kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

identified/labeled camera functions

Browse Source
This commit is contained in:
Banjo Kazooie
2023-03-10 21:52:35 -06:00
parent 13728811aa
commit 7f3dd5aa12
164 changed files with 1583 additions and 1522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/GV/ch/gobi1.c
View File

@@ -154,7 +154,7 @@ void chGobi1_update(Actor *this){
if(ml_timer_update(&local->unk14, tick)){
local->unk10 = 0.75f;
local->unk8 = 7.5f;
timed_setCameraToNode(0.5f, 0xa);
timed_setStaticCameraToNode(0.5f, 0xa);
timed_playSfx(1.0f, SFX_84_GOBI_CRYING, 1.1f, 30000);
timed_playSfx(2.0f, SFX_84_GOBI_CRYING, 1.3f, 30000);
timed_playSfx(2.5f, SFX_74_WALKING_NOISE_5, 0.5f, 30000);
@@ -162,7 +162,7 @@ void chGobi1_update(Actor *this){
timed_playSfx(5.0f, SFX_2E_BIGBUTT_RUNNING, 1.0f, 20000);
timed_playSfx(5.6f, SFX_2E_BIGBUTT_RUNNING, 1.0f, 20000);
timed_playSfx(6.5f, SFX_2E_BIGBUTT_RUNNING, 1.0f, 20000);
func_80324E88(7.6f);
timed_exitStaticCamera(7.6f);
}
if(this->state == 1 || this->state == 2){

8
src/GV/ch/gobi2.c
View File

@@ -48,14 +48,14 @@ void GV_func_80387A00(ActorMarker *this_marker){
}
void func_80387A2C(ActorMarker *caller, enum asset_e text_id, s32 arg2){
timed_setCameraToNode(0.0f, 0xC);
timed_setStaticCameraToNode(0.0f, 0xC);
timedFunc_set_1(0.5f, (GenMethod_1) func_80387984, reinterpret_cast(s32, caller));
timed_playSfx(0.5f, SFX_2C_PULLING_NOISE, 0.9f, 32000);
timed_playSfx(1.8f, SFX_2C_PULLING_NOISE, 1.0f, 32000);
timed_playSfx(2.5f, SFX_2C_PULLING_NOISE, 1.1f, 32000);
timed_setCameraToNode(3.0f, 0xd);
timed_setStaticCameraToNode(3.0f, 0xd);
timedFunc_set_0(3.5f, __chGobi2_spawnJIggy);
func_80324E88(6.0f);
timed_exitStaticCamera(6.0f);
timedFunc_set_1(6.0f, (GenMethod_1) GV_func_80387A00, reinterpret_cast(s32, caller));
func_80324E38(6.0f, 0);
}
@@ -81,7 +81,7 @@ void chGobi2_setState(Actor *this, s32 next_state){
timed_playSfx(0.05f, SFX_84_GOBI_CRYING, 1.1f, 32000);
func_80324E38(0.051f, 1);
timedFunc_set_1(0.06f, (GenMethod_1)func_803879D4, reinterpret_cast(s32, this->marker));
timed_setCameraToNode(0.86f, 0xb);
timed_setStaticCameraToNode(0.86f, 0xb);
timed_playSfx(0.8f, SFX_4B_GULPING, 0.8f, 28000);
timed_playSfx(1.4f, SFX_4B_GULPING, 0.8f, 28000);
timed_playSfx(2.0f, SFX_4B_GULPING, 0.8f, 28000);

4
src/GV/ch/gobi3.c
View File

@@ -44,7 +44,7 @@ void __chGobi3_runaway(ActorMarker *caller, enum asset_e text_id, s32 arg2){
timed_playSfx(2.6f, SFX_2E_BIGBUTT_RUNNING, 1.0f, 5000);
timed_playSfx(2.6f, SFX_2E_BIGBUTT_RUNNING, 1.0f, 5000);
func_80324E88(3.0f);
timed_exitStaticCamera(3.0f);
func_80324E38(3.0f, 0);
}
@@ -64,7 +64,7 @@ void chGobi3_setState(Actor *this, s32 next_state){
if(next_state == 3){
func_80324E38(0.0f, 3);
timedFunc_set_1(0.02f, (GenMethod_1)__chGobi3_func_80388270, (s32)this);
timed_setCameraToNode(0.1f, 0x12);
timed_setStaticCameraToNode(0.1f, 0x12);
timed_playSfx(0.2f, SFX_4C_LIP_SMACK, 1.0f, 32000);
timedFunc_set_1(0.2f, (GenMethod_1)__chGobi3_spawnHoneyComb, (s32)this);
func_80335924(this->unk148, ASSET_FC_ANIM_GOBI_SPITTING, 0.2f, 1.0f);

4
src/GV/ch/mazectrl.c
View File

@@ -74,10 +74,10 @@ void __chMazeCtrl_setState(Actor *this, s32 next_state){
FUNC_8030E624(SFX_3F6_UNKNOWN, 0.5f, 25000);
if(1500.0f < plyr_pos[0]){
func_80324E38(0.0f, 3);
timed_setCameraToNode(0.0f, 8);
timed_setStaticCameraToNode(0.0f, 8);
timed_playSfx(1.0f, SFX_7F_HEAVYDOOR_SLAM, 1.0f, 32000);
func_80324CD8(1.2f);
func_80324E88(1.2f);
timed_exitStaticCamera(1.2f);
func_80324E38(1.2f, 0);
}
else{//L8038F754

8
src/GV/code_6370.c
View File

@@ -47,17 +47,17 @@ void func_8038C760(Actor *this, s32 arg1){
FUNC_8030E624(SFX_3F6_UNKNOWN, 0.7f, 28000);
FUNC_8030E624(SFX_3F6_UNKNOWN, 0.9f, 29000);
FUNC_8030E624(SFX_3F6_UNKNOWN, 1.0f, 30000);
timed_setCameraToNode(0.0f, 8);
timed_setStaticCameraToNode(0.0f, 8);
if(arg1 < 3){
timed_setCameraToNode(3.5f, arg1 + 0x15);
timed_setStaticCameraToNode(3.5f, arg1 + 0x15);
timedFunc_set_3(3.5f, (GenMethod_3)fileProgressFlag_setN, FILEPROG_F8_KING_SANDYBUTT_PYRAMID_STATE, arg1, 2);
func_80324E88(6.5f);
timed_exitStaticCamera(6.5f);
func_80324E38(6.5f, 0);
}
else{
timedFunc_set_2(3.5f, (GenMethod_2)func_8025A6EC, COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7fff);
timedFunc_set_3(3.5f, (GenMethod_3)fileProgressFlag_setN, FILEPROG_F8_KING_SANDYBUTT_PYRAMID_STATE, arg1, 2);
func_80324E88(6.0f);
timed_exitStaticCamera(6.0f);
func_80324E38(6.0f, 0);
}
}

4
src/GV/code_9C10.c
View File

@@ -12,9 +12,9 @@ void func_80390000(s32 arg0){
GV_D_80391AD0 = arg0;
if(GV_D_80391AD0 == 1){
set_camera_to_node(0x14);
ncStaticCamera_setToNode(0x14);
func_80324E38(0.0f, 3);
timed_setCameraToNode(4.0f, 0x15);
timed_setStaticCameraToNode(4.0f, 0x15);
func_80324E38(8.0f, 0);
tmp_v0 = func_8034C5AC(0x130);

4
src/GV/matchinggame.c
View File

@@ -99,9 +99,9 @@ void __matchingGame_setState(s32 next_state){
func_8035D490(matchingGame.mummy_marker);
}
func_80324E38(0.5f, 3);
timed_setCameraToNode(1.5f, 2);
timed_setStaticCameraToNode(1.5f, 2);
timedFunc_set_0(1.7f, __matchingGame_spawnJIggy);
func_80324E88(4.0f);
timed_exitStaticCamera(4.0f);
func_80324E38(4.0f, 0);
}

4
src/GV/waterctrl.c
View File

@@ -23,9 +23,9 @@ void __waterCtrl_setState(s32 arg0){
GV_D_80391B00.state = arg0;
if(GV_D_80391B00.state == 2){
func_80324E38(0.0f, 3);
timed_setCameraToNode(0.0f, 0);
timed_setStaticCameraToNode(0.0f, 0);
timedFunc_set_0(3.0f, func_80390880);
timed_setCameraToNode(3.0f, 1);
timed_setStaticCameraToNode(3.0f, 1);
func_80324E38(6.0f, 0);
tmp_v0 = func_8034C528(400);
if(tmp_v0){