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/FP/ch/boggy1.c
View File

@@ -141,7 +141,7 @@ void func_8038794C(Actor *this){
if(mapSpecificFlags_get(0x1)){
func_8028F94C(1, this->position);
timed_setCameraToNode(0.0f, 0x12);
timed_setStaticCameraToNode(0.0f, 0x12);
func_80324DBC(1.0f, 0xc00, 0xe, NULL, this->marker, func_80387828, func_803877A8);
func_803876A4(this);
break;
@@ -188,7 +188,7 @@ void func_8038794C(Actor *this){
if(0.99 <= this->unk48){
func_8028F918(0);
func_80324CD8(0.0f);
func_80324E88(0.0f);
timed_exitStaticCamera(0.0f);
func_803876F8(this);
}
break;

4
src/FP/ch/boggy2.c
View File

@@ -116,7 +116,7 @@ void func_80388A50(Actor *this){
ActorLocal_FP_2350 *local = (ActorLocal_FP_2350 *)&this->local;
func_80328B8C(this, 2, 0.0001f, 1);
timed_setCameraToNode(0.0f, 4);
timed_setStaticCameraToNode(0.0f, 4);
local->unk18 = 0;
}
@@ -192,7 +192,7 @@ void func_80388D70(ActorMarker *caller, enum asset_e text_id, s32 arg2){
Actor *this = marker_getActor(caller);
ActorLocal_FP_2350 *local = (ActorLocal_FP_2350 *)&this->local;
func_80324E88(0.0f);
timed_exitStaticCamera(0.0f);
switch(text_id){
case 0xc03:
case 0xc06:

10
src/FP/ch/scarfsled.c
View File

@@ -25,18 +25,18 @@ void __chScarfSled_setState(Actor *this, s32 next_state){
if(next_state == 2){
mapSpecificFlags_set(0xB, TRUE);
timed_setCameraToNode(0.0f, 0x27);
timed_setStaticCameraToNode(0.0f, 0x27);
timed_playSfx(0.6f, SFX_52_BANJO_YAH_OH, 1.0f, 28000);
timed_playSfx(1.25f, SFX_31_BANJO_OHHWAAOOO, 1.0f, 28000);
timed_setCameraToNode(1.5f, 0x26);
timed_setCameraToNode(2.75f, 0x25);
timed_setStaticCameraToNode(1.5f, 0x26);
timed_setStaticCameraToNode(2.75f, 0x25);
timed_playSfx(3.5f, SFX_63_BANJO_UWAAAAOOH, 1.0f, 28000);
timed_setCameraToNode(3.75f, 0x24);
timed_setStaticCameraToNode(3.75f, 0x24);
timed_playSfx(4.25f, SFX_A7_WOODEN_SWOSH, 1.2f, 18000);
timed_playSfx(4.45f, SFX_C1_BUZZBOMB_ATTACK, 1.0f, 0x7fff);
timed_setCameraToNode(4.75f, 0x23);
timed_setStaticCameraToNode(4.75f, 0x23);
}
}

8
src/FP/ch/twinklybox.c
View File

@@ -244,7 +244,7 @@ void func_8038D51C(ActorMarker *marker){
FUNC_8030E624(SFX_416, 0.8f, 32000);
func_8028F8F8(7, 0);
this->unk1C[1] = 1.0f;
func_80324E88(1.7f);
timed_exitStaticCamera(1.7f);
func_80324E38(1.7f, 0);
timedFunc_set_1(2.3f, (GenMethod_1)func_8038D294, (s32)this->marker);
this->velocity[1] = 1.0f;
@@ -257,7 +257,7 @@ void func_8038D5C8(ActorMarker *this_marker, ActorMarker *other_marker){
if(this->state == 1 || this->state == 2){
actor_collisionOff(this);
timed_setCameraToNode(0.0f, 0xa);
timed_setStaticCameraToNode(0.0f, 0xa);
func_80324CD8(0.1f);
func_8028F784(1);
func_8028F490(D_8039237C);
@@ -360,7 +360,7 @@ void func_8038D6C8(Actor *this){
if(this->velocity[0] != 0.0f)
break;
func_80324E88(0.0f);
timed_exitStaticCamera(0.0f);
func_8028F784(0);
func_80328B8C(this, 4, 0.999f, 1);
actor_playAnimationOnce(this);
@@ -386,7 +386,7 @@ void func_8038D6C8(Actor *this){
func_8038D3D8();
func_80324E38(0.0f, 3);
timedFunc_set_1(1.3f, (GenMethod_1)func_8038D51C, (s32)this->marker);
timed_setCameraToNode(0.9f, 0xC);
timed_setStaticCameraToNode(0.9f, 0xC);
item_set(ITEM_24_TWINKLY_SCORE, this->unk38_31);
func_80347A14(1);
break;

4
src/FP/ch/twinklymuncher.c
View File

@@ -92,7 +92,7 @@ Actor *func_8038DF34(Actor *this){
void func_8038E040(ActorMarker *caller, enum asset_e text_id, s32 arg2){
Actor *this = marker_getActor(caller);
func_80324E88(0.5f);
timed_exitStaticCamera(0.5f);
func_80328B8C(this, 7, 0.03f, 1);
actor_playAnimationOnce(this);
}
@@ -126,7 +126,7 @@ void func_8038E094(Actor *this){
if(sp38->unk1C[1] == 1.0f){
if(this->unkF4_8 == 1 && !fileProgressFlag_get(FILEPROG_13)){
if(this->state != 6 && this->state != 7 && 0.0f == this->velocity[0]){
timed_setCameraToNode(0.5f, 0xd);
timed_setStaticCameraToNode(0.5f, 0xd);
func_80311480(ASSET_C15_TEXT_TWINKLIE_MINIGAME_LOST, 0x2b, this->position, this->marker, func_8038E040, NULL);
this->velocity[0] = 1.0f;
func_80328B8C(this, 6, 0.03f, 1);

8
src/FP/ch/wozza.c
View File

@@ -70,11 +70,11 @@ void func_8038F330(ActorMarker *caller, enum asset_e text_id, s32 arg2){
Actor *this = marker_getActor(caller);
switch(text_id){
case 0xC1B:
func_80324E88(0.0f);
timed_exitStaticCamera(0.0f);
break;
case 0xC1C:
func_80324E88(0.0f);
timed_exitStaticCamera(0.0f);
func_8038F2F0(this);
break;
}
@@ -105,7 +105,7 @@ void func_8038F454(Actor *this){
mapSpecificFlags_set(7, TRUE);
func_80328A84(this, 2);
actor_loopAnimation(this);
timed_setCameraToNode(0.0f, 0x2e);
timed_setStaticCameraToNode(0.0f, 0x2e);
func_80324DBC(0.0f, 0xc1b, 0x2a, this->position, this->marker, func_8038F330, NULL);
timedFunc_set_1(2.5f, (GenMethod_1)func_8038F3F4, (s32)this->marker);
}
@@ -301,7 +301,7 @@ void FP_func_8038F7AC(Actor *this){
if(func_80329530(this, 500) && !this->unk138_24){
if(func_80311480(0xc1c, 0xAA, this->position, this->marker, func_8038F330, func_8038F3C4)){
timed_setCameraToNode(0.0f, 0x2E);
timed_setStaticCameraToNode(0.0f, 0x2E);
this->unk138_24 = TRUE;
}
break;

2
src/FP/ch/xmastreeice.c
View File

@@ -78,7 +78,7 @@ void func_80390B2C(ActorMarker *marker){
void func_80390B70(Actor *this){
func_80324E38(0.0f, 3);
timed_setCameraToNode(0.0f, 0);
timed_setStaticCameraToNode(0.0f, 0);
timedFunc_set_1(0.6f, (GenMethod_1)func_80390ABC, reinterpret_cast(s32, this->marker));
timedFunc_set_1(2.5f, (GenMethod_1)func_80390B2C, reinterpret_cast(s32, this->marker));
}

12
src/FP/racectrl.c
View File

@@ -215,18 +215,18 @@ void func_8038B1C4(void){
}
void func_8038B1D0(enum jiggy_e jiggy_id){
timed_setCameraToNode(0.0f, 3);
timed_setStaticCameraToNode(0.0f, 3);
timedFunc_set_0(0.0f, func_8038AEA0);
timedFunc_set_0(0.0f, FP_func_8038B0B8);
timedFunc_set_1(0.1f, (GenMethod_1) func_8038B130, jiggy_id);
timedFunc_set_0(5.0f, func_8038B190);
timedFunc_set_0(5.0f, func_8038B1C4);
func_80324E88(5.0f);
timed_exitStaticCamera(5.0f);
}
void func_8038B268(void){
func_80324E88(0.0f);
timed_exitStaticCamera(0.0f);
timedFunc_set_0(0.0f, func_8038AEA0);
timedFunc_set_0(0.0f, FP_func_8038B0B8);
func_8028FA14(map_get(), 0x11);
@@ -273,7 +273,7 @@ void func_8038B39C(void){
func_8025A6EC(COMUSIC_3B_MINIGAME_VICTORY, 28000);
FP_func_8038AB60(0);
func_8038ABDC();
timed_setCameraToNode(0.0f, 1);
timed_setStaticCameraToNode(0.0f, 1);
}
void func_8038B410(void){
@@ -288,12 +288,12 @@ void func_8038B410(void){
FP_func_8038AB60(0);
func_8038ABDC();
if(!jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2)){
timed_setCameraToNode(0.0f, 1);
timed_setStaticCameraToNode(0.0f, 1);
timed_playSfx(1.0f, SFX_8C_BOGGY_WAHEY, 1.0f, 32000);
func_80324DBC(2.0f, 0xC04, 0x2b, sp2C->position, NULL, func_8038B2C8, NULL);
}//L8038B4E0
else{
timed_setCameraToNode(0.0f, 1);
timed_setStaticCameraToNode(0.0f, 1);
timed_playSfx(1.0f, SFX_8C_BOGGY_WAHEY, 1.0f, 32000);
func_80324DBC(2.0f, 0xC0b, 0x2b, sp2C->position, NULL, func_8038B2C8, NULL);