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/RBB/ch/anchorswitch.c
View File

@@ -21,7 +21,7 @@ void __chAnchorSwitch_setState(Actor *this, s32 arg1){
this->position_y -= 35.0f;
if(this->state == 1){
levelSpecificFlags_set(0x30, TRUE);
func_803204E4(0xe, 1);
volatileFlag_set(0xe, 1);
timedFunc_set_0(1.0f, func_803228D8);
timedFunc_set_3(1.0f, (GenFunction_3)func_802E4078, MAP_31_RBB_RUSTY_BUCKET_BAY, 0, 0);
}

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

@@ -313,7 +313,7 @@ void RBB_func_8038CC9C(Actor *this, s32 new_state){
timed_playSfx(1.25f, SFX_6C_LOCKUP_CLOSING, 1.05f, 0x7d00);
timed_playSfx(1.35f, SFX_6C_LOCKUP_CLOSING, 1.0f, 0x7d00);
timed_playSfx(1.8f, SFX_6C_LOCKUP_CLOSING, 1.0f, 0x7d00);
if(func_803203FC(2)){
if(volatileFlag_get(VOLATILE_FLAG_2)){
item_set(ITEM_6_HOURGLASS, 1);
item_set(ITEM_0_HOURGLASS_TIMER, 0x1067);
timed_exitStaticCamera(2.4f);
@@ -360,10 +360,10 @@ void RBB_func_8038CC9C(Actor *this, s32 new_state){
func_8025A58C(-1, 0x190);
comusic_8025AB44(COMUSIC_62_RBB_BOOMBOX, 0, 0x190);
func_8025AABC(COMUSIC_62_RBB_BOOMBOX);
if(func_803203FC(2)){
if(volatileFlag_get(VOLATILE_FLAG_2)){
item_set(ITEM_6_HOURGLASS, 0);
func_803204E4(3, 0);
func_803204E4(5, 1);
volatileFlag_set(3, 0);
volatileFlag_set(5, 1);
}
else{//L8038D220
timedFunc_set_3(0.0f, (GenFunction_3)chbossboombox_respawnJiggy, (s32)this->position_x, (s32)this->position_y, (s32)this->position_z);
@@ -523,13 +523,13 @@ void func_8038D8BC(Actor *this){
RBB_func_8038CC9C(this, 7);
}
if(jiggyscore_isSpawned(JIGGY_56_RBB_BOSS_BOOM_BOX) && !func_803203FC(2))
if(jiggyscore_isSpawned(JIGGY_56_RBB_BOSS_BOOM_BOX) && !volatileFlag_get(VOLATILE_FLAG_2))
marker_despawn(this->marker);
if(func_803203FC(2))
if(volatileFlag_get(VOLATILE_FLAG_2))
chbossboombox_hideJiggy();
if(func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)){
if(volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)){
chbossboombox_hideJiggy();
skeletalAnim_set(this->unk148, ASSET_146_ANIM_BOSS_BOOMBOX_APPEAR, 0.0f, 2.4f);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
@@ -540,8 +540,8 @@ void func_8038D8BC(Actor *this){
player_getPosition(player_position);
if(this->state == 1){
if(func_803203FC(2)){
if(func_803203FC(3)){
if(volatileFlag_get(VOLATILE_FLAG_2)){
if(volatileFlag_get(VOLATILE_FLAG_3)){
RBB_func_8038CC9C(this, 2);
}
}
@@ -572,10 +572,10 @@ void func_8038D8BC(Actor *this){
}//L8038DC48
if(this->state == 3 || this->state == 4){
if(func_803203FC(2)){
if(volatileFlag_get(VOLATILE_FLAG_2)){
if(item_empty(ITEM_0_HOURGLASS_TIMER)){
func_803204E4(3, 0);
func_803204E4(5, 0);
volatileFlag_set(3, 0);
volatileFlag_set(5, 0);
RBB_func_8038CC9C(this, 8);
}
}

2
src/RBB/ch/bossboomboxctrl.c
View File

@@ -21,7 +21,7 @@ void chBossBoomBoxCtrl_update(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = 1;
if(jiggyscore_isSpawned(JIGGY_56_RBB_BOSS_BOOM_BOX) && !func_803203FC(2)){
if(jiggyscore_isSpawned(JIGGY_56_RBB_BOSS_BOOM_BOX) && !volatileFlag_get(VOLATILE_FLAG_2)){
marker_despawn(this->marker);
}else{
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_281_BOSS_BOOM_BOX_LARGEST, reinterpret_cast(s32,this->position_x), reinterpret_cast(s32,this->position_y), reinterpret_cast(s32,this->position_z));