From 615e2bda338dbc1cb338bfd9e37702f6172f9741 Mon Sep 17 00:00:00 2001 From: mariob92 <21146795-mariob92@users.noreply.gitlab.com> Date: Sun, 8 Sep 2024 12:22:27 +0200 Subject: [PATCH 1/5] documented volatile flag functions and enums and some Actor struct members --- include/enums.h | 117 +++++++++++++--------- include/functions.h | 5 + include/prop.h | 4 +- src/BGS/ch/code_2270.c | 26 ++--- src/BGS/ch/flibbit.c | 2 +- src/BGS/code_3030.c | 2 +- src/BGS/code_3420.c | 16 +-- src/CCW/ch/vacationtexttrigger.c | 4 +- src/CCW/code_160.c | 20 ++-- src/CCW/code_3DA0.c | 4 +- src/CCW/code_4530.c | 2 +- src/FP/ch/bearcub.c | 2 +- src/FP/ch/boggy1.c | 2 +- src/FP/ch/boggy2.c | 12 +-- src/FP/ch/cavewozza.c | 2 +- src/FP/ch/twinkly.c | 2 +- src/FP/ch/twinklybox.c | 4 +- src/FP/ch/twinklymuncher.c | 2 +- src/FP/ch/wozza.c | 4 +- src/FP/ch/xmastree.c | 2 +- src/GV/ch/gobi1.c | 2 +- src/GV/ch/gobirock.c | 2 +- src/GV/ch/gobirope.c | 2 +- src/GV/ch/histup.c | 2 +- src/GV/ch/trunker.c | 2 +- src/GV/code_7060.c | 4 +- src/GV/matchinggame.c | 20 ++-- src/GV/waterctrl.c | 2 +- src/MM/ch/conga.c | 2 +- src/MMM/ch/napper.c | 2 +- src/RBB/ch/anchorswitch.c | 2 +- src/RBB/ch/bossboombox.c | 24 ++--- src/RBB/ch/bossboomboxctrl.c | 2 +- src/SM/ch/attacktutorial.c | 2 +- src/SM/ch/vegetables.c | 12 +-- src/SM/code_2990.c | 2 +- src/TTC/ch/clam.c | 8 +- src/TTC/ch/treasure.c | 2 +- src/TTC/code_3E30.c | 44 ++++---- src/core1/code_0.c | 2 +- src/core1/code_10A00.c | 4 +- src/core1/code_CE60.c | 4 +- src/core2/animcache.c | 2 +- src/core2/ba/anim.c | 4 +- src/core2/ba/marker.c | 56 +++++------ src/core2/ch/beehive.c | 2 +- src/core2/ch/bigbutt.c | 2 +- src/core2/ch/climbBase.c | 2 +- src/core2/ch/code_468E0.c | 2 +- src/core2/ch/collectible.c | 4 +- src/core2/ch/crab.c | 6 +- src/core2/ch/ghost.c | 2 +- src/core2/ch/icecube.c | 2 +- src/core2/ch/jinjo.c | 2 +- src/core2/ch/snacker.c | 4 +- src/core2/ch/trainers.c | 10 +- src/core2/ch/wadingboots.c | 10 +- src/core2/code_14420.c | 2 +- src/core2/code_34790.c | 4 +- src/core2/code_39D0.c | 2 +- src/core2/code_41F30.c | 2 +- src/core2/code_42CB0.c | 4 +- src/core2/code_43A40.c | 4 +- src/core2/code_45310.c | 2 +- src/core2/code_47BD0.c | 2 +- src/core2/code_4A6F0.c | 22 ++-- src/core2/code_4BD70.c | 2 +- src/core2/code_4C020.c | 75 +++++++------- src/core2/code_53A10.c | 2 +- src/core2/code_53C10.c | 2 +- src/core2/code_57C70.c | 2 +- src/core2/code_59A80.c | 6 +- src/core2/code_5C870.c | 8 +- src/core2/code_7060.c | 2 +- src/core2/code_7AF80.c | 2 +- src/core2/code_85800.c | 2 +- src/core2/code_91E10.c | 2 +- src/core2/code_935F0.c | 24 ++--- src/core2/code_956B0.c | 10 +- src/core2/code_98CB0.c | 139 +++++++++++++------------- src/core2/code_9A740.c | 6 +- src/core2/code_9B990.c | 4 +- src/core2/code_9E370.c | 25 +++-- src/core2/code_A5BC0.c | 11 +- src/core2/code_B5040.c | 10 +- src/core2/code_B62B0.c | 2 +- src/core2/code_BEF20.c | 36 +++---- src/core2/code_C2F30.c | 2 +- src/core2/code_C4320.c | 18 ++-- src/core2/code_CF3E0.c | 6 +- src/core2/code_D0CA0.c | 2 +- src/core2/code_D6600.c | 4 +- src/core2/code_D89E0.c | 2 +- src/core2/code_DA760.c | 12 +-- src/core2/gc/dialog.c | 14 +-- src/core2/gc/parade.c | 34 +++---- src/core2/gc/pauseMenu.c | 10 +- src/core2/gc/zoombox.c | 2 +- src/core2/levelspecificflags.c | 4 +- src/core2/mapModel.c | 4 +- src/core2/quizquestionaskedbitfield.c | 2 +- src/core2/snackerctl.c | 2 +- src/fight/chfinalboss.c | 2 +- src/fight/chspellfireball.c | 2 +- src/lair/ch/brentilda.c | 12 +-- src/lair/ch/cauldron.c | 2 +- src/lair/code_0.c | 38 +++---- src/lair/code_5ED0.c | 43 ++++---- src/lair/code_9C40.c | 2 +- src/lair/code_A810.c | 2 +- src/lair/code_BBD0.c | 4 +- 111 files changed, 584 insertions(+), 549 deletions(-) diff --git a/include/enums.h b/include/enums.h index aa3f260f..f8e21049 100644 --- a/include/enums.h +++ b/include/enums.h @@ -229,59 +229,80 @@ enum file_progress_e{ FILEPROG_FD_BANNED_CHEATCODES_ENTERED //2 bit }; -enum volatile_progress_e{ - VOLAPROG_0_UNKNOWN -}; +enum volatile_flags_e { + VOLATILE_FLAG_0, // FFQ + VOLATILE_FLAG_1, + VOLATILE_FLAG_2, + VOLATILE_FLAG_3, + VOLATILE_FLAG_4, + VOLATILE_FLAG_5, + VOLATILE_FLAG_6_HAS_SEEN_BOSS_BOOM_BOX_FF_MINIGAME = 0x6, + VOLATILE_FLAG_7_HAS_SEEN_VILE_FF_MINIGAME, + VOLATILE_FLAG_8_HAS_SEEN_MATCHING_PYRAMID_FF_MINIGAME, + VOLATILE_FLAG_9_HAS_SEEN_ZUBBAS_FF_MINIGAME, + VOLATILE_FLAG_A_HAS_SEEN_TIPTUP_FF_MINIGAME, + VOLATILE_FLAG_B_HAS_SEEN_SANDCASTLE_FF_MINIGAME, + VOLATILE_FLAG_C, + VOLATILE_FLAG_D, + VOLATILE_FLAG_E, + VOLATILE_FLAG_F, + VOLATILE_FLAG_10, + VOLATILE_FLAG_11, + VOLATILE_FLAG_12, + VOLATILE_FLAG_13_HAS_TRIGGERED_MUMBO_VACATION_TEXT = 0x13, + VOLATILE_FLAG_14, + VOLATILE_FLAG_15, + VOLATILE_FLAG_16, + VOLATILE_FLAG_17, + VOLATILE_FLAG_18, + VOLATILE_FLAG_19, + VOLATILE_FLAG_1A, + VOLATILE_FLAG_1B, + VOLATILE_FLAG_1C, + VOLATILE_FLAG_1D, + VOLATILE_FLAG_1E, + VOLATILE_FLAG_1F_IN_CHARACTER_PARADE = 0x1F, + VOLATILE_FLAG_20_BEGIN_CHARACTER_PARADE, -enum unkflags_1{ - UNKFLAGS1_6_HAS_SEEN_BOSS_BOOM_BOX_FF_MINIGAME = 0x6, - UNKFLAGS1_7_HAS_SEEN_VILE_FF_MINIGAME, - UNKFLAGS1_8_HAS_SEEN_MATCHING_PYRAMID_FF_MINIGAME, - UNKFLAGS1_9_HAS_SEEN_ZUBBAS_FF_MINIGAME, - UNKFLAGS1_A_HAS_SEEN_TIPTUP_FF_MINIGAME, - UNKFLAGS1_B_HAS_SEEN_SANDCASTLE_FF_MINIGAME, + VOLATILE_FLAG_73_SANDCASTLE_INFINITE_LIVES = 0x73, + VOLATILE_FLAG_74_SANDCASTLE_INFINITE_EGGS, + VOLATILE_FLAG_75_SANDCASTLE_INFINITE_RED_FEATHERS, + VOLATILE_FLAG_76_SANDCASTLE_INFINITE_GOLD_FEATHERS, - UNKFLAGS1_13_HAS_TRIGGERED_MUMBO_VACATION_TEXT = 0x13, + VOLATILE_FLAG_78_SANDCASTLE_NO_BONUS = 0x78, - UNKFLAGS1_1F_IN_CHARACTER_PARADE = 0x1F, - UNKFLAGS1_20_BEGIN_CHARACTER_PARADE, + VOLATILE_FLAG_7F_SANDCASTLE_OPEN_CC = 0x7F, - UNKFLAGS1_73_SANDCASTLE_INFINITE_LIVES = 0x73, - UNKFLAGS1_74_SANDCASTLE_INFINITE_EGGS, - UNKFLAGS1_75_SANDCASTLE_INFINITE_RED_FEATHERS, - UNKFLAGS1_76_SANDCASTLE_INFINITE_GOLD_FEATHERS, + VOLATILE_FLAG_84_SANDCASTLE_OPEN_BGS = 0x84, - UNKFLAGS1_78_SANDCASTLE_NO_BONUS = 0x78, + VOLATILE_FLAG_86_SANDCASTLE_SHOCKSPRING_JUMP_UNLOCKED = 0x86, + VOLATILE_FLAG_87_SANDCASTLE_OPEN_GV,// 0X87 - UNKFLAGS1_7F_SANDCASTLE_OPEN_CC = 0x7F, + VOLATILE_FLAG_8A_SANDCASTLE_FLIGHT_UNLOCKED = 0x8A,// 0X8A + VOLATILE_FLAG_8B_SANDCASTLE_OPEN_FP,// 0X8B + VOLATILE_FLAG_8C_SANDCASTLE_OPEN_MMM,// 0X8C + VOLATILE_FLAG_8D_SANDCASTLE_REMOVE_CRYPT_GATE,// 0X8D + VOLATILE_FLAG_8E_SANDCASTLE_REMOVE_CRYPT_COFFIN_LID,// 0X8E + VOLATILE_FLAG_8F_SANDCASTLE_REMOVE_GRATE_NEAR_WATER_SWITCH,// 0X8F + VOLATILE_FLAG_90_SANDCASTLE_OPEN_RBB, - UNKFLAGS1_84_SANDCASTLE_OPEN_BGS = 0x84, + VOLATILE_FLAG_93_SANDCASTLE_OPEN_CCW = 0x93, + VOLATILE_FLAG_94_SANDCASTLE_INFINITE_HEALTH,// 0X94 + VOLATILE_FLAG_95_SANDCASTLE_INFINTE_MUMBO_TOKENS,// 0X95 + VOLATILE_FLAG_96_SANDCASTLE_INFINITE_AIR,// 0X96 + VOLATILE_FLAG_97_SANDCASTLE_BOTTLES_BONUS_1,// 0X97 + VOLATILE_FLAG_98_SANDCASTLE_BOTTLES_BONUS_2,// 0X98 + VOLATILE_FLAG_99_SANDCASTLE_BOTTLES_BONUS_3,// 0X99 + VOLATILE_FLAG_9A_SANDCASTLE_BOTTLES_BONUS_4,// 0X9A + VOLATILE_FLAG_9B_SANDCASTLE_BOTTLES_BONUS_5,// 0X9B + VOLATILE_FLAG_9C_SANDCASTLE_BOTTLES_BONUS_6,// 0X9C + VOLATILE_FLAG_9D_SANDCASTLE_WISHY_WASHY,// 0X9D - UNKFLAGS1_86_SANDCASTLE_SHOCKSPRING_JUMP_UNLOCKED = 0x86, - UNKFLAGS1_87_SANDCASTLE_OPEN_GV,// 0X87 - - UNKFLAGS1_8A_SANDCASTLE_FLIGHT_UNLOCKED = 0x8A,// 0X8A - UNKFLAGS1_8B_SANDCASTLE_OPEN_FP,// 0X8B - UNKFLAGS1_8C_SANDCASTLE_OPEN_MMM,// 0X8C - UNKFLAGS1_8D_SANDCASTLE_REMOVE_CRYPT_GATE,// 0X8D - UNKFLAGS1_8E_SANDCASTLE_REMOVE_CRYPT_COFFIN_LID,// 0X8E - UNKFLAGS1_8F_SANDCASTLE_REMOVE_GRATE_NEAR_WATER_SWITCH,// 0X8F - UNKFLAGS1_90_SANDCASTLE_OPEN_RBB, - - UNKFLAGS1_93_SANDCASTLE_OPEN_CCW = 0x93, - UNKFLAGS1_94_SANDCASTLE_INFINITE_HEALTH,// 0X94 - UNKFLAGS1_95_SANDCASTLE_INFINTE_MUMBO_TOKENS,// 0X95 - UNKFLAGS1_96_SANDCASTLE_INFINITE_AIR,// 0X96 - UNKFLAGS1_97_SANDCASTLE_BOTTLES_BONUS_1,// 0X97 - UNKFLAGS1_98_SANDCASTLE_BOTTLES_BONUS_2,// 0X98 - UNKFLAGS1_99_SANDCASTLE_BOTTLES_BONUS_3,// 0X99 - UNKFLAGS1_9A_SANDCASTLE_BOTTLES_BONUS_4,// 0X9A - UNKFLAGS1_9B_SANDCASTLE_BOTTLES_BONUS_5,// 0X9B - UNKFLAGS1_9C_SANDCASTLE_BOTTLES_BONUS_6,// 0X9C - UNKFLAGS1_9D_SANDCASTLE_WISHY_WASHY,// 0X9D - - UNKFLAGS1_C0_BEGIN_FINAL_CHARACTER_PARADE = 0xC0, - UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE + VOLATILE_FLAG_C0_BEGIN_FINAL_CHARACTER_PARADE = 0xC0, + VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE, + VOLATILE_FLAG_C2_UNUSED, + VOLATILE_FLAG_C3, // unk + VOLATILE_FLAG_C4_WOZZA_HIDE_IN_SNS_PARADE }; enum level_flags_e @@ -4691,4 +4712,10 @@ enum nc_first_person_state{ FIRSTPERSON_STATE_4_DONE }; +enum marker_collision_func_type_e { + MARKER_COLLISION_FUNC_0, // active? + MARKER_COLLISION_FUNC_1, // passive? + MARKER_COLLISION_FUNC_2_DIE +}; + #endif diff --git a/include/functions.h b/include/functions.h index 133b94f7..d88535d9 100644 --- a/include/functions.h +++ b/include/functions.h @@ -20,6 +20,8 @@ #include "bsint.h" #include "generic.h" +#include "enums.h" + extern f32 fabsf(f32); #pragma intrinsic (fabsf) @@ -561,5 +563,8 @@ extern void spawnableActorList_add(ActorInfo *arg0, Actor *(*arg1)(s32[3], s32, extern void spawnableActorList_addIfMapVisited(ActorInfo *arg0, Actor *(*arg1)(s32[3], s32, ActorInfo *, u32), u32 arg2, enum map_e arg3); extern void marker_setActorUpdateFunc(ActorMarker *marker, ActorUpdateFunc method); extern void marker_setActorUpdate2Func(ActorMarker *marker, ActorUpdateFunc method); +extern void marker_callCollisionFunc(ActorMarker *, ActorMarker *, enum marker_collision_func_type_e); +extern enum marker_collision_func_type_e func_8033D574(struct5Cs *arg0); +extern s32 volatileFlag_get(s32); // get volatile flag #endif diff --git a/include/prop.h b/include/prop.h index 7b3f6b7f..6f4ddde7 100644 --- a/include/prop.h +++ b/include/prop.h @@ -217,7 +217,7 @@ typedef struct actor_s{ }; //u8 padAC[0x44]; - f32 unkEC; //animCtrl??? + f32 stored_animctrl_timer; // animCtrlTimer f32 stored_animctrl_duration; //animCtrlDuration u32 unkF4_31:1; u32 unkF4_30:1; // has something to do with vertices @@ -303,7 +303,7 @@ typedef struct actor_info_s{ s16 startAnimation; ActorAnimationInfo* animations; void (* update_func)(Actor *); - void (* unk10)(Actor *); + void (* update2_func)(Actor *); Actor* (* draw_func)(ActorMarker *, Gfx **, Mtx **, Vtx **); u16 unk18; u16 draw_distance; diff --git a/src/BGS/ch/code_2270.c b/src/BGS/ch/code_2270.c index e978adb2..a6b2cce0 100644 --- a/src/BGS/ch/code_2270.c +++ b/src/BGS/ch/code_2270.c @@ -111,10 +111,10 @@ void func_80388848(ActorMarker *this){ if(sp1C != ++unqPtr->unk0) return; - 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{ BGS_func_80388660(thisActor->marker); @@ -173,12 +173,12 @@ void BGS_func_803888E4(Actor *this, s32 arg1){ }//L80388B7C timed_exitStaticCamera(tmpf += 2.5); - if(!unqPtr->unkA && !func_803203FC(2)){ + if(!unqPtr->unkA && !volatileFlag_get(VOLATILE_FLAG_2)){ func_80324DBC(tmpf + 0.5, 0xc73, 0xe, this->position, this->marker, func_80388784, 0); unqPtr->unkA = 1; } func_80324E38(sp54 = tmpf + 0.6, 0); - if(func_803203FC(2)){ + if(volatileFlag_get(VOLATILE_FLAG_2)){ timedFunc_set_1(sp54, (GenFunction_1)func_803886F4, reinterpret_cast(s32, this->marker)); }else{ this->state = 0x05; @@ -243,7 +243,7 @@ void func_80388E94(ActorMarker *this, s32 arg1){ else{ func_8028F55C(1, thisActor->marker); timedFunc_set_0(0.5f, BGS_func_80388760); - if(!mapSpecificFlags_get(1) && !func_803203FC(2) && func_80311480(0xc75, 0, NULL, NULL, NULL, NULL)) + if(!mapSpecificFlags_get(1) && !volatileFlag_get(VOLATILE_FLAG_2) && func_80311480(0xc75, 0, NULL, NULL, NULL, NULL)) mapSpecificFlags_set(1,TRUE); } } @@ -292,12 +292,12 @@ void func_80389080(Actor *this){ unqPtr->unkA = fileProgressFlag_getN(0,2); unqPtr->unkB = 0; unqPtr->unkC = 0.0f; - if(func_803203FC(2)){ + if(volatileFlag_get(VOLATILE_FLAG_2)){ unqPtr->unkA = 3; this->position_y = this->position_y - 300.0f; } BGS_func_803888E4(this, 1); - if(jiggyscore_isSpawned(JIGGY_27_BGS_TIPTUP) && !func_803203FC(2) && !func_803203FC(1)) + if(jiggyscore_isSpawned(JIGGY_27_BGS_TIPTUP) && !volatileFlag_get(VOLATILE_FLAG_2) && !volatileFlag_get(VOLATILE_FLAG_1)) marker_despawn(this->marker); } else{ @@ -312,8 +312,8 @@ void func_80389080(Actor *this){ func_80258A4C(this->position, this->yaw - 90.0f, player_position, &sp38, &sp34, &sp30); this->yaw = this->yaw + 5.0f*sp30; if(this->state == 1){ - if(func_803203FC(2)){ - if(func_803203FC(3)){ + if(volatileFlag_get(VOLATILE_FLAG_2)){ + if(volatileFlag_get(VOLATILE_FLAG_3)){ func_80324E38(0.0f,0); BGS_func_803888E4(this, 3); } @@ -325,11 +325,11 @@ void func_80389080(Actor *this){ } } if(this->state == 5){ - if(func_803203FC(2)){ + if(volatileFlag_get(VOLATILE_FLAG_2)){ if(item_empty(ITEM_0_HOURGLASS_TIMER)){ item_set(ITEM_6_HOURGLASS,1); - func_803204E4(3,0); - func_803204E4(5,0); + volatileFlag_set(3,0); + volatileFlag_set(5,0); } } //L80389370 else{ diff --git a/src/BGS/ch/flibbit.c b/src/BGS/ch/flibbit.c index 183cb32f..5b900306 100644 --- a/src/BGS/ch/flibbit.c +++ b/src/BGS/ch/flibbit.c @@ -154,7 +154,7 @@ bool func_80386A34(Actor * this){ f32 plyrPos[3]; bool out; - if(func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)) + if(volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)) return 0; player_getPosition(plyrPos); diff --git a/src/BGS/code_3030.c b/src/BGS/code_3030.c index 9fb1de67..86a42d51 100644 --- a/src/BGS/code_3030.c +++ b/src/BGS/code_3030.c @@ -80,7 +80,7 @@ void func_80389668(Actor *this) { local->tiptup_marker = NULL; local->unk8 = 1.0f; func_80389488(this, 1); - if (jiggyscore_isSpawned(JIGGY_27_BGS_TIPTUP) && !func_803203FC(2) && !func_803203FC(1)) { + if (jiggyscore_isSpawned(JIGGY_27_BGS_TIPTUP) && !volatileFlag_get(VOLATILE_FLAG_2) && !volatileFlag_get(VOLATILE_FLAG_1)) { marker_despawn(this->marker); } return; diff --git a/src/BGS/code_3420.c b/src/BGS/code_3420.c index 4fcdf6e1..1e1c44b3 100644 --- a/src/BGS/code_3420.c +++ b/src/BGS/code_3420.c @@ -362,7 +362,7 @@ void func_8038A068(Actor *this, s32 next_state) { local->current_type = YUMBLIE; local->player_score = 0; local->vile_score = 0; - if (func_803203FC(2) != 0) { + if (volatileFlag_get(VOLATILE_FLAG_2) != 0) { local->type_change_timer = 5.0f; } else { local->type_change_timer = 10.0f; @@ -640,7 +640,7 @@ void chvilegame_update(Actor *this) { local->unkC = 3; local->unkD = 3; } - if (func_803203FC(2)) { + if (volatileFlag_get(VOLATILE_FLAG_2)) { local->unkC = 2; local->unkD = 3; } @@ -651,8 +651,8 @@ void chvilegame_update(Actor *this) { local->vile_marker = actorArray_findClosestActorFromActorId(this->position, 0x13A, -1, &sp4C)->marker; } if (this->state == 1) { - if (func_803203FC(2)) { - if (func_803203FC(3)) { + if (volatileFlag_get(VOLATILE_FLAG_2)) { + if (volatileFlag_get(VOLATILE_FLAG_3)) { func_8038A068(this, 5); } } else if (func_8038C2A8(local->vile_marker)) { @@ -670,7 +670,7 @@ void chvilegame_update(Actor *this) { if ((local->unkC == 3) || (local->unkC == 6)) { if (ml_timer_update(&local->type_change_timer, sp50)) { local->current_type = !local->current_type; - if (func_803203FC(2)) { + if (volatileFlag_get(VOLATILE_FLAG_2)) { local->type_change_timer = 5.0f; } else { local->type_change_timer = 10.0f; @@ -691,9 +691,9 @@ void chvilegame_update(Actor *this) { itemPrint_reset(); } if (item_empty(ITEM_6_HOURGLASS)) { - if (func_803203FC(2)) { - func_803204E4(3, 0); - func_803204E4(5, ( local->vile_score < local->player_score) ? TRUE : FALSE); + if (volatileFlag_get(VOLATILE_FLAG_2)) { + volatileFlag_set(3, 0); + volatileFlag_set(5, ( local->vile_score < local->player_score) ? TRUE : FALSE); func_8038A068(this, 1); } else if (local->vile_score < local->player_score) { if (local->unkC == 3) { diff --git a/src/CCW/ch/vacationtexttrigger.c b/src/CCW/ch/vacationtexttrigger.c index bc4722e8..16ad4dea 100644 --- a/src/CCW/ch/vacationtexttrigger.c +++ b/src/CCW/ch/vacationtexttrigger.c @@ -30,7 +30,7 @@ static bool __playerIsWithinTrigger(s32 x, s32 z, s32 distance) { void chVacationTextTrigger_update(Actor* this) { // Despawn if already triggered - if (func_803203FC(UNKFLAGS1_13_HAS_TRIGGERED_MUMBO_VACATION_TEXT)) { + if (volatileFlag_get(VOLATILE_FLAG_13_HAS_TRIGGERED_MUMBO_VACATION_TEXT)) { marker_despawn(this->marker); return; } @@ -38,6 +38,6 @@ void chVacationTextTrigger_update(Actor* this) { // Start dialog if player is within trigger if (__playerIsWithinTrigger(0, -107, 188) != 0) { func_80311480(0xDA9, 4, NULL, NULL, NULL, NULL); - func_803204E4(UNKFLAGS1_13_HAS_TRIGGERED_MUMBO_VACATION_TEXT, 1); + volatileFlag_set(VOLATILE_FLAG_13_HAS_TRIGGERED_MUMBO_VACATION_TEXT, 1); } } diff --git a/src/CCW/code_160.c b/src/CCW/code_160.c index 6f43cb4b..e99b950a 100644 --- a/src/CCW/code_160.c +++ b/src/CCW/code_160.c @@ -41,7 +41,7 @@ void func_803865F4(Actor *this, s32 next_state) { local = (ActorLocal_CCW_160 *)&this->local; local->unkC = 0.0f; if (next_state == 2) { - if (!func_80320454(0xB5, 1)) { + if (!volatileFlag_getAndSet(0xB5, 1)) { func_80311480(0xCE2, 4, NULL, this->marker, func_803865C4, NULL); } else { func_80311480(0xCE3, 4, NULL, NULL, NULL, NULL); @@ -57,10 +57,10 @@ void func_803865F4(Actor *this, s32 next_state) { } if (next_state == 4) { - if (func_803203FC(2)) { + if (volatileFlag_get(VOLATILE_FLAG_2)) { item_set(ITEM_6_HOURGLASS, FALSE); - func_803204E4(3, 0); - func_803204E4(5, 1); + volatileFlag_set(3, 0); + volatileFlag_set(5, 1); } else { func_80311480(0xCE4, 4, NULL, NULL, NULL, NULL); func_8025A58C(-1, 400); @@ -133,7 +133,7 @@ void func_8038687C(Actor *this) { local->unk4 = 0; local->unk8 = 0; local->unkC = 0.0f; - if (func_803203FC(2)) { + if (volatileFlag_get(VOLATILE_FLAG_2)) { this->position_y -= 300.0f; } func_803865F4(this, 1); @@ -141,7 +141,7 @@ void func_8038687C(Actor *this) { } if ((s32)local->unk0 == 1) { other = actorArray_findActorFromActorId(0x46); - if(func_803203FC(2)) { + if(volatileFlag_get(VOLATILE_FLAG_2)) { local->unk0 = NULL; if (other != NULL) { actor_collisionOff(other); @@ -198,7 +198,7 @@ void func_8038687C(Actor *this) { local->unkC = randf2(0.5 - ((local->unk8 / 10) * 0.4), 1.0 - ((local->unk8 / 10) * 0.8)); } if (this->state == 1) { - if (func_803203FC(2) && func_803203FC(3)) { + if (volatileFlag_get(VOLATILE_FLAG_2) && volatileFlag_get(VOLATILE_FLAG_3)) { item_set(ITEM_6_HOURGLASS, 1); item_set(ITEM_0_HOURGLASS_TIMER, 1800 - 1); func_803865F4(this, 3); @@ -209,9 +209,9 @@ void func_8038687C(Actor *this) { } } } - if ((this->state == 3) && func_803203FC(2) && item_empty(ITEM_0_HOURGLASS_TIMER)) { + if ((this->state == 3) && volatileFlag_get(VOLATILE_FLAG_2) && item_empty(ITEM_0_HOURGLASS_TIMER)) { item_set(ITEM_6_HOURGLASS, 0); - func_803204E4(3, 0); - func_803204E4(5, 0); + volatileFlag_set(3, 0); + volatileFlag_set(5, 0); } } diff --git a/src/CCW/code_3DA0.c b/src/CCW/code_3DA0.c index 46471686..7af28c59 100644 --- a/src/CCW/code_3DA0.c +++ b/src/CCW/code_3DA0.c @@ -152,9 +152,9 @@ void chcaterpillar_update(Actor *this){ if(ml_distance_vec3f(this->position, sp74) < 50.0f){ func_8028F030(ACTOR_2A2_CATERPILLAR); - if(!func_803203FC(0xb2)){ + if(!volatileFlag_get(0xb2)){ func_80311480(0xcc7, 4, NULL, NULL, NULL, NULL); - func_803204E4(0xb2, TRUE); + volatileFlag_set(0xb2, TRUE); } FUNC_8030E8B4(SFX_C5_TWINKLY_POP, 1.0f, 25000, this->position, 0x1f4, 0x9c4); marker_despawn(this->marker); diff --git a/src/CCW/code_4530.c b/src/CCW/code_4530.c index efe249e0..994ad025 100644 --- a/src/CCW/code_4530.c +++ b/src/CCW/code_4530.c @@ -80,7 +80,7 @@ void func_8038AA8C(Actor *this) { this->unk16C_4 = TRUE; mapSpecificFlags_set(5, FALSE); if( (!fileProgressFlag_get(FILEPROG_E8_AUTMN_EYRIE_FED) || jiggyscore_isSpawned(JIGGY_49_CCW_EYRIE)) - && !func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE) + && !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE) ) { marker_despawn(this->marker); } diff --git a/src/FP/ch/bearcub.c b/src/FP/ch/bearcub.c index 3df5de82..702bf4db 100644 --- a/src/FP/ch/bearcub.c +++ b/src/FP/ch/bearcub.c @@ -109,7 +109,7 @@ void func_8038A384(Actor *this){ }//L8038A4A0 if( jiggyscore_isCollected(JIGGY_2E_FP_PRESENTS) - || func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) + || volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) ){ subaddie_set_state_with_direction(this, 2, randf2(0.0f, 0.9f), 1); } diff --git a/src/FP/ch/boggy1.c b/src/FP/ch/boggy1.c index d1c4101a..4ce57932 100644 --- a/src/FP/ch/boggy1.c +++ b/src/FP/ch/boggy1.c @@ -115,7 +115,7 @@ void func_8038794C(Actor *this){ this->unk38_31 = 1; ml_vec3f_copy(this->velocity, this->position); - if(func_803203FC(1)) + if(volatileFlag_get(VOLATILE_FLAG_1)) return; if(!jiggyscore_isCollected(JIGGY_2A_FP_BOGGY_1) && jiggyscore_isSpawned(JIGGY_2A_FP_BOGGY_1)){ diff --git a/src/FP/ch/boggy2.c b/src/FP/ch/boggy2.c index 9b2bc779..3a94172b 100644 --- a/src/FP/ch/boggy2.c +++ b/src/FP/ch/boggy2.c @@ -143,9 +143,9 @@ void func_80388B18(Actor *this, u8 arg1){ } } else{//L80388BB8 - if(!func_803203FC(0xb3)){ + if(!volatileFlag_get(0xb3)){ if(func_80311480(0xc01, 0xe, this->position, this->marker, func_80388D70, NULL)){ - func_803204E4(0xb3, TRUE); + volatileFlag_set(0xb3, TRUE); func_80388A50(this); } } @@ -153,9 +153,9 @@ void func_80388B18(Actor *this, u8 arg1){ } else{//L80388C08 if(player_getTransformation() == TRANSFORM_4_WALRUS){ - if(!func_803203FC(0xb4)){ + if(!volatileFlag_get(0xb4)){ if(func_80311480(0xc08, 0xe, this->position, this->marker, func_80388D70, NULL)){ - func_803204E4(0xb4, TRUE); + volatileFlag_set(0xb4, TRUE); func_80388A50(this); } } @@ -476,13 +476,13 @@ void func_803896FC(Actor *this){ ){ if( local->unk19 == 1 && player_getTransformation() != TRANSFORM_4_WALRUS - && func_803203FC(0xb3) + && volatileFlag_get(0xb3) ){ func_80311480(0xC01, 0xf, this->position, this->marker, func_80388D70, NULL); } else if( local->unk19 == 2){ if( player_getTransformation() == TRANSFORM_4_WALRUS - && func_803203FC(0xb4) + && volatileFlag_get(0xb4) ){ func_80311480(0xC08, 0xf, this->position, this->marker, func_80388D70, NULL); } diff --git a/src/FP/ch/cavewozza.c b/src/FP/ch/cavewozza.c index 8d564fad..12b433dd 100644 --- a/src/FP/ch/cavewozza.c +++ b/src/FP/ch/cavewozza.c @@ -20,7 +20,7 @@ extern ActorInfo D_80392700 = { MARKER_20F_WOZZA_IN_CAVE, ACTOR_33F_WOZZA_IN_CAV /* .code */ void func_80390630(Actor *this){ - if(func_803203FC(0xC4)){ + if(volatileFlag_get(VOLATILE_FLAG_C4_WOZZA_HIDE_IN_SNS_PARADE)){ if(!this->unk16C_4){ this->unk16C_4 = TRUE; this->marker->propPtr->unk8_3 = FALSE; diff --git a/src/FP/ch/twinkly.c b/src/FP/ch/twinkly.c index c55022ba..64ce2a07 100644 --- a/src/FP/ch/twinkly.c +++ b/src/FP/ch/twinkly.c @@ -242,7 +242,7 @@ void func_8038C8F0(ActorMarker *marker){ void func_8038C94C(ActorMarker *caller, enum asset_e text_id, s32 arg2){ Actor *this = marker_getActor(caller); - if(!func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)){ + if(!volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)){ subaddie_set_state(this, 6); __spawnQueue_add_1((GenFunction_1)func_8038C8F0, reinterpret_cast(s32, this->marker)); } diff --git a/src/FP/ch/twinklybox.c b/src/FP/ch/twinklybox.c index 7fdd4066..d8de5ab2 100644 --- a/src/FP/ch/twinklybox.c +++ b/src/FP/ch/twinklybox.c @@ -302,14 +302,14 @@ void func_8038D6C8(Actor *this){ this->velocity[1] = 0.0f; this->unk1C[0] = -1.0f; func_8028F8F8(7, FALSE); - if(func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) && gcparade_8031B4F4() == -1){ + if(volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) && gcparade_8031B4F4() == -1){ subaddie_set_state_with_direction(this, 3, 0.001f, 1); actor_playAnimationOnce(this); this->velocity[0] = 1.0f; } }//L8038D844 - if(func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)){ + if(volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)){ this->velocity[0] = 1.0f; } diff --git a/src/FP/ch/twinklymuncher.c b/src/FP/ch/twinklymuncher.c index 40acd2c6..a5bc0925 100644 --- a/src/FP/ch/twinklymuncher.c +++ b/src/FP/ch/twinklymuncher.c @@ -112,7 +112,7 @@ void func_8038E094(Actor *this){ func_8038DDC8(this); } if(this->unkF4_8 == 2){ - if(func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) && gcparade_8031B4F4() == -2){ + if(volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) && gcparade_8031B4F4() == -2){ func_8038DDC8(this); } else{ diff --git a/src/FP/ch/wozza.c b/src/FP/ch/wozza.c index e6f0bd99..95c5a094 100644 --- a/src/FP/ch/wozza.c +++ b/src/FP/ch/wozza.c @@ -172,7 +172,7 @@ void FP_func_8038F758(ActorMarker *marker){ void FP_func_8038F7AC(Actor *this){ ActorLocal_Wozza * local = (ActorLocal_Wozza *)&this->local; - if(func_803203FC(0xC4)){ + if(volatileFlag_get(VOLATILE_FLAG_C4_WOZZA_HIDE_IN_SNS_PARADE)){ if(!this->unk16C_4){ this->unk16C_4 = TRUE; this->marker->propPtr->unk8_3 = FALSE; @@ -228,7 +228,7 @@ void FP_func_8038F7AC(Actor *this){ break; } - if(func_80329530(this, 1000) && !func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)){ + if(func_80329530(this, 1000) && !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)){ func_8038F454(this); break; } diff --git a/src/FP/ch/xmastree.c b/src/FP/ch/xmastree.c index c68dd31f..76ad7a8b 100644 --- a/src/FP/ch/xmastree.c +++ b/src/FP/ch/xmastree.c @@ -42,7 +42,7 @@ void __chXmasTree_80386EF4(Actor *this, int arg1){ void __chXmasTree_80386F3C(void){ levelSpecificFlags_set(0x29, TRUE); func_803228D8(); - func_803204E4(0xe, 1); + volatileFlag_set(0xe, 1); func_802E4078(MAP_53_FP_CHRISTMAS_TREE, 1, 0); } diff --git a/src/GV/ch/gobi1.c b/src/GV/ch/gobi1.c index de7f400c..3ec32a72 100644 --- a/src/GV/ch/gobi1.c +++ b/src/GV/ch/gobi1.c @@ -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; diff --git a/src/GV/ch/gobirock.c b/src/GV/ch/gobirock.c index bf8b4e5a..cdc4d298 100644 --- a/src/GV/ch/gobirock.c +++ b/src/GV/ch/gobirock.c @@ -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); } } diff --git a/src/GV/ch/gobirope.c b/src/GV/ch/gobirope.c index 93b05b34..40c8af23 100644 --- a/src/GV/ch/gobirope.c +++ b/src/GV/ch/gobirope.c @@ -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); } diff --git a/src/GV/ch/histup.c b/src/GV/ch/histup.c index d5c81e1c..db1379d1 100644 --- a/src/GV/ch/histup.c +++ b/src/GV/ch/histup.c @@ -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); diff --git a/src/GV/ch/trunker.c b/src/GV/ch/trunker.c index 9c4ba2b7..2d2be41d 100644 --- a/src/GV/ch/trunker.c +++ b/src/GV/ch/trunker.c @@ -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 diff --git a/src/GV/code_7060.c b/src/GV/code_7060.c index 61f7bd63..d9c407d0 100644 --- a/src/GV/code_7060.c +++ b/src/GV/code_7060.c @@ -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); } } diff --git a/src/GV/matchinggame.c b/src/GV/matchinggame.c index e32bf72a..f03d032c 100644 --- a/src/GV/matchinggame.c +++ b/src/GV/matchinggame.c @@ -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); } diff --git a/src/GV/waterctrl.c b/src/GV/waterctrl.c index 02a91bad..c4c6bcd8 100644 --- a/src/GV/waterctrl.c +++ b/src/GV/waterctrl.c @@ -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); } } diff --git a/src/MM/ch/conga.c b/src/MM/ch/conga.c index 04eac78e..c10ad8b6 100644 --- a/src/MM/ch/conga.c +++ b/src/MM/ch/conga.c @@ -152,7 +152,7 @@ int func_803872EC(void){ return text_id == ASSET_B37_TEXT_CONGA_SAFE_UP_HERE || text_id == ASSET_B38_TEXT_CONGA_DEFEAT - || func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE) + || volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE) || text_id == ASSET_B3B_TEXT_CONGA_ORANGE_PAD_JIGGY || text_id == ASSET_B45_TEXT_JIGGY_COLLECT_10 || text_id == ASSET_B51_TEXT_BOTTLES_HOW_TO_EXIT_LEVEL; diff --git a/src/MMM/ch/napper.c b/src/MMM/ch/napper.c index cc05e8d6..32d7a320 100644 --- a/src/MMM/ch/napper.c +++ b/src/MMM/ch/napper.c @@ -175,7 +175,7 @@ void chnapper_update(Actor *this){ __chnapper_setState(this, 2); } - if(MMM_func_80389530() || func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)){ + if(MMM_func_80389530() || volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)){ __chnapper_setState(this, 3); } }//L80386F74 diff --git a/src/RBB/ch/anchorswitch.c b/src/RBB/ch/anchorswitch.c index 4b93ed84..67d70449 100644 --- a/src/RBB/ch/anchorswitch.c +++ b/src/RBB/ch/anchorswitch.c @@ -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); } diff --git a/src/RBB/ch/bossboombox.c b/src/RBB/ch/bossboombox.c index 2b8ce103..9a368d14 100644 --- a/src/RBB/ch/bossboombox.c +++ b/src/RBB/ch/bossboombox.c @@ -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); } } diff --git a/src/RBB/ch/bossboomboxctrl.c b/src/RBB/ch/bossboomboxctrl.c index 7d285fdc..6cc6f34c 100644 --- a/src/RBB/ch/bossboomboxctrl.c +++ b/src/RBB/ch/bossboomboxctrl.c @@ -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)); diff --git a/src/SM/ch/attacktutorial.c b/src/SM/ch/attacktutorial.c index bf569dc5..08ca4e08 100644 --- a/src/SM/ch/attacktutorial.c +++ b/src/SM/ch/attacktutorial.c @@ -132,7 +132,7 @@ void chAttackTutorial_update(Actor *this){ if(mapSpecificFlags_get(4)) chAttackTutorial_setState(this, 5); - if(func_803874C4() || func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)) + if(func_803874C4() || volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)) chAttackTutorial_setState(this, 4); break; case 2://L80387658 diff --git a/src/SM/ch/vegetables.c b/src/SM/ch/vegetables.c index 538949e3..3d2be419 100644 --- a/src/SM/ch/vegetables.c +++ b/src/SM/ch/vegetables.c @@ -246,7 +246,7 @@ void func_80387E64(Actor *this){ void func_80387F00(Actor *this){ ChVeg *local = (ChVeg *)&this->local; - this->position_y += (mapSpecificFlags_get(0xC) || func_803203FC(0xC1)) ? 120.0 : 180.0; + this->position_y += (mapSpecificFlags_get(0xC) || volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)) ? 120.0 : 180.0; local->unk0_x = this->position_x; local->unk0_y = this->position_y; local->unk0_z = this->position_z; @@ -329,9 +329,9 @@ void func_80388080(Actor *this){ switch (this->state) { case 1: //L803882B0 - if(mapSpecificFlags_get(0xC) || func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) || this->unk10_12){ + if(mapSpecificFlags_get(0xC) || volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) || this->unk10_12){ //L803882E4 - if(mapSpecificFlags_get(0xC) || func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)){ //L8038830C + if(mapSpecificFlags_get(0xC) || volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)){ //L8038830C this->unk1C_y += (local->unkC == 3)? 120.0 : 0.0; }else{//L80388350 this->unk1C_y += (local->unkC == 3)? 270.0 : 85.0; @@ -372,7 +372,7 @@ void func_80388080(Actor *this){ }else{//L80388520 if(local->unkC == 1){ this->unk28 = 3.0f; - if(mapSpecificFlags_get(0xC) || func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)){//L80388554 + if(mapSpecificFlags_get(0xC) || volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)){//L80388554 if(!func_80329030(this, 0) && func_80329480(this)){ func_80328CEC(this, (s32)this->yaw, 0x78, 0xb4); this->unk38_0 = 1; @@ -396,7 +396,7 @@ void func_80388080(Actor *this){ func_80328CEC(this, (s32)this->yaw, 0x78, 0xB4); this->unk38_0 = 1; }//L80388698 - if(mapSpecificFlags_get(0xC) || (func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) && func_803292E0(this))){ + if(mapSpecificFlags_get(0xC) || (volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) && func_803292E0(this))){ this->yaw_ideal = func_80329784(this); }else{//L803886E4 if(randf() < 0.02){//D_8038B1D0){ @@ -427,7 +427,7 @@ void func_80388080(Actor *this){ func_80387E64(this); } this->unk28 = 5.0f; - if(mapSpecificFlags_get(0xC) || (func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE))){ //L8038892C + if(mapSpecificFlags_get(0xC) || (volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE))){ //L8038892C if(!func_80387FA8(this, local, (s32)this->yaw, (s32)this->unk28)){ if(func_80329480(this)){ func_80328CEC(this, (s32)this->yaw, 0x78, 0xb4); diff --git a/src/SM/code_2990.c b/src/SM/code_2990.c index ec1642ee..352b315a 100644 --- a/src/SM/code_2990.c +++ b/src/SM/code_2990.c @@ -420,7 +420,7 @@ void chsmmole_Update(Actor * this){ this->unk28 = nodeprop_getRadius(sp40); }//L80389A8C if(this->unkF4_8 == 1){ - if(func_803203FC(1) || func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)){ + if(volatileFlag_get(VOLATILE_FLAG_1) || volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)){ func_80388FA0(this, 3); } } diff --git a/src/TTC/ch/clam.c b/src/TTC/ch/clam.c index db1b4d0c..3f9b864f 100644 --- a/src/TTC/ch/clam.c +++ b/src/TTC/ch/clam.c @@ -85,8 +85,8 @@ bool __chClam_updateTarget(Actor *this, f32 arg1) { this->unk28 = phi_f2 / arg1; this->yaw_ideal = func_80257204(this->position[0], this->position[2], target_position[0], target_position[2]); - if ((func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) ? 0 : 0x11) < this->unk28) { - this->unk28 = (func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) != 0) ? 0.0f : 17.0f; + if ((volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) ? 0 : 0x11) < this->unk28) { + this->unk28 = (volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) != 0) ? 0.0f : 17.0f; } else if (sp38 == 0) { __chClam_func_803863F0(SFX_AE_YUMYUM_TALKING, randf2(0.9f, 1.0f), 22000, this->position, 500.0f, 2000.0f); } @@ -108,13 +108,13 @@ bool __chClam_rotateTowardTarget(Actor *this, s32 arg1) { if (((f64) animctrl_getAnimTimer(this->animctrl) < 0.1) && ((f64) randf() < 0.5)) { if (this->unk1C[0] != 0.0f) { arg1 *= 2; - this->unk28 = (f32) randi2(0, 0.5*(func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) ? 0 : 0x11)); + this->unk28 = (f32) randi2(0, 0.5*(volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) ? 0 : 0x11)); this->yaw_ideal += (f32) randi2(-arg1, arg1); } else if ((f64) randf() < 0.4) { this->unk28 = 0.0f; this->yaw_ideal += (f32) randi2(-arg1, arg1); } else { - this->unk28 = (f32) randi2(0.33 * (func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) ? 0 : 0x11), func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) ? 0 : 0x11); + this->unk28 = (f32) randi2(0.33 * (volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) ? 0 : 0x11), volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) ? 0 : 0x11); this->yaw_ideal = this->yaw; } this->unk1C[0] = 0.0f; diff --git a/src/TTC/ch/treasure.c b/src/TTC/ch/treasure.c index dab5530f..6547d480 100644 --- a/src/TTC/ch/treasure.c +++ b/src/TTC/ch/treasure.c @@ -48,7 +48,7 @@ void chtreasure_update(Actor *this){ if(!this->initialized){ this->initialized = TRUE; - if(this->unkF4_8 == 1 && !func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)){ + if(this->unkF4_8 == 1 && !volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)){ marker_despawn(this->marker); return; } diff --git a/src/TTC/code_3E30.c b/src/TTC/code_3E30.c index 9c184e86..5f657dac 100644 --- a/src/TTC/code_3E30.c +++ b/src/TTC/code_3E30.c @@ -116,7 +116,7 @@ void func_8038A23C( s32 arg0, BKVtxRef *vtx_ref, Vtx *vtx, s32 arg2){ void func_8038A258(s32 arg0) { if (arg0 == 1) { - if (func_803203FC(2)) { + if (volatileFlag_get(VOLATILE_FLAG_2)) { item_set(ITEM_0_HOURGLASS_TIMER, 3000 - 1); } else { item_set(ITEM_0_HOURGLASS_TIMER, 6000 - 1); @@ -247,14 +247,14 @@ void func_8038ABA0(u32 arg0){ if(arg0 & 0x400){ func_80356560(0xC5); } - func_803204E4(0x78, 0); + volatileFlag_set(0x78, 0); for(i = 4; i < 0xb; i++){ if( arg0 & (1 << i)){ - func_803204E4(0x93 + i, TRUE); - func_803204E4(0x78, TRUE); + volatileFlag_set(0x93 + i, TRUE); + volatileFlag_set(0x78, TRUE); } else{ - func_803204E4(0x93 + i, FALSE); + volatileFlag_set(0x93 + i, FALSE); } } } @@ -269,7 +269,7 @@ void func_8038AC48(LetterFloorTile *arg0) { s32 phi_s1; bool phi_s7; - temp_s5 = func_803203FC(2); + temp_s5 = volatileFlag_get(VOLATILE_FLAG_2); phi_s7 = FALSE; sp3C = func_8038BD10(arg0); for(i_ptr = codesTable; i_ptr->code != 0; i_ptr++){ @@ -284,7 +284,7 @@ void func_8038AC48(LetterFloorTile *arg0) { phi_s1 |= (0x10 << i); } }; - if (func_803203FC(0x78)) { + if (volatileFlag_get(0x78)) { phi_s1 |= 0x800; } } @@ -310,8 +310,8 @@ void func_8038AC48(LetterFloorTile *arg0) { if (temp_s5) { item_set(ITEM_6_HOURGLASS, FALSE); - func_803204E4(3, 0); - func_803204E4(5, 1); + volatileFlag_set(3, 0); + volatileFlag_set(5, 1); func_8038A258(2); } else { var_v0 = i_ptr->unk4; @@ -366,7 +366,7 @@ void func_8038AFC8(void){ iPtr->unk6 = 0; } - if(func_803203FC(2)) + if(volatileFlag_get(VOLATILE_FLAG_2)) strcpy(codesTable[0].code, "j4663n86pink"); //EIOOZAKOJNAB else strcpy(codesTable[0].code, "knip68n3664j"); //BANJOKAZOOIE @@ -410,7 +410,7 @@ void func_8038B094(void){ func_803228D8(); timedFunc_set_3(2.0f, (GenFunction_3) func_802E4078, MAP_7_TTC_TREASURE_TROVE_COVE, 1, 0); } - else if(levelSpecificFlags_get(2) || func_803203FC(2)){ + else if(levelSpecificFlags_get(2) || volatileFlag_get(VOLATILE_FLAG_2)){ func_8034E71C(sp2C, -500, 0.0f); } else{ @@ -437,7 +437,7 @@ void func_8038B094(void){ func_8038AFC8(); if( jiggyscore_isCollected(JIGGY_10_TTC_SANDCASTLE) - && !func_803203FC(2) + && !volatileFlag_get(VOLATILE_FLAG_2) ){ BKModel_transformMesh(D_8038D720.model2, 0x3C, func_8038A23C, 0); D_8038D720.unk8 = 3; @@ -461,20 +461,20 @@ void func_8038B2F0(void) { if (D_8038D720.model1 != 0) { func_8038AA2C(); player_getPosition(sp2C); - if ((D_8038D720.unk10 == 0) && func_803203FC(2) && func_803203FC(3)) { + if ((D_8038D720.unk10 == 0) && volatileFlag_get(VOLATILE_FLAG_2) && volatileFlag_get(VOLATILE_FLAG_3)) { func_8038A258(1); } if ((D_8038D720.unk10 == 1) && item_empty(ITEM_0_HOURGLASS_TIMER)) { func_8038A258(2); - if (func_803203FC(2)) { - func_803204E4(3, FALSE); - func_803204E4(5, FALSE); + if (volatileFlag_get(VOLATILE_FLAG_2)) { + volatileFlag_set(3, FALSE); + volatileFlag_set(5, FALSE); } else { func_8028F66C(BS_INTR_F); } } if ((D_8038D720.unk8 == 0) || (D_8038D720.unk8 == 3)) { - if( (levelSpecificFlags_get(2) || func_803203FC(3)) + if( (levelSpecificFlags_get(2) || volatileFlag_get(VOLATILE_FLAG_3)) && (player_getActiveHitbox(0) == HITBOX_1_BEAK_BUSTER) && func_8028F20C() ) { @@ -483,7 +483,7 @@ void func_8038B2F0(void) { temp_v0_3 = func_8038A2DC(mesh_id); if ((temp_v0_3 != NULL) && ((temp_v0_3->unk3 == 2) || (D_8038D720.unk8 == 3))) { func_8038AC48(temp_v0_3); - if ((D_8038D720.unk8 == 0) && (D_8038D720.unk10 == 0) && (func_803203FC(2) == 0)) { + if ((D_8038D720.unk8 == 0) && (D_8038D720.unk10 == 0) && (volatileFlag_get(VOLATILE_FLAG_2) == 0)) { func_8038A258(1); } } @@ -613,7 +613,7 @@ u32 func_8038B600(void) { } void TTC_func_8038B6D4(s32 arg0, s32 secretCodeIndex, s32 arg2, enum file_progress_e prog_id, s32 prog_val, s32 prog_bit_size, enum file_progress_e arg6){ - if( ((arg2 + 20 == secretCodesTable[secretCodeIndex].id) && func_803203FC(arg2)) + if( ((arg2 + 20 == secretCodesTable[secretCodeIndex].id) && volatileFlag_get(arg2)) || arg0 == 3 ){ fileProgressFlag_setN(prog_id, prog_val, prog_bit_size); @@ -657,8 +657,8 @@ void func_8038B800(s32 secretCodeIndex) { func_8038B564(secretCodeIndex, 7, MAP_7F_FP_WOZZAS_CAVE, 0x89, 0x21); if (secretCode->id >= 0x14) { func_8030E58C(SFX_2B_BULL_MOO_1, 1.5f); - func_803204E4(0x65, 1); - func_803204E4(sp38, 1); + volatileFlag_set(0x65, 1); + volatileFlag_set(sp38, 1); } TTC_func_8038B6D4(0, secretCodeIndex, 0x6C, FILEPROG_60_CC_PUZZLE_PIECES_PLACED, 5, 3, FILEPROG_33_CC_OPEN); TTC_func_8038B6D4(0, secretCodeIndex, 0x6D, FILEPROG_63_BGS_PUZZLE_PIECES_PLACED, 7, 3, FILEPROG_34_BGS_OPEN); @@ -694,7 +694,7 @@ void TTC_func_8038BBA0(s32 secretCodeIndex) { s32 i; if ((s32) secretCodesTable[secretCodeIndex].id >= 0x14) { - if (func_803203FC(secretCodesTable[secretCodeIndex].id - 0x14)) { + if (volatileFlag_get(secretCodesTable[secretCodeIndex].id - 0x14)) { func_8038B5B4(); return; } diff --git a/src/core1/code_0.c b/src/core1/code_0.c index fd93a3c0..0189642d 100644 --- a/src/core1/code_0.c +++ b/src/core1/code_0.c @@ -173,7 +173,7 @@ void mainLoop(void){ }//L8023DE54 if( !func_8032056C() || !levelSpecificFlags_validateCRC1() - || !func_80320240() + || !dummy_func_80320240() ){ s32 offset; //render weird CRC failure image diff --git a/src/core1/code_10A00.c b/src/core1/code_10A00.c index bf7d7209..4d9b0b2c 100644 --- a/src/core1/code_10A00.c +++ b/src/core1/code_10A00.c @@ -182,9 +182,9 @@ void pfsManager_update(void) { temp_t6 = demo_readInput(&pfsManagerContPadData, &sp5C) == 0; if ((D_802812D0.button & s0) || temp_t6) { if (D_802812D0.button & s0) { - func_803204E4(0x64, 1); + volatileFlag_set(0x64, 1); } else { - func_803204E4(0x63, 1); + volatileFlag_set(0x63, 1); } } func_8033DD04(sp5C); diff --git a/src/core1/code_CE60.c b/src/core1/code_CE60.c index d4ae6f9e..22650c06 100644 --- a/src/core1/code_CE60.c +++ b/src/core1/code_CE60.c @@ -181,8 +181,8 @@ void func_8024AF00(s32 arg0, s32 arg1){ void func_8024AF48(void){ if(!D_802806F4) return; - if(func_803203FC(1)) return; - if(func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) return; + if(volatileFlag_get(VOLATILE_FLAG_1)) return; + if(volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) return; if(func_802D686C()) return; if(func_8028F22C()) return; if(gctransition_8030BDC0()) return; diff --git a/src/core2/animcache.c b/src/core2/animcache.c index 5c008111..bc01671a 100644 --- a/src/core2/animcache.c +++ b/src/core2/animcache.c @@ -57,7 +57,7 @@ void animCache_flushAll(void){ for(i = 0; i<340; i++){ if(D_80379E20[i].alive){ - func_803203FC(0); + volatileFlag_get(VOLATILE_FLAG_0); D_80379E20[i].life = 0; boneTransformList_free(D_80379E20[i].bone_xform); D_80379E20[i].bone_xform = NULL; diff --git a/src/core2/ba/anim.c b/src/core2/ba/anim.c index beca5c24..d2624627 100644 --- a/src/core2/ba/anim.c +++ b/src/core2/ba/anim.c @@ -83,11 +83,11 @@ void __baanim_applyBottlesBonus(s32 arg0, s32 arg1) { sp28 = func_802E4B38(); - if (func_803203FC(UNKFLAGS1_78_SANDCASTLE_NO_BONUS) == 0) { + if (volatileFlag_get(VOLATILE_FLAG_78_SANDCASTLE_NO_BONUS) == 0) { D_8037BF4C = 0; } else { for(phi_s0 = 0; phi_s0 < 7; phi_s0++){ - if (func_803203FC(phi_s0 + UNKFLAGS1_97_SANDCASTLE_BOTTLES_BONUS_1)) { + if (volatileFlag_get(phi_s0 + VOLATILE_FLAG_97_SANDCASTLE_BOTTLES_BONUS_1)) { D_8037BF4C = D_803635EC[phi_s0]; } } diff --git a/src/core2/ba/marker.c b/src/core2/ba/marker.c index f255b6ef..af856924 100644 --- a/src/core2/ba/marker.c +++ b/src/core2/ba/marker.c @@ -205,10 +205,10 @@ void __baMarker_8028BB1C(s32 arg0, u32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 a if(arg1 & 0x400000){ sp24 = arg1 + 0xFFC00000; - if(!func_803203FC(sp24)){ - func_803204E4(sp24, 1); + if(!volatileFlag_get(sp24)){ + volatileFlag_set(sp24, 1); func_8030E6D4(SFX_90_SWITCH_PRESS); - func_803204E4(0xBF, 1); + volatileFlag_set(0xBF, 1); func_802D6264(1.0f, arg2, arg3, arg4, arg5, arg6); } } @@ -216,7 +216,7 @@ void __baMarker_8028BB1C(s32 arg0, u32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 a if(!fileProgressFlag_get(arg1)){ fileProgressFlag_set(arg1, 1); func_8030E6D4(SFX_90_SWITCH_PRESS); - func_803204E4(0xBF, 1); + volatileFlag_set(0xBF, 1); func_802D6264(1.0f, arg2, arg3, arg4, arg5, arg6); } } @@ -231,8 +231,8 @@ int __baMarker_8028BC60(void){ } void __baMarker_resolveCollision(Prop *other_prop){ - s32 plyr_collision_type; - s32 obj_collision_type; + enum marker_collision_func_type_e plyr_collision_type; + enum marker_collision_func_type_e obj_collision_type; s32 plyr_hitbox_type; int i; ActorMarker *marker; //0xbc @@ -253,8 +253,8 @@ void __baMarker_resolveCollision(Prop *other_prop){ s32 tmp1; if(*((u32*)(((u32)other_prop) + 8)) & 1){ - plyr_collision_type = 0; - obj_collision_type = 0; + plyr_collision_type = MARKER_COLLISION_FUNC_0; + obj_collision_type = MARKER_COLLISION_FUNC_0; marker = other_prop->actorProp.marker; actor = NULL; if(marker->unk3E_0){ @@ -273,12 +273,12 @@ void __baMarker_resolveCollision(Prop *other_prop){ switch(marker->id){ case 0x125: //L8028BE88 case 0x126: //L8028BE88 - obj_collision_type = 1; + obj_collision_type = MARKER_COLLISION_FUNC_1; break; - case 0x97: //L8028BE94 - plyr_collision_type = 1; - obj_collision_type = 1; + case MARKER_97_BOGGY_2: //L8028BE94 + plyr_collision_type = MARKER_COLLISION_FUNC_1; + obj_collision_type = MARKER_COLLISION_FUNC_1; break; case 0xBA: //L8028BEA8 @@ -289,7 +289,7 @@ void __baMarker_resolveCollision(Prop *other_prop){ || marker->unk40_31 == 5 || marker->unk40_31 == 6 ){ - obj_collision_type = 1; + obj_collision_type = MARKER_COLLISION_FUNC_1; } break; @@ -314,7 +314,7 @@ void __baMarker_resolveCollision(Prop *other_prop){ case 0xA1: //L8028BF54 if(plyr_hitbox_type == HITBOX_1_BEAK_BUSTER){ func_802A02B4(1); - obj_collision_type = 2; + obj_collision_type = MARKER_COLLISION_FUNC_2_DIE; } break; @@ -327,7 +327,7 @@ void __baMarker_resolveCollision(Prop *other_prop){ } if(plyr_hitbox_type != HITBOX_6_WONDERWING){ - plyr_collision_type = 2; + plyr_collision_type = MARKER_COLLISION_FUNC_2_DIE; } break; @@ -389,7 +389,7 @@ void __baMarker_resolveCollision(Prop *other_prop){ spAC[1] += 40.0f; if(func_802458E0(spAC, actor, 0x87) == 0) return; - func_803204E4(0x1E, 1); + volatileFlag_set(0x1E, 1); if(fileProgressFlag_get(((actor->unkF4_8 - 1) ^ 1) + 0x49)){ actor->unk10_12 = 2; } @@ -516,7 +516,7 @@ void __baMarker_resolveCollision(Prop *other_prop){ case MARKER_F3_GV_KAZOOIE_TARGET: //L8028C64C if(plyr_hitbox_type == HITBOX_3_BEAK_BOMB){ mapSpecificFlags_set(6,1); - obj_collision_type = 1; + obj_collision_type = MARKER_COLLISION_FUNC_1; } break; @@ -583,7 +583,7 @@ void __baMarker_resolveCollision(Prop *other_prop){ return; if( map_get() == MAP_8E_GL_FURNACE_FUN - && func_803203FC(0) + && volatileFlag_get(VOLATILE_FLAG_0) && !fileProgressFlag_get(FILEPROG_A6_FURNACE_FUN_COMPLETE) ){ func_80356540(FILEPROG_A6_FURNACE_FUN_COMPLETE); @@ -695,7 +695,7 @@ void __baMarker_resolveCollision(Prop *other_prop){ if(__baMarker_8028BC20(marker)) return; if( map_get() == MAP_8E_GL_FURNACE_FUN - && func_803203FC(0) + && volatileFlag_get(VOLATILE_FLAG_0) && !fileProgressFlag_get(FILEPROG_A6_FURNACE_FUN_COMPLETE) ){ func_80356540(FILEPROG_A7_NEAR_PUZZLE_PODIUM_TEXT); @@ -715,7 +715,7 @@ void __baMarker_resolveCollision(Prop *other_prop){ if(ability_isUnlocked(ABILITY_D_SHOCK_JUMP)){ miscflag_set(MISC_FLAG_2_ON_SPRING_PAD); }else{ - if(!func_80320454(0xC, 1)){ + if(!volatileFlag_getAndSet(0xC, 1)){ func_80311480(0xA24, 4, 0, 0, 0, 0); } } @@ -727,7 +727,7 @@ void __baMarker_resolveCollision(Prop *other_prop){ if(ability_isUnlocked(ABILITY_9_FLIGHT)){ miscflag_set(MISC_FLAG_1_ON_FLIGHT_PAD); } - else if(! func_80320454(0xD, 1)){ + else if(! volatileFlag_getAndSet(0xD, 1)){ func_80311480(0xA25, 4, 0, 0, 0, 0); } break; @@ -775,33 +775,33 @@ void __baMarker_resolveCollision(Prop *other_prop){ chtrainers_pickup(actor); break; - case 0x1AE: //L8028CFEC + case MARKER_1AE_ZUBBA: //L8028CFEC switch(plyr_hitbox_type){ case HITBOX_1_BEAK_BUSTER: case HITBOX_2_BEAK_BARGE: case HITBOX_5_PECK: case HITBOX_6_WONDERWING: - obj_collision_type = 2; + obj_collision_type = MARKER_COLLISION_FUNC_2_DIE; break; default: - plyr_collision_type = 2; + plyr_collision_type = MARKER_COLLISION_FUNC_2_DIE; break; } break; case MARKER_1B1_CCW_GOBI: //L8028D024 if(plyr_hitbox_type == HITBOX_1_BEAK_BUSTER) - obj_collision_type = 1; + obj_collision_type = MARKER_COLLISION_FUNC_1; break; }//L8028D034 if(func_80297C6C() == 3){ - plyr_collision_type = 0; + plyr_collision_type = MARKER_COLLISION_FUNC_0; } if(obj_collision_type){ miscflag_set(8); } - func_8032FFF4(playerMarker, marker, plyr_collision_type); - func_8032FFF4(marker, playerMarker, obj_collision_type); + marker_callCollisionFunc(playerMarker, marker, plyr_collision_type); + marker_callCollisionFunc(marker, playerMarker, obj_collision_type); if(marker->unk3E_0){ func_8032B258(actor, obj_collision_type); } diff --git a/src/core2/ch/beehive.c b/src/core2/ch/beehive.c index 527995e6..61c76e41 100644 --- a/src/core2/ch/beehive.c +++ b/src/core2/ch/beehive.c @@ -44,7 +44,7 @@ void chBeehive_update(Actor *this){ this->marker->propPtr->unk8_3 = 1; this->unk44_31 = func_8030D90C(); this->unk16C_4 = 1; - this->unk38_0 = func_803203FC(1)| func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE); + this->unk38_0 = volatileFlag_get(VOLATILE_FLAG_1)| volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE); }//L802CE960 if(map_get() == MAP_27_FP_FREEZEEZY_PEAK){ if(func_8038BFA0()){ diff --git a/src/core2/ch/bigbutt.c b/src/core2/ch/bigbutt.c index fc84f5e2..8728c25d 100644 --- a/src/core2/ch/bigbutt.c +++ b/src/core2/ch/bigbutt.c @@ -44,7 +44,7 @@ void func_802C5E80(Actor *this){ } void func_802C5EB8(Actor *this){ - if(func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)) + if(volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)) return; if(this->unk38_31){ diff --git a/src/core2/ch/climbBase.c b/src/core2/ch/climbBase.c index c6c101a2..348d0812 100644 --- a/src/core2/ch/climbBase.c +++ b/src/core2/ch/climbBase.c @@ -77,7 +77,7 @@ void func_802D77D4(Actor *this) { ml_vec3f_diff_copy(sp4C, this->position, sp40); if (((sp4C[0] * sp4C[0]) + (sp4C[2] * sp4C[2])) < (sp3C * sp3C)) { if ((this->position[1] < sp40[1]) && (sp40[1] <= local->unk0[1])) { - if (func_803203FC(2) == 0) { + if (volatileFlag_get(VOLATILE_FLAG_2) == 0) { func_8028F738(this->position, local->unk0, (f32)this->unkF4_8, local->unkC); } } diff --git a/src/core2/ch/code_468E0.c b/src/core2/ch/code_468E0.c index abc75f55..8f5a7fed 100644 --- a/src/core2/ch/code_468E0.c +++ b/src/core2/ch/code_468E0.c @@ -36,7 +36,7 @@ void func_802CD8C0(Actor *this){ this->marker->unk2C_1 = 1; this->marker->collidable = 0; *(s32*)this->unkBC = 0; //TODO Make struct - if(func_803203FC(1) || func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)){ + if(volatileFlag_get(VOLATILE_FLAG_1) || volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)){ marker_despawn(this->marker); return; } diff --git a/src/core2/ch/collectible.c b/src/core2/ch/collectible.c index 7bf7e85e..2c8b1c46 100644 --- a/src/core2/ch/collectible.c +++ b/src/core2/ch/collectible.c @@ -154,8 +154,8 @@ void chCollectible_update(Actor *this) { if(!this->unk38_0) return; - if (func_80320424(0x23, 3) != this->unk10_12) { - func_802D8C98(this, func_80320424(0x23, 3)); + if (volatileFlag_getN(0x23, 3) != this->unk10_12) { + func_802D8C98(this, volatileFlag_getN(0x23, 3)); } switch (this->state) { diff --git a/src/core2/ch/crab.c b/src/core2/ch/crab.c index 00080408..0fe0900a 100644 --- a/src/core2/ch/crab.c +++ b/src/core2/ch/crab.c @@ -246,14 +246,14 @@ void chCrab_update(Actor *this) { if (!jiggyscore_isCollected(JIGGY_10_TTC_SANDCASTLE)) { mapSpecificFlags_set(1, 0); } - if (func_803203FC(2)) { + if (volatileFlag_get(VOLATILE_FLAG_2)) { marker_despawn(this->marker); return; } } } - if (func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) != 0) { + if (volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) != 0) { if (this->unkF4_8 != 1) { marker_despawn(this->marker); return; @@ -279,7 +279,7 @@ void chCrab_update(Actor *this) { if (map_get() == MAP_A_TTC_SANDCASTLE) { if( !mapSpecificFlags_get(0) && levelSpecificFlags_get(2) - && !func_803203FC(2) + && !volatileFlag_get(VOLATILE_FLAG_2) && !jiggyscore_isCollected(JIGGY_10_TTC_SANDCASTLE) && func_80329530(this, 1600) ) { diff --git a/src/core2/ch/ghost.c b/src/core2/ch/ghost.c index 11a273d5..18e7f02c 100644 --- a/src/core2/ch/ghost.c +++ b/src/core2/ch/ghost.c @@ -176,7 +176,7 @@ void func_8035B6CC(Actor *this){ void func_8035B75C(Actor *this){ subaddie_set_state_with_direction(this, 3, 0.01f, 1); actor_loopAnimation(this); - this->unk28 = func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) ? 0.0 : 12.0; + this->unk28 = volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) ? 0.0 : 12.0; func_8030E878(0x3F4, randf2(1.0f, 1.2f), 32000, this->position, this->scale*400.0f, this->scale*1800.0f); } diff --git a/src/core2/ch/icecube.c b/src/core2/ch/icecube.c index e5ab25db..ce17a4f7 100644 --- a/src/core2/ch/icecube.c +++ b/src/core2/ch/icecube.c @@ -303,7 +303,7 @@ void chicecube_update(Actor *this){ case 1: // L8035AC9C animctrl_setAnimTimer(this->animctrl, 0.0f); if( func_80359DF4(this, 900) - || (this->unkF4_8 == 2 && func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)) + || (this->unkF4_8 == 2 && volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)) ){ subaddie_set_state_with_direction(this, 2, 0.0001f, 1); actor_playAnimationOnce(this); diff --git a/src/core2/ch/jinjo.c b/src/core2/ch/jinjo.c index d4f71437..1ede67d8 100644 --- a/src/core2/ch/jinjo.c +++ b/src/core2/ch/jinjo.c @@ -110,7 +110,7 @@ void chJinjo_update(Actor * this){ local->unk8 = (this->position_y < func_80309B24(this->position)); this->marker->collisionFunc = __chJinjo_802CDBA8; marker_setFreeMethod(this->marker, __chJinjo_802CDD3C); - if(func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)){ + if(volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)){ marker_despawn(this->marker); } }//L802CDE24 diff --git a/src/core2/ch/snacker.c b/src/core2/ch/snacker.c index 508d7e0a..04580d32 100644 --- a/src/core2/ch/snacker.c +++ b/src/core2/ch/snacker.c @@ -332,7 +332,7 @@ void chSnacker_spawn(void) { _player_getPosition(spawn_position); - if (func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) != 0) { + if (volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) != 0) { nodeprop_getPosition(func_80304CAC(0x3CB, spawn_position), spawn_position); } else{ @@ -372,7 +372,7 @@ void chSnacker_spawn(void) { marker_despawn(s_chSnacker_marker); return; } - if (func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) == 0) { + if (volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) == 0) { func_8032BB88(snacker, 5000, 750); func_8024BD08(0); func_8025A6EC(COMUSIC_34_SNACKER_DANGER, 0); diff --git a/src/core2/ch/trainers.c b/src/core2/ch/trainers.c index 9a8358bc..0b967f44 100644 --- a/src/core2/ch/trainers.c +++ b/src/core2/ch/trainers.c @@ -66,23 +66,23 @@ void chtrainers_update(Actor *this){ ml_vec3f_copy(this->unk1C, this->position); this->velocity[0] = this->yaw; this->velocity[1] = 0.0f; - this->unk10_12 = !func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE) && !func_803203FC(0x1); + this->unk10_12 = !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE) && !volatileFlag_get(0x1); subaddie_set_state(this, 0); } - if(!func_803203FC(0xF) && ability_isUnlocked(ABILITY_11_TURBO_TALON)){ - func_803204E4(0xF, TRUE); + if(!volatileFlag_get(0xF) && ability_isUnlocked(ABILITY_11_TURBO_TALON)){ + volatileFlag_set(0xF, TRUE); } switch(this->state){ case 0://L802CA5A8 if(func_803296D8(this, 2000) || sp2C){ if( func_80329530(this, 0xfa) - && !func_803203FC(0xf) + && !volatileFlag_get(0xf) && player_getTransformation() == TRANSFORM_1_BANJO ){ if(func_80311480(0xda4, 0, NULL, NULL, NULL, NULL)){ - func_803204E4(0xf, TRUE); + volatileFlag_set(0xf, TRUE); } }//L802CA620 _chtrainers_802CA378(this, sp2C); diff --git a/src/core2/ch/wadingboots.c b/src/core2/ch/wadingboots.c index e3c77034..4a103098 100644 --- a/src/core2/ch/wadingboots.c +++ b/src/core2/ch/wadingboots.c @@ -41,12 +41,12 @@ void chwadingboots_update(Actor *this){ if(!this->initialized){ this->initialized = TRUE; this->velocity[0] = this->yaw; - this->unk10_12 = !func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE) && !func_803203FC(0x1); + this->unk10_12 = !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE) && !volatileFlag_get(0x1); subaddie_set_state(this, 0); } - if(!func_803203FC(0x10) && ability_isUnlocked(ABILITY_E_WADING_BOOTS)){ - func_803204E4(0x10, TRUE); + if(!volatileFlag_get(0x10) && ability_isUnlocked(ABILITY_E_WADING_BOOTS)){ + volatileFlag_set(0x10, TRUE); } switch(this->state){ @@ -65,12 +65,12 @@ void chwadingboots_update(Actor *this){ } } - if(func_803203FC(0x10)) break; + if(volatileFlag_get(0x10)) break; if(!func_80329530(this, 250)) break; if(player_getTransformation() != TRANSFORM_1_BANJO) break; if(func_80311480(ASSET_DA5_DIALOG_WADINGBOOTS_MEET, 0, NULL, NULL, NULL, NULL)){ - func_803204E4(0x10, TRUE); + volatileFlag_set(0x10, TRUE); } break; diff --git a/src/core2/code_14420.c b/src/core2/code_14420.c index 84dfff67..48d10aad 100644 --- a/src/core2/code_14420.c +++ b/src/core2/code_14420.c @@ -336,7 +336,7 @@ void func_8029B85C(ActorMarker *caller, enum asset_e text_id, s32 arg2){ } void func_8029B890(void){ - if(!fileProgressFlag_get(FILEPROG_A8_HAS_DIED) && !func_803203FC(2)){ + if(!fileProgressFlag_get(FILEPROG_A8_HAS_DIED) && !volatileFlag_get(VOLATILE_FLAG_2)){ func_803114D0(); if(bs_getState() == 0x54){ func_8029B62C(); diff --git a/src/core2/code_34790.c b/src/core2/code_34790.c index d5560b98..bca87c62 100644 --- a/src/core2/code_34790.c +++ b/src/core2/code_34790.c @@ -338,10 +338,10 @@ void func_802BC2CC(s32 arg0) { f32 *sp20 = D_8037D918; s32 sp1C; - if (func_803203FC(0xE) != 0) { + if (volatileFlag_get(0xE) != 0) { func_80347A14(0); } - if (func_80320454(0xE, 0) || func_802D686C() || (arg0 == 0x63) || !func_802BB720(arg0, D_8037D908, D_8037D918, &sp1C)) { + if (volatileFlag_getAndSet(0xE, 0) || func_802D686C() || (arg0 == 0x63) || !func_802BB720(arg0, D_8037D908, D_8037D918, &sp1C)) { if (ncCameraType == CAMERA_TYPE_2_DYNAMIC) { func_802BE794(); } diff --git a/src/core2/code_39D0.c b/src/core2/code_39D0.c index e5972d32..e793cea8 100644 --- a/src/core2/code_39D0.c +++ b/src/core2/code_39D0.c @@ -133,7 +133,7 @@ int func_8028ADB4(void){ } int func_8028ADF0(void){ - return func_803203FC(0x9d); + return volatileFlag_get(0x9d); } bool func_8028AE10(void) { diff --git a/src/core2/code_41F30.c b/src/core2/code_41F30.c index 923fe752..6351629c 100644 --- a/src/core2/code_41F30.c +++ b/src/core2/code_41F30.c @@ -14,7 +14,7 @@ void chextralife_update(Actor *this){ if(!this->initialized){ func_8032AA58(this, 0.8f); this->initialized = TRUE; - if(func_803203FC(1) || func_803203FC(2)){ + if(volatileFlag_get(VOLATILE_FLAG_1) || volatileFlag_get(VOLATILE_FLAG_2)){ marker_despawn(this->marker); } } diff --git a/src/core2/code_42CB0.c b/src/core2/code_42CB0.c index 25c3c1b5..83c75f57 100644 --- a/src/core2/code_42CB0.c +++ b/src/core2/code_42CB0.c @@ -104,8 +104,8 @@ void chHoneycomb_update(Actor *this){ if(local->uid == 0) local->uid = (!this->unk44_2)? D_8037DDC0 : func_802C9C40(this); if( honeycombscore_get(local->uid) - || func_803203FC(1) - || func_803203FC(2) + || volatileFlag_get(VOLATILE_FLAG_1) + || volatileFlag_get(VOLATILE_FLAG_2) ){ marker_despawn(this->marker); return; diff --git a/src/core2/code_43A40.c b/src/core2/code_43A40.c index 737fde84..cf628790 100644 --- a/src/core2/code_43A40.c +++ b/src/core2/code_43A40.c @@ -47,7 +47,7 @@ extern struct43s chFightFlightPad_D_80366FB4 = { /* .code */ void chShockJump_update(Actor *this){ this->marker->propPtr->unk8_3 = TRUE; - if(func_803203FC(UNKFLAGS1_86_SANDCASTLE_SHOCKSPRING_JUMP_UNLOCKED)){ + if(volatileFlag_get(VOLATILE_FLAG_86_SANDCASTLE_SHOCKSPRING_JUMP_UNLOCKED)){ ability_unlock(ABILITY_D_SHOCK_JUMP); } @@ -61,7 +61,7 @@ void chShockJump_update(Actor *this){ void chFlightPad_update(Actor *this){ this->marker->propPtr->unk8_3 = TRUE; - if(func_803203FC(UNKFLAGS1_8A_SANDCASTLE_FLIGHT_UNLOCKED)){ + if(volatileFlag_get(VOLATILE_FLAG_8A_SANDCASTLE_FLIGHT_UNLOCKED)){ ability_unlock(ABILITY_9_FLIGHT); } diff --git a/src/core2/code_45310.c b/src/core2/code_45310.c index ab517669..035e941b 100644 --- a/src/core2/code_45310.c +++ b/src/core2/code_45310.c @@ -372,7 +372,7 @@ void func_802CCC5C(Actor *this) { } if (local->unk4 >= 1.0f) { local->unk4 = 1.0f; - if (func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)) { + if (volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)) { local->unk3A = 0; } else { if (this->state == 2) { diff --git a/src/core2/code_47BD0.c b/src/core2/code_47BD0.c index 3e10693a..70dddc93 100644 --- a/src/core2/code_47BD0.c +++ b/src/core2/code_47BD0.c @@ -378,7 +378,7 @@ void chBeeSwarm_update(Actor *this) { subaddie_set_state(this, (this->unk100 != NULL) ? 1 : 2); this->unk60 = 0.0f; chBeeSwarm_802CF040(this); - this->unk38_0 = func_803203FC(1) | func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE); + this->unk38_0 = volatileFlag_get(VOLATILE_FLAG_1) | volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE); } if (!subaddie_playerIsWithinSphere(this, 0xFA0)) diff --git a/src/core2/code_4A6F0.c b/src/core2/code_4A6F0.c index 53706313..f668bae9 100644 --- a/src/core2/code_4A6F0.c +++ b/src/core2/code_4A6F0.c @@ -123,7 +123,7 @@ void chMumbo_func_802D18B4(Actor *this) { } else { player_is_within_range = chMumbo_withinHorzDistToPlayer(0, -107, 188); } - if(player_is_within_range || func_803203FC(1) || func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)){ + if(player_is_within_range || volatileFlag_get(VOLATILE_FLAG_1) || volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)){ subaddie_set_state_forward(this, 2); if( !fileProgressFlag_get(FILEPROG_11_HAS_MET_MUMBO) || (!fileProgressFlag_get(FILEPROG_DC_HAS_HAD_ENOUGH_TOKENS_BEFORE) && this->unk38_0) @@ -221,8 +221,8 @@ void chMumbo_update(Actor *this) { f32 temp_f12; this->unk130 = func_803255FC; - if( !func_803203FC(1) - && !func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE) + if( !volatileFlag_get(VOLATILE_FLAG_1) + && !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE) && map_get() != MAP_7A_GL_CRYPT) { item_adjustByDiffWithHud(ITEM_1C_MUMBO_TOKEN, 0); } @@ -278,8 +278,8 @@ void chMumbo_update(Actor *this) { actor_playAnimationOnce(this); if (actor_animationIsAt(this, 0.999f)) { if( !fileProgressFlag_get(FILEPROG_11_HAS_MET_MUMBO) - && !func_803203FC(1) - && !func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE) + && !volatileFlag_get(VOLATILE_FLAG_1) + && !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE) ) { subaddie_set_state(this, 3); func_80311480(ASSET_D8F_DIALOG_MUMBO_MEET, 0xE, this->position, this->marker, __chMumbo_textCallback, NULL); @@ -288,8 +288,8 @@ void chMumbo_update(Actor *this) { } if( !fileProgressFlag_get(FILEPROG_DC_HAS_HAD_ENOUGH_TOKENS_BEFORE) - && !func_803203FC(1) - && !func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE) + && !volatileFlag_get(VOLATILE_FLAG_1) + && !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE) && this->unk38_0 ){ subaddie_set_state(this, 3); @@ -428,7 +428,7 @@ void chMumbo_update(Actor *this) { case 7: //L802D2704 chMumbo_func_802D186C(this); - if (func_803203FC(FILEPROG_11_HAS_MET_MUMBO) == 0) { + if (volatileFlag_get(FILEPROG_11_HAS_MET_MUMBO) == 0) { if (map_get() == MAP_7A_GL_CRYPT) { sp48 = chMumbo_withinHorzDistToPlayer(0x453, 0, 0xBC); } else { @@ -436,7 +436,7 @@ void chMumbo_update(Actor *this) { } if (sp48 != 0) { func_80311480(ASSET_DA7_DIALOG_MUMBO_CCW_SUMMER, 7, NULL, NULL, NULL, NULL); - func_803204E4(FILEPROG_11_HAS_MET_MUMBO, TRUE); + volatileFlag_set(FILEPROG_11_HAS_MET_MUMBO, TRUE); } } actor_loopAnimation(this); @@ -444,7 +444,7 @@ void chMumbo_update(Actor *this) { case 8: //L802D2790 chMumbo_func_802D186C(this); - if (func_803203FC(FILEPROG_12_HAS_TRANSFORMED_BEFORE) == 0) { + if (volatileFlag_get(FILEPROG_12_HAS_TRANSFORMED_BEFORE) == 0) { if (map_get() == MAP_7A_GL_CRYPT) { sp48 = chMumbo_withinHorzDistToPlayer(0x453, 0, 0xBC); } else { @@ -452,7 +452,7 @@ void chMumbo_update(Actor *this) { } if (sp48 != 0) { func_80311480(ASSET_DA8_DIALOG_MUMBO_CCW_AUTUMN, 7, NULL, NULL, NULL, NULL); - func_803204E4(FILEPROG_12_HAS_TRANSFORMED_BEFORE, TRUE); + volatileFlag_set(FILEPROG_12_HAS_TRANSFORMED_BEFORE, TRUE); } } actor_loopAnimation(this); diff --git a/src/core2/code_4BD70.c b/src/core2/code_4BD70.c index 6a9edc67..1dd11e4c 100644 --- a/src/core2/code_4BD70.c +++ b/src/core2/code_4BD70.c @@ -14,7 +14,7 @@ ActorInfo D_803675C0 = { MARKER_1E9_MUMBO_COST_SIGN, ACTOR_36C_25_MUMBO_TOKEN_SI void chMumboSign_update(Actor *this) { if (!this->unk16C_4) { if( fileProgressFlag_get(this->modelCacheIndex - ACTOR_368_5_MUMBO_TOKEN_SIGN + FILEPROG_90_PAID_TERMITE_COST) - || func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE) + || volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE) ) { marker_despawn(this->marker); } diff --git a/src/core2/code_4C020.c b/src/core2/code_4C020.c index 2f8528c1..8755d873 100644 --- a/src/core2/code_4C020.c +++ b/src/core2/code_4C020.c @@ -14,7 +14,7 @@ extern void ml_vec3f_assign(f32[3], f32, f32, f32); extern void func_802EE2E8(Actor *arg0, s32 arg1, s32 cnt, s32 arg3, f32 arg4, f32 arg5, f32 arg6); extern void func_80319EA4(void); extern void fileProgressFlag_set(s32, bool); -extern void func_803204E4(s32, bool); +extern void volatileFlag_set(s32, bool); void func_802D3D54(Actor *this); void func_802D3DA4(Actor *this); @@ -137,17 +137,20 @@ void func_802D2FB0(Actor *this, s32 arg1, s32 arg2, s32 arg3, f32 arg4, s32 arg5 } } -void func_802D3138(ActorMarker *marker, ActorMarker *other_marker){ - if(marker->id == 0x224 || marker->id == 0x225){ +// collision function if player shoots egg at spider webs +void func_802D3138(ActorMarker *marker, ActorMarker *other_marker) { + if(marker->id == MARKER_224_BREAKABLE_FLOOR_COBWEB || marker->id == MARKER_225_BREAKABLE_WALL_COBWEB) { func_8025A70C(COMUSIC_2B_DING_B); } } -void func_802D317C(ActorMarker *marker, enum file_progress_e prog_flag_id){ +// called from collision die function below, set according file flag and despawns object +void func_802D317C(ActorMarker *marker, enum file_progress_e prog_flag_id) { fileProgressFlag_set(prog_flag_id, TRUE); marker_despawn(marker); } +// collision die function for several objects in Lair void func_802D31AC(ActorMarker *arg0, ActorMarker * arg1) { Actor *sp2C; @@ -166,7 +169,7 @@ void func_802D31AC(ActorMarker *arg0, ActorMarker * arg1) { FUNC_8030E624(SFX_82_METAL_BREAK, 0.6f, 32736); func_802D2FB0(sp2C, 0x14, -0x1E, 0x190, 3.0f, 0x15E, 0x50, 0x96); sp2C->unk60 = 1.0f; - fileProgressFlag_set(0xA5, 1); + fileProgressFlag_set(FILEPROG_A5_LAIR_CRYPT_GATE_OPEN, 1); break; case MARKER_109_BREAKABLE_BRICK_WALL: @@ -261,21 +264,21 @@ void func_802D31AC(ActorMarker *arg0, ActorMarker * arg1) { func_8030E540(SFX_D9_WOODEN_CRATE_BREAKING_1); func_802EE2E8(sp2C, 7, 9, 0x78, 0.43f, 1.3f, 3.0f); func_802EE2E8(sp2C, 3, 6, 0x78, 0.43f, 1.3f, 3.0f); - func_802D317C(arg0, 0xC5); + func_802D317C(arg0, FILEPROG_C5_RAREWARE_BOX_BROKEN); break; case 0x11A: func_8030E540(SFX_82_METAL_BREAK); func_802EE278(sp2C, 0xE, 0xD, 0x32, 0.8f, 0.9f); func_802EE278(sp2C, 0xE, 0xD, 0xAA, 0.8f, 0.9f); - func_802D317C(arg0, 0xC2); + func_802D317C(arg0, FILEPROG_C2_GRATE_TO_RBB_PUZZLE_OPEN); break; case 0x118: func_8030E540(SFX_82_METAL_BREAK); func_802EE278(sp2C, 0xE, 0xD, 0x50, 1.2f, 0.9f); func_802EE278(sp2C, 0xE, 0xD, 0xB4, 1.2f, 0.9f); - func_802D317C(arg0, 0xCD); + func_802D317C(arg0, FILEPROG_CD_GRATE_TO_WATER_SWITCH_3_OPEN); break; case 0x119: @@ -283,7 +286,7 @@ void func_802D31AC(ActorMarker *arg0, ActorMarker * arg1) { func_802EE278(sp2C, 0xE, 9, 0x50, 1.2f, 0.9f); func_802EE278(sp2C, 0xE, 9, 0xAA, 1.2f, 0.9f); func_802EE278(sp2C, 0xE, 9, 0x104, 1.2f, 0.9f); - func_802D317C(arg0, 0xCE); + func_802D317C(arg0, FILEPROG_CE_GRATE_TO_MMM_PUZZLE_OPEN); break; case 0x22D: @@ -315,7 +318,7 @@ void func_802D31AC(ActorMarker *arg0, ActorMarker * arg1) { func_802EE278(sp2C, 4, 0x32, 0x50, 1.0f, 1.4f); func_802EE278(sp2C, 4, 0x32, 0xA0, 1.0f, 1.4f); func_802EE278(sp2C, 4, 0x1E, 0xF0, 0.8f, 1.1f); - func_802D317C(arg0, 0xC3); + func_802D317C(arg0, FILEPROG_C3_ICE_BALL_TO_CHEATO_BROKEN); break; case MARKER_121_GLASS_EYE: @@ -572,7 +575,7 @@ void func_802D4680(Actor *this){ if(func_80258640(this->position, sp1C) < 150.0f && func_8028F20C()){ if(func_8028ECAC() == 0 || func_8028ECAC() == BSGROUP_8_TROT){ if(map_get() == MAP_8E_GL_FURNACE_FUN){ - func_803204E4(0, 0); + volatileFlag_set(0, 0); func_802D4614(MAP_80_GL_FF_ENTRANCE); } else{ @@ -624,7 +627,7 @@ void func_802D4928(Actor *this, s32 arg1, s32 arg2, s32 arg3) { this->marker->propPtr->unk8_3 = TRUE; if( ( (((arg1 & 0xC00000) == 0) && mapSpecificFlags_get(arg1 - 0)) || (((arg1 & 0xC00000) == 0x800000) && fileProgressFlag_get(arg1 - 0x800000)) - || (((arg1 & 0xC00000) == 0x400000) && func_803203FC(arg1 - 0x400000)) + || (((arg1 & 0xC00000) == 0x400000) && volatileFlag_get(arg1 - 0x400000)) ) && (arg2 != this->state) ) { @@ -633,7 +636,7 @@ void func_802D4928(Actor *this, s32 arg1, s32 arg2, s32 arg3) { } if( ( (((arg1 & 0xC00000) == 0) && !mapSpecificFlags_get(arg1 - 0)) || (((arg1 & 0xC00000) == 0x800000) && !fileProgressFlag_get(arg1 - 0x800000)) - || (((arg1 & 0xC00000) == 0x400000) && !func_803203FC(arg1 - 0x400000)) + || (((arg1 & 0xC00000) == 0x400000) && !volatileFlag_get(arg1 - 0x400000)) ) && (arg2 == this->state) ) { @@ -652,10 +655,10 @@ void func_802D4AC0(Actor *this, s32 arg1, s32 arg2) { fileProgressFlag_set(arg1 + 0xFF800000, 1); } if (arg1 & 0x400000) { - func_803204E4(arg1 + 0xFFC00000, 1); + volatileFlag_set(arg1 + 0xFFC00000, 1); } } - if( (((arg1 & 0x800000) && (fileProgressFlag_get(arg1 + 0xFF800000))) || ((arg1 & 0x400000) && (func_803203FC(arg1 + 0xFFC00000)))) + if( (((arg1 & 0x800000) && (fileProgressFlag_get(arg1 + 0xFF800000))) || ((arg1 & 0x400000) && (volatileFlag_get(arg1 + 0xFFC00000)))) && (fileProgressFlag_get(arg2)) && (this->animctrl == NULL) ) { subaddie_set_state_with_direction(this, 8, 0.0f, 1); @@ -761,7 +764,7 @@ void func_802D5000(enum map_e map_id){ } void func_802D5058(enum map_e map_id, s32 arg1, bool arg2) { - func_803204E4(1, 1); + volatileFlag_set(1, 1); D_80367684 = map_id; D_80367688 = arg1; if (arg2) { @@ -784,7 +787,7 @@ void func_802D5058(enum map_e map_id, s32 arg1, bool arg2) { void func_802D5140(ActorMarker *caller, enum asset_e text_id, s32 arg2){ - itemscore_noteScores_get(func_80320424(0x19, 4)); + itemscore_noteScores_get(volatileFlag_getN(0x19, 4)); } void func_802D5178(s32 arg0, enum file_progress_e arg1, s32 arg2, enum map_e arg3, s32 arg4, s32 arg5, enum actor_e arg6, s32 arg7){ @@ -798,7 +801,7 @@ void func_802D5178(s32 arg0, enum file_progress_e arg1, s32 arg2, enum map_e arg } void func_802D520C(Gfx **gfx, Mtx **mtx, Vtx **vtx){ - if(func_803203FC(1) && map_get() != MAP_8E_GL_FURNACE_FUN){ + if(volatileFlag_get(VOLATILE_FLAG_1) && map_get() != MAP_8E_GL_FURNACE_FUN){ func_80319214(gfx, mtx, vtx); } } @@ -1020,16 +1023,16 @@ void func_802D5628(void){ func_802D5178(0x24, 0x30, 0x37, MAP_79_GL_CCW_LOBBY, 0xF, 0xB, ACTOR_234_CCW_ENTRANCE_DOOR, 0xA); func_802D5178(0x20, 0x2C, 0x38, MAP_6F_GL_FP_LOBBY, 0x11, 0xA, ACTOR_235_FP_ENTANCE_DOOR, 0xA); func_802D5178(0x3F, 0xE2, 0x40, MAP_93_GL_DINGPOT, 0x10, 0xA, ACTOR_2E5_DOOR_OF_GRUNTY, 0x28); - if(func_803203FC(0x18)){ + if(volatileFlag_get(0x18)){ if(!fileProgressFlag_get(FILEPROG_99_PAST_50_NOTE_DOOR_TEXT)){ func_80311174(0xF75, 0xE, NULL, NULL, NULL, NULL, func_802D5140); fileProgressFlag_set(FILEPROG_99_PAST_50_NOTE_DOOR_TEXT, TRUE); - func_803204E4(0x18, 0); + volatileFlag_set(0x18, 0); } else{//L802D5DD8 - if(!func_803203FC(0x16)){ + if(!volatileFlag_get(0x16)){ func_80311174(0xF77, 0x4, NULL, NULL, NULL, NULL, func_802D5140); - func_803204E4(0x18, 0); + volatileFlag_set(0x18, 0); } } }//L802D5E18 @@ -1042,7 +1045,7 @@ void func_802D5628(void){ && !fileProgressFlag_get(FILEPROG_FC_DEFEAT_GRUNTY) ){ D_8037DE04 += time_getDelta(); - if(D_80367680 < D_8037DE04 && !func_803203FC(0x16)){ + if(D_80367680 < D_8037DE04 && !volatileFlag_get(0x16)){ if(fileProgressFlag_get(FILEPROG_A6_FURNACE_FUN_COMPLETE)){ sp4C = 0xF9D; } @@ -1054,10 +1057,10 @@ void func_802D5628(void){ D_8037DE00 = randi2(0xF86, sp4C); }//L802D5F1C - if(func_803203FC(0x22)){ + if(volatileFlag_get(0x22)){ if(func_80311480(0xF82, 4, NULL, NULL, NULL, NULL)){ fileProgressFlag_set(FILEPROG_C1_BADDIES_ESCAPE_TEXT, TRUE); - func_803204E4(0x22, 0); + volatileFlag_set(0x22, 0); D_8037DE04 = 0.0f; D_80367680 += 60.0; if(300.0 < D_80367680) @@ -1109,7 +1112,7 @@ void func_802D6114(void){ if(map_getLevel(sp24) != map_getLevel(map_get())){ func_802E4A70(); }//L802D6194 - func_803204E4(0x21, 1); + volatileFlag_set(0x21, 1); if(sp24 != 0x1C || !func_8025ADBC(COMUSIC_23_MMM_INSIDE_CHURCH)){ func_803228D8(); } @@ -1194,7 +1197,7 @@ void func_802D63D4(void){ default: //L802D6460 func_802BAFE4(D_80367688); timedFuncQueue_update(); - func_803204E4(0xbf, 0); + volatileFlag_set(0xbf, 0); func_802D6750(); break; } @@ -1216,43 +1219,43 @@ void func_802D6494(void){ func_8025A6CC(COMUSIC_64_WORLD_OPENING_A, 32000); break; case ACTOR_212_CC_ENTRANCE_BARS:// L802D6550 - if(map_get() == MAP_70_GL_CC_LOBBY && !func_803203FC(UNKFLAGS1_7F_SANDCASTLE_OPEN_CC)){ + if(map_get() == MAP_70_GL_CC_LOBBY && !volatileFlag_get(VOLATILE_FLAG_7F_SANDCASTLE_OPEN_CC)){ func_802D4830(actorArray_findActorFromActorId(ACTOR_212_CC_ENTRANCE_BARS), SFX_9A_MECHANICAL_CLOSING, 0.5f); func_8025A6CC(COMUSIC_64_WORLD_OPENING_A, 32000); } break; case ACTOR_234_CCW_ENTRANCE_DOOR:// L802D65A0 - if(map_get() == MAP_79_GL_CCW_LOBBY && !func_803203FC(UNKFLAGS1_93_SANDCASTLE_OPEN_CCW)){ + if(map_get() == MAP_79_GL_CCW_LOBBY && !volatileFlag_get(VOLATILE_FLAG_93_SANDCASTLE_OPEN_CCW)){ func_802D485C(actorArray_findActorFromActorId(ACTOR_234_CCW_ENTRANCE_DOOR), SFX_3EC_CCW_DOOR_OPENING, 0.8f, 15000); func_8025A6CC(COMUSIC_64_WORLD_OPENING_A, 32000); } break; case ACTOR_210_BGS_ENTRANCE_DOOR:// L802D65F8 - if(!func_803203FC(0x84)){ + if(!volatileFlag_get(0x84)){ FUNC_8030E624(SFX_6B_LOCKUP_OPENING, 0.6f, 32000); func_8025A6CC(COMUSIC_64_WORLD_OPENING_A, 32000); } break; case ACTOR_235_FP_ENTANCE_DOOR:// L802D6624 - if(map_get() == MAP_6F_GL_FP_LOBBY && !func_803203FC(UNKFLAGS1_8B_SANDCASTLE_OPEN_FP)){ + if(map_get() == MAP_6F_GL_FP_LOBBY && !volatileFlag_get(VOLATILE_FLAG_8B_SANDCASTLE_OPEN_FP)){ func_802D4830(actorArray_findActorFromActorId(ACTOR_235_FP_ENTANCE_DOOR), SFX_18_BIGBUTT_SLIDE, 0.5f); func_8025A6CC(COMUSIC_64_WORLD_OPENING_A, 32000); } break; case ACTOR_226_GV_ENTRANCE:// L802D6674 - if(map_get() == MAP_6E_GL_GV_LOBBY && !func_803203FC(UNKFLAGS1_87_SANDCASTLE_OPEN_GV)){ + if(map_get() == MAP_6E_GL_GV_LOBBY && !volatileFlag_get(VOLATILE_FLAG_87_SANDCASTLE_OPEN_GV)){ func_802D485C(actorArray_findActorFromActorId(ACTOR_226_GV_ENTRANCE), SFX_3EC_CCW_DOOR_OPENING, 0.8f, 15000); func_8025A6CC(COMUSIC_64_WORLD_OPENING_A, 32000); } break; case ACTOR_228_MMM_ENTRANCE_DOOR:// L802D66CC - if(!func_803203FC(UNKFLAGS1_8C_SANDCASTLE_OPEN_MMM)){ + if(!volatileFlag_get(VOLATILE_FLAG_8C_SANDCASTLE_OPEN_MMM)){ FUNC_8030E624(SFX_6B_LOCKUP_OPENING, 0.6f, 32000); func_8025A6CC(COMUSIC_64_WORLD_OPENING_A, 32000); } break; case ACTOR_20F_RBB_ENTRANCE_DOOR:// L802D66F8 - if(map_get() == MAP_77_GL_RBB_LOBBY && !func_803203FC(UNKFLAGS1_90_SANDCASTLE_OPEN_RBB)){ + if(map_get() == MAP_77_GL_RBB_LOBBY && !volatileFlag_get(VOLATILE_FLAG_90_SANDCASTLE_OPEN_RBB)){ func_802D4830(actorArray_findActorFromActorId(ACTOR_20F_RBB_ENTRANCE_DOOR), SFX_9A_MECHANICAL_CLOSING, 0.5f); func_8025A6CC(COMUSIC_64_WORLD_OPENING_A, 32000); } @@ -1311,14 +1314,14 @@ s32 func_802D683C(s32 arg0){ } int func_802D686C(void){ - if(func_803203FC(0x1E)){ + if(volatileFlag_get(0x1E)){ return FALSE; } return map_get() == D_80367684; } int func_802D68B4(void){ - return func_802D686C() || func_803203FC(0x21); + return func_802D686C() || volatileFlag_get(0x21); } //BREAK???? diff --git a/src/core2/code_53A10.c b/src/core2/code_53A10.c index d1eeb03d..5d2d3b0f 100644 --- a/src/core2/code_53A10.c +++ b/src/core2/code_53A10.c @@ -36,7 +36,7 @@ void func_802DAA14(Actor *this){ s32 tmp; s32 text_id; - if(func_803203FC(1) || func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)){ + if(volatileFlag_get(VOLATILE_FLAG_1) || volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)){ marker_despawn(this->marker); return; } diff --git a/src/core2/code_53C10.c b/src/core2/code_53C10.c index bc9a8c40..eae84936 100644 --- a/src/core2/code_53C10.c +++ b/src/core2/code_53C10.c @@ -247,7 +247,7 @@ void func_802DB5A0(Actor *this) { this->unk124_0 = this->unk138_31 = FALSE; local->unk38 = 0; this->unk16C_4 = TRUE; - if (func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) { + if (volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) { subaddie_set_state(this, 2U); return; } diff --git a/src/core2/code_57C70.c b/src/core2/code_57C70.c index a709693b..b2d48fa7 100644 --- a/src/core2/code_57C70.c +++ b/src/core2/code_57C70.c @@ -133,7 +133,7 @@ void func_802DEE1C(Actor *this) { case 3: if(animctrl_isStopped(this->animctrl)) { - func_803204E4(0xC3, 1); + volatileFlag_set(VOLATILE_FLAG_C3, 1); this->state = 4; } break; diff --git a/src/core2/code_59A80.c b/src/core2/code_59A80.c index e4306673..8b9ca3ae 100644 --- a/src/core2/code_59A80.c +++ b/src/core2/code_59A80.c @@ -69,9 +69,9 @@ void func_802E0B10(Actor *this){ } } if( mumboscore_get(local->uid) - || func_803203FC(1) - || func_803203FC(2) - || func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE) + || volatileFlag_get(VOLATILE_FLAG_1) + || volatileFlag_get(VOLATILE_FLAG_2) + || volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE) ){ marker_despawn(this->marker); return; diff --git a/src/core2/code_5C870.c b/src/core2/code_5C870.c index 7e24cae3..6f9c3bab 100644 --- a/src/core2/code_5C870.c +++ b/src/core2/code_5C870.c @@ -214,7 +214,7 @@ void func_802E3BF8(enum game_mode_e next_mode, s32 arg1){ if(arg1){ sp20 = FALSE; if(next_mode == GAME_MODE_3_NORMAL){ - if(func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)){ + if(volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)){ sp20 = TRUE; sp1C = 7; } @@ -265,8 +265,8 @@ void func_802E3E7C(enum game_mode_e mode){ sp28 = D_8037E8E0.exit; prev_mode = D_8037E8E0.unk0; func_802E3BF8(GAME_MODE_2_UNKNOWN, 0); - if(!func_80320454(0x21, 0) || map_getLevel(map_get()) == map_getLevel(D_8037E8E0.map)){ - if(!func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) + if(!volatileFlag_getAndSet(0x21, 0) || map_getLevel(map_get()) == map_getLevel(D_8037E8E0.map)){ + if(!volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) mapSavestate_save(map_get()); } func_802E398C(1); @@ -547,7 +547,7 @@ bool func_802E4424(void) { && !func_8028F22C() && func_8032056C() && levelSpecificFlags_validateCRC1() - && func_80320248() + && dummy_func_80320248() ) { func_802E3BF8(GAME_MODE_4_PAUSED, 0U); } else if ((func_8024E67C(0) == 1) && (D_8037E8E0.unk0 != 0)) { diff --git a/src/core2/code_7060.c b/src/core2/code_7060.c index 198c1f5e..cdba5811 100644 --- a/src/core2/code_7060.c +++ b/src/core2/code_7060.c @@ -189,7 +189,7 @@ void func_8028E4B0(void) { sp20 = exit_get(); D_8037BFB8 = 0; player_setPosition(D_803636C0); - if (func_803203FC(0xE) || func_802D686C() || (sp20 == 0x65)){ + if (volatileFlag_get(0xE) || func_802D686C() || (sp20 == 0x65)){ return; } if (sp20 == 0x63) { diff --git a/src/core2/code_7AF80.c b/src/core2/code_7AF80.c index 630be8fd..6283897d 100644 --- a/src/core2/code_7AF80.c +++ b/src/core2/code_7AF80.c @@ -1265,7 +1265,7 @@ Actor * func_803055E0(enum actor_e arg0, s32 arg1[3], s32 arg2, s32 arg3, s32 ar Actor *spawn_actor(enum actor_e arg0, s32 arg1[3], s32 arg2) { s32 i; - arg0 = (!func_80320248()) ? (ACTOR_4_BIGBUTT) : (arg0); + arg0 = (!dummy_func_80320248()) ? (ACTOR_4_BIGBUTT) : (arg0); for (i = 0; i < sSpawnableActorSize; i++) { if (arg0 == sSpawnableActorList[i].infoPtr->actorId) { return sSpawnableActorList[i].spawnFunc(arg1, arg2, ((0, sSpawnableActorList[i])).infoPtr, sSpawnableActorList[i].unk8); diff --git a/src/core2/code_85800.c b/src/core2/code_85800.c index be2d8dd1..6f6755c1 100644 --- a/src/core2/code_85800.c +++ b/src/core2/code_85800.c @@ -905,7 +905,7 @@ void sfx_play(enum sfx_e uid, f32 arg1, u32 sampleRate, f32 position[3], f32 min __sfx_getPlayerPositionIfPresent(plyr_pos); if( !(maxFadeDistance <= ml_distance_vec3f(plyr_pos, position)) && levelSpecificFlags_validateCRC2() - && func_80320240() + && dummy_func_80320240() ){ sfxsource = func_8030D90C(); if(sfxsource){ diff --git a/src/core2/code_91E10.c b/src/core2/code_91E10.c index 3a44f4a6..b4299350 100644 --- a/src/core2/code_91E10.c +++ b/src/core2/code_91E10.c @@ -163,7 +163,7 @@ s32 func_80318F60(enum ff_question_type_e question_type, s32 q_indx, s32 arg2) { phi_v1 = arg2; } else { if (question_type == FFQT_3_GRUNTY) { - phi_a0 = func_80320424((q_indx * 2) + 0x26, 2); + phi_a0 = volatileFlag_getN((q_indx * 2) + 0x26, 2); } else { phi_a0 = 0; } diff --git a/src/core2/code_935F0.c b/src/core2/code_935F0.c index e8925dbe..4f3e3248 100644 --- a/src/core2/code_935F0.c +++ b/src/core2/code_935F0.c @@ -120,9 +120,9 @@ void __chMinigame_setState(Actor *this, u32 arg1) { if (this->unk10_12 == MINIGAME_1_VILE) { func_80347A14(0); } - if (func_803203FC(this->unk10_12 + 6) == 0) { + if (volatileFlag_get(this->unk10_12 + 6) == 0) { func_80324DBC(2.0f, this->unk10_12 + 0x1026, 0xA2, NULL, this->marker, __chMinigame_textCallback1, __chMinigame_transformToCroc); - func_803204E4(this->unk10_12 + 6, 1); + volatileFlag_set(this->unk10_12 + 6, 1); this->unk138_23 = TRUE; } else { func_80324DBC(2.0f, 0xD38, 0x20, NULL, this->marker, __chMinigame_textCallback1, NULL); @@ -130,15 +130,15 @@ void __chMinigame_setState(Actor *this, u32 arg1) { break; case MINIGAME_STATE_2_IN_PROGESS: func_8028F918(0); - func_803204E4(3, 1); + volatileFlag_set(3, 1); break; case MINIGAME_STATE_3_RETURN_TO_FF: - func_803204E4(4, 1); + volatileFlag_set(4, 1); func_8028F918(2); func_8025AB00(); - func_8025A70C((func_803203FC(5)) ? COMUSIC_3B_MINIGAME_VICTORY : COMUSIC_3C_MINIGAME_LOSS); + func_8025A70C((volatileFlag_get(VOLATILE_FLAG_5)) ? COMUSIC_3B_MINIGAME_VICTORY : COMUSIC_3C_MINIGAME_LOSS); func_802E4A70(); - func_803204E4(0x21, TRUE); + volatileFlag_set(0x21, TRUE); timedFunc_set_3(2.0f, (GenFunction_3)func_802E4078, MAP_8E_GL_FURNACE_FUN, 1, 1); break; } @@ -146,7 +146,7 @@ void __chMinigame_setState(Actor *this, u32 arg1) { } void __chMinigame_free(Actor *this){ - func_803204E4(3, 0); + volatileFlag_set(3, 0); } void chMinigame_update(Actor *this){ @@ -154,7 +154,7 @@ void chMinigame_update(Actor *this){ this->unk16C_4 = 1; this->unk10_12 = __chminigame_getCurrentMapId(); actor_collisionOff(this); - if(!func_803203FC(2)){ + if(!volatileFlag_get(VOLATILE_FLAG_2)){ func_8031A678(this); return; } @@ -169,12 +169,12 @@ void chMinigame_update(Actor *this){ marker_despawn(this->marker); return; } - func_803204E4(5, 0); - func_803204E4(3, 0); + volatileFlag_set(5, 0); + volatileFlag_set(3, 0); __chMinigame_setState(this, MINIGAME_STATE_1_INTRODUCE_GAME); gcpausemenu_80314AC8(0); } - if(func_803203FC(2)){ + if(volatileFlag_get(VOLATILE_FLAG_2)){ switch(this->state){ case MINIGAME_STATE_1_INTRODUCE_GAME://L8031AB2C if(this->unk138_24) @@ -184,7 +184,7 @@ void chMinigame_update(Actor *this){ func_8028FA14(MAP_8E_GL_FURNACE_FUN, 2); if(item_getCount(ITEM_14_HEALTH) == 0) item_set(ITEM_6_HOURGLASS, 0); - if(!func_803203FC(3)){ + if(!volatileFlag_get(VOLATILE_FLAG_3)){ __chMinigame_setState(this, MINIGAME_STATE_3_RETURN_TO_FF); } break; diff --git a/src/core2/code_956B0.c b/src/core2/code_956B0.c index 301dbdde..095ab093 100644 --- a/src/core2/code_956B0.c +++ b/src/core2/code_956B0.c @@ -9,8 +9,8 @@ extern s32 fileProgressFlag_get(s32); extern s32 fileProgressFlag_getN(s32 offset, s32 numBits); extern void func_8031FFAC(void); extern void fileProgressFlag_set(s32 index, s32 set); -extern void func_8032048C(void); -extern void func_803204E4(s32 arg0, s32 arg1); +extern void volatileFlag_clear(void); +extern void volatileFlag_set(s32 arg0, s32 arg1); extern void ml_vec3h_to_vec3f(f32 *, s32); extern NodeProp *func_80304ED0(void*, f32 *); extern void func_8031CD44(s32, s32, f32, f32, s32); @@ -299,7 +299,7 @@ void warp_gvEnterMatchingPyramid(s32 arg0, s32 arg1) { void warp_gvEnterWaterPyramidUpper(s32 arg0, s32 arg1) { func_80244C78(0); - func_803204E4(0xAC, 1); + volatileFlag_set(0xAC, 1); func_8031CC8C(arg0, 0x1502); } @@ -536,7 +536,7 @@ void func_8031DAA8(s32 arg0, s32 arg1) { void func_8031DAE0(s32 arg0, s32 arg1) { if (mapSpecificFlags_get(2) == 0) { - func_803204E4(0xAD, 1); + volatileFlag_set(0xAD, 1); func_80244C78(0); mapSpecificFlags_set(2, 1); func_8025A6EC(COMUSIC_3B_MINIGAME_VICTORY, 0x6D60); @@ -1498,7 +1498,7 @@ void func_8031FBA0(void) { jiggyscore_clearAll(); honeycombscore_clear(); mumboscore_clear(); - func_8032048C(); + volatileFlag_clear(); func_802D6344(); } diff --git a/src/core2/code_98CB0.c b/src/core2/code_98CB0.c index adb0d72d..0dc76f36 100644 --- a/src/core2/code_98CB0.c +++ b/src/core2/code_98CB0.c @@ -6,10 +6,10 @@ void func_8031FFAC(void); void fileProgressFlag_set(s32 index, s32 set); s32 bitfield_get_bit(u8 *array, s32 index); s32 bitfield_get_n_bits(u8 *array, s32 offset, s32 numBits); -void setBitToArray(u8 *array, s32 index, s32 set); -void func_803201C8(u8 *array, s32 startIndex, s32 set, s32 length); -void func_8032048C(void); -void func_803204E4(s32 arg0, s32 arg1); +void bitfield_set_bit(u8 *array, s32 index, s32 set); +void bitfield_set_n_bits(u8 *array, s32 startIndex, s32 set, s32 length); +void volatileFlag_clear(void); +void volatileFlag_set(s32 arg0, s32 arg1); s32 fileProgressFlag_getN(s32 offset, s32 numBits); void func_8031CE70(f32 *arg0, s32 arg1, s32 arg2); void ml_vec3h_to_vec3f(f32 *, s32); @@ -22,22 +22,22 @@ void func_80256E24(f32 *, f32, f32, f32, f32, f32); /* .data */ -s32 D_8036DDF0 = 0x24; +s32 gVolatileFlagsSize = 0x24; // sizeof(gVolatileFlags) /* .bss */ struct { s32 unk0; s32 unk4; u8 unk8[0x25]; -} D_803831A0; +} gFileProgressFlags; struct { s32 unk0; s32 unk4; u8 unk8[0x19]; -} D_803831D0; +} gVolatileFlags; -u8 D_803831F8[0x21]; //copy of D_803831D0 +u8 glVolatileFlagsCopy[0x21]; //copy of gVolatileFlags /* .code */ @@ -53,16 +53,16 @@ void func_8031FC40(void) { u32 v1; //obsucre address - t0 = (((s32)&D_803831A0.unk8 & 0xE0000000) >> 15) + - (((s32)&D_803831A0.unk8 & 0x1FC00000) >> 22) + - (((s32)&D_803831A0.unk8 & 0x00300000) << 10) + - (((s32)&D_803831A0.unk8 & 0x000F0000) << 7) + - (((s32)&D_803831A0.unk8 & 0x0000E000) << 14) + - (((s32)&D_803831A0.unk8 & 0x00001800) >> 4) + - (((s32)&D_803831A0.unk8 & 0x00000780) << 10) + - (((s32)&D_803831A0.unk8 & 0x00000060) << 4) + - (((s32)&D_803831A0.unk8 & 0x00000018) << 18) + - (((s32)&D_803831A0.unk8 & 0x00000007) << 11); + t0 = (((s32)&gFileProgressFlags.unk8 & 0xE0000000) >> 15) + + (((s32)&gFileProgressFlags.unk8 & 0x1FC00000) >> 22) + + (((s32)&gFileProgressFlags.unk8 & 0x00300000) << 10) + + (((s32)&gFileProgressFlags.unk8 & 0x000F0000) << 7) + + (((s32)&gFileProgressFlags.unk8 & 0x0000E000) << 14) + + (((s32)&gFileProgressFlags.unk8 & 0x00001800) >> 4) + + (((s32)&gFileProgressFlags.unk8 & 0x00000780) << 10) + + (((s32)&gFileProgressFlags.unk8 & 0x00000060) << 4) + + (((s32)&gFileProgressFlags.unk8 & 0x00000018) << 18) + + (((s32)&gFileProgressFlags.unk8 & 0x00000007) << 11); //unobscure address t1 = ((t0 & 0x1E0600) << 0xB) | ((s32) (t0 & 0x603800) / 8); @@ -79,7 +79,7 @@ void func_8031FC40(void) { v0 = (((v0 - ptr[v1]) & 0x1F) << 0xF) ^ ((ptr[v1]* 0x1B) + (v0 >> 0xB)); } - scrambled_ptr = (s32 *) ((((s32) &D_803831A0 & 0x55555555) << 1) + (((s32) &D_803831A0 & 0xAAAAAAAA) >> 1)); + scrambled_ptr = (s32 *) ((((s32) &gFileProgressFlags & 0x55555555) << 1) + (((s32) &gFileProgressFlags & 0xAAAAAAAA) >> 1)); unscrambled_ptr = (s32 *) ((((s32) scrambled_ptr & 0x55555555) << 1) | (((s32) scrambled_ptr & 0xAAAAAAAA) >> 1)); *unscrambled_ptr = v0; } @@ -92,7 +92,7 @@ u32 func_8031FE40(void) { var_v1 = 0xDE1C05; var_v0 = 0x25; - obscured_addr = (u8*)OBSCURE(&D_803831A0.unk8[0]); + obscured_addr = (u8*)OBSCURE(&gFileProgressFlags.unk8[0]); for(var_a2 = 0; var_a2 < var_v0; var_a2++){ var_v1 += ((var_v1 % 4) + var_a2) * obscured_addr[var_a2]; } @@ -101,16 +101,16 @@ u32 func_8031FE40(void) { void func_8031FEC0(void) { u32 *obscured_addr; - obscured_addr = (u32*)OBSCURE(&D_803831A0.unk4); + obscured_addr = (u32*)OBSCURE(&gFileProgressFlags.unk4); *obscured_addr = func_8031FE40(); } bool fileProgressFlag_get(enum file_progress_e index) { - return bitfield_get_bit(D_803831A0.unk8, index); + return bitfield_get_bit(gFileProgressFlags.unk8, index); } s32 fileProgressFlag_getN(s32 offset, s32 numBits) { - return bitfield_get_n_bits(D_803831A0.unk8, offset, numBits); + return bitfield_get_n_bits(gFileProgressFlags.unk8, offset, numBits); } s32 fileProgressFlag_getAndSet(s32 index, s32 set) { @@ -125,27 +125,27 @@ void func_8031FFAC(void) { s32 i; for (i = 0; i < 37; i++) { - D_803831A0.unk8[i] = 0; + gFileProgressFlags.unk8[i] = 0; } func_8031FC40(); func_8031FEC0(); } void fileProgressFlag_set(s32 index, s32 set) { - setBitToArray(D_803831A0.unk8, index, set); + bitfield_set_bit(gFileProgressFlags.unk8, index, set); func_8031FC40(); func_8031FEC0(); } void fileProgressFlag_setN(s32 startIndex, s32 set, s32 length) { - func_803201C8(D_803831A0.unk8, startIndex, set, length); + bitfield_set_n_bits(gFileProgressFlags.unk8, startIndex, set, length); func_8031FC40(); func_8031FEC0(); } -void progressflags_getSizeAndPtr(s32 *size, u8 **addr) { +void fileProgressFlag_getSizeAndPtr(s32 *size, u8 **addr) { *size = 0x25; - *addr = D_803831A0.unk8; + *addr = gFileProgressFlags.unk8; } // Returns a single bit from a byte array @@ -171,7 +171,7 @@ s32 bitfield_get_n_bits(u8 *array, s32 offset, s32 numBits) { } // Sets or clears a single bit in a byte array -void setBitToArray(u8 *array, s32 index, s32 set) { +void bitfield_set_bit(u8 *array, s32 index, s32 set) { if (set) { array[index / 8] |= (1 << (index & 7)); } else { @@ -180,21 +180,21 @@ void setBitToArray(u8 *array, s32 index, s32 set) { } // Sets or clears a range of bits in a byte array -void func_803201C8(u8 *array, s32 startIndex, s32 set, s32 length) { +void bitfield_set_n_bits(u8 *array, s32 startIndex, s32 set, s32 length) { s32 i; for (i = 0; i < length; i++) { - setBitToArray(array, startIndex + i, (1 << i) & set); + bitfield_set_bit(array, startIndex + i, (1 << i) & set); } } -s32 func_80320240(void){return 1;} +s32 dummy_func_80320240(void){return 1;} -s32 func_80320248(void){return 1;} +s32 dummy_func_80320248(void){return 1;} u32 func_80320250(void) { u32 checksum = 0x6CE9E91F; - u8 *obscured_addr = (u8*)OBSCURE(&D_803831D0.unk8[0]); + u8 *obscured_addr = (u8*)OBSCURE(&gVolatileFlags.unk8[0]); s32 len = 25; u32 i; @@ -207,7 +207,7 @@ u32 func_80320250(void) { } void func_803202D0(void) { - s32 addr = (s32) &D_803831D0.unk0; + s32 addr = (s32) &gVolatileFlags.unk0; addr ^= 0x7EDDF5F4; addr ^= 0x7BEF9D80; addr ^= 0x5326874; @@ -215,7 +215,7 @@ void func_803202D0(void) { } s32 func_80320320(void) { - s32 addr = (s32) &D_803831D0.unk8[0]; + s32 addr = (s32) &gVolatileFlags.unk8[0]; s32 checksum = 0x281E421C; s32 len = 25; s32 scrambled; @@ -238,44 +238,44 @@ s32 func_80320320(void) { } void func_803203A0(void) { - u32 *obscured_addr = (u32*)OBSCURE(&D_803831D0.unk4); + u32 *obscured_addr = (u32*)OBSCURE(&gVolatileFlags.unk4); *obscured_addr = func_80320320(); } -s32 func_803203FC(s32 index) { - return bitfield_get_bit(D_803831D0.unk8, index); +s32 volatileFlag_get(s32 index) { + return bitfield_get_bit(gVolatileFlags.unk8, index); } -void func_80320424(s32 index, s32 numBits) { - bitfield_get_n_bits(D_803831D0.unk8, index, numBits); +void volatileFlag_getN(s32 index, s32 numBits) { + bitfield_get_n_bits(gVolatileFlags.unk8, index, numBits); } -s32 func_80320454(s32 index, s32 arg1) { +s32 volatileFlag_getAndSet(s32 index, s32 arg1) { s32 temp_v0; - temp_v0 = func_803203FC(index); - func_803204E4(index, arg1); + temp_v0 = volatileFlag_get(index); + volatileFlag_set(index, arg1); return temp_v0; } -void func_8032048C(void) { +void volatileFlag_clear(void) { s32 i; for (i = 0; i < 25; i++) { - D_803831D0.unk8[i] = 0; + gVolatileFlags.unk8[i] = 0; } func_803202D0(); func_803203A0(); } -void func_803204E4(s32 index, s32 set) { - setBitToArray(D_803831D0.unk8, index, set); +void volatileFlag_set(s32 index, s32 set) { + bitfield_set_bit(gVolatileFlags.unk8, index, set); func_803202D0(); func_803203A0(); } -void func_80320524(s32 startIndex, s32 set, s32 length) { - func_803201C8(D_803831D0.unk8, startIndex, set, length); +void volatileFlag_setN(s32 startIndex, s32 set, s32 length) { + bitfield_set_n_bits(gVolatileFlags.unk8, startIndex, set, length); func_803202D0(); func_803203A0(); } @@ -285,7 +285,7 @@ s32 func_8032056C(void) { s32 temp_a1; s32 temp_a1_2; s32 phi_t9; - s32 addr = (s32)&D_803831D0; + s32 addr = (s32)&gVolatileFlags; s32 temp_v1; temp_v1 = ((addr & 0xE0000000) >> 15) + @@ -312,31 +312,32 @@ s32 func_80320708(void) { u16 temp_t6; s32 addr; - temp_t6 = ((s32) &D_803831D0.unk4 >> 0x10); - addr = (s32) &D_803831D0.unk4 ^ temp_t6; + temp_t6 = ((s32) &gVolatileFlags.unk4 >> 0x10); + addr = (s32) &gVolatileFlags.unk4 ^ temp_t6; return func_80320320() == *(s32*)(addr ^ temp_t6); } -void func_80320748(void) { - s32 var_v0; - u8 *var_a0; - u8 *var_a1; +void volatileFlag_backupAll(void) { + s32 i; + u8 *dst; + u8 *src; - var_a1 = &D_803831D0; - var_a0 = D_803831F8; - for(var_v0 = 0; var_v0 < D_8036DDF0; var_v0++){ - var_a0[var_v0] = var_a1[var_v0]; + src = (u8 *) &gVolatileFlags; + dst = glVolatileFlagsCopy; + for(i = 0; i < gVolatileFlagsSize; i++){ + dst[i] = src[i]; } } -void func_80320798(void) { - s32 var_v0; - u8 *var_a0; - u8 *var_a1; +void volatileFlag_restoreAll(void) { + s32 i; + u8 *dst; + u8 *src; - var_a1 = D_803831F8; - var_a0 = &D_803831D0; - for(var_v0 = 0; var_v0 < D_8036DDF0; var_v0++){ - var_a0[var_v0] = var_a1[var_v0]; + src = glVolatileFlagsCopy; + dst = (u8 *) &gVolatileFlags; + + for(i = 0; i < gVolatileFlagsSize; i++) { + dst[i] = src[i]; } } diff --git a/src/core2/code_9A740.c b/src/core2/code_9A740.c index a601b351..28ce94cd 100644 --- a/src/core2/code_9A740.c +++ b/src/core2/code_9A740.c @@ -37,12 +37,12 @@ void func_803216D0(enum map_e map){ levelSpecificFlags_clear(); bsStoredState_clearTimers(); func_803219A8(); - if( func_80320454(0x17, FALSE) + if( volatileFlag_getAndSet(0x17, FALSE) && getGameMode() != 0 && D_80383300.level != LEVEL_D_CUTSCENE && map != MAP_91_FILE_SELECT ){ - func_803204E4(0x18, TRUE); + volatileFlag_set(0x18, TRUE); } if(D_80383300.level == LEVEL_9_RUSTY_BUCKET_BAY){ @@ -74,7 +74,7 @@ void func_80321854(void){ && fileProgressFlag_get(FILEPROG_31_MM_OPEN) && !fileProgressFlag_get(FILEPROG_C1_BADDIES_ESCAPE_TEXT) ){ - func_803204E4(0x22, 1); + volatileFlag_set(0x22, 1); } bsStoredState_8029A924(); //null func_803465BC(); //null diff --git a/src/core2/code_9B990.c b/src/core2/code_9B990.c index fb7e3fd0..fbfdb793 100644 --- a/src/core2/code_9B990.c +++ b/src/core2/code_9B990.c @@ -286,8 +286,8 @@ void __overlay_bgs_release(void){ return; } void func_80322D38(void){ if( map_get() == MAP_10_BGS_MR_VILE - && func_803203FC(2) - && func_803203FC(7) + && volatileFlag_get(VOLATILE_FLAG_2) + && volatileFlag_get(VOLATILE_FLAG_7_HAS_SEEN_VILE_FF_MINIGAME) ){ player_setTransformation(TRANSFORM_5_CROC); } diff --git a/src/core2/code_9E370.c b/src/core2/code_9E370.c index f0d75c08..159f7774 100644 --- a/src/core2/code_9E370.c +++ b/src/core2/code_9E370.c @@ -19,7 +19,6 @@ f32 func_80257204(f32, f32, f32, f32); extern Actor *func_802C4260(enum actor_e actor_id, s32 x, s32 y, s32 z, s32 yaw); f32 func_8033229C(ActorMarker *); f32 player_getYaw(void); -extern void func_8032FFF4(ActorMarker *, ActorMarker *, s32); extern void func_802C9334(s32, Actor *); extern void func_8032B3A0(Actor *, ActorMarker *); extern void func_8032EE0C(GenFunction_2, s32); @@ -529,7 +528,7 @@ void func_803268B4(void) { if (suBaddieActorArray != NULL) { - sp54 = func_803203FC(101); + sp54 = volatileFlag_get(101); for(temp_v1 = suBaddieActorArray->cnt - 1; temp_v1 >= 0; temp_v1--){ actor = &suBaddieActorArray->data[temp_v1]; actor_info = actor->actor_info; @@ -538,7 +537,7 @@ void func_803268B4(void) { temp_s1 = actor->actor_info->unk18; if (marker->propPtr->unk8_4) { if(sp54){ - if ( actor->actor_info->unk20 && func_803203FC( actor->actor_info->unk20)) { + if ( actor->actor_info->unk20 && volatileFlag_get( actor->actor_info->unk20)) { marker_despawn(marker); } } @@ -724,7 +723,7 @@ Actor **actorArray_findJiggyActors(void) { return suBaddieJiggyArray; } -bool func_803270B8(f32 arg0[3], f32 arg1, s32 arg2, int (*arg3)(Actor *), ActorMarker * arg4){ +bool func_803270B8(f32 arg0[3], f32 arg1, enum marker_collision_func_type_e arg2, int (*arg3)(Actor *), ActorMarker * arg4){ bool var_s4; Actor * start; Actor * i_ptr; @@ -741,7 +740,7 @@ bool func_803270B8(f32 arg0[3], f32 arg1, s32 arg2, int (*arg3)(Actor *), ActorM ) { var_s4 = TRUE; if (!func_8033D410(arg4, i_ptr->marker)) { - func_8032FFF4(i_ptr->marker, arg4, arg2); + marker_callCollisionFunc(i_ptr->marker, arg4, arg2); } } } @@ -849,7 +848,7 @@ Actor *actor_new(s32 position[3], s32 yaw, ActorInfo* actorInfo, u32 flags){ func_8032FFD4(suLastBaddie->marker, suBaddieActorArray->cnt - 1); marker_setModelId(suLastBaddie->marker, actorInfo->modelId); marker_setActorUpdateFunc(suLastBaddie->marker, actorInfo->update_func); - marker_setActorUpdate2Func(suLastBaddie->marker, actorInfo->unk10); + marker_setActorUpdate2Func(suLastBaddie->marker, actorInfo->update2_func); ml_vec3f_clear(suLastBaddie->unk1C); ml_vec3f_clear(suLastBaddie->velocity); ml_vec3f_clear(suLastBaddie->spawn_position); @@ -859,7 +858,7 @@ Actor *actor_new(s32 position[3], s32 yaw, ActorInfo* actorInfo, u32 flags){ suLastBaddie->stored_animctrl_forwards = 0; suLastBaddie->stored_animctrl_smoothTransistion = 0; suLastBaddie->stored_animctrl_duration = 0.0f; - suLastBaddie->unkEC = 0.0f; + suLastBaddie->stored_animctrl_timer = 0.0f; suLastBaddie->unk138_19 = 0; suLastBaddie->stored_animctrl_subrangeMin = 0.0f; suLastBaddie->stored_animctrl_subrangeMax = 1.0f; @@ -868,7 +867,7 @@ Actor *actor_new(s32 position[3], s32 yaw, ActorInfo* actorInfo, u32 flags){ suLastBaddie->unk138_29 = 0; suLastBaddie->unk18 = actorInfo->animations; suLastBaddie->animctrl = NULL; - suLastBaddie->unkEC = 0.0f; + suLastBaddie->stored_animctrl_timer = 0.0f; suLastBaddie->unk130 = 0; suLastBaddie->unk124_5 = 0; suLastBaddie->unk124_3 = 0; @@ -1518,7 +1517,7 @@ bool func_803294F0(Actor *this, s32 arg1, s32 arg2){ bool func_80329530(Actor *this, s32 dist){ if( func_8028F098() - && !func_803203FC(0xBF) + && !volatileFlag_get(0xBF) && subaddie_playerIsWithinSphere(this, dist) ){ return TRUE; @@ -1684,7 +1683,7 @@ void func_80329B68(Actor *this){ animctrl_setDirection(this->animctrl, this->stored_animctrl_forwards); animctrl_setSmoothTransition(this->animctrl, this->stored_animctrl_smoothTransistion); animctrl_setDuration(this->animctrl, this->stored_animctrl_duration); - animctrl_setStart(this->animctrl, this->unkEC); + animctrl_setStart(this->animctrl, this->stored_animctrl_timer); animctrl_setSubRange(this->animctrl, this->stored_animctrl_subrangeMin, this->stored_animctrl_subrangeMax); animctrl_start(this->animctrl, "subaddie.c", 0x8fd); animctrl_setTimer(this->animctrl, this->sound_timer); @@ -1761,7 +1760,7 @@ void *actors_appendToSavestate(void * begin, u32 end){ s0->stored_animctrl_forwards = animctrl_isPlayedForwards(s0->animctrl); s0->stored_animctrl_smoothTransistion = animctrl_isSmoothTransistion(s0->animctrl); s0->stored_animctrl_duration = animctrl_getDuration(s0->animctrl); - s0->unkEC = animctrl_getAnimTimer(s0->animctrl); + s0->stored_animctrl_timer = animctrl_getAnimTimer(s0->animctrl); animctrl_getSubRange(s0->animctrl, &s0->stored_animctrl_subrangeMin, &s0->stored_animctrl_subrangeMax); } s0->animctrl = NULL; @@ -2231,7 +2230,7 @@ void func_8032B5C0(ActorMarker *arg0, ActorMarker *arg1, struct5Cs *arg2) { s32 sp70; s32 sp6C; s32 sp68; - s32 sp64; + enum marker_collision_func_type_e sp64; s32 var_v0; f32 player_yaw; f32 sp50[3]; @@ -2311,7 +2310,7 @@ void func_8032B5C0(ActorMarker *arg0, ActorMarker *arg1, struct5Cs *arg2) { } func_8032EE20(); } - func_8032FFF4(arg0, arg1, sp64); + marker_callCollisionFunc(arg0, arg1, sp64); } if ((sp64 != 0) && (sp6C != 0)) { FUNC_8030E8B4(SFX_1D_HITTING_AN_ENEMY_1, 1.0f, 25984, this->position, (s32)((500.0f + func_8033229C(arg0)) * 0.5), (s32)((500.0f + func_8033229C(arg0)) * 5)); diff --git a/src/core2/code_A5BC0.c b/src/core2/code_A5BC0.c index 4185c82c..e682f8c6 100644 --- a/src/core2/code_A5BC0.c +++ b/src/core2/code_A5BC0.c @@ -1,6 +1,7 @@ #include #include "functions.h" #include "variables.h" +#include "enums.h" #define AssetCacheSize 0x3D5 @@ -887,7 +888,7 @@ void cube_fromFile(Struct61s *file_ptr, Cube *cube) { } if (file_getByte_ifExpected(file_ptr, 8, &sp47)) { - sp34 = func_803203FC(1) + func_803203FC(2) + func_803203FC(0x1F); + sp34 = volatileFlag_get(VOLATILE_FLAG_1) + volatileFlag_get(VOLATILE_FLAG_2) + volatileFlag_get(0x1F); if ((sp34) && gcparade_8031B4CC()) { sp34 = 0; @@ -1219,17 +1220,17 @@ void func_8032FFEC(ActorMarker *this, s32 arg1){ this->unk28 = arg1; } -void func_8032FFF4(ActorMarker *this, ActorMarker *other, s32 type){ +void marker_callCollisionFunc(ActorMarker *this, ActorMarker *other, enum marker_collision_func_type_e type){ switch(type){ - case 0: //ow + case MARKER_COLLISION_FUNC_0: //ow if(this->collisionFunc) this->collisionFunc(this, other); break; - case 1: + case MARKER_COLLISION_FUNC_1: if(this->collision2Func) this->collision2Func(this, other); break; - case 2: //die + case MARKER_COLLISION_FUNC_2_DIE: //die if(this->dieFunc) this->dieFunc(this, other); break; diff --git a/src/core2/code_B5040.c b/src/core2/code_B5040.c index b30da025..6e291afd 100644 --- a/src/core2/code_B5040.c +++ b/src/core2/code_B5040.c @@ -112,7 +112,7 @@ void savedata_init(void){ //savedata_init jiggyscore_getSizeAndPtr(&jiggy_size, &jiggy_addr); honeycombscore_getSizeAndPtr(&honeycomb_size, &honeycomb_addr); mumboscore_getSizeAndPtr(&mumbotoken_size, &mumbotoken_addr); - progressflags_getSizeAndPtr(&progressflags_size, &progressflags_addr); + fileProgressFlag_getSizeAndPtr(&progressflags_size, &progressflags_addr); notescore_getSizeAndPtr(¬escores_size, ¬escores_addr); timeScores_getSizeAndPtr(×cores_size, ×cores_addr); saveditem_getSizeAndPtr(&saved_item_size, &saved_item_addr); @@ -194,7 +194,7 @@ void func_8033C460(u8 *savedata){ //global_progress u8 *progressflags_addr; int i; - progressflags_getSizeAndPtr(&progressflags_size, &progressflags_addr); + fileProgressFlag_getSizeAndPtr(&progressflags_size, &progressflags_addr); for(i = progressflagsOffset; i < progressflagsOffset + progressflags_size; i++){ progressflags_addr[i - progressflagsOffset] = savedata[i]; } @@ -287,7 +287,7 @@ void __savedata_8033C8A0(u8 *savedata){ //global_progress u8 *progressflags_addr; int i; - progressflags_getSizeAndPtr(&progressflags_size, &progressflags_addr); + fileProgressFlag_getSizeAndPtr(&progressflags_size, &progressflags_addr); for(i = progressflagsOffset; i < progressflagsOffset + progressflags_size; i++){ savedata[i] = progressflags_addr[i - progressflagsOffset]; } @@ -360,14 +360,14 @@ void saveData_load(SaveData *savedata){ func_8033C4E4(savedata); __savedata_load_abilities(savedata); for(i = 0; D_80370A20[i].unk0 != -1; i++){ - func_803204E4(D_80370A20[i].unk0, fileProgressFlag_get(D_80370A20[i].unk2)); + volatileFlag_set(D_80370A20[i].unk0, fileProgressFlag_get(D_80370A20[i].unk2)); } } void saveData_create(SaveData *savedata){ int i; for(i = 0; D_80370A20[i].unk0 != -1; i++){ - fileProgressFlag_set(D_80370A20[i].unk2, func_803203FC(D_80370A20[i].unk0)); + fileProgressFlag_set(D_80370A20[i].unk2, volatileFlag_get(D_80370A20[i].unk0)); } savedata_clear(savedata); __savedata_save_magic(savedata); diff --git a/src/core2/code_B62B0.c b/src/core2/code_B62B0.c index ac307fc7..155cb8ee 100644 --- a/src/core2/code_B62B0.c +++ b/src/core2/code_B62B0.c @@ -291,7 +291,7 @@ s32 func_8033D564(struct5Cs *arg0){ return arg0->unk0_15; } -s32 func_8033D574(struct5Cs *arg0){ +enum marker_collision_func_type_e func_8033D574(struct5Cs *arg0){ return arg0->unk0_11; } diff --git a/src/core2/code_BEF20.c b/src/core2/code_BEF20.c index 332efe92..4f9ffa18 100644 --- a/src/core2/code_BEF20.c +++ b/src/core2/code_BEF20.c @@ -66,11 +66,11 @@ s32 item_adjustByDiff(enum item_e item, s32 diff, s32 no_hud){ diff = 0; if(diff < 0){ - if( (item == ITEM_D_EGGS && func_803203FC(UNKFLAGS1_74_SANDCASTLE_INFINITE_EGGS)) - || (item == ITEM_16_LIFE && func_803203FC(UNKFLAGS1_73_SANDCASTLE_INFINITE_LIVES)) - || (item == ITEM_F_RED_FEATHER && func_803203FC(UNKFLAGS1_75_SANDCASTLE_INFINITE_RED_FEATHERS)) - || (item == ITEM_10_GOLD_FEATHER && func_803203FC(UNKFLAGS1_76_SANDCASTLE_INFINITE_GOLD_FEATHERS)) - || (item == ITEM_17_AIR && func_803203FC(UNKFLAGS1_96_SANDCASTLE_INFINITE_AIR)) + if( (item == ITEM_D_EGGS && volatileFlag_get(VOLATILE_FLAG_74_SANDCASTLE_INFINITE_EGGS)) + || (item == ITEM_16_LIFE && volatileFlag_get(VOLATILE_FLAG_73_SANDCASTLE_INFINITE_LIVES)) + || (item == ITEM_F_RED_FEATHER && volatileFlag_get(VOLATILE_FLAG_75_SANDCASTLE_INFINITE_RED_FEATHERS)) + || (item == ITEM_10_GOLD_FEATHER && volatileFlag_get(VOLATILE_FLAG_76_SANDCASTLE_INFINITE_GOLD_FEATHERS)) + || (item == ITEM_17_AIR && volatileFlag_get(VOLATILE_FLAG_96_SANDCASTLE_INFINITE_AIR)) ){ diff = 0; } @@ -253,7 +253,7 @@ void func_803465E4(void){ }//L8034667C if(D_80385FE0){ - if(gctransition_done() || func_803203FC(0)){ + if(gctransition_done() || volatileFlag_get(VOLATILE_FLAG_0)){ if(D_80385FE4){ item_dec(ITEM_16_LIFE); func_802FACA4(ITEM_14_HEALTH); @@ -308,7 +308,7 @@ void func_803465E4(void){ }//L803469E4 }//L803469E4 - if(!func_803203FC(0xbf)){ + if(!volatileFlag_get(0xbf)){ for(i = 0; i < 6; i++){ if(D_80385F30[ITEM_6_HOURGLASS + i]){ func_80345EB0(ITEM_0_HOURGLASS_TIMER + i); @@ -327,7 +327,7 @@ void func_803465E4(void){ }//L80346B6C if((globalTimer_getTime() & 7) == 6){ - if(!func_80320708() || !func_80320248()){ + if(!func_80320708() || !dummy_func_80320248()){ D_80385F30[randi2(0, 0x2C)] = 1; D_80385FF0[randi2(0, 0xE)] = 1; D_80386000[randi2(0, 0xE)] = 1.0f; @@ -406,9 +406,9 @@ void func_80346DB4(s32 note_count) { if (!levelSpecificFlags_get(0x34) && (func_80311480(0xF76, 0, NULL, NULL, NULL, NULL))) { levelSpecificFlags_set(0x34, TRUE); } - if (func_803203FC(0x17) == 0) { - func_803204E4(0x17, 1); - func_80320524(0x19, level_id, 4); + if (volatileFlag_get(0x17) == 0) { + volatileFlag_set(0x17, 1); + volatileFlag_setN(0x19, level_id, 4); } } } @@ -537,7 +537,7 @@ void func_8034789C(void) { } else { D_80385F30[ITEM_15_HEALTH_TOTAL] = 5 + MIN(3, (sp1C / 6)); } - if (func_803203FC(0x94)) { + if (volatileFlag_get(0x94)) { temp_v0 = D_80385F30[ITEM_15_HEALTH_TOTAL]; if (temp_v0 >= 9) { D_80385F30[ITEM_15_HEALTH_TOTAL] = temp_v0; @@ -591,16 +591,16 @@ void func_80347A70(void){ s32 D_80386068; void func_80347A7C(void){ - func_80320748(); + volatileFlag_backupAll(); D_80386068 = item_getCount(ITEM_16_LIFE); } void func_80347AA8(void) { - func_80320798(); - func_803204E4(0x1F, FALSE); - func_803204E4(0x20, FALSE); - func_803204E4(0xC1, FALSE); - func_803204E4(0xC0, FALSE); + volatileFlag_restoreAll(); + volatileFlag_set(0x1F, FALSE); + volatileFlag_set(0x20, FALSE); + volatileFlag_set(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE, FALSE); + volatileFlag_set(VOLATILE_FLAG_C0_BEGIN_FINAL_CHARACTER_PARADE, FALSE); item_set(ITEM_16_LIFE, D_80386068); itemPrint_reset(); } diff --git a/src/core2/code_C2F30.c b/src/core2/code_C2F30.c index 369c03e0..d3ae9568 100644 --- a/src/core2/code_C2F30.c +++ b/src/core2/code_C2F30.c @@ -77,7 +77,7 @@ void func_80349FB0(DemoInput *input_ptr, u32 size, int arg2){ func_8031FBA0(); func_803216D0(map_get()); func_8030AFA0(map_get()); - func_803204E4(0xc4, 1); + volatileFlag_set(VOLATILE_FLAG_C4_WOZZA_HIDE_IN_SNS_PARADE, 1); func_8024F224(); rand_reset(); globalTimer_reset(); diff --git a/src/core2/code_C4320.c b/src/core2/code_C4320.c index 7f8c3a77..626172ad 100644 --- a/src/core2/code_C4320.c +++ b/src/core2/code_C4320.c @@ -207,7 +207,7 @@ void func_8034B8C0(enum map_e map_id, s32 demo_id) { demo_load(map_id,demo_id); D_80386118 = D_8038611C = 0; if (D_80386114->unk1 == 6) { - func_803204E4(0x1F, 1); + volatileFlag_set(0x1F, 1); func_802E4A70(); } if ((demo_id == 0x5B) || (demo_id == 0x5F)) { @@ -297,16 +297,16 @@ void func_8034BB90(void) { D_80386118 = 1; } func_8034B580(D_80386114->unk1); - if (func_803203FC(0xC3)) { - func_803204E4(0xC3, 0); + if (volatileFlag_get(VOLATILE_FLAG_C3)) { + volatileFlag_set(VOLATILE_FLAG_C3, 0); func_8034B9E4(); } if( !sp1C && sp18 && !D_8038611C && (getGameMode() != GAME_MODE_8_BOTTLES_BONUS) - && ((func_803203FC(0x64) && (getGameMode() != GAME_MODE_A_SNS_PICTURE)) - || func_803203FC(0x63)) + && ((volatileFlag_get(0x64) && (getGameMode() != GAME_MODE_A_SNS_PICTURE)) + || volatileFlag_get(0x63)) ) { func_8034B7F0(D_80386114->unk1); if (getGameMode() == GAME_MODE_9_BANJO_AND_KAZOOIE) { @@ -317,7 +317,7 @@ void func_8034BB90(void) { } else { func_802DF0C8(); } - } else if (func_803203FC(0x64)) { + } else if (volatileFlag_get(0x64)) { func_802E412C(1, D_80386114->unk5); func_8034B994(); } else { @@ -329,8 +329,8 @@ void func_8034BB90(void) { func_8025A58C(0, 800); func_8025AB00(); } - func_803204E4(0x64, 0); - func_803204E4(0x63, 0); + volatileFlag_set(0x64, 0); + volatileFlag_set(0x63, 0); D_8038611C = 1; } } @@ -338,7 +338,7 @@ void func_8034BB90(void) { s32 func_8034BDA4(enum map_e map_id, s32 exit_id) { s32 phi_v0; - if (func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) { + if (volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) { return D_80371F70.unk3; } diff --git a/src/core2/code_CF3E0.c b/src/core2/code_CF3E0.c index 0f7c9071..e08e55f5 100644 --- a/src/core2/code_CF3E0.c +++ b/src/core2/code_CF3E0.c @@ -104,15 +104,15 @@ void func_8035646C(enum file_progress_e progress_flag) { s32 func_8035648C(s32 arg0, s32 arg1) { s32 index; - if (func_803203FC() != 0) { + if (volatileFlag_get(arg0) != 0) { return 0; } else { index = __findIndex(volatileProgressDialogMap, arg0); if (index != -1) { if (func_80311480(volatileProgressDialogMap[index].value, arg1, 0, 0, 0, 0) != 0) { - func_803204E4(arg0, 1); + volatileFlag_set(arg0, 1); } - return func_803203FC(arg0); + return volatileFlag_get(arg0); } return 0; } diff --git a/src/core2/code_D0CA0.c b/src/core2/code_D0CA0.c index 05a0aab4..39cc0110 100644 --- a/src/core2/code_D0CA0.c +++ b/src/core2/code_D0CA0.c @@ -357,7 +357,7 @@ void func_80358684(Actor *this) { } if (local->unk4 >= 1.0f) { local->unk4 = 1.0f; - if (func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)) { + if (volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)) { local->unk39 = 0; } else { if (this->state == 2) { diff --git a/src/core2/code_D6600.c b/src/core2/code_D6600.c index 77be8500..209a7814 100644 --- a/src/core2/code_D6600.c +++ b/src/core2/code_D6600.c @@ -130,7 +130,7 @@ void func_8035DA1C(Actor *this) { this->unk138_25 = TRUE; this->unk28 = 4.0f; LOCAL_D6600(this)->unk4 =(map_get() == MAP_71_GL_STATUE_ROOM) ? 8 : 0xf; - if (func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)) { + if (volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)) { this->unk28 = 0.0f; subaddie_set_state_with_direction(this, 1, 0.0f, 1); } @@ -151,7 +151,7 @@ void func_8035DA1C(Actor *this) { func_80328FB0(this, 0.5f); func_80328FF0(this, 0.5f); func_8032CA80(this, LOCAL_D6600(this)->unk4); - if (subaddie_maybe_set_state(this, 2, 0.05f) && !func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)) { + if (subaddie_maybe_set_state(this, 2, 0.05f) && !volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)) { this->unk28 = 4.0f; } func_8035D65C(this); diff --git a/src/core2/code_D89E0.c b/src/core2/code_D89E0.c index 5b864c4a..60e84b3b 100644 --- a/src/core2/code_D89E0.c +++ b/src/core2/code_D89E0.c @@ -43,7 +43,7 @@ void func_8035F970(Actor *this){ } void func_8035F99C(Actor *this){ - if(!func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)){ + if(!volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)){ subaddie_set_state_with_direction(this, 2, 0.01f, 1); actor_playAnimationOnce(this); this->unk28 = 5.0f; diff --git a/src/core2/code_DA760.c b/src/core2/code_DA760.c index 81aee2c5..1f142fc2 100644 --- a/src/core2/code_DA760.c +++ b/src/core2/code_DA760.c @@ -33,8 +33,8 @@ int func_803616F0(Actor *this){ } void func_80361828(Actor *this){ - if(func_803203FC(0x16) && level_get() == LEVEL_6_LAIR){ - func_803204E4(0x16, 0); + if(volatileFlag_get(0x16) && level_get() == LEVEL_6_LAIR){ + volatileFlag_set(0x16, 0); } } @@ -54,19 +54,19 @@ void func_80361870(Actor *this){ } } else if(func_803616F0(this)){ - sp28 = (func_803203FC(0x16)?0xf6e:0xf68) + this->unkF4_8 - 1; - if(!func_803203FC(0x16) && level_get() == LEVEL_6_LAIR){ + sp28 = (volatileFlag_get(0x16)?0xf6e:0xf68) + this->unkF4_8 - 1; + if(!volatileFlag_get(0x16) && level_get() == LEVEL_6_LAIR){ this->unk138_24 = TRUE; } else{ if(func_80311480(sp28, 0, 0, 0, 0, 0)){ this->unk138_24 = TRUE; - func_803204E4(0x16, 0); + volatileFlag_set(0x16, 0); } } } else{//L80361A14 - func_803204E4(0x16, 0); + volatileFlag_set(0x16, 0); } }//L80361A20 } diff --git a/src/core2/gc/dialog.c b/src/core2/gc/dialog.c index fe5881a6..446cd2af 100644 --- a/src/core2/gc/dialog.c +++ b/src/core2/gc/dialog.c @@ -228,7 +228,7 @@ void func_8030F338(void){ } } if(g_Dialog.unk128_31 & 0x8){ - if((!func_802E4A08() && !func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) || !g_Dialog.unk128_3){ + if((!func_802E4A08() && !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) || !g_Dialog.unk128_3){ func_8028F918(0); } }//L8030F3E8 @@ -710,13 +710,13 @@ void func_803106BC(s32 text_id, s32 arg1, ActorMarker *marker, void(*callback)(A g_Dialog.active_zoombox = 1; }//L8031095C g_Dialog.unk128_6 = 1; - g_Dialog.unk12C_23 = ((func_802E4A08() || func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) && g_Dialog.unk128_3) ? 1 : -1; + g_Dialog.unk12C_23 = ((func_802E4A08() || volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) && g_Dialog.unk128_3) ? 1 : -1; g_Dialog.caller = marker; g_Dialog.unk13C = callback; g_Dialog.unk140 = arg4; g_Dialog.unk144 = (void *)arg5; g_Dialog.unk138 = (marker != NULL )? ((marker->unk5C)? marker->unk5C : -1) : 0; - gcdialog_setState(((func_802E4A08() || func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) && g_Dialog.unk128_3) ? 6 : 1); + gcdialog_setState(((func_802E4A08() || volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) && g_Dialog.unk128_3) ? 6 : 1); //L803109EC } @@ -795,7 +795,7 @@ void func_80310D2C(void){ g_Dialog.unk138 = sp24->unk14; func_8025A55C(8000, 300, 2); - if((sp24->unk2 & 0x8) && !((func_802E4A08() || func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) && g_Dialog.unk128_3)){//L80310E6C + if((sp24->unk2 & 0x8) && !((func_802E4A08() || volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) && g_Dialog.unk128_3)){//L80310E6C func_8028F918(0); if( 0.0f == sp24->unk4_x && 0.0f == sp24->unk4_y @@ -871,13 +871,13 @@ int func_80311174(s32 text_id, s32 arg1, f32 *pos, ActorMarker *marker, void(*ca f32 pad; s32 temp_v1; - if(func_803203FC(1) || func_802D686C()) + if(volatileFlag_get(VOLATILE_FLAG_1) || func_802D686C()) return 0; if(!func_803114B0()){ func_80310B1C(text_id, arg1, marker, (void *)callback, (void *)arg5, arg6); if(arg1 & 8){ - if(!(func_802E4A08() || func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) || !g_Dialog.unk128_3){//L80311214 + if(!(func_802E4A08() || volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) || !g_Dialog.unk128_3){//L80311214 if(pos != NULL){ func_8028F94C(((g_Dialog.string_cmd[1] < 0)? 1 : 3), pos); }else{//L8031126C @@ -922,7 +922,7 @@ int func_80311174(s32 text_id, s32 arg1, f32 *pos, ActorMarker *marker, void(*ca g_Dialog.unk148[temp_v1].unk20 = arg6; g_Dialog.unk12C_15++; if(arg1 & 0x08){ - if(!( func_802E4A08() || func_803203FC(0x1f, &g_Dialog)) || !g_Dialog.unk128_3){//L8031141C + if(!( func_802E4A08() || volatileFlag_get(0x1f)) || !g_Dialog.unk128_3){//L8031141C if(!func_8028EC04()){ if(pos != NULL){ func_8028F94C(2, pos); diff --git a/src/core2/gc/parade.c b/src/core2/gc/parade.c index 7200e258..213c4d66 100644 --- a/src/core2/gc/parade.c +++ b/src/core2/gc/parade.c @@ -7,7 +7,7 @@ extern void func_8028F918(s32); extern void func_80311714(int); -extern void func_803204E4(s32, s32); +extern void volatileFlag_set(s32, s32); typedef struct struct_1C_s{ u8 map; @@ -166,9 +166,9 @@ void gcparade_8031ABF8(void) { func_80347A7C(); func_8031FBF8(); func_8031FBA0(); - func_803204E4(0x1F, 1); + volatileFlag_set(0x1F, 1); if (D_803830F0.parade_id == PARADE_1_POST_GRUNTY_BATTLE) { - func_803204E4(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE, TRUE); + volatileFlag_set(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE, TRUE); } func_803228D8(); func_802E4A70(); @@ -203,7 +203,7 @@ void gcparade_setState(enum parade_state_e next_state) { gcparade_8031AC8C(); break; case PARADE_STATE_2_INIT_FINAL_PARADE: //parade 1 init - func_803204E4(0xC1, TRUE); + volatileFlag_set(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE, TRUE); D_803830F0.parade_element = D_8036DAE4; D_803830F0.indx = 0; D_803830F0.parade_id = PARADE_1_POST_GRUNTY_BATTLE; @@ -243,8 +243,8 @@ void gcparade_setState(enum parade_state_e next_state) { timedFunc_set_1(0.25f, (GenFunction_1)gcparade_setState, (D_803830F0.indx == D_803830F0.count) ? PARADE_STATE_8_END : PARADE_STATE_3_WARP); break; case PARADE_STATE_8_END: - func_803204E4(0x1F, 0); - func_803204E4(0xC1, FALSE); + volatileFlag_set(0x1F, 0); + volatileFlag_set(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE, FALSE); func_802E412C(1, 8); func_802E40C4(0xA); if (D_803830F0.parade_id == 0) { @@ -286,7 +286,7 @@ void gcparade_update(void) { gcparade_beginFinalParade(); return; } - if (func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE) != 0) { + if (volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE) != 0) { snackerctl_update(); switch (D_803830F0.state) { case PARADE_STATE_3_WARP: @@ -333,9 +333,9 @@ void gcparade_update(void) { void gcparade_free(void){} void gcparade_start(void){ - func_803204E4(UNKFLAGS1_20_BEGIN_CHARACTER_PARADE, FALSE); - func_803204E4(0x1F, TRUE); - if(func_80320454(UNKFLAGS1_C0_BEGIN_FINAL_CHARACTER_PARADE, FALSE)) + volatileFlag_set(VOLATILE_FLAG_20_BEGIN_CHARACTER_PARADE, FALSE); + volatileFlag_set(0x1F, TRUE); + if(volatileFlag_getAndSet(VOLATILE_FLAG_C0_BEGIN_FINAL_CHARACTER_PARADE, FALSE)) gcparade_setState(PARADE_STATE_2_INIT_FINAL_PARADE); else gcparade_setState(PARADE_STATE_1_INIT_FF_PARADE); @@ -348,11 +348,11 @@ void gcparade_init(void) { s32 temp_v0; s32 var_s2; - if (func_803203FC(UNKFLAGS1_20_BEGIN_CHARACTER_PARADE)) { + if (volatileFlag_get(VOLATILE_FLAG_20_BEGIN_CHARACTER_PARADE)) { gcparade_start(); return; } - if (func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) { + if (volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) { func_80347A14(0); if ((D_803830F0.state == 3)){ var_s2 = FALSE; @@ -390,18 +390,18 @@ int gcparade_8031B4F4(void){ } void gcparade_beginFFParade(void){ - if (func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) return; + if (volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) return; - func_803204E4(UNKFLAGS1_20_BEGIN_CHARACTER_PARADE, TRUE); + volatileFlag_set(VOLATILE_FLAG_20_BEGIN_CHARACTER_PARADE, TRUE); gcparade_init(); } void gcparade_beginFinalParade(void){ - if (func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) return; + if (volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) return; - func_803204E4(UNKFLAGS1_20_BEGIN_CHARACTER_PARADE, TRUE); - func_803204E4(UNKFLAGS1_C0_BEGIN_FINAL_CHARACTER_PARADE, TRUE); + volatileFlag_set(VOLATILE_FLAG_20_BEGIN_CHARACTER_PARADE, TRUE); + volatileFlag_set(VOLATILE_FLAG_C0_BEGIN_FINAL_CHARACTER_PARADE, TRUE); D_803830F0.jiggyscore = jiggyscore_total(); gcparade_init(); } diff --git a/src/core2/gc/pauseMenu.c b/src/core2/gc/pauseMenu.c index 5c5445bf..b1f97bb6 100644 --- a/src/core2/gc/pauseMenu.c +++ b/src/core2/gc/pauseMenu.c @@ -24,7 +24,7 @@ typedef struct struct_1A_s{ extern void func_802C5994(void); extern void func_802E412C(s32, s32); -void func_803204E4(s32, s32); +void volatileFlag_set(s32, s32); f32 func_8024DE1C(f32, f32, f32 *, f32 *); void mlMtxApply(Mtx*); void func_80310D2C(void); @@ -988,9 +988,9 @@ s32 gcPauseMenu_update(void){ D_80383010.unk3_7 = 1; break; case 1://L80313908 //return to lair - func_803204E4(0x16, 1); + volatileFlag_set(0x16, 1); if(map_get() == MAP_8E_GL_FURNACE_FUN){ - func_803204E4(0,0); + volatileFlag_set(0,0); func_802E4078(MAP_80_GL_FF_ENTRANCE, 2, 1); }else{ func_802E4078(D_8036C560[level-1].map, D_8036C560[level-1].exit, 1); @@ -1003,7 +1003,7 @@ s32 gcPauseMenu_update(void){ break; case 3://L8031399C func_802C5994(); - func_803204E4(0,0); + volatileFlag_set(0,0); if(!fileProgressFlag_get(FILEPROG_BD_ENTER_LAIR_CUTSCENE) || fileProgressFlag_get(FILEPROG_A6_FURNACE_FUN_COMPLETE)){ gcPauseMenu_setState(0x14); }else{ @@ -1431,7 +1431,7 @@ void gcpausemenu_80314B24(void){ void gcpausemenu_returnToLair(void){ s32 level = level_get(); if(0 < level && level < 0xC && D_8036C560[level-1].map != -1){ - func_803204E4(0x16, TRUE); + volatileFlag_set(0x16, TRUE); func_802E4078(D_8036C560[level-1].map, D_8036C560[level-1].exit, 1); } } diff --git a/src/core2/gc/zoombox.c b/src/core2/gc/zoombox.c index 3ff3c464..142fcb26 100644 --- a/src/core2/gc/zoombox.c +++ b/src/core2/gc/zoombox.c @@ -990,7 +990,7 @@ void gczoombox_draw(GcZoombox *this, Gfx **gdl, Mtx ** mptr, void *vptr){ || ( getGameMode() != GAME_MODE_3_NORMAL && getGameMode() != GAME_MODE_8_BOTTLES_BONUS && getGameMode() != GAME_MODE_A_SNS_PICTURE - && !func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) + && !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) ){//L80316C64 func_80316764(this, 0); } diff --git a/src/core2/levelspecificflags.c b/src/core2/levelspecificflags.c index d41ead1d..678e17f5 100644 --- a/src/core2/levelspecificflags.c +++ b/src/core2/levelspecificflags.c @@ -84,13 +84,13 @@ void levelSpecificFlags_clear(void){ } void levelSpecificFlags_set(s32 index, s32 val){ - setBitToArray(&D_80383320.unk8, index, val); + bitfield_set_bit(&D_80383320.unk8, index, val); _levelSpecificFlags_updateCRC1(); _levelSpecificFlags_updateCRC2(); } void levelSpecificFlags_setN(s32 index, s32 val, s32 n){ - func_803201C8(&D_80383320.unk8, index, val, n); + bitfield_set_n_bits(&D_80383320.unk8, index, val, n); _levelSpecificFlags_updateCRC1(); _levelSpecificFlags_updateCRC2(); } diff --git a/src/core2/mapModel.c b/src/core2/mapModel.c index 65954c2a..4434a543 100644 --- a/src/core2/mapModel.c +++ b/src/core2/mapModel.c @@ -237,7 +237,7 @@ f32 func_80308FDC(f32 arg0[3], u32 arg1) { void mapModel_opa_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx) { s32 temp_a0; - if (func_80320708() && levelSpecificFlags_validateCRC2() && func_80320248()) { + if (func_80320708() && levelSpecificFlags_validateCRC2() && dummy_func_80320248()) { if (mapModel_getOpaModelId() == ASSET_14CF_MODEL_SM_SPIRAL_MOUNTAIN_OPA) { func_8033A45C(1, 0); func_8033A45C(2, 1); @@ -332,7 +332,7 @@ void mapModel_opa_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx) { case MAP_93_GL_DINGPOT: func_8033A45C(4, 1); func_8033A45C(5, 1); - func_8033A45C(6, (func_8038EAE0(0xA) || fileProgressFlag_get(FILEPROG_E2_DOOR_OF_GRUNTY_OPEN) || func_803203FC(0xC1))); + func_8033A45C(6, (func_8038EAE0(0xA) || fileProgressFlag_get(FILEPROG_E2_DOOR_OF_GRUNTY_OPEN) || volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE))); break; } func_8033A450(mapModel.unk24); diff --git a/src/core2/quizquestionaskedbitfield.c b/src/core2/quizquestionaskedbitfield.c index c8a9d495..42016765 100644 --- a/src/core2/quizquestionaskedbitfield.c +++ b/src/core2/quizquestionaskedbitfield.c @@ -26,7 +26,7 @@ void quizQuestionAskedBitfield_init(void){ } void quizQuestionAskedBitfield_set(s32 index, bool value){ - setBitToArray(quizQuestionAskedBitfield, index, value); + bitfield_set_bit(quizQuestionAskedBitfield, index, value); } void quizQuestionAskedBitfield_defrag(void){ diff --git a/src/core2/snackerctl.c b/src/core2/snackerctl.c index f63d1b6d..42cb76d9 100644 --- a/src/core2/snackerctl.c +++ b/src/core2/snackerctl.c @@ -37,7 +37,7 @@ static SnackerCtlState __snackerctl_update_ttc(void){ f32 player_position[3]; _player_getPosition(player_position); - if(func_8028B470() || func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)){ //(swimming || ???) + if(func_8028B470() || volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)){ //(swimming || ???) if(player_position[1] < 600.0f && !__snackerctl_player_within_distance(2478.0f, 4586.0f, 1750.0f) //within 1750 of sandcastle center && !__snackerctl_player_within_distance(-400.0, 2315.0f, 2000.0f) //within 2000 of blubber's ship center diff --git a/src/fight/chfinalboss.c b/src/fight/chfinalboss.c index 12152f0e..dba2b684 100644 --- a/src/fight/chfinalboss.c +++ b/src/fight/chfinalboss.c @@ -2237,7 +2237,7 @@ void chfinalboss_update(Actor *this){ chfinalboss_phase5_update(this->marker); break; } - func_80320524(0x23, local->phase, 3); + volatileFlag_setN(0x23, local->phase, 3); player_getPosition(D_80392788); D_80392798[0] = this->position[0]; D_80392798[1] = this->position[1]; diff --git a/src/fight/chspellfireball.c b/src/fight/chspellfireball.c index 2a78770f..c228231c 100644 --- a/src/fight/chspellfireball.c +++ b/src/fight/chspellfireball.c @@ -226,7 +226,7 @@ void func_8038F3B4(ActorMarker *marker, ActorMarker *other){ ) return; func_8038F084(marker); - switch(func_80320424(0x23, 3)){ + switch(volatileFlag_getN(0x23, 3)){ case 1: //8038F41C if(!fight_D_803928E0 && func_80311480(randi2(0, 5) + 0x10f2, 0, 0, 0, 0, 0)) fight_D_803928E0 = 1; diff --git a/src/lair/ch/brentilda.c b/src/lair/ch/brentilda.c index e3c539fc..fc839292 100644 --- a/src/lair/ch/brentilda.c +++ b/src/lair/ch/brentilda.c @@ -26,7 +26,7 @@ void func_8038BA30(ActorMarker *marker, enum asset_e text_id, s32 arg2){ this = marker_getActor(marker); phi_v1 = this->unk10_12*2; - func_80320424(0x20 + this->unkF4_8*6 + phi_v1, 2); + volatileFlag_getN(0x20 + this->unkF4_8*6 + phi_v1, 2); } void lair_func_8038BA88(ActorMarker *marker, enum asset_e text_id, s32 arg2){ @@ -68,18 +68,18 @@ void func_8038BC24(void) { s32 phi_s0; s32 phi_s1; - if (fileProgressFlag_get(FILEPROG_5C_FF_PATTERN_SET) && !func_803203FC(0x62)) { + if (fileProgressFlag_get(FILEPROG_5C_FF_PATTERN_SET) && !volatileFlag_get(0x62)) { rand_seed(fileProgressFlag_getN(FILEPROG_D3_FF_PATTERN, 8)); for(phi_s1 = 0; phi_s1 < func_8031A45C(3); phi_s1++){ phi_s0 = 0x26 + 2*phi_s1; temp_v0 = randi2(0, 3); if (phi_s0 >= 0x61) { - func_80320524(0x26, temp_v0, 2); + volatileFlag_setN(0x26, temp_v0, 2); } else { - func_80320524(phi_s0, temp_v0, 2); + volatileFlag_setN(phi_s0, temp_v0, 2); } } - func_803204E4(0x62, 1); + volatileFlag_set(0x62, 1); } } @@ -161,7 +161,7 @@ void chBrentilda_update(Actor *this) { } } actor_setOpacity(this, sp74); - if (!func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) { + if (!volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) { if ((phi_f2 < 600.0) && !this->unk38_0) { comusic_8025AB44(COMUSIC_7A_BRENTILDA, -1, 0x1F4); func_8032BB88(this, 0, 0x1F4); diff --git a/src/lair/ch/cauldron.c b/src/lair/ch/cauldron.c index 906ca267..27e18d4b 100644 --- a/src/lair/ch/cauldron.c +++ b/src/lair/ch/cauldron.c @@ -354,7 +354,7 @@ void chWarpCauldron_update(Actor *this) { func_8030E540(SFX_7C_CHEBOOF); } if (actor_animationIsAt(this, 0.63f)) { - func_803204E4(0x1E, 0); + volatileFlag_set(0x1E, 0); func_802D677C(0); func_8028FCAC(); nodeprop_getPosition(func_80304C38(D_80393620[this->unkF4_8 - 1].unk6, this), sp54); diff --git a/src/lair/code_0.c b/src/lair/code_0.c index 91a2ad31..69c97ea9 100644 --- a/src/lair/code_0.c +++ b/src/lair/code_0.c @@ -184,13 +184,13 @@ s16 D_80393454[] = { s16 D_80393468[] = { 0, 0, - UNKFLAGS1_7F_SANDCASTLE_OPEN_CC, - UNKFLAGS1_84_SANDCASTLE_OPEN_BGS, - UNKFLAGS1_8B_SANDCASTLE_OPEN_FP, - UNKFLAGS1_87_SANDCASTLE_OPEN_GV, - UNKFLAGS1_8C_SANDCASTLE_OPEN_MMM, - UNKFLAGS1_90_SANDCASTLE_OPEN_RBB, - UNKFLAGS1_93_SANDCASTLE_OPEN_CCW, + VOLATILE_FLAG_7F_SANDCASTLE_OPEN_CC, + VOLATILE_FLAG_84_SANDCASTLE_OPEN_BGS, + VOLATILE_FLAG_8B_SANDCASTLE_OPEN_FP, + VOLATILE_FLAG_87_SANDCASTLE_OPEN_GV, + VOLATILE_FLAG_8C_SANDCASTLE_OPEN_MMM, + VOLATILE_FLAG_90_SANDCASTLE_OPEN_RBB, + VOLATILE_FLAG_93_SANDCASTLE_OPEN_CCW, 0 }; @@ -362,7 +362,7 @@ void func_803867A8(Actor *this) { this->unk16C_4 = TRUE; this->unk158[0] = func_803866D8(0); this->unk158[1] = func_803866D8(1); - if (func_803203FC(0x86)) { + if (volatileFlag_get(0x86)) { ability_unlock(ABILITY_D_SHOCK_JUMP); fileProgressFlag_set(FILEPROG_C6_LAIR_JUMP_PAD_SWITCH_PRESSED, TRUE); fileProgressFlag_set(FILEPROG_C7_LAIR_JUMP_PAD_ACTIVE, TRUE); @@ -463,7 +463,7 @@ void func_80386D78(Actor *this) { if (!this->unk16C_4) { this->unk16C_4 = TRUE; - if (func_803203FC(0x8A)) { + if (volatileFlag_get(0x8A)) { ability_unlock(ABILITY_9_FLIGHT); mapSpecificFlags_set(0, TRUE); this->unk60 = 0.0f; @@ -472,7 +472,7 @@ void func_80386D78(Actor *this) { } } if ((this->unk1C[1] - 150.0f) <= this->position[1]) { - if (!func_803203FC(0x8A)) { + if (!volatileFlag_get(0x8A)) { if (this->unk60 != 0.0f) { this->unk60 -= 1.0f; if (this->unk60 == 0.0f) { @@ -525,7 +525,7 @@ void func_803870DC(Actor *this) { s32 temp_s7; phi_v1 = fileProgressFlag_get(D_80393454[this->unkF4_8 - 1]) - || (D_80393468[this->unkF4_8 - 1] != 0 && func_803203FC(D_80393468[this->unkF4_8 - 1])); + || (D_80393468[this->unkF4_8 - 1] != 0 && volatileFlag_get(D_80393468[this->unkF4_8 - 1])); if (!this->unk16C_4) { this->unk16C_4 = TRUE; @@ -666,7 +666,7 @@ void func_80387730(Actor *this) { marker_despawn(this->marker); return; } - if ((this->unkF4_8 >= 2U) && (this->unkF4_8 < 8U) && func_803203FC(D_80393494[this->unkF4_8 - 2])) { + if ((this->unkF4_8 >= 2U) && (this->unkF4_8 < 8U) && volatileFlag_get(D_80393494[this->unkF4_8 - 2])) { marker_despawn(this->marker); return; } @@ -872,7 +872,7 @@ void func_803880BC(Actor *this) __spawnQueue_add_1((GenFunction_1)func_80387E94, reinterpret_cast(s32, this->marker)); - if (func_803203FC(0xBC) && !fileProgressFlag_get(FILEPROG_9A_CC_WITCH_SWITCH_PRESSED)) + if (volatileFlag_get(0xBC) && !fileProgressFlag_get(FILEPROG_9A_CC_WITCH_SWITCH_PRESSED)) FUNC_8030E624(SFX_3F6_UNKNOWN, 0.75f, 30000); } @@ -892,7 +892,7 @@ void func_803880BC(Actor *this) } } - if (func_803203FC(0xBC) && !fileProgressFlag_get(FILEPROG_9B_LAIR_CC_WITCH_SWITCH_EYES_ACTIVE)) + if (volatileFlag_get(0xBC) && !fileProgressFlag_get(FILEPROG_9B_LAIR_CC_WITCH_SWITCH_EYES_ACTIVE)) { this->position_y += 1.7; @@ -944,7 +944,7 @@ void func_803882B0(Actor *this) this->unk60 = 0; } - if (this->pitch == 90.f || !func_803203FC(0xBB)) + if (this->pitch == 90.f || !volatileFlag_get(0xBB)) return; if (this->pitch == 0) @@ -1300,7 +1300,7 @@ void func_80388FC8(Actor *this) this->unk60 = 0; - if (func_803203FC(0x7D)) + if (volatileFlag_get(0x7D)) { this->position_y = this->unk1C[1]; this->unk60 = 1.f; @@ -1377,7 +1377,7 @@ void lair_func_80389204(Actor *this) this->position_y -= 280.f; this->unk60 = 0; - if (func_803203FC(0x7E)) + if (volatileFlag_get(0x7E)) { this->position_y = this->unk1C[1]; this->unk60 = 1.f; @@ -1481,7 +1481,7 @@ void lair_func_803894B0(Actor *this) return; } - this->unk1C[0] = func_803203FC(0xBD) ? 22 : 0; + this->unk1C[0] = volatileFlag_get(0xBD) ? 22 : 0; } if (!this->unk1C[0]) @@ -1612,7 +1612,7 @@ void func_80389934(Actor *this) { case 21: { - if (func_803203FC(0xBE)) + if (volatileFlag_get(0xBE)) { this->unk1C[0] = 25; diff --git a/src/lair/code_5ED0.c b/src/lair/code_5ED0.c index 335f2b6e..c86679e8 100644 --- a/src/lair/code_5ED0.c +++ b/src/lair/code_5ED0.c @@ -61,7 +61,6 @@ extern int quizQuestionAskedBitfield_get(u32); // ff_isAsked_flag_get extern void BKModel_getMeshCenter(BKModel *model, s32 mesh_id, s16 [3]); //! $a2 type unk -extern s32 func_803203FC(s32); // get volatile flag extern void ability_setAllLearned(s32); // set unlocked moves bitfield extern s32 ability_getAllLearned(void); // get unlocked moves bitfield @@ -574,10 +573,10 @@ void lair_func_8038CD48(void) if (D_8037DCB8->UNK_18) lair_func_8038CC9C(); - if (!func_803203FC(1) && !func_803203FC(2)) - func_803204E4(0, FALSE); + if (!volatileFlag_get(VOLATILE_FLAG_1) && !volatileFlag_get(VOLATILE_FLAG_2)) + volatileFlag_set(0, FALSE); - if (!func_803203FC(0)) + if (!volatileFlag_get(VOLATILE_FLAG_0)) func_8038CCEC(); } @@ -627,7 +626,7 @@ void lair_func_8038CF18(void) D_8037DCB8->unk0 = mapModel_getModel(0); D_8037DCB8->unk11 = 0; - if (func_803203FC(2) && !func_803203FC(4)) + if (volatileFlag_get(VOLATILE_FLAG_2) && !volatileFlag_get(VOLATILE_FLAG_4)) { quizQuestionAskedBitfield_free(); quizQuestionAskedBitfield_init(); @@ -659,7 +658,7 @@ void lair_func_8038CF18(void) func_80347A14(0); - if (func_803203FC(1)) + if (volatileFlag_get(VOLATILE_FLAG_1)) { levelSpecificFlags_clear(); func_8038CE00(); @@ -667,7 +666,7 @@ void lair_func_8038CF18(void) } else { - if (func_803203FC(2)) + if (volatileFlag_get(VOLATILE_FLAG_2)) { levelSpecificFlags_clear(); func_8038D670(FFA_5_FORGET_MOVES_2); @@ -824,7 +823,7 @@ void func_8038D48C(void) void func_8038D4BC(void) { - func_803204E4(2, TRUE); + volatileFlag_set(2, TRUE); func_802E4A70(); // restore moves after a delay @@ -967,7 +966,7 @@ void func_8038D670(enum FF_Action next_state) { if (D_8037DCB8->unk4->unk8 == FFTT_5_GRUNTY) { func_80356540(0xA2); } - if (func_803203FC(0xA0)) { + if (volatileFlag_get(0xA0)) { func_80356540(0xA1); } func_80356540(0xA0); @@ -996,7 +995,7 @@ void func_8038D670(enum FF_Action next_state) { quizQuestionAskedBitfield_set(func_8038D60C(D_8037DCB8->unk8), TRUE); lair_func_8038C640(D_8037DCB8->unk8, D_8037DCB8->unk4); } - if (func_803203FC(0xA3)) { + if (volatileFlag_get(0xA3)) { func_80356540(0xA4); } func_80356540(0xA3); @@ -1013,9 +1012,9 @@ void func_8038D670(enum FF_Action next_state) { func_8025AB00(); func_8025A70C(JINGLE_DOOR_OF_GRUNTY_OPENED); fileProgressFlag_set(FILEPROG_A6_FURNACE_FUN_COMPLETE, TRUE); - func_803204E4(0, FALSE); - func_803204E4(0xA6, TRUE); - func_803204E4(0xA7, TRUE); + volatileFlag_set(0, FALSE); + volatileFlag_set(0xA6, TRUE); + volatileFlag_set(0xA7, TRUE); next_state = 9; mapSpecificFlags_set(0xA, TRUE); func_8028F918(2); @@ -1284,24 +1283,24 @@ void lair_func_8038E0B0(void) { break; case 4://L8038E64C - if (func_803203FC(1)) { - func_803204E4(1, 0); + if (volatileFlag_get(VOLATILE_FLAG_1)) { + volatileFlag_set(1, 0); func_8038E070(); func_8025A55C(6000, 500, 0xA); } break; case 5://L8038E684 - if (func_803203FC(2)) { - if (func_803203FC(4)) { + if (volatileFlag_get(VOLATILE_FLAG_2)) { + if (volatileFlag_get(VOLATILE_FLAG_4)) { func_8038E070(); - D_8037DCB8->unkF = func_803203FC(5); + D_8037DCB8->unkF = volatileFlag_get(VOLATILE_FLAG_5); func_8038D670(6); } else { func_8038D670(1); } - func_803204E4(2, FALSE); - func_803204E4(4, FALSE); + volatileFlag_set(2, FALSE); + volatileFlag_set(4, FALSE); } break; @@ -1335,11 +1334,11 @@ void lair_func_8038E768(Gfx **dl, Mtx **m, Vtx **v) void func_8038E7C4(void) { - if (func_803203FC(0)) + if (volatileFlag_get(VOLATILE_FLAG_0)) return; func_8038CE28(); - func_803204E4(0, TRUE); + volatileFlag_set(0, TRUE); } /** diff --git a/src/lair/code_9C40.c b/src/lair/code_9C40.c index 1bc77511..3e458c1b 100644 --- a/src/lair/code_9C40.c +++ b/src/lair/code_9C40.c @@ -91,7 +91,7 @@ void func_803902B8(Actor *this) { sp54 = this->marker->id - 0x16D; if (!this->initialized) { marker_setFreeMethod(this->marker, func_80390298); - this->unk138_24 = func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE); + this->unk138_24 = volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE); this->initialized = TRUE; } _player_getPosition(sp5C); diff --git a/src/lair/code_A810.c b/src/lair/code_A810.c index c8fcbcd9..7c347965 100644 --- a/src/lair/code_A810.c +++ b/src/lair/code_A810.c @@ -131,7 +131,7 @@ void func_80390E28(Actor *this) { switch (this->state) { case 0: - if( !func_8031A3BC() && (sp38 < 2) && (randf() < 0.1) && !mapSpecificFlags_get(0xA) && !func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) { + if( !func_8031A3BC() && (sp38 < 2) && (randf() < 0.1) && !mapSpecificFlags_get(0xA) && !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) { sp38++; mapSpecificFlags_setN(0, sp38, 2); func_80390D3C(this, (randf() < 0.5) ? 2 :1); diff --git a/src/lair/code_BBD0.c b/src/lair/code_BBD0.c index f59a9139..fddd6426 100644 --- a/src/lair/code_BBD0.c +++ b/src/lair/code_BBD0.c @@ -48,7 +48,7 @@ Actor *func_80391FC0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){ } void func_80392014(Actor *this, enum sfx_e sfx_id, f32 arg2, f32 arg3, s32 arg4) { - if (mapSpecificFlags_get(0xA) || func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) { + if (mapSpecificFlags_get(0xA) || volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) { arg4 = arg4 * 0.5; } if (mapSpecificFlags_get(5)) { @@ -119,7 +119,7 @@ void func_8039217C(Actor *this) { break; case 5: //L803923C0 - if (func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) { + if (volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) { subaddie_set_state(this, 8U); break; } From 35f93d5505b2cb0b880b309817048b8a2e31b3ca Mon Sep 17 00:00:00 2001 From: mariob92 <21146795-mariob92@users.noreply.gitlab.com> Date: Sun, 8 Sep 2024 15:21:48 +0200 Subject: [PATCH 2/5] document more vola flags --- include/enums.h | 117 ++++++++++++++++++++++++++---------- include/functions.h | 10 ++- src/BGS/ch/code_2270.c | 8 +-- src/BGS/code_3420.c | 4 +- src/CCW/code_160.c | 8 +-- src/CCW/code_3DA0.c | 4 +- src/FP/ch/boggy2.c | 12 ++-- src/FP/ch/xmastree.c | 2 +- src/GV/matchinggame.c | 8 +-- src/GV/waterctrl.c | 2 +- src/RBB/ch/anchorswitch.c | 2 +- src/RBB/ch/bossboombox.c | 8 +-- src/TTC/code_3E30.c | 28 ++++----- src/core1/code_10A00.c | 4 +- src/core2/ba/marker.c | 6 +- src/core2/ch/collectible.c | 4 +- src/core2/ch/trainers.c | 10 +-- src/core2/ch/wadingboots.c | 10 +-- src/core2/code_34790.c | 2 +- src/core2/code_39D0.c | 2 +- src/core2/code_4C020.c | 31 +++++----- src/core2/code_57C70.c | 2 +- src/core2/code_7060.c | 2 +- src/core2/code_91E10.c | 2 +- src/core2/code_935F0.c | 12 ++-- src/core2/code_956B0.c | 6 +- src/core2/code_98CB0.c | 4 +- src/core2/code_9A740.c | 4 +- src/core2/code_9E370.c | 4 +- src/core2/code_A5BC0.c | 2 +- src/core2/code_BEF20.c | 17 +++--- src/core2/code_C4320.c | 12 ++-- src/core2/code_DA760.c | 12 ++-- src/core2/gc/dialog.c | 2 +- src/core2/gc/parade.c | 7 +-- src/core2/gc/pauseMenu.c | 8 +-- src/fight/chfinalboss.c | 2 +- src/fight/chspellfireball.c | 2 +- src/lair/ch/brentilda.c | 35 ++++++----- src/lair/ch/cauldron.c | 2 +- src/lair/code_0.c | 20 +++--- src/lair/code_5ED0.c | 24 ++++---- 42 files changed, 259 insertions(+), 204 deletions(-) diff --git a/include/enums.h b/include/enums.h index f8e21049..3f2280a6 100644 --- a/include/enums.h +++ b/include/enums.h @@ -230,7 +230,7 @@ enum file_progress_e{ }; enum volatile_flags_e { - VOLATILE_FLAG_0, // FFQ + VOLATILE_FLAG_0, // FFQ entered? VOLATILE_FLAG_1, VOLATILE_FLAG_2, VOLATILE_FLAG_3, @@ -255,53 +255,104 @@ enum volatile_flags_e { VOLATILE_FLAG_16, VOLATILE_FLAG_17, VOLATILE_FLAG_18, - VOLATILE_FLAG_19, - VOLATILE_FLAG_1A, - VOLATILE_FLAG_1B, - VOLATILE_FLAG_1C, - VOLATILE_FLAG_1D, + + VOLATILE_FLAG_19_CURRENT_LEVEL_ID, // 4 bits for current level ID + + VOLATILE_FLAG_1D = 0x1D, VOLATILE_FLAG_1E, VOLATILE_FLAG_1F_IN_CHARACTER_PARADE = 0x1F, VOLATILE_FLAG_20_BEGIN_CHARACTER_PARADE, + VOLATILE_FLAG_21, + VOLATILE_FLAG_22, - VOLATILE_FLAG_73_SANDCASTLE_INFINITE_LIVES = 0x73, + VOLATILE_FLAG_23_FINAL_BOSS_PHASE = 0x23, // 3 bits for current phase in final boss fight + + VOLATILE_FLAG_26_FF_GRUNTY_QUESTIONS = 0x26, // 60 bits FFQ Grunty Question related (two bits for every question) + + VOLATILE_FLAG_62_FF_GRUNTY_QUESTIONS_INITIALIZED = 0x62, + VOLATILE_FLAG_63, // related to demo mode + VOLATILE_FLAG_64, // related to demo mode + VOLATILE_FLAG_65_CHEAT_ENTERED, + VOLATILE_FLAG_66_SANDCASTLE_OPEN_DOOR_TWO, + VOLATILE_FLAG_67_SANDCASTLE_OPEN_DOOR_THREE, + VOLATILE_FLAG_68_SANDCASTLE_OPEN_DOOR_FOUR, + VOLATILE_FLAG_69_SANDCASTLE_OPEN_DOOR_FIVE, + VOLATILE_FLAG_6A_SANDCASTLE_OPEN_DOOR_SIX, + VOLATILE_FLAG_6B_SANDCASTLE_OPEN_DOOR_SEVEN, + VOLATILE_FLAG_6C_SANDCASTLE_PUZZLE_COMPLETE_CC, + VOLATILE_FLAG_6D_SANDCASTLE_PUZZLE_COMPLETE_BGS, + VOLATILE_FLAG_6E_SANDCASTLE_PUZZLE_COMPLETE_FP, + VOLATILE_FLAG_6F_SANDCASTLE_PUZZLE_COMPLETE_GV, + VOLATILE_FLAG_70_SANDCASTLE_PUZZLE_COMPLETE_MMM, + VOLATILE_FLAG_71_SANDCASTLE_PUZZLE_COMPLETE_RBB, + VOLATILE_FLAG_72_SANDCASTLE_PUZZLE_COMPLETE_CCC, + VOLATILE_FLAG_73_SANDCASTLE_INFINITE_LIVES, VOLATILE_FLAG_74_SANDCASTLE_INFINITE_EGGS, VOLATILE_FLAG_75_SANDCASTLE_INFINITE_RED_FEATHERS, VOLATILE_FLAG_76_SANDCASTLE_INFINITE_GOLD_FEATHERS, VOLATILE_FLAG_78_SANDCASTLE_NO_BONUS = 0x78, - VOLATILE_FLAG_7F_SANDCASTLE_OPEN_CC = 0x7F, - - VOLATILE_FLAG_84_SANDCASTLE_OPEN_BGS = 0x84, - - VOLATILE_FLAG_86_SANDCASTLE_SHOCKSPRING_JUMP_UNLOCKED = 0x86, - VOLATILE_FLAG_87_SANDCASTLE_OPEN_GV,// 0X87 - - VOLATILE_FLAG_8A_SANDCASTLE_FLIGHT_UNLOCKED = 0x8A,// 0X8A - VOLATILE_FLAG_8B_SANDCASTLE_OPEN_FP,// 0X8B - VOLATILE_FLAG_8C_SANDCASTLE_OPEN_MMM,// 0X8C - VOLATILE_FLAG_8D_SANDCASTLE_REMOVE_CRYPT_GATE,// 0X8D - VOLATILE_FLAG_8E_SANDCASTLE_REMOVE_CRYPT_COFFIN_LID,// 0X8E - VOLATILE_FLAG_8F_SANDCASTLE_REMOVE_GRATE_NEAR_WATER_SWITCH,// 0X8F + VOLATILE_FLAG_7D_SANDCASTLE_RAISE_PIPES_TO_CC = 0x7D, + VOLATILE_FLAG_7E_SANDCASTLE_RAISE_PIPE_TO_BRENTILDA, + VOLATILE_FLAG_7F_SANDCASTLE_OPEN_CC, + VOLATILE_FLAG_80_SANDCASTLE_REMOVE_GRILL_NEAR_BGS_JIGGY, + VOLATILE_FLAG_81_SANDCASTLE_CCC_JIGGY_PODIUM, + VOLATILE_FLAG_82_SANDCASTLE_REMOVE_GRILL_AND_HAT_FROM_STATUE, + VOLATILE_FLAG_83_SANDCASTLE_REMOVE_ICE, + VOLATILE_FLAG_84_SANDCASTLE_OPEN_BGS, + VOLATILE_FLAG_85_SANDCASTLE_REMOVE_BREAKABLE_WALLS, + VOLATILE_FLAG_86_SANDCASTLE_SHOCKSPRING_JUMP_UNLOCKED, + VOLATILE_FLAG_87_SANDCASTLE_OPEN_GV, + VOLATILE_FLAG_88_SANDCASTLE_REMOVE_WEBS, + VOLATILE_FLAG_89_SANDCASTLE_REMOVE_GLASS_EYE, + VOLATILE_FLAG_8A_SANDCASTLE_FLIGHT_UNLOCKED, + VOLATILE_FLAG_8B_SANDCASTLE_OPEN_FP, + VOLATILE_FLAG_8C_SANDCASTLE_OPEN_MMM, + VOLATILE_FLAG_8D_SANDCASTLE_REMOVE_CRYPT_GATE, + VOLATILE_FLAG_8E_SANDCASTLE_REMOVE_CRYPT_COFFIN_LID, + VOLATILE_FLAG_8F_SANDCASTLE_REMOVE_GRATE_NEAR_WATER_SWITCH, VOLATILE_FLAG_90_SANDCASTLE_OPEN_RBB, + VOLATILE_FLAG_91_SANDCASTLE_REMOVE_GRILL_NEAR_RBB_JIGGY, + VOLATILE_FLAG_92_SANDCASTLE_REMOVE_TUNNEL_GRILL_NEAR_RBB_JIGGY, + VOLATILE_FLAG_93_SANDCASTLE_OPEN_CCW, + VOLATILE_FLAG_94_SANDCASTLE_INFINITE_HEALTH, + VOLATILE_FLAG_95_SANDCASTLE_INFINTE_MUMBO_TOKENS, + VOLATILE_FLAG_96_SANDCASTLE_INFINITE_AIR, + VOLATILE_FLAG_97_SANDCASTLE_BOTTLES_BONUS_1, + VOLATILE_FLAG_98_SANDCASTLE_BOTTLES_BONUS_2, + VOLATILE_FLAG_99_SANDCASTLE_BOTTLES_BONUS_3, + VOLATILE_FLAG_9A_SANDCASTLE_BOTTLES_BONUS_4, + VOLATILE_FLAG_9B_SANDCASTLE_BOTTLES_BONUS_5, + VOLATILE_FLAG_9C_SANDCASTLE_BOTTLES_BONUS_6, + VOLATILE_FLAG_9D_SANDCASTLE_WISHY_WASHY, - VOLATILE_FLAG_93_SANDCASTLE_OPEN_CCW = 0x93, - VOLATILE_FLAG_94_SANDCASTLE_INFINITE_HEALTH,// 0X94 - VOLATILE_FLAG_95_SANDCASTLE_INFINTE_MUMBO_TOKENS,// 0X95 - VOLATILE_FLAG_96_SANDCASTLE_INFINITE_AIR,// 0X96 - VOLATILE_FLAG_97_SANDCASTLE_BOTTLES_BONUS_1,// 0X97 - VOLATILE_FLAG_98_SANDCASTLE_BOTTLES_BONUS_2,// 0X98 - VOLATILE_FLAG_99_SANDCASTLE_BOTTLES_BONUS_3,// 0X99 - VOLATILE_FLAG_9A_SANDCASTLE_BOTTLES_BONUS_4,// 0X9A - VOLATILE_FLAG_9B_SANDCASTLE_BOTTLES_BONUS_5,// 0X9B - VOLATILE_FLAG_9C_SANDCASTLE_BOTTLES_BONUS_6,// 0X9C - VOLATILE_FLAG_9D_SANDCASTLE_WISHY_WASHY,// 0X9D + VOLATILE_FLAG_A0 = 0xA0, + VOLATILE_FLAG_A1, + VOLATILE_FLAG_A2, + VOLATILE_FLAG_A3, + VOLATILE_FLAG_A4, + VOLATILE_FLAG_A5, + VOLATILE_FLAG_A6, + VOLATILE_FLAG_A7, + + VOLATILE_FLAG_AC = 0xAC, + VOLATILE_FLAG_AD, + + VOLATILE_FLAG_B2 = 0xB2, + VOLATILE_FLAG_B3, + VOLATILE_FLAG_B4, + + VOLATILE_FLAG_BB = 0xBB, + VOLATILE_FLAG_BC, + VOLATILE_FLAG_BD, + VOLATILE_FLAG_BE, + VOLATILE_FLAG_BF, VOLATILE_FLAG_C0_BEGIN_FINAL_CHARACTER_PARADE = 0xC0, VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE, VOLATILE_FLAG_C2_UNUSED, - VOLATILE_FLAG_C3, // unk + VOLATILE_FLAG_C3, // SNS picture related VOLATILE_FLAG_C4_WOZZA_HIDE_IN_SNS_PARADE }; @@ -3373,7 +3424,7 @@ enum asset_e // 56a FP Chimney ASSET_56B_MODEL_SANDYBUTT_PYRAMID = 0x56B, // 56c The End Sign - // 56d (Human Hand?) + ASSET_56D_MUMBOS_HAND_WITH_PICTURE = 0x56D, // Mumbo's Hand with SNS pictures // 56e Hammerhead Beach Scenery // Unused // Unused diff --git a/include/functions.h b/include/functions.h index d88535d9..d4dbcd46 100644 --- a/include/functions.h +++ b/include/functions.h @@ -565,6 +565,14 @@ extern void marker_setActorUpdateFunc(ActorMarker *marker, ActorUpdateFunc metho extern void marker_setActorUpdate2Func(ActorMarker *marker, ActorUpdateFunc method); extern void marker_callCollisionFunc(ActorMarker *, ActorMarker *, enum marker_collision_func_type_e); extern enum marker_collision_func_type_e func_8033D574(struct5Cs *arg0); -extern s32 volatileFlag_get(s32); // get volatile flag +extern s32 volatileFlag_get(s32); +extern s32 volatileFlag_getN(s32 index, s32 numBits); +extern s32 volatileFlag_getAndSet(s32 index, s32 arg1); +extern void volatileFlag_set(s32 index, s32 set); +extern void volatileFlag_setN(s32 startIndex, s32 set, s32 length); + +extern void itemscore_noteScores_clear(void); +extern s32 itemscore_noteScores_get(enum level_e lvl_id); +extern void itemscore_timeScores_clear(void); #endif diff --git a/src/BGS/ch/code_2270.c b/src/BGS/ch/code_2270.c index a6b2cce0..03e8f84d 100644 --- a/src/BGS/ch/code_2270.c +++ b/src/BGS/ch/code_2270.c @@ -113,8 +113,8 @@ void func_80388848(ActorMarker *this){ if(volatileFlag_get(VOLATILE_FLAG_2)){ item_set(ITEM_6_HOURGLASS,0); - volatileFlag_set(3,0); - volatileFlag_set(5,1); + volatileFlag_set(VOLATILE_FLAG_3,0); + volatileFlag_set(VOLATILE_FLAG_5,1); } else{ BGS_func_80388660(thisActor->marker); @@ -328,8 +328,8 @@ void func_80389080(Actor *this){ if(volatileFlag_get(VOLATILE_FLAG_2)){ if(item_empty(ITEM_0_HOURGLASS_TIMER)){ item_set(ITEM_6_HOURGLASS,1); - volatileFlag_set(3,0); - volatileFlag_set(5,0); + volatileFlag_set(VOLATILE_FLAG_3,0); + volatileFlag_set(VOLATILE_FLAG_5,0); } } //L80389370 else{ diff --git a/src/BGS/code_3420.c b/src/BGS/code_3420.c index 1e1c44b3..e3a21c01 100644 --- a/src/BGS/code_3420.c +++ b/src/BGS/code_3420.c @@ -692,8 +692,8 @@ void chvilegame_update(Actor *this) { } if (item_empty(ITEM_6_HOURGLASS)) { if (volatileFlag_get(VOLATILE_FLAG_2)) { - volatileFlag_set(3, 0); - volatileFlag_set(5, ( local->vile_score < local->player_score) ? TRUE : FALSE); + volatileFlag_set(VOLATILE_FLAG_3, 0); + volatileFlag_set(VOLATILE_FLAG_5, ( local->vile_score < local->player_score) ? TRUE : FALSE); func_8038A068(this, 1); } else if (local->vile_score < local->player_score) { if (local->unkC == 3) { diff --git a/src/CCW/code_160.c b/src/CCW/code_160.c index e99b950a..db7c4e18 100644 --- a/src/CCW/code_160.c +++ b/src/CCW/code_160.c @@ -59,8 +59,8 @@ void func_803865F4(Actor *this, s32 next_state) { if (next_state == 4) { if (volatileFlag_get(VOLATILE_FLAG_2)) { item_set(ITEM_6_HOURGLASS, FALSE); - volatileFlag_set(3, 0); - volatileFlag_set(5, 1); + volatileFlag_set(VOLATILE_FLAG_3, 0); + volatileFlag_set(VOLATILE_FLAG_5, 1); } else { func_80311480(0xCE4, 4, NULL, NULL, NULL, NULL); func_8025A58C(-1, 400); @@ -211,7 +211,7 @@ void func_8038687C(Actor *this) { } if ((this->state == 3) && volatileFlag_get(VOLATILE_FLAG_2) && item_empty(ITEM_0_HOURGLASS_TIMER)) { item_set(ITEM_6_HOURGLASS, 0); - volatileFlag_set(3, 0); - volatileFlag_set(5, 0); + volatileFlag_set(VOLATILE_FLAG_3, 0); + volatileFlag_set(VOLATILE_FLAG_5, 0); } } diff --git a/src/CCW/code_3DA0.c b/src/CCW/code_3DA0.c index 7af28c59..239f6643 100644 --- a/src/CCW/code_3DA0.c +++ b/src/CCW/code_3DA0.c @@ -152,9 +152,9 @@ void chcaterpillar_update(Actor *this){ if(ml_distance_vec3f(this->position, sp74) < 50.0f){ func_8028F030(ACTOR_2A2_CATERPILLAR); - if(!volatileFlag_get(0xb2)){ + if(!volatileFlag_get(VOLATILE_FLAG_B2)){ func_80311480(0xcc7, 4, NULL, NULL, NULL, NULL); - volatileFlag_set(0xb2, TRUE); + volatileFlag_set(VOLATILE_FLAG_B2, TRUE); } FUNC_8030E8B4(SFX_C5_TWINKLY_POP, 1.0f, 25000, this->position, 0x1f4, 0x9c4); marker_despawn(this->marker); diff --git a/src/FP/ch/boggy2.c b/src/FP/ch/boggy2.c index 3a94172b..c67f740d 100644 --- a/src/FP/ch/boggy2.c +++ b/src/FP/ch/boggy2.c @@ -143,9 +143,9 @@ void func_80388B18(Actor *this, u8 arg1){ } } else{//L80388BB8 - if(!volatileFlag_get(0xb3)){ + if(!volatileFlag_get(VOLATILE_FLAG_B3)){ if(func_80311480(0xc01, 0xe, this->position, this->marker, func_80388D70, NULL)){ - volatileFlag_set(0xb3, TRUE); + volatileFlag_set(VOLATILE_FLAG_B3, TRUE); func_80388A50(this); } } @@ -153,9 +153,9 @@ void func_80388B18(Actor *this, u8 arg1){ } else{//L80388C08 if(player_getTransformation() == TRANSFORM_4_WALRUS){ - if(!volatileFlag_get(0xb4)){ + if(!volatileFlag_get(VOLATILE_FLAG_B4)){ if(func_80311480(0xc08, 0xe, this->position, this->marker, func_80388D70, NULL)){ - volatileFlag_set(0xb4, TRUE); + volatileFlag_set(VOLATILE_FLAG_B4, TRUE); func_80388A50(this); } } @@ -476,13 +476,13 @@ void func_803896FC(Actor *this){ ){ if( local->unk19 == 1 && player_getTransformation() != TRANSFORM_4_WALRUS - && volatileFlag_get(0xb3) + && volatileFlag_get(VOLATILE_FLAG_B3) ){ func_80311480(0xC01, 0xf, this->position, this->marker, func_80388D70, NULL); } else if( local->unk19 == 2){ if( player_getTransformation() == TRANSFORM_4_WALRUS - && volatileFlag_get(0xb4) + && volatileFlag_get(VOLATILE_FLAG_B4) ){ func_80311480(0xC08, 0xf, this->position, this->marker, func_80388D70, NULL); } diff --git a/src/FP/ch/xmastree.c b/src/FP/ch/xmastree.c index 76ad7a8b..6220f350 100644 --- a/src/FP/ch/xmastree.c +++ b/src/FP/ch/xmastree.c @@ -42,7 +42,7 @@ void __chXmasTree_80386EF4(Actor *this, int arg1){ void __chXmasTree_80386F3C(void){ levelSpecificFlags_set(0x29, TRUE); func_803228D8(); - volatileFlag_set(0xe, 1); + volatileFlag_set(VOLATILE_FLAG_E, 1); func_802E4078(MAP_53_FP_CHRISTMAS_TREE, 1, 0); } diff --git a/src/GV/matchinggame.c b/src/GV/matchinggame.c index f03d032c..777d10ce 100644 --- a/src/GV/matchinggame.c +++ b/src/GV/matchinggame.c @@ -80,8 +80,8 @@ void __matchingGame_setState(s32 next_state){ if(next_state == 3){ if(volatileFlag_get(VOLATILE_FLAG_2)){ - volatileFlag_set(3, 0); - volatileFlag_set(5, 0); + volatileFlag_set(VOLATILE_FLAG_3, 0); + volatileFlag_set(VOLATILE_FLAG_5, 0); } else{ func_8028F66C(BS_INTR_F); @@ -90,8 +90,8 @@ void __matchingGame_setState(s32 next_state){ if(next_state == 4){ if(volatileFlag_get(VOLATILE_FLAG_2)){ - volatileFlag_set(3, 0); - volatileFlag_set(5, 1); + volatileFlag_set(VOLATILE_FLAG_3, 0); + volatileFlag_set(VOLATILE_FLAG_5, 1); } else{ func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7fff); diff --git a/src/GV/waterctrl.c b/src/GV/waterctrl.c index c4c6bcd8..7c5736ff 100644 --- a/src/GV/waterctrl.c +++ b/src/GV/waterctrl.c @@ -39,7 +39,7 @@ void __waterCtrl_setState(s32 arg0){ if(GV_D_80391B00.state == 3){ levelSpecificFlags_set(6, TRUE); func_803228D8(); - volatileFlag_set(0xe, 1); + volatileFlag_set(VOLATILE_FLAG_E, 1); func_802E4078(MAP_12_GV_GOBIS_VALLEY, 0, 0); } } diff --git a/src/RBB/ch/anchorswitch.c b/src/RBB/ch/anchorswitch.c index 67d70449..45455765 100644 --- a/src/RBB/ch/anchorswitch.c +++ b/src/RBB/ch/anchorswitch.c @@ -21,7 +21,7 @@ void __chAnchorSwitch_setState(Actor *this, s32 arg1){ this->position_y -= 35.0f; if(this->state == 1){ levelSpecificFlags_set(0x30, TRUE); - volatileFlag_set(0xe, 1); + volatileFlag_set(VOLATILE_FLAG_E, 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); } diff --git a/src/RBB/ch/bossboombox.c b/src/RBB/ch/bossboombox.c index 9a368d14..7f0fe9bb 100644 --- a/src/RBB/ch/bossboombox.c +++ b/src/RBB/ch/bossboombox.c @@ -362,8 +362,8 @@ void RBB_func_8038CC9C(Actor *this, s32 new_state){ func_8025AABC(COMUSIC_62_RBB_BOOMBOX); if(volatileFlag_get(VOLATILE_FLAG_2)){ item_set(ITEM_6_HOURGLASS, 0); - volatileFlag_set(3, 0); - volatileFlag_set(5, 1); + volatileFlag_set(VOLATILE_FLAG_3, 0); + volatileFlag_set(VOLATILE_FLAG_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); @@ -574,8 +574,8 @@ void func_8038D8BC(Actor *this){ if(this->state == 3 || this->state == 4){ if(volatileFlag_get(VOLATILE_FLAG_2)){ if(item_empty(ITEM_0_HOURGLASS_TIMER)){ - volatileFlag_set(3, 0); - volatileFlag_set(5, 0); + volatileFlag_set(VOLATILE_FLAG_3, 0); + volatileFlag_set(VOLATILE_FLAG_5, 0); RBB_func_8038CC9C(this, 8); } } diff --git a/src/TTC/code_3E30.c b/src/TTC/code_3E30.c index 5f657dac..5516add9 100644 --- a/src/TTC/code_3E30.c +++ b/src/TTC/code_3E30.c @@ -247,14 +247,14 @@ void func_8038ABA0(u32 arg0){ if(arg0 & 0x400){ func_80356560(0xC5); } - volatileFlag_set(0x78, 0); + volatileFlag_set(VOLATILE_FLAG_78_SANDCASTLE_NO_BONUS, 0); for(i = 4; i < 0xb; i++){ if( arg0 & (1 << i)){ - volatileFlag_set(0x93 + i, TRUE); - volatileFlag_set(0x78, TRUE); + volatileFlag_set(VOLATILE_FLAG_93_SANDCASTLE_OPEN_CCW + i, TRUE); + volatileFlag_set(VOLATILE_FLAG_78_SANDCASTLE_NO_BONUS, TRUE); } else{ - volatileFlag_set(0x93 + i, FALSE); + volatileFlag_set(VOLATILE_FLAG_93_SANDCASTLE_OPEN_CCW + i, FALSE); } } } @@ -284,7 +284,7 @@ void func_8038AC48(LetterFloorTile *arg0) { phi_s1 |= (0x10 << i); } }; - if (volatileFlag_get(0x78)) { + if (volatileFlag_get(VOLATILE_FLAG_78_SANDCASTLE_NO_BONUS)) { phi_s1 |= 0x800; } } @@ -310,8 +310,8 @@ void func_8038AC48(LetterFloorTile *arg0) { if (temp_s5) { item_set(ITEM_6_HOURGLASS, FALSE); - volatileFlag_set(3, 0); - volatileFlag_set(5, 1); + volatileFlag_set(VOLATILE_FLAG_3, 0); + volatileFlag_set(VOLATILE_FLAG_5, 1); func_8038A258(2); } else { var_v0 = i_ptr->unk4; @@ -467,8 +467,8 @@ void func_8038B2F0(void) { if ((D_8038D720.unk10 == 1) && item_empty(ITEM_0_HOURGLASS_TIMER)) { func_8038A258(2); if (volatileFlag_get(VOLATILE_FLAG_2)) { - volatileFlag_set(3, FALSE); - volatileFlag_set(5, FALSE); + volatileFlag_set(VOLATILE_FLAG_3, FALSE); + volatileFlag_set(VOLATILE_FLAG_5, FALSE); } else { func_8028F66C(BS_INTR_F); } @@ -643,10 +643,10 @@ void func_8038B79C(s32 arg0, s32 arg1, s32 arg2, enum item_e item_id, s32 item_d void func_8038B800(s32 secretCodeIndex) { struct_ttc_3E30_4_s *secretCode; - s32 sp38; + enum volatile_flags_e volaflag_cheat_id; secretCode = &secretCodesTable[secretCodeIndex]; - sp38 = secretCode->id - 0x14; + volaflag_cheat_id = secretCode->id - 0x14; sns_set_item_and_update_payload(secretCode->id, 1, 1); func_8038B564(secretCodeIndex, 1, MAP_61_CCW_WINTER_NABNUTS_HOUSE, 0x83, 0x1B); func_8038B564(secretCodeIndex, 2, MAP_3F_RBB_CAPTAINS_CABIN, 0x84, 0x1C); @@ -657,8 +657,8 @@ void func_8038B800(s32 secretCodeIndex) { func_8038B564(secretCodeIndex, 7, MAP_7F_FP_WOZZAS_CAVE, 0x89, 0x21); if (secretCode->id >= 0x14) { func_8030E58C(SFX_2B_BULL_MOO_1, 1.5f); - volatileFlag_set(0x65, 1); - volatileFlag_set(sp38, 1); + volatileFlag_set(VOLATILE_FLAG_65_CHEAT_ENTERED, 1); + volatileFlag_set(volaflag_cheat_id, 1); } TTC_func_8038B6D4(0, secretCodeIndex, 0x6C, FILEPROG_60_CC_PUZZLE_PIECES_PLACED, 5, 3, FILEPROG_33_CC_OPEN); TTC_func_8038B6D4(0, secretCodeIndex, 0x6D, FILEPROG_63_BGS_PUZZLE_PIECES_PLACED, 7, 3, FILEPROG_34_BGS_OPEN); @@ -670,7 +670,7 @@ void func_8038B800(s32 secretCodeIndex) { func_8038B79C(0, secretCodeIndex, 0x94, ITEM_15_HEALTH_TOTAL, 0, 8); func_8038B79C(0, secretCodeIndex, 0x77, ITEM_14_HEALTH, 0, item_getCount(ITEM_15_HEALTH_TOTAL)); func_8038B79C(0, secretCodeIndex, 0x95, ITEM_1C_MUMBO_TOKEN, 0, 99); - if (sp38 == 0x81) { + if (volaflag_cheat_id == VOLATILE_FLAG_81_SANDCASTLE_CCC_JIGGY_PODIUM) { fileProgressFlag_set(FILEPROG_53_CCW_PUZZLE_PODIUM_SWITCH_PRESSED, 1); fileProgressFlag_set(FILEPROG_54_CCW_PUZZLE_PODIUM_ACTIVE, 1); } diff --git a/src/core1/code_10A00.c b/src/core1/code_10A00.c index 4d9b0b2c..031a26d4 100644 --- a/src/core1/code_10A00.c +++ b/src/core1/code_10A00.c @@ -182,9 +182,9 @@ void pfsManager_update(void) { temp_t6 = demo_readInput(&pfsManagerContPadData, &sp5C) == 0; if ((D_802812D0.button & s0) || temp_t6) { if (D_802812D0.button & s0) { - volatileFlag_set(0x64, 1); + volatileFlag_set(VOLATILE_FLAG_64, 1); } else { - volatileFlag_set(0x63, 1); + volatileFlag_set(VOLATILE_FLAG_63, 1); } } func_8033DD04(sp5C); diff --git a/src/core2/ba/marker.c b/src/core2/ba/marker.c index af856924..be4061ba 100644 --- a/src/core2/ba/marker.c +++ b/src/core2/ba/marker.c @@ -208,7 +208,7 @@ void __baMarker_8028BB1C(s32 arg0, u32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 a if(!volatileFlag_get(sp24)){ volatileFlag_set(sp24, 1); func_8030E6D4(SFX_90_SWITCH_PRESS); - volatileFlag_set(0xBF, 1); + volatileFlag_set(VOLATILE_FLAG_BF, 1); func_802D6264(1.0f, arg2, arg3, arg4, arg5, arg6); } } @@ -216,7 +216,7 @@ void __baMarker_8028BB1C(s32 arg0, u32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 a if(!fileProgressFlag_get(arg1)){ fileProgressFlag_set(arg1, 1); func_8030E6D4(SFX_90_SWITCH_PRESS); - volatileFlag_set(0xBF, 1); + volatileFlag_set(VOLATILE_FLAG_BF, 1); func_802D6264(1.0f, arg2, arg3, arg4, arg5, arg6); } } @@ -389,7 +389,7 @@ void __baMarker_resolveCollision(Prop *other_prop){ spAC[1] += 40.0f; if(func_802458E0(spAC, actor, 0x87) == 0) return; - volatileFlag_set(0x1E, 1); + volatileFlag_set(VOLATILE_FLAG_1E, 1); if(fileProgressFlag_get(((actor->unkF4_8 - 1) ^ 1) + 0x49)){ actor->unk10_12 = 2; } diff --git a/src/core2/ch/collectible.c b/src/core2/ch/collectible.c index 2c8b1c46..8e12fa41 100644 --- a/src/core2/ch/collectible.c +++ b/src/core2/ch/collectible.c @@ -154,8 +154,8 @@ void chCollectible_update(Actor *this) { if(!this->unk38_0) return; - if (volatileFlag_getN(0x23, 3) != this->unk10_12) { - func_802D8C98(this, volatileFlag_getN(0x23, 3)); + if (volatileFlag_getN(VOLATILE_FLAG_23_FINAL_BOSS_PHASE, 3) != this->unk10_12) { + func_802D8C98(this, volatileFlag_getN(VOLATILE_FLAG_23_FINAL_BOSS_PHASE, 3)); } switch (this->state) { diff --git a/src/core2/ch/trainers.c b/src/core2/ch/trainers.c index 0b967f44..5dfdedce 100644 --- a/src/core2/ch/trainers.c +++ b/src/core2/ch/trainers.c @@ -66,23 +66,23 @@ void chtrainers_update(Actor *this){ ml_vec3f_copy(this->unk1C, this->position); this->velocity[0] = this->yaw; this->velocity[1] = 0.0f; - this->unk10_12 = !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE) && !volatileFlag_get(0x1); + this->unk10_12 = !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE) && !volatileFlag_get(VOLATILE_FLAG_1); subaddie_set_state(this, 0); } - if(!volatileFlag_get(0xF) && ability_isUnlocked(ABILITY_11_TURBO_TALON)){ - volatileFlag_set(0xF, TRUE); + if(!volatileFlag_get(VOLATILE_FLAG_F) && ability_isUnlocked(ABILITY_11_TURBO_TALON)){ + volatileFlag_set(VOLATILE_FLAG_F, TRUE); } switch(this->state){ case 0://L802CA5A8 if(func_803296D8(this, 2000) || sp2C){ if( func_80329530(this, 0xfa) - && !volatileFlag_get(0xf) + && !volatileFlag_get(VOLATILE_FLAG_F) && player_getTransformation() == TRANSFORM_1_BANJO ){ if(func_80311480(0xda4, 0, NULL, NULL, NULL, NULL)){ - volatileFlag_set(0xf, TRUE); + volatileFlag_set(VOLATILE_FLAG_F, TRUE); } }//L802CA620 _chtrainers_802CA378(this, sp2C); diff --git a/src/core2/ch/wadingboots.c b/src/core2/ch/wadingboots.c index 4a103098..74324a41 100644 --- a/src/core2/ch/wadingboots.c +++ b/src/core2/ch/wadingboots.c @@ -41,12 +41,12 @@ void chwadingboots_update(Actor *this){ if(!this->initialized){ this->initialized = TRUE; this->velocity[0] = this->yaw; - this->unk10_12 = !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE) && !volatileFlag_get(0x1); + this->unk10_12 = !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE) && !volatileFlag_get(VOLATILE_FLAG_1); subaddie_set_state(this, 0); } - if(!volatileFlag_get(0x10) && ability_isUnlocked(ABILITY_E_WADING_BOOTS)){ - volatileFlag_set(0x10, TRUE); + if(!volatileFlag_get(VOLATILE_FLAG_10) && ability_isUnlocked(ABILITY_E_WADING_BOOTS)){ + volatileFlag_set(VOLATILE_FLAG_10, TRUE); } switch(this->state){ @@ -65,12 +65,12 @@ void chwadingboots_update(Actor *this){ } } - if(volatileFlag_get(0x10)) break; + if(volatileFlag_get(VOLATILE_FLAG_10)) break; if(!func_80329530(this, 250)) break; if(player_getTransformation() != TRANSFORM_1_BANJO) break; if(func_80311480(ASSET_DA5_DIALOG_WADINGBOOTS_MEET, 0, NULL, NULL, NULL, NULL)){ - volatileFlag_set(0x10, TRUE); + volatileFlag_set(VOLATILE_FLAG_10, TRUE); } break; diff --git a/src/core2/code_34790.c b/src/core2/code_34790.c index bca87c62..5861d4de 100644 --- a/src/core2/code_34790.c +++ b/src/core2/code_34790.c @@ -338,7 +338,7 @@ void func_802BC2CC(s32 arg0) { f32 *sp20 = D_8037D918; s32 sp1C; - if (volatileFlag_get(0xE) != 0) { + if (volatileFlag_get(VOLATILE_FLAG_E) != 0) { func_80347A14(0); } if (volatileFlag_getAndSet(0xE, 0) || func_802D686C() || (arg0 == 0x63) || !func_802BB720(arg0, D_8037D908, D_8037D918, &sp1C)) { diff --git a/src/core2/code_39D0.c b/src/core2/code_39D0.c index e793cea8..0140acf8 100644 --- a/src/core2/code_39D0.c +++ b/src/core2/code_39D0.c @@ -133,7 +133,7 @@ int func_8028ADB4(void){ } int func_8028ADF0(void){ - return volatileFlag_get(0x9d); + return volatileFlag_get(VOLATILE_FLAG_9D_SANDCASTLE_WISHY_WASHY); } bool func_8028AE10(void) { diff --git a/src/core2/code_4C020.c b/src/core2/code_4C020.c index 8755d873..f026030e 100644 --- a/src/core2/code_4C020.c +++ b/src/core2/code_4C020.c @@ -14,7 +14,6 @@ extern void ml_vec3f_assign(f32[3], f32, f32, f32); extern void func_802EE2E8(Actor *arg0, s32 arg1, s32 cnt, s32 arg3, f32 arg4, f32 arg5, f32 arg6); extern void func_80319EA4(void); extern void fileProgressFlag_set(s32, bool); -extern void volatileFlag_set(s32, bool); void func_802D3D54(Actor *this); void func_802D3DA4(Actor *this); @@ -575,7 +574,7 @@ void func_802D4680(Actor *this){ if(func_80258640(this->position, sp1C) < 150.0f && func_8028F20C()){ if(func_8028ECAC() == 0 || func_8028ECAC() == BSGROUP_8_TROT){ if(map_get() == MAP_8E_GL_FURNACE_FUN){ - volatileFlag_set(0, 0); + volatileFlag_set(VOLATILE_FLAG_0, 0); func_802D4614(MAP_80_GL_FF_ENTRANCE); } else{ @@ -764,7 +763,7 @@ void func_802D5000(enum map_e map_id){ } void func_802D5058(enum map_e map_id, s32 arg1, bool arg2) { - volatileFlag_set(1, 1); + volatileFlag_set(VOLATILE_FLAG_1, 1); D_80367684 = map_id; D_80367688 = arg1; if (arg2) { @@ -787,7 +786,7 @@ void func_802D5058(enum map_e map_id, s32 arg1, bool arg2) { void func_802D5140(ActorMarker *caller, enum asset_e text_id, s32 arg2){ - itemscore_noteScores_get(volatileFlag_getN(0x19, 4)); + itemscore_noteScores_get(volatileFlag_getN(VOLATILE_FLAG_19_CURRENT_LEVEL_ID, 4)); } void func_802D5178(s32 arg0, enum file_progress_e arg1, s32 arg2, enum map_e arg3, s32 arg4, s32 arg5, enum actor_e arg6, s32 arg7){ @@ -1023,16 +1022,16 @@ void func_802D5628(void){ func_802D5178(0x24, 0x30, 0x37, MAP_79_GL_CCW_LOBBY, 0xF, 0xB, ACTOR_234_CCW_ENTRANCE_DOOR, 0xA); func_802D5178(0x20, 0x2C, 0x38, MAP_6F_GL_FP_LOBBY, 0x11, 0xA, ACTOR_235_FP_ENTANCE_DOOR, 0xA); func_802D5178(0x3F, 0xE2, 0x40, MAP_93_GL_DINGPOT, 0x10, 0xA, ACTOR_2E5_DOOR_OF_GRUNTY, 0x28); - if(volatileFlag_get(0x18)){ + if(volatileFlag_get(VOLATILE_FLAG_18)){ if(!fileProgressFlag_get(FILEPROG_99_PAST_50_NOTE_DOOR_TEXT)){ func_80311174(0xF75, 0xE, NULL, NULL, NULL, NULL, func_802D5140); fileProgressFlag_set(FILEPROG_99_PAST_50_NOTE_DOOR_TEXT, TRUE); - volatileFlag_set(0x18, 0); + volatileFlag_set(VOLATILE_FLAG_18, 0); } else{//L802D5DD8 - if(!volatileFlag_get(0x16)){ + if(!volatileFlag_get(VOLATILE_FLAG_16)){ func_80311174(0xF77, 0x4, NULL, NULL, NULL, NULL, func_802D5140); - volatileFlag_set(0x18, 0); + volatileFlag_set(VOLATILE_FLAG_18, 0); } } }//L802D5E18 @@ -1045,7 +1044,7 @@ void func_802D5628(void){ && !fileProgressFlag_get(FILEPROG_FC_DEFEAT_GRUNTY) ){ D_8037DE04 += time_getDelta(); - if(D_80367680 < D_8037DE04 && !volatileFlag_get(0x16)){ + if(D_80367680 < D_8037DE04 && !volatileFlag_get(VOLATILE_FLAG_16)){ if(fileProgressFlag_get(FILEPROG_A6_FURNACE_FUN_COMPLETE)){ sp4C = 0xF9D; } @@ -1057,10 +1056,10 @@ void func_802D5628(void){ D_8037DE00 = randi2(0xF86, sp4C); }//L802D5F1C - if(volatileFlag_get(0x22)){ + if(volatileFlag_get(VOLATILE_FLAG_22)){ if(func_80311480(0xF82, 4, NULL, NULL, NULL, NULL)){ fileProgressFlag_set(FILEPROG_C1_BADDIES_ESCAPE_TEXT, TRUE); - volatileFlag_set(0x22, 0); + volatileFlag_set(VOLATILE_FLAG_22, 0); D_8037DE04 = 0.0f; D_80367680 += 60.0; if(300.0 < D_80367680) @@ -1112,7 +1111,7 @@ void func_802D6114(void){ if(map_getLevel(sp24) != map_getLevel(map_get())){ func_802E4A70(); }//L802D6194 - volatileFlag_set(0x21, 1); + volatileFlag_set(VOLATILE_FLAG_21, 1); if(sp24 != 0x1C || !func_8025ADBC(COMUSIC_23_MMM_INSIDE_CHURCH)){ func_803228D8(); } @@ -1197,7 +1196,7 @@ void func_802D63D4(void){ default: //L802D6460 func_802BAFE4(D_80367688); timedFuncQueue_update(); - volatileFlag_set(0xbf, 0); + volatileFlag_set(VOLATILE_FLAG_BF, 0); func_802D6750(); break; } @@ -1231,7 +1230,7 @@ void func_802D6494(void){ } break; case ACTOR_210_BGS_ENTRANCE_DOOR:// L802D65F8 - if(!volatileFlag_get(0x84)){ + if(!volatileFlag_get(VOLATILE_FLAG_84_SANDCASTLE_OPEN_BGS)){ FUNC_8030E624(SFX_6B_LOCKUP_OPENING, 0.6f, 32000); func_8025A6CC(COMUSIC_64_WORLD_OPENING_A, 32000); } @@ -1314,14 +1313,14 @@ s32 func_802D683C(s32 arg0){ } int func_802D686C(void){ - if(volatileFlag_get(0x1E)){ + if(volatileFlag_get(VOLATILE_FLAG_1E)){ return FALSE; } return map_get() == D_80367684; } int func_802D68B4(void){ - return func_802D686C() || volatileFlag_get(0x21); + return func_802D686C() || volatileFlag_get(VOLATILE_FLAG_21); } //BREAK???? diff --git a/src/core2/code_57C70.c b/src/core2/code_57C70.c index b2d48fa7..2f4889eb 100644 --- a/src/core2/code_57C70.c +++ b/src/core2/code_57C70.c @@ -22,7 +22,7 @@ ActorAnimationInfo D_80368300[] ={ f32 D_80368330[3] = {0.0f, 0.0f, 0.0f}; ActorInfo D_8036833C = { - 0x294, 0x19B, 0x56D, + 0x294, 0x19B, ASSET_56D_MUMBOS_HAND_WITH_PICTURE, 0x1, D_80368300, func_802DEE1C, func_80326224, func_802DEC00, 0, 0, 0.0f, 0 diff --git a/src/core2/code_7060.c b/src/core2/code_7060.c index cdba5811..07319cdb 100644 --- a/src/core2/code_7060.c +++ b/src/core2/code_7060.c @@ -189,7 +189,7 @@ void func_8028E4B0(void) { sp20 = exit_get(); D_8037BFB8 = 0; player_setPosition(D_803636C0); - if (volatileFlag_get(0xE) || func_802D686C() || (sp20 == 0x65)){ + if (volatileFlag_get(VOLATILE_FLAG_E) || func_802D686C() || (sp20 == 0x65)){ return; } if (sp20 == 0x63) { diff --git a/src/core2/code_91E10.c b/src/core2/code_91E10.c index b4299350..1065c395 100644 --- a/src/core2/code_91E10.c +++ b/src/core2/code_91E10.c @@ -163,7 +163,7 @@ s32 func_80318F60(enum ff_question_type_e question_type, s32 q_indx, s32 arg2) { phi_v1 = arg2; } else { if (question_type == FFQT_3_GRUNTY) { - phi_a0 = volatileFlag_getN((q_indx * 2) + 0x26, 2); + phi_a0 = volatileFlag_getN((q_indx * 2) + VOLATILE_FLAG_26_FF_GRUNTY_QUESTIONS, 2); } else { phi_a0 = 0; } diff --git a/src/core2/code_935F0.c b/src/core2/code_935F0.c index 4f3e3248..5d6c8cd9 100644 --- a/src/core2/code_935F0.c +++ b/src/core2/code_935F0.c @@ -130,15 +130,15 @@ void __chMinigame_setState(Actor *this, u32 arg1) { break; case MINIGAME_STATE_2_IN_PROGESS: func_8028F918(0); - volatileFlag_set(3, 1); + volatileFlag_set(VOLATILE_FLAG_3, 1); break; case MINIGAME_STATE_3_RETURN_TO_FF: - volatileFlag_set(4, 1); + volatileFlag_set(VOLATILE_FLAG_4, 1); func_8028F918(2); func_8025AB00(); func_8025A70C((volatileFlag_get(VOLATILE_FLAG_5)) ? COMUSIC_3B_MINIGAME_VICTORY : COMUSIC_3C_MINIGAME_LOSS); func_802E4A70(); - volatileFlag_set(0x21, TRUE); + volatileFlag_set(VOLATILE_FLAG_21, TRUE); timedFunc_set_3(2.0f, (GenFunction_3)func_802E4078, MAP_8E_GL_FURNACE_FUN, 1, 1); break; } @@ -146,7 +146,7 @@ void __chMinigame_setState(Actor *this, u32 arg1) { } void __chMinigame_free(Actor *this){ - volatileFlag_set(3, 0); + volatileFlag_set(VOLATILE_FLAG_3, 0); } void chMinigame_update(Actor *this){ @@ -169,8 +169,8 @@ void chMinigame_update(Actor *this){ marker_despawn(this->marker); return; } - volatileFlag_set(5, 0); - volatileFlag_set(3, 0); + volatileFlag_set(VOLATILE_FLAG_5, 0); + volatileFlag_set(VOLATILE_FLAG_3, 0); __chMinigame_setState(this, MINIGAME_STATE_1_INTRODUCE_GAME); gcpausemenu_80314AC8(0); } diff --git a/src/core2/code_956B0.c b/src/core2/code_956B0.c index 095ab093..68782a0d 100644 --- a/src/core2/code_956B0.c +++ b/src/core2/code_956B0.c @@ -9,8 +9,6 @@ extern s32 fileProgressFlag_get(s32); extern s32 fileProgressFlag_getN(s32 offset, s32 numBits); extern void func_8031FFAC(void); extern void fileProgressFlag_set(s32 index, s32 set); -extern void volatileFlag_clear(void); -extern void volatileFlag_set(s32 arg0, s32 arg1); extern void ml_vec3h_to_vec3f(f32 *, s32); extern NodeProp *func_80304ED0(void*, f32 *); extern void func_8031CD44(s32, s32, f32, f32, s32); @@ -299,7 +297,7 @@ void warp_gvEnterMatchingPyramid(s32 arg0, s32 arg1) { void warp_gvEnterWaterPyramidUpper(s32 arg0, s32 arg1) { func_80244C78(0); - volatileFlag_set(0xAC, 1); + volatileFlag_set(VOLATILE_FLAG_AC, 1); func_8031CC8C(arg0, 0x1502); } @@ -536,7 +534,7 @@ void func_8031DAA8(s32 arg0, s32 arg1) { void func_8031DAE0(s32 arg0, s32 arg1) { if (mapSpecificFlags_get(2) == 0) { - volatileFlag_set(0xAD, 1); + volatileFlag_set(VOLATILE_FLAG_AD, 1); func_80244C78(0); mapSpecificFlags_set(2, 1); func_8025A6EC(COMUSIC_3B_MINIGAME_VICTORY, 0x6D60); diff --git a/src/core2/code_98CB0.c b/src/core2/code_98CB0.c index 0dc76f36..d34e9f17 100644 --- a/src/core2/code_98CB0.c +++ b/src/core2/code_98CB0.c @@ -247,8 +247,8 @@ s32 volatileFlag_get(s32 index) { return bitfield_get_bit(gVolatileFlags.unk8, index); } -void volatileFlag_getN(s32 index, s32 numBits) { - bitfield_get_n_bits(gVolatileFlags.unk8, index, numBits); +s32 volatileFlag_getN(s32 index, s32 numBits) { + return bitfield_get_n_bits(gVolatileFlags.unk8, index, numBits); } s32 volatileFlag_getAndSet(s32 index, s32 arg1) { diff --git a/src/core2/code_9A740.c b/src/core2/code_9A740.c index 28ce94cd..8d237a8e 100644 --- a/src/core2/code_9A740.c +++ b/src/core2/code_9A740.c @@ -42,7 +42,7 @@ void func_803216D0(enum map_e map){ && D_80383300.level != LEVEL_D_CUTSCENE && map != MAP_91_FILE_SELECT ){ - volatileFlag_set(0x18, TRUE); + volatileFlag_set(VOLATILE_FLAG_18, TRUE); } if(D_80383300.level == LEVEL_9_RUSTY_BUCKET_BAY){ @@ -74,7 +74,7 @@ void func_80321854(void){ && fileProgressFlag_get(FILEPROG_31_MM_OPEN) && !fileProgressFlag_get(FILEPROG_C1_BADDIES_ESCAPE_TEXT) ){ - volatileFlag_set(0x22, 1); + volatileFlag_set(VOLATILE_FLAG_22, 1); } bsStoredState_8029A924(); //null func_803465BC(); //null diff --git a/src/core2/code_9E370.c b/src/core2/code_9E370.c index 159f7774..a88057a8 100644 --- a/src/core2/code_9E370.c +++ b/src/core2/code_9E370.c @@ -528,7 +528,7 @@ void func_803268B4(void) { if (suBaddieActorArray != NULL) { - sp54 = volatileFlag_get(101); + sp54 = volatileFlag_get(VOLATILE_FLAG_65_CHEAT_ENTERED); for(temp_v1 = suBaddieActorArray->cnt - 1; temp_v1 >= 0; temp_v1--){ actor = &suBaddieActorArray->data[temp_v1]; actor_info = actor->actor_info; @@ -1517,7 +1517,7 @@ bool func_803294F0(Actor *this, s32 arg1, s32 arg2){ bool func_80329530(Actor *this, s32 dist){ if( func_8028F098() - && !volatileFlag_get(0xBF) + && !volatileFlag_get(VOLATILE_FLAG_BF) && subaddie_playerIsWithinSphere(this, dist) ){ return TRUE; diff --git a/src/core2/code_A5BC0.c b/src/core2/code_A5BC0.c index e682f8c6..e4e73cd2 100644 --- a/src/core2/code_A5BC0.c +++ b/src/core2/code_A5BC0.c @@ -888,7 +888,7 @@ void cube_fromFile(Struct61s *file_ptr, Cube *cube) { } if (file_getByte_ifExpected(file_ptr, 8, &sp47)) { - sp34 = volatileFlag_get(VOLATILE_FLAG_1) + volatileFlag_get(VOLATILE_FLAG_2) + volatileFlag_get(0x1F); + sp34 = volatileFlag_get(VOLATILE_FLAG_1) + volatileFlag_get(VOLATILE_FLAG_2) + volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE); if ((sp34) && gcparade_8031B4CC()) { sp34 = 0; diff --git a/src/core2/code_BEF20.c b/src/core2/code_BEF20.c index 4f9ffa18..8ad89528 100644 --- a/src/core2/code_BEF20.c +++ b/src/core2/code_BEF20.c @@ -7,9 +7,6 @@ f32 time_getDelta(void); void func_80346DB4(s32); s32 item_adjustByDiffWithHud(enum item_e item, s32 diff); -void itemscore_noteScores_clear(void); -s32 itemscore_noteScores_get(enum level_e lvl_id); -void itemscore_timeScores_clear(void); /* .bss */ s32 D_80385F30[0x2C]; @@ -308,7 +305,7 @@ void func_803465E4(void){ }//L803469E4 }//L803469E4 - if(!volatileFlag_get(0xbf)){ + if(!volatileFlag_get(VOLATILE_FLAG_BF)){ for(i = 0; i < 6; i++){ if(D_80385F30[ITEM_6_HOURGLASS + i]){ func_80345EB0(ITEM_0_HOURGLASS_TIMER + i); @@ -406,9 +403,9 @@ void func_80346DB4(s32 note_count) { if (!levelSpecificFlags_get(0x34) && (func_80311480(0xF76, 0, NULL, NULL, NULL, NULL))) { levelSpecificFlags_set(0x34, TRUE); } - if (volatileFlag_get(0x17) == 0) { - volatileFlag_set(0x17, 1); - volatileFlag_setN(0x19, level_id, 4); + if (volatileFlag_get(VOLATILE_FLAG_17) == 0) { + volatileFlag_set(VOLATILE_FLAG_17, 1); + volatileFlag_setN(VOLATILE_FLAG_19_CURRENT_LEVEL_ID, level_id, 4); } } } @@ -537,7 +534,7 @@ void func_8034789C(void) { } else { D_80385F30[ITEM_15_HEALTH_TOTAL] = 5 + MIN(3, (sp1C / 6)); } - if (volatileFlag_get(0x94)) { + if (volatileFlag_get(VOLATILE_FLAG_94_SANDCASTLE_INFINITE_HEALTH)) { temp_v0 = D_80385F30[ITEM_15_HEALTH_TOTAL]; if (temp_v0 >= 9) { D_80385F30[ITEM_15_HEALTH_TOTAL] = temp_v0; @@ -597,8 +594,8 @@ void func_80347A7C(void){ void func_80347AA8(void) { volatileFlag_restoreAll(); - volatileFlag_set(0x1F, FALSE); - volatileFlag_set(0x20, FALSE); + volatileFlag_set(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE, FALSE); + volatileFlag_set(VOLATILE_FLAG_20_BEGIN_CHARACTER_PARADE, FALSE); volatileFlag_set(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE, FALSE); volatileFlag_set(VOLATILE_FLAG_C0_BEGIN_FINAL_CHARACTER_PARADE, FALSE); item_set(ITEM_16_LIFE, D_80386068); diff --git a/src/core2/code_C4320.c b/src/core2/code_C4320.c index 626172ad..e1856afc 100644 --- a/src/core2/code_C4320.c +++ b/src/core2/code_C4320.c @@ -207,7 +207,7 @@ void func_8034B8C0(enum map_e map_id, s32 demo_id) { demo_load(map_id,demo_id); D_80386118 = D_8038611C = 0; if (D_80386114->unk1 == 6) { - volatileFlag_set(0x1F, 1); + volatileFlag_set(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE, 1); func_802E4A70(); } if ((demo_id == 0x5B) || (demo_id == 0x5F)) { @@ -305,8 +305,8 @@ void func_8034BB90(void) { && sp18 && !D_8038611C && (getGameMode() != GAME_MODE_8_BOTTLES_BONUS) - && ((volatileFlag_get(0x64) && (getGameMode() != GAME_MODE_A_SNS_PICTURE)) - || volatileFlag_get(0x63)) + && ((volatileFlag_get(VOLATILE_FLAG_64) && (getGameMode() != GAME_MODE_A_SNS_PICTURE)) + || volatileFlag_get(VOLATILE_FLAG_63)) ) { func_8034B7F0(D_80386114->unk1); if (getGameMode() == GAME_MODE_9_BANJO_AND_KAZOOIE) { @@ -317,7 +317,7 @@ void func_8034BB90(void) { } else { func_802DF0C8(); } - } else if (volatileFlag_get(0x64)) { + } else if (volatileFlag_get(VOLATILE_FLAG_64)) { func_802E412C(1, D_80386114->unk5); func_8034B994(); } else { @@ -329,8 +329,8 @@ void func_8034BB90(void) { func_8025A58C(0, 800); func_8025AB00(); } - volatileFlag_set(0x64, 0); - volatileFlag_set(0x63, 0); + volatileFlag_set(VOLATILE_FLAG_64, 0); + volatileFlag_set(VOLATILE_FLAG_63, 0); D_8038611C = 1; } } diff --git a/src/core2/code_DA760.c b/src/core2/code_DA760.c index 1f142fc2..cf941faa 100644 --- a/src/core2/code_DA760.c +++ b/src/core2/code_DA760.c @@ -33,8 +33,8 @@ int func_803616F0(Actor *this){ } void func_80361828(Actor *this){ - if(volatileFlag_get(0x16) && level_get() == LEVEL_6_LAIR){ - volatileFlag_set(0x16, 0); + if(volatileFlag_get(VOLATILE_FLAG_16) && level_get() == LEVEL_6_LAIR){ + volatileFlag_set(VOLATILE_FLAG_16, 0); } } @@ -54,19 +54,19 @@ void func_80361870(Actor *this){ } } else if(func_803616F0(this)){ - sp28 = (volatileFlag_get(0x16)?0xf6e:0xf68) + this->unkF4_8 - 1; - if(!volatileFlag_get(0x16) && level_get() == LEVEL_6_LAIR){ + sp28 = (volatileFlag_get(VOLATILE_FLAG_16)?0xf6e:0xf68) + this->unkF4_8 - 1; + if(!volatileFlag_get(VOLATILE_FLAG_16) && level_get() == LEVEL_6_LAIR){ this->unk138_24 = TRUE; } else{ if(func_80311480(sp28, 0, 0, 0, 0, 0)){ this->unk138_24 = TRUE; - volatileFlag_set(0x16, 0); + volatileFlag_set(VOLATILE_FLAG_16, 0); } } } else{//L80361A14 - volatileFlag_set(0x16, 0); + volatileFlag_set(VOLATILE_FLAG_16, 0); } }//L80361A20 } diff --git a/src/core2/gc/dialog.c b/src/core2/gc/dialog.c index 446cd2af..be1f68e7 100644 --- a/src/core2/gc/dialog.c +++ b/src/core2/gc/dialog.c @@ -922,7 +922,7 @@ int func_80311174(s32 text_id, s32 arg1, f32 *pos, ActorMarker *marker, void(*ca g_Dialog.unk148[temp_v1].unk20 = arg6; g_Dialog.unk12C_15++; if(arg1 & 0x08){ - if(!( func_802E4A08() || volatileFlag_get(0x1f)) || !g_Dialog.unk128_3){//L8031141C + if(!( func_802E4A08() || volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) || !g_Dialog.unk128_3){//L8031141C if(!func_8028EC04()){ if(pos != NULL){ func_8028F94C(2, pos); diff --git a/src/core2/gc/parade.c b/src/core2/gc/parade.c index 213c4d66..7a59e383 100644 --- a/src/core2/gc/parade.c +++ b/src/core2/gc/parade.c @@ -7,7 +7,6 @@ extern void func_8028F918(s32); extern void func_80311714(int); -extern void volatileFlag_set(s32, s32); typedef struct struct_1C_s{ u8 map; @@ -166,7 +165,7 @@ void gcparade_8031ABF8(void) { func_80347A7C(); func_8031FBF8(); func_8031FBA0(); - volatileFlag_set(0x1F, 1); + volatileFlag_set(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE, 1); if (D_803830F0.parade_id == PARADE_1_POST_GRUNTY_BATTLE) { volatileFlag_set(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE, TRUE); } @@ -243,7 +242,7 @@ void gcparade_setState(enum parade_state_e next_state) { timedFunc_set_1(0.25f, (GenFunction_1)gcparade_setState, (D_803830F0.indx == D_803830F0.count) ? PARADE_STATE_8_END : PARADE_STATE_3_WARP); break; case PARADE_STATE_8_END: - volatileFlag_set(0x1F, 0); + volatileFlag_set(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE, 0); volatileFlag_set(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE, FALSE); func_802E412C(1, 8); func_802E40C4(0xA); @@ -334,7 +333,7 @@ void gcparade_free(void){} void gcparade_start(void){ volatileFlag_set(VOLATILE_FLAG_20_BEGIN_CHARACTER_PARADE, FALSE); - volatileFlag_set(0x1F, TRUE); + volatileFlag_set(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE, TRUE); if(volatileFlag_getAndSet(VOLATILE_FLAG_C0_BEGIN_FINAL_CHARACTER_PARADE, FALSE)) gcparade_setState(PARADE_STATE_2_INIT_FINAL_PARADE); else diff --git a/src/core2/gc/pauseMenu.c b/src/core2/gc/pauseMenu.c index b1f97bb6..7c641ef4 100644 --- a/src/core2/gc/pauseMenu.c +++ b/src/core2/gc/pauseMenu.c @@ -988,9 +988,9 @@ s32 gcPauseMenu_update(void){ D_80383010.unk3_7 = 1; break; case 1://L80313908 //return to lair - volatileFlag_set(0x16, 1); + volatileFlag_set(VOLATILE_FLAG_16, 1); if(map_get() == MAP_8E_GL_FURNACE_FUN){ - volatileFlag_set(0,0); + volatileFlag_set(VOLATILE_FLAG_0,0); func_802E4078(MAP_80_GL_FF_ENTRANCE, 2, 1); }else{ func_802E4078(D_8036C560[level-1].map, D_8036C560[level-1].exit, 1); @@ -1003,7 +1003,7 @@ s32 gcPauseMenu_update(void){ break; case 3://L8031399C func_802C5994(); - volatileFlag_set(0,0); + volatileFlag_set(VOLATILE_FLAG_0,0); if(!fileProgressFlag_get(FILEPROG_BD_ENTER_LAIR_CUTSCENE) || fileProgressFlag_get(FILEPROG_A6_FURNACE_FUN_COMPLETE)){ gcPauseMenu_setState(0x14); }else{ @@ -1431,7 +1431,7 @@ void gcpausemenu_80314B24(void){ void gcpausemenu_returnToLair(void){ s32 level = level_get(); if(0 < level && level < 0xC && D_8036C560[level-1].map != -1){ - volatileFlag_set(0x16, TRUE); + volatileFlag_set(VOLATILE_FLAG_16, TRUE); func_802E4078(D_8036C560[level-1].map, D_8036C560[level-1].exit, 1); } } diff --git a/src/fight/chfinalboss.c b/src/fight/chfinalboss.c index dba2b684..fef65890 100644 --- a/src/fight/chfinalboss.c +++ b/src/fight/chfinalboss.c @@ -2237,7 +2237,7 @@ void chfinalboss_update(Actor *this){ chfinalboss_phase5_update(this->marker); break; } - volatileFlag_setN(0x23, local->phase, 3); + volatileFlag_setN(VOLATILE_FLAG_23_FINAL_BOSS_PHASE, local->phase, 3); player_getPosition(D_80392788); D_80392798[0] = this->position[0]; D_80392798[1] = this->position[1]; diff --git a/src/fight/chspellfireball.c b/src/fight/chspellfireball.c index c228231c..b2f879c8 100644 --- a/src/fight/chspellfireball.c +++ b/src/fight/chspellfireball.c @@ -226,7 +226,7 @@ void func_8038F3B4(ActorMarker *marker, ActorMarker *other){ ) return; func_8038F084(marker); - switch(volatileFlag_getN(0x23, 3)){ + switch(volatileFlag_getN(VOLATILE_FLAG_23_FINAL_BOSS_PHASE, 3)){ case 1: //8038F41C if(!fight_D_803928E0 && func_80311480(randi2(0, 5) + 0x10f2, 0, 0, 0, 0, 0)) fight_D_803928E0 = 1; diff --git a/src/lair/ch/brentilda.c b/src/lair/ch/brentilda.c index fc839292..c9a4be87 100644 --- a/src/lair/ch/brentilda.c +++ b/src/lair/ch/brentilda.c @@ -26,7 +26,7 @@ void func_8038BA30(ActorMarker *marker, enum asset_e text_id, s32 arg2){ this = marker_getActor(marker); phi_v1 = this->unk10_12*2; - volatileFlag_getN(0x20 + this->unkF4_8*6 + phi_v1, 2); + volatileFlag_getN(VOLATILE_FLAG_20_BEGIN_CHARACTER_PARADE + this->unkF4_8*6 + phi_v1, 2); } void lair_func_8038BA88(ActorMarker *marker, enum asset_e text_id, s32 arg2){ @@ -63,23 +63,26 @@ void func_8038BBC0(Actor *this) { } } -void func_8038BC24(void) { - s32 temp_v0; - s32 phi_s0; - s32 phi_s1; +void gzquiz_initGruntyQuestions(void) { + s32 pattern; + enum volatile_flags_e question_id; + s32 i; - if (fileProgressFlag_get(FILEPROG_5C_FF_PATTERN_SET) && !volatileFlag_get(0x62)) { + if (fileProgressFlag_get(FILEPROG_5C_FF_PATTERN_SET) && !volatileFlag_get(VOLATILE_FLAG_62_FF_GRUNTY_QUESTIONS_INITIALIZED)) { rand_seed(fileProgressFlag_getN(FILEPROG_D3_FF_PATTERN, 8)); - for(phi_s1 = 0; phi_s1 < func_8031A45C(3); phi_s1++){ - phi_s0 = 0x26 + 2*phi_s1; - temp_v0 = randi2(0, 3); - if (phi_s0 >= 0x61) { - volatileFlag_setN(0x26, temp_v0, 2); - } else { - volatileFlag_setN(phi_s0, temp_v0, 2); - } + + for(i = 0; i < func_8031A45C(FFQT_3_GRUNTY); i++){ + question_id = VOLATILE_FLAG_26_FF_GRUNTY_QUESTIONS + 2 * i; + pattern = randi2(0, 3); + + if (question_id >= 0x61) { + volatileFlag_setN(VOLATILE_FLAG_26_FF_GRUNTY_QUESTIONS, pattern, 2); + } else { + volatileFlag_setN(question_id, pattern, 2); + } } - volatileFlag_set(0x62, 1); + + volatileFlag_set(VOLATILE_FLAG_62_FF_GRUNTY_QUESTIONS_INITIALIZED, 1); } } @@ -104,7 +107,7 @@ void chBrentilda_update(Actor *this) { fileProgressFlag_setN(FILEPROG_D3_FF_PATTERN, randi2(0, 0x100), 8); fileProgressFlag_set(FILEPROG_5C_FF_PATTERN_SET, TRUE); } - func_8038BC24(); + gzquiz_initGruntyQuestions(); actor_setOpacity(this, 0x40); this->initialized = TRUE; } diff --git a/src/lair/ch/cauldron.c b/src/lair/ch/cauldron.c index 27e18d4b..6eb18d47 100644 --- a/src/lair/ch/cauldron.c +++ b/src/lair/ch/cauldron.c @@ -354,7 +354,7 @@ void chWarpCauldron_update(Actor *this) { func_8030E540(SFX_7C_CHEBOOF); } if (actor_animationIsAt(this, 0.63f)) { - volatileFlag_set(0x1E, 0); + volatileFlag_set(VOLATILE_FLAG_1E, 0); func_802D677C(0); func_8028FCAC(); nodeprop_getPosition(func_80304C38(D_80393620[this->unkF4_8 - 1].unk6, this), sp54); diff --git a/src/lair/code_0.c b/src/lair/code_0.c index 69c97ea9..4c9a6d96 100644 --- a/src/lair/code_0.c +++ b/src/lair/code_0.c @@ -362,7 +362,7 @@ void func_803867A8(Actor *this) { this->unk16C_4 = TRUE; this->unk158[0] = func_803866D8(0); this->unk158[1] = func_803866D8(1); - if (volatileFlag_get(0x86)) { + if (volatileFlag_get(VOLATILE_FLAG_86_SANDCASTLE_SHOCKSPRING_JUMP_UNLOCKED)) { ability_unlock(ABILITY_D_SHOCK_JUMP); fileProgressFlag_set(FILEPROG_C6_LAIR_JUMP_PAD_SWITCH_PRESSED, TRUE); fileProgressFlag_set(FILEPROG_C7_LAIR_JUMP_PAD_ACTIVE, TRUE); @@ -463,7 +463,7 @@ void func_80386D78(Actor *this) { if (!this->unk16C_4) { this->unk16C_4 = TRUE; - if (volatileFlag_get(0x8A)) { + if (volatileFlag_get(VOLATILE_FLAG_8A_SANDCASTLE_FLIGHT_UNLOCKED)) { ability_unlock(ABILITY_9_FLIGHT); mapSpecificFlags_set(0, TRUE); this->unk60 = 0.0f; @@ -472,7 +472,7 @@ void func_80386D78(Actor *this) { } } if ((this->unk1C[1] - 150.0f) <= this->position[1]) { - if (!volatileFlag_get(0x8A)) { + if (!volatileFlag_get(VOLATILE_FLAG_8A_SANDCASTLE_FLIGHT_UNLOCKED)) { if (this->unk60 != 0.0f) { this->unk60 -= 1.0f; if (this->unk60 == 0.0f) { @@ -872,7 +872,7 @@ void func_803880BC(Actor *this) __spawnQueue_add_1((GenFunction_1)func_80387E94, reinterpret_cast(s32, this->marker)); - if (volatileFlag_get(0xBC) && !fileProgressFlag_get(FILEPROG_9A_CC_WITCH_SWITCH_PRESSED)) + if (volatileFlag_get(VOLATILE_FLAG_BC) && !fileProgressFlag_get(FILEPROG_9A_CC_WITCH_SWITCH_PRESSED)) FUNC_8030E624(SFX_3F6_UNKNOWN, 0.75f, 30000); } @@ -892,7 +892,7 @@ void func_803880BC(Actor *this) } } - if (volatileFlag_get(0xBC) && !fileProgressFlag_get(FILEPROG_9B_LAIR_CC_WITCH_SWITCH_EYES_ACTIVE)) + if (volatileFlag_get(VOLATILE_FLAG_BC) && !fileProgressFlag_get(FILEPROG_9B_LAIR_CC_WITCH_SWITCH_EYES_ACTIVE)) { this->position_y += 1.7; @@ -944,7 +944,7 @@ void func_803882B0(Actor *this) this->unk60 = 0; } - if (this->pitch == 90.f || !volatileFlag_get(0xBB)) + if (this->pitch == 90.f || !volatileFlag_get(VOLATILE_FLAG_BB)) return; if (this->pitch == 0) @@ -1300,7 +1300,7 @@ void func_80388FC8(Actor *this) this->unk60 = 0; - if (volatileFlag_get(0x7D)) + if (volatileFlag_get(VOLATILE_FLAG_7D_SANDCASTLE_RAISE_PIPES_TO_CC)) { this->position_y = this->unk1C[1]; this->unk60 = 1.f; @@ -1377,7 +1377,7 @@ void lair_func_80389204(Actor *this) this->position_y -= 280.f; this->unk60 = 0; - if (volatileFlag_get(0x7E)) + if (volatileFlag_get(VOLATILE_FLAG_7E_SANDCASTLE_RAISE_PIPE_TO_BRENTILDA)) { this->position_y = this->unk1C[1]; this->unk60 = 1.f; @@ -1481,7 +1481,7 @@ void lair_func_803894B0(Actor *this) return; } - this->unk1C[0] = volatileFlag_get(0xBD) ? 22 : 0; + this->unk1C[0] = volatileFlag_get(VOLATILE_FLAG_BD) ? 22 : 0; } if (!this->unk1C[0]) @@ -1612,7 +1612,7 @@ void func_80389934(Actor *this) { case 21: { - if (volatileFlag_get(0xBE)) + if (volatileFlag_get(VOLATILE_FLAG_BE)) { this->unk1C[0] = 25; diff --git a/src/lair/code_5ED0.c b/src/lair/code_5ED0.c index c86679e8..6b82b958 100644 --- a/src/lair/code_5ED0.c +++ b/src/lair/code_5ED0.c @@ -574,7 +574,7 @@ void lair_func_8038CD48(void) lair_func_8038CC9C(); if (!volatileFlag_get(VOLATILE_FLAG_1) && !volatileFlag_get(VOLATILE_FLAG_2)) - volatileFlag_set(0, FALSE); + volatileFlag_set(VOLATILE_FLAG_0, FALSE); if (!volatileFlag_get(VOLATILE_FLAG_0)) func_8038CCEC(); @@ -611,7 +611,7 @@ void func_8038CE28(void) D_8037DCB8->currFfMode = 1; D_8037DCB8->unk48 = malloc(0x90); - func_8038BC24(); + gzquiz_initGruntyQuestions(); } void lair_func_8038CF18(void) @@ -823,7 +823,7 @@ void func_8038D48C(void) void func_8038D4BC(void) { - volatileFlag_set(2, TRUE); + volatileFlag_set(VOLATILE_FLAG_2, TRUE); func_802E4A70(); // restore moves after a delay @@ -966,7 +966,7 @@ void func_8038D670(enum FF_Action next_state) { if (D_8037DCB8->unk4->unk8 == FFTT_5_GRUNTY) { func_80356540(0xA2); } - if (volatileFlag_get(0xA0)) { + if (volatileFlag_get(VOLATILE_FLAG_A0)) { func_80356540(0xA1); } func_80356540(0xA0); @@ -995,7 +995,7 @@ void func_8038D670(enum FF_Action next_state) { quizQuestionAskedBitfield_set(func_8038D60C(D_8037DCB8->unk8), TRUE); lair_func_8038C640(D_8037DCB8->unk8, D_8037DCB8->unk4); } - if (volatileFlag_get(0xA3)) { + if (volatileFlag_get(VOLATILE_FLAG_A3)) { func_80356540(0xA4); } func_80356540(0xA3); @@ -1012,9 +1012,9 @@ void func_8038D670(enum FF_Action next_state) { func_8025AB00(); func_8025A70C(JINGLE_DOOR_OF_GRUNTY_OPENED); fileProgressFlag_set(FILEPROG_A6_FURNACE_FUN_COMPLETE, TRUE); - volatileFlag_set(0, FALSE); - volatileFlag_set(0xA6, TRUE); - volatileFlag_set(0xA7, TRUE); + volatileFlag_set(VOLATILE_FLAG_0, FALSE); + volatileFlag_set(VOLATILE_FLAG_A6, TRUE); + volatileFlag_set(VOLATILE_FLAG_A7, TRUE); next_state = 9; mapSpecificFlags_set(0xA, TRUE); func_8028F918(2); @@ -1284,7 +1284,7 @@ void lair_func_8038E0B0(void) { case 4://L8038E64C if (volatileFlag_get(VOLATILE_FLAG_1)) { - volatileFlag_set(1, 0); + volatileFlag_set(VOLATILE_FLAG_1, 0); func_8038E070(); func_8025A55C(6000, 500, 0xA); } @@ -1299,8 +1299,8 @@ void lair_func_8038E0B0(void) { } else { func_8038D670(1); } - volatileFlag_set(2, FALSE); - volatileFlag_set(4, FALSE); + volatileFlag_set(VOLATILE_FLAG_2, FALSE); + volatileFlag_set(VOLATILE_FLAG_4, FALSE); } break; @@ -1338,7 +1338,7 @@ void func_8038E7C4(void) return; func_8038CE28(); - volatileFlag_set(0, TRUE); + volatileFlag_set(VOLATILE_FLAG_0, TRUE); } /** From f451eae4e2601d9b17d43bac52118277a9c43e6d Mon Sep 17 00:00:00 2001 From: mariob92 <21146795-mariob92@users.noreply.gitlab.com> Date: Sun, 8 Sep 2024 17:59:41 +0200 Subject: [PATCH 3/5] document more vola flags --- include/enums.h | 56 ++++++++++++++++------------ src/BGS/ch/code_2270.c | 20 +++++----- src/BGS/code_3030.c | 2 +- src/BGS/code_3420.c | 12 +++--- src/CCW/code_160.c | 16 ++++---- src/GV/code_7FF0.c | 2 +- src/GV/matchinggame.c | 14 +++---- src/MMM/code_2040.c | 2 +- src/RBB/ch/bossboombox.c | 16 ++++---- src/RBB/ch/bossboomboxctrl.c | 2 +- src/TTC/code_3E30.c | 24 ++++++------ src/core2/animcache.c | 2 +- src/core2/ba/marker.c | 12 +++--- src/core2/ch/climbBase.c | 2 +- src/core2/ch/crab.c | 4 +- src/core2/ch/jiggy.c | 9 +++-- src/core2/code_14420.c | 2 +- src/core2/code_34790.c | 2 +- src/core2/code_41F30.c | 2 +- src/core2/code_42CB0.c | 2 +- src/core2/code_4C020.c | 2 +- src/core2/code_59A80.c | 2 +- src/core2/code_5C870.c | 2 +- src/core2/code_935F0.c | 8 ++-- src/core2/code_956B0.c | 4 +- src/core2/code_9A740.c | 2 +- src/core2/code_9B990.c | 2 +- src/core2/code_A5BC0.c | 2 +- src/core2/code_BEF20.c | 2 +- src/core2/code_CF3E0.c | 71 +++++++++++++++++++----------------- src/core2/gc/pauseMenu.c | 4 +- src/lair/code_0.c | 2 +- src/lair/code_5ED0.c | 50 ++++++++++++------------- 33 files changed, 184 insertions(+), 172 deletions(-) diff --git a/include/enums.h b/include/enums.h index 3f2280a6..a2363fa3 100644 --- a/include/enums.h +++ b/include/enums.h @@ -230,26 +230,26 @@ enum file_progress_e{ }; enum volatile_flags_e { - VOLATILE_FLAG_0, // FFQ entered? - VOLATILE_FLAG_1, - VOLATILE_FLAG_2, - VOLATILE_FLAG_3, - VOLATILE_FLAG_4, - VOLATILE_FLAG_5, - VOLATILE_FLAG_6_HAS_SEEN_BOSS_BOOM_BOX_FF_MINIGAME = 0x6, + VOLATILE_FLAG_0_IN_FURNACE_FUN_QUIZ, + VOLATILE_FLAG_1, // FF related + VOLATILE_FLAG_2_FF_IN_MINIGAME, + VOLATILE_FLAG_3, // FF related + VOLATILE_FLAG_4, // FF related + VOLATILE_FLAG_5_FF_MINIGAME_WON, + VOLATILE_FLAG_6_HAS_SEEN_BOSS_BOOM_BOX_FF_MINIGAME, VOLATILE_FLAG_7_HAS_SEEN_VILE_FF_MINIGAME, VOLATILE_FLAG_8_HAS_SEEN_MATCHING_PYRAMID_FF_MINIGAME, VOLATILE_FLAG_9_HAS_SEEN_ZUBBAS_FF_MINIGAME, VOLATILE_FLAG_A_HAS_SEEN_TIPTUP_FF_MINIGAME, VOLATILE_FLAG_B_HAS_SEEN_SANDCASTLE_FF_MINIGAME, VOLATILE_FLAG_C, - VOLATILE_FLAG_D, + VOLATILE_FLAG_D, VOLATILE_FLAG_E, VOLATILE_FLAG_F, VOLATILE_FLAG_10, VOLATILE_FLAG_11, VOLATILE_FLAG_12, - VOLATILE_FLAG_13_HAS_TRIGGERED_MUMBO_VACATION_TEXT = 0x13, + VOLATILE_FLAG_13_HAS_TRIGGERED_MUMBO_VACATION_TEXT, VOLATILE_FLAG_14, VOLATILE_FLAG_15, VOLATILE_FLAG_16, @@ -326,22 +326,29 @@ enum volatile_flags_e { VOLATILE_FLAG_9B_SANDCASTLE_BOTTLES_BONUS_5, VOLATILE_FLAG_9C_SANDCASTLE_BOTTLES_BONUS_6, VOLATILE_FLAG_9D_SANDCASTLE_WISHY_WASHY, - - VOLATILE_FLAG_A0 = 0xA0, - VOLATILE_FLAG_A1, - VOLATILE_FLAG_A2, - VOLATILE_FLAG_A3, - VOLATILE_FLAG_A4, - VOLATILE_FLAG_A5, - VOLATILE_FLAG_A6, - VOLATILE_FLAG_A7, - - VOLATILE_FLAG_AC = 0xAC, - VOLATILE_FLAG_AD, - + VOLATILE_FLAG_9E_BETA_OILY_SCUM, + VOLATILE_FLAG_9F_BETA_DIVE_IN_ICY_WATER, + VOLATILE_FLAG_A0_FF_FIRST_ANSWER_RIGHT, + VOLATILE_FLAG_A1_FF_NEXT_ANSWER_RIGHT, + VOLATILE_FLAG_A2_FF_GRUNTY_ANSWER_RIGHT, + VOLATILE_FLAG_A3_FF_FIRST_ANSWER_WRONG, + VOLATILE_FLAG_A4_FF_NEXT_ANSWER_WRONG, + VOLATILE_FLAG_A5_FF_UNUSED, + VOLATILE_FLAG_A6_FF_FOUND_HONEYCOMB, + VOLATILE_FLAG_A7_FF_FOUND_EXTRALIFE, + VOLATILE_FLAG_A8_FF_GOT_JOKER, + VOLATILE_FLAG_A9_FF_USED_JOKER, + VOLATILE_FLAG_AA_FF_LOW_HEALTH, + VOLATILE_FLAG_AB_LAST_LIFE_ON_SKULL, + VOLATILE_FLAG_AC_GV_TRAPDOOR_MISSED, + VOLATILE_FLAG_AD_MMM_CHURCH_DOOR_MISSED, + VOLATILE_FLAG_AE_BGS_WALKWAY_JIGGY_MISSED, + VOLATILE_FLAG_AF_BGS_MAZE_JIGGY_MISSED, + VOLATILE_FLAG_B0_NOT_ENOUGH_NOTES, VOLATILE_FLAG_B2 = 0xB2, VOLATILE_FLAG_B3, VOLATILE_FLAG_B4, + VOLATILE_FLAG_B5, VOLATILE_FLAG_BB = 0xBB, VOLATILE_FLAG_BC, @@ -351,9 +358,10 @@ enum volatile_flags_e { VOLATILE_FLAG_C0_BEGIN_FINAL_CHARACTER_PARADE = 0xC0, VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE, - VOLATILE_FLAG_C2_UNUSED, + VOLATILE_FLAG_C2_NOBONUS_TEXT, VOLATILE_FLAG_C3, // SNS picture related - VOLATILE_FLAG_C4_WOZZA_HIDE_IN_SNS_PARADE + VOLATILE_FLAG_C4_WOZZA_HIDE_IN_SNS_PARADE, + VOLATILE_FLAG_C5_WISHYWASHYBANJO_TEXT }; enum level_flags_e diff --git a/src/BGS/ch/code_2270.c b/src/BGS/ch/code_2270.c index 03e8f84d..ffefe90c 100644 --- a/src/BGS/ch/code_2270.c +++ b/src/BGS/ch/code_2270.c @@ -111,10 +111,10 @@ void func_80388848(ActorMarker *this){ if(sp1C != ++unqPtr->unk0) return; - if(volatileFlag_get(VOLATILE_FLAG_2)){ + if(volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){ item_set(ITEM_6_HOURGLASS,0); volatileFlag_set(VOLATILE_FLAG_3,0); - volatileFlag_set(VOLATILE_FLAG_5,1); + volatileFlag_set(VOLATILE_FLAG_5_FF_MINIGAME_WON,1); } else{ BGS_func_80388660(thisActor->marker); @@ -173,12 +173,12 @@ void BGS_func_803888E4(Actor *this, s32 arg1){ }//L80388B7C timed_exitStaticCamera(tmpf += 2.5); - if(!unqPtr->unkA && !volatileFlag_get(VOLATILE_FLAG_2)){ + if(!unqPtr->unkA && !volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){ func_80324DBC(tmpf + 0.5, 0xc73, 0xe, this->position, this->marker, func_80388784, 0); unqPtr->unkA = 1; } func_80324E38(sp54 = tmpf + 0.6, 0); - if(volatileFlag_get(VOLATILE_FLAG_2)){ + if(volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){ timedFunc_set_1(sp54, (GenFunction_1)func_803886F4, reinterpret_cast(s32, this->marker)); }else{ this->state = 0x05; @@ -243,7 +243,7 @@ void func_80388E94(ActorMarker *this, s32 arg1){ else{ func_8028F55C(1, thisActor->marker); timedFunc_set_0(0.5f, BGS_func_80388760); - if(!mapSpecificFlags_get(1) && !volatileFlag_get(VOLATILE_FLAG_2) && func_80311480(0xc75, 0, NULL, NULL, NULL, NULL)) + if(!mapSpecificFlags_get(1) && !volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) && func_80311480(0xc75, 0, NULL, NULL, NULL, NULL)) mapSpecificFlags_set(1,TRUE); } } @@ -292,12 +292,12 @@ void func_80389080(Actor *this){ unqPtr->unkA = fileProgressFlag_getN(0,2); unqPtr->unkB = 0; unqPtr->unkC = 0.0f; - if(volatileFlag_get(VOLATILE_FLAG_2)){ + if(volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){ unqPtr->unkA = 3; this->position_y = this->position_y - 300.0f; } BGS_func_803888E4(this, 1); - if(jiggyscore_isSpawned(JIGGY_27_BGS_TIPTUP) && !volatileFlag_get(VOLATILE_FLAG_2) && !volatileFlag_get(VOLATILE_FLAG_1)) + if(jiggyscore_isSpawned(JIGGY_27_BGS_TIPTUP) && !volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) && !volatileFlag_get(VOLATILE_FLAG_1)) marker_despawn(this->marker); } else{ @@ -312,7 +312,7 @@ void func_80389080(Actor *this){ func_80258A4C(this->position, this->yaw - 90.0f, player_position, &sp38, &sp34, &sp30); this->yaw = this->yaw + 5.0f*sp30; if(this->state == 1){ - if(volatileFlag_get(VOLATILE_FLAG_2)){ + if(volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){ if(volatileFlag_get(VOLATILE_FLAG_3)){ func_80324E38(0.0f,0); BGS_func_803888E4(this, 3); @@ -325,11 +325,11 @@ void func_80389080(Actor *this){ } } if(this->state == 5){ - if(volatileFlag_get(VOLATILE_FLAG_2)){ + if(volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){ if(item_empty(ITEM_0_HOURGLASS_TIMER)){ item_set(ITEM_6_HOURGLASS,1); volatileFlag_set(VOLATILE_FLAG_3,0); - volatileFlag_set(VOLATILE_FLAG_5,0); + volatileFlag_set(VOLATILE_FLAG_5_FF_MINIGAME_WON,0); } } //L80389370 else{ diff --git a/src/BGS/code_3030.c b/src/BGS/code_3030.c index 86a42d51..af914f3d 100644 --- a/src/BGS/code_3030.c +++ b/src/BGS/code_3030.c @@ -80,7 +80,7 @@ void func_80389668(Actor *this) { local->tiptup_marker = NULL; local->unk8 = 1.0f; func_80389488(this, 1); - if (jiggyscore_isSpawned(JIGGY_27_BGS_TIPTUP) && !volatileFlag_get(VOLATILE_FLAG_2) && !volatileFlag_get(VOLATILE_FLAG_1)) { + if (jiggyscore_isSpawned(JIGGY_27_BGS_TIPTUP) && !volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) && !volatileFlag_get(VOLATILE_FLAG_1)) { marker_despawn(this->marker); } return; diff --git a/src/BGS/code_3420.c b/src/BGS/code_3420.c index e3a21c01..bd013d52 100644 --- a/src/BGS/code_3420.c +++ b/src/BGS/code_3420.c @@ -362,7 +362,7 @@ void func_8038A068(Actor *this, s32 next_state) { local->current_type = YUMBLIE; local->player_score = 0; local->vile_score = 0; - if (volatileFlag_get(VOLATILE_FLAG_2) != 0) { + if (volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) != 0) { local->type_change_timer = 5.0f; } else { local->type_change_timer = 10.0f; @@ -640,7 +640,7 @@ void chvilegame_update(Actor *this) { local->unkC = 3; local->unkD = 3; } - if (volatileFlag_get(VOLATILE_FLAG_2)) { + if (volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)) { local->unkC = 2; local->unkD = 3; } @@ -651,7 +651,7 @@ void chvilegame_update(Actor *this) { local->vile_marker = actorArray_findClosestActorFromActorId(this->position, 0x13A, -1, &sp4C)->marker; } if (this->state == 1) { - if (volatileFlag_get(VOLATILE_FLAG_2)) { + if (volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)) { if (volatileFlag_get(VOLATILE_FLAG_3)) { func_8038A068(this, 5); } @@ -670,7 +670,7 @@ void chvilegame_update(Actor *this) { if ((local->unkC == 3) || (local->unkC == 6)) { if (ml_timer_update(&local->type_change_timer, sp50)) { local->current_type = !local->current_type; - if (volatileFlag_get(VOLATILE_FLAG_2)) { + if (volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)) { local->type_change_timer = 5.0f; } else { local->type_change_timer = 10.0f; @@ -691,9 +691,9 @@ void chvilegame_update(Actor *this) { itemPrint_reset(); } if (item_empty(ITEM_6_HOURGLASS)) { - if (volatileFlag_get(VOLATILE_FLAG_2)) { + if (volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)) { volatileFlag_set(VOLATILE_FLAG_3, 0); - volatileFlag_set(VOLATILE_FLAG_5, ( local->vile_score < local->player_score) ? TRUE : FALSE); + volatileFlag_set(VOLATILE_FLAG_5_FF_MINIGAME_WON, ( local->vile_score < local->player_score) ? TRUE : FALSE); func_8038A068(this, 1); } else if (local->vile_score < local->player_score) { if (local->unkC == 3) { diff --git a/src/CCW/code_160.c b/src/CCW/code_160.c index db7c4e18..0f99a84f 100644 --- a/src/CCW/code_160.c +++ b/src/CCW/code_160.c @@ -41,7 +41,7 @@ void func_803865F4(Actor *this, s32 next_state) { local = (ActorLocal_CCW_160 *)&this->local; local->unkC = 0.0f; if (next_state == 2) { - if (!volatileFlag_getAndSet(0xB5, 1)) { + if (!volatileFlag_getAndSet(VOLATILE_FLAG_B5, 1)) { func_80311480(0xCE2, 4, NULL, this->marker, func_803865C4, NULL); } else { func_80311480(0xCE3, 4, NULL, NULL, NULL, NULL); @@ -57,10 +57,10 @@ void func_803865F4(Actor *this, s32 next_state) { } if (next_state == 4) { - if (volatileFlag_get(VOLATILE_FLAG_2)) { + if (volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)) { item_set(ITEM_6_HOURGLASS, FALSE); volatileFlag_set(VOLATILE_FLAG_3, 0); - volatileFlag_set(VOLATILE_FLAG_5, 1); + volatileFlag_set(VOLATILE_FLAG_5_FF_MINIGAME_WON, 1); } else { func_80311480(0xCE4, 4, NULL, NULL, NULL, NULL); func_8025A58C(-1, 400); @@ -133,7 +133,7 @@ void func_8038687C(Actor *this) { local->unk4 = 0; local->unk8 = 0; local->unkC = 0.0f; - if (volatileFlag_get(VOLATILE_FLAG_2)) { + if (volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)) { this->position_y -= 300.0f; } func_803865F4(this, 1); @@ -141,7 +141,7 @@ void func_8038687C(Actor *this) { } if ((s32)local->unk0 == 1) { other = actorArray_findActorFromActorId(0x46); - if(volatileFlag_get(VOLATILE_FLAG_2)) { + if(volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)) { local->unk0 = NULL; if (other != NULL) { actor_collisionOff(other); @@ -198,7 +198,7 @@ void func_8038687C(Actor *this) { local->unkC = randf2(0.5 - ((local->unk8 / 10) * 0.4), 1.0 - ((local->unk8 / 10) * 0.8)); } if (this->state == 1) { - if (volatileFlag_get(VOLATILE_FLAG_2) && volatileFlag_get(VOLATILE_FLAG_3)) { + if (volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) && volatileFlag_get(VOLATILE_FLAG_3)) { item_set(ITEM_6_HOURGLASS, 1); item_set(ITEM_0_HOURGLASS_TIMER, 1800 - 1); func_803865F4(this, 3); @@ -209,9 +209,9 @@ void func_8038687C(Actor *this) { } } } - if ((this->state == 3) && volatileFlag_get(VOLATILE_FLAG_2) && item_empty(ITEM_0_HOURGLASS_TIMER)) { + if ((this->state == 3) && volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) && item_empty(ITEM_0_HOURGLASS_TIMER)) { item_set(ITEM_6_HOURGLASS, 0); volatileFlag_set(VOLATILE_FLAG_3, 0); - volatileFlag_set(VOLATILE_FLAG_5, 0); + volatileFlag_set(VOLATILE_FLAG_5_FF_MINIGAME_WON, 0); } } diff --git a/src/GV/code_7FF0.c b/src/GV/code_7FF0.c index ef814183..223ee199 100644 --- a/src/GV/code_7FF0.c +++ b/src/GV/code_7FF0.c @@ -263,7 +263,7 @@ void func_8038E648(Actor *this){ func_8030E540(SFX_7F_HEAVYDOOR_SLAM); mapSpecificFlags_set(5, FALSE); func_80244C78(0); - func_80356520(0xAC); + volatileFlag_setAndTriggerDialog_0(VOLATILE_FLAG_AC_GV_TRAPDOOR_MISSED); } break; }//L8038E904: diff --git a/src/GV/matchinggame.c b/src/GV/matchinggame.c index 777d10ce..5b64b5a3 100644 --- a/src/GV/matchinggame.c +++ b/src/GV/matchinggame.c @@ -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(volatileFlag_get(VOLATILE_FLAG_2)) + if(volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)) 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(volatileFlag_get(VOLATILE_FLAG_2)){ + if(volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){ volatileFlag_set(VOLATILE_FLAG_3, 0); - volatileFlag_set(VOLATILE_FLAG_5, 0); + volatileFlag_set(VOLATILE_FLAG_5_FF_MINIGAME_WON, 0); } else{ func_8028F66C(BS_INTR_F); @@ -89,9 +89,9 @@ void __matchingGame_setState(s32 next_state){ } if(next_state == 4){ - if(volatileFlag_get(VOLATILE_FLAG_2)){ + if(volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){ volatileFlag_set(VOLATILE_FLAG_3, 0); - volatileFlag_set(VOLATILE_FLAG_5, 1); + volatileFlag_set(VOLATILE_FLAG_5_FF_MINIGAME_WON, 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 - || volatileFlag_get(VOLATILE_FLAG_2) //in FF minigame + || volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) //in FF minigame ){ matchingGame.match_count = 0; matchingGame.tile_a = NULL; @@ -222,7 +222,7 @@ void gv_matchingGame_update(void){ }//L803907F0 if( matchingGame.state == 1 - && volatileFlag_get(VOLATILE_FLAG_2) + && volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) && volatileFlag_get(VOLATILE_FLAG_3) ){ __matchingGame_setState(2); diff --git a/src/MMM/code_2040.c b/src/MMM/code_2040.c index 9059a6f8..88179ae9 100644 --- a/src/MMM/code_2040.c +++ b/src/MMM/code_2040.c @@ -358,7 +358,7 @@ void func_80388BDC(Actor *this) { } this->unk38_31 = 0; this->unk60 = 0.0f; - func_80356520(0xAD); + volatileFlag_setAndTriggerDialog_0(VOLATILE_FLAG_AD_MMM_CHURCH_DOOR_MISSED); } break; } diff --git a/src/RBB/ch/bossboombox.c b/src/RBB/ch/bossboombox.c index 7f0fe9bb..d36b9e48 100644 --- a/src/RBB/ch/bossboombox.c +++ b/src/RBB/ch/bossboombox.c @@ -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(volatileFlag_get(VOLATILE_FLAG_2)){ + if(volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){ 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(volatileFlag_get(VOLATILE_FLAG_2)){ + if(volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){ item_set(ITEM_6_HOURGLASS, 0); volatileFlag_set(VOLATILE_FLAG_3, 0); - volatileFlag_set(VOLATILE_FLAG_5, 1); + volatileFlag_set(VOLATILE_FLAG_5_FF_MINIGAME_WON, 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,10 +523,10 @@ void func_8038D8BC(Actor *this){ RBB_func_8038CC9C(this, 7); } - if(jiggyscore_isSpawned(JIGGY_56_RBB_BOSS_BOOM_BOX) && !volatileFlag_get(VOLATILE_FLAG_2)) + if(jiggyscore_isSpawned(JIGGY_56_RBB_BOSS_BOOM_BOX) && !volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)) marker_despawn(this->marker); - if(volatileFlag_get(VOLATILE_FLAG_2)) + if(volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)) chbossboombox_hideJiggy(); if(volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)){ @@ -540,7 +540,7 @@ void func_8038D8BC(Actor *this){ player_getPosition(player_position); if(this->state == 1){ - if(volatileFlag_get(VOLATILE_FLAG_2)){ + if(volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){ 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(volatileFlag_get(VOLATILE_FLAG_2)){ + if(volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){ if(item_empty(ITEM_0_HOURGLASS_TIMER)){ volatileFlag_set(VOLATILE_FLAG_3, 0); - volatileFlag_set(VOLATILE_FLAG_5, 0); + volatileFlag_set(VOLATILE_FLAG_5_FF_MINIGAME_WON, 0); RBB_func_8038CC9C(this, 8); } } diff --git a/src/RBB/ch/bossboomboxctrl.c b/src/RBB/ch/bossboomboxctrl.c index 6cc6f34c..edf52905 100644 --- a/src/RBB/ch/bossboomboxctrl.c +++ b/src/RBB/ch/bossboomboxctrl.c @@ -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) && !volatileFlag_get(VOLATILE_FLAG_2)){ + if(jiggyscore_isSpawned(JIGGY_56_RBB_BOSS_BOOM_BOX) && !volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){ 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)); diff --git a/src/TTC/code_3E30.c b/src/TTC/code_3E30.c index 5516add9..3c1d910d 100644 --- a/src/TTC/code_3E30.c +++ b/src/TTC/code_3E30.c @@ -116,7 +116,7 @@ void func_8038A23C( s32 arg0, BKVtxRef *vtx_ref, Vtx *vtx, s32 arg2){ void func_8038A258(s32 arg0) { if (arg0 == 1) { - if (volatileFlag_get(VOLATILE_FLAG_2)) { + if (volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)) { item_set(ITEM_0_HOURGLASS_TIMER, 3000 - 1); } else { item_set(ITEM_0_HOURGLASS_TIMER, 6000 - 1); @@ -243,9 +243,9 @@ u32 cheatoCodeUnlocked(s32 cheato_code_index){ void func_8038ABA0(u32 arg0){ int i; - func_80356520(0xC2); + volatileFlag_setAndTriggerDialog_0(VOLATILE_FLAG_C2_NOBONUS_TEXT); if(arg0 & 0x400){ - func_80356560(0xC5); + volatileFlag_setAndTriggerDialog_E(VOLATILE_FLAG_C5_WISHYWASHYBANJO_TEXT); } volatileFlag_set(VOLATILE_FLAG_78_SANDCASTLE_NO_BONUS, 0); for(i = 4; i < 0xb; i++){ @@ -269,7 +269,7 @@ void func_8038AC48(LetterFloorTile *arg0) { s32 phi_s1; bool phi_s7; - temp_s5 = volatileFlag_get(VOLATILE_FLAG_2); + temp_s5 = volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME); phi_s7 = FALSE; sp3C = func_8038BD10(arg0); for(i_ptr = codesTable; i_ptr->code != 0; i_ptr++){ @@ -311,7 +311,7 @@ void func_8038AC48(LetterFloorTile *arg0) { if (temp_s5) { item_set(ITEM_6_HOURGLASS, FALSE); volatileFlag_set(VOLATILE_FLAG_3, 0); - volatileFlag_set(VOLATILE_FLAG_5, 1); + volatileFlag_set(VOLATILE_FLAG_5_FF_MINIGAME_WON, 1); func_8038A258(2); } else { var_v0 = i_ptr->unk4; @@ -366,7 +366,7 @@ void func_8038AFC8(void){ iPtr->unk6 = 0; } - if(volatileFlag_get(VOLATILE_FLAG_2)) + if(volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)) strcpy(codesTable[0].code, "j4663n86pink"); //EIOOZAKOJNAB else strcpy(codesTable[0].code, "knip68n3664j"); //BANJOKAZOOIE @@ -410,7 +410,7 @@ void func_8038B094(void){ func_803228D8(); timedFunc_set_3(2.0f, (GenFunction_3) func_802E4078, MAP_7_TTC_TREASURE_TROVE_COVE, 1, 0); } - else if(levelSpecificFlags_get(2) || volatileFlag_get(VOLATILE_FLAG_2)){ + else if(levelSpecificFlags_get(2) || volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){ func_8034E71C(sp2C, -500, 0.0f); } else{ @@ -437,7 +437,7 @@ void func_8038B094(void){ func_8038AFC8(); if( jiggyscore_isCollected(JIGGY_10_TTC_SANDCASTLE) - && !volatileFlag_get(VOLATILE_FLAG_2) + && !volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) ){ BKModel_transformMesh(D_8038D720.model2, 0x3C, func_8038A23C, 0); D_8038D720.unk8 = 3; @@ -461,14 +461,14 @@ void func_8038B2F0(void) { if (D_8038D720.model1 != 0) { func_8038AA2C(); player_getPosition(sp2C); - if ((D_8038D720.unk10 == 0) && volatileFlag_get(VOLATILE_FLAG_2) && volatileFlag_get(VOLATILE_FLAG_3)) { + if ((D_8038D720.unk10 == 0) && volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) && volatileFlag_get(VOLATILE_FLAG_3)) { func_8038A258(1); } if ((D_8038D720.unk10 == 1) && item_empty(ITEM_0_HOURGLASS_TIMER)) { func_8038A258(2); - if (volatileFlag_get(VOLATILE_FLAG_2)) { + if (volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)) { volatileFlag_set(VOLATILE_FLAG_3, FALSE); - volatileFlag_set(VOLATILE_FLAG_5, FALSE); + volatileFlag_set(VOLATILE_FLAG_5_FF_MINIGAME_WON, FALSE); } else { func_8028F66C(BS_INTR_F); } @@ -483,7 +483,7 @@ void func_8038B2F0(void) { temp_v0_3 = func_8038A2DC(mesh_id); if ((temp_v0_3 != NULL) && ((temp_v0_3->unk3 == 2) || (D_8038D720.unk8 == 3))) { func_8038AC48(temp_v0_3); - if ((D_8038D720.unk8 == 0) && (D_8038D720.unk10 == 0) && (volatileFlag_get(VOLATILE_FLAG_2) == 0)) { + if ((D_8038D720.unk8 == 0) && (D_8038D720.unk10 == 0) && (volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) == 0)) { func_8038A258(1); } } diff --git a/src/core2/animcache.c b/src/core2/animcache.c index bc01671a..acde349d 100644 --- a/src/core2/animcache.c +++ b/src/core2/animcache.c @@ -57,7 +57,7 @@ void animCache_flushAll(void){ for(i = 0; i<340; i++){ if(D_80379E20[i].alive){ - volatileFlag_get(VOLATILE_FLAG_0); + volatileFlag_get(VOLATILE_FLAG_0_IN_FURNACE_FUN_QUIZ); D_80379E20[i].life = 0; boneTransformList_free(D_80379E20[i].bone_xform); D_80379E20[i].bone_xform = NULL; diff --git a/src/core2/ba/marker.c b/src/core2/ba/marker.c index be4061ba..46d2b9ca 100644 --- a/src/core2/ba/marker.c +++ b/src/core2/ba/marker.c @@ -583,10 +583,10 @@ void __baMarker_resolveCollision(Prop *other_prop){ return; if( map_get() == MAP_8E_GL_FURNACE_FUN - && volatileFlag_get(VOLATILE_FLAG_0) + && volatileFlag_get(VOLATILE_FLAG_0_IN_FURNACE_FUN_QUIZ) && !fileProgressFlag_get(FILEPROG_A6_FURNACE_FUN_COMPLETE) ){ - func_80356540(FILEPROG_A6_FURNACE_FUN_COMPLETE); + volatileFlag_setAndTriggerDialog_4(VOLATILE_FLAG_A6_FF_FOUND_HONEYCOMB); func_8030E6D4(SFX_126_AUDIENCE_BOOING); } @@ -695,10 +695,10 @@ void __baMarker_resolveCollision(Prop *other_prop){ if(__baMarker_8028BC20(marker)) return; if( map_get() == MAP_8E_GL_FURNACE_FUN - && volatileFlag_get(VOLATILE_FLAG_0) + && volatileFlag_get(VOLATILE_FLAG_0_IN_FURNACE_FUN_QUIZ) && !fileProgressFlag_get(FILEPROG_A6_FURNACE_FUN_COMPLETE) ){ - func_80356540(FILEPROG_A7_NEAR_PUZZLE_PODIUM_TEXT); + volatileFlag_setAndTriggerDialog_4(VOLATILE_FLAG_A7_FF_FOUND_EXTRALIFE); func_8030E6D4(SFX_127_AUDIENCE_MIXED); } func_8025A6EC(COMUSIC_15_EXTRA_LIFE_COLLECTED, 0x7FFF); @@ -715,7 +715,7 @@ void __baMarker_resolveCollision(Prop *other_prop){ if(ability_isUnlocked(ABILITY_D_SHOCK_JUMP)){ miscflag_set(MISC_FLAG_2_ON_SPRING_PAD); }else{ - if(!volatileFlag_getAndSet(0xC, 1)){ + if(!volatileFlag_getAndSet(VOLATILE_FLAG_C, 1)){ func_80311480(0xA24, 4, 0, 0, 0, 0); } } @@ -727,7 +727,7 @@ void __baMarker_resolveCollision(Prop *other_prop){ if(ability_isUnlocked(ABILITY_9_FLIGHT)){ miscflag_set(MISC_FLAG_1_ON_FLIGHT_PAD); } - else if(! volatileFlag_getAndSet(0xD, 1)){ + else if(! volatileFlag_getAndSet(VOLATILE_FLAG_D, 1)){ func_80311480(0xA25, 4, 0, 0, 0, 0); } break; diff --git a/src/core2/ch/climbBase.c b/src/core2/ch/climbBase.c index 348d0812..d4446371 100644 --- a/src/core2/ch/climbBase.c +++ b/src/core2/ch/climbBase.c @@ -77,7 +77,7 @@ void func_802D77D4(Actor *this) { ml_vec3f_diff_copy(sp4C, this->position, sp40); if (((sp4C[0] * sp4C[0]) + (sp4C[2] * sp4C[2])) < (sp3C * sp3C)) { if ((this->position[1] < sp40[1]) && (sp40[1] <= local->unk0[1])) { - if (volatileFlag_get(VOLATILE_FLAG_2) == 0) { + if (volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) == 0) { func_8028F738(this->position, local->unk0, (f32)this->unkF4_8, local->unkC); } } diff --git a/src/core2/ch/crab.c b/src/core2/ch/crab.c index 0fe0900a..81f6b17b 100644 --- a/src/core2/ch/crab.c +++ b/src/core2/ch/crab.c @@ -246,7 +246,7 @@ void chCrab_update(Actor *this) { if (!jiggyscore_isCollected(JIGGY_10_TTC_SANDCASTLE)) { mapSpecificFlags_set(1, 0); } - if (volatileFlag_get(VOLATILE_FLAG_2)) { + if (volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)) { marker_despawn(this->marker); return; } @@ -279,7 +279,7 @@ void chCrab_update(Actor *this) { if (map_get() == MAP_A_TTC_SANDCASTLE) { if( !mapSpecificFlags_get(0) && levelSpecificFlags_get(2) - && !volatileFlag_get(VOLATILE_FLAG_2) + && !volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) && !jiggyscore_isCollected(JIGGY_10_TTC_SANDCASTLE) && func_80329530(this, 1600) ) { diff --git a/src/core2/ch/jiggy.c b/src/core2/ch/jiggy.c index 5a1a3c86..04efbefa 100644 --- a/src/core2/ch/jiggy.c +++ b/src/core2/ch/jiggy.c @@ -1,6 +1,7 @@ #include #include "functions.h" #include "variables.h" +#include "enums.h" extern void func_802BE720(void); extern f32 func_8033A244(f32); @@ -71,7 +72,7 @@ void func_802C7B6C(u32 arg0){ mapSpecificFlags_set(arg0, 0); } -void func_802C7B8C(Actor *this, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6){ +void func_802C7B8C(Actor *this, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, enum volatile_flags_e arg6){ if( !mapSpecificFlags_get(arg1) && mapSpecificFlags_get(arg2) && item_getCount(ITEM_0_HOURGLASS_TIMER) == 0 @@ -79,7 +80,7 @@ void func_802C7B8C(Actor *this, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5 func_8028FCC8(1); actor_collisionOff(this); func_802BAFE4(arg3); - func_80356520(arg6); + volatileFlag_setAndTriggerDialog_0(arg6); timedFunc_set_4(0.6f, (GenFunction_4)func_802C7AF8, (s32)this->position[0], (s32)this->position[1], (s32)this->position[2], arg4); timedFunc_set_2(0.6f, (GenFunction_2)func_802C7AB0, (s32)this->marker, arg5); timedFunc_set_0(1.0f, (GenFunction_0)func_802BE720); @@ -174,10 +175,10 @@ void chjiggy_update(Actor *this){ chjiggy_updateRotation(this); switch(chjiggy_getJiggyId(this)){ case JIGGY_20_BGS_ELEVATED_WALKWAY: //L802C7FE8 - func_802C7B8C(this, 4, 3, 0xD, 5, 2, 0xae); + func_802C7B8C(this, 4, 3, 0xD, 5, 2, VOLATILE_FLAG_AE_BGS_WALKWAY_JIGGY_MISSED); break; case JIGGY_25_BGS_MAZE://L802C8018 - func_802C7B8C(this, 0xd, 0xc, 0x1e, 9, 0xb, 0xaf); + func_802C7B8C(this, 0xd, 0xc, 0x1e, 9, 0xb, VOLATILE_FLAG_AF_BGS_MAZE_JIGGY_MISSED); break; case JIGGY_2F_FP_XMAS_TREE://L802C8048 if(levelSpecificFlags_get(0x29)) diff --git a/src/core2/code_14420.c b/src/core2/code_14420.c index 48d10aad..2853e03f 100644 --- a/src/core2/code_14420.c +++ b/src/core2/code_14420.c @@ -336,7 +336,7 @@ void func_8029B85C(ActorMarker *caller, enum asset_e text_id, s32 arg2){ } void func_8029B890(void){ - if(!fileProgressFlag_get(FILEPROG_A8_HAS_DIED) && !volatileFlag_get(VOLATILE_FLAG_2)){ + if(!fileProgressFlag_get(FILEPROG_A8_HAS_DIED) && !volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){ func_803114D0(); if(bs_getState() == 0x54){ func_8029B62C(); diff --git a/src/core2/code_34790.c b/src/core2/code_34790.c index 5861d4de..e11df21e 100644 --- a/src/core2/code_34790.c +++ b/src/core2/code_34790.c @@ -341,7 +341,7 @@ void func_802BC2CC(s32 arg0) { if (volatileFlag_get(VOLATILE_FLAG_E) != 0) { func_80347A14(0); } - if (volatileFlag_getAndSet(0xE, 0) || func_802D686C() || (arg0 == 0x63) || !func_802BB720(arg0, D_8037D908, D_8037D918, &sp1C)) { + if (volatileFlag_getAndSet(VOLATILE_FLAG_E, 0) || func_802D686C() || (arg0 == 0x63) || !func_802BB720(arg0, D_8037D908, D_8037D918, &sp1C)) { if (ncCameraType == CAMERA_TYPE_2_DYNAMIC) { func_802BE794(); } diff --git a/src/core2/code_41F30.c b/src/core2/code_41F30.c index 6351629c..bf53db7e 100644 --- a/src/core2/code_41F30.c +++ b/src/core2/code_41F30.c @@ -14,7 +14,7 @@ void chextralife_update(Actor *this){ if(!this->initialized){ func_8032AA58(this, 0.8f); this->initialized = TRUE; - if(volatileFlag_get(VOLATILE_FLAG_1) || volatileFlag_get(VOLATILE_FLAG_2)){ + if(volatileFlag_get(VOLATILE_FLAG_1) || volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){ marker_despawn(this->marker); } } diff --git a/src/core2/code_42CB0.c b/src/core2/code_42CB0.c index 83c75f57..5aff03d2 100644 --- a/src/core2/code_42CB0.c +++ b/src/core2/code_42CB0.c @@ -105,7 +105,7 @@ void chHoneycomb_update(Actor *this){ local->uid = (!this->unk44_2)? D_8037DDC0 : func_802C9C40(this); if( honeycombscore_get(local->uid) || volatileFlag_get(VOLATILE_FLAG_1) - || volatileFlag_get(VOLATILE_FLAG_2) + || volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) ){ marker_despawn(this->marker); return; diff --git a/src/core2/code_4C020.c b/src/core2/code_4C020.c index f026030e..899f9f31 100644 --- a/src/core2/code_4C020.c +++ b/src/core2/code_4C020.c @@ -574,7 +574,7 @@ void func_802D4680(Actor *this){ if(func_80258640(this->position, sp1C) < 150.0f && func_8028F20C()){ if(func_8028ECAC() == 0 || func_8028ECAC() == BSGROUP_8_TROT){ if(map_get() == MAP_8E_GL_FURNACE_FUN){ - volatileFlag_set(VOLATILE_FLAG_0, 0); + volatileFlag_set(VOLATILE_FLAG_0_IN_FURNACE_FUN_QUIZ, 0); func_802D4614(MAP_80_GL_FF_ENTRANCE); } else{ diff --git a/src/core2/code_59A80.c b/src/core2/code_59A80.c index 8b9ca3ae..8e3ea84a 100644 --- a/src/core2/code_59A80.c +++ b/src/core2/code_59A80.c @@ -70,7 +70,7 @@ void func_802E0B10(Actor *this){ } if( mumboscore_get(local->uid) || volatileFlag_get(VOLATILE_FLAG_1) - || volatileFlag_get(VOLATILE_FLAG_2) + || volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) || volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE) ){ marker_despawn(this->marker); diff --git a/src/core2/code_5C870.c b/src/core2/code_5C870.c index 6f9c3bab..be774461 100644 --- a/src/core2/code_5C870.c +++ b/src/core2/code_5C870.c @@ -265,7 +265,7 @@ void func_802E3E7C(enum game_mode_e mode){ sp28 = D_8037E8E0.exit; prev_mode = D_8037E8E0.unk0; func_802E3BF8(GAME_MODE_2_UNKNOWN, 0); - if(!volatileFlag_getAndSet(0x21, 0) || map_getLevel(map_get()) == map_getLevel(D_8037E8E0.map)){ + if(!volatileFlag_getAndSet(VOLATILE_FLAG_21, 0) || map_getLevel(map_get()) == map_getLevel(D_8037E8E0.map)){ if(!volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) mapSavestate_save(map_get()); } diff --git a/src/core2/code_935F0.c b/src/core2/code_935F0.c index 5d6c8cd9..768a6044 100644 --- a/src/core2/code_935F0.c +++ b/src/core2/code_935F0.c @@ -136,7 +136,7 @@ void __chMinigame_setState(Actor *this, u32 arg1) { volatileFlag_set(VOLATILE_FLAG_4, 1); func_8028F918(2); func_8025AB00(); - func_8025A70C((volatileFlag_get(VOLATILE_FLAG_5)) ? COMUSIC_3B_MINIGAME_VICTORY : COMUSIC_3C_MINIGAME_LOSS); + func_8025A70C((volatileFlag_get(VOLATILE_FLAG_5_FF_MINIGAME_WON)) ? COMUSIC_3B_MINIGAME_VICTORY : COMUSIC_3C_MINIGAME_LOSS); func_802E4A70(); volatileFlag_set(VOLATILE_FLAG_21, TRUE); timedFunc_set_3(2.0f, (GenFunction_3)func_802E4078, MAP_8E_GL_FURNACE_FUN, 1, 1); @@ -154,7 +154,7 @@ void chMinigame_update(Actor *this){ this->unk16C_4 = 1; this->unk10_12 = __chminigame_getCurrentMapId(); actor_collisionOff(this); - if(!volatileFlag_get(VOLATILE_FLAG_2)){ + if(!volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){ func_8031A678(this); return; } @@ -169,12 +169,12 @@ void chMinigame_update(Actor *this){ marker_despawn(this->marker); return; } - volatileFlag_set(VOLATILE_FLAG_5, 0); + volatileFlag_set(VOLATILE_FLAG_5_FF_MINIGAME_WON, 0); volatileFlag_set(VOLATILE_FLAG_3, 0); __chMinigame_setState(this, MINIGAME_STATE_1_INTRODUCE_GAME); gcpausemenu_80314AC8(0); } - if(volatileFlag_get(VOLATILE_FLAG_2)){ + if(volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){ switch(this->state){ case MINIGAME_STATE_1_INTRODUCE_GAME://L8031AB2C if(this->unk138_24) diff --git a/src/core2/code_956B0.c b/src/core2/code_956B0.c index 68782a0d..c1f21473 100644 --- a/src/core2/code_956B0.c +++ b/src/core2/code_956B0.c @@ -297,7 +297,7 @@ void warp_gvEnterMatchingPyramid(s32 arg0, s32 arg1) { void warp_gvEnterWaterPyramidUpper(s32 arg0, s32 arg1) { func_80244C78(0); - volatileFlag_set(VOLATILE_FLAG_AC, 1); + volatileFlag_set(VOLATILE_FLAG_AC_GV_TRAPDOOR_MISSED, 1); func_8031CC8C(arg0, 0x1502); } @@ -534,7 +534,7 @@ void func_8031DAA8(s32 arg0, s32 arg1) { void func_8031DAE0(s32 arg0, s32 arg1) { if (mapSpecificFlags_get(2) == 0) { - volatileFlag_set(VOLATILE_FLAG_AD, 1); + volatileFlag_set(VOLATILE_FLAG_AD_MMM_CHURCH_DOOR_MISSED, 1); func_80244C78(0); mapSpecificFlags_set(2, 1); func_8025A6EC(COMUSIC_3B_MINIGAME_VICTORY, 0x6D60); diff --git a/src/core2/code_9A740.c b/src/core2/code_9A740.c index 8d237a8e..9fb56644 100644 --- a/src/core2/code_9A740.c +++ b/src/core2/code_9A740.c @@ -37,7 +37,7 @@ void func_803216D0(enum map_e map){ levelSpecificFlags_clear(); bsStoredState_clearTimers(); func_803219A8(); - if( volatileFlag_getAndSet(0x17, FALSE) + if( volatileFlag_getAndSet(VOLATILE_FLAG_17, FALSE) && getGameMode() != 0 && D_80383300.level != LEVEL_D_CUTSCENE && map != MAP_91_FILE_SELECT diff --git a/src/core2/code_9B990.c b/src/core2/code_9B990.c index fbfdb793..6be00859 100644 --- a/src/core2/code_9B990.c +++ b/src/core2/code_9B990.c @@ -286,7 +286,7 @@ void __overlay_bgs_release(void){ return; } void func_80322D38(void){ if( map_get() == MAP_10_BGS_MR_VILE - && volatileFlag_get(VOLATILE_FLAG_2) + && volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) && volatileFlag_get(VOLATILE_FLAG_7_HAS_SEEN_VILE_FF_MINIGAME) ){ player_setTransformation(TRANSFORM_5_CROC); diff --git a/src/core2/code_A5BC0.c b/src/core2/code_A5BC0.c index e4e73cd2..26ce0b6f 100644 --- a/src/core2/code_A5BC0.c +++ b/src/core2/code_A5BC0.c @@ -888,7 +888,7 @@ void cube_fromFile(Struct61s *file_ptr, Cube *cube) { } if (file_getByte_ifExpected(file_ptr, 8, &sp47)) { - sp34 = volatileFlag_get(VOLATILE_FLAG_1) + volatileFlag_get(VOLATILE_FLAG_2) + volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE); + sp34 = volatileFlag_get(VOLATILE_FLAG_1) + volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) + volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE); if ((sp34) && gcparade_8031B4CC()) { sp34 = 0; diff --git a/src/core2/code_BEF20.c b/src/core2/code_BEF20.c index 8ad89528..8811349a 100644 --- a/src/core2/code_BEF20.c +++ b/src/core2/code_BEF20.c @@ -250,7 +250,7 @@ void func_803465E4(void){ }//L8034667C if(D_80385FE0){ - if(gctransition_done() || volatileFlag_get(VOLATILE_FLAG_0)){ + if(gctransition_done() || volatileFlag_get(VOLATILE_FLAG_0_IN_FURNACE_FUN_QUIZ)){ if(D_80385FE4){ item_dec(ITEM_16_LIFE); func_802FACA4(ITEM_14_HEALTH); diff --git a/src/core2/code_CF3E0.c b/src/core2/code_CF3E0.c index e08e55f5..2a52de74 100644 --- a/src/core2/code_CF3E0.c +++ b/src/core2/code_CF3E0.c @@ -36,28 +36,28 @@ MapProgressFlagToDialogID fileProgressDialogMap[] = { /* This progress IDs are not saved in the save file, like when Banjo goes near a Note door which requires more notes than the Banjo has. */ /* Triggers a dialog every time after the game restarts. */ -MapProgressFlagToDialogID volatileProgressDialogMap[] = { - {0x9E, 0xBA3}, - {0x9F, 0xCE8}, - {0xA0, 0x1032}, - {0xA1, 0x1033}, - {0xA2, 0x1034}, - {0xA3, 0x1035}, - {0xA4, 0x1036}, - {0xA5, 0x1037}, - {0xA6, 0x1038}, - {0xA7, 0x1039}, - {0xA8, 0x103A}, - {0xA9, 0x103B}, - {0xAA, 0x103C}, - {0xAB, 0x103D}, - {0xAC, 0xA88}, - {0xAD, 0xAE2}, - {0xAE, 0xC8B}, - {0xAF, 0xC8C}, - {0xB0, 0xFBD}, - {0xC2, 0xE36}, - {0xC5, 0xDB6}, +MapProgressFlagToDialogID gVolatileFlagDialogMap[] = { + {VOLATILE_FLAG_9E_BETA_OILY_SCUM, 0xBA3}, // Oily scum (unused) + {VOLATILE_FLAG_9F_BETA_DIVE_IN_ICY_WATER, 0xCE8}, // Dive in icy water (unused) + {VOLATILE_FLAG_A0_FF_FIRST_ANSWER_RIGHT, 0x1032}, + {VOLATILE_FLAG_A1_FF_NEXT_ANSWER_RIGHT, 0x1033}, + {VOLATILE_FLAG_A2_FF_GRUNTY_ANSWER_RIGHT, 0x1034}, + {VOLATILE_FLAG_A3_FF_FIRST_ANSWER_WRONG, 0x1035}, + {VOLATILE_FLAG_A4_FF_NEXT_ANSWER_WRONG, 0x1036}, + {VOLATILE_FLAG_A5_FF_UNUSED, 0x1037}, // FF "the choice is yours" + {VOLATILE_FLAG_A6_FF_FOUND_HONEYCOMB, 0x1038}, + {VOLATILE_FLAG_A7_FF_FOUND_EXTRALIFE, 0x1039}, + {VOLATILE_FLAG_A8_FF_GOT_JOKER, 0x103A}, + {VOLATILE_FLAG_A9_FF_USED_JOKER, 0x103B}, + {VOLATILE_FLAG_AA_FF_LOW_HEALTH, 0x103C}, + {VOLATILE_FLAG_AB_LAST_LIFE_ON_SKULL, 0x103D}, + {VOLATILE_FLAG_AC_GV_TRAPDOOR_MISSED, 0xA88}, + {VOLATILE_FLAG_AD_MMM_CHURCH_DOOR_MISSED, 0xAE2}, + {VOLATILE_FLAG_AE_BGS_WALKWAY_JIGGY_MISSED, 0xC8B}, + {VOLATILE_FLAG_AF_BGS_MAZE_JIGGY_MISSED, 0xC8C}, + {VOLATILE_FLAG_B0_NOT_ENOUGH_NOTES, 0xFBD}, + {VOLATILE_FLAG_C2_NOBONUS_TEXT, 0xE36}, + {VOLATILE_FLAG_C5_WISHYWASHYBANJO_TEXT, 0xDB6}, { -1, -1} }; @@ -101,31 +101,34 @@ void func_8035646C(enum file_progress_e progress_flag) { } /* Checks for a specific "volatile" progress flag and triggers a dialog only if the progress flag was not set and sets the progress flag */ -s32 func_8035648C(s32 arg0, s32 arg1) { +s32 volatileFlag_setAndTriggerDialog(enum volatile_flags_e id, s32 arg1) { s32 index; - if (volatileFlag_get(arg0) != 0) { + if (volatileFlag_get(id) != 0) { return 0; } else { - index = __findIndex(volatileProgressDialogMap, arg0); + index = __findIndex(gVolatileFlagDialogMap, id); if (index != -1) { - if (func_80311480(volatileProgressDialogMap[index].value, arg1, 0, 0, 0, 0) != 0) { - volatileFlag_set(arg0, 1); + if (func_80311480(gVolatileFlagDialogMap[index].value, arg1, 0, 0, 0, 0) != 0) { + volatileFlag_set(id, 1); } - return volatileFlag_get(arg0); + return volatileFlag_get(id); } return 0; } } -void func_80356520(s32 arg0) { - func_8035648C(arg0, 0); +// called for dialogs when banjo is not fast enough to reach a door or jiggy and for NOBONUS text +void volatileFlag_setAndTriggerDialog_0(s32 arg0) { + volatileFlag_setAndTriggerDialog(arg0, 0); } -void func_80356540(s32 arg0) { - func_8035648C(arg0, 4); +// called for FFQ dialogs +void volatileFlag_setAndTriggerDialog_4(s32 arg0) { + volatileFlag_setAndTriggerDialog(arg0, 4); } -void func_80356560(s32 arg0) { - func_8035648C(arg0, 0xE); +// called for WISHYWASHYBANJO dialog +void volatileFlag_setAndTriggerDialog_E(s32 arg0) { + volatileFlag_setAndTriggerDialog(arg0, 0xE); } diff --git a/src/core2/gc/pauseMenu.c b/src/core2/gc/pauseMenu.c index 7c641ef4..cfc9ddbc 100644 --- a/src/core2/gc/pauseMenu.c +++ b/src/core2/gc/pauseMenu.c @@ -990,7 +990,7 @@ s32 gcPauseMenu_update(void){ case 1://L80313908 //return to lair volatileFlag_set(VOLATILE_FLAG_16, 1); if(map_get() == MAP_8E_GL_FURNACE_FUN){ - volatileFlag_set(VOLATILE_FLAG_0,0); + volatileFlag_set(VOLATILE_FLAG_0_IN_FURNACE_FUN_QUIZ,0); func_802E4078(MAP_80_GL_FF_ENTRANCE, 2, 1); }else{ func_802E4078(D_8036C560[level-1].map, D_8036C560[level-1].exit, 1); @@ -1003,7 +1003,7 @@ s32 gcPauseMenu_update(void){ break; case 3://L8031399C func_802C5994(); - volatileFlag_set(VOLATILE_FLAG_0,0); + volatileFlag_set(VOLATILE_FLAG_0_IN_FURNACE_FUN_QUIZ,0); if(!fileProgressFlag_get(FILEPROG_BD_ENTER_LAIR_CUTSCENE) || fileProgressFlag_get(FILEPROG_A6_FURNACE_FUN_COMPLETE)){ gcPauseMenu_setState(0x14); }else{ diff --git a/src/lair/code_0.c b/src/lair/code_0.c index 4c9a6d96..d8557607 100644 --- a/src/lair/code_0.c +++ b/src/lair/code_0.c @@ -741,7 +741,7 @@ void func_80387730(Actor *this) { } } } else if ((this->unkF4_8 >= 2) && (ml_distance_vec3f(spAC, this->position) < 290.0f)) { - func_80356520(0xB0); + volatileFlag_setAndTriggerDialog_0(VOLATILE_FLAG_B0_NOT_ENOUGH_NOTES); } } } diff --git a/src/lair/code_5ED0.c b/src/lair/code_5ED0.c index 6b82b958..8471031c 100644 --- a/src/lair/code_5ED0.c +++ b/src/lair/code_5ED0.c @@ -573,10 +573,10 @@ void lair_func_8038CD48(void) if (D_8037DCB8->UNK_18) lair_func_8038CC9C(); - if (!volatileFlag_get(VOLATILE_FLAG_1) && !volatileFlag_get(VOLATILE_FLAG_2)) - volatileFlag_set(VOLATILE_FLAG_0, FALSE); + if (!volatileFlag_get(VOLATILE_FLAG_1) && !volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)) + volatileFlag_set(VOLATILE_FLAG_0_IN_FURNACE_FUN_QUIZ, FALSE); - if (!volatileFlag_get(VOLATILE_FLAG_0)) + if (!volatileFlag_get(VOLATILE_FLAG_0_IN_FURNACE_FUN_QUIZ)) func_8038CCEC(); } @@ -626,7 +626,7 @@ void lair_func_8038CF18(void) D_8037DCB8->unk0 = mapModel_getModel(0); D_8037DCB8->unk11 = 0; - if (volatileFlag_get(VOLATILE_FLAG_2) && !volatileFlag_get(VOLATILE_FLAG_4)) + if (volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) && !volatileFlag_get(VOLATILE_FLAG_4)) { quizQuestionAskedBitfield_free(); quizQuestionAskedBitfield_init(); @@ -666,7 +666,7 @@ void lair_func_8038CF18(void) } else { - if (volatileFlag_get(VOLATILE_FLAG_2)) + if (volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)) { levelSpecificFlags_clear(); func_8038D670(FFA_5_FORGET_MOVES_2); @@ -823,7 +823,7 @@ void func_8038D48C(void) void func_8038D4BC(void) { - volatileFlag_set(VOLATILE_FLAG_2, TRUE); + volatileFlag_set(VOLATILE_FLAG_2_FF_IN_MINIGAME, TRUE); func_802E4A70(); // restore moves after a delay @@ -959,17 +959,17 @@ void func_8038D670(enum FF_Action next_state) { if (((s32) D_8037DCB8->unk4->unk8 >= 7) && (quizQuestionAskedBitfield_get(func_8038D60C(D_8037DCB8->unk8)) == 0)) { item_adjustByDiffWithHud(ITEM_27_JOKER_CARD, D_8037DCB8->unk4->unk8 - 6); quizQuestionAskedBitfield_set(func_8038D60C(D_8037DCB8->unk8), TRUE); - func_80356540(0xA8); + volatileFlag_setAndTriggerDialog_4(VOLATILE_FLAG_A8_FF_GOT_JOKER); } if (D_8037DCB8->unk8 != 0x1EF) { func_8030E6A4(SFX_126_AUDIENCE_BOOING, 1.0f, 0x7FF8); if (D_8037DCB8->unk4->unk8 == FFTT_5_GRUNTY) { - func_80356540(0xA2); + volatileFlag_setAndTriggerDialog_4(VOLATILE_FLAG_A2_FF_GRUNTY_ANSWER_RIGHT); } - if (volatileFlag_get(VOLATILE_FLAG_A0)) { - func_80356540(0xA1); + if (volatileFlag_get(VOLATILE_FLAG_A0_FF_FIRST_ANSWER_RIGHT)) { + volatileFlag_setAndTriggerDialog_4(VOLATILE_FLAG_A1_FF_NEXT_ANSWER_RIGHT); } - func_80356540(0xA0); + volatileFlag_setAndTriggerDialog_4(VOLATILE_FLAG_A0_FF_FIRST_ANSWER_RIGHT); } } else { if (D_8037DCB8->unk4->unk8 == FFTT_6_SKULL) { @@ -995,10 +995,10 @@ void func_8038D670(enum FF_Action next_state) { quizQuestionAskedBitfield_set(func_8038D60C(D_8037DCB8->unk8), TRUE); lair_func_8038C640(D_8037DCB8->unk8, D_8037DCB8->unk4); } - if (volatileFlag_get(VOLATILE_FLAG_A3)) { - func_80356540(0xA4); + if (volatileFlag_get(VOLATILE_FLAG_A3_FF_FIRST_ANSWER_WRONG)) { + volatileFlag_setAndTriggerDialog_4(VOLATILE_FLAG_A4_FF_NEXT_ANSWER_WRONG); } - func_80356540(0xA3); + volatileFlag_setAndTriggerDialog_4(VOLATILE_FLAG_A3_FF_FIRST_ANSWER_WRONG); } break; @@ -1012,9 +1012,9 @@ void func_8038D670(enum FF_Action next_state) { func_8025AB00(); func_8025A70C(JINGLE_DOOR_OF_GRUNTY_OPENED); fileProgressFlag_set(FILEPROG_A6_FURNACE_FUN_COMPLETE, TRUE); - volatileFlag_set(VOLATILE_FLAG_0, FALSE); - volatileFlag_set(VOLATILE_FLAG_A6, TRUE); - volatileFlag_set(VOLATILE_FLAG_A7, TRUE); + volatileFlag_set(VOLATILE_FLAG_0_IN_FURNACE_FUN_QUIZ, FALSE); + volatileFlag_set(VOLATILE_FLAG_A6_FF_FOUND_HONEYCOMB, TRUE); + volatileFlag_set(VOLATILE_FLAG_A7_FF_FOUND_EXTRALIFE, TRUE); next_state = 9; mapSpecificFlags_set(0xA, TRUE); func_8028F918(2); @@ -1238,9 +1238,9 @@ void lair_func_8038E0B0(void) { fileProgressFlag_set(sp28, TRUE); } if ((sp38 == FFTT_6_SKULL) && (item_getCount(ITEM_16_LIFE) == 1)) { - func_80356540(0xAB); + volatileFlag_setAndTriggerDialog_4(VOLATILE_FLAG_AB_LAST_LIFE_ON_SKULL); } else if (item_getCount(ITEM_14_HEALTH) == 1) { - func_80356540(0xAA); + volatileFlag_setAndTriggerDialog_4(VOLATILE_FLAG_AA_FF_LOW_HEALTH); } if ((D_8037DCB8->unk4->unk9 == 2) && (func_8028ECAC() == 0)) { if (func_8028EFEC() && (sp48[FACE_BUTTON(BUTTON_A)] == 1)) { @@ -1256,7 +1256,7 @@ void lair_func_8038E0B0(void) { lair_func_8038C640(D_8037DCB8->unk8, D_8037DCB8->unk4); item_dec(ITEM_27_JOKER_CARD); func_8030E6D4(SFX_3EA_UNKNOWN); - func_80356540(0xA9); + volatileFlag_setAndTriggerDialog_4(VOLATILE_FLAG_A9_FF_USED_JOKER); if (D_8037DCB8->unk8 == 0x1EF) { func_8038D670(8); } @@ -1291,15 +1291,15 @@ void lair_func_8038E0B0(void) { break; case 5://L8038E684 - if (volatileFlag_get(VOLATILE_FLAG_2)) { + if (volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)) { if (volatileFlag_get(VOLATILE_FLAG_4)) { func_8038E070(); - D_8037DCB8->unkF = volatileFlag_get(VOLATILE_FLAG_5); + D_8037DCB8->unkF = volatileFlag_get(VOLATILE_FLAG_5_FF_MINIGAME_WON); func_8038D670(6); } else { func_8038D670(1); } - volatileFlag_set(VOLATILE_FLAG_2, FALSE); + volatileFlag_set(VOLATILE_FLAG_2_FF_IN_MINIGAME, FALSE); volatileFlag_set(VOLATILE_FLAG_4, FALSE); } break; @@ -1334,11 +1334,11 @@ void lair_func_8038E768(Gfx **dl, Mtx **m, Vtx **v) void func_8038E7C4(void) { - if (volatileFlag_get(VOLATILE_FLAG_0)) + if (volatileFlag_get(VOLATILE_FLAG_0_IN_FURNACE_FUN_QUIZ)) return; func_8038CE28(); - volatileFlag_set(VOLATILE_FLAG_0, TRUE); + volatileFlag_set(VOLATILE_FLAG_0_IN_FURNACE_FUN_QUIZ, TRUE); } /** From f85116d50caa38e19828ade69ff3d21431869f5f Mon Sep 17 00:00:00 2001 From: mariob92 <21146795-mariob92@users.noreply.gitlab.com> Date: Sun, 8 Sep 2024 18:58:43 +0200 Subject: [PATCH 4/5] completed documentation of vola flags --- include/enums.h | 87 ++++++++++++++++++++------------------ src/core2/ba/marker.c | 30 +++++++------ src/core2/ch/trainers.c | 8 ++-- src/core2/ch/wadingboots.c | 8 ++-- src/lair/code_0.c | 10 ++--- 5 files changed, 76 insertions(+), 67 deletions(-) diff --git a/include/enums.h b/include/enums.h index a2363fa3..14b7a222 100644 --- a/include/enums.h +++ b/include/enums.h @@ -242,33 +242,31 @@ enum volatile_flags_e { VOLATILE_FLAG_9_HAS_SEEN_ZUBBAS_FF_MINIGAME, VOLATILE_FLAG_A_HAS_SEEN_TIPTUP_FF_MINIGAME, VOLATILE_FLAG_B_HAS_SEEN_SANDCASTLE_FF_MINIGAME, - VOLATILE_FLAG_C, - VOLATILE_FLAG_D, - VOLATILE_FLAG_E, - VOLATILE_FLAG_F, - VOLATILE_FLAG_10, - VOLATILE_FLAG_11, - VOLATILE_FLAG_12, + VOLATILE_FLAG_C_HAS_SEEN_SPRING_PAD, + VOLATILE_FLAG_D_HAS_SEEN_FLIGHT_PAD, + VOLATILE_FLAG_E, // related to chxmastree, GV waterctrl and RBB anchorswitch + VOLATILE_FLAG_F_HAS_MEET_TURBO_SHOES, + VOLATILE_FLAG_10_HAS_MEET_WADING_BOOTS, + VOLATILE_FLAG_11, // unused + VOLATILE_FLAG_12, // unused VOLATILE_FLAG_13_HAS_TRIGGERED_MUMBO_VACATION_TEXT, - VOLATILE_FLAG_14, - VOLATILE_FLAG_15, - VOLATILE_FLAG_16, - VOLATILE_FLAG_17, - VOLATILE_FLAG_18, - + VOLATILE_FLAG_14, // unused + VOLATILE_FLAG_15, // unused + VOLATILE_FLAG_16, // related to beta function "return to lair" + VOLATILE_FLAG_17, // 17 and 18: related to 50 note door and demo mode (?) + VOLATILE_FLAG_18, // 17 and 18: related to 50 note door and demo mode (?) VOLATILE_FLAG_19_CURRENT_LEVEL_ID, // 4 bits for current level ID - - VOLATILE_FLAG_1D = 0x1D, - VOLATILE_FLAG_1E, - VOLATILE_FLAG_1F_IN_CHARACTER_PARADE = 0x1F, + // VOLATILE_FLAG_1A to VOLATILE_FLAG_1C belong to VOLATILE_FLAG_19_CURRENT_LEVEL_ID + VOLATILE_FLAG_1D = 0x1D, // unused + VOLATILE_FLAG_1E, // related to warp cauldron or dingpot + VOLATILE_FLAG_1F_IN_CHARACTER_PARADE, VOLATILE_FLAG_20_BEGIN_CHARACTER_PARADE, - VOLATILE_FLAG_21, - VOLATILE_FLAG_22, - - VOLATILE_FLAG_23_FINAL_BOSS_PHASE = 0x23, // 3 bits for current phase in final boss fight - + VOLATILE_FLAG_21, // related to FF + VOLATILE_FLAG_22, // related to baddies escape text + VOLATILE_FLAG_23_FINAL_BOSS_PHASE, // 3 bits for current phase in final boss fight + // VOLATILE_FLAG_24 to VOLATILE_FLAG_25 belong to VOLATILE_FLAG_23_FINAL_BOSS_PHASE VOLATILE_FLAG_26_FF_GRUNTY_QUESTIONS = 0x26, // 60 bits FFQ Grunty Question related (two bits for every question) - + // VOLATILE_FLAG_27 to VOLATILE_FLAG_61 belong to VOLATILE_FLAG_26_FF_GRUNTY_QUESTIONS VOLATILE_FLAG_62_FF_GRUNTY_QUESTIONS_INITIALIZED = 0x62, VOLATILE_FLAG_63, // related to demo mode VOLATILE_FLAG_64, // related to demo mode @@ -290,10 +288,13 @@ enum volatile_flags_e { VOLATILE_FLAG_74_SANDCASTLE_INFINITE_EGGS, VOLATILE_FLAG_75_SANDCASTLE_INFINITE_RED_FEATHERS, VOLATILE_FLAG_76_SANDCASTLE_INFINITE_GOLD_FEATHERS, - - VOLATILE_FLAG_78_SANDCASTLE_NO_BONUS = 0x78, - - VOLATILE_FLAG_7D_SANDCASTLE_RAISE_PIPES_TO_CC = 0x7D, + VOLATILE_FLAG_77, // unused + VOLATILE_FLAG_78_SANDCASTLE_NO_BONUS, + VOLATILE_FLAG_79, // unused + VOLATILE_FLAG_7A, // unused + VOLATILE_FLAG_7B, // unused + VOLATILE_FLAG_7C, // unused + VOLATILE_FLAG_7D_SANDCASTLE_RAISE_PIPES_TO_CC, VOLATILE_FLAG_7E_SANDCASTLE_RAISE_PIPE_TO_BRENTILDA, VOLATILE_FLAG_7F_SANDCASTLE_OPEN_CC, VOLATILE_FLAG_80_SANDCASTLE_REMOVE_GRILL_NEAR_BGS_JIGGY, @@ -345,23 +346,29 @@ enum volatile_flags_e { VOLATILE_FLAG_AE_BGS_WALKWAY_JIGGY_MISSED, VOLATILE_FLAG_AF_BGS_MAZE_JIGGY_MISSED, VOLATILE_FLAG_B0_NOT_ENOUGH_NOTES, - VOLATILE_FLAG_B2 = 0xB2, - VOLATILE_FLAG_B3, - VOLATILE_FLAG_B4, - VOLATILE_FLAG_B5, - - VOLATILE_FLAG_BB = 0xBB, - VOLATILE_FLAG_BC, - VOLATILE_FLAG_BD, - VOLATILE_FLAG_BE, - VOLATILE_FLAG_BF, - - VOLATILE_FLAG_C0_BEGIN_FINAL_CHARACTER_PARADE = 0xC0, + VOLATILE_FLAG_B1, // unused + VOLATILE_FLAG_B2, // ccw related + VOLATILE_FLAG_B3, // boggy2 related + VOLATILE_FLAG_B4, // fp related + VOLATILE_FLAG_B5, // ccw related + VOLATILE_FLAG_B6_WITCH_SWITCH_PRESSED_MM, + VOLATILE_FLAG_B7_WITCH_SWITCH_PRESSED_MMM, + VOLATILE_FLAG_B8_WITCH_SWITCH_PRESSED_TTC, + VOLATILE_FLAG_B9_WITCH_SWITCH_PRESSED_RBB, + VOLATILE_FLAG_BA_WITCH_SWITCH_PRESSED_CCW, + VOLATILE_FLAG_BB_WITCH_SWITCH_PRESSED_FP, + VOLATILE_FLAG_BC_WITCH_SWITCH_PRESSED_CC, + VOLATILE_FLAG_BD_WITCH_SWITCH_PRESSED_BGS, + VOLATILE_FLAG_BE_WITCH_SWITCH_PRESSED_GV, + VOLATILE_FLAG_BF, // witch switch related + VOLATILE_FLAG_C0_BEGIN_FINAL_CHARACTER_PARADE, VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE, VOLATILE_FLAG_C2_NOBONUS_TEXT, VOLATILE_FLAG_C3, // SNS picture related VOLATILE_FLAG_C4_WOZZA_HIDE_IN_SNS_PARADE, - VOLATILE_FLAG_C5_WISHYWASHYBANJO_TEXT + VOLATILE_FLAG_C5_WISHYWASHYBANJO_TEXT, + + VOLATILE_FLAG_NUM_FLAGS }; enum level_flags_e diff --git a/src/core2/ba/marker.c b/src/core2/ba/marker.c index 46d2b9ca..210c2f77 100644 --- a/src/core2/ba/marker.c +++ b/src/core2/ba/marker.c @@ -195,6 +195,7 @@ void __baMarker_8028BAB0(enum jiggy_e jiggy_id, s32 arg1, s32 arg2, s32 arg3){ func_8030E6D4(SFX_90_SWITCH_PRESS); } +// arg1 - if bit 0x400000 is set, it's a volatile flag, else it's a file progress flag (for witch switches) void __baMarker_8028BB1C(s32 arg0, u32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6){ u32 sp24; if(arg0 != 1) @@ -203,8 +204,9 @@ void __baMarker_8028BB1C(s32 arg0, u32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 a if(func_8028ECAC() == 1) return; + // if bit 0x400000 of arg1 is set, it's a volatile flag, else it's a file progress flag (for witch switches) if(arg1 & 0x400000){ - sp24 = arg1 + 0xFFC00000; + sp24 = arg1 + 0xFFC00000; // weird truncing if(!volatileFlag_get(sp24)){ volatileFlag_set(sp24, 1); func_8030E6D4(SFX_90_SWITCH_PRESS); @@ -379,8 +381,8 @@ void __baMarker_resolveCollision(Prop *other_prop){ } break; - case 0x231: //L8028C104 - case 0x244: //L8028C104 + case MARKER_231_WARP_CAULDRON: //L8028C104 + case MARKER_244_DINGPOT: //L8028C104 { if(func_8028ECAC() == 1) @@ -463,38 +465,38 @@ void __baMarker_resolveCollision(Prop *other_prop){ break; case MARKER_161_GV_WITCH_SWITCH: //L8028C384 - __baMarker_8028BB1C(plyr_hitbox_type, 0x4000BE, 0x6E, 0x7D, 0x19, 0x14, 0xA0); + __baMarker_8028BB1C(plyr_hitbox_type, 0x400000 | VOLATILE_FLAG_BE_WITCH_SWITCH_PRESSED_GV, 0x6E, 0x7D, 0x19, 0x14, 0xA0); break; case MARKER_162_BGS_WITCH_SWITCH: //L8028C3BC - __baMarker_8028BB1C(plyr_hitbox_type, 0x4000BD, 0x71, 0x7C, 0x18, 0x14, 0x9F); + __baMarker_8028BB1C(plyr_hitbox_type, 0x400000 | VOLATILE_FLAG_BD_WITCH_SWITCH_PRESSED_BGS, 0x71, 0x7C, 0x18, 0x14, 0x9F); break; case MARKER_166_CC_WITCH_SWITCH: //L8028C3F4 - __baMarker_8028BB1C(plyr_hitbox_type, 0x4000BC, 0x6A, 0x7A, 0x17, 0x14, 0x9A); + __baMarker_8028BB1C(plyr_hitbox_type, 0x400000 | VOLATILE_FLAG_BC_WITCH_SWITCH_PRESSED_CC, 0x6A, 0x7A, 0x17, 0x14, 0x9A); break; case MARKER_22B_FP_WITCH_SWITCH: //L8028C42C - __baMarker_8028BB1C(plyr_hitbox_type, 0x4000BB, 0x6F, 0x3A, 0x13, 0x15, 0x47); + __baMarker_8028BB1C(plyr_hitbox_type, 0x400000 | VOLATILE_FLAG_BB_WITCH_SWITCH_PRESSED_FP, 0x6F, 0x3A, 0x13, 0x15, 0x47); break; case MARKER_22A_CCW_WITCH_SWITCH: //L8028C464 - __baMarker_8028BB1C(plyr_hitbox_type, 0x4000BA, 0x79, 0x39, 0x12, 0x15, 0x46); + __baMarker_8028BB1C(plyr_hitbox_type, 0x400000 | VOLATILE_FLAG_BA_WITCH_SWITCH_PRESSED_CCW, 0x79, 0x39, 0x12, 0x15, 0x46); break; case MARKER_103_MM_WITCH_SWITCH: //L8028C49C - __baMarker_8028BB1C(plyr_hitbox_type, 0x4000B6, 0x69, 0x26, 1, 4, 0x18); + __baMarker_8028BB1C(plyr_hitbox_type, 0x400000 | VOLATILE_FLAG_B6_WITCH_SWITCH_PRESSED_MM, 0x69, 0x26, 1, 4, 0x18); break; case MARKER_104_MMM_WITCH_SWITCH: //L8028C4D4 - __baMarker_8028BB1C(plyr_hitbox_type, 0x4000B7, 0x6F, 0x27, 2, 0x14, 0x19); + __baMarker_8028BB1C(plyr_hitbox_type, 0x400000 | VOLATILE_FLAG_B7_WITCH_SWITCH_PRESSED_MMM, 0x6F, 0x27, 2, 0x14, 0x19); break; case MARKER_105_TTC_WITCH_SWITCH: //L8028C50C - __baMarker_8028BB1C(plyr_hitbox_type, 0x4000B8, 0x6D, 0x28, 3, 0x14, 0x1A); + __baMarker_8028BB1C(plyr_hitbox_type, 0x400000 | VOLATILE_FLAG_B8_WITCH_SWITCH_PRESSED_TTC, 0x6D, 0x28, 3, 0x14, 0x1A); break; case MARKER_106_RBB_WITCH_SWITCH: //L8028C544 - __baMarker_8028BB1C(plyr_hitbox_type, 0x4000B9, 0x76, 0x29, 4, 0xe, 0x1C); + __baMarker_8028BB1C(plyr_hitbox_type, 0x400000 | VOLATILE_FLAG_B9_WITCH_SWITCH_PRESSED_RBB, 0x76, 0x29, 4, 0xe, 0x1C); break; case MARKER_11B_WATER_LEVEL_SWITCH_1: //L8028C57C @@ -715,7 +717,7 @@ void __baMarker_resolveCollision(Prop *other_prop){ if(ability_isUnlocked(ABILITY_D_SHOCK_JUMP)){ miscflag_set(MISC_FLAG_2_ON_SPRING_PAD); }else{ - if(!volatileFlag_getAndSet(VOLATILE_FLAG_C, 1)){ + if(!volatileFlag_getAndSet(VOLATILE_FLAG_C_HAS_SEEN_SPRING_PAD, 1)){ func_80311480(0xA24, 4, 0, 0, 0, 0); } } @@ -727,7 +729,7 @@ void __baMarker_resolveCollision(Prop *other_prop){ if(ability_isUnlocked(ABILITY_9_FLIGHT)){ miscflag_set(MISC_FLAG_1_ON_FLIGHT_PAD); } - else if(! volatileFlag_getAndSet(VOLATILE_FLAG_D, 1)){ + else if(! volatileFlag_getAndSet(VOLATILE_FLAG_D_HAS_SEEN_FLIGHT_PAD, 1)){ func_80311480(0xA25, 4, 0, 0, 0, 0); } break; diff --git a/src/core2/ch/trainers.c b/src/core2/ch/trainers.c index 5dfdedce..df2d2cb1 100644 --- a/src/core2/ch/trainers.c +++ b/src/core2/ch/trainers.c @@ -70,19 +70,19 @@ void chtrainers_update(Actor *this){ subaddie_set_state(this, 0); } - if(!volatileFlag_get(VOLATILE_FLAG_F) && ability_isUnlocked(ABILITY_11_TURBO_TALON)){ - volatileFlag_set(VOLATILE_FLAG_F, TRUE); + if(!volatileFlag_get(VOLATILE_FLAG_F_HAS_MEET_TURBO_SHOES) && ability_isUnlocked(ABILITY_11_TURBO_TALON)){ + volatileFlag_set(VOLATILE_FLAG_F_HAS_MEET_TURBO_SHOES, TRUE); } switch(this->state){ case 0://L802CA5A8 if(func_803296D8(this, 2000) || sp2C){ if( func_80329530(this, 0xfa) - && !volatileFlag_get(VOLATILE_FLAG_F) + && !volatileFlag_get(VOLATILE_FLAG_F_HAS_MEET_TURBO_SHOES) && player_getTransformation() == TRANSFORM_1_BANJO ){ if(func_80311480(0xda4, 0, NULL, NULL, NULL, NULL)){ - volatileFlag_set(VOLATILE_FLAG_F, TRUE); + volatileFlag_set(VOLATILE_FLAG_F_HAS_MEET_TURBO_SHOES, TRUE); } }//L802CA620 _chtrainers_802CA378(this, sp2C); diff --git a/src/core2/ch/wadingboots.c b/src/core2/ch/wadingboots.c index 74324a41..c3f2aec1 100644 --- a/src/core2/ch/wadingboots.c +++ b/src/core2/ch/wadingboots.c @@ -45,8 +45,8 @@ void chwadingboots_update(Actor *this){ subaddie_set_state(this, 0); } - if(!volatileFlag_get(VOLATILE_FLAG_10) && ability_isUnlocked(ABILITY_E_WADING_BOOTS)){ - volatileFlag_set(VOLATILE_FLAG_10, TRUE); + if(!volatileFlag_get(VOLATILE_FLAG_10_HAS_MEET_WADING_BOOTS) && ability_isUnlocked(ABILITY_E_WADING_BOOTS)){ + volatileFlag_set(VOLATILE_FLAG_10_HAS_MEET_WADING_BOOTS, TRUE); } switch(this->state){ @@ -65,12 +65,12 @@ void chwadingboots_update(Actor *this){ } } - if(volatileFlag_get(VOLATILE_FLAG_10)) break; + if(volatileFlag_get(VOLATILE_FLAG_10_HAS_MEET_WADING_BOOTS)) break; if(!func_80329530(this, 250)) break; if(player_getTransformation() != TRANSFORM_1_BANJO) break; if(func_80311480(ASSET_DA5_DIALOG_WADINGBOOTS_MEET, 0, NULL, NULL, NULL, NULL)){ - volatileFlag_set(VOLATILE_FLAG_10, TRUE); + volatileFlag_set(VOLATILE_FLAG_10_HAS_MEET_WADING_BOOTS, TRUE); } break; diff --git a/src/lair/code_0.c b/src/lair/code_0.c index d8557607..082285ff 100644 --- a/src/lair/code_0.c +++ b/src/lair/code_0.c @@ -872,7 +872,7 @@ void func_803880BC(Actor *this) __spawnQueue_add_1((GenFunction_1)func_80387E94, reinterpret_cast(s32, this->marker)); - if (volatileFlag_get(VOLATILE_FLAG_BC) && !fileProgressFlag_get(FILEPROG_9A_CC_WITCH_SWITCH_PRESSED)) + if (volatileFlag_get(VOLATILE_FLAG_BC_WITCH_SWITCH_PRESSED_CC) && !fileProgressFlag_get(FILEPROG_9A_CC_WITCH_SWITCH_PRESSED)) FUNC_8030E624(SFX_3F6_UNKNOWN, 0.75f, 30000); } @@ -892,7 +892,7 @@ void func_803880BC(Actor *this) } } - if (volatileFlag_get(VOLATILE_FLAG_BC) && !fileProgressFlag_get(FILEPROG_9B_LAIR_CC_WITCH_SWITCH_EYES_ACTIVE)) + if (volatileFlag_get(VOLATILE_FLAG_BC_WITCH_SWITCH_PRESSED_CC) && !fileProgressFlag_get(FILEPROG_9B_LAIR_CC_WITCH_SWITCH_EYES_ACTIVE)) { this->position_y += 1.7; @@ -944,7 +944,7 @@ void func_803882B0(Actor *this) this->unk60 = 0; } - if (this->pitch == 90.f || !volatileFlag_get(VOLATILE_FLAG_BB)) + if (this->pitch == 90.f || !volatileFlag_get(VOLATILE_FLAG_BB_WITCH_SWITCH_PRESSED_FP)) return; if (this->pitch == 0) @@ -1481,7 +1481,7 @@ void lair_func_803894B0(Actor *this) return; } - this->unk1C[0] = volatileFlag_get(VOLATILE_FLAG_BD) ? 22 : 0; + this->unk1C[0] = volatileFlag_get(VOLATILE_FLAG_BD_WITCH_SWITCH_PRESSED_BGS) ? 22 : 0; } if (!this->unk1C[0]) @@ -1612,7 +1612,7 @@ void func_80389934(Actor *this) { case 21: { - if (volatileFlag_get(VOLATILE_FLAG_BE)) + if (volatileFlag_get(VOLATILE_FLAG_BE_WITCH_SWITCH_PRESSED_GV)) { this->unk1C[0] = 25; From 3b092f27491890f949ed671f9050d71f04490cbe Mon Sep 17 00:00:00 2001 From: mariob92 <21146795-mariob92@users.noreply.gitlab.com> Date: Sun, 8 Sep 2024 19:57:16 +0200 Subject: [PATCH 5/5] created enums for misc flags --- include/enums.h | 42 ++++++++++++++++++++++------------ include/functions.h | 7 ++++++ src/core2/ba/drone.c | 2 +- src/core2/ba/marker.c | 30 ++++++++++++------------ src/core2/bs/ant.c | 10 ++++---- src/core2/bs/bBarge.c | 20 ++++++++-------- src/core2/bs/bFlap.c | 2 +- src/core2/bs/bFly.c | 8 +++---- src/core2/bs/bLongLeg.c | 6 ++--- src/core2/bs/bPeck.c | 2 +- src/core2/bs/bTrot.c | 18 +++++++-------- src/core2/bs/bbuster.c | 2 +- src/core2/bs/bee.c | 8 +++---- src/core2/bs/beeFly.c | 4 ++-- src/core2/bs/beeMain.c | 6 ++--- src/core2/bs/croc.c | 14 ++++++------ src/core2/bs/dronelook.c | 4 ++-- src/core2/bs/dronexform.c | 4 ++-- src/core2/bs/jig.c | 6 ++--- src/core2/bs/jump.c | 14 ++++++------ src/core2/bs/pumpkin.c | 10 ++++---- src/core2/bs/rest.c | 2 +- src/core2/bs/stand.c | 2 +- src/core2/bs/surf.c | 2 +- src/core2/bs/swim.c | 4 ++-- src/core2/bs/walrus.c | 10 ++++---- src/core2/code_14420.c | 48 +++++++++++++++++++-------------------- src/core2/code_16010.c | 8 +++---- src/core2/code_39D0.c | 16 ++++++------- src/core2/code_7060.c | 25 ++++++++++---------- src/core2/code_A960.c | 4 ++-- src/core2/code_C3F0.c | 33 +++++++++++++-------------- src/core2/code_D9B0.c | 8 +++---- src/core2/code_E910.c | 2 +- src/core2/code_EF50.c | 14 ++++++------ src/core2/snackerctl.c | 2 +- 36 files changed, 209 insertions(+), 190 deletions(-) diff --git a/include/enums.h b/include/enums.h index 14b7a222..ee35aa27 100644 --- a/include/enums.h +++ b/include/enums.h @@ -4753,22 +4753,36 @@ enum bswatergroup_e{ }; enum misc_flag_e{ - MISC_FLAG_1_ON_FLIGHT_PAD = 0x1, + MISC_FLAG_0, // unused + MISC_FLAG_1_ON_FLIGHT_PAD, MISC_FLAG_2_ON_SPRING_PAD, + MISC_FLAG_3, + MISC_FLAG_4, + MISC_FLAG_5_HAS_PECKED, + MISC_FLAG_6, + MISC_FLAG_7, + MISC_FLAG_8, + MISC_FLAG_9, + MISC_FLAG_A, + MISC_FLAG_B, + MISC_FLAG_C, + MISC_FLAG_D, // unused + MISC_FLAG_E_TOUCHING_WADING_BOOTS, + MISC_FLAG_F, // related to A button ? + MISC_FLAG_10_TOUCHING_TURBO_TRAINERS, + MISC_FLAG_11, // unused + MISC_FLAG_12_HAS_FLAPPED, // has used flap + MISC_FLAG_13, // related to ground damage ? + MISC_FLAG_14_LOSE_BOGGY_RACE, // in difficult terrain (mud) + MISC_FLAG_15, // touching loadzone? + MISC_FLAG_16, // related to flying + MISC_FLAG_17_FIRST_PERSON_VIEW, + MISC_FLAG_18, // related to underwater state + MISC_FLAG_19, // related to transformations + MISC_FLAG_1A, // related to bee transformation + MISC_FLAG_1B_TRANSFORMING, - MISC_FLAG_5_HAS_PECKED = 0x5, - - MISC_FLAG_E_TOUCHING_WADING_BOOTS = 0xE, - - MISC_FLAG_10_TOUCHING_TURBO_TRAINERS = 0x10, - - //0x12 has used flap - MISC_FLAG_12_HAS_FLAPPED = 0x12, - //0x13 in difficult terrain (mud) - MISC_FLAG_14_LOSE_BOGGY_RACE = 0x14, - //0x15 touching loadzone? - MISC_FLAG_17_FPV = 0x17, - MISC_FLAG_1B_TRANSFORMING = 0x1B + MISC_FLAG_NUM_FLAGS }; enum nc_first_person_state{ diff --git a/include/functions.h b/include/functions.h index d4dbcd46..e35fc618 100644 --- a/include/functions.h +++ b/include/functions.h @@ -575,4 +575,11 @@ extern void itemscore_noteScores_clear(void); extern s32 itemscore_noteScores_get(enum level_e lvl_id); extern void itemscore_timeScores_clear(void); +extern void miscFlag_clearAll(void); +extern bool miscFlag_isTrue(enum misc_flag_e arg0); +extern bool miscFlag_isFalse(enum misc_flag_e arg0); +extern void miscFlag_set(enum misc_flag_e arg0); +extern void miscFlag_clear(enum misc_flag_e arg0); +extern void miscFlag_toggle(enum misc_flag_e arg0); + #endif diff --git a/src/core2/ba/drone.c b/src/core2/ba/drone.c index a5a0177a..54bdc69c 100644 --- a/src/core2/ba/drone.c +++ b/src/core2/ba/drone.c @@ -57,7 +57,7 @@ enum bs_e badrone_vanish(void){ } enum bs_e badrone_transform(void){ - miscflag_clear(0x19); + miscFlag_clear(MISC_FLAG_19); badrone_set_type(BA_DRONE_TRANSFORM); return func_8029BD90(); } diff --git a/src/core2/ba/marker.c b/src/core2/ba/marker.c index 210c2f77..eb6baa5d 100644 --- a/src/core2/ba/marker.c +++ b/src/core2/ba/marker.c @@ -142,7 +142,7 @@ void __baMarker_8028B904(s32 arg0, s32 arg1, s32 arg2, s32 arg3){ func_80296CC0(&sp1C); func_80296CB4(arg3); - if(miscflag_isTrue(7)){ + if(miscFlag_isTrue(MISC_FLAG_7)){ func_8029CDA0(); } else{ @@ -715,7 +715,7 @@ void __baMarker_resolveCollision(Prop *other_prop){ case MARKER_D4_SPRING_PAD: //L8028CDEC case 0x242: //L8028CDEC if(ability_isUnlocked(ABILITY_D_SHOCK_JUMP)){ - miscflag_set(MISC_FLAG_2_ON_SPRING_PAD); + miscFlag_set(MISC_FLAG_2_ON_SPRING_PAD); }else{ if(!volatileFlag_getAndSet(VOLATILE_FLAG_C_HAS_SEEN_SPRING_PAD, 1)){ func_80311480(0xA24, 4, 0, 0, 0, 0); @@ -727,7 +727,7 @@ void __baMarker_resolveCollision(Prop *other_prop){ case MARKER_240_LAIR_SWITCH_FLIGHT_PAD: //L8028CE3C case MARKER_261_FIGHT_FLIGHT_PAD: //L8028CE3C if(ability_isUnlocked(ABILITY_9_FLIGHT)){ - miscflag_set(MISC_FLAG_1_ON_FLIGHT_PAD); + miscFlag_set(MISC_FLAG_1_ON_FLIGHT_PAD); } else if(! volatileFlag_getAndSet(VOLATILE_FLAG_D_HAS_SEEN_FLIGHT_PAD, 1)){ func_80311480(0xA25, 4, 0, 0, 0, 0); @@ -746,7 +746,7 @@ void __baMarker_resolveCollision(Prop *other_prop){ if(chwadingboots_802D6E0C(actor) == 0) return; - miscflag_set(MISC_FLAG_E_TOUCHING_WADING_BOOTS); + miscFlag_set(MISC_FLAG_E_TOUCHING_WADING_BOOTS); func_802A6388(chwadingboots_802D6E4C(actor)); bs_checkInterrupt(BS_INTR_1B); __spawnQueue_add_4((GenFunction_4)func_802C418C, 0x4E, reinterpret_cast(u32, other_prop->actorProp.x), reinterpret_cast(u32, other_prop->actorProp.y), reinterpret_cast(u32, other_prop->actorProp.z)); @@ -770,7 +770,7 @@ void __baMarker_resolveCollision(Prop *other_prop){ if(!chtrainers_canUse(actor)) return; - miscflag_set(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS); + miscFlag_set(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS); set_turbo_duration(chtrainers_getDuration(actor)); bs_checkInterrupt(BS_INTR_1A); __spawnQueue_add_4((GenFunction_4)func_802C418C, 0x4E, reinterpret_cast(u32, other_prop->actorProp.x), reinterpret_cast(u32, other_prop->actorProp.y), reinterpret_cast(u32, other_prop->actorProp.z)); @@ -800,7 +800,7 @@ void __baMarker_resolveCollision(Prop *other_prop){ plyr_collision_type = MARKER_COLLISION_FUNC_0; } if(obj_collision_type){ - miscflag_set(8); + miscFlag_set(MISC_FLAG_8); } marker_callCollisionFunc(playerMarker, marker, plyr_collision_type); marker_callCollisionFunc(marker, playerMarker, obj_collision_type); @@ -814,10 +814,10 @@ void __baMarker_resolveCollision(Prop *other_prop){ switch (tmp2) { case 0x2E8: - miscflag_set(MISC_FLAG_1_ON_FLIGHT_PAD); //on flight pad + miscFlag_set(MISC_FLAG_1_ON_FLIGHT_PAD); //on flight pad break; case 0x2DD: //on shock spring pad - miscflag_set(MISC_FLAG_2_ON_SPRING_PAD); + miscFlag_set(MISC_FLAG_2_ON_SPRING_PAD); break; default: func_80332790(tmp2); @@ -866,9 +866,9 @@ void baMarker_init(void){ playerMarker->unk2C_1 = 1; marker_setCollisionScripts(playerMarker, NULL, func_80291634, func_80291610); func_803300B8(playerMarker, baMarker_8028D7B8); - miscflag_clear(MISC_FLAG_1_ON_FLIGHT_PAD); - miscflag_clear(MISC_FLAG_2_ON_SPRING_PAD); - miscflag_clear(8); + miscFlag_clear(MISC_FLAG_1_ON_FLIGHT_PAD); + miscFlag_clear(MISC_FLAG_2_ON_SPRING_PAD); + miscFlag_clear(MISC_FLAG_8); baMarker_8028D638(0,0); func_8033D2F4(); D_8037BF8C = 0; @@ -899,11 +899,11 @@ void baMarker_update(void){ D_8037BF88 = 0; } }//L8028D364 - miscflag_clear(8); + miscFlag_clear(MISC_FLAG_8); if(playerMarker->collidable){ temp_s0_2 = __baMarker_8028B750(); - miscflag_clear(MISC_FLAG_1_ON_FLIGHT_PAD); - miscflag_clear(MISC_FLAG_2_ON_SPRING_PAD); + miscFlag_clear(MISC_FLAG_1_ON_FLIGHT_PAD); + miscFlag_clear(MISC_FLAG_2_ON_SPRING_PAD); _player_getPosition(sp168); func_8032F64C(sp168, playerMarker); for(D_8037BF8C = NULL, i = 0, temp_s2 = 0; i < 2;i++){//L8028D3DC @@ -1016,7 +1016,7 @@ void baMarker_8028D7B8(s32 arg0, ActorMarker *arg1, struct5Cs *collision_flags){ s32 tmp_v0; if(func_8033D5A4(collision_flags)) - miscflag_set(8); + miscFlag_set(MISC_FLAG_8); if((func_80297C6C() != 3 && func_8028F1E0()) || !sp20){ if(!func_8028F25C()){ diff --git a/src/core2/bs/ant.c b/src/core2/bs/ant.c index 67be96dd..86fb00a1 100644 --- a/src/core2/bs/ant.c +++ b/src/core2/bs/ant.c @@ -54,8 +54,8 @@ void func_8029E4EC(void){ func_8029B0C0(); func_8029E070(0); func_8029E064(0); - miscflag_clear(3); - miscflag_clear(4); + miscFlag_clear(MISC_FLAG_3); + miscFlag_clear(MISC_FLAG_4); func_80293D74(); } baanim_setUpdateType(BAANIM_UPDATE_1_NORMAL); @@ -84,8 +84,8 @@ void bsant_idle_init(void){ baphysics_set_target_horizontal_velocity(0.0f); pitch_setAngVel(1000.0f, 12.0f); roll_setAngularVelocity(1000.0f, 12.0f); - miscflag_set(3); - miscflag_set(4); + miscFlag_set(MISC_FLAG_3); + miscFlag_set(MISC_FLAG_4); func_802900B4(); } @@ -266,7 +266,7 @@ void bsant_fall_update(void){ break; } if(player_isStable()){ - if(miscflag_isTrue(0x19)) + if(miscFlag_isTrue(MISC_FLAG_19)) sp2C = badrone_transform(); else sp2C = BS_35_ANT_IDLE; diff --git a/src/core2/bs/bBarge.c b/src/core2/bs/bBarge.c index 12a62de5..d459aea6 100644 --- a/src/core2/bs/bBarge.c +++ b/src/core2/bs/bBarge.c @@ -76,9 +76,9 @@ void bsbarge_init(void){ func_8029E070(1); D_8037D2A6 = 0; D_8037D2A5 = 0; - miscflag_clear(0xA); - miscflag_clear(0xB); - miscflag_clear(0xC); + miscFlag_clear(MISC_FLAG_A); + miscFlag_clear(MISC_FLAG_B); + miscFlag_clear(MISC_FLAG_C); func_8029E3C0(2, 0.01f); } @@ -90,7 +90,7 @@ void bsbarge_update(void){ sp24 = 0; plyrMvmnt = baanim_getAnimCtrlPtr(); if(button_released(BUTTON_B)) - miscflag_set(0xA); + miscFlag_set(MISC_FLAG_A); switch(D_8037D2A5){ case 0: if(animctrl_isAt(plyrMvmnt, 0.1392f)) @@ -99,8 +99,8 @@ void bsbarge_update(void){ if(!animctrl_isStopped(plyrMvmnt)) break; - if(miscflag_isFalse(0xA)){ - miscflag_set(0xC); + if(miscFlag_isFalse(MISC_FLAG_A)){ + miscFlag_set(MISC_FLAG_C); D_8037D2A0 = 850.0f; }else{ D_8037D2A0 = 500.0f; @@ -110,13 +110,13 @@ void bsbarge_update(void){ break; case 1: func_8029E1A8(1); - if(miscflag_isFalse(0xB) && func_8029E2E0(1, 0.1f)){ - if(miscflag_isTrue(0xC)){ + if(miscFlag_isFalse(MISC_FLAG_B) && func_8029E2E0(1, 0.1f)){ + if(miscFlag_isTrue(MISC_FLAG_C)){ func_8030E560(SFX_4_KAZOOIE_RUUUUUH, 30000); }else{ func_8030E560(SFX_43_KAZOOIE_RUH, 30000); } - miscflag_set(0xB); + miscFlag_set(MISC_FLAG_B); } if(!func_8029E384(1)) break; @@ -142,7 +142,7 @@ void bsbarge_update(void){ break; case 3: func_8029E1A8(0); - if(miscflag_isFalse(0xC) || func_8029E384(0)){ + if(miscFlag_isFalse(MISC_FLAG_C) || func_8029E384(0)){ D_8037D2A0 -= 80.0f; } baphysics_set_target_horizontal_velocity(D_8037D2A0); diff --git a/src/core2/bs/bFlap.c b/src/core2/bs/bFlap.c index a05f2229..73fb9c68 100644 --- a/src/core2/bs/bFlap.c +++ b/src/core2/bs/bFlap.c @@ -30,7 +30,7 @@ void bsbflap_init(void) { baphysics_set_vertical_velocity(0.0f); baphysics_set_gravity(D_80364A14); func_8029E070(1); - miscflag_set(MISC_FLAG_12_HAS_FLAPPED); + miscFlag_set(MISC_FLAG_12_HAS_FLAPPED); func_8029E3C0(0, 2.5f); D_8037D30C = func_8030D90C(); func_80299BD4(); diff --git a/src/core2/bs/bFly.c b/src/core2/bs/bFly.c index bcc1d876..675ed2fc 100644 --- a/src/core2/bs/bFly.c +++ b/src/core2/bs/bFly.c @@ -180,7 +180,7 @@ void bsbfly_enter_end(void){ void bsbfly_init(void){ baanim_playForDuration_loopSmooth(ASSET_38_ANIM_BSBFLY, 0.62f); func_8029C7F4(1,1,3, BA_PHYSICS_LOCKED_ROTATION); - if(miscflag_isTrue(9)){ + if(miscFlag_isTrue(MISC_FLAG_9)){ baphysics_set_target_horizontal_velocity(0.0f); }else{ baphysics_set_target_horizontal_velocity(600.0f); @@ -261,7 +261,7 @@ void bsbfly_update(void){ func_8030EBC8(SFX_2_CLAW_SWIPE, 0.6f, 0.7f, 0x2710, 0x2ee0); } baphysics_set_gravity(-300.0f); - if(miscflag_isTrue(9)){ + if(miscFlag_isTrue(MISC_FLAG_9)){ baphysics_set_terminal_velocity(0.0f); baphysics_set_velocity(0); sp38 = 0.0f; @@ -409,7 +409,7 @@ void func_802A411C(void) { ml_vec3f_copy(sp28, D_8037D338); ml_vec3f_normalize(sp28); sp24 = mlAbsF(sp34[0] * sp28[0] + sp34[1] * sp28[1] + sp34[2] * sp28[2]); - if (miscflag_isTrue(8) || ((sp44 & 0x80) != 0)) { + if (miscFlag_isTrue(MISC_FLAG_8) || ((sp44 & 0x80) != 0)) { func_802A4078(); next_state = BS_18_FLY_KNOCKBACK; } else if (0.4 < sp24) { @@ -782,7 +782,7 @@ void func_802A503C(void){ void func_802A505C(void){ if(bs_getInterruptType() == BS_INTR_9){ func_8029A86C(2); - miscflag_set(7); + miscFlag_set(MISC_FLAG_7); func_8029CCC4(); }else{ func_80296608(); diff --git a/src/core2/bs/bLongLeg.c b/src/core2/bs/bLongLeg.c index 3aba219e..1cabdd46 100644 --- a/src/core2/bs/bLongLeg.c +++ b/src/core2/bs/bLongLeg.c @@ -70,7 +70,7 @@ void func_802A5374(void){ func_8029E0F4(1); pitch_setAngVel(1000.0f, 12.0f); roll_setAngularVelocity(1000.0f, 12.0f); - miscflag_set(3); + miscFlag_set(MISC_FLAG_3); } void func_802A5404(void){ @@ -87,7 +87,7 @@ void func_802A5404(void){ roll_setIdeal(0.0f); stateTimer_clear(STATE_TIMER_2_LONGLEG); func_803219F4(1); - miscflag_clear(3); + miscFlag_clear(MISC_FLAG_3); func_8029E180(4, 0.5f); func_802A531C(); } @@ -121,7 +121,7 @@ void bsblongleg_enter_init(void){ D_8037D361 = func_8030D90C(); sfxsource_setSfxId(D_8037D361, SFX_2C_PULLING_NOISE); func_8030E04C(D_8037D361, 0.8f, 1.9f, 1.2f); - miscflag_clear(MISC_FLAG_E_TOUCHING_WADING_BOOTS); + miscFlag_clear(MISC_FLAG_E_TOUCHING_WADING_BOOTS); if(bsbtrot_inSet(bs_getPrevState())) __bsblongleg_enterFromTrot(); else diff --git a/src/core2/bs/bPeck.c b/src/core2/bs/bPeck.c index 8301639e..36c517a9 100644 --- a/src/core2/bs/bPeck.c +++ b/src/core2/bs/bPeck.c @@ -66,7 +66,7 @@ void func_802A664C(void){ sp1C = 1.32f; break; } - miscflag_set(MISC_FLAG_5_HAS_PECKED); + miscFlag_set(MISC_FLAG_5_HAS_PECKED); func_8030E58C(SFX_42_KAZOOIE_RAH, sp1C); baphysics_set_vertical_velocity(D_80364A64); D_8037D375++; diff --git a/src/core2/bs/bTrot.c b/src/core2/bs/bTrot.c index 90045450..bd319340 100644 --- a/src/core2/bs/bTrot.c +++ b/src/core2/bs/bTrot.c @@ -106,15 +106,15 @@ void func_802A8A40(void){ func_8029E064(1); pitch_setAngVel(1000.0f, 12.0f); roll_setAngularVelocity(1000.0f, 12.0f); - miscflag_set(3); + miscFlag_set(MISC_FLAG_3); func_8029CF48(4,1,0.24f); baModel_setDirection(PLAYER_MODEL_DIR_KAZOOIE); } void func_802A8AD8(void){ func_80299650(stateTimer_getPrevious(STATE_TIMER_3_TURBO_TALON), stateTimer_get(STATE_TIMER_3_TURBO_TALON)); - if(miscflag_isTrue(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS) &&(bs_getState() != BS_17_BTROT_EXIT)){ - miscflag_clear(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS); + if(miscFlag_isTrue(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS) &&(bs_getState() != BS_17_BTROT_EXIT)){ + miscFlag_clear(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS); stateTimer_set(STATE_TIMER_3_TURBO_TALON, get_turbo_duration()); func_803219F4(4); } @@ -122,7 +122,7 @@ void func_802A8AD8(void){ if(stateTimer_isDone(STATE_TIMER_3_TURBO_TALON)){ if(func_8029DFE0()){ func_8029E0DC(0); - if(miscflag_isFalse(MISC_FLAG_14_LOSE_BOGGY_RACE)) + if(miscFlag_isFalse(MISC_FLAG_14_LOSE_BOGGY_RACE)) func_8030E484(0x3eb); func_803219F4(1); } @@ -143,7 +143,7 @@ void func_802A8BB0(void){ func_8029E064(0); pitch_setIdeal(0.0f); roll_setIdeal(0.0f); - miscflag_clear(3); + miscFlag_clear(MISC_FLAG_3); if(next_state != BS_5A_LOADZONE) stateTimer_set(STATE_TIMER_3_TURBO_TALON, 0.0f); func_802A8AD8(); @@ -177,10 +177,10 @@ enum asset_e func_802A8D00(enum asset_e arg0, enum asset_e arg1){ } enum bs_e func_802A8D34(enum bs_e arg0){ - if(miscflag_isTrue(0xf)) + if(miscFlag_isTrue(MISC_FLAG_F)) return arg0; - if(miscflag_isTrue(MISC_FLAG_1_ON_FLIGHT_PAD)) + if(miscFlag_isTrue(MISC_FLAG_1_ON_FLIGHT_PAD)) return BS_23_FLY_ENTER; return BS_8_BTROT_JUMP; @@ -377,7 +377,7 @@ void bsbtrot_jump_update(void){ if(stateTimer_isActive(STATE_TIMER_3_TURBO_TALON)) func_802A87C0(); - if(miscflag_isTrue(0xF)) + if(miscFlag_isTrue(MISC_FLAG_F)) baphysics_reset_horizontal_velocity(); else func_802A89D4(); @@ -588,7 +588,7 @@ void bsbtrot_fall_update(void){ if(stateTimer_isActive(STATE_TIMER_3_TURBO_TALON)) func_802A87C0(); - if(miscflag_isTrue(0xf)) + if(miscFlag_isTrue(MISC_FLAG_F)) baphysics_reset_horizontal_velocity(); else func_802A89D4(); diff --git a/src/core2/bs/bbuster.c b/src/core2/bs/bbuster.c index c67bf185..48d6f33b 100644 --- a/src/core2/bs/bbuster.c +++ b/src/core2/bs/bbuster.c @@ -124,7 +124,7 @@ void bsbbuster_update(void){ rumbleManager_80250D94(1.0f, 0.3f, 0.4f); D_8037D2B6++; } - D_8037D2B9 = miscflag_isTrue(8); + D_8037D2B9 = miscFlag_isTrue(MISC_FLAG_8); func_8029445C(sp30); //L8029FF78 if(((0.0f <= sp30[1])? sp30[1] : -sp30[1]) < 1.0){ diff --git a/src/core2/bs/bee.c b/src/core2/bs/bee.c index 690f4be4..52c2831a 100644 --- a/src/core2/bs/bee.c +++ b/src/core2/bs/bee.c @@ -19,8 +19,8 @@ void func_802A02C0(void){ func_8029B0C0(); func_8029E070(0); func_8029E064(0); - miscflag_clear(3); - miscflag_clear(4); + miscFlag_clear(MISC_FLAG_3); + miscFlag_clear(MISC_FLAG_4); func_80293D74(); } baanim_setUpdateType(BAANIM_UPDATE_1_NORMAL); @@ -31,8 +31,8 @@ void func_802A0340(void){ pitch_setAngVel(1000.0f, 12.0f); roll_setAngularVelocity(1000.0f, 12.0f); func_80293D48(50.0f, 25.0f); - miscflag_set(3); - miscflag_set(4); + miscFlag_set(MISC_FLAG_3); + miscFlag_set(MISC_FLAG_4); } } diff --git a/src/core2/bs/beeFly.c b/src/core2/bs/beeFly.c index 920c8d47..4a089c57 100644 --- a/src/core2/bs/beeFly.c +++ b/src/core2/bs/beeFly.c @@ -152,7 +152,7 @@ void bsbeefly_enter(void){ mvmnt = bs_getPrevState(); baanim_playForDuration_loopSmooth(ASSET_1DC_ANIM_BEE_FLY, 0.38); func_8029C7F4(1, 1, 3, BA_PHYSICS_LOCKED_ROTATION); - if(miscflag_isTrue(9)) + if(miscFlag_isTrue(MISC_FLAG_9)) baphysics_set_target_horizontal_velocity(0.0f); else baphysics_set_target_horizontal_velocity(600.0f); @@ -235,7 +235,7 @@ void bsbeefly_update(void){ } break; }//L802A0DF0 - if(miscflag_isTrue(9)){ + if(miscFlag_isTrue(MISC_FLAG_9)){ baphysics_set_terminal_velocity(0.0f); baphysics_set_velocity(0); sp38 = 0.0f; diff --git a/src/core2/bs/beeMain.c b/src/core2/bs/beeMain.c index f034d14a..8b7eddb9 100644 --- a/src/core2/bs/beeMain.c +++ b/src/core2/bs/beeMain.c @@ -275,7 +275,7 @@ void func_802A170C(void){ break; } if(player_isStable()){ - if(miscflag_isTrue(0x19)){ + if(miscFlag_isTrue(MISC_FLAG_19)){ sp2c = badrone_transform(); }else{ if(func_8029B300() > 0) @@ -286,7 +286,7 @@ void func_802A170C(void){ } } else{ - if(miscflag_isFalse(0xf) && button_pressed(BUTTON_A)) + if(miscFlag_isFalse(MISC_FLAG_F) && button_pressed(BUTTON_A)) sp2c = BS_BEE_FLY; }//L802A189C if(player_inWater()) @@ -514,7 +514,7 @@ void func_802A2054(void){ } void func_802A2098(void){ - miscflag_clear(0x1A); + miscFlag_clear(MISC_FLAG_1A); baanim_playForDuration_loopSmooth(ASSET_1DE_ANIM_BEE_IDLE, 3.0f); yaw_setIdeal(func_8029B41C()); func_8029C7F4(1,1,3, BA_PHYSICS_NORMAL); diff --git a/src/core2/bs/croc.c b/src/core2/bs/croc.c index 70a951b5..77227f16 100644 --- a/src/core2/bs/croc.c +++ b/src/core2/bs/croc.c @@ -49,8 +49,8 @@ void __bscroc_jumpSfx(void){ void func_802ABE70(void){ f32 sp1C = stateTimer_get(STATE_TIMER_3_TURBO_TALON); func_80299650(stateTimer_getPrevious(STATE_TIMER_3_TURBO_TALON), sp1C); - if(miscflag_isTrue(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS) && bs_getState() != BS_17_BTROT_EXIT){ - miscflag_clear(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS); + if(miscFlag_isTrue(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS) && bs_getState() != BS_17_BTROT_EXIT){ + miscFlag_clear(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS); stateTimer_set(STATE_TIMER_3_TURBO_TALON, get_turbo_duration()); func_8025A6EC(COMUSIC_8A_GETTING_TURBO_TRAINERS, -1); func_8029E0DC(1); @@ -81,8 +81,8 @@ void func_802ABFBC(void){ func_8029B0C0(); func_8029E070(0); func_8029E064(0); - miscflag_clear(3); - miscflag_clear(4); + miscFlag_clear(MISC_FLAG_3); + miscFlag_clear(MISC_FLAG_4); func_80293D74(); } baanim_setUpdateType(BAANIM_UPDATE_1_NORMAL); @@ -109,8 +109,8 @@ void bscroc_idle_init(void){ pitch_setAngVel(1000.0f, 12.0f); roll_setAngularVelocity(1000.0f, 12.0f); func_80293D48(50.0f, 25.0f); - miscflag_set(3); - miscflag_set(4); + miscFlag_set(MISC_FLAG_3); + miscFlag_set(MISC_FLAG_4); func_802900B4(); } @@ -312,7 +312,7 @@ void bscroc_fall_update(void){ if(player_isStable()){ if(func_8029B300() > 0 || (D_8037D3EC == 2 && animctrl_isStopped(aCtrl))){ - if(miscflag_isTrue(0x19)){ + if(miscFlag_isTrue(MISC_FLAG_19)){ next_state = badrone_transform(); }else{ next_state = BS_5E_CROC_IDLE; diff --git a/src/core2/bs/dronelook.c b/src/core2/bs/dronelook.c index 7bf26c5d..93eea8f9 100644 --- a/src/core2/bs/dronelook.c +++ b/src/core2/bs/dronelook.c @@ -30,7 +30,7 @@ void bsDroneLook_init(void) { eye_rotation[1] += 180.0f; eye_rotation[2] = 0.0f; ncFirstPersonCamera_setZoomedOutRotation(eye_rotation); - miscflag_set(MISC_FLAG_17_FPV); + miscFlag_set(MISC_FLAG_17_FIRST_PERSON_VIEW); } void bsDroneLook_update(void) { @@ -79,5 +79,5 @@ void bsDroneLook_end(void) { func_80299D2C(SFX_12E_CAMERA_ZOOM_MEDIUM, 1.2f, 12000); } ncDynamicCamera_exitFirstPerson(); - miscflag_clear(MISC_FLAG_17_FPV); + miscFlag_clear(MISC_FLAG_17_FIRST_PERSON_VIEW); } diff --git a/src/core2/bs/dronexform.c b/src/core2/bs/dronexform.c index 6718856e..c437a214 100644 --- a/src/core2/bs/dronexform.c +++ b/src/core2/bs/dronexform.c @@ -335,7 +335,7 @@ void bsdronexform_init(void){ func_802B016C(); D_8037D470.player_transformation = bsStoredState_getTransformation(); D_8037D470.room_transformation = func_80294A4C(); - miscflag_set(MISC_FLAG_1B_TRANSFORMING); + miscFlag_set(MISC_FLAG_1B_TRANSFORMING); D_8037D470.state = 0; __bsdronexform_setState(1); } @@ -444,7 +444,7 @@ void bsdronexform_end(void){ func_802AFADC(); func_802B014C(); func_80298A64(); - miscflag_clear(MISC_FLAG_1B_TRANSFORMING); + miscFlag_clear(MISC_FLAG_1B_TRANSFORMING); } void bsdronexform_interrupt(void){} diff --git a/src/core2/bs/jig.c b/src/core2/bs/jig.c index f412063a..21b0e5a8 100644 --- a/src/core2/bs/jig.c +++ b/src/core2/bs/jig.c @@ -42,8 +42,8 @@ void bsjig_jiggy_init(void){ func_8029151C(0xC); func_8029E070(1); func_8030E6D4(SFX_33_BANJO_AHOO); - miscflag_clear(7); - miscflag_clear(0xf); + miscFlag_clear(MISC_FLAG_7); + miscFlag_clear(MISC_FLAG_F); baMarker_collisionOff(); chJigsawDance_setState(marker_getActor(bsjig_gJiggyMarker), 1); D_8037D4B0 = 0; @@ -164,7 +164,7 @@ void bsjig_notedoor_end(void){ void bsjig_notedoor_init(void){ AnimCtrl *aCtrl = baanim_getAnimCtrlPtr(); D_8037D4B2 = (bs_getPrevState() == BS_44_JIG_JIGGY); - miscflag_clear(0x1A); + miscFlag_clear(MISC_FLAG_1A); animctrl_reset(aCtrl); animctrl_setIndex(aCtrl, ASSET_282_ANIM_BSJIG_NOTEDOOR); animctrl_setDuration(aCtrl, 3.6f); diff --git a/src/core2/bs/jump.c b/src/core2/bs/jump.c index b40919ea..3558c159 100644 --- a/src/core2/bs/jump.c +++ b/src/core2/bs/jump.c @@ -35,7 +35,7 @@ void bsjump_init(void){ AnimCtrl *aCtrl = baanim_getAnimCtrlPtr(); enum bs_e sp30; - D_8037D4C2 = miscflag_isTrue(2); + D_8037D4C2 = miscFlag_isTrue(MISC_FLAG_2_ON_SPRING_PAD); sp30 = bs_getPrevState(); if(bsclimb_inSet(sp30)){ climbRelease(); @@ -89,7 +89,7 @@ void bsjump_update(void){ if(D_8037D4C2) func_8029C348(); - if(miscflag_isTrue(0xf)){ + if(miscFlag_isTrue(MISC_FLAG_F)){ baphysics_reset_horizontal_velocity(); }else{ func_802B6FA8(); @@ -172,7 +172,7 @@ void bsjump_fall_init(void){ AnimCtrl *aCtrl = baanim_getAnimCtrlPtr(); int sp20; - if(miscflag_isTrue(7) && 700.0f < baphysics_get_vertical_velocity()) + if(miscFlag_isTrue(MISC_FLAG_7) && 700.0f < baphysics_get_vertical_velocity()) baphysics_set_vertical_velocity(700.0f); sp20 = (bs_getPrevState() == BS_12_BFLIP)? 0 : 1; @@ -191,7 +191,7 @@ void bsjump_fall_update(void){ AnimCtrl *aCtrl = baanim_getAnimCtrlPtr(); f32 player_velocity[3]; - if(miscflag_isTrue(0xf)) + if(miscFlag_isTrue(MISC_FLAG_F)) baphysics_reset_horizontal_velocity(); else func_802B6FA8(); @@ -213,11 +213,11 @@ void bsjump_fall_update(void){ case 1: break; }//L802B1824 - if(miscflag_isFalse(0xf)){ + if(miscFlag_isFalse(MISC_FLAG_F)){ if(player_isFallTumbling()) sp2C = BS_3D_FALL_TUMBLING; - if(should_feathery_flap() && miscflag_isFalse(MISC_FLAG_5_HAS_PECKED)) + if(should_feathery_flap() && miscFlag_isFalse(MISC_FLAG_5_HAS_PECKED)) sp2C = BS_BFLAP; if(should_peck()) @@ -231,7 +231,7 @@ void bsjump_fall_update(void){ } else if(player_inWater()){ func_8029CCC4(); - if(miscflag_isTrue(6) || miscflag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE)){ + if(miscFlag_isTrue(MISC_FLAG_6) || miscFlag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE)){ sp2C = BS_D_TIMEOUT; } diff --git a/src/core2/bs/pumpkin.c b/src/core2/bs/pumpkin.c index 401da3af..f4a8dd22 100644 --- a/src/core2/bs/pumpkin.c +++ b/src/core2/bs/pumpkin.c @@ -55,8 +55,8 @@ void func_802B229C(void) { func_8029B0C0(); func_8029E070(0); func_8029E064(0); - miscflag_clear(3); - miscflag_clear(4); + miscFlag_clear(MISC_FLAG_3); + miscFlag_clear(MISC_FLAG_4); func_80293D74(); } baanim_setUpdateType(BAANIM_UPDATE_1_NORMAL); @@ -80,8 +80,8 @@ void bspumpkin_idle_init(void) { pitch_setAngVel(1000.0f, 12.0f); roll_setAngularVelocity(1000.0f, 12.0f); func_80293D48(50.0f, 25.0f); - miscflag_set(3); - miscflag_set(4); + miscFlag_set(MISC_FLAG_3); + miscFlag_set(MISC_FLAG_4); func_802900B4(); } @@ -290,7 +290,7 @@ void bspumpkin_fall_update(void) { break; } if (player_isStable() && ((func_8029B300() > 0) || (D_8037D4E0 == 2 && animctrl_isStopped(anim_ctrl)))) { - if (miscflag_isTrue(0x19)) { + if (miscFlag_isTrue(MISC_FLAG_19)) { next_state = badrone_transform(); } else { next_state = BS_48_PUMPKIN_IDLE; diff --git a/src/core2/bs/rest.c b/src/core2/bs/rest.c index 328c7e10..a8a1e046 100644 --- a/src/core2/bs/rest.c +++ b/src/core2/bs/rest.c @@ -160,7 +160,7 @@ void func_802B3E64(void) { if (func_802B3BB0()) { next_state = bs_getIdleState(); } - if (map_get() == MAP_27_FP_FREEZEEZY_PEAK && miscflag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE)) { + if (map_get() == MAP_27_FP_FREEZEEZY_PEAK && miscFlag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE)) { next_state = func_8029CA94(next_state); } bs_setState(next_state); diff --git a/src/core2/bs/stand.c b/src/core2/bs/stand.c index 6864a177..ee60057a 100644 --- a/src/core2/bs/stand.c +++ b/src/core2/bs/stand.c @@ -323,7 +323,7 @@ void func_802B5350(void){ } else if(sp1C == 0x12){//L802B53D0 func_8029A86C(1); - if( bsStoredState_getTransformation() == TRANSFORM_1_BANJO && !miscflag_isTrue(0xF) && stateTimer_isDone(STATE_TIMER_0_UNKNOWN)){ + if( bsStoredState_getTransformation() == TRANSFORM_1_BANJO && !miscFlag_isTrue(MISC_FLAG_F) && stateTimer_isDone(STATE_TIMER_0_UNKNOWN)){ func_8028DE6C(baMarker_getCarriedObjectActorId()); func_8029A86C(2); } diff --git a/src/core2/bs/surf.c b/src/core2/bs/surf.c index 89671a04..2ca46a61 100644 --- a/src/core2/bs/surf.c +++ b/src/core2/bs/surf.c @@ -33,7 +33,7 @@ void func_802B6064(void) { next_state = BS_1_IDLE; } D_8037D560 = 0; - if (miscflag_isTrue(6)) { + if (miscFlag_isTrue(MISC_FLAG_6)) { next_state = BS_53_TIMEOUT; } bs_setState(next_state); diff --git a/src/core2/bs/swim.c b/src/core2/bs/swim.c index 8c3ab647..d6637d5a 100644 --- a/src/core2/bs/swim.c +++ b/src/core2/bs/swim.c @@ -179,7 +179,7 @@ void func_802B5950(void) { if (func_80294524() && button_pressed(BUTTON_A)) { next_state = BS_5_JUMP; } - if (miscflag_isTrue(6) || miscflag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE)) { + if (miscFlag_isTrue(MISC_FLAG_6) || miscFlag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE)) { next_state = BS_D_TIMEOUT; } bs_setState(next_state); @@ -256,7 +256,7 @@ void func_802B5C40(void) { if (func_80294524() && button_pressed(BUTTON_A)) { next_state = BS_5_JUMP; } - if (miscflag_isTrue(6) || miscflag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE)) { + if (miscFlag_isTrue(MISC_FLAG_6) || miscFlag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE)) { next_state = BS_D_TIMEOUT; } bs_setState(next_state); diff --git a/src/core2/bs/walrus.c b/src/core2/bs/walrus.c index 103b22c1..4f58388b 100644 --- a/src/core2/bs/walrus.c +++ b/src/core2/bs/walrus.c @@ -95,8 +95,8 @@ void func_802B8048(void){ func_8029B0C0(); func_8029E070(0); func_8029E064(0); - miscflag_clear(3); - miscflag_clear(4); + miscFlag_clear(MISC_FLAG_3); + miscFlag_clear(MISC_FLAG_4); func_80293D74(); func_8029CF48(4, 0, 0.0f); } @@ -148,8 +148,8 @@ void bswalrus_idle_init(void){ pitch_setAngVel(1000.0f, 12.0f); roll_setAngularVelocity(1000.0f, 12.0f); func_80293D48(50.0f, 25.0f); - miscflag_set(3); - miscflag_set(4); + miscFlag_set(MISC_FLAG_3); + miscFlag_set(MISC_FLAG_4); func_802900B4(); func_802B8110(); } @@ -352,7 +352,7 @@ void bswalrus_fall_update(void){ if( func_8029B300() > 0 || (D_8037D5C8 == 2 && animctrl_isStopped(aCtrl)) ){ - if(miscflag_isTrue(0x19)) + if(miscFlag_isTrue(MISC_FLAG_19)) next_state = badrone_transform(); else next_state = BS_67_WALRUS_IDLE; diff --git a/src/core2/code_14420.c b/src/core2/code_14420.c index 2853e03f..b2f09bdf 100644 --- a/src/core2/code_14420.c +++ b/src/core2/code_14420.c @@ -240,10 +240,10 @@ enum bs_e func_8029B458(void){ enum bs_e func_8029B504(void){ enum bs_e sp1C; - if(miscflag_isTrue(0xF)) + if(miscFlag_isTrue(MISC_FLAG_F)) return 0; - miscflag_set(0xF); + miscFlag_set(MISC_FLAG_F); sp1C = func_8029B458(); if(bs_getState() != sp1C) return sp1C; @@ -448,7 +448,7 @@ enum bs_14420_e func_8029BAF0(void){ if (stateTimer_get(STATE_TIMER_2_LONGLEG) != 0.0f) { return BS14420_9_LONGLEG; } - if (miscflag_isTrue(0x18)) { + if (miscFlag_isTrue(MISC_FLAG_18)) { return BS14420_5_UNDERWATER; } if (func_8028ECAC() == BSGROUP_3_WONDERWING) { @@ -569,10 +569,10 @@ enum bs_e bs_getIdleState(void){ case TRANSFORM_1_BANJO: default: - if (miscflag_isTrue(0x16)) { + if (miscFlag_isTrue(MISC_FLAG_16)) { return BS_24_FLY; } - if (miscflag_isTrue(0x18)) { + if (miscFlag_isTrue(MISC_FLAG_18)) { return BS_2B_DIVE_IDLE; } if (stateTimer_get(STATE_TIMER_3_TURBO_TALON) != 0.0f) { @@ -723,7 +723,7 @@ void func_8029C674(void) { D_8037D1E8 = FALSE; if (func_80298850() == BSGROUP_4_LOOK) { D_8037D1E8 = TRUE; - miscflag_set(MISC_FLAG_17_FPV); + miscFlag_set(MISC_FLAG_17_FIRST_PERSON_VIEW); ncDynamicCamera_enterFirstPerson(); func_8028E9C4(5, sp1C); ncFirstPersonCamera_setZoomedOutPosition(sp1C); @@ -748,7 +748,7 @@ void func_8029C6D0(void) { void func_8029C748(void) { if (D_8037D1E8) { - miscflag_clear(MISC_FLAG_17_FPV); + miscFlag_clear(MISC_FLAG_17_FIRST_PERSON_VIEW); ncDynamicCamera_exitFirstPerson(); } } @@ -757,10 +757,10 @@ enum bs_e bs_getTypeOfJump(void){ if(button_held(BUTTON_Z) && can_flap_flip()) return BS_12_BFLIP; - if(miscflag_isTrue(MISC_FLAG_2_ON_SPRING_PAD)) + if(miscFlag_isTrue(MISC_FLAG_2_ON_SPRING_PAD)) return BS_5_JUMP; - if(miscflag_isTrue(MISC_FLAG_1_ON_FLIGHT_PAD)) + if(miscFlag_isTrue(MISC_FLAG_1_ON_FLIGHT_PAD)) return BS_23_FLY_ENTER; return BS_5_JUMP; @@ -827,7 +827,7 @@ void func_8029C984(void){ } s32 func_8029C9C0(s32 arg0){ - if(miscflag_isTrue(0xF)) + if(miscFlag_isTrue(MISC_FLAG_F)) return arg0; if(button_pressed(BUTTON_A)) @@ -849,28 +849,28 @@ s32 func_8029C9C0(s32 arg0){ } s32 func_8029CA94(s32 arg0){ - if(miscflag_isTrue(0x19)) + if(miscFlag_isTrue(MISC_FLAG_19)) arg0 = badrone_transform(); - if(miscflag_isTrue(0x1A)) + if(miscFlag_isTrue(MISC_FLAG_1A)) arg0 = (player_getTransformation() == TRANSFORM_6_BEE) ? 0x46 : BS_34_JIG_NOTEDOOR; - if(miscflag_isTrue(MISC_FLAG_E_TOUCHING_WADING_BOOTS)) + if(miscFlag_isTrue(MISC_FLAG_E_TOUCHING_WADING_BOOTS)) arg0 = BS_25_LONGLEG_ENTER; - if(miscflag_isTrue(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS)) + if(miscFlag_isTrue(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS)) arg0 = BS_14_BTROT_ENTER; - if(miscflag_isTrue(0x6)) + if(miscFlag_isTrue(MISC_FLAG_6)) arg0 = BS_53_TIMEOUT; - if(miscflag_isTrue(0x7)) + if(miscFlag_isTrue(MISC_FLAG_7)) arg0 = BS_44_JIG_JIGGY; - if(miscflag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE)) + if(miscFlag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE)) arg0 = (player_getTransformation() == TRANSFORM_4_WALRUS) ? BS_80_WALRUS_SLED_LOSE : BS_53_TIMEOUT; - miscflag_clear(0xF); + miscFlag_clear(MISC_FLAG_F); return arg0; } @@ -907,14 +907,14 @@ void func_8029CBF4(void){ } void func_8029CCC4(void){ - if(miscflag_isFalse(7)) return; - if( miscflag_isTrue(0xF) - && miscflag_isFalse(6) - && miscflag_isFalse(MISC_FLAG_14_LOSE_BOGGY_RACE) + if(miscFlag_isFalse(MISC_FLAG_7)) return; + if( miscFlag_isTrue(MISC_FLAG_F) + && miscFlag_isFalse(MISC_FLAG_6) + && miscFlag_isFalse(MISC_FLAG_14_LOSE_BOGGY_RACE) ){ - miscflag_clear(0xF); + miscFlag_clear(MISC_FLAG_F); } - miscflag_clear(7); + miscFlag_clear(MISC_FLAG_7); func_802B0CD8(); item_inc(ITEM_E_JIGGY); if(jiggyscore_total() == 100 && fileProgressFlag_get(FILEPROG_FC_DEFEAT_GRUNTY)){ diff --git a/src/core2/code_16010.c b/src/core2/code_16010.c index b3efcfe1..8c273be4 100644 --- a/src/core2/code_16010.c +++ b/src/core2/code_16010.c @@ -23,7 +23,7 @@ void func_8029CFF8(void){ } void func_8029D01C(void){ - miscflag_clear(0x13); + miscFlag_clear(MISC_FLAG_13); D_8037D210 = func_8030D90C(); D_8037D212 = 0; } @@ -226,7 +226,7 @@ bool func_8029D7B4(void){ && stateTimer_isDone(STATE_TIMER_2_LONGLEG) && func_8028ECAC() != BSGROUP_3_WONDERWING && func_8028ECAC() != BSGROUP_9_LONG_LEG - && miscflag_isFalse(MISC_FLAG_E_TOUCHING_WADING_BOOTS) + && miscFlag_isFalse(MISC_FLAG_E_TOUCHING_WADING_BOOTS) && sp1C != BS_25_LONGLEG_ENTER && player_getWaterState() != BSWATERGROUP_2_UNDERWATER && func_8028EC04() < 1U @@ -317,9 +317,9 @@ void func_8029D968(void){ break; } } - miscflag_set(0x13); + miscFlag_set(MISC_FLAG_13); } else{ - miscflag_clear(0x13); + miscFlag_clear(MISC_FLAG_13); } } diff --git a/src/core2/code_39D0.c b/src/core2/code_39D0.c index 0140acf8..2c3ca98b 100644 --- a/src/core2/code_39D0.c +++ b/src/core2/code_39D0.c @@ -52,8 +52,8 @@ s32 can_egg(void){ } int can_feathery_flap(void){ - return miscflag_isFalse(MISC_FLAG_12_HAS_FLAPPED) - && miscflag_isFalse(MISC_FLAG_5_HAS_PECKED) + return miscFlag_isFalse(MISC_FLAG_12_HAS_FLAPPED) + && miscFlag_isFalse(MISC_FLAG_5_HAS_PECKED) && ability_hasLearned(ABILITY_7_FEATHERY_FLAP); } @@ -70,13 +70,13 @@ s32 can_control_jump_height(void){ } int can_peck(void){ - return miscflag_isFalse(MISC_FLAG_5_HAS_PECKED) - && miscflag_isFalse(MISC_FLAG_12_HAS_FLAPPED) + return miscFlag_isFalse(MISC_FLAG_5_HAS_PECKED) + && miscFlag_isFalse(MISC_FLAG_12_HAS_FLAPPED) && ability_hasLearned(ABILITY_B_RATATAT_RAP); } int func_8028ABB8(void){ - if(miscflag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE) || miscflag_isTrue(0x19)) + if(miscFlag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE) || miscFlag_isTrue(MISC_FLAG_19)) return 0; if(bs_getState() == BS_56_RECOIL) return 0; @@ -185,7 +185,7 @@ int player_isInHorizontalRadius(f32 arg0[3], f32 arg1){ s32 func_8028B120(void){return 0;} int func_8028B128(void){ - return miscflag_isTrue(0x13); + return miscFlag_isTrue(MISC_FLAG_13); } bool player_isInRBB(void){ @@ -225,8 +225,8 @@ bool func_8028B3B4(void) { bool sp1C; bool sp18; - sp1C = func_80294610(0x10) && miscflag_isFalse(3); - sp18 = func_80294610(0x40) && miscflag_isFalse(4); + sp1C = func_80294610(0x10) && miscFlag_isFalse(MISC_FLAG_3); + sp18 = func_80294610(0x40) && miscFlag_isFalse(MISC_FLAG_4); if(sp1C || sp18) return TRUE; return FALSE; diff --git a/src/core2/code_7060.c b/src/core2/code_7060.c index 07319cdb..c7dbdd4c 100644 --- a/src/core2/code_7060.c +++ b/src/core2/code_7060.c @@ -13,7 +13,6 @@ extern bool player_isInHorizontalRadius(f32[3], f32); extern bool player_isInVerticalRange(f32[3], f32); -extern void miscflag_clear(s32); extern void func_80295A8C(void); extern void climbSet(f32[3], f32[3], f32, u32); extern void func_80296C90(f32); @@ -72,8 +71,8 @@ bool func_8028E060(s32 arg0, s32 *arg1){ void func_8028E0B0(ActorMarker *arg0){ bs_setState(bs_getIdleState()); bsStoredState_setTrot(FALSE); - miscflag_clear(0x16); - miscflag_clear(0x18); + miscFlag_clear(MISC_FLAG_16); + miscFlag_clear(MISC_FLAG_18); } void func_8028E0F0(s32 arg0, s32 arg1[3]) { @@ -119,17 +118,17 @@ void func_8028E0F0(s32 arg0, s32 arg1[3]) { switch (map_get()) { case MAP_27_FP_FREEZEEZY_PEAK: if (arg0 == 0xD) { - miscflag_set(0x16); + miscFlag_set(MISC_FLAG_16); } break; case MAP_77_GL_RBB_LOBBY: if ((arg0 == 2) && func_802D6088()) { - miscflag_set(0x18); + miscFlag_set(MISC_FLAG_18); } break; case MAP_76_GL_640_NOTE_DOOR: if ((arg0 == 1) && func_802D60C4()) { - miscflag_set(0x18); + miscFlag_set(MISC_FLAG_18); } break; } @@ -155,8 +154,8 @@ void func_8028E0F0(s32 arg0, s32 arg1[3]) { func_8028F85C(&sp7C); func_80295A8C(); bsStoredState_setTrot(FALSE); - miscflag_clear(0x16); - miscflag_clear(0x18); + miscFlag_clear(MISC_FLAG_16); + miscFlag_clear(MISC_FLAG_18); func_8028E060(arg0, &sp6C); yaw_setIdeal((f32) sp6C); yaw_applyIdeal(); @@ -199,7 +198,7 @@ void func_8028E4B0(void) { D_8037BFB8 = 1; func_80295A8C(); bsStoredState_setTrot(FALSE); - miscflag_clear(0x16); + miscFlag_clear(MISC_FLAG_16); yaw_setIdeal(D_8037BFCC); yaw_applyIdeal(); } else if (func_8028DFF0(sp20, sp24)) { @@ -441,10 +440,10 @@ enum bsgroup_e func_8028ECAC(void) { s32 temp_a1; state_id = bs_getState(); - if (miscflag_isTrue(MISC_FLAG_1B_TRANSFORMING)) { + if (miscFlag_isTrue(MISC_FLAG_1B_TRANSFORMING)) { return BSGROUP_D_TRANSFORMING; } - if (miscflag_isTrue(MISC_FLAG_17_FPV)) { + if (miscFlag_isTrue(MISC_FLAG_17_FIRST_PERSON_VIEW)) { return BSGROUP_4_LOOK; } if (bsbfly_inSet(state_id)) { @@ -459,7 +458,7 @@ enum bsgroup_e func_8028ECAC(void) { if (bswalrus_inSledSet(state_id)) { return BSGROUP_C_WALRUS_SLED; } - if (miscflag_isTrue(9) != 0) { + if (miscFlag_isTrue(MISC_FLAG_9) != 0) { return 1; } switch(state_id){ @@ -609,7 +608,7 @@ bool func_8028F150(void){ } bool func_8028F170(void){ - return miscflag_isTrue(MISC_FLAG_17_FPV); + return miscFlag_isTrue(MISC_FLAG_17_FIRST_PERSON_VIEW); } int ability_isUnlocked(enum ability_e uid){ diff --git a/src/core2/code_A960.c b/src/core2/code_A960.c index 9fcc29eb..d01147b5 100644 --- a/src/core2/code_A960.c +++ b/src/core2/code_A960.c @@ -6,7 +6,7 @@ void func_80291930(s32); int func_802918F0(void){ - return miscflag_isTrue(0x15); + return miscFlag_isTrue(MISC_FLAG_15); } void func_80291910(void){ @@ -15,7 +15,7 @@ void func_80291910(void){ void func_80291930(s32 arg0){ if(!func_802918F0()){ - miscflag_set(0x15); + miscFlag_set(MISC_FLAG_15); if(arg0){ func_8029E3C0(5, 2.0f); func_8029C984(); diff --git a/src/core2/code_C3F0.c b/src/core2/code_C3F0.c index 55172bcd..edcfd7e8 100644 --- a/src/core2/code_C3F0.c +++ b/src/core2/code_C3F0.c @@ -1,41 +1,40 @@ #include #include "functions.h" #include "variables.h" - -void miscflag_clear(enum misc_flag_e arg0); +#include "enums.h" /*.bss */ -u8 D_8037C1D0[0x1C]; +u8 gMiscFlags[0x1C]; /* code */ -void miscflag_clearAll(void){ +void miscFlag_clearAll(void){ int i; for(i = 1; i < 0x1C; i++){ - miscflag_clear(i); + miscFlag_clear(i); } } -bool miscflag_isTrue(enum misc_flag_e arg0){ - return D_8037C1D0[arg0]; +bool miscFlag_isTrue(enum misc_flag_e arg0){ + return gMiscFlags[arg0]; } -bool miscflag_isFalse(enum misc_flag_e arg0){ - return !D_8037C1D0[arg0]; +bool miscFlag_isFalse(enum misc_flag_e arg0){ + return !gMiscFlags[arg0]; } -void miscflag_set(enum misc_flag_e arg0){ - D_8037C1D0[arg0] = TRUE; +void miscFlag_set(enum misc_flag_e arg0){ + gMiscFlags[arg0] = TRUE; } -void miscflag_clear(enum misc_flag_e arg0){ - D_8037C1D0[arg0] = FALSE; +void miscFlag_clear(enum misc_flag_e arg0){ + gMiscFlags[arg0] = FALSE; } -void miscflag_toggle(enum misc_flag_e arg0){ - if(D_8037C1D0[arg0]){ - D_8037C1D0[arg0] = FALSE; +void miscFlag_toggle(enum misc_flag_e arg0){ + if(gMiscFlags[arg0]){ + gMiscFlags[arg0] = FALSE; } else { - D_8037C1D0[arg0] = TRUE; + gMiscFlags[arg0] = TRUE; } } diff --git a/src/core2/code_D9B0.c b/src/core2/code_D9B0.c index 903d40f2..fce7a7f6 100644 --- a/src/core2/code_D9B0.c +++ b/src/core2/code_D9B0.c @@ -185,13 +185,13 @@ void func_80294E60(void){ } if(player_isStable() || bsclimb_inSet(bs_getState())){ - miscflag_clear(MISC_FLAG_5_HAS_PECKED); - miscflag_clear(MISC_FLAG_12_HAS_FLAPPED); + miscFlag_clear(MISC_FLAG_5_HAS_PECKED); + miscFlag_clear(MISC_FLAG_12_HAS_FLAPPED); } if(player_inWater()){ - miscflag_clear(MISC_FLAG_5_HAS_PECKED); - miscflag_clear(MISC_FLAG_12_HAS_FLAPPED); + miscFlag_clear(MISC_FLAG_5_HAS_PECKED); + miscFlag_clear(MISC_FLAG_12_HAS_FLAPPED); } func_80294BDC(); diff --git a/src/core2/code_E910.c b/src/core2/code_E910.c index 80db2d2c..45a58186 100644 --- a/src/core2/code_E910.c +++ b/src/core2/code_E910.c @@ -191,7 +191,7 @@ void func_80295914(void){ func_80291910(); badrone_init(); bafalldamage_init(); - miscflag_clearAll(); + miscFlag_clearAll(); func_8028B6FC(); func_80291590(); func_802953A0(); diff --git a/src/core2/code_EF50.c b/src/core2/code_EF50.c index e5280ebf..9d8f515c 100644 --- a/src/core2/code_EF50.c +++ b/src/core2/code_EF50.c @@ -61,7 +61,7 @@ enum bs_e func_80295EE0(enum bs_e arg0){ func_8029CDA0(); } else{ - miscflag_set(7); + miscFlag_set(MISC_FLAG_7); if(sp2C){ func_8029CCC4(); } @@ -304,7 +304,7 @@ void func_80296608(void){ next_state = badrone_transform(); } else{ - miscflag_set(0x19); + miscFlag_set(MISC_FLAG_19); next_state = func_8029B504(); } break; @@ -424,7 +424,7 @@ void func_80296608(void){ sp2C = 2; break; case BS_INTR_35: //L80296984 - miscflag_set(0x1a); + miscFlag_set(MISC_FLAG_1A); next_state = func_8029B504(); sp2C = 2; break; @@ -442,7 +442,7 @@ void func_80296608(void){ if( !func_80298850() && !sp1C - && !miscflag_isTrue(0xf) + && !miscFlag_isTrue(MISC_FLAG_F) && !player_isStable() ){ next_state = BS_4F_CLIMB_IDLE; @@ -498,13 +498,13 @@ void func_80296608(void){ next_state = func_8029BED4(); break; case BS_INTR_F: //L80296B68 - miscflag_set(6); + miscFlag_set(MISC_FLAG_6); next_state = func_8029B504(); sp2C = 2; break; case BS_INTR_30: //L80296B88 item_set(ITEM_14_HEALTH, 0); - miscflag_set(6); + miscFlag_set(MISC_FLAG_6); next_state = func_8029B504(); sp2C = 2; break; @@ -515,7 +515,7 @@ void func_80296608(void){ case BS_INTR_2A: //L80296BCC sp2C = 2; next_state = func_8029B504(); - miscflag_set(MISC_FLAG_14_LOSE_BOGGY_RACE); + miscFlag_set(MISC_FLAG_14_LOSE_BOGGY_RACE); break; case BS_INTR_27_WALRUS_SLED: //L80296BEC if(player_getTransformation() == TRANSFORM_4_WALRUS){ diff --git a/src/core2/snackerctl.c b/src/core2/snackerctl.c index 42cb76d9..5ebb04ab 100644 --- a/src/core2/snackerctl.c +++ b/src/core2/snackerctl.c @@ -83,7 +83,7 @@ static SnackerCtlState _snackerctl_update_bottles_bonus(void){ if(!func_8028F25C() && func_80321960() == 3) func_803219F4(1); - if(miscflag_isTrue(MISC_FLAG_17_FPV) && !func_8028F25C()){ + if(miscFlag_isTrue(MISC_FLAG_17_FIRST_PERSON_VIEW) && !func_8028F25C()){ if(__snackerctl_player_within_distance(183.0f, -100.0f, 75.0f)){ if(chBottlesBonus_getPuzzleIndex() == 6){ if(!D_8037DCCC){