diff --git a/.vscode/settings.json b/.vscode/settings.json index 66387001..59af2494 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -36,7 +36,7 @@ "limits": "c", "algorithm": "c", "dfee30.h": "c", - "df4260.h": "c", + "fox_i1.h": "c", "symbol_addrs_overlays": "cpp", "string.h": "c", "stdarg.h": "c", diff --git a/include/fox_map.h b/include/fox_map.h index 4a422424..493fc8a9 100644 --- a/include/fox_map.h +++ b/include/fox_map.h @@ -18,7 +18,7 @@ typedef struct { /* 0x10 */ char pad10[0x4]; /* 0x14 */ s32 unk_14; /* 0x18 */ s32 unk_18; -} UnkStruct_D_EBFBE0_801AFD18; // size = 0x1C +} UnkStruct_D_menu_801AFD18; // size = 0x1C typedef struct { /* 0x00 */ s32 id; diff --git a/include/fox_option.h b/include/fox_option.h index 2a2cd71a..01941f8d 100644 --- a/include/fox_option.h +++ b/include/fox_option.h @@ -48,13 +48,13 @@ typedef struct { typedef struct { s32 unk_0; s32 unk_4; -} UnkStruct_D_EBFBE0_801B9250; +} UnkStruct_D_menu_801B9250; typedef struct { /* 0x0 */ s32 unk_0; /* 0x4 */ s32 unk_4; /* 0x8 */ s32 unk_8; -} UnkStruct_D_EBFBE0_801AED4C; // size = 0xC +} UnkStruct_D_menu_801AED4C; // size = 0xC typedef enum OptionId { OPTION_MAIN = 1000, @@ -77,275 +77,275 @@ typedef enum OptionId { #define OPTION_COUNT ARRAY_COUNT(sOptionCardList) -extern s32 D_EBFBE0_801B9090; -extern s32 D_EBFBE0_801B9094; -extern s32 D_EBFBE0_801B9098; //gap -extern s32 D_EBFBE0_801B90A0[3]; //gap -extern s32 D_EBFBE0_801B90B0[3]; //gap -extern f32 D_EBFBE0_801B90C0[3]; //gap -extern f32 D_EBFBE0_801B90D0[3]; //gap -extern f32 D_EBFBE0_801B90E0[3]; //gap -extern f32 D_EBFBE0_801B90F0[3]; //gap -extern f32 D_EBFBE0_801B9100[3]; //gap -extern f32 D_EBFBE0_801B9110[3]; -extern f32 D_EBFBE0_801B911C; -extern f32 D_EBFBE0_801B9120; -extern OptionId D_EBFBE0_801B9124; -extern s32 D_EBFBE0_801B9128; -extern s32 D_EBFBE0_801B912C; -extern s32 D_EBFBE0_801B9130; -extern s32 D_EBFBE0_801B9134; -extern s32 D_EBFBE0_801B9138; -extern s32 D_EBFBE0_801B913C; -extern s32 D_EBFBE0_801B9140[3]; -extern s32 D_EBFBE0_801B914C; -extern u8 D_EBFBE0_801B9150[3][2]; -extern s32 D_EBFBE0_801B9158; -extern UnkStruct_D_EBFBE0_801B9250 D_EBFBE0_801B9160[3]; -extern s32 D_EBFBE0_801B9178; -extern s32 D_EBFBE0_801B917C; -extern UnkStruct_D_EBFBE0_801B9250 D_EBFBE0_801B9180; //gap -extern UnkStruct_D_EBFBE0_801B9250 D_EBFBE0_801B9188; -extern UnkStruct_D_EBFBE0_801B9250 D_EBFBE0_801B9190; -extern UnkStruct_D_EBFBE0_801B9250 D_EBFBE0_801B9198; -extern s32 D_EBFBE0_801B91A0; -extern s32 D_EBFBE0_801B91A4; -extern s32 D_EBFBE0_801B91A8; -extern s32 D_EBFBE0_801B91AC; -extern s32 D_EBFBE0_801B91B0; -extern s32 D_EBFBE0_801B91B4; -extern s32 D_EBFBE0_801B91B8; -extern s32 D_EBFBE0_801B91BC; -extern s32 D_EBFBE0_801B91C0; -extern s32 D_EBFBE0_801B91C4; -extern s32 D_EBFBE0_801B91C8; -extern s32 D_EBFBE0_801B91CC; -extern s32 D_EBFBE0_801B91D0; -extern f32 D_EBFBE0_801B91D4; -extern f32 D_EBFBE0_801B91D8; -extern f32 D_EBFBE0_801B91DC; -extern f32 D_EBFBE0_801B91E0; -extern f32 D_EBFBE0_801B91E4; -extern f32 D_EBFBE0_801B91E8; -extern f32 D_EBFBE0_801B91EC; -extern s32 D_EBFBE0_801B91F0; -extern f32 D_EBFBE0_801B91F4; -extern f32 D_EBFBE0_801B91F8; -extern f32 D_EBFBE0_801B91FC; -extern f32 D_EBFBE0_801B9200; -extern f32 D_EBFBE0_801B9204; -extern f32 D_EBFBE0_801B9208; -extern f32 D_EBFBE0_801B920C; -extern f32 D_EBFBE0_801B9210; -extern s32 D_EBFBE0_801B9214; -extern f32 D_EBFBE0_801B9218; -extern f32 D_EBFBE0_801B921C; -extern f32 D_EBFBE0_801B9220; -extern f32 D_EBFBE0_801B9224; -extern f32 D_EBFBE0_801B9228; -extern s32 D_EBFBE0_801B922C; -extern s32 D_EBFBE0_801B9230; -extern s32 D_EBFBE0_801B9234; -extern s32 D_EBFBE0_801B9238; -extern s32 D_EBFBE0_801B923C; -extern s32 D_EBFBE0_801B9240; -extern s32 D_EBFBE0_801B9244; -extern s32 D_EBFBE0_801B9248; -extern u8 D_EBFBE0_801B924C; -extern UnkStruct_D_EBFBE0_801B9250 D_EBFBE0_801B9250; -extern UnkStruct_D_EBFBE0_801B9250 D_EBFBE0_801B9258; -extern UnkStruct_D_EBFBE0_801B9250 D_EBFBE0_801B9260; -extern UnkStruct_D_EBFBE0_801B9250 D_EBFBE0_801B9268; -extern f32 D_EBFBE0_801B9270[5]; -extern s32 D_EBFBE0_801B9284; -extern s32 D_EBFBE0_801B9288; //gap -extern UnkStruct_D_EBFBE0_801B9250 D_EBFBE0_801B9290; -extern f32 D_EBFBE0_801B9298[32]; +extern s32 D_menu_801B9090; +extern s32 D_menu_801B9094; +extern s32 D_menu_801B9098; //gap +extern s32 D_menu_801B90A0[3]; //gap +extern s32 D_menu_801B90B0[3]; //gap +extern f32 D_menu_801B90C0[3]; //gap +extern f32 D_menu_801B90D0[3]; //gap +extern f32 D_menu_801B90E0[3]; //gap +extern f32 D_menu_801B90F0[3]; //gap +extern f32 D_menu_801B9100[3]; //gap +extern f32 D_menu_801B9110[3]; +extern f32 D_menu_801B911C; +extern f32 D_menu_801B9120; +extern OptionId D_menu_801B9124; +extern s32 D_menu_801B9128; +extern s32 D_menu_801B912C; +extern s32 D_menu_801B9130; +extern s32 D_menu_801B9134; +extern s32 D_menu_801B9138; +extern s32 D_menu_801B913C; +extern s32 D_menu_801B9140[3]; +extern s32 D_menu_801B914C; +extern u8 D_menu_801B9150[3][2]; +extern s32 D_menu_801B9158; +extern UnkStruct_D_menu_801B9250 D_menu_801B9160[3]; +extern s32 D_menu_801B9178; +extern s32 D_menu_801B917C; +extern UnkStruct_D_menu_801B9250 D_menu_801B9180; //gap +extern UnkStruct_D_menu_801B9250 D_menu_801B9188; +extern UnkStruct_D_menu_801B9250 D_menu_801B9190; +extern UnkStruct_D_menu_801B9250 D_menu_801B9198; +extern s32 D_menu_801B91A0; +extern s32 D_menu_801B91A4; +extern s32 D_menu_801B91A8; +extern s32 D_menu_801B91AC; +extern s32 D_menu_801B91B0; +extern s32 D_menu_801B91B4; +extern s32 D_menu_801B91B8; +extern s32 D_menu_801B91BC; +extern s32 D_menu_801B91C0; +extern s32 D_menu_801B91C4; +extern s32 D_menu_801B91C8; +extern s32 D_menu_801B91CC; +extern s32 D_menu_801B91D0; +extern f32 D_menu_801B91D4; +extern f32 D_menu_801B91D8; +extern f32 D_menu_801B91DC; +extern f32 D_menu_801B91E0; +extern f32 D_menu_801B91E4; +extern f32 D_menu_801B91E8; +extern f32 D_menu_801B91EC; +extern s32 D_menu_801B91F0; +extern f32 D_menu_801B91F4; +extern f32 D_menu_801B91F8; +extern f32 D_menu_801B91FC; +extern f32 D_menu_801B9200; +extern f32 D_menu_801B9204; +extern f32 D_menu_801B9208; +extern f32 D_menu_801B920C; +extern f32 D_menu_801B9210; +extern s32 D_menu_801B9214; +extern f32 D_menu_801B9218; +extern f32 D_menu_801B921C; +extern f32 D_menu_801B9220; +extern f32 D_menu_801B9224; +extern f32 D_menu_801B9228; +extern s32 D_menu_801B922C; +extern s32 D_menu_801B9230; +extern s32 D_menu_801B9234; +extern s32 D_menu_801B9238; +extern s32 D_menu_801B923C; +extern s32 D_menu_801B9240; +extern s32 D_menu_801B9244; +extern s32 D_menu_801B9248; +extern u8 D_menu_801B924C; +extern UnkStruct_D_menu_801B9250 D_menu_801B9250; +extern UnkStruct_D_menu_801B9250 D_menu_801B9258; +extern UnkStruct_D_menu_801B9250 D_menu_801B9260; +extern UnkStruct_D_menu_801B9250 D_menu_801B9268; +extern f32 D_menu_801B9270[5]; +extern s32 D_menu_801B9284; +extern s32 D_menu_801B9288; //gap +extern UnkStruct_D_menu_801B9250 D_menu_801B9290; +extern f32 D_menu_801B9298[32]; extern s32 spectrumAnalizerMode; -extern s32 D_EBFBE0_801B931C; -extern bool D_EBFBE0_801B9320; // MusicPlaying status in the expert sound options -extern s32 D_EBFBE0_801B9330[2]; -extern s32 D_EBFBE0_801B933C; -extern s32 D_EBFBE0_801B9340; //gap -extern s32 D_EBFBE0_801B9348[4]; -extern f32 D_EBFBE0_801B9358[4]; -extern f32 D_EBFBE0_801B9368; -extern s32 D_EBFBE0_801B936C; -extern f32 D_EBFBE0_801B9370; -extern s32 D_EBFBE0_801B9374; -extern f32 D_EBFBE0_801B9378; -extern s32 D_EBFBE0_801B937C; -extern UnkStruct_D_EBFBE0_801B9250 D_EBFBE0_801B9380[4]; -extern UnkStruct_D_EBFBE0_801B9250 D_EBFBE0_801B93A0[4]; -extern u8 D_EBFBE0_801B93C4; -extern s32 D_EBFBE0_801B93D0; -extern s32 D_EBFBE0_801B93D4; -extern s32 D_EBFBE0_801B93D8; -extern s32 D_EBFBE0_801B93DC; -extern s32 D_EBFBE0_801B93E0; -extern s32 D_EBFBE0_801B93E4; -extern s32 D_EBFBE0_801B93E8; -extern s32 D_EBFBE0_801B93EC; -extern f32 D_EBFBE0_801B93F0; -extern f32 D_EBFBE0_801B93F4; -extern f32 D_EBFBE0_801B93F8; //gap -extern UnkStruct_D_EBFBE0_801B9250 D_EBFBE0_801B9400; -extern UnkStruct_D_EBFBE0_801B9250 D_EBFBE0_801B9408; +extern s32 D_menu_801B931C; +extern bool D_menu_801B9320; // MusicPlaying status in the expert sound options +extern s32 D_menu_801B9330[2]; +extern s32 D_menu_801B933C; +extern s32 D_menu_801B9340; //gap +extern s32 D_menu_801B9348[4]; +extern f32 D_menu_801B9358[4]; +extern f32 D_menu_801B9368; +extern s32 D_menu_801B936C; +extern f32 D_menu_801B9370; +extern s32 D_menu_801B9374; +extern f32 D_menu_801B9378; +extern s32 D_menu_801B937C; +extern UnkStruct_D_menu_801B9250 D_menu_801B9380[4]; +extern UnkStruct_D_menu_801B9250 D_menu_801B93A0[4]; +extern u8 D_menu_801B93C4; +extern s32 D_menu_801B93D0; +extern s32 D_menu_801B93D4; +extern s32 D_menu_801B93D8; +extern s32 D_menu_801B93DC; +extern s32 D_menu_801B93E0; +extern s32 D_menu_801B93E4; +extern s32 D_menu_801B93E8; +extern s32 D_menu_801B93EC; +extern f32 D_menu_801B93F0; +extern f32 D_menu_801B93F4; +extern f32 D_menu_801B93F8; //gap +extern UnkStruct_D_menu_801B9250 D_menu_801B9400; +extern UnkStruct_D_menu_801B9250 D_menu_801B9408; -extern void* D_EBFBE0_801B68B0[]; -extern u8* D_EBFBE0_801B68D4[]; +extern void* D_menu_801B68B0[]; +extern u8* D_menu_801B68D4[]; -extern s32 D_EBFBE0_801B81A8[][3]; +extern s32 D_menu_801B81A8[][3]; // Planet textures -extern s8 D_EBFBE0_801B9410[96 * 96]; -extern s8 D_EBFBE0_801BB810[96 * 96]; -extern s8 D_EBFBE0_801BDC10[96 * 96]; -extern s8 D_EBFBE0_801C0010[96 * 96]; -extern s8 D_EBFBE0_801C2410[96 * 96]; -extern s8 D_EBFBE0_801C4810[96 * 96]; -extern s8 D_EBFBE0_801C6C10[96 * 96]; -extern s8 D_EBFBE0_801C9010[96 * 96]; -extern s8 D_EBFBE0_801CB410[96 * 96]; +extern s8 D_menu_801B9410[96 * 96]; +extern s8 D_menu_801BB810[96 * 96]; +extern s8 D_menu_801BDC10[96 * 96]; +extern s8 D_menu_801C0010[96 * 96]; +extern s8 D_menu_801C2410[96 * 96]; +extern s8 D_menu_801C4810[96 * 96]; +extern s8 D_menu_801C6C10[96 * 96]; +extern s8 D_menu_801C9010[96 * 96]; +extern s8 D_menu_801CB410[96 * 96]; -extern f32 D_EBFBE0_801CD818[]; +extern f32 D_menu_801CD818[]; -void func_EBFBE0_801877F0(void); - s32 func_EBFBE0_80187ABC(void); -void func_EBFBE0_80187B00(void); -void func_EBFBE0_80187E28(void); -void func_EBFBE0_801888E8(void); -void func_EBFBE0_8018994C(void); -void func_EBFBE0_8018A644(void); -void func_EBFBE0_8018ACEC(void); -void func_EBFBE0_8018B5C4(void); -void func_EBFBE0_8018C644(void); -void func_EBFBE0_80187CA8(void); -s32 func_EBFBE0_80188010(void); -void func_EBFBE0_80189208(void); -void func_EBFBE0_8018A2F8(void); -void func_EBFBE0_8018A990(void); -void func_EBFBE0_8018B038(void); -void func_EBFBE0_8018C114(void); -void func_EBFBE0_8018CB90(void); -void func_EBFBE0_8018F680(void); -void func_EBFBE0_8018F77C(void); -void func_EBFBE0_8018F85C(void); -void func_EBFBE0_8018F8E4(void); -void func_EBFBE0_8018FC14(void); -void func_EBFBE0_8018FD08(void); -void func_EBFBE0_8018FF74(void); -void func_EBFBE0_8018D2B8(s32); -void func_EBFBE0_8018EA78(s32); +void func_menu_801877F0(void); + s32 func_menu_80187ABC(void); +void func_menu_80187B00(void); +void func_menu_80187E28(void); +void func_menu_801888E8(void); +void func_menu_8018994C(void); +void func_menu_8018A644(void); +void func_menu_8018ACEC(void); +void func_menu_8018B5C4(void); +void func_menu_8018C644(void); +void func_menu_80187CA8(void); +s32 func_menu_80188010(void); +void func_menu_80189208(void); +void func_menu_8018A2F8(void); +void func_menu_8018A990(void); +void func_menu_8018B038(void); +void func_menu_8018C114(void); +void func_menu_8018CB90(void); +void func_menu_8018F680(void); +void func_menu_8018F77C(void); +void func_menu_8018F85C(void); +void func_menu_8018F8E4(void); +void func_menu_8018FC14(void); +void func_menu_8018FD08(void); +void func_menu_8018FF74(void); +void func_menu_8018D2B8(s32); +void func_menu_8018EA78(s32); void Option_Setup(void); void Option_UpdateEntry(void); void Option_MapUpdate(void); void Option_MainMenuUpdate(void); void Option_TrainingUpdate(void); -void func_EBFBE0_801929F0(void); +void func_menu_801929F0(void); void Option_MainMenuDraw(void); void Option_VersusUpdate(void); void Option_VersusDraw(void); void Option_SoundInit(void); void Option_SoundUpdate(void); -void func_EBFBE0_80194AEC(void); -void func_EBFBE0_80194BD0(void); +void func_menu_80194AEC(void); +void func_menu_80194BD0(void); void Option_SoundDraw(void); -void func_EBFBE0_801952B4(void); +void func_menu_801952B4(void); void Option_ExpertSoundInit(void); void Option_ExpertSoundUpdate(void); void Option_ExpertSoundDraw(void); void Option_DataInit(void); void Option_DataUpdate(void); -void func_EBFBE0_8019669C(void); +void func_menu_8019669C(void); void Option_DataDraw(void); void Option_RankingInit(void); void Option_RankingUpdate(void); void Option_RankingDraw(void); -void func_EBFBE0_80196FC4(void); -void func_EBFBE0_80197074(void); -void func_EBFBE0_8019715C(void); +void func_menu_80196FC4(void); +void func_menu_80197074(void); +void func_menu_8019715C(void); void Option_RankingMenuDraw(void); -void func_EBFBE0_8019752C(void); -void func_EBFBE0_80197914(void); -void func_EBFBE0_80197A3C(s32, s32, s32); -void func_EBFBE0_80197D30(s32, s32, s32); -void func_EBFBE0_80197DE4(s32, s32, s32); -void func_EBFBE0_80197F74(s32, s32, s32); -void func_EBFBE0_80198164(s32, f32, f32); -void func_EBFBE0_801982B0(s32, s32, f32, f32, s32); -void func_EBFBE0_801984D0(s32, s32, f32, f32); -void func_EBFBE0_80198608(s32, s32, f32, f32); -void func_EBFBE0_8019882C(s32, s32, f32, f32); -void func_EBFBE0_8019896C(s32, f32, s32); -void func_EBFBE0_80199198(f32 arg0, f32 arg1, f32 arg2); -s32 func_EBFBE0_80199284(s32 arg0, s32 arg1); +void func_menu_8019752C(void); +void func_menu_80197914(void); +void func_menu_80197A3C(s32, s32, s32); +void func_menu_80197D30(s32, s32, s32); +void func_menu_80197DE4(s32, s32, s32); +void func_menu_80197F74(s32, s32, s32); +void func_menu_80198164(s32, f32, f32); +void func_menu_801982B0(s32, s32, f32, f32, s32); +void func_menu_801984D0(s32, s32, f32, f32); +void func_menu_80198608(s32, s32, f32, f32); +void func_menu_8019882C(s32, s32, f32, f32); +void func_menu_8019896C(s32, f32, s32); +void func_menu_80199198(f32 arg0, f32 arg1, f32 arg2); +s32 func_menu_80199284(s32 arg0, s32 arg1); void Option_VersusMenuInit(void); void Option_VersusMenuUpdate(void); -void func_EBFBE0_8019949C(void); +void func_menu_8019949C(void); void Option_VersusMenuDraw(void); -void func_EBFBE0_80199820(s32); -void func_EBFBE0_80199EA8(void); +void func_menu_80199820(s32); +void func_menu_80199EA8(void); void Option_VersusStageInit(void); -void func_EBFBE0_8019A080(void); +void func_menu_8019A080(void); void Option_VersusStageUpdate(void); -void func_EBFBE0_8019A124(void); -void func_EBFBE0_8019A1A8(void); -void func_EBFBE0_8019A214(void); -void func_EBFBE0_8019A298(void); -void func_EBFBE0_8019A2E0(void); -void func_EBFBE0_8019A4DC(void); -void func_EBFBE0_8019A6DC(void); -void func_EBFBE0_8019A954(void); +void func_menu_8019A124(void); +void func_menu_8019A1A8(void); +void func_menu_8019A214(void); +void func_menu_8019A298(void); +void func_menu_8019A2E0(void); +void func_menu_8019A4DC(void); +void func_menu_8019A6DC(void); +void func_menu_8019A954(void); void Option_VersusStageDraw(void); -void func_EBFBE0_8019AB30(void); -void func_EBFBE0_8019AD84(void); -void func_EBFBE0_8019AFFC(void); -void func_EBFBE0_8019B1F8(void); -void func_EBFBE0_8019B3DC(void); -void func_EBFBE0_8019B5AC(void); -void func_EBFBE0_8019B7D4(void); -void func_EBFBE0_8019B8A0(s32 arg0); -void func_EBFBE0_8019B8C8(void); +void func_menu_8019AB30(void); +void func_menu_8019AD84(void); +void func_menu_8019AFFC(void); +void func_menu_8019B1F8(void); +void func_menu_8019B3DC(void); +void func_menu_8019B5AC(void); +void func_menu_8019B7D4(void); +void func_menu_8019B8A0(s32 arg0); +void func_menu_8019B8C8(void); void Option_DrawMenuLabel(void); -void func_EBFBE0_8019BDF0(void); +void func_menu_8019BDF0(void); void Option_DrawMenuCard(MenuContext_38 arg0); void Option_DrawMenuArwing(ArwingPosition arg0); -void func_EBFBE0_8019BC44(f32, f32, f32, f32, f32, f32); -void func_EBFBE0_8019BE7C(f32, f32, f32, f32 *, f32 *, f32 *); -void func_EBFBE0_8019BF34(void); -void func_EBFBE0_8019B6D8(f32 xPos, f32 yPos, f32 offset, s32 r, s32 g, s32 b); -void func_EBFBE0_8019C04C(void); +void func_menu_8019BC44(f32, f32, f32, f32, f32, f32); +void func_menu_8019BE7C(f32, f32, f32, f32 *, f32 *, f32 *); +void func_menu_8019BF34(void); +void func_menu_8019B6D8(f32 xPos, f32 yPos, f32 offset, s32 r, s32 g, s32 b); +void func_menu_8019C04C(void); void Option_DrawCardLabel(OptionTexture arg0); -s32 func_EBFBE0_8019C418(s32* arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, UnkStruct_D_EBFBE0_801B9250* arg8); -void func_EBFBE0_8019C824(f32* ); -s32 func_EBFBE0_8019C8C4(void); -void func_EBFBE0_8019CAE0(void); -void func_EBFBE0_8019CBC0(void); -void func_EBFBE0_8019CD54(void); -void func_EBFBE0_8019D118(void); -void func_EBFBE0_8019D624(void); -void func_EBFBE0_8019DB20(s32, f32, f32, f32, f32, f32, f32, f32); -s32 func_EBFBE0_8019DCE8(s32 arg0); -void func_EBFBE0_8019DD44(void); -void func_EBFBE0_8019DE74(void); -void func_EBFBE0_8019DF64(void); +s32 func_menu_8019C418(s32* arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, UnkStruct_D_menu_801B9250* arg8); +void func_menu_8019C824(f32* ); +s32 func_menu_8019C8C4(void); +void func_menu_8019CAE0(void); +void func_menu_8019CBC0(void); +void func_menu_8019CD54(void); +void func_menu_8019D118(void); +void func_menu_8019D624(void); +void func_menu_8019DB20(s32, f32, f32, f32, f32, f32, f32, f32); +s32 func_menu_8019DCE8(s32 arg0); +void func_menu_8019DD44(void); +void func_menu_8019DE74(void); +void func_menu_8019DF64(void); void Option_InvoiceUpdate(void); void Option_InvoiceDraw(void); -void func_EBFBE0_801906A0(void); -void func_EBFBE0_80190C9C(void); -void func_EBFBE0_80190E64(void); -void func_EBFBE0_801918FC(void); -void func_EBFBE0_8019111C(void); -void func_EBFBE0_80191674(f32, f32, f32, f32*, f32*, f32*); -s32 func_EBFBE0_8019C5A0(s32*); -s32 func_EBFBE0_8019C66C(f32* arg0, f32 arg1, f32 arg2, UnkStruct_D_EBFBE0_801B9250* arg3); -void func_EBFBE0_8019E8D0(void); -void func_EBFBE0_801A07E8(u8*, u8*, f32*); -void func_EBFBE0_801AD7EC(s32, s32, s32); -void func_EBFBE0_801A9FD4(s32); +void func_menu_801906A0(void); +void func_menu_80190C9C(void); +void func_menu_80190E64(void); +void func_menu_801918FC(void); +void func_menu_8019111C(void); +void func_menu_80191674(f32, f32, f32, f32*, f32*, f32*); +s32 func_menu_8019C5A0(s32*); +s32 func_menu_8019C66C(f32* arg0, f32 arg1, f32 arg2, UnkStruct_D_menu_801B9250* arg3); +void func_menu_8019E8D0(void); +void func_menu_801A07E8(u8*, u8*, f32*); +void func_menu_801AD7EC(s32, s32, s32); +void func_menu_801A9FD4(s32); #endif diff --git a/include/functions.h b/include/functions.h index 8831b110..21ba649e 100644 --- a/include/functions.h +++ b/include/functions.h @@ -583,31 +583,31 @@ s32 Save_Read(void); void func_EFFA40_80187520(s32, void*); -void func_DF4260_80187520(s32, void*); -void func_DF4260_80187530(Object_80*); -void func_DF4260_8018753C(Object_80*); -void func_DF4260_801878D8(Boss *); -void func_DF4260_8018B0B4(Actor *); -void func_DF4260_8018BE7C(Boss *); -void func_DF4260_8018ED78(Boss*); -void func_DF4260_801924A8(Object_80* ); -void func_DF4260_8019250C(Actor *); -void func_DF4260_80192CB0(Actor *); -void func_DF4260_80192EA4(Actor *); -void func_DF4260_801933B4(Actor *); -void func_DF4260_801935CC(Boss *); -void func_DF4260_80198310(Boss *); -void func_DF4260_80198594(Boss *); -void func_DF4260_801988E0(void); -void func_DF4260_80198C50(void); -void func_DF4260_8019949C(void); -void func_DF4260_8019864C(PlayerShot*); +void func_i1_80187520(s32, void*); +void func_i1_80187530(Object_80*); +void func_i1_8018753C(Object_80*); +void func_i1_801878D8(Boss *); +void func_i1_8018B0B4(Actor *); +void func_i1_8018BE7C(Boss *); +void func_i1_8018ED78(Boss*); +void func_i1_801924A8(Object_80* ); +void func_i1_8019250C(Actor *); +void func_i1_80192CB0(Actor *); +void func_i1_80192EA4(Actor *); +void func_i1_801933B4(Actor *); +void func_i1_801935CC(Boss *); +void func_i1_80198310(Boss *); +void func_i1_80198594(Boss *); +void func_i1_801988E0(void); +void func_i1_80198C50(void); +void func_i1_8019949C(void); +void func_i1_8019864C(PlayerShot*); -void func_E08400_80187520(s32, void*); -void func_E08400_80187B08(Actor *); -void func_E08400_80188A40(Boss *); -void func_E08400_8018CCF8(Actor *); +void func_i2_80187520(s32, void*); +void func_i2_80187B08(Actor *); +void func_i2_80188A40(Boss *); +void func_i2_8018CCF8(Actor *); void func_i3_80187520(s32, void*); void func_i3_80187754(Boss *); @@ -743,59 +743,59 @@ void func_i3_801BEC74(Actor*); void func_i3_801BEC80(Player*); -void func_E51970_80187520(s32, void*); -void func_E51970_80187960(Actor*); -void func_E51970_8018BA2C(Object_58**); -void func_E51970_8018C158(Actor*); -void func_E51970_80191ED8(Object_58**); -void func_E51970_80192264(void); -void func_E51970_80193CA4(Boss *); -void func_E51970_80198594(Actor*); -void func_E51970_80198930(Object_58**); -void func_E51970_80199900(Actor *, s32); -void func_E51970_80199C60(Actor*); -void func_E51970_8019AB8C(Actor*); -void func_E51970_8019EA68(Object_58**); +void func_i4_80187520(u32, void*); +void func_i4_80187960(Actor*); +void func_i4_8018BA2C(Object_58**); +void func_i4_8018C158(Actor*); +void func_i4_80191ED8(Object_58**); +void func_i4_80192264(void); +void func_i4_80193CA4(Boss *); +void func_i4_80198594(Actor*); +void func_i4_80198930(Object_58**); +void func_i4_80199900(Actor *, s32); +void func_i4_80199C60(Actor*); +void func_i4_8019AB8C(Actor*); +void func_i4_8019EA68(Object_58**); -void func_E6A810_80187520(s32, void*); -void func_E6A810_8018769C(Player *); -void func_E6A810_80188F30(void); -void func_E6A810_80189B80(Actor *); -void func_E6A810_8018ADC4(Actor *); -void func_E6A810_8018B720(Actor *); -void func_E6A810_8018B96C(Actor *); -void func_E6A810_8018BFB0(Actor *); -void func_E6A810_8018E3B0(Actor *); -void func_E6A810_8018E3CC(Actor *); -void func_E6A810_8018E5E8(Actor *); -void func_E6A810_8018EFF0(Object_4C *); -void func_E6A810_8018F0D8(Object_80 *); -void func_E6A810_8018FA48(Boss *); -void func_E6A810_801990DC(Boss *); -void func_E6A810_80199920(void); -void func_E6A810_80199F8C(Actor *); -void func_E6A810_801A3E70(Actor *); -void func_E6A810_801A4660(Actor *); -void func_E6A810_801A4AF8(Actor *); -void func_E6A810_801A5E2C(Actor *); -void func_E6A810_801A6134(Actor *); -void func_E6A810_801A65E0(Object_80 *); -void func_E6A810_801A7D98(Actor *); -void func_E6A810_801ACFBC(ObjectInit*); -void func_E6A810_801AD080(void); -void func_E6A810_801B5110(f32, f32, f32); -void func_E6A810_801B58AC(Gfx **, f32); -bool func_E6A810_801B6AEC(f32, f32, f32); -void func_E6A810_801B6E20(f32, f32, f32 *, f32 *, f32 *); -void func_E6A810_801AD144(PlayerShot*); -void func_E6A810_80189120(f32 x, f32 y, f32 z, f32, f32); -bool func_E6A810_801A3C20(f32); -s32 func_E6A810_801A3300(Player*, f32, f32); -s32 func_E6A810_801A3790(Player*, f32, f32); +void func_i5_80187520(u32 mode, void* ptr); +void func_i5_8018769C(Player *); +void func_i5_80188F30(void); +void func_i5_80189B80(Actor *); +void func_i5_8018ADC4(Actor *); +void func_i5_8018B720(Actor *); +void func_i5_8018B96C(Actor *); +void func_i5_8018BFB0(Actor *); +void func_i5_8018E3B0(Actor *); +void func_i5_8018E3CC(Actor *); +void func_i5_8018E5E8(Actor *); +void func_i5_8018EFF0(Object_4C *); +void func_i5_8018F0D8(Object_80 *); +void func_i5_8018FA48(Boss *); +void func_i5_801990DC(Boss *); +void func_i5_80199920(void); +void func_i5_80199F8C(Actor *); +void func_i5_801A3E70(Actor *); +void func_i5_801A4660(Actor *); +void func_i5_801A4AF8(Actor *); +void func_i5_801A5E2C(Actor *); +void func_i5_801A6134(Actor *); +void func_i5_801A65E0(Object_80 *); +void func_i5_801A7D98(Actor *); +void func_i5_801ACFBC(ObjectInit*); +void func_i5_801AD080(void); +void func_i5_801B5110(f32, f32, f32); +void func_i5_801B58AC(Gfx **, f32); +bool func_i5_801B6AEC(f32, f32, f32); +void func_i5_801B6E20(f32, f32, f32 *, f32 *, f32 *); +void func_i5_801AD144(PlayerShot*); +void func_i5_80189120(f32 x, f32 y, f32 z, f32, f32); +bool func_i5_801A3C20(f32); +s32 func_i5_801A3300(Player*, f32, f32); +s32 func_i5_801A3790(Player*, f32, f32); void func_E9F1D0_8018769C(Actor*); -void func_E9F1D0_80187520(s32, void*); +void func_E9F1D0_80187520(u32 mode, void* ptr); void func_E9F1D0_801878A8(Object_58**); void func_E9F1D0_801888F4(Actor *); void func_E9F1D0_80189214(void); @@ -812,157 +812,157 @@ void func_E9F1D0_801A5AD4(Player*); void func_E9F1D0_801A5FC0(Player*); void func_E9F1D0_801A6164(Player *); -void func_EBFBE0_80187520(s32, void*); +void func_menu_80187520(u32, void*); void func_EF0260_8018A96C(void); void func_EF0260_8018AAC4(void); -// void func_DF4260_801875A4(Object*); -// void func_DF4260_80189058(Object*); -// void func_DF4260_8018AA74(Object*); -// void func_DF4260_8018AED0(Object*); -// void func_DF4260_8018B15C(Object*); -// void func_DF4260_8018B418(Object*); -// void func_DF4260_8018B58C(Object*); -// void func_DF4260_8018BAAC(Object*); -// void func_DF4260_8018BBA4(Object*); -// void func_DF4260_8018BBF8(Object*); -// void func_DF4260_8018BD7C(Object*); -// void func_DF4260_8018C19C(Object*); -// void func_DF4260_8018DDAC(Object*); -// void func_DF4260_8018E290(Object*); -// void func_DF4260_8018E76C(Object*); -// void func_DF4260_8018ECAC(Object*); -// void func_DF4260_8018ED78(Object*); -// void func_DF4260_8018EE84(Object*); -// void func_DF4260_8018EF90(Object*); -// void func_DF4260_8018F044(Object*); -// void func_DF4260_8018F31C(Object*); -// void func_DF4260_801922DC(Object*); -// void func_DF4260_80192358(Object*); -// void func_DF4260_801923C0(Object*); -// void func_DF4260_8019243C(Object*); -// void func_DF4260_80192518(Object*); -// void func_DF4260_80192CD4(Object*); -// void func_DF4260_80192E2C(Object*); -// void func_DF4260_80192EB0(Object*); -// void func_DF4260_801933DC(Object*); -// void func_DF4260_801934D0(Object*); -// void func_DF4260_80193540(Object*); -// void func_DF4260_80194398(Object*); -// void func_DF4260_801985E4(Object*); -// void func_DF4260_80198968(Object*); -// void func_E08400_8018756C(Object*); -// void func_E08400_80187650(Object*); -// void func_E08400_801877C4(Object*); -// void func_E08400_8018795C(Object*); -// void func_E08400_80188344(Object*); -// void func_E08400_801887D0(Object*); -// void func_E08400_80188CAC(Object*); -// void func_E08400_80188FAC(Object*); -// void func_E08400_80189114(Object*); -// void func_E08400_8018978C(Object*); -// void func_E08400_8018BACC(Object*); -// void func_E08400_8018D9EC(Object*); -// void func_E08400_8018DA6C(Object*); -// void func_E08400_8018DAEC(Object*); -// void func_E08400_8018DB6C(Object*); -// void func_E08400_8018DBEC(Object*); -// void func_E08400_8018DCE4(Object*); -// void func_E08400_8018DE14(Object*); -// void func_E08400_8018F330(Object*); -// void func_E08400_8018F884(Object*); -// void func_E08400_8018FE38(Object*); -// void func_E08400_8018FF20(Object*); -// void func_E08400_8018FF84(Object*); -// void func_E08400_80190020(Object*); -// void func_E08400_80190078(Object*); -// void func_E08400_80193434(Object*); -// void func_E51970_80188AD0(Object*); -// void func_E51970_80188FE4(Object*); -// void func_E51970_80191054(Object*); -// void func_E51970_80191180(Object*); -// void func_E51970_801912FC(Object*); -// void func_E51970_80191AFC(Object*); -// void func_E51970_80192984(Object*); -// void func_E51970_80192A68(Object*); -// void func_E51970_80193718(Object*); -// void func_E51970_80193B1C(Object*); -// void func_E51970_801946C4(Object*); -// void func_E51970_801968F4(Object*); -// void func_E51970_8019E234(Object*); -// void func_E51970_8019E3A8(Object*); -// void func_E51970_8019E454(Object*); -// void func_E51970_8019E98C(Object*); -// void func_E6A810_80188F60(Object*); -// void func_E6A810_80188FA8(Object*); -// void func_E6A810_80189194(Object*); -// void func_E6A810_801895B8(Object*); -// void func_E6A810_80189AFC(Object*); -// void func_E6A810_80189CC8(Object*); -// void func_E6A810_8018A1C0(Object*); -// void func_E6A810_8018A544(Object*); -// void func_E6A810_8018AABC(Object*); -// void func_E6A810_8018AB44(Object*); -// void func_E6A810_8018B268(Object*); -// void func_E6A810_8018B6AC(Object*); -// void func_E6A810_8018B9D0(Object*); -// void func_E6A810_8018BE84(Object*); -// void func_E6A810_8018C8A8(Object*); -// void func_E6A810_8018E2D8(Object*); -// void func_E6A810_8018E54C(Object*); -// void func_E6A810_8018E5B4(Object*); -// void func_E6A810_8018E5F8(Object*); -// void func_E6A810_8018EF14(Object*); -// void func_E6A810_8018F038(Object*); -// void func_E6A810_8018F4D8(Object*); -// void func_E6A810_8018F8B8(Object*); -// void func_E6A810_80197A94(Object*); -// void func_E6A810_801982A8(Object*); -// void func_E6A810_8019C778(Object*); -// void func_E6A810_8019CE88(Object*); -// void func_E6A810_8019D700(Object*); -// void func_E6A810_8019E410(Object*); -// void func_E6A810_8019EA60(Object*); -// void func_E6A810_8019EE68(Object*); -// void func_E6A810_8019FF9C(Object*); -// void func_E6A810_801A0BD8(Object*); -// void func_E6A810_801A12C4(Object*); -// void func_E6A810_801A23AC(Object*); -// void func_E6A810_801A2A78(Object*); -// void func_E6A810_801A2B24(Object*); -// void func_E6A810_801A2DD8(Object*); -// void func_E6A810_801A3240(Object*); -// void func_E6A810_801A3E98(Object*); -// void func_E6A810_801A43BC(Object*); -// void func_E6A810_801A46A0(Object*); -// void func_E6A810_801A4A64(Object*); -// void func_E6A810_801A4B24(Object*); -// void func_E6A810_801A54E8(Object*); -// void func_E6A810_801A57D0(Object*); -// void func_E6A810_801A5AF0(Object*); -// void func_E6A810_801A5B4C(Object*); -// void func_E6A810_801A5D68(Object*); -// void func_E6A810_801A5E54(Object*); -// void func_E6A810_801A5F90(Object*); -// void func_E6A810_801A5FD0(Object*); -// void func_E6A810_801A6100(Object*); -// void func_E6A810_801A6144(Object*); -// void func_E6A810_801A6540(Object*); -// void func_E6A810_801A6608(Object*); -// void func_E6A810_801A67C8(Object*); -// void func_E6A810_801A68EC(Object*); -// void func_E6A810_801A7E7C(Object*); -// void func_E6A810_801AC294(Object*); -// void func_E6A810_801AC438(Object*); -// void func_E6A810_801AD6F0(Object*); -// void func_E6A810_801ADAC8(Object*); -// void func_E6A810_801ADD68(Object*); -// void func_E6A810_801AE2C0(Object*); -// void func_E6A810_801AE87C(Object*); -// void func_E6A810_801AEAA0(Object*); -// void func_E6A810_801AEC04(Object*); -// void func_E6A810_801AEEFC(Object*); +// void func_i1_801875A4(Object*); +// void func_i1_80189058(Object*); +// void func_i1_8018AA74(Object*); +// void func_i1_8018AED0(Object*); +// void func_i1_8018B15C(Object*); +// void func_i1_8018B418(Object*); +// void func_i1_8018B58C(Object*); +// void func_i1_8018BAAC(Object*); +// void func_i1_8018BBA4(Object*); +// void func_i1_8018BBF8(Object*); +// void func_i1_8018BD7C(Object*); +// void func_i1_8018C19C(Object*); +// void func_i1_8018DDAC(Object*); +// void func_i1_8018E290(Object*); +// void func_i1_8018E76C(Object*); +// void func_i1_8018ECAC(Object*); +// void func_i1_8018ED78(Object*); +// void func_i1_8018EE84(Object*); +// void func_i1_8018EF90(Object*); +// void func_i1_8018F044(Object*); +// void func_i1_8018F31C(Object*); +// void func_i1_801922DC(Object*); +// void func_i1_80192358(Object*); +// void func_i1_801923C0(Object*); +// void func_i1_8019243C(Object*); +// void func_i1_80192518(Object*); +// void func_i1_80192CD4(Object*); +// void func_i1_80192E2C(Object*); +// void func_i1_80192EB0(Object*); +// void func_i1_801933DC(Object*); +// void func_i1_801934D0(Object*); +// void func_i1_80193540(Object*); +// void func_i1_80194398(Object*); +// void func_i1_801985E4(Object*); +// void func_i1_80198968(Object*); +// void func_i2_8018756C(Object*); +// void func_i2_80187650(Object*); +// void func_i2_801877C4(Object*); +// void func_i2_8018795C(Object*); +// void func_i2_80188344(Object*); +// void func_i2_801887D0(Object*); +// void func_i2_80188CAC(Object*); +// void func_i2_80188FAC(Object*); +// void func_i2_80189114(Object*); +// void func_i2_8018978C(Object*); +// void func_i2_8018BACC(Object*); +// void func_i2_8018D9EC(Object*); +// void func_i2_8018DA6C(Object*); +// void func_i2_8018DAEC(Object*); +// void func_i2_8018DB6C(Object*); +// void func_i2_8018DBEC(Object*); +// void func_i2_8018DCE4(Object*); +// void func_i2_8018DE14(Object*); +// void func_i2_8018F330(Object*); +// void func_i2_8018F884(Object*); +// void func_i2_8018FE38(Object*); +// void func_i2_8018FF20(Object*); +// void func_i2_8018FF84(Object*); +// void func_i2_80190020(Object*); +// void func_i2_80190078(Object*); +// void func_i2_80193434(Object*); +// void func_i4_80188AD0(Object*); +// void func_i4_80188FE4(Object*); +// void func_i4_80191054(Object*); +// void func_i4_80191180(Object*); +// void func_i4_801912FC(Object*); +// void func_i4_80191AFC(Object*); +// void func_i4_80192984(Object*); +// void func_i4_80192A68(Object*); +// void func_i4_80193718(Object*); +// void func_i4_80193B1C(Object*); +// void func_i4_801946C4(Object*); +// void func_i4_801968F4(Object*); +// void func_i4_8019E234(Object*); +// void func_i4_8019E3A8(Object*); +// void func_i4_8019E454(Object*); +// void func_i4_8019E98C(Object*); +// void func_i5_80188F60(Object*); +// void func_i5_80188FA8(Object*); +// void func_i5_80189194(Object*); +// void func_i5_801895B8(Object*); +// void func_i5_80189AFC(Object*); +// void func_i5_80189CC8(Object*); +// void func_i5_8018A1C0(Object*); +// void func_i5_8018A544(Object*); +// void func_i5_8018AABC(Object*); +// void func_i5_8018AB44(Object*); +// void func_i5_8018B268(Object*); +// void func_i5_8018B6AC(Object*); +// void func_i5_8018B9D0(Object*); +// void func_i5_8018BE84(Object*); +// void func_i5_8018C8A8(Object*); +// void func_i5_8018E2D8(Object*); +// void func_i5_8018E54C(Object*); +// void func_i5_8018E5B4(Object*); +// void func_i5_8018E5F8(Object*); +// void func_i5_8018EF14(Object*); +// void func_i5_8018F038(Object*); +// void func_i5_8018F4D8(Object*); +// void func_i5_8018F8B8(Object*); +// void func_i5_80197A94(Object*); +// void func_i5_801982A8(Object*); +// void func_i5_8019C778(Object*); +// void func_i5_8019CE88(Object*); +// void func_i5_8019D700(Object*); +// void func_i5_8019E410(Object*); +// void func_i5_8019EA60(Object*); +// void func_i5_8019EE68(Object*); +// void func_i5_8019FF9C(Object*); +// void func_i5_801A0BD8(Object*); +// void func_i5_801A12C4(Object*); +// void func_i5_801A23AC(Object*); +// void func_i5_801A2A78(Object*); +// void func_i5_801A2B24(Object*); +// void func_i5_801A2DD8(Object*); +// void func_i5_801A3240(Object*); +// void func_i5_801A3E98(Object*); +// void func_i5_801A43BC(Object*); +// void func_i5_801A46A0(Object*); +// void func_i5_801A4A64(Object*); +// void func_i5_801A4B24(Object*); +// void func_i5_801A54E8(Object*); +// void func_i5_801A57D0(Object*); +// void func_i5_801A5AF0(Object*); +// void func_i5_801A5B4C(Object*); +// void func_i5_801A5D68(Object*); +// void func_i5_801A5E54(Object*); +// void func_i5_801A5F90(Object*); +// void func_i5_801A5FD0(Object*); +// void func_i5_801A6100(Object*); +// void func_i5_801A6144(Object*); +// void func_i5_801A6540(Object*); +// void func_i5_801A6608(Object*); +// void func_i5_801A67C8(Object*); +// void func_i5_801A68EC(Object*); +// void func_i5_801A7E7C(Object*); +// void func_i5_801AC294(Object*); +// void func_i5_801AC438(Object*); +// void func_i5_801AD6F0(Object*); +// void func_i5_801ADAC8(Object*); +// void func_i5_801ADD68(Object*); +// void func_i5_801AE2C0(Object*); +// void func_i5_801AE87C(Object*); +// void func_i5_801AEAA0(Object*); +// void func_i5_801AEC04(Object*); +// void func_i5_801AEEFC(Object*); // void func_E9F1D0_801880E4(Object*); // void func_E9F1D0_80188448(Object*); // void func_E9F1D0_80188528(Object*); diff --git a/include/sf64dma.h b/include/sf64dma.h index f92217ad..37dbc75b 100644 --- a/include/sf64dma.h +++ b/include/sf64dma.h @@ -94,31 +94,31 @@ extern DmaEntry gDmaTable[]; // 178A70 extern OverlayInit sNoOvl_Logo[1]; // sets segment 15 with no overlay extern OverlayInit sOvlEF0260_Credits[6]; // overlay EF0260 -extern OverlayInit sOvlEBFBE0_Title[1]; // EBFBE0 -extern OverlayInit sOvlEBFBE0_Menu[1]; // EBFBE0 -extern OverlayInit sOvlEBFBE0_Map[1]; // EBFBE0 -extern OverlayInit sOvlEBFBE0_State5[1]; // EBFBE0 -extern OverlayInit sOvlDF4260_Corneria[1]; // DF4260 -extern OverlayInit sOvlE08400_Meteo[2]; // E08400 -extern OverlayInit sOvlE6A810_Titania[6]; // E6A810 -extern OverlayInit sOvlE08400_SectorX[2]; // E08400 -extern OverlayInit sOvlE51970_SectorZ[1]; // E51970 +extern OverlayInit sOvlmenu_Title[1]; // EBFBE0 +extern OverlayInit sOvlmenu_Menu[1]; // EBFBE0 +extern OverlayInit sOvlmenu_Map[1]; // EBFBE0 +extern OverlayInit sOvlmenu_State5[1]; // EBFBE0 +extern OverlayInit sOvli1_Corneria[1]; // fox_i1 +extern OverlayInit sOvli2_Meteo[2]; // fox_i2 +extern OverlayInit sOvli5_Titania[6]; // E6A810 +extern OverlayInit sOvli2_SectorX[2]; // fox_i2 +extern OverlayInit sOvli4_SectorZ[1]; // i4 extern OverlayInit sOvli3_Aquas[1]; // i3 extern OverlayInit sOvli3_Area6[1]; // i3 -extern OverlayInit sOvlE51970_Fortuna[2]; // E51970 +extern OverlayInit sOvli4_Fortuna[2]; // i4 extern OverlayInit sOvli3_Unk4[1]; // i3 extern OverlayInit sOvlE9F1D0_SectorY[1]; // E9F1D0 extern OverlayInit sOvli3_Solar[1]; // i3 extern OverlayInit sOvli3_Zoness[1]; // i3 -extern OverlayInit sOvlDF4260_Venom1[1]; // DF4260 +extern OverlayInit sOvli1_Venom1[1]; // fox_i1 extern OverlayInit sOvlE9F1D0_Venom2[1]; // E9F1D0 extern OverlayInit sOvlE9F1D0_VenomSW[2]; // E9F1D0 -extern OverlayInit sOvlE08400_Setup20[1]; // E08400 -extern OverlayInit sOvlE51970_Bolse[1]; // E51970 -extern OverlayInit sOvlE51970_Katina[1]; // E51970 -extern OverlayInit sOvlE6A810_Macbeth[2]; // E6A810 -extern OverlayInit sOvlDF4260_Training[1]; // DF4260 -extern OverlayInit sOvlE08400_Versus[2]; // E08400 +extern OverlayInit sOvli2_Setup20[1]; // fox_i2 +extern OverlayInit sOvli4_Bolse[1]; // i4 +extern OverlayInit sOvli4_Katina[1]; // i4 +extern OverlayInit sOvli5_Macbeth[2]; // E6A810 +extern OverlayInit sOvli1_Training[1]; // fox_i1 +extern OverlayInit sOvli2_Versus[2]; // fox_i2 extern OverlayInit sEFFA40_Overlay[1]; // EFFA40 DECLARE_SEGMENT(makerom); @@ -176,14 +176,14 @@ DECLARE_SEGMENT(ast_D68480); DECLARE_SEGMENT(ast_D91F10); DECLARE_SEGMENT(ast_DDC010); DECLARE_SEGMENT(ast_DE5D50); -DECLARE_SEGMENT(ovl_DF4260); -DECLARE_SEGMENT(ovl_E08400); +DECLARE_SEGMENT(ovl_i1); +DECLARE_SEGMENT(ovl_i2); DECLARE_SEGMENT(ovl_i3); -DECLARE_SEGMENT(ovl_E51970); -DECLARE_SEGMENT(ovl_E6A810); -DECLARE_SEGMENT(ovl_E9F1D0); +DECLARE_SEGMENT(ovl_i4); +DECLARE_SEGMENT(ovl_i5); +DECLARE_SEGMENT(ovl_i6); DECLARE_SEGMENT(ovl_menu); -DECLARE_SEGMENT(ovl_EF0260); -DECLARE_SEGMENT(ovl_EFFA40); +DECLARE_SEGMENT(ovl_ending); +DECLARE_SEGMENT(ovl_unused); #endif diff --git a/include/structs.h b/include/structs.h index f006c290..65c270d3 100644 --- a/include/structs.h +++ b/include/structs.h @@ -93,7 +93,7 @@ typedef struct { /* 0x0C */ f32 unk_0C; /* 0x10 */ f32 unk_10; /* 0x14 */ f32 unk_14; -} UnkStruct_D_EBFBE0_801B8294; // size = 0x18 +} UnkStruct_D_menu_801B8294; // size = 0x18 typedef enum OptionState { OPTION_WAIT, diff --git a/include/variables.h b/include/variables.h index 14f8d7ec..d5a0dbcb 100644 --- a/include/variables.h +++ b/include/variables.h @@ -840,25 +840,25 @@ extern f32 gHeadsetPanVolume[]; extern f32 gStereoPanVolume[]; extern f32 gDefaultPanVolume[]; -// ovl_DF4260 -extern Gfx* D_DF4260_8019A008[]; -extern f32 D_DF4260_8019A9B8[]; +// ovl_i1 +extern Gfx* D_i1_8019A008[]; +extern f32 D_i1_8019A9B8[]; // ovl_i3 // extern f32 D_i3_801C4188; Currently externed in relevant files for bss ordering -// ovl_E51970 -extern Matrix D_E51970_8019EE80; -extern s32 D_E51970_801A03DC; +// ovl_i4 +extern Matrix D_i4_8019EE80; +extern s32 D_i4_801A03DC; -// ovl_E6A810 -extern Gfx* D_E6A810_801B7584[]; -extern Gfx* D_E6A810_801B7608[]; -extern Gfx* D_E6A810_801B769C[]; -extern f32 D_E6A810_801B83A8[]; -extern u8 D_E6A810_801BA1E8; +// ovl_i5 +extern Gfx* D_i5_801B7584[]; +extern Gfx* D_i5_801B7608[]; +extern Gfx* D_i5_801B769C[]; +extern f32 D_i5_801B83A8[]; +extern u8 D_i5_801BA1E8; -// ovl_E9F1D0 +// ovl_i6 extern f32 D_E9F1D0_801A7F58; extern f32 D_E9F1D0_801A7F60; extern f32 D_E9F1D0_801A7F68; @@ -866,11 +866,11 @@ extern f32 D_E9F1D0_801A7F70; extern f32 D_E9F1D0_801A7F78; // ovl_menu -extern s32 D_EBFBE0_801B8220[]; // total hits ranking? see func_EBFBE0_80197DE4 -extern s32 D_EBFBE0_801B8280; -extern s32 D_EBFBE0_801B8284; -extern s32 D_EBFBE0_801B827C; -extern s32 D_EBFBE0_801B8288; +extern s32 D_menu_801B8220[]; // total hits ranking? see func_menu_80197DE4 +extern s32 D_menu_801B8280; +extern s32 D_menu_801B8284; +extern s32 D_menu_801B827C; +extern s32 D_menu_801B8288; // buffers extern u64 gDramStack[SP_DRAM_STACK_SIZE64]; diff --git a/linker_scripts/us/symbol_addrs.txt b/linker_scripts/us/symbol_addrs.txt index f8a9db31..2fc0afd4 100644 --- a/linker_scripts/us/symbol_addrs.txt +++ b/linker_scripts/us/symbol_addrs.txt @@ -90,18 +90,18 @@ D_800D8570 = 0x800D8570; // force_migration:True D_800D8594 = 0x800D8594; // force_migration:True D_800C93EC = 0x800C93EC; // force_migration:True -D_DF4260_8019B1EC = 0x8019B1EC; // force_migration:True segment:ovl_DF4260 -D_DF4260_8019B6D8 = 0x8019B6D8; // size:0x110 segment:ovl_DF4260 +D_i1_8019B1EC = 0x8019B1EC; // force_migration:True segment:ovl_i1 +D_i1_8019B6D8 = 0x8019B6D8; // size:0x110 segment:ovl_i1 D_i3_801C171C = 0x801C171C; // force_migration:True segment:ovl_i3 D_i3_801C1728 = 0x801C1728; // force_migration:True segment:ovl_i3 D_i3_801C1730 = 0x801C1730; // force_migration:True segment:ovl_i3 D_i3_801C1758 = 0x801C1758; // force_migration:True segment:ovl_i3 -D_E6A810_801BB83C = 0x801BB83C; // force_migration:True segment:ovl_E6A810 -D_E6A810_801BB808 = 0x801BB808; // force_migration:True segment:ovl_E6A810 -D_E6A810_801BBAD0 = 0x801BBAD0; // force_migration:True segment:ovl_E6A810 -D_E6A810_801BBAE4 = 0x801BBAE4; // force_migration:True segment:ovl_E6A810 -D_EF0260_80196BF4 = 0x80196BF4; // force_migration:True segment:ovl_EF0260 -D_E51970_8019FE74 = 0x8019FE74; // force_migration:True segment:ovl_E51970 -D_E51970_8019FEFC = 0x8019FEFC; // force_migration:True segment:ovl_E51970 -D_E9F1D0_801A7560 = 0x801A7560; // force_migration:True segment:ovl_E9F1D0 -D_E9F1D0_801A792C = 0x801A792C; // force_migration:True segment:ovl_E9F1D0 \ No newline at end of file +D_i5_801BB83C = 0x801BB83C; // force_migration:True segment:ovl_i5 +D_i5_801BB808 = 0x801BB808; // force_migration:True segment:ovl_i5 +D_i5_801BBAD0 = 0x801BBAD0; // force_migration:True segment:ovl_i5 +D_i5_801BBAE4 = 0x801BBAE4; // force_migration:True segment:ovl_i5 +D_EF0260_80196BF4 = 0x80196BF4; // force_migration:True segment:ovl_ending +D_ovl_i4_8019FE74 = 0x8019FE74; // force_migration:True segment:ovl_i4 +D_ovl_i4_8019FEFC = 0x8019FEFC; // force_migration:True segment:ovl_i4 +D_E9F1D0_801A7560 = 0x801A7560; // force_migration:True segment:ovl_i6 +D_E9F1D0_801A792C = 0x801A792C; // force_migration:True segment:ovl_i6 \ No newline at end of file diff --git a/linker_scripts/us/symbol_addrs_EBFBE0.txt b/linker_scripts/us/symbol_addrs_EBFBE0.txt index 466d0ce1..5972188c 100644 --- a/linker_scripts/us/symbol_addrs_EBFBE0.txt +++ b/linker_scripts/us/symbol_addrs_EBFBE0.txt @@ -4,111 +4,111 @@ planet = 0x801AF4A0; // type:Planet segment:ovl_menu size:0x38 sPlanetNames = 0x801AF9F4; // type:s32 segment:ovl_menu size:0xF GetPlanetId = 0x801A6480; // force_migration:True segment:ovl_menu sOptionCardList = 0x801AE638; // type:OptionEntry segment:ovl_menu size:0x240 -D_EBFBE0_801AE99C = 0x801AE99C; // force_migration:True segment:ovl_menu +D_menu_801AE99C = 0x801AE99C; // force_migration:True segment:ovl_menu sTimeTrialMinuteTextures = 0x801AF28C; // force_migration:True segment:ovl_menu sPlanetList = 0x801AF7E8; spectrumAnalizerMode = 0x801B9318; -D_EBFBE0_801B6E50 = 0x801B6E50; // force_migration:True segment:ovl_menu -D_EBFBE0_801B7BA0 = 0x801B7BA0; -D_EBFBE0_801B827C = 0x801B827C; -D_EBFBE0_801B9710 = 0x801B9710; -D_EBFBE0_801B9A10 = 0x801B9A10; -D_EBFBE0_801B9D10 = 0x801B9D10; -D_EBFBE0_801BA010 = 0x801BA010; -D_EBFBE0_801BA310 = 0x801BA310; -D_EBFBE0_801BA610 = 0x801BA610; -D_EBFBE0_801BA910 = 0x801BA910; -D_EBFBE0_801BAC10 = 0x801BAC10; -D_EBFBE0_801BAF10 = 0x801BAF10; -D_EBFBE0_801BB210 = 0x801BB210; -D_EBFBE0_801BB510 = 0x801BB510; -D_EBFBE0_801BBB10 = 0x801BBB10; -D_EBFBE0_801BBE10 = 0x801BBE10; -D_EBFBE0_801BC110 = 0x801BC110; -D_EBFBE0_801BC410 = 0x801BC410; -D_EBFBE0_801BC710 = 0x801BC710; -D_EBFBE0_801BCA10 = 0x801BCA10; -D_EBFBE0_801BCD10 = 0x801BCD10; -D_EBFBE0_801BD010 = 0x801BD010; -D_EBFBE0_801BD310 = 0x801BD310; -D_EBFBE0_801BD610 = 0x801BD610; -D_EBFBE0_801BD910 = 0x801BD910; -D_EBFBE0_801BDF10 = 0x801BDF10; -D_EBFBE0_801BE210 = 0x801BE210; -D_EBFBE0_801BE510 = 0x801BE510; -D_EBFBE0_801BE810 = 0x801BE810; -D_EBFBE0_801BEB10 = 0x801BEB10; -D_EBFBE0_801BEE10 = 0x801BEE10; -D_EBFBE0_801BF110 = 0x801BF110; -D_EBFBE0_801BF410 = 0x801BF410; -D_EBFBE0_801BF710 = 0x801BF710; -D_EBFBE0_801BFA10 = 0x801BFA10; -D_EBFBE0_801BFD10 = 0x801BFD10; -D_EBFBE0_801C0310 = 0x801C0310; -D_EBFBE0_801C0610 = 0x801C0610; -D_EBFBE0_801C0910 = 0x801C0910; -D_EBFBE0_801C0C10 = 0x801C0C10; -D_EBFBE0_801C0F10 = 0x801C0F10; -D_EBFBE0_801C1210 = 0x801C1210; -D_EBFBE0_801C1510 = 0x801C1510; -D_EBFBE0_801C1810 = 0x801C1810; -D_EBFBE0_801C1B10 = 0x801C1B10; -D_EBFBE0_801C1E10 = 0x801C1E10; -D_EBFBE0_801C2110 = 0x801C2110; -D_EBFBE0_801C2710 = 0x801C2710; -D_EBFBE0_801C2A10 = 0x801C2A10; -D_EBFBE0_801C2D10 = 0x801C2D10; -D_EBFBE0_801C3010 = 0x801C3010; -D_EBFBE0_801C3310 = 0x801C3310; -D_EBFBE0_801C3610 = 0x801C3610; -D_EBFBE0_801C3910 = 0x801C3910; -D_EBFBE0_801C3C10 = 0x801C3C10; -D_EBFBE0_801C3F10 = 0x801C3F10; -D_EBFBE0_801C4210 = 0x801C4210; -D_EBFBE0_801C4510 = 0x801C4510; -D_EBFBE0_801C4B10 = 0x801C4B10; -D_EBFBE0_801C4E10 = 0x801C4E10; -D_EBFBE0_801C5110 = 0x801C5110; -D_EBFBE0_801C5410 = 0x801C5410; -D_EBFBE0_801C5710 = 0x801C5710; -D_EBFBE0_801C5A10 = 0x801C5A10; -D_EBFBE0_801C5D10 = 0x801C5D10; -D_EBFBE0_801C6010 = 0x801C6010; -D_EBFBE0_801C6310 = 0x801C6310; -D_EBFBE0_801C6610 = 0x801C6610; -D_EBFBE0_801C6910 = 0x801C6910; -D_EBFBE0_801C6F10 = 0x801C6F10; -D_EBFBE0_801C7210 = 0x801C7210; -D_EBFBE0_801C7510 = 0x801C7510; -D_EBFBE0_801C7810 = 0x801C7810; -D_EBFBE0_801C7B10 = 0x801C7B10; -D_EBFBE0_801C7E10 = 0x801C7E10; -D_EBFBE0_801C8110 = 0x801C8110; -D_EBFBE0_801C8410 = 0x801C8410; -D_EBFBE0_801C8710 = 0x801C8710; -D_EBFBE0_801C8A10 = 0x801C8A10; -D_EBFBE0_801C8D10 = 0x801C8D10; -D_EBFBE0_801C9310 = 0x801C9310; -D_EBFBE0_801C9610 = 0x801C9610; -D_EBFBE0_801C9910 = 0x801C9910; -D_EBFBE0_801C9C10 = 0x801C9C10; -D_EBFBE0_801C9F10 = 0x801C9F10; -D_EBFBE0_801CA210 = 0x801CA210; -D_EBFBE0_801CA510 = 0x801CA510; -D_EBFBE0_801CA810 = 0x801CA810; -D_EBFBE0_801CAB10 = 0x801CAB10; -D_EBFBE0_801CAE10 = 0x801CAE10; -D_EBFBE0_801CB110 = 0x801CB110; -D_EBFBE0_801CB710 = 0x801CB710; -D_EBFBE0_801CBA10 = 0x801CBA10; -D_EBFBE0_801CBD10 = 0x801CBD10; -D_EBFBE0_801CC010 = 0x801CC010; -D_EBFBE0_801CC310 = 0x801CC310; -D_EBFBE0_801CC610 = 0x801CC610; -D_EBFBE0_801CC910 = 0x801CC910; -D_EBFBE0_801CCC10 = 0x801CCC10; -D_EBFBE0_801CCF10 = 0x801CCF10; -D_EBFBE0_801CD210 = 0x801CD210; -D_EBFBE0_801CD510 = 0x801CD510; +D_menu_801B6E50 = 0x801B6E50; // force_migration:True segment:ovl_menu +D_menu_801B7BA0 = 0x801B7BA0; +D_menu_801B827C = 0x801B827C; +D_menu_801B9710 = 0x801B9710; +D_menu_801B9A10 = 0x801B9A10; +D_menu_801B9D10 = 0x801B9D10; +D_menu_801BA010 = 0x801BA010; +D_menu_801BA310 = 0x801BA310; +D_menu_801BA610 = 0x801BA610; +D_menu_801BA910 = 0x801BA910; +D_menu_801BAC10 = 0x801BAC10; +D_menu_801BAF10 = 0x801BAF10; +D_menu_801BB210 = 0x801BB210; +D_menu_801BB510 = 0x801BB510; +D_menu_801BBB10 = 0x801BBB10; +D_menu_801BBE10 = 0x801BBE10; +D_menu_801BC110 = 0x801BC110; +D_menu_801BC410 = 0x801BC410; +D_menu_801BC710 = 0x801BC710; +D_menu_801BCA10 = 0x801BCA10; +D_menu_801BCD10 = 0x801BCD10; +D_menu_801BD010 = 0x801BD010; +D_menu_801BD310 = 0x801BD310; +D_menu_801BD610 = 0x801BD610; +D_menu_801BD910 = 0x801BD910; +D_menu_801BDF10 = 0x801BDF10; +D_menu_801BE210 = 0x801BE210; +D_menu_801BE510 = 0x801BE510; +D_menu_801BE810 = 0x801BE810; +D_menu_801BEB10 = 0x801BEB10; +D_menu_801BEE10 = 0x801BEE10; +D_menu_801BF110 = 0x801BF110; +D_menu_801BF410 = 0x801BF410; +D_menu_801BF710 = 0x801BF710; +D_menu_801BFA10 = 0x801BFA10; +D_menu_801BFD10 = 0x801BFD10; +D_menu_801C0310 = 0x801C0310; +D_menu_801C0610 = 0x801C0610; +D_menu_801C0910 = 0x801C0910; +D_menu_801C0C10 = 0x801C0C10; +D_menu_801C0F10 = 0x801C0F10; +D_menu_801C1210 = 0x801C1210; +D_menu_801C1510 = 0x801C1510; +D_menu_801C1810 = 0x801C1810; +D_menu_801C1B10 = 0x801C1B10; +D_menu_801C1E10 = 0x801C1E10; +D_menu_801C2110 = 0x801C2110; +D_menu_801C2710 = 0x801C2710; +D_menu_801C2A10 = 0x801C2A10; +D_menu_801C2D10 = 0x801C2D10; +D_menu_801C3010 = 0x801C3010; +D_menu_801C3310 = 0x801C3310; +D_menu_801C3610 = 0x801C3610; +D_menu_801C3910 = 0x801C3910; +D_menu_801C3C10 = 0x801C3C10; +D_menu_801C3F10 = 0x801C3F10; +D_menu_801C4210 = 0x801C4210; +D_menu_801C4510 = 0x801C4510; +D_menu_801C4B10 = 0x801C4B10; +D_menu_801C4E10 = 0x801C4E10; +D_menu_801C5110 = 0x801C5110; +D_menu_801C5410 = 0x801C5410; +D_menu_801C5710 = 0x801C5710; +D_menu_801C5A10 = 0x801C5A10; +D_menu_801C5D10 = 0x801C5D10; +D_menu_801C6010 = 0x801C6010; +D_menu_801C6310 = 0x801C6310; +D_menu_801C6610 = 0x801C6610; +D_menu_801C6910 = 0x801C6910; +D_menu_801C6F10 = 0x801C6F10; +D_menu_801C7210 = 0x801C7210; +D_menu_801C7510 = 0x801C7510; +D_menu_801C7810 = 0x801C7810; +D_menu_801C7B10 = 0x801C7B10; +D_menu_801C7E10 = 0x801C7E10; +D_menu_801C8110 = 0x801C8110; +D_menu_801C8410 = 0x801C8410; +D_menu_801C8710 = 0x801C8710; +D_menu_801C8A10 = 0x801C8A10; +D_menu_801C8D10 = 0x801C8D10; +D_menu_801C9310 = 0x801C9310; +D_menu_801C9610 = 0x801C9610; +D_menu_801C9910 = 0x801C9910; +D_menu_801C9C10 = 0x801C9C10; +D_menu_801C9F10 = 0x801C9F10; +D_menu_801CA210 = 0x801CA210; +D_menu_801CA510 = 0x801CA510; +D_menu_801CA810 = 0x801CA810; +D_menu_801CAB10 = 0x801CAB10; +D_menu_801CAE10 = 0x801CAE10; +D_menu_801CB110 = 0x801CB110; +D_menu_801CB710 = 0x801CB710; +D_menu_801CBA10 = 0x801CBA10; +D_menu_801CBD10 = 0x801CBD10; +D_menu_801CC010 = 0x801CC010; +D_menu_801CC310 = 0x801CC310; +D_menu_801CC610 = 0x801CC610; +D_menu_801CC910 = 0x801CC910; +D_menu_801CCC10 = 0x801CCC10; +D_menu_801CCF10 = 0x801CCF10; +D_menu_801CD210 = 0x801CD210; +D_menu_801CD510 = 0x801CD510; sCurrentPlanetId = 0x801CD954; // sPlanetsPositions = 0x801CE960; // force_migration:True segment:ovl_menu \ No newline at end of file diff --git a/linker_scripts/us/symbol_addrs_overlays.txt b/linker_scripts/us/symbol_addrs_overlays.txt index 287daf1c..0affca22 100644 --- a/linker_scripts/us/symbol_addrs_overlays.txt +++ b/linker_scripts/us/symbol_addrs_overlays.txt @@ -1,34 +1,34 @@ -func_DF4260_8018ED78 = 0x8018ED78; -func_DF4260_8018EE84 = 0x8018EE84; -func_DF4260_8018B0B4 = 0x8018B0B4; -func_DF4260_801878D8 = 0x801878D8; -func_DF4260_8018BE7C = 0x8018BE7C; -func_DF4260_8019250C = 0x8019250C; -func_DF4260_80192CB0 = 0x80192CB0; -func_DF4260_80192EA4 = 0x80192EA4; -func_DF4260_801933B4 = 0x801933B4; -func_DF4260_801935CC = 0x801935CC; -D_DF4260_8019B6C0 = 0x8019B6C0; -D_DF4260_8019A008 = 0x8019A008; +func_i1_8018ED78 = 0x8018ED78; +func_i1_8018EE84 = 0x8018EE84; +func_i1_8018B0B4 = 0x8018B0B4; +func_i1_801878D8 = 0x801878D8; +func_i1_8018BE7C = 0x8018BE7C; +func_i1_8019250C = 0x8019250C; +func_i1_80192CB0 = 0x80192CB0; +func_i1_80192EA4 = 0x80192EA4; +func_i1_801933B4 = 0x801933B4; +func_i1_801935CC = 0x801935CC; +D_i1_8019B6C0 = 0x8019B6C0; +D_i1_8019A008 = 0x8019A008; -func_E08400_80187B08 = 0x80187B08; -func_E08400_80188A40 = 0x80188A40; -D_E08400_80195D70 = 0x80195D70; +func_i2_80187B08 = 0x80187B08; +func_i2_80188A40 = 0x80188A40; +D_i2_80195D70 = 0x80195D70; sOptionCardPosY = 0x801AE570; // type:f32 size:0x18 force_migration:True segment:ovl_menu sOptionCardTextPosX = 0x801AE588; // type:f32 size:0x18 force_migration:True segment:ovl_menu sOptionCardTextPosY = 0x801AE5A0; // type:f32 size:0x18 force_migration:True segment:ovl_menu sOptionCardCurTextPosX = 0x801AE5B8; // type:f32 size:0x18 force_migration:True segment:ovl_menu sOptionCardCurTextPosY = 0x801AE5D0; // type:f32 size:0x18 force_migration:True segment:ovl_menu -D_EBFBE0_801AE9A0 = 0x801AE9A0; // type:f32 size:0x10 force_migration:True segment:ovl_menu -D_EBFBE0_801AE9B0 = 0x801AE9B0; // type:f32 size:0x10 force_migration:True segment:ovl_menu -D_EBFBE0_801AE9C0 = 0x801AE9C0; // type:s32 size:0xE0 force_migration:True segment:ovl_menu -D_EBFBE0_801AEAA0 = 0x801AEAA0; // type:s32 size:0xA8 force_migration:True segment:ovl_menu -D_EBFBE0_801AEB48 = 0x801AEB48; // type:s32 size:0xA8 force_migration:True segment:ovl_menu -D_EBFBE0_801AED20 = 0x801AED20; // type:f32 size:0x8 force_migration:True segment:ovl_menu -D_EBFBE0_801AEE6C = 0x801AEE6C; // type:s32 size:0x58 force_migration:True segment:ovl_menu -D_EBFBE0_801AF25C = 0x801AF25C; // type:f32 size:0x18 force_migration:True segment:ovl_menu -D_EBFBE0_801AF274 = 0x801AF274; // type:f32 size:0x18 force_migration:True segment:ovl_menu +D_menu_801AE9A0 = 0x801AE9A0; // type:f32 size:0x10 force_migration:True segment:ovl_menu +D_menu_801AE9B0 = 0x801AE9B0; // type:f32 size:0x10 force_migration:True segment:ovl_menu +D_menu_801AE9C0 = 0x801AE9C0; // type:s32 size:0xE0 force_migration:True segment:ovl_menu +D_menu_801AEAA0 = 0x801AEAA0; // type:s32 size:0xA8 force_migration:True segment:ovl_menu +D_menu_801AEB48 = 0x801AEB48; // type:s32 size:0xA8 force_migration:True segment:ovl_menu +D_menu_801AED20 = 0x801AED20; // type:f32 size:0x8 force_migration:True segment:ovl_menu +D_menu_801AEE6C = 0x801AEE6C; // type:s32 size:0x58 force_migration:True segment:ovl_menu +D_menu_801AF25C = 0x801AF25C; // type:f32 size:0x18 force_migration:True segment:ovl_menu +D_menu_801AF274 = 0x801AF274; // type:f32 size:0x18 force_migration:True segment:ovl_menu func_i3_80187754 = 0x80187754; func_i3_801932AC = 0x801932AC; @@ -91,48 +91,48 @@ D_i3_801C2740 = 0x801C2740; //segment:ovl_i3 size:0x28 D_i3_801C2768 = 0x801C2768; //segment:ovl_i3 size:0x38 D_i3_801C27A0 = 0x801C27A0; //segment:ovl_i3 size:0x20 -func_E51970_80198594 = 0x80198594; -func_E51970_80193CA4 = 0x80193CA4; -D_E51970_801A03C0 = 0x801A03C0; -D_E51970_8019EE80 = 0x8019EE80; -D_E51970_801A03DC = 0x801A03DC; +func_i4_80198594 = 0x80198594; +func_i4_80193CA4 = 0x80193CA4; +D_i4_801A03C0 = 0x801A03C0; +D_i4_8019EE80 = 0x8019EE80; +D_i4_801A03DC = 0x801A03DC; -func_E6A810_8018E3B0 = 0x8018E3B0; -func_E6A810_8018B720 = 0x8018B720; -func_E6A810_801990DC = 0x801990DC; -func_E6A810_801B6AEC = 0x801B6AEC; -func_E6A810_80189B80 = 0x80189B80; -func_E6A810_8018ADC4 = 0x8018ADC4; -func_E6A810_8018B96C = 0x8018B96C; -func_E6A810_8018BFB0 = 0x8018BFB0; -func_E6A810_8018E3CC = 0x8018E3CC; -func_E6A810_8018E5E8 = 0x8018E5E8; -func_E6A810_8018EFF0 = 0x8018EFF0; -func_E6A810_8018F0D8 = 0x8018F0D8; -func_E6A810_8018FA48 = 0x8018FA48; -func_E6A810_80199F8C = 0x80199F8C; -func_E6A810_801A3E70 = 0x801A3E70; -func_E6A810_801A4660 = 0x801A4660; -func_E6A810_801A4AF8 = 0x801A4AF8; -func_E6A810_801A5E2C = 0x801A5E2C; -func_E6A810_801A6134 = 0x801A6134; -func_E6A810_801A65E0 = 0x801A65E0; -func_E6A810_801A7D98 = 0x801A7D98; -func_E6A810_801B6E20 = 0x801B6E20; -D_E6A810_801BBEE0 = 0x801BBEE0; -D_E6A810_801BA1E8 = 0x801BA1E8; -D_E6A810_801B7584 = 0x801B7584; -D_E6A810_801B7608 = 0x801B7608; -D_E6A810_801B769C = 0x801B769C; -D_E6A810_801BE250 = 0x801BE250; -D_E6A810_801BE258 = 0x801BE258; -D_E6A810_801BE25C = 0x801BE25C; -D_E6A810_801BE274 = 0x801BE274; -D_E6A810_801BE280 = 0x801BE280; -D_E6A810_801BE284 = 0x801BE284; -D_E6A810_801BE29C = 0x801BE29C; -D_E6A810_801BE2FA = 0x801BE2FA; -D_E6A810_801BE2A4 = 0x801BE2A4; +func_i5_8018E3B0 = 0x8018E3B0; +func_i5_8018B720 = 0x8018B720; +func_i5_801990DC = 0x801990DC; +func_i5_801B6AEC = 0x801B6AEC; +func_i5_80189B80 = 0x80189B80; +func_i5_8018ADC4 = 0x8018ADC4; +func_i5_8018B96C = 0x8018B96C; +func_i5_8018BFB0 = 0x8018BFB0; +func_i5_8018E3CC = 0x8018E3CC; +func_i5_8018E5E8 = 0x8018E5E8; +func_i5_8018EFF0 = 0x8018EFF0; +func_i5_8018F0D8 = 0x8018F0D8; +func_i5_8018FA48 = 0x8018FA48; +func_i5_80199F8C = 0x80199F8C; +func_i5_801A3E70 = 0x801A3E70; +func_i5_801A4660 = 0x801A4660; +func_i5_801A4AF8 = 0x801A4AF8; +func_i5_801A5E2C = 0x801A5E2C; +func_i5_801A6134 = 0x801A6134; +func_i5_801A65E0 = 0x801A65E0; +func_i5_801A7D98 = 0x801A7D98; +func_i5_801B6E20 = 0x801B6E20; +D_i5_801BBEE0 = 0x801BBEE0; +D_i5_801BA1E8 = 0x801BA1E8; +D_i5_801B7584 = 0x801B7584; +D_i5_801B7608 = 0x801B7608; +D_i5_801B769C = 0x801B769C; +D_i5_801BE250 = 0x801BE250; +D_i5_801BE258 = 0x801BE258; +D_i5_801BE25C = 0x801BE25C; +D_i5_801BE274 = 0x801BE274; +D_i5_801BE280 = 0x801BE280; +D_i5_801BE284 = 0x801BE284; +D_i5_801BE29C = 0x801BE29C; +D_i5_801BE2FA = 0x801BE2FA; +D_i5_801BE2A4 = 0x801BE2A4; func_E9F1D0_801888F4 = 0x801888F4; func_E9F1D0_80197CC4 = 0x80197CC4; diff --git a/src/main/dmatable.c b/src/main/dmatable.c index 33664f8d..ffad9109 100644 --- a/src/main/dmatable.c +++ b/src/main/dmatable.c @@ -61,13 +61,13 @@ DmaEntry gDmaTable[90] = { { SEGMENT_ROM_START(ast_D91F10), { SEGMENT_ROM_START(ast_D91F10), SEGMENT_ROM_END(ast_D91F10) }, false }, { SEGMENT_ROM_START(ast_DDC010), { SEGMENT_ROM_START(ast_DDC010), SEGMENT_ROM_END(ast_DDC010) }, false }, { SEGMENT_ROM_START(ast_DE5D50), { SEGMENT_ROM_START(ast_DE5D50), SEGMENT_ROM_END(ast_DE5D50) }, false }, - { SEGMENT_ROM_START(ovl_DF4260), { SEGMENT_ROM_START(ovl_DF4260), SEGMENT_ROM_END(ovl_DF4260) }, false }, - { SEGMENT_ROM_START(ovl_E08400), { SEGMENT_ROM_START(ovl_E08400), SEGMENT_ROM_END(ovl_E08400) }, false }, + { SEGMENT_ROM_START(ovl_i1), { SEGMENT_ROM_START(ovl_i1), SEGMENT_ROM_END(ovl_i1) }, false }, + { SEGMENT_ROM_START(ovl_i2), { SEGMENT_ROM_START(ovl_i2), SEGMENT_ROM_END(ovl_i2) }, false }, { SEGMENT_ROM_START(ovl_i3), { SEGMENT_ROM_START(ovl_i3), SEGMENT_ROM_END(ovl_i3) }, false }, - { SEGMENT_ROM_START(ovl_E51970), { SEGMENT_ROM_START(ovl_E51970), SEGMENT_ROM_END(ovl_E51970) }, false }, - { SEGMENT_ROM_START(ovl_E6A810), { SEGMENT_ROM_START(ovl_E6A810), SEGMENT_ROM_END(ovl_E6A810) }, false }, - { SEGMENT_ROM_START(ovl_E9F1D0), { SEGMENT_ROM_START(ovl_E9F1D0), SEGMENT_ROM_END(ovl_E9F1D0) }, false }, + { SEGMENT_ROM_START(ovl_i4), { SEGMENT_ROM_START(ovl_i4), SEGMENT_ROM_END(ovl_i4) }, false }, + { SEGMENT_ROM_START(ovl_i5), { SEGMENT_ROM_START(ovl_i5), SEGMENT_ROM_END(ovl_i5) }, false }, + { SEGMENT_ROM_START(ovl_i6), { SEGMENT_ROM_START(ovl_i6), SEGMENT_ROM_END(ovl_i6) }, false }, { SEGMENT_ROM_START(ovl_menu), { SEGMENT_ROM_START(ovl_menu), SEGMENT_ROM_END(ovl_menu) }, false }, - { SEGMENT_ROM_START(ovl_EF0260), { SEGMENT_ROM_START(ovl_EF0260), SEGMENT_ROM_END(ovl_EF0260) }, false }, - { SEGMENT_ROM_START(ovl_EFFA40), { SEGMENT_ROM_START(ovl_EFFA40), SEGMENT_ROM_END(ovl_EFFA40) }, false }, + { SEGMENT_ROM_START(ovl_ending), { SEGMENT_ROM_START(ovl_ending), SEGMENT_ROM_END(ovl_ending) }, false }, + { SEGMENT_ROM_START(ovl_unused), { SEGMENT_ROM_START(ovl_unused), SEGMENT_ROM_END(ovl_unused) }, false }, }; diff --git a/src/main/fox_360.c b/src/main/fox_360.c index cc4e7dff..23ff249f 100644 --- a/src/main/fox_360.c +++ b/src/main/fox_360.c @@ -108,35 +108,35 @@ void func_8002E548(void) { } void func_8002E5E0(Boss* boss) { - func_E51970_80187520(91, boss); + func_i4_80187520(91, boss); } void func_8002E604(Boss* boss) { - func_E51970_80187520(92, boss); + func_i4_80187520(92, boss); } void func_8002E628(Boss* boss) { - func_E51970_80187520(93, boss); + func_i4_80187520(93, boss); } void func_8002E64C(Boss* boss) { - func_E51970_80187520(94, boss); + func_i4_80187520(94, boss); } void func_8002E670(Actor* actor) { - func_E51970_80187520(95, actor); + func_i4_80187520(95, actor); } void func_8002E694(Actor* actor) { - func_E51970_80187520(96, actor); + func_i4_80187520(96, actor); } void func_8002E6B8(Actor* actor) { - func_E51970_80187520(97, actor); + func_i4_80187520(97, actor); } void func_8002E6DC(Actor* actor) { - func_E51970_80187520(98, actor); + func_i4_80187520(98, actor); } void func_8002E700(Player* player) { @@ -671,16 +671,16 @@ void func_8003010C(Actor* actor) { D_8015F928++; switch (gCurrentLevel) { case LEVEL_FORTUNA: - func_E51970_80187960(actor); + func_i4_80187960(actor); break; case LEVEL_KATINA: - func_E51970_80198594(actor); + func_i4_80198594(actor); break; case LEVEL_BOLSE: - func_E51970_8018C158(actor); + func_i4_8018C158(actor); break; case LEVEL_SECTOR_Z: - func_E51970_8019AB8C(actor); + func_i4_8019AB8C(actor); break; case LEVEL_VENOM_2: func_E9F1D0_80196314(actor); @@ -833,7 +833,7 @@ void func_8003088C(Actor* arg0) { if (arg0->unk_0CE <= 0) { arg0->unk_0CE = 0; if (arg0->unk_0E4 == 200) { - func_E51970_80199900(arg0, 1); + func_i4_80199900(arg0, 1); if (arg0->unk_0D4 == 1) { if (gActors[8].obj.status == 2) { func_800BA808(gMsg_ID_16140, RCID_KATT); @@ -1369,7 +1369,7 @@ void func_800319AC(Actor* this) { sp104 = 2; break; case 5: - func_E51970_80199C60(this); + func_i4_80199C60(this); sp104 = 1; break; case 0: diff --git a/src/main/fox_43E80.c b/src/main/fox_43E80.c index 4534d3b4..1c8bb024 100644 --- a/src/main/fox_43E80.c +++ b/src/main/fox_43E80.c @@ -17,8 +17,8 @@ typedef struct { /* 0x6C */ f32 unk_6C; /* 0x70 */ f32 unk_70; /* 0x74 */ f32 unk_74; -} UnkStruct_D_E6A810_801BE250; // probably fake. investigate later. -extern UnkStruct_D_E6A810_801BE250 D_E6A810_801BE250; +} UnkStruct_D_i5_801BE250; // probably fake. investigate later. +extern UnkStruct_D_i5_801BE250 D_i5_801BE250; static u8 D_800C9F00 = 0; static u8 D_800C9F04 = 0; @@ -33,14 +33,14 @@ static f32 D_800C9F28 = 0.0f; Vec3f D_800C9F2C = { 0.0f, 0.0f, 0.0f }; static s32 D_800C9F38 = 0; // unused -extern f32 D_E6A810_801BE258; -extern f32 D_E6A810_801BE25C; -extern f32 D_E6A810_801BE274; -extern f32 D_E6A810_801BE280; -extern f32 D_E6A810_801BE284; -extern f32 D_E6A810_801BE29C; -extern f32 D_E6A810_801BE2A4; -extern s16 D_E6A810_801BE2FA; +extern f32 D_i5_801BE258; +extern f32 D_i5_801BE25C; +extern f32 D_i5_801BE274; +extern f32 D_i5_801BE280; +extern f32 D_i5_801BE284; +extern f32 D_i5_801BE29C; +extern f32 D_i5_801BE2A4; +extern s16 D_i5_801BE2FA; void func_80043280(u16* text0, u16* text1, f32 zRot) { s32 py; @@ -93,18 +93,18 @@ void func_80043468(Player* player) { sp50 += player->unk_17C * 0.5f; sp4C += player->unk_17C * -5.0f; - if (0 || (gCurrentLevel == LEVEL_MACBETH) && (D_E6A810_801BA1E8 == 102)) { + if (0 || (gCurrentLevel == LEVEL_MACBETH) && (D_i5_801BA1E8 == 102)) { sp50 = player->pos.y + 45.0f + (-player->unk_0E4 * 5.0f); sp4C = player->pos.y + 200.0f + (player->unk_0E4 * 10.0f); sp50 += player->unk_17C * 0.2f; sp4C += player->unk_17C * -3.0f; } - if (D_E6A810_801BA1E8 == 99) { + if (D_i5_801BA1E8 == 99) { sp50 = player->pos.y + 40.0f + (-player->unk_0E4 * 5.0f); sp4C = player->pos.y + 200.0f + (player->unk_0E4 * 10.0f); sp50 += player->unk_17C * 0.2f; sp4C += player->unk_17C * -3.0f; - } else if (D_E6A810_801BA1E8 == 98) { + } else if (D_i5_801BA1E8 == 98) { sp50 = player->pos.y + 100.0f; sp4C = player->pos.y + (player->unk_0E4 * 10.0f); sp4C += player->unk_17C * -3.0f; @@ -113,10 +113,10 @@ void func_80043468(Player* player) { sp50 = player->pos.y + 50.0f; sp4C = player->pos.y; - if (0 || (gCurrentLevel == LEVEL_MACBETH) && (D_E6A810_801BA1E8 == 102)) { + if (0 || (gCurrentLevel == LEVEL_MACBETH) && (D_i5_801BA1E8 == 102)) { sp4C = player->pos.y + 150.0f; } - if (D_E6A810_801BA1E8 == 0x63) { + if (D_i5_801BA1E8 == 0x63) { sp4C = player->pos.y + 150.0f; } } @@ -198,8 +198,8 @@ void func_80043B18(Player* player) { func_80043AA0(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z, 0.2f); } else { if (!(gFrameCount & 1)) { - func_E6A810_80189120(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z, - player->unk_0E8 + sp38, 1.3f); + func_i5_80189120(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z, + player->unk_0E8 + sp38, 1.3f); } if (!(gFrameCount & 3)) { func_8007A900(player->pos.x + sp3C.x, player->pos.y + sp3C.y + 20.0f, player->unk_138 + sp3C.z, 2.0f, @@ -217,8 +217,8 @@ void func_80043B18(Player* player) { } } else { if (!(gFrameCount & 1)) { - func_E6A810_80189120(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z, - player->unk_0E8 + sp38, 1.0f); + func_i5_80189120(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z, + player->unk_0E8 + sp38, 1.0f); } if (!(gFrameCount & 3) && (player->unk_0D0 >= 5.0f)) { func_8007A900(player->pos.x + sp3C.x, player->pos.y + sp3C.y + 20.0f, player->unk_138 + sp3C.z, @@ -235,8 +235,8 @@ void func_80043B18(Player* player) { } } else { if (!(gFrameCount & 1)) { - func_E6A810_80189120(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z, - player->unk_0E8 + sp38, 1.0f); + func_i5_80189120(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z, + player->unk_0E8 + sp38, 1.0f); } if (!(gFrameCount & 3) && (player->unk_0D0 >= 5.0f)) { func_8007A900(player->pos.x + sp3C.x, player->pos.y + sp3C.y + 20.0f, player->unk_138 + sp3C.z, @@ -328,16 +328,16 @@ void func_800444BC(Player* player) { sp40 = sp3C = 0.0f; sp38 = gGroundLevel; if (D_801784AC == 4) { - func_E6A810_801B6E20(player->pos.x, player->unk_138 + player->unk_144, &sp40, &sp38, &sp3C); + func_i5_801B6E20(player->pos.x, player->unk_138 + player->unk_144, &sp40, &sp38, &sp3C); } if (gCurrentLevel == LEVEL_MACBETH) { - D_E6A810_801BE250.unk_6C = gGroundLevel; - D_E6A810_801BE250.unk_70 = D_E6A810_801BE250.unk_74 = 0.0f; + D_i5_801BE250.unk_6C = gGroundLevel; + D_i5_801BE250.unk_70 = D_i5_801BE250.unk_74 = 0.0f; D_800C9F10 = 0.0f; func_80047754(player); - sp38 = D_E6A810_801BE250.unk_6C; - sp40 = D_E6A810_801BE250.unk_70; - sp3C = D_E6A810_801BE250.unk_74; + sp38 = D_i5_801BE250.unk_6C; + sp40 = D_i5_801BE250.unk_70; + sp3C = D_i5_801BE250.unk_74; } if ((player->pos.y - sp30) < sp38) { if (player->vel.y < -10.0f) { @@ -832,7 +832,7 @@ void func_80046358(Player* player) { player->unk_248 = 0.0f; player->unk_24C = 0.0f; player->unk_070 = 0.0f; - func_E6A810_801B6E20(player->unk_064, player->unk_06C + player->unk_144, &spD4, &spD0, &spCC); + func_i5_801B6E20(player->unk_064, player->unk_06C + player->unk_144, &spD4, &spD0, &spCC); player->unk_068 = spD0 + 2.0f; player->unk_248 = spD4; player->unk_24C = spCC; @@ -862,16 +862,16 @@ void func_8004641C(Player* player, s32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 a sp80 = sp64.y + arg3; sp7C = sp64.z + arg4; if (func_800A8054(arg1, arg2, arg3, arg4, sp84, sp80, sp7C, &sp58, &sp4C)) { - if (D_E6A810_801BE250.unk_6C < arg3 + sp58.y) { - D_E6A810_801BE250.unk_6C = arg3 + sp58.y; + if (D_i5_801BE250.unk_6C < arg3 + sp58.y) { + D_i5_801BE250.unk_6C = arg3 + sp58.y; if (arg1 == OBJ_80_67) { player->unk_1DC = 0; D_800C9F04 = 1; } } - D_E6A810_801BE250.unk_70 = sp58.x; - D_E6A810_801BE250.unk_74 = sp58.z; - } else if ((arg1 == OBJ_80_67) && (D_E6A810_801BE250.unk_6C == 0.0f) && + D_i5_801BE250.unk_70 = sp58.x; + D_i5_801BE250.unk_74 = sp58.z; + } else if ((arg1 == OBJ_80_67) && (D_i5_801BE250.unk_6C == 0.0f) && func_800A8054(arg1, arg2 + 20.0f, arg3, arg4, sp84, sp80, sp7C, &sp58, &sp4C)) { player->unk_1DC = 9; player->timer_1E8 = 15; @@ -918,9 +918,9 @@ void func_80046704(Player* player) { if (((player->pos.x - 820.0f) <= obj80->obj.pos.x) && (obj80->obj.pos.x <= (player->pos.x + 820.0f)) && ((player->pos.y - 50.0f) <= obj80->obj.pos.y) && (obj80->obj.pos.y <= (player->pos.y + 50.0f)) && (player->unk_138 <= obj80->obj.pos.z) && (obj80->obj.pos.z <= (player->unk_138 + 960.0f))) { - D_E6A810_801BE250.unk_6C = obj80->obj.pos.y; + D_i5_801BE250.unk_6C = obj80->obj.pos.y; player->unk_064 = player->pos.x; - player->unk_068 = D_E6A810_801BE250.unk_6C - 3.0f; + player->unk_068 = D_i5_801BE250.unk_6C - 3.0f; } } if ((obj80->obj.id == OBJ_80_59) || (obj80->obj.id == OBJ_80_60) || (obj80->obj.id == OBJ_80_61) || @@ -970,7 +970,7 @@ void func_80046704(Player* player) { if (!(((player->pos.x - 210.0f) <= obj80->obj.pos.x) && (obj80->obj.pos.x <= (player->pos.x + 210.0f))) && - (D_E6A810_801BE250.unk_6C == 0.f) && (player->vel.y < 0.f)) { + (D_i5_801BE250.unk_6C == 0.f) && (player->vel.y < 0.f)) { player->unk_1DC = 9; player->timer_1E8 = 15; if ((player->pos.x - 200.0f) <= obj80->obj.pos.x) { @@ -980,7 +980,7 @@ void func_80046704(Player* player) { } } else { D_800C9F04 = 1; - D_E6A810_801BE250.unk_6C = obj80->obj.pos.y + 206.0f; + D_i5_801BE250.unk_6C = obj80->obj.pos.y + 206.0f; player->unk_1DC = 0; } } @@ -990,10 +990,10 @@ void func_80046704(Player* player) { (obj80->obj.pos.z <= (player->unk_138 + 220.0f)) && (player->pos.y >= 200.0f)) { player->unk_068 = obj80->obj.pos.y + 204.0f; } - } else if ((obj80->obj.id == OBJ_80_105) && func_E6A810_801A3C20(player->unk_138)) { - if (((player->pos.x - 200.0f) < D_E6A810_801BE250.unk_54) && - (D_E6A810_801BE250.unk_54 < (player->pos.x + 200.0f))) { - player->unk_068 = D_E6A810_801BE250.unk_58 - 1.0f; + } else if ((obj80->obj.id == OBJ_80_105) && func_i5_801A3C20(player->unk_138)) { + if (((player->pos.x - 200.0f) < D_i5_801BE250.unk_54) && + (D_i5_801BE250.unk_54 < (player->pos.x + 200.0f))) { + player->unk_068 = D_i5_801BE250.unk_58 - 1.0f; } } } @@ -1183,49 +1183,46 @@ void func_80047504(Player* player) { void func_80047754(Player* player) { u8 sp2F = false; - if ((D_E6A810_801BE2FA == 0) && (func_E6A810_801A3300(player, player->unk_138, player->unk_0E8) == 0)) { - if (((player->pos.x - 110.0f) < D_E6A810_801BE274) && (D_E6A810_801BE274 < (player->pos.x + 110.0f)) && - ((player->pos.y - 60.0f) < (D_E6A810_801BE258 + 30.0f)) && - ((D_E6A810_801BE258 + 30.0f) < (player->pos.y + 60.f))) { - func_80047D38(player, D_E6A810_801BE258 + 29.0f); - player->unk_0E4 = D_E6A810_801BE25C; + if ((D_i5_801BE2FA == 0) && (func_i5_801A3300(player, player->unk_138, player->unk_0E8) == 0)) { + if (((player->pos.x - 110.0f) < D_i5_801BE274) && (D_i5_801BE274 < (player->pos.x + 110.0f)) && + ((player->pos.y - 60.0f) < (D_i5_801BE258 + 30.0f)) && ((D_i5_801BE258 + 30.0f) < (player->pos.y + 60.f))) { + func_80047D38(player, D_i5_801BE258 + 29.0f); + player->unk_0E4 = D_i5_801BE25C; func_80047FBC(player); sp2F = true; - } else if (((player->pos.x - 150.0f) < D_E6A810_801BE274) && (D_E6A810_801BE274 < (player->pos.x + 150.0f)) && - ((player->pos.y - 60.0f) < (D_E6A810_801BE258 + 30.0f)) && - ((D_E6A810_801BE258 + 30.0f) < (player->pos.y + 60.0f))) { - func_80047E7C(player, D_E6A810_801BE274, D_E6A810_801BE258 + 30.0f); + } else if (((player->pos.x - 150.0f) < D_i5_801BE274) && (D_i5_801BE274 < (player->pos.x + 150.0f)) && + ((player->pos.y - 60.0f) < (D_i5_801BE258 + 30.0f)) && + ((D_i5_801BE258 + 30.0f) < (player->pos.y + 60.0f))) { + func_80047E7C(player, D_i5_801BE274, D_i5_801BE258 + 30.0f); } } - if (func_E6A810_801A3C20(player->unk_138)) { - player->unk_0E4 = D_E6A810_801BE250.unk_5C; - if (((player->pos.x - 200.0f) < D_E6A810_801BE250.unk_54) && - (D_E6A810_801BE250.unk_54 < (player->pos.x + 200.0f))) { - if (((player->pos.y - 60.0f) < D_E6A810_801BE250.unk_58) && - (D_E6A810_801BE250.unk_58 < (player->pos.y + 60.0f))) { - func_80047D38(player, D_E6A810_801BE250.unk_58); + if (func_i5_801A3C20(player->unk_138)) { + player->unk_0E4 = D_i5_801BE250.unk_5C; + if (((player->pos.x - 200.0f) < D_i5_801BE250.unk_54) && (D_i5_801BE250.unk_54 < (player->pos.x + 200.0f))) { + if (((player->pos.y - 60.0f) < D_i5_801BE250.unk_58) && (D_i5_801BE250.unk_58 < (player->pos.y + 60.0f))) { + func_80047D38(player, D_i5_801BE250.unk_58); } else { - if ((100.0f < (D_E6A810_801BE250.unk_58 - player->pos.y)) && - ((D_E6A810_801BE250.unk_58 - player->pos.y) < 130.0f)) { + if ((100.0f < (D_i5_801BE250.unk_58 - player->pos.y)) && + ((D_i5_801BE250.unk_58 - player->pos.y) < 130.0f)) { player->unk_0A0 = 999.0f; player->pos.y = player->unk_090.y - 1.0f; } goto label_29; } - if (!(((player->pos.x - 65.0f) < D_E6A810_801BE250.unk_54) && - (D_E6A810_801BE250.unk_54 < (player->pos.x + 65.0f)))) { - if (!(((player->pos.x - 100.0f) < D_E6A810_801BE250.unk_54) && - (D_E6A810_801BE250.unk_54 < (player->pos.x + 100.0f)))) { + if (!(((player->pos.x - 65.0f) < D_i5_801BE250.unk_54) && + (D_i5_801BE250.unk_54 < (player->pos.x + 65.0f)))) { + if (!(((player->pos.x - 100.0f) < D_i5_801BE250.unk_54) && + (D_i5_801BE250.unk_54 < (player->pos.x + 100.0f)))) { player->unk_1D4 = 9; - Math_SmoothStepToF(&player->pos.y, D_E6A810_801BE250.unk_58 + 100.0f, 0.5f, 20.0f, 0); + Math_SmoothStepToF(&player->pos.y, D_i5_801BE250.unk_58 + 100.0f, 0.5f, 20.0f, 0); player->vel.y = 2.0f; Math_SmoothStepToF(&player->unk_0E8, 0.0f, 0.5f, 20.0f, 0); - Math_SmoothStepToF(&player->pos.x, D_E6A810_801BE2A4, 0.02f, 30.0f, 0); + Math_SmoothStepToF(&player->pos.x, D_i5_801BE2A4, 0.02f, 30.0f, 0); Math_SmoothStepToF(&player->unk_12C, -30.0f, 1.0f, 10.0f, 0); - D_E6A810_801BE284 += 0; // fake? + D_i5_801BE284 += 0; // fake? } player->unk_188 = 0; - if (player->pos.x < D_E6A810_801BE250.unk_54) { + if (player->pos.x < D_i5_801BE250.unk_54) { player->vel.x = 0.0f; player->pos.x += 8.0f; } else { @@ -1237,21 +1234,21 @@ void func_80047754(Player* player) { } label_29: - if (((D_E6A810_801BE2FA == 1) || (player->unk_138 < -116467.875f)) && - (func_E6A810_801A3790(player, player->unk_138, player->unk_0E8) == 0)) { - if (((player->pos.x - 110.0f) < D_E6A810_801BE29C) && (D_E6A810_801BE29C < (player->pos.x + 110.0f)) && - ((player->pos.y - 60.0f) < (D_E6A810_801BE280 + 30.0f)) && - ((D_E6A810_801BE280 + 30.0f) < (player->pos.y + 60.0f))) { + if (((D_i5_801BE2FA == 1) || (player->unk_138 < -116467.875f)) && + (func_i5_801A3790(player, player->unk_138, player->unk_0E8) == 0)) { + if (((player->pos.x - 110.0f) < D_i5_801BE29C) && (D_i5_801BE29C < (player->pos.x + 110.0f)) && + ((player->pos.y - 60.0f) < (D_i5_801BE280 + 30.0f)) && + ((D_i5_801BE280 + 30.0f) < (player->pos.y + 60.0f))) { sp2F = true; - func_80047D38(player, D_E6A810_801BE280 + 29.0f); - player->unk_0E4 = D_E6A810_801BE284; // not fake, but weird - player->unk_0E4 = D_E6A810_801BE284; + func_80047D38(player, D_i5_801BE280 + 29.0f); + player->unk_0E4 = D_i5_801BE284; // not fake, but weird + player->unk_0E4 = D_i5_801BE284; func_80047FBC(player); } else { - if (((player->pos.x - 150.0f) < D_E6A810_801BE29C) && (D_E6A810_801BE29C < (player->pos.x + 150.0f)) && - ((player->pos.y - 60.0f) < (D_E6A810_801BE280 + 30.0f)) && - ((D_E6A810_801BE280 + 30.0f) < (player->pos.y + 60.0f))) { - func_80047E7C(player, D_E6A810_801BE29C, D_E6A810_801BE280 + 30.0f); + if (((player->pos.x - 150.0f) < D_i5_801BE29C) && (D_i5_801BE29C < (player->pos.x + 150.0f)) && + ((player->pos.y - 60.0f) < (D_i5_801BE280 + 30.0f)) && + ((D_i5_801BE280 + 30.0f) < (player->pos.y + 60.0f))) { + func_80047E7C(player, D_i5_801BE29C, D_i5_801BE280 + 30.0f); } } } diff --git a/src/main/fox_beam.c b/src/main/fox_beam.c index 1aef37f6..b2e1fbb1 100644 --- a/src/main/fox_beam.c +++ b/src/main/fox_beam.c @@ -878,7 +878,7 @@ void func_80038140(PlayerShot* shot) { } } } - if ((D_801784AC == 4) && func_E6A810_801B6AEC(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z + D_80177D20)) { + if ((D_801784AC == 4) && func_i5_801B6AEC(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z + D_80177D20)) { func_80036318(shot); if (shot->obj.id != PLAYERSHOT_4) { func_8007A900(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 2.0f, 255, 15, 0); @@ -1918,9 +1918,9 @@ void func_8003C4D0(PlayerShot* shot, s32 unkD6) { } } if (gCurrentLevel == LEVEL_MACBETH) { - func_E6A810_801AD144(shot); + func_i5_801AD144(shot); } else if (gCurrentLevel == LEVEL_VENOM_1) { - func_DF4260_8019864C(shot); + func_i1_8019864C(shot); } else { func_8003C008(shot); } diff --git a/src/main/fox_bg.c b/src/main/fox_bg.c index bf995817..87155f1b 100644 --- a/src/main/fox_bg.c +++ b/src/main/fox_bg.c @@ -795,7 +795,7 @@ void func_80040CE4(void) { return; } if ((gCurrentLevel == LEVEL_BOLSE) && (D_800C9C34 != 0)) { - func_E51970_80192264(); + func_i4_80192264(); return; } sp1D4 = 0.0f; diff --git a/src/main/fox_demo.c b/src/main/fox_demo.c index c801b45f..73e0131f 100644 --- a/src/main/fox_demo.c +++ b/src/main/fox_demo.c @@ -131,7 +131,7 @@ AnimationHeader* D_800CA1F4[] = { D_60265B4, D_602B8DC, D_60034C4, D_602A2CC, D_602CEB4, D_602B778, (AnimationHeader*) 0x0601F3B8, }; -extern void func_E6A810_8018769C(Player*); +extern void func_i5_8018769C(Player*); extern void func_801882CC(Player*, OSContPad**, OSContPad**); extern void func_8018CD8C(Player*); extern void func_8018DA58(Actor*); @@ -160,7 +160,7 @@ extern void func_8019FF00(Actor*); extern void func_E9F1D0_801A0AC0(Player*); extern void func_801A8BE8(Actor*); extern void func_801AB9B0(Player*); -extern void func_E6A810_801AC754(Player*); +extern void func_i5_801AC754(Player*); extern void func_801AF8F4(Player*, OSContPad**, OSContPad**); extern void func_801B28BC(Actor*); extern void func_801B3D04(Player*, OSContPad**, OSContPad**); @@ -712,7 +712,7 @@ void func_8004A52C(Player* player) { break; case LEVEL_TITANIA: - func_E6A810_8018769C(player); + func_i5_8018769C(player); func_800AA800(player); break; @@ -721,7 +721,7 @@ void func_8004A52C(Player* player) { break; case LEVEL_MACBETH: - func_E6A810_801AC754(player); + func_i5_801AC754(player); break; case LEVEL_SECTOR_Y: @@ -1402,7 +1402,7 @@ void func_8004B368(Player* player) { } void func_8004C90C(Player* player) { - func_E51970_80187520(90, player); + func_i4_80187520(90, player); } void func_8004C930(Player* player) { diff --git a/src/main/fox_display.c b/src/main/fox_display.c index 33ef2924..96766cbf 100644 --- a/src/main/fox_display.c +++ b/src/main/fox_display.c @@ -1594,7 +1594,7 @@ void func_80057D00(void) { Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, 0.0f, D_8017847C, 0.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); - func_E6A810_801B58AC(&gMasterDisp, D_80177CC8); + func_i5_801B58AC(&gMasterDisp, D_80177CC8); D_80177CC8 = 0.0f; Matrix_Pop(&gGfxMatrix); } else if (D_80161A88 != 2) { diff --git a/src/main/fox_edata_1C.c b/src/main/fox_edata_1C.c index 28b1f2ea..1501ec11 100644 --- a/src/main/fox_edata_1C.c +++ b/src/main/fox_edata_1C.c @@ -1,300 +1,300 @@ #include "global.h" // these are overlay functions. They will need to be replaced with their proper overlay names given below them. -// func_DF4260_801875A4 +// func_i1_801875A4 void func_801875A4(Object*); -// func_DF4260_80189058 +// func_i1_80189058 void func_80189058(Object*); -// func_DF4260_8018AA74 +// func_i1_8018AA74 void func_8018AA74(Object*); -// func_DF4260_8018AED0 +// func_i1_8018AED0 void func_8018AED0(Object*); -// func_DF4260_8018B15C +// func_i1_8018B15C void func_8018B15C(Object*); -// func_DF4260_8018B418 +// func_i1_8018B418 void func_8018B418(Object*); -// func_DF4260_8018B58C +// func_i1_8018B58C void func_8018B58C(Object*); -// func_DF4260_8018BAAC +// func_i1_8018BAAC void func_8018BAAC(Object*); -// func_DF4260_8018BBA4 +// func_i1_8018BBA4 void func_8018BBA4(Object*); -// func_DF4260_8018BBF8 +// func_i1_8018BBF8 void func_8018BBF8(Object*); -// func_DF4260_8018BD7C +// func_i1_8018BD7C void func_8018BD7C(Object*); -// func_DF4260_8018C19C +// func_i1_8018C19C void func_8018C19C(Object*); -// func_DF4260_8018DDAC +// func_i1_8018DDAC void func_8018DDAC(Object*); -// func_DF4260_8018E290 +// func_i1_8018E290 void func_8018E290(Object*); -// func_DF4260_8018E76C +// func_i1_8018E76C void func_8018E76C(Object*); -// func_DF4260_8018ECAC +// func_i1_8018ECAC void func_8018ECAC(Object*); -// func_DF4260_8018ED78 +// func_i1_8018ED78 void func_8018ED78(Object*); -// func_DF4260_8018EE84 +// func_i1_8018EE84 void func_8018EE84(Object*); -// func_DF4260_8018EF90 +// func_i1_8018EF90 void func_8018EF90(Object*); -// func_DF4260_8018F044 +// func_i1_8018F044 void func_8018F044(Object*); -// func_DF4260_8018F31C +// func_i1_8018F31C void func_8018F31C(Object*); -// func_DF4260_801922DC +// func_i1_801922DC void func_801922DC(Object*); -// func_DF4260_80192358 +// func_i1_80192358 void func_80192358(Object*); -// func_DF4260_801923C0 +// func_i1_801923C0 void func_801923C0(Object*); -// func_DF4260_8019243C +// func_i1_8019243C void func_8019243C(Object*); -// func_DF4260_80192518 +// func_i1_80192518 void func_80192518(Object*); -// func_DF4260_80192CD4 +// func_i1_80192CD4 void func_80192CD4(Object*); -// func_DF4260_80192E2C +// func_i1_80192E2C void func_80192E2C(Object*); -// func_DF4260_80192EB0 +// func_i1_80192EB0 void func_80192EB0(Object*); -// func_DF4260_801933DC +// func_i1_801933DC void func_801933DC(Object*); -// func_DF4260_801934D0 +// func_i1_801934D0 void func_801934D0(Object*); -// func_DF4260_80193540 +// func_i1_80193540 void func_80193540(Object*); -// func_DF4260_80194398 +// func_i1_80194398 void func_80194398(Object*); -// func_DF4260_801985E4 +// func_i1_801985E4 void func_801985E4(Object*); -// func_DF4260_80198968 +// func_i1_80198968 void func_80198968(Object*); -// func_E08400_8018756C +// func_i2_8018756C void func_8018756C(Object*); -// func_E08400_80187650 +// func_i2_80187650 void func_80187650(Object*); -// func_E08400_801877C4 +// func_i2_801877C4 void func_801877C4(Object*); -// func_E08400_8018795C +// func_i2_8018795C void func_8018795C(Object*); -// func_E08400_80188344 +// func_i2_80188344 void func_80188344(Object*); -// func_E08400_801887D0 +// func_i2_801887D0 void func_801887D0(Object*); -// func_E08400_80188CAC +// func_i2_80188CAC void func_80188CAC(Object*); -// func_E08400_80188FAC +// func_i2_80188FAC void func_80188FAC(Object*); -// func_E08400_80189114 +// func_i2_80189114 void func_80189114(Object*); -// func_E08400_8018978C +// func_i2_8018978C void func_8018978C(Object*); -// func_E08400_8018BACC +// func_i2_8018BACC void func_8018BACC(Object*); -// func_E08400_8018D9EC +// func_i2_8018D9EC void func_8018D9EC(Object*); -// func_E08400_8018DA6C +// func_i2_8018DA6C void func_8018DA6C(Object*); -// func_E08400_8018DAEC +// func_i2_8018DAEC void func_8018DAEC(Object*); -// func_E08400_8018DB6C +// func_i2_8018DB6C void func_8018DB6C(Object*); -// func_E08400_8018DBEC +// func_i2_8018DBEC void func_8018DBEC(Object*); -// func_E08400_8018DCE4 +// func_i2_8018DCE4 void func_8018DCE4(Object*); -// func_E08400_8018DE14 +// func_i2_8018DE14 void func_8018DE14(Object*); -// func_E08400_8018F330 +// func_i2_8018F330 void func_8018F330(Object*); -// func_E08400_8018F884 +// func_i2_8018F884 void func_8018F884(Object*); -// func_E08400_8018FE38 +// func_i2_8018FE38 void func_8018FE38(Object*); -// func_E08400_8018FF20 +// func_i2_8018FF20 void func_8018FF20(Object*); -// func_E08400_8018FF84 +// func_i2_8018FF84 void func_8018FF84(Object*); -// func_E08400_80190020 +// func_i2_80190020 void func_80190020(Object*); -// func_E08400_80190078 +// func_i2_80190078 void func_80190078(Object*); -// func_E08400_80193434 +// func_i2_80193434 void func_80193434(Object*); -// func_E51970_80188AD0 +// func_i4_80188AD0 void func_80188AD0(Object*); -// func_E51970_80188FE4 +// func_i4_80188FE4 void func_80188FE4(Object*); -// func_E51970_80191054 +// func_i4_80191054 void func_80191054(Object*); -// func_E51970_80191180 +// func_i4_80191180 void func_80191180(Object*); -// func_E51970_801912FC +// func_i4_801912FC void func_801912FC(Object*); -// func_E51970_80191AFC +// func_i4_80191AFC void func_80191AFC(Object*); -// func_E51970_80192984 +// func_i4_80192984 void func_80192984(Object*); -// func_E51970_80192A68 +// func_i4_80192A68 void func_80192A68(Object*); -// func_E51970_80193718 +// func_i4_80193718 void func_80193718(Object*); -// func_E51970_80193B1C +// func_i4_80193B1C void func_80193B1C(Object*); -// func_E51970_801946C4 +// func_i4_801946C4 void func_801946C4(Object*); -// func_E51970_801968F4 +// func_i4_801968F4 void func_801968F4(Object*); -// func_E51970_8019E234 +// func_i4_8019E234 void func_8019E234(Object*); -// func_E51970_8019E3A8 +// func_i4_8019E3A8 void func_8019E3A8(Object*); -// func_E51970_8019E454 +// func_i4_8019E454 void func_8019E454(Object*); -// func_E51970_8019E98C +// func_i4_8019E98C void func_8019E98C(Object*); -// func_E6A810_80188F60 +// func_i5_80188F60 void func_80188F60(Object*); -// func_E6A810_80188FA8 +// func_i5_80188FA8 void func_80188FA8(Object*); -// func_E6A810_80189194 +// func_i5_80189194 void func_80189194(Object*); -// func_E6A810_801895B8 +// func_i5_801895B8 void func_801895B8(Object*); -// func_E6A810_80189AFC +// func_i5_80189AFC void func_80189AFC(Object*); -// func_E6A810_80189CC8 +// func_i5_80189CC8 void func_80189CC8(Object*); -// func_E6A810_8018A1C0 +// func_i5_8018A1C0 void func_8018A1C0(Object*); -// func_E6A810_8018A544 +// func_i5_8018A544 void func_8018A544(Object*); -// func_E6A810_8018AABC +// func_i5_8018AABC void func_8018AABC(Object*); -// func_E6A810_8018AB44 +// func_i5_8018AB44 void func_8018AB44(Object*); -// func_E6A810_8018B268 +// func_i5_8018B268 void func_8018B268(Object*); -// func_E6A810_8018B6AC +// func_i5_8018B6AC void func_8018B6AC(Object*); -// func_E6A810_8018B9D0 +// func_i5_8018B9D0 void func_8018B9D0(Object*); -// func_E6A810_8018BE84 +// func_i5_8018BE84 void func_8018BE84(Object*); -// func_E6A810_8018C8A8 +// func_i5_8018C8A8 void func_8018C8A8(Object*); -// func_E6A810_8018E2D8 +// func_i5_8018E2D8 void func_8018E2D8(Object*); -// func_E6A810_8018E54C +// func_i5_8018E54C void func_8018E54C(Object*); -// func_E6A810_8018E5B4 +// func_i5_8018E5B4 void func_8018E5B4(Object*); -// func_E6A810_8018E5F8 +// func_i5_8018E5F8 void func_8018E5F8(Object*); -// func_E6A810_8018EF14 +// func_i5_8018EF14 void func_8018EF14(Object*); -// func_E6A810_8018F038 +// func_i5_8018F038 void func_8018F038(Object*); -// func_E6A810_8018F4D8 +// func_i5_8018F4D8 void func_8018F4D8(Object*); -// func_E6A810_8018F8B8 +// func_i5_8018F8B8 void func_8018F8B8(Object*); -// func_E6A810_80197A94 +// func_i5_80197A94 void func_80197A94(Object*); -// func_E6A810_801982A8 +// func_i5_801982A8 void func_801982A8(Object*); -// func_E6A810_8019C778 +// func_i5_8019C778 void func_8019C778(Object*); -// func_E6A810_8019CE88 +// func_i5_8019CE88 void func_8019CE88(Object*); -// func_E6A810_8019D700 +// func_i5_8019D700 void func_8019D700(Object*); -// func_E6A810_8019E410 +// func_i5_8019E410 void func_8019E410(Object*); -// func_E6A810_8019EA60 +// func_i5_8019EA60 void func_8019EA60(Object*); -// func_E6A810_8019EE68 +// func_i5_8019EE68 void func_8019EE68(Object*); -// func_E6A810_8019FF9C +// func_i5_8019FF9C void func_8019FF9C(Object*); -// func_E6A810_801A0BD8 +// func_i5_801A0BD8 void func_801A0BD8(Object*); -// func_E6A810_801A12C4 +// func_i5_801A12C4 void func_801A12C4(Object*); -// func_E6A810_801A23AC +// func_i5_801A23AC void func_801A23AC(Object*); -// func_E6A810_801A2A78 +// func_i5_801A2A78 void func_801A2A78(Object*); -// func_E6A810_801A2B24 +// func_i5_801A2B24 void func_801A2B24(Object*); -// func_E6A810_801A2DD8 +// func_i5_801A2DD8 void func_801A2DD8(Object*); -// func_E6A810_801A3240 +// func_i5_801A3240 void func_801A3240(Object*); -// func_E6A810_801A3E98 +// func_i5_801A3E98 void func_801A3E98(Object*); -// func_E6A810_801A43BC +// func_i5_801A43BC void func_801A43BC(Object*); -// func_E6A810_801A46A0 +// func_i5_801A46A0 void func_801A46A0(Object*); -// func_E6A810_801A4A64 +// func_i5_801A4A64 void func_801A4A64(Object*); -// func_E6A810_801A4B24 +// func_i5_801A4B24 void func_801A4B24(Object*); -// func_E6A810_801A54E8 +// func_i5_801A54E8 void func_801A54E8(Object*); -// func_E6A810_801A57D0 +// func_i5_801A57D0 void func_801A57D0(Object*); -// func_E6A810_801A5AF0 +// func_i5_801A5AF0 void func_801A5AF0(Object*); -// func_E6A810_801A5B4C +// func_i5_801A5B4C void func_801A5B4C(Object*); -// func_E6A810_801A5D68 +// func_i5_801A5D68 void func_801A5D68(Object*); -// func_E6A810_801A5E54 +// func_i5_801A5E54 void func_801A5E54(Object*); -// func_E6A810_801A5F90 +// func_i5_801A5F90 void func_801A5F90(Object*); -// func_E6A810_801A5FD0 +// func_i5_801A5FD0 void func_801A5FD0(Object*); -// func_E6A810_801A6100 +// func_i5_801A6100 void func_801A6100(Object*); -// func_E6A810_801A6144 +// func_i5_801A6144 void func_801A6144(Object*); -// func_E6A810_801A6540 +// func_i5_801A6540 void func_801A6540(Object*); -// func_E6A810_801A6608 +// func_i5_801A6608 void func_801A6608(Object*); -// func_E6A810_801A67C8 +// func_i5_801A67C8 void func_801A67C8(Object*); -// func_E6A810_801A68EC +// func_i5_801A68EC void func_801A68EC(Object*); -// func_E6A810_801A7E7C +// func_i5_801A7E7C void func_801A7E7C(Object*); -// func_E6A810_801AC294 +// func_i5_801AC294 void func_801AC294(Object*); -// func_E6A810_801AC438 +// func_i5_801AC438 void func_801AC438(Object*); -// func_E6A810_801AD6F0 +// func_i5_801AD6F0 void func_801AD6F0(Object*); -// func_E6A810_801ADAC8 +// func_i5_801ADAC8 void func_801ADAC8(Object*); -// func_E6A810_801ADD68 +// func_i5_801ADD68 void func_801ADD68(Object*); -// func_E6A810_801AE2C0 +// func_i5_801AE2C0 void func_801AE2C0(Object*); -// func_E6A810_801AE87C +// func_i5_801AE87C void func_801AE87C(Object*); -// func_E6A810_801AEAA0 +// func_i5_801AEAA0 void func_801AEAA0(Object*); -// func_E6A810_801AEC04 +// func_i5_801AEC04 void func_801AEC04(Object*); -// func_E6A810_801AEEFC +// func_i5_801AEEFC void func_801AEEFC(Object*); // func_E9F1D0_801880E4 @@ -442,7 +442,7 @@ ObjectInfo D_800CC124[0x190] = { /* OBJ_80_15, */ {(void*) D_60361F0, 0, (ObjectFunc) func_80066EA8, D_603E014, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, /* OBJ_80_16, */ {(void*) D_6018E80, 0, (ObjectFunc) func_80066EA8, D_603E030, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, /* OBJ_80_17, */ {(void*) D_6035F10, 0, (ObjectFunc) func_80066EA8, D_603E09C, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, - /* OBJ_80_18, */ {(void*) func_DF4260_8018753C, 1, (ObjectFunc) func_DF4260_80187530, D_603E98C, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, + /* OBJ_80_18, */ {(void*) func_i1_8018753C, 1, (ObjectFunc) func_i1_80187530, D_603E98C, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, /* OBJ_80_19, */ {(void*) D_60153B0, 0, (ObjectFunc) NULL, D_603E118, 100.0f, 0, 0, 39, 0, 0.0f, 0 }, /* OBJ_80_20, */ {(void*) D_601F5A0, 0, (ObjectFunc) NULL, D_603E14C, 500.0f, 0, 0, 39, 0, 0.0f, 0 }, /* OBJ_80_21, */ {(void*) D_60137B0, 0, (ObjectFunc) NULL, D_603E1B4, 400.0f, 0, 0, 39, 0, 0.0f, 0 }, @@ -551,7 +551,7 @@ ObjectInfo D_800CC124[0x190] = { /* OBJ_80_124 */ {(void*) D_600EEF0, 0, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 41, 0, 0.0f, 0 }, /* OBJ_80_125 */ {(void*) D_600BF80, 0, (ObjectFunc) NULL, D_6030E68, 2000.0f, 0, 0, 41, 0, 0.0f, 0 }, /* OBJ_80_126 */ {(void*) func_i3_801BE1FC, 1, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 41, 0, 0.0f, 0 }, - /* OBJ_80_127 */ {(void*) D_9005C80, 0, (ObjectFunc) func_DF4260_801924A8, D_601B678, 1000.0f, 0, 0, 42, 0, 0.0f, 0 }, + /* OBJ_80_127 */ {(void*) D_9005C80, 0, (ObjectFunc) func_i1_801924A8, D_601B678, 1000.0f, 0, 0, 42, 0, 0.0f, 0 }, /* OBJ_80_128 */ {(void*) D_9003F50, 0, (ObjectFunc) NULL, D_601B6C4, 3200.0f, 0, 0, 42, 0, 0.0f, 0 }, /* OBJ_80_129 */ {(void*) D_900F060, 0, (ObjectFunc) NULL, D_601B710, 3200.0f, 0, 0, 42, 0, 0.0f, 0 }, /* OBJ_80_130 */ {(void*) D_900F1D0, 0, (ObjectFunc) NULL, D_601B75C, 3200.0f, 0, 0, 42, 0, 0.0f, 0 }, @@ -730,7 +730,7 @@ ObjectInfo D_800CC124[0x190] = { /* OBJ_BOSS_303 */ {(void*) func_80193434, 2, (ObjectFunc) func_80190078, D_6032550, 20000.0f, 0, 0, 20, 0, 0.0f, 10 }, /* OBJ_BOSS_304 */ {(void*) func_8018FF84, 2, (ObjectFunc) func_8018FE38, D_6032488, 1000.0f, 0, 0, 20, 0, 0.0f, 10 }, /* OBJ_BOSS_305 */ {(void*) func_80190020, 2, (ObjectFunc) func_8018FF20, D_60324EC, 1000.0f, 0, 0, 20, 0, 0.0f, 10 }, - /* OBJ_BOSS_306 */ {(void*) func_801982A8, 1, (ObjectFunc) func_80197A94,D_E6A810_801B83A8, 1000.0f, 0, 0, 40, 1, 0.0f, 10 }, + /* OBJ_BOSS_306 */ {(void*) func_801982A8, 1, (ObjectFunc) func_80197A94,D_i5_801B83A8, 1000.0f, 0, 0, 40, 1, 0.0f, 10 }, /* OBJ_BOSS_ZO */ {(void*) func_i3_801949DC, 2, (ObjectFunc) func_i3_80194A84, D_602C044, 1000.0f, 0, 0, 40, 0, 1.0f, 10 }, /* OBJ_BOSS_308 */ {(void*) func_8008FE78, 1, (ObjectFunc) func_800907C4, D_600FFE0, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, /* OBJ_BOSS_309 */ {(void*) func_8002E604, 1, (ObjectFunc) func_8002E5E0, D_800CBF34, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, @@ -743,7 +743,7 @@ ObjectInfo D_800CC124[0x190] = { /* OBJ_BOSS_316 */ {(void*) func_801968F4, 1, (ObjectFunc) func_801946C4, D_6011058, 0.0f, 0, 0, 40, 0, 0.0f, 10 }, /* OBJ_BOSS_317 */ {(void*) func_80193B1C, 1, (ObjectFunc) func_80193718, D_601115C, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, /* OBJ_BOSS_AQ */ {(void*) func_i3_801B4D84, 2, (ObjectFunc) func_i3_801B134C, D_6030F74, 10000.0f, 0, 0, 40, 0, 0.0f, 10 }, - /* OBJ_BOSS_319 */ {(void*) func_801985E4, 1, (ObjectFunc) func_80194398,D_DF4260_8019A9B8, 3000.0f, 0, 0, 40, 1, 0.0f, 10 }, + /* OBJ_BOSS_319 */ {(void*) func_801985E4, 1, (ObjectFunc) func_80194398,D_i1_8019A9B8, 3000.0f, 0, 0, 40, 1, 0.0f, 10 }, /* OBJ_BOSS_320 */ {(void*) func_801928C8, 2, (ObjectFunc) func_8018DBF0, D_C038DC0, 10000.0f, 0, 0, 40, 0, 0.0f, 10 }, /* OBJ_BOSS_321 */ {(void*) func_8018B8C0, 1, (ObjectFunc) func_80189B70, D_C038F24, 10000.0f, 0, 0, 40, 0, 0.0f, 10 }, /* OBJ_ITEM_LASERS */ {(void*) func_8005CC9C, 1, (ObjectFunc) func_80067F6C, D_800CBFA8, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, diff --git a/src/main/fox_edisplay.c b/src/main/fox_edisplay.c index 16a0432e..dc12db15 100644 --- a/src/main/fox_edisplay.c +++ b/src/main/fox_edisplay.c @@ -284,7 +284,7 @@ void func_8005A094(Actor* actor) { break; } if (gCurrentLevel != LEVEL_SOLAR) { - gSPDisplayList(gMasterDisp++, D_E6A810_801B769C[actor->unk_046]); + gSPDisplayList(gMasterDisp++, D_i5_801B769C[actor->unk_046]); } else { if (gBosses[0].fwork[3] < 4800.0f) { RCP_SetupDL(&gMasterDisp, 0x1E); @@ -323,10 +323,10 @@ void func_8005A094(Actor* actor) { RCP_SetupDL(&gMasterDisp, 0x21); } gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); - gSPDisplayList(gMasterDisp++, D_E6A810_801B7584[actor->unk_048]); + gSPDisplayList(gMasterDisp++, D_i5_801B7584[actor->unk_048]); break; case 47: - gSPDisplayList(gMasterDisp++, D_E6A810_801B7608[actor->unk_048]); + gSPDisplayList(gMasterDisp++, D_i5_801B7608[actor->unk_048]); break; case 48: Graphics_SetScaleMtx(actor->scale); @@ -406,7 +406,7 @@ void func_8005A094(Actor* actor) { gSPDisplayList(gMasterDisp++, D_10177C0); break; case 57: - gSPDisplayList(gMasterDisp++, D_DF4260_8019A008[actor->unk_048]); + gSPDisplayList(gMasterDisp++, D_i1_8019A008[actor->unk_048]); break; default: if (actor->unk_0B8 > 9) { // part of switch tree somehow? @@ -751,7 +751,7 @@ void func_8005BAB4(ObjectId objId, s32 index) { gSPDisplayList(gMasterDisp++, D_1024AC0); break; case OBJ_BOSS_319: - func_DF4260_80198310(&gBosses[index]); + func_i1_80198310(&gBosses[index]); break; } } @@ -1556,7 +1556,7 @@ void Object_DrawAll(s32 arg0) { spAC.x = obj58->sfxPos.x; spAC.y = obj58->sfxPos.y; spAC.z = obj58->sfxPos.z; - Matrix_MultVec3fNoTranslate(&D_E51970_8019EE80, &spAC, &obj58->obj.pos); + Matrix_MultVec3fNoTranslate(&D_i4_8019EE80, &spAC, &obj58->obj.pos); obj58->obj.rot.y = gBosses[0].obj.rot.y + (*obj58).unk_54; } Matrix_Push(&gGfxMatrix); diff --git a/src/main/fox_effect.c b/src/main/fox_effect.c index 65e47f5b..5591c98e 100644 --- a/src/main/fox_effect.c +++ b/src/main/fox_effect.c @@ -2274,7 +2274,7 @@ void func_8007E014(Effect* effect) { f32 y; if (D_801784AC == 4) { - func_E6A810_801B6E20(effect->obj.pos.x, effect->obj.pos.z + D_80177D20, &x, &y, &z); + func_i5_801B6E20(effect->obj.pos.x, effect->obj.pos.z + D_80177D20, &x, &y, &z); effect->obj.pos.y = y + 3.0f; effect->obj.rot.x = (x * 180.0f) / M_PI; effect->obj.rot.z = (z * 180.0f) / M_PI; @@ -2749,7 +2749,7 @@ void func_8007F6B0(Effect* effect) { posY = gGroundLevel + 40.0f; if (D_801784AC == 4) { - func_E6A810_801B6E20(effect->obj.pos.x + sin, effect->obj.pos.z + cos + D_80177D20, &x, &y, &z); + func_i5_801B6E20(effect->obj.pos.x + sin, effect->obj.pos.z + cos + D_80177D20, &x, &y, &z); posY = y + 30.0f; } @@ -2796,7 +2796,7 @@ void func_8007F958(Effect* effect) { posY = gGroundLevel + 10.0f; if (D_801784AC == 4) { - func_E6A810_801B6E20(effect->obj.pos.x + sin, effect->obj.pos.z + cos + D_80177D20, &x, &y, &z); + func_i5_801B6E20(effect->obj.pos.x + sin, effect->obj.pos.z + cos + D_80177D20, &x, &y, &z); posY = y + 10.0f; } @@ -2922,7 +2922,7 @@ void func_8007FE88(Effect* effect) { } if (D_801784AC == 4) { - if (func_E6A810_801B6AEC(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z + D_80177D20) != 0) { + if (func_i5_801B6AEC(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z + D_80177D20) != 0) { Object_Kill(&effect->obj, &effect->sfxPos); } } else if (effect->obj.pos.y < gGroundLevel) { @@ -3052,8 +3052,7 @@ void func_8008040C(Effect* effect) { } if (D_801784AC == 4) { - if (func_E6A810_801B6AEC(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z + D_80177D20) != - 0) { + if (func_i5_801B6AEC(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z + D_80177D20) != 0) { Object_Kill(&effect->obj, &effect->sfxPos); } } else if (effect->obj.pos.y < gGroundLevel) { diff --git a/src/main/fox_enmy.c b/src/main/fox_enmy.c index e4d3e742..52648b9c 100644 --- a/src/main/fox_enmy.c +++ b/src/main/fox_enmy.c @@ -459,13 +459,13 @@ void Object_Load(ObjectInit* objInit, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { if (objInit->id >= OBJ_EFFECT_339 && objInit->id <= OBJ_UNK_406) { switch (objInit->id) { case OBJ_UNK_403: - D_E6A810_801BA1E8 = 99; + D_i5_801BA1E8 = 99; break; case OBJ_UNK_404: - D_E6A810_801BA1E8 = 0; + D_i5_801BA1E8 = 0; break; case OBJ_UNK_405: - D_E6A810_801BA1E8 = 98; + D_i5_801BA1E8 = 98; break; case OBJ_UNK_402: D_E9F1D0_801A7F78 = objInit->unk_E * 0.1f; @@ -1018,8 +1018,8 @@ void Object_Init(s32 index, ObjectId objId) { break; case OBJ_EFFECT_368: if (gCurrentLevel == LEVEL_TITANIA) { - func_E6A810_801B6E20(gEffects[index].obj.pos.x, gEffects[index].obj.pos.z + D_80177D20, &sp54, &sp4C, - &sp50); + func_i5_801B6E20(gEffects[index].obj.pos.x, gEffects[index].obj.pos.z + D_80177D20, &sp54, &sp4C, + &sp50); gEffects[index].obj.pos.y = sp4C + 3.0f; gEffects[index].obj.rot.x = (sp54 * 180.0f) / M_PI; gEffects[index].obj.rot.z = (sp50 * 180.0f) / M_PI; @@ -1169,7 +1169,7 @@ void Object_Init(s32 index, ObjectId objId) { func_E9F1D0_8018D16C(&gBosses[index]); break; case OBJ_BOSS_316: - func_E51970_80193CA4(&gBosses[index]); + func_i4_80193CA4(&gBosses[index]); break; case OBJ_BOSS_314: func_E9F1D0_80197CC4(&gBosses[index]); @@ -1182,40 +1182,40 @@ void Object_Init(s32 index, ObjectId objId) { case OBJ_ACTOR_211: case OBJ_ACTOR_212: case OBJ_ACTOR_213: - func_E6A810_80199F8C(&gActors[index]); + func_i5_80199F8C(&gActors[index]); break; case OBJ_ACTOR_207: - func_E6A810_801A7D98(&gActors[index]); + func_i5_801A7D98(&gActors[index]); break; case OBJ_ACTOR_214: - func_E6A810_801A3E70(&gActors[index]); + func_i5_801A3E70(&gActors[index]); break; case OBJ_ACTOR_215: - func_E6A810_801A4660(&gActors[index]); + func_i5_801A4660(&gActors[index]); break; case OBJ_ACTOR_223: - func_E6A810_801A4AF8(&gActors[index]); + func_i5_801A4AF8(&gActors[index]); break; case OBJ_ACTOR_216: case OBJ_ACTOR_217: - func_E6A810_801A5E2C(&gActors[index]); + func_i5_801A5E2C(&gActors[index]); break; case OBJ_ACTOR_218: - func_E6A810_801A6134(&gActors[index]); + func_i5_801A6134(&gActors[index]); break; case OBJ_80_65: - func_E6A810_801A65E0(&gObjects80[index]); + func_i5_801A65E0(&gObjects80[index]); break; case OBJ_ACTOR_177: case OBJ_ACTOR_178: - func_DF4260_8018B0B4(&gActors[index]); + func_i1_8018B0B4(&gActors[index]); /* fallthrough */ case OBJ_ACTOR_176: gActors[index].unk_0CE = 24; Audio_PlaySfx(0x31000016, &gActors[index].sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); break; case OBJ_BOSS_297: - func_E08400_80188A40(&gBosses[index]); + func_i2_80188A40(&gBosses[index]); break; case OBJ_BOSS_299: func_80042FAC(&gBosses[index]); @@ -1224,37 +1224,37 @@ void Object_Init(s32 index, ObjectId objId) { func_80042FD0(&gBosses[index]); break; case OBJ_BOSS_292: - func_DF4260_801878D8(&gBosses[index]); + func_i1_801878D8(&gBosses[index]); break; case OBJ_BOSS_293: - func_DF4260_8018BE7C(&gBosses[index]); + func_i1_8018BE7C(&gBosses[index]); break; case OBJ_BOSS_A6: func_i3_80187754(&gBosses[index]); break; case OBJ_ACTOR_231: - func_E6A810_8018B96C(&gActors[index]); + func_i5_8018B96C(&gActors[index]); break; case OBJ_ACTOR_232: - func_E6A810_8018ADC4(&gActors[index]); + func_i5_8018ADC4(&gActors[index]); break; case OBJ_ACTOR_233: - func_E6A810_80189B80(&gActors[index]); + func_i5_80189B80(&gActors[index]); break; case OBJ_ACTOR_229: - func_E6A810_8018BFB0(&gActors[index]); + func_i5_8018BFB0(&gActors[index]); break; case OBJ_ACTOR_227: - func_E6A810_8018E3CC(&gActors[index]); + func_i5_8018E3CC(&gActors[index]); break; case OBJ_ACTOR_228: - func_E6A810_8018E5E8(&gActors[index]); + func_i5_8018E5E8(&gActors[index]); break; case OBJ_4C_169: - func_E6A810_8018EFF0(&gObjects4C[index]); + func_i5_8018EFF0(&gObjects4C[index]); break; case OBJ_BOSS_306: - func_E6A810_8018FA48(&gBosses[index]); + func_i5_8018FA48(&gBosses[index]); break; case OBJ_ACTOR_240: func_i3_801915A4(&gActors[index]); @@ -1296,23 +1296,23 @@ void Object_Init(s32 index, ObjectId objId) { func_i3_801B7AF0(&gActors[index]); break; case OBJ_80_57: - func_E6A810_8018F0D8(&gObjects80[index]); + func_i5_8018F0D8(&gObjects80[index]); break; case OBJ_BOSS_319: - func_DF4260_801935CC(&gBosses[index]); + func_i1_801935CC(&gBosses[index]); break; case OBJ_ACTOR_280: - func_DF4260_8019250C(&gActors[index]); + func_i1_8019250C(&gActors[index]); break; case OBJ_ACTOR_281: case OBJ_ACTOR_282: - func_DF4260_80192CB0(&gActors[index]); + func_i1_80192CB0(&gActors[index]); break; case OBJ_ACTOR_283: - func_DF4260_80192EA4(&gActors[index]); + func_i1_80192EA4(&gActors[index]); break; case OBJ_ACTOR_284: - func_DF4260_801933B4(&gActors[index]); + func_i1_801933B4(&gActors[index]); break; case OBJ_ACTOR_265: func_i3_801BA57C(&gActors[index]); @@ -1329,7 +1329,7 @@ void func_800652CC(Object_80* obj80) { f32 sp24; if ((D_801784AC == 4) && (obj80->unk_48 == 0)) { - func_E6A810_801B6E20(obj80->obj.pos.x, obj80->obj.pos.z + D_80177D20, &sp2C, &sp24, &sp28); + func_i5_801B6E20(obj80->obj.pos.x, obj80->obj.pos.z + D_80177D20, &sp2C, &sp24, &sp28); obj80->obj.pos.y = sp24 + 3.0f; obj80->obj.rot.x = (sp2C * 180.0f) / M_PI; obj80->obj.rot.z = (sp28 * 180.0f) / M_PI; @@ -1558,7 +1558,7 @@ void func_800656D4(Actor* actor) { } Math_SmoothStepToAngle(&actor->obj.rot.z, var_fv0, 0.1f, 3.0f, 0.01f); } - if ((D_801784AC == 4) && func_E6A810_801B6AEC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + D_80177D20)) { + if ((D_801784AC == 4) && func_i5_801B6AEC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + D_80177D20)) { func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 5.0f); Object_Kill(&actor->obj, &actor->sfxPos); } @@ -2444,7 +2444,7 @@ void func_800690D0(s32 index, ObjectId objId) { func_8006B0A0(&gActors[index]); break; case OBJ_ACTOR_186: - func_E08400_80187B08(&gActors[index]); + func_i2_80187B08(&gActors[index]); break; case OBJ_ACTOR_181: Object_Kill(&gActors[index].obj, &gActors[index].sfxPos); @@ -2459,13 +2459,13 @@ void func_800690D0(s32 index, ObjectId objId) { func_8006684C(&gActors[index]); break; case OBJ_BOSS_306: - func_E6A810_801990DC(&gBosses[index]); + func_i5_801990DC(&gBosses[index]); break; case OBJ_ACTOR_232: - func_E6A810_8018B720(&gActors[index]); + func_i5_8018B720(&gActors[index]); break; case OBJ_BOSS_319: - func_DF4260_80198594(&gBosses[index]); + func_i1_80198594(&gBosses[index]); break; } } @@ -2497,7 +2497,7 @@ void func_800693E8(Actor* actor) { D_801784A4 = 0; break; case OBJ_ACTOR_229: - func_E6A810_8018E3B0(actor); + func_i5_8018E3B0(actor); break; case OBJ_ACTOR_194: D_80176550[actor->unk_046] = 0; diff --git a/src/main/fox_enmy2.c b/src/main/fox_enmy2.c index 7e3dbdc4..4b8dbe4b 100644 --- a/src/main/fox_enmy2.c +++ b/src/main/fox_enmy2.c @@ -546,7 +546,7 @@ void func_8006C008(Actor* actor) { actor->obj.rot.y += actor->fwork[1]; actor->obj.rot.z += actor->fwork[2]; - func_E6A810_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_80177D20, &sp4C, &sp48, &sp4C); + func_i5_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_80177D20, &sp4C, &sp48, &sp4C); if (actor->obj.pos.y < sp48) { actor->obj.pos.y = sp48; @@ -566,7 +566,7 @@ void func_8006C008(Actor* actor) { break; case 47: - func_E6A810_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_80177D20, &sp4C, &sp48, &sp4C); + func_i5_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_80177D20, &sp4C, &sp48, &sp4C); if (actor->obj.pos.y < actor->fwork[3] + (-100.0f + sp48)) { actor->obj.pos.y = actor->fwork[3] + sp48; @@ -2090,7 +2090,7 @@ void func_800701E0(Actor* actor) { break; case 61: - func_E08400_8018CCF8(actor); + func_i2_8018CCF8(actor); break; case 27: @@ -2198,7 +2198,7 @@ void func_800701E0(Actor* actor) { } if (actor->unk_0B4 == 61) { - func_E08400_8018CCF8(actor); + func_i2_8018CCF8(actor); } } } @@ -4166,7 +4166,7 @@ void func_800763A4(Actor* actor) { } if (D_801784AC == 4) { - if (func_E6A810_801B6AEC(actor->obj.pos.x, actor->obj.pos.y - 10.0f, actor->obj.pos.z + D_80177D20) != 0) { + if (func_i5_801B6AEC(actor->obj.pos.x, actor->obj.pos.y - 10.0f, actor->obj.pos.z + D_80177D20) != 0) { func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 20.0f, actor->obj.pos.z, actor->scale * 6.0f); func_8007BFFC(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z - actor->vel.z, 0.0f, 0.0f, 0.0f, actor->scale * 4.0f, 20); diff --git a/src/main/fox_game.c b/src/main/fox_game.c index 3b8cd100..e053fe4d 100644 --- a/src/main/fox_game.c +++ b/src/main/fox_game.c @@ -245,15 +245,15 @@ void func_800A24DC(s32 arg0) { break; case DRAWMODE_1: func_8003DAF0(); - func_EBFBE0_80187520(104, NULL); + func_menu_80187520(104, NULL); break; case DRAWMODE_2: func_8003DAF0(); - func_EBFBE0_80187520(108, NULL); + func_menu_80187520(108, NULL); break; case DRAW_MAP: func_8003DAF0(); - func_EBFBE0_80187520(106, NULL); + func_menu_80187520(106, NULL); break; case DRAWMODE_4: gPlayerNum = arg0; @@ -261,7 +261,7 @@ void func_800A24DC(s32 arg0) { break; case DRAWMODE_5: func_8003DAF0(); - func_EBFBE0_80187520(110, NULL); + func_menu_80187520(110, NULL); break; case DRAWMODE_6: func_800C2190(); @@ -441,13 +441,13 @@ void func_800A26C0(void) { func_8001D8A8(2, gVolumeSettings[2]); break; case GSTATE_TITLE: - func_EBFBE0_80187520(103, NULL); + func_menu_80187520(103, NULL); break; case GSTATE_MENU: - func_EBFBE0_80187520(107, NULL); + func_menu_80187520(107, NULL); break; case GSTATE_MAP: - func_EBFBE0_8019E8D0(); + func_menu_8019E8D0(); break; case GSTATE_VS_INIT: func_800C20B0(); @@ -456,7 +456,7 @@ void func_800A26C0(void) { func_800B86CC(); break; case GSTATE_GAME_OVER: - func_EBFBE0_80187520(109, NULL); + func_menu_80187520(109, NULL); break; case GSTATE_CREDITS: gDrawMode = DRAWMODE_8; diff --git a/src/main/fox_load.c b/src/main/fox_load.c index 0a18658b..b7dbf078 100644 --- a/src/main/fox_load.c +++ b/src/main/fox_load.c @@ -46,7 +46,7 @@ void Overlay_LoadSegment(void* vRomAddress, void* dest, ptrdiff_t size) { } u8 Overlay_Init(OverlayInit* ovlInit) { - u8* ramPtr = SEGMENT_VRAM_START(ovl_DF4260); + u8* ramPtr = SEGMENT_VRAM_START(ovl_i1); u8 segment; u8 changeOvl = false; @@ -98,34 +98,34 @@ u8 Overlay_Load(u8 ovlSetup, u8 ovlStage) { switch (ovlSetup) { case OVL_SETUP_TITLE: - changeOvl = Overlay_Init(&sOvlEBFBE0_Title[ovlStage]); + changeOvl = Overlay_Init(&sOvlmenu_Title[ovlStage]); if (changeOvl == true) { func_8001DC6C(0, 0x16); } break; case OVL_SETUP_MENU: - changeOvl = Overlay_Init(&sOvlEBFBE0_Menu[ovlStage]); + changeOvl = Overlay_Init(&sOvlmenu_Menu[ovlStage]); break; case OVL_SETUP_MAP: - changeOvl = Overlay_Init(&sOvlEBFBE0_Map[ovlStage]); + changeOvl = Overlay_Init(&sOvlmenu_Map[ovlStage]); break; case OVL_SETUP_STATE_5: - changeOvl = Overlay_Init(&sOvlEBFBE0_State5[ovlStage]); + changeOvl = Overlay_Init(&sOvlmenu_State5[ovlStage]); break; case OVL_SETUP_CORNERIA: - changeOvl = Overlay_Init(&sOvlDF4260_Corneria[ovlStage]); + changeOvl = Overlay_Init(&sOvli1_Corneria[ovlStage]); break; case OVL_SETUP_METEO: - changeOvl = Overlay_Init(&sOvlE08400_Meteo[ovlStage]); + changeOvl = Overlay_Init(&sOvli2_Meteo[ovlStage]); break; case OVL_SETUP_TITANIA: - changeOvl = Overlay_Init(&sOvlE6A810_Titania[ovlStage]); + changeOvl = Overlay_Init(&sOvli5_Titania[ovlStage]); break; case OVL_SETUP_SECTOR_X: - changeOvl = Overlay_Init(&sOvlE08400_SectorX[ovlStage]); + changeOvl = Overlay_Init(&sOvli2_SectorX[ovlStage]); break; case OVL_SETUP_SECTOR_Z: - changeOvl = Overlay_Init(&sOvlE51970_SectorZ[ovlStage]); + changeOvl = Overlay_Init(&sOvli4_SectorZ[ovlStage]); break; case OVL_SETUP_AQUAS: changeOvl = Overlay_Init(&sOvli3_Aquas[ovlStage]); @@ -134,7 +134,7 @@ u8 Overlay_Load(u8 ovlSetup, u8 ovlStage) { changeOvl = Overlay_Init(&sOvli3_Area6[ovlStage]); break; case OVL_SETUP_FORTUNA: - changeOvl = Overlay_Init(&sOvlE51970_Fortuna[ovlStage]); + changeOvl = Overlay_Init(&sOvli4_Fortuna[ovlStage]); break; case OVL_SETUP_UNK_4: changeOvl = Overlay_Init(&sOvli3_Unk4[ovlStage]); @@ -152,28 +152,28 @@ u8 Overlay_Load(u8 ovlSetup, u8 ovlStage) { changeOvl = Overlay_Init(&sOvlE9F1D0_Venom2[ovlStage]); break; case OVL_SETUP_TRAINING: - changeOvl = Overlay_Init(&sOvlDF4260_Training[ovlStage]); + changeOvl = Overlay_Init(&sOvli1_Training[ovlStage]); break; case OVL_SETUP_VENOM_1: - changeOvl = Overlay_Init(&sOvlDF4260_Venom1[ovlStage]); + changeOvl = Overlay_Init(&sOvli1_Venom1[ovlStage]); break; case OVL_SETUP_VENOM_2: changeOvl = Overlay_Init(&sOvlE9F1D0_VenomSW[ovlStage]); break; case OVL_SETUP_20: - changeOvl = Overlay_Init(&sOvlE08400_Setup20[ovlStage]); + changeOvl = Overlay_Init(&sOvli2_Setup20[ovlStage]); break; case OVL_SETUP_BOLSE: - changeOvl = Overlay_Init(&sOvlE51970_Bolse[ovlStage]); + changeOvl = Overlay_Init(&sOvli4_Bolse[ovlStage]); break; case OVL_SETUP_KATINA: - changeOvl = Overlay_Init(&sOvlE51970_Katina[ovlStage]); + changeOvl = Overlay_Init(&sOvli4_Katina[ovlStage]); break; case OVL_SETUP_MACBETH: - changeOvl = Overlay_Init(&sOvlE6A810_Macbeth[ovlStage]); + changeOvl = Overlay_Init(&sOvli5_Macbeth[ovlStage]); break; case OVL_SETUP_VERSUS: - changeOvl = Overlay_Init(&sOvlE08400_Versus[ovlStage]); + changeOvl = Overlay_Init(&sOvli2_Versus[ovlStage]); if (changeOvl == true) { func_8001DC6C(3, 0x310); } diff --git a/src/main/fox_load_inits.c b/src/main/fox_load_inits.c index dcfcef39..924c023c 100644 --- a/src/main/fox_load_inits.c +++ b/src/main/fox_load_inits.c @@ -41,7 +41,7 @@ OverlayInit sNoOvl_Logo[1] = { }; OverlayInit sOvlEF0260_Credits[6] = { - { OVERLAY_OFFSETS(ovl_EF0260), + { OVERLAY_OFFSETS(ovl_ending), { /* 0x1 */ NO_SEGMENT, /* 0x2 */ NO_SEGMENT, /* 0x3 */ ROM_SEGMENT(ast_8BFC00), @@ -57,7 +57,7 @@ OverlayInit sOvlEF0260_Credits[6] = { /* 0xD */ ROM_SEGMENT(ast_955270), /* 0xE */ ROM_SEGMENT(ast_92EC40), /* 0xF */ NO_SEGMENT } }, - { OVERLAY_OFFSETS(ovl_EF0260), + { OVERLAY_OFFSETS(ovl_ending), { /* 0x1 */ NO_SEGMENT, /* 0x2 */ NO_SEGMENT, /* 0x3 */ NO_SEGMENT, @@ -73,7 +73,7 @@ OverlayInit sOvlEF0260_Credits[6] = { /* 0xD */ NO_SEGMENT, /* 0xE */ NO_SEGMENT, /* 0xF */ NO_SEGMENT } }, - { OVERLAY_OFFSETS(ovl_EF0260), + { OVERLAY_OFFSETS(ovl_ending), { /* 0x1 */ NO_SEGMENT, /* 0x2 */ NO_SEGMENT, /* 0x3 */ NO_SEGMENT, @@ -89,7 +89,7 @@ OverlayInit sOvlEF0260_Credits[6] = { /* 0xD */ NO_SEGMENT, /* 0xE */ NO_SEGMENT, /* 0xF */ NO_SEGMENT } }, - { OVERLAY_OFFSETS(ovl_EF0260), + { OVERLAY_OFFSETS(ovl_ending), { /* 0x1 */ NO_SEGMENT, /* 0x2 */ NO_SEGMENT, /* 0x3 */ NO_SEGMENT, @@ -105,7 +105,7 @@ OverlayInit sOvlEF0260_Credits[6] = { /* 0xD */ NO_SEGMENT, /* 0xE */ NO_SEGMENT, /* 0xF */ NO_SEGMENT } }, - { OVERLAY_OFFSETS(ovl_EF0260), + { OVERLAY_OFFSETS(ovl_ending), { /* 0x1 */ NO_SEGMENT, /* 0x2 */ NO_SEGMENT, /* 0x3 */ NO_SEGMENT, @@ -121,7 +121,7 @@ OverlayInit sOvlEF0260_Credits[6] = { /* 0xD */ NO_SEGMENT, /* 0xE */ ROM_SEGMENT(ast_92EC40), /* 0xF */ NO_SEGMENT } }, - { OVERLAY_OFFSETS(ovl_EF0260), + { OVERLAY_OFFSETS(ovl_ending), { /* 0x1 */ NO_SEGMENT, /* 0x2 */ NO_SEGMENT, /* 0x3 */ ROM_SEGMENT(ast_8BFC00), @@ -139,7 +139,7 @@ OverlayInit sOvlEF0260_Credits[6] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sOvlEBFBE0_Title[1] = { +OverlayInit sOvlmenu_Title[1] = { { OVERLAY_OFFSETS(ovl_menu), { /* 0x1 */ NO_SEGMENT, /* 0x2 */ NO_SEGMENT, @@ -158,7 +158,7 @@ OverlayInit sOvlEBFBE0_Title[1] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sOvlEBFBE0_Menu[1] = { +OverlayInit sOvlmenu_Menu[1] = { { OVERLAY_OFFSETS(ovl_menu), { /* 0x1 */ NO_SEGMENT, /* 0x2 */ NO_SEGMENT, @@ -177,7 +177,7 @@ OverlayInit sOvlEBFBE0_Menu[1] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sOvlEBFBE0_Map[1] = { +OverlayInit sOvlmenu_Map[1] = { { OVERLAY_OFFSETS(ovl_menu), { /* 0x1 */ NO_SEGMENT, /* 0x2 */ NO_SEGMENT, @@ -196,7 +196,7 @@ OverlayInit sOvlEBFBE0_Map[1] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sOvlEBFBE0_State5[1] = { +OverlayInit sOvlmenu_State5[1] = { { OVERLAY_OFFSETS(ovl_menu), { /* 0x1 */ NO_SEGMENT, /* 0x2 */ NO_SEGMENT, @@ -215,8 +215,8 @@ OverlayInit sOvlEBFBE0_State5[1] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sOvlDF4260_Corneria[1] = { - { OVERLAY_OFFSETS(ovl_DF4260), +OverlayInit sOvli1_Corneria[1] = { + { OVERLAY_OFFSETS(ovl_i1), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), /* 0x3 */ ROM_SEGMENT(ast_8BFC00), @@ -234,8 +234,8 @@ OverlayInit sOvlDF4260_Corneria[1] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sOvlE08400_Meteo[2] = { - { OVERLAY_OFFSETS(ovl_E08400), +OverlayInit sOvli2_Meteo[2] = { + { OVERLAY_OFFSETS(ovl_i2), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8A68C0), /* 0x3 */ ROM_SEGMENT(ast_8BFC00), @@ -251,7 +251,7 @@ OverlayInit sOvlE08400_Meteo[2] = { /* 0xD */ NO_SEGMENT, /* 0xE */ ROM_SEGMENT(ast_92EC40), /* 0xF */ NO_SEGMENT } }, - { OVERLAY_OFFSETS(ovl_E08400), + { OVERLAY_OFFSETS(ovl_i2), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8A68C0), /* 0x3 */ ROM_SEGMENT(ast_8BFC00), @@ -269,8 +269,8 @@ OverlayInit sOvlE08400_Meteo[2] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sOvlE6A810_Titania[6] = { - { OVERLAY_OFFSETS(ovl_E6A810), +OverlayInit sOvli5_Titania[6] = { + { OVERLAY_OFFSETS(ovl_i5), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), /* 0x3 */ ROM_SEGMENT(ast_8D99F0), @@ -286,7 +286,7 @@ OverlayInit sOvlE6A810_Titania[6] = { /* 0xD */ NO_SEGMENT, /* 0xE */ ROM_SEGMENT(ast_92EC40), /* 0xF */ NO_SEGMENT } }, - { OVERLAY_OFFSETS(ovl_E6A810), + { OVERLAY_OFFSETS(ovl_i5), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), /* 0x3 */ ROM_SEGMENT(ast_8D99F0), @@ -302,7 +302,7 @@ OverlayInit sOvlE6A810_Titania[6] = { /* 0xD */ NO_SEGMENT, /* 0xE */ NO_SEGMENT, /* 0xF */ NO_SEGMENT } }, - { OVERLAY_OFFSETS(ovl_E6A810), + { OVERLAY_OFFSETS(ovl_i5), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), /* 0x3 */ ROM_SEGMENT(ast_8D99F0), @@ -318,7 +318,7 @@ OverlayInit sOvlE6A810_Titania[6] = { /* 0xD */ NO_SEGMENT, /* 0xE */ NO_SEGMENT, /* 0xF */ NO_SEGMENT } }, - { OVERLAY_OFFSETS(ovl_E6A810), + { OVERLAY_OFFSETS(ovl_i5), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), /* 0x3 */ ROM_SEGMENT(ast_8D99F0), @@ -334,7 +334,7 @@ OverlayInit sOvlE6A810_Titania[6] = { /* 0xD */ NO_SEGMENT, /* 0xE */ NO_SEGMENT, /* 0xF */ NO_SEGMENT } }, - { OVERLAY_OFFSETS(ovl_E6A810), + { OVERLAY_OFFSETS(ovl_i5), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), /* 0x3 */ ROM_SEGMENT(ast_8D99F0), @@ -350,7 +350,7 @@ OverlayInit sOvlE6A810_Titania[6] = { /* 0xD */ NO_SEGMENT, /* 0xE */ NO_SEGMENT, /* 0xF */ NO_SEGMENT } }, - { OVERLAY_OFFSETS(ovl_E6A810), + { OVERLAY_OFFSETS(ovl_i5), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), /* 0x3 */ ROM_SEGMENT(ast_8D99F0), @@ -368,8 +368,8 @@ OverlayInit sOvlE6A810_Titania[6] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sOvlE08400_SectorX[2] = { - { OVERLAY_OFFSETS(ovl_E08400), +OverlayInit sOvli2_SectorX[2] = { + { OVERLAY_OFFSETS(ovl_i2), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8A68C0), /* 0x3 */ ROM_SEGMENT(ast_8BFC00), @@ -385,7 +385,7 @@ OverlayInit sOvlE08400_SectorX[2] = { /* 0xD */ ROM_SEGMENT(ast_955270), /* 0xE */ NO_SEGMENT, /* 0xF */ NO_SEGMENT } }, - { OVERLAY_OFFSETS(ovl_E08400), + { OVERLAY_OFFSETS(ovl_i2), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8A68C0), /* 0x3 */ ROM_SEGMENT(ast_8BFC00), @@ -403,8 +403,8 @@ OverlayInit sOvlE08400_SectorX[2] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sOvlE51970_SectorZ[1] = { - { OVERLAY_OFFSETS(ovl_E51970), +OverlayInit sOvli4_SectorZ[1] = { + { OVERLAY_OFFSETS(ovl_i4), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8A68C0), /* 0x3 */ ROM_SEGMENT(ast_8BFC00), @@ -460,8 +460,8 @@ OverlayInit sOvli3_Area6[1] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sOvlE51970_Fortuna[2] = { - { OVERLAY_OFFSETS(ovl_E51970), +OverlayInit sOvli4_Fortuna[2] = { + { OVERLAY_OFFSETS(ovl_i4), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), /* 0x3 */ ROM_SEGMENT(ast_8BFC00), @@ -477,7 +477,7 @@ OverlayInit sOvlE51970_Fortuna[2] = { /* 0xD */ NO_SEGMENT, /* 0xE */ NO_SEGMENT, /* 0xF */ ROM_SEGMENT(ast_940AD0) } }, - { OVERLAY_OFFSETS(ovl_E51970), + { OVERLAY_OFFSETS(ovl_i4), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), /* 0x3 */ ROM_SEGMENT(ast_8BFC00), @@ -515,7 +515,7 @@ OverlayInit sOvli3_Unk4[1] = { }; OverlayInit sOvlE9F1D0_SectorY[1] = { - { OVERLAY_OFFSETS(ovl_E9F1D0), + { OVERLAY_OFFSETS(ovl_i6), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8A68C0), /* 0x3 */ ROM_SEGMENT(ast_8BFC00), @@ -571,8 +571,8 @@ OverlayInit sOvli3_Zoness[1] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sOvlDF4260_Venom1[1] = { - { OVERLAY_OFFSETS(ovl_DF4260), +OverlayInit sOvli1_Venom1[1] = { + { OVERLAY_OFFSETS(ovl_i1), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), /* 0x3 */ ROM_SEGMENT(ast_8BFC00), @@ -591,7 +591,7 @@ OverlayInit sOvlDF4260_Venom1[1] = { }; OverlayInit sOvlE9F1D0_Venom2[1] = { - { OVERLAY_OFFSETS(ovl_E9F1D0), + { OVERLAY_OFFSETS(ovl_i6), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), /* 0x3 */ ROM_SEGMENT(ast_8BFC00), @@ -610,7 +610,7 @@ OverlayInit sOvlE9F1D0_Venom2[1] = { }; OverlayInit sOvlE9F1D0_VenomSW[2] = { - { OVERLAY_OFFSETS(ovl_E9F1D0), + { OVERLAY_OFFSETS(ovl_i6), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), /* 0x3 */ ROM_SEGMENT(ast_8BFC00), @@ -626,7 +626,7 @@ OverlayInit sOvlE9F1D0_VenomSW[2] = { /* 0xD */ NO_SEGMENT, /* 0xE */ NO_SEGMENT, /* 0xF */ ROM_SEGMENT(ast_940AD0) } }, - { OVERLAY_OFFSETS(ovl_E9F1D0), + { OVERLAY_OFFSETS(ovl_i6), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), /* 0x3 */ ROM_SEGMENT(ast_8BFC00), @@ -644,8 +644,8 @@ OverlayInit sOvlE9F1D0_VenomSW[2] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sOvlE08400_Setup20[1] = { - { OVERLAY_OFFSETS(ovl_E08400), +OverlayInit sOvli2_Setup20[1] = { + { OVERLAY_OFFSETS(ovl_i2), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), /* 0x3 */ ROM_SEGMENT(ast_8BFC00), @@ -663,8 +663,8 @@ OverlayInit sOvlE08400_Setup20[1] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sOvlE51970_Bolse[1] = { - { OVERLAY_OFFSETS(ovl_E51970), +OverlayInit sOvli4_Bolse[1] = { + { OVERLAY_OFFSETS(ovl_i4), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8A68C0), /* 0x3 */ ROM_SEGMENT(ast_8BFC00), @@ -682,8 +682,8 @@ OverlayInit sOvlE51970_Bolse[1] = { /* 0xF */ ROM_SEGMENT(ast_940AD0) } }, }; -OverlayInit sOvlE51970_Katina[1] = { - { OVERLAY_OFFSETS(ovl_E51970), +OverlayInit sOvli4_Katina[1] = { + { OVERLAY_OFFSETS(ovl_i4), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), /* 0x3 */ ROM_SEGMENT(ast_8BFC00), @@ -701,8 +701,8 @@ OverlayInit sOvlE51970_Katina[1] = { /* 0xF */ ROM_SEGMENT(ast_940AD0) } }, }; -OverlayInit sOvlE6A810_Macbeth[2] = { - { OVERLAY_OFFSETS(ovl_E6A810), +OverlayInit sOvli5_Macbeth[2] = { + { OVERLAY_OFFSETS(ovl_i5), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), /* 0x3 */ ROM_SEGMENT(ast_8D99F0), @@ -718,7 +718,7 @@ OverlayInit sOvlE6A810_Macbeth[2] = { /* 0xD */ ROM_SEGMENT(ast_955270), /* 0xE */ NO_SEGMENT, /* 0xF */ NO_SEGMENT } }, - { OVERLAY_OFFSETS(ovl_E6A810), + { OVERLAY_OFFSETS(ovl_i5), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), /* 0x3 */ ROM_SEGMENT(ast_8D99F0), @@ -736,8 +736,8 @@ OverlayInit sOvlE6A810_Macbeth[2] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sOvlDF4260_Training[1] = { - { OVERLAY_OFFSETS(ovl_DF4260), +OverlayInit sOvli1_Training[1] = { + { OVERLAY_OFFSETS(ovl_i1), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), /* 0x3 */ ROM_SEGMENT(ast_8BFC00), @@ -755,8 +755,8 @@ OverlayInit sOvlDF4260_Training[1] = { /* 0xF */ ROM_SEGMENT(ast_940AD0) } }, }; -OverlayInit sOvlE08400_Versus[2] = { - { OVERLAY_OFFSETS(ovl_E08400), +OverlayInit sOvli2_Versus[2] = { + { OVERLAY_OFFSETS(ovl_i2), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), /* 0x3 */ ROM_SEGMENT(ast_8E92D0), @@ -772,7 +772,7 @@ OverlayInit sOvlE08400_Versus[2] = { /* 0xD */ NO_SEGMENT, /* 0xE */ NO_SEGMENT, /* 0xF */ NO_SEGMENT } }, - { OVERLAY_OFFSETS(ovl_E08400), + { OVERLAY_OFFSETS(ovl_i2), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8A68C0), /* 0x3 */ ROM_SEGMENT(ast_8E92D0), @@ -791,7 +791,7 @@ OverlayInit sOvlE08400_Versus[2] = { }; OverlayInit sEFFA40_Overlay[1] = { - { OVERLAY_OFFSETS(ovl_EFFA40), + { OVERLAY_OFFSETS(ovl_unused), { /* 0x1 */ NO_SEGMENT, /* 0x2 */ NO_SEGMENT, /* 0x3 */ NO_SEGMENT, diff --git a/src/main/fox_play.c b/src/main/fox_play.c index f14cf89d..5461d540 100644 --- a/src/main/fox_play.c +++ b/src/main/fox_play.c @@ -1573,9 +1573,8 @@ void func_800A8BA4(Player* player) { func_800444BC(player); break; case FORM_BLUE_MARINE: - if (func_E6A810_801B6AEC(player->pos.x, player->pos.y - 12.0f, player->unk_138 + player->unk_144) != - 0) { - func_E6A810_801B6E20(player->pos.x, player->unk_138 + player->unk_144, &spE8, &spE0, &spE4); + if (func_i5_801B6AEC(player->pos.x, player->pos.y - 12.0f, player->unk_138 + player->unk_144) != 0) { + func_i5_801B6E20(player->pos.x, player->unk_138 + player->unk_144, &spE8, &spE0, &spE4); player->pos.y = spE0 + 10.0f; } break; @@ -2399,11 +2398,11 @@ void func_800AB334(void) { func_i3_801A9824(); break; case LEVEL_TITANIA: - func_E6A810_80188F30(); + func_i5_80188F30(); gTeamShields[2] = -2; break; case LEVEL_MACBETH: - func_E6A810_80199920(); + func_i5_80199920(); break; case LEVEL_ZONESS: MEM_ARRAY_ALLOCATE(D_801782C4, 200); @@ -2596,7 +2595,7 @@ void func_800ABAB4(void) { func_800A6148(); D_801782C8 = 0; if (gCurrentLevel == LEVEL_TITANIA) { - func_E6A810_801B5110(0.0f, 0.0f, 200.0f); + func_i5_801B5110(0.0f, 0.0f, 200.0f); } if (gCurrentLevel == LEVEL_AQUAS) { D_80177CC0 = 1000.0f; @@ -2625,23 +2624,23 @@ void func_800ABAB4(void) { switch (gCurrentLevel) { case LEVEL_SECTOR_Z: if (D_8017782C == 0) { - func_E51970_8019EA68(&gObjects58); + func_i4_8019EA68(&gObjects58); func_8002F180(); } break; case LEVEL_FORTUNA: - func_E51970_8018BA2C(&gObjects58); + func_i4_8018BA2C(&gObjects58); func_8002F180(); break; case LEVEL_KATINA: - func_E51970_80198930(&gObjects58); + func_i4_80198930(&gObjects58); if (D_8017782C == 0) { func_8002F180(); } break; case LEVEL_BOLSE: if (D_8017782C == 0) { - func_E51970_80191ED8(&gObjects58); + func_i4_80191ED8(&gObjects58); func_8002F180(); } break; @@ -4137,7 +4136,7 @@ void func_800B0F50(Player* playerx) { if ((D_80177CA0 > 0) && (gLevelMode == LEVELMODE_ON_RAILS)) { if (gCurrentLevel == LEVEL_MACBETH) { sp2E = D_80177DC8; - func_E6A810_801AD080(); + func_i5_801AD080(); D_80177DC8 = sp2E; } func_80062568(); @@ -4228,7 +4227,7 @@ void func_800B0F50(Player* playerx) { break; case LEVEL_BOLSE: player->unk_204 = 1; - D_E51970_801A03DC = 6; + D_i4_801A03DC = 6; /* fallthrough */ case LEVEL_SECTOR_X: case LEVEL_AREA_6: @@ -4267,7 +4266,7 @@ void func_800B0F50(Player* playerx) { for (sp34 = D_80178310, i = 0; i < D_80177DC8; i++, sp34++) { Object_Load(sp34, 4000.0f, -4000.0f, 4000.0f, -4000.0f); } - func_E6A810_801ACFBC(sp34); + func_i5_801ACFBC(sp34); } } if (player->state_1C8 == PLAYERSTATE_1C8_2) { @@ -6068,7 +6067,7 @@ void func_800B79B0(void) { switch (gCurrentLevel) { case LEVEL_TRAINING: if (gLevelMode == LEVELMODE_ALL_RANGE) { - func_DF4260_8019949C(); + func_i1_8019949C(); } break; case LEVEL_VERSUS: @@ -6331,7 +6330,7 @@ void func_800B86CC(void) { } else if (gCurrentLevel == LEVEL_VENOM_ANDROSS) { func_800A57E0(); } else if (gCurrentLevel == LEVEL_TRAINING) { - func_DF4260_80198C50(); + func_i1_80198C50(); } func_800B86A4(&gPlayer[0].pos.z); func_800B86A4(&gPlayer[0].unk_138); diff --git a/src/main/fox_versus.c b/src/main/fox_versus.c index 7a372d6b..22041b36 100644 --- a/src/main/fox_versus.c +++ b/src/main/fox_versus.c @@ -1706,7 +1706,7 @@ bool func_800C176C(void) { if (D_80178830 > 224) { func_800BC760(); - D_EBFBE0_801B827C = 1; + D_menu_801B827C = 1; } } break; diff --git a/src/main/sf_hud.c b/src/main/sf_hud.c index 6d48d97f..11a46524 100644 --- a/src/main/sf_hud.c +++ b/src/main/sf_hud.c @@ -1587,7 +1587,7 @@ void func_8008F96C(void) { } if (gCurrentLevel == LEVEL_TRAINING) { - func_DF4260_801988E0(); + func_i1_801988E0(); } } diff --git a/src/mods/sfxjukebox.c b/src/mods/sfxjukebox.c index 35c216f7..3cf6659a 100644 --- a/src/mods/sfxjukebox.c +++ b/src/mods/sfxjukebox.c @@ -82,22 +82,22 @@ void Option_ExpertSoundUpdate(void) { func_800182F4(0x100100FF); func_800182F4(0x110100FF); Audio_PlaySfx(sfx, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B9320 = true; + D_menu_801B9320 = true; } if (gControllerPress[gMainController].button & B_BUTTON) { - if (!D_EBFBE0_801B9320) { + if (!D_menu_801B9320) { func_8001D444(0, 36, 0, 255); gDrawMode = DRAWMODE_0; - D_EBFBE0_801B9124 = 1000; - D_EBFBE0_801B912C = 0; - D_EBFBE0_801B9244 = 1; + D_menu_801B9124 = 1000; + D_menu_801B912C = 0; + D_menu_801B9244 = 1; } else { Audio_PlaySfx(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); Audio_KillSfx(&D_800C5D28); func_800182F4(0x100100FF); func_800182F4(0x110100FF); - D_EBFBE0_801B9320 = false; + D_menu_801B9320 = false; } } diff --git a/src/overlays/ovl_DF4260/DF4260.c b/src/overlays/ovl_DF4260/DF4260.c deleted file mode 100644 index b0d3e3d8..00000000 --- a/src/overlays/ovl_DF4260/DF4260.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "global.h" - -static s32 D_DF4260_801997D0 = 0; - -s32 D_DF4260_8019B6C0; - -void func_DF4260_80187520(s32 arg0, void* arg1) { -} diff --git a/src/overlays/ovl_DF4260/DFEE30.c b/src/overlays/ovl_DF4260/DFEE30.c deleted file mode 100644 index 78559903..00000000 --- a/src/overlays/ovl_DF4260/DFEE30.c +++ /dev/null @@ -1,76 +0,0 @@ -#include "global.h" -#include "DFEE30.h" - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_801920F0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_801922DC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80192358.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_801923C0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_8019243C.s") - -void func_DF4260_801924A8(Object_80* arg0) { - switch (arg0->unk_48) { - case 0: - if (gPlayer[0].pos.z < arg0->obj.pos.z) { - D_80177AB0 = 0; - D_80177A98 = 0; - - arg0->unk_48++; - } - - case 1: - return; - } -} - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_8019250C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80192518.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80192AA4.s") - -void func_DF4260_80192CB0(Actor* actor) { - actor->iwork[0] = actor->obj.rot.x; - actor->obj.rot.x = 0.0f; -} - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80192CD4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80192E2C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80192EA4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80192EB0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_801933B4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_801933DC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_801934D0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80193540.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_801935CC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_801937F4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80193D64.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80194398.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80198310.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80198414.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80198594.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_801985E4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_8019864C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_801988B8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/D_DF4260_8019B2B0.s") diff --git a/src/overlays/ovl_DF4260/E05620.c b/src/overlays/ovl_DF4260/E05620.c deleted file mode 100644 index 388a267f..00000000 --- a/src/overlays/ovl_DF4260/E05620.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/E05620/func_DF4260_801988E0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/E05620/func_DF4260_80198968.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/E05620/D_DF4260_8019B640.s") diff --git a/src/overlays/ovl_DF4260/E05990.c b/src/overlays/ovl_DF4260/E05990.c deleted file mode 100644 index 7484acb7..00000000 --- a/src/overlays/ovl_DF4260/E05990.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "common.h" - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/E05990/func_DF4260_80198C50.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/E05990/func_DF4260_80198DCC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/E05990/func_DF4260_80199024.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/E05990/func_DF4260_8019949C.s") diff --git a/src/overlays/ovl_E08400/E08400.c b/src/overlays/ovl_E08400/E08400.c deleted file mode 100644 index 5ad4230f..00000000 --- a/src/overlays/ovl_E08400/E08400.c +++ /dev/null @@ -1,99 +0,0 @@ -#include "common.h" - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_80187520.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_80187530.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_8018756C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_80187650.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_801877C4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_8018795C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_80187B08.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_80187C68.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_80187D08.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_80187D98.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_80187E38.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_80187FF8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_80188088.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_801881A8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_80188228.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_80188298.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_80188344.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_801887D0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_80188A40.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_80188B84.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_80188C2C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_80188CAC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_80188E8C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_80188F2C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_80188FAC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_80189114.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_801892F0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_80189624.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_8018978C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_8018B7C4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_8018BACC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_8018C77C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_8018C8F4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_8018CA10.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_8018CAD8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_8018CB50.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_8018CCF8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_8018CD8C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_8018D9EC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_8018DA6C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_8018DAEC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_8018DB6C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_8018DBEC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_8018DCE4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_8018DE14.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_8018DF08.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_8018E084.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/func_E08400_8018ED9C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E08400/D_E08400_80195790.s") diff --git a/src/overlays/ovl_E08400/E0FF10.c b/src/overlays/ovl_E08400/E0FF10.c deleted file mode 100644 index 94feb7a5..00000000 --- a/src/overlays/ovl_E08400/E0FF10.c +++ /dev/null @@ -1,47 +0,0 @@ -#include "common.h" - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E0FF10/func_E08400_8018F030.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E0FF10/func_E08400_8018F124.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E0FF10/func_E08400_8018F1DC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E0FF10/func_E08400_8018F330.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E0FF10/func_E08400_8018F884.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E0FF10/func_E08400_8018FA04.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E0FF10/func_E08400_8018FBBC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E0FF10/func_E08400_8018FE38.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E0FF10/func_E08400_8018FF20.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E0FF10/func_E08400_8018FF40.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E0FF10/func_E08400_8018FF84.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E0FF10/func_E08400_8018FFDC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E0FF10/func_E08400_80190020.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E0FF10/func_E08400_80190078.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E0FF10/func_E08400_80192AF0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E0FF10/func_E08400_80193208.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E0FF10/func_E08400_80193434.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E0FF10/func_E08400_80193800.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E0FF10/func_E08400_801938D8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E0FF10/func_E08400_80193A30.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E0FF10/func_E08400_801944D4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E0FF10/func_E08400_80194728.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E08400/E0FF10/D_E08400_80195A50.s") diff --git a/src/overlays/ovl_E51970/E51970.c b/src/overlays/ovl_E51970/E51970.c deleted file mode 100644 index 6e0bc169..00000000 --- a/src/overlays/ovl_E51970/E51970.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E51970/func_E51970_80187520.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E51970/D_E51970_8019F6E0.s") diff --git a/src/overlays/ovl_E51970/E51A40.c b/src/overlays/ovl_E51970/E51A40.c deleted file mode 100644 index b76d1b4c..00000000 --- a/src/overlays/ovl_E51970/E51A40.c +++ /dev/null @@ -1,29 +0,0 @@ -#include "common.h" - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E51A40/func_E51970_801875F0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E51A40/func_E51970_80187884.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E51A40/func_E51970_80187960.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E51A40/func_E51970_801888C0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E51A40/func_E51970_80188A48.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E51A40/func_E51970_80188AD0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E51A40/func_E51970_80188DA0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E51A40/func_E51970_80188F08.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E51A40/func_E51970_80188FE4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E51A40/func_E51970_8018906C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E51A40/func_E51970_801890EC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E51A40/func_E51970_8018927C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E51A40/func_E51970_8018BA2C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E51A40/D_E51970_8019F720.s") diff --git a/src/overlays/ovl_E51970/E561B0.c b/src/overlays/ovl_E51970/E561B0.c deleted file mode 100644 index 883f1f51..00000000 --- a/src/overlays/ovl_E51970/E561B0.c +++ /dev/null @@ -1,91 +0,0 @@ -#include "common.h" - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_8018BD60.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_8018BEF8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_8018C158.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_8018CC60.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_8018CCE8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_8018CE5C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_8018D008.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_8018D124.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_8018D278.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_8018D394.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_8018D414.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_8018D454.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_8018D4F0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_8018D584.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_8018D7F0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_8018D874.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_8018D960.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_8018D9CC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_8018DE8C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_8018E05C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_8018E3FC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_8018E710.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_8018E870.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_8018EAEC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_8018EC1C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_8018ECB4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_8018ED44.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_8018EE4C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_8018EF6C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_8018F83C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_8018F94C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_80190D98.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_80190EE4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_80190F58.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_80190FE8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_80191054.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_80191180.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_801912FC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_801918E4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_80191A6C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_80191AFC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_80191BAC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_80191DB0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_80191ED8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E561B0/func_E51970_80192264.s") diff --git a/src/overlays/ovl_E51970/E5CC30.c b/src/overlays/ovl_E51970/E5CC30.c deleted file mode 100644 index d5af4ffb..00000000 --- a/src/overlays/ovl_E51970/E5CC30.c +++ /dev/null @@ -1,63 +0,0 @@ -#include "common.h" - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E5CC30/func_E51970_801927E0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E5CC30/func_E51970_80192908.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E5CC30/func_E51970_80192984.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E5CC30/func_E51970_80192A68.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E5CC30/func_E51970_80192B4C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E5CC30/func_E51970_80192C08.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E5CC30/func_E51970_80192C8C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E5CC30/func_E51970_80192E20.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E5CC30/func_E51970_80193718.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E5CC30/func_E51970_80193B1C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E5CC30/func_E51970_80193CA4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E5CC30/func_E51970_80193CE4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E5CC30/func_E51970_80193EF0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E5CC30/func_E51970_80194458.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E5CC30/func_E51970_801945FC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E5CC30/func_E51970_801946C4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E5CC30/func_E51970_801965A8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E5CC30/func_E51970_801968F4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E5CC30/func_E51970_80196E30.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E5CC30/func_E51970_80196F40.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E5CC30/func_E51970_80197024.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E5CC30/func_E51970_80197290.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E5CC30/func_E51970_80197F10.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E5CC30/func_E51970_801981F8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E5CC30/func_E51970_8019848C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E5CC30/func_E51970_80198594.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E5CC30/func_E51970_80198930.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E5CC30/func_E51970_801989F4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E5CC30/func_E51970_80198AA0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E5CC30/func_E51970_801995B4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E5CC30/D_E51970_8019FD20.s") diff --git a/src/overlays/ovl_E51970/E63D50.c b/src/overlays/ovl_E51970/E63D50.c deleted file mode 100644 index 7f782fd9..00000000 --- a/src/overlays/ovl_E51970/E63D50.c +++ /dev/null @@ -1,55 +0,0 @@ -#include "common.h" - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E63D50/func_E51970_80199900.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E63D50/func_E51970_80199B18.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E63D50/func_E51970_80199BDC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E63D50/func_E51970_80199C60.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E63D50/func_E51970_80199FCC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E63D50/func_E51970_8019A0F8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E63D50/func_E51970_8019A1D0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E63D50/func_E51970_8019A2F4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E63D50/func_E51970_8019A3E8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E63D50/func_E51970_8019AA9C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E63D50/func_E51970_8019AB8C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E63D50/func_E51970_8019B48C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E63D50/func_E51970_8019B568.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E63D50/func_E51970_8019B630.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E63D50/func_E51970_8019B75C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E63D50/func_E51970_8019B888.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E63D50/func_E51970_8019BA64.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E63D50/func_E51970_8019C574.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E63D50/func_E51970_8019C70C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E63D50/func_E51970_8019C85C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E63D50/func_E51970_8019DD20.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E63D50/func_E51970_8019E234.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E63D50/func_E51970_8019E3A8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E63D50/func_E51970_8019E454.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E63D50/func_E51970_8019E98C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E63D50/func_E51970_8019EA68.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E51970/E63D50/D_E51970_801A00C0.s") diff --git a/src/overlays/ovl_E6A810/E6A810.c b/src/overlays/ovl_E6A810/E6A810.c deleted file mode 100644 index 7da95107..00000000 --- a/src/overlays/ovl_E6A810/E6A810.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6A810/func_E6A810_80187520.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6A810/func_E6A810_80187530.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6A810/func_E6A810_801875D0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6A810/func_E6A810_8018769C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6A810/func_E6A810_80188108.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6A810/func_E6A810_801882CC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6A810/D_E6A810_801BA9E0.s") diff --git a/src/overlays/ovl_E6A810/E6C220.c b/src/overlays/ovl_E6A810/E6C220.c deleted file mode 100644 index bd41225f..00000000 --- a/src/overlays/ovl_E6A810/E6C220.c +++ /dev/null @@ -1,141 +0,0 @@ -#include "common.h" - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_80188F30.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_80188F60.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_80188FA8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_80189090.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_80189120.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_80189194.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_801891B4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_801891F4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_80189380.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_801895B8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_80189AFC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_80189B80.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_80189CC8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018A1C0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018A2E8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018A3F4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018A474.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018A544.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018AABC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018AB44.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018ADC4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018AFD4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018AFF0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018B144.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018B1B4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018B268.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018B6AC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018B720.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018B96C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018B9D0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018BE84.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018BFB0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018C118.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018C134.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018C370.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018C3D8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018C72C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018C8A8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018E2D8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018E3B0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018E3CC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018E54C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018E5B4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018E5E8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018E5F8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018EF14.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018EFF0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018F038.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018F0D8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018F134.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018F4D8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018F8B8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018FA48.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8018FC70.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8019002C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_801903A0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_8019081C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_80190A08.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_80191AE8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_80192118.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_80193B30.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_80193DF0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_80197A94.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_801982A8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/func_E6A810_801990DC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/D_E6A810_801BAA50.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/D_E6A810_801BAA54.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/D_E6A810_801BAA78.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/D_E6A810_801BAABC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E6C220/D_E6A810_801BAB0C.s") diff --git a/src/overlays/ovl_E6A810/E7CC10.c b/src/overlays/ovl_E6A810/E7CC10.c deleted file mode 100644 index ad0e3e81..00000000 --- a/src/overlays/ovl_E6A810/E7CC10.c +++ /dev/null @@ -1,279 +0,0 @@ -#include "common.h" - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_80199920.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_80199A40.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_80199C20.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_80199D88.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_80199F8C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_8019A128.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_8019A198.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_8019A2F4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_8019A728.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_8019A830.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_8019A87C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_8019A8C8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_8019AF34.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_8019B580.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_8019B8B0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_8019BBEC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_8019BE50.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_8019C4EC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_8019C5B8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_8019C6C4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_8019C778.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_8019CE88.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_8019D048.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_8019D5C8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_8019D670.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_8019D700.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_8019D910.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_8019E410.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_8019E624.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_8019EA60.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_8019EBF8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_8019EE68.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_8019F164.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_8019FC54.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_8019FF9C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A015C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A0308.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A0A74.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A0B00.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A0B20.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A0BD8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A0DD8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A0E2C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A0EB8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A1268.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A12C4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A23AC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A2A78.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A2B24.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A2DD8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A30B8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A3240.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A3300.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A3790.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A3C20.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A3E70.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A3E98.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A41B0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A43BC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A4660.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A46A0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A49B8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A4A64.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A4AF8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A4B24.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A5124.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A54AC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A54E8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A55D4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A57D0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A5AF0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A5B4C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A5D68.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A5E2C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A5E54.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A5F90.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A5FC4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A5FD0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A6100.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A6134.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A6144.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A6540.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A65E0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A6608.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A67BC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A67C8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A68EC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A68F8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A6984.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A6C78.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A6FB4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A72DC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A74C4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A78B0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A7A30.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A7CAC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A7D98.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801A7E7C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801ABC14.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801AC1C0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801AC294.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801AC42C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801AC438.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801AC5AC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801AC6B4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801AC754.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801ACE40.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801ACF6C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801ACFBC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801AD080.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801AD144.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801AD554.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801AD624.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801AD6F0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801ADAC8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801ADC08.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801ADCEC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801ADD68.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801AE2C0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801AE4CC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801AE610.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801AE694.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801AE800.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801AE87C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801AEAA0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801AEC04.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801AEEFC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801AF134.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801AF200.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801AF27C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801AF44C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801AF628.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801AF70C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801AF8F4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801B28BC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801B3554.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801B3718.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801B38E0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E7CC10/func_E6A810_801B3D04.s") diff --git a/src/overlays/ovl_E6A810/E97CC0.c b/src/overlays/ovl_E6A810/E97CC0.c deleted file mode 100644 index c9c98b2b..00000000 --- a/src/overlays/ovl_E6A810/E97CC0.c +++ /dev/null @@ -1,27 +0,0 @@ -#include "common.h" - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E97CC0/func_E6A810_801B49D0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E97CC0/func_E6A810_801B4A54.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E97CC0/func_E6A810_801B4AA8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E97CC0/func_E6A810_801B5110.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E97CC0/func_E6A810_801B5244.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E97CC0/func_E6A810_801B58AC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E97CC0/func_E6A810_801B5FE0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E97CC0/func_E6A810_801B68A8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E97CC0/func_E6A810_801B6AEC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E97CC0/func_E6A810_801B6B40.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E97CC0/func_E6A810_801B6E20.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E97CC0/func_E6A810_801B7240.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E6A810/E97CC0/D_E6A810_801BBDF0.s") diff --git a/src/overlays/ovl_E9F1D0/E9F1D0.c b/src/overlays/ovl_E9F1D0/E9F1D0.c deleted file mode 100644 index d0efef83..00000000 --- a/src/overlays/ovl_E9F1D0/E9F1D0.c +++ /dev/null @@ -1,127 +0,0 @@ -#include "common.h" - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_80187520.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_80187530.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_8018767C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_8018769C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_801876FC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_801878A8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_80187C5C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_801880E4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_80188448.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_80188468.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_80188528.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_80188660.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_801887B0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_8018887C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_801888F4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_80188A4C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_80188CB8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_80189098.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_80189214.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_8018933C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_801893B8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_80189470.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_80189724.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_801899E4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_80189B00.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_80189B70.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_8018B47C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_8018B8C0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_8018BDD8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_8018C390.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_8018C660.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_8018C734.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_8018C7A0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_8018C8D4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_8018C958.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_8018CA50.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_8018CAD4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_8018CF98.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_8018D0D8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_8018D16C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_8018D2B0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_8018D9C0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_8018DA94.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_8018DBF0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_801917F0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_801924B4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_801928C8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_80192E94.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_80193244.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_80193380.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_801934EC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_8019350C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_8019356C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_801935B4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_801935D4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_80193668.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_80193710.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_801939A0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_80193AE4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_80193C4C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_80195E44.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/func_E9F1D0_801961AC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/E9F1D0/D_E9F1D0_801A6B90.s") diff --git a/src/overlays/ovl_E9F1D0/EADECO.c b/src/overlays/ovl_E9F1D0/EADECO.c deleted file mode 100644 index 632e8297..00000000 --- a/src/overlays/ovl_E9F1D0/EADECO.c +++ /dev/null @@ -1,17 +0,0 @@ -#include "common.h" - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EADECO/func_E9F1D0_80196210.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EADECO/func_E9F1D0_8019624C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EADECO/func_E9F1D0_80196288.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EADECO/func_E9F1D0_801962F4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EADECO/func_E9F1D0_80196314.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EADECO/func_E9F1D0_80196968.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EADECO/func_E9F1D0_80196BF8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EADECO/func_E9F1D0_80196D88.s") diff --git a/src/overlays/ovl_E9F1D0/EAF7E0.c b/src/overlays/ovl_E9F1D0/EAF7E0.c deleted file mode 100644 index 264ef5e6..00000000 --- a/src/overlays/ovl_E9F1D0/EAF7E0.c +++ /dev/null @@ -1,105 +0,0 @@ -#include "common.h" - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_80197B30.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_80197C64.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_80197CB8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_80197CC4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_80197F18.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_80197F84.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_80198238.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_80198244.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_801983E4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_80198ABC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_80198CE4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_80198F5C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_80199438.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_80199D64.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_80199DAC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_8019A434.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_8019A520.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_8019A640.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_8019A66C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_8019A82C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_8019A898.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_8019AA08.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_8019AAF0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_8019AEC0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_8019AEEC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_8019B528.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_8019B5CC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_8019B6E8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_8019BBBC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_8019BC14.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_8019C194.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_8019C888.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_8019DC4C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_8019DE10.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_8019E014.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_8019E2C4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_8019EB80.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_8019EE60.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_8019FF00.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_801A0510.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_801A06A4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_801A07FC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_801A0A08.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_801A0AC0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_801A39FC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_801A3B50.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_801A3BD4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_801A4A18.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_801A4C34.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_801A4CB0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_801A4E44.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EAF7E0/func_E9F1D0_801A52B8.s") diff --git a/src/overlays/ovl_E9F1D0/EBD210.c b/src/overlays/ovl_E9F1D0/EBD210.c deleted file mode 100644 index b1264b88..00000000 --- a/src/overlays/ovl_E9F1D0/EBD210.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "common.h" - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EBD210/func_E9F1D0_801A5560.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EBD210/func_E9F1D0_801A581C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EBD210/func_E9F1D0_801A58A8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EBD210/func_E9F1D0_801A5AD4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EBD210/func_E9F1D0_801A5FC0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_E9F1D0/EBD210/func_E9F1D0_801A6164.s") diff --git a/src/overlays/ovl_EF0260/EF0260.c b/src/overlays/ovl_EF0260/EF0260.c deleted file mode 100644 index 19751999..00000000 --- a/src/overlays/ovl_EF0260/EF0260.c +++ /dev/null @@ -1,67 +0,0 @@ -#include "common.h" - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_80187520.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_801876A4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_80187860.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_80187D3C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_80188030.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_80188394.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_8018845C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_80188634.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_801886F4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_801888F4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_80188DB4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_80189108.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_80189C64.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_8018A024.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_8018A124.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_8018A2A8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_8018A570.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_8018A828.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_8018A8FC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_8018A96C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_8018AAC4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_8018ABE8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_8018B174.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_8018B3D8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_8018B3E8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_8018B52C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_8018B624.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_8018B6D8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_8018B860.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_8018BAD0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_8018BCB0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/func_EF0260_8018C21C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF0260/D_EF0260_80196240.s") diff --git a/src/overlays/ovl_EF0260/EF5B60.c b/src/overlays/ovl_EF0260/EF5B60.c deleted file mode 100644 index 8cde41b4..00000000 --- a/src/overlays/ovl_EF0260/EF5B60.c +++ /dev/null @@ -1,221 +0,0 @@ -#include "common.h" - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/func_EF0260_8018CE20.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/func_EF0260_8018D250.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/func_EF0260_8018D28C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/func_EF0260_8018D2C8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/func_EF0260_8018D398.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/func_EF0260_8018D4BC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/func_EF0260_8018D638.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/func_EF0260_8018D814.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196640.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_8019664C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196660.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_8019666C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_8019667C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_8019668C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_8019669C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_801966B0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_801966C0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_801966D0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_801966DC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_801966EC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196708.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196718.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_8019672C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196740.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196750.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196760.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196774.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196788.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196798.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_801967AC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_801967C0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_801967D0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_801967DC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_801967EC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_801967FC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196808.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196818.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_8019682C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196838.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_8019684C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_8019685C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_8019686C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_8019687C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196890.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_801968A4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_801968B0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_801968BC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_801968CC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_801968D8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_801968EC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_801968F8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196904.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196910.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196928.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196938.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_8019694C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_8019695C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196974.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196980.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196994.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_801969A8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_801969C0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_801969D0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_801969E0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_801969F0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196A08.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196A1C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196A30.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196A40.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196A4C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196A5C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196A70.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196A84.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196A94.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196AA0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196AB4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196AC4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196AD8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196AE4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196AF0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196B08.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196B14.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196B20.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196B30.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196B40.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196B54.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/D_EF0260_80196B68.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/func_EF0260_8018DA0C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/func_EF0260_8018DCB4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/func_EF0260_8018E1B8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/func_EF0260_8018E7B8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/func_EF0260_8018EDB8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/func_EF0260_8018F2A8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/func_EF0260_8018F64C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/func_EF0260_8018FC60.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/func_EF0260_80190274.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/func_EF0260_80190648.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/func_EF0260_80190778.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/func_EF0260_80190CF0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/func_EF0260_80191234.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/func_EF0260_80191294.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/func_EF0260_80191700.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/func_EF0260_80191710.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/func_EF0260_80191C58.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/func_EF0260_80191C7C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/func_EF0260_80192164.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/func_EF0260_80192290.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/func_EF0260_8019237C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/func_EF0260_801924EC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EF0260/EF5B60/func_EF0260_801926D4.s") diff --git a/src/overlays/ovl_EFFA40/EFFA40.c b/src/overlays/ovl_EFFA40/EFFA40.c deleted file mode 100644 index 84b439cc..00000000 --- a/src/overlays/ovl_EFFA40/EFFA40.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "common.h" - -void func_EFFA40_80187520(void) { -} diff --git a/src/overlays/ovl_ending/EF0260.c b/src/overlays/ovl_ending/EF0260.c new file mode 100644 index 00000000..ef9bb60e --- /dev/null +++ b/src/overlays/ovl_ending/EF0260.c @@ -0,0 +1,67 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_80187520.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_801876A4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_80187860.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_80187D3C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_80188030.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_80188394.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018845C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_80188634.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_801886F4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_801888F4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_80188DB4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_80189108.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_80189C64.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018A024.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018A124.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018A2A8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018A570.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018A828.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018A8FC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018A96C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018AAC4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018ABE8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018B174.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018B3D8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018B3E8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018B52C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018B624.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018B6D8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018B860.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018BAD0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018BCB0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018C21C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/D_EF0260_80196240.s") diff --git a/src/overlays/ovl_ending/EF5B60.c b/src/overlays/ovl_ending/EF5B60.c new file mode 100644 index 00000000..b93b79d4 --- /dev/null +++ b/src/overlays/ovl_ending/EF5B60.c @@ -0,0 +1,221 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018CE20.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018D250.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018D28C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018D2C8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018D398.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018D4BC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018D638.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018D814.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196640.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_8019664C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196660.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_8019666C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_8019667C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_8019668C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_8019669C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801966B0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801966C0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801966D0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801966DC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801966EC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196708.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196718.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_8019672C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196740.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196750.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196760.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196774.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196788.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196798.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801967AC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801967C0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801967D0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801967DC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801967EC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801967FC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196808.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196818.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_8019682C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196838.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_8019684C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_8019685C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_8019686C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_8019687C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196890.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801968A4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801968B0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801968BC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801968CC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801968D8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801968EC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801968F8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196904.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196910.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196928.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196938.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_8019694C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_8019695C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196974.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196980.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196994.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801969A8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801969C0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801969D0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801969E0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801969F0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196A08.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196A1C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196A30.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196A40.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196A4C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196A5C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196A70.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196A84.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196A94.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196AA0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196AB4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196AC4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196AD8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196AE4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196AF0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196B08.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196B14.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196B20.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196B30.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196B40.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196B54.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196B68.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018DA0C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018DCB4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018E1B8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018E7B8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018EDB8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018F2A8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018F64C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018FC60.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_80190274.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_80190648.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_80190778.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_80190CF0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_80191234.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_80191294.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_80191700.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_80191710.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_80191C58.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_80191C7C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_80192164.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_80192290.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8019237C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_801924EC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_801926D4.s") diff --git a/src/overlays/ovl_i1/DFEE30.c b/src/overlays/ovl_i1/DFEE30.c new file mode 100644 index 00000000..0ae7c527 --- /dev/null +++ b/src/overlays/ovl_i1/DFEE30.c @@ -0,0 +1,76 @@ +#include "global.h" +#include "DFEE30.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_801920F0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_801922DC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_80192358.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_801923C0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_8019243C.s") + +void func_i1_801924A8(Object_80* arg0) { + switch (arg0->unk_48) { + case 0: + if (gPlayer[0].pos.z < arg0->obj.pos.z) { + D_80177AB0 = 0; + D_80177A98 = 0; + + arg0->unk_48++; + } + + case 1: + return; + } +} + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_8019250C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_80192518.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_80192AA4.s") + +void func_i1_80192CB0(Actor* actor) { + actor->iwork[0] = actor->obj.rot.x; + actor->obj.rot.x = 0.0f; +} + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_80192CD4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_80192E2C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_80192EA4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_80192EB0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_801933B4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_801933DC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_801934D0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_80193540.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_801935CC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_801937F4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_80193D64.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_80194398.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_80198310.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_80198414.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_80198594.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_801985E4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_8019864C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_801988B8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/D_i1_8019B2B0.s") diff --git a/src/overlays/ovl_DF4260/DFEE30.h b/src/overlays/ovl_i1/DFEE30.h similarity index 83% rename from src/overlays/ovl_DF4260/DFEE30.h rename to src/overlays/ovl_i1/DFEE30.h index 8042693a..b89aafec 100644 --- a/src/overlays/ovl_DF4260/DFEE30.h +++ b/src/overlays/ovl_i1/DFEE30.h @@ -8,13 +8,13 @@ typedef struct { /* 0x0C */ f32 unkC; /* 0x10 */ char pad_10[0x38]; /* 0x48 */ s32 unk48; -} UnkStruct_func_DF4260_801924A8; +} UnkStruct_func_i1_801924A8; typedef struct { /* 0x00 */ char pad_0[0x10]; /* 0x10 */ f32 unk10; /* 0x14 */ char pad_14[0x3C]; /* 0x50 */ s32 unk50; -} UnkStruct_func_DF4260_80192CB0; +} UnkStruct_func_i1_80192CB0; #endif diff --git a/src/overlays/ovl_i1/E05620.c b/src/overlays/ovl_i1/E05620.c new file mode 100644 index 00000000..f0c34811 --- /dev/null +++ b/src/overlays/ovl_i1/E05620.c @@ -0,0 +1,7 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/E05620/func_i1_801988E0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/E05620/func_i1_80198968.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/E05620/D_i1_8019B640.s") diff --git a/src/overlays/ovl_i1/E05990.c b/src/overlays/ovl_i1/E05990.c new file mode 100644 index 00000000..86209ab6 --- /dev/null +++ b/src/overlays/ovl_i1/E05990.c @@ -0,0 +1,9 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/E05990/func_i1_80198C50.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/E05990/func_i1_80198DCC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/E05990/func_i1_80199024.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/E05990/func_i1_8019949C.s") diff --git a/src/overlays/ovl_DF4260/fox_co.c b/src/overlays/ovl_i1/fox_co.c similarity index 82% rename from src/overlays/ovl_DF4260/fox_co.c rename to src/overlays/ovl_i1/fox_co.c index 29f56522..2a4adf5f 100644 --- a/src/overlays/ovl_DF4260/fox_co.c +++ b/src/overlays/ovl_i1/fox_co.c @@ -1,15 +1,15 @@ #include "global.h" // bss -u8 D_DF4260_8019B6D0; -f32 D_DF4260_8019B6D8[68]; +u8 D_i1_8019B6D0; +f32 D_i1_8019B6D8[68]; -void func_DF4260_80187530(Object_80* obj80) { +void func_i1_80187530(Object_80* obj80) { } extern Gfx D_60199D0[]; -void func_DF4260_8018753C(Object_80* obj80) { +void func_i1_8018753C(Object_80* obj80) { GCGM_BACK(); GDL(&D_60199D0); @@ -29,8 +29,8 @@ void func_801875A4(Object* obj) { } } -void func_DF4260_80187670(Actor* actor, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, s32 arg7, s32 arg8, - s32 arg9) { +void func_i1_80187670(Actor* actor, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, s32 arg7, s32 arg8, + s32 arg9) { Actor_Initialize(actor); actor->obj.status = 1; @@ -47,19 +47,19 @@ void func_DF4260_80187670(Actor* actor, f32 arg1, f32 arg2, f32 arg3, f32 arg4, Object_SetInfo(&actor->info, actor->obj.id); } -void func_DF4260_80187710(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, s32 arg6, s32 arg7, s32 arg8) { +void func_i1_80187710(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, s32 arg6, s32 arg7, s32 arg8) { s32 i; for (i = 0; i < ARRAY_COUNT(gActors); i++) { if (gActors[i].obj.status == 0) { (void) "Enms[1].obj.mode %d\n"; - func_DF4260_80187670(&gActors[i], arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); + func_i1_80187670(&gActors[i], arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); return; } } } -void func_DF4260_801877A0(Boss* boss, f32 arg1, f32 arg2, f32 arg3) { +void func_i1_801877A0(Boss* boss, f32 arg1, f32 arg2, f32 arg3) { Vec3f sp2C; Vec3f sp20; @@ -70,7 +70,7 @@ void func_DF4260_801877A0(Boss* boss, f32 arg1, f32 arg2, f32 arg3) { func_8007F11C(OBJ_EFFECT_353, boss->obj.pos.x + sp20.x, boss->obj.pos.y + sp20.y, boss->obj.pos.z + sp20.z, 100.0f); } -void func_DF4260_80187838(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { +void func_i1_80187838(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { s32 i; for (i = 0; i < ARRAY_COUNT(gItems); i++) { @@ -88,7 +88,7 @@ void func_DF4260_80187838(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { } } -void func_DF4260_801878D8(Boss* boss) { +void func_i1_801878D8(Boss* boss) { s32 i; gBossFrameCount = 0; @@ -103,26 +103,26 @@ void func_DF4260_801878D8(Boss* boss) { return; } - for (i = 0; i < ARRAY_COUNT(D_DF4260_8019B6D8); i++) { - D_DF4260_8019B6D8[i] = 0.0f; + for (i = 0; i < ARRAY_COUNT(D_i1_8019B6D8); i++) { + D_i1_8019B6D8[i] = 0.0f; } } -void func_DF4260_8018798C(Boss* boss, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { +void func_i1_8018798C(Boss* boss, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { func_8007BFFC(arg1, arg2, arg3, 0.0f, 0.0f, 0.0f, arg4, 30); func_8007A6F0(&boss->obj.pos, 0x29034003); } -void func_DF4260_801879F0(Boss* boss, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { +void func_i1_801879F0(Boss* boss, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { func_8007D1E0(arg1, arg2, arg3, arg4); func_8007A6F0(&boss->obj.pos, 0x29034003); } -void func_DF4260_80187A38(Boss* boss, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5) { +void func_i1_80187A38(Boss* boss, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5) { func_8007C120(arg1, arg2, arg3, boss->vel.x, boss->vel.y, boss->vel.z, arg4, arg5); } -f32 func_DF4260_80187A88(s32 arg0) { +f32 func_i1_80187A88(s32 arg0) { f32 ret = arg0 * 0.5f; if (ret > 8.0f) { @@ -131,7 +131,7 @@ f32 func_DF4260_80187A88(s32 arg0) { return ret; } -void func_DF4260_80187AC8(Boss* boss) { +void func_i1_80187AC8(Boss* boss) { Object_4C* obj4C; s32 var_v0; s32 var_s1; @@ -142,7 +142,7 @@ void func_DF4260_80187AC8(Boss* boss) { if (boss->dmgPart == 0) { boss->swork[10] = 15; boss->swork[29] -= boss->damage; - func_DF4260_80187A38(boss, D_DF4260_8019B6D8[62], D_DF4260_8019B6D8[63], D_DF4260_8019B6D8[64], 0.2f, 20); + func_i1_80187A38(boss, D_i1_8019B6D8[62], D_i1_8019B6D8[63], D_i1_8019B6D8[64], 0.2f, 20); if (boss->swork[29] < 30) { func_8007A6F0(&boss->obj.pos, 0x2943500F); } else { @@ -152,7 +152,7 @@ void func_DF4260_80187AC8(Boss* boss) { if (boss->swork[29] <= 0) { boss->swork[10] = 1000; boss->info.hitbox[1 + 0] = 100000.0f; - func_DF4260_8018798C(boss, D_DF4260_8019B6D8[62], D_DF4260_8019B6D8[63], D_DF4260_8019B6D8[64], 10.0f); + func_i1_8018798C(boss, D_i1_8019B6D8[62], D_i1_8019B6D8[63], D_i1_8019B6D8[64], 10.0f); Audio_PlaySfx(0x2940D09A, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); D_Timer_80161A60 = 8; if (fabsf(boss->obj.rot.x) < 20.0f) { @@ -185,13 +185,13 @@ void func_DF4260_80187AC8(Boss* boss) { boss->swork[3] = 15; boss->swork[20] = 30; boss->swork[28] -= boss->damage; - func_DF4260_801879F0(boss, D_DF4260_8019B6D8[12] + ((Rand_ZeroOne() - 0.5f) * 60.0f), D_DF4260_8019B6D8[13], - D_DF4260_8019B6D8[14] + ((Rand_ZeroOne() - 0.5f) * 60.0f), 2.0f); - func_DF4260_80187A38(boss, D_DF4260_8019B6D8[12], D_DF4260_8019B6D8[13], D_DF4260_8019B6D8[14], 0.1f, 20); + func_i1_801879F0(boss, D_i1_8019B6D8[12] + ((Rand_ZeroOne() - 0.5f) * 60.0f), D_i1_8019B6D8[13], + D_i1_8019B6D8[14] + ((Rand_ZeroOne() - 0.5f) * 60.0f), 2.0f); + func_i1_80187A38(boss, D_i1_8019B6D8[12], D_i1_8019B6D8[13], D_i1_8019B6D8[14], 0.1f, 20); if (boss->swork[28] <= 0) { boss->swork[3] = 1000; boss->info.hitbox[1 + 18] = 100000.0f; - func_DF4260_8018798C(boss, D_DF4260_8019B6D8[12], D_DF4260_8019B6D8[13], D_DF4260_8019B6D8[14], 10.0f); + func_i1_8018798C(boss, D_i1_8019B6D8[12], D_i1_8019B6D8[13], D_i1_8019B6D8[14], 10.0f); } } @@ -200,25 +200,25 @@ void func_DF4260_80187AC8(Boss* boss) { boss->swork[21] = 30; boss->swork[26] -= boss->damage; - func_DF4260_801879F0(boss, D_DF4260_8019B6D8[6] + ((Rand_ZeroOne() - 0.5f) * 60.0f), D_DF4260_8019B6D8[7], - D_DF4260_8019B6D8[8] + ((Rand_ZeroOne() - 0.5f) * 60.0f), 2.0f); - func_DF4260_80187A38(boss, D_DF4260_8019B6D8[6], D_DF4260_8019B6D8[7], D_DF4260_8019B6D8[8], 0.1f, 20); + func_i1_801879F0(boss, D_i1_8019B6D8[6] + ((Rand_ZeroOne() - 0.5f) * 60.0f), D_i1_8019B6D8[7], + D_i1_8019B6D8[8] + ((Rand_ZeroOne() - 0.5f) * 60.0f), 2.0f); + func_i1_80187A38(boss, D_i1_8019B6D8[6], D_i1_8019B6D8[7], D_i1_8019B6D8[8], 0.1f, 20); if (boss->swork[26] <= 0) { boss->swork[2] = 1000; boss->info.hitbox[1 + 6] = 100000.0f; - func_DF4260_8018798C(boss, D_DF4260_8019B6D8[6], D_DF4260_8019B6D8[7], D_DF4260_8019B6D8[8], 7.0f); + func_i1_8018798C(boss, D_i1_8019B6D8[6], D_i1_8019B6D8[7], D_i1_8019B6D8[8], 7.0f); } } else if (boss->dmgPart == 2) { boss->swork[1] = 15; boss->swork[22] = 30; boss->swork[27] -= boss->damage; - func_DF4260_801879F0(boss, D_DF4260_8019B6D8[0] + ((Rand_ZeroOne() - 0.5f) * 60.0f), D_DF4260_8019B6D8[1], - D_DF4260_8019B6D8[2] + ((Rand_ZeroOne() - 0.5f) * 60.0f), 2.0f); - func_DF4260_80187A38(boss, D_DF4260_8019B6D8[0], D_DF4260_8019B6D8[1], D_DF4260_8019B6D8[2], 0.1f, 20); + func_i1_801879F0(boss, D_i1_8019B6D8[0] + ((Rand_ZeroOne() - 0.5f) * 60.0f), D_i1_8019B6D8[1], + D_i1_8019B6D8[2] + ((Rand_ZeroOne() - 0.5f) * 60.0f), 2.0f); + func_i1_80187A38(boss, D_i1_8019B6D8[0], D_i1_8019B6D8[1], D_i1_8019B6D8[2], 0.1f, 20); if (boss->swork[27] <= 0) { boss->swork[1] = 1000; boss->info.hitbox[1 + 12] = 100000.0f; - func_DF4260_8018798C(boss, D_DF4260_8019B6D8[0], D_DF4260_8019B6D8[1], D_DF4260_8019B6D8[2], 7.0f); + func_i1_8018798C(boss, D_i1_8019B6D8[0], D_i1_8019B6D8[1], D_i1_8019B6D8[2], 7.0f); } } else if ((boss->dmgPart == 4) || (boss->dmgPart == 5)) { Audio_PlaySfx(0x2903300E, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); @@ -231,9 +231,9 @@ void func_DF4260_80187AC8(Boss* boss) { boss->swork[7] = boss->swork[8] = boss->swork[9] = 1000; boss->info.hitbox[1 + 24] = 100000.0f; for (var_s1 = 3; var_s1 < 6; var_s1++) { - func_800430DC(D_DF4260_8019B6D8[18 + var_s1 + 2], D_DF4260_8019B6D8[24 + var_s1 + 2], - D_DF4260_8019B6D8[30 + var_s1 + 2], D_DF4260_8019B6D8[36 + var_s1 + 2], - D_DF4260_8019B6D8[42 + var_s1 + 2], D_DF4260_8019B6D8[48 + var_s1 + 2], 0.0f, + func_800430DC(D_i1_8019B6D8[18 + var_s1 + 2], D_i1_8019B6D8[24 + var_s1 + 2], + D_i1_8019B6D8[30 + var_s1 + 2], D_i1_8019B6D8[36 + var_s1 + 2], + D_i1_8019B6D8[42 + var_s1 + 2], D_i1_8019B6D8[48 + var_s1 + 2], 0.0f, (Rand_ZeroOne() * 20.0f), 0.0f, 5.5f, var_s1 + 0x1C, ((s32) (Rand_ZeroOne() * 30.0f)) + 60.0f); } @@ -251,9 +251,9 @@ void func_DF4260_80187AC8(Boss* boss) { boss->info.hitbox[1 + 30] = 100000.0f; for (var_s1 = 0; var_s1 < 3; var_s1++) { - func_800430DC(D_DF4260_8019B6D8[18 + var_s1 + 2], D_DF4260_8019B6D8[24 + var_s1 + 2], - D_DF4260_8019B6D8[30 + var_s1 + 2], D_DF4260_8019B6D8[36 + var_s1 + 2], - D_DF4260_8019B6D8[42 + var_s1 + 2], D_DF4260_8019B6D8[48 + var_s1 + 2], 0.0f, + func_800430DC(D_i1_8019B6D8[18 + var_s1 + 2], D_i1_8019B6D8[24 + var_s1 + 2], + D_i1_8019B6D8[30 + var_s1 + 2], D_i1_8019B6D8[36 + var_s1 + 2], + D_i1_8019B6D8[42 + var_s1 + 2], D_i1_8019B6D8[48 + var_s1 + 2], 0.0f, (Rand_ZeroOne() * 20.0f), 0.0f, 5.5f, var_s1 + 0x1C, ((s32) (Rand_ZeroOne() * 30.0f)) + 60.0f); } @@ -275,7 +275,7 @@ void func_DF4260_80187AC8(Boss* boss) { } else { var_v0 = 0x147; } - func_DF4260_80187838(boss, boss->obj.pos.x, boss->obj.pos.y + 100.0f, boss->obj.pos.z, var_v0); + func_i1_80187838(boss, boss->obj.pos.x, boss->obj.pos.y + 100.0f, boss->obj.pos.z, var_v0); } if (boss->actionState < 5) { boss->actionState = 0; @@ -303,43 +303,40 @@ void func_DF4260_80187AC8(Boss* boss) { obj4C = gObjects4C; for (var_s1 = 0; var_s1 < 40; var_s1++, obj4C++) { if ((obj4C->obj.status == 2) && (obj4C->obj.id == OBJ_4C_162)) { - if ((fabsf(obj4C->obj.pos.x - D_DF4260_8019B6D8[20]) < 90.0f) && - (fabsf(obj4C->obj.pos.z - D_DF4260_8019B6D8[32]) < 90.0f)) { + if ((fabsf(obj4C->obj.pos.x - D_i1_8019B6D8[20]) < 90.0f) && + (fabsf(obj4C->obj.pos.z - D_i1_8019B6D8[32]) < 90.0f)) { obj4C->unk_46 = 1; break; - } else if ((fabsf(obj4C->obj.pos.x - D_DF4260_8019B6D8[23]) < 90.0f) && - (fabsf(obj4C->obj.pos.z - D_DF4260_8019B6D8[35]) < 90.0f)) { + } else if ((fabsf(obj4C->obj.pos.x - D_i1_8019B6D8[23]) < 90.0f) && + (fabsf(obj4C->obj.pos.z - D_i1_8019B6D8[35]) < 90.0f)) { obj4C->unk_46 = 1; break; } } } if ((boss->swork[1] == 1000) && !(gFrameCount & 3)) { - func_8007BFFC(D_DF4260_8019B6D8[3], D_DF4260_8019B6D8[4], D_DF4260_8019B6D8[5], - (D_DF4260_8019B6D8[3] - boss->obj.pos.x) * 0.1f, 0.0f, - (D_DF4260_8019B6D8[5] - boss->obj.pos.z) * 0.1f, 1.5f, 5); + func_8007BFFC(D_i1_8019B6D8[3], D_i1_8019B6D8[4], D_i1_8019B6D8[5], + (D_i1_8019B6D8[3] - boss->obj.pos.x) * 0.1f, 0.0f, + (D_i1_8019B6D8[5] - boss->obj.pos.z) * 0.1f, 1.5f, 5); } if ((boss->swork[2] == 1000) && !(gFrameCount & 3)) { - func_8007BFFC(D_DF4260_8019B6D8[9], D_DF4260_8019B6D8[10], D_DF4260_8019B6D8[11], - (D_DF4260_8019B6D8[9] - boss->obj.pos.x) * 0.1f, 0.0f, - (D_DF4260_8019B6D8[11] - boss->obj.pos.z) * 0.1f, 1.5f, 5); + func_8007BFFC(D_i1_8019B6D8[9], D_i1_8019B6D8[10], D_i1_8019B6D8[11], + (D_i1_8019B6D8[9] - boss->obj.pos.x) * 0.1f, 0.0f, + (D_i1_8019B6D8[11] - boss->obj.pos.z) * 0.1f, 1.5f, 5); } if ((boss->swork[3] == 1000) && !(gFrameCount & 3)) { - func_8007BFFC(D_DF4260_8019B6D8[12], D_DF4260_8019B6D8[13], D_DF4260_8019B6D8[14], 0.0f, 20.0f, 0.0f, 2.0f, - 5); + func_8007BFFC(D_i1_8019B6D8[12], D_i1_8019B6D8[13], D_i1_8019B6D8[14], 0.0f, 20.0f, 0.0f, 2.0f, 5); } if ((boss->swork[4] == 1000) && !(gFrameCount & 3)) { - func_8007BFFC(D_DF4260_8019B6D8[56], D_DF4260_8019B6D8[57], D_DF4260_8019B6D8[58], 0.0f, 10.0f, 0.0f, 2.0f, - 5); + func_8007BFFC(D_i1_8019B6D8[56], D_i1_8019B6D8[57], D_i1_8019B6D8[58], 0.0f, 10.0f, 0.0f, 2.0f, 5); } if ((boss->swork[7] == 1000) && !(gFrameCount & 3)) { - func_8007BFFC(D_DF4260_8019B6D8[59], D_DF4260_8019B6D8[60], D_DF4260_8019B6D8[61], 0.0f, 10.0f, 0.0f, 2.0f, - 5); + func_8007BFFC(D_i1_8019B6D8[59], D_i1_8019B6D8[60], D_i1_8019B6D8[61], 0.0f, 10.0f, 0.0f, 2.0f, 5); } } } -s32 func_DF4260_80188750(Boss* boss) { +s32 func_i1_80188750(Boss* boss) { boss->swork[35]++; if (boss->swork[35] >= 5) { @@ -354,7 +351,7 @@ s32 func_DF4260_80188750(Boss* boss) { } } -void func_DF4260_801887AC(Boss* boss) { +void func_i1_801887AC(Boss* boss) { Vec3f sp3C; s32 sp38; s32 temp_v0; @@ -364,22 +361,22 @@ void func_DF4260_801887AC(Boss* boss) { if (temp_v0 != 0) { switch (temp_v0) { case 1: - sp38 = func_DF4260_80188750(boss); + sp38 = func_i1_80188750(boss); if (sp38 != 0) { if (boss->swork[1] != 1000) { - func_DF4260_80187710(D_DF4260_8019B6D8[0], D_DF4260_8019B6D8[1], D_DF4260_8019B6D8[2], - 65.0f, 0.0f, D_DF4260_8019B6D8[16] + boss->obj.rot.y, 0, 0, sp38); + func_i1_80187710(D_i1_8019B6D8[0], D_i1_8019B6D8[1], D_i1_8019B6D8[2], 65.0f, 0.0f, + D_i1_8019B6D8[16] + boss->obj.rot.y, 0, 0, sp38); } if (boss->swork[2] != 1000) { - func_DF4260_80187710(D_DF4260_8019B6D8[6], D_DF4260_8019B6D8[7], D_DF4260_8019B6D8[8], - 65.0f, 0.0f, D_DF4260_8019B6D8[16] + boss->obj.rot.y, 0, 0, sp38); + func_i1_80187710(D_i1_8019B6D8[6], D_i1_8019B6D8[7], D_i1_8019B6D8[8], 65.0f, 0.0f, + D_i1_8019B6D8[16] + boss->obj.rot.y, 0, 0, sp38); } } boss->swork[30] = 0; break; case 2: - func_DF4260_801877A0(boss, 40.0f, 228.0f, 212.0f); - func_DF4260_801877A0(boss, -40.0f, 228.0f, 212.0f); + func_i1_801877A0(boss, 40.0f, 228.0f, 212.0f); + func_i1_801877A0(boss, -40.0f, 228.0f, 212.0f); boss->swork[30] = 0; break; case 3: @@ -390,8 +387,7 @@ void func_DF4260_801887AC(Boss* boss) { gPlayer[0].pos.x += (Rand_ZeroOne() - 0.5f) * 300.0f; gPlayer[0].pos.y += (Rand_ZeroOne() - 0.5f) * 300.0f; gPlayer[0].unk_138 += (Rand_ZeroOne() - 0.5f) * 300.0f; - func_8007F11C(OBJ_EFFECT_376, D_DF4260_8019B6D8[12], D_DF4260_8019B6D8[13], - D_DF4260_8019B6D8[14], 60.0f); + func_8007F11C(OBJ_EFFECT_376, D_i1_8019B6D8[12], D_i1_8019B6D8[13], D_i1_8019B6D8[14], 60.0f); gPlayer[0].pos.x = sp3C.x; gPlayer[0].pos.y = sp3C.y; gPlayer[0].unk_138 = sp3C.z; @@ -403,7 +399,7 @@ void func_DF4260_801887AC(Boss* boss) { } } -void func_DF4260_80188A18(Boss* boss) { +void func_i1_80188A18(Boss* boss) { if (boss->timer_050 == 0) { boss->actionState = 0; @@ -452,13 +448,13 @@ void func_DF4260_80188A18(Boss* boss) { } } -void func_DF4260_80188C7C(Boss* boss) { +void func_i1_80188C7C(Boss* boss) { if (boss->unk_044 == 0) { boss->unk_044++; boss->fwork[12] *= -0.2f; Audio_PlaySfx(0x19030004, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - func_80062B60(D_DF4260_8019B6D8[56], D_DF4260_8019B6D8[58], 0, 30.0f); + func_80062B60(D_i1_8019B6D8[56], D_i1_8019B6D8[58], 0, 30.0f); boss->swork[18] = 13; boss->swork[19] = 15; boss->swork[21] = 10; @@ -470,8 +466,8 @@ void func_DF4260_80188C7C(Boss* boss) { } } -void func_DF4260_80188D50(Boss* boss) { - static s32 D_DF4260_801997E0 = 0; +void func_i1_80188D50(Boss* boss) { + static s32 D_i1_801997E0 = 0; s32 i; Vec3f sp48; Vec3f sp3C; @@ -479,16 +475,16 @@ void func_DF4260_80188D50(Boss* boss) { if (boss->swork[36] == 0) { if (gPlayer[0].unk_1F4 != 0) { - D_DF4260_801997E0 = 80; + D_i1_801997E0 = 80; } - if (D_DF4260_801997E0 != 0) { - D_DF4260_801997E0--; + if (D_i1_801997E0 != 0) { + D_i1_801997E0--; } else if ((gPlayer[0].pos.y < 200.0f) && (boss->actionState < 5) && (fabsf(boss->obj.pos.x - gPlayer[0].pos.x) < 200.0f) && (fabsf(boss->obj.pos.z - gPlayer[0].unk_138) < 200.0f) && (gPlayer[0].unk_4D8 > 180.0f)) { boss->swork[36]++; - D_DF4260_801997E0 = 20; + D_i1_801997E0 = 20; Audio_PlaySfx(0x49008025, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); if ((gTeamShields[1] > 0) || (gTeamShields[2] > 0) || (gTeamShields[3] > 0)) { do { @@ -535,14 +531,14 @@ void func_DF4260_80188D50(Boss* boss) { extern AnimationHeader D_602BC18; extern AnimationHeader D_602C0D0; -static Vec3f D_DF4260_801997E4 = { 0.0f, 0.0f, 0.0f }; -static Vec3f D_DF4260_801997F0 = { 0.0f, 0.0f, 5.0f }; -static Vec3f D_DF4260_801997FC = { 0.0f, 0.0f, 40.0f }; -static Vec3f D_DF4260_80199808 = { 0.0f, 0.0f, -30.0f }; +static Vec3f D_i1_801997E4 = { 0.0f, 0.0f, 0.0f }; +static Vec3f D_i1_801997F0 = { 0.0f, 0.0f, 5.0f }; +static Vec3f D_i1_801997FC = { 0.0f, 0.0f, 40.0f }; +static Vec3f D_i1_80199808 = { 0.0f, 0.0f, -30.0f }; #ifdef NON_MATCHING // Stack issues https://decomp.me/scratch/ZsX2L -void func_DF4260_80189058(Boss* boss) { +void func_i1_80189058(Boss* boss) { Vec3f sp21C; s32 sp218; @@ -561,10 +557,10 @@ void func_DF4260_80189058(Boss* boss) { Vec3f sp6C; f32 sp5C; - sp21C = D_DF4260_801997E4; - sp1EC = D_DF4260_801997F0; - sp78 = D_DF4260_801997FC; - sp6C = D_DF4260_80199808; + sp21C = D_i1_801997E4; + sp1EC = D_i1_801997F0; + sp78 = D_i1_801997FC; + sp6C = D_i1_80199808; if (gPlayer[0].state_1C8 != 9) { if (boss->swork[33] == 0) { @@ -587,8 +583,8 @@ void func_DF4260_80189058(Boss* boss) { boss->timer_052 = 100; boss->actionState = 0; boss->swork[31] = 1; - D_DF4260_8019B6D8[66] = 0.0f; - D_DF4260_8019B6D8[67] = 10000.0f; + D_i1_8019B6D8[66] = 0.0f; + D_i1_8019B6D8[67] = 10000.0f; boss->timer_050 = 30; Animation_GetFrameData(&D_602C0D0, 0, boss->vwork); gBossFrameCount = 0; @@ -601,7 +597,7 @@ void func_DF4260_80189058(Boss* boss) { gUnkEntities28[59].pos.z = boss->obj.pos.z; gUnkEntities28[59].unk_10 = boss->obj.rot.y + 180.0f; - func_DF4260_80188D50(boss); + func_i1_80188D50(boss); if (D_801615D0.z > 0.0f) { if (D_801615D0.x > 0.0f) { gPlayer[0].unk_228 = 0x10; @@ -647,23 +643,23 @@ void func_DF4260_80189058(Boss* boss) { } } - func_DF4260_80187AC8(boss); - boss->fwork[0] = __sinf(boss->swork[18] * 50.0f * M_DTOR) * func_DF4260_80187A88(boss->swork[18]); - boss->fwork[1] = __sinf(boss->swork[19] * 50.0f * M_DTOR) * func_DF4260_80187A88(boss->swork[19]); - boss->fwork[2] = __sinf(boss->swork[20] * 50.0f * M_DTOR) * func_DF4260_80187A88(boss->swork[20]); - boss->fwork[3] = __sinf(boss->swork[21] * 50.0f * M_DTOR) * func_DF4260_80187A88(boss->swork[21]); - boss->fwork[4] = __sinf(boss->swork[22] * 50.0f * M_DTOR) * func_DF4260_80187A88(boss->swork[22]); + func_i1_80187AC8(boss); + boss->fwork[0] = __sinf(boss->swork[18] * 50.0f * M_DTOR) * func_i1_80187A88(boss->swork[18]); + boss->fwork[1] = __sinf(boss->swork[19] * 50.0f * M_DTOR) * func_i1_80187A88(boss->swork[19]); + boss->fwork[2] = __sinf(boss->swork[20] * 50.0f * M_DTOR) * func_i1_80187A88(boss->swork[20]); + boss->fwork[3] = __sinf(boss->swork[21] * 50.0f * M_DTOR) * func_i1_80187A88(boss->swork[21]); + boss->fwork[4] = __sinf(boss->swork[22] * 50.0f * M_DTOR) * func_i1_80187A88(boss->swork[22]); if (boss->actionState < 5) { - sp5C = __sinf(boss->swork[23] * 12.0f * M_DTOR) * func_DF4260_80187A88(boss->swork[23]) * 0.3f; + sp5C = __sinf(boss->swork[23] * 12.0f * M_DTOR) * func_i1_80187A88(boss->swork[23]) * 0.3f; Math_SmoothStepToF(&boss->obj.rot.z, sp5C, 0.2f, 100.0f, 0.001f); } if (boss->obj.pos.y <= 10.0f) { boss->obj.pos.y = 10.0f; } - sp214 = D_DF4260_8019B6D8[17] - boss->obj.pos.x; - sp210 = D_DF4260_8019B6D8[18] - (boss->obj.pos.y + 300.0f); - sp20C = D_DF4260_8019B6D8[19] - boss->obj.pos.z; + sp214 = D_i1_8019B6D8[17] - boss->obj.pos.x; + sp210 = D_i1_8019B6D8[18] - (boss->obj.pos.y + 300.0f); + sp20C = D_i1_8019B6D8[19] - boss->obj.pos.z; sp1FC = Math_RadToDeg(Math_Atan2F(sp214, sp20C)); sp200 = Math_RadToDeg(-Math_Atan2F(sp210, sqrtf(SQ(sp214) + SQ(sp20C)))); @@ -687,22 +683,22 @@ void func_DF4260_80189058(Boss* boss) { sp1FC = 310.0f; } - Math_SmoothStepToAngle(&D_DF4260_8019B6D8[16], sp1FC, 0.1f, 3.0f, 0.0f); - Math_SmoothStepToAngle(&D_DF4260_8019B6D8[15], sp200, 0.1f, 3.0f, 0.0f); + Math_SmoothStepToAngle(&D_i1_8019B6D8[16], sp1FC, 0.1f, 3.0f, 0.0f); + Math_SmoothStepToAngle(&D_i1_8019B6D8[15], sp200, 0.1f, 3.0f, 0.0f); if (boss->actionState != 0) { - Math_SmoothStepToAngle(&boss->obj.rot.y, - Math_RadToDeg(Math_Atan2F(D_DF4260_8019B6D8[66] - boss->obj.pos.x, - D_DF4260_8019B6D8[67] - boss->obj.pos.z)), - 0.1f, 3.0f, 0.0f); + Math_SmoothStepToAngle( + &boss->obj.rot.y, + Math_RadToDeg(Math_Atan2F(D_i1_8019B6D8[66] - boss->obj.pos.x, D_i1_8019B6D8[67] - boss->obj.pos.z)), + 0.1f, 3.0f, 0.0f); } Matrix_RotateY(gCalcMatrix, boss->obj.rot.y * M_DTOR, 0U); switch (boss->actionState) { case 0: boss->unk_04C = 0; - D_DF4260_8019B6D8[17] = gPlayer[0].pos.x; - D_DF4260_8019B6D8[18] = gPlayer[0].pos.y; - D_DF4260_8019B6D8[19] = gPlayer[0].unk_138; + D_i1_8019B6D8[17] = gPlayer[0].pos.x; + D_i1_8019B6D8[18] = gPlayer[0].pos.y; + D_i1_8019B6D8[19] = gPlayer[0].unk_138; if (boss->timer_050 == 0) { switch (boss->swork[31]) { case 1: @@ -721,8 +717,8 @@ void func_DF4260_80189058(Boss* boss) { boss->actionState = 4; boss->timer_050 = (s32) (Rand_ZeroOne() * 70.0f) + 100; boss->fwork[14] = 0.1f; - D_DF4260_8019B6D8[66] = (Rand_ZeroOne() - 0.5f) * 6000.0f; - D_DF4260_8019B6D8[67] = (Rand_ZeroOne() - 0.5f) * 6000.0f; + D_i1_8019B6D8[66] = (Rand_ZeroOne() - 0.5f) * 6000.0f; + D_i1_8019B6D8[67] = (Rand_ZeroOne() - 0.5f) * 6000.0f; boss->fwork[14] = 0.07f; break; case 3: @@ -739,9 +735,9 @@ void func_DF4260_80189058(Boss* boss) { } break; case 1: - D_DF4260_8019B6D8[17] = D_DF4260_8019B6D8[66] = gPlayer[0].pos.x; - D_DF4260_8019B6D8[18] = gPlayer[0].pos.y; - D_DF4260_8019B6D8[19] = D_DF4260_8019B6D8[67] = gPlayer[0].unk_138; + D_i1_8019B6D8[17] = D_i1_8019B6D8[66] = gPlayer[0].pos.x; + D_i1_8019B6D8[18] = gPlayer[0].pos.y; + D_i1_8019B6D8[19] = D_i1_8019B6D8[67] = gPlayer[0].unk_138; boss->unk_04C += 2; if (boss->unk_04C >= Animation_GetFrameCount(&D_602BC18)) { @@ -753,12 +749,12 @@ void func_DF4260_80189058(Boss* boss) { boss->timer_052 = 150; boss->swork[30] = 1; } - func_DF4260_80188A18(boss); + func_i1_80188A18(boss); break; case 2: - D_DF4260_8019B6D8[17] = D_DF4260_8019B6D8[66] = gPlayer[0].pos.x; - D_DF4260_8019B6D8[18] = gPlayer[0].pos.y; - D_DF4260_8019B6D8[19] = D_DF4260_8019B6D8[67] = gPlayer[0].unk_138; + D_i1_8019B6D8[17] = D_i1_8019B6D8[66] = gPlayer[0].pos.x; + D_i1_8019B6D8[18] = gPlayer[0].pos.y; + D_i1_8019B6D8[19] = D_i1_8019B6D8[67] = gPlayer[0].unk_138; boss->unk_04C -= 4; if (boss->unk_04C < 0) { @@ -774,12 +770,12 @@ void func_DF4260_80189058(Boss* boss) { boss->timer_054 = 9; boss->swork[30] = 3; } - func_DF4260_80188A18(boss); + func_i1_80188A18(boss); break; case 3: - D_DF4260_8019B6D8[17] = D_DF4260_8019B6D8[66] = gPlayer[0].pos.x; - D_DF4260_8019B6D8[18] = gPlayer[0].pos.y; - D_DF4260_8019B6D8[19] = D_DF4260_8019B6D8[67] = gPlayer[0].unk_138; + D_i1_8019B6D8[17] = D_i1_8019B6D8[66] = gPlayer[0].pos.x; + D_i1_8019B6D8[18] = gPlayer[0].pos.y; + D_i1_8019B6D8[19] = D_i1_8019B6D8[67] = gPlayer[0].unk_138; boss->unk_04C += 4; if (boss->unk_04C >= 101) { @@ -795,12 +791,12 @@ void func_DF4260_80189058(Boss* boss) { boss->timer_054 = 9; boss->swork[30] = 3; } - func_DF4260_80188A18(boss); + func_i1_80188A18(boss); break; case 4: - D_DF4260_8019B6D8[17] = gPlayer[0].pos.x; - D_DF4260_8019B6D8[18] = gPlayer[0].pos.y; - D_DF4260_8019B6D8[19] = gPlayer[0].unk_138; + D_i1_8019B6D8[17] = gPlayer[0].pos.x; + D_i1_8019B6D8[18] = gPlayer[0].pos.y; + D_i1_8019B6D8[19] = gPlayer[0].unk_138; boss->unk_04C += 4; if (boss->unk_04C >= 101) { @@ -808,23 +804,23 @@ void func_DF4260_80189058(Boss* boss) { } Animation_GetFrameData(&D_602BC18, boss->unk_04C, sp84); Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp78, &sp21C); - func_DF4260_80188A18(boss); + func_i1_80188A18(boss); break; case 5: case 6: boss->unk_05E = 0; D_8017812C = 1; if (!(gFrameCount & 7)) { - D_DF4260_8019B6D8[17] = ((Rand_ZeroOne() - 0.5f) * 2000.0f) + gPlayer[0].pos.x; - D_DF4260_8019B6D8[18] = gPlayer[0].pos.y; - D_DF4260_8019B6D8[19] = ((Rand_ZeroOne() - 0.5f) * 2000.0f) + gPlayer[0].unk_138; + D_i1_8019B6D8[17] = ((Rand_ZeroOne() - 0.5f) * 2000.0f) + gPlayer[0].pos.x; + D_i1_8019B6D8[18] = gPlayer[0].pos.y; + D_i1_8019B6D8[19] = ((Rand_ZeroOne() - 0.5f) * 2000.0f) + gPlayer[0].unk_138; } boss->fwork[12] += 0.05f; if (boss->actionState == 6) { boss->obj.rot.z += boss->fwork[12]; if (boss->obj.rot.z > 60.0f) { boss->obj.rot.z = 60.0f; - func_DF4260_80188C7C(boss); + func_i1_80188C7C(boss); if ((gFrameCount & 0x1FF) == 0) { func_800BA808(gMsg_ID_2275, RCID_BOSS_CORNERIA); @@ -839,7 +835,7 @@ void func_DF4260_80189058(Boss* boss) { boss->obj.rot.z -= boss->fwork[12]; if (boss->obj.rot.z < -60.0f) { boss->obj.rot.z = -60.0f; - func_DF4260_80188C7C(boss); + func_i1_80188C7C(boss); if ((gFrameCount & 0x1FF) == 0) { func_800BA808(gMsg_ID_2275, RCID_BOSS_CORNERIA); @@ -854,11 +850,11 @@ void func_DF4260_80189058(Boss* boss) { s32 temp_v0_3; boss->timer_050 = 60; - temp_v0_3 = func_DF4260_80188750(boss); + temp_v0_3 = func_i1_80188750(boss); if (temp_v0_3 != 0) { - func_DF4260_80187710(D_DF4260_8019B6D8[62], D_DF4260_8019B6D8[63], D_DF4260_8019B6D8[64], 65.0f, - 270.0f, 0.0f, 0, 0, temp_v0_3); + func_i1_80187710(D_i1_8019B6D8[62], D_i1_8019B6D8[63], D_i1_8019B6D8[64], 65.0f, 270.0f, 0.0f, + 0, 0, temp_v0_3); } } @@ -875,7 +871,7 @@ void func_DF4260_80189058(Boss* boss) { boss->obj.rot.x += boss->fwork[12]; if (boss->obj.rot.x > 60.0f) { boss->obj.rot.x = 60.0f; - func_DF4260_80188C7C(boss); + func_i1_80188C7C(boss); } } @@ -883,7 +879,7 @@ void func_DF4260_80189058(Boss* boss) { if (boss->timer_050 == 12) { Object_Kill(&gEffects[0].obj, &gEffects[0].sfxPos); - func_8007D0E0(D_DF4260_8019B6D8[62], D_DF4260_8019B6D8[63] - 100.0f, D_DF4260_8019B6D8[64], 25.0f); + func_8007D0E0(D_i1_8019B6D8[62], D_i1_8019B6D8[63] - 100.0f, D_i1_8019B6D8[64], 25.0f); } if (boss->timer_050 == 10) { for (sp218 = 0; sp218 < 50; sp218++) { @@ -891,16 +887,16 @@ void func_DF4260_80189058(Boss* boss) { Object_Kill(&gEffects[sp218].obj, &gEffects[sp218].sfxPos); } } - func_8007A568(D_DF4260_8019B6D8[62], D_DF4260_8019B6D8[63] - 100.0f, D_DF4260_8019B6D8[64], 40.0f); - func_8007D0E0(D_DF4260_8019B6D8[62], D_DF4260_8019B6D8[63] - 100.0f, D_DF4260_8019B6D8[64], 30.0f); - func_80062B60(D_DF4260_8019B6D8[62], D_DF4260_8019B6D8[64], 0, 120.0f); + func_8007A568(D_i1_8019B6D8[62], D_i1_8019B6D8[63] - 100.0f, D_i1_8019B6D8[64], 40.0f); + func_8007D0E0(D_i1_8019B6D8[62], D_i1_8019B6D8[63] - 100.0f, D_i1_8019B6D8[64], 30.0f); + func_80062B60(D_i1_8019B6D8[62], D_i1_8019B6D8[64], 0, 120.0f); D_80178480 = 25; gShowBossHealth = 0; for (sp218 = 0; sp218 < 100; sp218++) { - func_80079618(D_DF4260_8019B6D8[62] + ((Rand_ZeroOne() - 0.5f) * 600.0f), - (D_DF4260_8019B6D8[63] + ((Rand_ZeroOne() - 0.5f) * 500.0f)) - 100.0f, - D_DF4260_8019B6D8[64] + ((Rand_ZeroOne() - 0.5f) * 600.0f), 2.0f); + func_80079618(D_i1_8019B6D8[62] + ((Rand_ZeroOne() - 0.5f) * 600.0f), + (D_i1_8019B6D8[63] + ((Rand_ZeroOne() - 0.5f) * 500.0f)) - 100.0f, + D_i1_8019B6D8[64] + ((Rand_ZeroOne() - 0.5f) * 600.0f), 2.0f); } } if (boss->timer_050 < 50) { @@ -943,7 +939,7 @@ void func_DF4260_80189058(Boss* boss) { } Math_SmoothStepToF(&boss->vel.x, sp21C.x, 0.3f, 5.0f, 0.0f); Math_SmoothStepToF(&boss->vel.z, sp21C.z, 0.3f, 5.0f, 0.0f); - func_DF4260_801887AC(boss); + func_i1_801887AC(boss); Math_SmoothStepToVec3fArray(sp84, boss->vwork, 1, 19, boss->fwork[14], 100.0f, 0.0f); Math_SmoothStepToF(&boss->fwork[14], 1.0f, 1.0f, 0.01f, 0.0f); @@ -952,8 +948,8 @@ void func_DF4260_80189058(Boss* boss) { (boss->actionState != 4)) { boss->actionState = 4; boss->timer_050 = 150; - D_DF4260_8019B6D8[66] = 0.0f; - D_DF4260_8019B6D8[67] = 0.0f; + D_i1_8019B6D8[66] = 0.0f; + D_i1_8019B6D8[67] = 0.0f; boss->swork[31] = 0; } if ((boss->actionState != 0) && ((boss->unk_04C == 0) || (boss->unk_04C == 52))) { @@ -969,10 +965,10 @@ void func_DF4260_80189058(Boss* boss) { } } #else -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/fox_co/func_DF4260_80189058.s") +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/fox_co/func_i1_80189058.s") #endif -s32 func_DF4260_8018A434(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4) { +s32 func_i1_8018A434(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4) { Boss* boss = (Boss*) arg4; if (boss->swork[arg0] == 1000) { @@ -1014,18 +1010,18 @@ s32 func_DF4260_8018A434(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* a case 3: arg3->x += boss->fwork[2]; arg3->y += boss->fwork[2]; - arg3->z += D_DF4260_8019B6D8[15]; + arg3->z += D_i1_8019B6D8[15]; break; case 1: - arg3->x += boss->fwork[4] - D_DF4260_8019B6D8[15]; + arg3->x += boss->fwork[4] - D_i1_8019B6D8[15]; arg3->y += boss->fwork[4]; break; case 2: - arg3->x += boss->fwork[3] + D_DF4260_8019B6D8[15]; + arg3->x += boss->fwork[3] + D_i1_8019B6D8[15]; arg3->y += boss->fwork[3]; break; case 16: - arg3->x += D_DF4260_8019B6D8[16]; + arg3->x += D_i1_8019B6D8[16]; break; } if ((boss->swork[arg0] & 1) || (boss->timer_05C & 1)) { @@ -1035,15 +1031,15 @@ s32 func_DF4260_8018A434(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* a return false; } -static Vec3f D_DF4260_80199814 = { 0.0f, 0.0f, 0.0f }; -static Vec3f D_DF4260_80199820 = { 75.0f, 0.0f, 0.0f }; -static Vec3f D_DF4260_8019982C = { 190.0f, 0.0f, 0.0f }; -static Vec3f D_DF4260_80199838 = { 96.0f, 34.0f, 0.0f }; -static Vec3f D_DF4260_80199844 = { 70.0f, 170.0f, 11.0f }; -static Vec3f D_DF4260_80199850 = { 70.0f, -170.0f, 11.0f }; -static Vec3f D_DF4260_8019985C = { 64.0f, 0.0f, -236.0f }; +static Vec3f D_i1_80199814 = { 0.0f, 0.0f, 0.0f }; +static Vec3f D_i1_80199820 = { 75.0f, 0.0f, 0.0f }; +static Vec3f D_i1_8019982C = { 190.0f, 0.0f, 0.0f }; +static Vec3f D_i1_80199838 = { 96.0f, 34.0f, 0.0f }; +static Vec3f D_i1_80199844 = { 70.0f, 170.0f, 11.0f }; +static Vec3f D_i1_80199850 = { 70.0f, -170.0f, 11.0f }; +static Vec3f D_i1_8019985C = { 64.0f, 0.0f, -236.0f }; -void func_DF4260_8018A730(s32 arg0, Vec3f* arg1, void* arg2) { +void func_i1_8018A730(s32 arg0, Vec3f* arg1, void* arg2) { s32 pad; Vec3f sp80; Vec3f sp74; @@ -1054,67 +1050,67 @@ void func_DF4260_8018A730(s32 arg0, Vec3f* arg1, void* arg2) { Vec3f sp38; Vec3f sp2C; - sp80 = D_DF4260_80199814; - sp68 = D_DF4260_80199820; - sp5C = D_DF4260_8019982C; - sp50 = D_DF4260_80199838; - sp44 = D_DF4260_80199844; - sp38 = D_DF4260_80199850; - sp2C = D_DF4260_8019985C; + sp80 = D_i1_80199814; + sp68 = D_i1_80199820; + sp5C = D_i1_8019982C; + sp50 = D_i1_80199838; + sp44 = D_i1_80199844; + sp38 = D_i1_80199850; + sp2C = D_i1_8019985C; if ((arg0 >= 4) && (arg0 < 10)) { Matrix_MultVec3f(gCalcMatrix, &sp80, &sp74); - D_DF4260_8019B6D8[arg0 + 16] = sp74.x; - D_DF4260_8019B6D8[arg0 + 22] = sp74.y; - D_DF4260_8019B6D8[arg0 + 28] = sp74.z; + D_i1_8019B6D8[arg0 + 16] = sp74.x; + D_i1_8019B6D8[arg0 + 22] = sp74.y; + D_i1_8019B6D8[arg0 + 28] = sp74.z; Matrix_GetYRPAngles(gCalcMatrix, &sp74); - D_DF4260_8019B6D8[arg0 + 34] = sp74.x; - D_DF4260_8019B6D8[arg0 + 40] = sp74.y; - D_DF4260_8019B6D8[arg0 + 46] = sp74.z; + D_i1_8019B6D8[arg0 + 34] = sp74.x; + D_i1_8019B6D8[arg0 + 40] = sp74.y; + D_i1_8019B6D8[arg0 + 46] = sp74.z; } switch (arg0) { case 1: Matrix_MultVec3f(gCalcMatrix, &sp68, &sp74); - D_DF4260_8019B6D8[3] = sp74.x; - D_DF4260_8019B6D8[4] = sp74.y; - D_DF4260_8019B6D8[5] = sp74.z; + D_i1_8019B6D8[3] = sp74.x; + D_i1_8019B6D8[4] = sp74.y; + D_i1_8019B6D8[5] = sp74.z; Matrix_MultVec3f(gCalcMatrix, &sp5C, &sp74); - D_DF4260_8019B6D8[0] = sp74.x; - D_DF4260_8019B6D8[1] = sp74.y; - D_DF4260_8019B6D8[2] = sp74.z; + D_i1_8019B6D8[0] = sp74.x; + D_i1_8019B6D8[1] = sp74.y; + D_i1_8019B6D8[2] = sp74.z; break; case 2: Matrix_MultVec3f(gCalcMatrix, &sp68, &sp74); - D_DF4260_8019B6D8[9] = sp74.x; - D_DF4260_8019B6D8[10] = sp74.y; - D_DF4260_8019B6D8[11] = sp74.z; + D_i1_8019B6D8[9] = sp74.x; + D_i1_8019B6D8[10] = sp74.y; + D_i1_8019B6D8[11] = sp74.z; Matrix_MultVec3f(gCalcMatrix, &sp5C, &sp74); - D_DF4260_8019B6D8[6] = sp74.x; - D_DF4260_8019B6D8[7] = sp74.y; - D_DF4260_8019B6D8[8] = sp74.z; + D_i1_8019B6D8[6] = sp74.x; + D_i1_8019B6D8[7] = sp74.y; + D_i1_8019B6D8[8] = sp74.z; break; case 3: Matrix_MultVec3f(gCalcMatrix, &sp50, &sp74); - D_DF4260_8019B6D8[12] = sp74.x; - D_DF4260_8019B6D8[13] = sp74.y; - D_DF4260_8019B6D8[14] = sp74.z; + D_i1_8019B6D8[12] = sp74.x; + D_i1_8019B6D8[13] = sp74.y; + D_i1_8019B6D8[14] = sp74.z; break; case 17: Matrix_MultVec3f(gCalcMatrix, &sp44, &sp74); - D_DF4260_8019B6D8[56] = sp74.x; - D_DF4260_8019B6D8[57] = sp74.y; - D_DF4260_8019B6D8[58] = sp74.z; + D_i1_8019B6D8[56] = sp74.x; + D_i1_8019B6D8[57] = sp74.y; + D_i1_8019B6D8[58] = sp74.z; Matrix_MultVec3f(gCalcMatrix, &sp38, &sp74); - D_DF4260_8019B6D8[59] = sp74.x; - D_DF4260_8019B6D8[60] = sp74.y; - D_DF4260_8019B6D8[61] = sp74.z; + D_i1_8019B6D8[59] = sp74.x; + D_i1_8019B6D8[60] = sp74.y; + D_i1_8019B6D8[61] = sp74.z; break; case 10: Matrix_MultVec3f(gCalcMatrix, &sp2C, &sp74); - D_DF4260_8019B6D8[62] = sp74.x; - D_DF4260_8019B6D8[63] = sp74.y; - D_DF4260_8019B6D8[64] = sp74.z; + D_i1_8019B6D8[62] = sp74.x; + D_i1_8019B6D8[63] = sp74.y; + D_i1_8019B6D8[64] = sp74.z; break; default: break; @@ -1123,14 +1119,14 @@ void func_DF4260_8018A730(s32 arg0, Vec3f* arg1, void* arg2) { extern Limb* D_602BE64[]; -void func_DF4260_8018AA74(Boss* boss) { +void func_i1_8018AA74(Boss* boss) { Matrix_Translate(gCalcMatrix, 0.0f, 700.0f, 0.0f, (u8) 1); - Animation_DrawSkeleton(2, D_602BE64, boss->vwork, func_DF4260_8018A434, func_DF4260_8018A730, boss, gCalcMatrix); + Animation_DrawSkeleton(2, D_602BE64, boss->vwork, func_i1_8018A434, func_i1_8018A730, boss, gCalcMatrix); Matrix_Pop(&gGfxMatrix); Matrix_Push(&gGfxMatrix); } -s32 func_DF4260_8018AB08(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4) { +s32 func_i1_8018AB08(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4) { Actor* actor = (Actor*) arg4; if (arg0 == 1) { @@ -1142,14 +1138,14 @@ s32 func_DF4260_8018AB08(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* a return false; } -static Vec3f D_DF4260_80199868 = { 0.0f, -10.0f, 0.0f }; +static Vec3f D_i1_80199868 = { 0.0f, -10.0f, 0.0f }; -s32 func_DF4260_8018AB64(Actor* actor) { +s32 func_i1_8018AB64(Actor* actor) { s32 pad[2]; s32 i; s32 temp_v0; Vec3f sp7C; - Vec3f sp70 = D_DF4260_80199868; + Vec3f sp70 = D_i1_80199868; f32 sp60[4] = { 130.0f, -130.0f, 0.0f, 0.0f }; f32 sp50[4] = { 0.0f, 0.0f, 130.0f, -130.0f }; @@ -1167,7 +1163,7 @@ s32 func_DF4260_8018AB64(Actor* actor) { return 0; } -void func_DF4260_8018ACE0(Actor* actor) { +void func_i1_8018ACE0(Actor* actor) { if (actor->unk_0D0 != 0) { actor->unk_0D0 = 0; @@ -1199,12 +1195,12 @@ void func_DF4260_8018ACE0(Actor* actor) { extern AnimationHeader D_602991C; extern Gfx D_60329C0[]; -void func_DF4260_8018AED0(Actor* actor) { +void func_i1_8018AED0(Actor* actor) { Vec3f sp40[20]; f32 temp_sin; f32 temp_cos; - func_DF4260_8018ACE0(actor); + func_i1_8018ACE0(actor); Math_SmoothStepToVec3fArray(sp40, actor->vwork, 0, Animation_GetFrameData(&D_602991C, actor->unk_0B6, sp40), 1.0f, 1.0f, 1.0f); temp_sin = __sinf(actor->obj.rot.y * M_DTOR); @@ -1221,7 +1217,7 @@ void func_DF4260_8018AED0(Actor* actor) { actor->fwork[0] = 10.0f; } - actor->iwork[0] = func_DF4260_8018AB64(actor); + actor->iwork[0] = func_i1_8018AB64(actor); if (actor->iwork[0] != 0) { actor->unk_0B8++; return; @@ -1245,7 +1241,7 @@ void func_DF4260_8018AED0(Actor* actor) { } } -void func_DF4260_8018B0B4(Actor* actor) { +void func_i1_8018B0B4(Actor* actor) { s32 i; for (i = 0; i < 50; i++) { @@ -1266,7 +1262,7 @@ void func_DF4260_8018B0B4(Actor* actor) { extern AnimationHeader D_602AA04; -void func_DF4260_8018B15C(Actor* actor) { +void func_i1_8018B15C(Actor* actor) { Vec3f sp60[20]; Vec3f sp54; Vec3f sp48; @@ -1274,7 +1270,7 @@ void func_DF4260_8018B15C(Actor* actor) { f32 temp_sin; f32 temp_cos; - func_DF4260_8018ACE0(actor); + func_i1_8018ACE0(actor); temp_s1 = &gObjects80[actor->iwork[0]]; temp_sin = __sinf(actor->obj.rot.y * M_DTOR); actor->vel.x = actor->fwork[0] * temp_sin; @@ -1332,7 +1328,7 @@ void func_DF4260_8018B15C(Actor* actor) { extern AnimationHeader D_602A520; -void func_DF4260_8018B418(Actor* actor) { +void func_i1_8018B418(Actor* actor) { s32 pad; Vec3f sp54[20]; Object_80* temp_v0_2; @@ -1340,7 +1336,7 @@ void func_DF4260_8018B418(Actor* actor) { f32 temp_cos; s32 pad2[4]; - func_DF4260_8018ACE0(actor); + func_i1_8018ACE0(actor); temp_sin = __sinf(actor->obj.rot.y * M_DTOR); actor->vel.x = actor->fwork[0] * temp_sin; temp_cos = __cosf(actor->obj.rot.y * M_DTOR); @@ -1371,7 +1367,7 @@ void func_DF4260_8018B418(Actor* actor) { 1.0f, 1.0f); } -void func_DF4260_8018B58C(Actor* actor) { +void func_i1_8018B58C(Actor* actor) { s32 i; f32 spB4[4] = { -10.0f, -5.0f, 10.0f, 5.0f }; f32 spA4[4] = { 10.0f, 15.0f, 10.0f, 15.0f }; @@ -1429,18 +1425,18 @@ void func_DF4260_8018B58C(Actor* actor) { extern Limb* D_6029A48[]; -void func_DF4260_8018BAAC(Actor* actor) { - Animation_DrawSkeleton(3, D_6029A48, actor->vwork, func_DF4260_8018AB08, NULL, actor, gCalcMatrix); +void func_i1_8018BAAC(Actor* actor) { + Animation_DrawSkeleton(3, D_6029A48, actor->vwork, func_i1_8018AB08, NULL, actor, gCalcMatrix); } -static Vec3f D_DF4260_801998B4 = { 120.0f, 0.0f, 0.0f }; +static Vec3f D_i1_801998B4 = { 120.0f, 0.0f, 0.0f }; -void func_DF4260_8018BAFC(s32 arg0, Vec3f* arg1, void* arg2) { +void func_i1_8018BAFC(s32 arg0, Vec3f* arg1, void* arg2) { Actor* actor = (Actor*) arg2; Vec3f sp28; Vec3f sp1C; - sp28 = D_DF4260_801998B4; + sp28 = D_i1_801998B4; if (arg0 == 1) { Matrix_MultVec3f(gCalcMatrix, &sp28, &sp1C); @@ -1453,15 +1449,15 @@ void func_DF4260_8018BAFC(s32 arg0, Vec3f* arg1, void* arg2) { } } -void func_DF4260_8018BBA4(Actor* actor) { - Animation_DrawSkeleton(3, D_6029A48, actor->vwork, NULL, func_DF4260_8018BAFC, actor, gCalcMatrix); +void func_i1_8018BBA4(Actor* actor) { + Animation_DrawSkeleton(3, D_6029A48, actor->vwork, NULL, func_i1_8018BAFC, actor, gCalcMatrix); } -void func_DF4260_8018BBF8(Actor* actor) { - Animation_DrawSkeleton(3, D_6029A48, actor->vwork, func_DF4260_8018AB08, func_DF4260_8018BAFC, actor, gCalcMatrix); +void func_i1_8018BBF8(Actor* actor) { + Animation_DrawSkeleton(3, D_6029A48, actor->vwork, func_i1_8018AB08, func_i1_8018BAFC, actor, gCalcMatrix); } -s32 func_DF4260_8018BC50(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4) { +s32 func_i1_8018BC50(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4) { Actor* actor = (Actor*) arg4; if ((actor->unk_0B8 == 101) && (arg0 != 8)) { @@ -1470,14 +1466,14 @@ s32 func_DF4260_8018BC50(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* a return false; } -static Vec3f D_DF4260_801998C0 = { 0.0f, 0.0f, 0.0f }; +static Vec3f D_i1_801998C0 = { 0.0f, 0.0f, 0.0f }; -void func_DF4260_8018BC84(s32 arg0, Vec3f* arg1, void* arg2) { +void func_i1_8018BC84(s32 arg0, Vec3f* arg1, void* arg2) { Actor* actor = (Actor*) arg2; Vec3f sp28; Vec3f sp1C; - sp28 = D_DF4260_801998C0; + sp28 = D_i1_801998C0; Matrix_MultVec3f(gCalcMatrix, &sp28, &sp1C); switch (arg0) { @@ -1504,11 +1500,11 @@ void func_DF4260_8018BC84(s32 arg0, Vec3f* arg1, void* arg2) { } } -void func_DF4260_8018BD7C(Actor* actor) { - Animation_DrawSkeleton(3, D_6029A48, actor->vwork, func_DF4260_8018BC50, func_DF4260_8018BC84, actor, gCalcMatrix); +void func_i1_8018BD7C(Actor* actor) { + Animation_DrawSkeleton(3, D_6029A48, actor->vwork, func_i1_8018BC50, func_i1_8018BC84, actor, gCalcMatrix); } -void func_DF4260_8018BDD4(Boss* boss, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5, s32 arg6) { +void func_i1_8018BDD4(Boss* boss, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5, s32 arg6) { s32 var_v1; var_v1 = 0xBF; @@ -1517,11 +1513,11 @@ void func_DF4260_8018BDD4(Boss* boss, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s3 var_v1 = 0xBE; } - func_DF4260_80187710(boss->obj.pos.x + arg1, boss->obj.pos.y + arg2, boss->obj.pos.z + arg3, arg4, boss->obj.rot.x, - boss->obj.rot.y, arg5, arg6, var_v1); + func_i1_80187710(boss->obj.pos.x + arg1, boss->obj.pos.y + arg2, boss->obj.pos.z + arg3, arg4, boss->obj.rot.x, + boss->obj.rot.y, arg5, arg6, var_v1); } -void func_DF4260_8018BE7C(Boss* boss) { +void func_i1_8018BE7C(Boss* boss) { s32 i; s16 temp_s1; @@ -1535,9 +1531,9 @@ void func_DF4260_8018BE7C(Boss* boss) { boss->timer_05A = 30000; boss->obj.pos.z = (gPlayer[0].camEye.z - D_80177D20) - 2000.0f; Audio_PlaySfx(0x31038018, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_DF4260_8019B6D0 = 0; + D_i1_8019B6D0 = 0; } else { - D_DF4260_8019B6D0 = 1; + D_i1_8019B6D0 = 1; boss->obj.rot.y = 180.0f; boss->fwork[6] = 800.0f; boss->obj.pos.z = gPlayer[0].unk_138 + 2000.0f; @@ -1566,30 +1562,30 @@ void func_DF4260_8018BE7C(Boss* boss) { } } -void func_DF4260_8018C0B0(Boss* boss) { +void func_i1_8018C0B0(Boss* boss) { func_8007D9DC(boss->obj.pos.x, gGroundLevel + 2.0f, boss->obj.pos.z, 5.0f, 100.0f, 0); func_8007D9DC(boss->obj.pos.x, gGroundLevel + 2.0f, boss->obj.pos.z, 5.0f, 100.0f, 5); func_8007D9DC(boss->obj.pos.x, gGroundLevel + 2.0f, boss->obj.pos.z, 5.0f, 100.0f, 10); func_8007ADF4(boss->obj.pos.x, gGroundLevel, boss->obj.pos.z, 1.0f, 10.0f); } -static Vec3f D_DF4260_801998CC = { 442.0f, 5.0f, 360.0f }; -static Vec3f D_DF4260_801998D8 = { -439.0f, 180.0f, 323.0f }; -static Vec3f D_DF4260_801998E4 = { -439.0f, -180.0f, 323.0f }; -static Vec3f D_DF4260_801998F0[2] = { +static Vec3f D_i1_801998CC = { 442.0f, 5.0f, 360.0f }; +static Vec3f D_i1_801998D8 = { -439.0f, 180.0f, 323.0f }; +static Vec3f D_i1_801998E4 = { -439.0f, -180.0f, 323.0f }; +static Vec3f D_i1_801998F0[2] = { { 0.0f, 50.0f, 473.0f }, { 300.0f, 70.0f, 200.0f }, }; -static Vec3f D_DF4260_80199908 = { 230.0f, 30.0f, -200.0f }; -static Vec3f D_DF4260_80199914[2] = { +static Vec3f D_i1_80199908 = { 230.0f, 30.0f, -200.0f }; +static Vec3f D_i1_80199914[2] = { { 434.0f, -74.0f, -580.0f }, { -438.0f, -277.0f, -750.0f }, }; -static Vec3f D_DF4260_8019992C = { -438.0f, 275.0f, -750.0f }; -static Vec3f D_DF4260_80199938 = { -426.0f, 147.0f, 2.0f }; -static Vec3f D_DF4260_80199944 = { -437.0f, -135.0f, 2.0f }; -static Vec3f D_DF4260_80199950 = { -250.0f, 30.0f, -200.0f }; -static Vec3f D_DF4260_8019995C[20] = { +static Vec3f D_i1_8019992C = { -438.0f, 275.0f, -750.0f }; +static Vec3f D_i1_80199938 = { -426.0f, 147.0f, 2.0f }; +static Vec3f D_i1_80199944 = { -437.0f, -135.0f, 2.0f }; +static Vec3f D_i1_80199950 = { -250.0f, 30.0f, -200.0f }; +static Vec3f D_i1_8019995C[20] = { { 67.0f, 44.0f, 377.0f }, { -146.0f, 24.0f, 376.0f }, { -88.0f, 85.0f, -15.0f }, { 105.0f, 89.0f, -169.0f }, { -107.0f, -36.0f, 367.0f }, { 110.0f, -39.0f, 286.0f }, { -126.0f, -93.0f, 221.0f }, { 88.0f, -94.0f, 155.0f }, { 126.0f, -179.0f, -101.0f }, { -94.0f, -151.0f, 29.0f }, { 105.0f, -140.0f, 2.0f }, { -18.0f, -101.0f, 77.0f }, @@ -1597,11 +1593,11 @@ static Vec3f D_DF4260_8019995C[20] = { { 116.0f, 34.0f, 368.0f }, { -49.0f, -53.0f, 366.0f }, { 113.0f, -62.0f, 255.0f }, { -114.0f, -88.0f, 182.0f } }; -static s32 D_DF4260_80199A4C[4] = { 150, 200, 150, 200 }; +static s32 D_i1_80199A4C[4] = { 150, 200, 150, 200 }; -static f32 D_DF4260_80199A5C[4] = { -225.0f, 0.0f, 225.0f, 0.0f }; +static f32 D_i1_80199A5C[4] = { -225.0f, 0.0f, 225.0f, 0.0f }; -void func_DF4260_8018C19C(Boss* boss) { +void func_i1_8018C19C(Boss* boss) { // todo: figure out vec3f stack s32 pad[9]; Vec3f sp84[30]; @@ -1621,7 +1617,7 @@ void func_DF4260_8018C19C(Boss* boss) { Matrix_RotateY(gCalcMatrix, boss->obj.rot.y * M_DTOR, 0); Matrix_RotateX(gCalcMatrix, boss->obj.rot.x * M_DTOR, 1); Matrix_RotateZ(gCalcMatrix, boss->obj.rot.z * M_DTOR, 1); - if (D_DF4260_8019B6D0 == 0) { + if (D_i1_8019B6D0 == 0) { if (boss->obj.pos.x > 6000.0f) { Object_Kill(&boss->obj, &boss->sfxPos); for (i = 1; i < ARRAY_COUNT(gBosses); i++) { @@ -1638,9 +1634,9 @@ void func_DF4260_8018C19C(Boss* boss) { boss->vel.z = sp6C.z - D_80177D08; boss->fwork[16] = 4.0f; if (!(gFrameCount & 1)) { - Matrix_MultVec3f(gCalcMatrix, &D_DF4260_80199914[0], &sp84[6]); - Matrix_MultVec3f(gCalcMatrix, &D_DF4260_80199914[1], &sp84[7]); - Matrix_MultVec3f(gCalcMatrix, &D_DF4260_8019992C, &sp84[8]); + Matrix_MultVec3f(gCalcMatrix, &D_i1_80199914[0], &sp84[6]); + Matrix_MultVec3f(gCalcMatrix, &D_i1_80199914[1], &sp84[7]); + Matrix_MultVec3f(gCalcMatrix, &D_i1_8019992C, &sp84[8]); func_8007BC7C(sp84[6].x + boss->obj.pos.x, sp84[6].y + boss->obj.pos.y, sp84[6].z + boss->obj.pos.z, 20.0f); func_8007BC7C(sp84[7].x + boss->obj.pos.x, sp84[7].y + boss->obj.pos.y, sp84[7].z + boss->obj.pos.z, 10.0f); func_8007BC7C(sp84[8].x + boss->obj.pos.x, sp84[8].y + boss->obj.pos.y, sp84[8].z + boss->obj.pos.z, 10.0f); @@ -1653,9 +1649,9 @@ void func_DF4260_8018C19C(Boss* boss) { D_80178578 = 20; gPlayer[0].unk_23C = 100; } - Matrix_MultVec3f(gCalcMatrix, &D_DF4260_801998CC, &sp84[0]); - Matrix_MultVec3f(gCalcMatrix, &D_DF4260_801998D8, &sp84[1]); - Matrix_MultVec3f(gCalcMatrix, &D_DF4260_801998E4, &sp84[2]); + Matrix_MultVec3f(gCalcMatrix, &D_i1_801998CC, &sp84[0]); + Matrix_MultVec3f(gCalcMatrix, &D_i1_801998D8, &sp84[1]); + Matrix_MultVec3f(gCalcMatrix, &D_i1_801998E4, &sp84[2]); if (boss->health != 601) { var_v1 = boss->health - 601; @@ -1668,7 +1664,7 @@ void func_DF4260_8018C19C(Boss* boss) { for (var_v0 = 0, var_v1 = 13; var_v0 < i; var_v0++, var_v1++) { if ((gFrameCount & 0xF) == (var_v0 & 0xF)) { - Matrix_MultVec3f(gCalcMatrix, &D_DF4260_8019995C[var_v0], &sp84[var_v1]); + Matrix_MultVec3f(gCalcMatrix, &D_i1_8019995C[var_v0], &sp84[var_v1]); func_8007D0E0(sp84[var_v1].x + boss->obj.pos.x, sp84[var_v1].y + boss->obj.pos.y, sp84[var_v1].z + boss->obj.pos.z, boss->fwork[17]); func_8007C120(sp84[var_v1].x + boss->obj.pos.x, sp84[var_v1].y + boss->obj.pos.y, @@ -1715,7 +1711,7 @@ void func_DF4260_8018C19C(Boss* boss) { } } if ((gBosses[1].actionState != 0) && !(gFrameCount & 0xF)) { - Matrix_MultVec3f(gCalcMatrix, &D_DF4260_80199908, &sp84[5]); + Matrix_MultVec3f(gCalcMatrix, &D_i1_80199908, &sp84[5]); func_8007D0E0(gBosses[0].obj.pos.x + sp84[5].x, gBosses[0].obj.pos.y + sp84[5].y, gBosses[0].obj.pos.z + sp84[5].z, 5.0f); } @@ -1723,26 +1719,26 @@ void func_DF4260_8018C19C(Boss* boss) { gBosses[3].unk_05E = 1; if (gBosses[3].actionState != 0) { if (!(gFrameCount & 7)) { - Matrix_MultVec3f(gCalcMatrix, &D_DF4260_80199950, &sp84[11]); + Matrix_MultVec3f(gCalcMatrix, &D_i1_80199950, &sp84[11]); func_8007D0E0(gBosses[0].obj.pos.x + sp84[11].x, gBosses[0].obj.pos.y + sp84[11].y, gBosses[0].obj.pos.z + sp84[11].z, 7.0f); } } else if (!(gFrameCount & 0xF)) { - Matrix_MultVec3f(gCalcMatrix, &D_DF4260_80199938, &sp84[9]); + Matrix_MultVec3f(gCalcMatrix, &D_i1_80199938, &sp84[9]); func_8007D0E0(gBosses[0].obj.pos.x + sp84[9].x, gBosses[0].obj.pos.y + sp84[9].y, gBosses[0].obj.pos.z + sp84[9].z, 5.0f); } } if ((gBosses[3].actionState != 0) && (gBosses[2].actionState == 0) && !(gFrameCount & 0xF)) { - Matrix_MultVec3f(gCalcMatrix, &D_DF4260_80199944, &sp84[10]); + Matrix_MultVec3f(gCalcMatrix, &D_i1_80199944, &sp84[10]); func_8007D0E0(gBosses[0].obj.pos.x + sp84[10].x, gBosses[0].obj.pos.y + sp84[10].y, gBosses[0].obj.pos.z + sp84[10].z, 5.0f); } if (((boss->actionState == 1) || (boss->actionState == 2)) && !(gFrameCount & 7)) { - Matrix_MultVec3f(gCalcMatrix, &D_DF4260_80199914[0], &sp84[6]); - Matrix_MultVec3f(gCalcMatrix, &D_DF4260_80199914[1], &sp84[7]); - Matrix_MultVec3f(gCalcMatrix, &D_DF4260_8019992C, &sp84[8]); + Matrix_MultVec3f(gCalcMatrix, &D_i1_80199914[0], &sp84[6]); + Matrix_MultVec3f(gCalcMatrix, &D_i1_80199914[1], &sp84[7]); + Matrix_MultVec3f(gCalcMatrix, &D_i1_8019992C, &sp84[8]); func_8007BC7C(sp84[6].x + boss->obj.pos.x, sp84[6].y + boss->obj.pos.y, sp84[6].z + boss->obj.pos.z, 20.0f); func_8007BC7C(sp84[7].x + boss->obj.pos.x, sp84[7].y + boss->obj.pos.y, sp84[7].z + boss->obj.pos.z, 10.0f); func_8007BC7C(sp84[8].x + boss->obj.pos.x, sp84[8].y + boss->obj.pos.y, sp84[8].z + boss->obj.pos.z, 10.0f); @@ -1825,7 +1821,7 @@ void func_DF4260_8018C19C(Boss* boss) { boss->swork[5] &= 3; } else if ((boss->fwork[2] > 60.0f) && (boss->timer_054 == 0)) { boss->timer_054 = 20; - func_DF4260_8018BDD4(boss, sp84[0].x, sp84[0].y, sp84[0].z, 30.0f, 0, 1); + func_i1_8018BDD4(boss, sp84[0].x, sp84[0].y, sp84[0].z, 30.0f, 0, 1); } break; case 5: @@ -1833,15 +1829,15 @@ void func_DF4260_8018C19C(Boss* boss) { boss->fwork[10] = 120.0f; boss->fwork[13] = 20.0f; if ((boss->fwork[0] > 60.0f) && (gBosses[2].actionState == 0) && (boss->swork[1] == 0)) { - func_DF4260_8018BDD4(boss, sp84[1].x, sp84[1].y + 50.0f, sp84[1].z, 45.0f, 0, 0); + func_i1_8018BDD4(boss, sp84[1].x, sp84[1].y + 50.0f, sp84[1].z, 45.0f, 0, 0); Audio_PlaySfx(0x2903201B, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - func_DF4260_8018BDD4(boss, sp84[1].x, sp84[1].y - 50.0f, sp84[1].z, 40.0f, 0, 0); + func_i1_8018BDD4(boss, sp84[1].x, sp84[1].y - 50.0f, sp84[1].z, 40.0f, 0, 0); boss->swork[1] = 1; } if ((boss->fwork[1] > 60.0f) && (gBosses[3].actionState == 0) && (boss->swork[2] == 0)) { - func_DF4260_8018BDD4(boss, sp84[2].x, sp84[2].y + 50.0f, sp84[2].z, 35.0f, 0, 0); + func_i1_8018BDD4(boss, sp84[2].x, sp84[2].y + 50.0f, sp84[2].z, 35.0f, 0, 0); Audio_PlaySfx(0x2903201B, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - func_DF4260_8018BDD4(boss, sp84[2].x, sp84[2].y - 50.0f, sp84[2].z, 30.0f, 0, 0); + func_i1_8018BDD4(boss, sp84[2].x, sp84[2].y - 50.0f, sp84[2].z, 30.0f, 0, 0); boss->swork[2] = 1; } if ((boss->timer_050 == 0) || ((gBosses[3].actionState != 0) && (gBosses[2].actionState != 0))) { @@ -1882,8 +1878,8 @@ void func_DF4260_8018C19C(Boss* boss) { Math_SmoothStepToF(&boss->obj.pos.z, boss->fwork[3], 0.1f, 15.0f, 0.00001f); if (boss->timer_058 == 0) { - boss->timer_058 = D_DF4260_80199A4C[boss->swork[3]]; - boss->fwork[20] = D_DF4260_80199A5C[boss->swork[3]]; + boss->timer_058 = D_i1_80199A4C[boss->swork[3]]; + boss->fwork[20] = D_i1_80199A5C[boss->swork[3]]; boss->swork[3]++; boss->swork[3] &= 3; boss->fwork[8] = 0.0f; @@ -1909,7 +1905,7 @@ void func_DF4260_8018C19C(Boss* boss) { if (!(gFrameCount & 7)) { if (fabsf(boss->obj.pos.z - gPlayer[0].unk_138) > 700.0f) { - Matrix_MultVec3f(gCalcMatrix, &D_DF4260_801998F0[0], &sp84[3]); + Matrix_MultVec3f(gCalcMatrix, &D_i1_801998F0[0], &sp84[3]); effect = gEffects; for (i = 0; i < 100; i++, effect++) { if (effect->obj.status == 0) { @@ -2036,7 +2032,7 @@ void func_DF4260_8018C19C(Boss* boss) { boss->vel.y = -10.0f; boss->gravity = 0.0f; boss->fwork[17] = 20.0f; - func_DF4260_8018C0B0(boss); + func_i1_8018C0B0(boss); boss->actionState = 10; } break; @@ -2091,10 +2087,10 @@ void func_DF4260_8018C19C(Boss* boss) { } } -static Vec3f D_DF4260_80199A6C = { -270.0f, 0.0f, 200.0f }; -static Vec3f D_DF4260_80199A78 = { 440.0f, 0.0f, 0.0f }; +static Vec3f D_i1_80199A6C = { -270.0f, 0.0f, 200.0f }; +static Vec3f D_i1_80199A78 = { 440.0f, 0.0f, 0.0f }; -void func_DF4260_8018DDAC(Boss* boss) { +void func_i1_8018DDAC(Boss* boss) { Vec3f sp4C; Vec3f sp40; s32 i; @@ -2125,7 +2121,7 @@ void func_DF4260_8018DDAC(Boss* boss) { } gBosses[0].timer_056 = 30; boss->actionState = 1; - Matrix_MultVec3f(gCalcMatrix, &D_DF4260_80199A6C, &sp4C); + Matrix_MultVec3f(gCalcMatrix, &D_i1_80199A6C, &sp4C); for (i = 0; i < 10; i++) { func_80079618(boss->obj.pos.x + sp4C.x, boss->obj.pos.y + sp4C.y, @@ -2148,7 +2144,7 @@ void func_DF4260_8018DDAC(Boss* boss) { Matrix_RotateY(gCalcMatrix, boss->obj.rot.y * M_DTOR, 0); Matrix_RotateX(gCalcMatrix, boss->obj.rot.x * M_DTOR, 1); Matrix_RotateZ(gCalcMatrix, boss->obj.rot.z * M_DTOR, 1); - Matrix_MultVec3f(gCalcMatrix, &D_DF4260_80199A78, &sp40); + Matrix_MultVec3f(gCalcMatrix, &D_i1_80199A78, &sp40); boss->obj.pos.x = gBosses[0].obj.pos.x + sp40.x; boss->obj.pos.y = gBosses[0].obj.pos.y + sp40.y; boss->obj.pos.z = gBosses[0].obj.pos.z + sp40.z; @@ -2163,7 +2159,7 @@ void func_DF4260_8018DDAC(Boss* boss) { } if (!(gFrameCount & 1)) { - Matrix_MultVec3f(gCalcMatrix, &D_DF4260_80199A6C, &sp4C); + Matrix_MultVec3f(gCalcMatrix, &D_i1_80199A6C, &sp4C); func_8007C120(boss->obj.pos.x + sp4C.x, boss->obj.pos.y + sp4C.y, boss->obj.pos.z + sp4C.z, boss->vel.x, boss->vel.y, boss->vel.z, 0.2f, 10); } @@ -2173,7 +2169,7 @@ void func_DF4260_8018DDAC(Boss* boss) { boss->vel.y = -5.0f; boss->swork[0] = 1; boss->gravity = 0.0f; - func_DF4260_8018C0B0(boss); + func_i1_8018C0B0(boss); Audio_PlaySfx(0x19000014, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } } else { @@ -2184,11 +2180,11 @@ void func_DF4260_8018DDAC(Boss* boss) { } } -static Vec3f D_DF4260_80199A84 = { 20.0f, -90.0f, 0.0f }; +static Vec3f D_i1_80199A84 = { 20.0f, -90.0f, 0.0f }; -static Vec3f D_DF4260_80199A90 = { -440.0f, 210.0f, 0.0f }; +static Vec3f D_i1_80199A90 = { -440.0f, 210.0f, 0.0f }; -void func_DF4260_8018E290(Boss* boss) { +void func_i1_8018E290(Boss* boss) { Vec3f sp4C; Vec3f sp40; s32 i; @@ -2220,7 +2216,7 @@ void func_DF4260_8018E290(Boss* boss) { } gBosses[0].timer_056 = 30; boss->actionState = 1; - Matrix_MultVec3f(gCalcMatrix, &D_DF4260_80199A84, &sp4C); + Matrix_MultVec3f(gCalcMatrix, &D_i1_80199A84, &sp4C); for (i = 0; i < 10; i++) { func_80079618(boss->obj.pos.x + sp4C.x, boss->obj.pos.y + sp4C.y, boss->obj.pos.z + sp4C.z, 1.0f); @@ -2241,7 +2237,7 @@ void func_DF4260_8018E290(Boss* boss) { Matrix_RotateY(gCalcMatrix, boss->obj.rot.y * M_DTOR, 0); Matrix_RotateX(gCalcMatrix, boss->obj.rot.x * M_DTOR, 1); Matrix_RotateZ(gCalcMatrix, boss->obj.rot.z * M_DTOR, 1); - Matrix_MultVec3f(gCalcMatrix, &D_DF4260_80199A90, &sp40); + Matrix_MultVec3f(gCalcMatrix, &D_i1_80199A90, &sp40); boss->obj.pos.x = gBosses[0].obj.pos.x + sp40.x; boss->obj.pos.y = gBosses[0].obj.pos.y + sp40.y; boss->obj.pos.z = gBosses[0].obj.pos.z + sp40.z; @@ -2256,7 +2252,7 @@ void func_DF4260_8018E290(Boss* boss) { } if (!(gFrameCount & 1)) { - Matrix_MultVec3f(gCalcMatrix, &D_DF4260_80199A84, &sp4C); + Matrix_MultVec3f(gCalcMatrix, &D_i1_80199A84, &sp4C); func_8007C120(boss->obj.pos.x + sp4C.x, boss->obj.pos.y + sp4C.y, boss->obj.pos.z + sp4C.z, boss->vel.x, boss->vel.y, boss->vel.z, 0.2f, 10); } @@ -2266,7 +2262,7 @@ void func_DF4260_8018E290(Boss* boss) { boss->vel.y = -5.0f; boss->swork[0] = 1; boss->gravity = 0.0f; - func_DF4260_8018C0B0(boss); + func_i1_8018C0B0(boss); Audio_PlaySfx(0x19000014, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } } else { @@ -2277,11 +2273,11 @@ void func_DF4260_8018E290(Boss* boss) { } } -static Vec3f D_DF4260_80199A9C = { 20.0f, 90.0f, 0.0f }; +static Vec3f D_i1_80199A9C = { 20.0f, 90.0f, 0.0f }; -static Vec3f D_DF4260_80199AA8 = { -440.0f, -210.0f, 0.0f }; +static Vec3f D_i1_80199AA8 = { -440.0f, -210.0f, 0.0f }; -void func_DF4260_8018E76C(Boss* boss) { +void func_i1_8018E76C(Boss* boss) { Vec3f sp4C; Vec3f sp40; s32 i; @@ -2314,7 +2310,7 @@ void func_DF4260_8018E76C(Boss* boss) { gBosses[0].timer_056 = 30; boss->actionState = 1; gBosses[0].fwork[6] = 500.0f; - Matrix_MultVec3f(gCalcMatrix, &D_DF4260_80199A9C, &sp4C); + Matrix_MultVec3f(gCalcMatrix, &D_i1_80199A9C, &sp4C); for (i = 0; i < 10; i++) { func_80079618(boss->obj.pos.x + sp4C.x, boss->obj.pos.y + sp4C.y, @@ -2337,7 +2333,7 @@ void func_DF4260_8018E76C(Boss* boss) { Matrix_RotateY(gCalcMatrix, boss->obj.rot.y * M_DTOR, 0); Matrix_RotateX(gCalcMatrix, boss->obj.rot.x * M_DTOR, 1); Matrix_RotateZ(gCalcMatrix, boss->obj.rot.z * M_DTOR, 1); - Matrix_MultVec3f(gCalcMatrix, &D_DF4260_80199AA8, &sp40); + Matrix_MultVec3f(gCalcMatrix, &D_i1_80199AA8, &sp40); boss->obj.pos.x = gBosses[0].obj.pos.x + sp40.x; boss->obj.pos.y = gBosses[0].obj.pos.y + sp40.y; boss->obj.pos.z = gBosses[0].obj.pos.z + sp40.z; @@ -2350,7 +2346,7 @@ void func_DF4260_8018E76C(Boss* boss) { boss->timer_05C = 4; } if (!(gFrameCount & 1)) { - Matrix_MultVec3f(gCalcMatrix, &D_DF4260_80199A9C, &sp4C); + Matrix_MultVec3f(gCalcMatrix, &D_i1_80199A9C, &sp4C); func_8007C120(boss->obj.pos.x + sp4C.x, boss->obj.pos.y + sp4C.y, boss->obj.pos.z + sp4C.z, boss->vel.x, boss->vel.y, boss->vel.z, 0.2f, 10); } @@ -2359,7 +2355,7 @@ void func_DF4260_8018E76C(Boss* boss) { boss->vel.y = -5.0f; boss->swork[0] = 1; boss->gravity = 0.0f; - func_DF4260_8018C0B0(boss); + func_i1_8018C0B0(boss); Audio_PlaySfx(0x19000014, &boss->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } } else { @@ -2370,7 +2366,7 @@ void func_DF4260_8018E76C(Boss* boss) { } } -s32 func_DF4260_8018EC54(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4) { +s32 func_i1_8018EC54(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4) { if ((arg0 == 10) && (gBosses[2].actionState != 0) && (gBosses[3].actionState != 0)) { *arg1 = NULL; } @@ -2383,13 +2379,13 @@ s32 func_DF4260_8018EC54(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* a extern AnimationHeader D_602D400; extern Limb* D_602D5AC[]; -void func_DF4260_8018ECAC(Boss* boss) { +void func_i1_8018ECAC(Boss* boss) { Animation_GetFrameData(&D_602D400, 0, boss->vwork); - Animation_DrawSkeleton(1, D_602D5AC, boss->vwork, func_DF4260_8018EC54, NULL, &boss->index, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_602D5AC, boss->vwork, func_i1_8018EC54, NULL, &boss->index, &gIdentityMatrix); } -s32 func_DF4260_8018ED1C(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4) { +s32 func_i1_8018ED1C(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4) { if (arg0 == 5) { arg3->y -= gBosses[*(s32*) arg4].fwork[2]; } @@ -2399,15 +2395,15 @@ s32 func_DF4260_8018ED1C(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* a return 0; } -void func_DF4260_8018ED78(Boss* boss) { +void func_i1_8018ED78(Boss* boss) { - Matrix_Translate(gGfxMatrix, -D_DF4260_80199A78.x, -D_DF4260_80199A78.y, 0.0f, 1); + Matrix_Translate(gGfxMatrix, -D_i1_80199A78.x, -D_i1_80199A78.y, 0.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); Animation_GetFrameData(&D_602D400, 0, boss->vwork); - Animation_DrawSkeleton(1, D_602D5AC, boss->vwork, func_DF4260_8018ED1C, NULL, &boss->index, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_602D5AC, boss->vwork, func_i1_8018ED1C, NULL, &boss->index, &gIdentityMatrix); } -s32 func_DF4260_8018EE2C(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4) { +s32 func_i1_8018EE2C(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4) { if (arg0 == 1) { arg3->z -= gBosses[*(s32*) arg4].fwork[0]; } @@ -2417,15 +2413,15 @@ s32 func_DF4260_8018EE2C(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* a return 0; } -void func_DF4260_8018EE84(Boss* boss) { +void func_i1_8018EE84(Boss* boss) { - Matrix_Translate(gGfxMatrix, -D_DF4260_80199A90.x, -D_DF4260_80199A90.y, 0.0f, 1); + Matrix_Translate(gGfxMatrix, -D_i1_80199A90.x, -D_i1_80199A90.y, 0.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); Animation_GetFrameData(&D_602D400, 0, boss->vwork); - Animation_DrawSkeleton(1, D_602D5AC, boss->vwork, func_DF4260_8018EE2C, NULL, &boss->index, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_602D5AC, boss->vwork, func_i1_8018EE2C, NULL, &boss->index, &gIdentityMatrix); } -s32 func_DF4260_8018EF38(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4) { +s32 func_i1_8018EF38(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4) { if (arg0 == 3) { arg3->z -= gBosses[*(s32*) arg4].fwork[1]; } @@ -2435,17 +2431,17 @@ s32 func_DF4260_8018EF38(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* a return 0; } -void func_DF4260_8018EF90(Boss* boss) { +void func_i1_8018EF90(Boss* boss) { - Matrix_Translate(gGfxMatrix, -D_DF4260_80199AA8.x, -D_DF4260_80199AA8.y, 0.0f, 1); + Matrix_Translate(gGfxMatrix, -D_i1_80199AA8.x, -D_i1_80199AA8.y, 0.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); Animation_GetFrameData(&D_602D400, 0, boss->vwork); - Animation_DrawSkeleton(1, D_602D5AC, boss->vwork, func_DF4260_8018EF38, NULL, &boss->index, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_602D5AC, boss->vwork, func_i1_8018EF38, NULL, &boss->index, &gIdentityMatrix); } extern f32 D_603E924[]; -void func_DF4260_8018F044(Object_80* obj80) { +void func_i1_8018F044(Object_80* obj80) { switch (obj80->unk_48) { case 0: @@ -2473,7 +2469,7 @@ void func_DF4260_8018F044(Object_80* obj80) { } } -s32 func_DF4260_8018F1C8(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4) { +s32 func_i1_8018F1C8(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4) { Object_80* obj80 = (Object_80*) arg4; RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); @@ -2497,15 +2493,15 @@ s32 func_DF4260_8018F1C8(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* a extern AnimationHeader D_602AA7C; extern Limb* D_602AB48[]; -void func_DF4260_8018F31C(Object_80* obj80) { +void func_i1_8018F31C(Object_80* obj80) { Vec3f sp28[10]; Animation_GetFrameData(&D_602AA7C, 0, sp28); - Animation_DrawSkeleton(3, D_602AB48, sp28, func_DF4260_8018F1C8, NULL, obj80, gCalcMatrix); + Animation_DrawSkeleton(3, D_602AB48, sp28, func_i1_8018F1C8, NULL, obj80, gCalcMatrix); RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } -void func_DF4260_8018F3BC(Object_80* obj80, f32 arg1) { +void func_i1_8018F3BC(Object_80* obj80, f32 arg1) { Object_80_Initialize(obj80); obj80->obj.status = 1; obj80->obj.pos.x = ((Rand_ZeroOne() - 0.5f) * 1000.0f) + arg1; @@ -2521,27 +2517,27 @@ void func_DF4260_8018F3BC(Object_80* obj80, f32 arg1) { obj80->info.unk_10 = 15000.0f; } -void func_DF4260_8018F4A4(void) { +void func_i1_8018F4A4(void) { s32 i; if (!(gFrameCount & 0xF) && !(gPlayer[0].unk_1D0 < 4)) { for (i = 0; i < 50; i++) { if (gObjects80[i].obj.status == 0) { - func_DF4260_8018F3BC(&gObjects80[i], 4000.0f); + func_i1_8018F3BC(&gObjects80[i], 4000.0f); break; } } for (i = 0; i < ARRAY_COUNT(gObjects80); i++) { if (gObjects80[i].obj.status == 0) { - func_DF4260_8018F3BC(&gObjects80[i], -4000.0f); + func_i1_8018F3BC(&gObjects80[i], -4000.0f); break; } } } } -void func_DF4260_8018F55C(Effect* effect) { +void func_i1_8018F55C(Effect* effect) { Effect_Initialize(effect); effect->obj.status = 1; @@ -2559,40 +2555,40 @@ void func_DF4260_8018F55C(Effect* effect) { Object_SetInfo(&effect->info, effect->obj.id); } -void func_DF4260_8018F678(void) { +void func_i1_8018F678(void) { s32 i; if (!(gFrameCount & 0x1F) && gPlayer[0].pos.x == 0.0f) { for (i = 0; i < ARRAY_COUNT(gEffects); i++) { if (gEffects[i].obj.status == 0) { - func_DF4260_8018F55C(&gEffects[i]); + func_i1_8018F55C(&gEffects[i]); return; } } } } -static f32 D_DF4260_80199AB4[3] = { 180.0f, -180.0f, 0.0f }; +static f32 D_i1_80199AB4[3] = { 180.0f, -180.0f, 0.0f }; -static f32 D_DF4260_80199AC0[3] = { 200.0f, 140.0f, 200.0f }; +static f32 D_i1_80199AC0[3] = { 200.0f, 140.0f, 200.0f }; -static f32 D_DF4260_80199ACC[3] = { 160.0f, 160.0f, 320.0f }; +static f32 D_i1_80199ACC[3] = { 160.0f, 160.0f, 320.0f }; -static f32 D_DF4260_80199AD8[3] = { -60.0f, 60.0f, -45.0f }; +static f32 D_i1_80199AD8[3] = { -60.0f, 60.0f, -45.0f }; -void func_DF4260_8018F6F8(Actor* actor, s32 arg1) { +void func_i1_8018F6F8(Actor* actor, s32 arg1) { Actor_Initialize(actor); actor->obj.status = 1; actor->obj.id = OBJ_ACTOR_195; - actor->obj.pos.x = (D_DF4260_80199AB4[arg1] * 4.0f) + gPlayer[0].pos.x; - actor->obj.pos.y = (D_DF4260_80199AC0[arg1] * 2.0f) + gPlayer[0].pos.y; - actor->obj.pos.z = (D_DF4260_80199ACC[arg1] * 3.0f) + gPlayer[0].unk_138; - actor->vwork[20].x = D_DF4260_80199AB4[arg1] + gPlayer[0].pos.x; + actor->obj.pos.x = (D_i1_80199AB4[arg1] * 4.0f) + gPlayer[0].pos.x; + actor->obj.pos.y = (D_i1_80199AC0[arg1] * 2.0f) + gPlayer[0].pos.y; + actor->obj.pos.z = (D_i1_80199ACC[arg1] * 3.0f) + gPlayer[0].unk_138; + actor->vwork[20].x = D_i1_80199AB4[arg1] + gPlayer[0].pos.x; actor->vwork[20].y = gPlayer[0].pos.y; - actor->vwork[20].z = D_DF4260_80199ACC[arg1] + gPlayer[0].unk_138; - actor->obj.rot.z = D_DF4260_80199AD8[arg1]; + actor->vwork[20].z = D_i1_80199ACC[arg1] + gPlayer[0].unk_138; + actor->obj.rot.z = D_i1_80199AD8[arg1]; actor->unk_0B8 = 100; actor->obj.rot.y = 180.0f; actor->fwork[0] = Rand_ZeroOne() * 360.0f; @@ -2605,7 +2601,7 @@ void func_DF4260_8018F6F8(Actor* actor, s32 arg1) { extern Gfx* D_30184D8; -void func_DF4260_8018F880(Player* player) { +void func_i1_8018F880(Player* player) { s32 i; Actor* actor0 = &gActors[0]; Actor* actor1 = &gActors[1]; @@ -2696,7 +2692,7 @@ void func_DF4260_8018F880(Player* player) { player->unk_080 = -__sinf(player->unk_088 * M_DTOR) * 0.5f; player->unk_0F4 += 3.0f; player->unk_0F0 = __sinf(player->unk_0F4 * M_DTOR) * 1.5f; - func_DF4260_8018F678(); + func_i1_8018F678(); player->wings.unk_30 = 0; switch (player->unk_1D0) { @@ -2706,9 +2702,9 @@ void func_DF4260_8018F880(Player* player) { player->timer_1F8 = 600; player->pos.y = 6000.0f; player->pos.x = 0.1f; - func_DF4260_8018F6F8(&gActors[0], 0); - func_DF4260_8018F6F8(&gActors[1], 1); - func_DF4260_8018F6F8(&gActors[2], 2); + func_i1_8018F6F8(&gActors[0], 0); + func_i1_8018F6F8(&gActors[1], 1); + func_i1_8018F6F8(&gActors[2], 2); actor0->iwork[14] = 2; actor1->iwork[14] = 3; actor2->iwork[14] = 4; @@ -3020,21 +3016,21 @@ void func_DF4260_8018F880(Player* player) { actor1->obj.pos.y -= 3.0f; } -static f32 D_DF4260_80199AE4[3] = { -1500.0f, 700.0f, 0.0f }; +static f32 D_i1_80199AE4[3] = { -1500.0f, 700.0f, 0.0f }; -static f32 D_DF4260_80199AF0[3] = { -300.0f, 400.0f, 500.0f }; +static f32 D_i1_80199AF0[3] = { -300.0f, 400.0f, 500.0f }; -static f32 D_DF4260_80199AFC[3] = { 500.0f, 800.0f, 1200.0f }; +static f32 D_i1_80199AFC[3] = { 500.0f, 800.0f, 1200.0f }; -static f32 D_DF4260_80199B08[3] = { -150.0f, 150.0f, 0.0f }; +static f32 D_i1_80199B08[3] = { -150.0f, 150.0f, 0.0f }; -static f32 D_DF4260_80199B14[3] = { 0.0f, 0.0f, 0.0f }; +static f32 D_i1_80199B14[3] = { 0.0f, 0.0f, 0.0f }; -static f32 D_DF4260_80199B20[3] = { 200.0f, 200.0f, 400.0f }; +static f32 D_i1_80199B20[3] = { 200.0f, 200.0f, 400.0f }; -static f32 D_DF4260_80199B2C[3] = { 180.0f, -120.0f, 180.0f }; +static f32 D_i1_80199B2C[3] = { 180.0f, -120.0f, 180.0f }; -void func_DF4260_80190F74(Actor* actor, s32 arg1) { +void func_i1_80190F74(Actor* actor, s32 arg1) { Vec3f sp5C; Vec3f sp50; Vec3f sp44; @@ -3042,12 +3038,12 @@ void func_DF4260_80190F74(Actor* actor, s32 arg1) { Player* player = &gPlayer[0]; Matrix_RotateY(gCalcMatrix, player->unk_0E8 * M_DTOR, 0); - sp5C.x = D_DF4260_80199AE4[arg1]; - sp5C.y = D_DF4260_80199AF0[arg1]; - sp5C.z = D_DF4260_80199AFC[arg1]; - sp44.x = D_DF4260_80199B08[arg1]; - sp44.y = D_DF4260_80199B14[arg1]; - sp44.z = D_DF4260_80199B20[arg1]; + sp5C.x = D_i1_80199AE4[arg1]; + sp5C.y = D_i1_80199AF0[arg1]; + sp5C.z = D_i1_80199AFC[arg1]; + sp44.x = D_i1_80199B08[arg1]; + sp44.y = D_i1_80199B14[arg1]; + sp44.z = D_i1_80199B20[arg1]; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp5C, &sp50); Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp44, &sp38); Actor_Initialize(actor); @@ -3064,13 +3060,13 @@ void func_DF4260_80190F74(Actor* actor, s32 arg1) { actor->vel.z = player->vel.z; actor->obj.status = 1; actor->obj.id = OBJ_ACTOR_195; - actor->obj.rot.z = D_DF4260_80199B2C[arg1]; + actor->obj.rot.z = D_i1_80199B2C[arg1]; Object_SetInfo(&actor->info, actor->obj.id); actor->iwork[11] = 1; Audio_PlaySfx(0x3100000C, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } -void func_DF4260_80191160(Player* player) { +void func_i1_80191160(Player* player) { Vec3f sp64; Vec3f sp58; f32 sp54; @@ -3100,8 +3096,8 @@ void func_DF4260_80191160(Player* player) { switch (player->unk_1D0) { case 0: func_8001A38C(1, &player->unk_460); - sp54 = player->camEye.x - D_DF4260_8019B6D8[62]; - sp4C = player->camEye.z - D_DF4260_8019B6D8[64]; + sp54 = player->camEye.x - D_i1_8019B6D8[62]; + sp4C = player->camEye.z - D_i1_8019B6D8[64]; D_80177A48[0] = Math_RadToDeg(Math_Atan2F(sp54, sp4C)); D_80177A48[1] = sqrtf(SQ(sp54) + SQ(sp4C)); @@ -3124,14 +3120,14 @@ void func_DF4260_80191160(Player* player) { sp64.y = 0.0f; sp64.z = D_80177A48[1]; Matrix_MultVec3f(gCalcMatrix, &sp64, &sp58); - Math_SmoothStepToF(&player->camEye.x, D_DF4260_8019B6D8[62] + sp58.x, 0.05f, 500.0f, 0.0f); - Math_SmoothStepToF(&player->camEye.y, D_DF4260_8019B6D8[63] + 100.0f, 0.05f, 500.0f, 0.0f); - Math_SmoothStepToF(&player->camEye.z, D_DF4260_8019B6D8[64] + sp58.z, 0.05f, 500.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.x, D_DF4260_8019B6D8[62], 0.05f, 500.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.y, D_DF4260_8019B6D8[63], 0.05f, 500.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.z, D_DF4260_8019B6D8[64], 0.05f, 500.0f, 0.0f); - temp_fa0 = player->pos.x - D_DF4260_8019B6D8[62]; - temp_fa1 = player->pos.z - D_DF4260_8019B6D8[64]; + Math_SmoothStepToF(&player->camEye.x, D_i1_8019B6D8[62] + sp58.x, 0.05f, 500.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.y, D_i1_8019B6D8[63] + 100.0f, 0.05f, 500.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.z, D_i1_8019B6D8[64] + sp58.z, 0.05f, 500.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.x, D_i1_8019B6D8[62], 0.05f, 500.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.y, D_i1_8019B6D8[63], 0.05f, 500.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.z, D_i1_8019B6D8[64], 0.05f, 500.0f, 0.0f); + temp_fa0 = player->pos.x - D_i1_8019B6D8[62]; + temp_fa1 = player->pos.z - D_i1_8019B6D8[64]; if (D_80177A80 < 30) { temp_deg = Math_RadToDeg(-Math_Atan2F(temp_fa0, temp_fa1)); var_fv1 = Math_SmoothStepToAngle(&player->unk_0E8, temp_deg, 0.5f, 4.0f, 0.0001f) * 20.0f; @@ -3244,13 +3240,13 @@ void func_DF4260_80191160(Player* player) { case 470: func_800A6148(); if (gTeamShields[1] > 0) { - func_DF4260_80190F74(&gActors[0], 0); + func_i1_80190F74(&gActors[0], 0); } if (gTeamShields[2] > 0) { - func_DF4260_80190F74(&gActors[1], 1); + func_i1_80190F74(&gActors[1], 1); } if (gTeamShields[3] > 0) { - func_DF4260_80190F74(&gActors[2], 2); + func_i1_80190F74(&gActors[2], 2); } break; case 410: diff --git a/src/overlays/ovl_i1/fox_i1.c b/src/overlays/ovl_i1/fox_i1.c new file mode 100644 index 00000000..e572e0ad --- /dev/null +++ b/src/overlays/ovl_i1/fox_i1.c @@ -0,0 +1,8 @@ +#include "global.h" + +static s32 D_i1_801997D0 = 0; + +s32 D_i1_8019B6C0; + +void func_i1_80187520(s32 arg0, void* arg1) { +} diff --git a/src/overlays/ovl_i2/fox_i2.c b/src/overlays/ovl_i2/fox_i2.c new file mode 100644 index 00000000..cb291145 --- /dev/null +++ b/src/overlays/ovl_i2/fox_i2.c @@ -0,0 +1,8 @@ +#include "global.h" + +UNK_TYPE D_i2_80195D70; + +s32 D_i2_80195420 = 0; + +void func_i2_80187520(s32 arg0, void* arg1) { +} diff --git a/src/overlays/ovl_i2/fox_me.c b/src/overlays/ovl_i2/fox_me.c new file mode 100644 index 00000000..c6642b21 --- /dev/null +++ b/src/overlays/ovl_i2/fox_me.c @@ -0,0 +1,97 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_80187530.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_8018756C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_80187650.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_801877C4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_8018795C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_80187B08.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_80187C68.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_80187D08.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_80187D98.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_80187E38.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_80187FF8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_80188088.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_801881A8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_80188228.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_80188298.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_80188344.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_801887D0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_80188A40.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_80188B84.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_80188C2C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_80188CAC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_80188E8C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_80188F2C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_80188FAC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_80189114.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_801892F0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_80189624.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_8018978C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_8018B7C4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_8018BACC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_8018C77C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_8018C8F4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_8018CA10.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_8018CAD8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_8018CB50.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_8018CCF8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_8018CD8C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_8018D9EC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_8018DA6C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_8018DAEC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_8018DB6C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_8018DBEC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_8018DCE4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_8018DE14.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_8018DF08.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_8018E084.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/func_i2_8018ED9C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_me/D_i2_80195790.s") diff --git a/src/overlays/ovl_i2/fox_sx.c b/src/overlays/ovl_i2/fox_sx.c new file mode 100644 index 00000000..81344280 --- /dev/null +++ b/src/overlays/ovl_i2/fox_sx.c @@ -0,0 +1,81 @@ +#include "global.h" + +UNK_TYPE D_i2_80195D80; +f32 D_i2_80195D88[3]; +f32 D_i2_80195D98[3]; + +#ifdef IMPORT_DATA +s32 D_E08400_80195640 = 0; +Vec3f D_E08400_80195644 = { 73.0f, -102.0f, 80.0f }; +Vec3f D_E08400_80195650 = { 90.0f, 0.0f, 0.0f }; +Vec3f D_E08400_8019565C = { 73.0f, -102.0f, -80.0f }; +Vec3f D_E08400_80195668 = { 90.0f, 0.0f, 0.0f }; +Vec3f D_E08400_80195674 = { 0.0f, 0.0f, 0.0f }; +Vec3f D_E08400_80195680 = { 87.0f, -323.0f, 200.0f }; +Vec3f D_E08400_8019568C = { 87.0f, -323.0f, -200.0f }; +Vec3f D_E08400_80195698 = { 87.0f, -323.0f, 200.0f }; +Vec3f D_E08400_801956A4 = { 87.0f, -323.0f, -200.0f }; +Vec3f D_E08400_801956B0[5] = { + { 0.0f, 2300.0f, -5000.0f }, { -600.0f, 2200.0f, -5000.0f }, { -300.0f, 2270.0f, -5000.0f }, + { 300.0f, 2270.0f, -5000.0f }, { 600.0f, 2200.0f, -5000.0f }, +}; +Vec3f D_E08400_801956EC[3] = { + { 150.0f, 250.0f, 50.0f }, + { -150.0f, -50.0f, 50.0f }, + { 150.0f, -50.0f, 50.0f }, +}; +f32 D_E08400_80195710[4] = { -1200.0f, 1000.0f, 0.0f, 0.0f }; +f32 D_E08400_80195720[4] = { -300.0f, 400.0f, -400.0f, 0.0f }; +f32 D_E08400_80195730[4] = { -800.0f, -800.0f, -1000.0f, -8000.0f }; +f32 D_E08400_80195740[4] = { -150.0f, 150.0f, 0.0f, 0.0f }; +f32 D_E08400_80195750[4] = { 20.0f, 0.0f, -70.0f, 0.0f }; +f32 D_E08400_80195760[4] = { -250.0f, -200.0f, -400.0f, -8000.0f }; +f32 D_E08400_80195770[3] = { 120.0f, 180.0f, -150.0f }; +s16 D_E08400_8019577C[3] = { 2, 3, 4 }; +#endif + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_sx/func_i2_8018F030.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_sx/func_i2_8018F124.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_sx/func_i2_8018F1DC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_sx/func_i2_8018F330.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_sx/func_i2_8018F884.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_sx/func_i2_8018FA04.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_sx/func_i2_8018FBBC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_sx/func_i2_8018FE38.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_sx/func_i2_8018FF20.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_sx/func_i2_8018FF40.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_sx/func_i2_8018FF84.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_sx/func_i2_8018FFDC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_sx/func_i2_80190020.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_sx/func_i2_80190078.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_sx/func_i2_80192AF0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_sx/func_i2_80193208.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_sx/func_i2_80193434.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_sx/func_i2_80193800.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_sx/func_i2_801938D8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_sx/func_i2_80193A30.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_sx/func_i2_801944D4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_sx/func_i2_80194728.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i2/fox_sx/D_i2_80195A50.s") diff --git a/src/overlays/ovl_i4/fox_bo.c b/src/overlays/ovl_i4/fox_bo.c new file mode 100644 index 00000000..8544cc6b --- /dev/null +++ b/src/overlays/ovl_i4/fox_bo.c @@ -0,0 +1,91 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_8018BD60.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_8018BEF8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_8018C158.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_8018CC60.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_8018CCE8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_8018CE5C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_8018D008.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_8018D124.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_8018D278.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_8018D394.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_8018D414.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_8018D454.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_8018D4F0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_8018D584.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_8018D7F0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_8018D874.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_8018D960.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_8018D9CC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_8018DE8C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_8018E05C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_8018E3FC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_8018E710.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_8018E870.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_8018EAEC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_8018EC1C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_8018ECB4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_8018ED44.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_8018EE4C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_8018EF6C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_8018F83C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_8018F94C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_80190D98.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_80190EE4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_80190F58.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_80190FE8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_80191054.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_80191180.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_801912FC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_801918E4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_80191A6C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_80191AFC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_80191BAC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_80191DB0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_80191ED8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_bo/func_i4_80192264.s") diff --git a/src/overlays/ovl_i4/fox_fo.c b/src/overlays/ovl_i4/fox_fo.c new file mode 100644 index 00000000..7ebe054c --- /dev/null +++ b/src/overlays/ovl_i4/fox_fo.c @@ -0,0 +1,29 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_fo/func_i4_801875F0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_fo/func_i4_80187884.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_fo/func_i4_80187960.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_fo/func_i4_801888C0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_fo/func_i4_80188A48.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_fo/func_i4_80188AD0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_fo/func_i4_80188DA0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_fo/func_i4_80188F08.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_fo/func_i4_80188FE4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_fo/func_i4_8018906C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_fo/func_i4_801890EC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_fo/func_i4_8018927C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_fo/func_i4_8018BA2C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_fo/D_i4_8019F720.s") diff --git a/src/overlays/ovl_i4/fox_i4.c b/src/overlays/ovl_i4/fox_i4.c new file mode 100644 index 00000000..d24a59d7 --- /dev/null +++ b/src/overlays/ovl_i4/fox_i4.c @@ -0,0 +1,48 @@ +#include "global.h" + +void func_i4_8018927C(u32); +void func_i4_8018D394(u32); +void func_i4_8018D454(u32); +void func_i4_8018D7F0(u32); +void func_i4_8018D960(u32); +void func_i4_8018E710(u32); +void func_i4_8018E870(u32); +void func_i4_80191BAC(u32); +void func_i4_80191DB0(u32); + +UNK_TYPE D_i4_801A03C0; +s32 D_i4_8019EDD0 = 0; + +void func_i4_80187520(u32 arg0, void* arg1) { + switch (arg0) { + case 0x5A: + func_i4_8018927C(arg1); + break; + case 0x5B: + func_i4_8018E710(arg1); + break; + case 0x5C: + func_i4_8018E870(arg1); + break; + case 0x5D: + func_i4_80191BAC(arg1); + break; + case 0x5E: + func_i4_80191DB0(arg1); + break; + case 0x5F: + func_i4_8018D7F0(arg1); + break; + case 0x60: + func_i4_8018D960(arg1); + break; + case 0x61: + func_i4_8018D394(arg1); + break; + case 0x62: + func_i4_8018D454(arg1); + default: + PRINTF("i4 指定外！\n"); // Not specified! + break; + } +} diff --git a/src/overlays/ovl_i4/fox_ka.c b/src/overlays/ovl_i4/fox_ka.c new file mode 100644 index 00000000..14b33d65 --- /dev/null +++ b/src/overlays/ovl_i4/fox_ka.c @@ -0,0 +1,63 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_ka/func_i4_801927E0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_ka/func_i4_80192908.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_ka/func_i4_80192984.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_ka/func_i4_80192A68.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_ka/func_i4_80192B4C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_ka/func_i4_80192C08.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_ka/func_i4_80192C8C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_ka/func_i4_80192E20.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_ka/func_i4_80193718.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_ka/func_i4_80193B1C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_ka/func_i4_80193CA4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_ka/func_i4_80193CE4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_ka/func_i4_80193EF0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_ka/func_i4_80194458.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_ka/func_i4_801945FC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_ka/func_i4_801946C4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_ka/func_i4_801965A8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_ka/func_i4_801968F4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_ka/func_i4_80196E30.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_ka/func_i4_80196F40.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_ka/func_i4_80197024.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_ka/func_i4_80197290.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_ka/func_i4_80197F10.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_ka/func_i4_801981F8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_ka/func_i4_8019848C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_ka/func_i4_80198594.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_ka/func_i4_80198930.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_ka/func_i4_801989F4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_ka/func_i4_80198AA0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_ka/func_i4_801995B4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_ka/D_i4_8019FD20.s") diff --git a/src/overlays/ovl_i4/fox_sz.c b/src/overlays/ovl_i4/fox_sz.c new file mode 100644 index 00000000..e22b78dc --- /dev/null +++ b/src/overlays/ovl_i4/fox_sz.c @@ -0,0 +1,55 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_80199900.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_80199B18.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_80199BDC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_80199C60.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_80199FCC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019A0F8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019A1D0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019A2F4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019A3E8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019AA9C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019AB8C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019B48C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019B568.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019B630.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019B75C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019B888.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019BA64.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019C574.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019C70C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019C85C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019DD20.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019E234.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019E3A8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019E454.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019E98C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/func_i4_8019EA68.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i4/fox_sz/D_i4_801A00C0.s") diff --git a/src/overlays/ovl_i5/E97CC0.c b/src/overlays/ovl_i5/E97CC0.c new file mode 100644 index 00000000..18561554 --- /dev/null +++ b/src/overlays/ovl_i5/E97CC0.c @@ -0,0 +1,27 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/E97CC0/func_i5_801B49D0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/E97CC0/func_i5_801B4A54.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/E97CC0/func_i5_801B4AA8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/E97CC0/func_i5_801B5110.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/E97CC0/func_i5_801B5244.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/E97CC0/func_i5_801B58AC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/E97CC0/func_i5_801B5FE0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/E97CC0/func_i5_801B68A8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/E97CC0/func_i5_801B6AEC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/E97CC0/func_i5_801B6B40.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/E97CC0/func_i5_801B6E20.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/E97CC0/func_i5_801B7240.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/E97CC0/D_i5_801BBDF0.s") diff --git a/src/overlays/ovl_i5/fox_i5.c b/src/overlays/ovl_i5/fox_i5.c new file mode 100644 index 00000000..339cae6e --- /dev/null +++ b/src/overlays/ovl_i5/fox_i5.c @@ -0,0 +1,8 @@ +#include "global.h" + +UNK_TYPE D_i5_801BBEE0; +s32 D_i5_801B7290 = 0; + +void func_i5_80187520(u32 mode, void* ptr) { + PRINTF("i5 指定外！\n"); +} diff --git a/src/overlays/ovl_i5/fox_ma.c b/src/overlays/ovl_i5/fox_ma.c new file mode 100644 index 00000000..fae95409 --- /dev/null +++ b/src/overlays/ovl_i5/fox_ma.c @@ -0,0 +1,279 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_80199920.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_80199A40.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_80199C20.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_80199D88.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_80199F8C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_8019A128.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_8019A198.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_8019A2F4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_8019A728.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_8019A830.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_8019A87C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_8019A8C8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_8019AF34.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_8019B580.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_8019B8B0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_8019BBEC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_8019BE50.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_8019C4EC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_8019C5B8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_8019C6C4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_8019C778.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_8019CE88.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_8019D048.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_8019D5C8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_8019D670.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_8019D700.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_8019D910.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_8019E410.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_8019E624.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_8019EA60.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_8019EBF8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_8019EE68.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_8019F164.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_8019FC54.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_8019FF9C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A015C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A0308.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A0A74.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A0B00.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A0B20.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A0BD8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A0DD8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A0E2C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A0EB8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A1268.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A12C4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A23AC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A2A78.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A2B24.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A2DD8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A30B8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A3240.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A3300.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A3790.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A3C20.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A3E70.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A3E98.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A41B0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A43BC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A4660.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A46A0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A49B8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A4A64.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A4AF8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A4B24.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A5124.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A54AC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A54E8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A55D4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A57D0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A5AF0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A5B4C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A5D68.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A5E2C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A5E54.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A5F90.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A5FC4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A5FD0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A6100.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A6134.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A6144.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A6540.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A65E0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A6608.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A67BC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A67C8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A68EC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A68F8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A6984.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A6C78.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A6FB4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A72DC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A74C4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A78B0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A7A30.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A7CAC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A7D98.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801A7E7C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801ABC14.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801AC1C0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801AC294.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801AC42C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801AC438.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801AC5AC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801AC6B4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801AC754.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801ACE40.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801ACF6C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801ACFBC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801AD080.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801AD144.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801AD554.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801AD624.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801AD6F0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801ADAC8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801ADC08.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801ADCEC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801ADD68.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801AE2C0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801AE4CC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801AE610.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801AE694.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801AE800.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801AE87C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801AEAA0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801AEC04.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801AEEFC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801AF134.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801AF200.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801AF27C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801AF44C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801AF628.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801AF70C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801AF8F4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801B28BC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801B3554.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801B3718.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801B38E0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ma/func_i5_801B3D04.s") diff --git a/src/overlays/ovl_i5/fox_ti.c b/src/overlays/ovl_i5/fox_ti.c new file mode 100644 index 00000000..c98c5b47 --- /dev/null +++ b/src/overlays/ovl_i5/fox_ti.c @@ -0,0 +1,141 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_80188F30.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_80188F60.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_80188FA8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_80189090.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_80189120.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_80189194.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_801891B4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_801891F4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_80189380.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_801895B8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_80189AFC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_80189B80.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_80189CC8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018A1C0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018A2E8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018A3F4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018A474.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018A544.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018AABC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018AB44.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018ADC4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018AFD4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018AFF0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018B144.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018B1B4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018B268.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018B6AC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018B720.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018B96C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018B9D0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018BE84.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018BFB0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018C118.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018C134.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018C370.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018C3D8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018C72C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018C8A8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018E2D8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018E3B0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018E3CC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018E54C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018E5B4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018E5E8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018E5F8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018EF14.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018EFF0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018F038.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018F0D8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018F134.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018F4D8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018F8B8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018FA48.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8018FC70.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8019002C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_801903A0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_8019081C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_80190A08.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_80191AE8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_80192118.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_80193B30.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_80193DF0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_80197A94.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_801982A8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_801990DC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/D_i5_801BAA50.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/D_i5_801BAA54.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/D_i5_801BAA78.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/D_i5_801BAABC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/D_i5_801BAB0C.s") diff --git a/src/overlays/ovl_i5/fox_ti_cs.c b/src/overlays/ovl_i5/fox_ti_cs.c new file mode 100644 index 00000000..8e2b78df --- /dev/null +++ b/src/overlays/ovl_i5/fox_ti_cs.c @@ -0,0 +1,11 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti_cs/func_i5_80187530.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti_cs/func_i5_801875D0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti_cs/func_i5_8018769C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti_cs/func_i5_80188108.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti_cs/func_i5_801882CC.s") diff --git a/src/overlays/ovl_i6/E9F1E0.c b/src/overlays/ovl_i6/E9F1E0.c new file mode 100644 index 00000000..054728d7 --- /dev/null +++ b/src/overlays/ovl_i6/E9F1E0.c @@ -0,0 +1,125 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80187530.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018767C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018769C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_801876FC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_801878A8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80187C5C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_801880E4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80188448.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80188468.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80188528.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80188660.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_801887B0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018887C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_801888F4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80188A4C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80188CB8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80189098.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80189214.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018933C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_801893B8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80189470.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80189724.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_801899E4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80189B00.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80189B70.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018B47C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018B8C0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018BDD8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018C390.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018C660.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018C734.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018C7A0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018C8D4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018C958.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018CA50.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018CAD4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018CF98.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018D0D8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018D16C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018D2B0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018D9C0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018DA94.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018DBF0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_801917F0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_801924B4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_801928C8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80192E94.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80193244.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80193380.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_801934EC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8019350C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8019356C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_801935B4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_801935D4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80193668.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80193710.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_801939A0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80193AE4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80193C4C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80195E44.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_801961AC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/D_E9F1D0_801A6BA0.s") diff --git a/src/overlays/ovl_i6/EADECO.c b/src/overlays/ovl_i6/EADECO.c new file mode 100644 index 00000000..2c8680b9 --- /dev/null +++ b/src/overlays/ovl_i6/EADECO.c @@ -0,0 +1,17 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/EADECO/func_E9F1D0_80196210.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/EADECO/func_E9F1D0_8019624C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/EADECO/func_E9F1D0_80196288.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/EADECO/func_E9F1D0_801962F4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/EADECO/func_E9F1D0_80196314.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/EADECO/func_E9F1D0_80196968.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/EADECO/func_E9F1D0_80196BF8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/EADECO/func_E9F1D0_80196D88.s") diff --git a/src/overlays/ovl_i6/EBD210.c b/src/overlays/ovl_i6/EBD210.c new file mode 100644 index 00000000..0e2a2ebe --- /dev/null +++ b/src/overlays/ovl_i6/EBD210.c @@ -0,0 +1,13 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/EBD210/func_E9F1D0_801A5560.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/EBD210/func_E9F1D0_801A581C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/EBD210/func_E9F1D0_801A58A8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/EBD210/func_E9F1D0_801A5AD4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/EBD210/func_E9F1D0_801A5FC0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/EBD210/func_E9F1D0_801A6164.s") diff --git a/src/overlays/ovl_i6/fox_i6.c b/src/overlays/ovl_i6/fox_i6.c new file mode 100644 index 00000000..0331d265 --- /dev/null +++ b/src/overlays/ovl_i6/fox_i6.c @@ -0,0 +1,8 @@ +#include "global.h" + +UNK_TYPE D_E9F1D0_801A7F30; +s32 D_E9F1D0_801A6750 = 0; + +void func_E9F1D0_80187520(u32 mode, void* ptr) { + PRINTF("i6 指定外！\n"); +} diff --git a/src/overlays/ovl_i6/fox_sy.c b/src/overlays/ovl_i6/fox_sy.c new file mode 100644 index 00000000..4e4e741d --- /dev/null +++ b/src/overlays/ovl_i6/fox_sy.c @@ -0,0 +1,105 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_80197B30.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_80197C64.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_80197CB8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_80197CC4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_80197F18.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_80197F84.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_80198238.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_80198244.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_801983E4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_80198ABC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_80198CE4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_80198F5C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_80199438.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_80199D64.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_80199DAC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019A434.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019A520.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019A640.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019A66C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019A82C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019A898.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019AA08.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019AAF0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019AEC0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019AEEC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019B528.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019B5CC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019B6E8.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019BBBC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019BC14.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019C194.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019C888.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019DC4C.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019DE10.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019E014.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019E2C4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019EB80.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019EE60.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019FF00.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_801A0510.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_801A06A4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_801A07FC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_801A0A08.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_801A0AC0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_801A39FC.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_801A3B50.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_801A3BD4.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_801A4A18.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_801A4C34.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_801A4CB0.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_801A4E44.s") + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_801A52B8.s") diff --git a/src/overlays/ovl_menu/EBFBE0.c b/src/overlays/ovl_menu/EBFBE0.c deleted file mode 100644 index 31399e1e..00000000 --- a/src/overlays/ovl_menu/EBFBE0.c +++ /dev/null @@ -1,48 +0,0 @@ -#include "global.h" - -void func_EBFBE0_80187754(void); -void func_EBFBE0_801878D8(void); -void Option_Init(void); -void Option_DrawEntry(void); -void func_EBFBE0_8019E85C(void); -void func_EBFBE0_8019E8C8(void); -void func_EBFBE0_8019E8D0(void); -void func_EBFBE0_801A01A8(void); - -void func_EBFBE0_80187520(s32 arg0, void* arg1) { - switch (arg0) { - case 103: - func_EBFBE0_80187754(); - break; - - case 104: - func_EBFBE0_801878D8(); - break; - - case 105: - func_EBFBE0_8019E8D0(); - break; - - case 106: - func_EBFBE0_801A01A8(); - break; - - case 107: - Option_Init(); - break; - - case 108: - Option_DrawEntry(); - break; - - case 109: - func_EBFBE0_8019E85C(); - break; - - case 110: - func_EBFBE0_8019E8C8(); - - default: - break; - } -} diff --git a/src/overlays/ovl_menu/fox_i_menu.c b/src/overlays/ovl_menu/fox_i_menu.c new file mode 100644 index 00000000..3e10234f --- /dev/null +++ b/src/overlays/ovl_menu/fox_i_menu.c @@ -0,0 +1,48 @@ +#include "global.h" + +void func_menu_80187754(void); +void func_menu_801878D8(void); +void Option_Init(void); +void Option_DrawEntry(void); +void func_menu_8019E85C(void); +void func_menu_8019E8C8(void); +void func_menu_8019E8D0(void); +void func_menu_801A01A8(void); + +void func_menu_80187520(u32 mode, void* ptr) { + switch (mode) { + case 103: + func_menu_80187754(); + break; + + case 104: + func_menu_801878D8(); + break; + + case 105: + func_menu_8019E8D0(); + break; + + case 106: + func_menu_801A01A8(); + break; + + case 107: + Option_Init(); + break; + + case 108: + Option_DrawEntry(); + break; + + case 109: + func_menu_8019E85C(); + break; + + case 110: + func_menu_8019E8C8(); + + default: + break; + } +} diff --git a/src/overlays/ovl_menu/fox_map.c b/src/overlays/ovl_menu/fox_map.c index 00dfabf4..590d7a8a 100644 --- a/src/overlays/ovl_menu/fox_map.c +++ b/src/overlays/ovl_menu/fox_map.c @@ -18,368 +18,368 @@ // #define IMPORT_BSS #ifdef IMPORT_BSS -s8 D_EBFBE0_801B9410[96 * 96]; -s8 D_EBFBE0_801BB810[96 * 96]; -s8 D_EBFBE0_801BDC10[96 * 96]; -s8 D_EBFBE0_801C0010[96 * 96]; -s8 D_EBFBE0_801C2410[96 * 96]; -s8 D_EBFBE0_801C4810[96 * 96]; -s8 D_EBFBE0_801C6C10[96 * 96]; -s8 D_EBFBE0_801C9010[96 * 96]; -s8 D_EBFBE0_801CB410[96 * 96]; -s32 D_EBFBE0_801CD810; // PAD -f32 D_EBFBE0_801CD818[9]; -s32 D_EBFBE0_801CD83C; -s32 D_EBFBE0_801CD840[24]; -s32 D_EBFBE0_801CD8A0[15]; -s32 D_EBFBE0_801CD8E0[7]; -f32 D_EBFBE0_801CD9F4; // x -f32 D_EBFBE0_801CD9F8; // y -f32 D_EBFBE0_801CD9FC; // z -s32 D_EBFBE0_801CD900[15]; -s32 D_EBFBE0_801CD93C; -s32 D_EBFBE0_801CD940; -s32 D_EBFBE0_801CD944; // mapState -s32 D_EBFBE0_801CD948; -s32 D_EBFBE0_801CD94C; -s32 D_EBFBE0_801CD950; +s8 D_menu_801B9410[96 * 96]; +s8 D_menu_801BB810[96 * 96]; +s8 D_menu_801BDC10[96 * 96]; +s8 D_menu_801C0010[96 * 96]; +s8 D_menu_801C2410[96 * 96]; +s8 D_menu_801C4810[96 * 96]; +s8 D_menu_801C6C10[96 * 96]; +s8 D_menu_801C9010[96 * 96]; +s8 D_menu_801CB410[96 * 96]; +s32 D_menu_801CD810; // PAD +f32 D_menu_801CD818[9]; +s32 D_menu_801CD83C; +s32 D_menu_801CD840[24]; +s32 D_menu_801CD8A0[15]; +s32 D_menu_801CD8E0[7]; +f32 D_menu_801CD9F4; // x +f32 D_menu_801CD9F8; // y +f32 D_menu_801CD9FC; // z +s32 D_menu_801CD900[15]; +s32 D_menu_801CD93C; +s32 D_menu_801CD940; +s32 D_menu_801CD944; // mapState +s32 D_menu_801CD948; +s32 D_menu_801CD94C; +s32 D_menu_801CD950; s32 sCurrentPlanetId; // sCurrentPlanetId -s32 D_EBFBE0_801CD958; -s32 D_EBFBE0_801CD95C; -s32 D_EBFBE0_801CD960; -s32 D_EBFBE0_801CD964; -s32 D_EBFBE0_801CD968; -s32 D_EBFBE0_801CD96C; -s32 D_EBFBE0_801CD970; -s32 D_EBFBE0_801CD974; -s32 D_EBFBE0_801CD978; -s32 D_EBFBE0_801CD97C; -s32 D_EBFBE0_801CD980; -s32 D_EBFBE0_801CD984; -s32 D_EBFBE0_801CD988; -s32 D_EBFBE0_801CD98C; -s32 D_EBFBE0_801CD990; -s32 D_EBFBE0_801CD994; -s32 D_EBFBE0_801CD998; -f32 D_EBFBE0_801CD99C; -s32 D_EBFBE0_801CD9A0; -s32 D_EBFBE0_801CD9A4; -s32 D_EBFBE0_801CD9A8; -s32 D_EBFBE0_801CD9AC; -f32 D_EBFBE0_801CD9B0; -f32 D_EBFBE0_801CD9B4; -s32 D_EBFBE0_801CD9B8; -s32 D_EBFBE0_801CD9BC; -s32 D_EBFBE0_801CD9C0; -s32 D_EBFBE0_801CD9C4; -s32 D_EBFBE0_801CD9C8; -s32 D_EBFBE0_801CD9CC; -s32 D_EBFBE0_801CD9D0; -s32 D_EBFBE0_801CD9D4; -s32 D_EBFBE0_801CD9D8; -f32 D_EBFBE0_801CD9DC; -f32 D_EBFBE0_801CD9E0; -f32 D_EBFBE0_801CD9E4; -f32 D_EBFBE0_801CD9E8; -f32 D_EBFBE0_801CD9EC; -s32 D_EBFBE0_801CD9F0; -f32 D_EBFBE0_801CDA00; // x -f32 D_EBFBE0_801CDA04; // y -f32 D_EBFBE0_801CDA08; // z -f32 D_EBFBE0_801CDA0C; // camera x -f32 D_EBFBE0_801CDA10; // camera y -f32 D_EBFBE0_801CDA14; -f32 D_EBFBE0_801CDA18; -f32 D_EBFBE0_801CDA1C; -f32 D_EBFBE0_801CDA20; -f32 D_EBFBE0_801CDA24; -f32 D_EBFBE0_801CDA28; -f32 D_EBFBE0_801CDA2C; -f32 D_EBFBE0_801CDA30; -f32 D_EBFBE0_801CDA34; -f32 D_EBFBE0_801CDA38; -Vec3f D_EBFBE0_801CDA40; -Vec3f D_EBFBE0_801CDA50; -Matrix D_EBFBE0_801CDA60[15]; -Matrix D_EBFBE0_801CDE20[15]; // planet related -Matrix D_EBFBE0_801CE060; -Matrix D_EBFBE0_801CE1E0[15]; -Matrix D_EBFBE0_801CE5A0[15]; -Vec3f D_EBFBE0_801CE960[15]; // sPlanetsPositions -f32 D_EBFBE0_801CEA54; -f32 D_EBFBE0_801CEA64; -f32 D_EBFBE0_801CEA68; -f32 D_EBFBE0_801CEAA0; -f32 D_EBFBE0_801CEAA4; -f32 D_EBFBE0_801CEAA8; -f32 D_EBFBE0_801CEAAC; -f32 D_EBFBE0_801CEAB0; -s32 D_EBFBE0_801CEAB4; -f32 D_EBFBE0_801CEA18[15]; -f32 D_EBFBE0_801CEA58; -f32 D_EBFBE0_801CEA5C; -f32 D_EBFBE0_801CEA60; -f32 D_EBFBE0_801CEA6C; -f32 D_EBFBE0_801CEA70; -s32 D_EBFBE0_801CEA74; -f32 D_EBFBE0_801CEA78; -f32 D_EBFBE0_801CEA7C; -f32 D_EBFBE0_801CEA80; -f32 D_EBFBE0_801CEA84; -f32 D_EBFBE0_801CEA88; -f32 D_EBFBE0_801CEA8C; -f32 D_EBFBE0_801CEA90; -f32 D_EBFBE0_801CEA94; -s32 D_EBFBE0_801CEA98; -f32 D_EBFBE0_801CEA9C; -f32 D_EBFBE0_801CEAB8[15]; -f32 D_EBFBE0_801CEAF8[15]; -s32 D_EBFBE0_801CEB34; -s32 D_EBFBE0_801CEB38; -f32 D_EBFBE0_801CEB3C; -f32 D_EBFBE0_801CEB40; -s32 D_EBFBE0_801CEB48[3]; -s32 D_EBFBE0_801CEB58[3][10]; -s32 D_EBFBE0_801CEBD0[3][10]; -f32 D_EBFBE0_801CEC48[3][10]; -f32 D_EBFBE0_801CECC0[3][10]; -f32 D_EBFBE0_801CED38[3][10]; -f32 D_EBFBE0_801CEDB0[3][10]; -f32 D_EBFBE0_801CEE28[3][10]; -s32 D_EBFBE0_801CEEA0; -s32 D_EBFBE0_801CEEA4; -s32 D_EBFBE0_801CEEA8; -s32 D_EBFBE0_801CEEAC; -Vec3f D_EBFBE0_801CEEB0; -f32 D_EBFBE0_801CEEBC; -f32 D_EBFBE0_801CEEC0; -s32 D_EBFBE0_801CEEC4; -s32 D_EBFBE0_801CEEC8; -s32 D_EBFBE0_801CEECC; -s32 D_EBFBE0_801CEED0; -s32 D_EBFBE0_801CEED4; -s32 D_EBFBE0_801CEED8; -f32 D_EBFBE0_801CEEDC; -f32 D_EBFBE0_801CEEE0; -Vec3f D_EBFBE0_801CEEE8[9]; -f32 D_EBFBE0_801CEF00; -f32 D_EBFBE0_801CEF04; -f32 D_EBFBE0_801CEF08; -f32 D_EBFBE0_801CEF30; -f32 D_EBFBE0_801CEF34; -f32 D_EBFBE0_801CEF38; -Vec3f D_EBFBE0_801CEF58[9]; -s32 D_EBFBE0_801CEFC4; -s32 D_EBFBE0_801CEFC8; -s32 D_EBFBE0_801CEFCC; -s32 D_EBFBE0_801CEFD0; -s32 D_EBFBE0_801CEFD4; -bool D_EBFBE0_801CEFD8; -s32 D_EBFBE0_801CEFDC; -f32 D_EBFBE0_801CEFE0; -f32 D_EBFBE0_801CEFE8[3]; -f32 D_EBFBE0_801CEFF4; -f32 D_EBFBE0_801CEFF8; -s32 D_EBFBE0_801CF000[3]; -s32 D_EBFBE0_801CF00C; -s32 D_EBFBE0_801CF010; -s32 D_EBFBE0_801CF014; -s32 D_EBFBE0_801CF018; -f32 D_EBFBE0_801CF020[8]; -f32 D_EBFBE0_801CF040[8]; -f32 D_EBFBE0_801CF060[8]; -f32 D_EBFBE0_801CF080; -f32 D_EBFBE0_801CF088[8]; -f32 D_EBFBE0_801CF0A8[8]; -f32* D_EBFBE0_801CF0C8; -f32* D_EBFBE0_801CF0CC; -f32* D_EBFBE0_801CF0D0; -s32 D_EBFBE0_801CF0D8[8]; -s32 D_EBFBE0_801CF0F8[8]; -s32 D_EBFBE0_801CF118; -s32 D_EBFBE0_801CF11C; -s32 D_EBFBE0_801CF120; -f32 D_EBFBE0_801CF124; +s32 D_menu_801CD958; +s32 D_menu_801CD95C; +s32 D_menu_801CD960; +s32 D_menu_801CD964; +s32 D_menu_801CD968; +s32 D_menu_801CD96C; +s32 D_menu_801CD970; +s32 D_menu_801CD974; +s32 D_menu_801CD978; +s32 D_menu_801CD97C; +s32 D_menu_801CD980; +s32 D_menu_801CD984; +s32 D_menu_801CD988; +s32 D_menu_801CD98C; +s32 D_menu_801CD990; +s32 D_menu_801CD994; +s32 D_menu_801CD998; +f32 D_menu_801CD99C; +s32 D_menu_801CD9A0; +s32 D_menu_801CD9A4; +s32 D_menu_801CD9A8; +s32 D_menu_801CD9AC; +f32 D_menu_801CD9B0; +f32 D_menu_801CD9B4; +s32 D_menu_801CD9B8; +s32 D_menu_801CD9BC; +s32 D_menu_801CD9C0; +s32 D_menu_801CD9C4; +s32 D_menu_801CD9C8; +s32 D_menu_801CD9CC; +s32 D_menu_801CD9D0; +s32 D_menu_801CD9D4; +s32 D_menu_801CD9D8; +f32 D_menu_801CD9DC; +f32 D_menu_801CD9E0; +f32 D_menu_801CD9E4; +f32 D_menu_801CD9E8; +f32 D_menu_801CD9EC; +s32 D_menu_801CD9F0; +f32 D_menu_801CDA00; // x +f32 D_menu_801CDA04; // y +f32 D_menu_801CDA08; // z +f32 D_menu_801CDA0C; // camera x +f32 D_menu_801CDA10; // camera y +f32 D_menu_801CDA14; +f32 D_menu_801CDA18; +f32 D_menu_801CDA1C; +f32 D_menu_801CDA20; +f32 D_menu_801CDA24; +f32 D_menu_801CDA28; +f32 D_menu_801CDA2C; +f32 D_menu_801CDA30; +f32 D_menu_801CDA34; +f32 D_menu_801CDA38; +Vec3f D_menu_801CDA40; +Vec3f D_menu_801CDA50; +Matrix D_menu_801CDA60[15]; +Matrix D_menu_801CDE20[15]; // planet related +Matrix D_menu_801CE060; +Matrix D_menu_801CE1E0[15]; +Matrix D_menu_801CE5A0[15]; +Vec3f D_menu_801CE960[15]; // sPlanetsPositions +f32 D_menu_801CEA54; +f32 D_menu_801CEA64; +f32 D_menu_801CEA68; +f32 D_menu_801CEAA0; +f32 D_menu_801CEAA4; +f32 D_menu_801CEAA8; +f32 D_menu_801CEAAC; +f32 D_menu_801CEAB0; +s32 D_menu_801CEAB4; +f32 D_menu_801CEA18[15]; +f32 D_menu_801CEA58; +f32 D_menu_801CEA5C; +f32 D_menu_801CEA60; +f32 D_menu_801CEA6C; +f32 D_menu_801CEA70; +s32 D_menu_801CEA74; +f32 D_menu_801CEA78; +f32 D_menu_801CEA7C; +f32 D_menu_801CEA80; +f32 D_menu_801CEA84; +f32 D_menu_801CEA88; +f32 D_menu_801CEA8C; +f32 D_menu_801CEA90; +f32 D_menu_801CEA94; +s32 D_menu_801CEA98; +f32 D_menu_801CEA9C; +f32 D_menu_801CEAB8[15]; +f32 D_menu_801CEAF8[15]; +s32 D_menu_801CEB34; +s32 D_menu_801CEB38; +f32 D_menu_801CEB3C; +f32 D_menu_801CEB40; +s32 D_menu_801CEB48[3]; +s32 D_menu_801CEB58[3][10]; +s32 D_menu_801CEBD0[3][10]; +f32 D_menu_801CEC48[3][10]; +f32 D_menu_801CECC0[3][10]; +f32 D_menu_801CED38[3][10]; +f32 D_menu_801CEDB0[3][10]; +f32 D_menu_801CEE28[3][10]; +s32 D_menu_801CEEA0; +s32 D_menu_801CEEA4; +s32 D_menu_801CEEA8; +s32 D_menu_801CEEAC; +Vec3f D_menu_801CEEB0; +f32 D_menu_801CEEBC; +f32 D_menu_801CEEC0; +s32 D_menu_801CEEC4; +s32 D_menu_801CEEC8; +s32 D_menu_801CEECC; +s32 D_menu_801CEED0; +s32 D_menu_801CEED4; +s32 D_menu_801CEED8; +f32 D_menu_801CEEDC; +f32 D_menu_801CEEE0; +Vec3f D_menu_801CEEE8[9]; +f32 D_menu_801CEF00; +f32 D_menu_801CEF04; +f32 D_menu_801CEF08; +f32 D_menu_801CEF30; +f32 D_menu_801CEF34; +f32 D_menu_801CEF38; +Vec3f D_menu_801CEF58[9]; +s32 D_menu_801CEFC4; +s32 D_menu_801CEFC8; +s32 D_menu_801CEFCC; +s32 D_menu_801CEFD0; +s32 D_menu_801CEFD4; +bool D_menu_801CEFD8; +s32 D_menu_801CEFDC; +f32 D_menu_801CEFE0; +f32 D_menu_801CEFE8[3]; +f32 D_menu_801CEFF4; +f32 D_menu_801CEFF8; +s32 D_menu_801CF000[3]; +s32 D_menu_801CF00C; +s32 D_menu_801CF010; +s32 D_menu_801CF014; +s32 D_menu_801CF018; +f32 D_menu_801CF020[8]; +f32 D_menu_801CF040[8]; +f32 D_menu_801CF060[8]; +f32 D_menu_801CF080; +f32 D_menu_801CF088[8]; +f32 D_menu_801CF0A8[8]; +f32* D_menu_801CF0C8; +f32* D_menu_801CF0CC; +f32* D_menu_801CF0D0; +s32 D_menu_801CF0D8[8]; +s32 D_menu_801CF0F8[8]; +s32 D_menu_801CF118; +s32 D_menu_801CF11C; +s32 D_menu_801CF120; +f32 D_menu_801CF124; #else -extern s32 D_EBFBE0_801CD810; -extern f32 D_EBFBE0_801CD818[]; -extern s32 D_EBFBE0_801CD83C; -extern s32 D_EBFBE0_801CD840[24]; -extern s32 D_EBFBE0_801CD8A0[15]; -extern s32 D_EBFBE0_801CD8E0[7]; -extern f32 D_EBFBE0_801CD9F4; // x -extern f32 D_EBFBE0_801CD9F8; // y -extern f32 D_EBFBE0_801CD9FC; // z -extern s32 D_EBFBE0_801CD900[15]; -extern s32 D_EBFBE0_801CD93C; -extern s32 D_EBFBE0_801CD940; -extern s32 D_EBFBE0_801CD944; // mapState -extern s32 D_EBFBE0_801CD948; -extern s32 D_EBFBE0_801CD94C; -extern s32 D_EBFBE0_801CD950; +extern s32 D_menu_801CD810; +extern f32 D_menu_801CD818[]; +extern s32 D_menu_801CD83C; +extern s32 D_menu_801CD840[24]; +extern s32 D_menu_801CD8A0[15]; +extern s32 D_menu_801CD8E0[7]; +extern f32 D_menu_801CD9F4; // x +extern f32 D_menu_801CD9F8; // y +extern f32 D_menu_801CD9FC; // z +extern s32 D_menu_801CD900[15]; +extern s32 D_menu_801CD93C; +extern s32 D_menu_801CD940; +extern s32 D_menu_801CD944; // mapState +extern s32 D_menu_801CD948; +extern s32 D_menu_801CD94C; +extern s32 D_menu_801CD950; extern s32 sCurrentPlanetId; // sCurrentPlanetId -extern s32 D_EBFBE0_801CD958; -extern s32 D_EBFBE0_801CD95C; -extern s32 D_EBFBE0_801CD960; -extern s32 D_EBFBE0_801CD964; -extern s32 D_EBFBE0_801CD968; -extern s32 D_EBFBE0_801CD96C; -extern s32 D_EBFBE0_801CD970; -extern s32 D_EBFBE0_801CD974; -extern s32 D_EBFBE0_801CD978; -extern s32 D_EBFBE0_801CD97C; -extern s32 D_EBFBE0_801CD980; -extern s32 D_EBFBE0_801CD984; -extern s32 D_EBFBE0_801CD988; -extern s32 D_EBFBE0_801CD98C; -extern s32 D_EBFBE0_801CD990; -extern s32 D_EBFBE0_801CD994; -extern s32 D_EBFBE0_801CD998; -extern f32 D_EBFBE0_801CD99C; -extern s32 D_EBFBE0_801CD9A0; -extern s32 D_EBFBE0_801CD9A4; -extern s32 D_EBFBE0_801CD9A8; -extern s32 D_EBFBE0_801CD9AC; -extern f32 D_EBFBE0_801CD9B0; -extern f32 D_EBFBE0_801CD9B4; -extern s32 D_EBFBE0_801CD9B8; -extern s32 D_EBFBE0_801CD9BC; -extern s32 D_EBFBE0_801CD9C0; -extern s32 D_EBFBE0_801CD9C4; -extern s32 D_EBFBE0_801CD9C8; -extern s32 D_EBFBE0_801CD9CC; -extern s32 D_EBFBE0_801CD9D0; -extern s32 D_EBFBE0_801CD9D4; -extern s32 D_EBFBE0_801CD9D8; -extern f32 D_EBFBE0_801CD9DC; -extern f32 D_EBFBE0_801CD9E0; -extern f32 D_EBFBE0_801CD9E4; -extern f32 D_EBFBE0_801CD9E8; -extern f32 D_EBFBE0_801CD9EC; -extern s32 D_EBFBE0_801CD9F0; -extern f32 D_EBFBE0_801CDA00; // x -extern f32 D_EBFBE0_801CDA04; // y -extern f32 D_EBFBE0_801CDA08; // z -extern f32 D_EBFBE0_801CDA0C; // camera x -extern f32 D_EBFBE0_801CDA10; // camera y -extern f32 D_EBFBE0_801CDA14; -extern f32 D_EBFBE0_801CDA18; -extern f32 D_EBFBE0_801CDA1C; -extern f32 D_EBFBE0_801CDA20; -extern f32 D_EBFBE0_801CDA24; -extern f32 D_EBFBE0_801CDA28; -extern f32 D_EBFBE0_801CDA2C; -extern f32 D_EBFBE0_801CDA30; -extern f32 D_EBFBE0_801CDA34; -extern f32 D_EBFBE0_801CDA38; -extern Vec3f D_EBFBE0_801CDA40; -extern Vec3f D_EBFBE0_801CDA50; -extern Matrix D_EBFBE0_801CDA60[]; -extern Matrix D_EBFBE0_801CDE20[15]; // planet related -extern Matrix D_EBFBE0_801CE060; -extern Matrix D_EBFBE0_801CE1E0[15]; -extern Matrix D_EBFBE0_801CE5A0[]; -extern Vec3f D_EBFBE0_801CE960[]; // sPlanetsPositions -extern f32 D_EBFBE0_801CEA54; -extern f32 D_EBFBE0_801CEA64; -extern f32 D_EBFBE0_801CEA68; -extern f32 D_EBFBE0_801CEAA0; -extern f32 D_EBFBE0_801CEAA4; -extern f32 D_EBFBE0_801CEAA8; -extern f32 D_EBFBE0_801CEAAC; -extern f32 D_EBFBE0_801CEAB0; -extern s32 D_EBFBE0_801CEAB4; -extern f32 D_EBFBE0_801CEA18[]; -extern f32 D_EBFBE0_801CEA58; -extern f32 D_EBFBE0_801CEA5C; -extern f32 D_EBFBE0_801CEA60; -extern f32 D_EBFBE0_801CEA6C; -extern f32 D_EBFBE0_801CEA70; -extern s32 D_EBFBE0_801CEA74; -extern f32 D_EBFBE0_801CEA78; -extern f32 D_EBFBE0_801CEA7C; -extern f32 D_EBFBE0_801CEA80; -extern f32 D_EBFBE0_801CEA84; -extern f32 D_EBFBE0_801CEA88; -extern f32 D_EBFBE0_801CEA8C; -extern f32 D_EBFBE0_801CEA90; -extern f32 D_EBFBE0_801CEA94; -extern s32 D_EBFBE0_801CEA98; -extern f32 D_EBFBE0_801CEA9C; -extern f32 D_EBFBE0_801CEAB8[15]; -extern f32 D_EBFBE0_801CEAF8[15]; -extern s32 D_EBFBE0_801CEB34; -extern s32 D_EBFBE0_801CEB38; -extern f32 D_EBFBE0_801CEB3C; -extern f32 D_EBFBE0_801CEB40; -extern s32 D_EBFBE0_801CEB48[3]; -extern s32 D_EBFBE0_801CEB58[3][10]; -extern s32 D_EBFBE0_801CEBD0[3][10]; -extern f32 D_EBFBE0_801CEC48[3][10]; -extern f32 D_EBFBE0_801CECC0[3][10]; -extern f32 D_EBFBE0_801CED38[3][10]; -extern f32 D_EBFBE0_801CEDB0[3][10]; -extern f32 D_EBFBE0_801CEE28[3][10]; -extern s32 D_EBFBE0_801CEEA0; -extern s32 D_EBFBE0_801CEEA4; -extern s32 D_EBFBE0_801CEEA8; -extern s32 D_EBFBE0_801CEEAC; -extern Vec3f D_EBFBE0_801CEEB0; -extern f32 D_EBFBE0_801CEEBC; -extern f32 D_EBFBE0_801CEEC0; -extern s32 D_EBFBE0_801CEEC4; -extern s32 D_EBFBE0_801CEEC8; -extern s32 D_EBFBE0_801CEECC; -extern s32 D_EBFBE0_801CEED0; -extern s32 D_EBFBE0_801CEED4; -extern s32 D_EBFBE0_801CEED8; -extern f32 D_EBFBE0_801CEEDC; -extern f32 D_EBFBE0_801CEEE0; -extern Vec3f D_EBFBE0_801CEEE8[9]; -extern f32 D_EBFBE0_801CEF00; -extern f32 D_EBFBE0_801CEF04; -extern f32 D_EBFBE0_801CEF08; -extern f32 D_EBFBE0_801CEF30; -extern f32 D_EBFBE0_801CEF34; -extern f32 D_EBFBE0_801CEF38; -extern Vec3f D_EBFBE0_801CEF58[9]; -extern s32 D_EBFBE0_801CEFC4; -extern s32 D_EBFBE0_801CEFC8; -extern s32 D_EBFBE0_801CEFCC; -extern s32 D_EBFBE0_801CEFD0; -extern s32 D_EBFBE0_801CEFD4; -extern bool D_EBFBE0_801CEFD8; -extern s32 D_EBFBE0_801CEFDC; -extern f32 D_EBFBE0_801CEFE0; -extern f32 D_EBFBE0_801CEFE8[3]; -extern f32 D_EBFBE0_801CEFF4; -extern f32 D_EBFBE0_801CEFF8; -extern s32 D_EBFBE0_801CF000[]; -extern s32 D_EBFBE0_801CF00C; -extern s32 D_EBFBE0_801CF010; -extern s32 D_EBFBE0_801CF014; -extern s32 D_EBFBE0_801CF018; -extern f32 D_EBFBE0_801CF020[8]; -extern f32 D_EBFBE0_801CF040[8]; -extern f32 D_EBFBE0_801CF060[8]; -extern f32 D_EBFBE0_801CF080; -extern f32 D_EBFBE0_801CF088[8]; -extern f32 D_EBFBE0_801CF0A8[8]; -extern f32* D_EBFBE0_801CF0C8; -extern f32* D_EBFBE0_801CF0CC; -extern f32* D_EBFBE0_801CF0D0; -extern s32 D_EBFBE0_801CF0D8[8]; -extern s32 D_EBFBE0_801CF0F8[8]; -extern s32 D_EBFBE0_801CF118; -extern s32 D_EBFBE0_801CF11C; -extern s32 D_EBFBE0_801CF120; -extern f32 D_EBFBE0_801CF124; +extern s32 D_menu_801CD958; +extern s32 D_menu_801CD95C; +extern s32 D_menu_801CD960; +extern s32 D_menu_801CD964; +extern s32 D_menu_801CD968; +extern s32 D_menu_801CD96C; +extern s32 D_menu_801CD970; +extern s32 D_menu_801CD974; +extern s32 D_menu_801CD978; +extern s32 D_menu_801CD97C; +extern s32 D_menu_801CD980; +extern s32 D_menu_801CD984; +extern s32 D_menu_801CD988; +extern s32 D_menu_801CD98C; +extern s32 D_menu_801CD990; +extern s32 D_menu_801CD994; +extern s32 D_menu_801CD998; +extern f32 D_menu_801CD99C; +extern s32 D_menu_801CD9A0; +extern s32 D_menu_801CD9A4; +extern s32 D_menu_801CD9A8; +extern s32 D_menu_801CD9AC; +extern f32 D_menu_801CD9B0; +extern f32 D_menu_801CD9B4; +extern s32 D_menu_801CD9B8; +extern s32 D_menu_801CD9BC; +extern s32 D_menu_801CD9C0; +extern s32 D_menu_801CD9C4; +extern s32 D_menu_801CD9C8; +extern s32 D_menu_801CD9CC; +extern s32 D_menu_801CD9D0; +extern s32 D_menu_801CD9D4; +extern s32 D_menu_801CD9D8; +extern f32 D_menu_801CD9DC; +extern f32 D_menu_801CD9E0; +extern f32 D_menu_801CD9E4; +extern f32 D_menu_801CD9E8; +extern f32 D_menu_801CD9EC; +extern s32 D_menu_801CD9F0; +extern f32 D_menu_801CDA00; // x +extern f32 D_menu_801CDA04; // y +extern f32 D_menu_801CDA08; // z +extern f32 D_menu_801CDA0C; // camera x +extern f32 D_menu_801CDA10; // camera y +extern f32 D_menu_801CDA14; +extern f32 D_menu_801CDA18; +extern f32 D_menu_801CDA1C; +extern f32 D_menu_801CDA20; +extern f32 D_menu_801CDA24; +extern f32 D_menu_801CDA28; +extern f32 D_menu_801CDA2C; +extern f32 D_menu_801CDA30; +extern f32 D_menu_801CDA34; +extern f32 D_menu_801CDA38; +extern Vec3f D_menu_801CDA40; +extern Vec3f D_menu_801CDA50; +extern Matrix D_menu_801CDA60[]; +extern Matrix D_menu_801CDE20[15]; // planet related +extern Matrix D_menu_801CE060; +extern Matrix D_menu_801CE1E0[15]; +extern Matrix D_menu_801CE5A0[]; +extern Vec3f D_menu_801CE960[]; // sPlanetsPositions +extern f32 D_menu_801CEA54; +extern f32 D_menu_801CEA64; +extern f32 D_menu_801CEA68; +extern f32 D_menu_801CEAA0; +extern f32 D_menu_801CEAA4; +extern f32 D_menu_801CEAA8; +extern f32 D_menu_801CEAAC; +extern f32 D_menu_801CEAB0; +extern s32 D_menu_801CEAB4; +extern f32 D_menu_801CEA18[]; +extern f32 D_menu_801CEA58; +extern f32 D_menu_801CEA5C; +extern f32 D_menu_801CEA60; +extern f32 D_menu_801CEA6C; +extern f32 D_menu_801CEA70; +extern s32 D_menu_801CEA74; +extern f32 D_menu_801CEA78; +extern f32 D_menu_801CEA7C; +extern f32 D_menu_801CEA80; +extern f32 D_menu_801CEA84; +extern f32 D_menu_801CEA88; +extern f32 D_menu_801CEA8C; +extern f32 D_menu_801CEA90; +extern f32 D_menu_801CEA94; +extern s32 D_menu_801CEA98; +extern f32 D_menu_801CEA9C; +extern f32 D_menu_801CEAB8[15]; +extern f32 D_menu_801CEAF8[15]; +extern s32 D_menu_801CEB34; +extern s32 D_menu_801CEB38; +extern f32 D_menu_801CEB3C; +extern f32 D_menu_801CEB40; +extern s32 D_menu_801CEB48[3]; +extern s32 D_menu_801CEB58[3][10]; +extern s32 D_menu_801CEBD0[3][10]; +extern f32 D_menu_801CEC48[3][10]; +extern f32 D_menu_801CECC0[3][10]; +extern f32 D_menu_801CED38[3][10]; +extern f32 D_menu_801CEDB0[3][10]; +extern f32 D_menu_801CEE28[3][10]; +extern s32 D_menu_801CEEA0; +extern s32 D_menu_801CEEA4; +extern s32 D_menu_801CEEA8; +extern s32 D_menu_801CEEAC; +extern Vec3f D_menu_801CEEB0; +extern f32 D_menu_801CEEBC; +extern f32 D_menu_801CEEC0; +extern s32 D_menu_801CEEC4; +extern s32 D_menu_801CEEC8; +extern s32 D_menu_801CEECC; +extern s32 D_menu_801CEED0; +extern s32 D_menu_801CEED4; +extern s32 D_menu_801CEED8; +extern f32 D_menu_801CEEDC; +extern f32 D_menu_801CEEE0; +extern Vec3f D_menu_801CEEE8[9]; +extern f32 D_menu_801CEF00; +extern f32 D_menu_801CEF04; +extern f32 D_menu_801CEF08; +extern f32 D_menu_801CEF30; +extern f32 D_menu_801CEF34; +extern f32 D_menu_801CEF38; +extern Vec3f D_menu_801CEF58[9]; +extern s32 D_menu_801CEFC4; +extern s32 D_menu_801CEFC8; +extern s32 D_menu_801CEFCC; +extern s32 D_menu_801CEFD0; +extern s32 D_menu_801CEFD4; +extern bool D_menu_801CEFD8; +extern s32 D_menu_801CEFDC; +extern f32 D_menu_801CEFE0; +extern f32 D_menu_801CEFE8[3]; +extern f32 D_menu_801CEFF4; +extern f32 D_menu_801CEFF8; +extern s32 D_menu_801CF000[]; +extern s32 D_menu_801CF00C; +extern s32 D_menu_801CF010; +extern s32 D_menu_801CF014; +extern s32 D_menu_801CF018; +extern f32 D_menu_801CF020[8]; +extern f32 D_menu_801CF040[8]; +extern f32 D_menu_801CF060[8]; +extern f32 D_menu_801CF080; +extern f32 D_menu_801CF088[8]; +extern f32 D_menu_801CF0A8[8]; +extern f32* D_menu_801CF0C8; +extern f32* D_menu_801CF0CC; +extern f32* D_menu_801CF0D0; +extern s32 D_menu_801CF0D8[8]; +extern s32 D_menu_801CF0F8[8]; +extern s32 D_menu_801CF118; +extern s32 D_menu_801CF11C; +extern s32 D_menu_801CF120; +extern f32 D_menu_801CF124; #endif -s32 D_EBFBE0_801AF420[2] = { 10, 20 }; +s32 D_menu_801AF420[2] = { 10, 20 }; -u16* D_EBFBE0_801AF428[15][2] = { +u16* D_menu_801AF428[15][2] = { gMsg_ID_1220, gMsg_ID_1230, gMsg_ID_1320, gMsg_ID_1330, gMsg_ID_1300, gMsg_ID_1310, gMsg_ID_1420, gMsg_ID_1430, gMsg_ID_1260, gMsg_ID_1270, gMsg_ID_1440, gMsg_ID_1450, gMsg_ID_1360, gMsg_ID_1370, gMsg_ID_1340, gMsg_ID_1350, gMsg_ID_1400, gMsg_ID_1410, gMsg_ID_1200, gMsg_ID_1210, gMsg_ID_1240, gMsg_ID_1250, gMsg_ID_1380, gMsg_ID_1390, @@ -427,9 +427,9 @@ PlanetId sPlanetList[] = { PLANET_SECTOR_Z, PLANET_ZONESS, PLANET_KATINA, PLANET_SECTOR_Y, PLANET_SOLAR, }; -Gfx* D_EBFBE0_801AF824[4] = { D_604A710, D_604A400, D_604A190, D_6049F80 }; +Gfx* D_menu_801AF824[4] = { D_604A710, D_604A400, D_604A190, D_6049F80 }; -Texture D_EBFBE0_801AF834[14] = { +Texture D_menu_801AF834[14] = { { D_6007B90, 128, 28, 95.0f }, { D_60030D0, 96, 28, 110.0f }, { D_60131A0, 176, 12, 73.0f }, { D_6009AD0, 168, 28, 77.0f }, { D_600B9B0, 168, 28, 74.0f }, { D_6001C80, 96, 13, 106.0f }, { D_6011660, 176, 12, 75.0f }, { D_6010010, 112, 13, 109.0f }, { D_6017640, 112, 28, 101.0f }, @@ -437,7 +437,7 @@ Texture D_EBFBE0_801AF834[14] = { { D_6004AC0, 168, 19, 72.0f }, { D_6006320, 104, 28, 105.0f }, }; -Texture D_EBFBE0_801AF914[] = { +Texture D_menu_801AF914[] = { { D_6008990, 232, 19, 46.0f }, { D_6003B50, 208, 19, 56.0f }, { D_60139E0, 128, 19, 98.0f }, { D_600AD30, 168, 19, 77.0f }, { D_600CC10, 128, 19, 95.0f }, { D_6002160, 208, 19, 57.0f }, { D_6011EA0, 256, 19, 40.0f }, { D_60105C0, 224, 19, 49.0f }, { D_6018280, 184, 19, 70.0f }, @@ -449,12 +449,12 @@ char* sPlanetNames[] = { "ME", "A6", "BO", "SZ", "SX", "SY", "KA", "MA", "ZO", "CO", "TI", "AQ", "FO", "VE", "SO", }; -Gfx* D_EBFBE0_801AFA30[2] = { +Gfx* D_menu_801AFA30[2] = { D_6055F20, D_6051D20, }; -ObjPosition D_EBFBE0_801AFA38[] = { +ObjPosition D_menu_801AFA38[] = { { -491.0f, 1170.0f, 20.0f, 0.71f }, { -488.0f, 1135.0f, 15.0f, 0.6f }, { -496.0f, 1090.0f, 0.0f, 0.50f }, { -489.0f, 1200.0f, 0.0f, 0.6f }, { -489.0f, 1150.0f, -15.0f, 0.80f }, { -487.0f, 1143.0f, -15.0f, 0.8f }, { -493.0f, 1182.0f, -20.0f, 0.90f }, { -491.0f, 1080.0f, -25.0f, 0.8f }, { -497.0f, 1114.0f, -25.0f, 0.70f }, @@ -471,14 +471,14 @@ ObjPosition D_EBFBE0_801AFA38[] = { { -512.0f, 1099.0f, -15.0f, 0.5f }, { -523.0f, 1179.0f, -30.0f, 0.70f }, { -519.0f, 1176.0f, -30.0f, 0.5f }, }; -ObjPosition D_EBFBE0_801AFCD8[4] = { +ObjPosition D_menu_801AFCD8[4] = { { 50.0f, 1410.0f, 40.0f, 0.10f }, { 35.0f, 1235.0f, 40.0f, 0.03f }, { 42.0f, 1270.0f, 60.0f, 0.05f }, { 35.0f, 1280.0f, 20.0f, 0.05f }, }; -UnkStruct_D_EBFBE0_801AFD18 D_EBFBE0_801AFD18[24] = { +UnkStruct_D_menu_801AFD18 D_menu_801AFD18[24] = { { 0, PLANET_CORNERIA, PLANET_METEO, 5, 0, 0, 0 }, { 0, PLANET_METEO, PLANET_FORTUNA, 5, 0, 0, 0 }, { 0, PLANET_FORTUNA, PLANET_SECTOR_X, 5, 0, 0, 0 }, { 0, PLANET_SECTOR_X, PLANET_TITANIA, 5, 0, 0, 0 }, { 0, PLANET_TITANIA, PLANET_BOLSE, 5, 0, 0, 0 }, { 0, PLANET_KATINA, PLANET_SECTOR_X, 5, 0, 0, 0 }, @@ -493,23 +493,23 @@ UnkStruct_D_EBFBE0_801AFD18 D_EBFBE0_801AFD18[24] = { { 3, PLANET_METEO, PLANET_KATINA, 5, 0, 0, 0 }, { 4, PLANET_SECTOR_X, PLANET_SECTOR_Z, 10, 0, 0, 0 }, }; -f32 D_EBFBE0_801AFFB8[] = { +f32 D_menu_801AFFB8[] = { 90.0f, 170.0f, 130.0f, 100.0f, 100.0f, 100.0f, 80.0f, 80.0f, 80.0f, 150.0f, 80.0f, 80.0f, 80.0f, 270.0f, 250.0f, }; -f32 D_EBFBE0_801AFFF4 = 0.0f; // yRot of something -f32 D_EBFBE0_801AFFF8 = 0.0f; // xRot of something -f32 D_EBFBE0_801AFFFC = 0.0f; // yRot of something -f32 D_EBFBE0_801B0000 = 0.0f; // xRot of something +f32 D_menu_801AFFF4 = 0.0f; // yRot of something +f32 D_menu_801AFFF8 = 0.0f; // xRot of something +f32 D_menu_801AFFFC = 0.0f; // yRot of something +f32 D_menu_801B0000 = 0.0f; // xRot of something -s32 D_EBFBE0_801B0004[47] = { +s32 D_menu_801B0004[47] = { 39, 35, 32, 30, 27, 26, 24, 22, 21, 20, 18, 17, 16, 15, 14, 13, 12, 12, 11, 10, 9, 9, 8, 8, 7, 6, 6, 6, 5, 5, 4, 4, 4, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, }; // Looks like a quarter of a circle s32 - D_EBFBE0_801B00C0[47][96] = { + D_menu_801B00C0[47][96] = { { 0, 2, 2, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 11 }, { 0, 2, 3, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 15, 16, 17 }, { 0, 2, 3, 4, 5, 6, 6, 7, 8, 8, 9, 9, 10, 10, 11, 11, @@ -665,7 +665,7 @@ s32 48, 48, 49, 49, 50, 51, 51, 52, 52, 53, 54, 55, 55, 56, 57, 58, 59, 60, 61, 62, 64, 66 }, }; -Vtx D_EBFBE0_801B4740[] = { +Vtx D_menu_801B4740[] = { { 0x001E, 0x001E, 0x0000, 0x0000, 0x0C00, 0x0000, 255, 255, 255, 255 }, { 0xFFE2, 0x001E, 0x0000, 0x0000, 0x0000, 0x0000, 255, 255, 255, 255 }, { 0xFFE2, 0x0019, 0x0000, 0x0000, 0x0000, 0x0100, 255, 255, 255, 255 }, @@ -716,44 +716,44 @@ Vtx D_EBFBE0_801B4740[] = { { 0x001E, 0xFFE2, 0x0000, 0x0000, 0x0C00, 0x0100, 255, 255, 255, 255 }, }; -Gfx D_EBFBE0_801B4A40[] = { - gsSPVertex(D_EBFBE0_801B4740, 16, 0), - gsDPLoadTextureBlock(D_EBFBE0_801B9410, G_IM_FMT_IA, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, +Gfx D_menu_801B4A40[] = { + gsSPVertex(D_menu_801B4740, 16, 0), + gsDPLoadTextureBlock(D_menu_801B9410, G_IM_FMT_IA, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(1, 2, 3, 0, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801B9410[96 * 8 * 1], G_IM_FMT_IA, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801B9410[96 * 8 * 1], G_IM_FMT_IA, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(5, 6, 7, 4, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801B9410[96 * 8 * 2], G_IM_FMT_IA, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801B9410[96 * 8 * 2], G_IM_FMT_IA, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(9, 10, 11, 8, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801B9410[96 * 8 * 3], G_IM_FMT_IA, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801B9410[96 * 8 * 3], G_IM_FMT_IA, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(13, 14, 15, 12, 0), - gsSPVertex(&D_EBFBE0_801B4740[16], 16, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801B9410[96 * 8 * 4], G_IM_FMT_IA, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsSPVertex(&D_menu_801B4740[16], 16, 0), + gsDPLoadTextureBlock(&D_menu_801B9410[96 * 8 * 4], G_IM_FMT_IA, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(1, 2, 3, 0, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801B9410[96 * 8 * 5], G_IM_FMT_IA, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801B9410[96 * 8 * 5], G_IM_FMT_IA, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(5, 6, 7, 4, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801B9410[96 * 8 * 6], G_IM_FMT_IA, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801B9410[96 * 8 * 6], G_IM_FMT_IA, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(9, 10, 11, 8, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801B9410[96 * 8 * 7], G_IM_FMT_IA, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801B9410[96 * 8 * 7], G_IM_FMT_IA, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(13, 14, 15, 12, 0), - gsSPVertex(&D_EBFBE0_801B4740[32], 16, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801B9410[96 * 8 * 8], G_IM_FMT_IA, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsSPVertex(&D_menu_801B4740[32], 16, 0), + gsDPLoadTextureBlock(&D_menu_801B9410[96 * 8 * 8], G_IM_FMT_IA, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(1, 2, 3, 0, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801B9410[96 * 8 * 9], G_IM_FMT_IA, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801B9410[96 * 8 * 9], G_IM_FMT_IA, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(5, 6, 7, 4, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801B9410[96 * 8 * 10], G_IM_FMT_IA, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801B9410[96 * 8 * 10], G_IM_FMT_IA, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(9, 10, 11, 8, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801B9410[96 * 8 * 11], G_IM_FMT_IA, G_IM_SIZ_8b, 96, 8, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801B9410[96 * 8 * 11], G_IM_FMT_IA, G_IM_SIZ_8b, 96, 8, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(13, 14, 15, 12, 0), gsDPPipeSync(), @@ -761,46 +761,46 @@ Gfx D_EBFBE0_801B4A40[] = { gsSPEndDisplayList(), }; -Gfx D_EBFBE0_801B4D70[] = { +Gfx D_menu_801B4D70[] = { gsDPLoadTLUT_pal256(D_6026C90), - gsSPVertex(D_EBFBE0_801B4740, 16, 0), - gsDPLoadTextureBlock(D_EBFBE0_801BB810, G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsSPVertex(D_menu_801B4740, 16, 0), + gsDPLoadTextureBlock(D_menu_801BB810, G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsDPSetTextureLUT(G_TT_RGBA16), gsSP1Quadrangle(1, 2, 3, 0, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801BB810[96 * 8 * 1], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801BB810[96 * 8 * 1], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(5, 6, 7, 4, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801BB810[96 * 8 * 2], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801BB810[96 * 8 * 2], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(9, 10, 11, 8, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801BB810[96 * 8 * 3], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801BB810[96 * 8 * 3], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(13, 14, 15, 12, 0), - gsSPVertex(&D_EBFBE0_801B4740[16], 16, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801BB810[96 * 8 * 4], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsSPVertex(&D_menu_801B4740[16], 16, 0), + gsDPLoadTextureBlock(&D_menu_801BB810[96 * 8 * 4], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(1, 2, 3, 0, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801BB810[96 * 8 * 5], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801BB810[96 * 8 * 5], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(5, 6, 7, 4, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801BB810[96 * 8 * 6], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801BB810[96 * 8 * 6], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(9, 10, 11, 8, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801BB810[96 * 8 * 7], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801BB810[96 * 8 * 7], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(13, 14, 15, 12, 0), - gsSPVertex(&D_EBFBE0_801B4740[32], 16, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801BB810[96 * 8 * 8], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsSPVertex(&D_menu_801B4740[32], 16, 0), + gsDPLoadTextureBlock(&D_menu_801BB810[96 * 8 * 8], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(1, 2, 3, 0, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801BB810[96 * 8 * 9], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801BB810[96 * 8 * 9], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(5, 6, 7, 4, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801BB810[96 * 8 * 10], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801BB810[96 * 8 * 10], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(9, 10, 11, 8, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801BB810[96 * 8 * 11], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 8, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801BB810[96 * 8 * 11], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 8, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(13, 14, 15, 12, 0), gsDPPipeSync(), @@ -808,46 +808,46 @@ Gfx D_EBFBE0_801B4D70[] = { gsSPEndDisplayList(), }; -Gfx D_EBFBE0_801B50D8[] = { +Gfx D_menu_801B50D8[] = { gsDPLoadTLUT_pal256(D_6029170), - gsSPVertex(D_EBFBE0_801B4740, 16, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801BDC10, G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsSPVertex(D_menu_801B4740, 16, 0), + gsDPLoadTextureBlock(&D_menu_801BDC10, G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsDPSetTextureLUT(G_TT_RGBA16), gsSP1Quadrangle(1, 2, 3, 0, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801BDC10[96 * 8 * 1], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801BDC10[96 * 8 * 1], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(5, 6, 7, 4, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801BDC10[96 * 8 * 2], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801BDC10[96 * 8 * 2], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(9, 10, 11, 8, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801BDC10[96 * 8 * 3], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801BDC10[96 * 8 * 3], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(13, 14, 15, 12, 0), - gsSPVertex(&D_EBFBE0_801B4740[16], 16, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801BDC10[96 * 8 * 4], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsSPVertex(&D_menu_801B4740[16], 16, 0), + gsDPLoadTextureBlock(&D_menu_801BDC10[96 * 8 * 4], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(1, 2, 3, 0, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801BDC10[96 * 8 * 5], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801BDC10[96 * 8 * 5], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(5, 6, 7, 4, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801BDC10[96 * 8 * 6], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801BDC10[96 * 8 * 6], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(9, 10, 11, 8, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801BDC10[96 * 8 * 7], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801BDC10[96 * 8 * 7], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(13, 14, 15, 12, 0), - gsSPVertex(&D_EBFBE0_801B4740[32], 16, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801BDC10[96 * 8 * 8], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsSPVertex(&D_menu_801B4740[32], 16, 0), + gsDPLoadTextureBlock(&D_menu_801BDC10[96 * 8 * 8], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(1, 2, 3, 0, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801BDC10[96 * 8 * 9], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801BDC10[96 * 8 * 9], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(5, 6, 7, 4, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801BDC10[96 * 8 * 10], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801BDC10[96 * 8 * 10], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(9, 10, 11, 8, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801BDC10[96 * 8 * 11], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 8, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801BDC10[96 * 8 * 11], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 8, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(13, 14, 15, 12, 0), gsDPPipeSync(), @@ -855,46 +855,46 @@ Gfx D_EBFBE0_801B50D8[] = { gsSPEndDisplayList(), }; -Gfx D_EBFBE0_801B5440[] = { +Gfx D_menu_801B5440[] = { gsDPLoadTLUT_pal256(D_6022340), - gsSPVertex(D_EBFBE0_801B4740, 16, 0), - gsDPLoadTextureBlock(D_EBFBE0_801C0010, G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsSPVertex(D_menu_801B4740, 16, 0), + gsDPLoadTextureBlock(D_menu_801C0010, G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsDPSetTextureLUT(G_TT_RGBA16), gsSP1Quadrangle(1, 2, 3, 0, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C0010[96 * 8 * 1], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C0010[96 * 8 * 1], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(5, 6, 7, 4, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C0010[96 * 8 * 2], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C0010[96 * 8 * 2], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(9, 10, 11, 8, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C0010[96 * 8 * 3], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C0010[96 * 8 * 3], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(13, 14, 15, 12, 0), - gsSPVertex(&D_EBFBE0_801B4740[16], 16, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C0010[96 * 8 * 4], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsSPVertex(&D_menu_801B4740[16], 16, 0), + gsDPLoadTextureBlock(&D_menu_801C0010[96 * 8 * 4], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(1, 2, 3, 0, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C0010[96 * 8 * 5], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C0010[96 * 8 * 5], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(5, 6, 7, 4, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C0010[96 * 8 * 6], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C0010[96 * 8 * 6], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(9, 10, 11, 8, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C0010[96 * 8 * 7], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C0010[96 * 8 * 7], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(13, 14, 15, 12, 0), - gsSPVertex(&D_EBFBE0_801B4740[32], 16, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C0010[96 * 8 * 8], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsSPVertex(&D_menu_801B4740[32], 16, 0), + gsDPLoadTextureBlock(&D_menu_801C0010[96 * 8 * 8], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(1, 2, 3, 0, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C0010[96 * 8 * 9], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C0010[96 * 8 * 9], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(5, 6, 7, 4, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C0010[96 * 8 * 10], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C0010[96 * 8 * 10], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(9, 10, 11, 8, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C0010[96 * 8 * 11], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 8, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C0010[96 * 8 * 11], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 8, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(13, 14, 15, 12, 0), gsDPPipeSync(), @@ -902,46 +902,46 @@ Gfx D_EBFBE0_801B5440[] = { gsSPEndDisplayList(), }; -Gfx D_EBFBE0_801B57A8[] = { +Gfx D_menu_801B57A8[] = { gsDPLoadTLUT_pal256(D_60247E0), - gsSPVertex(D_EBFBE0_801B4740, 16, 0), - gsDPLoadTextureBlock(D_EBFBE0_801C2410, G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsSPVertex(D_menu_801B4740, 16, 0), + gsDPLoadTextureBlock(D_menu_801C2410, G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsDPSetTextureLUT(G_TT_RGBA16), gsSP1Quadrangle(1, 2, 3, 0, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C2410[96 * 8 * 1], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C2410[96 * 8 * 1], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(5, 6, 7, 4, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C2410[96 * 8 * 2], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C2410[96 * 8 * 2], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(9, 10, 11, 8, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C2410[96 * 8 * 3], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C2410[96 * 8 * 3], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(13, 14, 15, 12, 0), - gsSPVertex(&D_EBFBE0_801B4740[16], 16, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C2410[96 * 8 * 4], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsSPVertex(&D_menu_801B4740[16], 16, 0), + gsDPLoadTextureBlock(&D_menu_801C2410[96 * 8 * 4], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(1, 2, 3, 0, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C2410[96 * 8 * 5], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C2410[96 * 8 * 5], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(5, 6, 7, 4, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C2410[96 * 8 * 6], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C2410[96 * 8 * 6], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(9, 10, 11, 8, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C2410[96 * 8 * 7], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C2410[96 * 8 * 7], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(13, 14, 15, 12, 0), - gsSPVertex(&D_EBFBE0_801B4740[32], 16, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C2410[96 * 8 * 8], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsSPVertex(&D_menu_801B4740[32], 16, 0), + gsDPLoadTextureBlock(&D_menu_801C2410[96 * 8 * 8], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(1, 2, 3, 0, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C2410[96 * 8 * 9], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C2410[96 * 8 * 9], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(5, 6, 7, 4, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C2410[96 * 8 * 10], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C2410[96 * 8 * 10], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(9, 10, 11, 8, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C2410[96 * 8 * 11], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 8, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C2410[96 * 8 * 11], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 8, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(13, 14, 15, 12, 0), gsDPPipeSync(), @@ -949,46 +949,46 @@ Gfx D_EBFBE0_801B57A8[] = { gsSPEndDisplayList(), }; -Gfx D_EBFBE0_801B5B10[] = { +Gfx D_menu_801B5B10[] = { gsDPLoadTLUT_pal256(D_602FF60), - gsSPVertex(D_EBFBE0_801B4740, 16, 0), - gsDPLoadTextureBlock(D_EBFBE0_801C4810, G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsSPVertex(D_menu_801B4740, 16, 0), + gsDPLoadTextureBlock(D_menu_801C4810, G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsDPSetTextureLUT(G_TT_RGBA16), gsSP1Quadrangle(1, 2, 3, 0, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C4810[96 * 8 * 1], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C4810[96 * 8 * 1], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(5, 6, 7, 4, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C4810[96 * 8 * 2], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C4810[96 * 8 * 2], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(9, 10, 11, 8, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C4810[96 * 8 * 3], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C4810[96 * 8 * 3], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(13, 14, 15, 12, 0), - gsSPVertex(&D_EBFBE0_801B4740[16], 16, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C4810[96 * 8 * 4], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsSPVertex(&D_menu_801B4740[16], 16, 0), + gsDPLoadTextureBlock(&D_menu_801C4810[96 * 8 * 4], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(1, 2, 3, 0, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C4810[96 * 8 * 5], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C4810[96 * 8 * 5], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(5, 6, 7, 4, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C4810[96 * 8 * 6], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C4810[96 * 8 * 6], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(9, 10, 11, 8, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C4810[96 * 8 * 7], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C4810[96 * 8 * 7], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(13, 14, 15, 12, 0), - gsSPVertex(&D_EBFBE0_801B4740[32], 16, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C4810[96 * 8 * 8], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsSPVertex(&D_menu_801B4740[32], 16, 0), + gsDPLoadTextureBlock(&D_menu_801C4810[96 * 8 * 8], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(1, 2, 3, 0, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C4810[96 * 8 * 9], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C4810[96 * 8 * 9], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(5, 6, 7, 4, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C4810[96 * 8 * 10], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C4810[96 * 8 * 10], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(9, 10, 11, 8, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C4810[96 * 8 * 11], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 8, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C4810[96 * 8 * 11], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 8, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(13, 14, 15, 12, 0), gsDPPipeSync(), @@ -996,46 +996,46 @@ Gfx D_EBFBE0_801B5B10[] = { gsSPEndDisplayList(), }; -Gfx D_EBFBE0_801B5E78[] = { +Gfx D_menu_801B5E78[] = { gsDPLoadTLUT_pal256(D_602B620), - gsSPVertex(D_EBFBE0_801B4740, 16, 0), - gsDPLoadTextureBlock(D_EBFBE0_801C6C10, G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsSPVertex(D_menu_801B4740, 16, 0), + gsDPLoadTextureBlock(D_menu_801C6C10, G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsDPSetTextureLUT(G_TT_RGBA16), gsSP1Quadrangle(1, 2, 3, 0, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C6C10[96 * 8 * 1], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C6C10[96 * 8 * 1], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(5, 6, 7, 4, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C6C10[96 * 8 * 2], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C6C10[96 * 8 * 2], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(9, 10, 11, 8, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C6C10[96 * 8 * 3], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C6C10[96 * 8 * 3], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(13, 14, 15, 12, 0), - gsSPVertex(&D_EBFBE0_801B4740[16], 16, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C6C10[96 * 8 * 4], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsSPVertex(&D_menu_801B4740[16], 16, 0), + gsDPLoadTextureBlock(&D_menu_801C6C10[96 * 8 * 4], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(1, 2, 3, 0, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C6C10[96 * 8 * 5], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C6C10[96 * 8 * 5], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(5, 6, 7, 4, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C6C10[96 * 8 * 6], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C6C10[96 * 8 * 6], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(9, 10, 11, 8, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C6C10[96 * 8 * 7], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C6C10[96 * 8 * 7], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(13, 14, 15, 12, 0), - gsSPVertex(&D_EBFBE0_801B4740[32], 16, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C6C10[96 * 8 * 8], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsSPVertex(&D_menu_801B4740[32], 16, 0), + gsDPLoadTextureBlock(&D_menu_801C6C10[96 * 8 * 8], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(1, 2, 3, 0, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C6C10[96 * 8 * 9], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C6C10[96 * 8 * 9], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(5, 6, 7, 4, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C6C10[96 * 8 * 10], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C6C10[96 * 8 * 10], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(9, 10, 11, 8, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C6C10[96 * 8 * 11], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 8, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C6C10[96 * 8 * 11], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 8, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(13, 14, 15, 12, 0), gsDPPipeSync(), @@ -1043,46 +1043,46 @@ Gfx D_EBFBE0_801B5E78[] = { gsSPEndDisplayList(), }; -Gfx D_EBFBE0_801B61E0[] = { +Gfx D_menu_801B61E0[] = { gsDPLoadTLUT_pal256(D_602DAD0), - gsSPVertex(D_EBFBE0_801B4740, 16, 0), - gsDPLoadTextureBlock(D_EBFBE0_801C9010, G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsSPVertex(D_menu_801B4740, 16, 0), + gsDPLoadTextureBlock(D_menu_801C9010, G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsDPSetTextureLUT(G_TT_RGBA16), gsSP1Quadrangle(1, 2, 3, 0, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C9010[96 * 8 * 1], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C9010[96 * 8 * 1], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(5, 6, 7, 4, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C9010[96 * 8 * 2], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C9010[96 * 8 * 2], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(9, 10, 11, 8, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C9010[96 * 8 * 3], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C9010[96 * 8 * 3], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(13, 14, 15, 12, 0), - gsSPVertex(&D_EBFBE0_801B4740[16], 16, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C9010[96 * 8 * 4], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsSPVertex(&D_menu_801B4740[16], 16, 0), + gsDPLoadTextureBlock(&D_menu_801C9010[96 * 8 * 4], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(1, 2, 3, 0, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C9010[96 * 8 * 5], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C9010[96 * 8 * 5], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(5, 6, 7, 4, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C9010[96 * 8 * 6], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C9010[96 * 8 * 6], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(9, 10, 11, 8, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C9010[96 * 8 * 7], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C9010[96 * 8 * 7], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(13, 14, 15, 12, 0), - gsSPVertex(&D_EBFBE0_801B4740[32], 16, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C9010[96 * 8 * 8], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsSPVertex(&D_menu_801B4740[32], 16, 0), + gsDPLoadTextureBlock(&D_menu_801C9010[96 * 8 * 8], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(1, 2, 3, 0, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C9010[96 * 8 * 9], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C9010[96 * 8 * 9], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(5, 6, 7, 4, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C9010[96 * 8 * 10], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C9010[96 * 8 * 10], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(9, 10, 11, 8, 0), - gsDPLoadTextureBlock(&D_EBFBE0_801C9010[96 * 8 * 11], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 8, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadTextureBlock(&D_menu_801C9010[96 * 8 * 11], G_IM_FMT_CI, G_IM_SIZ_8b, 96, 8, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(13, 14, 15, 12, 0), gsDPPipeSync(), @@ -1090,77 +1090,66 @@ Gfx D_EBFBE0_801B61E0[] = { gsSPEndDisplayList(), }; -Gfx D_EBFBE0_801B6548[] = { +Gfx D_menu_801B6548[] = { gsDPLoadTLUT_pal256(D_60323D0), - gsSPVertex(D_EBFBE0_801B4740, 16, 0), - gsDPLoadTextureBlock(D_EBFBE0_801CB410, G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsSPVertex(D_menu_801B4740, 16, 0), + gsDPLoadTextureBlock(D_menu_801CB410, G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsDPSetTextureLUT(G_TT_RGBA16), gsSP1Quadrangle(1, 2, 3, 0, 0), - gsDPLoadTextureBlock(D_EBFBE0_801CB410 + (96 * 8 * 1), G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, - G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, - G_TX_NOLOD), + gsDPLoadTextureBlock(D_menu_801CB410 + (96 * 8 * 1), G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(5, 6, 7, 4, 0), - gsDPLoadTextureBlock(D_EBFBE0_801CB410 + (96 * 8 * 2), G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, - G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, - G_TX_NOLOD), + gsDPLoadTextureBlock(D_menu_801CB410 + (96 * 8 * 2), G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(9, 10, 11, 8, 0), - gsDPLoadTextureBlock(D_EBFBE0_801CB410 + (96 * 8 * 3), G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, - G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, - G_TX_NOLOD), + gsDPLoadTextureBlock(D_menu_801CB410 + (96 * 8 * 3), G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(13, 14, 15, 12, 0), - gsSPVertex(&D_EBFBE0_801B4740[16], 16, 0), - gsDPLoadTextureBlock(D_EBFBE0_801CB410 + (96 * 8 * 4), G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, - G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, - G_TX_NOLOD), + gsSPVertex(&D_menu_801B4740[16], 16, 0), + gsDPLoadTextureBlock(D_menu_801CB410 + (96 * 8 * 4), G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(1, 2, 3, 0, 0), - gsDPLoadTextureBlock(D_EBFBE0_801CB410 + (96 * 8 * 5), G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, - G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, - G_TX_NOLOD), + gsDPLoadTextureBlock(D_menu_801CB410 + (96 * 8 * 5), G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(5, 6, 7, 4, 0), - gsDPLoadTextureBlock(D_EBFBE0_801CB410 + (96 * 8 * 6), G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, - G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, - G_TX_NOLOD), + gsDPLoadTextureBlock(D_menu_801CB410 + (96 * 8 * 6), G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(9, 10, 11, 8, 0), - gsDPLoadTextureBlock(D_EBFBE0_801CB410 + (96 * 8 * 7), G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, - G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, - G_TX_NOLOD), + gsDPLoadTextureBlock(D_menu_801CB410 + (96 * 8 * 7), G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(13, 14, 15, 12, 0), - gsSPVertex(&D_EBFBE0_801B4740[32], 16, 0), - gsDPLoadTextureBlock(D_EBFBE0_801CB410 + (96 * 8 * 8), G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, - G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, - G_TX_NOLOD), + gsSPVertex(&D_menu_801B4740[32], 16, 0), + gsDPLoadTextureBlock(D_menu_801CB410 + (96 * 8 * 8), G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(1, 2, 3, 0, 0), - gsDPLoadTextureBlock(D_EBFBE0_801CB410 + (96 * 8 * 9), G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, - G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, - G_TX_NOLOD), + gsDPLoadTextureBlock(D_menu_801CB410 + (96 * 8 * 9), G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(5, 6, 7, 4, 0), - gsDPLoadTextureBlock(D_EBFBE0_801CB410 + (96 * 8 * 10), G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, - G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, - G_TX_NOLOD), + gsDPLoadTextureBlock(D_menu_801CB410 + (96 * 8 * 10), G_IM_FMT_CI, G_IM_SIZ_8b, 96, 9, 0, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(9, 10, 11, 8, 0), - gsDPLoadTextureBlock(D_EBFBE0_801CB410 + (96 * 8 * 11), G_IM_FMT_CI, G_IM_SIZ_8b, 96, 8, 0, - G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, - G_TX_NOLOD), + gsDPLoadTextureBlock(D_menu_801CB410 + (96 * 8 * 11), G_IM_FMT_CI, G_IM_SIZ_8b, 96, 8, 0, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(13, 14, 15, 12, 0), gsDPPipeSync(), gsDPSetTextureLUT(G_TT_NONE), gsSPEndDisplayList(), }; -void* D_EBFBE0_801B68B0[] = { - D_EBFBE0_801C6C10, D_EBFBE0_801C9010, D_EBFBE0_801CB410, D_EBFBE0_801BB810, D_EBFBE0_801C4810, - D_EBFBE0_801C0010, D_EBFBE0_801BDC10, D_EBFBE0_801C2410, D_EBFBE0_801B9410, +void* D_menu_801B68B0[] = { + D_menu_801C6C10, D_menu_801C9010, D_menu_801CB410, D_menu_801BB810, D_menu_801C4810, + D_menu_801C0010, D_menu_801BDC10, D_menu_801C2410, D_menu_801B9410, }; -u8* D_EBFBE0_801B68D4[] = { +u8* D_menu_801B68D4[] = { D_6029220, D_602B6D0, D_602FFD0, D_6024890, D_602DB60, D_601FF40, D_6026D70, D_60223E0, D_60190B0, }; -Gfx* D_EBFBE0_801B68F8[] = { - D_6060610, D_601DE80, D_604B750, D_601F6B0, D_601C0D0, - D_601C960, D_EBFBE0_801B5E78, D_EBFBE0_801B61E0, D_EBFBE0_801B6548, D_EBFBE0_801B4D70, - D_EBFBE0_801B5B10, D_EBFBE0_801B5440, D_EBFBE0_801B50D8, D_EBFBE0_801B57A8, D_604DB10, +Gfx* D_menu_801B68F8[] = { + D_6060610, D_601DE80, D_604B750, D_601F6B0, D_601C0D0, + D_601C960, D_menu_801B5E78, D_menu_801B61E0, D_menu_801B6548, D_menu_801B4D70, + D_menu_801B5B10, D_menu_801B5440, D_menu_801B50D8, D_menu_801B57A8, D_604DB10, }; extern u8 D_5000500[]; @@ -1190,102 +1179,102 @@ extern Gfx D_604CDE0[]; extern Gfx D_604D680[]; extern Gfx D_605A120[]; -void func_EBFBE0_8019E800(void); -void func_EBFBE0_8019E99C(void); -void func_EBFBE0_8019F164(void); -void func_EBFBE0_8019F42C(void); -void func_EBFBE0_8019F600(void); -void func_EBFBE0_8019F910(void); -void func_EBFBE0_8019F97C(void); -void func_EBFBE0_8019F83C(void); -void func_EBFBE0_8019FA1C(void); -void func_EBFBE0_8019FC04(void); -s32 func_EBFBE0_8019FD1C(LevelId levelId, s32 arg1); -void func_EBFBE0_8019FF48(void); -s32 func_EBFBE0_801A05B4(void); -void func_EBFBE0_801A0788(void); -void func_EBFBE0_801A0954(void); -void func_EBFBE0_801A0D14(void); -void func_EBFBE0_801A1528(void); -void func_EBFBE0_801A116C(void); -void func_EBFBE0_801A19A8(void); -void func_EBFBE0_801A1C14(void); -bool func_EBFBE0_801A2304(void); -f32 func_EBFBE0_801A25C8(PlanetId); -void func_EBFBE0_801A2674(void); -void func_EBFBE0_801A281C(void); -void func_EBFBE0_801A2B8C(void); -void func_EBFBE0_801A2EB8(void); -void func_EBFBE0_801A3440(f32); -void func_EBFBE0_801A3550(Vec3f*, Vec3f*, Vec3f*, f32); -void func_EBFBE0_801A36A8(void); -void func_EBFBE0_801A3A00(void); -void func_EBFBE0_801A4394(void); -void func_EBFBE0_801A4650(void); -void func_EBFBE0_801A48C0(f32 speed); -void func_EBFBE0_801A4A38(f32 arg0); -void func_EBFBE0_801A4AE8(void); -void func_EBFBE0_801A4D0C(u32); -void func_EBFBE0_801A4D7C(void); -void func_EBFBE0_801A4F8C(void); -void func_EBFBE0_801A4FC4(void); -void func_EBFBE0_801A53C8(void); -void func_EBFBE0_801A5834(void); -void func_EBFBE0_801A5C90(void); -s32 func_EBFBE0_801A5770(void); -void func_EBFBE0_801A5E80(void); -void func_EBFBE0_801A6368(void); -void func_EBFBE0_801A61B4(LevelId level); -bool func_EBFBE0_801A62FC(PlanetId planet); -s32 func_EBFBE0_801A655C(s32 arg0, s32 arg1); -void func_EBFBE0_801A6628(void); -void func_EBFBE0_801A6694(void); -void func_EBFBE0_801A68E4(void); -void func_EBFBE0_801A6A24(void); -void func_EBFBE0_801A6A98(PlanetId); -s32 func_EBFBE0_801A6DAC(PlanetId planetId); -void func_EBFBE0_801A6EC0(PlanetId planetId); -void func_EBFBE0_801A7230(PlanetId planetId); -void func_EBFBE0_801A74F4(PlanetId); -void func_EBFBE0_801A7684(PlanetId planetId); -void func_EBFBE0_801A77B0(PlanetId planetId); -void func_EBFBE0_801A791C(PlanetId planetId); -void func_EBFBE0_801A7A84(PlanetId planetId); -void func_EBFBE0_801A7BEC(f32* zAngle, f32 next, f32 scale); -void func_EBFBE0_801A7D3C(PlanetId planetId); -void func_EBFBE0_801A7F1C(PlanetId planetId); -void func_EBFBE0_801A914C(void); -void func_EBFBE0_801A9EE4(void); -void func_EBFBE0_801AD11C(void); -void func_EBFBE0_801AD718(f32, f32, f32, f32*, f32*, f32*, f32, f32, f32); +void func_menu_8019E800(void); +void func_menu_8019E99C(void); +void func_menu_8019F164(void); +void func_menu_8019F42C(void); +void func_menu_8019F600(void); +void func_menu_8019F910(void); +void func_menu_8019F97C(void); +void func_menu_8019F83C(void); +void func_menu_8019FA1C(void); +void func_menu_8019FC04(void); +s32 func_menu_8019FD1C(LevelId levelId, s32 arg1); +void func_menu_8019FF48(void); +s32 func_menu_801A05B4(void); +void func_menu_801A0788(void); +void func_menu_801A0954(void); +void func_menu_801A0D14(void); +void func_menu_801A1528(void); +void func_menu_801A116C(void); +void func_menu_801A19A8(void); +void func_menu_801A1C14(void); +bool func_menu_801A2304(void); +f32 func_menu_801A25C8(PlanetId); +void func_menu_801A2674(void); +void func_menu_801A281C(void); +void func_menu_801A2B8C(void); +void func_menu_801A2EB8(void); +void func_menu_801A3440(f32); +void func_menu_801A3550(Vec3f*, Vec3f*, Vec3f*, f32); +void func_menu_801A36A8(void); +void func_menu_801A3A00(void); +void func_menu_801A4394(void); +void func_menu_801A4650(void); +void func_menu_801A48C0(f32 speed); +void func_menu_801A4A38(f32 arg0); +void func_menu_801A4AE8(void); +void func_menu_801A4D0C(u32); +void func_menu_801A4D7C(void); +void func_menu_801A4F8C(void); +void func_menu_801A4FC4(void); +void func_menu_801A53C8(void); +void func_menu_801A5834(void); +void func_menu_801A5C90(void); +s32 func_menu_801A5770(void); +void func_menu_801A5E80(void); +void func_menu_801A6368(void); +void func_menu_801A61B4(LevelId level); +bool func_menu_801A62FC(PlanetId planet); +s32 func_menu_801A655C(s32 arg0, s32 arg1); +void func_menu_801A6628(void); +void func_menu_801A6694(void); +void func_menu_801A68E4(void); +void func_menu_801A6A24(void); +void func_menu_801A6A98(PlanetId); +s32 func_menu_801A6DAC(PlanetId planetId); +void func_menu_801A6EC0(PlanetId planetId); +void func_menu_801A7230(PlanetId planetId); +void func_menu_801A74F4(PlanetId); +void func_menu_801A7684(PlanetId planetId); +void func_menu_801A77B0(PlanetId planetId); +void func_menu_801A791C(PlanetId planetId); +void func_menu_801A7A84(PlanetId planetId); +void func_menu_801A7BEC(f32* zAngle, f32 next, f32 scale); +void func_menu_801A7D3C(PlanetId planetId); +void func_menu_801A7F1C(PlanetId planetId); +void func_menu_801A914C(void); +void func_menu_801A9EE4(void); +void func_menu_801AD11C(void); +void func_menu_801AD718(f32, f32, f32, f32*, f32*, f32*, f32, f32, f32); PlanetId GetPlanetId(LevelId level); -void func_EBFBE0_801A809C(PlanetId planetId); -void func_EBFBE0_801A8738(void); -void func_EBFBE0_801A89BC(PlanetId, s32); -void func_EBFBE0_801A8F40(void); -void func_EBFBE0_801A9224(void); -void func_EBFBE0_801A9448(void); -void func_EBFBE0_801A9814(void); -void func_EBFBE0_801A9910(void); -void func_EBFBE0_801A9A8C(void); -void func_EBFBE0_801A9DE8(void); -void func_EBFBE0_801AA1CC(s32); -void func_EBFBE0_801AA434(s32, f32, f32, s32); -void func_EBFBE0_801AA778(s32, f32, f32, PlanetId); -void func_EBFBE0_801AB17C(f32 x, f32 y, f32 z); -void func_EBFBE0_801AB284(void); -void func_EBFBE0_801AB300(void); -void func_EBFBE0_801AB978(s32); -void func_EBFBE0_801ABCDC(s32 arg0, s32 alpha); -void func_EBFBE0_801ABF1C(void); -void func_EBFBE0_801AC200(s32); -void func_EBFBE0_801AC530(s32 index); -void func_EBFBE0_801AC80C(s32); -void func_EBFBE0_801AC9A0(s32); -void func_EBFBE0_801ACD90(s32 index, Vec3f* src, Vec3f* dest); -void func_EBFBE0_801AD048(void); +void func_menu_801A809C(PlanetId planetId); +void func_menu_801A8738(void); +void func_menu_801A89BC(PlanetId, s32); +void func_menu_801A8F40(void); +void func_menu_801A9224(void); +void func_menu_801A9448(void); +void func_menu_801A9814(void); +void func_menu_801A9910(void); +void func_menu_801A9A8C(void); +void func_menu_801A9DE8(void); +void func_menu_801AA1CC(s32); +void func_menu_801AA434(s32, f32, f32, s32); +void func_menu_801AA778(s32, f32, f32, PlanetId); +void func_menu_801AB17C(f32 x, f32 y, f32 z); +void func_menu_801AB284(void); +void func_menu_801AB300(void); +void func_menu_801AB978(s32); +void func_menu_801ABCDC(s32 arg0, s32 alpha); +void func_menu_801ABF1C(void); +void func_menu_801AC200(s32); +void func_menu_801AC530(s32 index); +void func_menu_801AC80C(s32); +void func_menu_801AC9A0(s32); +void func_menu_801ACD90(s32 index, Vec3f* src, Vec3f* dest); +void func_menu_801AD048(void); -void func_EBFBE0_8019E800(void) { +void func_menu_8019E800(void) { Memory_FreeAll(); func_800A5D6C(); D_80178410 = 0; @@ -1295,7 +1284,7 @@ void func_EBFBE0_8019E800(void) { gDrawMode = DRAWMODE_0; } -void func_EBFBE0_8019E85C(void) { +void func_menu_8019E85C(void) { switch (D_80177868) { case 0: if (D_Timer_8017783C == 0) { @@ -1307,23 +1296,23 @@ void func_EBFBE0_8019E85C(void) { break; case 1: - func_EBFBE0_8019E800(); + func_menu_8019E800(); break; } } -void func_EBFBE0_8019E8C8(void) { +void func_menu_8019E8C8(void) { } -void func_EBFBE0_8019E8D0(void) { - if (D_EBFBE0_801CD9B8 > 0) { - D_EBFBE0_801CD9B8--; +void func_menu_8019E8D0(void) { + if (D_menu_801CD9B8 > 0) { + D_menu_801CD9B8--; } - if (D_EBFBE0_801CD9BC > 0) { - D_EBFBE0_801CD9BC--; + if (D_menu_801CD9BC > 0) { + D_menu_801CD9BC--; } - if (D_EBFBE0_801CD9C0 > 0) { - D_EBFBE0_801CD9C0--; + if (D_menu_801CD9C0 > 0) { + D_menu_801CD9C0--; } switch (D_80177B40) { @@ -1335,17 +1324,17 @@ void func_EBFBE0_8019E8D0(void) { case 1: gDrawMode = DRAWMODE_0; - func_EBFBE0_8019E99C(); + func_menu_8019E99C(); break; case 2: gDrawMode = DRAW_MAP; - func_EBFBE0_8019FF48(); + func_menu_8019FF48(); break; } } -void func_EBFBE0_8019E99C(void) { +void func_menu_8019E99C(void) { s32 i; s32 j; @@ -1354,70 +1343,70 @@ void func_EBFBE0_8019E99C(void) { D_80137E78 = 2; gFrameCount = 0; - func_EBFBE0_80188010(); + func_menu_80188010(); - D_EBFBE0_801CD83C = func_EBFBE0_801A05B4(); + D_menu_801CD83C = func_menu_801A05B4(); - D_EBFBE0_801CD980 = 0; - D_EBFBE0_801CD984 = 0; - D_EBFBE0_801CD98C = 0; - D_EBFBE0_801CD990 = 0; - D_EBFBE0_801CD994 = 0; - D_EBFBE0_801CD9CC = 0; + D_menu_801CD980 = 0; + D_menu_801CD984 = 0; + D_menu_801CD98C = 0; + D_menu_801CD990 = 0; + D_menu_801CD994 = 0; + D_menu_801CD9CC = 0; - D_EBFBE0_801CEB48[0] = 0; - D_EBFBE0_801CEB48[1] = 0; - D_EBFBE0_801CEB48[2] = 0; + D_menu_801CEB48[0] = 0; + D_menu_801CEB48[1] = 0; + D_menu_801CEB48[2] = 0; for (i = 0; i < 10; i++) { - D_EBFBE0_801CEB58[1][i] = 0; - D_EBFBE0_801CEB58[2][i] = 0; - D_EBFBE0_801CEBD0[1][i] = 0xFF; - D_EBFBE0_801CEBD0[2][i] = 0xFF; - D_EBFBE0_801CEC48[1][i] = 0.0f; - D_EBFBE0_801CEC48[2][i] = 0.0f; - D_EBFBE0_801CECC0[1][i] = 0.5f + (Rand_ZeroOne() * 0.3f); - D_EBFBE0_801CECC0[2][i] = 0.5f + (Rand_ZeroOne() * 0.3f); - D_EBFBE0_801CEE28[1][i] = 1 + (s32) (Rand_ZeroOne() * 5.0f); - D_EBFBE0_801CEE28[2][i] = 1 + (s32) (Rand_ZeroOne() * 5.0f); - D_EBFBE0_801CED38[1][i] = 50.0f + (s32) (Rand_ZeroOne() * 30.0f); - D_EBFBE0_801CED38[2][i] = 110.0f + (s32) (Rand_ZeroOne() * 30.0f); - D_EBFBE0_801CEDB0[1][i] = -10.0f + (Rand_ZeroOne() * -60.0f); - D_EBFBE0_801CEDB0[2][i] = -10.0f + (Rand_ZeroOne() * -60.0f); + D_menu_801CEB58[1][i] = 0; + D_menu_801CEB58[2][i] = 0; + D_menu_801CEBD0[1][i] = 0xFF; + D_menu_801CEBD0[2][i] = 0xFF; + D_menu_801CEC48[1][i] = 0.0f; + D_menu_801CEC48[2][i] = 0.0f; + D_menu_801CECC0[1][i] = 0.5f + (Rand_ZeroOne() * 0.3f); + D_menu_801CECC0[2][i] = 0.5f + (Rand_ZeroOne() * 0.3f); + D_menu_801CEE28[1][i] = 1 + (s32) (Rand_ZeroOne() * 5.0f); + D_menu_801CEE28[2][i] = 1 + (s32) (Rand_ZeroOne() * 5.0f); + D_menu_801CED38[1][i] = 50.0f + (s32) (Rand_ZeroOne() * 30.0f); + D_menu_801CED38[2][i] = 110.0f + (s32) (Rand_ZeroOne() * 30.0f); + D_menu_801CEDB0[1][i] = -10.0f + (Rand_ZeroOne() * -60.0f); + D_menu_801CEDB0[2][i] = -10.0f + (Rand_ZeroOne() * -60.0f); } - D_EBFBE0_801CD978 = 0; - D_EBFBE0_801CD97C = 0; - D_EBFBE0_801CF010 = 0; - D_EBFBE0_801CF014 = 0; + D_menu_801CD978 = 0; + D_menu_801CD97C = 0; + D_menu_801CF010 = 0; + D_menu_801CF014 = 0; for (j = 0; j < 15; j++) { - D_EBFBE0_801CD900[j] = 0; - D_EBFBE0_801CEAB8[j] = 0.0f; - D_EBFBE0_801CEAF8[j] = -90.0f; + D_menu_801CD900[j] = 0; + D_menu_801CEAB8[j] = 0.0f; + D_menu_801CEAF8[j] = -90.0f; } - D_EBFBE0_801CDA20 = 0.0f; - D_EBFBE0_801CDA24 = 1.0f; - D_EBFBE0_801CDA28 = 0.0f; - D_EBFBE0_801CDA00 = -150.552155f; - D_EBFBE0_801CDA04 = -489.679993f; - D_EBFBE0_801CDA08 = 0.0f; - D_EBFBE0_801CDA0C = -42.750008f; - D_EBFBE0_801CDA10 = -9.849999f; - D_EBFBE0_801CDA14 = 3375.000000f; - D_EBFBE0_801CDA18 = 0.0f; - D_EBFBE0_801CDA1C = 0.0f; + D_menu_801CDA20 = 0.0f; + D_menu_801CDA24 = 1.0f; + D_menu_801CDA28 = 0.0f; + D_menu_801CDA00 = -150.552155f; + D_menu_801CDA04 = -489.679993f; + D_menu_801CDA08 = 0.0f; + D_menu_801CDA0C = -42.750008f; + D_menu_801CDA10 = -9.849999f; + D_menu_801CDA14 = 3375.000000f; + D_menu_801CDA18 = 0.0f; + D_menu_801CDA1C = 0.0f; - func_EBFBE0_801AD718(D_EBFBE0_801CDA00, D_EBFBE0_801CDA04, D_EBFBE0_801CDA08, &D_EBFBE0_801CD9F4, - &D_EBFBE0_801CD9F8, &D_EBFBE0_801CD9FC, D_EBFBE0_801CDA14, - D_EBFBE0_801CDA0C + D_EBFBE0_801CDA18, D_EBFBE0_801CDA10 + D_EBFBE0_801CDA1C); + func_menu_801AD718(D_menu_801CDA00, D_menu_801CDA04, D_menu_801CDA08, &D_menu_801CD9F4, &D_menu_801CD9F8, + &D_menu_801CD9FC, D_menu_801CDA14, D_menu_801CDA0C + D_menu_801CDA18, + D_menu_801CDA10 + D_menu_801CDA1C); for (i = 0; i < 15; i++) { - D_EBFBE0_801CD8A0[i] = i; + D_menu_801CD8A0[i] = i; } - D_EBFBE0_801CD960 = 0; + D_menu_801CD960 = 0; D_80178340 = 0xFF; D_80178348 = 0; @@ -1425,97 +1414,97 @@ void func_EBFBE0_8019E99C(void) { D_80178354 = 0; D_80177D20 = 0.0f; - D_EBFBE0_801CF018 = 0; + D_menu_801CF018 = 0; gBgColor = 0; - D_EBFBE0_801CEA58 = 0.0f; - D_EBFBE0_801CEA5C = 0.0f; - D_EBFBE0_801CEA60 = 0.0f; + D_menu_801CEA58 = 0.0f; + D_menu_801CEA5C = 0.0f; + D_menu_801CEA60 = 0.0f; - func_EBFBE0_801A0788(); + func_menu_801A0788(); - D_EBFBE0_801B8280 = 0; - D_EBFBE0_801B8284 = 0; - D_EBFBE0_801CD9B8 = 0; - D_EBFBE0_801CD9BC = 0; - D_EBFBE0_801CD9C0 = 0; - D_EBFBE0_801CD964 = 0; - D_EBFBE0_801CD968 = 0; - D_EBFBE0_801CD96C = 0; - D_EBFBE0_801CEA6C = 0.0f; - D_EBFBE0_801CEA70 = 0.002f; + D_menu_801B8280 = 0; + D_menu_801B8284 = 0; + D_menu_801CD9B8 = 0; + D_menu_801CD9BC = 0; + D_menu_801CD9C0 = 0; + D_menu_801CD964 = 0; + D_menu_801CD968 = 0; + D_menu_801CD96C = 0; + D_menu_801CEA6C = 0.0f; + D_menu_801CEA70 = 0.002f; func_8001D444(0, 0x3C, 0, 0xFF); - D_EBFBE0_801CEFC4 = 0; - D_EBFBE0_801CEFC8 = 0; - D_EBFBE0_801CEFD0 = 0; - D_EBFBE0_801CD974 = 0; + D_menu_801CEFC4 = 0; + D_menu_801CEFC8 = 0; + D_menu_801CEFD0 = 0; + D_menu_801CD974 = 0; for (i = 0; i < 24; i++) { - D_EBFBE0_801CD840[i] = i; - D_EBFBE0_801AFD18[i].unk_14 = 0; + D_menu_801CD840[i] = i; + D_menu_801AFD18[i].unk_14 = 0; } - func_EBFBE0_801A6694(); + func_menu_801A6694(); switch (D_80161A34) { default: case 0: - func_EBFBE0_8019F600(); + func_menu_8019F600(); break; case 7: - func_EBFBE0_8019F164(); + func_menu_8019F164(); break; case 5: - func_EBFBE0_8019F42C(); + func_menu_8019F42C(); break; } - func_EBFBE0_801A914C(); + func_menu_801A914C(); for (i = 0; i < 96 * 96; i++) { - D_EBFBE0_801BB810[i] = 106; - D_EBFBE0_801BDC10[i] = 84; - D_EBFBE0_801C0010[i] = 75; - D_EBFBE0_801C2410[i] = 81; - D_EBFBE0_801C4810[i] = 55; - D_EBFBE0_801C6C10[i] = 82; - D_EBFBE0_801C9010[i] = 68; - D_EBFBE0_801CB410[i] = 52; - D_EBFBE0_801B9410[i] = 0; + D_menu_801BB810[i] = 106; + D_menu_801BDC10[i] = 84; + D_menu_801C0010[i] = 75; + D_menu_801C2410[i] = 81; + D_menu_801C4810[i] = 55; + D_menu_801C6C10[i] = 82; + D_menu_801C9010[i] = 68; + D_menu_801CB410[i] = 52; + D_menu_801B9410[i] = 0; } for (i = 0; i < 9; i++) { - D_EBFBE0_801CD818[i] = 0.0f; - func_EBFBE0_801A07E8(D_EBFBE0_801B68B0[i], SEGMENTED_TO_VIRTUAL(D_EBFBE0_801B68D4[i]), &D_EBFBE0_801CD818[i]); + D_menu_801CD818[i] = 0.0f; + func_menu_801A07E8(D_menu_801B68B0[i], SEGMENTED_TO_VIRTUAL(D_menu_801B68D4[i]), &D_menu_801CD818[i]); } - D_EBFBE0_801CD810 = 0; + D_menu_801CD810 = 0; D_80177B40 = 2; - D_EBFBE0_801CD948 = 0; - D_EBFBE0_801CEEC4 = 0; - D_EBFBE0_801CEEC8 = 5; - D_EBFBE0_801CEFF4 = 255.0f; - D_EBFBE0_801CEFF8 = 255.0f; - D_EBFBE0_801CEEBC = 0.0f; - D_EBFBE0_801CEEC0 = 0.0f; - D_EBFBE0_801CEEA0 = 0; - D_EBFBE0_801CEEA4 = 0; - D_EBFBE0_801CEEA8 = 0xFF; - D_EBFBE0_801CEEAC = 0xFF; - D_EBFBE0_801CEB34 = -1; + D_menu_801CD948 = 0; + D_menu_801CEEC4 = 0; + D_menu_801CEEC8 = 5; + D_menu_801CEFF4 = 255.0f; + D_menu_801CEFF8 = 255.0f; + D_menu_801CEEBC = 0.0f; + D_menu_801CEEC0 = 0.0f; + D_menu_801CEEA0 = 0; + D_menu_801CEEA4 = 0; + D_menu_801CEEA8 = 0xFF; + D_menu_801CEEAC = 0xFF; + D_menu_801CEB34 = -1; } -void func_EBFBE0_8019F164(void) { +void func_menu_8019F164(void) { s32 i; - D_EBFBE0_801CD974 = 1; + D_menu_801CD974 = 1; if (gLifeCount[gPlayerNum] > 99) { gLifeCount[gPlayerNum] = 99; @@ -1533,91 +1522,91 @@ void func_EBFBE0_8019F164(void) { } } - D_EBFBE0_801CD93C = D_80177930; + D_menu_801CD93C = D_80177930; sCurrentPlanetId = GetPlanetId(gCurrentLevel); - D_EBFBE0_801CD950 = sCurrentPlanetId; + D_menu_801CD950 = sCurrentPlanetId; - D_EBFBE0_801CD980 = func_EBFBE0_8019FD1C(gCurrentLevel, 0); + D_menu_801CD980 = func_menu_8019FD1C(gCurrentLevel, 0); - func_EBFBE0_8019FD1C(gCurrentLevel, 2); + func_menu_8019FD1C(gCurrentLevel, 2); if (D_800D3180[gCurrentLevel] == 2) { - D_EBFBE0_801CD98C = 1; + D_menu_801CD98C = 1; D_80177BB0[gCurrentPlanet] = 1; - func_EBFBE0_8019FD1C(gCurrentLevel, 1); + func_menu_8019FD1C(gCurrentLevel, 1); } Save_Write(); - func_EBFBE0_8019F97C(); + func_menu_8019F97C(); - func_EBFBE0_8019F83C(); + func_menu_8019F83C(); - func_EBFBE0_8019FA1C(); + func_menu_8019FA1C(); - switch (D_EBFBE0_801CD93C) { + switch (D_menu_801CD93C) { case 0: - D_EBFBE0_801CD958 = planet[sCurrentPlanetId].unk_2C; + D_menu_801CD958 = planet[sCurrentPlanetId].unk_2C; break; case 1: - D_EBFBE0_801CD958 = planet[sCurrentPlanetId].unk_30; + D_menu_801CD958 = planet[sCurrentPlanetId].unk_30; break; case 2: - D_EBFBE0_801CD958 = planet[sCurrentPlanetId].unk_34; + D_menu_801CD958 = planet[sCurrentPlanetId].unk_34; break; } gCurrentPlanet++; - func_EBFBE0_8019FC04(); + func_menu_8019FC04(); - D_EBFBE0_801CEFC4 = 0; - D_EBFBE0_801CEFD0 = 0; - D_EBFBE0_801CEFE0 = 32.0f; + D_menu_801CEFC4 = 0; + D_menu_801CEFD0 = 0; + D_menu_801CEFE0 = 32.0f; - D_EBFBE0_801CEFE8[0] = 255.0f; - D_EBFBE0_801CEFE8[1] = 255.0f; - D_EBFBE0_801CEFE8[2] = 255.0f; + D_menu_801CEFE8[0] = 255.0f; + D_menu_801CEFE8[1] = 255.0f; + D_menu_801CEFE8[2] = 255.0f; - D_EBFBE0_801CEFD8 = 0; + D_menu_801CEFD8 = 0; - if (D_EBFBE0_801CD93C) { - D_EBFBE0_801CEFD8 = 1; + if (D_menu_801CD93C) { + D_menu_801CEFD8 = 1; } gHitCount = 0; - D_EBFBE0_801CD94C = 0; - D_EBFBE0_801CD944 = 5; + D_menu_801CD94C = 0; + D_menu_801CD944 = 5; } -void func_EBFBE0_8019F42C(void) { +void func_menu_8019F42C(void) { s32 i; gTotalHits += gHitCount; gLifeCount[gPlayerNum] = 0; - D_EBFBE0_801CD974 = 1; + D_menu_801CD974 = 1; sCurrentPlanetId = GetPlanetId(gCurrentLevel); D_80177B70[gCurrentPlanet] = gHitCount; - func_EBFBE0_8019F910(); - func_EBFBE0_8019FD1C(gCurrentLevel, 0); + func_menu_8019F910(); + func_menu_8019FD1C(gCurrentLevel, 0); Save_Write(); - func_EBFBE0_8019F83C(); + func_menu_8019F83C(); for (i = 0; i < 7; i++) { - D_EBFBE0_801CD8E0[i] = 0; + D_menu_801CD8E0[i] = 0; } if (gCurrentPlanet != 0) { for (i = 0; i < gCurrentPlanet; i++) { - D_EBFBE0_801CD8E0[i] = func_EBFBE0_801A655C(D_80177B90[i], D_80177B90[i + 1]); + D_menu_801CD8E0[i] = func_menu_801A655C(D_80177B90[i], D_80177B90[i + 1]); } } @@ -1629,18 +1618,18 @@ void func_EBFBE0_8019F42C(void) { planet[i].alpha = 0; } - func_EBFBE0_8019FC04(); + func_menu_8019FC04(); - D_EBFBE0_801CD9AC = 0; + D_menu_801CD9AC = 0; func_8001DC6C(0, 0x19); - D_EBFBE0_801CD948 = 0; - D_EBFBE0_801CD94C = 0; - D_EBFBE0_801CD944 = 7; + D_menu_801CD948 = 0; + D_menu_801CD94C = 0; + D_menu_801CD944 = 7; } -void func_EBFBE0_8019F600(void) { +void func_menu_8019F600(void) { s32 i; s32 sp18; s32 temp_t4; @@ -1661,13 +1650,13 @@ void func_EBFBE0_8019F600(void) { D_80177C58[2] = 255; D_80177C58[3] = 255; - D_EBFBE0_801CD950 = -1; + D_menu_801CD950 = -1; for (i = 0; i < 15; i++) { planet[i].alpha = 0; } - D_EBFBE0_801CD970 = 0; + D_menu_801CD970 = 0; for (i = 0; i < 24; i++) { D_80177BD8[i] = 0; gUnkEntities30[i].unk_24 = 0.0f; @@ -1687,28 +1676,28 @@ void func_EBFBE0_8019F600(void) { D_80177B90[6] = 13; for (i = 0; i < 24; i++) { - D_EBFBE0_801AFD18[i].unk_18 = 255; + D_menu_801AFD18[i].unk_18 = 255; } gCurrentPlanet = 0; gCurrentLevel = 0; sCurrentPlanetId = 9; - D_EBFBE0_801CEA9C = 0.0f; - D_EBFBE0_801CD9B0 = 0.002f; - D_EBFBE0_801CD9B4 = 0.01f; - D_EBFBE0_801CD944 = 0; + D_menu_801CEA9C = 0.0f; + D_menu_801CD9B0 = 0.002f; + D_menu_801CD9B4 = 0.01f; + D_menu_801CD944 = 0; - sp18 = func_EBFBE0_801A655C(sCurrentPlanetId, planet[sCurrentPlanetId].unk_2C); - temp_t4 = func_EBFBE0_801A655C(sCurrentPlanetId, planet[sCurrentPlanetId].unk_30); + sp18 = func_menu_801A655C(sCurrentPlanetId, planet[sCurrentPlanetId].unk_2C); + temp_t4 = func_menu_801A655C(sCurrentPlanetId, planet[sCurrentPlanetId].unk_30); D_80177BD8[sp18] = 1; D_80177BD8[temp_t4] = 1; } -void func_EBFBE0_8019F83C(void) { +void func_menu_8019F83C(void) { s32 i; - D_EBFBE0_801CD970 = 0; + D_menu_801CD970 = 0; for (i = 0; i < 24; i++) { if ((D_80177BD8[i] == 4) || (D_80177BD8[i] == 5) || (D_80177BD8[i] == 1) || (D_80177BD8[i] == 11)) { @@ -1716,15 +1705,15 @@ void func_EBFBE0_8019F83C(void) { } if (D_80177BD8[i] == 6) { - D_EBFBE0_801AFD18[i].unk_14 = 5; + D_menu_801AFD18[i].unk_14 = 5; } - D_EBFBE0_801AFD18[i].unk_18 = 0; + D_menu_801AFD18[i].unk_18 = 0; gUnkEntities30[i].unk_24 = 0.0f; } } -void func_EBFBE0_8019F910(void) { +void func_menu_8019F910(void) { s32 i; s32 mask = 0x00FF0000; @@ -1738,16 +1727,16 @@ void func_EBFBE0_8019F910(void) { } } -void func_EBFBE0_8019F97C(void) { - D_EBFBE0_801CEA54 = func_EBFBE0_801A25C8(sCurrentPlanetId); +void func_menu_8019F97C(void) { + D_menu_801CEA54 = func_menu_801A25C8(sCurrentPlanetId); - D_EBFBE0_801CD9F4 = D_EBFBE0_801CDA00 = planet[sCurrentPlanetId].posX; - D_EBFBE0_801CD9F8 = D_EBFBE0_801CDA04 = planet[sCurrentPlanetId].posY; - D_EBFBE0_801CDA08 = planet[sCurrentPlanetId].posZ; - D_EBFBE0_801CD9FC = planet[sCurrentPlanetId].posZ + D_EBFBE0_801CEA54; + D_menu_801CD9F4 = D_menu_801CDA00 = planet[sCurrentPlanetId].posX; + D_menu_801CD9F8 = D_menu_801CDA04 = planet[sCurrentPlanetId].posY; + D_menu_801CDA08 = planet[sCurrentPlanetId].posZ; + D_menu_801CD9FC = planet[sCurrentPlanetId].posZ + D_menu_801CEA54; } -void func_EBFBE0_8019FA1C(void) { +void func_menu_8019FA1C(void) { PlanetId planetId; for (planetId = 0; planetId < PLANET_MAX; planetId++) { @@ -1763,25 +1752,25 @@ void func_EBFBE0_8019FA1C(void) { } } -void func_EBFBE0_8019FC04(void) { +void func_menu_8019FC04(void) { s32 i; if (gCurrentPlanet != 0) { - D_EBFBE0_801CEB48[1] = 1; - D_EBFBE0_801CEB48[2] = 1; + D_menu_801CEB48[1] = 1; + D_menu_801CEB48[2] = 1; } for (i = 0; i < 7; i++) { if (D_80177B90[i] == 6) { - D_EBFBE0_801CEB48[1] = 0; + D_menu_801CEB48[1] = 0; } if (D_80177B90[i] == 5) { - D_EBFBE0_801CEB48[2] = 0; + D_menu_801CEB48[2] = 0; } } } -bool func_EBFBE0_8019FD1C(LevelId levelId, s32 arg1) { +bool func_menu_8019FD1C(LevelId levelId, s32 arg1) { s32 ret; s32 planetSaveSlot; @@ -1901,57 +1890,57 @@ bool func_EBFBE0_8019FD1C(LevelId levelId, s32 arg1) { return ret; } -void func_EBFBE0_8019FF48(void) { - func_EBFBE0_801A6694(); - func_EBFBE0_801A68E4(); - func_EBFBE0_801A6A24(); +void func_menu_8019FF48(void) { + func_menu_801A6694(); + func_menu_801A68E4(); + func_menu_801A6A24(); - switch (D_EBFBE0_801CD944) { + switch (D_menu_801CD944) { case 0: - func_EBFBE0_801A0954(); + func_menu_801A0954(); D_8017842C += 0.09f; break; case 1: - func_EBFBE0_801A1528(); - D_EBFBE0_801CDA1C += 0.03f; + func_menu_801A1528(); + D_menu_801CDA1C += 0.03f; break; case 3: - func_EBFBE0_801AD11C(); - D_EBFBE0_801CDA1C += 0.03f; + func_menu_801AD11C(); + D_menu_801CDA1C += 0.03f; break; case 2: - func_EBFBE0_801A1C14(); + func_menu_801A1C14(); break; case 4: - func_EBFBE0_801A5E80(); + func_menu_801A5E80(); break; case 5: - func_EBFBE0_801A2B8C(); + func_menu_801A2B8C(); break; case 6: - func_EBFBE0_801A4AE8(); + func_menu_801A4AE8(); break; case 7: - func_EBFBE0_801A36A8(); + func_menu_801A36A8(); break; default: break; } - if ((D_EBFBE0_801CD944 == 0) || (D_EBFBE0_801CD944 == 1) || (D_EBFBE0_801CD944 == 7) || (D_EBFBE0_801CD944 == 3)) { - func_EBFBE0_801AD718(D_EBFBE0_801CDA00, D_EBFBE0_801CDA04, D_EBFBE0_801CDA08, &D_EBFBE0_801CD9F4, - &D_EBFBE0_801CD9F8, &D_EBFBE0_801CD9FC, D_EBFBE0_801CDA14, - D_EBFBE0_801CDA0C + D_EBFBE0_801CDA18, D_EBFBE0_801CDA10 + D_EBFBE0_801CDA1C); - func_800B6F50(D_EBFBE0_801CD9F4, D_EBFBE0_801CD9F8, D_EBFBE0_801CD9FC, D_EBFBE0_801CDA00, D_EBFBE0_801CDA04, - D_EBFBE0_801CDA08); + if ((D_menu_801CD944 == 0) || (D_menu_801CD944 == 1) || (D_menu_801CD944 == 7) || (D_menu_801CD944 == 3)) { + func_menu_801AD718(D_menu_801CDA00, D_menu_801CDA04, D_menu_801CDA08, &D_menu_801CD9F4, &D_menu_801CD9F8, + &D_menu_801CD9FC, D_menu_801CDA14, D_menu_801CDA0C + D_menu_801CDA18, + D_menu_801CDA10 + D_menu_801CDA1C); + func_800B6F50(D_menu_801CD9F4, D_menu_801CD9F8, D_menu_801CD9FC, D_menu_801CDA00, D_menu_801CDA04, + D_menu_801CDA08); } gFrameCount++; #if MODS_LEVEL_SELECT == true @@ -1959,106 +1948,106 @@ void func_EBFBE0_8019FF48(void) { #endif } -void func_EBFBE0_801A01A8(void) { +void func_menu_801A01A8(void) { s32 i; s32* ptr; Matrix_Push(&gGfxMatrix); - Matrix_LookAt(gGfxMatrix, D_EBFBE0_801CD9F4, D_EBFBE0_801CD9F8, D_EBFBE0_801CD9FC, D_EBFBE0_801CDA00, - D_EBFBE0_801CDA04, D_EBFBE0_801CDA08, D_EBFBE0_801CDA20, D_EBFBE0_801CDA24, D_EBFBE0_801CDA28, 1); - Matrix_Translate(gGfxMatrix, D_EBFBE0_801CEA58, D_EBFBE0_801CEA5C, D_EBFBE0_801CEA60, 1); + Matrix_LookAt(gGfxMatrix, D_menu_801CD9F4, D_menu_801CD9F8, D_menu_801CD9FC, D_menu_801CDA00, D_menu_801CDA04, + D_menu_801CDA08, D_menu_801CDA20, D_menu_801CDA24, D_menu_801CDA28, 1); + Matrix_Translate(gGfxMatrix, D_menu_801CEA58, D_menu_801CEA5C, D_menu_801CEA60, 1); Matrix_SetGfxMtx(&gMasterDisp); - if (D_EBFBE0_801CD974 && D_EBFBE0_801CD944 != 0) { + if (D_menu_801CD974 && D_menu_801CD944 != 0) { for (i = 0; i < 24; i++) { if (D_80177BD8[i] == 0) { continue; } - if (D_EBFBE0_801AFD18[i].unk_18 == 0) { + if (D_menu_801AFD18[i].unk_18 == 0) { continue; } - func_EBFBE0_801AC9A0(i); + func_menu_801AC9A0(i); - if (D_EBFBE0_801AFD18[i].unk_14) { - func_EBFBE0_801AC200(i); + if (D_menu_801AFD18[i].unk_14) { + func_menu_801AC200(i); } func_80060D94(i); } } - func_EBFBE0_801A8F40(); + func_menu_801A8F40(); - func_EBFBE0_801A9224(); + func_menu_801A9224(); - func_EBFBE0_801A9448(); + func_menu_801A9448(); - for (ptr = D_EBFBE0_801CD8A0, i = 0; i < 15; i++, ptr++) { - func_EBFBE0_801A6A98(*ptr); + for (ptr = D_menu_801CD8A0, i = 0; i < 15; i++, ptr++) { + func_menu_801A6A98(*ptr); } - func_EBFBE0_801A8738(); + func_menu_801A8738(); Matrix_Pop(&gGfxMatrix); - if (D_EBFBE0_801CD96C) { - func_EBFBE0_801ABF1C(); + if (D_menu_801CD96C) { + func_menu_801ABF1C(); } - func_EBFBE0_801AB300(); + func_menu_801AB300(); - if (D_EBFBE0_801CEFC4) { - func_EBFBE0_801A5834(); + if (D_menu_801CEFC4) { + func_menu_801A5834(); } - if (D_EBFBE0_801CD964) { - func_EBFBE0_801A9910(); + if (D_menu_801CD964) { + func_menu_801A9910(); } - func_EBFBE0_801A9814(); + func_menu_801A9814(); - if (D_EBFBE0_801CD968) { - func_EBFBE0_801A9A8C(); + if (D_menu_801CD968) { + func_menu_801A9A8C(); } - func_EBFBE0_801A9DE8(); + func_menu_801A9DE8(); - func_EBFBE0_801A5C90(); + func_menu_801A5C90(); - if ((D_EBFBE0_801CD944 == 7) && (D_EBFBE0_801CD948 == 1)) { - func_EBFBE0_801A4650(); + if ((D_menu_801CD944 == 7) && (D_menu_801CD948 == 1)) { + func_menu_801A4650(); } - if (D_EBFBE0_801CD944 == 0) { - func_EBFBE0_801A0D14(); + if (D_menu_801CD944 == 0) { + func_menu_801A0D14(); } - if (D_EBFBE0_801CD944 == 1) { - func_EBFBE0_801A19A8(); + if (D_menu_801CD944 == 1) { + func_menu_801A19A8(); } - if (D_EBFBE0_801CEEC8 == 0) { - func_EBFBE0_801A07E8((u8*) D_EBFBE0_801B68B0[8], (u8*) SEGMENTED_TO_VIRTUAL(D_EBFBE0_801B68D4[8]), - &(D_EBFBE0_801CD818[8])); - D_EBFBE0_801CEEC8 = 5; + if (D_menu_801CEEC8 == 0) { + func_menu_801A07E8((u8*) D_menu_801B68B0[8], (u8*) SEGMENTED_TO_VIRTUAL(D_menu_801B68D4[8]), + &(D_menu_801CD818[8])); + D_menu_801CEEC8 = 5; } else { - D_EBFBE0_801CEEC8--; + D_menu_801CEEC8--; } - func_EBFBE0_801A07E8((u8*) D_EBFBE0_801B68B0[D_EBFBE0_801CEEC4 * 2], - (u8*) SEGMENTED_TO_VIRTUAL(D_EBFBE0_801B68D4[D_EBFBE0_801CEEC4 * 2]), - &(D_EBFBE0_801CD818[D_EBFBE0_801CEEC4 * 2])); - func_EBFBE0_801A07E8((u8*) D_EBFBE0_801B68B0[(D_EBFBE0_801CEEC4 * 2) + 1], - (u8*) SEGMENTED_TO_VIRTUAL(D_EBFBE0_801B68D4[(D_EBFBE0_801CEEC4 * 2) + 1]), - &(D_EBFBE0_801CD818[(D_EBFBE0_801CEEC4 * 2) + 1])); - D_EBFBE0_801CEEC4++; - if (D_EBFBE0_801CEEC4 > 3) { - D_EBFBE0_801CEEC4 = 0; + func_menu_801A07E8((u8*) D_menu_801B68B0[D_menu_801CEEC4 * 2], + (u8*) SEGMENTED_TO_VIRTUAL(D_menu_801B68D4[D_menu_801CEEC4 * 2]), + &(D_menu_801CD818[D_menu_801CEEC4 * 2])); + func_menu_801A07E8((u8*) D_menu_801B68B0[(D_menu_801CEEC4 * 2) + 1], + (u8*) SEGMENTED_TO_VIRTUAL(D_menu_801B68D4[(D_menu_801CEEC4 * 2) + 1]), + &(D_menu_801CD818[(D_menu_801CEEC4 * 2) + 1])); + D_menu_801CEEC4++; + if (D_menu_801CEEC4 > 3) { + D_menu_801CEEC4 = 0; } Texture_Mottle((u16*) D_6047F80, (u16*) D_6048F80, 5); } -s32 func_EBFBE0_801A05B4(void) { +s32 func_menu_801A05B4(void) { s32 i; s32 j; s32 sp30[10]; @@ -2092,7 +2081,7 @@ s32 func_EBFBE0_801A05B4(void) { return ret; } -void func_EBFBE0_801A0788(void) { +void func_menu_801A0788(void) { D_80178410 = 800; Memory_FreeAll(); @@ -2104,8 +2093,8 @@ void func_EBFBE0_801A0788(void) { D_80178430 = 0.0f; } -void func_EBFBE0_801A07E8(u8* arg0, u8* arg1, f32* arg2) { - s32* var_v0 = D_EBFBE0_801B0004; +void func_menu_801A07E8(u8* arg0, u8* arg1, f32* arg2) { + s32* var_v0 = D_menu_801B0004; s32 temp; s32 i; s32 j; @@ -2113,7 +2102,7 @@ void func_EBFBE0_801A07E8(u8* arg0, u8* arg1, f32* arg2) { for (i = 1; i < 48; i++, var_v0++) { for (k = 0, j = *var_v0; j < (95 - *var_v0); j++, k++) { - temp = D_EBFBE0_801B00C0[i - 1][k] + (s32) *arg2; + temp = D_menu_801B00C0[i - 1][k] + (s32) *arg2; if (temp > 95) { temp -= 95; @@ -2138,30 +2127,30 @@ void func_EBFBE0_801A07E8(u8* arg0, u8* arg1, f32* arg2) { } } -void func_EBFBE0_801A0954(void) { +void func_menu_801A0954(void) { PlanetId planetId; - static f32 D_EBFBE0_801B6934[] = { + static f32 D_menu_801B6934[] = { 99.0f, 24, -90.0f, -150.0f, -208.0f, -276.0f, }; - switch (D_EBFBE0_801CD948) { + switch (D_menu_801CD948) { case 100: break; case 0: - D_EBFBE0_801CD9F0 = 0; - D_EBFBE0_801CD9DC = 30.0f; - D_EBFBE0_801CD9E0 = 230.0f; - D_EBFBE0_801CD9E8 = 0; - D_EBFBE0_801CD9E4 = 0; - D_EBFBE0_801CD9EC = 0.29f; + D_menu_801CD9F0 = 0; + D_menu_801CD9DC = 30.0f; + D_menu_801CD9E0 = 230.0f; + D_menu_801CD9E8 = 0; + D_menu_801CD9E4 = 0; + D_menu_801CD9EC = 0.29f; D_80178410 = 800; - D_EBFBE0_801CD9C0 = 5; - D_EBFBE0_801CD948++; + D_menu_801CD9C0 = 5; + D_menu_801CD948++; break; case 1: - if (D_EBFBE0_801CD9C0 != 0) { + if (D_menu_801CD9C0 != 0) { break; } @@ -2169,48 +2158,48 @@ void func_EBFBE0_801A0954(void) { break; } - if ((s32) D_EBFBE0_801CD9E0 == 205) { + if ((s32) D_menu_801CD9E0 == 205) { func_8001AD00(1000); } - if (D_EBFBE0_801CD9E0 > -355.0f) { - D_EBFBE0_801CD9E0 -= D_EBFBE0_801CD9EC; + if (D_menu_801CD9E0 > -355.0f) { + D_menu_801CD9E0 -= D_menu_801CD9EC; } - if ((D_EBFBE0_801CD9E0 < 200.0f) && (D_EBFBE0_801CD9E8 != 255)) { - D_EBFBE0_801CD9E8 += 8; - if (D_EBFBE0_801CD9E8 > 255) { - D_EBFBE0_801CD9E8 = 255; + if ((D_menu_801CD9E0 < 200.0f) && (D_menu_801CD9E8 != 255)) { + D_menu_801CD9E8 += 8; + if (D_menu_801CD9E8 > 255) { + D_menu_801CD9E8 = 255; } } - if (D_EBFBE0_801CD9E0 < D_EBFBE0_801B6934[D_EBFBE0_801CD9F0]) { - D_EBFBE0_801CD9E4 += 8; - if (D_EBFBE0_801CD9E4 > 255) { - D_EBFBE0_801CD9E4 = 255; + if (D_menu_801CD9E0 < D_menu_801B6934[D_menu_801CD9F0]) { + D_menu_801CD9E4 += 8; + if (D_menu_801CD9E4 > 255) { + D_menu_801CD9E4 = 255; } } - if (D_EBFBE0_801CD9E0 <= -355.0f) { - D_EBFBE0_801CD948++; + if (D_menu_801CD9E0 <= -355.0f) { + D_menu_801CD948++; } break; case 2: - D_EBFBE0_801CD9E8 -= 16; - if (D_EBFBE0_801CD9E8 < 0) { - D_EBFBE0_801CD9E8 = 0; - D_EBFBE0_801CD948++; - D_EBFBE0_801CD9C0 = 20; + D_menu_801CD9E8 -= 16; + if (D_menu_801CD9E8 < 0) { + D_menu_801CD9E8 = 0; + D_menu_801CD948++; + D_menu_801CD9C0 = 20; } break; case 3: - if (D_EBFBE0_801CD9C0 != 0) { + if (D_menu_801CD9C0 != 0) { break; } - D_EBFBE0_801CD948 = 0; - D_EBFBE0_801CD944 = 1; + D_menu_801CD948 = 0; + D_menu_801CD944 = 1; break; } @@ -2225,73 +2214,73 @@ void func_EBFBE0_801A0954(void) { } else { planet[planetId].alpha = 255; } - D_EBFBE0_801CD900[planetId] = 255; + D_menu_801CD900[planetId] = 255; } - D_EBFBE0_801CD970 = 255; + D_menu_801CD970 = 255; func_8001AE58(); - D_EBFBE0_801CD974 = 1; - D_EBFBE0_801CD97C = 1; - D_EBFBE0_801CD948 = 0; - D_EBFBE0_801CD944 = 3; + D_menu_801CD974 = 1; + D_menu_801CD97C = 1; + D_menu_801CD948 = 0; + D_menu_801CD944 = 3; } } -void func_EBFBE0_801A0D14(void) { +void func_menu_801A0D14(void) { s32 i; - static f32 D_EBFBE0_801B694C = 71.0f; - static f32 D_EBFBE0_801B6950 = 205.0f; - static u16* D_EBFBE0_801B6954[] = { + static f32 D_menu_801B694C = 71.0f; + static f32 D_menu_801B6950 = 205.0f; + static u16* D_menu_801B6954[] = { D_6041A80, D_6035780, D_6033080, D_603A580, D_603F380, D_6037E80, D_603CC80, }; - func_EBFBE0_801A116C(); + func_menu_801A116C(); RCP_SetupDL(&gMasterDisp, 0x51); gDPSetPrimColor(gMasterDisp++, 0, 0, 180, 180, 180, 255); - Message_DisplayScrollingText(&gMasterDisp, gMsg_ID_1, D_EBFBE0_801CD9DC, D_EBFBE0_801CD9E0, 218, 70, + Message_DisplayScrollingText(&gMasterDisp, gMsg_ID_1, D_menu_801CD9DC, D_menu_801CD9E0, 218, 70, Message_GetCharCount(gMsg_ID_1)); RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - TextureRect_8bIA(&gMasterDisp, D_6019030, 8, 16, 0.0f, D_EBFBE0_801B694C, 40.0f, 1.66f); - TextureRect_8bIA_MirY(&gMasterDisp, D_6019030, 8, 16, 0.0f, D_EBFBE0_801B6950, 40.0f, 1.68f); + TextureRect_8bIA(&gMasterDisp, D_6019030, 8, 16, 0.0f, D_menu_801B694C, 40.0f, 1.66f); + TextureRect_8bIA_MirY(&gMasterDisp, D_6019030, 8, 16, 0.0f, D_menu_801B6950, 40.0f, 1.68f); func_8003DE68(0x47, 0x76); func_8003DE68(0xCD, 0xEF); RCP_SetupDL(&gMasterDisp, 0x4C); - gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_EBFBE0_801CD9E8); + gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_menu_801CD9E8); for (i = 0; i < 13; i++) { - TextureRect_16bRGBA(&gMasterDisp, D_EBFBE0_801B6954[D_EBFBE0_801CD9F0] + (96 * 4 * i), 96, 4, 109.0f, + TextureRect_16bRGBA(&gMasterDisp, D_menu_801B6954[D_menu_801CD9F0] + (96 * 4 * i), 96, 4, 109.0f, 24.0f + (4.0f * i), 1.0f, 1.0f); } - if ((D_EBFBE0_801CD9E4 != 0) && (D_EBFBE0_801CD9F0 + 1 < 7)) { - gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_EBFBE0_801CD9E4); + if ((D_menu_801CD9E4 != 0) && (D_menu_801CD9F0 + 1 < 7)) { + gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_menu_801CD9E4); for (i = 0; i < 13; i++) { - TextureRect_16bRGBA(&gMasterDisp, D_EBFBE0_801B6954[D_EBFBE0_801CD9F0 + 1] + (i * 96 * 4), 96, 4, 109.0f, + TextureRect_16bRGBA(&gMasterDisp, D_menu_801B6954[D_menu_801CD9F0 + 1] + (i * 96 * 4), 96, 4, 109.0f, 24.0f + (i * 4.0f), 1.0f, 1.0f); } - if (D_EBFBE0_801CD9E4 == 255) { - D_EBFBE0_801CD9E4 = 0; - D_EBFBE0_801CD9F0++; + if (D_menu_801CD9E4 == 255) { + D_menu_801CD9E4 = 0; + D_menu_801CD9F0++; } } } -void func_EBFBE0_801A116C(void) { - static f32 D_EBFBE0_801B6970 = 35.0f; +void func_menu_801A116C(void) { + static f32 D_menu_801B6970 = 35.0f; WingInfo wings; Vec3f dest; Vec3f src; @@ -2306,7 +2295,7 @@ void func_EBFBE0_801A116C(void) { Matrix_RotateX(gCalcMatrix, M_DTOR * -70.0f, 1); Matrix_MultVec3f(gCalcMatrix, &src, &dest); - if (D_EBFBE0_801CD948 >= 2) { + if (D_menu_801CD948 >= 2) { colR -= 10; if (colR < 0) { colR = 0; @@ -2323,12 +2312,12 @@ void func_EBFBE0_801A116C(void) { } RCP_SetupDL(&gMasterDisp, 0x2E); - gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_EBFBE0_801CD9E8); + gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_menu_801CD9E8); } else { RCP_SetupDL(&gMasterDisp, 0x17); } - if ((D_EBFBE0_801CD948 < 2) || (D_EBFBE0_801CD9E8 != 0)) { + if ((D_menu_801CD948 < 2) || (D_menu_801CD9E8 != 0)) { Matrix_Push(&gGfxMatrix); Matrix_LookAt(gGfxMatrix, 0.0f, 0.0f, 430.0f, 0.0f, 180.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -2341,7 +2330,7 @@ void func_EBFBE0_801A116C(void) { Matrix_Scale(gGfxMatrix, 3.0f, 3.0f, 3.0f, 1); Matrix_RotateZ(gGfxMatrix, M_DTOR * -15.0f, 1); - Matrix_RotateX(gGfxMatrix, M_DTOR * D_EBFBE0_801B6970, 1); + Matrix_RotateX(gGfxMatrix, M_DTOR * D_menu_801B6970, 1); Matrix_RotateY(gGfxMatrix, M_DTOR * -90.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -2363,76 +2352,76 @@ void func_EBFBE0_801A116C(void) { Matrix_Pop(&gGfxMatrix); Matrix_Pop(&gGfxMatrix); } - D_EBFBE0_801B6970 += 0.6f; + D_menu_801B6970 += 0.6f; } -f32 D_EBFBE0_801B6974[8] = { -248.0f, -76.0f, 84.0f, 248.0f, -242.0f, -79.0f, 82.0f, 245.0f }; -f32 D_EBFBE0_801B6994[8] = { 80.0f, 80.0f, 80.0f, 80.0f, -30.0f, -30.0f, -30.0f, -30.0f }; -f32 D_EBFBE0_801B69B4[8] = { -455.0f, -455.0f, -455.0f, -455.0f, -455.0f, -455.0f, -455.0f, -455.0f }; +f32 D_menu_801B6974[8] = { -248.0f, -76.0f, 84.0f, 248.0f, -242.0f, -79.0f, 82.0f, 245.0f }; +f32 D_menu_801B6994[8] = { 80.0f, 80.0f, 80.0f, 80.0f, -30.0f, -30.0f, -30.0f, -30.0f }; +f32 D_menu_801B69B4[8] = { -455.0f, -455.0f, -455.0f, -455.0f, -455.0f, -455.0f, -455.0f, -455.0f }; -f32 D_EBFBE0_801B69D4[8] = { -248.0f, -76.0f, 84.0f, 248.0f, -242.0f, -79.0f, 82.0f, 245.0f }; -f32 D_EBFBE0_801B69F4[8] = { 80.0f, 80.0f, 80.0f, 80.0f, -30.0f, -30.0f, -30.0f, -30.0f }; -f32 D_EBFBE0_801B6A14[8] = { 1000.0f, 1000.0f, 1000.0f, 1000.0f, 1000.0f, 1000.0f, 1000.0f, 1000.0f }; +f32 D_menu_801B69D4[8] = { -248.0f, -76.0f, 84.0f, 248.0f, -242.0f, -79.0f, 82.0f, 245.0f }; +f32 D_menu_801B69F4[8] = { 80.0f, 80.0f, 80.0f, 80.0f, -30.0f, -30.0f, -30.0f, -30.0f }; +f32 D_menu_801B6A14[8] = { 1000.0f, 1000.0f, 1000.0f, 1000.0f, 1000.0f, 1000.0f, 1000.0f, 1000.0f }; -f32* D_EBFBE0_801B6A34[2] = { D_EBFBE0_801B69D4, D_EBFBE0_801B6974 }; -f32* D_EBFBE0_801B6A3C[2] = { D_EBFBE0_801B69F4, D_EBFBE0_801B6994 }; -f32* D_EBFBE0_801B6A44[2] = { D_EBFBE0_801B6A14, D_EBFBE0_801B69B4 }; +f32* D_menu_801B6A34[2] = { D_menu_801B69D4, D_menu_801B6974 }; +f32* D_menu_801B6A3C[2] = { D_menu_801B69F4, D_menu_801B6994 }; +f32* D_menu_801B6A44[2] = { D_menu_801B6A14, D_menu_801B69B4 }; -void func_EBFBE0_801A1528(void) { +void func_menu_801A1528(void) { PlanetId planetId; f32 temp; - switch (D_EBFBE0_801CD948) { + switch (D_menu_801CD948) { case 0: - temp = Math_SmoothStepToF(&D_EBFBE0_801CEA9C, 255.0f, D_EBFBE0_801CD9B0, 10.0f, 1.0f); + temp = Math_SmoothStepToF(&D_menu_801CEA9C, 255.0f, D_menu_801CD9B0, 10.0f, 1.0f); - D_EBFBE0_801CD9B0 *= 1.06f; + D_menu_801CD9B0 *= 1.06f; if (temp == 0.0f) { - D_EBFBE0_801CEAA0 = 0.0f; - D_EBFBE0_801CEAA4 = 0.0f; - D_EBFBE0_801CD9B0 = 0.002f; - D_EBFBE0_801CD9B8 = 10; - D_EBFBE0_801CD9BC = 45; - D_EBFBE0_801CD948++; + D_menu_801CEAA0 = 0.0f; + D_menu_801CEAA4 = 0.0f; + D_menu_801CD9B0 = 0.002f; + D_menu_801CD9B8 = 10; + D_menu_801CD9BC = 45; + D_menu_801CD948++; } break; case 1: - if (D_EBFBE0_801CD9B8 != 0) { + if (D_menu_801CD9B8 != 0) { break; } - Math_SmoothStepToF(&D_EBFBE0_801CEA9C, 0.0f, D_EBFBE0_801CD9B4, 50.0f, 0.1f); - D_EBFBE0_801CD9B4 *= 1.06f; + Math_SmoothStepToF(&D_menu_801CEA9C, 0.0f, D_menu_801CD9B4, 50.0f, 0.1f); + D_menu_801CD9B4 *= 1.06f; - if (D_EBFBE0_801CD9BC != 0) { + if (D_menu_801CD9BC != 0) { break; } - Math_SmoothStepToF(&D_EBFBE0_801CEAA0, 144.0f, D_EBFBE0_801CD9B0, 50.0f, 0.1f); - temp = Math_SmoothStepToF(&D_EBFBE0_801CEAA4, 255.0f, D_EBFBE0_801CD9B0, 50.0f, 0.1f); - D_EBFBE0_801CD9B0 *= 1.09f; + Math_SmoothStepToF(&D_menu_801CEAA0, 144.0f, D_menu_801CD9B0, 50.0f, 0.1f); + temp = Math_SmoothStepToF(&D_menu_801CEAA4, 255.0f, D_menu_801CD9B0, 50.0f, 0.1f); + D_menu_801CD9B0 *= 1.09f; for (planetId = 0; planetId < PLANET_MAX; planetId++) { if ((planetId == PLANET_SECTOR_Z) || (planetId == PLANET_SECTOR_X) || (planetId == PLANET_SECTOR_Y)) { - planet[planetId].alpha = D_EBFBE0_801CEAA0; + planet[planetId].alpha = D_menu_801CEAA0; } else { - planet[planetId].alpha = D_EBFBE0_801CEAA4; - D_EBFBE0_801CD970 = D_EBFBE0_801CEAA4; + planet[planetId].alpha = D_menu_801CEAA4; + D_menu_801CD970 = D_menu_801CEAA4; } - D_EBFBE0_801CD900[planetId] = D_EBFBE0_801CEAA4; + D_menu_801CD900[planetId] = D_menu_801CEAA4; } - if (D_EBFBE0_801CEAA0 > 32) { - D_EBFBE0_801CD974 = 1; + if (D_menu_801CEAA0 > 32) { + D_menu_801CD974 = 1; } if (temp == 0.0f) { Audio_PlaySfx(0x4900001FU, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801CD948 = 0; - D_EBFBE0_801CD97C = 1; - D_EBFBE0_801CD944 = 3; + D_menu_801CD948 = 0; + D_menu_801CD97C = 1; + D_menu_801CD944 = 3; } break; } @@ -2446,20 +2435,20 @@ void func_EBFBE0_801A1528(void) { } else { planet[planetId].alpha = 255; } - D_EBFBE0_801CD900[planetId] = 255; + D_menu_801CD900[planetId] = 255; } - D_EBFBE0_801CD970 = 255; - D_EBFBE0_801CD944 = 3; - D_EBFBE0_801CD97C = 1; + D_menu_801CD970 = 255; + D_menu_801CD944 = 3; + D_menu_801CD97C = 1; } } -void func_EBFBE0_801A19A8(void) { +void func_menu_801A19A8(void) { s32 i; RCP_SetupDL(&gMasterDisp, 0x53); - gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, (s32) D_EBFBE0_801CEA9C); + gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, (s32) D_menu_801CEA9C); for (i = 0; i < 4; i++) { TextureRect_8bIA(&gMasterDisp, D_600D590 + (i * 168 * 4), 168, 4, 72.0f, 104.0f + (4.0f * i), 1.0f, 1.0f); @@ -2467,68 +2456,68 @@ void func_EBFBE0_801A19A8(void) { TextureRect_8bIA(&gMasterDisp, D_600D590 + (168 * 16), 168, 3, 72.0f, 104.0f + 16.0f, 1.0f, 1.0f); } -void func_EBFBE0_801A1AE8(void) { +void func_menu_801A1AE8(void) { f32 x; f32 y; f32 z; - D_EBFBE0_801CEA64 = 0.04f; + D_menu_801CEA64 = 0.04f; - D_EBFBE0_801CEA54 = func_EBFBE0_801A25C8(sCurrentPlanetId); + D_menu_801CEA54 = func_menu_801A25C8(sCurrentPlanetId); - D_EBFBE0_801CDA40.x = planet[sCurrentPlanetId].posX; - D_EBFBE0_801CDA40.y = planet[sCurrentPlanetId].posY; - D_EBFBE0_801CDA40.z = planet[sCurrentPlanetId].posZ; + D_menu_801CDA40.x = planet[sCurrentPlanetId].posX; + D_menu_801CDA40.y = planet[sCurrentPlanetId].posY; + D_menu_801CDA40.z = planet[sCurrentPlanetId].posZ; - D_EBFBE0_801CDA50.x = planet[sCurrentPlanetId].posX; - D_EBFBE0_801CDA50.y = planet[sCurrentPlanetId].posY; - D_EBFBE0_801CDA50.z = D_EBFBE0_801CDA40.z + D_EBFBE0_801CEA54; + D_menu_801CDA50.x = planet[sCurrentPlanetId].posX; + D_menu_801CDA50.y = planet[sCurrentPlanetId].posY; + D_menu_801CDA50.z = D_menu_801CDA40.z + D_menu_801CEA54; - D_EBFBE0_801CDA2C = D_EBFBE0_801CDA00; - D_EBFBE0_801CDA30 = D_EBFBE0_801CDA04; + D_menu_801CDA2C = D_menu_801CDA00; + D_menu_801CDA30 = D_menu_801CDA04; - D_EBFBE0_801CDA34 = D_EBFBE0_801CD9F4; - D_EBFBE0_801CDA38 = D_EBFBE0_801CD9F8; + D_menu_801CDA34 = D_menu_801CD9F4; + D_menu_801CDA38 = D_menu_801CD9F8; - x = D_EBFBE0_801CDA50.x - D_EBFBE0_801CD9F4; - y = D_EBFBE0_801CDA50.y - D_EBFBE0_801CD9F8; - z = D_EBFBE0_801CDA50.z - D_EBFBE0_801CD9FC; + x = D_menu_801CDA50.x - D_menu_801CD9F4; + y = D_menu_801CDA50.y - D_menu_801CD9F8; + z = D_menu_801CDA50.z - D_menu_801CD9FC; - D_EBFBE0_801CEA68 = sqrtf(SQ(x) + SQ(y) + SQ(z)); + D_menu_801CEA68 = sqrtf(SQ(x) + SQ(y) + SQ(z)); } -// needs D_EBFBE0_801CD900 to be static +// needs D_menu_801CD900 to be static #if defined(IMPORT_BSS) || defined(NON_MATCHING) -void func_EBFBE0_801A1C14(void) { +void func_menu_801A1C14(void) { s32 i; - switch (D_EBFBE0_801CD948) { + switch (D_menu_801CD948) { case 0: - func_EBFBE0_801A1AE8(); + func_menu_801A1AE8(); - D_EBFBE0_801CD94C = 0; - D_EBFBE0_801CD9C4 = 0; - D_EBFBE0_801CEA88 = 0.0f; - D_EBFBE0_801CEA8C = 0.0f; - D_EBFBE0_801CEA90 = -400.0f; + D_menu_801CD94C = 0; + D_menu_801CD9C4 = 0; + D_menu_801CEA88 = 0.0f; + D_menu_801CEA8C = 0.0f; + D_menu_801CEA90 = -400.0f; - D_EBFBE0_801CEA78 = 0.05f; - D_EBFBE0_801CEA7C = 0.05f; - D_EBFBE0_801CEA80 = 0.05f; - D_EBFBE0_801CEA84 = 0.05f; - D_EBFBE0_801CEA94 = 0.0f; - D_EBFBE0_801CEA98 = 0; - D_EBFBE0_801CD95C = 10; - D_EBFBE0_801CD97C = 0; + D_menu_801CEA78 = 0.05f; + D_menu_801CEA7C = 0.05f; + D_menu_801CEA80 = 0.05f; + D_menu_801CEA84 = 0.05f; + D_menu_801CEA94 = 0.0f; + D_menu_801CEA98 = 0; + D_menu_801CD95C = 10; + D_menu_801CD97C = 0; if (sCurrentPlanetId == PLANET_CORNERIA) { - D_EBFBE0_801CD95C = 5; + D_menu_801CD95C = 5; } - D_EBFBE0_801CD9D8 = 0; + D_menu_801CD9D8 = 0; for (i = 0; i < 24; i++) { - D_EBFBE0_801AFD18[i].unk_18 = 0; + D_menu_801AFD18[i].unk_18 = 0; } D_80178410 = 0; @@ -2537,171 +2526,171 @@ void func_EBFBE0_801A1C14(void) { D_80178354 = 255; D_80178340 = 0; - D_EBFBE0_801CEB3C = 0.0f; - D_EBFBE0_801CEB38 = 255; + D_menu_801CEB3C = 0.0f; + D_menu_801CEB38 = 255; - D_EBFBE0_801CD948++; + D_menu_801CD948++; break; case 1: - if (D_EBFBE0_801CD95C == 0) { + if (D_menu_801CD95C == 0) { if (sCurrentPlanetId == PLANET_CORNERIA) { D_80178340 = 0; - D_EBFBE0_801CD948 = 10; + D_menu_801CD948 = 10; Audio_PlaySfx(0x0940A00BU, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } else { Audio_PlaySfx(0x19003012U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801CD948++; + D_menu_801CD948++; } } else { if (sCurrentPlanetId == PLANET_CORNERIA) { D_80178340 ^= 0xFF; - if (D_EBFBE0_801CD95C == 2) { - D_EBFBE0_801CEB34 = 0; + if (D_menu_801CD95C == 2) { + D_menu_801CEB34 = 0; } } - D_EBFBE0_801CD95C--; + D_menu_801CD95C--; } break; case 10: - if (D_EBFBE0_801CEB34 == 4) { + if (D_menu_801CEB34 == 4) { Audio_PlaySfx(0x19003012U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801CD948 = 2; + D_menu_801CD948 = 2; } break; case 2: - func_EBFBE0_801A2674(); - if ((D_EBFBE0_801CD9FC == D_EBFBE0_801CDA50.z) && (D_EBFBE0_801CD9D8 == 0)) { + func_menu_801A2674(); + if ((D_menu_801CD9FC == D_menu_801CDA50.z) && (D_menu_801CD9D8 == 0)) { Audio_PlaySfx(0x19004013U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801CD9D8 = 1; + D_menu_801CD9D8 = 1; if (sCurrentPlanetId == PLANET_CORNERIA) { - D_EBFBE0_801CEB48[0] = 1; + D_menu_801CEB48[0] = 1; for (i = 0; i < 10; i++) { - D_EBFBE0_801CEB58[0][i] = Rand_ZeroOne() * 3.0f; - D_EBFBE0_801CEBD0[0][i] = 255; - D_EBFBE0_801CEC48[0][i] = 0.0f; - D_EBFBE0_801CECC0[0][i] = 0.5f + (Rand_ZeroOne() * 0.3f); - D_EBFBE0_801CEE28[0][i] = 1 + (s32) (Rand_ZeroOne() * 4.0f); - D_EBFBE0_801CED38[0][i] = 110.0f + (s32) (Rand_ZeroOne() * 30.0f); - D_EBFBE0_801CEDB0[0][i] = -10.0f + (Rand_ZeroOne() * -60.0f); + D_menu_801CEB58[0][i] = Rand_ZeroOne() * 3.0f; + D_menu_801CEBD0[0][i] = 255; + D_menu_801CEC48[0][i] = 0.0f; + D_menu_801CECC0[0][i] = 0.5f + (Rand_ZeroOne() * 0.3f); + D_menu_801CEE28[0][i] = 1 + (s32) (Rand_ZeroOne() * 4.0f); + D_menu_801CED38[0][i] = 110.0f + (s32) (Rand_ZeroOne() * 30.0f); + D_menu_801CEDB0[0][i] = -10.0f + (Rand_ZeroOne() * -60.0f); } } } - if ((D_EBFBE0_801CDA34 == D_EBFBE0_801CDA50.x) && (D_EBFBE0_801CDA38 == D_EBFBE0_801CDA50.y) && - (D_EBFBE0_801CD9FC == D_EBFBE0_801CDA50.z) && (D_EBFBE0_801CDA08 == D_EBFBE0_801CDA40.z)) { + if ((D_menu_801CDA34 == D_menu_801CDA50.x) && (D_menu_801CDA38 == D_menu_801CDA50.y) && + (D_menu_801CD9FC == D_menu_801CDA50.z) && (D_menu_801CDA08 == D_menu_801CDA40.z)) { - D_EBFBE0_801CD964 = 1; - D_EBFBE0_801CD96C = 1; + D_menu_801CD964 = 1; + D_menu_801CD96C = 1; for (i = 0; i < 15; i++) { - D_EBFBE0_801CD900[i] = 0; + D_menu_801CD900[i] = 0; } - D_EBFBE0_801CD970 = 0; + D_menu_801CD970 = 0; - if (func_EBFBE0_801A2304()) { - D_EBFBE0_801CD948 = 3; + if (func_menu_801A2304()) { + D_menu_801CD948 = 3; } } break; case 20: if (gControllerPress[gMainController].button & START_BUTTON) { - D_EBFBE0_801CD948 = 21; + D_menu_801CD948 = 21; } if (gControllerHold[gMainController].button & R_TRIG) { - D_EBFBE0_801CD9FC += 10.0f; + D_menu_801CD9FC += 10.0f; } if (gControllerHold[gMainController].button & Z_TRIG) { - if (D_EBFBE0_801CD9FC - 10.0f > D_EBFBE0_801CDA08) { - D_EBFBE0_801CD9FC -= 10.0f; + if (D_menu_801CD9FC - 10.0f > D_menu_801CDA08) { + D_menu_801CD9FC -= 10.0f; } } break; case 21: - D_EBFBE0_801CD964 = 1; - D_EBFBE0_801CD96C = 1; + D_menu_801CD964 = 1; + D_menu_801CD96C = 1; for (i = 0; i < 15; i++) { - D_EBFBE0_801CD900[i] = 0; + D_menu_801CD900[i] = 0; } - D_EBFBE0_801CD970 = 0; + D_menu_801CD970 = 0; - if (func_EBFBE0_801A2304()) { - D_EBFBE0_801CD948 = 3; + if (func_menu_801A2304()) { + D_menu_801CD948 = 3; } break; case 3: - D_EBFBE0_801CD948 = 0; - D_EBFBE0_801CD944 = 4; + D_menu_801CD948 = 0; + D_menu_801CD944 = 4; break; } - D_EBFBE0_801CD9C4++; + D_menu_801CD9C4++; } #else -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_menu/fox_map/func_EBFBE0_801A1C14.s") +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_menu/fox_map/func_menu_801A1C14.s") #endif -bool func_EBFBE0_801A2304(void) { +bool func_menu_801A2304(void) { s32 ret = false; f32 sp28; f32 sp24; f32 sp20; f32 temp_fv0; - switch (D_EBFBE0_801CD94C) { + switch (D_menu_801CD94C) { case 0: func_8001ACDC(3); - D_EBFBE0_801CEA78 += 2.9f; - D_EBFBE0_801CEA80 += 2.9f; - if (D_EBFBE0_801CEA78 > 5.5f) { - D_EBFBE0_801CEA78 = 5.5f; - D_EBFBE0_801CEA80 = 4.6f; - D_EBFBE0_801CD94C += 1; - D_EBFBE0_801CD9B8 = 0xD; + D_menu_801CEA78 += 2.9f; + D_menu_801CEA80 += 2.9f; + if (D_menu_801CEA78 > 5.5f) { + D_menu_801CEA78 = 5.5f; + D_menu_801CEA80 = 4.6f; + D_menu_801CD94C += 1; + D_menu_801CD9B8 = 0xD; } break; case 1: - D_EBFBE0_801CEA78 -= 2.5f; - D_EBFBE0_801CEA98 += 0xA; - D_EBFBE0_801CEA80 -= 2.5f; + D_menu_801CEA78 -= 2.5f; + D_menu_801CEA98 += 0xA; + D_menu_801CEA80 -= 2.5f; - if (D_EBFBE0_801CEA78 < 5.0f) { - D_EBFBE0_801CEA78 = 5.0f; + if (D_menu_801CEA78 < 5.0f) { + D_menu_801CEA78 = 5.0f; } - if (D_EBFBE0_801CEA80 < 3.9f) { - D_EBFBE0_801CEA80 = 3.9f; + if (D_menu_801CEA80 < 3.9f) { + D_menu_801CEA80 = 3.9f; } - D_EBFBE0_801CEA7C += 2.5f; - D_EBFBE0_801CEA84 += 2.5f; + D_menu_801CEA7C += 2.5f; + D_menu_801CEA84 += 2.5f; - if (D_EBFBE0_801CEA7C > 5.0f) { - D_EBFBE0_801CEA7C = 5.0f; + if (D_menu_801CEA7C > 5.0f) { + D_menu_801CEA7C = 5.0f; } - if (D_EBFBE0_801CEA84 > 3.9f) { - D_EBFBE0_801CEA84 = 3.9f; + if (D_menu_801CEA84 > 3.9f) { + D_menu_801CEA84 = 3.9f; } - if (D_EBFBE0_801CD9B8 == 0) { - D_EBFBE0_801CEA98 = 0xFF; - D_EBFBE0_801CD94C = 0x64; + if (D_menu_801CD9B8 == 0) { + D_menu_801CEA98 = 0xFF; + D_menu_801CD94C = 0x64; } break; case 100: - sp28 = Math_SmoothStepToF(&D_EBFBE0_801CEA88, -206.0f, 0.4f, 100.0f, 1.0f); - sp24 = Math_SmoothStepToF(&D_EBFBE0_801CEA8C, 51.0f, 0.4f, 100.0f, 1.0f); - sp20 = Math_SmoothStepToF(&D_EBFBE0_801CEA90, -627.0f, 0.4f, 100.0f, 1.0f); - temp_fv0 = Math_SmoothStepToF(&D_EBFBE0_801CEA94, 42.8f, 0.4f, 100.0f, 1.0f); + sp28 = Math_SmoothStepToF(&D_menu_801CEA88, -206.0f, 0.4f, 100.0f, 1.0f); + sp24 = Math_SmoothStepToF(&D_menu_801CEA8C, 51.0f, 0.4f, 100.0f, 1.0f); + sp20 = Math_SmoothStepToF(&D_menu_801CEA90, -627.0f, 0.4f, 100.0f, 1.0f); + temp_fv0 = Math_SmoothStepToF(&D_menu_801CEA94, 42.8f, 0.4f, 100.0f, 1.0f); if ((sp28 == 0.0f) && (sp24 == 0.0f) && (sp20 == 0.0f) && (temp_fv0 == 0.0f)) { ret = true; } @@ -2711,7 +2700,7 @@ bool func_EBFBE0_801A2304(void) { return ret; } -f32 func_EBFBE0_801A25C8(PlanetId planetId) { +f32 func_menu_801A25C8(PlanetId planetId) { f32 sp4; switch (planetId) { @@ -2761,20 +2750,20 @@ f32 func_EBFBE0_801A25C8(PlanetId planetId) { return sp4; } -void func_EBFBE0_801A2674(void) { +void func_menu_801A2674(void) { s32 i; - func_EBFBE0_801A48C0(D_EBFBE0_801CEA64); + func_menu_801A48C0(D_menu_801CEA64); - func_EBFBE0_801A4A38(D_EBFBE0_801CEA64); + func_menu_801A4A38(D_menu_801CEA64); - D_EBFBE0_801CEA64 *= 1.03f; + D_menu_801CEA64 *= 1.03f; for (i = 0; i < 15; i++) { - D_EBFBE0_801CD900[i] -= 16; + D_menu_801CD900[i] -= 16; - if (D_EBFBE0_801CD900[i] < 0) { - D_EBFBE0_801CD900[i] = 0; + if (D_menu_801CD900[i] < 0) { + D_menu_801CD900[i] = 0; } if (i == sCurrentPlanetId) { @@ -2793,104 +2782,102 @@ void func_EBFBE0_801A2674(void) { continue; } - D_EBFBE0_801AFD18[i].unk_18 -= 16; + D_menu_801AFD18[i].unk_18 -= 16; - if (D_EBFBE0_801AFD18[i].unk_18 < 0) { - D_EBFBE0_801AFD18[i].unk_18 = 0; + if (D_menu_801AFD18[i].unk_18 < 0) { + D_menu_801AFD18[i].unk_18 = 0; } } if (sCurrentPlanetId == 2) { - Math_SmoothStepToF(&D_EBFBE0_801AFFF8, 20.0f, 0.05f, 100.0f, 0.1f); + Math_SmoothStepToF(&D_menu_801AFFF8, 20.0f, 0.05f, 100.0f, 0.1f); } if (sCurrentPlanetId == 1) { - Math_SmoothStepToF(&D_EBFBE0_801B0000, 15.0f, 0.05f, 100.0f, 0.1f); + Math_SmoothStepToF(&D_menu_801B0000, 15.0f, 0.05f, 100.0f, 0.1f); } - D_EBFBE0_801CD970 -= 16; - if (D_EBFBE0_801CD970 < 0) { - D_EBFBE0_801CD970 = 0; + D_menu_801CD970 -= 16; + if (D_menu_801CD970 < 0) { + D_menu_801CD970 = 0; } func_800182F4(0x102D00FF); func_800182F4(0x112D00FF); } -void func_EBFBE0_801A281C(void) { +void func_menu_801A281C(void) { D_80178348 = 0; D_80178350 = 0; D_80178354 = 0; D_80178340 = 255; - D_EBFBE0_801CD988 = 5; - D_EBFBE0_801CEED8 = 0; - D_EBFBE0_801CEEDC = 0.0f; - D_EBFBE0_801CEEE0 = 0.04f; + D_menu_801CD988 = 5; + D_menu_801CEED8 = 0; + D_menu_801CEEDC = 0.0f; + D_menu_801CEEE0 = 0.04f; - D_EBFBE0_801CEEE8[0].x = D_EBFBE0_801CEEE8[1].x = D_EBFBE0_801CD9F4; - D_EBFBE0_801CEEE8[0].y = D_EBFBE0_801CEEE8[1].y = D_EBFBE0_801CD9F8; - D_EBFBE0_801CEEE8[0].z = D_EBFBE0_801CEEE8[1].z = D_EBFBE0_801CD9FC; + D_menu_801CEEE8[0].x = D_menu_801CEEE8[1].x = D_menu_801CD9F4; + D_menu_801CEEE8[0].y = D_menu_801CEEE8[1].y = D_menu_801CD9F8; + D_menu_801CEEE8[0].z = D_menu_801CEEE8[1].z = D_menu_801CD9FC; - D_EBFBE0_801CEF58[0].x = D_EBFBE0_801CEF58[1].x = D_EBFBE0_801CDA00; - D_EBFBE0_801CEF58[0].y = D_EBFBE0_801CEF58[1].y = D_EBFBE0_801CDA04; - D_EBFBE0_801CEF58[0].z = D_EBFBE0_801CEF58[1].z = D_EBFBE0_801CDA08; + D_menu_801CEF58[0].x = D_menu_801CEF58[1].x = D_menu_801CDA00; + D_menu_801CEF58[0].y = D_menu_801CEF58[1].y = D_menu_801CDA04; + D_menu_801CEF58[0].z = D_menu_801CEF58[1].z = D_menu_801CDA08; - D_EBFBE0_801CEF58[5].x = D_EBFBE0_801CEF58[4].x = D_EBFBE0_801CEF58[3].x = D_EBFBE0_801CEF58[2].x = - planet[D_EBFBE0_801CD958].posX; - D_EBFBE0_801CEF58[5].y = D_EBFBE0_801CEF58[4].y = D_EBFBE0_801CEF58[3].y = D_EBFBE0_801CEF58[2].y = - planet[D_EBFBE0_801CD958].posY; - D_EBFBE0_801CEF58[5].z = D_EBFBE0_801CEF58[4].z = D_EBFBE0_801CEF58[3].z = D_EBFBE0_801CEF58[2].z = - planet[D_EBFBE0_801CD958].posZ; + D_menu_801CEF58[5].x = D_menu_801CEF58[4].x = D_menu_801CEF58[3].x = D_menu_801CEF58[2].x = + planet[D_menu_801CD958].posX; + D_menu_801CEF58[5].y = D_menu_801CEF58[4].y = D_menu_801CEF58[3].y = D_menu_801CEF58[2].y = + planet[D_menu_801CD958].posY; + D_menu_801CEF58[5].z = D_menu_801CEF58[4].z = D_menu_801CEF58[3].z = D_menu_801CEF58[2].z = + planet[D_menu_801CD958].posZ; - D_EBFBE0_801CDA0C = -46.5f; - D_EBFBE0_801CDA10 = 0.0f; - D_EBFBE0_801CDA14 = 500.0f; + D_menu_801CDA0C = -46.5f; + D_menu_801CDA10 = 0.0f; + D_menu_801CDA14 = 500.0f; - func_EBFBE0_801AD718(D_EBFBE0_801CEF58[2].x, D_EBFBE0_801CEF58[2].y, D_EBFBE0_801CEF58[2].z, - &D_EBFBE0_801CEEE8[2].x, &D_EBFBE0_801CEEE8[2].y, &D_EBFBE0_801CEEE8[2].z, D_EBFBE0_801CDA14, - D_EBFBE0_801CDA0C, D_EBFBE0_801CDA10); + func_menu_801AD718(D_menu_801CEF58[2].x, D_menu_801CEF58[2].y, D_menu_801CEF58[2].z, &D_menu_801CEEE8[2].x, + &D_menu_801CEEE8[2].y, &D_menu_801CEEE8[2].z, D_menu_801CDA14, D_menu_801CDA0C, D_menu_801CDA10); - D_EBFBE0_801CEEE8[5].x = D_EBFBE0_801CEEE8[4].x = D_EBFBE0_801CEEE8[3].x = D_EBFBE0_801CEEE8[2].x; - D_EBFBE0_801CEEE8[5].y = D_EBFBE0_801CEEE8[4].y = D_EBFBE0_801CEEE8[3].y = D_EBFBE0_801CEEE8[2].y; - D_EBFBE0_801CEEE8[5].z = D_EBFBE0_801CEEE8[4].z = D_EBFBE0_801CEEE8[3].z = D_EBFBE0_801CEEE8[2].z; + D_menu_801CEEE8[5].x = D_menu_801CEEE8[4].x = D_menu_801CEEE8[3].x = D_menu_801CEEE8[2].x; + D_menu_801CEEE8[5].y = D_menu_801CEEE8[4].y = D_menu_801CEEE8[3].y = D_menu_801CEEE8[2].y; + D_menu_801CEEE8[5].z = D_menu_801CEEE8[4].z = D_menu_801CEEE8[3].z = D_menu_801CEEE8[2].z; - D_EBFBE0_801CEF58[7].x = D_EBFBE0_801CEF58[6].x = -150.552155f; - D_EBFBE0_801CEF58[7].y = D_EBFBE0_801CEF58[6].y = -489.679993f; - D_EBFBE0_801CEF58[7].z = D_EBFBE0_801CEF58[6].z = 0.0f; + D_menu_801CEF58[7].x = D_menu_801CEF58[6].x = -150.552155f; + D_menu_801CEF58[7].y = D_menu_801CEF58[6].y = -489.679993f; + D_menu_801CEF58[7].z = D_menu_801CEF58[6].z = 0.0f; - D_EBFBE0_801CDA0C = -42.750008f; - D_EBFBE0_801CDA10 = -9.849999f; - D_EBFBE0_801CDA14 = 3375.000000f; + D_menu_801CDA0C = -42.750008f; + D_menu_801CDA10 = -9.849999f; + D_menu_801CDA14 = 3375.000000f; - func_EBFBE0_801AD718(D_EBFBE0_801CEF58[6].x, D_EBFBE0_801CEF58[6].y, D_EBFBE0_801CEF58[6].z, - &D_EBFBE0_801CEEE8[6].x, &D_EBFBE0_801CEEE8[6].y, &D_EBFBE0_801CEEE8[6].z, D_EBFBE0_801CDA14, - D_EBFBE0_801CDA0C, D_EBFBE0_801CDA10); + func_menu_801AD718(D_menu_801CEF58[6].x, D_menu_801CEF58[6].y, D_menu_801CEF58[6].z, &D_menu_801CEEE8[6].x, + &D_menu_801CEEE8[6].y, &D_menu_801CEEE8[6].z, D_menu_801CDA14, D_menu_801CDA0C, D_menu_801CDA10); - D_EBFBE0_801CEEE8[7].x = D_EBFBE0_801CEEE8[6].x; - D_EBFBE0_801CEEE8[7].y = D_EBFBE0_801CEEE8[6].y; - D_EBFBE0_801CEEE8[7].z = D_EBFBE0_801CEEE8[6].z; + D_menu_801CEEE8[7].x = D_menu_801CEEE8[6].x; + D_menu_801CEEE8[7].y = D_menu_801CEEE8[6].y; + D_menu_801CEEE8[7].z = D_menu_801CEEE8[6].z; - D_EBFBE0_801CEECC = func_EBFBE0_801A655C(sCurrentPlanetId, D_EBFBE0_801CD958); + D_menu_801CEECC = func_menu_801A655C(sCurrentPlanetId, D_menu_801CD958); - if (D_EBFBE0_801CD93C == 2) { - D_80177BD8[D_EBFBE0_801CEECC] = 5; - D_EBFBE0_801AFD18[D_EBFBE0_801CEECC].unk_14 = 5; + if (D_menu_801CD93C == 2) { + D_80177BD8[D_menu_801CEECC] = 5; + D_menu_801AFD18[D_menu_801CEECC].unk_14 = 5; } else { - D_80177BD8[D_EBFBE0_801CEECC] = 2; - D_EBFBE0_801AFD18[D_EBFBE0_801CEECC].unk_14 = 1; + D_80177BD8[D_menu_801CEECC] = 2; + D_menu_801AFD18[D_menu_801CEECC].unk_14 = 1; } } -// needs D_EBFBE0_801CD900 to be static bss +// needs D_menu_801CD900 to be static bss #if defined(IMPORT_BSS) || defined(NON_MATCHING) -void func_EBFBE0_801A2B8C(void) { +void func_menu_801A2B8C(void) { s32 i; - switch (D_EBFBE0_801CD94C) { + switch (D_menu_801CD94C) { case 0: - func_EBFBE0_801A281C(); - D_EBFBE0_801CD94C = 100; + func_menu_801A281C(); + D_menu_801CD94C = 100; break; case 100: @@ -2900,36 +2887,36 @@ void func_EBFBE0_801A2B8C(void) { D_80178340 = 0; } } else { - D_EBFBE0_801CD9C0 = 30; + D_menu_801CD9C0 = 30; - if ((D_EBFBE0_801CD98C == 1) || (D_EBFBE0_801CD980 == 1)) { + if ((D_menu_801CD98C == 1) || (D_menu_801CD980 == 1)) { D_80178348 = 255; D_80178350 = 255; D_80178354 = 255; D_80178340 = 0; - D_EBFBE0_801CD984 = 0; - D_EBFBE0_801CD94C = 10; + D_menu_801CD984 = 0; + D_menu_801CD94C = 10; break; } - D_EBFBE0_801CD9C4 = 0; - D_EBFBE0_801CD94C = 1; + D_menu_801CD9C4 = 0; + D_menu_801CD94C = 1; } break; case 10: - if (D_EBFBE0_801CD9C0 != 0) { + if (D_menu_801CD9C0 != 0) { break; } - if ((D_EBFBE0_801CD984 == 255) && (D_80178340 == 0)) { - D_EBFBE0_801CD980 = 0; - D_EBFBE0_801CD9C0 = 30; - D_EBFBE0_801CD94C = 20; - } else if (D_EBFBE0_801CD988 != 0) { + if ((D_menu_801CD984 == 255) && (D_80178340 == 0)) { + D_menu_801CD980 = 0; + D_menu_801CD9C0 = 30; + D_menu_801CD94C = 20; + } else if (D_menu_801CD988 != 0) { D_80178340 ^= 255; - D_EBFBE0_801CD988--; + D_menu_801CD988--; } else { - D_EBFBE0_801CD988 = 0; + D_menu_801CD988 = 0; if (D_80178340 != 0) { D_80178340 -= 21; @@ -2938,124 +2925,123 @@ void func_EBFBE0_801A2B8C(void) { } } - D_EBFBE0_801CD984 += 8; + D_menu_801CD984 += 8; - if (D_EBFBE0_801CD984 > 255) { + if (D_menu_801CD984 > 255) { D_80178340 = 0; - D_EBFBE0_801CD984 = 255; + D_menu_801CD984 = 255; } } break; case 20: - if (D_EBFBE0_801CD9C0 != 0) { + if (D_menu_801CD9C0 != 0) { break; } - if ((D_EBFBE0_801CD98C == 1) || (D_EBFBE0_801CD980 == 1)) { + if ((D_menu_801CD98C == 1) || (D_menu_801CD980 == 1)) { break; } - D_EBFBE0_801CD9C4 = 0; - D_EBFBE0_801CD9C0 = 30; - D_EBFBE0_801CD94C = 1; + D_menu_801CD9C4 = 0; + D_menu_801CD9C0 = 30; + D_menu_801CD94C = 1; break; case 1: - if (D_EBFBE0_801CD9C0 != 0) { + if (D_menu_801CD9C0 != 0) { break; } - func_EBFBE0_801A2EB8(); + func_menu_801A2EB8(); break; case 2: - if (D_EBFBE0_801CD9C0 != 0) { + if (D_menu_801CD9C0 != 0) { break; } for (i = 0; i < 15; i++) { - D_EBFBE0_801CD900[i] = 255; + D_menu_801CD900[i] = 255; } - D_EBFBE0_801CD9C0 = 0; - D_EBFBE0_801CD94C++; + D_menu_801CD9C0 = 0; + D_menu_801CD94C++; break; case 3: - if (D_EBFBE0_801CD9C0 != 0) { + if (D_menu_801CD9C0 != 0) { break; } - D_EBFBE0_801CEFC8 = 1; - D_EBFBE0_801CD97C = 1; - D_EBFBE0_801CD94C = 0; - D_EBFBE0_801CD944 = 3; + D_menu_801CEFC8 = 1; + D_menu_801CD97C = 1; + D_menu_801CD94C = 0; + D_menu_801CD944 = 3; break; } - func_800B6F50(D_EBFBE0_801CD9F4, D_EBFBE0_801CD9F8, D_EBFBE0_801CD9FC, D_EBFBE0_801CDA00, D_EBFBE0_801CDA04, - D_EBFBE0_801CDA08); + func_800B6F50(D_menu_801CD9F4, D_menu_801CD9F8, D_menu_801CD9FC, D_menu_801CDA00, D_menu_801CDA04, D_menu_801CDA08); - D_EBFBE0_801CD9C4++; + D_menu_801CD9C4++; } #else -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_menu/fox_map/func_EBFBE0_801A2B8C.s") +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_menu/fox_map/func_menu_801A2B8C.s") #endif -void func_EBFBE0_801A2EB8(void) { +void func_menu_801A2EB8(void) { s32 i; s32 temp1; s32 temp2; - if (D_EBFBE0_801CD9C4 == 30) { - if (D_EBFBE0_801CD93C == 2) { + if (D_menu_801CD9C4 == 30) { + if (D_menu_801CD93C == 2) { Audio_PlaySfx(0x0900802AU, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } else { Audio_PlaySfx(0x09000032U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } } - func_EBFBE0_801A3440(D_EBFBE0_801CEEE0); + func_menu_801A3440(D_menu_801CEEE0); - if (D_EBFBE0_801CD9C4 == 80) { - sCurrentPlanetId = D_EBFBE0_801CD958; + if (D_menu_801CD9C4 == 80) { + sCurrentPlanetId = D_menu_801CD958; D_80177B90[gCurrentPlanet] = sCurrentPlanetId; - func_EBFBE0_801A6368(); + func_menu_801A6368(); } - if (D_EBFBE0_801CD9C4 < 80) { - D_EBFBE0_801AFD18[D_EBFBE0_801CEECC].unk_18 += 16; - if (D_EBFBE0_801AFD18[D_EBFBE0_801CEECC].unk_18 > 255) { - D_EBFBE0_801AFD18[D_EBFBE0_801CEECC].unk_18 = 255; + if (D_menu_801CD9C4 < 80) { + D_menu_801AFD18[D_menu_801CEECC].unk_18 += 16; + if (D_menu_801AFD18[D_menu_801CEECC].unk_18 > 255) { + D_menu_801AFD18[D_menu_801CEECC].unk_18 = 255; } - planet[D_EBFBE0_801CD958].alpha += 16; - if ((D_EBFBE0_801CD958 == PLANET_SECTOR_Z) || (D_EBFBE0_801CD958 == PLANET_SECTOR_X) || - (D_EBFBE0_801CD958 == PLANET_SECTOR_Y)) { - if (planet[D_EBFBE0_801CD958].alpha > 144) { - planet[D_EBFBE0_801CD958].alpha = 144; + planet[D_menu_801CD958].alpha += 16; + if ((D_menu_801CD958 == PLANET_SECTOR_Z) || (D_menu_801CD958 == PLANET_SECTOR_X) || + (D_menu_801CD958 == PLANET_SECTOR_Y)) { + if (planet[D_menu_801CD958].alpha > 144) { + planet[D_menu_801CD958].alpha = 144; } - } else if (planet[D_EBFBE0_801CD958].alpha > 255) { - planet[D_EBFBE0_801CD958].alpha = 255; + } else if (planet[D_menu_801CD958].alpha > 255) { + planet[D_menu_801CD958].alpha = 255; } } else { - D_EBFBE0_801CD970 += 16; - if (D_EBFBE0_801CD970 > 255) { - D_EBFBE0_801CD970 = 255; + D_menu_801CD970 += 16; + if (D_menu_801CD970 > 255) { + D_menu_801CD970 = 255; } for (i = 0; i < 24; i++) { if (D_80177BD8[i] == 0) { continue; } - D_EBFBE0_801AFD18[i].unk_18 += 16; - if (D_EBFBE0_801AFD18[i].unk_18 > 255) { - D_EBFBE0_801AFD18[i].unk_18 = 255; + D_menu_801AFD18[i].unk_18 += 16; + if (D_menu_801AFD18[i].unk_18 > 255) { + D_menu_801AFD18[i].unk_18 = 255; } } #define PLANET_ID i for (PLANET_ID = 0; PLANET_ID < PLANET_MAX; PLANET_ID++) { - if ((PLANET_ID == sCurrentPlanetId) || (PLANET_ID == D_EBFBE0_801CD958)) { + if ((PLANET_ID == sCurrentPlanetId) || (PLANET_ID == D_menu_801CD958)) { continue; } @@ -3075,67 +3061,66 @@ void func_EBFBE0_801A2EB8(void) { #undef PLANET_ID } - if ((D_EBFBE0_801CEED8 == 4) && (D_EBFBE0_801CEEDC == 0.0f)) { + if ((D_menu_801CEED8 == 4) && (D_menu_801CEEDC == 0.0f)) { Audio_PlaySfx(0x19000026U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } - if ((D_EBFBE0_801CEED8 == 5) && (D_EBFBE0_801CEEDC == 0.0f)) { - if (D_EBFBE0_801CD93C != 2) { - D_EBFBE0_801AFD18[D_EBFBE0_801CEECC].unk_14 = 2; - D_EBFBE0_801CEEA0 = 0; - D_EBFBE0_801CEEA4 = 100; - D_EBFBE0_801CEEA8 = 255; - D_EBFBE0_801CEEAC = 255; + if ((D_menu_801CEED8 == 5) && (D_menu_801CEEDC == 0.0f)) { + if (D_menu_801CD93C != 2) { + D_menu_801AFD18[D_menu_801CEECC].unk_14 = 2; + D_menu_801CEEA0 = 0; + D_menu_801CEEA4 = 100; + D_menu_801CEEA8 = 255; + D_menu_801CEEAC = 255; } } - if (D_EBFBE0_801CEED8 == -1) { + if (D_menu_801CEED8 == -1) { - D_EBFBE0_801CEED4 = -1; - if (planet[D_EBFBE0_801CD958].unk_2C != -1) { - temp1 = func_EBFBE0_801A655C(D_EBFBE0_801CD958, planet[D_EBFBE0_801CD958].unk_2C); + D_menu_801CEED4 = -1; + if (planet[D_menu_801CD958].unk_2C != -1) { + temp1 = func_menu_801A655C(D_menu_801CD958, planet[D_menu_801CD958].unk_2C); D_80177BD8[temp1] = 1; - D_EBFBE0_801AFD18[temp1].unk_18 = 255; - D_EBFBE0_801CEED4 = temp1; + D_menu_801AFD18[temp1].unk_18 = 255; + D_menu_801CEED4 = temp1; } - D_EBFBE0_801CEED0 = -1; - if (planet[D_EBFBE0_801CD958].unk_30 != -1) { - temp2 = func_EBFBE0_801A655C(D_EBFBE0_801CD958, planet[D_EBFBE0_801CD958].unk_30); + D_menu_801CEED0 = -1; + if (planet[D_menu_801CD958].unk_30 != -1) { + temp2 = func_menu_801A655C(D_menu_801CD958, planet[D_menu_801CD958].unk_30); D_80177BD8[temp2] = 1; - D_EBFBE0_801AFD18[temp2].unk_18 = 255; - D_EBFBE0_801CEED0 = temp2; + D_menu_801AFD18[temp2].unk_18 = 255; + D_menu_801CEED0 = temp2; } - D_EBFBE0_801CD9C0 = 50; - D_EBFBE0_801CD94C++; + D_menu_801CD9C0 = 50; + D_menu_801CD94C++; } } -void func_EBFBE0_801A3440(f32 arg0) { +void func_menu_801A3440(f32 arg0) { Vec3f vec[2]; - if (D_EBFBE0_801CEED8 != -1) { - func_EBFBE0_801A3550(vec, &D_EBFBE0_801CEEE8[D_EBFBE0_801CEED8], &D_EBFBE0_801CEF58[D_EBFBE0_801CEED8], - D_EBFBE0_801CEEDC); - D_EBFBE0_801CD9F4 = vec[0].x; - D_EBFBE0_801CD9F8 = vec[0].y; - D_EBFBE0_801CD9FC = vec[0].z; - D_EBFBE0_801CDA00 = vec[1].x; - D_EBFBE0_801CDA04 = vec[1].y; - D_EBFBE0_801CDA08 = vec[1].z; - D_EBFBE0_801CEEDC += arg0; + if (D_menu_801CEED8 != -1) { + func_menu_801A3550(vec, &D_menu_801CEEE8[D_menu_801CEED8], &D_menu_801CEF58[D_menu_801CEED8], D_menu_801CEEDC); + D_menu_801CD9F4 = vec[0].x; + D_menu_801CD9F8 = vec[0].y; + D_menu_801CD9FC = vec[0].z; + D_menu_801CDA00 = vec[1].x; + D_menu_801CDA04 = vec[1].y; + D_menu_801CDA08 = vec[1].z; + D_menu_801CEEDC += arg0; - if (D_EBFBE0_801CEEDC > 1.0f) { - D_EBFBE0_801CEED8++; - D_EBFBE0_801CEEDC = 0.0f; - if (D_EBFBE0_801CEED8 >= 6) { - D_EBFBE0_801CEED8 = -1; + if (D_menu_801CEEDC > 1.0f) { + D_menu_801CEED8++; + D_menu_801CEEDC = 0.0f; + if (D_menu_801CEED8 >= 6) { + D_menu_801CEED8 = -1; } } } } -void func_EBFBE0_801A3550(Vec3f* arg0, Vec3f* arg1, Vec3f* arg2, f32 arg3) { +void func_menu_801A3550(Vec3f* arg0, Vec3f* arg1, Vec3f* arg2, f32 arg3) { f32 temp_fa1; f32 temp_fs0; f32 temp_ft5; @@ -3153,11 +3138,11 @@ void func_EBFBE0_801A3550(Vec3f* arg0, Vec3f* arg1, Vec3f* arg2, f32 arg3) { (arg0 + 1)->z = (temp_fa1 * arg2->z) + (temp_fs0 * (arg2 + 1)->z) + (temp_ft5 * (arg2 + 2)->z); } -void func_EBFBE0_801A36A8(void) { +void func_menu_801A36A8(void) { s32 i; f32 temp; - switch (D_EBFBE0_801CD948) { + switch (D_menu_801CD948) { case 0: D_80178348 = 0; D_80178350 = 0; @@ -3165,63 +3150,63 @@ void func_EBFBE0_801A36A8(void) { D_80178340 = 0xFF; for (i = 0; i < 8; i++) { - D_EBFBE0_801CF020[i] = D_EBFBE0_801B69D4[i]; - D_EBFBE0_801CF040[i] = D_EBFBE0_801B69F4[i]; - D_EBFBE0_801CF060[i] = D_EBFBE0_801B6A14[i]; + D_menu_801CF020[i] = D_menu_801B69D4[i]; + D_menu_801CF040[i] = D_menu_801B69F4[i]; + D_menu_801CF060[i] = D_menu_801B6A14[i]; } - D_EBFBE0_801CF0C8 = D_EBFBE0_801B6A34[1]; - D_EBFBE0_801CF0CC = D_EBFBE0_801B6A3C[1]; - D_EBFBE0_801CF0D0 = D_EBFBE0_801B6A44[1]; + D_menu_801CF0C8 = D_menu_801B6A34[1]; + D_menu_801CF0CC = D_menu_801B6A3C[1]; + D_menu_801CF0D0 = D_menu_801B6A44[1]; - D_EBFBE0_801CF120 = 0; - D_EBFBE0_801CEA9C = 255.0f; - D_EBFBE0_801CF080 = 1.0f; - D_EBFBE0_801CD948 = 10; + D_menu_801CF120 = 0; + D_menu_801CEA9C = 255.0f; + D_menu_801CF080 = 1.0f; + D_menu_801CD948 = 10; func_8001D444(0, 0x28, 0, 0xFF); break; case 10: - temp = Math_SmoothStepToF(&D_EBFBE0_801CEA9C, 0.0f, 1.0f, 100.0f, 1.0f); + temp = Math_SmoothStepToF(&D_menu_801CEA9C, 0.0f, 1.0f, 100.0f, 1.0f); - D_80178340 = D_EBFBE0_801CEA9C; + D_80178340 = D_menu_801CEA9C; if (temp == 0.0f) { D_80178340 = 0; - D_EBFBE0_801CD9C0 = 0; - D_EBFBE0_801CD948 = 20; + D_menu_801CD9C0 = 0; + D_menu_801CD948 = 20; } break; case 20: - if (D_EBFBE0_801CD9C0 != 0) { + if (D_menu_801CD9C0 != 0) { break; } - D_EBFBE0_801CD94C = 0; - D_EBFBE0_801CD9C0 = 0; - D_EBFBE0_801CD948 = 1; + D_menu_801CD94C = 0; + D_menu_801CD9C0 = 0; + D_menu_801CD948 = 1; break; case 1: - if (D_EBFBE0_801CF120) { - D_EBFBE0_801CDA1C += 0.03f; + if (D_menu_801CF120) { + D_menu_801CDA1C += 0.03f; } - if (D_EBFBE0_801CD9C0) { + if (D_menu_801CD9C0) { break; } - func_EBFBE0_801A3A00(); + func_menu_801A3A00(); break; case 2: - func_EBFBE0_801A4394(); + func_menu_801A4394(); break; case 3: D_80178340 += 32; if (D_80178340 > 255) { D_80178340 = 255; - D_EBFBE0_801CD948++; + D_menu_801CD948++; } break; @@ -3236,180 +3221,180 @@ void func_EBFBE0_801A36A8(void) { if (gControllerPress[gMainController].button & (A_BUTTON | START_BUTTON)) { Audio_PlaySfx(0x49000003U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801CD948 = 3; + D_menu_801CD948 = 3; } } -void func_EBFBE0_801A3A00(void) { +void func_menu_801A3A00(void) { s32 i; bool boolTemp; f32 temp1[8]; f32 temp2[8]; f32 temp3[8]; - switch (D_EBFBE0_801CD94C) { + switch (D_menu_801CD94C) { case 0: for (i = 0; i < 8; i++) { - if (!D_EBFBE0_801CF120) { - D_EBFBE0_801CF0D8[i] = i * 4; + if (!D_menu_801CF120) { + D_menu_801CF0D8[i] = i * 4; } else { - D_EBFBE0_801CF0D8[i] = i * 3; + D_menu_801CF0D8[i] = i * 3; } - D_EBFBE0_801CF088[i] = 0.0f; - D_EBFBE0_801CF0A8[i] = 0.0f; - D_EBFBE0_801CF0F8[i] = 0; + D_menu_801CF088[i] = 0.0f; + D_menu_801CF0A8[i] = 0.0f; + D_menu_801CF0F8[i] = 0; } - D_EBFBE0_801CD94C++; + D_menu_801CD94C++; break; case 1: for (i = 0; i < 8; i++) { - if (D_EBFBE0_801CF0D8[i] != 0) { - D_EBFBE0_801CF0D8[i]--; + if (D_menu_801CF0D8[i] != 0) { + D_menu_801CF0D8[i]--; continue; } - temp1[i] = Math_SmoothStepToF(&D_EBFBE0_801CF020[i], *(D_EBFBE0_801CF0C8 + i), 0.05f, 100.0f, 10.0f); - temp2[i] = Math_SmoothStepToF(&D_EBFBE0_801CF040[i], *(D_EBFBE0_801CF0CC + i), 0.05f, 100.0f, 10.0f); - temp3[i] = Math_SmoothStepToF(&D_EBFBE0_801CF060[i], *(D_EBFBE0_801CF0D0 + i), 0.1f, 100.0f, 0.1f); + temp1[i] = Math_SmoothStepToF(&D_menu_801CF020[i], *(D_menu_801CF0C8 + i), 0.05f, 100.0f, 10.0f); + temp2[i] = Math_SmoothStepToF(&D_menu_801CF040[i], *(D_menu_801CF0CC + i), 0.05f, 100.0f, 10.0f); + temp3[i] = Math_SmoothStepToF(&D_menu_801CF060[i], *(D_menu_801CF0D0 + i), 0.1f, 100.0f, 0.1f); if (temp1[i] == 0.0f && temp2[i] == 0.0f && temp3[i] == 0.0f) { - D_EBFBE0_801CF088[i] = 0.0f; + D_menu_801CF088[i] = 0.0f; if (temp3[i] == 0.0f) { - D_EBFBE0_801CF0F8[i] = 1; + D_menu_801CF0F8[i] = 1; } } else { - D_EBFBE0_801CF088[i] += 10.0f; + D_menu_801CF088[i] += 10.0f; } } boolTemp = true; for (i = 0; i < 8; i++) { - if (D_EBFBE0_801CF0F8[i] == 0) { + if (D_menu_801CF0F8[i] == 0) { boolTemp = false; break; } } if (boolTemp == true) { - D_EBFBE0_801CF118 = 0; + D_menu_801CF118 = 0; for (i = 0; i < 8; i++) { - D_EBFBE0_801CF088[i] = 0.0f; - D_EBFBE0_801CF0D8[i] = i * 10; - D_EBFBE0_801CF0F8[i] = 0; + D_menu_801CF088[i] = 0.0f; + D_menu_801CF0D8[i] = i * 10; + D_menu_801CF0F8[i] = 0; } - D_EBFBE0_801CD9C0 = 60; - D_EBFBE0_801CD9BC = 85; - D_EBFBE0_801CD94C = 11; + D_menu_801CD9C0 = 60; + D_menu_801CD9BC = 85; + D_menu_801CD94C = 11; } break; case 11: - if (D_EBFBE0_801CD9C0) { + if (D_menu_801CD9C0) { break; } - if (D_EBFBE0_801CD9BC) { + if (D_menu_801CD9BC) { for (i = 0; i < 8; i++) { - Math_SmoothStepToF(&D_EBFBE0_801CF088[i], 360.0f, 0.3f, 100.0f, 1.0f); - Math_SmoothStepToF(&D_EBFBE0_801CF0A8[i], 360.0f, 0.3f, 100.0f, 1.0f); + Math_SmoothStepToF(&D_menu_801CF088[i], 360.0f, 0.3f, 100.0f, 1.0f); + Math_SmoothStepToF(&D_menu_801CF0A8[i], 360.0f, 0.3f, 100.0f, 1.0f); } } else { - D_EBFBE0_801CD94C = 10; + D_menu_801CD94C = 10; } break; case 10: - if (!D_EBFBE0_801CD9B8) { - if (!D_EBFBE0_801CF120) { - D_EBFBE0_801CEAA0 = 0.0f; - D_EBFBE0_801CD9B8 = 25; - D_EBFBE0_801CD94C = 3; + if (!D_menu_801CD9B8) { + if (!D_menu_801CF120) { + D_menu_801CEAA0 = 0.0f; + D_menu_801CD9B8 = 25; + D_menu_801CD94C = 3; } else { for (i = 0; i < 8; i++) { - D_EBFBE0_801CF088[i] = 0.0f; - D_EBFBE0_801CF0A8[i] = 0.0f; - D_EBFBE0_801CF0F8[i] = 0; + D_menu_801CF088[i] = 0.0f; + D_menu_801CF0A8[i] = 0.0f; + D_menu_801CF0F8[i] = 0; } - D_EBFBE0_801CEFCC = 0; - D_EBFBE0_801CF0D8[0] = 4; - D_EBFBE0_801CD94C = 2; + D_menu_801CEFCC = 0; + D_menu_801CF0D8[0] = 4; + D_menu_801CD94C = 2; } } break; case 2: - if (D_EBFBE0_801CF0D8[0]) { - D_EBFBE0_801CF0D8[0]--; + if (D_menu_801CF0D8[0]) { + D_menu_801CF0D8[0]--; } else { - D_EBFBE0_801CEFCC++; - if (D_EBFBE0_801CEFCC > 8) { - D_EBFBE0_801CEFCC = 8; + D_menu_801CEFCC++; + if (D_menu_801CEFCC > 8) { + D_menu_801CEFCC = 8; boolTemp = true; for (i = 0; i < 8; i++) { - if (D_EBFBE0_801CF0F8[i] == 0) { + if (D_menu_801CF0F8[i] == 0) { boolTemp = false; break; } } if (boolTemp) { - D_EBFBE0_801CEFCC = 0; - D_EBFBE0_801CF11C ^= 1; - D_EBFBE0_801CF0C8 = D_EBFBE0_801B6A34[D_EBFBE0_801CF11C]; - D_EBFBE0_801CF0CC = D_EBFBE0_801B6A3C[D_EBFBE0_801CF11C]; - D_EBFBE0_801CF0D0 = D_EBFBE0_801B6A44[D_EBFBE0_801CF11C]; + D_menu_801CEFCC = 0; + D_menu_801CF11C ^= 1; + D_menu_801CF0C8 = D_menu_801B6A34[D_menu_801CF11C]; + D_menu_801CF0CC = D_menu_801B6A3C[D_menu_801CF11C]; + D_menu_801CF0D0 = D_menu_801B6A44[D_menu_801CF11C]; - D_EBFBE0_801CD9C0 = 15; - if (D_EBFBE0_801CF11C) { - D_EBFBE0_801CD9C0 = 240; + D_menu_801CD9C0 = 15; + if (D_menu_801CF11C) { + D_menu_801CD9C0 = 240; } - D_EBFBE0_801CD94C = 0; + D_menu_801CD94C = 0; } } else { - D_EBFBE0_801CF0D8[0] = 4; + D_menu_801CF0D8[0] = 4; } } - for (i = 0; i < D_EBFBE0_801CEFCC; i++) { - if (D_EBFBE0_801CF0F8[i] == 1) { + for (i = 0; i < D_menu_801CEFCC; i++) { + if (D_menu_801CF0F8[i] == 1) { continue; } - if (D_EBFBE0_801CF0A8[i] > 360.0f) { - D_EBFBE0_801CF0A8[i] = 0.0f; - D_EBFBE0_801CF0F8[i] = 1; + if (D_menu_801CF0A8[i] > 360.0f) { + D_menu_801CF0A8[i] = 0.0f; + D_menu_801CF0F8[i] = 1; } else { - D_EBFBE0_801CF0A8[i] += 10.0f; + D_menu_801CF0A8[i] += 10.0f; } } break; case 3: - if (D_EBFBE0_801CD9B8 != 0) { + if (D_menu_801CD9B8 != 0) { break; } for (i = 0; i < 8; i++) { - D_EBFBE0_801CF088[i] += 30.0f; - D_EBFBE0_801CF060[i] += -300.0f; - if (D_EBFBE0_801CF060[i] <= -120000.0f) { - D_EBFBE0_801CF060[i] = -12000.0f; + D_menu_801CF088[i] += 30.0f; + D_menu_801CF060[i] += -300.0f; + if (D_menu_801CF060[i] <= -120000.0f) { + D_menu_801CF060[i] = -12000.0f; } } - if (D_EBFBE0_801CF060[0] <= -11000.0f) { - D_EBFBE0_801CEAA0 += 32.0f; + if (D_menu_801CF060[0] <= -11000.0f) { + D_menu_801CEAA0 += 32.0f; - if (D_EBFBE0_801CEAA0 > 255.0f) { - D_EBFBE0_801CEAA0 = 255.0f; + if (D_menu_801CEAA0 > 255.0f) { + D_menu_801CEAA0 = 255.0f; } #define PLANET_ID i for (PLANET_ID = 0; PLANET_ID < PLANET_MAX; PLANET_ID++) { - planet[PLANET_ID].alpha = D_EBFBE0_801CEAA0; - D_EBFBE0_801CD970 = D_EBFBE0_801CEAA0; + planet[PLANET_ID].alpha = D_menu_801CEAA0; + D_menu_801CD970 = D_menu_801CEAA0; if ((PLANET_ID == PLANET_SECTOR_Z) || (PLANET_ID == PLANET_SECTOR_X) || (PLANET_ID == PLANET_SECTOR_Y)) { if (planet[PLANET_ID].alpha > 144) { @@ -3420,88 +3405,88 @@ void func_EBFBE0_801A3A00(void) { #undef PLANET_ID } - if (D_EBFBE0_801CEAA0 == 255.0f) { - D_EBFBE0_801CF080 = 0.0f; - D_EBFBE0_801CD948 = 2; - D_EBFBE0_801CD94C = 0; + if (D_menu_801CEAA0 == 255.0f) { + D_menu_801CF080 = 0.0f; + D_menu_801CD948 = 2; + D_menu_801CD94C = 0; } break; } } -void func_EBFBE0_801A4394(void) { +void func_menu_801A4394(void) { s32 i; - switch (D_EBFBE0_801CD94C) { + switch (D_menu_801CD94C) { case 0: if (gCurrentPlanet == 0) { - D_EBFBE0_801CD9C0 = 45; - D_EBFBE0_801CD94C = 3; + D_menu_801CD9C0 = 45; + D_menu_801CD94C = 3; } else { - D_EBFBE0_801CD94C++; + D_menu_801CD94C++; } break; case 1: - if (gCurrentPlanet == D_EBFBE0_801CD9AC) { - D_EBFBE0_801CD94C = 3; - D_EBFBE0_801CD9C0 = 45; + if (gCurrentPlanet == D_menu_801CD9AC) { + D_menu_801CD94C = 3; + D_menu_801CD9C0 = 45; break; } - if ((D_EBFBE0_801AFD18[D_EBFBE0_801CD8E0[D_EBFBE0_801CD9AC]].unk_00 == 3) || - (D_EBFBE0_801AFD18[D_EBFBE0_801CD8E0[D_EBFBE0_801CD9AC]].unk_00 == 4)) { - D_80177BD8[D_EBFBE0_801CD8E0[D_EBFBE0_801CD9AC]] = 5; - D_EBFBE0_801AFD18[D_EBFBE0_801CD8E0[D_EBFBE0_801CD9AC]].unk_14 = 5; + if ((D_menu_801AFD18[D_menu_801CD8E0[D_menu_801CD9AC]].unk_00 == 3) || + (D_menu_801AFD18[D_menu_801CD8E0[D_menu_801CD9AC]].unk_00 == 4)) { + D_80177BD8[D_menu_801CD8E0[D_menu_801CD9AC]] = 5; + D_menu_801AFD18[D_menu_801CD8E0[D_menu_801CD9AC]].unk_14 = 5; } else { - D_80177BD8[D_EBFBE0_801CD8E0[D_EBFBE0_801CD9AC]] = 2; - D_EBFBE0_801AFD18[D_EBFBE0_801CD8E0[D_EBFBE0_801CD9AC]].unk_14 = 0; + D_80177BD8[D_menu_801CD8E0[D_menu_801CD9AC]] = 2; + D_menu_801AFD18[D_menu_801CD8E0[D_menu_801CD9AC]].unk_14 = 0; } - D_EBFBE0_801AFD18[D_EBFBE0_801CD8E0[D_EBFBE0_801CD9AC]].unk_18 = 255; - D_EBFBE0_801CEEAC = 255; - D_EBFBE0_801CEEA8 = 255; - D_EBFBE0_801CD94C++; + D_menu_801AFD18[D_menu_801CD8E0[D_menu_801CD9AC]].unk_18 = 255; + D_menu_801CEEAC = 255; + D_menu_801CEEA8 = 255; + D_menu_801CD94C++; break; case 2: - if ((D_80177BD8[D_EBFBE0_801CD8E0[D_EBFBE0_801CD9AC]] == 3) || - (D_80177BD8[D_EBFBE0_801CD8E0[D_EBFBE0_801CD9AC]] == 6)) { - D_EBFBE0_801CD9AC++; - D_EBFBE0_801CD94C = 1; + if ((D_80177BD8[D_menu_801CD8E0[D_menu_801CD9AC]] == 3) || + (D_80177BD8[D_menu_801CD8E0[D_menu_801CD9AC]] == 6)) { + D_menu_801CD9AC++; + D_menu_801CD94C = 1; } break; case 3: - if (D_EBFBE0_801CD9C0 != 0) { + if (D_menu_801CD9C0 != 0) { break; } for (i = 0; i < 8; i++) { - D_EBFBE0_801CF020[i] = D_EBFBE0_801B69D4[i]; - D_EBFBE0_801CF040[i] = D_EBFBE0_801B69F4[i]; - D_EBFBE0_801CF060[i] = D_EBFBE0_801B6A14[i]; + D_menu_801CF020[i] = D_menu_801B69D4[i]; + D_menu_801CF040[i] = D_menu_801B69F4[i]; + D_menu_801CF060[i] = D_menu_801B6A14[i]; } - D_EBFBE0_801CD978 = 1; - D_EBFBE0_801CF120 = 1; - D_EBFBE0_801CF11C = 1; + D_menu_801CD978 = 1; + D_menu_801CF120 = 1; + D_menu_801CF11C = 1; - D_EBFBE0_801CF0C8 = D_EBFBE0_801B6A34[1]; - D_EBFBE0_801CF0CC = D_EBFBE0_801B6A3C[1]; - D_EBFBE0_801CF0D0 = D_EBFBE0_801B6A44[1]; + D_menu_801CF0C8 = D_menu_801B6A34[1]; + D_menu_801CF0CC = D_menu_801B6A3C[1]; + D_menu_801CF0D0 = D_menu_801B6A44[1]; - D_EBFBE0_801CF080 = 1.0f; - D_EBFBE0_801CD9C0 = 450; - D_EBFBE0_801CD94C = 0; - D_EBFBE0_801CD948 = 1; + D_menu_801CF080 = 1.0f; + D_menu_801CD9C0 = 450; + D_menu_801CD94C = 0; + D_menu_801CD948 = 1; break; } } -void func_EBFBE0_801A4650(void) { +void func_menu_801A4650(void) { s32 i; - static Gfx* D_EBFBE0_801B6A4C[] = { + static Gfx* D_menu_801B6A4C[] = { D_9006AE0, D_90086F0, D_9005380, D_90075A0, D_9000570, D_9002EA0, D_90075A0, D_9004230, }; @@ -3521,14 +3506,14 @@ void func_EBFBE0_801A4650(void) { for (i = 0; i < 8; i++) { Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, D_EBFBE0_801CF020[i], D_EBFBE0_801CF040[i], D_EBFBE0_801CF060[i], 1); - Matrix_RotateY(gGfxMatrix, M_DTOR * D_EBFBE0_801CF0A8[i], 1); - Matrix_RotateX(gGfxMatrix, M_DTOR * D_EBFBE0_801CF088[i], 1); - Matrix_Scale(gGfxMatrix, D_EBFBE0_801CF080, D_EBFBE0_801CF080, D_EBFBE0_801CF080, 1); + Matrix_Translate(gGfxMatrix, D_menu_801CF020[i], D_menu_801CF040[i], D_menu_801CF060[i], 1); + Matrix_RotateY(gGfxMatrix, M_DTOR * D_menu_801CF0A8[i], 1); + Matrix_RotateX(gGfxMatrix, M_DTOR * D_menu_801CF088[i], 1); + Matrix_Scale(gGfxMatrix, D_menu_801CF080, D_menu_801CF080, D_menu_801CF080, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_EBFBE0_801B6A4C[i]); + gSPDisplayList(gMasterDisp++, D_menu_801B6A4C[i]); Matrix_Pop(&gGfxMatrix); } @@ -3536,111 +3521,111 @@ void func_EBFBE0_801A4650(void) { Matrix_Pop(&gGfxMatrix); } -void func_EBFBE0_801A48C0(f32 speed) { +void func_menu_801A48C0(f32 speed) { f32 x; f32 y; f32 z; f32 temp; f32 angle; - Math_SmoothStepToF(&D_EBFBE0_801CDA34, D_EBFBE0_801CDA50.x, speed, 100.0f, 0.1f); - Math_SmoothStepToF(&D_EBFBE0_801CDA38, D_EBFBE0_801CDA50.y, speed, 100.0f, 0.1f); - Math_SmoothStepToF(&D_EBFBE0_801CD9FC, D_EBFBE0_801CDA50.z, speed, 100.0f, 0.1f); + Math_SmoothStepToF(&D_menu_801CDA34, D_menu_801CDA50.x, speed, 100.0f, 0.1f); + Math_SmoothStepToF(&D_menu_801CDA38, D_menu_801CDA50.y, speed, 100.0f, 0.1f); + Math_SmoothStepToF(&D_menu_801CD9FC, D_menu_801CDA50.z, speed, 100.0f, 0.1f); - x = D_EBFBE0_801CDA50.x - D_EBFBE0_801CDA34; - y = D_EBFBE0_801CDA50.y - D_EBFBE0_801CDA38; - z = D_EBFBE0_801CDA50.z - D_EBFBE0_801CD9FC; + x = D_menu_801CDA50.x - D_menu_801CDA34; + y = D_menu_801CDA50.y - D_menu_801CDA38; + z = D_menu_801CDA50.z - D_menu_801CD9FC; temp = sqrtf(SQ(x) + SQ(y) + SQ(z)); - angle = M_DTOR * ((1 - (temp / D_EBFBE0_801CEA68)) * 180.0f); + angle = M_DTOR * ((1 - (temp / D_menu_801CEA68)) * 180.0f); - D_EBFBE0_801CD9F4 = D_EBFBE0_801CDA34 * (1 + __sinf(angle) * 1.1f); - D_EBFBE0_801CD9F8 = D_EBFBE0_801CDA38 * (1 + __sinf(angle) * 1.3f); + D_menu_801CD9F4 = D_menu_801CDA34 * (1 + __sinf(angle) * 1.1f); + D_menu_801CD9F8 = D_menu_801CDA38 * (1 + __sinf(angle) * 1.3f); } -void func_EBFBE0_801A4A38(f32 arg0) { - Math_SmoothStepToF(&D_EBFBE0_801CDA2C, D_EBFBE0_801CDA40.x, arg0, 100.0f, 0.1f); - Math_SmoothStepToF(&D_EBFBE0_801CDA30, D_EBFBE0_801CDA40.y, arg0, 100.0f, 0.1f); - Math_SmoothStepToF(&D_EBFBE0_801CDA08, D_EBFBE0_801CDA40.z, arg0, 100.0f, 0.1f); - D_EBFBE0_801CDA00 = D_EBFBE0_801CDA2C; - D_EBFBE0_801CDA04 = D_EBFBE0_801CDA30; +void func_menu_801A4A38(f32 arg0) { + Math_SmoothStepToF(&D_menu_801CDA2C, D_menu_801CDA40.x, arg0, 100.0f, 0.1f); + Math_SmoothStepToF(&D_menu_801CDA30, D_menu_801CDA40.y, arg0, 100.0f, 0.1f); + Math_SmoothStepToF(&D_menu_801CDA08, D_menu_801CDA40.z, arg0, 100.0f, 0.1f); + D_menu_801CDA00 = D_menu_801CDA2C; + D_menu_801CDA04 = D_menu_801CDA30; } -void func_EBFBE0_801A4AE8(void) { +void func_menu_801A4AE8(void) { s32 var_a0; s32 i; - switch (D_EBFBE0_801CD94C) { + switch (D_menu_801CD94C) { case 0: - func_EBFBE0_801A4D7C(); + func_menu_801A4D7C(); break; case 1: - if (D_EBFBE0_801CF000[D_EBFBE0_801CEFDC] == 0) { - if (D_EBFBE0_801CEFD0 != 0) { + if (D_menu_801CF000[D_menu_801CEFDC] == 0) { + if (D_menu_801CEFD0 != 0) { if (gLifeCount[gPlayerNum] != 0) { func_8001D520(); - D_EBFBE0_801CD9CC = 1; - D_EBFBE0_801CD9D0 = 0; - D_EBFBE0_801CD9B8 = 120; + D_menu_801CD9CC = 1; + D_menu_801CD9D0 = 0; + D_menu_801CD9B8 = 120; } else { - D_EBFBE0_801CD9D4 = 1; - D_EBFBE0_801CD9B8 = 0; + D_menu_801CD9D4 = 1; + D_menu_801CD9B8 = 0; } } else { - D_EBFBE0_801CD9B8 = 0; + D_menu_801CD9B8 = 0; } - D_EBFBE0_801CEFC4 = 0; - D_EBFBE0_801CD94C = 2; + D_menu_801CEFC4 = 0; + D_menu_801CD94C = 2; } break; case 2: - if ((D_EBFBE0_801CD9CC != 0) && (D_EBFBE0_801CD9B8 == 110)) { + if ((D_menu_801CD9CC != 0) && (D_menu_801CD9B8 == 110)) { gLifeCount[gPlayerNum]--; } - if (D_EBFBE0_801CD9B8 == 0) { - D_EBFBE0_801CD9CC = 0; + if (D_menu_801CD9B8 == 0) { + D_menu_801CD9CC = 0; - var_a0 = D_EBFBE0_801CEFDC; - if (D_EBFBE0_801CD93C != 0) { + var_a0 = D_menu_801CEFDC; + if (D_menu_801CD93C != 0) { var_a0 += 2; } - func_EBFBE0_801A4D0C(var_a0); + func_menu_801A4D0C(var_a0); - if (D_EBFBE0_801CEFDC == 0) { + if (D_menu_801CEFDC == 0) { for (i = 0; i < 6; i++) { D_80177C58[i] = gTeamShields[i]; } - D_EBFBE0_801CEFC8 = 0; - D_EBFBE0_801CD948 = 0; - D_EBFBE0_801CD944 = 2; + D_menu_801CEFC8 = 0; + D_menu_801CD948 = 0; + D_menu_801CD944 = 2; } else { - D_EBFBE0_801CD944 = 3; + D_menu_801CD944 = 3; } - D_EBFBE0_801CD94C = 0; + D_menu_801CD94C = 0; } break; } } -void func_EBFBE0_801A4D0C(u32 arg0) { +void func_menu_801A4D0C(u32 arg0) { switch (arg0) { case 1: case 4: - if (D_EBFBE0_801CD9D4 != 0) { - func_EBFBE0_801A4F8C(); + if (D_menu_801CD9D4 != 0) { + func_menu_801A4F8C(); } else { - func_EBFBE0_801A4FC4(); + func_menu_801A4FC4(); } break; case 3: - func_EBFBE0_801A53C8(); + func_menu_801A53C8(); case 0: case 2: @@ -3648,60 +3633,59 @@ void func_EBFBE0_801A4D0C(u32 arg0) { } } -void func_EBFBE0_801A4D7C(void) { +void func_menu_801A4D7C(void) { f32 temp; - if (func_EBFBE0_801A5770() != 0) { - D_EBFBE0_801CEFE8[D_EBFBE0_801CEFDC] = 255.0f; - if (D_EBFBE0_801CD93C != 0) { - if (D_EBFBE0_801CEFD4 < 0) { - D_EBFBE0_801CEFDC++; - if (D_EBFBE0_801CEFDC >= 3) { - D_EBFBE0_801CEFDC = 0; + if (func_menu_801A5770() != 0) { + D_menu_801CEFE8[D_menu_801CEFDC] = 255.0f; + if (D_menu_801CD93C != 0) { + if (D_menu_801CEFD4 < 0) { + D_menu_801CEFDC++; + if (D_menu_801CEFDC >= 3) { + D_menu_801CEFDC = 0; } } else { - D_EBFBE0_801CEFDC--; - if (D_EBFBE0_801CEFDC < 0) { - D_EBFBE0_801CEFDC = 2; + D_menu_801CEFDC--; + if (D_menu_801CEFDC < 0) { + D_menu_801CEFDC = 2; } } } else { - D_EBFBE0_801CEFDC ^= 1; + D_menu_801CEFDC ^= 1; } } - temp = Math_SmoothStepToF(&D_EBFBE0_801CEFE8[D_EBFBE0_801CEFDC], D_EBFBE0_801CEFE0, 0.5f, 100.0f, 1.0f); + temp = Math_SmoothStepToF(&D_menu_801CEFE8[D_menu_801CEFDC], D_menu_801CEFE0, 0.5f, 100.0f, 1.0f); if (temp == 0.0f) { - if (D_EBFBE0_801CEFE0 == 32.0f) { - D_EBFBE0_801CEFE0 = 255.0f; + if (D_menu_801CEFE0 == 32.0f) { + D_menu_801CEFE0 = 255.0f; } else { - D_EBFBE0_801CEFE0 = 32.0f; + D_menu_801CEFE0 = 32.0f; } } if (gControllerPress[gMainController].button & (B_BUTTON | START_BUTTON)) { func_8001D6DC(0); - D_EBFBE0_801CEFC4 = 0; - D_EBFBE0_801CD944 = 3; + D_menu_801CEFC4 = 0; + D_menu_801CD944 = 3; return; } if (gControllerPress[gMainController].button & A_BUTTON) { func_8001D6DC(0); Audio_PlaySfx(0x49000003U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801CF000[D_EBFBE0_801CEFDC] = 10; + D_menu_801CF000[D_menu_801CEFDC] = 10; - if (((D_EBFBE0_801CD93C != 0) && (D_EBFBE0_801CEFDC == 2)) || - ((D_EBFBE0_801CD93C == 0) && (D_EBFBE0_801CEFDC == 1))) { - D_EBFBE0_801CEFD0 = 1; - D_EBFBE0_801CF00C = 10; + if (((D_menu_801CD93C != 0) && (D_menu_801CEFDC == 2)) || ((D_menu_801CD93C == 0) && (D_menu_801CEFDC == 1))) { + D_menu_801CEFD0 = 1; + D_menu_801CF00C = 10; } - D_EBFBE0_801CD94C = 1; + D_menu_801CD94C = 1; } } -void func_EBFBE0_801A4F8C(void) { +void func_menu_801A4F8C(void) { D_80178410 = 0; gGameState = GSTATE_GAME_OVER; D_80177868 = 0; @@ -3709,7 +3693,7 @@ void func_EBFBE0_801A4F8C(void) { gDrawMode = DRAWMODE_0; } -void func_EBFBE0_801A4FC4(void) { +void func_menu_801A4FC4(void) { s32 i; s32 temp; s32 temp2; @@ -3732,28 +3716,28 @@ void func_EBFBE0_801A4FC4(void) { gBombCount[gPlayerNum] = 3; if (planet[sCurrentPlanetId].unk_2C != -1) { - temp2 = func_EBFBE0_801A655C(sCurrentPlanetId, planet[sCurrentPlanetId].unk_2C); + temp2 = func_menu_801A655C(sCurrentPlanetId, planet[sCurrentPlanetId].unk_2C); D_80177BD8[temp2] = 0; - D_EBFBE0_801AFD18[temp2].unk_18 = 0; + D_menu_801AFD18[temp2].unk_18 = 0; } if (planet[sCurrentPlanetId].unk_30 != -1) { - temp = func_EBFBE0_801A655C(sCurrentPlanetId, planet[sCurrentPlanetId].unk_30); + temp = func_menu_801A655C(sCurrentPlanetId, planet[sCurrentPlanetId].unk_30); D_80177BD8[temp] = 0; - D_EBFBE0_801AFD18[temp].unk_18 = 0; + D_menu_801AFD18[temp].unk_18 = 0; } if (planet[sCurrentPlanetId].unk_34 != -1) { - temp = func_EBFBE0_801A655C(sCurrentPlanetId, planet[sCurrentPlanetId].unk_34); + temp = func_menu_801A655C(sCurrentPlanetId, planet[sCurrentPlanetId].unk_34); D_80177BD8[temp] = 0; - D_EBFBE0_801AFD18[temp].unk_18 = 0; + D_menu_801AFD18[temp].unk_18 = 0; } - D_EBFBE0_801AFD18[D_EBFBE0_801CEECC].unk_14 = 0; - D_EBFBE0_801CEEA0 = 0; - D_EBFBE0_801CEEA4 = 0; - D_EBFBE0_801CEEA8 = 255; - D_EBFBE0_801CEEAC = 255; + D_menu_801AFD18[D_menu_801CEECC].unk_14 = 0; + D_menu_801CEEA0 = 0; + D_menu_801CEEA4 = 0; + D_menu_801CEEA8 = 255; + D_menu_801CEEAC = 255; gTotalHits -= D_80177B70[gCurrentPlanet - 1]; D_80177B90[gCurrentPlanet] = -1; @@ -3763,107 +3747,107 @@ void func_EBFBE0_801A4FC4(void) { gHitCount = 0; gCurrentPlanet--; - D_EBFBE0_801CD83C = func_EBFBE0_801A05B4(); + D_menu_801CD83C = func_menu_801A05B4(); - sCurrentPlanetId = D_EBFBE0_801CD950; + sCurrentPlanetId = D_menu_801CD950; if (planet[sCurrentPlanetId].unk_2C != -1) { - temp2 = func_EBFBE0_801A655C(sCurrentPlanetId, planet[sCurrentPlanetId].unk_2C); + temp2 = func_menu_801A655C(sCurrentPlanetId, planet[sCurrentPlanetId].unk_2C); D_80177BD8[temp2] = 1; - D_EBFBE0_801AFD18[temp2].unk_18 = 255; + D_menu_801AFD18[temp2].unk_18 = 255; } if (planet[sCurrentPlanetId].unk_30 != -1) { - temp = func_EBFBE0_801A655C(sCurrentPlanetId, planet[sCurrentPlanetId].unk_30); + temp = func_menu_801A655C(sCurrentPlanetId, planet[sCurrentPlanetId].unk_30); D_80177BD8[temp] = 1; - D_EBFBE0_801AFD18[temp].unk_18 = 255; + D_menu_801AFD18[temp].unk_18 = 255; } if (planet[sCurrentPlanetId].unk_34 != -1) { - temp = func_EBFBE0_801A655C(sCurrentPlanetId, planet[sCurrentPlanetId].unk_34); + temp = func_menu_801A655C(sCurrentPlanetId, planet[sCurrentPlanetId].unk_34); D_80177BD8[temp] = 0; - D_EBFBE0_801AFD18[temp].unk_18 = 0; + D_menu_801AFD18[temp].unk_18 = 0; } - func_EBFBE0_801A6368(); + func_menu_801A6368(); } -void func_EBFBE0_801A53C8(void) { +void func_menu_801A53C8(void) { s32 temp; s32 temp2; - D_EBFBE0_801CEFD8 ^= 1; + D_menu_801CEFD8 ^= 1; if (planet[sCurrentPlanetId].unk_2C != -1) { - temp2 = func_EBFBE0_801A655C(sCurrentPlanetId, planet[sCurrentPlanetId].unk_2C); + temp2 = func_menu_801A655C(sCurrentPlanetId, planet[sCurrentPlanetId].unk_2C); D_80177BD8[temp2] = 0; - D_EBFBE0_801AFD18[temp2].unk_18 = 0; + D_menu_801AFD18[temp2].unk_18 = 0; } if (planet[sCurrentPlanetId].unk_30 != -1) { - temp = func_EBFBE0_801A655C(sCurrentPlanetId, planet[sCurrentPlanetId].unk_30); + temp = func_menu_801A655C(sCurrentPlanetId, planet[sCurrentPlanetId].unk_30); D_80177BD8[temp] = 0; - D_EBFBE0_801AFD18[temp].unk_18 = 0; + D_menu_801AFD18[temp].unk_18 = 0; } - D_80177BD8[D_EBFBE0_801CEECC] = 0; + D_80177BD8[D_menu_801CEECC] = 0; - D_EBFBE0_801AFD18[D_EBFBE0_801CEECC].unk_18 = 0; - D_EBFBE0_801AFD18[D_EBFBE0_801CEECC].unk_14 = 0; + D_menu_801AFD18[D_menu_801CEECC].unk_18 = 0; + D_menu_801AFD18[D_menu_801CEECC].unk_14 = 0; - sCurrentPlanetId = D_EBFBE0_801CD950; + sCurrentPlanetId = D_menu_801CD950; - if (!D_EBFBE0_801CEFD8) { - D_EBFBE0_801CD958 = planet[sCurrentPlanetId].unk_2C; - } else if (D_EBFBE0_801CD93C != 2) { + if (!D_menu_801CEFD8) { + D_menu_801CD958 = planet[sCurrentPlanetId].unk_2C; + } else if (D_menu_801CD93C != 2) { if (planet[sCurrentPlanetId].unk_30 != -1) { - D_EBFBE0_801CD958 = planet[sCurrentPlanetId].unk_30; + D_menu_801CD958 = planet[sCurrentPlanetId].unk_30; } else { - D_EBFBE0_801CD958 = planet[sCurrentPlanetId].unk_2C; + D_menu_801CD958 = planet[sCurrentPlanetId].unk_2C; } } else if (planet[sCurrentPlanetId].unk_34 != -1) { - D_EBFBE0_801CD958 = planet[sCurrentPlanetId].unk_34; + D_menu_801CD958 = planet[sCurrentPlanetId].unk_34; } else { - D_EBFBE0_801CD958 = planet[sCurrentPlanetId].unk_2C; + D_menu_801CD958 = planet[sCurrentPlanetId].unk_2C; } - D_EBFBE0_801CEECC = func_EBFBE0_801A655C(sCurrentPlanetId, D_EBFBE0_801CD958); + D_menu_801CEECC = func_menu_801A655C(sCurrentPlanetId, D_menu_801CD958); - D_EBFBE0_801AFD18[D_EBFBE0_801CEECC].unk_18 = 255; + D_menu_801AFD18[D_menu_801CEECC].unk_18 = 255; - D_80177BD8[D_EBFBE0_801CEECC] = 3; + D_80177BD8[D_menu_801CEECC] = 3; - D_EBFBE0_801AFD18[D_EBFBE0_801CEECC].unk_14 = 2; + D_menu_801AFD18[D_menu_801CEECC].unk_14 = 2; - if ((D_EBFBE0_801AFD18[D_EBFBE0_801CEECC].unk_00 == 3) || (D_EBFBE0_801AFD18[D_EBFBE0_801CEECC].unk_00 == 4)) { - D_80177BD8[D_EBFBE0_801CEECC] = 5; - D_EBFBE0_801AFD18[D_EBFBE0_801CEECC].unk_14 = 5; + if ((D_menu_801AFD18[D_menu_801CEECC].unk_00 == 3) || (D_menu_801AFD18[D_menu_801CEECC].unk_00 == 4)) { + D_80177BD8[D_menu_801CEECC] = 5; + D_menu_801AFD18[D_menu_801CEECC].unk_14 = 5; } - D_EBFBE0_801CEEA0 = 0; - D_EBFBE0_801CEEA4 = 100; - D_EBFBE0_801CEEA8 = 255; - D_EBFBE0_801CEEAC = 255; + D_menu_801CEEA0 = 0; + D_menu_801CEEA4 = 100; + D_menu_801CEEA8 = 255; + D_menu_801CEEAC = 255; - sCurrentPlanetId = D_EBFBE0_801CD958; + sCurrentPlanetId = D_menu_801CD958; D_80177B90[gCurrentPlanet] = sCurrentPlanetId; - func_EBFBE0_801A6368(); + func_menu_801A6368(); - if (planet[D_EBFBE0_801CD958].unk_2C != -1) { - temp2 = func_EBFBE0_801A655C(D_EBFBE0_801CD958, planet[D_EBFBE0_801CD958].unk_2C); + if (planet[D_menu_801CD958].unk_2C != -1) { + temp2 = func_menu_801A655C(D_menu_801CD958, planet[D_menu_801CD958].unk_2C); D_80177BD8[temp2] = 1; - D_EBFBE0_801AFD18[temp2].unk_18 = 255; + D_menu_801AFD18[temp2].unk_18 = 255; } - if (planet[D_EBFBE0_801CD958].unk_30 != -1) { - temp = func_EBFBE0_801A655C(D_EBFBE0_801CD958, planet[D_EBFBE0_801CD958].unk_30); + if (planet[D_menu_801CD958].unk_30 != -1) { + temp = func_menu_801A655C(D_menu_801CD958, planet[D_menu_801CD958].unk_30); D_80177BD8[temp] = 1; - D_EBFBE0_801AFD18[temp].unk_18 = 255; + D_menu_801AFD18[temp].unk_18 = 255; } } -bool func_EBFBE0_801A5770(void) { +bool func_menu_801A5770(void) { bool ret = false; s8 y = gControllerPress[gMainController].stick_y; @@ -3872,12 +3856,12 @@ bool func_EBFBE0_801A5770(void) { } if (y != 0) { - if (D_EBFBE0_801CEFD4 == 0) { + if (D_menu_801CEFD4 == 0) { ret = true; } - D_EBFBE0_801CEFD4 = y; + D_menu_801CEFD4 = y; } else { - D_EBFBE0_801CEFD4 = 0; + D_menu_801CEFD4 = 0; } if (ret) { @@ -3887,7 +3871,7 @@ bool func_EBFBE0_801A5770(void) { return ret; } -void func_EBFBE0_801A5834(void) { +void func_menu_801A5834(void) { s32 i; f32 x; f32 y; @@ -3899,7 +3883,7 @@ void func_EBFBE0_801A5834(void) { s32 r[3]; s32 g[3]; s32 b[3]; - static f32 D_EBFBE0_801B6A6C[] = { 3.05f, 4.15f }; + static f32 D_menu_801B6A6C[] = { 3.05f, 4.15f }; x = 101.0f; y = 92.0f; @@ -3911,15 +3895,15 @@ void func_EBFBE0_801A5834(void) { r[i] = 64; g[i] = 64; b[i] = 64; - if (i == D_EBFBE0_801CEFDC) { + if (i == D_menu_801CEFDC) { r[i] = 255; - g[i] = D_EBFBE0_801CEFE8[i]; - b[i] = D_EBFBE0_801CEFE8[i]; + g[i] = D_menu_801CEFE8[i]; + b[i] = D_menu_801CEFE8[i]; } } var_t0 = 1; - if (!D_EBFBE0_801CD93C) { + if (!D_menu_801CD93C) { var_t0 = 0; } @@ -3933,12 +3917,12 @@ void func_EBFBE0_801A5834(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 60, 60, 255, 170); - TextureRect_8bIA(&gMasterDisp, D_601B4B0, 24, 17, x, y, 4.6f, D_EBFBE0_801B6A6C[var_t0]); + TextureRect_8bIA(&gMasterDisp, D_601B4B0, 24, 17, x, y, 4.6f, D_menu_801B6A6C[var_t0]); mask = 0xFFFFFFFF; - if (D_EBFBE0_801CF000[colorIndex] != 0) { + if (D_menu_801CF000[colorIndex] != 0) { mask = 0x00000001; - D_EBFBE0_801CF000[colorIndex]--; + D_menu_801CF000[colorIndex]--; } if (gFrameCount & mask) { @@ -3949,11 +3933,11 @@ void func_EBFBE0_801A5834(void) { z = 24.0f; colorIndex++; - if (D_EBFBE0_801CD93C != 0) { + if (D_menu_801CD93C != 0) { mask = 0xFFFFFFFF; - if (D_EBFBE0_801CF000[colorIndex] != 0) { + if (D_menu_801CF000[colorIndex] != 0) { mask = 0x00000001; - D_EBFBE0_801CF000[colorIndex]--; + D_menu_801CF000[colorIndex]--; } if (gFrameCount & mask) { @@ -3965,9 +3949,9 @@ void func_EBFBE0_801A5834(void) { } mask = 0xFFFFFFFF; - if (D_EBFBE0_801CF000[colorIndex] != 0) { + if (D_menu_801CF000[colorIndex] != 0) { mask = 0x00000001; - D_EBFBE0_801CF000[colorIndex]--; + D_menu_801CF000[colorIndex]--; } if (gFrameCount & mask) { @@ -3976,34 +3960,34 @@ void func_EBFBE0_801A5834(void) { } } -void func_EBFBE0_801A5C90(void) { +void func_menu_801A5C90(void) { s32 pad[3]; f32 scale; - if (D_EBFBE0_801CD9CC != 0) { + if (D_menu_801CD9CC != 0) { if (gLifeCount[gPlayerNum] < 10) { scale = 0.13f; } else { scale = 0.18f; } - switch (D_EBFBE0_801CD9CC) { + switch (D_menu_801CD9CC) { case 1: - D_EBFBE0_801CD9C0 = 2; - D_EBFBE0_801CD9CC = 2; + D_menu_801CD9C0 = 2; + D_menu_801CD9CC = 2; break; case 2: - if (D_EBFBE0_801CD9C0 != 0) { + if (D_menu_801CD9C0 != 0) { break; } - if ((D_EBFBE0_801CD9D0 + 1) > 3) { - D_EBFBE0_801CD9D0 = 0; - D_EBFBE0_801CD9CC = 0; + if ((D_menu_801CD9D0 + 1) > 3) { + D_menu_801CD9D0 = 0; + D_menu_801CD9CC = 0; } else { - D_EBFBE0_801CD9D0++; - D_EBFBE0_801CD9CC = 1; + D_menu_801CD9D0++; + D_menu_801CD9CC = 1; } break; } @@ -4023,94 +4007,92 @@ void func_EBFBE0_801A5C90(void) { Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_EBFBE0_801AF824[D_EBFBE0_801CD9D0]); + gSPDisplayList(gMasterDisp++, D_menu_801AF824[D_menu_801CD9D0]); Matrix_Pop(&gGfxMatrix); } } -void func_EBFBE0_801A5E80(void) { - switch (D_EBFBE0_801B8280) { +void func_menu_801A5E80(void) { + switch (D_menu_801B8280) { case 0: - D_EBFBE0_801B8284 = 0; - D_EBFBE0_801CD9A0 = 1; - func_EBFBE0_801A6368(); - D_EBFBE0_801CD9A8 = func_EBFBE0_801A62FC(sCurrentPlanetId); - func_EBFBE0_801AB284(); - D_EBFBE0_801B8280++; + D_menu_801B8284 = 0; + D_menu_801CD9A0 = 1; + func_menu_801A6368(); + D_menu_801CD9A8 = func_menu_801A62FC(sCurrentPlanetId); + func_menu_801AB284(); + D_menu_801B8280++; break; case 1: - if ((gControllerPress[gMainController].button & START_BUTTON) && !(D_EBFBE0_801CD9A8)) { + if ((gControllerPress[gMainController].button & START_BUTTON) && !(D_menu_801CD9A8)) { func_8001A838(0x4100001EU); func_8001AE58(); - D_EBFBE0_801CF018 = 0; - D_EBFBE0_801B8280 = 2; - D_EBFBE0_801CD9B8 = 0; + D_menu_801CF018 = 0; + D_menu_801B8280 = 2; + D_menu_801CD9B8 = 0; } - if ((gControllerPress[gMainController].button & A_BUTTON) && (D_EBFBE0_801CD9A0 == 0) && - !(D_EBFBE0_801CD9A8)) { + if ((gControllerPress[gMainController].button & A_BUTTON) && (D_menu_801CD9A0 == 0) && !(D_menu_801CD9A8)) { func_8001AE58(); D_Timer_801782AC = 0; } - if ((gControllerPress[gMainController].button & A_BUTTON) && (D_EBFBE0_801CD9A0 == 1) && - !(D_EBFBE0_801CD9A8)) { - D_EBFBE0_801CD9A0 = 0; + if ((gControllerPress[gMainController].button & A_BUTTON) && (D_menu_801CD9A0 == 1) && !(D_menu_801CD9A8)) { + D_menu_801CD9A0 = 0; } - if (D_EBFBE0_801CF018 == 7) { - D_EBFBE0_801CD9B8 = 5; - D_EBFBE0_801B8280++; + if (D_menu_801CF018 == 7) { + D_menu_801CD9B8 = 5; + D_menu_801B8280++; } break; case 2: - if (D_EBFBE0_801CD9B8 != 0) { + if (D_menu_801CD9B8 != 0) { break; } - if (D_EBFBE0_801B8284 < 120) { - D_EBFBE0_801B8284 += 15; + if (D_menu_801B8284 < 120) { + D_menu_801B8284 += 15; if (sCurrentPlanetId == PLANET_CORNERIA) { - *D_EBFBE0_801CEB48 = 0; + *D_menu_801CEB48 = 0; } } else { - D_EBFBE0_801CD9B8 = 5; - D_EBFBE0_801CF018 = 0; - D_EBFBE0_801B8280++; + D_menu_801CD9B8 = 5; + D_menu_801CF018 = 0; + D_menu_801B8280++; } break; case 3: - if (D_EBFBE0_801CD9B8 == 0) { - D_EBFBE0_801CD9B8 = 5; - D_EBFBE0_801CD968 = 1; - D_EBFBE0_801B8280++; + if (D_menu_801CD9B8 == 0) { + D_menu_801CD9B8 = 5; + D_menu_801CD968 = 1; + D_menu_801B8280++; } break; case 4: - if (D_EBFBE0_801CD9B8 == 0) { + if (D_menu_801CD9B8 == 0) { Audio_PlaySfx(0x49002016U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801CD9B8 = 75; - D_EBFBE0_801B8280++; + D_menu_801CD9B8 = 75; + D_menu_801B8280++; } break; case 5: - if (D_EBFBE0_801CD9B8 == 0) { - func_EBFBE0_801A61B4(gCurrentLevel); - D_EBFBE0_801B8280 = 0; - D_EBFBE0_801CD968 = 0; - func_EBFBE0_801A6628(); + if (D_menu_801CD9B8 == 0) { + func_menu_801A61B4(gCurrentLevel); + D_menu_801B8280 = 0; + D_menu_801CD968 = 0; + func_menu_801A6628(); } break; } } -void func_EBFBE0_801A61B4(LevelId level) { +void func_menu_801A61B4(LevelId level) { switch (level) { case LEVEL_CORNERIA: func_8001DC6C(0, 0); @@ -4172,7 +4154,7 @@ void func_EBFBE0_801A61B4(LevelId level) { } } -bool func_EBFBE0_801A62FC(PlanetId planet) { +bool func_menu_801A62FC(PlanetId planet) { u32 planetSaveSlot; s32 ret = true; @@ -4205,7 +4187,7 @@ bool func_EBFBE0_801A62FC(PlanetId planet) { return ret; } -void func_EBFBE0_801A6368(void) { +void func_menu_801A6368(void) { switch (sCurrentPlanetId) { case PLANET_CORNERIA: gCurrentLevel = LEVEL_CORNERIA; @@ -4340,11 +4322,11 @@ PlanetId GetPlanetId(LevelId level) { return planet; } -s32 func_EBFBE0_801A655C(s32 arg0, s32 arg1) { +s32 func_menu_801A655C(s32 arg0, s32 arg1) { s32 i; for (i = 0; i < 24; i++) { - if ((D_EBFBE0_801AFD18[i].unk_04 == arg0) && (D_EBFBE0_801AFD18[i].unk_08 == arg1)) { + if ((D_menu_801AFD18[i].unk_04 == arg0) && (D_menu_801AFD18[i].unk_08 == arg1)) { break; } } @@ -4352,7 +4334,7 @@ s32 func_EBFBE0_801A655C(s32 arg0, s32 arg1) { return i; } -void func_EBFBE0_801A659C(void) { +void func_menu_801A659C(void) { func_8001A838(0x1100004C); func_8001A838(0x1100204C); @@ -4360,12 +4342,12 @@ void func_EBFBE0_801A659C(void) { Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } - D_EBFBE0_801CEFC8 = 0; - D_EBFBE0_801CD944 = 2; - D_EBFBE0_801CD948 = 0; + D_menu_801CEFC8 = 0; + D_menu_801CD944 = 2; + D_menu_801CD948 = 0; } -void func_EBFBE0_801A6628(void) { +void func_menu_801A6628(void) { gGameState = GSTATE_PLAY; D_Timer_8017783C = 2; D_80177854 = 0; @@ -4379,7 +4361,7 @@ void func_EBFBE0_801A6628(void) { D_8017782C = 1; } -void func_EBFBE0_801A6694(void) { +void func_menu_801A6694(void) { PlanetId planetId; Vec3f dest; Vec3f src; @@ -4396,11 +4378,11 @@ void func_EBFBE0_801A6694(void) { Matrix_RotateY(gGfxMatrix, M_DTOR * -planet[planetId].unk_1C, 1); - func_EBFBE0_801AD048(); + func_menu_801AD048(); Matrix_SetGfxMtx(&gMasterDisp); - Matrix_Copy(&D_EBFBE0_801CDA60[planetId], gGfxMatrix); + Matrix_Copy(&D_menu_801CDA60[planetId], gGfxMatrix); Matrix_MultVec3f(gGfxMatrix, &src, &dest); @@ -4412,42 +4394,42 @@ void func_EBFBE0_801A6694(void) { Matrix_Push(&gGfxMatrix); - Matrix_LookAt(gGfxMatrix, D_EBFBE0_801CD9F4, D_EBFBE0_801CD9F8, D_EBFBE0_801CD9FC, D_EBFBE0_801CDA00, - D_EBFBE0_801CDA04, D_EBFBE0_801CDA08, D_EBFBE0_801CDA20, D_EBFBE0_801CDA24, D_EBFBE0_801CDA28, 1); - Matrix_Translate(gGfxMatrix, D_EBFBE0_801CEA58, D_EBFBE0_801CEA5C, D_EBFBE0_801CEA60, 1); - Matrix_Mult(gGfxMatrix, &D_EBFBE0_801CDA60[planetId], 1); + Matrix_LookAt(gGfxMatrix, D_menu_801CD9F4, D_menu_801CD9F8, D_menu_801CD9FC, D_menu_801CDA00, D_menu_801CDA04, + D_menu_801CDA08, D_menu_801CDA20, D_menu_801CDA24, D_menu_801CDA28, 1); + Matrix_Translate(gGfxMatrix, D_menu_801CEA58, D_menu_801CEA5C, D_menu_801CEA60, 1); + Matrix_Mult(gGfxMatrix, &D_menu_801CDA60[planetId], 1); Matrix_SetGfxMtx(&gMasterDisp); - Matrix_MultVec3f(gGfxMatrix, &src, &D_EBFBE0_801CE960[planetId]); + Matrix_MultVec3f(gGfxMatrix, &src, &D_menu_801CE960[planetId]); Matrix_Pop(&gGfxMatrix); } } -void func_EBFBE0_801A68E4(void) { +void func_menu_801A68E4(void) { s32 i; s32 j; s32 var_a0; for (i = 0; i < 14; i++) { for (j = i; j < 15; j++) { - if (D_EBFBE0_801CE960[D_EBFBE0_801CD8A0[i]].z > D_EBFBE0_801CE960[D_EBFBE0_801CD8A0[j]].z) { - var_a0 = D_EBFBE0_801CD8A0[i]; - D_EBFBE0_801CD8A0[i] = D_EBFBE0_801CD8A0[j]; - D_EBFBE0_801CD8A0[j] = var_a0; + if (D_menu_801CE960[D_menu_801CD8A0[i]].z > D_menu_801CE960[D_menu_801CD8A0[j]].z) { + var_a0 = D_menu_801CD8A0[i]; + D_menu_801CD8A0[i] = D_menu_801CD8A0[j]; + D_menu_801CD8A0[j] = var_a0; } } } } -void func_EBFBE0_801A6A24(void) { - switch (D_EBFBE0_801CD960) { +void func_menu_801A6A24(void) { + switch (D_menu_801CD960) { case 0: if (D_80178340 != 0) { D_80178340 -= 5; } else { - D_EBFBE0_801CD960 = 255; + D_menu_801CD960 = 255; } break; @@ -4455,13 +4437,13 @@ void func_EBFBE0_801A6A24(void) { if (D_80178340 != 255) { D_80178340 += 15; } else { - D_EBFBE0_801CD960 = 255; + D_menu_801CD960 = 255; } break; } } -void func_EBFBE0_801A6A98(PlanetId planetId) { +void func_menu_801A6A98(PlanetId planetId) { s32 mask; s32 temp; @@ -4469,85 +4451,85 @@ void func_EBFBE0_801A6A98(PlanetId planetId) { return; } - if ((planetId == sCurrentPlanetId) && (D_EBFBE0_801CD944 == 2) && (D_EBFBE0_801CD95C != 0)) { + if ((planetId == sCurrentPlanetId) && (D_menu_801CD944 == 2) && (D_menu_801CD95C != 0)) { mask = 0x00000001; } else { mask = 0xFFFFFFFF; } - temp = func_EBFBE0_801A6DAC(planetId); + temp = func_menu_801A6DAC(planetId); - func_EBFBE0_801A6EC0(planetId); - func_EBFBE0_801A7D3C(planetId); + func_menu_801A6EC0(planetId); + func_menu_801A7D3C(planetId); Matrix_Push(&gGfxMatrix); if (gFrameCount & mask) { if (planetId == PLANET_TITANIA) { - func_EBFBE0_801A791C(planetId); + func_menu_801A791C(planetId); } - if ((temp == 1) && (D_EBFBE0_801CE960[planetId].z > D_EBFBE0_801CEA18[planetId]) && - (planetId != PLANET_AREA_6) && (planetId != PLANET_BOLSE)) { + if ((temp == 1) && (D_menu_801CE960[planetId].z > D_menu_801CEA18[planetId]) && (planetId != PLANET_AREA_6) && + (planetId != PLANET_BOLSE)) { - func_EBFBE0_801A7F1C(planetId); + func_menu_801A7F1C(planetId); } - func_EBFBE0_801A7230(planetId); + func_menu_801A7230(planetId); if (planetId == PLANET_SOLAR) { - func_EBFBE0_801A74F4(planetId); + func_menu_801A74F4(planetId); } if (planet[planetId].unk_28 == 4) { if (planetId != PLANET_VENOM) { if ((planetId != PLANET_AQUAS) && (planetId != PLANET_TITANIA)) { - func_EBFBE0_801A7684(planetId); + func_menu_801A7684(planetId); } - func_EBFBE0_801A77B0(planetId); + func_menu_801A77B0(planetId); } if (planetId == PLANET_VENOM) { - func_EBFBE0_801A7BEC(&D_EBFBE0_801CEEBC, 0.1f, 3.1f); - func_EBFBE0_801A7BEC(&D_EBFBE0_801CEEC0, -0.1f, 2.9f); + func_menu_801A7BEC(&D_menu_801CEEBC, 0.1f, 3.1f); + func_menu_801A7BEC(&D_menu_801CEEC0, -0.1f, 2.9f); } } if (planetId == PLANET_TITANIA) { - func_EBFBE0_801A7A84(planetId); + func_menu_801A7A84(planetId); } - if ((planetId == PLANET_CORNERIA) && D_EBFBE0_801CEB48[0]) { - func_EBFBE0_801A89BC(PLANET_CORNERIA, 0); + if ((planetId == PLANET_CORNERIA) && D_menu_801CEB48[0]) { + func_menu_801A89BC(PLANET_CORNERIA, 0); } - if ((planetId == PLANET_KATINA) && D_EBFBE0_801CEB48[1]) { - func_EBFBE0_801A89BC(PLANET_KATINA, 1); + if ((planetId == PLANET_KATINA) && D_menu_801CEB48[1]) { + func_menu_801A89BC(PLANET_KATINA, 1); } - if ((planetId == PLANET_SECTOR_Y) && D_EBFBE0_801CEB48[2]) { - func_EBFBE0_801A89BC(PLANET_SECTOR_Y, 2); + if ((planetId == PLANET_SECTOR_Y) && D_menu_801CEB48[2]) { + func_menu_801A89BC(PLANET_SECTOR_Y, 2); } - if ((temp == 1) && (D_EBFBE0_801CE960[planetId].z <= D_EBFBE0_801CEA18[planetId]) && - (planetId != PLANET_AREA_6) && (planetId != PLANET_BOLSE)) { + if ((temp == 1) && (D_menu_801CE960[planetId].z <= D_menu_801CEA18[planetId]) && (planetId != PLANET_AREA_6) && + (planetId != PLANET_BOLSE)) { - func_EBFBE0_801A7F1C(planetId); + func_menu_801A7F1C(planetId); } if ((temp == 1) && ((planetId == PLANET_AREA_6) || (planetId == PLANET_BOLSE))) { - func_EBFBE0_801A7F1C(planetId); + func_menu_801A7F1C(planetId); } if (temp == 2) { - func_EBFBE0_801A809C(planetId); + func_menu_801A809C(planetId); } } Matrix_Pop(&gGfxMatrix); } -s32 func_EBFBE0_801A6DAC(PlanetId planetId) { +s32 func_menu_801A6DAC(PlanetId planetId) { s32 ret; s32 planetSaveSlot; s32 var_v0; @@ -4590,7 +4572,7 @@ s32 func_EBFBE0_801A6DAC(PlanetId planetId) { return ret; } -void func_EBFBE0_801A6EC0(PlanetId planetId) { +void func_menu_801A6EC0(PlanetId planetId) { f32 dirX; f32 dirY; f32 dirZ; @@ -4608,15 +4590,15 @@ void func_EBFBE0_801A6EC0(PlanetId planetId) { Matrix_Push(&gGfxMatrix); - Matrix_Mult(gGfxMatrix, &D_EBFBE0_801CDA60[planetId], 1); + Matrix_Mult(gGfxMatrix, &D_menu_801CDA60[planetId], 1); if (planet[planetId].unk_28 == 2) { if (planetId == 2) { - Matrix_RotateX(gGfxMatrix, M_DTOR * D_EBFBE0_801AFFF8, 1); - Matrix_RotateY(gGfxMatrix, M_DTOR * D_EBFBE0_801AFFF4, 1); + Matrix_RotateX(gGfxMatrix, M_DTOR * D_menu_801AFFF8, 1); + Matrix_RotateY(gGfxMatrix, M_DTOR * D_menu_801AFFF4, 1); } else { - Matrix_RotateX(gGfxMatrix, M_DTOR * D_EBFBE0_801B0000, 1); - Matrix_RotateY(gGfxMatrix, M_DTOR * D_EBFBE0_801AFFFC, 1); + Matrix_RotateX(gGfxMatrix, M_DTOR * D_menu_801B0000, 1); + Matrix_RotateY(gGfxMatrix, M_DTOR * D_menu_801AFFFC, 1); } } @@ -4627,9 +4609,9 @@ void func_EBFBE0_801A6EC0(PlanetId planetId) { Matrix_SetGfxMtx(&gMasterDisp); if (planet[planetId].unk_28 == 2) { - x2 = D_EBFBE0_801CE960[14].x - D_EBFBE0_801CE960[planetId].x; - y2 = D_EBFBE0_801CE960[14].y - D_EBFBE0_801CE960[planetId].y; - z2 = D_EBFBE0_801CE960[14].z - D_EBFBE0_801CE960[planetId].z; + x2 = D_menu_801CE960[14].x - D_menu_801CE960[planetId].x; + y2 = D_menu_801CE960[14].y - D_menu_801CE960[planetId].y; + z2 = D_menu_801CE960[14].z - D_menu_801CE960[planetId].z; x1 = Math_Atan2F(y2, sqrtf(SQ(x2) + SQ(z2))); y1 = -Math_Atan2F(x2, z2); @@ -4638,8 +4620,8 @@ void func_EBFBE0_801A6EC0(PlanetId planetId) { src.y = 0.0f; src.z = 100.0f; - Matrix_RotateY(gCalcMatrix, M_DTOR * (-D_EBFBE0_801CDA10 - y1), 0); - Matrix_RotateX(gCalcMatrix, M_DTOR * (-D_EBFBE0_801CDA0C - x1), 1); + Matrix_RotateY(gCalcMatrix, M_DTOR * (-D_menu_801CDA10 - y1), 0); + Matrix_RotateX(gCalcMatrix, M_DTOR * (-D_menu_801CDA0C - x1), 1); Matrix_MultVec3f(gCalcMatrix, &src, &dst); @@ -4649,19 +4631,19 @@ void func_EBFBE0_801A6EC0(PlanetId planetId) { Lights_SetOneLight(&gMasterDisp, dirX, dirY, dirZ, 80, 80, 60, 10, 10, 8); } - Matrix_Copy(&D_EBFBE0_801CDE20[planetId], gGfxMatrix); + Matrix_Copy(&D_menu_801CDE20[planetId], gGfxMatrix); Matrix_Pop(&gGfxMatrix); - D_EBFBE0_801AFFF4 += 0.1f; - D_EBFBE0_801AFFFC -= 0.09f; + D_menu_801AFFF4 += 0.1f; + D_menu_801AFFFC -= 0.09f; } -void func_EBFBE0_801A7230(PlanetId planetId) { +void func_menu_801A7230(PlanetId planetId) { switch (planet[planetId].unk_28) { case 0: - if ((D_EBFBE0_801CD944 == 3 || planetId == sCurrentPlanetId || planetId == D_EBFBE0_801CD958) && - D_EBFBE0_801CD944 != 1 && D_EBFBE0_801CD944 != 7) { + if ((D_menu_801CD944 == 3 || planetId == sCurrentPlanetId || planetId == D_menu_801CD958) && + D_menu_801CD944 != 1 && D_menu_801CD944 != 7) { RCP_SetupDL(&gMasterDisp, 0x35); } else { RCP_SetupDL(&gMasterDisp, 0x29); @@ -4670,8 +4652,8 @@ void func_EBFBE0_801A7230(PlanetId planetId) { break; case 2: - if ((D_EBFBE0_801CD944 == 3 || planetId == sCurrentPlanetId || planetId == D_EBFBE0_801CD958) && - D_EBFBE0_801CD944 != 1 && D_EBFBE0_801CD944 != 7) { + if ((D_menu_801CD944 == 3 || planetId == sCurrentPlanetId || planetId == D_menu_801CD958) && + D_menu_801CD944 != 1 && D_menu_801CD944 != 7) { RCP_SetupDL(&gMasterDisp, 0x17); } else { RCP_SetupDL(&gMasterDisp, 0x2E); @@ -4698,16 +4680,16 @@ void func_EBFBE0_801A7230(PlanetId planetId) { Matrix_Push(&gGfxMatrix); - Matrix_Copy(gGfxMatrix, &D_EBFBE0_801CDE20[planetId]); + Matrix_Copy(gGfxMatrix, &D_menu_801CDE20[planetId]); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_EBFBE0_801B68F8[planet[planetId].id]); + gSPDisplayList(gMasterDisp++, D_menu_801B68F8[planet[planetId].id]); Matrix_Pop(&gGfxMatrix); } -void func_EBFBE0_801A74F4(PlanetId planetId) { - static f32 D_EBFBE0_801B6A74 = 0.0f; +void func_menu_801A74F4(PlanetId planetId) { + static f32 D_menu_801B6A74 = 0.0f; s32 alpha = planet[13].alpha; if (planet[planetId].alpha > 128) { @@ -4721,20 +4703,20 @@ void func_EBFBE0_801A74F4(PlanetId planetId) { Matrix_Push(&gGfxMatrix); - Matrix_Copy(gGfxMatrix, &D_EBFBE0_801CDE20[planetId]); - Matrix_RotateZ(gGfxMatrix, M_DTOR * D_EBFBE0_801B6A74, 1); + Matrix_Copy(gGfxMatrix, &D_menu_801CDE20[planetId]); + Matrix_RotateZ(gGfxMatrix, M_DTOR * D_menu_801B6A74, 1); Matrix_Scale(gGfxMatrix, 0.8f, 0.8f, 0.8f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_EBFBE0_801B68F8[planet[planetId].id]); + gSPDisplayList(gMasterDisp++, D_menu_801B68F8[planet[planetId].id]); Matrix_Pop(&gGfxMatrix); - D_EBFBE0_801B6A74 -= 0.2f; + D_menu_801B6A74 -= 0.2f; } -void func_EBFBE0_801A7684(PlanetId planetId) { +void func_menu_801A7684(PlanetId planetId) { s32 r; s32 g; s32 b; @@ -4750,22 +4732,22 @@ void func_EBFBE0_801A7684(PlanetId planetId) { gDPSetPrimColor(gMasterDisp++, 0, 0, r, g, b, planet[planetId].alpha); Matrix_Push(&gGfxMatrix); - Matrix_Copy(gGfxMatrix, &D_EBFBE0_801CDE20[planetId]); + Matrix_Copy(gGfxMatrix, &D_menu_801CDE20[planetId]); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_EBFBE0_801B4A40); + gSPDisplayList(gMasterDisp++, D_menu_801B4A40); Matrix_Pop(&gGfxMatrix); } -void func_EBFBE0_801A77B0(PlanetId planetId) { +void func_menu_801A77B0(PlanetId planetId) { RCP_SetupDL(&gMasterDisp, 0x40); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, planet[planetId].alpha); Matrix_Push(&gGfxMatrix); - Matrix_Copy(gGfxMatrix, &D_EBFBE0_801CDE20[planetId]); + Matrix_Copy(gGfxMatrix, &D_menu_801CDE20[planetId]); if ((planetId == 10) || (planetId == 7) || (planetId == 8)) { Matrix_RotateY(gGfxMatrix, M_DTOR * 180.0f, 1); @@ -4781,7 +4763,7 @@ void func_EBFBE0_801A77B0(PlanetId planetId) { Matrix_Pop(&gGfxMatrix); } -void func_EBFBE0_801A791C(PlanetId planetId) { +void func_menu_801A791C(PlanetId planetId) { RCP_SetupDL(&gMasterDisp, 0x43); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 175, 175, planet[planetId].alpha); @@ -4789,7 +4771,7 @@ void func_EBFBE0_801A791C(PlanetId planetId) { Matrix_Push(&gGfxMatrix); - Matrix_Copy(gGfxMatrix, &D_EBFBE0_801CDE20[planetId]); + Matrix_Copy(gGfxMatrix, &D_menu_801CDE20[planetId]); Matrix_RotateZ(gGfxMatrix, M_DTOR * -planet[planetId].zAngle, 1); Matrix_RotateX(gGfxMatrix, M_DTOR * 20.0f, 1); @@ -4803,7 +4785,7 @@ void func_EBFBE0_801A791C(PlanetId planetId) { Matrix_Pop(&gGfxMatrix); } -void func_EBFBE0_801A7A84(PlanetId planetId) { +void func_menu_801A7A84(PlanetId planetId) { RCP_SetupDL(&gMasterDisp, 0x43); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 175, 175, planet[planetId].alpha); @@ -4811,7 +4793,7 @@ void func_EBFBE0_801A7A84(PlanetId planetId) { Matrix_Push(&gGfxMatrix); - Matrix_Copy(gGfxMatrix, &D_EBFBE0_801CDE20[planetId]); + Matrix_Copy(gGfxMatrix, &D_menu_801CDE20[planetId]); Matrix_RotateZ(gGfxMatrix, M_DTOR * -planet[planetId].zAngle, 1); Matrix_RotateX(gGfxMatrix, M_DTOR * 20.0f, 1); Matrix_Scale(gGfxMatrix, 3.0f, 3.0f, 3.0f, 1); @@ -4823,7 +4805,7 @@ void func_EBFBE0_801A7A84(PlanetId planetId) { Matrix_Pop(&gGfxMatrix); } -void func_EBFBE0_801A7BEC(f32* zAngle, f32 next, f32 scale) { +void func_menu_801A7BEC(f32* zAngle, f32 next, f32 scale) { s32 alpha = planet[13].alpha; if (planet[13].alpha > 128) { @@ -4837,7 +4819,7 @@ void func_EBFBE0_801A7BEC(f32* zAngle, f32 next, f32 scale) { Matrix_Push(&gGfxMatrix); - Matrix_Copy(gGfxMatrix, &D_EBFBE0_801CDE20[13]); + Matrix_Copy(gGfxMatrix, &D_menu_801CDE20[13]); Matrix_RotateZ(gGfxMatrix, M_DTOR * (*zAngle), 1); Matrix_Scale(gGfxMatrix, scale, scale, scale, 1); @@ -4850,7 +4832,7 @@ void func_EBFBE0_801A7BEC(f32* zAngle, f32 next, f32 scale) { *zAngle += next; } -void func_EBFBE0_801A7D3C(PlanetId planetId) { +void func_menu_801A7D3C(PlanetId planetId) { Vec3f src; Vec3f dest; f32 scale; @@ -4863,35 +4845,35 @@ void func_EBFBE0_801A7D3C(PlanetId planetId) { Matrix_Push(&gGfxMatrix); - Matrix_Mult(gGfxMatrix, &D_EBFBE0_801CDA60[planetId], 1); - Matrix_RotateY(gGfxMatrix, M_DTOR * D_EBFBE0_801CEAF8[planetId], 1); - Matrix_Translate(gGfxMatrix, D_EBFBE0_801AFFB8[planetId], 0.0f, 0.0f, 1); - Matrix_RotateY(gGfxMatrix, M_DTOR * -D_EBFBE0_801CEAF8[planetId], 1); + Matrix_Mult(gGfxMatrix, &D_menu_801CDA60[planetId], 1); + Matrix_RotateY(gGfxMatrix, M_DTOR * D_menu_801CEAF8[planetId], 1); + Matrix_Translate(gGfxMatrix, D_menu_801AFFB8[planetId], 0.0f, 0.0f, 1); + Matrix_RotateY(gGfxMatrix, M_DTOR * -D_menu_801CEAF8[planetId], 1); Matrix_SetGfxMtx(&gMasterDisp); - Matrix_Copy(&D_EBFBE0_801CE5A0[planetId], gGfxMatrix); - Matrix_RotateZ(gGfxMatrix, M_DTOR * D_EBFBE0_801CEAB8[planetId], 1); + Matrix_Copy(&D_menu_801CE5A0[planetId], gGfxMatrix); + Matrix_RotateZ(gGfxMatrix, M_DTOR * D_menu_801CEAB8[planetId], 1); Matrix_Scale(gGfxMatrix, scale, scale, scale, 1); Matrix_MultVec3f(gGfxMatrix, &src, &dest); - D_EBFBE0_801CEA18[planetId] = dest.z; + D_menu_801CEA18[planetId] = dest.z; Matrix_SetGfxMtx(&gMasterDisp); - Matrix_Copy(&D_EBFBE0_801CE1E0[planetId], gGfxMatrix); + Matrix_Copy(&D_menu_801CE1E0[planetId], gGfxMatrix); Matrix_Pop(&gGfxMatrix); } -void func_EBFBE0_801A7F1C(PlanetId planetId) { +void func_menu_801A7F1C(PlanetId planetId) { s32 alpha; - if (D_EBFBE0_801CD980 != 1) { - alpha = D_EBFBE0_801CD900[planetId]; + if (D_menu_801CD980 != 1) { + alpha = D_menu_801CD900[planetId]; } else { - alpha = D_EBFBE0_801CD984; - D_EBFBE0_801CD900[planetId] = 255; + alpha = D_menu_801CD984; + D_menu_801CD900[planetId] = 255; } if (alpha != 0) { @@ -4902,39 +4884,39 @@ void func_EBFBE0_801A7F1C(PlanetId planetId) { Matrix_Push(&gGfxMatrix); - Matrix_Copy(gGfxMatrix, &D_EBFBE0_801CE1E0[planetId]); + Matrix_Copy(gGfxMatrix, &D_menu_801CE1E0[planetId]); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_604D680); Matrix_Pop(&gGfxMatrix); - D_EBFBE0_801CEAB8[planetId] += 45.0f; - if (D_EBFBE0_801CD980 == 0) { - D_EBFBE0_801CEAF8[planetId] += 5.0f; + D_menu_801CEAB8[planetId] += 45.0f; + if (D_menu_801CD980 == 0) { + D_menu_801CEAF8[planetId] += 5.0f; } } } -void func_EBFBE0_801A809C(PlanetId planetId) { - static f32 D_EBFBE0_801B6A78 = 0.0f; +void func_menu_801A809C(PlanetId planetId) { + static f32 D_menu_801B6A78 = 0.0f; s32 i; s32 alpha; f32 scale; - if (D_EBFBE0_801CD98C != 1) { - alpha = D_EBFBE0_801CD900[planetId]; + if (D_menu_801CD98C != 1) { + alpha = D_menu_801CD900[planetId]; } else { - alpha = D_EBFBE0_801CD984; - D_EBFBE0_801CD900[planetId] = 255; + alpha = D_menu_801CD984; + D_menu_801CD900[planetId] = 255; } if (alpha == 0) { return; } - if (D_EBFBE0_801CD98C == 1) { - switch (D_EBFBE0_801CD990) { + if (D_menu_801CD98C == 1) { + switch (D_menu_801CD990) { case 0: RCP_SetupDL(&gMasterDisp, 0x43); @@ -4943,7 +4925,7 @@ void func_EBFBE0_801A809C(PlanetId planetId) { Matrix_Push(&gGfxMatrix); - Matrix_Copy(gGfxMatrix, &D_EBFBE0_801CE1E0[planetId]); + Matrix_Copy(gGfxMatrix, &D_menu_801CE1E0[planetId]); Matrix_Translate(gGfxMatrix, 0.0f, -30.0f, 0.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -4952,34 +4934,34 @@ void func_EBFBE0_801A809C(PlanetId planetId) { Matrix_Pop(&gGfxMatrix); - D_EBFBE0_801CEAB8[planetId] += 45.0f; + D_menu_801CEAB8[planetId] += 45.0f; if (alpha == 255) { - D_EBFBE0_801CD9C8 = 15; - D_EBFBE0_801CD998 = 0; - D_EBFBE0_801CD994 = 255; - D_EBFBE0_801CD99C = 0.0f; - D_EBFBE0_801CD990++; + D_menu_801CD9C8 = 15; + D_menu_801CD998 = 0; + D_menu_801CD994 = 255; + D_menu_801CD99C = 0.0f; + D_menu_801CD990++; } break; case 1: scale = 5.0f + (Rand_ZeroOne() * 4.0f); - Math_SmoothStepToF(&D_EBFBE0_801CD99C, 150.0f, 0.09f, 100.0f, 0.1f); + Math_SmoothStepToF(&D_menu_801CD99C, 150.0f, 0.09f, 100.0f, 0.1f); RCP_SetupDL(&gMasterDisp, 0x43); - gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_EBFBE0_801CD994); + gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_menu_801CD994); gDPSetEnvColor(gMasterDisp++, 80, 80, 0, 0); for (i = 0; i < 8; i++) { Matrix_Push(&gGfxMatrix); - Matrix_Copy(gGfxMatrix, &D_EBFBE0_801CE5A0[planetId]); + Matrix_Copy(gGfxMatrix, &D_menu_801CE5A0[planetId]); Matrix_Translate(gGfxMatrix, 0.0f, -30.0f, 0.0f, 1); Matrix_RotateZ(gGfxMatrix, M_DTOR * (i * -45.0f), 1); - Matrix_Translate(gGfxMatrix, 0.0f, D_EBFBE0_801CD99C, 0.0f, 1); - Matrix_RotateZ(gGfxMatrix, M_DTOR * (D_EBFBE0_801B6A78), 1); + Matrix_Translate(gGfxMatrix, 0.0f, D_menu_801CD99C, 0.0f, 1); + Matrix_RotateZ(gGfxMatrix, M_DTOR * (D_menu_801B6A78), 1); Matrix_Scale(gGfxMatrix, scale, scale, scale, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -4989,21 +4971,21 @@ void func_EBFBE0_801A809C(PlanetId planetId) { Matrix_Pop(&gGfxMatrix); } - D_EBFBE0_801B6A78 += 45.0f; - D_EBFBE0_801CD994 -= 16; + D_menu_801B6A78 += 45.0f; + D_menu_801CD994 -= 16; - if (D_EBFBE0_801CD994 <= 0) { - D_EBFBE0_801CD994 = 0; + if (D_menu_801CD994 <= 0) { + D_menu_801CD994 = 0; } RCP_SetupDL(&gMasterDisp, 0x40); gDPSetTextureFilter(gMasterDisp++, G_TF_POINT); - gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_EBFBE0_801CD998); + gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_menu_801CD998); Matrix_Push(&gGfxMatrix); - Matrix_Copy(gGfxMatrix, &D_EBFBE0_801CE5A0[planetId]); + Matrix_Copy(gGfxMatrix, &D_menu_801CE5A0[planetId]); Matrix_Translate(gGfxMatrix, 0.0f, -30.0f, 0.0f, 1); Matrix_Scale(gGfxMatrix, 3.0f, 3.0f, 3.0f, 1); @@ -5013,22 +4995,22 @@ void func_EBFBE0_801A809C(PlanetId planetId) { Matrix_Pop(&gGfxMatrix); - D_EBFBE0_801CEAF8[planetId] = -90.0f; + D_menu_801CEAF8[planetId] = -90.0f; - D_EBFBE0_801CD998 += 8; + D_menu_801CD998 += 8; - if (D_EBFBE0_801CD998 == 8) { + if (D_menu_801CD998 == 8) { Audio_PlaySfx(0x49008030U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } - if (D_EBFBE0_801CD998 >= 255) { - D_EBFBE0_801CD998 = 255; + if (D_menu_801CD998 >= 255) { + D_menu_801CD998 = 255; } - if (D_EBFBE0_801CD998 == 255) { - if (!D_EBFBE0_801CD9C8) { - D_EBFBE0_801CD98C = 0; + if (D_menu_801CD998 == 255) { + if (!D_menu_801CD9C8) { + D_menu_801CD98C = 0; } else { - D_EBFBE0_801CD9C8--; + D_menu_801CD9C8--; } } break; @@ -5041,7 +5023,7 @@ void func_EBFBE0_801A809C(PlanetId planetId) { Matrix_Push(&gGfxMatrix); - Matrix_Copy(gGfxMatrix, &D_EBFBE0_801CE5A0[planetId]); + Matrix_Copy(gGfxMatrix, &D_menu_801CE5A0[planetId]); Matrix_Translate(gGfxMatrix, 0.0f, -30.0f, 0.0f, 1); Matrix_Scale(gGfxMatrix, 3.0f, 3.0f, 3.0f, 1); @@ -5051,56 +5033,56 @@ void func_EBFBE0_801A809C(PlanetId planetId) { Matrix_Pop(&gGfxMatrix); - D_EBFBE0_801CEAF8[planetId] = -90.0f; + D_menu_801CEAF8[planetId] = -90.0f; } } -void func_EBFBE0_801A8738(void) { - if (D_EBFBE0_801CEB34 >= 0) { +void func_menu_801A8738(void) { + if (D_menu_801CEB34 >= 0) { RCP_SetupDL(&gMasterDisp, 0x43); gDPSetEnvColor(gMasterDisp++, 255, 0, 0, 0); - switch (D_EBFBE0_801CEB34) { + switch (D_menu_801CEB34) { case 0: - D_EBFBE0_801CEB3C += 0.15f; - if (D_EBFBE0_801CEB3C >= 0.7f) { - D_EBFBE0_801CEB3C = 0.8f; - D_EBFBE0_801CEB34 = 2; - D_EBFBE0_801CEB40 = 2.0f; + D_menu_801CEB3C += 0.15f; + if (D_menu_801CEB3C >= 0.7f) { + D_menu_801CEB3C = 0.8f; + D_menu_801CEB34 = 2; + D_menu_801CEB40 = 2.0f; } break; case 2: - D_EBFBE0_801CEB40--; - if (D_EBFBE0_801CEB40 <= 0.0f) { - D_EBFBE0_801CEB34 = 3; - D_EBFBE0_801CEB3C = 0.7f; + D_menu_801CEB40--; + if (D_menu_801CEB40 <= 0.0f) { + D_menu_801CEB34 = 3; + D_menu_801CEB3C = 0.7f; } break; case 3: - D_EBFBE0_801CEB38 -= 8; - D_EBFBE0_801CEB3C -= 0.001f; + D_menu_801CEB38 -= 8; + D_menu_801CEB3C -= 0.001f; - if (D_EBFBE0_801CEB38 < 0) { - D_EBFBE0_801CEB38 = 0; + if (D_menu_801CEB38 < 0) { + D_menu_801CEB38 = 0; } - if (D_EBFBE0_801CEB38 == 0) { - D_EBFBE0_801CEB34 = 4; + if (D_menu_801CEB38 == 0) { + D_menu_801CEB34 = 4; } break; } - gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 200, 200, D_EBFBE0_801CEB38); + gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 200, 200, D_menu_801CEB38); Matrix_Push(&gGfxMatrix); - Matrix_Copy(gGfxMatrix, &D_EBFBE0_801CE060); + Matrix_Copy(gGfxMatrix, &D_menu_801CE060); Matrix_RotateZ(gGfxMatrix, M_DTOR * -50.0f, 1); Matrix_Translate(gGfxMatrix, 0.0f, 25.0f, 0.0f, 1); - Matrix_Scale(gGfxMatrix, D_EBFBE0_801CEB3C, D_EBFBE0_801CEB3C, D_EBFBE0_801CEB3C, 1); + Matrix_Scale(gGfxMatrix, D_menu_801CEB3C, D_menu_801CEB3C, D_menu_801CEB3C, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -5110,7 +5092,7 @@ void func_EBFBE0_801A8738(void) { } } -void func_EBFBE0_801A89BC(PlanetId planetId, s32 arg1) { +void func_menu_801A89BC(PlanetId planetId, s32 arg1) { s32 i; s32 temp2; f32 temp; @@ -5119,7 +5101,7 @@ void func_EBFBE0_801A89BC(PlanetId planetId, s32 arg1) { return; } - if (D_EBFBE0_801CEB48[arg1] == 0) { + if (D_menu_801CEB48[arg1] == 0) { return; } @@ -5133,59 +5115,59 @@ void func_EBFBE0_801A89BC(PlanetId planetId, s32 arg1) { gDPSetEnvColor(gMasterDisp++, 255, 0, 0, 0); for (i = 0; i < temp2; i++) { - switch (D_EBFBE0_801CEB58[arg1][i]) { + switch (D_menu_801CEB58[arg1][i]) { case 0: - D_EBFBE0_801CEC48[arg1][i] += 0.1f; - if (D_EBFBE0_801CEC48[arg1][i] >= D_EBFBE0_801CECC0[arg1][i]) { - D_EBFBE0_801CEC48[arg1][i] = D_EBFBE0_801CECC0[arg1][i]; - D_EBFBE0_801CEB58[arg1][i] = 1; + D_menu_801CEC48[arg1][i] += 0.1f; + if (D_menu_801CEC48[arg1][i] >= D_menu_801CECC0[arg1][i]) { + D_menu_801CEC48[arg1][i] = D_menu_801CECC0[arg1][i]; + D_menu_801CEB58[arg1][i] = 1; } break; case 1: - D_EBFBE0_801CEE28[arg1][i]--; - if (D_EBFBE0_801CEE28[arg1][i] <= 0) { - D_EBFBE0_801CEB58[arg1][i] = 2; + D_menu_801CEE28[arg1][i]--; + if (D_menu_801CEE28[arg1][i] <= 0) { + D_menu_801CEB58[arg1][i] = 2; } break; case 2: - D_EBFBE0_801CEBD0[arg1][i] -= 48; - if (D_EBFBE0_801CEBD0[arg1][i] < 0) { - D_EBFBE0_801CEBD0[arg1][i] = 0; - D_EBFBE0_801CEB58[arg1][i] = 3; + D_menu_801CEBD0[arg1][i] -= 48; + if (D_menu_801CEBD0[arg1][i] < 0) { + D_menu_801CEBD0[arg1][i] = 0; + D_menu_801CEB58[arg1][i] = 3; } break; case 3: - D_EBFBE0_801CEB58[arg1][i] = Rand_ZeroOne() * 3.0f; - D_EBFBE0_801CEBD0[arg1][i] = 255; - D_EBFBE0_801CEC48[arg1][i] = 0.0f; - D_EBFBE0_801CECC0[arg1][i] = 0.5f + (Rand_ZeroOne() * 0.3f); - D_EBFBE0_801CEE28[arg1][i] = 1 + (s32) (Rand_ZeroOne() * 4.0f); + D_menu_801CEB58[arg1][i] = Rand_ZeroOne() * 3.0f; + D_menu_801CEBD0[arg1][i] = 255; + D_menu_801CEC48[arg1][i] = 0.0f; + D_menu_801CECC0[arg1][i] = 0.5f + (Rand_ZeroOne() * 0.3f); + D_menu_801CEE28[arg1][i] = 1 + (s32) (Rand_ZeroOne() * 4.0f); temp = 110.0f; if (arg1 == 1) { temp = 50.0f; } - D_EBFBE0_801CED38[arg1][i] = temp + (s32) (Rand_ZeroOne() * 30.0f); - D_EBFBE0_801CEDB0[arg1][i] = -10.0f + (Rand_ZeroOne() * -60.0f); + D_menu_801CED38[arg1][i] = temp + (s32) (Rand_ZeroOne() * 30.0f); + D_menu_801CEDB0[arg1][i] = -10.0f + (Rand_ZeroOne() * -60.0f); break; } - if ((D_EBFBE0_801CECC0[arg1][i] == 0.0f) || (D_EBFBE0_801CEBD0[arg1][i] == 0)) { + if ((D_menu_801CECC0[arg1][i] == 0.0f) || (D_menu_801CEBD0[arg1][i] == 0)) { continue; } - gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 200, 200, D_EBFBE0_801CEBD0[arg1][i]); + gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 200, 200, D_menu_801CEBD0[arg1][i]); Matrix_Push(&gGfxMatrix); - Matrix_Mult(gGfxMatrix, &D_EBFBE0_801CDA60[planetId], 1); - Matrix_RotateZ(gGfxMatrix, M_DTOR * D_EBFBE0_801CEDB0[arg1][i], 1); - Matrix_Translate(gGfxMatrix, 0.0f, D_EBFBE0_801CED38[arg1][i], 0.0f, 1); - Matrix_Scale(gGfxMatrix, D_EBFBE0_801CEC48[arg1][i], D_EBFBE0_801CEC48[arg1][i], D_EBFBE0_801CEC48[arg1][i], 1); + Matrix_Mult(gGfxMatrix, &D_menu_801CDA60[planetId], 1); + Matrix_RotateZ(gGfxMatrix, M_DTOR * D_menu_801CEDB0[arg1][i], 1); + Matrix_Translate(gGfxMatrix, 0.0f, D_menu_801CED38[arg1][i], 0.0f, 1); + Matrix_Scale(gGfxMatrix, D_menu_801CEC48[arg1][i], D_menu_801CEC48[arg1][i], D_menu_801CEC48[arg1][i], 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -5195,28 +5177,28 @@ void func_EBFBE0_801A89BC(PlanetId planetId, s32 arg1) { } } -void func_EBFBE0_801A8F40(void) { - static f32 D_EBFBE0_801B6A7C = 0.0f; +void func_menu_801A8F40(void) { + static f32 D_menu_801B6A7C = 0.0f; s32 temp; - if (D_EBFBE0_801CD97C != 0) { + if (D_menu_801CD97C != 0) { Lights_SetOneLight(&gMasterDisp, 0, 0, 127, 80, 80, 60, 50, 50, 50); RCP_SetupDL(&gMasterDisp, 0x17); - temp = Math_SmoothStepToF(&D_EBFBE0_801CEAA8, D_EBFBE0_801CEAB0, 0.1f, 100.0f, 1.0f); + temp = Math_SmoothStepToF(&D_menu_801CEAA8, D_menu_801CEAB0, 0.1f, 100.0f, 1.0f); if (temp == 0.0f) { - if (D_EBFBE0_801CEAB0 == D_EBFBE0_801CEAAC) { - D_EBFBE0_801CEAA8 = D_EBFBE0_801CEAAC + 50.0f; + if (D_menu_801CEAB0 == D_menu_801CEAAC) { + D_menu_801CEAA8 = D_menu_801CEAAC + 50.0f; } } Matrix_Push(&gGfxMatrix); - Matrix_Mult(gGfxMatrix, &D_EBFBE0_801CDA60[sCurrentPlanetId], 1); - Matrix_Translate(gGfxMatrix, 0.0f, D_EBFBE0_801CEAA8, 0.0f, 1); - Matrix_RotateY(gGfxMatrix, M_DTOR * D_EBFBE0_801B6A7C, 1); + Matrix_Mult(gGfxMatrix, &D_menu_801CDA60[sCurrentPlanetId], 1); + Matrix_Translate(gGfxMatrix, 0.0f, D_menu_801CEAA8, 0.0f, 1); + Matrix_RotateY(gGfxMatrix, M_DTOR * D_menu_801B6A7C, 1); Matrix_Scale(gGfxMatrix, 3.0f, 3.0f, 3.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -5225,57 +5207,57 @@ void func_EBFBE0_801A8F40(void) { Matrix_Pop(&gGfxMatrix); - D_EBFBE0_801B6A7C += 6.0f; + D_menu_801B6A7C += 6.0f; } } -void func_EBFBE0_801A914C(void) { - D_EBFBE0_801CEAA8 = 140.0f; +void func_menu_801A914C(void) { + D_menu_801CEAA8 = 140.0f; if (sCurrentPlanetId == 9) { - D_EBFBE0_801CEAA8 = 230.0f; + D_menu_801CEAA8 = 230.0f; } if (sCurrentPlanetId == 1) { - D_EBFBE0_801CEAA8 = 210.0f; + D_menu_801CEAA8 = 210.0f; } if (sCurrentPlanetId == 0xE) { - D_EBFBE0_801CEAA8 = 250.0f; + D_menu_801CEAA8 = 250.0f; } if (sCurrentPlanetId == 4) { - D_EBFBE0_801CEAA8 = 150.0f; + D_menu_801CEAA8 = 150.0f; } if (sCurrentPlanetId == 5) { - D_EBFBE0_801CEAA8 = 150.0f; + D_menu_801CEAA8 = 150.0f; } if (sCurrentPlanetId == 3) { - D_EBFBE0_801CEAA8 = 150.0f; + D_menu_801CEAA8 = 150.0f; } if (sCurrentPlanetId == 0xD) { - D_EBFBE0_801CEAA8 = 300.0f; + D_menu_801CEAA8 = 300.0f; } - D_EBFBE0_801CEAAC = D_EBFBE0_801CEAA8; - D_EBFBE0_801CEAB0 = D_EBFBE0_801CEAA8; + D_menu_801CEAAC = D_menu_801CEAA8; + D_menu_801CEAB0 = D_menu_801CEAA8; } -void func_EBFBE0_801A9224(void) { +void func_menu_801A9224(void) { s32 i; s32 mask; if ((planet[PLANET_METEO].alpha != 0) || (sCurrentPlanetId == 0)) { - if ((sCurrentPlanetId == 0) && (D_EBFBE0_801CD944 == 2) && (D_EBFBE0_801CD95C != 0)) { + if ((sCurrentPlanetId == 0) && (D_menu_801CD944 == 2) && (D_menu_801CD95C != 0)) { mask = 0x00000001; } else { mask = 0xFFFFFFFF; } - if ((D_EBFBE0_801CD944 == 3) || ((sCurrentPlanetId == 0) && (D_EBFBE0_801CD944 != 7))) { + if ((D_menu_801CD944 == 3) || ((sCurrentPlanetId == 0) && (D_menu_801CD944 != 7))) { RCP_SetupDL(&gMasterDisp, 0x35); } else { RCP_SetupDL(&gMasterDisp, 0x40); @@ -5286,18 +5268,18 @@ void func_EBFBE0_801A9224(void) { for (i = 0; i < 42; i++) { Matrix_Push(&gGfxMatrix); - Matrix_RotateY(gGfxMatrix, M_DTOR * D_EBFBE0_801AFA38[i].angle, 1); - Matrix_Translate(gGfxMatrix, D_EBFBE0_801AFA38[i].x, D_EBFBE0_801AFA38[i].y, 0.0f, 1); - Matrix_RotateY(gGfxMatrix, M_DTOR * -D_EBFBE0_801AFA38[i].angle, 1); + Matrix_RotateY(gGfxMatrix, M_DTOR * D_menu_801AFA38[i].angle, 1); + Matrix_Translate(gGfxMatrix, D_menu_801AFA38[i].x, D_menu_801AFA38[i].y, 0.0f, 1); + Matrix_RotateY(gGfxMatrix, M_DTOR * -D_menu_801AFA38[i].angle, 1); - func_EBFBE0_801AD048(); + func_menu_801AD048(); - Matrix_Scale(gGfxMatrix, D_EBFBE0_801AFA38[i].scale, D_EBFBE0_801AFA38[i].scale, - D_EBFBE0_801AFA38[i].scale, 1); + Matrix_Scale(gGfxMatrix, D_menu_801AFA38[i].scale, D_menu_801AFA38[i].scale, D_menu_801AFA38[i].scale, + 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_EBFBE0_801B68F8[0]); + gSPDisplayList(gMasterDisp++, D_menu_801B68F8[0]); Matrix_Pop(&gGfxMatrix); } @@ -5305,7 +5287,7 @@ void func_EBFBE0_801A9224(void) { } } -void func_EBFBE0_801A9448(void) { +void func_menu_801A9448(void) { Vec3f src; Vec3f dest; f32 x1; @@ -5315,19 +5297,19 @@ void func_EBFBE0_801A9448(void) { f32 z; s32 i; s32 mask; - static f32 D_EBFBE0_801B6A80 = -22.0f; + static f32 D_menu_801B6A80 = -22.0f; if ((planet[PLANET_AREA_6].alpha == 0) && (sCurrentPlanetId != PLANET_AREA_6)) { return; } - if ((sCurrentPlanetId == PLANET_AREA_6) && (D_EBFBE0_801CD944 == 2) && (D_EBFBE0_801CD95C != 0)) { + if ((sCurrentPlanetId == PLANET_AREA_6) && (D_menu_801CD944 == 2) && (D_menu_801CD95C != 0)) { mask = 0x00000001; } else { mask = 0xFFFFFFFF; } - if ((D_EBFBE0_801CD944 == 3) || (sCurrentPlanetId == PLANET_AREA_6)) { + if ((D_menu_801CD944 == 3) || (sCurrentPlanetId == PLANET_AREA_6)) { RCP_SetupDL(&gMasterDisp, 0x17); } else { RCP_SetupDL(&gMasterDisp, 0x2E); @@ -5342,23 +5324,22 @@ void func_EBFBE0_801A9448(void) { for (i = 0; i < 4; i++) { Matrix_Push(&gGfxMatrix); - Matrix_RotateY(gGfxMatrix, M_DTOR * D_EBFBE0_801AFCD8[i].angle, 1); - Matrix_Translate(gGfxMatrix, D_EBFBE0_801AFCD8[i].x, D_EBFBE0_801AFCD8[i].y, 0.0f, 1); - Matrix_RotateY(gGfxMatrix, M_DTOR * -(D_EBFBE0_801AFCD8[i].angle), 1); + Matrix_RotateY(gGfxMatrix, M_DTOR * D_menu_801AFCD8[i].angle, 1); + Matrix_Translate(gGfxMatrix, D_menu_801AFCD8[i].x, D_menu_801AFCD8[i].y, 0.0f, 1); + Matrix_RotateY(gGfxMatrix, M_DTOR * -(D_menu_801AFCD8[i].angle), 1); - func_EBFBE0_801AD048(); + func_menu_801AD048(); - Matrix_RotateY(gGfxMatrix, M_DTOR * D_EBFBE0_801B6A80, 1); - Matrix_Scale(gGfxMatrix, D_EBFBE0_801AFCD8[i].scale, D_EBFBE0_801AFCD8[i].scale, D_EBFBE0_801AFCD8[i].scale, - 1); + Matrix_RotateY(gGfxMatrix, M_DTOR * D_menu_801B6A80, 1); + Matrix_Scale(gGfxMatrix, D_menu_801AFCD8[i].scale, D_menu_801AFCD8[i].scale, D_menu_801AFCD8[i].scale, 1); Matrix_SetGfxMtx(&gMasterDisp); Matrix_MultVec3f(gGfxMatrix, &dest, &src); - x = D_EBFBE0_801CE960[PLANET_SOLAR].x - src.x; - y = D_EBFBE0_801CE960[PLANET_SOLAR].y - src.y; - z = D_EBFBE0_801CE960[PLANET_SOLAR].z - src.z; + x = D_menu_801CE960[PLANET_SOLAR].x - src.x; + y = D_menu_801CE960[PLANET_SOLAR].y - src.y; + z = D_menu_801CE960[PLANET_SOLAR].z - src.z; x1 = Math_Atan2F(y, sqrtf(SQ(x) + SQ(z))); y1 = -Math_Atan2F(x, z); @@ -5367,8 +5348,8 @@ void func_EBFBE0_801A9448(void) { dest.y = 0.0f; dest.z = 100.0f; - Matrix_RotateY(gCalcMatrix, M_DTOR * (-D_EBFBE0_801CDA10 - y1), 0); - Matrix_RotateX(gCalcMatrix, M_DTOR * (-D_EBFBE0_801CDA0C - x1), 1); + Matrix_RotateY(gCalcMatrix, M_DTOR * (-D_menu_801CDA10 - y1), 0); + Matrix_RotateX(gCalcMatrix, M_DTOR * (-D_menu_801CDA0C - x1), 1); Matrix_MultVec3f(gCalcMatrix, &dest, &src); Lights_SetOneLight(&gMasterDisp, src.x, src.y, src.z, 80, 80, 60, 0, 0, 0); @@ -5380,44 +5361,44 @@ void func_EBFBE0_801A9448(void) { } } -void func_EBFBE0_801A9814(void) { - if (D_EBFBE0_801B8280 != 0) { +void func_menu_801A9814(void) { + if (D_menu_801B8280 != 0) { Matrix_Push(&gGfxMatrix); - Matrix_LookAt(gGfxMatrix, D_EBFBE0_801CD9F4, D_EBFBE0_801CD9F8, D_EBFBE0_801CD9FC, D_EBFBE0_801CDA00, - D_EBFBE0_801CDA04, D_EBFBE0_801CDA08, D_EBFBE0_801CDA20, D_EBFBE0_801CDA24, D_EBFBE0_801CDA28, 1); - Matrix_Translate(gGfxMatrix, D_EBFBE0_801CEA58, D_EBFBE0_801CEA5C, D_EBFBE0_801CEA60, 1); + Matrix_LookAt(gGfxMatrix, D_menu_801CD9F4, D_menu_801CD9F8, D_menu_801CD9FC, D_menu_801CDA00, D_menu_801CDA04, + D_menu_801CDA08, D_menu_801CDA20, D_menu_801CDA24, D_menu_801CDA28, 1); + Matrix_Translate(gGfxMatrix, D_menu_801CEA58, D_menu_801CEA5C, D_menu_801CEA60, 1); Matrix_SetGfxMtx(&gMasterDisp); - func_80084688(2, D_EBFBE0_801B8284); + func_80084688(2, D_menu_801B8284); Matrix_Pop(&gGfxMatrix); } } -void func_EBFBE0_801A9910(void) { - static s32 D_EBFBE0_801B6A84[] = { 1, 13, 12, 11, 6, 2, 4, 10, 8, 0, 9, 5, 3, 7, 7 }; +void func_menu_801A9910(void) { + static s32 D_menu_801B6A84[] = { 1, 13, 12, 11, 6, 2, 4, 10, 8, 0, 9, 5, 3, 7, 7 }; s32 i; - s32 var_s0 = D_EBFBE0_801B6A84[sCurrentPlanetId]; + s32 var_s0 = D_menu_801B6A84[sCurrentPlanetId]; RCP_SetupDL(&gMasterDisp, 0x53); - gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, (s32) D_EBFBE0_801CEA6C); + gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, (s32) D_menu_801CEA6C); - for (i = 0; i < D_EBFBE0_801AF834[var_s0].height; i++) { - TextureRect_8bIA(&gMasterDisp, D_EBFBE0_801AF834[var_s0].addr + (D_EBFBE0_801AF834[var_s0].width * i), - D_EBFBE0_801AF834[var_s0].width, 1, D_EBFBE0_801AF834[var_s0].posX, 20.0f + (1.0f * i), 1.0f, + for (i = 0; i < D_menu_801AF834[var_s0].height; i++) { + TextureRect_8bIA(&gMasterDisp, D_menu_801AF834[var_s0].addr + (D_menu_801AF834[var_s0].width * i), + D_menu_801AF834[var_s0].width, 1, D_menu_801AF834[var_s0].posX, 20.0f + (1.0f * i), 1.0f, 1.0f); } - Math_SmoothStepToF(&D_EBFBE0_801CEA6C, 255.0f, D_EBFBE0_801CEA70, 10.0f, 1.0f); + Math_SmoothStepToF(&D_menu_801CEA6C, 255.0f, D_menu_801CEA70, 10.0f, 1.0f); - D_EBFBE0_801CEA70 *= 1.08; + D_menu_801CEA70 *= 1.08; } -void func_EBFBE0_801A9A8C(void) { +void func_menu_801A9A8C(void) { s32 i; s32 sp58; u8* sp54; - static f32 D_EBFBE0_801B6AC0[2] = { 91.0f, 207.0f }; - static f32 D_EBFBE0_801B6AC8[2] = { 61.0f, 61.0f }; + static f32 D_menu_801B6AC0[2] = { 91.0f, 207.0f }; + static f32 D_menu_801B6AC8[2] = { 61.0f, 61.0f }; switch (gCurrentLevel) { case LEVEL_CORNERIA: @@ -5494,50 +5475,48 @@ void func_EBFBE0_801A9A8C(void) { RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - TextureRect_8bIA(&gMasterDisp, &D_5000500, 112, 19, D_EBFBE0_801B6AC0[0], D_EBFBE0_801B6AC8[0], 1.0f, 1.0f); - TextureRect_8bIA(&gMasterDisp, sp54, 16, 15, D_EBFBE0_801B6AC0[1], D_EBFBE0_801B6AC8[1], 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, &D_5000500, 112, 19, D_menu_801B6AC0[0], D_menu_801B6AC8[0], 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, sp54, 16, 15, D_menu_801B6AC0[1], D_menu_801B6AC8[1], 1.0f, 1.0f); - for (i = 0; i < D_EBFBE0_801AF834[sp58].height; i++) { - TextureRect_8bIA(&gMasterDisp, D_EBFBE0_801AF834[sp58].addr + (D_EBFBE0_801AF834[sp58].width * i), - D_EBFBE0_801AF834[sp58].width, 1, D_EBFBE0_801AF834[sp58].posX, 94.0f + (1.0f * i), 1.0f, - 1.0f); + for (i = 0; i < D_menu_801AF834[sp58].height; i++) { + TextureRect_8bIA(&gMasterDisp, D_menu_801AF834[sp58].addr + (D_menu_801AF834[sp58].width * i), + D_menu_801AF834[sp58].width, 1, D_menu_801AF834[sp58].posX, 94.0f + (1.0f * i), 1.0f, 1.0f); } - for (i = 0; i < D_EBFBE0_801AF914[sp58].height; i++) { - TextureRect_8bIA(&gMasterDisp, D_EBFBE0_801AF914[sp58].addr + (D_EBFBE0_801AF914[sp58].width * i), - D_EBFBE0_801AF914[sp58].width, 1, D_EBFBE0_801AF914[sp58].posX, 140.0f + (1.0f * i), 1.0f, - 1.0f); + for (i = 0; i < D_menu_801AF914[sp58].height; i++) { + TextureRect_8bIA(&gMasterDisp, D_menu_801AF914[sp58].addr + (D_menu_801AF914[sp58].width * i), + D_menu_801AF914[sp58].width, 1, D_menu_801AF914[sp58].posX, 140.0f + (1.0f * i), 1.0f, 1.0f); } } -void func_EBFBE0_801A9DE8(void) { +void func_menu_801A9DE8(void) { s32 mask; - if (!((D_EBFBE0_801CD978 != 0) || (D_EBFBE0_801CD944 == 3) || (D_EBFBE0_801CD944 == 6) || - ((D_EBFBE0_801CD944 == 7) && (D_EBFBE0_801CD948 == 2)))) { + if (!((D_menu_801CD978 != 0) || (D_menu_801CD944 == 3) || (D_menu_801CD944 == 6) || + ((D_menu_801CD944 == 7) && (D_menu_801CD948 == 2)))) { return; } mask = 0xFFFFFFFF; - if (D_EBFBE0_801CF00C != 0) { + if (D_menu_801CF00C != 0) { mask = 0x00000001; - D_EBFBE0_801CF00C--; + D_menu_801CF00C--; } if (gFrameCount & mask) { - func_EBFBE0_801AD7EC(254, 16, gLifeCount[gPlayerNum]); + func_menu_801AD7EC(254, 16, gLifeCount[gPlayerNum]); } if ((D_80161A34 == 7) || (D_80161A34 == 5)) { - if (D_EBFBE0_801CD83C < gTotalHits) { - D_EBFBE0_801CD83C = gTotalHits; + if (D_menu_801CD83C < gTotalHits) { + D_menu_801CD83C = gTotalHits; } - func_EBFBE0_801A9EE4(); - func_EBFBE0_801A9FD4(0); + func_menu_801A9EE4(); + func_menu_801A9FD4(0); } } -void func_EBFBE0_801A9EE4(void) { +void func_menu_801A9EE4(void) { RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255); @@ -5545,10 +5524,10 @@ void func_EBFBE0_801A9EE4(void) { Graphics_DisplaySmallText(24, 14, 1.0f, 1.0f, "TOTAL HITS"); Graphics_DisplaySmallNumber(71 - (func_8008BCBC(gTotalHits) * 8), 24, gTotalHits); Graphics_DisplaySmallText(143, 14, 1.0f, 1.0f, "TOP"); - Graphics_DisplaySmallNumber(167 - (func_8008BCBC(D_EBFBE0_801CD83C) * 8), 24, D_EBFBE0_801CD83C); + Graphics_DisplaySmallNumber(167 - (func_8008BCBC(D_menu_801CD83C) * 8), 24, D_menu_801CD83C); } -void func_EBFBE0_801A9FD4(s32 arg0) { +void func_menu_801A9FD4(s32 arg0) { s32 i; s32 var_s3; f32 var_fs0, var_fs1; @@ -5562,11 +5541,11 @@ void func_EBFBE0_801A9FD4(s32 arg0) { var_s3 = gCurrentPlanet; } if (D_80161A34 == 5) { - var_s3 = D_EBFBE0_801CD9AC; + var_s3 = D_menu_801CD9AC; } } - func_EBFBE0_801AA1CC(var_s3); + func_menu_801AA1CC(var_s3); if ((D_80161A34 == 7) || (D_80161A34 == 8)) { var_s3 = 7; @@ -5584,15 +5563,15 @@ void func_EBFBE0_801A9FD4(s32 arg0) { for (var_fs0 = 0.0f, var_fs1 = -41.5f, i = 0; i < var_s3; i++, var_fs0 += 24.0f + temp, var_fs1 += 13.8f) { if (D_80177B90[i] != -1) { - func_EBFBE0_801AA434(i, 28.0f + var_fs0, 182.0f, D_80177B90[i]); - func_EBFBE0_801AA778(i, var_fs1, -25.4f, D_80177B90[i]); + func_menu_801AA434(i, 28.0f + var_fs0, 182.0f, D_80177B90[i]); + func_menu_801AA778(i, var_fs1, -25.4f, D_80177B90[i]); } } Matrix_Pop(&gGfxMatrix); } -void func_EBFBE0_801AA1CC(s32 arg0) { +void func_menu_801AA1CC(s32 arg0) { s32 i; f32 x; s32 r; @@ -5609,8 +5588,8 @@ void func_EBFBE0_801AA1CC(s32 arg0) { if (i < 6) { r = g = b = 255; if (i < arg0) { - temp = func_EBFBE0_801A655C(*ptr, *(ptr + 1)); - switch (D_EBFBE0_801AFD18[temp].unk_00) { + temp = func_menu_801A655C(*ptr, *(ptr + 1)); + switch (D_menu_801AFD18[temp].unk_00) { case 0: r = 16; g = 64; @@ -5640,16 +5619,16 @@ void func_EBFBE0_801AA1CC(s32 arg0) { } } -void func_EBFBE0_801AA434(s32 arg0, f32 x, f32 y, s32 idx) { +void func_menu_801AA434(s32 arg0, f32 x, f32 y, s32 idx) { s32 i; f32 x2; s32 pad; s32 mask; s32 temp; - static char* D_EBFBE0_801B6AD0[] = { "P", "S", "F" }; - static s32 D_EBFBE0_801B6ADC[] = { 255, 0, 30 }; - static s32 D_EBFBE0_801B6AE8[] = { 30, 179, 30 }; - static s32 D_EBFBE0_801B6AF4[] = { 0, 67, 255 }; + static char* D_menu_801B6AD0[] = { "P", "S", "F" }; + static s32 D_menu_801B6ADC[] = { 255, 0, 30 }; + static s32 D_menu_801B6AE8[] = { 30, 179, 30 }; + static s32 D_menu_801B6AF4[] = { 0, 67, 255 }; RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255); @@ -5673,17 +5652,16 @@ void func_EBFBE0_801AA434(s32 arg0, f32 x, f32 y, s32 idx) { for (i = 0; i < 3; i++, x2 += 9.0f) { if ((D_80177B50[arg0] & mask)) { RCP_SetupDL(&gMasterDisp, 0x53); - gDPSetPrimColor(gMasterDisp++, 0, 0, D_EBFBE0_801B6ADC[i], D_EBFBE0_801B6AE8[i], D_EBFBE0_801B6AF4[i], - 255); + gDPSetPrimColor(gMasterDisp++, 0, 0, D_menu_801B6ADC[i], D_menu_801B6AE8[i], D_menu_801B6AF4[i], 255); Graphics_DisplaySmallText((s32) x + x2 - 1.0f, (s32) y + 24.0f + 8.0f + 2.0f, 1.0f, 1.0f, - D_EBFBE0_801B6AD0[i]); + D_menu_801B6AD0[i]); } mask >>= 8; } } } -void func_EBFBE0_801AA778(s32 arg0, f32 x, f32 y, PlanetId planetId) { +void func_menu_801AA778(s32 arg0, f32 x, f32 y, PlanetId planetId) { s32 mask = 0xFFFFFFFF; if (gGameState == GSTATE_MAP) { @@ -5706,7 +5684,7 @@ void func_EBFBE0_801AA778(s32 arg0, f32 x, f32 y, PlanetId planetId) { Matrix_Scale(gGfxMatrix, 0.11f, 0.11f, 0.11f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_EBFBE0_801B68F8[planet[planetId].id]); + gSPDisplayList(gMasterDisp++, D_menu_801B68F8[planet[planetId].id]); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 128); gDPSetEnvColor(gMasterDisp++, 31, 0, 0, 0); @@ -5714,7 +5692,7 @@ void func_EBFBE0_801AA778(s32 arg0, f32 x, f32 y, PlanetId planetId) { Matrix_Scale(gGfxMatrix, 0.8f, 0.8f, 0.8f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_EBFBE0_801B68F8[planet[planetId].id]); + gSPDisplayList(gMasterDisp++, D_menu_801B68F8[planet[planetId].id]); Matrix_Pop(&gGfxMatrix); } @@ -5734,13 +5712,13 @@ void func_EBFBE0_801AA778(s32 arg0, f32 x, f32 y, PlanetId planetId) { Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_EBFBE0_801B68F8[planet[planetId].id]); + gSPDisplayList(gMasterDisp++, D_menu_801B68F8[planet[planetId].id]); Matrix_Translate(gGfxMatrix, 18.0f, -20.0f, 0.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_EBFBE0_801B68F8[planet[planetId].id]); + gSPDisplayList(gMasterDisp++, D_menu_801B68F8[planet[planetId].id]); Matrix_Pop(&gGfxMatrix); } break; @@ -5761,7 +5739,7 @@ void func_EBFBE0_801AA778(s32 arg0, f32 x, f32 y, PlanetId planetId) { Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_EBFBE0_801B68F8[planet[planetId].id]); + gSPDisplayList(gMasterDisp++, D_menu_801B68F8[planet[planetId].id]); Matrix_Pop(&gGfxMatrix); } @@ -5777,13 +5755,13 @@ void func_EBFBE0_801AA778(s32 arg0, f32 x, f32 y, PlanetId planetId) { Matrix_Translate(gGfxMatrix, x, y, 0.0f, 1); Matrix_RotateX(gGfxMatrix, M_DTOR * 20.0f, 1); - Matrix_RotateY(gGfxMatrix, M_DTOR * D_EBFBE0_801AFFF4, 1); + Matrix_RotateY(gGfxMatrix, M_DTOR * D_menu_801AFFF4, 1); Matrix_RotateZ(gGfxMatrix, M_DTOR * planet[planetId].zAngle, 1); Matrix_Scale(gGfxMatrix, 0.004f, 0.004f, 0.004f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_EBFBE0_801B68F8[planet[planetId].id]); + gSPDisplayList(gMasterDisp++, D_menu_801B68F8[planet[planetId].id]); Matrix_Pop(&gGfxMatrix); } @@ -5799,13 +5777,13 @@ void func_EBFBE0_801AA778(s32 arg0, f32 x, f32 y, PlanetId planetId) { Matrix_Translate(gGfxMatrix, x, y, 0.0f, 1); Matrix_RotateX(gGfxMatrix, M_DTOR * 20.0f, 1); - Matrix_RotateY(gGfxMatrix, M_DTOR * D_EBFBE0_801AFFFC, 1); + Matrix_RotateY(gGfxMatrix, M_DTOR * D_menu_801AFFFC, 1); Matrix_RotateZ(gGfxMatrix, M_DTOR * planet[planetId].zAngle, 1); Matrix_Scale(gGfxMatrix, 0.003f, 0.003f, 0.003f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_EBFBE0_801B68F8[planet[planetId].id]); + gSPDisplayList(gMasterDisp++, D_menu_801B68F8[planet[planetId].id]); Matrix_Pop(&gGfxMatrix); } @@ -5825,7 +5803,7 @@ void func_EBFBE0_801AA778(s32 arg0, f32 x, f32 y, PlanetId planetId) { Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_EBFBE0_801B68F8[planet[planetId].id]); + gSPDisplayList(gMasterDisp++, D_menu_801B68F8[planet[planetId].id]); if (planet[planetId].unk_28 == 4) { if (planetId != PLANET_VENOM && planetId != PLANET_AQUAS) { @@ -5835,7 +5813,7 @@ void func_EBFBE0_801AA778(s32 arg0, f32 x, f32 y, PlanetId planetId) { } else { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); } - gSPDisplayList(gMasterDisp++, D_EBFBE0_801B4A40); + gSPDisplayList(gMasterDisp++, D_menu_801B4A40); } Matrix_Scale(gGfxMatrix, 1.6f, 1.6f, 1.6f, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -5847,11 +5825,11 @@ void func_EBFBE0_801AA778(s32 arg0, f32 x, f32 y, PlanetId planetId) { } if (D_80177BB0[arg0] != 0) { - func_EBFBE0_801AB17C(x, y, 0.0f); + func_menu_801AB17C(x, y, 0.0f); } } -void func_EBFBE0_801AB17C(f32 x, f32 y, f32 z) { +void func_menu_801AB17C(f32 x, f32 y, f32 z) { static f32 scale = 0.23f; static f32 posX = 4.4f; static f32 posY = 1.0f; @@ -5870,16 +5848,16 @@ void func_EBFBE0_801AB17C(f32 x, f32 y, f32 z) { Matrix_Pop(&gGfxMatrix); } -void func_EBFBE0_801AB284(void) { - D_EBFBE0_801CD940 = 0; - D_80178308 = D_EBFBE0_801AF428[sCurrentPlanetId][D_EBFBE0_801CD940]; - D_80177D68 = D_EBFBE0_801AF420[D_EBFBE0_801CD940]; - D_EBFBE0_801CF018 = 100; +void func_menu_801AB284(void) { + D_menu_801CD940 = 0; + D_80178308 = D_menu_801AF428[sCurrentPlanetId][D_menu_801CD940]; + D_80177D68 = D_menu_801AF420[D_menu_801CD940]; + D_menu_801CF018 = 100; D_80178728 = 78; D_8017872C = 166; } -void func_EBFBE0_801AB300(void) { +void func_menu_801AB300(void) { if (D_Timer_801782AC > 0) { D_Timer_801782AC--; } @@ -5887,22 +5865,22 @@ void func_EBFBE0_801AB300(void) { D_Timer_801782B4--; } - switch (D_EBFBE0_801CF018) { + switch (D_menu_801CF018) { case 0: break; case 100: - D_EBFBE0_801CEA74 = 0; + D_menu_801CEA74 = 0; D_801782A4 = 0 + D_80177D68; - D_EBFBE0_801CF018 = 1; + D_menu_801CF018 = 1; D_80177D50 = 0.0f; D_801782D8 = 0; - D_EBFBE0_801CF124 = 0.0f; - D_EBFBE0_801CEAB4 = 0; + D_menu_801CF124 = 0.0f; + D_menu_801CEAB4 = 0; break; case 200: - D_EBFBE0_801CF018 = 210; + D_menu_801CF018 = 210; D_Timer_801782AC = 30; break; @@ -5911,30 +5889,30 @@ void func_EBFBE0_801AB300(void) { break; } - D_EBFBE0_801CD940 = 1; - D_80178308 = D_EBFBE0_801AF428[sCurrentPlanetId][D_EBFBE0_801CD940]; + D_menu_801CD940 = 1; + D_80178308 = D_menu_801AF428[sCurrentPlanetId][D_menu_801CD940]; func_8001ACDC(Message_IdFromPtr(D_80178308)); - D_80177D68 = D_EBFBE0_801AF420[D_EBFBE0_801CD940]; + D_80177D68 = D_menu_801AF420[D_menu_801CD940]; D_Timer_801782AC = Message_GetCharCount(D_80178308) * 2; D_801782A4 = D_80177D68; - D_EBFBE0_801CF018 = 4; - D_EBFBE0_801CD9A0 = 1; + D_menu_801CF018 = 4; + D_menu_801CD9A0 = 1; break; case 1: - D_EBFBE0_801CEA74 += 8; - if (D_EBFBE0_801CEA74 > 255) { - D_EBFBE0_801CEA74 = 255; + D_menu_801CEA74 += 8; + if (D_menu_801CEA74 > 255) { + D_menu_801CEA74 = 255; D_80177D50 = 1.3f; Audio_PlaySfx(0x4100001EU, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); func_8001ACDC(Message_IdFromPtr(D_80178308)); D_Timer_801782AC = Message_GetCharCount(D_80178308) * 2; - D_EBFBE0_801CD9A4 = 0; - D_EBFBE0_801CF018 = 4; + D_menu_801CD9A4 = 0; + D_menu_801CF018 = 4; } break; @@ -5942,13 +5920,13 @@ void func_EBFBE0_801AB300(void) { if (!D_Timer_801782AC && !func_8001AE78()) { D_801782A4 = D_80177D68; func_8001AE58(); - if (D_EBFBE0_801CD940 == 0) { + if (D_menu_801CD940 == 0) { D_801782D8 = 0; D_Timer_801782AC = 30; } else { D_Timer_801782AC = 20; } - D_EBFBE0_801CF018 = 41; + D_menu_801CF018 = 41; break; } @@ -5959,17 +5937,17 @@ void func_EBFBE0_801AB300(void) { } if (D_801782D8 >= Message_GetCharCount(D_80178308)) { - D_EBFBE0_801CD9A4 = 1; + D_menu_801CD9A4 = 1; } - if (D_EBFBE0_801CD9A0 == 1) { - D_EBFBE0_801CF124 += 0.7f; - D_801782D8 = D_EBFBE0_801CF124; + if (D_menu_801CD9A0 == 1) { + D_menu_801CF124 += 0.7f; + D_801782D8 = D_menu_801CF124; } else { D_801782D8 += 2; } - if (D_EBFBE0_801CEAB4) { + if (D_menu_801CEAB4) { if (func_8001AED4() == 1) { D_Timer_801782B4 = 2; } else { @@ -5977,7 +5955,7 @@ void func_EBFBE0_801AB300(void) { } } - D_EBFBE0_801CEAB4 ^= 1; + D_menu_801CEAB4 ^= 1; break; case 41: @@ -5985,28 +5963,28 @@ void func_EBFBE0_801AB300(void) { break; } - if (D_EBFBE0_801CD940 == 1) { - D_EBFBE0_801CF018 = 5; + if (D_menu_801CD940 == 1) { + D_menu_801CF018 = 5; break; } else { - D_EBFBE0_801CD940 = 1; - D_80178308 = D_EBFBE0_801AF428[sCurrentPlanetId][D_EBFBE0_801CD940]; + D_menu_801CD940 = 1; + D_80178308 = D_menu_801AF428[sCurrentPlanetId][D_menu_801CD940]; func_8001ACDC(Message_IdFromPtr(D_80178308)); - D_80177D68 = D_EBFBE0_801AF420[D_EBFBE0_801CD940]; + D_80177D68 = D_menu_801AF420[D_menu_801CD940]; D_801782A4 = D_80177D68; D_801782D8 = 0; - D_EBFBE0_801CF124 = 0.0f; + D_menu_801CF124 = 0.0f; D_Timer_801782AC = Message_GetCharCount(D_80178308) * 2; - D_EBFBE0_801CD9A0 = 1; - D_EBFBE0_801CD9A4 = 0; - D_EBFBE0_801CF018 = 4; + D_menu_801CD9A0 = 1; + D_menu_801CD9A4 = 0; + D_menu_801CF018 = 4; } break; case 5: D_Timer_801782AC = 5; D_801782A4 = D_80177D68; - D_EBFBE0_801CF018++; + D_menu_801CF018++; break; case 6: @@ -6014,8 +5992,8 @@ void func_EBFBE0_801AB300(void) { func_8001A838(0x4100001EU); func_8001ACDC(0); D_80177D50 = 0.0f; - D_EBFBE0_801CF018++; - D_EBFBE0_801CF018 = 7; + D_menu_801CF018++; + D_menu_801CF018 = 7; } break; @@ -6025,36 +6003,36 @@ void func_EBFBE0_801AB300(void) { case 8: D_801782A4 = D_80177D68; D_80177D50 = 1.3f; - D_EBFBE0_801CEA74 = 255; + D_menu_801CEA74 = 255; break; } - if ((D_EBFBE0_801CF018 > 0) && (D_EBFBE0_801CF018 != 100)) { - func_EBFBE0_801AB978(D_801782A4); - func_EBFBE0_801AB978(D_EBFBE0_801AF420[!D_EBFBE0_801CD940]); + if ((D_menu_801CF018 > 0) && (D_menu_801CF018 != 100)) { + func_menu_801AB978(D_801782A4); + func_menu_801AB978(D_menu_801AF420[!D_menu_801CD940]); func_800BB388(); } } -void func_EBFBE0_801AB978(s32 arg0) { +void func_menu_801AB978(s32 arg0) { s32 i; f32 xPos; f32 yPos; s32 sp90[3]; - static f32 D_EBFBE0_801B6B0C[3] = { 205.0f, 237.0f, 269.0f }; - static u16* D_EBFBE0_801B6B18[3] = { D_6032A60, D_6044180, D_6032440 }; + static f32 D_menu_801B6B0C[3] = { 205.0f, 237.0f, 269.0f }; + static u16* D_menu_801B6B18[3] = { D_6032A60, D_6044180, D_6032440 }; switch (arg0) { case 10: case 11: - D_EBFBE0_801CD810 = arg0 - 10; + D_menu_801CD810 = arg0 - 10; break; case 20: case 21: - if (D_EBFBE0_801CEA74 != 0) { + if (D_menu_801CEA74 != 0) { RCP_SetupDL(&gMasterDisp, 0x4C); - gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_EBFBE0_801CEA74); + gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_menu_801CEA74); xPos = 205.0f; yPos = 77.0f; @@ -6072,10 +6050,10 @@ void func_EBFBE0_801AB978(s32 arg0) { switch (gSavedTeamShields[3 - i]) { case -1: case -2: - if (D_EBFBE0_801CEA74 > 0x20) { + if (D_menu_801CEA74 > 0x20) { sp90[i] = 32; } else { - sp90[i] = D_EBFBE0_801CEA74; + sp90[i] = D_menu_801CEA74; } break; @@ -6083,31 +6061,31 @@ void func_EBFBE0_801AB978(s32 arg0) { RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255); if (gFrameCount & 0x10) { - Graphics_DisplaySmallText(D_EBFBE0_801B6B0C[i], 131 + 28, 1.0f, 1.0f, "OK !"); + Graphics_DisplaySmallText(D_menu_801B6B0C[i], 131 + 28, 1.0f, 1.0f, "OK !"); } - sp90[i] = D_EBFBE0_801CEA74; + sp90[i] = D_menu_801CEA74; break; default: - sp90[i] = D_EBFBE0_801CEA74; + sp90[i] = D_menu_801CEA74; break; } RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, sp90[i]); - TextureRect_16bRGBA(&gMasterDisp, D_EBFBE0_801B6B18[i], 28, 28, D_EBFBE0_801B6B0C[i], 131.0f, 1.0f, + TextureRect_16bRGBA(&gMasterDisp, D_menu_801B6B18[i], 28, 28, D_menu_801B6B0C[i], 131.0f, 1.0f, 1.0f); if ((gSavedTeamShields[3 - i] < 0) && (gSavedTeamShields[3 - i] != -2)) { - func_EBFBE0_801ABCDC(i, D_EBFBE0_801CEA74); + func_menu_801ABCDC(i, D_menu_801CEA74); } } } } } -void func_EBFBE0_801ABCDC(s32 arg0, s32 alpha) { - static s32 D_EBFBE0_801B6B24[] = { 81.0f, 125.0f, 170.0f }; +void func_menu_801ABCDC(s32 arg0, s32 alpha) { + static s32 D_menu_801B6B24[] = { 81.0f, 125.0f, 170.0f }; Matrix_Push(&gGfxMatrix); @@ -6122,7 +6100,7 @@ void func_EBFBE0_801ABCDC(s32 arg0, s32 alpha) { Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, D_EBFBE0_801B6B24[arg0], -35.0f, -400.0f, 1); + Matrix_Translate(gGfxMatrix, D_menu_801B6B24[arg0], -35.0f, -400.0f, 1); Matrix_RotateZ(gGfxMatrix, M_DTOR * -40.0f, 1); Matrix_Scale(gGfxMatrix, 0.3f, 0.3f, 1.0f, 1); @@ -6133,7 +6111,7 @@ void func_EBFBE0_801ABCDC(s32 arg0, s32 alpha) { Matrix_Pop(&gGfxMatrix); Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, D_EBFBE0_801B6B24[arg0], -35.0f, -400.0f, 1); + Matrix_Translate(gGfxMatrix, D_menu_801B6B24[arg0], -35.0f, -400.0f, 1); Matrix_RotateZ(gGfxMatrix, M_DTOR * 40.0f, 1); Matrix_Scale(gGfxMatrix, 0.3f, 0.3f, 1.0f, 1); @@ -6145,7 +6123,7 @@ void func_EBFBE0_801ABCDC(s32 arg0, s32 alpha) { Matrix_Pop(&gGfxMatrix); } -void func_EBFBE0_801ABF1C(void) { +void func_menu_801ABF1C(void) { Matrix_Push(&gGfxMatrix); { Matrix_LookAt(gGfxMatrix, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -400.0f, 0.0f, 1.0f, 0.0f, 1); @@ -6156,16 +6134,16 @@ void func_EBFBE0_801ABF1C(void) { Matrix_Push(&gGfxMatrix); { - Matrix_Translate(gGfxMatrix, D_EBFBE0_801CEA88, D_EBFBE0_801CEA8C, D_EBFBE0_801CEA90, 1); - Matrix_RotateY(gGfxMatrix, M_DTOR * D_EBFBE0_801CEA94, 1); + Matrix_Translate(gGfxMatrix, D_menu_801CEA88, D_menu_801CEA8C, D_menu_801CEA90, 1); + Matrix_RotateY(gGfxMatrix, M_DTOR * D_menu_801CEA94, 1); - func_EBFBE0_801AD048(); + func_menu_801AD048(); - Matrix_Scale(gGfxMatrix, D_EBFBE0_801CEA78, D_EBFBE0_801CEA7C, 1.0f, 1); + Matrix_Scale(gGfxMatrix, D_menu_801CEA78, D_menu_801CEA7C, 1.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_EBFBE0_801AFA30[D_EBFBE0_801CD810]); + gSPDisplayList(gMasterDisp++, D_menu_801AFA30[D_menu_801CD810]); Matrix_SetGfxMtx(&gMasterDisp); @@ -6175,17 +6153,17 @@ void func_EBFBE0_801ABF1C(void) { RCP_SetupDL(&gMasterDisp, 0x43); - gDPSetPrimColor(gMasterDisp++, 0, 0, 32, 32, 255, D_EBFBE0_801CEA98); + gDPSetPrimColor(gMasterDisp++, 0, 0, 32, 32, 255, D_menu_801CEA98); gDPSetEnvColor(gMasterDisp++, 207, 207, 255, 0); Matrix_Push(&gGfxMatrix); { - Matrix_Translate(gGfxMatrix, D_EBFBE0_801CEA88, D_EBFBE0_801CEA8C - 1.5f, D_EBFBE0_801CEA90, 1); - Matrix_RotateY(gGfxMatrix, M_DTOR * D_EBFBE0_801CEA94, 1); + Matrix_Translate(gGfxMatrix, D_menu_801CEA88, D_menu_801CEA8C - 1.5f, D_menu_801CEA90, 1); + Matrix_RotateY(gGfxMatrix, M_DTOR * D_menu_801CEA94, 1); - func_EBFBE0_801AD048(); + func_menu_801AD048(); - Matrix_Scale(gGfxMatrix, D_EBFBE0_801CEA80, D_EBFBE0_801CEA84, 3.3f, 1); + Matrix_Scale(gGfxMatrix, D_menu_801CEA80, D_menu_801CEA84, 3.3f, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -6198,7 +6176,7 @@ void func_EBFBE0_801ABF1C(void) { Matrix_Pop(&gGfxMatrix); } -void func_EBFBE0_801AC200(s32 index) { +void func_menu_801AC200(s32 index) { f32 x; f32 y; f32 z; @@ -6216,47 +6194,47 @@ void func_EBFBE0_801AC200(s32 index) { r = 1.0f; } - if (D_EBFBE0_801AFD18[index].unk_14 == 2) { - vec.x = (x / r) * (r / (D_EBFBE0_801AFD18[index].unk_0C - 1)); - vec.y = (y / r) * (r / (D_EBFBE0_801AFD18[index].unk_0C - 1)); - vec.z = (z / r) * (r / (D_EBFBE0_801AFD18[index].unk_0C - 1)); + if (D_menu_801AFD18[index].unk_14 == 2) { + vec.x = (x / r) * (r / (D_menu_801AFD18[index].unk_0C - 1)); + vec.y = (y / r) * (r / (D_menu_801AFD18[index].unk_0C - 1)); + vec.z = (z / r) * (r / (D_menu_801AFD18[index].unk_0C - 1)); - D_EBFBE0_801CEEB0.x = gUnkEntities30[index].unk_04.x + (vec.x * D_EBFBE0_801CEEA0); - D_EBFBE0_801CEEB0.y = gUnkEntities30[index].unk_04.y + (vec.y * D_EBFBE0_801CEEA0); - D_EBFBE0_801CEEB0.z = gUnkEntities30[index].unk_04.z + (vec.z * D_EBFBE0_801CEEA0); + D_menu_801CEEB0.x = gUnkEntities30[index].unk_04.x + (vec.x * D_menu_801CEEA0); + D_menu_801CEEB0.y = gUnkEntities30[index].unk_04.y + (vec.y * D_menu_801CEEA0); + D_menu_801CEEB0.z = gUnkEntities30[index].unk_04.z + (vec.z * D_menu_801CEEA0); - switch (D_EBFBE0_801CEEA4) { + switch (D_menu_801CEEA4) { case 0: break; case 100: - D_EBFBE0_801CD9BC = 5; - D_EBFBE0_801CEEA4 = 10; + D_menu_801CD9BC = 5; + D_menu_801CEEA4 = 10; break; case 10: - if (D_EBFBE0_801CD9BC) { + if (D_menu_801CD9BC) { break; } - D_EBFBE0_801CD9BC = 5; - D_EBFBE0_801CEEA4 = 20; + D_menu_801CD9BC = 5; + D_menu_801CEEA4 = 20; break; case 20: - if (D_EBFBE0_801CD9BC) { + if (D_menu_801CD9BC) { break; } - D_EBFBE0_801CEEA0++; - if (D_EBFBE0_801CEEA0 > D_EBFBE0_801AFD18[index].unk_0C - 1) { - D_EBFBE0_801CEEA0 = 0; + D_menu_801CEEA0++; + if (D_menu_801CEEA0 > D_menu_801AFD18[index].unk_0C - 1) { + D_menu_801CEEA0 = 0; } - D_EBFBE0_801CEEA4 = 100; + D_menu_801CEEA4 = 100; break; } - if (D_EBFBE0_801CEEA4 != 10) { + if (D_menu_801CEEA4 != 10) { return; } } else { @@ -6264,31 +6242,31 @@ void func_EBFBE0_801AC200(s32 index) { vec.y = (y / r) * gUnkEntities30[index].unk_24; vec.z = (z / r) * gUnkEntities30[index].unk_24; - D_EBFBE0_801CEEB0.x = gUnkEntities30[index].unk_04.x + vec.x; - D_EBFBE0_801CEEB0.y = gUnkEntities30[index].unk_04.y + vec.y; - D_EBFBE0_801CEEB0.z = gUnkEntities30[index].unk_04.z + vec.z; + D_menu_801CEEB0.x = gUnkEntities30[index].unk_04.x + vec.x; + D_menu_801CEEB0.y = gUnkEntities30[index].unk_04.y + vec.y; + D_menu_801CEEB0.z = gUnkEntities30[index].unk_04.z + vec.z; - x = D_EBFBE0_801CEEB0.x - gUnkEntities30[index].unk_04.x; - y = D_EBFBE0_801CEEB0.y - gUnkEntities30[index].unk_04.y; - z = D_EBFBE0_801CEEB0.z - gUnkEntities30[index].unk_04.z; + x = D_menu_801CEEB0.x - gUnkEntities30[index].unk_04.x; + y = D_menu_801CEEB0.y - gUnkEntities30[index].unk_04.y; + z = D_menu_801CEEB0.z - gUnkEntities30[index].unk_04.z; r2 = sqrtf(SQ(x) + SQ(y) + SQ(z)); if (((r / 9.0f) * 8.0f) < r2) { - D_EBFBE0_801CEEAC -= 16; - if (D_EBFBE0_801CEEAC < 0) { - D_EBFBE0_801CEEAC = 0; + D_menu_801CEEAC -= 16; + if (D_menu_801CEEAC < 0) { + D_menu_801CEEAC = 0; } } } - if (D_EBFBE0_801AFD18[index].unk_14 == 5) { - func_EBFBE0_801AC80C(D_EBFBE0_801AFD18[index].unk_00); + if (D_menu_801AFD18[index].unk_14 == 5) { + func_menu_801AC80C(D_menu_801AFD18[index].unk_00); } else { - func_EBFBE0_801AC530(index); + func_menu_801AC530(index); } } -void func_EBFBE0_801AC530(s32 index) { +void func_menu_801AC530(s32 index) { f32 dirX; f32 dirY; f32 dirZ; @@ -6304,16 +6282,16 @@ void func_EBFBE0_801AC530(s32 index) { src.y = 0.0f; src.z = 0.0f; - if (D_EBFBE0_801CEEA8 == 255) { + if (D_menu_801CEEA8 == 255) { RCP_SetupDL(&gMasterDisp, 0x17); } else { RCP_SetupDL(&gMasterDisp, 0x2E); - gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_EBFBE0_801CEEA8); + gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_menu_801CEEA8); } Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, D_EBFBE0_801CEEB0.x, D_EBFBE0_801CEEB0.y, D_EBFBE0_801CEEB0.z, 1); + Matrix_Translate(gGfxMatrix, D_menu_801CEEB0.x, D_menu_801CEEB0.y, D_menu_801CEEB0.z, 1); Matrix_RotateY(gGfxMatrix, gUnkEntities30[index].unk_20, 1); Matrix_RotateX(gGfxMatrix, M_DTOR * -90.0f, 1); @@ -6325,9 +6303,9 @@ void func_EBFBE0_801AC530(s32 index) { Matrix_MultVec3f(gGfxMatrix, &src, &dest); - x = D_EBFBE0_801CE960[14].x - dest.x; - y = D_EBFBE0_801CE960[14].y - dest.y; - z = D_EBFBE0_801CE960[14].z - dest.z; + x = D_menu_801CE960[14].x - dest.x; + y = D_menu_801CE960[14].y - dest.y; + z = D_menu_801CE960[14].z - dest.z; x1 = Math_Atan2F(y, sqrtf(SQ(x) + SQ(z))); y1 = -Math_Atan2F(x, z); @@ -6336,8 +6314,8 @@ void func_EBFBE0_801AC530(s32 index) { src.y = 0.0f; src.z = 10.0f; - Matrix_RotateY(gCalcMatrix, M_DTOR * (-D_EBFBE0_801CDA10 - y1), 0); - Matrix_RotateX(gCalcMatrix, M_DTOR * (-D_EBFBE0_801CDA0C - x1), 1); + Matrix_RotateY(gCalcMatrix, M_DTOR * (-D_menu_801CDA10 - y1), 0); + Matrix_RotateX(gCalcMatrix, M_DTOR * (-D_menu_801CDA0C - x1), 1); Matrix_MultVec3f(gCalcMatrix, &src, &dest); dirX = dest.x; @@ -6351,8 +6329,8 @@ void func_EBFBE0_801AC530(s32 index) { Matrix_Pop(&gGfxMatrix); } -void func_EBFBE0_801AC80C(s32 arg0) { - static f32 D_EBFBE0_801B6B30 = 0.0f; +void func_menu_801AC80C(s32 arg0) { + static f32 D_menu_801B6B30 = 0.0f; s32 r; s32 g; s32 b; @@ -6369,16 +6347,16 @@ void func_EBFBE0_801AC80C(s32 arg0) { RCP_SetupDL(&gMasterDisp, 0x43); - gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 80, D_EBFBE0_801CEEAC); + gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 80, D_menu_801CEEAC); gDPSetEnvColor(gMasterDisp++, r, g, b, 0); Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, D_EBFBE0_801CEEB0.x, D_EBFBE0_801CEEB0.y, D_EBFBE0_801CEEB0.z, 1); + Matrix_Translate(gGfxMatrix, D_menu_801CEEB0.x, D_menu_801CEEB0.y, D_menu_801CEEB0.z, 1); - func_EBFBE0_801AD048(); + func_menu_801AD048(); - Matrix_RotateZ(gGfxMatrix, M_DTOR * D_EBFBE0_801B6B30, 1); + Matrix_RotateZ(gGfxMatrix, M_DTOR * D_menu_801B6B30, 1); Matrix_Scale(gGfxMatrix, 10.0f, 10.0f, 10.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -6387,12 +6365,12 @@ void func_EBFBE0_801AC80C(s32 arg0) { Matrix_Pop(&gGfxMatrix); - D_EBFBE0_801B6B30 -= 45.0f; + D_menu_801B6B30 -= 45.0f; } u32 padding_801B6B34[3] = { 0, 0, 0 }; -UnkStruct_D_EBFBE0_801B8294 D_EBFBE0_801B6B40[] = { +UnkStruct_D_menu_801B8294 D_menu_801B6B40[] = { { 0.0, 260.4722595214844, @@ -6491,7 +6469,7 @@ UnkStruct_D_EBFBE0_801B8294 D_EBFBE0_801B6B40[] = { }, }; -UnkStruct_D_EBFBE0_801B8294 D_EBFBE0_801B6C60[] = { +UnkStruct_D_menu_801B8294 D_menu_801B6C60[] = { { 230.0, -20.0, @@ -6574,7 +6552,7 @@ UnkStruct_D_EBFBE0_801B8294 D_EBFBE0_801B6C60[] = { }, }; -void func_EBFBE0_801AC9A0(s32 index) { +void func_menu_801AC9A0(s32 index) { Vec3f srcPos; Vec3f destPos; f32 x; @@ -6583,7 +6561,7 @@ void func_EBFBE0_801AC9A0(s32 index) { f32 target; f32 temp; - func_EBFBE0_801ACD90(index, &srcPos, &destPos); + func_menu_801ACD90(index, &srcPos, &destPos); x = srcPos.x - destPos.x; y = srcPos.y - destPos.y; @@ -6625,13 +6603,13 @@ void func_EBFBE0_801AC9A0(s32 index) { if (gUnkEntities30[index].unk_24 == target) { gUnkEntities30[index].unk_24 = 0.0f; D_80177BD8[index] = 6; - D_EBFBE0_801CEEAC = 255; + D_menu_801CEEAC = 255; } break; case 2: temp = 0.04f; - if (D_EBFBE0_801CD944 == 7) { + if (D_menu_801CD944 == 7) { temp = 0.25f; } Math_SmoothStepToF(&gUnkEntities30[index].unk_24, target, temp, 100.0f, 4.0f); @@ -6644,7 +6622,7 @@ void func_EBFBE0_801AC9A0(s32 index) { case 3: case 4: gUnkEntities30[index].unk_24 = target; - gUnkEntities30[index].unk_2F = D_EBFBE0_801AFD18[index].unk_18; + gUnkEntities30[index].unk_2F = D_menu_801AFD18[index].unk_18; break; } @@ -6654,7 +6632,7 @@ void func_EBFBE0_801AC9A0(s32 index) { gUnkEntities30[index].unk_2E = 32; gUnkEntities30[index].unk_28 = 4.0f; } else { - switch (D_EBFBE0_801AFD18[index].unk_00) { + switch (D_menu_801AFD18[index].unk_00) { case 0: gUnkEntities30[index].unk_2C = 16; gUnkEntities30[index].unk_2D = 64; @@ -6688,7 +6666,7 @@ void func_EBFBE0_801AC9A0(s32 index) { } } -void func_EBFBE0_801ACD90(s32 index, Vec3f* src, Vec3f* dest) { +void func_menu_801ACD90(s32 index, Vec3f* src, Vec3f* dest) { f32 x1; f32 y1; f32 z1; @@ -6704,86 +6682,80 @@ void func_EBFBE0_801ACD90(s32 index, Vec3f* src, Vec3f* dest) { temp1 = 40.0f; - if (D_EBFBE0_801AFD18[index].unk_04 == 12) { + if (D_menu_801AFD18[index].unk_04 == 12) { temp1 = 50.0f; } - if (D_EBFBE0_801AFD18[index].unk_04 == 10) { + if (D_menu_801AFD18[index].unk_04 == 10) { temp1 = 60.0f; } - if (D_EBFBE0_801AFD18[index].unk_04 == 14) { + if (D_menu_801AFD18[index].unk_04 == 14) { temp1 = 20.0f; } - if (D_EBFBE0_801AFD18[index].unk_04 == 0) { + if (D_menu_801AFD18[index].unk_04 == 0) { temp1 = 60.0f; } - if (D_EBFBE0_801AFD18[index].unk_04 == 4) { + if (D_menu_801AFD18[index].unk_04 == 4) { temp1 = 20.0f; } - if (D_EBFBE0_801AFD18[index].unk_04 == 5) { + if (D_menu_801AFD18[index].unk_04 == 5) { temp1 = 20.0f; } - if (D_EBFBE0_801AFD18[index].unk_04 == 3) { + if (D_menu_801AFD18[index].unk_04 == 3) { temp1 = 20.0f; } - if (D_EBFBE0_801AFD18[index].unk_04 == 1) { + if (D_menu_801AFD18[index].unk_04 == 1) { temp1 = 1200.0f; } - if (D_EBFBE0_801AFD18[index].unk_04 == 2) { + if (D_menu_801AFD18[index].unk_04 == 2) { temp1 = 1200.0f; } temp2 = 40.0f; - if (D_EBFBE0_801AFD18[index].unk_08 == 10) { + if (D_menu_801AFD18[index].unk_08 == 10) { temp2 = 60.0f; } - if (D_EBFBE0_801AFD18[index].unk_08 == 12) { + if (D_menu_801AFD18[index].unk_08 == 12) { temp2 = 50.0f; } - if (D_EBFBE0_801AFD18[index].unk_08 == 14) { + if (D_menu_801AFD18[index].unk_08 == 14) { temp2 = 20.0f; } - if (D_EBFBE0_801AFD18[index].unk_08 == 0) { + if (D_menu_801AFD18[index].unk_08 == 0) { temp2 = 60.0f; } - if (D_EBFBE0_801AFD18[index].unk_08 == 4) { + if (D_menu_801AFD18[index].unk_08 == 4) { temp2 = 20.0f; } - if (D_EBFBE0_801AFD18[index].unk_08 == 5) { + if (D_menu_801AFD18[index].unk_08 == 5) { temp2 = 20.0f; } - if (D_EBFBE0_801AFD18[index].unk_08 == 3) { + if (D_menu_801AFD18[index].unk_08 == 3) { temp2 = 20.0f; } - if (D_EBFBE0_801AFD18[index].unk_08 == 1) { + if (D_menu_801AFD18[index].unk_08 == 1) { temp2 = 1200.0f; } - if (D_EBFBE0_801AFD18[index].unk_08 == 2) { + if (D_menu_801AFD18[index].unk_08 == 2) { temp2 = 1200.0f; } - if (D_EBFBE0_801AFD18[index].unk_08 == 13) { + if (D_menu_801AFD18[index].unk_08 == 13) { temp2 = 30.0f; } - x = planet[D_EBFBE0_801AFD18[index].unk_08].posX - planet[D_EBFBE0_801AFD18[index].unk_04].posX; - y = planet[D_EBFBE0_801AFD18[index].unk_08].posY - planet[D_EBFBE0_801AFD18[index].unk_04].posY; - z = planet[D_EBFBE0_801AFD18[index].unk_08].posZ - planet[D_EBFBE0_801AFD18[index].unk_04].posZ; + x = planet[D_menu_801AFD18[index].unk_08].posX - planet[D_menu_801AFD18[index].unk_04].posX; + y = planet[D_menu_801AFD18[index].unk_08].posY - planet[D_menu_801AFD18[index].unk_04].posY; + z = planet[D_menu_801AFD18[index].unk_08].posZ - planet[D_menu_801AFD18[index].unk_04].posZ; r = sqrtf(SQ(x) + SQ(y) + SQ(z)); - x1 = planet[D_EBFBE0_801AFD18[index].unk_04].posX + - (temp1 * planet[D_EBFBE0_801AFD18[index].unk_04].scale * (x / r)); - y1 = planet[D_EBFBE0_801AFD18[index].unk_04].posY + - (temp1 * planet[D_EBFBE0_801AFD18[index].unk_04].scale * (y / r)); - z1 = planet[D_EBFBE0_801AFD18[index].unk_04].posZ + - (temp1 * planet[D_EBFBE0_801AFD18[index].unk_04].scale * (z / r)); + x1 = planet[D_menu_801AFD18[index].unk_04].posX + (temp1 * planet[D_menu_801AFD18[index].unk_04].scale * (x / r)); + y1 = planet[D_menu_801AFD18[index].unk_04].posY + (temp1 * planet[D_menu_801AFD18[index].unk_04].scale * (y / r)); + z1 = planet[D_menu_801AFD18[index].unk_04].posZ + (temp1 * planet[D_menu_801AFD18[index].unk_04].scale * (z / r)); - x2 = planet[D_EBFBE0_801AFD18[index].unk_08].posX + - (temp2 * planet[D_EBFBE0_801AFD18[index].unk_08].scale * (-x / r)); - y2 = planet[D_EBFBE0_801AFD18[index].unk_08].posY + - (temp2 * planet[D_EBFBE0_801AFD18[index].unk_08].scale * (-y / r)); - z2 = planet[D_EBFBE0_801AFD18[index].unk_08].posZ + - (temp2 * planet[D_EBFBE0_801AFD18[index].unk_08].scale * (-z / r)); + x2 = planet[D_menu_801AFD18[index].unk_08].posX + (temp2 * planet[D_menu_801AFD18[index].unk_08].scale * (-x / r)); + y2 = planet[D_menu_801AFD18[index].unk_08].posY + (temp2 * planet[D_menu_801AFD18[index].unk_08].scale * (-y / r)); + z2 = planet[D_menu_801AFD18[index].unk_08].posZ + (temp2 * planet[D_menu_801AFD18[index].unk_08].scale * (-z / r)); src->x = x1; src->y = y1; @@ -6794,16 +6766,16 @@ void func_EBFBE0_801ACD90(s32 index, Vec3f* src, Vec3f* dest) { dest->z = z2; } -void func_EBFBE0_801AD048(void) { - f32 sp1C = Math_Atan2F(D_EBFBE0_801CD9F8 - D_EBFBE0_801CDA04, sqrtf(SQ(D_EBFBE0_801CD9F4 - D_EBFBE0_801CDA00) + - SQ(D_EBFBE0_801CD9FC - D_EBFBE0_801CDA08))); - f32 temp = -Math_Atan2F(D_EBFBE0_801CD9F4 - D_EBFBE0_801CDA00, D_EBFBE0_801CD9FC - D_EBFBE0_801CDA08); +void func_menu_801AD048(void) { + f32 sp1C = Math_Atan2F(D_menu_801CD9F8 - D_menu_801CDA04, + sqrtf(SQ(D_menu_801CD9F4 - D_menu_801CDA00) + SQ(D_menu_801CD9FC - D_menu_801CDA08))); + f32 temp = -Math_Atan2F(D_menu_801CD9F4 - D_menu_801CDA00, D_menu_801CD9FC - D_menu_801CDA08); Matrix_RotateY(gGfxMatrix, -temp, 1); Matrix_RotateX(gGfxMatrix, -sp1C, 1); } -void func_EBFBE0_801AD11C(void) { +void func_menu_801AD11C(void) { s32 i; s32 var_t0; s32 var_a3; @@ -6817,33 +6789,33 @@ void func_EBFBE0_801AD11C(void) { var_t0 = 0; if (gControllerPress[gMainController].button & A_BUTTON) { - if ((D_80161A34 == 7) && (D_EBFBE0_801CD93C != 0) && (!D_EBFBE0_801CEFD0)) { + if ((D_80161A34 == 7) && (D_menu_801CD93C != 0) && (!D_menu_801CEFD0)) { func_8001D6DC(1); - D_EBFBE0_801CEFC4 = 1; - D_EBFBE0_801CEFD4 = 0; - D_EBFBE0_801CEFDC = 0; - D_EBFBE0_801CD944 = 6; - D_EBFBE0_801CD94C = 0; + D_menu_801CEFC4 = 1; + D_menu_801CEFD4 = 0; + D_menu_801CEFDC = 0; + D_menu_801CD944 = 6; + D_menu_801CD94C = 0; } else { for (i = 0; i < 6; i++) { D_80177C58[i] = gTeamShields[i]; } - func_EBFBE0_801A659C(); + func_menu_801A659C(); } return; } if (gControllerPress[gMainController].button & START_BUTTON) { - if (D_EBFBE0_801CD944 == 3 && D_80161A34 == 7) { - if (D_EBFBE0_801CEFD0) { + if (D_menu_801CD944 == 3 && D_80161A34 == 7) { + if (D_menu_801CEFD0) { Audio_PlaySfx(0x4900100AU, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } else { func_8001D6DC(1); - D_EBFBE0_801CEFC4 = 1; - D_EBFBE0_801CEFD4 = 0; - D_EBFBE0_801CEFDC = 0; - D_EBFBE0_801CD944 = 6; - D_EBFBE0_801CD94C = 0; + D_menu_801CEFC4 = 1; + D_menu_801CEFD4 = 0; + D_menu_801CEFDC = 0; + D_menu_801CD944 = 6; + D_menu_801CD94C = 0; } return; } @@ -6853,26 +6825,26 @@ void func_EBFBE0_801AD11C(void) { y = gControllerPress[gMainController].stick_y; if (y != 0.0f) { - if (D_EBFBE0_801CDA0C - (y * 0.05f) < -80.0f) { - D_EBFBE0_801CDA0C = -80.0f; + if (D_menu_801CDA0C - (y * 0.05f) < -80.0f) { + D_menu_801CDA0C = -80.0f; y = 0.0f; - } else if (D_EBFBE0_801CDA0C - (y * 0.05f) > 80.0f) { - D_EBFBE0_801CDA0C = 80.0f; + } else if (D_menu_801CDA0C - (y * 0.05f) > 80.0f) { + D_menu_801CDA0C = 80.0f; y = 0.0f; } else { - D_EBFBE0_801CDA0C -= y * 0.05f; + D_menu_801CDA0C -= y * 0.05f; var_a3 = 1; var_a1 = (s32) fabsf(((y * 0.05f) / 0.27f)); } } if (x != 0.0f) { - D_EBFBE0_801CDA10 += x * 0.05f; + D_menu_801CDA10 += x * 0.05f; var_a2 = (s32) fabsf((x * 0.05f) / 0.27f); var_a3 = 1; } - if (D_EBFBE0_801CF014 == 1) { + if (D_menu_801CF014 == 1) { var_a0 = var_a1; if (var_a1 < var_a2) { var_a0 = var_a2; @@ -6880,75 +6852,75 @@ void func_EBFBE0_801AD11C(void) { func_8001D15C(var_a0); } - if (D_EBFBE0_801CF014 == 0 && var_a3 == 1) { + if (D_menu_801CF014 == 0 && var_a3 == 1) { func_8001D10C(&D_800C5D28, 0x1100204C); - D_EBFBE0_801CF014 = 1; + D_menu_801CF014 = 1; } - if ((D_EBFBE0_801CF014 == 1) && (var_a3 == 0) && (y == 0.0f) && (x == 0.0f)) { + if ((D_menu_801CF014 == 1) && (var_a3 == 0) && (y == 0.0f) && (x == 0.0f)) { var_a1 = 0; var_a2 = 0; func_8001A838(0x1100204CU); - D_EBFBE0_801CF014 = 0; + D_menu_801CF014 = 0; } if (gControllerHold[gMainController].button & R_TRIG) { - if (D_EBFBE0_801CDA14 - 20.0f > 2475.0f) { - D_EBFBE0_801CDA14 -= 20.0f; + if (D_menu_801CDA14 - 20.0f > 2475.0f) { + D_menu_801CDA14 -= 20.0f; var_t0 = 1; } } if (gControllerHold[gMainController].button & Z_TRIG) { - if (D_EBFBE0_801CDA14 + 20.0f < 7695.0f) { - D_EBFBE0_801CDA14 += 20.0f; + if (D_menu_801CDA14 + 20.0f < 7695.0f) { + D_menu_801CDA14 += 20.0f; var_t0 = 1; } } if (gControllerHold[gMainController].button & U_CBUTTONS) { - if (D_EBFBE0_801CDA04 - 10.0f >= -1200.0f) { - D_EBFBE0_801CDA04 -= 10.0f; + if (D_menu_801CDA04 - 10.0f >= -1200.0f) { + D_menu_801CDA04 -= 10.0f; var_t0 = 1; } } if (gControllerHold[gMainController].button & D_CBUTTONS) { - if (D_EBFBE0_801CDA04 + 10.0f <= 1200.0f) { - D_EBFBE0_801CDA04 += 10.0f; + if (D_menu_801CDA04 + 10.0f <= 1200.0f) { + D_menu_801CDA04 += 10.0f; var_t0 = 1; } } if (gControllerHold[gMainController].button & L_CBUTTONS) { - if (D_EBFBE0_801CDA00 + 10.0f <= 1200.0f) { - D_EBFBE0_801CDA00 += 10.0f; + if (D_menu_801CDA00 + 10.0f <= 1200.0f) { + D_menu_801CDA00 += 10.0f; var_t0 = 1; } } if (gControllerHold[gMainController].button & R_CBUTTONS) { - if (D_EBFBE0_801CDA00 - 10.0f >= -1200.0f) { - D_EBFBE0_801CDA00 -= 10.0f; + if (D_menu_801CDA00 - 10.0f >= -1200.0f) { + D_menu_801CDA00 -= 10.0f; var_t0 = 1; } } - if (D_EBFBE0_801CF010 == 0 && var_t0 == 1) { + if (D_menu_801CF010 == 0 && var_t0 == 1) { Audio_PlaySfx(0x1100004CU, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801CF010 = 1; + D_menu_801CF010 = 1; } - if (D_EBFBE0_801CF010 == 1 && var_t0 == 0) { + if (D_menu_801CF010 == 1 && var_t0 == 0) { func_8001A838(0x1100004CU); - D_EBFBE0_801CF010 = 0; + D_menu_801CF010 = 0; } } void func_dummy_() { } -void func_EBFBE0_801AD718(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f32* arg5, f32 arg6, f32 arg7, f32 arg8) { +void func_menu_801AD718(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f32* arg5, f32 arg6, f32 arg7, f32 arg8) { Vec3f sp2C; Vec3f sp20; @@ -6966,7 +6938,7 @@ void func_EBFBE0_801AD718(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f3 *arg5 = sp2C.z; } -void func_EBFBE0_801AD7EC(s32 xPos, s32 yPos, s32 number) { +void func_menu_801AD7EC(s32 xPos, s32 yPos, s32 number) { RCP_SetupDL(&gMasterDisp, 0x55); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); diff --git a/src/overlays/ovl_menu/fox_option.c b/src/overlays/ovl_menu/fox_option.c index 642af995..64763637 100644 --- a/src/overlays/ovl_menu/fox_option.c +++ b/src/overlays/ovl_menu/fox_option.c @@ -11,32 +11,32 @@ //! TODO: IMPORT BSS -extern Gfx D_EBFBE0_801B4A40[]; -extern Gfx D_EBFBE0_801B5E78[]; -extern Gfx D_EBFBE0_801B61E0[]; -extern Gfx D_EBFBE0_801B6548[]; -extern Gfx D_EBFBE0_801B4D70[]; -extern Gfx D_EBFBE0_801B5B10[]; -extern Gfx D_EBFBE0_801B5440[]; -extern Gfx D_EBFBE0_801B50D8[]; -extern Gfx D_EBFBE0_801B5E78[]; -extern Gfx D_EBFBE0_801B57A8[]; +extern Gfx D_menu_801B4A40[]; +extern Gfx D_menu_801B5E78[]; +extern Gfx D_menu_801B61E0[]; +extern Gfx D_menu_801B6548[]; +extern Gfx D_menu_801B4D70[]; +extern Gfx D_menu_801B5B10[]; +extern Gfx D_menu_801B5440[]; +extern Gfx D_menu_801B50D8[]; +extern Gfx D_menu_801B5E78[]; +extern Gfx D_menu_801B57A8[]; // #define IMPORT_BSS -static f32 sOptionCardPosY[] = { 60.0f, 36.0f, 12.0f, -12.0f, -36.0f, -60.0f }; // D_EBFBE0_801AE570 -static f32 sOptionCardTextPosX[] = { 124.0f, 118.0f, 145.0f, 125.0f, 133.0f, 118.0f }; // D_EBFBE0_801AE588 -static f32 sOptionCardTextPosY[] = { 54.0f, 78.0f, 103.0f, 126.0f, 151.0f, 175.0f }; // D_EBFBE0_801AE5A0 -static f32 sOptionCardCurTextPosX[] = { 124.0f, 118.0f, 145.0f, 125.0f, 133.0f, 118.0f }; // D_EBFBE0_801AE5B8 -static f32 sOptionCardCurTextPosY[] = { 54.0f, 78.0f, 103.0f, 126.0f, 151.0f, 175.0f }; // D_EBFBE0_801AE5D0 -static f32 D_EBFBE0_801AE5E8[] = { 124.0f, 125.0f }; -static f32 D_EBFBE0_801AE5F0[] = { 54.0f, 55.0f }; -static f32 D_EBFBE0_801AE5F8[] = { 133.0f, 125.0f }; -static f32 D_EBFBE0_801AE600[] = { 151.0f, 151.0f }; -static f32 D_EBFBE0_801AE608[] = { 8.0f, 8.0f, 8.0f, 8.0f, 8.0f, 8.0f }; -static f32 D_EBFBE0_801AE620[] = { 1.9f, 2.4f, 0.9f, 1.9f, 1.8f, 2.4f }; +static f32 sOptionCardPosY[] = { 60.0f, 36.0f, 12.0f, -12.0f, -36.0f, -60.0f }; // D_menu_801AE570 +static f32 sOptionCardTextPosX[] = { 124.0f, 118.0f, 145.0f, 125.0f, 133.0f, 118.0f }; // D_menu_801AE588 +static f32 sOptionCardTextPosY[] = { 54.0f, 78.0f, 103.0f, 126.0f, 151.0f, 175.0f }; // D_menu_801AE5A0 +static f32 sOptionCardCurTextPosX[] = { 124.0f, 118.0f, 145.0f, 125.0f, 133.0f, 118.0f }; // D_menu_801AE5B8 +static f32 sOptionCardCurTextPosY[] = { 54.0f, 78.0f, 103.0f, 126.0f, 151.0f, 175.0f }; // D_menu_801AE5D0 +static f32 D_menu_801AE5E8[] = { 124.0f, 125.0f }; +static f32 D_menu_801AE5F0[] = { 54.0f, 55.0f }; +static f32 D_menu_801AE5F8[] = { 133.0f, 125.0f }; +static f32 D_menu_801AE600[] = { 151.0f, 151.0f }; +static f32 D_menu_801AE608[] = { 8.0f, 8.0f, 8.0f, 8.0f, 8.0f, 8.0f }; +static f32 D_menu_801AE620[] = { 1.9f, 2.4f, 0.9f, 1.9f, 1.8f, 2.4f }; -// D_EBFBE0_801AE638 +// D_menu_801AE638 static OptionEntry sOptionCardList[] = { { { 0, 0, (void*) 0x08003B50, 0, 72, 12, 126.0f, 46.0f, 1.0f, 1.0f, 20, 0, 75, 255 }, @@ -82,7 +82,7 @@ static OptionEntry sOptionCardList[] = { }, }; -// D_EBFBE0_801AE878 +// D_menu_801AE878 static OptionEntry sOptionVSCardList[] = { { { 0, 0, (void*) 0x08005010, 0, 96, 13, 110.0f, 91.0f, 1.0f, 1.0f, 20, 0, 75, 255 }, @@ -106,77 +106,77 @@ static OptionEntry sOptionVSCardList[] = { 1, }, }; -static u8 D_EBFBE0_801AE998[] = { 0, 3, 1 }; +static u8 D_menu_801AE998[] = { 0, 3, 1 }; -static u8 D_EBFBE0_801AE99C[] = { 0, 1, 2 }; +static u8 D_menu_801AE99C[] = { 0, 1, 2 }; -static f32 D_EBFBE0_801AE9A0[4] = { 62.0f, 222.0f, 75.0f, 235.0f }; +static f32 D_menu_801AE9A0[4] = { 62.0f, 222.0f, 75.0f, 235.0f }; -static f32 D_EBFBE0_801AE9B0[4] = { 43.0f, 43.0f, 46.0f, 46.0f }; +static f32 D_menu_801AE9B0[4] = { 43.0f, 43.0f, 46.0f, 46.0f }; -static OptionTexture D_EBFBE0_801AE9C0[4] = { +static OptionTexture D_menu_801AE9C0[4] = { { 2, 0, (void*) 0x080143B0, 0x080147B0, 32, 32, 56.0f, 175.0f, 1.0f, 1.0f, 255, 255, 255, 255 }, { 2, 0, (void*) 0x080143B0, 0x080147B0, 32, 32, 216.0f, 175.0f, 1.0f, 1.0f, 255, 255, 255, 255 }, { 1, 0, (void*) 0x080039D0, 0x08003A50, 16, 16, 69.0f, 178.0f, 1.0f, 1.0f, 255, 255, 255, 255 }, { 1, 0, (void*) 0x080039D0, 0x08003A50, 16, 16, 229.0f, 178.0f, 1.0f, 1.0f, 255, 255, 255, 255 }, }; -static OptionTexture D_EBFBE0_801AEAA0[3] = { +static OptionTexture D_menu_801AEAA0[3] = { { 3, 0, (void*) 0x08013990, 0, 104, 10, 151.0f, 135.0f, 1.05f, 1.0f, 255, 255, 255, 255 }, { 3, 0, (void*) 0x08013990, 0, 104, 10, 151.0f, 161.0f, 1.05f, 1.0f, 255, 255, 255, 255 }, { 3, 0, (void*) 0x08013990, 0, 104, 10, 151.0f, 188.0f, 1.05f, 1.0f, 255, 255, 255, 255 }, }; -static OptionTexture D_EBFBE0_801AEB48[3] = { +static OptionTexture D_menu_801AEB48[3] = { { 3, 0, (void*) 0x080141B0, 0, 16, 16, 245.0f, 132.0f, 1.0f, 1.0f, 255, 255, 255, 255 }, { 3, 0, (void*) 0x080141B0, 0, 16, 16, 245.0f, 158.0f, 1.0f, 1.0f, 255, 255, 255, 255 }, { 3, 0, (void*) 0x080141B0, 0, 16, 16, 245.0f, 185.0f, 1.0f, 1.0f, 255, 255, 255, 255 }, }; -// Something inside D_EBFBE0_801AEC30 display list -static u32 D_EBFBE0_801AEBF0[] = { +// Something inside D_menu_801AEC30 display list +static u32 D_menu_801AEBF0[] = { 0x00010001, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFF0001, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFF0000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00010000, 0x00000000, 0x00000000, 0xFFFFFFFF, }; -static Gfx D_EBFBE0_801AEC30[] = { - gsSPVertex(D_EBFBE0_801AEBF0, 4, 0), +static Gfx D_menu_801AEC30[] = { + gsSPVertex(D_menu_801AEBF0, 4, 0), gsSP1Quadrangle(1, 2, 3, 0, 0), gsSPEndDisplayList(), }; -// Something inside D_EBFBE0_801AEC88 display list -static u32 D_EBFBE0_801AEC48[] = { +// Something inside D_menu_801AEC88 display list +static u32 D_menu_801AEC48[] = { 0x00010000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFF0000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0001FFFF, 0x00000000, 0x00000000, 0xFFFFFFFF, }; -static Gfx D_EBFBE0_801AEC88[] = { - gsSPVertex(D_EBFBE0_801AEC48, 4, 0), +static Gfx D_menu_801AEC88[] = { + gsSPVertex(D_menu_801AEC48, 4, 0), gsSP1Quadrangle(1, 2, 3, 0, 0), gsSPEndDisplayList(), }; -// Something inside D_EBFBE0_801AECE0 display list -static u32 D_EBFBE0_801AECA0[] = { +// Something inside D_menu_801AECE0 display list +static u32 D_menu_801AECA0[] = { 0x00010001, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFF0001, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0001FFFF, 0x00000000, 0x00000000, 0xFFFFFFFF, }; -static Gfx D_EBFBE0_801AECE0[] = { - gsSPVertex(D_EBFBE0_801AECA0, 4, 0), +static Gfx D_menu_801AECE0[] = { + gsSPVertex(D_menu_801AECA0, 4, 0), gsSP1Quadrangle(1, 2, 3, 0, 0), gsSPEndDisplayList(), }; -static u8* D_EBFBE0_801AECF8[10] = { +static u8* D_menu_801AECF8[10] = { (u8*) 0x05009F60, (u8*) 0x0500A050, (u8*) 0x0500A140, (u8*) 0x0500A230, (u8*) 0x0500A320, (u8*) 0x0500A410, (u8*) 0x0500A500, (u8*) 0x0500A5F0, (u8*) 0x0500A6E0, (u8*) 0x0500A7D0, }; -static f32 D_EBFBE0_801AED20[2] = { 255.0f, 255.0f }; +static f32 D_menu_801AED20[2] = { 255.0f, 255.0f }; // TF is this? seems unused -static s32 D_EBFBE0_801AED28[] = { +static s32 D_menu_801AED28[] = { /* EE73E8 801AED28 00000038 */ 56, /* EE73EC 801AED2C 00000043 */ 67, /* EE73F0 801AED30 0000004E */ 78, @@ -184,162 +184,162 @@ static s32 D_EBFBE0_801AED28[] = { /* EE73F8 801AED38 0000005B */ 91, }; -static s32 D_EBFBE0_801AED3C[4] = { 0, 0, 0, 0 }; +static s32 D_menu_801AED3C[4] = { 0, 0, 0, 0 }; -static UnkStruct_D_EBFBE0_801AED4C D_EBFBE0_801AED4C[24] = { +static UnkStruct_D_menu_801AED4C D_menu_801AED4C[24] = { { 9, 0, 0 }, { 0, 12, 0 }, { 12, 4, 0 }, { 4, 10, 0 }, { 10, 2, 0 }, { 6, 4, 0 }, { 7, 2, 0 }, { 3, 2, 0 }, { 2, 14, 0 }, { 5, 6, 1 }, { 6, 13, 1 }, { 13, 7, 1 }, { 4, 7, 1 }, { 12, 13, 1 }, { 8, 7, 1 }, { 9, 5, 2 }, { 5, 11, 2 }, { 11, 8, 2 }, { 8, 3, 2 }, { 3, 1, 2 }, { 7, 1, 2 }, { 1, 14, 2 }, { 0, 6, 3 }, { 4, 3, 4 }, }; -static Gfx* D_EBFBE0_801AEE6C[16] = { +static Gfx* D_menu_801AEE6C[16] = { (Gfx*) 0x06060610, (Gfx*) 0x0601DE80, (Gfx*) 0x0604B750, (Gfx*) 0x0601F6B0, (Gfx*) 0x0601C0D0, (Gfx*) 0x0601C960, - D_EBFBE0_801B5E78, D_EBFBE0_801B61E0, D_EBFBE0_801B6548, D_EBFBE0_801B4D70, D_EBFBE0_801B5B10, D_EBFBE0_801B5440, - D_EBFBE0_801B50D8, (Gfx*) 0x0604DB10, D_EBFBE0_801B57A8, D_EBFBE0_801B57A8, + D_menu_801B5E78, D_menu_801B61E0, D_menu_801B6548, D_menu_801B4D70, D_menu_801B5B10, D_menu_801B5440, + D_menu_801B50D8, (Gfx*) 0x0604DB10, D_menu_801B57A8, D_menu_801B57A8, }; -static char* D_EBFBE0_801AEEAC[] = { +static char* D_menu_801AEEAC[] = { "ME", "A6", "BO", "SZ", "SX", "SY", "KA", "MA", "ZO", "CO", "TI", "AQ", "FO", "SO", "VE", "VE", }; -static s32 PAD_EBFBE0_801AEEEC = 0; +static s32 PAD_menu_801AEEEC = 0; -// Something inside D_EBFBE0_801AEF30 display list -static u32 D_EBFBE0_801AEEF0[] = { +// Something inside D_menu_801AEF30 display list +static u32 D_menu_801AEEF0[] = { 0xFFF5FFF5, 0x00000000, 0x000000FF, 0x00000000, 0x000BFFF5, 0x00000000, 0x00FF00FF, 0x00000000, 0x000B000B, 0x00000000, 0x00FF0000, 0x00000000, 0xFFF5000B, 0x00000000, 0x00000000, 0x00000000, }; -static Gfx D_EBFBE0_801AEF30[] = { - gsSPVertex(D_EBFBE0_801AEEF0, 4, 0), +static Gfx D_menu_801AEF30[] = { + gsSPVertex(D_menu_801AEEF0, 4, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 2, 3, 0), gsSPEndDisplayList(), }; -static s32 PAD_EBFBE0_801AEF50[] = { 0x00000000, 0x00000000, 0x00000000 }; +static s32 PAD_menu_801AEF50[] = { 0x00000000, 0x00000000, 0x00000000 }; -static char D_EBFBE0_801AEF5C[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789."; +static char D_menu_801AEF5C[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789."; -static f32 D_EBFBE0_801AEF84[] = { 24.0f, 0.0f, -24.0f }; -static f32 D_EBFBE0_801AEF90[] = { 111.0f, 112.0f, 121.0f }; -static f32 D_EBFBE0_801AEF9C[] = { 89.0f, 115.0f, 139.0f }; +static f32 D_menu_801AEF84[] = { 24.0f, 0.0f, -24.0f }; +static f32 D_menu_801AEF90[] = { 111.0f, 112.0f, 121.0f }; +static f32 D_menu_801AEF9C[] = { 89.0f, 115.0f, 139.0f }; #ifdef IMPORT_BSS -s32 D_EBFBE0_801B9090; -s32 D_EBFBE0_801B9094; -s32 D_EBFBE0_801B9098; // gap -s32 D_EBFBE0_801B90A0[3]; // gap -s32 D_EBFBE0_801B90B0[3]; // gap -f32 D_EBFBE0_801B90C0[3]; // gap -f32 D_EBFBE0_801B90D0[3]; // gap -f32 D_EBFBE0_801B90E0[3]; // gap -f32 D_EBFBE0_801B90F0[3]; // gap -f32 D_EBFBE0_801B9100[3]; // gap -f32 D_EBFBE0_801B9110[3]; -f32 D_EBFBE0_801B911C; -f32 D_EBFBE0_801B9120; -OptionId D_EBFBE0_801B9124; -s32 D_EBFBE0_801B9128; -s32 D_EBFBE0_801B912C; -s32 D_EBFBE0_801B9130; -s32 D_EBFBE0_801B9134; -s32 D_EBFBE0_801B9138; -s32 D_EBFBE0_801B913C; -s32 D_EBFBE0_801B9140[3]; -s32 D_EBFBE0_801B914C; -u8 D_EBFBE0_801B9150[3][2]; -s32 D_EBFBE0_801B9158; -UnkStruct_D_EBFBE0_801B9250 D_EBFBE0_801B9160[3]; -s32 D_EBFBE0_801B9178; -s32 D_EBFBE0_801B917C; -UnkStruct_D_EBFBE0_801B9250 D_EBFBE0_801B9180; // gap -UnkStruct_D_EBFBE0_801B9250 D_EBFBE0_801B9188; -UnkStruct_D_EBFBE0_801B9250 D_EBFBE0_801B9190; -UnkStruct_D_EBFBE0_801B9250 D_EBFBE0_801B9198; -s32 D_EBFBE0_801B91A0; -s32 D_EBFBE0_801B91A4; -s32 D_EBFBE0_801B91A8; -s32 D_EBFBE0_801B91AC; -s32 D_EBFBE0_801B91B0; -s32 D_EBFBE0_801B91B4; -s32 D_EBFBE0_801B91B8; -s32 D_EBFBE0_801B91BC; -s32 D_EBFBE0_801B91C0; -s32 D_EBFBE0_801B91C4; -s32 D_EBFBE0_801B91C8; -s32 D_EBFBE0_801B91CC; -s32 D_EBFBE0_801B91D0; -f32 D_EBFBE0_801B91D4; -f32 D_EBFBE0_801B91D8; -f32 D_EBFBE0_801B91DC; -f32 D_EBFBE0_801B91E0; -f32 D_EBFBE0_801B91E4; -f32 D_EBFBE0_801B91E8; -f32 D_EBFBE0_801B91EC; -s32 D_EBFBE0_801B91F0; -f32 D_EBFBE0_801B91F4; -f32 D_EBFBE0_801B91F8; -f32 D_EBFBE0_801B91FC; -f32 D_EBFBE0_801B9200; -f32 D_EBFBE0_801B9204; -f32 D_EBFBE0_801B9208; -f32 D_EBFBE0_801B920C; -f32 D_EBFBE0_801B9210; -s32 D_EBFBE0_801B9214; -f32 D_EBFBE0_801B9218; -f32 D_EBFBE0_801B921C; -f32 D_EBFBE0_801B9220; -f32 D_EBFBE0_801B9224; -f32 D_EBFBE0_801B9228; -s32 D_EBFBE0_801B922C; -s32 D_EBFBE0_801B9230; -s32 D_EBFBE0_801B9234; -s32 D_EBFBE0_801B9238; -s32 D_EBFBE0_801B923C; -s32 D_EBFBE0_801B9240; -s32 D_EBFBE0_801B9244; -s32 D_EBFBE0_801B9248; -u8 D_EBFBE0_801B924C; -UnkStruct_D_EBFBE0_801B9250 D_EBFBE0_801B9250; -UnkStruct_D_EBFBE0_801B9250 D_EBFBE0_801B9258; -UnkStruct_D_EBFBE0_801B9250 D_EBFBE0_801B9260; -UnkStruct_D_EBFBE0_801B9250 D_EBFBE0_801B9268; -f32 D_EBFBE0_801B9270[5]; -s32 D_EBFBE0_801B9284; -s32 D_EBFBE0_801B9288; // gap -UnkStruct_D_EBFBE0_801B9250 D_EBFBE0_801B9290; -f32 D_EBFBE0_801B9298[32]; +s32 D_menu_801B9090; +s32 D_menu_801B9094; +s32 D_menu_801B9098; // gap +s32 D_menu_801B90A0[3]; // gap +s32 D_menu_801B90B0[3]; // gap +f32 D_menu_801B90C0[3]; // gap +f32 D_menu_801B90D0[3]; // gap +f32 D_menu_801B90E0[3]; // gap +f32 D_menu_801B90F0[3]; // gap +f32 D_menu_801B9100[3]; // gap +f32 D_menu_801B9110[3]; +f32 D_menu_801B911C; +f32 D_menu_801B9120; +OptionId D_menu_801B9124; +s32 D_menu_801B9128; +s32 D_menu_801B912C; +s32 D_menu_801B9130; +s32 D_menu_801B9134; +s32 D_menu_801B9138; +s32 D_menu_801B913C; +s32 D_menu_801B9140[3]; +s32 D_menu_801B914C; +u8 D_menu_801B9150[3][2]; +s32 D_menu_801B9158; +UnkStruct_D_menu_801B9250 D_menu_801B9160[3]; +s32 D_menu_801B9178; +s32 D_menu_801B917C; +UnkStruct_D_menu_801B9250 D_menu_801B9180; // gap +UnkStruct_D_menu_801B9250 D_menu_801B9188; +UnkStruct_D_menu_801B9250 D_menu_801B9190; +UnkStruct_D_menu_801B9250 D_menu_801B9198; +s32 D_menu_801B91A0; +s32 D_menu_801B91A4; +s32 D_menu_801B91A8; +s32 D_menu_801B91AC; +s32 D_menu_801B91B0; +s32 D_menu_801B91B4; +s32 D_menu_801B91B8; +s32 D_menu_801B91BC; +s32 D_menu_801B91C0; +s32 D_menu_801B91C4; +s32 D_menu_801B91C8; +s32 D_menu_801B91CC; +s32 D_menu_801B91D0; +f32 D_menu_801B91D4; +f32 D_menu_801B91D8; +f32 D_menu_801B91DC; +f32 D_menu_801B91E0; +f32 D_menu_801B91E4; +f32 D_menu_801B91E8; +f32 D_menu_801B91EC; +s32 D_menu_801B91F0; +f32 D_menu_801B91F4; +f32 D_menu_801B91F8; +f32 D_menu_801B91FC; +f32 D_menu_801B9200; +f32 D_menu_801B9204; +f32 D_menu_801B9208; +f32 D_menu_801B920C; +f32 D_menu_801B9210; +s32 D_menu_801B9214; +f32 D_menu_801B9218; +f32 D_menu_801B921C; +f32 D_menu_801B9220; +f32 D_menu_801B9224; +f32 D_menu_801B9228; +s32 D_menu_801B922C; +s32 D_menu_801B9230; +s32 D_menu_801B9234; +s32 D_menu_801B9238; +s32 D_menu_801B923C; +s32 D_menu_801B9240; +s32 D_menu_801B9244; +s32 D_menu_801B9248; +u8 D_menu_801B924C; +UnkStruct_D_menu_801B9250 D_menu_801B9250; +UnkStruct_D_menu_801B9250 D_menu_801B9258; +UnkStruct_D_menu_801B9250 D_menu_801B9260; +UnkStruct_D_menu_801B9250 D_menu_801B9268; +f32 D_menu_801B9270[5]; +s32 D_menu_801B9284; +s32 D_menu_801B9288; // gap +UnkStruct_D_menu_801B9250 D_menu_801B9290; +f32 D_menu_801B9298[32]; s32 spectrumAnalizerMode; -s32 D_EBFBE0_801B931C; -bool D_EBFBE0_801B9320; // MusicPlaying status in the expert sound options -s32 D_EBFBE0_801B9330[2]; -s32 D_EBFBE0_801B933C; -s32 D_EBFBE0_801B9340; // gap -s32 D_EBFBE0_801B9348[4]; -f32 D_EBFBE0_801B9358[4]; -f32 D_EBFBE0_801B9368; -s32 D_EBFBE0_801B936C; -f32 D_EBFBE0_801B9370; -s32 D_EBFBE0_801B9374; -f32 D_EBFBE0_801B9378; -s32 D_EBFBE0_801B937C; -UnkStruct_D_EBFBE0_801B9250 D_EBFBE0_801B9380[4]; -UnkStruct_D_EBFBE0_801B9250 D_EBFBE0_801B93A0[4]; -u8 D_EBFBE0_801B93C4; -s32 D_EBFBE0_801B93D0; -s32 D_EBFBE0_801B93D4; -s32 D_EBFBE0_801B93D8; -s32 D_EBFBE0_801B93DC; -s32 D_EBFBE0_801B93E0; -s32 D_EBFBE0_801B93E4; -s32 D_EBFBE0_801B93E8; -s32 D_EBFBE0_801B93EC; -f32 D_EBFBE0_801B93F0; -f32 D_EBFBE0_801B93F4; -f32 D_EBFBE0_801B93F8; // gap -UnkStruct_D_EBFBE0_801B9250 D_EBFBE0_801B9400; -UnkStruct_D_EBFBE0_801B9250 D_EBFBE0_801B9408; +s32 D_menu_801B931C; +bool D_menu_801B9320; // MusicPlaying status in the expert sound options +s32 D_menu_801B9330[2]; +s32 D_menu_801B933C; +s32 D_menu_801B9340; // gap +s32 D_menu_801B9348[4]; +f32 D_menu_801B9358[4]; +f32 D_menu_801B9368; +s32 D_menu_801B936C; +f32 D_menu_801B9370; +s32 D_menu_801B9374; +f32 D_menu_801B9378; +s32 D_menu_801B937C; +UnkStruct_D_menu_801B9250 D_menu_801B9380[4]; +UnkStruct_D_menu_801B9250 D_menu_801B93A0[4]; +u8 D_menu_801B93C4; +s32 D_menu_801B93D0; +s32 D_menu_801B93D4; +s32 D_menu_801B93D8; +s32 D_menu_801B93DC; +s32 D_menu_801B93E0; +s32 D_menu_801B93E4; +s32 D_menu_801B93E8; +s32 D_menu_801B93EC; +f32 D_menu_801B93F0; +f32 D_menu_801B93F4; +f32 D_menu_801B93F8; // gap +UnkStruct_D_menu_801B9250 D_menu_801B9400; +UnkStruct_D_menu_801B9250 D_menu_801B9408; #endif void Option_Setup(void) { @@ -378,7 +378,7 @@ void Option_Setup(void) { } } - D_EBFBE0_801B91C8 = enableExpertModes; + D_menu_801B91C8 = enableExpertModes; D_80178348 = 0; D_80178350 = 0; D_80178354 = 0; @@ -388,24 +388,24 @@ void Option_Setup(void) { gBgColor = 0; - D_EBFBE0_801B91A4 = 0; + D_menu_801B91A4 = 0; if ((D_80161A34 == 7) && (gCurrentLevel == LEVEL_TRAINING)) { D_80161A34 = 0; - D_EBFBE0_801B91A4 = 1; + D_menu_801B91A4 = 1; } - D_EBFBE0_801B91A8 = 0; - D_EBFBE0_801B91AC = 0; - D_EBFBE0_801B91B0 = 0; + D_menu_801B91A8 = 0; + D_menu_801B91AC = 0; + D_menu_801B91B0 = 0; var_v0_2 = gExpertMode; gExpertMode = false; gFrameCount = 0; - D_EBFBE0_801B8284 = 0; - D_EBFBE0_801B9178 = 0; - D_EBFBE0_801B917C = 0; + D_menu_801B8284 = 0; + D_menu_801B9178 = 0; + D_menu_801B917C = 0; - D_EBFBE0_801B9124 = OPTION_MAIN; + D_menu_801B9124 = OPTION_MAIN; if ((D_80161A34 == 5) || (D_80161A34 == 8)) { if (D_80161A34 == 8) { @@ -432,18 +432,18 @@ void Option_Setup(void) { } } - func_EBFBE0_80188010(); - D_EBFBE0_801B9094 = func_EBFBE0_8019C8C4(); + func_menu_80188010(); + D_menu_801B9094 = func_menu_8019C8C4(); - if (D_EBFBE0_801B9094 != -1) { - D_EBFBE0_801B9124 = 200; + if (D_menu_801B9094 != -1) { + D_menu_801B9124 = 200; } else { - D_EBFBE0_801B9124 = 300; + D_menu_801B9124 = 300; } } else { if (D_800D2870 != 0) { - D_EBFBE0_801B91A4 = 2; - D_EBFBE0_801B91A8 = D_801778AC; + D_menu_801B91A4 = 2; + D_menu_801B91A8 = D_801778AC; for (i = 0; i < OPTION_COUNT; i++) { if (i == 2) { continue; @@ -473,15 +473,15 @@ void Option_Setup(void) { sOptionCardList[2].unk_00.unk_1C = 25.0f; sOptionCardList[2].unk_58 = 1; - D_EBFBE0_801B9124 = OPTION_VERSUS; + D_menu_801B9124 = OPTION_VERSUS; } else { - D_EBFBE0_801B9124 = OPTION_MAIN; + D_menu_801B9124 = OPTION_MAIN; } } - D_EBFBE0_801B912C = 0; - D_EBFBE0_801B9134 = 0; - D_EBFBE0_801B913C = 0; + D_menu_801B912C = 0; + D_menu_801B9134 = 0; + D_menu_801B913C = 0; gOptionMenuStatus = OPTION_UPDATE; @@ -499,33 +499,33 @@ void Option_Setup(void) { D_801779B8 = 0.0f; D_801779C0 = 0.0f; - D_EBFBE0_801B9224 = -80.0f; - D_EBFBE0_801B9228 = 0.0f; + D_menu_801B9224 = -80.0f; + D_menu_801B9228 = 0.0f; - D_EBFBE0_801B922C = 225; - D_EBFBE0_801B9230 = 225; - D_EBFBE0_801B9234 = 225; - D_EBFBE0_801B9238 = 30; - D_EBFBE0_801B923C = 30; - D_EBFBE0_801B9240 = 30; + D_menu_801B922C = 225; + D_menu_801B9230 = 225; + D_menu_801B9234 = 225; + D_menu_801B9238 = 30; + D_menu_801B923C = 30; + D_menu_801B9240 = 30; - D_EBFBE0_801B91F8 = 0.1f; - D_EBFBE0_801B91F4 = -130.0f; - D_EBFBE0_801B91FC = 0.0f; - D_EBFBE0_801B9200 = 0.0f; + D_menu_801B91F8 = 0.1f; + D_menu_801B91F4 = -130.0f; + D_menu_801B91FC = 0.0f; + D_menu_801B9200 = 0.0f; - D_EBFBE0_801B91EC = 0; - D_EBFBE0_801B9244 = 0; - D_EBFBE0_801B9248 = 0; + D_menu_801B91EC = 0; + D_menu_801B9244 = 0; + D_menu_801B9248 = 0; func_8001D444(0, 36, 0, 255); } void Option_Init(void) { - if (D_EBFBE0_801B9178 > 0) { - D_EBFBE0_801B9178--; + if (D_menu_801B9178 > 0) { + D_menu_801B9178--; } - if (D_EBFBE0_801B917C > 0) { - D_EBFBE0_801B917C--; + if (D_menu_801B917C > 0) { + D_menu_801B917C--; } switch (gOptionMenuStatus) { @@ -550,7 +550,7 @@ void Option_Init(void) { } void Option_UpdateEntry(void) { - switch (D_EBFBE0_801B9124) { + switch (D_menu_801B9124) { case OPTION_MAIN: Option_MainMenuUpdate(); break; @@ -594,11 +594,11 @@ void Option_UpdateEntry(void) { break; case OPTION_NAME: - func_EBFBE0_8019CAE0(); + func_menu_8019CAE0(); break; case OPTION_SCORE: - func_EBFBE0_8019DD44(); + func_menu_8019DD44(); break; case OPTION_INVOICE: @@ -606,14 +606,14 @@ void Option_UpdateEntry(void) { break; } - if (D_EBFBE0_801B91BC != 0) { - D_EBFBE0_801B91FC += 3.8f; - D_EBFBE0_801B9200 += 4.2f; + if (D_menu_801B91BC != 0) { + D_menu_801B91FC += 3.8f; + D_menu_801B9200 += 4.2f; } } void Option_DrawEntry(void) { - switch (D_EBFBE0_801B9124) { + switch (D_menu_801B9124) { case OPTION_MAIN: Option_MainMenuDraw(); break; @@ -649,11 +649,11 @@ void Option_DrawEntry(void) { break; case OPTION_NAME: - func_EBFBE0_8019D118(); + func_menu_8019D118(); break; case OPTION_SCORE: - func_EBFBE0_8019DF64(); + func_menu_8019DF64(); break; case OPTION_INVOICE: @@ -661,18 +661,18 @@ void Option_DrawEntry(void) { break; } - if (D_EBFBE0_801B8280 != 0) { - func_EBFBE0_8019BDF0(); - func_80084688(2, D_EBFBE0_801B8284); + if (D_menu_801B8280 != 0) { + func_menu_8019BDF0(); + func_80084688(2, D_menu_801B8284); Matrix_Pop(&gGfxMatrix); } } void Option_InitEntry(void) { gBlurAlpha = 0xFF; - D_EBFBE0_801B912C = 0; + D_menu_801B912C = 0; - switch (D_EBFBE0_801B9124) { + switch (D_menu_801B9124) { case OPTION_MAP: gDrawMode = DRAWMODE_0; break; @@ -705,57 +705,56 @@ void Option_InitEntry(void) { } } -void func_EBFBE0_80192598(void) { +void func_menu_80192598(void) { s32 i; - D_EBFBE0_801B93E8 = 0; - D_EBFBE0_801B93EC = 0; + D_menu_801B93E8 = 0; + D_menu_801B93EC = 0; for (i = 0; i < (96 * 96); i++) { // Planet Textures - D_EBFBE0_801BB810[i] = 106; - D_EBFBE0_801BDC10[i] = 84; - D_EBFBE0_801C0010[i] = 75; - D_EBFBE0_801C2410[i] = 81; - D_EBFBE0_801C4810[i] = 55; - D_EBFBE0_801C6C10[i] = 82; - D_EBFBE0_801C9010[i] = 68; - D_EBFBE0_801CB410[i] = 52; - D_EBFBE0_801B9410[i] = 0; + D_menu_801BB810[i] = 106; + D_menu_801BDC10[i] = 84; + D_menu_801C0010[i] = 75; + D_menu_801C2410[i] = 81; + D_menu_801C4810[i] = 55; + D_menu_801C6C10[i] = 82; + D_menu_801C9010[i] = 68; + D_menu_801CB410[i] = 52; + D_menu_801B9410[i] = 0; } for (i = 0; i < 9; i++) { - D_EBFBE0_801CD818[i] = 0.0f; - func_EBFBE0_801A07E8(D_EBFBE0_801B68B0[i], SEGMENTED_TO_VIRTUAL(D_EBFBE0_801B68D4[i]), &D_EBFBE0_801CD818[i]); + D_menu_801CD818[i] = 0.0f; + func_menu_801A07E8(D_menu_801B68B0[i], SEGMENTED_TO_VIRTUAL(D_menu_801B68D4[i]), &D_menu_801CD818[i]); } } -void func_EBFBE0_80192738(void) { - if (D_EBFBE0_801B93E8 == 5) { - func_EBFBE0_801A07E8(D_EBFBE0_801B68B0[8], SEGMENTED_TO_VIRTUAL(D_EBFBE0_801B68D4[8]), &D_EBFBE0_801CD818[8]); - D_EBFBE0_801B93E8 = 0; +void func_menu_80192738(void) { + if (D_menu_801B93E8 == 5) { + func_menu_801A07E8(D_menu_801B68B0[8], SEGMENTED_TO_VIRTUAL(D_menu_801B68D4[8]), &D_menu_801CD818[8]); + D_menu_801B93E8 = 0; } else { - D_EBFBE0_801B93E8++; + D_menu_801B93E8++; } - func_EBFBE0_801A07E8(D_EBFBE0_801B68B0[D_EBFBE0_801B93EC * 2], - SEGMENTED_TO_VIRTUAL(D_EBFBE0_801B68D4[D_EBFBE0_801B93EC * 2]), - &D_EBFBE0_801CD818[D_EBFBE0_801B93EC * 2]); + func_menu_801A07E8(D_menu_801B68B0[D_menu_801B93EC * 2], SEGMENTED_TO_VIRTUAL(D_menu_801B68D4[D_menu_801B93EC * 2]), + &D_menu_801CD818[D_menu_801B93EC * 2]); - func_EBFBE0_801A07E8(D_EBFBE0_801B68B0[(D_EBFBE0_801B93EC * 2) + 1], - SEGMENTED_TO_VIRTUAL(D_EBFBE0_801B68D4[(D_EBFBE0_801B93EC * 2) + 1]), - &D_EBFBE0_801CD818[(D_EBFBE0_801B93EC * 2) + 1]); + func_menu_801A07E8(D_menu_801B68B0[(D_menu_801B93EC * 2) + 1], + SEGMENTED_TO_VIRTUAL(D_menu_801B68D4[(D_menu_801B93EC * 2) + 1]), + &D_menu_801CD818[(D_menu_801B93EC * 2) + 1]); - D_EBFBE0_801B93EC++; - if (D_EBFBE0_801B93EC >= 4) { - D_EBFBE0_801B93EC = 0; + D_menu_801B93EC++; + if (D_menu_801B93EC >= 4) { + D_menu_801B93EC = 0; } } void Option_MapUpdate(void) { if (D_80178340 == 0xFF) { D_80178410 = 0; - D_EBFBE0_801B9124 = 100; + D_menu_801B9124 = 100; gGameState = GSTATE_MAP; D_Timer_8017783C = 2; D_80177B40 = 0; @@ -790,17 +789,17 @@ void Option_TrainingUpdate(void) { } } -void func_EBFBE0_801929F0(void) { +void func_menu_801929F0(void) { s32 i; D_800D2870 = 0; gBlurAlpha = 0xFF; gControllerLock = 0; D_80178410 = 800; - D_EBFBE0_801B9248 = 0; + D_menu_801B9248 = 0; - if (D_EBFBE0_801B9244 == 0) { - D_EBFBE0_801B91BC = 1; + if (D_menu_801B9244 == 0) { + D_menu_801B91BC = 1; for (i = 0; i < OPTION_COUNT; i++) { sOptionCardList[i].unk_00.unk_18 = sOptionCardCurTextPosX[i]; sOptionCardList[i].unk_00.unk_1C = sOptionCardCurTextPosY[i]; @@ -815,7 +814,7 @@ void func_EBFBE0_801929F0(void) { sOptionCardList[i].unk_5C = 1; } } else { - D_EBFBE0_801B91BC = 0; + D_menu_801B91BC = 0; for (i = 0; i < OPTION_COUNT; i++) { sOptionCardList[i].unk_00.unk_24 = 1.0f; sOptionCardList[i].unk_38.unk_10 = 0.21f; @@ -825,15 +824,15 @@ void func_EBFBE0_801929F0(void) { } } - D_EBFBE0_801B9204 = -45.0f; - D_EBFBE0_801B9214 = 0; + D_menu_801B9204 = -45.0f; + D_menu_801B9214 = 0; - D_EBFBE0_801B9180.unk_0 = 0; - D_EBFBE0_801B9180.unk_4 = 0; - D_EBFBE0_801B9190.unk_0 = 0; - D_EBFBE0_801B9190.unk_4 = 0; - D_EBFBE0_801B9198.unk_0 = 0; - D_EBFBE0_801B9198.unk_4 = 0; + D_menu_801B9180.unk_0 = 0; + D_menu_801B9180.unk_4 = 0; + D_menu_801B9190.unk_0 = 0; + D_menu_801B9190.unk_4 = 0; + D_menu_801B9198.unk_0 = 0; + D_menu_801B9198.unk_4 = 0; } void Option_MainMenuUpdate(void) { @@ -843,17 +842,17 @@ void Option_MainMenuUpdate(void) { s32 temp1; s32 temp2; - switch (D_EBFBE0_801B912C) { + switch (D_menu_801B912C) { case 0: - func_EBFBE0_801929F0(); - if (D_EBFBE0_801B9244 == 0) { - D_EBFBE0_801B912C++; + func_menu_801929F0(); + if (D_menu_801B9244 == 0) { + D_menu_801B912C++; } else { - sOptionCardCurTextPosX[0] = D_EBFBE0_801AE5E8[D_EBFBE0_801B91B0]; - sOptionCardCurTextPosY[0] = D_EBFBE0_801AE5F0[D_EBFBE0_801B91B0]; - sOptionCardCurTextPosX[4] = D_EBFBE0_801AE5F8[D_EBFBE0_801B91AC]; - sOptionCardCurTextPosY[4] = D_EBFBE0_801AE600[D_EBFBE0_801B91AC]; - D_EBFBE0_801B912C = 1000; + sOptionCardCurTextPosX[0] = D_menu_801AE5E8[D_menu_801B91B0]; + sOptionCardCurTextPosY[0] = D_menu_801AE5F0[D_menu_801B91B0]; + sOptionCardCurTextPosX[4] = D_menu_801AE5F8[D_menu_801B91AC]; + sOptionCardCurTextPosY[4] = D_menu_801AE600[D_menu_801B91AC]; + D_menu_801B912C = 1000; } break; @@ -875,36 +874,35 @@ void Option_MainMenuUpdate(void) { Math_SmoothStepToF(&sOptionCardList[i].unk_00.unk_1C, sOptionCardCurTextPosY[i], 0.15f, 100.0f, 0.1f); Math_SmoothStepToF(&sOptionCardList[i].unk_38.unk_04, sOptionCardPosY[i], 0.15f, 100.0f, 0.1f); Math_SmoothStepToF(&sOptionCardList[i].unk_00.unk_18, sOptionCardCurTextPosX[i], 0.2f, - D_EBFBE0_801AE620[i], 0.1f); + D_menu_801AE620[i], 0.1f); } gBlurAlpha += 4; - if (sOptionCardList[D_EBFBE0_801B91A4].unk_38.unk_04 == sOptionCardPosY[D_EBFBE0_801B91A4]) { + if (sOptionCardList[D_menu_801B91A4].unk_38.unk_04 == sOptionCardPosY[D_menu_801B91A4]) { for (i = 0; i < OPTION_COUNT; i++) { sOptionCardList[i].unk_00.unk_20 = 1.0f; sOptionCardList[i].unk_00.unk_18 = sOptionCardCurTextPosX[i]; sOptionCardList[i].unk_00.unk_1C = sOptionCardCurTextPosY[i]; } - D_EBFBE0_801B91BC = 1; + D_menu_801B91BC = 1; gBlurAlpha = 0xFF; - D_EBFBE0_801B912C = 1; + D_menu_801B912C = 1; } break; case 1: - temp1 = func_EBFBE0_8019C418(&D_EBFBE0_801B91A4, OPTION_COUNT - 1, 1, 0, 20, 5, 4, gMainController, - &D_EBFBE0_801B9180); + temp1 = func_menu_8019C418(&D_menu_801B91A4, OPTION_COUNT - 1, 1, 0, 20, 5, 4, gMainController, + &D_menu_801B9180); // clang-format off if (temp1 != 0) { Audio_PlaySfx(0x49000022, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } // clang-format on - if ((D_EBFBE0_801B91A4 == 0) && (D_EBFBE0_801B91C8 != 0)) { - temp2 = - func_EBFBE0_8019C418(&D_EBFBE0_801B91B0, 1, 0, 0, 20, 5, 4, gMainController, &D_EBFBE0_801B9190); + if ((D_menu_801B91A4 == 0) && (D_menu_801B91C8 != 0)) { + temp2 = func_menu_8019C418(&D_menu_801B91B0, 1, 0, 0, 20, 5, 4, gMainController, &D_menu_801B9190); if (temp2 != 0) { Audio_PlaySfx(0x49000022, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - if (D_EBFBE0_801B91B0) { + if (D_menu_801B91B0) { sOptionCardList[0].unk_00.unk_08 = D_8004C50; sOptionCardList[0].unk_00.unk_10 = 80; sOptionCardList[0].unk_00.unk_14 = 12; @@ -917,15 +915,14 @@ void Option_MainMenuUpdate(void) { sOptionCardList[0].unk_00.unk_18 = 124.0f; sOptionCardList[0].unk_00.unk_1C = 54.0f; } - gExpertMode = D_EBFBE0_801B91B0; + gExpertMode = D_menu_801B91B0; } } - if ((D_EBFBE0_801B91A4 == 4) && (D_EBFBE0_801B91C8 != 0)) { - temp2 = - func_EBFBE0_8019C418(&D_EBFBE0_801B91AC, 1, 0, 0, 20, 5, 4, gMainController, &D_EBFBE0_801B9198); + if ((D_menu_801B91A4 == 4) && (D_menu_801B91C8 != 0)) { + temp2 = func_menu_8019C418(&D_menu_801B91AC, 1, 0, 0, 20, 5, 4, gMainController, &D_menu_801B9198); if (temp2 != 0) { Audio_PlaySfx(0x49000022, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - if (D_EBFBE0_801B91AC) { + if (D_menu_801B91AC) { sOptionCardList[4].unk_00.unk_08 = D_8004C50; sOptionCardList[4].unk_00.unk_10 = 80; sOptionCardList[4].unk_00.unk_14 = 12; @@ -943,79 +940,79 @@ void Option_MainMenuUpdate(void) { if (gControllerPress[gMainController].button & (A_BUTTON | START_BUTTON)) { Audio_PlaySfx(0x49000020, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B9208 = sOptionCardPosY[D_EBFBE0_801B91A4]; - D_EBFBE0_801B91BC = 0; - D_EBFBE0_801B912C = 11; + D_menu_801B9208 = sOptionCardPosY[D_menu_801B91A4]; + D_menu_801B91BC = 0; + D_menu_801B912C = 11; } if (gControllerPress[gMainController].button & B_BUTTON) { Audio_PlaySfx(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B8284 = 0; - D_EBFBE0_801B8280 = 1; - D_EBFBE0_801B912C = 100; + D_menu_801B8284 = 0; + D_menu_801B8280 = 1; + D_menu_801B912C = 100; } break; case 11: gBlurAlpha = 0x10; - D_EBFBE0_801B9178 = 3; - sOptionCardList[D_EBFBE0_801B91A4].unk_38.unk_0C -= 0.01f; - sOptionCardList[D_EBFBE0_801B91A4].unk_38.unk_10 -= 0.01f; - sOptionCardList[D_EBFBE0_801B91A4].unk_00.unk_20 -= 0.1f; - sOptionCardList[D_EBFBE0_801B91A4].unk_00.unk_24 -= 0.1f; - sOptionCardList[D_EBFBE0_801B91A4].unk_00.unk_18 += 4.0f; - D_EBFBE0_801B917C = 3; - D_EBFBE0_801B912C++; + D_menu_801B9178 = 3; + sOptionCardList[D_menu_801B91A4].unk_38.unk_0C -= 0.01f; + sOptionCardList[D_menu_801B91A4].unk_38.unk_10 -= 0.01f; + sOptionCardList[D_menu_801B91A4].unk_00.unk_20 -= 0.1f; + sOptionCardList[D_menu_801B91A4].unk_00.unk_24 -= 0.1f; + sOptionCardList[D_menu_801B91A4].unk_00.unk_18 += 4.0f; + D_menu_801B917C = 3; + D_menu_801B912C++; break; case 12: - if (D_EBFBE0_801B9178 == 1) { - sOptionCardList[D_EBFBE0_801B91A4].unk_38.unk_0C += 0.01f; - sOptionCardList[D_EBFBE0_801B91A4].unk_38.unk_10 += 0.01f; - sOptionCardList[D_EBFBE0_801B91A4].unk_00.unk_20 += 0.1f; - sOptionCardList[D_EBFBE0_801B91A4].unk_00.unk_24 += 0.1f; - sOptionCardList[D_EBFBE0_801B91A4].unk_00.unk_18 -= 4.0f; - D_EBFBE0_801B9214 = 1; + if (D_menu_801B9178 == 1) { + sOptionCardList[D_menu_801B91A4].unk_38.unk_0C += 0.01f; + sOptionCardList[D_menu_801B91A4].unk_38.unk_10 += 0.01f; + sOptionCardList[D_menu_801B91A4].unk_00.unk_20 += 0.1f; + sOptionCardList[D_menu_801B91A4].unk_00.unk_24 += 0.1f; + sOptionCardList[D_menu_801B91A4].unk_00.unk_18 -= 4.0f; + D_menu_801B9214 = 1; } for (i = 0; i < OPTION_COUNT; i++) { - if (i == D_EBFBE0_801B91A4) { + if (i == D_menu_801B91A4) { continue; } if (sOptionCardList[i].unk_38.unk_0C > 0.01f) { sOptionCardList[i].unk_38.unk_0C -= 0.05f; sOptionCardList[i].unk_00.unk_20 -= 0.19f; - Math_SmoothStepToF(&sOptionCardList[i].unk_00.unk_18, 158.0f, 0.2f, D_EBFBE0_801AE608[i], 0.1f); + Math_SmoothStepToF(&sOptionCardList[i].unk_00.unk_18, 158.0f, 0.2f, D_menu_801AE608[i], 0.1f); } else { sOptionCardList[i].unk_5C = 0; sOptionCardList[i].unk_58 = 0; } } - if (D_EBFBE0_801B917C != 0) { + if (D_menu_801B917C != 0) { break; } var_fs0 = 25.0f; var_fs1 = 90.0f; - if ((D_EBFBE0_801B91A4 == 0) || (D_EBFBE0_801B91A4 == 1)) { + if ((D_menu_801B91A4 == 0) || (D_menu_801B91A4 == 1)) { var_fs0 = 0.0f; var_fs1 = 120.0f; } - Math_SmoothStepToF(&sOptionCardList[D_EBFBE0_801B91A4].unk_00.unk_1C, var_fs0, 0.25f, 100.0f, 0.1f); - Math_SmoothStepToF(&sOptionCardList[D_EBFBE0_801B91A4].unk_38.unk_04, var_fs1, 0.25f, 100.0f, 0.1f); + Math_SmoothStepToF(&sOptionCardList[D_menu_801B91A4].unk_00.unk_1C, var_fs0, 0.25f, 100.0f, 0.1f); + Math_SmoothStepToF(&sOptionCardList[D_menu_801B91A4].unk_38.unk_04, var_fs1, 0.25f, 100.0f, 0.1f); gBlurAlpha += 4; - if ((sOptionCardList[D_EBFBE0_801B91A4].unk_00.unk_1C == var_fs0) && - (sOptionCardList[D_EBFBE0_801B91A4].unk_38.unk_04 == var_fs1)) { + if ((sOptionCardList[D_menu_801B91A4].unk_00.unk_1C == var_fs0) && + (sOptionCardList[D_menu_801B91A4].unk_38.unk_04 == var_fs1)) { gBlurAlpha += 255; - D_EBFBE0_801B9124 = D_EBFBE0_801B91A4; + D_menu_801B9124 = D_menu_801B91A4; - if (D_EBFBE0_801B91A4 == 4 && D_EBFBE0_801B91AC) { - D_EBFBE0_801B9124 = 6; + if (D_menu_801B91A4 == 4 && D_menu_801B91AC) { + D_menu_801B9124 = 6; } Option_InitEntry(); @@ -1023,17 +1020,17 @@ void Option_MainMenuUpdate(void) { break; case 100: - if (D_EBFBE0_801B8284 < 120) { - D_EBFBE0_801B8284 += 18; + if (D_menu_801B8284 < 120) { + D_menu_801B8284 += 18; } else { D_80178410 = 0; gGameState = GSTATE_TITLE; D_Timer_8017783C = 2; D_80177AE0 = 0; - D_EBFBE0_801B827C = 1; + D_menu_801B827C = 1; gDrawMode = DRAWMODE_0; - D_EBFBE0_801B8280 = 0; - D_EBFBE0_801B8284 = 0; + D_menu_801B8280 = 0; + D_menu_801B8284 = 0; gControllerLock = 3; } break; @@ -1043,7 +1040,7 @@ void Option_MainMenuUpdate(void) { void Option_MainMenuDraw(void) { s32 i; - func_EBFBE0_8019BDF0(); + func_menu_8019BDF0(); for (i = 0; i < OPTION_COUNT; i++) { if (sOptionCardList[i].unk_5C) { @@ -1051,49 +1048,49 @@ void Option_MainMenuDraw(void) { } } - Option_DrawMenuArwing(sOptionCardList[D_EBFBE0_801B91A4].unk_4C); + Option_DrawMenuArwing(sOptionCardList[D_menu_801B91A4].unk_4C); Matrix_Pop(&gGfxMatrix); for (i = 0; i < OPTION_COUNT; i++) { if (!(sOptionCardList[i].unk_58) || (sOptionCardList[i].unk_00.unk_20) <= 0.0f) { continue; } - if ((i == 0) && (D_EBFBE0_801B91C8 != 0) && ((D_EBFBE0_801B912C == 0) || (D_EBFBE0_801B912C == 1))) { - func_EBFBE0_8019B6D8(106.0f, 56.0f, 98.0f, 20, 0, 75); + if ((i == 0) && (D_menu_801B91C8 != 0) && ((D_menu_801B912C == 0) || (D_menu_801B912C == 1))) { + func_menu_8019B6D8(106.0f, 56.0f, 98.0f, 20, 0, 75); } - if ((i == 4) && (D_EBFBE0_801B91C8 != 0) && ((D_EBFBE0_801B912C == 0) || (D_EBFBE0_801B912C == 1))) { - func_EBFBE0_8019B6D8(106.0f, 152.0f, 98.0f, 20, 0, 75); + if ((i == 4) && (D_menu_801B91C8 != 0) && ((D_menu_801B912C == 0) || (D_menu_801B912C == 1))) { + func_menu_8019B6D8(106.0f, 152.0f, 98.0f, 20, 0, 75); } Option_DrawCardLabel(sOptionCardList[i].unk_00); } - func_EBFBE0_8019BF34(); + func_menu_8019BF34(); } -void func_EBFBE0_80193B04(void) { +void func_menu_80193B04(void) { s32 i; gBlurAlpha = 0xFF; gControllerLock = 0; D_80178410 = 800; - if (D_EBFBE0_801B9248 == 0) { - D_EBFBE0_801B91BC = 1; + if (D_menu_801B9248 == 0) { + D_menu_801B91BC = 1; for (i = 0; i < 3; i++) { - sOptionVSCardList[i].unk_00.unk_18 = D_EBFBE0_801AEF90[i]; - sOptionVSCardList[i].unk_00.unk_1C = D_EBFBE0_801AEF9C[i]; + sOptionVSCardList[i].unk_00.unk_18 = D_menu_801AEF90[i]; + sOptionVSCardList[i].unk_00.unk_1C = D_menu_801AEF9C[i]; sOptionVSCardList[i].unk_00.unk_20 = 1.0f; sOptionVSCardList[i].unk_00.unk_24 = 1.0f; sOptionVSCardList[i].unk_58 = 1; sOptionVSCardList[i].unk_38.unk_0C = 0.4f; sOptionVSCardList[i].unk_38.unk_10 = 0.21f; - sOptionVSCardList[i].unk_38.unk_04 = D_EBFBE0_801AEF84[i]; + sOptionVSCardList[i].unk_38.unk_04 = D_menu_801AEF84[i]; sOptionVSCardList[i].unk_38.unk_08 = 0.0f; sOptionVSCardList[i].unk_5C = 1; } } else { - D_EBFBE0_801B91BC = 0; + D_menu_801B91BC = 0; for (i = 0; i < 3; i++) { sOptionVSCardList[i].unk_00.unk_24 = 1.0f; @@ -1104,23 +1101,23 @@ void func_EBFBE0_80193B04(void) { } } - D_EBFBE0_801B9204 = -45.0f; - D_EBFBE0_801B9214 = 0; - D_EBFBE0_801B9188.unk_0 = 0; - D_EBFBE0_801B9188.unk_4 = 0; + D_menu_801B9204 = -45.0f; + D_menu_801B9214 = 0; + D_menu_801B9188.unk_0 = 0; + D_menu_801B9188.unk_4 = 0; } void Option_VersusUpdate(void) { f32 var_fs0; s32 i; - switch (D_EBFBE0_801B912C) { + switch (D_menu_801B912C) { case 0: - func_EBFBE0_80193B04(); - if (D_EBFBE0_801B9248 == 0) { - D_EBFBE0_801B912C++; + func_menu_80193B04(); + if (D_menu_801B9248 == 0) { + D_menu_801B912C++; } else { - D_EBFBE0_801B912C = 1000; + D_menu_801B912C = 1000; } break; @@ -1140,110 +1137,109 @@ void Option_VersusUpdate(void) { } } - Math_SmoothStepToF(&sOptionVSCardList[i].unk_38.unk_04, D_EBFBE0_801AEF84[i], 0.15f, 100.0f, 0.1f); - Math_SmoothStepToF(&sOptionVSCardList[i].unk_00.unk_18, D_EBFBE0_801AEF90[i], 0.2f, 3.1f, 0.1f); - Math_SmoothStepToF(&sOptionVSCardList[i].unk_00.unk_1C, D_EBFBE0_801AEF9C[i], 0.15f, 100.0f, 0.1f); + Math_SmoothStepToF(&sOptionVSCardList[i].unk_38.unk_04, D_menu_801AEF84[i], 0.15f, 100.0f, 0.1f); + Math_SmoothStepToF(&sOptionVSCardList[i].unk_00.unk_18, D_menu_801AEF90[i], 0.2f, 3.1f, 0.1f); + Math_SmoothStepToF(&sOptionVSCardList[i].unk_00.unk_1C, D_menu_801AEF9C[i], 0.15f, 100.0f, 0.1f); } - Math_SmoothStepToF(&sOptionCardList[D_EBFBE0_801B91A4].unk_00.unk_1C, 25.0f, 0.25f, 100.0f, 0.1f); - Math_SmoothStepToF(&sOptionCardList[D_EBFBE0_801B91A4].unk_38.unk_04, 90.0f, 0.25f, 100.0f, 0.1f); + Math_SmoothStepToF(&sOptionCardList[D_menu_801B91A4].unk_00.unk_1C, 25.0f, 0.25f, 100.0f, 0.1f); + Math_SmoothStepToF(&sOptionCardList[D_menu_801B91A4].unk_38.unk_04, 90.0f, 0.25f, 100.0f, 0.1f); gBlurAlpha += 4; - if (sOptionVSCardList[D_EBFBE0_801B91A8].unk_38.unk_04 == D_EBFBE0_801AEF84[D_EBFBE0_801B91A8]) { + if (sOptionVSCardList[D_menu_801B91A8].unk_38.unk_04 == D_menu_801AEF84[D_menu_801B91A8]) { for (i = 0; i < 3; i++) { sOptionVSCardList[i].unk_00.unk_20 = 1.0f; - sOptionVSCardList[i].unk_00.unk_1C = D_EBFBE0_801AEF9C[i]; - sOptionVSCardList[i].unk_00.unk_18 = D_EBFBE0_801AEF90[i]; + sOptionVSCardList[i].unk_00.unk_1C = D_menu_801AEF9C[i]; + sOptionVSCardList[i].unk_00.unk_18 = D_menu_801AEF90[i]; } - sOptionCardList[D_EBFBE0_801B91A4].unk_00.unk_1C = 25.0f; - sOptionCardList[D_EBFBE0_801B91A4].unk_38.unk_04 = 90.0f; - D_EBFBE0_801B91BC = 1; + sOptionCardList[D_menu_801B91A4].unk_00.unk_1C = 25.0f; + sOptionCardList[D_menu_801B91A4].unk_38.unk_04 = 90.0f; + D_menu_801B91BC = 1; gBlurAlpha = 0xFF; - D_EBFBE0_801B912C = 1; + D_menu_801B912C = 1; } break; case 1: // clang-format off - if (func_EBFBE0_8019C418(&D_EBFBE0_801B91A8, 2, 1, 0, 20, 5, 4, gMainController, &D_EBFBE0_801B9188)) { Audio_PlaySfx(0x49000022, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } + if (func_menu_8019C418(&D_menu_801B91A8, 2, 1, 0, 20, 5, 4, gMainController, &D_menu_801B9188)) { Audio_PlaySfx(0x49000022, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } // clang-format on if (gControllerPress[gMainController].button & (A_BUTTON | START_BUTTON)) { Audio_PlaySfx(0x49000020, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B9208 = D_EBFBE0_801AEF84[D_EBFBE0_801B91A8]; - D_EBFBE0_801B91BC = 0; - D_EBFBE0_801B912C = 11; + D_menu_801B9208 = D_menu_801AEF84[D_menu_801B91A8]; + D_menu_801B91BC = 0; + D_menu_801B912C = 11; } if (gControllerPress[gMainController].button & B_BUTTON) { Audio_PlaySfx(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B912C = 0; - D_EBFBE0_801B9124 = 1000; + D_menu_801B912C = 0; + D_menu_801B9124 = 1000; gDrawMode = DRAWMODE_0; - D_EBFBE0_801B9244 = 1; + D_menu_801B9244 = 1; } break; case 11: gBlurAlpha = 0x10; - D_EBFBE0_801B9178 = 5; - sOptionVSCardList[D_EBFBE0_801B91A8].unk_38.unk_0C -= 0.01f; - sOptionVSCardList[D_EBFBE0_801B91A8].unk_38.unk_10 -= 0.01f; - sOptionVSCardList[D_EBFBE0_801B91A8].unk_00.unk_20 -= 0.1f; - sOptionVSCardList[D_EBFBE0_801B91A8].unk_00.unk_24 -= 0.1f; - sOptionVSCardList[D_EBFBE0_801B91A8].unk_00.unk_18 += 4.0f; - D_EBFBE0_801B917C = 5; - D_EBFBE0_801B912C++; + D_menu_801B9178 = 5; + sOptionVSCardList[D_menu_801B91A8].unk_38.unk_0C -= 0.01f; + sOptionVSCardList[D_menu_801B91A8].unk_38.unk_10 -= 0.01f; + sOptionVSCardList[D_menu_801B91A8].unk_00.unk_20 -= 0.1f; + sOptionVSCardList[D_menu_801B91A8].unk_00.unk_24 -= 0.1f; + sOptionVSCardList[D_menu_801B91A8].unk_00.unk_18 += 4.0f; + D_menu_801B917C = 5; + D_menu_801B912C++; break; case 12: - if (D_EBFBE0_801B9178 == 1) { - sOptionVSCardList[D_EBFBE0_801B91A8].unk_38.unk_0C += 0.01f; - sOptionVSCardList[D_EBFBE0_801B91A8].unk_38.unk_10 += 0.01f; - sOptionVSCardList[D_EBFBE0_801B91A8].unk_00.unk_20 += 0.1f; - sOptionVSCardList[D_EBFBE0_801B91A8].unk_00.unk_24 += 0.1f; - sOptionVSCardList[D_EBFBE0_801B91A8].unk_00.unk_18 -= 4.0f; - D_EBFBE0_801B9214 = 1; + if (D_menu_801B9178 == 1) { + sOptionVSCardList[D_menu_801B91A8].unk_38.unk_0C += 0.01f; + sOptionVSCardList[D_menu_801B91A8].unk_38.unk_10 += 0.01f; + sOptionVSCardList[D_menu_801B91A8].unk_00.unk_20 += 0.1f; + sOptionVSCardList[D_menu_801B91A8].unk_00.unk_24 += 0.1f; + sOptionVSCardList[D_menu_801B91A8].unk_00.unk_18 -= 4.0f; + D_menu_801B9214 = 1; } for (i = 0; i < 3; i++) { - if (i == D_EBFBE0_801B91A8) { + if (i == D_menu_801B91A8) { continue; } if (sOptionVSCardList[i].unk_38.unk_0C > 0.01f) { sOptionVSCardList[i].unk_38.unk_0C -= 0.05f; sOptionVSCardList[i].unk_00.unk_20 -= 0.19f; - Math_SmoothStepToF(&sOptionVSCardList[i].unk_00.unk_18, 158.0f, 0.2f, D_EBFBE0_801AE608[i + 1], - 0.1f); + Math_SmoothStepToF(&sOptionVSCardList[i].unk_00.unk_18, 158.0f, 0.2f, D_menu_801AE608[i + 1], 0.1f); } else { sOptionVSCardList[i].unk_5C = 0; sOptionVSCardList[i].unk_58 = 0; } } - if (D_EBFBE0_801B917C == 0) { - if (D_EBFBE0_801B91A8 == 0) { + if (D_menu_801B917C == 0) { + if (D_menu_801B91A8 == 0) { var_fs0 = 129.0f; } else { var_fs0 = 131.0f; } - Math_SmoothStepToF(&sOptionVSCardList[D_EBFBE0_801B91A8].unk_00.unk_1C, var_fs0, 0.25f, 100.0f, 0.1f); - Math_SmoothStepToF(&sOptionVSCardList[D_EBFBE0_801B91A8].unk_38.unk_04, -15.5f, 0.25f, 100.0f, 0.1f); - Math_SmoothStepToF(&sOptionCardList[D_EBFBE0_801B91A4].unk_00.unk_1C, -10.0f, 0.35f, 100.0f, 0.1f); - Math_SmoothStepToF(&sOptionCardList[D_EBFBE0_801B91A4].unk_38.unk_04, 150.0f, 0.35f, 100.0f, 0.1f); + Math_SmoothStepToF(&sOptionVSCardList[D_menu_801B91A8].unk_00.unk_1C, var_fs0, 0.25f, 100.0f, 0.1f); + Math_SmoothStepToF(&sOptionVSCardList[D_menu_801B91A8].unk_38.unk_04, -15.5f, 0.25f, 100.0f, 0.1f); + Math_SmoothStepToF(&sOptionCardList[D_menu_801B91A4].unk_00.unk_1C, -10.0f, 0.35f, 100.0f, 0.1f); + Math_SmoothStepToF(&sOptionCardList[D_menu_801B91A4].unk_38.unk_04, 150.0f, 0.35f, 100.0f, 0.1f); gBlurAlpha += 4; - if ((var_fs0 == sOptionVSCardList[D_EBFBE0_801B91A8].unk_00.unk_1C) && - (sOptionVSCardList[D_EBFBE0_801B91A8].unk_38.unk_04 == -15.5f)) { + if ((var_fs0 == sOptionVSCardList[D_menu_801B91A8].unk_00.unk_1C) && + (sOptionVSCardList[D_menu_801B91A8].unk_38.unk_04 == -15.5f)) { gBlurAlpha += 0xFF; - D_EBFBE0_801B9124 = (D_EBFBE0_801B91A8 + 1) * 10; - D_801778AC = D_EBFBE0_801B91A8; - D_EBFBE0_801B91C4 = 1; + D_menu_801B9124 = (D_menu_801B91A8 + 1) * 10; + D_801778AC = D_menu_801B91A8; + D_menu_801B91C4 = 1; Option_InitEntry(); } } @@ -1255,7 +1251,7 @@ void Option_VersusDraw(void) { s32 i; Option_DrawMenuLabel(); - func_EBFBE0_8019BDF0(); + func_menu_8019BDF0(); for (i = 0; i < 3; i++) { if (sOptionVSCardList[i].unk_5C != 0) { @@ -1263,7 +1259,7 @@ void Option_VersusDraw(void) { } } - Option_DrawMenuArwing(sOptionVSCardList[D_EBFBE0_801B91A8].unk_4C); + Option_DrawMenuArwing(sOptionVSCardList[D_menu_801B91A8].unk_4C); Matrix_Pop(&gGfxMatrix); for (i = 0; i < 3; i++) { @@ -1272,7 +1268,7 @@ void Option_VersusDraw(void) { } } - func_EBFBE0_8019BF34(); + func_menu_8019BF34(); } void Option_SoundInit(void) { @@ -1280,13 +1276,13 @@ void Option_SoundInit(void) { D_80178410 = 800; - D_EBFBE0_801B91B4 = 0; - D_EBFBE0_801B91B8 = 0; - D_EBFBE0_801B91BC = 1; - D_EBFBE0_801B91A0 = 0; + D_menu_801B91B4 = 0; + D_menu_801B91B8 = 0; + D_menu_801B91BC = 1; + D_menu_801B91A0 = 0; gSoundMode = gSaveFile.save.data.soundMode; - func_800182F4(D_EBFBE0_801AE998[gSoundMode] | 0xE0000000); + func_800182F4(D_menu_801AE998[gSoundMode] | 0xE0000000); gVolumeSettings[0] = gSaveFile.save.data.musicVolume; gVolumeSettings[1] = gSaveFile.save.data.voiceVolume; @@ -1306,111 +1302,111 @@ void Option_SoundInit(void) { func_8001D8A8(1, gVolumeSettings[1]); func_8001D8A8(2, gVolumeSettings[2]); - D_EBFBE0_801AEB48[0].unk_18 = gVolumeSettings[0] + 146.0f; - D_EBFBE0_801AEB48[1].unk_18 = gVolumeSettings[1] + 146.0f; - D_EBFBE0_801AEB48[2].unk_18 = gVolumeSettings[2] + 146.0f; + D_menu_801AEB48[0].unk_18 = gVolumeSettings[0] + 146.0f; + D_menu_801AEB48[1].unk_18 = gVolumeSettings[1] + 146.0f; + D_menu_801AEB48[2].unk_18 = gVolumeSettings[2] + 146.0f; - D_EBFBE0_801B9288 = 0; - D_EBFBE0_801B9284 = 0; - D_EBFBE0_801B914C = 0; - D_EBFBE0_801B9158 = 0; - D_EBFBE0_801B9178 = 0; - D_EBFBE0_801B917C = 0; + D_menu_801B9288 = 0; + D_menu_801B9284 = 0; + D_menu_801B914C = 0; + D_menu_801B9158 = 0; + D_menu_801B9178 = 0; + D_menu_801B917C = 0; // clang-format off - for (i = 0; i < 5; i++) { D_EBFBE0_801B9270[i] = 255.0f; } + for (i = 0; i < 5; i++) { D_menu_801B9270[i] = 255.0f; } // clang-format on - D_EBFBE0_801B91E4 = 255.0f; + D_menu_801B91E4 = 255.0f; - D_EBFBE0_801B9218 = 56.0f; - D_EBFBE0_801B921C = -43.0f; - D_EBFBE0_801B9220 = 0.0f; + D_menu_801B9218 = 56.0f; + D_menu_801B921C = -43.0f; + D_menu_801B9220 = 0.0f; - D_EBFBE0_801B9250.unk_0 = 0; - D_EBFBE0_801B9250.unk_4 = 0; + D_menu_801B9250.unk_0 = 0; + D_menu_801B9250.unk_4 = 0; - D_EBFBE0_801B9258.unk_0 = 0; - D_EBFBE0_801B9258.unk_4 = 0; + D_menu_801B9258.unk_0 = 0; + D_menu_801B9258.unk_4 = 0; - D_EBFBE0_801B9260.unk_0 = 0; - D_EBFBE0_801B9260.unk_4 = 0; + D_menu_801B9260.unk_0 = 0; + D_menu_801B9260.unk_4 = 0; - D_EBFBE0_801B9268.unk_0 = 0; - D_EBFBE0_801B9268.unk_4 = 0; + D_menu_801B9268.unk_0 = 0; + D_menu_801B9268.unk_4 = 0; } void Option_SoundUpdate(void) { s32 sp34; s32 temp; - sp34 = D_EBFBE0_801B9288; - temp = func_EBFBE0_8019C418(&D_EBFBE0_801B9288, 3, 1, 0, 20, 5, 4, gMainController, &D_EBFBE0_801B9250); + sp34 = D_menu_801B9288; + temp = func_menu_8019C418(&D_menu_801B9288, 3, 1, 0, 20, 5, 4, gMainController, &D_menu_801B9250); if (temp != 0) { - D_EBFBE0_801B9270[sp34] = 255.0f; + D_menu_801B9270[sp34] = 255.0f; Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } - if (D_EBFBE0_801B9288 == 0) { - func_EBFBE0_80194AEC(); + if (D_menu_801B9288 == 0) { + func_menu_80194AEC(); } else { - func_EBFBE0_80194BD0(); + func_menu_80194BD0(); } // Test sound if (gControllerPress[gMainController].button & R_TRIG) { - D_EBFBE0_801B9284 ^= 1; - func_8001D8F4(D_EBFBE0_801B9284); + D_menu_801B9284 ^= 1; + func_8001D8F4(D_menu_801B9284); } if (gControllerPress[gMainController].button & A_BUTTON) { Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B9288 = (D_EBFBE0_801B9288 + 1) & 3; + D_menu_801B9288 = (D_menu_801B9288 + 1) & 3; } if (gControllerPress[gMainController].button & B_BUTTON) { Audio_PlaySfx(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - if (D_EBFBE0_801B9284 == 1) { - D_EBFBE0_801B9284 = 0; - func_8001D8F4(D_EBFBE0_801B9284); + if (D_menu_801B9284 == 1) { + D_menu_801B9284 = 0; + func_8001D8F4(D_menu_801B9284); } Save_Write(); gDrawMode = DRAWMODE_0; - D_EBFBE0_801B9124 = 1000; - D_EBFBE0_801B912C = 0; - D_EBFBE0_801B9244 = 1; + D_menu_801B9124 = 1000; + D_menu_801B912C = 0; + D_menu_801B9244 = 1; } } -void func_EBFBE0_80194AEC(void) { +void func_menu_80194AEC(void) { s32 sp3C = gSoundMode; s32 pad; - if (func_EBFBE0_8019C418(&sp3C, 2, 0, 0, 20, 5, 4, gMainController, &D_EBFBE0_801B9260)) { + if (func_menu_8019C418(&sp3C, 2, 0, 0, 20, 5, 4, gMainController, &D_menu_801B9260)) { Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); gSoundMode = sp3C; if (gSoundMode >= 3) { gSoundMode = 0; } gSaveFile.save.data.soundMode = gSoundMode; - func_800182F4(D_EBFBE0_801AE998[gSoundMode] | 0xE0000000); + func_800182F4(D_menu_801AE998[gSoundMode] | 0xE0000000); } } -void func_EBFBE0_80194BD0(void) { +void func_menu_80194BD0(void) { s32 var_v1; - D_EBFBE0_801B924C = D_EBFBE0_801AE99C[D_EBFBE0_801B9288 - 1]; + D_menu_801B924C = D_menu_801AE99C[D_menu_801B9288 - 1]; - if (func_EBFBE0_8019C66C(&(D_EBFBE0_801AEB48[D_EBFBE0_801B9288 - 1].unk_18), 146.0f, 245.0f, &D_EBFBE0_801B9268)) { - var_v1 = D_EBFBE0_801AEB48[D_EBFBE0_801B9288 - 1].unk_18 - 146.0f; + if (func_menu_8019C66C(&(D_menu_801AEB48[D_menu_801B9288 - 1].unk_18), 146.0f, 245.0f, &D_menu_801B9268)) { + var_v1 = D_menu_801AEB48[D_menu_801B9288 - 1].unk_18 - 146.0f; - gVolumeSettings[D_EBFBE0_801B9288 - 1] = var_v1; + gVolumeSettings[D_menu_801B9288 - 1] = var_v1; if (var_v1 > 99) { var_v1 = 99; } - switch (D_EBFBE0_801B9288 - 1) { + switch (D_menu_801B9288 - 1) { case 0: gSaveFile.save.data.musicVolume = var_v1; break; @@ -1423,7 +1419,7 @@ void func_EBFBE0_80194BD0(void) { gSaveFile.save.data.sfxVolume = var_v1; break; } - func_8001D8A8(D_EBFBE0_801B924C, var_v1); + func_8001D8A8(D_menu_801B924C, var_v1); } } @@ -1431,182 +1427,183 @@ void Option_SoundDraw(void) { s32 i; s32 colorGB; - static f32 D_EBFBE0_801AEFA8[11] = { 48.0f, 103.0f, 77.0f, 55.0f, 71.0f, 87.0f, - 143.0f, 244.0f, 169.0f, 170.0f, 157.0f }; - static f32 D_EBFBE0_801AEFD4[11] = { 79.0f, 52.0f, 99.0f, 131.0f, 157.0f, 186.0f, - 102.0f, 102.0f, 98.0f, 99.0f, 98.0f }; - static f32 D_EBFBE0_801AF000 = 27.5f; + static f32 D_menu_801AEFA8[11] = { + 48.0f, 103.0f, 77.0f, 55.0f, 71.0f, 87.0f, 143.0f, 244.0f, 169.0f, 170.0f, 157.0f + }; + static f32 D_menu_801AEFD4[11] = { + 79.0f, 52.0f, 99.0f, 131.0f, 157.0f, 186.0f, 102.0f, 102.0f, 98.0f, 99.0f, 98.0f + }; + static f32 D_menu_801AF000 = 27.5f; Option_DrawMenuLabel(); - func_EBFBE0_801952B4(); + func_menu_801952B4(); RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - TextureRect_16bRGBA(&gMasterDisp, D_60447A0, 8, 8, D_EBFBE0_801AEFA8[0], D_EBFBE0_801AEFD4[0], D_EBFBE0_801AF000, - 0.2f); + TextureRect_16bRGBA(&gMasterDisp, D_60447A0, 8, 8, D_menu_801AEFA8[0], D_menu_801AEFD4[0], D_menu_801AF000, 0.2f); RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - TextureRect_8bIA(&gMasterDisp, D_8005CD0, 112, 13, D_EBFBE0_801AEFA8[1], D_EBFBE0_801AEFD4[1], 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_8005CD0, 112, 13, D_menu_801AEFA8[1], D_menu_801AEFD4[1], 1.0f, 1.0f); for (i = 0; i < 4; i++) { - if (D_EBFBE0_801B9288 == i) { - func_EBFBE0_8019C824(&D_EBFBE0_801B9270[i]); + if (D_menu_801B9288 == i) { + func_menu_8019C824(&D_menu_801B9270[i]); } else { - D_EBFBE0_801B9270[i] = 255.0f; + D_menu_801B9270[i] = 255.0f; } } - colorGB = D_EBFBE0_801B9270[0]; + colorGB = D_menu_801B9270[0]; gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255); - TextureRect_8bIA(&gMasterDisp, D_8006280, 48, 13, D_EBFBE0_801AEFA8[2], D_EBFBE0_801AEFD4[2], 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_8006280, 48, 13, D_menu_801AEFA8[2], D_menu_801AEFD4[2], 1.0f, 1.0f); - colorGB = D_EBFBE0_801B9270[1]; + colorGB = D_menu_801B9270[1]; gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255); - TextureRect_8bIA(&gMasterDisp, D_80064F0, 88, 14, D_EBFBE0_801AEFA8[3], D_EBFBE0_801AEFD4[3], 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_80064F0, 88, 14, D_menu_801AEFA8[3], D_menu_801AEFD4[3], 1.0f, 1.0f); - colorGB = D_EBFBE0_801B9270[2]; + colorGB = D_menu_801B9270[2]; gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255); - TextureRect_8bIA(&gMasterDisp, D_80069C0, 56, 15, D_EBFBE0_801AEFA8[4], D_EBFBE0_801AEFD4[4], 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_80069C0, 56, 15, D_menu_801AEFA8[4], D_menu_801AEFD4[4], 1.0f, 1.0f); - colorGB = D_EBFBE0_801B9270[3]; + colorGB = D_menu_801B9270[3]; gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255); - TextureRect_8bIA(&gMasterDisp, D_8006D10, 24, 13, D_EBFBE0_801AEFA8[5], D_EBFBE0_801AEFD4[5], 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_8006D10, 24, 13, D_menu_801AEFA8[5], D_menu_801AEFD4[5], 1.0f, 1.0f); - if (D_EBFBE0_801B9288 == 0) { + if (D_menu_801B9288 == 0) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - TextureRect_8bIA_MirX(&gMasterDisp, D_800E130, 8, 8, D_EBFBE0_801AEFA8[6], D_EBFBE0_801AEFD4[6], 1.0f, 1.0f); - TextureRect_8bIA(&gMasterDisp, D_800E130, 8, 8, D_EBFBE0_801AEFA8[7], D_EBFBE0_801AEFD4[7], 1.0f, 1.0f); + TextureRect_8bIA_MirX(&gMasterDisp, D_800E130, 8, 8, D_menu_801AEFA8[6], D_menu_801AEFD4[6], 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_800E130, 8, 8, D_menu_801AEFA8[7], D_menu_801AEFD4[7], 1.0f, 1.0f); } gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); switch (gSoundMode) { case 0: - TextureRect_8bIA(&gMasterDisp, D_800CD90, 56, 13, D_EBFBE0_801AEFA8[8], D_EBFBE0_801AEFD4[8], 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_800CD90, 56, 13, D_menu_801AEFA8[8], D_menu_801AEFD4[8], 1.0f, 1.0f); break; case 1: - TextureRect_8bIA(&gMasterDisp, D_80076E0, 56, 14, D_EBFBE0_801AEFA8[9], D_EBFBE0_801AEFD4[9], 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_80076E0, 56, 14, D_menu_801AEFA8[9], D_menu_801AEFD4[9], 1.0f, 1.0f); break; case 2: - TextureRect_8bIA(&gMasterDisp, D_8007210, 88, 14, D_EBFBE0_801AEFA8[10], D_EBFBE0_801AEFD4[10], 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_8007210, 88, 14, D_menu_801AEFA8[10], D_menu_801AEFD4[10], 1.0f, 1.0f); break; } TextureRect_8bIA(&gMasterDisp, D_8006E50, 96, 10, 166.0f, 213.0f, 1.0f, 1.0f); for (i = 0; i < 3; i++) { - Option_DrawCardLabel(D_EBFBE0_801AEAA0[i]); - Option_DrawCardLabel(D_EBFBE0_801AEB48[i]); + Option_DrawCardLabel(D_menu_801AEAA0[i]); + Option_DrawCardLabel(D_menu_801AEB48[i]); } } -void func_EBFBE0_801952B4(void) { +void func_menu_801952B4(void) { s32 i; - if (D_EBFBE0_801B9284 == 1) { - switch (D_EBFBE0_801B914C) { + if (D_menu_801B9284 == 1) { + switch (D_menu_801B914C) { case 0: - D_EBFBE0_801B914C++; + D_menu_801B914C++; break; case 1: - if (D_EBFBE0_801B9178) { + if (D_menu_801B9178) { break; } for (i = 2; i < 4; i++) { - D_EBFBE0_801AE9C0[i].unk_20 += 0.02f; - D_EBFBE0_801AE9C0[i].unk_24 += 0.02f; - D_EBFBE0_801AE9C0[i].unk_18 -= 0.1f; + D_menu_801AE9C0[i].unk_20 += 0.02f; + D_menu_801AE9C0[i].unk_24 += 0.02f; + D_menu_801AE9C0[i].unk_18 -= 0.1f; } - D_EBFBE0_801B9178 = 2; - D_EBFBE0_801B914C++; + D_menu_801B9178 = 2; + D_menu_801B914C++; break; case 2: - if (D_EBFBE0_801B9178) { + if (D_menu_801B9178) { break; } for (i = 2; i < 4; i++) { - D_EBFBE0_801AE9C0[i].unk_20 -= 0.02f; - D_EBFBE0_801AE9C0[i].unk_24 -= 0.02f; - D_EBFBE0_801AE9C0[i].unk_18 += 0.1f; + D_menu_801AE9C0[i].unk_20 -= 0.02f; + D_menu_801AE9C0[i].unk_24 -= 0.02f; + D_menu_801AE9C0[i].unk_18 += 0.1f; } - D_EBFBE0_801B914C++; + D_menu_801B914C++; break; case 3: - D_EBFBE0_801B9178 = Rand_ZeroOne() * 15.0f; - D_EBFBE0_801B914C = 1; + D_menu_801B9178 = Rand_ZeroOne() * 15.0f; + D_menu_801B914C = 1; break; } - switch (D_EBFBE0_801B9158) { + switch (D_menu_801B9158) { case 0: - if (D_EBFBE0_801B917C) { + if (D_menu_801B917C) { break; } for (i = 0; i < 4; i++) { - D_EBFBE0_801AE9C0[i].unk_20 += 0.08f; - D_EBFBE0_801AE9C0[i].unk_24 += 0.08f; - D_EBFBE0_801AE9C0[i].unk_18 -= 0.4f; - D_EBFBE0_801AE9C0[i].unk_1C -= 0.4f; + D_menu_801AE9C0[i].unk_20 += 0.08f; + D_menu_801AE9C0[i].unk_24 += 0.08f; + D_menu_801AE9C0[i].unk_18 -= 0.4f; + D_menu_801AE9C0[i].unk_1C -= 0.4f; } - D_EBFBE0_801B917C = 2; - D_EBFBE0_801B9158++; + D_menu_801B917C = 2; + D_menu_801B9158++; break; case 1: - if (D_EBFBE0_801B917C) { + if (D_menu_801B917C) { break; } for (i = 0; i < 4; i++) { - D_EBFBE0_801AE9C0[i].unk_20 -= 0.08f; - D_EBFBE0_801AE9C0[i].unk_24 -= 0.08f; - D_EBFBE0_801AE9C0[i].unk_18 += 0.4f; - D_EBFBE0_801AE9C0[i].unk_1C += 0.4f; + D_menu_801AE9C0[i].unk_20 -= 0.08f; + D_menu_801AE9C0[i].unk_24 -= 0.08f; + D_menu_801AE9C0[i].unk_18 += 0.4f; + D_menu_801AE9C0[i].unk_1C += 0.4f; } - D_EBFBE0_801B917C = 2; - D_EBFBE0_801B9158++; + D_menu_801B917C = 2; + D_menu_801B9158++; break; case 2: - if (D_EBFBE0_801B917C) { + if (D_menu_801B917C) { break; } - D_EBFBE0_801B917C = Rand_ZeroOne() * 30.0f; - D_EBFBE0_801B9158 = 0; + D_menu_801B917C = Rand_ZeroOne() * 30.0f; + D_menu_801B9158 = 0; break; } } else { for (i = 0; i < 4; i++) { - D_EBFBE0_801AE9C0[i].unk_20 = 1.0f; - D_EBFBE0_801AE9C0[i].unk_24 = 1.0f; - D_EBFBE0_801AE9C0[i].unk_18 = D_EBFBE0_801AE9A0[i]; - D_EBFBE0_801AE9C0[i].unk_1C = D_EBFBE0_801AE9B0[i]; + D_menu_801AE9C0[i].unk_20 = 1.0f; + D_menu_801AE9C0[i].unk_24 = 1.0f; + D_menu_801AE9C0[i].unk_18 = D_menu_801AE9A0[i]; + D_menu_801AE9C0[i].unk_1C = D_menu_801AE9B0[i]; } } for (i = 0; i < 2; i++) { - Option_DrawCardLabel(D_EBFBE0_801AE9C0[i]); + Option_DrawCardLabel(D_menu_801AE9C0[i]); } for (i = 2; i < 4; i++) { - if (D_EBFBE0_801B914C != 3) { - Option_DrawCardLabel(D_EBFBE0_801AE9C0[i]); + if (D_menu_801B914C != 3) { + Option_DrawCardLabel(D_menu_801AE9C0[i]); } } } @@ -1615,16 +1612,16 @@ void Option_ExpertSoundInit(void) { s32 i; D_80178410 = 800; - D_EBFBE0_801B931C = 0; + D_menu_801B931C = 0; - D_EBFBE0_801B9290.unk_0 = 0; - D_EBFBE0_801B9290.unk_4 = 0; + D_menu_801B9290.unk_0 = 0; + D_menu_801B9290.unk_4 = 0; spectrumAnalizerMode = 0; - D_EBFBE0_801B9320 = 0; + D_menu_801B9320 = 0; // clang-format off - for (i = 0; i < 32; i++) { D_EBFBE0_801B9298[i] = 0.0f; } + for (i = 0; i < 32; i++) { D_menu_801B9298[i] = 0.0f; } // clang-format on } @@ -1634,31 +1631,31 @@ void Option_ExpertSoundInit(void) { #else void Option_ExpertSoundUpdate(void) { s32 pad; - f32 sp28 = D_EBFBE0_801B931C; + f32 sp28 = D_menu_801B931C; - if (func_EBFBE0_8019C66C(&sp28, 0.0f, 49.0f, &D_EBFBE0_801B9290) != 0) { + if (func_menu_8019C66C(&sp28, 0.0f, 49.0f, &D_menu_801B9290) != 0) { Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B931C = sp28; + D_menu_801B931C = sp28; } if (gControllerPress[gMainController].button & A_BUTTON) { - func_8001DA90(D_EBFBE0_801B931C); - D_EBFBE0_801B9320 = true; + func_8001DA90(D_menu_801B931C); + D_menu_801B9320 = true; } if (gControllerPress[gMainController].button & B_BUTTON) { - if (!D_EBFBE0_801B9320) { + if (!D_menu_801B9320) { Audio_PlaySfx(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); func_8001D444(0, 36, 0, 255); gDrawMode = DRAWMODE_0; - D_EBFBE0_801B9124 = 1000; - D_EBFBE0_801B912C = 0; - D_EBFBE0_801B9244 = 1; + D_menu_801B9124 = 1000; + D_menu_801B912C = 0; + D_menu_801B9244 = 1; } else { Audio_PlaySfx(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); func_800182F4(0x100100FF); func_800182F4(0x110100FF); - D_EBFBE0_801B9320 = false; + D_menu_801B9320 = false; } } @@ -1680,26 +1677,26 @@ void Option_ExpertSoundDraw(void) { f32 r; f32 g; f32 b; - static f32 D_EBFBE0_801AF004 = -125.0f; - static f32 D_EBFBE0_801AF008 = 0.0f; - static f32 D_EBFBE0_801AF00C = 2.0f; - static f32 D_EBFBE0_801AF010 = 8.0f; - static f32 D_EBFBE0_801AF014[4] = { 30.0f, 30.0f, 28.0f, 288.0f }; - static f32 D_EBFBE0_801AF024[4] = { 125.0f, 197.0f, 125.0f, 125.0f }; - static f32 D_EBFBE0_801AF034[4] = { 32.3f, 32.3f, 0.2f, 0.2f }; - static f32 D_EBFBE0_801AF044[4] = { 0.2f, 0.2f, 9.2f, 9.2f }; - static f32 D_EBFBE0_801AF054 = 255.0f; - static f32 D_EBFBE0_801AF058 = 100.0f; - static f32 D_EBFBE0_801AF05C = 255.0f; - static f32 D_EBFBE0_801AF060 = 100.0f; - static f32 D_EBFBE0_801AF064 = 255.0f; - static f32 D_EBFBE0_801AF068 = 100.0f; - static Gfx* D_EBFBE0_801AF06C[] = { - (Gfx*) D_EBFBE0_801AEC30, - (Gfx*) D_EBFBE0_801AEC88, - (Gfx*) D_EBFBE0_801AECE0, + static f32 D_menu_801AF004 = -125.0f; + static f32 D_menu_801AF008 = 0.0f; + static f32 D_menu_801AF00C = 2.0f; + static f32 D_menu_801AF010 = 8.0f; + static f32 D_menu_801AF014[4] = { 30.0f, 30.0f, 28.0f, 288.0f }; + static f32 D_menu_801AF024[4] = { 125.0f, 197.0f, 125.0f, 125.0f }; + static f32 D_menu_801AF034[4] = { 32.3f, 32.3f, 0.2f, 0.2f }; + static f32 D_menu_801AF044[4] = { 0.2f, 0.2f, 9.2f, 9.2f }; + static f32 D_menu_801AF054 = 255.0f; + static f32 D_menu_801AF058 = 100.0f; + static f32 D_menu_801AF05C = 255.0f; + static f32 D_menu_801AF060 = 100.0f; + static f32 D_menu_801AF064 = 255.0f; + static f32 D_menu_801AF068 = 100.0f; + static Gfx* D_menu_801AF06C[] = { + (Gfx*) D_menu_801AEC30, + (Gfx*) D_menu_801AEC88, + (Gfx*) D_menu_801AECE0, }; - static f32 D_EBFBE0_801AF078[] = { -73.0f, -13.0f, -43.0f }; + static f32 D_menu_801AF078[] = { -73.0f, -13.0f, -43.0f }; Option_DrawMenuLabel(); @@ -1710,22 +1707,22 @@ void Option_ExpertSoundDraw(void) { TextureRect_8bIA(&gMasterDisp, D_80079F0, 128, 14, 49.0f, 81.0f, 1.0f, 1.0f); - TextureRect_8bIA(&gMasterDisp, D_EBFBE0_801AECF8[D_EBFBE0_801B931C / 10], 16, 15, 230.0f, 82.0f, 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_menu_801AECF8[D_menu_801B931C / 10], 16, 15, 230.0f, 82.0f, 1.0f, 1.0f); - TextureRect_8bIA(&gMasterDisp, D_EBFBE0_801AECF8[D_EBFBE0_801B931C % 10], 16, 15, 244.0f, 82.0f, 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_menu_801AECF8[D_menu_801B931C % 10], 16, 15, 244.0f, 82.0f, 1.0f, 1.0f); - func_EBFBE0_8019B7D4(); + func_menu_8019B7D4(); RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0, 0, 50, 50, 200, 255); for (i = 0; i < 4; i++) { - TextureRect_16bRGBA(&gMasterDisp, D_60447A0, 8, 8, D_EBFBE0_801AF014[i], D_EBFBE0_801AF024[i], - D_EBFBE0_801AF034[i], D_EBFBE0_801AF044[i]); + TextureRect_16bRGBA(&gMasterDisp, D_60447A0, 8, 8, D_menu_801AF014[i], D_menu_801AF024[i], D_menu_801AF034[i], + D_menu_801AF044[i]); } - if (D_EBFBE0_801B9320 != 0) { + if (D_menu_801B9320 != 0) { temp_v0_4 = func_8001C3EC(); var_fv1 = 60.0f; @@ -1735,14 +1732,14 @@ void Option_ExpertSoundDraw(void) { for (i = 0; i < 32; i++) { if (spectrumAnalizerMode == 0 || spectrumAnalizerMode == 2) { - D_EBFBE0_801B9298[i] = (var_fv1 / 255.0f) * temp_v0_4[i]; + D_menu_801B9298[i] = (var_fv1 / 255.0f) * temp_v0_4[i]; } else { - D_EBFBE0_801B9298[i] = var_fv1 - ((var_fv1 / 255.0f) * temp_v0_4[i]); + D_menu_801B9298[i] = var_fv1 - ((var_fv1 / 255.0f) * temp_v0_4[i]); } } } else { for (i = 0; i < 32; i++) { - Math_SmoothStepToF(&D_EBFBE0_801B9298[i], 0.0f, 0.2f, 100.0f, 0.1f); + Math_SmoothStepToF(&D_menu_801B9298[i], 0.0f, 0.2f, 100.0f, 0.1f); } } @@ -1754,19 +1751,19 @@ void Option_ExpertSoundDraw(void) { Matrix_LookAt(gGfxMatrix, 0.0f, 0.0f, 100.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); - for (var_fs0 = D_EBFBE0_801AF004, i = 0; i < 32; i++, var_fs0 += D_EBFBE0_801AF010) { - r = D_EBFBE0_801AF054 + ((D_EBFBE0_801AF060 - D_EBFBE0_801AF054) / 31.0f) * i; - g = D_EBFBE0_801AF058 + ((D_EBFBE0_801AF064 - D_EBFBE0_801AF058) / 31.0f) * i; - b = D_EBFBE0_801AF05C + ((D_EBFBE0_801AF068 - D_EBFBE0_801AF05C) / 31.0f) * i; + for (var_fs0 = D_menu_801AF004, i = 0; i < 32; i++, var_fs0 += D_menu_801AF010) { + r = D_menu_801AF054 + ((D_menu_801AF060 - D_menu_801AF054) / 31.0f) * i; + g = D_menu_801AF058 + ((D_menu_801AF064 - D_menu_801AF058) / 31.0f) * i; + b = D_menu_801AF05C + ((D_menu_801AF068 - D_menu_801AF05C) / 31.0f) * i; gDPSetPrimColor(gMasterDisp++, 0, 0, (s32) r, (s32) g, (s32) b, 255); Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, var_fs0, D_EBFBE0_801AF078[spectrumAnalizerMode], D_EBFBE0_801AF008, 1); - Matrix_Scale(gGfxMatrix, D_EBFBE0_801AF00C, D_EBFBE0_801B9298[i], 1.0f, 1); + Matrix_Translate(gGfxMatrix, var_fs0, D_menu_801AF078[spectrumAnalizerMode], D_menu_801AF008, 1); + Matrix_Scale(gGfxMatrix, D_menu_801AF00C, D_menu_801B9298[i], 1.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_EBFBE0_801AF06C[spectrumAnalizerMode]); + gSPDisplayList(gMasterDisp++, D_menu_801AF06C[spectrumAnalizerMode]); Matrix_Pop(&gGfxMatrix); } @@ -1777,55 +1774,55 @@ void Option_ExpertSoundDraw(void) { void Option_DataInit(void) { D_80178410 = 800; - D_EBFBE0_801B91E4 = 255.0f; - D_EBFBE0_801B9330[0] = 0; - D_EBFBE0_801B9330[1] = 0; - D_EBFBE0_801B91C0 = 0; - D_EBFBE0_801B91CC = 0; + D_menu_801B91E4 = 255.0f; + D_menu_801B9330[0] = 0; + D_menu_801B9330[1] = 0; + D_menu_801B91C0 = 0; + D_menu_801B91CC = 0; } void Option_DataUpdate(void) { f32 temp_fv0; s32 i; - switch (D_EBFBE0_801B912C) { + switch (D_menu_801B912C) { case 0: - func_EBFBE0_8019669C(); + func_menu_8019669C(); break; case 2: - if (D_EBFBE0_801B9330[D_EBFBE0_801B91C0] != 0) { + if (D_menu_801B9330[D_menu_801B91C0] != 0) { break; } - D_EBFBE0_801B91CC = 0; - D_EBFBE0_801B91C0 = 0; - D_EBFBE0_801B912C = 0; + D_menu_801B91CC = 0; + D_menu_801B91C0 = 0; + D_menu_801B912C = 0; break; case 3: - if (D_EBFBE0_801B9330[D_EBFBE0_801B91C0]) { + if (D_menu_801B9330[D_menu_801B91C0]) { break; } gDrawMode = DRAWMODE_0; - D_EBFBE0_801B9124 = 1000; - D_EBFBE0_801B912C = 0; - D_EBFBE0_801B9244 = 1; + D_menu_801B9124 = 1000; + D_menu_801B912C = 0; + D_menu_801B9244 = 1; break; case 4: - if (D_EBFBE0_801B9330[D_EBFBE0_801B91C0]) { + if (D_menu_801B9330[D_menu_801B91C0]) { break; } - switch (D_EBFBE0_801B91CC) { + switch (D_menu_801B91CC) { case 0: - D_EBFBE0_801B91CC = 1; - D_EBFBE0_801B91C0 = 0; - D_EBFBE0_801B912C = 0; + D_menu_801B91CC = 1; + D_menu_801B91C0 = 0; + D_menu_801B912C = 0; break; case 1: - D_EBFBE0_801B91CC = 2; + D_menu_801B91CC = 2; Audio_PlaySfx(0x0940A00B, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); D_801779A8[gMainController] = 50.0f; D_80177990[gMainController] = 0; @@ -1841,15 +1838,15 @@ void Option_DataUpdate(void) { } if (temp_fv0 == 0.0f) { - D_EBFBE0_801B91CC = 3; + D_menu_801B91CC = 3; gSaveFile = *(SaveFile*) &gDefaultSave; Save_Write(); - D_EBFBE0_801B91AC = 0; - D_EBFBE0_801B91B0 = 0; - D_EBFBE0_801B91C8 = 0; + D_menu_801B91AC = 0; + D_menu_801B91B0 = 0; + D_menu_801B91C8 = 0; gExpertMode = false; @@ -1864,52 +1861,52 @@ void Option_DataUpdate(void) { sOptionCardCurTextPosX[i] = sOptionCardTextPosX[i]; sOptionCardCurTextPosY[i] = sOptionCardTextPosY[i]; } - func_EBFBE0_80188010(); + func_menu_80188010(); } break; case 3: - D_EBFBE0_801B912C = 0; + D_menu_801B912C = 0; break; } break; } } -void func_EBFBE0_8019669C(void) { - if ((D_EBFBE0_801B91CC == 0) || (D_EBFBE0_801B91CC == 1)) { - if (func_EBFBE0_8019C5A0(&D_EBFBE0_801B91C0) != 0) { +void func_menu_8019669C(void) { + if ((D_menu_801B91CC == 0) || (D_menu_801B91CC == 1)) { + if (func_menu_8019C5A0(&D_menu_801B91C0) != 0) { Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } if (1) {} } if (gControllerPress[gMainController].button & A_BUTTON) { - if (D_EBFBE0_801B91CC == 3) { + if (D_menu_801B91CC == 3) { Audio_PlaySfx(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B912C = 3; + D_menu_801B912C = 3; } else { - D_EBFBE0_801B9330[D_EBFBE0_801B91C0] = 10; - if (D_EBFBE0_801B91C0 == 0) { - if (D_EBFBE0_801B91CC == 1) { + D_menu_801B9330[D_menu_801B91C0] = 10; + if (D_menu_801B91C0 == 0) { + if (D_menu_801B91CC == 1) { Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B912C = 2; + D_menu_801B912C = 2; } else { Audio_PlaySfx(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B912C = 3; + D_menu_801B912C = 3; } } else { Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B912C = 4; + D_menu_801B912C = 4; } } } else if (gControllerPress[gMainController].button & B_BUTTON) { - if (D_EBFBE0_801B91CC == 1) { + if (D_menu_801B91CC == 1) { Audio_PlaySfx(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B912C = 2; + D_menu_801B912C = 2; } else { Audio_PlaySfx(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B912C = 3; + D_menu_801B912C = 3; } } } @@ -1918,11 +1915,11 @@ void Option_DataDraw(void) { s32 i; s32 sp7C[2]; s32 sp74[2]; - static f32 D_EBFBE0_801AF084[2] = { 172.0f, 76.0f }; - static f32 D_EBFBE0_801AF08C[2] = { 228.0f, 121.0f }; + static f32 D_menu_801AF084[2] = { 172.0f, 76.0f }; + static f32 D_menu_801AF08C[2] = { 228.0f, 121.0f }; - static f32 D_EBFBE0_801AF094[6] = { 72.0f, 88.0f, 185.0f, 80.0f, 84.0f, 88.0f }; - static f32 D_EBFBE0_801AF0AC[6] = { 53.0f, 137.0f, 137.0f, 90.0f, 80.0f, 97.0f }; + static f32 D_menu_801AF094[6] = { 72.0f, 88.0f, 185.0f, 80.0f, 84.0f, 88.0f }; + static f32 D_menu_801AF0AC[6] = { 53.0f, 137.0f, 137.0f, 90.0f, 80.0f, 97.0f }; Option_DrawMenuLabel(); @@ -1931,51 +1928,50 @@ void Option_DataDraw(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); for (i = 0; i < 2; i++) { - TextureRect_8bIA(&gMasterDisp, D_80084B0 + (i * 176 * 4), 176, 4, D_EBFBE0_801AF094[0], - D_EBFBE0_801AF0AC[0] + (4.0f * i), 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_80084B0 + (i * 176 * 4), 176, 4, D_menu_801AF094[0], + D_menu_801AF0AC[0] + (4.0f * i), 1.0f, 1.0f); } - TextureRect_8bIA(&gMasterDisp, D_80084B0 + 1408, 176, 5, D_EBFBE0_801AF094[0], D_EBFBE0_801AF0AC[0] + 8.0f, 1.0f, - 1.0f); + TextureRect_8bIA(&gMasterDisp, D_80084B0 + 1408, 176, 5, D_menu_801AF094[0], D_menu_801AF0AC[0] + 8.0f, 1.0f, 1.0f); - if (D_EBFBE0_801B91CC < 2) { - TextureRect_8bIA_MirX(&gMasterDisp, D_800E130, 8, 8, D_EBFBE0_801AF084[D_EBFBE0_801B91C0], 140.0f, 1.0f, 1.0f); - TextureRect_8bIA(&gMasterDisp, D_800E130, 8, 8, D_EBFBE0_801AF08C[D_EBFBE0_801B91C0], 140.0f, 1.0f, 1.0f); + if (D_menu_801B91CC < 2) { + TextureRect_8bIA_MirX(&gMasterDisp, D_800E130, 8, 8, D_menu_801AF084[D_menu_801B91C0], 140.0f, 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_800E130, 8, 8, D_menu_801AF08C[D_menu_801B91C0], 140.0f, 1.0f, 1.0f); - func_EBFBE0_8019C824(&D_EBFBE0_801AED20[D_EBFBE0_801B91C0]); - D_EBFBE0_801AED20[!D_EBFBE0_801B91C0] = 255.0f; + func_menu_8019C824(&D_menu_801AED20[D_menu_801B91C0]); + D_menu_801AED20[!D_menu_801B91C0] = 255.0f; sp74[0] = sp74[1] = 0xFFFFFFFF; for (i = 0; i < 2; i++) { - if (D_EBFBE0_801B9330[i]) { + if (D_menu_801B9330[i]) { sp74[i] = 1; sp7C[i] = 255; - D_EBFBE0_801B9330[i]--; + D_menu_801B9330[i]--; } } if (gFrameCount & sp74[1]) { - sp7C[1] = D_EBFBE0_801AED20[1]; + sp7C[1] = D_menu_801AED20[1]; gDPSetPrimColor(gMasterDisp++, 0, 0, 255, sp7C[1], sp7C[1], 255); - TextureRect_8bIA(&gMasterDisp, D_8009980, 32, 12, D_EBFBE0_801AF094[1], D_EBFBE0_801AF0AC[1], 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_8009980, 32, 12, D_menu_801AF094[1], D_menu_801AF0AC[1], 1.0f, 1.0f); } if (gFrameCount & sp74[0]) { - sp7C[0] = D_EBFBE0_801AED20[0]; + sp7C[0] = D_menu_801AED20[0]; gDPSetPrimColor(gMasterDisp++, 0, 0, 255, sp7C[0], sp7C[0], 255); - TextureRect_8bIA(&gMasterDisp, D_8009B00, 40, 12, D_EBFBE0_801AF094[2], D_EBFBE0_801AF0AC[2], 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_8009B00, 40, 12, D_menu_801AF094[2], D_menu_801AF0AC[2], 1.0f, 1.0f); } } - switch (D_EBFBE0_801B91CC) { + switch (D_menu_801B91CC) { case 0: gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); for (i = 0; i < 9; i++) { - TextureRect_8bIA(&gMasterDisp, D_8008DA0 + (160 * 2 * i), 160, 2, D_EBFBE0_801AF094[3], - D_EBFBE0_801AF0AC[3] + (2.0f * i), 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_8008DA0 + (160 * 2 * i), 160, 2, D_menu_801AF094[3], + D_menu_801AF0AC[3] + (2.0f * i), 1.0f, 1.0f); } - TextureRect_8bIA(&gMasterDisp, D_8008DA0 + 2880, 160, 1, D_EBFBE0_801AF094[3], D_EBFBE0_801AF0AC[3] + 18.0f, + TextureRect_8bIA(&gMasterDisp, D_8008DA0 + 2880, 160, 1, D_menu_801AF094[3], D_menu_801AF0AC[3] + 18.0f, 1.0f, 1.0f); break; @@ -1984,64 +1980,64 @@ void Option_DataDraw(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); for (i = 0; i < 20; i++) { - TextureRect_8bIA(&gMasterDisp, D_8009CE0 + (160 * 2 * i), 160, 2, D_EBFBE0_801AF094[4], - D_EBFBE0_801AF0AC[4] + (2.0f * i), 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_8009CE0 + (160 * 2 * i), 160, 2, D_menu_801AF094[4], + D_menu_801AF0AC[4] + (2.0f * i), 1.0f, 1.0f); } - TextureRect_8bIA(&gMasterDisp, D_8009CE0 + 6400, 160, 1, D_EBFBE0_801AF094[4], D_EBFBE0_801AF0AC[4] + 40.0f, + TextureRect_8bIA(&gMasterDisp, D_8009CE0 + 6400, 160, 1, D_menu_801AF094[4], D_menu_801AF0AC[4] + 40.0f, 1.0f, 1.0f); break; case 3: gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 32, 32, 255); - TextureRect_8bIA(&gMasterDisp, D_800B680, 144, 28, D_EBFBE0_801AF094[5], D_EBFBE0_801AF0AC[5], 1.0f, 1.0f); - TextureRect_8bIA(&gMasterDisp, D_800B680 + 4032, 144, 13, D_EBFBE0_801AF094[5], - D_EBFBE0_801AF0AC[5] + 28.0f, 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_800B680, 144, 28, D_menu_801AF094[5], D_menu_801AF0AC[5], 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_800B680 + 4032, 144, 13, D_menu_801AF094[5], D_menu_801AF0AC[5] + 28.0f, + 1.0f, 1.0f); break; } - func_EBFBE0_8019B7D4(); + func_menu_8019B7D4(); } -static char* D_EBFBE0_801AF0C4[3] = { "P", "S", "F" }; -static s32 D_EBFBE0_801AF0D0[3] = { 255, 0, 30 }; -static s32 D_EBFBE0_801AF0DC[3] = { 30, 179, 30 }; -static s32 D_EBFBE0_801AF0E8[3] = { 0, 67, 255 }; +static char* D_menu_801AF0C4[3] = { "P", "S", "F" }; +static s32 D_menu_801AF0D0[3] = { 255, 0, 30 }; +static s32 D_menu_801AF0DC[3] = { 30, 179, 30 }; +static s32 D_menu_801AF0E8[3] = { 0, 67, 255 }; void Option_RankingInit(void) { - func_EBFBE0_80188010(); + func_menu_80188010(); D_80178410 = 800; - D_EBFBE0_801B91D0 = 1; - D_EBFBE0_801B93E4 = 0; + D_menu_801B91D0 = 1; + D_menu_801B93E4 = 0; - D_EBFBE0_801B91D4 = 114.0f; - D_EBFBE0_801B91DC = 114.0f; + D_menu_801B91D4 = 114.0f; + D_menu_801B91DC = 114.0f; - D_EBFBE0_801B91D8 = -6.0f; - D_EBFBE0_801B91E0 = -6.0f; + D_menu_801B91D8 = -6.0f; + D_menu_801B91E0 = -6.0f; - D_EBFBE0_801B93E0 = 0; - D_EBFBE0_801B8288 = 10; + D_menu_801B93E0 = 0; + D_menu_801B8288 = 10; - D_EBFBE0_801B9400.unk_0 = 0; - D_EBFBE0_801B9400.unk_4 = 0; - D_EBFBE0_801B9408.unk_0 = 0; - D_EBFBE0_801B9408.unk_4 = 0; + D_menu_801B9400.unk_0 = 0; + D_menu_801B9400.unk_4 = 0; + D_menu_801B9408.unk_0 = 0; + D_menu_801B9408.unk_4 = 0; - func_EBFBE0_80192598(); + func_menu_80192598(); } void Option_RankingUpdate(void) { - func_EBFBE0_80196FC4(); + func_menu_80196FC4(); if (gControllerPress[gMainController].button & B_BUTTON) { Audio_PlaySfx(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); gDrawMode = DRAWMODE_0; - D_EBFBE0_801B9124 = 1000; - D_EBFBE0_801B912C = 0; - D_EBFBE0_801B9244 = 1; + D_menu_801B9124 = 1000; + D_menu_801B912C = 0; + D_menu_801B9244 = 1; } } @@ -2050,177 +2046,177 @@ void Option_RankingDraw(void) { Option_DrawMenuLabel(); } -void func_EBFBE0_80196FC4(void) { +void func_menu_80196FC4(void) { if (gControllerPress[gMainController].button & A_BUTTON) { Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B93E0 ^= 1; + D_menu_801B93E0 ^= 1; } - if (D_EBFBE0_801B93E0 != 0) { - func_EBFBE0_8019715C(); + if (D_menu_801B93E0 != 0) { + func_menu_8019715C(); return; } - func_EBFBE0_80197074(); + func_menu_80197074(); } -void func_EBFBE0_80197074(void) { - if (func_EBFBE0_8019C418(&D_EBFBE0_801B93E4, 9, 1, 0, 20, 5, 4, gMainController, &D_EBFBE0_801B9400)) { +void func_menu_80197074(void) { + if (func_menu_8019C418(&D_menu_801B93E4, 9, 1, 0, 20, 5, 4, gMainController, &D_menu_801B9400)) { Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B91D4 = 114.0f - D_EBFBE0_801B93E4 * 130.0f; - D_EBFBE0_801B91DC = 114.0f - D_EBFBE0_801B93E4 * 130.0f; - D_EBFBE0_801B91D8 = -6.0f + D_EBFBE0_801B93E4 * 130.0f; - D_EBFBE0_801B91E0 = -6.0f + D_EBFBE0_801B93E4 * 130.0f; + D_menu_801B91D4 = 114.0f - D_menu_801B93E4 * 130.0f; + D_menu_801B91DC = 114.0f - D_menu_801B93E4 * 130.0f; + D_menu_801B91D8 = -6.0f + D_menu_801B93E4 * 130.0f; + D_menu_801B91E0 = -6.0f + D_menu_801B93E4 * 130.0f; } } -void func_EBFBE0_8019715C(void) { +void func_menu_8019715C(void) { s32 pad; f32 sp30; f32 temp_fv0_2; s32 temp; s32 temp2; - if (D_EBFBE0_801B91D0 != 0) { - if (func_EBFBE0_8019C418(&D_EBFBE0_801B93E4, 9, 1, 1, 20, 2, 9, gMainController, &D_EBFBE0_801B9408) != 0.00f) { + if (D_menu_801B91D0 != 0) { + if (func_menu_8019C418(&D_menu_801B93E4, 9, 1, 1, 20, 2, 9, gMainController, &D_menu_801B9408) != 0.00f) { Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B91DC = 114.0f - D_EBFBE0_801B93E4 * 130.0f; - D_EBFBE0_801B91E0 = -6.0f + D_EBFBE0_801B93E4 * 130.0f; - D_EBFBE0_801B91D0 = 0; + D_menu_801B91DC = 114.0f - D_menu_801B93E4 * 130.0f; + D_menu_801B91E0 = -6.0f + D_menu_801B93E4 * 130.0f; + D_menu_801B91D0 = 0; } } else { - sp30 = Math_SmoothStepToF(&D_EBFBE0_801B91D8, D_EBFBE0_801B91E0, 0.5f, 100.0f, 1.0f); - temp_fv0_2 = Math_SmoothStepToF(&D_EBFBE0_801B91D4, D_EBFBE0_801B91DC, 0.5f, 100.0f, 1.0f); + sp30 = Math_SmoothStepToF(&D_menu_801B91D8, D_menu_801B91E0, 0.5f, 100.0f, 1.0f); + temp_fv0_2 = Math_SmoothStepToF(&D_menu_801B91D4, D_menu_801B91DC, 0.5f, 100.0f, 1.0f); if ((sp30 == 0.0f) && (temp_fv0_2 == 0.0f)) { - D_EBFBE0_801B91D0 = 1; + D_menu_801B91D0 = 1; } } - temp = D_EBFBE0_801B91D4; - temp2 = D_EBFBE0_801B91D8; + temp = D_menu_801B91D4; + temp2 = D_menu_801B91D8; - D_EBFBE0_801B91D4 = temp; - D_EBFBE0_801B91D8 = temp2; + D_menu_801B91D4 = temp; + D_menu_801B91D8 = temp2; - if (D_EBFBE0_801B91D4 >= 114.0f) { - D_EBFBE0_801B91D4 = 114.0f; + if (D_menu_801B91D4 >= 114.0f) { + D_menu_801B91D4 = 114.0f; } - if (D_EBFBE0_801B91D4 <= -1056.0f) { - D_EBFBE0_801B91D4 = -1056.0f; + if (D_menu_801B91D4 <= -1056.0f) { + D_menu_801B91D4 = -1056.0f; } - if (D_EBFBE0_801B91D8 <= -6.0f) { - D_EBFBE0_801B91D8 = -6.0f; + if (D_menu_801B91D8 <= -6.0f) { + D_menu_801B91D8 = -6.0f; } - if (D_EBFBE0_801B91D8 >= 1164.0f) { - D_EBFBE0_801B91D8 = 1164.0f; + if (D_menu_801B91D8 >= 1164.0f) { + D_menu_801B91D8 = 1164.0f; } } void Option_RankingMenuDraw(void) { s32 temp_t0; - if (D_EBFBE0_801B93E0 != 0) { - func_EBFBE0_8019752C(); + if (D_menu_801B93E0 != 0) { + func_menu_8019752C(); } else { - func_EBFBE0_80187E28(); + func_menu_80187E28(); RCP_SetupDL(&gMasterDisp, 0x53); - func_EBFBE0_8019C824(&D_EBFBE0_801B93F0); - temp_t0 = D_EBFBE0_801B93F0; + func_menu_8019C824(&D_menu_801B93F0); + temp_t0 = D_menu_801B93F0; gDPSetPrimColor(gMasterDisp++, 0, 0, 255, temp_t0, temp_t0, 255); - TextureRect_8bIA(&gMasterDisp, D_7004010, 8, 8, 70.0f, (D_EBFBE0_801B93E4 * 17.0f) + 55.0f, 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_7004010, 8, 8, 70.0f, (D_menu_801B93E4 * 17.0f) + 55.0f, 1.0f, 1.0f); } RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255); Graphics_DisplaySmallText(242, 215, 1.0f, 1.0f, "PUSH A"); } -void func_EBFBE0_8019752C(void) { +void func_menu_8019752C(void) { f32 var_fs0; f32 var_fs1; s32 temp_a0; s32 i; - static f32 D_EBFBE0_801AF0F4 = 130.0f; - static f32 D_EBFBE0_801AF0F8[] = { 48.0f, 175.0f }; + static f32 D_menu_801AF0F4 = 130.0f; + static f32 D_menu_801AF0F8[] = { 48.0f, 175.0f }; - var_fs0 = D_EBFBE0_801B91D4; - var_fs1 = D_EBFBE0_801B91D8; + var_fs0 = D_menu_801B91D4; + var_fs1 = D_menu_801B91D8; for (i = 0; i < 10; i++) { if ((var_fs0 > 69.0f) && (var_fs0 < 230.0f)) { - func_EBFBE0_80197A3C(i, 41, var_fs0); - func_EBFBE0_80197D30(i, 75, var_fs0 - 25.0f); - func_EBFBE0_80197DE4(i, 130, (var_fs0 - 26.0f)); - func_EBFBE0_801AD7EC(210, (var_fs0 - 24.0f), gSaveFile.save.data.unk_40[i]); - func_EBFBE0_80197F74(i, 258, var_fs0 - 25.0f); + func_menu_80197A3C(i, 41, var_fs0); + func_menu_80197D30(i, 75, var_fs0 - 25.0f); + func_menu_80197DE4(i, 130, (var_fs0 - 26.0f)); + func_menu_801AD7EC(210, (var_fs0 - 24.0f), gSaveFile.save.data.unk_40[i]); + func_menu_80197F74(i, 258, var_fs0 - 25.0f); } - func_EBFBE0_80198164(i, var_fs0, var_fs1); - var_fs0 += D_EBFBE0_801AF0F4; - var_fs1 -= D_EBFBE0_801AF0F4; + func_menu_80198164(i, var_fs0, var_fs1); + var_fs0 += D_menu_801AF0F4; + var_fs1 -= D_menu_801AF0F4; } - func_EBFBE0_8019BDF0(); - func_EBFBE0_80197914(); + func_menu_8019BDF0(); + func_menu_80197914(); Matrix_Pop(&gGfxMatrix); RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - TextureRect_8bIA(&gMasterDisp, D_800D170, 8, 16, 0.0f, D_EBFBE0_801AF0F8[0], 40.0f, 1.5f); - TextureRect_8bIA_MirY(&gMasterDisp, D_800D170, 8, 16, 0.0f, D_EBFBE0_801AF0F8[1], 40.0f, 1.5f); + TextureRect_8bIA(&gMasterDisp, D_800D170, 8, 16, 0.0f, D_menu_801AF0F8[0], 40.0f, 1.5f); + TextureRect_8bIA_MirY(&gMasterDisp, D_800D170, 8, 16, 0.0f, D_menu_801AF0F8[1], 40.0f, 1.5f); func_8003DE68(0, 70); func_8003DE68(170, 239); RCP_SetupDL(&gMasterDisp, 0x53); - if (D_EBFBE0_801B91D4 >= 114.0f) { + if (D_menu_801B91D4 >= 114.0f) { gDPSetPrimColor(gMasterDisp++, 0, 0, 32, 32, 32, 255); } else { - func_EBFBE0_8019C824(&D_EBFBE0_801B93F4); - temp_a0 = D_EBFBE0_801B93F4; + func_menu_8019C824(&D_menu_801B93F4); + temp_a0 = D_menu_801B93F4; gDPSetPrimColor(gMasterDisp++, 0, 0, 255, temp_a0, temp_a0, 255); } TextureRect_8bIA(&gMasterDisp, D_800D070, 16, 16, 150.0f, 44.0f, 1.0f, 1.0f); - if (D_EBFBE0_801B91D4 <= -1055.0f) { + if (D_menu_801B91D4 <= -1055.0f) { gDPSetPrimColor(gMasterDisp++, 0, 0, 32, 32, 32, 255); } else { - func_EBFBE0_8019C824(&D_EBFBE0_801B93F8); - temp_a0 = D_EBFBE0_801B93F8; + func_menu_8019C824(&D_menu_801B93F8); + temp_a0 = D_menu_801B93F8; gDPSetPrimColor(gMasterDisp++, 0, 0, 255, temp_a0, temp_a0, 255); } TextureRect_8bIA_MirY(&gMasterDisp, D_800D070, 0x10, 0x10, 150.0f, 200.0f, 1.0f, 1.0f); } -static Vec3f D_EBFBE0_801AF100[2] = { { 0.0f, 167.0f, 0.0f }, { 0.0f, -167.0f, 0.0f } }; -static Vec3f D_EBFBE0_801AF118[2] = { { 25.0f, 3.6f, 0.0f }, { 25.0f, 3.6f, 0.0f } }; +static Vec3f D_menu_801AF100[2] = { { 0.0f, 167.0f, 0.0f }, { 0.0f, -167.0f, 0.0f } }; +static Vec3f D_menu_801AF118[2] = { { 25.0f, 3.6f, 0.0f }, { 25.0f, 3.6f, 0.0f } }; -void func_EBFBE0_80197914(void) { +void func_menu_80197914(void) { Vec3f* vec1; Vec3f* vec2; s32 i; RCP_SetupDL(&gMasterDisp, 0); - for (i = 0, vec1 = D_EBFBE0_801AF100, vec2 = D_EBFBE0_801AF118; i < 2; i++, vec1++, vec2++) { + for (i = 0, vec1 = D_menu_801AF100, vec2 = D_menu_801AF118; i < 2; i++, vec1++, vec2++) { Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, vec1->x, vec1->y, -500.0f, 1); Matrix_Scale(gGfxMatrix, vec2->x, vec2->y, 1.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_EBFBE0_801AEF30); + gSPDisplayList(gMasterDisp++, D_menu_801AEF30); Matrix_Pop(&gGfxMatrix); } } -void func_EBFBE0_80197A3C(s32 arg0, s32 arg1, s32 arg2) { +void func_menu_80197A3C(s32 arg0, s32 arg1, s32 arg2) { RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); if (arg0 != 9) { - TextureRect_8bIA(&gMasterDisp, D_EBFBE0_801AECF8[arg0 + 1], 16, 15, arg1, arg2 - 25.0f, 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_menu_801AECF8[arg0 + 1], 16, 15, arg1, arg2 - 25.0f, 1.0f, 1.0f); } else { TextureRect_8bIA(&gMasterDisp, D_500A050, 16, 15, arg1 - 14.0f, arg2 - 25.0f, 1.0f, 1.0f); TextureRect_8bIA(&gMasterDisp, D_5009F60, 16, 15, arg1, arg2 - 25.0f, 1.0f, 1.0f); @@ -2249,7 +2245,7 @@ void func_EBFBE0_80197A3C(s32 arg0, s32 arg1, s32 arg2) { } } -void func_EBFBE0_80197D30(s32 arg0, s32 arg1, s32 arg2) { +void func_menu_80197D30(s32 arg0, s32 arg1, s32 arg2) { char temp[4]; RCP_SetupDL(&gMasterDisp, 0x53); @@ -2264,53 +2260,53 @@ void func_EBFBE0_80197D30(s32 arg0, s32 arg1, s32 arg2) { Graphics_DisplayLargeText(arg1, arg2, 1.0f, 1.0f, temp); } -void func_EBFBE0_80197DE4(s32 arg0, s32 arg1, s32 arg2) { +void func_menu_80197DE4(s32 arg0, s32 arg1, s32 arg2) { RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 60, 60, 255, 170); TextureRect_8bIA(&gMasterDisp, D_601B4B0, 24, 17, arg1, arg2, 3.17f, 1.05f); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255); Graphics_DisplaySmallText(arg1, arg2, 1.0f, 1.0f, "TOTAL HITS"); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - Graphics_DisplaySmallNumber((arg1 + 40.0f) - ((func_8008BCBC(D_EBFBE0_801B8220[arg0]) * 8) - 8), (arg2 + 9.0f), - D_EBFBE0_801B8220[arg0]); + Graphics_DisplaySmallNumber((arg1 + 40.0f) - ((func_8008BCBC(D_menu_801B8220[arg0]) * 8) - 8), (arg2 + 9.0f), + D_menu_801B8220[arg0]); } -void func_EBFBE0_80197F74(s32 arg0, s32 arg1, s32 arg2) { +void func_menu_80197F74(s32 arg0, s32 arg1, s32 arg2) { f32 temp_fs1; s32 i; RCP_SetupDL(&gMasterDisp, 0x53); for (temp_fs1 = 0.0f, i = 0; i < 3; i++, temp_fs1 += 12.0f) { - gDPSetPrimColor(gMasterDisp++, 0, 0, D_EBFBE0_801AF0D0[i], D_EBFBE0_801AF0DC[i], D_EBFBE0_801AF0E8[i], 255); - Graphics_DisplaySmallText(temp_fs1 + arg1, arg2, 1.0f, 1.0f, D_EBFBE0_801AF0C4[i]); + gDPSetPrimColor(gMasterDisp++, 0, 0, D_menu_801AF0D0[i], D_menu_801AF0DC[i], D_menu_801AF0E8[i], 255); + Graphics_DisplaySmallText(temp_fs1 + arg1, arg2, 1.0f, 1.0f, D_menu_801AF0C4[i]); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - Graphics_DisplaySmallNumber(arg1 + temp_fs1 - ((func_8008BCBC(D_EBFBE0_801B81A8[arg0][i]) - 1) * 8), - arg2 + 9.0f, D_EBFBE0_801B81A8[arg0][i]); + Graphics_DisplaySmallNumber(arg1 + temp_fs1 - ((func_8008BCBC(D_menu_801B81A8[arg0][i]) - 1) * 8), arg2 + 9.0f, + D_menu_801B81A8[arg0][i]); } } -void func_EBFBE0_80198164(s32 arg0, f32 arg1, f32 arg2) { +void func_menu_80198164(s32 arg0, f32 arg1, f32 arg2) { f32 temp = 16.0f; s32 temp_s2 = gSaveFile.save.data.unk_36[arg0]; f32 var_fs2; s32 i; for (var_fs2 = 0.0f, i = 0; i < 7; i++, var_fs2 += 24.0f + temp) { - func_EBFBE0_801982B0(arg0, i, 28.0f + var_fs2, arg1, temp_s2); + func_menu_801982B0(arg0, i, 28.0f + var_fs2, arg1, temp_s2); if (i < temp_s2) { - func_EBFBE0_8019882C(arg0, i, 28.0f + var_fs2, arg1); - func_EBFBE0_801984D0(arg0, i, 28.0f + var_fs2, arg1); - func_EBFBE0_80198608(arg0, i, 28.0f + var_fs2, arg1); + func_menu_8019882C(arg0, i, 28.0f + var_fs2, arg1); + func_menu_801984D0(arg0, i, 28.0f + var_fs2, arg1); + func_menu_80198608(arg0, i, 28.0f + var_fs2, arg1); } } if ((arg2 < 75.0f) && (arg2 > -80.0f)) { - func_EBFBE0_8019896C(arg0, arg2, temp_s2); + func_menu_8019896C(arg0, arg2, temp_s2); } } -void func_EBFBE0_801982B0(s32 arg0, s32 arg1, f32 arg2, f32 arg3, s32 arg4) { +void func_menu_801982B0(s32 arg0, s32 arg1, f32 arg2, f32 arg3, s32 arg4) { s32 r; s32 g; s32 b; @@ -2328,7 +2324,7 @@ void func_EBFBE0_801982B0(s32 arg0, s32 arg1, f32 arg2, f32 arg3, s32 arg4) { temp1 = gSaveFile.save.data.unk_5E[arg0][arg1].unk_8 & 15; temp2 = gSaveFile.save.data.unk_5E[arg0][arg1 + 1].unk_8 & 15; - temp_v0 = func_EBFBE0_80199284(temp1, temp2); + temp_v0 = func_menu_80199284(temp1, temp2); g = 255; b = 255; @@ -2361,7 +2357,7 @@ void func_EBFBE0_801982B0(s32 arg0, s32 arg1, f32 arg2, f32 arg3, s32 arg4) { } } -void func_EBFBE0_801984D0(s32 arg0, s32 arg1, f32 arg2, f32 arg3) { +void func_menu_801984D0(s32 arg0, s32 arg1, f32 arg2, f32 arg3) { s32 sp1C; if ((arg3 > 22.0f) && (arg3 < 162.0f)) { @@ -2373,7 +2369,7 @@ void func_EBFBE0_801984D0(s32 arg0, s32 arg1, f32 arg2, f32 arg3) { } } -void func_EBFBE0_80198608(s32 arg0, s32 arg1, f32 arg2, f32 arg3) { +void func_menu_80198608(s32 arg0, s32 arg1, f32 arg2, f32 arg3) { f32 var_fs1; s32 sp90[3]; s32 i; @@ -2389,21 +2385,21 @@ void func_EBFBE0_80198608(s32 arg0, s32 arg1, f32 arg2, f32 arg3) { if (sp90[i] == 0) { continue; } - gDPSetPrimColor(gMasterDisp++, 0, 0, D_EBFBE0_801AF0D0[i], D_EBFBE0_801AF0DC[i], D_EBFBE0_801AF0E8[i], 255); + gDPSetPrimColor(gMasterDisp++, 0, 0, D_menu_801AF0D0[i], D_menu_801AF0DC[i], D_menu_801AF0E8[i], 255); Graphics_DisplaySmallText(arg2 + var_fs1 - 1.0f, arg3 + 24.0f + 8.0f + 1.0f, 1.0f, 1.0f, - D_EBFBE0_801AF0C4[i]); + D_menu_801AF0C4[i]); } } } -void func_EBFBE0_8019882C(s32 arg0, s32 arg1, f32 arg2, f32 arg3) { +void func_menu_8019882C(s32 arg0, s32 arg1, f32 arg2, f32 arg3) { s32 temp; char* sp20; f32 temp2; if ((arg3 > 58.0f) && (arg3 < 197.0f)) { temp = gSaveFile.save.data.unk_5E[arg0][arg1].unk_8 & 0xF; - sp20 = D_EBFBE0_801AEEAC[temp]; + sp20 = D_menu_801AEEAC[temp]; RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255); temp2 = Graphics_GetSmallTextWidth(sp20) / 2.0f; @@ -2411,10 +2407,10 @@ void func_EBFBE0_8019882C(s32 arg0, s32 arg1, f32 arg2, f32 arg3) { } } -void func_EBFBE0_8019896C(s32 arg0, f32 y, s32 arg2) { - static f32 D_EBFBE0_801AF130 = 0.0f; - static f32 D_EBFBE0_801AF134 = -121.0f; - static f32 D_EBFBE0_801AF138 = 40.1f; +void func_menu_8019896C(s32 arg0, f32 y, s32 arg2) { + static f32 D_menu_801AF130 = 0.0f; + static f32 D_menu_801AF134 = -121.0f; + static f32 D_menu_801AF138 = 40.1f; s32 i; s32 data; s32 spFC; @@ -2429,7 +2425,7 @@ void func_EBFBE0_8019896C(s32 arg0, f32 y, s32 arg2) { Lib_Ortho(&gMasterDisp); spFC = gSaveFile.save.data.unk_4A[arg0]; - for (x = D_EBFBE0_801AF134, i = 0; i < arg2; i++, x += D_EBFBE0_801AF138) { + for (x = D_menu_801AF134, i = 0; i < arg2; i++, x += D_menu_801AF138) { data = gSaveFile.save.data.unk_5E[arg0][i].unk_8 & 15; switch (data) { @@ -2441,16 +2437,16 @@ void func_EBFBE0_8019896C(s32 arg0, f32 y, s32 arg2) { Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, x, y, 0.0f, 1); - Matrix_RotateZ(gGfxMatrix, M_DTOR * D_EBFBE0_801AF130, 1); + Matrix_RotateZ(gGfxMatrix, M_DTOR * D_menu_801AF130, 1); Matrix_Scale(gGfxMatrix, 0.3f, 0.3f, 0.3f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_EBFBE0_801AEE6C[data]); + gSPDisplayList(gMasterDisp++, D_menu_801AEE6C[data]); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 128); gDPSetEnvColor(gMasterDisp++, 31, 0, 0, 0); Matrix_Scale(gGfxMatrix, 0.8f, 0.8f, 0.8f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_EBFBE0_801AEE6C[data]); + gSPDisplayList(gMasterDisp++, D_menu_801AEE6C[data]); Matrix_Pop(&gGfxMatrix); break; @@ -2464,12 +2460,12 @@ void func_EBFBE0_8019896C(s32 arg0, f32 y, s32 arg2) { Matrix_Scale(gGfxMatrix, 0.3f, 0.3f, 0.3f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_EBFBE0_801AEE6C[data]); + gSPDisplayList(gMasterDisp++, D_menu_801AEE6C[data]); Matrix_Translate(gGfxMatrix, 18.0f, -20.0f, 0.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_EBFBE0_801AEE6C[data]); + gSPDisplayList(gMasterDisp++, D_menu_801AEE6C[data]); Matrix_Pop(&gGfxMatrix); break; @@ -2486,7 +2482,7 @@ void func_EBFBE0_8019896C(s32 arg0, f32 y, s32 arg2) { Matrix_Scale(gGfxMatrix, 0.3f, 0.3f, 0.3f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_EBFBE0_801AEE6C[data]); + gSPDisplayList(gMasterDisp++, D_menu_801AEE6C[data]); Matrix_Pop(&gGfxMatrix); break; @@ -2501,7 +2497,7 @@ void func_EBFBE0_8019896C(s32 arg0, f32 y, s32 arg2) { Matrix_Scale(gGfxMatrix, 0.01f, 0.01f, 0.01f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_EBFBE0_801AEE6C[data]); + gSPDisplayList(gMasterDisp++, D_menu_801AEE6C[data]); Matrix_Pop(&gGfxMatrix); break; @@ -2516,7 +2512,7 @@ void func_EBFBE0_8019896C(s32 arg0, f32 y, s32 arg2) { Matrix_Scale(gGfxMatrix, 0.01f, 0.01f, 0.01f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_EBFBE0_801AEE6C[data]); + gSPDisplayList(gMasterDisp++, D_menu_801AEE6C[data]); Matrix_Pop(&gGfxMatrix); break; @@ -2531,7 +2527,7 @@ void func_EBFBE0_8019896C(s32 arg0, f32 y, s32 arg2) { Matrix_Scale(gGfxMatrix, 0.3f, 0.3f, 0.3f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_EBFBE0_801AEE6C[data]); + gSPDisplayList(gMasterDisp++, D_menu_801AEE6C[data]); if ((data != 14) && (data != 15) && (data != 11)) { if (data == 7) { @@ -2540,7 +2536,7 @@ void func_EBFBE0_8019896C(s32 arg0, f32 y, s32 arg2) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); } Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_EBFBE0_801B4A40); + gSPDisplayList(gMasterDisp++, D_menu_801B4A40); } Matrix_Scale(gGfxMatrix, 1.6f, 1.6f, 1.6f, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -2553,53 +2549,53 @@ void func_EBFBE0_8019896C(s32 arg0, f32 y, s32 arg2) { spF4 = (spFC >> i) & 1; if (spF4 != 0) { - func_EBFBE0_80199198(x, y, 0.0f); + func_menu_80199198(x, y, 0.0f); } } Matrix_Pop(&gGfxMatrix); - func_EBFBE0_80192738(); + func_menu_80192738(); - D_EBFBE0_801AF130 += 0.1f; + D_menu_801AF130 += 0.1f; Lib_Perspective(&gMasterDisp); } -static f32 D_EBFBE0_801AF13C = 0.7f; -static f32 D_EBFBE0_801AF140 = 11.0f; -static f32 D_EBFBE0_801AF144 = 2.7f; +static f32 D_menu_801AF13C = 0.7f; +static f32 D_menu_801AF140 = 11.0f; +static f32 D_menu_801AF144 = 2.7f; -void func_EBFBE0_80199198(f32 arg0, f32 arg1, f32 arg2) { +void func_menu_80199198(f32 arg0, f32 arg1, f32 arg2) { RCP_SetupDL(&gMasterDisp, 0x35); Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, arg0 - D_EBFBE0_801AF140, arg1 + D_EBFBE0_801AF144, arg2, 1); - Matrix_Scale(gGfxMatrix, D_EBFBE0_801AF13C, D_EBFBE0_801AF13C, D_EBFBE0_801AF13C, 1); + Matrix_Translate(gGfxMatrix, arg0 - D_menu_801AF140, arg1 + D_menu_801AF144, arg2, 1); + Matrix_Scale(gGfxMatrix, D_menu_801AF13C, D_menu_801AF13C, D_menu_801AF13C, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_601D1F0); Matrix_Pop(&gGfxMatrix); } -s32 func_EBFBE0_80199284(s32 arg0, s32 arg1) { +s32 func_menu_80199284(s32 arg0, s32 arg1) { s32 i; for (i = 0; i < 24; i++) { - if ((D_EBFBE0_801AED4C[i].unk_0 == arg0) && (D_EBFBE0_801AED4C[i].unk_4 == arg1)) { + if ((D_menu_801AED4C[i].unk_0 == arg0) && (D_menu_801AED4C[i].unk_4 == arg1)) { break; } } - return D_EBFBE0_801AED4C[i].unk_8; + return D_menu_801AED4C[i].unk_8; } void Option_VersusMenuInit(void) { s32 i; - if (D_EBFBE0_801B91C4) { + if (D_menu_801B91C4) { func_8001D444(0, 56, 0, 255); } - D_EBFBE0_801B93D0 = D_EBFBE0_801B9124; + D_menu_801B93D0 = D_menu_801B9124; if (D_800D2870) { sOptionCardList[1].unk_00.unk_1C = 129.0f; @@ -2608,79 +2604,79 @@ void Option_VersusMenuInit(void) { D_801778A4 = 3; - D_EBFBE0_801B9340 = 2; + D_menu_801B9340 = 2; D_80161A28 = 0; D_80178410 = 0; - D_EBFBE0_801B93C4 = 0; + D_menu_801B93C4 = 0; for (i = 0; i < 4; i++) { gPlayerInactive[i] = false; if (gControllerPlugged[i] == 0) { gPlayerInactive[i] = true; - D_EBFBE0_801B93C4 |= 1 << i; + D_menu_801B93C4 |= 1 << i; } - D_EBFBE0_801B9358[i] = 255.0f; - D_EBFBE0_801B93A0[i].unk_0 = 0; - D_EBFBE0_801B93A0[i].unk_4 = 0; + D_menu_801B9358[i] = 255.0f; + D_menu_801B93A0[i].unk_0 = 0; + D_menu_801B93A0[i].unk_4 = 0; } - D_EBFBE0_801B91E8 = 255.0f; + D_menu_801B91E8 = 255.0f; } void Option_VersusMenuUpdate(void) { - switch (D_EBFBE0_801B912C) { + switch (D_menu_801B912C) { case 0: - func_EBFBE0_8019949C(); + func_menu_8019949C(); break; case 1: - if (D_EBFBE0_801B91EC == 0.0f) { - D_EBFBE0_801B9124 = 2000; + if (D_menu_801B91EC == 0.0f) { + D_menu_801B9124 = 2000; Option_InitEntry(); } break; } } -void func_EBFBE0_8019949C(void) { +void func_menu_8019949C(void) { s32 i; for (i = 0; i < 4; i++) { - if (!(D_EBFBE0_801B93C4 & (1 << i))) { - func_EBFBE0_8019C824(&D_EBFBE0_801B9358[i]); - if (func_EBFBE0_8019C418(&D_EBFBE0_801AED3C[i], 2, 0, 0, 20, 2, 4, i, &D_EBFBE0_801B93A0[i])) { + if (!(D_menu_801B93C4 & (1 << i))) { + func_menu_8019C824(&D_menu_801B9358[i]); + if (func_menu_8019C418(&D_menu_801AED3C[i], 2, 0, 0, 20, 2, 4, i, &D_menu_801B93A0[i])) { Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } } if (gControllerPress[i].button & A_BUTTON) { - if (D_EBFBE0_801B93C4 == 15) { + if (D_menu_801B93C4 == 15) { Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B91EC = 10; - D_EBFBE0_801B912C++; + D_menu_801B91EC = 10; + D_menu_801B912C++; break; } else { - if (!(D_EBFBE0_801B93C4 & (1 << i))) { + if (!(D_menu_801B93C4 & (1 << i))) { Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - gHandicap[i] = D_EBFBE0_801AED3C[i]; - D_EBFBE0_801B9358[i] = 255.0f; - D_EBFBE0_801B9348[i] = 10; - D_EBFBE0_801B93C4 = D_EBFBE0_801B93C4 | (1 << i); + gHandicap[i] = D_menu_801AED3C[i]; + D_menu_801B9358[i] = 255.0f; + D_menu_801B9348[i] = 10; + D_menu_801B93C4 = D_menu_801B93C4 | (1 << i); } } } if (gControllerPress[i].button & B_BUTTON) { - if (D_EBFBE0_801B93C4 & (1 << i)) { + if (D_menu_801B93C4 & (1 << i)) { Audio_PlaySfx(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B93C4 &= (1 << i) ^ 15; + D_menu_801B93C4 &= (1 << i) ^ 15; } else { func_8001D444(0, 36, 0, 255); Audio_PlaySfx(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - func_EBFBE0_8019B8A0(2); - D_EBFBE0_801B9248 = 1; + func_menu_8019B8A0(2); + D_menu_801B9248 = 1; break; } } @@ -2690,158 +2686,153 @@ void func_EBFBE0_8019949C(void) { void Option_VersusMenuDraw(void) { s32 i; - func_EBFBE0_8019B8C8(); - func_EBFBE0_80199EA8(); + func_menu_8019B8C8(); + func_menu_80199EA8(); for (i = 0; i < 4; i++) { if (gControllerPlugged[i] == 1) { - func_EBFBE0_80199820(i); + func_menu_80199820(i); } } - if (D_EBFBE0_801B93C4 == 15) { - func_EBFBE0_8019B5AC(); + if (D_menu_801B93C4 == 15) { + func_menu_8019B5AC(); } } -static f32 D_EBFBE0_801AF148[4] = { 30.0f, 214.0f, 30.0f, 215.0f }; -static f32 D_EBFBE0_801AF158[4] = { 18.0f, 18.0f, 151.0f, 151.0f }; -static s32 D_EBFBE0_801AF168[4] = { 56, 48, 56, 48 }; -static s32 D_EBFBE0_801AF178[4] = { 8, 10, 10, 8 }; -static f32 D_EBFBE0_801AF188[4] = { 12.0f, 16.0f, 12.0f, 18.0f }; -static f32 D_EBFBE0_801AF198 = -1.0f; -static f32 D_EBFBE0_801AF19C[4] = { 46.0f, 41.0f, 41.0f, 41.0f }; -static f32 D_EBFBE0_801AF1AC = 24.0f; -static f32 D_EBFBE0_801AF1B0 = 1.4f; -static f32 D_EBFBE0_801AF1B4 = 5.0f; -static f32 D_EBFBE0_801AF1B8 = 11.0f; -static f32 D_EBFBE0_801AF1BC = 8.0f; -static f32 D_EBFBE0_801AF1C0 = 45.0f; -static f32 D_EBFBE0_801AF1C4 = 20.0f; -static f32 D_EBFBE0_801AF1C8 = 55.0f; -static f32 D_EBFBE0_801AF1CC = 37.0f; -static f32 D_EBFBE0_801AF1D0 = 11.0f; -static f32 D_EBFBE0_801AF1D4 = 7.0f; -static f32 D_EBFBE0_801AF1D8 = 59.0f; -static f32 D_EBFBE0_801AF1DC = 58.0f; +static f32 D_menu_801AF148[4] = { 30.0f, 214.0f, 30.0f, 215.0f }; +static f32 D_menu_801AF158[4] = { 18.0f, 18.0f, 151.0f, 151.0f }; +static s32 D_menu_801AF168[4] = { 56, 48, 56, 48 }; +static s32 D_menu_801AF178[4] = { 8, 10, 10, 8 }; +static f32 D_menu_801AF188[4] = { 12.0f, 16.0f, 12.0f, 18.0f }; +static f32 D_menu_801AF198 = -1.0f; +static f32 D_menu_801AF19C[4] = { 46.0f, 41.0f, 41.0f, 41.0f }; +static f32 D_menu_801AF1AC = 24.0f; +static f32 D_menu_801AF1B0 = 1.4f; +static f32 D_menu_801AF1B4 = 5.0f; +static f32 D_menu_801AF1B8 = 11.0f; +static f32 D_menu_801AF1BC = 8.0f; +static f32 D_menu_801AF1C0 = 45.0f; +static f32 D_menu_801AF1C4 = 20.0f; +static f32 D_menu_801AF1C8 = 55.0f; +static f32 D_menu_801AF1CC = 37.0f; +static f32 D_menu_801AF1D0 = 11.0f; +static f32 D_menu_801AF1D4 = 7.0f; +static f32 D_menu_801AF1D8 = 59.0f; +static f32 D_menu_801AF1DC = 58.0f; -void func_EBFBE0_80199820(s32 arg0) { +void func_menu_80199820(s32 arg0) { s32 var_v0; s32 var_a2; s32 colorGB; s32 i; - static u8* D_EBFBE0_801AF1E0[3] = { + static u8* D_menu_801AF1E0[3] = { (u8*) 0x070030B0, (u8*) 0x07003290, (u8*) 0x07003470, }; - static u8* D_EBFBE0_801AF1EC[4] = { + static u8* D_menu_801AF1EC[4] = { (u8*) 0x070049C0, (u8*) 0x07004BB0, (u8*) 0x07004DC0, (u8*) 0x07005020, }; - static u16* D_EBFBE0_801AF1FC[4] = { + static u16* D_menu_801AF1FC[4] = { (u16*) 0x07004B80, (u16*) 0x07004D90, (u16*) 0x07004FF0, (u16*) 0x070051A0, }; - static u16* D_EBFBE0_801AF20C[4] = { + static u16* D_menu_801AF20C[4] = { (u16*) 0x07008EE0, (u16*) 0x0700AD20, (u16*) 0x0700CB60, (u16*) 0x070070A0, }; - static u8* D_EBFBE0_801AF21C[4] = { + static u8* D_menu_801AF21C[4] = { (u8*) 0x07000000, (u8*) 0x070000D0, (u8*) 0x07000210, (u8*) 0x07000350, }; - static s32 D_EBFBE0_801AF22C[4] = { 177, 255, 0, 30 }; - static s32 D_EBFBE0_801AF23C[4] = { 242, 30, 255, 30 }; - static s32 D_EBFBE0_801AF24C[4] = { 12, 0, 67, 255 }; + static s32 D_menu_801AF22C[4] = { 177, 255, 0, 30 }; + static s32 D_menu_801AF23C[4] = { 242, 30, 255, 30 }; + static s32 D_menu_801AF24C[4] = { 12, 0, 67, 255 }; RCP_SetupDL(&gMasterDisp, 0x55); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); for (i = 0; i < 4; i++) { - TextureRect_4bCI(&gMasterDisp, D_70118E0 + (80 * 16 * i) / 2, D_70123F8, 80, 16, D_EBFBE0_801AF148[arg0], - D_EBFBE0_801AF158[arg0] + (16.0f * i), 1.0f, 1.0f); + TextureRect_4bCI(&gMasterDisp, D_70118E0 + (80 * 16 * i) / 2, D_70123F8, 80, 16, D_menu_801AF148[arg0], + D_menu_801AF158[arg0] + (16.0f * i), 1.0f, 1.0f); } - TextureRect_4bCI(&gMasterDisp, D_70118E0 + (80 * 16 * 4) / 2, D_70123F8, 80, 7, D_EBFBE0_801AF148[arg0], - D_EBFBE0_801AF158[arg0] + (16.0f * 4), 1.0f, 1.0f); + TextureRect_4bCI(&gMasterDisp, D_70118E0 + (80 * 16 * 4) / 2, D_70123F8, 80, 7, D_menu_801AF148[arg0], + D_menu_801AF158[arg0] + (16.0f * 4), 1.0f, 1.0f); - gDPSetPrimColor(gMasterDisp++, 0, 0, D_EBFBE0_801AF22C[arg0], D_EBFBE0_801AF23C[arg0], D_EBFBE0_801AF24C[arg0], - 255); + gDPSetPrimColor(gMasterDisp++, 0, 0, D_menu_801AF22C[arg0], D_menu_801AF23C[arg0], D_menu_801AF24C[arg0], 255); - TextureRect_8bCI(&gMasterDisp, D_EBFBE0_801AF1EC[arg0], D_EBFBE0_801AF1FC[arg0], D_EBFBE0_801AF168[arg0], - D_EBFBE0_801AF178[arg0], D_EBFBE0_801AF148[arg0] + D_EBFBE0_801AF188[arg0], - D_EBFBE0_801AF158[arg0] + D_EBFBE0_801AF198, 1.0f, 1.0f); + TextureRect_8bCI(&gMasterDisp, D_menu_801AF1EC[arg0], D_menu_801AF1FC[arg0], D_menu_801AF168[arg0], + D_menu_801AF178[arg0], D_menu_801AF148[arg0] + D_menu_801AF188[arg0], + D_menu_801AF158[arg0] + D_menu_801AF198, 1.0f, 1.0f); RCP_SetupDL(&gMasterDisp, 0x53); var_v0 = 0xFFFFFFFF; - if (D_EBFBE0_801B9348[arg0] != 0) { + if (D_menu_801B9348[arg0] != 0) { var_v0 = 1; - D_EBFBE0_801B9348[arg0]--; + D_menu_801B9348[arg0]--; } if (gFrameCount & var_v0) { - colorGB = D_EBFBE0_801B9358[arg0]; + colorGB = D_menu_801B9358[arg0]; gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255); - TextureRect_8bIA(&gMasterDisp, D_7001030, 64, 9, D_EBFBE0_801AF148[arg0] + D_EBFBE0_801AF1BC, - D_EBFBE0_801AF158[arg0] + D_EBFBE0_801AF1C0, 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_7001030, 64, 9, D_menu_801AF148[arg0] + D_menu_801AF1BC, + D_menu_801AF158[arg0] + D_menu_801AF1C0, 1.0f, 1.0f); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255); - TextureRect_8bIA(&gMasterDisp, D_EBFBE0_801AF1E0[D_EBFBE0_801AED3C[arg0]], 40, 12, - D_EBFBE0_801AF148[arg0] + D_EBFBE0_801AF1C4, D_EBFBE0_801AF158[arg0] + D_EBFBE0_801AF1C8, 1.0f, - 1.0f); + TextureRect_8bIA(&gMasterDisp, D_menu_801AF1E0[D_menu_801AED3C[arg0]], 40, 12, + D_menu_801AF148[arg0] + D_menu_801AF1C4, D_menu_801AF158[arg0] + D_menu_801AF1C8, 1.0f, 1.0f); } gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - TextureRect_8bIA_MirX(&gMasterDisp, D_800E130, 8, 8, D_EBFBE0_801AF148[arg0] + D_EBFBE0_801AF1D4, - D_EBFBE0_801AF158[arg0] + D_EBFBE0_801AF1DC, 1.0f, 1.0f); + TextureRect_8bIA_MirX(&gMasterDisp, D_800E130, 8, 8, D_menu_801AF148[arg0] + D_menu_801AF1D4, + D_menu_801AF158[arg0] + D_menu_801AF1DC, 1.0f, 1.0f); - TextureRect_8bIA(&gMasterDisp, D_800E130, 8, 8, D_EBFBE0_801AF148[arg0] + D_EBFBE0_801AF1D8, - D_EBFBE0_801AF158[arg0] + D_EBFBE0_801AF1DC, 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_800E130, 8, 8, D_menu_801AF148[arg0] + D_menu_801AF1D8, + D_menu_801AF158[arg0] + D_menu_801AF1DC, 1.0f, 1.0f); - TextureRect_8bIA(&gMasterDisp, D_7000F10, 40, 7, D_EBFBE0_801AF148[arg0] + D_EBFBE0_801AF1CC, - D_EBFBE0_801AF158[arg0] + D_EBFBE0_801AF1D0, 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_7000F10, 40, 7, D_menu_801AF148[arg0] + D_menu_801AF1CC, + D_menu_801AF158[arg0] + D_menu_801AF1D0, 1.0f, 1.0f); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); for (i = 0; i < 2; i++) { - TextureRect_16bRGBA(&gMasterDisp, D_EBFBE0_801AF20C[arg0] + (44 * i * 20), 44, 20, - D_EBFBE0_801AF148[arg0] + D_EBFBE0_801AF1B4, - D_EBFBE0_801AF158[arg0] + D_EBFBE0_801AF1B8 + (i * 20.0f * 0.7f), 0.7f, 0.7f); + TextureRect_16bRGBA(&gMasterDisp, D_menu_801AF20C[arg0] + (44 * i * 20), 44, 20, + D_menu_801AF148[arg0] + D_menu_801AF1B4, + D_menu_801AF158[arg0] + D_menu_801AF1B8 + (i * 20.0f * 0.7f), 0.7f, 0.7f); } - TextureRect_16bRGBA(&gMasterDisp, D_EBFBE0_801AF20C[arg0] + 1760, 44, 4, - D_EBFBE0_801AF148[arg0] + D_EBFBE0_801AF1B4, - D_EBFBE0_801AF158[arg0] + D_EBFBE0_801AF1B8 + 28.0f, 0.7f, 0.7f); + TextureRect_16bRGBA(&gMasterDisp, D_menu_801AF20C[arg0] + 1760, 44, 4, D_menu_801AF148[arg0] + D_menu_801AF1B4, + D_menu_801AF158[arg0] + D_menu_801AF1B8 + 28.0f, 0.7f, 0.7f); var_a2 = 24; if (arg0 == 0) { var_a2 = 16; } - gDPSetPrimColor(gMasterDisp++, 0, 0, D_EBFBE0_801AF22C[arg0], D_EBFBE0_801AF23C[arg0], D_EBFBE0_801AF24C[arg0], - 255); + gDPSetPrimColor(gMasterDisp++, 0, 0, D_menu_801AF22C[arg0], D_menu_801AF23C[arg0], D_menu_801AF24C[arg0], 255); - TextureRect_8bIA(&gMasterDisp, D_EBFBE0_801AF21C[arg0], var_a2, 13, - D_EBFBE0_801AF148[arg0] + D_EBFBE0_801AF19C[arg0], D_EBFBE0_801AF158[arg0] + D_EBFBE0_801AF1AC, - D_EBFBE0_801AF1B0, D_EBFBE0_801AF1B0); + TextureRect_8bIA(&gMasterDisp, D_menu_801AF21C[arg0], var_a2, 13, D_menu_801AF148[arg0] + D_menu_801AF19C[arg0], + D_menu_801AF158[arg0] + D_menu_801AF1AC, D_menu_801AF1B0, D_menu_801AF1B0); } -void func_EBFBE0_80199EA8(void) { +void func_menu_80199EA8(void) { s32 i; RCP_SetupDL_76(); @@ -2853,122 +2844,122 @@ void func_EBFBE0_80199EA8(void) { } } -// D_EBFBE0_801B9358 needs to be static but belongs to bss section? +// D_menu_801B9358 needs to be static but belongs to bss section? #if defined(IMPORT_BSS) || defined(NON_MATCHING) void Option_VersusStageInit(void) { s32 i; D_80178410 = 0; - D_EBFBE0_801B933C = 0; - D_EBFBE0_801B91E8 = 255.0f; - D_EBFBE0_801B93D4 = D_801778A4 - 1; - D_EBFBE0_801B93D8 = D_80161A28; - D_EBFBE0_801B93DC = D_EBFBE0_801B9340; - D_801778C8 = D_EBFBE0_801B93DC; + D_menu_801B933C = 0; + D_menu_801B91E8 = 255.0f; + D_menu_801B93D4 = D_801778A4 - 1; + D_menu_801B93D8 = D_80161A28; + D_menu_801B93DC = D_menu_801B9340; + D_801778C8 = D_menu_801B93DC; for (i = 0; i < 4; i++) { - D_EBFBE0_801B9358[i] = 0; + D_menu_801B9358[i] = 0; } - D_EBFBE0_801B936C = 0; - D_EBFBE0_801B9374 = 0; - D_EBFBE0_801B937C = 0; - D_EBFBE0_801B91EC = 0; - D_EBFBE0_801B91F0 = 0; - D_EBFBE0_801B9368 = 255.0f; - D_EBFBE0_801B9370 = 255.0f; - D_EBFBE0_801B9378 = 255.0f; - func_EBFBE0_8019A080(); + D_menu_801B936C = 0; + D_menu_801B9374 = 0; + D_menu_801B937C = 0; + D_menu_801B91EC = 0; + D_menu_801B91F0 = 0; + D_menu_801B9368 = 255.0f; + D_menu_801B9370 = 255.0f; + D_menu_801B9378 = 255.0f; + func_menu_8019A080(); } #else #pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_menu/fox_option/Option_VersusStageInit.s") #endif -// D_EBFBE0_801B9380 needs to be static but belongs to bss section? +// D_menu_801B9380 needs to be static but belongs to bss section? #if defined(IMPORT_BSS) || defined(NON_MATCHING) -void func_EBFBE0_8019A080(void) { +void func_menu_8019A080(void) { s32 i; for (i = 0; i < 4; i++) { - D_EBFBE0_801B9380[i].unk_0 = 0; - D_EBFBE0_801B9380[i].unk_4 = 0; + D_menu_801B9380[i].unk_0 = 0; + D_menu_801B9380[i].unk_4 = 0; } } #else -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_menu/fox_option/func_EBFBE0_8019A080.s") +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_menu/fox_option/func_menu_8019A080.s") #endif void Option_VersusStageUpdate(void) { - switch (D_EBFBE0_801B93D0) { + switch (D_menu_801B93D0) { case OPTION_POINT_MATCH: - func_EBFBE0_8019A124(); + func_menu_8019A124(); break; case OPTION_BR_MATCH: - func_EBFBE0_8019A1A8(); + func_menu_8019A1A8(); break; case OPTION_TT_MATCH: - func_EBFBE0_8019A214(); + func_menu_8019A214(); break; } } -void func_EBFBE0_8019A124(void) { - switch (D_EBFBE0_801B912C) { +void func_menu_8019A124(void) { + switch (D_menu_801B912C) { case 0: - func_EBFBE0_8019A2E0(); + func_menu_8019A2E0(); break; case 1: - func_EBFBE0_8019A6DC(); + func_menu_8019A6DC(); break; case 2: - func_EBFBE0_8019A954(); + func_menu_8019A954(); break; case 3: - func_EBFBE0_8019A298(); + func_menu_8019A298(); break; } } -void func_EBFBE0_8019A1A8(void) { - switch (D_EBFBE0_801B912C) { +void func_menu_8019A1A8(void) { + switch (D_menu_801B912C) { case 0: - func_EBFBE0_8019A6DC(); + func_menu_8019A6DC(); break; case 1: - func_EBFBE0_8019A954(); + func_menu_8019A954(); break; case 2: - func_EBFBE0_8019A298(); + func_menu_8019A298(); break; } } -void func_EBFBE0_8019A214(void) { - switch (D_EBFBE0_801B912C) { +void func_menu_8019A214(void) { + switch (D_menu_801B912C) { case 0: - func_EBFBE0_8019A4DC(); + func_menu_8019A4DC(); break; case 1: - func_EBFBE0_8019A6DC(); + func_menu_8019A6DC(); break; case 2: - func_EBFBE0_8019A954(); + func_menu_8019A954(); break; case 3: - func_EBFBE0_8019A298(); + func_menu_8019A298(); break; } } -void func_EBFBE0_8019A298(void) { - if (D_EBFBE0_801B91EC == 0.0f) { +void func_menu_8019A298(void) { + if (D_menu_801B91EC == 0.0f) { gGameState = GSTATE_VS_INIT; D_Timer_8017783C = 2; gOptionMenuStatus = OPTION_WAIT; @@ -2976,16 +2967,16 @@ void func_EBFBE0_8019A298(void) { } } -void func_EBFBE0_8019A2E0(void) { +void func_menu_8019A2E0(void) { s32 i; - if (D_EBFBE0_801B936C != 0) { + if (D_menu_801B936C != 0) { return; } - if (D_EBFBE0_801B91F0) { - D_EBFBE0_801B912C++; - D_EBFBE0_801B91F0 = 0; + if (D_menu_801B91F0) { + D_menu_801B912C++; + D_menu_801B91F0 = 0; return; } @@ -2994,38 +2985,38 @@ void func_EBFBE0_8019A2E0(void) { continue; } - if (func_EBFBE0_8019C418(&D_EBFBE0_801B93D4, 4, 0, 0, 20, 2, 4, i, &D_EBFBE0_801B9380[i])) { + if (func_menu_8019C418(&D_menu_801B93D4, 4, 0, 0, 20, 2, 4, i, &D_menu_801B9380[i])) { Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_801778A4 = D_EBFBE0_801B93D4 + 1; + D_801778A4 = D_menu_801B93D4 + 1; } if (gControllerPress[i].button & A_BUTTON) { Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - func_EBFBE0_8019A080(); - D_EBFBE0_801B936C = 10; + func_menu_8019A080(); + D_menu_801B936C = 10; break; } if (gControllerPress[i].button & B_BUTTON) { Audio_PlaySfx(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B9124 = D_EBFBE0_801B93D0; - D_EBFBE0_801B91C4 = 0; + D_menu_801B9124 = D_menu_801B93D0; + D_menu_801B91C4 = 0; Option_InitEntry(); break; } } } -void func_EBFBE0_8019A4DC(void) { +void func_menu_8019A4DC(void) { s32 i; - if (D_EBFBE0_801B937C) { + if (D_menu_801B937C) { return; } - if (D_EBFBE0_801B91F0) { - D_EBFBE0_801B912C++; - D_EBFBE0_801B91F0 = 0; + if (D_menu_801B91F0) { + D_menu_801B912C++; + D_menu_801B91F0 = 0; return; } @@ -3034,40 +3025,40 @@ void func_EBFBE0_8019A4DC(void) { continue; } - if (func_EBFBE0_8019C418(&D_EBFBE0_801B93DC, 4, 0, 0, 20, 2, 4, i, &D_EBFBE0_801B9380[i])) { + if (func_menu_8019C418(&D_menu_801B93DC, 4, 0, 0, 20, 2, 4, i, &D_menu_801B9380[i])) { Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B9340 = D_EBFBE0_801B93DC; - D_801778C8 = D_EBFBE0_801B93DC; + D_menu_801B9340 = D_menu_801B93DC; + D_801778C8 = D_menu_801B93DC; } if (gControllerPress[i].button & A_BUTTON) { Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - func_EBFBE0_8019A080(); - D_EBFBE0_801B937C = 10; + func_menu_8019A080(); + D_menu_801B937C = 10; break; } if (gControllerPress[i].button & B_BUTTON) { Audio_PlaySfx(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B9124 = D_EBFBE0_801B93D0; - D_EBFBE0_801B91C4 = 0; + D_menu_801B9124 = D_menu_801B93D0; + D_menu_801B91C4 = 0; Option_InitEntry(); break; } } } -void func_EBFBE0_8019A6DC(void) { +void func_menu_8019A6DC(void) { s32 i; - if (D_EBFBE0_801B9374) { + if (D_menu_801B9374) { return; } - if (D_EBFBE0_801B91F0) { - D_EBFBE0_801B933C = 1; - D_EBFBE0_801B91F0 = 0; - D_EBFBE0_801B912C++; + if (D_menu_801B91F0) { + D_menu_801B933C = 1; + D_menu_801B91F0 = 0; + D_menu_801B912C++; return; } @@ -3075,54 +3066,54 @@ void func_EBFBE0_8019A6DC(void) { if (gControllerPlugged[i] == 0) { continue; } - if (func_EBFBE0_8019C418(&D_EBFBE0_801B93D8, 1, 0, 1, 20, 2, 4, i, &D_EBFBE0_801B9380[i])) { + if (func_menu_8019C418(&D_menu_801B93D8, 1, 0, 1, 20, 2, 4, i, &D_menu_801B9380[i])) { Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_80161A28 = D_EBFBE0_801B93D8; + D_80161A28 = D_menu_801B93D8; } if (gControllerPress[i].button & A_BUTTON) { Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); if (D_80161A28 == 0) { gVersusStage = VS_STAGE_CORNERIA; - if (D_EBFBE0_801B93D0 == 30) { + if (D_menu_801B93D0 == 30) { gVersusStage = VS_STAGE_KATINA; } } else { gVersusStage = VS_STAGE_SECTOR_Z; } - D_EBFBE0_801B9374 = 10; - func_EBFBE0_8019A080(); + D_menu_801B9374 = 10; + func_menu_8019A080(); break; } if (gControllerPress[i].button & B_BUTTON) { Audio_PlaySfx(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - if (D_EBFBE0_801B93D0 == 20) { - D_EBFBE0_801B9124 = D_EBFBE0_801B93D0; - D_EBFBE0_801B91C4 = 0; + if (D_menu_801B93D0 == 20) { + D_menu_801B9124 = D_menu_801B93D0; + D_menu_801B91C4 = 0; Option_InitEntry(); } else { - func_EBFBE0_8019A080(); - D_EBFBE0_801B91F0 = 0; - D_EBFBE0_801B912C--; + func_menu_8019A080(); + D_menu_801B91F0 = 0; + D_menu_801B912C--; } break; } } } -void func_EBFBE0_8019A954(void) { +void func_menu_8019A954(void) { s32 i; - if (D_EBFBE0_801B91EC) { + if (D_menu_801B91EC) { return; } - if (D_EBFBE0_801B91F0) { + if (D_menu_801B91F0) { - D_EBFBE0_801B91F0 = 0; - D_EBFBE0_801B912C++; + D_menu_801B91F0 = 0; + D_menu_801B912C++; return; } @@ -3133,43 +3124,43 @@ void func_EBFBE0_8019A954(void) { if (gControllerPress[i].button & A_BUTTON) { Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B91EC = 10; + D_menu_801B91EC = 10; break; } if (gControllerPress[i].button & B_BUTTON) { Audio_PlaySfx(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - func_EBFBE0_8019A080(); - D_EBFBE0_801B933C = 0; - D_EBFBE0_801B91F0 = 0; - D_EBFBE0_801B912C--; + func_menu_8019A080(); + D_menu_801B933C = 0; + D_menu_801B91F0 = 0; + D_menu_801B912C--; break; } } } void Option_VersusStageDraw(void) { - switch (D_EBFBE0_801B93D0) { + switch (D_menu_801B93D0) { case OPTION_BR_MATCH: break; case OPTION_POINT_MATCH: - func_EBFBE0_8019AB30(); + func_menu_8019AB30(); break; case OPTION_TT_MATCH: - func_EBFBE0_8019AD84(); + func_menu_8019AD84(); break; } - func_EBFBE0_8019AFFC(); + func_menu_8019AFFC(); - if (D_EBFBE0_801B933C != 0) { - func_EBFBE0_8019B5AC(); + if (D_menu_801B933C != 0) { + func_menu_8019B5AC(); } } -void func_EBFBE0_8019AB30(void) { +void func_menu_8019AB30(void) { s32 pad[5]; s32 colorGB; s32 sp44 = D_801778A4; @@ -3181,23 +3172,23 @@ void func_EBFBE0_8019AB30(void) { TextureRect_8bIA(&gMasterDisp, D_601B4B0, 24, 17, 94.0f, 43.0f, 5.0f, 1.1f); - if (D_EBFBE0_801B912C == 0) { - func_EBFBE0_8019B6D8(97.0f, 50.0f, 107.0f, 255, 255, 255); - func_EBFBE0_8019C824(&D_EBFBE0_801B9368); + if (D_menu_801B912C == 0) { + func_menu_8019B6D8(97.0f, 50.0f, 107.0f, 255, 255, 255); + func_menu_8019C824(&D_menu_801B9368); } else { - D_EBFBE0_801B9368 = 255.0f; + D_menu_801B9368 = 255.0f; } - colorGB = D_EBFBE0_801B9368; + colorGB = D_menu_801B9368; var_v0 = 0xFFFFFFFF; - if (D_EBFBE0_801B936C != 0) { + if (D_menu_801B936C != 0) { colorGB = 255; var_v0 = 1; - D_EBFBE0_801B936C--; - if (D_EBFBE0_801B936C == 0) { - D_EBFBE0_801B91F0 = 1; + D_menu_801B936C--; + if (D_menu_801B936C == 0) { + D_menu_801B91F0 = 1; } } @@ -3206,36 +3197,36 @@ void func_EBFBE0_8019AB30(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255); - TextureRect_8bIA(&gMasterDisp, D_EBFBE0_801AECF8[sp44], 16, 15, 109.0f, 45.0f, 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_menu_801AECF8[sp44], 16, 15, 109.0f, 45.0f, 1.0f, 1.0f); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255); TextureRect_8bIA(&gMasterDisp, D_7001DF0, 80, 10, 122.0f, 49.0f, 1.0f, 1.0f); } } -// extern f32 D_EBFBE0_801B9324; // in-function -// extern f32 D_EBFBE0_801B9328; //gap, in-function +// extern f32 D_menu_801B9324; // in-function +// extern f32 D_menu_801B9328; //gap, in-function -// extern f32 D_EBFBE0_801B9338; // in-function +// extern f32 D_menu_801B9338; // in-function // needs in function static #if defined(IMPORT_BSS) || defined(NON_MATCHING) #ifndef IMPORT_BSS -extern f32 D_EBFBE0_801B9324; -extern f32 D_EBFBE0_801B9328; -extern f32 D_EBFBE0_801B9338; +extern f32 D_menu_801B9324; +extern f32 D_menu_801B9328; +extern f32 D_menu_801B9338; #endif -void func_EBFBE0_8019AD84(void) { +void func_menu_8019AD84(void) { #ifdef IMPORT_BSS - static f32 D_EBFBE0_801B9324; - static f32 D_EBFBE0_801B9328; - static f32 D_EBFBE0_801B9338; + static f32 D_menu_801B9324; + static f32 D_menu_801B9328; + static f32 D_menu_801B9338; #endif s32 pad[2]; s32 colorGB; s32 var_v0; - static f32 D_EBFBE0_801AF25C[6] = { 156.0f, 112.0f, 112.0f, 112.0f, 112.0f, 112.0f }; - static f32 D_EBFBE0_801AF274[6] = { 46.0f, 43.0f, 43.0f, 43.0f, 43.0f, 43.0f }; - // D_EBFBE0_801AF28C + static f32 D_menu_801AF25C[6] = { 156.0f, 112.0f, 112.0f, 112.0f, 112.0f, 112.0f }; + static f32 D_menu_801AF274[6] = { 46.0f, 43.0f, 43.0f, 43.0f, 43.0f, 43.0f }; + // D_menu_801AF28C static u8* sTimeTrialMinuteTextures[] = { (u8*) 0x070024D0, (u8*) 0x07002730, (u8*) 0x07002990, (u8*) 0x07002BF0, (u8*) 0x07002E50, }; @@ -3246,26 +3237,26 @@ void func_EBFBE0_8019AD84(void) { TextureRect_8bIA(&gMasterDisp, D_601B4B0, 24, 17, 93.0f, 42.0f, 5.1f, 1.1f); - if (D_EBFBE0_801B912C == 0) { - D_EBFBE0_801B9324 = 97.0f; - D_EBFBE0_801B9328 = 49.0f; - D_EBFBE0_801B9338 = 107.0f; - func_EBFBE0_8019B6D8(D_EBFBE0_801B9324, D_EBFBE0_801B9328, D_EBFBE0_801B9338, 255, 255, 255); - func_EBFBE0_8019C824(&D_EBFBE0_801B9378); + if (D_menu_801B912C == 0) { + D_menu_801B9324 = 97.0f; + D_menu_801B9328 = 49.0f; + D_menu_801B9338 = 107.0f; + func_menu_8019B6D8(D_menu_801B9324, D_menu_801B9328, D_menu_801B9338, 255, 255, 255); + func_menu_8019C824(&D_menu_801B9378); } else { - D_EBFBE0_801B9378 = 255.0f; + D_menu_801B9378 = 255.0f; } - colorGB = D_EBFBE0_801B9378; + colorGB = D_menu_801B9378; var_v0 = 0xFFFFFFFF; - if (D_EBFBE0_801B937C != 0) { + if (D_menu_801B937C != 0) { colorGB = 255; var_v0 = 1; - D_EBFBE0_801B937C--; - if (!D_EBFBE0_801B937C) { - D_EBFBE0_801B91F0 = 1; + D_menu_801B937C--; + if (!D_menu_801B937C) { + D_menu_801B91F0 = 1; } } @@ -3274,65 +3265,64 @@ void func_EBFBE0_8019AD84(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255); - TextureRect_8bIA(&gMasterDisp, sTimeTrialMinuteTextures[D_EBFBE0_801B9340], 40, 15, - D_EBFBE0_801AF25C[D_EBFBE0_801B9340 + 1], D_EBFBE0_801AF274[D_EBFBE0_801B9340 + 1], 1.0f, - 1.0f); + TextureRect_8bIA(&gMasterDisp, sTimeTrialMinuteTextures[D_menu_801B9340], 40, 15, + D_menu_801AF25C[D_menu_801B9340 + 1], D_menu_801AF274[D_menu_801B9340 + 1], 1.0f, 1.0f); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255); - TextureRect_8bIA(&gMasterDisp, D_7002110, 80, 12, D_EBFBE0_801AF25C[0], D_EBFBE0_801AF274[0], 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_7002110, 80, 12, D_menu_801AF25C[0], D_menu_801AF274[0], 1.0f, 1.0f); } } #else -static f32 D_EBFBE0_801AF25C[6] = { 156.0f, 112.0f, 112.0f, 112.0f, 112.0f, 112.0f }; -static f32 D_EBFBE0_801AF274[6] = { 46.0f, 43.0f, 43.0f, 43.0f, 43.0f, 43.0f }; -// D_EBFBE0_801AF28C +static f32 D_menu_801AF25C[6] = { 156.0f, 112.0f, 112.0f, 112.0f, 112.0f, 112.0f }; +static f32 D_menu_801AF274[6] = { 46.0f, 43.0f, 43.0f, 43.0f, 43.0f, 43.0f }; +// D_menu_801AF28C static u8* sTimeTrialMinuteTextures[] = { (u8*) 0x070024D0, (u8*) 0x07002730, (u8*) 0x07002990, (u8*) 0x07002BF0, (u8*) 0x07002E50, }; -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_menu/fox_option/func_EBFBE0_8019AD84.s") +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_menu/fox_option/func_menu_8019AD84.s") #endif // needs in-function static data & bss #if defined(IMPORT_BSS) || defined(NON_MATCHING) #ifndef IMPORT_BSS -extern f32 D_EBFBE0_801B93C0; -extern f32 D_EBFBE0_801B93C8; -extern f32 D_EBFBE0_801B93CC; +extern f32 D_menu_801B93C0; +extern f32 D_menu_801B93C8; +extern f32 D_menu_801B93CC; #endif -void func_EBFBE0_8019AFFC(void) { - static f32 D_EBFBE0_801AF2A0 = 101.0f; - static f32 D_EBFBE0_801AF2A4 = 86.0f; +void func_menu_8019AFFC(void) { + static f32 D_menu_801AF2A0 = 101.0f; + static f32 D_menu_801AF2A4 = 86.0f; #ifdef IMPORT_BSS - static f32 D_EBFBE0_801B93C0; - static f32 D_EBFBE0_801B93C8; - static f32 D_EBFBE0_801B93CC; + static f32 D_menu_801B93C0; + static f32 D_menu_801B93C8; + static f32 D_menu_801B93CC; #endif s32 var_v0; s32 colorGB; - if ((D_EBFBE0_801B912C == 0 && D_EBFBE0_801B93D0 == 20) || (D_EBFBE0_801B912C == 1 && D_EBFBE0_801B93D0 != 20)) { - D_EBFBE0_801B93C0 = 94.0f; - D_EBFBE0_801B93C8 = 88.0f; - D_EBFBE0_801B93CC = 114.0f; + if ((D_menu_801B912C == 0 && D_menu_801B93D0 == 20) || (D_menu_801B912C == 1 && D_menu_801B93D0 != 20)) { + D_menu_801B93C0 = 94.0f; + D_menu_801B93C8 = 88.0f; + D_menu_801B93CC = 114.0f; RCP_SetupDL(&gMasterDisp, 0x53); - func_EBFBE0_8019B6D8(D_EBFBE0_801B93C0, D_EBFBE0_801B93C8, D_EBFBE0_801B93CC, 255, 255, 255); - func_EBFBE0_8019C824(&D_EBFBE0_801B9370); + func_menu_8019B6D8(D_menu_801B93C0, D_menu_801B93C8, D_menu_801B93CC, 255, 255, 255); + func_menu_8019C824(&D_menu_801B9370); } else { - D_EBFBE0_801B9370 = 255.0f; + D_menu_801B9370 = 255.0f; } - colorGB = D_EBFBE0_801B9370; + colorGB = D_menu_801B9370; var_v0 = 0xFFFFFFFF; - if (D_EBFBE0_801B9374 != 0) { + if (D_menu_801B9374 != 0) { var_v0 = 1; colorGB = 255; - D_EBFBE0_801B9374--; - if (!D_EBFBE0_801B9374) { - D_EBFBE0_801B91F0 = 1; + D_menu_801B9374--; + if (!D_menu_801B9374) { + D_menu_801B91F0 = 1; } } @@ -3341,35 +3331,35 @@ void func_EBFBE0_8019AFFC(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255); - TextureRect_8bIA(&gMasterDisp, D_7001270, 112, 12, D_EBFBE0_801AF2A0, D_EBFBE0_801AF2A4, 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_7001270, 112, 12, D_menu_801AF2A0, D_menu_801AF2A4, 1.0f, 1.0f); } - if (D_EBFBE0_801B93D0 == 30) { - func_EBFBE0_8019B1F8(); + if (D_menu_801B93D0 == 30) { + func_menu_8019B1F8(); } else { - func_EBFBE0_8019B3DC(); + func_menu_8019B3DC(); } } #else -static f32 D_EBFBE0_801AF2A0 = 101.0f; -static f32 D_EBFBE0_801AF2A4 = 86.0f; -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_menu/fox_option/func_EBFBE0_8019AFFC.s") +static f32 D_menu_801AF2A0 = 101.0f; +static f32 D_menu_801AF2A4 = 86.0f; +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_menu/fox_option/func_menu_8019AFFC.s") #endif -void func_EBFBE0_8019B1F8(void) { - static f32 D_EBFBE0_801AF2A8 = 69.0f; - static f32 D_EBFBE0_801AF2AC = 110.0f; - static f32 D_EBFBE0_801AF2B0 = 123.0f; - static f32 D_EBFBE0_801AF2B4[] = { 72.0f, 189.0f }; +void func_menu_8019B1F8(void) { + static f32 D_menu_801AF2A8 = 69.0f; + static f32 D_menu_801AF2AC = 110.0f; + static f32 D_menu_801AF2B0 = 123.0f; + static f32 D_menu_801AF2B4[] = { 72.0f, 189.0f }; f32 xPos; s32 i; s32 width; s32 sp8C[2]; - static u8* D_EBFBE0_801AF2BC[] = { (u8*) 0x07001C10, (u8*) 0x070019E0 }; - static u8* D_EBFBE0_801AF2C4[] = { (u8*) 0x07006780, (u8*) 0x07005F10 }; - static u16* D_EBFBE0_801AF2CC[] = { (u16*) 0x07006EA0, (u16*) 0x07006630 }; + static u8* D_menu_801AF2BC[] = { (u8*) 0x07001C10, (u8*) 0x070019E0 }; + static u8* D_menu_801AF2C4[] = { (u8*) 0x07006780, (u8*) 0x07005F10 }; + static u16* D_menu_801AF2CC[] = { (u16*) 0x07006EA0, (u16*) 0x07006630 }; - for (xPos = D_EBFBE0_801AF2A8, i = 0; i < 2; i++, xPos += D_EBFBE0_801AF2B0) { + for (xPos = D_menu_801AF2A8, i = 0; i < 2; i++, xPos += D_menu_801AF2B0) { if (i == D_80161A28) { sp8C[i] = 255; } else { @@ -3380,8 +3370,8 @@ void func_EBFBE0_8019B1F8(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, sp8C[i]); - TextureRect_8bCI(&gMasterDisp, D_EBFBE0_801AF2C4[i], D_EBFBE0_801AF2CC[i], 48, 38, xPos, D_EBFBE0_801AF2AC, - 1.0f, 1.0f); + TextureRect_8bCI(&gMasterDisp, D_menu_801AF2C4[i], D_menu_801AF2CC[i], 48, 38, xPos, D_menu_801AF2AC, 1.0f, + 1.0f); width = 48; if (i == 1) { @@ -3389,33 +3379,33 @@ void func_EBFBE0_8019B1F8(void) { } RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 0xff, 0xff, 0xff, sp8C[i]); - TextureRect_8bIA(&gMasterDisp, D_EBFBE0_801AF2BC[i], width, 10, D_EBFBE0_801AF2B4[i], D_EBFBE0_801AF2AC + 40.0f, - 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_menu_801AF2BC[i], width, 10, D_menu_801AF2B4[i], D_menu_801AF2AC + 40.0f, 1.0f, + 1.0f); } } -void func_EBFBE0_8019B3DC(void) { - static f32 D_EBFBE0_801AF2D4 = 69.0f; - static f32 D_EBFBE0_801AF2D8 = 110.0f; - static f32 D_EBFBE0_801AF2DC = 123.0f; - static f32 D_EBFBE0_801AF2E0[] = { 66.0f, 189.0f }; +void func_menu_8019B3DC(void) { + static f32 D_menu_801AF2D4 = 69.0f; + static f32 D_menu_801AF2D8 = 110.0f; + static f32 D_menu_801AF2DC = 123.0f; + static f32 D_menu_801AF2E0[] = { 66.0f, 189.0f }; f32 xPos; s32 i; s32 sp8C[3]; - static u8* D_EBFBE0_801AF2E8[] = { + static u8* D_menu_801AF2E8[] = { (u8*) 0x070017B0, (u8*) 0x070019E0, }; - static u8* D_EBFBE0_801AF2F0[] = { + static u8* D_menu_801AF2F0[] = { (u8*) 0x07005600, (u8*) 0x07005F10, }; - static u16* D_EBFBE0_801AF2F8[] = { + static u16* D_menu_801AF2F8[] = { (u16*) 0x07005D20, (u16*) 0x07006630, }; - for (xPos = D_EBFBE0_801AF2D4, i = 0; i < 2; i++, xPos += D_EBFBE0_801AF2DC) { + for (xPos = D_menu_801AF2D4, i = 0; i < 2; i++, xPos += D_menu_801AF2DC) { if (i == D_80161A28) { sp8C[i] = 255; } else { @@ -3426,34 +3416,34 @@ void func_EBFBE0_8019B3DC(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, sp8C[i]); - TextureRect_8bCI(&gMasterDisp, D_EBFBE0_801AF2F0[i], D_EBFBE0_801AF2F8[i], 48, 38, xPos, D_EBFBE0_801AF2D8, - 1.0f, 1.0f); + TextureRect_8bCI(&gMasterDisp, D_menu_801AF2F0[i], D_menu_801AF2F8[i], 48, 38, xPos, D_menu_801AF2D8, 1.0f, + 1.0f); RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, sp8C[i]); - TextureRect_8bIA(&gMasterDisp, D_EBFBE0_801AF2E8[i], 56, 10, D_EBFBE0_801AF2E0[i], D_EBFBE0_801AF2D8 + 40.0f, - 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_menu_801AF2E8[i], 56, 10, D_menu_801AF2E0[i], D_menu_801AF2D8 + 40.0f, 1.0f, + 1.0f); } } -void func_EBFBE0_8019B5AC(void) { +void func_menu_8019B5AC(void) { s32 pad[2]; s32 colorGB; s32 var_v0; - func_EBFBE0_8019C824(&D_EBFBE0_801B91E8); + func_menu_8019C824(&D_menu_801B91E8); - colorGB = D_EBFBE0_801B91E8; + colorGB = D_menu_801B91E8; var_v0 = 0xFFFFFFFF; - if (D_EBFBE0_801B91EC) { + if (D_menu_801B91EC) { colorGB = 255; var_v0 = 1; - D_EBFBE0_801B91EC--; - if (D_EBFBE0_801B91EC == 0) { - D_EBFBE0_801B91F0 = 1; + D_menu_801B91EC--; + if (D_menu_801B91EC == 0) { + D_menu_801B91F0 = 1; } } @@ -3464,39 +3454,39 @@ void func_EBFBE0_8019B5AC(void) { } } -void func_EBFBE0_8019B6D8(f32 xPos, f32 yPos, f32 offset, s32 r, s32 g, s32 b) { +void func_menu_8019B6D8(f32 xPos, f32 yPos, f32 offset, s32 r, s32 g, s32 b) { RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, r, g, b, 255); TextureRect_8bIA_MirX(&gMasterDisp, D_7004010, 8, 8, xPos, yPos, 1.0f, 1.0f); TextureRect_8bIA(&gMasterDisp, D_7004010, 8, 8, xPos + offset, yPos, 1.0f, 1.0f); } -void func_EBFBE0_8019B7D4(void) { +void func_menu_8019B7D4(void) { RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); TextureRect_8bIA(&gMasterDisp, &D_80080F0, 96, 10, 62.0f, 213.0f, 1.0f, 1.0f); TextureRect_8bIA(&gMasterDisp, D_8006E50, 96, 10, 166.0f, 213.0f, 1.0f, 1.0f); } -void func_EBFBE0_8019B8A0(s32 arg0) { - D_EBFBE0_801B9124 = arg0; +void func_menu_8019B8A0(s32 arg0) { + D_menu_801B9124 = arg0; gDrawMode = DRAWMODE_0; - D_EBFBE0_801B912C = 0; - D_EBFBE0_801B91B4 = 0; + D_menu_801B912C = 0; + D_menu_801B91B4 = 0; } -void func_EBFBE0_8019B8C8(void) { - func_EBFBE0_8019BDF0(); - Option_DrawMenuCard(sOptionVSCardList[D_EBFBE0_801B91A8].unk_38); +void func_menu_8019B8C8(void) { + func_menu_8019BDF0(); + Option_DrawMenuCard(sOptionVSCardList[D_menu_801B91A8].unk_38); Matrix_Pop(&gGfxMatrix); - Option_DrawCardLabel(sOptionVSCardList[D_EBFBE0_801B91A8].unk_00); + Option_DrawCardLabel(sOptionVSCardList[D_menu_801B91A8].unk_00); } void Option_DrawMenuLabel(void) { - func_EBFBE0_8019BDF0(); - Option_DrawMenuCard(sOptionCardList[D_EBFBE0_801B91A4].unk_38); + func_menu_8019BDF0(); + Option_DrawMenuCard(sOptionCardList[D_menu_801B91A4].unk_38); Matrix_Pop(&gGfxMatrix); - Option_DrawCardLabel(sOptionCardList[D_EBFBE0_801B91A4].unk_00); + Option_DrawCardLabel(sOptionCardList[D_menu_801B91A4].unk_00); } void Option_DrawMenuCard(MenuContext_38 arg0) { @@ -3520,22 +3510,22 @@ void Option_DrawMenuCard(MenuContext_38 arg0) { } void Option_DrawMenuArwing(ArwingPosition arg0) { - if (D_EBFBE0_801B91BC != 0) { - func_EBFBE0_8019BC44(arg0.unk_0, arg0.unk_4, D_EBFBE0_801B91F4, D_EBFBE0_801B9200, 90.0f, D_EBFBE0_801B91F8); - func_EBFBE0_8019BC44(arg0.unk_0 + arg0.unk_8, arg0.unk_4, D_EBFBE0_801B91F4, D_EBFBE0_801B91FC, -90.0f, - D_EBFBE0_801B91F8); + if (D_menu_801B91BC != 0) { + func_menu_8019BC44(arg0.unk_0, arg0.unk_4, D_menu_801B91F4, D_menu_801B9200, 90.0f, D_menu_801B91F8); + func_menu_8019BC44(arg0.unk_0 + arg0.unk_8, arg0.unk_4, D_menu_801B91F4, D_menu_801B91FC, -90.0f, + D_menu_801B91F8); } } -void func_EBFBE0_8019BC44(f32 x, f32 y, f32 arg2, f32 arg3, f32 arg4, f32 arg5) { +void func_menu_8019BC44(f32 x, f32 y, f32 arg2, f32 arg3, f32 arg4, f32 arg5) { f32 sp44; f32 sp40; f32 sp3C; - func_EBFBE0_8019BE7C(D_EBFBE0_801B9224, D_EBFBE0_801B9228, 100.0f, &sp44, &sp40, &sp3C); + func_menu_8019BE7C(D_menu_801B9224, D_menu_801B9228, 100.0f, &sp44, &sp40, &sp3C); - Lights_SetOneLight(&gMasterDisp, sp44, sp40, sp3C, D_EBFBE0_801B922C, D_EBFBE0_801B9230, D_EBFBE0_801B9234, - D_EBFBE0_801B9238, D_EBFBE0_801B923C, D_EBFBE0_801B9240); + Lights_SetOneLight(&gMasterDisp, sp44, sp40, sp3C, D_menu_801B922C, D_menu_801B9230, D_menu_801B9234, + D_menu_801B9238, D_menu_801B923C, D_menu_801B9240); Matrix_Push(&gGfxMatrix); @@ -3554,13 +3544,13 @@ void func_EBFBE0_8019BC44(f32 x, f32 y, f32 arg2, f32 arg3, f32 arg4, f32 arg5) Matrix_Pop(&gGfxMatrix); } -void func_EBFBE0_8019BDF0(void) { +void func_menu_8019BDF0(void) { Matrix_Push(&gGfxMatrix); Matrix_LookAt(gGfxMatrix, D_80177978, D_80177980, D_80177988, D_801779A0, D_801779B8, D_801779C0, 0.0f, 1.0f, 0.0f, 1); } -void func_EBFBE0_8019BE7C(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f32* arg5) { +void func_menu_8019BE7C(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f32* arg5) { Vec3f sp24; Vec3f sp18; @@ -3577,42 +3567,42 @@ void func_EBFBE0_8019BE7C(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f3 *arg5 = sp24.z; } -void func_EBFBE0_8019BF34(void) { +void func_menu_8019BF34(void) { s32 i; f32 sp40; - if (D_EBFBE0_801B9214 != 0) { - sp40 = D_EBFBE0_801B9204; - func_EBFBE0_8019BDF0(); + if (D_menu_801B9214 != 0) { + sp40 = D_menu_801B9204; + func_menu_8019BDF0(); for (i = 0; i < 3; i++) { - D_EBFBE0_801B920C = Rand_ZeroOne() * 0.5f; - D_EBFBE0_801B9210 = 0.5f; - func_EBFBE0_8019C04C(); - D_EBFBE0_801B9204 += 6.0f; + D_menu_801B920C = Rand_ZeroOne() * 0.5f; + D_menu_801B9210 = 0.5f; + func_menu_8019C04C(); + D_menu_801B9204 += 6.0f; } Matrix_Pop(&gGfxMatrix); - D_EBFBE0_801B9204 = sp40; + D_menu_801B9204 = sp40; - if (D_EBFBE0_801B9204 < 23.0f) { - D_EBFBE0_801B9204 += 18.0f; + if (D_menu_801B9204 < 23.0f) { + D_menu_801B9204 += 18.0f; } else { - D_EBFBE0_801B9204 = 23.0f; - D_EBFBE0_801B9214 = 0; + D_menu_801B9204 = 23.0f; + D_menu_801B9214 = 0; } } } -void func_EBFBE0_8019C04C(void) { +void func_menu_8019C04C(void) { RCP_SetupDL(&gMasterDisp, 0x24); Lib_Ortho(&gMasterDisp); Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, D_EBFBE0_801B9204, D_EBFBE0_801B9208, 0.0f, 1); - Matrix_Scale(gGfxMatrix, D_EBFBE0_801B920C, D_EBFBE0_801B9210, 1.0f, 1); + Matrix_Translate(gGfxMatrix, D_menu_801B9204, D_menu_801B9208, 0.0f, 1); + Matrix_Scale(gGfxMatrix, D_menu_801B920C, D_menu_801B9210, 1.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -3657,8 +3647,8 @@ void Option_DrawCardLabel(OptionTexture arg0) { } } -bool func_EBFBE0_8019C418(s32* arg0, s32 arg1, bool arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, - UnkStruct_D_EBFBE0_801B9250* arg8) { +bool func_menu_8019C418(s32* arg0, s32 arg1, bool arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, + UnkStruct_D_menu_801B9250* arg8) { s32 axis; s32 x; s32 y; @@ -3735,7 +3725,7 @@ bool func_EBFBE0_8019C418(s32* arg0, s32 arg1, bool arg2, s32 arg3, s32 arg4, s3 return ret; } -s32 func_EBFBE0_8019C5A0(s32* arg0) { +s32 func_menu_8019C5A0(s32* arg0) { s32 ret = 0; s32 temp = *arg0; s32 x = gControllerPress[gMainController].stick_x; @@ -3749,7 +3739,7 @@ s32 func_EBFBE0_8019C5A0(s32* arg0) { x = 0; } - if (D_EBFBE0_801B91A0 == 0) { + if (D_menu_801B91A0 == 0) { if (x != 0) { if (x > 0) { *arg0 = 0; @@ -3759,12 +3749,12 @@ s32 func_EBFBE0_8019C5A0(s32* arg0) { *arg0 = 1; ret = -1; } - D_EBFBE0_801B91A0 = OPTION_COUNT; + D_menu_801B91A0 = OPTION_COUNT; } } - if (D_EBFBE0_801B91A0 > 0) { - D_EBFBE0_801B91A0--; + if (D_menu_801B91A0 > 0) { + D_menu_801B91A0--; } if (temp == *arg0) { @@ -3774,7 +3764,7 @@ s32 func_EBFBE0_8019C5A0(s32* arg0) { return ret; } -bool func_EBFBE0_8019C66C(f32* arg0, f32 arg1, f32 arg2, UnkStruct_D_EBFBE0_801B9250* arg3) { +bool func_menu_8019C66C(f32* arg0, f32 arg1, f32 arg2, UnkStruct_D_menu_801B9250* arg3) { f32 var_fv1; f32 temp2; bool var_a2 = false; @@ -3839,17 +3829,17 @@ bool func_EBFBE0_8019C66C(f32* arg0, f32 arg1, f32 arg2, UnkStruct_D_EBFBE0_801B return var_a2; } -void func_EBFBE0_8019C824(f32* arg0) { - if ((s32) Math_SmoothStepToF(arg0, D_EBFBE0_801B91E4, 0.5f, 100.0f, 1.0f) == 0.0f) { +void func_menu_8019C824(f32* arg0) { + if ((s32) Math_SmoothStepToF(arg0, D_menu_801B91E4, 0.5f, 100.0f, 1.0f) == 0.0f) { if (*arg0 == 32.0f) { - D_EBFBE0_801B91E4 = 255.0f; + D_menu_801B91E4 = 255.0f; } else { - D_EBFBE0_801B91E4 = 32.0f; + D_menu_801B91E4 = 32.0f; } } } -s32 func_EBFBE0_8019C8C4(void) { +s32 func_menu_8019C8C4(void) { s32 i; s32 j; s32 k; @@ -3872,10 +3862,10 @@ s32 func_EBFBE0_8019C8C4(void) { ret = -1; for (i = 0; i < 10; i++) { - if (D_EBFBE0_801B8220[i] <= gTotalHits) { - if (D_EBFBE0_801B8220[i] == gTotalHits) { + if (D_menu_801B8220[i] <= gTotalHits) { + if (D_menu_801B8220[i] == gTotalHits) { for (j = i; j < 10; j++) { - if (D_EBFBE0_801B8220[j] != gTotalHits) { + if (D_menu_801B8220[j] != gTotalHits) { ret = j; break; } @@ -3883,13 +3873,13 @@ s32 func_EBFBE0_8019C8C4(void) { if (temp[j] <= gLifeCount[gPlayerNum]) { if (temp[j] == gLifeCount[gPlayerNum]) { for (k = j; k < 10; k++) { - if ((temp[k] != gLifeCount[gPlayerNum]) || (D_EBFBE0_801B8220[k] != gTotalHits)) { + if ((temp[k] != gLifeCount[gPlayerNum]) || (D_menu_801B8220[k] != gTotalHits)) { ret = k; break; } for (var_a0 = 0, m = 0; m < 3; m++) { - var_a0 += D_EBFBE0_801B81A8[k][m]; + var_a0 += D_menu_801B81A8[k][m]; } if (var_v0 > var_a0) { @@ -3913,36 +3903,36 @@ s32 func_EBFBE0_8019C8C4(void) { return ret; } -void func_EBFBE0_8019CAE0(void) { - switch (D_EBFBE0_801B912C) { +void func_menu_8019CAE0(void) { + switch (D_menu_801B912C) { case 0: - func_EBFBE0_8019CBC0(); - D_EBFBE0_801B912C++; + func_menu_8019CBC0(); + D_menu_801B912C++; break; case 1: - func_EBFBE0_8019CD54(); + func_menu_8019CD54(); break; case 2: - func_EBFBE0_8019D624(); - func_EBFBE0_80188010(); - D_EBFBE0_801B917C = 15; - D_EBFBE0_801B912C++; + func_menu_8019D624(); + func_menu_80188010(); + D_menu_801B917C = 15; + D_menu_801B912C++; break; case 3: - if (D_EBFBE0_801B917C == 0) { + if (D_menu_801B917C == 0) { gBlurAlpha = 255; gDrawMode = DRAWMODE_0; - D_EBFBE0_801B912C = 0; - D_EBFBE0_801B9124 = 300; + D_menu_801B912C = 0; + D_menu_801B9124 = 300; } break; } } -void func_EBFBE0_8019CBC0(void) { +void func_menu_8019CBC0(void) { s32 temp; s32 i; @@ -3951,191 +3941,191 @@ void func_EBFBE0_8019CBC0(void) { gBlurAlpha = 0xD0; D_80178410 = 800; - D_EBFBE0_801B9130 = 1; - D_EBFBE0_801B9128 = 0; - D_EBFBE0_801B911C = 0.0f; - D_EBFBE0_801B9120 = 70.0f; + D_menu_801B9130 = 1; + D_menu_801B9128 = 0; + D_menu_801B911C = 0.0f; + D_menu_801B9120 = 70.0f; temp = gSaveFile.save.data.unk_EA & 0xFF; if (temp < 10) { - D_EBFBE0_801B9098 = 3; - D_EBFBE0_801B9138 = 1; + D_menu_801B9098 = 3; + D_menu_801B9138 = 1; - D_EBFBE0_801B9150[0][0] = gSaveFile.save.data.unk_18[temp][0] & 0xFF; - D_EBFBE0_801B9150[1][0] = gSaveFile.save.data.unk_18[temp][1] & 0xFF; - D_EBFBE0_801B9150[2][0] = gSaveFile.save.data.unk_18[temp][2] & 0xFF; + D_menu_801B9150[0][0] = gSaveFile.save.data.unk_18[temp][0] & 0xFF; + D_menu_801B9150[1][0] = gSaveFile.save.data.unk_18[temp][1] & 0xFF; + D_menu_801B9150[2][0] = gSaveFile.save.data.unk_18[temp][2] & 0xFF; for (i = 0; i < 3; i++) { - D_EBFBE0_801B90A0[i] = func_EBFBE0_8019DCE8(D_EBFBE0_801B9150[i][0]); - D_EBFBE0_801B90B0[i] = 1; - D_EBFBE0_801B9150[i][1] = 0; + D_menu_801B90A0[i] = func_menu_8019DCE8(D_menu_801B9150[i][0]); + D_menu_801B90B0[i] = 1; + D_menu_801B9150[i][1] = 0; } } else { - D_EBFBE0_801B9098 = 0; - D_EBFBE0_801B9138 = 0; + D_menu_801B9098 = 0; + D_menu_801B9138 = 0; for (i = 0; i < 3; i++) { - D_EBFBE0_801B90B0[i] = 0; - D_EBFBE0_801B90A0[i] = 0; - D_EBFBE0_801B9150[i][0] = 0x41; - D_EBFBE0_801B9150[i][1] = 0; + D_menu_801B90B0[i] = 0; + D_menu_801B90A0[i] = 0; + D_menu_801B9150[i][0] = 0x41; + D_menu_801B9150[i][1] = 0; } } - func_EBFBE0_80192598(); + func_menu_80192598(); } -void func_EBFBE0_8019CD54(void) { - switch (D_EBFBE0_801B9128) { +void func_menu_8019CD54(void) { + switch (D_menu_801B9128) { case 0: - if (D_EBFBE0_801B9138 == 0) { - if (func_EBFBE0_8019C418(&D_EBFBE0_801B90A0[D_EBFBE0_801B9098], 36, 0, 0, 50, 5, 10, gMainController, - &D_EBFBE0_801B9160[D_EBFBE0_801B9098])) { + if (D_menu_801B9138 == 0) { + if (func_menu_8019C418(&D_menu_801B90A0[D_menu_801B9098], 36, 0, 0, 50, 5, 10, gMainController, + &D_menu_801B9160[D_menu_801B9098])) { Audio_PlaySfx(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B9150[D_EBFBE0_801B9098][0] = D_EBFBE0_801AEF5C[D_EBFBE0_801B90A0[D_EBFBE0_801B9098]]; - D_EBFBE0_801B90D0[D_EBFBE0_801B9098] = 0.0f; - D_EBFBE0_801B9100[D_EBFBE0_801B9098] = 0.0f; + D_menu_801B9150[D_menu_801B9098][0] = D_menu_801AEF5C[D_menu_801B90A0[D_menu_801B9098]]; + D_menu_801B90D0[D_menu_801B9098] = 0.0f; + D_menu_801B9100[D_menu_801B9098] = 0.0f; } } if (gControllerPress[gMainController].button & A_BUTTON) { - D_EBFBE0_801B90D0[D_EBFBE0_801B9098] = 0.0f; - if (D_EBFBE0_801B9138 != 0) { + D_menu_801B90D0[D_menu_801B9098] = 0.0f; + if (D_menu_801B9138 != 0) { Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B9140[0] = 10; - D_EBFBE0_801B9140[1] = 10; - D_EBFBE0_801B9140[2] = 10; - D_EBFBE0_801B9138 = -1; - D_EBFBE0_801B9128 = 2; + D_menu_801B9140[0] = 10; + D_menu_801B9140[1] = 10; + D_menu_801B9140[2] = 10; + D_menu_801B9138 = -1; + D_menu_801B9128 = 2; break; } else { - if (D_EBFBE0_801B9098 < 3) { + if (D_menu_801B9098 < 3) { Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B90D0[D_EBFBE0_801B9098] = 0.0f; - D_EBFBE0_801B9140[D_EBFBE0_801B9098] = 15; - D_EBFBE0_801B9128 = 1; + D_menu_801B90D0[D_menu_801B9098] = 0.0f; + D_menu_801B9140[D_menu_801B9098] = 15; + D_menu_801B9128 = 1; break; } } } - if ((gControllerPress[gMainController].button & B_BUTTON) && (D_EBFBE0_801B9098 != 0)) { + if ((gControllerPress[gMainController].button & B_BUTTON) && (D_menu_801B9098 != 0)) { Audio_PlaySfx(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - if (D_EBFBE0_801B9138 != 0) { - D_EBFBE0_801B9138 = 0; + if (D_menu_801B9138 != 0) { + D_menu_801B9138 = 0; } - D_EBFBE0_801B9098--; - D_EBFBE0_801B9140[D_EBFBE0_801B9098] = 15; - D_EBFBE0_801B9128 = 10; + D_menu_801B9098--; + D_menu_801B9140[D_menu_801B9098] = 15; + D_menu_801B9128 = 10; } break; case 10: - D_EBFBE0_801B9140[D_EBFBE0_801B9098]--; - if (D_EBFBE0_801B9140[D_EBFBE0_801B9098] != 0) { + D_menu_801B9140[D_menu_801B9098]--; + if (D_menu_801B9140[D_menu_801B9098] != 0) { break; } - D_EBFBE0_801B9128 = 0; + D_menu_801B9128 = 0; break; case 1: - D_EBFBE0_801B9140[D_EBFBE0_801B9098]--; - if (D_EBFBE0_801B9140[D_EBFBE0_801B9098] != 0) { + D_menu_801B9140[D_menu_801B9098]--; + if (D_menu_801B9140[D_menu_801B9098] != 0) { break; } - if ((D_EBFBE0_801B9098 + 1) > 2) { - D_EBFBE0_801B9138 = 1; + if ((D_menu_801B9098 + 1) > 2) { + D_menu_801B9138 = 1; } - D_EBFBE0_801B9098++; - D_EBFBE0_801B9128 = 0; + D_menu_801B9098++; + D_menu_801B9128 = 0; break; case 2: - D_EBFBE0_801B9140[0]--; - D_EBFBE0_801B9140[1]--; - D_EBFBE0_801B9140[2]--; + D_menu_801B9140[0]--; + D_menu_801B9140[1]--; + D_menu_801B9140[2]--; - if (D_EBFBE0_801B9140[0] != 0) { + if (D_menu_801B9140[0] != 0) { break; } - D_EBFBE0_801B917C = 20; - D_EBFBE0_801B9128 = 3; + D_menu_801B917C = 20; + D_menu_801B9128 = 3; break; case 3: - if (D_EBFBE0_801B917C == 0) { - D_EBFBE0_801B912C = 2; + if (D_menu_801B917C == 0) { + D_menu_801B912C = 2; break; } } } -void func_EBFBE0_8019D118(void) { - static f32 D_EBFBE0_801AF300[] = { -120.0f, 0.0f, 120.0f }; +void func_menu_8019D118(void) { + static f32 D_menu_801AF300[] = { -120.0f, 0.0f, 120.0f }; f32 dirX; f32 dirY; f32 dirZ; s32 mask[3]; s32 i; - static f32 D_EBFBE0_801AF30C[6] = { 51.0f, 138.0f, 118.0f, 166.0f, 138.0f, 267.0f }; - static f32 D_EBFBE0_801AF324[6] = { 29.0f, 49.0f, 145.0f, 155.0f, 87.0f, 127.0f }; + static f32 D_menu_801AF30C[6] = { 51.0f, 138.0f, 118.0f, 166.0f, 138.0f, 267.0f }; + static f32 D_menu_801AF324[6] = { 29.0f, 49.0f, 145.0f, 155.0f, 87.0f, 127.0f }; RCP_SetupDL(&gMasterDisp, 0x4C); if (D_80161A34 == 8) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - Graphics_DisplayLargeText(D_EBFBE0_801AF30C[0], D_EBFBE0_801AF324[0], 1.0f, 1.0f, "CONGRATULATIONS"); + Graphics_DisplayLargeText(D_menu_801AF30C[0], D_menu_801AF324[0], 1.0f, 1.0f, "CONGRATULATIONS"); } - if (D_EBFBE0_801B9178 != 0) { + if (D_menu_801B9178 != 0) { return; } gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255); - Graphics_DisplaySmallText(D_EBFBE0_801AF30C[1], D_EBFBE0_801AF324[1], 1.0f, 1.0f, "RANK"); - Graphics_DisplaySmallText(D_EBFBE0_801AF30C[2], D_EBFBE0_801AF324[2], 1.0f, 1.0f, "TOTAL HITS"); + Graphics_DisplaySmallText(D_menu_801AF30C[1], D_menu_801AF324[1], 1.0f, 1.0f, "RANK"); + Graphics_DisplaySmallText(D_menu_801AF30C[2], D_menu_801AF324[2], 1.0f, 1.0f, "TOTAL HITS"); (void) "p:%d x:%f y:%f\n"; - if (D_EBFBE0_801B9138 == 1) { + if (D_menu_801B9138 == 1) { if (gFrameCount & 0x10) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255); - TextureRect_8bIA(&gMasterDisp, D_50021F0, 32, 8, D_EBFBE0_801AF30C[5], D_EBFBE0_801AF324[5], 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_50021F0, 32, 8, D_menu_801AF30C[5], D_menu_801AF324[5], 1.0f, 1.0f); } } - func_EBFBE0_80197A3C(D_EBFBE0_801B9094, D_EBFBE0_801AF30C[4], D_EBFBE0_801AF324[4]); + func_menu_80197A3C(D_menu_801B9094, D_menu_801AF30C[4], D_menu_801AF324[4]); RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - Graphics_DisplayLargeNumber(D_EBFBE0_801AF30C[3] - ((func_8008BCBC(gTotalHits) - 1) * 13), D_EBFBE0_801AF324[3], + Graphics_DisplayLargeNumber(D_menu_801AF30C[3] - ((func_8008BCBC(gTotalHits) - 1) * 13), D_menu_801AF324[3], gTotalHits); - func_EBFBE0_801A9FD4(1); + func_menu_801A9FD4(1); - func_EBFBE0_80192738(); + func_menu_80192738(); for (i = 0; i < 3; i++) { - if (i == D_EBFBE0_801B9098) { - D_EBFBE0_801B9100[i] += 1.0f; + if (i == D_menu_801B9098) { + D_menu_801B9100[i] += 1.0f; } else { - D_EBFBE0_801B9100[i] = 0.0f; + D_menu_801B9100[i] = 0.0f; } mask[i] = 0xFFFFFFFF; - if (D_EBFBE0_801B9140[i]) { + if (D_menu_801B9140[i]) { mask[i] = 0x1; - D_EBFBE0_801B9100[i] = 0.0f; + D_menu_801B9100[i] = 0.0f; } } - func_EBFBE0_8019BE7C(D_EBFBE0_801B911C, D_EBFBE0_801B9120, 127.0f, &dirX, &dirY, &dirZ); + func_menu_8019BE7C(D_menu_801B911C, D_menu_801B9120, 127.0f, &dirX, &dirY, &dirZ); Lights_SetOneLight(&gMasterDisp, dirX, dirY, dirZ, 255, 255, 255, 65, 70, 48); @@ -4147,17 +4137,16 @@ void func_EBFBE0_8019D118(void) { for (i = 0; i < 3; i++) { if (gFrameCount & mask[i]) { - func_EBFBE0_8019DB20(D_EBFBE0_801B9150[i][0], D_EBFBE0_801AF300[i], 18.0f, -455.0f, 1.0f, - D_EBFBE0_801B90C0[i] + D_EBFBE0_801B90F0[i], - D_EBFBE0_801B90D0[i] + D_EBFBE0_801B9100[i], - D_EBFBE0_801B90E0[i] + D_EBFBE0_801B9110[i]); + func_menu_8019DB20(D_menu_801B9150[i][0], D_menu_801AF300[i], 18.0f, -455.0f, 1.0f, + D_menu_801B90C0[i] + D_menu_801B90F0[i], D_menu_801B90D0[i] + D_menu_801B9100[i], + D_menu_801B90E0[i] + D_menu_801B9110[i]); } } Matrix_Pop(&gGfxMatrix); } -void func_EBFBE0_8019D624(void) { +void func_menu_8019D624(void) { s32 i; s32 j; s32 var_t2; @@ -4169,9 +4158,9 @@ void func_EBFBE0_8019D624(void) { u8 sp10A[11]; Save_SubStruct_5E var_s0[11][7]; - sp142[10][0] = D_EBFBE0_801B9150[0][0]; - sp142[10][1] = D_EBFBE0_801B9150[1][0]; - sp142[10][2] = D_EBFBE0_801B9150[2][0]; + sp142[10][0] = D_menu_801B9150[0][0]; + sp142[10][1] = D_menu_801B9150[1][0]; + sp142[10][2] = D_menu_801B9150[2][0]; sp122[10] = gCurrentPlanet + 1; @@ -4231,7 +4220,7 @@ void func_EBFBE0_8019D624(void) { } for (var_a1 = 0, i = 0; i < 10; i++) { - if (i == D_EBFBE0_801B9094) { + if (i == D_menu_801B9094) { var_a3 = var_a1; var_a1 = 10; } @@ -4252,20 +4241,20 @@ void func_EBFBE0_8019D624(void) { gSaveFile.save.data.unk_5E[i][j].unk_F = var_s0[var_a1][j].unk_F; } - if (i == D_EBFBE0_801B9094) { + if (i == D_menu_801B9094) { var_a1 = var_a3; } else { var_a1++; } } - gSaveFile.save.data.unk_EA = D_EBFBE0_801B9094; + gSaveFile.save.data.unk_EA = D_menu_801B9094; Save_Write(); } -void func_EBFBE0_8019DB20(s32 character, f32 x, f32 y, f32 z, f32 scale, f32 xAngle, f32 yAngle, f32 zAngle) { - static Gfx* D_EBFBE0_801AF33C[37] = { +void func_menu_8019DB20(s32 character, f32 x, f32 y, f32 z, f32 scale, f32 xAngle, f32 yAngle, f32 zAngle) { + static Gfx* D_menu_801AF33C[37] = { (Gfx*) 0x090086F0, (Gfx*) 0x09007FD0, (Gfx*) 0x09007BB0, (Gfx*) 0x09000980, (Gfx*) 0x090075A0, (Gfx*) 0x090070C0, (Gfx*) 0x09006AE0, (Gfx*) 0x09006500, (Gfx*) 0x090062D0, (Gfx*) 0x09001120, (Gfx*) 0x09005CA0, (Gfx*) 0x09005980, (Gfx*) 0x09005380, (Gfx*) 0x09004E10, (Gfx*) 0x09000570, @@ -4279,8 +4268,8 @@ void func_EBFBE0_8019DB20(s32 character, f32 x, f32 y, f32 z, f32 scale, f32 xAn s32 i; s32 charIndex = -1; - for (i = 0; D_EBFBE0_801AEF5C[i] != NULL; i++) { - if (character == D_EBFBE0_801AEF5C[i]) { + for (i = 0; D_menu_801AEF5C[i] != NULL; i++) { + if (character == D_menu_801AEF5C[i]) { charIndex = i; break; } @@ -4306,42 +4295,42 @@ void func_EBFBE0_8019DB20(s32 character, f32 x, f32 y, f32 z, f32 scale, f32 xAn Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_EBFBE0_801AF33C[charIndex]); + gSPDisplayList(gMasterDisp++, D_menu_801AF33C[charIndex]); Matrix_Pop(&gGfxMatrix); } -s32 func_EBFBE0_8019DCE8(s32 arg0) { +s32 func_menu_8019DCE8(s32 arg0) { s32 i = 0; // 'for()' causes instruction reorder - while (D_EBFBE0_801AEF5C[i] != 0) { - if (D_EBFBE0_801AEF5C[i] == arg0) { + while (D_menu_801AEF5C[i] != 0) { + if (D_menu_801AEF5C[i] == arg0) { break; } i++; } - if (D_EBFBE0_801AEF5C[i] == 0) { + if (D_menu_801AEF5C[i] == 0) { i = 0; } return i; } -void func_EBFBE0_8019DD44(void) { - switch (D_EBFBE0_801B912C) { +void func_menu_8019DD44(void) { + switch (D_menu_801B912C) { case 0: Option_RankingInit(); - D_EBFBE0_801B93E4 = D_EBFBE0_801B9094; + D_menu_801B93E4 = D_menu_801B9094; - if ((D_EBFBE0_801B9094 < 0) || (D_EBFBE0_801B9094 >= 10)) { - D_EBFBE0_801B93E4 = 0; + if ((D_menu_801B9094 < 0) || (D_menu_801B9094 >= 10)) { + D_menu_801B93E4 = 0; } - D_EBFBE0_801B91D4 = 114.0f - D_EBFBE0_801B93E4 * 130.0f; - D_EBFBE0_801B91D8 = -6.0f + D_EBFBE0_801B93E4 * 130.0f; + D_menu_801B91D4 = 114.0f - D_menu_801B93E4 * 130.0f; + D_menu_801B91D8 = -6.0f + D_menu_801B93E4 * 130.0f; sOptionCardList[3].unk_00.unk_18 = sOptionCardCurTextPosX[3]; sOptionCardList[3].unk_00.unk_1C = 23.0f; sOptionCardList[3].unk_00.unk_20 = 1.0f; @@ -4351,23 +4340,23 @@ void func_EBFBE0_8019DD44(void) { sOptionCardList[3].unk_38.unk_0C = 0.4f; sOptionCardList[3].unk_38.unk_10 = 0.21f; sOptionCardList[3].unk_5C = 1; - D_EBFBE0_801B912C++; + D_menu_801B912C++; break; case 1: - func_EBFBE0_8019DE74(); + func_menu_8019DE74(); break; } } -void func_EBFBE0_8019DE74(void) { - func_EBFBE0_8019715C(); +void func_menu_8019DE74(void) { + func_menu_8019715C(); if (gControllerPress[gMainController].button & 0xD00E) { // START, A, B, C-UP, C-LEFT, C-DOWN Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); gDrawMode = DRAWMODE_0; - D_EBFBE0_801B912C = 0; + D_menu_801B912C = 0; if (D_80161A34 == 5) { D_80178410 = 0; @@ -4377,21 +4366,21 @@ void func_EBFBE0_8019DE74(void) { } else if (D_80161A34 == 8) { func_800182F4(0x100100FF); func_800182F4(0x110100FF); - D_EBFBE0_801B9124 = 400; + D_menu_801B9124 = 400; } } } -void func_EBFBE0_8019DF64(void) { - func_EBFBE0_8019752C(); - func_EBFBE0_8019BDF0(); +void func_menu_8019DF64(void) { + func_menu_8019752C(); + func_menu_8019BDF0(); Option_DrawMenuCard(sOptionCardList[3].unk_38); Matrix_Pop(&gGfxMatrix); Option_DrawCardLabel(sOptionCardList[3].unk_00); } void Option_InvoiceUpdate(void) { - switch (D_EBFBE0_801B912C) { + switch (D_menu_801B912C) { case 0: D_80178410 = 0; gBgColor = 0; @@ -4399,35 +4388,35 @@ void Option_InvoiceUpdate(void) { D_80178350 = 0; D_80178354 = 0; D_80178340 = 0; - D_EBFBE0_801B9090 = 0; - D_EBFBE0_801B9178 = 30; - D_EBFBE0_801B912C++; + D_menu_801B9090 = 0; + D_menu_801B9178 = 30; + D_menu_801B912C++; break; case 1: - if (D_EBFBE0_801B9178 == 0) { + if (D_menu_801B9178 == 0) { if (((gTotalHits * 64) >= 50000) && ((gTotalHits * 64) < 70000)) { Audio_PlaySfx(0x49000032, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } if ((gTotalHits * 64) >= 70000) { Audio_PlaySfx(0x49000033, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } - D_EBFBE0_801B9178 = 20; - D_EBFBE0_801B912C++; + D_menu_801B9178 = 20; + D_menu_801B912C++; } break; case 2: - if ((D_EBFBE0_801B9178 == 0) && (gControllerPress[gMainController].button & 0xD00E)) { + if ((D_menu_801B9178 == 0) && (gControllerPress[gMainController].button & 0xD00E)) { Audio_PlaySfx(0x19031083, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B9090 = 1; - D_EBFBE0_801B9178 = 60; - D_EBFBE0_801B912C++; + D_menu_801B9090 = 1; + D_menu_801B9178 = 60; + D_menu_801B912C++; } break; case 3: - if (D_EBFBE0_801B9178 == 0) { + if (D_menu_801B9178 == 0) { D_80178410 = 0; gGameState = GSTATE_INIT; gDrawMode = DRAWMODE_0; @@ -4441,9 +4430,9 @@ void Option_InvoiceUpdate(void) { void Option_InvoiceDraw(void) { s32 i; s32 temp_a0; - static f32 D_EBFBE0_801AF3D0[8] = { 96.0f, 31.0f, 32.0f, 80.0f, 86.0f, 213.0f, 275.0f, 276.0f }; - static f32 D_EBFBE0_801AF3F0[8] = { 24.0f, 57.0f, 92.0f, 162.0f, 163.0f, 171.0f, 103.0f, 131.0f }; - static s32 D_EBFBE0_801AF410 = 0; + static f32 D_menu_801AF3D0[8] = { 96.0f, 31.0f, 32.0f, 80.0f, 86.0f, 213.0f, 275.0f, 276.0f }; + static f32 D_menu_801AF3F0[8] = { 24.0f, 57.0f, 92.0f, 162.0f, 163.0f, 171.0f, 103.0f, 131.0f }; + static s32 D_menu_801AF410 = 0; Graphics_FillRectangle(&gMasterDisp, 25, 18, 295, 222, 255, 255, 255, 255); @@ -4451,52 +4440,50 @@ void Option_InvoiceDraw(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - TextureRect_4bCI(&gMasterDisp, D_8000000, D_8000680, 128, 16, D_EBFBE0_801AF3D0[0], D_EBFBE0_801AF3F0[0], 1.0f, - 1.0f); + TextureRect_4bCI(&gMasterDisp, D_8000000, D_8000680, 128, 16, D_menu_801AF3D0[0], D_menu_801AF3F0[0], 1.0f, 1.0f); - TextureRect_4bCI(&gMasterDisp, D_8000000 + 1024, D_8000680, 128, 10, D_EBFBE0_801AF3D0[0], - D_EBFBE0_801AF3F0[0] + 16.0f, 1.0f, 1.0f); + TextureRect_4bCI(&gMasterDisp, D_8000000 + 1024, D_8000680, 128, 10, D_menu_801AF3D0[0], D_menu_801AF3F0[0] + 16.0f, + 1.0f, 1.0f); for (i = 0; i < 2; i++) { - TextureRect_4bCI(&gMasterDisp, D_80006A0 + (256 * 16 * i) / 2, D_80017A0, 256, 16, D_EBFBE0_801AF3D0[1], - D_EBFBE0_801AF3F0[1] + (16 * i), 1.0f, 1.0f); + TextureRect_4bCI(&gMasterDisp, D_80006A0 + (256 * 16 * i) / 2, D_80017A0, 256, 16, D_menu_801AF3D0[1], + D_menu_801AF3F0[1] + (16 * i), 1.0f, 1.0f); } - TextureRect_4bCI(&gMasterDisp, D_80006A0 + 4096, D_80017A0, 256, 2, D_EBFBE0_801AF3D0[1], - D_EBFBE0_801AF3F0[1] + 32.0f, 1.0f, 1.0f); + TextureRect_4bCI(&gMasterDisp, D_80006A0 + 4096, D_80017A0, 256, 2, D_menu_801AF3D0[1], D_menu_801AF3F0[1] + 32.0f, + 1.0f, 1.0f); for (i = 0; i < 4; i++) { - TextureRect_4bCI(&gMasterDisp, D_80017C0 + (256 * 16 * i) / 2, D_80038C0, 256, 16, D_EBFBE0_801AF3D0[2], - D_EBFBE0_801AF3F0[2] + (16 * i), 1.0f, 1.0f); + TextureRect_4bCI(&gMasterDisp, D_80017C0 + (256 * 16 * i) / 2, D_80038C0, 256, 16, D_menu_801AF3D0[2], + D_menu_801AF3F0[2] + (16 * i), 1.0f, 1.0f); } - TextureRect_4bCI(&gMasterDisp, D_80017C0 + 8192, D_80038C0, 256, 2, D_EBFBE0_801AF3D0[2], - D_EBFBE0_801AF3F0[2] + 64.0f, 1.0f, 1.0f); + TextureRect_4bCI(&gMasterDisp, D_80017C0 + 8192, D_80038C0, 256, 2, D_menu_801AF3D0[2], D_menu_801AF3F0[2] + 64.0f, + 1.0f, 1.0f); RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); for (i = 0; i < 30; i++) { - TextureRect_16bRGBA(&gMasterDisp, D_800E170 + (188 * 2 * i), 188, 2, D_EBFBE0_801AF3D0[3], - D_EBFBE0_801AF3F0[3] + (2.0f * i), 1.0f, 1.0f); + TextureRect_16bRGBA(&gMasterDisp, D_800E170 + (188 * 2 * i), 188, 2, D_menu_801AF3D0[3], + D_menu_801AF3F0[3] + (2.0f * i), 1.0f, 1.0f); } gDPSetPrimColor(gMasterDisp++, 0, 0, 0, 0, 0, 255); - Graphics_DisplayLargeNumber(D_EBFBE0_801AF3D0[6] - ((func_8008BCBC(gTotalHits) - 1) * 13), D_EBFBE0_801AF3F0[6], + Graphics_DisplayLargeNumber(D_menu_801AF3D0[6] - ((func_8008BCBC(gTotalHits) - 1) * 13), D_menu_801AF3F0[6], gTotalHits); temp_a0 = gTotalHits * 64; - Graphics_DisplayLargeNumber(D_EBFBE0_801AF3D0[7] - ((func_8008BCBC(temp_a0) - 1) * 13), D_EBFBE0_801AF3F0[7], - temp_a0); + Graphics_DisplayLargeNumber(D_menu_801AF3D0[7] - ((func_8008BCBC(temp_a0) - 1) * 13), D_menu_801AF3F0[7], temp_a0); - if (D_EBFBE0_801B9090) { + if (D_menu_801B9090) { gDPSetPrimColor(gMasterDisp++, 0, 0, 120, 0, 0, 192); for (i = 0; i < 3; i++) { - TextureRect_8bIA(&gMasterDisp, D_800D1F0 + (80 * 16 * i), 80, 16, D_EBFBE0_801AF3D0[5], - D_EBFBE0_801AF3F0[5] + (16.0f * i), 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_800D1F0 + (80 * 16 * i), 80, 16, D_menu_801AF3D0[5], + D_menu_801AF3F0[5] + (16.0f * i), 1.0f, 1.0f); } } @@ -4507,32 +4494,32 @@ void Option_InvoiceDraw(void) { */ if (gControllerPress[3].button & R_TRIG) { - D_EBFBE0_801AF410++; - if (D_EBFBE0_801AF410 > 7) { - D_EBFBE0_801AF410 = 0; + D_menu_801AF410++; + if (D_menu_801AF410 > 7) { + D_menu_801AF410 = 0; } } if (gControllerPress[3].button & L_TRIG) { - D_EBFBE0_801AF410--; - if (D_EBFBE0_801AF410 < 0) { - D_EBFBE0_801AF410 = 7; + D_menu_801AF410--; + if (D_menu_801AF410 < 0) { + D_menu_801AF410 = 7; } } if (gControllerHold[3].button & U_JPAD) { - D_EBFBE0_801AF3F0[D_EBFBE0_801AF410] -= 1.0f; + D_menu_801AF3F0[D_menu_801AF410] -= 1.0f; } if (gControllerHold[3].button & D_JPAD) { - D_EBFBE0_801AF3F0[D_EBFBE0_801AF410] += 1.0f; + D_menu_801AF3F0[D_menu_801AF410] += 1.0f; } if (gControllerHold[3].button & L_JPAD) { - D_EBFBE0_801AF3D0[D_EBFBE0_801AF410] -= 1.0f; + D_menu_801AF3D0[D_menu_801AF410] -= 1.0f; } if (gControllerHold[3].button & R_JPAD) { - D_EBFBE0_801AF3D0[D_EBFBE0_801AF410] += 1.0f; + D_menu_801AF3D0[D_menu_801AF410] += 1.0f; } } diff --git a/src/overlays/ovl_menu/fox_title.c b/src/overlays/ovl_menu/fox_title.c index 60193c6b..075dedce 100644 --- a/src/overlays/ovl_menu/fox_title.c +++ b/src/overlays/ovl_menu/fox_title.c @@ -21,21 +21,21 @@ extern SkelAnime D_603088C[]; extern SkelAnime D_60313AC[]; extern SkelAnime D_6032084[]; -s32 pad_D_EBFBE0_801AD9F0[4] = { 0, 0, 0, 0 }; +s32 pad_D_menu_801AD9F0[4] = { 0, 0, 0, 0 }; //! TODO: Symbols for segmented addresses -Animation D_EBFBE0_801ADA00[4] = { +Animation D_menu_801ADA00[4] = { { (AnimationHeader*) 0x0602F8E0, (AnimationHeader*) 0x06035024, (SkelAnime*) 0x0602FBAC }, { (AnimationHeader*) 0x060305C0, (AnimationHeader*) 0x060338DC, (SkelAnime*) 0x0603088C }, { (AnimationHeader*) 0x06031DB8, (AnimationHeader*) 0x0603531C, (SkelAnime*) 0x06032084 }, { (AnimationHeader*) 0x06031120, (AnimationHeader*) 0x06036278, (SkelAnime*) 0x060313AC }, }; -u16* D_EBFBE0_801ADA30[5] = { +u16* D_menu_801ADA30[5] = { (u16*) 0x8017A150, (u16*) 0x8017A190, (u16*) 0x8017A1CC, (u16*) 0x8017A210, (u16*) 0x8017A260, }; -void func_EBFBE0_801875E0(void) { +void func_menu_801875E0(void) { D_80137E78 = 2; gFrameCount = 0; @@ -45,7 +45,7 @@ void func_EBFBE0_801875E0(void) { D_80161A34 = 0; D_800D2870 = 0; - gMainController = func_EBFBE0_80187ABC(); + gMainController = func_menu_80187ABC(); D_80178348 = 0; D_80178350 = 0; @@ -58,17 +58,17 @@ void func_EBFBE0_801875E0(void) { gBgColor = 0; - D_EBFBE0_801B8284 = 0; - D_EBFBE0_801B82A8 = 0; - D_EBFBE0_801B82AC = 0; + D_menu_801B8284 = 0; + D_menu_801B82A8 = 0; + D_menu_801B82AC = 0; - D_EBFBE0_801B833C = 0.0f; + D_menu_801B833C = 0.0f; - D_EBFBE0_801B82C0 = 0; - D_EBFBE0_801B8280 = 0; + D_menu_801B82C0 = 0; + D_menu_801B8280 = 0; - D_EBFBE0_801B7BCC = 255.0f; - D_EBFBE0_801B7BC8 = 255.0f; + D_menu_801B7BCC = 255.0f; + D_menu_801B7BC8 = 255.0f; Memory_FreeAll(); @@ -76,20 +76,20 @@ void func_EBFBE0_801875E0(void) { D_80178420 = 320.0f; D_80178424 = 240.0f; - func_EBFBE0_80188010(); + func_menu_80188010(); - if ((gMainController == -1) || (D_EBFBE0_801B827C != 0)) { + if ((gMainController == -1) || (D_menu_801B827C != 0)) { func_8001DC6C(0, 0x17); - D_EBFBE0_801B82C4 = 0; - D_EBFBE0_801B827C = 0; + D_menu_801B82C4 = 0; + D_menu_801B827C = 0; } else { func_8001DC6C(0, 0x16); - D_EBFBE0_801B82C4 = 1; + D_menu_801B82C4 = 1; } gControllerLock = 0x1E; } -void func_EBFBE0_80187754(void) { +void func_menu_80187754(void) { switch (D_80177AE0) { case 0: if (D_Timer_8017783C == 0) { @@ -100,123 +100,123 @@ void func_EBFBE0_80187754(void) { case 1: gDrawMode = DRAWMODE_0; - func_EBFBE0_801875E0(); + func_menu_801875E0(); break; case 2: gDrawMode = DRAWMODE_1; - func_EBFBE0_801877F0(); + func_menu_801877F0(); break; } gFrameCount++; } -void func_EBFBE0_801877F0(void) { - if (D_EBFBE0_801B82A8 > 0) { - D_EBFBE0_801B82A8 -= 1; +void func_menu_801877F0(void) { + if (D_menu_801B82A8 > 0) { + D_menu_801B82A8 -= 1; } - if (D_EBFBE0_801B82AC > 0) { - D_EBFBE0_801B82AC -= 1; + if (D_menu_801B82AC > 0) { + D_menu_801B82AC -= 1; } - switch (D_EBFBE0_801B82C4) { + switch (D_menu_801B82C4) { case 7: - func_EBFBE0_80187B00(); + func_menu_80187B00(); break; case 0: - func_EBFBE0_801888E8(); - func_EBFBE0_8019111C(); + func_menu_801888E8(); + func_menu_8019111C(); break; case 1: - func_EBFBE0_8018994C(); + func_menu_8018994C(); break; case 2: - func_EBFBE0_8018A644(); + func_menu_8018A644(); break; case 3: - func_EBFBE0_8018ACEC(); + func_menu_8018ACEC(); break; case 4: - func_EBFBE0_8018B5C4(); + func_menu_8018B5C4(); break; case 5: - func_EBFBE0_8018C644(); + func_menu_8018C644(); break; } - func_EBFBE0_80190E64(); + func_menu_80190E64(); } -void func_EBFBE0_801878D8(void) { - switch (D_EBFBE0_801B82C4) { +void func_menu_801878D8(void) { + switch (D_menu_801B82C4) { case 7: - func_EBFBE0_80187CA8(); + func_menu_80187CA8(); break; case 0: - func_EBFBE0_801918FC(); - func_EBFBE0_80189208(); + func_menu_801918FC(); + func_menu_80189208(); Matrix_Pop(&gGfxMatrix); - func_EBFBE0_8018F680(); - func_EBFBE0_8018F85C(); - func_EBFBE0_8018FC14(); - func_EBFBE0_8018F8E4(); - func_EBFBE0_801918FC(); - func_EBFBE0_8018F77C(); + func_menu_8018F680(); + func_menu_8018F85C(); + func_menu_8018FC14(); + func_menu_8018F8E4(); + func_menu_801918FC(); + func_menu_8018F77C(); Matrix_Pop(&gGfxMatrix); break; case 1: - if (D_EBFBE0_801B8348 != 0) { - func_EBFBE0_801918FC(); - func_EBFBE0_8018A2F8(); + if (D_menu_801B8348 != 0) { + func_menu_801918FC(); + func_menu_8018A2F8(); Matrix_Pop(&gGfxMatrix); func_800BB5D0(); - func_EBFBE0_80190C9C(); + func_menu_80190C9C(); } - func_EBFBE0_8018FF74(); - func_EBFBE0_801906A0(); + func_menu_8018FF74(); + func_menu_801906A0(); break; case 2: - func_EBFBE0_801918FC(); - func_EBFBE0_8018A990(); + func_menu_801918FC(); + func_menu_8018A990(); Matrix_Pop(&gGfxMatrix); - if (D_EBFBE0_801B8344 != 0) { - func_EBFBE0_8018FD08(); + if (D_menu_801B8344 != 0) { + func_menu_8018FD08(); } break; case 3: - func_EBFBE0_801918FC(); - func_EBFBE0_8018B038(); + func_menu_801918FC(); + func_menu_8018B038(); Matrix_Pop(&gGfxMatrix); break; case 4: - func_EBFBE0_801918FC(); - func_EBFBE0_8018C114(); + func_menu_801918FC(); + func_menu_8018C114(); Matrix_Pop(&gGfxMatrix); - func_EBFBE0_80190C9C(); + func_menu_80190C9C(); break; case 5: - func_EBFBE0_801918FC(); - func_EBFBE0_8018CB90(); + func_menu_801918FC(); + func_menu_8018CB90(); Matrix_Pop(&gGfxMatrix); break; } - if (D_EBFBE0_801B8284 != 0) { + if (D_menu_801B8284 != 0) { D_80178340 = 0; D_80178348 = 0; D_80178350 = 0; D_80178354 = 0; - func_80084688(2, D_EBFBE0_801B8284); + func_80084688(2, D_menu_801B8284); } } -s32 func_EBFBE0_80187ABC(void) { +s32 func_menu_80187ABC(void) { s32 ret = -1; s32 i; @@ -230,46 +230,46 @@ s32 func_EBFBE0_80187ABC(void) { return ret; } -void func_EBFBE0_80187B00(void) { - switch (D_EBFBE0_801B82C0) { +void func_menu_80187B00(void) { + switch (D_menu_801B82C0) { case 0: - D_EBFBE0_801B8288 = 0; + D_menu_801B8288 = 0; D_80178410 = 800; - D_EBFBE0_801B82BC = 450; - D_EBFBE0_801B82C0++; - D_EBFBE0_801B82A8 = 20; + D_menu_801B82BC = 450; + D_menu_801B82C0++; + D_menu_801B82A8 = 20; break; case 1: - if (D_EBFBE0_801B82BC != 0) { + if (D_menu_801B82BC != 0) { func_800B6F50(D_80177978, D_80177980, D_80177988, D_801779A0, D_801779B8, D_801779C0); D_8017842C -= 1.0f; - if (D_EBFBE0_801B82BC == 60) { + if (D_menu_801B82BC == 60) { func_800182F4(0x103C00FF); func_800182F4(0x113C00FF); } } else { D_80178410 = 0; gRadioState = 0; - D_EBFBE0_801B82C0 = 0; + D_menu_801B82C0 = 0; gDrawMode = DRAWMODE_0; func_8001DC6C(0, 0x16); - D_EBFBE0_801B82C4 = 1; + D_menu_801B82C4 = 1; } - if (D_EBFBE0_801B8288 == 10) { - D_EBFBE0_801B82BC--; + if (D_menu_801B8288 == 10) { + D_menu_801B82BC--; } break; } - if ((D_EBFBE0_801B82A8 == 0) && ((gFrameCount & 7) == 7) && (D_EBFBE0_801B8288 < 10)) { - D_EBFBE0_801B8288++; + if ((D_menu_801B82A8 == 0) && ((gFrameCount & 7) == 7) && (D_menu_801B8288 < 10)) { + D_menu_801B8288++; } } -void func_EBFBE0_80187CA8(void) { - static char D_EBFBE0_801ADA44[] = "S T A R F O X R A N K I N G"; +void func_menu_80187CA8(void) { + static char D_menu_801ADA44[] = "S T A R F O X R A N K I N G"; s32 temp = 20; s32 temp2 = 36; @@ -277,7 +277,7 @@ void func_EBFBE0_80187CA8(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255); - Graphics_DisplaySmallText(temp2, temp, 1.0f, 1.0f, D_EBFBE0_801ADA44); + Graphics_DisplaySmallText(temp2, temp, 1.0f, 1.0f, D_menu_801ADA44); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); @@ -289,10 +289,10 @@ void func_EBFBE0_80187CA8(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); TextureRect_8bIA(&gMasterDisp, D_50077B0, 16, 2, 36, 32, 15.2f, 1.0f); - func_EBFBE0_80187E28(); + func_menu_80187E28(); } -void func_EBFBE0_80187E28(void) { +void func_menu_80187E28(void) { s32 temp; s32 i; @@ -305,23 +305,23 @@ void func_EBFBE0_80187E28(void) { Graphics_DisplaySmallText(192, 38, 1.0f, 1.0f, "HITS"); temp = 55; - for (i = 0; i < D_EBFBE0_801B8288; i++) { + for (i = 0; i < D_menu_801B8288; i++) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); Graphics_DisplaySmallNumber(105 - ((func_8008BCBC(i + 1) - 1) * 8), temp, i + 1); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255); - Graphics_DisplaySmallText(150, temp, 1.0f, 1.0f, &D_EBFBE0_801B8248[i][0]); + Graphics_DisplaySmallText(150, temp, 1.0f, 1.0f, &D_menu_801B8248[i][0]); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - Graphics_DisplaySmallNumber(211 - ((func_8008BCBC(D_EBFBE0_801B8220[i]) - 1) * 8), temp, D_EBFBE0_801B8220[i]); + Graphics_DisplaySmallNumber(211 - ((func_8008BCBC(D_menu_801B8220[i]) - 1) * 8), temp, D_menu_801B8220[i]); temp += 17; } } -s32 func_EBFBE0_80188010(void) { +s32 func_menu_80188010(void) { s32 temp1; s32 temp2; s32 temp3; @@ -329,17 +329,17 @@ s32 func_EBFBE0_80188010(void) { s32 j; for (i = 0; i < 10; i++) { - D_EBFBE0_801B8220[i] = 0; + D_menu_801B8220[i] = 0; for (j = 0; j < 3; j++) { - D_EBFBE0_801B81A8[i][j] = 0; + D_menu_801B81A8[i][j] = 0; } } for (i = 0; i < 10; i++) { - D_EBFBE0_801B8248[i][0] = gSaveFile.save.data.unk_18[i][0] & 0xFF; - D_EBFBE0_801B8248[i][1] = gSaveFile.save.data.unk_18[i][1] & 0xFF; - D_EBFBE0_801B8248[i][2] = gSaveFile.save.data.unk_18[i][2] & 0xFF; - D_EBFBE0_801B8248[i][3] = '\0'; + D_menu_801B8248[i][0] = gSaveFile.save.data.unk_18[i][0] & 0xFF; + D_menu_801B8248[i][1] = gSaveFile.save.data.unk_18[i][1] & 0xFF; + D_menu_801B8248[i][2] = gSaveFile.save.data.unk_18[i][2] & 0xFF; + D_menu_801B8248[i][3] = '\0'; temp3 = gSaveFile.save.data.unk_36[i]; @@ -347,26 +347,26 @@ s32 func_EBFBE0_80188010(void) { temp2 = gSaveFile.save.data.unk_5E[i][j].unk_0; temp2 |= (gSaveFile.save.data.unk_5E[i][j].unk_C & 1) * 256; - D_EBFBE0_801B8220[i] += temp2; + D_menu_801B8220[i] += temp2; - D_EBFBE0_801B81A8[i][0] += gSaveFile.save.data.unk_5E[i][j].unk_D & 1; - D_EBFBE0_801B81A8[i][1] += gSaveFile.save.data.unk_5E[i][j].unk_F & 1; - D_EBFBE0_801B81A8[i][2] += gSaveFile.save.data.unk_5E[i][j].unk_E & 1; + D_menu_801B81A8[i][0] += gSaveFile.save.data.unk_5E[i][j].unk_D & 1; + D_menu_801B81A8[i][1] += gSaveFile.save.data.unk_5E[i][j].unk_F & 1; + D_menu_801B81A8[i][2] += gSaveFile.save.data.unk_5E[i][j].unk_E & 1; } } - temp1 = D_EBFBE0_801B8220[0]; + temp1 = D_menu_801B8220[0]; for (i = 1; i < 10; i++) { - if (temp1 < D_EBFBE0_801B8220[i]) { - temp1 = D_EBFBE0_801B8220[i]; + if (temp1 < D_menu_801B8220[i]) { + temp1 = D_menu_801B8220[i]; } } return temp1; } -void func_EBFBE0_801881FC(void) { +void func_menu_801881FC(void) { bool var_a1 = true; s32 i; @@ -377,455 +377,452 @@ void func_EBFBE0_801881FC(void) { } } - D_EBFBE0_801B82BC = 900; + D_menu_801B82BC = 900; gRadioState = 0; - D_EBFBE0_801B869C = 255; + D_menu_801B869C = 255; D_80178410 = 800; - D_EBFBE0_801B9040 = 0; - D_EBFBE0_801B86C8 = 0.0f; - D_EBFBE0_801B86CC = -180.0f; - D_EBFBE0_801B82F8 = 124; - D_EBFBE0_801B82FC = 108; - D_EBFBE0_801B8300 = 75; - D_EBFBE0_801B8304 = 0.0f; - D_EBFBE0_801B8308 = 0.0f; - D_EBFBE0_801B830C = 0.0f; - D_EBFBE0_801B86D0 = -70.0f; - D_EBFBE0_801B86D4 = 22.0f; - D_EBFBE0_801B8310 = 30; - D_EBFBE0_801B8314 = 29; - D_EBFBE0_801B8318 = 40; - D_EBFBE0_801B831C = 6; - D_EBFBE0_801B8320 = 1; - D_EBFBE0_801B8324 = 11; - D_EBFBE0_801B9054 = 26.0f; - D_EBFBE0_801B9058 = 37.0f; - D_EBFBE0_801B9068 = 1.5f; - D_EBFBE0_801B906C = 3.0f; - D_EBFBE0_801B905C = 124.0f; - D_EBFBE0_801B9060 = 242.0f; - D_EBFBE0_801B9064 = 100.0f; + D_menu_801B9040 = 0; + D_menu_801B86C8 = 0.0f; + D_menu_801B86CC = -180.0f; + D_menu_801B82F8 = 124; + D_menu_801B82FC = 108; + D_menu_801B8300 = 75; + D_menu_801B8304 = 0.0f; + D_menu_801B8308 = 0.0f; + D_menu_801B830C = 0.0f; + D_menu_801B86D0 = -70.0f; + D_menu_801B86D4 = 22.0f; + D_menu_801B8310 = 30; + D_menu_801B8314 = 29; + D_menu_801B8318 = 40; + D_menu_801B831C = 6; + D_menu_801B8320 = 1; + D_menu_801B8324 = 11; + D_menu_801B9054 = 26.0f; + D_menu_801B9058 = 37.0f; + D_menu_801B9068 = 1.5f; + D_menu_801B906C = 3.0f; + D_menu_801B905C = 124.0f; + D_menu_801B9060 = 242.0f; + D_menu_801B9064 = 100.0f; D_80178340 = 0; D_80178348 = 0; D_80178350 = 0; D_80178354 = 0; - D_EBFBE0_801B86A8 = 0.0f; - D_EBFBE0_801B86AC = 0.0f; - D_EBFBE0_801B86B0 = 430.0f; + D_menu_801B86A8 = 0.0f; + D_menu_801B86AC = 0.0f; + D_menu_801B86B0 = 430.0f; D_801779A0 = 0.0f; D_801779B8 = 180.0f; D_801779C0 = 0.0f; - D_EBFBE0_801B829C = 0.0f; - D_EBFBE0_801B82A0 = 1.0f; - D_EBFBE0_801B82A4 = 0.0f; + D_menu_801B829C = 0.0f; + D_menu_801B82A0 = 1.0f; + D_menu_801B82A4 = 0.0f; - D_EBFBE0_801B84D4 = 0.5f; + D_menu_801B84D4 = 0.5f; - D_EBFBE0_801B84E8[0].unk_00.x = -80.0f; - D_EBFBE0_801B84E8[0].unk_00.y = 220.0f; - D_EBFBE0_801B84E8[0].unk_00.z = -360.0f; - D_EBFBE0_801B84E8[0].unk_0C = 4.0f; - D_EBFBE0_801B84E8[0].unk_18 = 35.0f; - D_EBFBE0_801B84E8[0].unk_1C = -90.0f; - D_EBFBE0_801B84E8[0].unk_20 = -15.0f; - D_EBFBE0_801B84E8[0].unk_24 = 0.0f; - D_EBFBE0_801B84E8[0].unk_28 = 0.0f; - D_EBFBE0_801B84E8[0].unk_2C = 0.0f; - D_EBFBE0_801B84E8[0].unk_30 = 0.0f; - D_EBFBE0_801B84E8[0].unk_34 = 1; - D_EBFBE0_801B84E8[0].unk_3C = 0; - D_EBFBE0_801B84E8[0].unk_40 = 0; - D_EBFBE0_801B84E8[0].unk_48 = 0; + D_menu_801B84E8[0].unk_00.x = -80.0f; + D_menu_801B84E8[0].unk_00.y = 220.0f; + D_menu_801B84E8[0].unk_00.z = -360.0f; + D_menu_801B84E8[0].unk_0C = 4.0f; + D_menu_801B84E8[0].unk_18 = 35.0f; + D_menu_801B84E8[0].unk_1C = -90.0f; + D_menu_801B84E8[0].unk_20 = -15.0f; + D_menu_801B84E8[0].unk_24 = 0.0f; + D_menu_801B84E8[0].unk_28 = 0.0f; + D_menu_801B84E8[0].unk_2C = 0.0f; + D_menu_801B84E8[0].unk_30 = 0.0f; + D_menu_801B84E8[0].unk_34 = 1; + D_menu_801B84E8[0].unk_3C = 0; + D_menu_801B84E8[0].unk_40 = 0; + D_menu_801B84E8[0].unk_48 = 0; if (var_a1) { - D_EBFBE0_801B8350[0].unk_00.x = -299.0f; - D_EBFBE0_801B8350[0].unk_00.y = -32.0f; - D_EBFBE0_801B8350[0].unk_00.z = 90.0f; - D_EBFBE0_801B8350[0].unk_48 = -9.660022f; - D_EBFBE0_801B8350[0].unk_4C = 60.330208f; - D_EBFBE0_801B8350[0].unk_50 = 0.00f; + D_menu_801B8350[0].unk_00.x = -299.0f; + D_menu_801B8350[0].unk_00.y = -32.0f; + D_menu_801B8350[0].unk_00.z = 90.0f; + D_menu_801B8350[0].unk_48 = -9.660022f; + D_menu_801B8350[0].unk_4C = 60.330208f; + D_menu_801B8350[0].unk_50 = 0.00f; } else { - D_EBFBE0_801B8350[0].unk_00.x = 33.00f; - D_EBFBE0_801B8350[0].unk_00.y = 23.00f; - D_EBFBE0_801B8350[0].unk_00.z = 4.00f; - D_EBFBE0_801B8350[0].unk_48 = -7.800007f; - D_EBFBE0_801B8350[0].unk_4C = 0.589999f; - D_EBFBE0_801B8350[0].unk_50 = 0.00f; + D_menu_801B8350[0].unk_00.x = 33.00f; + D_menu_801B8350[0].unk_00.y = 23.00f; + D_menu_801B8350[0].unk_00.z = 4.00f; + D_menu_801B8350[0].unk_48 = -7.800007f; + D_menu_801B8350[0].unk_4C = 0.589999f; + D_menu_801B8350[0].unk_50 = 0.00f; } - D_EBFBE0_801B8350[0].unk_30 = 0.0f; - D_EBFBE0_801B8350[0].unk_34 = 0.0f; - D_EBFBE0_801B8350[0].unk_28 = 0.0f; - D_EBFBE0_801B8350[0].unk_2C = 0.0f; - D_EBFBE0_801B8350[0].unk_14 = 150.0f; - D_EBFBE0_801B8350[0].unk_18 = 0.0f; - D_EBFBE0_801B8350[0].unk_1C = 1.0f; - D_EBFBE0_801B8350[0].unk_20 = 0.0f; - D_EBFBE0_801B8350[0].unk_24 = 0.0f; - D_EBFBE0_801B8350[0].unk_54 = 0; - D_EBFBE0_801B8350[0].unk_38 = 0.0f; - D_EBFBE0_801B8350[0].unk_3C = 0.0f; - D_EBFBE0_801B8350[0].unk_40 = 0.0f; - D_EBFBE0_801B8350[0].unk_44 = 0.0f; - D_EBFBE0_801B8350[0].unk_58 = 0; - D_EBFBE0_801B8350[0].unk_5C = 0; + D_menu_801B8350[0].unk_30 = 0.0f; + D_menu_801B8350[0].unk_34 = 0.0f; + D_menu_801B8350[0].unk_28 = 0.0f; + D_menu_801B8350[0].unk_2C = 0.0f; + D_menu_801B8350[0].unk_14 = 150.0f; + D_menu_801B8350[0].unk_18 = 0.0f; + D_menu_801B8350[0].unk_1C = 1.0f; + D_menu_801B8350[0].unk_20 = 0.0f; + D_menu_801B8350[0].unk_24 = 0.0f; + D_menu_801B8350[0].unk_54 = 0; + D_menu_801B8350[0].unk_38 = 0.0f; + D_menu_801B8350[0].unk_3C = 0.0f; + D_menu_801B8350[0].unk_40 = 0.0f; + D_menu_801B8350[0].unk_44 = 0.0f; + D_menu_801B8350[0].unk_58 = 0; + D_menu_801B8350[0].unk_5C = 0; if (var_a1) { - D_EBFBE0_801B8350[1].unk_00.x = -42.0f; - D_EBFBE0_801B8350[1].unk_00.y = -7.0f; - D_EBFBE0_801B8350[1].unk_00.z = -12.0f; - D_EBFBE0_801B8350[1].unk_48 = -2.009996f; - D_EBFBE0_801B8350[1].unk_4C = 56.90997f; - D_EBFBE0_801B8350[1].unk_50 = 0.00f; + D_menu_801B8350[1].unk_00.x = -42.0f; + D_menu_801B8350[1].unk_00.y = -7.0f; + D_menu_801B8350[1].unk_00.z = -12.0f; + D_menu_801B8350[1].unk_48 = -2.009996f; + D_menu_801B8350[1].unk_4C = 56.90997f; + D_menu_801B8350[1].unk_50 = 0.00f; } else { - D_EBFBE0_801B8350[1].unk_00.x = 147.0f; - D_EBFBE0_801B8350[1].unk_00.y = 18.0f; - D_EBFBE0_801B8350[1].unk_00.z = -32.0f; - D_EBFBE0_801B8350[1].unk_48 = -6.009995f; - D_EBFBE0_801B8350[1].unk_4C = 22.620012f; - D_EBFBE0_801B8350[1].unk_50 = 0.00f; + D_menu_801B8350[1].unk_00.x = 147.0f; + D_menu_801B8350[1].unk_00.y = 18.0f; + D_menu_801B8350[1].unk_00.z = -32.0f; + D_menu_801B8350[1].unk_48 = -6.009995f; + D_menu_801B8350[1].unk_4C = 22.620012f; + D_menu_801B8350[1].unk_50 = 0.00f; } - D_EBFBE0_801B8350[1].unk_30 = 0.0f; - D_EBFBE0_801B8350[1].unk_34 = 0.0f; - D_EBFBE0_801B8350[1].unk_28 = 0.0f; - D_EBFBE0_801B8350[1].unk_2C = 0.0f; - D_EBFBE0_801B8350[1].unk_14 = 180.0f; - D_EBFBE0_801B8350[1].unk_18 = 0.0f; - D_EBFBE0_801B8350[1].unk_1C = 1.0f; - D_EBFBE0_801B8350[1].unk_20 = 0.0f; - D_EBFBE0_801B8350[1].unk_24 = -4.0f; - D_EBFBE0_801B8350[1].unk_54 = 0; - D_EBFBE0_801B8350[1].unk_38 = 0.0f; - D_EBFBE0_801B8350[1].unk_3C = 0.0f; - D_EBFBE0_801B8350[1].unk_40 = 0.0f; - D_EBFBE0_801B8350[1].unk_44 = 0.0f; - D_EBFBE0_801B8350[1].unk_58 = 0; - D_EBFBE0_801B8350[1].unk_5C = 0; + D_menu_801B8350[1].unk_30 = 0.0f; + D_menu_801B8350[1].unk_34 = 0.0f; + D_menu_801B8350[1].unk_28 = 0.0f; + D_menu_801B8350[1].unk_2C = 0.0f; + D_menu_801B8350[1].unk_14 = 180.0f; + D_menu_801B8350[1].unk_18 = 0.0f; + D_menu_801B8350[1].unk_1C = 1.0f; + D_menu_801B8350[1].unk_20 = 0.0f; + D_menu_801B8350[1].unk_24 = -4.0f; + D_menu_801B8350[1].unk_54 = 0; + D_menu_801B8350[1].unk_38 = 0.0f; + D_menu_801B8350[1].unk_3C = 0.0f; + D_menu_801B8350[1].unk_40 = 0.0f; + D_menu_801B8350[1].unk_44 = 0.0f; + D_menu_801B8350[1].unk_58 = 0; + D_menu_801B8350[1].unk_5C = 0; if (var_a1) { - D_EBFBE0_801B8350[2].unk_00.x = 90.0f; - D_EBFBE0_801B8350[2].unk_00.y = 1.00f; - D_EBFBE0_801B8350[2].unk_00.z = -143.0f; - D_EBFBE0_801B8350[2].unk_48 = -0.500016f; - D_EBFBE0_801B8350[2].unk_4C = -33.31999f; - D_EBFBE0_801B8350[2].unk_50 = 0.00f; + D_menu_801B8350[2].unk_00.x = 90.0f; + D_menu_801B8350[2].unk_00.y = 1.00f; + D_menu_801B8350[2].unk_00.z = -143.0f; + D_menu_801B8350[2].unk_48 = -0.500016f; + D_menu_801B8350[2].unk_4C = -33.31999f; + D_menu_801B8350[2].unk_50 = 0.00f; } else { - D_EBFBE0_801B8350[2].unk_00.x = -143.0f; - D_EBFBE0_801B8350[2].unk_00.y = 22.00f; - D_EBFBE0_801B8350[2].unk_00.z = -57.0f; - D_EBFBE0_801B8350[2].unk_48 = -5.950006f; - D_EBFBE0_801B8350[2].unk_4C = -7.689997f; - D_EBFBE0_801B8350[2].unk_50 = 0.00f; + D_menu_801B8350[2].unk_00.x = -143.0f; + D_menu_801B8350[2].unk_00.y = 22.00f; + D_menu_801B8350[2].unk_00.z = -57.0f; + D_menu_801B8350[2].unk_48 = -5.950006f; + D_menu_801B8350[2].unk_4C = -7.689997f; + D_menu_801B8350[2].unk_50 = 0.00f; } - D_EBFBE0_801B8350[2].unk_30 = 0.0f; - D_EBFBE0_801B8350[2].unk_34 = 0.0f; - D_EBFBE0_801B8350[2].unk_28 = 0.0f; - D_EBFBE0_801B8350[2].unk_2C = 0.0f; - D_EBFBE0_801B8350[2].unk_14 = 130.0f; - D_EBFBE0_801B8350[2].unk_18 = 0.0f; - D_EBFBE0_801B8350[2].unk_1C = 1.0f; - D_EBFBE0_801B8350[2].unk_20 = 0.0f; - D_EBFBE0_801B8350[2].unk_24 = 0.0f; - D_EBFBE0_801B8350[2].unk_54 = 0; - D_EBFBE0_801B8350[2].unk_38 = 0.0f; - D_EBFBE0_801B8350[2].unk_3C = 0.0f; - D_EBFBE0_801B8350[2].unk_40 = 0.0f; - D_EBFBE0_801B8350[2].unk_44 = 0.0f; - D_EBFBE0_801B8350[2].unk_58 = 0; - D_EBFBE0_801B8350[2].unk_5C = 0; + D_menu_801B8350[2].unk_30 = 0.0f; + D_menu_801B8350[2].unk_34 = 0.0f; + D_menu_801B8350[2].unk_28 = 0.0f; + D_menu_801B8350[2].unk_2C = 0.0f; + D_menu_801B8350[2].unk_14 = 130.0f; + D_menu_801B8350[2].unk_18 = 0.0f; + D_menu_801B8350[2].unk_1C = 1.0f; + D_menu_801B8350[2].unk_20 = 0.0f; + D_menu_801B8350[2].unk_24 = 0.0f; + D_menu_801B8350[2].unk_54 = 0; + D_menu_801B8350[2].unk_38 = 0.0f; + D_menu_801B8350[2].unk_3C = 0.0f; + D_menu_801B8350[2].unk_40 = 0.0f; + D_menu_801B8350[2].unk_44 = 0.0f; + D_menu_801B8350[2].unk_58 = 0; + D_menu_801B8350[2].unk_5C = 0; if (var_a1) { - D_EBFBE0_801B8350[3].unk_00.x = 58.0f; - D_EBFBE0_801B8350[3].unk_00.y = -5.0f; - D_EBFBE0_801B8350[3].unk_00.z = 22.00f; - D_EBFBE0_801B8350[3].unk_48 = -17.899979; - D_EBFBE0_801B8350[3].unk_4C = -8.890011f; - D_EBFBE0_801B8350[3].unk_50 = 0.00f; + D_menu_801B8350[3].unk_00.x = 58.0f; + D_menu_801B8350[3].unk_00.y = -5.0f; + D_menu_801B8350[3].unk_00.z = 22.00f; + D_menu_801B8350[3].unk_48 = -17.899979; + D_menu_801B8350[3].unk_4C = -8.890011f; + D_menu_801B8350[3].unk_50 = 0.00f; } else { - D_EBFBE0_801B8350[3].unk_00.x = -50.0f; - D_EBFBE0_801B8350[3].unk_00.y = 25.0f; - D_EBFBE0_801B8350[3].unk_00.z = 15.0f; - D_EBFBE0_801B8350[3].unk_48 = -15.870002f; - D_EBFBE0_801B8350[3].unk_4C = -17.549995f; - D_EBFBE0_801B8350[3].unk_50 = 0.00f; + D_menu_801B8350[3].unk_00.x = -50.0f; + D_menu_801B8350[3].unk_00.y = 25.0f; + D_menu_801B8350[3].unk_00.z = 15.0f; + D_menu_801B8350[3].unk_48 = -15.870002f; + D_menu_801B8350[3].unk_4C = -17.549995f; + D_menu_801B8350[3].unk_50 = 0.00f; } - D_EBFBE0_801B8350[3].unk_30 = 0.0f; - D_EBFBE0_801B8350[3].unk_34 = 0.0f; - D_EBFBE0_801B8350[3].unk_28 = 0.0f; - D_EBFBE0_801B8350[3].unk_2C = 0.0f; - D_EBFBE0_801B8350[3].unk_14 = 140.0f; - D_EBFBE0_801B8350[3].unk_18 = 0.0f; - D_EBFBE0_801B8350[3].unk_1C = 1.0f; - D_EBFBE0_801B8350[3].unk_20 = 0.0f; - D_EBFBE0_801B8350[3].unk_24 = 0.0f; - D_EBFBE0_801B8350[3].unk_54 = 0; - D_EBFBE0_801B8350[3].unk_38 = 0.0f; - D_EBFBE0_801B8350[3].unk_3C = 0.0f; - D_EBFBE0_801B8350[3].unk_40 = 0.0f; - D_EBFBE0_801B8350[3].unk_44 = 0.0f; - D_EBFBE0_801B8350[3].unk_58 = 254; - D_EBFBE0_801B8350[3].unk_5C = 0; + D_menu_801B8350[3].unk_30 = 0.0f; + D_menu_801B8350[3].unk_34 = 0.0f; + D_menu_801B8350[3].unk_28 = 0.0f; + D_menu_801B8350[3].unk_2C = 0.0f; + D_menu_801B8350[3].unk_14 = 140.0f; + D_menu_801B8350[3].unk_18 = 0.0f; + D_menu_801B8350[3].unk_1C = 1.0f; + D_menu_801B8350[3].unk_20 = 0.0f; + D_menu_801B8350[3].unk_24 = 0.0f; + D_menu_801B8350[3].unk_54 = 0; + D_menu_801B8350[3].unk_38 = 0.0f; + D_menu_801B8350[3].unk_3C = 0.0f; + D_menu_801B8350[3].unk_40 = 0.0f; + D_menu_801B8350[3].unk_44 = 0.0f; + D_menu_801B8350[3].unk_58 = 254; + D_menu_801B8350[3].unk_5C = 0; for (i = 0; i < 4; i++) { - Animation_GetFrameData(D_EBFBE0_801ADA00[i].unk_4, - D_EBFBE0_801B8350[i].unk_58 % Animation_GetFrameCount(D_EBFBE0_801ADA00[i].unk_4), - D_EBFBE0_801B86E0[i]); + Animation_GetFrameData(D_menu_801ADA00[i].unk_4, + D_menu_801B8350[i].unk_58 % Animation_GetFrameCount(D_menu_801ADA00[i].unk_4), + D_menu_801B86E0[i]); } - D_EBFBE0_801B86A4 = 0; - D_EBFBE0_801B82B0 = 100; + D_menu_801B86A4 = 0; + D_menu_801B82B0 = 100; func_8001D444(0, 34, 0, 255); } -void func_EBFBE0_801888E8(void) { +void func_menu_801888E8(void) { f32 temp_fv1; s32 i; - static f32 D_EBFBE0_801ADA64[4] = { 10.0f, 20.0f, 20.0f, 20.0f }; - static f32 D_EBFBE0_801ADA74[4] = { 2.0f, 5.0f, 4.0f, 4.0f }; + static f32 D_menu_801ADA64[4] = { 10.0f, 20.0f, 20.0f, 20.0f }; + static f32 D_menu_801ADA74[4] = { 2.0f, 5.0f, 4.0f, 4.0f }; - switch (D_EBFBE0_801B82C0) { + switch (D_menu_801B82C0) { case 0: - func_EBFBE0_801881FC(); - D_EBFBE0_801B82CC = 0.04f; - D_EBFBE0_801B82D0 = 0.1f; - D_EBFBE0_801B8340 = 0; - D_EBFBE0_801B82C0++; + func_menu_801881FC(); + D_menu_801B82CC = 0.04f; + D_menu_801B82D0 = 0.1f; + D_menu_801B8340 = 0; + D_menu_801B82C0++; break; case 1: - Math_SmoothStepToF(&D_EBFBE0_801B86C8, -10.0f, D_EBFBE0_801B82CC, 100.0f, 0.0001f); - Math_SmoothStepToF(&D_EBFBE0_801B86CC, 57.0f, D_EBFBE0_801B82CC, 100.0f, 0.0001f); - Math_SmoothStepToF(&D_EBFBE0_801B8304, 13.0f, D_EBFBE0_801B82CC, 100.0f, 0.0001f); - Math_SmoothStepToF(&D_EBFBE0_801B8308, 2.0f, D_EBFBE0_801B82CC, 100.0f, 0.0001f); - Math_SmoothStepToF(&D_EBFBE0_801B830C, 15.0f, D_EBFBE0_801B82CC, 100.0f, 0.0001f); - D_EBFBE0_801B82CC *= 1.04f; + Math_SmoothStepToF(&D_menu_801B86C8, -10.0f, D_menu_801B82CC, 100.0f, 0.0001f); + Math_SmoothStepToF(&D_menu_801B86CC, 57.0f, D_menu_801B82CC, 100.0f, 0.0001f); + Math_SmoothStepToF(&D_menu_801B8304, 13.0f, D_menu_801B82CC, 100.0f, 0.0001f); + Math_SmoothStepToF(&D_menu_801B8308, 2.0f, D_menu_801B82CC, 100.0f, 0.0001f); + Math_SmoothStepToF(&D_menu_801B830C, 15.0f, D_menu_801B82CC, 100.0f, 0.0001f); + D_menu_801B82CC *= 1.04f; - if (D_EBFBE0_801B86CC == 57.0f) { - D_EBFBE0_801B82C0++; + if (D_menu_801B86CC == 57.0f) { + D_menu_801B82C0++; } break; case 2: - if (D_EBFBE0_801B82B0 == 0) { - D_EBFBE0_801B82C0++; + if (D_menu_801B82B0 == 0) { + D_menu_801B82C0++; } break; case 3: - D_EBFBE0_801B82A8 = (s32) ((Rand_ZeroOne() * 5.0f) + 1.0f) * 10; - temp_fv1 = D_EBFBE0_801B8340; - D_EBFBE0_801B8350[D_EBFBE0_801B8340].unk_5C = 0; - D_EBFBE0_801B8350[D_EBFBE0_801B8340].unk_18 = 0.0f; + D_menu_801B82A8 = (s32) ((Rand_ZeroOne() * 5.0f) + 1.0f) * 10; + temp_fv1 = D_menu_801B8340; + D_menu_801B8350[D_menu_801B8340].unk_5C = 0; + D_menu_801B8350[D_menu_801B8340].unk_18 = 0.0f; - if (D_EBFBE0_801B8340 == 2) { - D_EBFBE0_801B8350[D_EBFBE0_801B8340].unk_58 = 0; + if (D_menu_801B8340 == 2) { + D_menu_801B8350[D_menu_801B8340].unk_58 = 0; } - while (temp_fv1 == D_EBFBE0_801B8340) { - D_EBFBE0_801B8340 = (s32) (Rand_ZeroOne() * 4.0f); + while (temp_fv1 == D_menu_801B8340) { + D_menu_801B8340 = (s32) (Rand_ZeroOne() * 4.0f); } - D_EBFBE0_801B8350[D_EBFBE0_801B8340].unk_5C = (s32) (Rand_ZeroOne() * 6.0f) + 5; - D_EBFBE0_801B8350[D_EBFBE0_801B8340].unk_54 = 1; + D_menu_801B8350[D_menu_801B8340].unk_5C = (s32) (Rand_ZeroOne() * 6.0f) + 5; + D_menu_801B8350[D_menu_801B8340].unk_54 = 1; - D_EBFBE0_801B82CC = 0.07f; - D_EBFBE0_801B82C0++; + D_menu_801B82CC = 0.07f; + D_menu_801B82C0++; break; case 4: - if (D_EBFBE0_801B82A8 == 0) { - D_EBFBE0_801B8350[D_EBFBE0_801B8340].unk_54 = 0; - Math_SmoothStepToF(&D_EBFBE0_801B8350[D_EBFBE0_801B8340].unk_18, 0.0f, D_EBFBE0_801B82CC, 100.0f, - 0.001f); - D_EBFBE0_801B82CC *= 1.07f; + if (D_menu_801B82A8 == 0) { + D_menu_801B8350[D_menu_801B8340].unk_54 = 0; + Math_SmoothStepToF(&D_menu_801B8350[D_menu_801B8340].unk_18, 0.0f, D_menu_801B82CC, 100.0f, 0.001f); + D_menu_801B82CC *= 1.07f; - if (D_EBFBE0_801B8350[D_EBFBE0_801B8340].unk_18 == 0.0f) { - D_EBFBE0_801B82C0 = 3; + if (D_menu_801B8350[D_menu_801B8340].unk_18 == 0.0f) { + D_menu_801B82C0 = 3; } } break; } - if (D_EBFBE0_801B8350[D_EBFBE0_801B8340].unk_54 != 0) { - if ((D_EBFBE0_801B8350[D_EBFBE0_801B8340].unk_18 + D_EBFBE0_801B8350[D_EBFBE0_801B8340].unk_1C) < 0.0f) { - D_EBFBE0_801B8350[D_EBFBE0_801B8340].unk_1C = D_EBFBE0_801ADA74[D_EBFBE0_801B8340]; + if (D_menu_801B8350[D_menu_801B8340].unk_54 != 0) { + if ((D_menu_801B8350[D_menu_801B8340].unk_18 + D_menu_801B8350[D_menu_801B8340].unk_1C) < 0.0f) { + D_menu_801B8350[D_menu_801B8340].unk_1C = D_menu_801ADA74[D_menu_801B8340]; } - if ((D_EBFBE0_801B8350[D_EBFBE0_801B8340].unk_18 + D_EBFBE0_801B8350[D_EBFBE0_801B8340].unk_1C) > - D_EBFBE0_801ADA64[D_EBFBE0_801B8340]) { - D_EBFBE0_801B8350[D_EBFBE0_801B8340].unk_1C = -D_EBFBE0_801ADA74[D_EBFBE0_801B8340]; + if ((D_menu_801B8350[D_menu_801B8340].unk_18 + D_menu_801B8350[D_menu_801B8340].unk_1C) > + D_menu_801ADA64[D_menu_801B8340]) { + D_menu_801B8350[D_menu_801B8340].unk_1C = -D_menu_801ADA74[D_menu_801B8340]; } - D_EBFBE0_801B8350[D_EBFBE0_801B8340].unk_18 += D_EBFBE0_801B8350[D_EBFBE0_801B8340].unk_1C; + D_menu_801B8350[D_menu_801B8340].unk_18 += D_menu_801B8350[D_menu_801B8340].unk_1C; } - if (D_EBFBE0_801B82B0 == 0) { + if (D_menu_801B82B0 == 0) { if (gFrameCount & 0x80) { - if (D_EBFBE0_801B8350[1].unk_20 + D_EBFBE0_801B8350[1].unk_24 < -20.0f) { - D_EBFBE0_801B8350[1].unk_24 = 4.0f; + if (D_menu_801B8350[1].unk_20 + D_menu_801B8350[1].unk_24 < -20.0f) { + D_menu_801B8350[1].unk_24 = 4.0f; } - if (D_EBFBE0_801B8350[1].unk_20 + D_EBFBE0_801B8350[1].unk_24 > 0.0f) { - D_EBFBE0_801B8350[1].unk_24 = -4.0f; + if (D_menu_801B8350[1].unk_20 + D_menu_801B8350[1].unk_24 > 0.0f) { + D_menu_801B8350[1].unk_24 = -4.0f; } - D_EBFBE0_801B8350[1].unk_20 += D_EBFBE0_801B8350[1].unk_24; + D_menu_801B8350[1].unk_20 += D_menu_801B8350[1].unk_24; } else { - Math_SmoothStepToF(&D_EBFBE0_801B8350[1].unk_20, 0.0f, 0.3f, 100.0f, 0.1f); + Math_SmoothStepToF(&D_menu_801B8350[1].unk_20, 0.0f, 0.3f, 100.0f, 0.1f); } } - if ((D_EBFBE0_801B86A4 >= 3) && (D_EBFBE0_801B9040 != 0)) { - Math_SmoothStepToF(&D_EBFBE0_801B86C8, -10.0f, D_EBFBE0_801B82D0, 100.0f, 0.0001f); - Math_SmoothStepToF(&D_EBFBE0_801B86CC, 57.0f, D_EBFBE0_801B82D0, 100.0f, 0.0001f); - Math_SmoothStepToF(&D_EBFBE0_801B905C, 124.0f, D_EBFBE0_801B82D0, 100.0f, 0.0001f); - Math_SmoothStepToF(&D_EBFBE0_801B9060, 242.0f, D_EBFBE0_801B82D0, 100.0f, 0.0001f); + if ((D_menu_801B86A4 >= 3) && (D_menu_801B9040 != 0)) { + Math_SmoothStepToF(&D_menu_801B86C8, -10.0f, D_menu_801B82D0, 100.0f, 0.0001f); + Math_SmoothStepToF(&D_menu_801B86CC, 57.0f, D_menu_801B82D0, 100.0f, 0.0001f); + Math_SmoothStepToF(&D_menu_801B905C, 124.0f, D_menu_801B82D0, 100.0f, 0.0001f); + Math_SmoothStepToF(&D_menu_801B9060, 242.0f, D_menu_801B82D0, 100.0f, 0.0001f); for (i = 0; i < 4; i++) { - Math_SmoothStepToF(&D_EBFBE0_801B8350[i].unk_28, 0.0f, D_EBFBE0_801B82D0, 100.0f, 0.01f); - Math_SmoothStepToF(&D_EBFBE0_801B8350[i].unk_2C, 0.0f, D_EBFBE0_801B82D0, 100.0f, 0.01f); - Math_SmoothStepToF(&D_EBFBE0_801B8350[i].unk_30, 0.0f, D_EBFBE0_801B82D0, 100.0f, 0.01f); - Math_SmoothStepToF(&D_EBFBE0_801B8350[i].unk_34, 0.0f, D_EBFBE0_801B82D0, 100.0f, 0.01f); - Math_SmoothStepToF(&D_EBFBE0_801B8350[i].unk_38, 0.0f, D_EBFBE0_801B82D0, 100.0f, 0.01f); - Math_SmoothStepToF(&D_EBFBE0_801B8350[i].unk_3C, 0.0f, D_EBFBE0_801B82D0, 100.0f, 0.01f); - Math_SmoothStepToF(&D_EBFBE0_801B8350[i].unk_40, 0.0f, D_EBFBE0_801B82D0, 100.0f, 0.01f); - Math_SmoothStepToF(&D_EBFBE0_801B8350[i].unk_44, 0.0f, D_EBFBE0_801B82D0, 100.0f, 0.01f); + Math_SmoothStepToF(&D_menu_801B8350[i].unk_28, 0.0f, D_menu_801B82D0, 100.0f, 0.01f); + Math_SmoothStepToF(&D_menu_801B8350[i].unk_2C, 0.0f, D_menu_801B82D0, 100.0f, 0.01f); + Math_SmoothStepToF(&D_menu_801B8350[i].unk_30, 0.0f, D_menu_801B82D0, 100.0f, 0.01f); + Math_SmoothStepToF(&D_menu_801B8350[i].unk_34, 0.0f, D_menu_801B82D0, 100.0f, 0.01f); + Math_SmoothStepToF(&D_menu_801B8350[i].unk_38, 0.0f, D_menu_801B82D0, 100.0f, 0.01f); + Math_SmoothStepToF(&D_menu_801B8350[i].unk_3C, 0.0f, D_menu_801B82D0, 100.0f, 0.01f); + Math_SmoothStepToF(&D_menu_801B8350[i].unk_40, 0.0f, D_menu_801B82D0, 100.0f, 0.01f); + Math_SmoothStepToF(&D_menu_801B8350[i].unk_44, 0.0f, D_menu_801B82D0, 100.0f, 0.01f); } - D_EBFBE0_801B82D0 *= 1.1f; + D_menu_801B82D0 *= 1.1f; - if ((D_EBFBE0_801B905C == 124.0f) && (D_EBFBE0_801B9060 == 242.0f)) { - D_EBFBE0_801B9040 = 0; - D_EBFBE0_801B82D0 = 0.08f; - D_EBFBE0_801B86A4 = 0; + if ((D_menu_801B905C == 124.0f) && (D_menu_801B9060 == 242.0f)) { + D_menu_801B9040 = 0; + D_menu_801B82D0 = 0.08f; + D_menu_801B86A4 = 0; } if ((gControllerPress[gMainController].stick_x != 0) || (gControllerPress[gMainController].stick_y != 0)) { - D_EBFBE0_801B82D0 = 0.08f; + D_menu_801B82D0 = 0.08f; } } - D_EBFBE0_801B84E8->unk_18 += 0.6f; + D_menu_801B84E8->unk_18 += 0.6f; - func_EBFBE0_80191320(1, &D_80177978, &D_80177980, &D_80177988, &D_801779A0, &D_801779B8, &D_801779C0, - D_EBFBE0_801B86A8, D_EBFBE0_801B86AC, D_EBFBE0_801B86B0); + func_menu_80191320(1, &D_80177978, &D_80177980, &D_80177988, &D_801779A0, &D_801779B8, &D_801779C0, D_menu_801B86A8, + D_menu_801B86AC, D_menu_801B86B0); func_800B6F50(D_80177978, D_80177980, D_80177988, D_801779A0, D_801779B8, D_801779C0); D_8017842C -= 0.5f; - if (D_EBFBE0_801B82B0 > 0) { - D_EBFBE0_801B82B0 -= 1; + if (D_menu_801B82B0 > 0) { + D_menu_801B82B0 -= 1; } - if (D_EBFBE0_801B9040 == 1) { - D_EBFBE0_801B82BC = 450; + if (D_menu_801B9040 == 1) { + D_menu_801B82BC = 450; } - if (D_EBFBE0_801B82BC != 0) { - D_EBFBE0_801B82BC -= 1; + if (D_menu_801B82BC != 0) { + D_menu_801B82BC -= 1; return; } D_80178410 = 0; - D_EBFBE0_801B82C0 = 0; + D_menu_801B82C0 = 0; gDrawMode = DRAWMODE_0; - D_EBFBE0_801B82C4 = 7; + D_menu_801B82C4 = 7; } -void func_EBFBE0_80189208(void) { +void func_menu_80189208(void) { s32 i; - static s32 D_EBFBE0_801ADA84[4] = { 0, 1, 3, 2 }; + static s32 D_menu_801ADA84[4] = { 0, 1, 3, 2 }; - gLight1R = D_EBFBE0_801B82F8; - gLight1G = D_EBFBE0_801B82FC; - gLight1B = D_EBFBE0_801B8300; - gAmbientR = D_EBFBE0_801B8304; - gAmbientG = D_EBFBE0_801B8308; - gAmbientB = D_EBFBE0_801B830C; + gLight1R = D_menu_801B82F8; + gLight1G = D_menu_801B82FC; + gLight1B = D_menu_801B8300; + gAmbientR = D_menu_801B8304; + gAmbientG = D_menu_801B8308; + gAmbientB = D_menu_801B830C; - if ((D_EBFBE0_801B86A4 < 2) && (D_EBFBE0_801B9040 != 0)) { - D_EBFBE0_801B86D8 = Math_Atan2F(-D_EBFBE0_801B9060, sqrtf((-D_EBFBE0_801B905C * -D_EBFBE0_801B905C) + - (-D_EBFBE0_801B9064 * -D_EBFBE0_801B9064))) * - 180.0f / M_PI; - D_EBFBE0_801B86DC = (Math_Atan2F(D_EBFBE0_801B905C, D_EBFBE0_801B9064) * 180.0f) / M_PI; + if ((D_menu_801B86A4 < 2) && (D_menu_801B9040 != 0)) { + D_menu_801B86D8 = Math_Atan2F(-D_menu_801B9060, sqrtf((-D_menu_801B905C * -D_menu_801B905C) + + (-D_menu_801B9064 * -D_menu_801B9064))) * + 180.0f / M_PI; + D_menu_801B86DC = (Math_Atan2F(D_menu_801B905C, D_menu_801B9064) * 180.0f) / M_PI; - Math_SmoothStepToF(&D_EBFBE0_801B86C8, D_EBFBE0_801B86D8, 0.1f, 100.0f, 0.0001f); - Math_SmoothStepToF(&D_EBFBE0_801B86CC, D_EBFBE0_801B86DC, 0.1f, 100.0f, 0.0001f); + Math_SmoothStepToF(&D_menu_801B86C8, D_menu_801B86D8, 0.1f, 100.0f, 0.0001f); + Math_SmoothStepToF(&D_menu_801B86CC, D_menu_801B86DC, 0.1f, 100.0f, 0.0001f); } - func_EBFBE0_80191674(D_EBFBE0_801B86C8, D_EBFBE0_801B86CC, 100.0f, &D_EBFBE0_801B82E0, &D_EBFBE0_801B82E4, - &D_EBFBE0_801B82E8); + func_menu_80191674(D_menu_801B86C8, D_menu_801B86CC, 100.0f, &D_menu_801B82E0, &D_menu_801B82E4, &D_menu_801B82E8); for (i = 0; i < 4; i++) { - func_EBFBE0_8018EA78(D_EBFBE0_801ADA84[i]); - D_EBFBE0_801B8350[D_EBFBE0_801ADA84[i]].unk_58 += D_EBFBE0_801B8350[D_EBFBE0_801ADA84[i]].unk_5C; + func_menu_8018EA78(D_menu_801ADA84[i]); + D_menu_801B8350[D_menu_801ADA84[i]].unk_58 += D_menu_801B8350[D_menu_801ADA84[i]].unk_5C; } - gLight1R = D_EBFBE0_801B8310; - gLight1G = D_EBFBE0_801B8314; - gLight1B = D_EBFBE0_801B8318; + gLight1R = D_menu_801B8310; + gLight1G = D_menu_801B8314; + gLight1B = D_menu_801B8318; - gAmbientR = D_EBFBE0_801B831C; - gAmbientG = D_EBFBE0_801B8320; - gAmbientB = D_EBFBE0_801B8324; + gAmbientR = D_menu_801B831C; + gAmbientG = D_menu_801B8320; + gAmbientB = D_menu_801B8324; - func_EBFBE0_80191674(D_EBFBE0_801B86D0, D_EBFBE0_801B86D4, 100.0f, &D_EBFBE0_801B82E0, &D_EBFBE0_801B82E4, - &D_EBFBE0_801B82E8); + func_menu_80191674(D_menu_801B86D0, D_menu_801B86D4, 100.0f, &D_menu_801B82E0, &D_menu_801B82E4, &D_menu_801B82E8); - func_EBFBE0_8018D2B8(0); + func_menu_8018D2B8(0); } -void func_EBFBE0_801894E8(void) { +void func_menu_801894E8(void) { s32 i; D_80178410 = 800; - D_EBFBE0_801B7C98 = 10; + D_menu_801B7C98 = 10; for (i = 0; i < 10; i++) { - D_EBFBE0_801B7BF8[i] = 10.0f + (Rand_ZeroOne() * 10.0f); - D_EBFBE0_801B7C20[i] = -10.0f + (Rand_ZeroOne() * -60.0f); - D_EBFBE0_801B7C48[i] = 0.0f; - D_EBFBE0_801B7C70[i] = 0.1f + (Rand_ZeroOne() * 0.3f); - D_EBFBE0_801B7D18[i] = 5 + (s32) (Rand_ZeroOne() * 5.0f); - D_EBFBE0_801B7CC8[i] = 255; - D_EBFBE0_801B7CF0[i] = 128; - D_EBFBE0_801B7CA0[i] = 0; + D_menu_801B7BF8[i] = 10.0f + (Rand_ZeroOne() * 10.0f); + D_menu_801B7C20[i] = -10.0f + (Rand_ZeroOne() * -60.0f); + D_menu_801B7C48[i] = 0.0f; + D_menu_801B7C70[i] = 0.1f + (Rand_ZeroOne() * 0.3f); + D_menu_801B7D18[i] = 5 + (s32) (Rand_ZeroOne() * 5.0f); + D_menu_801B7CC8[i] = 255; + D_menu_801B7CF0[i] = 128; + D_menu_801B7CA0[i] = 0; } - D_EBFBE0_801B869C = 255; + D_menu_801B869C = 255; D_80178340 = 255; D_80178348 = 0; D_80178350 = 0; D_80178354 = 0; - D_EBFBE0_801B9070 = 110.0f; - D_EBFBE0_801B9074 = 70.0f; - D_EBFBE0_801B9078 = 1.0f; - D_EBFBE0_801B907C = 1.0f; - D_EBFBE0_801B7BDC = 0.0f; - D_EBFBE0_801B7BE0 = 0.0f; - D_EBFBE0_801B7BD4 = 0; - D_EBFBE0_801B7BD8 = 0; - D_EBFBE0_801B9080 = 0.0f; - D_EBFBE0_801B9084 = 60.0f; - D_EBFBE0_801B7BB0 = 1.0f; - D_EBFBE0_801B7BB4 = 1.0f; - D_EBFBE0_801B7BD0 = 0; - D_EBFBE0_801B7BB8 = -900.0f; - D_EBFBE0_801B7BBC = 205.0f; - D_EBFBE0_801B7BC0 = 10.0f; - D_EBFBE0_801B7BC4 = 10.0f; - D_EBFBE0_801B86C8 = 0.0f; - D_EBFBE0_801B86CC = 162.0f; + D_menu_801B9070 = 110.0f; + D_menu_801B9074 = 70.0f; + D_menu_801B9078 = 1.0f; + D_menu_801B907C = 1.0f; + D_menu_801B7BDC = 0.0f; + D_menu_801B7BE0 = 0.0f; + D_menu_801B7BD4 = 0; + D_menu_801B7BD8 = 0; + D_menu_801B9080 = 0.0f; + D_menu_801B9084 = 60.0f; + D_menu_801B7BB0 = 1.0f; + D_menu_801B7BB4 = 1.0f; + D_menu_801B7BD0 = 0; + D_menu_801B7BB8 = -900.0f; + D_menu_801B7BBC = 205.0f; + D_menu_801B7BC0 = 10.0f; + D_menu_801B7BC4 = 10.0f; + D_menu_801B86C8 = 0.0f; + D_menu_801B86CC = 162.0f; gLight1R = 101; gLight1G = 106; @@ -834,55 +831,55 @@ void func_EBFBE0_801894E8(void) { gAmbientG = 4; gAmbientB = 10; - D_EBFBE0_801B8688.pos.y = 0.0f; - D_EBFBE0_801B8688.unk_0C = 0; - D_EBFBE0_801B8688.pos.x = -80.0f; - D_EBFBE0_801B8688.pos.z = 500.0f; - D_EBFBE0_801B8688.scale = 5.0f; + D_menu_801B8688.pos.y = 0.0f; + D_menu_801B8688.unk_0C = 0; + D_menu_801B8688.pos.x = -80.0f; + D_menu_801B8688.pos.z = 500.0f; + D_menu_801B8688.scale = 5.0f; - D_EBFBE0_801B8348 = 0; + D_menu_801B8348 = 0; - D_EBFBE0_801B8658.pos.x = 20.0f; - D_EBFBE0_801B8658.pos.y = 0.0f; - D_EBFBE0_801B8658.pos.z = 30.0f; - D_EBFBE0_801B8658.angleX = 0.0f; - D_EBFBE0_801B8658.angleY = 0.0f; - D_EBFBE0_801B8658.angleZ = 0.0f; - D_EBFBE0_801B8658.scale = 0.1f; + D_menu_801B8658.pos.x = 20.0f; + D_menu_801B8658.pos.y = 0.0f; + D_menu_801B8658.pos.z = 30.0f; + D_menu_801B8658.angleX = 0.0f; + D_menu_801B8658.angleY = 0.0f; + D_menu_801B8658.angleZ = 0.0f; + D_menu_801B8658.scale = 0.1f; - D_EBFBE0_801B86BC = 0.0f; - D_EBFBE0_801B86C0 = 0.0f; - D_EBFBE0_801B86C4 = 0.0f; - D_EBFBE0_801B86A8 = -10.0f; - D_EBFBE0_801B86AC = 0.0f; + D_menu_801B86BC = 0.0f; + D_menu_801B86C0 = 0.0f; + D_menu_801B86C4 = 0.0f; + D_menu_801B86A8 = -10.0f; + D_menu_801B86AC = 0.0f; - D_EBFBE0_801B86B4 = 1500.0f; - D_EBFBE0_801B86B8 = -100.0f; - D_EBFBE0_801B829C = 0.0f; - D_EBFBE0_801B82A0 = 1.0f; - D_EBFBE0_801B82A4 = 0.0f; + D_menu_801B86B4 = 1500.0f; + D_menu_801B86B8 = -100.0f; + D_menu_801B829C = 0.0f; + D_menu_801B82A0 = 1.0f; + D_menu_801B82A4 = 0.0f; - func_EBFBE0_801914AC(D_EBFBE0_801B86BC, D_EBFBE0_801B86C0, D_EBFBE0_801B86C4, &D_80177978, &D_80177980, &D_80177988, - D_EBFBE0_801B86B4, &D_801779A0, &D_801779B8, &D_801779C0, D_EBFBE0_801B86B8, D_EBFBE0_801B86A8, - D_EBFBE0_801B86AC); + func_menu_801914AC(D_menu_801B86BC, D_menu_801B86C0, D_menu_801B86C4, &D_80177978, &D_80177980, &D_80177988, + D_menu_801B86B4, &D_801779A0, &D_801779B8, &D_801779C0, D_menu_801B86B8, D_menu_801B86A8, + D_menu_801B86AC); - D_EBFBE0_801B7BF0 = 0; + D_menu_801B7BF0 = 0; func_8001D444(0, 35, 0, 255); } -void func_EBFBE0_8018994C(void) { +void func_menu_8018994C(void) { f32 temp; f32 temp2; - switch (D_EBFBE0_801B82C0) { + switch (D_menu_801B82C0) { case 0: - func_EBFBE0_801894E8(); - D_EBFBE0_801B8294 = D_EBFBE0_801B6B40; - D_EBFBE0_801B7BE8 = 1.0f; - D_EBFBE0_801B82CC = 0.002f; - D_EBFBE0_801B82C0 = 100; - D_EBFBE0_801B82B8 = 0; + func_menu_801894E8(); + D_menu_801B8294 = D_menu_801B6B40; + D_menu_801B7BE8 = 1.0f; + D_menu_801B82CC = 0.002f; + D_menu_801B82C0 = 100; + D_menu_801B82B8 = 0; gRadioState = 0; D_80178300 = 0; @@ -893,37 +890,37 @@ void func_EBFBE0_8018994C(void) { if (D_80178340 != 0) { D_80178340 -= 5; } else { - D_EBFBE0_801B82A8 = 19; - D_EBFBE0_801B82C0 = 1; + D_menu_801B82A8 = 19; + D_menu_801B82C0 = 1; } break; case 1: - if (D_EBFBE0_801B82A8 == 0) { - temp2 = Math_SmoothStepToF(&D_EBFBE0_801B7BDC, 255.0f, D_EBFBE0_801B82CC, 100.0f, 1.0f); - D_EBFBE0_801B82CC *= 1.08f; + if (D_menu_801B82A8 == 0) { + temp2 = Math_SmoothStepToF(&D_menu_801B7BDC, 255.0f, D_menu_801B82CC, 100.0f, 1.0f); + D_menu_801B82CC *= 1.08f; if (temp2 == 0.0f) { - D_EBFBE0_801B82A8 = 50; - D_EBFBE0_801B82AC = 85; - D_EBFBE0_801B82D0 = 0.01f; - D_EBFBE0_801B82CC = 0.002f; - D_EBFBE0_801B82C0++; + D_menu_801B82A8 = 50; + D_menu_801B82AC = 85; + D_menu_801B82D0 = 0.01f; + D_menu_801B82CC = 0.002f; + D_menu_801B82C0++; } } break; case 2: - if (D_EBFBE0_801B82A8 == 0) { - Math_SmoothStepToF(&D_EBFBE0_801B7BDC, 0.0f, D_EBFBE0_801B82D0, 100.0f, 0.1f); - D_EBFBE0_801B82D0 *= 1.06f; - if (D_EBFBE0_801B82AC == 0) { - temp2 = Math_SmoothStepToF(&D_EBFBE0_801B7BE0, 255.0f, D_EBFBE0_801B82CC, 100.0f, 1.0f); - D_EBFBE0_801B82CC *= 1.08f; + if (D_menu_801B82A8 == 0) { + Math_SmoothStepToF(&D_menu_801B7BDC, 0.0f, D_menu_801B82D0, 100.0f, 0.1f); + D_menu_801B82D0 *= 1.06f; + if (D_menu_801B82AC == 0) { + temp2 = Math_SmoothStepToF(&D_menu_801B7BE0, 255.0f, D_menu_801B82CC, 100.0f, 1.0f); + D_menu_801B82CC *= 1.08f; if (temp2 == 0.0f) { - D_EBFBE0_801B82A8 = 30; - D_EBFBE0_801B82D0 = 0.02f; - D_EBFBE0_801B82C0++; - D_EBFBE0_801B7BD8 = 1; + D_menu_801B82A8 = 30; + D_menu_801B82D0 = 0.02f; + D_menu_801B82C0++; + D_menu_801B7BD8 = 1; D_80178340 = 0; } } @@ -931,241 +928,240 @@ void func_EBFBE0_8018994C(void) { break; case 3: - if (D_EBFBE0_801B82A8 == 0) { - Math_SmoothStepToF(&D_EBFBE0_801B7BE0, 0.0f, D_EBFBE0_801B82D0, 100.0f, 0.1f); - D_EBFBE0_801B82D0 *= 1.07f; - if (D_EBFBE0_801B7BB8 < 1200.0f) { - D_EBFBE0_801B7BB8 += 10.0f; - if (D_EBFBE0_801B7BB8 > 50.0f) { - D_EBFBE0_801B7BD4 = 1; - D_EBFBE0_801B7BDC += 1.8f; + if (D_menu_801B82A8 == 0) { + Math_SmoothStepToF(&D_menu_801B7BE0, 0.0f, D_menu_801B82D0, 100.0f, 0.1f); + D_menu_801B82D0 *= 1.07f; + if (D_menu_801B7BB8 < 1200.0f) { + D_menu_801B7BB8 += 10.0f; + if (D_menu_801B7BB8 > 50.0f) { + D_menu_801B7BD4 = 1; + D_menu_801B7BDC += 1.8f; } } else { - D_EBFBE0_801B7BD8 = 0; - D_EBFBE0_801B82C0++; + D_menu_801B7BD8 = 0; + D_menu_801B82C0++; } } break; case 4: - if (D_EBFBE0_801B7BDC < 255.0f) { - D_EBFBE0_801B7BDC += 1.0f; + if (D_menu_801B7BDC < 255.0f) { + D_menu_801B7BDC += 1.0f; } else { - D_EBFBE0_801B7BDC = 255.0f; - D_EBFBE0_801B82A8 = 70; - D_EBFBE0_801B82B4 = 0; - D_EBFBE0_801B82D4 = 0.02f; - D_EBFBE0_801B82D8 = 0.00005f; - D_EBFBE0_801B82DC = 0.02f; - D_EBFBE0_801B8298 = 0; - D_EBFBE0_801B828C = 0.0f; - D_EBFBE0_801B8290 = 0.011f; + D_menu_801B7BDC = 255.0f; + D_menu_801B82A8 = 70; + D_menu_801B82B4 = 0; + D_menu_801B82D4 = 0.02f; + D_menu_801B82D8 = 0.00005f; + D_menu_801B82DC = 0.02f; + D_menu_801B8298 = 0; + D_menu_801B828C = 0.0f; + D_menu_801B8290 = 0.011f; - D_80177978 = D_EBFBE0_801B6B40[0].unk_00; - D_80177980 = D_EBFBE0_801B6B40[0].unk_04; - D_80177988 = D_EBFBE0_801B6B40[0].unk_08; - D_801779A0 = D_EBFBE0_801B6B40[0].unk_0C; - D_801779B8 = D_EBFBE0_801B6B40[0].unk_10; - D_801779C0 = D_EBFBE0_801B6B40[0].unk_14; + D_80177978 = D_menu_801B6B40[0].unk_00; + D_80177980 = D_menu_801B6B40[0].unk_04; + D_80177988 = D_menu_801B6B40[0].unk_08; + D_801779A0 = D_menu_801B6B40[0].unk_0C; + D_801779B8 = D_menu_801B6B40[0].unk_10; + D_801779C0 = D_menu_801B6B40[0].unk_14; - D_EBFBE0_801B82C0 = 10; + D_menu_801B82C0 = 10; } break; case 10: - if (D_EBFBE0_801B82B4 == 45) { - D_EBFBE0_801B7BF0 = 1; + if (D_menu_801B82B4 == 45) { + D_menu_801B7BF0 = 1; } - if (D_EBFBE0_801B82B4 == 145) { - D_EBFBE0_801B7BF0 = 0; + if (D_menu_801B82B4 == 145) { + D_menu_801B7BF0 = 0; } - if (D_EBFBE0_801B82B8 == 638) { - Audio_PlaySfx(0x11030010, &D_EBFBE0_801B867C, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - Audio_PlaySfx(0x31024059, &D_EBFBE0_801B867C, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + if (D_menu_801B82B8 == 638) { + Audio_PlaySfx(0x11030010, &D_menu_801B867C, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + Audio_PlaySfx(0x31024059, &D_menu_801B867C, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); func_800BA808(gMsg_ID_60, RCID_ROB64_TITLE); } - if (D_EBFBE0_801B82B8 == 838) { - func_EBFBE0_801919C4(D_EBFBE0_801ADA30, RCID_GEN_PEPPER_TITLE); + if (D_menu_801B82B8 == 838) { + func_menu_801919C4(D_menu_801ADA30, RCID_GEN_PEPPER_TITLE); } - if (D_EBFBE0_801B82A8 == 1) { - D_EBFBE0_801B8348 = 1; + if (D_menu_801B82A8 == 1) { + D_menu_801B8348 = 1; } - if (D_EBFBE0_801B82A8 != 0) { + if (D_menu_801B82A8 != 0) { break; } - if (D_EBFBE0_801B9078 < 1.39f) { - D_EBFBE0_801B9078 += 0.01f; - D_EBFBE0_801B907C += 0.01f; - D_EBFBE0_801B9070 -= 0.5f; - D_EBFBE0_801B9074 -= 0.5f; + if (D_menu_801B9078 < 1.39f) { + D_menu_801B9078 += 0.01f; + D_menu_801B907C += 0.01f; + D_menu_801B9070 -= 0.5f; + D_menu_801B9074 -= 0.5f; } - temp = Math_SmoothStepToF(&D_EBFBE0_801B7BDC, 0.0f, D_EBFBE0_801B82DC, 100.0f, 0.1f); + temp = Math_SmoothStepToF(&D_menu_801B7BDC, 0.0f, D_menu_801B82DC, 100.0f, 0.1f); - D_EBFBE0_801B82DC *= 1.06f; + D_menu_801B82DC *= 1.06f; if (temp == 0.0f) { - D_EBFBE0_801B7BD4 = -1; + D_menu_801B7BD4 = -1; } - func_EBFBE0_8018CC30(D_EBFBE0_801B8294, 12, D_EBFBE0_801B8290); + func_menu_8018CC30(D_menu_801B8294, 12, D_menu_801B8290); - func_EBFBE0_80191798(&D_EBFBE0_801B86A8, &D_EBFBE0_801B86AC); - func_EBFBE0_80191844(D_EBFBE0_801B86A8, D_EBFBE0_801B86AC); + func_menu_80191798(&D_menu_801B86A8, &D_menu_801B86AC); + func_menu_80191844(D_menu_801B86A8, D_menu_801B86AC); - if ((D_EBFBE0_801B82B8 > 960) && (D_EBFBE0_801B7BE8 > 0.0f)) { - D_EBFBE0_801B7BE8 -= 0.0022f; - if (D_EBFBE0_801B7BE8 < 0.0f) { - D_EBFBE0_801B7BE8 = 0.0f; + if ((D_menu_801B82B8 > 960) && (D_menu_801B7BE8 > 0.0f)) { + D_menu_801B7BE8 -= 0.0022f; + if (D_menu_801B7BE8 < 0.0f) { + D_menu_801B7BE8 = 0.0f; } } - if (D_EBFBE0_801B86AC > -100.0f) { - Math_SmoothStepToF(&D_EBFBE0_801B86C8, 15.0f, D_EBFBE0_801B82D4, 100.0f, 0.0001f); - Math_SmoothStepToF(&D_EBFBE0_801B86CC, -35.0f, D_EBFBE0_801B82D4, 100.0f, 0.0001f); - D_EBFBE0_801B82D4 -= 0.000005f; + if (D_menu_801B86AC > -100.0f) { + Math_SmoothStepToF(&D_menu_801B86C8, 15.0f, D_menu_801B82D4, 100.0f, 0.0001f); + Math_SmoothStepToF(&D_menu_801B86CC, -35.0f, D_menu_801B82D4, 100.0f, 0.0001f); + D_menu_801B82D4 -= 0.000005f; } else { - Math_SmoothStepToF(&D_EBFBE0_801B86C8, -20.0f, D_EBFBE0_801B82D8, 100.0f, 0.0001f); - Math_SmoothStepToF(&D_EBFBE0_801B86CC, -25.0f, D_EBFBE0_801B82D8, 100.0f, 0.0001f); + Math_SmoothStepToF(&D_menu_801B86C8, -20.0f, D_menu_801B82D8, 100.0f, 0.0001f); + Math_SmoothStepToF(&D_menu_801B86CC, -25.0f, D_menu_801B82D8, 100.0f, 0.0001f); - if (D_EBFBE0_801B82B4 > 550) { - D_EBFBE0_801B82D8 += 0.0001f; + if (D_menu_801B82B4 > 550) { + D_menu_801B82D8 += 0.0001f; } else { - D_EBFBE0_801B82D8 += 0.000001f; + D_menu_801B82D8 += 0.000001f; } } - if (D_EBFBE0_801B82B4 == 260) { - D_EBFBE0_801B8694 = 1; + if (D_menu_801B82B4 == 260) { + D_menu_801B8694 = 1; } - if (D_EBFBE0_801B82B4 == 750) { + if (D_menu_801B82B4 == 750) { D_80178340 = 0; D_80178348 = 0; D_80178350 = 0; D_80178354 = 0; - D_EBFBE0_801B869C = 1; + D_menu_801B869C = 1; } if (D_80178340 == 255) { - func_8001A55C(&D_EBFBE0_801B867C, 0x11030010); - func_8001A55C(&D_EBFBE0_801B867C, 0x31024059); + func_8001A55C(&D_menu_801B867C, 0x11030010); + func_8001A55C(&D_menu_801B867C, 0x31024059); - D_EBFBE0_801B82C0 = 0; + D_menu_801B82C0 = 0; gDrawMode = DRAWMODE_0; - D_EBFBE0_801B82C4 = 2; + D_menu_801B82C4 = 2; } - D_EBFBE0_801B82B4++; + D_menu_801B82B4++; break; } - func_EBFBE0_801912A0(); - func_EBFBE0_80191674(D_EBFBE0_801B86C8, D_EBFBE0_801B86CC, 100.0f, &D_EBFBE0_801B82E0, &D_EBFBE0_801B82E4, - &D_EBFBE0_801B82E8); + func_menu_801912A0(); + func_menu_80191674(D_menu_801B86C8, D_menu_801B86CC, 100.0f, &D_menu_801B82E0, &D_menu_801B82E4, &D_menu_801B82E8); - if (D_EBFBE0_801B7BE8 != 0) { + if (D_menu_801B7BE8 != 0) { func_800B6F50(D_80177978, D_80177980, D_80177988, D_801779A0, D_801779B8, D_801779C0); } - D_8017842C -= D_EBFBE0_801B7BE8; - D_EBFBE0_801B82B8++; + D_8017842C -= D_menu_801B7BE8; + D_menu_801B82B8++; } -void func_EBFBE0_8018A2F8(void) { - if (D_EBFBE0_801B8694 != 0) { - func_EBFBE0_8018DF0C(-700.0f); +void func_menu_8018A2F8(void) { + if (D_menu_801B8694 != 0) { + func_menu_8018DF0C(-700.0f); } - func_EBFBE0_8018E058(); + func_menu_8018E058(); } -void func_EBFBE0_8018A338(void) { +void func_menu_8018A338(void) { D_80178410 = 0; - D_EBFBE0_801B869C = 255; + D_menu_801B869C = 255; D_80178340 = 255; D_80178348 = 0; D_80178350 = 0; D_80178354 = 0; - D_EBFBE0_801B8344 = 0; - D_EBFBE0_801B8334 = 0; - D_EBFBE0_801B8338 = 1; + D_menu_801B8344 = 0; + D_menu_801B8334 = 0; + D_menu_801B8338 = 1; - D_EBFBE0_801B8328 = D_EBFBE0_801B832C = D_EBFBE0_801B8330 = 155.0f; + D_menu_801B8328 = D_menu_801B832C = D_menu_801B8330 = 155.0f; - D_EBFBE0_801B8328 = 77.0f; - D_EBFBE0_801B832C = 77.0f; - D_EBFBE0_801B8330 = 77.0f; + D_menu_801B8328 = 77.0f; + D_menu_801B832C = 77.0f; + D_menu_801B8330 = 77.0f; - D_EBFBE0_801B86C8 = 0.0f; - D_EBFBE0_801B86CC = -90.0f; - D_EBFBE0_801B82F8 = 76; - D_EBFBE0_801B82FC = 45; - D_EBFBE0_801B8300 = 66; - D_EBFBE0_801B8304 = 11.0f; - D_EBFBE0_801B8308 = 1.0f; - D_EBFBE0_801B830C = 1.0f; - D_EBFBE0_801B84D4 = 0.5f; + D_menu_801B86C8 = 0.0f; + D_menu_801B86CC = -90.0f; + D_menu_801B82F8 = 76; + D_menu_801B82FC = 45; + D_menu_801B8300 = 66; + D_menu_801B8304 = 11.0f; + D_menu_801B8308 = 1.0f; + D_menu_801B830C = 1.0f; + D_menu_801B84D4 = 0.5f; - D_EBFBE0_801B8350[0].unk_00.x = -20.0f; - D_EBFBE0_801B8350[0].unk_00.y = 0.0f; - D_EBFBE0_801B8350[0].unk_00.z = -600.0f; - D_EBFBE0_801B8350[0].unk_0C = 0.0f; - D_EBFBE0_801B8350[0].unk_10 = 3.0f; - D_EBFBE0_801B8350[0].unk_58 = 14; - D_EBFBE0_801B8350[0].unk_5C = 5; + D_menu_801B8350[0].unk_00.x = -20.0f; + D_menu_801B8350[0].unk_00.y = 0.0f; + D_menu_801B8350[0].unk_00.z = -600.0f; + D_menu_801B8350[0].unk_0C = 0.0f; + D_menu_801B8350[0].unk_10 = 3.0f; + D_menu_801B8350[0].unk_58 = 14; + D_menu_801B8350[0].unk_5C = 5; - D_EBFBE0_801B8350[1].unk_00.x = -209.0f; - D_EBFBE0_801B8350[1].unk_00.y = 0.0f; - D_EBFBE0_801B8350[1].unk_00.z = -820.0f; - D_EBFBE0_801B8350[1].unk_0C = 0.0f; - D_EBFBE0_801B8350[1].unk_10 = 3.0f; - D_EBFBE0_801B8350[1].unk_58 = 0; - D_EBFBE0_801B8350[1].unk_5C = 5; + D_menu_801B8350[1].unk_00.x = -209.0f; + D_menu_801B8350[1].unk_00.y = 0.0f; + D_menu_801B8350[1].unk_00.z = -820.0f; + D_menu_801B8350[1].unk_0C = 0.0f; + D_menu_801B8350[1].unk_10 = 3.0f; + D_menu_801B8350[1].unk_58 = 0; + D_menu_801B8350[1].unk_5C = 5; - D_EBFBE0_801B8350[2].unk_00.x = 62.0f; - D_EBFBE0_801B8350[2].unk_00.y = 0.0f; - D_EBFBE0_801B8350[2].unk_00.z = -813.0f; - D_EBFBE0_801B8350[2].unk_0C = 0.0f; - D_EBFBE0_801B8350[2].unk_10 = 3.0f; - D_EBFBE0_801B8350[2].unk_58 = 29; - D_EBFBE0_801B8350[2].unk_5C = 6; + D_menu_801B8350[2].unk_00.x = 62.0f; + D_menu_801B8350[2].unk_00.y = 0.0f; + D_menu_801B8350[2].unk_00.z = -813.0f; + D_menu_801B8350[2].unk_0C = 0.0f; + D_menu_801B8350[2].unk_10 = 3.0f; + D_menu_801B8350[2].unk_58 = 29; + D_menu_801B8350[2].unk_5C = 6; - D_EBFBE0_801B8350[3].unk_00.x = 183.0f; - D_EBFBE0_801B8350[3].unk_00.y = 0.0f; - D_EBFBE0_801B8350[3].unk_00.z = -990.0f; - D_EBFBE0_801B8350[3].unk_0C = 0.0f; - D_EBFBE0_801B8350[3].unk_10 = 3.0f; - D_EBFBE0_801B8350[3].unk_58 = 41; - D_EBFBE0_801B8350[3].unk_5C = 7; + D_menu_801B8350[3].unk_00.x = 183.0f; + D_menu_801B8350[3].unk_00.y = 0.0f; + D_menu_801B8350[3].unk_00.z = -990.0f; + D_menu_801B8350[3].unk_0C = 0.0f; + D_menu_801B8350[3].unk_10 = 3.0f; + D_menu_801B8350[3].unk_58 = 41; + D_menu_801B8350[3].unk_5C = 7; - D_EBFBE0_801B84D0 = -6000.0f; - D_EBFBE0_801B86BC = 22.0f; - D_EBFBE0_801B86C0 = 116.0f; - D_EBFBE0_801B86C4 = -543.0f; - D_EBFBE0_801B86A8 = 3.0f; - D_EBFBE0_801B86AC = 7.0f; - D_EBFBE0_801B86B4 = 400.0f; - D_EBFBE0_801B86B8 = -100.0f; - D_EBFBE0_801B829C = 0.0f; - D_EBFBE0_801B82A0 = 1.0f; - D_EBFBE0_801B82A4 = 0.0f; + D_menu_801B84D0 = -6000.0f; + D_menu_801B86BC = 22.0f; + D_menu_801B86C0 = 116.0f; + D_menu_801B86C4 = -543.0f; + D_menu_801B86A8 = 3.0f; + D_menu_801B86AC = 7.0f; + D_menu_801B86B4 = 400.0f; + D_menu_801B86B8 = -100.0f; + D_menu_801B829C = 0.0f; + D_menu_801B82A0 = 1.0f; + D_menu_801B82A4 = 0.0f; - func_EBFBE0_801914AC(D_EBFBE0_801B86BC, D_EBFBE0_801B86C0, D_EBFBE0_801B86C4, &D_80177978, &D_80177980, &D_80177988, - D_EBFBE0_801B86B4, &D_801779A0, &D_801779B8, &D_801779C0, D_EBFBE0_801B86B8, D_EBFBE0_801B86A8, - D_EBFBE0_801B86AC); + func_menu_801914AC(D_menu_801B86BC, D_menu_801B86C0, D_menu_801B86C4, &D_80177978, &D_80177980, &D_80177988, + D_menu_801B86B4, &D_801779A0, &D_801779B8, &D_801779C0, D_menu_801B86B8, D_menu_801B86A8, + D_menu_801B86AC); } -static UnkStruct_D_EBFBE0_801B8294 D_EBFBE0_801ADA94[50] = { +static UnkStruct_D_menu_801B8294 D_menu_801ADA94[50] = { { 70.68093f, 95.06561f, -146.52567f, 9.829767f, 121.2336f, -642.1186f }, { 205.506f, 142.9332f, -268.0091f, 168.6235f, 176.76671f, -765.49774f }, { 247.74275f, 218.72449f, -519.0222f, 186.81432f, 211.56888f, -1015.24445f }, @@ -1202,89 +1198,88 @@ static UnkStruct_D_EBFBE0_801B8294 D_EBFBE0_801ADA94[50] = { { -357.60858f, 192.84035f, -1394.141f, 41.881878f, 129.81488f, -738.9043f }, }; -void func_EBFBE0_8018A644(void) { - static s32 D_EBFBE0_801ADF44[] = { 63, 170, 268, 368 }; +void func_menu_8018A644(void) { + static s32 D_menu_801ADF44[] = { 63, 170, 268, 368 }; - switch (D_EBFBE0_801B82C0) { + switch (D_menu_801B82C0) { case 0: - func_EBFBE0_8018A338(); + func_menu_8018A338(); Audio_PlaySfx(0x49000014, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - Audio_PlaySfx(0x0140001C, (Vec3f*) &D_EBFBE0_801B84D8, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + Audio_PlaySfx(0x0140001C, (Vec3f*) &D_menu_801B84D8, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B82B4 = 0; - D_EBFBE0_801B82C8 = 0.0f; - D_EBFBE0_801B7BEC = 0; - D_EBFBE0_801B82C0++; + D_menu_801B82B4 = 0; + D_menu_801B82C8 = 0.0f; + D_menu_801B7BEC = 0; + D_menu_801B82C0++; break; case 1: - if (D_EBFBE0_801B82B4 == 20) { - D_EBFBE0_801B869C = 0; + if (D_menu_801B82B4 == 20) { + D_menu_801B869C = 0; } - if (D_EBFBE0_801B84D0 != 0.0f) { - Math_SmoothStepToF(&D_EBFBE0_801B84D0, 0.0f, 0.09f, 70.0f, 1.0f); + if (D_menu_801B84D0 != 0.0f) { + Math_SmoothStepToF(&D_menu_801B84D0, 0.0f, 0.09f, 70.0f, 1.0f); } - if (D_EBFBE0_801B84D0 == 0.0f) { - D_EBFBE0_801B82B4 = 0; - D_EBFBE0_801B8340 = 0; - D_EBFBE0_801B8294 = D_EBFBE0_801ADA94; - D_EBFBE0_801B8298 = 0; - D_EBFBE0_801B828C = 0.0f; - D_EBFBE0_801B8290 = 0.06f; - D_EBFBE0_801B82C0++; + if (D_menu_801B84D0 == 0.0f) { + D_menu_801B82B4 = 0; + D_menu_801B8340 = 0; + D_menu_801B8294 = D_menu_801ADA94; + D_menu_801B8298 = 0; + D_menu_801B828C = 0.0f; + D_menu_801B8290 = 0.06f; + D_menu_801B82C0++; } - D_EBFBE0_801B82B4++; + D_menu_801B82B4++; break; case 2: - func_EBFBE0_80191798(&D_EBFBE0_801B86A8, &D_EBFBE0_801B86AC); - func_EBFBE0_80191844(D_EBFBE0_801B86A8, D_EBFBE0_801B86AC); - func_EBFBE0_8018CC30(D_EBFBE0_801B8294, 34, D_EBFBE0_801B8290); + func_menu_80191798(&D_menu_801B86A8, &D_menu_801B86AC); + func_menu_80191844(D_menu_801B86A8, D_menu_801B86AC); + func_menu_8018CC30(D_menu_801B8294, 34, D_menu_801B8290); - if (D_EBFBE0_801B82B4 == D_EBFBE0_801ADF44[D_EBFBE0_801B8340]) { - D_EBFBE0_801B8344 = 1; - D_EBFBE0_801B82A8 = 40; - D_EBFBE0_801B82C0 = 3; + if (D_menu_801B82B4 == D_menu_801ADF44[D_menu_801B8340]) { + D_menu_801B8344 = 1; + D_menu_801B82A8 = 40; + D_menu_801B82C0 = 3; } - if (D_EBFBE0_801B82B4 == 475) { - D_EBFBE0_801B869C = 1; + if (D_menu_801B82B4 == 475) { + D_menu_801B869C = 1; } - if (D_EBFBE0_801B7BEC == 795) { + if (D_menu_801B7BEC == 795) { func_8001A838(0x49000014); - func_8001A55C(&D_EBFBE0_801B84D8, 0x0140001C); + func_8001A55C(&D_menu_801B84D8, 0x0140001C); - D_EBFBE0_801B82C0 = 0; + D_menu_801B82C0 = 0; gDrawMode = DRAWMODE_0; - D_EBFBE0_801B82C4 = 3; + D_menu_801B82C4 = 3; } - D_EBFBE0_801B82B4++; + D_menu_801B82B4++; break; case 3: - if (D_EBFBE0_801B82A8 == 0) { - D_EBFBE0_801B8344 = 0; - D_EBFBE0_801B82C0 = 2; - D_EBFBE0_801B8340++; + if (D_menu_801B82A8 == 0) { + D_menu_801B8344 = 0; + D_menu_801B82C0 = 2; + D_menu_801B8340++; } break; } - func_EBFBE0_801912A0(); - func_EBFBE0_80191674(D_EBFBE0_801B86C8, D_EBFBE0_801B86CC, 100.0f, &D_EBFBE0_801B82E0, &D_EBFBE0_801B82E4, - &D_EBFBE0_801B82E8); + func_menu_801912A0(); + func_menu_80191674(D_menu_801B86C8, D_menu_801B86CC, 100.0f, &D_menu_801B82E0, &D_menu_801B82E4, &D_menu_801B82E8); - D_EBFBE0_801B7BEC++; + D_menu_801B7BEC++; } -void func_EBFBE0_8018A990(void) { +void func_menu_8018A990(void) { s32 i; - static UnkStruct_D_EBFBE0_801ADF54 D_EBFBE0_801ADF54[4] = { + static UnkStruct_D_menu_801ADF54 D_menu_801ADF54[4] = { { 255.0f, 155.0f, 155.0f }, { 155.0f, 255.0f, 155.0f }, { 135.0f, 206.0f, 255.0f }, @@ -1292,49 +1287,49 @@ void func_EBFBE0_8018A990(void) { }; if ((gFrameCount & 7) == 7) { - if (D_EBFBE0_801B8338 != 0) { - D_EBFBE0_801B8334 = (D_EBFBE0_801B8334 + 1) & 3; - D_EBFBE0_801B8328 = D_EBFBE0_801ADF54[D_EBFBE0_801B8334].unk_0; - D_EBFBE0_801B832C = D_EBFBE0_801ADF54[D_EBFBE0_801B8334].unk_4; - D_EBFBE0_801B8330 = D_EBFBE0_801ADF54[D_EBFBE0_801B8334].unk_8; + if (D_menu_801B8338 != 0) { + D_menu_801B8334 = (D_menu_801B8334 + 1) & 3; + D_menu_801B8328 = D_menu_801ADF54[D_menu_801B8334].unk_0; + D_menu_801B832C = D_menu_801ADF54[D_menu_801B8334].unk_4; + D_menu_801B8330 = D_menu_801ADF54[D_menu_801B8334].unk_8; } else { - D_EBFBE0_801B8328 = 155.0f; - D_EBFBE0_801B832C = 155.0f; - D_EBFBE0_801B8330 = 155.0f; + D_menu_801B8328 = 155.0f; + D_menu_801B832C = 155.0f; + D_menu_801B8330 = 155.0f; } - D_EBFBE0_801B8338 ^= 1; + D_menu_801B8338 ^= 1; } if (gFrameCount & 1) { - D_EBFBE0_801B86CC += 30.0f; - if (D_EBFBE0_801B86CC > 90.0f) { - D_EBFBE0_801B86CC = -90.0f; + D_menu_801B86CC += 30.0f; + if (D_menu_801B86CC > 90.0f) { + D_menu_801B86CC = -90.0f; } } - gAmbientR = D_EBFBE0_801B8328; - gAmbientG = D_EBFBE0_801B832C; - gAmbientB = D_EBFBE0_801B8330; + gAmbientR = D_menu_801B8328; + gAmbientG = D_menu_801B832C; + gAmbientB = D_menu_801B8330; - func_EBFBE0_8018F438(); + func_menu_8018F438(); - gLight1R = D_EBFBE0_801B82F8; - gLight1G = D_EBFBE0_801B82FC; - gLight1B = D_EBFBE0_801B8300; - gAmbientR = D_EBFBE0_801B8304; - gAmbientG = D_EBFBE0_801B8308; - gAmbientB = D_EBFBE0_801B830C; + gLight1R = D_menu_801B82F8; + gLight1G = D_menu_801B82FC; + gLight1B = D_menu_801B8300; + gAmbientR = D_menu_801B8304; + gAmbientG = D_menu_801B8308; + gAmbientB = D_menu_801B830C; for (i = 0; i < 4; i++) { - func_EBFBE0_8018E67C(i); - D_EBFBE0_801B8350[i].unk_58 += D_EBFBE0_801B8350[i].unk_5C; + func_menu_8018E67C(i); + D_menu_801B8350[i].unk_58 += D_menu_801B8350[i].unk_5C; } } -void func_EBFBE0_8018ABC0(void) { +void func_menu_8018ABC0(void) { D_80178410 = 800; - D_EBFBE0_801B869C = 255; + D_menu_801B869C = 255; D_80178340 = 0; D_80178348 = 0; @@ -1347,110 +1342,109 @@ void func_EBFBE0_8018ABC0(void) { gAmbientG = 4; gAmbientB = 10; - D_EBFBE0_801B86A8 = 10.0f; - D_EBFBE0_801B86AC = -30.0f; - D_EBFBE0_801B86B0 = 450.0f; - D_EBFBE0_801B86C8 = 0.0f; - D_EBFBE0_801B86CC = 0.0f; + D_menu_801B86A8 = 10.0f; + D_menu_801B86AC = -30.0f; + D_menu_801B86B0 = 450.0f; + D_menu_801B86C8 = 0.0f; + D_menu_801B86CC = 0.0f; D_801779A0 = -10.0f; D_801779B8 = 0.0f; D_801779C0 = 0.0f; - D_EBFBE0_801B829C = 0.0f; - D_EBFBE0_801B82A0 = 1.0f; - D_EBFBE0_801B82A4 = 0.0f; + D_menu_801B829C = 0.0f; + D_menu_801B82A0 = 1.0f; + D_menu_801B82A4 = 0.0f; - D_EBFBE0_801B8658.pos.x = 0.0f; - D_EBFBE0_801B8658.pos.y = 0.0f; - D_EBFBE0_801B8658.pos.z = 0.0f; - D_EBFBE0_801B8658.angleX = 0.0f; - D_EBFBE0_801B8658.angleY = 0.0f; - D_EBFBE0_801B8658.angleZ = 0.0f; + D_menu_801B8658.pos.x = 0.0f; + D_menu_801B8658.pos.y = 0.0f; + D_menu_801B8658.pos.z = 0.0f; + D_menu_801B8658.angleX = 0.0f; + D_menu_801B8658.angleY = 0.0f; + D_menu_801B8658.angleZ = 0.0f; } -void func_EBFBE0_8018ACEC(void) { - switch (D_EBFBE0_801B82C0) { +void func_menu_8018ACEC(void) { + switch (D_menu_801B82C0) { case 0: - func_EBFBE0_8018ABC0(); - Audio_PlaySfx(0x11030010, &D_EBFBE0_801B867C, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - Audio_PlaySfx(0x31024059, &D_EBFBE0_801B867C, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + func_menu_8018ABC0(); + Audio_PlaySfx(0x11030010, &D_menu_801B867C, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + Audio_PlaySfx(0x31024059, &D_menu_801B867C, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B82CC = 0.01f; - D_EBFBE0_801B82B4 = 0; - D_EBFBE0_801B82C0++; + D_menu_801B82CC = 0.01f; + D_menu_801B82B4 = 0; + D_menu_801B82C0++; break; case 1: - Math_SmoothStepToF(&D_EBFBE0_801B86A8, 30.0f, D_EBFBE0_801B82CC, 100.0f, 0.0001f); - Math_SmoothStepToF(&D_EBFBE0_801B86AC, -15.0f, D_EBFBE0_801B82CC, 100.0f, 0.0001f); + Math_SmoothStepToF(&D_menu_801B86A8, 30.0f, D_menu_801B82CC, 100.0f, 0.0001f); + Math_SmoothStepToF(&D_menu_801B86AC, -15.0f, D_menu_801B82CC, 100.0f, 0.0001f); Math_SmoothStepToF(&D_801779A0, 0.0f, 0.05f, 100.0f, 0.0001f); - Math_SmoothStepToF(&D_801779B8, -40.0f, D_EBFBE0_801B82CC, 100.0f, 0.0001f); - Math_SmoothStepToF(&D_EBFBE0_801B86B0, 100.0f, D_EBFBE0_801B82CC, 100.0f, 0.0001f); + Math_SmoothStepToF(&D_801779B8, -40.0f, D_menu_801B82CC, 100.0f, 0.0001f); + Math_SmoothStepToF(&D_menu_801B86B0, 100.0f, D_menu_801B82CC, 100.0f, 0.0001f); - D_EBFBE0_801B82CC *= 1.04f; - if (D_EBFBE0_801B82B4 == 50) { - D_EBFBE0_801B869C = 1; + D_menu_801B82CC *= 1.04f; + if (D_menu_801B82B4 == 50) { + D_menu_801B869C = 1; } if (D_80178340 == 255) { - func_8001A55C(&D_EBFBE0_801B867C, 0x11030010); - func_8001A55C(&D_EBFBE0_801B867C, 0x31024059); + func_8001A55C(&D_menu_801B867C, 0x11030010); + func_8001A55C(&D_menu_801B867C, 0x31024059); gDrawMode = DRAWMODE_0; - D_EBFBE0_801B82C0 = 0; - D_EBFBE0_801B82C4 = 4; + D_menu_801B82C0 = 0; + D_menu_801B82C4 = 4; } - func_EBFBE0_801912A0(); - D_EBFBE0_801B82B4++; + func_menu_801912A0(); + D_menu_801B82B4++; break; } - func_EBFBE0_80191320(1, &D_80177978, &D_80177980, &D_80177988, &D_801779A0, &D_801779B8, &D_801779C0, - D_EBFBE0_801B86A8, D_EBFBE0_801B86AC, D_EBFBE0_801B86B0); - func_EBFBE0_80191674(D_EBFBE0_801B86C8, D_EBFBE0_801B86CC, 100.0f, &D_EBFBE0_801B82E0, &D_EBFBE0_801B82E4, - &D_EBFBE0_801B82E8); + func_menu_80191320(1, &D_80177978, &D_80177980, &D_80177988, &D_801779A0, &D_801779B8, &D_801779C0, D_menu_801B86A8, + D_menu_801B86AC, D_menu_801B86B0); + func_menu_80191674(D_menu_801B86C8, D_menu_801B86CC, 100.0f, &D_menu_801B82E0, &D_menu_801B82E4, &D_menu_801B82E8); func_800B6F50(D_80177978, D_80177980, D_80177988, D_801779A0, D_801779B8, D_801779C0); D_8017842C += 2.0f; D_80178430 += 2.0f; } -void func_EBFBE0_8018B038(void) { - func_EBFBE0_8018E058(); +void func_menu_8018B038(void) { + func_menu_8018E058(); } -void func_EBFBE0_8018B058(void) { +void func_menu_8018B058(void) { f32 var_fv0; s32 i; - D_EBFBE0_801B7C98 = 10; + D_menu_801B7C98 = 10; for (i = 0; i < 10; i++) { - D_EBFBE0_801B7BF8[i] = (Rand_ZeroOne() * 10.0f) + 10.0f; - D_EBFBE0_801B7C20[i] = -10.0f + (Rand_ZeroOne() * -60.0f); - D_EBFBE0_801B7C48[i] = 0.0f; - D_EBFBE0_801B7C70[i] = 0.1f + (Rand_ZeroOne() * 0.3f); - D_EBFBE0_801B7D18[i] = 5 + (s32) (Rand_ZeroOne() * 5.0f); - D_EBFBE0_801B7CC8[i] = 255; - D_EBFBE0_801B7CF0[i] = 128; - D_EBFBE0_801B7CA0[i] = 0; + D_menu_801B7BF8[i] = (Rand_ZeroOne() * 10.0f) + 10.0f; + D_menu_801B7C20[i] = -10.0f + (Rand_ZeroOne() * -60.0f); + D_menu_801B7C48[i] = 0.0f; + D_menu_801B7C70[i] = 0.1f + (Rand_ZeroOne() * 0.3f); + D_menu_801B7D18[i] = 5 + (s32) (Rand_ZeroOne() * 5.0f); + D_menu_801B7CC8[i] = 255; + D_menu_801B7CF0[i] = 128; + D_menu_801B7CA0[i] = 0; } - D_EBFBE0_801B8100 = 20; + D_menu_801B8100 = 20; - for (i = 0; i < D_EBFBE0_801B8100; i++) { - D_EBFBE0_801B7D40[i] = -(Rand_ZeroOne() * 22.0f) + 13.0f; - D_EBFBE0_801B7DE0[i] = 5.0f - (Rand_ZeroOne() * 10.0f); - D_EBFBE0_801B7E80[i] = -25.0f - (Rand_ZeroOne() * 15.0f); - D_EBFBE0_801B7FC0[i] = 0.0f; - D_EBFBE0_801B8060[i] = Rand_ZeroOne() * 0.04f; - D_EBFBE0_801B7F20[i] = 0.02f + (Rand_ZeroOne() * 0.08f); - D_EBFBE0_801B8108[i] = 0; + for (i = 0; i < D_menu_801B8100; i++) { + D_menu_801B7D40[i] = -(Rand_ZeroOne() * 22.0f) + 13.0f; + D_menu_801B7DE0[i] = 5.0f - (Rand_ZeroOne() * 10.0f); + D_menu_801B7E80[i] = -25.0f - (Rand_ZeroOne() * 15.0f); + D_menu_801B7FC0[i] = 0.0f; + D_menu_801B8060[i] = Rand_ZeroOne() * 0.04f; + D_menu_801B7F20[i] = 0.02f + (Rand_ZeroOne() * 0.08f); + D_menu_801B8108[i] = 0; } - D_EBFBE0_801B869C = 0xFF; + D_menu_801B869C = 0xFF; D_80178340 = 0; D_80178348 = 0xFF; @@ -1458,10 +1452,10 @@ void func_EBFBE0_8018B058(void) { D_80178354 = 0xFF; D_80178410 = 0; - D_EBFBE0_801B8334 = 0; - D_EBFBE0_801B8338 = 1; - D_EBFBE0_801B86C8 = -360.0f; - D_EBFBE0_801B86CC = 131.0f; + D_menu_801B8334 = 0; + D_menu_801B8338 = 1; + D_menu_801B86C8 = -360.0f; + D_menu_801B86CC = 131.0f; gLight1R = 90; gLight1G = 75; @@ -1470,364 +1464,363 @@ void func_EBFBE0_8018B058(void) { gAmbientG = 34; gAmbientB = 56; - D_EBFBE0_801B8688.pos.x = 0.0f; - D_EBFBE0_801B8688.pos.y = 0.0f; - D_EBFBE0_801B8688.pos.z = 1000.0f; - D_EBFBE0_801B8688.scale = 2.0f; - D_EBFBE0_801B8688.unk_0C = 0; + D_menu_801B8688.pos.x = 0.0f; + D_menu_801B8688.pos.y = 0.0f; + D_menu_801B8688.pos.z = 1000.0f; + D_menu_801B8688.scale = 2.0f; + D_menu_801B8688.unk_0C = 0; - D_EBFBE0_801B7BE4 = 1; + D_menu_801B7BE4 = 1; var_fv0 = -120.0f; for (i = 0; i < 4; i++, var_fv0 += 75.0f) { - D_EBFBE0_801B84E8[i].unk_00.x = var_fv0; - D_EBFBE0_801B84E8[i].unk_00.y = 0.0f; - D_EBFBE0_801B84E8[i].unk_00.z = 0.0f; - D_EBFBE0_801B84E8[i].unk_0C = 0.5f; - D_EBFBE0_801B84E8[i].unk_18 = 0.0f; - D_EBFBE0_801B84E8[i].unk_1C = 0.0f; - D_EBFBE0_801B84E8[i].unk_20 = 0.0f; - D_EBFBE0_801B84E8[i].unk_24 = -60.0f; - D_EBFBE0_801B84E8[i].unk_28 = -10.0f; - D_EBFBE0_801B84E8[i].unk_2C = 0.0f; - D_EBFBE0_801B84E8[i].unk_30 = 0.0f; - D_EBFBE0_801B84E8[i].unk_34 = 4 - i; + D_menu_801B84E8[i].unk_00.x = var_fv0; + D_menu_801B84E8[i].unk_00.y = 0.0f; + D_menu_801B84E8[i].unk_00.z = 0.0f; + D_menu_801B84E8[i].unk_0C = 0.5f; + D_menu_801B84E8[i].unk_18 = 0.0f; + D_menu_801B84E8[i].unk_1C = 0.0f; + D_menu_801B84E8[i].unk_20 = 0.0f; + D_menu_801B84E8[i].unk_24 = -60.0f; + D_menu_801B84E8[i].unk_28 = -10.0f; + D_menu_801B84E8[i].unk_2C = 0.0f; + D_menu_801B84E8[i].unk_30 = 0.0f; + D_menu_801B84E8[i].unk_34 = 4 - i; - D_EBFBE0_801B84E8[i].unk_3C = 0; - D_EBFBE0_801B84E8[i].unk_40 = 0; - D_EBFBE0_801B84E8[i].unk_44 = 0.0f; - D_EBFBE0_801B84E8[i].unk_10 = 0.05f; + D_menu_801B84E8[i].unk_3C = 0; + D_menu_801B84E8[i].unk_40 = 0; + D_menu_801B84E8[i].unk_44 = 0.0f; + D_menu_801B84E8[i].unk_10 = 0.05f; - D_EBFBE0_801B84E8[i].unk_48 = 1; - D_EBFBE0_801B84E8[i].unk_4C = 1; + D_menu_801B84E8[i].unk_48 = 1; + D_menu_801B84E8[i].unk_4C = 1; } - D_EBFBE0_801B86BC = 140.0f; - D_EBFBE0_801B86C0 = -20.0f; - D_EBFBE0_801B86C4 = 0.0f; - D_EBFBE0_801B86A8 = 0.0f; - D_EBFBE0_801B86AC = 90.0f; - D_EBFBE0_801B86B4 = 90.0f; - D_EBFBE0_801B86B8 = -50.0f; - D_EBFBE0_801B829C = 0.0f; - D_EBFBE0_801B82A0 = 1.0f; - D_EBFBE0_801B82A4 = 0.0f; + D_menu_801B86BC = 140.0f; + D_menu_801B86C0 = -20.0f; + D_menu_801B86C4 = 0.0f; + D_menu_801B86A8 = 0.0f; + D_menu_801B86AC = 90.0f; + D_menu_801B86B4 = 90.0f; + D_menu_801B86B8 = -50.0f; + D_menu_801B829C = 0.0f; + D_menu_801B82A0 = 1.0f; + D_menu_801B82A4 = 0.0f; - func_EBFBE0_801914AC(D_EBFBE0_801B86BC, D_EBFBE0_801B86C0, D_EBFBE0_801B86C4, &D_80177978, &D_80177980, &D_80177988, - D_EBFBE0_801B86B4, &D_801779A0, &D_801779B8, &D_801779C0, D_EBFBE0_801B86B8, D_EBFBE0_801B86A8, - D_EBFBE0_801B86AC); + func_menu_801914AC(D_menu_801B86BC, D_menu_801B86C0, D_menu_801B86C4, &D_80177978, &D_80177980, &D_80177988, + D_menu_801B86B4, &D_801779A0, &D_801779B8, &D_801779C0, D_menu_801B86B8, D_menu_801B86A8, + D_menu_801B86AC); - D_EBFBE0_801B9044 = 25.0f; - D_EBFBE0_801B9048 = 84.0f; - D_EBFBE0_801B904C = -20.0f; - D_EBFBE0_801B9050 = -33.0f; + D_menu_801B9044 = 25.0f; + D_menu_801B9048 = 84.0f; + D_menu_801B904C = -20.0f; + D_menu_801B9050 = -33.0f; } -void func_EBFBE0_8018B5C4(void) { +void func_menu_8018B5C4(void) { s32 i; f32 temp[4]; - switch (D_EBFBE0_801B82C0) { + switch (D_menu_801B82C0) { case 0: - D_EBFBE0_801B7BEC = 0; + D_menu_801B7BEC = 0; - func_EBFBE0_8018B058(); + func_menu_8018B058(); func_8001D400(0x68); - D_EBFBE0_801B82A8 = 30; + D_menu_801B82A8 = 30; - D_EBFBE0_801B84E8[3].unk_38 = 70; - D_EBFBE0_801B84E8[2].unk_38 = 102; - D_EBFBE0_801B84E8[1].unk_38 = 132; - D_EBFBE0_801B84E8[0].unk_38 = 171; + D_menu_801B84E8[3].unk_38 = 70; + D_menu_801B84E8[2].unk_38 = 102; + D_menu_801B84E8[1].unk_38 = 132; + D_menu_801B84E8[0].unk_38 = 171; - D_EBFBE0_801B8294 = D_EBFBE0_801B6C60; - D_EBFBE0_801B8298 = 0; - D_EBFBE0_801B828C = 0.0f; - D_EBFBE0_801B8290 = 0.024f; - D_EBFBE0_801B82C0 = 10; + D_menu_801B8294 = D_menu_801B6C60; + D_menu_801B8298 = 0; + D_menu_801B828C = 0.0f; + D_menu_801B8290 = 0.024f; + D_menu_801B82C0 = 10; break; case 10: - if (D_EBFBE0_801B82A8 == 0) { + if (D_menu_801B82A8 == 0) { Audio_PlaySfx(0x0100001D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B82B4 = 0; - D_EBFBE0_801B82C0 = 1; + D_menu_801B82B4 = 0; + D_menu_801B82C0 = 1; } break; case 1: - func_EBFBE0_80191798(&D_EBFBE0_801B86A8, &D_EBFBE0_801B86AC); - func_EBFBE0_80191844(D_EBFBE0_801B86A8, D_EBFBE0_801B86AC); - func_EBFBE0_8018CC30(D_EBFBE0_801B8294, 10, D_EBFBE0_801B8290); + func_menu_80191798(&D_menu_801B86A8, &D_menu_801B86AC); + func_menu_80191844(D_menu_801B86A8, D_menu_801B86AC); + func_menu_8018CC30(D_menu_801B8294, 10, D_menu_801B8290); - if (D_EBFBE0_801B9048 > 0.0f) { - D_EBFBE0_801B9048 -= 0.41f; - if (D_EBFBE0_801B9048 < 0.0f) { - D_EBFBE0_801B9048 = 0.0f; + if (D_menu_801B9048 > 0.0f) { + D_menu_801B9048 -= 0.41f; + if (D_menu_801B9048 < 0.0f) { + D_menu_801B9048 = 0.0f; Audio_PlaySfx(0x09002013, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } } - if (D_EBFBE0_801B82B4 == 60) { - D_EBFBE0_801B7BF0 = 2; + if (D_menu_801B82B4 == 60) { + D_menu_801B7BF0 = 2; } for (i = 3; i >= 0; i--) { - if (D_EBFBE0_801B84E8[i].unk_38 > 0) { - D_EBFBE0_801B84E8[i].unk_38--; + if (D_menu_801B84E8[i].unk_38 > 0) { + D_menu_801B84E8[i].unk_38--; } - if (D_EBFBE0_801B84E8[i].unk_38 == 1) { - Audio_PlaySfx(0x1950107A, &D_EBFBE0_801B84E8[i].unk_50, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + if (D_menu_801B84E8[i].unk_38 == 1) { + Audio_PlaySfx(0x1950107A, &D_menu_801B84E8[i].unk_50, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); }; - if (D_EBFBE0_801B84E8[i].unk_38 == 0) { - Math_SmoothStepToF(&D_EBFBE0_801B84E8[i].unk_28, 0.0f, D_EBFBE0_801B84E8[i].unk_10, 100.0f, 0.01f); - temp[i] = Math_SmoothStepToF(&(D_EBFBE0_801B84E8[i].unk_24), 0.0f, D_EBFBE0_801B84E8[i].unk_10, - 100.0f, 0.01f); - D_EBFBE0_801B84E8[i].unk_10 *= 1.04f; + if (D_menu_801B84E8[i].unk_38 == 0) { + Math_SmoothStepToF(&D_menu_801B84E8[i].unk_28, 0.0f, D_menu_801B84E8[i].unk_10, 100.0f, 0.01f); + temp[i] = Math_SmoothStepToF(&(D_menu_801B84E8[i].unk_24), 0.0f, D_menu_801B84E8[i].unk_10, 100.0f, + 0.01f); + D_menu_801B84E8[i].unk_10 *= 1.04f; if (temp[i] == 0.0f) { - func_8001A55C(&D_EBFBE0_801B84E8[i].unk_50, 0x1950107A); + func_8001A55C(&D_menu_801B84E8[i].unk_50, 0x1950107A); } } } - if (D_EBFBE0_801B82B4 == 70) { - D_EBFBE0_801B7BE4 = 0; - D_EBFBE0_801B84E8[0].unk_4C = 0; + if (D_menu_801B82B4 == 70) { + D_menu_801B7BE4 = 0; + D_menu_801B84E8[0].unk_4C = 0; } - if (D_EBFBE0_801B82B4 == 80) { - D_EBFBE0_801B84E8[1].unk_4C = 0; + if (D_menu_801B82B4 == 80) { + D_menu_801B84E8[1].unk_4C = 0; for (i = 0; i < 4; i++) { - D_EBFBE0_801B84E8[i].unk_48 = 0; + D_menu_801B84E8[i].unk_48 = 0; } } - if (D_EBFBE0_801B82B4 == 115) { - D_EBFBE0_801B84E8[0].unk_4C = 1; - D_EBFBE0_801B84E8[1].unk_4C = 1; + if (D_menu_801B82B4 == 115) { + D_menu_801B84E8[0].unk_4C = 1; + D_menu_801B84E8[1].unk_4C = 1; } - if (D_EBFBE0_801B82B4 == 226) { - D_EBFBE0_801B7BF0 = 0; + if (D_menu_801B82B4 == 226) { + D_menu_801B7BF0 = 0; - Audio_PlaySfx(0x0100001E, &D_EBFBE0_801B84E8[3].unk_50, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + Audio_PlaySfx(0x0100001E, &D_menu_801B84E8[3].unk_50, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B86BC = 105.0f; - D_EBFBE0_801B86C0 = 0.0f; - D_EBFBE0_801B86C4 = -12.0f; - D_EBFBE0_801B86A8 = 9.4f; - D_EBFBE0_801B86AC = 110.0f; - D_EBFBE0_801B86B4 = 36.0f; - D_EBFBE0_801B86B8 = -70.0f; + D_menu_801B86BC = 105.0f; + D_menu_801B86C0 = 0.0f; + D_menu_801B86C4 = -12.0f; + D_menu_801B86A8 = 9.4f; + D_menu_801B86AC = 110.0f; + D_menu_801B86B4 = 36.0f; + D_menu_801B86B8 = -70.0f; - func_EBFBE0_801914AC(D_EBFBE0_801B86BC, D_EBFBE0_801B86C0, D_EBFBE0_801B86C4, &D_80177978, &D_80177980, - &D_80177988, D_EBFBE0_801B86B4, &D_801779A0, &D_801779B8, &D_801779C0, - D_EBFBE0_801B86B8, D_EBFBE0_801B86A8, D_EBFBE0_801B86AC); + func_menu_801914AC(D_menu_801B86BC, D_menu_801B86C0, D_menu_801B86C4, &D_80177978, &D_80177980, + &D_80177988, D_menu_801B86B4, &D_801779A0, &D_801779B8, &D_801779C0, D_menu_801B86B8, + D_menu_801B86A8, D_menu_801B86AC); - D_EBFBE0_801B82B4 = 0; + D_menu_801B82B4 = 0; - D_EBFBE0_801B84E8[3].unk_44 = 0.0f; + D_menu_801B84E8[3].unk_44 = 0.0f; - D_EBFBE0_801B86C8 = 60.0f; - D_EBFBE0_801B86CC = 0.0f; - D_EBFBE0_801B82EC = 60.0f; - D_EBFBE0_801B82F0 = 45.0f; - D_EBFBE0_801B82F4 = 60.0f; + D_menu_801B86C8 = 60.0f; + D_menu_801B86CC = 0.0f; + D_menu_801B82EC = 60.0f; + D_menu_801B82F0 = 45.0f; + D_menu_801B82F4 = 60.0f; - gLight1R = D_EBFBE0_801B82EC; - gLight1G = D_EBFBE0_801B82F0; - gLight1B = D_EBFBE0_801B82F4; + gLight1R = D_menu_801B82EC; + gLight1G = D_menu_801B82F0; + gLight1B = D_menu_801B82F4; gAmbientR = 35; gAmbientG = 24; gAmbientB = 46; - D_EBFBE0_801B82C0++; + D_menu_801B82C0++; } - D_EBFBE0_801B82B4++; + D_menu_801B82B4++; break; case 2: - if (D_EBFBE0_801B82B4 == 30) { - D_EBFBE0_801B84E8[3].unk_40 = 1; + if (D_menu_801B82B4 == 30) { + D_menu_801B84E8[3].unk_40 = 1; } - if (D_EBFBE0_801B82B4 == 40) { - D_EBFBE0_801B84E8[3].unk_3C = 1; + if (D_menu_801B82B4 == 40) { + D_menu_801B84E8[3].unk_3C = 1; } - if (D_EBFBE0_801B82B4 > 40) { - D_EBFBE0_801B84E8[3].unk_44 += 0.002f; + if (D_menu_801B82B4 > 40) { + D_menu_801B84E8[3].unk_44 += 0.002f; - if (D_EBFBE0_801B84E8[3].unk_44 > 0.2f) { - D_EBFBE0_801B84E8[3].unk_44 = 0.2f; + if (D_menu_801B84E8[3].unk_44 > 0.2f) { + D_menu_801B84E8[3].unk_44 = 0.2f; } - Math_SmoothStepToF(&D_EBFBE0_801B82EC, 240.0f, 0.06f, 2.0f, 0.01f); - Math_SmoothStepToF(&D_EBFBE0_801B82F0, 240.0f, 0.06f, 2.0f, 0.01f); - Math_SmoothStepToF(&D_EBFBE0_801B82F4, 255.0f, 0.06f, 2.0f, 0.01f); + Math_SmoothStepToF(&D_menu_801B82EC, 240.0f, 0.06f, 2.0f, 0.01f); + Math_SmoothStepToF(&D_menu_801B82F0, 240.0f, 0.06f, 2.0f, 0.01f); + Math_SmoothStepToF(&D_menu_801B82F4, 255.0f, 0.06f, 2.0f, 0.01f); - gLight1R = D_EBFBE0_801B82EC; - gLight1G = D_EBFBE0_801B82F0; - gLight1B = D_EBFBE0_801B82F4; + gLight1R = D_menu_801B82EC; + gLight1G = D_menu_801B82F0; + gLight1B = D_menu_801B82F4; } - if ((D_EBFBE0_801B82B4 > 60) && (D_80178340 < 255)) { + if ((D_menu_801B82B4 > 60) && (D_80178340 < 255)) { D_80178340++; } if (D_80178340 == 0x80) { - D_EBFBE0_801B82A8 = 7; - D_EBFBE0_801B84E8[3].unk_3C = 0; - D_EBFBE0_801B84E8[3].unk_40 = 0; + D_menu_801B82A8 = 7; + D_menu_801B84E8[3].unk_3C = 0; + D_menu_801B84E8[3].unk_40 = 0; D_80178340 = 0xFF; - D_EBFBE0_801B82C0++; + D_menu_801B82C0++; } - if (D_EBFBE0_801B82B4 == 50) { - D_EBFBE0_801B84E8[0].unk_4C = 0; + if (D_menu_801B82B4 == 50) { + D_menu_801B84E8[0].unk_4C = 0; } - if (D_EBFBE0_801B82B4 == 60) { - D_EBFBE0_801B84E8[1].unk_4C = 0; + if (D_menu_801B82B4 == 60) { + D_menu_801B84E8[1].unk_4C = 0; } - Math_SmoothStepToF(&D_EBFBE0_801B86B4, 16.0f, 0.01f, 100.0f, 0.01f); - Math_SmoothStepToF(&D_EBFBE0_801B86AC, 138.0f, 0.01f, 100.0f, 0.01f); + Math_SmoothStepToF(&D_menu_801B86B4, 16.0f, 0.01f, 100.0f, 0.01f); + Math_SmoothStepToF(&D_menu_801B86AC, 138.0f, 0.01f, 100.0f, 0.01f); - func_EBFBE0_801914AC(D_EBFBE0_801B86BC, D_EBFBE0_801B86C0, D_EBFBE0_801B86C4, &D_80177978, &D_80177980, - &D_80177988, D_EBFBE0_801B86B4, &D_801779A0, &D_801779B8, &D_801779C0, - D_EBFBE0_801B86B8, D_EBFBE0_801B86A8, D_EBFBE0_801B86AC); - D_EBFBE0_801B82B4++; + func_menu_801914AC(D_menu_801B86BC, D_menu_801B86C0, D_menu_801B86C4, &D_80177978, &D_80177980, &D_80177988, + D_menu_801B86B4, &D_801779A0, &D_801779B8, &D_801779C0, D_menu_801B86B8, D_menu_801B86A8, + D_menu_801B86AC); + D_menu_801B82B4++; break; case 3: - if (D_EBFBE0_801B82A8 == 0) { - func_8001A55C(&D_EBFBE0_801B84E8[3].unk_50, 0x0100001E); - Audio_PlaySfx(0x09000002, &D_EBFBE0_801B84E8[3].unk_50, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + if (D_menu_801B82A8 == 0) { + func_8001A55C(&D_menu_801B84E8[3].unk_50, 0x0100001E); + Audio_PlaySfx(0x09000002, &D_menu_801B84E8[3].unk_50, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B82A8 = 4; + D_menu_801B82A8 = 4; D_80178340 = 0; for (i = 0; i < 4; i++) { - D_EBFBE0_801B84E8[i].unk_3C = 1; - D_EBFBE0_801B84E8[i].unk_44 = 0.9f; + D_menu_801B84E8[i].unk_3C = 1; + D_menu_801B84E8[i].unk_44 = 0.9f; } - D_EBFBE0_801B82B4 = 0; + D_menu_801B82B4 = 0; D_80178410 = 800; - D_EBFBE0_801B82C0++; + D_menu_801B82C0++; } break; case 4: - if (D_EBFBE0_801B82A8 == 0) { - D_EBFBE0_801B84E8[3].unk_44 = 1.2f; + if (D_menu_801B82A8 == 0) { + D_menu_801B84E8[3].unk_44 = 1.2f; - Math_SmoothStepToF(&D_EBFBE0_801B84E8[3].unk_00.z, 900.0f, 0.06f, 100.0f, 0.0001f); - Math_SmoothStepToF(&D_EBFBE0_801B86AC, 154.0f, 0.2f, 100.0f, 0.01f); - Math_SmoothStepToF(&D_EBFBE0_801B86A8, -5.0f, 0.2f, 100.0f, 0.01f); - Math_SmoothStepToF(&D_EBFBE0_801B86BC, 100.0f, 0.2f, 100.0f, 0.01f); - Math_SmoothStepToF(&D_EBFBE0_801B86B4, 40.0f, 0.2f, 100.0f, 0.01f); + Math_SmoothStepToF(&D_menu_801B84E8[3].unk_00.z, 900.0f, 0.06f, 100.0f, 0.0001f); + Math_SmoothStepToF(&D_menu_801B86AC, 154.0f, 0.2f, 100.0f, 0.01f); + Math_SmoothStepToF(&D_menu_801B86A8, -5.0f, 0.2f, 100.0f, 0.01f); + Math_SmoothStepToF(&D_menu_801B86BC, 100.0f, 0.2f, 100.0f, 0.01f); + Math_SmoothStepToF(&D_menu_801B86B4, 40.0f, 0.2f, 100.0f, 0.01f); - func_EBFBE0_801914AC(D_EBFBE0_801B86BC, D_EBFBE0_801B86C0, D_EBFBE0_801B86C4, &D_80177978, &D_80177980, - &D_80177988, D_EBFBE0_801B86B4, &D_801779A0, &D_801779B8, &D_801779C0, - D_EBFBE0_801B86B8, D_EBFBE0_801B86A8, D_EBFBE0_801B86AC); + func_menu_801914AC(D_menu_801B86BC, D_menu_801B86C0, D_menu_801B86C4, &D_80177978, &D_80177980, + &D_80177988, D_menu_801B86B4, &D_801779A0, &D_801779B8, &D_801779C0, D_menu_801B86B8, + D_menu_801B86A8, D_menu_801B86AC); - if (D_EBFBE0_801B82B4 > 8) { + if (D_menu_801B82B4 > 8) { func_8001D400(0); - D_EBFBE0_801B82C0 = 0; - D_EBFBE0_801B82C4 = 5; + D_menu_801B82C0 = 0; + D_menu_801B82C4 = 5; } - D_EBFBE0_801B82B4++; + D_menu_801B82B4++; } break; } - func_EBFBE0_80191674(D_EBFBE0_801B86C8, D_EBFBE0_801B86CC, 100.0f, &D_EBFBE0_801B82E0, &D_EBFBE0_801B82E4, - &D_EBFBE0_801B82E8); - D_EBFBE0_801B7BEC++; + func_menu_80191674(D_menu_801B86C8, D_menu_801B86CC, 100.0f, &D_menu_801B82E0, &D_menu_801B82E4, &D_menu_801B82E8); + D_menu_801B7BEC++; } -void func_EBFBE0_8018C114(void) { +void func_menu_8018C114(void) { s32 i; - if (D_EBFBE0_801B8688.unk_0C != 0) { - func_EBFBE0_8018DF0C(0.0f); + if (D_menu_801B8688.unk_0C != 0) { + func_menu_8018DF0C(0.0f); } - func_EBFBE0_80190950(); + func_menu_80190950(); for (i = 3; i >= 0; i--) { - if (D_EBFBE0_801B84E8[i].unk_4C) { - func_EBFBE0_80190B30(i); + if (D_menu_801B84E8[i].unk_4C) { + func_menu_80190B30(i); } } for (i = 0; i < 4; i++) { - if (D_EBFBE0_801B84E8[i].unk_4C) { - func_EBFBE0_8018D2B8(i); + if (D_menu_801B84E8[i].unk_4C) { + func_menu_8018D2B8(i); } } } -void func_EBFBE0_8018C1C0(void) { +void func_menu_8018C1C0(void) { s32 i; D_80178410 = 1; - D_EBFBE0_801B7C98 = 10; + D_menu_801B7C98 = 10; for (i = 0; i < 10; i++) { - D_EBFBE0_801B7BF8[i] = (Rand_ZeroOne() * 10.0f) + 10.0f; - D_EBFBE0_801B7C20[i] = -10.0f + (Rand_ZeroOne() * -60.0f); - D_EBFBE0_801B7C48[i] = 0.0f; - D_EBFBE0_801B7C70[i] = (Rand_ZeroOne() * 0.3f) + 0.1f; - D_EBFBE0_801B7D18[i] = 5 + (s32) (Rand_ZeroOne() * 5.0f); - D_EBFBE0_801B7CC8[i] = 255; - D_EBFBE0_801B7CF0[i] = 128; - D_EBFBE0_801B7CA0[i] = 0; + D_menu_801B7BF8[i] = (Rand_ZeroOne() * 10.0f) + 10.0f; + D_menu_801B7C20[i] = -10.0f + (Rand_ZeroOne() * -60.0f); + D_menu_801B7C48[i] = 0.0f; + D_menu_801B7C70[i] = (Rand_ZeroOne() * 0.3f) + 0.1f; + D_menu_801B7D18[i] = 5 + (s32) (Rand_ZeroOne() * 5.0f); + D_menu_801B7CC8[i] = 255; + D_menu_801B7CF0[i] = 128; + D_menu_801B7CA0[i] = 0; } - D_EBFBE0_801B86A0 = 1; - D_EBFBE0_801B86BC = 0.0f; - D_EBFBE0_801B86C0 = -38.0f; - D_EBFBE0_801B86C4 = 35.0f; + D_menu_801B86A0 = 1; + D_menu_801B86BC = 0.0f; + D_menu_801B86C0 = -38.0f; + D_menu_801B86C4 = 35.0f; - D_EBFBE0_801B86A8 = -35.0f; - D_EBFBE0_801B86AC = -50.0f; - D_EBFBE0_801B86B4 = 105.0f; - D_EBFBE0_801B86B8 = 50.0f; + D_menu_801B86A8 = -35.0f; + D_menu_801B86AC = -50.0f; + D_menu_801B86B4 = 105.0f; + D_menu_801B86B8 = 50.0f; - D_EBFBE0_801B869C = 255; + D_menu_801B869C = 255; D_80178340 = 0; D_80178348 = 0; D_80178350 = 0; D_80178354 = 0; - D_EBFBE0_801B8688.pos.x = 130.0f; - D_EBFBE0_801B8688.pos.y = -30.0f; - D_EBFBE0_801B8688.pos.z = 2000.0f; - D_EBFBE0_801B8688.scale = 8.0f; - D_EBFBE0_801B8688.unk_0C = 0; + D_menu_801B8688.pos.x = 130.0f; + D_menu_801B8688.pos.y = -30.0f; + D_menu_801B8688.pos.z = 2000.0f; + D_menu_801B8688.scale = 8.0f; + D_menu_801B8688.unk_0C = 0; - D_EBFBE0_801B8658.pos.x = 0.0f; - D_EBFBE0_801B8658.pos.y = 0.0f; - D_EBFBE0_801B8658.pos.z = 0.0f; - D_EBFBE0_801B8658.angleX = 0.0f; - D_EBFBE0_801B8658.angleY = 0.0f; - D_EBFBE0_801B8658.angleZ = 0.0f; - D_EBFBE0_801B8658.scale = 0.1f; + D_menu_801B8658.pos.x = 0.0f; + D_menu_801B8658.pos.y = 0.0f; + D_menu_801B8658.pos.z = 0.0f; + D_menu_801B8658.angleX = 0.0f; + D_menu_801B8658.angleY = 0.0f; + D_menu_801B8658.angleZ = 0.0f; + D_menu_801B8658.scale = 0.1f; - D_EBFBE0_801B86C8 = 0.0f; - D_EBFBE0_801B86CC = 0.0f; + D_menu_801B86C8 = 0.0f; + D_menu_801B86CC = 0.0f; gLight1R = 101; gLight1G = 106; @@ -1837,45 +1830,45 @@ void func_EBFBE0_8018C1C0(void) { gAmbientB = 10; for (i = 0; i < 4; i++) { - D_EBFBE0_801B84E8[i].unk_00.x = 0.0f; - D_EBFBE0_801B84E8[i].unk_00.y = -40.0f; - D_EBFBE0_801B84E8[i].unk_00.z = -30.0f; - D_EBFBE0_801B84E8[i].unk_0C = 0.1f; - D_EBFBE0_801B84E8[i].unk_18 = 0.0f; - D_EBFBE0_801B84E8[i].unk_1C = 0.0f; - D_EBFBE0_801B84E8[i].unk_20 = 0.0f; - D_EBFBE0_801B84E8[i].unk_10 = 0.05f; - D_EBFBE0_801B84E8[i].unk_24 = 0.0f; - D_EBFBE0_801B84E8[i].unk_28 = 0.0f; - D_EBFBE0_801B84E8[i].unk_2C = 0.0f; - D_EBFBE0_801B84E8[i].unk_30 = 0.0f; - D_EBFBE0_801B84E8[i].unk_34 = i + 1; - D_EBFBE0_801B84E8[i].unk_3C = 1; - D_EBFBE0_801B84E8[i].unk_40 = 0; - D_EBFBE0_801B84E8[i].unk_44 = 1.2f; - D_EBFBE0_801B84E8[i].unk_48 = 0; - D_EBFBE0_801B84E8[i].unk_4C = 0; + D_menu_801B84E8[i].unk_00.x = 0.0f; + D_menu_801B84E8[i].unk_00.y = -40.0f; + D_menu_801B84E8[i].unk_00.z = -30.0f; + D_menu_801B84E8[i].unk_0C = 0.1f; + D_menu_801B84E8[i].unk_18 = 0.0f; + D_menu_801B84E8[i].unk_1C = 0.0f; + D_menu_801B84E8[i].unk_20 = 0.0f; + D_menu_801B84E8[i].unk_10 = 0.05f; + D_menu_801B84E8[i].unk_24 = 0.0f; + D_menu_801B84E8[i].unk_28 = 0.0f; + D_menu_801B84E8[i].unk_2C = 0.0f; + D_menu_801B84E8[i].unk_30 = 0.0f; + D_menu_801B84E8[i].unk_34 = i + 1; + D_menu_801B84E8[i].unk_3C = 1; + D_menu_801B84E8[i].unk_40 = 0; + D_menu_801B84E8[i].unk_44 = 1.2f; + D_menu_801B84E8[i].unk_48 = 0; + D_menu_801B84E8[i].unk_4C = 0; } - D_EBFBE0_801B86BC = -8.0f; - D_EBFBE0_801B86C0 = -37.0f; - D_EBFBE0_801B86C4 = 64.0f; + D_menu_801B86BC = -8.0f; + D_menu_801B86C0 = -37.0f; + D_menu_801B86C4 = 64.0f; - D_EBFBE0_801B86A8 = 5.899999f; - D_EBFBE0_801B86AC = -112.74477f; - D_EBFBE0_801B86B4 = 235.0f; - D_EBFBE0_801B86B8 = 50.00f; + D_menu_801B86A8 = 5.899999f; + D_menu_801B86AC = -112.74477f; + D_menu_801B86B4 = 235.0f; + D_menu_801B86B8 = 50.00f; - D_EBFBE0_801B829C = 0.0f; - D_EBFBE0_801B82A0 = 1.0f; - D_EBFBE0_801B82A4 = 0.0f; + D_menu_801B829C = 0.0f; + D_menu_801B82A0 = 1.0f; + D_menu_801B82A4 = 0.0f; - func_EBFBE0_801914AC(D_EBFBE0_801B86BC, D_EBFBE0_801B86C0, D_EBFBE0_801B86C4, &D_80177978, &D_80177980, &D_80177988, - D_EBFBE0_801B86B4, &D_801779A0, &D_801779B8, &D_801779C0, D_EBFBE0_801B86B8, D_EBFBE0_801B86A8, - D_EBFBE0_801B86AC); + func_menu_801914AC(D_menu_801B86BC, D_menu_801B86C0, D_menu_801B86C4, &D_80177978, &D_80177980, &D_80177988, + D_menu_801B86B4, &D_801779A0, &D_801779B8, &D_801779C0, D_menu_801B86B8, D_menu_801B86A8, + D_menu_801B86AC); } -static UnkStruct_D_EBFBE0_801B8294 D_EBFBE0_801ADF84[50] = { +static UnkStruct_D_menu_801B8294 D_menu_801ADF84[50] = { { -223.5775f, -61.156242f, -26.375984f, -53.867554f, -42.139626f, 44.77107f }, { -160.05501f, -67.74775f, 85.750084f, -61.486446f, -44.164986f, 29.322315f }, { -22.228004f, -79.54139f, 121.01903f, -15.555059f, -64.843475f, 85.51631f }, @@ -1887,158 +1880,156 @@ static UnkStruct_D_EBFBE0_801B8294 D_EBFBE0_801ADF84[50] = { { 481.63818f, -313.2934f, -628.9213f, 96.2103f, -5.343582f, -4.23885f }, }; -void func_EBFBE0_8018C644(void) { +void func_menu_8018C644(void) { s32 i; f32 x; f32 y; f32 z; - static f32 D_EBFBE0_801AE434[4] = { -15.0f, -5.0f, 5.0f, 10.0f }; - static f32 D_EBFBE0_801AE444[4] = { -50.0f, -45.0f, -55.0f, -60.0f }; - static f32 D_EBFBE0_801AE454[4] = { 265.0f, 260.0f, 255.0f, 230.0f }; + static f32 D_menu_801AE434[4] = { -15.0f, -5.0f, 5.0f, 10.0f }; + static f32 D_menu_801AE444[4] = { -50.0f, -45.0f, -55.0f, -60.0f }; + static f32 D_menu_801AE454[4] = { 265.0f, 260.0f, 255.0f, 230.0f }; - switch (D_EBFBE0_801B82C0) { + switch (D_menu_801B82C0) { case 0: - Audio_PlaySfx(0x11030010, &D_EBFBE0_801B867C, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - Audio_PlaySfx(0x31024059, &D_EBFBE0_801B867C, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + Audio_PlaySfx(0x11030010, &D_menu_801B867C, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + Audio_PlaySfx(0x31024059, &D_menu_801B867C, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - func_EBFBE0_8018C1C0(); + func_menu_8018C1C0(); - D_EBFBE0_801B82B4 = 0; - D_EBFBE0_801B7BEC = 0; - D_EBFBE0_801B8694 = 1; + D_menu_801B82B4 = 0; + D_menu_801B7BEC = 0; + D_menu_801B8694 = 1; - D_EBFBE0_801B84E8[0].unk_38 = 3; - D_EBFBE0_801B84E8[1].unk_38 = 23; - D_EBFBE0_801B84E8[2].unk_38 = 43; - D_EBFBE0_801B84E8[3].unk_38 = 63; + D_menu_801B84E8[0].unk_38 = 3; + D_menu_801B84E8[1].unk_38 = 23; + D_menu_801B84E8[2].unk_38 = 43; + D_menu_801B84E8[3].unk_38 = 63; - D_EBFBE0_801B8294 = D_EBFBE0_801ADF84; - D_EBFBE0_801B8298 = 0; - D_EBFBE0_801B828C = 0.0f; - D_EBFBE0_801B8290 = 0.042f; + D_menu_801B8294 = D_menu_801ADF84; + D_menu_801B8298 = 0; + D_menu_801B828C = 0.0f; + D_menu_801B8290 = 0.042f; - D_EBFBE0_801B82C0++; + D_menu_801B82C0++; break; case 1: for (i = 0; i < 4; i++) { - if (D_EBFBE0_801B84E8[i].unk_38 > 0) { - D_EBFBE0_801B84E8[i].unk_38--; + if (D_menu_801B84E8[i].unk_38 > 0) { + D_menu_801B84E8[i].unk_38--; } else { - if (D_EBFBE0_801B84E8[i].unk_38 == 0) { - Audio_PlaySfx(0x19000001, &D_EBFBE0_801B84E8[i].unk_50, 0, &D_800C5D34, &D_800C5D34, - &D_800C5D3C); - D_EBFBE0_801B84E8[i].unk_38 = -1; - D_EBFBE0_801B84E8[i].unk_4C = 1; + if (D_menu_801B84E8[i].unk_38 == 0) { + Audio_PlaySfx(0x19000001, &D_menu_801B84E8[i].unk_50, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + D_menu_801B84E8[i].unk_38 = -1; + D_menu_801B84E8[i].unk_4C = 1; } - Math_SmoothStepToF(&D_EBFBE0_801B84E8[i].unk_00.y, D_EBFBE0_801AE444[i], - D_EBFBE0_801B84E8[i].unk_10, 100.0f, 0.001f); - Math_SmoothStepToF(&D_EBFBE0_801B84E8[i].unk_00.x, D_EBFBE0_801AE434[i], - D_EBFBE0_801B84E8[i].unk_10, 100.0f, 0.001f); - Math_SmoothStepToF(&D_EBFBE0_801B84E8[i].unk_00.z, D_EBFBE0_801AE454[i], - D_EBFBE0_801B84E8[i].unk_10, 100.0f, 0.001f); + Math_SmoothStepToF(&D_menu_801B84E8[i].unk_00.y, D_menu_801AE444[i], D_menu_801B84E8[i].unk_10, + 100.0f, 0.001f); + Math_SmoothStepToF(&D_menu_801B84E8[i].unk_00.x, D_menu_801AE434[i], D_menu_801B84E8[i].unk_10, + 100.0f, 0.001f); + Math_SmoothStepToF(&D_menu_801B84E8[i].unk_00.z, D_menu_801AE454[i], D_menu_801B84E8[i].unk_10, + 100.0f, 0.001f); - D_EBFBE0_801B84E8[i].unk_10 *= 1.05f; + D_menu_801B84E8[i].unk_10 *= 1.05f; - if (D_EBFBE0_801B84E8[i].unk_00.z == D_EBFBE0_801AE454[i]) { - D_EBFBE0_801B84E8[i].unk_0C -= 0.002f; - if (D_EBFBE0_801B84E8[i].unk_0C < 0.0f) { - D_EBFBE0_801B84E8[i].unk_0C = 0.0f; - D_EBFBE0_801B84E8[i].unk_4C = 0; + if (D_menu_801B84E8[i].unk_00.z == D_menu_801AE454[i]) { + D_menu_801B84E8[i].unk_0C -= 0.002f; + if (D_menu_801B84E8[i].unk_0C < 0.0f) { + D_menu_801B84E8[i].unk_0C = 0.0f; + D_menu_801B84E8[i].unk_4C = 0; } } - x = D_EBFBE0_801AE434[i] - D_EBFBE0_801B84E8[i].unk_00.x; - y = D_EBFBE0_801AE444[i] - D_EBFBE0_801B84E8[i].unk_00.y; - z = D_EBFBE0_801AE454[i] + 10.0f - D_EBFBE0_801B84E8[i].unk_00.z; + x = D_menu_801AE434[i] - D_menu_801B84E8[i].unk_00.x; + y = D_menu_801AE444[i] - D_menu_801B84E8[i].unk_00.y; + z = D_menu_801AE454[i] + 10.0f - D_menu_801B84E8[i].unk_00.z; - D_EBFBE0_801B84E8[i].unk_18 = -Math_Atan2F(y, sqrtf(SQ(x) + SQ(z))) * 180.0f / M_PI; - D_EBFBE0_801B84E8[i].unk_1C = Math_Atan2F(x, z) * 180.0f / M_PI; + D_menu_801B84E8[i].unk_18 = -Math_Atan2F(y, sqrtf(SQ(x) + SQ(z))) * 180.0f / M_PI; + D_menu_801B84E8[i].unk_1C = Math_Atan2F(x, z) * 180.0f / M_PI; } } - if (D_EBFBE0_801B82B4 == 125) { - D_EBFBE0_801B869C = 1; + if (D_menu_801B82B4 == 125) { + D_menu_801B869C = 1; } if (D_80178340 == 0xFF) { - func_8001A55C(&D_EBFBE0_801B867C, 0x11030010); - func_8001A55C(&D_EBFBE0_801B867C, 0x31024059); - D_EBFBE0_801B82C0++; + func_8001A55C(&D_menu_801B867C, 0x11030010); + func_8001A55C(&D_menu_801B867C, 0x31024059); + D_menu_801B82C0++; } - func_EBFBE0_801912A0(); - D_EBFBE0_801B82B4++; + func_menu_801912A0(); + D_menu_801B82B4++; break; case 2: D_80178340 = 0; D_80178410 = 0; - D_EBFBE0_801B86A0 = 0; - D_EBFBE0_801B82A8 = 20; - D_EBFBE0_801B82C0++; + D_menu_801B86A0 = 0; + D_menu_801B82A8 = 20; + D_menu_801B82C0++; break; case 3: - if (D_EBFBE0_801B82A8 != 0) { + if (D_menu_801B82A8 != 0) { break; } - D_EBFBE0_801B82C0 = 0; + D_menu_801B82C0 = 0; gDrawMode = DRAWMODE_0; - D_EBFBE0_801B82C4 = 0; + D_menu_801B82C4 = 0; func_8001DC6C(0, 23); break; } - func_EBFBE0_80191798(&D_EBFBE0_801B86A8, &D_EBFBE0_801B86AC); - func_EBFBE0_80191844(D_EBFBE0_801B86A8, D_EBFBE0_801B86AC); - func_EBFBE0_8018CC30(D_EBFBE0_801B8294, 9, D_EBFBE0_801B8290); - func_EBFBE0_80191674(D_EBFBE0_801B86C8, D_EBFBE0_801B86CC, 100.0f, &D_EBFBE0_801B82E0, &D_EBFBE0_801B82E4, - &D_EBFBE0_801B82E8); + func_menu_80191798(&D_menu_801B86A8, &D_menu_801B86AC); + func_menu_80191844(D_menu_801B86A8, D_menu_801B86AC); + func_menu_8018CC30(D_menu_801B8294, 9, D_menu_801B8290); + func_menu_80191674(D_menu_801B86C8, D_menu_801B86CC, 100.0f, &D_menu_801B82E0, &D_menu_801B82E4, &D_menu_801B82E8); func_800B6F50(D_80177978, D_80177980, D_80177988, D_801779A0, D_801779B8, D_801779C0); - D_EBFBE0_801B7BEC++; + D_menu_801B7BEC++; } -void func_EBFBE0_8018CB90(void) { +void func_menu_8018CB90(void) { s32 i; - if (D_EBFBE0_801B86A0 != 0) { - if (D_EBFBE0_801B8694 != 0) { - func_EBFBE0_8018DF0C(-1000.0f); + if (D_menu_801B86A0 != 0) { + if (D_menu_801B8694 != 0) { + func_menu_8018DF0C(-1000.0f); } - func_EBFBE0_8018E058(); + func_menu_8018E058(); for (i = 0; i < 4; i++) { - if ((D_EBFBE0_801B84E8[i].unk_38 <= 0) && (D_EBFBE0_801B84E8[i].unk_4C != 0)) { - func_EBFBE0_8018D2B8(i); + if ((D_menu_801B84E8[i].unk_38 <= 0) && (D_menu_801B84E8[i].unk_4C != 0)) { + func_menu_8018D2B8(i); } } } } -void func_EBFBE0_8018CC30(UnkStruct_D_EBFBE0_801B8294* arg0, s32 arg1, f32 arg2) { +void func_menu_8018CC30(UnkStruct_D_menu_801B8294* arg0, s32 arg1, f32 arg2) { s32 var_a3; Vec3f pos[2]; - if (D_EBFBE0_801B8298 != -1) { - if (D_EBFBE0_801B8298 == 0) { + if (D_menu_801B8298 != -1) { + if (D_menu_801B8298 == 0) { var_a3 = 0; - } else if (D_EBFBE0_801B8298 == 1) { + } else if (D_menu_801B8298 == 1) { var_a3 = 1; if (arg1 == 5) { var_a3 = 4; } - } else if (arg1 == (D_EBFBE0_801B8298 + 5)) { + } else if (arg1 == (D_menu_801B8298 + 5)) { var_a3 = 3; - } else if (arg1 == (D_EBFBE0_801B8298 + 4)) { + } else if (arg1 == (D_menu_801B8298 + 4)) { { var_a3 = 4; } } else { var_a3 = 2; } - func_EBFBE0_8018CD9C(&pos[0], &arg0[D_EBFBE0_801B8298], D_EBFBE0_801B828C, var_a3); + func_menu_8018CD9C(&pos[0], &arg0[D_menu_801B8298], D_menu_801B828C, var_a3); D_80177978 = pos[0].x; D_80177980 = pos[0].y; D_80177988 = pos[0].z; @@ -2046,19 +2037,19 @@ void func_EBFBE0_8018CC30(UnkStruct_D_EBFBE0_801B8294* arg0, s32 arg1, f32 arg2) D_801779B8 = pos[1].y; D_801779C0 = pos[1].z; - D_EBFBE0_801B828C += arg2; + D_menu_801B828C += arg2; - if (D_EBFBE0_801B828C > 1.0f) { - D_EBFBE0_801B8298++; - D_EBFBE0_801B828C = 0.0f; - if ((arg1 - 4) < D_EBFBE0_801B8298) { - D_EBFBE0_801B8298 = -1; + if (D_menu_801B828C > 1.0f) { + D_menu_801B8298++; + D_menu_801B828C = 0.0f; + if ((arg1 - 4) < D_menu_801B8298) { + D_menu_801B8298 = -1; } } } } -void func_EBFBE0_8018CD9C(Vec3f* pos, UnkStruct_D_EBFBE0_801B8294* arg1, f32 arg2, s32 arg3) { +void func_menu_8018CD9C(Vec3f* pos, UnkStruct_D_menu_801B8294* arg1, f32 arg2, s32 arg3) { f32 temp1; f32 temp2; f32 temp3; @@ -2120,25 +2111,25 @@ void func_EBFBE0_8018CD9C(Vec3f* pos, UnkStruct_D_EBFBE0_801B8294* arg1, f32 arg (temp4 * (arg1 + 3)->unk_14); } -void func_EBFBE0_8018D2B8(s32 arg0) { +void func_menu_8018D2B8(s32 arg0) { WingInfo wings; - Lights_SetOneLight(&gMasterDisp, D_EBFBE0_801B82E0, D_EBFBE0_801B82E4, D_EBFBE0_801B82E8, gLight1R, gLight1G, - gLight1B, gAmbientR, gAmbientG, gAmbientB); + Lights_SetOneLight(&gMasterDisp, D_menu_801B82E0, D_menu_801B82E4, D_menu_801B82E8, gLight1R, gLight1G, gLight1B, + gAmbientR, gAmbientG, gAmbientB); RCP_SetupDL(&gMasterDisp, 0x17); Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, D_EBFBE0_801B84E8[arg0].unk_00.x, D_EBFBE0_801B84E8[arg0].unk_00.y, - D_EBFBE0_801B84E8[arg0].unk_00.z, 1); + Matrix_Translate(gGfxMatrix, D_menu_801B84E8[arg0].unk_00.x, D_menu_801B84E8[arg0].unk_00.y, + D_menu_801B84E8[arg0].unk_00.z, 1); - Matrix_Scale(gGfxMatrix, D_EBFBE0_801B84E8[arg0].unk_0C, D_EBFBE0_801B84E8[arg0].unk_0C, - D_EBFBE0_801B84E8[arg0].unk_0C, 1); + Matrix_Scale(gGfxMatrix, D_menu_801B84E8[arg0].unk_0C, D_menu_801B84E8[arg0].unk_0C, D_menu_801B84E8[arg0].unk_0C, + 1); - Matrix_RotateZ(gGfxMatrix, D_EBFBE0_801B84E8[arg0].unk_20 * M_DTOR, 1); - Matrix_RotateX(gGfxMatrix, D_EBFBE0_801B84E8[arg0].unk_18 * M_DTOR, 1); - Matrix_RotateY(gGfxMatrix, D_EBFBE0_801B84E8[arg0].unk_1C * M_DTOR, 1); + Matrix_RotateZ(gGfxMatrix, D_menu_801B84E8[arg0].unk_20 * M_DTOR, 1); + Matrix_RotateX(gGfxMatrix, D_menu_801B84E8[arg0].unk_18 * M_DTOR, 1); + Matrix_RotateY(gGfxMatrix, D_menu_801B84E8[arg0].unk_1C * M_DTOR, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -2146,32 +2137,32 @@ void func_EBFBE0_8018D2B8(s32 arg0) { wings.unk_18 = wings.unk_1C = wings.unk_20 = wings.unk_24 = wings.unk_04 = wings.unk_08 = wings.unk_0C = wings.unk_10 = wings.unk_28 = 0.0f; - wings.unk_14 = D_EBFBE0_801B84E8[arg0].unk_28; - wings.unk_2C = D_EBFBE0_801B84E8[arg0].unk_34; - wings.unk_30 = D_EBFBE0_801B84E8[arg0].unk_2C; - wings.unk_34 = D_EBFBE0_801B84E8[arg0].unk_30; - wings.unk_38 = D_EBFBE0_801B84E8[arg0].unk_24; + wings.unk_14 = D_menu_801B84E8[arg0].unk_28; + wings.unk_2C = D_menu_801B84E8[arg0].unk_34; + wings.unk_30 = D_menu_801B84E8[arg0].unk_2C; + wings.unk_34 = D_menu_801B84E8[arg0].unk_30; + wings.unk_38 = D_menu_801B84E8[arg0].unk_24; func_80053658(&wings); - func_8005F1EC(&D_EBFBE0_801B84E8[arg0].unk_50); + func_8005F1EC(&D_menu_801B84E8[arg0].unk_50); - if (D_EBFBE0_801B84E8[arg0].unk_40 != 0) { - func_EBFBE0_8018D80C(arg0); + if (D_menu_801B84E8[arg0].unk_40 != 0) { + func_menu_8018D80C(arg0); } - if (D_EBFBE0_801B84E8[arg0].unk_3C != 0) { - func_EBFBE0_8018D510(arg0); + if (D_menu_801B84E8[arg0].unk_3C != 0) { + func_menu_8018D510(arg0); } - if (D_EBFBE0_801B84E8[arg0].unk_48 != 0) { - func_EBFBE0_8018DDB8(arg0); + if (D_menu_801B84E8[arg0].unk_48 != 0) { + func_menu_8018DDB8(arg0); } Matrix_Pop(&gGfxMatrix); } -void func_EBFBE0_8018D510(s32 arg0) { +void func_menu_8018D510(s32 arg0) { f32 var_fv0; f32 sp40; f32 sp3C; @@ -2182,7 +2173,7 @@ void func_EBFBE0_8018D510(s32 arg0) { RCP_SetupDL(&gMasterDisp, 0x43); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - if (D_EBFBE0_801B84E8[arg0].unk_40 == 1) { + if (D_menu_801B84E8[arg0].unk_40 == 1) { var_fa0 = -30.0f; var_fv1 = 0.02f; gDPSetEnvColor(gMasterDisp++, 128, 128, 255, 255); @@ -2192,7 +2183,7 @@ void func_EBFBE0_8018D510(s32 arg0) { gDPSetEnvColor(gMasterDisp++, 0, 0, 255, 255); } - var_fv0 = D_EBFBE0_801B84E8[arg0].unk_44; + var_fv0 = D_menu_801B84E8[arg0].unk_44; if (gFrameCount & 1) { var_fv0 += var_fv1; @@ -2202,13 +2193,13 @@ void func_EBFBE0_8018D510(s32 arg0) { Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, var_fa0, 1); Matrix_Scale(gGfxMatrix, var_fv0, var_fv0 * 0.7f, var_fv0, 1); - Matrix_RotateZ(gGfxMatrix, -D_EBFBE0_801B84E8[arg0].unk_20 * M_DTOR, 1); - Matrix_RotateX(gGfxMatrix, -D_EBFBE0_801B84E8[arg0].unk_18 * M_DTOR, 1); - Matrix_RotateY(gGfxMatrix, -D_EBFBE0_801B84E8[arg0].unk_1C * M_DTOR, 1); + Matrix_RotateZ(gGfxMatrix, -D_menu_801B84E8[arg0].unk_20 * M_DTOR, 1); + Matrix_RotateX(gGfxMatrix, -D_menu_801B84E8[arg0].unk_18 * M_DTOR, 1); + Matrix_RotateY(gGfxMatrix, -D_menu_801B84E8[arg0].unk_1C * M_DTOR, 1); - sp3C = -Math_Atan2F(D_80177978 - D_EBFBE0_801B84E8[arg0].unk_00.x, D_80177988 - D_EBFBE0_801B84E8[arg0].unk_00.z); - temp = sqrtf(SQ(D_80177988 - D_EBFBE0_801B84E8[arg0].unk_00.z) + SQ(D_80177978 - D_EBFBE0_801B84E8[arg0].unk_00.x)); - sp40 = Math_Atan2F(D_80177980 - D_EBFBE0_801B84E8[arg0].unk_00.y, temp); + sp3C = -Math_Atan2F(D_80177978 - D_menu_801B84E8[arg0].unk_00.x, D_80177988 - D_menu_801B84E8[arg0].unk_00.z); + temp = sqrtf(SQ(D_80177988 - D_menu_801B84E8[arg0].unk_00.z) + SQ(D_80177978 - D_menu_801B84E8[arg0].unk_00.x)); + sp40 = Math_Atan2F(D_80177980 - D_menu_801B84E8[arg0].unk_00.y, temp); Matrix_RotateY(gGfxMatrix, -sp3C, 1); Matrix_RotateX(gGfxMatrix, -sp40, 1); @@ -2221,69 +2212,69 @@ void func_EBFBE0_8018D510(s32 arg0) { Matrix_Pop(&gGfxMatrix); } -void func_EBFBE0_8018D80C(s32 arg0) { +void func_menu_8018D80C(s32 arg0) { s32 i; f32 sp70; f32 sp6C; f32 temp; - for (i = 0; i < D_EBFBE0_801B8100; i++) { - switch (D_EBFBE0_801B8108[i]) { + for (i = 0; i < D_menu_801B8100; i++) { + switch (D_menu_801B8108[i]) { case 0: - Math_SmoothStepToF(&D_EBFBE0_801B7FC0[i], D_EBFBE0_801B8060[i], 0.05f, 100.0f, 0.01f); + Math_SmoothStepToF(&D_menu_801B7FC0[i], D_menu_801B8060[i], 0.05f, 100.0f, 0.01f); - if (D_EBFBE0_801B7FC0[i] >= D_EBFBE0_801B8060[i]) { - D_EBFBE0_801B7FC0[i] = D_EBFBE0_801B8060[i]; - D_EBFBE0_801B8108[i] = 1; + if (D_menu_801B7FC0[i] >= D_menu_801B8060[i]) { + D_menu_801B7FC0[i] = D_menu_801B8060[i]; + D_menu_801B8108[i] = 1; } break; case 1: - Math_SmoothStepToF(&D_EBFBE0_801B7D40[i], 0.0f, D_EBFBE0_801B7F20[i], 100.0f, 0.01f); - Math_SmoothStepToF(&D_EBFBE0_801B7DE0[i], 0.0f, D_EBFBE0_801B7F20[i], 100.0f, 0.01f); - Math_SmoothStepToF(&D_EBFBE0_801B7E80[i], -25.0f, D_EBFBE0_801B7F20[i], 100.0f, 0.01f); + Math_SmoothStepToF(&D_menu_801B7D40[i], 0.0f, D_menu_801B7F20[i], 100.0f, 0.01f); + Math_SmoothStepToF(&D_menu_801B7DE0[i], 0.0f, D_menu_801B7F20[i], 100.0f, 0.01f); + Math_SmoothStepToF(&D_menu_801B7E80[i], -25.0f, D_menu_801B7F20[i], 100.0f, 0.01f); - D_EBFBE0_801B7FC0[i] -= 0.002f; - if (D_EBFBE0_801B7FC0[i] < 0.0f) { - D_EBFBE0_801B7FC0[i] = 0.0f; - D_EBFBE0_801B8108[i] = 255; + D_menu_801B7FC0[i] -= 0.002f; + if (D_menu_801B7FC0[i] < 0.0f) { + D_menu_801B7FC0[i] = 0.0f; + D_menu_801B8108[i] = 255; } break; case 255: - D_EBFBE0_801B7D40[i] = 10.0f - (Rand_ZeroOne() * 20.0f); - D_EBFBE0_801B7DE0[i] = 3.0f - (Rand_ZeroOne() * 7.0f); - D_EBFBE0_801B7E80[i] = -30.0f - (Rand_ZeroOne() * 15.0f); - D_EBFBE0_801B7FC0[i] = 0.0f; - D_EBFBE0_801B8060[i] = Rand_ZeroOne() * 0.02f; - D_EBFBE0_801B7F20[i] = 0.02f + (Rand_ZeroOne() * 0.08f); - D_EBFBE0_801B8108[i] = 0; + D_menu_801B7D40[i] = 10.0f - (Rand_ZeroOne() * 20.0f); + D_menu_801B7DE0[i] = 3.0f - (Rand_ZeroOne() * 7.0f); + D_menu_801B7E80[i] = -30.0f - (Rand_ZeroOne() * 15.0f); + D_menu_801B7FC0[i] = 0.0f; + D_menu_801B8060[i] = Rand_ZeroOne() * 0.02f; + D_menu_801B7F20[i] = 0.02f + (Rand_ZeroOne() * 0.08f); + D_menu_801B8108[i] = 0; break; } } - sp6C = -Math_Atan2F(D_80177978 - D_EBFBE0_801B84E8[arg0].unk_00.x, D_80177988 - D_EBFBE0_801B84E8[arg0].unk_00.z); - temp = sqrtf(SQ(D_80177988 - D_EBFBE0_801B84E8[arg0].unk_00.z) + SQ(D_80177978 - D_EBFBE0_801B84E8[arg0].unk_00.x)); - sp70 = Math_Atan2F(D_80177980 - D_EBFBE0_801B84E8[arg0].unk_00.y, temp); + sp6C = -Math_Atan2F(D_80177978 - D_menu_801B84E8[arg0].unk_00.x, D_80177988 - D_menu_801B84E8[arg0].unk_00.z); + temp = sqrtf(SQ(D_80177988 - D_menu_801B84E8[arg0].unk_00.z) + SQ(D_80177978 - D_menu_801B84E8[arg0].unk_00.x)); + sp70 = Math_Atan2F(D_80177980 - D_menu_801B84E8[arg0].unk_00.y, temp); RCP_SetupDL(&gMasterDisp, 0x31); gDPSetPrimColor(gMasterDisp++, 0, 0, 253, 253, 255, 255); gDPSetEnvColor(gMasterDisp++, 251, 251, 255, 255); - for (i = 0; i < D_EBFBE0_801B8100; i++) { - if (D_EBFBE0_801B7FC0[i] == 0.0f) { + for (i = 0; i < D_menu_801B8100; i++) { + if (D_menu_801B7FC0[i] == 0.0f) { continue; } Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, D_EBFBE0_801B7D40[i], D_EBFBE0_801B7DE0[i], D_EBFBE0_801B7E80[i], 1); - Matrix_Scale(gGfxMatrix, D_EBFBE0_801B7FC0[i], D_EBFBE0_801B7FC0[i], D_EBFBE0_801B7FC0[i], 1); + Matrix_Translate(gGfxMatrix, D_menu_801B7D40[i], D_menu_801B7DE0[i], D_menu_801B7E80[i], 1); + Matrix_Scale(gGfxMatrix, D_menu_801B7FC0[i], D_menu_801B7FC0[i], D_menu_801B7FC0[i], 1); - Matrix_RotateZ(gGfxMatrix, -D_EBFBE0_801B84E8[arg0].unk_20 * M_DTOR, 1); - Matrix_RotateX(gGfxMatrix, -D_EBFBE0_801B84E8[arg0].unk_18 * M_DTOR, 1); - Matrix_RotateY(gGfxMatrix, -D_EBFBE0_801B84E8[arg0].unk_1C * M_DTOR, 1); + Matrix_RotateZ(gGfxMatrix, -D_menu_801B84E8[arg0].unk_20 * M_DTOR, 1); + Matrix_RotateX(gGfxMatrix, -D_menu_801B84E8[arg0].unk_18 * M_DTOR, 1); + Matrix_RotateY(gGfxMatrix, -D_menu_801B84E8[arg0].unk_1C * M_DTOR, 1); Matrix_RotateY(gGfxMatrix, -sp6C, 1); Matrix_RotateX(gGfxMatrix, -sp70, 1); @@ -2296,11 +2287,11 @@ void func_EBFBE0_8018D80C(s32 arg0) { } } -void func_EBFBE0_8018DDB8(s32 arg0) { +void func_menu_8018DDB8(s32 arg0) { Matrix_Push(&gGfxMatrix); - Matrix_Translate( - gGfxMatrix, 0.0f, - (D_EBFBE0_801B9050 - D_EBFBE0_801B84E8[arg0].unk_00.y * 2.05f) + (D_EBFBE0_801B9048 - 84.0f) * 1.99f, 0.0f, 1); + Matrix_Translate(gGfxMatrix, 0.0f, + (D_menu_801B9050 - D_menu_801B84E8[arg0].unk_00.y * 2.05f) + (D_menu_801B9048 - 84.0f) * 1.99f, + 0.0f, 1); Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, 1.0f, 1); Matrix_RotateY(gGfxMatrix, M_PI, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -2313,42 +2304,42 @@ void func_EBFBE0_8018DDB8(s32 arg0) { Matrix_Pop(&gGfxMatrix); } -void func_EBFBE0_8018DF0C(f32 arg0) { +void func_menu_8018DF0C(f32 arg0) { f32 sp34; f32 sp30; - func_EBFBE0_80191798(&sp34, &sp30); + func_menu_80191798(&sp34, &sp30); RCP_SetupDL(&gMasterDisp, 0x35); if (arg0 != 0.0f) { - D_EBFBE0_801B8688.pos.z = D_80177988 - arg0; + D_menu_801B8688.pos.z = D_80177988 - arg0; } Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, D_EBFBE0_801B8688.pos.x, D_EBFBE0_801B8688.pos.y, D_EBFBE0_801B8688.pos.z, 1); + Matrix_Translate(gGfxMatrix, D_menu_801B8688.pos.x, D_menu_801B8688.pos.y, D_menu_801B8688.pos.z, 1); Matrix_RotateY(gGfxMatrix, M_DTOR * sp30, 1); Matrix_RotateX(gGfxMatrix, M_DTOR * sp34, 1); - Matrix_Scale(gGfxMatrix, D_EBFBE0_801B8688.scale, D_EBFBE0_801B8688.scale, D_EBFBE0_801B8688.scale, 1); + Matrix_Scale(gGfxMatrix, D_menu_801B8688.scale, D_menu_801B8688.scale, D_menu_801B8688.scale, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_6037CF0); - func_EBFBE0_8018E200(); + func_menu_8018E200(); Matrix_Pop(&gGfxMatrix); } -void func_EBFBE0_8018E058(void) { - Lights_SetOneLight(&gMasterDisp, D_EBFBE0_801B82E0, D_EBFBE0_801B82E4, D_EBFBE0_801B82E8, gLight1R, gLight1G, - gLight1B, gAmbientR, gAmbientG, gAmbientB); +void func_menu_8018E058(void) { + Lights_SetOneLight(&gMasterDisp, D_menu_801B82E0, D_menu_801B82E4, D_menu_801B82E8, gLight1R, gLight1G, gLight1B, + gAmbientR, gAmbientG, gAmbientB); Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, D_EBFBE0_801B8658.pos.x, D_EBFBE0_801B8658.pos.y, D_EBFBE0_801B8658.pos.z, 1); + Matrix_Translate(gGfxMatrix, D_menu_801B8658.pos.x, D_menu_801B8658.pos.y, D_menu_801B8658.pos.z, 1); - Matrix_RotateZ(gGfxMatrix, M_DTOR * D_EBFBE0_801B8658.angleZ, 1); - Matrix_RotateX(gGfxMatrix, M_DTOR * D_EBFBE0_801B8658.angleX, 1); - Matrix_RotateY(gGfxMatrix, M_DTOR * D_EBFBE0_801B8658.angleY, 1); + Matrix_RotateZ(gGfxMatrix, M_DTOR * D_menu_801B8658.angleZ, 1); + Matrix_RotateX(gGfxMatrix, M_DTOR * D_menu_801B8658.angleX, 1); + Matrix_RotateY(gGfxMatrix, M_DTOR * D_menu_801B8658.angleY, 1); - Matrix_Scale(gGfxMatrix, D_EBFBE0_801B8658.scale, D_EBFBE0_801B8658.scale, D_EBFBE0_801B8658.scale, 1); + Matrix_Scale(gGfxMatrix, D_menu_801B8658.scale, D_menu_801B8658.scale, D_menu_801B8658.scale, 1); Matrix_SetGfxMtx(&gMasterDisp); RCP_SetupDL(&gMasterDisp, 0x17); @@ -2356,72 +2347,72 @@ void func_EBFBE0_8018E058(void) { D_80177B8C = 1; func_800515C4(); - func_8005F1EC(&D_EBFBE0_801B8658.unk_24); + func_8005F1EC(&D_menu_801B8658.unk_24); Matrix_Pop(&gGfxMatrix); } -void func_EBFBE0_8018E200(void) { +void func_menu_8018E200(void) { f32 scale; s32 i; - for (i = 0; i < D_EBFBE0_801B7C98; i++) { - switch (D_EBFBE0_801B7CA0[i]) { + for (i = 0; i < D_menu_801B7C98; i++) { + switch (D_menu_801B7CA0[i]) { case 0: - D_EBFBE0_801B7C48[i] += 0.15f; - if (D_EBFBE0_801B7C48[i] >= D_EBFBE0_801B7C70[i]) { - D_EBFBE0_801B7C48[i] = D_EBFBE0_801B7C70[i]; - D_EBFBE0_801B7CA0[i] = 10; + D_menu_801B7C48[i] += 0.15f; + if (D_menu_801B7C48[i] >= D_menu_801B7C70[i]) { + D_menu_801B7C48[i] = D_menu_801B7C70[i]; + D_menu_801B7CA0[i] = 10; } break; case 10: - D_EBFBE0_801B7D18[i]--; - if (D_EBFBE0_801B7D18[i] <= 0) { - D_EBFBE0_801B7CA0[i] = 1; + D_menu_801B7D18[i]--; + if (D_menu_801B7D18[i] <= 0) { + D_menu_801B7CA0[i] = 1; } break; case 1: - D_EBFBE0_801B7CC8[i] -= 0x10; - if (D_EBFBE0_801B7CC8[i] < 0) { - D_EBFBE0_801B7CC8[i] = 0; + D_menu_801B7CC8[i] -= 0x10; + if (D_menu_801B7CC8[i] < 0) { + D_menu_801B7CC8[i] = 0; } - D_EBFBE0_801B7CF0[i] -= 0x10; - if (D_EBFBE0_801B7CF0[i] < 0) { - D_EBFBE0_801B7CF0[i] = 0; + D_menu_801B7CF0[i] -= 0x10; + if (D_menu_801B7CF0[i] < 0) { + D_menu_801B7CF0[i] = 0; } - if (D_EBFBE0_801B7CC8[i] == 0 && D_EBFBE0_801B7CF0[i] == 0) { - D_EBFBE0_801B7CA0[i] = 255; + if (D_menu_801B7CC8[i] == 0 && D_menu_801B7CF0[i] == 0) { + D_menu_801B7CA0[i] = 255; } break; case 255: - D_EBFBE0_801B7BF8[i] = 10.0f + (Rand_ZeroOne() * 10.0f); - D_EBFBE0_801B7C20[i] = -10.0f + (Rand_ZeroOne() * -60.0f); - D_EBFBE0_801B7C48[i] = 0.0f; - D_EBFBE0_801B7C70[i] = 0.1f + (Rand_ZeroOne() * 0.3f); - D_EBFBE0_801B7D18[i] = 5 + (s32) (Rand_ZeroOne() * 5.0f); - D_EBFBE0_801B7CC8[i] = 255; - D_EBFBE0_801B7CF0[i] = 128; - D_EBFBE0_801B7CA0[i] = 0; + D_menu_801B7BF8[i] = 10.0f + (Rand_ZeroOne() * 10.0f); + D_menu_801B7C20[i] = -10.0f + (Rand_ZeroOne() * -60.0f); + D_menu_801B7C48[i] = 0.0f; + D_menu_801B7C70[i] = 0.1f + (Rand_ZeroOne() * 0.3f); + D_menu_801B7D18[i] = 5 + (s32) (Rand_ZeroOne() * 5.0f); + D_menu_801B7CC8[i] = 255; + D_menu_801B7CF0[i] = 128; + D_menu_801B7CA0[i] = 0; break; } } RCP_SetupDL(&gMasterDisp, 0x31); - for (i = 0; i < D_EBFBE0_801B7C98; i++) { - gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 200, 200, D_EBFBE0_801B7CC8[i]); - gDPSetEnvColor(gMasterDisp++, 255, 0, 0, D_EBFBE0_801B7CF0[i]); + for (i = 0; i < D_menu_801B7C98; i++) { + gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 200, 200, D_menu_801B7CC8[i]); + gDPSetEnvColor(gMasterDisp++, 255, 0, 0, D_menu_801B7CF0[i]); - scale = D_EBFBE0_801B7C48[i] / D_EBFBE0_801B8688.scale; + scale = D_menu_801B7C48[i] / D_menu_801B8688.scale; Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 5.0f, 1); - Matrix_RotateZ(gGfxMatrix, D_EBFBE0_801B7C20[i] * M_DTOR, 1); - Matrix_Translate(gGfxMatrix, 0.0f, D_EBFBE0_801B7BF8[i], 0.0f, 1); + Matrix_RotateZ(gGfxMatrix, D_menu_801B7C20[i] * M_DTOR, 1); + Matrix_Translate(gGfxMatrix, 0.0f, D_menu_801B7BF8[i], 0.0f, 1); Matrix_Scale(gGfxMatrix, scale, scale, scale, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -2432,48 +2423,48 @@ void func_EBFBE0_8018E200(void) { } } -void func_EBFBE0_8018E67C(s32 arg0) { +void func_menu_8018E67C(s32 arg0) { Vec3f sp60[50]; s32 sp5C; f32 temp_fv1; - Lights_SetOneLight(&gMasterDisp, D_EBFBE0_801B82E0, D_EBFBE0_801B82E4, D_EBFBE0_801B82E8, gLight1R, gLight1G, - gLight1B, gAmbientR, gAmbientG, gAmbientB); + Lights_SetOneLight(&gMasterDisp, D_menu_801B82E0, D_menu_801B82E4, D_menu_801B82E8, gLight1R, gLight1G, gLight1B, + gAmbientR, gAmbientG, gAmbientB); - sp5C = D_EBFBE0_801B8350[arg0].unk_58 % Animation_GetFrameCount(D_EBFBE0_801ADA00[arg0].unk_0); + sp5C = D_menu_801B8350[arg0].unk_58 % Animation_GetFrameCount(D_menu_801ADA00[arg0].unk_0); RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, 255, 995, 1000); Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, D_EBFBE0_801B8350[arg0].unk_00.x, D_EBFBE0_801B8350[arg0].unk_00.y, - D_EBFBE0_801B8350[arg0].unk_00.z + D_EBFBE0_801B84D0, 1); - Matrix_Scale(gGfxMatrix, D_EBFBE0_801B84D4, D_EBFBE0_801B84D4, D_EBFBE0_801B84D4, 1); + Matrix_Translate(gGfxMatrix, D_menu_801B8350[arg0].unk_00.x, D_menu_801B8350[arg0].unk_00.y, + D_menu_801B8350[arg0].unk_00.z + D_menu_801B84D0, 1); + Matrix_Scale(gGfxMatrix, D_menu_801B84D4, D_menu_801B84D4, D_menu_801B84D4, 1); Matrix_SetGfxMtx(&gMasterDisp); if (arg0 == 2) { gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); } - Animation_GetFrameData(D_EBFBE0_801ADA00[arg0].unk_0, sp5C, sp60); - Animation_DrawSkeleton(0, D_EBFBE0_801ADA00[arg0].skelanime, sp60, NULL, NULL, NULL, &gIdentityMatrix); + Animation_GetFrameData(D_menu_801ADA00[arg0].unk_0, sp5C, sp60); + Animation_DrawSkeleton(0, D_menu_801ADA00[arg0].skelanime, sp60, NULL, NULL, NULL, &gIdentityMatrix); if (arg0 == 2) { gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); } if (arg0 == 0) { - func_8005F1EC(&D_EBFBE0_801B84D8); + func_8005F1EC(&D_menu_801B84D8); } Matrix_Pop(&gGfxMatrix); Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, D_EBFBE0_801B8350[arg0].unk_00.x - 5.0f, 5.0f, - D_EBFBE0_801B8350[arg0].unk_00.z + 10.0f + D_EBFBE0_801B84D0, 1); + Matrix_Translate(gGfxMatrix, D_menu_801B8350[arg0].unk_00.x - 5.0f, 5.0f, + D_menu_801B8350[arg0].unk_00.z + 10.0f + D_menu_801B84D0, 1); - Matrix_Scale(gGfxMatrix, D_EBFBE0_801B8350[arg0].unk_10, D_EBFBE0_801B8350[arg0].unk_10, - D_EBFBE0_801B8350[arg0].unk_10, 1); + Matrix_Scale(gGfxMatrix, D_menu_801B8350[arg0].unk_10, D_menu_801B8350[arg0].unk_10, D_menu_801B8350[arg0].unk_10, + 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -2487,139 +2478,138 @@ void func_EBFBE0_8018E67C(s32 arg0) { temp_fv1 = __sinf(sp5C * 12.0f * M_DTOR) * 15.0f; if (temp_fv1 >= 0) { - D_EBFBE0_801B8350[arg0].unk_0C = temp_fv1; + D_menu_801B8350[arg0].unk_0C = temp_fv1; } else if (temp_fv1 > -2.0f) { - D_EBFBE0_801B8350[arg0].unk_0C = -temp_fv1; + D_menu_801B8350[arg0].unk_0C = -temp_fv1; } else { - D_EBFBE0_801B8350[arg0].unk_0C = 0.0f; + D_menu_801B8350[arg0].unk_0C = 0.0f; } - D_EBFBE0_801B8350[arg0].unk_10 = 3.0f - (D_EBFBE0_801B8350[arg0].unk_0C / 100.0f); + D_menu_801B8350[arg0].unk_10 = 3.0f - (D_menu_801B8350[arg0].unk_0C / 100.0f); } -void func_EBFBE0_8018EA78(s32 arg0) { +void func_menu_8018EA78(s32 arg0) { Vec3f sp48[50]; s32 sp44; - sp44 = D_EBFBE0_801B8350[arg0].unk_58 % Animation_GetFrameCount(D_EBFBE0_801ADA00[arg0].unk_4); + sp44 = D_menu_801B8350[arg0].unk_58 % Animation_GetFrameCount(D_menu_801ADA00[arg0].unk_4); RCP_SetupDL(&gMasterDisp, 0x17); - Lights_SetOneLight(&gMasterDisp, D_EBFBE0_801B82E0, D_EBFBE0_801B82E4, D_EBFBE0_801B82E8, gLight1R, gLight1G, - gLight1B, gAmbientR, gAmbientG, gAmbientB); + Lights_SetOneLight(&gMasterDisp, D_menu_801B82E0, D_menu_801B82E4, D_menu_801B82E8, gLight1R, gLight1G, gLight1B, + gAmbientR, gAmbientG, gAmbientB); Matrix_Push(&gGfxMatrix); - Matrix_RotateX(gGfxMatrix, D_EBFBE0_801B8350[arg0].unk_48 * M_DTOR, 1); - Matrix_RotateY(gGfxMatrix, D_EBFBE0_801B8350[arg0].unk_4C * M_DTOR, 1); - Matrix_RotateZ(gGfxMatrix, D_EBFBE0_801B8350[arg0].unk_50 * M_DTOR, 1); + Matrix_RotateX(gGfxMatrix, D_menu_801B8350[arg0].unk_48 * M_DTOR, 1); + Matrix_RotateY(gGfxMatrix, D_menu_801B8350[arg0].unk_4C * M_DTOR, 1); + Matrix_RotateZ(gGfxMatrix, D_menu_801B8350[arg0].unk_50 * M_DTOR, 1); - Matrix_Translate(gGfxMatrix, D_EBFBE0_801B8350[arg0].unk_00.x, D_EBFBE0_801B8350[arg0].unk_00.y, - D_EBFBE0_801B8350[arg0].unk_00.z, 1); - Matrix_Scale(gGfxMatrix, D_EBFBE0_801B84D4, D_EBFBE0_801B84D4, D_EBFBE0_801B84D4, 1); + Matrix_Translate(gGfxMatrix, D_menu_801B8350[arg0].unk_00.x, D_menu_801B8350[arg0].unk_00.y, + D_menu_801B8350[arg0].unk_00.z, 1); + Matrix_Scale(gGfxMatrix, D_menu_801B84D4, D_menu_801B84D4, D_menu_801B84D4, 1); Matrix_SetGfxMtx(&gMasterDisp); - Math_SmoothStepToVec3fArray(sp48, D_EBFBE0_801B86E0[arg0], 1, - Animation_GetFrameData(D_EBFBE0_801ADA00[arg0].unk_4, sp44, sp48), 0.2f, 100.0f, - 0.0001f); - Animation_DrawSkeleton(1, D_EBFBE0_801ADA00[arg0].skelanime, D_EBFBE0_801B86E0[arg0], func_EBFBE0_8018EDC8, NULL, - &arg0, &gIdentityMatrix); + Math_SmoothStepToVec3fArray(sp48, D_menu_801B86E0[arg0], 1, + Animation_GetFrameData(D_menu_801ADA00[arg0].unk_4, sp44, sp48), 0.2f, 100.0f, 0.0001f); + Animation_DrawSkeleton(1, D_menu_801ADA00[arg0].skelanime, D_menu_801B86E0[arg0], func_menu_8018EDC8, NULL, &arg0, + &gIdentityMatrix); Matrix_Pop(&gGfxMatrix); } -bool func_EBFBE0_8018EDC8(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4) { +bool func_menu_8018EDC8(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4) { f32 x; f32 y; f32 z; s32 i = *(s32*) arg4; - if ((D_EBFBE0_801B86A4 < 2) && D_EBFBE0_801B9040) { - x = D_EBFBE0_801B905C - D_EBFBE0_801B8350[i].unk_00.x; - y = D_EBFBE0_801B9060 - (D_EBFBE0_801B8350[i].unk_00.y + D_EBFBE0_801B8350[i].unk_14); - z = D_EBFBE0_801B9064 - D_EBFBE0_801B8350[i].unk_00.z; + if ((D_menu_801B86A4 < 2) && D_menu_801B9040) { + x = D_menu_801B905C - D_menu_801B8350[i].unk_00.x; + y = D_menu_801B9060 - (D_menu_801B8350[i].unk_00.y + D_menu_801B8350[i].unk_14); + z = D_menu_801B9064 - D_menu_801B8350[i].unk_00.z; - D_EBFBE0_801B8350[i].unk_28 = Math_Atan2F(x, sqrtf(SQ(y) + SQ(z))) * M_RTOD; - D_EBFBE0_801B8350[i].unk_2C = Math_Atan2F(y, z) * M_RTOD; + D_menu_801B8350[i].unk_28 = Math_Atan2F(x, sqrtf(SQ(y) + SQ(z))) * M_RTOD; + D_menu_801B8350[i].unk_2C = Math_Atan2F(y, z) * M_RTOD; - D_EBFBE0_801B8350[i].unk_38 = D_EBFBE0_801B8350[i].unk_28; - D_EBFBE0_801B8350[i].unk_3C = D_EBFBE0_801B8350[i].unk_2C; + D_menu_801B8350[i].unk_38 = D_menu_801B8350[i].unk_28; + D_menu_801B8350[i].unk_3C = D_menu_801B8350[i].unk_2C; - if (D_EBFBE0_801B8350[i].unk_28 < -45.0f) { - D_EBFBE0_801B8350[i].unk_28 = -45.0f; - } else if (D_EBFBE0_801B8350[i].unk_28 > 45.0f) { - D_EBFBE0_801B8350[i].unk_28 = 45.0f; + if (D_menu_801B8350[i].unk_28 < -45.0f) { + D_menu_801B8350[i].unk_28 = -45.0f; + } else if (D_menu_801B8350[i].unk_28 > 45.0f) { + D_menu_801B8350[i].unk_28 = 45.0f; } - if (D_EBFBE0_801B8350[i].unk_2C < -40.0f) { - D_EBFBE0_801B8350[i].unk_2C = -40.0f; - } else if (D_EBFBE0_801B8350[i].unk_2C > 55.0f) { - D_EBFBE0_801B8350[i].unk_2C = 55.0f; + if (D_menu_801B8350[i].unk_2C < -40.0f) { + D_menu_801B8350[i].unk_2C = -40.0f; + } else if (D_menu_801B8350[i].unk_2C > 55.0f) { + D_menu_801B8350[i].unk_2C = 55.0f; } - if (D_EBFBE0_801B8350[i].unk_38 < -20.0f) { - D_EBFBE0_801B8350[i].unk_38 = D_EBFBE0_801B8350[i].unk_38 - (-20.0f); - if (D_EBFBE0_801B8350[i].unk_38 < -20.0f) { - D_EBFBE0_801B8350[i].unk_38 = -20.0f; + if (D_menu_801B8350[i].unk_38 < -20.0f) { + D_menu_801B8350[i].unk_38 = D_menu_801B8350[i].unk_38 - (-20.0f); + if (D_menu_801B8350[i].unk_38 < -20.0f) { + D_menu_801B8350[i].unk_38 = -20.0f; } - } else if (D_EBFBE0_801B8350[i].unk_38 > 20.0f) { - D_EBFBE0_801B8350[i].unk_38 = D_EBFBE0_801B8350[i].unk_38 - 20.0f; - if (D_EBFBE0_801B8350[i].unk_38 > 20.0f) { - D_EBFBE0_801B8350[i].unk_38 = 20.0f; + } else if (D_menu_801B8350[i].unk_38 > 20.0f) { + D_menu_801B8350[i].unk_38 = D_menu_801B8350[i].unk_38 - 20.0f; + if (D_menu_801B8350[i].unk_38 > 20.0f) { + D_menu_801B8350[i].unk_38 = 20.0f; } } else { - D_EBFBE0_801B8350[i].unk_38 = 0.0f; + D_menu_801B8350[i].unk_38 = 0.0f; } - if (D_EBFBE0_801B8350[i].unk_3C < -35.0f) { - D_EBFBE0_801B8350[i].unk_3C = D_EBFBE0_801B8350[i].unk_3C - (-35.0f); - if (D_EBFBE0_801B8350[i].unk_3C < -10.0f) { - D_EBFBE0_801B8350[i].unk_3C = -10.0f; + if (D_menu_801B8350[i].unk_3C < -35.0f) { + D_menu_801B8350[i].unk_3C = D_menu_801B8350[i].unk_3C - (-35.0f); + if (D_menu_801B8350[i].unk_3C < -10.0f) { + D_menu_801B8350[i].unk_3C = -10.0f; } - } else if (D_EBFBE0_801B8350[i].unk_3C > 40.0f) { - D_EBFBE0_801B8350[i].unk_3C = D_EBFBE0_801B8350[i].unk_3C - 40.0f; - if (D_EBFBE0_801B8350[i].unk_3C > 10.0f) { - D_EBFBE0_801B8350[i].unk_3C = 10.0f; + } else if (D_menu_801B8350[i].unk_3C > 40.0f) { + D_menu_801B8350[i].unk_3C = D_menu_801B8350[i].unk_3C - 40.0f; + if (D_menu_801B8350[i].unk_3C > 10.0f) { + D_menu_801B8350[i].unk_3C = 10.0f; } } else { - D_EBFBE0_801B8350[i].unk_3C = 0.0f; + D_menu_801B8350[i].unk_3C = 0.0f; } - Math_SmoothStepToF(&D_EBFBE0_801B8350[i].unk_30, D_EBFBE0_801B8350[i].unk_28, 0.01f, 100.0f, 0.0001f); - Math_SmoothStepToF(&D_EBFBE0_801B8350[i].unk_34, D_EBFBE0_801B8350[i].unk_2C, 0.01f, 100.0f, 0.0001f); - Math_SmoothStepToF(&D_EBFBE0_801B8350[i].unk_40, D_EBFBE0_801B8350[i].unk_38, 0.005f, 100.0f, 0.0001f); - Math_SmoothStepToF(&D_EBFBE0_801B8350[i].unk_44, D_EBFBE0_801B8350[i].unk_3C, 0.005f, 100.0f, 0.0001f); + Math_SmoothStepToF(&D_menu_801B8350[i].unk_30, D_menu_801B8350[i].unk_28, 0.01f, 100.0f, 0.0001f); + Math_SmoothStepToF(&D_menu_801B8350[i].unk_34, D_menu_801B8350[i].unk_2C, 0.01f, 100.0f, 0.0001f); + Math_SmoothStepToF(&D_menu_801B8350[i].unk_40, D_menu_801B8350[i].unk_38, 0.005f, 100.0f, 0.0001f); + Math_SmoothStepToF(&D_menu_801B8350[i].unk_44, D_menu_801B8350[i].unk_3C, 0.005f, 100.0f, 0.0001f); } switch (i) { case 0: if (arg0 == 1) { - arg3->z += D_EBFBE0_801B8350[i].unk_18; + arg3->z += D_menu_801B8350[i].unk_18; } if (arg0 == 19) { - arg3->x += D_EBFBE0_801B8350[i].unk_30; - arg3->y += D_EBFBE0_801B8350[i].unk_34; + arg3->x += D_menu_801B8350[i].unk_30; + arg3->y += D_menu_801B8350[i].unk_34; } if (arg0 == 20) { - arg3->x += D_EBFBE0_801B8350[i].unk_40; - arg3->y += D_EBFBE0_801B8350[i].unk_44; + arg3->x += D_menu_801B8350[i].unk_40; + arg3->y += D_menu_801B8350[i].unk_44; } break; case 1: if (arg0 == 1) { - arg3->z += D_EBFBE0_801B8350[i].unk_18; + arg3->z += D_menu_801B8350[i].unk_18; } if (arg0 == 11) { - arg3->z += D_EBFBE0_801B8350[i].unk_20; + arg3->z += D_menu_801B8350[i].unk_20; } if (arg0 == 19) { - arg3->x += D_EBFBE0_801B8350[i].unk_30; - arg3->y += D_EBFBE0_801B8350[i].unk_34; + arg3->x += D_menu_801B8350[i].unk_30; + arg3->y += D_menu_801B8350[i].unk_34; } if (arg0 == 20) { - arg3->x += D_EBFBE0_801B8350[i].unk_40; - arg3->y += D_EBFBE0_801B8350[i].unk_44; + arg3->x += D_menu_801B8350[i].unk_40; + arg3->y += D_menu_801B8350[i].unk_44; } if (arg0 == 21) { arg3->x += -5.0f; @@ -2628,15 +2618,15 @@ bool func_EBFBE0_8018EDC8(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* case 2: if (arg0 == 1) { - arg3->z += D_EBFBE0_801B8350[i].unk_18; + arg3->z += D_menu_801B8350[i].unk_18; } if (arg0 == 19) { - arg3->x += D_EBFBE0_801B8350[i].unk_30; - arg3->y += D_EBFBE0_801B8350[i].unk_34; + arg3->x += D_menu_801B8350[i].unk_30; + arg3->y += D_menu_801B8350[i].unk_34; } if (arg0 == 20) { - arg3->x += D_EBFBE0_801B8350[i].unk_40; - arg3->y += D_EBFBE0_801B8350[i].unk_44; + arg3->x += D_menu_801B8350[i].unk_40; + arg3->y += D_menu_801B8350[i].unk_44; } if (arg0 == 21) { arg3->x += 10.0f; @@ -2645,15 +2635,15 @@ bool func_EBFBE0_8018EDC8(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* case 3: if (arg0 == 1) { - arg3->z += D_EBFBE0_801B8350[i].unk_18; + arg3->z += D_menu_801B8350[i].unk_18; } if (arg0 == 17) { - arg3->x += D_EBFBE0_801B8350[i].unk_30; - arg3->y += D_EBFBE0_801B8350[i].unk_34; + arg3->x += D_menu_801B8350[i].unk_30; + arg3->y += D_menu_801B8350[i].unk_34; } if (arg0 == 18) { - arg3->x += D_EBFBE0_801B8350[i].unk_40; - arg3->y += D_EBFBE0_801B8350[i].unk_44; + arg3->x += D_menu_801B8350[i].unk_40; + arg3->y += D_menu_801B8350[i].unk_44; } if (arg0 == 19) { arg3->x += 4.0f; @@ -2664,7 +2654,7 @@ bool func_EBFBE0_8018EDC8(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* return false; } -void func_EBFBE0_8018F438(void) { +void func_menu_8018F438(void) { f32 sp54; Lights_SetOneLight(&gMasterDisp, 0, 0, 0, 0, 0, 0, gAmbientR, gAmbientG, gAmbientB); @@ -2675,14 +2665,14 @@ void func_EBFBE0_8018F438(void) { sp54 = 3.0f; } - D_EBFBE0_801B82C8 += 70.0f; - D_EBFBE0_801B82C8 = Math_ModF(D_EBFBE0_801B82C8, 4101.6f); + D_menu_801B82C8 += 70.0f; + D_menu_801B82C8 = Math_ModF(D_menu_801B82C8, 4101.6f); RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, 255, 995, 1000); Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, (3079.2002f * sp54) - D_EBFBE0_801B82C8, 1); + Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, (3079.2002f * sp54) - D_menu_801B82C8, 1); Matrix_Scale(gGfxMatrix, 0.6f, 0.6f, 0.6f, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -2701,53 +2691,53 @@ void func_EBFBE0_8018F438(void) { Matrix_Pop(&gGfxMatrix); } -void func_EBFBE0_8018F680(void) { +void func_menu_8018F680(void) { s32 i; RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); for (i = 0; i < 30; i++) { - TextureRect_16bRGBA(&gMasterDisp, D_6000000 + (i * 472), 236, 2, D_EBFBE0_801B9054, - D_EBFBE0_801B9058 + (i * 2.0f), 1.0f, 1.0f); + TextureRect_16bRGBA(&gMasterDisp, D_6000000 + (i * 472), 236, 2, D_menu_801B9054, D_menu_801B9058 + (i * 2.0f), + 1.0f, 1.0f); } } -void func_EBFBE0_8018F77C(void) { +void func_menu_8018F77C(void) { RCP_SetupDL(&gMasterDisp, 0x35); Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, D_EBFBE0_801B905C, D_EBFBE0_801B9060, D_EBFBE0_801B9064, 1); - Matrix_Scale(gGfxMatrix, D_EBFBE0_801B9068, D_EBFBE0_801B906C, 1.0f, 1); + Matrix_Translate(gGfxMatrix, D_menu_801B905C, D_menu_801B9060, D_menu_801B9064, 1); + Matrix_Scale(gGfxMatrix, D_menu_801B9068, D_menu_801B906C, 1.0f, 1); Matrix_RotateX(gGfxMatrix, M_DTOR * 90, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_60148D0); Matrix_Pop(&gGfxMatrix); } -void func_EBFBE0_8018F85C(void) { +void func_menu_8018F85C(void) { RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); TextureRect_8bIA(&gMasterDisp, D_6013470, 16, 16, 234.0f, 20.0f, 1.0f, 1.0f); } -void func_EBFBE0_8018F8E4(void) { +void func_menu_8018F8E4(void) { f32 temp2; s32 i; - static f32 D_EBFBE0_801AE464 = 68.0f; - static f32 D_EBFBE0_801AE468 = 170.0f; - static f32 D_EBFBE0_801AE46C = 5.55f; - static f32 D_EBFBE0_801AE470 = 0.9f; - static f32 D_EBFBE0_801AE474 = 70.0f; - static f32 D_EBFBE0_801AE478 = 172.0f; + static f32 D_menu_801AE464 = 68.0f; + static f32 D_menu_801AE468 = 170.0f; + static f32 D_menu_801AE46C = 5.55f; + static f32 D_menu_801AE470 = 0.9f; + static f32 D_menu_801AE474 = 70.0f; + static f32 D_menu_801AE478 = 172.0f; if (gControllerLock == 0) { temp2 = 188.0f; - if ((s32) Math_SmoothStepToF(&D_EBFBE0_801B7BC8, D_EBFBE0_801B7BCC, 0.5f, 100.0f, 1.0f) == 0.0f) { - if (D_EBFBE0_801B7BC8 == 32.0f) { - D_EBFBE0_801B7BCC = 255.0f; + if ((s32) Math_SmoothStepToF(&D_menu_801B7BC8, D_menu_801B7BCC, 0.5f, 100.0f, 1.0f) == 0.0f) { + if (D_menu_801B7BC8 == 32.0f) { + D_menu_801B7BCC = 255.0f; } else { - D_EBFBE0_801B7BCC = 32.0f; + D_menu_801B7BCC = 32.0f; } } @@ -2756,19 +2746,19 @@ void func_EBFBE0_8018F8E4(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 60, 60, 255, 200); - TextureRect_8bCI(&gMasterDisp, &D_601D750, &D_601DB50, 32, 32, D_EBFBE0_801AE464, D_EBFBE0_801AE468, - D_EBFBE0_801AE46C, D_EBFBE0_801AE470); + TextureRect_8bCI(&gMasterDisp, &D_601D750, &D_601DB50, 32, 32, D_menu_801AE464, D_menu_801AE468, + D_menu_801AE46C, D_menu_801AE470); RCP_SetupDL(&gMasterDisp, 0x53); - gDPSetPrimColor(gMasterDisp++, 0, 0, 255, (s32) D_EBFBE0_801B7BC8, (s32) D_EBFBE0_801B7BC8, 255); + gDPSetPrimColor(gMasterDisp++, 0, 0, 255, (s32) D_menu_801B7BC8, (s32) D_menu_801B7BC8, 255); for (i = 0; i < 6; i++) { - TextureRect_8bIA(&gMasterDisp, D_60123F0 + (704 * i), 176, 4, D_EBFBE0_801AE474, - D_EBFBE0_801AE478 + (i * 4.0f), 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_60123F0 + (704 * i), 176, 4, D_menu_801AE474, + D_menu_801AE478 + (i * 4.0f), 1.0f, 1.0f); } } else { RCP_SetupDL(&gMasterDisp, 0x53); - gDPSetPrimColor(gMasterDisp++, 0, 0, 255, (s32) D_EBFBE0_801B7BC8, (s32) D_EBFBE0_801B7BC8, 255); + gDPSetPrimColor(gMasterDisp++, 0, 0, 255, (s32) D_menu_801B7BC8, (s32) D_menu_801B7BC8, 255); for (i = 0; i < 2; i++) { TextureRect_8bIA(&gMasterDisp, D_600E360 + (i * 720), 120, 6, 101.0f, temp2 + (i * 6.0f), 1.0f, 1.0f); @@ -2778,7 +2768,7 @@ void func_EBFBE0_8018F8E4(void) { } } -void func_EBFBE0_8018FC14(void) { +void func_menu_8018FC14(void) { s32 i; RCP_SetupDL(&gMasterDisp, 0x53); @@ -2789,23 +2779,23 @@ void func_EBFBE0_8018FC14(void) { } } -void func_EBFBE0_8018FD08(void) { +void func_menu_8018FD08(void) { s32 i; Gfx* temp_v1; f32 temp_fs2; s32 var_s0; s32 var_s0_2; f32 temp; - static f32 D_EBFBE0_801AE47C[] = { 90.0f, 100.0f, 75.0f, 75.0f }; + static f32 D_menu_801AE47C[] = { 90.0f, 100.0f, 75.0f, 75.0f }; - temp_fs2 = D_EBFBE0_801AE47C[D_EBFBE0_801B8340]; + temp_fs2 = D_menu_801AE47C[D_menu_801B8340]; temp = 210.0f; RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - switch (D_EBFBE0_801B8340) { + switch (D_menu_801B8340) { case 0: TextureRect_8bIA(&gMasterDisp, D_600F940, 144, 13, temp_fs2, temp, 1.0f, 1.0f); break; @@ -2830,65 +2820,65 @@ void func_EBFBE0_8018FD08(void) { } } -static Gfx* D_EBFBE0_801AE48C[12] = { +static Gfx* D_menu_801AE48C[12] = { (Gfx*) 0x06036290, (Gfx*) 0x06036290, (Gfx*) 0x06036290, (Gfx*) 0x06036290, (Gfx*) 0x06036B30, (Gfx*) 0x06036290, (Gfx*) 0x06036290, (Gfx*) 0x06036290, (Gfx*) 0x06036290, (Gfx*) 0x06036290, (Gfx*) 0x06036B30, (Gfx*) 0x06036290, }; -static f32 D_EBFBE0_801AE4BC[12] = { +static f32 D_menu_801AE4BC[12] = { 0.0f, 0.0f, 0.0f, 0.0f, 10.0f, 13.0f, 20.0f, 35.0f, 40.0f, 50.0f, 50.0f, 70.0f, }; -static f32 D_EBFBE0_801AE4EC[] = { +static f32 D_menu_801AE4EC[] = { 20.0f, 22.0f, 24.0f, 28.0f, 30.0f, 14.0f, 16.0f, 18.0f, 27.0f, 28.0f, 70.0f, 40.0f, }; -static u8 D_EBFBE0_801AE51C[] = { +static u8 D_menu_801AE51C[] = { 0xC0, 0x80, 0x60, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, }; -static s32 D_EBFBE0_801AE528[] = { +static s32 D_menu_801AE528[] = { 80, 64, 48, 32, 12, 32, 44, 32, 42, 36, 12, 38, }; -void func_EBFBE0_8018FF74(void) { - if (D_EBFBE0_801B7BD8 != 0) { - if ((D_EBFBE0_801B7BB8 > -870.0f) && (D_EBFBE0_801B7BB8 < 900.0f) && (D_80178340 > 0)) { - if ((D_EBFBE0_801B7BB8 < 0.0f) && (D_EBFBE0_801B7BD0 < 255)) { - D_EBFBE0_801B7BD0 += 2; +void func_menu_8018FF74(void) { + if (D_menu_801B7BD8 != 0) { + if ((D_menu_801B7BB8 > -870.0f) && (D_menu_801B7BB8 < 900.0f) && (D_80178340 > 0)) { + if ((D_menu_801B7BB8 < 0.0f) && (D_menu_801B7BD0 < 255)) { + D_menu_801B7BD0 += 2; } - if ((D_EBFBE0_801B7BB8 > 0.0f) && (D_EBFBE0_801B7BD0 > 0)) { - D_EBFBE0_801B7BD0 -= 2; + if ((D_menu_801B7BB8 > 0.0f) && (D_menu_801B7BD0 > 0)) { + D_menu_801B7BD0 -= 2; } RCP_SetupDL(&gMasterDisp, 0x53); gDPSetAlphaDither(gMasterDisp++, G_AD_NOISE); gDPSetColorDither(gMasterDisp++, G_CD_NOISE); - gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_EBFBE0_801B7BD0); + gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_menu_801B7BD0); - TextureRect_16bRGBA(&gMasterDisp, &D_600D5C0, 32, 32, D_EBFBE0_801B9080, D_EBFBE0_801B9084, - D_EBFBE0_801B7BB0, D_EBFBE0_801B7BB4); - D_EBFBE0_801B9080 += 1.66f; + TextureRect_16bRGBA(&gMasterDisp, &D_600D5C0, 32, 32, D_menu_801B9080, D_menu_801B9084, D_menu_801B7BB0, + D_menu_801B7BB4); + D_menu_801B9080 += 1.66f; } - func_EBFBE0_801918FC(); - func_EBFBE0_80190144(); - func_EBFBE0_801903B8(); + func_menu_801918FC(); + func_menu_80190144(); + func_menu_801903B8(); Matrix_Pop(&gGfxMatrix); } } -void func_EBFBE0_80190144(void) { +void func_menu_80190144(void) { s32 i; if (D_80178340 > 0) { D_80178340 -= 4; } - D_801783D0 = D_EBFBE0_801B7BB8; - D_801783D4 = D_EBFBE0_801B7BBC; + D_801783D0 = D_menu_801B7BB8; + D_801783D4 = D_menu_801B7BBC; if (D_801783D0 < 950.0f) { if (D_801783D0 > -900.0f) { @@ -2913,12 +2903,12 @@ void func_EBFBE0_80190144(void) { for (i = 0; i < 4; i++) { Matrix_Push(&gGfxMatrix); - Matrix_Scale(gGfxMatrix, D_EBFBE0_801AE4EC[i] * 0.5f, D_EBFBE0_801AE4EC[i] * 0.5f, - D_EBFBE0_801AE4EC[i] * 0.5f, 1); + Matrix_Scale(gGfxMatrix, D_menu_801AE4EC[i] * 0.5f, D_menu_801AE4EC[i] * 0.5f, D_menu_801AE4EC[i] * 0.5f, + 1); Matrix_SetGfxMtx(&gMasterDisp); - gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, D_EBFBE0_801AE51C[i], D_EBFBE0_801AE528[i]); - gSPDisplayList(gMasterDisp++, D_EBFBE0_801AE48C[i]); + gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, D_menu_801AE51C[i], D_menu_801AE528[i]); + gSPDisplayList(gMasterDisp++, D_menu_801AE48C[i]); Matrix_Pop(&gGfxMatrix); } @@ -2926,8 +2916,8 @@ void func_EBFBE0_80190144(void) { } } -void func_EBFBE0_801903B8(void) { - static s32 D_EBFBE0_801AE558 = 12; +void func_menu_801903B8(void) { + static s32 D_menu_801AE558 = 12; f32 temp_fs3; f32 temp_fs4; f32 var_fs1; @@ -2955,88 +2945,87 @@ void func_EBFBE0_801903B8(void) { for (i = 4; i < 12; i++) { Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, D_EBFBE0_801AE4BC[i] * temp_fs3, -D_EBFBE0_801AE4BC[i] * temp_fs4, 0.0f, 1); - Matrix_Scale(gGfxMatrix, D_EBFBE0_801AE4EC[i] * 0.5f, D_EBFBE0_801AE4EC[i] * 0.5f, - D_EBFBE0_801AE4EC[i] * 0.5f, 1); + Matrix_Translate(gGfxMatrix, D_menu_801AE4BC[i] * temp_fs3, -D_menu_801AE4BC[i] * temp_fs4, 0.0f, 1); + Matrix_Scale(gGfxMatrix, D_menu_801AE4EC[i] * 0.5f, D_menu_801AE4EC[i] * 0.5f, D_menu_801AE4EC[i] * 0.5f, + 1); Matrix_SetGfxMtx(&gMasterDisp); - temp = D_EBFBE0_801AE528[i] * var_fs1; + temp = D_menu_801AE528[i] * var_fs1; if (i != 10) { - gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, D_EBFBE0_801AE51C[i], (s32) temp); + gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, D_menu_801AE51C[i], (s32) temp); } else { - gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, D_EBFBE0_801AE51C[i], D_EBFBE0_801AE558); + gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, D_menu_801AE51C[i], D_menu_801AE558); } - gSPDisplayList(gMasterDisp++, D_EBFBE0_801AE48C[i]); + gSPDisplayList(gMasterDisp++, D_menu_801AE48C[i]); Matrix_Pop(&gGfxMatrix); } Matrix_Pop(&gGfxMatrix); } } -void func_EBFBE0_801906A0(void) { +void func_menu_801906A0(void) { s32 i; - switch (D_EBFBE0_801B7BD4) { + switch (D_menu_801B7BD4) { case 0: RCP_SetupDL(&gMasterDisp, 0x55); - gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, (s32) D_EBFBE0_801B7BDC); + gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, (s32) D_menu_801B7BDC); TextureRect_4bCI(&gMasterDisp, D_6014140, D_60147C0, 256, 13, 90.0f, 110.0f, 1.0f, 1.0f); - gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, (s32) D_EBFBE0_801B7BE0); + gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, (s32) D_menu_801B7BE0); TextureRect_4bCI(&gMasterDisp, D_60147E0, D_60148B0, 32, 13, 150.0f, 110.0f, 1.0f, 1.0f); break; case 1: RCP_SetupDL(&gMasterDisp, 0x53); - gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, (s32) D_EBFBE0_801B7BDC); + gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, (s32) D_menu_801B7BDC); for (i = 0; i < 5; i++) { - TextureRect_16bRGBA(&gMasterDisp, D_6006EA0 + (2048 * i), 128, 16, D_EBFBE0_801B9070, - D_EBFBE0_801B9074 + (16 * i * D_EBFBE0_801B907C), D_EBFBE0_801B9078, - D_EBFBE0_801B907C); + TextureRect_16bRGBA(&gMasterDisp, D_6006EA0 + (2048 * i), 128, 16, D_menu_801B9070, + D_menu_801B9074 + (16 * i * D_menu_801B907C), D_menu_801B9078, D_menu_801B907C); } - TextureRect_16bRGBA(&gMasterDisp, D_600BEA0, 128, 8, D_EBFBE0_801B9070, - (80.0f * D_EBFBE0_801B907C) + D_EBFBE0_801B9074, D_EBFBE0_801B9078, D_EBFBE0_801B907C); + TextureRect_16bRGBA(&gMasterDisp, D_600BEA0, 128, 8, D_menu_801B9070, + (80.0f * D_menu_801B907C) + D_menu_801B9074, D_menu_801B9078, D_menu_801B907C); case -1: break; } } -void func_EBFBE0_80190950(void) { - Lights_SetOneLight(&gMasterDisp, D_EBFBE0_801B82E0, D_EBFBE0_801B82E4, D_EBFBE0_801B82E8, 0, 0, 0, gAmbientR, - gAmbientG, gAmbientB); +void func_menu_80190950(void) { + Lights_SetOneLight(&gMasterDisp, D_menu_801B82E0, D_menu_801B82E4, D_menu_801B82E8, 0, 0, 0, gAmbientR, gAmbientG, + gAmbientB); RCP_SetupDL(&gMasterDisp, 0x17); Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, 0.0f, D_EBFBE0_801B9048, D_EBFBE0_801B904C, 1); + Matrix_Translate(gGfxMatrix, 0.0f, D_menu_801B9048, D_menu_801B904C, 1); Matrix_Scale(gGfxMatrix, 0.4f, 0.4f, 0.4f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_6018D40); - if (D_EBFBE0_801B7BE4 != 0) { - func_EBFBE0_80190A98(); + if (D_menu_801B7BE4 != 0) { + func_menu_80190A98(); } Matrix_Pop(&gGfxMatrix); } -void func_EBFBE0_80190A98(void) { +void func_menu_80190A98(void) { Matrix_Translate(gGfxMatrix, 401.0f, -249.0f, -22.0f, 1); Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, 1.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_602A720); } -void func_EBFBE0_80190B30(s32 arg0) { - Lights_SetOneLight(&gMasterDisp, D_EBFBE0_801B82E0, D_EBFBE0_801B82E4, D_EBFBE0_801B82E8, gLight1R, gLight1G, - gLight1B, gAmbientR, gAmbientG, gAmbientB); +void func_menu_80190B30(s32 arg0) { + Lights_SetOneLight(&gMasterDisp, D_menu_801B82E0, D_menu_801B82E4, D_menu_801B82E8, gLight1R, gLight1G, gLight1B, + gAmbientR, gAmbientG, gAmbientB); RCP_SetupDL(&gMasterDisp, 0x17); Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, D_EBFBE0_801B84E8[arg0].unk_00.x, -12.8f, D_EBFBE0_801B9044, 1); + Matrix_Translate(gGfxMatrix, D_menu_801B84E8[arg0].unk_00.x, -12.8f, D_menu_801B9044, 1); Matrix_Scale(gGfxMatrix, 0.8f, 0.8f, 0.8f, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -3045,21 +3034,21 @@ void func_EBFBE0_80190B30(s32 arg0) { Matrix_Pop(&gGfxMatrix); } -void func_EBFBE0_80190C9C(void) { +void func_menu_80190C9C(void) { s32 i; - static f32 D_EBFBE0_801AE55C = 89.0f; - static f32 D_EBFBE0_801AE560 = 17.0f; - static f32 D_EBFBE0_801AE564 = 101.0f; - static f32 D_EBFBE0_801AE568 = 197.0f; + static f32 D_menu_801AE55C = 89.0f; + static f32 D_menu_801AE560 = 17.0f; + static f32 D_menu_801AE564 = 101.0f; + static f32 D_menu_801AE568 = 197.0f; - switch (D_EBFBE0_801B7BF0) { + switch (D_menu_801B7BF0) { case 0: break; case 1: RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - TextureRect_8bIA(&gMasterDisp, D_600E980, 144, 28, D_EBFBE0_801AE55C, D_EBFBE0_801AE560, 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_600E980, 144, 28, D_menu_801AE55C, D_menu_801AE560, 1.0f, 1.0f); break; case 2: @@ -3067,77 +3056,77 @@ void func_EBFBE0_80190C9C(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); for (i = 0; i < 4; i++) { - TextureRect_8bIA(&gMasterDisp, D_6011890 + (672 * i), 112, 6, D_EBFBE0_801AE564, - D_EBFBE0_801AE568 + (6.0f * i), 1.0f, 1.0f); + TextureRect_8bIA(&gMasterDisp, D_6011890 + (672 * i), 112, 6, D_menu_801AE564, + D_menu_801AE568 + (6.0f * i), 1.0f, 1.0f); } - TextureRect_8bIA(&gMasterDisp, D_6012310, 112, 2, D_EBFBE0_801AE564, D_EBFBE0_801AE568 + (6.0f * 4), 1.0f, + TextureRect_8bIA(&gMasterDisp, D_6012310, 112, 2, D_menu_801AE564, D_menu_801AE568 + (6.0f * 4), 1.0f, 1.0f); } } -void func_EBFBE0_80190E64(void) { - if (D_EBFBE0_801B82C4 == 0) { - func_EBFBE0_80190FD0(); +void func_menu_80190E64(void) { + if (D_menu_801B82C4 == 0) { + func_menu_80190FD0(); } else { - func_EBFBE0_80190EA4(); + func_menu_80190EA4(); } } -void func_EBFBE0_80190EA4(void) { - switch (D_EBFBE0_801B8280) { +void func_menu_80190EA4(void) { + switch (D_menu_801B8280) { case 0: if (gControllerPress[gMainController].button & 0xD00F) { // START, A, B, C-left, C-Down, C-Up, C-Right Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_EBFBE0_801B8284 = 0; - D_EBFBE0_801B8280 = 1; + D_menu_801B8284 = 0; + D_menu_801B8280 = 1; gControllerLock = 0x1E; } break; case 1: - if (D_EBFBE0_801B8284 < 120) { - D_EBFBE0_801B8284 += 18; + if (D_menu_801B8284 < 120) { + D_menu_801B8284 += 18; } else { func_8001DC6C(0, 0x17); D_80178410 = 0; gRadioState = 0; - D_EBFBE0_801B82C0 = 0; + D_menu_801B82C0 = 0; gDrawMode = DRAWMODE_0; - D_EBFBE0_801B82C4 = 0; + D_menu_801B82C4 = 0; gControllerLock = 30; - D_EBFBE0_801B8284 = 0; - D_EBFBE0_801B8280 = 0; + D_menu_801B8284 = 0; + D_menu_801B8280 = 0; } break; } } -void func_EBFBE0_80190FD0(void) { +void func_menu_80190FD0(void) { if (gControllerLock == 0) { - switch (D_EBFBE0_801B8280) { + switch (D_menu_801B8280) { case 0: if (((gControllerPress[gMainController].button & START_BUTTON) || (gControllerPress[gMainController].button & A_BUTTON)) && - (D_EBFBE0_801B8280 == 0)) { + (D_menu_801B8280 == 0)) { Audio_PlaySfx(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); func_800182F4(0x101E00FF); func_800182F4(0x111E00FF); - D_EBFBE0_801B8284 = 0; - D_EBFBE0_801B8280 = 1; + D_menu_801B8284 = 0; + D_menu_801B8280 = 1; } break; case 1: - if (D_EBFBE0_801B8284 < 120) { - D_EBFBE0_801B8284 += 18; + if (D_menu_801B8284 < 120) { + D_menu_801B8284 += 18; } else { gGameState = GSTATE_MENU; D_Timer_8017783C = 2; gOptionMenuStatus = OPTION_WAIT; gDrawMode = DRAWMODE_0; D_80178410 = 0; - D_EBFBE0_801B8280 = 0; - D_EBFBE0_801B8284 = 0; + D_menu_801B8280 = 0; + D_menu_801B8284 = 0; gControllerLock = 3; } break; @@ -3145,43 +3134,43 @@ void func_EBFBE0_80190FD0(void) { } } -void func_EBFBE0_8019111C(void) { +void func_menu_8019111C(void) { f32 x; f32 y; - if ((D_EBFBE0_801B82B0 == 0) && (D_EBFBE0_801B9040 == 0) && + if ((D_menu_801B82B0 == 0) && (D_menu_801B9040 == 0) && ((gControllerPress[gMainController].stick_x != 0) || (gControllerPress[gMainController].stick_y != 0))) { - D_EBFBE0_801B9040 = 1; - D_EBFBE0_801B86A4 = 0; + D_menu_801B9040 = 1; + D_menu_801B86A4 = 0; } x = gControllerPress[gMainController].stick_x; y = gControllerPress[gMainController].stick_y; - if (D_EBFBE0_801B9040 != 0) { - if (((x * 0.2f) + D_EBFBE0_801B905C > -500.0f) && ((x * 0.2f) + D_EBFBE0_801B905C < 500.0f)) { - D_EBFBE0_801B905C += x * 0.2f; + if (D_menu_801B9040 != 0) { + if (((x * 0.2f) + D_menu_801B905C > -500.0f) && ((x * 0.2f) + D_menu_801B905C < 500.0f)) { + D_menu_801B905C += x * 0.2f; } - if (((y * 0.2f) + D_EBFBE0_801B9060 > -500.0f) && ((y * 0.2f) + D_EBFBE0_801B9060 < 500.0f)) { - D_EBFBE0_801B9060 += y * 0.2f; + if (((y * 0.2f) + D_menu_801B9060 > -500.0f) && ((y * 0.2f) + D_menu_801B9060 < 500.0f)) { + D_menu_801B9060 += y * 0.2f; } } - if ((D_EBFBE0_801B9040 != 0) && (gControllerPress[gMainController].stick_x == 0) && + if ((D_menu_801B9040 != 0) && (gControllerPress[gMainController].stick_x == 0) && (gControllerPress[gMainController].stick_y == 0)) { - D_EBFBE0_801B86A4++; + D_menu_801B86A4++; } else { - D_EBFBE0_801B86A4 = 0; + D_menu_801B86A4 = 0; } } -void func_EBFBE0_801912A0(void) { - switch (D_EBFBE0_801B869C) { +void func_menu_801912A0(void) { + switch (D_menu_801B869C) { case 0: D_80178340 -= 4; if (D_80178340 < 0) { D_80178340 = 0; - D_EBFBE0_801B869C = 255; + D_menu_801B869C = 255; } break; @@ -3189,14 +3178,14 @@ void func_EBFBE0_801912A0(void) { D_80178340 += 15; if (D_80178340 > 255) { D_80178340 = 255; - D_EBFBE0_801B869C = 255; + D_menu_801B869C = 255; } break; } } -void func_EBFBE0_80191320(s32 arg0, f32* arg1, f32* arg2, f32* arg3, f32* arg4, f32* arg5, f32* arg6, f32 arg7, - f32 arg8, f32 arg9) { +void func_menu_80191320(s32 arg0, f32* arg1, f32* arg2, f32* arg3, f32* arg4, f32* arg5, f32* arg6, f32 arg7, f32 arg8, + f32 arg9) { Vec3f sp54; Vec3f sp48; f32* sp44; @@ -3244,13 +3233,13 @@ void func_EBFBE0_80191320(s32 arg0, f32* arg1, f32* arg2, f32* arg3, f32* arg4, Matrix_RotateX(gCalcMatrix, M_DTOR * arg7, 1); Matrix_MultVec3f(gCalcMatrix, &sp48, &sp54); - D_EBFBE0_801B829C = sp54.x; - D_EBFBE0_801B82A0 = sp54.y; - D_EBFBE0_801B82A4 = sp54.z; + D_menu_801B829C = sp54.x; + D_menu_801B82A0 = sp54.y; + D_menu_801B82A4 = sp54.z; } -void func_EBFBE0_801914AC(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f32* arg5, f32 arg6, f32* arg7, f32* arg8, - f32* arg9, f32 argA, f32 argB, f32 argC) { +void func_menu_801914AC(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f32* arg5, f32 arg6, f32* arg7, f32* arg8, + f32* arg9, f32 argA, f32 argB, f32 argC) { Vec3f sp44; Vec3f sp38; @@ -3290,12 +3279,12 @@ void func_EBFBE0_801914AC(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f3 Matrix_RotateX(gCalcMatrix, M_DTOR * argB, 1); Matrix_MultVec3f(gCalcMatrix, &sp38, &sp44); - D_EBFBE0_801B829C = sp44.x; - D_EBFBE0_801B82A0 = sp44.y; - D_EBFBE0_801B82A4 = sp44.z; + D_menu_801B829C = sp44.x; + D_menu_801B82A0 = sp44.y; + D_menu_801B82A4 = sp44.z; } -void func_EBFBE0_80191674(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f32* arg5) { +void func_menu_80191674(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f32* arg5) { f32 sp34; f32 sp30; Vec3f sp24; @@ -3305,7 +3294,7 @@ void func_EBFBE0_80191674(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f3 sp18.y = 0.0f; sp18.z = arg2; - func_EBFBE0_80191798(&sp34, &sp30); + func_menu_80191798(&sp34, &sp30); Matrix_RotateX(gCalcMatrix, M_DTOR * -sp34, 0); Matrix_RotateY(gCalcMatrix, M_DTOR * -sp30, 1); @@ -3319,7 +3308,7 @@ void func_EBFBE0_80191674(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f3 *arg5 = sp24.z; } -void func_EBFBE0_80191798(f32* arg0, f32* arg1) { +void func_menu_80191798(f32* arg0, f32* arg1) { f32 temp_fv1 = D_80177978 - D_801779A0; f32 temp_fv2 = D_80177980 - D_801779B8; f32 temp_ft4 = D_80177988 - D_801779C0; @@ -3328,7 +3317,7 @@ void func_EBFBE0_80191798(f32* arg0, f32* arg1) { *arg1 = Math_Atan2F(temp_fv1, temp_ft4) * (180.0f / M_PI); } -void func_EBFBE0_80191844(f32 arg0, f32 arg1) { +void func_menu_80191844(f32 arg0, f32 arg1) { Vec3f sp24; Vec3f sp18; @@ -3341,20 +3330,20 @@ void func_EBFBE0_80191844(f32 arg0, f32 arg1) { Matrix_MultVec3f(gCalcMatrix, &sp18, &sp24); - D_EBFBE0_801B829C = sp24.x; - D_EBFBE0_801B82A0 = sp24.y; - D_EBFBE0_801B82A4 = sp24.z; + D_menu_801B829C = sp24.x; + D_menu_801B82A0 = sp24.y; + D_menu_801B82A4 = sp24.z; } -void func_EBFBE0_801918FC(void) { +void func_menu_801918FC(void) { Matrix_Push(&gGfxMatrix); - Matrix_LookAt(gGfxMatrix, D_80177978, D_80177980, D_80177988, D_801779A0, D_801779B8, D_801779C0, D_EBFBE0_801B829C, - D_EBFBE0_801B82A0, D_EBFBE0_801B82A4, 1); + Matrix_LookAt(gGfxMatrix, D_80177978, D_80177980, D_80177988, D_801779A0, D_801779B8, D_801779C0, D_menu_801B829C, + D_menu_801B82A0, D_menu_801B82A4, 1); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 0.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); } -void func_EBFBE0_801919C4(u16** arg0, s32 arg1) { +void func_menu_801919C4(u16** arg0, s32 arg1) { D_80178720 = arg0; D_80178724 = 0; D_80178308 = arg0[D_80178724]; diff --git a/src/overlays/ovl_menu/fox_title.h b/src/overlays/ovl_menu/fox_title.h index 7163dbda..77a75fdf 100644 --- a/src/overlays/ovl_menu/fox_title.h +++ b/src/overlays/ovl_menu/fox_title.h @@ -7,7 +7,7 @@ typedef struct { /* 0x00 */ f32 unk_0; /* 0x04 */ f32 unk_4; /* 0x08 */ f32 unk_8; -} UnkStruct_D_EBFBE0_801ADF54; // size = 0xC +} UnkStruct_D_menu_801ADF54; // size = 0xC typedef struct UnkStruct_D_801B8350 { /* 0x00 */ Vec3f unk_00; @@ -54,7 +54,7 @@ typedef struct { /* 0x48 */ s32 unk_48; /* 0x4C */ s32 unk_4C; /* 0x50 */ Vec3f unk_50; -} UnkStruct_D_EBFBE0_801B84E8; // size = 0x5C +} UnkStruct_D_menu_801B84E8; // size = 0x5C typedef struct { /* 0x00 */ Vec3f pos; @@ -65,172 +65,172 @@ typedef struct { /* 0x1C */ f32 scale; /* 0x20 */ char pad20[0x4]; /* 0x24 */ Vec3f unk_24; -} UnkStruct_D_EBFBE0_801B8658; // size = 0x30 +} UnkStruct_D_menu_801B8658; // size = 0x30 typedef struct { /* 0x00 */ Vec3f pos; /* 0x0C */ s32 unk_0C; /* 0x10 */ f32 scale; -} UnkStruct_D_EBFBE0_801B8688; // size = 0x14 +} UnkStruct_D_menu_801B8688; // size = 0x14 -extern UnkStruct_D_EBFBE0_801B8294 D_EBFBE0_801B6B40[]; -extern UnkStruct_D_EBFBE0_801B8294 D_EBFBE0_801B6C60[]; -extern f32 D_EBFBE0_801B7BB0; -extern f32 D_EBFBE0_801B7BB4; -extern f32 D_EBFBE0_801B7BB8; -extern f32 D_EBFBE0_801B7BBC; -extern f32 D_EBFBE0_801B7BC0; -extern f32 D_EBFBE0_801B7BC4; -extern f32 D_EBFBE0_801B7BC8; -extern f32 D_EBFBE0_801B7BCC; -extern s32 D_EBFBE0_801B7BD0; -extern s32 D_EBFBE0_801B7BD4; -extern s32 D_EBFBE0_801B7BD8; -extern f32 D_EBFBE0_801B7BDC; -extern f32 D_EBFBE0_801B7BE0; -extern s32 D_EBFBE0_801B7BE4; -extern f32 D_EBFBE0_801B7BE8; -extern s32 D_EBFBE0_801B7BEC; -extern s32 D_EBFBE0_801B7BF0; -extern f32 D_EBFBE0_801B7BF8[10]; -extern f32 D_EBFBE0_801B7C20[10]; -extern f32 D_EBFBE0_801B7C48[10]; -extern f32 D_EBFBE0_801B7C70[10]; -extern s32 D_EBFBE0_801B7C98; -extern s32 D_EBFBE0_801B7CA0[10]; -extern s32 D_EBFBE0_801B7CC8[10]; -extern s32 D_EBFBE0_801B7CF0[10]; -extern s32 D_EBFBE0_801B7D18[10]; -extern f32 D_EBFBE0_801B7D40[]; -extern f32 D_EBFBE0_801B7DE0[]; -extern f32 D_EBFBE0_801B7E80[]; -extern f32 D_EBFBE0_801B7F20[]; -extern f32 D_EBFBE0_801B7FC0[]; -extern f32 D_EBFBE0_801B8060[]; -extern s32 D_EBFBE0_801B8100; -extern s32 D_EBFBE0_801B8108[]; -extern u8 D_EBFBE0_801B8248[][4]; -extern f32 D_EBFBE0_801B828C; -extern f32 D_EBFBE0_801B8290; -extern UnkStruct_D_EBFBE0_801B8294* D_EBFBE0_801B8294; -extern s32 D_EBFBE0_801B8298; -extern f32 D_EBFBE0_801B829C; -extern f32 D_EBFBE0_801B82A0; -extern f32 D_EBFBE0_801B82A4; -extern s32 D_EBFBE0_801B82A8; -extern s32 D_EBFBE0_801B82AC; -extern s32 D_EBFBE0_801B82B0; -extern s32 D_EBFBE0_801B82B4; -extern s32 D_EBFBE0_801B82B8; -extern s32 D_EBFBE0_801B82BC; -extern s32 D_EBFBE0_801B82C0; -extern s32 D_EBFBE0_801B82C4; -extern f32 D_EBFBE0_801B82C8; -extern f32 D_EBFBE0_801B82CC; -extern f32 D_EBFBE0_801B82D0; -extern f32 D_EBFBE0_801B82D4; -extern f32 D_EBFBE0_801B82D8; -extern f32 D_EBFBE0_801B82DC; -extern f32 D_EBFBE0_801B82E0; -extern f32 D_EBFBE0_801B82E4; -extern f32 D_EBFBE0_801B82E8; -extern f32 D_EBFBE0_801B82EC; -extern f32 D_EBFBE0_801B82F0; -extern f32 D_EBFBE0_801B82F4; -extern s32 D_EBFBE0_801B82F8; -extern s32 D_EBFBE0_801B82FC; -extern s32 D_EBFBE0_801B8300; -extern f32 D_EBFBE0_801B8304; -extern f32 D_EBFBE0_801B8308; -extern f32 D_EBFBE0_801B830C; -extern s32 D_EBFBE0_801B8310; -extern s32 D_EBFBE0_801B8314; -extern s32 D_EBFBE0_801B8318; -extern s32 D_EBFBE0_801B831C; -extern s32 D_EBFBE0_801B8320; -extern s32 D_EBFBE0_801B8324; -extern f32 D_EBFBE0_801B8328; -extern f32 D_EBFBE0_801B832C; -extern f32 D_EBFBE0_801B8330; -extern s32 D_EBFBE0_801B8334; -extern bool D_EBFBE0_801B8338; -extern f32 D_EBFBE0_801B833C; -extern s32 D_EBFBE0_801B8340; -extern s32 D_EBFBE0_801B8344; -extern s32 D_EBFBE0_801B8348; -extern UnkStruct_D_801B8350 D_EBFBE0_801B8350[]; -extern f32 D_EBFBE0_801B84D0; -extern f32 D_EBFBE0_801B84D4; -extern Vec3f D_EBFBE0_801B84D8; -extern UnkStruct_D_EBFBE0_801B84E8 D_EBFBE0_801B84E8[4]; -extern UnkStruct_D_EBFBE0_801B8658 D_EBFBE0_801B8658; -extern Vec3f D_EBFBE0_801B867C; -extern UnkStruct_D_EBFBE0_801B8688 D_EBFBE0_801B8688; -extern s32 D_EBFBE0_801B8694; -extern s32 D_EBFBE0_801B869C; -extern s32 D_EBFBE0_801B86A0; -extern s32 D_EBFBE0_801B86A4; -extern f32 D_EBFBE0_801B86A8; -extern f32 D_EBFBE0_801B86AC; -extern f32 D_EBFBE0_801B86B0; -extern f32 D_EBFBE0_801B86B4; -extern f32 D_EBFBE0_801B86B8; -extern f32 D_EBFBE0_801B86BC; -extern f32 D_EBFBE0_801B86C0; -extern f32 D_EBFBE0_801B86C4; -extern f32 D_EBFBE0_801B86C8; -extern f32 D_EBFBE0_801B86CC; -extern f32 D_EBFBE0_801B86D0; -extern f32 D_EBFBE0_801B86D4; -extern f32 D_EBFBE0_801B86D8; -extern f32 D_EBFBE0_801B86DC; -extern Vec3f D_EBFBE0_801B86E0[4][50]; -extern s32 D_EBFBE0_801B9040; -extern f32 D_EBFBE0_801B9044; -extern f32 D_EBFBE0_801B9048; -extern f32 D_EBFBE0_801B904C; -extern f32 D_EBFBE0_801B9050; -extern f32 D_EBFBE0_801B9054; -extern f32 D_EBFBE0_801B9058; -extern f32 D_EBFBE0_801B905C; -extern f32 D_EBFBE0_801B9060; -extern f32 D_EBFBE0_801B9064; -extern f32 D_EBFBE0_801B9068; -extern f32 D_EBFBE0_801B906C; -extern f32 D_EBFBE0_801B9070; -extern f32 D_EBFBE0_801B9074; -extern f32 D_EBFBE0_801B9078; -extern f32 D_EBFBE0_801B907C; -extern f32 D_EBFBE0_801B9080; -extern f32 D_EBFBE0_801B9084; +extern UnkStruct_D_menu_801B8294 D_menu_801B6B40[]; +extern UnkStruct_D_menu_801B8294 D_menu_801B6C60[]; +extern f32 D_menu_801B7BB0; +extern f32 D_menu_801B7BB4; +extern f32 D_menu_801B7BB8; +extern f32 D_menu_801B7BBC; +extern f32 D_menu_801B7BC0; +extern f32 D_menu_801B7BC4; +extern f32 D_menu_801B7BC8; +extern f32 D_menu_801B7BCC; +extern s32 D_menu_801B7BD0; +extern s32 D_menu_801B7BD4; +extern s32 D_menu_801B7BD8; +extern f32 D_menu_801B7BDC; +extern f32 D_menu_801B7BE0; +extern s32 D_menu_801B7BE4; +extern f32 D_menu_801B7BE8; +extern s32 D_menu_801B7BEC; +extern s32 D_menu_801B7BF0; +extern f32 D_menu_801B7BF8[10]; +extern f32 D_menu_801B7C20[10]; +extern f32 D_menu_801B7C48[10]; +extern f32 D_menu_801B7C70[10]; +extern s32 D_menu_801B7C98; +extern s32 D_menu_801B7CA0[10]; +extern s32 D_menu_801B7CC8[10]; +extern s32 D_menu_801B7CF0[10]; +extern s32 D_menu_801B7D18[10]; +extern f32 D_menu_801B7D40[]; +extern f32 D_menu_801B7DE0[]; +extern f32 D_menu_801B7E80[]; +extern f32 D_menu_801B7F20[]; +extern f32 D_menu_801B7FC0[]; +extern f32 D_menu_801B8060[]; +extern s32 D_menu_801B8100; +extern s32 D_menu_801B8108[]; +extern u8 D_menu_801B8248[][4]; +extern f32 D_menu_801B828C; +extern f32 D_menu_801B8290; +extern UnkStruct_D_menu_801B8294* D_menu_801B8294; +extern s32 D_menu_801B8298; +extern f32 D_menu_801B829C; +extern f32 D_menu_801B82A0; +extern f32 D_menu_801B82A4; +extern s32 D_menu_801B82A8; +extern s32 D_menu_801B82AC; +extern s32 D_menu_801B82B0; +extern s32 D_menu_801B82B4; +extern s32 D_menu_801B82B8; +extern s32 D_menu_801B82BC; +extern s32 D_menu_801B82C0; +extern s32 D_menu_801B82C4; +extern f32 D_menu_801B82C8; +extern f32 D_menu_801B82CC; +extern f32 D_menu_801B82D0; +extern f32 D_menu_801B82D4; +extern f32 D_menu_801B82D8; +extern f32 D_menu_801B82DC; +extern f32 D_menu_801B82E0; +extern f32 D_menu_801B82E4; +extern f32 D_menu_801B82E8; +extern f32 D_menu_801B82EC; +extern f32 D_menu_801B82F0; +extern f32 D_menu_801B82F4; +extern s32 D_menu_801B82F8; +extern s32 D_menu_801B82FC; +extern s32 D_menu_801B8300; +extern f32 D_menu_801B8304; +extern f32 D_menu_801B8308; +extern f32 D_menu_801B830C; +extern s32 D_menu_801B8310; +extern s32 D_menu_801B8314; +extern s32 D_menu_801B8318; +extern s32 D_menu_801B831C; +extern s32 D_menu_801B8320; +extern s32 D_menu_801B8324; +extern f32 D_menu_801B8328; +extern f32 D_menu_801B832C; +extern f32 D_menu_801B8330; +extern s32 D_menu_801B8334; +extern bool D_menu_801B8338; +extern f32 D_menu_801B833C; +extern s32 D_menu_801B8340; +extern s32 D_menu_801B8344; +extern s32 D_menu_801B8348; +extern UnkStruct_D_801B8350 D_menu_801B8350[]; +extern f32 D_menu_801B84D0; +extern f32 D_menu_801B84D4; +extern Vec3f D_menu_801B84D8; +extern UnkStruct_D_menu_801B84E8 D_menu_801B84E8[4]; +extern UnkStruct_D_menu_801B8658 D_menu_801B8658; +extern Vec3f D_menu_801B867C; +extern UnkStruct_D_menu_801B8688 D_menu_801B8688; +extern s32 D_menu_801B8694; +extern s32 D_menu_801B869C; +extern s32 D_menu_801B86A0; +extern s32 D_menu_801B86A4; +extern f32 D_menu_801B86A8; +extern f32 D_menu_801B86AC; +extern f32 D_menu_801B86B0; +extern f32 D_menu_801B86B4; +extern f32 D_menu_801B86B8; +extern f32 D_menu_801B86BC; +extern f32 D_menu_801B86C0; +extern f32 D_menu_801B86C4; +extern f32 D_menu_801B86C8; +extern f32 D_menu_801B86CC; +extern f32 D_menu_801B86D0; +extern f32 D_menu_801B86D4; +extern f32 D_menu_801B86D8; +extern f32 D_menu_801B86DC; +extern Vec3f D_menu_801B86E0[4][50]; +extern s32 D_menu_801B9040; +extern f32 D_menu_801B9044; +extern f32 D_menu_801B9048; +extern f32 D_menu_801B904C; +extern f32 D_menu_801B9050; +extern f32 D_menu_801B9054; +extern f32 D_menu_801B9058; +extern f32 D_menu_801B905C; +extern f32 D_menu_801B9060; +extern f32 D_menu_801B9064; +extern f32 D_menu_801B9068; +extern f32 D_menu_801B906C; +extern f32 D_menu_801B9070; +extern f32 D_menu_801B9074; +extern f32 D_menu_801B9078; +extern f32 D_menu_801B907C; +extern f32 D_menu_801B9080; +extern f32 D_menu_801B9084; extern s32 D_EBFEB0_801ADA94; -void func_EBFBE0_8018CC30(UnkStruct_D_EBFBE0_801B8294*, s32, f32); -void func_EBFBE0_8018CD9C(Vec3f *pos, UnkStruct_D_EBFBE0_801B8294 *arg1, f32 arg2, s32 arg3); -void func_EBFBE0_8018D510(s32); -void func_EBFBE0_8018D80C(s32); -void func_EBFBE0_8018DDB8(s32); -void func_EBFBE0_8018DF0C(f32 arg0); -void func_EBFBE0_8018E058(void); -void func_EBFBE0_8018E200(void); -s32 func_EBFBE0_8018EDC8(s32, Gfx **, Vec3f *, Vec3f *, void *); -void func_EBFBE0_8018E67C(s32); -void func_EBFBE0_8018F438(void); -void func_EBFBE0_80190144(void); -void func_EBFBE0_801903B8(void); -void func_EBFBE0_80190950(void); -void func_EBFBE0_80190A98(void); -void func_EBFBE0_80190B30(s32 arg0); -void func_EBFBE0_80190EA4(void); -void func_EBFBE0_80190FD0(void); -void func_EBFBE0_801912A0(void); -void func_EBFBE0_80191320(s32 arg0, f32* arg1, f32* arg2, f32* arg3, f32* arg4, f32* arg5, f32* arg6, f32 arg7, +void func_menu_8018CC30(UnkStruct_D_menu_801B8294*, s32, f32); +void func_menu_8018CD9C(Vec3f *pos, UnkStruct_D_menu_801B8294 *arg1, f32 arg2, s32 arg3); +void func_menu_8018D510(s32); +void func_menu_8018D80C(s32); +void func_menu_8018DDB8(s32); +void func_menu_8018DF0C(f32 arg0); +void func_menu_8018E058(void); +void func_menu_8018E200(void); +s32 func_menu_8018EDC8(s32, Gfx **, Vec3f *, Vec3f *, void *); +void func_menu_8018E67C(s32); +void func_menu_8018F438(void); +void func_menu_80190144(void); +void func_menu_801903B8(void); +void func_menu_80190950(void); +void func_menu_80190A98(void); +void func_menu_80190B30(s32 arg0); +void func_menu_80190EA4(void); +void func_menu_80190FD0(void); +void func_menu_801912A0(void); +void func_menu_80191320(s32 arg0, f32* arg1, f32* arg2, f32* arg3, f32* arg4, f32* arg5, f32* arg6, f32 arg7, f32 arg8, f32 arg9); -void func_EBFBE0_801914AC(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f32* arg5, f32 arg6, f32* arg7, f32* arg8, +void func_menu_801914AC(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f32* arg5, f32 arg6, f32* arg7, f32* arg8, f32* arg9, f32 argA, f32 argB, f32 argC); -void func_EBFBE0_80191798(f32* arg0, f32* arg1); -void func_EBFBE0_80191844(f32 arg0, f32 arg1); -void func_EBFBE0_801918FC(void); -void func_EBFBE0_801919C4(u16** arg0, s32 arg1); +void func_menu_80191798(f32* arg0, f32* arg1); +void func_menu_80191844(f32 arg0, f32 arg1); +void func_menu_801918FC(void); +void func_menu_801919C4(u16** arg0, s32 arg1); #endif diff --git a/src/overlays/ovl_unused/EFFA40.c b/src/overlays/ovl_unused/EFFA40.c new file mode 100644 index 00000000..7520cc0b --- /dev/null +++ b/src/overlays/ovl_unused/EFFA40.c @@ -0,0 +1,3 @@ +#include "common.h" + +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_unused/EFFA40/func_EFFA40_80187520.s") diff --git a/yamls/us/overlays.yaml b/yamls/us/overlays.yaml index b0d3038f..3652c1fa 100644 --- a/yamls/us/overlays.yaml +++ b/yamls/us/overlays.yaml @@ -1,18 +1,18 @@ - - name: ovl_DF4260 + - name: ovl_i1 type: code - dir: overlays/ovl_DF4260 + dir: overlays/ovl_i1 start: 0xDF4260 vram: 0x80187520 bss_size: 0xA10 exclusive_ram_id: overlay - symbol_name_format: DF4260_$VRAM + symbol_name_format: i1_$VRAM subsegments: - - [0xDF4260, c, DF4260] + - [0xDF4260, c, fox_i1] - [0xDF4270, c, fox_co] - [0xDFEE30, c, DFEE30] - [0xE05620, c, E05620] - [0xE05990, c, E05990] - - [0xE06510, .data, DF4260] + - [0xE06510, .data, fox_i1] - [0xE06520, .data, fox_co] - [0xE06880, data, DFEE30] - [0xE07B90, data, E05990] @@ -20,26 +20,29 @@ - [0xE07FF0, .rodata, DFEE30] - [0xE08380, .rodata, E05620] - [0xE083C0, .rodata, E05990] - - { start: 0xE08400, type: .bss, vram: 0x8019B6C0, name: DF4260 } - - { start: 0xE08410, type: .bss, vram: 0x8019B6D0, name: fox_co } - - { start: 0xE08530, type: bss, vram: 0x8019B7F0, name: DFEE30 } + - { start: 0xE08400, type: .bss, vram: 0x8019B6C0, name: fox_i1 } + - { type: .bss, vram: 0x8019B6D0, name: fox_co } + - { type: bss, vram: 0x8019B7F0, name: DFEE30 } - - name: ovl_E08400 + - name: ovl_i2 type: code - dir: overlays/ovl_E08400 + dir: overlays/ovl_i2 start: 0xE08400 vram: 0x80187520 bss_size: 0x40 exclusive_ram_id: overlay - symbol_name_format: E08400_$VRAM + symbol_name_format: i2_$VRAM subsegments: - - [0xE08400, c, E08400] - - [0xE0FF10, c, E0FF10] - - [0xE16300, data, E08400] - - [0xE16520, data, E0FF10] - - [0xE16670, .rodata, E08400] - - [0xE16930, .rodata, E0FF10] - - { start: 0xE16C50, type: bss, vram: 0x80195D70, name: ovl_E08400 } + - [0xE08400, c, fox_i2] + - [0xE08410, c, fox_me] + - [0xE0FF10, c, fox_sx] + - [0xE16300, .data, fox_i2] + - [0xE16310, data, fox_me] + - [0xE16520, data, fox_sx] + - [0xE16670, .rodata, fox_me] + - [0xE16930, .rodata, fox_sx] + - { start: 0xE16C50, type: .bss, vram: 0x80195D70, name: fox_i2 } + - { type: .bss, vram: 0x80195D80, name: fox_sx } - name: ovl_i3 type: code @@ -65,80 +68,95 @@ - [0xE50C00, .rodata, sf_so] - [0xE51160, .rodata, sf_aq] - { start: 0xE51970, type: .bss, vram: 0x801C2240, name: fox_i3 } - - { start: 0xE51970, type: .bss, vram: 0x801C2250, name: fox_a6 } - - { start: 0xE51970, type: .bss, vram: 0x801C2330, name: fox_zo } - - { start: 0xE51970, type: .bss, vram: 0x801C2740, name: sf_so } - - { start: 0xE51970, type: .bss, vram: 0x801C27C0, name: sf_aq } + - { type: .bss, vram: 0x801C2250, name: fox_a6 } + - { type: .bss, vram: 0x801C2330, name: fox_zo } + - { type: .bss, vram: 0x801C2740, name: sf_so } + - { type: .bss, vram: 0x801C27C0, name: sf_aq } - - name: ovl_E51970 + - name: ovl_i4 type: code - dir: overlays/ovl_E51970 + dir: overlays/ovl_i4 start: 0xE51970 vram: 0x80187520 bss_size: 0x1B0 exclusive_ram_id: overlay - symbol_name_format: E51970_$VRAM + symbol_name_format: i4_$VRAM subsegments: - - [0xE51970, c, E51970] - - [0xE51A40, c, E51A40] - - [0xE561B0, c, E561B0] - - [0xE5CC30, c, E5CC30] - - [0xE63D50, c, E63D50] - - [0xE69220, data, E51A40] - - [0xE69310, data, E561B0] - - [0xE69540, data, E5CC30] - - [0xE69910, data, E63D50] - - [0xE69B30, .rodata, E51970] - - [0xE69B70, .rodata, E51A40] - - [0xE69D70, .rodata, E561B0] - - [0xE6A170, .rodata, E5CC30] - - [0xE6A510, .rodata, E63D50] - - { start: 0xE6A810, type: bss, vram: 0x801A03C0, name: ovl_E51970 } + - [0xE51970, c, fox_i4] + - [0xE51A40, c, fox_fo] + - [0xE561B0, c, fox_bo] + - [0xE5CC30, c, fox_ka] + - [0xE63D50, c, fox_sz] + - [0xE69220, .data, fox_i4] + - [0xE69230, data, fox_fo] + - [0xE69310, data, fox_bo] + - [0xE69540, data, fox_ka] + - [0xE69910, data, fox_sz] + - [0xE69B30, .rodata, fox_i4] + - [0xE69B70, .rodata, fox_fo] + - [0xE69D70, .rodata, fox_bo] + - [0xE6A170, .rodata, fox_ka] + - [0xE6A510, .rodata, fox_sz] + - { start: 0xE6A810, type: .bss, vram: 0x801A03C0, name: fox_i4 } + - { type: bss, vram: 0x801A03D0, name: fox_bo } + - { type: bss, vram: 0x801A0540, name: fox_ka } + - { type: bss, vram: 0x801A0560, name: fox_sz } - - name: ovl_E6A810 + - name: ovl_i5 type: code - dir: overlays/ovl_E6A810 + dir: overlays/ovl_i5 start: 0xE6A810 vram: 0x80187520 bss_size: 0xAF80 exclusive_ram_id: overlay - symbol_name_format: E6A810_$VRAM + symbol_name_format: i5_$VRAM subsegments: - - [0xE6A810, c, E6A810] - - [0xE6C220, c, E6C220] - - [0xE7CC10, c, E7CC10] + - [0xE6A810, c, fox_i5] + - [0xE6A820, c, fox_ti_cs] + - [0xE6C220, c, fox_ti] + - [0xE7CC10, c, fox_ma] - [0xE97CC0, c, E97CC0] - - [0xE9A580, data, E6A810] - - [0xE9A650, data, E6C220] + - [0xE9A580, .data, fox_i5] + - [0xE9A590, data, fox_ti_cs] + - [0xE9A650, data, fox_ti] - [0xE9DC00, data, E97CC0] - - [0xE9DCD0, .rodata, E6A810] - - [0xE9DD40, .rodata, E6C220] - - [0xE9E5A0, .rodata, E7CC10] + - [0xE9DCD0, .rodata, fox_i5] + - [0xE9DCE0, .rodata, fox_ti_cs] + - [0xE9DD40, .rodata, fox_ti] + - [0xE9E5A0, .rodata, fox_ma] - [0xE9F0E0, .rodata, E97CC0] - - { start: 0xE9F1D0, type: bss, vram: 0x801BBEE0, name: ovl_E6A810 } + - { start: 0xE9F1D0, type: .bss, vram: 0x801BBEE0, name: fox_i5 } + - { type: bss, vram: 0x801BBEF0, name: fox_ti } + - { type: bss, vram: 0x801BE240, name: fox_ma } + - { type: bss, vram: 0x801BE740, name: E97CC0 } - - name: ovl_E9F1D0 + - name: ovl_i6 type: code - dir: overlays/ovl_E9F1D0 + dir: overlays/ovl_i6 start: 0xE9F1D0 vram: 0x80187520 bss_size: 0x520 exclusive_ram_id: overlay symbol_name_format: E9F1D0_$VRAM subsegments: - - [0xE9F1D0, c, E9F1D0] + - [0xE9F1D0, c, fox_i6] + - [0xE9F1E0, c, E9F1E0] - [0xEADEC0, c, EADECO] - - [0xEAF7E0, c, EAF7E0] + - [0xEAF7E0, c, fox_sy] - [0xEBD210, c, EBD210] - - [0xEBE400, data, E9F1D0] + - [0xEBE400, .data, fox_i6] + - [0xEBE410, data, E9F1E0] - [0xEBE560, data, EADCE0] - - [0xEBE5C0, data, EAF7E0] + - [0xEBE5C0, data, fox_sy] - [0xEBE830, data, EBD210] - - [0xEBE840, .rodata, E9F1D0] + - [0xEBE840, .rodata, fox_i6] + - [0xEBE850, .rodata, E9F1E0] - [0xEBF0F0, .rodata, EADECO] - - [0xEBF130, .rodata, EAF7E0] + - [0xEBF130, .rodata, fox_sy] - [0xEBFB80, .rodata, EBD210] - - { start: 0xEBFBE0, type: bss, vram: 0x801A7F30, name: ovl_E9F1D0 } + - { start: 0xEBFBE0, type: .bss, vram: 0x801A7F30, name: fox_i6 } + - { type: bss, vram: 0x801A7F40, name: E9F1E0 } + - { type: bss, vram: 0x801A8440, name: fox_sy } - name: ovl_menu type: code @@ -147,27 +165,27 @@ vram: 0x80187520 bss_size: 0x17590 exclusive_ram_id: overlay - symbol_name_format: EBFBE0_$VRAM + symbol_name_format: menu_$VRAM subsegments: - - [0xEBFBE0, c, EBFBE0] + - [0xEBFBE0, c, fox_i_menu] - [0xEBFCA0, c, fox_title] - [0xECA1E0, c, fox_option] - [0xED6EC0, c, fox_map] - [0xEE60B0, .data, fox_title] - [0xEE6C30, .data, fox_option] - [0xEE7AE0, .data, fox_map] - - [0xEEF410, .rodata, EBFBE0] + - [0xEEF410, .rodata, fox_i_menu] - [0xEEF430, .rodata, fox_title] - [0xEEF7D0, .rodata, fox_option] - [0xEEFB80, .rodata, fox_map] - # - { start: 0xEF0260, type: bss, vram: 0x801B7BA0, name: ovl_menu } - - { start: 0xEF0260, type: bss, vram: 0x801B7BA0, name: fox_title } - - { start: 0xEF0260, type: bss, vram: 0x801B9090, name: fox_option } - - { start: 0xEF0260, type: bss, vram: 0x801B9410, name: fox_map } + - { start: 0xEF0260, type: bss, vram: 0x801B7BA0, name: fox_i_menu } + - { type: bss, vram: 0x801B7BB0, name: fox_title } + - { type: bss, vram: 0x801B9090, name: fox_option } + - { type: bss, vram: 0x801B9410, name: fox_map } - - name: ovl_EF0260 + - name: ovl_ending type: code - dir: overlays/ovl_EF0260 + dir: overlays/ovl_ending start: 0xEF0260 vram: 0x80187520 bss_size: 0x2710 @@ -180,11 +198,11 @@ - [0xEFBBB0, data, EF5B60] - [0xEFEF80, .rodata, EF0260] - [0xEFF380, .rodata, EF5B60] - - { start: 0xEFFA40, type: bss, vram: 0x80196D00, name: ovl_EF0260 } + - { start: 0xEFFA40, type: bss, vram: 0x80196D00, name: ovl_ending } - - name: ovl_EFFA40 + - name: ovl_unused type: code - dir: overlays/ovl_EFFA40 + dir: overlays/ovl_unused start: 0xEFFA40 vram: 0x80187520 bss_size: 0x10 @@ -193,6 +211,6 @@ subsegments: - [0xEFFA40, c, EFFA40] - [0xEFFA50, data, EFFA40] - - { start: 0xEFFAE0, type: bss, vram: 0x801875C0, name: ovl_EFFA40 } + - { start: 0xEFFAE0, type: bss, vram: 0x801875C0, name: ovl_unused } - [0xEFFAE0] \ No newline at end of file