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

documented volatile flag functions and enums and some Actor struct members

Browse Source
This commit is contained in:
mariob92
2024-09-08 12:22:27 +02:00
parent 347c3edcdf
commit 615e2bda33
111 changed files with 584 additions and 549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,7 +130,7 @@ void chGobi1_update(Actor *this){
this->unk1C[0] = 0.0f;
this->unk1C[1] = 0.0f;
chGobi1_setState(this, 1);
if(jiggyscore_isSpawned(JIGGY_44_GV_GOBI_1) && ! func_803203FC(1)){
if(jiggyscore_isSpawned(JIGGY_44_GV_GOBI_1) && ! volatileFlag_get(VOLATILE_FLAG_1)){
marker_despawn(this->marker);
}
return;

2
src/GV/ch/gobirock.c
View File

@@ -112,7 +112,7 @@ void chGobiRock_update(Actor *this){
this->position_z = sp28->position_z;
}
__chGobiRock_setState(this, 1);
if(jiggyscore_isSpawned(JIGGY_44_GV_GOBI_1) && !func_803203FC(1)){
if(jiggyscore_isSpawned(JIGGY_44_GV_GOBI_1) && !volatileFlag_get(VOLATILE_FLAG_1)){
marker_despawn(this->marker);
}
}

2
src/GV/ch/gobirope.c
View File

@@ -49,7 +49,7 @@ void chGobiRope_update(Actor *this){
}
chGobiRope_setState(this, 1);
if( jiggyscore_isSpawned(JIGGY_44_GV_GOBI_1)
&& !func_803203FC(1)
&& !volatileFlag_get(VOLATILE_FLAG_1)
){
marker_despawn(this->marker);
}

2
src/GV/ch/histup.c
View File

@@ -118,7 +118,7 @@ void func_8038DBDC(Actor *this){
func_8038DB4C(0);
this->unk1C[0] = 0.0f;
}//L8038DC90
if(func_8038E178() != (s32)this->unk1C[0] || func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)){
if(func_8038E178() != (s32)this->unk1C[0] || volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)){
if(15.0f <= this->unk60){
subaddie_set_state_with_direction(this, 2, 0.01f, 1);
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_ONCE);

2
src/GV/ch/trunker.c
View File

@@ -61,7 +61,7 @@ void chTrucker_update(Actor *this){
marker->propPtr->unk8_3 = TRUE;
actor_collisionOff(this);
mapSpecificFlags_set(0xC, FALSE);
if(jiggyscore_isSpawned(JIGGY_45_GV_GOBI_2) && !func_803203FC(1)){
if(jiggyscore_isSpawned(JIGGY_45_GV_GOBI_2) && !volatileFlag_get(VOLATILE_FLAG_1)){
__chTrucker_setState(this, 3);
}
else{//L803891CC

4
src/GV/code_7060.c
View File

@@ -64,7 +64,7 @@ void func_8038D47C(Actor *this){
if(!this->unk16C_4){
mapSpecificFlags_set(0x10, 0);
this->unk16C_4 = TRUE;
if(func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) && gcparade_8031B4F4() == -3){
if(volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) && gcparade_8031B4F4() == -3){
timedFunc_set_1(1.5f, (GenFunction_1)func_8038D450, reinterpret_cast(s32, this->marker));
}
}//L8038D5EC
@@ -121,7 +121,7 @@ void func_8038D47C(Actor *this){
FUNC_8030E624(SFX_D6_UGH, 0.8f, 32750);
}
if(actor_animationIsAt(this, 0.94f)){
if(!func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)){
if(!volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)){
mapSpecificFlags_set(0x10, 1);
}
}

20
src/GV/matchinggame.c
View File

@@ -69,7 +69,7 @@ void __matchingGame_spawnJIggy(void){
void __matchingGame_setState(s32 next_state){
if(next_state == 2){
item_set(ITEM_6_HOURGLASS, 1);
if(func_803203FC(2))
if(volatileFlag_get(VOLATILE_FLAG_2))
item_set(ITEM_0_HOURGLASS_TIMER, 4499);
else
item_set(ITEM_0_HOURGLASS_TIMER, 5999);
@@ -79,9 +79,9 @@ void __matchingGame_setState(s32 next_state){
}
if(next_state == 3){
if(func_803203FC(2)){
func_803204E4(3, 0);
func_803204E4(5, 0);
if(volatileFlag_get(VOLATILE_FLAG_2)){
volatileFlag_set(3, 0);
volatileFlag_set(5, 0);
}
else{
func_8028F66C(BS_INTR_F);
@@ -89,9 +89,9 @@ void __matchingGame_setState(s32 next_state){
}
if(next_state == 4){
if(func_803203FC(2)){
func_803204E4(3, 0);
func_803204E4(5, 1);
if(volatileFlag_get(VOLATILE_FLAG_2)){
volatileFlag_set(3, 0);
volatileFlag_set(5, 1);
}
else{
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7fff);
@@ -120,7 +120,7 @@ void gv_matchingGame_init(void){
matchingGame.state = 0;
if(map_get() == MAP_13_GV_MEMORY_GAME){
if( !jiggyscore_isSpawned(JIGGY_40_GV_MATCHING_GAME) //jiggy is collected
|| func_803203FC(2) //in FF minigame
|| volatileFlag_get(VOLATILE_FLAG_2) //in FF minigame
){
matchingGame.match_count = 0;
matchingGame.tile_a = NULL;
@@ -222,8 +222,8 @@ void gv_matchingGame_update(void){
}//L803907F0
if( matchingGame.state == 1
&& func_803203FC(2)
&& func_803203FC(3)
&& volatileFlag_get(VOLATILE_FLAG_2)
&& volatileFlag_get(VOLATILE_FLAG_3)
){
__matchingGame_setState(2);
}

2
src/GV/waterctrl.c
View File

@@ -39,7 +39,7 @@ void __waterCtrl_setState(s32 arg0){
if(GV_D_80391B00.state == 3){
levelSpecificFlags_set(6, TRUE);
func_803228D8();
func_803204E4(0xe, 1);
volatileFlag_set(0xe, 1);
func_802E4078(MAP_12_GV_GOBIS_VALLEY, 0, 0);
}
}