From c07c907d97bc02bc865403a6b6bd4bc54f6afba9 Mon Sep 17 00:00:00 2001 From: Bl00D4NGEL Date: Sat, 5 Oct 2024 02:58:17 +0200 Subject: [PATCH 01/15] document: sandcastle (code_3E30) related code --- include/enums.h | 8 +- level_symbols.us.v10.txt | 2 +- src/TTC/code_3E30.c | 1224 ++++++++++++++++++++++--------------- src/core2/ch/crab.c | 4 +- src/core2/ch/gameSelect.c | 2 +- src/core2/code_73640.c | 2 +- src/core2/code_9B990.c | 6 +- src/core2/code_AD5B0.c | 2 +- src/core2/code_CF3E0.c | 4 +- src/core2/gc/dialog.c | 5 + 10 files changed, 767 insertions(+), 492 deletions(-) diff --git a/include/enums.h b/include/enums.h index da212652..6230eef9 100644 --- a/include/enums.h +++ b/include/enums.h @@ -290,7 +290,7 @@ 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_77, // unused + VOLATILE_FLAG_77_SANDCASTLE_SET_HEALTH_TO_MAX, // unused VOLATILE_FLAG_78_SANDCASTLE_NO_BONUS, VOLATILE_FLAG_79, // unused VOLATILE_FLAG_7A, // unused @@ -4265,7 +4265,7 @@ enum asset_e ASSET_E35_DIALOG_BOTTLES_BONUS_REMINDER = VER_SELECT(0xE35, 0xa77, 0, 0), ASSET_E37_TEXT_BOTTLES_STOP_WASTING_TIME_AFTER_FURNACE_FUN = 0xE37, // Talk to bottles after beating furnace fun - ASSET_E38_TEXT_UNKNOWN, + ASSET_E38_CHEATING_ERASE_SAVE_CONFIRMATION, ASSET_E57_DIALOG_FIRST_JIGGY = VER_SELECT(0xF57, 0xabd, 0, 0), @@ -4282,8 +4282,8 @@ enum asset_e ASSET_FAD_TEXT_UNKNOWN = 0xfad, - ASSET_FBE_TEXT_UNKNOWN = 0xfbe, - ASSET_FBF_TEXT_UNKNOWN, + ASSET_FBE_TEXT_CHEATING_ERASE_SAVE_WARNING = 0xfbe, + ASSET_FBF_TEXT_ERASED_SAVE, ASSET_10A1_DIALOG_BRENTILDA_MEET = 0x10A1, ASSET_10A2_TEXT_UNKNOWN, diff --git a/level_symbols.us.v10.txt b/level_symbols.us.v10.txt index aabae6b5..4d14705c 100644 --- a/level_symbols.us.v10.txt +++ b/level_symbols.us.v10.txt @@ -1,7 +1,7 @@ sm_func_80386810 = 0x80386810; mm_func_803888B0 = 0x803888B0; TTC_resetSpawnableActors = 0x80388AC0; -ttc_func_8038BF8C = 0x8038BF8C; +code_3E30_isSecretCheatCodeRelatedValueEqualToScrambledAddressValue = 0x8038BF8C; cc_func_803870E0 = 0x803870E0; cc_func_80387DA0 = 0x80387DA0; bgs_func_803885DC = 0x803885DC; diff --git a/src/TTC/code_3E30.c b/src/TTC/code_3E30.c index 6b679ffc..1414f29a 100644 --- a/src/TTC/code_3E30.c +++ b/src/TTC/code_3E30.c @@ -5,326 +5,434 @@ #include "SnS.h" /* extern */ -extern void func_802D6310(f32, enum map_e, s32, s32, enum file_progress_e); + +void func_802D6310(f32, enum map_e, s32, s32, enum file_progress_e); extern BKModel *mapModel_getModel(s32); extern u8 D_8037DCC0[7]; /* .h */ -void func_8038B5B4(void); -u32 func_8038B600(void); -typedef struct { +static void __code3E30_resetSecretCheatCodeProgress(void); +static u32 __code3E30_scrambleAddressForSecretCheatCode(); + +typedef struct +{ u8 *code; - u8 unk4; + u8 codeCharacterIdx; u8 id; - s16 unk6; -} struct_ttc_3E30_4_s; + s16 unk6; // unused +} SecretCheatCode; -typedef struct { - u8 *code; - s16 unk4; - s16 unk6; -} struct_ttc_3E30_3_s; +typedef struct +{ + u8 *code; // string of code where the hex value of floor_letters_e is converted into a char + s16 flagBitMask; + s16 codeCharacterIdx; +} CheatCode; -typedef struct { +typedef struct +{ s16 meshId; - u8 letter; - u8 unk3; - f32 unk4; -}LetterFloorTile; + u8 letter; // floor_letters_e + u8 state; // some sort of state, 1 - 5 + f32 time_delta_sum; +} LetterFloorTile; -typedef struct { +typedef struct +{ s16 minId; s16 maxId; -}IdRange; +} BannedCheatCodeRange; -s32 __sandcastleCodes_getNumberEntered(void); +static s32 __code3E30_getNumberOfBannedCheatCodesEntered(); /* .data */ -s32 D_8038C980 = 0; -LetterFloorTile letterFloorTilesTable[] ={ - {0x02, 0x70, 0, 0.0f}, - {0x04, 0x35, 0, 0.0f}, - {0x06, 0x6E, 0, 0.0f}, - {0x08, 0x62, 0, 0.0f}, - {0x0A, 0x61, 0, 0.0f}, - {0x0C, 0x6A, 0, 0.0f}, - {0x0E, 0x30, 0, 0.0f}, - {0x10, 0x31, 0, 0.0f}, - {0x12, 0x69, 0, 0.0f}, - {0x14, 0x39, 0, 0.0f}, - {0x16, 0x72, 0, 0.0f}, - {0x18, 0x6C, 0, 0.0f}, - {0x1A, 0x36, 0, 0.0f}, - {0x1C, 0x32, 0, 0.0f}, - {0x1E, 0x33, 0, 0.0f}, - {0x20, 0x67, 0, 0.0f}, - {0x22, 0x65, 0, 0.0f}, - {0x24, 0x34, 0, 0.0f}, - {0x26, 0x68, 0, 0.0f}, - {0x28, 0x64, 0, 0.0f}, - {0x2A, 0x63, 0, 0.0f}, - {0x2C, 0x36, 0, 0.0f}, - {0x2E, 0x6E, 0, 0.0f}, - {0x30, 0x37, 0, 0.0f}, - {0x32, 0x36, 0, 0.0f}, - {0x34, 0x6D, 0, 0.0f}, - {0x36, 0x6B, 0, 0.0f}, - {0x38, 0x38, 0, 0.0f}, - {0x00, 0x00, 0, 0.0f} +static s32 secretCheatCodeRelatedValue = NULL; + +enum floor_letters_e { + FLOOR_LETTER_J = 0x70, + FLOOR_LETTER_G = 0x35, + FLOOR_LETTER_A = 0x6E, + FLOOR_LETTER_L = 0x62, + FLOOR_LETTER_V = 0x61, + FLOOR_LETTER_E = 0x6A, + FLOOR_LETTER_C = 0x30, + FLOOR_LETTER_M = 0x31, + FLOOR_LETTER_N = 0x69, + FLOOR_LETTER_R = 0x39, + FLOOR_LETTER_P = 0x72, + FLOOR_LETTER_D = 0x6C, + FLOOR_LETTER_O = 0x36, + FLOOR_LETTER_S = 0x32, + FLOOR_LETTER_Z = 0x33, + FLOOR_LETTER_U = 0x67, + FLOOR_LETTER_Y = 0x65, + FLOOR_LETTER_I = 0x34, + FLOOR_LETTER_X = 0x68, + FLOOR_LETTER_T = 0x64, + FLOOR_LETTER_F = 0x63, + FLOOR_LETTER_W = 0x37, + FLOOR_LETTER_H = 0x6D, + FLOOR_LETTER_B = 0x6B, + FLOOR_LETTER_K = 0x38 }; - -struct_ttc_3E30_3_s codesTable[] = { - {"knip68n3664j", 0x0001, 0}, //BANJOKAZOOIE - {"kbgjj552", 0x0002, 0}, //BLUEEGGS - {"9jlcjndmj92", 0x0004, 0}, //REDFEATHERS - {"56blcjndmj92", 0x0008, 0}, //GOLDFEATHERS - {"k6ddbj2k6ig26ij", 0x0010, 0}, //BOTTLESBONUSONE - {"k6ddbj2k6ig2d76", 0x0020, 0}, //BOTTLESBONUSTWO - {"k6ddbj2k6ig2dm9jj", 0x0040, 0}, //BOTTLESBONUSTHREE - {"k6ddbj2k6ig2c6g9", 0x0080, 0}, //BOTTLESBONUSFOUR - {"k6ddbj2k6ig2c4aj", 0x0100, 0}, //BOTTLESBONUSFIVE - {"k45k6ddbj2k6ig2", 0x0200, 0}, //BIGBOTTLESBONUS - {"742me7n2meknip6", 0x0400, 0}, //WISHYWASHYBANJO - {"i6k6ig2", 0x0800, 0}, //NOBONUS - 0 +static LetterFloorTile sLetterFloorTiles[] = { + {0x02, FLOOR_LETTER_J, 0, 0.0f}, + {0x04, FLOOR_LETTER_G, 0, 0.0f}, + {0x06, FLOOR_LETTER_A, 0, 0.0f}, + {0x08, FLOOR_LETTER_L, 0, 0.0f}, + {0x0A, FLOOR_LETTER_V, 0, 0.0f}, + {0x0C, FLOOR_LETTER_E, 0, 0.0f}, + {0x0E, FLOOR_LETTER_C, 0, 0.0f}, + {0x10, FLOOR_LETTER_M, 0, 0.0f}, + {0x12, FLOOR_LETTER_N, 0, 0.0f}, + {0x14, FLOOR_LETTER_R, 0, 0.0f}, + {0x16, FLOOR_LETTER_P, 0, 0.0f}, + {0x18, FLOOR_LETTER_D, 0, 0.0f}, + {0x1A, FLOOR_LETTER_O, 0, 0.0f}, + {0x1C, FLOOR_LETTER_S, 0, 0.0f}, + {0x1E, FLOOR_LETTER_Z, 0, 0.0f}, + {0x20, FLOOR_LETTER_U, 0, 0.0f}, + {0x22, FLOOR_LETTER_Y, 0, 0.0f}, + {0x24, FLOOR_LETTER_I, 0, 0.0f}, + {0x26, FLOOR_LETTER_X, 0, 0.0f}, + {0x28, FLOOR_LETTER_T, 0, 0.0f}, + {0x2A, FLOOR_LETTER_F, 0, 0.0f}, + {0x2C, FLOOR_LETTER_O, 0, 0.0f}, + {0x2E, FLOOR_LETTER_A, 0, 0.0f}, + {0x30, FLOOR_LETTER_W, 0, 0.0f}, + {0x32, FLOOR_LETTER_O, 0, 0.0f}, + {0x34, FLOOR_LETTER_H, 0, 0.0f}, + {0x36, FLOOR_LETTER_B, 0, 0.0f}, + {0x38, FLOOR_LETTER_K, 0, 0.0f}, + {NULL, NULL, NULL, NULL} }; -struct{ +static CheatCode sCheatCodes[0xD] = { + {"knip68n3664j", 0x0001, 0}, // BANJOKAZOOIE + {"kbgjj552", 0x0002, 0}, // BLUEEGGS + {"9jlcjndmj92", 0x0004, 0}, // REDFEATHERS + {"56blcjndmj92", 0x0008, 0}, // GOLDFEATHERS + {"k6ddbj2k6ig26ij", 0x0010, 0}, // BOTTLESBONUSONE + {"k6ddbj2k6ig2d76", 0x0020, 0}, // BOTTLESBONUSTWO + {"k6ddbj2k6ig2dm9jj", 0x0040, 0}, // BOTTLESBONUSTHREE + {"k6ddbj2k6ig2c6g9", 0x0080, 0}, // BOTTLESBONUSFOUR + {"k6ddbj2k6ig2c4aj", 0x0100, 0}, // BOTTLESBONUSFIVE + {"k45k6ddbj2k6ig2", 0x0200, 0}, // BIGBOTTLESBONUS + {"742me7n2meknip6", 0x0400, 0}, // WISHYWASHYBANJO + {"i6k6ig2", 0x0800, 0}, // NOBONUS + NULL +}; + +struct +{ BKModel *model1; BKModel *model2; - u8 unk8; - u8 sfxsourceIdx; - u8 unkA; - u8 padB[1]; - f32 unkC; - u8 unk10; -} D_8038D720; - - + u8 banjoKazooieCodeEnteredState; // 0 = BK code not entered, 2 = BK code entered, 3 = jiggy collected + u8 doorOpeningSfxSourceIdx; + u8 dullCannonShotSfxSourceId; + u8 padB[1]; + f32 unkC; // time in map? + u8 timerState; // 0 = nothing, 1 = timer running, 2 = no timer required / time trial completed +} sMapState; /* .code */ -void func_8038A220( s32 arg0, BKVtxRef *vtx_ref, Vtx *vtx, s32 arg2){ +static void __code3E30_transformMeshCallbackOverlayUpdate(s32 arg0, BKVtxRef *vtx_ref, Vtx *vtx, s32 arg2) +{ vtx->v.ob[1] += 2; } -void func_8038A23C( s32 arg0, BKVtxRef *vtx_ref, Vtx *vtx, s32 arg2){ +static void __code3E30_transformMeshCallbackOverlayInit(s32 arg0, BKVtxRef *vtx_ref, Vtx *vtx, s32 arg2) +{ vtx->v.ob[1] += 0xf0; } -void func_8038A258(s32 arg0) { - if (arg0 == 1) { - 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); +static void __code3E30_setupCheatCodeTimer(s32 new_timer_state) +{ + if (new_timer_state == 1) + { // something in FF? + if (volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)) + { + // set timer to 50 seconds + item_set(ITEM_0_HOURGLASS_TIMER, 2999); + } + else + { + // set timer to 100 seconds + item_set(ITEM_0_HOURGLASS_TIMER, 5999); } item_set(ITEM_6_HOURGLASS, TRUE); } - if (D_8038D720.unk10 == 1) { + + if (sMapState.timerState == 1) + { item_set(ITEM_6_HOURGLASS, FALSE); } - D_8038D720.unk10 = arg0; + + sMapState.timerState = new_timer_state; } -LetterFloorTile *func_8038A2DC(s32 mesh_id) { +static LetterFloorTile* __code_3E30_getFloorTileForMeshId(s32 mesh_id) +{ LetterFloorTile *i_ptr; - for(i_ptr = letterFloorTilesTable; i_ptr->meshId != 0; i_ptr++){ - if(i_ptr->meshId == mesh_id){ + for (i_ptr = sLetterFloorTiles; i_ptr->meshId != NULL; i_ptr++) + { + if (i_ptr->meshId == mesh_id) + { return i_ptr; } } + return NULL; } -void func_8038A328(void) { +static void __code3E30_initFloorTiles(void) +{ LetterFloorTile *i_ptr; - for(i_ptr = letterFloorTilesTable; i_ptr->meshId != 0; i_ptr++){ - i_ptr->unk3 = 2; - i_ptr->unk4 = 0.0f; + for (i_ptr = sLetterFloorTiles; i_ptr->meshId != 0; i_ptr++) + { + i_ptr->state = 2; + i_ptr->time_delta_sum = 0.0f; } + mapSpecificFlags_set(TTC_SPECIFIC_FLAG_1_UNKNOWN, FALSE); } -void func_8038A37C(s32 arg0, BKVtxRef *ref, Vtx *dst, s32 arg3) { - LetterFloorTile *ptr = (LetterFloorTile *) arg3; +static void __code3E30_meshCallbackFloorTileState_1(s32 arg0, BKVtxRef *ref, Vtx *dst, s32 arg3) +{ + LetterFloorTile *ptr = (LetterFloorTile *)arg3; f32 temp_f2; - if (ptr->unk4 < 0.5) { - temp_f2 = (ptr->unk4 / 0.5); + if (ptr->time_delta_sum < 0.5) + { + temp_f2 = (ptr->time_delta_sum / 0.5); dst->v.cn[0] = (ref->v.v.cn[0] - 0xFF) * temp_f2 + 255.0f; dst->v.cn[1] = ref->v.v.cn[1] * temp_f2; dst->v.cn[2] = ref->v.v.cn[2] * temp_f2; } - else{ + else + { dst->v.cn[0] = ref->v.v.cn[0]; dst->v.cn[1] = ref->v.v.cn[1]; dst->v.cn[2] = ref->v.v.cn[2]; - ptr->unk3 = 2; + ptr->state = 2; } } -void TTC_func_8038A5D8(LetterFloorTile *arg0, s32 arg1) { +static void __code3E30_setLetterFloorTileState(LetterFloorTile *arg0, s32 arg1) +{ s32 temp_v0; - temp_v0 = arg0->unk3; - arg0->unk3 = arg1; - arg0->unk4 = 0.0f; - if ((arg1 == 1) && (temp_v0 != arg1)) { + temp_v0 = arg0->state; + arg0->state = arg1; + arg0->time_delta_sum = 0.0f; + if ((arg1 == 1) && (temp_v0 != arg1)) + { func_8025A6EC(COMUSIC_2C_BUZZER, 32000); } } -void func_8038A618(s32 arg0, BKVtxRef *ref, Vtx *dst, s32 arg3) { - LetterFloorTile *ptr = (LetterFloorTile *) arg3; +static void __code3E30_meshCallbackFloorTileState_3(s32 arg0, BKVtxRef *ref, Vtx *dst, s32 arg3) +{ + LetterFloorTile *ptr = (LetterFloorTile *)arg3; f32 temp_f12; - - if (ptr->unk4 <= 0.5) { - temp_f12 = (ptr->unk4 / 0.5); + if (ptr->time_delta_sum <= 0.5) + { + temp_f12 = (ptr->time_delta_sum / 0.5); dst->v.cn[0] = ref->v.v.cn[0] * (1.0f - temp_f12); dst->v.cn[1] = 0xFF; dst->v.cn[2] = ref->v.v.cn[2] * (1.0f - temp_f12); } - if (ptr->unk4 >= 0.5) { - ptr->unk3 = 4; + if (ptr->time_delta_sum >= 0.5) + { + ptr->state = 4; } } -void func_8038A7DC(s32 arg0, BKVtxRef *ref, Vtx *dst, s32 arg3){ - LetterFloorTile *ptr = (LetterFloorTile *) arg3; +static void __code3E30_meshCallbackFloorTileState_5(s32 arg0, BKVtxRef *ref, Vtx *dst, s32 arg3) +{ + LetterFloorTile *ptr = (LetterFloorTile *)arg3; f32 temp_f2; - if (ptr->unk4 < 0.5) { - temp_f2 = (ptr->unk4 / 0.5); + if (ptr->time_delta_sum < 0.5) + { + temp_f2 = (ptr->time_delta_sum / 0.5); dst->v.cn[0] = (ref->v.v.cn[0] - 0xFF) * temp_f2 + 255.0f; dst->v.cn[1] = (ref->v.v.cn[1] - 0xFF) * temp_f2 + 255.0f; dst->v.cn[2] = ref->v.v.cn[2] * temp_f2; } - else{ + else + { dst->v.cn[0] = ref->v.v.cn[0]; dst->v.cn[1] = ref->v.v.cn[1]; dst->v.cn[2] = ref->v.v.cn[2]; - ptr->unk3 = 2; + ptr->state = 2; } } -void func_8038AA2C(void) { - f32 temp_f20; +static void __code3E30_updateTimeDeltaSumForFloorTiles() +{ + f32 time_delta; LetterFloorTile *floor_tile; - temp_f20 = time_getDelta(); - for(floor_tile = letterFloorTilesTable; floor_tile->meshId != 0; floor_tile++){ - floor_tile->unk4 += temp_f20; - if (floor_tile->unk3 == 1) { - BKModel_transformMesh(D_8038D720.model1, floor_tile->meshId, func_8038A37C, (s32)floor_tile); - } else if (floor_tile->unk3 == 3) { - BKModel_transformMesh(D_8038D720.model1, floor_tile->meshId, func_8038A618, (s32)floor_tile); - } else if (floor_tile->unk3 == 5) { - BKModel_transformMesh(D_8038D720.model1, floor_tile->meshId, func_8038A7DC, (s32)floor_tile); + time_delta = time_getDelta(); + for (floor_tile = sLetterFloorTiles; floor_tile->meshId != 0; floor_tile++) + { + floor_tile->time_delta_sum += time_delta; + if (floor_tile->state == 1) + { + BKModel_transformMesh(sMapState.model1, floor_tile->meshId, __code3E30_meshCallbackFloorTileState_1, (s32)floor_tile); + } + else if (floor_tile->state == 3) + { + BKModel_transformMesh(sMapState.model1, floor_tile->meshId, __code3E30_meshCallbackFloorTileState_3, (s32)floor_tile); + } + else if (floor_tile->state == 5) + { + BKModel_transformMesh(sMapState.model1, floor_tile->meshId, __code3E30_meshCallbackFloorTileState_5, (s32)floor_tile); } } } -void func_8038AB44(void){ - D_8038C980 = func_8038B600(); +static void __code3E30_setsecretCheatCodeRelatedValue(void) +{ + secretCheatCodeRelatedValue = __code3E30_scrambleAddressForSecretCheatCode(); } -u32 cheatoCodeUnlocked(s32 cheato_code_index){ - if(fileProgressFlag_get(FILEPROG_AD_CHEATO_BLUEEGGS_UNLOCKED + cheato_code_index - 1)){ +static u32 __code3E30_cheatoCodeUnlocked(s32 cheato_code_index) +{ + if (fileProgressFlag_get(FILEPROG_AD_CHEATO_BLUEEGGS_UNLOCKED + cheato_code_index - 1)) + { return 1 << cheato_code_index; } + return 0; } -void func_8038ABA0(u32 arg0){ +static void __code3E30_setVolatileFlags(u32 arg0) +{ int i; volatileFlag_setAndTriggerDialog_0(VOLATILE_FLAG_C2_NOBONUS_TEXT); - if(arg0 & 0x400){ + // wish washy banjo cheat code + if (arg0 & 0x400) + { volatileFlag_setAndTriggerDialog_E(VOLATILE_FLAG_C5_WISHYWASHYBANJO_TEXT); } volatileFlag_set(VOLATILE_FLAG_78_SANDCASTLE_NO_BONUS, 0); - for(i = 4; i < 0xb; i++){ - if( arg0 & (1 << i)){ + for (i = 4; i < 11; i++) + { + if (arg0 & (1 << i)) + { volatileFlag_set(VOLATILE_FLAG_93_SANDCASTLE_OPEN_CCW + i, TRUE); volatileFlag_set(VOLATILE_FLAG_78_SANDCASTLE_NO_BONUS, TRUE); } - else{ + else + { volatileFlag_set(VOLATILE_FLAG_93_SANDCASTLE_OPEN_CCW + i, FALSE); } } } -void func_8038AC48(LetterFloorTile *arg0) { - s32 sp40[4]; - s32 sp3C; - bool temp_s5; +static void __code3E30_checkFloorTileForRegularCheatCode(LetterFloorTile *letter_floor_tile) +{ + s32 sp40[4]; // unused but required for checksum + + bool floor_is_valid_or_correct; + bool is_in_ff_minigame; s32 i; u32 var_v0; - struct_ttc_3E30_3_s *i_ptr; - s32 phi_s1; - bool phi_s7; + CheatCode *cheatcode_ptr; + s32 unlocked_cheat_flags; + bool is_correct_input; - 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++){ - phi_s1 = (D_8038D720.unk8 == 0) ? 1 : 0; - if (!temp_s5) { - for(i = 1; i < 4; i++){ - phi_s1 |= cheatoCodeUnlocked(i); + is_in_ff_minigame = volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME); + is_correct_input = FALSE; + floor_is_valid_or_correct = __code3E30_isFloorTileValidForSecretCheatCode(letter_floor_tile); + for (cheatcode_ptr = sCheatCodes; cheatcode_ptr->code != NULL; cheatcode_ptr++) + { + unlocked_cheat_flags = (sMapState.banjoKazooieCodeEnteredState == 0) ? 1 : 0; + if (!is_in_ff_minigame) + { + for (i = 1; i < 4; i++) + { + unlocked_cheat_flags |= __code3E30_cheatoCodeUnlocked(i); } - for(i = 0; i < 7; i++){ - if (D_8037DCC0[i] != 0) { - phi_s1 |= (0x10 << i); + for (i = 0; i < 7; i++) + { + if (D_8037DCC0[i] != 0) + { + unlocked_cheat_flags |= (0x10 << i); } }; - if (volatileFlag_get(VOLATILE_FLAG_78_SANDCASTLE_NO_BONUS)) { - phi_s1 |= 0x800; + if (volatileFlag_get(VOLATILE_FLAG_78_SANDCASTLE_NO_BONUS)) + { + unlocked_cheat_flags |= 0x800; } } - if (i_ptr->unk4 & phi_s1) { - if (func_8038BF68() && !temp_s5) { - i_ptr->unk6 = 0; - func_8038A258(2); + if (cheatcode_ptr->flagBitMask & unlocked_cheat_flags) + { + if (__code3E30_isCurrentSecretCheatCodeCharacter0() && !is_in_ff_minigame) + { + cheatcode_ptr->codeCharacterIdx = 0; + __code3E30_setupCheatCodeTimer(2); } - if (arg0->letter == i_ptr->code[i_ptr->unk6]) { - phi_s7 = TRUE; - i_ptr->unk6++; - if (func_8038BF68()) { - i_ptr->unk6 = 0; - } else { - if (i_ptr->unk4 & 0xFFE) { - func_8038A258(2); - TTC_func_8038A5D8(arg0, 5); - } else { - TTC_func_8038A5D8(arg0, 3); + if (letter_floor_tile->letter == cheatcode_ptr->code[cheatcode_ptr->codeCharacterIdx]) + { + is_correct_input = TRUE; + cheatcode_ptr->codeCharacterIdx++; + if (__code3E30_isCurrentSecretCheatCodeCharacter0()) + { + cheatcode_ptr->codeCharacterIdx = 0; + } + else + { + // is not banjo kazooie + if (cheatcode_ptr->flagBitMask & 0xFFE) + { + __code3E30_setupCheatCodeTimer(2); + __code3E30_setLetterFloorTileState(letter_floor_tile, 5); } - if (i_ptr->code[i_ptr->unk6] == 0) { + else + { + __code3E30_setLetterFloorTileState(letter_floor_tile, 3); + } + if (cheatcode_ptr->code[cheatcode_ptr->codeCharacterIdx] == 0) + { func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 32000); - - if (temp_s5) { + + if (is_in_ff_minigame) + { item_set(ITEM_6_HOURGLASS, FALSE); volatileFlag_set(VOLATILE_FLAG_3, 0); volatileFlag_set(VOLATILE_FLAG_5_FF_MINIGAME_WON, 1); - func_8038A258(2); - } else { - var_v0 = i_ptr->unk4; - if (var_v0 & 1) { - D_8038D720.unk8 = 2U; - D_8038D720.unkC = 0.0f; + __code3E30_setupCheatCodeTimer(2); + } + else + { + var_v0 = cheatcode_ptr->flagBitMask; + // banjokazooie check + if (var_v0 & 1) + { + sMapState.banjoKazooieCodeEnteredState = 2; + sMapState.unkC = 0.0f; mapSpecificFlags_set(TTC_SPECIFIC_FLAG_1_UNKNOWN, TRUE); fileProgressFlag_set(0xFA, TRUE); - func_8030E2C4(D_8038D720.sfxsourceIdx); - func_8038A258(2); - } else if (var_v0 & 0xE) { - func_8035644C((i_ptr - codesTable) - 1 + FILEPROG_BE_CHEATO_BLUEEGGS); - switch ((i_ptr - codesTable) - 1) { /* irregular */ + func_8030E2C4(sMapState.doorOpeningSfxSourceIdx); + __code3E30_setupCheatCodeTimer(2); + } + // blue eggs & red/gold feathers check + else if (var_v0 & 0xE) + { + // trigger dialog + func_8035644C((cheatcode_ptr - sCheatCodes) - 1 + FILEPROG_BE_CHEATO_BLUEEGGS); + switch ((cheatcode_ptr - sCheatCodes) - 1) + { default: break; case 0: @@ -340,255 +448,296 @@ void func_8038AC48(LetterFloorTile *arg0) { func_802FAFAC(ITEM_10_GOLD_FEATHER, COMUSIC_14_GOLD_FEATHER_COLLECTED); break; } - } else if (var_v0 & 0xFF0) { - func_8038ABA0(var_v0); + } + // bottle bonus / wishy washy banjo / nobonus + else if (var_v0 & 0xFF0) + { + __code3E30_setVolatileFlags(var_v0); } } - } else { + } + else + { func_8025A6EC(COMUSIC_2B_DING_B, 28000); } } - - } else if (sp3C != 0) { - phi_s7 = TRUE; + } + else if (floor_is_valid_or_correct != FALSE) + { + is_correct_input = TRUE; } } } - if ((func_8038BF68() == 0) && (phi_s7 == 0) && (D_8038D720.unk8 == 0)) { - TTC_func_8038A5D8(arg0, 1); + if ((__code3E30_isCurrentSecretCheatCodeCharacter0() == FALSE) && (is_correct_input == FALSE) && (sMapState.banjoKazooieCodeEnteredState == 0)) + { + __code3E30_setLetterFloorTileState(letter_floor_tile, 1); } } -void func_8038AFC8(void){ - struct_ttc_3E30_3_s *iPtr; +static void __code3E30_resetCheatCodeProgress(void) +{ + CheatCode *iPtr; - for(iPtr = codesTable; iPtr->code != NULL; iPtr++){ - iPtr->unk6 = 0; + for (iPtr = sCheatCodes; iPtr->code != NULL; iPtr++) + { + iPtr->codeCharacterIdx = 0; } - if(volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)) - strcpy(codesTable[0].code, "j4663n86pink"); //EIOOZAKOJNAB + if (volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)) + strcpy(sCheatCodes[0].code, "j4663n86pink"); // EIOOZAKOJNAB else - strcpy(codesTable[0].code, "knip68n3664j"); //BANJOKAZOOIE + strcpy(sCheatCodes[0].code, "knip68n3664j"); // BANJOKAZOOIE - func_8038B5B4(); + __code3E30_resetSecretCheatCodeProgress(); } -void func_8038B04C(void){ - if(D_8038D720.model1){ - func_8038A258(0); - func_8030DA44(D_8038D720.sfxsourceIdx); - func_8030DA44(D_8038D720.unkA); +void code3E30_overlayRelease(void) +{ + if (sMapState.model1) + { + __code3E30_setupCheatCodeTimer(0); + func_8030DA44(sMapState.doorOpeningSfxSourceIdx); + func_8030DA44(sMapState.dullCannonShotSfxSourceId); } } -void func_8038B094(void){ +void code3E30_overlayInit(void) +{ void *sp2C; void *sp28; - if( map_get() == MAP_7_TTC_TREASURE_TROVE_COVE - && levelSpecificFlags_get(0x2) - ){ + if (map_get() == MAP_7_TTC_TREASURE_TROVE_COVE && levelSpecificFlags_get(0x2)) + { sp2C = func_8034C5AC(0x12C); - if(sp2C){ + if (sp2C) + { func_8034E71C(sp2C, -600, 0.0f); } } - D_8038D720.model1 = 0; - if(map_get() != MAP_A_TTC_SANDCASTLE){ - func_8038AB44(); + sMapState.model1 = 0; + if (map_get() != MAP_A_TTC_SANDCASTLE) + { + __code3E30_setsecretCheatCodeRelatedValue(); } - else{ + else + { sp2C = func_8034C5AC(0x131); sp28 = func_8034C5AC(0x12C); - if(levelSpecificFlags_get(5)){ + if (levelSpecificFlags_get(5)) + { func_8034E71C(sp2C, -500, 10.0f); func_80324E38(0.0f, 3); timed_setStaticCameraToNode(0.0f, 1); timed_exitStaticCamera(2.0f); func_80324E38(2.0f, 0); func_803228D8(); - timedFunc_set_3(2.0f, (GenFunction_3) func_802E4078, MAP_7_TTC_TREASURE_TROVE_COVE, 1, 0); + 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_FF_IN_MINIGAME)){ + else if (levelSpecificFlags_get(2) || volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)) + { func_8034E71C(sp2C, -500, 0.0f); } - else{ + else + { func_8034E71C(sp28, -500, 0.0f); - }//L8038B1EC + } // L8038B1EC - D_8038D720.model1 = mapModel_getModel(0); - D_8038D720.model2 = mapModel_getModel(1); - D_8038D720.unk8 = 0; - D_8038D720.unk10 = 0; - D_8038D720.unkC = 0.0f; + sMapState.model1 = mapModel_getModel(0); + sMapState.model2 = mapModel_getModel(1); + sMapState.banjoKazooieCodeEnteredState = 0; + sMapState.timerState = 0; + sMapState.unkC = 0.0f; - D_8038D720.sfxsourceIdx = sfxsource_createSfxsourceAndReturnIndex(); - sfxsource_playSfxAtVolume(D_8038D720.sfxsourceIdx, 0.1f); - sfxsource_setSfxId(D_8038D720.sfxsourceIdx, SFX_3EC_CCW_DOOR_OPENING); - func_8030DD14(D_8038D720.sfxsourceIdx, 3); - sfxsource_setSampleRate(D_8038D720.sfxsourceIdx, 28000); + sMapState.doorOpeningSfxSourceIdx = sfxsource_createSfxsourceAndReturnIndex(); + sfxsource_playSfxAtVolume(sMapState.doorOpeningSfxSourceIdx, 0.1f); + sfxsource_setSfxId(sMapState.doorOpeningSfxSourceIdx, SFX_3EC_CCW_DOOR_OPENING); + func_8030DD14(sMapState.doorOpeningSfxSourceIdx, 3); + sfxsource_setSampleRate(sMapState.doorOpeningSfxSourceIdx, 28000); - D_8038D720.unkA = sfxsource_createSfxsourceAndReturnIndex(); - sfxsource_setSfxId(D_8038D720.unkA, SFX_3_DULL_CANNON_SHOT); - func_8030DD14(D_8038D720.unkA, 3); - sfxsource_setSampleRate(D_8038D720.unkA, 0x7fff); - func_8038A328(); - func_8038AFC8(); + sMapState.dullCannonShotSfxSourceId = sfxsource_createSfxsourceAndReturnIndex(); + sfxsource_setSfxId(sMapState.dullCannonShotSfxSourceId, SFX_3_DULL_CANNON_SHOT); + func_8030DD14(sMapState.dullCannonShotSfxSourceId, 3); + sfxsource_setSampleRate(sMapState.dullCannonShotSfxSourceId, 0x7fff); + __code3E30_initFloorTiles(); + __code3E30_resetCheatCodeProgress(); - if( jiggyscore_isCollected(JIGGY_10_TTC_SANDCASTLE) - && !volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) - ){ - BKModel_transformMesh(D_8038D720.model2, 0x3C, func_8038A23C, 0); - D_8038D720.unk8 = 3; - }//L8038B2CC - func_8038AB44(); - func_8038B5B4(); - }//L8038B2E0 + if (jiggyscore_isCollected(JIGGY_10_TTC_SANDCASTLE) && !volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)) + { + BKModel_transformMesh(sMapState.model2, 0x3C, __code3E30_transformMeshCallbackOverlayInit, 0); + sMapState.banjoKazooieCodeEnteredState = 3; + } // L8038B2CC + __code3E30_setsecretCheatCodeRelatedValue(); + __code3E30_resetSecretCheatCodeProgress(); + } // L8038B2E0 } -void func_8038B2F0(void) { - f32 sp2C[3]; - s32 mesh_id; - f32 sp24; +void code3E30_overlayUpdate(void) +{ + f32 player_position[3]; + s32 mesh_id_closest_to_player; + f32 time_delta; u8 temp_v0; - LetterFloorTile *temp_v0_3; + LetterFloorTile *floor_tile; - sp24 = time_getDelta(); - if (__sandcastleCodes_getNumberEntered() == 3) { + time_delta = time_getDelta(); + if (__code3E30_getNumberOfBannedCheatCodesEntered() == 3) + { func_802C5A3C(-1); } - if (D_8038D720.model1 != 0) { - func_8038AA2C(); - player_getPosition(sp2C); - if ((D_8038D720.unk10 == 0) && volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) && volatileFlag_get(VOLATILE_FLAG_3)) { - func_8038A258(1); + if (sMapState.model1 != 0) + { + __code3E30_updateTimeDeltaSumForFloorTiles(); + player_getPosition(player_position); + if ((sMapState.timerState == 0) && volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) && volatileFlag_get(VOLATILE_FLAG_3)) + { + __code3E30_setupCheatCodeTimer(1); } - if ((D_8038D720.unk10 == 1) && item_empty(ITEM_0_HOURGLASS_TIMER)) { - func_8038A258(2); - if (volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)) { + // timer has run out + if ((sMapState.timerState == 1) && item_empty(ITEM_0_HOURGLASS_TIMER)) + { + __code3E30_setupCheatCodeTimer(2); + if (volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)) + { volatileFlag_set(VOLATILE_FLAG_3, FALSE); volatileFlag_set(VOLATILE_FLAG_5_FF_MINIGAME_WON, FALSE); - } else { + } + else + { func_8028F66C(BS_INTR_F); } } - if ((D_8038D720.unk8 == 0) || (D_8038D720.unk8 == 3)) { - if( (levelSpecificFlags_get(2) || volatileFlag_get(VOLATILE_FLAG_3)) - && (player_getActiveHitbox(0) == HITBOX_1_BEAK_BUSTER) - && func_8028F20C() - ) { - mesh_id = func_8033F3C0(D_8038D720.model1, sp2C); - if (mesh_id != 0) { - 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_FF_IN_MINIGAME) == 0)) { - func_8038A258(1); + if ((sMapState.banjoKazooieCodeEnteredState == 0) || (sMapState.banjoKazooieCodeEnteredState == 3)) + { + if ((levelSpecificFlags_get(2) || volatileFlag_get(VOLATILE_FLAG_3)) && (player_getActiveHitbox(0) == HITBOX_1_BEAK_BUSTER) && func_8028F20C()) + { + mesh_id_closest_to_player = func_8033F3C0(sMapState.model1, player_position); + if (mesh_id_closest_to_player != 0) + { + floor_tile = __code_3E30_getFloorTileForMeshId(mesh_id_closest_to_player); + if ((floor_tile != NULL) && ((floor_tile->state == 2) || (sMapState.banjoKazooieCodeEnteredState == 3))) + { + __code3E30_checkFloorTileForRegularCheatCode(floor_tile); + if ((sMapState.banjoKazooieCodeEnteredState == 0) && (sMapState.timerState == 0) && (volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) == 0)) + { + __code3E30_setupCheatCodeTimer(1); } } } } - } else if (D_8038D720.unk8 == 2) { - D_8038D720.unkC = (f32) (D_8038D720.unkC + sp24); - BKModel_transformMesh(D_8038D720.model2, 0x3C, func_8038A220, 0); - if (D_8038D720.unkC > 4.0f) { - D_8038D720.unk8 = 3; - func_8030E2C4(D_8038D720.unkA); - func_8030E394(D_8038D720.sfxsourceIdx); + } + else if (sMapState.banjoKazooieCodeEnteredState == 2) + { + sMapState.unkC = (f32)(sMapState.unkC + time_delta); + BKModel_transformMesh(sMapState.model2, 0x3C, __code3E30_transformMeshCallbackOverlayUpdate, 0); + if (sMapState.unkC > 4.0f) + { + sMapState.banjoKazooieCodeEnteredState = 3; + func_8030E2C4(sMapState.dullCannonShotSfxSourceId); + func_8030E394(sMapState.doorOpeningSfxSourceIdx); } } } } -bool func_8038B550(void){ - return NOT(D_8038D720.unk8 < 2); +// is used to determine whether to spawn the crab or not +bool code3E30_hasBanjoKazooieCodeBeenEntered(void) +{ + return NOT(sMapState.banjoKazooieCodeEnteredState < 2); } -s32 D_8038CAD4 = 0; -struct_ttc_3E30_4_s secretCodesTable[] = { - {"0mjnd", 0, 0x00, 00}, //CHEAT - {"i67knip674bbkjnkbjd62jj4d6iinkigd2dnkbj", 0, 0x01, 00}, //NOW BANJO WILL BE ABLE TO SEE IT ON NABNUTS TABLE - {"dm422j09jde6gbbkj59nkk4i4idmj0nrdn4i20nk4i", 0, 0x02, 00}, //THIS SECRET YOULL BE GRABBIN IN THE CAPTAINS CABIN - {"n14l2ddmjmngidjl5b661n2j09jd4idmjkndm9661", 0, 0x03, 00}, //AMIDST THE HAUNTED GLOOM A SECRET IN THE BATHROOM - {"nlj2j9dl6696rji274ljni04jid2j09jd27n4d4i24lj", 0, 0x04, 00}, //A DESERT DOOR OPENS WIDE ANCIENT SECRETS WAIT INSIDE - {"6gd6cdmj2jn4d942j2d69jajnb169j2j09jdr943j2", 0, 0x05, 00}, //OUT OF THE SEA IT RISES TO REVEAL MORE SECRET PRIZES - {"l6ide6g56nildjbbmj9nk6gddmj2j09jd4imj90jbbn9", 0, 0x06, 00}, //DONT YOU GO AND TELL HER ABOUT THE SECRET IN HER CELLAR - {"i67e6g0ni2jjni40j40j8je7m40me6g0nimnajc69c9jj", 0, 0x07, 00}, //NOW YOU CAN SEE A NICE ICE KEY WHICH YOU CAN HAVE FOR FREE - {"56945md6idm96g5mi6djl669d76", 0, 0x7A, 00}, //GO RIGHT ON THROUGH NOTE DOOR TWO - {"i6djl669dm9jj5jd4ic69c9jj", 0, 0x7B, 00}, //NOTE DOOR THREE GET IN FOR FREE - {"dn8jnd6g9dm96g5mi6djl669c6g9", 0, 0x7C, 00}, //TAKE A TOUR THROUGH NOTE DOOR FOUR - {"g2jdm420mjndi6djl669c4aj42kjnd", 0, 0x7D, 00}, //USE THIS CHEAT NOTE DOOR FIVE IS BEAT - {"dm42d94082g2jld66rjii6djl66924h", 0, 0x7E, 00}, //THIS TRICKS USED TO OPEN NOTE DOOR SIX - {"dmj2jajidmi6djl66942i67i6169j", 0, 0x7F, 00}, //THE SEVENTH NOTE DOOR IS NOW NO MORE - {"e6g0ni5jd7jdcjjdi670bni8j92p455e42061rbjdj", 0, 0x80, 00}, //YOU CAN GET WET FEET NOW CLANKERS JIGGY IS COMPLETE - {"dmjp455e2cgbb6cce6g2d61r4id6l4i5ekgkkbj5b66r27n1r", 0, 0x81, 00}, //THE JIGGYS FULL OFF YOU STOMP IN TO DINGY BUBBLEGLOOP SWAMP - {"dmjp455e2l6ij266cce6g564id6c9jj3jj3erjn8nil4d22i67", 0, 0x82, 00}, //THE JIGGYS DONE SO OFF YOU GO INTO FREEZEEZY PEAK AND ITS SNOW - {"56k42p455e42i67l6ijd9j86i4inil5jd261j2gi", 0, 0x83, 00}, //GOBIS JIGGY IS NOW DONE TREK ON IN AND GET SOME SUN - {"dmjp455e2i671nlj7m6bj4id6dmj1ni246ie6g0ni2d96bb", 0, 0x84, 00}, //THE JIGGYS NOW MADE WHOLE INTO THE MANSION YOU CAN STROLL - {"dmjp455e2l6ij26dn8jnd94r6id6dmj9g2dekg08jd2m4r", 0, 0x85, 00}, //THE JIGGYS DONE SO TAKE A TRIP ON TO THE RUSTY BUCKET SHIP - {"0b4080b608766l42b6d26ccgi566i4idmjp455e2l6ij", 0, 0x86, 00}, //CLICK CLOCK WOOD IS LOTS OF FUN GO ON IN THE JIGGYS DONE - {"b6d26c56j274dm1nieknip62", 0, 0x87, 00}, //LOTS OF GOES WITH MANY BANJOS - {"knip6kj52c69rbjide6cj552", 0, 0x88, 00}, //BANJO BEGS FOR PLENTY OF EGGS - {"i67e6g0nicbem45m4idmj28e", 0, 0x89, 00}, //NOW YOU CAN FLY HIGH IN THE SKY - {"n56blji5b67d6r96dj0dknip6", 0, 0x8A, 00}, //A GOLDEN GLOW TO PROTECT BANJO - {"k6dmr4rj2n9jdmj9jd60bni8j92bn49", 0, 0x91, 00}, //BOTH PIPES ARE THERE TO CLANKERS LAIR - {"e6gbb0jn2jd6594rj7mjigr56j2nr4rj", 0, 0x92, 00}, //YOULL CEASE TO GRIPE WHEN UP GOES A PIPE - {"dmj9j2i67mj9jlni8j9dmni4i74dm0bni8j9", 0, 0x93, 00}, //THERES NOWHERE DANKER THAN IN WITH CLANKER - {"e6gbbkjn1n3jli67dmj27n1rr400e594bbj429n42jl", 0, 0x94, 00}, //YOULL BE AMAZED NOW THE SWAMP PICCY GRILLE IS RAISED - {"l6idlj2rn49dmjd9jjp455er6l4g142i67dmj9j", 0, 0x95, 00}, //DONT DESPAIR THE TREE JIGGY PODIUM IS NOW THERE - {"2mj2nig5beknd26bjd29j16ajmj9594bbjnilmnd", 0, 0x96, 00}, //SHES AN UGLY BAT SO LETS REMOVE HER GRILLE AND HAT - {"4d2e6g9bg08elnen2dmj40jknbb1jbd2n7ne", 0, 0x97, 00}, //ITS YOUR LUCKY DAY AS THE ICE BALL MELTS AWAY - {"i674id6dmj27n1re6g0ni2d61r", 0, 0x98, 00}, //NOW IN TO THE SWAMP YOU CAN STOMP - {"dmje0ng2jd96gkbjkgdi67dmje9j9gkkbj", 0, 0x99, 00}, //THEY CAUSE TROUBLE BUT NOW THEYRE RUBBLE - {"e6gbbkj5bnld62jjdmj2m608pg1rrnl", 0, 0x9A, 00}, //YOULL BE GLAD TO SEE THE SHOCK JUMP PAD - {"dm42061j24imniled66rji261j7mj9j2nile", 0, 0x9B, 00}, //THIS COMES IN HANDY TO OPEN SOMEWHERE SANDY - {"7jk22d6re6g9rbne26dn8jdmj1n7ne", 0, 0x9C, 00}, //WEBS STOP YOUR PLAY SO TAKE THEM AWAY - {"59gide74bb09ei67e6gaj21n2mjlmj9jej", 0, 0x9D, 00}, //GRUNTY WILL CRY NOW YOUVE SMASHED HER EYE - {"e6g76idkj2nli67e6g0nig2jdmjcbernl", 0, 0x9E, 00}, //YOU WONT BE SAD NOW YOU CAN USE THE FLY PAD - {"i67e6g0ni56nild9gl5j4idmj2i67", 0, 0x9F, 00}, //NOW YOU CAN GO AND TRUDGE IN THE SNOW - {"dmj1ni246i6c5m62d2n9ji67e6g9m62d2", 0, 0xA0, 00}, //THE MANSION OF GHOSTS ARE NOW YOUR HOSTS - {"e6g76idmnajd67n4di67dmj9j2i609erd5ndj", 0, 0xA1, 00}, //YOU WONT HAVE TO WAIT NOW THERES NO CRYPT GATE - {"dm422m6gbl5jd94l6cdmj09erd06cc4ib4l", 0, 0xA2, 00}, //THIS SHOULD GET RID OF THE CRYPT COFFIN LID - {"gre6g5674dm6gdnm4d0mgrd6dmj7ndj9bjajb274d0m", 0, 0xA3, 00}, //UP YOU GO WITHOUT A HITCH UP TO THE WATER LEVEL SWITCH - {"7mei6ddn8jnd94r4i24lj59gide29g2de2m4r", 0, 0xA4, 00}, //WHY NOT TAKE A TRIP INSIDE GRUNTYS RUSTY SHIP - {"dmj594bbj56j2k661d6dmj2m4rr40dg9j9661", 0, 0xA5, 00}, //THE GRILLE GOES BOOM TO THE SHIP PICTURE ROOM - {"6i0j4d2m6ijkgddmjb6i5dgiijb594bbj4256ij", 0, 0xA6, 00}, //ONCE IT SHONE BUT THE LONG TUNNEL GRILLE IS GONE - {"dm426ij2566ln2e6g0nijidj9dmj766l", 0, 0xA7, 00}, //THIS ONES GOOD AS YOU CAN ENTER THE WOOD - {"nijij95ekn9d65jde6gcn9", 0, 0xA8, 00}, //AN ENERGY BAR TO GET YOU FAR - {"l6idkjnlg1k6562jj1g1k6", 0, 0xA9, 00}, //DONT BE A DUMBO GO SEE MUMBO - {"54ajdmjkjn9b6d26cn49", 0, 0xAA, 00}, //GIVE THE BEAR LOTS OF AIR - 0 +static s32 sThirdForbiddenSecretCheatCodeIndex = NULL; + +#define VOLATILE_FLAG_CHEAT_OFFSET 0x14 + +static SecretCheatCode sSecretsCheatCodes[] = { + {"0mjnd", 0, 0x00, 00}, // CHEAT + {"i67knip674bbkjnkbjd62jj4d6iinkigd2dnkbj", 0, 0x01, 00}, // NOW BANJO WILL BE ABLE TO SEE IT ON NABNUTS TABLE + {"dm422j09jde6gbbkj59nkk4i4idmj0nrdn4i20nk4i", 0, 0x02, 00}, // THIS SECRET YOULL BE GRABBIN IN THE CAPTAINS CABIN + {"n14l2ddmjmngidjl5b661n2j09jd4idmjkndm9661", 0, 0x03, 00}, // AMIDST THE HAUNTED GLOOM A SECRET IN THE BATHROOM + {"nlj2j9dl6696rji274ljni04jid2j09jd27n4d4i24lj", 0, 0x04, 00}, // A DESERT DOOR OPENS WIDE ANCIENT SECRETS WAIT INSIDE + {"6gd6cdmj2jn4d942j2d69jajnb169j2j09jdr943j2", 0, 0x05, 00}, // OUT OF THE SEA IT RISES TO REVEAL MORE SECRET PRIZES + {"l6ide6g56nildjbbmj9nk6gddmj2j09jd4imj90jbbn9", 0, 0x06, 00}, // DONT YOU GO AND TELL HER ABOUT THE SECRET IN HER CELLAR + {"i67e6g0ni2jjni40j40j8je7m40me6g0nimnajc69c9jj", 0, 0x07, 00}, // NOW YOU CAN SEE A NICE ICE KEY WHICH YOU CAN HAVE FOR FREE + {"56945md6idm96g5mi6djl669d76", 0, VOLATILE_FLAG_66_SANDCASTLE_OPEN_DOOR_TWO + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // GO RIGHT ON THROUGH NOTE DOOR TWO + {"i6djl669dm9jj5jd4ic69c9jj", 0, VOLATILE_FLAG_67_SANDCASTLE_OPEN_DOOR_THREE + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // NOTE DOOR THREE GET IN FOR FREE + {"dn8jnd6g9dm96g5mi6djl669c6g9", 0, VOLATILE_FLAG_68_SANDCASTLE_OPEN_DOOR_FOUR + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // TAKE A TOUR THROUGH NOTE DOOR FOUR + {"g2jdm420mjndi6djl669c4aj42kjnd", 0, VOLATILE_FLAG_69_SANDCASTLE_OPEN_DOOR_FIVE + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // USE THIS CHEAT NOTE DOOR FIVE IS BEAT + {"dm42d94082g2jld66rjii6djl66924h", 0, VOLATILE_FLAG_6A_SANDCASTLE_OPEN_DOOR_SIX + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // THIS TRICKS USED TO OPEN NOTE DOOR SIX + {"dmj2jajidmi6djl66942i67i6169j", 0, VOLATILE_FLAG_6B_SANDCASTLE_OPEN_DOOR_SEVEN + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // THE SEVENTH NOTE DOOR IS NOW NO MORE + {"e6g0ni5jd7jdcjjdi670bni8j92p455e42061rbjdj", 0, VOLATILE_FLAG_6C_SANDCASTLE_PUZZLE_COMPLETE_CC + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // YOU CAN GET WET FEET NOW CLANKERS JIGGY IS COMPLETE + {"dmjp455e2cgbb6cce6g2d61r4id6l4i5ekgkkbj5b66r27n1r", 0, VOLATILE_FLAG_6D_SANDCASTLE_PUZZLE_COMPLETE_BGS + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // THE JIGGYS FULL OFF YOU STOMP IN TO DINGY BUBBLEGLOOP SWAMP + {"dmjp455e2l6ij266cce6g564id6c9jj3jj3erjn8nil4d22i67", 0, VOLATILE_FLAG_6E_SANDCASTLE_PUZZLE_COMPLETE_FP + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // THE JIGGYS DONE SO OFF YOU GO INTO FREEZEEZY PEAK AND ITS SNOW + {"56k42p455e42i67l6ijd9j86i4inil5jd261j2gi", 0, VOLATILE_FLAG_6F_SANDCASTLE_PUZZLE_COMPLETE_GV + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // GOBIS JIGGY IS NOW DONE TREK ON IN AND GET SOME SUN + {"dmjp455e2i671nlj7m6bj4id6dmj1ni246ie6g0ni2d96bb", 0, VOLATILE_FLAG_70_SANDCASTLE_PUZZLE_COMPLETE_MMM + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // THE JIGGYS NOW MADE WHOLE INTO THE MANSION YOU CAN STROLL + {"dmjp455e2l6ij26dn8jnd94r6id6dmj9g2dekg08jd2m4r", 0, VOLATILE_FLAG_71_SANDCASTLE_PUZZLE_COMPLETE_RBB + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // THE JIGGYS DONE SO TAKE A TRIP ON TO THE RUSTY BUCKET SHIP + {"0b4080b608766l42b6d26ccgi566i4idmjp455e2l6ij", 0, VOLATILE_FLAG_72_SANDCASTLE_PUZZLE_COMPLETE_CCC + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // CLICK CLOCK WOOD IS LOTS OF FUN GO ON IN THE JIGGYS DONE + {"b6d26c56j274dm1nieknip62", 0, VOLATILE_FLAG_73_SANDCASTLE_INFINITE_LIVES + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // LOTS OF GOES WITH MANY BANJOS + {"knip6kj52c69rbjide6cj552", 0, VOLATILE_FLAG_74_SANDCASTLE_INFINITE_EGGS + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // BANJO BEGS FOR PLENTY OF EGGS + {"i67e6g0nicbem45m4idmj28e", 0, VOLATILE_FLAG_75_SANDCASTLE_INFINITE_RED_FEATHERS + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // NOW YOU CAN FLY HIGH IN THE SKY + {"n56blji5b67d6r96dj0dknip6", 0, VOLATILE_FLAG_76_SANDCASTLE_INFINITE_GOLD_FEATHERS + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // A GOLDEN GLOW TO PROTECT BANJO + {"k6dmr4rj2n9jdmj9jd60bni8j92bn49", 0, VOLATILE_FLAG_7D_SANDCASTLE_RAISE_PIPES_TO_CC + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // BOTH PIPES ARE THERE TO CLANKERS LAIR + {"e6gbb0jn2jd6594rj7mjigr56j2nr4rj", 0, VOLATILE_FLAG_7E_SANDCASTLE_RAISE_PIPE_TO_BRENTILDA + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // YOULL CEASE TO GRIPE WHEN UP GOES A PIPE + {"dmj9j2i67mj9jlni8j9dmni4i74dm0bni8j9", 0, VOLATILE_FLAG_7F_SANDCASTLE_OPEN_CC + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // THERES NOWHERE DANKER THAN IN WITH CLANKER + {"e6gbbkjn1n3jli67dmj27n1rr400e594bbj429n42jl", 0, VOLATILE_FLAG_80_SANDCASTLE_REMOVE_GRILL_NEAR_BGS_JIGGY + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // YOULL BE AMAZED NOW THE SWAMP PICCY GRILLE IS RAISED + {"l6idlj2rn49dmjd9jjp455er6l4g142i67dmj9j", 0, VOLATILE_FLAG_81_SANDCASTLE_CCC_JIGGY_PODIUM + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // DONT DESPAIR THE TREE JIGGY PODIUM IS NOW THERE + {"2mj2nig5beknd26bjd29j16ajmj9594bbjnilmnd", 0, VOLATILE_FLAG_82_SANDCASTLE_REMOVE_GRILL_AND_HAT_FROM_STATUE + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // SHES AN UGLY BAT SO LETS REMOVE HER GRILLE AND HAT + {"4d2e6g9bg08elnen2dmj40jknbb1jbd2n7ne", 0, VOLATILE_FLAG_83_SANDCASTLE_REMOVE_ICE + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // ITS YOUR LUCKY DAY AS THE ICE BALL MELTS AWAY + {"i674id6dmj27n1re6g0ni2d61r", 0, VOLATILE_FLAG_84_SANDCASTLE_OPEN_BGS + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // NOW IN TO THE SWAMP YOU CAN STOMP + {"dmje0ng2jd96gkbjkgdi67dmje9j9gkkbj", 0, VOLATILE_FLAG_85_SANDCASTLE_REMOVE_BREAKABLE_WALLS + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // THEY CAUSE TROUBLE BUT NOW THEYRE RUBBLE + {"e6gbbkj5bnld62jjdmj2m608pg1rrnl", 0, VOLATILE_FLAG_86_SANDCASTLE_SHOCKSPRING_JUMP_UNLOCKED + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // YOULL BE GLAD TO SEE THE SHOCK JUMP PAD + {"dm42061j24imniled66rji261j7mj9j2nile", 0, VOLATILE_FLAG_87_SANDCASTLE_OPEN_GV + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // THIS COMES IN HANDY TO OPEN SOMEWHERE SANDY + {"7jk22d6re6g9rbne26dn8jdmj1n7ne", 0, VOLATILE_FLAG_88_SANDCASTLE_REMOVE_WEBS + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // WEBS STOP YOUR PLAY SO TAKE THEM AWAY + {"59gide74bb09ei67e6gaj21n2mjlmj9jej", 0, VOLATILE_FLAG_89_SANDCASTLE_REMOVE_GLASS_EYE + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // GRUNTY WILL CRY NOW YOUVE SMASHED HER EYE + {"e6g76idkj2nli67e6g0nig2jdmjcbernl", 0, VOLATILE_FLAG_8A_SANDCASTLE_FLIGHT_UNLOCKED + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // YOU WONT BE SAD NOW YOU CAN USE THE FLY PAD + {"i67e6g0ni56nild9gl5j4idmj2i67", 0, VOLATILE_FLAG_8B_SANDCASTLE_OPEN_FP + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // NOW YOU CAN GO AND TRUDGE IN THE SNOW + {"dmj1ni246i6c5m62d2n9ji67e6g9m62d2", 0, VOLATILE_FLAG_8C_SANDCASTLE_OPEN_MMM + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // THE MANSION OF GHOSTS ARE NOW YOUR HOSTS + {"e6g76idmnajd67n4di67dmj9j2i609erd5ndj", 0, VOLATILE_FLAG_8D_SANDCASTLE_REMOVE_CRYPT_GATE + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // YOU WONT HAVE TO WAIT NOW THERES NO CRYPT GATE + {"dm422m6gbl5jd94l6cdmj09erd06cc4ib4l", 0, VOLATILE_FLAG_8E_SANDCASTLE_REMOVE_CRYPT_COFFIN_LID + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // THIS SHOULD GET RID OF THE CRYPT COFFIN LID + {"gre6g5674dm6gdnm4d0mgrd6dmj7ndj9bjajb274d0m", 0, VOLATILE_FLAG_8F_SANDCASTLE_REMOVE_GRATE_NEAR_WATER_SWITCH + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // UP YOU GO WITHOUT A HITCH UP TO THE WATER LEVEL SWITCH + {"7mei6ddn8jnd94r4i24lj59gide29g2de2m4r", 0, VOLATILE_FLAG_90_SANDCASTLE_OPEN_RBB + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // WHY NOT TAKE A TRIP INSIDE GRUNTYS RUSTY SHIP + {"dmj594bbj56j2k661d6dmj2m4rr40dg9j9661", 0, VOLATILE_FLAG_91_SANDCASTLE_REMOVE_GRILL_NEAR_RBB_JIGGY + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // THE GRILLE GOES BOOM TO THE SHIP PICTURE ROOM + {"6i0j4d2m6ijkgddmjb6i5dgiijb594bbj4256ij", 0, VOLATILE_FLAG_92_SANDCASTLE_REMOVE_TUNNEL_GRILL_NEAR_RBB_JIGGY + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // ONCE IT SHONE BUT THE LONG TUNNEL GRILLE IS GONE + {"dm426ij2566ln2e6g0nijidj9dmj766l", 0, VOLATILE_FLAG_93_SANDCASTLE_OPEN_CCW + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // THIS ONES GOOD AS YOU CAN ENTER THE WOOD + {"nijij95ekn9d65jde6gcn9", 0, VOLATILE_FLAG_94_SANDCASTLE_INFINITE_HEALTH + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // AN ENERGY BAR TO GET YOU FAR + {"l6idkjnlg1k6562jj1g1k6", 0, VOLATILE_FLAG_95_SANDCASTLE_INFINTE_MUMBO_TOKENS + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // DONT BE A DUMBO GO SEE MUMBO + {"54ajdmjkjn9b6d26cn49", 0, VOLATILE_FLAG_96_SANDCASTLE_INFINITE_AIR + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // GIVE THE BEAR LOTS OF AIR + NULL }; -u8 D_8038CC78 = 0; -IdRange bannedCheatCodesIdRanges[] = { - {0x7A, 0x7F}, - {0x80, 0x86}, - {0x91, 0xA7}, - 0 +static u8 sLastFloorTileHitCorret = 0; // 0 = "initial", 1 = incorrect, 2 = correct +static BannedCheatCodeRange sBannedCheatCodeRanges[4] = { + {VOLATILE_FLAG_66_SANDCASTLE_OPEN_DOOR_TWO + VOLATILE_FLAG_CHEAT_OFFSET, VOLATILE_FLAG_6B_SANDCASTLE_OPEN_DOOR_SEVEN + VOLATILE_FLAG_CHEAT_OFFSET}, + {VOLATILE_FLAG_6C_SANDCASTLE_PUZZLE_COMPLETE_CC + VOLATILE_FLAG_CHEAT_OFFSET, VOLATILE_FLAG_72_SANDCASTLE_PUZZLE_COMPLETE_CCC + VOLATILE_FLAG_CHEAT_OFFSET}, + {VOLATILE_FLAG_7D_SANDCASTLE_RAISE_PIPES_TO_CC + VOLATILE_FLAG_CHEAT_OFFSET, VOLATILE_FLAG_93_SANDCASTLE_OPEN_CCW + VOLATILE_FLAG_CHEAT_OFFSET}, + NULL }; -void func_8038B564(s32 secretCodeIndex, s32 codeId, enum map_e map_id, s32 arg3, s32 arg4){ - if(codeId == secretCodesTable[secretCodeIndex].id){ +// shows the unlocked stop n swap item in a cutscene, arg3/arg4 might describe state / camera angle or something +static void __code3E30_showUnlockedSnSCode(s32 secret_cheat_code_index, s32 codeId, enum map_e map_id, s32 arg3, s32 arg4) +{ + if (codeId == sSecretsCheatCodes[secret_cheat_code_index].id) + { func_802D6310(1.0f, map_id, arg3, arg4, 0); } } -void func_8038B5B4(void) { - struct_ttc_3E30_4_s *i_ptr; +static void __code3E30_resetSecretCheatCodeProgress(void) +{ + SecretCheatCode *i_ptr; - for(i_ptr = &secretCodesTable[0]; i_ptr->code != NULL; i_ptr++){ - i_ptr->unk4 = 0; + for (i_ptr = &sSecretsCheatCodes[0]; i_ptr->code != NULL; i_ptr++) + { + i_ptr->codeCharacterIdx = 0; } - D_8038CC78 = 0; - func_8038AB44(); + sLastFloorTileHitCorret = 0; + __code3E30_setsecretCheatCodeRelatedValue(); } -u32 func_8038B600(void) { - s32 addr = (s32)&secretCodesTable; +static u32 __code3E30_scrambleAddressForSecretCheatCode() +{ + s32 addr = (s32)&sSecretsCheatCodes; s32 scrambled; - struct_ttc_3E30_4_s * i_ptr; + SecretCheatCode *i_ptr; u32 var_a3; u32 var_v0; @@ -596,15 +745,18 @@ u32 func_8038B600(void) { scrambled += (addr & 0xFF) << 8; scrambled = addr ^ scrambled; - addr = (((scrambled & 0xFF000000) >> 8) + ((scrambled << 8) & 0xFF00)) ^ scrambled; + addr = (((scrambled & 0xFF000000) >> 8) + ((scrambled << 8) & 0xFF00)) ^ scrambled; - i_ptr = (struct_ttc_3E30_4_s *)addr; + i_ptr = (SecretCheatCode *)addr; var_a3 = 0x03148C41; - while(i_ptr->code != NULL){ - for(var_v0 = 0; var_v0 < i_ptr->unk4; var_v0++){ + while (i_ptr->code != NULL) + { + for (var_v0 = 0; var_v0 < i_ptr->codeCharacterIdx; var_v0++) + { var_a3 = ((i_ptr->code[var_v0] ^ var_a3) << 5) + (var_a3 >> 0x18); } - for(var_v0 = var_v0; i_ptr->code[var_v0] != 0; var_v0++){ + for (var_v0 = var_v0; i_ptr->code[var_v0] != 0; var_v0++) + { var_a3 = (i_ptr->code[var_v0] << (var_v0 & 0xF)) ^ (var_a3 + 0xD); } i_ptr++; @@ -612,193 +764,311 @@ u32 func_8038B600(void) { return var_a3; } -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) && volatileFlag_get(arg2)) - || arg0 == 3 - ){ +static void __code3E30_setFileProgressForSecretCheatCode( + s32 always_0, + s32 secret_cheat_code_index, + enum volatile_flags_e volatile_flag, + enum file_progress_e prog_id, + s32 prog_val, + s32 prog_bit_size, + enum file_progress_e file_progress_to_mark_true +) +{ + if ( + ((volatile_flag + VOLATILE_FLAG_CHEAT_OFFSET == sSecretsCheatCodes[secret_cheat_code_index].id) && volatileFlag_get(volatile_flag)) + // This can never be true as always_0 is always 0 + || always_0 == 3 + ) { fileProgressFlag_setN(prog_id, prog_val, prog_bit_size); - if(arg6){ - fileProgressFlag_set(arg6, TRUE); + if (file_progress_to_mark_true) + { + fileProgressFlag_set(file_progress_to_mark_true, TRUE); } } } -void __sandcastleCodes_setNumberEntered(s32 arg0){ +static void __code3E30_setNumberOfBannedCheatcodesEntered(s32 arg0) +{ fileProgressFlag_setN(FILEPROG_FD_BANNED_CHEATCODES_ENTERED, arg0, 2); } -s32 __sandcastleCodes_getNumberEntered(void){ +static s32 __code3E30_getNumberOfBannedCheatCodesEntered() +{ return fileProgressFlag_getN(FILEPROG_FD_BANNED_CHEATCODES_ENTERED, 2); } -void func_8038B79C(s32 arg0, s32 arg1, s32 arg2, enum item_e item_id, s32 item_diff, s32 item_val) { - if (((arg2 + 0x14) == secretCodesTable[arg1].id) || (arg0 == 1)) { - if (item_diff != 0) { - item_adjustByDiffWithHud(item_id, item_diff); +static void __code3E30_setItemForSecretCheatCode(s32 always_0, s32 secret_cheat_code_index, enum volatile_flags_e volatile_flag, enum item_e item_id, s32 always_0_2, s32 item_val) +{ + if (((volatile_flag + VOLATILE_FLAG_CHEAT_OFFSET) == sSecretsCheatCodes[secret_cheat_code_index].id) || (always_0 == 1)) + { + if (always_0_2 != 0) + { + item_adjustByDiffWithHud(item_id, always_0_2); return; } item_set(item_id, item_val); } } -void func_8038B800(s32 secretCodeIndex) { - struct_ttc_3E30_4_s *secretCode; +static void __code3E30_checkSecretCheatCodeIndex(s32 secret_cheat_code_index) +{ + SecretCheatCode *secret_cheat_code; enum volatile_flags_e volaflag_cheat_id; - secretCode = &secretCodesTable[secretCodeIndex]; - 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); - func_8038B564(secretCodeIndex, 3, MAP_2C_MMM_BATHROOM, 0x85, 0x1D); - func_8038B564(secretCodeIndex, 4, MAP_12_GV_GOBIS_VALLEY, 0x86, 0x1E); - func_8038B564(secretCodeIndex, 5, MAP_7_TTC_TREASURE_TROVE_COVE, 0x87, 0x1F); - func_8038B564(secretCodeIndex, 6, MAP_1D_MMM_CELLAR, 0x88, 0x20); - func_8038B564(secretCodeIndex, 7, MAP_7F_FP_WOZZAS_CAVE, 0x89, 0x21); - if (secretCode->id >= 0x14) { + secret_cheat_code = &sSecretsCheatCodes[secret_cheat_code_index]; + volaflag_cheat_id = secret_cheat_code->id - VOLATILE_FLAG_CHEAT_OFFSET; + sns_set_item_and_update_payload(secret_cheat_code->id, 1, 1); + __code3E30_showUnlockedSnSCode(secret_cheat_code_index, 0x01, MAP_61_CCW_WINTER_NABNUTS_HOUSE, 0x83, 0x1B); + __code3E30_showUnlockedSnSCode(secret_cheat_code_index, 0x02, MAP_3F_RBB_CAPTAINS_CABIN, 0x84, 0x1C); + __code3E30_showUnlockedSnSCode(secret_cheat_code_index, 0x03, MAP_2C_MMM_BATHROOM, 0x85, 0x1D); + __code3E30_showUnlockedSnSCode(secret_cheat_code_index, 0x04, MAP_12_GV_GOBIS_VALLEY, 0x86, 0x1E); + __code3E30_showUnlockedSnSCode(secret_cheat_code_index, 0x05, MAP_7_TTC_TREASURE_TROVE_COVE, 0x87, 0x1F); + __code3E30_showUnlockedSnSCode(secret_cheat_code_index, 0x06, MAP_1D_MMM_CELLAR, 0x88, 0x20); + __code3E30_showUnlockedSnSCode(secret_cheat_code_index, 0x07, MAP_7F_FP_WOZZAS_CAVE, 0x89, 0x21); + if (secret_cheat_code->id >= VOLATILE_FLAG_CHEAT_OFFSET) + { func_8030E58C(SFX_2B_BULL_MOO_1, 1.5f); 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); - TTC_func_8038B6D4(0, secretCodeIndex, 0x6E, FILEPROG_66_FP_PUZZLE_PIECES_PLACED, 8, 4, FILEPROG_35_FP_OPEN); - TTC_func_8038B6D4(0, secretCodeIndex, 0x6F, FILEPROG_6A_GV_PUZZLE_PIECES_PLACED, 9, 4, FILEPROG_36_GV_OPEN); - TTC_func_8038B6D4(0, secretCodeIndex, 0x70, FILEPROG_6E_MMM_PUZZLE_PIECES_PLACED, 10, 4, FILEPROG_37_MMM_OPEN); - TTC_func_8038B6D4(0, secretCodeIndex, 0x71, FILEPROG_72_RBB_PUZZLE_PIECES_PLACED, 0xC, 4, FILEPROG_38_RBB_OPEN); - TTC_func_8038B6D4(0, secretCodeIndex, 0x72, FILEPROG_76_CCW_PUZZLE_PIECES_PLACED, 0xF, 4, FILEPROG_39_CCW_OPEN); - 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 (volaflag_cheat_id == VOLATILE_FLAG_81_SANDCASTLE_CCC_JIGGY_PODIUM) { + + __code3E30_setFileProgressForSecretCheatCode( + 0, + secret_cheat_code_index, + VOLATILE_FLAG_6C_SANDCASTLE_PUZZLE_COMPLETE_CC, + FILEPROG_60_CC_PUZZLE_PIECES_PLACED, + 5, + 3, + FILEPROG_33_CC_OPEN + ); + __code3E30_setFileProgressForSecretCheatCode( + 0, + secret_cheat_code_index, + VOLATILE_FLAG_6D_SANDCASTLE_PUZZLE_COMPLETE_BGS, + FILEPROG_63_BGS_PUZZLE_PIECES_PLACED, + 7, + 3, + FILEPROG_34_BGS_OPEN + ); + __code3E30_setFileProgressForSecretCheatCode( + 0, + secret_cheat_code_index, + VOLATILE_FLAG_6E_SANDCASTLE_PUZZLE_COMPLETE_FP, + FILEPROG_66_FP_PUZZLE_PIECES_PLACED, + 8, + 4, + FILEPROG_35_FP_OPEN + ); + __code3E30_setFileProgressForSecretCheatCode( + 0, + secret_cheat_code_index, + VOLATILE_FLAG_6F_SANDCASTLE_PUZZLE_COMPLETE_GV, + FILEPROG_6A_GV_PUZZLE_PIECES_PLACED, + 9, + 4, + FILEPROG_36_GV_OPEN + ); + __code3E30_setFileProgressForSecretCheatCode( + 0, + secret_cheat_code_index, + VOLATILE_FLAG_70_SANDCASTLE_PUZZLE_COMPLETE_MMM, + FILEPROG_6E_MMM_PUZZLE_PIECES_PLACED, + 10, + 4, + FILEPROG_37_MMM_OPEN + ); + __code3E30_setFileProgressForSecretCheatCode( + 0, + secret_cheat_code_index, + VOLATILE_FLAG_71_SANDCASTLE_PUZZLE_COMPLETE_RBB, + FILEPROG_72_RBB_PUZZLE_PIECES_PLACED, + 0xC, + 4, + FILEPROG_38_RBB_OPEN + ); + __code3E30_setFileProgressForSecretCheatCode( + 0, + secret_cheat_code_index, + VOLATILE_FLAG_72_SANDCASTLE_PUZZLE_COMPLETE_CCC, + FILEPROG_76_CCW_PUZZLE_PIECES_PLACED, + 0xF, + 4, + FILEPROG_39_CCW_OPEN + ); + __code3E30_setItemForSecretCheatCode(0, secret_cheat_code_index, VOLATILE_FLAG_94_SANDCASTLE_INFINITE_HEALTH, ITEM_15_HEALTH_TOTAL, 0, 8); + __code3E30_setItemForSecretCheatCode(0, secret_cheat_code_index, VOLATILE_FLAG_77_SANDCASTLE_SET_HEALTH_TO_MAX, ITEM_14_HEALTH, 0, item_getCount(ITEM_15_HEALTH_TOTAL)); + __code3E30_setItemForSecretCheatCode(0, secret_cheat_code_index, VOLATILE_FLAG_95_SANDCASTLE_INFINTE_MUMBO_TOKENS, ITEM_1C_MUMBO_TOKEN, 0, 99); + 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); } - func_8038B5B4(); + __code3E30_resetSecretCheatCodeProgress(); } -void __sandcastleCodes_eraseGameDialogCallback(ActorMarker *caller, enum asset_e text_id, s32 confirmed) { - if (confirmed == 1) { - __sandcastleCodes_setNumberEntered(3); - func_8038B800(D_8038CAD4); - gcdialog_showText(ASSET_FBF_TEXT_UNKNOWN, 0xC, NULL, NULL, NULL, NULL); +static void __code3E30_eraseGameplayDialogCallback(ActorMarker *caller, enum asset_e text_id, s32 confirmed) +{ + if (confirmed == 1) + { + __code3E30_setNumberOfBannedCheatcodesEntered(3); + __code3E30_checkSecretCheatCodeIndex(sThirdForbiddenSecretCheatCodeIndex); + gcdialog_showText(ASSET_FBF_TEXT_ERASED_SAVE, 0xC, NULL, NULL, NULL, NULL); gameFile_clear(func_802C5A30()); gameFile_8033CFD4(func_802C5A30()); func_802C5A3C(-1); return; } - func_8038B5B4(); + __code3E30_resetSecretCheatCodeProgress(); } -void TTC_func_8038BBA0(s32 secretCodeIndex) { +static void __code3E30_checkIfBannedCheatCodeEntered(s32 secret_cheat_code_index) +{ s32 i; - if ((s32) secretCodesTable[secretCodeIndex].id >= 0x14) { - if (volatileFlag_get(secretCodesTable[secretCodeIndex].id - 0x14)) { - func_8038B5B4(); + if ((s32)sSecretsCheatCodes[secret_cheat_code_index].id >= VOLATILE_FLAG_CHEAT_OFFSET) + { + if (volatileFlag_get(sSecretsCheatCodes[secret_cheat_code_index].id - VOLATILE_FLAG_CHEAT_OFFSET)) + { + __code3E30_resetSecretCheatCodeProgress(); return; } - for( i = 0; bannedCheatCodesIdRanges[i].minId != 0; i++){ - if ((secretCodesTable[secretCodeIndex].id >= bannedCheatCodesIdRanges[i].minId) && (bannedCheatCodesIdRanges[i].maxId >= secretCodesTable[secretCodeIndex].id)) { - switch (__sandcastleCodes_getNumberEntered()) { + for (i = 0; sBannedCheatCodeRanges[i].minId != 0; i++) + { + if ((sSecretsCheatCodes[secret_cheat_code_index].id >= sBannedCheatCodeRanges[i].minId) && (sBannedCheatCodeRanges[i].maxId >= sSecretsCheatCodes[secret_cheat_code_index].id)) + { + switch (__code3E30_getNumberOfBannedCheatCodesEntered()) + { case 0: - __sandcastleCodes_setNumberEntered(1); - func_8038B800(secretCodeIndex); - func_8038B5B4(); + __code3E30_setNumberOfBannedCheatcodesEntered(1); + __code3E30_checkSecretCheatCodeIndex(secret_cheat_code_index); + __code3E30_resetSecretCheatCodeProgress(); return; case 1: - __sandcastleCodes_setNumberEntered(2); - func_8038B800(secretCodeIndex); - func_8038B5B4(); - gcdialog_showText(ASSET_FBE_TEXT_UNKNOWN, 0xC, NULL, NULL, NULL, NULL); + __code3E30_setNumberOfBannedCheatcodesEntered(2); + __code3E30_checkSecretCheatCodeIndex(secret_cheat_code_index); + __code3E30_resetSecretCheatCodeProgress(); + gcdialog_showText(ASSET_FBE_TEXT_CHEATING_ERASE_SAVE_WARNING, 0xC, NULL, NULL, NULL, NULL); return; case 2: - D_8038CAD4 = secretCodeIndex; - gcdialog_showText(ASSET_E38_TEXT_UNKNOWN, 0xC, NULL, NULL, __sandcastleCodes_eraseGameDialogCallback, NULL); + sThirdForbiddenSecretCheatCodeIndex = secret_cheat_code_index; + gcdialog_showText(ASSET_E38_CHEATING_ERASE_SAVE_CONFIRMATION, 0xC, NULL, NULL, __code3E30_eraseGameplayDialogCallback, NULL); return; } return; } } } - func_8038B800(secretCodeIndex); - func_8038B5B4(); + __code3E30_checkSecretCheatCodeIndex(secret_cheat_code_index); + __code3E30_resetSecretCheatCodeProgress(); } -bool func_8038BD10(LetterFloorTile *arg0) { - struct_ttc_3E30_4_s *var_s0; - struct_ttc_3E30_4_s *var_v0; - s32 var_a2; - s32 secretCodeIndex; - s32 var_s2; +static bool __code3E30_isFloorTileValidForSecretCheatCode(LetterFloorTile *floor_tile) +{ + SecretCheatCode *var_s0; + SecretCheatCode *var_v0; + s32 matched_secret_cheat_codes; + s32 secret_cheat_code_index; + s32 matched_secret_cheat_code_2; s32 var_v1; - if ((D_8038CC78 == 2) || (__sandcastleCodes_getNumberEntered() == 3)) { - return 0; + if ((sLastFloorTileHitCorret == 2) || (__code3E30_getNumberOfBannedCheatCodesEntered() == 3)) + { + return FALSE; } - if (D_8038CC78 == 0) { - var_a2 = 0; - if (*(secretCodesTable[0].unk4 + secretCodesTable[0].code) == 0) { - for(var_v1 = 0; (secretCodesTable + var_v1)->code != NULL; var_v1++){ - if (arg0->letter == (secretCodesTable + var_v1)->code[(secretCodesTable + var_v1)->unk4]) { - (secretCodesTable + var_v1)->unk4++; - var_a2 += 1; + + if (sLastFloorTileHitCorret == 0) + { + matched_secret_cheat_codes = 0; + // has entered "CHEAT" and is now entering "actual" cheat code + if (*(sSecretsCheatCodes[0].codeCharacterIdx + sSecretsCheatCodes[0].code) == NULL) + { + // go through each secret cheat code + for (var_v1 = 0; (sSecretsCheatCodes + var_v1)->code != NULL; var_v1++) + { + // check whether the floor tile letter is the "expected" character in the current secret cheat code + if (floor_tile->letter == (sSecretsCheatCodes + var_v1)->code[(sSecretsCheatCodes + var_v1)->codeCharacterIdx]) + { + // advance character index + (sSecretsCheatCodes + var_v1)->codeCharacterIdx++; + matched_secret_cheat_codes += 1; } } - if (var_a2 != 0) { - D_8038CC78 = 1; - func_8038AB44(); - return 1; + // did the letter occur in any secret cheat code? + if (matched_secret_cheat_codes != 0) + { + sLastFloorTileHitCorret = 1; + __code3E30_setsecretCheatCodeRelatedValue(); + return TRUE; } - D_8038CC78 = 2; - func_8038AB44(); - return 0; + + sLastFloorTileHitCorret = 2; + __code3E30_setsecretCheatCodeRelatedValue(); + return FALSE; } - if (arg0->letter == secretCodesTable[0].code[secretCodesTable[0].unk4]) { + + // is entering "CHEAT"? + if (floor_tile->letter == sSecretsCheatCodes[0].code[sSecretsCheatCodes[0].codeCharacterIdx]) + { func_8030E58C(SFX_2B_BULL_MOO_1, randf2(0.6f, 0.7f)); - secretCodesTable[0].unk4++; - func_8038AB44(); - return 1; + sSecretsCheatCodes[0].codeCharacterIdx++; + __code3E30_setsecretCheatCodeRelatedValue(); + return TRUE; } - D_8038CC78 = 2; - func_8038AB44(); - return 0; + + sLastFloorTileHitCorret = 2; + __code3E30_setsecretCheatCodeRelatedValue(); + return FALSE; } - - func_8038AB44(); - if (D_8038CC78 == 1) { - var_s2 = 0; - for(secretCodeIndex = 1; (secretCodesTable + secretCodeIndex)->code != 0; secretCodeIndex++){ - if (((secretCodesTable + secretCodeIndex)->unk4 != 0) && (arg0->letter == (secretCodesTable + secretCodeIndex)->code[(secretCodesTable + secretCodeIndex)->unk4])) { - var_s2 += 1; - (secretCodesTable + secretCodeIndex)->unk4++; - func_8038AB44(); - if ((secretCodesTable + secretCodeIndex)->code[(secretCodesTable + secretCodeIndex)->unk4] == '\0') { - if ((secretCodesTable + secretCodeIndex)->id != 0) { - TTC_func_8038BBA0(secretCodeIndex); - } - return 1; + + __code3E30_setsecretCheatCodeRelatedValue(); + if (sLastFloorTileHitCorret == 1) + { + matched_secret_cheat_code_2 = 0; + // iterate over all secret cheat codes except the first one + for (secret_cheat_code_index = 1; (sSecretsCheatCodes + secret_cheat_code_index)->code != 0; secret_cheat_code_index++) + { + // is the letter expected at the current cheat codes character index + if ( + ((sSecretsCheatCodes + secret_cheat_code_index)->codeCharacterIdx != NULL) && + (floor_tile->letter == (sSecretsCheatCodes + secret_cheat_code_index)->code[(sSecretsCheatCodes + secret_cheat_code_index)->codeCharacterIdx]) + ) + { + matched_secret_cheat_code_2 += 1; + (sSecretsCheatCodes + secret_cheat_code_index)->codeCharacterIdx++; + __code3E30_setsecretCheatCodeRelatedValue(); + // check if "next" expected character is zero-terminator, if true then cheat entered successfully + if ((sSecretsCheatCodes + secret_cheat_code_index)->code[(sSecretsCheatCodes + secret_cheat_code_index)->codeCharacterIdx] == '\0') + { + if ((sSecretsCheatCodes + secret_cheat_code_index)->id != NULL) + { + __code3E30_checkIfBannedCheatCodeEntered(secret_cheat_code_index); } + return TRUE; } - else{ - (secretCodesTable + secretCodeIndex)->unk4 = 0U; - func_8038AB44(); - } + } + else + { + // reset progress for current secret cheat code + (sSecretsCheatCodes + secret_cheat_code_index)->codeCharacterIdx = 0; + __code3E30_setsecretCheatCodeRelatedValue(); + } } - if (var_s2 == 0) { - D_8038CC78 = 2; - return 0; + if (matched_secret_cheat_code_2 == 0) + { + sLastFloorTileHitCorret = 2; + return FALSE; } - } - return 1; + + return TRUE; } -bool func_8038BF68(void){ - return *(u8*)(secretCodesTable[0].unk4 + (s32)secretCodesTable[0].code) == 0; +static bool __code3E30_isCurrentSecretCheatCodeCharacter0() +{ + return *(u8 *)(sSecretsCheatCodes[0].codeCharacterIdx + (s32)sSecretsCheatCodes[0].code) == 0; } - -int ttc_func_8038BF8C(void){ - return func_8038B600() == D_8038C980; +bool code_3E30_isSecretCheatCodeRelatedValueEqualToScrambledAddressValue() +{ + return __code3E30_scrambleAddressForSecretCheatCode() == secretCheatCodeRelatedValue; } diff --git a/src/core2/ch/crab.c b/src/core2/ch/crab.c index 85be3490..b5d26f19 100644 --- a/src/core2/ch/crab.c +++ b/src/core2/ch/crab.c @@ -39,7 +39,7 @@ void __chCrab_802CB040(Actor *this) { void __chCrab_802CB078(Actor *this) { u32 temp_t9; - if ((this->modelCacheIndex != ACTOR_F2_BLACK_SNIPPET) || func_8038B550()) { + if ((this->modelCacheIndex != ACTOR_F2_BLACK_SNIPPET) || code3E30_hasBanjoKazooieCodeBeenEntered()) { temp_t9 = (u32) this->unk38_31 >> 0x16; if (this->unk38_31 != 0) { this->unk38_31--; @@ -159,7 +159,7 @@ bool __chCrab_802CB76C(ActorMarker *marker, ActorMarker *other) { Actor *this; this = marker_getActor(marker); - if ((this->modelCacheIndex == ACTOR_F2_BLACK_SNIPPET) && !func_8038B550()) { + if ((this->modelCacheIndex == ACTOR_F2_BLACK_SNIPPET) && !code3E30_hasBanjoKazooieCodeBeenEntered()) { return FALSE; } return TRUE; diff --git a/src/core2/ch/gameSelect.c b/src/core2/ch/gameSelect.c index ed243191..20fa103a 100644 --- a/src/core2/ch/gameSelect.c +++ b/src/core2/ch/gameSelect.c @@ -83,7 +83,7 @@ s32 mm_hut_smash_count; u32 CH_TREASUREHUNT_PUZZLE_CURRENT_STEP; struct FF_StorageStruct* D_8037DCB8; s32 D_8037DCBC; -u8 D_8037DCC0[7]; +u8 D_8037DCC0[7]; // bottle bonus puzzle? u8 D_8037DCC7; u8 D_8037DCC8; u8 D_8037DCC9; diff --git a/src/core2/code_73640.c b/src/core2/code_73640.c index 3007fc3b..ca6382e7 100644 --- a/src/core2/code_73640.c +++ b/src/core2/code_73640.c @@ -89,7 +89,7 @@ ItemPrint D_803692F8[0x2C] = { /* .bss */ s32 D_803810B0; f32 itemPrintValues[0x2C]; //item_print_value -s32 D_80381168[0x2C]; //comusic_e +s32 D_80381168[0x2C]; // item_e => comusic_e f32 D_80381218[0x2C]; //item_sfx_volume??? s32 D_803812C8[0x2C]; //comusic_e s32 D_80381378[0x2C]; //sfx_e diff --git a/src/core2/code_9B990.c b/src/core2/code_9B990.c index 6e816522..829d6130 100644 --- a/src/core2/code_9B990.c +++ b/src/core2/code_9B990.c @@ -208,15 +208,15 @@ void func_80322B3C(s32 arg0, s32 arg1){ return; } void __overlay_ttc_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx){ return; } void __overlay_ttc_release(void){ - func_8038B04C(); + code3E30_overlayRelease(); } void overlay_ttc_init(void){ - func_8038B094(); + code3E30_overlayInit(); } void __overlay_ttc_update(void){ - func_8038B2F0(); + code3E30_overlayUpdate(); } void func_80322BB8(s32 arg0, s32 arg1){ return; } diff --git a/src/core2/code_AD5B0.c b/src/core2/code_AD5B0.c index 619dc3e0..0f4a839a 100644 --- a/src/core2/code_AD5B0.c +++ b/src/core2/code_AD5B0.c @@ -321,7 +321,7 @@ s32 func_80334ECC(void) { phi_v1 = 0x1F; } if (((phi_v1 & phi_v0) == 3) && (overlayManagergetLoadedId() == OVERLAY_5_BEACH)) { - if ((ttc_func_8038BF8C() == 0) || (D_80370250 != 0)) { + if ((code_3E30_isSecretCheatCodeRelatedValueEqualToScrambledAddressValue() == FALSE) || (D_80370250 != 0)) { D_80370250 = (u8)1; for (phi_v0 = 0; phi_v0 != 0x8F0D180; phi_v0++){ } diff --git a/src/core2/code_CF3E0.c b/src/core2/code_CF3E0.c index af97ebf8..c1058b26 100644 --- a/src/core2/code_CF3E0.c +++ b/src/core2/code_CF3E0.c @@ -123,12 +123,12 @@ void volatileFlag_setAndTriggerDialog_0(s32 arg0) { volatileFlag_setAndTriggerDialog(arg0, 0); } -// called for FFQ dialogs +// called for FFQ dialogs, gruntilda speaking? void volatileFlag_setAndTriggerDialog_4(s32 arg0) { volatileFlag_setAndTriggerDialog(arg0, 4); } -// called for WISHYWASHYBANJO dialog +// called for WISHYWASHYBANJO dialog, mumbo jumbo speaking? void volatileFlag_setAndTriggerDialog_E(s32 arg0) { volatileFlag_setAndTriggerDialog(arg0, 0xE); } diff --git a/src/core2/gc/dialog.c b/src/core2/gc/dialog.c index 858888ea..b83854fe 100644 --- a/src/core2/gc/dialog.c +++ b/src/core2/gc/dialog.c @@ -942,6 +942,11 @@ int func_80311174(s32 text_id, s32 arg1, f32 *pos, ActorMarker *marker, void(*ca return 0; } +// arg1 = "person" that says text? +// 0xC = Bottles +// 0xE = Jumbo? +// 0x4 = Gruntilda? +// 0xF = Mr Vile? bool gcdialog_showText(s32 text_id, s32 arg1, f32 *pos, ActorMarker *marker, void(*callback)(ActorMarker *, enum asset_e, s32), void(*arg5)(ActorMarker *, enum asset_e, s32)){ return func_80311174(text_id, arg1, pos, marker, callback, arg5, 0); } From de24d9230d307f0ee1127c35ad334ee79b37853c Mon Sep 17 00:00:00 2001 From: Owlenuff Date: Wed, 2 Oct 2024 09:35:58 +0200 Subject: [PATCH 02/15] Document map Spiral Mountain --- include/enums.h | 22 +++++++++++++-- src/SM/ch/attacktutorial.c | 31 ++++++++++++--------- src/SM/ch/vegetables.c | 15 +++++----- src/SM/code_2990.c | 56 +++++++++++++++++++------------------- src/SM/code_4070.c | 26 +++++++++--------- src/SM/code_44D0.c | 10 +++---- 6 files changed, 91 insertions(+), 69 deletions(-) diff --git a/include/enums.h b/include/enums.h index 8fc7aabc..cd25fbab 100644 --- a/include/enums.h +++ b/include/enums.h @@ -2439,6 +2439,25 @@ enum bs_e BS_A5_WONDERWING_UNKA5 }; +enum sm_specific_flags { + SM_SPECIFIC_FLAG_1 = 0x1, + SM_SPECIFIC_FLAG_2, + SM_SPECIFIC_FLAG_3, + SM_SPECIFIC_FLAG_4, + SM_SPECIFIC_FLAG_5, + + SM_SPECIFIC_FLAG_7 = 0x7, + SM_SPECIFIC_FLAG_8, + SM_SPECIFIC_FLAG_9, + SM_SPECIFIC_FLAG_A, + + SM_SPECIFIC_FLAG_C = 0xC, + + SM_SPECIFIC_FLAG_E = 0xE, + SM_SPECIFIC_FLAG_F, + SM_SPECIFIC_FLAG_10 +}; + enum mm_specific_flags { MM_SPECIFIC_FLAG_0_CHIMPY_STUMP_RAISED, MM_SPECIFIC_FLAG_1_ORANGE_HAS_BEEN_COLLECTED, @@ -2487,11 +2506,10 @@ enum item_e ITEM_6_HOURGLASS, ITEM_7_SKULL_HOURGLASS, - ITEM_9_PROPELLOR = 0x9, ITEM_B_XMAS_TREE = 0xb, - ITEM_C_NOTE = 0xC, + ITEM_C_NOTE, ITEM_D_EGGS, ITEM_E_JIGGY, ITEM_F_RED_FEATHER, diff --git a/src/SM/ch/attacktutorial.c b/src/SM/ch/attacktutorial.c index da5f106f..086f45b2 100644 --- a/src/SM/ch/attacktutorial.c +++ b/src/SM/ch/attacktutorial.c @@ -85,12 +85,13 @@ void chAttackTutorial_setState(Actor * this, s32 arg1){ SM_func_803871FC(this, ++this->unk10_12); break; case 3://L8038742C - mapSpecificFlags_set(5,1); - mapSpecificFlags_set(0xC, 1); + mapSpecificFlags_set(SM_SPECIFIC_FLAG_5, TRUE); + mapSpecificFlags_set(SM_SPECIFIC_FLAG_C, TRUE); marker_despawn(this->marker); break; + case 4://L80387454 - mapSpecificFlags_set(0xC, 1); + mapSpecificFlags_set(SM_SPECIFIC_FLAG_C, TRUE); if(!honeycombscore_get(HONEYCOMB_17_SM_COLIWOBBLE)){ this->unk10_12 = 3; this->unk38_31 = 1; @@ -129,18 +130,22 @@ void chAttackTutorial_update(Actor *this){ switch(this->state){ case 1://L80387610 - if(mapSpecificFlags_get(4)) + if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_4)) { chAttackTutorial_setState(this, 5); - - if(func_803874C4() || volatileFlag_get(VOLATILE_FLAG_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 - if(mapSpecificFlags_get(7)){ - func_80387764(this->marker); - mapSpecificFlags_set(7,0); } break; + + case 2://L80387658 + if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_7)) { + func_80387764(this->marker); + mapSpecificFlags_set(SM_SPECIFIC_FLAG_7, FALSE); + } + break; + case 5://L80387680 break; }////L80387680 @@ -206,8 +211,8 @@ void func_80387764(ActorMarker * marker){ func_8028F94C(2, actor->unk1C); } //L80387848 - if (!mapSpecificFlags_get(3) && chmole_learnedAllSpiralMountainAbilities() && temp_a2) { - mapSpecificFlags_set(3, 1); + if (!mapSpecificFlags_get(SM_SPECIFIC_FLAG_3) && chmole_learnedAllSpiralMountainAbilities() && temp_a2) { + mapSpecificFlags_set(SM_SPECIFIC_FLAG_3, TRUE); sp34 = ASSET_E12_TEXT_BOTTLES_LEARNED_TUTORIAL_MOVES; }//L80387898 diff --git a/src/SM/ch/vegetables.c b/src/SM/ch/vegetables.c index 46a38f4d..f94ddc32 100644 --- a/src/SM/ch/vegetables.c +++ b/src/SM/ch/vegetables.c @@ -206,8 +206,7 @@ void func_80387C28(Actor * this){ func_802CA1CC(HONEYCOMB_17_SM_COLIWOBBLE); __spawnQueue_add_4((GenFunction_4) spawnQueue_bundle_f32, BUNDLE_1F_SM_EMPTY_HONEYCOMB, reinterpret_cast(s32, this->position_x), reinterpret_cast(s32, this->position_y), reinterpret_cast(s32, this->position_z)); }//L80387D64 - - timed_mapSpecificFlags_setTrue(1.5f, 7); + timed_mapSpecificFlags_setTrue(1.5f, SM_SPECIFIC_FLAG_7); actor_collisionOff(this); if(local->unkC != 3){ subaddie_set_state_with_direction(this, 3, 0.0f, 1); @@ -248,7 +247,7 @@ void func_80387E64(Actor *this){ void func_80387F00(Actor *this){ ChVeg *local = (ChVeg *)&this->local; - this->position_y += (mapSpecificFlags_get(0xC) || volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)) ? 120.0 : 180.0; + this->position_y += (mapSpecificFlags_get(SM_SPECIFIC_FLAG_C) || 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; @@ -331,9 +330,9 @@ void func_80388080(Actor *this){ switch (this->state) { case 1: //L803882B0 - if(mapSpecificFlags_get(0xC) || volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) || this->unk10_12){ + if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_C) || volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) || this->unk10_12){ //L803882E4 - if(mapSpecificFlags_get(0xC) || volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)){ //L8038830C + if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_C) || 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; @@ -374,7 +373,7 @@ void func_80388080(Actor *this){ }else{//L80388520 if(local->unkC == 1){ this->actor_specific_1_f = 3.0f; - if(mapSpecificFlags_get(0xC) || volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)){//L80388554 + if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_C) || 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; @@ -398,7 +397,7 @@ void func_80388080(Actor *this){ func_80328CEC(this, (s32)this->yaw, 0x78, 0xB4); this->unk38_0 = 1; }//L80388698 - if(mapSpecificFlags_get(0xC) || (volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) && func_803292E0(this))){ + if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_C) || (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){ @@ -429,7 +428,7 @@ void func_80388080(Actor *this){ func_80387E64(this); } this->actor_specific_1_f = 5.0f; - if(mapSpecificFlags_get(0xC) || (volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE))){ //L8038892C + if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_C) || (volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE))){ //L8038892C if(!func_80387FA8(this, local, (s32)this->yaw, (s32)this->actor_specific_1_f)){ 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 940eaf46..45d0d341 100644 --- a/src/SM/code_2990.c +++ b/src/SM/code_2990.c @@ -101,7 +101,7 @@ void chsmmole_skipIntroTutorial(void){ ability_unlock(ABILITY_8_FLAP_FLIP); ability_unlock(ABILITY_5_CLIMB); chsmmole_setSpiralMountainAbilitiesAsUsed(); - mapSpecificFlags_set(3,1); + mapSpecificFlags_set(SM_SPECIFIC_FLAG_3, TRUE); } /** * @brief If the player is talking to Intro Bottles for the first time, use the @@ -109,7 +109,7 @@ void chsmmole_skipIntroTutorial(void){ */ void chsmmole_setSpiralMountainStaticCamera(Actor *this){ - if(this->unkF4_8 == 1 && !mapSpecificFlags_get(1)){ + if(this->unkF4_8 == 1 && !mapSpecificFlags_get(SM_SPECIFIC_FLAG_1)){ timed_setStaticCameraToNode(0.0f, 0x12); } else{ //L80388F68 @@ -193,7 +193,7 @@ static void __chsmmole_additionalAbilityLearnActions(ActorMarker *marker, enum a timed_setStaticCameraToNode(0.0f, 2); break; case 4: - mapSpecificFlags_set(4,1); + mapSpecificFlags_set(SM_SPECIFIC_FLAG_4, TRUE); break; case 5: timed_setStaticCameraToNode(0.0f, 0x12); @@ -211,8 +211,8 @@ void func_803892C8(ActorMarker *marker, enum asset_e text_id, s32 arg2){ Actor *actor; actor = marker_getActor(marker); - if(!mapSpecificFlags_get(3) && chmole_learnedAllSpiralMountainAbilities()){ - mapSpecificFlags_set(3, 1); + if(!mapSpecificFlags_get(SM_SPECIFIC_FLAG_3) && chmole_learnedAllSpiralMountainAbilities()){ + mapSpecificFlags_set(SM_SPECIFIC_FLAG_3, TRUE); gcdialog_showText(ASSET_E12_TEXT_BOTTLES_LEARNED_TUTORIAL_MOVES, 0xe, actor->position, actor->marker, func_803892C8, NULL); }//L8038933C else{ @@ -290,7 +290,7 @@ void chsmmole_80389610(Actor * this){ switch(this->unkF4_8){ case 1://L8038965C - if(mapSpecificFlags_get(1)){ + if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_1)){ sp28 |= 1; if(fileProgressFlag_get(FILEPROG_DB_SKIPPED_TUTORIAL)){ sp2C = D_8038AFE4 + 0xE0A; //dialog index @@ -302,34 +302,34 @@ void chsmmole_80389610(Actor * this){ } else{//L803896E8 sp2C = smMoleTable[this->unkF4_8 -1].learn_text; - mapSpecificFlags_set(1,1); + mapSpecificFlags_set(SM_SPECIFIC_FLAG_1, TRUE); } break; case 8://L80389720 - if(mapSpecificFlags_get(3)){ + if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_3)){ if(fileProgressFlag_get(FILEPROG_A6_FURNACE_FUN_COMPLETE)){ sp2C = ASSET_E37_TEXT_BOTTLES_STOP_WASTING_TIME_AFTER_FURNACE_FUN; sp28 |= 1; }else{//L80389758 - if(mapSpecificFlags_get(0xf)){ + if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_F)){ sp2C = ASSET_E0F_TEXT_BOTTLES_STOP_WASTING_TIME_BEFORE_FURNACE_FUN; sp28 |= 1; }else{//L80389780 chsmmole_setSpiralMountainAbilitiesAsUsed(); sp2C = fileProgressFlag_get(FILEPROG_DB_SKIPPED_TUTORIAL) ? 0xe1e : 0xe13; - mapSpecificFlags_set(0xf, 1); + mapSpecificFlags_set(SM_SPECIFIC_FLAG_F, TRUE); } } //L803897B4 - mapSpecificFlags_set(2, 1); + mapSpecificFlags_set(SM_SPECIFIC_FLAG_2, TRUE); } else{//L803897C8 - if(mapSpecificFlags_get(2)){ + if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_2)){ sp2C = smMoleTable[this->unkF4_8 -1].refresher_text; sp28 |= 1; } else{ sp2C = smMoleTable[this->unkF4_8 -1].learn_text; - mapSpecificFlags_set(2, 1); + mapSpecificFlags_set(SM_SPECIFIC_FLAG_2, TRUE); } } @@ -340,7 +340,7 @@ void chsmmole_80389610(Actor * this){ || !ability_isUnlocked(ABILITY_C_ROLL) || !ability_isUnlocked(ABILITY_B_RATATAT_RAP) ){//L803898D4 - mapSpecificFlags_set(4, 1); + mapSpecificFlags_set(SM_SPECIFIC_FLAG_4, TRUE); } else{//L803898E4 chsmmole_learnAbility(this, &sp2C, &sp28); @@ -352,7 +352,7 @@ void chsmmole_80389610(Actor * this){ || !ability_isUnlocked(ABILITY_7_FEATHERY_FLAP) || !ability_isUnlocked(ABILITY_8_FLAP_FLIP) ){//L803898D4 - mapSpecificFlags_set(0xE, 1); + mapSpecificFlags_set(SM_SPECIFIC_FLAG_E, TRUE); } else{//L803898E4 chsmmole_learnAbility(this, &sp2C, &sp28); @@ -426,13 +426,13 @@ void chsmmole_Update(Actor * this){ } }//L80389AC8 if(chsmmole_learnedAnySpiralMountainAbilities()){ - mapSpecificFlags_set(1,1); + mapSpecificFlags_set(SM_SPECIFIC_FLAG_1, TRUE); if(chmole_learnedAllSpiralMountainAbilities()){ - mapSpecificFlags_set(3, 1); - mapSpecificFlags_set(2, 1); - mapSpecificFlags_set(0xC, 1); - mapSpecificFlags_set(0xF, 1); + mapSpecificFlags_set(SM_SPECIFIC_FLAG_3, TRUE); + mapSpecificFlags_set(SM_SPECIFIC_FLAG_2, TRUE); + mapSpecificFlags_set(SM_SPECIFIC_FLAG_C, TRUE); + mapSpecificFlags_set(SM_SPECIFIC_FLAG_F, TRUE); } } }//L80389B20 @@ -453,13 +453,13 @@ void chsmmole_Update(Actor * this){ case 1://L80389BAC this->yaw_ideal = (f32)func_80329784(this); func_80328FB0(this, 4.0f); - if( (this->unkF4_8 == 1 && !mapSpecificFlags_get(1)) - || (this->unkF4_8 == 8 && !mapSpecificFlags_get(2)) - || (this->unkF4_8 == 8 && mapSpecificFlags_get(3) && !mapSpecificFlags_get(0xF)) + if( (this->unkF4_8 == 1 && !mapSpecificFlags_get(SM_SPECIFIC_FLAG_1)) + || (this->unkF4_8 == 8 && !mapSpecificFlags_get(SM_SPECIFIC_FLAG_2)) + || (this->unkF4_8 == 8 && mapSpecificFlags_get(SM_SPECIFIC_FLAG_3) && !mapSpecificFlags_get(SM_SPECIFIC_FLAG_F)) ){//L80389C50 if( ((ml_distance_vec3f(sp44, this->unk1C) < this->actor_specific_1_f) && func_8028F20C()) - || mapSpecificFlags_get(0x10) + || mapSpecificFlags_get(SM_SPECIFIC_FLAG_10) ){//L80389C8C if(func_80329530(this, 0x96)) func_8028F45C(9, this->position); @@ -506,7 +506,7 @@ void chsmmole_Update(Actor * this){ func_8030E2C4(this->unk44_31); }//L80389EA0 if(actor_animationIsAt(this, 0.9999f)){ - if(!mapSpecificFlags_get(1)){ + if(!mapSpecificFlags_get(SM_SPECIFIC_FLAG_1)){ chsmmole_80389610(this); } func_80388FA0(this, 3); @@ -519,7 +519,7 @@ void chsmmole_Update(Actor * this){ FUNC_8030E8B4(SFX_C5_TWINKLY_POP, 1.0f, 32000, this->position, 1250, 2500); }else if(actor_animationIsAt(this, 0.35f)){//L80389F78 - if(mapSpecificFlags_get(1)){ + if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_1)){ chsmmole_80389610(this); } } @@ -551,8 +551,8 @@ void chsmmole_Update(Actor * this){ func_8030E878(SFX_6F_BANJO_HEADSCRATCH, randf2(1.35f, 1.5f), 6000, this->position, 1250.0f, 2500.0f); }//L8038A194 - if(mapSpecificFlags_get(5)){ - mapSpecificFlags_set(5,0); + if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_5)){ + mapSpecificFlags_set(SM_SPECIFIC_FLAG_5, FALSE); func_80388FA0(this, 4); }//L8038A1B8 user_input = -1; diff --git a/src/SM/code_4070.c b/src/SM/code_4070.c index 8627496c..b021c381 100644 --- a/src/SM/code_4070.c +++ b/src/SM/code_4070.c @@ -37,19 +37,19 @@ void func_8038A4DC(Actor *this, s32 arg1){ player_getPosition(this->velocity); func_8028F918(0); if(ability_isUnlocked(ABILITY_7_FEATHERY_FLAP)){ - mapSpecificFlags_set(9,1); + mapSpecificFlags_set(SM_SPECIFIC_FLAG_9, TRUE); }else if(ability_isUnlocked(ABILITY_A_HOLD_A_JUMP_HIGHER)){//L8038A540 - mapSpecificFlags_set(8,1); + mapSpecificFlags_set(SM_SPECIFIC_FLAG_8, TRUE); }else{//L8038A560 func_8038A460(this); ability_unlock(ABILITY_A_HOLD_A_JUMP_HIGHER); gcdialog_showText(0xdf6, 0xe, this->unk1C, this->marker, func_8038A488, NULL); this->sm_4070.unk0 = 0xe1a; - mapSpecificFlags_set(8, 0); + mapSpecificFlags_set(SM_SPECIFIC_FLAG_8, FALSE); } break; case 3://L8038A5B0 - mapSpecificFlags_set(5, 1); + mapSpecificFlags_set(SM_SPECIFIC_FLAG_5, TRUE); break; }//L8038A5BC subaddie_set_state(this, arg1); @@ -84,7 +84,7 @@ void SM_func_8038A5D8(Actor *this){ if(fileProgressFlag_get(FILEPROG_DB_SKIPPED_TUTORIAL)){ marker_despawn(this->marker); }else{ - if(mapSpecificFlags_get(0xe)){ + if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_E)){ func_8038A4DC(this, 2); } } @@ -92,35 +92,35 @@ void SM_func_8038A5D8(Actor *this){ case 2://L8038A6C8 if(!func_803114B0()){ - if(mapSpecificFlags_get(8)){ + if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_8)){ func_8038A460(this); ability_unlock(ABILITY_7_FEATHERY_FLAP); gcdialog_showText(0xdf7, 0xa, this->unk1C, this->marker, func_8038A488, NULL); this->sm_4070.unk0 = 0xe1b; - mapSpecificFlags_set(8,0); + mapSpecificFlags_set(SM_SPECIFIC_FLAG_8, FALSE); }//L8038A730 - if(mapSpecificFlags_get(9)){ + if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_9)){ func_8038A460(this); ability_unlock(ABILITY_8_FLAP_FLIP); gcdialog_showText(0xdf8, 0xa, this->unk1C, this->marker, func_8038A488, NULL); this->sm_4070.unk0 = 0xe1c; - mapSpecificFlags_set(9,0); + mapSpecificFlags_set(SM_SPECIFIC_FLAG_9, FALSE); }//L8038A794 - if(mapSpecificFlags_get(0xa)){ + if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_A)){ func_8038A460(this); func_8028F94C(2, this->unk1C); - if(!mapSpecificFlags_get(3) && chmole_learnedAllSpiralMountainAbilities()){ - mapSpecificFlags_set(3,1); + if(!mapSpecificFlags_get(SM_SPECIFIC_FLAG_3) && chmole_learnedAllSpiralMountainAbilities()){ + mapSpecificFlags_set(SM_SPECIFIC_FLAG_3, TRUE); temp_a0 = 0xe12; }else{ temp_a0 = 0xdf9; } gcdialog_showText(temp_a0, 0xe, this->unk1C, this->marker, func_8038A488, NULL); - mapSpecificFlags_set(0xa,0); + mapSpecificFlags_set(SM_SPECIFIC_FLAG_A, FALSE); this->sm_4070.unk0 = 0; } }//L8038A828 diff --git a/src/SM/code_44D0.c b/src/SM/code_44D0.c index 9607b6ba..56f94914 100644 --- a/src/SM/code_44D0.c +++ b/src/SM/code_44D0.c @@ -18,7 +18,7 @@ ActorInfo D_8038B0E0 = { 0x1F0, 0x3BD, 0, 0, NULL, /* .code */ void func_8038A8C0(ActorMarker *arg0){ - mapSpecificFlags_set(0x10, 0); + mapSpecificFlags_set(SM_SPECIFIC_FLAG_10, FALSE); func_8028E6EC(2); func_8028F918(0); } @@ -44,13 +44,13 @@ void func_8038A8F8(Actor *this){ if(sp2C < (f32) this->unkF4_8) func_80388D48(); - if( !mapSpecificFlags_get(0x10) && sp2C < (f32) this->unkF4_8 && 1780.0f < func_8028E82C()){ - if( !mapSpecificFlags_get(2) - || (mapSpecificFlags_get(3) && !mapSpecificFlags_get(0xf)) + if( !mapSpecificFlags_get(SM_SPECIFIC_FLAG_10) && sp2C < (f32) this->unkF4_8 && 1780.0f < func_8028E82C()){ + if( !mapSpecificFlags_get(SM_SPECIFIC_FLAG_2) + || (mapSpecificFlags_get(SM_SPECIFIC_FLAG_3) && !mapSpecificFlags_get(SM_SPECIFIC_FLAG_F)) ){ //L8038AA54 this->yaw_ideal = ml_distance_vec3f(this->velocity, this->unk1C) / 150.0; func_8028F3D8(this->unk1C, this->yaw_ideal, func_8038A8C0, this->marker); - mapSpecificFlags_set(0x10, 1); + mapSpecificFlags_set(SM_SPECIFIC_FLAG_10, TRUE); } } } From 82cc8de2067d0630c5a31d2ef3c703f8c1a2fcb2 Mon Sep 17 00:00:00 2001 From: Owlenuff Date: Wed, 2 Oct 2024 09:55:46 +0200 Subject: [PATCH 03/15] Document ch Bottles2 --- include/enums.h | 21 ++-- include/functions.h | 2 +- include/prop.h | 2 +- src/BGS/code_3420.c | 2 +- src/FP/ch/boggy2.c | 2 +- src/SM/ch/attacktutorial.c | 4 +- src/SM/code_2990.c | 14 +-- src/SM/code_4070.c | 228 ++++++++++++++++++++----------------- src/SM/code_44D0.c | 2 +- src/core1/code_10A00.c | 2 +- src/core2/ch/gameSelect.c | 2 +- src/core2/ch/mole.c | 2 +- src/core2/code_4A6F0.c | 2 +- src/core2/code_4C020.c | 2 +- src/core2/code_5C240.c | 2 +- src/core2/code_91E10.c | 2 +- src/core2/code_DC4B0.c | 2 +- src/core2/code_E410.c | 2 +- src/core2/gc/dialog.c | 2 +- src/core2/gc/pauseMenu.c | 2 +- src/core2/gc/zoombox.c | 4 +- src/lair/ch/brentilda.c | 2 +- src/lair/code_5ED0.c | 2 +- src/lair/code_86F0.c | 2 +- src/lair/code_9C40.c | 2 +- 25 files changed, 167 insertions(+), 144 deletions(-) diff --git a/include/enums.h b/include/enums.h index cd25fbab..39087412 100644 --- a/include/enums.h +++ b/include/enums.h @@ -2210,7 +2210,8 @@ enum actor_e ACTOR_3AF_GRUNTY_SHADOW = 0x3AF, - ACTOR_3BA_UNKOWN = 0x3ba, + ACTOR_3B9_UNKNOWN = 0x3B9, + ACTOR_3BA_UNKNOWN, ACTOR_3BF_GRUNTLING_BLUE = 0x3bf, ACTOR_3C0_GRUNTLING_BLACK, @@ -2442,13 +2443,13 @@ enum bs_e enum sm_specific_flags { SM_SPECIFIC_FLAG_1 = 0x1, SM_SPECIFIC_FLAG_2, - SM_SPECIFIC_FLAG_3, + SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED, SM_SPECIFIC_FLAG_4, SM_SPECIFIC_FLAG_5, SM_SPECIFIC_FLAG_7 = 0x7, - SM_SPECIFIC_FLAG_8, - SM_SPECIFIC_FLAG_9, + SM_SPECIFIC_FLAG_8_ABILITY_HOLD_A_JUMP_HIGHER_UNLOCKED, + SM_SPECIFIC_FLAG_9_ABILITY_FEATHERY_UNLOCKED, SM_SPECIFIC_FLAG_A, SM_SPECIFIC_FLAG_C = 0xC, @@ -4404,8 +4405,8 @@ enum asset_e ASSET_DF6_TEXT_BOTTLES_HIGH_JUMP_LEARN, ASSET_DF7_TEXT_BOTTLES_FEATHERY_FLAP_LEARN, ASSET_DF8_TEXT_BOTTLES_FLAP_FLIP_LEARN, - - ASSET_DFA_TEXT_BOTTLES_JUMP_REFRESHER = 0xDFA, + ASSET_DF9_TEXT_BOTTLES_UNKNOWN, + ASSET_DFA_TEXT_BOTTLES_JUMP_REFRESHER, ASSET_DFB_TEXT_BOTTLES_DIVE_LEARN, ASSET_DFC_TEXT_UNKNOWN, ASSET_DFD_TEXT_BOTTLES_SWIM_LEARN, @@ -4437,8 +4438,10 @@ enum asset_e ASSET_E17_TEXT_UNKNOWN, ASSET_E18_TEXT_UNKNOWN, ASSET_E19_TEXT_UNKNOWN, - - ASSET_E1D_TEXT_BOTTLES_TUTORIAL_OFFER_WAIT = 0xE1D, + ASSET_E1A_TEXT_BOTTLES_UNKNOWN, + ASSET_E1B_TEXT_BOTTLES_UNKNOWN, + ASSET_E1C_TEXT_BOTTLES_UNKNOWN, + ASSET_E1D_TEXT_BOTTLES_TUTORIAL_OFFER_WAIT, ASSET_E1F_TEXT_BOTTLES_TUTORIAL_OFFER = VER_SELECT(0xE1F, 0xa61, 0, 0), ASSET_E20_DIALOG_BOTTLES_BONUS_NOT_READY, @@ -4955,6 +4958,8 @@ enum marker_e{ MARKER_1E9_MUMBO_COST_SIGN, MARKER_1EA_GRUNTLING_RED, + MARKER_1ED_UNKNOWN = 0x1ED, + MARKER_1F1_GRUNTLING_BLACK = 0x1F1, MARKER_1F4_TOOTS = 0x1F4, diff --git a/include/functions.h b/include/functions.h index eca224a4..53d20c45 100644 --- a/include/functions.h +++ b/include/functions.h @@ -509,7 +509,7 @@ f32 climbGetBottomY(void); f32 climbGetTopY(void); void func_802596AC(f32 a0[3], f32 a1[3], f32 a2[3], f32 a3[3]); -void func_8024E55C(s32, s32 [6]); +void controller_copyFaceButtons(s32, s32 [6]); void __spawnQueue_add_1(GenFunction_1, s32); #define SPAWNQUEUE_ADD_1(method, arg0) __spawnQueue_add_1((GenFunction_1) (method), reinterpret_cast(s32, (arg0))) diff --git a/include/prop.h b/include/prop.h index 7d30e6da..fc5bcef2 100644 --- a/include/prop.h +++ b/include/prop.h @@ -146,7 +146,7 @@ typedef struct jinjo_s{ }ActorLocal_Jinjo; typedef struct ch_sm_4070{ - s32 unk0; + s32 dialog_id; }ActorLocal_SM_4070; typedef struct actor_s{ diff --git a/src/BGS/code_3420.c b/src/BGS/code_3420.c index 10a5510c..d8b1276e 100644 --- a/src/BGS/code_3420.c +++ b/src/BGS/code_3420.c @@ -658,7 +658,7 @@ void chvilegame_update(Actor *this) { } if (this->state == 5) { if (local->unkC == 7) { - func_8024E55C(0, sp30); + controller_copyFaceButtons(0, sp30); if ((sp30[FACE_BUTTON(BUTTON_B)] > 0) && func_8038C2A8(local->vile_marker)) { func_8038A068(this, 0xA); } diff --git a/src/FP/ch/boggy2.c b/src/FP/ch/boggy2.c index 765fb59d..e39ab5d4 100644 --- a/src/FP/ch/boggy2.c +++ b/src/FP/ch/boggy2.c @@ -403,7 +403,7 @@ void func_803896FC(Actor *this){ sp58 = func_8038BE20(this->position); sp54 = time_getDelta(); - func_8024E55C(0, sp3C); + controller_copyFaceButtons(0, sp3C); if(!this->volatile_initialized){ this->volatile_initialized = TRUE; diff --git a/src/SM/ch/attacktutorial.c b/src/SM/ch/attacktutorial.c index 086f45b2..e2b18388 100644 --- a/src/SM/ch/attacktutorial.c +++ b/src/SM/ch/attacktutorial.c @@ -211,8 +211,8 @@ void func_80387764(ActorMarker * marker){ func_8028F94C(2, actor->unk1C); } //L80387848 - if (!mapSpecificFlags_get(SM_SPECIFIC_FLAG_3) && chmole_learnedAllSpiralMountainAbilities() && temp_a2) { - mapSpecificFlags_set(SM_SPECIFIC_FLAG_3, TRUE); + if (!mapSpecificFlags_get(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED) && chmole_learnedAllSpiralMountainAbilities() && temp_a2) { + mapSpecificFlags_set(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED, TRUE); sp34 = ASSET_E12_TEXT_BOTTLES_LEARNED_TUTORIAL_MOVES; }//L80387898 diff --git a/src/SM/code_2990.c b/src/SM/code_2990.c index 45d0d341..ed951d2d 100644 --- a/src/SM/code_2990.c +++ b/src/SM/code_2990.c @@ -101,7 +101,7 @@ void chsmmole_skipIntroTutorial(void){ ability_unlock(ABILITY_8_FLAP_FLIP); ability_unlock(ABILITY_5_CLIMB); chsmmole_setSpiralMountainAbilitiesAsUsed(); - mapSpecificFlags_set(SM_SPECIFIC_FLAG_3, TRUE); + mapSpecificFlags_set(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED, TRUE); } /** * @brief If the player is talking to Intro Bottles for the first time, use the @@ -211,8 +211,8 @@ void func_803892C8(ActorMarker *marker, enum asset_e text_id, s32 arg2){ Actor *actor; actor = marker_getActor(marker); - if(!mapSpecificFlags_get(SM_SPECIFIC_FLAG_3) && chmole_learnedAllSpiralMountainAbilities()){ - mapSpecificFlags_set(SM_SPECIFIC_FLAG_3, TRUE); + if(!mapSpecificFlags_get(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED) && chmole_learnedAllSpiralMountainAbilities()){ + mapSpecificFlags_set(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED, TRUE); gcdialog_showText(ASSET_E12_TEXT_BOTTLES_LEARNED_TUTORIAL_MOVES, 0xe, actor->position, actor->marker, func_803892C8, NULL); }//L8038933C else{ @@ -306,7 +306,7 @@ void chsmmole_80389610(Actor * this){ } break; case 8://L80389720 - if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_3)){ + if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED)){ if(fileProgressFlag_get(FILEPROG_A6_FURNACE_FUN_COMPLETE)){ sp2C = ASSET_E37_TEXT_BOTTLES_STOP_WASTING_TIME_AFTER_FURNACE_FUN; sp28 |= 1; @@ -429,7 +429,7 @@ void chsmmole_Update(Actor * this){ mapSpecificFlags_set(SM_SPECIFIC_FLAG_1, TRUE); if(chmole_learnedAllSpiralMountainAbilities()){ - mapSpecificFlags_set(SM_SPECIFIC_FLAG_3, TRUE); + mapSpecificFlags_set(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED, TRUE); mapSpecificFlags_set(SM_SPECIFIC_FLAG_2, TRUE); mapSpecificFlags_set(SM_SPECIFIC_FLAG_C, TRUE); mapSpecificFlags_set(SM_SPECIFIC_FLAG_F, TRUE); @@ -446,7 +446,7 @@ void chsmmole_Update(Actor * this){ func_8028E668(this->position, 180.0f, -40.0f, 120.0f); }//L80389B64 - func_8024E55C(0,sp50); //get face buttons press counters + controller_copyFaceButtons(0,sp50); //get face buttons press counters player_getPosition(sp44); switch (this->state) { @@ -455,7 +455,7 @@ void chsmmole_Update(Actor * this){ func_80328FB0(this, 4.0f); if( (this->unkF4_8 == 1 && !mapSpecificFlags_get(SM_SPECIFIC_FLAG_1)) || (this->unkF4_8 == 8 && !mapSpecificFlags_get(SM_SPECIFIC_FLAG_2)) - || (this->unkF4_8 == 8 && mapSpecificFlags_get(SM_SPECIFIC_FLAG_3) && !mapSpecificFlags_get(SM_SPECIFIC_FLAG_F)) + || (this->unkF4_8 == 8 && mapSpecificFlags_get(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED) && !mapSpecificFlags_get(SM_SPECIFIC_FLAG_F)) ){//L80389C50 if( ((ml_distance_vec3f(sp44, this->unk1C) < this->actor_specific_1_f) && func_8028F20C()) diff --git a/src/SM/code_4070.c b/src/SM/code_4070.c index b021c381..e7de9f11 100644 --- a/src/SM/code_4070.c +++ b/src/SM/code_4070.c @@ -2,143 +2,161 @@ #include "functions.h" #include "variables.h" -//extern -Actor *func_802D94B4(ActorMarker *, Gfx **, Mtx **, Vtx**); +/* extern functions */ +Actor *func_802D94B4(ActorMarker *, Gfx **, Mtx **, Vtx **); void timed_exitStaticCamera(f32); -//public -void SM_func_8038A5D8(Actor *this); -void func_8038A4DC(Actor *this, s32 arg1); +/* public functions */ +void chBottles2_update(Actor *this); +void chBottles2_setState(Actor *this, s32 state); /* .data */ -ActorInfo D_8038B0B0 = { 0x1ED, 0x3B9, 0, 1, NULL, - SM_func_8038A5D8, actor_update_func_80326224, func_80325340, +enum chBottles2_state_e { + BOTTLES2_STATE_1_IDLE = 1, + BOTTLES2_STATE_2_TEACHING, + BOTTLES2_STATE_3_DISAPPEARED +}; + +ActorInfo D_8038B0B0 = { + MARKER_1ED_UNKNOWN, ACTOR_3B9_UNKNOWN, NULL, 1, NULL, + chBottles2_update, actor_update_func_80326224, func_80325340, 0, 0, 0.0f, 0 }; - /* .code */ -void func_8038A460(Actor *this){ - timed_setStaticCameraToNode(0.0f,4); +void __chBottles2_setStaticCameraToNode4(Actor *this) { + timed_setStaticCameraToNode(0.0f, 4); } -void func_8038A488(ActorMarker *caller, enum asset_e text_id, s32 arg2){ +void __chBottles2_textCallback(ActorMarker *caller, enum asset_e text_id, s32 arg2) { Actor *actor = marker_getActor(caller); - if(text_id == 0xdf9 || text_id == 0xe12){ - func_8038A4DC(actor, 3); + + if (text_id == ASSET_DF9_TEXT_BOTTLES_UNKNOWN || text_id == ASSET_E12_TEXT_BOTTLES_LEARNED_TUTORIAL_MOVES) { + chBottles2_setState(actor, BOTTLES2_STATE_3_DISAPPEARED); } + timed_exitStaticCamera(0.0f); } -void func_8038A4DC(Actor *this, s32 arg1){ - switch(arg1){ - case 2://L8038A50C - this->sm_4070.unk0 = 0; - player_getPosition(this->velocity); - func_8028F918(0); - if(ability_isUnlocked(ABILITY_7_FEATHERY_FLAP)){ - mapSpecificFlags_set(SM_SPECIFIC_FLAG_9, TRUE); - }else if(ability_isUnlocked(ABILITY_A_HOLD_A_JUMP_HIGHER)){//L8038A540 - mapSpecificFlags_set(SM_SPECIFIC_FLAG_8, TRUE); - }else{//L8038A560 - func_8038A460(this); - ability_unlock(ABILITY_A_HOLD_A_JUMP_HIGHER); - gcdialog_showText(0xdf6, 0xe, this->unk1C, this->marker, func_8038A488, NULL); - this->sm_4070.unk0 = 0xe1a; - mapSpecificFlags_set(SM_SPECIFIC_FLAG_8, FALSE); - } - break; - case 3://L8038A5B0 - mapSpecificFlags_set(SM_SPECIFIC_FLAG_5, TRUE); - break; +void chBottles2_setState(Actor *this, s32 state) { + switch (state) { + case BOTTLES2_STATE_2_TEACHING://L8038A50C + this->sm_4070.dialog_id = NULL; + player_getPosition(this->velocity); + func_8028F918(0); + + if (ability_isUnlocked(ABILITY_7_FEATHERY_FLAP)) { + mapSpecificFlags_set(SM_SPECIFIC_FLAG_9_ABILITY_FEATHERY_UNLOCKED, TRUE); + } + else if (ability_isUnlocked(ABILITY_A_HOLD_A_JUMP_HIGHER)) {//L8038A540 + mapSpecificFlags_set(SM_SPECIFIC_FLAG_8_ABILITY_HOLD_A_JUMP_HIGHER_UNLOCKED, TRUE); + } + else {//L8038A560 + __chBottles2_setStaticCameraToNode4(this); + ability_unlock(ABILITY_A_HOLD_A_JUMP_HIGHER); + + gcdialog_showText(ASSET_DF6_TEXT_BOTTLES_HIGH_JUMP_LEARN, 0xe, this->unk1C, this->marker, __chBottles2_textCallback, NULL); + this->sm_4070.dialog_id = ASSET_E1A_TEXT_BOTTLES_UNKNOWN; + mapSpecificFlags_set(SM_SPECIFIC_FLAG_8_ABILITY_HOLD_A_JUMP_HIGHER_UNLOCKED, FALSE); + } + break; + + case BOTTLES2_STATE_3_DISAPPEARED://L8038A5B0 + mapSpecificFlags_set(SM_SPECIFIC_FLAG_5, TRUE); + break; }//L8038A5BC - subaddie_set_state(this, arg1); + + subaddie_set_state(this, state); } -void SM_func_8038A5D8(Actor *this){ - f32 sp5C[3]; - s32 sp44[6]; - f32 sp40; - Actor *temp_v0; - s32 temp_a0; +void chBottles2_update(Actor *this) { + f32 plyr_pos[3]; + s32 face_buttons[6]; + f32 distance_to_bottles; + Actor *bottles_ptr; + s32 dialog_id; - if(!this->initialized){ - temp_v0 = actorArray_findClosestActorFromActorId(this->position, ACTOR_12B_TUTORIAL_BOTTLES, -1, &sp40); - if(temp_v0){ - this->unk1C_x = temp_v0->position_x; - this->unk1C_y = temp_v0->position_y; - this->unk1C_z = temp_v0->position_z; + if (!this->initialized) { + bottles_ptr = actorArray_findClosestActorFromActorId(this->position, ACTOR_12B_TUTORIAL_BOTTLES, -1, &distance_to_bottles); + + if (bottles_ptr) { + this->unk1C_x = bottles_ptr->position_x; + this->unk1C_y = bottles_ptr->position_y; + this->unk1C_z = bottles_ptr->position_z; } - else{//L8038A630 + else {//L8038A630 this->unk1C_x = this->position_x; this->unk1C_y = this->position_y; this->unk1C_z = this->position_z; }//L8038A644 + this->initialized = TRUE; }//L8038A650 - func_8024E55C(0, sp44); - switch (this->state) - { - case 1://L8038A688 - if(fileProgressFlag_get(FILEPROG_DB_SKIPPED_TUTORIAL)){ - marker_despawn(this->marker); - }else{ - if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_E)){ - func_8038A4DC(this, 2); + controller_copyFaceButtons(0, face_buttons); + + switch (this->state) { + case BOTTLES2_STATE_1_IDLE://L8038A688 + if (fileProgressFlag_get(FILEPROG_DB_SKIPPED_TUTORIAL)) { + marker_despawn(this->marker); } - } - break; - - case 2://L8038A6C8 - if(!func_803114B0()){ - if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_8)){ - func_8038A460(this); - ability_unlock(ABILITY_7_FEATHERY_FLAP); - gcdialog_showText(0xdf7, 0xa, this->unk1C, this->marker, func_8038A488, NULL); - this->sm_4070.unk0 = 0xe1b; - mapSpecificFlags_set(SM_SPECIFIC_FLAG_8, FALSE); - }//L8038A730 + else if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_E)) { + chBottles2_setState(this, BOTTLES2_STATE_2_TEACHING); + } + break; - if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_9)){ - func_8038A460(this); - ability_unlock(ABILITY_8_FLAP_FLIP); - gcdialog_showText(0xdf8, 0xa, this->unk1C, this->marker, func_8038A488, NULL); - this->sm_4070.unk0 = 0xe1c; - mapSpecificFlags_set(SM_SPECIFIC_FLAG_9, FALSE); - }//L8038A794 + case BOTTLES2_STATE_2_TEACHING://L8038A6C8 + if (!func_803114B0()) { + if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_8_ABILITY_HOLD_A_JUMP_HIGHER_UNLOCKED)) { + __chBottles2_setStaticCameraToNode4(this); + ability_unlock(ABILITY_7_FEATHERY_FLAP); - if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_A)){ - func_8038A460(this); - func_8028F94C(2, this->unk1C); - - if(!mapSpecificFlags_get(SM_SPECIFIC_FLAG_3) && chmole_learnedAllSpiralMountainAbilities()){ - mapSpecificFlags_set(SM_SPECIFIC_FLAG_3, TRUE); - temp_a0 = 0xe12; - }else{ - temp_a0 = 0xdf9; + gcdialog_showText(ASSET_DF7_TEXT_BOTTLES_FEATHERY_FLAP_LEARN, 0xa, this->unk1C, this->marker, __chBottles2_textCallback, NULL); + this->sm_4070.dialog_id = ASSET_E1B_TEXT_BOTTLES_UNKNOWN; + mapSpecificFlags_set(SM_SPECIFIC_FLAG_8_ABILITY_HOLD_A_JUMP_HIGHER_UNLOCKED, FALSE); + }//L8038A730 + + if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_9_ABILITY_FEATHERY_UNLOCKED)) { + __chBottles2_setStaticCameraToNode4(this); + ability_unlock(ABILITY_8_FLAP_FLIP); + + gcdialog_showText(ASSET_DF8_TEXT_BOTTLES_FLAP_FLIP_LEARN, 0xa, this->unk1C, this->marker, __chBottles2_textCallback, NULL); + this->sm_4070.dialog_id = ASSET_E1C_TEXT_BOTTLES_UNKNOWN; + mapSpecificFlags_set(SM_SPECIFIC_FLAG_9_ABILITY_FEATHERY_UNLOCKED, FALSE); + }//L8038A794 + + if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_A)) { + __chBottles2_setStaticCameraToNode4(this); + func_8028F94C(2, this->unk1C); + + if (!mapSpecificFlags_get(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED) && chmole_learnedAllSpiralMountainAbilities()) { + mapSpecificFlags_set(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED, TRUE); + dialog_id = ASSET_E12_TEXT_BOTTLES_LEARNED_TUTORIAL_MOVES; + } + else { + dialog_id = ASSET_DF9_TEXT_BOTTLES_UNKNOWN; + } + + gcdialog_showText(dialog_id, 0xe, this->unk1C, this->marker, __chBottles2_textCallback, NULL); + mapSpecificFlags_set(SM_SPECIFIC_FLAG_A, FALSE); + this->sm_4070.dialog_id = NULL; } + }//L8038A828 - gcdialog_showText(temp_a0, 0xe, this->unk1C, this->marker, func_8038A488, NULL); - mapSpecificFlags_set(SM_SPECIFIC_FLAG_A, FALSE); - this->sm_4070.unk0 = 0; + player_getPosition(plyr_pos); + plyr_pos[0] = this->velocity_x; + plyr_pos[2] = this->velocity_z; + func_8028FAB0(plyr_pos); + + if (func_8028EFC8() && face_buttons[FACE_BUTTON(BUTTON_B)] == TRUE && func_8028F20C()) { + if (this->sm_4070.dialog_id) { + gcdialog_showText(dialog_id = this->sm_4070.dialog_id, 0, NULL, NULL, NULL, NULL); + } } - }//L8038A828 - player_getPosition(sp5C); - sp5C[0] = this->velocity_x; - sp5C[2] = this->velocity_z; - func_8028FAB0(sp5C); - if( func_8028EFC8() - && sp44[FACE_BUTTON(BUTTON_B)] == 1 - && func_8028F20C() - ){ - if(this->sm_4070.unk0) - gcdialog_showText(temp_a0 = this->sm_4070.unk0, 0, NULL, NULL, NULL, NULL); - } - break; - - case 3://L8038A8A0 - marker_despawn(this->marker); - break; + break; + + case BOTTLES2_STATE_3_DISAPPEARED://L8038A8A0 + marker_despawn(this->marker); + break; }//L8038A8AC } diff --git a/src/SM/code_44D0.c b/src/SM/code_44D0.c index 56f94914..62905d89 100644 --- a/src/SM/code_44D0.c +++ b/src/SM/code_44D0.c @@ -46,7 +46,7 @@ void func_8038A8F8(Actor *this){ if( !mapSpecificFlags_get(SM_SPECIFIC_FLAG_10) && sp2C < (f32) this->unkF4_8 && 1780.0f < func_8028E82C()){ if( !mapSpecificFlags_get(SM_SPECIFIC_FLAG_2) - || (mapSpecificFlags_get(SM_SPECIFIC_FLAG_3) && !mapSpecificFlags_get(SM_SPECIFIC_FLAG_F)) + || (mapSpecificFlags_get(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED) && !mapSpecificFlags_get(SM_SPECIFIC_FLAG_F)) ){ //L8038AA54 this->yaw_ideal = ml_distance_vec3f(this->velocity, this->unk1C) / 150.0; func_8028F3D8(this->unk1C, this->yaw_ideal, func_8038A8C0, this->marker); diff --git a/src/core1/code_10A00.c b/src/core1/code_10A00.c index 3f50ec47..88727b35 100644 --- a/src/core1/code_10A00.c +++ b/src/core1/code_10A00.c @@ -92,7 +92,7 @@ f32 func_8024E420(s32 arg0, s32 arg1, s32 arg2) { return phi_f2 *= arg0; } -void func_8024E55C(s32 controller_index, s32 dst[6]){ +void controller_copyFaceButtons(s32 controller_index, s32 dst[6]){ dst[FACE_BUTTON(BUTTON_A)] = D_80281138[controller_index].face_button[FACE_BUTTON(BUTTON_A)]; dst[FACE_BUTTON(BUTTON_B)] = D_80281138[controller_index].face_button[FACE_BUTTON(BUTTON_B)]; dst[FACE_BUTTON(BUTTON_C_LEFT)] = D_80281138[controller_index].face_button[FACE_BUTTON(BUTTON_C_LEFT)]; diff --git a/src/core2/ch/gameSelect.c b/src/core2/ch/gameSelect.c index c41c4a69..5bcf7c16 100644 --- a/src/core2/ch/gameSelect.c +++ b/src/core2/ch/gameSelect.c @@ -333,7 +333,7 @@ void func_802C4C14(Actor *this){ } else{//L802C4D24 func_8024E60C(0, sp74); - func_8024E55C(0, sp5C); + controller_copyFaceButtons(0, sp5C); controller_getJoystick(0, &sp54); switch(this->state){ case 2: diff --git a/src/core2/ch/mole.c b/src/core2/ch/mole.c index ac327701..932eab00 100644 --- a/src/core2/ch/mole.c +++ b/src/core2/ch/mole.c @@ -376,7 +376,7 @@ void chmole_update(Actor *this){ } } }//L802D9F34 - func_8024E55C(0, sp50); // get face buttons press counters + controller_copyFaceButtons(0, sp50); // get face buttons press counters switch(this->state){ case 1://L802D9F70 this->yaw_ideal = func_80329784(this); diff --git a/src/core2/code_4A6F0.c b/src/core2/code_4A6F0.c index cc08a469..ae8efa66 100644 --- a/src/core2/code_4A6F0.c +++ b/src/core2/code_4A6F0.c @@ -314,7 +314,7 @@ void chMumbo_update(Actor *this) { && func_8028F20C() && func_8028EFC8() ){ - func_8024E55C(0, face_buttons); + controller_copyFaceButtons(0, face_buttons); if(face_buttons[FACE_BUTTON(BUTTON_B)] == 1){ if (D_8037DDF0 == TRANSFORM_7_WISHWASHY) { this->unk38_31 = 0; diff --git a/src/core2/code_4C020.c b/src/core2/code_4C020.c index 5db33954..89f40506 100644 --- a/src/core2/code_4C020.c +++ b/src/core2/code_4C020.c @@ -1013,7 +1013,7 @@ void func_802D5628(void){ D_8037DE08 -= time_getDelta(); } else{//L802D5B24 - func_8024E55C(0, sp50); //get button inputs + controller_copyFaceButtons(0, sp50); //get button inputs if(sp50[FACE_BUTTON(BUTTON_B)] == 1){ func_80324C58(); func_802D6114(); diff --git a/src/core2/code_5C240.c b/src/core2/code_5C240.c index 91fa5178..28940722 100644 --- a/src/core2/code_5C240.c +++ b/src/core2/code_5C240.c @@ -138,7 +138,7 @@ void func_802E35D8(void ) { } } else if (D_8037E8C0.unk14 == 3) { sp38 = 0; - func_8024E55C(0, &sp40); + controller_copyFaceButtons(0, &sp40); for(i = 0; i < 6; i++){ if (sp40[i] == 1) { sp38++; diff --git a/src/core2/code_91E10.c b/src/core2/code_91E10.c index 3f663217..ed23824e 100644 --- a/src/core2/code_91E10.c +++ b/src/core2/code_91E10.c @@ -487,7 +487,7 @@ void func_80319EA4(void) { if(D_803830E0 == NULL) return; - func_8024E55C(0, sp58); + controller_copyFaceButtons(0, sp58); controller_getJoystick(0, sp4C); for(phi_s0 = 0; phi_s0 < 4; phi_s0++){ gczoombox_update(D_803830E0->unk24[phi_s0]); diff --git a/src/core2/code_DC4B0.c b/src/core2/code_DC4B0.c index a4eac276..0c670033 100644 --- a/src/core2/code_DC4B0.c +++ b/src/core2/code_DC4B0.c @@ -6,7 +6,7 @@ void func_80363500(Actor *this); /* .data */ ActorInfo D_80373DC0= { - 0x1EE, ACTOR_3BA_UNKOWN, 0, + 0x1EE, ACTOR_3BA_UNKNOWN, 0, 0, NULL, func_80363500, actor_update_func_80326224, func_80325340, 0, 0, 0.0f, 0 diff --git a/src/core2/code_E410.c b/src/core2/code_E410.c index 97be2874..af0d226c 100644 --- a/src/core2/code_E410.c +++ b/src/core2/code_E410.c @@ -27,7 +27,7 @@ void func_80295448(void){ D_8037C310.unk0[0] = controller_getStartButton(0); func_8024E60C(0, &D_8037C310.unk0[1]); func_8024E6E0(0, &D_8037C310.unk0[4]); - func_8024E55C(0, &D_8037C310.unk0[8]); + controller_copyFaceButtons(0, &D_8037C310.unk0[8]); for(i=0; i<0xE; i++){//L802954A8 D_8037C310.unk7E[i] = D_8037C310.unk70[i]; if(D_8037C310.unk70[i]){ diff --git a/src/core2/gc/dialog.c b/src/core2/gc/dialog.c index 858888ea..38e1d099 100644 --- a/src/core2/gc/dialog.c +++ b/src/core2/gc/dialog.c @@ -376,7 +376,7 @@ void gcdialog_update(void) { func_8024E5A8(0, controller_face_buttons); func_8024E640(0, controller_side_buttons); } else { - func_8024E55C(0, controller_face_buttons); + controller_copyFaceButtons(0, controller_face_buttons); func_8024E60C(0, controller_side_buttons); } diff --git a/src/core2/gc/pauseMenu.c b/src/core2/gc/pauseMenu.c index 46cc988f..17447731 100644 --- a/src/core2/gc/pauseMenu.c +++ b/src/core2/gc/pauseMenu.c @@ -936,7 +936,7 @@ s32 gcPauseMenu_update(void) { return 0; } - func_8024E55C(0, face_button); + controller_copyFaceButtons(0, face_button); controller_getJoystick(0, joystick); func_8024E60C(0, sp60); func_8024E6E0(0, sp50); diff --git a/src/core2/gc/zoombox.c b/src/core2/gc/zoombox.c index 610cf954..a4e79ce6 100644 --- a/src/core2/gc/zoombox.c +++ b/src/core2/gc/zoombox.c @@ -881,7 +881,7 @@ void func_80316764(GcZoombox *this, s32 arg1) { f32 pad0; if (!this->unk1A4_10 ) { - func_8024E55C(0, sp38); + controller_copyFaceButtons(0, sp38); func_8024E60C(0, sp2C); phi_f0 = time_getDelta(); } else { @@ -1067,7 +1067,7 @@ void gczoombox_update(GcZoombox *this){ return; if( !this->unk1A4_10 ){ - func_8024E55C(0, sp58); + controller_copyFaceButtons(0, sp58); func_8024E60C(0, sp4C); tmp_f0 = time_getDelta(); } diff --git a/src/lair/ch/brentilda.c b/src/lair/ch/brentilda.c index 0d3de6b2..5f1656e4 100644 --- a/src/lair/ch/brentilda.c +++ b/src/lair/ch/brentilda.c @@ -120,7 +120,7 @@ void chBrentilda_update(Actor *this) { func_8028E668(this->position, 280.0f, -40.0f, 160.0f); this->yaw_ideal = (f32) func_80329784(this); func_80328FB0(this, 3.0f); - func_8024E55C(0, sp78); + controller_copyFaceButtons(0, sp78); player_getPosition(sp64); temp_f0 = sp64[1] - this->position[1]; if ((temp_f0 > -100.0f) && (temp_f0 < 350.0f)) { diff --git a/src/lair/code_5ED0.c b/src/lair/code_5ED0.c index 3e53a221..9ef68b7d 100644 --- a/src/lair/code_5ED0.c +++ b/src/lair/code_5ED0.c @@ -1159,7 +1159,7 @@ void lair_func_8038E0B0(void) { ){ func_80319EA4(); func_8038C9D0(); - func_8024E55C(0, sp48); + controller_copyFaceButtons(0, sp48); func_8024E60C(0, sp3C); if (D_8037DCB8->currFfMode < 3) { player_getPosition(D_8037DCB8->playerPosition); diff --git a/src/lair/code_86F0.c b/src/lair/code_86F0.c index 21fb5410..4b566399 100644 --- a/src/lair/code_86F0.c +++ b/src/lair/code_86F0.c @@ -468,7 +468,7 @@ void lair_func_8038F924(Actor *this) { particleEmitter_emitN(sp54, 6); } } - func_8024E55C(0, sp7C); + controller_copyFaceButtons(0, sp7C); func_8024E60C(0, sp6C); func_8038EDBC(this); switch(this->state){ diff --git a/src/lair/code_9C40.c b/src/lair/code_9C40.c index 5f946264..93261678 100644 --- a/src/lair/code_9C40.c +++ b/src/lair/code_9C40.c @@ -108,7 +108,7 @@ void func_803902B8(Actor *this) { this->unk38_0 = sp58; sp58 = ml_vec3f_within_distance(this->position, sp5C, 400.0f); if (fileProgressFlag_get(sp54 + FILEPROG_AD_CHEATO_BLUEEGGS_UNLOCKED)) { - func_8024E55C(0, sp3C); + controller_copyFaceButtons(0, sp3C); sp58 &= (sp3C[FACE_BUTTON(BUTTON_B)] == 1) || func_8028EC04(); } if (sp58 && !*(s32 *)&this->local) { From c9d8cc4a56b4db0caf7363935854e471758d13d9 Mon Sep 17 00:00:00 2001 From: Owlenuff Date: Wed, 2 Oct 2024 13:58:41 +0200 Subject: [PATCH 04/15] Document ch Bottles --- include/enums.h | 10 +- src/SM/code_2990.c | 693 +++++++++++++++++++++++--------------------- src/SM/code_F0.c | 4 +- src/core2/ch/mole.c | 8 +- 4 files changed, 380 insertions(+), 335 deletions(-) diff --git a/include/enums.h b/include/enums.h index 39087412..b97d19d6 100644 --- a/include/enums.h +++ b/include/enums.h @@ -2147,6 +2147,8 @@ enum actor_e ACTOR_33F_WOZZA_IN_CAVE = 0x33F, + ACTOR_349_UNKNOWN = 0x349, + ACTOR_34D_BEE_SWARM = 0x34D, ACTOR_34E_LIMBO, ACTOR_34F_MUMMUM, @@ -2441,7 +2443,7 @@ enum bs_e }; enum sm_specific_flags { - SM_SPECIFIC_FLAG_1 = 0x1, + SM_SPECIFIC_FLAG_1_TALKED_TO_BOTTLES = 0x1, SM_SPECIFIC_FLAG_2, SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED, SM_SPECIFIC_FLAG_4, @@ -4418,9 +4420,9 @@ enum asset_e ASSET_E03_TEXT_BOTTLES_CLIMB_REFRESHER, ASSET_E04_TEXT_BOTTLES_BEAK_BARGE_LEARN, ASSET_E05_TEXT_UNKNOWN, - ASSET_E06_TEXT_BOTTLES_BEAK_BARGE_REFRESHER = 0xE06, - - ASSET_E08_TEXT_BOTTLES_FIND_ANOTHER_MOLEHILL = 0xE08, + ASSET_E06_TEXT_BOTTLES_BEAK_BARGE_REFRESHER, + ASSET_E07_TEXT_BOTTLES_UNKNOWN, + ASSET_E08_TEXT_BOTTLES_FIND_ANOTHER_MOLEHILL, ASSET_E09_TEXT_BOTTLES_SKIPPED_TUTORIAL, ASSET_E0A_TEXT_BOTTLES_REFUSE_HELP_1, ASSET_E0B_TEXT_BOTTLES_REFUSE_HELP_2, diff --git a/src/SM/code_2990.c b/src/SM/code_2990.c index ed951d2d..c58575a1 100644 --- a/src/SM/code_2990.c +++ b/src/SM/code_2990.c @@ -2,29 +2,37 @@ #include "functions.h" #include "variables.h" -//external -Actor *func_802D94B4(ActorMarker*, Gfx**, Mtx**, Vtx**); -void func_8028E668(f32*, f32, f32, f32); +/* extern functions */ +Actor *func_802D94B4(ActorMarker *, Gfx **, Mtx **, Vtx **); +void func_8028E668(f32 *, f32, f32, f32); void func_80328FB0(Actor *, f32); void func_8030DA44(u8); void timed_exitStaticCamera(f32); void subaddie_set_state_with_direction(Actor *, s32, f32, s32); -//static types +/* typedefs and declarations */ +enum chBottles_state_e { + BOTTLES_STATE_1_UNKNOWN = 1, + BOTTLES_STATE_2_UNKNOWN, + BOTTLES_STATE_3_UNKNOWN, + BOTTLES_STATE_4_UNKNOWN, + BOTTLES_STATE_5_UNKNOWN +}; + typedef struct { - s16 learn_text; + s16 teach_text_id; s16 refresher_text; s8 camera_node; s8 ability; } ChSmMoleDescription; -//public -void chsmmole_Update(Actor * this); -void chsmmole_80389610(Actor * this); +/* public functions */ +void chBottles_update(Actor *this); +void __chBottles_talk(Actor *this); /* .data */ -ActorAnimationInfo smMoleAnimations[6] = { - {0, 0.0f}, +ActorAnimationInfo chBottlesAnimations[6] = { + {NULL, 0.0f}, {ASSET_13A_ANIM_BOTTLES_ENTER, 2000000000.0f}, {ASSET_13A_ANIM_BOTTLES_ENTER, 4.5f}, {ASSET_13B_ANIM_BOTTLES_IDLE, 7.0f}, @@ -32,49 +40,47 @@ ActorAnimationInfo smMoleAnimations[6] = { {ASSET_13A_ANIM_BOTTLES_ENTER, 2000000000.0f} }; -ActorInfo chSmMole = { - MARKER_B7_TUTORIAL_BOTTLES, ACTOR_12B_TUTORIAL_BOTTLES, ASSET_387_MODEL_BOTTLES, - 1, smMoleAnimations, - chsmmole_Update, actor_update_func_80326224, func_802D94B4, +ActorInfo chBottles = { + MARKER_B7_TUTORIAL_BOTTLES, ACTOR_12B_TUTORIAL_BOTTLES, ASSET_387_MODEL_BOTTLES, 1, chBottlesAnimations, + chBottles_update, actor_update_func_80326224, func_802D94B4, 0, 0, 0.0f, 0 }; -ChSmMoleDescription smMoleTable[8] = { - {ASSET_DF3_TEXT_BOTTLES_INTRODUCTION, ASSET_E08_TEXT_BOTTLES_FIND_ANOTHER_MOLEHILL, 1, -1}, - {ASSET_DF4_TEXT_BOTTLES_CAMERA_CONTROL_LEARN, ASSET_DF5_TEXT_BOTTLES_CAMERA_CONTROL_REFRESHER, 3, ABILITY_3_CAMERA_CONTROL}, - {ASSET_DFB_TEXT_BOTTLES_DIVE_LEARN, ASSET_DFE_TEXT_BOTTLES_DIVE_REFRESHER, 5, ABILITY_F_DIVE}, - { -1, ASSET_E00_TEXT_BOTTLES_ATTACK_REFRESHER, 6, ABILITY_B_RATATAT_RAP}, - {ASSET_E04_TEXT_BOTTLES_BEAK_BARGE_LEARN, ASSET_E06_TEXT_BOTTLES_BEAK_BARGE_REFRESHER, 8, ABILITY_0_BARGE}, - { -1, ASSET_DFA_TEXT_BOTTLES_JUMP_REFRESHER, 4, ABILITY_8_FLAP_FLIP}, - {ASSET_E01_TEXT_BOTTLES_CLIMB_LEARN, ASSET_E03_TEXT_BOTTLES_CLIMB_REFRESHER, 7, ABILITY_5_CLIMB}, +ChSmMoleDescription chBottlesDialogTable[8] = { + {ASSET_DF3_TEXT_BOTTLES_INTRODUCTION, ASSET_E08_TEXT_BOTTLES_FIND_ANOTHER_MOLEHILL, 0x1, -1}, + {ASSET_DF4_TEXT_BOTTLES_CAMERA_CONTROL_LEARN, ASSET_DF5_TEXT_BOTTLES_CAMERA_CONTROL_REFRESHER, 0x3, ABILITY_3_CAMERA_CONTROL}, + {ASSET_DFB_TEXT_BOTTLES_DIVE_LEARN, ASSET_DFE_TEXT_BOTTLES_DIVE_REFRESHER, 0x5, ABILITY_F_DIVE}, + {-1, ASSET_E00_TEXT_BOTTLES_ATTACK_REFRESHER, 0x6, ABILITY_B_RATATAT_RAP}, + {ASSET_E04_TEXT_BOTTLES_BEAK_BARGE_LEARN, ASSET_E06_TEXT_BOTTLES_BEAK_BARGE_REFRESHER, 0x8, ABILITY_0_BARGE}, + {-1, ASSET_DFA_TEXT_BOTTLES_JUMP_REFRESHER, 0x4, ABILITY_8_FLAP_FLIP}, + {ASSET_E01_TEXT_BOTTLES_CLIMB_LEARN, ASSET_E03_TEXT_BOTTLES_CLIMB_REFRESHER, 0x7, ABILITY_5_CLIMB}, {ASSET_E10_TEXT_BOTTLES_BRIDGE_BROKEN, ASSET_E11_TEXT_BOTTLES_BRIDGE_STILL_BROKEN, 0x11, -1}, }; -s32 D_8038AFE4 = 0; - +s32 gDialogIndex = 0; /* .code */ /** * @brief Checks if any Spiral Mountain abilities have been learned */ -int chsmmole_learnedAnySpiralMountainAbilities(void){ - return ability_isUnlocked(ABILITY_F_DIVE) - || ability_isUnlocked(ABILITY_4_CLAW_SWIPE) - || ability_isUnlocked(ABILITY_C_ROLL) - || ability_isUnlocked(ABILITY_B_RATATAT_RAP) - || ability_isUnlocked(ABILITY_0_BARGE) - || ability_isUnlocked(ABILITY_A_HOLD_A_JUMP_HIGHER) - || ability_isUnlocked(ABILITY_7_FEATHERY_FLAP) - || ability_isUnlocked(ABILITY_8_FLAP_FLIP) - || ability_isUnlocked(ABILITY_5_CLIMB); +bool __chBottles_isAnySpiralMountainAbilityLearned(void) { + return ability_isUnlocked(ABILITY_F_DIVE) || + ability_isUnlocked(ABILITY_4_CLAW_SWIPE) || + ability_isUnlocked(ABILITY_C_ROLL) || + ability_isUnlocked(ABILITY_B_RATATAT_RAP) || + ability_isUnlocked(ABILITY_0_BARGE) || + ability_isUnlocked(ABILITY_A_HOLD_A_JUMP_HIGHER) || + ability_isUnlocked(ABILITY_7_FEATHERY_FLAP) || + ability_isUnlocked(ABILITY_8_FLAP_FLIP) || + ability_isUnlocked(ABILITY_5_CLIMB); } /** * @brief Sets all Spiral Mountain abilities to used & disables the noise * played when the player uses an ability for the first time. */ -void chsmmole_setSpiralMountainAbilitiesAsUsed(void){ +void __chBottles_setHasUsedSpiralMountainAbilities(void) { ability_unlock(ABILITY_3_CAMERA_CONTROL); ability_setHasUsed(ABILITY_0_BARGE); ability_setHasUsed(ABILITY_1_BEAK_BOMB); @@ -90,7 +96,7 @@ void chsmmole_setSpiralMountainAbilitiesAsUsed(void){ /** * @brief Unlocks all of the Spiral Mountain moves. */ -void chsmmole_skipIntroTutorial(void){ +void __chBottles_skipIntroTutorial(void) { ability_unlock(ABILITY_F_DIVE); ability_unlock(ABILITY_4_CLAW_SWIPE); ability_unlock(ABILITY_C_ROLL); @@ -100,136 +106,157 @@ void chsmmole_skipIntroTutorial(void){ ability_unlock(ABILITY_7_FEATHERY_FLAP); ability_unlock(ABILITY_8_FLAP_FLIP); ability_unlock(ABILITY_5_CLIMB); - chsmmole_setSpiralMountainAbilitiesAsUsed(); + __chBottles_setHasUsedSpiralMountainAbilities(); mapSpecificFlags_set(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED, TRUE); } + /** * @brief If the player is talking to Intro Bottles for the first time, use the * camera that points to the lair. Otherwise, use the camera for the ability. */ -void chsmmole_setSpiralMountainStaticCamera(Actor *this){ - - if(this->unkF4_8 == 1 && !mapSpecificFlags_get(SM_SPECIFIC_FLAG_1)){ +void __chBottles_setStaticCameraToNode(Actor *this) { + if (this->unkF4_8 == 1 && !mapSpecificFlags_get(SM_SPECIFIC_FLAG_1_TALKED_TO_BOTTLES)) { timed_setStaticCameraToNode(0.0f, 0x12); } - else{ //L80388F68 - timed_setStaticCameraToNode(0.0f, smMoleTable[this->unkF4_8 -1].camera_node); + else { //L80388F68 + timed_setStaticCameraToNode(0.0f, chBottlesDialogTable[this->unkF4_8 - 1].camera_node); } } -void func_80388FA0(Actor *this, s32 arg1){ +void __chBottles_setState(Actor *this, s32 next_state) { Actor *other; - ActorMarker *myOther; + ActorMarker *molehillMarker; - switch(this->state){ - case 1://L80388FE8 + switch (this->state) { + case BOTTLES_STATE_1_UNKNOWN://L80388FE8 this->unk138_23 = 1; break; - case 4://L80388FF8 + + case BOTTLES_STATE_4_UNKNOWN://L80388FF8 this->unk138_23 = 0; - case 2://L80389004 + + case BOTTLES_STATE_2_UNKNOWN://L80389004 func_8030DA44(this->unk44_31); this->unk44_31 = 0; break; - case 5://L80389018 + + case BOTTLES_STATE_5_UNKNOWN://L80389018 this->unk138_23 = 0; func_8028F918(0); - break; }//L8038902C - switch(arg1){ - case 4: + switch (next_state) { + case BOTTLES_STATE_4_UNKNOWN: other = subaddie_getLinkedActor(this); - myOther = this->unk100; - if(myOther && other && myOther->id == 0xB8) + molehillMarker = this->unk100; + + if (molehillMarker && other && molehillMarker->id == 0xB8) { subaddie_set_state_with_direction(other, 3, 0.0001f, 1); + } + actor_playAnimationOnce(this); + this->unk44_31 = sfxsource_createSfxsourceAndReturnIndex(); sfxsource_setSfxId(this->unk44_31, 0x3f9); func_8030DD14(this->unk44_31, 2); sfxsource_playSfxAtVolume(this->unk44_31, 1.4f); sfxsource_setSampleRate(this->unk44_31, 0x6590); + func_8028F918(0); break; - case 1: + + case BOTTLES_STATE_1_UNKNOWN: animctrl_setSmoothTransition(this->animctrl, 0); break; - case 5: - chsmmole_setSpiralMountainStaticCamera(this); - func_8028F94C(2,this->position); - chsmmole_80389610(this); + + case BOTTLES_STATE_5_UNKNOWN: + __chBottles_setStaticCameraToNode(this); + func_8028F94C(2, this->position); + __chBottles_talk(this); break; - case 3: + + case BOTTLES_STATE_3_UNKNOWN: actor_loopAnimation(this); break; - case 2: - other = subaddie_getLinkedActor(this); - myOther = this->unk100; - if(myOther && other && myOther->id == 0xB8) - subaddie_set_state_with_direction(other, 2, 0.0001f, 1); + + case BOTTLES_STATE_2_UNKNOWN: + other = subaddie_getLinkedActor(this); + molehillMarker = this->unk100; + + if (molehillMarker && other && molehillMarker->id == 0xB8) { + subaddie_set_state_with_direction(other, 2, 0.0001f, 1); + } + animctrl_setSmoothTransition(this->animctrl, 1); actor_playAnimationOnce(this); + this->unk44_31 = sfxsource_createSfxsourceAndReturnIndex(); sfxsource_setSfxId(this->unk44_31, 0x3f9); func_8030DD14(this->unk44_31, 2); sfxsource_playSfxAtVolume(this->unk44_31, 1.4f); sfxsource_setSampleRate(this->unk44_31, 0x6590); - chsmmole_setSpiralMountainStaticCamera(this); + + __chBottles_setStaticCameraToNode(this); func_8028F94C(2, this->position); break; } - subaddie_set_state_with_direction(this, arg1, 0.0001f, 1); + + subaddie_set_state_with_direction(this, next_state, 0.0001f, 1); } /** * @brief Performs actions depending on what move is being learned * */ -static void __chsmmole_additionalAbilityLearnActions(ActorMarker *marker, enum asset_e text_id, s32 arg2){ +static void __chBottles_textActions(ActorMarker *marker, enum asset_e text_id, s32 arg2) { Actor *actor = marker_getActor(marker); - switch(arg2){ + + switch (arg2) { case 3: timed_setStaticCameraToNode(0.0f, 2); break; + case 4: mapSpecificFlags_set(SM_SPECIFIC_FLAG_4, TRUE); break; + case 5: timed_setStaticCameraToNode(0.0f, 0x12); break; + case 6: comusic_playTrack(COMUSIC_2B_DING_B); break; + case 0xff: - chsmmole_setSpiralMountainStaticCamera(actor); + __chBottles_setStaticCameraToNode(actor); break; } } -void func_803892C8(ActorMarker *marker, enum asset_e text_id, s32 arg2){ - Actor *actor; +void __chBottles_textCallback(ActorMarker *marker, enum asset_e text_id, s32 arg2) { + Actor *actor = marker_getActor(marker); - actor = marker_getActor(marker); - if(!mapSpecificFlags_get(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED) && chmole_learnedAllSpiralMountainAbilities()){ + if (!mapSpecificFlags_get(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED) && chmole_learnedAllSpiralMountainAbilities()) { mapSpecificFlags_set(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED, TRUE); - gcdialog_showText(ASSET_E12_TEXT_BOTTLES_LEARNED_TUTORIAL_MOVES, 0xe, actor->position, actor->marker, func_803892C8, NULL); + gcdialog_showText(ASSET_E12_TEXT_BOTTLES_LEARNED_TUTORIAL_MOVES, 0xe, actor->position, actor->marker, __chBottles_textCallback, NULL); }//L8038933C - else{ - if(!(text_id == ASSET_DF3_TEXT_BOTTLES_INTRODUCTION - || text_id == ASSET_E1F_TEXT_BOTTLES_TUTORIAL_OFFER - || text_id == ASSET_E1D_TEXT_BOTTLES_TUTORIAL_OFFER_WAIT)){ + else { + if (!(text_id == ASSET_DF3_TEXT_BOTTLES_INTRODUCTION || text_id == ASSET_E1F_TEXT_BOTTLES_TUTORIAL_OFFER || text_id == ASSET_E1D_TEXT_BOTTLES_TUTORIAL_OFFER_WAIT)) { timed_exitStaticCamera(0.0f); } - switch(text_id){ + + switch (text_id) { case ASSET_D38_TEXT_BOTTLES_ALL_MOVES_LEARNED: break; + case ASSET_DF3_TEXT_BOTTLES_INTRODUCTION: /* 2FB8 803893A8 3C188039 */ - gcdialog_showText(ASSET_E1F_TEXT_BOTTLES_TUTORIAL_OFFER, 0x8e, actor->position, actor->marker, func_803892C8, __chsmmole_additionalAbilityLearnActions); + gcdialog_showText(ASSET_E1F_TEXT_BOTTLES_TUTORIAL_OFFER, 0x8e, actor->position, actor->marker, __chBottles_textCallback, __chBottles_textActions); break; case ASSET_E1F_TEXT_BOTTLES_TUTORIAL_OFFER: /* 2FEC 803893DC 9209003B */ - actor->unk38_0 = 1; + actor->unk38_0 = TRUE; break; case ASSET_E1D_TEXT_BOTTLES_TUTORIAL_OFFER_WAIT: /* 2FFC 803893EC 920B0138 */ @@ -244,191 +271,200 @@ void func_803892C8(ActorMarker *marker, enum asset_e text_id, s32 arg2){ case ASSET_E09_TEXT_BOTTLES_SKIPPED_TUTORIAL: case ASSET_E12_TEXT_BOTTLES_LEARNED_TUTORIAL_MOVES: - func_80388FA0(actor,4); + __chBottles_setState(actor, BOTTLES_STATE_4_UNKNOWN); break; default: - if(actor->state != 5) - gcdialog_showText(ASSET_D38_TEXT_BOTTLES_ALL_MOVES_LEARNED, 4, NULL, NULL, NULL, NULL); - - func_80388FA0(actor, actor->state == 5 ? 1:4); + if (actor->state != BOTTLES_STATE_5_UNKNOWN) { + gcdialog_showText(ASSET_D38_TEXT_BOTTLES_ALL_MOVES_LEARNED, 0x4, NULL, NULL, NULL, NULL); + } + + __chBottles_setState(actor, actor->state == BOTTLES_STATE_5_UNKNOWN ? BOTTLES_STATE_1_UNKNOWN : BOTTLES_STATE_4_UNKNOWN); break; } } } -void chsmmole_learnAbility(Actor * this, s32* arg1, s32 *arg2){ +void __chBottles_getReteachDialog(Actor *this, s32 *text_id, s32 *text_flags) { // Selects the learn and refresh dialogs. // Gives the player the ability if not learned. - if(ability_isUnlocked(smMoleTable[this->unkF4_8 -1].ability)){ - if(fileProgressFlag_get(FILEPROG_DB_SKIPPED_TUTORIAL)){ - *arg1 = D_8038AFE4 + ASSET_E0A_TEXT_BOTTLES_REFUSE_HELP_1; - D_8038AFE4++; - D_8038AFE4 = MIN(D_8038AFE4, 5); - if(*arg1 != ASSET_E0E_TEXT_BOTTLES_REFUSE_HELP_5){ - *arg2 |= 1; - } - }else{//L8038956C - *arg2 |= 1; - *arg1 = smMoleTable[this->unkF4_8 -1].refresher_text; - if(*arg1 == ASSET_DFE_TEXT_BOTTLES_DIVE_REFRESHER && !ability_hasUsed(ABILITY_3_CAMERA_CONTROL)){ - *arg1 = ASSET_DFD_TEXT_BOTTLES_SWIM_LEARN; + if (ability_isUnlocked(chBottlesDialogTable[this->unkF4_8 - 1].ability)) { + if (fileProgressFlag_get(FILEPROG_DB_SKIPPED_TUTORIAL)) { + *text_id = gDialogIndex + ASSET_E0A_TEXT_BOTTLES_REFUSE_HELP_1; + gDialogIndex++; + gDialogIndex = MIN(gDialogIndex, 5); + + if (*text_id != ASSET_E0E_TEXT_BOTTLES_REFUSE_HELP_5) { + *text_flags |= 1; } } - }else{//L803895C0 - *arg1 = smMoleTable[this->unkF4_8 -1].learn_text; - ability_unlock(smMoleTable[this->unkF4_8 -1].ability); + else {//L8038956C + *text_flags |= 1; + *text_id = chBottlesDialogTable[this->unkF4_8 - 1].refresher_text; + + if (*text_id == ASSET_DFE_TEXT_BOTTLES_DIVE_REFRESHER && !ability_hasUsed(ABILITY_3_CAMERA_CONTROL)) { + *text_id = ASSET_DFD_TEXT_BOTTLES_SWIM_LEARN; + } + } + } + else {//L803895C0 + *text_id = chBottlesDialogTable[this->unkF4_8 - 1].teach_text_id; + ability_unlock(chBottlesDialogTable[this->unkF4_8 - 1].ability); } } -void chsmmole_80389610(Actor * this){ - s32 sp2C; - s32 sp28; +void __chBottles_talk(Actor *this) { + s32 text_id; + s32 text_flags; - sp28 = 0xe; - sp2C = 0; + text_flags = 0xe; + text_id = 0; - switch(this->unkF4_8){ + switch (this->unkF4_8) { case 1://L8038965C - if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_1)){ - sp28 |= 1; - if(fileProgressFlag_get(FILEPROG_DB_SKIPPED_TUTORIAL)){ - sp2C = D_8038AFE4 + 0xE0A; //dialog index - D_8038AFE4++; - D_8038AFE4 = MIN(D_8038AFE4, 5); - }else{//L803896C0 - sp2C = smMoleTable[this->unkF4_8 -1].refresher_text; + if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_1_TALKED_TO_BOTTLES)) { + text_flags |= 1; + + if (fileProgressFlag_get(FILEPROG_DB_SKIPPED_TUTORIAL)) { + text_id = gDialogIndex + ASSET_E0A_TEXT_BOTTLES_REFUSE_HELP_1; + gDialogIndex++; + gDialogIndex = MIN(gDialogIndex, 5); + } + else {//L803896C0 + text_id = chBottlesDialogTable[this->unkF4_8 - 1].refresher_text; } } - else{//L803896E8 - sp2C = smMoleTable[this->unkF4_8 -1].learn_text; - mapSpecificFlags_set(SM_SPECIFIC_FLAG_1, TRUE); + else {//L803896E8 + text_id = chBottlesDialogTable[this->unkF4_8 - 1].teach_text_id; + mapSpecificFlags_set(SM_SPECIFIC_FLAG_1_TALKED_TO_BOTTLES, TRUE); } break; + case 8://L80389720 - if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED)){ - if(fileProgressFlag_get(FILEPROG_A6_FURNACE_FUN_COMPLETE)){ - sp2C = ASSET_E37_TEXT_BOTTLES_STOP_WASTING_TIME_AFTER_FURNACE_FUN; - sp28 |= 1; - }else{//L80389758 - if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_F)){ - sp2C = ASSET_E0F_TEXT_BOTTLES_STOP_WASTING_TIME_BEFORE_FURNACE_FUN; - sp28 |= 1; - }else{//L80389780 - chsmmole_setSpiralMountainAbilitiesAsUsed(); - sp2C = fileProgressFlag_get(FILEPROG_DB_SKIPPED_TUTORIAL) ? 0xe1e : 0xe13; - mapSpecificFlags_set(SM_SPECIFIC_FLAG_F, TRUE); - } + if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED)) { + if (fileProgressFlag_get(FILEPROG_A6_FURNACE_FUN_COMPLETE)) { + text_id = ASSET_E37_TEXT_BOTTLES_STOP_WASTING_TIME_AFTER_FURNACE_FUN; + text_flags |= 1; + } + else if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_F)) { //L80389758 + text_id = ASSET_E0F_TEXT_BOTTLES_STOP_WASTING_TIME_BEFORE_FURNACE_FUN; + text_flags |= 1; + } + else {//L80389780 + __chBottles_setHasUsedSpiralMountainAbilities(); + text_id = fileProgressFlag_get(FILEPROG_DB_SKIPPED_TUTORIAL) ? 0xe1e : 0xe13; + mapSpecificFlags_set(SM_SPECIFIC_FLAG_F, TRUE); } //L803897B4 + mapSpecificFlags_set(SM_SPECIFIC_FLAG_2, TRUE); } - else{//L803897C8 - if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_2)){ - sp2C = smMoleTable[this->unkF4_8 -1].refresher_text; - sp28 |= 1; + else {//L803897C8 + if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_2)) { + text_id = chBottlesDialogTable[this->unkF4_8 - 1].refresher_text; + text_flags |= 1; } - else{ - sp2C = smMoleTable[this->unkF4_8 -1].learn_text; + else { + text_id = chBottlesDialogTable[this->unkF4_8 - 1].teach_text_id; mapSpecificFlags_set(SM_SPECIFIC_FLAG_2, TRUE); } - } break; - + case 4://L80389848 - if( !ability_isUnlocked(ABILITY_4_CLAW_SWIPE) - || !ability_isUnlocked(ABILITY_C_ROLL) - || !ability_isUnlocked(ABILITY_B_RATATAT_RAP) - ){//L803898D4 + if (!(ability_isUnlocked(ABILITY_4_CLAW_SWIPE) && ability_isUnlocked(ABILITY_C_ROLL) && ability_isUnlocked(ABILITY_B_RATATAT_RAP))) {//L803898D4 mapSpecificFlags_set(SM_SPECIFIC_FLAG_4, TRUE); } - else{//L803898E4 - chsmmole_learnAbility(this, &sp2C, &sp28); + else {//L803898E4 + __chBottles_getReteachDialog(this, &text_id, &text_flags); } break; - + case 6://L803898A0 - if( !ability_isUnlocked(ABILITY_A_HOLD_A_JUMP_HIGHER) - || !ability_isUnlocked(ABILITY_7_FEATHERY_FLAP) - || !ability_isUnlocked(ABILITY_8_FLAP_FLIP) - ){//L803898D4 + if (!(ability_isUnlocked(ABILITY_A_HOLD_A_JUMP_HIGHER) && ability_isUnlocked(ABILITY_7_FEATHERY_FLAP) && ability_isUnlocked(ABILITY_8_FLAP_FLIP))) {//L803898D4 mapSpecificFlags_set(SM_SPECIFIC_FLAG_E, TRUE); } - else{//L803898E4 - chsmmole_learnAbility(this, &sp2C, &sp28); + else {//L803898E4 + __chBottles_getReteachDialog(this, &text_id, &text_flags); } break; + default://L803898F8 - chsmmole_learnAbility(this, &sp2C, &sp28); + __chBottles_getReteachDialog(this, &text_id, &text_flags); break; }//L80389904 - if(sp2C){ - gcdialog_showText(sp2C, sp28, this->position, this->marker, func_803892C8, __chsmmole_additionalAbilityLearnActions); + + if (text_id) { + gcdialog_showText(text_id, text_flags, this->position, this->marker, __chBottles_textCallback, __chBottles_textActions); } } /** * @brief Spawns a molehill for the actor */ -void chsmmole_spawnMolehill(ActorMarker * marker){ - Actor *actor; - Actor *other; - s32 pad; +void __chBottles_spawnMolehill(ActorMarker *marker) { + Actor *this; + Actor *molehill; + s32 pad; - actor = marker_getActor(marker); - other = spawn_child_actor(ACTOR_12C_MOLEHILL, &actor); - actor->unk100 = other->marker; - - if(marker); + this = marker_getActor(marker); + molehill = spawn_child_actor(ACTOR_12C_MOLEHILL, &this); + this->unk100 = molehill->marker; + + if (marker); } -void func_80389984(Actor * this){ - u8 tmp; +void __chBottles_free(Actor *this) { + u8 tmp = this->unk44_31; - tmp = this->unk44_31; - if(tmp) + if (tmp) { func_8030DA44(tmp); + } } -void chsmmole_Update(Actor * this){ - // Sets up the initial functions and state for the actor - s32 sp50[6]; // face buttons - f32 sp44[3]; // player position +void chBottles_update(Actor *this) { + s32 face_buttons[6]; + f32 plyr_pos[3]; void *sp40; int sp34; - int user_input; - + int button_pressed; + // Checks the actor's selector value is lower than 0x9 // Anything higher is a non-Spiral Mountain ability, and should use a different actor id - if(this->unkF4_8 >= 9) + if (this->unkF4_8 >= 9) { return; + } - if(!this->initialized){ + if (!this->initialized) { this->marker->propPtr->unk8_3 = 0; actor_collisionOff(this); this->initialized = TRUE; - marker_setFreeMethod(this->marker, func_80389984); - if(this->unkF4_8 == 1 || this->unkF4_8 == 8){//L80389A30 - sp40 = nodeprop_findByActorIdAndActorPosition(0x349, this); - if(!sp40){ + marker_setFreeMethod(this->marker, __chBottles_free); + + if (this->unkF4_8 == 1 || this->unkF4_8 == 8) {//L80389A30 + sp40 = nodeprop_findByActorIdAndActorPosition(ACTOR_349_UNKNOWN, this); + + if (!sp40) { this->unk1C_x = this->position_x; this->unk1C_y = this->position_y; this->unk1C_z = this->position_z; this->actor_specific_1_f = 300.0f; - } else{ //L80389A68 + } + else { //L80389A68 nodeprop_getPosition(sp40, this->unk1C); this->actor_specific_1_f = nodeprop_getRadius(sp40); }//L80389A8C - if(this->unkF4_8 == 1){ - if(volatileFlag_get(VOLATILE_FLAG_1) || volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)){ - func_80388FA0(this, 3); + + if (this->unkF4_8 == 1) { + if (volatileFlag_get(VOLATILE_FLAG_1) || volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) { + __chBottles_setState(this, BOTTLES_STATE_3_UNKNOWN); } } }//L80389AC8 - if(chsmmole_learnedAnySpiralMountainAbilities()){ - mapSpecificFlags_set(SM_SPECIFIC_FLAG_1, TRUE); - if(chmole_learnedAllSpiralMountainAbilities()){ + if (__chBottles_isAnySpiralMountainAbilityLearned()) { + mapSpecificFlags_set(SM_SPECIFIC_FLAG_1_TALKED_TO_BOTTLES, TRUE); + + if (chmole_learnedAllSpiralMountainAbilities()) { mapSpecificFlags_set(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED, TRUE); mapSpecificFlags_set(SM_SPECIFIC_FLAG_2, TRUE); mapSpecificFlags_set(SM_SPECIFIC_FLAG_C, TRUE); @@ -437,158 +473,165 @@ void chsmmole_Update(Actor * this){ } }//L80389B20 - if(!this->volatile_initialized){ - __spawnQueue_add_1((GenFunction_1)chsmmole_spawnMolehill, reinterpret_cast(s32, this->marker)); + if (!this->volatile_initialized) { + __spawnQueue_add_1((GenFunction_1) __chBottles_spawnMolehill, reinterpret_cast(s32, this->marker)); this->volatile_initialized = TRUE; }//L80389B4C - if(this->unk138_23){ + if (this->unk138_23) { func_8028E668(this->position, 180.0f, -40.0f, 120.0f); }//L80389B64 - controller_copyFaceButtons(0,sp50); //get face buttons press counters - player_getPosition(sp44); - switch (this->state) - { - case 1://L80389BAC - this->yaw_ideal = (f32)func_80329784(this); - func_80328FB0(this, 4.0f); - if( (this->unkF4_8 == 1 && !mapSpecificFlags_get(SM_SPECIFIC_FLAG_1)) - || (this->unkF4_8 == 8 && !mapSpecificFlags_get(SM_SPECIFIC_FLAG_2)) - || (this->unkF4_8 == 8 && mapSpecificFlags_get(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED) && !mapSpecificFlags_get(SM_SPECIFIC_FLAG_F)) - ){//L80389C50 - - if( ((ml_distance_vec3f(sp44, this->unk1C) < this->actor_specific_1_f) && func_8028F20C()) - || mapSpecificFlags_get(SM_SPECIFIC_FLAG_10) - ){//L80389C8C - if(func_80329530(this, 0x96)) - func_8028F45C(9, this->position); - //L80389CA4 - func_80388FA0(this, 2); - } - } - else{//L80389CBC - if( !func_80329530(this, 0xfa) - || func_8028ECAC() - || !func_8028F20C() - || func_8028EC04() - ) break; - - sp34 = !((!(smMoleTable[this->unkF4_8-1].ability + 1)) || (!ability_isUnlocked( smMoleTable[this->unkF4_8-1].ability))); - if( (!sp34 && this->unkF4_8 != 1) - || fileProgressFlag_get(FILEPROG_DB_SKIPPED_TUTORIAL) == 0 - || D_8038AFE4 < 6 - ){ - if(this->unkF4_8 != 8 || !fileProgressFlag_get(FILEPROG_FC_DEFEAT_GRUNTY)){ - if( func_8028EFC8() - && sp50[FACE_BUTTON(BUTTON_B)] == 1 - ){ - if(sp34 || this->unkF4_8 == 1 || this->unkF4_8 == 8){ - func_80388FA0(this, 5); - } - else{ - if(func_80329530(this, 0x96) && !sp34){ - func_8028F45C(9, this->position); + controller_copyFaceButtons(0, face_buttons); //get face buttons press counters + player_getPosition(plyr_pos); + + switch (this->state) { + case BOTTLES_STATE_1_UNKNOWN://L80389BAC + this->yaw_ideal = (f32) func_80329784(this); + func_80328FB0(this, 4.0f); + + if ((this->unkF4_8 == 1 && !mapSpecificFlags_get(SM_SPECIFIC_FLAG_1_TALKED_TO_BOTTLES)) || + (this->unkF4_8 == 8 && !mapSpecificFlags_get(SM_SPECIFIC_FLAG_2)) || + (this->unkF4_8 == 8 && mapSpecificFlags_get(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED) && !mapSpecificFlags_get(SM_SPECIFIC_FLAG_F)) + ) {//L80389C50 + if (((ml_distance_vec3f(plyr_pos, this->unk1C) < this->actor_specific_1_f) && func_8028F20C()) || + mapSpecificFlags_get(SM_SPECIFIC_FLAG_10) + ) {//L80389C8C + if (func_80329530(this, 0x96)) { + func_8028F45C(9, this->position); + } + + //L80389CA4 + __chBottles_setState(this, BOTTLES_STATE_2_UNKNOWN); + } + } + else {//L80389CBC + if (!func_80329530(this, 0xfa) || func_8028ECAC() || !func_8028F20C() || func_8028EC04()) { + break; + } + + sp34 = (chBottlesDialogTable[this->unkF4_8 - 1].ability + 1) && ability_isUnlocked(chBottlesDialogTable[this->unkF4_8 - 1].ability); + + if (!sp34 && this->unkF4_8 != 1 || fileProgressFlag_get(FILEPROG_DB_SKIPPED_TUTORIAL) == 0 || gDialogIndex < 6) { + if (this->unkF4_8 != 8 || !fileProgressFlag_get(FILEPROG_FC_DEFEAT_GRUNTY)) { + if (func_8028EFC8() && face_buttons[FACE_BUTTON(BUTTON_B)] == 1) { + if (sp34 || this->unkF4_8 == 1 || this->unkF4_8 == 8) { + __chBottles_setState(this, BOTTLES_STATE_5_UNKNOWN); + } + else { + if (func_80329530(this, 0x96) && !sp34) { + func_8028F45C(9, this->position); + } + + __chBottles_setState(this, BOTTLES_STATE_2_UNKNOWN); } - func_80388FA0(this, 2); } } } } - } - break; - case 2://L80389E2C - this->yaw_ideal = func_80329784(this); - func_80328FB0(this, 4.0f); - if( (f64) 0.0 < animctrl_getAnimTimer(this->animctrl) - && animctrl_getAnimTimer(this->animctrl) < 0.16 - ){ - func_8030E2C4(this->unk44_31); - }//L80389EA0 - if(actor_animationIsAt(this, 0.9999f)){ - if(!mapSpecificFlags_get(SM_SPECIFIC_FLAG_1)){ - chsmmole_80389610(this); - } - func_80388FA0(this, 3); - }//L80389EE0 - else if(actor_animationIsAt(this, 0.14f)){ - FUNC_8030E8B4(SFX_C6_SHAKING_MOUTH, 1.2f, 24000, this->position, 1250, 2500); - }else if(actor_animationIsAt(this, 0.4f)){ //L80389F14 - FUNC_8030E8B4(SFX_2C_PULLING_NOISE, 1.2f, 24000, this->position, 1250, 2500); - }else if(actor_animationIsAt(this, 0.75f)){//L80389F48 - FUNC_8030E8B4(SFX_C5_TWINKLY_POP, 1.0f, 32000, this->position, 1250, 2500); + break; - }else if(actor_animationIsAt(this, 0.35f)){//L80389F78 - if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_1)){ - chsmmole_80389610(this); - } - } - break; - case 3://L80389FAC - this->yaw_ideal = func_80329784(this); - func_80328FB0(this, 4.0f); - if( ( actor_animationIsAt(this, 0.37f) - || actor_animationIsAt(this, 0.66f) - || actor_animationIsAt(this, 0.85f) - ) - && randf() < 0.2 - ){ - animctrl_setDirection(this->animctrl, animctrl_isPlayedForwards(this->animctrl)^1); - }//L8038A088 - else if( actor_animationIsAt(this, 0.25f) - || actor_animationIsAt(this, 0.28f) - || actor_animationIsAt(this, 0.31f) - ){ - func_8030E878(SFX_6F_BANJO_HEADSCRATCH, randf2(1.4f, 1.55f), 16000, this->position, 1250.0f, 2500.0f); - } //L8038A0D8 - else if( actor_animationIsAt(this, 0.45f) - || actor_animationIsAt(this, 0.48f) - || actor_animationIsAt(this, 0.51f) - || actor_animationIsAt(this, 0.7f) - || actor_animationIsAt(this, 0.73f) - || actor_animationIsAt(this, 0.76f) - ){ - func_8030E878(SFX_6F_BANJO_HEADSCRATCH, randf2(1.35f, 1.5f), 6000, this->position, 1250.0f, 2500.0f); - }//L8038A194 + case BOTTLES_STATE_2_UNKNOWN://L80389E2C + this->yaw_ideal = func_80329784(this); + func_80328FB0(this, 4.0f); - if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_5)){ - mapSpecificFlags_set(SM_SPECIFIC_FLAG_5, FALSE); - func_80388FA0(this, 4); - }//L8038A1B8 - user_input = -1; - if(this->unk38_0){ - this->lifetime_value += time_getDelta(); - if(func_803114C4() != 0xe1d){ - if(sp50[FACE_BUTTON(BUTTON_A)] == 1) - user_input = 1; //A button pressed - else if(sp50[FACE_BUTTON(BUTTON_B)] == 1) - user_input = 0; //B button pressed - }//L8038A218 + if (0.0 < animctrl_getAnimTimer(this->animctrl) && animctrl_getAnimTimer(this->animctrl) < 0.16) { + func_8030E2C4(this->unk44_31); + }//L80389EA0 - if( user_input != -1){ //button was pressed - fileProgressFlag_set(FILEPROG_DB_SKIPPED_TUTORIAL, (user_input)?0:1); - gcdialog_showText((user_input)? 0xe07 : 0xe09, 0xe, this->position, this->marker, func_803892C8, __chsmmole_additionalAbilityLearnActions); - if(!user_input){ - chsmmole_skipIntroTutorial(); //give all SM moves + if (actor_animationIsAt(this, 0.9999f)) { + if (!mapSpecificFlags_get(SM_SPECIFIC_FLAG_1_TALKED_TO_BOTTLES)) { + __chBottles_talk(this); } - this->unk38_0 = 0; - }else if(!this->has_met_before && 5.0 < this->lifetime_value){ - gcdialog_showText(0xe1d, 0x86, this->position, this->marker, func_803892C8, NULL); - this->has_met_before = TRUE; + + __chBottles_setState(this, BOTTLES_STATE_3_UNKNOWN); + }//L80389EE0 + else if (actor_animationIsAt(this, 0.14f)) { + FUNC_8030E8B4(SFX_C6_SHAKING_MOUTH, 1.2f, 24000, this->position, 1250, 2500); } - } - break; - case 4://L8038A31C - if( 0.35 < animctrl_getAnimTimer(this->animctrl) - && animctrl_getAnimTimer(this->animctrl) < 0.9 - ){ - func_8030E2C4(this->unk44_31); - }else{//L8038A378 - if(actor_animationIsAt(this, 0.9999f)){ - func_80388FA0(this, 1); + else if (actor_animationIsAt(this, 0.4f)) { //L80389F14 + FUNC_8030E8B4(SFX_2C_PULLING_NOISE, 1.2f, 24000, this->position, 1250, 2500); + } + else if (actor_animationIsAt(this, 0.75f)) {//L80389F48 + FUNC_8030E8B4(SFX_C5_TWINKLY_POP, 1.0f, 32000, this->position, 1250, 2500); + } + else if (actor_animationIsAt(this, 0.35f)) {//L80389F78 + if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_1_TALKED_TO_BOTTLES)) { + __chBottles_talk(this); + } + } + break; + + case BOTTLES_STATE_3_UNKNOWN://L80389FAC + this->yaw_ideal = func_80329784(this); + func_80328FB0(this, 4.0f); + + if ((actor_animationIsAt(this, 0.37f) || + actor_animationIsAt(this, 0.66f) || + actor_animationIsAt(this, 0.85f)) && randf() < 0.2 + ) { + animctrl_setDirection(this->animctrl, animctrl_isPlayedForwards(this->animctrl) ^ 1); + }//L8038A088 + else if (actor_animationIsAt(this, 0.25f) || + actor_animationIsAt(this, 0.28f) || + actor_animationIsAt(this, 0.31f) + ) { + func_8030E878(SFX_6F_BANJO_HEADSCRATCH, randf2(1.4f, 1.55f), 16000, this->position, 1250.0f, 2500.0f); + } //L8038A0D8 + else if (actor_animationIsAt(this, 0.45f) || + actor_animationIsAt(this, 0.48f) || + actor_animationIsAt(this, 0.51f) || + actor_animationIsAt(this, 0.7f) || + actor_animationIsAt(this, 0.73f) || + actor_animationIsAt(this, 0.76f) + ) { + func_8030E878(SFX_6F_BANJO_HEADSCRATCH, randf2(1.35f, 1.5f), 6000, this->position, 1250.0f, 2500.0f); + }//L8038A194 + + if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_5)) { + mapSpecificFlags_set(SM_SPECIFIC_FLAG_5, FALSE); + __chBottles_setState(this, BOTTLES_STATE_4_UNKNOWN); + }//L8038A1B8 + + button_pressed = -1; + + if (this->unk38_0) { + this->lifetime_value += time_getDelta(); + + if (func_803114C4() != 0xe1d) { + if (face_buttons[FACE_BUTTON(BUTTON_A)] == TRUE) { + button_pressed = 1; + } + else if (face_buttons[FACE_BUTTON(BUTTON_B)] == TRUE) { + button_pressed = 0; + } + }//L8038A218 + + if (button_pressed != -1) { + fileProgressFlag_set(FILEPROG_DB_SKIPPED_TUTORIAL, button_pressed ? 0 : 1); + gcdialog_showText(button_pressed ? ASSET_E07_TEXT_BOTTLES_UNKNOWN : ASSET_E09_TEXT_BOTTLES_SKIPPED_TUTORIAL, 0xe, this->position, this->marker, __chBottles_textCallback,__chBottles_textActions); + + if (!button_pressed) { + __chBottles_skipIntroTutorial(); + } + + this->unk38_0 = FALSE; + } + else if (!this->has_met_before && 5.0 < this->lifetime_value) { + gcdialog_showText(ASSET_E1D_TEXT_BOTTLES_TUTORIAL_OFFER_WAIT, 0x86, this->position, this->marker, __chBottles_textCallback, NULL); + this->has_met_before = TRUE; + } + } + break; + + case BOTTLES_STATE_4_UNKNOWN: //L8038A31C + if (0.35 < animctrl_getAnimTimer(this->animctrl) && animctrl_getAnimTimer(this->animctrl) < 0.9) { + func_8030E2C4(this->unk44_31); + } + else if (actor_animationIsAt(this, 0.9999f)) { //L8038A378 + __chBottles_setState(this, BOTTLES_STATE_1_UNKNOWN); func_80386540(); } - } - break; + break; }//L8038A3A0 } diff --git a/src/SM/code_F0.c b/src/SM/code_F0.c index 5d918fbb..d46ee5b5 100644 --- a/src/SM/code_F0.c +++ b/src/SM/code_F0.c @@ -18,7 +18,7 @@ extern ActorInfo D_8038AD58; //ch cauliflower A extern ActorInfo D_8038AC9C; //chCarrot FreeRange? extern ActorInfo D_8038AD0C; //ch onion B extern ActorInfo D_8038AD7C; //ch cauliflower B -extern ActorInfo chSmMole; //chSmMole bottles +extern ActorInfo chBottles; //chSmMole bottles extern ActorInfo D_8038B0B0; //chJumpTutorial code_4070 extern ActorInfo D_8038B0E0; extern ActorInfo D_8038B008; //chBanjosBed @@ -149,7 +149,7 @@ void SM_func_80386810(void) spawnableActorList_add(&D_8038AC9C, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_25); spawnableActorList_add(&D_8038AD0C, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_25); spawnableActorList_add(&D_8038AD7C, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_5 | ACTOR_FLAG_UNKNOWN_8 | ACTOR_FLAG_UNKNOWN_21 | ACTOR_FLAG_UNKNOWN_25); - spawnableActorList_add(&chSmMole, actor_new, ACTOR_FLAG_UNKNOWN_8); + spawnableActorList_add(&chBottles, actor_new, ACTOR_FLAG_UNKNOWN_8); spawnableActorList_add(&D_8038B0B0, actor_new, ACTOR_FLAG_NONE); spawnableActorList_add(&D_8038B0E0, actor_new, ACTOR_FLAG_NONE); spawnableActorList_add(&D_8038B008, actor_new, ACTOR_FLAG_UNKNOWN_3 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_7 | ACTOR_FLAG_UNKNOWN_9 | ACTOR_FLAG_UNKNOWN_10); diff --git a/src/core2/ch/mole.c b/src/core2/ch/mole.c index 932eab00..f159fe2e 100644 --- a/src/core2/ch/mole.c +++ b/src/core2/ch/mole.c @@ -7,7 +7,7 @@ Actor *func_802D94B4(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); void chmole_additionalAbilityLearnActions(ActorMarker *marker, enum asset_e arg1, s32 arg2); typedef struct{ - s16 learn_text; + s16 teach_text_id; s16 refresher_text; s8 camera_node; s8 ability; @@ -154,12 +154,12 @@ void chmole_healthRefill(ActorMarker *marker, enum asset_e arg1, s32 arg2){ // Also releases the camera Actor *actor = marker_getActor(marker); - if( arg1 == moleTable[actor->unkF4_8-9].learn_text + if( arg1 == moleTable[actor->unkF4_8-9].teach_text_id && item_getCount(ITEM_14_HEALTH) < item_getCount(ITEM_15_HEALTH_TOTAL) ){ gcdialog_showText(ASSET_D39_TEXT_BOTTLES_REFILL_HEALTH, 7, 0, actor->marker, chmole_healthRefill, chmole_additionalAbilityLearnActions); }//L802D9738 - else if(arg1 == moleTable[actor->unkF4_8-9].learn_text || arg1 == ASSET_D39_TEXT_BOTTLES_REFILL_HEALTH){ + else if(arg1 == moleTable[actor->unkF4_8-9].teach_text_id || arg1 == ASSET_D39_TEXT_BOTTLES_REFILL_HEALTH){ gcdialog_showText(chmole_learnedAllGameAbilities()? 0xa87 : chmole_learnedAllLevelAbilitiesDialog(), 7, 0, actor->marker, chmole_healthRefill, NULL); } else{//L802D97BC @@ -230,7 +230,7 @@ int chmole_learnAbility(Actor *this){ else{ func_80347A14(0); this->has_met_before = TRUE; - sp2C = moleTable[this->unkF4_8-9].learn_text; + sp2C = moleTable[this->unkF4_8-9].teach_text_id; ability_unlock(moleTable[this->unkF4_8-9].ability); switch(moleTable[this->unkF4_8-9].ability){ case ABILITY_9_FLIGHT: From 4270ed91b15ab3514f9f6786889e010166a0a63b Mon Sep 17 00:00:00 2001 From: Owlenuff Date: Thu, 3 Oct 2024 12:36:23 +0200 Subject: [PATCH 05/15] Move ch Bottles2 to Jump Tutorial --- decompressed.pal.yaml | 4 +- decompressed.us.v10.yaml | 4 +- include/enums.h | 4 +- src/SM/{code_4070.c => ch/jumptutorial.c} | 54 +++++++++++------------ 4 files changed, 33 insertions(+), 33 deletions(-) rename src/SM/{code_4070.c => ch/jumptutorial.c} (75%) diff --git a/decompressed.pal.yaml b/decompressed.pal.yaml index aab33b08..14e5dbf5 100644 --- a/decompressed.pal.yaml +++ b/decompressed.pal.yaml @@ -2140,7 +2140,7 @@ segments: # # - [0x108D450, c, code_2900] # # - [0x108D4E0, c, code_2990] # # - [0x108EB10, c, code_3FC0] -# # - [0x108EBC0, c, code_4070] +# # - [0x108EBC0, c, ch/jumptutorial] # # - [0x108F020, c, code_44D0] # # - [0x108F210, c, code_46C0] # # - [0x108F220, .data, code_0] @@ -2151,7 +2151,7 @@ segments: # # - [0x108F3B0, .data, ch/vegetables] # # - [0x108F6C0, .data, code_2990] # # - [0x108F750, .data, code_3FC0] -# # - [0x108F810, .data, code_4070] +# # - [0x108F810, .data, ch/jumptutorial] # # - [0x108F840, .data, code_44D0] # # - [0x108F870, .rodata, code_5B0] # # - [0x108F890, .rodata, ch/attacktutorial] diff --git a/decompressed.us.v10.yaml b/decompressed.us.v10.yaml index c1923b09..280622df 100644 --- a/decompressed.us.v10.yaml +++ b/decompressed.us.v10.yaml @@ -2138,7 +2138,7 @@ segments: - [0x108D450, c, code_2900] - [0x108D4E0, c, code_2990] - [0x108EB10, c, code_3FC0] - - [0x108EBC0, c, code_4070] + - [0x108EBC0, c, ch/jumptutorial] - [0x108F020, c, code_44D0] - [0x108F210, c, code_46C0] - [0x108F220, .data, code_0] @@ -2149,7 +2149,7 @@ segments: - [0x108F3B0, .data, ch/vegetables] - [0x108F6C0, .data, code_2990] - [0x108F750, .data, code_3FC0] - - [0x108F810, .data, code_4070] + - [0x108F810, .data, ch/jumptutorial] - [0x108F840, .data, code_44D0] - [0x108F870, .rodata, code_5B0] - [0x108F890, .rodata, ch/attacktutorial] diff --git a/include/enums.h b/include/enums.h index b97d19d6..df174250 100644 --- a/include/enums.h +++ b/include/enums.h @@ -2212,7 +2212,7 @@ enum actor_e ACTOR_3AF_GRUNTY_SHADOW = 0x3AF, - ACTOR_3B9_UNKNOWN = 0x3B9, + ACTOR_3B9_JUMP_TUTORIAL = 0x3B9, ACTOR_3BA_UNKNOWN, ACTOR_3BF_GRUNTLING_BLUE = 0x3bf, @@ -4960,7 +4960,7 @@ enum marker_e{ MARKER_1E9_MUMBO_COST_SIGN, MARKER_1EA_GRUNTLING_RED, - MARKER_1ED_UNKNOWN = 0x1ED, + MARKER_1ED_JUMP_TUTORIAL = 0x1ED, MARKER_1F1_GRUNTLING_BLACK = 0x1F1, diff --git a/src/SM/code_4070.c b/src/SM/ch/jumptutorial.c similarity index 75% rename from src/SM/code_4070.c rename to src/SM/ch/jumptutorial.c index e7de9f11..be6a1a17 100644 --- a/src/SM/code_4070.c +++ b/src/SM/ch/jumptutorial.c @@ -7,40 +7,40 @@ Actor *func_802D94B4(ActorMarker *, Gfx **, Mtx **, Vtx **); void timed_exitStaticCamera(f32); /* public functions */ -void chBottles2_update(Actor *this); -void chBottles2_setState(Actor *this, s32 state); +void chJumpTutorial_update(Actor *this); +void chJumpTutorial_setState(Actor *this, s32 state); /* .data */ -enum chBottles2_state_e { - BOTTLES2_STATE_1_IDLE = 1, - BOTTLES2_STATE_2_TEACHING, - BOTTLES2_STATE_3_DISAPPEARED +enum chJumpTutorial_state_e { + JUMP_TUTORIAL_STATE_1_IDLE = 1, + JUMP_TUTORIAL_STATE_2_TEACHING, + JUMP_TUTORIAL_STATE_3_DISAPPEARED }; ActorInfo D_8038B0B0 = { - MARKER_1ED_UNKNOWN, ACTOR_3B9_UNKNOWN, NULL, 1, NULL, - chBottles2_update, actor_update_func_80326224, func_80325340, + MARKER_1ED_JUMP_TUTORIAL, ACTOR_3B9_JUMP_TUTORIAL, NULL, 1, NULL, + chJumpTutorial_update, actor_update_func_80326224, func_80325340, 0, 0, 0.0f, 0 }; /* .code */ -void __chBottles2_setStaticCameraToNode4(Actor *this) { +void __chJumpTutorial_setStaticCameraToNode4(Actor *this) { timed_setStaticCameraToNode(0.0f, 4); } -void __chBottles2_textCallback(ActorMarker *caller, enum asset_e text_id, s32 arg2) { +void __chJumpTutorial_textCallback(ActorMarker *caller, enum asset_e text_id, s32 arg2) { Actor *actor = marker_getActor(caller); if (text_id == ASSET_DF9_TEXT_BOTTLES_UNKNOWN || text_id == ASSET_E12_TEXT_BOTTLES_LEARNED_TUTORIAL_MOVES) { - chBottles2_setState(actor, BOTTLES2_STATE_3_DISAPPEARED); + chJumpTutorial_setState(actor, JUMP_TUTORIAL_STATE_3_DISAPPEARED); } timed_exitStaticCamera(0.0f); } -void chBottles2_setState(Actor *this, s32 state) { +void chJumpTutorial_setState(Actor *this, s32 state) { switch (state) { - case BOTTLES2_STATE_2_TEACHING://L8038A50C + case JUMP_TUTORIAL_STATE_2_TEACHING://L8038A50C this->sm_4070.dialog_id = NULL; player_getPosition(this->velocity); func_8028F918(0); @@ -52,16 +52,16 @@ void chBottles2_setState(Actor *this, s32 state) { mapSpecificFlags_set(SM_SPECIFIC_FLAG_8_ABILITY_HOLD_A_JUMP_HIGHER_UNLOCKED, TRUE); } else {//L8038A560 - __chBottles2_setStaticCameraToNode4(this); + __chJumpTutorial_setStaticCameraToNode4(this); ability_unlock(ABILITY_A_HOLD_A_JUMP_HIGHER); - gcdialog_showText(ASSET_DF6_TEXT_BOTTLES_HIGH_JUMP_LEARN, 0xe, this->unk1C, this->marker, __chBottles2_textCallback, NULL); + gcdialog_showText(ASSET_DF6_TEXT_BOTTLES_HIGH_JUMP_LEARN, 0xe, this->unk1C, this->marker, __chJumpTutorial_textCallback, NULL); this->sm_4070.dialog_id = ASSET_E1A_TEXT_BOTTLES_UNKNOWN; mapSpecificFlags_set(SM_SPECIFIC_FLAG_8_ABILITY_HOLD_A_JUMP_HIGHER_UNLOCKED, FALSE); } break; - case BOTTLES2_STATE_3_DISAPPEARED://L8038A5B0 + case JUMP_TUTORIAL_STATE_3_DISAPPEARED://L8038A5B0 mapSpecificFlags_set(SM_SPECIFIC_FLAG_5, TRUE); break; }//L8038A5BC @@ -69,7 +69,7 @@ void chBottles2_setState(Actor *this, s32 state) { subaddie_set_state(this, state); } -void chBottles2_update(Actor *this) { +void chJumpTutorial_update(Actor *this) { f32 plyr_pos[3]; s32 face_buttons[6]; f32 distance_to_bottles; @@ -96,37 +96,37 @@ void chBottles2_update(Actor *this) { controller_copyFaceButtons(0, face_buttons); switch (this->state) { - case BOTTLES2_STATE_1_IDLE://L8038A688 + case JUMP_TUTORIAL_STATE_1_IDLE://L8038A688 if (fileProgressFlag_get(FILEPROG_DB_SKIPPED_TUTORIAL)) { marker_despawn(this->marker); } else if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_E)) { - chBottles2_setState(this, BOTTLES2_STATE_2_TEACHING); + chJumpTutorial_setState(this, JUMP_TUTORIAL_STATE_2_TEACHING); } break; - case BOTTLES2_STATE_2_TEACHING://L8038A6C8 + case JUMP_TUTORIAL_STATE_2_TEACHING://L8038A6C8 if (!func_803114B0()) { if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_8_ABILITY_HOLD_A_JUMP_HIGHER_UNLOCKED)) { - __chBottles2_setStaticCameraToNode4(this); + __chJumpTutorial_setStaticCameraToNode4(this); ability_unlock(ABILITY_7_FEATHERY_FLAP); - gcdialog_showText(ASSET_DF7_TEXT_BOTTLES_FEATHERY_FLAP_LEARN, 0xa, this->unk1C, this->marker, __chBottles2_textCallback, NULL); + gcdialog_showText(ASSET_DF7_TEXT_BOTTLES_FEATHERY_FLAP_LEARN, 0xa, this->unk1C, this->marker, __chJumpTutorial_textCallback, NULL); this->sm_4070.dialog_id = ASSET_E1B_TEXT_BOTTLES_UNKNOWN; mapSpecificFlags_set(SM_SPECIFIC_FLAG_8_ABILITY_HOLD_A_JUMP_HIGHER_UNLOCKED, FALSE); }//L8038A730 if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_9_ABILITY_FEATHERY_UNLOCKED)) { - __chBottles2_setStaticCameraToNode4(this); + __chJumpTutorial_setStaticCameraToNode4(this); ability_unlock(ABILITY_8_FLAP_FLIP); - gcdialog_showText(ASSET_DF8_TEXT_BOTTLES_FLAP_FLIP_LEARN, 0xa, this->unk1C, this->marker, __chBottles2_textCallback, NULL); + gcdialog_showText(ASSET_DF8_TEXT_BOTTLES_FLAP_FLIP_LEARN, 0xa, this->unk1C, this->marker, __chJumpTutorial_textCallback, NULL); this->sm_4070.dialog_id = ASSET_E1C_TEXT_BOTTLES_UNKNOWN; mapSpecificFlags_set(SM_SPECIFIC_FLAG_9_ABILITY_FEATHERY_UNLOCKED, FALSE); }//L8038A794 if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_A)) { - __chBottles2_setStaticCameraToNode4(this); + __chJumpTutorial_setStaticCameraToNode4(this); func_8028F94C(2, this->unk1C); if (!mapSpecificFlags_get(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED) && chmole_learnedAllSpiralMountainAbilities()) { @@ -137,7 +137,7 @@ void chBottles2_update(Actor *this) { dialog_id = ASSET_DF9_TEXT_BOTTLES_UNKNOWN; } - gcdialog_showText(dialog_id, 0xe, this->unk1C, this->marker, __chBottles2_textCallback, NULL); + gcdialog_showText(dialog_id, 0xe, this->unk1C, this->marker, __chJumpTutorial_textCallback, NULL); mapSpecificFlags_set(SM_SPECIFIC_FLAG_A, FALSE); this->sm_4070.dialog_id = NULL; } @@ -155,7 +155,7 @@ void chBottles2_update(Actor *this) { } break; - case BOTTLES2_STATE_3_DISAPPEARED://L8038A8A0 + case JUMP_TUTORIAL_STATE_3_DISAPPEARED://L8038A8A0 marker_despawn(this->marker); break; }//L8038A8AC From d38faa8147eb18ea32da06b789a5eed586a9f620 Mon Sep 17 00:00:00 2001 From: Owlenuff Date: Thu, 3 Oct 2024 12:57:37 +0200 Subject: [PATCH 06/15] Move ch Bottles to SmBottles --- decompressed.us.v10.yaml | 6 +- src/SM/{code_2990.c => ch/smbottles.c} | 174 ++++++++++++------------- src/core2/ch/mole.c | 4 +- 3 files changed, 92 insertions(+), 92 deletions(-) rename src/SM/{code_2990.c => ch/smbottles.c} (78%) diff --git a/decompressed.us.v10.yaml b/decompressed.us.v10.yaml index 280622df..d1b3db18 100644 --- a/decompressed.us.v10.yaml +++ b/decompressed.us.v10.yaml @@ -2136,7 +2136,7 @@ segments: - [0x108B8B0, c, ch/attacktutorial] - [0x108C070, c, ch/vegetables] - [0x108D450, c, code_2900] - - [0x108D4E0, c, code_2990] + - [0x108D4E0, c, ch/smbottles] - [0x108EB10, c, code_3FC0] - [0x108EBC0, c, ch/jumptutorial] - [0x108F020, c, code_44D0] @@ -2147,14 +2147,14 @@ segments: - [0x108F350, .data, code_BF0] - [0x108F380, .data, ch/attacktutorial] - [0x108F3B0, .data, ch/vegetables] - - [0x108F6C0, .data, code_2990] + - [0x108F6C0, .data, ch/smbottles] - [0x108F750, .data, code_3FC0] - [0x108F810, .data, ch/jumptutorial] - [0x108F840, .data, code_44D0] - [0x108F870, .rodata, code_5B0] - [0x108F890, .rodata, ch/attacktutorial] - [0x108F930, .rodata, ch/vegetables] - - [0x108F960, .rodata, code_2990] + - [0x108F960, .rodata, ch/smbottles] - [0x108FA70, .rodata, code_44D0] - [0x108FA80, .bss, code_F0] - name: cutscenes diff --git a/src/SM/code_2990.c b/src/SM/ch/smbottles.c similarity index 78% rename from src/SM/code_2990.c rename to src/SM/ch/smbottles.c index c58575a1..2b8e0098 100644 --- a/src/SM/code_2990.c +++ b/src/SM/ch/smbottles.c @@ -11,27 +11,27 @@ void timed_exitStaticCamera(f32); void subaddie_set_state_with_direction(Actor *, s32, f32, s32); /* typedefs and declarations */ -enum chBottles_state_e { - BOTTLES_STATE_1_UNKNOWN = 1, - BOTTLES_STATE_2_UNKNOWN, - BOTTLES_STATE_3_UNKNOWN, - BOTTLES_STATE_4_UNKNOWN, - BOTTLES_STATE_5_UNKNOWN +enum chSmBottles_state_e { + SM_BOTTLES_STATE_1_UNKNOWN = 1, + SM_BOTTLES_STATE_2_UNKNOWN, + SM_BOTTLES_STATE_3_UNKNOWN, + SM_BOTTLES_STATE_4_UNKNOWN, + SM_BOTTLES_STATE_5_UNKNOWN }; typedef struct { s16 teach_text_id; - s16 refresher_text; + s16 refresher_text_id; s8 camera_node; s8 ability; -} ChSmMoleDescription; +} ChSmBottlesDialog; /* public functions */ -void chBottles_update(Actor *this); -void __chBottles_talk(Actor *this); +void chSmBottles_update(Actor *this); +void __chSmBottles_talk(Actor *this); /* .data */ -ActorAnimationInfo chBottlesAnimations[6] = { +ActorAnimationInfo chSmBottlesAnimations[6] = { {NULL, 0.0f}, {ASSET_13A_ANIM_BOTTLES_ENTER, 2000000000.0f}, {ASSET_13A_ANIM_BOTTLES_ENTER, 4.5f}, @@ -41,12 +41,12 @@ ActorAnimationInfo chBottlesAnimations[6] = { }; ActorInfo chBottles = { - MARKER_B7_TUTORIAL_BOTTLES, ACTOR_12B_TUTORIAL_BOTTLES, ASSET_387_MODEL_BOTTLES, 1, chBottlesAnimations, - chBottles_update, actor_update_func_80326224, func_802D94B4, + MARKER_B7_TUTORIAL_BOTTLES, ACTOR_12B_TUTORIAL_BOTTLES, ASSET_387_MODEL_BOTTLES, 1, chSmBottlesAnimations, + chSmBottles_update, actor_update_func_80326224, func_802D94B4, 0, 0, 0.0f, 0 }; -ChSmMoleDescription chBottlesDialogTable[8] = { +ChSmBottlesDialog chSmBottlesDialogTable[8] = { {ASSET_DF3_TEXT_BOTTLES_INTRODUCTION, ASSET_E08_TEXT_BOTTLES_FIND_ANOTHER_MOLEHILL, 0x1, -1}, {ASSET_DF4_TEXT_BOTTLES_CAMERA_CONTROL_LEARN, ASSET_DF5_TEXT_BOTTLES_CAMERA_CONTROL_REFRESHER, 0x3, ABILITY_3_CAMERA_CONTROL}, {ASSET_DFB_TEXT_BOTTLES_DIVE_LEARN, ASSET_DFE_TEXT_BOTTLES_DIVE_REFRESHER, 0x5, ABILITY_F_DIVE}, @@ -57,14 +57,14 @@ ChSmMoleDescription chBottlesDialogTable[8] = { {ASSET_E10_TEXT_BOTTLES_BRIDGE_BROKEN, ASSET_E11_TEXT_BOTTLES_BRIDGE_STILL_BROKEN, 0x11, -1}, }; -s32 gDialogIndex = 0; +s32 chSmBottlesDialogIndex = 0; /* .code */ /** * @brief Checks if any Spiral Mountain abilities have been learned */ -bool __chBottles_isAnySpiralMountainAbilityLearned(void) { +bool __chSmBottles_isAnySpiralMountainAbilityLearned(void) { return ability_isUnlocked(ABILITY_F_DIVE) || ability_isUnlocked(ABILITY_4_CLAW_SWIPE) || ability_isUnlocked(ABILITY_C_ROLL) || @@ -80,7 +80,7 @@ bool __chBottles_isAnySpiralMountainAbilityLearned(void) { * @brief Sets all Spiral Mountain abilities to used & disables the noise * played when the player uses an ability for the first time. */ -void __chBottles_setHasUsedSpiralMountainAbilities(void) { +void __chSmBottles_setHasUsedSpiralMountainAbilities(void) { ability_unlock(ABILITY_3_CAMERA_CONTROL); ability_setHasUsed(ABILITY_0_BARGE); ability_setHasUsed(ABILITY_1_BEAK_BOMB); @@ -96,7 +96,7 @@ void __chBottles_setHasUsedSpiralMountainAbilities(void) { /** * @brief Unlocks all of the Spiral Mountain moves. */ -void __chBottles_skipIntroTutorial(void) { +void __chSmBottles_skipIntroTutorial(void) { ability_unlock(ABILITY_F_DIVE); ability_unlock(ABILITY_4_CLAW_SWIPE); ability_unlock(ABILITY_C_ROLL); @@ -106,7 +106,7 @@ void __chBottles_skipIntroTutorial(void) { ability_unlock(ABILITY_7_FEATHERY_FLAP); ability_unlock(ABILITY_8_FLAP_FLIP); ability_unlock(ABILITY_5_CLIMB); - __chBottles_setHasUsedSpiralMountainAbilities(); + __chSmBottles_setHasUsedSpiralMountainAbilities(); mapSpecificFlags_set(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED, TRUE); } @@ -114,40 +114,40 @@ void __chBottles_skipIntroTutorial(void) { * @brief If the player is talking to Intro Bottles for the first time, use the * camera that points to the lair. Otherwise, use the camera for the ability. */ -void __chBottles_setStaticCameraToNode(Actor *this) { +void __chSmBottles_setStaticCameraToNode(Actor *this) { if (this->unkF4_8 == 1 && !mapSpecificFlags_get(SM_SPECIFIC_FLAG_1_TALKED_TO_BOTTLES)) { timed_setStaticCameraToNode(0.0f, 0x12); } else { //L80388F68 - timed_setStaticCameraToNode(0.0f, chBottlesDialogTable[this->unkF4_8 - 1].camera_node); + timed_setStaticCameraToNode(0.0f, chSmBottlesDialogTable[this->unkF4_8 - 1].camera_node); } } -void __chBottles_setState(Actor *this, s32 next_state) { +void __chSmBottles_setState(Actor *this, s32 next_state) { Actor *other; ActorMarker *molehillMarker; switch (this->state) { - case BOTTLES_STATE_1_UNKNOWN://L80388FE8 + case SM_BOTTLES_STATE_1_UNKNOWN://L80388FE8 this->unk138_23 = 1; break; - case BOTTLES_STATE_4_UNKNOWN://L80388FF8 + case SM_BOTTLES_STATE_4_UNKNOWN://L80388FF8 this->unk138_23 = 0; - case BOTTLES_STATE_2_UNKNOWN://L80389004 + case SM_BOTTLES_STATE_2_UNKNOWN://L80389004 func_8030DA44(this->unk44_31); this->unk44_31 = 0; break; - case BOTTLES_STATE_5_UNKNOWN://L80389018 + case SM_BOTTLES_STATE_5_UNKNOWN://L80389018 this->unk138_23 = 0; func_8028F918(0); break; }//L8038902C switch (next_state) { - case BOTTLES_STATE_4_UNKNOWN: + case SM_BOTTLES_STATE_4_UNKNOWN: other = subaddie_getLinkedActor(this); molehillMarker = this->unk100; @@ -166,21 +166,21 @@ void __chBottles_setState(Actor *this, s32 next_state) { func_8028F918(0); break; - case BOTTLES_STATE_1_UNKNOWN: + case SM_BOTTLES_STATE_1_UNKNOWN: animctrl_setSmoothTransition(this->animctrl, 0); break; - case BOTTLES_STATE_5_UNKNOWN: - __chBottles_setStaticCameraToNode(this); + case SM_BOTTLES_STATE_5_UNKNOWN: + __chSmBottles_setStaticCameraToNode(this); func_8028F94C(2, this->position); - __chBottles_talk(this); + __chSmBottles_talk(this); break; - case BOTTLES_STATE_3_UNKNOWN: + case SM_BOTTLES_STATE_3_UNKNOWN: actor_loopAnimation(this); break; - case BOTTLES_STATE_2_UNKNOWN: + case SM_BOTTLES_STATE_2_UNKNOWN: other = subaddie_getLinkedActor(this); molehillMarker = this->unk100; @@ -197,7 +197,7 @@ void __chBottles_setState(Actor *this, s32 next_state) { sfxsource_playSfxAtVolume(this->unk44_31, 1.4f); sfxsource_setSampleRate(this->unk44_31, 0x6590); - __chBottles_setStaticCameraToNode(this); + __chSmBottles_setStaticCameraToNode(this); func_8028F94C(2, this->position); break; } @@ -209,7 +209,7 @@ void __chBottles_setState(Actor *this, s32 next_state) { * @brief Performs actions depending on what move is being learned * */ -static void __chBottles_textActions(ActorMarker *marker, enum asset_e text_id, s32 arg2) { +static void __chSmBottles_textActions(ActorMarker *marker, enum asset_e text_id, s32 arg2) { Actor *actor = marker_getActor(marker); switch (arg2) { @@ -230,17 +230,17 @@ static void __chBottles_textActions(ActorMarker *marker, enum asset_e text_id, s break; case 0xff: - __chBottles_setStaticCameraToNode(actor); + __chSmBottles_setStaticCameraToNode(actor); break; } } -void __chBottles_textCallback(ActorMarker *marker, enum asset_e text_id, s32 arg2) { +void __chSmBottles_textCallback(ActorMarker *marker, enum asset_e text_id, s32 arg2) { Actor *actor = marker_getActor(marker); if (!mapSpecificFlags_get(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED) && chmole_learnedAllSpiralMountainAbilities()) { mapSpecificFlags_set(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED, TRUE); - gcdialog_showText(ASSET_E12_TEXT_BOTTLES_LEARNED_TUTORIAL_MOVES, 0xe, actor->position, actor->marker, __chBottles_textCallback, NULL); + gcdialog_showText(ASSET_E12_TEXT_BOTTLES_LEARNED_TUTORIAL_MOVES, 0xe, actor->position, actor->marker, __chSmBottles_textCallback, NULL); }//L8038933C else { if (!(text_id == ASSET_DF3_TEXT_BOTTLES_INTRODUCTION || text_id == ASSET_E1F_TEXT_BOTTLES_TUTORIAL_OFFER || text_id == ASSET_E1D_TEXT_BOTTLES_TUTORIAL_OFFER_WAIT)) { @@ -252,7 +252,7 @@ void __chBottles_textCallback(ActorMarker *marker, enum asset_e text_id, s32 arg break; case ASSET_DF3_TEXT_BOTTLES_INTRODUCTION: /* 2FB8 803893A8 3C188039 */ - gcdialog_showText(ASSET_E1F_TEXT_BOTTLES_TUTORIAL_OFFER, 0x8e, actor->position, actor->marker, __chBottles_textCallback, __chBottles_textActions); + gcdialog_showText(ASSET_E1F_TEXT_BOTTLES_TUTORIAL_OFFER, 0x8e, actor->position, actor->marker, __chSmBottles_textCallback, __chSmBottles_textActions); break; case ASSET_E1F_TEXT_BOTTLES_TUTORIAL_OFFER: /* 2FEC 803893DC 9209003B */ @@ -271,28 +271,28 @@ void __chBottles_textCallback(ActorMarker *marker, enum asset_e text_id, s32 arg case ASSET_E09_TEXT_BOTTLES_SKIPPED_TUTORIAL: case ASSET_E12_TEXT_BOTTLES_LEARNED_TUTORIAL_MOVES: - __chBottles_setState(actor, BOTTLES_STATE_4_UNKNOWN); + __chSmBottles_setState(actor, SM_BOTTLES_STATE_4_UNKNOWN); break; default: - if (actor->state != BOTTLES_STATE_5_UNKNOWN) { + if (actor->state != SM_BOTTLES_STATE_5_UNKNOWN) { gcdialog_showText(ASSET_D38_TEXT_BOTTLES_ALL_MOVES_LEARNED, 0x4, NULL, NULL, NULL, NULL); } - __chBottles_setState(actor, actor->state == BOTTLES_STATE_5_UNKNOWN ? BOTTLES_STATE_1_UNKNOWN : BOTTLES_STATE_4_UNKNOWN); + __chSmBottles_setState(actor, actor->state == SM_BOTTLES_STATE_5_UNKNOWN ? SM_BOTTLES_STATE_1_UNKNOWN : SM_BOTTLES_STATE_4_UNKNOWN); break; } } } -void __chBottles_getReteachDialog(Actor *this, s32 *text_id, s32 *text_flags) { +void __chSmBottles_getRefresherDialog(Actor *this, s32 *text_id, s32 *text_flags) { // Selects the learn and refresh dialogs. // Gives the player the ability if not learned. - if (ability_isUnlocked(chBottlesDialogTable[this->unkF4_8 - 1].ability)) { + if (ability_isUnlocked(chSmBottlesDialogTable[this->unkF4_8 - 1].ability)) { if (fileProgressFlag_get(FILEPROG_DB_SKIPPED_TUTORIAL)) { - *text_id = gDialogIndex + ASSET_E0A_TEXT_BOTTLES_REFUSE_HELP_1; - gDialogIndex++; - gDialogIndex = MIN(gDialogIndex, 5); + *text_id = chSmBottlesDialogIndex + ASSET_E0A_TEXT_BOTTLES_REFUSE_HELP_1; + chSmBottlesDialogIndex++; + chSmBottlesDialogIndex = MIN(chSmBottlesDialogIndex, 5); if (*text_id != ASSET_E0E_TEXT_BOTTLES_REFUSE_HELP_5) { *text_flags |= 1; @@ -300,7 +300,7 @@ void __chBottles_getReteachDialog(Actor *this, s32 *text_id, s32 *text_flags) { } else {//L8038956C *text_flags |= 1; - *text_id = chBottlesDialogTable[this->unkF4_8 - 1].refresher_text; + *text_id = chSmBottlesDialogTable[this->unkF4_8 - 1].refresher_text_id; if (*text_id == ASSET_DFE_TEXT_BOTTLES_DIVE_REFRESHER && !ability_hasUsed(ABILITY_3_CAMERA_CONTROL)) { *text_id = ASSET_DFD_TEXT_BOTTLES_SWIM_LEARN; @@ -308,12 +308,12 @@ void __chBottles_getReteachDialog(Actor *this, s32 *text_id, s32 *text_flags) { } } else {//L803895C0 - *text_id = chBottlesDialogTable[this->unkF4_8 - 1].teach_text_id; - ability_unlock(chBottlesDialogTable[this->unkF4_8 - 1].ability); + *text_id = chSmBottlesDialogTable[this->unkF4_8 - 1].teach_text_id; + ability_unlock(chSmBottlesDialogTable[this->unkF4_8 - 1].ability); } } -void __chBottles_talk(Actor *this) { +void __chSmBottles_talk(Actor *this) { s32 text_id; s32 text_flags; @@ -326,16 +326,16 @@ void __chBottles_talk(Actor *this) { text_flags |= 1; if (fileProgressFlag_get(FILEPROG_DB_SKIPPED_TUTORIAL)) { - text_id = gDialogIndex + ASSET_E0A_TEXT_BOTTLES_REFUSE_HELP_1; - gDialogIndex++; - gDialogIndex = MIN(gDialogIndex, 5); + text_id = chSmBottlesDialogIndex + ASSET_E0A_TEXT_BOTTLES_REFUSE_HELP_1; + chSmBottlesDialogIndex++; + chSmBottlesDialogIndex = MIN(chSmBottlesDialogIndex, 5); } else {//L803896C0 - text_id = chBottlesDialogTable[this->unkF4_8 - 1].refresher_text; + text_id = chSmBottlesDialogTable[this->unkF4_8 - 1].refresher_text_id; } } else {//L803896E8 - text_id = chBottlesDialogTable[this->unkF4_8 - 1].teach_text_id; + text_id = chSmBottlesDialogTable[this->unkF4_8 - 1].teach_text_id; mapSpecificFlags_set(SM_SPECIFIC_FLAG_1_TALKED_TO_BOTTLES, TRUE); } break; @@ -351,7 +351,7 @@ void __chBottles_talk(Actor *this) { text_flags |= 1; } else {//L80389780 - __chBottles_setHasUsedSpiralMountainAbilities(); + __chSmBottles_setHasUsedSpiralMountainAbilities(); text_id = fileProgressFlag_get(FILEPROG_DB_SKIPPED_TUTORIAL) ? 0xe1e : 0xe13; mapSpecificFlags_set(SM_SPECIFIC_FLAG_F, TRUE); } //L803897B4 @@ -360,11 +360,11 @@ void __chBottles_talk(Actor *this) { } else {//L803897C8 if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_2)) { - text_id = chBottlesDialogTable[this->unkF4_8 - 1].refresher_text; + text_id = chSmBottlesDialogTable[this->unkF4_8 - 1].refresher_text_id; text_flags |= 1; } else { - text_id = chBottlesDialogTable[this->unkF4_8 - 1].teach_text_id; + text_id = chSmBottlesDialogTable[this->unkF4_8 - 1].teach_text_id; mapSpecificFlags_set(SM_SPECIFIC_FLAG_2, TRUE); } } @@ -375,7 +375,7 @@ void __chBottles_talk(Actor *this) { mapSpecificFlags_set(SM_SPECIFIC_FLAG_4, TRUE); } else {//L803898E4 - __chBottles_getReteachDialog(this, &text_id, &text_flags); + __chSmBottles_getRefresherDialog(this, &text_id, &text_flags); } break; @@ -384,24 +384,24 @@ void __chBottles_talk(Actor *this) { mapSpecificFlags_set(SM_SPECIFIC_FLAG_E, TRUE); } else {//L803898E4 - __chBottles_getReteachDialog(this, &text_id, &text_flags); + __chSmBottles_getRefresherDialog(this, &text_id, &text_flags); } break; default://L803898F8 - __chBottles_getReteachDialog(this, &text_id, &text_flags); + __chSmBottles_getRefresherDialog(this, &text_id, &text_flags); break; }//L80389904 if (text_id) { - gcdialog_showText(text_id, text_flags, this->position, this->marker, __chBottles_textCallback, __chBottles_textActions); + gcdialog_showText(text_id, text_flags, this->position, this->marker, __chSmBottles_textCallback, __chSmBottles_textActions); } } /** * @brief Spawns a molehill for the actor */ -void __chBottles_spawnMolehill(ActorMarker *marker) { +void __chSmBottles_spawnMolehill(ActorMarker *marker) { Actor *this; Actor *molehill; s32 pad; @@ -413,7 +413,7 @@ void __chBottles_spawnMolehill(ActorMarker *marker) { if (marker); } -void __chBottles_free(Actor *this) { +void __chSmBottles_free(Actor *this) { u8 tmp = this->unk44_31; if (tmp) { @@ -421,7 +421,7 @@ void __chBottles_free(Actor *this) { } } -void chBottles_update(Actor *this) { +void chSmBottles_update(Actor *this) { s32 face_buttons[6]; f32 plyr_pos[3]; void *sp40; @@ -438,7 +438,7 @@ void chBottles_update(Actor *this) { this->marker->propPtr->unk8_3 = 0; actor_collisionOff(this); this->initialized = TRUE; - marker_setFreeMethod(this->marker, __chBottles_free); + marker_setFreeMethod(this->marker, __chSmBottles_free); if (this->unkF4_8 == 1 || this->unkF4_8 == 8) {//L80389A30 sp40 = nodeprop_findByActorIdAndActorPosition(ACTOR_349_UNKNOWN, this); @@ -456,12 +456,12 @@ void chBottles_update(Actor *this) { if (this->unkF4_8 == 1) { if (volatileFlag_get(VOLATILE_FLAG_1) || volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) { - __chBottles_setState(this, BOTTLES_STATE_3_UNKNOWN); + __chSmBottles_setState(this, SM_BOTTLES_STATE_3_UNKNOWN); } } }//L80389AC8 - if (__chBottles_isAnySpiralMountainAbilityLearned()) { + if (__chSmBottles_isAnySpiralMountainAbilityLearned()) { mapSpecificFlags_set(SM_SPECIFIC_FLAG_1_TALKED_TO_BOTTLES, TRUE); if (chmole_learnedAllSpiralMountainAbilities()) { @@ -474,7 +474,7 @@ void chBottles_update(Actor *this) { }//L80389B20 if (!this->volatile_initialized) { - __spawnQueue_add_1((GenFunction_1) __chBottles_spawnMolehill, reinterpret_cast(s32, this->marker)); + __spawnQueue_add_1((GenFunction_1) __chSmBottles_spawnMolehill, reinterpret_cast(s32, this->marker)); this->volatile_initialized = TRUE; }//L80389B4C @@ -486,7 +486,7 @@ void chBottles_update(Actor *this) { player_getPosition(plyr_pos); switch (this->state) { - case BOTTLES_STATE_1_UNKNOWN://L80389BAC + case SM_BOTTLES_STATE_1_UNKNOWN://L80389BAC this->yaw_ideal = (f32) func_80329784(this); func_80328FB0(this, 4.0f); @@ -502,7 +502,7 @@ void chBottles_update(Actor *this) { } //L80389CA4 - __chBottles_setState(this, BOTTLES_STATE_2_UNKNOWN); + __chSmBottles_setState(this, SM_BOTTLES_STATE_2_UNKNOWN); } } else {//L80389CBC @@ -510,20 +510,20 @@ void chBottles_update(Actor *this) { break; } - sp34 = (chBottlesDialogTable[this->unkF4_8 - 1].ability + 1) && ability_isUnlocked(chBottlesDialogTable[this->unkF4_8 - 1].ability); + sp34 = (chSmBottlesDialogTable[this->unkF4_8 - 1].ability + 1) && ability_isUnlocked(chSmBottlesDialogTable[this->unkF4_8 - 1].ability); - if (!sp34 && this->unkF4_8 != 1 || fileProgressFlag_get(FILEPROG_DB_SKIPPED_TUTORIAL) == 0 || gDialogIndex < 6) { + if (!sp34 && this->unkF4_8 != 1 || fileProgressFlag_get(FILEPROG_DB_SKIPPED_TUTORIAL) == 0 || chSmBottlesDialogIndex < 6) { if (this->unkF4_8 != 8 || !fileProgressFlag_get(FILEPROG_FC_DEFEAT_GRUNTY)) { if (func_8028EFC8() && face_buttons[FACE_BUTTON(BUTTON_B)] == 1) { if (sp34 || this->unkF4_8 == 1 || this->unkF4_8 == 8) { - __chBottles_setState(this, BOTTLES_STATE_5_UNKNOWN); + __chSmBottles_setState(this, SM_BOTTLES_STATE_5_UNKNOWN); } else { if (func_80329530(this, 0x96) && !sp34) { func_8028F45C(9, this->position); } - __chBottles_setState(this, BOTTLES_STATE_2_UNKNOWN); + __chSmBottles_setState(this, SM_BOTTLES_STATE_2_UNKNOWN); } } } @@ -531,7 +531,7 @@ void chBottles_update(Actor *this) { } break; - case BOTTLES_STATE_2_UNKNOWN://L80389E2C + case SM_BOTTLES_STATE_2_UNKNOWN://L80389E2C this->yaw_ideal = func_80329784(this); func_80328FB0(this, 4.0f); @@ -541,10 +541,10 @@ void chBottles_update(Actor *this) { if (actor_animationIsAt(this, 0.9999f)) { if (!mapSpecificFlags_get(SM_SPECIFIC_FLAG_1_TALKED_TO_BOTTLES)) { - __chBottles_talk(this); + __chSmBottles_talk(this); } - __chBottles_setState(this, BOTTLES_STATE_3_UNKNOWN); + __chSmBottles_setState(this, SM_BOTTLES_STATE_3_UNKNOWN); }//L80389EE0 else if (actor_animationIsAt(this, 0.14f)) { FUNC_8030E8B4(SFX_C6_SHAKING_MOUTH, 1.2f, 24000, this->position, 1250, 2500); @@ -557,12 +557,12 @@ void chBottles_update(Actor *this) { } else if (actor_animationIsAt(this, 0.35f)) {//L80389F78 if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_1_TALKED_TO_BOTTLES)) { - __chBottles_talk(this); + __chSmBottles_talk(this); } } break; - case BOTTLES_STATE_3_UNKNOWN://L80389FAC + case SM_BOTTLES_STATE_3_UNKNOWN://L80389FAC this->yaw_ideal = func_80329784(this); func_80328FB0(this, 4.0f); @@ -590,7 +590,7 @@ void chBottles_update(Actor *this) { if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_5)) { mapSpecificFlags_set(SM_SPECIFIC_FLAG_5, FALSE); - __chBottles_setState(this, BOTTLES_STATE_4_UNKNOWN); + __chSmBottles_setState(this, SM_BOTTLES_STATE_4_UNKNOWN); }//L8038A1B8 button_pressed = -1; @@ -609,27 +609,27 @@ void chBottles_update(Actor *this) { if (button_pressed != -1) { fileProgressFlag_set(FILEPROG_DB_SKIPPED_TUTORIAL, button_pressed ? 0 : 1); - gcdialog_showText(button_pressed ? ASSET_E07_TEXT_BOTTLES_UNKNOWN : ASSET_E09_TEXT_BOTTLES_SKIPPED_TUTORIAL, 0xe, this->position, this->marker, __chBottles_textCallback,__chBottles_textActions); + gcdialog_showText(button_pressed ? ASSET_E07_TEXT_BOTTLES_UNKNOWN : ASSET_E09_TEXT_BOTTLES_SKIPPED_TUTORIAL, 0xe, this->position, this->marker, __chSmBottles_textCallback,__chSmBottles_textActions); if (!button_pressed) { - __chBottles_skipIntroTutorial(); + __chSmBottles_skipIntroTutorial(); } this->unk38_0 = FALSE; } else if (!this->has_met_before && 5.0 < this->lifetime_value) { - gcdialog_showText(ASSET_E1D_TEXT_BOTTLES_TUTORIAL_OFFER_WAIT, 0x86, this->position, this->marker, __chBottles_textCallback, NULL); + gcdialog_showText(ASSET_E1D_TEXT_BOTTLES_TUTORIAL_OFFER_WAIT, 0x86, this->position, this->marker, __chSmBottles_textCallback, NULL); this->has_met_before = TRUE; } } break; - case BOTTLES_STATE_4_UNKNOWN: //L8038A31C + case SM_BOTTLES_STATE_4_UNKNOWN: //L8038A31C if (0.35 < animctrl_getAnimTimer(this->animctrl) && animctrl_getAnimTimer(this->animctrl) < 0.9) { func_8030E2C4(this->unk44_31); } else if (actor_animationIsAt(this, 0.9999f)) { //L8038A378 - __chBottles_setState(this, BOTTLES_STATE_1_UNKNOWN); + __chSmBottles_setState(this, SM_BOTTLES_STATE_1_UNKNOWN); func_80386540(); } break; diff --git a/src/core2/ch/mole.c b/src/core2/ch/mole.c index f159fe2e..31822185 100644 --- a/src/core2/ch/mole.c +++ b/src/core2/ch/mole.c @@ -8,7 +8,7 @@ void chmole_additionalAbilityLearnActions(ActorMarker *marker, enum asset_e arg1 typedef struct{ s16 teach_text_id; - s16 refresher_text; + s16 refresher_text_id; s8 camera_node; s8 ability; } ChMoleDescription; @@ -224,7 +224,7 @@ int chmole_learnAbility(Actor *this){ // Known Ability: Refresher Dialog if(ability_isUnlocked(moleTable[this->unkF4_8-9].ability)){ sp28 = 0xf; - sp2C = moleTable[this->unkF4_8-9].refresher_text; + sp2C = moleTable[this->unkF4_8-9].refresher_text_id; }//L802D99EC // New Ability: Learn Dialog & Misc Actions else{ From 9ad24710440c675223138d4fe6f198500e281578 Mon Sep 17 00:00:00 2001 From: Owlenuff Date: Thu, 3 Oct 2024 13:20:33 +0200 Subject: [PATCH 07/15] Document ch Attack Tutorial --- src/SM/ch/attacktutorial.c | 313 ++++++++++++++++++++----------------- src/SM/ch/jumptutorial.c | 3 +- src/SM/ch/smbottles.c | 3 +- 3 files changed, 176 insertions(+), 143 deletions(-) diff --git a/src/SM/ch/attacktutorial.c b/src/SM/ch/attacktutorial.c index e2b18388..2ec217a7 100644 --- a/src/SM/ch/attacktutorial.c +++ b/src/SM/ch/attacktutorial.c @@ -2,224 +2,255 @@ #include "functions.h" #include "variables.h" -/* chAttackTutorial - controls bottle teaching moves in spiral*/ - -//external +/* extern functions */ void timed_exitStaticCamera(f32); void func_8028F918(s32); -//public -void func_80387764(ActorMarker *); -void chAttackTutorial_setState(Actor * this, s32 arg1); +/* public functions */ +void chAttackTutorial_talk(ActorMarker *); +void chAttackTutorial_setState(Actor *this, s32 state); void chAttackTutorial_update(Actor *); - /* .data */ -ActorInfo D_8038AC20 = { MARKER_12B_ATTACK_TUTORIAL, ACTOR_167_ATTACK_TUTORIAL, 0, +enum chAttackTutorial_state_e { + ATTACK_TUTORIAL_STATE_1_UNKNOWN = 1, + ATTACK_TUTORIAL_STATE_2_UNKNOWN, + ATTACK_TUTORIAL_STATE_3_UNKNOWN, + ATTACK_TUTORIAL_STATE_4_UNKNOWN, + ATTACK_TUTORIAL_STATE_5_UNKNOWN +}; + +enum chAttackTutorial_enemy_e { + ATTACK_TUTORIAL_ENEMY_1_TOPPER = 1, + ATTACK_TUTORIAL_ENEMY_2_BAWL, + ATTACK_TUTORIAL_ENEMY_3_COLLY_WOBBLE +}; + +ActorInfo D_8038AC20 = { + MARKER_12B_ATTACK_TUTORIAL, ACTOR_167_ATTACK_TUTORIAL, NULL, 1, NULL, chAttackTutorial_update, actor_update_func_80326224, func_80325340, 0, 0, 0.0f, 0 }; /* .code */ -void __chAttackTutorial_spawnEnemy(ActorMarker *marker, s32 enemy_id){ +void __chAttackTutorial_enemy(ActorMarker *marker, s32 enemy_id) { Actor *actor = marker_getActor(marker); s32 pad; - Actor *other = spawn_child_actor(enemy_id, &actor); + Actor *enemy = spawn_child_actor(enemy_id, &actor); - actor->unk100 = other->marker; - other->unk100 = actor->marker; - if(actor->unk10_12 == 3 && actor->unk38_31 == 1){ - other->unk38_31 = 1; - }else{//L803871D4 - other->unk38_31 = 0; + actor->unk100 = enemy->marker; + enemy->unk100 = actor->marker; + + if (actor->unk10_12 == ATTACK_TUTORIAL_ENEMY_3_COLLY_WOBBLE && actor->unk38_31 == 1) { + enemy->unk38_31 = 1; } - other->unk10_12 = 1; - if(marker); + else {//L803871D4 + enemy->unk38_31 = 0; + } + + enemy->unk10_12 = ATTACK_TUTORIAL_ENEMY_1_TOPPER; + if (marker); } -s32 SM_func_803871FC(Actor *this, s32 arg1){ +s32 __chAttackTutorial_spawnEnemy(Actor *this, enum chAttackTutorial_enemy_e enemy) { volatile s32 sp1C; - s32 tmp_v0; - - sp1C = (arg1 == 1)? ACTOR_166_TOPPER_A : (tmp_v0 = (arg1 == 2)? ACTOR_165_BAWL_A : ACTOR_164_COLLYWOBBLE_A); - __spawnQueue_add_2(__chAttackTutorial_spawnEnemy, this->marker, sp1C); - + + sp1C = enemy == ATTACK_TUTORIAL_ENEMY_1_TOPPER ? ACTOR_166_TOPPER_A : + enemy == ATTACK_TUTORIAL_ENEMY_2_BAWL ? ACTOR_165_BAWL_A : ACTOR_164_COLLYWOBBLE_A; + + __spawnQueue_add_2(__chAttackTutorial_enemy, this->marker, sp1C); } -void func_80387258(ActorMarker *marker, enum asset_e text_id, s32 arg2){ - chAttackTutorial_setState(marker_getActor(marker), 2); +void __chAttackTutorial_learnedTextActions(ActorMarker *marker, enum asset_e text_id, s32 arg2) { + chAttackTutorial_setState(marker_getActor(marker), ATTACK_TUTORIAL_STATE_2_UNKNOWN); } -void func_80387288(ActorMarker *marker, enum asset_e text_id, s32 arg2){ +void __chAttackTutorial_learnedTextCallback(ActorMarker *marker, enum asset_e text_id, s32 arg2) { Actor *actor = marker_getActor(marker); func_8028F918(0); - switch(text_id){ - case 0xe15://L803872C8 + + switch (text_id) { + case ASSET_E15_TEXT_UNKNOWN://L803872C8 ability_unlock(ABILITY_C_ROLL); - chAttackTutorial_setState(actor, 2); + chAttackTutorial_setState(actor, ATTACK_TUTORIAL_STATE_2_UNKNOWN); break; - case 0xe17://L803872E4 + + case ASSET_E17_TEXT_UNKNOWN://L803872E4 ability_unlock(ABILITY_B_RATATAT_RAP); - chAttackTutorial_setState(actor, 2); + chAttackTutorial_setState(actor, ATTACK_TUTORIAL_STATE_2_UNKNOWN); break; }//L803872FC + timed_exitStaticCamera(0.0f); } -void chAttackTutorial_setState(Actor * this, s32 arg1){ - switch (arg1) - { - case 5: - if(this->unk10_12 == 0){ - ability_unlock(ABILITY_4_CLAW_SWIPE); - gcdialog_showText(ASSET_DFF_TEXT_BOTTLES_CLAW_SWIPE_LEARN, 0xE, this->unk1C, this->marker, func_80387288, func_80387258); - } - else{ - gcdialog_showText((this->unk10_12 == 1) ? ASSET_E15_TEXT_UNKNOWN : ASSET_E17_TEXT_UNKNOWN, 0xE, this->unk1C, this->marker, func_80387288, NULL); - } - break; - case 2://L803873E0 - - this->unk38_31 = 0; - SM_func_803871FC(this, ++this->unk10_12); - break; - case 3://L8038742C - mapSpecificFlags_set(SM_SPECIFIC_FLAG_5, TRUE); - mapSpecificFlags_set(SM_SPECIFIC_FLAG_C, TRUE); - marker_despawn(this->marker); - break; - - case 4://L80387454 - mapSpecificFlags_set(SM_SPECIFIC_FLAG_C, TRUE); - if(!honeycombscore_get(HONEYCOMB_17_SM_COLIWOBBLE)){ - this->unk10_12 = 3; - this->unk38_31 = 1; - SM_func_803871FC(this, this->unk10_12); - } - break; - }//L803874A8 - subaddie_set_state(this, arg1); -} - -int func_803874C4(void){ - return ability_isUnlocked(ABILITY_4_CLAW_SWIPE) - && ability_isUnlocked(ABILITY_C_ROLL) - && ability_isUnlocked(ABILITY_B_RATATAT_RAP); -} - -void chAttackTutorial_update(Actor *this){ - f32 sp2C; - Actor *bottles; - - if(!this->initialized){ - //find closest tutorial bottles - bottles = actorArray_findClosestActorFromActorId(this->position, ACTOR_12B_TUTORIAL_BOTTLES, -1, &sp2C); - if(bottles != NULL){ - this->unk1C_x = bottles->position_x; - this->unk1C_y = bottles->position_y; - this->unk1C_z = bottles->position_z; - }else{ - {this->unk1C_x = this->position_x; - this->unk1C_y = this->position_y; - this->unk1C_z = this->position_z;} - } - this->unk10_12 = (ability_isUnlocked(ABILITY_C_ROLL))? 2 : (ability_isUnlocked(ABILITY_4_CLAW_SWIPE)? 1:0); - this->initialized = TRUE; - } - - switch(this->state){ - case 1://L80387610 - if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_4)) { - chAttackTutorial_setState(this, 5); +void chAttackTutorial_setState(Actor *this, s32 state) { + switch (state) { + case ATTACK_TUTORIAL_STATE_5_UNKNOWN: + if (this->unk10_12 == NULL) { + ability_unlock(ABILITY_4_CLAW_SWIPE); + gcdialog_showText(ASSET_DFF_TEXT_BOTTLES_CLAW_SWIPE_LEARN, 0xE, this->unk1C, this->marker, __chAttackTutorial_learnedTextCallback, __chAttackTutorial_learnedTextActions); } - - if (func_803874C4() || volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)) { - chAttackTutorial_setState(this, 4); + else { + gcdialog_showText(this->unk10_12 == ATTACK_TUTORIAL_ENEMY_1_TOPPER ? ASSET_E15_TEXT_UNKNOWN : ASSET_E17_TEXT_UNKNOWN, 0xE, this->unk1C, this->marker, __chAttackTutorial_learnedTextCallback, NULL); } break; - case 2://L80387658 + case ATTACK_TUTORIAL_STATE_2_UNKNOWN://L803873E0 + this->unk38_31 = 0; + __chAttackTutorial_spawnEnemy(this, ++this->unk10_12); + break; + + case ATTACK_TUTORIAL_STATE_3_UNKNOWN://L8038742C + mapSpecificFlags_set(SM_SPECIFIC_FLAG_5, TRUE); + mapSpecificFlags_set(SM_SPECIFIC_FLAG_C, TRUE); + marker_despawn(this->marker); + break; + + case ATTACK_TUTORIAL_STATE_4_UNKNOWN://L80387454 + mapSpecificFlags_set(SM_SPECIFIC_FLAG_C, TRUE); + + if (!honeycombscore_get(HONEYCOMB_17_SM_COLIWOBBLE)) { + this->unk10_12 = ATTACK_TUTORIAL_ENEMY_3_COLLY_WOBBLE; + this->unk38_31 = 1; + __chAttackTutorial_spawnEnemy(this, this->unk10_12); + } + break; + }//L803874A8 + + subaddie_set_state(this, state); +} + +int __chAttackTutorial_isEveryAbilitiesUnlocked(void) { + return ability_isUnlocked(ABILITY_4_CLAW_SWIPE) && + ability_isUnlocked(ABILITY_C_ROLL) && + ability_isUnlocked(ABILITY_B_RATATAT_RAP); +} + +void chAttackTutorial_update(Actor *this) { + f32 distance_to_bottles; + Actor *bottles_ptr; + + if (!this->initialized) { + bottles_ptr = actorArray_findClosestActorFromActorId(this->position, ACTOR_12B_TUTORIAL_BOTTLES, -1, &distance_to_bottles); + + if (bottles_ptr != NULL) { + this->unk1C_x = bottles_ptr->position_x; + this->unk1C_y = bottles_ptr->position_y; + this->unk1C_z = bottles_ptr->position_z; + } + else { + this->unk1C_x = this->position_x; + this->unk1C_y = this->position_y; + this->unk1C_z = this->position_z; + } + + this->unk10_12 = ability_isUnlocked(ABILITY_C_ROLL) ? ATTACK_TUTORIAL_ENEMY_2_BAWL : + ability_isUnlocked(ABILITY_4_CLAW_SWIPE) ? ATTACK_TUTORIAL_ENEMY_1_TOPPER : NULL; + + this->initialized = TRUE; + } + + switch (this->state) { + case ATTACK_TUTORIAL_STATE_1_UNKNOWN://L80387610 + if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_4)) { + chAttackTutorial_setState(this, ATTACK_TUTORIAL_STATE_5_UNKNOWN); + } + + if (__chAttackTutorial_isEveryAbilitiesUnlocked() || volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)) { + chAttackTutorial_setState(this, ATTACK_TUTORIAL_STATE_4_UNKNOWN); + } + break; + + case ATTACK_TUTORIAL_STATE_2_UNKNOWN://L80387658 if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_7)) { - func_80387764(this->marker); + chAttackTutorial_talk(this->marker); mapSpecificFlags_set(SM_SPECIFIC_FLAG_7, FALSE); } break; - case 5://L80387680 + case ATTACK_TUTORIAL_STATE_5_UNKNOWN://L80387680 break; }////L80387680 } -void func_80387690(ActorMarker *marker, enum asset_e text_id, s32 arg2){ +void __chAttackTutorial_attackTextCallback(ActorMarker *marker, enum asset_e text_id, s32 arg2) { Actor *actor = marker_getActor(marker); - switch(text_id){ - case 0xDFF: + + switch (text_id) { + case ASSET_DFF_TEXT_BOTTLES_CLAW_SWIPE_LEARN: func_8028F918(0); break; - case 0xE14: - case 0xE16: - case 0xE18: - SM_func_803871FC(actor, actor->unk10_12); + + case ASSET_E14_TEXT_UNKNOWN: + case ASSET_E16_TEXT_UNKNOWN: + case ASSET_E18_TEXT_UNKNOWN: + __chAttackTutorial_spawnEnemy(actor, actor->unk10_12); break; - case 0xE15: + + case ASSET_E15_TEXT_UNKNOWN: ability_unlock(ABILITY_C_ROLL); - chAttackTutorial_setState(actor, 2); + chAttackTutorial_setState(actor, ATTACK_TUTORIAL_STATE_2_UNKNOWN); break; - case 0xE17: + + case ASSET_E17_TEXT_UNKNOWN: ability_unlock(ABILITY_B_RATATAT_RAP); - chAttackTutorial_setState(actor, 2); + chAttackTutorial_setState(actor, ATTACK_TUTORIAL_STATE_2_UNKNOWN); break; - case 0xE12: - case 0xE19: - chAttackTutorial_setState(actor, 3); + + case ASSET_E12_TEXT_BOTTLES_LEARNED_TUTORIAL_MOVES: + case ASSET_E19_TEXT_UNKNOWN: + chAttackTutorial_setState(actor, ATTACK_TUTORIAL_STATE_3_UNKNOWN); break; } - timed_exitStaticCamera(0.0f); -}//*/ -void func_80387764(ActorMarker * marker){ - s32 sp34; - int temp_a2; - s32 sp2C = 4; - + timed_exitStaticCamera(0.0f); +} + +void chAttackTutorial_talk(ActorMarker *marker) { + s32 text_id; + int try_count; + s32 text_flags = 4; + Actor *actor = marker_getActor(marker); - - temp_a2 = actor->unk38_31 ? 1 : 0 ; - if( temp_a2 ){ - sp2C = 0xE; + try_count = BOOL(actor->unk38_31); + + if (try_count) { + text_flags = 0xE; } switch (actor->unk10_12) { - case 0x1: //L803877D8 - sp34 = temp_a2 ? ASSET_E15_TEXT_UNKNOWN : ASSET_E14_TEXT_UNKNOWN; //dialog enums + case ATTACK_TUTORIAL_ENEMY_1_TOPPER: //L803877D8 + text_id = try_count ? ASSET_E15_TEXT_UNKNOWN : ASSET_E14_TEXT_UNKNOWN; break; - case 0x2: //L803877F4 - sp34 = temp_a2 ? ASSET_E17_TEXT_UNKNOWN : ASSET_E16_TEXT_UNKNOWN; //dialog enums + case ATTACK_TUTORIAL_ENEMY_2_BAWL: //L803877F4 + text_id = try_count ? ASSET_E17_TEXT_UNKNOWN : ASSET_E16_TEXT_UNKNOWN; break; - case 3: //L80387810 - sp34 = temp_a2 ? ASSET_E19_TEXT_UNKNOWN : ASSET_E18_TEXT_UNKNOWN; //dialog enums + case ATTACK_TUTORIAL_ENEMY_3_COLLY_WOBBLE: //L80387810 + text_id = try_count ? ASSET_E19_TEXT_UNKNOWN : ASSET_E18_TEXT_UNKNOWN; break; + default: //sp34 = actor->unk38_31; break; }//L8038782C - if (sp34 == ASSET_E19_TEXT_UNKNOWN) { + if (text_id == ASSET_E19_TEXT_UNKNOWN) { func_8028F94C(2, actor->unk1C); - } - //L80387848 - if (!mapSpecificFlags_get(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED) && chmole_learnedAllSpiralMountainAbilities() && temp_a2) { + }//L80387848 + + if (!mapSpecificFlags_get(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED) && chmole_learnedAllSpiralMountainAbilities() && try_count) { mapSpecificFlags_set(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED, TRUE); - sp34 = ASSET_E12_TEXT_BOTTLES_LEARNED_TUTORIAL_MOVES; + text_id = ASSET_E12_TEXT_BOTTLES_LEARNED_TUTORIAL_MOVES; }//L80387898 - if (temp_a2) { + if (try_count) { timed_setStaticCameraToNode(0.0f, 6); }//L803878B0 - gcdialog_showText(sp34, sp2C, actor->unk1C, actor->marker, func_80387690, NULL); + gcdialog_showText(text_id, text_flags, actor->unk1C, actor->marker, __chAttackTutorial_attackTextCallback, NULL); actor->unk38_31++; } diff --git a/src/SM/ch/jumptutorial.c b/src/SM/ch/jumptutorial.c index be6a1a17..2f276b03 100644 --- a/src/SM/ch/jumptutorial.c +++ b/src/SM/ch/jumptutorial.c @@ -18,7 +18,8 @@ enum chJumpTutorial_state_e { }; ActorInfo D_8038B0B0 = { - MARKER_1ED_JUMP_TUTORIAL, ACTOR_3B9_JUMP_TUTORIAL, NULL, 1, NULL, + MARKER_1ED_JUMP_TUTORIAL, ACTOR_3B9_JUMP_TUTORIAL, NULL, + 1, NULL, chJumpTutorial_update, actor_update_func_80326224, func_80325340, 0, 0, 0.0f, 0 }; diff --git a/src/SM/ch/smbottles.c b/src/SM/ch/smbottles.c index 2b8e0098..48f41e98 100644 --- a/src/SM/ch/smbottles.c +++ b/src/SM/ch/smbottles.c @@ -41,7 +41,8 @@ ActorAnimationInfo chSmBottlesAnimations[6] = { }; ActorInfo chBottles = { - MARKER_B7_TUTORIAL_BOTTLES, ACTOR_12B_TUTORIAL_BOTTLES, ASSET_387_MODEL_BOTTLES, 1, chSmBottlesAnimations, + MARKER_B7_TUTORIAL_BOTTLES, ACTOR_12B_TUTORIAL_BOTTLES, ASSET_387_MODEL_BOTTLES, + 1, chSmBottlesAnimations, chSmBottles_update, actor_update_func_80326224, func_802D94B4, 0, 0, 0.0f, 0 }; From de99e04f6c0a396db9a1f400886a17492181c3c8 Mon Sep 17 00:00:00 2001 From: Owlenuff Date: Mon, 7 Oct 2024 20:44:57 +0200 Subject: [PATCH 08/15] Document ch Vegetables --- include/enums.h | 33 +- src/SM/ch/attacktutorial.c | 36 +- src/SM/ch/vegetables.c | 683 ++++++++++++++++++++----------------- src/SM/code_BF0.c | 2 +- 4 files changed, 413 insertions(+), 341 deletions(-) diff --git a/include/enums.h b/include/enums.h index df174250..7cf52801 100644 --- a/include/enums.h +++ b/include/enums.h @@ -1980,7 +1980,8 @@ enum actor_e ACTOR_166_TOPPER_A, ACTOR_167_ATTACK_TUTORIAL, - ACTOR_16F_QUARRIE = 0x16F, + ACTOR_16E_UNKNOWN = 0x16E, + ACTOR_16F_QUARRIE, ACTOR_172_RBB_EGG_TOLL = 0x172, @@ -2942,6 +2943,11 @@ enum asset_e ASSET_220_ANIM_SIR_SLUSH_DIE = 0x220, ASSET_221_ANIM_WOZZA_IN_CAVE, + ASSET_223_ANIM_TOPPER_UNKNOWN = 0x223, + ASSET_224_ANIM_TOPPER_UNKNOWN, + ASSET_225_ANIM_COLLYWOBBLE_UNKNOWN, + ASSET_226_ANIM_BAWL_UNKNOWN, + ASSET_227_ANIM_BAWL_UNKNOWN, ASSET_228_ANIM_BANJO_SLED = 0x228, ASSET_229_ANIM_WHIPCRACK_ATTACK, ASSET_22A_ANIM_WHIPCRACK_IDLE, @@ -3525,14 +3531,14 @@ enum asset_e // 4ea FP Finish Banner // 4eb FP Start Banner // 4ec FP Race Rostrum - MODEL_TOPPER = 0x4ed, - MODEL_COLLYWOBBLE = 0x4ee, - MODEL_BAWL = 0x4ef, - // 4f0 Colliwobble Large Stem (Upon Death) - // 4f1 Colliwobble Small Stem (Upon Death) - // 4f2 Colliwobble Large Leaf (Upon Death) - // 4f3 Colliwobble Small Leaf (Upon Death) - // 4f4 Colliwobble Stem (Upon Death) + ASSET_4ED_MODEL_TOPPER = 0x4ed, + ASSET_4EE_MODEL_COLLYWOBBLE, + ASSET_4EF_MODEL_BAWL, + ASSET_4F0_MODEL_UNKNOWN, // 4f0 Colliwobble Large Stem (Upon Death) + ASSET_4F1_MODEL_UNKNOWN, // 4f1 Colliwobble Small Stem (Upon Death) + ASSET_4F2_MODEL_UNKNOWN, // 4f2 Colliwobble Large Leaf (Upon Death) + ASSET_4F3_MODEL_UNKNOWN, // 4f3 Colliwobble Small Leaf (Upon Death) + ASSET_4F4_MODEL_UNKNOWN, // 4f4 Colliwobble Stem (Upon Death) // 4f5 CCW Spring Switch // 4f6 CCW Summer Switch // 4f7 CCW Autumn Switch @@ -4878,13 +4884,15 @@ enum marker_e{ MARKER_124_BOGGY_1 = 0x124, + MARKER_126_UNKNOWN = 0x126, MARKER_127_BAT = 0x127, MARKER_128_COLLYWOBBLE_A, MARKER_129_BAWL_A, MARKER_12A_TOPPER_A, MARKER_12B_ATTACK_TUTORIAL, - MARKER_135_QUARRIE = 0x135, + MARKER_134_UNKNOWN = 0x134, + MARKER_135_QUARRIE, MARKER_161_GV_WITCH_SWITCH = 0x161, MARKER_162_BGS_WITCH_SWITCH, @@ -5160,6 +5168,11 @@ enum marker_collision_func_type_e { MARKER_COLLISION_FUNC_2_DIE }; +enum vegetable_e { + VEGETABLE_1_TOPPER = 1, + VEGETABLE_2_BAWL, + VEGETABLE_3_COLLY_WOBBLE +}; #endif diff --git a/src/SM/ch/attacktutorial.c b/src/SM/ch/attacktutorial.c index 2ec217a7..6e9ec693 100644 --- a/src/SM/ch/attacktutorial.c +++ b/src/SM/ch/attacktutorial.c @@ -20,12 +20,6 @@ enum chAttackTutorial_state_e { ATTACK_TUTORIAL_STATE_5_UNKNOWN }; -enum chAttackTutorial_enemy_e { - ATTACK_TUTORIAL_ENEMY_1_TOPPER = 1, - ATTACK_TUTORIAL_ENEMY_2_BAWL, - ATTACK_TUTORIAL_ENEMY_3_COLLY_WOBBLE -}; - ActorInfo D_8038AC20 = { MARKER_12B_ATTACK_TUTORIAL, ACTOR_167_ATTACK_TUTORIAL, NULL, 1, NULL, @@ -34,7 +28,7 @@ ActorInfo D_8038AC20 = { }; /* .code */ -void __chAttackTutorial_enemy(ActorMarker *marker, s32 enemy_id) { +void __chAttackTutorial_enemy(ActorMarker *marker, enum actor_e enemy_id) { Actor *actor = marker_getActor(marker); s32 pad; Actor *enemy = spawn_child_actor(enemy_id, &actor); @@ -42,24 +36,24 @@ void __chAttackTutorial_enemy(ActorMarker *marker, s32 enemy_id) { actor->unk100 = enemy->marker; enemy->unk100 = actor->marker; - if (actor->unk10_12 == ATTACK_TUTORIAL_ENEMY_3_COLLY_WOBBLE && actor->unk38_31 == 1) { + if (actor->unk10_12 == VEGETABLE_3_COLLY_WOBBLE && actor->unk38_31 == 1) { enemy->unk38_31 = 1; } else {//L803871D4 enemy->unk38_31 = 0; } - enemy->unk10_12 = ATTACK_TUTORIAL_ENEMY_1_TOPPER; + enemy->unk10_12 = VEGETABLE_1_TOPPER; if (marker); } -s32 __chAttackTutorial_spawnEnemy(Actor *this, enum chAttackTutorial_enemy_e enemy) { - volatile s32 sp1C; +s32 __chAttackTutorial_spawnEnemy(Actor *this, enum vegetable_e vegetable_id) { + volatile enum actor_e enemy_id; - sp1C = enemy == ATTACK_TUTORIAL_ENEMY_1_TOPPER ? ACTOR_166_TOPPER_A : - enemy == ATTACK_TUTORIAL_ENEMY_2_BAWL ? ACTOR_165_BAWL_A : ACTOR_164_COLLYWOBBLE_A; + enemy_id = vegetable_id == VEGETABLE_1_TOPPER ? ACTOR_166_TOPPER_A : + vegetable_id == VEGETABLE_2_BAWL ? ACTOR_165_BAWL_A : ACTOR_164_COLLYWOBBLE_A; - __spawnQueue_add_2(__chAttackTutorial_enemy, this->marker, sp1C); + __spawnQueue_add_2(__chAttackTutorial_enemy, this->marker, enemy_id); } void __chAttackTutorial_learnedTextActions(ActorMarker *marker, enum asset_e text_id, s32 arg2) { @@ -93,7 +87,7 @@ void chAttackTutorial_setState(Actor *this, s32 state) { gcdialog_showText(ASSET_DFF_TEXT_BOTTLES_CLAW_SWIPE_LEARN, 0xE, this->unk1C, this->marker, __chAttackTutorial_learnedTextCallback, __chAttackTutorial_learnedTextActions); } else { - gcdialog_showText(this->unk10_12 == ATTACK_TUTORIAL_ENEMY_1_TOPPER ? ASSET_E15_TEXT_UNKNOWN : ASSET_E17_TEXT_UNKNOWN, 0xE, this->unk1C, this->marker, __chAttackTutorial_learnedTextCallback, NULL); + gcdialog_showText(this->unk10_12 == VEGETABLE_1_TOPPER ? ASSET_E15_TEXT_UNKNOWN : ASSET_E17_TEXT_UNKNOWN, 0xE, this->unk1C, this->marker, __chAttackTutorial_learnedTextCallback, NULL); } break; @@ -112,7 +106,7 @@ void chAttackTutorial_setState(Actor *this, s32 state) { mapSpecificFlags_set(SM_SPECIFIC_FLAG_C, TRUE); if (!honeycombscore_get(HONEYCOMB_17_SM_COLIWOBBLE)) { - this->unk10_12 = ATTACK_TUTORIAL_ENEMY_3_COLLY_WOBBLE; + this->unk10_12 = VEGETABLE_3_COLLY_WOBBLE; this->unk38_31 = 1; __chAttackTutorial_spawnEnemy(this, this->unk10_12); } @@ -146,8 +140,8 @@ void chAttackTutorial_update(Actor *this) { this->unk1C_z = this->position_z; } - this->unk10_12 = ability_isUnlocked(ABILITY_C_ROLL) ? ATTACK_TUTORIAL_ENEMY_2_BAWL : - ability_isUnlocked(ABILITY_4_CLAW_SWIPE) ? ATTACK_TUTORIAL_ENEMY_1_TOPPER : NULL; + this->unk10_12 = ability_isUnlocked(ABILITY_C_ROLL) ? VEGETABLE_2_BAWL : + ability_isUnlocked(ABILITY_4_CLAW_SWIPE) ? VEGETABLE_1_TOPPER : NULL; this->initialized = TRUE; } @@ -221,15 +215,15 @@ void chAttackTutorial_talk(ActorMarker *marker) { } switch (actor->unk10_12) { - case ATTACK_TUTORIAL_ENEMY_1_TOPPER: //L803877D8 + case VEGETABLE_1_TOPPER: //L803877D8 text_id = try_count ? ASSET_E15_TEXT_UNKNOWN : ASSET_E14_TEXT_UNKNOWN; break; - case ATTACK_TUTORIAL_ENEMY_2_BAWL: //L803877F4 + case VEGETABLE_2_BAWL: //L803877F4 text_id = try_count ? ASSET_E17_TEXT_UNKNOWN : ASSET_E16_TEXT_UNKNOWN; break; - case ATTACK_TUTORIAL_ENEMY_3_COLLY_WOBBLE: //L80387810 + case VEGETABLE_3_COLLY_WOBBLE: //L80387810 text_id = try_count ? ASSET_E19_TEXT_UNKNOWN : ASSET_E18_TEXT_UNKNOWN; break; diff --git a/src/SM/ch/vegetables.c b/src/SM/ch/vegetables.c index f94ddc32..83993e8c 100644 --- a/src/SM/ch/vegetables.c +++ b/src/SM/ch/vegetables.c @@ -2,203 +2,223 @@ #include "functions.h" #include "variables.h" - - -//external -f32 mapModel_getFloorY(f32*); +/* extern functions */ +f32 mapModel_getFloorY(f32 *); void spawnQueue_bundle_f32(s32, f32, f32, f32); void timed_mapSpecificFlags_setTrue(f32, s32); void subaddie_set_state_with_direction(Actor *, s32, f32, s32); -//typedefs -typedef struct ch_vegatable{ +/* typedefs and declarations */ +enum chVegetables_state_e { + VEGETABLES_STATE_1_UNKNOWN = 1, + VEGETABLES_STATE_2_UNKNOWN, + VEGETABLES_STATE_3_UNKNOWN, + VEGETABLES_STATE_4_UNKNOWN +}; + +typedef struct ch_vegetable { TUPLE(f32, unk0); - s32 unkC; + s32 vegetable_id; u32 pad10_31: 19; u32 unk10_12: 4; u32 pad10_8: 9; } ChVeg; -//public -Actor *func_80387DF4(ActorMarker *, Gfx**, Mtx**, Vtx **); -void func_80388080(Actor *); +/* public functions */ +Actor *chVegetablesDraw(ActorMarker *, Gfx **, Mtx **, Vtx **); +void chVegetablesUpdate(Actor *); /* .data */ -ActorAnimationInfo chCarrotAnimations[5] = { - {0, 0.0f}, - {0x223, 1000000.0f}, - {0x223, 1.0f}, - {0x224, 0.75f}, - {0x223, 1.0f} +ActorAnimationInfo chTopperAnimations[5] = { + {NULL, 0.0f}, + {ASSET_223_ANIM_TOPPER_UNKNOWN, 1000000.0f}, + {ASSET_223_ANIM_TOPPER_UNKNOWN, 1.0f}, + {ASSET_224_ANIM_TOPPER_UNKNOWN, 0.75f}, + {ASSET_223_ANIM_TOPPER_UNKNOWN, 1.0f} }; -ActorInfo D_8038AC78 = { MARKER_12A_TOPPER_A, ACTOR_166_TOPPER_A, MODEL_TOPPER, 1, chCarrotAnimations, - func_80388080, actor_update_func_80326224, func_80387DF4, +ActorInfo D_8038AC78 = { + MARKER_12A_TOPPER_A, ACTOR_166_TOPPER_A, ASSET_4ED_MODEL_TOPPER, + 1, chTopperAnimations, + chVegetablesUpdate, actor_update_func_80326224, chVegetablesDraw, 2000, 0, 1.0f, 0 }; -ActorInfo D_8038AC9C = { MARKER_1E6_TOPPER_B, ACTOR_TOPPER_B, MODEL_TOPPER, 1, chCarrotAnimations, - func_80388080, actor_update_func_80326224, func_80387DF4, +ActorInfo D_8038AC9C = { + MARKER_1E6_TOPPER_B, ACTOR_TOPPER_B, ASSET_4ED_MODEL_TOPPER, + 1, chTopperAnimations, + chVegetablesUpdate, actor_update_func_80326224, chVegetablesDraw, 2000, 0, 1.0f, 0 }; -ActorAnimationInfo chOnionAnimations[5] = { - {0, 0.0f}, - {0x226, 1000000.0f}, - {0x226, 1.0f}, - {0x227, 0.75f}, - {0x226, 1.0f} +ActorAnimationInfo chBawlAnimations[5] = { + {NULL, 0.0f}, + {ASSET_226_ANIM_BAWL_UNKNOWN, 1000000.0f}, + {ASSET_226_ANIM_BAWL_UNKNOWN, 1.0f}, + {ASSET_227_ANIM_BAWL_UNKNOWN, 0.75f}, + {ASSET_226_ANIM_BAWL_UNKNOWN, 1.0f} }; -ActorInfo D_8038ACE8 = { MARKER_129_BAWL_A, ACTOR_165_BAWL_A, MODEL_BAWL, 1, chOnionAnimations, - func_80388080, actor_update_func_80326224, func_80387DF4, +ActorInfo D_8038ACE8 = { + MARKER_129_BAWL_A, ACTOR_165_BAWL_A, ASSET_4EF_MODEL_BAWL, + 1, chBawlAnimations, + chVegetablesUpdate, actor_update_func_80326224, chVegetablesDraw, 0, 0, 1.0f, 0 }; -ActorInfo D_8038AD0C = { MARKER_1E7_BAWL_B, ACTOR_BAWL_B, MODEL_BAWL, 1, chOnionAnimations, - func_80388080, actor_update_func_80326224, func_80387DF4, +ActorInfo D_8038AD0C = { + MARKER_1E7_BAWL_B, ACTOR_BAWL_B, ASSET_4EF_MODEL_BAWL, + 1, chBawlAnimations, + chVegetablesUpdate, actor_update_func_80326224, chVegetablesDraw, 0, 0, 1.0f, 0 }; -ActorAnimationInfo chCauliflowerAnimations[5] = { - {0, 0.0f}, - {0x225, 10000000.0f}, - {0x225, 1.0f}, - {0x225, 10000000.0f}, - {0x225, 1.0f} +ActorAnimationInfo chCollywobbleAnimations[5] = { + {NULL, 0.0f}, + {ASSET_225_ANIM_COLLYWOBBLE_UNKNOWN, 10000000.0f}, + {ASSET_225_ANIM_COLLYWOBBLE_UNKNOWN, 1.0f}, + {ASSET_225_ANIM_COLLYWOBBLE_UNKNOWN, 10000000.0f}, + {ASSET_225_ANIM_COLLYWOBBLE_UNKNOWN, 1.0f} }; -ActorInfo D_8038AD58 = { MARKER_128_COLLYWOBBLE_A, ACTOR_164_COLLYWOBBLE_A, MODEL_COLLYWOBBLE, 1, chCauliflowerAnimations, - func_80388080, actor_update_func_80326224, func_80387DF4, +ActorInfo D_8038AD58 = { + MARKER_128_COLLYWOBBLE_A, ACTOR_164_COLLYWOBBLE_A, ASSET_4EE_MODEL_COLLYWOBBLE, + 1, chCollywobbleAnimations, + chVegetablesUpdate, actor_update_func_80326224, chVegetablesDraw, 0, 0, 2.0f, 0 }; -ActorInfo D_8038AD7C = { MARKER_1E8_COLLYWOBBLE_B, ACTOR_COLLYWOBBLE_B, MODEL_COLLYWOBBLE, 1, chCauliflowerAnimations, - func_80388080, actor_update_func_80326224, func_80387DF4, +ActorInfo D_8038AD7C = { + MARKER_1E8_COLLYWOBBLE_B, ACTOR_COLLYWOBBLE_B, ASSET_4EE_MODEL_COLLYWOBBLE, + 1, chCollywobbleAnimations, + chVegetablesUpdate, actor_update_func_80326224, chVegetablesDraw, 0, 0, 2.0f, 0 }; -s32 D_8038ADA0[3] = {0xFF, 0xFF, 0xFF}; +s32 D_8038ADA0[3] = {0xFF, 0xFF, 0xFF}; ParticleScaleAndLifetimeRanges D_8038ADAC = { - {0.1f, 0.5f}, - {1.5f, 3.0f}, - {0.0f, 0.01f}, - {1.0f, 1.5f}, + {0.1f, 0.5f}, + {1.5f, 3.0f}, + {0.0f, 0.01f}, + {1.0f, 1.5f}, 0.0f, 0.01f, }; ParticleSettingsVelocityPosition D_8038ADD4 = { {{-100.0f, -100.0f, -100.0f}, {100.0f, 100.0f, 100.0f}}, - {{-40.0f, -40.0f, -40.0f}, {40.0f, 40.0f, 40.0f}} + {{-40.0f, -40.0f, -40.0f}, {40.0f, 40.0f, 40.0f}} }; ParticleScaleAndLifetimeRanges D_8038AE04 = { {0.5f, 0.75f}, - {0.4f, 0.6f}, + {0.4f, 0.6f}, {0.0f, 0.01f}, - {4.0f, 4.0f}, + {4.0f, 4.0f}, 0.0f, 0.2f }; ParticleSettingsVelocityAccelerationPosition D_8038AE2C = { - {{-100.0f, 200.0f, -100.0f}, {100.0f, 400.0f, 100.0f}}, - {{0.0f, -600.0f, 0.0f}, {0.0f, -600.0f, 0.0f}}, - {{-80.0f, -80.0f, -80.0f}, {80.0f, 80.0f, 80.0f}} + {{-100.0f, 200.0f, -100.0f}, {100.0f, 400.0f, 100.0f}}, + {{0.0f, -600.0f, 0.0f}, {0.0f, -600.0f, 0.0f}}, + {{-80.0f, -80.0f, -80.0f}, {80.0f, 80.0f, 80.0f}} }; ParticleScaleAndLifetimeRanges D_8038AE74 = { - {1.0f, 1.0f}, - {1.0f, 1.0f}, - {0.0f, 0.01f}, - {2.0f, 2.0f}, + {1.0f, 1.0f}, + {1.0f, 1.0f}, + {0.0f, 0.01f}, + {2.0f, 2.0f}, 0.0f, 0.5f }; ParticleSettingsVelocityAccelerationPosition D_8038AE9C = { - {{-100.0f, 400.0f, -100.0f}, {100.0f, 600.0f, 100.0f}}, - {{0.0f, -600.0f, 0.0f}, {0.0f, -600.0f, 0.0f}}, - {{-20.0f, -20.0f, -20.0f}, {20.0f, 20.0f, 20.0f}} + {{-100.0f, 400.0f, -100.0f}, {100.0f, 600.0f, 100.0f}}, + {{0.0f, -600.0f, 0.0f}, {0.0f, -600.0f, 0.0f}}, + {{-20.0f, -20.0f, -20.0f}, {20.0f, 20.0f, 20.0f}} }; ParticleScaleAndLifetimeRanges D_8038AEE4 = { - {0.6f, 0.8f}, - {0.5f, 0.7f}, - {0.0f, 0.01f}, - {4.0f, 4.0f}, + {0.6f, 0.8f}, + {0.5f, 0.7f}, + {0.0f, 0.01f}, + {4.0f, 4.0f}, 0.0f, 0.5f }; -ParticleSettingsVelocityAccelerationPosition D_8038AF0C ={ - {{-200.0f, 200.0f, -200.0f}, {200.0f, 600.0f, 200.0f}}, - {{0.0f, -900.0f, 0.0f}, {0.0f, -900.0f, 0.0f}}, - {{-100.0f, -100.0f, -100.0f}, {100.0f, 100.0f, 100.0f}}, +ParticleSettingsVelocityAccelerationPosition D_8038AF0C = { + {{-200.0f, 200.0f, -200.0f}, {200.0f, 600.0f, 200.0f}}, + {{ 0.0f, -900.0f, 0.0f}, { 0.0f, -900.0f, 0.0f}}, + {{-100.0f, -100.0f, -100.0f}, {100.0f, 100.0f, 100.0f}}, }; /* .code */ -void func_80387910(ParticleEmitter *arg0, f32 *arg1, s32 arg2){ +void __chVegetables_emitDust(ParticleEmitter *pCtrl, f32 *pos, s32 n) { s32 sp24[3] = D_8038ADA0; - particleEmitter_setRGB(arg0, sp24); - particleEmitter_setSprite(arg0, ASSET_700_SPRITE_DUST); - particleEmitter_setStartingFrameRange(arg0, 0, 7); - particleEmitter_setPosition(arg0, arg1); - particleEmitter_setScaleAndLifetimeRanges(arg0, &D_8038ADAC); - particleEmitter_setPositionAndVelocityRanges(arg0, &D_8038ADD4); - particleEmitter_emitN(arg0, arg2); + particleEmitter_setRGB(pCtrl, sp24); + particleEmitter_setSprite(pCtrl, ASSET_700_SPRITE_DUST); + particleEmitter_setStartingFrameRange(pCtrl, 0, 7); + particleEmitter_setPosition(pCtrl, pos); + particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038ADAC); + particleEmitter_setPositionAndVelocityRanges(pCtrl, &D_8038ADD4); + particleEmitter_emitN(pCtrl, n); } -void func_803879B8(ParticleEmitter *arg0, f32 *arg1, s32 arg2, enum asset_e model_id){ - particleEmitter_func_802EF9F8(arg0, 0.6f); - particleEmitter_func_802EFA18(arg0, 2); - particleEmitter_setModel(arg0, model_id); - particleEmitter_setPosition(arg0, arg1); - particleEmitter_setDrawMode(arg0, 2); - particleEmitter_setAngularVelocityRange(arg0, -300.0f, -300.0f, -300.0f, 300.0f, 300.0f, 300.0f); - particleEmitter_setScaleAndLifetimeRanges(arg0, &D_8038AE04); - particleEmitter_setVelocityAccelerationAndPositionRanges(arg0, &D_8038AE2C); - particleEmitter_emitN(arg0, arg2); +void func_803879B8(ParticleEmitter *pCtrl, f32 *pos, s32 n, enum asset_e model_id) { + particleEmitter_func_802EF9F8(pCtrl, 0.6f); + particleEmitter_func_802EFA18(pCtrl, 2); + particleEmitter_setModel(pCtrl, model_id); + particleEmitter_setPosition(pCtrl, pos); + particleEmitter_setDrawMode(pCtrl, 2); + particleEmitter_setAngularVelocityRange(pCtrl, -300.0f, -300.0f, -300.0f, 300.0f, 300.0f, 300.0f); + particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038AE04); + particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_8038AE2C); + particleEmitter_emitN(pCtrl, n); } -void func_80387A80(ParticleEmitter *arg0, f32 *arg1, s32 arg2, enum asset_e model_id){ - particleEmitter_func_802EF9F8(arg0, 0.6f); - particleEmitter_func_802EFA18(arg0, 3); - particleEmitter_setModel(arg0, model_id); - particleEmitter_setPosition(arg0, arg1); - particleEmitter_setDrawMode(arg0, 2); - particleEmitter_setAngularVelocityRange(arg0, -300.0f, -300.0f, -300.0f, 300.0f, 300.0f, 300.0f); - particleEmitter_setScaleAndLifetimeRanges(arg0, &D_8038AE74); - particleEmitter_setVelocityAccelerationAndPositionRanges(arg0, &D_8038AE9C); - particleEmitter_emitN(arg0, arg2); +void func_80387A80(ParticleEmitter *pCtrl, f32 *pos, s32 n, enum asset_e model_id) { + particleEmitter_func_802EF9F8(pCtrl, 0.6f); + particleEmitter_func_802EFA18(pCtrl, 3); + particleEmitter_setModel(pCtrl, model_id); + particleEmitter_setPosition(pCtrl, pos); + particleEmitter_setDrawMode(pCtrl, 2); + particleEmitter_setAngularVelocityRange(pCtrl, -300.0f, -300.0f, -300.0f, 300.0f, 300.0f, 300.0f); + particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038AE74); + particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_8038AE9C); + particleEmitter_emitN(pCtrl, n); } -void func_80387B48(ParticleEmitter *arg0, f32 arg1[3], s32 arg2, enum asset_e model_id){ - particleEmitter_func_802EF9F8(arg0, 0.7f); - particleEmitter_func_802EFA18(arg0, 4); - particleEmitter_setModel(arg0, model_id); - particleEmitter_setPosition(arg0, arg1); - particleEmitter_setDrawMode(arg0, 2); - particleEmitter_setAngularVelocityRange(arg0, 150.0f, -300.0f, -300.0f, 300.0f, 300.0f, -150.0f); - particleEmitter_setSfx(arg0, SFX_1F_HITTING_AN_ENEMY_3, 8000); - particleEmitter_setScaleAndLifetimeRanges(arg0, &D_8038AEE4); - particleEmitter_setVelocityAccelerationAndPositionRanges(arg0, &D_8038AF0C); - particleEmitter_emitN(arg0, arg2); +void func_80387B48(ParticleEmitter *pCtrl, f32 pos[3], s32 n, enum asset_e model_id) { + particleEmitter_func_802EF9F8(pCtrl, 0.7f); + particleEmitter_func_802EFA18(pCtrl, 4); + particleEmitter_setModel(pCtrl, model_id); + particleEmitter_setPosition(pCtrl, pos); + particleEmitter_setDrawMode(pCtrl, 2); + particleEmitter_setAngularVelocityRange(pCtrl, 150.0f, -300.0f, -300.0f, 300.0f, 300.0f, -150.0f); + particleEmitter_setSfx(pCtrl, SFX_1F_HITTING_AN_ENEMY_3, 8000); + particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_8038AEE4); + particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_8038AF0C); + particleEmitter_emitN(pCtrl, n); } -void func_80387C28(Actor * this){ - ChVeg * local = (ChVeg *)&this->local; - f32 sp30[3]; +void __chVegetables_dieActor(Actor *this) { + ChVeg *local = (ChVeg *) &this->local; + f32 pos[3]; FUNC_8030E8B4(SFX_111_WHIPCRACK_DEATH, 1.0f, 32000, this->position, 1000, 2000); - if(local->unkC == 3){ - sp30[0] = this->position_x; - sp30[1] = this->position_y; - sp30[2] = this->position_z; - sp30[1] += 50.0f; - func_80387B48(partEmitMgr_newEmitter(0xC), sp30, 0xC, 0x4F4); - func_803879B8(partEmitMgr_newEmitter(4), sp30, 0x4, 0x4F2); - func_803879B8(partEmitMgr_newEmitter(4), sp30, 0x4, 0x4F3); - sp30[1] += 50.0f; - func_80387910(partEmitMgr_newEmitter(8), sp30, 8); + + if (local->vegetable_id == VEGETABLE_3_COLLY_WOBBLE) { + pos[0] = this->position_x; + pos[1] = this->position_y; + pos[2] = this->position_z; + pos[1] += 50.0f; + + func_80387B48(partEmitMgr_newEmitter(12), pos, 0xC, ASSET_4F4_MODEL_UNKNOWN); + func_803879B8(partEmitMgr_newEmitter(4), pos, 0x4, ASSET_4F2_MODEL_UNKNOWN); + func_803879B8(partEmitMgr_newEmitter(4), pos, 0x4, ASSET_4F3_MODEL_UNKNOWN); + + pos[1] += 50.0f; + __chVegetables_emitDust(partEmitMgr_newEmitter(8), pos, 8); }//L80387D18 if (this->unk38_31) { @@ -206,34 +226,38 @@ void func_80387C28(Actor * this){ func_802CA1CC(HONEYCOMB_17_SM_COLIWOBBLE); __spawnQueue_add_4((GenFunction_4) spawnQueue_bundle_f32, BUNDLE_1F_SM_EMPTY_HONEYCOMB, reinterpret_cast(s32, this->position_x), reinterpret_cast(s32, this->position_y), reinterpret_cast(s32, this->position_z)); }//L80387D64 + timed_mapSpecificFlags_setTrue(1.5f, SM_SPECIFIC_FLAG_7); actor_collisionOff(this); - if(local->unkC != 3){ - subaddie_set_state_with_direction(this, 3, 0.0f, 1); + + if (local->vegetable_id != VEGETABLE_3_COLLY_WOBBLE) { + subaddie_set_state_with_direction(this, VEGETABLES_STATE_3_UNKNOWN, 0.0f, 1); actor_playAnimationOnce(this); } - else{ + else { marker_despawn(this->marker); } } -void func_80387DCC(ActorMarker *marker, ActorMarker *other_marker){ - func_80387C28(marker_getActor(marker)); +void __chVegetables_die(ActorMarker *marker, ActorMarker *other_marker) { + __chVegetables_dieActor(marker_getActor(marker)); } -Actor *func_80387DF4(ActorMarker *marker, Gfx **gdl, Mtx **mptr, Vtx **arg3){ +Actor *chVegetablesDraw(ActorMarker *marker, Gfx **gdl, Mtx **mptr, Vtx **arg3) { Actor *actor = marker_getActor(marker); - if(actor->has_met_before) + if (actor->has_met_before) { func_8033A470(3, 7); - else + } + else { func_8033A45C(3, 0); + } return actor_draw(marker, gdl, mptr, arg3); } -void func_80387E64(Actor *this){ - ChVeg *local = (ChVeg *)&this->local; +void func_80387E64(Actor *this) { + ChVeg *local = (ChVeg *) &this->local; this->unk1C_x = randf2(-50.0f, 50.0f); this->unk1C_y = randf2(-50.0f, 50.0f); @@ -244,252 +268,293 @@ void func_80387E64(Actor *this){ this->unk1C_z = local->unk0_z + this->unk1C_z; } -void func_80387F00(Actor *this){ - ChVeg *local = (ChVeg *)&this->local; - - this->position_y += (mapSpecificFlags_get(SM_SPECIFIC_FLAG_C) || volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)) ? 120.0 : 180.0; +void func_80387F00(Actor *this) { + ChVeg *local = (ChVeg *) &this->local; + + this->position_y += mapSpecificFlags_get(SM_SPECIFIC_FLAG_C) || 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; + this->velocity_x = 0.0f; this->velocity_y = 0.0f; this->velocity_z = 0.0f; + func_80387E64(this); } -int func_80387FA8(Actor *this, ChVeg *local, s32 yaw, s32 arg3){ +int func_80387FA8(Actor *this, ChVeg *local, s32 yaw, s32 arg3) { f32 sp24[3]; f32 sp18[3]; - + sp18[0] = arg3; sp18[1] = 0.0f; sp18[2] = 0.0f; + ml_vec3f_yaw_rotate_copy(sp18, sp18, yaw - 90.0); + sp24[0] = sp18[0] + local->unk0_x; sp24[1] = sp18[1] + local->unk0_y; sp24[2] = sp18[2] + local->unk0_z; - if(func_80307258(sp24, this->unk10_25 - 1, this->unk10_18 - 1) == -1) + + if (func_80307258(sp24, this->unk10_25 - 1, this->unk10_18 - 1) == -1) { return 0; - else + } + else { return 1; + } } -void func_80388080(Actor *this){ +void chVegetablesUpdate(Actor *this) { f32 temp_velZ; f32 temp_velX; f32 temp_f0; - f32 sp78; + f32 tick; f32 sp6C[3]; f32 sp60[3]; - f32 sp54[3]; - ChVeg *local = (ChVeg *)&this->local; //sp38 - f32 sp30; + f32 position[3]; + ChVeg *local = (ChVeg *) &this->local; //sp38 + f32 unused; - - - if(!this->initialized){ - switch(this->marker->id){ + if (!this->initialized) { + switch (this->marker->id) { default: - local->unkC = 3; //cauliflower + local->vegetable_id = VEGETABLE_3_COLLY_WOBBLE; //cauliflower break; - case 0x12A: //L803880F0 - case 0x1E6: //L803880F0 - local->unkC = 1; //carrot + + case MARKER_12A_TOPPER_A: //L803880F0 + case MARKER_1E6_TOPPER_B: //L803880F0 + local->vegetable_id = VEGETABLE_1_TOPPER; //carrot break; - case 0x129: //L80388100 - case 0x1E7: //L80388100 - local->unkC = 2; //onion + + case MARKER_129_BAWL_A: //L80388100 + case MARKER_1E7_BAWL_B: //L80388100 + local->vegetable_id = VEGETABLE_2_BAWL; //onion break; } + actor_collisionOff(this); - marker_setCollisionScripts(this->marker, NULL, NULL, func_80387DCC); + marker_setCollisionScripts(this->marker, NULL, NULL, __chVegetables_die); + this->unk1C_x = this->position_x; this->unk1C_y = this->position_y; this->unk1C_z = this->position_z; this->position_y -= 200.f; - do{//L80388154 + do {//L80388154 temp_velX = randf2(-10.0f, 10.0f); - temp_f0 =(0.0f <= temp_velX) ? temp_velX : -temp_velX; - }while(temp_f0 < 5.0); + temp_f0 = 0.0f <= temp_velX ? temp_velX : -temp_velX; + } while (temp_f0 < 5.0); - do{//L803881AC + do {//L803881AC temp_velZ = randf2(-10.0f, 10.0f); - temp_f0 =(0.0f <= temp_velZ) ? temp_velZ : -temp_velZ; - }while(temp_f0 < 5.0); + temp_f0 = 0.0f <= temp_velZ ? temp_velZ : -temp_velZ; + } while (temp_f0 < 5.0); this->velocity_x = temp_velX; - this->velocity_y = (local->unkC == 3) ? 90.0f : 70.0f; + this->velocity_y = local->vegetable_id == VEGETABLE_3_COLLY_WOBBLE ? 90.0f : 70.0f; this->velocity_z = temp_velZ; + this->has_met_before = TRUE; this->unk138_23 = 0; this->unk38_0 = 0; this->initialized = TRUE; this->scale = 0.5; }//L80388278 - switch (this->state) - { - case 1: //L803882B0 - if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_C) || volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) || this->unk10_12){ - //L803882E4 - if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_C) || 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; - } - //L80388384 - subaddie_set_state(this, 4); - } - break; - case 4: //L8038839C - this->position_x = this->velocity_x + this->position_x; - this->position_y = this->velocity_y + this->position_y; - this->position_z = this->velocity_z + this->position_z; - this->velocity_y -= 5.0f; - this->scale = MIN(this->scale + 0.05, 1.0); - if(this->velocity_y < 0.0f && this->position_y < this->unk1C_y){ - this->position_y = mapModel_getFloorY(this->position); - if(local->unkC == 3) - func_80387F00(this); - actor_collisionOn(this); - subaddie_set_state(this, 2); - }//L80388494 + switch (this->state) { + case VEGETABLES_STATE_1_UNKNOWN: //L803882B0 + if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_C) || volatileFlag_get( + VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) || this->unk10_12) {//L803882E4 + if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_C) || volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)) { //L8038830C + this->unk1C_y += local->vegetable_id == VEGETABLE_3_COLLY_WOBBLE ? 120.0 : 0.0; + } + else {//L80388350 + this->unk1C_y += local->vegetable_id == VEGETABLE_3_COLLY_WOBBLE ? 270.0 : 85.0; + } + //L80388384 + subaddie_set_state(this, VEGETABLES_STATE_4_UNKNOWN); + } + break; - if(!this->unk138_23){ - if(0.0f < this->position_y){ - FUNC_8030E8B4(SFX_C5_TWINKLY_POP, 1.0f, 32000, this->position, 1000, 2000); - this->unk138_23 = 1; - this->scale = 1.0f; - } - } + case VEGETABLES_STATE_4_UNKNOWN: //L8038839C + this->position_x = this->velocity_x + this->position_x; + this->position_y = this->velocity_y + this->position_y; + this->position_z = this->velocity_z + this->position_z; - break; - case 2: //L803884E4 - if(this->unk38_0){ - if(func_80329480(this)){ - this->unk38_0 = 0; - } - }else{//L80388520 - if(local->unkC == 1){ - this->actor_specific_1_f = 3.0f; - if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_C) || 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; - }//L803885A0 - if(func_803292E0(this)){ - this->yaw_ideal = func_80329784(this); - } - else{//L803885CC - if(randf() < 0.02){ - func_80328CEC(this, (s32)this->yaw, 0x1E, 0x5A); - } - }//L80388B68 + this->velocity_y -= 5.0f; + this->scale = MIN(this->scale + 0.05, 1.0); + + if (this->velocity_y < 0.0f && this->position_y < this->unk1C_y) { + this->position_y = mapModel_getFloorY(this->position); + + if (local->vegetable_id == VEGETABLE_3_COLLY_WOBBLE) { + func_80387F00(this); } - else{//L80388618 - this->yaw_ideal = func_80329784(this); + + actor_collisionOn(this); + subaddie_set_state(this, VEGETABLES_STATE_2_UNKNOWN); + }//L80388494 + + if (!this->unk138_23) { + if (0.0f < this->position_y) { + FUNC_8030E8B4(SFX_C5_TWINKLY_POP, 1.0f, 32000, this->position, 1000, 2000); + this->unk138_23 = 1; + this->scale = 1.0f; } } - else if(local->unkC == 2){//L80388634 - this->actor_specific_1_f = 4.0f; - if(!func_80329030(this, 0) && func_80329480(this)){ - func_80328CEC(this, (s32)this->yaw, 0x78, 0xB4); - this->unk38_0 = 1; - }//L80388698 - if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_C) || (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){ - func_80328CEC(this, (s32)this->yaw, 0x1E, 0x5A); - } + break; + + case VEGETABLES_STATE_2_UNKNOWN: //L803884E4 + if (this->unk38_0) { + if (func_80329480(this)) { + this->unk38_0 = 0; } - }else{//L80388730 - sp78 = time_getDelta(); - sp6C[0] = this->unk1C_x - this->position_x; - sp6C[1] = this->unk1C_y - this->position_y; - sp6C[2] = this->unk1C_z - this->position_z; - if( LENGTH_VEC3F(sp6C) < 40.0f){ - ml_vec3f_set_length(sp6C, 400.0f); - } - else{ - ml_vec3f_set_length(sp6C, 100.0f); - } - this->position_x += this->velocity_x*sp78 + sp6C[0]*sp78*sp78; - this->position_y += this->velocity_y*sp78 + sp6C[1]*sp78*sp78; - this->position_z += this->velocity_z*sp78 + sp6C[2]*sp78*sp78; - this->velocity_x += sp6C[0]*sp78; - this->velocity_y += sp6C[1]*sp78; - this->velocity_z += sp6C[2]*sp78; - if(gu_sqrtf(this->velocity_z*this->velocity_z + (this->velocity_x*this->velocity_x + this->velocity_y*this->velocity_y)) > 50.0f){ - ml_vec3f_set_length(this->velocity, 50.0f); - } - if(ml_distance_vec3f(this->position, this->unk1C) < 20.0f){ - func_80387E64(this); - } - this->actor_specific_1_f = 5.0f; - if(mapSpecificFlags_get(SM_SPECIFIC_FLAG_C) || (volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE))){ //L8038892C - if(!func_80387FA8(this, local, (s32)this->yaw, (s32)this->actor_specific_1_f)){ - if(func_80329480(this)){ - func_80328CEC(this, (s32)this->yaw, 0x78, 0xb4); + } + else {//L80388520 + if (local->vegetable_id == VEGETABLE_1_TOPPER) { + this->actor_specific_1_f = 3.0f; + + if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_C) || 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; - }//L80388994 - }else{ //L803889A0 + }//L803885A0 - this->position_x -= local->unk0_x; - this->position_y -= local->unk0_y; - this->position_z -= local->unk0_z; - this->unk1C_x -= local->unk0_x; - this->unk1C_y -= local->unk0_y; - this->unk1C_z -= local->unk0_z; - TUPLE_ASSIGN(sp60, this->actor_specific_1_f, 0.0f, 0.0f); - ml_vec3f_yaw_rotate_copy(sp60, sp60, this->yaw - 90.0); - local->unk0_x = sp60[0] + local->unk0_x; - local->unk0_y = sp60[1] + local->unk0_y; - local->unk0_z = sp60[2] + local->unk0_z; - this->position_x = local->unk0_x + this->position_x; - this->position_y = local->unk0_y + this->position_y; - this->position_z = local->unk0_z + this->position_z; - this->unk1C_x = local->unk0_x + this->unk1C_x; - this->unk1C_y = local->unk0_y + this->unk1C_y; - this->unk1C_z = local->unk0_z + this->unk1C_z; - }//L80388AD8 - if(func_803292E0(this)){ + if (func_803292E0(this)) { + this->yaw_ideal = func_80329784(this); + }//L803885CC + else if (randf() < 0.02) { + func_80328CEC(this, (s32) this->yaw, 0x1E, 0x5A); + }//L80388B68 + } + else {//L80388618 this->yaw_ideal = func_80329784(this); - }else{//L80388B04 - if(randf() < 0.01){ - func_80328CEC(this, (s32)this->yaw, 0x1e, 0x5A); + } + } + else if (local->vegetable_id == VEGETABLE_2_BAWL) {//L80388634 + this->actor_specific_1_f = 4.0f; + + if (!func_80329030(this, 0) && func_80329480(this)) { + func_80328CEC(this, (s32) this->yaw, 0x78, 0xB4); + this->unk38_0 = 1; + }//L80388698 + + if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_C) || (volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) && func_803292E0( + this))) { + this->yaw_ideal = func_80329784(this); + }//L803886E4 + else if (randf() < 0.02) {//D_8038B1D0){ + func_80328CEC(this, (s32) this->yaw, 0x1E, 0x5A); + } + } + else {//L80388730 + tick = time_getDelta(); + + sp6C[0] = this->unk1C_x - this->position_x; + sp6C[1] = this->unk1C_y - this->position_y; + sp6C[2] = this->unk1C_z - this->position_z; + + if (LENGTH_VEC3F(sp6C) < 40.0f) { + ml_vec3f_set_length(sp6C, 400.0f); + } + else { + ml_vec3f_set_length(sp6C, 100.0f); + } + + this->position_x += this->velocity_x * tick + sp6C[0] * tick * tick; + this->position_y += this->velocity_y * tick + sp6C[1] * tick * tick; + this->position_z += this->velocity_z * tick + sp6C[2] * tick * tick; + + this->velocity_x += sp6C[0] * tick; + this->velocity_y += sp6C[1] * tick; + this->velocity_z += sp6C[2] * tick; + + if (gu_sqrtf(SQ(this->velocity_z) + (SQ(this->velocity_x) + SQ(this->velocity_y))) > 50.0f) { + ml_vec3f_set_length(this->velocity, 50.0f); + } + + if (ml_distance_vec3f(this->position, this->unk1C) < 20.0f) { + func_80387E64(this); + } + + this->actor_specific_1_f = 5.0f; + + if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_C) || (volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE))) { //L8038892C + if (!func_80387FA8(this, local, (s32) this->yaw, (s32) this->actor_specific_1_f)) { + if (func_80329480(this)) { + func_80328CEC(this, (s32) this->yaw, 0x78, 0xb4); + this->unk38_0 = 1; + }//L80388994 + } + else { //L803889A0 + this->position_x -= local->unk0_x; + this->position_y -= local->unk0_y; + this->position_z -= local->unk0_z; + + this->unk1C_x -= local->unk0_x; + this->unk1C_y -= local->unk0_y; + this->unk1C_z -= local->unk0_z; + + TUPLE_ASSIGN(sp60, this->actor_specific_1_f, 0.0f, 0.0f) + ml_vec3f_yaw_rotate_copy(sp60, sp60, this->yaw - 90.0); + + local->unk0_x = sp60[0] + local->unk0_x; + local->unk0_y = sp60[1] + local->unk0_y; + local->unk0_z = sp60[2] + local->unk0_z; + + this->position_x = local->unk0_x + this->position_x; + this->position_y = local->unk0_y + this->position_y; + this->position_z = local->unk0_z + this->position_z; + + this->unk1C_x = local->unk0_x + this->unk1C_x; + this->unk1C_y = local->unk0_y + this->unk1C_y; + this->unk1C_z = local->unk0_z + this->unk1C_z; + }//L80388AD8 + + if (func_803292E0(this)) { + this->yaw_ideal = func_80329784(this); + }//L80388B04 + else if (randf() < 0.01) { + func_80328CEC(this, (s32) this->yaw, 0x1e, 0x5A); } } - }else{ - //L80388B50 - this->yaw_ideal = func_80329784(this); + else { //L80388B50 + this->yaw_ideal = func_80329784(this); + } + } + }//L80388B68 + + func_80328FB0(this, 2.0f); + + if (local->vegetable_id != VEGETABLE_3_COLLY_WOBBLE && actor_animationIsAt(this, 0.3f)) { + FUNC_8030E8B4(SFX_3F2_UNKNOWN, 1.0f, 22000, this->position, 1000, 2000); + } + + if (local->vegetable_id == VEGETABLE_3_COLLY_WOBBLE && actor_animationIsAt(this, 0.4f)) { + FUNC_8030E8B4(SFX_2_CLAW_SWIPE, 0.9f, 8000, this->position, 1000, 2000); + } + break; + + case VEGETABLES_STATE_3_UNKNOWN: //L80388BFC + if (actor_animationIsAt(this, local->vegetable_id == VEGETABLE_2_BAWL ? 0.4 : 0.05)) { + position[0] = this->position_x; + position[1] = this->position_y; + position[2] = this->position_z; + + if (local->vegetable_id == VEGETABLE_1_TOPPER) { + position[1] += 150.0f; } + this->has_met_before = FALSE; + func_80387A80(partEmitMgr_newEmitter(3), position, 3, + local->vegetable_id == VEGETABLE_1_TOPPER ? ASSET_4F0_MODEL_UNKNOWN : ASSET_4F1_MODEL_UNKNOWN); + }//L80388CC4 + + if (actor_animationIsAt(this, 0.75f)) { + func_80326310(this); } - }//L80388B68 - func_80328FB0(this, 2.0f); - - if(local->unkC != 3 && actor_animationIsAt(this, 0.3f)) - FUNC_8030E8B4(SFX_3F2_UNKNOWN, 1.0f, 22000, this->position, 1000, 2000); - - if(local->unkC == 3 && actor_animationIsAt(this, 0.4f)){ - FUNC_8030E8B4(SFX_2_CLAW_SWIPE, 0.9f, 8000, this->position, 1000, 2000); - } - break; - case 3: //L80388BFC - if(actor_animationIsAt(this, (local->unkC == 2) ? 0.4 : 0.05)){ - sp54[0] = this->position_x; - sp54[1] = this->position_y; - sp54[2] = this->position_z; - if(local->unkC == 1) - sp54[1] += 150.0f; - this->has_met_before = FALSE; - func_80387A80(partEmitMgr_newEmitter(3), sp54, 3, (local->unkC == 1)? 0x4f0: 0x4f1); - }//L80388CC4 - - if(actor_animationIsAt(this, 0.75f)) - func_80326310(this); - break; + break; }//L80388CE0 }//*/ diff --git a/src/SM/code_BF0.c b/src/SM/code_BF0.c index 4da2b907..db8a7331 100644 --- a/src/SM/code_BF0.c +++ b/src/SM/code_BF0.c @@ -6,7 +6,7 @@ void SM_func_80386FE0(Actor *this); /* .data */ ActorInfo D_8038ABF0 = { - 0x134, 0x16E, 0, + MARKER_134_UNKNOWN, ACTOR_16E_UNKNOWN, NULL, 1, NULL, SM_func_80386FE0, actor_update_func_80326224, func_80325340, 2000, 0, 0.0f, 0 From 236253ee189cc8834314b098abd879fefced42f6 Mon Sep 17 00:00:00 2001 From: Bl00D4NGEL Date: Tue, 8 Oct 2024 23:40:56 +0200 Subject: [PATCH 09/15] document: code_91E10 --- include/enums.h | 204 ++++++++++++ src/core2/ch/gameSelect.c | 6 +- src/core2/code_4C020.c | 6 +- src/core2/code_5C870.c | 2 +- src/core2/code_6DA30.c | 4 +- src/core2/code_91E10.c | 659 ++++++++++++++++++++------------------ src/core2/code_94620.c | 7 +- src/core2/code_B3A80.c | 2 +- src/core2/code_C9E70.c | 2 +- src/core2/gc/dialog.c | 2 +- src/core2/gc/pauseMenu.c | 12 +- src/core2/gc/zoombox.c | 20 +- src/core2/gc/zoombox.h | 8 +- src/lair/ch/brentilda.c | 2 +- src/lair/code_5ED0.c | 15 +- src/lair/code_A810.c | 2 +- src/lair/code_AD70.c | 2 +- src/lair/code_C1C0.c | 2 +- 18 files changed, 590 insertions(+), 367 deletions(-) diff --git a/include/enums.h b/include/enums.h index 8fc7aabc..16641add 100644 --- a/include/enums.h +++ b/include/enums.h @@ -4500,6 +4500,210 @@ enum asset_e ASSET_1157_TEXT_FINALBOSS_PHASE_5_OPTION_4, ASSET_1158_TEXT_FINALBOSS_PHASE_5_OPTION_5, + ASSET_1213_FF_QUIZ_QUESTION = 0x1213, + ASSET_1214_FF_QUIZ_QUESTION, + ASSET_1215_FF_QUIZ_QUESTION, + ASSET_1216_FF_QUIZ_QUESTION, + ASSET_1217_FF_QUIZ_QUESTION, + ASSET_1218_FF_QUIZ_QUESTION, + ASSET_1219_FF_QUIZ_QUESTION, + ASSET_121A_FF_QUIZ_QUESTION, + ASSET_121B_FF_QUIZ_QUESTION, + ASSET_121C_FF_QUIZ_QUESTION, + ASSET_121D_FF_QUIZ_QUESTION, + ASSET_121E_FF_QUIZ_QUESTION, + ASSET_121F_FF_QUIZ_QUESTION, + ASSET_1220_FF_QUIZ_QUESTION, + ASSET_1221_FF_QUIZ_QUESTION, + ASSET_1222_FF_QUIZ_QUESTION, + ASSET_1223_FF_QUIZ_QUESTION, + ASSET_1224_FF_QUIZ_QUESTION, + ASSET_1225_FF_QUIZ_QUESTION, + ASSET_1226_FF_QUIZ_QUESTION, + ASSET_1227_FF_QUIZ_QUESTION, + ASSET_1228_FF_QUIZ_QUESTION, + ASSET_1229_FF_QUIZ_QUESTION, + ASSET_122A_FF_QUIZ_QUESTION, + ASSET_122B_FF_QUIZ_QUESTION, + ASSET_122C_FF_QUIZ_QUESTION, + ASSET_122D_FF_QUIZ_QUESTION, + ASSET_122E_FF_QUIZ_QUESTION, + ASSET_122F_FF_QUIZ_QUESTION, + ASSET_1230_FF_QUIZ_QUESTION, + ASSET_1231_FF_QUIZ_QUESTION, + ASSET_1232_FF_QUIZ_QUESTION, + ASSET_1233_FF_QUIZ_QUESTION, + ASSET_1234_FF_QUIZ_QUESTION, + ASSET_1235_FF_QUIZ_QUESTION, + ASSET_1236_FF_QUIZ_QUESTION, + ASSET_1237_FF_QUIZ_QUESTION, + ASSET_1238_FF_QUIZ_QUESTION, + ASSET_1239_FF_QUIZ_QUESTION, + ASSET_123A_FF_QUIZ_QUESTION, + ASSET_123B_FF_QUIZ_QUESTION, + ASSET_123C_FF_QUIZ_QUESTION, + ASSET_123D_FF_QUIZ_QUESTION, + ASSET_123E_FF_QUIZ_QUESTION, + ASSET_123F_FF_QUIZ_QUESTION, + ASSET_1240_FF_QUIZ_QUESTION, + ASSET_1241_FF_QUIZ_QUESTION, + ASSET_1242_FF_QUIZ_QUESTION, + ASSET_1243_FF_QUIZ_QUESTION, + ASSET_1244_FF_QUIZ_QUESTION, + ASSET_1245_FF_QUIZ_QUESTION, + ASSET_1246_FF_QUIZ_QUESTION, + ASSET_1247_FF_QUIZ_QUESTION, + ASSET_1248_FF_QUIZ_QUESTION, + ASSET_1249_FF_QUIZ_QUESTION, + ASSET_124A_FF_QUIZ_QUESTION, + ASSET_124B_FF_QUIZ_QUESTION, + ASSET_124C_FF_QUIZ_QUESTION, + ASSET_124D_FF_QUIZ_QUESTION, + ASSET_124E_FF_QUIZ_QUESTION, + ASSET_124F_FF_QUIZ_QUESTION, + ASSET_1250_FF_QUIZ_QUESTION, + ASSET_1251_FF_QUIZ_QUESTION, + ASSET_1252_FF_QUIZ_QUESTION, + ASSET_1253_FF_QUIZ_QUESTION, + ASSET_1254_FF_QUIZ_QUESTION, + ASSET_1255_FF_QUIZ_QUESTION, + ASSET_1256_FF_QUIZ_QUESTION, + ASSET_1257_FF_QUIZ_QUESTION, + ASSET_1258_FF_QUIZ_QUESTION, + ASSET_1259_FF_QUIZ_QUESTION, + ASSET_125A_FF_QUIZ_QUESTION, + ASSET_125B_FF_QUIZ_QUESTION, + ASSET_125C_FF_QUIZ_QUESTION, + ASSET_125D_FF_QUIZ_QUESTION, + ASSET_125E_FF_QUIZ_QUESTION, + ASSET_125F_FF_QUIZ_QUESTION, + ASSET_1260_FF_QUIZ_QUESTION, + ASSET_1261_FF_QUIZ_QUESTION, + ASSET_1262_FF_QUIZ_QUESTION, + ASSET_1263_FF_QUIZ_QUESTION, + ASSET_1264_FF_QUIZ_QUESTION, + ASSET_1265_FF_QUIZ_QUESTION, + ASSET_1266_FF_QUIZ_QUESTION, + ASSET_1267_FF_QUIZ_QUESTION, + ASSET_1268_FF_QUIZ_QUESTION, + ASSET_1269_FF_QUIZ_QUESTION, + ASSET_126A_FF_QUIZ_QUESTION, + ASSET_126B_FF_QUIZ_QUESTION, + ASSET_126C_FF_QUIZ_QUESTION, + ASSET_126D_FF_QUIZ_QUESTION, + ASSET_126E_FF_QUIZ_QUESTION, + ASSET_126F_FF_QUIZ_QUESTION, + ASSET_1270_FF_QUIZ_QUESTION, + ASSET_1271_FF_QUIZ_QUESTION, + ASSET_1272_FF_QUIZ_QUESTION, + ASSET_1273_FF_QUIZ_QUESTION, + ASSET_1274_FF_QUIZ_QUESTION, + ASSET_1275_FF_QUIZ_QUESTION, + ASSET_1276_FF_QUIZ_QUESTION, + + ASSET_12DB_FF_PICTURE_QUESTION = 0x12DB, + ASSET_12DC_FF_PICTURE_QUESTION, + ASSET_12DD_FF_PICTURE_QUESTION, + ASSET_12DE_FF_PICTURE_QUESTION, + ASSET_12DF_FF_PICTURE_QUESTION, + ASSET_12E0_FF_PICTURE_QUESTION, + ASSET_12E1_FF_PICTURE_QUESTION, + ASSET_12E2_FF_PICTURE_QUESTION, + ASSET_12E3_FF_PICTURE_QUESTION, + ASSET_12E4_FF_PICTURE_QUESTION, + ASSET_12E5_FF_PICTURE_QUESTION, + ASSET_12E6_FF_PICTURE_QUESTION, + ASSET_12E7_FF_PICTURE_QUESTION, + ASSET_12E8_FF_PICTURE_QUESTION, + ASSET_12E9_FF_PICTURE_QUESTION, + ASSET_12EA_FF_PICTURE_QUESTION, + ASSET_12EB_FF_PICTURE_QUESTION, + ASSET_12EC_FF_PICTURE_QUESTION, + ASSET_12ED_FF_PICTURE_QUESTION, + + ASSET_13A3_FF_SOUND_QUESTION = 0x13A3, + ASSET_13A4_FF_SOUND_QUESTION, + ASSET_13A5_FF_SOUND_QUESTION, + ASSET_13A6_FF_SOUND_QUESTION, + ASSET_13A7_FF_SOUND_QUESTION, + ASSET_13A8_FF_SOUND_QUESTION, + ASSET_13A9_FF_SOUND_QUESTION, + ASSET_13AA_FF_SOUND_QUESTION, + ASSET_13AB_FF_SOUND_QUESTION, + ASSET_13AC_FF_SOUND_QUESTION, + ASSET_13AD_FF_SOUND_QUESTION, + ASSET_13AE_FF_SOUND_QUESTION, + ASSET_13AF_FF_SOUND_QUESTION, + ASSET_13B0_FF_SOUND_QUESTION, + ASSET_13B1_FF_SOUND_QUESTION, + ASSET_13B2_FF_SOUND_QUESTION, + ASSET_13B3_FF_SOUND_QUESTION, + ASSET_13B4_FF_SOUND_QUESTION, + ASSET_13B5_FF_SOUND_QUESTION, + ASSET_13B6_FF_SOUND_QUESTION, + ASSET_13B7_FF_SOUND_QUESTION, + ASSET_13B8_FF_SOUND_QUESTION, + ASSET_13B9_FF_SOUND_QUESTION, + ASSET_13BA_FF_SOUND_QUESTION, + ASSET_13BB_FF_SOUND_QUESTION, + ASSET_13BC_FF_SOUND_QUESTION, + ASSET_13BD_FF_SOUND_QUESTION, + ASSET_13BE_FF_SOUND_QUESTION, + ASSET_13BF_FF_SOUND_QUESTION, + ASSET_13C0_FF_SOUND_QUESTION, + ASSET_13C1_FF_SOUND_QUESTION, + ASSET_13C2_FF_SOUND_QUESTION, + ASSET_13C3_FF_SOUND_QUESTION, + ASSET_13C4_FF_SOUND_QUESTION, + ASSET_13C5_FF_SOUND_QUESTION, + ASSET_13C6_FF_SOUND_QUESTION, + ASSET_13C7_FF_SOUND_QUESTION, + ASSET_13C8_FF_SOUND_QUESTION, + ASSET_13C9_FF_SOUND_QUESTION, + ASSET_13CA_FF_SOUND_QUESTION, + ASSET_13CB_FF_SOUND_QUESTION, + ASSET_13CC_FF_SOUND_QUESTION, + ASSET_13CD_FF_SOUND_QUESTION, + ASSET_13CE_FF_SOUND_QUESTION, + ASSET_13CF_FF_SOUND_QUESTION, + ASSET_13D0_FF_SOUND_QUESTION, + ASSET_13D1_FF_SOUND_QUESTION, + ASSET_13D2_FF_SOUND_QUESTION, + ASSET_13D3_FF_SOUND_QUESTION, + ASSET_13D4_FF_SOUND_QUESTION, + ASSET_13D5_FF_SOUND_QUESTION, + + ASSET_1407_FF_GRUNTY_QUESTION = 0x1407, + ASSET_1408_FF_GRUNTY_QUESTION, + ASSET_1409_FF_GRUNTY_QUESTION, + ASSET_140A_FF_GRUNTY_QUESTION, + ASSET_140B_FF_GRUNTY_QUESTION, + ASSET_140C_FF_GRUNTY_QUESTION, + ASSET_140D_FF_GRUNTY_QUESTION, + ASSET_140E_FF_GRUNTY_QUESTION, + ASSET_140F_FF_GRUNTY_QUESTION, + ASSET_1410_FF_GRUNTY_QUESTION, + ASSET_1411_FF_GRUNTY_QUESTION, + ASSET_1412_FF_GRUNTY_QUESTION, + ASSET_1413_FF_GRUNTY_QUESTION, + ASSET_1414_FF_GRUNTY_QUESTION, + ASSET_1415_FF_GRUNTY_QUESTION, + ASSET_1416_FF_GRUNTY_QUESTION, + ASSET_1417_FF_GRUNTY_QUESTION, + ASSET_1418_FF_GRUNTY_QUESTION, + ASSET_1419_FF_GRUNTY_QUESTION, + ASSET_141A_FF_GRUNTY_QUESTION, + ASSET_141B_FF_GRUNTY_QUESTION, + ASSET_141C_FF_GRUNTY_QUESTION, + ASSET_141D_FF_GRUNTY_QUESTION, + ASSET_141E_FF_GRUNTY_QUESTION, + ASSET_141F_FF_GRUNTY_QUESTION, + ASSET_1420_FF_GRUNTY_QUESTION, + ASSET_1421_FF_GRUNTY_QUESTION, + ASSET_1422_FF_GRUNTY_QUESTION, + ASSET_1423_FF_GRUNTY_QUESTION, + ASSET_1424_FF_GRUNTY_QUESTION, + ASSET_146B_MODEL_TTC_TREASURE_TROVE_COVE_OPA = 0x146B, ASSET_146C_MODEL_TTC_TREASURE_TROVE_COVE_XLU, ASSET_146D_MODEL_TTC_NIPPERS_SHELL_OPA, diff --git a/src/core2/ch/gameSelect.c b/src/core2/ch/gameSelect.c index c41c4a69..b5bcacdd 100644 --- a/src/core2/ch/gameSelect.c +++ b/src/core2/ch/gameSelect.c @@ -428,7 +428,7 @@ void func_802C4C14(Actor *this){ if(sp74[0] == 1){ if(gameFile_isNotEmpty(sp84)){ func_8031877C(chGameSelectTopZoombox); - func_803183A4(chGameSelectTopZoombox, (&D_80365DFC)[func_8031B5B0()]); + func_803183A4(chGameSelectTopZoombox, (&D_80365DFC)[code94620_func_8031B5B0()]); D_8037DD2C = 1; subaddie_set_state(this, 5); } @@ -551,7 +551,7 @@ void func_802C4C14(Actor *this){ } void func_802C5740(Actor * this){ - int i = func_8031B5B0(); + int i = code94620_func_8031B5B0(); D_8037DCE0.unk0 = (&D_80365DF4)[i]; D_8037DCE0.unk4 = (&D_80365DF8)[i]; @@ -560,7 +560,7 @@ void func_802C5740(Actor * this){ if(chGameSelectBottomZoombox == NULL){ chGameSelectBottomZoombox = gczoombox_new(0xA0, ZOOMBOX_SPRITE_C_BANJO_2, 2, 0, NULL); gczoombox_open(chGameSelectBottomZoombox); - func_803184C8(chGameSelectBottomZoombox, 30.0f, 5, 2, 0.4f, 0, 0); + gczoombox_func_803184C8(chGameSelectBottomZoombox, 30.0f, 5, 2, 0.4f, 0, 0); }//L802C57FC if(chGameSelectTopZoombox == NULL){ diff --git a/src/core2/code_4C020.c b/src/core2/code_4C020.c index 5db33954..b9591063 100644 --- a/src/core2/code_4C020.c +++ b/src/core2/code_4C020.c @@ -12,7 +12,7 @@ extern void func_802F9D38(s32); extern void func_802EE6CC(f32[3], f32[3], s32[4], s32, f32, f32, s32, s32, s32); 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 code_91E10_func_80319EA4(void); extern void fileProgressFlag_set(enum file_progress_e, bool); void func_802D3D54(Actor *this); @@ -814,7 +814,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(volatileFlag_get(VOLATILE_FLAG_1) && map_get() != MAP_8E_GL_FURNACE_FUN){ - func_80319214(gfx, mtx, vtx); + code91E10_draw(gfx, mtx, vtx); } } @@ -1008,7 +1008,7 @@ void func_802D5628(void){ case 0x15:// L802D5AB4 case 0x2d:// L802D5AB4 if(D_80367684 && D_80367684 == map_get()){ - func_80319EA4(); + code_91E10_func_80319EA4(); if(0.0f < D_8037DE08){ D_8037DE08 -= time_getDelta(); } diff --git a/src/core2/code_5C870.c b/src/core2/code_5C870.c index 38424f1f..75a1e6f7 100644 --- a/src/core2/code_5C870.c +++ b/src/core2/code_5C870.c @@ -624,7 +624,7 @@ s32 getGameMode(void){ return D_8037E8E0.game_mode; } -int func_802E4A08(void){ +bool func_802E4A08(void){ return (D_8037E8E0.game_mode == GAME_MODE_6_FILE_PLAYBACK) || (D_8037E8E0.game_mode == GAME_MODE_5_UNKNOWN) || (D_8037E8E0.game_mode == GAME_MODE_7_ATTRACT_DEMO) diff --git a/src/core2/code_6DA30.c b/src/core2/code_6DA30.c index f082f95b..559805df 100644 --- a/src/core2/code_6DA30.c +++ b/src/core2/code_6DA30.c @@ -386,7 +386,7 @@ void func_802F5060(s32 textureId){ tmp_a2 = func_802546E4(D_80380AB8[1]); if(tmp_a2 & 0xF) tmp_a2 += 0x10 - (tmp_a2 & 0xF); - if(!func_8033BDAC(SPRITE_BOLD_FONT_NUMBERS_ALPHAMASK, D_80380AB8[1],tmp_a2)){ + if(!code_B3A80_func_8033BDAC(SPRITE_BOLD_FONT_NUMBERS_ALPHAMASK, D_80380AB8[1],tmp_a2)){ assetcache_release(D_80380AB8[1]); D_80380AB8[1] = assetcache_get(SPRITE_BOLD_FONT_NUMBERS_ALPHAMASK); } @@ -394,7 +394,7 @@ void func_802F5060(s32 textureId){ tmp_a2 = func_802546E4(D_80380AB8[3]); if(tmp_a2 & 0xF) tmp_a2 += 0x10 - (tmp_a2 & 0xF); - if(!func_8033BDAC(SPRITE_BOLD_FONT_LETTERS_ALPHAMASK, D_80380AB8[3],tmp_a2)){ + if(!code_B3A80_func_8033BDAC(SPRITE_BOLD_FONT_LETTERS_ALPHAMASK, D_80380AB8[3],tmp_a2)){ assetcache_release(D_80380AB8[3]); D_80380AB8[3] = assetcache_get(SPRITE_BOLD_FONT_LETTERS_ALPHAMASK); } diff --git a/src/core2/code_91E10.c b/src/core2/code_91E10.c index 3f663217..0e0b3e91 100644 --- a/src/core2/code_91E10.c +++ b/src/core2/code_91E10.c @@ -7,57 +7,71 @@ extern void item_set(enum item_e, s32); extern void func_8025A55C(s32, s32, s32); +enum code91E10_state { + CODE91E10_STATE_0_INITIAL, //803197F0 + CODE91E10_STATE_1_SHOW_QUESTION_VIA_ZOOMBOX, //80319910 + CODE91E10_STATE_2_SHOW_PORTRAITS_FOR_QUESTION, //8031994C + CODE91E10_STATE_3_UNKNOWN, //80319B78 + CODE91E10_STATE_4_UNKNOWN, //80319B78 + CODE91E10_STATE_5_UNKNOWN, //80319B78 + CODE91E10_STATE_6_SELECT_QUIZ_ANSWER, //80319B84 + CODE91E10_STATE_7_CHECK_GIVEN_ANSWER, //80319C0C + CODE91E10_STATE_8_UNKNOWN, //80319CFC + CODE91E10_STATE_9_UNKNOWN, //80319D6C + CODE91E10_STATE_A_UNKNOWN //80319D80 +}; typedef struct { u8 cmd; u8 string_size; - //u8 str[]; -}StringBin; +} StringBin_Unused; typedef struct { u8 unk0; u8 unk1; -}QuizQuestionBin_Struct_1; +} QuizQuestionBin_Unused; typedef struct { u8 unk0; u8 unk1; u8 unk2; -}QuizQuestionBin; +} QuizQuestionBin; typedef struct{ - s32 unk0[4][4]; -}Struct_Core2_91E10_1; + s32 answer_options[4][4]; // first dimension = zoombox index, second dimension = value (0-3), third dimension = answer +} QuizQuestionStruct; typedef struct { - s8 unk0; //question_type - s8 unk1; //question_indx - s8 unk2; - u8 unk3; - s32 unk4; - void (*unk8)(s32, s32); + s8 question_type; // enum ff_question_type_e + s8 question_index; + s8 unk2; // always -1? + u8 quiz_question_time; // is either 0 or 10 (from __code5ED0_getQuizQuestionTime) + s32 unk4; // always 0 + void (*unk8)(s32, s8); // gets called with unk4 and unk11 QuizQuestionBin *unkC; //asset_bin - u8 unk10; //state + u8 state; s8 unk11; - s8 unk12; - u8 unk13; //selected_box_indx - u8 unk14; - u8 unk15; //cursor_cooldown - u8 unk16; - u8 unk17; - u8 unk18[4]; - s8 unk1C[4]; - s8 unk20[4]; //portrait_id - GcZoombox *unk24[4]; //zoombox - Struct_Core2_91E10_1 unk34; -}Struct_Core2_91E10; + s8 selected_answer_index; + u8 answer_cursor_index; + u8 unk14; // relevant for state = 9, from 0 to 4? + u8 answer_cursor_cooldown; + u8 unk16; // some value for zoombox (gczoombox_func_803184C8) + u8 unk17; // some value for zoombox (gczoombox_func_803184C8) + u8 answer_str_counts[4]; + s8 answer_values[4]; + s8 portait_ids[4]; + GcZoombox *zoomboxes[4]; + QuizQuestionStruct quiz_question; +} Struct_Core2_91E10; -void func_803197AC(s32 arg0); -void func_80319E20(s32 arg0, s32 arg1); -void func_8031A3E4(void); +static void __code91E10_advanceStateTo(enum code91E10_state state); +static void __code91E10_func_80319E20(s32 portrait_id, s32 state); +static void __code91E10_closeZoomboxes(void); -u8 D_8036D940[] = { - 0, +#define SELECTABLE_PORTAIT_COUNT 0x2C + +static u8 sPortraits[SELECTABLE_PORTAIT_COUNT+1] = { + NULL, ZOOMBOX_SPRITE_11_CHIMPY, ZOOMBOX_SPRITE_12_CONGA, ZOOMBOX_SPRITE_13_BLUBBER, @@ -105,57 +119,59 @@ u8 D_8036D940[] = { }; /* .bss */ -Struct_Core2_91E10 *D_803830E0; +Struct_Core2_91E10 *sD_803830E0; /* .code */ -void func_80318DA0(s8 *ptr, u8 min_indx, u8 max_indx, s32 min_value, s32 max_value){ +static void __code91E10_uniquelyRandomizeValuesInPointer(s8 *ptr, u8 min_index, u8 max_index, s32 min_value, s32 max_value){ s32 i; s32 j; - s32 unique; + bool is_unique; - for(i = min_indx; i <= max_indx; i++){ - /* assign unique random value*/ - do{ - /*assign random value */ - ptr[i] = randi2(min_value, max_value + 1); - unique = TRUE; - /* test uniqueness */ - for(j = min_indx; j < i; j++){ - if (ptr[i] == ptr[j]) { - unique = FALSE; - break; - } + for (i = min_index; i <= max_index; i++){ + /* assign is_unique random value*/ + do { + /*assign random value */ + ptr[i] = randi2(min_value, max_value + 1); + is_unique = TRUE; + /* test uniqueness */ + for(j = min_index; j < i; j++){ + if (ptr[i] == ptr[j]) { + is_unique = FALSE; + break; } - }while(unique == FALSE); + } + } while(is_unique == FALSE); } } -void func_80318E90(void) { - D_803830E0->unk20[0] = 0; - func_80318DA0(D_803830E0->unk20, 1, 3, 1, 0x2C); +static void __code91E10_randomizePortaitIds(void) { + sD_803830E0->portait_ids[0] = 0; + __code91E10_uniquelyRandomizeValuesInPointer(sD_803830E0->portait_ids, 1, 3, 1, SELECTABLE_PORTAIT_COUNT); } -//__gcquiz_get_type_start_id -enum asset_e func_80318ED8(enum ff_question_type_e question_type){ - switch(question_type){ - case FFQT_1_PICTURE: return 0x12DB; - case FFQT_2_SOUND: return 0x13A3; - case FFQT_3_GRUNTY: return 0x1407; +static enum asset_e __code91E10_getQuizQuestionAssetStartOffsetInclusive(enum ff_question_type_e question_type) { + switch(question_type) { + case FFQT_1_PICTURE: return ASSET_12DB_FF_PICTURE_QUESTION; + case FFQT_2_SOUND: return ASSET_13A3_FF_SOUND_QUESTION; + case FFQT_3_GRUNTY: return ASSET_1407_FF_GRUNTY_QUESTION; } - return 0x1213; + + return ASSET_1213_FF_QUIZ_QUESTION; } -//__gcquiz_get_type_end_id -enum asset_e func_80318F1C(enum ff_question_type_e question_type){ - switch(question_type){ - case FFQT_1_PICTURE: return 0x12EE; - case FFQT_2_SOUND: return 0x13D6; - case FFQT_3_GRUNTY: return 0x1425; +static enum asset_e __code91E10_getQuizQuestionAssetEndOffset(enum ff_question_type_e question_type){ + switch(question_type) { + case FFQT_1_PICTURE: return ASSET_12ED_FF_PICTURE_QUESTION + 1; + case FFQT_2_SOUND: return ASSET_13D5_FF_SOUND_QUESTION + 1; + case FFQT_3_GRUNTY: return ASSET_1424_FF_GRUNTY_QUESTION + 1; } - return 0x1277; + + return ASSET_1276_FF_QUIZ_QUESTION + 1; } -s32 func_80318F60(enum ff_question_type_e question_type, s32 q_indx, s32 arg2) { + +// get correct question index? +static s32 __code91E10_func_80318F60(enum ff_question_type_e question_type, s32 q_index, s32 arg2) { s32 phi_v1; s32 phi_a0; @@ -163,7 +179,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) + VOLATILE_FLAG_26_FF_GRUNTY_QUESTIONS, 2); + phi_a0 = volatileFlag_getN((q_index * 2) + VOLATILE_FLAG_26_FF_GRUNTY_QUESTIONS, 2); } else { phi_a0 = 0; } @@ -172,285 +188,287 @@ s32 func_80318F60(enum ff_question_type_e question_type, s32 q_indx, s32 arg2) { return phi_v1; } -bool func_80318FB4(enum ff_question_type_e question_type){ +static bool __code91E10_isSoundQuestion(enum ff_question_type_e question_type){ return question_type == FFQT_2_SOUND; } -s32 func_80318FC0(s32 arg0){ - switch(arg0){ +static s32 __code91E10_getZoomboxY(s32 arg0){ + switch(arg0) { case 1: return 40; case 2: return 80; case 3: return 120; } + return 0; } -s32 func_80319004(s32 arg0){ +static s32 __code91E10_func_80319004(s32 arg0){ return arg0 == 0 ? 3 : 2; } -s32 func_8031901C(s32 arg0){ +static s32 __code91E10_return0(s32 arg0){ return 0; } -bool func_80319028(s32 arg0){ +static bool __code91E10_isZero(s32 arg0){ return arg0 != 0 ? FALSE : TRUE; } -//__gcquiz_animation_duration -f32 func_80319040(s32 arg0){ +static f32 __code91E10_getAnimationDuration(s32 arg0){ return 0.4f; } -void func_80319050(void) { +void code_91E10_init() { s32 i; - D_803830E0 = malloc(0x74); - D_803830E0->unkC = malloc(0x400); - D_803830E0->unk16 = 0x14U; - D_803830E0->unk17 = 0x1E; - D_803830E0->unk20[0] = 0; - D_803830E0->unk24[0] = gczoombox_new(func_80318FC0(0), 0, func_80319004(0), func_8031901C(0), func_80319E20); - func_803184C8(D_803830E0->unk24[0], (f32)D_803830E0->unk16, 5, 2, func_80319040(0), func_80319028(0), 0); + sD_803830E0 = malloc(sizeof(Struct_Core2_91E10)); + sD_803830E0->unkC = malloc(0x400); + sD_803830E0->unk16 = 0x14U; + sD_803830E0->unk17 = 0x1E; + sD_803830E0->portait_ids[0] = 0; + sD_803830E0->zoomboxes[0] = gczoombox_new(__code91E10_getZoomboxY(0), 0, __code91E10_func_80319004(0), __code91E10_return0(0), __code91E10_func_80319E20); + gczoombox_func_803184C8(sD_803830E0->zoomboxes[0], (f32)sD_803830E0->unk16, 5, 2, __code91E10_getAnimationDuration(0), __code91E10_isZero(0), 0); for(i = 1; i < 4; i++){ - D_803830E0->unk20[i] = 0; - D_803830E0->unk24[i] = NULL; + sD_803830E0->portait_ids[i] = 0; + sD_803830E0->zoomboxes[i] = NULL; } - func_803197AC(0); + __code91E10_advanceStateTo(CODE91E10_STATE_0_INITIAL); } -void func_80319190(void) { +void code_91E10_free() { s32 i; - if (D_803830E0 != NULL) { - free(D_803830E0->unkC); - D_803830E0->unkC = NULL; + if (sD_803830E0 != NULL) { + free(sD_803830E0->unkC); + sD_803830E0->unkC = NULL; for(i = 0; i < 4; i++){ - gczoombox_free(D_803830E0->unk24[i]); - D_803830E0->unk24[i] = NULL; + gczoombox_free(sD_803830E0->zoomboxes[i]); + sD_803830E0->zoomboxes[i] = NULL; } - free(D_803830E0); - D_803830E0 = NULL; + free(sD_803830E0); + sD_803830E0 = NULL; } } -void func_80319214(Gfx **gfx, Mtx **mtx, Vtx **vtx) { +void code91E10_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx) { s32 i; - if (D_803830E0 != NULL) { + if (sD_803830E0 != NULL) { for(i = 0; i < 4; i++){ - gczoombox_draw(D_803830E0->unk24[i], gfx, mtx, vtx); + gczoombox_draw(sD_803830E0->zoomboxes[i], gfx, mtx, vtx); } } } -bool func_803192A4(enum ff_question_type_e q_type, s32 q_indx, s32 arg2) { - //#define NEXT(iter) (*(((char *)(iter))++)) - //#define SKIP(iter,n) (((char *)(iter)) += (n)) +// randomize quiz question? +static bool __code91E10_func_803192A4(enum ff_question_type_e q_type, s32 q_index, s32 arg2) { char *char_iter; - s32 temp_s0; + enum asset_e quiz_question_index; s32 temp_s2; s32 str_cnt; s32 phi_v1; - s32 sp60; + s32 zoombox_text_index; s32 phi_a1; - s32 sp58; - s32 sp54; - s32 sp50; - s32 sp4C; - s32 sp48; - s32 sp44; - s32 temp_v0_3; - s32 str_size; + s32 quiz_question_bin_unk0; + s32 quiz_question_bin_unk1; + s32 quiz_question_bin_unk2; + s32 first_answer_cmd; + s32 second_answer_cmd; + s32 third_answer_cmd; + s32 cmd; + s32 option_text; - temp_s0 = func_80318ED8(q_type) + q_indx; - if (func_8031A3BC()) { - return 0; + quiz_question_index = __code91E10_getQuizQuestionAssetStartOffsetInclusive(q_type) + q_index; + if (code91E10_isNotInInitialState()) { + return FALSE; } - if (func_8033BDAC(temp_s0, D_803830E0->unkC, 0x400) == 0) { - free(D_803830E0->unkC); - D_803830E0->unkC = (QuizQuestionBin *) assetcache_get(temp_s0); + + // not in asset cache? + if (code_B3A80_func_8033BDAC(quiz_question_index, sD_803830E0->unkC, 0x400) == 0) { + free(sD_803830E0->unkC); + sD_803830E0->unkC = (QuizQuestionBin *) assetcache_get(quiz_question_index); } - char_iter = D_803830E0->unkC; - sp58 = *(char_iter++); // NEXT - sp54 = *(char_iter++); // NEXT - sp50 = *(char_iter++); // NEXT - sp4C = ((sp54 >= 2) ? func_80318F60(q_type, q_indx, arg2) : 0) + 1; - if (((sp50 == 0) || (func_80318FB4(q_type) != 0)) != 0) { + + char_iter = sD_803830E0->unkC; + quiz_question_bin_unk0 = *(char_iter++); // NEXT + quiz_question_bin_unk1 = *(char_iter++); // NEXT + quiz_question_bin_unk2 = *(char_iter++); // NEXT + first_answer_cmd = ((quiz_question_bin_unk1 >= 2) ? __code91E10_func_80318F60(q_type, q_index, arg2) : 0) + 1; + // is sound question or quiz_question_bin_unk2 == 0 + if (((quiz_question_bin_unk2 == 0) || (__code91E10_isSoundQuestion(q_type) != FALSE)) != FALSE) { do { - sp48 = randi2(0, sp54 + sp50) + 1; - } while (sp48 == sp4C); + second_answer_cmd = randi2(0, quiz_question_bin_unk1 + quiz_question_bin_unk2) + 1; + } while (second_answer_cmd == first_answer_cmd); do { - sp44 = randi2(0, sp54 + sp50) + 1; - } while (sp44 == sp4C || sp44 == sp48); + third_answer_cmd = randi2(0, quiz_question_bin_unk1 + quiz_question_bin_unk2) + 1; + } while (third_answer_cmd == first_answer_cmd || third_answer_cmd == second_answer_cmd); } else { - sp48 = randi2(0, sp50) + sp54 + 1; + second_answer_cmd = randi2(0, quiz_question_bin_unk2) + quiz_question_bin_unk1 + 1; do { - sp44 = randi2(0, sp50) + sp54 + 1; - } while (sp44 == sp48); + third_answer_cmd = randi2(0, quiz_question_bin_unk2) + quiz_question_bin_unk1 + 1; + } while (third_answer_cmd == second_answer_cmd); } - char_iter += 2*func_8031B5B0(); // SKIP + char_iter += 2*code94620_func_8031B5B0(); // SKIP phi_v1 = *(char_iter++); // NEXT phi_v1 += (*(char_iter++) << 8); - char_iter = (s32)D_803830E0->unkC + phi_v1; - str_cnt = *(char_iter++); // NEXT + char_iter = (s32)sD_803830E0->unkC + phi_v1; + str_cnt = *(char_iter++); // NEXT char_iter = 5 for(phi_a1 = 0; phi_a1 < 4; phi_a1++){ - D_803830E0->unk18[phi_a1] = 0; + sD_803830E0->answer_str_counts[phi_a1] = 0; } for(phi_a1 = 0; phi_a1 < str_cnt; phi_a1++){ - temp_v0_3 = *(char_iter++); // NEXT - str_size = *(char_iter++); // NEXT - temp_v0_3 -= 0x80; - + // cmd = 0x80 - 0x83 + cmd = *(char_iter++); // NEXT char_iter = 6 + option_text = *(char_iter++); // NEXT char_iter = 7 + cmd -= 0x80; - if ((temp_v0_3 == 0) || (temp_v0_3 == sp4C) || (temp_v0_3 == sp48) || (temp_v0_3 == sp44)) { - if (temp_v0_3 == 0) { - sp60 = 0; - } else if (temp_v0_3 == sp4C) { - sp60 = 1; - } else if (temp_v0_3 == sp48) { - sp60 = 2; - } else if (temp_v0_3 == sp44) { - sp60 = 3; + if ((cmd == 0) || (cmd == first_answer_cmd) || (cmd == second_answer_cmd) || (cmd == third_answer_cmd)) { + if (cmd == 0) { // grunty + zoombox_text_index = 0; + } else if (cmd == first_answer_cmd) { // first answer + zoombox_text_index = 1; + } else if (cmd == second_answer_cmd) { // second answer + zoombox_text_index = 2; + } else if (cmd == third_answer_cmd) { // third answer + zoombox_text_index = 3; } else{ - sp60 = sp60; + zoombox_text_index = zoombox_text_index; } - D_803830E0->unk34.unk0[sp60][D_803830E0->unk18[sp60]++] = char_iter; + sD_803830E0->quiz_question.answer_options[zoombox_text_index][sD_803830E0->answer_str_counts[zoombox_text_index]++] = char_iter; } - char_iter += str_size; // SKIP + char_iter += option_text; // SKIP } - //#undef NEXT - //#undef SKIP return TRUE; } - -void func_803196D0(s32 arg0) { - gczoombox_open(D_803830E0->unk24[arg0]); - gczoombox_maximize(D_803830E0->unk24[arg0]); - gczoombox_setStrings(D_803830E0->unk24[arg0], D_803830E0->unk18[D_803830E0->unk1C[arg0]], D_803830E0->unk34.unk0[D_803830E0->unk1C[arg0]]); +void __code91E10_openZoomboxAndMaximizeWithStringsAt(s32 zoombox_index) { + gczoombox_open(sD_803830E0->zoomboxes[zoombox_index]); + gczoombox_maximize(sD_803830E0->zoomboxes[zoombox_index]); + gczoombox_setStrings( + sD_803830E0->zoomboxes[zoombox_index], + sD_803830E0->answer_str_counts[sD_803830E0->answer_values[zoombox_index]], + sD_803830E0->quiz_question.answer_options[sD_803830E0->answer_values[zoombox_index]] + ); } -//__gcquiz_set_box_highlight -void func_80319758(s32 indx, bool arg1){ - gczoombox_highlight(D_803830E0->unk24[indx], arg1); - func_80318C48(D_803830E0->unk24[indx], arg1); +void __code91E10_setZoomboxHighlight(s32 index, bool arg1){ + gczoombox_highlight(sD_803830E0->zoomboxes[index], arg1); + gczoombox_func_80318C48(sD_803830E0->zoomboxes[index], arg1); } -void func_803197AC(s32 arg0){ +static void __code91E10_advanceStateTo(enum code91E10_state state){ s32 i; s32 j; - switch(arg0){ - case 0: //803197F0 - D_803830E0->unk0 = 0; - D_803830E0->unk1 = 0; - D_803830E0->unk3 = 0; - D_803830E0->unk8 = 0; - D_803830E0->unk12 = -1; - D_803830E0->unk14 = 0; - D_803830E0->unk11 = -2; - func_803184C8(D_803830E0->unk24[0], (f32) D_803830E0->unk16, 5, 2, func_80319040(0), func_80319028(0), 0); - func_80318774(D_803830E0->unk24[0]); - gczoombox_highlight(D_803830E0->unk24[0], 1); + switch(state){ + case CODE91E10_STATE_0_INITIAL: + sD_803830E0->question_type = 0; + sD_803830E0->question_index = 0; + sD_803830E0->quiz_question_time = 0; + sD_803830E0->unk8 = NULL; + sD_803830E0->selected_answer_index = -1; + sD_803830E0->unk14 = 0; + sD_803830E0->unk11 = -2; + gczoombox_func_803184C8(sD_803830E0->zoomboxes[0], (f32) sD_803830E0->unk16, 5, 2, __code91E10_getAnimationDuration(0), __code91E10_isZero(0), 0); + gczoombox_setUnk13ATo0(sD_803830E0->zoomboxes[0]); + gczoombox_highlight(sD_803830E0->zoomboxes[0], TRUE); for(i = 0; i < 4; i++){ - D_803830E0->unk1C[i] = -1; + sD_803830E0->answer_values[i] = -1; for(j = 0; j < 4; j++){ - D_803830E0->unk34.unk0[i][j] = 0; + sD_803830E0->quiz_question.answer_options[i][j] = NULL; } } break; - case 1: //80319910 - gczoombox_open(D_803830E0->unk24[0]); - gczoombox_maximize(D_803830E0->unk24[0]); - gczoombox_setStrings(D_803830E0->unk24[0], D_803830E0->unk18[0], D_803830E0->unk34.unk0[0]); + case CODE91E10_STATE_1_SHOW_QUESTION_VIA_ZOOMBOX: + gczoombox_open(sD_803830E0->zoomboxes[0]); + gczoombox_maximize(sD_803830E0->zoomboxes[0]); + gczoombox_setStrings(sD_803830E0->zoomboxes[0], sD_803830E0->answer_str_counts[0], sD_803830E0->quiz_question.answer_options[0]); break; - case 2: //8031994C - if (D_803830E0->unk0 != -1) { - func_80318E90(); + case CODE91E10_STATE_2_SHOW_PORTRAITS_FOR_QUESTION: + if (sD_803830E0->question_type != -1) { + __code91E10_randomizePortaitIds(); for(i = 1; i < 4; i++){ - D_803830E0->unk24[i] = gczoombox_new(func_80318FC0(i), D_8036D940[D_803830E0->unk20[i]], func_80319004(i), func_8031901C(i), func_80319E20); - func_803184C8(D_803830E0->unk24[i], (f32)D_803830E0->unk17, 5, 2, func_80319040(i), func_80319028(i), 0); + sD_803830E0->zoomboxes[i] = gczoombox_new(__code91E10_getZoomboxY(i), sPortraits[sD_803830E0->portait_ids[i]], __code91E10_func_80319004(i), __code91E10_return0(i), __code91E10_func_80319E20); + gczoombox_func_803184C8(sD_803830E0->zoomboxes[i], (f32)sD_803830E0->unk17, 5, 2, __code91E10_getAnimationDuration(i), __code91E10_isZero(i), 0); } } else { for(i = 1; i < 4; i++){ - D_803830E0->unk24[i] = gczoombox_new(func_80318FC0(i), D_803830E0->unk20[i], 1, func_8031901C(i), func_80319E20); - func_803184C8(D_803830E0->unk24[i], (f32)D_803830E0->unk17, 5, 2, func_80319040(i), func_80319028(i), 0); + sD_803830E0->zoomboxes[i] = gczoombox_new(__code91E10_getZoomboxY(i), sD_803830E0->portait_ids[i], 1, __code91E10_return0(i), __code91E10_func_80319E20); + gczoombox_func_803184C8(sD_803830E0->zoomboxes[i], (f32)sD_803830E0->unk17, 5, 2, __code91E10_getAnimationDuration(i), __code91E10_isZero(i), 0); } } - timedFunc_set_1(0.0f, func_803197AC, 3); - timedFunc_set_1(0.0f, func_803196D0, 1); - timedFunc_set_1(0.2f, func_803196D0, 2); - timedFunc_set_1(0.4f, func_803196D0, 3); + timedFunc_set_1(0.0f, __code91E10_advanceStateTo, CODE91E10_STATE_3_UNKNOWN); + timedFunc_set_1(0.0f, __code91E10_openZoomboxAndMaximizeWithStringsAt, 1); + timedFunc_set_1(0.2f, __code91E10_openZoomboxAndMaximizeWithStringsAt, 2); + timedFunc_set_1(0.4f, __code91E10_openZoomboxAndMaximizeWithStringsAt, 3); break; - case 3: //80319B78 - case 4: //80319B78 - case 5: //80319B78 - if(1){} + case CODE91E10_STATE_3_UNKNOWN: + case CODE91E10_STATE_4_UNKNOWN: + case CODE91E10_STATE_5_UNKNOWN: break; - case 6: //80319B84 - item_set(ITEM_0_HOURGLASS_TIMER, D_803830E0->unk3 * 60 - 1); + case CODE91E10_STATE_6_SELECT_QUIZ_ANSWER: + item_set(ITEM_0_HOURGLASS_TIMER, sD_803830E0->quiz_question_time * 60 - 1); item_set(ITEM_6_HOURGLASS, TRUE); - D_803830E0->unk15 = 0; - D_803830E0->unk13 = 1U; + sD_803830E0->answer_cursor_cooldown = 0; + sD_803830E0->answer_cursor_index = 1U; for (i = 1; i < 4; i++) { - func_80319758(i, BOOL(i == D_803830E0->unk13)); + __code91E10_setZoomboxHighlight(i, BOOL(i == sD_803830E0->answer_cursor_index)); } break; - case 7: //80319C0C - if (D_803830E0->unk0 != -1) { - D_803830E0->unk11 = (D_803830E0->unk12 == -1) ? -1 - : (D_803830E0->unk1C[D_803830E0->unk12] == 1) ? 1 + case CODE91E10_STATE_7_CHECK_GIVEN_ANSWER: + if (sD_803830E0->question_type != -1) { + sD_803830E0->unk11 = (sD_803830E0->selected_answer_index == -1) ? -1 + : (sD_803830E0->answer_values[sD_803830E0->selected_answer_index] == 1) ? 1 : 0; } else { - D_803830E0->unk11 = (s8) D_803830E0->unk12; + sD_803830E0->unk11 = (s8) sD_803830E0->selected_answer_index; } - if (D_803830E0->unk12 != -1) { + if (sD_803830E0->selected_answer_index != -1) { for(i = 1; i < 4; i++){ - if (i != D_803830E0->unk12) { - gczoombox_minimize(D_803830E0->unk24[i]); - gczoombox_close(D_803830E0->unk24[i]); + if (i != sD_803830E0->selected_answer_index) { + gczoombox_minimize(sD_803830E0->zoomboxes[i]); + gczoombox_close(sD_803830E0->zoomboxes[i]); } else { - func_80318C48(D_803830E0->unk24[i], 0); + gczoombox_func_80318C48(sD_803830E0->zoomboxes[i], FALSE); } } } - timedFunc_set_1(1.0f, func_803197AC, 8); + timedFunc_set_1(1.0f, __code91E10_advanceStateTo, CODE91E10_STATE_8_UNKNOWN); item_set(ITEM_6_HOURGLASS, FALSE); break; - case 8: //80319CFC - if (D_803830E0->unk0 != -1) { - comusic_playTrack((D_803830E0->unk11 == 1)? COMUSIC_2B_DING_B : COMUSIC_2C_BUZZER); + case CODE91E10_STATE_8_UNKNOWN: + if (sD_803830E0->question_type != -1) { + comusic_playTrack((sD_803830E0->unk11 == 1)? COMUSIC_2B_DING_B : COMUSIC_2C_BUZZER); } else { comusic_playTrack(COMUSIC_2B_DING_B); } - timedFunc_set_1(1.0f, func_803197AC, 9); + timedFunc_set_1(1.0f, __code91E10_advanceStateTo, CODE91E10_STATE_9_UNKNOWN); break; - case 9: //80319D6C - func_8031A3E4(); + case CODE91E10_STATE_9_UNKNOWN: + __code91E10_closeZoomboxes(); break; - case 10: //80319D80 - if (D_803830E0->unk8 != NULL) { - D_803830E0->unk8(D_803830E0->unk4, D_803830E0->unk11); + case CODE91E10_STATE_A_UNKNOWN: + if (sD_803830E0->unk8 != NULL) { + sD_803830E0->unk8(sD_803830E0->unk4, sD_803830E0->unk11); } for(i = 1; i < 4; i++){ - gczoombox_free(D_803830E0->unk24[i]); - D_803830E0->unk24[i] = NULL; + gczoombox_free(sD_803830E0->zoomboxes[i]); + sD_803830E0->zoomboxes[i] = NULL; } func_8025A55C(-1, 500, 10); break; @@ -458,109 +476,112 @@ void func_803197AC(s32 arg0){ default: break; } - D_803830E0->unk10 = arg0; + sD_803830E0->state = state; } -void func_80319E20(s32 arg0, s32 arg1) { - if (arg1 == 3) { - if (arg0 == D_803830E0->unk20[0]) { - if (D_803830E0->unk8 != NULL) { - D_803830E0->unk8(D_803830E0->unk4, D_803830E0->unk11); +void __code91E10_func_80319E20(s32 portrait_id, s32 zoombox_state) { + if (zoombox_state == 3) { + if (portrait_id == sD_803830E0->portait_ids[0]) { + if (sD_803830E0->unk8 != NULL) { + sD_803830E0->unk8(sD_803830E0->unk4, sD_803830E0->unk11); } } else { - func_803197AC(D_803830E0->unk10 + 1); + __code91E10_advanceStateTo(sD_803830E0->state + 1); } - } else if (arg1 == 5) { - D_803830E0->unk14++; + } else if (zoombox_state == 5) { + sD_803830E0->unk14++; } } -void func_80319EA4(void) { - s32 sp58[6]; - f32 sp4C[3]; +// handle selection in zoombox? +void code_91E10_func_80319EA4(void) { + s32 face_button_states[6]; + f32 joystick_states[3]; s32 phi_s0; f32 sp44; - if(getGameMode() != GAME_MODE_3_NORMAL && func_802E4A08() == 0) + if(getGameMode() != GAME_MODE_3_NORMAL && func_802E4A08() == FALSE) return; - if(D_803830E0 == NULL) + if(sD_803830E0 == NULL) return; - func_8024E55C(0, sp58); - controller_getJoystick(0, sp4C); + func_8024E55C(0, face_button_states); + controller_getJoystick(0, joystick_states); for(phi_s0 = 0; phi_s0 < 4; phi_s0++){ - gczoombox_update(D_803830E0->unk24[phi_s0]); + gczoombox_update(sD_803830E0->zoomboxes[phi_s0]); } - switch (D_803830E0->unk10) { - case 1: - if (func_8028EFC8() && (sp58[FACE_BUTTON(BUTTON_B)] == 1)) { - sp44 = func_80319040(0); - func_803184C8(D_803830E0->unk24[0], 100.0f, 2, 4, sp44, func_80319028(0), 0); + switch (sD_803830E0->state) { + case CODE91E10_STATE_1_SHOW_QUESTION_VIA_ZOOMBOX: + if (func_8028EFC8() && (face_button_states[FACE_BUTTON(BUTTON_B)] == 1)) { + sp44 = __code91E10_getAnimationDuration(0); + gczoombox_func_803184C8(sD_803830E0->zoomboxes[0], 100.0f, 2, 4, sp44, __code91E10_isZero(0), 0); return; } break; - case 6: - if (D_803830E0->unk15 > 0) { - D_803830E0->unk15--; + case CODE91E10_STATE_6_SELECT_QUIZ_ANSWER: + if (sD_803830E0->answer_cursor_cooldown > 0) { + sD_803830E0->answer_cursor_cooldown--; } else { - if (sp4C[1] > 0.75) { - if (D_803830E0->unk13 >= 2) { - func_80319758(D_803830E0->unk13, 0); - D_803830E0->unk13--; - func_80319758(D_803830E0->unk13, 1); - func_803160A8(D_803830E0->unk24[D_803830E0->unk13]); - D_803830E0->unk15 = 4U; + if (joystick_states[1] > 0.75) { + if (sD_803830E0->answer_cursor_index >= 2) { + __code91E10_setZoomboxHighlight(sD_803830E0->answer_cursor_index, FALSE); + sD_803830E0->answer_cursor_index--; + __code91E10_setZoomboxHighlight(sD_803830E0->answer_cursor_index, TRUE); + gczoombox_func_803160A8(sD_803830E0->zoomboxes[sD_803830E0->answer_cursor_index]); + sD_803830E0->answer_cursor_cooldown = 4U; } - } else if (sp4C[1] < -0.75) { - if (D_803830E0->unk13 < 3) { - func_80319758(D_803830E0->unk13, 0); - D_803830E0->unk13++; - func_80319758(D_803830E0->unk13, 1); - func_803160A8(D_803830E0->unk24[D_803830E0->unk13]); - D_803830E0->unk15 = 4U; + } else if (joystick_states[1] < -0.75) { + if (sD_803830E0->answer_cursor_index < 3) { + __code91E10_setZoomboxHighlight(sD_803830E0->answer_cursor_index, FALSE); + sD_803830E0->answer_cursor_index++; + __code91E10_setZoomboxHighlight(sD_803830E0->answer_cursor_index, TRUE); + gczoombox_func_803160A8(sD_803830E0->zoomboxes[sD_803830E0->answer_cursor_index]); + sD_803830E0->answer_cursor_cooldown = 4U; } } } - if ((sp58[FACE_BUTTON(BUTTON_A)] == 1) || (item_empty(ITEM_0_HOURGLASS_TIMER))) { - D_803830E0->unk12 = (u8) D_803830E0->unk13; + if ((face_button_states[FACE_BUTTON(BUTTON_A)] == 1) || (item_empty(ITEM_0_HOURGLASS_TIMER))) { + sD_803830E0->selected_answer_index = (u8) sD_803830E0->answer_cursor_index; } - if ((s8) D_803830E0->unk12 != -1) { - func_803197AC(7); + if ((s8) sD_803830E0->selected_answer_index != -1) { + __code91E10_advanceStateTo(CODE91E10_STATE_7_CHECK_GIVEN_ANSWER); return; } break; - case 9: - if (D_803830E0->unk14 == 4) { - func_803197AC(0xA); + case CODE91E10_STATE_9_UNKNOWN: + if (sD_803830E0->unk14 == 4) { + __code91E10_advanceStateTo(CODE91E10_STATE_A_UNKNOWN); return; } break; - case 10: - func_803197AC(0); + case CODE91E10_STATE_A_UNKNOWN: + __code91E10_advanceStateTo(CODE91E10_STATE_0_INITIAL); break; } } -bool func_8031A154(enum ff_question_type_e q_type, s32 q_indx, s32 arg2, s32 arg3, s32 arg4, void (*arg5)(s32, s32)) { - if (func_803192A4(q_type, q_indx, arg2) != 0) { - D_803830E0->unk0 = q_type; - D_803830E0->unk1 = q_indx; - D_803830E0->unk2 = arg2; - D_803830E0->unk3 = arg3; - D_803830E0->unk4 = arg4; - D_803830E0->unk8 = arg5; +bool code_91E10_func_8031A154(enum ff_question_type_e q_type, s32 q_index, s32 arg2, s32 arg3, s32 arg4, void (*arg5)(s32, s8)) { + if (__code91E10_func_803192A4(q_type, q_index, arg2) != FALSE) { + sD_803830E0->question_type = q_type; + sD_803830E0->question_index = q_index; + sD_803830E0->unk2 = arg2; + sD_803830E0->quiz_question_time = arg3; + sD_803830E0->unk4 = arg4; + sD_803830E0->unk8 = arg5; item_set(ITEM_6_HOURGLASS, FALSE); - func_80318DA0(D_803830E0->unk1C, 1, 3, 1, 3); + __code91E10_uniquelyRandomizeValuesInPointer(sD_803830E0->answer_values, 1, 3, 1, 3); func_8025A55C(6000, 500, 10); - func_803197AC(1); + __code91E10_advanceStateTo(CODE91E10_STATE_1_SHOW_QUESTION_VIA_ZOOMBOX); return TRUE; } + return FALSE; } -bool func_8031A22C(u8 *arg0, s8 *arg1, Struct_Core2_91E10_1 *arg2, s32 arg3, void (*arg4)(s32, s32)) { +// unused but making this static differs checksum +bool __code91E10_unused(u8 *arg0, s8 *arg1, QuizQuestionStruct *arg2, s32 arg3, void (*arg4)(s32, s8)) { s32 temp_v0; s8 *temp_a2; s8 *temp_s0; @@ -574,81 +595,81 @@ bool func_8031A22C(u8 *arg0, s8 *arg1, Struct_Core2_91E10_1 *arg2, s32 arg3, voi s32 j; s8 *phi_s0; - if (func_8031A3BC()) { - return 0; + if (code91E10_isNotInInitialState()) { + return FALSE; } + for(i = 0; i < 4; i++){ - D_803830E0->unk20[i] = arg0[i]; - D_803830E0->unk18[i] = arg1[i]; + sD_803830E0->portait_ids[i] = arg0[i]; + sD_803830E0->answer_str_counts[i] = arg1[i]; for(j = 0; j < arg1[i]; j++){ - D_803830E0->unk34.unk0[i][j] = arg2->unk0[i][j]; + sD_803830E0->quiz_question.answer_options[i][j] = arg2->answer_options[i][j]; } - D_803830E0->unk1C[i] = i; + sD_803830E0->answer_values[i] = i; } - if (D_803830E0->unk20[0] != 0) { - gczoombox_loadSprite(D_803830E0->unk24[0], D_803830E0->unk20[0]); + if (sD_803830E0->portait_ids[0] != NULL) { + gczoombox_loadSprite(sD_803830E0->zoomboxes[0], sD_803830E0->portait_ids[0]); } - D_803830E0->unk0 = -1; - D_803830E0->unk1 = -1; - D_803830E0->unk2 = -1; - D_803830E0->unk3 = (s8) arg3; - D_803830E0->unk4 = 0; - D_803830E0->unk8 = arg4; + sD_803830E0->question_type = -1; + sD_803830E0->question_index = -1; + sD_803830E0->unk2 = -1; + sD_803830E0->quiz_question_time = (s8) arg3; + sD_803830E0->unk4 = 0; + sD_803830E0->unk8 = arg4; func_8025A55C(6000, 500, 10); - func_803197AC(1); + __code91E10_advanceStateTo(CODE91E10_STATE_1_SHOW_QUESTION_VIA_ZOOMBOX); return TRUE; } -void func_8031A388(u8 arg0, u8 arg1) { - if (D_803830E0 != NULL) { - D_803830E0->unk16 = arg0; - D_803830E0->unk17 = arg1; +// unused but making this static differs checksum +void __code91E10_unused2(u8 arg0, u8 arg1) { + if (sD_803830E0 != NULL) { + sD_803830E0->unk16 = arg0; + sD_803830E0->unk17 = arg1; } } -bool func_8031A3BC(void){ - return (D_803830E0 != NULL)? D_803830E0->unk10 != 0: FALSE; +bool code91E10_isNotInInitialState(){ + return (sD_803830E0 != NULL) ? sD_803830E0->state != CODE91E10_STATE_0_INITIAL: FALSE; } -//gcquiz_close -void func_8031A3E4(void){ +static void __code91E10_closeZoomboxes(){ s32 i; - if(D_803830E0 != NULL){ + if(sD_803830E0 != NULL){ for(i = 0; i < 4; i++){ - gczoombox_minimize(D_803830E0->unk24[i]); - gczoombox_close(D_803830E0->unk24[i]); + gczoombox_minimize(sD_803830E0->zoomboxes[i]); + gczoombox_close(sD_803830E0->zoomboxes[i]); } } } -s32 func_8031A454(void){ +// unused but making this static differs checksum +s32 code91E10_unused3(){ return 4; } -//__gcquiz_get_type_count -s32 func_8031A45C(enum ff_question_type_e question_type){ - return func_80318F1C(question_type) - func_80318ED8(question_type); +s32 code91E10_getLastIndexOfQuestionType(enum ff_question_type_e question_type) { + return __code91E10_getQuizQuestionAssetEndOffset(question_type) - __code91E10_getQuizQuestionAssetStartOffsetInclusive(question_type); } -void func_8031A48C(void) { - if ((D_803830E0 != NULL) && (D_803830E0->unk10 == 1)) { - func_803197AC(2); +void code91E10_func_8031A48C(void) { + if ((sD_803830E0 != NULL) && (sD_803830E0->state == CODE91E10_STATE_1_SHOW_QUESTION_VIA_ZOOMBOX)) { + __code91E10_advanceStateTo(CODE91E10_STATE_2_SHOW_PORTRAITS_FOR_QUESTION); } } -//gcquiz_defrag -void func_8031A4CC(void) { +void code91E10_defrag() { s32 i; - if (D_803830E0 != NULL) { + if (sD_803830E0 != NULL) { for(i = 0; i < 4; i++){ - gczoombox_defrag(D_803830E0->unk24[i]); - D_803830E0->unk24[i] = (GcZoombox *)defrag(D_803830E0->unk24[i]); + gczoombox_defrag(sD_803830E0->zoomboxes[i]); + sD_803830E0->zoomboxes[i] = (GcZoombox *)defrag(sD_803830E0->zoomboxes[i]); } - if (func_8031A3BC() == 0) { - D_803830E0->unkC = (QuizQuestionBin *)defrag(D_803830E0->unkC); + if (code91E10_isNotInInitialState() == FALSE) { + sD_803830E0->unkC = (QuizQuestionBin *)defrag(sD_803830E0->unkC); } - D_803830E0 = (Struct_Core2_91E10 *)defrag(D_803830E0); + sD_803830E0 = (Struct_Core2_91E10 *)defrag(sD_803830E0); } } diff --git a/src/core2/code_94620.c b/src/core2/code_94620.c index deac9e7a..193d8b9c 100644 --- a/src/core2/code_94620.c +++ b/src/core2/code_94620.c @@ -10,10 +10,9 @@ struct { u8 unk0; char *ptr; s32 index; -} -s_dialogBin; +} s_dialogBin; -s32 func_8031B5B0(void) { +s32 code94620_func_8031B5B0(void) { return s_dialogBin.unk0; } @@ -55,7 +54,7 @@ char *dialogBin_get(enum asset_e text_id) { //get text_bin from asset cache s_dialogBin.ptr = assetcache_get(text_id); sp1C = s_dialogBin.ptr + 1; - sp1C += func_8031B5B0()*2; + sp1C += code94620_func_8031B5B0()*2; var_a0 = *(sp1C++); var_a0 += *(sp1C++)<< 8; if(sp1C); diff --git a/src/core2/code_B3A80.c b/src/core2/code_B3A80.c index 15a0537d..4457b83b 100644 --- a/src/core2/code_B3A80.c +++ b/src/core2/code_B3A80.c @@ -477,7 +477,7 @@ void func_8033BD8C(void* arg0){ func_8033B0D0(arg0); } -s32 func_8033BDAC(enum asset_e id, void *dst, s32 size) { +s32 code_B3A80_func_8033BDAC(enum asset_e id, void *dst, s32 size) { s32 comp_size; s32 var_s0; s32 sp34; diff --git a/src/core2/code_C9E70.c b/src/core2/code_C9E70.c index 9340fe78..aae629bb 100644 --- a/src/core2/code_C9E70.c +++ b/src/core2/code_C9E70.c @@ -8,7 +8,7 @@ extern struct FF_StorageStruct *D_8037DCB8; void func_80350E00(void){ quizQuestionAskedBitfield_defrag(); - func_8031A4CC(); + code91E10_defrag(); if(D_8037DCB8 == NULL) return; diff --git a/src/core2/gc/dialog.c b/src/core2/gc/dialog.c index 858888ea..3e390ca7 100644 --- a/src/core2/gc/dialog.c +++ b/src/core2/gc/dialog.c @@ -725,7 +725,7 @@ void func_80310A5C(s32 next_state, s32 arg1, s32 arg2, s32 arg3, s32 arg4){ f32 tmpf; for(i = 0, tmpf = 0.4f; i< 2; i++){ if(g_Dialog.zoombox[i]){ - func_803184C8(g_Dialog.zoombox[i], arg2, next_state, arg1, tmpf, arg3, arg4); + gczoombox_func_803184C8(g_Dialog.zoombox[i], arg2, next_state, arg1, tmpf, arg3, arg4); } } } diff --git a/src/core2/gc/pauseMenu.c b/src/core2/gc/pauseMenu.c index 46cc988f..c361faed 100644 --- a/src/core2/gc/pauseMenu.c +++ b/src/core2/gc/pauseMenu.c @@ -243,7 +243,7 @@ void gcpausemenu_zoomboxes_initMainMenu(void) { s32 i; for (i = 0; i < 4; i++) { D_80383010.zoombox[i] = gczoombox_new(D_8036C4E0[i].y, D_8036C4E0[i].portrait, 2, 0, gcpausemenu_zoombox_callback); - func_803184C8(D_80383010.zoombox[i], 60.0f, 5, 2, 0.3f, 0, 0); + gczoombox_func_803184C8(D_80383010.zoombox[i], 60.0f, 5, 2, 0.3f, 0, 0); func_80318640(D_80383010.zoombox[i], 0x1C, 0.75f, 0.9f, 0); func_80318760(D_80383010.zoombox[i], 8000); } @@ -254,7 +254,7 @@ void gcpausemenu_zoomboxes_initTotalsMenu(void) { for (i = 0; i < 4; i++) { D_80383010.zoombox[i] = gczoombox_new(D_8036C520[i].y, D_8036C520[i].portrait, (i == 3) ? 1 : 2, 0, gcpausemenu_zoombox_callback); - func_803184C8(D_80383010.zoombox[i], 40.0f, 5, 2, 0.3f, 0, 0); + gczoombox_func_803184C8(D_80383010.zoombox[i], 40.0f, 5, 2, 0.3f, 0, 0); func_80318640(D_80383010.zoombox[i], 0x46, 0.9f, 0.7f, 1); func_80318760(D_80383010.zoombox[i], 8000); } @@ -1006,7 +1006,7 @@ s32 gcPauseMenu_update(void) { }//L80313664 else { if (D_80383010.selection == PAUSE_SELECTION_2_VIEW_TOTALS && !D_80383010.unk3_6) { - func_803160A8(D_80383010.zoombox[D_80383010.selection]); + gczoombox_func_803160A8(D_80383010.zoombox[D_80383010.selection]); D_80383010.unk3_6 = 1; } @@ -1018,7 +1018,7 @@ s32 gcPauseMenu_update(void) { D_80383010.selection--; } gczoombox_highlight(D_80383010.zoombox[D_80383010.selection], TRUE); - func_803160A8(D_80383010.zoombox[D_80383010.selection]); + gczoombox_func_803160A8(D_80383010.zoombox[D_80383010.selection]); D_80383010.unk3_6 = 0; D_80383010.unk7 = 6; } @@ -1031,7 +1031,7 @@ s32 gcPauseMenu_update(void) { D_80383010.selection++; } gczoombox_highlight(D_80383010.zoombox[D_80383010.selection], 1); - func_803160A8(D_80383010.zoombox[D_80383010.selection]); + gczoombox_func_803160A8(D_80383010.zoombox[D_80383010.selection]); D_80383010.unk3_6 = 0; D_80383010.unk7 = 6; } @@ -1039,7 +1039,7 @@ s32 gcPauseMenu_update(void) { } if (D_80383010.selection == 2 && !D_80383010.unk3_6 && D_80383010.unk7 == 3) { - func_803160A8(D_80383010.zoombox[D_80383010.selection]); + gczoombox_func_803160A8(D_80383010.zoombox[D_80383010.selection]); D_80383010.unk3_6 = 1; } break; diff --git a/src/core2/gc/zoombox.c b/src/core2/gc/zoombox.c index 610cf954..702734b0 100644 --- a/src/core2/gc/zoombox.c +++ b/src/core2/gc/zoombox.c @@ -766,7 +766,7 @@ void func_80315C90(GcZoombox *this, s32 arg1) { } } -void func_803160A8(GcZoombox *this) { +void gczoombox_func_803160A8(GcZoombox *this) { f32 temp_f14; f32 phi_f14; s32 phi_a0; @@ -1451,7 +1451,7 @@ GcZoombox *gczoombox_new(s32 y, GcZoomboxSprite portrait_id, s32 arg2, s32 arg3, animctrl_setIndex(this->anim_ctrl, ASSET_138_ANIM_ZOOMBOX); animctrl_start(this->anim_ctrl, "gczoombox.c", 0x6fd); - func_803184C8(this, 15.0f, 5, 2, 0.4f, 0, 0); //func_803184C8(this, 15.0f, 5, 2, D_80378940, 0, 0); + gczoombox_func_803184C8(this, 15.0f, 5, 2, 0.4f, 0, 0); //gczoombox_func_803184C8(this, 15.0f, 5, 2, D_80378940, 0, 0); this->unk176 = D_8036C6C0[portrait_id].unk2; this->unk177 = D_8036C6C0[portrait_id].unk3; this->unk100 = 0; @@ -1558,14 +1558,14 @@ void func_803184B8(GcZoombox *this){ this->unk13A &= (u8)~(0x20); } -void func_803184C8(GcZoombox *this, f32 arg1, s32 arg2, s32 arg3, f32 arg4, bool arg5, bool arg6) { +void gczoombox_func_803184C8(GcZoombox *this, f32 arg1, s32 arg2, s32 arg3, f32 animation_duration, bool arg5, bool arg6) { if (this != NULL) { this->unk182 = arg2; this->unk184 = arg3; this->unk190 = 1.0 / arg1; if (this->anim_ctrl != NULL) { - animctrl_setDuration(this->anim_ctrl, arg4); + animctrl_setDuration(this->anim_ctrl, animation_duration); } this->unk1A4_12 = BOOL(arg5); this->unk1A4_10 = BOOL(arg6); @@ -1583,8 +1583,8 @@ bool func_8031857C(GcZoombox *this, u8 *str){ return FALSE; } -void gczoombox_highlight(GcZoombox *this, bool arg1){ - if(arg1) +void gczoombox_highlight(GcZoombox *this, bool should_highlight){ + if(should_highlight) this->highlighted = 1; else this->highlighted = 0; @@ -1632,7 +1632,7 @@ void func_80318760(GcZoombox *this, s32 arg1){ this->unk12E = arg1; } -void func_80318774(GcZoombox *this){ +void gczoombox_setUnk13ATo0(GcZoombox *this){ this->unk13A = 0; } @@ -1765,10 +1765,10 @@ void gczoombox_defrag(GcZoombox *this) { } } -void func_80318C48(GcZoombox *this, s32 arg1) { +void gczoombox_func_80318C48(GcZoombox *this, bool arg1) { if (this != NULL) { if (this->unk1A4_30) { - if (arg1 != 0) { + if (arg1 != FALSE) { if (this->unk0[0] == 0xFD) { this->unk0[1] = 0x68; } else { @@ -1783,7 +1783,7 @@ void func_80318C48(GcZoombox *this, s32 arg1) { } } if (this->unk1A4_29) { - if (arg1 != 0) { + if (arg1 != FALSE) { if (this->unk30[0] == 0xFD) { this->unk30[1] = 0x68; return; diff --git a/src/core2/gc/zoombox.h b/src/core2/gc/zoombox.h index 707980f4..c0d3a11c 100644 --- a/src/core2/gc/zoombox.h +++ b/src/core2/gc/zoombox.h @@ -207,7 +207,7 @@ typedef struct { void gczoombox_free(GcZoombox *this); -void func_803160A8(GcZoombox *this); +void gczoombox_func_803160A8(GcZoombox *this); void func_803163A8(GcZoombox *this, Gfx **gfx, Mtx **mtx); void func_803164B0(GcZoombox *this, Gfx **gfx, Mtx **mtx, s32 arg3, s32 arg4, BKSpriteDisplayData *arg5, f32 arg6); void func_80316764(GcZoombox *this, s32 arg1); @@ -231,7 +231,7 @@ void func_80318488(GcZoombox *this); void func_80318498(GcZoombox *this); void gczoombox_resolve_minimize(GcZoombox *this); void func_803184B8(GcZoombox *this); -void func_803184C8(GcZoombox *this, f32 arg1, s32 arg2, s32 arg3, f32 arg4, bool arg5, bool arg6); +void gczoombox_func_803184C8(GcZoombox *this, f32 arg1, s32 arg2, s32 arg3, f32 arg4, bool arg5, bool arg6); bool func_8031857C(GcZoombox *this, u8 *str); void gczoombox_highlight(GcZoombox *this, bool arg1); bool gczoombox_is_highlighted(GcZoombox *this); @@ -239,7 +239,7 @@ void func_80318614(GcZoombox *this, int arg1); void func_80318640(GcZoombox *this, s32 arg1, f32 arg2, f32 arg3, s32 arg4); void func_80318734(GcZoombox *this, f32 arg1); void func_80318760(GcZoombox *this, s32 arg1); -void func_80318774(GcZoombox *this); +void gczoombox_setUnk13ATo0(GcZoombox *this); bool func_8031877C(GcZoombox *this); bool func_803188B4(GcZoombox *this); bool func_80318964(GcZoombox *this); @@ -247,6 +247,6 @@ bool gczoombox_loadSprite(GcZoombox *this, GcZoomboxSprite arg1); void func_80318B7C(GcZoombox *this, s32 arg1); bool func_80318BEC(GcZoombox *this); void gczoombox_defrag(GcZoombox *this); -void func_80318C48(GcZoombox *this, s32 arg1); +void gczoombox_func_80318C48(GcZoombox *this, bool arg1); #endif // __BANJO_KAZOOIE_CORE2_GC_ZOOMBOX_H__ diff --git a/src/lair/ch/brentilda.c b/src/lair/ch/brentilda.c index 0d3de6b2..f18791d0 100644 --- a/src/lair/ch/brentilda.c +++ b/src/lair/ch/brentilda.c @@ -71,7 +71,7 @@ void gzquiz_initGruntyQuestions(void) { 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(i = 0; i < func_8031A45C(FFQT_3_GRUNTY); i++){ + for(i = 0; i < code91E10_getLastIndexOfQuestionType(FFQT_3_GRUNTY); i++){ question_id = VOLATILE_FLAG_26_FF_GRUNTY_QUESTIONS + 2 * i; pattern = randi2(0, 3); diff --git a/src/lair/code_5ED0.c b/src/lair/code_5ED0.c index 3e53a221..5054f666 100644 --- a/src/lair/code_5ED0.c +++ b/src/lair/code_5ED0.c @@ -548,7 +548,7 @@ void func_8038CCEC(void) free(D_8037DCB8); D_8037DCB8 = NULL; - func_80319190(); + code_91E10_free(); quizQuestionAskedBitfield_free(); func_802C5994(); } @@ -590,7 +590,7 @@ void func_8038CE28(void) { s32 i; - func_80319050(); + code_91E10_init(); D_8037DCB8 = malloc(sizeof(struct FF_StorageStruct)); quizQuestionAskedBitfield_init(); @@ -681,9 +681,8 @@ void lair_func_8038CF18(void) } } -s32 func_8038D0AC(s32 questionType, s32 a1) +static s32 __code5ED0_getQuizQuestionTime(s32 questionType, s32 a1) { - // :morphone: tf return 10; } @@ -912,7 +911,7 @@ void func_8038D670(enum FF_Action next_state) { func_8028F918(2); if (D_8037DCB8->ffQuestionType != FFQT_4_MINIGAME) { func_8038CE00(); - func_8031A154(D_8037DCB8->ffQuestionType, D_8037DCB8->unkD, D_8037DCB8->unkE, func_8038D0AC(D_8037DCB8->ffQuestionType, D_8037DCB8->unkC), 0, &func_8038D3F0); + code_91E10_func_8031A154(D_8037DCB8->ffQuestionType, D_8037DCB8->unkD, D_8037DCB8->unkE, __code5ED0_getQuizQuestionTime(D_8037DCB8->ffQuestionType, D_8037DCB8->unkC), 0, &func_8038D3F0); } else { func_8038D4BC(); } @@ -943,7 +942,7 @@ void func_8038D670(enum FF_Action next_state) { break; }//L8038D91C } - func_8031A48C(); + code91E10_func_8031A48C(); break; case FFA_6_TRIGGER_QUESTION_POST_EFFECTS: //L8038D940 @@ -1157,7 +1156,7 @@ void lair_func_8038E0B0(void) { && (D_8037DCB8 != NULL) && (D_8037DCB8->unk0 != NULL) ){ - func_80319EA4(); + code_91E10_func_80319EA4(); func_8038C9D0(); func_8024E55C(0, sp48); func_8024E60C(0, sp3C); @@ -1328,7 +1327,7 @@ void lair_func_8038E768(Gfx **dl, Mtx **m, Vtx **v) if (map_get() != MAP_8E_GL_FURNACE_FUN) return; - func_80319214(dl, m, v); + code91E10_draw(dl, m, v); gczoombox_draw(D_8037DCB8->unk20, dl, m, v); } diff --git a/src/lair/code_A810.c b/src/lair/code_A810.c index 64bfe284..445a45b2 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) && !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) { + if( code91E10_isNotInInitialState() == FALSE && (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_AD70.c b/src/lair/code_AD70.c index 5fc77a21..7c5ba099 100644 --- a/src/lair/code_AD70.c +++ b/src/lair/code_AD70.c @@ -240,7 +240,7 @@ void func_80391B04(Actor *this) { func_8038E9A4(local->unk10, this->position); switch (this->state) { /* irregular */ case 1: - if (func_8031A3BC() || mapSpecificFlags_get(0xA)) { + if (code91E10_isNotInInitialState() || mapSpecificFlags_get(0xA)) { func_80391810(this, 4); break; } diff --git a/src/lair/code_C1C0.c b/src/lair/code_C1C0.c index 336fcf32..9edf50ea 100644 --- a/src/lair/code_C1C0.c +++ b/src/lair/code_C1C0.c @@ -86,7 +86,7 @@ void func_80392700(Actor *this) { this->marker->unk2C_2 = TRUE; } } - this->unk58_0 = !func_8031A3BC(); + this->unk58_0 = !code91E10_isNotInInitialState(); } From 8009f5b3a9e432539795b3f3fdcec8210bd78c14 Mon Sep 17 00:00:00 2001 From: Bl00D4NGEL Date: Tue, 8 Oct 2024 23:55:59 +0200 Subject: [PATCH 10/15] chore: rename code91E10 prefix to previous gcquiz --- decompressed.pal.yaml | 8 +- decompressed.us.v10.yaml | 8 +- src/core2/code_4C020.c | 6 +- src/core2/code_91E10.c | 202 +++++++++++++++++++-------------------- src/core2/code_C9E70.c | 2 +- src/lair/ch/brentilda.c | 2 +- src/lair/code_5ED0.c | 12 +-- src/lair/code_A810.c | 2 +- src/lair/code_AD70.c | 2 +- src/lair/code_C1C0.c | 2 +- 10 files changed, 123 insertions(+), 123 deletions(-) diff --git a/decompressed.pal.yaml b/decompressed.pal.yaml index aab33b08..30874b33 100644 --- a/decompressed.pal.yaml +++ b/decompressed.pal.yaml @@ -780,7 +780,7 @@ segments: # - [0xFE0110, c, gc/pauseMenu] #DONE # - [0xFE3580, c, code_8DC20] #DONE # - [0xFE3BD0, c, gc/zoombox] #DONE - # - [0xFE7770, c, code_91E10] #DONE + # - [0xFE7770, c, gcquiz] #DONE # - [0xFE8F50, c, code_935F0] #DONE #chminigmae # - [0xFE9570, c, gc/parade] #DONE # - [0xFE9F80, c, code_94620] #DONE @@ -1054,7 +1054,7 @@ segments: # - [0x103AEB0, .data, gc/pauseMenu] # - [0x103B000, .data, code_8DC20] # - [0x103B090, .data, gc/zoombox] - # - [0x103C310, .data, code_91E10] + # - [0x103C310, .data, gcquiz] # - [0x103C340, .data, code_935F0] # - [0x103C370, .data, gc/parade] # - [0x103C790, .data, code_94A20] @@ -1301,7 +1301,7 @@ segments: # - [0x1046EA0, .rodata, gc/dialog] # - [0x1046F10, .rodata, gc/pauseMenu] # - [0x1047250, .rodata, gc/zoombox] - # - [0x1047320, .rodata, code_91E10] + # - [0x1047320, .rodata, gcquiz] # - [0x1047360, .rodata, code_935F0] # - [0x1047380, .rodata, gc/parade] # - [0x1047700, .rodata, code_94A20] @@ -1571,7 +1571,7 @@ segments: # - [0x0106C980, .bss, gc/pauseMenu] # - [0x0106C980, .bss, code_8DC20] # - [0x0106C980, .bss, gc/zoombox] - # - [0x0106C980, .bss, code_91E10] + # - [0x0106C980, .bss, gcquiz] # - [0x0106C980, .bss, gc/parade] # - [0x0106C980, .bss, code_94620] # - [0x0106C980, .bss, code_94780] diff --git a/decompressed.us.v10.yaml b/decompressed.us.v10.yaml index c1923b09..96f9284d 100644 --- a/decompressed.us.v10.yaml +++ b/decompressed.us.v10.yaml @@ -780,7 +780,7 @@ segments: - [0xFE0110, c, gc/pauseMenu] #DONE - [0xFE3580, c, code_8DC20] #DONE - [0xFE3BD0, c, gc/zoombox] #DONE - - [0xFE7770, c, code_91E10] #DONE + - [0xFE7770, c, gcquiz] #DONE - [0xFE8F50, c, code_935F0] #DONE #chminigmae - [0xFE9570, c, gc/parade] #DONE - [0xFE9F80, c, code_94620] #DONE @@ -1053,7 +1053,7 @@ segments: - [0x103AEB0, .data, gc/pauseMenu] - [0x103B000, .data, code_8DC20] - [0x103B090, .data, gc/zoombox] - - [0x103C310, .data, code_91E10] + - [0x103C310, .data, gcquiz] - [0x103C340, .data, code_935F0] - [0x103C370, .data, gc/parade] - [0x103C790, .data, code_94A20] @@ -1299,7 +1299,7 @@ segments: - [0x1046EA0, .rodata, gc/dialog] - [0x1046F10, .rodata, gc/pauseMenu] - [0x1047250, .rodata, gc/zoombox] - - [0x1047320, .rodata, code_91E10] + - [0x1047320, .rodata, gcquiz] - [0x1047360, .rodata, code_935F0] - [0x1047380, .rodata, gc/parade] - [0x1047700, .rodata, code_94A20] @@ -1569,7 +1569,7 @@ segments: - [0x1048560, .bss, gc/pauseMenu] - [0x1048560, .bss, code_8DC20] - [0x1048560, .bss, gc/zoombox] - - [0x1048560, .bss, code_91E10] + - [0x1048560, .bss, gcquiz] - [0x1048560, .bss, gc/parade] - [0x1048560, .bss, code_94620] - [0x1048560, .bss, code_94780] diff --git a/src/core2/code_4C020.c b/src/core2/code_4C020.c index b9591063..a36cd1a4 100644 --- a/src/core2/code_4C020.c +++ b/src/core2/code_4C020.c @@ -12,7 +12,7 @@ extern void func_802F9D38(s32); extern void func_802EE6CC(f32[3], f32[3], s32[4], s32, f32, f32, s32, s32, s32); 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 code_91E10_func_80319EA4(void); +extern void gcquiz_func_80319EA4(void); extern void fileProgressFlag_set(enum file_progress_e, bool); void func_802D3D54(Actor *this); @@ -814,7 +814,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(volatileFlag_get(VOLATILE_FLAG_1) && map_get() != MAP_8E_GL_FURNACE_FUN){ - code91E10_draw(gfx, mtx, vtx); + gcquiz_draw(gfx, mtx, vtx); } } @@ -1008,7 +1008,7 @@ void func_802D5628(void){ case 0x15:// L802D5AB4 case 0x2d:// L802D5AB4 if(D_80367684 && D_80367684 == map_get()){ - code_91E10_func_80319EA4(); + gcquiz_func_80319EA4(); if(0.0f < D_8037DE08){ D_8037DE08 -= time_getDelta(); } diff --git a/src/core2/code_91E10.c b/src/core2/code_91E10.c index 0e0b3e91..108d9a6a 100644 --- a/src/core2/code_91E10.c +++ b/src/core2/code_91E10.c @@ -7,18 +7,18 @@ extern void item_set(enum item_e, s32); extern void func_8025A55C(s32, s32, s32); -enum code91E10_state { - CODE91E10_STATE_0_INITIAL, //803197F0 - CODE91E10_STATE_1_SHOW_QUESTION_VIA_ZOOMBOX, //80319910 - CODE91E10_STATE_2_SHOW_PORTRAITS_FOR_QUESTION, //8031994C - CODE91E10_STATE_3_UNKNOWN, //80319B78 - CODE91E10_STATE_4_UNKNOWN, //80319B78 - CODE91E10_STATE_5_UNKNOWN, //80319B78 - CODE91E10_STATE_6_SELECT_QUIZ_ANSWER, //80319B84 - CODE91E10_STATE_7_CHECK_GIVEN_ANSWER, //80319C0C - CODE91E10_STATE_8_UNKNOWN, //80319CFC - CODE91E10_STATE_9_UNKNOWN, //80319D6C - CODE91E10_STATE_A_UNKNOWN //80319D80 +enum gcquiz_state { + GCQUIZ_STATE_0_INITIAL, //803197F0 + GCQUIZ_STATE_1_SHOW_QUESTION_VIA_ZOOMBOX, //80319910 + GCQUIZ_STATE_2_SHOW_PORTRAITS_FOR_QUESTION, //8031994C + GCQUIZ_STATE_3_UNKNOWN, //80319B78 + GCQUIZ_STATE_4_UNKNOWN, //80319B78 + GCQUIZ_STATE_5_UNKNOWN, //80319B78 + GCQUIZ_STATE_6_SELECT_QUIZ_ANSWER, //80319B84 + GCQUIZ_STATE_7_CHECK_GIVEN_ANSWER, //80319C0C + GCQUIZ_STATE_8_UNKNOWN, //80319CFC + GCQUIZ_STATE_9_UNKNOWN, //80319D6C + GCQUIZ_STATE_A_UNKNOWN //80319D80 }; typedef struct { @@ -64,9 +64,9 @@ typedef struct { QuizQuestionStruct quiz_question; } Struct_Core2_91E10; -static void __code91E10_advanceStateTo(enum code91E10_state state); -static void __code91E10_func_80319E20(s32 portrait_id, s32 state); -static void __code91E10_closeZoomboxes(void); +static void __gcquiz_advanceStateTo(enum gcquiz_state state); +static void __gcquiz_func_80319E20(s32 portrait_id, s32 state); +static void __gcquiz_closeZoomboxes(void); #define SELECTABLE_PORTAIT_COUNT 0x2C @@ -122,7 +122,7 @@ static u8 sPortraits[SELECTABLE_PORTAIT_COUNT+1] = { Struct_Core2_91E10 *sD_803830E0; /* .code */ -static void __code91E10_uniquelyRandomizeValuesInPointer(s8 *ptr, u8 min_index, u8 max_index, s32 min_value, s32 max_value){ +static void __gcquiz_uniquelyRandomizeValuesInPointer(s8 *ptr, u8 min_index, u8 max_index, s32 min_value, s32 max_value){ s32 i; s32 j; bool is_unique; @@ -144,12 +144,12 @@ static void __code91E10_uniquelyRandomizeValuesInPointer(s8 *ptr, u8 min_index, } } -static void __code91E10_randomizePortaitIds(void) { +static void __gcquiz_randomizePortaitIds(void) { sD_803830E0->portait_ids[0] = 0; - __code91E10_uniquelyRandomizeValuesInPointer(sD_803830E0->portait_ids, 1, 3, 1, SELECTABLE_PORTAIT_COUNT); + __gcquiz_uniquelyRandomizeValuesInPointer(sD_803830E0->portait_ids, 1, 3, 1, SELECTABLE_PORTAIT_COUNT); } -static enum asset_e __code91E10_getQuizQuestionAssetStartOffsetInclusive(enum ff_question_type_e question_type) { +static enum asset_e __gcquiz_get_type_start_id(enum ff_question_type_e question_type) { switch(question_type) { case FFQT_1_PICTURE: return ASSET_12DB_FF_PICTURE_QUESTION; case FFQT_2_SOUND: return ASSET_13A3_FF_SOUND_QUESTION; @@ -159,7 +159,7 @@ static enum asset_e __code91E10_getQuizQuestionAssetStartOffsetInclusive(enum ff return ASSET_1213_FF_QUIZ_QUESTION; } -static enum asset_e __code91E10_getQuizQuestionAssetEndOffset(enum ff_question_type_e question_type){ +static enum asset_e __gcquiz_get_type_end_id(enum ff_question_type_e question_type){ switch(question_type) { case FFQT_1_PICTURE: return ASSET_12ED_FF_PICTURE_QUESTION + 1; case FFQT_2_SOUND: return ASSET_13D5_FF_SOUND_QUESTION + 1; @@ -171,7 +171,7 @@ static enum asset_e __code91E10_getQuizQuestionAssetEndOffset(enum ff_question_t // get correct question index? -static s32 __code91E10_func_80318F60(enum ff_question_type_e question_type, s32 q_index, s32 arg2) { +static s32 __gcquiz_func_80318F60(enum ff_question_type_e question_type, s32 q_index, s32 arg2) { s32 phi_v1; s32 phi_a0; @@ -188,11 +188,11 @@ static s32 __code91E10_func_80318F60(enum ff_question_type_e question_type, s32 return phi_v1; } -static bool __code91E10_isSoundQuestion(enum ff_question_type_e question_type){ +static bool __gcquiz_isSoundQuestion(enum ff_question_type_e question_type){ return question_type == FFQT_2_SOUND; } -static s32 __code91E10_getZoomboxY(s32 arg0){ +static s32 __gcquiz_getZoomboxY(s32 arg0){ switch(arg0) { case 1: return 40; case 2: return 80; @@ -202,23 +202,23 @@ static s32 __code91E10_getZoomboxY(s32 arg0){ return 0; } -static s32 __code91E10_func_80319004(s32 arg0){ +static s32 __gcquiz_func_80319004(s32 arg0){ return arg0 == 0 ? 3 : 2; } -static s32 __code91E10_return0(s32 arg0){ +static s32 __gcquiz_return0(s32 arg0){ return 0; } -static bool __code91E10_isZero(s32 arg0){ +static bool __gcquiz_isZero(s32 arg0){ return arg0 != 0 ? FALSE : TRUE; } -static f32 __code91E10_getAnimationDuration(s32 arg0){ +static f32 __gcquiz_animation_duration(s32 arg0){ return 0.4f; } -void code_91E10_init() { +void gcquiz_init() { s32 i; sD_803830E0 = malloc(sizeof(Struct_Core2_91E10)); @@ -226,16 +226,16 @@ void code_91E10_init() { sD_803830E0->unk16 = 0x14U; sD_803830E0->unk17 = 0x1E; sD_803830E0->portait_ids[0] = 0; - sD_803830E0->zoomboxes[0] = gczoombox_new(__code91E10_getZoomboxY(0), 0, __code91E10_func_80319004(0), __code91E10_return0(0), __code91E10_func_80319E20); - gczoombox_func_803184C8(sD_803830E0->zoomboxes[0], (f32)sD_803830E0->unk16, 5, 2, __code91E10_getAnimationDuration(0), __code91E10_isZero(0), 0); + sD_803830E0->zoomboxes[0] = gczoombox_new(__gcquiz_getZoomboxY(0), 0, __gcquiz_func_80319004(0), __gcquiz_return0(0), __gcquiz_func_80319E20); + gczoombox_func_803184C8(sD_803830E0->zoomboxes[0], (f32)sD_803830E0->unk16, 5, 2, __gcquiz_animation_duration(0), __gcquiz_isZero(0), 0); for(i = 1; i < 4; i++){ sD_803830E0->portait_ids[i] = 0; sD_803830E0->zoomboxes[i] = NULL; } - __code91E10_advanceStateTo(CODE91E10_STATE_0_INITIAL); + __gcquiz_advanceStateTo(GCQUIZ_STATE_0_INITIAL); } -void code_91E10_free() { +void gcquiz_free() { s32 i; if (sD_803830E0 != NULL) { @@ -250,7 +250,7 @@ void code_91E10_free() { } } -void code91E10_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx) { +void gcquiz_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx) { s32 i; if (sD_803830E0 != NULL) { @@ -261,7 +261,7 @@ void code91E10_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx) { } // randomize quiz question? -static bool __code91E10_func_803192A4(enum ff_question_type_e q_type, s32 q_index, s32 arg2) { +static bool __gcquiz_func_803192A4(enum ff_question_type_e q_type, s32 q_index, s32 arg2) { char *char_iter; enum asset_e quiz_question_index; s32 temp_s2; @@ -278,8 +278,8 @@ static bool __code91E10_func_803192A4(enum ff_question_type_e q_type, s32 q_inde s32 cmd; s32 option_text; - quiz_question_index = __code91E10_getQuizQuestionAssetStartOffsetInclusive(q_type) + q_index; - if (code91E10_isNotInInitialState()) { + quiz_question_index = __gcquiz_get_type_start_id(q_type) + q_index; + if (gcquiz_isNotInInitialState()) { return FALSE; } @@ -293,9 +293,9 @@ static bool __code91E10_func_803192A4(enum ff_question_type_e q_type, s32 q_inde quiz_question_bin_unk0 = *(char_iter++); // NEXT quiz_question_bin_unk1 = *(char_iter++); // NEXT quiz_question_bin_unk2 = *(char_iter++); // NEXT - first_answer_cmd = ((quiz_question_bin_unk1 >= 2) ? __code91E10_func_80318F60(q_type, q_index, arg2) : 0) + 1; + first_answer_cmd = ((quiz_question_bin_unk1 >= 2) ? __gcquiz_func_80318F60(q_type, q_index, arg2) : 0) + 1; // is sound question or quiz_question_bin_unk2 == 0 - if (((quiz_question_bin_unk2 == 0) || (__code91E10_isSoundQuestion(q_type) != FALSE)) != FALSE) { + if (((quiz_question_bin_unk2 == 0) || (__gcquiz_isSoundQuestion(q_type) != FALSE)) != FALSE) { do { second_answer_cmd = randi2(0, quiz_question_bin_unk1 + quiz_question_bin_unk2) + 1; } while (second_answer_cmd == first_answer_cmd); @@ -346,7 +346,7 @@ static bool __code91E10_func_803192A4(enum ff_question_type_e q_type, s32 q_inde return TRUE; } -void __code91E10_openZoomboxAndMaximizeWithStringsAt(s32 zoombox_index) { +void __gcquiz_openZoomboxAndMaximizeWithStringsAt(s32 zoombox_index) { gczoombox_open(sD_803830E0->zoomboxes[zoombox_index]); gczoombox_maximize(sD_803830E0->zoomboxes[zoombox_index]); gczoombox_setStrings( @@ -356,17 +356,17 @@ void __code91E10_openZoomboxAndMaximizeWithStringsAt(s32 zoombox_index) { ); } -void __code91E10_setZoomboxHighlight(s32 index, bool arg1){ +void __gcquiz_set_box_highlight(s32 index, bool arg1){ gczoombox_highlight(sD_803830E0->zoomboxes[index], arg1); gczoombox_func_80318C48(sD_803830E0->zoomboxes[index], arg1); } -static void __code91E10_advanceStateTo(enum code91E10_state state){ +static void __gcquiz_advanceStateTo(enum gcquiz_state state){ s32 i; s32 j; switch(state){ - case CODE91E10_STATE_0_INITIAL: + case GCQUIZ_STATE_0_INITIAL: sD_803830E0->question_type = 0; sD_803830E0->question_index = 0; sD_803830E0->quiz_question_time = 0; @@ -374,7 +374,7 @@ static void __code91E10_advanceStateTo(enum code91E10_state state){ sD_803830E0->selected_answer_index = -1; sD_803830E0->unk14 = 0; sD_803830E0->unk11 = -2; - gczoombox_func_803184C8(sD_803830E0->zoomboxes[0], (f32) sD_803830E0->unk16, 5, 2, __code91E10_getAnimationDuration(0), __code91E10_isZero(0), 0); + gczoombox_func_803184C8(sD_803830E0->zoomboxes[0], (f32) sD_803830E0->unk16, 5, 2, __gcquiz_animation_duration(0), __gcquiz_isZero(0), 0); gczoombox_setUnk13ATo0(sD_803830E0->zoomboxes[0]); gczoombox_highlight(sD_803830E0->zoomboxes[0], TRUE); for(i = 0; i < 4; i++){ @@ -385,49 +385,49 @@ static void __code91E10_advanceStateTo(enum code91E10_state state){ } break; - case CODE91E10_STATE_1_SHOW_QUESTION_VIA_ZOOMBOX: + case GCQUIZ_STATE_1_SHOW_QUESTION_VIA_ZOOMBOX: gczoombox_open(sD_803830E0->zoomboxes[0]); gczoombox_maximize(sD_803830E0->zoomboxes[0]); gczoombox_setStrings(sD_803830E0->zoomboxes[0], sD_803830E0->answer_str_counts[0], sD_803830E0->quiz_question.answer_options[0]); break; - case CODE91E10_STATE_2_SHOW_PORTRAITS_FOR_QUESTION: + case GCQUIZ_STATE_2_SHOW_PORTRAITS_FOR_QUESTION: if (sD_803830E0->question_type != -1) { - __code91E10_randomizePortaitIds(); + __gcquiz_randomizePortaitIds(); for(i = 1; i < 4; i++){ - sD_803830E0->zoomboxes[i] = gczoombox_new(__code91E10_getZoomboxY(i), sPortraits[sD_803830E0->portait_ids[i]], __code91E10_func_80319004(i), __code91E10_return0(i), __code91E10_func_80319E20); - gczoombox_func_803184C8(sD_803830E0->zoomboxes[i], (f32)sD_803830E0->unk17, 5, 2, __code91E10_getAnimationDuration(i), __code91E10_isZero(i), 0); + sD_803830E0->zoomboxes[i] = gczoombox_new(__gcquiz_getZoomboxY(i), sPortraits[sD_803830E0->portait_ids[i]], __gcquiz_func_80319004(i), __gcquiz_return0(i), __gcquiz_func_80319E20); + gczoombox_func_803184C8(sD_803830E0->zoomboxes[i], (f32)sD_803830E0->unk17, 5, 2, __gcquiz_animation_duration(i), __gcquiz_isZero(i), 0); } } else { for(i = 1; i < 4; i++){ - sD_803830E0->zoomboxes[i] = gczoombox_new(__code91E10_getZoomboxY(i), sD_803830E0->portait_ids[i], 1, __code91E10_return0(i), __code91E10_func_80319E20); - gczoombox_func_803184C8(sD_803830E0->zoomboxes[i], (f32)sD_803830E0->unk17, 5, 2, __code91E10_getAnimationDuration(i), __code91E10_isZero(i), 0); + sD_803830E0->zoomboxes[i] = gczoombox_new(__gcquiz_getZoomboxY(i), sD_803830E0->portait_ids[i], 1, __gcquiz_return0(i), __gcquiz_func_80319E20); + gczoombox_func_803184C8(sD_803830E0->zoomboxes[i], (f32)sD_803830E0->unk17, 5, 2, __gcquiz_animation_duration(i), __gcquiz_isZero(i), 0); } } - timedFunc_set_1(0.0f, __code91E10_advanceStateTo, CODE91E10_STATE_3_UNKNOWN); - timedFunc_set_1(0.0f, __code91E10_openZoomboxAndMaximizeWithStringsAt, 1); - timedFunc_set_1(0.2f, __code91E10_openZoomboxAndMaximizeWithStringsAt, 2); - timedFunc_set_1(0.4f, __code91E10_openZoomboxAndMaximizeWithStringsAt, 3); + timedFunc_set_1(0.0f, __gcquiz_advanceStateTo, GCQUIZ_STATE_3_UNKNOWN); + timedFunc_set_1(0.0f, __gcquiz_openZoomboxAndMaximizeWithStringsAt, 1); + timedFunc_set_1(0.2f, __gcquiz_openZoomboxAndMaximizeWithStringsAt, 2); + timedFunc_set_1(0.4f, __gcquiz_openZoomboxAndMaximizeWithStringsAt, 3); break; - case CODE91E10_STATE_3_UNKNOWN: - case CODE91E10_STATE_4_UNKNOWN: - case CODE91E10_STATE_5_UNKNOWN: + case GCQUIZ_STATE_3_UNKNOWN: + case GCQUIZ_STATE_4_UNKNOWN: + case GCQUIZ_STATE_5_UNKNOWN: break; - case CODE91E10_STATE_6_SELECT_QUIZ_ANSWER: + case GCQUIZ_STATE_6_SELECT_QUIZ_ANSWER: item_set(ITEM_0_HOURGLASS_TIMER, sD_803830E0->quiz_question_time * 60 - 1); item_set(ITEM_6_HOURGLASS, TRUE); sD_803830E0->answer_cursor_cooldown = 0; sD_803830E0->answer_cursor_index = 1U; for (i = 1; i < 4; i++) { - __code91E10_setZoomboxHighlight(i, BOOL(i == sD_803830E0->answer_cursor_index)); + __gcquiz_set_box_highlight(i, BOOL(i == sD_803830E0->answer_cursor_index)); } break; - case CODE91E10_STATE_7_CHECK_GIVEN_ANSWER: + case GCQUIZ_STATE_7_CHECK_GIVEN_ANSWER: if (sD_803830E0->question_type != -1) { sD_803830E0->unk11 = (sD_803830E0->selected_answer_index == -1) ? -1 : (sD_803830E0->answer_values[sD_803830E0->selected_answer_index] == 1) ? 1 @@ -445,24 +445,24 @@ static void __code91E10_advanceStateTo(enum code91E10_state state){ } } } - timedFunc_set_1(1.0f, __code91E10_advanceStateTo, CODE91E10_STATE_8_UNKNOWN); + timedFunc_set_1(1.0f, __gcquiz_advanceStateTo, GCQUIZ_STATE_8_UNKNOWN); item_set(ITEM_6_HOURGLASS, FALSE); break; - case CODE91E10_STATE_8_UNKNOWN: + case GCQUIZ_STATE_8_UNKNOWN: if (sD_803830E0->question_type != -1) { comusic_playTrack((sD_803830E0->unk11 == 1)? COMUSIC_2B_DING_B : COMUSIC_2C_BUZZER); } else { comusic_playTrack(COMUSIC_2B_DING_B); } - timedFunc_set_1(1.0f, __code91E10_advanceStateTo, CODE91E10_STATE_9_UNKNOWN); + timedFunc_set_1(1.0f, __gcquiz_advanceStateTo, GCQUIZ_STATE_9_UNKNOWN); break; - case CODE91E10_STATE_9_UNKNOWN: - __code91E10_closeZoomboxes(); + case GCQUIZ_STATE_9_UNKNOWN: + __gcquiz_closeZoomboxes(); break; - case CODE91E10_STATE_A_UNKNOWN: + case GCQUIZ_STATE_A_UNKNOWN: if (sD_803830E0->unk8 != NULL) { sD_803830E0->unk8(sD_803830E0->unk4, sD_803830E0->unk11); } @@ -479,14 +479,14 @@ static void __code91E10_advanceStateTo(enum code91E10_state state){ sD_803830E0->state = state; } -void __code91E10_func_80319E20(s32 portrait_id, s32 zoombox_state) { +void __gcquiz_func_80319E20(s32 portrait_id, s32 zoombox_state) { if (zoombox_state == 3) { if (portrait_id == sD_803830E0->portait_ids[0]) { if (sD_803830E0->unk8 != NULL) { sD_803830E0->unk8(sD_803830E0->unk4, sD_803830E0->unk11); } } else { - __code91E10_advanceStateTo(sD_803830E0->state + 1); + __gcquiz_advanceStateTo(sD_803830E0->state + 1); } } else if (zoombox_state == 5) { sD_803830E0->unk14++; @@ -494,7 +494,7 @@ void __code91E10_func_80319E20(s32 portrait_id, s32 zoombox_state) { } // handle selection in zoombox? -void code_91E10_func_80319EA4(void) { +void gcquiz_func_80319EA4(void) { s32 face_button_states[6]; f32 joystick_states[3]; s32 phi_s0; @@ -513,30 +513,30 @@ void code_91E10_func_80319EA4(void) { } switch (sD_803830E0->state) { - case CODE91E10_STATE_1_SHOW_QUESTION_VIA_ZOOMBOX: + case GCQUIZ_STATE_1_SHOW_QUESTION_VIA_ZOOMBOX: if (func_8028EFC8() && (face_button_states[FACE_BUTTON(BUTTON_B)] == 1)) { - sp44 = __code91E10_getAnimationDuration(0); - gczoombox_func_803184C8(sD_803830E0->zoomboxes[0], 100.0f, 2, 4, sp44, __code91E10_isZero(0), 0); + sp44 = __gcquiz_animation_duration(0); + gczoombox_func_803184C8(sD_803830E0->zoomboxes[0], 100.0f, 2, 4, sp44, __gcquiz_isZero(0), 0); return; } break; - case CODE91E10_STATE_6_SELECT_QUIZ_ANSWER: + case GCQUIZ_STATE_6_SELECT_QUIZ_ANSWER: if (sD_803830E0->answer_cursor_cooldown > 0) { sD_803830E0->answer_cursor_cooldown--; } else { if (joystick_states[1] > 0.75) { if (sD_803830E0->answer_cursor_index >= 2) { - __code91E10_setZoomboxHighlight(sD_803830E0->answer_cursor_index, FALSE); + __gcquiz_set_box_highlight(sD_803830E0->answer_cursor_index, FALSE); sD_803830E0->answer_cursor_index--; - __code91E10_setZoomboxHighlight(sD_803830E0->answer_cursor_index, TRUE); + __gcquiz_set_box_highlight(sD_803830E0->answer_cursor_index, TRUE); gczoombox_func_803160A8(sD_803830E0->zoomboxes[sD_803830E0->answer_cursor_index]); sD_803830E0->answer_cursor_cooldown = 4U; } } else if (joystick_states[1] < -0.75) { if (sD_803830E0->answer_cursor_index < 3) { - __code91E10_setZoomboxHighlight(sD_803830E0->answer_cursor_index, FALSE); + __gcquiz_set_box_highlight(sD_803830E0->answer_cursor_index, FALSE); sD_803830E0->answer_cursor_index++; - __code91E10_setZoomboxHighlight(sD_803830E0->answer_cursor_index, TRUE); + __gcquiz_set_box_highlight(sD_803830E0->answer_cursor_index, TRUE); gczoombox_func_803160A8(sD_803830E0->zoomboxes[sD_803830E0->answer_cursor_index]); sD_803830E0->answer_cursor_cooldown = 4U; } @@ -546,24 +546,24 @@ void code_91E10_func_80319EA4(void) { sD_803830E0->selected_answer_index = (u8) sD_803830E0->answer_cursor_index; } if ((s8) sD_803830E0->selected_answer_index != -1) { - __code91E10_advanceStateTo(CODE91E10_STATE_7_CHECK_GIVEN_ANSWER); + __gcquiz_advanceStateTo(GCQUIZ_STATE_7_CHECK_GIVEN_ANSWER); return; } break; - case CODE91E10_STATE_9_UNKNOWN: + case GCQUIZ_STATE_9_UNKNOWN: if (sD_803830E0->unk14 == 4) { - __code91E10_advanceStateTo(CODE91E10_STATE_A_UNKNOWN); + __gcquiz_advanceStateTo(GCQUIZ_STATE_A_UNKNOWN); return; } break; - case CODE91E10_STATE_A_UNKNOWN: - __code91E10_advanceStateTo(CODE91E10_STATE_0_INITIAL); + case GCQUIZ_STATE_A_UNKNOWN: + __gcquiz_advanceStateTo(GCQUIZ_STATE_0_INITIAL); break; } } -bool code_91E10_func_8031A154(enum ff_question_type_e q_type, s32 q_index, s32 arg2, s32 arg3, s32 arg4, void (*arg5)(s32, s8)) { - if (__code91E10_func_803192A4(q_type, q_index, arg2) != FALSE) { +bool gcquiz_func_8031A154(enum ff_question_type_e q_type, s32 q_index, s32 arg2, s32 arg3, s32 arg4, void (*arg5)(s32, s8)) { + if (__gcquiz_func_803192A4(q_type, q_index, arg2) != FALSE) { sD_803830E0->question_type = q_type; sD_803830E0->question_index = q_index; sD_803830E0->unk2 = arg2; @@ -571,9 +571,9 @@ bool code_91E10_func_8031A154(enum ff_question_type_e q_type, s32 q_index, s32 a sD_803830E0->unk4 = arg4; sD_803830E0->unk8 = arg5; item_set(ITEM_6_HOURGLASS, FALSE); - __code91E10_uniquelyRandomizeValuesInPointer(sD_803830E0->answer_values, 1, 3, 1, 3); + __gcquiz_uniquelyRandomizeValuesInPointer(sD_803830E0->answer_values, 1, 3, 1, 3); func_8025A55C(6000, 500, 10); - __code91E10_advanceStateTo(CODE91E10_STATE_1_SHOW_QUESTION_VIA_ZOOMBOX); + __gcquiz_advanceStateTo(GCQUIZ_STATE_1_SHOW_QUESTION_VIA_ZOOMBOX); return TRUE; } @@ -581,7 +581,7 @@ bool code_91E10_func_8031A154(enum ff_question_type_e q_type, s32 q_index, s32 a } // unused but making this static differs checksum -bool __code91E10_unused(u8 *arg0, s8 *arg1, QuizQuestionStruct *arg2, s32 arg3, void (*arg4)(s32, s8)) { +bool __gcquiz_unused(u8 *arg0, s8 *arg1, QuizQuestionStruct *arg2, s32 arg3, void (*arg4)(s32, s8)) { s32 temp_v0; s8 *temp_a2; s8 *temp_s0; @@ -595,7 +595,7 @@ bool __code91E10_unused(u8 *arg0, s8 *arg1, QuizQuestionStruct *arg2, s32 arg3, s32 j; s8 *phi_s0; - if (code91E10_isNotInInitialState()) { + if (gcquiz_isNotInInitialState()) { return FALSE; } @@ -617,23 +617,23 @@ bool __code91E10_unused(u8 *arg0, s8 *arg1, QuizQuestionStruct *arg2, s32 arg3, sD_803830E0->unk4 = 0; sD_803830E0->unk8 = arg4; func_8025A55C(6000, 500, 10); - __code91E10_advanceStateTo(CODE91E10_STATE_1_SHOW_QUESTION_VIA_ZOOMBOX); + __gcquiz_advanceStateTo(GCQUIZ_STATE_1_SHOW_QUESTION_VIA_ZOOMBOX); return TRUE; } // unused but making this static differs checksum -void __code91E10_unused2(u8 arg0, u8 arg1) { +void __gcquiz_unused2(u8 arg0, u8 arg1) { if (sD_803830E0 != NULL) { sD_803830E0->unk16 = arg0; sD_803830E0->unk17 = arg1; } } -bool code91E10_isNotInInitialState(){ - return (sD_803830E0 != NULL) ? sD_803830E0->state != CODE91E10_STATE_0_INITIAL: FALSE; +bool gcquiz_isNotInInitialState(){ + return (sD_803830E0 != NULL) ? sD_803830E0->state != GCQUIZ_STATE_0_INITIAL: FALSE; } -static void __code91E10_closeZoomboxes(){ +static void __gcquiz_closeZoomboxes(){ s32 i; if(sD_803830E0 != NULL){ for(i = 0; i < 4; i++){ @@ -644,21 +644,21 @@ static void __code91E10_closeZoomboxes(){ } // unused but making this static differs checksum -s32 code91E10_unused3(){ +s32 gcquiz_unused3(){ return 4; } -s32 code91E10_getLastIndexOfQuestionType(enum ff_question_type_e question_type) { - return __code91E10_getQuizQuestionAssetEndOffset(question_type) - __code91E10_getQuizQuestionAssetStartOffsetInclusive(question_type); +s32 gcquiz_getLastIndexOfQuestionType(enum ff_question_type_e question_type) { + return __gcquiz_get_type_end_id(question_type) - __gcquiz_get_type_start_id(question_type); } -void code91E10_func_8031A48C(void) { - if ((sD_803830E0 != NULL) && (sD_803830E0->state == CODE91E10_STATE_1_SHOW_QUESTION_VIA_ZOOMBOX)) { - __code91E10_advanceStateTo(CODE91E10_STATE_2_SHOW_PORTRAITS_FOR_QUESTION); +void gcquiz_func_8031A48C(void) { + if ((sD_803830E0 != NULL) && (sD_803830E0->state == GCQUIZ_STATE_1_SHOW_QUESTION_VIA_ZOOMBOX)) { + __gcquiz_advanceStateTo(GCQUIZ_STATE_2_SHOW_PORTRAITS_FOR_QUESTION); } } -void code91E10_defrag() { +void gcquiz_defrag() { s32 i; if (sD_803830E0 != NULL) { @@ -667,7 +667,7 @@ void code91E10_defrag() { sD_803830E0->zoomboxes[i] = (GcZoombox *)defrag(sD_803830E0->zoomboxes[i]); } - if (code91E10_isNotInInitialState() == FALSE) { + if (gcquiz_isNotInInitialState() == FALSE) { sD_803830E0->unkC = (QuizQuestionBin *)defrag(sD_803830E0->unkC); } sD_803830E0 = (Struct_Core2_91E10 *)defrag(sD_803830E0); diff --git a/src/core2/code_C9E70.c b/src/core2/code_C9E70.c index aae629bb..b7878a20 100644 --- a/src/core2/code_C9E70.c +++ b/src/core2/code_C9E70.c @@ -8,7 +8,7 @@ extern struct FF_StorageStruct *D_8037DCB8; void func_80350E00(void){ quizQuestionAskedBitfield_defrag(); - code91E10_defrag(); + gcquiz_defrag(); if(D_8037DCB8 == NULL) return; diff --git a/src/lair/ch/brentilda.c b/src/lair/ch/brentilda.c index f18791d0..f23668d3 100644 --- a/src/lair/ch/brentilda.c +++ b/src/lair/ch/brentilda.c @@ -71,7 +71,7 @@ void gzquiz_initGruntyQuestions(void) { 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(i = 0; i < code91E10_getLastIndexOfQuestionType(FFQT_3_GRUNTY); i++){ + for(i = 0; i < gcquiz_getLastIndexOfQuestionType(FFQT_3_GRUNTY); i++){ question_id = VOLATILE_FLAG_26_FF_GRUNTY_QUESTIONS + 2 * i; pattern = randi2(0, 3); diff --git a/src/lair/code_5ED0.c b/src/lair/code_5ED0.c index 5054f666..bae206ae 100644 --- a/src/lair/code_5ED0.c +++ b/src/lair/code_5ED0.c @@ -548,7 +548,7 @@ void func_8038CCEC(void) free(D_8037DCB8); D_8037DCB8 = NULL; - code_91E10_free(); + gcquiz_free(); quizQuestionAskedBitfield_free(); func_802C5994(); } @@ -590,7 +590,7 @@ void func_8038CE28(void) { s32 i; - code_91E10_init(); + gcquiz_init(); D_8037DCB8 = malloc(sizeof(struct FF_StorageStruct)); quizQuestionAskedBitfield_init(); @@ -911,7 +911,7 @@ void func_8038D670(enum FF_Action next_state) { func_8028F918(2); if (D_8037DCB8->ffQuestionType != FFQT_4_MINIGAME) { func_8038CE00(); - code_91E10_func_8031A154(D_8037DCB8->ffQuestionType, D_8037DCB8->unkD, D_8037DCB8->unkE, __code5ED0_getQuizQuestionTime(D_8037DCB8->ffQuestionType, D_8037DCB8->unkC), 0, &func_8038D3F0); + gcquiz_func_8031A154(D_8037DCB8->ffQuestionType, D_8037DCB8->unkD, D_8037DCB8->unkE, __code5ED0_getQuizQuestionTime(D_8037DCB8->ffQuestionType, D_8037DCB8->unkC), 0, &func_8038D3F0); } else { func_8038D4BC(); } @@ -942,7 +942,7 @@ void func_8038D670(enum FF_Action next_state) { break; }//L8038D91C } - code91E10_func_8031A48C(); + gcquiz_func_8031A48C(); break; case FFA_6_TRIGGER_QUESTION_POST_EFFECTS: //L8038D940 @@ -1156,7 +1156,7 @@ void lair_func_8038E0B0(void) { && (D_8037DCB8 != NULL) && (D_8037DCB8->unk0 != NULL) ){ - code_91E10_func_80319EA4(); + gcquiz_func_80319EA4(); func_8038C9D0(); func_8024E55C(0, sp48); func_8024E60C(0, sp3C); @@ -1327,7 +1327,7 @@ void lair_func_8038E768(Gfx **dl, Mtx **m, Vtx **v) if (map_get() != MAP_8E_GL_FURNACE_FUN) return; - code91E10_draw(dl, m, v); + gcquiz_draw(dl, m, v); gczoombox_draw(D_8037DCB8->unk20, dl, m, v); } diff --git a/src/lair/code_A810.c b/src/lair/code_A810.c index 445a45b2..abdccb3d 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( code91E10_isNotInInitialState() == FALSE && (sp38 < 2) && (randf() < 0.1) && !mapSpecificFlags_get(0xA) && !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) { + if( gcquiz_isNotInInitialState() == FALSE && (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_AD70.c b/src/lair/code_AD70.c index 7c5ba099..f60fbbab 100644 --- a/src/lair/code_AD70.c +++ b/src/lair/code_AD70.c @@ -240,7 +240,7 @@ void func_80391B04(Actor *this) { func_8038E9A4(local->unk10, this->position); switch (this->state) { /* irregular */ case 1: - if (code91E10_isNotInInitialState() || mapSpecificFlags_get(0xA)) { + if (gcquiz_isNotInInitialState() || mapSpecificFlags_get(0xA)) { func_80391810(this, 4); break; } diff --git a/src/lair/code_C1C0.c b/src/lair/code_C1C0.c index 9edf50ea..43049c39 100644 --- a/src/lair/code_C1C0.c +++ b/src/lair/code_C1C0.c @@ -86,7 +86,7 @@ void func_80392700(Actor *this) { this->marker->unk2C_2 = TRUE; } } - this->unk58_0 = !code91E10_isNotInInitialState(); + this->unk58_0 = !gcquiz_isNotInInitialState(); } From 2b85cc990ac27d90c099d17a043d46d00adfebe2 Mon Sep 17 00:00:00 2001 From: Bl00D4NGEL Date: Wed, 9 Oct 2024 00:16:07 +0200 Subject: [PATCH 11/15] revert renaming in decompressed.*.yaml --- decompressed.pal.yaml | 8 ++++---- decompressed.us.v10.yaml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/decompressed.pal.yaml b/decompressed.pal.yaml index 30874b33..aab33b08 100644 --- a/decompressed.pal.yaml +++ b/decompressed.pal.yaml @@ -780,7 +780,7 @@ segments: # - [0xFE0110, c, gc/pauseMenu] #DONE # - [0xFE3580, c, code_8DC20] #DONE # - [0xFE3BD0, c, gc/zoombox] #DONE - # - [0xFE7770, c, gcquiz] #DONE + # - [0xFE7770, c, code_91E10] #DONE # - [0xFE8F50, c, code_935F0] #DONE #chminigmae # - [0xFE9570, c, gc/parade] #DONE # - [0xFE9F80, c, code_94620] #DONE @@ -1054,7 +1054,7 @@ segments: # - [0x103AEB0, .data, gc/pauseMenu] # - [0x103B000, .data, code_8DC20] # - [0x103B090, .data, gc/zoombox] - # - [0x103C310, .data, gcquiz] + # - [0x103C310, .data, code_91E10] # - [0x103C340, .data, code_935F0] # - [0x103C370, .data, gc/parade] # - [0x103C790, .data, code_94A20] @@ -1301,7 +1301,7 @@ segments: # - [0x1046EA0, .rodata, gc/dialog] # - [0x1046F10, .rodata, gc/pauseMenu] # - [0x1047250, .rodata, gc/zoombox] - # - [0x1047320, .rodata, gcquiz] + # - [0x1047320, .rodata, code_91E10] # - [0x1047360, .rodata, code_935F0] # - [0x1047380, .rodata, gc/parade] # - [0x1047700, .rodata, code_94A20] @@ -1571,7 +1571,7 @@ segments: # - [0x0106C980, .bss, gc/pauseMenu] # - [0x0106C980, .bss, code_8DC20] # - [0x0106C980, .bss, gc/zoombox] - # - [0x0106C980, .bss, gcquiz] + # - [0x0106C980, .bss, code_91E10] # - [0x0106C980, .bss, gc/parade] # - [0x0106C980, .bss, code_94620] # - [0x0106C980, .bss, code_94780] diff --git a/decompressed.us.v10.yaml b/decompressed.us.v10.yaml index 96f9284d..c1923b09 100644 --- a/decompressed.us.v10.yaml +++ b/decompressed.us.v10.yaml @@ -780,7 +780,7 @@ segments: - [0xFE0110, c, gc/pauseMenu] #DONE - [0xFE3580, c, code_8DC20] #DONE - [0xFE3BD0, c, gc/zoombox] #DONE - - [0xFE7770, c, gcquiz] #DONE + - [0xFE7770, c, code_91E10] #DONE - [0xFE8F50, c, code_935F0] #DONE #chminigmae - [0xFE9570, c, gc/parade] #DONE - [0xFE9F80, c, code_94620] #DONE @@ -1053,7 +1053,7 @@ segments: - [0x103AEB0, .data, gc/pauseMenu] - [0x103B000, .data, code_8DC20] - [0x103B090, .data, gc/zoombox] - - [0x103C310, .data, gcquiz] + - [0x103C310, .data, code_91E10] - [0x103C340, .data, code_935F0] - [0x103C370, .data, gc/parade] - [0x103C790, .data, code_94A20] @@ -1299,7 +1299,7 @@ segments: - [0x1046EA0, .rodata, gc/dialog] - [0x1046F10, .rodata, gc/pauseMenu] - [0x1047250, .rodata, gc/zoombox] - - [0x1047320, .rodata, gcquiz] + - [0x1047320, .rodata, code_91E10] - [0x1047360, .rodata, code_935F0] - [0x1047380, .rodata, gc/parade] - [0x1047700, .rodata, code_94A20] @@ -1569,7 +1569,7 @@ segments: - [0x1048560, .bss, gc/pauseMenu] - [0x1048560, .bss, code_8DC20] - [0x1048560, .bss, gc/zoombox] - - [0x1048560, .bss, gcquiz] + - [0x1048560, .bss, code_91E10] - [0x1048560, .bss, gc/parade] - [0x1048560, .bss, code_94620] - [0x1048560, .bss, code_94780] From 230aa57fb1a3bea165dd56f572ea7eb03a8adf87 Mon Sep 17 00:00:00 2001 From: Bl00D4NGEL Date: Thu, 10 Oct 2024 22:20:53 +0200 Subject: [PATCH 12/15] refac: rename struct property --- src/TTC/code_3E30.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TTC/code_3E30.c b/src/TTC/code_3E30.c index 60122dd8..54eb046b 100644 --- a/src/TTC/code_3E30.c +++ b/src/TTC/code_3E30.c @@ -36,7 +36,7 @@ typedef struct s16 meshId; u8 letter; // floor_letters_e u8 state; // some sort of state, 1 - 5 - f32 time_delta_sum; + f32 timeDeltaSum; } LetterFloorTile; typedef struct From f8b724f598843360b3ead3f2b6e3ec63917ffcb5 Mon Sep 17 00:00:00 2001 From: Bl00D4NGEL Date: Thu, 10 Oct 2024 22:33:07 +0200 Subject: [PATCH 13/15] document the rest of ttc --- level_symbols.us.v10.txt | 2 +- src/CC/code_1F70.c | 2 +- src/CC/code_BF0.c | 2 +- src/TTC/ch/lockup.c | 2 +- src/TTC/code_26D0.c | 41 ++++++++++++++++++++-------------------- src/TTC/code_3040.c | 13 ++++++++----- src/TTC/code_3E30.c | 20 ++++++++++---------- src/core2/code_4C020.c | 2 ++ src/core2/code_956B0.c | 5 +++-- src/core2/spawnqueue.c | 2 +- 10 files changed, 49 insertions(+), 42 deletions(-) diff --git a/level_symbols.us.v10.txt b/level_symbols.us.v10.txt index 0b659fc5..a8d4da4f 100644 --- a/level_symbols.us.v10.txt +++ b/level_symbols.us.v10.txt @@ -1,6 +1,6 @@ sm_func_80386810 = 0x80386810; mm_func_803888B0 = 0x803888B0; -TTC_resetSpawnableActors = 0x80388AC0; +code26D0_resetSpawnableActorsForTTC = 0x80388AC0; code_3E30_isSecretCheatCodeRelatedValueEqualToScrambledAddressValue = 0x8038BF8C; cc_func_803870E0 = 0x803870E0; cc_func_80387DA0 = 0x80387DA0; diff --git a/src/CC/code_1F70.c b/src/CC/code_1F70.c index 38176809..a039910c 100644 --- a/src/CC/code_1F70.c +++ b/src/CC/code_1F70.c @@ -382,7 +382,7 @@ void CC_func_80388F4C(void){ if(D_80389FA0.unk21 == 3){ func_8034A174(D_80389FA0.unk34, 6, sp48); if(ml_distance_vec3f(sp48, sp6C) <= 130.0f && sp6C[1] - sp48[1] < 50.0f){ - func_8031D04C(0x21, 1); + func_8031D04C(MAP_21_CC_WITCH_SWITCH_ROOM, 1); } }//L80389260 diff --git a/src/CC/code_BF0.c b/src/CC/code_BF0.c index 980bff2b..eda3acbd 100644 --- a/src/CC/code_BF0.c +++ b/src/CC/code_BF0.c @@ -137,7 +137,7 @@ void func_803870F8(Actor *this){ sp3C[1] = this->position_y + 100; sp3C[2] = this->position_z; if(ml_distance_vec3f(&sp3C, &sp70) < 120.0f){ - func_8031D04C(0x22, (local->unk0 == 1)? 7 : 6); + func_8031D04C(MAP_22_CC_INSIDE_CLANKER, (local->unk0 == 1)? 7 : 6); } }//L80387500 } diff --git a/src/TTC/ch/lockup.c b/src/TTC/ch/lockup.c index 574ae5d6..3ead4eb2 100644 --- a/src/TTC/ch/lockup.c +++ b/src/TTC/ch/lockup.c @@ -70,7 +70,7 @@ static void __chLockup_close(Actor *this){ } static void __chLockup_open(Actor *this){ - func_80389468(); + code3040_func_80389468(); subaddie_set_state_with_direction(this, CH_LOCKUP_STATE_OPENING, 0.2f, 1); this->unk38_31 = 1; FUNC_8030E8B4(SFX_6B_LOCKUP_OPENING, 1.0f, 32000, this->position, 1250, 2500); diff --git a/src/TTC/code_26D0.c b/src/TTC/code_26D0.c index 55759d90..a7e484dc 100644 --- a/src/TTC/code_26D0.c +++ b/src/TTC/code_26D0.c @@ -25,11 +25,12 @@ extern ActorInfo gChTreasurehuntRedQuestionMark; extern ActorInfo gChTreasurehuntRedX; extern ActorInfo gChTreasure; -void code26D0_genericUpdateFunc(Actor *this); -void code26D0_palmTreeUpdateFunc(Actor *this); -void code26D0_lighthouseAUpdateFunc(Actor *this); -void func_802D3D54(Actor *this); -void code26D0_sharkfoodIslandUpdateFunc(Actor *this); +extern void func_802D3D54(Actor *this); + +static void __code26D0_genericUpdateFunc(Actor *this); +static void __code26D0_palmTreeUpdateFunc(Actor *this); +static void __code26D0_lighthouseAUpdateFunc(Actor *this); +static void __code26D0_sharkfoodIslandUpdateFunc(Actor *this); /* .data */ ActorInfo gBlubberShipTopHatch = { @@ -49,47 +50,47 @@ ActorInfo gLighthouseDoor = { ActorInfo gSharkfoodIsland = { MARKER_167_SHARKFOOD_ISLAND, ACTOR_25C_SHARKFOOD_ISLAND, ASSET_50A_MODEL_SHARKFOOD_ISLAND, 0x1, NULL, - code26D0_sharkfoodIslandUpdateFunc, actor_update_func_80326224, actor_drawFullDepth, + __code26D0_sharkfoodIslandUpdateFunc, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0 }; ActorInfo gLighthouseA = { MARKER_267_LIGHTHOUSE_A, ACTOR_2E2_LIGHTHOUSE_A, ASSET_3BD_MODEL_LIGHTHOUSE_A, 0x1, NULL, - code26D0_lighthouseAUpdateFunc, actor_update_func_80326224, actor_drawFullDepth, + __code26D0_lighthouseAUpdateFunc, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0 }; ActorInfo gLighthouseB = { MARKER_26A_LIGHTHOUSE_B, ACTOR_2DF_LIGHTHOUSE_B, ASSET_3BE_MODEL_LIGHTHOUSE_B, 0x1, NULL, - code26D0_genericUpdateFunc, actor_update_func_80326224, actor_drawFullDepth, + __code26D0_genericUpdateFunc, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0 }; ActorInfo gStairs1 = { MARKER_268_STAIRS_1, ACTOR_2E0_TTC_STAIRS_1, ASSET_3B6_MODEL_TTC_STAIRS_1, 0x1, NULL, - code26D0_genericUpdateFunc, actor_update_func_80326224, actor_drawFullDepth, + __code26D0_genericUpdateFunc, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0 }; ActorInfo gStairs2 = { MARKER_269_STAIRS_2, ACTOR_2E1_TTC_STAIRS_2, ASSET_3B7_MODEL_TTC_STAIRS_1, 0x1, NULL, - code26D0_genericUpdateFunc, actor_update_func_80326224, actor_drawFullDepth, + __code26D0_genericUpdateFunc, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0 }; ActorInfo gPalmTree = { MARKER_1D5_PALM_TREE, ACTOR_31E_PALM_TREE, ASSET_3A9_MODEL_PALM_TREE, 0x1, NULL, - code26D0_palmTreeUpdateFunc, actor_update_func_80326224, actor_drawFullDepth, + __code26D0_palmTreeUpdateFunc, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0 }; /* .code */ -void TTC_resetSpawnableActors(void) +void code26D0_resetSpawnableActorsForTTC(void) { spawnableActorList_add(&gBlubberShipTopHatch, actor_new, ACTOR_FLAG_NONE); spawnableActorList_add(&gLighthouseDoor, actor_new, ACTOR_FLAG_NONE); @@ -112,14 +113,14 @@ void TTC_resetSpawnableActors(void) spawnableActorList_add(&gChClam, actor_new, ACTOR_FLAG_UNKNOWN_0 | ACTOR_FLAG_UNKNOWN_6 | ACTOR_FLAG_UNKNOWN_25); } -void code26D0_genericUpdateFunc(Actor *this){ +static void __code26D0_genericUpdateFunc(Actor *this){ if(!this->initialized){ func_802D3D74(this); this->initialized = TRUE; } } -void code26D0_palmTreeUpdateFunc(Actor *this){ +static void __code26D0_palmTreeUpdateFunc(Actor *this){ if(!this->initialized){ func_802D3D74(this); this->initialized = TRUE; @@ -127,21 +128,21 @@ void code26D0_palmTreeUpdateFunc(Actor *this){ } } -void code26D0_spawnLighthouseB(s32 arg0){ +static void __code26D0_spawnLighthouseB(s32 arg0){ ActorMarker *marker = reinterpret_cast(ActorMarker *, arg0); Actor *this = marker_getActor(marker); spawn_child_actor(ACTOR_2DF_LIGHTHOUSE_B, &this); } -void code26D0_lighthouseAUpdateFunc(Actor *this){ - code26D0_genericUpdateFunc(this); +static void __code26D0_lighthouseAUpdateFunc(Actor *this){ + __code26D0_genericUpdateFunc(this); if(!this->volatile_initialized){ - __spawnQueue_add_1((GenFunction_1)code26D0_spawnLighthouseB, (s32)this->marker); + __spawnQueue_add_1((GenFunction_1)__code26D0_spawnLighthouseB, (s32)this->marker); this->volatile_initialized = TRUE; } } -void code26D0_sharkfoodIslandUpdateFunc(Actor *this){ +static void __code26D0_sharkfoodIslandUpdateFunc(Actor *this){ f32 player_position[3]; if(!this->initialized){ @@ -160,7 +161,7 @@ void code26D0_sharkfoodIslandUpdateFunc(Actor *this){ else{ this->position_y = -1000.0f; } - }//L80388E7C + } if(this->position_y == 700.0f){ player_getPosition(player_position); diff --git a/src/TTC/code_3040.c b/src/TTC/code_3040.c index 942a7198..c0c6a292 100644 --- a/src/TTC/code_3040.c +++ b/src/TTC/code_3040.c @@ -5,8 +5,11 @@ extern s32 D_80276CB0; /* .data */ +// code crc0 s32 D_8038C750 = 0x0016D2FD; +// code crc1 s32 D_8038C754 = 0xFB70B01D; +// data crc s32 D_8038C758 = 0x0004EFAC; /* .bss */ @@ -15,17 +18,17 @@ struct { s32 unk4; u8 pad8[4]; s32 unkC; -}D_8038D6F0; +} sD_8038D6F0; /* .code */ -void func_80389430(void){ +void __code3040_func_80389430(){ if(getGameMode() != GAME_MODE_7_ATTRACT_DEMO){ func_8029CF48(2, 1, 0.0f); } } -void func_80389468(void){ - if(D_8038D6F0.unk4 != D_8038C754 || D_8038D6F0.unkC != D_80276CB0){ - func_80389430(); +void code3040_func_80389468(void){ + if(sD_8038D6F0.unk4 != D_8038C754 || sD_8038D6F0.unkC != D_80276CB0){ + __code3040_func_80389430(); } } diff --git a/src/TTC/code_3E30.c b/src/TTC/code_3E30.c index 54eb046b..dfaec3c0 100644 --- a/src/TTC/code_3E30.c +++ b/src/TTC/code_3E30.c @@ -196,7 +196,7 @@ static void __code3E30_initFloorTiles(void) for (i_ptr = sLetterFloorTiles; i_ptr->meshId != 0; i_ptr++) { i_ptr->state = 2; - i_ptr->time_delta_sum = 0.0f; + i_ptr->timeDeltaSum = 0.0f; } mapSpecificFlags_set(TTC_SPECIFIC_FLAG_1_UNKNOWN, FALSE); @@ -207,9 +207,9 @@ static void __code3E30_meshCallbackFloorTileState_1(s32 arg0, BKVtxRef *ref, Vtx LetterFloorTile *ptr = (LetterFloorTile *)arg3; f32 temp_f2; - if (ptr->time_delta_sum < 0.5) + if (ptr->timeDeltaSum < 0.5) { - temp_f2 = (ptr->time_delta_sum / 0.5); + temp_f2 = (ptr->timeDeltaSum / 0.5); dst->v.cn[0] = (ref->v.v.cn[0] - 0xFF) * temp_f2 + 255.0f; dst->v.cn[1] = ref->v.v.cn[1] * temp_f2; dst->v.cn[2] = ref->v.v.cn[2] * temp_f2; @@ -229,7 +229,7 @@ static void __code3E30_setLetterFloorTileState(LetterFloorTile *arg0, s32 arg1) temp_v0 = arg0->state; arg0->state = arg1; - arg0->time_delta_sum = 0.0f; + arg0->timeDeltaSum = 0.0f; if ((arg1 == 1) && (temp_v0 != arg1)) { func_8025A6EC(COMUSIC_2C_BUZZER, 32000); @@ -241,14 +241,14 @@ static void __code3E30_meshCallbackFloorTileState_3(s32 arg0, BKVtxRef *ref, Vtx LetterFloorTile *ptr = (LetterFloorTile *)arg3; f32 temp_f12; - if (ptr->time_delta_sum <= 0.5) + if (ptr->timeDeltaSum <= 0.5) { - temp_f12 = (ptr->time_delta_sum / 0.5); + temp_f12 = (ptr->timeDeltaSum / 0.5); dst->v.cn[0] = ref->v.v.cn[0] * (1.0f - temp_f12); dst->v.cn[1] = 0xFF; dst->v.cn[2] = ref->v.v.cn[2] * (1.0f - temp_f12); } - if (ptr->time_delta_sum >= 0.5) + if (ptr->timeDeltaSum >= 0.5) { ptr->state = 4; } @@ -259,9 +259,9 @@ static void __code3E30_meshCallbackFloorTileState_5(s32 arg0, BKVtxRef *ref, Vtx LetterFloorTile *ptr = (LetterFloorTile *)arg3; f32 temp_f2; - if (ptr->time_delta_sum < 0.5) + if (ptr->timeDeltaSum < 0.5) { - temp_f2 = (ptr->time_delta_sum / 0.5); + temp_f2 = (ptr->timeDeltaSum / 0.5); dst->v.cn[0] = (ref->v.v.cn[0] - 0xFF) * temp_f2 + 255.0f; dst->v.cn[1] = (ref->v.v.cn[1] - 0xFF) * temp_f2 + 255.0f; dst->v.cn[2] = ref->v.v.cn[2] * temp_f2; @@ -283,7 +283,7 @@ static void __code3E30_updateTimeDeltaSumForFloorTiles() time_delta = time_getDelta(); for (floor_tile = sLetterFloorTiles; floor_tile->meshId != 0; floor_tile++) { - floor_tile->time_delta_sum += time_delta; + floor_tile->timeDeltaSum += time_delta; if (floor_tile->state == 1) { BKModel_transformMesh(sMapState.model1, floor_tile->meshId, __code3E30_meshCallbackFloorTileState_1, (s32)floor_tile); diff --git a/src/core2/code_4C020.c b/src/core2/code_4C020.c index 5db33954..7f972afd 100644 --- a/src/core2/code_4C020.c +++ b/src/core2/code_4C020.c @@ -361,6 +361,7 @@ void func_802D3CC8(ActorMarker *marker){ func_802D31AC(marker, NULL); } +// used as init function void func_802D3CE8(Actor *this){ if(!this->initialized){ marker_setCollisionScripts(this->marker, NULL, func_802D3138, func_802D31AC); @@ -373,6 +374,7 @@ void func_802D3D54(Actor *this){ func_802D3CE8(this); } +// used as init function void func_802D3D74(Actor *this){ this->marker->propPtr->unk8_3 = TRUE; actor_collisionOff(this); diff --git a/src/core2/code_956B0.c b/src/core2/code_956B0.c index 161a6d96..1b547460 100644 --- a/src/core2/code_956B0.c +++ b/src/core2/code_956B0.c @@ -231,8 +231,9 @@ void func_8031CE70(f32 *arg0, enum map_e arg1, s32 arg2) { } } -void func_8031D04C(enum map_e arg0, s32 arg1) { - func_8031CB50(arg0, arg1, 0); +// set map and exit id? +void func_8031D04C(enum map_e arg0, s32 exit_id) { + func_8031CB50(arg0, exit_id, 0); } void func_8031D06C(enum map_e arg0, s32 arg1) { diff --git a/src/core2/spawnqueue.c b/src/core2/spawnqueue.c index 7b1b9859..aad84102 100644 --- a/src/core2/spawnqueue.c +++ b/src/core2/spawnqueue.c @@ -374,7 +374,7 @@ void spawnQueue_reset(void){ GV_func_8038F154(); break; case OVERLAY_5_BEACH: - TTC_resetSpawnableActors(); + code26D0_resetSpawnableActorsForTTC(); break; case OVERLAY_6_JUNGLE: MM_func_803888B0(); From 3a8222b5cd23680479a3b682209e820c6085ca8e Mon Sep 17 00:00:00 2001 From: Bl00D4NGEL Date: Thu, 10 Oct 2024 22:54:45 +0200 Subject: [PATCH 14/15] general cleanup of ttc related code --- include/enums.h | 8 +- src/TTC/code_3E30.c | 283 +++++++++++++++++++++++++----------- src/core2/ch/bottlesbonus.c | 6 +- src/core2/ch/gameSelect.c | 2 +- src/core2/gc/dialog.c | 5 - 5 files changed, 210 insertions(+), 94 deletions(-) diff --git a/include/enums.h b/include/enums.h index d1e9d46a..0b70abc1 100644 --- a/include/enums.h +++ b/include/enums.h @@ -328,7 +328,7 @@ 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_77_SANDCASTLE_SET_HEALTH_TO_MAX, // unused + VOLATILE_FLAG_77_SANDCASTLE_SET_HEALTH_TO_MAX, VOLATILE_FLAG_78_SANDCASTLE_NO_BONUS, VOLATILE_FLAG_79, // unused VOLATILE_FLAG_7A, // unused @@ -4431,7 +4431,7 @@ enum asset_e ASSET_E35_DIALOG_BOTTLES_BONUS_REMINDER = VER_SELECT(0xE35, 0xa77, 0, 0), ASSET_E37_TEXT_BOTTLES_STOP_WASTING_TIME_AFTER_FURNACE_FUN = 0xE37, // Talk to bottles after beating furnace fun - ASSET_E38_CHEATING_ERASE_SAVE_CONFIRMATION, + ASSET_E38_DIALOG_CHEATING_ERASE_SAVE_CONFIRMATION, ASSET_E57_DIALOG_FIRST_JIGGY = VER_SELECT(0xF57, 0xabd, 0, 0), @@ -4450,8 +4450,8 @@ enum asset_e ASSET_FAD_TEXT_UNKNOWN = 0xfad, - ASSET_FBE_TEXT_CHEATING_ERASE_SAVE_WARNING = 0xfbe, - ASSET_FBF_TEXT_ERASED_SAVE, + ASSET_FBE_DIALOG_CHEATING_ERASE_SAVE_WARNING = 0xfbe, + ASSET_FBF_DIALOG_ERASED_SAVE, ASSET_10A1_DIALOG_BRENTILDA_MEET = 0x10A1, ASSET_10A2_TEXT_UNKNOWN, diff --git a/src/TTC/code_3E30.c b/src/TTC/code_3E30.c index dfaec3c0..b6df2004 100644 --- a/src/TTC/code_3E30.c +++ b/src/TTC/code_3E30.c @@ -5,14 +5,12 @@ #include "SnS.h" /* extern */ - -void func_802D6310(f32, enum map_e, s32, s32, enum file_progress_e); +extern void func_802D6310(f32, enum map_e, s32, s32, enum file_progress_e); extern BKModel *mapModel_getModel(s32); -extern u8 D_8037DCC0[7]; +extern u8 gCompletedBottleBonusGames[7]; /* .h */ - static void __code3E30_resetSecretCheatCodeProgress(void); static u32 __code3E30_scrambleAddressForSecretCheatCode(); @@ -48,7 +46,7 @@ typedef struct static s32 __code3E30_getNumberOfBannedCheatCodesEntered(); /* .data */ -static s32 secretCheatCodeRelatedValue = NULL; +static s32 sSecretCheatCodeRelatedValue = NULL; enum floor_letters_e { FLOOR_LETTER_J = 0x70, @@ -78,6 +76,17 @@ enum floor_letters_e { FLOOR_LETTER_K = 0x38 }; +/** + * The floor tiles look like this (_ being empty): + * J _ G _ A _ L + * _ V _ E _ C _ + * M _ N _ R _ P + * _ D _ O _ S _ + * Z _ U _ Y _ I + * _ X _ T _ F _ + * O _ A _ W _ O + * _ H _ B _ K _ + */ static LetterFloorTile sLetterFloorTiles[] = { {0x02, FLOOR_LETTER_J, 0, 0.0f}, {0x04, FLOOR_LETTER_G, 0, 0.0f}, @@ -111,18 +120,18 @@ static LetterFloorTile sLetterFloorTiles[] = { }; static CheatCode sCheatCodes[0xD] = { - {"knip68n3664j", 0x0001, 0}, // BANJOKAZOOIE - {"kbgjj552", 0x0002, 0}, // BLUEEGGS - {"9jlcjndmj92", 0x0004, 0}, // REDFEATHERS - {"56blcjndmj92", 0x0008, 0}, // GOLDFEATHERS - {"k6ddbj2k6ig26ij", 0x0010, 0}, // BOTTLESBONUSONE - {"k6ddbj2k6ig2d76", 0x0020, 0}, // BOTTLESBONUSTWO - {"k6ddbj2k6ig2dm9jj", 0x0040, 0}, // BOTTLESBONUSTHREE - {"k6ddbj2k6ig2c6g9", 0x0080, 0}, // BOTTLESBONUSFOUR - {"k6ddbj2k6ig2c4aj", 0x0100, 0}, // BOTTLESBONUSFIVE - {"k45k6ddbj2k6ig2", 0x0200, 0}, // BIGBOTTLESBONUS - {"742me7n2meknip6", 0x0400, 0}, // WISHYWASHYBANJO - {"i6k6ig2", 0x0800, 0}, // NOBONUS + {"knip68n3664j", 0x0001, 0}, // BANJOKAZOOIE + {"kbgjj552", 0x0002, 0}, // BLUEEGGS + {"9jlcjndmj92", 0x0004, 0}, // REDFEATHERS + {"56blcjndmj92", 0x0008, 0}, // GOLDFEATHERS + {"k6ddbj2k6ig26ij", 0x0010, 0}, // BOTTLESBONUSONE + {"k6ddbj2k6ig2d76", 0x0020, 0}, // BOTTLESBONUSTWO + {"k6ddbj2k6ig2dm9jj", 0x0040, 0}, // BOTTLESBONUSTHREE + {"k6ddbj2k6ig2c6g9", 0x0080, 0}, // BOTTLESBONUSFOUR + {"k6ddbj2k6ig2c4aj", 0x0100, 0}, // BOTTLESBONUSFIVE + {"k45k6ddbj2k6ig2", 0x0200, 0}, // BIGBOTTLESBONUS + {"742me7n2meknip6", 0x0400, 0}, // WISHYWASHYBANJO + {"i6k6ig2", 0x0800, 0}, // NOBONUS NULL }; @@ -152,7 +161,7 @@ static void __code3E30_transformMeshCallbackOverlayInit(s32 arg0, BKVtxRef *vtx_ static void __code3E30_setupCheatCodeTimer(s32 new_timer_state) { if (new_timer_state == 1) - { // something in FF? + { if (volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)) { // set timer to 50 seconds @@ -163,6 +172,7 @@ static void __code3E30_setupCheatCodeTimer(s32 new_timer_state) // set timer to 100 seconds item_set(ITEM_0_HOURGLASS_TIMER, 5999); } + item_set(ITEM_6_HOURGLASS, TRUE); } @@ -301,7 +311,7 @@ static void __code3E30_updateTimeDeltaSumForFloorTiles() static void __code3E30_setsecretCheatCodeRelatedValue(void) { - secretCheatCodeRelatedValue = __code3E30_scrambleAddressForSecretCheatCode(); + sSecretCheatCodeRelatedValue = __code3E30_scrambleAddressForSecretCheatCode(); } static u32 __code3E30_cheatoCodeUnlocked(s32 cheato_code_index) @@ -340,7 +350,7 @@ static void __code3E30_setVolatileFlags(u32 arg0) static void __code3E30_checkFloorTileForRegularCheatCode(LetterFloorTile *letter_floor_tile) { - s32 sp40[4]; // unused but required for checksum + s32 pad0[4]; bool floor_is_valid_or_correct; bool is_in_ff_minigame; @@ -365,7 +375,7 @@ static void __code3E30_checkFloorTileForRegularCheatCode(LetterFloorTile *letter for (i = 0; i < 7; i++) { - if (D_8037DCC0[i] != 0) + if (gCompletedBottleBonusGames[i] != 0) { unlocked_cheat_flags |= (0x10 << i); } @@ -563,10 +573,10 @@ void code3E30_overlayInit(void) { BKModel_transformMesh(sMapState.model2, 0x3C, __code3E30_transformMeshCallbackOverlayInit, 0); sMapState.banjoKazooieCodeEnteredState = 3; - } // L8038B2CC + } __code3E30_setsecretCheatCodeRelatedValue(); __code3E30_resetSecretCheatCodeProgress(); - } // L8038B2E0 + } } void code3E30_overlayUpdate(void) @@ -648,65 +658,176 @@ static s32 sThirdForbiddenSecretCheatCodeIndex = NULL; #define VOLATILE_FLAG_CHEAT_OFFSET 0x14 static SecretCheatCode sSecretsCheatCodes[] = { - {"0mjnd", 0, 0x00, 00}, // CHEAT - {"i67knip674bbkjnkbjd62jj4d6iinkigd2dnkbj", 0, 0x01, 00}, // NOW BANJO WILL BE ABLE TO SEE IT ON NABNUTS TABLE - {"dm422j09jde6gbbkj59nkk4i4idmj0nrdn4i20nk4i", 0, 0x02, 00}, // THIS SECRET YOULL BE GRABBIN IN THE CAPTAINS CABIN - {"n14l2ddmjmngidjl5b661n2j09jd4idmjkndm9661", 0, 0x03, 00}, // AMIDST THE HAUNTED GLOOM A SECRET IN THE BATHROOM - {"nlj2j9dl6696rji274ljni04jid2j09jd27n4d4i24lj", 0, 0x04, 00}, // A DESERT DOOR OPENS WIDE ANCIENT SECRETS WAIT INSIDE - {"6gd6cdmj2jn4d942j2d69jajnb169j2j09jdr943j2", 0, 0x05, 00}, // OUT OF THE SEA IT RISES TO REVEAL MORE SECRET PRIZES - {"l6ide6g56nildjbbmj9nk6gddmj2j09jd4imj90jbbn9", 0, 0x06, 00}, // DONT YOU GO AND TELL HER ABOUT THE SECRET IN HER CELLAR - {"i67e6g0ni2jjni40j40j8je7m40me6g0nimnajc69c9jj", 0, 0x07, 00}, // NOW YOU CAN SEE A NICE ICE KEY WHICH YOU CAN HAVE FOR FREE - {"56945md6idm96g5mi6djl669d76", 0, VOLATILE_FLAG_66_SANDCASTLE_OPEN_DOOR_TWO + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // GO RIGHT ON THROUGH NOTE DOOR TWO - {"i6djl669dm9jj5jd4ic69c9jj", 0, VOLATILE_FLAG_67_SANDCASTLE_OPEN_DOOR_THREE + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // NOTE DOOR THREE GET IN FOR FREE - {"dn8jnd6g9dm96g5mi6djl669c6g9", 0, VOLATILE_FLAG_68_SANDCASTLE_OPEN_DOOR_FOUR + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // TAKE A TOUR THROUGH NOTE DOOR FOUR - {"g2jdm420mjndi6djl669c4aj42kjnd", 0, VOLATILE_FLAG_69_SANDCASTLE_OPEN_DOOR_FIVE + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // USE THIS CHEAT NOTE DOOR FIVE IS BEAT - {"dm42d94082g2jld66rjii6djl66924h", 0, VOLATILE_FLAG_6A_SANDCASTLE_OPEN_DOOR_SIX + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // THIS TRICKS USED TO OPEN NOTE DOOR SIX - {"dmj2jajidmi6djl66942i67i6169j", 0, VOLATILE_FLAG_6B_SANDCASTLE_OPEN_DOOR_SEVEN + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // THE SEVENTH NOTE DOOR IS NOW NO MORE - {"e6g0ni5jd7jdcjjdi670bni8j92p455e42061rbjdj", 0, VOLATILE_FLAG_6C_SANDCASTLE_PUZZLE_COMPLETE_CC + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // YOU CAN GET WET FEET NOW CLANKERS JIGGY IS COMPLETE - {"dmjp455e2cgbb6cce6g2d61r4id6l4i5ekgkkbj5b66r27n1r", 0, VOLATILE_FLAG_6D_SANDCASTLE_PUZZLE_COMPLETE_BGS + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // THE JIGGYS FULL OFF YOU STOMP IN TO DINGY BUBBLEGLOOP SWAMP - {"dmjp455e2l6ij266cce6g564id6c9jj3jj3erjn8nil4d22i67", 0, VOLATILE_FLAG_6E_SANDCASTLE_PUZZLE_COMPLETE_FP + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // THE JIGGYS DONE SO OFF YOU GO INTO FREEZEEZY PEAK AND ITS SNOW - {"56k42p455e42i67l6ijd9j86i4inil5jd261j2gi", 0, VOLATILE_FLAG_6F_SANDCASTLE_PUZZLE_COMPLETE_GV + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // GOBIS JIGGY IS NOW DONE TREK ON IN AND GET SOME SUN - {"dmjp455e2i671nlj7m6bj4id6dmj1ni246ie6g0ni2d96bb", 0, VOLATILE_FLAG_70_SANDCASTLE_PUZZLE_COMPLETE_MMM + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // THE JIGGYS NOW MADE WHOLE INTO THE MANSION YOU CAN STROLL - {"dmjp455e2l6ij26dn8jnd94r6id6dmj9g2dekg08jd2m4r", 0, VOLATILE_FLAG_71_SANDCASTLE_PUZZLE_COMPLETE_RBB + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // THE JIGGYS DONE SO TAKE A TRIP ON TO THE RUSTY BUCKET SHIP - {"0b4080b608766l42b6d26ccgi566i4idmjp455e2l6ij", 0, VOLATILE_FLAG_72_SANDCASTLE_PUZZLE_COMPLETE_CCC + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // CLICK CLOCK WOOD IS LOTS OF FUN GO ON IN THE JIGGYS DONE - {"b6d26c56j274dm1nieknip62", 0, VOLATILE_FLAG_73_SANDCASTLE_INFINITE_LIVES + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // LOTS OF GOES WITH MANY BANJOS - {"knip6kj52c69rbjide6cj552", 0, VOLATILE_FLAG_74_SANDCASTLE_INFINITE_EGGS + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // BANJO BEGS FOR PLENTY OF EGGS - {"i67e6g0nicbem45m4idmj28e", 0, VOLATILE_FLAG_75_SANDCASTLE_INFINITE_RED_FEATHERS + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // NOW YOU CAN FLY HIGH IN THE SKY - {"n56blji5b67d6r96dj0dknip6", 0, VOLATILE_FLAG_76_SANDCASTLE_INFINITE_GOLD_FEATHERS + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // A GOLDEN GLOW TO PROTECT BANJO - {"k6dmr4rj2n9jdmj9jd60bni8j92bn49", 0, VOLATILE_FLAG_7D_SANDCASTLE_RAISE_PIPES_TO_CC + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // BOTH PIPES ARE THERE TO CLANKERS LAIR - {"e6gbb0jn2jd6594rj7mjigr56j2nr4rj", 0, VOLATILE_FLAG_7E_SANDCASTLE_RAISE_PIPE_TO_BRENTILDA + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // YOULL CEASE TO GRIPE WHEN UP GOES A PIPE - {"dmj9j2i67mj9jlni8j9dmni4i74dm0bni8j9", 0, VOLATILE_FLAG_7F_SANDCASTLE_OPEN_CC + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // THERES NOWHERE DANKER THAN IN WITH CLANKER - {"e6gbbkjn1n3jli67dmj27n1rr400e594bbj429n42jl", 0, VOLATILE_FLAG_80_SANDCASTLE_REMOVE_GRILL_NEAR_BGS_JIGGY + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // YOULL BE AMAZED NOW THE SWAMP PICCY GRILLE IS RAISED - {"l6idlj2rn49dmjd9jjp455er6l4g142i67dmj9j", 0, VOLATILE_FLAG_81_SANDCASTLE_CCC_JIGGY_PODIUM + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // DONT DESPAIR THE TREE JIGGY PODIUM IS NOW THERE - {"2mj2nig5beknd26bjd29j16ajmj9594bbjnilmnd", 0, VOLATILE_FLAG_82_SANDCASTLE_REMOVE_GRILL_AND_HAT_FROM_STATUE + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // SHES AN UGLY BAT SO LETS REMOVE HER GRILLE AND HAT - {"4d2e6g9bg08elnen2dmj40jknbb1jbd2n7ne", 0, VOLATILE_FLAG_83_SANDCASTLE_REMOVE_ICE + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // ITS YOUR LUCKY DAY AS THE ICE BALL MELTS AWAY - {"i674id6dmj27n1re6g0ni2d61r", 0, VOLATILE_FLAG_84_SANDCASTLE_OPEN_BGS + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // NOW IN TO THE SWAMP YOU CAN STOMP - {"dmje0ng2jd96gkbjkgdi67dmje9j9gkkbj", 0, VOLATILE_FLAG_85_SANDCASTLE_REMOVE_BREAKABLE_WALLS + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // THEY CAUSE TROUBLE BUT NOW THEYRE RUBBLE - {"e6gbbkj5bnld62jjdmj2m608pg1rrnl", 0, VOLATILE_FLAG_86_SANDCASTLE_SHOCKSPRING_JUMP_UNLOCKED + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // YOULL BE GLAD TO SEE THE SHOCK JUMP PAD - {"dm42061j24imniled66rji261j7mj9j2nile", 0, VOLATILE_FLAG_87_SANDCASTLE_OPEN_GV + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // THIS COMES IN HANDY TO OPEN SOMEWHERE SANDY - {"7jk22d6re6g9rbne26dn8jdmj1n7ne", 0, VOLATILE_FLAG_88_SANDCASTLE_REMOVE_WEBS + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // WEBS STOP YOUR PLAY SO TAKE THEM AWAY - {"59gide74bb09ei67e6gaj21n2mjlmj9jej", 0, VOLATILE_FLAG_89_SANDCASTLE_REMOVE_GLASS_EYE + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // GRUNTY WILL CRY NOW YOUVE SMASHED HER EYE - {"e6g76idkj2nli67e6g0nig2jdmjcbernl", 0, VOLATILE_FLAG_8A_SANDCASTLE_FLIGHT_UNLOCKED + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // YOU WONT BE SAD NOW YOU CAN USE THE FLY PAD - {"i67e6g0ni56nild9gl5j4idmj2i67", 0, VOLATILE_FLAG_8B_SANDCASTLE_OPEN_FP + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // NOW YOU CAN GO AND TRUDGE IN THE SNOW - {"dmj1ni246i6c5m62d2n9ji67e6g9m62d2", 0, VOLATILE_FLAG_8C_SANDCASTLE_OPEN_MMM + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // THE MANSION OF GHOSTS ARE NOW YOUR HOSTS - {"e6g76idmnajd67n4di67dmj9j2i609erd5ndj", 0, VOLATILE_FLAG_8D_SANDCASTLE_REMOVE_CRYPT_GATE + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // YOU WONT HAVE TO WAIT NOW THERES NO CRYPT GATE - {"dm422m6gbl5jd94l6cdmj09erd06cc4ib4l", 0, VOLATILE_FLAG_8E_SANDCASTLE_REMOVE_CRYPT_COFFIN_LID + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // THIS SHOULD GET RID OF THE CRYPT COFFIN LID - {"gre6g5674dm6gdnm4d0mgrd6dmj7ndj9bjajb274d0m", 0, VOLATILE_FLAG_8F_SANDCASTLE_REMOVE_GRATE_NEAR_WATER_SWITCH + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // UP YOU GO WITHOUT A HITCH UP TO THE WATER LEVEL SWITCH - {"7mei6ddn8jnd94r4i24lj59gide29g2de2m4r", 0, VOLATILE_FLAG_90_SANDCASTLE_OPEN_RBB + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // WHY NOT TAKE A TRIP INSIDE GRUNTYS RUSTY SHIP - {"dmj594bbj56j2k661d6dmj2m4rr40dg9j9661", 0, VOLATILE_FLAG_91_SANDCASTLE_REMOVE_GRILL_NEAR_RBB_JIGGY + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // THE GRILLE GOES BOOM TO THE SHIP PICTURE ROOM - {"6i0j4d2m6ijkgddmjb6i5dgiijb594bbj4256ij", 0, VOLATILE_FLAG_92_SANDCASTLE_REMOVE_TUNNEL_GRILL_NEAR_RBB_JIGGY + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // ONCE IT SHONE BUT THE LONG TUNNEL GRILLE IS GONE - {"dm426ij2566ln2e6g0nijidj9dmj766l", 0, VOLATILE_FLAG_93_SANDCASTLE_OPEN_CCW + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // THIS ONES GOOD AS YOU CAN ENTER THE WOOD - {"nijij95ekn9d65jde6gcn9", 0, VOLATILE_FLAG_94_SANDCASTLE_INFINITE_HEALTH + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // AN ENERGY BAR TO GET YOU FAR - {"l6idkjnlg1k6562jj1g1k6", 0, VOLATILE_FLAG_95_SANDCASTLE_INFINTE_MUMBO_TOKENS + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // DONT BE A DUMBO GO SEE MUMBO - {"54ajdmjkjn9b6d26cn49", 0, VOLATILE_FLAG_96_SANDCASTLE_INFINITE_AIR + VOLATILE_FLAG_CHEAT_OFFSET, 00}, // GIVE THE BEAR LOTS OF AIR + // CHEAT + {"0mjnd", 0, 0x00, 00}, + + // NOW BANJO WILL BE ABLE TO SEE IT ON NABNUTS TABLE + {"i67knip674bbkjnkbjd62jj4d6iinkigd2dnkbj", 0, 0x01, 00}, + + // THIS SECRET YOULL BE GRABBIN IN THE CAPTAINS CABIN + {"dm422j09jde6gbbkj59nkk4i4idmj0nrdn4i20nk4i", 0, 0x02, 00}, + + // AMIDST THE HAUNTED GLOOM A SECRET IN THE BATHROOM + {"n14l2ddmjmngidjl5b661n2j09jd4idmjkndm9661", 0, 0x03, 00}, + + // A DESERT DOOR OPENS WIDE ANCIENT SECRETS WAIT INSIDE + {"nlj2j9dl6696rji274ljni04jid2j09jd27n4d4i24lj", 0, 0x04, 00}, + + // OUT OF THE SEA IT RISES TO REVEAL MORE SECRET PRIZES + {"6gd6cdmj2jn4d942j2d69jajnb169j2j09jdr943j2", 0, 0x05, 00}, + + // DONT YOU GO AND TELL HER ABOUT THE SECRET IN HER CELLAR + {"l6ide6g56nildjbbmj9nk6gddmj2j09jd4imj90jbbn9", 0, 0x06, 00}, + + // NOW YOU CAN SEE A NICE ICE KEY WHICH YOU CAN HAVE FOR FREE + {"i67e6g0ni2jjni40j40j8je7m40me6g0nimnajc69c9jj", 0, 0x07, 00}, + + // GO RIGHT ON THROUGH NOTE DOOR TWO + {"56945md6idm96g5mi6djl669d76", 0, VOLATILE_FLAG_66_SANDCASTLE_OPEN_DOOR_TWO + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // NOTE DOOR THREE GET IN FOR FREE + {"i6djl669dm9jj5jd4ic69c9jj", 0, VOLATILE_FLAG_67_SANDCASTLE_OPEN_DOOR_THREE + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // TAKE A TOUR THROUGH NOTE DOOR FOUR + {"dn8jnd6g9dm96g5mi6djl669c6g9", 0, VOLATILE_FLAG_68_SANDCASTLE_OPEN_DOOR_FOUR + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // USE THIS CHEAT NOTE DOOR FIVE IS BEAT + {"g2jdm420mjndi6djl669c4aj42kjnd", 0, VOLATILE_FLAG_69_SANDCASTLE_OPEN_DOOR_FIVE + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // THIS TRICKS USED TO OPEN NOTE DOOR SIX + {"dm42d94082g2jld66rjii6djl66924h", 0, VOLATILE_FLAG_6A_SANDCASTLE_OPEN_DOOR_SIX + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // THE SEVENTH NOTE DOOR IS NOW NO MORE + {"dmj2jajidmi6djl66942i67i6169j", 0, VOLATILE_FLAG_6B_SANDCASTLE_OPEN_DOOR_SEVEN + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // YOU CAN GET WET FEET NOW CLANKERS JIGGY IS COMPLETE + {"e6g0ni5jd7jdcjjdi670bni8j92p455e42061rbjdj", 0, VOLATILE_FLAG_6C_SANDCASTLE_PUZZLE_COMPLETE_CC + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // THE JIGGYS FULL OFF YOU STOMP IN TO DINGY BUBBLEGLOOP SWAMP + {"dmjp455e2cgbb6cce6g2d61r4id6l4i5ekgkkbj5b66r27n1r", 0, VOLATILE_FLAG_6D_SANDCASTLE_PUZZLE_COMPLETE_BGS + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // THE JIGGYS DONE SO OFF YOU GO INTO FREEZEEZY PEAK AND ITS SNOW + {"dmjp455e2l6ij266cce6g564id6c9jj3jj3erjn8nil4d22i67", 0, VOLATILE_FLAG_6E_SANDCASTLE_PUZZLE_COMPLETE_FP + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // GOBIS JIGGY IS NOW DONE TREK ON IN AND GET SOME SUN + {"56k42p455e42i67l6ijd9j86i4inil5jd261j2gi", 0, VOLATILE_FLAG_6F_SANDCASTLE_PUZZLE_COMPLETE_GV + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // THE JIGGYS NOW MADE WHOLE INTO THE MANSION YOU CAN STROLL + {"dmjp455e2i671nlj7m6bj4id6dmj1ni246ie6g0ni2d96bb", 0, VOLATILE_FLAG_70_SANDCASTLE_PUZZLE_COMPLETE_MMM + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // THE JIGGYS DONE SO TAKE A TRIP ON TO THE RUSTY BUCKET SHIP + {"dmjp455e2l6ij26dn8jnd94r6id6dmj9g2dekg08jd2m4r", 0, VOLATILE_FLAG_71_SANDCASTLE_PUZZLE_COMPLETE_RBB + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // CLICK CLOCK WOOD IS LOTS OF FUN GO ON IN THE JIGGYS DONE + {"0b4080b608766l42b6d26ccgi566i4idmjp455e2l6ij", 0, VOLATILE_FLAG_72_SANDCASTLE_PUZZLE_COMPLETE_CCC + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // LOTS OF GOES WITH MANY BANJOS + {"b6d26c56j274dm1nieknip62", 0, VOLATILE_FLAG_73_SANDCASTLE_INFINITE_LIVES + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // BANJO BEGS FOR PLENTY OF EGGS + {"knip6kj52c69rbjide6cj552", 0, VOLATILE_FLAG_74_SANDCASTLE_INFINITE_EGGS + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // NOW YOU CAN FLY HIGH IN THE SKY + {"i67e6g0nicbem45m4idmj28e", 0, VOLATILE_FLAG_75_SANDCASTLE_INFINITE_RED_FEATHERS + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // A GOLDEN GLOW TO PROTECT BANJO + {"n56blji5b67d6r96dj0dknip6", 0, VOLATILE_FLAG_76_SANDCASTLE_INFINITE_GOLD_FEATHERS + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // BOTH PIPES ARE THERE TO CLANKERS LAIR + {"k6dmr4rj2n9jdmj9jd60bni8j92bn49", 0, VOLATILE_FLAG_7D_SANDCASTLE_RAISE_PIPES_TO_CC + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // YOULL CEASE TO GRIPE WHEN UP GOES A PIPE + {"e6gbb0jn2jd6594rj7mjigr56j2nr4rj", 0, VOLATILE_FLAG_7E_SANDCASTLE_RAISE_PIPE_TO_BRENTILDA + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // THERES NOWHERE DANKER THAN IN WITH CLANKER + {"dmj9j2i67mj9jlni8j9dmni4i74dm0bni8j9", 0, VOLATILE_FLAG_7F_SANDCASTLE_OPEN_CC + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // YOULL BE AMAZED NOW THE SWAMP PICCY GRILLE IS RAISED + {"e6gbbkjn1n3jli67dmj27n1rr400e594bbj429n42jl", 0, VOLATILE_FLAG_80_SANDCASTLE_REMOVE_GRILL_NEAR_BGS_JIGGY + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // DONT DESPAIR THE TREE JIGGY PODIUM IS NOW THERE + {"l6idlj2rn49dmjd9jjp455er6l4g142i67dmj9j", 0, VOLATILE_FLAG_81_SANDCASTLE_CCC_JIGGY_PODIUM + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // SHES AN UGLY BAT SO LETS REMOVE HER GRILLE AND HAT + {"2mj2nig5beknd26bjd29j16ajmj9594bbjnilmnd", 0, VOLATILE_FLAG_82_SANDCASTLE_REMOVE_GRILL_AND_HAT_FROM_STATUE + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // ITS YOUR LUCKY DAY AS THE ICE BALL MELTS AWAY + {"4d2e6g9bg08elnen2dmj40jknbb1jbd2n7ne", 0, VOLATILE_FLAG_83_SANDCASTLE_REMOVE_ICE + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // NOW IN TO THE SWAMP YOU CAN STOMP + {"i674id6dmj27n1re6g0ni2d61r", 0, VOLATILE_FLAG_84_SANDCASTLE_OPEN_BGS + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // THEY CAUSE TROUBLE BUT NOW THEYRE RUBBLE + {"dmje0ng2jd96gkbjkgdi67dmje9j9gkkbj", 0, VOLATILE_FLAG_85_SANDCASTLE_REMOVE_BREAKABLE_WALLS + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // YOULL BE GLAD TO SEE THE SHOCK JUMP PAD + {"e6gbbkj5bnld62jjdmj2m608pg1rrnl", 0, VOLATILE_FLAG_86_SANDCASTLE_SHOCKSPRING_JUMP_UNLOCKED + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // THIS COMES IN HANDY TO OPEN SOMEWHERE SANDY + {"dm42061j24imniled66rji261j7mj9j2nile", 0, VOLATILE_FLAG_87_SANDCASTLE_OPEN_GV + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // WEBS STOP YOUR PLAY SO TAKE THEM AWAY + {"7jk22d6re6g9rbne26dn8jdmj1n7ne", 0, VOLATILE_FLAG_88_SANDCASTLE_REMOVE_WEBS + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // GRUNTY WILL CRY NOW YOUVE SMASHED HER EYE + {"59gide74bb09ei67e6gaj21n2mjlmj9jej", 0, VOLATILE_FLAG_89_SANDCASTLE_REMOVE_GLASS_EYE + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // YOU WONT BE SAD NOW YOU CAN USE THE FLY PAD + {"e6g76idkj2nli67e6g0nig2jdmjcbernl", 0, VOLATILE_FLAG_8A_SANDCASTLE_FLIGHT_UNLOCKED + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // NOW YOU CAN GO AND TRUDGE IN THE SNOW + {"i67e6g0ni56nild9gl5j4idmj2i67", 0, VOLATILE_FLAG_8B_SANDCASTLE_OPEN_FP + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // THE MANSION OF GHOSTS ARE NOW YOUR HOSTS + {"dmj1ni246i6c5m62d2n9ji67e6g9m62d2", 0, VOLATILE_FLAG_8C_SANDCASTLE_OPEN_MMM + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // YOU WONT HAVE TO WAIT NOW THERES NO CRYPT GATE + {"e6g76idmnajd67n4di67dmj9j2i609erd5ndj", 0, VOLATILE_FLAG_8D_SANDCASTLE_REMOVE_CRYPT_GATE + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // THIS SHOULD GET RID OF THE CRYPT COFFIN LID + {"dm422m6gbl5jd94l6cdmj09erd06cc4ib4l", 0, VOLATILE_FLAG_8E_SANDCASTLE_REMOVE_CRYPT_COFFIN_LID + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // UP YOU GO WITHOUT A HITCH UP TO THE WATER LEVEL SWITCH + {"gre6g5674dm6gdnm4d0mgrd6dmj7ndj9bjajb274d0m", 0, VOLATILE_FLAG_8F_SANDCASTLE_REMOVE_GRATE_NEAR_WATER_SWITCH + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // WHY NOT TAKE A TRIP INSIDE GRUNTYS RUSTY SHIP + {"7mei6ddn8jnd94r4i24lj59gide29g2de2m4r", 0, VOLATILE_FLAG_90_SANDCASTLE_OPEN_RBB + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // THE GRILLE GOES BOOM TO THE SHIP PICTURE ROOM + {"dmj594bbj56j2k661d6dmj2m4rr40dg9j9661", 0, VOLATILE_FLAG_91_SANDCASTLE_REMOVE_GRILL_NEAR_RBB_JIGGY + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // ONCE IT SHONE BUT THE LONG TUNNEL GRILLE IS GONE + {"6i0j4d2m6ijkgddmjb6i5dgiijb594bbj4256ij", 0, VOLATILE_FLAG_92_SANDCASTLE_REMOVE_TUNNEL_GRILL_NEAR_RBB_JIGGY + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // THIS ONES GOOD AS YOU CAN ENTER THE WOOD + {"dm426ij2566ln2e6g0nijidj9dmj766l", 0, VOLATILE_FLAG_93_SANDCASTLE_OPEN_CCW + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // AN ENERGY BAR TO GET YOU FAR + {"nijij95ekn9d65jde6gcn9", 0, VOLATILE_FLAG_94_SANDCASTLE_INFINITE_HEALTH + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // DONT BE A DUMBO GO SEE MUMBO + {"l6idkjnlg1k6562jj1g1k6", 0, VOLATILE_FLAG_95_SANDCASTLE_INFINTE_MUMBO_TOKENS + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + + // GIVE THE BEAR LOTS OF AIR + {"54ajdmjkjn9b6d26cn49", 0, VOLATILE_FLAG_96_SANDCASTLE_INFINITE_AIR + VOLATILE_FLAG_CHEAT_OFFSET, 00}, + NULL }; static u8 sLastFloorTileHitCorret = 0; // 0 = "initial", 1 = incorrect, 2 = correct static BannedCheatCodeRange sBannedCheatCodeRanges[4] = { - {VOLATILE_FLAG_66_SANDCASTLE_OPEN_DOOR_TWO + VOLATILE_FLAG_CHEAT_OFFSET, VOLATILE_FLAG_6B_SANDCASTLE_OPEN_DOOR_SEVEN + VOLATILE_FLAG_CHEAT_OFFSET}, - {VOLATILE_FLAG_6C_SANDCASTLE_PUZZLE_COMPLETE_CC + VOLATILE_FLAG_CHEAT_OFFSET, VOLATILE_FLAG_72_SANDCASTLE_PUZZLE_COMPLETE_CCC + VOLATILE_FLAG_CHEAT_OFFSET}, - {VOLATILE_FLAG_7D_SANDCASTLE_RAISE_PIPES_TO_CC + VOLATILE_FLAG_CHEAT_OFFSET, VOLATILE_FLAG_93_SANDCASTLE_OPEN_CCW + VOLATILE_FLAG_CHEAT_OFFSET}, + { + VOLATILE_FLAG_66_SANDCASTLE_OPEN_DOOR_TWO + VOLATILE_FLAG_CHEAT_OFFSET, + VOLATILE_FLAG_6B_SANDCASTLE_OPEN_DOOR_SEVEN + VOLATILE_FLAG_CHEAT_OFFSET + }, + { + VOLATILE_FLAG_6C_SANDCASTLE_PUZZLE_COMPLETE_CC + VOLATILE_FLAG_CHEAT_OFFSET, + VOLATILE_FLAG_72_SANDCASTLE_PUZZLE_COMPLETE_CCC + VOLATILE_FLAG_CHEAT_OFFSET + }, + { + VOLATILE_FLAG_7D_SANDCASTLE_RAISE_PIPES_TO_CC + VOLATILE_FLAG_CHEAT_OFFSET, + VOLATILE_FLAG_93_SANDCASTLE_OPEN_CCW + VOLATILE_FLAG_CHEAT_OFFSET + }, NULL }; @@ -910,7 +1031,7 @@ static void __code3E30_eraseGameplayDialogCallback(ActorMarker *caller, enum ass { __code3E30_setNumberOfBannedCheatcodesEntered(3); __code3E30_checkSecretCheatCodeIndex(sThirdForbiddenSecretCheatCodeIndex); - gcdialog_showText(ASSET_FBF_TEXT_ERASED_SAVE, 0xC, NULL, NULL, NULL, NULL); + gcdialog_showText(ASSET_FBF_DIALOG_ERASED_SAVE, 0xC, NULL, NULL, NULL, NULL); gameFile_clear(func_802C5A30()); gameFile_8033CFD4(func_802C5A30()); func_802C5A3C(-1); @@ -945,11 +1066,11 @@ static void __code3E30_checkIfBannedCheatCodeEntered(s32 secret_cheat_code_index __code3E30_setNumberOfBannedCheatcodesEntered(2); __code3E30_checkSecretCheatCodeIndex(secret_cheat_code_index); __code3E30_resetSecretCheatCodeProgress(); - gcdialog_showText(ASSET_FBE_TEXT_CHEATING_ERASE_SAVE_WARNING, 0xC, NULL, NULL, NULL, NULL); + gcdialog_showText(ASSET_FBE_DIALOG_CHEATING_ERASE_SAVE_WARNING, 0xC, NULL, NULL, NULL, NULL); return; case 2: sThirdForbiddenSecretCheatCodeIndex = secret_cheat_code_index; - gcdialog_showText(ASSET_E38_CHEATING_ERASE_SAVE_CONFIRMATION, 0xC, NULL, NULL, __code3E30_eraseGameplayDialogCallback, NULL); + gcdialog_showText(ASSET_E38_DIALOG_CHEATING_ERASE_SAVE_CONFIRMATION, 0xC, NULL, NULL, __code3E30_eraseGameplayDialogCallback, NULL); return; } return; @@ -1068,5 +1189,5 @@ static bool __code3E30_isCurrentSecretCheatCodeCharacter0() bool code_3E30_isSecretCheatCodeRelatedValueEqualToScrambledAddressValue() { - return __code3E30_scrambleAddressForSecretCheatCode() == secretCheatCodeRelatedValue; + return __code3E30_scrambleAddressForSecretCheatCode() == sSecretCheatCodeRelatedValue; } diff --git a/src/core2/ch/bottlesbonus.c b/src/core2/ch/bottlesbonus.c index 65333c30..1ef89412 100644 --- a/src/core2/ch/bottlesbonus.c +++ b/src/core2/ch/bottlesbonus.c @@ -19,7 +19,7 @@ extern void func_803458E4(f32[4], f32[4], f32[4], f32); #define CH_BOTTLES_BONUS_PUZZLE_PIECE_COUNT (CH_BOTTLES_BONUS_PUZZLE_HEIGHT * CH_BOTTLES_BONUS_PUZZLE_WIDTH) /* .extern symbols??? */ -extern u8 D_8037DCC0[7]; +extern u8 gCompletedBottleBonusGames[7]; extern u8 D_8037DCC7; extern u8 D_8037DCC8; extern u8 D_8037DCC9; @@ -422,7 +422,7 @@ void chBottlesBonus_completedPuzzle(void) { Actor *actor; actor = marker_getActor(chBottlesBonusMarker); - D_8037DCC0[chBottleBonusPuzzleIndex] = TRUE; + gCompletedBottleBonusGames[chBottleBonusPuzzleIndex] = TRUE; func_80311714(0); gcdialog_showText(D_803681A0[chBottleBonusPuzzleIndex + 1].text_id, 0x86, actor->position, chBottlesBonusMarker, chBottlesBonus_IncrementPuzzle, NULL); func_80311714(1); @@ -600,7 +600,7 @@ Actor *chBottlesBonus_new(s32 position[3], s32 yaw, ActorInfo *actor_info, u32 f void chBottlesBonus_func_802DEB80(void) { int i; for(i = 0; i < 7; i++){ - D_8037DCC0[i] = 0; + gCompletedBottleBonusGames[i] = 0; } D_8037DCC7 = 0; D_8037DCC8 = 0; diff --git a/src/core2/ch/gameSelect.c b/src/core2/ch/gameSelect.c index 7f26bd00..ce2d2dbe 100644 --- a/src/core2/ch/gameSelect.c +++ b/src/core2/ch/gameSelect.c @@ -83,7 +83,7 @@ s32 mm_hut_smash_count; u32 CH_TREASUREHUNT_PUZZLE_CURRENT_STEP; struct FF_StorageStruct* D_8037DCB8; s32 D_8037DCBC; -u8 D_8037DCC0[7]; // bottle bonus puzzle? +u8 gCompletedBottleBonusGames[7]; // bottle bonus puzzle? u8 D_8037DCC7; u8 D_8037DCC8; u8 D_8037DCC9; diff --git a/src/core2/gc/dialog.c b/src/core2/gc/dialog.c index b83854fe..858888ea 100644 --- a/src/core2/gc/dialog.c +++ b/src/core2/gc/dialog.c @@ -942,11 +942,6 @@ int func_80311174(s32 text_id, s32 arg1, f32 *pos, ActorMarker *marker, void(*ca return 0; } -// arg1 = "person" that says text? -// 0xC = Bottles -// 0xE = Jumbo? -// 0x4 = Gruntilda? -// 0xF = Mr Vile? bool gcdialog_showText(s32 text_id, s32 arg1, f32 *pos, ActorMarker *marker, void(*callback)(ActorMarker *, enum asset_e, s32), void(*arg5)(ActorMarker *, enum asset_e, s32)){ return func_80311174(text_id, arg1, pos, marker, callback, arg5, 0); } From 31c28a7009be7da3518438593bc74bd4bdc12aad Mon Sep 17 00:00:00 2001 From: Dominik Peters Date: Mon, 14 Oct 2024 21:22:33 +0000 Subject: [PATCH 15/15] Generate asset enum programmatically --- tools/generate_asset_enums.py | 210 ++++++++++++++++++++++++++++++++++ 1 file changed, 210 insertions(+) create mode 100644 tools/generate_asset_enums.py diff --git a/tools/generate_asset_enums.py b/tools/generate_asset_enums.py new file mode 100644 index 00000000..06f130ab --- /dev/null +++ b/tools/generate_asset_enums.py @@ -0,0 +1,210 @@ +#!/usr/bin/env python3 +import argparse +import yaml +import re +import os +from typing import Dict, List +from pathlib import Path + + +def build_asset_map(assets_file: str) -> Dict[str, str]: + file_types_to_skip = ( + 'LevelSetup', # 0x071D - 0x07B5 + 'DemoInput', # 0x09A2 - 0x0A0A + 'QuizQuestion', # 0x1213 - 0x13D5 + 'GruntyQuestion', # 0x1407 - 0x1424 + 'Midi' # 0x1516 - 0x15C2 + ) + + file_type_to_asset_type = { + 'Animation': 'ANIM', + 'Model': 'MODEL', + 'Sprite_I4': 'SPRITE', + 'Sprite_I8': 'SPRITE', + 'Sprite_CI4': 'SPRITE', + 'Sprite_CI8': 'SPRITE', + 'Sprite_RGBA16': 'SPRITE', + 'Sprite_RGBA32': 'SPRITE', + 'Sprite_UNKNOWN(256)': 'SPRITE', + 'Dialog': 'DIALOG', + } + + asset_map = {} + with open(assets_file, 'r') as stream: + try: + data = yaml.safe_load(stream) + if "files" not in data: + raise Exception("Expected to find 'files' key in assets file") + files = data["files"] + for file in files: + file_type = file["type"] + if file_type in file_types_to_skip: + continue + + if file_type not in file_type_to_asset_type: + continue + + asset_type = file_type_to_asset_type[file_type] + address = file["uid"] + asset_map[f"{address:X}"] = f"ASSET_{address:X}_{asset_type}_UNKNOWN" + except yaml.YAMLError as exc: + print(exc) + + return asset_map + + +def get_existing_asset_enums(assets_enum_file: str) -> Dict[str, str]: + with open(assets_enum_file, "r") as enums_stream: + existing_asset_match = re.compile(r"^\s*(ASSET_([A-F0-9]+)_\w+)", re.IGNORECASE) + existing_asset_mappings = {} + for line in enums_stream: + asset_line = existing_asset_match.match(line) + if asset_line is not None: + asset_address = asset_line.group(2).upper() + existing_asset_mappings[asset_address] = asset_line.group(1) + + return existing_asset_mappings + + +def build_asset_enum(asset_map: Dict[str, str], existing_assets: Dict[str, str]) -> List[str]: + asset_enum_lines = [] + address_already_defined = False + for i in range(1, int(0x1516)): + address = f"{i:X}" + if address in existing_assets: + if address_already_defined is False: + asset_enum_lines.append( + f"{existing_assets[address]} = 0x{address},") + address_already_defined = True + else: + asset_enum_lines.append(f"{existing_assets[address]},") + elif address in asset_map: + if address_already_defined is False: + asset_enum_lines.append(f"{asset_map[address]} = 0x{address},") + address_already_defined = True + else: + asset_enum_lines.append(f"{asset_map[address]},") + else: + asset_enum_lines.append(f"// {address} unused") + address_already_defined = False + + asset_enum_lines = remove_unnecessary_unused_asset_lines(asset_enum_lines) + + # Remove trailing comma in last asset line + last_line: str = asset_enum_lines[-1] + if last_line.endswith(","): + last_line = last_line.replace(",", "") + asset_enum_lines[-1] = last_line + + return map(lambda x: f" {x}", asset_enum_lines) + + +def remove_unnecessary_unused_asset_lines(lines: List[str]) -> List[str]: + prev_unused = False + unused_asset_line_indexes = [] + # Create list of lines that contain "// xx is unused" + for idx, line in enumerate(lines): + if line.endswith('unused') is False: + continue + + if idx + 1 >= len(lines): + continue + + prev: str | None = lines[idx - 1] + prev_unused = prev is not None and prev.endswith('unused') + + next: str | None = lines[idx + 1] + next_unused = next is not None and next.endswith('unused') + + if prev_unused and next_unused: + unused_asset_line_indexes.append(idx) + + # "Group" lines where multiple "// xx is unused" lines occur in a row + groups = [] + group = [] + target = None + for idx, line_index in enumerate(unused_asset_line_indexes): + if target is not None and target > idx: + continue + else: + target = None + + for next in range(0, len(unused_asset_line_indexes) - idx): + if unused_asset_line_indexes[next + idx] == line_index + next: + group.append(next + idx) + else: + break + + if len(group) == 0: + continue + + combine_from_index = group[0] + combine_from = unused_asset_line_indexes[combine_from_index] + combine_to_index = group[len(group)-1] + combine_to = unused_asset_line_indexes[combine_to_index] + groups.append((combine_from - 1, combine_to + 1)) + group = [] + target = next + idx + + # Replace the "unnecessary" lines with a single line that lists the range that is unused + offset = 0 + address_regex = re.compile(r"^// (\w+) unused$") + for group in groups: + (start, end) = group + start -= offset + start_line = lines[start] + start_match = address_regex.match(start_line) + + end -= offset + end_line = lines[end] + end_match = address_regex.match(end_line) + + if start_match is not None and end_match is not None: + lines[start:end+1] = [ + f"// 0x{start_match.group(1)} - 0x{end_match.group(1)} unused" + ] + + offset += end - start + + return lines + + +def write_enum_file(asset_lines: List[str], out_file: str): + with open(out_file, "w") as enums_out: + lines = [ + "enum asset_e", + "{", + *asset_lines, + "};" + ] + enums_out.write("\n".join(lines)) + + +def main(): + parser = argparse.ArgumentParser( + description='Generate asset_e enum from assets/assets.yaml and include/enums.h files', + formatter_class=argparse.RawDescriptionHelpFormatter + ) + parser.add_argument( + 'basedir', + type=str, + help="base directory (containing src/)" + ) + args = parser.parse_args() + + asset_map = build_asset_map( + assets_file=f"{args.basedir}{os.sep}assets{os.sep}assets.yaml" + ) + existing_assets = get_existing_asset_enums( + assets_enum_file=f"{args.basedir}{os.sep}include{os.sep}enums.h" + ) + + asset_enum_lines = build_asset_enum(asset_map, existing_assets) + write_enum_file( + asset_enum_lines, + out_file=f"{args.basedir}{os.sep}assets.h" + ) + + +if __name__ == '__main__': + main()