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

6
src/RBB/ch/anchorctrl.c
View File

@@ -32,13 +32,13 @@ void __chAnchorCtrl_spawnJiggy(ActorMarker *marker, s32 arg1, s32 arg2){
Actor *actor = marker_getActor(marker);
jiggySpawn(JIGGY_53_RBB_SNORKEL, &D_80390B34);
timed_setCameraToNode(0.5f, 0xb);
timed_setStaticCameraToNode(0.5f, 0xb);
__chAnchorCtrl_setState(actor, 3);
}
void __chAnchorCtrl_setState(Actor *this, s32 new_state){
if(new_state == 2){
set_camera_to_node(0xC);
ncStaticCamera_setToNode(0xC);
func_80324E38(0.0f, 3);
timedFunc_set_0(1.0f, func_8038C000);
timedFunc_set_2(1.0f, (GenMethod_2)mapSpecificFlags_set, 8, TRUE);
@@ -63,7 +63,7 @@ void chAnchorCtrl_update(Actor *this){
}//L8038C27C
if(this->state == 3 && !mapSpecificFlags_get(4)){
func_80324E88(0.0f);
timed_exitStaticCamera(0.0f);
func_80324E38(0.0f, 0);
timedFunc_set_0(0.0f, func_803228D8);
timedFunc_set_3(0.0f, (GenMethod_3)func_802E4078, MAP_8B_RBB_ANCHOR_ROOM, 2, 0);

6
src/RBB/ch/bossboombox.c
View File

@@ -227,7 +227,7 @@ void func_8038CB34(ActorMarker *marker, s32 arg1, s32 arg2){
void func_8038CB68(ActorMarker *marker, s32 arg1, s32 arg2){
Actor *actor = marker_getActor(marker);
func_80324E88(0.0f);
timed_exitStaticCamera(0.0f);
func_80324E38(0.0f, 0);
timedFunc_set_2(0.0f, (GenMethod_2)RBB_func_8038C370, actor->marker, 3);
}
@@ -309,7 +309,7 @@ void RBB_func_8038CC9C(Actor *this, s32 new_state){
func_80335924(this->unk148, ASSET_146_ANIM_BOSS_BOOMBOX_APPEAR, 0.0f, 2.4f);
func_80335A8C(this->unk148, 2);
func_80324E38(0.0f, 3);
timed_setCameraToNode(0.0f, 0);
timed_setStaticCameraToNode(0.0f, 0);
timed_playSfx(0.5f, SFX_3F5_UNKNOWN, 1.0f, 0x7fc6);
timed_playSfx(1.25f, SFX_6C_LOCKUP_CLOSING, 1.05f, 0x7d00);
timed_playSfx(1.35f, SFX_6C_LOCKUP_CLOSING, 1.0f, 0x7d00);
@@ -317,7 +317,7 @@ void RBB_func_8038CC9C(Actor *this, s32 new_state){
if(func_803203FC(2)){
item_set(ITEM_6_HOURGLASS, 1);
item_set(ITEM_0_HOURGLASS_TIMER, 0x1067);
func_80324E88(2.4f);
timed_exitStaticCamera(2.4f);
func_80324E38(2.4f, 0);
timedFunc_set_2(2.4f, (GenMethod_2)RBB_func_8038C370, (s32)this->marker, 3);
}

6
src/RBB/ch/eggtoll1.c
View File

@@ -2,7 +2,7 @@
#include "functions.h"
#include "variables.h"
extern void func_80324E88(f32);
extern void timed_exitStaticCamera(f32);
/* typedefs and declarations */
typedef struct {
@@ -93,9 +93,9 @@ void func_803865D0(ActorMarker *marker){
Actor* actor = marker_getActor(marker);
ActorLocal_RBB_0 * local = (ActorLocal_RBB_0 *) &actor->local;
RBB_func_803863F0(actor, 1);
timed_setCameraToNode(0.0f, D_80390074[local->unk4].unk0);
timed_setStaticCameraToNode(0.0f, D_80390074[local->unk4].unk0);
timedFunc_set_2(0.75*D_80390074[local->unk4].unk4, (GenMethod_2) func_803865A4, actor->marker, 4);
func_80324E88(0.75*D_80390074[local->unk4].unk4);
timed_exitStaticCamera(0.75*D_80390074[local->unk4].unk4);
func_80324E38(0.75*D_80390074[local->unk4].unk4, 0);
timed_playSfx(D_80390074[local->unk4].unk4, SFX_7F_HEAVYDOOR_SLAM, 0.8f, 0x7fd0);
}

4
src/RBB/ch/enginefanswitch.c
View File

@@ -22,9 +22,9 @@ void chEngineFanSwitch_setState(Actor * this, s32 arg1){
func_8030E6D4(SFX_90_SWITCH_PRESS);
this->position_y -= 35.0f;
func_80324E38(1.0f, 3);
timed_setCameraToNode(1.0f, 0);
timed_setStaticCameraToNode(1.0f, 0);
timedFunc_set_0(1.0f, RBB_func_803898A0);
func_80324E88(5.0f);
timed_exitStaticCamera(5.0f);
func_80324E38(5.0f, 0);
}
}

4
src/RBB/ch/propellor.c
View File

@@ -91,10 +91,10 @@ void chPropellor_update(Actor *this){
local->unkC = 0.0f;
__chPropellor_setState(this, 1);
if(levelSpecificFlags_get(local->unk8 ? 4 : 3)){
set_camera_to_node(9);
ncStaticCamera_setToNode(9);
func_80324E38(0.0f, 3);
timedFunc_set_2(0.1f, (GenMethod_2)levelSpecificFlags_set, local->unk8 ? 0x28 : 0x27, 1);
func_80324E88(4.5f);
timed_exitStaticCamera(4.5f);
func_80324E38(4.5f, 0);
timedFunc_set_2(4.5f, (GenMethod_2)levelSpecificFlags_set, local->unk8 ? 0x4 : 0x3, 0);
timedFunc_set_3(4.5f, (GenMethod_3)func_802E4078, MAP_34_RBB_ENGINE_ROOM, !local->unk8 ? 3 : 2, 0);

4
src/RBB/ch/whistlectrl.c
View File

@@ -43,9 +43,9 @@ void __chWhistleCtrl_wrong(ActorMarker *marker){
void __chWhistleCtrl_complete(void){
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
func_80324E38(1.0f, 3);
timed_setCameraToNode(2.0f, 10);
timed_setStaticCameraToNode(2.0f, 10);
timedFunc_set_0(2.2f, __chWhistleCtrl_soundWhistle);
func_80324E88(5.0f);
timed_exitStaticCamera(5.0f);
func_80324E38(5.0f, 0);
}

6
src/RBB/code_1570.c
View File

@@ -186,7 +186,7 @@ void func_80387F88(ActorMarker *marker){
timed_playSfx(1.0f, SFX_1A_BIG_THINGS_FALL_OVER, 1.0f, 22000);
timed_playSfx(2.0f, SFX_1A_BIG_THINGS_FALL_OVER, 0.8f, 22000);
timed_playSfx(3.0f, SFX_1A_BIG_THINGS_FALL_OVER, 0.6f, 22000);
func_80324E88(4.0f);
timed_exitStaticCamera(4.0f);
func_80324E38(4.0f, 0);
timedFunc_set_2(4.0f, (GenMethod_2) RBB_func_80387F18, (s32) actor->marker, 3);
}
@@ -197,7 +197,7 @@ void func_80388154(ActorMarker *marker){
timedFunc_set_0(0.0f, (GenMethod_0) RBB_func_80387F44);
timed_playSfx(0.0f, SFX_7F_HEAVYDOOR_SLAM, 1.0f, 0x7fc6);
timedFunc_set_2(1.2f, (GenMethod_2) func_80387B8C, 0x19f, 0);
timed_setCameraToNode(1.2f, 8);
timed_setStaticCameraToNode(1.2f, 8);
timedFunc_set_1(1.5f, (GenMethod_1) func_80387F88, (s32) actor->marker);
}
@@ -208,7 +208,7 @@ void func_803881E8(Actor *this, s32 arg1){
timedFunc_set_2(0.05f, (GenMethod_2)func_80387BEC, 0x19f, 0x1f4);
timedFunc_set_2(0.1f, (GenMethod_2)func_8025A6EC, COMUSIC_2B_DING_B, 28000);
func_80324E38(0.2f, 3);
timed_setCameraToNode(1.1f, 7);
timed_setStaticCameraToNode(1.1f, 7);
timedFunc_set_1(1.6f, (GenMethod_1)func_80388154, (s32)this->marker);
levelSpecificFlags_set(0x2D, 1);
}

2
src/RBB/code_640.c
View File

@@ -139,7 +139,7 @@ void func_80386A7C(Actor *this){
func_802D3D74(this);
this->depth_mode = 1;
func_8024C5CC(&sp2C);
viewport_getPosition(&sp2C);
sp28 = func_80386A30(&this->position);
temp_v0 = func_80386A30(&sp2C);
this->unk38_0 = 0;

4
src/RBB/code_9670.c
View File

@@ -27,9 +27,9 @@ void func_8038FA9C(Actor *this, s32 arg1){
if(arg1 == 3){
func_80324E38(0.0f, 3);
timedFunc_set_2(1.0f, (GenMethod_2)func_8025A6EC, COMUSIC_2B_DING_B, 28000);
timed_setCameraToNode(1.8f, 1);
timed_setStaticCameraToNode(1.8f, 1);
timedFunc_set_1(2.0f, (GenMethod_1) RBB_func_8038FA60, (s32)this->marker);
func_80324E88(5.0f);
timed_exitStaticCamera(5.0f);
func_80324E38(5.0f, 0);
}
this->state = arg1;

10
src/RBB/code_CA0.c
View File

@@ -54,15 +54,15 @@ void func_8038718C(ActorMarker *marker){
func_8034DDF0(sp44, &sp38, &sp2C, 4.0f, 1);
func_8034E1A4(sp44, SFX_D8_CRANE, 1.0f, 1.0f);
}
timed_setCameraToNode(0.0f, 4);
timed_setCameraToNode(2.5f, 5);
timed_setStaticCameraToNode(0.0f, 4);
timed_setStaticCameraToNode(2.5f, 5);
timed_playSfx(4.0f, SFX_7F_HEAVYDOOR_SLAM, 0.5f, 19000);
timed_playSfx(4.0f, SFX_7F_HEAVYDOOR_SLAM, 0.6f, 19000);
timed_playSfx(4.0f, SFX_7F_HEAVYDOOR_SLAM, 0.7f, 19000);
timed_playSfx(4.0f, SFX_7F_HEAVYDOOR_SLAM, 0.8f, 19000);
timed_playSfx(4.0f, SFX_7F_HEAVYDOOR_SLAM, 0.9f, 19000);
timed_playSfx(4.0f, SFX_7F_HEAVYDOOR_SLAM, 1.0f, 19000);\
func_80324E88(5.0f);
timed_exitStaticCamera(5.0f);
func_80324E38(5.0f, 0);
timedFunc_set_2(5.0f, (GenMethod_2) func_80387090, (s32) marker, 3);
}
@@ -89,7 +89,7 @@ void func_80387308(ActorMarker *marker){
timedFunc_set_2(0.5f, (GenMethod_2) func_80387090, (s32) actor->marker, 1);
timedFunc_set_2(1.5f, (GenMethod_2) func_803870BC, 0x19d, 0x1f4);
func_80324E88(1.5f);
timed_exitStaticCamera(1.5f);
func_80324E38(1.5f, 0);
}
@@ -107,7 +107,7 @@ void func_80387488(ActorMarker *marker){
}
}
func_80324E38(0.0f, 3);
timed_setCameraToNode(0.0f, 6);
timed_setStaticCameraToNode(0.0f, 6);
timedFunc_set_1(0.5f, (GenMethod_1) func_80387308, (s32) actor->marker);
}