diff --git a/.vscode/settings.json b/.vscode/settings.json index dbe4abb6..e0eac220 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -131,7 +131,10 @@ "ast_versus.h": "c", "ast_macbeth.h": "c", "ast_7_ti_1.h": "c", - "ast_meteo.h": "c" + "ast_meteo.h": "c", + "ast_font_3d.h": "c", + "ast_vs_menu.h": "c", + "sf64mesg.h": "c" }, "C_Cpp_Runner.msvcBatchPath": "" } \ No newline at end of file diff --git a/assets/yaml/us/ast_common.yaml b/assets/yaml/us/ast_common.yaml index 32478a07..e3ab6d29 100644 --- a/assets/yaml/us/ast_common.yaml +++ b/assets/yaml/us/ast_common.yaml @@ -508,10 +508,7 @@ D_10182C0: { type: GFX, offset: 0x10182C0, symbol: D_10182C0 } D_10190C0: - { type: TEXTURE, format: IA8, width: 16, height: 32, ctype: u8, offset: 0x10190C0, symbol: D_10190C0 } - -D_10192C0: - { type: TEXTURE, format: RGBA16, width: 16, height: 16, ctype: u16, offset: 0x10192C0, symbol: D_10192C0 } + { type: TEXTURE, format: RGBA16, width: 16, height: 32, ctype: u16, offset: 0x10190C0, symbol: D_10190C0 } D_10194C0: { type: GFX, offset: 0x10194C0, symbol: D_10194C0 } diff --git a/include/context.h b/include/context.h index 66822575..c1de8618 100644 --- a/include/context.h +++ b/include/context.h @@ -8,198 +8,198 @@ extern s32 gOverlaySetup; extern s32 gOverlayStage; -extern s32 D_80177824; // some sort of flag -extern s32 D_8017782C; // some sort of flag. all range related? +extern s32 D_ctx_80177824; // some sort of flag +extern s32 D_ctx_8017782C; // some sort of flag. all range related? extern GameState gGameState; extern s32 D_Timer_8017783C; // next game state timer? -extern s32 D_80177844; // timer for vs item spawn +extern s32 D_ctx_80177844; // timer for vs item spawn extern OptionState gOptionMenuStatus; -extern s32 D_80177854; // pause-related state -extern s32 D_80177868; // some sort of state. pause-related? +extern s32 D_ctx_80177854; // pause-related state +extern s32 D_ctx_80177868; // some sort of state. pause-related? extern LevelMode gLevelMode; extern DrawMode gDrawMode; extern s32 gPlayerNum; extern s32 gCamCount; extern s32 gTeamShields[6]; extern s32 gSavedTeamShields[6]; -extern UNK_TYPE D_801778F0[6]; +extern UNK_TYPE D_ctx_801778F0[6]; extern s32 gTeamDamage[6]; -extern u8 D_80177930; // next planet path +extern u8 D_ctx_80177930; // next planet path extern f32 gGroundLevel; -extern f32 D_80177950; -extern f32 D_80177968; -extern f32 D_80177970; +extern f32 D_ctx_80177950; +extern f32 D_ctx_80177968; +extern f32 D_ctx_80177970; extern f32 gCsCamEyeX; extern f32 gCsCamEyeY; extern f32 gCsCamEyeZ; extern f32 gCsCamAtX; extern f32 gCsCamAtY; extern f32 gCsCamAtZ; -extern Vec3f D_801779D8; -extern Vec3f D_801779E8; +extern Vec3f D_ctx_801779D8; +extern Vec3f D_ctx_801779E8; extern bool gExpertMode; -extern s32 D_80177A10[10]; -extern f32 D_80177A48[10]; +extern s32 D_ctx_80177A10[10]; +extern f32 D_ctx_80177A48[10]; extern s32 gCsFrameCount; -extern u8 D_80177A98; -extern u8 D_80177AB0; -extern u8 D_80177AC8; -extern s32 D_80177AE0; +extern u8 D_ctx_80177A98; +extern u8 D_ctx_80177AB0; +extern u8 D_ctx_80177AC8; +extern s32 D_ctx_80177AE0; extern s32 gMainController; -extern s32 D_80177B40; -extern PlanetId gCurrentPlanet; // D_80177B48 // Arrow pointer? -extern s32 D_80177B50[7]; -extern s32 D_80177B70[7]; -extern PlanetId D_80177B90[7]; -extern s32 D_80177BB0[7]; -extern s32 D_80177BD8[22]; // overruns D_80177C30? -extern s32 D_80177C38[6]; -extern s32 D_80177C58[6]; +extern s32 D_ctx_80177B40; +extern PlanetId gCurrentPlanet; // D_ctx_80177B48 // Arrow pointer? +extern s32 D_ctx_80177B50[7]; +extern s32 D_ctx_80177B70[7]; +extern PlanetId D_ctx_80177B90[7]; +extern s32 D_ctx_80177BB0[7]; +extern s32 D_ctx_80177BD8[22]; // overruns D_ctx_80177C30? +extern s32 D_ctx_80177C38[6]; +extern s32 D_ctx_80177C58[6]; extern u8 gSoundMode; extern s32 gVolumeSettings[3]; -extern u16 D_80177C90; +extern u16 D_ctx_80177C90; extern u8 gLevelType; -extern s32 D_80177CA0; +extern s32 D_ctx_80177CA0; extern UNK_TYPE F_80177CA8; -extern f32 D_80177CB0; +extern f32 D_ctx_80177CB0; extern UNK_TYPE F_80177CB8; -extern f32 D_80177CC0; -extern f32 D_80177CC8; -extern f32 D_80177CE8; -extern f32 D_80177D08; -extern f32 D_80177D20; -extern f32 D_80177D38; -extern f32 D_80177D50; -extern f32 D_80177D68; +extern f32 D_ctx_80177CC0; +extern f32 D_ctx_80177CC8; +extern f32 D_ctx_80177CE8; +extern f32 D_ctx_80177D08; +extern f32 D_ctx_80177D20; +extern f32 D_ctx_80177D38; +extern f32 D_ctx_80177D50; +extern f32 D_ctx_80177D68; extern UNK_TYPE F_80177D80; extern UNK_TYPE F_80177DE8; extern s32 gGameFrameCount; -extern s32 D_80177DC8; -extern s32 D_80177E70; -extern s32 D_80177E78; -extern s32 D_80177E80; -extern Vec3f D_80177E88; -extern Vec3f D_80177F10; +extern s32 D_ctx_80177DC8; +extern s32 D_ctx_80177E70; +extern s32 D_ctx_80177E78; +extern s32 D_ctx_80177E80; +extern Vec3f D_ctx_80177E88; +extern Vec3f D_ctx_80177F10; extern UNK_TYPE F_80178020; -extern s32 D_8017812C; +extern s32 D_ctx_8017812C; extern LevelId gCurrentLevel; -extern s32 D_8017827C; +extern s32 D_ctx_8017827C; extern s32 gBossActive; -extern s32 D_8017828C; -extern s32 D_80178294; +extern s32 D_ctx_8017828C; +extern s32 D_ctx_80178294; extern s32 gRadioState; -extern s32 D_801782A4; +extern s32 D_ctx_801782A4; extern s32 D_Timer_801782AC; extern s32 D_Timer_801782B4; -// extern s32 D_801782B8; -extern s32 D_801782C0; -extern s32 D_801782C8; -extern s32 D_801782D0; -extern s32 D_801782D8; +// extern s32 D_ctx_801782B8; +extern s32 D_ctx_801782C0; +extern s32 D_ctx_801782C8; +extern s32 D_ctx_801782D0; +extern s32 D_ctx_801782D8; extern UNK_TYPE F_801782E0; -extern s32 D_801782E8; +extern s32 D_ctx_801782E8; extern UNK_TYPE F_801782F0; -extern s32 D_801782F8; -extern s32 D_80178300; -extern u16* D_80178308; -extern ObjectInit* D_80178310; +extern s32 D_ctx_801782F8; +extern s32 D_ctx_80178300; +extern u16* D_ctx_80178308; +extern ObjectInit* D_ctx_80178310; extern s32 gFogRed; extern s32 gFogGreen; extern s32 gFogBlue; extern s32 gFogAlpha; -extern s32 D_80178340; // alpha something -extern s32 D_80178348; // red something -extern s32 D_80178350; // green something -extern s32 D_80178354; // blue something -extern s32 D_80178358; // alpha target -extern s32 D_8017835C; // alpha step -extern s32 D_80178360; // 2 lights second color -extern s32 D_80178364; -extern s32 D_80178368; -extern f32 D_8017836C; // 2 lights second color brightness -extern f32 D_80178370; // Vec3f? -extern f32 D_80178374; -extern f32 D_80178378; -extern s32 D_8017837C; -extern u32 D_80178380[4]; // player alphas -extern s32 D_80178390[4]; // player reds -extern s32 D_801783A0[4]; // player greens -extern s32 D_801783B0[4]; // player alphas -extern UNK_TYPE D_801783C0[4]; -extern f32 D_801783D0; // something x translate -extern f32 D_801783D4; // something y translate +extern s32 D_ctx_80178340; // alpha something +extern s32 D_ctx_80178348; // red something +extern s32 D_ctx_80178350; // green something +extern s32 D_ctx_80178354; // blue something +extern s32 D_ctx_80178358; // alpha target +extern s32 D_ctx_8017835C; // alpha step +extern s32 D_ctx_80178360; // 2 lights second color +extern s32 D_ctx_80178364; +extern s32 D_ctx_80178368; +extern f32 D_ctx_8017836C; // 2 lights second color brightness +extern f32 D_ctx_80178370; // Vec3f? +extern f32 D_ctx_80178374; +extern f32 D_ctx_80178378; +extern s32 D_ctx_8017837C; +extern u32 D_ctx_80178380[4]; // player alphas +extern s32 D_ctx_80178390[4]; // player reds +extern s32 D_ctx_801783A0[4]; // player greens +extern s32 D_ctx_801783B0[4]; // player alphas +extern UNK_TYPE D_ctx_801783C0[4]; +extern f32 D_ctx_801783D0; // something x translate +extern f32 D_ctx_801783D4; // something y translate extern s32 gFogNear; //near extern s32 gFogFar; //far extern UNK_TYPE F_801783E0[12]; -extern s32 D_80178410; -extern f32 D_80178414; -extern f32 D_80178418; +extern s32 D_ctx_80178410; +extern f32 D_ctx_80178414; +extern f32 D_ctx_80178418; extern UNK_TYPE F_8017841C; -extern f32 D_80178420; -extern f32 D_80178424; -extern f32 D_80178428; -extern f32 D_8017842C; -extern f32 D_80178430; +extern f32 D_ctx_80178420; +extern f32 D_ctx_80178424; +extern f32 D_ctx_80178428; +extern f32 D_ctx_8017842C; +extern f32 D_ctx_80178430; extern UNK_TYPE F_80178434; extern UNK_TYPE F_80178438; extern UNK_TYPE F_8017843C; -extern f32 D_80178440; -extern f32 D_80178444; -extern f32 D_80178448; -extern f32 D_80178450[3]; -extern f32 D_80178460[3]; -extern f32 D_80178470[3]; -extern f32 D_8017847C; -extern s32 D_80178480; -extern s32 D_80178484; -extern bool D_80178488; +extern f32 D_ctx_80178440; +extern f32 D_ctx_80178444; +extern f32 D_ctx_80178448; +extern f32 D_ctx_80178450[3]; +extern f32 D_ctx_80178460[3]; +extern f32 D_ctx_80178470[3]; +extern f32 D_ctx_8017847C; +extern s32 D_ctx_80178480; +extern s32 D_ctx_80178484; +extern bool D_ctx_80178488; extern UNK_TYPE F_8017848C; extern UNK_TYPE F_80178490; -extern s32 D_80178494; -extern f32 D_80178498; -extern f32 D_8017849C; -extern f32 D_801784A0; -extern s32 D_801784A4; +extern s32 D_ctx_80178494; +extern f32 D_ctx_80178498; +extern f32 D_ctx_8017849C; +extern f32 D_ctx_801784A0; +extern s32 D_ctx_801784A4; extern UNK_TYPE F_801784A8; -extern s32 D_801784AC; +extern s32 D_ctx_801784AC; extern UNK_TYPE F_801784B0; extern UNK_TYPE F_801784B4; -extern f32 D_801784B8; // effective Vec3f -extern f32 D_801784BC; -extern f32 D_801784C0; -extern f32 D_801784C4; // effective Vec3f -extern f32 D_801784C8; -extern f32 D_801784CC; -extern f32 D_801784D0; // effective Vec3f -extern f32 D_801784D4; -extern f32 D_801784D8; +extern f32 D_ctx_801784B8; // effective Vec3f +extern f32 D_ctx_801784BC; +extern f32 D_ctx_801784C0; +extern f32 D_ctx_801784C4; // effective Vec3f +extern f32 D_ctx_801784C8; +extern f32 D_ctx_801784CC; +extern f32 D_ctx_801784D0; // effective Vec3f +extern f32 D_ctx_801784D4; +extern f32 D_ctx_801784D8; extern s32 gLight1x; // Vec3i light direction extern s32 gLight1y; extern s32 gLight1z; -extern f32 D_801784E8; -extern f32 D_801784EC; // effective Vec3f? -extern f32 D_801784F0; -extern f32 D_801784F4; -extern f32 D_801784F8; // effective Vec3f -extern f32 D_801784FC; -extern f32 D_80178500; +extern f32 D_ctx_801784E8; +extern f32 D_ctx_801784EC; // effective Vec3f? +extern f32 D_ctx_801784F0; +extern f32 D_ctx_801784F4; +extern f32 D_ctx_801784F8; // effective Vec3f +extern f32 D_ctx_801784FC; +extern f32 D_ctx_80178500; extern s32 gLight2x; // Vec3i light direction alternate extern s32 gLight2y; extern s32 gLight2z; -extern f32 D_80178510; +extern f32 D_ctx_80178510; extern UNK_TYPE F_801784514; extern UNK_TYPE F_801784518; extern UNK_TYPE F_80178451C; -extern f32 D_80178520; // effective Vec3f -extern f32 D_80178524; -extern f32 D_80178528; +extern f32 D_ctx_80178520; // effective Vec3f +extern f32 D_ctx_80178524; +extern f32 D_ctx_80178528; extern UNK_TYPE F_80178452C; extern UNK_TYPE F_801784530; extern UNK_TYPE F_801784534; -extern f32 D_80178538; -extern f32 D_8017853C; -extern s32 D_80178540; -extern s32 D_80178544; +extern f32 D_ctx_80178538; +extern f32 D_ctx_8017853C; +extern s32 D_ctx_80178540; +extern s32 D_ctx_80178544; extern s32 gLight1R; // Color32 light color 1 extern s32 gLight1G; extern s32 gLight1B; @@ -210,9 +210,9 @@ extern UNK_TYPE F_801784560; extern s32 gLight2R; // Color32 light color 2 extern s32 gLight2G; extern s32 gLight2B; -extern s32 D_80178570; // Color32 light color 2 modifier? -extern s32 D_80178574; -extern s32 D_80178578; +extern s32 D_ctx_80178570; // Color32 light color 2 modifier? +extern s32 D_ctx_80178574; +extern s32 D_ctx_80178578; extern s32 D_80161A70; // Color32? extern s32 D_80161A74; extern s32 D_80161A78; @@ -239,105 +239,105 @@ extern PlayerShot gPlayerShots[16]; extern TexturedLine gTexturedLines[100]; extern RadarMark gRadarMarks[65]; extern BonusText gBonusText[10]; -extern s32 D_80176550[2]; -extern f32 D_80176558[2][100]; -extern f32 D_80176878[2][100]; -extern f32 D_80176B98[2][100]; -extern f32 D_80176EB8[2][100]; -extern f32 D_801771D8[2][100]; -extern f32 D_80177500[2][100]; -extern u16 D_80177828; // enemy shot speed? -extern u8 D_80177830; // show level complete status overlay -extern s32 D_80177838; // level clear related -extern s32 D_80177840; // timer for mission accomplished scrren +extern s32 D_ctx_80176550[2]; +extern f32 D_ctx_80176558[2][100]; +extern f32 D_ctx_80176878[2][100]; +extern f32 D_ctx_80176B98[2][100]; +extern f32 D_ctx_80176EB8[2][100]; +extern f32 D_ctx_801771D8[2][100]; +extern f32 D_ctx_80177500[2][100]; +extern u16 D_ctx_80177828; // enemy shot speed? +extern u8 D_ctx_80177830; // show level complete status overlay +extern s32 D_ctx_80177838; // level clear related +extern s32 D_ctx_80177840; // timer for mission accomplished scrren extern s32 gBossHealthBar; -extern s32 D_80177850; // bonus text related. set to 15 but never read -extern s32 D_80177858[4]; -extern s32 D_80177870[4]; +extern s32 D_ctx_80177850; // bonus text related. set to 15 but never read +extern s32 D_ctx_80177858[4]; +extern s32 D_ctx_80177870[4]; extern s32 gHandicap[4]; extern VsStage gVersusStage; -extern s32 D_801778A4; -extern s32 D_801778AC; -extern s32 D_801778C8; +extern s32 D_ctx_801778A4; +extern s32 D_ctx_801778AC; +extern s32 D_ctx_801778C8; extern bool gVersusMode; extern u16 gBoostButton[4]; extern u16 gBrakeButton[4]; extern u16 gShootButton[4]; extern u16 gBombButton[4]; -extern f32 D_80177958[4]; -extern s32 D_8017796C; +extern f32 D_ctx_80177958[4]; +extern s32 D_ctx_8017796C; extern OSContPad* gInputHold; extern OSContPad* gInputPress; -extern u8* D_80177984; -extern s32 D_80177990[4]; -extern f32 D_801779A8[4]; -extern u8 D_801779BC; +extern u8* D_ctx_80177984; +extern s32 D_ctx_80177990[4]; +extern f32 D_ctx_801779A8[4]; +extern u8 D_ctx_801779BC; extern s32 gChargeTimers[4]; -extern f32 D_801779E4; -extern f32 D_801779F4; +extern f32 D_ctx_801779E4; +extern f32 D_ctx_801779F4; extern s32 D_Timer_80177A00[4]; extern s32 D_Timer_80177A38[4]; extern s32 D_Timer_80177A70[4]; extern s32 D_Timer_80177A88[4]; -extern f32 D_80177AA0[4]; -extern f32 D_80177AB8[4]; -extern s32 D_80177AD0[4]; -extern s32 D_80177AE8[4]; -extern s32 D_80177B00[4][4]; +extern f32 D_ctx_80177AA0[4]; +extern f32 D_ctx_80177AB8[4]; +extern s32 D_ctx_80177AD0[4]; +extern s32 D_ctx_80177AE8[4]; +extern s32 D_ctx_80177B00[4][4]; extern u8 D_Timer_80177B44; -extern u8 D_80177B4C; -extern u8 D_80177B6C; +extern u8 D_ctx_80177B4C; +extern u8 D_ctx_80177B6C; extern u8 gGreatFoxIntact; -extern u8 D_80177BAC; +extern u8 D_ctx_80177BAC; extern u16 D_Timer_80177BD0[4]; -extern u16 D_80177C30[4]; -extern s32 D_80177C50; -extern s32 D_80177C70; -extern s32 D_80177C78; -extern s32 D_80177C8C; -extern s32 D_80177C94; -extern s32 D_80177C9C; -extern s32 D_80177CA4; -extern s32 D_80177CAC; -extern s32 D_80177CB4; -extern s32 D_80177CBC; -extern s32 D_80177CC4; -extern s32 D_80177CD0[6]; -extern s32 D_80177CF0[6]; +extern u16 D_ctx_80177C30[4]; +extern s32 D_ctx_80177C50; +extern s32 D_ctx_80177C70; +extern s32 D_ctx_80177C78; +extern s32 D_ctx_80177C8C; +extern s32 D_ctx_80177C94; +extern s32 D_ctx_80177C9C; +extern s32 D_ctx_80177CA4; +extern s32 D_ctx_80177CAC; +extern s32 D_ctx_80177CB4; +extern s32 D_ctx_80177CBC; +extern s32 D_ctx_80177CC4; +extern s32 D_ctx_80177CD0[6]; +extern s32 D_ctx_80177CF0[6]; extern s32 gRightWingHealth[4]; extern s32 gLeftWingHealth[4]; -extern s32 D_80177D40[4]; -extern s32 D_80177D58[4]; -extern s32 D_80177D70[4]; -extern s32 D_80177D88[4]; +extern s32 D_ctx_80177D40[4]; +extern s32 D_ctx_80177D58[4]; +extern s32 D_ctx_80177D70[4]; +extern s32 D_ctx_80177D88[4]; extern s32 gBombCount[4]; -extern s32 D_80177DB8[4]; -extern s32 D_80177DD0[4][10]; -extern s32 D_80177E74; -extern s32 D_80177E7C; -extern s32 D_80177E84; -extern Vec3f D_80177E98[10]; -extern f32 D_80177F20[65]; -extern f32 D_80178028[65]; -extern f32 D_80178130[65]; -extern u8 D_80178238[65]; +extern s32 D_ctx_80177DB8[4]; +extern s32 D_ctx_80177DD0[4][10]; +extern s32 D_ctx_80177E74; +extern s32 D_ctx_80177E7C; +extern s32 D_ctx_80177E84; +extern Vec3f D_ctx_80177E98[10]; +extern f32 D_ctx_80177F20[65]; +extern f32 D_ctx_80178028[65]; +extern f32 D_ctx_80178130[65]; +extern u8 D_ctx_80178238[65]; extern Player* gPlayer; -extern f32* D_80178288; -extern f32* D_80178290; -extern u32* D_80178298; +extern f32* D_ctx_80178288; +extern f32* D_ctx_80178290; +extern u32* D_ctx_80178298; extern UNK_TYPE F_801782A0; extern Object_58* gObjects58; extern UNK_TYPE F_801782B0; -extern s32 D_801782B8; -extern s32 D_801782BC; -extern PosRot* D_801782C4; -extern f32* D_801782CC; -extern f32* D_801782D4; -extern f32* D_801782DC; -extern f32* D_801782E4; -extern f32* D_801782EC; +extern s32 D_ctx_801782B8; +extern s32 D_ctx_801782BC; +extern PosRot* D_ctx_801782C4; +extern f32* D_ctx_801782CC; +extern f32* D_ctx_801782D4; +extern f32* D_ctx_801782DC; +extern f32* D_ctx_801782E4; +extern f32* D_ctx_801782EC; extern UNK_TYPE F_801782F4; -extern s32 D_801782FC; +extern s32 D_ctx_801782FC; extern UNK_TYPE F_80178304; extern UNK_TYPE F_8017830C; extern UNK_TYPE F_80178314; diff --git a/include/fox_option.h b/include/fox_option.h index 488113bf..ecf39a28 100644 --- a/include/fox_option.h +++ b/include/fox_option.h @@ -80,7 +80,7 @@ typedef enum OptionId { extern void* D_menu_801B68B0[]; extern u8* D_menu_801B68D4[]; -extern s32 D_menu_801B8220[]; // total hits ranking? see func_menu_80197DE4 +extern s32 D_menu_801B8220[]; // total hits ranking? see Option_80197DE4 extern s32 D_menu_801B827C; extern s32 D_menu_801B8280; extern s32 D_menu_801B8284; @@ -97,31 +97,31 @@ extern u8 D_menu_801C6C10[96 * 96]; extern u8 D_menu_801C9010[96 * 96]; extern u8 D_menu_801CB410[96 * 96]; -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 Title_801877F0(void); + s32 Title_80187ABC(void); +void Title_80187B00(void); +void Title_80187E28(void); +void Title_801888E8(void); +void Title_8018994C(void); +void Title_8018A644(void); +void Title_8018ACEC(void); +void Title_8018B5C4(void); +void Title_8018C644(void); +void Title_80187CA8(void); +s32 Title_80188010(void); +void Title_80189208(void); +void Title_8018A2F8(void); +void Title_8018A990(void); +void Title_8018B038(void); +void Title_8018C114(void); +void Title_8018CB90(void); +void Title_8018F680(void); +void Title_8018F77C(void); +void Title_8018F85C(void); +void Title_8018F8E4(void); +void Title_8018FC14(void); +void Title_8018FD08(void); +void Title_8018FF74(void); void Option_UpdateEntry(void); void Option_MapUpdate(void); @@ -132,96 +132,96 @@ void Option_VersusUpdate(void); void Option_VersusDraw(void); void Option_SoundInit(void); void Option_SoundUpdate(void); -void func_menu_80194AEC(void); -void func_menu_80194BD0(void); +void Option_80194AEC(void); +void Option_80194BD0(void); void Option_SoundDraw(void); -void func_menu_801952B4(void); +void Option_801952B4(void); void Option_ExpertSoundInit(void); void Option_ExpertSoundUpdate(void); void Option_ExpertSoundDraw(void); void Option_DataInit(void); void Option_DataUpdate(void); -void func_menu_8019669C(void); +void Option_8019669C(void); void Option_DataDraw(void); void Option_RankingInit(void); void Option_RankingUpdate(void); void Option_RankingDraw(void); -void func_menu_80196FC4(void); -void func_menu_80197074(void); -void func_menu_8019715C(void); +void Option_80196FC4(void); +void Option_80197074(void); +void Option_8019715C(void); void Option_RankingMenuDraw(void); -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(PlanetId start, PlanetId end); +void Option_8019752C(void); +void Option_80197914(void); +void Option_80197A3C(s32, s32, s32); +void Option_80197D30(s32, s32, s32); +void Option_80197DE4(s32, s32, s32); +void Option_80197F74(s32, s32, s32); +void Option_80198164(s32, f32, f32); +void Option_801982B0(s32, s32, f32, f32, s32); +void Option_801984D0(s32, s32, f32, f32); +void Option_80198608(s32, s32, f32, f32); +void Option_8019882C(s32, s32, f32, f32); +void Option_8019896C(s32, f32, s32); +void Option_80199198(f32 arg0, f32 arg1, f32 arg2); +s32 Option_80199284(PlanetId start, PlanetId end); void Option_VersusMenuInit(void); void Option_VersusMenuUpdate(void); -void func_menu_8019949C(void); +void Option_8019949C(void); void Option_VersusMenuDraw(void); -void func_menu_80199820(s32); -void func_menu_80199EA8(void); +void Option_80199820(s32); +void Option_80199EA8(void); void Option_VersusStageInit(void); -void func_menu_8019A080(void); +void Option_8019A080(void); void Option_VersusStageUpdate(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_8019A124(void); +void Option_8019A1A8(void); +void Option_8019A214(void); +void Option_8019A298(void); +void Option_8019A2E0(void); +void Option_8019A4DC(void); +void Option_8019A6DC(void); +void Option_8019A954(void); void Option_VersusStageDraw(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_8019B6D8(f32 xPos, f32 yPos, f32 offset, s32 r, s32 g, s32 b); -void func_menu_8019B7D4(void); -void func_menu_8019B8A0(s32 arg0); -void func_menu_8019B8C8(void); +void Option_8019AB30(void); +void Option_8019AD84(void); +void Option_8019AFFC(void); +void Option_8019B1F8(void); +void Option_8019B3DC(void); +void Option_8019B5AC(void); +void Option_8019B6D8(f32 xPos, f32 yPos, f32 offset, s32 r, s32 g, s32 b); +void Option_8019B7D4(void); +void Option_8019B8A0(s32 arg0); +void Option_8019B8C8(void); void Option_DrawMenuLabel(void); void Option_DrawMenuCard(MenuContext_38 arg0); void Option_DrawMenuArwing(ArwingPosition arg0); -void func_menu_8019BC44(f32, f32, f32, f32, f32, f32); -void func_menu_8019BDF0(void); -void func_menu_8019BE7C(f32, f32, f32, f32 *, f32 *, f32 *); -void func_menu_8019BF34(void); -void func_menu_8019C04C(void); +void Option_8019BC44(f32, f32, f32, f32, f32, f32); +void Option_8019BDF0(void); +void Option_8019BE7C(f32, f32, f32, f32 *, f32 *, f32 *); +void Option_8019BF34(void); +void Option_8019C04C(void); void Option_DrawCardLabel(OptionTexture arg0); -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); -s32 func_menu_8019C5A0(s32*); -s32 func_menu_8019C66C(f32* arg0, f32 arg1, f32 arg2, UnkStruct_D_menu_801B9250* arg3); -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); +s32 Option_8019C418(s32* arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, UnkStruct_D_menu_801B9250* arg8); +s32 Option_8019C5A0(s32*); +s32 Option_8019C66C(f32* arg0, f32 arg1, f32 arg2, UnkStruct_D_menu_801B9250* arg3); +void Option_8019C824(f32* ); +s32 Option_8019C8C4(void); +void Option_8019CAE0(void); +void Option_8019CBC0(void); +void Option_8019CD54(void); +void Option_8019D118(void); +void Option_8019D624(void); +void Option_8019DB20(s32, f32, f32, f32, f32, f32, f32, f32); +s32 Option_8019DCE8(s32 arg0); +void Option_8019DD44(void); +void Option_8019DE74(void); +void Option_8019DF64(void); void Option_InvoiceUpdate(void); void Option_InvoiceDraw(void); -void func_menu_8019E8D0(void); -void func_menu_801A07E8(u8*, u8*, f32*); -void func_menu_801AD7EC(s32, s32, s32); -void func_menu_801A9FD4(s32); +void Map_8019E8D0(void); +void Map_801A07E8(u8*, u8*, f32*); +void Map_801AD7EC(s32, s32, s32); +void Map_801A9FD4(s32); #endif diff --git a/include/functions.h b/include/functions.h index 60da8481..aaec35e0 100644 --- a/include/functions.h +++ b/include/functions.h @@ -8,139 +8,142 @@ #include "sf64mesg.h" // fox_360 -void func_8002ED60(Player*); -void func_8002E3E0(Actor*); -void func_8002E548(void); -void func_8002E5E0(Boss*); -void func_8002E604(Boss*); -void func_8002E628(Boss*); -void func_8002E64C(Boss*); -void func_8002E670(Actor*); -void func_8002E694(Actor*); -void func_8002E6B8(Actor*); -void func_8002E6DC(Actor*); -bool func_8002E4F8(u16*, RadioCharacterId); -void func_8002E700(Player*); -void func_8002EE34(void); -void func_8002EE64(Actor* actor); -void func_8002F180(void); -void func_8002F5F4(u16* msg, RadioCharacterId character); -void func_8002F69C(Actor*); -void func_8003088C(Actor*); -void func_800319AC(Actor* this); -void func_80035448(Actor* actor); +void func_360_8002ED60(Player*); +void func_360_8002E3E0(Actor*); +void func_360_8002E548(void); +void func_360_8002E5E0(Boss*); +void func_360_8002E604(Boss*); +void func_360_8002E628(Boss*); +void func_360_8002E64C(Boss*); +void func_360_8002E670(Actor*); +void func_360_8002E694(Actor*); +void func_360_8002E6B8(Actor*); +void func_360_8002E6DC(Actor*); +bool func_360_8002E4F8(u16*, RadioCharacterId); +void func_360_8002E700(Player*); +void func_360_8002EE34(void); +void func_360_8002EE64(Actor* actor); +void func_360_8002F180(void); +void func_360_8002F5F4(u16* msg, RadioCharacterId character); +void func_360_8002F69C(Actor*); +void func_360_8002FC00(Actor*); +void func_360_8003088C(Actor*); +s32 func_360_80031900(Actor*); +void func_360_800319AC(Actor* this); +void func_360_80035448(Actor* actor); //fox_beam -void func_80038140(PlayerShot* shot); -void func_80036318(PlayerShot* shot); -void func_80035DEC(f32 xPos, f32 yPos, f32 zPos); +void func_beam_80038140(PlayerShot* shot); +void func_beam_80036318(PlayerShot* shot); +void func_beam_80035DEC(f32 xPos, f32 yPos, f32 zPos); void PlayerShot_Initialize(PlayerShot*); -void func_800365E4(f32, f32, f32, f32, f32, f32, f32, f32, f32, s32, s32); -void func_8003D9B8(void); -void func_8003DA0C(void); +void func_beam_800365E4(f32, f32, f32, f32, f32, f32, f32, f32, f32, s32, s32); +void func_beam_8003D9B8(void); +void func_beam_8003DA0C(void); // fox_bg -void func_8003DAF0(void); -void func_8003DE68(s32, s32); -void func_8003E1E8(void); -void func_80040450(void); -void func_80040954(void); -void func_80040CDC(void); -void func_80040CE4(void); -void func_80042D38(void); +void func_bg_8003DAF0(void); +void func_bg_8003DE68(s32, s32); +void func_bg_8003E1E8(void); +void func_bg_80040450(void); +void func_bg_80040954(void); +void func_bg_80040CDC(void); +void func_bg_80040CE4(void); +void func_bg_80042D38(void); // fox_boss -void func_80042EC0(Boss* boss); -void func_80042FAC(Boss* boss); -void func_80042FB8(Boss* boss); -void func_80042FC4(Boss* boss); -void func_80042FD0(Boss* boss); -void func_80042FDC(Boss* boss); -void func_80042FE8(Boss* boss); -void func_800430DC(f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, s32, s32); -void func_8004319C(Player* player, f32 arg1, f32 arg2, f32 arg3); +void func_boss_80042EC0(Boss* boss); +void func_boss_80042FAC(Boss* boss); +void func_boss_80042FB8(Boss* boss); +void func_boss_80042FC4(Boss* boss); +void func_boss_80042FD0(Boss* boss); +void func_boss_80042FDC(Boss* boss); +void func_boss_80042FE8(Boss* boss); +void func_boss_800430DC(f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, s32, s32); +void func_boss_8004319C(Player* player, f32 arg1, f32 arg2, f32 arg3); // fox_tank -void func_80043468(Player* player); -void func_800444BC(Player* player); -void func_80044868(Player*); -void func_80045130(Player*); -void func_80045678(Player*); -void func_80045E7C(Player*); -void func_80047504(Player* player); -void func_80046358(Player*); +void func_tank_80043468(Player* player); +void func_tank_800444BC(Player* player); +void func_tank_80044868(Player*); +void func_tank_80045130(Player*); +void func_tank_80045678(Player*); +void func_tank_80045E7C(Player*); +void func_tank_80047504(Player* player); +void func_tank_80046358(Player*); // fox_demo -void func_80048AC0(s32 teamId); -void func_80049C0C(Player*); -void func_8004A52C(Player*); -void func_8004AA84(void); -void func_8004AAF4(Player*); -void func_8004C930(Player*); -void func_8004CCC0(Player*); -void func_8004D440(Player* player); -void func_8004E3D8(Player*); -void func_8004F8AC(Actor*); -void func_8004FEC0(Actor*); -void func_800515C4(void); +void func_demo_8004D440(Player*); +void func_demo_80048AC0(s32 teamId); +void func_demo_80049C0C(Player*); +void func_demo_8004A52C(Player*); +void func_demo_8004AA84(void); +void func_demo_8004AAF4(Player*); +void func_demo_8004C930(Player*); +void func_demo_8004CCC0(Player*); +void func_demo_8004D440(Player* player); +void func_demo_8004E3D8(Player*); +void func_demo_8004F8AC(Actor*); +void func_demo_8004FEC0(Actor*); +void func_demo_800515C4(void); // fox_display -void func_80053658(WingInfo*); -void func_8005465C(s32); -void func_80057814(Player*); -void func_80057D00(void); +void func_display_80053658(WingInfo*); +void func_display_8005465C(s32); +void func_display_80057814(Player*); +void func_display_80057D00(void); // fox_edata -void func_800594F0(Object_80*); -void func_800595D0(Object_80*); -void func_800596C0(void); -void func_800596B0(Actor*); +void func_edata_800594F0(Object_80*); +void func_edata_800595D0(Object_80*); +void func_edisplay_800596C0(void); +void func_edata_800596B0(Actor*); // fox_edisplay void Graphics_SetScaleMtx(f32); -void func_80059850(Object_4C*); -void func_800598E8(Actor*); -void func_80059A24(Actor*); -void func_80059AEC(Object_80*); -void func_80059B20(Object_80*); -void func_80059BBC(Object_80*); -void func_80059BF0(Actor*); -void func_80059C34(Object_4C*); -void func_80059C40(Object_4C*); -void func_80059F68(Item*); -void func_80059FDC(Item*); -void func_8005A094(Actor*); -void func_8005ADAC(Actor*); -void func_8005B1E8(Actor*, s32); -void func_8005B388(Actor*); -void func_8005B6A4(Actor*); -void func_8005B71C(Actor*); -void func_8005B7CC(Actor*); -void func_8005B848(Actor*); -void func_8005B9A4(Actor*); -void func_8005BA30(Actor*); -void func_8005C5F0(Item*); -void func_8005C900(Item*); -void func_8005C9C0(Item*); -void func_8005CA80(Item*); -void func_8005CB44(Item*); -void func_8005CC9C(Item*); -void func_8005CDA8(Item*); -void func_8005F030(f32*); -void func_8005F0E8(f32*, Vec3f*); -void func_8005F1EC(f32*); -void func_8005F290(f32*, Vec3f*); -void func_8005F670(Vec3f*); -s32 func_8005F9DC(Vec3f*); +void func_edisplay_80059850(Object_4C*); +void func_edisplay_800598E8(Actor*); +void func_edisplay_80059A24(Actor*); +void func_edisplay_80059AEC(Object_80*); +void func_edisplay_80059B20(Object_80*); +void func_edisplay_80059BBC(Object_80*); +void func_edisplay_80059BF0(Actor*); +void func_edisplay_80059C34(Object_4C*); +void func_edisplay_80059C40(Object_4C*); +void func_edisplay_80059F68(Item*); +void func_edisplay_80059FDC(Item*); +void func_edisplay_8005A094(Actor*); +void func_edisplay_8005ADAC(Actor*); +void func_edisplay_8005B1E8(Actor*, s32); +void func_edisplay_8005B388(Actor*); +void func_edisplay_8005B6A4(Actor*); +void func_edisplay_8005B71C(Actor*); +void func_edisplay_8005B7CC(Actor*); +void func_edisplay_8005B848(Actor*); +void func_edisplay_8005B9A4(Actor*); +void func_edisplay_8005BA30(Actor*); +void func_edisplay_8005C5F0(Item*); +void func_edisplay_8005C900(Item*); +void func_edisplay_8005C9C0(Item*); +void func_edisplay_8005CA80(Item*); +void func_edisplay_8005CB44(Item*); +void func_edisplay_8005CC9C(Item*); +void func_edisplay_8005CDA8(Item*); +void func_edisplay_8005F030(f32*); +void func_edisplay_8005F0E8(f32*, Vec3f*); +void func_edisplay_8005F1EC(f32*); +void func_edisplay_8005F290(f32*, Vec3f*); +void func_edisplay_8005F670(Vec3f*); +s32 func_edisplay_8005F9DC(Vec3f*); // fox_enmy -void func_80060714(s32 ); -void func_8006089C(u8 ); +void func_edisplay_80060714(s32 ); +void func_edisplay_8006089C(u8 ); void TexturedLine_Draw(void); -void func_80060D94(s32); -void func_80060F30(f32* , u32 , s32 ); +void func_edisplay_80060D94(s32); +void func_enmy_80060F30(f32* , u32 , s32 ); void Object_Kill(Object*, f32*); -s32 func_80060FE4(Vec3f*, f32); +s32 func_enmy_80060FE4(Vec3f*, f32); void Object_SetInfo(ObjectInfo* info, u32 objId); void Object_80_Initialize(Object_80*); void Object_4C_Initialize(Object_4C*); @@ -148,56 +151,56 @@ void Actor_Initialize(Actor*); void Boss_Initialize(Boss*); void Item_Initialize(Item*); void Effect_Initialize(Effect*); -void func_80061B68(void); -void func_80061CD0(void); -void func_80061E48(Actor* , f32 , f32 , f32 ); -void func_80061F0C(Actor* , ObjectInit* , s32 ); +void func_enmy_80061B68(void); +void func_enmy_80061CD0(void); +void func_enmy_80061E48(Actor* , f32 , f32 , f32 ); +void func_enmy_80061F0C(Actor* , ObjectInit* , s32 ); void Object_Load(ObjectInit* , f32 , f32 , f32 , f32 ); -void func_80062568(void); -void func_80062B60(f32 xPos, f32 zPos, s32 state, f32 scale); -void func_80062C38(f32, f32); -bool func_80062DBC(Vec3f* pos, f32* hitboxData, Object* obj, f32 xRot, f32 yRot, f32 zRot); -s32 func_800631A8(Vec3f*, f32*, Vec3f*); -s32 func_8006326C(Vec3f* , Vec3f* , ObjectId , Object* ); -s32 func_8006351C(s32 , Vec3f* , Vec3f* , s32 ); -void func_800652CC(Object_80*); -void func_800654E4(Object*); -void func_800656D4(Actor*); -void func_800660F0(Actor*); -void func_80066254(Actor*); -void func_8006654C(Actor*); -void func_8006684C(Actor*); -void func_800669A0(Actor*); -void func_80066A80(Actor*); -void func_80066C00(Object_80*); -void func_80066D5C(Object_80*); -void func_80066E8C(Object_4C*); -void func_80066EA8(Object_80*); -void func_80066EF0(Item*); -void func_800671D0(Item*); -void func_800674B4(f32, f32, f32, f32, f32, f32, f32, f32); -void func_8006753C(Actor*); -void func_80067874(Actor*); -void func_80067A40(void); -void func_80067B1C(Item*); -void func_80067BEC(Item*); -void func_80067F6C(Item*); -void func_80068020(Item*); -void func_800685D8(Item*); -void func_800685F8(Item*); -void func_80068618(Item*); -void func_80068688(Item*); -void func_80068914(Item*); -void func_80068C48(Item*); -void func_80068C88(Item*); -void func_80068FE0(Object_4C*); -void func_800690D0(s32, ObjectId); -void func_80069924(Effect*); -void func_800693E8(Actor*); -void func_80069658(Boss*); -void func_800696F8(Object_80*); -void func_80069858(Object_4C*); -void func_80069A10(Item*); +void func_enmy_80062568(void); +void func_enmy_80062B60(f32 xPos, f32 zPos, s32 state, f32 scale); +void func_enmy_80062C38(f32, f32); +bool func_enmy_80062DBC(Vec3f* pos, f32* hitboxData, Object* obj, f32 xRot, f32 yRot, f32 zRot); +s32 func_enmy_800631A8(Vec3f*, f32*, Vec3f*); +s32 func_enmy_8006326C(Vec3f* , Vec3f* , ObjectId , Object* ); +s32 func_enmy_8006351C(s32 , Vec3f* , Vec3f* , s32 ); +void func_enmy_800652CC(Object_80*); +void func_enmy_800654E4(Object*); +void func_enmy_800656D4(Actor*); +void func_enmy_800660F0(Actor*); +void func_enmy_80066254(Actor*); +void func_enmy_8006654C(Actor*); +void func_enmy_8006684C(Actor*); +void func_enmy_800669A0(Actor*); +void func_enmy_80066A80(Actor*); +void func_enmy_80066C00(Object_80*); +void func_enmy_80066D5C(Object_80*); +void func_enmy_80066E8C(Object_4C*); +void func_enmy_80066EA8(Object_80*); +void func_enmy_80066EF0(Item*); +void func_enmy_800671D0(Item*); +void func_enmy_800674B4(f32, f32, f32, f32, f32, f32, f32, f32); +void func_enmy_8006753C(Actor*); +void func_enmy_80067874(Actor*); +void func_enmy_80067A40(void); +void func_enmy_80067B1C(Item*); +void func_enmy_80067BEC(Item*); +void func_enmy_80067F6C(Item*); +void func_enmy_80068020(Item*); +void func_enmy_800685D8(Item*); +void func_enmy_800685F8(Item*); +void func_enmy_80068618(Item*); +void func_enmy_80068688(Item*); +void func_enmy_80068914(Item*); +void func_enmy_80068C48(Item*); +void func_enmy_80068C88(Item*); +void func_enmy_80068FE0(Object_4C*); +void func_enmy_800690D0(s32, ObjectId); +void func_enmy_80069924(Effect*); +void func_enmy_800693E8(Actor*); +void func_enmy_80069658(Boss*); +void func_enmy_800696F8(Object_80*); +void func_enmy_80069858(Object_4C*); +void func_enmy_80069A10(Item*); void Actor_Update(Actor*); void Boss_Update(Boss*); void Object_80_Update(Object_80*); @@ -208,303 +211,306 @@ void TexturedLine_Update(TexturedLine*); void TexturedLine_UpdateAll(void); void Object_UpdateAll(void); -//fox_6B3B0 -void func_8006A96C(Actor*); -void func_8006A978(Actor*); -void func_8006AA98(Object_80*); -void func_8006AC08(Actor*); -void func_8006AD18(Actor*); -void func_8006B094(Actor*); -void func_8006B0A0(Actor*); -void func_8006B74C(Actor*); -void func_8006B95C(Object_80*); -void func_8006BB78(Actor*); -void func_8006C008(Actor*); -void func_8006D350(Object_80*); -void func_8006ECBC(PlayerShotId, PlayerShot*, s32, f32, f32, f32, f32, f32, f32, f32, f32, f32); -void func_8006EEFC(s32, f32, f32, f32, f32, f32, f32, f32, f32, f32); -void func_8006EFA0(s32 unk0E4, f32 xPos, f32 yPos, f32 zPos, f32 arg4, f32 arg5, f32 arg6, f32 xRot, f32 yRot, +//fox_enmy2 +void func_enmy2_8006A96C(Actor*); +void func_enmy2_8006A978(Actor*); +void func_enmy2_8006AA98(Object_80*); +void func_enmy2_8006AC08(Actor*); +void func_enmy2_8006AD18(Actor*); +void func_enmy2_8006B094(Actor*); +void func_enmy2_8006B0A0(Actor*); +void func_enmy2_8006B74C(Actor*); +void func_enmy2_8006B95C(Object_80*); +void func_enmy2_8006BB78(Actor*); +void func_enmy2_8006C008(Actor*); +void func_enmy2_8006D350(Object_80*); +void func_enmy2_8006ECBC(PlayerShotId, PlayerShot*, s32, f32, f32, f32, f32, f32, f32, f32, f32, f32); +void func_enmy2_8006EEFC(s32, f32, f32, f32, f32, f32, f32, f32, f32, f32); +void func_enmy2_8006EFA0(s32 unk0E4, f32 xPos, f32 yPos, f32 zPos, f32 arg4, f32 arg5, f32 arg6, f32 xRot, f32 yRot, f32 zRot); -void func_8006F0D8(f32 xPos, f32 yPos, f32 zPos, f32 arg3); -void func_8006F254(Actor*); -void func_80072594(Actor*); -s32 func_80074F90(Object_80*); -void func_80074FF0(Actor*); -void func_800763A4(Actor*); -void func_8007717C(Actor*); -void func_800771CC(Actor*); -void func_80077218(Actor*); +void func_enmy2_8006F0D8(f32 xPos, f32 yPos, f32 zPos, f32 arg3); +void func_enmy2_8006F254(Actor*); +void func_enmy2_80072594(Actor*); +s32 func_enmy2_80074F90(Object_80*); +void func_enmy2_80074FF0(Actor*); +void func_enmy2_800763A4(Actor*); +void func_enmy2_8007717C(Actor*); +void func_enmy2_800771CC(Actor*); +void func_enmy2_80077218(Actor*); // fox_effect -s32 func_80081B24(f32 xPos, f32 yPos, f32 zPos, f32 scale2); +s32 func_effect_80081B24(f32 xPos, f32 yPos, f32 zPos, f32 scale2); s32 BonusText_Display(f32 xPos, f32 yPos, f32 zPos, s32 hits); void BonusText_Update(void); void BonusText_DrawAll(void); -Effect* func_8007783C(ObjectId objId); -void func_8007797C(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2); -void func_80077A00(Effect* ); -void func_80077A7C(Effect* ); -void func_80077B78(Effect* ); -void func_80077B84(Effect* ); -void func_80078038(Effect* ); -void func_800780F8(Effect* ); -void func_800783C0(Effect* ); -void func_80078438(Effect* ); -void func_800784B4(Effect* ); -void func_80078550(Effect* ); -void func_80078604(Effect* ); -void func_8007868C(Effect* ); -void func_8007879C(Effect* ); -void func_800788B0(Effect* ); -void func_80078A64(Effect* ); -void func_80078AEC(Effect* ); -void func_80078B8C(Effect*); -void func_80078BE0(Effect* ); -void func_80078C84(Effect* ); -void func_80078CE8(Effect* ); -void func_80078E50(f32 xPos, f32 yPos, f32 zPos, f32 scale2); -void func_80078EBC(Effect* ); -void func_80078F78(Effect* ); -void func_800794CC(f32 xPos, f32 yPos, f32 zPos, f32 scale2); -void func_8007953C(f32 xPos, f32 yPos, f32 zPos, f32 scale2); -void func_800795AC(f32 xPos, f32 yPos, f32 zPos, f32 scale2); -void func_80079618(f32 xPos, f32 yPos, f32 zPos, f32 scale2); -void func_8007968C(Effect*); -s32 func_800798C4(s32 , Gfx** , Vec3f* , Vec3f* , void* ); //OverrideLimbDraw -void func_800798F0(Effect* ); -void func_8007A28C(Effect* ); -void func_8007A3C0(Effect* ); -void func_8007A568(f32 xPos, f32 yPos, f32 zPos, f32 scale1); -void func_8007A5F8(Effect* , Vec3f* pos, u32 sfxId); -void func_8007A6F0(Vec3f* pos, s32 sfxId); -void func_8007A748(Effect*); -s32 func_8007A774(Player*, Effect*, f32); -void func_8007A900(f32 xPos, f32 yPos, f32 zPos, f32 scale1, u8, u8, u16); -void func_8007A994(Effect*); -void func_8007AA60(Effect*); -void func_8007AB50(Effect*); -void func_8007ACE0(f32 xPos, f32 yPos, f32 zPos, f32 scale2, f32 scale1, f32 yRot); -void func_8007ADF4(f32 xPos, f32 yPos, f32 zPos, f32 scale2, f32 scale1); -void func_8007AFD0(f32 xPos, f32 zPos, f32 xVel, f32 zVel, f32 scale1); -void func_8007B040(Effect*); -void func_8007B0F4(Effect*); -void func_8007B228(f32 xPos, f32 yPos, f32 zPos, f32 scale1); -void func_8007B344(f32 xPos, f32 yPos, f32 zPos, f32 scale1, s32 ); -void func_8007B3B8(Effect*); -void func_8007B550(f32 xPos, f32 yPos, f32 zPos, f32 scale1, s32 ); -void func_8007B5C0(Effect*); -void func_8007B62C(Effect*); -void func_8007B670(Effect*); -void func_8007B67C(Effect*); -void func_8007B758(Effect*); -void func_8007B8F8(f32 xPos, f32 yPos, f32 zPos, f32 scale2); -void func_8007B960(Effect*); -void func_8007BC7C(f32 xPos, f32 yPos, f32 zPos, f32 scale2); -void func_8007BCE8(Effect*); -void func_8007B9DC(Effect*); -void func_8007BDE0(Effect*); -void func_8007BE54(Effect*); -void func_8007BEE8(Effect*); -void func_8007BFFC(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, s32 timer50); -void func_8007C120(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, s32 timer50); -void func_8007C250(Effect*); -void func_8007C484(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, s32 arg7); -void func_8007C50C(Effect*); -void func_8007C688(f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 timer50); -void func_8007C8C4(Effect*); -void func_8007C85C(f32 xPos, f32 yPos, f32 zPos, f32 scale2); -void func_8007C9E0(Effect*); -void func_8007CAF0(Effect*); -void func_8007CF30(f32 xPos, f32 yPos, f32 zPos, f32 scale2); -void func_8007D074(f32 xPos, f32 yPos, f32 zPos, f32 scale2); -void func_8007D0E0(f32 xPos, f32 yPos, f32 zPos, f32 scale2); -void func_8007D10C(f32 xPos, f32 yPos, f32 zPos, f32 scale2); -void func_8007D1E0(f32 xPos, f32 yPos, f32 zPos, f32 scale2); -void func_8007D24C(f32 xPos, f32 yPos, f32 zPos, f32 scale2); -void func_8007D2C8(f32 xPos, f32 yPos, f32 zPos, f32 scale2); -void func_8007D2F4(Effect*); -void func_8007D55C(Effect*); -void func_8007D748(Effect*); -void func_8007D8A8(Effect*); -void func_8007D9DC(f32 xPos, f32 yPos, f32 zPos, f32 scale2, f32 scale1, s32 timer50); -void func_8007DA58(Effect*); -void func_8007DAE4(Effect*); -void func_8007DB70(Effect*); -void func_8007DED4(Effect*); -void func_8007E014(Effect*); -void func_8007E258(Effect*); -void func_8007E298(Effect*); -void func_8007E330(Effect*); -void func_8007E3E4(Effect*); -void func_8007E45C(Effect*); -void func_8007E5CC(Effect*); -void func_8007E648(Effect*); -void func_8007E93C(Effect* effect, u32 objId, f32 xPos, f32 yPos, f32 zPos, f32 arg5); -void func_8007EE68(ObjectId objId, Vec3f* pos, Vec3f* rot, Vec3f* arg3, Vec3f* arg4, f32 scale2); -void func_8007F04C(ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 zRot, f32 unkX, f32 unkY, f32 unkZ, f32 xVel, f32 yVel, f32 zVel, f32 scale2); -void func_8007F11C(ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 arg4); -void func_8007F20C(ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 arg4); -void func_8007F438(Effect*); -void func_8007F6B0(Effect*); -void func_8007F958(Effect*); -void func_8007FBE0(Effect*); -void func_8007FE88(Effect*); -s32 func_8007FD84(Effect*); -void func_800802B8(Effect*); -void func_800802D8(Effect*); -void func_800802F8(Effect*); -void func_80080360(Effect*); -void func_8008040C(Effect*); -void func_8008092C(Effect*); -void func_80080ACC(Effect*); -void func_80080D04(Effect*); -void func_800815DC(void); -void func_80081A8C(f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 arg4); -void func_80081BEC(f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 arg4); -void func_80081C5C(Effect*); -void func_80082F78(Effect*); -void func_8008377C(f32, f32, f32, f32, f32); -void func_800837EC(Effect*); -void func_80083B8C(Effect*); -void func_80083C70(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 arg7, s32 arg8); -void func_80083D2C(f32 xPos, f32 yPos, f32 zPos, f32 srcZ); -void func_80083FA8(Effect*); -void func_80084194(Effect*); +Effect* func_effect_8007783C(ObjectId objId); +void func_effect_8007797C(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2); +void func_effect_80077A00(Effect* ); +void func_effect_80077A7C(Effect* ); +void func_effect_80077B78(Effect* ); +void func_effect_80077B84(Effect* ); +void func_effect_80078038(Effect* ); +void func_effect_800780F8(Effect* ); +void func_effect_800783C0(Effect* ); +void func_effect_80078438(Effect* ); +void func_effect_800784B4(Effect* ); +void func_effect_80078550(Effect* ); +void func_effect_80078604(Effect* ); +void func_effect_8007868C(Effect* ); +void func_effect_8007879C(Effect* ); +void func_effect_800788B0(Effect* ); +void func_effect_80078A64(Effect* ); +void func_effect_80078AEC(Effect* ); +void func_effect_80078B8C(Effect*); +void func_effect_80078BE0(Effect* ); +void func_effect_80078C84(Effect* ); +void func_effect_80078CE8(Effect* ); +void func_effect_80078E50(f32 xPos, f32 yPos, f32 zPos, f32 scale2); +void func_effect_80078EBC(Effect* ); +void func_effect_80078F78(Effect* ); +void func_effect_800794CC(f32 xPos, f32 yPos, f32 zPos, f32 scale2); +void func_effect_8007953C(f32 xPos, f32 yPos, f32 zPos, f32 scale2); +void func_effect_800795AC(f32 xPos, f32 yPos, f32 zPos, f32 scale2); +void func_effect_80079618(f32 xPos, f32 yPos, f32 zPos, f32 scale2); +void func_effect_8007968C(Effect*); +s32 func_effect_800798C4(s32 , Gfx** , Vec3f* , Vec3f* , void* ); //OverrideLimbDraw +void func_effect_800798F0(Effect* ); +void func_effect_8007A28C(Effect* ); +void func_effect_8007A3C0(Effect* ); +void func_effect_8007A568(f32 xPos, f32 yPos, f32 zPos, f32 scale1); +void func_effect_8007A5F8(Effect* , Vec3f* pos, u32 sfxId); +void func_effect_8007A6F0(Vec3f* pos, s32 sfxId); +void func_effect_8007A748(Effect*); +s32 func_effect_8007A774(Player*, Effect*, f32); +void func_effect_8007A900(f32 xPos, f32 yPos, f32 zPos, f32 scale1, u8, u8, u16); +void func_effect_8007A994(Effect*); +void func_effect_8007AA60(Effect*); +void func_effect_8007AB50(Effect*); +void func_effect_8007ACE0(f32 xPos, f32 yPos, f32 zPos, f32 scale2, f32 scale1, f32 yRot); +void func_effect_8007ADF4(f32 xPos, f32 yPos, f32 zPos, f32 scale2, f32 scale1); +void func_effect_8007AFD0(f32 xPos, f32 zPos, f32 xVel, f32 zVel, f32 scale1); +void func_effect_8007B040(Effect*); +void func_effect_8007B0F4(Effect*); +void func_effect_8007B228(f32 xPos, f32 yPos, f32 zPos, f32 scale1); +void func_effect_8007B344(f32 xPos, f32 yPos, f32 zPos, f32 scale1, s32 ); +void func_effect_8007B3B8(Effect*); +void func_effect_8007B550(f32 xPos, f32 yPos, f32 zPos, f32 scale1, s32 ); +void func_effect_8007B5C0(Effect*); +void func_effect_8007B62C(Effect*); +void func_effect_8007B670(Effect*); +void func_effect_8007B67C(Effect*); +void func_effect_8007B758(Effect*); +void func_effect_8007B8F8(f32 xPos, f32 yPos, f32 zPos, f32 scale2); +void func_effect_8007B960(Effect*); +void func_effect_8007BC7C(f32 xPos, f32 yPos, f32 zPos, f32 scale2); +void func_effect_8007BCE8(Effect*); +void func_effect_8007B9DC(Effect*); +void func_effect_8007BDE0(Effect*); +void func_effect_8007BE54(Effect*); +void func_effect_8007BEE8(Effect*); +void func_effect_8007BFFC(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, s32 timer50); +void func_effect_8007C120(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, s32 timer50); +void func_effect_8007C250(Effect*); +void func_effect_8007C484(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, s32 arg7); +void func_effect_8007C50C(Effect*); +void func_effect_8007C688(f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 timer50); +void func_effect_8007C8C4(Effect*); +void func_effect_8007C85C(f32 xPos, f32 yPos, f32 zPos, f32 scale2); +void func_effect_8007C9E0(Effect*); +void func_effect_8007CAF0(Effect*); +void func_effect_8007CF30(f32 xPos, f32 yPos, f32 zPos, f32 scale2); +void func_effect_8007D074(f32 xPos, f32 yPos, f32 zPos, f32 scale2); +void func_effect_8007D0E0(f32 xPos, f32 yPos, f32 zPos, f32 scale2); +void func_effect_8007D10C(f32 xPos, f32 yPos, f32 zPos, f32 scale2); +void func_effect_8007D1E0(f32 xPos, f32 yPos, f32 zPos, f32 scale2); +void func_effect_8007D24C(f32 xPos, f32 yPos, f32 zPos, f32 scale2); +void func_effect_8007D2C8(f32 xPos, f32 yPos, f32 zPos, f32 scale2); +void func_effect_8007D2F4(Effect*); +void func_effect_8007D55C(Effect*); +void func_effect_8007D748(Effect*); +void func_effect_8007D8A8(Effect*); +void func_effect_8007D9DC(f32 xPos, f32 yPos, f32 zPos, f32 scale2, f32 scale1, s32 timer50); +void func_effect_8007DA58(Effect*); +void func_effect_8007DAE4(Effect*); +void func_effect_8007DB70(Effect*); +void func_effect_8007DED4(Effect*); +void func_effect_8007E014(Effect*); +void func_effect_8007E258(Effect*); +void func_effect_8007E298(Effect*); +void func_effect_8007E330(Effect*); +void func_effect_8007E3E4(Effect*); +void func_effect_8007E45C(Effect*); +void func_effect_8007E5CC(Effect*); +void func_effect_8007E648(Effect*); +void func_effect_8007E93C(Effect* effect, u32 objId, f32 xPos, f32 yPos, f32 zPos, f32 arg5); +void func_effect_8007EE68(ObjectId objId, Vec3f* pos, Vec3f* rot, Vec3f* arg3, Vec3f* arg4, f32 scale2); +void func_effect_8007F04C(ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 zRot, f32 unkX, f32 unkY, f32 unkZ, f32 xVel, f32 yVel, f32 zVel, f32 scale2); +void func_effect_8007F11C(ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 arg4); +void func_effect_8007F20C(ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 arg4); +void func_effect_8007F438(Effect*); +void func_effect_8007F6B0(Effect*); +void func_effect_8007F958(Effect*); +void func_effect_8007FBE0(Effect*); +void func_effect_8007FE88(Effect*); +s32 func_effect_8007FD84(Effect*); +void func_effect_800802B8(Effect*); +void func_effect_800802D8(Effect*); +void func_effect_800802F8(Effect*); +void func_effect_80080360(Effect*); +void func_effect_8008040C(Effect*); +void func_effect_8008092C(Effect*); +void func_effect_80080ACC(Effect*); +void func_effect_80080D04(Effect*); +void func_effect_800815DC(void); +void func_effect_80081A8C(f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 arg4); +void func_effect_80081BEC(f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 arg4); +void func_effect_80081C5C(Effect*); +void func_effect_80082F78(Effect*); +void func_effect_8008377C(f32, f32, f32, f32, f32); +void func_effect_800837EC(Effect*); +void func_effect_80083B8C(Effect*); +void func_effect_80083C70(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 arg7, s32 arg8); +void func_effect_80083D2C(f32 xPos, f32 yPos, f32 zPos, f32 srcZ); +void func_effect_80083FA8(Effect*); +void func_effect_80084194(Effect*); // fox_fade -void func_80084370(s32); -void func_800843FC(s32); -void func_80084488(s32); -void func_80084688(s32, s32); +void func_fade_80084370(s32); +void func_fade_800843FC(s32); +void func_fade_80084488(s32); +void func_fade_80084688(s32, s32); // fox_hud -void func_80084B94(s32); -void func_800857DC(f32, f32, f32, f32); -void func_80085890(f32, f32, f32, f32); -void func_80086110(f32, f32, s32); -void func_80086664(f32, f32); -void func_800869A0(f32, f32, s32, f32, s32, s32); -void func_80087530(f32, f32, s32); -void func_800884E4(void); -void func_80088564(void); -void func_8008865C(void); -s32 func_8008AC54(s32); -void func_8008AD94(void); -void func_8008B5B0(f32 x, f32 y); -s32 func_8008B774(void); -void func_8008BD00(u8*, s32, s32, u8); -void func_8008C104(u16*, u16*); -void func_8008C390(f32, f32, f32, s32); -void func_8008C5C8(f32, f32, f32, s32); -void func_8008C6F4(s32, s32); -s32 func_8008BCBC(s32); -void func_8008CA44(void); -s32 func_8008CB8C(void); -void func_8008D0DC(f32, f32, f32, f32, f32); -void func_8008DE68(void); -void func_8008E51C(s32* , f32); -void func_8008E9EC(f32, f32); -void func_8008EA14(f32, f32); -void func_8008FA84(void); -void func_8008FE78(Boss*); -void func_8008FFF0(Boss*, s32); -s32 func_80090200(Boss* boss); -bool func_8009092C(Actor*); -void func_800907C4(Boss*); -s32 func_800915FC(Actor*); -s32 func_800924E0(Actor*); -s32 func_800927A0(Actor*); -void func_80092D48(Actor*); -void func_80092EC0(Actor* actor); -void func_80093164(Actor*); -void func_800935E8(Player*); -void func_800953A0(Actor*, s32); -void func_8009546C(Actor*, s32); -void func_80095538(Actor*, s32); -void func_80095604(Player*); -void func_80094954(Effect*); -void func_80094BBC(Effect*); -void func_80094D20(f32, f32); -void func_80096A74(Player* player); +void func_hud_80084B94(s32); +void func_hud_800857DC(f32, f32, f32, f32); +void func_hud_80085890(f32, f32, f32, f32); +void func_hud_80086110(f32, f32, s32); +void func_hud_80086664(f32, f32); +void func_hud_800869A0(f32, f32, s32, f32, s32, s32); +void func_hud_80087530(f32, f32, s32); +void func_hud_800884E4(void); +void func_hud_80088564(void); +void func_hud_8008865C(void); +s32 func_hud_8008AC54(s32); +void func_hud_8008AD94(void); +void func_hud_8008B5B0(f32 x, f32 y); +s32 func_hud_8008B774(void); +void func_hud_8008BD00(u8*, s32, s32, u8); +void func_hud_8008C104(u16*, u16*); +void func_hud_8008C390(f32, f32, f32, s32); +void func_hud_8008C5C8(f32, f32, f32, s32); +void func_hud_8008C6F4(s32, s32); +s32 func_hud_8008BCBC(s32); +void func_hud_8008CA44(void); +s32 func_hud_8008CB8C(void); +void func_hud_8008D0DC(f32, f32, f32, f32, f32); +void func_hud_8008DE68(void); +void func_hud_8008E51C(s32* , f32); +void func_hud_8008E9EC(f32, f32); +void func_hud_8008EA14(f32, f32); +void func_hud_8008FA84(void); +void func_hud_8008FE78(Boss*); +void func_hud_8008FFF0(Boss*, s32); +s32 func_hud_80090200(Boss* boss); +bool func_hud_8009092C(Actor*); +void func_hud_800907C4(Boss*); +s32 func_hud_800915FC(Actor*); +s32 func_hud_800924E0(Actor*); +s32 func_hud_800927A0(Actor*); +void func_hud_80092D48(Actor*); +void func_hud_80092EC0(Actor* actor); +void func_hud_80093164(Actor*); +void func_hud_800935E8(Player*); +void func_hud_800953A0(Actor*, s32); +void func_hud_8009546C(Actor*, s32); +void func_hud_80095538(Actor*, s32); +void func_hud_80095604(Player*); +void func_hud_80094954(Effect*); +void func_hud_80094BBC(Effect*); +void func_hud_80094D20(f32, f32); +void func_hud_80096A74(Player* player); // fox_97F80 -void func_80098860(PlaneF* plane, Vec3f* point, Vec3f* normal); -s32 func_800988B4(Vec3f* vec, PlaneF* plane); -s32 func_800998FC(Vec3f*, Vec3f*, Vec3f*, s32, Vec3f*, f32*); +void func_col1_80098860(PlaneF* plane, Vec3f* point, Vec3f* normal); +s32 func_col1_800988B4(Vec3f* vec, PlaneF* plane); +s32 func_col1_800998FC(Vec3f*, Vec3f*, Vec3f*, s32, Vec3f*, f32*); // fox_A4290 -bool func_800A3690(Vec3f*, Vec3f*, s32, Vec3f*); +bool func_col2_800A3690(Vec3f*, Vec3f*, s32, Vec3f*); // fox_A48A0 void func_800A3CA0(void); // fox_play s32 Play_CheckMedalStatus(u16); +void func_play_800A3FB0(void); s32 Play_GetMaxShields(void); -void func_800A6028(f32*, u32); -void func_800AC290(Player* player, PlayerShot* shot, f32 arg2, f32 arg3, PlayerShotId shotId, f32 arg5); -void func_800A5844(void); -void func_800A594C(void); -void func_800A5D6C(void); -void func_800A5EBC(void); -void func_800A5FA0(f32* , u32 , s32 ); -void func_800A6070(f32* , u32 ); -void func_800A6148(void); -void func_800A69F8(s32 , f32 , f32 , f32 ); +void func_play_800A6028(f32*, u32); +void func_play_800AC290(Player* player, PlayerShot* shot, f32 arg2, f32 arg3, PlayerShotId shotId, f32 arg5); +void func_play_800A5844(void); +void func_play_800A594C(void); +void func_play_800A5D6C(void); +void func_play_800A5EBC(void); +void func_play_800A5FA0(f32* , u32 , s32 ); +void func_play_800A6070(f32* , u32 ); +void func_play_800A6148(void); +void func_play_800A69F8(s32 , f32 , f32 , f32 ); void Player_ApplyDamage(Player* player, s32 direction, s32 damage); -bool func_800A73E4(f32* , s32* , f32 xPos, f32 yPos, f32 zPos); -s32 func_800A78C4(Hitbox* hitbox, f32 , f32 , f32 , f32 , f32 , f32 ); -void func_800A8BA4(Player* player); -void func_800AA800(Player* player); -void func_800ACDC0(Player*, PlayerShot*, PlayerShotId ); -void func_800B0F50(Player*); -void func_800B44C4(Player*); -void func_800AB334(void); -void func_800ABA08(void); -void func_800AE278(Player*); -void func_800B2130(Player*); -void func_800B2574(Player*); -void func_800B5FBC(Player*, s32 , s32 ); -void func_800B63BC(Player*, s32); -void func_800B6848(Player*, s32 ); -void func_800B6BFC(Player*, s32 ); -void func_800B6F50(f32, f32, f32, f32, f32, f32); -void func_800B7184(Player*, s32); -void func_800B73E0(Player*); -void func_800B852C(ObjectId , Item*); -void func_800B86CC(void); -void func_800A668C(f32 xPos, f32 yPos, f32 zPos); -void func_800AD7F0(Player* player); -void func_800ADF58(Player* player); -void func_800B415C(Player* player); -void func_800B41E0(Player* player); -void func_800B41EC(Player* player); -void func_800A46A0(Player* player); -void func_800A86E4(Player* player); -void func_800A887C(Player* player); -s32 func_800A7974(Player* player, f32* hitboxData, s32* index, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, +bool func_play_800A73E4(f32* , s32* , f32 xPos, f32 yPos, f32 zPos); +s32 func_play_800A78C4(Hitbox* hitbox, f32 , f32 , f32 , f32 , f32 , f32 ); +void func_play_800A8BA4(Player* player); +void func_play_800AA800(Player* player); +void func_play_800ACDC0(Player*, PlayerShot*, PlayerShotId ); +void func_play_800B0F50(Player*); +void func_play_800B44C4(Player*); +void func_play_800AB334(void); +void func_play_800ABA08(void); +void func_play_800AE278(Player*); +void func_play_800B2130(Player*); +void func_play_800B2574(Player*); +void func_play_800B56BC(Player*); +void func_play_800B5D30(Player*, s32); +void func_play_800B5FBC(Player*, s32 , s32 ); +void func_play_800B63BC(Player*, s32); +void func_play_800B6848(Player*, s32 ); +void func_play_800B6BFC(Player*, s32 ); +void func_play_800B6F50(f32, f32, f32, f32, f32, f32); +void func_play_800B7184(Player*, s32); +void func_play_800B73E0(Player*); +void func_play_800B852C(ObjectId , Item*); +void func_play_800B86CC(void); +void func_play_800A668C(f32 xPos, f32 yPos, f32 zPos); +void func_play_800AD7F0(Player* player); +void func_play_800ADF58(Player* player); +void func_play_800B415C(Player* player); +void func_play_800B41E0(Player* player); +void func_play_800B41EC(Player* player); +void func_play_800A46A0(Player* player); +void func_play_800A86E4(Player* player); +void func_play_800A887C(Player* player); +s32 func_play_800A7974(Player* player, f32* hitboxData, s32* index, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 zRot, f32 arg9, f32 argA, f32 argB); -bool func_800A8054(ObjectId objId, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, Vec3f* arg7, Vec3f* arg8); +bool func_play_800A8054(ObjectId objId, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, Vec3f* arg7, Vec3f* arg8); void Object_58_Initialize(Object_58*); // fox_versus -s32 func_800C1E9C(void); -void func_800C1ED4(void); -void func_800C20B0(void); -void func_800C2190(void); -void func_800C26C8(void); +s32 func_versus_800C1E9C(void); +void func_versus_800C1ED4(void); +void func_versus_800C20B0(void); +void func_versus_800C2190(void); +void func_versus_800C26C8(void); -void func_menu_80187520(u32, void*); -void func_menu_8019E8D0(void); +void OvlMenu_CallFunction(u32, void*); +void Map_8019E8D0(void); -void func_i1_80198414(void); -// s32 func_i1_801937F4(s32, Gfx**, Vec3f*, Vec3f*, void*); -// void func_i1_80193D64(s32, Vec3f*, void*); +void Venom1_80198414(void); +// s32 Venom1_801937F4(s32, Gfx**, Vec3f*, Vec3f*, void*); +// void Venom1_80193D64(s32, Vec3f*, void*); -void func_ending_8018A96C(void); -void func_ending_8018AAC4(void); +void Ending_8018A96C(void); +void Ending_8018AAC4(void); // sf_i5_5 -bool func_i5_801B49D0(Actor* actor); +bool Ground_801B49D0(Actor* actor); #endif diff --git a/include/gfx.h b/include/gfx.h index 3158bc31..ee8bb1c5 100644 --- a/include/gfx.h +++ b/include/gfx.h @@ -107,8 +107,8 @@ void Lights_SetTwoLights(Gfx** dList, s32 dir1x, s32 dir1y, s32 dir1z, s32 dir2x char* Graphics_ClearPrintBuffer(char *buf, s32 fill, s32 len); s32 Graphics_Printf(const char *fmt, ...); -void Texture_Scroll(void *texture, s32 width, s32 height, u8 mode); -void Texture_Mottle(void *dst, void *src, u8 mode); +void Texture_Scroll(u16 *texture, s32 width, s32 height, u8 mode); +void Texture_Mottle(u16 *dst, u16 *src, u8 mode); s32 Animation_GetLimbIndex(Limb* limb, Limb** skeleton); void Animation_DrawLimb(s32 mode, Limb* limb, Limb* *skeleton, Vec3f* jointTable, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, void* data); void Animation_DrawSkeleton(s32 mode, Limb** skeletonSegment, Vec3f* jointTable, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, void* data, Matrix* transform); diff --git a/include/i1.h b/include/i1.h index bbbbcab1..4bd560d2 100644 --- a/include/i1.h +++ b/include/i1.h @@ -8,67 +8,67 @@ #include "sf64player.h" #include "sf64mesg.h" -extern Gfx* D_i1_8019A008[]; -extern f32 D_i1_8019A9B8[]; +extern Gfx* D_VE1_8019A008[]; +extern f32 D_VE1_8019A9B8[]; -extern void func_i1_8018F880(Player*); -extern void func_i1_80191160(Player*); -extern void func_i1_801988B8(Player*); +extern void Corneria_8018F880(Player*); +extern void Corneria_80191160(Player*); +extern void Venom1_801988B8(Player*); -void func_i1_801875A4(Object_4C*); -void func_i1_80189058(Boss*); -void func_i1_8018AA74(Boss*); -void func_i1_8018AED0(Actor*); -void func_i1_8018B15C(Actor*); -void func_i1_8018B418(Actor*); -void func_i1_8018B58C(Actor*); -void func_i1_8018BAAC(Actor*); -void func_i1_8018BBA4(Actor*); -void func_i1_8018BBF8(Actor*); -void func_i1_8018BD7C(Actor*); -void func_i1_8018C19C(Boss*); -void func_i1_8018DDAC(Boss*); -void func_i1_8018E290(Boss*); -void func_i1_8018E76C(Boss*); -void func_i1_8018ECAC(Boss*); -void func_i1_8018ED78(Boss*); -void func_i1_8018EE84(Boss*); -void func_i1_8018EF90(Boss*); -void func_i1_8018F044(Object_80*); -void func_i1_8018F31C(Object_80*); -void func_i1_801922DC(Object_4C*); -void func_i1_80192358(Object_4C*); -void func_i1_801923C0(Object_4C*); -void func_i1_8019243C(Object_4C*); -void func_i1_80192518(Actor*); -void func_i1_80192CD4(Actor*); -void func_i1_80192E2C(Actor*); -void func_i1_80192EB0(Actor*); -void func_i1_801933DC(Actor*); -void func_i1_801934D0(Actor*); -void func_i1_80193540(Object_80*); -void func_i1_80194398(Boss*); -void func_i1_801985E4(Boss*); -void func_i1_80198968(Item*); +void Corneria_801875A4(Object_4C*); +void Corneria_80189058(Boss*); +void Corneria_8018AA74(Boss*); +void Corneria_8018AED0(Actor*); +void Corneria_8018B15C(Actor*); +void Corneria_8018B418(Actor*); +void Corneria_8018B58C(Actor*); +void Corneria_8018BAAC(Actor*); +void Corneria_8018BBA4(Actor*); +void Corneria_8018BBF8(Actor*); +void Corneria_8018BD7C(Actor*); +void Corneria_8018C19C(Boss*); +void Corneria_8018DDAC(Boss*); +void Corneria_8018E290(Boss*); +void Corneria_8018E76C(Boss*); +void Corneria_8018ECAC(Boss*); +void Corneria_8018ED78(Boss*); +void Corneria_8018EE84(Boss*); +void Corneria_8018EF90(Boss*); +void Corneria_8018F044(Object_80*); +void Corneria_8018F31C(Object_80*); +void Venom1_801922DC(Object_4C*); +void Venom1_80192358(Object_4C*); +void Venom1_801923C0(Object_4C*); +void Venom1_8019243C(Object_4C*); +void Venom1_80192518(Actor*); +void Venom1_80192CD4(Actor*); +void Venom1_80192E2C(Actor*); +void Venom1_80192EB0(Actor*); +void Venom1_801933DC(Actor*); +void Venom1_801934D0(Actor*); +void Venom1_80193540(Object_80*); +void Venom1_80194398(Boss*); +void Venom1_801985E4(Boss*); +void Training_80198968(Item*); -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 OvlI1_CallFunction(s32, void*); +void Corneria_80187530(Object_80*); +void Corneria_8018753C(Object_80*); +void Corneria_801878D8(Boss *); +void Corneria_8018B0B4(Actor *); +void Corneria_8018BE7C(Boss *); +void Corneria_8018ED78(Boss*); +void Venom1_801924A8(Object_80* ); +void Venom1_8019250C(Actor *); +void Venom1_80192CB0(Actor *); +void Venom1_80192EA4(Actor *); +void Venom1_801933B4(Actor *); +void Venom1_801935CC(Boss *); +void Venom1_80198310(Boss *); +void Venom1_80198594(Boss *); +void Training_801988E0(void); +void Training_80198C50(void); +void Training_8019949C(void); +void Venom1_8019864C(PlayerShot*); #endif diff --git a/include/i2.h b/include/i2.h index 060bd64a..7e6dfd2a 100644 --- a/include/i2.h +++ b/include/i2.h @@ -8,42 +8,42 @@ #include "sf64player.h" #include "sf64mesg.h" -void func_i2_8018CD8C(Player*); -void func_i2_8018E084(Player*); -void func_i2_8018ED9C(Actor*); -void func_i2_80193A30(Player*); -void func_i2_80194728(Player*); +void Meteo_8018CD8C(Player*); +void Meteo_8018E084(Player*); +void Meteo_8018ED9C(Actor*); +void SectorX_80193A30(Player*); +void SectorX_80194728(Player*); -void func_i2_80187520(s32, void*); -void func_i2_80187B08(Actor *); -void func_i2_80188A40(Boss *); -void func_i2_8018CCF8(Actor *); +void OvlI2_CallFunction(s32, void*); +void Meteo_80187B08(Actor *); +void Meteo_80188A40(Boss *); +void Meteo_8018CCF8(Actor *); -void func_i2_8018756C(Actor*); -void func_i2_80187650(Actor*); -void func_i2_801877C4(Actor*); -void func_i2_8018795C(Actor*); -void func_i2_80188344(Boss*); -void func_i2_801887D0(Boss*); -void func_i2_80188CAC(Effect*); -void func_i2_80188FAC(Effect*); -void func_i2_80189114(Effect*); -void func_i2_8018978C(Boss*); -void func_i2_8018BACC(Boss*); -void func_i2_8018D9EC(Actor*); -void func_i2_8018DA6C(Actor*); -void func_i2_8018DAEC(Actor*); -void func_i2_8018DB6C(Actor*); -void func_i2_8018DBEC(Effect*); -void func_i2_8018DCE4(Effect*); -void func_i2_8018DE14(Effect*); -void func_i2_8018F330(Actor*); -void func_i2_8018F884(Actor*); -void func_i2_8018FE38(Boss*); -void func_i2_8018FF20(Boss*); -void func_i2_8018FF84(Boss*); -void func_i2_80190020(Boss*); -void func_i2_80190078(Boss*); -void func_i2_80193434(Boss*); +void Meteo_8018756C(Actor*); +void Meteo_80187650(Actor*); +void Meteo_801877C4(Actor*); +void Meteo_8018795C(Actor*); +void Meteo_80188344(Boss*); +void Meteo_801887D0(Boss*); +void Meteo_80188CAC(Effect*); +void Meteo_80188FAC(Effect*); +void Meteo_80189114(Effect*); +void Meteo_8018978C(Boss*); +void Meteo_8018BACC(Boss*); +void Meteo_8018D9EC(Actor*); +void Meteo_8018DA6C(Actor*); +void Meteo_8018DAEC(Actor*); +void Meteo_8018DB6C(Actor*); +void Meteo_8018DBEC(Effect*); +void Meteo_8018DCE4(Effect*); +void Meteo_8018DE14(Effect*); +void SectorX_8018F330(Actor*); +void SectorX_8018F884(Actor*); +void SectorX_8018FE38(Boss*); +void SectorX_8018FF20(Boss*); +void SectorX_8018FF84(Boss*); +void SectorX_80190020(Boss*); +void SectorX_80190078(Boss*); +void SectorX_80193434(Boss*); #endif diff --git a/include/i3.h b/include/i3.h index b9fa4dbf..f978e6b4 100644 --- a/include/i3.h +++ b/include/i3.h @@ -8,147 +8,147 @@ #include "sf64player.h" #include "sf64mesg.h" -// extern f32 D_i3_801C4188; Currently externed in relevant files for bss ordering +extern f32 D_AQ_801C4188; -void func_i3_801BE034(Actor*); +void Aquas_801BE034(Actor*); -void func_i3_8018DA58(Actor*); -void func_i3_8019E5F0(Actor*); -void func_i3_801A8BE8(Actor*); -void func_i3_801AB9B0(Player*); -void func_i3_801BE0F0(Actor*); +void Area6_8018DA58(Actor*); +void Zoness_8019E5F0(Actor*); +void Solar_801A8BE8(Actor*); +void Aquas_801AB9B0(Player*); +void Aquas_801BE0F0(Actor*); -void func_i3_80187520(s32, void*); -void func_i3_80187754(Boss *); -void func_i3_80187944(Boss*); -void func_i3_8018C54C(Boss*); -void func_i3_8018DF74(Player *player); -void func_i3_8018ED78(Player*); +void OvlI3_CallFunction(s32, void*); +void Area6_80187754(Boss *); +void Area6_80187944(Boss*); +void Area6_8018C54C(Boss*); +void Area6_8018DF74(Player *player); +void Area6_8018ED78(Player*); -void func_i3_801900FC(Vec3f*, Vec3f*, f32, f32, f32, s32, f32, s32, s32); -void func_i3_80190430(Actor* actor); -void func_i3_801904CC(Actor* actor); -void func_i3_80190A00(Actor* actor); -void func_i3_80190F08(Actor* actor); -void func_i3_80191010(Actor* actor); -void func_i3_801914C4(Actor* actor); -void func_i3_801915A4(Actor* actor); -void func_i3_80191680(Actor* actor); -void func_i3_80191B4C(Actor* actor); -void func_i3_80191BB8(Actor* actor); -void func_i3_80191BC4(Actor* actor); -void func_i3_80191DB0(Actor* actor); -void func_i3_80191DB0(Actor* actor); -void func_i3_80191FFC(Actor* actor); -void func_i3_80192094(Actor* actor); -void func_i3_80192834(Actor* actor); -void func_i3_80192C18(Actor* actor); -void func_i3_80192E64(Actor* actor); -void func_i3_80193240(Actor* actor); -void func_i3_801932AC(Boss* bossZO); -void func_i3_801949DC(Boss* bossZO); -void func_i3_80194A84(Boss* bossZO); -void func_i3_8019969C(Actor* actor); -void func_i3_8019983C(Actor* actor); -void func_i3_80199A28(Actor* actor); -void func_i3_80199E24(Actor* actor); -void func_i3_80199F10(Actor* actor); -void func_i3_8019A1FC(Actor* actor); -void func_i3_8019A5D4(Actor* actor); -void func_i3_8019ACCC(Actor* actor); -void func_i3_8019B1F0(Actor* actor); -void func_i3_8019B548(Actor* actor); -void func_i3_8019B7DC(Actor* actor); -void func_i3_8019B810(Actor* actor); -void func_i3_8019B854(Actor* actor); -void func_i3_8019BDE0(Actor* actor); -void func_i3_8019BE48(Actor* actor); -void func_i3_8019C1CC(Actor* actor); -void func_i3_8019C200(Actor* actor); -void func_i3_8019C454(Actor* actor); -void func_i3_8019C83C(Actor* actor); -void func_i3_8019CBEC(Actor* actor); -void func_i3_8019CE58(Actor* actor); -void func_i3_8019D060(Actor* actor); -void func_i3_8019D15C(Actor* actor); -void func_i3_8019D3C4(Actor* actor); -void func_i3_8019D428(Player* player); -void func_i3_8019D76C(Player* player); +void Zoness_801900FC(Vec3f*, Vec3f*, f32, f32, f32, s32, f32, s32, s32); +void Zoness_80190430(Actor* actor); +void Zoness_801904CC(Actor* actor); +void Zoness_80190A00(Actor* actor); +void Zoness_80190F08(Actor* actor); +void Zoness_80191010(Actor* actor); +void Zoness_801914C4(Actor* actor); +void Zoness_801915A4(Actor* actor); +void Zoness_80191680(Actor* actor); +void Zoness_80191B4C(Actor* actor); +void Zoness_80191BB8(Actor* actor); +void Zoness_80191BC4(Actor* actor); +void Zoness_80191DB0(Actor* actor); +void Zoness_80191DB0(Actor* actor); +void Zoness_80191FFC(Actor* actor); +void Zoness_80192094(Actor* actor); +void Zoness_80192834(Actor* actor); +void Zoness_80192C18(Actor* actor); +void Zoness_80192E64(Actor* actor); +void Zoness_80193240(Actor* actor); +void Zoness_801932AC(Boss* bossZO); +void Zoness_801949DC(Boss* bossZO); +void Zoness_80194A84(Boss* bossZO); +void Zoness_8019969C(Actor* actor); +void Zoness_8019983C(Actor* actor); +void Zoness_80199A28(Actor* actor); +void Zoness_80199E24(Actor* actor); +void Zoness_80199F10(Actor* actor); +void Zoness_8019A1FC(Actor* actor); +void Zoness_8019A5D4(Actor* actor); +void Zoness_8019ACCC(Actor* actor); +void Zoness_8019B1F0(Actor* actor); +void Zoness_8019B548(Actor* actor); +void Zoness_8019B7DC(Actor* actor); +void Zoness_8019B810(Actor* actor); +void Zoness_8019B854(Actor* actor); +void Zoness_8019BDE0(Actor* actor); +void Zoness_8019BE48(Actor* actor); +void Zoness_8019C1CC(Actor* actor); +void Zoness_8019C200(Actor* actor); +void Zoness_8019C454(Actor* actor); +void Zoness_8019C83C(Actor* actor); +void Zoness_8019CBEC(Actor* actor); +void Zoness_8019CE58(Actor* actor); +void Zoness_8019D060(Actor* actor); +void Zoness_8019D15C(Actor* actor); +void Zoness_8019D3C4(Actor* actor); +void Zoness_8019D428(Player* player); +void Zoness_8019D76C(Player* player); -void func_i3_8019E8B8(f32, f32, f32, f32); -void func_i3_8019E9F4(f32, f32, f32, f32, f32, f32, f32, s32); -void func_i3_8019EA7C(Actor*); -void func_i3_8019F20C(Actor*); -void func_i3_8019F7AC(Actor*); -void func_i3_801A003C(Actor*); -void func_i3_801A0120(Effect*); -void func_i3_801A0AF0(Effect*); -void func_i3_801A10F4(Player* player); -void func_i3_801A5B3C(Boss*); -void func_i3_801A71B8(Boss*); -void func_i3_801A8BE8(Actor*); -void func_i3_801A7930(Player* player); +void Solar_8019E8B8(f32, f32, f32, f32); +void Solar_8019E9F4(f32, f32, f32, f32, f32, f32, f32, s32); +void Solar_8019EA7C(Actor*); +void Solar_8019F20C(Actor*); +void Solar_8019F7AC(Actor*); +void Solar_801A003C(Actor*); +void Solar_801A0120(Effect*); +void Solar_801A0AF0(Effect*); +void Solar_801A10F4(Player* player); +void Solar_801A5B3C(Boss*); +void Solar_801A71B8(Boss*); +void Solar_801A8BE8(Actor*); +void Solar_801A7930(Player* player); -void func_i3_801A9824(void); -void func_i3_801AA20C(void); -void func_i3_801AA8E8(Player*); -void func_i3_801AACF8(Player*); -void func_i3_801ABA40(PlayerShot*); -void func_i3_801AC274(Player*); -void func_i3_801AC8A8(f32, f32, f32, f32, s32); -void func_i3_801AC918(Effect*); -void func_i3_801ACBB4(Player*); -void func_i3_801ACE50(Player*); -void func_i3_801AD328(Player*); -void func_i3_801AD688(Actor *); -void func_i3_801AD6C0(Actor*); -void func_i3_801AE168(Actor*); -void func_i3_801AE3AC(Actor *); -void func_i3_801AE3D8(Actor*); -void func_i3_801AEB44(Actor*); -void func_i3_801AF9FC(Actor *); -void func_i3_801AFA5C(Actor*); -void func_i3_801B099C(Actor*); -void func_i3_801B0B60(Actor*); -void func_i3_801B0EC0(Actor*); -void func_i3_801B10F8(Boss*); -void func_i3_801B134C(Boss*); -void func_i3_801B4D84(Boss*); -void func_i3_801B504C(Actor*); -void func_i3_801B50E8(Actor*); -void func_i3_801B619C(Actor*); -void func_i3_801B6344(Actor *); -void func_i3_801B638C(Actor*); -void func_i3_801B6E54(Actor *); -void func_i3_801B6FF8(Actor*); -void func_i3_801B7A24(Actor*); -void func_i3_801B7AF0(Actor *); -void func_i3_801B7C78(Actor*); -void func_i3_801B90DC(Actor*); -void func_i3_801B91A4(Actor*); -void func_i3_801BA108(Actor*); -void func_i3_801BA26C(Actor*); -void func_i3_801BA4E4(Actor*); -void func_i3_801BA57C(Actor *); -void func_i3_801BA6A4(Actor*); -void func_i3_801BAD7C(Actor*); -void func_i3_801BADF8(Actor*); -void func_i3_801BB204(Actor*); -void func_i3_801BB26C(Actor *); -void func_i3_801BB79C(Actor*); -void func_i3_801BC930(Actor*); -void func_i3_801BC9A0(Actor*); -void func_i3_801BD264(Actor*); -void func_i3_801BD54C(Actor*); -void func_i3_801BDE6C(Actor*); -void func_i3_801BDF14(void); -void func_i3_801BE1FC(Object_80*); -void func_i3_801BE3F8(Actor*); -void func_i3_801BEB1C(Actor*); -void func_i3_801BEC50(Boss*); -void func_i3_801BEC5C(Boss*); -void func_i3_801BEC68(Actor*); -void func_i3_801BEC74(Actor*); -void func_i3_801BEC80(Player*); +void Aquas_801A9824(void); +void Aquas_801AA20C(void); +void Aquas_801AA8E8(Player*); +void Aquas_801AACF8(Player*); +void Aquas_801ABA40(PlayerShot*); +void Aquas_801AC274(Player*); +void Aquas_801AC8A8(f32, f32, f32, f32, s32); +void Aquas_801AC918(Effect*); +void Aquas_801ACBB4(Player*); +void Aquas_801ACE50(Player*); +void Aquas_801AD328(Player*); +void Aquas_801AD688(Actor *); +void Aquas_801AD6C0(Actor*); +void Aquas_801AE168(Actor*); +void Aquas_801AE3AC(Actor *); +void Aquas_801AE3D8(Actor*); +void Aquas_801AEB44(Actor*); +void Aquas_801AF9FC(Actor *); +void Aquas_801AFA5C(Actor*); +void Aquas_801B099C(Actor*); +void Aquas_801B0B60(Actor*); +void Aquas_801B0EC0(Actor*); +void Aquas_801B10F8(Boss*); +void Aquas_801B134C(Boss*); +void Aquas_801B4D84(Boss*); +void Aquas_801B504C(Actor*); +void Aquas_801B50E8(Actor*); +void Aquas_801B619C(Actor*); +void Aquas_801B6344(Actor *); +void Aquas_801B638C(Actor*); +void Aquas_801B6E54(Actor *); +void Aquas_801B6FF8(Actor*); +void Aquas_801B7A24(Actor*); +void Aquas_801B7AF0(Actor *); +void Aquas_801B7C78(Actor*); +void Aquas_801B90DC(Actor*); +void Aquas_801B91A4(Actor*); +void Aquas_801BA108(Actor*); +void Aquas_801BA26C(Actor*); +void Aquas_801BA4E4(Actor*); +void Aquas_801BA57C(Actor *); +void Aquas_801BA6A4(Actor*); +void Aquas_801BAD7C(Actor*); +void Aquas_801BADF8(Actor*); +void Aquas_801BB204(Actor*); +void Aquas_801BB26C(Actor *); +void Aquas_801BB79C(Actor*); +void Aquas_801BC930(Actor*); +void Aquas_801BC9A0(Actor*); +void Aquas_801BD264(Actor*); +void Aquas_801BD54C(Actor*); +void Aquas_801BDE6C(Actor*); +void Aquas_801BDF14(void); +void Aquas_801BE1FC(Object_80*); +void Aquas_801BE3F8(Actor*); +void Aquas_801BEB1C(Actor*); +void Aquas_801BEC50(Boss*); +void Aquas_801BEC5C(Boss*); +void Aquas_801BEC68(Actor*); +void Aquas_801BEC74(Actor*); +void Aquas_801BEC80(Player*); #endif diff --git a/include/i4.h b/include/i4.h index 2c9f51a4..cce7fc58 100644 --- a/include/i4.h +++ b/include/i4.h @@ -8,46 +8,47 @@ #include "sf64player.h" #include "sf64mesg.h" -extern Matrix D_i4_8019EE80; +extern s32 D_BO_801A03DC; +extern Matrix D_BO_8019EE80; -void func_i4_8018EF6C(Player*); -void func_i4_8018F94C(Player*); -void func_i4_80192E20(Player*); -void func_i4_80197290(Player*); -void func_i4_80197F10(Actor*); -void func_i4_8019BA64(Player*); -void func_i4_8019C85C(Player*); -void func_i4_8019DD20(Actor*); +void Bolse_8018EF6C(Player*); +void Bolse_8018F94C(Player*); +void Katina_80192E20(Player*); +void Katina_80197290(Player*); +void Katina_80197F10(Actor*); +void SectorZ_8019BA64(Player*); +void SectorZ_8019C85C(Player*); +void SectorZ_8019DD20(Actor*); -void func_i4_80187520(u32, void*); -void func_i4_80187960(Actor*); -void func_i4_8018BA2C(void); -void func_i4_8018C158(Actor*); -void func_i4_80191ED8(void); -void func_i4_80192264(void); -void func_i4_80193CA4(Boss *); -void func_i4_80198594(Actor*); -void func_i4_80198930(void); -void func_i4_80199900(Actor *, s32); -void func_i4_80199C60(Actor*); -void func_i4_8019AB8C(Actor*); -void func_i4_8019EA68(void); +void OvlI4_CallFunction(u32, void*); +void Fortuna_80187960(Actor*); +void Fortuna_8018BA2C(void); +void Bolse_8018C158(Actor*); +void Bolse_80191ED8(void); +void Bolse_80192264(void); +void Katina_80193CA4(Boss *); +void Katina_80198594(Actor*); +void Katina_80198930(void); +void SectorZ_80199900(Actor *, s32); +void SectorZ_80199C60(Actor*); +void SectorZ_8019AB8C(Actor*); +void SectorZ_8019EA68(void); -void func_i4_80188AD0(Actor*); -void func_i4_80188FE4(Actor*); -void func_i4_80191054(Effect*); -void func_i4_80191180(Effect*); -void func_i4_801912FC(Boss*); -void func_i4_80191AFC(Boss*); -void func_i4_80192984(Effect*); -void func_i4_80192A68(Effect*); -void func_i4_80193718(Boss*); -void func_i4_80193B1C(Boss*); -void func_i4_801946C4(Boss*); -void func_i4_801968F4(Boss*); -void func_i4_8019E234(Actor*); -void func_i4_8019E3A8(Actor*); -void func_i4_8019E454(Boss*); -void func_i4_8019E98C(Boss*); +void Fortuna_80188AD0(Actor*); +void Fortuna_80188FE4(Actor*); +void Bolse_80191054(Effect*); +void Bolse_80191180(Effect*); +void Bolse_801912FC(Boss*); +void Bolse_80191AFC(Boss*); +void Katina_80192984(Effect*); +void Katina_80192A68(Effect*); +void Katina_80193718(Boss*); +void Katina_80193B1C(Boss*); +void Katina_801946C4(Boss*); +void Katina_801968F4(Boss*); +void SectorZ_8019E234(Actor*); +void SectorZ_8019E3A8(Actor*); +void SectorZ_8019E454(Boss*); +void SectorZ_8019E98C(Boss*); #endif diff --git a/include/i5.h b/include/i5.h index b491d294..2d2ebdb7 100644 --- a/include/i5.h +++ b/include/i5.h @@ -8,145 +8,127 @@ #include "sf64player.h" #include "sf64mesg.h" -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; -void func_i5_8018769C(Player*); -void func_i5_801882CC(Player*); -void func_i5_801AC754(Player*); -void func_i5_801AF8F4(Player*); -void func_i5_801B28BC(Actor*); -void func_i5_801B3D04(Player*); +extern Gfx* D_TI_801B7584[]; +extern Gfx* D_TI_801B7608[]; +extern Gfx* D_TI_801B769C[]; +extern f32 D_TI_801B83A8[]; +extern u8 D_MA_801BA1E8; +extern f32 D_MA_801BE250[40]; +extern s16 D_MA_801BE2F0[9]; -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(void); -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); -s32 func_i5_801B6E20(f32, f32, f32 *, f32 *, f32 *); -void func_i5_801AD144(PlayerShot*); -void func_i5_80189120(f32, f32, f32, f32, f32); -bool func_i5_801A3C20(f32); -s32 func_i5_801A3300(Player*, f32, f32); -s32 func_i5_801A3790(Player*, f32, f32); +void Titania_8018769C(Player*); +void Titania_801882CC(Player*); +void Macbeth_801AC754(Player*); +void Macbeth_801AF8F4(Player*); +void Macbeth_801B28BC(Actor*); +void Macbeth_801B3D04(Player*); -void func_i5_80188F60(Effect*); -void func_i5_80188FA8(Effect*); -void func_i5_80189194(Actor*); -void func_i5_801895B8(Actor*); -void func_i5_80189AFC(Actor*); -void func_i5_80189CC8(Actor*); -void func_i5_8018A1C0(Actor*); -void func_i5_8018A544(Actor*); -void func_i5_8018AABC(Actor*); -void func_i5_8018AB44(Actor*); -void func_i5_8018B268(Actor*); -void func_i5_8018B6AC(Actor*); -void func_i5_8018B9D0(Actor*); -void func_i5_8018BE84(Actor*); -void func_i5_8018C8A8(Actor*); -void func_i5_8018E2D8(Actor*); -void func_i5_8018E54C(Actor*); -void func_i5_8018E5B4(Actor*); -void func_i5_8018E5F8(Actor*); -void func_i5_8018EF14(Actor*); -void func_i5_8018F038(Object_4C*); -void func_i5_8018F4D8(Object_80*); -void func_i5_8018F8B8(Object_80*); -void func_i5_80197A94(Boss*); -void func_i5_801982A8(Boss*); -void func_i5_8019C778(Actor*); -void func_i5_8019CE88(Actor*); -void func_i5_8019D700(Actor*); -void func_i5_8019E410(Actor*); -void func_i5_8019EA60(Actor*); -void func_i5_8019EE68(Actor*); -void func_i5_8019FF9C(Actor*); -void func_i5_801A0BD8(Object_80*); -void func_i5_801A12C4(Actor*); -void func_i5_801A23AC(Object_80*); -void func_i5_801A2A78(Object_80*); -void func_i5_801A2B24(Object_80*); -void func_i5_801A2DD8(Object_80*); -void func_i5_801A3240(Object_80*); -void func_i5_801A3E98(Actor*); -void func_i5_801A43BC(Actor*); -void func_i5_801A46A0(Actor*); -void func_i5_801A4A64(Actor*); -void func_i5_801A4B24(Actor*); -void func_i5_801A54E8(Actor*); -void func_i5_801A57D0(Effect*); -void func_i5_801A5AF0(Effect*); -void func_i5_801A5B4C(Effect*); -void func_i5_801A5D68(Effect*); -void func_i5_801A5E54(Actor*); -void func_i5_801A5F90(Actor*); -void func_i5_801A5FD0(Actor*); -void func_i5_801A6100(Actor*); -void func_i5_801A6144(Actor*); -void func_i5_801A6540(Actor*); -void func_i5_801A6608(Object_80*); -void func_i5_801A67C8(Actor*); -void func_i5_801A68EC(Actor*); -void func_i5_801A7E7C(Actor*); -void func_i5_801AC294(Actor*); -void func_i5_801AC438(Actor*); -void func_i5_801AD6F0(Actor*); -void func_i5_801ADAC8(Actor*); -void func_i5_801ADD68(Actor*); -void func_i5_801AE2C0(Actor*); -void func_i5_801AE87C(Effect*); -void func_i5_801AEAA0(Effect*); -void func_i5_801AEC04(Actor*); -void func_i5_801AEEFC(Actor*); -s32 func_i5_801A55D4(s32 , Vec3f* , Vec3f* , s32 ); +void OvlI5_CallFunction(u32 mode, void* ptr); +void Titania_8018769C(Player *); +void Titania_80188F30(void); +void Titania_80189B80(Actor *); +void Titania_8018ADC4(Actor *); +void Titania_8018B720(Actor *); +void Titania_8018B96C(Actor *); +void Titania_8018BFB0(Actor *); +void Titania_8018E3B0(Actor *); +void Titania_8018E3CC(Actor *); +void Titania_8018E5E8(Actor *); +void Titania_8018EFF0(Object_4C *); +void Titania_8018F0D8(Object_80 *); +void Titania_8018FA48(Boss *); +void Titania_801990DC(Boss *); +void Macbeth_80199920(void); +void Macbeth_80199F8C(Actor *); +void Macbeth_801A3E70(Actor *); +void Macbeth_801A4660(Actor *); +void Macbeth_801A4AF8(Actor *); +void Macbeth_801A5E2C(Actor *); +void Macbeth_801A6134(Actor *); +void Macbeth_801A65E0(Object_80 *); +void Macbeth_801A7D98(Actor *); +void Macbeth_801ACFBC(void); +void Macbeth_801AD080(void); +void Ground_801B5110(f32, f32, f32); +void Ground_801B58AC(Gfx **, f32); +bool Ground_801B6AEC(f32, f32, f32); +s32 Ground_801B6E20(f32, f32, f32 *, f32 *, f32 *); +void Macbeth_801AD144(PlayerShot*); +void Titania_80189120(f32, f32, f32, f32, f32); +bool Macbeth_801A3C20(f32); +s32 Macbeth_801A3300(Player*, f32, f32); +s32 Macbeth_801A3790(Player*, f32, f32); -typedef struct { - /* 0x00 */ PosRot unk_00; - /* 0x18 */ u16 unk_18; -} UnkStruct_i5_801BD738; // size = 0x1C - -typedef struct { - /* 0x00 */ PosRot unk_00; - /* 0x18 */ f32 unk_18; - /* 0x1C */ f32 unk_1C; - /* 0x20 */ f32 unk_20; - /* 0x24 */ s16 unk_24; - /* 0x26 */ u16 unk_26; -} UnkStruct_i5_801BBF00; // size = 0x28 - -typedef struct { - s32 unk_00; - s32 unk_04; - Actor* actor; - s32 unk_0C; -} UnkStruct_i5_801B8198; // size = 0x10 +void Titania_80188F60(Effect*); +void Titania_80188FA8(Effect*); +void Titania_80189194(Actor*); +void Titania_801895B8(Actor*); +void Titania_80189AFC(Actor*); +void Titania_80189CC8(Actor*); +void Titania_8018A1C0(Actor*); +void Titania_8018A544(Actor*); +void Titania_8018AABC(Actor*); +void Titania_8018AB44(Actor*); +void Titania_8018B268(Actor*); +void Titania_8018B6AC(Actor*); +void Titania_8018B9D0(Actor*); +void Titania_8018BE84(Actor*); +void Titania_8018C8A8(Actor*); +void Titania_8018E2D8(Actor*); +void Titania_8018E54C(Actor*); +void Titania_8018E5B4(Actor*); +void Titania_8018E5F8(Actor*); +void Titania_8018EF14(Actor*); +void Titania_8018F038(Object_4C*); +void Titania_8018F4D8(Object_80*); +void Titania_8018F8B8(Object_80*); +void Titania_80197A94(Boss*); +void Titania_801982A8(Boss*); +void Macbeth_8019C778(Actor*); +void Macbeth_8019CE88(Actor*); +void Macbeth_8019D700(Actor*); +void Macbeth_8019E410(Actor*); +void Macbeth_8019EA60(Actor*); +void Macbeth_8019EE68(Actor*); +void Macbeth_8019FF9C(Actor*); +void Macbeth_801A0BD8(Object_80*); +void Macbeth_801A12C4(Actor*); +void Macbeth_801A23AC(Object_80*); +void Macbeth_801A2A78(Object_80*); +void Macbeth_801A2B24(Object_80*); +void Macbeth_801A2DD8(Object_80*); +void Macbeth_801A3240(Object_80*); +void Macbeth_801A3E98(Actor*); +void Macbeth_801A43BC(Actor*); +void Macbeth_801A46A0(Actor*); +void Macbeth_801A4A64(Actor*); +void Macbeth_801A4B24(Actor*); +void Macbeth_801A54E8(Actor*); +void Macbeth_801A57D0(Effect*); +void Macbeth_801A5AF0(Effect*); +void Macbeth_801A5B4C(Effect*); +void Macbeth_801A5D68(Effect*); +void Macbeth_801A5E54(Actor*); +void Macbeth_801A5F90(Actor*); +void Macbeth_801A5FD0(Actor*); +void Macbeth_801A6100(Actor*); +void Macbeth_801A6144(Actor*); +void Macbeth_801A6540(Actor*); +void Macbeth_801A6608(Object_80*); +void Macbeth_801A67C8(Actor*); +void Macbeth_801A68EC(Actor*); +void Macbeth_801A7E7C(Actor*); +void Macbeth_801AC294(Actor*); +void Macbeth_801AC438(Actor*); +void Macbeth_801AD6F0(Actor*); +void Macbeth_801ADAC8(Actor*); +void Macbeth_801ADD68(Actor*); +void Macbeth_801AE2C0(Actor*); +void Macbeth_801AE87C(Effect*); +void Macbeth_801AEAA0(Effect*); +void Macbeth_801AEC04(Actor*); +void Macbeth_801AEEFC(Actor*); +s32 Macbeth_801A55D4(s32 , Vec3f* , Vec3f* , s32 ); #endif diff --git a/include/i6.h b/include/i6.h index 6364d40c..774f9a2d 100644 --- a/include/i6.h +++ b/include/i6.h @@ -8,79 +8,66 @@ #include "sf64player.h" #include "sf64mesg.h" -extern f32 D_i6_801A7F40; -extern f32 D_i6_801A7F44; -extern f32 D_i6_801A7F48; -extern f32 D_i6_801A7F4C; -extern f32 D_i6_801A7F50; -extern f32 D_i6_801A7F54; -extern f32 D_i6_801A7F58; -extern f32 D_i6_801A7F5C; -extern f32 D_i6_801A7F60; -extern f32 D_i6_801A7F64; -extern f32 D_i6_801A7F68; -extern f32 D_i6_801A7F6C; -extern f32 D_i6_801A7F70; -extern f32 D_i6_801A7F74; -extern f32 D_i6_801A7F78; -extern f32 D_i6_801A7F7C; -extern Vec3f D_i6_801A7F80[100]; -extern f32 D_i6_801A8430; +extern f32 D_Andross_801A7F58; +extern f32 D_Andross_801A7F60; +extern f32 D_Andross_801A7F68; +extern f32 D_Andross_801A7F70; +extern f32 D_Andross_801A7F78; -void func_i6_80187530(Actor*); -void func_i6_80193C4C(Player*); -void func_i6_80195E44(Actor*); -void func_i6_80196BF8(Player*); -void func_i6_80196D88(Player*); -void func_i6_8019EE60(Player*); -void func_i6_8019FF00(Actor*); -void func_i6_801A0AC0(Player*); +void Andross_80187530(Actor*); +void Andross_80193C4C(Player*); +void Andross_80195E44(Actor*); +void Venom2_80196BF8(Player*); +void Venom2_80196D88(Player*); +void SectorY_8019EE60(Player*); +void SectorY_8019FF00(Actor*); +void SectorY_801A0AC0(Player*); -void func_i6_8018769C(Actor*); -void func_i6_80187520(u32 mode, void* ptr); -void func_i6_801878A8(void); -void func_i6_801888F4(Actor *); -void func_i6_80189214(void); -void func_i6_8018BDD8(void); -void func_i6_8018C390(Player*); -void func_i6_8018D16C(Boss *); -void func_i6_801961AC(void); -void func_i6_80196314(Actor*); -void func_i6_80196968(void); -void func_i6_80197CC4(Boss *); -void func_i6_801A3BD4(Actor*); -void func_i6_801A4CB0(Actor*); -void func_i6_801A5AD4(Player*); -void func_i6_801A5FC0(Player*); -void func_i6_801A6164(Player *); +void Andross_8018769C(Actor*); +void OvlI6_CallFunction(u32 mode, void* ptr); +void Andross_801878A8(void); +void Andross_801888F4(Actor *); +void Andross_80189214(void); +void Andross_8018BDD8(void); +void Andross_8018C390(Player*); +void Andross_8018D16C(Boss *); +void Andross_801961AC(void); +void Venom2_80196314(Actor*); +void Venom2_80196968(void); +void SectorY_80197CC4(Boss *); +void SectorY_801A3BD4(Actor*); +void SectorY_801A4CB0(Actor*); +void Turret_801A5AD4(Player*); +void Turret_801A5FC0(Player*); +void Turret_801A6164(Player *); -void func_i6_801880E4(Actor*); -void func_i6_80188448(Actor*); -void func_i6_80188528(Actor*); -void func_i6_80188660(Actor*); -void func_i6_8018933C(Actor*); -void func_i6_801893B8(Actor*); -void func_i6_80189470(Actor*); -void func_i6_80189724(Actor*); -void func_i6_80189B70(Boss*); -void func_i6_8018B8C0(Boss*); -void func_i6_8018CAD4(Effect*); -void func_i6_8018CF98(Effect*); -void func_i6_8018DBF0(Boss*); -void func_i6_801928C8(Boss*); -void func_i6_80192E94(Actor*); -void func_i6_80193244(Actor*); -void func_i6_80193380(Object_80*); -void func_i6_8019350C(Object_80*); -void func_i6_8019356C(Object_80*); -void func_i6_801935D4(Object_80*); -void func_i6_80196210(Boss*); -void func_i6_80196288(Boss*); -void func_i6_80197C64(Effect*); -void func_i6_80197CB8(Object_80*); -void func_i6_8019C888(Boss*); -void func_i6_8019E2C4(Boss*); -void func_i6_801A4E44(Object_80*); -void func_i6_801A52B8(Object_80*); +void Andross_801880E4(Actor*); +void Andross_80188448(Actor*); +void Andross_80188528(Actor*); +void Andross_80188660(Actor*); +void Andross_8018933C(Actor*); +void Andross_801893B8(Actor*); +void Andross_80189470(Actor*); +void Andross_80189724(Actor*); +void Andross_80189B70(Boss*); +void Andross_8018B8C0(Boss*); +void Andross_8018CAD4(Effect*); +void Andross_8018CF98(Effect*); +void Andross_8018DBF0(Boss*); +void Andross_801928C8(Boss*); +void Andross_80192E94(Actor*); +void Andross_80193244(Actor*); +void Andross_80193380(Object_80*); +void Andross_8019350C(Object_80*); +void Andross_8019356C(Object_80*); +void Andross_801935D4(Object_80*); +void Venom2_80196210(Boss*); +void Venom2_80196288(Boss*); +void SectorY_80197C64(Effect*); +void SectorY_80197CB8(Object_80*); +void SectorY_8019C888(Boss*); +void SectorY_8019E2C4(Boss*); +void SectorY_801A4E44(Object_80*); +void SectorY_801A52B8(Object_80*); #endif diff --git a/include/sf64audio_provisional.h b/include/sf64audio_provisional.h index dacc5d68..02d2fe4e 100644 --- a/include/sf64audio_provisional.h +++ b/include/sf64audio_provisional.h @@ -1196,7 +1196,13 @@ void AudioThread_ResetAudioHeap(s32); void AudioThread_PreNMIReset(void); void AudioThread_Init(void); - +extern AudioTable gSampleBankTableInit; +// extern AudioTableEntry gSampleBankTableInitEntries[]; +extern AudioTable gSeqTableInit; +// extern AudioTableEntry gSeqTableInitEntries[]; +extern AudioTable gSoundFontTableInit; +// extern AudioTableEntry gSoundFontTableInitEntries[]; +extern u8 gSeqFontTableInit[]; extern u8 gSamplesPerWavePeriod[4]; diff --git a/include/sf64mesg.h b/include/sf64mesg.h index 81c232f9..924ba659 100644 --- a/include/sf64mesg.h +++ b/include/sf64mesg.h @@ -100,8 +100,8 @@ typedef enum RadioCharacterId { } RadioCharacterId; void Radio_PlayMessage(u16*, enum RadioCharacterId); -void func_800BB388(void); -void func_800BB5D0(void); +void func_radio_800BB388(void); +void func_radio_800BB5D0(void); typedef enum { MSGCHAR_END, diff --git a/include/sf64object.h b/include/sf64object.h index 1c2db480..443168e8 100644 --- a/include/sf64object.h +++ b/include/sf64object.h @@ -701,7 +701,7 @@ typedef enum ObjectId { #define OBJ_UNK_1000 1000 -Actor* func_800A3608(ObjectId); +Actor* func_game_800A3608(ObjectId); // template enums for boss work buffers diff --git a/include/sys.h b/include/sys.h index 190f3b97..7686ec02 100644 --- a/include/sys.h +++ b/include/sys.h @@ -40,23 +40,23 @@ s32 vsprintf(char* dst, const char* fmt, va_list args); void Game_Initialize(void); void Game_Update(void); -extern s32 D_800D2860[]; -extern s32 D_800D2870; +extern s32 D_game_800D2860[]; +extern s32 D_game_800D2870; -extern f32 D_80161A10; -extern f32 D_80161A14; +extern f32 D_game_80161A10; +extern f32 D_game_80161A14; extern s32 gPlayerInactive[4]; -extern s32 D_80161A28; -extern u8 D_80161A2C; -extern u16 D_80161A2E; +extern s32 D_game_80161A28; +extern u8 D_game_80161A2C; +extern u16 D_game_80161A2E; extern u16 gNextLevel; extern u16 gNextGameState; -extern u16 D_80161A34; +extern u16 D_game_80161A34; extern u16 gBgColor; extern u8 gBlurAlpha; -extern u8 D_80161A39; -extern f32 D_80161A3C; -extern f32 D_80161A40; -extern f32 D_80161A44; +extern u8 D_game_80161A39; +extern f32 D_game_80161A3C; +extern f32 D_game_80161A40; +extern f32 D_game_80161A44; #endif diff --git a/include/variables.h b/include/variables.h index e03cbbfd..43bd51a7 100644 --- a/include/variables.h +++ b/include/variables.h @@ -8,235 +8,187 @@ #include "sf64player.h" // fox_360 -extern s32 D_800C9B4C; +extern s32 D_360_800C9B4C; // fox_bg -extern u16 D_800C9C3C[16]; +extern u16 D_bg_800C9C3C[16]; + +// fox_boss +extern s32 D_boss_800C9E90[]; // fox_tank -extern Vec3f D_800C9F2C; +extern Vec3f D_tank_800C9F2C; // fox_display -extern s32 D_800CA220; -extern f32 D_800CA230; -extern Actor* D_800CA234; -extern s32 D_Timer_800CA238; +extern s32 D_display_800CA220; +extern f32 D_display_800CA230; +extern Actor* D_display_800CA234; +extern s32 D_display_Timer_800CA238; // fox_edata -extern f32 D_800CBE70[]; -extern f32 D_800CBE8C[]; -extern f32 D_800CBEA8[]; -extern f32 D_800CBEC4[]; -extern f32 D_800CBEE0[]; -extern f32 D_800CBEFC[]; -extern f32 D_800CBF18[]; -extern f32 D_800CBF34[]; -extern f32 D_800CBF38[]; -extern f32 D_800CBF54[]; -extern f32 D_800CBF70[]; -extern f32 D_800CBF8C[]; -extern f32 D_800CBFA8[]; -extern f32 D_800CBFC8[]; -extern f32 D_800CBFE4[]; -extern f32 D_800CC000[]; -extern f32 D_800CC01C[]; -extern f32 D_800CC038[]; -extern f32 D_800CC054[]; -extern f32 D_800CC070[]; -extern f32 D_800CC0D4[]; -extern f32 D_800CC0F0[]; -extern ObjectInfo D_800CC124[]; +extern f32 D_edata_800CBE70[]; +extern f32 D_edata_800CBE8C[]; +extern f32 D_edata_800CBEA8[]; +extern f32 D_edata_800CBEC4[]; +extern f32 D_edata_800CBEE0[]; +extern f32 D_edata_800CBEFC[]; +extern f32 D_edata_800CBF18[]; +extern f32 D_edata_800CBF34[]; +extern f32 D_edata_800CBF38[]; +extern f32 D_edata_800CBF54[]; +extern f32 D_edata_800CBF70[]; +extern f32 D_edata_800CBF8C[]; +extern f32 D_edata_800CBFA8[]; +extern f32 D_edata_800CBFC8[]; +extern f32 D_edata_800CBFE4[]; +extern f32 D_edata_800CC000[]; +extern f32 D_edata_800CC01C[]; +extern f32 D_edata_800CC038[]; +extern f32 D_edata_800CC054[]; +extern f32 D_edata_800CC070[]; +extern f32 D_edata_800CC0D4[]; +extern f32 D_edata_800CC0F0[]; +extern ObjectInfo D_edata_800CC124[]; +extern f32* D_edata_800CF964[]; // fox_edisplay -extern f32 D_800CF9B0[]; -extern Gfx* D_800CFA54[]; -extern Gfx* D_800CFAC4[]; -extern Gfx* D_800CFADC[]; -extern Gfx* D_800CFB08[]; -extern Gfx* D_800CFB14[]; -extern Gfx* D_800CFB28[]; -extern Gfx* D_800CFB40[]; -extern Gfx* D_800CFB64[]; -extern Gfx* D_800CFB88[]; -extern Gfx* D_800CFBA8[]; -extern Gfx* D_800CFBE4[]; -extern Gfx* D_800CFC0C[]; -extern Gfx* D_800CFC40[]; -extern Gfx* D_800CFC50[]; -extern Gfx* D_800CFC64[]; -extern Gfx* D_800CFC7C[]; -extern f32* D_800CF964[]; -extern f32 D_800CFCA0[]; -extern f32 D_800CFCCC[]; -extern Gfx D_800CFD80[]; +extern f32 D_edisplay_800CF9B0[]; +extern Gfx* D_edisplay_800CFA54[]; +extern Gfx* D_edisplay_800CFAC4[]; +extern Gfx* D_edisplay_800CFADC[]; +extern Gfx* D_edisplay_800CFB08[]; +extern Gfx* D_edisplay_800CFB14[]; +extern Gfx* D_edisplay_800CFB28[]; +extern Gfx* D_edisplay_800CFB40[]; +extern Gfx* D_edisplay_800CFB64[]; +extern Gfx* D_edisplay_800CFB88[]; +extern Gfx* D_edisplay_800CFBA8[]; +extern Gfx* D_edisplay_800CFBE4[]; +extern Gfx* D_edisplay_800CFC0C[]; +extern Gfx* D_edisplay_800CFC40[]; +extern Gfx* D_edisplay_800CFC50[]; +extern Gfx* D_edisplay_800CFC64[]; +extern Gfx* D_edisplay_800CFC7C[]; +extern f32 D_edisplay_800CFCA0[]; +extern f32 D_edisplay_800CFCCC[]; +extern Gfx D_edisplay_800CFD80[]; // fox_enmy -extern ObjectInit* D_800CFDA0[]; -extern s32 D_800CFDF4[]; -extern f32 D_800CFE5C[]; -extern Vec3f D_800CFEC4[6]; -extern Vec3f D_800CFF0C[6]; -extern u32 D_800CFF54[9]; +extern ObjectInit* D_enmy_800CFDA0[]; +extern u32 D_enmy_800CFF54[9]; -// fox_6B3B0 -extern s32 D_800CFF80[4]; -extern s32 D_800CFF90; -extern s16 D_800CFF94[]; -extern u8 D_800CFFB4[]; -extern f32 D_800CFFC4[]; +// fox_enmy2 +extern s32 D_enmy2_800CFF80[4]; +extern s32 D_enmy2_800CFF90; // fox_hud -extern s16 D_800D1970; -extern f32 D_800D19AC[]; -extern f32 D_800D19E0[]; -extern Gfx D_800D1A40[]; -extern s32 D_800D1EB4; -extern s32 D_800D1EB8; -extern s32 D_800D1EBC; -extern s32 D_800D20D8; -extern s32 D_800D2180[]; -extern s32 D_800D2190[]; -extern f32 D_800D21A0; -extern f32 D_800D21A4; +extern s16 D_hud_800D1970; // fox_A4290 extern CollisionHeader D_800D2B38[]; extern CollisionHeader2 D_800D2CA0[]; // fox_play -extern u8 D_800D2F68; -extern u8 D_800D3180[30]; +extern u8 D_play_800D2F68; +extern u8 D_play_800D3180[30]; // fox_radio extern s32 gCurrentMsgPri; // fox_360 -extern s32 D_8015F900; -extern s32 D_8015F904; -extern s16 D_8015F908; -extern s32 D_8015F90C; -extern s32 D_8015F910; -extern f32 D_8015F914; -extern f32 D_8015F918; -extern f32 D_8015F91C; -extern u8 D_8015F920; -extern u8 D_8015F921; -extern s32 D_8015F924; -extern s32 D_8015F928; -extern s32 D_8015F930[3]; -extern s32 D_8015F93C; -extern s32 D_8015F940; -extern f32 D_8015F944; +extern s32 D_360_8015F900; +extern s32 D_360_8015F904; +extern s16 D_360_8015F908; +extern s32 D_360_8015F90C; +extern s32 D_360_8015F910; +extern f32 D_360_8015F914; +extern f32 D_360_8015F918; +extern f32 D_360_8015F91C; +extern u8 D_360_8015F920; +extern u8 D_360_8015F921; +extern s32 D_360_8015F924; +extern s32 D_360_8015F928; +extern s32 D_360_8015F930[3]; +extern s32 D_360_8015F93C; +extern s32 D_360_8015F940; +extern f32 D_360_8015F944; // fox_bg -extern f32 D_8015F960; -extern u8 D_8015F964; -extern f32 D_8015F968; -extern f32 D_8015F96C; -extern f32 D_8015F970; -extern s32 D_8015F974; -extern s32 D_8015F978; -extern s32 D_8015F97C; -extern s32 D_8015F980; -extern f32 D_8015F984; +extern f32 D_bg_800C9C30; +extern u16 D_bg_800C9C34; +extern f32 D_bg_8015F960; +extern u8 D_bg_8015F964; +extern f32 D_bg_8015F968; +extern f32 D_bg_8015F96C; +extern f32 D_bg_8015F970; +extern s32 D_bg_8015F974; +extern s32 D_bg_8015F978; +extern s32 D_bg_8015F97C; +extern s32 D_bg_8015F980; +extern f32 D_bg_8015F984; // fox_boss extern s32 gBossFrameCount; // fox_display -extern Vec3f D_801613B0[]; -extern Vec3f D_801613E0[]; -extern s16 D_80161410; -extern Matrix D_80161418[4]; -extern Vec3f D_80161518[4]; -extern Vec3f D_80161548[4]; -extern Vec3f D_80161578[4]; -extern f32 D_801615A8[4]; -extern f32 D_801615B8[4]; +extern Vec3f D_display_801613B0[]; // static, here for reordering +extern Vec3f D_display_801613E0[]; // static, here for reordering +extern s16 D_display_80161410; +extern Matrix D_display_80161418[]; // static, here for reordering +extern Vec3f D_display_80161518[]; // static, here for reordering +extern Vec3f D_display_80161548[]; // static, here for reordering +extern Vec3f D_display_80161578[]; +extern f32 D_display_801615A8[]; +extern f32 D_display_801615B8[]; // fox_edisplay -extern Vec3f D_801615D0; +extern Vec3f D_edisplay_801615D0; // fox_enmy -extern s32 D_Timer_80161670[4]; -extern s32 D_80161680; -extern u8 D_80161684; +extern s32 D_enmy_Timer_80161670[4]; +extern s32 D_enmy_80161680; +extern u8 D_enmy_80161684; // fox_enmy2 -extern s32 D_80161690; +extern s32 D_enmy2_80161690; // fox_hud -extern s32 D_80161704; -extern s32 D_80161708; -extern s32 D_8016170C; +extern s32 D_hud_80161704; +extern s32 D_hud_80161708; +extern s32 D_hud_8016170C; +extern s32 D_hud_80161710; extern s32 gTotalHits; // 0x80161714 gTotalGameScore -extern f32 D_80161720[3]; -extern s32 D_8016172C; -extern s32 D_80161730; +extern f32 D_hud_80161720[3]; +extern s32 D_hud_8016172C; +extern s32 D_hud_80161730; extern s32 gShowBossHealth; // 0x80161734 // fox_play -extern u8 D_80161A50; -extern f32 D_80161A54; -extern s32 D_80161A58; -extern s32 D_80161A5C; -extern u16 D_Timer_80161A60; -extern u16 D_80161A62; -extern s32 D_80161A64; -extern EnvSettings* sEnvSettings; +extern u8 D_play_80161A50; +extern f32 D_play_80161A54; +extern s32 D_play_80161A58; +extern s32 D_play_80161A5C; +extern u16 D_play_Timer_80161A60; +extern u16 D_play_80161A62; //fox_radio -extern u16** D_80178720; -extern s32 D_80178724; -extern s32 D_80178728; -extern s32 D_8017872C; -extern f32 D_80178730; -extern f32 D_80178734; -extern f32 D_80178738; -extern f32 D_8017873C; -extern f32 D_80178740; -extern s32 D_80178744; -extern s32 D_80178748; -extern s32 D_8017874C; +extern u16** D_radio_80178720; +extern s32 D_radio_80178724; +extern s32 D_radio_80178728; +extern s32 D_radio_8017872C; +extern f32 D_radio_80178730; +extern f32 D_radio_80178734; +extern f32 D_radio_80178738; +extern f32 D_radio_8017873C; +extern f32 D_radio_80178740; // fox_versus -extern s32 D_80178750; -extern s32 D_80178754; -extern s32 D_80178758; +extern s32 D_versus_80178750; +extern s32 D_versus_80178754; +extern s32 D_versus_80178758; extern s32 sUnlockLandmaster; // sUnlockLandmaster extern s32 sUnlockOnFoot; // sUnlockOnFoot -extern s32 D_80178768[]; -extern s32 D_80178768[]; -extern s32 D_80178778; -extern s32 D_80178780[4]; -extern s32 D_80178790; -extern s32 D_80178794; -extern s32 D_80178798; -extern s32 D_8017879C; -extern s32 D_801787A0; -extern s32 D_801787A4; -extern s32 D_801787A8; -extern f32 D_801787AC; -extern f32 D_801787B0; -extern s32 D_801787B4; -extern s32 D_801787B8; -extern s32 D_801787BC; -extern f32 D_801787C0; -extern f32 D_801787C4; -extern f32 D_801787C8; -extern f32 D_801787CC; -extern f32 D_801787D0; -extern f32 D_801787D8[4]; -extern f32 D_801787E8[4]; -extern s32 D_801787F8[4]; -extern u16 D_80178808[4]; -extern s32 D_80178810[4]; -extern s32 D_80178820[4]; -extern s32 D_80178830; -extern s32 D_80178838[5]; -extern s32 D_80178850[4]; -extern OSTime D_80178860; -extern OSTime D_80178868; +extern s32 D_versus_80178768[]; // gfx_data extern u16 D_Unk_800DACB8[][32]; @@ -245,7 +197,8 @@ extern u16 D_Tex_800DBA20[]; extern Gfx D_Gfx_800DBAA0[]; extern Gfx D_Gfx_800DAC20[]; extern Gfx D_Gfx_800D9688[]; - +extern u8 D_Unk_800DB4B8[]; +extern Gfx D_Gfx_800D94D0[]; #endif // VARIABLES_H diff --git a/linker_scripts/us/symbol_addrs.txt b/linker_scripts/us/symbol_addrs.txt index f382003b..ac960417 100644 --- a/linker_scripts/us/symbol_addrs.txt +++ b/linker_scripts/us/symbol_addrs.txt @@ -58,28 +58,28 @@ ast_radio_ROM_END = 0xDF4260; //defined:true D_800C90F0 = 0x800C90F0; D_800C45E0 = 0x800C45E0; -D_801615D0 = 0x801615D0;//size:0xC -D_801615E0 = 0x801615E0;//size:0xC -D_800CFF80 = 0x800CFF80;//size:0x10 +D_edisplay_801615D0 = 0x801615D0;//size:0xC +D_edisplay_801615E0 = 0x801615E0;//size:0xC +D_enmy2_800CFF80 = 0x800CFF80;//size:0x10 -D_80161578 = 0x80161578;//size:0x30 -D_800CA23C = 0x800CA23C;//size:0x18 -D_800CA26C = 0x800CA26C;//size:0x20 +D_display_80161578 = 0x80161578;//size:0x30 +D_display_800CA23C = 0x800CA23C;//size:0x18 +D_display_800CA26C = 0x800CA26C;//size:0x20 D_800CA260 = 0x800CA260;//size:0xC -D_801613E0 = 0x801613E0;//size:0x18 -D_800CC124 = 0x800CC124;//type:u8 -D_800C9E90 = 0x800C9E90;//size:0x70 +D_display_801613E0 = 0x801613E0;//size:0x18 +D_edata_800CC124 = 0x800CC124;//type:u8 +D_boss_800C9E90 = 0x800C9E90;//size:0x70 -D_800D3180 = 0x800D3180; // size:0x20 +D_play_800D3180 = 0x800D3180; // size:0x20 gSetupDLs = 0x800D31B0; // size:0x18C0 -D_800CFCA0 = 0x800CFCA0; +D_edisplay_800CFCA0 = 0x800CFCA0; sControllerMotor = 0x800DD900; // size:0x1A0 D_800CBDD4 = 0x800CBDD4; //size:0x98 -D_800D55D0 = 0x800D55D0; //type:f32 +D_boss_800D55D0 = 0x800D55D0; //type:f32 __libm_qnan_f = 0x800C9570; __floorf = 0x8001FE60; @@ -138,7 +138,7 @@ D_A4000000 = 0xA4000000; D_A5000508 = 0xA5000508; D_A5000510 = 0xA5000510; -D_800CFA54 = 0x800CFA54; +D_edisplay_800CFA54 = 0x800CFA54; D_800D934C = 0x800D934C; // force_migration:True D_800D503C = 0x800D503C; // force_migration:True diff --git a/linker_scripts/us/symbol_addrs_EBFBE0.txt b/linker_scripts/us/symbol_addrs_EBFBE0.txt index f5c81e2d..2cc6611a 100644 --- a/linker_scripts/us/symbol_addrs_EBFBE0.txt +++ b/linker_scripts/us/symbol_addrs_EBFBE0.txt @@ -2,7 +2,7 @@ Option_ExpertSoundUpdate = 0x80195944; // segment:ovl_menu Option_VersusStageInit = 0x80199FA8; // segment:ovl_menu 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 +Map_GetPlanetId = 0x801A6480; // force_migration:True segment:ovl_menu sOptionCardList = 0x801AE638; // type:OptionEntry segment:ovl_menu size:0x240 D_menu_801AE99C = 0x801AE99C; // force_migration:True segment:ovl_menu sTimeTrialMinuteTextures = 0x801AF28C; // force_migration:True segment:ovl_menu diff --git a/linker_scripts/us/symbol_addrs_engine.txt b/linker_scripts/us/symbol_addrs_engine.txt index 84304f7a..f0d08cb3 100644 --- a/linker_scripts/us/symbol_addrs_engine.txt +++ b/linker_scripts/us/symbol_addrs_engine.txt @@ -1,5 +1,5 @@ //fox_display -D_Timer_800CA238 = 0x800CA238; +D_display_Timer_800CA238 = 0x800CA238; //fox_std_lib sSmallChars = 0x800D2660;//type:asciz size:42 @@ -111,17 +111,17 @@ RCP_SetupDL_50 = 0x800BA610; RCP_SetupDL_61 = 0x800BA640; // fox_radio -D_80178720 = 0x80178720; -D_80178724 = 0x80178724; -D_80178728 = 0x80178728; -D_8017872C = 0x8017872C; -D_80178730 = 0x80178730; -D_80178734 = 0x80178734; -D_80178738 = 0x80178738; -D_8017873C = 0x8017873C; -D_80178740 = 0x80178740; -D_80178744 = 0x80178744; -D_80178748 = 0x80178748; +D_radio_80178720 = 0x80178720; +D_radio_80178724 = 0x80178724; +D_radio_80178728 = 0x80178728; +D_radio_8017872C = 0x8017872C; +D_radio_80178730 = 0x80178730; +D_radio_80178734 = 0x80178734; +D_radio_80178738 = 0x80178738; +D_radio_8017873C = 0x8017873C; +D_radio_80178740 = 0x80178740; +D_radio_80178744 = 0x80178744; +D_radio_80178748 = 0x80178748; // fox_versus sUnlockLandmaster = 0x8017875C; @@ -129,12 +129,12 @@ sUnlockOnFoot = 0x80178760; gCurrentMsgPri = 0x800D4A70; -func_800BA760 = 0x800BA760; -func_800BA7BC = 0x800BA7BC; +func_radio_800BA760 = 0x800BA760; +func_radio_800BA7BC = 0x800BA7BC; Radio_PlayMessage = 0x800BA808; -func_800BAAE8 = 0x800BAAE8; -func_800BB388 = 0x800BB388; -func_800BB5D0 = 0x800BB5D0; +func_radio_800BAAE8 = 0x800BAAE8; +func_radio_800BB388 = 0x800BB388; +func_radio_800BB5D0 = 0x800BB5D0; // fox_message gTextCharTextures = 0x80179010; @@ -150,12 +150,14 @@ Message_DisplayScrollingText = 0x800C2D3C; Message_IsPrintingChar = 0x800C2F30; // fox_bg -D_800C9DBC = 0x800C9DBC;//size:39 -D_800C9D94 = 0x800C9D94;//size:39 -D_800C9CC4 = 0x800C9CC4; -D_800C9CF8 = 0x800C9CF8; +D_bg_800C9DBC = 0x800C9DBC;//size:39 +D_bg_800C9D94 = 0x800C9D94;//size:39 +D_bg_800C9CC4 = 0x800C9CC4; +D_bg_800C9CF8 = 0x800C9CF8; // fox_boss +func_boss_8004319C = 0x8004319C; +func_boss_80042EC0 = 0x80042EC0; gBossFrameCount = 0x801613A0; // fox_save @@ -163,49 +165,49 @@ gDefaultSave = 0x800D4D10; gSaveFile = 0x80178870; //size:0x200 // fox_edisplay -func_800596C0 = 0x800596C0; -func_800597C0 = 0x800597C0; +func_edisplay_800596C0 = 0x800596C0; +func_edisplay_800597C0 = 0x800597C0; Graphics_SetScaleMtx = 0x8005980C; -func_80059850 = 0x80059850; -func_800598DC = 0x800598DC; -func_800598E8 = 0x800598E8; -func_800599A4 = 0x800599A4; -func_80059A24 = 0x80059A24; -func_80059AEC = 0x80059AEC; -func_80059B20 = 0x80059B20; -func_80059BB0 = 0x80059BB0; -func_80059BBC = 0x80059BBC; -func_80059BF0 = 0x80059BF0; -func_80059C28 = 0x80059C28; -func_80059C34 = 0x80059C34; -func_80059C40 = 0x80059C40; -func_80059F68 = 0x80059F68; -func_80059FDC = 0x80059FDC; -func_8005A010 = 0x8005A010; -func_8005A07C = 0x8005A07C; -func_8005A088 = 0x8005A088; -func_8005A094 = 0x8005A094; -func_8005ADAC = 0x8005ADAC; -func_8005B1E8 = 0x8005B1E8; -func_8005B388 = 0x8005B388; -func_8005B6A4 = 0x8005B6A4; -func_8005B71C = 0x8005B71C; -func_8005B7CC = 0x8005B7CC; -func_8005B848 = 0x8005B848; -func_8005B9A4 = 0x8005B9A4; -func_8005BA30 = 0x8005BA30; -func_8005BAAC = 0x8005BAAC; -func_8005BAB4 = 0x8005BAB4; -func_8005C5F0 = 0x8005C5F0; -func_8005C900 = 0x8005C900; -func_8005C9C0 = 0x8005C9C0; -func_8005CA80 = 0x8005CA80; -func_8005CB44 = 0x8005CB44; -func_8005CC9C = 0x8005CC9C; -func_8005CDA8 = 0x8005CDA8; -func_8005D008 = 0x8005D008; -func_8005D1F0 = 0x8005D1F0; -func_8005D3CC = 0x8005D3CC; +func_edisplay_80059850 = 0x80059850; +func_edisplay_800598DC = 0x800598DC; +func_edisplay_800598E8 = 0x800598E8; +func_edisplay_800599A4 = 0x800599A4; +func_edisplay_80059A24 = 0x80059A24; +func_edisplay_80059AEC = 0x80059AEC; +func_edisplay_80059B20 = 0x80059B20; +func_edisplay_80059BB0 = 0x80059BB0; +func_edisplay_80059BBC = 0x80059BBC; +func_edisplay_80059BF0 = 0x80059BF0; +func_edisplay_80059C28 = 0x80059C28; +func_edisplay_80059C34 = 0x80059C34; +func_edisplay_80059C40 = 0x80059C40; +func_edisplay_80059F68 = 0x80059F68; +func_edisplay_80059FDC = 0x80059FDC; +func_edisplay_8005A010 = 0x8005A010; +func_edisplay_8005A07C = 0x8005A07C; +func_edisplay_8005A088 = 0x8005A088; +func_edisplay_8005A094 = 0x8005A094; +func_edisplay_8005ADAC = 0x8005ADAC; +func_edisplay_8005B1E8 = 0x8005B1E8; +func_edisplay_8005B388 = 0x8005B388; +func_edisplay_8005B6A4 = 0x8005B6A4; +func_edisplay_8005B71C = 0x8005B71C; +func_edisplay_8005B7CC = 0x8005B7CC; +func_edisplay_8005B848 = 0x8005B848; +func_edisplay_8005B9A4 = 0x8005B9A4; +func_edisplay_8005BA30 = 0x8005BA30; +func_edisplay_8005BAAC = 0x8005BAAC; +func_edisplay_8005BAB4 = 0x8005BAB4; +func_edisplay_8005C5F0 = 0x8005C5F0; +func_edisplay_8005C900 = 0x8005C900; +func_edisplay_8005C9C0 = 0x8005C9C0; +func_edisplay_8005CA80 = 0x8005CA80; +func_edisplay_8005CB44 = 0x8005CB44; +func_edisplay_8005CC9C = 0x8005CC9C; +func_edisplay_8005CDA8 = 0x8005CDA8; +func_edisplay_8005D008 = 0x8005D008; +func_edisplay_8005D1F0 = 0x8005D1F0; +func_edisplay_8005D3CC = 0x8005D3CC; Object_80_Draw = 0x8005D654; Object_4C_Draw = 0x8005D8B8; Actor_Draw2 = 0x8005D954; @@ -214,30 +216,46 @@ Boss_Draw = 0x8005E1B8; Effect_Draw1 = 0x8005E454; Effect_Draw2 = 0x8005E538; Item_Draw = 0x8005E7B8; -func_8005EA24 = 0x8005EA24; -func_8005ECD8 = 0x8005ECD8; -func_8005F030 = 0x8005F030; -func_8005F0E8 = 0x8005F0E8; -func_8005F1EC = 0x8005F1EC; -func_8005F290 = 0x8005F290; +func_edisplay_8005EA24 = 0x8005EA24; +func_edisplay_8005ECD8 = 0x8005ECD8; +func_edisplay_8005F030 = 0x8005F030; +func_edisplay_8005F0E8 = 0x8005F0E8; +func_edisplay_8005F1EC = 0x8005F1EC; +func_edisplay_8005F290 = 0x8005F290; Object_58_Draw = 0x8005F2F4; -func_8005F670 = 0x8005F670; -func_8005F9DC = 0x8005F9DC; +func_edisplay_8005F670 = 0x8005F670; +func_edisplay_8005F9DC = 0x8005F9DC; Object_DrawAll = 0x8005FB70; -func_8006046C = 0x8006046C; -func_80060714 = 0x80060714; -func_8006089C = 0x8006089C; +func_edisplay_8006046C = 0x8006046C; +func_edisplay_80060714 = 0x80060714; +func_edisplay_8006089C = 0x8006089C; TexturedLine_Draw = 0x80060968; -func_80060D94 = 0x80060D94; +func_edisplay_80060D94 = 0x80060D94; // fox_effect BonusText_Display = 0x80077240; +func_effect_8007783C = 0x8007783C; +func_effect_80079618 = 0x80079618; +func_effect_8007A568 = 0x8007A568; +func_effect_8007A6F0 = 0x8007A6F0; +func_effect_8007A900 = 0x8007A900; +func_effect_8007AFD0 = 0x8007AFD0; +func_effect_8007B8F8 = 0x8007B8F8; +func_effect_8007BC7C = 0x8007BC7C; +func_effect_8007BFFC = 0x8007BFFC; +func_effect_8007C120 = 0x8007C120; +func_effect_8007D0E0 = 0x8007D0E0; +func_effect_8007D2C8 = 0x8007D2C8; +func_effect_8007EE68 = 0x8007EE68; +func_effect_800815DC = 0x800815DC; +func_effect_80081A8C = 0x80081A8C; +func_effect_8008377C = 0x8008377C; // fox_enmy -func_80060F30 = 0x80060F30; +func_enmy_80060F30 = 0x80060F30; Object_Kill = 0x80060FBC; -func_80060FE4 = 0x80060FE4; -func_80061148 = 0x80061148; +func_enmy_80060FE4 = 0x80060FE4; +func_enmy_80061148 = 0x80061148; Object_SetInfo = 0x800612B8; Object_80_Initialize = 0x80061364; Object_4C_Initialize = 0x80061394; @@ -250,75 +268,75 @@ Object_4C_Load = 0x800615A0; Actor_Load = 0x8006168C; Boss_Load = 0x80061778; Item_Load = 0x80061864; -func_80061958 = 0x80061958; -func_80061A4C = 0x80061A4C; -func_80061B68 = 0x80061B68; -func_80061CD0 = 0x80061CD0; -func_80061E48 = 0x80061E48; -func_80061F0C = 0x80061F0C; +func_enmy_80061958 = 0x80061958; +func_enmy_80061A4C = 0x80061A4C; +func_enmy_80061B68 = 0x80061B68; +func_enmy_80061CD0 = 0x80061CD0; +func_enmy_80061E48 = 0x80061E48; +func_enmy_80061F0C = 0x80061F0C; Object_Load = 0x80062180; -func_80062568 = 0x80062568; -func_80062664 = 0x80062664; -func_80062B60 = 0x80062B60; -func_80062C38 = 0x80062C38; -func_80062D04 = 0x80062D04; -func_80062DBC = 0x80062DBC; -func_800631A8 = 0x800631A8; -func_8006326C = 0x8006326C; -func_8006351C = 0x8006351C; -func_80063CAC = 0x80063CAC; -func_80063D58 = 0x80063D58; -func_80063E5C = 0x80063E5C; -func_80063F4C = 0x80063F4C; -func_80063F58 = 0x80063F58; -func_80063F74 = 0x80063F74; +func_enmy_80062568 = 0x80062568; +func_enmy_80062664 = 0x80062664; +func_enmy_80062B60 = 0x80062B60; +func_enmy_80062C38 = 0x80062C38; +func_enmy_80062D04 = 0x80062D04; +func_enmy_80062DBC = 0x80062DBC; +func_enmy_800631A8 = 0x800631A8; +func_enmy_8006326C = 0x8006326C; +func_enmy_8006351C = 0x8006351C; +func_enmy_80063CAC = 0x80063CAC; +func_enmy_80063D58 = 0x80063D58; +func_enmy_80063E5C = 0x80063E5C; +func_enmy_80063F4C = 0x80063F4C; +func_enmy_80063F58 = 0x80063F58; +func_enmy_80063F74 = 0x80063F74; Object_Init = 0x80063F90; -func_800652CC = 0x800652CC; -func_80065380 = 0x80065380; -func_8006546C = 0x8006546C; -func_800654E4 = 0x800654E4; -func_800655C8 = 0x800655C8; -func_8006566C = 0x8006566C; -func_800656D4 = 0x800656D4; -func_800660F0 = 0x800660F0; -func_80066254 = 0x80066254; -func_8006654C = 0x8006654C; -func_8006684C = 0x8006684C; -func_800669A0 = 0x800669A0; -func_80066A80 = 0x80066A80; -func_80066A8C = 0x80066A8C; -func_80066C00 = 0x80066C00; -func_80066D5C = 0x80066D5C; -func_80066E80 = 0x80066E80; -func_80066E8C = 0x80066E8C; -func_80066EA8 = 0x80066EA8; -func_80066EE4 = 0x80066EE4; -func_80066EF0 = 0x80066EF0; -func_800671D0 = 0x800671D0; -func_80067348 = 0x80067348; -func_800674B4 = 0x800674B4; -func_8006753C = 0x8006753C; -func_80067874 = 0x80067874; -func_80067A40 = 0x80067A40; -func_80067B1C = 0x80067B1C; -func_80067BEC = 0x80067BEC; -func_80067F6C = 0x80067F6C; -func_80068020 = 0x80068020; -func_800685D8 = 0x800685D8; -func_800685F8 = 0x800685F8; -func_80068618 = 0x80068618; -func_80068688 = 0x80068688; -func_80068914 = 0x80068914; -func_80068C48 = 0x80068C48; -func_80068C88 = 0x80068C88; -func_80068FE0 = 0x80068FE0; -func_800690D0 = 0x800690D0; -func_800693E8 = 0x800693E8; -func_80069658 = 0x80069658; -func_800696F8 = 0x800696F8; -func_80069858 = 0x80069858; -func_80069924 = 0x80069924; -func_80069A10 = 0x80069A10; +func_enmy_800652CC = 0x800652CC; +func_enmy_80065380 = 0x80065380; +func_enmy_8006546C = 0x8006546C; +func_enmy_800654E4 = 0x800654E4; +func_enmy_800655C8 = 0x800655C8; +func_enmy_8006566C = 0x8006566C; +func_enmy_800656D4 = 0x800656D4; +func_enmy_800660F0 = 0x800660F0; +func_enmy_80066254 = 0x80066254; +func_enmy_8006654C = 0x8006654C; +func_enmy_8006684C = 0x8006684C; +func_enmy_800669A0 = 0x800669A0; +func_enmy_80066A80 = 0x80066A80; +func_enmy_80066A8C = 0x80066A8C; +func_enmy_80066C00 = 0x80066C00; +func_enmy_80066D5C = 0x80066D5C; +func_enmy_80066E80 = 0x80066E80; +func_enmy_80066E8C = 0x80066E8C; +func_enmy_80066EA8 = 0x80066EA8; +func_enmy_80066EE4 = 0x80066EE4; +func_enmy_80066EF0 = 0x80066EF0; +func_enmy_800671D0 = 0x800671D0; +func_enmy_80067348 = 0x80067348; +func_enmy_800674B4 = 0x800674B4; +func_enmy_8006753C = 0x8006753C; +func_enmy_80067874 = 0x80067874; +func_enmy_80067A40 = 0x80067A40; +func_enmy_80067B1C = 0x80067B1C; +func_enmy_80067BEC = 0x80067BEC; +func_enmy_80067F6C = 0x80067F6C; +func_enmy_80068020 = 0x80068020; +func_enmy_800685D8 = 0x800685D8; +func_enmy_800685F8 = 0x800685F8; +func_enmy_80068618 = 0x80068618; +func_enmy_80068688 = 0x80068688; +func_enmy_80068914 = 0x80068914; +func_enmy_80068C48 = 0x80068C48; +func_enmy_80068C88 = 0x80068C88; +func_enmy_80068FE0 = 0x80068FE0; +func_enmy_800690D0 = 0x800690D0; +func_enmy_800693E8 = 0x800693E8; +func_enmy_80069658 = 0x80069658; +func_enmy_800696F8 = 0x800696F8; +func_enmy_80069858 = 0x80069858; +func_enmy_80069924 = 0x80069924; +func_enmy_80069A10 = 0x80069A10; Actor_Update = 0x80069AAC; Boss_Update = 0x80069CBC; Object_80_Update = 0x80069DF4; @@ -333,40 +351,40 @@ Object_UpdateAll = 0x8006A3E8; D_800D0DBC = 0x800D0DBC;//size:24 // fox_game -D_80161A10 = 0x80161A10; -D_80161A14 = 0x80161A14; +D_game_80161A10 = 0x80161A10; +D_game_80161A14 = 0x80161A14; gPlayerInactive = 0x80161A18; //size:0x10 -D_80161A28 = 0x80161A28; -D_80161A2C = 0x80161A2C; -D_80161A2E = 0x80161A2E; +D_game_80161A28 = 0x80161A28; +D_game_80161A2C = 0x80161A2C; +D_game_80161A2E = 0x80161A2E; gNextLevel = 0x80161A30; gNextGameState = 0x80161A32; -D_80161A34 = 0x80161A34; +D_game_80161A34 = 0x80161A34; gBgColor = 0x80161A36; gBlurAlpha = 0x80161A38; -D_80161A39 = 0x80161A39; -D_80161A3C = 0x80161A3C; -D_80161A40 = 0x80161A40; -D_80161A44 = 0x80161A44; -D_800D2860 = 0x800D2860; -D_800D2870 = 0x800D2870; -D_800D2874 = 0x800D2874; -D_800D2884 = 0x800D2884; -D_800D2894 = 0x800D2894; -D_800D28A4 = 0x800D28A4; +D_game_80161A39 = 0x80161A39; +D_game_80161A3C = 0x80161A3C; +D_game_80161A40 = 0x80161A40; +D_game_80161A44 = 0x80161A44; +D_game_800D2860 = 0x800D2860; +D_game_800D2870 = 0x800D2870; +D_game_800D2874 = 0x800D2874; +D_game_800D2884 = 0x800D2884; +D_game_800D2894 = 0x800D2894; +D_game_800D28A4 = 0x800D28A4; sOverlaySetups = 0x800D28B4; Game_Initialize = 0x800A18B0; Game_SetGameState = 0x800A1980; -func_800A1B6C = 0x800A1B6C; -func_800A1C14 = 0x800A1C14; -func_800A1E68 = 0x800A1E68; -func_800A1F44 = 0x800A1F44; -func_800A1FB0 = 0x800A1FB0; -func_800A24DC = 0x800A24DC; -func_800A25DC = 0x800A25DC; +func_game_800A1B6C = 0x800A1B6C; +func_game_800A1C14 = 0x800A1C14; +func_game_800A1E68 = 0x800A1E68; +func_game_800A1F44 = 0x800A1F44; +func_game_800A1FB0 = 0x800A1FB0; +func_game_800A24DC = 0x800A24DC; +func_game_800A25DC = 0x800A25DC; Game_Update = 0x800A26C0; -func_800A3608 = 0x800A3608; +func_game_800A3608 = 0x800A3608; // sf_hud @@ -379,14 +397,14 @@ gMedalFlashTimer = 0x801617B8; D_800D1AEC = 0x800D1AEC; //type:s32 size:0x1B0 // fox_play -D_80161A50 = 0x80161A50; -D_80161A54 = 0x80161A54; -D_80161A5C = 0x80161A5C; -D_Timer_80161A60 = 0x80161A60; -D_80161A62 = 0x80161A62; -D_80161A64 = 0x80161A64; +D_play_80161A50 = 0x80161A50; +D_play_80161A54 = 0x80161A54; +D_play_80161A5C = 0x80161A5C; +D_play_Timer_80161A60 = 0x80161A60; +D_play_80161A62 = 0x80161A62; +D_play_80161A64 = 0x80161A64; sEnvSettings = 0x80161A68; -D_800D2F68 = 0x800D2F68; //type:u8 +D_play_800D2F68 = 0x800D2F68; //type:u8 // fox_context D_80161A70 = 0x80161A70; @@ -413,228 +431,228 @@ gPlayerShots = 0x80174050; //size:0x700 gTexturedLines = 0x80174750; //size:0x12C0 gRadarMarks = 0x80175A10; //size:0xA28 gBonusText = 0x80176438; //size:0x118 -D_80176550 = 0x80176550; -D_80176558 = 0x80176558; -D_80176878 = 0x80176878; -D_80176B98 = 0x80176B98; -D_80176EB8 = 0x80176EB8; -D_801771D8 = 0x801771D8; +D_ctx_80176550 = 0x80176550; +D_ctx_80176558 = 0x80176558; +D_ctx_80176878 = 0x80176878; +D_ctx_80176B98 = 0x80176B98; +D_ctx_80176EB8 = 0x80176EB8; +D_ctx_801771D8 = 0x801771D8; gOverlaySetup = 0x801774F8; -D_80177500 = 0x80177500; +D_ctx_80177500 = 0x80177500; gOverlayStage = 0x80177820; -D_80177824 = 0x80177824; -D_80177828 = 0x80177828; -D_8017782C = 0x8017782C; -D_80177830 = 0x80177830; +D_ctx_80177824 = 0x80177824; +D_ctx_80177828 = 0x80177828; +D_ctx_8017782C = 0x8017782C; +D_ctx_80177830 = 0x80177830; gGameState = 0x80177834; -D_80177838 = 0x80177838; +D_ctx_80177838 = 0x80177838; D_Timer_8017783C = 0x8017783C; -D_80177840 = 0x80177840; +D_ctx_80177840 = 0x80177840; gOptionMenuStatus = 0x8017784C; //type:OptionState gBossHealthBar = 0x80177848; -D_80177850 = 0x80177850; -D_80177854 = 0x80177854; -D_80177858 = 0x80177858; -D_80177868 = 0x80177868; -D_80177870 = 0x80177870; +D_ctx_80177850 = 0x80177850; +D_ctx_80177854 = 0x80177854; +D_ctx_80177858 = 0x80177858; +D_ctx_80177868 = 0x80177868; +D_ctx_80177870 = 0x80177870; gLevelMode = 0x80177880; gHandicap = 0x80177888; gDrawMode = 0x80177898; gVersusStage = 0x8017789C; gPlayerNum = 0x801778A0; -D_801778A4 = 0x801778A4; +D_ctx_801778A4 = 0x801778A4; gCamCount = 0x801778A8; D_801778AB = 0x801778AB; -D_801778AC = 0x801778AC; +D_ctx_801778AC = 0x801778AC; gTeamShields = 0x801778B0; //size:0x18 -D_801778C8 = 0x801778C8; +D_ctx_801778C8 = 0x801778C8; gSavedTeamShields = 0x801778D0; //size:0x18 gVersusMode = 0x801778E8; -D_801778F0 = 0x801778F0;//size=0x18 +D_ctx_801778F0 = 0x801778F0;//size=0x18 gBoostButton = 0x80177908; gTeamDamage = 0x80177910; gBrakeButton = 0x80177928; -D_80177930 = 0x80177930; +D_ctx_80177930 = 0x80177930; gShootButton = 0x80177938; gGroundLevel = 0x80177940; gBombButton = 0x80177948; -D_80177950 = 0x80177950; -D_80177958 = 0x80177958; +D_ctx_80177950 = 0x80177950; +D_ctx_80177958 = 0x80177958; gInputHold = 0x80177974; gCsCamEyeX = 0x80177978; gInputPress = 0x8017797C; gCsCamEyeY = 0x80177980; gCsCamEyeZ = 0x80177988; -D_80177990 = 0x80177990; +D_ctx_80177990 = 0x80177990; gCsCamAtX = 0x801779A0; -D_801779A8 = 0x801779A8; +D_ctx_801779A8 = 0x801779A8; gCsCamAtY = 0x801779B8; gCsCamAtZ = 0x801779C0; gChargeTimers = 0x801779C8; -D_801779D8 = 0x801779D8; -D_801779E8 = 0x801779E8; +D_ctx_801779D8 = 0x801779D8; +D_ctx_801779E8 = 0x801779E8; gExpertMode = 0x801779F8; D_Timer_80177A00 = 0x80177A00; -D_80177A10 = 0x80177A10;//size:0x28 +D_ctx_80177A10 = 0x80177A10;//size:0x28 D_Timer_80177A38 = 0x80177A38; -D_80177A48 = 0x80177A48;//size:0x28 +D_ctx_80177A48 = 0x80177A48;//size:0x28 D_Timer_80177A70 = 0x80177A70;//size:0x10 gCsFrameCount = 0x80177A80; D_Timer_80177A88 = 0x80177A88;//size:0x10 -D_80177A98 = 0x80177A98; -D_80177AA0 = 0x80177AA0; -D_80177AB0 = 0x80177AB0; -D_80177AB8 = 0x80177AB8; -D_80177AC8 = 0x80177AC8; -D_80177AD0 = 0x80177AD0; -D_80177AE0 = 0x80177AE0; -D_80177AE8 = 0x80177AE8; +D_ctx_80177A98 = 0x80177A98; +D_ctx_80177AA0 = 0x80177AA0; +D_ctx_80177AB0 = 0x80177AB0; +D_ctx_80177AB8 = 0x80177AB8; +D_ctx_80177AC8 = 0x80177AC8; +D_ctx_80177AD0 = 0x80177AD0; +D_ctx_80177AE0 = 0x80177AE0; +D_ctx_80177AE8 = 0x80177AE8; gMainController = 0x80177AF8; -D_80177B00 = 0x80177B00; -D_80177B40 = 0x80177B40; +D_ctx_80177B00 = 0x80177B00; +D_ctx_80177B40 = 0x80177B40; D_Timer_80177B44 = 0x80177B44; gCurrentPlanet = 0x80177B48; -D_80177B50 = 0x80177B50; -D_80177B70 = 0x80177B70; -D_80177B90 = 0x80177B90; -D_80177BB0 = 0x80177BB0; +D_ctx_80177B50 = 0x80177B50; +D_ctx_80177B70 = 0x80177B70; +D_ctx_80177B90 = 0x80177B90; +D_ctx_80177BB0 = 0x80177BB0; D_Timer_80177BD0 = 0x80177BD0; -D_80177BD8 = 0x80177BD8; -D_80177C30 = 0x80177C30; -D_80177C50 = 0x80177C50; -D_80177C58 = 0x80177C58; +D_ctx_80177BD8 = 0x80177BD8; +D_ctx_80177C30 = 0x80177C30; +D_ctx_80177C50 = 0x80177C50; +D_ctx_80177C58 = 0x80177C58; gSoundMode = 0x80177C74; gVolumeSettings = 0x80177C80; -D_80177C90 = 0x80177C90; -D_80177C94 = 0x80177C94; +D_ctx_80177C90 = 0x80177C90; +D_ctx_80177C94 = 0x80177C94; gLevelType = 0x80177C98; -D_80177C9C = 0x80177C9C; -D_80177CA0 = 0x80177CA0; -D_80177CA4 = 0x80177CA4; -D_80177CAC = 0x80177CAC; -D_80177CB0 = 0x80177CB0; -D_80177CB4 = 0x80177CB4; -D_80177CBC = 0x80177CBC; -D_80177CC4 = 0x80177CC4; -D_80177CC8 = 0x80177CC8; -D_80177CD0 = 0x80177CD0; // size:0x18 -D_80177D08 = 0x80177D08; +D_ctx_80177C9C = 0x80177C9C; +D_ctx_80177CA0 = 0x80177CA0; +D_ctx_80177CA4 = 0x80177CA4; +D_ctx_80177CAC = 0x80177CAC; +D_ctx_80177CB0 = 0x80177CB0; +D_ctx_80177CB4 = 0x80177CB4; +D_ctx_80177CBC = 0x80177CBC; +D_ctx_80177CC4 = 0x80177CC4; +D_ctx_80177CC8 = 0x80177CC8; +D_ctx_80177CD0 = 0x80177CD0; // size:0x18 +D_ctx_80177D08 = 0x80177D08; gRightWingHealth = 0x80177D10; -D_80177D20 = 0x80177D20; +D_ctx_80177D20 = 0x80177D20; gLeftWingHealth = 0x80177D28; -D_80177D38 = 0x80177D38; -D_80177D40 = 0x80177D40; -D_80177D50 = 0x80177D50; -D_80177D58 = 0x80177D58; -D_80177D68 = 0x80177D68; -D_80177D70 = 0x80177D70; -D_80177D88 = 0x80177D88; +D_ctx_80177D38 = 0x80177D38; +D_ctx_80177D40 = 0x80177D40; +D_ctx_80177D50 = 0x80177D50; +D_ctx_80177D58 = 0x80177D58; +D_ctx_80177D68 = 0x80177D68; +D_ctx_80177D70 = 0x80177D70; +D_ctx_80177D88 = 0x80177D88; gBombCount = 0x80177DA0; gGameFrameCount = 0x80177DB0; -D_80177DC8 = 0x80177DC8; -D_80177E70 = 0x80177E70; -D_80177E78 = 0x80177E78; -D_80177E80 = 0x80177E80; -D_80177E88 = 0x80177E88; // size:0xC -D_80177E98 = 0x80177E98; -D_80177F10 = 0x80177F10; -D_80177F20 = 0x80177F20; //size:0xF4 -D_80178028 = 0x80178028; //size:0xF4 -D_8017812C = 0x8017812C; -D_80178130 = 0x80178130; //size:0xF4 +D_ctx_80177DC8 = 0x80177DC8; +D_ctx_80177E70 = 0x80177E70; +D_ctx_80177E78 = 0x80177E78; +D_ctx_80177E80 = 0x80177E80; +D_ctx_80177E88 = 0x80177E88; // size:0xC +D_ctx_80177E98 = 0x80177E98; +D_ctx_80177F10 = 0x80177F10; +D_ctx_80177F20 = 0x80177F20; //size:0xF4 +D_ctx_80178028 = 0x80178028; //size:0xF4 +D_ctx_8017812C = 0x8017812C; +D_ctx_80178130 = 0x80178130; //size:0xF4 gCurrentLevel = 0x80178234; -D_80178238 = 0x80178238;//size:0x3D type:u8 -D_8017827C = 0x8017827C; +D_ctx_80178238 = 0x80178238;//size:0x3D type:u8 +D_ctx_8017827C = 0x8017827C; gPlayer = 0x80178280; gBossActive = 0x80178284; -D_80178288 = 0x80178288; -D_8017828C = 0x8017828C; -D_80178290 = 0x80178290; -D_80178294 = 0x80178294; -D_80178298 = 0x80178298; +D_ctx_80178288 = 0x80178288; +D_ctx_8017828C = 0x8017828C; +D_ctx_80178290 = 0x80178290; +D_ctx_80178294 = 0x80178294; +D_ctx_80178298 = 0x80178298; gRadioState = 0x8017829C; -D_801782A4 = 0x801782A4; +D_ctx_801782A4 = 0x801782A4; gObjects58 = 0x801782A8; D_Timer_801782AC = 0x801782AC; D_Timer_801782B4 = 0x801782B4; -D_801782B8 = 0x801782B8; -D_801782BC = 0x801782BC; -D_801782C0 = 0x801782C0; -D_801782D0 = 0x801782D0; -D_801782D4 = 0x801782D4; -D_801782D8 = 0x801782D8; -D_801782E8 = 0x801782E8; -D_801782F8 = 0x801782F8; -D_801782FC = 0x801782FC; -D_80178300 = 0x80178300; -D_80178308 = 0x80178308; -D_80178310 = 0x80178310; +D_ctx_801782B8 = 0x801782B8; +D_ctx_801782BC = 0x801782BC; +D_ctx_801782C0 = 0x801782C0; +D_ctx_801782D0 = 0x801782D0; +D_ctx_801782D4 = 0x801782D4; +D_ctx_801782D8 = 0x801782D8; +D_ctx_801782E8 = 0x801782E8; +D_ctx_801782F8 = 0x801782F8; +D_ctx_801782FC = 0x801782FC; +D_ctx_80178300 = 0x80178300; +D_ctx_80178308 = 0x80178308; +D_ctx_80178310 = 0x80178310; gFogRed = 0x80178320; gFogGreen = 0x80178328; gFogBlue = 0x80178330; gFogAlpha = 0x80178338; -D_80178340 = 0x80178340; -D_80178348 = 0x80178348; -D_80178350 = 0x80178350; -D_80178354 = 0x80178354; -D_80178358 = 0x80178358; -D_8017835C = 0x8017835C; -D_80178360 = 0x80178360; -D_80178364 = 0x80178364; -D_80178368 = 0x80178368; -D_8017836C = 0x8017836C; -D_80178370 = 0x80178370; -D_80178380 = 0x80178380; -D_80178390 = 0x80178390; -D_801783A0 = 0x801783A0; -D_801783B0 = 0x801783B0; -D_801783D0 = 0x801783D0; -D_801783D4 = 0x801783D4; +D_ctx_80178340 = 0x80178340; +D_ctx_80178348 = 0x80178348; +D_ctx_80178350 = 0x80178350; +D_ctx_80178354 = 0x80178354; +D_ctx_80178358 = 0x80178358; +D_ctx_8017835C = 0x8017835C; +D_ctx_80178360 = 0x80178360; +D_ctx_80178364 = 0x80178364; +D_ctx_80178368 = 0x80178368; +D_ctx_8017836C = 0x8017836C; +D_ctx_80178370 = 0x80178370; +D_ctx_80178380 = 0x80178380; +D_ctx_80178390 = 0x80178390; +D_ctx_801783A0 = 0x801783A0; +D_ctx_801783B0 = 0x801783B0; +D_ctx_801783D0 = 0x801783D0; +D_ctx_801783D4 = 0x801783D4; gFogNear = 0x801783D8; gFogFar = 0x801783DC; -D_80178410 = 0x80178410; -D_80178420 = 0x80178420; -D_80178424 = 0x80178424; -D_80178428 = 0x80178428; -D_8017842C = 0x8017842C; -D_80178430 = 0x80178430; -D_80178440 = 0x80178440; -D_80178444 = 0x80178444; -D_80178448 = 0x80178448; -D_8017847C = 0x8017847C; -D_80178480 = 0x80178480; -D_80178488 = 0x80178488; -D_801784A4 = 0x801784A4; -D_801784AC = 0x801784AC; -D_801784B8 = 0x801784B8; -D_801784BC = 0x801784BC; -D_801784C0 = 0x801784C0; -D_801784C4 = 0x801784C4; -D_801784C8 = 0x801784C8; -D_801784CC = 0x801784CC; -D_801784D0 = 0x801784D0; -D_801784D4 = 0x801784D4; -D_801784D8 = 0x801784D8; +D_ctx_80178410 = 0x80178410; +D_ctx_80178420 = 0x80178420; +D_ctx_80178424 = 0x80178424; +D_ctx_80178428 = 0x80178428; +D_ctx_8017842C = 0x8017842C; +D_ctx_80178430 = 0x80178430; +D_ctx_80178440 = 0x80178440; +D_ctx_80178444 = 0x80178444; +D_ctx_80178448 = 0x80178448; +D_ctx_8017847C = 0x8017847C; +D_ctx_80178480 = 0x80178480; +D_ctx_80178488 = 0x80178488; +D_ctx_801784A4 = 0x801784A4; +D_ctx_801784AC = 0x801784AC; +D_ctx_801784B8 = 0x801784B8; +D_ctx_801784BC = 0x801784BC; +D_ctx_801784C0 = 0x801784C0; +D_ctx_801784C4 = 0x801784C4; +D_ctx_801784C8 = 0x801784C8; +D_ctx_801784CC = 0x801784CC; +D_ctx_801784D0 = 0x801784D0; +D_ctx_801784D4 = 0x801784D4; +D_ctx_801784D8 = 0x801784D8; gLight1x = 0x801784DC; gLight1y = 0x801784E0; gLight1z = 0x801784E4; -D_801784E8 = 0x801784E8; -D_801784EC = 0x801784EC; -D_801784F0 = 0x801784F0; -D_801784F4 = 0x801784F4; -D_801784F8 = 0x801784F8; -D_801784FC = 0x801784FC; -D_80178500 = 0x80178500; +D_ctx_801784E8 = 0x801784E8; +D_ctx_801784EC = 0x801784EC; +D_ctx_801784F0 = 0x801784F0; +D_ctx_801784F4 = 0x801784F4; +D_ctx_801784F8 = 0x801784F8; +D_ctx_801784FC = 0x801784FC; +D_ctx_80178500 = 0x80178500; gLight2x = 0x80178504; gLight2y = 0x80178508; gLight2z = 0x8017850C; -D_80178520 = 0x80178520; -D_80178524 = 0x80178524; -D_80178528 = 0x80178528; -D_80178538 = 0x80178538; -D_8017853C = 0x8017853C; -D_80178540 = 0x80178540; -D_80178544 = 0x80178544; +D_ctx_80178520 = 0x80178520; +D_ctx_80178524 = 0x80178524; +D_ctx_80178528 = 0x80178528; +D_ctx_80178538 = 0x80178538; +D_ctx_8017853C = 0x8017853C; +D_ctx_80178540 = 0x80178540; +D_ctx_80178544 = 0x80178544; gLight1R = 0x80178548; gLight1G = 0x8017854C; gLight1B = 0x80178550; @@ -644,107 +662,113 @@ gAmbientB = 0x8017855C; gLight2R = 0x80178564; gLight2G = 0x80178568; gLight2B = 0x8017856C; -D_80178570 = 0x80178570; -D_80178574 = 0x80178574; -D_80178578 = 0x80178578; +D_ctx_80178570 = 0x80178570; +D_ctx_80178574 = 0x80178574; +D_ctx_80178578 = 0x80178578; Play_GetMaxShields = 0x800A3FC4; -func_800A3FB0 = 0x800A3FB0; +func_play_800A3FB0 = 0x800A3FB0; Play_CheckMedalStatus = 0x800A3F50; -func_800A3FEC = 0x800A3FEC; -func_800A4460 = 0x800A4460; -func_800A46A0 = 0x800A46A0; -func_800A4C40 = 0x800A4C40; +func_play_800A3FEC = 0x800A3FEC; +func_play_800A4460 = 0x800A4460; +func_play_800A46A0 = 0x800A46A0; +func_play_800A4C40 = 0x800A4C40; Object_58_Initialize = 0x800A4F4C; -func_800A4F7C = 0x800A4F7C; -func_800A5330 = 0x800A5330; -func_800A5338 = 0x800A5338; -func_800A55B0 = 0x800A55B0; -func_800A57E0 = 0x800A57E0; -func_800A5844 = 0x800A5844; -func_800A594C = 0x800A594C; -func_800A5D6C = 0x800A5D6C; -func_800A5EBC = 0x800A5EBC; -func_800A5FA0 = 0x800A5FA0; -func_800A6028 = 0x800A6028; -func_800A6070 = 0x800A6070; +func_play_800A4F7C = 0x800A4F7C; +func_play_800A5330 = 0x800A5330; +func_play_800A5338 = 0x800A5338; +func_play_800A55B0 = 0x800A55B0; +func_play_800A57E0 = 0x800A57E0; +func_play_800A5844 = 0x800A5844; +func_play_800A594C = 0x800A594C; +func_play_800A5D6C = 0x800A5D6C; +func_play_800A5EBC = 0x800A5EBC; +func_play_800A5FA0 = 0x800A5FA0; +func_play_800A6028 = 0x800A6028; +func_play_800A6070 = 0x800A6070; BonusText_Initialize = 0x800A60B8; TexturedLine_Initialize = 0x800A60E8; RadarMark_Initialize = 0x800A6118; -func_800A6148 = 0x800A6148; -func_800A6590 = 0x800A6590; -func_800A668C = 0x800A668C; -func_800A670C = 0x800A670C; -func_800A69F8 = 0x800A69F8; -func_800A6A74 = 0x800A6A74; +func_play_800A6148 = 0x800A6148; +func_play_800A6590 = 0x800A6590; +func_play_800A668C = 0x800A668C; +func_play_800A670C = 0x800A670C; +func_play_800A69F8 = 0x800A69F8; +func_play_800A6A74 = 0x800A6A74; Player_DamageWings = 0x800A6AC0; Player_ApplyDamage = 0x800A6CD0; -func_800A729C = 0x800A729C; -func_800A73E4 = 0x800A73E4; -func_800A78C4 = 0x800A78C4; -func_800A7974 = 0x800A7974; -func_800A8054 = 0x800A8054; -func_800A8304 = 0x800A8304; -func_800A86E4 = 0x800A86E4; -func_800A8804 = 0x800A8804; -func_800A887C = 0x800A887C; -func_800A8BA4 = 0x800A8BA4; -func_800AA800 = 0x800AA800; -func_800AB2AC = 0x800AB2AC; -func_800AB304 = 0x800AB304; -func_800AB334 = 0x800AB334; -func_800AB964 = 0x800AB964; -func_800ABA08 = 0x800ABA08; -func_800ABAB4 = 0x800ABAB4; -func_800AC290 = 0x800AC290; -func_800AC650 = 0x800AC650; -func_800ACA40 = 0x800ACA40; -func_800ACABC = 0x800ACABC; -func_800ACC7C = 0x800ACC7C; -func_800ACDC0 = 0x800ACDC0; -func_800AD094 = 0x800AD094; -func_800AD118 = 0x800AD118; -func_800AD1F4 = 0x800AD1F4; -func_800AD7F0 = 0x800AD7F0; -func_800ADA28 = 0x800ADA28; -func_800ADD98 = 0x800ADD98; -func_800ADF58 = 0x800ADF58; -func_800AE278 = 0x800AE278; -func_800AE4A4 = 0x800AE4A4; -func_800AECAC = 0x800AECAC; -func_800AF07C = 0x800AF07C; -func_800AF928 = 0x800AF928; -func_800B00C0 = 0x800B00C0; -func_800B0194 = 0x800B0194; -func_800B0F50 = 0x800B0F50; -func_800B2130 = 0x800B2130; -func_800B22C0 = 0x800B22C0; -func_800B2574 = 0x800B2574; -func_800B2BE0 = 0x800B2BE0; -func_800B2C00 = 0x800B2C00; -func_800B3010 = 0x800B3010; -func_800B3314 = 0x800B3314; -func_800B39E0 = 0x800B39E0; -func_800B40AC = 0x800B40AC; -func_800B415C = 0x800B415C; -func_800B41E0 = 0x800B41E0; -func_800B41EC = 0x800B41EC; -func_800B42B0 = 0x800B42B0; -func_800B44C4 = 0x800B44C4; -func_800B46F8 = 0x800B46F8; -func_800B48BC = 0x800B48BC; -func_800B56BC = 0x800B56BC; -func_800B5D30 = 0x800B5D30; -func_800B5FBC = 0x800B5FBC; -func_800B63BC = 0x800B63BC; -func_800B6848 = 0x800B6848; -func_800B6BFC = 0x800B6BFC; -func_800B6F50 = 0x800B6F50; -func_800B7184 = 0x800B7184; -func_800B71E4 = 0x800B71E4; -func_800B73E0 = 0x800B73E0; -func_800B79B0 = 0x800B79B0; -func_800B832C = 0x800B832C; -func_800B852C = 0x800B852C; -func_800B86A4 = 0x800B86A4; -func_800B86CC = 0x800B86CC; +func_play_800A729C = 0x800A729C; +func_play_800A73E4 = 0x800A73E4; +func_play_800A78C4 = 0x800A78C4; +func_play_800A7974 = 0x800A7974; +func_play_800A8054 = 0x800A8054; +func_play_800A8304 = 0x800A8304; +func_play_800A86E4 = 0x800A86E4; +func_play_800A8804 = 0x800A8804; +func_play_800A887C = 0x800A887C; +func_play_800A8BA4 = 0x800A8BA4; +func_play_800AA800 = 0x800AA800; +func_play_800AB2AC = 0x800AB2AC; +func_play_800AB304 = 0x800AB304; +func_play_800AB334 = 0x800AB334; +func_play_800AB964 = 0x800AB964; +func_play_800ABA08 = 0x800ABA08; +func_play_800ABAB4 = 0x800ABAB4; +func_play_800AC290 = 0x800AC290; +func_play_800AC650 = 0x800AC650; +func_play_800ACA40 = 0x800ACA40; +func_play_800ACABC = 0x800ACABC; +func_play_800ACC7C = 0x800ACC7C; +func_play_800ACDC0 = 0x800ACDC0; +func_play_800AD094 = 0x800AD094; +func_play_800AD118 = 0x800AD118; +func_play_800AD1F4 = 0x800AD1F4; +func_play_800AD7F0 = 0x800AD7F0; +func_play_800ADA28 = 0x800ADA28; +func_play_800ADD98 = 0x800ADD98; +func_play_800ADF58 = 0x800ADF58; +func_play_800AE278 = 0x800AE278; +func_play_800AE4A4 = 0x800AE4A4; +func_play_800AECAC = 0x800AECAC; +func_play_800AF07C = 0x800AF07C; +func_play_800AF928 = 0x800AF928; +func_play_800B00C0 = 0x800B00C0; +func_play_800B0194 = 0x800B0194; +func_play_800B0F50 = 0x800B0F50; +func_play_800B2130 = 0x800B2130; +func_play_800B22C0 = 0x800B22C0; +func_play_800B2574 = 0x800B2574; +func_play_800B2BE0 = 0x800B2BE0; +func_play_800B2C00 = 0x800B2C00; +func_play_800B3010 = 0x800B3010; +func_play_800B3314 = 0x800B3314; +func_play_800B39E0 = 0x800B39E0; +func_play_800B40AC = 0x800B40AC; +func_play_800B415C = 0x800B415C; +func_play_800B41E0 = 0x800B41E0; +func_play_800B41EC = 0x800B41EC; +func_play_800B42B0 = 0x800B42B0; +func_play_800B44C4 = 0x800B44C4; +func_play_800B46F8 = 0x800B46F8; +func_play_800B48BC = 0x800B48BC; +func_play_800B56BC = 0x800B56BC; +func_play_800B5D30 = 0x800B5D30; +func_play_800B5FBC = 0x800B5FBC; +func_play_800B63BC = 0x800B63BC; +func_play_800B6848 = 0x800B6848; +func_play_800B6BFC = 0x800B6BFC; +func_play_800B6F50 = 0x800B6F50; +func_play_800B7184 = 0x800B7184; +func_play_800B71E4 = 0x800B71E4; +func_play_800B73E0 = 0x800B73E0; +func_play_800B79B0 = 0x800B79B0; +func_play_800B832C = 0x800B832C; +func_play_800B852C = 0x800B852C; +func_play_800B86A4 = 0x800B86A4; +func_play_800B86CC = 0x800B86CC; + +D_tank_800C9F2C = 0x800C9F2C; +D_edata_800CBF34 = 0x800CBF34; +D_bg_8015F970 = 0x8015F970; +D_bg_8015F984 = 0x8015F984; +D_ctx_8017796C = 0x8017796C; diff --git a/linker_scripts/us/symbol_addrs_overlays.txt b/linker_scripts/us/symbol_addrs_overlays.txt index e8b6615e..d8b357c7 100644 --- a/linker_scripts/us/symbol_addrs_overlays.txt +++ b/linker_scripts/us/symbol_addrs_overlays.txt @@ -1,16 +1,18 @@ -func_i1_8018ED78 = 0x8018ED78;//segment:ovl_i1 -func_i1_8018EE84 = 0x8018EE84;//segment:ovl_i1 -func_i1_8018B0B4 = 0x8018B0B4;//segment:ovl_i1 -func_i1_801878D8 = 0x801878D8;//segment:ovl_i1 -func_i1_8018BE7C = 0x8018BE7C;//segment:ovl_i1 -func_i1_8019250C = 0x8019250C;//segment:ovl_i1 -func_i1_80192CB0 = 0x80192CB0;//segment:ovl_i1 -func_i1_80192EA4 = 0x80192EA4;//segment:ovl_i1 -func_i1_801933B4 = 0x801933B4;//segment:ovl_i1 -func_i1_801935CC = 0x801935CC;//segment:ovl_i1 +Corneria_8018ED78 = 0x8018ED78;//segment:ovl_i1 +Corneria_8018EE84 = 0x8018EE84;//segment:ovl_i1 +Corneria_8018B0B4 = 0x8018B0B4;//segment:ovl_i1 +Corneria_801878D8 = 0x801878D8;//segment:ovl_i1 +Corneria_8018BE7C = 0x8018BE7C;//segment:ovl_i1 +Venom1_8019250C = 0x8019250C;//segment:ovl_i1 +Venom1_80192CB0 = 0x80192CB0;//segment:ovl_i1 +Venom1_80192EA4 = 0x80192EA4;//segment:ovl_i1 +Venom1_801933B4 = 0x801933B4;//segment:ovl_i1 +Venom1_801935CC = 0x801935CC;//segment:ovl_i1 +Venom1_80194398 = 0x80194398;//segment:ovl_i1 +Venom1_801920F0 = 0x801920F0;//segment:ovl_i1 D_i1_8019A04C = 0x8019A04C; // size:0xC type:s16 segment:ovl_i1 D_i1_8019B6C0 = 0x8019B6C0;//segment:ovl_i1 -D_i1_8019A008 = 0x8019A008; // segment:ovl_i1 +D_VE1_8019A008 = 0x8019A008; // segment:ovl_i1 D_i1_8019A820 = 0x8019A820; // segment:ovl_i1 type:s16 size:0x198 D_i1_8019AD2C = 0x8019AD2C; // segment:ovl_i1 size:0x28 D_i1_8019AD5C = 0x8019AD5C; // segment:ovl_i1 type:Vec3f size:0xC @@ -18,8 +20,8 @@ D_i1_8019A748 = 0x8019A748; // segment:ovl_i1 size:0xD8 type:s32 D_i1_8019A500 = 0x8019A500; // segment:ovl_i1 type:s16 size:0x44 D_i1_8019B838 = 0x8019B838; // segment:ovl_i1 size:0x880 -func_i2_80187B08 = 0x80187B08;//segment:ovl_i2 -func_i2_80188A40 = 0x80188A40;//segment:ovl_i2 +Meteo_80187B08 = 0x80187B08;//segment:ovl_i2 +Meteo_80188A40 = 0x80188A40;//segment:ovl_i2 D_i2_80195D70 = 0x80195D70;//segment:ovl_i2 D_i4_8019F168 = 0x8019F168; // type:Vec3f segment:ovl_i4 D_i4_8019F18C = 0x8019F18C; // type:f32 size:0xC segment:ovl_i4 @@ -53,26 +55,63 @@ D_menu_801AEE6C = 0x801AEE6C; // type:s32 size:0x58 force_migration:True segment 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_801A7930 = 0x801A7930;//segment:ovl_i3 -func_i3_80187754 = 0x80187754;//segment:ovl_i3 -func_i3_801932AC = 0x801932AC;//segment:ovl_i3 -func_i3_8019B1F0 = 0x8019B1F0;//segment:ovl_i3 -func_i3_8019B810 = 0x8019B810;//segment:ovl_i3 -func_i3_8019C200 = 0x8019C200;//segment:ovl_i3 -func_i3_8019D060 = 0x8019D060;//segment:ovl_i3 -func_i3_801AD688 = 0x801AD688;//segment:ovl_i3 -func_i3_801AE3AC = 0x801AE3AC;//segment:ovl_i3 -func_i3_801AF9FC = 0x801AF9FC;//segment:ovl_i3 -func_i3_801B10F8 = 0x801B10F8;//segment:ovl_i3 -func_i3_801B6344 = 0x801B6344;//segment:ovl_i3 -func_i3_801B6E54 = 0x801B6E54;//segment:ovl_i3 -func_i3_801B7AF0 = 0x801B7AF0;//segment:ovl_i3 -func_i3_801BA57C = 0x801BA57C;//segment:ovl_i3 -func_i3_801BB26C = 0x801BB26C;//segment:ovl_i3 -func_i3_801915A4 = 0x801915A4;//segment:ovl_i3 -func_i3_80191BB8 = 0x80191BB8;//segment:ovl_i3 +Area6_801875E4 = 0x801875E4;//segment:ovl_i3 +Area6_80187704 = 0x80187704;//segment:ovl_i3 +Area6_80187754 = 0x80187754;//segment:ovl_i3 +Area6_80187944 = 0x80187944;//segment:ovl_i3 +Area6_8018A1B0 = 0x8018A1B0;//segment:ovl_i3 +Area6_8018A2C4 = 0x8018A2C4;//segment:ovl_i3 +Area6_8018A464 = 0x8018A464;//segment:ovl_i3 +Area6_8018B9BC = 0x8018B9BC;//segment:ovl_i3 +Area6_8018BCD4 = 0x8018BCD4;//segment:ovl_i3 +Area6_8018C0D0 = 0x8018C0D0;//segment:ovl_i3 +Area6_8018C54C = 0x8018C54C;//segment:ovl_i3 +Zoness_801900FC = 0x801900FC;//segment:ovl_i3 +Zoness_801915A4 = 0x801915A4;//segment:ovl_i3 +Zoness_80191BB8 = 0x80191BB8;//segment:ovl_i3 +Zoness_801932AC = 0x801932AC;//segment:ovl_i3 +Zoness_80193908 = 0x80193908;//segment:ovl_i3 +Zoness_80193A98 = 0x80193A98;//segment:ovl_i3 +Zoness_80193CC8 = 0x80193CC8;//segment:ovl_i3 +Zoness_80194A84 = 0x80194A84;//segment:ovl_i3 +Zoness_801986FC = 0x801986FC;//segment:ovl_i3 +Zoness_801989FC = 0x801989FC;//segment:ovl_i3 +Zoness_80198BE8 = 0x80198BE8;//segment:ovl_i3 +Zoness_80198ECC = 0x80198ECC;//segment:ovl_i3 +Zoness_80198F3C = 0x80198F3C;//segment:ovl_i3 +Zoness_8019907C = 0x8019907C;//segment:ovl_i3 +Zoness_8019914C = 0x8019914C;//segment:ovl_i3 +Zoness_801991D0 = 0x801991D0;//segment:ovl_i3 +Zoness_80199394 = 0x80199394;//segment:ovl_i3 +Zoness_80199470 = 0x80199470;//segment:ovl_i3 +Zoness_8019962C = 0x8019962C;//segment:ovl_i3 +Zoness_8019B1F0 = 0x8019B1F0;//segment:ovl_i3 +Zoness_8019B810 = 0x8019B810;//segment:ovl_i3 +Zoness_8019C200 = 0x8019C200;//segment:ovl_i3 +Zoness_8019D060 = 0x8019D060;//segment:ovl_i3 +Solar_801A7930 = 0x801A7930;//segment:ovl_i3 +Aquas_801A9448 = 0x801A9448;//segment:ovl_i3 +Aquas_801A94EC = 0x801A94EC;//segment:ovl_i3 +Aquas_801A958C = 0x801A958C;//segment:ovl_i3 +Aquas_801AC8A8 = 0x801AC8A8;//segment:ovl_i3 +Aquas_801AD688 = 0x801AD688;//segment:ovl_i3 +Aquas_801AE3AC = 0x801AE3AC;//segment:ovl_i3 +Aquas_801AF9FC = 0x801AF9FC;//segment:ovl_i3 +Aquas_801AFA5C = 0x801AFA5C;//segment:ovl_i3 +Aquas_801B0F88 = 0x801B0F88;//segment:ovl_i3 +Aquas_801B0FCC = 0x801B0FCC;//segment:ovl_i3 +Aquas_801B1008 = 0x801B1008;//segment:ovl_i3 +Aquas_801B10F8 = 0x801B10F8;//segment:ovl_i3 +Aquas_801B134C = 0x801B134C;//segment:ovl_i3 +Aquas_801B6344 = 0x801B6344;//segment:ovl_i3 +Aquas_801B638C = 0x801B638C;//segment:ovl_i3 +Aquas_801B6E54 = 0x801B6E54;//segment:ovl_i3 +Aquas_801B6FF8 = 0x801B6FF8;//segment:ovl_i3 +Aquas_801B7AF0 = 0x801B7AF0;//segment:ovl_i3 +Aquas_801BA57C = 0x801BA57C;//segment:ovl_i3 +Aquas_801BB26C = 0x801BB26C;//segment:ovl_i3 D_i3_801C2240 = 0x801C2240;//segment:ovl_i3 -D_i3_801C4188 = 0x801C4188;//segment:ovl_i3 +D_AQ_801C4188 = 0x801C4188;//segment:ovl_i3 D_i3_801C2250 = 0x801C2250;//size:0xA0 segment:ovl_i3 D_i3_801C22F0 = 0x801C22F0;//size:0x40 segment:ovl_i3 D_i3_801BF1F0 = 0x801BF1F0;//size:0x30 type:f32 segment:ovl_i3 @@ -115,44 +154,50 @@ 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_i4_80198594 = 0x80198594;//segment:ovl_i4 -func_i4_80193CA4 = 0x80193CA4;//segment:ovl_i4 +Katina_80198594 = 0x80198594;//segment:ovl_i4 +Katina_80193CA4 = 0x80193CA4;//segment:ovl_i4 +SectorZ_80199C60 = 0x80199C60;//segment:ovl_i4 +SectorZ_80199900 = 0x80199900;//segment:ovl_i4 D_i4_801A03C0 = 0x801A03C0;//segment:ovl_i4 -D_i4_8019EE80 = 0x8019EE80;//segment:ovl_i4 -D_i4_801A03DC = 0x801A03DC;//segment:ovl_i4 +D_BO_8019EE80 = 0x8019EE80;//segment:ovl_i4 +D_BO_801A03DC = 0x801A03DC;//segment:ovl_i4 -func_i5_801A55D4 = 0x801A55D4;//segment:ovl_i5 -func_i5_8018E3B0 = 0x8018E3B0;//segment:ovl_i5 -func_i5_8018B720 = 0x8018B720;//segment:ovl_i5 -func_i5_801990DC = 0x801990DC;//segment:ovl_i5 -func_i5_801B6AEC = 0x801B6AEC;//segment:ovl_i5 -func_i5_80189B80 = 0x80189B80;//segment:ovl_i5 -func_i5_8018ADC4 = 0x8018ADC4;//segment:ovl_i5 -func_i5_8018B96C = 0x8018B96C;//segment:ovl_i5 -func_i5_8018BFB0 = 0x8018BFB0;//segment:ovl_i5 -func_i5_8018E3CC = 0x8018E3CC;//segment:ovl_i5 -func_i5_8018E5E8 = 0x8018E5E8;//segment:ovl_i5 -func_i5_8018EFF0 = 0x8018EFF0;//segment:ovl_i5 -func_i5_8018F0D8 = 0x8018F0D8;//segment:ovl_i5 -func_i5_8018FA48 = 0x8018FA48;//segment:ovl_i5 -func_i5_80199F8C = 0x80199F8C;//segment:ovl_i5 -func_i5_801A3E70 = 0x801A3E70;//segment:ovl_i5 -func_i5_801A4660 = 0x801A4660;//segment:ovl_i5 -func_i5_801A4AF8 = 0x801A4AF8;//segment:ovl_i5 -func_i5_801A5E2C = 0x801A5E2C;//segment:ovl_i5 -func_i5_801A6134 = 0x801A6134;//segment:ovl_i5 -func_i5_801A65E0 = 0x801A65E0;//segment:ovl_i5 -func_i5_801A7D98 = 0x801A7D98;//segment:ovl_i5 -func_i5_801B6E20 = 0x801B6E20;//segment:ovl_i5 + +Macbeth_801A55D4 = 0x801A55D4;//segment:ovl_i5 +Titania_8018E3B0 = 0x8018E3B0;//segment:ovl_i5 +Titania_8018B720 = 0x8018B720;//segment:ovl_i5 +Titania_801990DC = 0x801990DC;//segment:ovl_i5 +Ground_801B6AEC = 0x801B6AEC;//segment:ovl_i5 +Titania_80189B80 = 0x80189B80;//segment:ovl_i5 +Titania_8018ADC4 = 0x8018ADC4;//segment:ovl_i5 +Titania_8018B96C = 0x8018B96C;//segment:ovl_i5 +Titania_8018BFB0 = 0x8018BFB0;//segment:ovl_i5 +Titania_8018E3CC = 0x8018E3CC;//segment:ovl_i5 +Titania_8018E5E8 = 0x8018E5E8;//segment:ovl_i5 +Titania_8018EFF0 = 0x8018EFF0;//segment:ovl_i5 +Titania_8018F0D8 = 0x8018F0D8;//segment:ovl_i5 +Titania_8018FA48 = 0x8018FA48;//segment:ovl_i5 +Macbeth_80199F8C = 0x80199F8C;//segment:ovl_i5 +Titania_80193B30 = 0x80193B30;//segment:ovl_i5 +Titania_80193DF0 = 0x80193DF0;//segment:ovl_i5 +Titania_80190A08 = 0x80190A08;//segment:ovl_i5 +Macbeth_801A3E70 = 0x801A3E70;//segment:ovl_i5 +Macbeth_801A4660 = 0x801A4660;//segment:ovl_i5 +Macbeth_801A4AF8 = 0x801A4AF8;//segment:ovl_i5 +Macbeth_801A5E2C = 0x801A5E2C;//segment:ovl_i5 +Macbeth_801A6134 = 0x801A6134;//segment:ovl_i5 +Macbeth_801A65E0 = 0x801A65E0;//segment:ovl_i5 +Macbeth_801A7D98 = 0x801A7D98;//segment:ovl_i5 +Ground_801B6E20 = 0x801B6E20;//segment:ovl_i5 D_i5_801B74F0 = 0x801B74F0;//segment:ovl_i5 size:28 -D_i5_801B7584 = 0x801B7584;//segment:ovl_i5 -D_i5_801B7608 = 0x801B7608;//segment:ovl_i5 -D_i5_801B769C = 0x801B769C;//segment:ovl_i5 -D_i5_801BA1E8 = 0x801BA1E8;//segment:ovl_i5 -D_i5_801BE250 = 0x801BE250;//segment:ovl_i5 size:0x20 -D_i5_801BE2F0 = 0x801BE2F0;//segment:ovl_i5 size:0x12 +D_TI_801B7584 = 0x801B7584;//segment:ovl_i5 +D_TI_801B7608 = 0x801B7608;//segment:ovl_i5 +D_TI_801B769C = 0x801B769C;//segment:ovl_i5 +D_MA_801BA1E8 = 0x801BA1E8;//segment:ovl_i5 +D_MA_801BE250 = 0x801BE250;//segment:ovl_i5 size:0x20 +D_MA_801BE2F0 = 0x801BE2F0;//segment:ovl_i5 size:0x12 D_i5_801B8198 = 0x801B8198;//size:0x210 segment:ovl_i5 -D_i5_801B83A8 = 0x801B83A8;//size:0x814 type:f32 segment:ovl_i5 +D_TI_801B83A8 = 0x801B83A8;//size:0x814 type:f32 segment:ovl_i5 D_i5_801BA708 = 0x801BA708;//size:0xC type:Vec3f segment:ovl_i5 D_i5_801BAA50 = 0x801BAA50;//size:0x28 type:s16 segment:ovl_i5 D_i5_801BBEE0 = 0x801BBEE0;//segment:ovl_i5 @@ -165,19 +210,22 @@ D_i5_801B8138 = 0x801B8138;//size:0x14 segment:ovl_i5 D_i5_801B814C = 0x801B814C;//size:0x14 segment:ovl_i5 D_i5_801B7630 = 0x801B7630;//size:0x24 segment:ovl_i5 -func_i6_801888F4 = 0x801888F4; //segment:ovl_i6 -func_i6_80197CC4 = 0x80197CC4; //segment:ovl_i6 -func_i6_8018D16C = 0x8018D16C; //segment:ovl_i6 +Andross_801888F4 = 0x801888F4; //segment:ovl_i6 +SectorY_80197CC4 = 0x80197CC4; //segment:ovl_i6 +Andross_8018D16C = 0x8018D16C; //segment:ovl_i6 D_i6_801A68B0 = 0x801A68B0;//size:0x48 type:Vec3f segment:ovl_i6 D_i6_801A68F8 = 0x801A68F8;//size:0xC type:f32 segment:ovl_i6 D_i6_801A7F30 = 0x801A7F30; //segment:ovl_i6 -D_i6_801A7F58 = 0x801A7F58; //segment:ovl_i6 -D_i6_801A7F60 = 0x801A7F60; //segment:ovl_i6 -D_i6_801A7F68 = 0x801A7F68; //segment:ovl_i6 -D_i6_801A7F70 = 0x801A7F70; //segment:ovl_i6 -D_i6_801A7F78 = 0x801A7F78; //segment:ovl_i6 +D_Andross_801A7F58 = 0x801A7F58; //segment:ovl_i6 +D_Andross_801A7F60 = 0x801A7F60; //segment:ovl_i6 +D_Andross_801A7F68 = 0x801A7F68; //segment:ovl_i6 +D_Andross_801A7F70 = 0x801A7F70; //segment:ovl_i6 +D_Andross_801A7F78 = 0x801A7F78; //segment:ovl_i6 D_i5_801BE308 = 0x801BE308; //segment:ovl_i6 +Ending_80189C64 = 0x80189C64;//segment:ovl_ending +Ending_80187860 = 0x80187860;//segment:ovl_ending +Ending_8018845C = 0x8018845C;//segment:ovl_ending D_ending_80196D08 = 0x80196D08;//size:0x280 segment:ovl_ending D_ending_80196FA0 = 0x80196FA0;//size:0x960 segment:ovl_ending D_ending_80197900 = 0x80197900;//size:0x960 segment:ovl_ending diff --git a/src/main/audio_general.c b/src/main/audio_general.c index 7fada77e..f5d092fc 100644 --- a/src/main/audio_general.c +++ b/src/main/audio_general.c @@ -4,7 +4,6 @@ #include "audiothread_cmd.h" #include "audioseq_cmd.h" -void Audio_ProcessSeqCmd(u32 seqCmd); void func_8001D0B4(f32* sfxSource, u32 sfxId, f32 freqMod); void func_8001DD40(void); s32 Audio_GetCurrentVoice(void); @@ -1138,6 +1137,7 @@ void Audio_ProcessSeqCmd(u32 seqCmd) { } } #else +void Audio_ProcessSeqCmd(u32 seqCmd); #pragma GLOBAL_ASM("asm/us/nonmatchings/main/audio_general/Audio_ProcessSeqCmd.s") #endif diff --git a/src/main/audio_load.c b/src/main/audio_load.c index 7a11bb86..8ca47f84 100644 --- a/src/main/audio_load.c +++ b/src/main/audio_load.c @@ -2,14 +2,6 @@ #include "sf64dma.h" #include "sf64audio_provisional.h" -extern AudioTable gSampleBankTableInit; -// extern AudioTableEntry gSampleBankTableInitEntries[]; -extern AudioTable gSeqTableInit; -// extern AudioTableEntry gSeqTableInitEntries[]; -extern AudioTable gSoundFontTableInit; -// extern AudioTableEntry gSoundFontTableInitEntries[]; -extern u8 gSeqFontTableInit[]; - static char devstr00[] = "CAUTION:WAVE CACHE FULL %d"; static char D_800C4F6C[] = "SUPERDMA"; static char devstr02[] = "Bank Change... top %d lba %d\n"; diff --git a/src/main/audio_thread.c b/src/main/audio_thread.c index 776971bd..4bf358d4 100644 --- a/src/main/audio_thread.c +++ b/src/main/audio_thread.c @@ -6,8 +6,6 @@ void AudioThread_ProcessCmds(u32 msg); void AudioThread_SetFadeOutTimer(s32 seqPlayId, s32 fadeTime); void AudioThread_SetFadeInTimer(s32 seqPlayId, s32 fadeTime); -extern AudioTable gSampleBankTableInit; - OSMesgQueue sAudioTaskStartQueue; OSMesgQueue sThreadCmdProcQueue; OSMesgQueue sAudioUnkQueue; diff --git a/src/main/audiotables.c b/src/main/audiotables.c index 9be71d99..1899da88 100644 --- a/src/main/audiotables.c +++ b/src/main/audiotables.c @@ -1,5 +1,4 @@ #include "sys.h" -#include "sf64audio_provisional.h" typedef struct { /* 0x00 */ s16 numEntries; @@ -8,6 +7,16 @@ typedef struct { /* 0x08 */ char pad[0x8]; } AudioTableBase; +typedef struct { + /* 0x00 */ u32 romAddr; + /* 0x04 */ u32 size; + /* 0x08 */ s8 medium; + /* 0x09 */ s8 cachePolicy; + /* 0x0A */ s16 shortData1; + /* 0x0C */ s16 shortData2; + /* 0x0E */ s16 shortData3; +} AudioTableEntry; // size = 0x10 + AudioTableBase gSampleBankTableInit = { 4, 0, 0 }; AudioTableEntry gSampleBankTableInitEntries[4] = { { 0, 0xE1E30, 2, 4, 0, 0, 0 }, diff --git a/src/main/fox_360.c b/src/main/fox_360.c index 34d17e0f..9d84304d 100644 --- a/src/main/fox_360.c +++ b/src/main/fox_360.c @@ -9,51 +9,50 @@ #include "assets/ast_enmy_planet.h" #include "assets/ast_sector_z.h" -/* static */ Vec3f D_800C9A90 = { 0.0f, -10.0f, 0.0f }; -/* static */ Vec3f D_800C9A9C[4] = { +/* static */ Vec3f D_360_800C9A90 = { 0.0f, -10.0f, 0.0f }; +/* static */ Vec3f D_360_800C9A9C[4] = { { 0.0f, 20000.0f, 0.0f }, { 0.0f, 700.0f, 6500.0f }, { -300.0f, 800.0f, 6800.0f }, { 300.0f, 900.0f, 7200.0f }, }; -/* static */ s32 D_800C9ACC[4] = { 0, 1, 2, 3 }; -/* static */ s32 D_800C9ADC[4] = { -1, 10, 11, 12 }; -/* static */ s32 D_800C9AEC[4] = { -1, 21, 23, 25 }; -/* static */ Vec3f D_800C9AFC[4] = { +/* static */ s32 D_360_800C9ACC[4] = { 0, 1, 2, 3 }; +/* static */ s32 D_360_800C9ADC[4] = { -1, 10, 11, 12 }; +/* static */ s32 D_360_800C9AEC[4] = { -1, 21, 23, 25 }; +/* static */ Vec3f D_360_800C9AFC[4] = { { 9500.0f, 5000.0f, 9500.0f }, { 10000.0f, 5000.0f, 10000.0f }, { 10000.0f, 5000.0f, 9500.0f }, { 9500.0f, 5000.0f, 10000.0f }, }; -/* static */ s32 D_800C9B2C[4] = { 0, 1, 3, 2 }; -/* static */ f32 D_800C9B3C[4] = { 330.0f, 90.0f, 280.0f, 70.0f }; -s32 D_800C9B4C = 96 * 30; -/* static */ Vec3f D_800C9B50[6] = { +/* static */ s32 D_360_800C9B2C[4] = { 0, 1, 3, 2 }; +/* static */ f32 D_360_800C9B3C[4] = { 330.0f, 90.0f, 280.0f, 70.0f }; +s32 D_360_800C9B4C = 96 * 30; +/* static */ Vec3f D_360_800C9B50[6] = { { 8000.0f, 500.0f, 0.0f }, { 5000.0f, 400.0f, 0.0f }, { 2000.0f, 300.0f, 0.0f }, { -500.0f, 250.0f, 0.0f }, { 0.0f, 250.0f, 0.0f }, { 0.0f, 250.0f, 0.0f }, }; -/* static */ Vec3f D_800C9B98 = { 60.0f, 0.0f, -170.0f }; -/* static */ Vec3f D_800C9BA4 = { -60.0f, 0.0f, -170.0f }; -// /* static */ Vec3f D_800C9BB0 = { 0.0f, 0.0f, 0.0f }; +/* static */ Vec3f D_360_800C9B98 = { 60.0f, 0.0f, -170.0f }; +/* static */ Vec3f D_360_800C9BA4 = { -60.0f, 0.0f, -170.0f }; -s32 D_8015F900; -s32 D_8015F904; -s16 D_8015F908; -s32 D_8015F90C; -s32 D_8015F910; -f32 D_8015F914; -f32 D_8015F918; -f32 D_8015F91C; -u8 D_8015F920; -u8 D_8015F921; -s32 D_8015F924; -s32 D_8015F928; -s32 D_8015F930[3]; -s32 D_8015F93C; -s32 D_8015F940; -f32 D_8015F944; +s32 D_360_8015F900; +s32 D_360_8015F904; +s16 D_360_8015F908; +s32 D_360_8015F90C; +s32 D_360_8015F910; +f32 D_360_8015F914; +f32 D_360_8015F918; +f32 D_360_8015F91C; +u8 D_360_8015F920; +u8 D_360_8015F921; +s32 D_360_8015F924; +s32 D_360_8015F928; +s32 D_360_8015F930[3]; +s32 D_360_8015F93C; +s32 D_360_8015F940; +f32 D_360_8015F944; -void func_8002E3E0(Actor* actor) { +void func_360_8002E3E0(Actor* actor) { s32 hits = 0; (void) "time=%d\n"; @@ -62,23 +61,23 @@ void func_8002E3E0(Actor* actor) { (void) "time=%d\n"; (void) "time=%d\n"; if (gCurrentLevel == LEVEL_VENOM_2) { - if (D_8015F940 < 128 * 30) { + if (D_360_8015F940 < 128 * 30) { hits = 50; - } else if (D_8015F940 < 192 * 30) { + } else if (D_360_8015F940 < 192 * 30) { hits = 30; - } else if (D_8015F940 < 256 * 30) { + } else if (D_360_8015F940 < 256 * 30) { hits = 20; - } else if (D_8015F940 < 320 * 30) { + } else if (D_360_8015F940 < 320 * 30) { hits = 10; } } else { - if (D_8015F940 < 128 * 30) { + if (D_360_8015F940 < 128 * 30) { hits = 10; - } else if (D_8015F940 < 192 * 30) { + } else if (D_360_8015F940 < 192 * 30) { hits = 5; - } else if (D_8015F940 < 256 * 30) { + } else if (D_360_8015F940 < 256 * 30) { hits = 2; - } else if (D_8015F940 < 320 * 30) { + } else if (D_360_8015F940 < 320 * 30) { hits = 1; } } @@ -86,10 +85,10 @@ void func_8002E3E0(Actor* actor) { BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, hits); } gHitCount += hits; - D_80177850 = 15; + D_ctx_80177850 = 15; } -bool func_8002E4F8(u16* msg, RadioCharacterId rcid) { +bool func_360_8002E4F8(u16* msg, RadioCharacterId rcid) { if ((gRadioState == 0) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_0)) { Radio_PlayMessage(msg, rcid); return true; @@ -98,50 +97,50 @@ bool func_8002E4F8(u16* msg, RadioCharacterId rcid) { } } -void func_8002E548(void) { - if (D_8015F93C != 0) { - s32 sp24 = D_8015F930[1]; +void func_360_8002E548(void) { + if (D_360_8015F93C != 0) { + s32 sp24 = D_360_8015F930[1]; - func_8008E51C(D_8015F930, D_8015F944); - if ((D_8015F930[0] == 0) && (sp24 != D_8015F930[1]) && (D_8015F930[1] < 15)) { + func_hud_8008E51C(D_360_8015F930, D_360_8015F944); + if ((D_360_8015F930[0] == 0) && (sp24 != D_360_8015F930[1]) && (D_360_8015F930[1] < 15)) { AUDIO_PLAY_SFX(0x4900C02A, gDefaultSfxSource, 4); } } } -void func_8002E5E0(Boss* boss) { - func_i4_80187520(91, boss); +void func_360_8002E5E0(Boss* boss) { + OvlI4_CallFunction(91, boss); } -void func_8002E604(Boss* boss) { - func_i4_80187520(92, boss); +void func_360_8002E604(Boss* boss) { + OvlI4_CallFunction(92, boss); } -void func_8002E628(Boss* boss) { - func_i4_80187520(93, boss); +void func_360_8002E628(Boss* boss) { + OvlI4_CallFunction(93, boss); } -void func_8002E64C(Boss* boss) { - func_i4_80187520(94, boss); +void func_360_8002E64C(Boss* boss) { + OvlI4_CallFunction(94, boss); } -void func_8002E670(Actor* actor) { - func_i4_80187520(95, actor); +void func_360_8002E670(Actor* actor) { + OvlI4_CallFunction(95, actor); } -void func_8002E694(Actor* actor) { - func_i4_80187520(96, actor); +void func_360_8002E694(Actor* actor) { + OvlI4_CallFunction(96, actor); } -void func_8002E6B8(Actor* actor) { - func_i4_80187520(97, actor); +void func_360_8002E6B8(Actor* actor) { + OvlI4_CallFunction(97, actor); } -void func_8002E6DC(Actor* actor) { - func_i4_80187520(98, actor); +void func_360_8002E6DC(Actor* actor) { + OvlI4_CallFunction(98, actor); } -void func_8002E700(Player* player) { +void func_360_8002E700(Player* player) { Vec3f sp6C; Vec3f sp60; @@ -169,15 +168,15 @@ void func_8002E700(Player* player) { gCsCamAtY = 450.0f; player->pos.z = 0.0f; gCsCamAtZ = 0.0f; - D_80177A48[0] = 1.0f; + D_ctx_80177A48[0] = 1.0f; player->wings.unk_2C = 1; player->unk_1D0++; break; case 1: if (gCsFrameCount >= 47) { - D_80178358 = 255; - D_8017835C = 32; - D_80178348 = D_80178350 = D_80178354 = 0; + D_ctx_80178358 = 255; + D_ctx_8017835C = 32; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; } if (gCsFrameCount >= 64) { player->unk_1D0++; @@ -185,8 +184,8 @@ void func_8002E700(Player* player) { } break; case 2: - if (D_80178340 == 255) { - D_80178358 = 0; + if (D_ctx_80178340 == 255) { + D_ctx_80178358 = 0; player->pos.x = 400.0f; player->pos.y = -420.0f; player->pos.z = 0.0f; @@ -207,12 +206,12 @@ void func_8002E700(Player* player) { } break; case 3: - D_8017835C = 32; + D_ctx_8017835C = 32; gCsCamEyeZ -= 1.0f; - if (D_80178340 == 0) { + if (D_ctx_80178340 == 0) { player->unk_190 = player->unk_194 = 5.0f; player->unk_114 = 90.0f; - player->unk_0D0 = D_80161A54; + player->unk_0D0 = D_play_80161A54; player->unk_1D0++; AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); @@ -251,15 +250,15 @@ void func_8002E700(Player* player) { player->pos.z += player->vel.z; player->unk_138 = player->pos.z; player->unk_0F8 = player->unk_0EC + player->unk_12C + player->unk_130; - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_ctx_80177A48[0], 50000.0f, 0); } -void func_8002ED60(Player* player) { +void func_360_8002ED60(Player* player) { Vec3f sp24; Math_Vec3fFromAngles(&sp24, 0.0f, player->unk_114 + 180.0f, 40.0f); @@ -278,11 +277,11 @@ void func_8002ED60(Player* player) { player->camAt.z = player->pos.z; } -void func_8002EE34(void) { - D_8015F904 = gRadioState = gActors[1].iwork[1] = gActors[2].iwork[1] = gActors[3].iwork[1] = 0; +void func_360_8002EE34(void) { + D_360_8015F904 = gRadioState = gActors[1].iwork[1] = gActors[2].iwork[1] = gActors[3].iwork[1] = 0; } -void func_8002EE64(Actor* actor) { +void func_360_8002EE64(Actor* actor) { s32 i; s32 colId; Object_58* obj58; @@ -296,7 +295,7 @@ void func_8002EE64(Actor* actor) { Vec3f spB4; Vec3f spA8; f32 spA0[2]; - Vec3f sp94 = D_800C9A90; + Vec3f sp94 = D_360_800C9A90; s32 pad1; s32 pad2; @@ -331,7 +330,7 @@ void func_8002EE64(Actor* actor) { } else { colId = COL1_6; } - if (func_800998FC(&spCC, &spC0, &sp94, colId, &spA8, spA0) > 0) { + if (func_col1_800998FC(&spCC, &spC0, &sp94, colId, &spA8, spA0) > 0) { actor->fwork[25] = spA8.y; actor->fwork[26] = spA0[0]; actor->fwork[28] = spA0[1]; @@ -342,7 +341,7 @@ void func_8002EE64(Actor* actor) { if (obj58->obj.id == OBJ_80_3) { colId = COL2_3; } - if (func_800A3690(&spCC, &spC0, colId, &spB4)) { + if (func_col2_800A3690(&spCC, &spC0, colId, &spB4)) { actor->fwork[25] = spB4.y; actor->fwork[26] = spB4.x; actor->fwork[28] = spB4.z; @@ -354,7 +353,7 @@ void func_8002EE64(Actor* actor) { } } -void func_8002F180(void) { +void func_360_8002F180(void) { Actor* actor; s32 i; s32 temp = 4; @@ -370,14 +369,14 @@ void func_8002F180(void) { if (i == 0) { actor->aiType = 1000; } else { - actor->obj.pos.x = D_800C9A9C[i].x; - actor->obj.pos.y = D_800C9A9C[i].y; - actor->obj.pos.z = D_800C9A9C[i].z; - actor->aiType = D_800C9ACC[i]; + actor->obj.pos.x = D_360_800C9A9C[i].x; + actor->obj.pos.y = D_360_800C9A9C[i].y; + actor->obj.pos.z = D_360_800C9A9C[i].z; + actor->aiType = D_360_800C9ACC[i]; if (gCurrentLevel == LEVEL_KATINA) { - actor->aiIndex = D_800C9AEC[i]; + actor->aiIndex = D_360_800C9AEC[i]; } else { - actor->aiIndex = D_800C9ADC[i]; + actor->aiIndex = D_360_800C9ADC[i]; } actor->state = 2; actor->unk_0F4.y = 180.0f; @@ -391,7 +390,7 @@ void func_8002F180(void) { actor->iwork[11] = 1; if (actor->aiType < 4) { AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_800CC01C); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_edata_800CC01C); actor->info.unk_1C = 0.0f; actor->info.bonus = 0; } else { @@ -401,20 +400,20 @@ void func_8002F180(void) { } } -void func_8002F3E0(void) { +void func_360_8002F3E0(void) { Actor* actor; s32 i; for (i = 0, actor = &gActors[4]; i < 4; i++, actor++) { - if (D_80177CD0[i] != 0) { + if (D_ctx_80177CD0[i] != 0) { Actor_Initialize(actor); actor->obj.status = OBJ_ACTIVE; - actor->obj.pos.x = D_800C9AFC[i].x; - actor->obj.pos.y = D_800C9AFC[i].y; - actor->obj.pos.z = D_800C9AFC[i].z; + actor->obj.pos.x = D_360_800C9AFC[i].x; + actor->obj.pos.y = D_360_800C9AFC[i].y; + actor->obj.pos.z = D_360_800C9AFC[i].z; actor->obj.id = OBJ_ACTOR_197; actor->aiType = i + 4; - actor->aiIndex = D_800C9B2C[i]; + actor->aiIndex = D_360_800C9B2C[i]; gActors[actor->aiIndex].aiIndex = -1; actor->health = 100; actor->unk_0C9 = 1; @@ -424,7 +423,7 @@ void func_8002F3E0(void) { actor->unk_0F4.x = -20.0f; actor->iwork[11] = 1; if (gCurrentLevel == LEVEL_VENOM_2) { - actor->obj.rot.z = D_800C9B3C[i]; + actor->obj.rot.z = D_360_800C9B3C[i]; actor->unk_044 = 25; } Object_SetInfo(&actor->info, actor->obj.id); @@ -437,44 +436,44 @@ void func_8002F3E0(void) { } } -void func_8002F5F4(u16* msg, RadioCharacterId character) { - if ((D_80178300 == 0) && (gActors[0].state == 2) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_0)) { +void func_360_8002F5F4(u16* msg, RadioCharacterId character) { + if ((D_ctx_80178300 == 0) && (gActors[0].state == 2) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_0)) { Radio_PlayMessage(msg, character); } } -void func_8002F64C(u16* msg, RadioCharacterId character) { - if ((D_80177CD0[0] + D_80177CD0[1] + D_80177CD0[2] + D_80177CD0[3]) == 0) { +void func_360_8002F64C(u16* msg, RadioCharacterId character) { + if ((D_ctx_80177CD0[0] + D_ctx_80177CD0[1] + D_ctx_80177CD0[2] + D_ctx_80177CD0[3]) == 0) { gRadioState = 0; } - func_8002F5F4(msg, character); + func_360_8002F5F4(msg, character); } -void func_8002F69C(Actor* actor) { +void func_360_8002F69C(Actor* actor) { Actor* otherActor; s32 i; - if (D_8015F904 != 0) { - D_8015F904--; - if ((D_8015F904 == 0) && (gCurrentLevel != LEVEL_BOLSE) && - ((D_80177CD0[0] + D_80177CD0[1] + D_80177CD0[2] + D_80177CD0[3]) == 1)) { + if (D_360_8015F904 != 0) { + D_360_8015F904--; + if ((D_360_8015F904 == 0) && (gCurrentLevel != LEVEL_BOLSE) && + ((D_ctx_80177CD0[0] + D_ctx_80177CD0[1] + D_ctx_80177CD0[2] + D_ctx_80177CD0[3]) == 1)) { Radio_PlayMessage(gMsg_ID_19465, RCID_FOX); } } - if (((D_8015F928 + 100) == (0, D_800C9B4C)) && (gCurrentLevel != LEVEL_VENOM_2)) { + if (((D_360_8015F928 + 100) == (0, D_360_800C9B4C)) && (gCurrentLevel != LEVEL_VENOM_2)) { // fake? SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 30); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 30); } - if (D_8015F928 == D_800C9B4C) { - func_8002F3E0(); + if (D_360_8015F928 == D_360_800C9B4C) { + func_360_8002F3E0(); actor->state = 3; gPlayer[0].state_1C8 = PLAYERSTATE_1C8_0; if ((gCurrentLevel == LEVEL_VENOM_2) || (gCurrentLevel == LEVEL_BOLSE)) { gPlayer[0].unk_034 = 20.0f; } AUDIO_PLAY_BGM(SEQ_ID_43 | 0x8000); - func_8002EE34(); + func_360_8002EE34(); if ((gCurrentLevel == LEVEL_FORTUNA) || (gCurrentLevel == LEVEL_VENOM_2)) { gPlayer[0].camEye.x = 4500.0f; } else if (gCurrentLevel == LEVEL_BOLSE) { @@ -486,9 +485,9 @@ void func_8002F69C(Actor* actor) { gPlayer[0].camAt.y = gActors[4].obj.pos.y; gPlayer[0].camAt.z = gActors[4].obj.pos.z; } - if (D_8015F928 > D_800C9B4C) { - if (D_8015F908 == 0) { - D_8015F940++; + if (D_360_8015F928 > D_360_800C9B4C) { + if (D_360_8015F908 == 0) { + D_360_8015F940++; for (i = 1, otherActor = &gActors[1]; i < 8; i++, otherActor++) { if ((otherActor->obj.status == OBJ_ACTIVE) && (otherActor->state == 2) && (otherActor->health < 70) && (otherActor->timer_0C6 != 0) && (otherActor->unk_0D4 == 1)) { @@ -496,20 +495,20 @@ void func_8002F69C(Actor* actor) { gActors[otherActor->aiIndex].iwork[2] = 0; gActors[otherActor->aiIndex].state = 2; gActors[otherActor->aiIndex].aiIndex = otherActor->aiType; - if (D_800CA234 == &gActors[otherActor->aiIndex]) { - D_800CA234 = NULL; - D_Timer_800CA238 = 0; + if (D_display_800CA234 == &gActors[otherActor->aiIndex]) { + D_display_800CA234 = NULL; + D_display_Timer_800CA238 = 0; } if (gActors[otherActor->aiIndex].iwork[3] == 0) { switch (gActors[otherActor->aiIndex].aiType) { case 1: - func_8002F5F4(gMsg_ID_9160, RCID_FALCO); + func_360_8002F5F4(gMsg_ID_9160, RCID_FALCO); break; case 2: - func_8002F5F4(gMsg_ID_9170, RCID_SLIPPY); + func_360_8002F5F4(gMsg_ID_9170, RCID_SLIPPY); break; case 3: - func_8002F5F4(gMsg_ID_9180, RCID_PEPPY); + func_360_8002F5F4(gMsg_ID_9180, RCID_PEPPY); break; } gActors[otherActor->aiIndex].iwork[3] = 200; @@ -539,7 +538,7 @@ void func_8002F69C(Actor* actor) { } } -void func_8002FB4C(Actor* actor) { +void func_360_8002FB4C(Actor* actor) { Actor* actor2; Actor* actor1; s32 var_a0; @@ -565,7 +564,7 @@ void func_8002FB4C(Actor* actor) { } } -void func_8002FC00(Actor* actor) { +void func_360_8002FC00(Actor* actor) { Actor* otherActor; s32 i; @@ -581,22 +580,22 @@ void func_8002FC00(Actor* actor) { } } if (gTeamShields[otherActor->aiIndex] > 0) { - func_8002FB4C(&gActors[otherActor->aiIndex]); + func_360_8002FB4C(&gActors[otherActor->aiIndex]); if ((otherActor->iwork[5] != 0) && (otherActor->unk_0D4 == 1) && (gActors[otherActor->aiIndex].iwork[3] == 0)) { - if (D_800CA234 == &gActors[otherActor->aiIndex]) { - D_800CA234 = NULL; - D_Timer_800CA238 = 0; + if (D_display_800CA234 == &gActors[otherActor->aiIndex]) { + D_display_800CA234 = NULL; + D_display_Timer_800CA238 = 0; } switch (gActors[otherActor->aiIndex].aiType) { case 1: - func_8002F5F4(gMsg_ID_9160, RCID_FALCO); + func_360_8002F5F4(gMsg_ID_9160, RCID_FALCO); break; case 2: - func_8002F5F4(gMsg_ID_9170, RCID_SLIPPY); + func_360_8002F5F4(gMsg_ID_9170, RCID_SLIPPY); break; case 3: - func_8002F5F4(gMsg_ID_9180, RCID_PEPPY); + func_360_8002F5F4(gMsg_ID_9180, RCID_PEPPY); break; } gActors[otherActor->aiIndex].iwork[3] = 200; @@ -607,10 +606,10 @@ void func_8002FC00(Actor* actor) { } } -bool func_8002FE74(void) { +bool func_360_8002FE74(void) { switch (gCurrentLevel) { case LEVEL_FORTUNA: - return D_8015F928 == D_800C9B4C + 2400; + return D_360_8015F928 == D_360_800C9B4C + 2400; case LEVEL_BOLSE: return gBosses[2].swork[36] == 4; case LEVEL_KATINA: @@ -619,20 +618,20 @@ bool func_8002FE74(void) { return false; } -void func_8002FEF0(Actor* actor) { +void func_360_8002FEF0(Actor* actor) { Actor* newActor; s32 i; - if ((D_80161690 != 0) && (gControllerPress[gMainController].button & R_CBUTTONS)) { + if ((D_enmy2_80161690 != 0) && (gControllerPress[gMainController].button & R_CBUTTONS)) { func_8001AF40(0); - D_800CFF90 = 0; - D_80161690 = 0; + D_enmy2_800CFF90 = 0; + D_enmy2_80161690 = 0; Radio_PlayMessage(gMsg_ID_20230, RCID_ROB64); - D_8015F900 = 160; + D_360_8015F900 = 160; } - if (D_8015F900 != 0) { - D_8015F900--; - if (D_8015F900 == 0) { + if (D_360_8015F900 != 0) { + D_360_8015F900--; + if (D_360_8015F900 == 0) { for (i = 20, newActor = &gActors[20]; i < 60; i++, newActor++) { if (newActor->obj.status == OBJ_FREE) { Actor_Initialize(newActor); @@ -656,44 +655,44 @@ void func_8002FEF0(Actor* actor) { } } } - if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) && (D_8015F910 == 0)) { - if (D_8015F90C != 0) { - D_8015F90C--; + if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) && (D_360_8015F910 == 0)) { + if (D_360_8015F90C != 0) { + D_360_8015F90C--; } - if ((gPlayer[0].shields < 64) || func_8002FE74() || (D_8015F90C == 1)) { - D_80161690 = 60; - D_8015F910 = 1; + if ((gPlayer[0].shields < 64) || func_360_8002FE74() || (D_360_8015F90C == 1)) { + D_enmy2_80161690 = 60; + D_360_8015F910 = 1; } } } -void func_8003010C(Actor* actor) { +void func_360_8003010C(Actor* actor) { if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_4) || (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_6)) { Object_Kill(&actor->obj, actor->sfxSource); return; } - D_8015F928++; + D_360_8015F928++; switch (gCurrentLevel) { case LEVEL_FORTUNA: - func_i4_80187960(actor); + Fortuna_80187960(actor); break; case LEVEL_KATINA: - func_i4_80198594(actor); + Katina_80198594(actor); break; case LEVEL_BOLSE: - func_i4_8018C158(actor); + Bolse_8018C158(actor); break; case LEVEL_SECTOR_Z: - func_i4_8019AB8C(actor); + SectorZ_8019AB8C(actor); break; case LEVEL_VENOM_2: - func_i6_80196314(actor); + Venom2_80196314(actor); break; } - func_8002FEF0(actor); + func_360_8002FEF0(actor); } -s32 func_800301F4(Actor* actor) { +s32 func_360_800301F4(Actor* actor) { Boss* boss; f32 temp_ft4; f32 temp_ft5; @@ -735,7 +734,7 @@ s32 func_800301F4(Actor* actor) { return 0; } -s32 func_8003049C(Actor* actor) { +s32 func_360_8003049C(Actor* actor) { Object_58* obj58; s32 i; f32 sp44; @@ -751,7 +750,7 @@ s32 func_8003049C(Actor* actor) { return 0; } if ((gLevelType == LEVELTYPE_SPACE) && (gCurrentLevel != LEVEL_BOLSE)) { - return func_800301F4(actor); + return func_360_800301F4(actor); } sp40 = SIN_DEG(actor->obj.rot.y); sp3C = COS_DEG(actor->obj.rot.y); @@ -789,7 +788,7 @@ s32 func_8003049C(Actor* actor) { return 0; } -void func_8003088C(Actor* actor) { +void func_360_8003088C(Actor* actor) { s32 var_a1; Vec3f sp48; Vec3f sp3C; @@ -838,14 +837,14 @@ void func_8003088C(Actor* actor) { if (actor->health <= 0) { actor->health = 0; if (actor->aiType == 200) { - func_i4_80199900(actor, 1); + SectorZ_80199900(actor, 1); if (actor->unk_0D4 == 1) { if (gActors[8].obj.status == OBJ_ACTIVE) { Radio_PlayMessage(gMsg_ID_16140, RCID_KATT); } BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10); gHitCount += 11; - D_80177850 = 15; + D_ctx_80177850 = 15; } else { switch (actor->unk_0D4) { case 102: @@ -868,7 +867,7 @@ void func_8003088C(Actor* actor) { actor->iwork[8] = 20; actor->obj.status = OBJ_DYING; actor->fwork[23] = 0.0f; - func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 4.0f); + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 4.0f); AUDIO_PLAY_SFX(0x2903700B, actor->sfxSource, 4); actor->timer_0C2 = 10; actor->timer_0BE = 0; @@ -904,60 +903,60 @@ void func_8003088C(Actor* actor) { actor->timer_0BC = 0; } if ((gCurrentLevel == LEVEL_KATINA) && (actor->unk_0B6 == 1) && (actor->unk_0D4 == 1)) { - if (D_8015F921 < 2) { - func_8002F5F4(gMsg_ID_18018, RCID_BILL); + if (D_360_8015F921 < 2) { + func_360_8002F5F4(gMsg_ID_18018, RCID_BILL); } - D_8015F921++; + D_360_8015F921++; } switch (actor->aiType) { case 4: - D_80177CD0[0] = 0; + D_ctx_80177CD0[0] = 0; if (gCurrentLevel == LEVEL_VENOM_2) { - func_8002F64C(gMsg_ID_19458, RCID_WOLF); + func_360_8002F64C(gMsg_ID_19458, RCID_WOLF); } else { - func_8002F64C(gMsg_ID_9365, RCID_WOLF); + func_360_8002F64C(gMsg_ID_9365, RCID_WOLF); } break; case 5: - D_80177CD0[1] = 0; + D_ctx_80177CD0[1] = 0; if (gCurrentLevel == LEVEL_VENOM_2) { - func_8002F64C(gMsg_ID_19459, RCID_LEON); + func_360_8002F64C(gMsg_ID_19459, RCID_LEON); } else { - func_8002F64C(gMsg_ID_9366, RCID_LEON); + func_360_8002F64C(gMsg_ID_9366, RCID_LEON); } break; case 6: - D_80177CD0[2] = 0; + D_ctx_80177CD0[2] = 0; if (gCurrentLevel == LEVEL_VENOM_2) { - func_8002F64C(gMsg_ID_19460, RCID_PIGMA); + func_360_8002F64C(gMsg_ID_19460, RCID_PIGMA); } else { - func_8002F64C(gMsg_ID_9367, RCID_PIGMA); + func_360_8002F64C(gMsg_ID_9367, RCID_PIGMA); } break; case 7: - D_80177CD0[3] = 0; + D_ctx_80177CD0[3] = 0; if (gCurrentLevel == LEVEL_VENOM_2) { - func_8002F64C(gMsg_ID_19461, RCID_ANDREW); + func_360_8002F64C(gMsg_ID_19461, RCID_ANDREW); } else { - func_8002F64C(gMsg_ID_9368, RCID_ANDREW); + func_360_8002F64C(gMsg_ID_9368, RCID_ANDREW); } break; } if ((actor->aiType >= 4) && (actor->aiType < 8)) { - D_8015F904 = 150; + D_360_8015F904 = 150; } switch (actor->unk_0D4) { case 1: if (actor->aiType >= 10) { switch (actor->iwork[2]) { case 1: - func_8002F5F4(gMsg_ID_20170, RCID_FALCO); + func_360_8002F5F4(gMsg_ID_20170, RCID_FALCO); break; case 2: - func_8002F5F4(gMsg_ID_20150, RCID_SLIPPY); + func_360_8002F5F4(gMsg_ID_20150, RCID_SLIPPY); break; case 3: - func_8002F5F4(gMsg_ID_20160, RCID_PEPPY); + func_360_8002F5F4(gMsg_ID_20160, RCID_PEPPY); break; } } @@ -966,7 +965,7 @@ void func_8003088C(Actor* actor) { case 103: case 104: if ((actor->aiType >= 4) && (actor->aiType < 8)) { - if ((D_80177CD0[0] + D_80177CD0[1] + D_80177CD0[2] + D_80177CD0[3]) == 0) { + if ((D_ctx_80177CD0[0] + D_ctx_80177CD0[1] + D_ctx_80177CD0[2] + D_ctx_80177CD0[3]) == 0) { switch (actor->unk_0D4) { case 102: Radio_PlayMessage(gMsg_ID_9438, RCID_FALCO); @@ -1008,7 +1007,7 @@ void func_8003088C(Actor* actor) { } else if (actor->iwork[7] == 0) { AUDIO_PLAY_SFX(0x2903300E, actor->sfxSource, 4); } - func_8007D10C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.5f); + func_effect_8007D10C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.5f); if (actor->aiType < 100) { Matrix_RotateY(gCalcMatrix, actor->unk_0F4.y * M_DTOR, 0); sp48.x = 30.0f; @@ -1034,41 +1033,41 @@ void func_8003088C(Actor* actor) { if (actor->unk_0D0 == 3) { switch (actor->aiType) { case 1: - func_8002F5F4(gMsg_ID_20210, RCID_FALCO); + func_360_8002F5F4(gMsg_ID_20210, RCID_FALCO); break; case 3: - func_8002F5F4(gMsg_ID_20200, RCID_PEPPY); + func_360_8002F5F4(gMsg_ID_20200, RCID_PEPPY); break; case 2: - func_8002F5F4(gMsg_ID_20190, RCID_SLIPPY); + func_360_8002F5F4(gMsg_ID_20190, RCID_SLIPPY); break; case 8: - func_8002F5F4(gMsg_ID_20084, RCID_KATT); + func_360_8002F5F4(gMsg_ID_20084, RCID_KATT); break; } } else if (actor->unk_0D4 < 105) { if (actor->aiType >= 4) { if (actor->unk_0D4 == 1) { - if ((gCurrentLevel == LEVEL_KATINA) && (actor->unk_0B6 == 1) && (D_8015F920 == 0)) { - D_8015F920 = 1; + if ((gCurrentLevel == LEVEL_KATINA) && (actor->unk_0B6 == 1) && (D_360_8015F920 == 0)) { + D_360_8015F920 = 1; Radio_PlayMessage(gMsg_ID_18015, RCID_BILL); } else if (actor->aiType == 8) { - func_8002F5F4(gMsg_ID_20084, RCID_KATT); + func_360_8002F5F4(gMsg_ID_20084, RCID_KATT); } else if (actor->aiType == 9) { - func_8002F5F4(gMsg_ID_20085, RCID_BILL); + func_360_8002F5F4(gMsg_ID_20085, RCID_BILL); } else if (gCurrentLevel == LEVEL_VENOM_2) { switch (actor->aiType) { case 4: - func_8002F5F4(gMsg_ID_19454, RCID_WOLF); + func_360_8002F5F4(gMsg_ID_19454, RCID_WOLF); break; case 5: - func_8002F5F4(gMsg_ID_19455, RCID_LEON); + func_360_8002F5F4(gMsg_ID_19455, RCID_LEON); break; case 6: - func_8002F5F4(gMsg_ID_19456, RCID_PIGMA); + func_360_8002F5F4(gMsg_ID_19456, RCID_PIGMA); break; case 7: - func_8002F5F4(gMsg_ID_19457, RCID_ANDREW); + func_360_8002F5F4(gMsg_ID_19457, RCID_ANDREW); break; } } @@ -1076,13 +1075,13 @@ void func_8003088C(Actor* actor) { } else if (actor->unk_0D4 == 1) { switch (actor->aiType) { case 1: - func_8002F5F4(gMsg_ID_20060, RCID_FALCO); + func_360_8002F5F4(gMsg_ID_20060, RCID_FALCO); break; case 3: - func_8002F5F4(gMsg_ID_20070, RCID_PEPPY); + func_360_8002F5F4(gMsg_ID_20070, RCID_PEPPY); break; case 2: - func_8002F5F4(gMsg_ID_20080, RCID_SLIPPY); + func_360_8002F5F4(gMsg_ID_20080, RCID_SLIPPY); break; } } @@ -1090,35 +1089,35 @@ void func_8003088C(Actor* actor) { switch (actor->aiType) { case 1: if (gTeamShields[1] >= 90) { - func_8002F5F4(gMsg_ID_9130, RCID_FALCO); + func_360_8002F5F4(gMsg_ID_9130, RCID_FALCO); } else { Radio_PlayMessage(gMsg_ID_9151, RCID_FALCO); } - if ((D_800CA234 == NULL) || (gTeamShields[actor->aiType] <= 50)) { - D_800CA234 = actor; - D_Timer_800CA238 = 320; + if ((D_display_800CA234 == NULL) || (gTeamShields[actor->aiType] <= 50)) { + D_display_800CA234 = actor; + D_display_Timer_800CA238 = 320; } break; case 2: if (gTeamShields[2] >= 90) { - func_8002F5F4(gMsg_ID_9140, RCID_SLIPPY); + func_360_8002F5F4(gMsg_ID_9140, RCID_SLIPPY); } else { Radio_PlayMessage(gMsg_ID_9152, RCID_SLIPPY); } - if ((D_800CA234 == NULL) || (gTeamShields[actor->aiType] <= 50)) { - D_800CA234 = actor; - D_Timer_800CA238 = 320; + if ((D_display_800CA234 == NULL) || (gTeamShields[actor->aiType] <= 50)) { + D_display_800CA234 = actor; + D_display_Timer_800CA238 = 320; } break; case 3: if (gTeamShields[3] >= 90) { - func_8002F5F4(gMsg_ID_9150, RCID_PEPPY); + func_360_8002F5F4(gMsg_ID_9150, RCID_PEPPY); } else { Radio_PlayMessage(gMsg_ID_9153, RCID_PEPPY); } - if ((D_800CA234 == NULL) || (gTeamShields[actor->aiType] <= 50)) { - D_800CA234 = actor; - D_Timer_800CA238 = 320; + if ((D_display_800CA234 == NULL) || (gTeamShields[actor->aiType] <= 50)) { + D_display_800CA234 = actor; + D_display_Timer_800CA238 = 320; } break; } @@ -1130,7 +1129,7 @@ void func_8003088C(Actor* actor) { } } -void func_80031858(Actor* actor) { +void func_360_80031858(Actor* actor) { if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) && (actor->iwork[24] != 0) && (fabsf(actor->obj.pos.x - gPlayer[0].pos.x) < 1000.0f) && (fabsf(actor->obj.pos.y - gPlayer[0].pos.y) < 1000.0f) && @@ -1141,7 +1140,7 @@ void func_80031858(Actor* actor) { } } -bool func_80031900(Actor* actor) { +bool func_360_80031900(Actor* actor) { Vec3f sp24; Vec3f sp18; @@ -1156,7 +1155,7 @@ bool func_80031900(Actor* actor) { return false; } -void func_800319AC(Actor* this) { +void func_360_800319AC(Actor* this) { u8 sp10F; s32 sp108; s32 sp104; @@ -1183,8 +1182,8 @@ void func_800319AC(Actor* this) { Vec3f spA8; Vec3f sp9C; Vec3f sp90; - Vec3f sp84 = D_800C9B98; - Vec3f sp78 = D_800C9BA4; + Vec3f sp84 = D_360_800C9B98; + Vec3f sp78 = D_360_800C9BA4; s32 pad1; s32 pad2; s32 pad3; @@ -1192,7 +1191,7 @@ void func_800319AC(Actor* this) { if (this->aiType == 1000) { this->timer_0C2 = 10; this->info.unk_1C = 0.0f; - func_8003010C(this); + func_360_8003010C(this); return; } if ((this->iwork[17] != 0) && (this->iwork[16] == 0) && (this->aiType >= 4)) { @@ -1276,7 +1275,7 @@ void func_800319AC(Actor* this) { this->iwork[11] = 1; } if (this->aiType < 10) { - func_80031858(this); + func_360_80031858(this); if (this->iwork[10] == 200) { switch (this->aiType) { case 4: @@ -1355,11 +1354,11 @@ void func_800319AC(Actor* this) { gTeamShields[this->aiType] = -1; gTeamDamage[this->aiType] = 0; if (gCurrentLevel == LEVEL_SECTOR_Z) { - this->fwork[4] = D_800C9B50[this->unk_046].x; - this->fwork[5] = D_800C9B50[this->unk_046].y; - this->fwork[6] = D_800C9B50[this->unk_046].z; - if ((fabsf(this->obj.pos.x - D_800C9B50[this->unk_046].x) < 800.0f) && - (fabsf(this->obj.pos.z - D_800C9B50[this->unk_046].z) < 800.0f)) { + this->fwork[4] = D_360_800C9B50[this->unk_046].x; + this->fwork[5] = D_360_800C9B50[this->unk_046].y; + this->fwork[6] = D_360_800C9B50[this->unk_046].z; + if ((fabsf(this->obj.pos.x - D_360_800C9B50[this->unk_046].x) < 800.0f) && + (fabsf(this->obj.pos.z - D_360_800C9B50[this->unk_046].z) < 800.0f)) { this->unk_046++; if (this->unk_046 >= 4) { Object_Kill(&this->obj, this->sfxSource); @@ -1374,7 +1373,7 @@ void func_800319AC(Actor* this) { sp104 = 2; break; case 5: - func_i4_80199C60(this); + SectorZ_80199C60(this); sp104 = 1; break; case 0: @@ -1447,7 +1446,7 @@ void func_800319AC(Actor* this) { this->unk_04E = 300; this->timer_0BC = 160; if (this->aiType == 4) { - func_8002F5F4(gMsg_ID_9369, RCID_WOLF); + func_360_8002F5F4(gMsg_ID_9369, RCID_WOLF); } break; } else if ((this->iwork[4] > 200) && (gPlayer[0].timer_224 != 0)) { @@ -1534,27 +1533,27 @@ void func_800319AC(Actor* this) { this->iwork[4]++; this->iwork[5] = 1; if (!((this->index + gGameFrameCount) & sp10F) && (Rand_ZeroOne() < spF0) && - func_80031900(this) && ((gActors[0].state == 2) || (gCurrentLevel == LEVEL_TRAINING))) { + func_360_80031900(this) && ((gActors[0].state == 2) || (gCurrentLevel == LEVEL_TRAINING))) { if ((this->aiIndex == 0) && (gCurrentLevel != LEVEL_TRAINING)) { if ((this->iwork[4] > 250) && (gCurrentLevel != LEVEL_VENOM_ANDROSS)) { if ((Rand_ZeroOne() < 0.5f) || (gCurrentLevel == LEVEL_VENOM_2)) { this->iwork[4] = 0; switch (this->aiType) { case 4: - func_8002E4F8(gMsg_ID_19450, RCID_WOLF); + func_360_8002E4F8(gMsg_ID_19450, RCID_WOLF); break; case 5: - func_8002E4F8(gMsg_ID_19451, RCID_LEON); + func_360_8002E4F8(gMsg_ID_19451, RCID_LEON); break; case 6: - func_8002E4F8(gMsg_ID_19452, RCID_PIGMA); + func_360_8002E4F8(gMsg_ID_19452, RCID_PIGMA); break; case 7: - func_8002E4F8(gMsg_ID_19453, RCID_ANDREW); + func_360_8002E4F8(gMsg_ID_19453, RCID_ANDREW); break; } } else { - func_8002E4F8(gMsg_ID_2233, RCID_FALCO); + func_360_8002E4F8(gMsg_ID_2233, RCID_FALCO); } } this->iwork[0] = 1; @@ -1562,72 +1561,72 @@ void func_800319AC(Actor* this) { this->iwork[0] = 1; } } - if ((gRadioState == 0) && (this->timer_0C4 == 0) && (D_8015F928 > 700) && (D_8015F908 == 0) && - (gActors[0].obj.status == OBJ_ACTIVE)) { + if ((gRadioState == 0) && (this->timer_0C4 == 0) && (D_360_8015F928 > 700) && + (D_360_8015F908 == 0) && (gActors[0].obj.status == OBJ_ACTIVE)) { this->timer_0C4 = 600; if (Rand_ZeroOne() < 0.5f) { gActors[this->aiIndex].iwork[6]++; switch (this->aiIndex) { case 1: if ((gCurrentLevel == LEVEL_VENOM_2) && (Rand_ZeroOne() < 0.5f)) { - func_8002F5F4(gMsg_ID_19462, RCID_FALCO); + func_360_8002F5F4(gMsg_ID_19462, RCID_FALCO); } else if ((gActors[this->aiIndex].iwork[6] >= 3) && (Rand_ZeroOne() < 0.5f)) { - func_8002F5F4(gMsg_ID_20310, RCID_FALCO); + func_360_8002F5F4(gMsg_ID_20310, RCID_FALCO); } else { - func_8002F5F4(gMsg_ID_9100, RCID_FALCO); + func_360_8002F5F4(gMsg_ID_9100, RCID_FALCO); } gActors[this->aiIndex].iwork[2] = this->aiType; - if ((D_800CA234 == NULL) || (gTeamShields[this->aiIndex] <= 50)) { - D_800CA234 = &gActors[this->aiIndex]; - D_Timer_800CA238 = 320; + if ((D_display_800CA234 == NULL) || (gTeamShields[this->aiIndex] <= 50)) { + D_display_800CA234 = &gActors[this->aiIndex]; + D_display_Timer_800CA238 = 320; } break; case 2: if ((gCurrentLevel == LEVEL_VENOM_2) && (Rand_ZeroOne() < 0.5f)) { - func_8002F5F4(gMsg_ID_19463, RCID_SLIPPY); + func_360_8002F5F4(gMsg_ID_19463, RCID_SLIPPY); } else if ((gActors[this->aiIndex].iwork[6] >= 3) && (Rand_ZeroOne() < 0.5f)) { - func_8002F5F4(gMsg_ID_20311, RCID_SLIPPY); + func_360_8002F5F4(gMsg_ID_20311, RCID_SLIPPY); } else { - func_8002F5F4(gMsg_ID_9110, RCID_SLIPPY); + func_360_8002F5F4(gMsg_ID_9110, RCID_SLIPPY); } gActors[this->aiIndex].iwork[2] = this->aiType; - if ((D_800CA234 == NULL) || (gTeamShields[this->aiIndex] <= 50)) { - D_800CA234 = &gActors[this->aiIndex]; - D_Timer_800CA238 = 320; + if ((D_display_800CA234 == NULL) || (gTeamShields[this->aiIndex] <= 50)) { + D_display_800CA234 = &gActors[this->aiIndex]; + D_display_Timer_800CA238 = 320; } break; case 3: if ((gCurrentLevel == LEVEL_VENOM_2) && (Rand_ZeroOne() < 0.5f)) { - func_8002F5F4(gMsg_ID_19464, 0x1E); + func_360_8002F5F4(gMsg_ID_19464, 0x1E); } else if ((gActors[this->aiIndex].iwork[6] >= 3) && (Rand_ZeroOne() < 0.5f)) { - func_8002F5F4(gMsg_ID_20312, 0x1E); + func_360_8002F5F4(gMsg_ID_20312, 0x1E); } else { - func_8002F5F4(gMsg_ID_9120, 0x1E); + func_360_8002F5F4(gMsg_ID_9120, 0x1E); } gActors[this->aiIndex].iwork[2] = this->aiType; - if ((D_800CA234 == NULL) || (gTeamShields[this->aiIndex] <= 50)) { - D_800CA234 = &gActors[this->aiIndex]; - D_Timer_800CA238 = 320; + if ((D_display_800CA234 == NULL) || (gTeamShields[this->aiIndex] <= 50)) { + D_display_800CA234 = &gActors[this->aiIndex]; + D_display_Timer_800CA238 = 320; } break; case 4: - if (D_80177CD0[0] != 0) { - func_8002F5F4(gMsg_ID_9330, RCID_WOLF); + if (D_ctx_80177CD0[0] != 0) { + func_360_8002F5F4(gMsg_ID_9330, RCID_WOLF); } break; case 5: - if (D_80177CD0[1] != 0) { - func_8002F5F4(gMsg_ID_9340, RCID_LEON); + if (D_ctx_80177CD0[1] != 0) { + func_360_8002F5F4(gMsg_ID_9340, RCID_LEON); } break; case 6: - if (D_80177CD0[2] != 0) { - func_8002F5F4(gMsg_ID_9350, RCID_PIGMA); + if (D_ctx_80177CD0[2] != 0) { + func_360_8002F5F4(gMsg_ID_9350, RCID_PIGMA); } break; case 7: - if (D_80177CD0[3] != 0) { - func_8002F5F4(gMsg_ID_9360, RCID_ANDREW); + if (D_ctx_80177CD0[3] != 0) { + func_360_8002F5F4(gMsg_ID_9360, RCID_ANDREW); } break; } @@ -1635,25 +1634,25 @@ void func_800319AC(Actor* this) { switch (this->aiType) { case 1: if ((gCurrentLevel == LEVEL_FORTUNA) && (Rand_ZeroOne() < 0.5f)) { - func_8002F5F4(gMsg_ID_9211, RCID_FALCO); + func_360_8002F5F4(gMsg_ID_9211, RCID_FALCO); } else { - func_8002F5F4(gMsg_ID_9190, RCID_FALCO); + func_360_8002F5F4(gMsg_ID_9190, RCID_FALCO); } gActors[this->aiIndex].iwork[2] = 1; break; case 2: if ((gCurrentLevel == LEVEL_FORTUNA) && (Rand_ZeroOne() < 0.5f)) { - func_8002F5F4(gMsg_ID_9212, RCID_SLIPPY); + func_360_8002F5F4(gMsg_ID_9212, RCID_SLIPPY); } else { - func_8002F5F4(gMsg_ID_9200, RCID_SLIPPY); + func_360_8002F5F4(gMsg_ID_9200, RCID_SLIPPY); } gActors[this->aiIndex].iwork[2] = 2; break; case 3: if ((gCurrentLevel == LEVEL_FORTUNA) && (Rand_ZeroOne() < 0.5f)) { - func_8002F5F4(gMsg_ID_9213, RCID_PEPPY); + func_360_8002F5F4(gMsg_ID_9213, RCID_PEPPY); } else { - func_8002F5F4(gMsg_ID_9210, RCID_PEPPY); + func_360_8002F5F4(gMsg_ID_9210, RCID_PEPPY); } gActors[this->aiIndex].iwork[2] = 3; break; @@ -1661,56 +1660,56 @@ void func_800319AC(Actor* this) { if (gCurrentLevel != LEVEL_VENOM_2) { if (this->iwork[6] == 0) { this->iwork[6] = 1; - func_8002F5F4(gMsg_ID_9289, RCID_WOLF); + func_360_8002F5F4(gMsg_ID_9289, RCID_WOLF); } else if (this->iwork[4] > 150) { if (Rand_ZeroOne() < 0.5f) { this->iwork[4] = 0; - func_8002F5F4(gMsg_ID_9290, RCID_WOLF); + func_360_8002F5F4(gMsg_ID_9290, RCID_WOLF); } else { - func_8002F5F4(gMsg_ID_2233, RCID_FALCO); + func_360_8002F5F4(gMsg_ID_2233, RCID_FALCO); } } else { - func_8002F5F4(gMsg_ID_9322, RCID_WOLF); + func_360_8002F5F4(gMsg_ID_9322, RCID_WOLF); } } break; case 5: if (gCurrentLevel == LEVEL_VENOM_2) { if ((Rand_ZeroOne() < 0.5f) && (this->aiIndex == 1)) { - func_8002F5F4(gMsg_ID_9323, RCID_LEON); + func_360_8002F5F4(gMsg_ID_9323, RCID_LEON); } else { - func_8002F5F4(gMsg_ID_19451, RCID_LEON); + func_360_8002F5F4(gMsg_ID_19451, RCID_LEON); } } else if ((Rand_ZeroOne() < 0.5f) && (this->aiIndex == 1)) { - func_8002F5F4(gMsg_ID_9323, RCID_LEON); + func_360_8002F5F4(gMsg_ID_9323, RCID_LEON); } else { - func_8002F5F4(gMsg_ID_9300, RCID_LEON); + func_360_8002F5F4(gMsg_ID_9300, RCID_LEON); } break; case 6: if (gCurrentLevel == LEVEL_VENOM_2) { if ((Rand_ZeroOne() < 0.5f) && (this->aiIndex == 3)) { - func_8002F5F4(gMsg_ID_9324, RCID_PIGMA); + func_360_8002F5F4(gMsg_ID_9324, RCID_PIGMA); } else { - func_8002F5F4(gMsg_ID_19452, RCID_PIGMA); + func_360_8002F5F4(gMsg_ID_19452, RCID_PIGMA); } } else if ((Rand_ZeroOne() < 0.5f) && (this->aiIndex == 3)) { - func_8002F5F4(gMsg_ID_9324, RCID_PIGMA); + func_360_8002F5F4(gMsg_ID_9324, RCID_PIGMA); } else { - func_8002F5F4(gMsg_ID_9310, RCID_PIGMA); + func_360_8002F5F4(gMsg_ID_9310, RCID_PIGMA); } break; case 7: if (gCurrentLevel == LEVEL_VENOM_2) { if ((Rand_ZeroOne() < 0.5f) && (this->aiIndex == 2)) { - func_8002F5F4(gMsg_ID_9325, RCID_ANDREW); + func_360_8002F5F4(gMsg_ID_9325, RCID_ANDREW); } else { - func_8002F5F4(gMsg_ID_19453, RCID_ANDREW); + func_360_8002F5F4(gMsg_ID_19453, RCID_ANDREW); } } else if ((Rand_ZeroOne() < 0.5f) && (this->aiIndex == 2)) { - func_8002F5F4(gMsg_ID_9325, RCID_ANDREW); + func_360_8002F5F4(gMsg_ID_9325, RCID_ANDREW); } else { - func_8002F5F4(gMsg_ID_9320, RCID_ANDREW); + func_360_8002F5F4(gMsg_ID_9320, RCID_ANDREW); } break; } @@ -1724,7 +1723,7 @@ void func_800319AC(Actor* this) { (gActors[this->aiIndex].obj.status == OBJ_FREE))) { this->state = 3; if (gCurrentLevel == LEVEL_BOLSE) { - func_8002FB4C(this); + func_360_8002FB4C(this); } } } @@ -1884,7 +1883,7 @@ void func_800319AC(Actor* this) { sp108 = 0; if (sp104 == 1) { if (this->aiType < 100) { - sp108 = func_8003049C(this); + sp108 = func_360_8003049C(this); if ((sp108 != 0) && (this->aiType < 10) && (this->timer_0BE == 0) && ((this->fwork[7] < 0.01f) || (this->fwork[7] > 359.9f))) { this->timer_0BE = RAND_INT(200.0f) + 200; @@ -1947,7 +1946,8 @@ void func_800319AC(Actor* this) { spA8.z = -70.0f; Matrix_MultVec3fNoTranslate(gCalcMatrix, &spA8, &sp9C); - func_80078E50(this->obj.pos.x + sp9C.x, this->obj.pos.y + sp9C.y, this->obj.pos.z + sp9C.z, 3.1f); + func_effect_80078E50(this->obj.pos.x + sp9C.x, this->obj.pos.y + sp9C.y, this->obj.pos.z + sp9C.z, + 3.1f); } } } @@ -1992,24 +1992,26 @@ void func_800319AC(Actor* this) { if (Rand_ZeroOne() < 0.8f) { spA8.x = 60.0f; Matrix_MultVec3fNoTranslate(gCalcMatrix, &spA8, &sp9C); - func_8006EEFC(this->aiType, this->obj.pos.x + sp9C.x + (sp90.x * 1.5f), - this->obj.pos.y + sp9C.y + (sp90.y * 1.5f), this->obj.pos.z + sp9C.z + (sp90.z * 1.5f), - sp90.x, sp90.y, sp90.z, this->obj.rot.x, this->obj.rot.y, this->obj.rot.z); + func_enmy2_8006EEFC(this->aiType, this->obj.pos.x + sp9C.x + (sp90.x * 1.5f), + this->obj.pos.y + sp9C.y + (sp90.y * 1.5f), + this->obj.pos.z + sp9C.z + (sp90.z * 1.5f), sp90.x, sp90.y, sp90.z, this->obj.rot.x, + this->obj.rot.y, this->obj.rot.z); } if (Rand_ZeroOne() < 0.8f) { spA8.x = -60.0f; Matrix_MultVec3fNoTranslate(gCalcMatrix, &spA8, &sp9C); - func_8006EEFC(this->aiType, this->obj.pos.x + sp9C.x + (sp90.x * 1.5f), - this->obj.pos.y + sp9C.y + (sp90.y * 1.5f), this->obj.pos.z + sp9C.z + (sp90.z * 1.5f), - sp90.x, sp90.y, sp90.z, this->obj.rot.x, this->obj.rot.y, this->obj.rot.z); + func_enmy2_8006EEFC(this->aiType, this->obj.pos.x + sp9C.x + (sp90.x * 1.5f), + this->obj.pos.y + sp9C.y + (sp90.y * 1.5f), + this->obj.pos.z + sp9C.z + (sp90.z * 1.5f), sp90.x, sp90.y, sp90.z, this->obj.rot.x, + this->obj.rot.y, this->obj.rot.z); } } else { - func_8006EEFC(this->aiType, this->obj.pos.x + (sp90.x * 1.5f), this->obj.pos.y + (sp90.y * 1.5f), - this->obj.pos.z + (sp90.z * 1.5f), sp90.x, sp90.y, sp90.z, this->obj.rot.x, this->obj.rot.y, - this->obj.rot.z); + func_enmy2_8006EEFC(this->aiType, this->obj.pos.x + (sp90.x * 1.5f), this->obj.pos.y + (sp90.y * 1.5f), + this->obj.pos.z + (sp90.z * 1.5f), sp90.x, sp90.y, sp90.z, this->obj.rot.x, + this->obj.rot.y, this->obj.rot.z); } } - func_8003088C(this); + func_360_8003088C(this); radarMark = &gRadarMarks[this->index]; radarMark->unk_00 = 1; if (this->aiType == 200) { @@ -2029,16 +2031,16 @@ void func_800319AC(Actor* this) { if ((this->iwork[1] == 0) && (gActors[0].state == 2) && (gRadioState == 0)) { switch (this->aiType) { case 1: - func_8002F5F4(gMsg_ID_9220, RCID_FALCO); + func_360_8002F5F4(gMsg_ID_9220, RCID_FALCO); break; case 2: - func_8002F5F4(gMsg_ID_9230, RCID_SLIPPY); + func_360_8002F5F4(gMsg_ID_9230, RCID_SLIPPY); break; case 3: if ((Rand_ZeroOne() < 0.1f) && (gCurrentLevel == LEVEL_KATINA)) { - func_8002F5F4(gMsg_ID_18150, RCID_PEPPY); + func_360_8002F5F4(gMsg_ID_18150, RCID_PEPPY); } else { - func_8002F5F4(gMsg_ID_9240, RCID_PEPPY); + func_360_8002F5F4(gMsg_ID_9240, RCID_PEPPY); } break; } @@ -2055,7 +2057,7 @@ void func_800319AC(Actor* this) { sp90.x = this->vel.x; sp90.y = this->vel.y; sp90.z = this->vel.z; - temp_v0_27 = func_8006351C(this->index, &this->obj.pos, &sp90, var_a3); + temp_v0_27 = func_enmy_8006351C(this->index, &this->obj.pos, &sp90, var_a3); if (temp_v0_27 != 0) { this->obj.pos.x -= this->vel.x; this->obj.pos.y -= this->vel.y; @@ -2064,19 +2066,20 @@ void func_800319AC(Actor* this) { this->timer_0BE = 2; this->obj.status = OBJ_DYING; this->unk_044 = 0; - func_8007BFFC(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 0.0f, 0.0f, 0.0f, 5.0f, 0xF); - func_8007A6F0(&this->obj.pos, 0x2903A008); + func_effect_8007BFFC(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 0.0f, 0.0f, 0.0f, 5.0f, + 0xF); + func_effect_8007A6F0(&this->obj.pos, 0x2903A008); } else { this->unk_0D0 = 1; this->damage = 10; this->health = 0; - func_8003088C(this); + func_360_8003088C(this); } } } } if (gCurrentLevel == LEVEL_FORTUNA) { - func_8002EE64(this); + func_360_8002EE64(this); } else if (gCurrentLevel == LEVEL_VENOM_ANDROSS) { this->unk_04A++; if (this->unk_04A >= Animation_GetFrameCount(&D_VE2_600C200)) { @@ -2090,7 +2093,7 @@ void func_800319AC(Actor* this) { } } -void func_80034E64(Actor* actor) { +void func_360_80034E64(Actor* actor) { f32 sp24; s32 sp20; @@ -2118,7 +2121,7 @@ void func_80034E64(Actor* actor) { } } -void func_80035098(Actor* actor) { +void func_360_80035098(Actor* actor) { s32 sp2C; if (actor->fwork[23] > 1.0f) { @@ -2143,7 +2146,7 @@ void func_80035098(Actor* actor) { } } -bool func_800352E0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { +bool func_360_800352E0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { Actor* this = thisx; if (this->timer_0C6 & 1) { @@ -2157,12 +2160,13 @@ bool func_800352E0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thi } if ((limbIndex == 1) || (limbIndex == 2)) { RCP_SetupDL(&gMasterDisp, 0x22); - gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, (s32) D_8015F914, (s32) D_8015F918, (s32) D_8015F91C, 255); + gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, (s32) D_360_8015F914, (s32) D_360_8015F918, (s32) D_360_8015F91C, + 255); } return false; } -void func_80035448(Actor* actor) { +void func_360_80035448(Actor* actor) { f32 sp38; s32 pad[3]; Vec3f sp1E4 = { 0.0f, 0.0f, 0.0f }; @@ -2188,9 +2192,9 @@ void func_80035448(Actor* actor) { case 2: case 3: Matrix_Push(&gGfxMatrix); - func_8005B388(actor); + func_edisplay_8005B388(actor); Matrix_Pop(&gGfxMatrix); - func_80035098(actor); + func_360_80035098(actor); break; case 4: case 5: @@ -2200,43 +2204,43 @@ void func_80035448(Actor* actor) { gSPDisplayList(gMasterDisp++, D_STAR_WOLF_F0103D0); Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, 30.0f, 0.0f, -60.0f, 1); - func_8005B1E8(actor, 2); + func_edisplay_8005B1E8(actor, 2); Matrix_Pop(&gGfxMatrix); Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, -30.0f, 0.0f, -60.0f, 1); - func_8005B1E8(actor, 2); + func_edisplay_8005B1E8(actor, 2); Matrix_Pop(&gGfxMatrix); - func_80035098(actor); - func_80034E64(actor); + func_360_80035098(actor); + func_360_80034E64(actor); } else { gSPDisplayList(gMasterDisp++, D_STAR_WOLF_F00F200); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, 1); if (gCurrentLevel == LEVEL_BOLSE) { - func_8005B1E8(actor, 3); + func_edisplay_8005B1E8(actor, 3); } else { - func_8005B1E8(actor, 2); + func_edisplay_8005B1E8(actor, 2); } } break; case 8: gSPDisplayList(gMasterDisp++, D_D009A40); - func_8005ADAC(actor); + func_edisplay_8005ADAC(actor); break; case 9: gSPDisplayList(gMasterDisp++, D_D00B880); - func_8005ADAC(actor); + func_edisplay_8005ADAC(actor); break; case 100: - func_8005F670(&actor->obj.pos); + func_edisplay_8005F670(&actor->obj.pos); actor->unk_0B6 = 1; - func_8004FEC0(actor); + func_demo_8004FEC0(actor); break; case 200: Animation_GetFrameData(&D_SZ_6006D64, 0, sp7C); - Animation_DrawSkeleton(3, D_SZ_6006E50, sp7C, func_800352E0, NULL, actor, gCalcMatrix); + Animation_DrawSkeleton(3, D_SZ_6006E50, sp7C, func_360_800352E0, NULL, actor, gCalcMatrix); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -400.0f, 1); Matrix_Scale(gGfxMatrix, actor->fwork[29], actor->fwork[29], actor->fwork[29], 1); - func_8005B1E8(actor, 3); + func_edisplay_8005B1E8(actor, 3); break; default: if (gCurrentLevel == LEVEL_FORTUNA) { @@ -2245,7 +2249,7 @@ void func_80035448(Actor* actor) { gSPDisplayList(gMasterDisp++, D_FO_6006BE0); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -100.0f, 1); Matrix_Scale(gGfxMatrix, 1.5f, 1.5f, 1.5f, 1); - func_8005B1E8(actor, 2); + func_edisplay_8005B1E8(actor, 2); } else if (gCurrentLevel == LEVEL_KATINA) { switch (actor->unk_0B6) { case 0: @@ -2254,23 +2258,23 @@ void func_80035448(Actor* actor) { case 1: gSPDisplayList(gMasterDisp++, D_KA_600E050); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, 1); - func_8005B1E8(actor, 0); + func_edisplay_8005B1E8(actor, 0); break; case 3: gSPDisplayList(gMasterDisp++, D_KA_6001530); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 30.0f, 1); - func_80034E64(actor); + func_360_80034E64(actor); break; } } else if (gCurrentLevel == LEVEL_SECTOR_Z) { gSPDisplayList(gMasterDisp++, D_SZ_6004FE0) Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, 1); - func_8005B1E8(actor, 2); + func_edisplay_8005B1E8(actor, 2); } else if (gCurrentLevel == LEVEL_BOLSE) { gSPDisplayList(gMasterDisp++, D_BO_6008770) Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, 1); - func_8005B1E8(actor, 2); + func_edisplay_8005B1E8(actor, 2); Matrix_Pop(&gGfxMatrix); - func_80034E64(actor); + func_360_80034E64(actor); } else if (gCurrentLevel == LEVEL_VENOM_ANDROSS) { Animation_GetFrameData(&D_VE2_600C200, actor->unk_04A, actor->vwork); Matrix_Scale(gGfxMatrix, 10.0f, 10.0f, 10.0f, 1); @@ -2281,11 +2285,11 @@ void func_80035448(Actor* actor) { if (actor->aiIndex == 0) { gSPDisplayList(gMasterDisp++, D_STAR_WOLF_F00F200); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, 1); - func_8005B1E8(actor, 3); + func_edisplay_8005B1E8(actor, 3); } else { gSPDisplayList(gMasterDisp++, D_ENMY_PLANET_40068F0); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, 1); - func_8005B1E8(actor, 2); + func_edisplay_8005B1E8(actor, 2); } } break; diff --git a/src/main/fox_97F80.c b/src/main/fox_97F80.c index 196eceb7..f570c6fc 100644 --- a/src/main/fox_97F80.c +++ b/src/main/fox_97F80.c @@ -26,7 +26,7 @@ f32 __pos_z; #define TRINORM_Z(A, B, C) ((B##_x - A##_x) * (C##_y - B##_y) - (B##_y - A##_y) * (C##_x - B##_x)) // Calculate the directed plane that contains the ordered triangle tri, given as an array of Vec3s -void func_80097380(PlaneF* plane, Vec3s** tri) { +void func_col1_80097380(PlaneF* plane, Vec3s** tri) { Vec3s a; Vec3s b; Vec3s c; @@ -64,7 +64,7 @@ void func_80097380(PlaneF* plane, Vec3s** tri) { // Calculate the directed plane that contains the ordered triangle tri, given as an array of Vec3s. Duplicate of // previous -void func_80097558(PlaneF* plane, Vec3s** tri) { +void func_col1_80097558(PlaneF* plane, Vec3s** tri) { Vec3s a; Vec3s b; Vec3s c; @@ -101,7 +101,7 @@ void func_80097558(PlaneF* plane, Vec3s** tri) { } // Calculate the normal vector of an ordered triangle, given as a Vec3f array -void func_80097730(Vec3f* norm, Vec3f* tri) { +void func_col1_80097730(Vec3f* norm, Vec3f* tri) { __vtx0_x = tri->x; __vtx0_y = tri->y; __vtx0_z = tri->z; @@ -128,7 +128,7 @@ void func_80097730(Vec3f* norm, Vec3f* tri) { } // Calculate the normal vector of an ordered triangle, given as integer coordinates -void func_800978C4(Vec3f* norm, s32 ax, s32 ay, s32 az, s32 bx, s32 by, s32 bz, s32 cx, s32 cy, s32 cz) { +void func_col1_800978C4(Vec3f* norm, s32 ax, s32 ay, s32 az, s32 bx, s32 by, s32 bz, s32 cx, s32 cy, s32 cz) { __dx1 = bx - ax; __dx2 = cx - bx; __dy1 = by - ay; @@ -142,7 +142,7 @@ void func_800978C4(Vec3f* norm, s32 ax, s32 ay, s32 az, s32 bx, s32 by, s32 bz, } // Calculate the normal vector of an ordered triangle, given as vertices -void func_800979E8(Vtx_tn* tri) { +void func_col1_800979E8(Vtx_tn* tri) { s32 i; Vec3f temp; f32 temp_fv0; @@ -185,7 +185,7 @@ void func_800979E8(Vtx_tn* tri) { } // calculate the normal vectors of the two ordered triangles in a quad -void func_80097C88(Vec3f* norms, Vtx_tn* quad) { +void func_col1_80097C88(Vec3f* norms, Vtx_tn* quad) { f32 temp_fv0; __vtx0_x = quad[3].ob[0]; @@ -242,7 +242,7 @@ void func_80097C88(Vec3f* norms, Vtx_tn* quad) { // check if the projection of pos onto either ordered triangle of quad lies within that triangle // If it does and lies on the positive side, return which triangle it's within and that triangle's normal -s32 func_8009808C(Vec3f* pos, Vtx_tn* quad, Vec3f* normOut) { +s32 func_col1_8009808C(Vec3f* pos, Vtx_tn* quad, Vec3f* normOut) { f32 temp_fv0; s32 var_v1 = 0; f32 test1; @@ -308,7 +308,7 @@ s32 func_8009808C(Vec3f* pos, Vtx_tn* quad, Vec3f* normOut) { } // check if vec lies within tri when projected to the xz-plane -bool func_800985CC(Vec3f* vec, Vtx_tn* tri) { +bool func_col1_800985CC(Vec3f* vec, Vtx_tn* tri) { f32 sp24; f32 sp20; @@ -339,7 +339,7 @@ bool func_800985CC(Vec3f* vec, Vtx_tn* tri) { } // PlaneF from normal and point -void func_80098860(PlaneF* plane, Vec3f* point, Vec3f* normal) { +void func_col1_80098860(PlaneF* plane, Vec3f* point, Vec3f* normal) { plane->normal.x = normal->x; plane->normal.y = normal->y; plane->normal.z = normal->z; @@ -347,24 +347,24 @@ void func_80098860(PlaneF* plane, Vec3f* point, Vec3f* normal) { } // y dist to closest point on plane -s32 func_800988B4(Vec3f* vec, PlaneF* plane) { +s32 func_col1_800988B4(Vec3f* vec, PlaneF* plane) { return (-plane->normal.x * vec->x - plane->normal.z * vec->z - plane->dist) / plane->normal.y; } // z dist to closest point on plane -s32 func_800988F8(Vec3f* vec, PlaneF* plane) { +s32 func_col1_800988F8(Vec3f* vec, PlaneF* plane) { return (-plane->normal.x * vec->x - plane->normal.y * vec->y - plane->dist) / plane->normal.z; } // x dist to closest point on plane -s32 func_8009893C(Vec3f* vec, PlaneF* plane) { +s32 func_col1_8009893C(Vec3f* vec, PlaneF* plane) { return (-plane->normal.y * vec->y - plane->normal.z * vec->z - plane->dist) / plane->normal.x; } #define INTSIGN_OF(x) ((((x) >= 1.0f) || ((x) <= -1.0f)) ? (f32) SIGN_OF(x) : 0.0f) // checks if the projection of pos onto the plane of tri lies within tri and it is on the same side as the normal. -bool func_80098980(Vec3f* pos, Vec3s** tri, Vec3f* normal) { +bool func_col1_80098980(Vec3f* pos, Vec3s** tri, Vec3f* normal) { s32 normSignY; s32 normSignZ; s32 signCross; @@ -590,7 +590,7 @@ bool func_80099254(Vec3f* objPos, Vec3f* colliderPos, Vec3f* objVel, CollisionHe hitPosRel.z = objRel.z - (objVel->z * tempf); // check if that point is within the polygon - if (func_80098980(&hitPosRel, polyVtxPos, &polyPlane.normal) == true) { + if (func_col1_80098980(&hitPosRel, polyVtxPos, &polyPlane.normal) == true) { hitPosOut->x = colliderPos->x + hitPosRel.x; hitPosOut->y = colliderPos->y + hitPosRel.y; hitPosOut->z = colliderPos->z + hitPosRel.z; @@ -624,7 +624,8 @@ bool func_80099254(Vec3f* objPos, Vec3f* colliderPos, Vec3f* objVel, CollisionHe return didHit; } -bool func_800998FC(Vec3f* objPos, Vec3f* colliderPos, Vec3f* objVel, s32 colId, Vec3f* hitPosOut, f32* hitAnglesOut) { +bool func_col1_800998FC(Vec3f* objPos, Vec3f* colliderPos, Vec3f* objVel, s32 colId, Vec3f* hitPosOut, + f32* hitAnglesOut) { return func_80099254(objPos, colliderPos, objVel, SEGMENTED_TO_VIRTUAL(&D_800D2B38[colId]), hitPosOut, hitAnglesOut); } diff --git a/src/main/fox_A4290.c b/src/main/fox_A4290.c index a969d227..82088912 100644 --- a/src/main/fox_A4290.c +++ b/src/main/fox_A4290.c @@ -2,14 +2,14 @@ #include "fox_A4290_colheaders.c" -bool func_800A36FC(Vec3f* objPos, Vec3f* colliderPos, CollisionHeader2* colHeader, Vec3f* hitDataOut); -bool func_800A3A74(Vec3f* point, Vec3f** tri, Vec3f* normOut); +bool func_col2_800A36FC(Vec3f* objPos, Vec3f* colliderPos, CollisionHeader2* colHeader, Vec3f* hitDataOut); +bool func_col2_800A3A74(Vec3f* point, Vec3f** tri, Vec3f* normOut); -bool func_800A3690(Vec3f* objPos, Vec3f* colliderPos, s32 colId, Vec3f* hitDataOut) { - return func_800A36FC(objPos, colliderPos, SEGMENTED_TO_VIRTUAL(&D_800D2CA0[colId]), hitDataOut); +bool func_col2_800A3690(Vec3f* objPos, Vec3f* colliderPos, s32 colId, Vec3f* hitDataOut) { + return func_col2_800A36FC(objPos, colliderPos, SEGMENTED_TO_VIRTUAL(&D_800D2CA0[colId]), hitDataOut); } -bool func_800A36FC(Vec3f* objPos, Vec3f* colliderPos, CollisionHeader2* colHeader, Vec3f* hitDataOut) { +bool func_col2_800A36FC(Vec3f* objPos, Vec3f* colliderPos, CollisionHeader2* colHeader, Vec3f* hitDataOut) { Vec3f objRelPos; PlaneF triPlane; bool above; @@ -38,7 +38,7 @@ bool func_800A36FC(Vec3f* objPos, Vec3f* colliderPos, CollisionHeader2* colHeade for (j = 0; j < 3; j++) { tri[j] = &mesh[polys->vtx[j]]; } - above = func_800A3A74(&objRelPos, tri, &norm); + above = func_col2_800A3A74(&objRelPos, tri, &norm); if (above) { break; } @@ -47,8 +47,8 @@ bool func_800A36FC(Vec3f* objPos, Vec3f* colliderPos, CollisionHeader2* colHeade vtx.x = tri[0]->x; vtx.y = tri[0]->y; vtx.z = tri[0]->z; - func_80098860(&triPlane, &vtx, &norm); - hitDataOut->y = func_800988B4(&objRelPos, &triPlane); + func_col1_80098860(&triPlane, &vtx, &norm); + hitDataOut->y = func_col1_800988B4(&objRelPos, &triPlane); if (triPlane.normal.x != 0.0f) { norm.x = -triPlane.dist / triPlane.normal.x; } else { @@ -80,7 +80,7 @@ bool func_800A36FC(Vec3f* objPos, Vec3f* colliderPos, CollisionHeader2* colHeade } // Checks if point is above the triangle tri. If so, puts the triangle normal in normOut -bool func_800A3A74(Vec3f* point, Vec3f** tri, Vec3f* normOut) { +bool func_col2_800A3A74(Vec3f* point, Vec3f** tri, Vec3f* normOut) { s32 pad; f32 temp1; bool ret = false; diff --git a/src/main/fox_A48A0.c b/src/main/fox_A48A0.c index b2f18337..9eb4b111 100644 --- a/src/main/fox_A48A0.c +++ b/src/main/fox_A48A0.c @@ -12,14 +12,14 @@ void func_800A3CA0(void) { } void func_800A3E00(void) { - switch (D_80177868) { + switch (D_ctx_80177868) { case 0: if (D_Timer_8017783C == 0) { - D_80177868 = 1; + D_ctx_80177868 = 1; } break; case 1: - D_80177868 = 2; + D_ctx_80177868 = 2; gDrawMode = DRAWMODE_7; gCsCamAtY = 0.0f; gCsCamAtX = gCsCamAtY; @@ -31,15 +31,15 @@ void func_800A3E00(void) { case 2: if ((gControllerPress[0].button & START_BUTTON) || (gControllerPress[1].button & START_BUTTON)) { func_8001D638(0); - D_80177868 = 3; + D_ctx_80177868 = 3; gDrawMode = DRAWMODE_0; - func_800A5844(); + func_play_800A5844(); D_Timer_8017783C = 0; } break; case 3: if (D_Timer_8017783C == 0) { - D_80177854 = 2; + D_ctx_80177854 = 2; } break; } diff --git a/src/main/fox_beam.c b/src/main/fox_beam.c index 2cf71104..ef5b476f 100644 --- a/src/main/fox_beam.c +++ b/src/main/fox_beam.c @@ -4,9 +4,9 @@ #include "assets/ast_great_fox.h" #include "assets/ast_versus.h" -static Vec3f D_8015F950; +static Vec3f D_beam_8015F950; -void func_80035D30(Effect* effect, f32 xPos, f32 yPos, f32 zPos) { +void func_beam_80035D30(Effect* effect, f32 xPos, f32 yPos, f32 zPos) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_351; @@ -24,12 +24,12 @@ void func_80035D30(Effect* effect, f32 xPos, f32 yPos, f32 zPos) { Object_SetInfo(&effect->info, effect->obj.id); } -void func_80035DEC(f32 xPos, f32 yPos, f32 zPos) { +void func_beam_80035DEC(f32 xPos, f32 yPos, f32 zPos) { s32 i; for (i = 0; i < ARRAY_COUNT(gEffects); i++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_80035D30(&gEffects[i], xPos, yPos, zPos); + func_beam_80035D30(&gEffects[i], xPos, yPos, zPos); break; } } @@ -44,7 +44,7 @@ void PlayerShot_Initialize(PlayerShot* shot) { } } -void func_80035E78(PlayerShot* shot) { +void func_beam_80035E78(PlayerShot* shot) { f32 var_fs0; f32 var_fv0; f32 var_fv1; @@ -57,21 +57,21 @@ void func_80035E78(PlayerShot* shot) { shot->unk_64 = 30; shot->unk_58 = 150; func_8001CE28(shot->playerNum, shot->sfxSource); - D_Timer_80161A60 = 4; + D_play_Timer_80161A60 = 4; if (shot->obj.pos.y < (gGroundLevel + 450.0f)) { - D_80178480 = 15; + D_ctx_80178480 = 15; if (D_80161A88 == 2) { - func_8007D9DC(shot->obj.pos.x, gGroundLevel + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f, - shot->unk_48 * 3.0f, 0); - func_8007D9DC(shot->obj.pos.x, gGroundLevel + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f, - shot->unk_48 * 3.0f, 5); - func_8007D9DC(shot->obj.pos.x, gGroundLevel + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f, - shot->unk_48 * 3.0f, 10); - func_8007ADF4(shot->obj.pos.x, gGroundLevel, shot->obj.pos.z, shot->unk_48 * 0.05f, - shot->unk_48 * 0.5f); - func_8007A6F0(&shot->obj.pos, 0x19000014); + func_effect_8007D9DC(shot->obj.pos.x, gGroundLevel + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f, + shot->unk_48 * 3.0f, 0); + func_effect_8007D9DC(shot->obj.pos.x, gGroundLevel + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f, + shot->unk_48 * 3.0f, 5); + func_effect_8007D9DC(shot->obj.pos.x, gGroundLevel + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f, + shot->unk_48 * 3.0f, 10); + func_effect_8007ADF4(shot->obj.pos.x, gGroundLevel, shot->obj.pos.z, shot->unk_48 * 0.05f, + shot->unk_48 * 0.5f); + func_effect_8007A6F0(&shot->obj.pos, 0x19000014); } else { - func_80062B60(shot->obj.pos.x, shot->obj.pos.z, 0, shot->unk_48 * 3.0f); + func_enmy_80062B60(shot->obj.pos.x, shot->obj.pos.z, 0, shot->unk_48 * 3.0f); } } if (gCurrentLevel == LEVEL_BOLSE) { @@ -83,8 +83,8 @@ void func_80035E78(PlayerShot* shot) { if (var_fv1 > 2.0f) { var_fv1 = 2.0f; } - func_8007B550(shot->obj.pos.x, gGroundLevel + 6.0f, shot->obj.pos.z, shot->unk_48 * (1.5f + var_fv1), - var_fv0); + func_effect_8007B550(shot->obj.pos.x, gGroundLevel + 6.0f, shot->obj.pos.z, shot->unk_48 * (1.5f + var_fv1), + var_fv0); } if (gVersusMode) { @@ -92,8 +92,8 @@ void func_80035E78(PlayerShot* shot) { } else { var_v0 = 0; } - func_8007B344(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, shot->unk_48 * 1.5f, var_v0); - if (D_80178294 != 0) { + func_effect_8007B344(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, shot->unk_48 * 1.5f, var_v0); + if (D_ctx_80178294 != 0) { var_fs0 = 5.0f; if (shot->obj.pos.y > 300.0f) { var_fs0 = 1.0f; @@ -105,20 +105,20 @@ void func_80035E78(PlayerShot* shot) { var_fs0 = 4.0f; } var_fs0 *= 2.0f; - func_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, 50.0f, 0.0f, var_fs0); - func_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, 46.0f, 19.0f, var_fs0); - func_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, 35.0f, 35.0f, var_fs0); - func_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, 19.0f, 46.0f, var_fs0); - func_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, 0.0f, 50.0f, var_fs0); - func_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, -50.0f, 0.0f, var_fs0); - func_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, -46.0f, 19.0f, var_fs0); - func_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, -35.0f, 35.0f, var_fs0); - func_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, -19.0f, 46.0f, var_fs0); + func_effect_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, 50.0f, 0.0f, var_fs0); + func_effect_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, 46.0f, 19.0f, var_fs0); + func_effect_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, 35.0f, 35.0f, var_fs0); + func_effect_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, 19.0f, 46.0f, var_fs0); + func_effect_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, 0.0f, 50.0f, var_fs0); + func_effect_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, -50.0f, 0.0f, var_fs0); + func_effect_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, -46.0f, 19.0f, var_fs0); + func_effect_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, -35.0f, 35.0f, var_fs0); + func_effect_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, -19.0f, 46.0f, var_fs0); } } } -void func_80036318(PlayerShot* shot) { +void func_beam_80036318(PlayerShot* shot) { s32 var_v0_2; s32 i; @@ -126,16 +126,16 @@ void func_80036318(PlayerShot* shot) { Object_Kill(&shot->obj, shot->sfxSource); return; } - shot->obj.pos.z = D_80178498; // strange order on the globals - shot->obj.pos.y = D_801784A0; - shot->obj.pos.x = D_8017849C; + shot->obj.pos.z = D_ctx_80178498; // strange order on the globals + shot->obj.pos.y = D_ctx_801784A0; + shot->obj.pos.x = D_ctx_8017849C; if ((shot->obj.id == PLAYERSHOT_3) || ((gCurrentLevel != LEVEL_AQUAS) && (shot->obj.id == PLAYERSHOT_8) && (shot->unk_5C != 0))) { if (shot->obj.id == PLAYERSHOT_8) { shot->obj.id = PLAYERSHOT_3; shot->unk_5C = 0; } - func_80035E78(shot); + func_beam_80035E78(shot); } else if (shot->obj.id == PLAYERSHOT_8) { shot->unk_44 = 7.5f; for (i = 0; i < ARRAY_COUNT(gActors); i++) { @@ -143,9 +143,9 @@ void func_80036318(PlayerShot* shot) { } shot->vel.x = shot->vel.y = shot->vel.z = 0.0f; if (gCurrentLevel == LEVEL_AQUAS) { - D_80178360 = D_80178364 = D_80178368 = 0; - func_8007B344(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 10.0f, 4); - func_8007C120(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 0.0f, 0.0f, 0.0f, 0.3f, 30); + D_ctx_80178360 = D_ctx_80178364 = D_ctx_80178368 = 0; + func_effect_8007B344(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 10.0f, 4); + func_effect_8007C120(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 0.0f, 0.0f, 0.0f, 0.3f, 30); } else { if (gVersusMode) { @@ -153,8 +153,8 @@ void func_80036318(PlayerShot* shot) { } else { var_v0_2 = 12; } - func_8007B344(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 10.0f, var_v0_2); - func_8007D2C8(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 4.0f); + func_effect_8007B344(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 10.0f, var_v0_2); + func_effect_8007D2C8(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 4.0f); } } else { shot->obj.status = 2; @@ -162,7 +162,8 @@ void func_80036318(PlayerShot* shot) { } } -void func_80036528(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot, f32 xRot, f32 scale, s32 unk44, s32 time) { +void func_beam_80036528(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot, f32 xRot, f32 scale, s32 unk44, + s32 time) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_344; @@ -176,25 +177,26 @@ void func_80036528(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot, f32 x effect->unk_46 = 80; effect->timer_50 = time; Object_SetInfo(&effect->info, effect->obj.id); - func_800A6070(effect->sfxSource, 0x29000000); + func_play_800A6070(effect->sfxSource, 0x29000000); } -void func_800365E4(f32 xPos, f32 yPos, f32 zPos, f32 arg3, f32 arg4, f32 arg5, f32 yRot, f32 xRot, f32 scale, s32 unk44, - s32 time) { +void func_beam_800365E4(f32 xPos, f32 yPos, f32 zPos, f32 arg3, f32 arg4, f32 arg5, f32 yRot, f32 xRot, f32 scale, + s32 unk44, s32 time) { s32 i; - if ((D_801784AC != 4) && (gLevelType == LEVELTYPE_PLANET) && (D_80161A88 != 2) && (gCurrentLevel != LEVEL_SOLAR) && - (gCurrentLevel != LEVEL_BOLSE) && (gCurrentLevel != LEVEL_TRAINING) && (gCurrentLevel != LEVEL_ZONESS)) { + if ((D_ctx_801784AC != 4) && (gLevelType == LEVELTYPE_PLANET) && (D_80161A88 != 2) && + (gCurrentLevel != LEVEL_SOLAR) && (gCurrentLevel != LEVEL_BOLSE) && (gCurrentLevel != LEVEL_TRAINING) && + (gCurrentLevel != LEVEL_ZONESS)) { for (i = 0; i < 50; i++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_80036528(&gEffects[i], xPos, yPos, zPos, yRot, xRot, scale, unk44, time); + func_beam_80036528(&gEffects[i], xPos, yPos, zPos, yRot, xRot, scale, unk44, time); break; } } } } -void func_800366CC(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot, f32 scale) { +void func_beam_800366CC(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot, f32 scale) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_345; @@ -205,28 +207,28 @@ void func_800366CC(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot, f32 s effect->scale2 = scale * 0.5f; effect->timer_50 = 80; Object_SetInfo(&effect->info, effect->obj.id); - func_800A6070(effect->sfxSource, 0x29000000); + func_play_800A6070(effect->sfxSource, 0x29000000); } -void func_80036770(f32 xPos, f32 yPos, f32 zPos, f32 yRot, f32 scale) { +void func_beam_80036770(f32 xPos, f32 yPos, f32 zPos, f32 yRot, f32 scale) { s32 i; - if ((D_801784AC != 4) && (gLevelType == LEVELTYPE_PLANET) && (D_80161A88 <= 0) && + if ((D_ctx_801784AC != 4) && (gLevelType == LEVELTYPE_PLANET) && (D_80161A88 <= 0) && (gCurrentLevel != LEVEL_TRAINING) && (gCurrentLevel != LEVEL_SOLAR) && (gCurrentLevel != LEVEL_ZONESS)) { for (i = 0; i < 50; i++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_800366CC(&gEffects[i], xPos, yPos, zPos, yRot, scale); - func_8007D10C(xPos, yPos, zPos, 2.0f); + func_beam_800366CC(&gEffects[i], xPos, yPos, zPos, yRot, scale); + func_effect_8007D10C(xPos, yPos, zPos, 2.0f); break; } } } if (gCurrentLevel == LEVEL_BOLSE) { - func_8007D10C(xPos, yPos, zPos, 2.0f); + func_effect_8007D10C(xPos, yPos, zPos, 2.0f); } } -s32 func_80036874(PlayerShot* shot, f32* hitboxData, Object* obj) { +s32 func_beam_80036874(PlayerShot* shot, f32* hitboxData, Object* obj) { s32 count; f32 shotPx; f32 shotPy; @@ -302,7 +304,7 @@ s32 func_80036874(PlayerShot* shot, f32* hitboxData, Object* obj) { return 0; } if ((obj->id < 176) || (obj->id >= 292)) { - func_80036318(shot); + func_beam_80036318(shot); } if ((obj->id == 15) || ((obj->id == 22) && (i == 0)) || ((obj->id == 10) && (i == 0)) || ((obj->id == 13) && (i == 0)) || ((obj->id == 12) && (i < 3)) || (obj->id == 16) || @@ -311,30 +313,30 @@ s32 func_80036874(PlayerShot* shot, f32* hitboxData, Object* obj) { if (hitbox->z.size + (obj->pos.z + hitbox->z.offset) < shot->obj.pos.z) { shot->obj.pos.z = hitbox->z.size + (obj->pos.z + hitbox->z.offset) - 5.0f; } - func_800365E4((hitbox->x.offset + obj->pos.x) - (hitbox->x.size + 2.0f), shot->obj.pos.y, - shot->obj.pos.z, obj->pos.x, obj->pos.z, obj->rot.y, obj->rot.y + 90.0f, 0.0f, - 2.0f, 1, 20); + func_beam_800365E4((hitbox->x.offset + obj->pos.x) - (hitbox->x.size + 2.0f), + shot->obj.pos.y, shot->obj.pos.z, obj->pos.x, obj->pos.z, obj->rot.y, + obj->rot.y + 90.0f, 0.0f, 2.0f, 1, 20); return i + 1; } if (hitbox->x.size < shot->obj.pos.x - (obj->pos.x + hitbox->x.offset)) { if ((hitbox->z.size + (obj->pos.z + hitbox->z.offset)) < shot->obj.pos.z) { shot->obj.pos.z = hitbox->z.size + (obj->pos.z + hitbox->z.offset) - 5.0f; } - func_800365E4(hitbox->x.size + (hitbox->x.offset + obj->pos.x) + 2.0f, shot->obj.pos.y, - shot->obj.pos.z, obj->pos.x, obj->pos.z, obj->rot.y, obj->rot.y + 90.0f, 0.0f, - 2.0f, 1, 20); + func_beam_800365E4(hitbox->x.size + (hitbox->x.offset + obj->pos.x) + 2.0f, shot->obj.pos.y, + shot->obj.pos.z, obj->pos.x, obj->pos.z, obj->rot.y, obj->rot.y + 90.0f, + 0.0f, 2.0f, 1, 20); return i + 1; } if (((hitbox->y.size + (obj->pos.y + hitbox->y.offset)) - 10.0f) <= shot->obj.pos.y) { shot->obj.pos.y = ((hitbox->y.size + (obj->pos.y + hitbox->y.offset)) - 10.0f); } - func_800365E4(shot->obj.pos.x, shot->obj.pos.y, - hitbox->z.size + (obj->pos.z + hitbox->z.offset) + 20.0f, obj->pos.x, obj->pos.z, - 0.0f, 0.0f, 0.0f, 2.0f, 1, 20); + func_beam_800365E4(shot->obj.pos.x, shot->obj.pos.y, + hitbox->z.size + (obj->pos.z + hitbox->z.offset) + 20.0f, obj->pos.x, + obj->pos.z, 0.0f, 0.0f, 0.0f, 2.0f, 1, 20); return i + 1; } if (obj->id < 161) { - func_8007A6F0(&shot->obj.pos, 0x29121007); + func_effect_8007A6F0(&shot->obj.pos, 0x29121007); } return i + 1; } @@ -344,7 +346,7 @@ s32 func_80036874(PlayerShot* shot, f32* hitboxData, Object* obj) { return 0; } -s32 func_80036F88(PlayerShot* shot, Actor* actor) { +s32 func_beam_80036F88(PlayerShot* shot, Actor* actor) { s32 i; f32* hitboxData; f32 shotPx; @@ -364,7 +366,7 @@ s32 func_80036F88(PlayerShot* shot, Actor* actor) { if (count != 0) { xySizeMod = 0.0f; if (actor->info.unk_16 == 1) { - xySizeMod = fabsf((actor->obj.pos.z + D_80177D20) / 50.0f) + 10.0f; + xySizeMod = fabsf((actor->obj.pos.z + D_ctx_80177D20) / 50.0f) + 10.0f; if ((shot->playerNum < 4) && ((gLaserStrength[shot->playerNum] != LASERS_SINGLE) || (shot->obj.id == PLAYERSHOT_8))) { xySizeMod += 30.0f; @@ -416,7 +418,7 @@ s32 func_80036F88(PlayerShot* shot, Actor* actor) { return 0; } -bool func_80037438(PlayerShot* shot, Actor* actor) { +bool func_beam_80037438(PlayerShot* shot, Actor* actor) { Object* shotx = &shot->obj; f32 temp_fv1 = actor->obj.pos.x - shotx->pos.x; f32 temp_fa0 = actor->obj.pos.z - shotx->pos.z; @@ -426,7 +428,7 @@ bool func_80037438(PlayerShot* shot, Actor* actor) { if (((s32) hitboxData[0] != 0) && (sqrtf(SQ(temp_fv1) + SQ(temp_fa0)) <= 500.0f)) { if (shot->playerNum < 4) { temp_fv1 = actor->obj.pos.x - gPlayer[0].camEye.x; - temp_fa0 = actor->obj.pos.z + D_80177D20 - gPlayer[0].camEye.z; + temp_fa0 = actor->obj.pos.z + D_ctx_80177D20 - gPlayer[0].camEye.z; var_fa1 = (sqrtf(SQ(temp_fv1) + SQ(temp_fa0)) / 50.0f) + 20.0f + 10.0f; if (var_fa1 > 200.0f) { var_fa1 = 200.0f; @@ -457,7 +459,7 @@ bool func_80037438(PlayerShot* shot, Actor* actor) { return false; } -bool func_80037698(PlayerShot* shot, Object_4C* obj4C) { +bool func_beam_80037698(PlayerShot* shot, Object_4C* obj4C) { f32* temp_v0 = obj4C->info.hitbox; if (((s32) temp_v0[0] != 0) && (fabsf(temp_v0[1] + obj4C->obj.pos.z - shot->obj.pos.z) < temp_v0[2]) && @@ -468,7 +470,7 @@ bool func_80037698(PlayerShot* shot, Object_4C* obj4C) { return false; } -bool func_8003774C(PlayerShot* shot, ObjectId objId, Object* obj) { +bool func_beam_8003774C(PlayerShot* shot, ObjectId objId, Object* obj) { Vec3f sp7C; Vec3f sp70; Vec3f sp64; @@ -604,13 +606,13 @@ bool func_8003774C(PlayerShot* shot, ObjectId objId, Object* obj) { break; } if (!useCol2) { - if (func_800998FC(&sp64, &sp58, &sp38, objId, &sp4C, sp44) > 0) { + if (func_col1_800998FC(&sp64, &sp58, &sp38, objId, &sp4C, sp44) > 0) { if (shot->obj.id == PLAYERSHOT_4) { Object_Kill(&shot->obj, shot->sfxSource); return false; } - func_80036318(shot); - func_8007A6F0(&shot->obj.pos, 0x29121007); + func_beam_80036318(shot); + func_effect_8007A6F0(&shot->obj.pos, 0x29121007); if (gCurrentLevel == LEVEL_METEO) { Matrix_RotateY(gCalcMatrix, obj->rot.y * M_DTOR, 0); sp7C.x = sp4C.x - obj->pos.x; @@ -622,21 +624,21 @@ bool func_8003774C(PlayerShot* shot, ObjectId objId, Object* obj) { shot->obj.pos.z = obj->pos.z + sp70.z; } if (gCurrentLevel == LEVEL_FORTUNA) { - func_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f); - func_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f); + func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f); + func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f); } return true; } - } else if (func_800A3690(&sp64, &sp58, objId, &sp4C)) { + } else if (func_col2_800A3690(&sp64, &sp58, objId, &sp4C)) { if (shot->obj.id == PLAYERSHOT_4) { Object_Kill(&shot->obj, shot->sfxSource); return false; } - func_80036318(shot); - func_8007A6F0(&shot->obj.pos, 0x29121007); + func_beam_80036318(shot); + func_effect_8007A6F0(&shot->obj.pos, 0x29121007); if (gCurrentLevel == LEVEL_FORTUNA) { - func_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f); - func_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f); + func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f); + func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f); } return true; } @@ -645,7 +647,7 @@ bool func_8003774C(PlayerShot* shot, ObjectId objId, Object* obj) { // return false; } -void func_80037CF4(PlayerShot* shot, Actor* actor, s32 hitIndex) { +void func_beam_80037CF4(PlayerShot* shot, Actor* actor, s32 hitIndex) { Vec3f sp44 = { 0.0f, 0.0f, -100.0f }; Vec3f sp38; @@ -693,7 +695,7 @@ void func_80037CF4(PlayerShot* shot, Actor* actor, s32 hitIndex) { actor->state = 2; } if ((shot->obj.id == PLAYERSHOT_8) || (shot->obj.id == PLAYERSHOT_3)) { - func_80036318(shot); + func_beam_80036318(shot); } else { shot->unk_64 = 25; shot->obj.rot.y += 90.0f; @@ -708,16 +710,16 @@ void func_80037CF4(PlayerShot* shot, Actor* actor, s32 hitIndex) { shot->obj.pos.y += shot->vel.y * 5.0f; shot->obj.pos.z += shot->vel.z * 5.0f; actor->timer_0C2 = 3; - func_80078E50(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 8.0f); + func_effect_80078E50(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 8.0f); AUDIO_PLAY_SFX(0x29121007, actor->sfxSource, 4); - func_800A668C(D_8017849C, D_801784A0, D_80178498); + func_play_800A668C(D_ctx_8017849C, D_ctx_801784A0, D_ctx_80178498); } } else { - func_80036318(shot); + func_beam_80036318(shot); } } -void func_80038140(PlayerShot* shot) { +void func_beam_80038140(PlayerShot* shot) { s32 i; s32 temp_v0; s32 spA4; @@ -755,7 +757,7 @@ void func_80038140(PlayerShot* shot) { if ((actor->obj.status >= OBJ_ACTIVE) && (actor->timer_0C2 == 0)) { switch (actor->obj.id) { case OBJ_ACTOR_180: - if (func_8003774C(shot, actor->obj.id, &actor->obj)) { + if (func_beam_8003774C(shot, actor->obj.id, &actor->obj)) { actor->unk_0D0 = 1; actor->unk_0D2 = shot->playerNum; return; @@ -763,7 +765,7 @@ void func_80038140(PlayerShot* shot) { break; case OBJ_ACTOR_200: if (actor->unk_0B4 == 42) { - if (func_8003774C(shot, OBJ_UNK_1000, &actor->obj)) { + if (func_beam_8003774C(shot, OBJ_UNK_1000, &actor->obj)) { actor->unk_0D0 = 1; actor->unk_0D2 = shot->playerNum; return; @@ -773,12 +775,12 @@ void func_80038140(PlayerShot* shot) { test.y = fabsf(actor->obj.pos.y - shot->obj.pos.y); test.z = fabsf(actor->obj.pos.z - shot->obj.pos.z); if (VEC3F_MAG(&test) < 1000.0f) { - func_80037CF4(shot, actor, 0); + func_beam_80037CF4(shot, actor, 0); } } else { - temp_v0 = func_80036F88(shot, actor); + temp_v0 = func_beam_80036F88(shot, actor); if (temp_v0 != 0) { - func_80037CF4(shot, actor, temp_v0); + func_beam_80037CF4(shot, actor, temp_v0); return; } } @@ -800,15 +802,15 @@ void func_80038140(PlayerShot* shot) { } } } - temp_v0 = func_80037438(shot, actor); + temp_v0 = func_beam_80037438(shot, actor); if (temp_v0 != 0) { - func_80037CF4(shot, actor, temp_v0); + func_beam_80037CF4(shot, actor, temp_v0); return; } } else { - temp_v0 = func_80036874(shot, actor->info.hitbox, &actor->obj); + temp_v0 = func_beam_80036874(shot, actor->info.hitbox, &actor->obj); if (temp_v0 != 0) { - func_80037CF4(shot, actor, temp_v0); + func_beam_80037CF4(shot, actor, temp_v0); return; } } @@ -856,9 +858,9 @@ void func_80038140(PlayerShot* shot) { shot->obj.pos.z += 2.0f * shot->vel.z; shot->unk_64 = 5; AUDIO_PLAY_SFX(0x09007011, player->sfxSource, 0); - func_80078E50(player->pos.x, player->pos.y, player->unk_138, 8.0f); + func_effect_80078E50(player->pos.x, player->pos.y, player->unk_138, 8.0f); } else { - func_80036318(shot); + func_beam_80036318(shot); if (player->unk_1F4 == 0) { if (gPlayer[0].form == 3) { Player_ApplyDamage(player, 0, 60); @@ -873,7 +875,7 @@ void func_80038140(PlayerShot* shot) { player->unk_0D8.y = shot->vel.y * 0.1f; player->unk_0D8.z = shot->vel.z * 0.1f; if (player->form != FORM_ON_FOOT) { - func_8007D1E0(player->pos.x, player->pos.y, player->unk_138, 2.0f); + func_effect_8007D1E0(player->pos.x, player->pos.y, player->unk_138, 2.0f); } } } @@ -881,16 +883,16 @@ void func_80038140(PlayerShot* shot) { } } } - 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 ((D_ctx_801784AC == 4) && Ground_801B6AEC(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z + D_ctx_80177D20)) { + func_beam_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); + func_effect_8007A900(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 2.0f, 255, 15, 0); } } - if ((D_80178294 != 0) && func_800A73E4(&sp94, &spA4, shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z)) { - func_80036318(shot); + if ((D_ctx_80178294 != 0) && func_play_800A73E4(&sp94, &spA4, shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z)) { + func_beam_80036318(shot); if (shot->obj.id != PLAYERSHOT_4) { - func_8007B228(shot->obj.pos.x, sp94, shot->obj.pos.z, 1.0f); + func_effect_8007B228(shot->obj.pos.x, sp94, shot->obj.pos.z, 1.0f); } } @@ -901,9 +903,9 @@ void func_80038140(PlayerShot* shot) { (obj58->obj.id == OBJ_80_150) || (obj58->obj.id == OBJ_80_148) || (obj58->obj.id == OBJ_80_143) || (obj58->obj.id == OBJ_80_160) || (obj58->obj.id == OBJ_80_1) || (obj58->obj.id == OBJ_80_3) || (obj58->obj.id == OBJ_80_140)) { - func_8003774C(shot, obj58->obj.id, &obj58->obj); + func_beam_8003774C(shot, obj58->obj.id, &obj58->obj); } else { - func_80036874(shot, obj58->info.hitbox, &obj58->obj); + func_beam_80036874(shot, obj58->info.hitbox, &obj58->obj); } } } @@ -915,9 +917,9 @@ void func_80038140(PlayerShot* shot) { (obj80->obj.id == OBJ_80_126) || (obj80->obj.id == OBJ_80_47) || (obj80->obj.id == OBJ_80_2) || (obj80->obj.id == OBJ_80_3) || (obj80->obj.id == OBJ_80_67) || (obj80->obj.id == OBJ_80_74) || (obj80->obj.id == OBJ_80_3)) { - func_8003774C(shot, obj80->obj.id, &obj80->obj); + func_beam_8003774C(shot, obj80->obj.id, &obj80->obj); } else { - temp_v0 = func_80036874(shot, obj80->info.hitbox, &obj80->obj); + temp_v0 = func_beam_80036874(shot, obj80->info.hitbox, &obj80->obj); if (temp_v0 != 0) { obj80->dmgType = 1; obj80->dmgPart = temp_v0 - 1; @@ -930,11 +932,11 @@ void func_80038140(PlayerShot* shot) { for (i = 0, obj4C = gObjects4C; i < 40; i++, obj4C++) { if (obj4C->obj.status == OBJ_ACTIVE) { if (obj4C->obj.id != OBJ_4C_169) { - if (func_80037698(shot, obj4C)) { + if (func_beam_80037698(shot, obj4C)) { obj4C->unk_46 = 1; } } else { - if (func_80036874(shot, obj4C->info.hitbox, &obj4C->obj) != 0) { + if (func_beam_80036874(shot, obj4C->info.hitbox, &obj4C->obj) != 0) { obj4C->unk_46 = 1; } } @@ -945,7 +947,7 @@ void func_80038140(PlayerShot* shot) { if ((boss->obj.status == OBJ_ACTIVE) && (boss->timer_05A == 0)) { if ((boss->obj.id == OBJ_BOSS_308) || (boss->obj.id == OBJ_BOSS_312) || (boss->obj.id == OBJ_BOSS_309) || (boss->obj.id == OBJ_BOSS_313)) { - func_8003774C(shot, boss->obj.id, &boss->obj); + func_beam_8003774C(shot, boss->obj.id, &boss->obj); } else if (boss->obj.id == OBJ_BOSS_310) { test.x = fabsf(boss->obj.pos.x - shot->obj.pos.x) * .8333333f; test.y = fabsf(boss->obj.pos.y - shot->obj.pos.y) * 2; @@ -955,7 +957,7 @@ void func_80038140(PlayerShot* shot) { Object_Kill(&shot->obj, shot->sfxSource); } else { boss->dmgType = DMG_BEAM; - func_80036318(shot); + func_beam_80036318(shot); AUDIO_PLAY_SFX(0x29001062, shot->sfxSource, 4); } } @@ -971,11 +973,11 @@ void func_80038140(PlayerShot* shot) { boss->dmgType = DMG_BEAM; boss->dmgPart = 100; AUDIO_PLAY_SFX(0x29121007, shot->sfxSource, 4); - func_80036318(shot); + func_beam_80036318(shot); } } } - temp_v0 = func_80036874(shot, boss->info.hitbox, &boss->obj); + temp_v0 = func_beam_80036874(shot, boss->info.hitbox, &boss->obj); if (temp_v0 != 0) { if (shot->obj.id == PLAYERSHOT_4) { Object_Kill(&shot->obj, shot->sfxSource); @@ -1024,15 +1026,15 @@ void func_80038140(PlayerShot* shot) { } } -void func_80038F34(PlayerShot* shot) { +void func_beam_80038F34(PlayerShot* shot) { Vec3f sp4C = { 0.0f, 0.0f, 0.0f }; s32 sp48 = 0; - Matrix_Translate(gGfxMatrix, shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z + D_80177D20, 1); - Matrix_MultVec3f(gGfxMatrix, &sp4C, &D_8015F950); - if ((D_8015F950.z < 0.0f) && (D_8015F950.z > -10000.0f)) { - if (fabsf(D_8015F950.x) < (fabsf(D_8015F950.z * 0.5f) + 500.0f)) { - if (fabsf(D_8015F950.y) < (fabsf(D_8015F950.z * 0.5f) + 500.0f)) { + Matrix_Translate(gGfxMatrix, shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z + D_ctx_80177D20, 1); + Matrix_MultVec3f(gGfxMatrix, &sp4C, &D_beam_8015F950); + if ((D_beam_8015F950.z < 0.0f) && (D_beam_8015F950.z > -10000.0f)) { + if (fabsf(D_beam_8015F950.x) < (fabsf(D_beam_8015F950.z * 0.5f) + 500.0f)) { + if (fabsf(D_beam_8015F950.y) < (fabsf(D_beam_8015F950.z * 0.5f) + 500.0f)) { sp48 = 1; } } @@ -1067,7 +1069,7 @@ void func_80038F34(PlayerShot* shot) { } } -void func_80039210(PlayerShot* shot) { +void func_beam_80039210(PlayerShot* shot) { f32 var_fv0; f32 var_fv1; u8 var_a1; @@ -1203,18 +1205,18 @@ static f32 D_800C9BD8[10] = { 100.0f, 100.0f, 0.0f, 0.0f, 0.0f, 50.0f, 0.0f, 40. static u8 D_800C9C00[4] = { 255, 255, 32, 32 }; static u8 D_800C9C04[4] = { 255, 32, 255, 32 }; static u8 D_800C9C08[4] = { 32, 32, 32, 255 }; -void func_80039A50(PlayerShot* shot) { +void func_beam_80039A50(PlayerShot* shot) { Vec3f sp11C = { 0.0f, 0.0f, 0.0f }; s32 pad[4]; f32 var_fv1; s32 sp104 = 0; - Matrix_Translate(gGfxMatrix, shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z + D_80177D20, 1); - Matrix_MultVec3f(gGfxMatrix, &sp11C, &D_8015F950); - if ((D_8015F950.z < 0.0f) && (D_8015F950.z > -10000.0f)) { - var_fv1 = fabsf(D_8015F950.x); // probably fake. The use of temps was likely different - if (var_fv1 < (fabsf(D_8015F950.z * 0.5f) + 500.0f)) { - if (fabsf(D_8015F950.y) < (fabsf(D_8015F950.z * 0.5f) + 500.0f)) { + Matrix_Translate(gGfxMatrix, shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z + D_ctx_80177D20, 1); + Matrix_MultVec3f(gGfxMatrix, &sp11C, &D_beam_8015F950); + if ((D_beam_8015F950.z < 0.0f) && (D_beam_8015F950.z > -10000.0f)) { + var_fv1 = fabsf(D_beam_8015F950.x); // probably fake. The use of temps was likely different + if (var_fv1 < (fabsf(D_beam_8015F950.z * 0.5f) + 500.0f)) { + if (fabsf(D_beam_8015F950.y) < (fabsf(D_beam_8015F950.z * 0.5f) + 500.0f)) { sp104 = 1; } } @@ -1243,7 +1245,7 @@ void func_80039A50(PlayerShot* shot) { switch (shot->obj.id) { case PLAYERSHOT_0: case PLAYERSHOT_1: - func_80039210(shot); + func_beam_80039210(shot); break; case PLAYERSHOT_3: if (shot->unk_5C == 0) { @@ -1251,7 +1253,7 @@ void func_80039A50(PlayerShot* shot) { gSPDisplayList(gMasterDisp++, D_10231A0); Matrix_Pop(&gGfxMatrix); Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z + D_80177D20, 1); + Matrix_Translate(gGfxMatrix, shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z + D_ctx_80177D20, 1); Matrix_RotateY(gGfxMatrix, -gPlayer[gPlayerNum].unk_058, 1); Matrix_RotateX(gGfxMatrix, gPlayer[gPlayerNum].unk_05C, 1); Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 40.0f * M_DTOR, 1); @@ -1390,7 +1392,7 @@ void func_80039A50(PlayerShot* shot) { gSPDisplayList(gMasterDisp++, D_AQ_600DB80); Matrix_Pop(&gGfxMatrix); Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, shot->obj.pos.x, gGroundLevel, shot->obj.pos.z + D_80177D20, 1); + Matrix_Translate(gGfxMatrix, shot->obj.pos.x, gGroundLevel, shot->obj.pos.z + D_ctx_80177D20, 1); Matrix_Scale(gGfxMatrix, shot->unk_2C, shot->unk_30, shot->unk_34, 1); RCP_SetupDL(&gMasterDisp, 0x31); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 32, 32, 0, shot->unk_58); @@ -1401,7 +1403,8 @@ void func_80039A50(PlayerShot* shot) { if (!(shot->unk_44 > 1.5f)) { Matrix_Pop(&gGfxMatrix); Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z + D_80177D20, 1); + Matrix_Translate(gGfxMatrix, shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z + D_ctx_80177D20, + 1); Matrix_RotateY(gGfxMatrix, -gPlayer[gPlayerNum].unk_058, 1); Matrix_RotateX(gGfxMatrix, gPlayer[gPlayerNum].unk_05C, 1); Matrix_Push(&gGfxMatrix); @@ -1446,7 +1449,7 @@ void func_80039A50(PlayerShot* shot) { gSPDisplayList(gMasterDisp++, D_10231A0); Matrix_Pop(&gGfxMatrix); Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z + D_80177D20, 1); + Matrix_Translate(gGfxMatrix, shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z + D_ctx_80177D20, 1); Matrix_RotateY(gGfxMatrix, -gPlayer[gPlayerNum].unk_058, 1); Matrix_RotateX(gGfxMatrix, gPlayer[gPlayerNum].unk_05C, 1); if (!(gGameFrameCount & 1)) { @@ -1472,25 +1475,25 @@ void func_80039A50(PlayerShot* shot) { } } -void func_8003AF88(PlayerShot* shot) { +void func_beam_8003AF88(PlayerShot* shot) { switch (shot->obj.status) { case 1: - func_80039A50(shot); + func_beam_80039A50(shot); break; case 2: - func_80038F34(shot); + func_beam_80038F34(shot); break; } } -void func_8003AFD8(PlayerShot* shot) { +void func_beam_8003AFD8(PlayerShot* shot) { shot->unk_60++; if (shot->unk_60 > 2) { Object_Kill(&shot->obj, shot->sfxSource); } } -void func_8003B00C(PlayerShot* shot, Player* player) { +void func_beam_8003B00C(PlayerShot* shot, Player* player) { Vec3f sp5C; Vec3f sp50; Vec3f sp44; @@ -1521,18 +1524,18 @@ void func_8003B00C(PlayerShot* shot, Player* player) { } for (sp5C.z = 0.0f; sp5C.z <= shot->unk_44; sp5C.z += 200.0f) { Matrix_MultVec3f(gCalcMatrix, &sp5C, &sp38); - D_80178498 = shot->obj.pos.z; - D_801784A0 = shot->obj.pos.y; - D_8017849C = shot->obj.pos.x; + D_ctx_80178498 = shot->obj.pos.z; + D_ctx_801784A0 = shot->obj.pos.y; + D_ctx_8017849C = shot->obj.pos.x; shot->obj.pos.x = player->pos.x + sp38.x; shot->obj.pos.y = player->pos.y + sp38.y; shot->obj.pos.z = player->unk_138 + sp38.z; Matrix_Push(&gCalcMatrix); - func_80038140(shot); + func_beam_80038140(shot); Matrix_Pop(&gCalcMatrix); if (shot->obj.pos.y < gGroundLevel) { shot->unk_5C = 0; - func_80036770(shot->obj.pos.x, gGroundLevel + 2.0f, shot->obj.pos.z, shot->obj.rot.y, 2.0f); + func_beam_80036770(shot->obj.pos.x, gGroundLevel + 2.0f, shot->obj.pos.z, shot->obj.rot.y, 2.0f); break; } else if (shot->unk_5C == 2) { shot->unk_5C = 0; @@ -1558,7 +1561,7 @@ void func_8003B00C(PlayerShot* shot, Player* player) { shot->unk_4C += shot->vel.y; shot->unk_50 += shot->vel.z; if (!(gGameFrameCount & 3)) { - func_800A668C(D_8017849C, D_801784A0, D_80178498); + func_play_800A668C(D_ctx_8017849C, D_ctx_801784A0, D_ctx_80178498); } if ((fabsf(shot->obj.pos.x - shot->unk_48) < 200.0f) && (fabsf(shot->obj.pos.y - shot->unk_4C) < 200.0f) && (fabsf(shot->obj.pos.z - shot->unk_50) < 200.0f)) { @@ -1572,31 +1575,31 @@ void func_8003B00C(PlayerShot* shot, Player* player) { } if (shot->unk_5C == 1) { if (shot->obj.pos.y < gGroundLevel) { - func_80036318(shot); - func_80036770(shot->obj.pos.x, gGroundLevel + 2.0f, shot->obj.pos.z, shot->obj.rot.y, 2.0f); + func_beam_80036318(shot); + func_beam_80036770(shot->obj.pos.x, gGroundLevel + 2.0f, shot->obj.pos.z, shot->obj.rot.y, 2.0f); if (gCurrentLevel == LEVEL_FORTUNA) { - func_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f); - func_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f); - func_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f); + func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f); + func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f); + func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f); } } - func_80038140(shot); + func_beam_80038140(shot); } } -void func_8003B55C(PlayerShot* shot, s32 index) { +void func_beam_8003B55C(PlayerShot* shot, s32 index) { Vec3f sp44; Vec3f sp38; if ((D_80161A88 == 2) && (shot->obj.pos.y < (gGroundLevel + 50.0f)) && (index == 0)) { - func_8007ACE0(shot->obj.pos.x, gGroundLevel, shot->obj.pos.z, 0.1f, 1.5f, shot->obj.rot.y + 20.0f); - func_8007ACE0(shot->obj.pos.x, gGroundLevel, shot->obj.pos.z, 0.1f, 1.5f, shot->obj.rot.y - 20.0f); + func_effect_8007ACE0(shot->obj.pos.x, gGroundLevel, shot->obj.pos.z, 0.1f, 1.5f, shot->obj.rot.y + 20.0f); + func_effect_8007ACE0(shot->obj.pos.x, gGroundLevel, shot->obj.pos.z, 0.1f, 1.5f, shot->obj.rot.y - 20.0f); } - if ((shot->obj.pos.y < gGroundLevel) && (D_801784AC != 4)) { - func_80036318(shot); + if ((shot->obj.pos.y < gGroundLevel) && (D_ctx_801784AC != 4)) { + func_beam_80036318(shot); shot->obj.pos.y = gGroundLevel + 2; if (gCurrentLevel == LEVEL_BOLSE) { - func_8007A6F0(&shot->obj.pos, 0x29121007); + func_effect_8007A6F0(&shot->obj.pos, 0x29121007); } if ((gCamCount != 4) && (gCurrentLevel != LEVEL_AQUAS)) { if ((shot->playerNum == 0) && (gLaserStrength[0] != LASERS_SINGLE) && @@ -1607,14 +1610,14 @@ void func_8003B55C(PlayerShot* shot, s32 index) { sp44.y = sp44.z = 0.0f; sp44.x = 40.0f; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp44, &sp38); - func_80036770(shot->obj.pos.x + sp38.x, gGroundLevel + 2.0f, shot->obj.pos.z + sp38.z, shot->obj.rot.y, - 2.0f); + func_beam_80036770(shot->obj.pos.x + sp38.x, gGroundLevel + 2.0f, shot->obj.pos.z + sp38.z, + shot->obj.rot.y, 2.0f); sp44.x = -40.0f; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp44, &sp38); - func_80036770(shot->obj.pos.x + sp38.x, gGroundLevel + 2.0f, shot->obj.pos.z + sp38.z, shot->obj.rot.y, - 2.0f); + func_beam_80036770(shot->obj.pos.x + sp38.x, gGroundLevel + 2.0f, shot->obj.pos.z + sp38.z, + shot->obj.rot.y, 2.0f); } else { - func_80036770(shot->obj.pos.x, gGroundLevel + 2.0f, shot->obj.pos.z, shot->obj.rot.y, 2.0f); + func_beam_80036770(shot->obj.pos.x, gGroundLevel + 2.0f, shot->obj.pos.z, shot->obj.rot.y, 2.0f); } } if (D_80161A88 == 2) { @@ -1622,58 +1625,58 @@ void func_8003B55C(PlayerShot* shot, s32 index) { return; } if (gCurrentLevel == LEVEL_FORTUNA) { - func_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f); - func_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f); - func_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f); + func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f); + func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f); + func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f); } if (gCurrentLevel == LEVEL_AQUAS) { - func_8007B8F8(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f); - func_8007B8F8(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f); - func_8007B8F8(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f); - func_i3_801AC8A8(RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.x, RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.y, - shot->obj.pos.z, 0.8f, 0); - func_i3_801AC8A8(RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.x, RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.y, - shot->obj.pos.z, 0.8f, 0); - func_i3_801AC8A8(RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.x, RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.y, - shot->obj.pos.z, 0.8f, 0); + func_effect_8007B8F8(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f); + func_effect_8007B8F8(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f); + func_effect_8007B8F8(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f); + Aquas_801AC8A8(RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.x, RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.y, + shot->obj.pos.z, 0.8f, 0); + Aquas_801AC8A8(RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.x, RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.y, + shot->obj.pos.z, 0.8f, 0); + Aquas_801AC8A8(RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.x, RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.y, + shot->obj.pos.z, 0.8f, 0); } } if (shot->unk_64 == 0) { Object_Kill(&shot->obj, shot->sfxSource); return; } else if ((shot->playerNum < 110) || (shot->unk_64 & 1)) { - func_80038140(shot); + func_beam_80038140(shot); } } -void func_8003BA80(PlayerShot* shot) { - func_8003B55C(shot, 0); +void func_beam_8003BA80(PlayerShot* shot) { + func_beam_8003B55C(shot, 0); } -void func_8003BAA0(PlayerShot* shot) { - func_8003B55C(shot, 0); +void func_beam_8003BAA0(PlayerShot* shot) { + func_beam_8003B55C(shot, 0); shot->unk_58 = 0; } -void func_8003BACC(PlayerShot* shot) { +void func_beam_8003BACC(PlayerShot* shot) { Vec3f sp3C; Vec3f sp30; Vec3f sp24; - func_8003B55C(shot, 0); + func_beam_8003B55C(shot, 0); sp3C.x = shot->obj.pos.x; sp3C.y = shot->obj.pos.y; sp3C.z = shot->obj.pos.z; sp30.x = 0.0f; sp30.y = 0.0f; sp30.z = 0.0f; - if (!func_800A3690(&sp3C, &sp30, COL2_5, &sp24)) { - func_80036318(shot); + if (!func_col2_800A3690(&sp3C, &sp30, COL2_5, &sp24)) { + func_beam_80036318(shot); } shot->unk_58 = 0; } -bool func_8003BB4C(PlayerShot* shot) { +bool func_beam_8003BB4C(PlayerShot* shot) { s32 i; s32 j; f32 var_fa0; @@ -1691,35 +1694,35 @@ bool func_8003BB4C(PlayerShot* shot) { (fabsf(shot->obj.pos.y - (actor->obj.pos.y + actor->info.unk_1C)) <= var_fa0) && (fabsf(shot->obj.pos.z - actor->obj.pos.z) <= var_fa0))) { actor->timer_0CA[shot->playerNum] = 20; - func_80060F30(gPlayer[shot->playerNum].sfxSource, 0x49008027, shot->playerNum); + func_enmy_80060F30(gPlayer[shot->playerNum].sfxSource, 0x49008027, shot->playerNum); for (j = 0; j < ARRAY_COUNT(gPlayerShots); j++) { if (gPlayerShots[j].obj.id == PLAYERSHOT_4) { Object_Kill(&gPlayerShots[j].obj, gPlayerShots[j].sfxSource); } } - D_801615B8[shot->playerNum] = 3.0f; - D_801615A8[shot->playerNum] = 300.0f; + D_display_801615B8[shot->playerNum] = 3.0f; + D_display_801615A8[shot->playerNum] = 300.0f; return true; } } if (gVersusMode) { for (i = 0, player = gPlayer; i < gCamCount; i++, player++) { if ((player->state_1C8 == PLAYERSTATE_1C8_3) && (player->unk_4DC == 0) && (player->form != FORM_ON_FOOT) && - (i != shot->playerNum) && (D_80177B00[i][shot->playerNum] == 0) && + (i != shot->playerNum) && (D_ctx_80177B00[i][shot->playerNum] == 0) && (fabsf(shot->obj.pos.x - player->pos.x) <= var_fa0) && (fabsf(shot->obj.pos.y - player->pos.y) <= var_fa0) && (fabsf(shot->obj.pos.z - player->unk_138) <= var_fa0)) { - D_80177B00[0][shot->playerNum] = D_80177B00[1][shot->playerNum] = D_80177B00[2][shot->playerNum] = - D_80177B00[3][shot->playerNum] = 0; - D_80177B00[i][shot->playerNum] = 20; - func_80060F30(gPlayer[shot->playerNum].sfxSource, 0x49008027, shot->playerNum); + D_ctx_80177B00[0][shot->playerNum] = D_ctx_80177B00[1][shot->playerNum] = + D_ctx_80177B00[2][shot->playerNum] = D_ctx_80177B00[3][shot->playerNum] = 0; + D_ctx_80177B00[i][shot->playerNum] = 20; + func_enmy_80060F30(gPlayer[shot->playerNum].sfxSource, 0x49008027, shot->playerNum); for (j = 0; j < ARRAY_COUNT(gPlayerShots); j++) { if (gPlayerShots[j].obj.id == PLAYERSHOT_4) { Object_Kill(&gPlayerShots[j].obj, gPlayerShots[j].sfxSource); } } - D_801615B8[shot->playerNum] = 3.0f; - D_801615A8[shot->playerNum] = 300.0f; + D_display_801615B8[shot->playerNum] = 3.0f; + D_display_801615A8[shot->playerNum] = 300.0f; return true; } } @@ -1727,22 +1730,22 @@ bool func_8003BB4C(PlayerShot* shot) { return false; } -void func_8003BEF4(PlayerShot* shot) { +void func_beam_8003BEF4(PlayerShot* shot) { if (gVersusMode) { - if ((shot->obj.pos.y < gGroundLevel) || func_8003BB4C(shot) || + if ((shot->obj.pos.y < gGroundLevel) || func_beam_8003BB4C(shot) || !(gControllerHold[shot->playerNum].button & A_BUTTON) || (shot->unk_64 == 0)) { Object_Kill(&shot->obj, shot->sfxSource); } } else { - if ((shot->obj.pos.y < gGroundLevel) || func_8003BB4C(shot) || + if ((shot->obj.pos.y < gGroundLevel) || func_beam_8003BB4C(shot) || !(gControllerHold[gMainController].button & A_BUTTON) || (shot->unk_64 == 0)) { Object_Kill(&shot->obj, shot->sfxSource); } } - func_80038140(shot); + func_beam_80038140(shot); } -void func_8003C008(PlayerShot* shot) { +void func_beam_8003C008(PlayerShot* shot) { s32 i; s32 j; f32* hitboxData; @@ -1804,32 +1807,32 @@ void func_8003C008(PlayerShot* shot) { } } -void func_8003C3D8(PlayerShot* shot) { +void func_beam_8003C3D8(PlayerShot* shot) { static u8 D_800C9C18[4] = { 255, 255, 32, 32 }; static u8 D_800C9C1C[4] = { 255, 32, 255, 32 }; static u8 D_800C9C20[4] = { 32, 32, 32, 255 }; f32 var_fv0; - D_80178370 = shot->obj.pos.x; - D_80178374 = shot->obj.pos.y; - D_80178378 = shot->obj.pos.z; + D_ctx_80178370 = shot->obj.pos.x; + D_ctx_80178374 = shot->obj.pos.y; + D_ctx_80178378 = shot->obj.pos.z; if (gVersusMode) { - D_80178360 = D_800C9C18[shot->playerNum]; - D_80178364 = D_800C9C1C[shot->playerNum]; - D_80178368 = D_800C9C20[shot->playerNum]; + D_ctx_80178360 = D_800C9C18[shot->playerNum]; + D_ctx_80178364 = D_800C9C1C[shot->playerNum]; + D_ctx_80178368 = D_800C9C20[shot->playerNum]; } else { - D_80178360 = 90; - D_80178364 = 90; - D_80178368 = 255; + D_ctx_80178360 = 90; + D_ctx_80178364 = 90; + D_ctx_80178368 = 255; } var_fv0 = 0.7f; if (shot->unk_5C != 0) { var_fv0 = 1.0f; } - Math_SmoothStepToF(&D_8017836C, var_fv0, 1.0f, 0.08f, 0.001f); + Math_SmoothStepToF(&D_ctx_8017836C, var_fv0, 1.0f, 0.08f, 0.001f); } -void func_8003C4D0(PlayerShot* shot, s32 damage) { +void func_beam_8003C4D0(PlayerShot* shot, s32 damage) { s32 i; f32 sp68; f32 sp64; @@ -1920,11 +1923,11 @@ void func_8003C4D0(PlayerShot* shot, s32 damage) { } } if (gCurrentLevel == LEVEL_MACBETH) { - func_i5_801AD144(shot); + Macbeth_801AD144(shot); } else if (gCurrentLevel == LEVEL_VENOM_1) { - func_i1_8019864C(shot); + Venom1_8019864C(shot); } else { - func_8003C008(shot); + func_beam_8003C008(shot); } effect = gEffects; for (i = 0; i < 100; i++, effect++) { @@ -1978,18 +1981,18 @@ void func_8003C4D0(PlayerShot* shot, s32 damage) { } } -void func_8003CC08(PlayerShot* shot) { +void func_beam_8003CC08(PlayerShot* shot) { Vec3f test; f32 var_ft5; switch (shot->unk_5C) { case 0: if (shot->unk_64 == 0) { - func_80035E78(shot); + func_beam_80035E78(shot); break; } - if ((shot->obj.pos.y < gGroundLevel) && (D_801784AC != 4)) { - func_80035E78(shot); + if ((shot->obj.pos.y < gGroundLevel) && (D_ctx_801784AC != 4)) { + func_beam_80035E78(shot); break; } if ((gPlayer[shot->playerNum].form == FORM_LANDMASTER) || (gPlayer[shot->playerNum].form == FORM_ON_FOOT)) { @@ -1999,24 +2002,24 @@ void func_8003CC08(PlayerShot* shot) { if (shot->unk_64 < 25) { if (gVersusMode) { if (gControllerPress[shot->playerNum].button & gBombButton[shot->playerNum]) { - func_80035E78(shot); + func_beam_80035E78(shot); break; } } else { if (gControllerPress[gMainController].button & gBombButton[shot->playerNum]) { - func_80035E78(shot); + func_beam_80035E78(shot); break; } } } if (!((gCurrentLevel == LEVEL_VENOM_ANDROSS) && (gBosses[0].obj.status == OBJ_ACTIVE) && (gBosses[0].state == 17))) { - func_80038140(shot); + func_beam_80038140(shot); } - func_8003C3D8(shot); + func_beam_8003C3D8(shot); break; case 1: - D_8017812C = 2; + D_ctx_8017812C = 2; shot->obj.rot.y += 1.0f; Math_SmoothStepToF(&shot->unk_44, shot->unk_48, 0.05f, 1.5f, 0.001f); if ((shot->unk_64 > 0) && (shot->unk_64 < 30)) { @@ -2030,25 +2033,25 @@ void func_8003CC08(PlayerShot* shot) { var_ft5 = 60.0f; } var_ft5 = 60.0f - var_ft5; - Math_SmoothStepToF(&D_801779A8[gMainController], var_ft5 + 5.0f, 1.0f, 3.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_801779A8[gMainController], var_ft5 + 5.0f, 1.0f, 3.0f, 0.0f); } - func_8003C3D8(shot); + func_beam_8003C3D8(shot); } if (shot->unk_64 == 0) { shot->unk_58 -= 8; if (shot->unk_58 < 0) { shot->unk_58 = 0; Object_Kill(&shot->obj, shot->sfxSource); - D_8017812C = 0; + D_ctx_8017812C = 0; } } - func_8003C4D0(shot, 50); + func_beam_8003C4D0(shot, 50); break; } } static Vec3f D_800C9C24 = { 0.0f, 0.0f, 0.0f }; -void func_8003CF90(PlayerShot* shot) { +void func_beam_8003CF90(PlayerShot* shot) { s32 i; s32 var_a3; f32 sp6C; @@ -2063,14 +2066,15 @@ void func_8003CF90(PlayerShot* shot) { if ((shot->obj.pos.y < gGroundLevel) || (shot->unk_64 == 1)) { if ((D_80161A88 == 2) && (shot->obj.pos.y < gGroundLevel)) { shot->unk_48 = 10.0f; - func_8007D9DC(shot->obj.pos.x, gGroundLevel + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f, - shot->unk_48 * 3.0f, 0); - func_8007D9DC(shot->obj.pos.x, gGroundLevel + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f, - shot->unk_48 * 3.0f, 5); - func_8007ADF4(shot->obj.pos.x, gGroundLevel, shot->obj.pos.z, shot->unk_48 * 0.05f, shot->unk_48 * 0.5f); - func_8007A6F0(&shot->obj.pos, 0x19000014); + func_effect_8007D9DC(shot->obj.pos.x, gGroundLevel + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f, + shot->unk_48 * 3.0f, 0); + func_effect_8007D9DC(shot->obj.pos.x, gGroundLevel + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f, + shot->unk_48 * 3.0f, 5); + func_effect_8007ADF4(shot->obj.pos.x, gGroundLevel, shot->obj.pos.z, shot->unk_48 * 0.05f, + shot->unk_48 * 0.5f); + func_effect_8007A6F0(&shot->obj.pos, 0x19000014); } - func_80036318(shot); + func_beam_80036318(shot); } else { var_a3 = 0; if (shot->unk_60 == 0) { @@ -2085,9 +2089,9 @@ void func_8003CF90(PlayerShot* shot) { } for (i = 0, player = gPlayer; i < gCamCount; i++, player++) { if (((player->state_1C8 == PLAYERSTATE_1C8_3) || (player->state_1C8 == PLAYERSTATE_1C8_5)) && - (D_80177B00[i][shot->playerNum] != 0)) { + (D_ctx_80177B00[i][shot->playerNum] != 0)) { var_a3 = 1; - D_80177B00[i][shot->playerNum] = 2; + D_ctx_80177B00[i][shot->playerNum] = 2; D_800C9C24.x = player->pos.x; if (player->form == FORM_ARWING) { D_800C9C24.y = player->pos.y; @@ -2143,18 +2147,18 @@ void func_8003CF90(PlayerShot* shot) { shot->vel.y = sp38.y; shot->vel.z = sp38.z; } - func_80038140(shot); - D_80178370 = shot->obj.pos.x; - D_80178374 = shot->obj.pos.y; - D_80178378 = shot->obj.pos.z; - D_80178360 = 90; - D_80178364 = 180; - D_80178368 = 90; - Math_SmoothStepToF(&D_8017836C, 0.6f, 1.0f, 0.08f, 0.001f); + func_beam_80038140(shot); + D_ctx_80178370 = shot->obj.pos.x; + D_ctx_80178374 = shot->obj.pos.y; + D_ctx_80178378 = shot->obj.pos.z; + D_ctx_80178360 = 90; + D_ctx_80178364 = 180; + D_ctx_80178368 = 90; + Math_SmoothStepToF(&D_ctx_8017836C, 0.6f, 1.0f, 0.08f, 0.001f); } } -void func_8003D54C(PlayerShot* shot, s32 index) { +void func_beam_8003D54C(PlayerShot* shot, s32 index) { s32 teamId; s32 bonus; @@ -2163,36 +2167,36 @@ void func_8003D54C(PlayerShot* shot, s32 index) { shot->obj.pos.z += shot->vel.z; switch (shot->obj.id) { case PLAYERSHOT_0: - func_8003B55C(shot, index); + func_beam_8003B55C(shot, index); break; case PLAYERSHOT_1: case PLAYERSHOT_9: - func_8003B55C(shot, index); + func_beam_8003B55C(shot, index); break; case PLAYERSHOT_2: - func_8003B00C(shot, &gPlayer[shot->playerNum]); + func_beam_8003B00C(shot, &gPlayer[shot->playerNum]); break; case PLAYERSHOT_3: - func_8003CC08(shot); + func_beam_8003CC08(shot); break; case PLAYERSHOT_4: - func_8003BEF4(shot); + func_beam_8003BEF4(shot); break; case PLAYERSHOT_5: - func_8003BA80(shot); + func_beam_8003BA80(shot); break; case PLAYERSHOT_6: - func_8003BAA0(shot); + func_beam_8003BAA0(shot); break; case PLAYERSHOT_7: - func_8003BACC(shot); + func_beam_8003BACC(shot); break; case PLAYERSHOT_8: if (shot->unk_44 > 1.5f) { - func_8003C4D0(shot, 30); + func_beam_8003C4D0(shot, 30); if (shot->bonus != 0) { if (gVersusMode) { - D_80177C30[shot->playerNum] += shot->bonus; + D_ctx_80177C30[shot->playerNum] += shot->bonus; } else { bonus = shot->bonus; if (shot->bonus > 10) { @@ -2220,17 +2224,17 @@ void func_8003D54C(PlayerShot* shot, s32 index) { } } Object_Kill(&shot->obj, shot->sfxSource); - func_8007A6F0(&shot->obj.pos, 0x0903502E); + func_effect_8007A6F0(&shot->obj.pos, 0x0903502E); } else if (gCurrentLevel == LEVEL_AQUAS) { - func_i3_801ABA40(shot); + Aquas_801ABA40(shot); } else { - func_8003CF90(shot); + func_beam_8003CF90(shot); } break; } } -void func_8003D854(PlayerShot* shot) { +void func_beam_8003D854(PlayerShot* shot) { s32 i; s32 var_s5; @@ -2259,40 +2263,40 @@ void func_8003D854(PlayerShot* shot) { if (shot->unk_64 > 0) { shot->unk_64--; } - D_80178498 = shot->obj.pos.z; - D_801784A0 = shot->obj.pos.y; - D_8017849C = shot->obj.pos.x; - func_8003D54C(shot, i); + D_ctx_80178498 = shot->obj.pos.z; + D_ctx_801784A0 = shot->obj.pos.y; + D_ctx_8017849C = shot->obj.pos.x; + func_beam_8003D54C(shot, i); } break; case 2: - func_8003AFD8(shot); + func_beam_8003AFD8(shot); break; } } -void func_8003D9B8(void) { +void func_beam_8003D9B8(void) { s32 i; for (i = 0; i < 16; i++) { gPlayerShots[i].index = i; - func_8003D854(&gPlayerShots[i]); + func_beam_8003D854(&gPlayerShots[i]); } } -void func_8003DA0C(void) { +void func_beam_8003DA0C(void) { s32 i; for (i = 0; i < 16; i++) { gPlayerShots[i].index = i; if (gPlayerShots[i].obj.status != 0) { - if (!((D_80161410 < 0) && (gPlayerShots[i].obj.rot.x < -10.0f))) { + if (!((D_display_80161410 < 0) && (gPlayerShots[i].obj.rot.x < -10.0f))) { Matrix_Push(&gGfxMatrix); - func_8003AF88(&gPlayerShots[i]); + func_beam_8003AF88(&gPlayerShots[i]); Matrix_Pop(&gGfxMatrix); } - if (D_80161410 > 0) { - func_8005F290(gPlayerShots[i].sfxSource, &D_8015F950); + if (D_display_80161410 > 0) { + func_edisplay_8005F290(gPlayerShots[i].sfxSource, &D_beam_8015F950); } } } diff --git a/src/main/fox_bg.c b/src/main/fox_bg.c index b60bd69f..189a66e5 100644 --- a/src/main/fox_bg.c +++ b/src/main/fox_bg.c @@ -1,20 +1,4 @@ #include "global.h" - -extern f32 D_i3_801C4188; - -f32 D_8015F960; -u8 D_8015F964; -f32 D_8015F968; -f32 D_8015F96C; -f32 D_8015F970; -s32 D_8015F974; -s32 D_8015F978; -s32 D_8015F97C; -s32 D_8015F980; -f32 D_8015F984; -UNK_TYPE D_8015F988[0x683]; // Unused? Close to being [13][0x80] -f32 D_80161394; // can be static - #include "assets/ast_katina.h" #include "assets/ast_venom_1.h" #include "assets/ast_venom_2.h" @@ -37,66 +21,79 @@ f32 D_80161394; // can be static #include "assets/ast_area_6.h" #include "assets/ast_zoness.h" -f32 D_800C9C30 = 0.0f; -u16 D_800C9C34 = 1; -s32 D_800C9C38 = 0; // unused? -u16 D_800C9C3C[16] = { +f32 D_bg_8015F960; +u8 D_bg_8015F964; +f32 D_bg_8015F968; +f32 D_bg_8015F96C; +f32 D_bg_8015F970; +s32 D_bg_8015F974; +s32 D_bg_8015F978; +s32 D_bg_8015F97C; +s32 D_bg_8015F980; +f32 D_bg_8015F984; +UNK_TYPE D_bg_8015F988[0x683]; // Unused? Close to being [13][0x80] +f32 D_bg_80161394; // can be static + +f32 D_bg_800C9C30 = 0.0f; +u16 D_bg_800C9C34 = 1; +s32 D_bg_800C9C38 = 0; // unused? +u16 D_bg_800C9C3C[16] = { 0x108B, 0x108B, 0x1087, 0x1089, 0x39FF, 0x190D, 0x108B, 0x1089, 0x294B, 0x18DF, 0x294B, 0x1085, 0x39FF, 0x108B, 0x18CD, 0x108B, }; -Gfx* D_800C9C5C[13] = { +Gfx* D_bg_800C9C5C[13] = { D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0, D_BG_PLANET_20112C0, D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0, D_BG_PLANET_20112C0, D_102A8A0, }; -Gfx* D_800C9C90[13] = { +Gfx* D_bg_800C9C90[13] = { D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0, }; -f32 D_800C9CC4[13] = { +f32 D_bg_800C9CC4[13] = { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 10.0f, 13.0f, 20.0f, 35.0f, 40.0f, 50.0f, 50.0f, 70.0f, }; -f32 D_800C9CF8[13] = { +f32 D_bg_800C9CF8[13] = { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 5.0f, 10.0f, 16.0f, 20.0f, 30.0f, 45.0f, 60.0f, 70.0f, }; -f32 D_800C9D2C[13] = { +f32 D_bg_800C9D2C[13] = { 0.7f, 1.0f, 1.2f, 1.4f, 1.8f, 2.0f, 0.4f, 0.6f, 0.8f, 1.7f, 0.8f, 4.0f, 2.0f, }; -f32 D_800C9D60[13] = { +f32 D_bg_800C9D60[13] = { 0.525f, 0.75f, 0.90000004f, 1.05f, 1.3499999f, 0.15f, 0.25f, 0.35f, 1.0f, 0.6f, 0.35f, 0.9f, 1.0f, }; -Color_RGB8 D_800C9D94[13] = { +Color_RGB8 D_bg_800C9D94[13] = { { 255, 255, 255 }, { 255, 255, 192 }, { 255, 255, 128 }, { 255, 255, 96 }, { 255, 255, 64 }, { 255, 255, 64 }, { 255, 255, 64 }, { 255, 255, 64 }, { 255, 255, 64 }, { 255, 255, 64 }, { 255, 255, 64 }, { 255, 255, 64 }, { 255, 255, 64 }, }; -Color_RGB8 D_800C9DBC[13] = { +Color_RGB8 D_bg_800C9DBC[13] = { { 255, 128, 64 }, { 255, 128, 64 }, { 255, 128, 64 }, { 255, 128, 64 }, { 255, 128, 64 }, { 255, 255, 64 }, { 255, 128, 64 }, { 255, 128, 64 }, { 255, 255, 64 }, { 128, 128, 128 }, { 128, 128, 255 }, { 255, 255, 64 }, { 255, 128, 64 }, }; -s32 D_800C9DE4[13] = { +s32 D_bg_800C9DE4[13] = { 255, 80, 64, 48, 32, 12, 32, 44, 32, 42, 36, 12, 38, }; -s32 D_800C9E18[13] = { +s32 D_bg_800C9E18[13] = { 80, 60, 40, 20, 10, 20, 30, 20, 15, 30, 20, 27, 20, }; -s32 D_800C9E4C[2] = { 10, 4 }; -s32 D_800C9E54[2] = { 140, 40 }; -f32 D_800C9E5C[2] = { 1.2f, 0.5f }; -f32 D_800C9E64[4] = { +s32 D_bg_800C9E4C[2] = { 10, 4 }; +s32 D_bg_800C9E54[2] = { 140, 40 }; +f32 D_bg_800C9E5C[2] = { 1.2f, 0.5f }; +f32 D_bg_800C9E64[4] = { 6000.0f, -6000.0f, 6000.0f, -6000.0f, }; -f32 D_800C9E74[4] = { +f32 D_bg_800C9E74[4] = { 6000.0f, 6000.0f, -6000.0f, -6000.0f, }; -void func_8003DAF0(void) { +void func_bg_8003DAF0(void) { f32 var_fa0; f32 var_fv1; s16 temp_ft0; @@ -115,32 +112,32 @@ void func_8003DAF0(void) { gDPSetCycleType(gMasterDisp++, G_CYC_FILL); gDPSetCombineMode(gMasterDisp++, G_CC_SHADE, G_CC_SHADE); gDPSetRenderMode(gMasterDisp++, G_RM_OPA_SURF, G_RM_OPA_SURF2); - var_s2 = D_80178410; + var_s2 = D_ctx_80178410; if (var_s2 != 0) { - if (D_80178420 >= 480.0f) { - D_80178420 -= 480.0f; + if (D_ctx_80178420 >= 480.0f) { + D_ctx_80178420 -= 480.0f; } - if (D_80178424 >= 360.0f) { - D_80178424 -= 360.0f; + if (D_ctx_80178424 >= 360.0f) { + D_ctx_80178424 -= 360.0f; } - if (D_80178420 < 0.0f) { - D_80178420 += 480.0f; + if (D_ctx_80178420 < 0.0f) { + D_ctx_80178420 += 480.0f; } - if (D_80178424 < 0.0f) { - D_80178424 += 360.0f; + if (D_ctx_80178424 < 0.0f) { + D_ctx_80178424 += 360.0f; } - spf68 = D_80178420; - spf64 = D_80178424; + spf68 = D_ctx_80178420; + spf64 = D_ctx_80178424; - sp60 = D_80178288; - sp5C = D_80178290; - sp58 = D_80178298; + sp60 = D_ctx_80178288; + sp5C = D_ctx_80178290; + sp58 = D_ctx_80178298; if (gGameState != GSTATE_PLAY) { var_s2 = 1000; } - sp70 = __cosf(D_80178428); - spf6C = __sinf(D_80178428); + sp70 = __cosf(D_ctx_80178428); + spf6C = __sinf(D_ctx_80178428); for (i = 0; i < var_s2; i++, sp5C++, sp60++, sp58++) { var_fv1 = *sp60 + spf68; var_fa0 = *sp5C + spf64; @@ -166,7 +163,7 @@ void func_8003DAF0(void) { gDPSetColorDither(gMasterDisp++, G_CD_MAGICSQ); } -void func_8003DE68(s32 arg0, s32 arg1) { +void func_bg_8003DE68(s32 arg0, s32 arg1) { f32 var_fa0; // 8C f32 var_fv1; // 88 s16 temp_ft0; // 84 @@ -186,29 +183,29 @@ void func_8003DE68(s32 arg0, s32 arg1) { gDPSetCombineMode(gMasterDisp++, G_CC_SHADE, G_CC_SHADE); gDPSetRenderMode(gMasterDisp++, G_RM_OPA_SURF, G_RM_OPA_SURF2); - if (D_80178420 >= 480.0f) { - D_80178420 -= 480.0f; + if (D_ctx_80178420 >= 480.0f) { + D_ctx_80178420 -= 480.0f; } - if (D_80178424 >= 360.0f) { - D_80178424 -= 360.0f; + if (D_ctx_80178424 >= 360.0f) { + D_ctx_80178424 -= 360.0f; } - if (D_80178420 < 0.0f) { - D_80178420 += 480.0f; + if (D_ctx_80178420 < 0.0f) { + D_ctx_80178420 += 480.0f; } - if (D_80178424 < 0.0f) { - D_80178424 += 360.0f; + if (D_ctx_80178424 < 0.0f) { + D_ctx_80178424 += 360.0f; } - spf68 = D_80178420; - spf64 = D_80178424; + spf68 = D_ctx_80178420; + spf64 = D_ctx_80178424; - sp60 = D_80178288; - sp5C = D_80178290; - sp58 = D_80178298; + sp60 = D_ctx_80178288; + sp5C = D_ctx_80178290; + sp58 = D_ctx_80178298; var_s2 = 500; - sp70 = __cosf(D_80178428); - spf6C = __sinf(D_80178428); + sp70 = __cosf(D_ctx_80178428); + spf6C = __sinf(D_ctx_80178428); for (i = 0; i < var_s2; i++, sp5C++, sp60++, sp58++) { var_fv1 = *sp60 + spf68; var_fa0 = *sp5C + spf64; @@ -233,10 +230,10 @@ void func_8003DE68(s32 arg0, s32 arg1) { gDPSetColorDither(gMasterDisp++, G_CD_MAGICSQ); } -void func_8003E1E0(void) { +void func_bg_8003E1E0(void) { } -void func_8003E1E8(void) { +void func_bg_8003E1E8(void) { f32 sp13C; f32 sp138; f32 sp134; @@ -247,7 +244,7 @@ void func_8003E1E8(void) { u8 var_s0; s32 sp11C; - if (D_80177AB0 == 0) { + if (D_ctx_80177AB0 == 0) { return; } @@ -260,7 +257,7 @@ void func_8003E1E8(void) { } sp11C = gCurrentLevel; Matrix_Push(&gGfxMatrix); - if (D_80177C70 == 2) { + if (D_ctx_80177C70 == 2) { Matrix_Scale(gGfxMatrix, 1.2f, 1.2f, 1.0f, 1); } switch (var_s0) { @@ -351,25 +348,25 @@ void func_8003E1E8(void) { } break; case LEVEL_VENOM_ANDROSS: - if (D_80177AB0 != 6) { - if ((D_80177AB0 == 2) || (D_80177AB0 == 7)) { + if (D_ctx_80177AB0 != 6) { + if ((D_ctx_80177AB0 == 2) || (D_ctx_80177AB0 == 7)) { Matrix_RotateZ(gGfxMatrix, gPlayer[gPlayerNum].unk_034 * M_DTOR, 1); Matrix_Translate(gGfxMatrix, 0.0f, -4000.0f, -7000.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_VE2_600F670); - } else if ((D_80177AB0 == 3) || (D_80177AB0 == 4)) { + } else if ((D_ctx_80177AB0 == 3) || (D_ctx_80177AB0 == 4)) { RCP_SetupDL(&gMasterDisp, 0x3E); - if (D_80177AB0 == 4) { + if (D_ctx_80177AB0 == 4) { if (!(gGameFrameCount & 8)) { - Math_SmoothStepToF(&D_80161394, 0.0f, 1.0f, 30.0f, 0); + Math_SmoothStepToF(&D_bg_80161394, 0.0f, 1.0f, 30.0f, 0); } else { - Math_SmoothStepToF(&D_80161394, 120.0f, 1.0f, 30.0f, 0); + Math_SmoothStepToF(&D_bg_80161394, 120.0f, 1.0f, 30.0f, 0); } } else { - D_80161394 = 255.0f; + D_bg_80161394 = 255.0f; } - gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, (s32) D_80161394, (s32) D_80161394, - (s32) D_800C9C30); + gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, (s32) D_bg_80161394, (s32) D_bg_80161394, + (s32) D_bg_800C9C30); sp134 = (gPlayer[gPlayerNum].unk_05C * -6000.0f) - (gPlayer[gPlayerNum].camEye.y * 0.4f); sp13C = Math_ModF(Math_RadToDeg(gPlayer[gPlayerNum].unk_058) * (-7280.0f / 360.0f) * 5.0f, @@ -385,10 +382,10 @@ void func_8003E1E8(void) { } else { fake_label: // fake RCP_SetupDL(&gMasterDisp, 0x3E); - if (D_80177AB0 == 5) { + if (D_ctx_80177AB0 == 5) { gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 64); } else { - gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 255, 128, (s32) D_800C9C30); + gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 255, 128, (s32) D_bg_800C9C30); } Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -290.0f, 1); Matrix_Push(&gGfxMatrix); @@ -397,7 +394,7 @@ void func_8003E1E8(void) { Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_ANDROSS_C039208); Matrix_Pop(&gGfxMatrix); - if (D_80177AB0 != 5) { + if (D_ctx_80177AB0 != 5) { Matrix_Push(&gGfxMatrix); Matrix_Scale(gGfxMatrix, 10.0f, 10.0f, 1.0f, 1); Matrix_RotateZ(gGfxMatrix, (gPlayer[0].unk_034 + (gGameFrameCount * -1.3f)) * M_DTOR, @@ -451,13 +448,13 @@ void func_8003E1E8(void) { sp13C = sp12C * -40.44444f * 2.0f; // close to 7280.0f / 180.0f if ((gCurrentLevel == LEVEL_TITANIA) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_2) && (gPlayer[0].unk_1D0 < 3)) { - D_8015F968 += __sinf(gPlayer[0].unk_058) * 20.0f; - sp13C += D_8015F968; + D_bg_8015F968 += __sinf(gPlayer[0].unk_058) * 20.0f; + sp13C += D_bg_8015F968; } if ((gCurrentLevel == LEVEL_SOLAR) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_2) && (gPlayer[0].unk_1D0 >= 2) && (gPlayer[0].camEye.z <= -1900.0f)) { - D_8015F968 = __sinf(gPlayer[0].unk_05C) * 7000.0f; - sp134 -= fabsf(D_8015F968); + D_bg_8015F968 = __sinf(gPlayer[0].unk_05C) * 7000.0f; + sp134 -= fabsf(D_bg_8015F968); } sp13C = Math_ModF(sp13C, 7280.0f); RCP_SetupDL_17(); @@ -506,9 +503,10 @@ void func_8003E1E8(void) { sp130 = Math_RadToDeg(gPlayer[0].unk_05C); if (((sp12C < 45.0f) || (sp12C > 315.0f)) && ((sp130 < 40.0f) || (sp130 > 325.0f))) { RCP_SetupDL_36(); - sp138 = D_80178420; - sp134 = D_80178424; - if (((gCurrentLevel == LEVEL_SECTOR_X) || (gCurrentLevel == LEVEL_METEO)) && (D_8017827C == 1)) { + sp138 = D_ctx_80178420; + sp134 = D_ctx_80178424; + if (((gCurrentLevel == LEVEL_SECTOR_X) || (gCurrentLevel == LEVEL_METEO)) && + (D_ctx_8017827C == 1)) { sp11C = LEVEL_WARP_ZONE; } if (sp11C == LEVEL_SECTOR_X) { @@ -537,12 +535,12 @@ void func_8003E1E8(void) { if ((sp130 > 180.0f) && (sp134 > 280.0f)) { sp134 = -(360.0f - sp134); } - Matrix_RotateZ(gGfxMatrix, D_80178428, 1); + Matrix_RotateZ(gGfxMatrix, D_ctx_80178428, 1); switch (sp11C) { case LEVEL_WARP_ZONE: - if ((s32) D_8015F960 != 0) { + if ((s32) D_bg_8015F960 != 0) { RCP_SetupDL_62(); - gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, (s32) D_8015F960); + gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, (s32) D_bg_8015F960); Matrix_Translate(gGfxMatrix, sp138 - 120.0f, -(sp134 - 120.0f), -290.0f, 1); Matrix_Scale(gGfxMatrix, 1.7f, 1.7f, 1.0f, 1); Matrix_Push(&gGfxMatrix); @@ -561,7 +559,7 @@ void func_8003E1E8(void) { Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 1.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_ME_600DDF0); - } else if (D_80177D20 > 185668.0f) { + } else if (D_ctx_80177D20 > 185668.0f) { Matrix_Translate(gGfxMatrix, sp138 - 120.0f, -(sp134 - 120.0f) - 130.0f, -290.0f, 1); Matrix_Scale(gGfxMatrix, 0.4f, 0.4f, 1.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -588,12 +586,12 @@ void func_8003E1E8(void) { break; case LEVEL_AREA_6: case LEVEL_UNK_4: - sp128 = (D_80177D20 * 0.00004f) + 0.5f; + sp128 = (D_ctx_80177D20 * 0.00004f) + 0.5f; if (sp128 > 3.5f) { sp128 = 3.5f; } if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7) { - sp128 = D_8015F984; + sp128 = D_bg_8015F984; if (sp128 > 3.5f) { sp128 = 3.5f; } @@ -606,7 +604,7 @@ void func_8003E1E8(void) { break; case LEVEL_FORTUNA: sp128 = 1.5f; - if ((gCsFrameCount > 400) && (D_80177930 == 0)) { + if ((gCsFrameCount > 400) && (D_ctx_80177930 == 0)) { sp128 = 0.75f; } Matrix_Translate(gGfxMatrix, sp138 - 120.0f, -(sp134 - 120.0f), -290.0f, 1); @@ -643,9 +641,9 @@ void func_8003E1E8(void) { } Matrix_Pop(&gGfxMatrix); } - if (D_80178414 > 0.0f) { - f32* sp50 = D_80178288; - f32* sp4C = D_80178290; + if (D_ctx_80178414 > 0.0f) { + f32* sp50 = D_ctx_80178288; + f32* sp4C = D_ctx_80178290; f32 sp48; RCP_SetupDL_14(); @@ -658,9 +656,9 @@ void func_8003E1E8(void) { Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, (*sp50 - 160.0f) * 10.0f, (*sp4C - 120.0f) * 10.0f, -5000.0f, 1); Matrix_RotateZ(gGfxMatrix, sp48, 1); - Matrix_Scale(gGfxMatrix, 10.0f, 1.0f, -D_80178414, 1); + Matrix_Scale(gGfxMatrix, 10.0f, 1.0f, -D_ctx_80178414, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_800CFD80); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFD80); Matrix_Pop(&gGfxMatrix); sp48 += M_PI / 4; } @@ -670,7 +668,7 @@ void func_8003E1E8(void) { Matrix_Pop(&gGfxMatrix); } -void func_80040450(void) { +void func_bg_80040450(void) { f32 sp44; f32 var_fa0; Color_RGB8* var_s1; @@ -684,53 +682,53 @@ void func_80040450(void) { (gCurrentLevel == LEVEL_SOLAR) || (gCurrentLevel == LEVEL_TRAINING) || gVersusMode) { return; } - D_80178380[gPlayerNum] -= D_800C9E4C[temp]; - if (D_80178380[gPlayerNum] > 300) { - D_80178380[gPlayerNum] = 0; + D_ctx_80178380[gPlayerNum] -= D_bg_800C9E4C[temp]; + if (D_ctx_80178380[gPlayerNum] > 300) { + D_ctx_80178380[gPlayerNum] = 0; } if (((gCurrentLevel == LEVEL_AQUAS) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_2)) || (((gPlayer[gPlayerNum].state_1C8 == PLAYERSTATE_1C8_5) || (gLevelMode == LEVELMODE_ALL_RANGE) || (gPlayer[gPlayerNum].state_1C8 == PLAYERSTATE_1C8_7)) && (gLevelType == LEVELTYPE_PLANET) && (gCurrentLevel != LEVEL_TITANIA) && (gCurrentLevel != LEVEL_AQUAS))) { - D_80178390[gPlayerNum] = 128; - D_801783A0[gPlayerNum] = 128; - D_801783B0[gPlayerNum] = 128; + D_ctx_80178390[gPlayerNum] = 128; + D_ctx_801783A0[gPlayerNum] = 128; + D_ctx_801783B0[gPlayerNum] = 128; sp44 = Math_RadToDeg(gPlayer[gPlayerNum].unk_058); var_fa0 = Math_RadToDeg(gPlayer[gPlayerNum].unk_05C); if (var_fa0 > 180.0f) { var_fa0 -= 360.0f; } sp44 -= 135.0f; - D_801783D0 = -sp44 * 3.2f; - D_801783D4 = ((-var_fa0 * 3.2f) + 130.0f) - ((gPlayer[gPlayerNum].camEye.y - 350.0f) * 0.015f); + D_ctx_801783D0 = -sp44 * 3.2f; + D_ctx_801783D4 = ((-var_fa0 * 3.2f) + 130.0f) - ((gPlayer[gPlayerNum].camEye.y - 350.0f) * 0.015f); if (gCurrentLevel == LEVEL_KATINA) { - D_801783D4 -= 80.0f; + D_ctx_801783D4 -= 80.0f; } - if ((gCurrentLevel == LEVEL_ZONESS) && (gPlayer[0].unk_1D0 >= 2) && (D_80161684 == 0)) { - D_801783D4 -= 60.0f; - D_801783D0 -= 480.0f; + if ((gCurrentLevel == LEVEL_ZONESS) && (gPlayer[0].unk_1D0 >= 2) && (D_enmy_80161684 == 0)) { + D_ctx_801783D4 -= 60.0f; + D_ctx_801783D0 -= 480.0f; } - if ((D_801783D0 < 120.0f) && (D_801783D0 > -120.0f) && (D_801783D4 < 120.0f)) { - D_80178380[gPlayerNum] += D_800C9E4C[temp] * 2; - if (D_800C9E54[temp] < D_80178380[gPlayerNum]) { - D_80178380[gPlayerNum] = D_800C9E54[temp]; + if ((D_ctx_801783D0 < 120.0f) && (D_ctx_801783D0 > -120.0f) && (D_ctx_801783D4 < 120.0f)) { + D_ctx_80178380[gPlayerNum] += D_bg_800C9E4C[temp] * 2; + if (D_bg_800C9E54[temp] < D_ctx_80178380[gPlayerNum]) { + D_ctx_80178380[gPlayerNum] = D_bg_800C9E54[temp]; } } } - if (D_80178380[gPlayerNum] != 0) { + if (D_ctx_80178380[gPlayerNum] != 0) { Matrix_Push(&gGfxMatrix); Matrix_RotateZ(gGfxMatrix, gPlayer[gPlayerNum].unk_034 * M_DTOR, 1); - Matrix_Translate(gGfxMatrix, D_801783D0, D_801783D4, -200.0f, 1); + Matrix_Translate(gGfxMatrix, D_ctx_801783D0, D_ctx_801783D4, -200.0f, 1); RCP_SetupDL_62(); - var_s1 = D_800C9D94; - var_s2 = D_800C9DE4; - var_s3 = D_800C9C5C; - var_s4 = D_800C9D2C; + var_s1 = D_bg_800C9D94; + var_s2 = D_bg_800C9DE4; + var_s3 = D_bg_800C9C5C; + var_s4 = D_bg_800C9D2C; if (gCurrentLevel == LEVEL_KATINA) { - var_s1 = D_800C9DBC; - var_s2 = D_800C9E18; - var_s3 = D_800C9C90; - var_s4 = D_800C9D60; + var_s1 = D_bg_800C9DBC; + var_s2 = D_bg_800C9E18; + var_s3 = D_bg_800C9C90; + var_s4 = D_bg_800C9D60; } for (i = 0; i < 5; i++, var_s1++, var_s2++, var_s3++, var_s4++) { Matrix_Push(&gGfxMatrix); @@ -744,7 +742,7 @@ void func_80040450(void) { } } -void func_80040954(void) { +void func_bg_80040954(void) { s32 i; Color_RGB8* var_s1; s32* var_s4; @@ -756,29 +754,30 @@ void func_80040954(void) { f32 var_fs2; f32 var_fv0; - if ((gCurrentLevel != LEVEL_VENOM_ANDROSS) && (gLevelType != LEVELTYPE_SPACE) && (D_80178380[gPlayerNum] != 0)) { + if ((gCurrentLevel != LEVEL_VENOM_ANDROSS) && (gLevelType != LEVELTYPE_SPACE) && + (D_ctx_80178380[gPlayerNum] != 0)) { var_fs2 = 1.0f; - if (D_80178380[gPlayerNum] < 80) { - var_fs2 = D_80178380[gPlayerNum] / 80.0f; + if (D_ctx_80178380[gPlayerNum] < 80) { + var_fs2 = D_ctx_80178380[gPlayerNum] / 80.0f; } - var_fs2 *= D_800C9E5C[gLevelType]; + var_fs2 *= D_bg_800C9E5C[gLevelType]; Matrix_Push(&gGfxMatrix); Matrix_RotateZ(gGfxMatrix, gPlayer[gPlayerNum].unk_034 * M_DTOR, 1); - Matrix_Translate(gGfxMatrix, D_801783D0, D_801783D4, -200.0f, 1); + Matrix_Translate(gGfxMatrix, D_ctx_801783D0, D_ctx_801783D4, -200.0f, 1); RCP_SetupDL_62(); - temp_fs0 = D_801783D0 * -0.03f; - temp_fs1 = D_801783D4 * 0.03f; - var_s1 = &D_800C9D94[5]; - var_s4 = &D_800C9DE4[5]; - var_s5 = &D_800C9C5C[5]; - var_s6 = &D_800C9D2C[5]; - var_s7 = &D_800C9CC4[5]; + temp_fs0 = D_ctx_801783D0 * -0.03f; + temp_fs1 = D_ctx_801783D4 * 0.03f; + var_s1 = &D_bg_800C9D94[5]; + var_s4 = &D_bg_800C9DE4[5]; + var_s5 = &D_bg_800C9C5C[5]; + var_s6 = &D_bg_800C9D2C[5]; + var_s7 = &D_bg_800C9CC4[5]; if (gCurrentLevel == LEVEL_KATINA) { - var_s1 = &D_800C9DBC[5]; - var_s4 = &D_800C9E18[5]; - var_s5 = &D_800C9C90[5]; - var_s6 = &D_800C9D60[5]; - var_s7 = &D_800C9CF8[5]; + var_s1 = &D_bg_800C9DBC[5]; + var_s4 = &D_bg_800C9E18[5]; + var_s5 = &D_bg_800C9C90[5]; + var_s6 = &D_bg_800C9D60[5]; + var_s7 = &D_bg_800C9CF8[5]; } for (i = 5; i < 13; i++, var_s1++, var_s4++, var_s5++, var_s6++, var_s7++) { Matrix_Push(&gGfxMatrix); @@ -800,10 +799,10 @@ void func_80040954(void) { } } -void func_80040CDC(void) { +void func_bg_80040CDC(void) { } -void func_80040CE4(void) { +void func_bg_80040CE4(void) { f32 sp1D4; s32 i; u32 temp_fv0; @@ -811,18 +810,18 @@ void func_80040CE4(void) { u16* sp1C4; Gfx* sp1C0; - if ((gCurrentLevel != LEVEL_VENOM_2) && ((gPlayer[0].camEye.y > 4000.0f) || (D_80177A98 == 0))) { + if ((gCurrentLevel != LEVEL_VENOM_2) && ((gPlayer[0].camEye.y > 4000.0f) || (D_ctx_80177A98 == 0))) { return; } - if ((gCurrentLevel == LEVEL_BOLSE) && (D_800C9C34 != 0)) { - func_i4_80192264(); + if ((gCurrentLevel == LEVEL_BOLSE) && (D_bg_800C9C34 != 0)) { + Bolse_80192264(); return; } sp1D4 = 0.0f; - if ((D_801784AC != 10) && (D_801784AC != 11)) { + if ((D_ctx_801784AC != 10) && (D_ctx_801784AC != 11)) { sp1D4 = -4000.0f; } - if (D_801784AC == 7) { + if (D_ctx_801784AC == 7) { sp1D4 = 0.0f; gPlayer[gPlayerNum].unk_0AC = 0.0f; } @@ -869,21 +868,21 @@ void func_80040CE4(void) { } } Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, gPlayer[gPlayerNum].unk_0AC, -3.0f + D_8017847C, sp1D4, 1); - if (D_80177C70 == 2) { + Matrix_Translate(gGfxMatrix, gPlayer[gPlayerNum].unk_0AC, -3.0f + D_ctx_8017847C, sp1D4, 1); + if (D_ctx_80177C70 == 2) { Matrix_Scale(gGfxMatrix, 1.2f, 1.2f, 1.0f, 1); } Matrix_SetGfxMtx(&gMasterDisp); switch (gCurrentLevel) { case LEVEL_CORNERIA: - if (D_8017812C != 0) { + if (D_ctx_8017812C != 0) { RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } else { RCP_SetupDL_20(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } if (gLevelMode == LEVELMODE_ON_RAILS) { gDPSetTextureImage(gMasterDisp++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, SEGMENTED_TO_VIRTUAL(D_CO_601B6C0)); - temp_s0 = fabsf(Math_ModF(2.0f * (D_80177CE8 * 0.2133333f), 128.0f)); + temp_s0 = fabsf(Math_ModF(2.0f * (D_ctx_80177CE8 * 0.2133333f), 128.0f)); temp_fv0 = Math_ModF((10000.0f - gPlayer[gPlayerNum].unk_0AC) * 0.32f, 128.0f); gDPSetupTile(gMasterDisp++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, temp_fv0, temp_s0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD); @@ -918,7 +917,7 @@ void func_80040CE4(void) { gBgColor = 0x845; // 8, 8, 32 for (i = 0; i < 4; i++) { Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, D_800C9E64[i], 0.0f, D_800C9E74[i], 1); + Matrix_Translate(gGfxMatrix, D_bg_800C9E64[i], 0.0f, D_bg_800C9E74[i], 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_CO_601EAA0); Matrix_Pop(&gGfxMatrix); @@ -945,7 +944,7 @@ void func_80040CE4(void) { break; } gDPSetTextureImage(gMasterDisp++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, sp1C4); - temp_s0 = fabsf(Math_ModF(2.0f * (D_80177CE8 * 0.2133333f), 128.0f)); + temp_s0 = fabsf(Math_ModF(2.0f * (D_ctx_80177CE8 * 0.2133333f), 128.0f)); temp_fv0 = Math_ModF((10000.0f - gPlayer[gPlayerNum].unk_0AC) * 0.32f, 128.0f); gDPSetupTile(gMasterDisp++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, temp_fv0, temp_s0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD); @@ -965,18 +964,18 @@ void func_80040CE4(void) { case LEVEL_TRAINING: RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); if (gLevelMode == LEVELMODE_ON_RAILS) { - if (D_80177CE8 > 290.0f) { - D_80177CE8 -= 290.0f; + if (D_ctx_80177CE8 > 290.0f) { + D_ctx_80177CE8 -= 290.0f; } Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -3000.0f + D_80177CE8, 1); + Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -3000.0f + D_ctx_80177CE8, 1); Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, 0.5f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_TR_6005880); Matrix_Pop(&gGfxMatrix); if (1) {} Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 3000.0f + D_80177CE8, 1); + Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 3000.0f + D_ctx_80177CE8, 1); Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, 0.5f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_TR_6005880); @@ -984,7 +983,7 @@ void func_80040CE4(void) { } else { for (i = 0; i < 4; i++) { Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, D_800C9E64[i], 0.0f, D_800C9E74[i], 1); + Matrix_Translate(gGfxMatrix, D_bg_800C9E64[i], 0.0f, D_bg_800C9E74[i], 1); Matrix_Scale(gGfxMatrix, 1.5f, 1.0f, 1.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_TR_6005880); @@ -996,12 +995,12 @@ void func_80040CE4(void) { RCP_SetupDL(&gMasterDisp, 0x14); sp1C0 = D_AQ_600AB10; gSPFogPosition(gMasterDisp++, gFogNear, gFogFar); - if ((D_8015F964 == 0) && ((D_80177AC8 == 0) || (D_80177AC8 == 2))) { + if ((D_bg_8015F964 == 0) && ((D_ctx_80177AC8 == 0) || (D_ctx_80177AC8 == 2))) { gDPLoadTileTexture(gMasterDisp++, SEGMENTED_TO_VIRTUAL(D_AQ_600AB68), G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32); gDPSetTextureImage(gMasterDisp++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, SEGMENTED_TO_VIRTUAL(D_AQ_600AB68)); - temp_s0 = fabsf(Math_ModF(2.0f * (D_80177CE8 * 0.2133333f), 128.0f)); + temp_s0 = fabsf(Math_ModF(2.0f * (D_ctx_80177CE8 * 0.2133333f), 128.0f)); temp_fv0 = Math_ModF((10000.0f - gPlayer[gPlayerNum].unk_0AC) * 0.32f, 128.0f); gDPSetupTile(gMasterDisp++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, temp_fv0, temp_s0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD); @@ -1019,15 +1018,15 @@ void func_80040CE4(void) { gSPDisplayList(gMasterDisp++, sp1C0); Matrix_Pop(&gGfxMatrix); } - if ((D_8015F964 != 0) || (D_80177AC8 == 0)) { + if ((D_bg_8015F964 != 0) || (D_ctx_80177AC8 == 0)) { gDPLoadTileTexture(gMasterDisp++, SEGMENTED_TO_VIRTUAL(D_AQ_602ACC0), G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32); gDPSetTextureImage(gMasterDisp++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, SEGMENTED_TO_VIRTUAL(D_AQ_602ACC0)); - temp_s0 = fabsf(Math_ModF(2.0f * (D_80177CE8 * 0.2133333f), 128.0f)); + temp_s0 = fabsf(Math_ModF(2.0f * (D_ctx_80177CE8 * 0.2133333f), 128.0f)); temp_fv0 = Math_ModF((10000.0f - gPlayer[gPlayerNum].unk_0AC) * 0.32f, 128.0f); gDPSetupTile(gMasterDisp++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, temp_fv0, temp_s0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD); - if (D_80177AC8 != 0) { + if (D_ctx_80177AC8 != 0) { RCP_SetupDL(&gMasterDisp, 0x2F); } else { RCP_SetupDL(&gMasterDisp, 0x25); @@ -1035,17 +1034,18 @@ void func_80040CE4(void) { if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_2) && (gPlayer[0].unk_1D0 < 2)) { gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255); } else if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7) { - gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, D_8015F974, D_8015F978, D_8015F97C, D_8015F980); + gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, D_bg_8015F974, D_bg_8015F978, D_bg_8015F97C, + D_bg_8015F980); } else { - gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, (s32) D_i3_801C4188); + gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, (s32) D_AQ_801C4188); } Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, 0.0f, D_8015F970, -3000.0f, 1); + Matrix_Translate(gGfxMatrix, 0.0f, D_bg_8015F970, -3000.0f, 1); Matrix_Scale(gGfxMatrix, 2.0f, 1.0f, 0.5f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_AQ_602AC40); Matrix_Pop(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, 0.0f, D_8015F970, 3000.0f, 1); + Matrix_Translate(gGfxMatrix, 0.0f, D_bg_8015F970, 3000.0f, 1); Matrix_Scale(gGfxMatrix, 2.0f, 1.0f, 0.5f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_AQ_602AC40); @@ -1055,14 +1055,14 @@ void func_80040CE4(void) { case LEVEL_KATINA: case LEVEL_BOLSE: case LEVEL_VENOM_2: - if ((D_8017812C != 0) || (gCurrentLevel == LEVEL_BOLSE)) { + if ((D_ctx_8017812C != 0) || (gCurrentLevel == LEVEL_BOLSE)) { RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } else { RCP_SetupDL_20(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } for (i = 0; i < 4; i++) { Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, D_800C9E64[i], 0.0f, D_800C9E74[i], 1); + Matrix_Translate(gGfxMatrix, D_bg_800C9E64[i], 0.0f, D_bg_800C9E74[i], 1); Matrix_SetGfxMtx(&gMasterDisp); if (gCurrentLevel == LEVEL_FORTUNA) { gSPDisplayList(gMasterDisp++, D_FO_6001360); @@ -1077,14 +1077,14 @@ void func_80040CE4(void) { } break; case LEVEL_VERSUS: - if (D_8017812C != 0) { + if (D_ctx_8017812C != 0) { RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } else { RCP_SetupDL_20(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } for (i = 0; i < 4; i++) { Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, D_800C9E64[i], 0.0f, D_800C9E74[i], 1); + Matrix_Translate(gGfxMatrix, D_bg_800C9E64[i], 0.0f, D_bg_800C9E74[i], 1); Matrix_SetGfxMtx(&gMasterDisp); if (gVersusStage == VS_STAGE_CORNERIA) { gSPDisplayList(gMasterDisp++, D_versus_3018800); @@ -1120,7 +1120,7 @@ void func_80040CE4(void) { Matrix_Pop(&gGfxMatrix); } -void func_80042D38(void) { +void func_bg_80042D38(void) { f32 xEye; f32 zEye; @@ -1131,7 +1131,7 @@ void func_80042D38(void) { xEye = gPlayer[gPlayerNum].camEye.x; if (0) {} zEye = gPlayer[gPlayerNum].camEye.z; - Matrix_Translate(gGfxMatrix, xEye, 2.0f + D_8017847C, zEye, 1); + Matrix_Translate(gGfxMatrix, xEye, 2.0f + D_ctx_8017847C, zEye, 1); Matrix_Scale(gGfxMatrix, 1.5f, 1.0f, 1.0f, 1); RCP_SetupDL_37(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 125); diff --git a/src/main/fox_boss.c b/src/main/fox_boss.c index 43c3c018..4ccfb68e 100644 --- a/src/main/fox_boss.c +++ b/src/main/fox_boss.c @@ -2,14 +2,14 @@ s32 gBossFrameCount; -s32 D_800C9E90[28] = { +s32 D_boss_800C9E90[28] = { 0x8012, 0x8013, 0x8015, 0x8017, 0x8017, 0x8019, 0x8018, 0x801B, 0x8016, 0x8018, 0x8012, 0x8020, 0x8014, 0x801E, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, }; -const f32 D_800D55D0[] = { 6000.0f, 18000.0f, -6000.0f, -18000.0f }; +const f32 D_boss_800D55D0[] = { 6000.0f, 18000.0f, -6000.0f, -18000.0f }; -void func_80042EC0(Boss* boss) { +void func_boss_80042EC0(Boss* boss) { s32 bonus; f32 yOffset; @@ -34,29 +34,29 @@ void func_80042EC0(Boss* boss) { BonusText_Display(boss->obj.pos.x, boss->obj.pos.y + yOffset, boss->obj.pos.z, bonus); } gHitCount += bonus + 1; - D_80177850 = 15; + D_ctx_80177850 = 15; } -void func_80042FAC(Boss* boss) { +void func_boss_80042FAC(Boss* boss) { } -void func_80042FB8(Boss* boss) { +void func_boss_80042FB8(Boss* boss) { } -void func_80042FC4(Boss* boss) { +void func_boss_80042FC4(Boss* boss) { } -void func_80042FD0(Boss* boss) { +void func_boss_80042FD0(Boss* boss) { } -void func_80042FDC(Boss* boss) { +void func_boss_80042FDC(Boss* boss) { } -void func_80042FE8(Boss* boss) { +void func_boss_80042FE8(Boss* boss) { } -void func_80042FF4(Actor* actor, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8, - f32 arg9, f32 argA, s32 argB, s32 argC) { +void func_boss_80042FF4(Actor* actor, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8, + f32 arg9, f32 argA, s32 argB, s32 argC) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; actor->obj.id = OBJ_ACTOR_189; @@ -79,30 +79,30 @@ void func_80042FF4(Actor* actor, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg } } -void func_800430DC(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8, f32 arg9, - s32 argA, s32 argB) { +void func_boss_800430DC(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8, + f32 arg9, s32 argA, s32 argB) { s32 i; for (i = 59; i >= 0; i--) { if (gActors[i].obj.status == OBJ_FREE) { - func_80042FF4(&gActors[i], arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, argA, argB); + func_boss_80042FF4(&gActors[i], arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, argA, argB); return; } } } -void func_80043188(Boss* boss) { +void func_boss_80043188(Boss* boss) { boss->info.unk_10 = 30000.0f; } -void func_8004319C(Player* player, f32 arg1, f32 arg2, f32 arg3) { +void func_boss_8004319C(Player* player, f32 arg1, f32 arg2, f32 arg3) { SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 80); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 80); gCsFrameCount = 0; - D_80178448 = arg3 + D_80177D20; - D_80178440 = arg1; - D_80178444 = arg2; + D_ctx_80178448 = arg3 + D_ctx_80177D20; + D_ctx_80178440 = arg1; + D_ctx_80178444 = arg2; player->state_1C8 = PLAYERSTATE_1C8_7; player->unk_1D0 = 10; diff --git a/src/main/fox_context.c b/src/main/fox_context.c index 838572ea..c1d8ad0e 100644 --- a/src/main/fox_context.c +++ b/src/main/fox_context.c @@ -6,131 +6,131 @@ s32 gOverlaySetup; s32 gOverlayStage; -s32 D_80177824; // some sort of flag -s32 D_8017782C; // some sort of flag. all range related? +s32 D_ctx_80177824; // some sort of flag +s32 D_ctx_8017782C; // some sort of flag. all range related? GameState gGameState; s32 D_Timer_8017783C; // next game state timer? -s32 D_80177844; // timer for vs item spawn +s32 D_ctx_80177844; // timer for vs item spawn OptionState gOptionMenuStatus; -s32 D_80177854; // pause-related state -s32 D_80177868; // some sort of state. pause-related? +s32 D_ctx_80177854; // pause-related state +s32 D_ctx_80177868; // some sort of state. pause-related? LevelMode gLevelMode; DrawMode gDrawMode; s32 gPlayerNum; s32 gCamCount; s32 gTeamShields[6]; s32 gSavedTeamShields[6]; -UNK_TYPE D_801778F0[6]; +UNK_TYPE D_ctx_801778F0[6]; s32 gTeamDamage[6]; -u8 D_80177930; // next planet path +u8 D_ctx_80177930; // next planet path f32 gGroundLevel; -f32 D_80177950; -f32 D_80177968; -f32 D_80177970; +f32 D_ctx_80177950; +f32 D_ctx_80177968; +f32 D_ctx_80177970; f32 gCsCamEyeX; f32 gCsCamEyeY; f32 gCsCamEyeZ; f32 gCsCamAtX; f32 gCsCamAtY; f32 gCsCamAtZ; -Vec3f D_801779D8; -Vec3f D_801779E8; +Vec3f D_ctx_801779D8; +Vec3f D_ctx_801779E8; bool gExpertMode; -s32 D_80177A10[10]; -f32 D_80177A48[10]; +s32 D_ctx_80177A10[10]; +f32 D_ctx_80177A48[10]; s32 gCsFrameCount; -u8 D_80177A98; -u8 D_80177AB0; -u8 D_80177AC8; -s32 D_80177AE0; +u8 D_ctx_80177A98; +u8 D_ctx_80177AB0; +u8 D_ctx_80177AC8; +s32 D_ctx_80177AE0; s32 gMainController; -s32 D_80177B40; -s32 gCurrentPlanet; // D_80177B48 // Arrow pointer? -s32 D_80177B50[7]; -s32 D_80177B70[7]; -PlanetId D_80177B90[7]; -s32 D_80177BB0[7]; -s32 D_80177BD8[22]; // overruns D_80177C30? -s32 D_80177C38[6]; -s32 D_80177C58[6]; +s32 D_ctx_80177B40; +s32 gCurrentPlanet; // D_ctx_80177B48 // Arrow pointer? +s32 D_ctx_80177B50[7]; +s32 D_ctx_80177B70[7]; +PlanetId D_ctx_80177B90[7]; +s32 D_ctx_80177BB0[7]; +s32 D_ctx_80177BD8[22]; // overruns D_ctx_80177C30? +s32 D_ctx_80177C38[6]; +s32 D_ctx_80177C58[6]; u8 gSoundMode; s32 gVolumeSettings[3]; -u16 D_80177C90; +u16 D_ctx_80177C90; u8 gLevelType; -s32 D_80177CA0; +s32 D_ctx_80177CA0; UNK_TYPE F_80177CA8; -f32 D_80177CB0; +f32 D_ctx_80177CB0; UNK_TYPE F_80177CB8; -f32 D_80177CC0; -f32 D_80177CC8; -f32 D_80177CE8; -f32 D_80177D08; -f32 D_80177D20; -f32 D_80177D38; -f32 D_80177D50; -f32 D_80177D68; +f32 D_ctx_80177CC0; +f32 D_ctx_80177CC8; +f32 D_ctx_80177CE8; +f32 D_ctx_80177D08; +f32 D_ctx_80177D20; +f32 D_ctx_80177D38; +f32 D_ctx_80177D50; +f32 D_ctx_80177D68; UNK_TYPE F_80177D80; UNK_TYPE F_80177DE8; s32 gGameFrameCount; -s32 D_80177DC8; -s32 D_80177E70; -s32 D_80177E78; -s32 D_80177E80; -Vec3f D_80177E88; -Vec3f D_80177F10; +s32 D_ctx_80177DC8; +s32 D_ctx_80177E70; +s32 D_ctx_80177E78; +s32 D_ctx_80177E80; +Vec3f D_ctx_80177E88; +Vec3f D_ctx_80177F10; UNK_TYPE F_80178020; -s32 D_8017812C; +s32 D_ctx_8017812C; LevelId gCurrentLevel; -s32 D_8017827C; +s32 D_ctx_8017827C; s32 gBossActive; -s32 D_8017828C; -s32 D_80178294; +s32 D_ctx_8017828C; +s32 D_ctx_80178294; s32 gRadioState; -s32 D_801782A4; +s32 D_ctx_801782A4; s32 D_Timer_801782AC; s32 D_Timer_801782B4; -u8 D_800D3180[30] = { +u8 D_play_800D3180[30] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; -s32 D_801782C0; -s32 D_801782C8; -s32 D_801782D0; -s32 D_801782D8; +s32 D_ctx_801782C0; +s32 D_ctx_801782C8; +s32 D_ctx_801782D0; +s32 D_ctx_801782D8; UNK_TYPE F_801782E0; -s32 D_801782E8; +s32 D_ctx_801782E8; UNK_TYPE F_801782F0; -s32 D_801782F8; -s32 D_80178300; -u16* D_80178308; -ObjectInit* D_80178310; +s32 D_ctx_801782F8; +s32 D_ctx_80178300; +u16* D_ctx_80178308; +ObjectInit* D_ctx_80178310; UNK_TYPE F_80178318; s32 gFogRed; s32 gFogGreen; s32 gFogBlue; s32 gFogAlpha; -s32 D_80178340; // alpha something -s32 D_80178348; // red something -s32 D_80178350; // green something -s32 D_80178354; // blue something -s32 D_80178358; // alpha target -s32 D_8017835C; // alpha step -s32 D_80178360; // 2 lights second color -s32 D_80178364; -s32 D_80178368; -f32 D_8017836C; // 2 lights second color brightness -f32 D_80178370; // Vec3f? -f32 D_80178374; -f32 D_80178378; -s32 D_8017837C; -u32 D_80178380[4]; // player alphas -s32 D_80178390[4]; // player reds -s32 D_801783A0[4]; // player greens -s32 D_801783B0[4]; // player alphas -UNK_TYPE D_801783C0[4]; -f32 D_801783D0; // something x translate -f32 D_801783D4; // something y translate -s32 gFogNear; // near -s32 gFogFar; // far +s32 D_ctx_80178340; // alpha something +s32 D_ctx_80178348; // red something +s32 D_ctx_80178350; // green something +s32 D_ctx_80178354; // blue something +s32 D_ctx_80178358; // alpha target +s32 D_ctx_8017835C; // alpha step +s32 D_ctx_80178360; // 2 lights second color +s32 D_ctx_80178364; +s32 D_ctx_80178368; +f32 D_ctx_8017836C; // 2 lights second color brightness +f32 D_ctx_80178370; // Vec3f? +f32 D_ctx_80178374; +f32 D_ctx_80178378; +s32 D_ctx_8017837C; +u32 D_ctx_80178380[4]; // player alphas +s32 D_ctx_80178390[4]; // player reds +s32 D_ctx_801783A0[4]; // player greens +s32 D_ctx_801783B0[4]; // player alphas +UNK_TYPE D_ctx_801783C0[4]; +f32 D_ctx_801783D0; // something x translate +f32 D_ctx_801783D4; // something y translate +s32 gFogNear; // near +s32 gFogFar; // far UNK_TYPE F_801783E0; UNK_TYPE F_801783E4; UNK_TYPE F_801783E8; @@ -143,75 +143,75 @@ UNK_TYPE F_80178400; UNK_TYPE F_80178404; UNK_TYPE F_80178408; UNK_TYPE F_8017840C; -s32 D_80178410; -f32 D_80178414; -f32 D_80178418; +s32 D_ctx_80178410; +f32 D_ctx_80178414; +f32 D_ctx_80178418; UNK_TYPE F_8017841C; -f32 D_80178420; -f32 D_80178424; -f32 D_80178428; -f32 D_8017842C; -f32 D_80178430; +f32 D_ctx_80178420; +f32 D_ctx_80178424; +f32 D_ctx_80178428; +f32 D_ctx_8017842C; +f32 D_ctx_80178430; UNK_TYPE F_80178434; UNK_TYPE F_80178438; UNK_TYPE F_8017843C; -f32 D_80178440; -f32 D_80178444; -f32 D_80178448; -f32 D_80178450[3]; -f32 D_80178460[3]; -f32 D_80178470[3]; -f32 D_8017847C; -s32 D_80178480; -s32 D_80178484; -bool D_80178488; +f32 D_ctx_80178440; +f32 D_ctx_80178444; +f32 D_ctx_80178448; +f32 D_ctx_80178450[3]; +f32 D_ctx_80178460[3]; +f32 D_ctx_80178470[3]; +f32 D_ctx_8017847C; +s32 D_ctx_80178480; +s32 D_ctx_80178484; +bool D_ctx_80178488; UNK_TYPE F_8017848C; UNK_TYPE F_80178490; -s32 D_80178494; -f32 D_80178498; -f32 D_8017849C; -f32 D_801784A0; -s32 D_801784A4; +s32 D_ctx_80178494; +f32 D_ctx_80178498; +f32 D_ctx_8017849C; +f32 D_ctx_801784A0; +s32 D_ctx_801784A4; UNK_TYPE F_801784A8; -s32 D_801784AC; +s32 D_ctx_801784AC; UNK_TYPE F_801784B0; UNK_TYPE F_801784B4; -f32 D_801784B8; // effective Vec3f -f32 D_801784BC; -f32 D_801784C0; -f32 D_801784C4; // effective Vec3f -f32 D_801784C8; -f32 D_801784CC; -f32 D_801784D0; // effective Vec3f -f32 D_801784D4; -f32 D_801784D8; +f32 D_ctx_801784B8; // effective Vec3f +f32 D_ctx_801784BC; +f32 D_ctx_801784C0; +f32 D_ctx_801784C4; // effective Vec3f +f32 D_ctx_801784C8; +f32 D_ctx_801784CC; +f32 D_ctx_801784D0; // effective Vec3f +f32 D_ctx_801784D4; +f32 D_ctx_801784D8; s32 gLight1x; // Vec3i light direction s32 gLight1y; s32 gLight1z; -f32 D_801784E8; -f32 D_801784EC; // effective Vec3f? -f32 D_801784F0; -f32 D_801784F4; -f32 D_801784F8; // effective Vec3f -f32 D_801784FC; -f32 D_80178500; +f32 D_ctx_801784E8; +f32 D_ctx_801784EC; // effective Vec3f? +f32 D_ctx_801784F0; +f32 D_ctx_801784F4; +f32 D_ctx_801784F8; // effective Vec3f +f32 D_ctx_801784FC; +f32 D_ctx_80178500; s32 gLight2x; // Vec3i light direction alternate s32 gLight2y; s32 gLight2z; -f32 D_80178510; +f32 D_ctx_80178510; UNK_TYPE F_801784514; UNK_TYPE F_801784518; UNK_TYPE F_80178451C; -f32 D_80178520; // effective Vec3f -f32 D_80178524; -f32 D_80178528; +f32 D_ctx_80178520; // effective Vec3f +f32 D_ctx_80178524; +f32 D_ctx_80178528; UNK_TYPE F_80178452C; UNK_TYPE F_801784530; UNK_TYPE F_801784534; -f32 D_80178538; -f32 D_8017853C; -s32 D_80178540; -s32 D_80178544; +f32 D_ctx_80178538; +f32 D_ctx_8017853C; +s32 D_ctx_80178540; +s32 D_ctx_80178544; s32 gLight1R; // Color32 light color 1 s32 gLight1G; s32 gLight1B; @@ -223,9 +223,9 @@ s32 gLight2R; // Color32 light color 2 s32 gLight2G; s32 gLight2B; UNK_TYPE P_800D31A0 = 0; -s32 D_80178570; // Color32 light color 2 modifier? -s32 D_80178574; -s32 D_80178578; +s32 D_ctx_80178570; // Color32 light color 2 modifier? +s32 D_ctx_80178574; +s32 D_ctx_80178578; s32 D_80161A70; // Color32? start of bss s32 D_80161A74; s32 D_80161A78; @@ -256,106 +256,106 @@ PlayerShot gPlayerShots[16]; TexturedLine gTexturedLines[100]; RadarMark gRadarMarks[65]; BonusText gBonusText[10]; -s32 D_80176550[2]; -f32 D_80176558[2][100]; -f32 D_80176878[2][100]; -f32 D_80176B98[2][100]; -f32 D_80176EB8[2][100]; -f32 D_801771D8[2][100]; -f32 D_80177500[2][100]; +s32 D_ctx_80176550[2]; +f32 D_ctx_80176558[2][100]; +f32 D_ctx_80176878[2][100]; +f32 D_ctx_80176B98[2][100]; +f32 D_ctx_80176EB8[2][100]; +f32 D_ctx_801771D8[2][100]; +f32 D_ctx_80177500[2][100]; UNK_TYPE P_800D31A8 = 0; -u16 D_80177828; // enemy shot speed? -u8 D_80177830; // show level complete status overlay -s32 D_80177838; // level clear related -s32 D_80177840; // timer for mission accomplished scrren +u16 D_ctx_80177828; // enemy shot speed? +u8 D_ctx_80177830; // show level complete status overlay +s32 D_ctx_80177838; // level clear related +s32 D_ctx_80177840; // timer for mission accomplished scrren s32 gBossHealthBar; -s32 D_80177850; // bonus text related. set to 15 but never read -s32 D_80177858[4]; -s32 D_80177870[4]; +s32 D_ctx_80177850; // bonus text related. set to 15 but never read +s32 D_ctx_80177858[4]; +s32 D_ctx_80177870[4]; s32 gHandicap[4]; VsStage gVersusStage; -s32 D_801778A4; -s32 D_801778AC; -s32 D_801778C8; +s32 D_ctx_801778A4; +s32 D_ctx_801778AC; +s32 D_ctx_801778C8; bool gVersusMode; u16 gBoostButton[4]; u16 gBrakeButton[4]; u16 gShootButton[4]; u16 gBombButton[4]; -f32 D_80177958[4]; -s32 D_8017796C; +f32 D_ctx_80177958[4]; +s32 D_ctx_8017796C; OSContPad* gInputHold; OSContPad* gInputPress; -u8* D_80177984; -s32 D_80177990[4]; -f32 D_801779A8[4]; -u8 D_801779BC; +u8* D_ctx_80177984; +s32 D_ctx_80177990[4]; +f32 D_ctx_801779A8[4]; +u8 D_ctx_801779BC; s32 gChargeTimers[4]; -f32 D_801779E4; -f32 D_801779F4; +f32 D_ctx_801779E4; +f32 D_ctx_801779F4; s32 D_Timer_80177A00[4]; s32 D_Timer_80177A38[4]; s32 D_Timer_80177A70[4]; s32 D_Timer_80177A88[4]; -f32 D_80177AA0[4]; -f32 D_80177AB8[4]; -s32 D_80177AD0[4]; -s32 D_80177AE8[4]; -s32 D_80177B00[4][4]; +f32 D_ctx_80177AA0[4]; +f32 D_ctx_80177AB8[4]; +s32 D_ctx_80177AD0[4]; +s32 D_ctx_80177AE8[4]; +s32 D_ctx_80177B00[4][4]; u8 D_Timer_80177B44; -u8 D_80177B4C; -u8 D_80177B6C; +u8 D_ctx_80177B4C; +u8 D_ctx_80177B6C; u8 gGreatFoxIntact; -u8 D_80177BAC; +u8 D_ctx_80177BAC; u16 D_Timer_80177BD0[4]; -u16 D_80177C30[4]; -s32 D_80177C50; -s32 D_80177C70; -s32 D_80177C78; -s32 D_80177C8C; -s32 D_80177C94; -s32 D_80177C9C; -s32 D_80177CA4; -s32 D_80177CAC; -s32 D_80177CB4; -s32 D_80177CBC; -s32 D_80177CC4; -s32 D_80177CD0[6]; -s32 D_80177CF0[6]; +u16 D_ctx_80177C30[4]; +s32 D_ctx_80177C50; +s32 D_ctx_80177C70; +s32 D_ctx_80177C78; +s32 D_ctx_80177C8C; +s32 D_ctx_80177C94; +s32 D_ctx_80177C9C; +s32 D_ctx_80177CA4; +s32 D_ctx_80177CAC; +s32 D_ctx_80177CB4; +s32 D_ctx_80177CBC; +s32 D_ctx_80177CC4; +s32 D_ctx_80177CD0[6]; +s32 D_ctx_80177CF0[6]; s32 gRightWingHealth[4]; s32 gLeftWingHealth[4]; -s32 D_80177D40[4]; -s32 D_80177D58[4]; -s32 D_80177D70[4]; -s32 D_80177D88[4]; +s32 D_ctx_80177D40[4]; +s32 D_ctx_80177D58[4]; +s32 D_ctx_80177D70[4]; +s32 D_ctx_80177D88[4]; s32 gBombCount[4]; -s32 D_80177DB8[4]; -s32 D_80177DD0[4][10]; -s32 D_80177E74; -s32 D_80177E7C; -s32 D_80177E84; -Vec3f D_80177E98[10]; -f32 D_80177F20[65]; -f32 D_80178028[65]; -f32 D_80178130[65]; -u8 D_80178238[65]; +s32 D_ctx_80177DB8[4]; +s32 D_ctx_80177DD0[4][10]; +s32 D_ctx_80177E74; +s32 D_ctx_80177E7C; +s32 D_ctx_80177E84; +Vec3f D_ctx_80177E98[10]; +f32 D_ctx_80177F20[65]; +f32 D_ctx_80178028[65]; +f32 D_ctx_80178130[65]; +u8 D_ctx_80178238[65]; Player* gPlayer; -f32* D_80178288; -f32* D_80178290; -u32* D_80178298; +f32* D_ctx_80178288; +f32* D_ctx_80178290; +u32* D_ctx_80178298; UNK_TYPE F_801782A0; Object_58* gObjects58; UNK_TYPE F_801782B0; -s32 D_801782B8; -s32 D_801782BC; -PosRot* D_801782C4; -f32* D_801782CC; -f32* D_801782D4; -f32* D_801782DC; -f32* D_801782E4; -f32* D_801782EC; +s32 D_ctx_801782B8; +s32 D_ctx_801782BC; +PosRot* D_ctx_801782C4; +f32* D_ctx_801782CC; +f32* D_ctx_801782D4; +f32* D_ctx_801782DC; +f32* D_ctx_801782E4; +f32* D_ctx_801782EC; UNK_TYPE F_801782F4; -s32 D_801782FC; +s32 D_ctx_801782FC; UNK_TYPE F_80178304; UNK_TYPE F_8017830C; UNK_TYPE F_80178314; diff --git a/src/main/fox_demo.c b/src/main/fox_demo.c index 3c72408d..6a7577a9 100644 --- a/src/main/fox_demo.c +++ b/src/main/fox_demo.c @@ -17,110 +17,100 @@ #include "assets/ast_sector_z.h" #include "assets/ast_title.h" #include "assets/ast_katina.h" - -extern s32 D_800C9E90[]; - -extern f32 D_80178454; -extern f32 D_80178458; -extern f32 D_80178464; -extern f32 D_80178468; -extern f32 D_80178474; -extern f32 D_80178478; - #include "assets/ast_allies.h" -Vec3f D_800C9F60[] = { +static Vec3f D_demo_800C9F60[] = { { 2000.0f, 2000.0f, 2000.0f }, { -2000.0f, 2000.0f, 2000.0f }, { 0.0f, -3000.0f, 3000.0f }, { 5000.0f, -3000.0f, -3000.0f }, }; -f32 D_800C9F90[] = { 75.0f, -80.0f, 85.0f, 0.0f }; +static f32 D_demo_800C9F90[] = { 75.0f, -80.0f, 85.0f, 0.0f }; -Vec3f D_800C9FA0[] = { +static Vec3f D_demo_800C9FA0[] = { { 200.0f, -10.0f, 200.0f }, { -200.0f, 20.0f, 200.0f }, { 0.0f, 50.0f, 400.0f }, { -2000.0f, -1000.0f, 0.0f }, }; -f32 D_800C9FD0[] = { -1200.0f, 1200.0f, 0.0f, 0.0f }; +static f32 D_demo_800C9FD0[] = { -1200.0f, 1200.0f, 0.0f, 0.0f }; -f32 D_800C9FE0[] = { 0.0f, 0.0f, 600.0f, 2000.0f }; +static f32 D_demo_800C9FE0[] = { 0.0f, 0.0f, 600.0f, 2000.0f }; -f32 D_800C9FF0[] = { -100.0f, 0.0f, 100.0f, 500.0f }; +static f32 D_demo_800C9FF0[] = { -100.0f, 0.0f, 100.0f, 500.0f }; -f32 D_800CA000[] = { -150.0f, 150.0f, 0.0f, 0.0f }; +static f32 D_demo_800CA000[] = { -150.0f, 150.0f, 0.0f, 0.0f }; -f32 D_800CA010[] = { 0.0f, 0.0f, 80.0f, 1000.0f }; +static f32 D_demo_800CA010[] = { 0.0f, 0.0f, 80.0f, 1000.0f }; -f32 D_800CA020[] = { 45.0f, -45.0f, 10.0f, 0.0f }; +static f32 D_demo_800CA020[] = { 45.0f, -45.0f, 10.0f, 0.0f }; -s32 D_800CA030[] = { 0, 0, 0, 1 }; +static s32 D_demo_800CA030[] = { 0, 0, 0, 1 }; -s32 D_800CA040[] = { 0, 0, 0, 0 }; +static s32 D_demo_800CA040[] = { 0, 0, 0, 0 }; -f32 D_800CA050[] = { 210.0f, -210.0f, 0.0f }; +static f32 D_demo_800CA050[] = { 210.0f, -210.0f, 0.0f }; -f32 D_800CA05C[] = { -60.0f, -60.0f, -120.0f }; +static f32 D_demo_800CA05C[] = { -60.0f, -60.0f, -120.0f }; -f32 D_800CA068[] = { -150.0f, -150.0f, -300.0f }; +static f32 D_demo_800CA068[] = { -150.0f, -150.0f, -300.0f }; -f32 D_800CA074[] = { 360.0f, -360.0f, 0.0f }; +static f32 D_demo_800CA074[] = { 360.0f, -360.0f, 0.0f }; -f32 D_800CA080[] = { -400.0f, 0.0f, 400.0f }; +static f32 D_demo_800CA080[] = { -400.0f, 0.0f, 400.0f }; -f32 D_800CA08C[] = { 0.0f, 200.0f, 0.0f }; +static f32 D_demo_800CA08C[] = { 0.0f, 200.0f, 0.0f }; -f32 D_800CA098[] = { 1.0f, -0.9f, 0.7f }; +static f32 D_demo_800CA098[] = { 1.0f, -0.9f, 0.7f }; -f32 D_800CA0A4[] = { 150.0f, 100.0f, 200.0f }; +static f32 D_demo_800CA0A4[] = { 150.0f, 100.0f, 200.0f }; -f32 D_800CA0B0[] = { 200.0f, 300.0f, 500.0f }; +static f32 D_demo_800CA0B0[] = { 200.0f, 300.0f, 500.0f }; -Vec3f D_800CA0BC[] = { +static Vec3f D_demo_800CA0BC[] = { { -1373.0, 484.0, -374.0 }, { 1373.0, 484.0, -374.0 }, { -1373.0, -704.0, -374.0 }, { 1373.0, -704.0, -374.0 }, }; -Vec3f D_800CA0EC[] = { +static Vec3f D_demo_800CA0EC[] = { { 0.0, 40.0, -2278.0 }, { 295.0, -92.0, -1301.0 }, { -295.0, -92.0, -1301.0 }, }; -Vec3f D_800CA110[8] = { +static Vec3f D_demo_800CA110[8] = { { 170.0f, -35.0f, -380.0f }, { -170.0f, -40.0f, -380.0f }, { 170.0f, -130.0f, -380.0f }, { -170.0f, -140.0f, -380.0f }, { 140.0f, 40.0f, -250.0f }, { -150.0f, 40.0f, -250.0f }, { 140.0f, 0.0f, -250.0f }, { -150.0f, 0.0f, -250.0f }, }; -f32 D_800CA170[] = { +static f32 D_demo_800CA170[] = { 0.15f, 0.45f, 0.75f, 1.3f, 0.75f, 0.45f, 0.15f, 0.0f, }; -f32 D_800CA190[] = { 5.0f, 5.2f }; +static f32 D_demo_800CA190[] = { 5.0f, 5.2f }; -f32 D_800CA198[] = { +static f32 D_demo_800CA198[] = { 0.5f, 1.5f, 2.5f, 1.5f, 0.5f, 0.2f, 0.2f, }; -f32 D_800CA1B4[] = { +static f32 D_demo_800CA1B4[] = { -30.0f, -60.0f, -90.0f, -120.0f, -150.0f, -180.0f, -200.0, -210.0, }; -f32 D_800CA1D4[] = { +static f32 D_demo_800CA1D4[] = { 1.5f, 0.87f, 0.83f, 0.75f, 0.7f, 0.6f, 0.4f, 0.1f, }; -Animation* D_800CA1F4[] = { +static Animation* D_demo_800CA1F4[] = { &D_SY_60265B4, &D_SY_602B8DC, &D_SY_60034C4, &D_SY_602A2CC, &D_SY_602CEB4, &D_SY_602B778, &D_SY_601F3B8, }; -void func_80048AC0(s32 teamId) { +void func_demo_80048AC0(s32 teamId) { s32 teamShield; if (teamId == 1) { @@ -172,15 +162,15 @@ void func_80048AC0(s32 teamId) { } } -void func_80048CC4(Actor* actor, s32 arg1) { +void func_demo_80048CC4(Actor* actor, s32 arg1) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; actor->obj.id = OBJ_ACTOR_195; - actor->obj.pos.x = D_800C9F60[arg1].x + gPlayer[0].pos.x; - actor->obj.pos.y = D_800C9F60[arg1].y + gPlayer[0].pos.y; - actor->obj.pos.z = D_800C9F60[arg1].z + gPlayer[0].unk_138; + actor->obj.pos.x = D_demo_800C9F60[arg1].x + gPlayer[0].pos.x; + actor->obj.pos.y = D_demo_800C9F60[arg1].y + gPlayer[0].pos.y; + actor->obj.pos.z = D_demo_800C9F60[arg1].z + gPlayer[0].unk_138; actor->unk_0F4.y = 0.0f; - actor->unk_0F4.z = D_800C9F90[arg1]; + actor->unk_0F4.z = D_demo_800C9F90[arg1]; Object_SetInfo(&actor->info, actor->obj.id); if (arg1 == 3) { @@ -193,7 +183,7 @@ void func_80048CC4(Actor* actor, s32 arg1) { } } -void func_80048E40(Player* player) { +void func_demo_80048E40(Player* player) { Vec3f sp5C; Vec3f sp50; s32 pad[2]; @@ -217,50 +207,50 @@ void func_80048E40(Player* player) { player->unk_4DC = 0; Audio_StopSfxByBankAndSource(1, player->sfxSource); player->unk_1D0++; - D_80177A48[0] = 0.0f; - D_80177A48[1] = 0.0f; - D_80177A48[2] = 0.0f; + D_ctx_80177A48[0] = 0.0f; + D_ctx_80177A48[1] = 0.0f; + D_ctx_80177A48[2] = 0.0f; player->wings.unk_2C = 1; gCsFrameCount = 0; /* fallthrough */ case 1: - D_80177A48[1] -= D_80177A48[2]; - Math_SmoothStepToF(&D_80177A48[2], 1.2f, 0.1f, 0.01f, 0.0f); - Math_SmoothStepToF(&D_80177A48[0], 0.1f, 0.1f, 0.002f, 0.0f); + D_ctx_80177A48[1] -= D_ctx_80177A48[2]; + Math_SmoothStepToF(&D_ctx_80177A48[2], 1.2f, 0.1f, 0.01f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[0], 0.1f, 0.1f, 0.002f, 0.0f); Math_SmoothStepToF(&player->unk_0D0, 0.0f, 1.0f, 0.5f, 0.0f); Matrix_RotateX(gCalcMatrix, -5.0f * M_DTOR, 0); - Matrix_RotateY(gCalcMatrix, D_80177A48[1] * M_DTOR, 1); + Matrix_RotateY(gCalcMatrix, D_ctx_80177A48[1] * M_DTOR, 1); sp5C.x = 0.0f; sp5C.y = 0.0f; sp5C.z = 300.0f; Matrix_MultVec3f(gCalcMatrix, &sp5C, &sp50); gCsCamAtX = player->pos.x; gCsCamAtY = player->pos.y; - gCsCamAtZ = player->unk_138 + D_80177D20; + gCsCamAtZ = player->unk_138 + D_ctx_80177D20; switch (gCsFrameCount) { case 101: if (gTeamShields[1] > 0) { - func_80048CC4(&gActors[0], 0); + func_demo_80048CC4(&gActors[0], 0); } if (gTeamShields[2] > 0) { - func_80048CC4(&gActors[1], 1); + func_demo_80048CC4(&gActors[1], 1); } if (gTeamShields[3] > 0) { - func_80048CC4(&gActors[2], 2); + func_demo_80048CC4(&gActors[2], 2); } break; case 100: - D_80177840 = 0x64; + D_ctx_80177840 = 0x64; break; case 200: - D_80177830 = 1; + D_ctx_80177830 = 1; break; case 400: - D_80177830 = 0; + D_ctx_80177830 = 0; break; case 420: @@ -284,7 +274,7 @@ void func_80048E40(Player* player) { break; } if (gCsFrameCount >= 0x1C3) { - Math_SmoothStepToF(&D_80177A48[0], 1.0f, 0.1f, 0.004f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[0], 1.0f, 0.1f, 0.004f, 0.0f); player->unk_0D0 += 2.0f; player->unk_0E4 += 0.1f; player->unk_190 = 2.0f; @@ -294,36 +284,36 @@ void func_80048E40(Player* player) { } if (gCsFrameCount > 540) { - D_80178358 = 255; - D_80178348 = (D_80178350 = (D_80178354 = 0)); - D_8017835C = 8; - if (D_80178340 == 255) { + D_ctx_80178358 = 255; + D_ctx_80178348 = (D_ctx_80178350 = (D_ctx_80178354 = 0)); + D_ctx_8017835C = 8; + if (D_ctx_80178340 == 255) { player->state_1C8 = PLAYERSTATE_1C8_6; player->timer_1F8 = 0; - D_8017837C = 4; + D_ctx_8017837C = 4; if (gCurrentLevel == LEVEL_METEO) { - D_800D3180[LEVEL_METEO] = Play_CheckMedalStatus(200) + 1; + D_play_800D3180[LEVEL_METEO] = Play_CheckMedalStatus(200) + 1; } else { - D_800D3180[LEVEL_SECTOR_X] = Play_CheckMedalStatus(150) + 1; + D_play_800D3180[LEVEL_SECTOR_X] = Play_CheckMedalStatus(150) + 1; } - D_80177930 = 2; + D_ctx_80177930 = 2; } } } else { gCsCamEyeX = player->pos.x + sp50.x; gCsCamEyeY = player->pos.y + sp50.y; - gCsCamEyeZ = player->unk_138 + D_80177D20 + sp50.z; + gCsCamEyeZ = player->unk_138 + D_ctx_80177D20 + sp50.z; } break; } - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_ctx_80177A48[0], 50000.0f, 0); Matrix_RotateY(gCalcMatrix, (player->unk_0E8 + 180.0f) * M_DTOR, 0); Matrix_RotateX(gCalcMatrix, -((player->unk_0E4 + player->unk_4D8) * M_DTOR), 1); @@ -348,15 +338,15 @@ void func_80048E40(Player* player) { player->unk_0F0 = SIN_DEG(player->unk_0F4); } -void func_80049630(Actor* actor) { +void func_demo_80049630(Actor* actor) { Vec3f sp3C; Vec3f sp30; switch (actor->state) { case 0: - actor->vwork[0].x = gPlayer[0].pos.x + D_800C9FA0[actor->index].x; - actor->vwork[0].y = gPlayer[0].pos.y + D_800C9FA0[actor->index].y; - actor->vwork[0].z = gPlayer[0].pos.z + D_800C9FA0[actor->index].z; + actor->vwork[0].x = gPlayer[0].pos.x + D_demo_800C9FA0[actor->index].x; + actor->vwork[0].y = gPlayer[0].pos.y + D_demo_800C9FA0[actor->index].y; + actor->vwork[0].z = gPlayer[0].pos.z + D_demo_800C9FA0[actor->index].z; Math_SmoothStepToF(&actor->obj.pos.x, actor->vwork[0].x, 0.05f, 50.0f, 0.0001f); Math_SmoothStepToF(&actor->obj.pos.y, actor->vwork[0].y, 0.05f, 50.0f, 0.0001f); Math_SmoothStepToF(&actor->obj.pos.z, actor->vwork[0].z, 0.05f, 50.0f, 0.0001f); @@ -397,26 +387,26 @@ void func_80049630(Actor* actor) { actor->obj.rot.z = -actor->unk_0F4.z; } -void func_8004990C(Player* player) { - if (D_801784AC == 0) { - D_80177CE8 += 60.0f; +void func_demo_8004990C(Player* player) { + if (D_ctx_801784AC == 0) { + D_ctx_80177CE8 += 60.0f; } player->unk_138 = player->pos.z + player->unk_08C; player->unk_0F8 = player->unk_0EC + player->unk_12C + player->unk_130; } -void func_80049968(Actor* actor, s32 arg1) { +void func_demo_80049968(Actor* actor, s32 arg1) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; actor->obj.id = OBJ_ACTOR_195; - actor->obj.pos.x = D_800C9FD0[arg1]; - actor->obj.pos.y = D_800C9FE0[arg1]; - actor->obj.pos.z = D_800C9FF0[arg1] + ((void) 0, gPlayer)[0].unk_138; - actor->fwork[0] = D_800CA000[arg1]; - actor->fwork[1] = D_800CA010[arg1]; - actor->unk_0B6 = D_800CA030[arg1]; - actor->state = D_800CA040[arg1]; - actor->obj.rot.z = D_800CA020[arg1]; + actor->obj.pos.x = D_demo_800C9FD0[arg1]; + actor->obj.pos.y = D_demo_800C9FE0[arg1]; + actor->obj.pos.z = D_demo_800C9FF0[arg1] + ((void) 0, gPlayer)[0].unk_138; + actor->fwork[0] = D_demo_800CA000[arg1]; + actor->fwork[1] = D_demo_800CA010[arg1]; + actor->unk_0B6 = D_demo_800CA030[arg1]; + actor->state = D_demo_800CA040[arg1]; + actor->obj.rot.z = D_demo_800CA020[arg1]; actor->obj.rot.y = 180.0f; actor->vel.z = gPlayer[0].vel.z; Object_SetInfo(&actor->info, actor->obj.id); @@ -424,7 +414,7 @@ void func_80049968(Actor* actor, s32 arg1) { AUDIO_PLAY_SFX(0x3100000CU, actor->sfxSource, 4U); } -void func_80049A9C(Effect* effect, f32 x, f32 y, f32 z) { +void func_demo_80049A9C(Effect* effect, f32 x, f32 y, f32 z) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_346; @@ -438,7 +428,7 @@ void func_80049A9C(Effect* effect, f32 x, f32 y, f32 z) { Object_SetInfo(&effect->info, effect->obj.id); } -void func_80049B44(void) { +void func_demo_80049B44(void) { s32 i; f32 x; f32 y; @@ -448,14 +438,14 @@ void func_80049B44(void) { if (gEffects[i].obj.status == OBJ_FREE) { x = RAND_FLOAT_CENTERED(400.0f); y = RAND_FLOAT_CENTERED(400.0f); - z = -D_80177D20 - 500.0f - RAND_FLOAT(500.0f); - func_80049A9C(&gEffects[i], x, y, z); + z = -D_ctx_80177D20 - 500.0f - RAND_FLOAT(500.0f); + func_demo_80049A9C(&gEffects[i], x, y, z); break; } } } -void func_80049C0C(Player* player) { +void func_demo_80049C0C(Player* player) { s32 var_v0; s32 pad[4]; @@ -465,11 +455,11 @@ void func_80049C0C(Player* player) { player->pos.y += player->vel.y; player->pos.z += player->vel.z; - func_8004990C(player); + func_demo_8004990C(player); player->unk_140 = -player->vel.z; player->unk_144 += -player->vel.z; - D_80177D20 = player->unk_144; + D_ctx_80177D20 = player->unk_144; Math_SmoothStepToF(&player->unk_130, 0.0f, 0.1f, 15.0f, 0.0f); Math_SmoothStepToF(&player->unk_12C, 0.0f, 0.1f, 15.0f, 0.0f); @@ -487,33 +477,33 @@ void func_80049C0C(Player* player) { switch (player->unk_1D0) { case 0: player->unk_4DC = 0; - D_80178414 = 100.0f; + D_ctx_80178414 = 100.0f; player->unk_1D0 = 1; - D_80178410 = 1; - D_80178488 = 0; + D_ctx_80178410 = 1; + D_ctx_80178488 = 0; player->vel.x = 0.0f; player->vel.y = 0.0f; player->vel.z = -500.0f; player->unk_0CC = -500.0f; if (gTeamShields[1] > 0) { - func_80049968(&gActors[0], 0); + func_demo_80049968(&gActors[0], 0); } if (gTeamShields[2] > 0) { - func_80049968(&gActors[1], 1); + func_demo_80049968(&gActors[1], 1); } if (gTeamShields[3] > 0) { - func_80049968(&gActors[2], 2); + func_demo_80049968(&gActors[2], 2); } - func_80049968(&gActors[3], 3); + func_demo_80049968(&gActors[3], 3); player->timer_1F8 = 0x32; break; case 1: - Math_SmoothStepToF(&D_801779A8[player->num], 100.0f, 1.0f, 4.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_801779A8[player->num], 100.0f, 1.0f, 4.0f, 0.0f); Math_SmoothStepToF(&player->unk_034, 0.0f, 0.1f, 3.0f, 0.0f); - D_80178414 *= 1.05f; + D_ctx_80178414 *= 1.05f; if (player->timer_1F8 == 0) { player->unk_1D0 = 2; player->timer_1F8 = 0x96; @@ -524,14 +514,14 @@ void func_80049C0C(Player* player) { break; case 2: - Math_SmoothStepToF(&D_801779A8[player->num], 100.0f, 1.0f, 3.0f, 0.0f); - if (D_80178414 < 20000.0f) { - D_80178414 *= 1.01f; + Math_SmoothStepToF(&D_ctx_801779A8[player->num], 100.0f, 1.0f, 3.0f, 0.0f); + if (D_ctx_80178414 < 20000.0f) { + D_ctx_80178414 *= 1.01f; } if (player->timer_1F8 <= 100) { if (player->timer_1F8 == 100) { - func_800A6028(player->sfxSource, 0x0940802AU); + func_play_800A6028(player->sfxSource, 0x0940802AU); player->unk_194 = 5.0f; player->unk_190 = 5.0f; } @@ -577,39 +567,39 @@ void func_80049C0C(Player* player) { break; case 4: - Math_SmoothStepToF(&D_801779A8[player->num], 100.0f, 1.0f, 3.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_801779A8[player->num], 100.0f, 1.0f, 3.0f, 0.0f); player->unk_034 -= 0.5f; if (player->timer_1F8 == 0) { - D_80178348 = D_80178350 = D_80178354 = 255; - D_80178358 = 255; - D_8017835C = 8; - if (D_80178340 == 255) { - func_800A6148(); + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; + D_ctx_80178358 = 255; + D_ctx_8017835C = 8; + if (D_ctx_80178340 == 255) { + func_play_800A6148(); player->unk_1D0 = 5; player->timer_1F8 = 0xA; player->unk_08C = -10000.0f; player->unk_0AC = player->unk_0B8 = player->unk_0B0 = player->unk_0BC = player->pos.x = player->pos.y = player->pos.z = player->unk_130 = player->unk_034 = player->unk_138 = - player->vel.z = player->unk_144 = D_80177D20 = player->unk_144 = D_80177CB0 = D_80177D20 = - 0.0f; + player->vel.z = player->unk_144 = D_ctx_80177D20 = player->unk_144 = D_ctx_80177CB0 = + D_ctx_80177D20 = 0.0f; - player->timer_27C = gSavedHitCount = D_80177DC8 = D_80177CA0 = 0; + player->timer_27C = gSavedHitCount = D_ctx_80177DC8 = D_ctx_80177CA0 = 0; player->unk_234 = 1; - D_8017827C = 1; - D_800CA230 = 0.15f; + D_ctx_8017827C = 1; + D_display_800CA230 = 0.15f; AUDIO_PLAY_SFX(0x11407079U, gDefaultSfxSource, 0); - func_800AB334(); + func_play_800AB334(); } } break; case 5: - Math_SmoothStepToF(&D_801779A8[player->num], 100.0f, 1.0f, 3.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_801779A8[player->num], 100.0f, 1.0f, 3.0f, 0.0f); if (player->timer_1F8 == 0) { - D_80178358 = 0; - D_8017835C = 8; - if (D_80178340 == 0) { + D_ctx_80178358 = 0; + D_ctx_8017835C = 8; + if (D_ctx_80178340 == 0) { player->unk_1D0 = 6; player->timer_1F8 = 50; } @@ -617,27 +607,27 @@ void func_80049C0C(Player* player) { break; case 6: - Math_SmoothStepToF(&D_80178414, 0.0f, 0.2f, 1000.0f, 0.1f); + Math_SmoothStepToF(&D_ctx_80178414, 0.0f, 0.2f, 1000.0f, 0.1f); Math_SmoothStepToF(&player->unk_08C, 0.0f, 0.2f, 500.0f, 0.1f); if (player->timer_1F8 < 0x1E) { for (var_v0 = 0; var_v0 < 3; var_v0++) { - func_80049B44(); + func_demo_80049B44(); } } if (player->timer_1F8 == 30) { - D_80178410 = 300; + D_ctx_80178410 = 300; AUDIO_PLAY_BGM(SEQ_ID_58 | 0x8000); } if (player->timer_1F8 == 0) { - D_8015F960 = 0.0f; - D_80178414 = 0.0f; + D_bg_8015F960 = 0.0f; + D_ctx_80178414 = 0.0f; player->state_1C8 = 3; player->unk_014 = 0.0f; player->unk_018 = 0.0f; - D_801782B8 = 0; - D_80178488 = 1; + D_ctx_801782B8 = 0; + D_ctx_80178488 = 1; } Math_SmoothStepToF(&player->camEye.y, (player->pos.y * player->unk_148) + 50.0f, 0.2f, 15.0f, 0.01f); Math_SmoothStepToF(&player->camAt.y, (player->pos.y * player->unk_14C) + 20.0f, 0.2f, 15.0f, 0.01f); @@ -648,113 +638,113 @@ void func_80049C0C(Player* player) { } } -void func_8004A52C(Player* player) { +void func_demo_8004A52C(Player* player) { gCsFrameCount += 1; if (gLevelMode == LEVELMODE_ON_RAILS) { switch (gCurrentLevel) { case LEVEL_CORNERIA: - func_i1_8018F880(player); - func_800AA800(player); + Corneria_8018F880(player); + func_play_800AA800(player); break; case LEVEL_METEO: - func_i2_8018CD8C(player); + Meteo_8018CD8C(player); break; case LEVEL_SECTOR_X: - func_i2_80193A30(player); + SectorX_80193A30(player); break; case LEVEL_TITANIA: - func_i5_8018769C(player); - func_800AA800(player); + Titania_8018769C(player); + func_play_800AA800(player); break; case LEVEL_ZONESS: - func_i3_8019D428(player); + Zoness_8019D428(player); break; case LEVEL_MACBETH: - func_i5_801AC754(player); + Macbeth_801AC754(player); break; case LEVEL_SECTOR_Y: - func_i6_801A0AC0(player); + SectorY_801A0AC0(player); break; case LEVEL_SOLAR: - func_i3_801A10F4(player); + Solar_801A10F4(player); break; case LEVEL_VENOM_1: - func_i1_801988B8(player); - func_800AA800(player); + Venom1_801988B8(player); + func_play_800AA800(player); break; case LEVEL_AQUAS: - func_800935E8(player); + func_hud_800935E8(player); break; case LEVEL_AREA_6: - func_i3_8018DF74(player); + Area6_8018DF74(player); break; } - func_8004990C(player); + func_demo_8004990C(player); return; } switch (gCurrentLevel) { case LEVEL_FORTUNA: - func_8002ED60(player); - func_800AA800(player); + func_360_8002ED60(player); + func_play_800AA800(player); break; case LEVEL_VENOM_2: - func_i6_80196BF8(player); - func_800AA800(player); + Venom2_80196BF8(player); + func_play_800AA800(player); break; case LEVEL_BOLSE: - func_i4_8018EF6C(player); - func_800AA800(player); + Bolse_8018EF6C(player); + func_play_800AA800(player); break; case LEVEL_KATINA: - func_i4_80192E20(player); - func_800AA800(player); + Katina_80192E20(player); + func_play_800AA800(player); break; case LEVEL_SECTOR_Z: - func_i4_8019BA64(player); + SectorZ_8019BA64(player); default: break; } } -void func_8004A700(Actor* actor, s32 arg1) { +void func_demo_8004A700(Actor* actor, s32 arg1) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; actor->obj.id = OBJ_ACTOR_195; actor->obj.pos.x = gPlayer[0].pos.x; actor->obj.pos.y = gPlayer[0].pos.y - 1000.0f; actor->obj.pos.z = gPlayer[0].pos.z; - actor->fwork[0] = D_800CA050[arg1]; - actor->fwork[1] = D_800CA05C[arg1]; - actor->fwork[2] = D_800CA068[arg1]; + actor->fwork[0] = D_demo_800CA050[arg1]; + actor->fwork[1] = D_demo_800CA05C[arg1]; + actor->fwork[2] = D_demo_800CA068[arg1]; actor->fwork[3] = 4.0f; actor->fwork[7] = RAND_FLOAT(100.0f); actor->fwork[8] = RAND_FLOAT(100.0f); - actor->obj.rot.z = D_800CA074[arg1]; + actor->obj.rot.z = D_demo_800CA074[arg1]; actor->iwork[11] = 1; Object_SetInfo(&actor->info, actor->obj.id); AUDIO_PLAY_SFX(0x3100000CU, actor->sfxSource, 4U); } -void func_8004A840(s32 actor) { - func_8004A700(&gActors[actor], actor); +void func_demo_8004A840(s32 actor) { + func_demo_8004A700(&gActors[actor], actor); } -void func_8004A888(Effect* effect) { +void func_demo_8004A888(Effect* effect) { Vec3f sp2C; Vec3f sp20; @@ -792,20 +782,20 @@ void func_8004A888(Effect* effect) { Object_SetInfo(&effect->info, effect->obj.id); } -void func_8004AA84(void) { +void func_demo_8004AA84(void) { s32 i; if (!(gGameFrameCount & 7) && (gLevelType == LEVELTYPE_PLANET)) { for (i = 0; i < ARRAY_COUNT(gEffects); i++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8004A888(&gEffects[i]); + func_demo_8004A888(&gEffects[i]); break; } } } } -void func_8004AAF4(Player* player) { +void func_demo_8004AAF4(Player* player) { s32 pad; Vec3f sp70; Vec3f sp64; @@ -820,16 +810,16 @@ void func_8004AAF4(Player* player) { gCsFrameCount += 1; Math_SmoothStepToAngle(&player->unk_4D8, 0.0f, 0.1f, 20.0f, 0.0f); if (gCsFrameCount == 37) { - D_80177E84 = 1; + D_ctx_80177E84 = 1; if (gCurrentLevel == LEVEL_VENOM_ANDROSS) { Radio_PlayMessage(gMsg_ID_19466, RCID_FOX); AUDIO_PLAY_BGM(SEQ_ID_61 | 0x8000); } else if (gCurrentLevel != LEVEL_TRAINING) { Radio_PlayMessage(gMsg_ID_20180, RCID_FOX); if (gCurrentLevel == LEVEL_SECTOR_Y) { - Audio_PlaySequence(SEQ_PLAYER_BGM, D_800C9E90[gCurrentLevel], 0, 2); + Audio_PlaySequence(SEQ_PLAYER_BGM, D_boss_800C9E90[gCurrentLevel], 0, 2); } else { - AUDIO_PLAY_BGM(D_800C9E90[gCurrentLevel]); + AUDIO_PLAY_BGM(D_boss_800C9E90[gCurrentLevel]); } } } @@ -849,29 +839,29 @@ void func_8004AAF4(Player* player) { switch (player->unk_1D0) { case 0: Audio_PlayVoice(0); - D_80177A48[0] = 0.005f; - D_80177A48[1] = 0.0f; - D_80177A48[2] = 60.0f; - D_80177A48[3] = 0.0f; + D_ctx_80177A48[0] = 0.005f; + D_ctx_80177A48[1] = 0.0f; + D_ctx_80177A48[2] = 60.0f; + D_ctx_80177A48[3] = 0.0f; player->wings.unk_2C = 1; player->unk_1D0++; gCsFrameCount = 0; /* fallthrough */ case 1: if (player->pos.y < 350.0f) { - Math_SmoothStepToF(&player->pos.y, 350.0f, 0.1f, D_80177A48[3], 0.0f); + Math_SmoothStepToF(&player->pos.y, 350.0f, 0.1f, D_ctx_80177A48[3], 0.0f); } - Math_SmoothStepToF(&D_80177A48[3], 10.0f, 1.0f, 1.0f, 0.0f); - Math_SmoothStepToF(&D_80177A48[1], 360.0f, 0.05f, 1.5f, 0.0f); - Math_SmoothStepToF(&D_80177A48[2], -70.0f, 0.1f, 0.7f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[3], 10.0f, 1.0f, 1.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[1], 360.0f, 0.05f, 1.5f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[2], -70.0f, 0.1f, 0.7f, 0.0f); - if (D_80177A48[1] > 220.0f) { + if (D_ctx_80177A48[1] > 220.0f) { player->unk_204 = 2; } if ((gCsFrameCount >= 0x88) && (gCsFrameCount < 0xB4)) { - Math_SmoothStepToF(&D_801779A8[player->num], 30.0f, 1.0f, 10.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_801779A8[player->num], 30.0f, 1.0f, 10.0f, 0.0f); } if (gCsFrameCount == 0x8A) { @@ -882,7 +872,7 @@ void func_8004AAF4(Player* player) { AUDIO_PLAY_SFX(0x09000013U, player->sfxSource, 0); } - if (D_80177A48[1] > 350.0f) { + if (D_ctx_80177A48[1] > 350.0f) { player->state_1C8 = PLAYERSTATE_1C8_3; player->unk_014 = 0.0f; player->unk_018 = 0.1f; @@ -891,16 +881,16 @@ void func_8004AAF4(Player* player) { AUDIO_PLAY_SFX(0x09000002U, player->sfxSource, 0); - D_801779A8[player->num] = 70.0f; + D_ctx_801779A8[player->num] = 70.0f; if ((gCurrentLevel != LEVEL_VENOM_ANDROSS) && (gCurrentLevel != LEVEL_TRAINING)) { - D_800D1970 = 0; + D_hud_800D1970 = 0; for (i = 0, actor = &gActors[2]; i < 3; i++, actor++) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; actor->obj.id = OBJ_ACTOR_198; - actor->obj.pos.x = D_800CA080[i] + player->pos.x; - actor->obj.pos.y = D_800CA08C[i] + player->pos.y; + actor->obj.pos.x = D_demo_800CA080[i] + player->pos.x; + actor->obj.pos.y = D_demo_800CA08C[i] + player->pos.y; actor->obj.pos.z = player->unk_138 - 1000.0f; actor->unk_0F4.y = 180.0f; Object_SetInfo(&actor->info, actor->obj.id); @@ -908,8 +898,8 @@ void func_8004AAF4(Player* player) { } } - Matrix_RotateY(gCalcMatrix, D_80177A48[1] * M_DTOR, 0); - Matrix_RotateX(gCalcMatrix, D_80177A48[2] * M_DTOR, 1); + Matrix_RotateY(gCalcMatrix, D_ctx_80177A48[1] * M_DTOR, 0); + Matrix_RotateX(gCalcMatrix, D_ctx_80177A48[2] * M_DTOR, 1); sp70.x = 0.0f; sp70.y = 0.0f; @@ -920,13 +910,14 @@ void func_8004AAF4(Player* player) { if ((gCurrentLevel == LEVEL_CORNERIA) || (gCurrentLevel == LEVEL_VENOM_ANDROSS)) { sp64.x *= -1.0f; } - Math_SmoothStepToF(&D_80177A48[0], 0.1f, 1.0f, 0.005f, 0.0f); - Math_SmoothStepToF(&player->camEye.x, player->pos.x + sp64.x, D_80177A48[0], 500.0f, 0.0f); - Math_SmoothStepToF(&player->camEye.y, player->pos.y + sp64.y, D_80177A48[0], 500.0f, 0.0f); - Math_SmoothStepToF(&player->camEye.z, player->unk_138 + D_80177D20 + sp64.z, D_80177A48[0], 500.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.x, player->pos.x, D_80177A48[0], 500.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.y, player->pos.y, D_80177A48[0], 500.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.z, player->unk_138 + D_80177D20, D_80177A48[0], 500.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[0], 0.1f, 1.0f, 0.005f, 0.0f); + Math_SmoothStepToF(&player->camEye.x, player->pos.x + sp64.x, D_ctx_80177A48[0], 500.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.y, player->pos.y + sp64.y, D_ctx_80177A48[0], 500.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.z, player->unk_138 + D_ctx_80177D20 + sp64.z, D_ctx_80177A48[0], 500.0f, + 0.0f); + Math_SmoothStepToF(&player->camAt.x, player->pos.x, D_ctx_80177A48[0], 500.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.y, player->pos.y, D_ctx_80177A48[0], 500.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.z, player->unk_138 + D_ctx_80177D20, D_ctx_80177A48[0], 500.0f, 0.0f); break; } Matrix_RotateY(gCalcMatrix, (player->unk_0E8 + 180.0f) * M_DTOR, 0); @@ -954,10 +945,10 @@ void func_8004AAF4(Player* player) { player->unk_0F4 += 8.0f; player->unk_0F0 = SIN_DEG(player->unk_0F4); - func_800AA800(player); + func_play_800AA800(player); } -void func_8004B368(Player* player) { +void func_demo_8004B368(Player* player) { s32 pad[5]; Vec3f sp78; Vec3f sp6C; @@ -972,7 +963,7 @@ void func_8004B368(Player* player) { switch (player->unk_1D0) { case 10: - D_80177A48[2] = 0.0f; + D_ctx_80177A48[2] = 0.0f; player->unk_1D0++; player->wings.unk_04 = 0.0f; player->wings.unk_0C = 0.0f; @@ -986,38 +977,38 @@ void func_8004B368(Player* player) { /* fallthrough */ case 11: - D_80177A48[0] = 0.0f; + D_ctx_80177A48[0] = 0.0f; Math_SmoothStepToAngle(&player->unk_4D8, 0.0f, 1.0f, 5.0f, 0.0f); - player->camAt.x += (D_80178440 - player->camAt.x) * 0.01f; - player->camAt.y += (D_80178444 - player->camAt.y) * 0.01f; - player->camAt.z += (D_80178448 - player->camAt.z) * 0.01f; + player->camAt.x += (D_ctx_80178440 - player->camAt.x) * 0.01f; + player->camAt.y += (D_ctx_80178444 - player->camAt.y) * 0.01f; + player->camAt.z += (D_ctx_80178448 - player->camAt.z) * 0.01f; player->camEye.x += ((player->camAt.x + (500.0f * player->unk_004)) - player->camEye.x) * 0.01f; player->camEye.y += ((player->camAt.y + 500.0f) - player->camEye.y) * 0.01f; - player->camEye.z += ((D_80178448 + (2000.0f * D_80177950)) - player->camEye.z) * 0.01f; + player->camEye.z += ((D_ctx_80178448 + (2000.0f * D_ctx_80177950)) - player->camEye.z) * 0.01f; if (player->timer_1FC >= 0x1A) { - D_80177A48[2] += 1.5f * player->unk_004; - Math_SmoothStepToF(&player->unk_0EC, (player->unk_004 * (-450.0f)) * D_80177950, 0.2f, 20.0f, 0.1f); + D_ctx_80177A48[2] += 1.5f * player->unk_004; + Math_SmoothStepToF(&player->unk_0EC, (player->unk_004 * (-450.0f)) * D_ctx_80177950, 0.2f, 20.0f, 0.1f); } else { - D_80177A48[2] += 0.25f * player->unk_004; + D_ctx_80177A48[2] += 0.25f * player->unk_004; if (player->unk_0EC < (-360.0f)) { player->unk_0EC += 360.0f; } if (player->unk_0EC > 360.0f) { player->unk_0EC -= 360.0f; } - Math_SmoothStepToF(&player->unk_0EC, (player->unk_004 * 20.0f) * D_80177950, 0.1f, 3.0f, 0.1f); + Math_SmoothStepToF(&player->unk_0EC, (player->unk_004 * 20.0f) * D_ctx_80177950, 0.1f, 3.0f, 0.1f); } - if (D_80177950 > 0.0f) { + if (D_ctx_80177950 > 0.0f) { Math_SmoothStepToF(&player->unk_0E8, 0.0f, 0.1f, 3.0f, 0.1f); } else { Math_SmoothStepToF(&player->unk_0E8, 180.0f, 0.1f, 3.0f, 0.1f); Math_SmoothStepToF(&player->pos.x, player->camEye.x, 1.0f, 30.0f, 0.0f); - D_80177A48[2] = 0.0f; + D_ctx_80177A48[2] = 0.0f; } - player->pos.x += D_80177A48[2]; + player->pos.x += D_ctx_80177A48[2]; Math_SmoothStepToF(&player->unk_0E4, 0.0f, 0.1f, 3.0f, 0.1f); Math_SmoothStepToF(&player->pos.y, player->camEye.y + 5.0f, 0.1f, 1.0f, 0.0f); @@ -1025,7 +1016,7 @@ void func_8004B368(Player* player) { player->unk_1D0 = 0; player->timer_1F8 = 0x78; player->timer_1FC = 0x14; - D_80177A48[0] = 0.001f; + D_ctx_80177A48[0] = 0.001f; gCsCamEyeX = player->camEye.x; gCsCamEyeY = player->camEye.y; gCsCamEyeZ = player->camEye.z; @@ -1037,13 +1028,13 @@ void func_8004B368(Player* player) { case 0: if (player->timer_1F8 > 60) { - Math_SmoothStepToF(&player->unk_0EC, (player->unk_004 * 60.0f) * D_80177950, 0.1f, 4.0f, 0.1f); + Math_SmoothStepToF(&player->unk_0EC, (player->unk_004 * 60.0f) * D_ctx_80177950, 0.1f, 4.0f, 0.1f); } if (player->timer_1F8 < 80) { gCsCamAtX = player->pos.x; gCsCamAtY = player->pos.y; - gCsCamAtZ = player->unk_138 + D_80177D20 + 30.0f; - Math_SmoothStepToF(&D_80177A48[0], 0.05f, 0.1f, 0.0005f, 0.0f); + gCsCamAtZ = player->unk_138 + D_ctx_80177D20 + 30.0f; + Math_SmoothStepToF(&D_ctx_80177A48[0], 0.05f, 0.1f, 0.0005f, 0.0f); } Math_SmoothStepToF(&player->pos.x, player->camEye.x, 0.1f, 10.0f, 0.0f); @@ -1051,16 +1042,16 @@ void func_8004B368(Player* player) { player->camEye.y = gCsCamEyeY; var_fa1 = player->unk_004 * 190.0f; - if ((D_80177950 > 0.0f) && (player->unk_004 > 0.0f)) { + if ((D_ctx_80177950 > 0.0f) && (player->unk_004 > 0.0f)) { var_fa1 = 181.0f; } - if ((D_80177950 > 0.0f) && (player->unk_004 < 0.0f)) { + if ((D_ctx_80177950 > 0.0f) && (player->unk_004 < 0.0f)) { var_fa1 = -181.0f; } - if ((D_80177950 < 0.0f) && (player->unk_004 > 0.0f)) { + if ((D_ctx_80177950 < 0.0f) && (player->unk_004 > 0.0f)) { var_fa1 = 0.0f; } - if ((D_80177950 < 0.0f) && (player->unk_004 < 0.0f)) { + if ((D_ctx_80177950 < 0.0f) && (player->unk_004 < 0.0f)) { var_fa1 = 360.0f; } if (player->timer_1FC == 0) { @@ -1084,7 +1075,7 @@ void func_8004B368(Player* player) { break; case 1: - Math_SmoothStepToF(&D_80177A48[0], 1.0f, 0.1f, 0.05f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[0], 1.0f, 0.1f, 0.05f, 0.0f); player->unk_25C += 0.04f; if (player->unk_25C > 0.6f) { player->unk_25C = 0.6f; @@ -1094,9 +1085,9 @@ void func_8004B368(Player* player) { if (player->unk_000 > 0.3f) { player->unk_000 = 0.3f; } - Math_SmoothStepToF(&gCsCamAtX, player->pos.x, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&gCsCamAtY, player->pos.y, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&gCsCamAtZ, player->unk_138 + D_80177D20 + 30.0f, D_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&gCsCamAtX, player->pos.x, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&gCsCamAtY, player->pos.y, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&gCsCamAtZ, player->unk_138 + D_ctx_80177D20 + 30.0f, D_ctx_80177A48[0], 50000.0f, 0.0f); Math_SmoothStepToF(&player->pos.y, player->camEye.y + 5.0f, 0.1f, 4.0f, 0.0f); Math_SmoothStepToF(&player->unk_0E4, 20.0f, 0.1f, 0.2f, 0.01f); Math_SmoothStepToF(&player->pos.x, player->camEye.x, 0.1f, 2.0f, 0.0f); @@ -1115,15 +1106,15 @@ void func_8004B368(Player* player) { player->timer_1F8 = 0xC8; player->timer_1FC = 0x1F4; player->unk_1D0 = 2; - player->unk_000 = (player->unk_004 = (player->unk_008 = (D_80178418 = 0.0f))); + player->unk_000 = (player->unk_004 = (player->unk_008 = (D_ctx_80178418 = 0.0f))); player->unk_0D0 = 0.0f; - D_80177A48[6] = 0.0f; + D_ctx_80177A48[6] = 0.0f; } break; case 2: player->pos.y += 5.0f; - Matrix_RotateY(gCalcMatrix, ((player->unk_0E8 + 180.0f) + D_80178418) * M_DTOR, 0); + Matrix_RotateY(gCalcMatrix, ((player->unk_0E8 + 180.0f) + D_ctx_80178418) * M_DTOR, 0); Matrix_RotateX(gCalcMatrix, -(player->unk_0E4 * M_DTOR), 1); Matrix_RotateZ(gCalcMatrix, -((player->unk_0F8 + player->unk_0F0) * M_DTOR), 1); @@ -1132,10 +1123,11 @@ void func_8004B368(Player* player) { sp78.z = -800.0f; Matrix_MultVec3f(gCalcMatrix, &sp78, &sp6C); - Math_SmoothStepToF(&gCsCamAtX, player->pos.x, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&gCsCamAtY, player->pos.y - D_80177A48[6], D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&gCsCamAtZ, player->unk_138 + D_80177D20 - D_80177A48[6], D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&D_80177A48[6], 130.0f, 0.1f, 0.25f, 0.0f); + Math_SmoothStepToF(&gCsCamAtX, player->pos.x, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&gCsCamAtY, player->pos.y - D_ctx_80177A48[6], D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&gCsCamAtZ, player->unk_138 + D_ctx_80177D20 - D_ctx_80177A48[6], D_ctx_80177A48[0], + 50000.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[6], 130.0f, 0.1f, 0.25f, 0.0f); player->unk_000 += 0.002f; if (player->unk_000 > 0.3f) { @@ -1144,10 +1136,10 @@ void func_8004B368(Player* player) { gCsCamEyeX += ((player->pos.x + sp6C.x) - gCsCamEyeX) * player->unk_000; gCsCamEyeY += ((player->pos.y + sp6C.y) - gCsCamEyeY) * player->unk_000; - gCsCamEyeZ += ((player->unk_138 + D_80177D20 + sp6C.z) - gCsCamEyeZ) * player->unk_000; - D_80178430 += 0.2f; - D_8017842C += 0.2f; - D_80178418 += player->unk_008; + gCsCamEyeZ += ((player->unk_138 + D_ctx_80177D20 + sp6C.z) - gCsCamEyeZ) * player->unk_000; + D_ctx_80178430 += 0.2f; + D_ctx_8017842C += 0.2f; + D_ctx_80178418 += player->unk_008; Math_SmoothStepToAngle(&player->unk_0EC, 0.0f, 0.1f, 2.0f, 0.0f); if (player->timer_1F8 == 0) { @@ -1165,17 +1157,17 @@ void func_8004B368(Player* player) { player->vel.y = 5.0f; if ((player->timer_1F8 == 50) && (gTeamShields[1] > 0)) { - func_8004A840(0); + func_demo_8004A840(0); } if ((player->timer_1F8 == 70) && (gTeamShields[2] > 0)) { - func_8004A840(1); + func_demo_8004A840(1); } if (player->timer_1F8 == 90) { - func_800A6148(); + func_play_800A6148(); if (gTeamShields[3] > 0) { - func_8004A840(2); + func_demo_8004A840(2); } D_80161A88 = 0; } @@ -1184,8 +1176,8 @@ void func_8004B368(Player* player) { Matrix_RotateX(gCalcMatrix, -(player->unk_0E4 * M_DTOR), 1); Matrix_RotateZ(gCalcMatrix, -((player->unk_0F8 + player->unk_0F0) * M_DTOR), 1); - if ((D_80178418 > 70.0f) && (D_80178418 < 280.0f)) { - func_8004AA84(); + if ((D_ctx_80178418 > 70.0f) && (D_ctx_80178418 < 280.0f)) { + func_demo_8004AA84(); } sp78.x = gActors[0].fwork[0] * gActors[0].fwork[3]; sp78.y = gActors[0].fwork[1] * gActors[0].fwork[3]; @@ -1193,9 +1185,9 @@ void func_8004B368(Player* player) { Matrix_MultVec3f(gCalcMatrix, &sp78, &sp6C); - D_80178450[0] = player->pos.x + sp6C.x; - D_80178460[0] = player->pos.y + sp6C.y; - D_80178470[0] = player->unk_138 + sp6C.z; + D_ctx_80178450[0] = player->pos.x + sp6C.x; + D_ctx_80178460[0] = player->pos.y + sp6C.y; + D_ctx_80178470[0] = player->unk_138 + sp6C.z; sp78.x = gActors[1].fwork[0] * gActors[1].fwork[3]; sp78.y = gActors[1].fwork[1] * gActors[1].fwork[3]; @@ -1203,9 +1195,9 @@ void func_8004B368(Player* player) { Matrix_MultVec3f(gCalcMatrix, &sp78, &sp6C); - D_80178450[1] = player->pos.x + sp6C.x; - D_80178460[1] = player->pos.y + sp6C.y; - D_80178470[1] = player->unk_138 + sp6C.z; + D_ctx_80178450[1] = player->pos.x + sp6C.x; + D_ctx_80178460[1] = player->pos.y + sp6C.y; + D_ctx_80178470[1] = player->unk_138 + sp6C.z; sp78.x = gActors[2].fwork[0] * gActors[2].fwork[3]; sp78.y = gActors[2].fwork[1] * gActors[2].fwork[3]; @@ -1213,13 +1205,13 @@ void func_8004B368(Player* player) { Matrix_MultVec3f(gCalcMatrix, &sp78, &sp6C); - D_80178450[2] = player->pos.x + sp6C.x; - D_80178460[2] = player->pos.y + sp6C.y; - D_80178470[2] = player->unk_138 + sp6C.z; + D_ctx_80178450[2] = player->pos.x + sp6C.x; + D_ctx_80178460[2] = player->pos.y + sp6C.y; + D_ctx_80178470[2] = player->unk_138 + sp6C.z; switch (gCsFrameCount) { case 330: - D_80177840 = 100; + D_ctx_80177840 = 100; break; case 410: @@ -1253,8 +1245,8 @@ void func_8004B368(Player* player) { break; case 3: - D_80178430 += 0.2f; - D_8017842C += 0.2f; + D_ctx_80178430 += 0.2f; + D_ctx_8017842C += 0.2f; if (player->timer_1F8 == 0) { player->unk_1D0 = 4; player->timer_1F8 = 0x1E; @@ -1265,8 +1257,8 @@ void func_8004B368(Player* player) { break; case 4: - D_80178430 += 0.2f; - D_8017842C += 0.2f; + D_ctx_80178430 += 0.2f; + D_ctx_8017842C += 0.2f; player->unk_190 = 2.0f; player->unk_25C += 0.1f; if (player->unk_25C > 0.6f) { @@ -1275,47 +1267,47 @@ void func_8004B368(Player* player) { player->unk_000 += 1.0f; player->unk_0D0 = player->unk_000 * player->unk_000; if (player->timer_1F8 == 0) { - D_80177A48[7] = player->vel.x; - D_80177A48[8] = player->vel.y; - D_80177A48[9] = player->vel.z; + D_ctx_80177A48[7] = player->vel.x; + D_ctx_80177A48[8] = player->vel.y; + D_ctx_80177A48[9] = player->vel.z; player->unk_1D0 = 5; player->unk_0D0 = 0.0f; player->timer_1F8 = 0xA; - func_80078E50(player->pos.x, player->pos.y, player->unk_138, 30.0f); + func_effect_80078E50(player->pos.x, player->pos.y, player->unk_138, 30.0f); } gCsCamAtX = player->pos.x; - gCsCamAtY = player->pos.y - D_80177A48[6]; - gCsCamAtZ = player->unk_138 + D_80177D20 - D_80177A48[6]; + gCsCamAtY = player->pos.y - D_ctx_80177A48[6]; + gCsCamAtZ = player->unk_138 + D_ctx_80177D20 - D_ctx_80177A48[6]; break; case 5: - gCsCamAtX += D_80177A48[7]; - gCsCamAtY += D_80177A48[8]; - gCsCamAtZ += D_80177A48[9]; + gCsCamAtX += D_ctx_80177A48[7]; + gCsCamAtY += D_ctx_80177A48[8]; + gCsCamAtZ += D_ctx_80177A48[9]; player->unk_234 = 0; if (player->timer_1F8 == 0) { player->state_1C8 = PLAYERSTATE_1C8_6; player->timer_1F8 = 0; - D_8017837C = 4; + D_ctx_8017837C = 4; Audio_FadeOutAll(10); - D_800D3180[gCurrentLevel] = Play_CheckMedalStatus(150) + 1; + D_play_800D3180[gCurrentLevel] = Play_CheckMedalStatus(150) + 1; } break; } switch (gCsFrameCount) { case 961: - D_80177830 = 1; + D_ctx_80177830 = 1; break; case 1161: - D_80177830 = 0; + D_ctx_80177830 = 0; break; case 1255: player->unk_1D0 = 3; player->timer_1F8 = 0xA; - func_800A6028(player->sfxSource, 0x09000002U); + func_play_800A6028(player->sfxSource, 0x09000002U); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 50); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 50); break; @@ -1341,12 +1333,12 @@ void func_8004B368(Player* player) { player->unk_0F8 = player->unk_0EC; player->unk_138 = player->pos.z; - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 50000.0f, 0.f); - Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 50000.0f, 0.f); - Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 50000.0f, 0.f); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_ctx_80177A48[0], 50000.0f, 0.f); + Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_ctx_80177A48[0], 50000.0f, 0.f); + Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_ctx_80177A48[0], 50000.0f, 0.f); player->unk_088 += 10.0f; player->unk_080 = (-SIN_DEG(player->unk_088)) * 0.3f; @@ -1354,11 +1346,11 @@ void func_8004B368(Player* player) { player->unk_0F0 = SIN_DEG(player->unk_0F4); } -void func_8004C90C(Player* player) { - func_i4_80187520(90, player); +void func_demo_8004C90C(Player* player) { + OvlI4_CallFunction(90, player); } -void func_8004C930(Player* player) { +void func_demo_8004C930(Player* player) { s32 sp24; s32 sp20; s32 btn; @@ -1367,56 +1359,56 @@ void func_8004C930(Player* player) { switch (player->form) { case FORM_ARWING: - if ((gCurrentLevel == LEVEL_VENOM_ANDROSS) || ((gCurrentLevel == LEVEL_VENOM_2) && (D_8017827C == 1))) { - func_i6_80193C4C(player); + if ((gCurrentLevel == LEVEL_VENOM_ANDROSS) || ((gCurrentLevel == LEVEL_VENOM_2) && (D_ctx_8017827C == 1))) { + Andross_80193C4C(player); } else if (gCurrentLevel == LEVEL_SECTOR_X) { - if (D_8017827C == 0) { - func_i2_80194728(player); + if (D_ctx_8017827C == 0) { + SectorX_80194728(player); } else { - func_80048E40(player); + func_demo_80048E40(player); } } else if (gCurrentLevel == LEVEL_AREA_6) { - func_i3_8018ED78(player); + Area6_8018ED78(player); } else if (gCurrentLevel == LEVEL_FORTUNA) { - func_8004C90C(player); - func_800AA800(player); + func_demo_8004C90C(player); + func_play_800AA800(player); } else if (gCurrentLevel == LEVEL_BOLSE) { - func_i4_8018F94C(player); - func_800AA800(player); + Bolse_8018F94C(player); + func_play_800AA800(player); } else if (gCurrentLevel == LEVEL_SECTOR_Z) { - func_i4_8019C85C(player); + SectorZ_8019C85C(player); } else if (gCurrentLevel == LEVEL_KATINA) { - func_i4_80197290(player); - func_800AA800(player); + Katina_80197290(player); + func_play_800AA800(player); } else if (gCurrentLevel == LEVEL_SECTOR_Y) { - func_i6_8019EE60(player); - func_800AA800(player); + SectorY_8019EE60(player); + func_play_800AA800(player); } else if (gCurrentLevel == LEVEL_SOLAR) { - func_i3_801A7930(player); - func_800AA800(player); + Solar_801A7930(player); + func_play_800AA800(player); } else if (gCurrentLevel == LEVEL_ZONESS) { - func_i3_8019D76C(player); - func_800AA800(player); + Zoness_8019D76C(player); + func_play_800AA800(player); } else if (gCurrentLevel == LEVEL_VENOM_2) { - func_i6_80196D88(player); - func_800AA800(player); + Venom2_80196D88(player); + func_play_800AA800(player); } else if (gCurrentLevel == LEVEL_METEO) { - if (D_8017827C == 0) { - func_i2_8018E084(player); + if (D_ctx_8017827C == 0) { + Meteo_8018E084(player); } else { - func_80048E40(player); + func_demo_80048E40(player); } } else if ((gCurrentLevel == LEVEL_CORNERIA) && (gLevelMode == LEVELMODE_ALL_RANGE)) { - func_i1_80191160(player); - func_800AA800(player); + Corneria_80191160(player); + func_play_800AA800(player); } else { if (gCsFrameCount == 170) { AUDIO_PLAY_BGM(SEQ_ID_38); } - func_8004B368(player); - func_800AA800(player); + func_demo_8004B368(player); + func_play_800AA800(player); } - func_800B2130(player); + func_play_800B2130(player); break; case FORM_LANDMASTER: @@ -1429,27 +1421,27 @@ void func_8004C930(Player* player) { gInputPress->stick_x = btn; if (gCurrentLevel == LEVEL_TITANIA) { - func_i5_801882CC(player); - } else if (D_80177930 != 0) { - func_i5_801AF8F4(player); + Titania_801882CC(player); + } else if (D_ctx_80177930 != 0) { + Macbeth_801AF8F4(player); } else { - func_i5_801B3D04(player); + Macbeth_801B3D04(player); } - func_80046358(player); + func_tank_80046358(player); gInputPress->button = sp20; gInputHold->button = sp24; break; case FORM_BLUE_MARINE: if (gCurrentLevel == LEVEL_AQUAS) { - func_80095604(player); + func_hud_80095604(player); } break; } } -void func_8004CCC0(Player* player) { +void func_demo_8004CCC0(Player* player) { Vec3f sp58; PosRot sp50; @@ -1522,7 +1514,7 @@ void func_8004CCC0(Player* player) { player->unk_12C = -180.0f; } player->unk_1D0 = 3; - func_800A5FA0(player->sfxSource, 0x09000002U, player->num); + func_play_800A5FA0(player->sfxSource, 0x09000002U, player->num); player->unk_194 = 7.0f; player->unk_190 = 7.0f; } @@ -1595,17 +1587,17 @@ void func_8004CCC0(Player* player) { player->pos.z += player->vel.z; player->unk_138 = player->pos.z; - func_800B2574(player); - func_800B2130(player); - func_800AD7F0(player); - func_800AA800(player); - func_800A46A0(player); + func_play_800B2574(player); + func_play_800B2130(player); + func_play_800AD7F0(player); + func_play_800AA800(player); + func_play_800A46A0(player); } -void func_8004D3C8(s32 arg0) { +void func_demo_8004D3C8(s32 arg0) { } -void func_8004D3D4(Player* player, ObjectId itemId, Item* item) { +void func_demo_8004D3D4(Player* player, ObjectId itemId, Item* item) { Item_Initialize(item); item->obj.status = OBJ_INIT; item->obj.pos.x = player->pos.x; @@ -1615,16 +1607,16 @@ void func_8004D3D4(Player* player, ObjectId itemId, Item* item) { Object_SetInfo(&item->info, item->obj.id); } -void func_8004D440(Player* player) { +void func_demo_8004D440(Player* player) { s32 teamId; func_8001CA24(player->num); Audio_KillSfxBySourceAndId(player->sfxSource, 0x0900C010U); - func_800A5FA0(player->sfxSource, 0x0903F004U, player->num); + func_play_800A5FA0(player->sfxSource, 0x0903F004U, player->num); player->state_1C8 = PLAYERSTATE_1C8_6; player->timer_1F8 = 0x46; player->timer_224 = 0x14; - D_8017837C = 7; + D_ctx_8017837C = 7; if (player->unk_1D4 != 0) { player->unk_284 = 0; @@ -1661,39 +1653,39 @@ void func_8004D440(Player* player) { } } else { if (player->unk_288 > 0) { - D_80177DD0[player->unk_288 - 1][D_80177DB8[player->unk_288 - 1]] = player->num; - D_80177DB8[player->unk_288 - 1] += 1; - if (D_801778A4 == D_80177DB8[player->unk_288 - 1]) { + D_ctx_80177DD0[player->unk_288 - 1][D_ctx_80177DB8[player->unk_288 - 1]] = player->num; + D_ctx_80177DB8[player->unk_288 - 1] += 1; + if (D_ctx_801778A4 == D_ctx_80177DB8[player->unk_288 - 1]) { player->unk_288 = -1; if (player->unk_284 == 0) { - func_8007C688(player->pos.x, player->pos.y, player->unk_138, 3.0f, 0x3E8); + func_effect_8007C688(player->pos.x, player->pos.y, player->unk_138, 3.0f, 0x3E8); } } } if (gBombCount[gPlayerNum] != 0) { gBombCount[gPlayerNum] = 0; - func_8004D3D4(player, 0x147, &gItems[1]); + func_demo_8004D3D4(player, 0x147, &gItems[1]); } if (gLaserStrength[gPlayerNum] != 0) { gLaserStrength[gPlayerNum] = 0; - func_8004D3D4(player, 0x142, &gItems[0]); + func_demo_8004D3D4(player, 0x142, &gItems[0]); } } } -void func_8004D738(Player* player) { +void func_demo_8004D738(Player* player) { player->pos.y += 30.0f; - func_8007D0E0(player->pos.x, player->pos.y, player->unk_138, 6.0f); + func_effect_8007D0E0(player->pos.x, player->pos.y, player->unk_138, 6.0f); if (gCamCount == 1) { - func_8007BFFC(player->pos.x, player->pos.y, player->unk_138, 0.0f, 0.0f, 0.0f, 3.0f, 0x50); - func_8007C688(player->pos.x, player->pos.y, player->unk_138, 3.0f, 0x320); + func_effect_8007BFFC(player->pos.x, player->pos.y, player->unk_138, 0.0f, 0.0f, 0.0f, 3.0f, 0x50); + func_effect_8007C688(player->pos.x, player->pos.y, player->unk_138, 3.0f, 0x320); } else { - func_8007BFFC(player->pos.x, player->pos.y, player->unk_138, 0.0f, 0.0f, 0.0f, 3.0f, 0xA); + func_effect_8007BFFC(player->pos.x, player->pos.y, player->unk_138, 0.0f, 0.0f, 0.0f, 3.0f, 0xA); } - func_8004D440(player); + func_demo_8004D440(player); } -void func_8004D828(Player* player) { +void func_demo_8004D828(Player* player) { s32 i; Vec3f src; Vec3f dest; @@ -1720,12 +1712,12 @@ void func_8004D828(Player* player) { if (gCamCount == 1) { if (!(gGameFrameCount & 1)) { - func_8007D24C(RAND_FLOAT_CENTERED(20.0) + player->pos.x, RAND_FLOAT_CENTERED(20.0) + player->pos.y, - player->unk_138, 2.2f); + func_effect_8007D24C(RAND_FLOAT_CENTERED(20.0) + player->pos.x, RAND_FLOAT_CENTERED(20.0) + player->pos.y, + player->unk_138, 2.2f); } } else if (!(gGameFrameCount & 3)) { - func_8007D10C(RAND_FLOAT_CENTERED(10.0f) + player->pos.x, RAND_FLOAT_CENTERED(10.0f) + player->pos.y, - RAND_FLOAT_CENTERED(10.0f) + player->unk_138, 2.2f); + func_effect_8007D10C(RAND_FLOAT_CENTERED(10.0f) + player->pos.x, RAND_FLOAT_CENTERED(10.0f) + player->pos.y, + RAND_FLOAT_CENTERED(10.0f) + player->unk_138, 2.2f); } if ((player->pos.y < player->unk_0A4) && (player->unk_1D0 == 0)) { @@ -1735,47 +1727,49 @@ void func_8004D828(Player* player) { player->vel.y = 10.0f; player->unk_1D0 = 1; - func_800A6070(player->sfxSource, 0x29000000U); + func_play_800A6070(player->sfxSource, 0x29000000U); if ((gCurrentLevel == LEVEL_CORNERIA) || (gCurrentLevel == LEVEL_FORTUNA)) { - func_80062C38(player->pos.x, player->pos.z); + func_enmy_80062C38(player->pos.x, player->pos.z); } else { - func_8007D0E0(player->pos.x, player->pos.y, player->unk_138, 3.0f); + func_effect_8007D0E0(player->pos.x, player->pos.y, player->unk_138, 3.0f); } if (player->wings.rightState == 2) { - func_800A69F8(1, player->hit1.x, player->hit1.y, player->hit1.z); + func_play_800A69F8(1, player->hit1.x, player->hit1.y, player->hit1.z); player->wings.rightState = 1; - func_8007D0E0(player->hit1.x, player->hit1.y, player->hit1.z, 2.0f); + func_effect_8007D0E0(player->hit1.x, player->hit1.y, player->hit1.z, 2.0f); } if (player->wings.leftState == 2) { - func_800A69F8(0, player->hit2.x, player->hit2.y, player->hit2.z); + func_play_800A69F8(0, player->hit2.x, player->hit2.y, player->hit2.z); player->wings.leftState = 1; - func_8007D0E0(player->hit2.x, player->hit2.y, player->hit2.z, 2.0f); + func_effect_8007D0E0(player->hit2.x, player->hit2.y, player->hit2.z, 2.0f); } - } else if (((player->timer_220 > 0) || (player->pos.y < player->unk_0A4) || (player->pos.y < D_80177CC0) || + } else if (((player->timer_220 > 0) || (player->pos.y < player->unk_0A4) || (player->pos.y < D_ctx_80177CC0) || (player->timer_1FC == 0)) && (player->timer_1F8 == 0)) { if (gCamCount != 4) { if (player->unk_284 == 0) { - func_8007C688(player->pos.x, player->pos.y, player->unk_138 - (2.0f * player->vel.z), 3.0f, 0x50); + func_effect_8007C688(player->pos.x, player->pos.y, player->unk_138 - (2.0f * player->vel.z), 3.0f, + 0x50); } if (player->pos.y < player->unk_0A4) { - func_80062C38(player->pos.x, player->pos.z); + func_enmy_80062C38(player->pos.x, player->pos.z); } } if (gLevelType == LEVELTYPE_PLANET) { for (i = 0; i < 4; i++) { - func_800A69F8(2, player->pos.x, player->pos.y, player->unk_138); + func_play_800A69F8(2, player->pos.x, player->pos.y, player->unk_138); } for (i = 0; i < 2; i++) { - func_800A69F8(3, player->pos.x, player->pos.y, player->unk_138); + func_play_800A69F8(3, player->pos.x, player->pos.y, player->unk_138); } } - func_8007D0E0(player->pos.x, player->pos.y, player->unk_138, 5.0f); - func_8007BFFC(player->pos.x, player->pos.y, player->unk_138, player->vel.x, 0.0f, player->vel.z, 5.0f, 0x14); - func_8004D440(player); + func_effect_8007D0E0(player->pos.x, player->pos.y, player->unk_138, 5.0f); + func_effect_8007BFFC(player->pos.x, player->pos.y, player->unk_138, player->vel.x, 0.0f, player->vel.z, 5.0f, + 0x14); + func_demo_8004D440(player); } Math_SmoothStepToF(&player->unk_034, 0.0f, 0.05f, 5.0f, 0.00001f); Matrix_RotateY(gCalcMatrix, (player->unk_114 + (player->unk_134 * 0.2f)) * M_DTOR, 0); @@ -1803,11 +1797,11 @@ void func_8004D828(Player* player) { } if (gVersusMode != 0) { - func_800AE278(player); + func_play_800AE278(player); } } -void func_8004DEF8(Player* player) { +void func_demo_8004DEF8(Player* player) { s32 i; if (player->unk_0E4 < 0.0f) { @@ -1835,8 +1829,8 @@ void func_8004DEF8(Player* player) { } if (!(gGameFrameCount & 1)) { - func_8007D24C(RAND_FLOAT_CENTERED(20.0) + player->pos.x, RAND_FLOAT_CENTERED(20.0) + player->pos.y, - player->unk_138, 2.2f); + func_effect_8007D24C(RAND_FLOAT_CENTERED(20.0) + player->pos.x, RAND_FLOAT_CENTERED(20.0) + player->pos.y, + player->unk_138, 2.2f); } if ((player->pos.y < player->unk_0A4) && (player->unk_1D0 == 0)) { @@ -1844,42 +1838,43 @@ void func_8004DEF8(Player* player) { player->timer_220 = 0; player->vel.y = 10.0f; player->unk_1D0 = 1; - func_800A6070(player->sfxSource, 0x29000000U); + func_play_800A6070(player->sfxSource, 0x29000000U); if (gCurrentLevel == LEVEL_CORNERIA) { - func_80062C38(player->pos.x, player->pos.z); + func_enmy_80062C38(player->pos.x, player->pos.z); } if (player->wings.rightState == 2) { - func_800A69F8(1, player->hit1.x, player->hit1.y, player->hit1.z); + func_play_800A69F8(1, player->hit1.x, player->hit1.y, player->hit1.z); player->wings.rightState = 0; - func_8007D0E0(player->hit1.x, player->hit1.y, player->hit1.z, 2.0f); + func_effect_8007D0E0(player->hit1.x, player->hit1.y, player->hit1.z, 2.0f); } if (player->wings.leftState == 2) { - func_800A69F8(0, player->hit2.x, player->hit2.y, player->hit2.z); + func_play_800A69F8(0, player->hit2.x, player->hit2.y, player->hit2.z); player->wings.leftState = 0; - func_8007D0E0(player->hit2.x, player->hit2.y, player->hit2.z, 2.0f); + func_effect_8007D0E0(player->hit2.x, player->hit2.y, player->hit2.z, 2.0f); } } else if ((((player->timer_220 > 0) || (player->pos.y < player->unk_0A4)) || (player->timer_1FC == 0)) && (player->timer_1F8 == 0)) { if (player->pos.y < player->unk_0A4) { - func_8007C688(player->pos.x, gGroundLevel + 20.0f, player->unk_138 - (2.0f * player->vel.z), 3.0f, 0x320); - func_80062C38(player->pos.x, player->pos.z); + func_effect_8007C688(player->pos.x, gGroundLevel + 20.0f, player->unk_138 - (2.0f * player->vel.z), 3.0f, + 0x320); + func_enmy_80062C38(player->pos.x, player->pos.z); } - func_8007D0E0(player->pos.x, player->pos.y - (2.0f * player->vel.y), player->unk_138 - (2.0f * player->vel.z), - 6.0f); - func_8007BFFC(player->pos.x, player->pos.y - player->vel.y, player->unk_138 - (2.0f * player->vel.z), 0.0f, - 0.0f, 0.0f, 3.0f, 0x14); + func_effect_8007D0E0(player->pos.x, player->pos.y - (2.0f * player->vel.y), + player->unk_138 - (2.0f * player->vel.z), 6.0f); + func_effect_8007BFFC(player->pos.x, player->pos.y - player->vel.y, player->unk_138 - (2.0f * player->vel.z), + 0.0f, 0.0f, 0.0f, 3.0f, 0x14); if (gLevelType == LEVELTYPE_PLANET) { for (i = 0; i < 2; i++) { - func_800A69F8(2, player->pos.x, player->pos.y, player->unk_138); + func_play_800A69F8(2, player->pos.x, player->pos.y, player->unk_138); } for (i = 0; i < 4; i++) { - func_800A69F8(4, player->pos.x, player->pos.y, player->unk_138); + func_play_800A69F8(4, player->pos.x, player->pos.y, player->unk_138); } } - func_8004D440(player); + func_demo_8004D440(player); } player->unk_034 -= 3.0f; @@ -1889,12 +1884,12 @@ void func_8004DEF8(Player* player) { } if ((D_80161A88 == 2) && (player->pos.y <= player->unk_0A4)) { - func_8007D9DC(player->pos.x, gGroundLevel + 2.0f, player->unk_138, 3.0f, 20.0f, 0); - func_8007ADF4(player->pos.x, gGroundLevel, player->unk_138, 0.1f, 2.0f); + func_effect_8007D9DC(player->pos.x, gGroundLevel + 2.0f, player->unk_138, 3.0f, 20.0f, 0); + func_effect_8007ADF4(player->pos.x, gGroundLevel, player->unk_138, 0.1f, 2.0f); } } -void func_8004E3D8(Player* player) { +void func_demo_8004E3D8(Player* player) { player->unk_228 = 0; player->unk_280 = 0; @@ -1905,30 +1900,30 @@ void func_8004E3D8(Player* player) { switch (player->form) { case FORM_ARWING: if (gLevelMode == LEVELMODE_ALL_RANGE) { - func_8004D828(player); + func_demo_8004D828(player); } else { - func_8004DEF8(player); - func_800ADF58(player); + func_demo_8004DEF8(player); + func_play_800ADF58(player); } - func_800A8BA4(player); - func_800AA800(player); + func_play_800A8BA4(player); + func_play_800AA800(player); break; case FORM_LANDMASTER: - func_8004D738(player); + func_demo_8004D738(player); break; case FORM_BLUE_MARINE: - func_i3_801AB9B0(player); + Aquas_801AB9B0(player); break; case FORM_ON_FOOT: - func_8004D738(player); + func_demo_8004D738(player); break; } } -void func_8004E4D4(Actor* actor) { +void func_demo_8004E4D4(Actor* actor) { Vec3f sp54; Vec3f sp48; Vec3f sp3C; @@ -2010,13 +2005,13 @@ void func_8004E4D4(Actor* actor) { break; case 30: - actor->fwork[3] += D_800CA098[actor->index]; + actor->fwork[3] += D_demo_800CA098[actor->index]; Matrix_RotateY(gCalcMatrix, actor->fwork[3] * M_DTOR, 0); sp54.x = 0.0f; - sp54.y = D_800CA0A4[actor->index]; - sp54.z = D_800CA0B0[actor->index]; + sp54.y = D_demo_800CA0A4[actor->index]; + sp54.z = D_demo_800CA0B0[actor->index]; Matrix_MultVec3f(gCalcMatrix, &sp54, &sp3C); @@ -2057,16 +2052,16 @@ void func_8004E4D4(Actor* actor) { actor->vel.z = sp48.z; } -void func_8004EBD0(Actor* actor) { +void func_demo_8004EBD0(Actor* actor) { Vec3f src; Vec3f dest; if (actor->state < 4) { actor->fwork[9] = 0.4f; - actor->obj.pos.x += (D_80178450[actor->index] - actor->obj.pos.x) * 0.4f; - actor->obj.pos.y += (D_80178460[actor->index] - actor->obj.pos.y) * 0.4f; - actor->obj.pos.z += (D_80178470[actor->index] - actor->obj.pos.z) * 0.4f; + actor->obj.pos.x += (D_ctx_80178450[actor->index] - actor->obj.pos.x) * 0.4f; + actor->obj.pos.y += (D_ctx_80178460[actor->index] - actor->obj.pos.y) * 0.4f; + actor->obj.pos.z += (D_ctx_80178470[actor->index] - actor->obj.pos.z) * 0.4f; actor->obj.rot.z *= 0.98f; actor->obj.rot.x = -gPlayer[0].unk_0E4; @@ -2116,7 +2111,7 @@ void func_8004EBD0(Actor* actor) { if (actor->timer_0BC == 0) { actor->state++; actor->timer_0BC = 10; - func_800A6028(actor->sfxSource, 0x09000002); + func_play_800A6028(actor->sfxSource, 0x09000002); actor->fwork[29] = 5.0f; } break; @@ -2150,7 +2145,7 @@ void func_8004EBD0(Actor* actor) { actor->vel.z = dest.z; if (actor->timer_0BC == 0) { - func_80078E50(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 30.0f); + func_effect_80078E50(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 30.0f); Object_Kill(&actor->obj, actor->sfxSource); } break; @@ -2162,7 +2157,7 @@ void func_8004EBD0(Actor* actor) { } } -void func_8004F05C(Actor* actor) { +void func_demo_8004F05C(Actor* actor) { if (((gLevelType == LEVELTYPE_PLANET) && (actor->unk_0B6 == 0)) || (gCurrentLevel == LEVEL_BOLSE)) { actor->fwork[0] += 3.0f; actor->fwork[1] = SIN_DEG(actor->fwork[0]) * 1.5f; @@ -2220,13 +2215,13 @@ void func_8004F05C(Actor* actor) { break; case LEVEL_AREA_6: - func_i3_8018DA58(actor); + Area6_8018DA58(actor); break; case LEVEL_SECTOR_Y: switch (actor->unk_0B6) { case 0: - func_i6_8019FF00(actor); + SectorY_8019FF00(actor); break; case 42: @@ -2234,7 +2229,7 @@ void func_8004F05C(Actor* actor) { if (actor->obj.pos.x >= -3500.0f) { if (actor->obj.pos.z <= 3000.0f) { if ((fabsf(actor->obj.pos.y) <= 400.0f) && (gCsFrameCount < 0x12D)) { - func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 8.0f); + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 8.0f); } } } @@ -2324,7 +2319,7 @@ void func_8004F05C(Actor* actor) { } } -void func_8004F798(Actor* actor) { +void func_demo_8004F798(Actor* actor) { actor->iwork[11] = 2; switch (actor->state) { @@ -2338,17 +2333,17 @@ void func_8004F798(Actor* actor) { case 1: actor->fwork[29] = 10.0f; actor->vel.z -= 100.0f; - if ((actor->obj.pos.z + D_80177D20) < -15000.0f) { + if ((actor->obj.pos.z + D_ctx_80177D20) < -15000.0f) { Object_Kill(&actor->obj, actor->sfxSource); } break; } } -void func_8004F8AC(Actor* actor) { +void func_demo_8004F8AC(Actor* actor) { if (gCurrentLevel == LEVEL_AQUAS) { - func_80093164(actor); + func_hud_80093164(actor); return; } @@ -2357,46 +2352,46 @@ void func_8004F8AC(Actor* actor) { switch (gCurrentLevel) { case LEVEL_SECTOR_Y: if (gPlayer[0].unk_1D0 >= 3) { - func_i6_8019FF00(actor); + SectorY_8019FF00(actor); } break; case LEVEL_SOLAR: if (gPlayer[0].unk_1D0 >= 3) { - func_i3_801A8BE8(actor); + Solar_801A8BE8(actor); } break; case LEVEL_ZONESS: if (gPlayer[0].unk_1D0 >= 3) { - func_i3_8019E5F0(actor); + Zoness_8019E5F0(actor); } break; case LEVEL_VENOM_ANDROSS: case LEVEL_VENOM_2: - func_i6_80195E44(actor); + Andross_80195E44(actor); break; case LEVEL_KATINA: - func_i4_80197F10(actor); + Katina_80197F10(actor); break; case LEVEL_SECTOR_Z: - func_i4_8019DD20(actor); + SectorZ_8019DD20(actor); break; case LEVEL_AREA_6: - func_i3_8018DA58(actor); + Area6_8018DA58(actor); break; case LEVEL_METEO: - if (D_8017827C == 0) { - func_i2_8018ED9C(actor); + if (D_ctx_8017827C == 0) { + Meteo_8018ED9C(actor); break; } - func_80049630(actor); + func_demo_80049630(actor); break; case LEVEL_FORTUNA: @@ -2413,12 +2408,12 @@ void func_8004F8AC(Actor* actor) { case 1: Math_SmoothStepToF(&actor->scale, 0.5f, 0.03f, 0.01f, 0.0f); - D_80178348 = D_80178340 = D_80178350 = D_80178354 = 0; + D_ctx_80178348 = D_ctx_80178340 = D_ctx_80178350 = D_ctx_80178354 = 0; if ((actor->timer_0BC == 0x2B) || (actor->timer_0BC == 0x2E) || (actor->timer_0BC == 0x31)) { - D_80178340 = 0xC0; - D_80178348 = D_80178350 = D_80178354 = 255; + D_ctx_80178340 = 0xC0; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; } actor->iwork[0] -= 2; @@ -2427,13 +2422,13 @@ void func_8004F8AC(Actor* actor) { actor->scale = 0.0f; } - D_8017836C = actor->iwork[0] / 255.0f; - D_80178370 = gActors[0].obj.pos.x + 10.0f; - D_80178374 = gActors[0].obj.pos.y - 40.0f; - D_80178378 = gActors[0].obj.pos.z - 70.0f; - D_80178360 = 255; - D_80178364 = 255; - D_80178368 = 0x50; + D_ctx_8017836C = actor->iwork[0] / 255.0f; + D_ctx_80178370 = gActors[0].obj.pos.x + 10.0f; + D_ctx_80178374 = gActors[0].obj.pos.y - 40.0f; + D_ctx_80178378 = gActors[0].obj.pos.z - 70.0f; + D_ctx_80178360 = 255; + D_ctx_80178364 = 255; + D_ctx_80178368 = 0x50; break; } } @@ -2441,57 +2436,57 @@ void func_8004F8AC(Actor* actor) { case LEVEL_CORNERIA: if (gLevelMode == LEVELMODE_ALL_RANGE) { - func_8004E4D4(actor); + func_demo_8004E4D4(actor); break; } - func_8004EBD0(actor); + func_demo_8004EBD0(actor); break; case LEVEL_SECTOR_X: - if (D_8017827C != 0) { - func_80049630(actor); + if (D_ctx_8017827C != 0) { + func_demo_80049630(actor); break; } - func_8004E4D4(actor); + func_demo_8004E4D4(actor); break; case LEVEL_TITANIA: - func_8004E4D4(actor); + func_demo_8004E4D4(actor); break; case LEVEL_MACBETH: - func_i5_801B28BC(actor); + Macbeth_801B28BC(actor); break; case LEVEL_BOLSE: - func_8004F05C(actor); + func_demo_8004F05C(actor); break; default: - func_8004EBD0(actor); + func_demo_8004EBD0(actor); break; } break; case PLAYERSTATE_1C8_2: - func_8004F05C(actor); + func_demo_8004F05C(actor); break; case PLAYERSTATE_1C8_8: - func_8004F798(actor); + func_demo_8004F798(actor); break; case PLAYERSTATE_1C8_0: if (gCurrentLevel == LEVEL_SECTOR_Y) { - func_i6_8019FF00(actor); + SectorY_8019FF00(actor); } break; } } -void func_8004FCB8(Actor* actor, s32 arg1) { +void func_demo_8004FCB8(Actor* actor, s32 arg1) { f32 angle; f32 scale; s32 i; @@ -2512,8 +2507,8 @@ void func_8004FCB8(Actor* actor, s32 arg1) { for (i = arg1; i < (arg1 + 4); i++) { Matrix_Pop(&gGfxMatrix); Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, D_800CA110[i].x + actor->obj.pos.x, D_800CA110[i].y + actor->obj.pos.y, - D_800CA110[i].z + actor->obj.pos.z, 1); + Matrix_Translate(gGfxMatrix, D_demo_800CA110[i].x + actor->obj.pos.x, + D_demo_800CA110[i].y + actor->obj.pos.y, D_demo_800CA110[i].z + actor->obj.pos.z, 1); Matrix_RotateY(gGfxMatrix, angle, 1); Matrix_Scale(gGfxMatrix, scale, scale, scale, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -2522,7 +2517,7 @@ void func_8004FCB8(Actor* actor, s32 arg1) { } } -void func_8004FEC0(Actor* actor) { +void func_demo_8004FEC0(Actor* actor) { static f32 D_800CA210 = 0.0f; static f32 D_800CA214 = 0.0f; static f32 D_800CA218 = 0.0f; @@ -2549,12 +2544,12 @@ void func_8004FEC0(Actor* actor) { gSPDisplayList(gMasterDisp++, D_ENMY_PLANET_40018A0); if (actor->unk_046 >= 0x33) { - func_8005ADAC(actor); + func_edisplay_8005ADAC(actor); } break; case 0: - func_8005B388(actor); + func_edisplay_8005B388(actor); break; case 1: @@ -2562,7 +2557,7 @@ void func_8004FEC0(Actor* actor) { gSPFogPosition(gMasterDisp++, gFogNear, 1005); } actor->info.bonus = 1; - func_800515C4(); + func_demo_800515C4(); break; case 10: @@ -2592,7 +2587,7 @@ void func_8004FEC0(Actor* actor) { case 24: gSPDisplayList(gMasterDisp++, D_D009A40); - func_8005ADAC(actor); + func_edisplay_8005ADAC(actor); break; case 25: @@ -2606,17 +2601,17 @@ void func_8004FEC0(Actor* actor) { case 26: gSPDisplayList(gMasterDisp++, D_SZ_6004FE0); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, 1); - func_8005B1E8(actor, 2); + func_edisplay_8005B1E8(actor, 2); break; case 28: gSPDisplayList(gMasterDisp++, D_ENMY_SPACE_400AAE0); Matrix_Translate(gGfxMatrix, 0.f, 0.f, -60.0f, 1); - func_8005B1E8(actor, 2); + func_edisplay_8005B1E8(actor, 2); break; case 30: - func_8005F670(&actor->obj.pos); + func_edisplay_8005F670(&actor->obj.pos); if (actor->unk_046 != 0) { RCP_SetupDL(&gMasterDisp, 0x37); @@ -2752,7 +2747,7 @@ void func_8004FEC0(Actor* actor) { gSPDisplayList(gMasterDisp++, D_KA_600E050); } Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, 1); - func_8005B1E8(actor, 0); + func_edisplay_8005B1E8(actor, 0); break; case 34: @@ -2765,14 +2760,14 @@ void func_8004FEC0(Actor* actor) { /* fallthrough */ case 39: gSPDisplayList(gMasterDisp++, D_SY_60097E0); - func_8004FCB8(actor, 4); + func_demo_8004FCB8(actor, 4); break; case 36: Matrix_Scale(gGfxMatrix, actor->scale, actor->scale, actor->scale, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_SY_601D730); - func_8004FCB8(actor, 0); + func_demo_8004FCB8(actor, 0); break; case 37: @@ -2785,7 +2780,7 @@ void func_8004FEC0(Actor* actor) { break; case 38: - animFrameData = Animation_GetFrameData(D_800CA1F4[actor->iwork[4]], actor->iwork[5], sp144); + animFrameData = Animation_GetFrameData(D_demo_800CA1F4[actor->iwork[4]], actor->iwork[5], sp144); Math_SmoothStepToVec3fArray(sp144, actor->vwork, 1, animFrameData, actor->fwork[2], 100.0f, .0f); RCP_SetupDL_30(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); gDPSetPrimColor(gMasterDisp++, 0, 0, 150, 255, 150, 255); @@ -2802,7 +2797,7 @@ void func_8004FEC0(Actor* actor) { camX = gPlayer[0].camEye.x - actor->obj.pos.x; camY = gPlayer[0].camEye.y - actor->obj.pos.y; - camZ = gPlayer[0].camEye.z - (actor->obj.pos.z + D_80177D20); + camZ = gPlayer[0].camEye.z - (actor->obj.pos.z + D_ctx_80177D20); y = -Math_Atan2F(camX, camZ); x = Math_Atan2F(camY, sqrtf(SQ(camZ) + SQ(camX))); @@ -2834,7 +2829,7 @@ void func_8004FEC0(Actor* actor) { camX = gPlayer[0].camEye.x - actor->obj.pos.x; camY = gPlayer[0].camEye.y - actor->obj.pos.y; - camZ = gPlayer[0].camEye.z - (actor->obj.pos.z + D_80177D20); + camZ = gPlayer[0].camEye.z - (actor->obj.pos.z + D_ctx_80177D20); y = -Math_Atan2F(camX, camZ); x = Math_Atan2F(camY, sqrtf(SQ(camZ) + SQ(camX))); @@ -2853,7 +2848,7 @@ void func_8004FEC0(Actor* actor) { break; case 41: - func_i3_801BE0F0(actor); + Aquas_801BE0F0(actor); break; case 42: @@ -2903,7 +2898,7 @@ void func_8004FEC0(Actor* actor) { } } -void func_800515C4(void) { +void func_demo_800515C4(void) { Vec3f* var_s6_2; s32 i; s32 j; @@ -2936,17 +2931,17 @@ void func_800515C4(void) { ((gCurrentLevel != LEVEL_SECTOR_Z) || (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7))) { RCP_SetupDL_49(); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - for (i = 0, var_s6_2 = D_800CA0BC; i < 4; i++, var_s6_2++) { + for (i = 0, var_s6_2 = D_demo_800CA0BC; i < 4; i++, var_s6_2++) { if ((i != 1) || gGreatFoxIntact) { sp9C[i] = 0.0f; if (i < 2) { if (!(gGameFrameCount & 0x38)) { - sp9C[i] = D_800CA170[gGameFrameCount & 7]; + sp9C[i] = D_demo_800CA170[gGameFrameCount & 7]; } gDPSetEnvColor(gMasterDisp++, 255, 32, 32, 128); } else { if (!((gGameFrameCount + 32) & 0x38)) { - sp9C[i] = D_800CA170[gGameFrameCount & 7]; + sp9C[i] = D_demo_800CA170[gGameFrameCount & 7]; } gDPSetEnvColor(gMasterDisp++, 32, 32, 255, 128); } @@ -2961,8 +2956,8 @@ void func_800515C4(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 48); gDPSetEnvColor(gMasterDisp++, 255, 255, 0, 48); - for (i = 0, var_s6_2 = D_800CA0EC; i < 3; i++, var_s6_2++) { - sp9C[i] = D_800CA190[gGameFrameCount & 1]; + for (i = 0, var_s6_2 = D_demo_800CA0EC; i < 3; i++, var_s6_2++) { + sp9C[i] = D_demo_800CA190[gGameFrameCount & 1]; Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, var_s6_2->x, var_s6_2->y, var_s6_2->z, 1); Matrix_Scale(gGfxMatrix, sp9C[i], sp9C[i], 1.0f, 1); @@ -2971,8 +2966,8 @@ void func_800515C4(void) { for (j = 0; j < 4; j++) { Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, D_800CA1B4[2 * j], 1); - Matrix_Scale(gGfxMatrix, D_800CA1D4[2 * j], D_800CA1D4[2 * j], 1.0f, 1); + Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, D_demo_800CA1B4[2 * j], 1); + Matrix_Scale(gGfxMatrix, D_demo_800CA1D4[2 * j], D_demo_800CA1D4[2 * j], 1.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, var_fp); Matrix_Pop(&gGfxMatrix); @@ -2983,8 +2978,9 @@ void func_800515C4(void) { if ((gCurrentLevel == LEVEL_METEO) && (gPlayer[0].timer_1FC != 0)) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 128); gDPSetEnvColor(gMasterDisp++, 255, 255, 32, 128); - Matrix_Translate(gGfxMatrix, D_80177A48[3] * (-74.0f), -232.0f, 1190.0f, 1); - Matrix_Scale(gGfxMatrix, D_800CA198[gPlayer[0].timer_1FC], D_800CA198[gPlayer[0].timer_1FC], 1.0f, 1); + Matrix_Translate(gGfxMatrix, D_ctx_80177A48[3] * (-74.0f), -232.0f, 1190.0f, 1); + Matrix_Scale(gGfxMatrix, D_demo_800CA198[gPlayer[0].timer_1FC], D_demo_800CA198[gPlayer[0].timer_1FC], 1.0f, + 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, var_fp); } diff --git a/src/main/fox_display.c b/src/main/fox_display.c index 573ef271..f9eee36d 100644 --- a/src/main/fox_display.c +++ b/src/main/fox_display.c @@ -1,67 +1,65 @@ #include "global.h" - -s16 D_80161410; -Vec3f D_801613B0[4]; -Vec3f D_801613E0[4]; - -Matrix D_80161418[4]; -Vec3f D_80161518[4]; -Vec3f D_80161548[4]; -Vec3f D_80161578[4]; -f32 D_801615A8[4]; -f32 D_801615B8[4]; - #include "assets/ast_arwing.h" #include "assets/ast_allies.h" #include "assets/ast_landmaster.h" #include "assets/ast_versus.h" #include "assets/ast_sector_z.h" -s32 D_800CA220 = 0; -u8 D_800CA224[] = { 0, 0, 0, 0 }; -s32 D_800CA228 = 0; -s32 D_800CA22C = 0; -f32 D_800CA230 = 0.0f; -Actor* D_800CA234 = NULL; -s32 D_Timer_800CA238 = 0; -f32 D_800CA23C[3] = { 0.5f, 0.25f, 0.25f }; -f32 D_800CA248[3] = { 2.0f, 1.0f, 0.5f }; +Vec3f D_display_801613B0[4]; +Vec3f D_display_801613E0[4]; +s16 D_display_80161410; +Matrix D_display_80161418[4]; +Vec3f D_display_80161518[4]; +Vec3f D_display_80161548[4]; +Vec3f D_display_80161578[4]; +f32 D_display_801615A8[4]; +f32 D_display_801615B8[4]; -void func_80051B30(void) { +s32 D_display_800CA220 = 0; +u8 D_display_800CA224[] = { 0, 0, 0, 0 }; // +s32 D_display_800CA228 = 0; // +s32 D_display_800CA22C = 0; // +f32 D_display_800CA230 = 0.0f; +Actor* D_display_800CA234 = NULL; +s32 D_display_Timer_800CA238 = 0; +f32 D_display_800CA23C[3] = { 0.5f, 0.25f, 0.25f }; // +f32 D_display_800CA248[3] = { 2.0f, 1.0f, 0.5f }; // + +void func_display_80051B30(void) { s32 sp7C; f32 sp78; f32 sp74; Vec3f sp68; Vec3f sp5C; - if ((D_80177854 == 0x64) || (D_800CA234 == NULL)) { + if ((D_ctx_80177854 == 0x64) || (D_display_800CA234 == NULL)) { return; } - if ((D_800CA234->obj.status != OBJ_ACTIVE) || (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_3)) { - D_800CA234 = NULL; - D_Timer_800CA238 = 0; + if ((D_display_800CA234->obj.status != OBJ_ACTIVE) || (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_3)) { + D_display_800CA234 = NULL; + D_display_Timer_800CA238 = 0; return; } - if (D_Timer_800CA238 != 0) { - D_Timer_800CA238--; - if (D_Timer_800CA238 == 0) { - D_800CA234 = NULL; + if (D_display_Timer_800CA238 != 0) { + D_display_Timer_800CA238--; + if (D_display_Timer_800CA238 == 0) { + D_display_800CA234 = NULL; return; } } - if (!(D_Timer_800CA238 & 4)) { + if (!(D_display_Timer_800CA238 & 4)) { Matrix_RotateY(gCalcMatrix, gPlayer[0].unk_058, 0); Matrix_RotateX(gCalcMatrix, gPlayer[0].unk_05C, 1); - sp68.x = D_800CA234->obj.pos.x - gPlayer[0].camEye.x; - sp68.y = D_800CA234->obj.pos.y - gPlayer[0].camEye.y; - sp68.z = D_800CA234->obj.pos.z + D_80177D20 - gPlayer[0].camEye.z; + sp68.x = D_display_800CA234->obj.pos.x - gPlayer[0].camEye.x; + sp68.y = D_display_800CA234->obj.pos.y - gPlayer[0].camEye.y; + sp68.z = D_display_800CA234->obj.pos.z + D_ctx_80177D20 - gPlayer[0].camEye.z; Matrix_MultVec3f(gCalcMatrix, &sp68, &sp5C); sp7C = 0; if ((sp5C.z < 0.0f) && (sp5C.z > -12000.0f) && (fabsf(sp5C.x) < fabsf(sp5C.z * 0.4f))) { sp7C = 1; } RCP_SetupDL(&gMasterDisp, 0xC); - switch (D_800CA234->aiType) { + switch (D_display_800CA234->aiType) { case 3: gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 30, 0, 255); break; @@ -74,7 +72,7 @@ void func_80051B30(void) { } switch (sp7C) { case 0: - if (D_800CA234->sfxSource[0] > 0.0f) { + if (D_display_800CA234->sfxSource[0] > 0.0f) { sp78 = 20.0f; sp74 = M_PI / 2; } else { @@ -127,7 +125,7 @@ void func_80051B30(void) { } } -bool func_800520FC(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot, void* data) { +bool func_display_800520FC(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot, void* data) { Player* player = (Player*) data; gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); @@ -183,7 +181,7 @@ bool func_800520FC(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot, void* da return false; } -void func_800523A8(s32 limbIndex, Vec3f* rot, void* data) { +void func_display_800523A8(s32 limbIndex, Vec3f* rot, void* data) { Vec3f sp1C; Player* player = (Player*) data; @@ -191,11 +189,11 @@ void func_800523A8(s32 limbIndex, Vec3f* rot, void* data) { sp1C.x = 3.0f; sp1C.y = 1.0f; sp1C.z = -28.0f; - Matrix_MultVec3f(gGfxMatrix, &sp1C, &D_801613B0[player->num]); + Matrix_MultVec3f(gGfxMatrix, &sp1C, &D_display_801613B0[player->num]); } } -void func_80052420(s32 limbIndex, Vec3f* rot, void* data) { +void func_display_80052420(s32 limbIndex, Vec3f* rot, void* data) { Vec3f sp1C; Player* player = (Player*) data; @@ -203,11 +201,11 @@ void func_80052420(s32 limbIndex, Vec3f* rot, void* data) { sp1C.x = 13.0f; sp1C.y = 2.0f; sp1C.z = 28.0f; - Matrix_MultVec3f(gGfxMatrix, &sp1C, &D_801613B0[player->num]); + Matrix_MultVec3f(gGfxMatrix, &sp1C, &D_display_801613B0[player->num]); } } -void func_80052498(s32 limbIndex, Vec3f* rot, void* data) { +void func_display_80052498(s32 limbIndex, Vec3f* rot, void* data) { Vec3f sp1C; Player* player = (Player*) data; @@ -215,11 +213,11 @@ void func_80052498(s32 limbIndex, Vec3f* rot, void* data) { sp1C.x = 0.0f; sp1C.y = 2.0f; sp1C.z = 29.0f; - Matrix_MultVec3f(gGfxMatrix, &sp1C, &D_801613B0[player->num]); + Matrix_MultVec3f(gGfxMatrix, &sp1C, &D_display_801613B0[player->num]); } } -void func_8005250C(s32 limbIndex, Vec3f* rot, void* data) { +void func_display_8005250C(s32 limbIndex, Vec3f* rot, void* data) { Vec3f sp1C; Player* player = (Player*) data; @@ -227,18 +225,18 @@ void func_8005250C(s32 limbIndex, Vec3f* rot, void* data) { sp1C.x = 19.0f; sp1C.y = 1.0f; sp1C.z = 32.0f; - Matrix_MultVec3f(gGfxMatrix, &sp1C, &D_801613B0[player->num]); + Matrix_MultVec3f(gGfxMatrix, &sp1C, &D_display_801613B0[player->num]); } } -void func_80052584(Player* player) { +void func_display_80052584(Player* player) { Matrix_Push(&gGfxMatrix); Matrix_Copy(gGfxMatrix, &gIdentityMatrix); if ((player->state_1C8 == PLAYERSTATE_1C8_3) && (player->timer_1F8 != 0)) { - Matrix_Translate(gGfxMatrix, D_801613B0[player->num].x, D_801613B0[player->num].y, D_801613B0[player->num].z, - 1); - Matrix_Scale(gGfxMatrix, D_800CA23C[player->timer_1F8 - 1], D_800CA23C[player->timer_1F8 - 1], - D_800CA23C[player->timer_1F8 - 1], 1); + Matrix_Translate(gGfxMatrix, D_display_801613B0[player->num].x, D_display_801613B0[player->num].y, + D_display_801613B0[player->num].z, 1); + Matrix_Scale(gGfxMatrix, D_display_800CA23C[player->timer_1F8 - 1], D_display_800CA23C[player->timer_1F8 - 1], + D_display_800CA23C[player->timer_1F8 - 1], 1); Matrix_SetGfxMtx(&gMasterDisp); RCP_SetupDL_40(); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); @@ -247,33 +245,33 @@ void func_80052584(Player* player) { Matrix_Pop(&gGfxMatrix); } -void func_800526B8(Player* player) { +void func_display_800526B8(Player* player) { Matrix_Push(&gGfxMatrix); Matrix_Scale(gCalcMatrix, 0.5f, 0.5f, 0.5f, 1); Matrix_Translate(gCalcMatrix, 0.0f, 35.0f, 0.0f, 1); switch (player->num) { case 0: - Animation_DrawSkeleton(5, D_versus_301D258, player->jointTable, func_800520FC, func_800523A8, player, - gCalcMatrix); + Animation_DrawSkeleton(5, D_versus_301D258, player->jointTable, func_display_800520FC, + func_display_800523A8, player, gCalcMatrix); break; case 1: - Animation_DrawSkeleton(5, D_versus_301DB94, player->jointTable, func_800520FC, func_80052420, player, - gCalcMatrix); + Animation_DrawSkeleton(5, D_versus_301DB94, player->jointTable, func_display_800520FC, + func_display_80052420, player, gCalcMatrix); break; case 2: - Animation_DrawSkeleton(5, D_versus_301E3E8, player->jointTable, func_800520FC, func_80052498, player, - gCalcMatrix); + Animation_DrawSkeleton(5, D_versus_301E3E8, player->jointTable, func_display_800520FC, + func_display_80052498, player, gCalcMatrix); break; case 3: - Animation_DrawSkeleton(5, D_versus_301C614, player->jointTable, func_800520FC, func_8005250C, player, - gCalcMatrix); + Animation_DrawSkeleton(5, D_versus_301C614, player->jointTable, func_display_800520FC, + func_display_8005250C, player, gCalcMatrix); break; } Matrix_Pop(&gGfxMatrix); gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); } -void func_80052884(Player* player) { +void func_display_80052884(Player* player) { f32 sp64; Vec3f sp58; Vec3f sp4C = { 0.0f, 0.0f, 90.0f }; @@ -285,7 +283,7 @@ void func_80052884(Player* player) { } else { gSPDisplayList(gMasterDisp++, D_versus_300FB80); } - Matrix_MultVec3f(gGfxMatrix, &sp40, &D_80161518[player->num]); + Matrix_MultVec3f(gGfxMatrix, &sp40, &D_display_80161518[player->num]); Matrix_Translate(gGfxMatrix, 0.0f, 51.0f, -10.0f, 1); Matrix_RotateY(gGfxMatrix, -player->unk_180 * M_DTOR, 1); Matrix_RotateX(gGfxMatrix, player->unk_17C * M_DTOR, 1); @@ -297,9 +295,9 @@ void func_80052884(Player* player) { sp58.x = 0.0f; sp58.y = 0.0f; sp58.z = 1200.0f; - Matrix_MultVec3f(gGfxMatrix, &sp58, &D_801613E0[0]); + Matrix_MultVec3f(gGfxMatrix, &sp58, &D_display_801613E0[0]); sp58.z = 2400.0f + sp64; - Matrix_MultVec3f(gGfxMatrix, &sp58, &D_801613E0[1]); + Matrix_MultVec3f(gGfxMatrix, &sp58, &D_display_801613E0[1]); } Matrix_SetGfxMtx(&gMasterDisp); if (!gVersusMode) { @@ -311,25 +309,25 @@ void func_80052884(Player* player) { } else { gSPDisplayList(gMasterDisp++, D_versus_301F140); } - Matrix_MultVec3f(gGfxMatrix, &sp4C, &D_80161548[player->num]); + Matrix_MultVec3f(gGfxMatrix, &sp4C, &D_display_80161548[player->num]); Matrix_Pop(&gGfxMatrix); } -Gfx* D_800CA26C[] = { D_arwing_3000090, D_arwing_3016CC0, D_arwing_3005AB0, D_arwing_3003CE0 }; -Gfx* D_800CA27C[] = { D_arwing_3001C90, D_arwing_3016CC0, D_arwing_3005AB0, D_arwing_3003CE0 }; -f32 D_800CA28C = 2.0f; -f32 D_800CA290 = 13.0f; -f32 D_800CA294 = -10.0f; -f32 D_800CA298[] = { 0.0f, 0.0f, 0.0f, 0.0f }; -f32 D_800CA2A8 = 0.0f; +Gfx* D_display_800CA26C[] = { D_arwing_3000090, D_arwing_3016CC0, D_arwing_3005AB0, D_arwing_3003CE0 }; +Gfx* D_display_800CA27C[] = { D_arwing_3001C90, D_arwing_3016CC0, D_arwing_3005AB0, D_arwing_3003CE0 }; +f32 D_display_800CA28C = 2.0f; +f32 D_display_800CA290 = 13.0f; +f32 D_display_800CA294 = -10.0f; +f32 D_display_800CA298[] = { 0.0f, 0.0f, 0.0f, 0.0f }; +f32 D_display_800CA2A8 = 0.0f; -void func_80052B80(Player* player) { +void func_display_80052B80(Player* player) { Matrix_Push(&gGfxMatrix); if ((player->state_1C8 == PLAYERSTATE_1C8_3) && (player->unk_1A0 != 0)) { - Matrix_Translate(gGfxMatrix, D_80161548[player->num].x, D_80161548[player->num].y, D_80161548[player->num].z, - 1); - Matrix_Scale(gGfxMatrix, D_800CA248[player->unk_1A0 - 1], D_800CA248[player->unk_1A0 - 1], - D_800CA248[player->unk_1A0 - 1], 1); + Matrix_Translate(gGfxMatrix, D_display_80161548[player->num].x, D_display_80161548[player->num].y, + D_display_80161548[player->num].z, 1); + Matrix_Scale(gGfxMatrix, D_display_800CA248[player->unk_1A0 - 1], D_display_800CA248[player->unk_1A0 - 1], + D_display_800CA248[player->unk_1A0 - 1], 1); Matrix_SetGfxMtx(&gMasterDisp); if (gVersusMode) { RCP_SetupDL_40(); @@ -347,11 +345,11 @@ void func_80052B80(Player* player) { Matrix_Pop(&gGfxMatrix); } -void func_80052D48(Player* player) { +void func_display_80052D48(Player* player) { f32 sp2C; Matrix_Push(&gGfxMatrix); - Matrix_Copy(gGfxMatrix, &D_80161418[player->num]); + Matrix_Copy(gGfxMatrix, &D_display_80161418[player->num]); if (gVersusMode) { RCP_SetupDL_64(); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 150); @@ -409,19 +407,19 @@ void func_80052D48(Player* player) { Matrix_Pop(&gGfxMatrix); } -void func_8005314C(void) { - if (D_80161410 != 0) { +void func_display_8005314C(void) { + if (D_display_80161410 != 0) { gSPSetGeometryMode(gMasterDisp++, G_CULL_FRONT); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); } } -bool func_800531A4(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot, void* wingData) { +bool func_display_800531A4(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot, void* wingData) { WingInfo* wings = (WingInfo*) wingData; - if ((D_800CA22C != 0) && (gPlayer[0].unk_200 == 0)) { + if ((D_display_800CA22C != 0) && (gPlayer[0].unk_200 == 0)) { RCP_SetupDL(&gMasterDisp, 0x1D); - func_8005314C(); + func_display_8005314C(); } switch (limbIndex) { case 13: @@ -431,10 +429,10 @@ bool func_800531A4(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot, void* wi if (wings->rightState == WINGSTATE_BROKEN) { *gfxPtr = D_arwing_3015120; } - if ((D_800CA22C != 0) && (D_80177D40[0] & 1)) { + if ((D_display_800CA22C != 0) && (D_ctx_80177D40[0] & 1)) { RCP_SetupDL(&gMasterDisp, 0x22); - func_8005314C(); - if (D_80177D40[0] > 1000) { + func_display_8005314C(); + if (D_ctx_80177D40[0] > 1000) { gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 32, 32, 255, 255); } else { gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255); @@ -446,10 +444,10 @@ bool func_800531A4(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot, void* wi if (wings->rightState != 2) { *gfxPtr = NULL; } - if ((D_800CA22C != 0) && (D_80177D40[0] & 1)) { + if ((D_display_800CA22C != 0) && (D_ctx_80177D40[0] & 1)) { RCP_SetupDL(&gMasterDisp, 0x22); - func_8005314C(); - if (D_80177D40[0] > 1000) { + func_display_8005314C(); + if (D_ctx_80177D40[0] > 1000) { gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 32, 32, 255, 255); } else { gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255); @@ -463,10 +461,10 @@ bool func_800531A4(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot, void* wi if (wings->leftState == WINGSTATE_BROKEN) { *gfxPtr = D_arwing_3014BF0; } - if ((D_800CA22C != 0) && (D_80177D58[0] & 1)) { + if ((D_display_800CA22C != 0) && (D_ctx_80177D58[0] & 1)) { RCP_SetupDL(&gMasterDisp, 0x22); - func_8005314C(); - if (D_80177D58[0] > 1000) { + func_display_8005314C(); + if (D_ctx_80177D58[0] > 1000) { gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 32, 32, 255, 255); } else { gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255); @@ -478,10 +476,10 @@ bool func_800531A4(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot, void* wi if (wings->leftState != 2) { *gfxPtr = NULL; } - if ((D_800CA22C != 0) && (D_80177D58[0] & 1)) { + if ((D_display_800CA22C != 0) && (D_ctx_80177D58[0] & 1)) { RCP_SetupDL(&gMasterDisp, 0x22); - func_8005314C(); - if (D_80177D58[0] > 1000) { + func_display_8005314C(); + if (D_ctx_80177D58[0] > 1000) { gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 32, 32, 255, 255); } else { gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255); @@ -520,7 +518,7 @@ bool func_800531A4(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot, void* wi return false; } -void func_80053658(WingInfo* wings) { +void func_display_80053658(WingInfo* wings) { Vec3f sp68[30]; s32 sp64; @@ -530,7 +528,7 @@ void func_80053658(WingInfo* wings) { wings->unk_18 = (-wings->unk_14 - 7.0f) * 2.5f; } if (gGameState == GSTATE_PLAY) { - Animation_DrawSkeleton(1, D_arwing_3016610, gPlayer[0].jointTable, func_800531A4, NULL, wings, + Animation_DrawSkeleton(1, D_arwing_3016610, gPlayer[0].jointTable, func_display_800531A4, NULL, wings, &gIdentityMatrix); } else { if (gGameState == GSTATE_MENU) { @@ -538,11 +536,11 @@ void func_80053658(WingInfo* wings) { } else { Animation_GetFrameData(&D_arwing_3015C28, 0, sp68); } - Animation_DrawSkeleton(1, D_arwing_3016610, sp68, func_800531A4, NULL, wings, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_arwing_3016610, sp68, func_display_800531A4, NULL, wings, &gIdentityMatrix); } - D_800CA22C = 0; + D_display_800CA22C = 0; sp64 = wings->unk_2C; - if (D_800CA220 != 0) { + if (D_display_800CA220 != 0) { sp64 = 1; } if (sp64 != 0) { @@ -556,9 +554,9 @@ void func_80053658(WingInfo* wings) { } Matrix_SetGfxMtx(&gMasterDisp); if (gExpertMode) { - gSPDisplayList(gMasterDisp++, D_800CA27C[sp64 - 1]); + gSPDisplayList(gMasterDisp++, D_display_800CA27C[sp64 - 1]); } else { - gSPDisplayList(gMasterDisp++, D_800CA26C[sp64 - 1]); + gSPDisplayList(gMasterDisp++, D_display_800CA26C[sp64 - 1]); } Matrix_Pop(&gGfxMatrix); } @@ -584,14 +582,14 @@ void func_80053658(WingInfo* wings) { Matrix_Pop(&gGfxMatrix); } -void func_80053B00(f32 arg0, f32 arg1, UNK_TYPE arg2, UNK_TYPE arg3) { +void func_display_80053B00(f32 arg0, f32 arg1, UNK_TYPE arg2, UNK_TYPE arg3) { } -void func_80053B18(void) { +void func_display_80053B18(void) { Matrix_Push(&gGfxMatrix); - Matrix_Copy(gGfxMatrix, &D_80161418[0]); - Matrix_Translate(gGfxMatrix, 0.0f, D_800CA290, D_800CA294, 1); - Matrix_Scale(gGfxMatrix, D_800CA28C, D_800CA28C, D_800CA28C, 1); + Matrix_Copy(gGfxMatrix, &D_display_80161418[0]); + Matrix_Translate(gGfxMatrix, 0.0f, D_display_800CA290, D_display_800CA294, 1); + Matrix_Scale(gGfxMatrix, D_display_800CA28C, D_display_800CA28C, D_display_800CA28C, 1); Matrix_SetGfxMtx(&gMasterDisp); RCP_SetupDL_64_2(); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 120); @@ -601,7 +599,7 @@ void func_80053B18(void) { Matrix_Pop(&gGfxMatrix); } -void func_80053C38(Player* player, s32 arg1) { +void func_display_80053C38(Player* player, s32 arg1) { Vec3f sp4C; f32 sp48; @@ -613,14 +611,14 @@ void func_80053C38(Player* player, s32 arg1) { sp4C.x = 0.0f; sp4C.y = 0.0f; sp4C.z = 1200.0f; - Matrix_MultVec3f(gGfxMatrix, &sp4C, &D_801613E0[0]); + Matrix_MultVec3f(gGfxMatrix, &sp4C, &D_display_801613E0[0]); sp4C.z = 2400.0f + sp48; - Matrix_MultVec3f(gGfxMatrix, &sp4C, &D_801613E0[1]); + Matrix_MultVec3f(gGfxMatrix, &sp4C, &D_display_801613E0[1]); } if ((player->unk_238 != 0) && (gLevelMode == LEVELMODE_ON_RAILS) && - (fabsf(player->unk_138 + D_80177D20 - player->camEye.z) < 10.0f)) { + (fabsf(player->unk_138 + D_ctx_80177D20 - player->camEye.z) < 10.0f)) { if (arg1 == 0) { - D_800CA228 = 1; + D_display_800CA228 = 1; Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, 0.0f, -8.0f, 5.0f, 1); Matrix_RotateY(gGfxMatrix, M_PI, 1); @@ -646,14 +644,14 @@ void func_80053C38(Player* player, s32 arg1) { player->wings.unk_28 = player->wings.unk_04 = player->wings.unk_08 = player->wings.unk_0C = player->wings.unk_10 = 0.0f; } - D_800CA22C = 1; - D_80161410 = arg1; - func_80053658(&player->wings); + D_display_800CA22C = 1; + D_display_80161410 = arg1; + func_display_80053658(&player->wings); } } } -void func_80053F7C(Player* player) { +void func_display_80053F7C(Player* player) { Vec3f* pad; s32 i; @@ -661,7 +659,7 @@ void func_80053F7C(Player* player) { (player->unk_234 != 0) && (((gGameState == GSTATE_PLAY) && (player->state_1C8 == PLAYERSTATE_1C8_3)) || (gGameState == GSTATE_MENU))) { for (i = 0; i < 2; i++) { - pad = &D_801613E0[i]; + pad = &D_display_801613E0[i]; Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, pad->x, pad->y, pad->z, 1); if (gChargeTimers[player->num] >= 20) { @@ -669,7 +667,7 @@ void func_80053F7C(Player* player) { if (i == 1) { gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255); gDPSetEnvColor(gMasterDisp++, 255, 0, 0, 255); - Math_SmoothStepToF(&D_800CA298[player->num], 2.0f, 1.0f, 0.4f, 0.0f); + Math_SmoothStepToF(&D_display_800CA298[player->num], 2.0f, 1.0f, 0.4f, 0.0f); } else { gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 0, 255); gDPSetEnvColor(gMasterDisp++, 255, 255, 0, 255); @@ -678,8 +676,8 @@ void func_80053F7C(Player* player) { RCP_SetupDL_36(); } if (i == 1) { - Matrix_Scale(gGfxMatrix, D_800CA298[player->num], D_800CA298[player->num], 1.0f, 1); - Math_SmoothStepToF(&D_800CA298[player->num], 1.0f, 1.0f, 0.2f, 0.0f); + Matrix_Scale(gGfxMatrix, D_display_800CA298[player->num], D_display_800CA298[player->num], 1.0f, 1); + Math_SmoothStepToF(&D_display_800CA298[player->num], 1.0f, 1.0f, 0.2f, 0.0f); } Matrix_Scale(gGfxMatrix, 4.0f, 4.0f, 4.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -689,27 +687,27 @@ void func_80053F7C(Player* player) { } } -void func_80054280(Player* player, s32 arg1) { +void func_display_80054280(Player* player, s32 arg1) { switch (player->form) { case FORM_ARWING: - func_80053C38(player, arg1); + func_display_80053C38(player, arg1); return; case FORM_LANDMASTER: - func_80052884(player); + func_display_80052884(player); return; case FORM_BLUE_MARINE: - func_i3_801ACBB4(player); + Aquas_801ACBB4(player); return; case FORM_ON_FOOT: - func_800526B8(player); + func_display_800526B8(player); return; } } -void func_80054300(Player* player) { - Math_SmoothStepToF(&D_800CA2A8, player->unk_23C, 1.0f, 10.0f, 0.0f); +void func_display_80054300(Player* player) { + Math_SmoothStepToF(&D_display_800CA2A8, player->unk_23C, 1.0f, 10.0f, 0.0f); RCP_SetupDL(&gMasterDisp, 0x42); - gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, (s32) D_800CA2A8); + gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, (s32) D_display_800CA2A8); if (player->unk_068 > 30.0f) { gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); } @@ -756,7 +754,7 @@ void func_80054300(Player* player) { } } -void func_8005465C(s32 levelType) { +void func_display_8005465C(s32 levelType) { RCP_SetupDL(&gMasterDisp, 0x43); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255); @@ -777,7 +775,7 @@ void func_8005465C(s32 levelType) { gSPDisplayList(gMasterDisp++, D_1024AC0); } -void func_8005478C(Player* player) { +void func_display_8005478C(Player* player) { RCP_SetupDL_64(); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 100); Matrix_Push(&gGfxMatrix); @@ -797,11 +795,11 @@ void func_8005478C(Player* player) { Matrix_Scale(gGfxMatrix, 0.80999994f, 0.567f, 1.0f, 1); } Matrix_SetGfxMtx(&gMasterDisp); - func_8005465C(gLevelType); + func_display_8005465C(gLevelType); Matrix_Pop(&gGfxMatrix); } -void func_80054914(Player* player) { +void func_display_80054914(Player* player) { f32 sp4C; Vec3f sp40; Vec3f sp34; @@ -843,16 +841,16 @@ void func_80054914(Player* player) { } } -void func_80054CA4(Player* player) { - if (D_80177AB8[player->num] > 1.0f) { +void func_display_80054CA4(Player* player) { + if (D_ctx_80177AB8[player->num] > 1.0f) { Matrix_Push(&gGfxMatrix); - Matrix_Copy(gGfxMatrix, &D_80161418[player->num]); + Matrix_Copy(gGfxMatrix, &D_display_80161418[player->num]); Matrix_Translate(gGfxMatrix, 0.0f, -5.0f, 10.0f, 1); Matrix_Scale(gGfxMatrix, 2.5f, 1.6f, 2.5f, 1); Matrix_SetGfxMtx(&gMasterDisp); RCP_SetupDL(&gMasterDisp, 0x44); - gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 255, 255, (s32) D_80177AB8[player->num]); - gDPSetEnvColor(gMasterDisp++, 255, 0, 255, (s32) D_80177AB8[player->num]); + gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 255, 255, (s32) D_ctx_80177AB8[player->num]); + gDPSetEnvColor(gMasterDisp++, 255, 0, 255, (s32) D_ctx_80177AB8[player->num]); gSPDisplayList(gMasterDisp++, D_101CD70); Matrix_Pop(&gGfxMatrix); Texture_Scroll(D_101D070, 0x20, 0x20, 3); @@ -860,11 +858,7 @@ void func_80054CA4(Player* player) { } } -// Vec3f D_800CA2AC = {0.0f, -5.0f, 60.0f}; -// Vec3f D_800CA2B8 = {0.0f, -14.0f, 60.0f}; -// Vec3f D_800CA2C4 = {30.0f, -10.0f, 30.0f}; -// Vec3f D_800CA2D0 = {-30.0f, -10.0f, 30.0f}; -void func_80054E80(Player* player) { +void func_display_80054E80(Player* player) { Vec3f spC4 = { 0.0f, -5.0f, 60.0f }; Vec3f spB8 = { 0.0f, -14.0f, 60.0f }; Vec3f spAC = { 30.0f, -10.0f, 30.0f }; @@ -876,7 +870,7 @@ void func_80054E80(Player* player) { if (gChargeTimers[player->num] > 10) { RCP_SetupDL(&gMasterDisp, 0x43); - Matrix_Copy(gCalcMatrix, &D_80161418[player->num]); + Matrix_Copy(gCalcMatrix, &D_display_80161418[player->num]); if ((player->unk_238 != 0) && (gLevelMode == LEVELMODE_ON_RAILS)) { Matrix_MultVec3f(gCalcMatrix, &spB8, &sp94); } else { @@ -932,10 +926,10 @@ void func_80054E80(Player* player) { gSPDisplayList(gMasterDisp++, D_1024AC0); Matrix_Pop(&gGfxMatrix); } - if (D_80177AA0[player->num] > 0.1f) { + if (D_ctx_80177AA0[player->num] > 0.1f) { Matrix_Push(&gGfxMatrix); RCP_SetupDL(&gMasterDisp, 0x43); - Matrix_Copy(gCalcMatrix, &D_80161418[player->num]); + Matrix_Copy(gCalcMatrix, &D_display_80161418[player->num]); var_v1 = gLaserStrength[player->num]; if (player->wings.unk_14 > -8.0f) { var_v1 = LASERS_SINGLE; @@ -951,7 +945,7 @@ void func_80054E80(Player* player) { } Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, sp94.x, sp94.y, sp94.z, 0); - Matrix_Scale(gGfxMatrix, D_80177AA0[player->num], D_80177AA0[player->num], 1.0f, 1); + Matrix_Scale(gGfxMatrix, D_ctx_80177AA0[player->num], D_ctx_80177AA0[player->num], 1.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_1024AC0); Matrix_Pop(&gGfxMatrix); @@ -969,13 +963,13 @@ void func_80054E80(Player* player) { Matrix_MultVec3f(gCalcMatrix, &spA0, &sp88); Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, sp94.x, sp94.y, sp94.z, 0); - Matrix_Scale(gGfxMatrix, D_80177AA0[player->num], D_80177AA0[player->num], 1.0f, 1); + Matrix_Scale(gGfxMatrix, D_ctx_80177AA0[player->num], D_ctx_80177AA0[player->num], 1.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_1024AC0); Matrix_Pop(&gGfxMatrix); Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, sp88.x, sp88.y, sp88.z, 0); - Matrix_Scale(gGfxMatrix, D_80177AA0[player->num], D_80177AA0[player->num], 1.0f, 1); + Matrix_Scale(gGfxMatrix, D_ctx_80177AA0[player->num], D_ctx_80177AA0[player->num], 1.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_1024AC0); Matrix_Pop(&gGfxMatrix); @@ -985,15 +979,15 @@ void func_80054E80(Player* player) { } } -void func_80055788(Player* player) { +void func_display_80055788(Player* player) { f32 sp54; if (gChargeTimers[player->num] >= 0xB) { RCP_SetupDL(&gMasterDisp, 0x43); Matrix_Push(&gGfxMatrix); sp54 = gChargeTimers[player->num] / 20.0f; - Matrix_Translate(gGfxMatrix, D_80161548[player->num].x, D_80161548[player->num].y, D_80161548[player->num].z, - 0); + Matrix_Translate(gGfxMatrix, D_display_80161548[player->num].x, D_display_80161548[player->num].y, + D_display_80161548[player->num].z, 0); Matrix_Scale(gGfxMatrix, sp54, sp54, 1.0f, 1); Matrix_Push(&gGfxMatrix); Matrix_Scale(gGfxMatrix, 10.0f, 10.0f, 10.0f, 1); @@ -1036,7 +1030,7 @@ void func_80055788(Player* player) { } } -void func_80055B58(Player* player) { +void func_display_80055B58(Player* player) { Vec3f sp4C; Vec3f sp40; f32 var_fv0; @@ -1066,30 +1060,30 @@ void func_80055B58(Player* player) { Matrix_RotateY(gGfxMatrix, -gPlayer[gPlayerNum].unk_058, 1); Matrix_RotateX(gGfxMatrix, gPlayer[gPlayerNum].unk_05C, 1); Matrix_SetGfxMtx(&gMasterDisp); - func_8005478C(player); + func_display_8005478C(player); Matrix_Pop(&gGfxMatrix); - func_80054914(player); - func_80054CA4(player); - func_80054E80(player); + func_display_80054914(player); + func_display_80054CA4(player); + func_display_80054E80(player); break; case FORM_LANDMASTER: - func_80052D48(player); + func_display_80052D48(player); Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, D_80161518[player->num].x, D_80161518[player->num].y, - D_80161518[player->num].z, 0); + Matrix_Translate(gGfxMatrix, D_display_80161518[player->num].x, D_display_80161518[player->num].y, + D_display_80161518[player->num].z, 0); Matrix_SetGfxMtx(&gMasterDisp); - func_8005478C(player); + func_display_8005478C(player); Matrix_Pop(&gGfxMatrix); - func_80055788(player); + func_display_80055788(player); break; case FORM_BLUE_MARINE: - func_80054914(player); + func_display_80054914(player); break; } } } -void func_80055E98(Player* player) { +void func_display_80055E98(Player* player) { f32 sp5C; f32 sp58; f32 sp54; @@ -1148,7 +1142,7 @@ void func_80055E98(Player* player) { } } -void func_80056230(Player* player) { +void func_display_80056230(Player* player) { if ((player->unk_234 != 0) && (player->form == FORM_ARWING) && (gCurrentLevel != LEVEL_VENOM_ANDROSS) && (gCurrentLevel != LEVEL_TRAINING) && (gLevelType == LEVELTYPE_PLANET)) { Matrix_Push(&gGfxMatrix); @@ -1158,12 +1152,12 @@ void func_80056230(Player* player) { Matrix_RotateZ(gGfxMatrix, -((player->unk_0F8 + player->unk_0F0 + player->unk_134) * M_DTOR), 1); Matrix_Translate(gGfxMatrix, player->unk_084, player->unk_080, 0.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); - func_80055E98(player); + func_display_80055E98(player); Matrix_Pop(&gGfxMatrix); } } -bool func_800563B4(s32 index, s32 arg1) { +bool func_display_800563B4(s32 index, s32 arg1) { Vec3f sp2C = { 0.0f, 0.0f, 0.0f }; Vec3f sp20; @@ -1172,21 +1166,21 @@ bool func_800563B4(s32 index, s32 arg1) { if (fabsf(sp20.x) < (fabsf(sp20.z * 0.5f) + 500.0f)) { if (fabsf(sp20.y) < (fabsf(sp20.z * 0.5f) + 500.0f)) { if (arg1 == 0) { - D_800CA224[index] = 1; + D_display_800CA224[index] = 1; } return true; } } } if (arg1 == 0) { - D_800CA224[index] = 0; + D_display_800CA224[index] = 0; } return false; } -s32 D_800CA2E8[16] = { 60, 40, 20, 20, 20, 20, 20, 20, 0, 0, 0, 0, 0, 0, 0, 0 }; +s32 D_display_800CA2E8[16] = { 60, 40, 20, 20, 20, 20, 20, 20, 0, 0, 0, 0, 0, 0, 0, 0 }; -void func_800564C0(Player* player, s32 arg1) { +void func_display_800564C0(Player* player, s32 arg1) { s32 i; Vec3f sp50 = { 0.0f, 0.0f, 0.0f }; @@ -1194,25 +1188,25 @@ void func_800564C0(Player* player, s32 arg1) { Matrix_Push(&gGfxMatrix); if (player->form == FORM_LANDMASTER) { if (player->unk_1D4 != 0) { - Matrix_Translate(gGfxMatrix, 0.0f, D_8017847C, 0.0f, 1); + Matrix_Translate(gGfxMatrix, 0.0f, D_ctx_8017847C, 0.0f, 1); } Matrix_Translate(gGfxMatrix, player->pos.x, player->pos.y + player->unk_18C + 30.0f, player->unk_138 + player->unk_144, 1); if (gVersusMode) { for (i = 0; i < gCamCount; i++) { - if (D_80177B00[player->num][i] != 0) { - Matrix_MultVec3f(gGfxMatrix, &sp50, &D_80161578[i]); + if (D_ctx_80177B00[player->num][i] != 0) { + Matrix_MultVec3f(gGfxMatrix, &sp50, &D_display_80161578[i]); if ((i == gPlayerNum) && - ((D_80161578[i].z > 300.0f) || (D_80161578[i].z < -8000.0f) || - (fabsf(D_80161578[i].x) > (fabsf(D_80161578[i].z * 0.5f) + 100.0f)) || - (fabsf(D_80161578[i].y)) > (fabsf(D_80161578[i].z * 0.5f) + 100.0f))) { + ((D_display_80161578[i].z > 300.0f) || (D_display_80161578[i].z < -8000.0f) || + (fabsf(D_display_80161578[i].x) > (fabsf(D_display_80161578[i].z * 0.5f) + 100.0f)) || + (fabsf(D_display_80161578[i].y)) > (fabsf(D_display_80161578[i].z * 0.5f) + 100.0f))) { - D_80177B00[player->num][i] = 0; + D_ctx_80177B00[player->num][i] = 0; } } } } - if (!func_800563B4(player->num, arg1)) { + if (!func_display_800563B4(player->num, arg1)) { Matrix_Pop(&gGfxMatrix); return; } @@ -1228,14 +1222,14 @@ void func_800564C0(Player* player, s32 arg1) { } else if (player->form == FORM_ON_FOOT) { Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, player->pos.x, player->pos.y, player->unk_138 + player->unk_144, 1); - if (!func_800563B4(player->num, arg1)) { + if (!func_display_800563B4(player->num, arg1)) { Matrix_Pop(&gGfxMatrix); Matrix_Pop(&gGfxMatrix); return; } Matrix_Pop(&gGfxMatrix); - Matrix_Translate(gCalcMatrix, player->pos.x, player->pos.y + D_8017847C, player->unk_138 + player->unk_144, - 0); + Matrix_Translate(gCalcMatrix, player->pos.x, player->pos.y + D_ctx_8017847C, + player->unk_138 + player->unk_144, 0); Matrix_RotateY(gCalcMatrix, (player->unk_114 + player->unk_0E8 + player->unk_134 + 180.0f) * M_DTOR, 1); Matrix_RotateX(gCalcMatrix, -((player->unk_120 + player->unk_0E4 + player->unk_134) * M_DTOR), 1); Matrix_RotateZ(gCalcMatrix, -((player->unk_0F8 + player->unk_0F0 + player->unk_134) * M_DTOR), 1); @@ -1244,19 +1238,19 @@ void func_800564C0(Player* player, s32 arg1) { Matrix_Translate(gGfxMatrix, player->pos.x, player->pos.y, player->unk_138 + player->unk_144, 1); if (gVersusMode) { for (i = 0; i < gCamCount; i++) { - if (D_80177B00[player->num][i] != 0) { - Matrix_MultVec3f(gGfxMatrix, &sp50, &D_80161578[i]); + if (D_ctx_80177B00[player->num][i] != 0) { + Matrix_MultVec3f(gGfxMatrix, &sp50, &D_display_80161578[i]); if ((i == gPlayerNum) && - ((D_80161578[i].z > 300.0f) || (D_80161578[i].z < -8000.0f) || - (fabsf(D_80161578[i].x) > (fabsf(D_80161578[i].z * 0.5f) + 100.0f)) || - (fabsf(D_80161578[i].y) > (fabsf(D_80161578[i].z * 0.5f) + 100.0f)))) { + ((D_display_80161578[i].z > 300.0f) || (D_display_80161578[i].z < -8000.0f) || + (fabsf(D_display_80161578[i].x) > (fabsf(D_display_80161578[i].z * 0.5f) + 100.0f)) || + (fabsf(D_display_80161578[i].y) > (fabsf(D_display_80161578[i].z * 0.5f) + 100.0f)))) { - D_80177B00[player->num][i] = 0; + D_ctx_80177B00[player->num][i] = 0; } } } } - if (!func_800563B4(player->num, arg1)) { + if (!func_display_800563B4(player->num, arg1)) { Matrix_Pop(&gGfxMatrix); return; } @@ -1290,40 +1284,40 @@ void func_800564C0(Player* player, s32 arg1) { break; } if (arg1 != 0) { - func_800596C0(); + func_edisplay_800596C0(); } else { - Matrix_Copy(&D_80161418[player->num], gGfxMatrix); + Matrix_Copy(&D_display_80161418[player->num], gGfxMatrix); } - func_80054280(player, arg1); + func_display_80054280(player, arg1); Matrix_Pop(&gGfxMatrix); } } -f32 D_800CA334[] = { +f32 D_display_800CA334[] = { 0.02f, 0.06f, 0.08f, 0.05f, 0.04f, 0.03f, 0.06f, 0.04f, }; -Gfx* D_800CA354[] = { +Gfx* D_display_800CA354[] = { D_1024570, D_1024570, D_10246D0, D_1024410, D_1024410, D_1024410, D_1024410, D_1024410, D_D000000, D_D00B5C0, D_D00B720, }; -f32 D_800CA380 = 0.0f; -f32 D_800CA384 = 0.0f; -f32 D_800CA388 = -300.0f; -f32 D_800CA38C[] = { +f32 D_display_800CA380 = 0.0f; +f32 D_display_800CA384 = 0.0f; +f32 D_display_800CA388 = -300.0f; +f32 D_display_800CA38C[] = { 0.0f, -300.0f, -150.0f, -50.0f, }; -void func_80056E2C(Player* player) { +void func_display_80056E2C(Player* player) { f32 sp34; f32 sp30; f32 sp2C; if ((player->unk_234 != 0) && (player->unk_240 == 0)) { - sp34 = D_800CA334[gGameFrameCount & 7]; - sp30 = D_800CA334[(gGameFrameCount + 4) & 7]; + sp34 = D_display_800CA334[gGameFrameCount & 7]; + sp30 = D_display_800CA334[(gGameFrameCount + 4) & 7]; if (player->unk_1D4 != 0) { sp34 = sp30 = 0.0f; } @@ -1358,27 +1352,27 @@ void func_80056E2C(Player* player) { Matrix_RotateY(gGfxMatrix, player->unk_0E8 * M_DTOR, 1); Matrix_RotateZ(gGfxMatrix, (-player->unk_12C - player->unk_130) * M_DTOR, 1); } - func_80054300(player); + func_display_80054300(player); Matrix_Pop(&gGfxMatrix); } } -void func_80057248(void) { +void func_display_80057248(void) { s32 i; f32 var_fs0; if (!(gGameFrameCount & 4)) { RCP_SetupDL_40(); - for (i = 0; i < ARRAY_COUNT(D_80177E98); i++) { - if (D_80177E98[i].z < 0.0f) { - var_fs0 = (VEC3F_MAG(&D_80177E98[i])) * 0.0015f; + for (i = 0; i < ARRAY_COUNT(D_ctx_80177E98); i++) { + if (D_ctx_80177E98[i].z < 0.0f) { + var_fs0 = (VEC3F_MAG(&D_ctx_80177E98[i])) * 0.0015f; if (var_fs0 > 100.0f) { var_fs0 = 100.0f; } else if (var_fs0 < 1.0f) { var_fs0 = 1.0f; } Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, D_80177E98[i].x, D_80177E98[i].y, D_80177E98[i].z, 1); + Matrix_Translate(gGfxMatrix, D_ctx_80177E98[i].x, D_ctx_80177E98[i].y, D_ctx_80177E98[i].z, 1); Matrix_Scale(gGfxMatrix, var_fs0 * 0.25f, var_fs0 * 0.25f, 1.0f, 1); if ((i == 0) && (gCurrentLevel == LEVEL_SECTOR_Z)) { Matrix_Scale(gGfxMatrix, 2.0f, 2.0f, 1.0f, 1); @@ -1389,25 +1383,25 @@ void func_80057248(void) { if ((i == 0) && (gCurrentLevel == LEVEL_SECTOR_Z)) { gSPDisplayList(gMasterDisp++, D_SZ_6004330); } else { - gSPDisplayList(gMasterDisp++, D_800CA354[i]); + gSPDisplayList(gMasterDisp++, D_display_800CA354[i]); } Matrix_Pop(&gGfxMatrix); } - D_80177E98[i].x = D_80177E98[i].y = 0; - D_80177E98[i].z = 100.0f; + D_ctx_80177E98[i].x = D_ctx_80177E98[i].y = 0; + D_ctx_80177E98[i].z = 100.0f; } gDPSetTextureFilter(gMasterDisp++, G_TF_BILERP); } } -void func_80057504(void) { +void func_display_80057504(void) { s32 i; s32 j; f32 var_fs0; for (i = 0; i < gCamCount; i++) { - if (D_80161578[i].z < 0.0f) { - var_fs0 = (VEC3F_MAG(&D_80161578[i])); + if (D_display_80161578[i].z < 0.0f) { + var_fs0 = (VEC3F_MAG(&D_display_80161578[i])); if (var_fs0 < 20000.0f) { var_fs0 *= 0.0015f; if (var_fs0 > 100.0f) { @@ -1417,14 +1411,15 @@ void func_80057504(void) { var_fs0 = 1.2f; } Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, D_80161578[i].x, D_80161578[i].y, D_80161578[i].z, 1); - if ((D_80177854 != 0x64) && (i == gPlayerNum)) { - Math_SmoothStepToF(&D_801615A8[i], 0.0f, 0.5f, 20.0f, 0); - Math_SmoothStepToF(&D_801615B8[i], 1.0, 0.5f, 0.2f, 0); + Matrix_Translate(gGfxMatrix, D_display_80161578[i].x, D_display_80161578[i].y, D_display_80161578[i].z, + 1); + if ((D_ctx_80177854 != 0x64) && (i == gPlayerNum)) { + Math_SmoothStepToF(&D_display_801615A8[i], 0.0f, 0.5f, 20.0f, 0); + Math_SmoothStepToF(&D_display_801615B8[i], 1.0, 0.5f, 0.2f, 0); } - var_fs0 *= D_801615B8[i]; + var_fs0 *= D_display_801615B8[i]; Matrix_Scale(gGfxMatrix, var_fs0 * 1.5f, var_fs0 * 1.5f, 1.0f, 1); - Matrix_RotateZ(gGfxMatrix, D_801615A8[i] * M_DTOR, 1); + Matrix_RotateZ(gGfxMatrix, D_display_801615A8[i] * M_DTOR, 1); Matrix_SetGfxMtx(&gMasterDisp); RCP_SetupDL(&gMasterDisp, 0x43); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255); @@ -1436,12 +1431,12 @@ void func_80057504(void) { } for (j = 0; j < gCamCount; j++) { - D_80161578[j].x = D_80161578[j].y = 0.f; - D_80161578[j].z = 100.0f; + D_display_80161578[j].x = D_display_80161578[j].y = 0.f; + D_display_80161578[j].z = 100.0f; } } -void func_80057814(Player* player) { +void func_display_80057814(Player* player) { Vec3f sp2C; Vec3f sp20; @@ -1451,7 +1446,7 @@ void func_80057814(Player* player) { sp2C.x = player->sfxSource[0]; sp2C.y = player->sfxSource[1]; sp2C.z = player->sfxSource[2]; - func_8005F0E8(player->sfxSource, &sp20); + func_edisplay_8005F0E8(player->sfxSource, &sp20); player->sfxVel[0] = player->sfxSource[0] - sp2C.x; player->sfxVel[1] = player->sfxSource[1] - sp2C.y; player->sfxVel[2] = player->sfxSource[2] - sp2C.z; @@ -1461,22 +1456,22 @@ void func_80057814(Player* player) { player->sfx.zRot = player->unk_0F8; } -void func_800578C4(Player* player) { +void func_display_800578C4(Player* player) { Vec3f sp4C = { 0.0f, 0.0f, -300.0f }; Vec3f sp40; f32 sp3C; f32 sp38; - switch (D_800CA220) { + switch (D_display_800CA220) { case 0: Math_SmoothStepToAngle(&player->wings.unk_30, 0.0f, 0.2f, 3.0f, 0.0f); Math_SmoothStepToAngle(&player->wings.unk_34, 0.0f, 0.2f, 3.0f, 0.0f); - D_801779D8.x = player->camEye.x; - D_801779D8.y = player->camEye.y; - D_801779D8.z = player->camEye.z; - D_801779E8.x = player->camAt.x; - D_801779E8.y = player->camAt.y; - D_801779E8.z = player->camAt.z; + D_ctx_801779D8.x = player->camEye.x; + D_ctx_801779D8.y = player->camEye.y; + D_ctx_801779D8.z = player->camEye.z; + D_ctx_801779E8.x = player->camAt.x; + D_ctx_801779E8.y = player->camAt.y; + D_ctx_801779E8.z = player->camAt.z; break; case 1: case 2: @@ -1498,24 +1493,24 @@ void func_800578C4(Player* player) { sp3C = 360.0f - sp3C; Math_SmoothStepToAngle(&player->wings.unk_30, sp38, 0.2f, 6.0f, 0.0f); Math_SmoothStepToAngle(&player->wings.unk_34, sp3C, 0.2f, 6.0f, 0.0f); - Math_SmoothStepToF(&D_800CA380, gControllerPress->stick_y * 0.75f, 0.1f, 2.0f, 0.0f); - Math_SmoothStepToF(&D_800CA384, gControllerPress->stick_x * 3.0f, 0.1f, 5.0f, 0.0f); - Math_SmoothStepToF(&D_800CA388, D_800CA38C[D_800CA220], 0.1f, 10.0f, 0.0f); - sp4C.z = D_800CA388; - Matrix_RotateX(gCalcMatrix, (player->unk_0E8 + D_800CA380) * M_DTOR, 0); - Matrix_RotateY(gCalcMatrix, (player->unk_0E4 + D_800CA384) * M_DTOR, 1); + Math_SmoothStepToF(&D_display_800CA380, gControllerPress->stick_y * 0.75f, 0.1f, 2.0f, 0.0f); + Math_SmoothStepToF(&D_display_800CA384, gControllerPress->stick_x * 3.0f, 0.1f, 5.0f, 0.0f); + Math_SmoothStepToF(&D_display_800CA388, D_display_800CA38C[D_display_800CA220], 0.1f, 10.0f, 0.0f); + sp4C.z = D_display_800CA388; + Matrix_RotateX(gCalcMatrix, (player->unk_0E8 + D_display_800CA380) * M_DTOR, 0); + Matrix_RotateY(gCalcMatrix, (player->unk_0E4 + D_display_800CA384) * M_DTOR, 1); Matrix_MultVec3f(gCalcMatrix, &sp4C, &sp40); - D_801779D8.x = player->pos.x + sp40.x; - D_801779D8.y = player->pos.y + sp40.y + 20.0f; - D_801779D8.z = player->unk_138 + sp40.z; - D_801779E8.x = (SIN_DEG(gGameFrameCount * 3.0f) * 3.0f) + player->pos.x; - D_801779E8.y = (COS_DEG(gGameFrameCount * 4.0f) * 3.0f) + player->pos.y; - D_801779E8.z = (SIN_DEG(gGameFrameCount * 3.5f) * 3.0f) + player->unk_138; + D_ctx_801779D8.x = player->pos.x + sp40.x; + D_ctx_801779D8.y = player->pos.y + sp40.y + 20.0f; + D_ctx_801779D8.z = player->unk_138 + sp40.z; + D_ctx_801779E8.x = (SIN_DEG(gGameFrameCount * 3.0f) * 3.0f) + player->pos.x; + D_ctx_801779E8.y = (COS_DEG(gGameFrameCount * 4.0f) * 3.0f) + player->pos.y; + D_ctx_801779E8.z = (SIN_DEG(gGameFrameCount * 3.5f) * 3.0f) + player->unk_138; break; } } -void func_80057D00(void) { +void func_display_80057D00(void) { s32 i; Vec3f sp78; Vec3f sp6C; @@ -1524,23 +1519,23 @@ void func_80057D00(void) { Player* opponent; Player* player = &gPlayer[gPlayerNum]; - D_800CA228 = 0; + D_display_800CA228 = 0; if (gHitCount > 511) { gHitCount = 511; } Matrix_Push(&gGfxMatrix); if ((gCurrentLevel == LEVEL_AQUAS) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3)) { - Math_SmoothStepToF(&D_800CA230, 0.01f, 0.2f, 0.002f, 0.0f); + Math_SmoothStepToF(&D_display_800CA230, 0.01f, 0.2f, 0.002f, 0.0f); } else { - Math_SmoothStepToF(&D_800CA230, 0.0f, 0.2f, 0.002f, 0.0f); + Math_SmoothStepToF(&D_display_800CA230, 0.0f, 0.2f, 0.002f, 0.0f); } Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 10.0f * M_DTOR, 1); - Matrix_Scale(gGfxMatrix, 1.0f + D_800CA230, 1.0f - D_800CA230, 1.0f, 1); + Matrix_Scale(gGfxMatrix, 1.0f + D_display_800CA230, 1.0f - D_display_800CA230, 1.0f, 1); Matrix_RotateZ(gGfxMatrix, -(f32) gGameFrameCount * 10.0f * M_DTOR, 1); - Matrix_Scale(gGfxMatrix, 1.0f + D_800CA230, 1.0f - D_800CA230, 1.0f, 1); + Matrix_Scale(gGfxMatrix, 1.0f + D_display_800CA230, 1.0f - D_display_800CA230, 1.0f, 1); Matrix_Push(&gGfxMatrix); - func_800B73E0(player); + func_play_800B73E0(player); Lights_SetOneLight(&gMasterDisp, gLight1x, gLight1y, gLight1z, gLight1R, gLight1G, gLight1B, gAmbientR, gAmbientG, gAmbientB); if (gLevelMode == LEVELMODE_ON_RAILS) { @@ -1550,35 +1545,35 @@ void func_80057D00(void) { sp78.x = player->camEye.x - player->pos.x; sp78.y = player->camEye.y - player->pos.y; sp78.z = player->camEye.z - (player->unk_138 + player->unk_144); - Matrix_MultVec3f(gCalcMatrix, &sp78, &D_801779D8); - D_801779D8.x += player->pos.x; - D_801779D8.y += player->pos.y; - D_801779D8.z += player->unk_138 + player->unk_144; + Matrix_MultVec3f(gCalcMatrix, &sp78, &D_ctx_801779D8); + D_ctx_801779D8.x += player->pos.x; + D_ctx_801779D8.y += player->pos.y; + D_ctx_801779D8.z += player->unk_138 + player->unk_144; sp78.x = player->camAt.x - player->pos.x; sp78.y = player->camAt.y - player->pos.y; sp78.z = player->camAt.z - (player->unk_138 + player->unk_144); - Matrix_MultVec3f(gCalcMatrix, &sp78, &D_801779E8); - D_801779E8.x += player->pos.x; - D_801779E8.y += player->pos.y; - D_801779E8.z += player->unk_138 + player->unk_144; + Matrix_MultVec3f(gCalcMatrix, &sp78, &D_ctx_801779E8); + D_ctx_801779E8.x += player->pos.x; + D_ctx_801779E8.y += player->pos.y; + D_ctx_801779E8.z += player->unk_138 + player->unk_144; if ((player->unk_238 != 0) && (player->unk_110 > 5.0f)) { - D_801779E8.x += SIN_DEG(gGameFrameCount * 150.0f) * player->unk_110 * 0.2f; + D_ctx_801779E8.x += SIN_DEG(gGameFrameCount * 150.0f) * player->unk_110 * 0.2f; } } else if (player->state_1C8 == PLAYERSTATE_1C8_7) { - func_800578C4(player); + func_display_800578C4(player); } else { - D_801779D8.x = player->camEye.x; - D_801779D8.y = player->camEye.y; - D_801779D8.z = player->camEye.z; - D_801779E8.x = player->camAt.x; - D_801779E8.y = player->camAt.y; - D_801779E8.z = player->camAt.z; + D_ctx_801779D8.x = player->camEye.x; + D_ctx_801779D8.y = player->camEye.y; + D_ctx_801779D8.z = player->camEye.z; + D_ctx_801779E8.x = player->camAt.x; + D_ctx_801779E8.y = player->camAt.y; + D_ctx_801779E8.z = player->camAt.z; } - player->unk_058 = -Math_Atan2F(D_801779D8.x - D_801779E8.x, D_801779D8.z - D_801779E8.z); - player->unk_05C = -Math_Atan2F(D_801779D8.y - D_801779E8.y, - sqrtf(SQ(D_801779D8.z - D_801779E8.z) + SQ(D_801779D8.x - D_801779E8.x))); + player->unk_058 = -Math_Atan2F(D_ctx_801779D8.x - D_ctx_801779E8.x, D_ctx_801779D8.z - D_ctx_801779E8.z); + player->unk_05C = -Math_Atan2F(D_ctx_801779D8.y - D_ctx_801779E8.y, sqrtf(SQ(D_ctx_801779D8.z - D_ctx_801779E8.z) + + SQ(D_ctx_801779D8.x - D_ctx_801779E8.x))); Matrix_RotateY(gCalcMatrix, -player->unk_058, 0); Matrix_RotateX(gCalcMatrix, player->unk_05C, 1); Matrix_RotateZ(gCalcMatrix, -player->unk_034 * M_DTOR, 1); @@ -1586,28 +1581,29 @@ void func_80057D00(void) { sp78.y = 100.0f; sp78.z = 0.0f; Matrix_MultVec3f(gCalcMatrix, &sp78, &sp6C); - if (D_80178410 != 0) { - D_80178428 = DEG_TO_RAD(gPlayer[0].unk_034); - func_800B6F50(D_801779D8.x, D_801779D8.y, D_801779D8.z, D_801779E8.x, D_801779E8.y, D_801779E8.z); - func_8003DAF0(); + if (D_ctx_80178410 != 0) { + D_ctx_80178428 = DEG_TO_RAD(gPlayer[0].unk_034); + func_play_800B6F50(D_ctx_801779D8.x, D_ctx_801779D8.y, D_ctx_801779D8.z, D_ctx_801779E8.x, D_ctx_801779E8.y, + D_ctx_801779E8.z); + func_bg_8003DAF0(); } - func_8003E1E8(); - func_80040450(); + func_bg_8003E1E8(); + func_bg_80040450(); Matrix_Push(&gGfxMatrix); - Matrix_LookAt(gGfxMatrix, D_801779D8.x, D_801779D8.y, D_801779D8.z, D_801779E8.x, D_801779E8.y, D_801779E8.z, - sp6C.x, sp6C.y, sp6C.z, 1); + Matrix_LookAt(gGfxMatrix, D_ctx_801779D8.x, D_ctx_801779D8.y, D_ctx_801779D8.z, D_ctx_801779E8.x, D_ctx_801779E8.y, + D_ctx_801779E8.z, sp6C.x, sp6C.y, sp6C.z, 1); if ((gLevelType == LEVELTYPE_PLANET) || (gCurrentLevel == LEVEL_BOLSE)) { if ((gCurrentLevel == LEVEL_TITANIA) && ((gPlayer[0].state_1C8 != PLAYERSTATE_1C8_2) || (gPlayer[0].unk_19C != 0))) { Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, 0.0f, D_8017847C, 0.0f, 1); + Matrix_Translate(gGfxMatrix, 0.0f, D_ctx_8017847C, 0.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); - func_i5_801B58AC(&gMasterDisp, D_80177CC8); - D_80177CC8 = 0.0f; + Ground_801B58AC(&gMasterDisp, D_ctx_80177CC8); + D_ctx_80177CC8 = 0.0f; Matrix_Pop(&gGfxMatrix); } else if (D_80161A88 != 2) { - D_8015F964 = 0; - func_80040CE4(); + D_bg_8015F964 = 0; + func_bg_80040CE4(); } } Lights_SetOneLight(&gMasterDisp, gLight2x, gLight2y, gLight2z, gLight2R, gLight2G, gLight2B, gAmbientR, gAmbientG, @@ -1616,9 +1612,9 @@ void func_80057D00(void) { sp60.x = opponent->pos.x; sp60.y = opponent->pos.y; sp60.z = opponent->unk_138; - func_8005F670(&sp60); - func_800564C0(opponent, 0); - func_80057814(opponent); + func_edisplay_8005F670(&sp60); + func_display_800564C0(opponent, 0); + func_display_80057814(opponent); } if ((D_80161A88 == 2) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_2)) { Lights_SetOneLight(&gMasterDisp, gLight2x, -1 * gLight2y, gLight2z, gLight2R, gLight2G, gLight2B, gAmbientR, @@ -1629,92 +1625,92 @@ void func_80057D00(void) { sp60.x = opponent->pos.x; sp60.y = opponent->pos.y; sp60.z = opponent->unk_138; - func_800564C0(opponent, 1); + func_display_800564C0(opponent, 1); } Matrix_Pop(&gGfxMatrix); } Lights_SetOneLight(&gMasterDisp, gLight1x, gLight1y, gLight1z, gLight1R, gLight1G, gLight1B, gAmbientR, gAmbientG, gAmbientB); - func_80060714(1); + func_edisplay_80060714(1); TexturedLine_Draw(); - D_80161410 = 1; - func_8003DA0C(); + D_display_80161410 = 1; + func_beam_8003DA0C(); if ((D_80161A88 == 2) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_2)) { Matrix_Push(&gGfxMatrix); Matrix_Scale(gGfxMatrix, 1.0f, -1.0f, 1.0f, 1); - D_80161410 = -1; - func_8003DA0C(); + D_display_80161410 = -1; + func_beam_8003DA0C(); Matrix_Pop(&gGfxMatrix); } - D_80161410 = -1; + D_display_80161410 = -1; if ((D_80161A88 == 2) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_2)) { Matrix_Push(&gGfxMatrix); Matrix_Scale(gGfxMatrix, 1.0f, -1.0f, 1.0f, 1); for (i = 0, opponent = gPlayer; i < gCamCount; i++, opponent++) { - if (D_800CA224[i] != 0) { - func_80055B58(opponent); - func_80056230(opponent); + if (D_display_800CA224[i] != 0) { + func_display_80055B58(opponent); + func_display_80056230(opponent); } Matrix_Pop(&gGfxMatrix); } } if (gCurrentLevel == LEVEL_AQUAS) { - func_8006089C(0); + func_edisplay_8006089C(0); } - if ((D_80161A88 == 2) || (D_80177AC8 != 0)) { - D_8015F964 = 1; - func_8006089C(1); - func_80040CE4(); + if ((D_80161A88 == 2) || (D_ctx_80177AC8 != 0)) { + D_bg_8015F964 = 1; + func_edisplay_8006089C(1); + func_bg_80040CE4(); } if ((gCurrentLevel != LEVEL_AQUAS) && (((gCurrentLevel != LEVEL_CORNERIA) && (gCurrentLevel != LEVEL_VENOM_ANDROSS)) || ((gPlayer[0].state_1C8 != PLAYERSTATE_1C8_7) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_2)))) { - func_8006089C(0); + func_edisplay_8006089C(0); } - D_80161410 = 1; + D_display_80161410 = 1; for (i = 0, opponent = gPlayer; i < gCamCount; i++, opponent++) { - if (D_800CA224[i] != 0) { - func_80056E2C(opponent); - func_80055B58(opponent); - func_80056230(opponent); + if (D_display_800CA224[i] != 0) { + func_display_80056E2C(opponent); + func_display_80055B58(opponent); + func_display_80056230(opponent); } } if ((gCurrentLevel == LEVEL_AQUAS) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3)) { - func_i3_801AA20C(); + Aquas_801AA20C(); } if (((gCurrentLevel == LEVEL_CORNERIA) || (gCurrentLevel == LEVEL_VENOM_ANDROSS)) && ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7) || (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_2))) { - func_8006089C(0); + func_edisplay_8006089C(0); } BonusText_DrawAll(); Matrix_Pop(&gGfxMatrix); - func_80057248(); - func_80057504(); - if (D_800CA228 != 0) { - func_80053B18(); + func_display_80057248(); + func_display_80057504(); + if (D_display_800CA228 != 0) { + func_display_80053B18(); } for (i = 0, opponent = gPlayer; i < gCamCount; i++, opponent++) { - if (D_800CA224[i] != 0) { - if (D_800D2860[i]) { - func_80053F7C(opponent); + if (D_display_800CA224[i] != 0) { + if (D_game_800D2860[i]) { + func_display_80053F7C(opponent); } if (opponent->form == FORM_LANDMASTER) { - func_80052B80(opponent); + func_display_80052B80(opponent); } else if (opponent->form == FORM_ON_FOOT) { - func_80052584(opponent); + func_display_80052584(opponent); } } } if ((gLevelMode == LEVELMODE_UNK_2) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3)) { - func_i6_801A6164(gPlayer); + Turret_801A6164(gPlayer); } - func_80040954(); + func_bg_80040954(); if ((gCamCount != 1) && ((player->state_1C8 == PLAYERSTATE_1C8_3) || (player->state_1C8 == PLAYERSTATE_1C8_5))) { - func_8008FA84(); - func_8008CA44(); + func_hud_8008FA84(); + func_hud_8008CA44(); } Matrix_Pop(&gGfxMatrix); - func_80051B30(); - D_800CA224[gPlayerNum] = 0; + func_display_80051B30(); + D_display_800CA224[gPlayerNum] = 0; Matrix_Pop(&gGfxMatrix); } diff --git a/src/main/fox_edata.c b/src/main/fox_edata.c index 7b450f17..b692f50f 100644 --- a/src/main/fox_edata.c +++ b/src/main/fox_edata.c @@ -2,9 +2,9 @@ #include "fox_edata_1C.c" -f32* D_800CF964[] = { NULL }; +f32* D_edata_800CF964[] = { NULL }; -void func_800594F0(Object_80* obj80) { +void func_edata_800594F0(Object_80* obj80) { RCP_SetupDL_57(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); Matrix_RotateY(gGfxMatrix, M_PI, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -12,7 +12,7 @@ void func_800594F0(Object_80* obj80) { RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } -void func_800595D0(Object_80* obj80) { +void func_edata_800595D0(Object_80* obj80) { RCP_SetupDL_57(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); Matrix_RotateY(gGfxMatrix, M_PI, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -20,5 +20,5 @@ void func_800595D0(Object_80* obj80) { RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } -void func_800596B0(Actor* actor) { +void func_edata_800596B0(Actor* actor) { } diff --git a/src/main/fox_edata_1C.c b/src/main/fox_edata_1C.c index f83133b1..aab57d35 100644 --- a/src/main/fox_edata_1C.c +++ b/src/main/fox_edata_1C.c @@ -22,95 +22,95 @@ #include "assets/ast_area_6.h" #include "assets/ast_zoness.h" -f32 D_800CBE70[] = { +f32 D_edata_800CBE70[] = { 1.0f, 0.0f, 50.0f, 0.0f, 25.0f, 0.0f, 25.0f, }; -f32 D_800CBE8C[] = { +f32 D_edata_800CBE8C[] = { 1.0f, 0.0f, 50.0f, 0.0f, 50.0f, 0.0f, 50.0f, }; -f32 D_800CBEA8[] = { +f32 D_edata_800CBEA8[] = { 1.0f, 0.0f, 75.0f, 0.0f, 75.0f, 0.0f, 75.0f, }; -f32 D_800CBEC4[] = { +f32 D_edata_800CBEC4[] = { 1.0f, 0.0f, 100.0f, 0.0f, 100.0f, 0.0f, 100.0f, }; -f32 D_800CBEE0[] = { +f32 D_edata_800CBEE0[] = { 1.0f, 0.0f, 150.0f, 0.0f, 150.0f, 0.0f, 150.0f, }; -f32 D_800CBEFC[] = { +f32 D_edata_800CBEFC[] = { 1.0f, 0.0f, 200.0f, 0.0f, 200.0f, 0.0f, 200.0f, }; -f32 D_800CBF18[] = { +f32 D_edata_800CBF18[] = { 1.0f, -113.0f, 61.0f, 98.0f, 100.0f, 0.0f, 219.0f, }; -f32 D_800CBF34[] = { +f32 D_edata_800CBF34[] = { 0.0f, }; -f32 D_800CBF38[] = { +f32 D_edata_800CBF38[] = { 1.0f, -40.0f, 40.0f, 0.0f, 180.0f, 0.0f, 180.0f, }; -f32 D_800CBF54[] = { +f32 D_edata_800CBF54[] = { 1.0f, 0.0f, 120.0f, 0.0f, 120.0f, 0.0f, 120.0f, }; -f32 D_800CBF70[] = { +f32 D_edata_800CBF70[] = { 1.0f, -40.0f, 100.0f, 0.0f, 100.0f, 0.0f, 100.0f, }; -f32 D_800CBF8C[] = { +f32 D_edata_800CBF8C[] = { 1.0f, 0.0f, 100.0f, 0.0f, 1200.0f, 0.0f, 1200.0f, }; -f32 D_800CBFA8[] = { +f32 D_edata_800CBFA8[] = { 1.0f, 0.0f, 120.0f, 0.0f, 120.0f, 0.0f, 120.0f, 0.0f, }; -f32 D_800CBFC8[] = { +f32 D_edata_800CBFC8[] = { 1.0f, 0.0f, 120.0f, 0.0f, 120.0f, 0.0f, 120.0f, }; -f32 D_800CBFE4[] = { +f32 D_edata_800CBFE4[] = { 1.0f, 0.0f, 40.0f, 0.0f, 40.0f, 0.0f, 40.0f, }; -f32 D_800CC000[] = { +f32 D_edata_800CC000[] = { 1.0f, 0.0f, 50.0f, 0.0f, 50.0f, 0.0f, 50.0f, }; -f32 D_800CC01C[] = { +f32 D_edata_800CC01C[] = { 1.0f, 0.0f, 40.0f, 0.0f, 40.0f, 0.0f, 40.0f, }; -f32 D_800CC038[] = { +f32 D_edata_800CC038[] = { 1.0f, 0.0f, 40.0f, 0.0f, 40.0f, 0.0f, 40.0f, }; -f32 D_800CC054[] = { +f32 D_edata_800CC054[] = { 1.0f, 0.0f, 140.0f, 0.0f, 170.0f, 0.0f, 140.0f, }; -f32 D_800CC070[] = { +f32 D_edata_800CC070[] = { 4.0f, 0.0f, 140.0f, -675.0f, 140.0f, 0.0f, 810.0f, 0.0f, 140.0f, 675.0f, 140.0f, 0.0f, 810.0f, 0.0f, 140.0f, 0.0f, 810.0f, 675.0f, 140.0f, 0.0f, 140.0f, 0.0f, 810.0f, -675.0f, 140.0f, }; -f32 D_800CC0D4[] = { +f32 D_edata_800CC0D4[] = { 1.0f, 0.0f, 140.0f, 0.0f, 140.0f, 0.0f, 1800.0f, }; -f32 D_800CC0F0[] = { +f32 D_edata_800CC0F0[] = { 2.0f, 0.0f, 140.0f, 0.0f, 140.0f, 0.0f, 1800.0f, 1.0f, 141.0f, 1.0f, 1800.0f, 1.0f, 140.0f, }; // clang-format off -ObjectInfo D_800CC124[0x190] = { +ObjectInfo D_edata_800CC124[0x190] = { /* OBJ_80_0, */ {(void*) D_CO_6015F00, 0, (ObjectFunc) NULL, D_CO_603E3E0, 800.0f, 0, 0, 39, 0, 0.0f, 0 }, - /* OBJ_80_1, */ {(void*) D_CO_602E9E0, 0, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_2, */ {(void*) D_CO_601BEC0, 0, (ObjectFunc) NULL, D_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_3, */ {(void*) D_CO_602E7A0, 0, (ObjectFunc) NULL, D_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_4, */ {(void*) D_CO_60244A0, 0, (ObjectFunc) NULL, D_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_5, */ {(void*) D_CO_602E570, 0, (ObjectFunc) NULL, D_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_1, */ {(void*) D_CO_602E9E0, 0, (ObjectFunc) NULL, D_edata_800CBF34, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_2, */ {(void*) D_CO_601BEC0, 0, (ObjectFunc) NULL, D_edata_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_3, */ {(void*) D_CO_602E7A0, 0, (ObjectFunc) NULL, D_edata_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_4, */ {(void*) D_CO_60244A0, 0, (ObjectFunc) NULL, D_edata_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_5, */ {(void*) D_CO_602E570, 0, (ObjectFunc) NULL, D_edata_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_6, */ {(void*) D_CO_60132B0, 0, (ObjectFunc) NULL, D_CO_603DCA4, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_7, */ {(void*) D_CO_602E080, 0, (ObjectFunc) NULL, D_CO_603DD40, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_8, */ {(void*) D_CO_60164F0, 0, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_9, */ {(void*) D_CO_6014500, 0, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_8, */ {(void*) D_CO_60164F0, 0, (ObjectFunc) NULL, D_edata_800CBF34, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_9, */ {(void*) D_CO_6014500, 0, (ObjectFunc) NULL, D_edata_800CBF34, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_10, */ {(void*) D_CO_602D5F0, 0, (ObjectFunc) NULL, D_CO_603DDF0, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, /* OBJ_80_11, */ {(void*) D_CO_601A7D0, 0, (ObjectFunc) NULL, D_CO_603DE8C, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, /* OBJ_80_12, */ {(void*) D_CO_6014B50, 0, (ObjectFunc) NULL, D_CO_603DEF4, 500.0f, 0, 0, 39, 0, 0.0f, 0 }, /* OBJ_80_13, */ {(void*) D_CO_6016580, 0, (ObjectFunc) NULL, D_CO_603DF8C, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, - /* OBJ_80_14, */ {(void*) D_CO_601B560, 0, (ObjectFunc) func_80066EA8, D_CO_603DFDC, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, - /* OBJ_80_15, */ {(void*) D_CO_60361F0, 0, (ObjectFunc) func_80066EA8, D_CO_603E014, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, - /* OBJ_80_16, */ {(void*) D_CO_6018E80, 0, (ObjectFunc) func_80066EA8, D_CO_603E030, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, - /* OBJ_80_17, */ {(void*) D_CO_6035F10, 0, (ObjectFunc) func_80066EA8, D_CO_603E09C, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, - /* OBJ_80_18, */ {(void*) func_i1_8018753C, 1, (ObjectFunc) func_i1_80187530, D_CO_603E98C, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, + /* OBJ_80_14, */ {(void*) D_CO_601B560, 0, (ObjectFunc) func_enmy_80066EA8, D_CO_603DFDC, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, + /* OBJ_80_15, */ {(void*) D_CO_60361F0, 0, (ObjectFunc) func_enmy_80066EA8, D_CO_603E014, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, + /* OBJ_80_16, */ {(void*) D_CO_6018E80, 0, (ObjectFunc) func_enmy_80066EA8, D_CO_603E030, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, + /* OBJ_80_17, */ {(void*) D_CO_6035F10, 0, (ObjectFunc) func_enmy_80066EA8, D_CO_603E09C, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, + /* OBJ_80_18, */ {(void*) Corneria_8018753C, 1, (ObjectFunc) Corneria_80187530, D_CO_603E98C, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, /* OBJ_80_19, */ {(void*) D_CO_60153B0, 0, (ObjectFunc) NULL, D_CO_603E118, 100.0f, 0, 0, 39, 0, 0.0f, 0 }, /* OBJ_80_20, */ {(void*) D_CO_601F5A0, 0, (ObjectFunc) NULL, D_CO_603E14C, 500.0f, 0, 0, 39, 0, 0.0f, 0 }, /* OBJ_80_21, */ {(void*) D_CO_60137B0, 0, (ObjectFunc) NULL, D_CO_603E1B4, 400.0f, 0, 0, 39, 0, 0.0f, 0 }, @@ -121,43 +121,43 @@ ObjectInfo D_800CC124[0x190] = { /* OBJ_80_26, */ {(void*) D_CO_6010A50, 0, (ObjectFunc) NULL, D_CO_603EA74, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_27, */ {(void*) D_CO_60143E0, 0, (ObjectFunc) NULL, D_CO_603EAE0, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_28, */ {(void*) D_CO_6014A20, 0, (ObjectFunc) NULL, D_CO_603EB0C, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_29, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_60064FC, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_30, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_6006518, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_31, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_6006564, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_32, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_60065B0, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_33, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_60065FC, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_34, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_6006648, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_35, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_6006694, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_36, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_60066E0, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_37, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_600672C, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_38, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_6006778, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_39, */ {(void*) func_80059AEC, 1, (ObjectFunc) func_8006D350, D_800CBF34, 6000.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_40, */ {(void*) func_80059F68, 1, (ObjectFunc) func_80066D5C, D_CO_603E4A4, 1000.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_41, */ {(void*) func_80059FDC, 1, (ObjectFunc) func_80066EA8, D_CO_603E4DC, 300.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_42, */ {(void*) func_80059BBC, 1, (ObjectFunc) func_8006B95C, D_CO_603E514, 1000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_29, */ {(void*) func_edisplay_80059B20, 1, (ObjectFunc) func_enmy_800652CC, D_TI_60064FC, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_30, */ {(void*) func_edisplay_80059B20, 1, (ObjectFunc) func_enmy_800652CC, D_TI_6006518, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_31, */ {(void*) func_edisplay_80059B20, 1, (ObjectFunc) func_enmy_800652CC, D_TI_6006564, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_32, */ {(void*) func_edisplay_80059B20, 1, (ObjectFunc) func_enmy_800652CC, D_TI_60065B0, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_33, */ {(void*) func_edisplay_80059B20, 1, (ObjectFunc) func_enmy_800652CC, D_TI_60065FC, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_34, */ {(void*) func_edisplay_80059B20, 1, (ObjectFunc) func_enmy_800652CC, D_TI_6006648, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_35, */ {(void*) func_edisplay_80059B20, 1, (ObjectFunc) func_enmy_800652CC, D_TI_6006694, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_36, */ {(void*) func_edisplay_80059B20, 1, (ObjectFunc) func_enmy_800652CC, D_TI_60066E0, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_37, */ {(void*) func_edisplay_80059B20, 1, (ObjectFunc) func_enmy_800652CC, D_TI_600672C, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_38, */ {(void*) func_edisplay_80059B20, 1, (ObjectFunc) func_enmy_800652CC, D_TI_6006778, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_39, */ {(void*) func_edisplay_80059AEC, 1, (ObjectFunc) func_enmy2_8006D350, D_edata_800CBF34, 6000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_40, */ {(void*) func_edisplay_80059F68, 1, (ObjectFunc) func_enmy_80066D5C, D_CO_603E4A4, 1000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_41, */ {(void*) func_edisplay_80059FDC, 1, (ObjectFunc) func_enmy_80066EA8, D_CO_603E4DC, 300.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_42, */ {(void*) func_edisplay_80059BBC, 1, (ObjectFunc) func_enmy2_8006B95C, D_CO_603E514, 1000.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_43, */ {(void*) D_ZO_6024AC0, 0, (ObjectFunc) NULL, D_ZO_602B9EC, 200.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_44, */ {(void*) D_ZO_600F560, 0, (ObjectFunc) NULL, D_ZO_602BA20, 1500.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_45, */ {(void*) D_ZO_600EC90, 0, (ObjectFunc) NULL, D_ZO_602BAE4, 1500.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_46, */ {(void*) D_ZO_600E820, 0, (ObjectFunc) NULL, D_ZO_602BBD8, 1500.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_47, */ {(void*) D_ZO_601FCB0, 0, (ObjectFunc) NULL, D_ZO_602BC54, 500.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_48, */ {(void*) func_800594F0, 1, (ObjectFunc) NULL, D_VE1_601B4E0, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_49, */ {(void*) func_800595D0, 1, (ObjectFunc) NULL, D_VE1_601B4FC, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_48, */ {(void*) func_edata_800594F0, 1, (ObjectFunc) NULL, D_VE1_601B4E0, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_49, */ {(void*) func_edata_800595D0, 1, (ObjectFunc) NULL, D_VE1_601B4FC, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_50, */ {(void*) D_VE1_6007410, 0, (ObjectFunc) NULL, D_VE1_601B518, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_51, */ {(void*) D_VE1_6006F50, 0, (ObjectFunc) NULL, D_VE1_601B584, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_52, */ {(void*) D_VE1_6005780, 0, (ObjectFunc) func_i1_80193540, D_VE1_601B5F4, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_52, */ {(void*) D_VE1_6005780, 0, (ObjectFunc) Venom1_80193540, D_VE1_601B5F4, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_53, */ {(void*) D_AQ_6003610, 0, (ObjectFunc) NULL, D_VE1_601B644, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_54, */ {(void*) D_CO_6000E00, 0, (ObjectFunc) func_8006AA98, D_CO_603E0EC, 1000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_54, */ {(void*) D_CO_6000E00, 0, (ObjectFunc) func_enmy2_8006AA98, D_CO_603E0EC, 1000.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_55, */ {(void*) D_CO_6013B50, 0, (ObjectFunc) NULL, D_CO_603E88C, 1000.0f, 0, 0, 41, 0, 0.0f, 0 }, - /* OBJ_80_56, */ {(void*) func_i1_8018F31C, 2, (ObjectFunc) func_i1_8018F044, D_CO_603E8A8, 1000.0f, 0, 0, 39, 0, 0.0f, 0 }, - /* OBJ_80_57, */ {(void*) func_i5_8018F8B8, 1, (ObjectFunc) func_i5_8018F4D8, D_TI_6006BF0, 800.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_56, */ {(void*) Corneria_8018F31C, 2, (ObjectFunc) Corneria_8018F044, D_CO_603E8A8, 1000.0f, 0, 0, 39, 0, 0.0f, 0 }, + /* OBJ_80_57, */ {(void*) Titania_8018F8B8, 1, (ObjectFunc) Titania_8018F4D8, D_TI_6006BF0, 800.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_58, */ {(void*) D_TI1_700BE00, 0, (ObjectFunc) NULL, D_TI_6006C44, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_59, */ {(void*) D_MA_6024010, 0, (ObjectFunc) NULL, D_MA_603626C, 300.0f, 0, 0, 5, 0, 0.0f, 0 }, /* OBJ_80_60, */ {(void*) D_MA_6027180, 0, (ObjectFunc) NULL, D_MA_6036288, 400.0f, 0, 0, 5, 0, 0.0f, 0 }, - /* OBJ_80_61, */ {(void*) func_i5_801A2A78, 1, (ObjectFunc) NULL, D_MA_60362A4, 200.0f, 0, 0, 5, 0, 0.0f, 0 }, - /* OBJ_80_62, */ {(void*) D_MA_60270E0, 0, (ObjectFunc) NULL, D_800CBF34, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_61, */ {(void*) Macbeth_801A2A78, 1, (ObjectFunc) NULL, D_MA_60362A4, 200.0f, 0, 0, 5, 0, 0.0f, 0 }, + /* OBJ_80_62, */ {(void*) D_MA_60270E0, 0, (ObjectFunc) NULL, D_edata_800CBF34, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, /* OBJ_80_63, */ {(void*) D_MA_6013960, 0, (ObjectFunc) NULL, D_MA_6036894, 500.0f, 0, 0, 5, 0, 0.0f, 0 }, /* OBJ_80_64, */ {(void*) D_MA_600AF40, 0, (ObjectFunc) NULL, D_MA_60368E0, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_65, */ {(void*) func_i5_801A6608, 1, (ObjectFunc) NULL, D_MA_6036724, 400.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_65, */ {(void*) Macbeth_801A6608, 1, (ObjectFunc) NULL, D_MA_6036724, 400.0f, 0, 0, 0, 0, 0.0f, 0 }, /* OBJ_80_66, */ {(void*) D_MA_601F1D0, 0, (ObjectFunc) NULL, D_MA_60362D8, 2500.0f, 0, 0, 5, 0, 0.0f, 0 }, /* OBJ_80_67, */ {(void*) D_MA_60238F0, 0, (ObjectFunc) NULL, D_MA_6036328, 2000.0f, 0, 0, 5, 0, 0.0f, 0 }, /* OBJ_80_68, */ {(void*) D_MA_601B7C0, 0, (ObjectFunc) NULL, D_MA_60362F4, 2500.0f, 0, 0, 5, 0, 0.0f, 0 }, @@ -168,45 +168,45 @@ ObjectInfo D_800CC124[0x190] = { /* OBJ_80_73, */ {(void*) D_MA_6030630, 0, (ObjectFunc) NULL, D_MA_6036410, 1100.0f, 0, 0, 0, 0, 0.0f, 0 }, /* OBJ_80_74, */ {(void*) D_MA_602DC20, 0, (ObjectFunc) NULL, D_MA_603643C, 1000.0f, 0, 0, 0, 0, 0.0f, 0 }, /* OBJ_80_75, */ {(void*) D_MA_601B0D0, 0, (ObjectFunc) NULL, D_MA_6036760, 3000.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_76, */ {(void*) D_MA_60075D0, 0, (ObjectFunc) NULL, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_77, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_MA_6036344, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_78, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_79, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_80, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_81, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_82, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_83, */ {(void*) func_i5_801A3240, 1, (ObjectFunc) func_i5_801A2DD8, D_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_84, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_85, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_86, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_87, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_88, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_89, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_90, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_91, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_92, */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_93, */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_94, */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_95, */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_96, */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_97, */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_98, */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_99, */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_100 */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_101 */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_102 */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_103 */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_104 */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) func_i5_801A0BD8, D_MA_6036594, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_105 */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_MA_6036204, 1300.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_76, */ {(void*) D_MA_60075D0, 0, (ObjectFunc) NULL, D_edata_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_77, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, D_MA_6036344, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_78, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, D_edata_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_79, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, D_edata_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_80, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, D_edata_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_81, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, D_edata_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_82, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, D_edata_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_83, */ {(void*) Macbeth_801A3240, 1, (ObjectFunc) Macbeth_801A2DD8, D_edata_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_84, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, D_edata_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_85, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, D_edata_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_86, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, D_edata_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_87, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, D_edata_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_88, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, D_edata_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_89, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, D_edata_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_90, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, D_edata_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_91, */ {(void*) Macbeth_801A2B24, 1, (ObjectFunc) NULL, D_edata_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_92, */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, D_edata_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_93, */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, D_edata_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_94, */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, D_edata_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_95, */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, D_edata_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_96, */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, D_edata_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_97, */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, D_edata_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_98, */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, D_edata_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_99, */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, D_edata_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_100 */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, D_edata_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_101 */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, D_edata_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_102 */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, D_edata_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_103 */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, D_edata_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_104 */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) Macbeth_801A0BD8, D_MA_6036594, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_105 */ {(void*) Macbeth_801A23AC, 1, (ObjectFunc) NULL, D_MA_6036204, 1300.0f, 0, 0, 0, 0, 0.0f, 0 }, /* OBJ_80_106 */ {(void*) D_SY_60097E0, 0, (ObjectFunc) NULL, D_SY_6034478, 4000.0f, 0, 0, 41, 0, 0.0f, 0 }, /* OBJ_80_107 */ {(void*) D_SY_601D730, 0, (ObjectFunc) NULL, D_SY_603450C, 4000.0f, 0, 0, 41, 0, 0.0f, 0 }, /* OBJ_80_108 */ {(void*) D_SY_60102C0, 0, (ObjectFunc) NULL, D_SY_6034588, 4000.0f, 0, 0, 41, 0, 0.0f, 0 }, - /* OBJ_80_109 */ {(void*) D_SY_60036A0, 0, (ObjectFunc) func_i6_801A4E44, D_SY_6034664, 4000.0f, 0, 0, 41, 0, 0.0f, 0 }, + /* OBJ_80_109 */ {(void*) D_SY_60036A0, 0, (ObjectFunc) SectorY_801A4E44, D_SY_6034664, 4000.0f, 0, 0, 41, 0, 0.0f, 0 }, /* OBJ_80_110 */ {(void*) D_SY_6005360, 0, (ObjectFunc) NULL, D_SY_6034770, 4000.0f, 0, 0, 41, 0, 0.0f, 0 }, - /* OBJ_80_111 */ {(void*) func_80074F90, 1, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_80_112 */ {(void*) D_SY_600F6C0, 0, (ObjectFunc) func_i6_801A52B8, D_SY_60347F0, 4000.0f, 0, 0, 41, 0, 0.0f, 0 }, - /* OBJ_80_113 */ {(void*) D_SY_601B610, 0, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_114 */ {(void*) D_SY_601C6A0, 0, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_111 */ {(void*) func_enmy2_80074F90, 1, (ObjectFunc) NULL, D_edata_800CBF34, 2000.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_112 */ {(void*) D_SY_600F6C0, 0, (ObjectFunc) SectorY_801A52B8, D_SY_60347F0, 4000.0f, 0, 0, 41, 0, 0.0f, 0 }, + /* OBJ_80_113 */ {(void*) D_SY_601B610, 0, (ObjectFunc) NULL, D_edata_800CBF34, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_114 */ {(void*) D_SY_601C6A0, 0, (ObjectFunc) NULL, D_edata_800CBF34, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_115 */ {(void*) D_SY_60188D0, 0, (ObjectFunc) NULL, D_SY_603486C, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_116 */ {(void*) D_SY_60034D0, 0, (ObjectFunc) NULL, D_SY_60347D4, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_117 */ {(void*) D_AQ_60231C0, 0, (ObjectFunc) NULL, D_AQ_6030C60, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, @@ -216,30 +216,30 @@ ObjectInfo D_800CC124[0x190] = { /* OBJ_80_121 */ {(void*) D_AQ_602B4C0, 0, (ObjectFunc) NULL, D_AQ_6030E14, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_122 */ {(void*) D_AQ_600EE10, 0, (ObjectFunc) NULL, D_AQ_6030E30_Hitbox, 2000.0f, 0, 0, 41, 0, 0.0f, 0 }, /* OBJ_80_123 */ {(void*) D_AQ_60120F0, 0, (ObjectFunc) NULL, D_AQ_6030E4C, 2000.0f, 0, 0, 41, 0, 0.0f, 0 }, - /* OBJ_80_124 */ {(void*) D_AQ_600EEF0, 0, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 41, 0, 0.0f, 0 }, + /* OBJ_80_124 */ {(void*) D_AQ_600EEF0, 0, (ObjectFunc) NULL, D_edata_800CBF34, 2000.0f, 0, 0, 41, 0, 0.0f, 0 }, /* OBJ_80_125 */ {(void*) D_AQ_600BF80, 0, (ObjectFunc) NULL, D_AQ_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_VE1_9005C80, 0, (ObjectFunc) func_i1_801924A8, D_VE1_601B678, 1000.0f, 0, 0, 42, 0, 0.0f, 0 }, + /* OBJ_80_126 */ {(void*) Aquas_801BE1FC, 1, (ObjectFunc) NULL, D_edata_800CBF34, 2000.0f, 0, 0, 41, 0, 0.0f, 0 }, + /* OBJ_80_127 */ {(void*) D_VE1_9005C80, 0, (ObjectFunc) Venom1_801924A8, D_VE1_601B678, 1000.0f, 0, 0, 42, 0, 0.0f, 0 }, /* OBJ_80_128 */ {(void*) D_VE1_9003F50, 0, (ObjectFunc) NULL, D_VE1_601B6C4, 3200.0f, 0, 0, 42, 0, 0.0f, 0 }, /* OBJ_80_129 */ {(void*) D_VE1_900F060, 0, (ObjectFunc) NULL, D_VE1_601B710, 3200.0f, 0, 0, 42, 0, 0.0f, 0 }, /* OBJ_80_130 */ {(void*) D_VE1_900F1D0, 0, (ObjectFunc) NULL, D_VE1_601B75C, 3200.0f, 0, 0, 42, 0, 0.0f, 0 }, - /* OBJ_80_131 */ {(void*) func_i6_801935D4, 1, (ObjectFunc) func_i6_8019356C, D_ANDROSS_C038BD8, 500.0f, 0, 0, 41, 0, 0.0f, 0 }, - /* OBJ_80_132 */ {(void*) func_i6_8019350C, 1, (ObjectFunc) func_i6_80193380, D_ANDROSS_C038A48, 500.0f, 0, 0, 41, 0, 0.0f, 0 }, + /* OBJ_80_131 */ {(void*) Andross_801935D4, 1, (ObjectFunc) Andross_8019356C, D_ANDROSS_C038BD8, 500.0f, 0, 0, 41, 0, 0.0f, 0 }, + /* OBJ_80_132 */ {(void*) Andross_8019350C, 1, (ObjectFunc) Andross_80193380, D_ANDROSS_C038A48, 500.0f, 0, 0, 41, 0, 0.0f, 0 }, /* OBJ_80_133 */ {(void*) D_TR_60030F0, 0, (ObjectFunc) NULL, D_TR_6009CC4, 1000.0f, 0, 0, 20, 0, 0.0f, 0 }, /* OBJ_80_134 */ {(void*) D_VE2_6003000, 0, (ObjectFunc) NULL, D_ANDROSS_C038BA4, 0.0f, 0, 0, 41, 1, 0.0f, 0 }, /* OBJ_80_135 */ {(void*) D_TI_6006890, 0, (ObjectFunc) NULL, D_ANDROSS_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 }, /* OBJ_80_136 */ {(void*) D_VE2_6002990, 0, (ObjectFunc) NULL, D_ANDROSS_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 }, - /* OBJ_80_137 */ {(void*) D_VE2_6004170, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 0, 1, 0.0f, 0 }, + /* OBJ_80_137 */ {(void*) D_VE2_6004170, 0, (ObjectFunc) NULL, D_edata_800CBF34, 0.0f, 0, 0, 0, 1, 0.0f, 0 }, /* OBJ_80_138 */ {(void*) D_versus_3017600, 0, (ObjectFunc) NULL, D_versus_302EE64, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_139 */ {(void*) D_versus_3017600, 0, (ObjectFunc) NULL, D_versus_302EE80, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_140 */ {(void*) D_versus_30173C0, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_141 */ {(void*) D_versus_30174E0, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_140 */ {(void*) D_versus_30173C0, 0, (ObjectFunc) NULL, D_edata_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_141 */ {(void*) D_versus_30174E0, 0, (ObjectFunc) NULL, D_edata_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_142 */ {(void*) D_versus_301B080, 0, (ObjectFunc) NULL, D_versus_302EE9C, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_143 */ {(void*) D_versus_3016B00, 0, (ObjectFunc) NULL, D_versus_302EE00, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_144 */ {(void*) D_versus_3013780, 0, (ObjectFunc) NULL, D_versus_302ED4C, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_145 */ {(void*) D_versus_3013580, 0, (ObjectFunc) NULL, D_versus_302ED98, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_146 */ {(void*) D_versus_3012ED0, 0, (ObjectFunc) NULL, D_versus_302EDB4, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_147 */ {(void*) NULL, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_80_147 */ {(void*) NULL, 0, (ObjectFunc) NULL, D_edata_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 }, /* OBJ_80_148 */ {(void*) D_FO_60079B0, 0, (ObjectFunc) NULL, D_FO_600FF80, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_149 */ {(void*) D_FO_6007D80, 0, (ObjectFunc) NULL, D_FO_600FFA0, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_150 */ {(void*) D_FO_6006310, 0, (ObjectFunc) NULL, D_FO_600FFC0, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, @@ -247,250 +247,250 @@ ObjectInfo D_800CC124[0x190] = { /* OBJ_80_152 */ {(void*) D_BO_600F4C0, 0, (ObjectFunc) NULL, D_BO_6011C10, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_153 */ {(void*) D_BO_600B8B0, 0, (ObjectFunc) NULL, D_BO_6011C48, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_154 */ {(void*) D_KA_600BAF0, 0, (ObjectFunc) NULL, D_KA_601115C, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_155 */ {(void*) NULL, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_80_156 */ {(void*) func_i6_80197CB8, 1, (ObjectFunc) NULL, D_SY_6034368, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_155 */ {(void*) NULL, 0, (ObjectFunc) NULL, D_edata_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_80_156 */ {(void*) SectorY_80197CB8, 1, (ObjectFunc) NULL, D_SY_6034368, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_157 */ {(void*) D_SZ_6001DA0, 0, (ObjectFunc) NULL, D_SZ_600924C, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_158 */ {(void*) D_SZ_6001360, 0, (ObjectFunc) NULL, D_SZ_60092E8, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_159 */ {(void*) D_VE2_6008370, 0, (ObjectFunc) NULL, D_VE2_601668C, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_80_160 */ {(void*) D_VE2_6010960, 0, (ObjectFunc) NULL, D_VE2_6016714, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_4C_161 */ {(void*) D_CO_602F7C0, 0, (ObjectFunc) func_80068FE0, D_CO_603E468, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_4C_162 */ {(void*) D_CO_601C9B0, 0, (ObjectFunc) func_80068FE0, D_CO_603E484, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_4C_163 */ {(void*) D_FO_600A420, 0, (ObjectFunc) func_80068FE0, D_FO_600FE9C, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_4C_164 */ {(void*) func_80059C40, 1, (ObjectFunc) NULL, D_800CBF34, 1800.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_4C_165 */ {(void*) D_CO_602DCA0, 0, (ObjectFunc) NULL, D_800CBF34, -100.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_4C_166 */ {(void*) D_CO_601F500, 0, (ObjectFunc) NULL, D_800CBF34, -100.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_4C_167 */ {(void*) func_80059C34, 1, (ObjectFunc) func_80066E8C, D_800CBF34, 500.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_4C_168 */ {(void*) func_80059850, 1, (ObjectFunc) NULL, D_800CBF34, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_4C_169 */ {(void*) D_TI_60023B0, 0, (ObjectFunc) func_i5_8018F038, D_TI_60068BC, 100.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_4C_170 */ {(void*) NULL, 1, (ObjectFunc) func_i1_801875A4, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_4C_171 */ {(void*) NULL, 1, (ObjectFunc) func_i1_801922DC, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_4C_172 */ {(void*) NULL, 1, (ObjectFunc) func_i1_80192358, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_4C_173 */ {(void*) NULL, 1, (ObjectFunc) func_i1_801923C0, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_4C_174 */ {(void*) NULL, 1, (ObjectFunc) func_i1_8019243C, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_4C_175 */ {(void*) NULL, 1, (ObjectFunc) NULL, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_ACTOR_176 */ {(void*) func_i1_8018BAAC, 2, (ObjectFunc) func_i1_8018AED0, D_CO_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 }, - /* OBJ_ACTOR_177 */ {(void*) func_i1_8018BBA4, 2, (ObjectFunc) func_i1_8018B15C, D_CO_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 }, - /* OBJ_ACTOR_178 */ {(void*) func_i1_8018BBF8, 2, (ObjectFunc) func_i1_8018B418, D_CO_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 }, - /* OBJ_ACTOR_179 */ {(void*) func_i1_8018BD7C, 2, (ObjectFunc) func_i1_8018B58C, D_CO_603E604, 500.0f, 0, 0, 39, 1, 0.0f, 1 }, - /* OBJ_ACTOR_180 */ {(void*) func_8005B6A4, 1, (ObjectFunc) func_80066A80, D_800CBF34, 1000.0f, 0, 0, 39, 0, 0.0f, 1 }, - /* OBJ_ACTOR_181 */ {(void*) D_ME_6018C00, 0, (ObjectFunc) func_i2_8018756C, D_ME_602F6EC, 200.0f, 0, 0, 39, 0, 1.0f, 1 }, - /* OBJ_ACTOR_182 */ {(void*) func_8005B71C, 1, (ObjectFunc) func_i2_80187650, D_ME_602F708, 100.0f, 0, 1, 39, 0, 1.0f, 1 }, - /* OBJ_ACTOR_183 */ {(void*) func_i2_8018DA6C, 1, (ObjectFunc) func_i2_8018D9EC, D_800CBF34, 100.0f, 0, 1, 39, 0, 0.0f, 1 }, - /* OBJ_ACTOR_184 */ {(void*) func_i2_8018DAEC, 1, (ObjectFunc) func_i2_8018D9EC, D_800CBF34, 100.0f, 0, 1, 39, 0, 0.0f, 1 }, - /* OBJ_ACTOR_185 */ {(void*) func_i2_8018DB6C, 1, (ObjectFunc) func_i2_8018D9EC, D_800CBF34, 100.0f, 0, 1, 39, 0, 0.0f, 1 }, - /* OBJ_ACTOR_186 */ {(void*) func_8005B7CC, 1, (ObjectFunc) func_i2_8018795C, D_ME_602F724, 200.0f, 0, 1, 39, 0, 1.0f, 1 }, - /* OBJ_ACTOR_187 */ {(void*) D_ME_6018450, 0, (ObjectFunc) func_i2_801877C4, D_ME_602F740, 200.0f, 0, 1, 39, 0, 1.0f, 1 }, - /* OBJ_ACTOR_188 */ {(void*) func_i3_801BEC74, 1, (ObjectFunc) func_i3_801BEC68, D_AQ_6030BE0, 200.0f, 0, 1, 39, 0, 1.0f, 1 }, - /* OBJ_ACTOR_189 */ {(void*) func_8005A094, 1, (ObjectFunc) func_8006C008, D_800CBF34, 0.0f, 0, 0, 39, 0, 0.0f, 0 }, - /* OBJ_ACTOR_190 */ {(void*) func_8005B848, 1, (ObjectFunc) func_800656D4, D_800CBFE4, 100.0f, 0, 1, 39, 0, 1.0f, 0 }, - /* OBJ_ACTOR_191 */ {(void*) func_8005B848, 1, (ObjectFunc) func_800656D4, D_800CBFE4, 100.0f, 0, 1, 39, 0, 1.0f, 0 }, - /* OBJ_ACTOR_192 */ {(void*) func_8005B9A4, 1, (ObjectFunc) func_8006654C, D_CO_603E54C, 200.0f, 0, 1, 39, 0, 50.0f, 1 }, - /* OBJ_ACTOR_193 */ {(void*) func_8005BA30, 1, (ObjectFunc) func_800669A0, D_CO_603E598, 100.0f, 0, 1, 39, 0, 0.0f, 0 }, - /* OBJ_ACTOR_194 */ {(void*) func_8006B74C, 1, (ObjectFunc) func_8006B094, D_800CC000, 200.0f, 0, 1, 39, 0, 0.0f, 1 }, - /* OBJ_ACTOR_195 */ {(void*) func_8004FEC0, 1, (ObjectFunc) func_8004F8AC, D_800CBF34, 20000.0f, 0, 1, 39, 0, 0.0f, 0 }, - /* OBJ_ACTOR_196 */ {(void*) func_80059BF0, 1, (ObjectFunc) func_8006BB78, D_CO_603E5B4, 200.0f, 0, 1, 39, 0, 1.0f, 1 }, - /* OBJ_ACTOR_197 */ {(void*) func_80035448, 1, (ObjectFunc) func_800319AC, D_800CC038, 20000.0f, 0, 1, 39, 1, 1.0f, 1 }, - /* OBJ_ACTOR_198 */ {(void*) func_80035448, 1, (ObjectFunc) func_80092EC0, D_800CC01C, 20000.0f, 0, 0, 39, 1, 0.0f, 0 }, - /* OBJ_ACTOR_199 */ {(void*) func_i6_80188448, 1, (ObjectFunc) func_i6_801880E4, D_800CBF34, 20000.0f, 0, 0, 39, 1, 0.0f, 0 }, - /* OBJ_ACTOR_200 */ {(void*) func_80074FF0, 1, (ObjectFunc) func_80072594, D_800CBF34, 2000.0f, 0, 1, 39, 0, 0.0f, 1 }, - /* OBJ_ACTOR_201 */ {(void*) func_800598E8, 1, (ObjectFunc) func_8006AC08, D_ME_602F684, 100.0f, 0, 1, 39, 0, 1.0f, 1 }, - /* OBJ_ACTOR_202 */ {(void*) func_80059A24, 1, (ObjectFunc) func_8006AD18, D_ME_602F6A0, 100.0f, 0, 1, 39, 0, 180.0f, 1 }, - /* OBJ_ACTOR_203 */ {(void*) func_i2_8018F884, 1, (ObjectFunc) func_i2_8018F330, D_800CBF34, 1000.0f, 0, 0, 39, 0, 0.0f, 0 }, - /* OBJ_ACTOR_204 */ {(void*) func_i6_801A4CB0, 1, (ObjectFunc) func_i6_801A3BD4, D_SY_603405C, 1000.0f, 0, 0, 39, 0, 1.0f, 1 }, - /* OBJ_ACTOR_205 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019C778, D_MA_60359C8, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_206 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_801AC438, D_MA_6035A48, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_207 */ {(void*) func_i5_801AC294, 2, (ObjectFunc) func_i5_801A7E7C, D_MA_603677C, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_208 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019EA60, D_MA_6035A14, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_209 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019D700, D_MA_6035AE0, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_210 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019CE88, D_MA_6035D9C, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_211 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019E410, D_MA_6035E04, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_212 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019FF9C, D_MA_60360C0, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_213 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019EE68, D_MA_6036154, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_214 */ {(void*) func_i5_801A43BC, 1, (ObjectFunc) func_i5_801A3E98, D_MA_6036458, 300.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_215 */ {(void*) func_i5_801A4A64, 1, (ObjectFunc) func_i5_801A46A0, D_MA_60364C0, 300.0f, 0, 1, 40, 1, 0.0f, 1 }, - /* OBJ_ACTOR_216 */ {(void*) func_i5_801A5F90, 1, (ObjectFunc) func_i5_801A5E54, D_MA_60366EC, 200.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_217 */ {(void*) func_i5_801A6100, 1, (ObjectFunc) func_i5_801A5FD0, D_MA_6036708, 200.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_218 */ {(void*) func_i5_801A6540, 1, (ObjectFunc) func_i5_801A6144, D_MA_6036728, 200.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_219 */ {(void*) func_i5_801A68EC, 1, (ObjectFunc) func_i5_801A67C8, D_MA_6036744, 300.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_220 */ {(void*) func_i5_801ADAC8, 1, (ObjectFunc) func_i5_801AD6F0, D_MA_6036930, 200.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_221 */ {(void*) func_i5_801AE2C0, 1, (ObjectFunc) func_i5_801ADD68, D_MA_603694C, 300.0f, 0, 0, 40, 1, 1.0f, 0 }, - /* OBJ_ACTOR_222 */ {(void*) func_i5_801AEEFC, 1, (ObjectFunc) func_i5_801AEC04, D_MA_6036968, 300.0f, 0, 0, 40, 1, 1.0f, 0 }, - /* OBJ_ACTOR_223 */ {(void*) func_i5_801A54E8, 1, (ObjectFunc) func_i5_801A4B24, D_MA_60364DC, 300.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_224 */ {(void*) NULL, 1, (ObjectFunc) func_i5_80189194, D_800CBF34, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, - /* OBJ_ACTOR_225 */ {(void*) D_TI1_700AB70, 0, (ObjectFunc) func_i5_8018AB44, D_TI_60064AC, 50.0f, 0, 0, 39, 1, 1.0f, 0 }, - /* OBJ_ACTOR_226 */ {(void*) func_i5_80189AFC, 1, (ObjectFunc) func_i5_801895B8, D_TI_60064C8, 300.0f, 0, 0, 39, 1, 70.0f, 1 }, - /* OBJ_ACTOR_227 */ {(void*) func_i5_8018E5B4, 1, (ObjectFunc) func_i5_8018E54C, D_TI_60067C4, 0.0f, 0, 0, 39, 1, 0.0f, 0 }, - /* OBJ_ACTOR_228 */ {(void*) func_i5_8018EF14, 1, (ObjectFunc) func_i5_8018E5F8, D_TI_6006808, 0.0f, 0, 0, 39, 1, 1.0f, 1 }, - /* OBJ_ACTOR_229 */ {(void*) func_i5_8018E2D8, 1, (ObjectFunc) func_i5_8018C8A8, D_TI_6006A3C, 1000.0f, 0, 0, 20, 1, 0.0f, 1 }, - /* OBJ_ACTOR_230 */ {(void*) func_i5_8018AABC, 1, (ObjectFunc) func_i5_8018A544, D_TI_600683C, 0.0f, 0, 1, 39, 1, 0.0f, 1 }, - /* OBJ_ACTOR_231 */ {(void*) func_i5_8018BE84, 1, (ObjectFunc) func_i5_8018B9D0, D_TI_6006858, 0.0f, 0, 0, 39, 1, 0.0f, 1 }, - /* OBJ_ACTOR_232 */ {(void*) func_i5_8018B6AC, 1, (ObjectFunc) func_i5_8018B268, D_TI_6006890, 0.0f, 0, 0, 39, 1, 20.0f, 1 }, - /* OBJ_ACTOR_233 */ {(void*) func_i5_8018A1C0, 1, (ObjectFunc) func_i5_80189CC8, D_TI_60068F0, 200.0f, 0, 0, 39, 1, 1.0f, 1 }, - /* OBJ_ACTOR_234 */ {(void*) func_80077218, 1, (ObjectFunc) func_800771CC, D_800CBF34, 2000.0f, 0, 0, 39, 0, 0.0f, 5 }, - /* OBJ_ACTOR_235 */ {(void*) func_i3_80190430, 2, (ObjectFunc) func_i3_801904CC, D_ZO_602C294, 1000.0f, 0, 1, 40, 0, 1.0f, 1 }, - /* OBJ_ACTOR_236 */ {(void*) func_i3_80190F08, 1, (ObjectFunc) func_i3_80190A00, D_ZO_602BC58, 5000.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_ACTOR_237 */ {(void*) func_8006A978, 1, (ObjectFunc) func_8006A96C, D_800CBF34, 200.0f, 0, 0, 40, 0, 0.0f, 2 }, - /* OBJ_ACTOR_238 */ {(void*) func_i3_801914C4, 2, (ObjectFunc) func_i3_80191010, D_800CBE8C, 200.0f, 0, 1, 40, 0, 1.0f, 1 }, - /* OBJ_ACTOR_239 */ {(void*) NULL, 1, (ObjectFunc) NULL, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_ACTOR_240 */ {(void*) func_i3_80191B4C, 1, (ObjectFunc) func_i3_80191680, D_800CBE8C, 1500.0f, 0, 1, 40, 0, 20.0f, 0 }, - /* OBJ_ACTOR_241 */ {(void*) func_i3_80191DB0, 1, (ObjectFunc) func_i3_80191BC4, D_800CBE70, 1500.0f, 0, 1, 40, 0, 0.0f, 0 }, - /* OBJ_ACTOR_242 */ {(void*) func_i3_80191FFC, 2, (ObjectFunc) func_i3_80192094, D_ZO_602BE3C, 500.0f, 0, 0, 40, 0, 1.0f, 0 }, - /* OBJ_ACTOR_243 */ {(void*) func_i3_80192C18, 2, (ObjectFunc) func_i3_80192834, D_800CBE8C, 0.0f, 0, 1, 40, 0, 1.0f, 1 }, - /* OBJ_ACTOR_244 */ {(void*) func_i3_80193240, 2, (ObjectFunc) func_i3_80192E64, D_ZO_602BE58, 2000.0f, 0, 0, 40, 0, 50.0f, 0 }, - /* OBJ_ACTOR_245 */ {(void*) func_i3_8019983C, 1, (ObjectFunc) func_i3_8019969C, D_800CBE8C, 200.0f, 0, 0, 40, 0, 1.0f, 0 }, - /* OBJ_ACTOR_246 */ {(void*) func_i3_80199E24, 1, (ObjectFunc) func_i3_80199A28, D_800CBE8C, 2000.0f, 0, 0, 40, 0, 1.0f, 0 }, - /* OBJ_ACTOR_247 */ {(void*) func_i3_8019D3C4, 1, (ObjectFunc) func_i3_8019D15C, D_ZO_602BFC4, 500.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_ACTOR_248 */ {(void*) func_i3_8019A1FC, 1, (ObjectFunc) func_i3_80199F10, D_800CBEA8, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_ACTOR_249 */ {(void*) func_i3_8019ACCC, 1, (ObjectFunc) func_i3_8019A5D4, D_800CBEC4, 5000.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_ACTOR_250 */ {(void*) func_i3_8019B7DC, 1, (ObjectFunc) func_i3_8019B548, D_ZO_602C1D4, 10000.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_ACTOR_251 */ {(void*) func_i3_8019BDE0, 2, (ObjectFunc) func_i3_8019B854, D_ZO_602C218, 1000.0f, 0, 0, 40, 0, 1.0f, 1 }, - /* OBJ_ACTOR_252 */ {(void*) func_i3_8019C1CC, 1, (ObjectFunc) func_i3_8019BE48, D_ZO_602C234, 200.0f, 0, 0, 40, 0, 80.0f, 1 }, - /* OBJ_ACTOR_253 */ {(void*) func_i3_8019C83C, 1, (ObjectFunc) func_i3_8019C454, D_ZO_602C250, 300.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_ACTOR_254 */ {(void*) func_i3_8019CE58, 1, (ObjectFunc) func_i3_8019CBEC, D_ZO_602C2B0, 300.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_ACTOR_255 */ {(void*) func_i3_801AE168, 1, (ObjectFunc) func_i3_801AD6C0, D_AQ_6030BFC, 500.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_ACTOR_256 */ {(void*) func_i3_801AEB44, 1, (ObjectFunc) func_i3_801AE3D8, D_AQ_6030C18, 10000.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_ACTOR_257 */ {(void*) func_i3_801B099C, 1, (ObjectFunc) func_i3_801AFA5C, D_AQ_6030C44, 10000.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_ACTOR_258 */ {(void*) func_i3_801B0EC0, 1, (ObjectFunc) func_i3_801B0B60, D_800CBE8C, 200.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_ACTOR_259 */ {(void*) func_i3_801B619C, 2, (ObjectFunc) func_i3_801B638C, D_AQ_6031398, 10000.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_ACTOR_260 */ {(void*) func_i3_801B90DC, 2, (ObjectFunc) func_i3_801B7C78, D_AQ_60313CC, 300.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_ACTOR_261 */ {(void*) func_i3_801B504C, 2, (ObjectFunc) func_i3_801B50E8, D_AQ_6031400, 300.0f, 0, 0, 40, 0, 0.0f, 1 }, - /* OBJ_ACTOR_262 */ {(void*) func_i3_801B7A24, 2, (ObjectFunc) func_i3_801B6FF8, D_AQ_603144C, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_ACTOR_263 */ {(void*) func_i3_801BA108, 2, (ObjectFunc) func_i3_801B91A4, D_AQ_6031480, 200.0f, 0, 0, 40, 0, 0.0f, 1 }, - /* OBJ_ACTOR_264 */ {(void*) func_i3_801BA4E4, 1, (ObjectFunc) func_i3_801BA26C, D_800CBE8C, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_ACTOR_265 */ {(void*) func_i3_801BAD7C, 1, (ObjectFunc) func_i3_801BA6A4, D_AQ_6031500, 200.0f, 0, 0, 40, 0, 0.0f, 1 }, - /* OBJ_ACTOR_266 */ {(void*) func_i3_801BB204, 2, (ObjectFunc) func_i3_801BADF8, D_AQ_6031538, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_ACTOR_267 */ {(void*) func_i3_801BC930, 2, (ObjectFunc) func_i3_801BB79C, D_AQ_6031554, 800.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_ACTOR_268 */ {(void*) func_i3_801BDE6C, 1, (ObjectFunc) func_i3_801BD54C, D_AQ_6031570, 10000.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_ACTOR_269 */ {(void*) func_i3_801BD264, 1, (ObjectFunc) func_i3_801BC9A0, D_AQ_6030D20, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_ACTOR_270 */ {(void*) func_i3_801BEB1C, 1, (ObjectFunc) func_i3_801BE3F8, D_AQ_60314C8, 1000.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_ACTOR_271 */ {(void*) func_8002E694, 2, (ObjectFunc) func_8002E670, D_BO_6011B24, 0.0f, 0, 0, 39, 0, 730.0f, 1 }, - /* OBJ_ACTOR_272 */ {(void*) func_8002E6DC, 1, (ObjectFunc) func_8002E6B8, D_BO_6011BF4, 0.0f, 0, 0, 39, 0, 150.0f, 1 }, - /* OBJ_ACTOR_273 */ {(void*) func_i4_80188FE4, 2, (ObjectFunc) func_i4_80188AD0, D_FO_600FF30, 0.0f, 0, 0, 39, 0, 220.0f, 1 }, - /* OBJ_ACTOR_274 */ {(void*) func_i4_8019E3A8, 1, (ObjectFunc) func_i4_8019E234, D_800CBEC4, 0.0f, 0, 0, 39, 0, 1.0f, 0 }, - /* OBJ_ACTOR_275 */ {(void*) func_i3_8019F7AC, 1, (ObjectFunc) func_i3_8019F20C, D_800CBE8C, 200.0f, 0, 0, 39, 0, 1.0f, 1 }, - /* OBJ_ACTOR_276 */ {(void*) func_i3_8019F7AC, 1, (ObjectFunc) func_i3_8019F20C, D_800CBE8C, 200.0f, 0, 0, 39, 0, 1.0f, 1 }, - /* OBJ_ACTOR_277 */ {(void*) func_i3_8019F7AC, 1, (ObjectFunc) func_i3_8019F20C, D_800CBEC4, 200.0f, 0, 0, 39, 0, 1.0f, 1 }, - /* OBJ_ACTOR_278 */ {(void*) NULL, 1, (ObjectFunc) func_i3_8019EA7C, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 1 }, - /* OBJ_ACTOR_279 */ {(void*) NULL, 1, (ObjectFunc) func_i3_801A003C, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 1 }, - /* OBJ_ACTOR_280 */ {(void*) D_VE1_900DD20, 0, (ObjectFunc) func_i1_80192518, D_VE1_601B7F8, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_281 */ {(void*) func_i1_80192E2C, 1, (ObjectFunc) func_i1_80192CD4, D_VE1_601B830, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_282 */ {(void*) D_VE1_901DA50, 0, (ObjectFunc) func_i1_80192CD4, D_VE1_601B868, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_283 */ {(void*) D_VE1_9023AD0, 0, (ObjectFunc) func_i1_80192EB0, D_VE1_601B8A0, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_284 */ {(void*) func_i1_801934D0, 1, (ObjectFunc) func_i1_801933DC, D_VE1_601B8D8, 1000.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_ACTOR_285 */ {(void*) func_i6_80193244, 1, (ObjectFunc) func_i6_80192E94, D_800CBE8C, 1000.0f, 0, 0, 20, 0, 1.0f, 1 }, - /* OBJ_ACTOR_286 */ {(void*) func_i6_80188660, 1, (ObjectFunc) func_i6_80188528, D_800CBE8C, 1000.0f, 0, 0, 20, 0, 0.0f, 0 }, - /* OBJ_ACTOR_287 */ {(void*) NULL, 1, (ObjectFunc) func_i6_80189724, D_800CBF34, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, - /* OBJ_ACTOR_288 */ {(void*) NULL, 1, (ObjectFunc) func_i6_801893B8, D_800CBF34, 1000.0f, 0, 0, 20, 1, 0.0f, 0 }, - /* OBJ_ACTOR_289 */ {(void*) func_800596B0, 1, (ObjectFunc) func_i6_80189470, D_800CBF34, 1000.0f, 0, 0, 20, 1, 0.0f, 0 }, - /* OBJ_ACTOR_290 */ {(void*) NULL, 1, (ObjectFunc) func_i6_8018933C, D_800CBF34, 1000.0f, 0, 0, 20, 0, 0.0f, 0 }, - /* OBJ_ACTOR_291 */ {(void*) func_80067874, 1, (ObjectFunc) func_8006753C, D_800CBEA8, 1000.0f, 0, 0, 0, 0, 1.0f, 0 }, - /* OBJ_BOSS_292 */ {(void*) func_i1_8018AA74, 2, (ObjectFunc) func_i1_80189058, D_CO_603E620, 20000.0f, 0, 0, 40, 1, 0.0f, 10 }, - /* OBJ_BOSS_293 */ {(void*) func_i1_8018ECAC, 1, (ObjectFunc) func_i1_8018C19C, D_CO_603E840, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, - /* OBJ_BOSS_294 */ {(void*) func_i1_8018ED78, 1, (ObjectFunc) func_i1_8018DDAC, D_CO_603E714, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, - /* OBJ_BOSS_295 */ {(void*) func_i1_8018EE84, 1, (ObjectFunc) func_i1_8018E290, D_CO_603E748, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, - /* OBJ_BOSS_296 */ {(void*) func_i1_8018EF90, 1, (ObjectFunc) func_i1_8018E76C, D_CO_603E7C4, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, - /* OBJ_BOSS_297 */ {(void*) func_i2_8018BACC, 1, (ObjectFunc) func_i2_8018978C, D_ME_602F75C, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, - /* OBJ_BOSS_298 */ {(void*) func_i2_801887D0, 1, (ObjectFunc) func_i2_80188344, D_ME_602FA50, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, - /* OBJ_BOSS_299 */ {(void*) func_80042FC4, 2, (ObjectFunc) func_80042FB8, D_800CBF34, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, - /* OBJ_BOSS_300 */ {(void*) func_80042FE8, 1, (ObjectFunc) func_80042FDC, D_800CBF34, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, - /* OBJ_BOSS_301 */ {(void*) func_i3_801BEC5C, 1, (ObjectFunc) func_i3_801BEC50, D_AQ_6030B10, 0.0f, 0, 0, 40, 0, 0.0f, 10 }, - /* OBJ_BOSS_A6 */ {(void*) func_i3_8018C54C, 1, (ObjectFunc) func_i3_80187944, D_A6_6028454, 2000.0f, 0, 0, 40, 0, 0.0f, 10 }, - /* OBJ_BOSS_303 */ {(void*) func_i2_80193434, 2, (ObjectFunc) func_i2_80190078, D_SX_6032550, 20000.0f, 0, 0, 20, 0, 0.0f, 10 }, - /* OBJ_BOSS_304 */ {(void*) func_i2_8018FF84, 2, (ObjectFunc) func_i2_8018FE38, D_SX_6032488, 1000.0f, 0, 0, 20, 0, 0.0f, 10 }, - /* OBJ_BOSS_305 */ {(void*) func_i2_80190020, 2, (ObjectFunc) func_i2_8018FF20, D_SX_60324EC, 1000.0f, 0, 0, 20, 0, 0.0f, 10 }, - /* OBJ_BOSS_306 */ {(void*) func_i5_801982A8, 1, (ObjectFunc) func_i5_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_ZO_602C044, 1000.0f, 0, 0, 40, 0, 1.0f, 10 }, - /* OBJ_BOSS_308 */ {(void*) func_8008FE78, 1, (ObjectFunc) func_800907C4, D_FO_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 }, - /* OBJ_BOSS_310 */ {(void*) func_8002E64C, 1, (ObjectFunc) func_8002E628, D_800CBF34, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, - /* OBJ_BOSS_311 */ {(void*) func_i4_80191AFC, 2, (ObjectFunc) func_i4_801912FC, D_BO_6011C80, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, - /* OBJ_BOSS_312 */ {(void*) func_i6_80196288, 2, (ObjectFunc) func_i6_80196210, D_VE2_60166F4, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, - /* OBJ_BOSS_313 */ {(void*) func_i4_8019E98C, 1, (ObjectFunc) func_i4_8019E454, D_SZ_6009388, 0.0f, 0, 0, 40, 0, 0.0f, 10 }, - /* OBJ_BOSS_314 */ {(void*) func_i6_8019E2C4, 2, (ObjectFunc) func_i6_8019C888, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 10 }, - /* OBJ_BOSS_SO */ {(void*) func_i3_801A71B8, 2, (ObjectFunc) func_i3_801A5B3C, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 10 }, - /* OBJ_BOSS_316 */ {(void*) func_i4_801968F4, 1, (ObjectFunc) func_i4_801946C4, D_KA_6011058, 0.0f, 0, 0, 40, 0, 0.0f, 10 }, - /* OBJ_BOSS_317 */ {(void*) func_i4_80193B1C, 1, (ObjectFunc) func_i4_80193718, D_KA_601115C, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, - /* OBJ_BOSS_AQ */ {(void*) func_i3_801B4D84, 2, (ObjectFunc) func_i3_801B134C, D_AQ_6030F74, 10000.0f, 0, 0, 40, 0, 0.0f, 10 }, - /* OBJ_BOSS_319 */ {(void*) func_i1_801985E4, 1, (ObjectFunc) func_i1_80194398,D_i1_8019A9B8, 3000.0f, 0, 0, 40, 1, 0.0f, 10 }, - /* OBJ_BOSS_320 */ {(void*) func_i6_801928C8, 2, (ObjectFunc) func_i6_8018DBF0, D_ANDROSS_C038DC0, 10000.0f, 0, 0, 40, 0, 0.0f, 10 }, - /* OBJ_BOSS_321 */ {(void*) func_i6_8018B8C0, 1, (ObjectFunc) func_i6_80189B70, D_ANDROSS_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 }, - /* OBJ_ITEM_CHECKPOINT */ {(void*) func_8005C5F0, 1, (ObjectFunc) func_80068914, D_800CBF38, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_ITEM_SILVER_RING */ {(void*) func_8005C900, 1, (ObjectFunc) func_80068020, D_800CBF54, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_ITEM_SILVER_STAR */ {(void*) func_8005C9C0, 1, (ObjectFunc) func_800685D8, D_800CBF54, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_ITEM_METEO_WARP */ {(void*) func_8005CDA8, 1, (ObjectFunc) func_80068688, D_800CBF70, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_ITEM_BOMB */ {(void*) func_8005CB44, 1, (ObjectFunc) func_80067BEC, D_800CBFC8, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_ITEM_328 */ {(void*) NULL, 1, (ObjectFunc) func_80068C88, D_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_ITEM_329 */ {(void*) NULL, 1, (ObjectFunc) func_80068C88, D_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_ITEM_330 */ {(void*) NULL, 1, (ObjectFunc) func_80068C88, D_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_ITEM_331 */ {(void*) NULL, 1, (ObjectFunc) func_80068C88, D_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_ITEM_332 */ {(void*) NULL, 1, (ObjectFunc) func_80068C88, D_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_ITEM_333 */ {(void*) NULL, 1, (ObjectFunc) func_80068C88, D_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_ITEM_334 */ {(void*) NULL, 1, (ObjectFunc) func_80068C48, D_800CBF18, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_ITEM_1UP */ {(void*) D_1022120, 0, (ObjectFunc) func_80067B1C, D_800CBE8C, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_ITEM_GOLD_RING */ {(void*) func_8005CA80, 1, (ObjectFunc) func_800685F8, D_800CBF54, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_ITEM_WING_REPAIR */ {(void*) D_arwing_3007650, 0, (ObjectFunc) func_80068618, D_800CBFA8, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_ITEM_TRAINING_RING */ {(void*) gItemTrainingRingDL, 0, (ObjectFunc) func_i1_80198968, D_TR_6009CFC, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_339 */ {(void*) func_8007D55C, 1, (ObjectFunc) func_8007D2F4, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_340 */ {(void*) func_8007D55C, 1, (ObjectFunc) func_8007D748, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_341 */ {(void*) func_8007D55C, 1, (ObjectFunc) func_8007D8A8, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_342 */ {(void*) func_8007E330, 1, (ObjectFunc) func_8007E298, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_343 */ {(void*) func_8007CAF0, 1, (ObjectFunc) func_8007C9E0, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_344 */ {(void*) func_8007868C, 1, (ObjectFunc) func_8007E014, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_345 */ {(void*) func_8007879C, 1, (ObjectFunc) func_8007E258, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_346 */ {(void*) func_800788B0, 1, (ObjectFunc) func_8007F438, NULL, -200.0f, 1, 0, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_347 */ {(void*) func_800783C0, 1, (ObjectFunc) func_8007B758, NULL, 100.0f, 1, 0, 40, 0, 0.0f, 0 }, - /* OBJ_EFFECT_348 */ {(void*) func_80078A64, 1, (ObjectFunc) func_8007F6B0, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_349 */ {(void*) NULL, 1, (ObjectFunc) func_8007F958, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_350 */ {(void*) NULL, 1, (ObjectFunc) func_8007FBE0, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_351 */ {(void*) func_80078438, 1, (ObjectFunc) func_8007E3E4, NULL, -200.0f, 1, 1, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_352 */ {(void*) func_800784B4, 1, (ObjectFunc) func_8007B62C, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_353 */ {(void*) func_80078B8C, 1, (ObjectFunc) func_8007FE88, NULL, 100.0f, 0, 0, 20, 0, 0.0f, 0 }, - /* OBJ_EFFECT_354 */ {(void*) func_i6_80197C64, 1, (ObjectFunc) func_8007FE88, NULL, 100.0f, 0, 0, 20, 0, 0.0f, 0 }, - /* OBJ_EFFECT_355 */ {(void*) func_80078AEC, 1, (ObjectFunc) func_800802B8, NULL, 100.0f, 1, 0, 20, 1, 0.0f, 0 }, - /* OBJ_EFFECT_356 */ {(void*) func_80078C84, 1, (ObjectFunc) func_800802F8, NULL, 100.0f, 1, 0, 20, 0, 0.0f, 0 }, - /* OBJ_EFFECT_357 */ {(void*) func_800798F0, 1, (ObjectFunc) func_8007968C, NULL, 100.0f, 0, 1, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_358 */ {(void*) func_i4_80192A68, 1, (ObjectFunc) func_i4_80192984, NULL, 100.0f, 1, 1, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_359 */ {(void*) func_8007AA60, 1, (ObjectFunc) func_8007A994, NULL, -100.0f, 1, 2, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_360 */ {(void*) func_8007BEE8, 1, (ObjectFunc) func_8007BE54, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_361 */ {(void*) func_8007BEE8, 1, (ObjectFunc) func_8007BDE0, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_362 */ {(void*) func_8007BEE8, 1, (ObjectFunc) func_8007BCE8, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_363 */ {(void*) func_80094BBC, 1, (ObjectFunc) func_80094954, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_364 */ {(void*) func_8007B9DC, 1, (ObjectFunc) func_8007B960, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_365 */ {(void*) func_8007E5CC, 1, (ObjectFunc) func_8007E45C, NULL, -200.0f, 1, 1, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_366 */ {(void*) func_80078550, 1, (ObjectFunc) func_i3_801AC918, NULL, 100.0f, 1, 2, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_367 */ {(void*) func_80078604, 1, (ObjectFunc) func_8007E648, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_368 */ {(void*) func_i5_80188FA8, 1, (ObjectFunc) func_i5_80188F60, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_369 */ {(void*) func_i2_8018DCE4, 1, (ObjectFunc) func_i2_80188CAC, NULL, 100.0f, 0, 1, 40, 0, 0.0f, 0 }, - /* OBJ_EFFECT_370 */ {(void*) func_i2_8018DBEC, 1, (ObjectFunc) func_i2_80188FAC, NULL, 100.0f, 0, 1, 40, 0, 0.0f, 0 }, - /* OBJ_EFFECT_371 */ {(void*) func_i2_8018DE14, 1, (ObjectFunc) func_i2_80189114, NULL, 100.0f, 0, 1, 40, 0, 0.0f, 0 }, - /* OBJ_EFFECT_372 */ {(void*) func_80077A00, 1, (ObjectFunc) func_8007AB50, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_373 */ {(void*) NULL, 1, (ObjectFunc) func_8007A748, NULL, 500.0f, 0, 1, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_374 */ {(void*) func_8007DED4, 1, (ObjectFunc) func_8007DB70, NULL, 100.0f, 0, 1, 40, 0, 0.0f, 0 }, - /* OBJ_EFFECT_375 */ {(void*) func_8007DAE4, 1, (ObjectFunc) func_8007DA58, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_376 */ {(void*) func_80078CE8, 1, (ObjectFunc) func_80080360, NULL, -200.0f, 1, 0, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_377 */ {(void*) func_80078BE0, 1, (ObjectFunc) func_800802D8, NULL, 100.0f, 1, 0, 20, 0, 0.0f, 0 }, - /* OBJ_EFFECT_378 */ {(void*) func_i5_801A5AF0, 1, (ObjectFunc) func_i5_801A57D0, NULL, 100.0f, 0, 0, 20, 0, 0.0f, 0 }, - /* OBJ_EFFECT_379 */ {(void*) func_i5_801AEAA0, 1, (ObjectFunc) func_i5_801AE87C, NULL, 100.0f, 1, 1, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_380 */ {(void*) func_i5_801A5D68, 1, (ObjectFunc) func_i5_801A5B4C, NULL, 100.0f, 0, 0, 20, 0, 0.0f, 0 }, - /* OBJ_EFFECT_381 */ {(void*) func_80077A7C, 1, (ObjectFunc) func_8007B0F4, NULL, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_382 */ {(void*) NULL, 1, (ObjectFunc) func_8007B040, NULL, 200.0f, 0, 1, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_383 */ {(void*) func_8007A3C0, 1, (ObjectFunc) func_8007A28C, NULL, 10000.0f, 0, 1, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_384 */ {(void*) func_80077B84, 1, (ObjectFunc) func_8007B3B8, NULL, -200.0f, 1, 1, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_385 */ {(void*) func_80078038, 1, (ObjectFunc) func_8007B5C0, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_386 */ {(void*) NULL, 1, (ObjectFunc) func_8007C250, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_387 */ {(void*) NULL, 1, (ObjectFunc) func_8007C8C4, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_388 */ {(void*) func_80077B78, 1, (ObjectFunc) func_8007B670, NULL, -200.0f, 1, 1, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_389 */ {(void*) func_800780F8, 1, (ObjectFunc) func_8007B67C, NULL, -200.0f, 1, 1, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_390 */ {(void*) NULL, 1, (ObjectFunc) func_8007C50C, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_391 */ {(void*) func_80083B8C, 1, (ObjectFunc) func_800837EC, NULL, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_392 */ {(void*) func_i3_801A0AF0, 1, (ObjectFunc) func_i3_801A0120, NULL, 300.0f, 1, 2, 10, 0, 0.0f, 0 }, - /* OBJ_EFFECT_393 */ {(void*) func_80078F78, 1, (ObjectFunc) func_80078EBC, NULL, 300.0f, 1, 1, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_394 */ {(void*) func_80080D04, 1, (ObjectFunc) func_80080ACC, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 }, - /* OBJ_EFFECT_395 */ {(void*) func_80082F78, 1, (ObjectFunc) func_80081C5C, NULL, 300.0f, 0, 1, 40, 0, 0.0f, 0 }, - /* OBJ_EFFECT_396 */ {(void*) func_i6_8018CF98, 1, (ObjectFunc) func_i6_8018CAD4, NULL, 2000.0f, 0, 1, 40, 2, 0.0f, 0 }, - /* OBJ_EFFECT_397 */ {(void*) func_i4_80191180, 1, (ObjectFunc) func_i4_80191054, NULL, 2000.0f, 0, 1, 20, 0, 0.0f, 0 }, - /* OBJ_EFFECT_398 */ {(void*) func_8008092C, 1, (ObjectFunc) func_8008040C, NULL, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - /* OBJ_EFFECT_399 */ {(void*) func_80084194, 1, (ObjectFunc) func_80083FA8, NULL, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_4C_161 */ {(void*) D_CO_602F7C0, 0, (ObjectFunc) func_enmy_80068FE0, D_CO_603E468, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_4C_162 */ {(void*) D_CO_601C9B0, 0, (ObjectFunc) func_enmy_80068FE0, D_CO_603E484, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_4C_163 */ {(void*) D_FO_600A420, 0, (ObjectFunc) func_enmy_80068FE0, D_FO_600FE9C, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_4C_164 */ {(void*) func_edisplay_80059C40, 1, (ObjectFunc) NULL, D_edata_800CBF34, 1800.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_4C_165 */ {(void*) D_CO_602DCA0, 0, (ObjectFunc) NULL, D_edata_800CBF34, -100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_4C_166 */ {(void*) D_CO_601F500, 0, (ObjectFunc) NULL, D_edata_800CBF34, -100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_4C_167 */ {(void*) func_edisplay_80059C34, 1, (ObjectFunc) func_enmy_80066E8C, D_edata_800CBF34, 500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_4C_168 */ {(void*) func_edisplay_80059850, 1, (ObjectFunc) NULL, D_edata_800CBF34, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_4C_169 */ {(void*) D_TI_60023B0, 0, (ObjectFunc) Titania_8018F038, D_TI_60068BC, 100.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_4C_170 */ {(void*) NULL, 1, (ObjectFunc) Corneria_801875A4, D_edata_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_4C_171 */ {(void*) NULL, 1, (ObjectFunc) Venom1_801922DC, D_edata_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_4C_172 */ {(void*) NULL, 1, (ObjectFunc) Venom1_80192358, D_edata_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_4C_173 */ {(void*) NULL, 1, (ObjectFunc) Venom1_801923C0, D_edata_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_4C_174 */ {(void*) NULL, 1, (ObjectFunc) Venom1_8019243C, D_edata_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_4C_175 */ {(void*) NULL, 1, (ObjectFunc) NULL, D_edata_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_ACTOR_176 */ {(void*) Corneria_8018BAAC, 2, (ObjectFunc) Corneria_8018AED0, D_CO_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 }, + /* OBJ_ACTOR_177 */ {(void*) Corneria_8018BBA4, 2, (ObjectFunc) Corneria_8018B15C, D_CO_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 }, + /* OBJ_ACTOR_178 */ {(void*) Corneria_8018BBF8, 2, (ObjectFunc) Corneria_8018B418, D_CO_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 }, + /* OBJ_ACTOR_179 */ {(void*) Corneria_8018BD7C, 2, (ObjectFunc) Corneria_8018B58C, D_CO_603E604, 500.0f, 0, 0, 39, 1, 0.0f, 1 }, + /* OBJ_ACTOR_180 */ {(void*) func_edisplay_8005B6A4, 1, (ObjectFunc) func_enmy_80066A80, D_edata_800CBF34, 1000.0f, 0, 0, 39, 0, 0.0f, 1 }, + /* OBJ_ACTOR_181 */ {(void*) D_ME_6018C00, 0, (ObjectFunc) Meteo_8018756C, D_ME_602F6EC, 200.0f, 0, 0, 39, 0, 1.0f, 1 }, + /* OBJ_ACTOR_182 */ {(void*) func_edisplay_8005B71C, 1, (ObjectFunc) Meteo_80187650, D_ME_602F708, 100.0f, 0, 1, 39, 0, 1.0f, 1 }, + /* OBJ_ACTOR_183 */ {(void*) Meteo_8018DA6C, 1, (ObjectFunc) Meteo_8018D9EC, D_edata_800CBF34, 100.0f, 0, 1, 39, 0, 0.0f, 1 }, + /* OBJ_ACTOR_184 */ {(void*) Meteo_8018DAEC, 1, (ObjectFunc) Meteo_8018D9EC, D_edata_800CBF34, 100.0f, 0, 1, 39, 0, 0.0f, 1 }, + /* OBJ_ACTOR_185 */ {(void*) Meteo_8018DB6C, 1, (ObjectFunc) Meteo_8018D9EC, D_edata_800CBF34, 100.0f, 0, 1, 39, 0, 0.0f, 1 }, + /* OBJ_ACTOR_186 */ {(void*) func_edisplay_8005B7CC, 1, (ObjectFunc) Meteo_8018795C, D_ME_602F724, 200.0f, 0, 1, 39, 0, 1.0f, 1 }, + /* OBJ_ACTOR_187 */ {(void*) D_ME_6018450, 0, (ObjectFunc) Meteo_801877C4, D_ME_602F740, 200.0f, 0, 1, 39, 0, 1.0f, 1 }, + /* OBJ_ACTOR_188 */ {(void*) Aquas_801BEC74, 1, (ObjectFunc) Aquas_801BEC68, D_AQ_6030BE0, 200.0f, 0, 1, 39, 0, 1.0f, 1 }, + /* OBJ_ACTOR_189 */ {(void*) func_edisplay_8005A094, 1, (ObjectFunc) func_enmy2_8006C008, D_edata_800CBF34, 0.0f, 0, 0, 39, 0, 0.0f, 0 }, + /* OBJ_ACTOR_190 */ {(void*) func_edisplay_8005B848, 1, (ObjectFunc) func_enmy_800656D4, D_edata_800CBFE4, 100.0f, 0, 1, 39, 0, 1.0f, 0 }, + /* OBJ_ACTOR_191 */ {(void*) func_edisplay_8005B848, 1, (ObjectFunc) func_enmy_800656D4, D_edata_800CBFE4, 100.0f, 0, 1, 39, 0, 1.0f, 0 }, + /* OBJ_ACTOR_192 */ {(void*) func_edisplay_8005B9A4, 1, (ObjectFunc) func_enmy_8006654C, D_CO_603E54C, 200.0f, 0, 1, 39, 0, 50.0f, 1 }, + /* OBJ_ACTOR_193 */ {(void*) func_edisplay_8005BA30, 1, (ObjectFunc) func_enmy_800669A0, D_CO_603E598, 100.0f, 0, 1, 39, 0, 0.0f, 0 }, + /* OBJ_ACTOR_194 */ {(void*) func_enmy2_8006B74C, 1, (ObjectFunc) func_enmy2_8006B094, D_edata_800CC000, 200.0f, 0, 1, 39, 0, 0.0f, 1 }, + /* OBJ_ACTOR_195 */ {(void*) func_demo_8004FEC0, 1, (ObjectFunc) func_demo_8004F8AC, D_edata_800CBF34, 20000.0f, 0, 1, 39, 0, 0.0f, 0 }, + /* OBJ_ACTOR_196 */ {(void*) func_edisplay_80059BF0, 1, (ObjectFunc) func_enmy2_8006BB78, D_CO_603E5B4, 200.0f, 0, 1, 39, 0, 1.0f, 1 }, + /* OBJ_ACTOR_197 */ {(void*) func_360_80035448, 1, (ObjectFunc) func_360_800319AC, D_edata_800CC038, 20000.0f, 0, 1, 39, 1, 1.0f, 1 }, + /* OBJ_ACTOR_198 */ {(void*) func_360_80035448, 1, (ObjectFunc) func_hud_80092EC0, D_edata_800CC01C, 20000.0f, 0, 0, 39, 1, 0.0f, 0 }, + /* OBJ_ACTOR_199 */ {(void*) Andross_80188448, 1, (ObjectFunc) Andross_801880E4, D_edata_800CBF34, 20000.0f, 0, 0, 39, 1, 0.0f, 0 }, + /* OBJ_ACTOR_200 */ {(void*) func_enmy2_80074FF0, 1, (ObjectFunc) func_enmy2_80072594, D_edata_800CBF34, 2000.0f, 0, 1, 39, 0, 0.0f, 1 }, + /* OBJ_ACTOR_201 */ {(void*) func_edisplay_800598E8, 1, (ObjectFunc) func_enmy2_8006AC08, D_ME_602F684, 100.0f, 0, 1, 39, 0, 1.0f, 1 }, + /* OBJ_ACTOR_202 */ {(void*) func_edisplay_80059A24, 1, (ObjectFunc) func_enmy2_8006AD18, D_ME_602F6A0, 100.0f, 0, 1, 39, 0, 180.0f, 1 }, + /* OBJ_ACTOR_203 */ {(void*) SectorX_8018F884, 1, (ObjectFunc) SectorX_8018F330, D_edata_800CBF34, 1000.0f, 0, 0, 39, 0, 0.0f, 0 }, + /* OBJ_ACTOR_204 */ {(void*) SectorY_801A4CB0, 1, (ObjectFunc) SectorY_801A3BD4, D_SY_603405C, 1000.0f, 0, 0, 39, 0, 1.0f, 1 }, + /* OBJ_ACTOR_205 */ {(void*) Macbeth_801A12C4, 1, (ObjectFunc) Macbeth_8019C778, D_MA_60359C8, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_206 */ {(void*) Macbeth_801A12C4, 1, (ObjectFunc) Macbeth_801AC438, D_MA_6035A48, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_207 */ {(void*) Macbeth_801AC294, 2, (ObjectFunc) Macbeth_801A7E7C, D_MA_603677C, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_208 */ {(void*) Macbeth_801A12C4, 1, (ObjectFunc) Macbeth_8019EA60, D_MA_6035A14, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_209 */ {(void*) Macbeth_801A12C4, 1, (ObjectFunc) Macbeth_8019D700, D_MA_6035AE0, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_210 */ {(void*) Macbeth_801A12C4, 1, (ObjectFunc) Macbeth_8019CE88, D_MA_6035D9C, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_211 */ {(void*) Macbeth_801A12C4, 1, (ObjectFunc) Macbeth_8019E410, D_MA_6035E04, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_212 */ {(void*) Macbeth_801A12C4, 1, (ObjectFunc) Macbeth_8019FF9C, D_MA_60360C0, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_213 */ {(void*) Macbeth_801A12C4, 1, (ObjectFunc) Macbeth_8019EE68, D_MA_6036154, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_214 */ {(void*) Macbeth_801A43BC, 1, (ObjectFunc) Macbeth_801A3E98, D_MA_6036458, 300.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_215 */ {(void*) Macbeth_801A4A64, 1, (ObjectFunc) Macbeth_801A46A0, D_MA_60364C0, 300.0f, 0, 1, 40, 1, 0.0f, 1 }, + /* OBJ_ACTOR_216 */ {(void*) Macbeth_801A5F90, 1, (ObjectFunc) Macbeth_801A5E54, D_MA_60366EC, 200.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_217 */ {(void*) Macbeth_801A6100, 1, (ObjectFunc) Macbeth_801A5FD0, D_MA_6036708, 200.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_218 */ {(void*) Macbeth_801A6540, 1, (ObjectFunc) Macbeth_801A6144, D_MA_6036728, 200.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_219 */ {(void*) Macbeth_801A68EC, 1, (ObjectFunc) Macbeth_801A67C8, D_MA_6036744, 300.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_220 */ {(void*) Macbeth_801ADAC8, 1, (ObjectFunc) Macbeth_801AD6F0, D_MA_6036930, 200.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_221 */ {(void*) Macbeth_801AE2C0, 1, (ObjectFunc) Macbeth_801ADD68, D_MA_603694C, 300.0f, 0, 0, 40, 1, 1.0f, 0 }, + /* OBJ_ACTOR_222 */ {(void*) Macbeth_801AEEFC, 1, (ObjectFunc) Macbeth_801AEC04, D_MA_6036968, 300.0f, 0, 0, 40, 1, 1.0f, 0 }, + /* OBJ_ACTOR_223 */ {(void*) Macbeth_801A54E8, 1, (ObjectFunc) Macbeth_801A4B24, D_MA_60364DC, 300.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_224 */ {(void*) NULL, 1, (ObjectFunc) Titania_80189194, D_edata_800CBF34, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, + /* OBJ_ACTOR_225 */ {(void*) D_TI1_700AB70, 0, (ObjectFunc) Titania_8018AB44, D_TI_60064AC, 50.0f, 0, 0, 39, 1, 1.0f, 0 }, + /* OBJ_ACTOR_226 */ {(void*) Titania_80189AFC, 1, (ObjectFunc) Titania_801895B8, D_TI_60064C8, 300.0f, 0, 0, 39, 1, 70.0f, 1 }, + /* OBJ_ACTOR_227 */ {(void*) Titania_8018E5B4, 1, (ObjectFunc) Titania_8018E54C, D_TI_60067C4, 0.0f, 0, 0, 39, 1, 0.0f, 0 }, + /* OBJ_ACTOR_228 */ {(void*) Titania_8018EF14, 1, (ObjectFunc) Titania_8018E5F8, D_TI_6006808, 0.0f, 0, 0, 39, 1, 1.0f, 1 }, + /* OBJ_ACTOR_229 */ {(void*) Titania_8018E2D8, 1, (ObjectFunc) Titania_8018C8A8, D_TI_6006A3C, 1000.0f, 0, 0, 20, 1, 0.0f, 1 }, + /* OBJ_ACTOR_230 */ {(void*) Titania_8018AABC, 1, (ObjectFunc) Titania_8018A544, D_TI_600683C, 0.0f, 0, 1, 39, 1, 0.0f, 1 }, + /* OBJ_ACTOR_231 */ {(void*) Titania_8018BE84, 1, (ObjectFunc) Titania_8018B9D0, D_TI_6006858, 0.0f, 0, 0, 39, 1, 0.0f, 1 }, + /* OBJ_ACTOR_232 */ {(void*) Titania_8018B6AC, 1, (ObjectFunc) Titania_8018B268, D_TI_6006890, 0.0f, 0, 0, 39, 1, 20.0f, 1 }, + /* OBJ_ACTOR_233 */ {(void*) Titania_8018A1C0, 1, (ObjectFunc) Titania_80189CC8, D_TI_60068F0, 200.0f, 0, 0, 39, 1, 1.0f, 1 }, + /* OBJ_ACTOR_234 */ {(void*) func_enmy2_80077218, 1, (ObjectFunc) func_enmy2_800771CC, D_edata_800CBF34, 2000.0f, 0, 0, 39, 0, 0.0f, 5 }, + /* OBJ_ACTOR_235 */ {(void*) Zoness_80190430, 2, (ObjectFunc) Zoness_801904CC, D_ZO_602C294, 1000.0f, 0, 1, 40, 0, 1.0f, 1 }, + /* OBJ_ACTOR_236 */ {(void*) Zoness_80190F08, 1, (ObjectFunc) Zoness_80190A00, D_ZO_602BC58, 5000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_ACTOR_237 */ {(void*) func_enmy2_8006A978, 1, (ObjectFunc) func_enmy2_8006A96C, D_edata_800CBF34, 200.0f, 0, 0, 40, 0, 0.0f, 2 }, + /* OBJ_ACTOR_238 */ {(void*) Zoness_801914C4, 2, (ObjectFunc) Zoness_80191010, D_edata_800CBE8C, 200.0f, 0, 1, 40, 0, 1.0f, 1 }, + /* OBJ_ACTOR_239 */ {(void*) NULL, 1, (ObjectFunc) NULL, D_edata_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_ACTOR_240 */ {(void*) Zoness_80191B4C, 1, (ObjectFunc) Zoness_80191680, D_edata_800CBE8C, 1500.0f, 0, 1, 40, 0, 20.0f, 0 }, + /* OBJ_ACTOR_241 */ {(void*) Zoness_80191DB0, 1, (ObjectFunc) Zoness_80191BC4, D_edata_800CBE70, 1500.0f, 0, 1, 40, 0, 0.0f, 0 }, + /* OBJ_ACTOR_242 */ {(void*) Zoness_80191FFC, 2, (ObjectFunc) Zoness_80192094, D_ZO_602BE3C, 500.0f, 0, 0, 40, 0, 1.0f, 0 }, + /* OBJ_ACTOR_243 */ {(void*) Zoness_80192C18, 2, (ObjectFunc) Zoness_80192834, D_edata_800CBE8C, 0.0f, 0, 1, 40, 0, 1.0f, 1 }, + /* OBJ_ACTOR_244 */ {(void*) Zoness_80193240, 2, (ObjectFunc) Zoness_80192E64, D_ZO_602BE58, 2000.0f, 0, 0, 40, 0, 50.0f, 0 }, + /* OBJ_ACTOR_245 */ {(void*) Zoness_8019983C, 1, (ObjectFunc) Zoness_8019969C, D_edata_800CBE8C, 200.0f, 0, 0, 40, 0, 1.0f, 0 }, + /* OBJ_ACTOR_246 */ {(void*) Zoness_80199E24, 1, (ObjectFunc) Zoness_80199A28, D_edata_800CBE8C, 2000.0f, 0, 0, 40, 0, 1.0f, 0 }, + /* OBJ_ACTOR_247 */ {(void*) Zoness_8019D3C4, 1, (ObjectFunc) Zoness_8019D15C, D_ZO_602BFC4, 500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_ACTOR_248 */ {(void*) Zoness_8019A1FC, 1, (ObjectFunc) Zoness_80199F10, D_edata_800CBEA8, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_ACTOR_249 */ {(void*) Zoness_8019ACCC, 1, (ObjectFunc) Zoness_8019A5D4, D_edata_800CBEC4, 5000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_ACTOR_250 */ {(void*) Zoness_8019B7DC, 1, (ObjectFunc) Zoness_8019B548, D_ZO_602C1D4, 10000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_ACTOR_251 */ {(void*) Zoness_8019BDE0, 2, (ObjectFunc) Zoness_8019B854, D_ZO_602C218, 1000.0f, 0, 0, 40, 0, 1.0f, 1 }, + /* OBJ_ACTOR_252 */ {(void*) Zoness_8019C1CC, 1, (ObjectFunc) Zoness_8019BE48, D_ZO_602C234, 200.0f, 0, 0, 40, 0, 80.0f, 1 }, + /* OBJ_ACTOR_253 */ {(void*) Zoness_8019C83C, 1, (ObjectFunc) Zoness_8019C454, D_ZO_602C250, 300.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_ACTOR_254 */ {(void*) Zoness_8019CE58, 1, (ObjectFunc) Zoness_8019CBEC, D_ZO_602C2B0, 300.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_ACTOR_255 */ {(void*) Aquas_801AE168, 1, (ObjectFunc) Aquas_801AD6C0, D_AQ_6030BFC, 500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_ACTOR_256 */ {(void*) Aquas_801AEB44, 1, (ObjectFunc) Aquas_801AE3D8, D_AQ_6030C18, 10000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_ACTOR_257 */ {(void*) Aquas_801B099C, 1, (ObjectFunc) Aquas_801AFA5C, D_AQ_6030C44, 10000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_ACTOR_258 */ {(void*) Aquas_801B0EC0, 1, (ObjectFunc) Aquas_801B0B60, D_edata_800CBE8C, 200.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_ACTOR_259 */ {(void*) Aquas_801B619C, 2, (ObjectFunc) Aquas_801B638C, D_AQ_6031398, 10000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_ACTOR_260 */ {(void*) Aquas_801B90DC, 2, (ObjectFunc) Aquas_801B7C78, D_AQ_60313CC, 300.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_ACTOR_261 */ {(void*) Aquas_801B504C, 2, (ObjectFunc) Aquas_801B50E8, D_AQ_6031400, 300.0f, 0, 0, 40, 0, 0.0f, 1 }, + /* OBJ_ACTOR_262 */ {(void*) Aquas_801B7A24, 2, (ObjectFunc) Aquas_801B6FF8, D_AQ_603144C, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_ACTOR_263 */ {(void*) Aquas_801BA108, 2, (ObjectFunc) Aquas_801B91A4, D_AQ_6031480, 200.0f, 0, 0, 40, 0, 0.0f, 1 }, + /* OBJ_ACTOR_264 */ {(void*) Aquas_801BA4E4, 1, (ObjectFunc) Aquas_801BA26C, D_edata_800CBE8C, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_ACTOR_265 */ {(void*) Aquas_801BAD7C, 1, (ObjectFunc) Aquas_801BA6A4, D_AQ_6031500, 200.0f, 0, 0, 40, 0, 0.0f, 1 }, + /* OBJ_ACTOR_266 */ {(void*) Aquas_801BB204, 2, (ObjectFunc) Aquas_801BADF8, D_AQ_6031538, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_ACTOR_267 */ {(void*) Aquas_801BC930, 2, (ObjectFunc) Aquas_801BB79C, D_AQ_6031554, 800.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_ACTOR_268 */ {(void*) Aquas_801BDE6C, 1, (ObjectFunc) Aquas_801BD54C, D_AQ_6031570, 10000.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_ACTOR_269 */ {(void*) Aquas_801BD264, 1, (ObjectFunc) Aquas_801BC9A0, D_AQ_6030D20, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_ACTOR_270 */ {(void*) Aquas_801BEB1C, 1, (ObjectFunc) Aquas_801BE3F8, D_AQ_60314C8, 1000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_ACTOR_271 */ {(void*) func_360_8002E694, 2, (ObjectFunc) func_360_8002E670, D_BO_6011B24, 0.0f, 0, 0, 39, 0, 730.0f, 1 }, + /* OBJ_ACTOR_272 */ {(void*) func_360_8002E6DC, 1, (ObjectFunc) func_360_8002E6B8, D_BO_6011BF4, 0.0f, 0, 0, 39, 0, 150.0f, 1 }, + /* OBJ_ACTOR_273 */ {(void*) Fortuna_80188FE4, 2, (ObjectFunc) Fortuna_80188AD0, D_FO_600FF30, 0.0f, 0, 0, 39, 0, 220.0f, 1 }, + /* OBJ_ACTOR_274 */ {(void*) SectorZ_8019E3A8, 1, (ObjectFunc) SectorZ_8019E234, D_edata_800CBEC4, 0.0f, 0, 0, 39, 0, 1.0f, 0 }, + /* OBJ_ACTOR_275 */ {(void*) Solar_8019F7AC, 1, (ObjectFunc) Solar_8019F20C, D_edata_800CBE8C, 200.0f, 0, 0, 39, 0, 1.0f, 1 }, + /* OBJ_ACTOR_276 */ {(void*) Solar_8019F7AC, 1, (ObjectFunc) Solar_8019F20C, D_edata_800CBE8C, 200.0f, 0, 0, 39, 0, 1.0f, 1 }, + /* OBJ_ACTOR_277 */ {(void*) Solar_8019F7AC, 1, (ObjectFunc) Solar_8019F20C, D_edata_800CBEC4, 200.0f, 0, 0, 39, 0, 1.0f, 1 }, + /* OBJ_ACTOR_278 */ {(void*) NULL, 1, (ObjectFunc) Solar_8019EA7C, D_edata_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 1 }, + /* OBJ_ACTOR_279 */ {(void*) NULL, 1, (ObjectFunc) Solar_801A003C, D_edata_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 1 }, + /* OBJ_ACTOR_280 */ {(void*) D_VE1_900DD20, 0, (ObjectFunc) Venom1_80192518, D_VE1_601B7F8, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_281 */ {(void*) Venom1_80192E2C, 1, (ObjectFunc) Venom1_80192CD4, D_VE1_601B830, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_282 */ {(void*) D_VE1_901DA50, 0, (ObjectFunc) Venom1_80192CD4, D_VE1_601B868, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_283 */ {(void*) D_VE1_9023AD0, 0, (ObjectFunc) Venom1_80192EB0, D_VE1_601B8A0, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_284 */ {(void*) Venom1_801934D0, 1, (ObjectFunc) Venom1_801933DC, D_VE1_601B8D8, 1000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_ACTOR_285 */ {(void*) Andross_80193244, 1, (ObjectFunc) Andross_80192E94, D_edata_800CBE8C, 1000.0f, 0, 0, 20, 0, 1.0f, 1 }, + /* OBJ_ACTOR_286 */ {(void*) Andross_80188660, 1, (ObjectFunc) Andross_80188528, D_edata_800CBE8C, 1000.0f, 0, 0, 20, 0, 0.0f, 0 }, + /* OBJ_ACTOR_287 */ {(void*) NULL, 1, (ObjectFunc) Andross_80189724, D_edata_800CBF34, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJ_ACTOR_288 */ {(void*) NULL, 1, (ObjectFunc) Andross_801893B8, D_edata_800CBF34, 1000.0f, 0, 0, 20, 1, 0.0f, 0 }, + /* OBJ_ACTOR_289 */ {(void*) func_edata_800596B0, 1, (ObjectFunc) Andross_80189470, D_edata_800CBF34, 1000.0f, 0, 0, 20, 1, 0.0f, 0 }, + /* OBJ_ACTOR_290 */ {(void*) NULL, 1, (ObjectFunc) Andross_8018933C, D_edata_800CBF34, 1000.0f, 0, 0, 20, 0, 0.0f, 0 }, + /* OBJ_ACTOR_291 */ {(void*) func_enmy_80067874, 1, (ObjectFunc) func_enmy_8006753C, D_edata_800CBEA8, 1000.0f, 0, 0, 0, 0, 1.0f, 0 }, + /* OBJ_BOSS_292 */ {(void*) Corneria_8018AA74, 2, (ObjectFunc) Corneria_80189058, D_CO_603E620, 20000.0f, 0, 0, 40, 1, 0.0f, 10 }, + /* OBJ_BOSS_293 */ {(void*) Corneria_8018ECAC, 1, (ObjectFunc) Corneria_8018C19C, D_CO_603E840, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJ_BOSS_294 */ {(void*) Corneria_8018ED78, 1, (ObjectFunc) Corneria_8018DDAC, D_CO_603E714, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJ_BOSS_295 */ {(void*) Corneria_8018EE84, 1, (ObjectFunc) Corneria_8018E290, D_CO_603E748, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJ_BOSS_296 */ {(void*) Corneria_8018EF90, 1, (ObjectFunc) Corneria_8018E76C, D_CO_603E7C4, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJ_BOSS_297 */ {(void*) Meteo_8018BACC, 1, (ObjectFunc) Meteo_8018978C, D_ME_602F75C, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJ_BOSS_298 */ {(void*) Meteo_801887D0, 1, (ObjectFunc) Meteo_80188344, D_ME_602FA50, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJ_BOSS_299 */ {(void*) func_boss_80042FC4, 2, (ObjectFunc) func_boss_80042FB8, D_edata_800CBF34, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJ_BOSS_300 */ {(void*) func_boss_80042FE8, 1, (ObjectFunc) func_boss_80042FDC, D_edata_800CBF34, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJ_BOSS_301 */ {(void*) Aquas_801BEC5C, 1, (ObjectFunc) Aquas_801BEC50, D_AQ_6030B10, 0.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJ_BOSS_A6 */ {(void*) Area6_8018C54C, 1, (ObjectFunc) Area6_80187944, D_A6_6028454, 2000.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJ_BOSS_303 */ {(void*) SectorX_80193434, 2, (ObjectFunc) SectorX_80190078, D_SX_6032550, 20000.0f, 0, 0, 20, 0, 0.0f, 10 }, + /* OBJ_BOSS_304 */ {(void*) SectorX_8018FF84, 2, (ObjectFunc) SectorX_8018FE38, D_SX_6032488, 1000.0f, 0, 0, 20, 0, 0.0f, 10 }, + /* OBJ_BOSS_305 */ {(void*) SectorX_80190020, 2, (ObjectFunc) SectorX_8018FF20, D_SX_60324EC, 1000.0f, 0, 0, 20, 0, 0.0f, 10 }, + /* OBJ_BOSS_306 */ {(void*) Titania_801982A8, 1, (ObjectFunc) Titania_80197A94,D_TI_801B83A8, 1000.0f, 0, 0, 40, 1, 0.0f, 10 }, + /* OBJ_BOSS_ZO */ {(void*) Zoness_801949DC, 2, (ObjectFunc) Zoness_80194A84, D_ZO_602C044, 1000.0f, 0, 0, 40, 0, 1.0f, 10 }, + /* OBJ_BOSS_308 */ {(void*) func_hud_8008FE78, 1, (ObjectFunc) func_hud_800907C4, D_FO_600FFE0, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, + /* OBJ_BOSS_309 */ {(void*) func_360_8002E604, 1, (ObjectFunc) func_360_8002E5E0, D_edata_800CBF34, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, + /* OBJ_BOSS_310 */ {(void*) func_360_8002E64C, 1, (ObjectFunc) func_360_8002E628, D_edata_800CBF34, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, + /* OBJ_BOSS_311 */ {(void*) Bolse_80191AFC, 2, (ObjectFunc) Bolse_801912FC, D_BO_6011C80, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, + /* OBJ_BOSS_312 */ {(void*) Venom2_80196288, 2, (ObjectFunc) Venom2_80196210, D_VE2_60166F4, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, + /* OBJ_BOSS_313 */ {(void*) SectorZ_8019E98C, 1, (ObjectFunc) SectorZ_8019E454, D_SZ_6009388, 0.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJ_BOSS_314 */ {(void*) SectorY_8019E2C4, 2, (ObjectFunc) SectorY_8019C888, D_edata_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJ_BOSS_SO */ {(void*) Solar_801A71B8, 2, (ObjectFunc) Solar_801A5B3C, D_edata_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJ_BOSS_316 */ {(void*) Katina_801968F4, 1, (ObjectFunc) Katina_801946C4, D_KA_6011058, 0.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJ_BOSS_317 */ {(void*) Katina_80193B1C, 1, (ObjectFunc) Katina_80193718, D_KA_601115C, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, + /* OBJ_BOSS_AQ */ {(void*) Aquas_801B4D84, 2, (ObjectFunc) Aquas_801B134C, D_AQ_6030F74, 10000.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJ_BOSS_319 */ {(void*) Venom1_801985E4, 1, (ObjectFunc) Venom1_80194398,D_VE1_8019A9B8, 3000.0f, 0, 0, 40, 1, 0.0f, 10 }, + /* OBJ_BOSS_320 */ {(void*) Andross_801928C8, 2, (ObjectFunc) Andross_8018DBF0, D_ANDROSS_C038DC0, 10000.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJ_BOSS_321 */ {(void*) Andross_8018B8C0, 1, (ObjectFunc) Andross_80189B70, D_ANDROSS_C038F24, 10000.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJ_ITEM_LASERS */ {(void*) func_edisplay_8005CC9C, 1, (ObjectFunc) func_enmy_80067F6C, D_edata_800CBFA8, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_ITEM_CHECKPOINT */ {(void*) func_edisplay_8005C5F0, 1, (ObjectFunc) func_enmy_80068914, D_edata_800CBF38, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_ITEM_SILVER_RING */ {(void*) func_edisplay_8005C900, 1, (ObjectFunc) func_enmy_80068020, D_edata_800CBF54, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_ITEM_SILVER_STAR */ {(void*) func_edisplay_8005C9C0, 1, (ObjectFunc) func_enmy_800685D8, D_edata_800CBF54, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_ITEM_METEO_WARP */ {(void*) func_edisplay_8005CDA8, 1, (ObjectFunc) func_enmy_80068688, D_edata_800CBF70, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_ITEM_BOMB */ {(void*) func_edisplay_8005CB44, 1, (ObjectFunc) func_enmy_80067BEC, D_edata_800CBFC8, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_ITEM_328 */ {(void*) NULL, 1, (ObjectFunc) func_enmy_80068C88, D_edata_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_ITEM_329 */ {(void*) NULL, 1, (ObjectFunc) func_enmy_80068C88, D_edata_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_ITEM_330 */ {(void*) NULL, 1, (ObjectFunc) func_enmy_80068C88, D_edata_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_ITEM_331 */ {(void*) NULL, 1, (ObjectFunc) func_enmy_80068C88, D_edata_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_ITEM_332 */ {(void*) NULL, 1, (ObjectFunc) func_enmy_80068C88, D_edata_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_ITEM_333 */ {(void*) NULL, 1, (ObjectFunc) func_enmy_80068C88, D_edata_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_ITEM_334 */ {(void*) NULL, 1, (ObjectFunc) func_enmy_80068C48, D_edata_800CBF18, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_ITEM_1UP */ {(void*) D_1022120, 0, (ObjectFunc) func_enmy_80067B1C, D_edata_800CBE8C, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_ITEM_GOLD_RING */ {(void*) func_edisplay_8005CA80, 1, (ObjectFunc) func_enmy_800685F8, D_edata_800CBF54, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_ITEM_WING_REPAIR */ {(void*) D_arwing_3007650, 0, (ObjectFunc) func_enmy_80068618, D_edata_800CBFA8, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_ITEM_TRAINING_RING */ {(void*) gItemTrainingRingDL, 0, (ObjectFunc) Training_80198968, D_TR_6009CFC, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_339 */ {(void*) func_effect_8007D55C, 1, (ObjectFunc) func_effect_8007D2F4, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_340 */ {(void*) func_effect_8007D55C, 1, (ObjectFunc) func_effect_8007D748, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_341 */ {(void*) func_effect_8007D55C, 1, (ObjectFunc) func_effect_8007D8A8, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_342 */ {(void*) func_effect_8007E330, 1, (ObjectFunc) func_effect_8007E298, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_343 */ {(void*) func_effect_8007CAF0, 1, (ObjectFunc) func_effect_8007C9E0, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_344 */ {(void*) func_effect_8007868C, 1, (ObjectFunc) func_effect_8007E014, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_345 */ {(void*) func_effect_8007879C, 1, (ObjectFunc) func_effect_8007E258, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_346 */ {(void*) func_effect_800788B0, 1, (ObjectFunc) func_effect_8007F438, NULL, -200.0f, 1, 0, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_347 */ {(void*) func_effect_800783C0, 1, (ObjectFunc) func_effect_8007B758, NULL, 100.0f, 1, 0, 40, 0, 0.0f, 0 }, + /* OBJ_EFFECT_348 */ {(void*) func_effect_80078A64, 1, (ObjectFunc) func_effect_8007F6B0, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_349 */ {(void*) NULL, 1, (ObjectFunc) func_effect_8007F958, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_350 */ {(void*) NULL, 1, (ObjectFunc) func_effect_8007FBE0, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_351 */ {(void*) func_effect_80078438, 1, (ObjectFunc) func_effect_8007E3E4, NULL, -200.0f, 1, 1, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_352 */ {(void*) func_effect_800784B4, 1, (ObjectFunc) func_effect_8007B62C, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_353 */ {(void*) func_effect_80078B8C, 1, (ObjectFunc) func_effect_8007FE88, NULL, 100.0f, 0, 0, 20, 0, 0.0f, 0 }, + /* OBJ_EFFECT_354 */ {(void*) SectorY_80197C64, 1, (ObjectFunc) func_effect_8007FE88, NULL, 100.0f, 0, 0, 20, 0, 0.0f, 0 }, + /* OBJ_EFFECT_355 */ {(void*) func_effect_80078AEC, 1, (ObjectFunc) func_effect_800802B8, NULL, 100.0f, 1, 0, 20, 1, 0.0f, 0 }, + /* OBJ_EFFECT_356 */ {(void*) func_effect_80078C84, 1, (ObjectFunc) func_effect_800802F8, NULL, 100.0f, 1, 0, 20, 0, 0.0f, 0 }, + /* OBJ_EFFECT_357 */ {(void*) func_effect_800798F0, 1, (ObjectFunc) func_effect_8007968C, NULL, 100.0f, 0, 1, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_358 */ {(void*) Katina_80192A68, 1, (ObjectFunc) Katina_80192984, NULL, 100.0f, 1, 1, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_359 */ {(void*) func_effect_8007AA60, 1, (ObjectFunc) func_effect_8007A994, NULL, -100.0f, 1, 2, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_360 */ {(void*) func_effect_8007BEE8, 1, (ObjectFunc) func_effect_8007BE54, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_361 */ {(void*) func_effect_8007BEE8, 1, (ObjectFunc) func_effect_8007BDE0, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_362 */ {(void*) func_effect_8007BEE8, 1, (ObjectFunc) func_effect_8007BCE8, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_363 */ {(void*) func_hud_80094BBC, 1, (ObjectFunc) func_hud_80094954, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_364 */ {(void*) func_effect_8007B9DC, 1, (ObjectFunc) func_effect_8007B960, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_365 */ {(void*) func_effect_8007E5CC, 1, (ObjectFunc) func_effect_8007E45C, NULL, -200.0f, 1, 1, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_366 */ {(void*) func_effect_80078550, 1, (ObjectFunc) Aquas_801AC918, NULL, 100.0f, 1, 2, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_367 */ {(void*) func_effect_80078604, 1, (ObjectFunc) func_effect_8007E648, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_368 */ {(void*) Titania_80188FA8, 1, (ObjectFunc) Titania_80188F60, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_369 */ {(void*) Meteo_8018DCE4, 1, (ObjectFunc) Meteo_80188CAC, NULL, 100.0f, 0, 1, 40, 0, 0.0f, 0 }, + /* OBJ_EFFECT_370 */ {(void*) Meteo_8018DBEC, 1, (ObjectFunc) Meteo_80188FAC, NULL, 100.0f, 0, 1, 40, 0, 0.0f, 0 }, + /* OBJ_EFFECT_371 */ {(void*) Meteo_8018DE14, 1, (ObjectFunc) Meteo_80189114, NULL, 100.0f, 0, 1, 40, 0, 0.0f, 0 }, + /* OBJ_EFFECT_372 */ {(void*) func_effect_80077A00, 1, (ObjectFunc) func_effect_8007AB50, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_373 */ {(void*) NULL, 1, (ObjectFunc) func_effect_8007A748, NULL, 500.0f, 0, 1, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_374 */ {(void*) func_effect_8007DED4, 1, (ObjectFunc) func_effect_8007DB70, NULL, 100.0f, 0, 1, 40, 0, 0.0f, 0 }, + /* OBJ_EFFECT_375 */ {(void*) func_effect_8007DAE4, 1, (ObjectFunc) func_effect_8007DA58, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_376 */ {(void*) func_effect_80078CE8, 1, (ObjectFunc) func_effect_80080360, NULL, -200.0f, 1, 0, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_377 */ {(void*) func_effect_80078BE0, 1, (ObjectFunc) func_effect_800802D8, NULL, 100.0f, 1, 0, 20, 0, 0.0f, 0 }, + /* OBJ_EFFECT_378 */ {(void*) Macbeth_801A5AF0, 1, (ObjectFunc) Macbeth_801A57D0, NULL, 100.0f, 0, 0, 20, 0, 0.0f, 0 }, + /* OBJ_EFFECT_379 */ {(void*) Macbeth_801AEAA0, 1, (ObjectFunc) Macbeth_801AE87C, NULL, 100.0f, 1, 1, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_380 */ {(void*) Macbeth_801A5D68, 1, (ObjectFunc) Macbeth_801A5B4C, NULL, 100.0f, 0, 0, 20, 0, 0.0f, 0 }, + /* OBJ_EFFECT_381 */ {(void*) func_effect_80077A7C, 1, (ObjectFunc) func_effect_8007B0F4, NULL, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_382 */ {(void*) NULL, 1, (ObjectFunc) func_effect_8007B040, NULL, 200.0f, 0, 1, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_383 */ {(void*) func_effect_8007A3C0, 1, (ObjectFunc) func_effect_8007A28C, NULL, 10000.0f, 0, 1, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_384 */ {(void*) func_effect_80077B84, 1, (ObjectFunc) func_effect_8007B3B8, NULL, -200.0f, 1, 1, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_385 */ {(void*) func_effect_80078038, 1, (ObjectFunc) func_effect_8007B5C0, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_386 */ {(void*) NULL, 1, (ObjectFunc) func_effect_8007C250, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_387 */ {(void*) NULL, 1, (ObjectFunc) func_effect_8007C8C4, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_388 */ {(void*) func_effect_80077B78, 1, (ObjectFunc) func_effect_8007B670, NULL, -200.0f, 1, 1, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_389 */ {(void*) func_effect_800780F8, 1, (ObjectFunc) func_effect_8007B67C, NULL, -200.0f, 1, 1, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_390 */ {(void*) NULL, 1, (ObjectFunc) func_effect_8007C50C, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_391 */ {(void*) func_effect_80083B8C, 1, (ObjectFunc) func_effect_800837EC, NULL, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_392 */ {(void*) Solar_801A0AF0, 1, (ObjectFunc) Solar_801A0120, NULL, 300.0f, 1, 2, 10, 0, 0.0f, 0 }, + /* OBJ_EFFECT_393 */ {(void*) func_effect_80078F78, 1, (ObjectFunc) func_effect_80078EBC, NULL, 300.0f, 1, 1, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_394 */ {(void*) func_effect_80080D04, 1, (ObjectFunc) func_effect_80080ACC, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 }, + /* OBJ_EFFECT_395 */ {(void*) func_effect_80082F78, 1, (ObjectFunc) func_effect_80081C5C, NULL, 300.0f, 0, 1, 40, 0, 0.0f, 0 }, + /* OBJ_EFFECT_396 */ {(void*) Andross_8018CF98, 1, (ObjectFunc) Andross_8018CAD4, NULL, 2000.0f, 0, 1, 40, 2, 0.0f, 0 }, + /* OBJ_EFFECT_397 */ {(void*) Bolse_80191180, 1, (ObjectFunc) Bolse_80191054, NULL, 2000.0f, 0, 1, 20, 0, 0.0f, 0 }, + /* OBJ_EFFECT_398 */ {(void*) func_effect_8008092C, 1, (ObjectFunc) func_effect_8008040C, NULL, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJ_EFFECT_399 */ {(void*) func_effect_80084194, 1, (ObjectFunc) func_effect_80083FA8, NULL, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, }; // clang-format on diff --git a/src/main/fox_edisplay.c b/src/main/fox_edisplay.c index 0515f059..a5bfcfe7 100644 --- a/src/main/fox_edisplay.c +++ b/src/main/fox_edisplay.c @@ -21,15 +21,16 @@ #include "assets/ast_ve1_boss.h" #include "assets/ast_zoness.h" // #include "prevent_bss_reordering.h" -Vec3f D_801615D0; -Vec3f D_801615E0; -s32 D_801615EC; -Matrix D_801615F0; -WingInfo D_80161630; -char D_800CF970[] = "$Id: fox_edisplay.c,v 1.196 1997/05/08 08:31:50 morita Exp $"; +Vec3f D_edisplay_801615D0; +Vec3f D_edisplay_801615E0; +s32 D_edisplay_801615EC; +Matrix D_edisplay_801615F0; +WingInfo D_edisplay_80161630; -void func_800596C0(void) { +char D_edisplay_800CF970[] = "$Id: fox_edisplay.c,v 1.196 1997/05/08 08:31:50 morita Exp $"; + +void func_edisplay_800596C0(void) { Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 13.0f * M_DTOR, 1); Matrix_Scale(gGfxMatrix, 1.02f, 0.98f, 1.0f, 1); Matrix_RotateZ(gGfxMatrix, -(f32) gGameFrameCount * 13.0f * M_DTOR, 1); @@ -37,7 +38,7 @@ void func_800596C0(void) { Matrix_SetGfxMtx(&gMasterDisp); } -void func_800597C0(s32 arg0) { +void func_edisplay_800597C0(s32 arg0) { if (arg0 < 0) { gSPSetGeometryMode(gMasterDisp++, G_CULL_FRONT); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); @@ -49,22 +50,22 @@ void Graphics_SetScaleMtx(f32 scale) { Matrix_SetGfxMtx(&gMasterDisp); } -void func_80059850(Object_4C* obj4C) { +void func_edisplay_80059850(Object_4C* obj4C) { RCP_SetupDL(&gMasterDisp, 0x40); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 60); RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } -void func_800598DC(s32 arg0) { +void func_edisplay_800598DC(s32 arg0) { } -void func_800598E8(Actor* actor) { +void func_edisplay_800598E8(Actor* actor) { RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); gSPDisplayList(gMasterDisp++, D_MA_6025B50); RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } -void func_800599A4(s32 limbIndex, Vec3f* rot, void* index) { +void func_edisplay_800599A4(s32 limbIndex, Vec3f* rot, void* index) { Vec3f sp24; Vec3f sp18; @@ -77,59 +78,59 @@ void func_800599A4(s32 limbIndex, Vec3f* rot, void* index) { } } -f32 D_800CF9B0[] = { +f32 D_edisplay_800CF9B0[] = { -12.324226f, -12.008495f, -11.083107f, -9.56147f, -7.440754f, -4.713318f, -1.393303f, 2.48587f, 6.872662f, 11.668991f, 16.752102f, 21.98127f, 27.193024f, 32.21534f, 36.875694f, 41.007812f, 44.462303f, 47.094223f, 48.761005f, 49.345966f, 47.6453f, 42.988186f, 36.062622f, 27.662722f, 18.646473f, 9.883305f, 2.113918f, -4.157948f, -8.673706f, -11.395222f, -12.324226f, }; -f32 D_800CFA2C[] = { +f32 D_edisplay_800CFA2C[] = { 1.0f, 1.0f, 0.95f, 0.9f, 0.85f, 0.8f, 0.75f, 0.7f, 0.65f, 0.6f, }; -void func_80059A24(Actor* actor) { +void func_edisplay_80059A24(Actor* actor) { Vec3f sp30[30]; - f32 temp = D_800CF9B0[actor->unk_0B6] - 114.0f; + f32 temp = D_edisplay_800CF9B0[actor->unk_0B6] - 114.0f; Matrix_Translate(gGfxMatrix, 0.f, -temp, 0.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); Animation_GetFrameData(&D_ME_601E8C4, actor->unk_0B6, sp30); - Animation_DrawSkeleton(1, D_ME_601E9D0, sp30, NULL, func_800599A4, &actor->index, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_ME_601E9D0, sp30, NULL, func_edisplay_800599A4, &actor->index, &gIdentityMatrix); } -void func_80059AEC(Object_80* obj80) { +void func_edisplay_80059AEC(Object_80* obj80) { gSPDisplayList(gMasterDisp++, D_ME_601AE40); } -void func_80059B20(Object_80* obj80) { +void func_edisplay_80059B20(Object_80* obj80) { if (obj80->obj.id == OBJ_80_29) { gSPDisplayList(gMasterDisp++, D_TI1_7007350); } else { - Graphics_SetScaleMtx(D_800CF9B0[obj80->obj.id + 2]); + Graphics_SetScaleMtx(D_edisplay_800CF9B0[obj80->obj.id + 2]); gSPDisplayList(gMasterDisp++, D_TI1_700BB10); } } -void func_80059BB0(void* arg0) { +void func_edisplay_80059BB0(void* arg0) { } -void func_80059BBC(Object_80* obj80) { +void func_edisplay_80059BBC(Object_80* obj80) { gSPDisplayList(gMasterDisp++, D_CO_6023AC0); } -void func_80059BF0(Actor* actor) { +void func_edisplay_80059BF0(Actor* actor) { if (actor->unk_0B6 != 0) { gSPDisplayList(gMasterDisp++, D_CO_6032BC0); } } -void func_80059C28(void* arg0) { +void func_edisplay_80059C28(void* arg0) { } -void func_80059C34(Object_4C* obj4C) { +void func_edisplay_80059C34(Object_4C* obj4C) { } -void func_80059C40(Object_4C* obj4C) { +void func_edisplay_80059C40(Object_4C* obj4C) { RCP_SetupDL_47(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 180); switch (obj4C->unk_45) { @@ -168,17 +169,17 @@ void func_80059C40(Object_4C* obj4C) { RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } -void func_80059F68(Item* item) { +void func_edisplay_80059F68(Item* item) { Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -95.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_CO_602DA20); } -void func_80059FDC(Item* item) { +void func_edisplay_80059FDC(Item* item) { gSPDisplayList(gMasterDisp++, D_CO_6035DA0); } -void func_8005A010(Object_4C* obj4C) { +void func_edisplay_8005A010(Object_4C* obj4C) { if (obj4C->unk_48 == 0) { Matrix_RotateY(gGfxMatrix, M_PI / 2, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -186,56 +187,56 @@ void func_8005A010(Object_4C* obj4C) { } } -void func_8005A07C(void* arg0) { +void func_edisplay_8005A07C(void* arg0) { } -void func_8005A088(void* arg0) { +void func_edisplay_8005A088(void* arg0) { } -Gfx* D_800CFA54[] = { +Gfx* D_edisplay_800CFA54[] = { D_SY_6027960, D_SY_60273A0, D_SY_60183B0, D_SY_60121E0, D_SY_602A2E0, D_SY_602A720, D_SY_602B8F0, D_SY_602A8C0, D_SY_6028E70, D_SY_602E0A0, D_SY_602DE70, D_SY_602DC40, D_SY_602D830, D_SY_602D340, D_CO_6031280, D_CO_6031130, D_CO_6030850, D_CO_6030FD0, D_CO_602DD40, D_CO_6033AF0, D_CO_60186E0, D_CO_6024160, D_CO_6033290, D_CO_6017F10, D_FO_60074E0, D_FO_6007590, D_FO_6007730, D_FO_6005CC0, }; -Gfx* D_800CFAC4[] = { +Gfx* D_edisplay_800CFAC4[] = { D_ZO_60176D0, D_ZO_6017810, D_ZO_6017770, D_ZO_6016D90, D_ZO_6016E30, D_ZO_60178B0, }; -Gfx* D_800CFADC[] = { +Gfx* D_edisplay_800CFADC[] = { D_ZO_6023690, D_ZO_6021BB0, D_ZO_6021C50, D_ZO_6021CE0, D_ZO_6021D80, D_ZO_6016350, D_ZO_6021E20, D_ZO_60222A0, D_ZO_6022BE0, D_ZO_6022D70, D_ZO_6022F00, }; -Gfx* D_800CFB08[] = { D_ZO_6020F10, D_ZO_6021100, D_ZO_60214B0 }; -Gfx* D_800CFB14[] = { D_ZO_60163E0, D_ZO_60165D0, D_ZO_6016880, D_ZO_6016B50, D_ZO_6000C40 }; -Gfx* D_800CFB28[] = { D_CO_6018E80, D_ZO_601F620, D_ZO_601F420, D_ZO_6018C80, D_ZO_601F940, D_ZO_601F260 }; -Gfx* D_800CFB40[] = { +Gfx* D_edisplay_800CFB08[] = { D_ZO_6020F10, D_ZO_6021100, D_ZO_60214B0 }; +Gfx* D_edisplay_800CFB14[] = { D_ZO_60163E0, D_ZO_60165D0, D_ZO_6016880, D_ZO_6016B50, D_ZO_6000C40 }; +Gfx* D_edisplay_800CFB28[] = { D_CO_6018E80, D_ZO_601F620, D_ZO_601F420, D_ZO_6018C80, D_ZO_601F940, D_ZO_601F260 }; +Gfx* D_edisplay_800CFB40[] = { D_SO_6014DB0, D_SO_60146D0, D_SO_6014B80, D_SO_6014470, D_SO_6014930, D_SO_60138A0, D_SO_60151A0, D_SO_600F750, D_SO_6015810, }; -Gfx* D_800CFB64[] = { +Gfx* D_edisplay_800CFB64[] = { D_AQ_600D4A0, D_AQ_600D720, D_AQ_600D810, D_AQ_600CFF0, D_AQ_600BD20, D_AQ_600D390, D_AQ_600E150, D_AQ_6007160, D_AQ_600D900, }; -Gfx* D_800CFB88[] = { +Gfx* D_edisplay_800CFB88[] = { D_AQ_600A8E0, D_AQ_600A840, D_AQ_600A480, D_AQ_600A720, D_AQ_600A970, D_AQ_6007D70, D_AQ_600A520, D_AQ_6009990, }; -Gfx* D_800CFBA8[] = { +Gfx* D_edisplay_800CFBA8[] = { D_AQ_6026460, D_AQ_60266B0, D_AQ_6026950, D_AQ_60276F0, D_AQ_6027810, D_AQ_6027330, D_AQ_60273C0, D_AQ_6026E30, D_AQ_6026EC0, D_AQ_6026DA0, D_AQ_6026D10, D_AQ_6026C80, D_AQ_6026BF0, D_AQ_6027460, D_AQ_6026F60, }; -Gfx* D_800CFBE4[] = { D_AQ_60040F0, D_AQ_6027C90, D_AQ_6027FA0, D_AQ_6003350, D_AQ_6028240, - D_AQ_6028550, D_AQ_6004DB0, D_AQ_6027930, D_AQ_600F030, D_AQ_60050F0 }; -Gfx* D_800CFC0C[] = { +Gfx* D_edisplay_800CFBE4[] = { D_AQ_60040F0, D_AQ_6027C90, D_AQ_6027FA0, D_AQ_6003350, D_AQ_6028240, + D_AQ_6028550, D_AQ_6004DB0, D_AQ_6027930, D_AQ_600F030, D_AQ_60050F0 }; +Gfx* D_edisplay_800CFC0C[] = { D_AQ_60294A0, D_AQ_60291B0, D_AQ_60287F0, D_AQ_6029330, D_AQ_6029240, D_AQ_6029790, D_AQ_6029900, D_AQ_6028F50, D_AQ_60290C0, D_AQ_6029530, D_AQ_60296A0, D_AQ_6028A80, D_AQ_6028910, }; -Gfx* D_800CFC40[] = { D_AQ_6014FD0, D_AQ_6014FD0, D_AQ_6014FD0, D_AQ_6014FD0 }; -Gfx* D_800CFC50[] = { D_AQ_601EDE0, D_AQ_601F2F0, D_AQ_601F830, D_AQ_601FD70, D_AQ_601D110 }; -Gfx* D_800CFC64[] = { D_AQ_6023940, D_AQ_6023D70, D_AQ_60249C0, D_AQ_6023EB0, D_AQ_60249C0, D_AQ_6023B80 }; -Gfx* D_800CFC7C[] = { D_ZO_601B570, D_ZO_601B710, D_ZO_60209B0, D_ZO_6020B70, D_ZO_6020D50, - D_ZO_601B8F0, D_ZO_601B3B0, D_ZO_601B1C0, D_ZO_6011660 }; +Gfx* D_edisplay_800CFC40[] = { D_AQ_6014FD0, D_AQ_6014FD0, D_AQ_6014FD0, D_AQ_6014FD0 }; +Gfx* D_edisplay_800CFC50[] = { D_AQ_601EDE0, D_AQ_601F2F0, D_AQ_601F830, D_AQ_601FD70, D_AQ_601D110 }; +Gfx* D_edisplay_800CFC64[] = { D_AQ_6023940, D_AQ_6023D70, D_AQ_60249C0, D_AQ_6023EB0, D_AQ_60249C0, D_AQ_6023B80 }; +Gfx* D_edisplay_800CFC7C[] = { D_ZO_601B570, D_ZO_601B710, D_ZO_60209B0, D_ZO_6020B70, D_ZO_6020D50, + D_ZO_601B8F0, D_ZO_601B3B0, D_ZO_601B1C0, D_ZO_6011660 }; -void func_8005A094(Actor* actor) { +void func_edisplay_8005A094(Actor* actor) { switch (actor->state) { case 0: Matrix_Translate(gGfxMatrix, 18.0f, 15.0f, -15.0f, 1); @@ -266,7 +267,7 @@ void func_8005A094(Actor* actor) { break; case 39: gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); - gSPDisplayList(gMasterDisp++, D_800CFAC4[actor->unk_048]); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFAC4[actor->unk_048]); break; case 40: gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255); @@ -286,7 +287,7 @@ void func_8005A094(Actor* actor) { break; } if (gCurrentLevel != LEVEL_SOLAR) { - gSPDisplayList(gMasterDisp++, D_i5_801B769C[actor->unk_046]); + gSPDisplayList(gMasterDisp++, D_TI_801B769C[actor->unk_046]); } else { if (gBosses[0].fwork[3] < 4800.0f) { RCP_SetupDL(&gMasterDisp, 0x1E); @@ -298,24 +299,24 @@ void func_8005A094(Actor* actor) { gSPFogPosition(gMasterDisp++, gFogNear, gFogFar); } Graphics_SetScaleMtx(actor->scale); - gSPDisplayList(gMasterDisp++, D_800CFB40[actor->unk_046]); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFB40[actor->unk_046]); } break; case 41: Graphics_SetScaleMtx(actor->scale); - gSPDisplayList(gMasterDisp++, D_800CFADC[actor->unk_048]); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFADC[actor->unk_048]); break; case 42: Graphics_SetScaleMtx(actor->scale); - gSPDisplayList(gMasterDisp++, D_800CFB08[actor->unk_048]); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFB08[actor->unk_048]); break; case 43: Graphics_SetScaleMtx(actor->scale); - gSPDisplayList(gMasterDisp++, D_800CFB14[actor->unk_048]); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFB14[actor->unk_048]); break; case 44: Graphics_SetScaleMtx(actor->scale); - gSPDisplayList(gMasterDisp++, D_800CFB28[actor->unk_048]); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFB28[actor->unk_048]); break; case 45: gSPDisplayList(gMasterDisp++, D_ENMY_PLANET_40018A0); @@ -325,18 +326,18 @@ void func_8005A094(Actor* actor) { RCP_SetupDL(&gMasterDisp, 0x21); } gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); - gSPDisplayList(gMasterDisp++, D_i5_801B7584[actor->unk_048]); + gSPDisplayList(gMasterDisp++, D_TI_801B7584[actor->unk_048]); break; case 47: - gSPDisplayList(gMasterDisp++, D_i5_801B7608[actor->unk_048]); + gSPDisplayList(gMasterDisp++, D_TI_801B7608[actor->unk_048]); break; case 48: Graphics_SetScaleMtx(actor->scale); - gSPDisplayList(gMasterDisp++, D_800CFB64[actor->unk_048]); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFB64[actor->unk_048]); break; case 49: Graphics_SetScaleMtx(actor->scale); - gSPDisplayList(gMasterDisp++, D_800CFB88[actor->unk_048]); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFB88[actor->unk_048]); break; case 50: Graphics_SetScaleMtx(0.7f); @@ -369,30 +370,30 @@ void func_8005A094(Actor* actor) { break; case 51: Graphics_SetScaleMtx(actor->scale); - gSPDisplayList(gMasterDisp++, D_800CFBA8[actor->unk_048]); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFBA8[actor->unk_048]); break; case 52: Graphics_SetScaleMtx(actor->scale); - gSPDisplayList(gMasterDisp++, D_800CFBE4[actor->unk_048]); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFBE4[actor->unk_048]); break; case 53: Graphics_SetScaleMtx(actor->scale); - gSPDisplayList(gMasterDisp++, D_800CFC0C[actor->unk_048]); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFC0C[actor->unk_048]); break; case 54: Graphics_SetScaleMtx(actor->scale); - gSPDisplayList(gMasterDisp++, D_800CFC40[actor->unk_048]); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFC40[actor->unk_048]); break; case 55: Graphics_SetScaleMtx(actor->scale); - gSPDisplayList(gMasterDisp++, D_800CFC50[actor->unk_048]); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFC50[actor->unk_048]); break; case 56: Graphics_SetScaleMtx(actor->scale); RCP_SetupDL(&gMasterDisp, 0x29); Matrix_SetGfxMtx(&gMasterDisp); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 191, 255, 223, 255); - gSPDisplayList(gMasterDisp++, D_800CFC64[actor->unk_048]); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFC64[actor->unk_048]); break; case 58: Graphics_SetScaleMtx(actor->scale); @@ -402,26 +403,26 @@ void func_8005A094(Actor* actor) { case 59: Graphics_SetScaleMtx(actor->scale); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_800CFC7C[actor->unk_048]); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFC7C[actor->unk_048]); break; case 70: gSPDisplayList(gMasterDisp++, D_10177C0); break; case 57: - gSPDisplayList(gMasterDisp++, D_i1_8019A008[actor->unk_048]); + gSPDisplayList(gMasterDisp++, D_VE1_8019A008[actor->unk_048]); break; default: if (actor->state > 9) { if (actor->state == 0x24) { gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); } - gSPDisplayList(gMasterDisp++, D_800CFA54[actor->state - 10]); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFA54[actor->state - 10]); } break; } } -void func_8005ADAC(Actor* actor) { +void func_edisplay_8005ADAC(Actor* actor) { f32 sp5C; f32 temp1; f32 sp54; @@ -446,7 +447,7 @@ void func_8005ADAC(Actor* actor) { Matrix_RotateY(gGfxMatrix, -gPlayer[gPlayerNum].unk_058, 1); Matrix_RotateX(gGfxMatrix, gPlayer[gPlayerNum].unk_05C, 1); Matrix_SetGfxMtx(&gMasterDisp); - func_8005465C(gLevelType); + func_display_8005465C(gLevelType); Matrix_Pop(&gGfxMatrix); } sp5C = actor->fwork[21]; @@ -478,17 +479,17 @@ void func_8005ADAC(Actor* actor) { } } -f32 D_800CFCA0[] = { +f32 D_edisplay_800CFCA0[] = { 1.7f, 1.8f, 2.0f, 3.0f, 3.0f, 3.0f, 3.0f, 3.0f, }; -void func_8005B1E8(Actor* actor, s32 levelType) { +void func_edisplay_8005B1E8(Actor* actor, s32 levelType) { f32 scale; if ((actor->iwork[11] != 0) && (actor->obj.status == OBJ_ACTIVE)) { scale = 0.63f; if (actor->iwork[11] >= 2) { - scale = D_800CFCA0[actor->iwork[11] - 2] * 0.45f; + scale = D_edisplay_800CFCA0[actor->iwork[11] - 2] * 0.45f; } if (gGameFrameCount & 1) { scale *= 1.2f; @@ -500,12 +501,12 @@ void func_8005B1E8(Actor* actor, s32 levelType) { Matrix_RotateY(gGfxMatrix, -actor->obj.rot.y * M_DTOR, 1); Matrix_RotateY(gGfxMatrix, -gPlayer[gPlayerNum].unk_058, 1); Matrix_SetGfxMtx(&gMasterDisp); - func_8005465C(levelType); + func_display_8005465C(levelType); Matrix_Pop(&gGfxMatrix); } } -void func_8005B388(Actor* actor) { +void func_edisplay_8005B388(Actor* actor) { Vec3f sp3C = { 0.0f, 0.0f, 0.0f }; Vec3f sp30; @@ -521,28 +522,29 @@ void func_8005B388(Actor* actor) { (gCurrentLevel == LEVEL_KATINA) && (actor->index == 1)) || ((gCurrentLevel == LEVEL_SECTOR_Y) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_0) && (actor->state == 5))) { - D_80161630.rightState = gPlayer[0].wings.rightState; - D_80161630.leftState = gPlayer[0].wings.leftState; + D_edisplay_80161630.rightState = gPlayer[0].wings.rightState; + D_edisplay_80161630.leftState = gPlayer[0].wings.leftState; } else { - D_80161630.rightState = D_80161630.leftState = WINGSTATE_INTACT; + D_edisplay_80161630.rightState = D_edisplay_80161630.leftState = WINGSTATE_INTACT; } } else { - D_80161630.rightState = D_80161630.leftState = WINGSTATE_INTACT; + D_edisplay_80161630.rightState = D_edisplay_80161630.leftState = WINGSTATE_INTACT; } - D_80161630.unk_04 = actor->fwork[15]; - D_80161630.unk_0C = actor->fwork[16]; - D_80161630.unk_08 = actor->fwork[26]; - D_80161630.unk_10 = actor->fwork[27]; - D_80161630.unk_14 = D_80161630.unk_18 = D_80161630.unk_1C = D_80161630.unk_20 = D_80161630.unk_38 = - D_80161630.unk_24 = 0.0f; - D_80161630.unk_28 = actor->fwork[17]; - D_80161630.unk_2C = actor->iwork[14]; - D_80161630.unk_30 = actor->fwork[20]; - D_80161630.unk_34 = actor->fwork[19]; + D_edisplay_80161630.unk_04 = actor->fwork[15]; + D_edisplay_80161630.unk_0C = actor->fwork[16]; + D_edisplay_80161630.unk_08 = actor->fwork[26]; + D_edisplay_80161630.unk_10 = actor->fwork[27]; + D_edisplay_80161630.unk_14 = D_edisplay_80161630.unk_18 = D_edisplay_80161630.unk_1C = + D_edisplay_80161630.unk_20 = D_edisplay_80161630.unk_38 = D_edisplay_80161630.unk_24 = 0.0f; + D_edisplay_80161630.unk_28 = actor->fwork[17]; + D_edisplay_80161630.unk_2C = actor->iwork[14]; + D_edisplay_80161630.unk_30 = actor->fwork[20]; + D_edisplay_80161630.unk_34 = actor->fwork[19]; if (gLevelType == LEVELTYPE_SPACE) { - D_80161630.unk_04 = D_80161630.unk_08 = D_80161630.unk_0C = D_80161630.unk_10 = 0.0f; + D_edisplay_80161630.unk_04 = D_edisplay_80161630.unk_08 = D_edisplay_80161630.unk_0C = + D_edisplay_80161630.unk_10 = 0.0f; } - func_80053658(&D_80161630); + func_display_80053658(&D_edisplay_80161630); } else if (gLevelType == LEVELTYPE_PLANET) { gSPDisplayList(gMasterDisp++, D_ENMY_PLANET_40018A0); } else if (gPlayer[0].unk_204 == 2) { @@ -550,28 +552,28 @@ void func_8005B388(Actor* actor) { } else { gSPDisplayList(gMasterDisp++, D_ENMY_SPACE_4007870); } - func_8005ADAC(actor); + func_edisplay_8005ADAC(actor); } -void func_8005B6A4(Actor* actor) { +void func_edisplay_8005B6A4(Actor* actor) { Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, 1.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_ME_6024B60); } -void func_8005B71C(Actor* actor) { +void func_edisplay_8005B71C(Actor* actor) { RCP_SetupDL_29(actor->unk_046, gFogGreen, gFogBlue, gFogAlpha, actor->unk_048, gFogFar); Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 0.5f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_ME_6018C00); } -void func_8005B7CC(Actor* actor) { +void func_edisplay_8005B7CC(Actor* actor) { RCP_SetupDL_29(actor->unk_046, gFogGreen, gFogBlue, gFogAlpha, actor->unk_048, gFogFar); gSPDisplayList(gMasterDisp++, D_ME_6022920); } -void func_8005B848(Actor* actor) { +void func_edisplay_8005B848(Actor* actor) { f32 scale; switch (actor->unk_0B4) { @@ -593,16 +595,16 @@ void func_8005B848(Actor* actor) { Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, 1); actor->iwork[11] = 1; Matrix_Scale(gGfxMatrix, scale, scale, scale, 1); - func_8005B1E8(actor, 2); + func_edisplay_8005B1E8(actor, 2); } -void func_8005B9A4(Actor* actor) { +void func_edisplay_8005B9A4(Actor* actor) { Matrix_Translate(gGfxMatrix, 0.0f, -124.0f, 0.0f, 1); Animation_GetFrameData(&D_CO_6029528, actor->unk_0B6, actor->vwork); Animation_DrawSkeleton(1, D_CO_6029674, actor->vwork, NULL, NULL, actor, &gIdentityMatrix); } -void func_8005BA30(Actor* actor) { +void func_edisplay_8005BA30(Actor* actor) { if (actor->timer_0BC != 0) { RCP_SetupDL_27(); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255); @@ -610,14 +612,14 @@ void func_8005BA30(Actor* actor) { gSPDisplayList(gMasterDisp++, D_CO_6020B40); } -void func_8005BAAC(void) { +void func_edisplay_8005BAAC(void) { } -f32 D_800CFCCC[] = { +f32 D_edisplay_800CFCCC[] = { 0.0f, 0.05f, 0.03f, 0.02f, 0.01f, 0.05f, 0.0f, 0.02f, }; -void func_8005BAB4(ObjectId objId, s32 index) { +void func_edisplay_8005BAB4(ObjectId objId, s32 index) { f32 temp_fv0; f32 temp1; f32 temp2; @@ -653,8 +655,8 @@ void func_8005BAB4(ObjectId objId, s32 index) { gSPDisplayList(gMasterDisp++, D_1024AC0); break; default: - temp1 = D_800CFCCC[gGameFrameCount % 8U]; - temp2 = D_800CFCCC[(gGameFrameCount + 4) % 8U]; + temp1 = D_edisplay_800CFCCC[gGameFrameCount % 8U]; + temp2 = D_edisplay_800CFCCC[(gGameFrameCount + 4) % 8U]; Matrix_Scale(gGfxMatrix, 1.4f + temp1, 0.0f, 1.4f + temp2, 1); Matrix_RotateY(gGfxMatrix, M_PI, 1); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 30.0f, 1); @@ -753,12 +755,12 @@ void func_8005BAB4(ObjectId objId, s32 index) { gSPDisplayList(gMasterDisp++, D_1024AC0); break; case OBJ_BOSS_319: - func_i1_80198310(&gBosses[index]); + Venom1_80198310(&gBosses[index]); break; } } -void func_8005C5F0(Item* item) { +void func_edisplay_8005C5F0(Item* item) { s32 i; if ((gGameFrameCount & 0x18) && (item->state == 0)) { @@ -789,7 +791,7 @@ void func_8005C5F0(Item* item) { gSPClearGeometryMode(gMasterDisp++, G_TEXTURE_GEN); } -void func_8005C900(Item* item) { +void func_edisplay_8005C900(Item* item) { RCP_SetupDL(&gMasterDisp, 0x1D); gSPTexture(gMasterDisp++, 3000, 0, 0, G_TX_RENDERTILE, G_ON); gSPSetGeometryMode(gMasterDisp++, G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR); @@ -798,7 +800,7 @@ void func_8005C900(Item* item) { gSPClearGeometryMode(gMasterDisp++, G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR); } -void func_8005C9C0(Item* item) { +void func_edisplay_8005C9C0(Item* item) { RCP_SetupDL(&gMasterDisp, 0x1D); gSPTexture(gMasterDisp++, 3000, 0, 0, G_TX_RENDERTILE, G_ON); gSPSetGeometryMode(gMasterDisp++, G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR); @@ -807,7 +809,7 @@ void func_8005C9C0(Item* item) { gSPClearGeometryMode(gMasterDisp++, G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR); } -void func_8005CA80(Item* item) { +void func_edisplay_8005CA80(Item* item) { RCP_SetupDL(&gMasterDisp, 0x1D); gSPTexture(gMasterDisp++, 1900, 1700, 0, G_TX_RENDERTILE, G_ON); gSPSetGeometryMode(gMasterDisp++, G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR); @@ -816,7 +818,7 @@ void func_8005CA80(Item* item) { gSPClearGeometryMode(gMasterDisp++, G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR); } -void func_8005CB44(Item* item) { +void func_edisplay_8005CB44(Item* item) { if (gCurrentLevel == LEVEL_AQUAS) { Graphics_SetScaleMtx(item->scale); gSPDisplayList(gMasterDisp++, D_blue_marine_3005980); @@ -833,7 +835,7 @@ void func_8005CB44(Item* item) { } } -void func_8005CC9C(Item* item) { +void func_edisplay_8005CC9C(Item* item) { Graphics_SetScaleMtx(item->scale * 0.1f); RCP_SetupDL(&gMasterDisp, 0x1D); gSPTexture(gMasterDisp++, 2000, 2000, 0, G_TX_RENDERTILE, G_ON); @@ -845,11 +847,11 @@ void func_8005CC9C(Item* item) { gSPDisplayList(gMasterDisp++, D_101A8E0); } -void func_8005CDA8(Item* item) { +void func_edisplay_8005CDA8(Item* item) { s32 i; item->obj.rot.y = (Math_Atan2F(gPlayer[gPlayerNum].camEye.x - item->obj.pos.x, - gPlayer[gPlayerNum].camEye.z - (item->obj.pos.z + D_80177D20)) * + gPlayer[gPlayerNum].camEye.z - (item->obj.pos.z + D_ctx_80177D20)) * 180.0f) / M_PI; if (item->state != 0) { @@ -870,20 +872,20 @@ void func_8005CDA8(Item* item) { gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK | G_LIGHTING); } -void func_8005D008(Object* obj, s32 drawType) { +void func_edisplay_8005D008(Object* obj, s32 drawType) { if (drawType == 2) { - Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, D_80177D20, 1); + Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, D_ctx_80177D20, 1); Matrix_Translate(gCalcMatrix, obj->pos.x, obj->pos.y, obj->pos.z, 0); Matrix_Push(&gGfxMatrix); Matrix_Mult(gGfxMatrix, gCalcMatrix, 1); - Matrix_Copy(&D_801615F0, gGfxMatrix); + Matrix_Copy(&D_edisplay_801615F0, gGfxMatrix); Matrix_Pop(&gGfxMatrix); Matrix_RotateY(gCalcMatrix, obj->rot.y * M_DTOR, 1); Matrix_RotateX(gCalcMatrix, obj->rot.x * M_DTOR, 1); Matrix_RotateZ(gCalcMatrix, obj->rot.z * M_DTOR, 1); } else { - Matrix_Translate(gGfxMatrix, obj->pos.x, obj->pos.y, obj->pos.z + D_80177D20, 1); - Matrix_Copy(&D_801615F0, gGfxMatrix); + Matrix_Translate(gGfxMatrix, obj->pos.x, obj->pos.y, obj->pos.z + D_ctx_80177D20, 1); + Matrix_Copy(&D_edisplay_801615F0, gGfxMatrix); Matrix_RotateY(gGfxMatrix, obj->rot.y * M_DTOR, 1); Matrix_RotateX(gGfxMatrix, obj->rot.x * M_DTOR, 1); Matrix_RotateZ(gGfxMatrix, obj->rot.z * M_DTOR, 1); @@ -891,33 +893,33 @@ void func_8005D008(Object* obj, s32 drawType) { } } -void func_8005D1F0(Object* obj, s32 drawType) { +void func_edisplay_8005D1F0(Object* obj, s32 drawType) { if (drawType == 2) { - Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, D_80177D20, 1); + Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, D_ctx_80177D20, 1); Matrix_Translate(gCalcMatrix, obj->pos.x, obj->pos.y, obj->pos.z, 0); Matrix_Push(&gGfxMatrix); Matrix_Mult(gGfxMatrix, gCalcMatrix, 1); - Matrix_Copy(&D_801615F0, gGfxMatrix); + Matrix_Copy(&D_edisplay_801615F0, gGfxMatrix); Matrix_Pop(&gGfxMatrix); Matrix_RotateY(gCalcMatrix, obj->rot.y * M_DTOR, 1); Matrix_RotateX(gCalcMatrix, obj->rot.x * M_DTOR, 1); Matrix_RotateZ(gCalcMatrix, obj->rot.z * M_DTOR, 1); } else { - Matrix_Translate(gGfxMatrix, obj->pos.x, obj->pos.y, obj->pos.z + D_80177D20, 1); - Matrix_Copy(&D_801615F0, gGfxMatrix); + Matrix_Translate(gGfxMatrix, obj->pos.x, obj->pos.y, obj->pos.z + D_ctx_80177D20, 1); + Matrix_Copy(&D_edisplay_801615F0, gGfxMatrix); Matrix_RotateY(gGfxMatrix, obj->rot.y * M_DTOR, 1); Matrix_RotateX(gGfxMatrix, obj->rot.x * M_DTOR, 1); Matrix_RotateZ(gGfxMatrix, obj->rot.z * M_DTOR, 1); } } -void func_8005D3CC(Object* obj, f32 xRot, f32 yRot, f32 zRot, s32 drawType) { +void func_edisplay_8005D3CC(Object* obj, f32 xRot, f32 yRot, f32 zRot, s32 drawType) { if (drawType == 2) { - Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, D_80177D20, 1); + Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, D_ctx_80177D20, 1); Matrix_Translate(gCalcMatrix, obj->pos.x, obj->pos.y, obj->pos.z, 0); Matrix_Push(&gGfxMatrix); Matrix_Mult(gGfxMatrix, gCalcMatrix, 1); - Matrix_Copy(&D_801615F0, gGfxMatrix); + Matrix_Copy(&D_edisplay_801615F0, gGfxMatrix); Matrix_Pop(&gGfxMatrix); Matrix_RotateY(gCalcMatrix, M_DTOR * yRot, 1); Matrix_RotateX(gCalcMatrix, M_DTOR * xRot, 1); @@ -926,8 +928,8 @@ void func_8005D3CC(Object* obj, f32 xRot, f32 yRot, f32 zRot, s32 drawType) { Matrix_RotateX(gCalcMatrix, obj->rot.x * M_DTOR, 1); Matrix_RotateZ(gCalcMatrix, obj->rot.z * M_DTOR, 1); } else { - Matrix_Translate(gGfxMatrix, obj->pos.x, obj->pos.y, obj->pos.z + D_80177D20, 1); - Matrix_Copy(&D_801615F0, gGfxMatrix); + Matrix_Translate(gGfxMatrix, obj->pos.x, obj->pos.y, obj->pos.z + D_ctx_80177D20, 1); + Matrix_Copy(&D_edisplay_801615F0, gGfxMatrix); Matrix_RotateY(gGfxMatrix, M_DTOR * yRot, 1); Matrix_RotateX(gGfxMatrix, M_DTOR * xRot, 1); Matrix_RotateZ(gGfxMatrix, M_DTOR * zRot, 1); @@ -939,16 +941,16 @@ void func_8005D3CC(Object* obj, f32 xRot, f32 yRot, f32 zRot, s32 drawType) { } void Object_80_Draw(Object_80* obj80, s32 arg1) { - obj80->obj.pos.y += D_8017847C; - func_8005D008(&obj80->obj, obj80->info.drawType); - obj80->obj.pos.y -= D_8017847C; + obj80->obj.pos.y += D_ctx_8017847C; + func_edisplay_8005D008(&obj80->obj, obj80->info.drawType); + obj80->obj.pos.y -= D_ctx_8017847C; if (obj80->info.drawType == 0) { if ((obj80->obj.id == OBJ_80_19) || (obj80->obj.id == OBJ_80_55) || (obj80->obj.id == OBJ_80_9) || (obj80->obj.id == OBJ_80_50)) { RCP_SetupDL_57(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); if (arg1 < 0) { - func_800596C0(); + func_edisplay_800596C0(); } gSPDisplayList(gMasterDisp++, obj80->info.dList); RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); @@ -959,9 +961,9 @@ void Object_80_Draw(Object_80* obj80, s32 arg1) { } RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } - func_800597C0(arg1); + func_edisplay_800597C0(arg1); if (arg1 < 0) { - func_800596C0(); + func_edisplay_800596C0(); } gSPDisplayList(gMasterDisp++, obj80->info.dList); if (obj80->obj.id == OBJ_80_8) { @@ -969,16 +971,16 @@ void Object_80_Draw(Object_80* obj80, s32 arg1) { } } } else if (obj80->info.draw != NULL) { - func_800597C0(arg1); + func_edisplay_800597C0(arg1); obj80->info.draw(&obj80->obj); } } void Object_4C_Draw(Object_4C* obj4C, s32 arg1) { if (arg1 >= 0) { - obj4C->obj.pos.y += D_8017847C; - func_8005D008(&obj4C->obj, 0); - obj4C->obj.pos.y -= D_8017847C; + obj4C->obj.pos.y += D_ctx_8017847C; + func_edisplay_8005D008(&obj4C->obj, 0); + obj4C->obj.pos.y -= D_ctx_8017847C; if (obj4C->info.drawType == 0) { gSPDisplayList(gMasterDisp++, obj4C->info.dList); } else if (obj4C->info.draw != NULL) { @@ -993,40 +995,40 @@ void Actor_Draw2(Actor* actor) { if (actor->info.draw != NULL) { switch (actor->obj.id) { case OBJ_ACTOR_194: - func_8006B74C(actor); + func_enmy2_8006B74C(actor); return; case OBJ_ACTOR_236: - func_i3_80190F08(actor); + Zoness_80190F08(actor); return; } if ((actor->obj.id == OBJ_ACTOR_200) && (actor->unk_0B4 == 200)) { - func_8006B74C(actor); + func_enmy2_8006B74C(actor); } else { if (actor->info.unk_19 != 0) { - actor->obj.pos.y += D_8017847C; - func_8005D008(&actor->obj, actor->info.drawType); - actor->obj.pos.y -= D_8017847C; + actor->obj.pos.y += D_ctx_8017847C; + func_edisplay_8005D008(&actor->obj, actor->info.drawType); + actor->obj.pos.y -= D_ctx_8017847C; } else if ((actor->obj.id == OBJ_ACTOR_200) && (actor->unk_0B4 != 31)) { - func_8005D3CC(&actor->obj, actor->vwork[29].x, actor->vwork[29].y, - actor->vwork[29].z + actor->unk_0F4.z, actor->info.drawType); + func_edisplay_8005D3CC(&actor->obj, actor->vwork[29].x, actor->vwork[29].y, + actor->vwork[29].z + actor->unk_0F4.z, actor->info.drawType); } else { - func_8005D008(&actor->obj, actor->info.drawType); + func_edisplay_8005D008(&actor->obj, actor->info.drawType); } if (actor->info.drawType == 0) { gSPDisplayList(gMasterDisp++, actor->info.dList); - func_8005F1EC(actor->sfxSource); + func_edisplay_8005F1EC(actor->sfxSource); } else { actor->info.draw(&actor->obj); - func_8005F1EC(actor->sfxSource); + func_edisplay_8005F1EC(actor->sfxSource); if (((actor->obj.id == OBJ_ACTOR_198) || ((actor->obj.id == OBJ_ACTOR_203) && (actor->unk_0B6 > 0))) && - (D_80161410 > 0)) { - Matrix_MultVec3f(gGfxMatrix, &sp34, &D_80177E98[actor->aiType]); + (D_display_80161410 > 0)) { + Matrix_MultVec3f(gGfxMatrix, &sp34, &D_ctx_80177E98[actor->aiType]); } } - if ((actor->timer_0CA[0] != 0) && (D_80161410 > 0)) { + if ((actor->timer_0CA[0] != 0) && (D_display_80161410 > 0)) { sp34.y += actor->info.unk_1C; - Matrix_MultVec3f(gGfxMatrix, &sp34, &D_80161578[0]); - if (D_80161578[0].z > -200.0f) { + Matrix_MultVec3f(gGfxMatrix, &sp34, &D_display_80161578[0]); + if (D_display_80161578[0].z > -200.0f) { actor->timer_0CA[0] = 0; } } @@ -1042,13 +1044,13 @@ void Actor_Draw1(Actor* actor) { f32 var_fv0; f32 var_fv1; - D_801615EC = 0; + D_edisplay_801615EC = 0; if (actor->info.drawType == 2) { - Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, D_80177D20, 1); + Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, D_ctx_80177D20, 1); Matrix_Translate(gCalcMatrix, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 0); Matrix_Push(&gGfxMatrix); Matrix_Mult(gGfxMatrix, gCalcMatrix, 1); - Matrix_MultVec3f(gGfxMatrix, &sp50, &D_801615E0); + Matrix_MultVec3f(gGfxMatrix, &sp50, &D_edisplay_801615E0); Matrix_Pop(&gGfxMatrix); var_fv0 = 0.0f; var_fv1 = -12000.0f; @@ -1056,24 +1058,24 @@ void Actor_Draw1(Actor* actor) { var_fv0 = 1000.0f; var_fv1 = -25000.0f; } - if ((var_fv0 > D_801615E0.z) && (D_801615E0.z > var_fv1)) { - if (fabsf(D_801615E0.x) < (fabsf(D_801615E0.z * 0.5f) + 500.0f)) { - if (fabsf(D_801615E0.y) < (fabsf(D_801615E0.z * 0.5f) + 500.0f)) { + if ((var_fv0 > D_edisplay_801615E0.z) && (D_edisplay_801615E0.z > var_fv1)) { + if (fabsf(D_edisplay_801615E0.x) < (fabsf(D_edisplay_801615E0.z * 0.5f) + 500.0f)) { + if (fabsf(D_edisplay_801615E0.y) < (fabsf(D_edisplay_801615E0.z * 0.5f) + 500.0f)) { Matrix_RotateY(gCalcMatrix, actor->obj.rot.y * M_DTOR, 1); Matrix_RotateX(gCalcMatrix, actor->obj.rot.x * M_DTOR, 1); Matrix_RotateZ(gCalcMatrix, actor->obj.rot.z * M_DTOR, 1); actor->info.draw(&actor->obj); - D_801615EC = 1; + D_edisplay_801615EC = 1; if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) && (actor->obj.id == OBJ_ACTOR_197) && (actor->aiType == 200)) { - D_80177E98[0] = D_801615E0; + D_ctx_80177E98[0] = D_edisplay_801615E0; } } } } } else { Matrix_Translate(gGfxMatrix, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1); - Matrix_MultVec3f(gGfxMatrix, &sp50, &D_801615E0); + Matrix_MultVec3f(gGfxMatrix, &sp50, &D_edisplay_801615E0); if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_2) || (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_0) || ((actor->obj.id == OBJ_ACTOR_197) && (actor->aiType >= 100)) || ((actor->obj.id == OBJ_ACTOR_195) && (actor->info.bonus != 0))) { @@ -1086,28 +1088,28 @@ void Actor_Draw1(Actor* actor) { var_fv1 = -20000.0f; var_fa1 = 0.5f; } - if ((var_fv0 > D_801615E0.z) && (D_801615E0.z > var_fv1)) { - if (fabsf(D_801615E0.x) < (fabsf(D_801615E0.z * var_fa1) + var_ft5)) { - if (fabsf(D_801615E0.y) < (fabsf(D_801615E0.z * var_fa1) + var_ft5)) { + if ((var_fv0 > D_edisplay_801615E0.z) && (D_edisplay_801615E0.z > var_fv1)) { + if (fabsf(D_edisplay_801615E0.x) < (fabsf(D_edisplay_801615E0.z * var_fa1) + var_ft5)) { + if (fabsf(D_edisplay_801615E0.y) < (fabsf(D_edisplay_801615E0.z * var_fa1) + var_ft5)) { if (actor->info.draw != NULL) { Matrix_RotateY(gGfxMatrix, actor->obj.rot.y * M_DTOR, 1); Matrix_RotateX(gGfxMatrix, actor->obj.rot.x * M_DTOR, 1); Matrix_RotateZ(gGfxMatrix, actor->obj.rot.z * M_DTOR, 1); Matrix_SetGfxMtx(&gMasterDisp); actor->info.draw(&actor->obj); - D_801615EC = 1; + D_edisplay_801615EC = 1; if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) && (((actor->obj.id == OBJ_ACTOR_197) && ((actor->aiType < 4) || (actor->aiType == 8) || (actor->aiType == 9))) || (actor->obj.id == OBJ_ACTOR_198))) { - D_80177E98[actor->aiType] = D_801615E0; + D_ctx_80177E98[actor->aiType] = D_edisplay_801615E0; } } } } } } - if (D_801615EC == 0) { + if (D_edisplay_801615EC == 0) { actor->timer_0CA[gPlayerNum] = 0; if ((actor->obj.id == OBJ_ACTOR_189) || (actor->obj.id == OBJ_ACTOR_286)) { Object_Kill(&actor->obj, actor->sfxSource); @@ -1115,15 +1117,15 @@ void Actor_Draw1(Actor* actor) { } for (var_v1 = 0; var_v1 < gCamCount; var_v1++) { if (actor->timer_0CA[var_v1] != 0) { - D_80161578[var_v1] = D_801615E0; - D_80161578[var_v1].y += actor->info.unk_1C; - if ((var_v1 == gPlayerNum) && (D_80161578[var_v1].z > -300.0f)) { + D_display_80161578[var_v1] = D_edisplay_801615E0; + D_display_80161578[var_v1].y += actor->info.unk_1C; + if ((var_v1 == gPlayerNum) && (D_display_80161578[var_v1].z > -300.0f)) { actor->timer_0CA[var_v1] = 0; } } } - func_8005F290(actor->sfxSource, &D_801615E0); - actor->iwork[24] = D_801615EC; + func_edisplay_8005F290(actor->sfxSource, &D_edisplay_801615E0); + actor->iwork[24] = D_edisplay_801615EC; } void Boss_Draw(Boss* boss, s32 arg1) { @@ -1135,14 +1137,14 @@ void Boss_Draw(Boss* boss, s32 arg1) { Vec3f sp30 = { 0.0f, 0.0f, 0.0f }; if (boss->info.unk_19 != 0) { - boss->obj.pos.y += boss->unk_068 + D_8017847C; - func_8005D1F0(&boss->obj, boss->info.drawType); - boss->obj.pos.y -= boss->unk_068 + D_8017847C; + boss->obj.pos.y += boss->unk_068 + D_ctx_8017847C; + func_edisplay_8005D1F0(&boss->obj, boss->info.drawType); + boss->obj.pos.y -= boss->unk_068 + D_ctx_8017847C; } else { - func_8005D1F0(&boss->obj, boss->info.drawType); + func_edisplay_8005D1F0(&boss->obj, boss->info.drawType); } - Matrix_MultVec3f(&D_801615F0, &sp30, &D_801615D0); - func_8005F290(boss->sfxSource, &D_801615D0); + Matrix_MultVec3f(&D_edisplay_801615F0, &sp30, &D_edisplay_801615D0); + func_edisplay_8005F290(boss->sfxSource, &D_edisplay_801615D0); if ((boss->obj.id == OBJ_BOSS_316) || (boss->obj.id == OBJ_BOSS_317)) { var_fa1 = 6000.0f; var_fv0 = 6000.0f; @@ -1160,29 +1162,29 @@ void Boss_Draw(Boss* boss, s32 arg1) { var_fv1 = -15000.0f; } sp3C = -1.0f; - if ((D_801615D0.z < var_fv0) && (var_fv1 < D_801615D0.z)) { - if (fabsf(D_801615D0.x) < (fabsf(D_801615D0.z * var_ft5) + var_fa1)) { - if (fabsf(D_801615D0.y) < (fabsf(D_801615D0.z * var_ft5) + var_fa1)) { + if ((D_edisplay_801615D0.z < var_fv0) && (var_fv1 < D_edisplay_801615D0.z)) { + if (fabsf(D_edisplay_801615D0.x) < (fabsf(D_edisplay_801615D0.z * var_ft5) + var_fa1)) { + if (fabsf(D_edisplay_801615D0.y) < (fabsf(D_edisplay_801615D0.z * var_ft5) + var_fa1)) { sp3C = 1.0f; if (boss->obj.id != OBJ_BOSS_309) { if (boss->obj.id != OBJ_BOSS_316) { - func_8005F670(&boss->obj.pos); + func_edisplay_8005F670(&boss->obj.pos); } if (boss->info.drawType != 2) { Matrix_SetGfxMtx(&gMasterDisp); } if (arg1 < 0) { - func_800596C0(); + func_edisplay_800596C0(); } boss->info.draw(&boss->obj); } } } } - D_801615D0.y = sp3C; + D_edisplay_801615D0.y = sp3C; if (boss->obj.id == OBJ_BOSS_309) { - boss->vwork[30] = D_801615D0; - func_8005F670(&boss->obj.pos); + boss->vwork[30] = D_edisplay_801615D0; + func_edisplay_8005F670(&boss->obj.pos); Matrix_SetGfxMtx(&gMasterDisp); boss->info.draw(&boss->obj); } @@ -1193,13 +1195,13 @@ void Effect_Draw1(Effect* effect, s32 arg1) { return; } if ((effect->obj.id == OBJ_EFFECT_353) || (effect->obj.id == OBJ_EFFECT_369)) { - func_8005D3CC(&effect->obj, effect->unk_60.x, effect->unk_60.y, effect->unk_60.z, 0); + func_edisplay_8005D3CC(&effect->obj, effect->unk_60.x, effect->unk_60.y, effect->unk_60.z, 0); } else if (effect->info.unk_14 == -1) { - effect->obj.pos.y += D_8017847C; - func_8005D008(&effect->obj, 0); - effect->obj.pos.y -= D_8017847C; + effect->obj.pos.y += D_ctx_8017847C; + func_edisplay_8005D008(&effect->obj, 0); + effect->obj.pos.y -= D_ctx_8017847C; } else { - func_8005D008(&effect->obj, 0); + func_edisplay_8005D008(&effect->obj, 0); } if (effect->info.draw != NULL) { effect->info.draw(&effect->obj); @@ -1213,10 +1215,10 @@ void Effect_Draw2(Effect* effect) { u8 sp3B = 0; if (effect->info.unk_14 == -1) { - Matrix_Translate(gGfxMatrix, effect->obj.pos.x, effect->obj.pos.y + D_8017847C, effect->obj.pos.z + D_80177D20, - 1); + Matrix_Translate(gGfxMatrix, effect->obj.pos.x, effect->obj.pos.y + D_ctx_8017847C, + effect->obj.pos.z + D_ctx_80177D20, 1); } else { - Matrix_Translate(gGfxMatrix, effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z + D_80177D20, 1); + Matrix_Translate(gGfxMatrix, effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z + D_ctx_80177D20, 1); } Matrix_MultVec3f(gGfxMatrix, &sp4C, &sp40); if ((gCurrentLevel == LEVEL_SECTOR_Z) || (gCurrentLevel == LEVEL_BOLSE)) { @@ -1238,7 +1240,7 @@ void Effect_Draw2(Effect* effect) { } } } - func_8005F290(effect->sfxSource, &sp40); + func_edisplay_8005F290(effect->sfxSource, &sp40); if ((sp3B == 0) && (effect->obj.id != OBJ_EFFECT_352) && (effect->obj.id != OBJ_EFFECT_373) && (!gVersusMode)) { Object_Kill(&effect->obj, effect->sfxSource); } @@ -1249,7 +1251,7 @@ void Item_Draw(Item* item, s32 arg1) { Vec3f sp38; u8 var_v0; - Matrix_Translate(gGfxMatrix, item->obj.pos.x, item->obj.pos.y, item->obj.pos.z + D_80177D20, 1); + Matrix_Translate(gGfxMatrix, item->obj.pos.x, item->obj.pos.y, item->obj.pos.z + D_ctx_80177D20, 1); Matrix_MultVec3f(gGfxMatrix, &sp44, &sp38); var_v0 = 0; if ((sp38.z < 0.0f) && (sp38.z > -12000.0f)) { @@ -1270,14 +1272,14 @@ void Item_Draw(Item* item, s32 arg1) { } } } - func_8005F290(item->sfxSource, &sp38); + func_edisplay_8005F290(item->sfxSource, &sp38); if ((var_v0 == 0) && (gLevelMode == LEVELMODE_ALL_RANGE) && (gCamCount == 1) && (item->obj.id < 336) && (gCurrentLevel != LEVEL_VENOM_ANDROSS)) { Object_Kill(&item->obj, item->sfxSource); } } -void func_8005EA24(Actor* actor) { +void func_edisplay_8005EA24(Actor* actor) { Matrix_Translate(gGfxMatrix, actor->obj.pos.x, actor->fwork[25] + 3.0f, actor->obj.pos.z, 1); if (gCurrentLevel == LEVEL_FORTUNA) { Matrix_RotateY(gGfxMatrix, actor->fwork[27], 1); @@ -1308,30 +1310,30 @@ void func_8005EA24(Actor* actor) { } } -void func_8005ECD8(s32 index, Object* obj) { +void func_edisplay_8005ECD8(s32 index, Object* obj) { RCP_SetupDL(&gMasterDisp, 0x42); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 180); if (obj->id == OBJ_ACTOR_197) { - func_8005EA24(&gActors[index]); + func_edisplay_8005EA24(&gActors[index]); } else { switch (obj->id) { case OBJ_ACTOR_230: Matrix_Translate(gGfxMatrix, obj->pos.x, gGroundLevel + 2.0f + gActors[index].fwork[1], - obj->pos.z + D_80177D20, 1); + obj->pos.z + D_ctx_80177D20, 1); break; case OBJ_ACTOR_229: case OBJ_ACTOR_231: Matrix_Translate(gGfxMatrix, obj->pos.x, gGroundLevel + 2.0f + gActors[index].fwork[0], - obj->pos.z + D_80177D20, 1); + obj->pos.z + D_ctx_80177D20, 1); break; case OBJ_BOSS_316: - Matrix_Translate(gGfxMatrix, obj->pos.x, gGroundLevel + 2.0f + D_8017847C, obj->pos.z, 1); + Matrix_Translate(gGfxMatrix, obj->pos.x, gGroundLevel + 2.0f + D_ctx_8017847C, obj->pos.z, 1); break; default: - Matrix_Translate(gGfxMatrix, obj->pos.x, gGroundLevel + 2.0f, obj->pos.z + D_80177D20, 1); + Matrix_Translate(gGfxMatrix, obj->pos.x, gGroundLevel + 2.0f, obj->pos.z + D_ctx_80177D20, 1); break; } - if ((D_801784AC != 4) || (obj->id == OBJ_ACTOR_200) || (obj->id == OBJ_ACTOR_195) || + if ((D_ctx_801784AC != 4) || (obj->id == OBJ_ACTOR_200) || (obj->id == OBJ_ACTOR_195) || (obj->id == OBJ_ACTOR_198)) { Matrix_Scale(gGfxMatrix, 1.0f, 0.0f, 1.0f, 1); Matrix_RotateY(gGfxMatrix, obj->rot.y * M_DTOR, 1); @@ -1342,11 +1344,11 @@ void func_8005ECD8(s32 index, Object* obj) { Matrix_RotateZ(gGfxMatrix, obj->rot.z * M_DTOR, 1); } Matrix_SetGfxMtx(&gMasterDisp); - func_8005BAB4(obj->id, index); + func_edisplay_8005BAB4(obj->id, index); } } -void func_8005F030(f32* sfxSrc) { +void func_edisplay_8005F030(f32* sfxSrc) { if (sfxSrc[0] > 5000.0f) { sfxSrc[0] = 5000.0f; } @@ -1367,7 +1369,7 @@ void func_8005F030(f32* sfxSrc) { } } -void func_8005F0E8(f32* sfxSrc, Vec3f* pos) { +void func_edisplay_8005F0E8(f32* sfxSrc, Vec3f* pos) { Vec3f sp2C; Vec3f sp20; @@ -1376,18 +1378,18 @@ void func_8005F0E8(f32* sfxSrc, Vec3f* pos) { } else { Matrix_RotateY(gCalcMatrix, gPlayer[0].unk_058, 0); Matrix_RotateX(gCalcMatrix, gPlayer[0].unk_05C, 1); - sp2C.x = pos->x - D_801779D8.x; - sp2C.y = pos->y - D_801779D8.y; - sp2C.z = pos->z + D_80177D20 - D_801779D8.z; + sp2C.x = pos->x - D_ctx_801779D8.x; + sp2C.y = pos->y - D_ctx_801779D8.y; + sp2C.z = pos->z + D_ctx_80177D20 - D_ctx_801779D8.z; Matrix_MultVec3f(gCalcMatrix, &sp2C, &sp20); sfxSrc[0] = sp20.x; sfxSrc[1] = sp20.y; sfxSrc[2] = sp20.z; } - func_8005F030(sfxSrc); + func_edisplay_8005F030(sfxSrc); } -void func_8005F1EC(f32* sfxSrc) { +void func_edisplay_8005F1EC(f32* sfxSrc) { Vec3f sp2C = { 0.0f, 0.0f, 0.0f }; Vec3f sp20; s32 pad; @@ -1395,15 +1397,15 @@ void func_8005F1EC(f32* sfxSrc) { if (gCamCount != 1) { sfxSrc[0] = sfxSrc[1] = sfxSrc[2] = 0.0f; } else { - Matrix_MultVec3f(&D_801615F0, &sp2C, &sp20); + Matrix_MultVec3f(&D_edisplay_801615F0, &sp2C, &sp20); sfxSrc[0] = sp20.x; sfxSrc[1] = sp20.y; sfxSrc[2] = sp20.z; } - func_8005F030(sfxSrc); + func_edisplay_8005F030(sfxSrc); } -void func_8005F290(f32* sfxSrc, Vec3f* pos) { +void func_edisplay_8005F290(f32* sfxSrc, Vec3f* pos) { if (gCamCount != 1) { sfxSrc[0] = sfxSrc[1] = sfxSrc[2] = 0.0f; } else { @@ -1411,7 +1413,7 @@ void func_8005F290(f32* sfxSrc, Vec3f* pos) { sfxSrc[1] = pos->y; sfxSrc[2] = pos->z; } - func_8005F030(sfxSrc); + func_edisplay_8005F030(sfxSrc); } void Object_58_Draw(Object_58* obj58) { @@ -1436,7 +1438,7 @@ void Object_58_Draw(Object_58* obj58) { sp38 = 0.9f; } if ((gLevelType == LEVELTYPE_PLANET) || (gCurrentLevel == LEVEL_BOLSE)) { - Matrix_Translate(gGfxMatrix, obj58->obj.pos.x, obj58->obj.pos.y + D_8017847C, obj58->obj.pos.z, 1); + Matrix_Translate(gGfxMatrix, obj58->obj.pos.x, obj58->obj.pos.y + D_ctx_8017847C, obj58->obj.pos.z, 1); } else { Matrix_Translate(gGfxMatrix, obj58->obj.pos.x, obj58->obj.pos.y, obj58->obj.pos.z, 1); } @@ -1444,7 +1446,7 @@ void Object_58_Draw(Object_58* obj58) { if ((sp48.z < sp44) && (sp40 < sp48.z)) { if (fabsf(sp48.y) < (fabsf(sp48.z * sp38) + sp3C)) { if (fabsf(sp48.x) < (fabsf(sp48.z * sp38) + sp3C)) { - func_8005F670(&obj58->obj.pos); + func_edisplay_8005F670(&obj58->obj.pos); if (obj58->obj.id == OBJ_80_131) { Matrix_RotateY(gGfxMatrix, obj58->obj.rot.y * M_DTOR, 1); Matrix_RotateX(gGfxMatrix, obj58->obj.rot.x * M_DTOR, 1); @@ -1463,7 +1465,7 @@ void Object_58_Draw(Object_58* obj58) { } } -void func_8005F670(Vec3f* arg0) { +void func_edisplay_8005F670(Vec3f* arg0) { Vec3f sp9C; f32 sp98; f32 sp94; @@ -1476,10 +1478,10 @@ void func_8005F670(Vec3f* arg0) { f32 temp3; f32 pad; - if (D_8017836C > 0.01f) { - sp9C.x = arg0->x - D_80178370; - sp9C.y = arg0->y - D_80178374; - sp9C.z = arg0->z - D_80178378; + if (D_ctx_8017836C > 0.01f) { + sp9C.x = arg0->x - D_ctx_80178370; + sp9C.y = arg0->y - D_ctx_80178374; + sp9C.z = arg0->z - D_ctx_80178378; temp_fv0 = (VEC3F_MAG(&sp9C)); if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_2) { var_fs0 = 700.0f / temp_fv0; @@ -1489,13 +1491,13 @@ void func_8005F670(Vec3f* arg0) { if (var_fs0 > 1.0f) { var_fs0 = 1.0f; } - if (D_8017812C == 2) { + if (D_ctx_8017812C == 2) { var_fs0 = 1.0f; } sp94 = Math_Atan2F(sp9C.x, sp9C.z); sp98 = -Math_Atan2F(sp9C.y, sqrtf(SQ(sp9C.x) + SQ(sp9C.z))); Matrix_Push(&gCalcMatrix); - Matrix_RotateZ(gCalcMatrix, gPlayer[gPlayerNum].unk_034 * D_80177950 * M_DTOR, 0); + Matrix_RotateZ(gCalcMatrix, gPlayer[gPlayerNum].unk_034 * D_ctx_80177950 * M_DTOR, 0); Matrix_RotateX(gCalcMatrix, -gPlayer[gPlayerNum].unk_05C, 1); Matrix_RotateY(gCalcMatrix, gPlayer[gPlayerNum].unk_058 + sp94, 1); Matrix_RotateX(gCalcMatrix, sp98, 1); @@ -1504,15 +1506,15 @@ void func_8005F670(Vec3f* arg0) { sp6C.z = -100.0f; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp6C, &sp84); Matrix_Pop(&gCalcMatrix); - temp1 = D_80178360 * D_8017836C * var_fs0; - temp2 = D_80178364 * D_8017836C * var_fs0; - temp3 = D_80178368 * D_8017836C * var_fs0; + temp1 = D_ctx_80178360 * D_ctx_8017836C * var_fs0; + temp2 = D_ctx_80178364 * D_ctx_8017836C * var_fs0; + temp3 = D_ctx_80178368 * D_ctx_8017836C * var_fs0; Lights_SetTwoLights(&gMasterDisp, gLight1x, gLight1y, gLight1z, sp84.x, sp84.y, sp84.z, gLight1R, gLight1G, gLight1B, temp1, temp2, temp3, gAmbientR, gAmbientG, gAmbientB); } } -bool func_8005F9DC(Vec3f* arg0) { +bool func_edisplay_8005F9DC(Vec3f* arg0) { Vec3f sp2C; Vec3f sp20; @@ -1545,7 +1547,7 @@ void Object_DrawAll(s32 arg0) { if ((gLevelMode == LEVELMODE_ALL_RANGE) && (gCurrentLevel != LEVEL_KATINA)) { RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); - if (D_80177AB0 == 5) { + if (D_ctx_80177AB0 == 5) { gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); } for (i = 0, obj58 = gObjects58; i < 200; i++, obj58++) { @@ -1554,7 +1556,7 @@ void Object_DrawAll(s32 arg0) { spAC.x = obj58->sfxSource[0]; spAC.y = obj58->sfxSource[1]; spAC.z = obj58->sfxSource[2]; - Matrix_MultVec3fNoTranslate(&D_i4_8019EE80, &spAC, &obj58->obj.pos); + Matrix_MultVec3fNoTranslate(&D_BO_8019EE80, &spAC, &obj58->obj.pos); obj58->obj.rot.y = gBosses[0].obj.rot.y + (*obj58).unk_54; } Matrix_Push(&gGfxMatrix); @@ -1567,12 +1569,12 @@ void Object_DrawAll(s32 arg0) { for (i = 0, obj80 = gObjects80; i < ARRAY_COUNT(gObjects80); i++, obj80++) { if (obj80->obj.status >= OBJ_ACTIVE) { if (arg0 > 0) { - func_8005F670(&obj80->obj.pos); + func_edisplay_8005F670(&obj80->obj.pos); } Matrix_Push(&gGfxMatrix); Object_80_Draw(obj80, arg0); Matrix_Pop(&gGfxMatrix); - func_8005F1EC(obj80->sfxSource); + func_edisplay_8005F1EC(obj80->sfxSource); } } } @@ -1584,13 +1586,13 @@ void Object_DrawAll(s32 arg0) { RCP_SetupDL_27(); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 64, 64, 255, 255); } - func_800597C0(arg0); + func_edisplay_800597C0(arg0); Matrix_Push(&gGfxMatrix); Boss_Draw(boss, arg0); Matrix_Pop(&gGfxMatrix); - if ((boss->unk_05E != 0) && (D_801615D0.y > 0.0f)) { + if ((boss->unk_05E != 0) && (D_edisplay_801615D0.y > 0.0f)) { Matrix_Push(&gGfxMatrix); - func_8005ECD8(i, &boss->obj); + func_edisplay_8005ECD8(i, &boss->obj); Matrix_Pop(&gGfxMatrix); } } @@ -1598,7 +1600,7 @@ void Object_DrawAll(s32 arg0) { Lights_SetOneLight(&gMasterDisp, gLight1x, gLight1y, gLight1z, gLight1R, gLight1G, gLight1B, gAmbientR, gAmbientG, gAmbientB); for (i = 0, obj4C = gObjects4C; i < ARRAY_COUNT(gObjects4C); i++, obj4C++) { - if ((obj4C->obj.status >= OBJ_ACTIVE) && func_80060FE4(&obj4C->obj.pos, -12000.0f)) { + if ((obj4C->obj.status >= OBJ_ACTIVE) && func_enmy_80060FE4(&obj4C->obj.pos, -12000.0f)) { Matrix_Push(&gGfxMatrix); if ((obj4C->obj.id == OBJ_4C_165) || (obj4C->obj.id == OBJ_4C_166)) { RCP_SetupDL_57(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); @@ -1631,14 +1633,14 @@ void Object_DrawAll(s32 arg0) { Matrix_Push(&gGfxMatrix); if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_2) || (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7) || (gCurrentLevel == LEVEL_AQUAS)) { - func_8005F670(&actor->obj.pos); + func_edisplay_8005F670(&actor->obj.pos); } - func_800597C0(arg0); + func_edisplay_800597C0(arg0); Actor_Draw2(actor); Matrix_Pop(&gGfxMatrix); if (actor->unk_0C9 != 0) { Matrix_Push(&gGfxMatrix); - func_8005ECD8(i, &actor->obj); + func_edisplay_8005ECD8(i, &actor->obj); Matrix_Pop(&gGfxMatrix); } break; @@ -1646,10 +1648,10 @@ void Object_DrawAll(s32 arg0) { Matrix_Push(&gGfxMatrix); Actor_Draw1(actor); Matrix_Pop(&gGfxMatrix); - if ((actor->unk_0C9 != 0) && (D_801615EC != 0) && - ((D_801615E0.z > -4000.0f) || (gCurrentLevel != LEVEL_KATINA))) { + if ((actor->unk_0C9 != 0) && (D_edisplay_801615EC != 0) && + ((D_edisplay_801615E0.z > -4000.0f) || (gCurrentLevel != LEVEL_KATINA))) { Matrix_Push(&gGfxMatrix); - func_8005ECD8(i, &actor->obj); + func_edisplay_8005ECD8(i, &actor->obj); Matrix_Pop(&gGfxMatrix); } break; @@ -1663,7 +1665,7 @@ void Object_DrawAll(s32 arg0) { if (item->obj.status >= OBJ_ACTIVE) { Matrix_Push(&gGfxMatrix); RCP_SetupDL(&gMasterDisp, 0x1D); - func_800597C0(arg0); + func_edisplay_800597C0(arg0); Item_Draw(item, arg0); Matrix_Pop(&gGfxMatrix); } @@ -1672,7 +1674,7 @@ void Object_DrawAll(s32 arg0) { gAmbientB); } -void func_8006046C(s32 arg0) { +void func_edisplay_8006046C(s32 arg0) { s32 i; Boss* boss; Effect* effect; @@ -1692,10 +1694,10 @@ void func_8006046C(s32 arg0) { Matrix_Push(&gGfxMatrix); Effect_Draw1(effect, arg0); Matrix_Pop(&gGfxMatrix); - func_8005F1EC(effect->sfxSource); + func_edisplay_8005F1EC(effect->sfxSource); if (effect->obj.id == OBJ_EFFECT_374) { Matrix_Push(&gGfxMatrix); - func_8005ECD8(i, &effect->obj); + func_edisplay_8005ECD8(i, &effect->obj); Matrix_Pop(&gGfxMatrix); } } @@ -1716,11 +1718,11 @@ void func_8006046C(s32 arg0) { } } -void func_80060714(s32 arg0) { - D_80161410 = 1; +void func_edisplay_80060714(s32 arg0) { + D_display_80161410 = 1; Object_DrawAll(1); if ((D_80161A88 == 2) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_2)) { - D_80161410 = -1; + D_display_80161410 = -1; Lights_SetOneLight(&gMasterDisp, gLight1x, -1 * gLight1y, gLight1z, gLight1R, gLight1G, gLight1B, gAmbientR, gAmbientG, gAmbientB); Matrix_Push(&gGfxMatrix); @@ -1732,28 +1734,28 @@ void func_80060714(s32 arg0) { } } -void func_8006089C(u8 arg0) { +void func_edisplay_8006089C(u8 arg0) { if (arg0 == 0) { - D_80161410 = 1; - func_8006046C(1); + D_display_80161410 = 1; + func_edisplay_8006046C(1); } else if ((D_80161A88 == 2) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_2)) { - D_80161410 = -1; + D_display_80161410 = -1; Matrix_Push(&gGfxMatrix); Matrix_Scale(gGfxMatrix, 1.0f, -1.0f, 1.0f, 1); - func_8006046C(-1); + func_edisplay_8006046C(-1); Matrix_Pop(&gGfxMatrix); } - D_80161410 = 1; + D_display_80161410 = 1; } -Vtx D_800CFD40[] = { +Vtx D_edisplay_800CFD40[] = { VTX(1, 0, 0, 0, 0, 255, 255, 255, 255), VTX(-1, 0, 0, 0, 0, 255, 255, 255, 255), VTX(-1, 0, -1, 0, 0, 255, 255, 255, 255), VTX(1, 0, -1, 0, 0, 255, 255, 255, 255), }; -Gfx D_800CFD80[] = { - gsSPVertex(D_800CFD40, 4, 0), +Gfx D_edisplay_800CFD80[] = { + gsSPVertex(D_edisplay_800CFD40, 4, 0), gsSP1Quadrangle(1, 2, 3, 0, 0), gsSPEndDisplayList(), }; @@ -1774,7 +1776,7 @@ void TexturedLine_Draw(void) { if (gTexturedLines[i].mode != 0) { Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, texLine->unk_04.x, texLine->unk_04.y, texLine->unk_04.z + D_80177D20, 1); + Matrix_Translate(gGfxMatrix, texLine->unk_04.x, texLine->unk_04.y, texLine->unk_04.z + D_ctx_80177D20, 1); Matrix_RotateY(gGfxMatrix, texLine->unk_20, 1); Matrix_RotateX(gGfxMatrix, texLine->unk_1C, 1); Matrix_RotateZ(gGfxMatrix, texLine->unk_20, 1); @@ -1804,7 +1806,7 @@ void TexturedLine_Draw(void) { } else { gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, texLine->unk_2C, texLine->unk_2D, texLine->unk_2E, texLine->unk_2F); - gSPDisplayList(gMasterDisp++, D_800CFD80); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFD80); } } Matrix_Pop(&gGfxMatrix); @@ -1812,7 +1814,7 @@ void TexturedLine_Draw(void) { } } -void func_80060D94(s32 arg0) { +void func_edisplay_80060D94(s32 arg0) { TexturedLine* texLine = &gTexturedLines[arg0]; if (texLine->unk_2F == 0xFF) { @@ -1829,7 +1831,7 @@ void func_80060D94(s32 arg0) { Matrix_Scale(gGfxMatrix, texLine->unk_28, 1.0f, texLine->unk_24, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); - gSPDisplayList(gMasterDisp++, D_800CFD80); + gSPDisplayList(gMasterDisp++, D_edisplay_800CFD80); gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); Matrix_Pop(&gGfxMatrix); } diff --git a/src/main/fox_effect.c b/src/main/fox_effect.c index 79284b72..5150e0db 100644 --- a/src/main/fox_effect.c +++ b/src/main/fox_effect.c @@ -1,10 +1,4 @@ #include "global.h" - -// rodata -const char D_800D7230[] = "Enm->wrk3=<%d>\n"; -const char D_800D7240[] = "a=<%d>\n"; -const char D_800D7248[] = "a=<%d>\n"; - #include "assets/ast_blue_marine.h" #include "assets/ast_arwing.h" #include "assets/ast_bg_space.h" @@ -23,6 +17,11 @@ const char D_800D7248[] = "a=<%d>\n"; #include "assets/ast_enmy_planet.h" #include "assets/ast_zoness.h" +// rodata +const char D_800D7230[] = "Enm->wrk3=<%d>\n"; +const char D_800D7240[] = "a=<%d>\n"; +const char D_800D7248[] = "a=<%d>\n"; + s32 BonusText_Display(f32 xPos, f32 yPos, f32 zPos, s32 hits) { s32 i; @@ -53,7 +52,7 @@ void BonusText_Update(void) { } if (gLevelMode == LEVELMODE_ON_RAILS) { - bonus->pos.z -= D_80177D08; + bonus->pos.z -= D_ctx_80177D08; } else if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) { bonus->pos.x += gPlayer[0].vel.x; bonus->pos.z += gPlayer[0].vel.z; @@ -66,14 +65,14 @@ void BonusText_Update(void) { } } -Gfx* sLargeBonusDLs[4][2] = { +static Gfx* sLargeBonusDLs[4][2] = { { D_1016410, D_1003130 }, { D_10162A0, D_1003130 }, { D_1016130, D_1003130 }, { D_1015FC0, D_1003130 }, }; -Gfx* sSmallBonusDLs[10] = { +static Gfx* sSmallBonusDLs[10] = { D_1015810, D_1016410, D_10162A0, D_1016130, D_1015FC0, D_1015E50, D_10156A0, D_1015CE0, D_1015B70, D_1015320, }; @@ -84,7 +83,7 @@ void BonusText_Draw(BonusText* bonus) { f32 sp50; if (bonus->timer <= 45) { - Matrix_Translate(gGfxMatrix, bonus->pos.x, bonus->pos.y, bonus->pos.z + D_80177D20, 1); + Matrix_Translate(gGfxMatrix, bonus->pos.x, bonus->pos.y, bonus->pos.z + D_ctx_80177D20, 1); Matrix_MultVec3f(gGfxMatrix, &sp60, &sp54); if ((fabsf(sp54.x) < 20000.0f) && (fabsf(sp54.y) < 20000.0f)) { @@ -146,7 +145,7 @@ void BonusText_DrawAll(void) { } } -Effect* func_8007783C(ObjectId objId) { +Effect* func_effect_8007783C(ObjectId objId) { Effect* effect; s32 i; @@ -165,7 +164,7 @@ Effect* func_8007783C(ObjectId objId) { return effect; } -void func_800778C4(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2) { +void func_effect_800778C4(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_339; @@ -186,24 +185,24 @@ void func_800778C4(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 y effect->unk_44 = 255; } -void func_8007797C(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2) { +void func_effect_8007797C(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2) { s32 i; for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_800778C4(&gEffects[i], xPos, yPos, zPos, xVel, yVel, zVel, scale2); + func_effect_800778C4(&gEffects[i], xPos, yPos, zPos, xVel, yVel, zVel, scale2); break; } } } -void func_80077A00(Effect* effect) { +void func_effect_80077A00(Effect* effect) { Graphics_SetScaleMtx(effect->scale2); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->unk_44); gSPDisplayList(gMasterDisp++, D_arwing_3016B30); } -void func_80077A7C(Effect* effect) { +void func_effect_80077A7C(Effect* effect) { RCP_SetupDL_49(); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->unk_44); gDPSetEnvColor(gMasterDisp++, 255, 255, 255, effect->unk_44); @@ -214,10 +213,10 @@ void func_80077A7C(Effect* effect) { RCP_SetupDL(&gMasterDisp, 0x40); } -void func_80077B78(Effect* effect) { +void func_effect_80077B78(Effect* effect) { } -void func_80077B84(Effect* effect) { +void func_effect_80077B84(Effect* effect) { Graphics_SetScaleMtx(effect->scale2); if ((effect->scale1 == 71.0f) || @@ -290,7 +289,7 @@ void func_80077B84(Effect* effect) { RCP_SetupDL(&gMasterDisp, 0x40); } -void func_80078038(Effect* effect) { +void func_effect_80078038(Effect* effect) { Graphics_SetScaleMtx(effect->scale2); RCP_SetupDL_49(); RCP_SetupDL(&gMasterDisp, 0x26); @@ -301,7 +300,7 @@ void func_80078038(Effect* effect) { } // Possibly the little sparks of electricity that come off the arwing and landmaster when low on health -f32 D_800D1534[][10] = { +static f32 D_800D1534[][10] = { { 38.45957f, -65.08043f, 8.068213f, 87.01006f, -86.956184f, -71.82677f, 37.854507f, 46.845963f, 23.723173f, 84.2551f }, { -77.50479f, 86.4889f, -8.664565f, -74.90449f, -42.23121f, 49.20716f, -18.885563f, -47.375793f, -58.059227f, @@ -330,7 +329,7 @@ f32 D_800D1534[][10] = { 41.706547f }, }; -void func_800780F8(Effect* effect) { +void func_effect_800780F8(Effect* effect) { s32 i; if (effect->unk_4A >= 0xB) { @@ -361,19 +360,19 @@ void func_800780F8(Effect* effect) { } } -void func_800783C0(Effect* effect) { +void func_effect_800783C0(Effect* effect) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->unk_44); Graphics_SetScaleMtx(effect->scale2); gSPDisplayList(gMasterDisp++, D_BG_SPACE_2006F50); } -void func_80078438(Effect* effect) { +void func_effect_80078438(Effect* effect) { Graphics_SetScaleMtx(effect->scale2); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->unk_4A); gSPDisplayList(gMasterDisp++, D_102A8A0); } -void func_800784B4(Effect* effect) { +void func_effect_800784B4(Effect* effect) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->unk_46); Graphics_SetScaleMtx(effect->scale2); Matrix_RotateX(gGfxMatrix, M_PI / 2, 1); @@ -381,7 +380,7 @@ void func_800784B4(Effect* effect) { gSPDisplayList(gMasterDisp++, D_BG_PLANET_200D750); } -void func_80078550(Effect* effect) { +void func_effect_80078550(Effect* effect) { RCP_SetupDL(&gMasterDisp, 0x43); Graphics_SetScaleMtx(effect->scale2); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->unk_4A); @@ -390,7 +389,7 @@ void func_80078550(Effect* effect) { RCP_SetupDL(&gMasterDisp, 0x40); } -void func_80078604(Effect* effect) { +void func_effect_80078604(Effect* effect) { if (effect->timer_50 == 0) { Graphics_SetScaleMtx(effect->scale2); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->unk_44); @@ -398,7 +397,7 @@ void func_80078604(Effect* effect) { } } -void func_8007868C(Effect* effect) { +void func_effect_8007868C(Effect* effect) { RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); Matrix_Scale(gGfxMatrix, effect->scale2, effect->scale2, effect->scale2, 1); @@ -410,7 +409,7 @@ void func_8007868C(Effect* effect) { RCP_SetupDL(&gMasterDisp, 0x40); } -void func_8007879C(Effect* effect) { +void func_effect_8007879C(Effect* effect) { RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); Matrix_Scale(gGfxMatrix, effect->scale2 * 0.6f, 1.0f, effect->scale2 * 3.5f, 1); @@ -420,9 +419,9 @@ void func_8007879C(Effect* effect) { RCP_SetupDL(&gMasterDisp, 0x40); } -s32 D_800D173C[] = { 255, 255, 255, 0, 0, 0, 255, 0, 255, 0, 0, 0, 255, 255, 0, 0, 0, 255, 0, 0 }; +static s32 D_800D173C[] = { 255, 255, 255, 0, 0, 0, 255, 0, 255, 0, 0, 0, 255, 255, 0, 0, 0, 255, 0, 0 }; -void func_800788B0(Effect* effect) { +void func_effect_800788B0(Effect* effect) { s32 temp_ft3; s32* tmp; @@ -446,28 +445,28 @@ void func_800788B0(Effect* effect) { } } -void func_80078A64(Effect* effect) { +void func_effect_80078A64(Effect* effect) { Graphics_SetScaleMtx(effect->scale2); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->unk_44); gSPDisplayList(gMasterDisp++, D_BG_PLANET_20112C0); } -void func_80078AE0(void* effect) { +void func_effect_80078AE0(void* effect) { } -void func_80078AEC(Effect* effect) { +void func_effect_80078AEC(Effect* effect) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 180); Graphics_SetScaleMtx(effect->scale2 * (13.0f + ((gGameFrameCount & 1) * 2.5f))); gSPDisplayList(gMasterDisp++, D_102ED50); } -void func_80078B8C(Effect* effect) { +void func_effect_80078B8C(Effect* effect) { RCP_SetupDL_21(); gSPDisplayList(gMasterDisp++, D_101ABD0); RCP_SetupDL(&gMasterDisp, 0x40); } -void func_80078BE0(Effect* effect) { +void func_effect_80078BE0(Effect* effect) { f32 var_fv0; gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 160); @@ -480,19 +479,19 @@ void func_80078BE0(Effect* effect) { gSPDisplayList(gMasterDisp++, D_SX_600F8A0); } -void func_80078C84(Effect* effect) { +void func_effect_80078C84(Effect* effect) { Graphics_SetScaleMtx(effect->scale2); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 192); gSPDisplayList(gMasterDisp++, D_ME_6000A80); } -void func_80078CE8(Effect* effect) { +void func_effect_80078CE8(Effect* effect) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->unk_4A); Graphics_SetScaleMtx(effect->scale2); gSPDisplayList(gMasterDisp++, D_CO_6033000); } -void func_80078D60(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2) { +void func_effect_80078D60(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_393; @@ -517,18 +516,18 @@ void func_80078D60(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2) { Object_SetInfo(&effect->info, effect->obj.id); } -void func_80078E50(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { +void func_effect_80078E50(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { s32 i; for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_80078D60(&gEffects[i], xPos, yPos, zPos, scale2); + func_effect_80078D60(&gEffects[i], xPos, yPos, zPos, scale2); break; } } } -void func_80078EBC(Effect* effect) { +void func_effect_80078EBC(Effect* effect) { if (effect->state == 2) { effect->vel.x = gPlayer[0].vel.x; effect->vel.y = gPlayer[0].vel.y; @@ -547,7 +546,7 @@ void func_80078EBC(Effect* effect) { } } -void func_80078F78(Effect* effect) { +void func_effect_80078F78(Effect* effect) { if (effect->state != 0) { RCP_SetupDL(&gMasterDisp, 0x43); } else { @@ -560,7 +559,7 @@ void func_80078F78(Effect* effect) { RCP_SetupDL(&gMasterDisp, 0x40); } -void func_8007905C(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2, u8 arg5) { +void func_effect_8007905C(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2, u8 arg5) { Vec3f sp54; Vec3f sp48; Vec3f sp3C; @@ -618,58 +617,58 @@ void func_8007905C(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2, u8 Object_SetInfo(&effect->info, effect->obj.id); } -void func_800794CC(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { +void func_effect_800794CC(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { s32 i; for (i = 50; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8007905C(&gEffects[i], xPos, yPos, zPos, scale2, 0); + func_effect_8007905C(&gEffects[i], xPos, yPos, zPos, scale2, 0); break; } } } -void func_8007953C(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { +void func_effect_8007953C(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { s32 i; for (i = 79; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8007905C(&gEffects[i], xPos, yPos, zPos, scale2, 0); + func_effect_8007905C(&gEffects[i], xPos, yPos, zPos, scale2, 0); break; } } } -void func_800795AC(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { +void func_effect_800795AC(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { s32 i; for (i = 0; i < 95; i++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8007905C(&gEffects[i], xPos, yPos, zPos, scale2, 0); + func_effect_8007905C(&gEffects[i], xPos, yPos, zPos, scale2, 0); break; } } } -void func_80079618(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { +void func_effect_80079618(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { s32 i; for (i = 50; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8007905C(&gEffects[i], xPos, yPos, zPos, scale2, 1); + func_effect_8007905C(&gEffects[i], xPos, yPos, zPos, scale2, 1); break; } } } -void func_8007968C(Effect* effect) { +void func_effect_8007968C(Effect* effect) { if ((gCurrentLevel != LEVEL_MACBETH) || (effect->unk_44 != 7)) { if ((effect->timer_50 == 0) || (effect->obj.pos.y < gGroundLevel)) { Object_Kill(&effect->obj, effect->sfxSource); } } else { if (!(gGameFrameCount & 3)) { - func_8007D2C8(effect->obj.pos.x, effect->obj.pos.y + 550.0f, effect->obj.pos.z, 10.0f); + func_effect_8007D2C8(effect->obj.pos.x, effect->obj.pos.y + 550.0f, effect->obj.pos.z, 10.0f); } if ((effect->timer_50 == 0) || (effect->obj.pos.y < (gGroundLevel - 100.0f))) { Object_Kill(&effect->obj, effect->sfxSource); @@ -701,18 +700,18 @@ void func_8007968C(Effect* effect) { } } -bool func_800798C4(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4) { +bool func_effect_800798C4(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4) { if ((arg0 != 1) && (arg0 != 5)) { *arg1 = NULL; } return false; } -void func_800798F0(Effect* effect) { +void func_effect_800798F0(Effect* effect) { Vec3f frameJointTable[50]; if ((gCurrentLevel == LEVEL_BOLSE) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7)) { - func_8005F670(&effect->obj.pos); + func_edisplay_8005F670(&effect->obj.pos); } RCP_SetupDL(&gMasterDisp, 0x1D); @@ -746,7 +745,7 @@ void func_800798F0(Effect* effect) { case 7: Animation_GetFrameData(&D_MA_6027320, 0, frameJointTable); - Animation_DrawSkeleton(1, D_MA_602742C, frameJointTable, func_800798C4, NULL, effect, + Animation_DrawSkeleton(1, D_MA_602742C, frameJointTable, func_effect_800798C4, NULL, effect, &gIdentityMatrix); break; @@ -870,37 +869,37 @@ void func_800798F0(Effect* effect) { } } -void func_8007A28C(Effect* effect) { +void func_effect_8007A28C(Effect* effect) { Texture_Scroll(D_10190C0, 16, 32, 0); - D_8017812C = 2; + D_ctx_8017812C = 2; effect->obj.rot.y += 1.0f; Math_SmoothStepToF(&effect->scale2, effect->scale1, 0.05f, 1.5f, 0.001f); if (effect->timer_50 >= 0xB) { - D_801779A8[0] = 60.0f; + D_ctx_801779A8[0] = 60.0f; } if (effect->timer_50 == 48) { - D_80178340 = 150; + D_ctx_80178340 = 150; } if (effect->timer_50 > 45) { - D_80178358 = 0; - D_80178348 = D_80178350 = D_80178354 = 255; + D_ctx_80178358 = 0; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; } - D_8017835C = 3; + D_ctx_8017835C = 3; if (effect->timer_50 == 0) { effect->unk_44 -= 2; if (effect->unk_44 < 0) { effect->unk_44 = 0; Object_Kill(&effect->obj, effect->sfxSource); - D_8017812C = 0; + D_ctx_8017812C = 0; } } } -void func_8007A3C0(Effect* effect) { - if (D_80161410 > 0) { +void func_effect_8007A3C0(Effect* effect) { + if (D_display_80161410 > 0) { Matrix_Scale(gGfxMatrix, effect->scale2, effect->scale2, effect->scale2, 1); Matrix_SetGfxMtx(&gMasterDisp); RCP_SetupDL_64_2(); @@ -912,7 +911,7 @@ void func_8007A3C0(Effect* effect) { } } -void func_8007A4B8(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale1) { +void func_effect_8007A4B8(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale1) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_383; @@ -928,19 +927,19 @@ void func_8007A4B8(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale1) { Object_SetInfo(&effect->info, effect->obj.id); } -void func_8007A568(f32 xPos, f32 yPos, f32 zPos, f32 scale1) { +void func_effect_8007A568(f32 xPos, f32 yPos, f32 zPos, f32 scale1) { s32 i; for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8007A4B8(&gEffects[i], xPos, yPos, zPos, scale1); + func_effect_8007A4B8(&gEffects[i], xPos, yPos, zPos, scale1); break; } } - func_8007B344(xPos, yPos, zPos, 80.0f, 4); + func_effect_8007B344(xPos, yPos, zPos, 80.0f, 4); } -void func_8007A5F8(Effect* effect, Vec3f* pos, u32 sfxId) { +void func_effect_8007A5F8(Effect* effect, Vec3f* pos, u32 sfxId) { Effect_Initialize(effect); effect->obj.status = OBJ_ACTIVE; effect->obj.id = OBJ_EFFECT_373; @@ -962,24 +961,24 @@ void func_8007A5F8(Effect* effect, Vec3f* pos, u32 sfxId) { Object_SetInfo(&effect->info, effect->obj.id); } -void func_8007A6F0(Vec3f* pos, s32 sfxId) { +void func_effect_8007A6F0(Vec3f* pos, s32 sfxId) { s32 i; for (i = 0; i < ARRAY_COUNT(gEffects); i++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8007A5F8(&gEffects[i], pos, sfxId); + func_effect_8007A5F8(&gEffects[i], pos, sfxId); break; } } } -void func_8007A748(Effect* effect) { +void func_effect_8007A748(Effect* effect) { if (effect->timer_50 == 0) { Object_Kill(&effect->obj, effect->sfxSource); } } -bool func_8007A774(Player* player, Effect* effect, f32 arg2) { +bool func_effect_8007A774(Player* player, Effect* effect, f32 arg2) { if ((fabsf(player->unk_138 - effect->obj.pos.z) < arg2) && (fabsf(player->pos.x - effect->obj.pos.x) < arg2) && (fabsf(player->pos.y - effect->obj.pos.y) < arg2) && (player->timer_498 == 0)) { Player_ApplyDamage(player, 0, effect->info.damage); @@ -989,7 +988,7 @@ bool func_8007A774(Player* player, Effect* effect, f32 arg2) { } } -void func_8007A818(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale1, u8 arg5, u8 arg6, u16 arg7) { +void func_effect_8007A818(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale1, u8 arg5, u8 arg6, u16 arg7) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_359; @@ -1009,20 +1008,20 @@ void func_8007A818(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale1, u8 Object_SetInfo(&effect->info, effect->obj.id); } -void func_8007A900(f32 xPos, f32 yPos, f32 zPos, f32 scale1, u8 arg4, u8 arg5, u16 arg6) { +void func_effect_8007A900(f32 xPos, f32 yPos, f32 zPos, f32 scale1, u8 arg4, u8 arg5, u16 arg6) { s32 i; if (gCurrentLevel == LEVEL_TITANIA) { for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8007A818(&gEffects[i], xPos, yPos, zPos, scale1, arg4, arg5, arg6); + func_effect_8007A818(&gEffects[i], xPos, yPos, zPos, scale1, arg4, arg5, arg6); break; } } } } -void func_8007A994(Effect* effect) { +void func_effect_8007A994(Effect* effect) { Math_SmoothStepToF(&effect->scale2, effect->scale1, 0.1f, 10.0f, 0.01f); effect->obj.rot.z += effect->unk_60.z; effect->vel.y += effect->unk_60.y; @@ -1041,9 +1040,9 @@ void func_8007A994(Effect* effect) { effect->unk_4A++; } -Gfx* D_800D178C[] = { D_TI_6003440, D_TI_60034E0, D_TI_6003580, D_TI_6003620, D_TI_60036C0, D_TR_6003760 }; +static Gfx* D_800D178C[] = { D_TI_6003440, D_TI_60034E0, D_TI_6003580, D_TI_6003620, D_TI_60036C0, D_TR_6003760 }; -void func_8007AA60(Effect* effect) { +void func_effect_8007AA60(Effect* effect) { RCP_SetupDL(&gMasterDisp, 0x44); gDPSetPrimColor(gMasterDisp++, 0, 0, 31, 10, 00, effect->unk_44); gDPSetEnvColor(gMasterDisp++, 141, 73, 5, 0); @@ -1054,7 +1053,7 @@ void func_8007AA60(Effect* effect) { RCP_SetupDL(&gMasterDisp, 0x40); } -void func_8007AB50(Effect* effect) { +void func_effect_8007AB50(Effect* effect) { if (effect->state == 0) { Math_SmoothStepToF(&effect->scale2, effect->scale1, 0.1f, 10.0f, 0.0f); effect->unk_44 -= 20; @@ -1070,7 +1069,7 @@ void func_8007AB50(Effect* effect) { } } -void func_8007AC0C(Effect* effect, f32 xPos, f32 unused_posY, f32 zPos, f32 scale2, f32 scale1, f32 yRot) { +void func_effect_8007AC0C(Effect* effect, f32 xPos, f32 unused_posY, f32 zPos, f32 scale2, f32 scale1, f32 yRot) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_372; @@ -1088,18 +1087,18 @@ void func_8007AC0C(Effect* effect, f32 xPos, f32 unused_posY, f32 zPos, f32 scal Object_SetInfo(&effect->info, effect->obj.id); } -void func_8007ACE0(f32 xPos, f32 yPos, f32 zPos, f32 scale2, f32 scale1, f32 yRot) { +void func_effect_8007ACE0(f32 xPos, f32 yPos, f32 zPos, f32 scale2, f32 scale1, f32 yRot) { s32 i; for (i = 0; i < ARRAY_COUNT(gEffects); i++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8007AC0C(&gEffects[i], xPos, yPos, zPos, scale2, scale1, yRot); + func_effect_8007AC0C(&gEffects[i], xPos, yPos, zPos, scale2, scale1, yRot); break; } } } -void func_8007AD58(Effect* effect, f32 xPos, f32 unused_posY, f32 zPos, f32 scale2, f32 scale1, f32 yRot) { +void func_effect_8007AD58(Effect* effect, f32 xPos, f32 unused_posY, f32 zPos, f32 scale2, f32 scale1, f32 yRot) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_372; @@ -1116,7 +1115,7 @@ void func_8007AD58(Effect* effect, f32 xPos, f32 unused_posY, f32 zPos, f32 scal Object_SetInfo(&effect->info, effect->obj.id); } -void func_8007ADF4(f32 xPos, f32 yPos, f32 zPos, f32 scale2, f32 scale1) { +void func_effect_8007ADF4(f32 xPos, f32 yPos, f32 zPos, f32 scale2, f32 scale1) { f32 cosf; f32 sinf; f32 yRot; @@ -1128,14 +1127,14 @@ void func_8007ADF4(f32 xPos, f32 yPos, f32 zPos, f32 scale2, f32 scale1) { if (gEffects[j].obj.status == OBJ_FREE) { sinf = SIN_DEG(yRot) * scale1 * 20.0f; cosf = COS_DEG(yRot) * scale1 * 20.0f; - func_8007AD58(&gEffects[j], xPos + sinf, yPos, zPos + cosf, scale2, scale1, yRot); + func_effect_8007AD58(&gEffects[j], xPos + sinf, yPos, zPos + cosf, scale2, scale1, yRot); break; } } } } -void func_8007AF30(Effect* effect, f32 xPos, f32 zPos, f32 xVel, f32 zVel, f32 scale1) { +void func_effect_8007AF30(Effect* effect, f32 xPos, f32 zPos, f32 xVel, f32 zVel, f32 scale1) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_382; @@ -1145,38 +1144,38 @@ void func_8007AF30(Effect* effect, f32 xPos, f32 zPos, f32 xVel, f32 zVel, f32 s effect->obj.pos.z = zPos; effect->vel.x = xVel; - effect->vel.z = zVel - D_80177D08; + effect->vel.z = zVel - D_ctx_80177D08; effect->scale1 = scale1; effect->timer_50 = 100; Object_SetInfo(&effect->info, effect->obj.id); } -void func_8007AFD0(f32 xPos, f32 zPos, f32 xVel, f32 zVel, f32 scale1) { +void func_effect_8007AFD0(f32 xPos, f32 zPos, f32 xVel, f32 zVel, f32 scale1) { s32 i; for (i = 0; i < ARRAY_COUNT(gEffects); i++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8007AF30(&gEffects[i], xPos, zPos, xVel, zVel, scale1); + func_effect_8007AF30(&gEffects[i], xPos, zPos, xVel, zVel, scale1); break; } } } -void func_8007B040(Effect* effect) { +void func_effect_8007B040(Effect* effect) { f32 sp2C; s32 sp28; - if (func_800A73E4(&sp2C, &sp28, effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z)) { - D_801782EC[sp28] = effect->scale1; - D_801782EC[sp28 + 1] = effect->scale1 * 0.7f; - D_801782EC[sp28 - 1] = effect->scale1 * 0.7f; + if (func_play_800A73E4(&sp2C, &sp28, effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z)) { + D_ctx_801782EC[sp28] = effect->scale1; + D_ctx_801782EC[sp28 + 1] = effect->scale1 * 0.7f; + D_ctx_801782EC[sp28 - 1] = effect->scale1 * 0.7f; } if (effect->timer_50 == 0) { Object_Kill(&effect->obj, effect->sfxSource); } } -void func_8007B0F4(Effect* effect) { +void func_effect_8007B0F4(Effect* effect) { Math_SmoothStepToF(&effect->scale2, effect->scale1 * 3.0f, 0.1f, 10.0f, 0.0f); effect->unk_44 -= 13; effect->obj.rot.y = 180.0f - effect->obj.rot.y; @@ -1185,7 +1184,7 @@ void func_8007B0F4(Effect* effect) { } } -void func_8007B180(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale1) { +void func_effect_8007B180(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale1) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_381; @@ -1200,18 +1199,18 @@ void func_8007B180(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale1) { AUDIO_PLAY_SFX(0x1100000C, effect->sfxSource, 0); } -void func_8007B228(f32 xPos, f32 yPos, f32 zPos, f32 scale1) { +void func_effect_8007B228(f32 xPos, f32 yPos, f32 zPos, f32 scale1) { s32 i; for (i = 0; i < ARRAY_COUNT(gEffects) && gCurrentLevel == LEVEL_ZONESS; i++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8007B180(&gEffects[i], xPos, yPos, zPos, scale1); + func_effect_8007B180(&gEffects[i], xPos, yPos, zPos, scale1); break; } } } -void func_8007B2BC(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale1, s32 arg5) { +void func_effect_8007B2BC(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale1, s32 arg5) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_384; @@ -1226,18 +1225,18 @@ void func_8007B2BC(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale1, s32 Object_SetInfo(&effect->info, effect->obj.id); } -void func_8007B344(f32 xPos, f32 yPos, f32 zPos, f32 scale1, s32 arg4) { +void func_effect_8007B344(f32 xPos, f32 yPos, f32 zPos, f32 scale1, s32 arg4) { s32 i; for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8007B2BC(&gEffects[i], xPos, yPos, zPos, scale1, arg4); + func_effect_8007B2BC(&gEffects[i], xPos, yPos, zPos, scale1, arg4); break; } } } -void func_8007B3B8(Effect* effect) { +void func_effect_8007B3B8(Effect* effect) { f32 var_fv0; f32 var_fv1; s32 var_v0; @@ -1264,7 +1263,7 @@ void func_8007B3B8(Effect* effect) { } } -void func_8007B494(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale1, s32 arg5) { +void func_effect_8007B494(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale1, s32 arg5) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_385; @@ -1287,18 +1286,18 @@ void func_8007B494(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale1, s32 Object_SetInfo(&effect->info, effect->obj.id); } -void func_8007B550(f32 xPos, f32 yPos, f32 zPos, f32 scale1, s32 arg4) { +void func_effect_8007B550(f32 xPos, f32 yPos, f32 zPos, f32 scale1, s32 arg4) { s32 i; for (i = 0; i < ARRAY_COUNT(gEffects); i++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8007B494(&gEffects[i], xPos, yPos, zPos, scale1, arg4); + func_effect_8007B494(&gEffects[i], xPos, yPos, zPos, scale1, arg4); break; } } } -void func_8007B5C0(Effect* effect) { +void func_effect_8007B5C0(Effect* effect) { Math_SmoothStepToF(&effect->scale2, effect->scale1, 0.1f, 10.0f, 0.1f); effect->unk_44 -= effect->unk_46; if (effect->unk_44 < 0) { @@ -1306,7 +1305,7 @@ void func_8007B5C0(Effect* effect) { } } -void func_8007B62C(Effect* effect) { +void func_effect_8007B62C(Effect* effect) { if (effect->timer_50 == 0) { effect->unk_46 -= 4; if (effect->unk_46 <= 0) { @@ -1315,10 +1314,10 @@ void func_8007B62C(Effect* effect) { } } -void func_8007B670(Effect* effect) { +void func_effect_8007B670(Effect* effect) { } -void func_8007B67C(Effect* effect) { +void func_effect_8007B67C(Effect* effect) { s32 var_v1; effect->unk_46 += 2; @@ -1345,16 +1344,16 @@ void func_8007B67C(Effect* effect) { } } -void func_8007B758(Effect* effect) { +void func_effect_8007B758(Effect* effect) { Math_SmoothStepToF(&effect->scale2, effect->scale1, 0.1f, 10.0f, 0.1f); effect->unk_44 -= 2; if (effect->unk_44 < 0) { Object_Kill(&effect->obj, effect->sfxSource); } - func_8007A774(gPlayer, effect, effect->scale2 * 20.0f); + func_effect_8007A774(gPlayer, effect, effect->scale2 * 20.0f); } -void func_8007B7E8(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2) { +void func_effect_8007B7E8(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_364; @@ -1377,18 +1376,18 @@ void func_8007B7E8(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2) { Object_SetInfo(&effect->info, effect->obj.id); } -void func_8007B8F8(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { +void func_effect_8007B8F8(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { s32 i, j; for (i = ARRAY_COUNT(gEffects) - 1, j = 0; j < ARRAY_COUNT(gEffects); i--, j++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8007B7E8(&gEffects[i], xPos, yPos, zPos, scale2); + func_effect_8007B7E8(&gEffects[i], xPos, yPos, zPos, scale2); break; } } } -void func_8007B960(Effect* effect) { +void func_effect_8007B960(Effect* effect) { effect->scale2 += 0.07f; effect->unk_4A -= effect->unk_46; if (effect->unk_4A < 0) { @@ -1398,7 +1397,7 @@ void func_8007B960(Effect* effect) { effect->vel.y += 0.2f; } -void func_8007B9DC(Effect* effect) { +void func_effect_8007B9DC(Effect* effect) { //! DEBUG: Hold Z on controller 4 to set up a display list. if (gControllerHold[3].button & Z_TRIG) { RCP_SetupDL(&gMasterDisp, 4); @@ -1422,7 +1421,7 @@ void func_8007B9DC(Effect* effect) { } } -void func_8007BB14(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2) { +void func_effect_8007BB14(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_362; @@ -1456,18 +1455,18 @@ void func_8007BB14(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2) { Object_SetInfo(&effect->info, effect->obj.id); } -void func_8007BC7C(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { +void func_effect_8007BC7C(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { s32 i; for (i = ARRAY_COUNT(gEffects) - 20; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8007BB14(&gEffects[i], xPos, yPos, zPos, scale2); + func_effect_8007BB14(&gEffects[i], xPos, yPos, zPos, scale2); break; } } } -void func_8007BCE8(Effect* effect) { +void func_effect_8007BCE8(Effect* effect) { if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7) { effect->obj.rot.x = RAD_TO_DEG(gPlayer[0].unk_05C); effect->obj.rot.y = RAD_TO_DEG(-gPlayer[0].unk_058); @@ -1487,7 +1486,7 @@ void func_8007BCE8(Effect* effect) { effect->vel.y += 0.2f; } -void func_8007BDE0(Effect* effect) { +void func_effect_8007BDE0(Effect* effect) { effect->scale2 += 0.04f; effect->unk_4A -= 2; if (effect->unk_4A < 0) { @@ -1497,7 +1496,7 @@ void func_8007BDE0(Effect* effect) { effect->vel.y += effect->scale1; } -void func_8007BE54(Effect* effect) { +void func_effect_8007BE54(Effect* effect) { effect->scale2 += 0.02f; effect->unk_4A -= 3; if (effect->unk_4A < 0) { @@ -1508,14 +1507,14 @@ void func_8007BE54(Effect* effect) { effect->vel.y += 0.1f; } -void func_8007BEE8(Effect* effect) { +void func_effect_8007BEE8(Effect* effect) { Graphics_SetScaleMtx(effect->scale2); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->unk_4A); gSPDisplayList(gMasterDisp++, D_BG_PLANET_2010A30); } -void func_8007BF64(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, - s32 timer50) { +void func_effect_8007BF64(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, + s32 timer50) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_386; @@ -1532,19 +1531,19 @@ void func_8007BF64(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 y Object_SetInfo(&effect->info, effect->obj.id); } -void func_8007BFFC(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, s32 timer50) { +void func_effect_8007BFFC(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, s32 timer50) { s32 i; for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8007BF64(&gEffects[i], xPos, yPos, zPos, xVel, yVel, zVel, scale2, timer50); + func_effect_8007BF64(&gEffects[i], xPos, yPos, zPos, xVel, yVel, zVel, scale2, timer50); break; } } } -void func_8007C088(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, - s32 timer50) { +void func_effect_8007C088(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, + s32 timer50) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_390; @@ -1561,30 +1560,30 @@ void func_8007C088(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 y Object_SetInfo(&effect->info, effect->obj.id); } -void func_8007C120(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, s32 timer50) { +void func_effect_8007C120(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, s32 timer50) { s32 i; for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8007C088(&gEffects[i], xPos, yPos, zPos, xVel, yVel, zVel, scale2, timer50); + func_effect_8007C088(&gEffects[i], xPos, yPos, zPos, xVel, yVel, zVel, scale2, timer50); break; } } } -void func_8007C1AC(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, s32 timer50) { +void func_effect_8007C1AC(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, s32 timer50) { s32 i; for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8007BF64(&gEffects[i], xPos, yPos, zPos, xVel, yVel, zVel, scale2, timer50); - func_800A6070(gEffects[i].sfxSource, 0x29000000); + func_effect_8007BF64(&gEffects[i], xPos, yPos, zPos, xVel, yVel, zVel, scale2, timer50); + func_play_800A6070(gEffects[i].sfxSource, 0x29000000); break; } } } -void func_8007C250(Effect* effect) { +void func_effect_8007C250(Effect* effect) { f32 randX; f32 randY; f32 randOther; @@ -1603,15 +1602,16 @@ void func_8007C250(Effect* effect) { randX = RAND_FLOAT_CENTERED(40.0f); randY = RAND_FLOAT_CENTERED(40.0f); randOther = RAND_FLOAT(0.5f) + 1.0f; - func_8007D0E0(effect->obj.pos.x + randX, effect->obj.pos.y + randY, effect->obj.pos.z, - effect->scale2 * randOther); + func_effect_8007D0E0(effect->obj.pos.x + randX, effect->obj.pos.y + randY, effect->obj.pos.z, + effect->scale2 * randOther); if (effect->timer_50 == 0) { Object_Kill(&effect->obj, effect->sfxSource); } } } -void func_8007C3B4(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, s32 arg8) { +void func_effect_8007C3B4(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, + s32 arg8) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_389; @@ -1632,18 +1632,18 @@ void func_8007C3B4(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 y effect->unk_44 = 0xFF; } -void func_8007C484(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, s32 arg7) { +void func_effect_8007C484(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, s32 arg7) { s32 i; for (i = ARRAY_COUNT(gEffects) - 1; i > 32; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8007C3B4(&gEffects[i], xPos, yPos, zPos, xVel, yVel, zVel, scale2, arg7); + func_effect_8007C3B4(&gEffects[i], xPos, yPos, zPos, xVel, yVel, zVel, scale2, arg7); break; } } } -void func_8007C50C(Effect* effect) { +void func_effect_8007C50C(Effect* effect) { f32 randX; f32 randY; f32 randOther; @@ -1652,15 +1652,15 @@ void func_8007C50C(Effect* effect) { randX = RAND_FLOAT_CENTERED(40.0f) * effect->scale2; randY = RAND_FLOAT_CENTERED(40.0f) * effect->scale2; randOther = RAND_FLOAT(1.0f) + 1.0f; - func_8007C484(effect->obj.pos.x + randX, effect->obj.pos.y + randY, effect->obj.pos.z, effect->vel.x, - effect->vel.y, effect->vel.z, effect->scale2 * randOther, 0); + func_effect_8007C484(effect->obj.pos.x + randX, effect->obj.pos.y + randY, effect->obj.pos.z, effect->vel.x, + effect->vel.y, effect->vel.z, effect->scale2 * randOther, 0); if (effect->timer_50 == 0) { Object_Kill(&effect->obj, effect->sfxSource); } } } -void func_8007C608(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 timer50) { +void func_effect_8007C608(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 timer50) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_387; @@ -1674,18 +1674,18 @@ void func_8007C608(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 Object_SetInfo(&effect->info, effect->obj.id); } -void func_8007C688(f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 timer50) { +void func_effect_8007C688(f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 timer50) { s32 i; for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8007C608(&gEffects[i], xPos, yPos, zPos, scale2, timer50); + func_effect_8007C608(&gEffects[i], xPos, yPos, zPos, scale2, timer50); break; } } } -void func_8007C6FC(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2) { +void func_effect_8007C6FC(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_343; @@ -1718,18 +1718,18 @@ void func_8007C6FC(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2) { Object_SetInfo(&effect->info, effect->obj.id); } -void func_8007C85C(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { +void func_effect_8007C85C(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { s32 i; for (i = 0; i < ARRAY_COUNT(gEffects) - 20; i++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8007C6FC(&gEffects[i], xPos, yPos, zPos, scale2); + func_effect_8007C6FC(&gEffects[i], xPos, yPos, zPos, scale2); break; } } } -void func_8007C8C4(Effect* effect) { +void func_effect_8007C8C4(Effect* effect) { f32 randX; f32 randY; f32 randOther; @@ -1744,15 +1744,15 @@ void func_8007C8C4(Effect* effect) { randX = RAND_FLOAT_CENTERED(10.0f); randY = RAND_FLOAT_CENTERED(10.0f); randOther = RAND_FLOAT(0.5f) + 1.0f; - func_8007C85C(effect->obj.pos.x + randX, effect->obj.pos.y + randY, effect->obj.pos.z, - effect->scale2 * randOther); + func_effect_8007C85C(effect->obj.pos.x + randX, effect->obj.pos.y + randY, effect->obj.pos.z, + effect->scale2 * randOther); if (effect->timer_50 == 0) { Object_Kill(&effect->obj, effect->sfxSource); } } } -void func_8007C9E0(Effect* effect) { +void func_effect_8007C9E0(Effect* effect) { if (effect->unk_44 == 0) { effect->scale2 *= 1.03f; effect->unk_4A -= 3; @@ -1774,7 +1774,7 @@ void func_8007C9E0(Effect* effect) { } } -void func_8007CAF0(Effect* effect) { +void func_effect_8007CAF0(Effect* effect) { Graphics_SetScaleMtx(effect->scale2); if (effect->unk_44 == 0) { gDPSetPrimColor(gMasterDisp++, 0, 0, 0, 0, 0, effect->unk_4A); @@ -1787,7 +1787,7 @@ void func_8007CAF0(Effect* effect) { } } -void func_8007CC00(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2) { +void func_effect_8007CC00(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_339; @@ -1806,7 +1806,7 @@ void func_8007CC00(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2) { } } -void func_8007CCBC(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2) { +void func_effect_8007CCBC(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_340; @@ -1827,7 +1827,7 @@ void func_8007CCBC(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2) { } } -void func_8007CD7C(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 timer50) { +void func_effect_8007CD7C(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 timer50) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_342; @@ -1857,70 +1857,70 @@ void func_8007CD7C(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 Object_SetInfo(&effect->info, effect->obj.id); } -void func_8007CEBC(f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 timer50) { +void func_effect_8007CEBC(f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 timer50) { s32 i; for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8007CD7C(&gEffects[i], xPos, yPos, zPos, scale2, timer50); + func_effect_8007CD7C(&gEffects[i], xPos, yPos, zPos, scale2, timer50); break; } } } -void func_8007CF30(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { +void func_effect_8007CF30(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { s32 i; for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8007CC00(&gEffects[i], xPos, yPos, zPos, scale2); + func_effect_8007CC00(&gEffects[i], xPos, yPos, zPos, scale2); break; } } } -void func_8007CF9C(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { +void func_effect_8007CF9C(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { s32 i; for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8007CCBC(&gEffects[i], xPos, yPos, zPos, scale2); + func_effect_8007CCBC(&gEffects[i], xPos, yPos, zPos, scale2); break; } } } -void func_8007D008(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { +void func_effect_8007D008(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { s32 i; for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8007CC00(&gEffects[i], xPos, yPos, zPos, scale2); + func_effect_8007CC00(&gEffects[i], xPos, yPos, zPos, scale2); break; } } } -void func_8007D074(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { +void func_effect_8007D074(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { s32 i; for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8007CCBC(&gEffects[i], xPos, yPos, zPos, scale2); + func_effect_8007CCBC(&gEffects[i], xPos, yPos, zPos, scale2); break; } } } -void func_8007D0E0(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { - func_8007CF30(xPos, yPos, zPos, scale2); +void func_effect_8007D0E0(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { + func_effect_8007CF30(xPos, yPos, zPos, scale2); } -void func_8007D10C(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { - func_8007CF9C(xPos, yPos, zPos, scale2); +void func_effect_8007D10C(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { + func_effect_8007CF9C(xPos, yPos, zPos, scale2); } -void func_8007D138(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2) { +void func_effect_8007D138(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_341; @@ -1938,31 +1938,31 @@ void func_8007D138(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2) { effect->unk_44 = 180; } -void func_8007D1E0(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { +void func_effect_8007D1E0(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { s32 i; for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8007D138(&gEffects[i], xPos, yPos, zPos, scale2); + func_effect_8007D138(&gEffects[i], xPos, yPos, zPos, scale2); break; } } } -void func_8007D24C(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { +void func_effect_8007D24C(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { if (gLevelType == LEVELTYPE_PLANET) { - func_8007D1E0(xPos, yPos, zPos, scale2); - func_8007CEBC(xPos, scale2 + yPos, zPos, scale2, 9); + func_effect_8007D1E0(xPos, yPos, zPos, scale2); + func_effect_8007CEBC(xPos, scale2 + yPos, zPos, scale2, 9); } else { - func_8007D0E0(xPos, yPos, zPos, scale2); + func_effect_8007D0E0(xPos, yPos, zPos, scale2); } } -void func_8007D2C8(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { - func_8007D008(xPos, yPos, zPos, scale2); +void func_effect_8007D2C8(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { + func_effect_8007D008(xPos, yPos, zPos, scale2); } -void func_8007D2F4(Effect* effect) { +void func_effect_8007D2F4(Effect* effect) { if (gLevelType == LEVELTYPE_PLANET) { if ((gCurrentLevel == LEVEL_KATINA) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7)) { effect->vel.y += 0.1f; @@ -2004,19 +2004,19 @@ void func_8007D2F4(Effect* effect) { } effect->unk_44 -= 15; } - if (D_8017836C < effect->scale1) { - D_8017836C = effect->scale1; - D_80178370 = effect->obj.pos.x; - D_80178374 = effect->obj.pos.y; - D_80178378 = effect->obj.pos.z; - D_80178360 = 0xFF; - D_80178364 = 50; - D_80178368 = 0; + if (D_ctx_8017836C < effect->scale1) { + D_ctx_8017836C = effect->scale1; + D_ctx_80178370 = effect->obj.pos.x; + D_ctx_80178374 = effect->obj.pos.y; + D_ctx_80178378 = effect->obj.pos.z; + D_ctx_80178360 = 0xFF; + D_ctx_80178364 = 50; + D_ctx_80178368 = 0; } Math_SmoothStepToF(&effect->scale1, 0.0f, 1.0f, 0.05f, 0.0f); } -Gfx* D_800D17A4[] = { +static Gfx* D_800D17A4[] = { D_BG_PLANET_200B630, D_BG_PLANET_200B630, D_BG_PLANET_200B630, D_BG_PLANET_200B630, D_BG_PLANET_200A5A0, D_BG_PLANET_2009510, D_BG_PLANET_2008480, D_BG_PLANET_20073F0, D_BG_PLANET_2006360, D_BG_PLANET_200C6C0, D_BG_PLANET_20052D0, D_BG_PLANET_2004240, D_BG_PLANET_20031B0, D_BG_PLANET_2002120, D_BG_PLANET_2001090, @@ -2024,13 +2024,13 @@ Gfx* D_800D17A4[] = { D_BG_PLANET_200E7F0, }; -f32 D_800D17F8[] = { +static f32 D_800D17F8[] = { 1.0f, 1.1f, 1.1f, 1.2f, 1.2f, 1.3f, 1.3f, 1.4f, 1.4f, 1.5f, 1.5f, 1.6f, 1.6f, 1.7f, 1.7f, 1.8f, 1.8f, 1.9f, 1.9f, 2.0f, 2.0f, }; // RGBA values -u8 D_800D184C[][4] = { +static u8 D_800D184C[][4] = { { 255, 255, 255, 255 }, { 255, 0, 0, 255 }, { 255, 40, 40, 255 }, { 255, 80, 80, 255 }, { 255, 120, 120, 255 }, { 255, 160, 160, 255 }, { 255, 200, 200, 255 }, { 255, 240, 240, 255 }, { 255, 255, 255, 255 }, { 255, 255, 255, 255 }, { 255, 255, 255, 255 }, { 255, 255, 255, 255 }, @@ -2039,13 +2039,13 @@ u8 D_800D184C[][4] = { { 0, 0, 0, 50 }, }; -Gfx* D_800D18A0[] = { +static Gfx* D_800D18A0[] = { D_BG_SPACE_20066C0, D_BG_SPACE_20066C0, D_BG_SPACE_2005E30, D_BG_SPACE_20055A0, D_BG_SPACE_2004D10, D_BG_SPACE_2004480, D_BG_SPACE_2003BF0, D_BG_SPACE_2003360, D_BG_SPACE_2002AD0, D_BG_SPACE_2002240, D_BG_SPACE_20019B0, D_BG_SPACE_2001120, D_BG_SPACE_2000890, D_BG_SPACE_2000000, }; -void func_8007D55C(Effect* effect) { +void func_effect_8007D55C(Effect* effect) { f32 scale; Graphics_SetScaleMtx(effect->scale2); @@ -2068,7 +2068,7 @@ void func_8007D55C(Effect* effect) { gSPDisplayList(gMasterDisp++, D_800D18A0[effect->unk_4C]); } -void func_8007D748(Effect* effect) { +void func_effect_8007D748(Effect* effect) { if (gLevelType == LEVELTYPE_PLANET) { effect->vel.y += 0.3f; if (effect->timer_50 == 0) { @@ -2092,21 +2092,21 @@ void func_8007D748(Effect* effect) { } effect->unk_44 -= 15; } - if (D_8017836C < effect->scale1) { - D_8017836C = effect->scale1; - D_80178370 = effect->obj.pos.x; - D_80178374 = effect->obj.pos.y; - D_80178378 = effect->obj.pos.z; - D_80178360 = 0xFF; - D_80178364 = 50; - D_80178368 = 0; + if (D_ctx_8017836C < effect->scale1) { + D_ctx_8017836C = effect->scale1; + D_ctx_80178370 = effect->obj.pos.x; + D_ctx_80178374 = effect->obj.pos.y; + D_ctx_80178378 = effect->obj.pos.z; + D_ctx_80178360 = 0xFF; + D_ctx_80178364 = 50; + D_ctx_80178368 = 0; } Math_SmoothStepToF(&effect->scale1, 0, 1.0f, 0.1f, 0.0f); } -void func_8007D8A8(Effect* effect) { +void func_effect_8007D8A8(Effect* effect) { if (gLevelType == LEVELTYPE_SPACE) { - func_8007D2F4(effect); + func_effect_8007D2F4(effect); return; } effect->vel.y += 0.3f; @@ -2122,7 +2122,7 @@ void func_8007D8A8(Effect* effect) { } } -void func_8007D94C(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2, f32 scale1, s32 timer50) { +void func_effect_8007D94C(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2, f32 scale1, s32 timer50) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_367; @@ -2136,18 +2136,18 @@ void func_8007D94C(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2, f32 Object_SetInfo(&effect->info, effect->obj.id); } -void func_8007D9DC(f32 xPos, f32 yPos, f32 zPos, f32 scale2, f32 scale1, s32 timer50) { +void func_effect_8007D9DC(f32 xPos, f32 yPos, f32 zPos, f32 scale2, f32 scale1, s32 timer50) { s32 i; for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8007D94C(&gEffects[i], xPos, yPos, zPos, scale2, scale1, timer50); + func_effect_8007D94C(&gEffects[i], xPos, yPos, zPos, scale2, scale1, timer50); break; } } } -void func_8007DA58(Effect* effect) { +void func_effect_8007DA58(Effect* effect) { effect->scale2 += effect->scale1; if (effect->scale1 > 0.0f) { effect->scale1 -= 0.01f; @@ -2160,20 +2160,20 @@ void func_8007DA58(Effect* effect) { } } -void func_8007DAE4(Effect* effect) { +void func_effect_8007DAE4(Effect* effect) { Graphics_SetScaleMtx(effect->scale2); RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); gSPDisplayList(gMasterDisp++, D_CO_6004900); RCP_SetupDL(&gMasterDisp, 0x40); } -void func_8007DB70(Effect* effect) { +void func_effect_8007DB70(Effect* effect) { Vec3f sp54 = { 0.0f, -10.0f, 0.0f }; switch (effect->state) { case 0: effect->vel.y -= 0.5f; - if ((effect->timer_50 == 0) && ((func_8006351C(1000, &effect->obj.pos, &sp54, 1) != 0) || + if ((effect->timer_50 == 0) && ((func_enmy_8006351C(1000, &effect->obj.pos, &sp54, 1) != 0) || (effect->obj.pos.y < (gGroundLevel + 10.0f)))) { effect->vel.y = 0.0f; if (effect->obj.pos.y < (gGroundLevel + 10.0f)) { @@ -2185,12 +2185,12 @@ void func_8007DB70(Effect* effect) { effect->scale2 = 2.5f; effect->scale1 = 2.5f; AUDIO_PLAY_SFX(0x2903B009, effect->sfxSource, 4); - func_8007D0E0(effect->obj.pos.x, effect->obj.pos.y + 30.0f, effect->obj.pos.z, 7.0f); - func_8007BFFC(effect->obj.pos.x, effect->obj.pos.y + 30.0f, effect->obj.pos.z, 0.0f, 0.0f, 0.0f, 4.0f, - 5); + func_effect_8007D0E0(effect->obj.pos.x, effect->obj.pos.y + 30.0f, effect->obj.pos.z, 7.0f); + func_effect_8007BFFC(effect->obj.pos.x, effect->obj.pos.y + 30.0f, effect->obj.pos.z, 0.0f, 0.0f, 0.0f, + 4.0f, 5); if ((effect->obj.pos.y < (gGroundLevel + 10.0f)) || (D_80161A88 != 2)) { - func_800365E4(effect->obj.pos.x, 3.0f, effect->obj.pos.z, effect->obj.pos.x, effect->obj.pos.z, - 0.0f, 0.0f, 90.0f, 5.0f, 0, 0); + func_beam_800365E4(effect->obj.pos.x, 3.0f, effect->obj.pos.z, effect->obj.pos.x, effect->obj.pos.z, + 0.0f, 0.0f, 90.0f, 5.0f, 0, 0); break; } } @@ -2218,7 +2218,7 @@ void func_8007DB70(Effect* effect) { } } -void func_8007DED4(Effect* effect) { +void func_effect_8007DED4(Effect* effect) { switch (effect->state) { case 0: Graphics_SetScaleMtx(effect->scale2); @@ -2238,22 +2238,22 @@ void func_8007DED4(Effect* effect) { } } -void func_8007E014(Effect* effect) { +void func_effect_8007E014(Effect* effect) { s32 i; f32 x; f32 z; f32 y; - if (D_801784AC == 4) { - func_i5_801B6E20(effect->obj.pos.x, effect->obj.pos.z + D_80177D20, &x, &y, &z); + if (D_ctx_801784AC == 4) { + Ground_801B6E20(effect->obj.pos.x, effect->obj.pos.z + D_ctx_80177D20, &x, &y, &z); effect->obj.pos.y = y + 3.0f; effect->obj.rot.x = RAD_TO_DEG(x); effect->obj.rot.z = RAD_TO_DEG(z); } if (((effect->unk_44 == 1) || (effect->unk_44 == 3)) && ((effect->timer_50 & 3) == 1) && (Rand_ZeroOne() < 0.5f)) { - func_8007D10C(effect->obj.pos.x, effect->obj.pos.y + (effect->scale2 * 5.0f), effect->obj.pos.z + 3.0f, - (RAND_FLOAT(0.7f) + 1.0f) * (effect->scale2 * 1.2f)); + func_effect_8007D10C(effect->obj.pos.x, effect->obj.pos.y + (effect->scale2 * 5.0f), effect->obj.pos.z + 3.0f, + (RAND_FLOAT(0.7f) + 1.0f) * (effect->scale2 * 1.2f)); } for (i = 0; i < ARRAY_COUNT(gEffects); i++) { @@ -2266,13 +2266,13 @@ void func_8007E014(Effect* effect) { } } -void func_8007E258(Effect* effect) { +void func_effect_8007E258(Effect* effect) { if ((gCamCount != 1) && (effect->timer_50 == 0)) { Object_Kill(&effect->obj, effect->sfxSource); } } -void func_8007E298(Effect* effect) { +void func_effect_8007E298(Effect* effect) { if (effect->timer_50 == 0) { effect->scale2 *= 1.035f; effect->unk_4A -= 8; @@ -2286,7 +2286,7 @@ void func_8007E298(Effect* effect) { } } -void func_8007E330(Effect* effect) { +void func_effect_8007E330(Effect* effect) { Graphics_SetScaleMtx(effect->scale2); if (effect->unk_44 == 0) { gDPSetPrimColor(gMasterDisp++, 0, 0, 0, 0, 0, effect->unk_4A); @@ -2296,7 +2296,7 @@ void func_8007E330(Effect* effect) { gSPDisplayList(gMasterDisp++, D_BG_PLANET_2010A30); } -void func_8007E3E4(Effect* effect) { +void func_effect_8007E3E4(Effect* effect) { effect->scale2 += 0.02f; effect->unk_4A -= 4; if (effect->unk_4A < 0) { @@ -2306,7 +2306,7 @@ void func_8007E3E4(Effect* effect) { effect->vel.y += 0.05f; } -void func_8007E45C(Effect* effect) { +void func_effect_8007E45C(Effect* effect) { switch (effect->state) { case 0: if (effect->unk_4C != 0) { @@ -2342,13 +2342,13 @@ void func_8007E45C(Effect* effect) { } } -void func_8007E5CC(Effect* effect) { +void func_effect_8007E5CC(Effect* effect) { Graphics_SetScaleMtx(effect->scale2); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->unk_44); gSPDisplayList(gMasterDisp++, D_BG_PLANET_2010A30); } -void func_8007E648(Effect* effect) { +void func_effect_8007E648(Effect* effect) { if (effect->timer_50 == 0) { Math_SmoothStepToF(&effect->scale2, effect->scale1, 0.05f, 100.0f, 0.0f); effect->unk_44 -= 2; @@ -2358,7 +2358,7 @@ void func_8007E648(Effect* effect) { } } -void func_8007E6B8(Effect* effect, u32 objId, f32 xPos, f32 yPos, f32 zPos, f32 arg5) { +void func_effect_8007E6B8(Effect* effect, u32 objId, f32 xPos, f32 yPos, f32 zPos, f32 arg5) { f32 sp54; f32 sp50; f32 temp_ft4; @@ -2388,9 +2388,9 @@ void func_8007E6B8(Effect* effect, u32 objId, f32 xPos, f32 yPos, f32 zPos, f32 Matrix_MultVec3f(gCalcMatrix, &sp40, &sp34); - effect->vel.x = sp34.x + D_801779E4; - effect->vel.y = sp34.y + D_801779F4; - effect->vel.z = sp34.z - D_80177D08; + effect->vel.x = sp34.x + D_ctx_801779E4; + effect->vel.y = sp34.y + D_ctx_801779F4; + effect->vel.z = sp34.z - D_ctx_80177D08; if ((objId == OBJ_EFFECT_353) || (objId == OBJ_EFFECT_354)) { effect->obj.rot.x = RAD_TO_DEG(sp54); @@ -2415,7 +2415,7 @@ void func_8007E6B8(Effect* effect, u32 objId, f32 xPos, f32 yPos, f32 zPos, f32 AUDIO_PLAY_SFX(0x29002002, effect->sfxSource, 4); } -void func_8007E93C(Effect* effect, u32 objId, f32 xPos, f32 yPos, f32 zPos, f32 arg5) { +void func_effect_8007E93C(Effect* effect, u32 objId, f32 xPos, f32 yPos, f32 zPos, f32 arg5) { f32 sp54; f32 sp50; f32 temp_ft4; @@ -2445,9 +2445,9 @@ void func_8007E93C(Effect* effect, u32 objId, f32 xPos, f32 yPos, f32 zPos, f32 Matrix_MultVec3f(gCalcMatrix, &sp40, &sp34); - effect->vel.x = sp34.x + D_801779E4; - effect->vel.y = sp34.y + D_801779F4; - effect->vel.z = sp34.z - D_80177D08; + effect->vel.x = sp34.x + D_ctx_801779E4; + effect->vel.y = sp34.y + D_ctx_801779F4; + effect->vel.z = sp34.z - D_ctx_80177D08; if (objId == OBJ_EFFECT_353) { effect->obj.rot.x = RAD_TO_DEG(sp54); @@ -2472,8 +2472,8 @@ void func_8007E93C(Effect* effect, u32 objId, f32 xPos, f32 yPos, f32 zPos, f32 AUDIO_PLAY_SFX(0x29002002, effect->sfxSource, 4); } -void func_8007EBB8(Effect* effect, ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, - f32 scale2) { +void func_effect_8007EBB8(Effect* effect, ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, + f32 scale2) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = objId; @@ -2497,19 +2497,19 @@ void func_8007EBB8(Effect* effect, ObjectId objId, f32 xPos, f32 yPos, f32 zPos, Object_SetInfo(&effect->info, effect->obj.id); } -void func_8007ECB4(ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2) { +void func_effect_8007ECB4(ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2) { s32 i; for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8007EBB8(&gEffects[i], objId, xPos, yPos, zPos, xVel, yVel, zVel, scale2); + func_effect_8007EBB8(&gEffects[i], objId, xPos, yPos, zPos, xVel, yVel, zVel, scale2); break; } } } -void func_8007ED54(Effect* effect, ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 zRot, f32 unkX, - f32 unkY, f32 unkZ, f32 xVel, f32 yVel, f32 zVel, f32 scale2) { +void func_effect_8007ED54(Effect* effect, ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 zRot, + f32 unkX, f32 unkY, f32 unkZ, f32 xVel, f32 yVel, f32 zVel, f32 scale2) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = objId; @@ -2542,7 +2542,7 @@ void func_8007ED54(Effect* effect, ObjectId objId, f32 xPos, f32 yPos, f32 zPos, Object_SetInfo(&effect->info, effect->obj.id); } -void func_8007EE68(ObjectId objId, Vec3f* pos, Vec3f* rot, Vec3f* arg3, Vec3f* arg4, f32 scale2) { +void func_effect_8007EE68(ObjectId objId, Vec3f* pos, Vec3f* rot, Vec3f* arg3, Vec3f* arg4, f32 scale2) { s32 i; Vec3f sp68; @@ -2556,35 +2556,35 @@ void func_8007EE68(ObjectId objId, Vec3f* pos, Vec3f* rot, Vec3f* arg3, Vec3f* a for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8007ED54(&gEffects[i], objId, pos->x + sp68.x, pos->y + sp68.y, pos->z + sp68.z, rot->x, rot->y, - rot->z, arg3->x, arg3->y, arg3->z, sp68.x + D_801779E4, sp68.y + D_801779F4, - sp68.z - D_80177D08, scale2); + func_effect_8007ED54(&gEffects[i], objId, pos->x + sp68.x, pos->y + sp68.y, pos->z + sp68.z, rot->x, rot->y, + rot->z, arg3->x, arg3->y, arg3->z, sp68.x + D_ctx_801779E4, sp68.y + D_ctx_801779F4, + sp68.z - D_ctx_80177D08, scale2); break; } } } -void func_8007F04C(ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 zRot, f32 unkX, f32 unkY, - f32 unkZ, f32 xVel, f32 yVel, f32 zVel, f32 scale2) { +void func_effect_8007F04C(ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 zRot, f32 unkX, + f32 unkY, f32 unkZ, f32 xVel, f32 yVel, f32 zVel, f32 scale2) { s32 i; for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8007ED54(&gEffects[i], objId, xPos, yPos, zPos, xRot, yRot, zRot, unkX, unkY, unkZ, xVel, yVel, zVel, - scale2); + func_effect_8007ED54(&gEffects[i], objId, xPos, yPos, zPos, xRot, yRot, zRot, unkX, unkY, unkZ, xVel, yVel, + zVel, scale2); break; } } } -void func_8007F11C(ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 arg4) { +void func_effect_8007F11C(ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 arg4) { s32 i; if ((fabsf(zPos - gPlayer[0].unk_138) > 300.0f) || (fabsf(xPos - gPlayer[0].pos.x) > 300.0f)) { for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { Matrix_Push(&gCalcMatrix); - func_8007E6B8(&gEffects[i], objId, xPos, yPos, zPos, arg4); + func_effect_8007E6B8(&gEffects[i], objId, xPos, yPos, zPos, arg4); Matrix_Pop(&gCalcMatrix); break; } @@ -2592,14 +2592,14 @@ void func_8007F11C(ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 arg4) { } } -void func_8007F20C(ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 arg4) { +void func_effect_8007F20C(ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 arg4) { s32 i; if ((fabsf(zPos - gPlayer[0].camEye.z) > 300.0f) || (fabsf(xPos - gPlayer[0].camEye.x) > 300.0f)) { for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { Matrix_Push(&gCalcMatrix); - func_8007E93C(&gEffects[i], objId, xPos, yPos, zPos, arg4); + func_effect_8007E93C(&gEffects[i], objId, xPos, yPos, zPos, arg4); Matrix_Pop(&gCalcMatrix); break; } @@ -2607,7 +2607,7 @@ void func_8007F20C(ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 arg4) { } } -void func_8007F2FC(Effect* effect) { +void func_effect_8007F2FC(Effect* effect) { if (effect->timer_50 == 0) { Object_Kill(&effect->obj, effect->sfxSource); } @@ -2620,7 +2620,7 @@ void func_8007F2FC(Effect* effect) { effect->vel.y -= 0.3f; } - if (effect->obj.pos.y < D_80177CC0) { + if (effect->obj.pos.y < D_ctx_80177CC0) { effect->vel.y += 0.2f; effect->obj.pos.y -= effect->vel.y * 0.5f; effect->obj.pos.x -= effect->vel.x * 0.5f; @@ -2628,11 +2628,11 @@ void func_8007F2FC(Effect* effect) { } if ((effect->unk_44 == 1) && !(gGameFrameCount & 1)) { - func_8007D0E0(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 1.5f); + func_effect_8007D0E0(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 1.5f); } } -void func_8007F438(Effect* effect) { +void func_effect_8007F438(Effect* effect) { if (gCurrentLevel == LEVEL_AQUAS) { effect->obj.rot.z += 3.5f; effect->vel.z = 5.0f; @@ -2651,7 +2651,7 @@ void func_8007F438(Effect* effect) { effect->unk_46--; } - if (D_80177D08 < 0.0f) { + if (D_ctx_80177D08 < 0.0f) { effect->vel.z = -10.0f; } @@ -2669,7 +2669,7 @@ void func_8007F438(Effect* effect) { } } -void func_8007F5AC(Effect* effect) { +void func_effect_8007F5AC(Effect* effect) { if (effect->unk_4C == 0) { effect->unk_46++; if (!(effect->unk_46 & 0x20)) { @@ -2694,7 +2694,7 @@ void func_8007F5AC(Effect* effect) { } } -void func_8007F6B0(Effect* effect) { +void func_effect_8007F6B0(Effect* effect) { s32 i; f32 temp; f32 cos; @@ -2720,23 +2720,23 @@ void func_8007F6B0(Effect* effect) { cos = __cosf(temp) * effect->scale2 * 8.0f; yPos = gGroundLevel + 40.0f; - if (D_801784AC == 4) { - func_i5_801B6E20(effect->obj.pos.x + sin, effect->obj.pos.z + cos + D_80177D20, &x, &y, &z); + if (D_ctx_801784AC == 4) { + Ground_801B6E20(effect->obj.pos.x + sin, effect->obj.pos.z + cos + D_ctx_80177D20, &x, &y, &z); yPos = y + 30.0f; } if (gCurrentLevel == LEVEL_AQUAS) { - func_8007B8F8(effect->obj.pos.x + sin, yPos, effect->obj.pos.z + cos, 20.0f); + func_effect_8007B8F8(effect->obj.pos.x + sin, yPos, effect->obj.pos.z + cos, 20.0f); } else if (gCurrentLevel == LEVEL_FORTUNA) { - func_8007BC7C(effect->obj.pos.x + sin, yPos, effect->obj.pos.z + cos, 20.0f); + func_effect_8007BC7C(effect->obj.pos.x + sin, yPos, effect->obj.pos.z + cos, 20.0f); } else if (gCurrentLevel == LEVEL_TITANIA) { - func_8007A900(effect->obj.pos.x + sin, yPos, effect->obj.pos.z + cos, 10.0f, 0xFF, 0xF, 0); + func_effect_8007A900(effect->obj.pos.x + sin, yPos, effect->obj.pos.z + cos, 10.0f, 0xFF, 0xF, 0); } } } } -void func_8007F958(Effect* effect) { +void func_effect_8007F958(Effect* effect) { s32 i; f32 x; f32 z; @@ -2767,21 +2767,21 @@ void func_8007F958(Effect* effect) { cos = __cosf(temp) * effect->scale2 * 16.0f; yPos = gGroundLevel + 10.0f; - if (D_801784AC == 4) { - func_i5_801B6E20(effect->obj.pos.x + sin, effect->obj.pos.z + cos + D_80177D20, &x, &y, &z); + if (D_ctx_801784AC == 4) { + Ground_801B6E20(effect->obj.pos.x + sin, effect->obj.pos.z + cos + D_ctx_80177D20, &x, &y, &z); yPos = y + 10.0f; } if (gCurrentLevel == LEVEL_FORTUNA) { - func_8007BC7C(effect->obj.pos.x + sin, yPos, effect->obj.pos.z + cos, 8.0f); + func_effect_8007BC7C(effect->obj.pos.x + sin, yPos, effect->obj.pos.z + cos, 8.0f); } else if (gCurrentLevel == LEVEL_TITANIA) { - func_8007A900(effect->obj.pos.x + sin, yPos, effect->obj.pos.z + cos, 8.0f, 0xFF, 0xF, 0); + func_effect_8007A900(effect->obj.pos.x + sin, yPos, effect->obj.pos.z + cos, 8.0f, 0xFF, 0xF, 0); } } } } -void func_8007FBE0(Effect* effect) { +void func_effect_8007FBE0(Effect* effect) { s32 i; f32 temp; f32 sin; @@ -2807,17 +2807,17 @@ void func_8007FBE0(Effect* effect) { sin = __sinf(temp) * effect->scale2 * 16.0f; cos = __cosf(temp) * effect->scale2 * 16.0f; yPos = gGroundLevel + 10.0f; - func_8007BC7C(effect->obj.pos.x + sin, yPos, effect->obj.pos.z + cos, 12.0f); + func_effect_8007BC7C(effect->obj.pos.x + sin, yPos, effect->obj.pos.z + cos, 12.0f); } } } -bool func_8007FD84(Effect* effect) { +bool func_effect_8007FD84(Effect* effect) { s32 i; Actor* actor; - for (i = 1; i < ARRAY_COUNT(D_800CFF80); i++) { - actor = &gActors[D_800CFF80[i]]; + for (i = 1; i < ARRAY_COUNT(D_enmy2_800CFF80); i++) { + actor = &gActors[D_enmy2_800CFF80[i]]; if (actor->obj.status == OBJ_ACTIVE) { if ((actor->iwork[12] > 0) && (actor->iwork[12] < 6) && (fabsf(actor->obj.pos.z - effect->obj.pos.z) < 100.0f) && @@ -2837,7 +2837,7 @@ bool func_8007FD84(Effect* effect) { return false; } -void func_8007FE88(Effect* effect) { +void func_effect_8007FE88(Effect* effect) { Vec3f srcVelocity; Vec3f destVelocity; Vec3f velocity; @@ -2848,7 +2848,7 @@ void func_8007FE88(Effect* effect) { return; } - if (func_8007FD84(effect) != 0) { + if (func_effect_8007FD84(effect) != 0) { Object_Kill(&effect->obj, effect->sfxSource); return; } @@ -2893,15 +2893,15 @@ void func_8007FE88(Effect* effect) { } } - if (D_801784AC == 4) { - if (func_i5_801B6AEC(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z + D_80177D20) != 0) { + if (D_ctx_801784AC == 4) { + if (Ground_801B6AEC(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z + D_ctx_80177D20) != 0) { Object_Kill(&effect->obj, effect->sfxSource); } } else if (effect->obj.pos.y < gGroundLevel) { Object_Kill(&effect->obj, effect->sfxSource); if (D_80161A88 != 2) { effect->obj.pos.y = gGroundLevel; - func_8007D074(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 2.0f); + func_effect_8007D074(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 2.0f); } } @@ -2910,26 +2910,26 @@ void func_8007FE88(Effect* effect) { velocity.z = effect->vel.z; if (gCurrentLevel != LEVEL_MACBETH) { - if (func_8006351C(1000, &effect->obj.pos, &velocity, 2) != 0) { - func_8007D10C(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 2.0f); + if (func_enmy_8006351C(1000, &effect->obj.pos, &velocity, 2) != 0) { + func_effect_8007D10C(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 2.0f); Object_Kill(&effect->obj, effect->sfxSource); } - } else if (func_i5_801A55D4(1000, &effect->obj.pos, &velocity, 0) != 0) { - func_8007D10C(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 2.0f); + } else if (Macbeth_801A55D4(1000, &effect->obj.pos, &velocity, 0) != 0) { + func_effect_8007D10C(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 2.0f); Object_Kill(&effect->obj, effect->sfxSource); } } -void func_800802B8(Effect* effect) { - func_8007FE88(effect); +void func_effect_800802B8(Effect* effect) { + func_effect_8007FE88(effect); } -void func_800802D8(Effect* effect) { - func_8007FE88(effect); +void func_effect_800802D8(Effect* effect) { + func_effect_8007FE88(effect); } -void func_800802F8(Effect* effect) { - func_8007FE88(effect); +void func_effect_800802F8(Effect* effect) { + func_effect_8007FE88(effect); effect->obj.rot.z += 10.0f; effect->scale2 = 3.0f; if (gGameFrameCount & 1) { @@ -2937,7 +2937,7 @@ void func_800802F8(Effect* effect) { } } -void func_80080360(Effect* effect) { +void func_effect_80080360(Effect* effect) { effect->obj.rot.z += 8.0f; effect->scale2 += 0.1f; // It seems they forgot that unk_4A is s16 and not a float... @@ -2945,10 +2945,10 @@ void func_80080360(Effect* effect) { if (effect->unk_4A < 50.0f) { effect->unk_4A = 50; } - func_8007A774(gPlayer, effect, 50.0f); + func_effect_8007A774(gPlayer, effect, 50.0f); } -void func_8008040C(Effect* effect) { +void func_effect_8008040C(Effect* effect) { f32 xRot; f32 yRot; f32 temp; @@ -2968,9 +2968,9 @@ void func_8008040C(Effect* effect) { srcVelocity.x = 0.0f; srcVelocity.z = 100.0f; Matrix_MultVec3f(gCalcMatrix, &srcVelocity, &destVelocity); - effect->vel.x = destVelocity.x + D_801779E4; - effect->vel.y = destVelocity.y + D_801779F4; - effect->vel.z = destVelocity.z - D_80177D08; + effect->vel.x = destVelocity.x + D_ctx_801779E4; + effect->vel.y = destVelocity.y + D_ctx_801779F4; + effect->vel.z = destVelocity.z - D_ctx_80177D08; effect->state++; break; @@ -2981,7 +2981,7 @@ void func_8008040C(Effect* effect) { return; } - if (func_8007FD84(effect) != 0) { + if (func_effect_8007FD84(effect) != 0) { Object_Kill(&effect->obj, effect->sfxSource); return; } @@ -3023,15 +3023,16 @@ void func_8008040C(Effect* effect) { } } - if (D_801784AC == 4) { - if (func_i5_801B6AEC(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z + D_80177D20) != 0) { + if (D_ctx_801784AC == 4) { + if (Ground_801B6AEC(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z + D_ctx_80177D20) != + 0) { Object_Kill(&effect->obj, effect->sfxSource); } } else if (effect->obj.pos.y < gGroundLevel) { Object_Kill(&effect->obj, effect->sfxSource); if (D_80161A88 != 2) { effect->obj.pos.y = gGroundLevel; - func_8007D074(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 2.0f); + func_effect_8007D074(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 2.0f); } } @@ -3039,18 +3040,18 @@ void func_8008040C(Effect* effect) { sp3C.y = effect->vel.y; sp3C.z = effect->vel.z; - if (func_8006351C(1000, &effect->obj.pos, &sp3C, 2) != 0) { - func_8007D10C(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 2.0f); + if (func_enmy_8006351C(1000, &effect->obj.pos, &sp3C, 2) != 0) { + func_effect_8007D10C(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 2.0f); Object_Kill(&effect->obj, effect->sfxSource); } } break; } - func_8007A774(gPlayer, effect, 50.0f); + func_effect_8007A774(gPlayer, effect, 50.0f); } -void func_8008092C(Effect* effect) { +void func_effect_8008092C(Effect* effect) { switch (effect->unk_44) { case 0: RCP_SetupDL(&gMasterDisp, 0x31); @@ -3073,7 +3074,7 @@ void func_8008092C(Effect* effect) { } } -void func_80080ACC(Effect* effect) { +void func_effect_80080ACC(Effect* effect) { s16 temp_ft2; switch (effect->unk_78) { @@ -3126,20 +3127,20 @@ void func_80080ACC(Effect* effect) { break; case 100: - func_8007E45C(effect); + func_effect_8007E45C(effect); break; case 101: - func_8007BCE8(effect); + func_effect_8007BCE8(effect); break; case 102: - func_8007B758(effect); + func_effect_8007B758(effect); break; } } -void func_80080D04(Effect* effect) { +void func_effect_80080D04(Effect* effect) { static s32 D_800D18E4 = 0; s32 i; s32 alpha; @@ -3295,7 +3296,7 @@ void func_80080D04(Effect* effect) { } } -void func_800815DC(void) { +void func_effect_800815DC(void) { s32 i; for (i = 0; i < ARRAY_COUNT(gEffects); i++) { @@ -3308,7 +3309,7 @@ void func_800815DC(void) { } } -void func_8008165C(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 arg5) { +void func_effect_8008165C(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 arg5) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_395; @@ -3397,26 +3398,26 @@ void func_8008165C(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 } } -void func_80081A8C(f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 arg4) { +void func_effect_80081A8C(f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 arg4) { s32 i; if (arg4 == 6 || arg4 == 7) { - func_800815DC(); + func_effect_800815DC(); } for (i = 0; i < ARRAY_COUNT(gEffects); i++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8008165C(&gEffects[i], xPos, yPos, zPos, scale2, arg4); + func_effect_8008165C(&gEffects[i], xPos, yPos, zPos, scale2, arg4); break; } } } -s32 func_80081B24(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { +s32 func_effect_80081B24(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { s32 i; Effect* effect; - func_800815DC(); + func_effect_800815DC(); for (i = 0, effect = gEffects; i < ARRAY_COUNT(gEffects); i++, effect++) { if (effect->obj.status == OBJ_FREE) { @@ -3441,21 +3442,21 @@ s32 func_80081B24(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { return i; } -void func_80081BEC(f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 arg4) { +void func_effect_80081BEC(f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 arg4) { s32 i; for (i = 0; i < ARRAY_COUNT(gEffects); i++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8008165C(&gEffects[i], xPos, yPos, zPos, scale2, arg4); + func_effect_8008165C(&gEffects[i], xPos, yPos, zPos, scale2, arg4); break; } } } -f32 D_800D18E8 = 0.0f; -f32 D_800D18EC = 0.0f; +static f32 D_800D18E8 = 0.0f; +static f32 D_800D18EC = 0.0f; -void func_80081C5C(Effect* effect) { +void func_effect_80081C5C(Effect* effect) { f32 sp84; f32 posXDiff; f32 posYDiff; @@ -3490,14 +3491,14 @@ void func_80081C5C(Effect* effect) { } if (!(gGameFrameCount & 1)) { - func_8007C484(RAND_FLOAT_CENTERED(50.0f) + effect->obj.pos.x, - RAND_FLOAT_CENTERED(50.0f) + effect->obj.pos.y, - RAND_FLOAT_CENTERED(50.0f) + effect->obj.pos.z, effect->vel.x, effect->vel.y, - effect->vel.z, RAND_FLOAT(0.05f) + 0.05f, 0); + func_effect_8007C484(RAND_FLOAT_CENTERED(50.0f) + effect->obj.pos.x, + RAND_FLOAT_CENTERED(50.0f) + effect->obj.pos.y, + RAND_FLOAT_CENTERED(50.0f) + effect->obj.pos.z, effect->vel.x, effect->vel.y, + effect->vel.z, RAND_FLOAT(0.05f) + 0.05f, 0); } - if (func_8006351C(effect->index, &effect->obj.pos, &velocity, 1) != 0) { - func_8007B344(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 3.0f, 7); + if (func_enmy_8006351C(effect->index, &effect->obj.pos, &velocity, 1) != 0) { + func_effect_8007B344(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 3.0f, 7); Object_Kill(&effect->obj, effect->sfxSource); } sp84 = 50.0f; @@ -3523,9 +3524,9 @@ void func_80081C5C(Effect* effect) { Math_SmoothStepToF(&effect->scale2, 0.5f, 0.01f, 0.02f, 0.0f); } - if (func_8006351C(effect->index, &effect->obj.pos, &velocity, 1) != 0) { + if (func_enmy_8006351C(effect->index, &effect->obj.pos, &velocity, 1) != 0) { Object_Kill(&effect->obj, effect->sfxSource); - func_8007D0E0(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 1.0f); + func_effect_8007D0E0(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 1.0f); } break; @@ -3556,13 +3557,13 @@ void func_80081C5C(Effect* effect) { } if (!(gGameFrameCount & 3)) { - func_8007C120((RAND_FLOAT_CENTERED(effect->scale2) * 50.0f) + effect->obj.pos.x, - (RAND_FLOAT_CENTERED(effect->scale2) * 50.0f) + effect->obj.pos.y, - (RAND_FLOAT_CENTERED(effect->scale2) * 50.0f) + effect->obj.pos.z, effect->vel.x, - effect->vel.y, effect->vel.z, RAND_FLOAT(0.03f) + 0.05f, 10); + func_effect_8007C120((RAND_FLOAT_CENTERED(effect->scale2) * 50.0f) + effect->obj.pos.x, + (RAND_FLOAT_CENTERED(effect->scale2) * 50.0f) + effect->obj.pos.y, + (RAND_FLOAT_CENTERED(effect->scale2) * 50.0f) + effect->obj.pos.z, effect->vel.x, + effect->vel.y, effect->vel.z, RAND_FLOAT(0.03f) + 0.05f, 10); } - if (func_8006351C(effect->index, &effect->obj.pos, &velocity, 1) != 0) { - func_8007B344(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 3.0f, 7); + if (func_enmy_8006351C(effect->index, &effect->obj.pos, &velocity, 1) != 0) { + func_effect_8007B344(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 3.0f, 7); Object_Kill(&effect->obj, effect->sfxSource); } sp84 = 50.0f; @@ -3572,9 +3573,9 @@ void func_80081C5C(Effect* effect) { effect->info.unk_19 = 2; if (effect->unk_44 != 0) { Object_Kill(&effect->obj, effect->sfxSource); - func_8007D0E0(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 5.0f); + func_effect_8007D0E0(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 5.0f); } else if (fabsf(gPlayer[0].unk_138 - effect->obj.pos.z) < 1000.0f) { - func_8006F0D8(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 15.0f); + func_enmy2_8006F0D8(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 15.0f); Object_Kill(&effect->obj, effect->sfxSource); } sp84 = 50.0f; @@ -3591,7 +3592,7 @@ void func_80081C5C(Effect* effect) { break; case 5: - func_80081A8C(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 5.0f, 6); + func_effect_80081A8C(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 5.0f, 6); effect->unk_4A -= effect->unk_46; effect->obj.rot.x += effect->unk_44; effect->obj.rot.y += effect->unk_44; @@ -3614,7 +3615,8 @@ void func_80081C5C(Effect* effect) { switch (gCurrentLevel) { case LEVEL_AQUAS: if (!(gGameFrameCount & 3)) { - func_80081A8C(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, effect->scale2, 6); + func_effect_80081A8C(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, effect->scale2, + 6); } effect->obj.rot.x += effect->unk_60.x; effect->obj.rot.y += effect->unk_60.y; @@ -3628,7 +3630,7 @@ void func_80081C5C(Effect* effect) { case LEVEL_ZONESS: if (!(gGameFrameCount & 3)) { // clang-format off - func_80081A8C(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, effect->scale2 * 3.0f, 6); + func_effect_80081A8C(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, effect->scale2 * 3.0f, 6); // clang-format on } @@ -3638,10 +3640,10 @@ void func_80081C5C(Effect* effect) { effect->vel.y -= 1.0f; - if ((func_800A73E4(&posYOut, &unusedOut, effect->obj.pos.x, effect->obj.pos.y, - effect->obj.pos.z)) || + if ((func_play_800A73E4(&posYOut, &unusedOut, effect->obj.pos.x, effect->obj.pos.y, + effect->obj.pos.z)) || (effect->timer_50 == 0)) { - func_8007B228(effect->obj.pos.x, posYOut, effect->obj.pos.z, effect->scale2); + func_effect_8007B228(effect->obj.pos.x, posYOut, effect->obj.pos.z, effect->scale2); Object_Kill(&effect->obj, effect->sfxSource); } break; @@ -3649,7 +3651,7 @@ void func_80081C5C(Effect* effect) { break; case 8: - Math_SmoothStepToF(D_801779A8, 30.0f, 1.0f, 5.0f, 0.0f); + Math_SmoothStepToF(D_ctx_801779A8, 30.0f, 1.0f, 5.0f, 0.0f); Matrix_RotateY(gCalcMatrix, gBosses[0].obj.rot.y * M_DTOR, 0); Matrix_RotateX(gCalcMatrix, gBosses[0].obj.rot.x * M_DTOR, 1); @@ -3669,16 +3671,16 @@ void func_80081C5C(Effect* effect) { switch (effect->unk_44) { case 0: - func_80081BEC(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 1.0f, 9); + func_effect_80081BEC(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 1.0f, 9); Math_SmoothStepToF(&effect->scale2, 6.0f, 0.01f, 0.05f, 0.00001f); if (effect->scale2 >= 5.0f) { gEffects[ARRAY_COUNT(gEffects) - 1].obj.status = gEffects[ARRAY_COUNT(gEffects) - 2].obj.status = OBJ_FREE; - func_80081BEC(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 1.0f, 10); - D_80178348 = D_80178350 = D_80178354 = 0xFF; - D_80178340 = D_80178358 = 0xFF; - D_80178358 = 0; - D_8017835C = 25; + func_effect_80081BEC(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 1.0f, 10); + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0xFF; + D_ctx_80178340 = D_ctx_80178358 = 0xFF; + D_ctx_80178358 = 0; + D_ctx_8017835C = 25; effect->timer_50 = 10; D_800D18EC = 0.0f; D_800D18E8 = 0.0f; @@ -3691,8 +3693,8 @@ void func_80081C5C(Effect* effect) { case 1: Math_SmoothStepToF(&effect->scale2, 8.0f, 0.1f, 1.0f, 0.00001f); if (effect->timer_50 == 0) { - if (D_80178340 != 0) { - D_80178348 = D_80178350 = D_80178354 = D_80178340 = 0; + if (D_ctx_80178340 != 0) { + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = D_ctx_80178340 = 0; } effect->timer_50 = gBosses[0].timer_050; effect->unk_44++; @@ -3744,28 +3746,29 @@ void func_80081C5C(Effect* effect) { case 10: switch (effect->unk_44) { case 0: - D_801779A8[0] = 50.0f; + D_ctx_801779A8[0] = 50.0f; if (effect->unk_46 == 10) { - D_80178348 = D_80178350 = D_80178354 = 0xFF; - D_80178340 = D_80178358 = 0xFF; - D_80178358 = 0; - D_8017835C = 25; - D_80178480 = 50; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0xFF; + D_ctx_80178340 = D_ctx_80178358 = 0xFF; + D_ctx_80178358 = 0; + D_ctx_8017835C = 25; + D_ctx_80178480 = 50; } if (effect->unk_46 == 0) { - D_80178348 = (D_80178350 = (D_80178354 = (D_80178340 = 0))); + D_ctx_80178348 = (D_ctx_80178350 = (D_ctx_80178354 = (D_ctx_80178340 = 0))); effect->unk_46 = 50; } if (effect->unk_46 != 0) { effect->unk_46 -= 1; } if ((!(gGameFrameCount & 0xF)) && (effect->timer_50 == 0)) { - D_800D18EC = RAD_TO_DEG(Math_Atan2F(gPlayer[0].camEye.x - gBosses[0].obj.pos.x, - gPlayer[0].camEye.z - (gBosses[0].obj.pos.z + D_80177D20))); + D_800D18EC = + RAD_TO_DEG(Math_Atan2F(gPlayer[0].camEye.x - gBosses[0].obj.pos.x, + gPlayer[0].camEye.z - (gBosses[0].obj.pos.z + D_ctx_80177D20))); D_800D18E8 = RAD_TO_DEG( -Math_Atan2F(gPlayer[0].camEye.y - gBosses[0].obj.pos.y, - sqrtf(SQ(gPlayer[0].camEye.z - (gBosses[0].obj.pos.z + D_80177D20)) + + sqrtf(SQ(gPlayer[0].camEye.z - (gBosses[0].obj.pos.z + D_ctx_80177D20)) + SQ(gPlayer[0].camEye.x - gBosses[0].obj.pos.x)))); } if (gBosses[0].timer_050 == 0) { @@ -3775,7 +3778,7 @@ void func_80081C5C(Effect* effect) { break; case 1: - Math_SmoothStepToF(D_801779A8, 20.0f, 1.0f, 5.0f, 0.0f); + Math_SmoothStepToF(D_ctx_801779A8, 20.0f, 1.0f, 5.0f, 0.0f); break; } @@ -3834,19 +3837,19 @@ void func_80081C5C(Effect* effect) { break; case 12: - func_8007A28C(effect); + func_effect_8007A28C(effect); break; } if ((effect->state == 2) && (effect->unk_44 == 2)) { - func_8007FE88(effect); + func_effect_8007FE88(effect); } if ((effect->state < 4) && (effect->state != 1)) { - func_8007A774(gPlayer, effect, sp84); + func_effect_8007A774(gPlayer, effect, sp84); } } -void func_80082F78(Effect* effect) { +void func_effect_80082F78(Effect* effect) { //! FAKE: Probably some debug stuff printing different messages depending on what unk_4E is. if (effect->state != 0 && effect->state != 6) { if (effect->unk_4A && effect->unk_4A) {} @@ -3937,7 +3940,7 @@ void func_80082F78(Effect* effect) { break; case 10: - if (D_80177854 != 100) { + if (D_ctx_80177854 != 100) { Texture_Scroll(D_A6_6012840, 16, 16, 0); } RCP_SetupDL(&gMasterDisp, 0x35); @@ -3956,14 +3959,14 @@ void func_80082F78(Effect* effect) { break; case 12: - func_8007A3C0(effect); + func_effect_8007A3C0(effect); break; } RCP_SetupDL(&gMasterDisp, 0x40); } -void func_800836C0(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 arg4, f32 scale) { +void func_effect_800836C0(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 arg4, f32 scale) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_391; @@ -3984,18 +3987,18 @@ void func_800836C0(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 arg4, f32 s Object_SetInfo(&effect->info, effect->obj.id); } -void func_8008377C(f32 xPos, f32 yPos, f32 zPos, f32 arg3, f32 scale) { +void func_effect_8008377C(f32 xPos, f32 yPos, f32 zPos, f32 arg3, f32 scale) { s32 i; for (i = 0; i < ARRAY_COUNT(gEffects); i++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_800836C0(&gEffects[i], xPos, yPos, zPos, arg3, scale); + func_effect_800836C0(&gEffects[i], xPos, yPos, zPos, arg3, scale); break; } } } -void func_800837EC(Effect* effect) { +void func_effect_800837EC(Effect* effect) { s32 pad[2]; f32 var_fv1; s32 var_s2; @@ -4026,10 +4029,10 @@ void func_800837EC(Effect* effect) { var_fv1 = effect->unk_60.y * 100.0f; } for (i = 0; i < var_s2; i++) { - func_80081BEC(effect->obj.pos.x + RAND_FLOAT_CENTERED(effect->scale2 * 200.0f), - effect->obj.pos.y + var_fv1 + RAND_FLOAT_CENTERED(effect->scale2 * 100.0f), - effect->obj.pos.z + RAND_FLOAT_CENTERED(effect->scale2 * 200.0f), - 0.3f - RAND_FLOAT_CENTERED(0.2f), 11); + func_effect_80081BEC(effect->obj.pos.x + RAND_FLOAT_CENTERED(effect->scale2 * 200.0f), + effect->obj.pos.y + var_fv1 + RAND_FLOAT_CENTERED(effect->scale2 * 100.0f), + effect->obj.pos.z + RAND_FLOAT_CENTERED(effect->scale2 * 200.0f), + 0.3f - RAND_FLOAT_CENTERED(0.2f), 11); } effect->state++; } @@ -4046,11 +4049,11 @@ void func_800837EC(Effect* effect) { break; } - effect->obj.rot.y = RAD_TO_DEG( - Math_Atan2F(gPlayer[0].camEye.x - effect->obj.pos.x, gPlayer[0].camEye.z - (effect->obj.pos.z + D_80177D20))); + effect->obj.rot.y = RAD_TO_DEG(Math_Atan2F(gPlayer[0].camEye.x - effect->obj.pos.x, + gPlayer[0].camEye.z - (effect->obj.pos.z + D_ctx_80177D20))); } -void func_80083B8C(Effect* effect) { +void func_effect_80083B8C(Effect* effect) { RCP_SetupDL_49(); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->unk_44); gDPSetEnvColor(gMasterDisp++, 36, 45, 28, 255); @@ -4060,7 +4063,8 @@ void func_80083B8C(Effect* effect) { RCP_SetupDL(&gMasterDisp, 0x40); } -void func_80083C70(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 arg7, s32 arg8) { +void func_effect_80083C70(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 arg7, + s32 arg8) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = 0x18F; @@ -4082,7 +4086,7 @@ void func_80083C70(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 y Object_SetInfo(&effect->info, effect->obj.id); } -void func_80083D2C(f32 xPos, f32 yPos, f32 zPos, f32 srcZ) { +void func_effect_80083D2C(f32 xPos, f32 yPos, f32 zPos, f32 srcZ) { s32 i; s32 j; s32 pad1; @@ -4123,12 +4127,12 @@ void func_80083D2C(f32 xPos, f32 yPos, f32 zPos, f32 srcZ) { Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &dest); - dest.z -= D_80177D08; + dest.z -= D_ctx_80177D08; for (i = 0; i < 6; i++) { for (j = 0; j < ARRAY_COUNT(gEffects); j++) { if (gEffects[j].obj.status == OBJ_FREE) { - func_80083C70(&gEffects[j], xPos, yPos, zPos, dest.x, dest.y, dest.z, i * 60.0f, i); + func_effect_80083C70(&gEffects[j], xPos, yPos, zPos, dest.x, dest.y, dest.z, i * 60.0f, i); if (i == 0) { AUDIO_PLAY_SFX(0x3103109B, gEffects[j].sfxSource, 4); } @@ -4138,7 +4142,7 @@ void func_80083D2C(f32 xPos, f32 yPos, f32 zPos, f32 srcZ) { } } -void func_80083FA8(Effect* effect) { +void func_effect_80083FA8(Effect* effect) { Vec3f src; Vec3f dest; @@ -4177,16 +4181,16 @@ void func_80083FA8(Effect* effect) { if ((effect->scale1 >= 349.0f) && (effect->timer_50 > 50)) { effect->timer_50 = 50; } - func_8007A774(gPlayer, effect, 100.0f); + func_effect_8007A774(gPlayer, effect, 100.0f); } // RGB Values. Used like an array of [8][3], but only matches this way. -s32 D_800D18F0[24] = { 32, 32, 255, 0, 255, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 255, 255, 0, 255, 0, 255, 0 }; +static s32 D_800D18F0[] = { 32, 32, 255, 0, 255, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 255, 255, 0, 255, 0, 255, 0 }; // Alpha values -s32 D_800D1950[] = { 255, 210, 180, 120, 70, 30, 0, 0 }; +static s32 D_800D1950[] = { 255, 210, 180, 120, 70, 30, 0, 0 }; -void func_80084194(Effect* effect) { +void func_effect_80084194(Effect* effect) { s32 tmp; if (gCurrentLevel != LEVEL_AQUAS) { diff --git a/src/main/fox_enmy.c b/src/main/fox_enmy.c index 51a20a05..115c6cc9 100644 --- a/src/main/fox_enmy.c +++ b/src/main/fox_enmy.c @@ -19,16 +19,16 @@ #include "assets/ast_versus.h" #include "assets/ast_zoness.h" -s32 D_Timer_80161670[4]; -s32 D_80161680; -u8 D_80161684; +s32 D_enmy_Timer_80161670[4]; +s32 D_enmy_80161680; +u8 D_enmy_80161684; -ObjectInit* D_800CFDA0[] = { +ObjectInit* D_enmy_800CFDA0[] = { D_CO_60371A4, D_ME_6026CC4, D_SX_602A164, D_A6_6023F64, D_A6_60287A4, D_SY_602E4F4, D_VE1_6007E74, D_SO_601F234, D_ZO_6026714, D_ANDROSS_C035154, D_TR_6006AA4, D_MA_6031000, D_TI_6006C60, D_AQ_602E5C8, D_FO_600EAD4, NULL, D_KA_6011044, D_BO_600FF74, D_SZ_6006EB4, D_VE2_6014D94, D_versus_302DE3C, }; -s32 D_800CFDF4[] = { +static s32 D_enmy_800CFDF4[] = { OBJ_80_0, OBJ_ITEM_SILVER_RING, OBJ_ITEM_SILVER_RING, @@ -56,23 +56,23 @@ s32 D_800CFDF4[] = { OBJ_80_0, OBJ_ITEM_SILVER_STAR, }; -f32 D_800CFE5C[] = { +static f32 D_enmy_800CFE5C[] = { 0.0f, 1.0f, 0.5f, 0.33f, 0.25f, 1.0f, 0.5f, 0.33f, 0.25f, 1.0f, 0.5f, 0.33f, 0.25f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, -1.0f, -1.0f, -1.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, }; -Vec3f D_800CFEC4[6] = { +static Vec3f D_enmy_800CFEC4[] = { { 0.0f, 0.0f, 50.0f }, { -50.0f, 0.0f, 0.0f }, { 50.0f, 0.0f, 0.0f }, { 0.0f, 50.0f, 0.0f }, { 0.0f, 0.0f, -50.0f }, { 0.0f, -50.0f, 0.0f }, }; -Vec3f D_800CFF0C[6] = { +static Vec3f D_enmy_800CFF0C[] = { { 0.0f, 0.0f, 0.0f }, { 0.0f, -90.0f, 0.0f }, { 0.0f, 90.0f, 0.0f }, { -90.0f, 0.0f, 0.0f }, { 0.0f, 180.0f, 0.0f }, { 90.0f, 0.0f, 0.0f }, }; -u32 D_800CFF54[9] = { +u32 D_enmy_800CFF54[] = { 0x19404038, 0x19404139, 0x1940423A, 0x1940433B, 0x1940443C, 0x1940453D, 0x1940463E, 0x1940463E, 0x1940463E, }; -void func_80060F30(f32* pos, u32 sfxId, s32 arg2) { +void func_enmy_80060F30(f32* pos, u32 sfxId, s32 arg2) { PRINTF("CHIME SET \n"); PRINTF("BOMB SET 1\n"); PRINTF("BOMB SET 2\n"); @@ -90,7 +90,7 @@ void Object_Kill(Object* obj, f32* sfxSrc) { Audio_KillSfxBySource(sfxSrc); } -bool func_80060FE4(Vec3f* arg0, f32 arg1) { +bool func_enmy_80060FE4(Vec3f* arg0, f32 arg1) { Vec3f sp2C; Vec3f sp20; @@ -109,7 +109,7 @@ bool func_80060FE4(Vec3f* arg0, f32 arg1) { return false; } -bool func_80061148(Vec3f* arg0, f32 arg1) { +bool func_enmy_80061148(Vec3f* arg0, f32 arg1) { Vec3f sp2C; Vec3f sp20; @@ -117,7 +117,7 @@ bool func_80061148(Vec3f* arg0, f32 arg1) { return true; } if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7) { - return func_80060FE4(arg0, arg1); + return func_enmy_80060FE4(arg0, arg1); } Matrix_RotateY(gCalcMatrix, gPlayer[gPlayerNum].unk_058, 0); sp2C.x = arg0->x - gPlayer[gPlayerNum].camEye.x; @@ -132,8 +132,8 @@ bool func_80061148(Vec3f* arg0, f32 arg1) { } void Object_SetInfo(ObjectInfo* info, u32 objId) { - *info = D_800CC124[objId]; - info->hitbox = SEGMENTED_TO_VIRTUAL(D_800CC124[objId].hitbox); + *info = D_edata_800CC124[objId]; + info->hitbox = SEGMENTED_TO_VIRTUAL(D_edata_800CC124[objId].hitbox); if (gLevelMode == LEVELMODE_UNK_2) { info->unk_10 += 200.0f; } @@ -267,7 +267,7 @@ void Item_Load(Item* item, ObjectInit* objInit) { Object_SetInfo(&item->info, item->obj.id); } -void func_80061958(Effect* effect, f32 xPos, f32 yPos, f32 zPos) { +void func_enmy_80061958(Effect* effect, f32 xPos, f32 yPos, f32 zPos) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_346; @@ -288,7 +288,7 @@ void func_80061958(Effect* effect, f32 xPos, f32 yPos, f32 zPos) { } } -void func_80061A4C(void) { +void func_enmy_80061A4C(void) { s32 i; f32 x; f32 y; @@ -298,17 +298,17 @@ void func_80061A4C(void) { if (gEffects[i].obj.status == OBJ_FREE) { x = gPlayer[0].pos.x + RAND_FLOAT_CENTERED(400.0f) + (5.0f * gPlayer[0].vel.x); y = gPlayer[0].pos.y + RAND_FLOAT_CENTERED(400.0f) + (5.0f * gPlayer[0].vel.y); - z = -D_80177D20 - 500.0f; - if (D_80177D08 < 0.0f) { - z = -D_80177D20 + 500.0f; + z = -D_ctx_80177D20 - 500.0f; + if (D_ctx_80177D08 < 0.0f) { + z = -D_ctx_80177D20 + 500.0f; } - func_80061958(&gEffects[i], x, y, z); + func_enmy_80061958(&gEffects[i], x, y, z); break; } } } -void func_80061B68(void) { +void func_enmy_80061B68(void) { s32 i; f32 x; f32 y; @@ -322,17 +322,17 @@ void func_80061B68(void) { while (y <= gGroundLevel) { y = gPlayer[0].pos.y + RAND_FLOAT_CENTERED(2000.0f) + (5.0f * gPlayer[0].vel.y); } - z = -D_80177D20 - 3000.0f; - if (D_80177D08 < 0.0f) { - z = -D_80177D20 + 1000.0f; + z = -D_ctx_80177D20 - 3000.0f; + if (D_ctx_80177D08 < 0.0f) { + z = -D_ctx_80177D20 + 1000.0f; } - func_80061958(&gEffects[i], x, y, z); + func_enmy_80061958(&gEffects[i], x, y, z); break; } } } -void func_80061CD0(void) { +void func_enmy_80061CD0(void) { s32 i; f32 x; f32 y; @@ -342,17 +342,17 @@ void func_80061CD0(void) { if (gEffects[i].obj.status == OBJ_FREE) { x = gPlayer[gPlayerNum].pos.x + RAND_FLOAT_CENTERED(3000.0f) + (5.0f * gPlayer[gPlayerNum].vel.x); y = gPlayer[gPlayerNum].pos.y + 1000.0f + RAND_FLOAT_CENTERED(500.0f) + (5.0f * gPlayer[gPlayerNum].vel.y); - z = -D_80177D20 - RAND_FLOAT(2000.0f); - if (D_80177D08 < 0.0f) { - z = -D_80177D20 + 1000.0f; + z = -D_ctx_80177D20 - RAND_FLOAT(2000.0f); + if (D_ctx_80177D08 < 0.0f) { + z = -D_ctx_80177D20 + 1000.0f; } - func_80061958(&gEffects[i], x, y, z); + func_enmy_80061958(&gEffects[i], x, y, z); break; } } } -void func_80061E48(Actor* actor, f32 xPos, f32 yPos, f32 zPos) { +void func_enmy_80061E48(Actor* actor, f32 xPos, f32 yPos, f32 zPos) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; actor->obj.id = OBJ_ACTOR_181; @@ -369,7 +369,7 @@ void func_80061E48(Actor* actor, f32 xPos, f32 yPos, f32 zPos) { Object_SetInfo(&actor->info, actor->obj.id); } -void func_80061F0C(Actor* actor, ObjectInit* objInit, s32 arg2) { +void func_enmy_80061F0C(Actor* actor, ObjectInit* objInit, s32 arg2) { Vec3f sp24; Actor_Initialize(actor); @@ -390,18 +390,18 @@ void func_80061F0C(Actor* actor, ObjectInit* objInit, s32 arg2) { Object_SetInfo(&actor->info, actor->obj.id); actor->info.unk_10 = 3000.0f; actor->fwork[25] = 20000.0f; - actor->iwork[1] = D_80177E70; - actor->iwork[10] = gActors[D_80177E70].aiType; - actor->fwork[22] = D_80161A54; - Matrix_RotateZ(gCalcMatrix, -D_80177E88.z * M_DTOR, 0); - Matrix_RotateX(gCalcMatrix, -D_80177E88.x * M_DTOR, 1); - Matrix_RotateY(gCalcMatrix, -D_80177E88.y * M_DTOR, 1); - sp24.x = actor->obj.pos.x - D_80177F10.x; - sp24.y = actor->obj.pos.y - D_80177F10.y; - sp24.z = actor->obj.pos.z - D_80177F10.z; + actor->iwork[1] = D_ctx_80177E70; + actor->iwork[10] = gActors[D_ctx_80177E70].aiType; + actor->fwork[22] = D_play_80161A54; + Matrix_RotateZ(gCalcMatrix, -D_ctx_80177E88.z * M_DTOR, 0); + Matrix_RotateX(gCalcMatrix, -D_ctx_80177E88.x * M_DTOR, 1); + Matrix_RotateY(gCalcMatrix, -D_ctx_80177E88.y * M_DTOR, 1); + sp24.x = actor->obj.pos.x - D_ctx_80177F10.x; + sp24.y = actor->obj.pos.y - D_ctx_80177F10.y; + sp24.z = actor->obj.pos.z - D_ctx_80177F10.z; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp24, &actor->vwork[28]); - actor->iwork[9] = D_80177E78; - D_80177E70 = arg2; + actor->iwork[9] = D_ctx_80177E78; + D_ctx_80177E70 = arg2; Actor_Update(actor); } @@ -469,24 +469,24 @@ 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_i5_801BA1E8 = 99; + D_MA_801BA1E8 = 99; break; case OBJ_UNK_404: - D_i5_801BA1E8 = 0; + D_MA_801BA1E8 = 0; break; case OBJ_UNK_405: - D_i5_801BA1E8 = 98; + D_MA_801BA1E8 = 98; break; case OBJ_UNK_402: - D_i6_801A7F78 = objInit->rot.z * 0.1f; - D_i6_801A7F60 = -(f32) objInit->rot.x; + D_Andross_801A7F78 = objInit->rot.z * 0.1f; + D_Andross_801A7F60 = -(f32) objInit->rot.x; break; case OBJ_UNK_400: - D_801782B8++; + D_ctx_801782B8++; break; case OBJ_UNK_401: - if (D_801782B8 > 0) { - D_801782B8--; + if (D_ctx_801782B8 > 0) { + D_ctx_801782B8--; break; } break; @@ -495,7 +495,7 @@ void Object_Load(ObjectInit* objInit, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { if (objInit->id > OBJ_UNK_406) { for (i = 0; i < ARRAY_COUNT(gActors); i++) { if (gActors[i].obj.status == OBJ_FREE) { - func_80061F0C(&gActors[i], objInit, i); + func_enmy_80061F0C(&gActors[i], objInit, i); break; } } @@ -503,21 +503,21 @@ void Object_Load(ObjectInit* objInit, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { } } -void func_80062568(void) { +void func_enmy_80062568(void) { ObjectInit* var_s1; s32 var_s0; s32 temp = gCurrentLevel; // seems fake if (1) {} - D_80178310 = SEGMENTED_TO_VIRTUAL(D_800CFDA0[temp]); - var_s0 = D_80177CA0 - 40; - var_s1 = &D_80178310[var_s0]; + D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_enmy_800CFDA0[temp]); + var_s0 = D_ctx_80177CA0 - 40; + var_s1 = &D_ctx_80178310[var_s0]; - for (; var_s0 < D_80177CA0; var_s0++, var_s1++) { + for (; var_s0 < D_ctx_80177CA0; var_s0++, var_s1++) { Object_Load(var_s1, 4000.0f, -4000.0f, 4000.0f, -4000.0f); } } -void func_80062664(void) { +void func_enmy_80062664(void) { ObjectInit* objInit; f32 var_fs1; f32 var_fs2; @@ -526,23 +526,23 @@ void func_80062664(void) { s32 i; s32 j; - if ((gCurrentLevel == LEVEL_METEO) && (D_8017827C == 1)) { - D_80178310 = SEGMENTED_TO_VIRTUAL(D_ME_602B148); - } else if ((gCurrentLevel == LEVEL_SECTOR_X) && (D_8017827C == 1)) { - D_80178310 = SEGMENTED_TO_VIRTUAL(D_SX_602F18C); - } else if ((gCurrentLevel == LEVEL_VENOM_ANDROSS) && (D_8017827C == 1)) { - D_80178310 = SEGMENTED_TO_VIRTUAL(D_ANDROSS_C0356A4); - } else if ((gCurrentLevel == LEVEL_VENOM_1) && (D_8017827C == 1)) { - D_80178310 = SEGMENTED_TO_VIRTUAL(D_VE1_6010088); + if ((gCurrentLevel == LEVEL_METEO) && (D_ctx_8017827C == 1)) { + D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_ME_602B148); + } else if ((gCurrentLevel == LEVEL_SECTOR_X) && (D_ctx_8017827C == 1)) { + D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_SX_602F18C); + } else if ((gCurrentLevel == LEVEL_VENOM_ANDROSS) && (D_ctx_8017827C == 1)) { + D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_ANDROSS_C0356A4); + } else if ((gCurrentLevel == LEVEL_VENOM_1) && (D_ctx_8017827C == 1)) { + D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_VE1_6010088); } else { - D_80178310 = SEGMENTED_TO_VIRTUAL(D_800CFDA0[gCurrentLevel]); + D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_enmy_800CFDA0[gCurrentLevel]); } - if (D_8017812C == 0) { - for (j = 0; j < D_801782B8; j++) { + if (D_ctx_8017812C == 0) { + for (j = 0; j < D_ctx_801782B8; j++) { if (gCurrentLevel == LEVEL_AQUAS) { - func_80061B68(); + func_enmy_80061B68(); } else { - func_80061A4C(); + func_enmy_80061A4C(); } } } @@ -566,10 +566,11 @@ void func_80062664(void) { if ((gPlayer[0].timer_210 != 0) && (gPlayer[0].unk_118 > 0.0f)) { var_fs2 = -10000.0f; } - D_80161680 = 0; + D_enmy_80161680 = 0; - for (i = 0, objInit = &D_80178310[D_80177DC8]; i < 10000; i++, D_80177DC8++, objInit++) { - if ((objInit->id > OBJ_INVALID) && D_80177D20 <= objInit->zPos1 && objInit->zPos1 <= D_80177D20 + 200.0f) { + for (i = 0, objInit = &D_ctx_80178310[D_ctx_80177DC8]; i < 10000; i++, D_ctx_80177DC8++, objInit++) { + if ((objInit->id > OBJ_INVALID) && D_ctx_80177D20 <= objInit->zPos1 && + objInit->zPos1 <= D_ctx_80177D20 + 200.0f) { if ((gCurrentLevel == LEVEL_VENOM_1) && (objInit->id >= OBJ_UNK_1000)) { if (((objInit->rot.y < 180.0f) && (objInit->xPos < gPlayer[0].unk_0AC)) || ((objInit->rot.y > 180.0f) && (gPlayer[0].unk_0AC < objInit->xPos))) { @@ -584,7 +585,7 @@ void func_80062664(void) { } } -void func_80062B60(f32 xPos, f32 zPos, s32 state, f32 scale) { +void func_enmy_80062B60(f32 xPos, f32 zPos, s32 state, f32 scale) { s32 i; if (gLevelType == LEVELTYPE_PLANET) { @@ -607,7 +608,7 @@ void func_80062B60(f32 xPos, f32 zPos, s32 state, f32 scale) { } } -void func_80062C38(f32 xPos, f32 yPos) { +void func_enmy_80062C38(f32 xPos, f32 yPos) { s32 i; if (gLevelType == LEVELTYPE_PLANET) { @@ -629,7 +630,7 @@ void func_80062C38(f32 xPos, f32 yPos) { } } -void func_80062D04(f32 xPos, f32 yPos) { +void func_enmy_80062D04(f32 xPos, f32 yPos) { s32 i; for (i = 0; i < ARRAY_COUNT(gEffects); i++) { @@ -649,7 +650,7 @@ void func_80062D04(f32 xPos, f32 yPos) { } } -bool func_80062DBC(Vec3f* pos, f32* hitboxData, Object* obj, f32 xRot, f32 yRot, f32 zRot) { +bool func_enmy_80062DBC(Vec3f* pos, f32* hitboxData, Object* obj, f32 xRot, f32 yRot, f32 zRot) { s32 i; Vec3f hitRot; Vec3f hitPos; @@ -710,7 +711,7 @@ bool func_80062DBC(Vec3f* pos, f32* hitboxData, Object* obj, f32 xRot, f32 yRot, return false; } -bool func_800631A8(Vec3f* posD, f32* hitboxData, Vec3f* posA) { +bool func_enmy_800631A8(Vec3f* posD, f32* hitboxData, Vec3f* posA) { if ((s32) hitboxData[0] != 0) { if ((fabsf(hitboxData[1] + posA->z - posD->z) < (hitboxData[2] + 20.0f)) && (fabsf(hitboxData[5] + posA->x - posD->x) < (hitboxData[6] + 20.0f)) && @@ -721,7 +722,7 @@ bool func_800631A8(Vec3f* posD, f32* hitboxData, Vec3f* posA) { return false; } -bool func_8006326C(Vec3f* arg0, Vec3f* arg1, ObjectId objId, Object* obj) { +bool func_enmy_8006326C(Vec3f* arg0, Vec3f* arg1, ObjectId objId, Object* obj) { Vec3f sp74; Vec3f sp68; Vec3f sp5C; @@ -763,7 +764,7 @@ bool func_8006326C(Vec3f* arg0, Vec3f* arg1, ObjectId objId, Object* obj) { } else if (objId == OBJ_BOSS_313) { colId = COL1_8; } - if (func_800998FC(&sp5C, &sp50, arg1, colId, &sp44, &sp30) > 0) { + if (func_col1_800998FC(&sp5C, &sp50, arg1, colId, &sp44, &sp30) > 0) { return true; } } else { @@ -785,7 +786,7 @@ bool func_8006326C(Vec3f* arg0, Vec3f* arg1, ObjectId objId, Object* obj) { } else if ((objId == OBJ_80_4) || (objId == OBJ_80_5)) { colId = COL2_1; } - if (func_800A3690(&sp5C, &sp50, colId, &sp44)) { + if (func_col2_800A3690(&sp5C, &sp50, colId, &sp44)) { return true; } } @@ -793,7 +794,7 @@ bool func_8006326C(Vec3f* arg0, Vec3f* arg1, ObjectId objId, Object* obj) { return false; } -s32 func_8006351C(s32 index, Vec3f* pos, Vec3f* arg2, s32 arg3) { +s32 func_enmy_8006351C(s32 index, Vec3f* pos, Vec3f* arg2, s32 arg3) { Object_58* obj58; Object_80* obj80; Object_4C* obj4C; @@ -809,12 +810,12 @@ s32 func_8006351C(s32 index, Vec3f* pos, Vec3f* arg2, s32 arg3) { if ((obj58->obj.id == OBJ_80_1) || (obj58->obj.id == OBJ_80_3) || (obj58->obj.id == OBJ_80_117) || (obj58->obj.id == OBJ_80_141) || (obj58->obj.id == OBJ_80_150) || (obj58->obj.id == OBJ_80_149) || (obj58->obj.id == OBJ_80_148) || (obj58->obj.id == OBJ_80_140)) { - if (func_8006326C(pos, arg2, obj58->obj.id, &obj58->obj)) { + if (func_enmy_8006326C(pos, arg2, obj58->obj.id, &obj58->obj)) { return 999; } } else if ((fabsf(pos->x - obj58->obj.pos.x) < 2000.0f) && (fabsf(pos->z - obj58->obj.pos.z) < 2000.0f)) { - if (func_80062DBC(pos, obj58->info.hitbox, &obj58->obj, 0.0f, 0.0f, 0.0f)) { + if (func_enmy_80062DBC(pos, obj58->info.hitbox, &obj58->obj, 0.0f, 0.0f, 0.0f)) { return 2; } } @@ -826,11 +827,11 @@ s32 func_8006351C(s32 index, Vec3f* pos, Vec3f* arg2, s32 arg3) { if (obj80->obj.status == OBJ_ACTIVE) { if ((obj80->obj.id == OBJ_80_1) || (obj80->obj.id == OBJ_80_4) || (obj80->obj.id == OBJ_80_5) || (obj80->obj.id == OBJ_80_2) || (obj80->obj.id == OBJ_80_39) || (obj80->obj.id == OBJ_80_3)) { - if (func_8006326C(pos, arg2, obj80->obj.id, &obj80->obj)) { + if (func_enmy_8006326C(pos, arg2, obj80->obj.id, &obj80->obj)) { return 2; } } else if ((fabsf(pos->x - obj80->obj.pos.x) < 2000.0f) && (fabsf(pos->z - obj80->obj.pos.z) < 2000.0f)) { - if (func_80062DBC(pos, obj80->info.hitbox, &obj80->obj, 0.0f, 0.0f, 0.0f)) { + if (func_enmy_80062DBC(pos, obj80->info.hitbox, &obj80->obj, 0.0f, 0.0f, 0.0f)) { return i + 10; } } @@ -839,7 +840,8 @@ s32 func_8006351C(s32 index, Vec3f* pos, Vec3f* arg2, s32 arg3) { obj4C = gObjects4C; for (i = 0; i < ARRAY_COUNT(gObjects4C); i++, obj4C++) { if ((obj4C->obj.status == OBJ_ACTIVE) && (fabsf(pos->x - obj4C->obj.pos.x) < 500.0f) && - (fabsf(pos->z - obj4C->obj.pos.z) < 500.0f) && func_800631A8(pos, obj4C->info.hitbox, &obj4C->obj.pos)) { + (fabsf(pos->z - obj4C->obj.pos.z) < 500.0f) && + func_enmy_800631A8(pos, obj4C->info.hitbox, &obj4C->obj.pos)) { if ((obj4C->obj.id == OBJ_4C_163) || (obj4C->obj.id == OBJ_4C_162) || (obj4C->obj.id == OBJ_4C_162)) { obj4C->unk_46 = 1; } @@ -853,7 +855,7 @@ s32 func_8006351C(s32 index, Vec3f* pos, Vec3f* arg2, s32 arg3) { if (boss->obj.status == OBJ_ACTIVE) { if ((boss->obj.id == OBJ_BOSS_308) || (boss->obj.id == OBJ_BOSS_312) || (boss->obj.id == OBJ_BOSS_313) || (boss->obj.id == OBJ_BOSS_309)) { - if (func_8006326C(pos, arg2, boss->obj.id, &boss->obj)) { + if (func_enmy_8006326C(pos, arg2, boss->obj.id, &boss->obj)) { return 2; } } else if (boss->obj.id == OBJ_BOSS_310) { @@ -875,7 +877,7 @@ s32 func_8006351C(s32 index, Vec3f* pos, Vec3f* arg2, s32 arg3) { } if ((fabsf(pos->x - boss->obj.pos.x) < 2000.0f) && (fabsf(pos->z - boss->obj.pos.z) < 2000.0f)) { - if (func_80062DBC(pos, boss->info.hitbox, &boss->obj, 0.0f, 0.0f, 0.0f)) { + if (func_enmy_80062DBC(pos, boss->info.hitbox, &boss->obj, 0.0f, 0.0f, 0.0f)) { return 2; } } @@ -889,12 +891,12 @@ s32 func_8006351C(s32 index, Vec3f* pos, Vec3f* arg2, s32 arg3) { (fabsf(pos->z - actor->obj.pos.z) < 1500.0f) && (index != i) && (actor->info.unk_16 != 2) && ((actor->obj.id != OBJ_ACTOR_197) || (actor->aiType >= 4)) && (actor->timer_0C2 == 0)) { if (actor->obj.id == OBJ_ACTOR_180) { - if (func_8006326C(pos, arg2, actor->obj.id, &actor->obj)) { + if (func_enmy_8006326C(pos, arg2, actor->obj.id, &actor->obj)) { return 2; } } else if (actor->scale < 0.0f) { - if (func_80062DBC(pos, actor->info.hitbox, &actor->obj, actor->vwork[29].x, actor->vwork[29].y, - actor->vwork[29].z + actor->unk_0F4.z)) { + if (func_enmy_80062DBC(pos, actor->info.hitbox, &actor->obj, actor->vwork[29].x, actor->vwork[29].y, + actor->vwork[29].z + actor->unk_0F4.z)) { actor->unk_0D0 = 1; actor->damage = 10; actor->unk_0D2 = -1; @@ -904,7 +906,7 @@ s32 func_8006351C(s32 index, Vec3f* pos, Vec3f* arg2, s32 arg3) { return 2; } } else if ((arg3 != 2) && (arg3 != 3)) { - if (func_800631A8(pos, actor->info.hitbox, &actor->obj.pos)) { + if (func_enmy_800631A8(pos, actor->info.hitbox, &actor->obj.pos)) { actor->unk_0D0 = 1; actor->damage = 10; actor->unk_0D2 = -1; @@ -924,7 +926,7 @@ s32 func_8006351C(s32 index, Vec3f* pos, Vec3f* arg2, s32 arg3) { return 0; } -void func_80063CAC(Object_80* obj80) { +void func_enmy_80063CAC(Object_80* obj80) { s32 i; for (i = 0; i < ARRAY_COUNT(gActors); i++) { @@ -942,7 +944,7 @@ void func_80063CAC(Object_80* obj80) { } } -void func_80063D58(Object_80* obj80) { +void func_enmy_80063D58(Object_80* obj80) { s32 i; obj80->obj.pos.y = gGroundLevel; @@ -968,7 +970,7 @@ void func_80063D58(Object_80* obj80) { } } -void func_80063E5C(Object_80* obj80, f32* hitboxData) { +void func_enmy_80063E5C(Object_80* obj80, f32* hitboxData) { s32 i; Item* item; @@ -988,14 +990,14 @@ void func_80063E5C(Object_80* obj80, f32* hitboxData) { } } -void func_80063F4C(s32 arg0) { +void func_enmy_80063F4C(s32 arg0) { } -void func_80063F58(Item* item) { +void func_enmy_80063F58(Item* item) { item->scale = item->obj.rot.z * 100.0f; } -void func_80063F74(Item* item) { +void func_enmy_80063F74(Item* item) { item->scale = item->obj.rot.z * 100.0f; } @@ -1009,7 +1011,7 @@ void Object_Init(s32 index, ObjectId objId) { switch (objId) { case OBJ_4C_170: - func_8007A6F0(&gObjects4C[index].obj.pos, 0x11000055); + func_effect_8007A6F0(&gObjects4C[index].obj.pos, 0x11000055); break; case OBJ_ACTOR_234: AUDIO_PLAY_SFX(0x11030010, gActors[index].sfxSource, 0); @@ -1018,18 +1020,18 @@ void Object_Init(s32 index, ObjectId objId) { AUDIO_PLAY_SFX(0x11000000, gObjects80[index].sfxSource, 0); break; case OBJ_ACTOR_198: - func_80092D48(&gActors[index]); + func_hud_80092D48(&gActors[index]); break; case OBJ_ACTOR_235: gActors[index].fwork[10] = fabsf(Math_ModF(gActors[index].obj.pos.x, 100.0f)); break; case OBJ_ACTOR_247: - func_i3_8019D060(&gActors[index]); + Zoness_8019D060(&gActors[index]); break; case OBJ_EFFECT_368: if (gCurrentLevel == LEVEL_TITANIA) { - func_i5_801B6E20(gEffects[index].obj.pos.x, gEffects[index].obj.pos.z + D_80177D20, &sp54, &sp4C, - &sp50); + Ground_801B6E20(gEffects[index].obj.pos.x, gEffects[index].obj.pos.z + D_ctx_80177D20, &sp54, &sp4C, + &sp50); gEffects[index].obj.pos.y = sp4C + 3.0f; gEffects[index].obj.rot.x = RAD_TO_DEG(sp54); gEffects[index].obj.rot.z = RAD_TO_DEG(sp50); @@ -1038,64 +1040,64 @@ void Object_Init(s32 index, ObjectId objId) { } break; case OBJ_80_30: - func_80063E5C(&gObjects80[index], D_TI_6006940); + func_enmy_80063E5C(&gObjects80[index], D_TI_6006940); break; case OBJ_80_31: - func_80063E5C(&gObjects80[index], D_TI_600695C); + func_enmy_80063E5C(&gObjects80[index], D_TI_600695C); break; case OBJ_80_32: - func_80063E5C(&gObjects80[index], D_TI_6006978); + func_enmy_80063E5C(&gObjects80[index], D_TI_6006978); break; case OBJ_80_33: - func_80063E5C(&gObjects80[index], D_TI_6006994); + func_enmy_80063E5C(&gObjects80[index], D_TI_6006994); break; case OBJ_80_34: - func_80063E5C(&gObjects80[index], D_TI_60069B0); + func_enmy_80063E5C(&gObjects80[index], D_TI_60069B0); break; case OBJ_80_35: - func_80063E5C(&gObjects80[index], D_TI_60069CC); + func_enmy_80063E5C(&gObjects80[index], D_TI_60069CC); break; case OBJ_80_36: - func_80063E5C(&gObjects80[index], D_TI_60069E8); + func_enmy_80063E5C(&gObjects80[index], D_TI_60069E8); break; case OBJ_80_37: - func_80063E5C(&gObjects80[index], D_TI_6006A04); + func_enmy_80063E5C(&gObjects80[index], D_TI_6006A04); break; case OBJ_80_38: - func_80063E5C(&gObjects80[index], D_TI_6006A20); + func_enmy_80063E5C(&gObjects80[index], D_TI_6006A20); break; case OBJ_80_23: - func_80063CAC(&gObjects80[index]); + func_enmy_80063CAC(&gObjects80[index]); break; case OBJ_ITEM_CHECKPOINT: - if (D_80177CA0 != 0) { + if (D_ctx_80177CA0 != 0) { gItems[index].obj.status = OBJ_FREE; } break; case OBJ_ITEM_METEO_WARP: - if (D_80177E80 < 0) { + if (D_ctx_80177E80 < 0) { gItems[index].obj.status = OBJ_FREE; } break; case OBJ_ITEM_331: case OBJ_ITEM_332: case OBJ_ITEM_333: - func_80063F74(&gItems[index]); + func_enmy_80063F74(&gItems[index]); break; case OBJ_ITEM_328: case OBJ_ITEM_329: - func_80063F58(&gItems[index]); + func_enmy_80063F58(&gItems[index]); break; case OBJ_ITEM_330: - if (((D_80177E80 >= 7) && (gCurrentLevel == LEVEL_CORNERIA) && (gTeamShields[1] > 0)) || + if (((D_ctx_80177E80 >= 7) && (gCurrentLevel == LEVEL_CORNERIA) && (gTeamShields[1] > 0)) || (gCurrentLevel != LEVEL_CORNERIA)) { - func_80063F58(&gItems[index]); + func_enmy_80063F58(&gItems[index]); } else { gItems[index].obj.status = OBJ_FREE; } break; case OBJ_80_0: - func_80063E5C(&gObjects80[index], D_800CBF18); + func_enmy_80063E5C(&gObjects80[index], D_edata_800CBF18); /* fallthrough */ case OBJ_80_6: case OBJ_80_7: @@ -1103,7 +1105,7 @@ void Object_Init(s32 index, ObjectId objId) { case OBJ_80_21: case OBJ_80_22: case OBJ_80_56: - func_80063D58(&gObjects80[index]); + func_enmy_80063D58(&gObjects80[index]); break; case OBJ_ACTOR_187: gActors[index].fwork[0] = gActors[index].obj.pos.x; @@ -1132,16 +1134,16 @@ void Object_Init(s32 index, ObjectId objId) { } break; case OBJ_ACTOR_239: - gActors[index].iwork[0] = D_801784A4; - D_801784A4++; + gActors[index].iwork[0] = D_ctx_801784A4; + D_ctx_801784A4++; break; case OBJ_ACTOR_236: - D_801784A4 = 0; + D_ctx_801784A4 = 0; gActors[index].unk_0F4.x = gActors[index].obj.rot.x; gActors[index].unk_0F4.y = gActors[index].obj.rot.y; gActors[index].obj.rot.x = gActors[index].obj.rot.y = 0.0f; gActors[index].fwork[2] = gActors[index].obj.pos.y; - var_v0 = D_801782C4; + var_v0 = D_ctx_801782C4; for (var_a0 = 0; var_a0 < 200; var_a0++, var_v0++) { var_v0->pos.x = gActors[index].obj.pos.x; var_v0->pos.y = gActors[index].obj.pos.y; @@ -1154,12 +1156,12 @@ void Object_Init(s32 index, ObjectId objId) { case OBJ_ACTOR_194: gActors[index].unk_046 = 100; for (var_a0 = 0; var_a0 < 2; var_a0++) { - if (D_80176550[var_a0] == 0) { - D_80176550[var_a0] = 1; + if (D_ctx_80176550[var_a0] == 0) { + D_ctx_80176550[var_a0] = 1; gActors[index].unk_046 = var_a0; for (var_a2 = 0; var_a2 < 100; var_a2++) { - D_80176878[var_a0][var_a2] = gActors[index].obj.pos.y; - D_80176B98[var_a0][var_a2] = gActors[index].obj.pos.z; + D_ctx_80176878[var_a0][var_a2] = gActors[index].obj.pos.y; + D_ctx_80176B98[var_a0][var_a2] = gActors[index].obj.pos.z; } break; } @@ -1176,13 +1178,13 @@ void Object_Init(s32 index, ObjectId objId) { gActors[index].unk_0C9 = 1; break; case OBJ_BOSS_320: - func_i6_8018D16C(&gBosses[index]); + Andross_8018D16C(&gBosses[index]); break; case OBJ_BOSS_316: - func_i4_80193CA4(&gBosses[index]); + Katina_80193CA4(&gBosses[index]); break; case OBJ_BOSS_314: - func_i6_80197CC4(&gBosses[index]); + SectorY_80197CC4(&gBosses[index]); break; case OBJ_ACTOR_205: case OBJ_ACTOR_206: @@ -1192,154 +1194,154 @@ void Object_Init(s32 index, ObjectId objId) { case OBJ_ACTOR_211: case OBJ_ACTOR_212: case OBJ_ACTOR_213: - func_i5_80199F8C(&gActors[index]); + Macbeth_80199F8C(&gActors[index]); break; case OBJ_ACTOR_207: - func_i5_801A7D98(&gActors[index]); + Macbeth_801A7D98(&gActors[index]); break; case OBJ_ACTOR_214: - func_i5_801A3E70(&gActors[index]); + Macbeth_801A3E70(&gActors[index]); break; case OBJ_ACTOR_215: - func_i5_801A4660(&gActors[index]); + Macbeth_801A4660(&gActors[index]); break; case OBJ_ACTOR_223: - func_i5_801A4AF8(&gActors[index]); + Macbeth_801A4AF8(&gActors[index]); break; case OBJ_ACTOR_216: case OBJ_ACTOR_217: - func_i5_801A5E2C(&gActors[index]); + Macbeth_801A5E2C(&gActors[index]); break; case OBJ_ACTOR_218: - func_i5_801A6134(&gActors[index]); + Macbeth_801A6134(&gActors[index]); break; case OBJ_80_65: - func_i5_801A65E0(&gObjects80[index]); + Macbeth_801A65E0(&gObjects80[index]); break; case OBJ_ACTOR_177: case OBJ_ACTOR_178: - func_i1_8018B0B4(&gActors[index]); + Corneria_8018B0B4(&gActors[index]); /* fallthrough */ case OBJ_ACTOR_176: gActors[index].health = 24; AUDIO_PLAY_SFX(0x31000016, gActors[index].sfxSource, 4); break; case OBJ_BOSS_297: - func_i2_80188A40(&gBosses[index]); + Meteo_80188A40(&gBosses[index]); break; case OBJ_BOSS_299: - func_80042FAC(&gBosses[index]); + func_boss_80042FAC(&gBosses[index]); break; case OBJ_BOSS_300: - func_80042FD0(&gBosses[index]); + func_boss_80042FD0(&gBosses[index]); break; case OBJ_BOSS_292: - func_i1_801878D8(&gBosses[index]); + Corneria_801878D8(&gBosses[index]); break; case OBJ_BOSS_293: - func_i1_8018BE7C(&gBosses[index]); + Corneria_8018BE7C(&gBosses[index]); break; case OBJ_BOSS_A6: - func_i3_80187754(&gBosses[index]); + Area6_80187754(&gBosses[index]); break; case OBJ_ACTOR_231: - func_i5_8018B96C(&gActors[index]); + Titania_8018B96C(&gActors[index]); break; case OBJ_ACTOR_232: - func_i5_8018ADC4(&gActors[index]); + Titania_8018ADC4(&gActors[index]); break; case OBJ_ACTOR_233: - func_i5_80189B80(&gActors[index]); + Titania_80189B80(&gActors[index]); break; case OBJ_ACTOR_229: - func_i5_8018BFB0(&gActors[index]); + Titania_8018BFB0(&gActors[index]); break; case OBJ_ACTOR_227: - func_i5_8018E3CC(&gActors[index]); + Titania_8018E3CC(&gActors[index]); break; case OBJ_ACTOR_228: - func_i5_8018E5E8(&gActors[index]); + Titania_8018E5E8(&gActors[index]); break; case OBJ_4C_169: - func_i5_8018EFF0(&gObjects4C[index]); + Titania_8018EFF0(&gObjects4C[index]); break; case OBJ_BOSS_306: - func_i5_8018FA48(&gBosses[index]); + Titania_8018FA48(&gBosses[index]); break; case OBJ_ACTOR_240: - func_i3_801915A4(&gActors[index]); + Zoness_801915A4(&gActors[index]); break; case OBJ_ACTOR_241: - func_i3_80191BB8(&gActors[index]); + Zoness_80191BB8(&gActors[index]); break; case OBJ_BOSS_ZO: - func_i3_801932AC(&gBosses[index]); + Zoness_801932AC(&gBosses[index]); break; case OBJ_ACTOR_250: - func_i3_8019B1F0(&gActors[index]); + Zoness_8019B1F0(&gActors[index]); break; case OBJ_ACTOR_251: - func_i3_8019B810(&gActors[index]); + Zoness_8019B810(&gActors[index]); break; case OBJ_ACTOR_253: - func_i3_8019C200(&gActors[index]); + Zoness_8019C200(&gActors[index]); break; case OBJ_ACTOR_255: - func_i3_801AD688(&gActors[index]); + Aquas_801AD688(&gActors[index]); break; case OBJ_ACTOR_256: - func_i3_801AE3AC(&gActors[index]); + Aquas_801AE3AC(&gActors[index]); break; case OBJ_ACTOR_257: - func_i3_801AF9FC(&gActors[index]); + Aquas_801AF9FC(&gActors[index]); break; case OBJ_BOSS_AQ: - func_i3_801B10F8(&gBosses[index]); + Aquas_801B10F8(&gBosses[index]); break; case OBJ_ACTOR_259: - func_i3_801B6344(&gActors[index]); + Aquas_801B6344(&gActors[index]); break; case OBJ_ACTOR_262: - func_i3_801B6E54(&gActors[index]); + Aquas_801B6E54(&gActors[index]); break; case OBJ_ACTOR_260: - func_i3_801B7AF0(&gActors[index]); + Aquas_801B7AF0(&gActors[index]); break; case OBJ_80_57: - func_i5_8018F0D8(&gObjects80[index]); + Titania_8018F0D8(&gObjects80[index]); break; case OBJ_BOSS_319: - func_i1_801935CC(&gBosses[index]); + Venom1_801935CC(&gBosses[index]); break; case OBJ_ACTOR_280: - func_i1_8019250C(&gActors[index]); + Venom1_8019250C(&gActors[index]); break; case OBJ_ACTOR_281: case OBJ_ACTOR_282: - func_i1_80192CB0(&gActors[index]); + Venom1_80192CB0(&gActors[index]); break; case OBJ_ACTOR_283: - func_i1_80192EA4(&gActors[index]); + Venom1_80192EA4(&gActors[index]); break; case OBJ_ACTOR_284: - func_i1_801933B4(&gActors[index]); + Venom1_801933B4(&gActors[index]); break; case OBJ_ACTOR_265: - func_i3_801BA57C(&gActors[index]); + Aquas_801BA57C(&gActors[index]); break; case OBJ_ACTOR_267: - func_i3_801BB26C(&gActors[index]); + Aquas_801BB26C(&gActors[index]); break; } } -void func_800652CC(Object_80* obj80) { +void func_enmy_800652CC(Object_80* obj80) { f32 sp2C; f32 sp28; f32 sp24; - if ((D_801784AC == 4) && (obj80->state == 0)) { - func_i5_801B6E20(obj80->obj.pos.x, obj80->obj.pos.z + D_80177D20, &sp2C, &sp24, &sp28); + if ((D_ctx_801784AC == 4) && (obj80->state == 0)) { + Ground_801B6E20(obj80->obj.pos.x, obj80->obj.pos.z + D_ctx_80177D20, &sp2C, &sp24, &sp28); obj80->obj.pos.y = sp24 + 3.0f; obj80->obj.rot.x = RAD_TO_DEG(sp2C); obj80->obj.rot.z = RAD_TO_DEG(sp28); @@ -1347,7 +1349,7 @@ void func_800652CC(Object_80* obj80) { } } -void func_80065380(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 arg4, f32 arg5, f32 arg6) { +void func_enmy_80065380(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 arg4, f32 arg5, f32 arg6) { Actor_Initialize(actor); actor->obj.status = OBJ_ACTIVE; actor->obj.id = OBJ_ACTOR_182; @@ -1366,30 +1368,30 @@ void func_80065380(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 arg4, f32 arg Object_SetInfo(&actor->info, actor->obj.id); } -void func_8006546C(f32 xPos, f32 yPos, f32 zPos, f32 arg3, f32 arg4, f32 arg5) { +void func_enmy_8006546C(f32 xPos, f32 yPos, f32 zPos, f32 arg3, f32 arg4, f32 arg5) { s32 i; for (i = 0; i < ARRAY_COUNT(gActors); i++) { if (gActors[i].obj.status == OBJ_FREE) { - func_80065380(&gActors[i], xPos, yPos, zPos, arg3, arg4, arg5); + func_enmy_80065380(&gActors[i], xPos, yPos, zPos, arg3, arg4, arg5); break; } } } -void func_800654E4(Object* obj) { +void func_enmy_800654E4(Object* obj) { f32 temp_fs0; f32 temp_fs1; s32 var_s1; - func_8007D2C8(obj->pos.x, obj->pos.y, obj->pos.z, 12.0f); + func_effect_8007D2C8(obj->pos.x, obj->pos.y, obj->pos.z, 12.0f); for (var_s1 = 0; var_s1 < 4; var_s1++) { - func_8006546C(obj->pos.x, obj->pos.y, obj->pos.z, RAND_FLOAT_CENTERED(40.0f), RAND_FLOAT_CENTERED(40.0f), - RAND_FLOAT(-20.0f)); + func_enmy_8006546C(obj->pos.x, obj->pos.y, obj->pos.z, RAND_FLOAT_CENTERED(40.0f), RAND_FLOAT_CENTERED(40.0f), + RAND_FLOAT(-20.0f)); } } -void func_800655C8(Actor* actor, f32 xPos, f32 yPos, f32 zPos, s32 arg4) { +void func_enmy_800655C8(Actor* actor, f32 xPos, f32 yPos, f32 zPos, s32 arg4) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; actor->obj.id = OBJ_ACTOR_190; @@ -1405,18 +1407,18 @@ void func_800655C8(Actor* actor, f32 xPos, f32 yPos, f32 zPos, s32 arg4) { Object_SetInfo(&actor->info, actor->obj.id); } -void func_8006566C(f32 xPos, f32 yPos, f32 zPos, s32 arg3) { +void func_enmy_8006566C(f32 xPos, f32 yPos, f32 zPos, s32 arg3) { s32 i; for (i = 0; i < ARRAY_COUNT(gActors); i++) { if (gActors[i].obj.status == OBJ_FREE) { - func_800655C8(&gActors[i], xPos, yPos, zPos, arg3); + func_enmy_800655C8(&gActors[i], xPos, yPos, zPos, arg3); break; } } } -void func_800656D4(Actor* actor) { +void func_enmy_800656D4(Actor* actor) { s32 i; s32 j; f32 spD4; @@ -1541,15 +1543,15 @@ void func_800656D4(Actor* actor) { gActors[spC4].unk_0D0 = 1; gActors[spC4].damage = 20; gActors[spC4].unk_0D4 = 2; - func_8007A6F0(&actor->obj.pos, 0x2903A008); - func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 5.0f); + func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 5.0f); Object_Kill(&actor->obj, actor->sfxSource); } } Math_Vec3fFromAngles(&sp98, actor->obj.rot.x, actor->obj.rot.y, actor->fwork[5]); actor->vel.x = sp98.x; actor->vel.y = sp98.y; - actor->vel.z = sp98.z - D_80177D08; + actor->vel.z = sp98.z - D_ctx_80177D08; if (actor->unk_0B4 == 0) { actor->obj.rot.z += 5.0f; } @@ -1557,9 +1559,9 @@ void func_800656D4(Actor* actor) { if (actor->timer_0BE == 0) { actor->timer_0BE = 30; Math_Vec3fFromAngles(&sp98, actor->obj.rot.x, actor->obj.rot.y, 120.0f); - func_8007F04C(0x161, actor->obj.pos.x + sp98.x, actor->obj.pos.y + sp98.y, actor->obj.pos.z + sp98.z, - actor->obj.rot.x, actor->obj.rot.y, actor->obj.rot.z, 0.0f, 0.0f, 0.0f, sp98.x, sp98.y, - sp98.z, 1.0f); + func_effect_8007F04C(0x161, actor->obj.pos.x + sp98.x, actor->obj.pos.y + sp98.y, actor->obj.pos.z + sp98.z, + actor->obj.rot.x, actor->obj.rot.y, actor->obj.rot.z, 0.0f, 0.0f, 0.0f, sp98.x, sp98.y, + sp98.z, 1.0f); } var_fv0 = 330.0f; if (sp84 < 0.0f) { @@ -1567,16 +1569,17 @@ void func_800656D4(Actor* actor) { } Math_SmoothStepToAngle(&actor->obj.rot.z, var_fv0, 0.1f, 3.0f, 0.01f); } - 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); + if ((D_ctx_801784AC == 4) && + Ground_801B6AEC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + D_ctx_80177D20)) { + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 5.0f); Object_Kill(&actor->obj, actor->sfxSource); } sp8C.x = actor->vel.x; sp8C.y = actor->vel.y; sp8C.z = actor->vel.z; - if ((func_8006351C(actor->index, &actor->obj.pos, &sp8C, 1) != 0) || (actor->unk_0D0 != 0) || + if ((func_enmy_8006351C(actor->index, &actor->obj.pos, &sp8C, 1) != 0) || (actor->unk_0D0 != 0) || (actor->obj.pos.y < (gGroundLevel + 10.0f)) || (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7)) { - func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 3.0f); + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 3.0f); Object_Kill(&actor->obj, actor->sfxSource); if (actor->unk_0D0 != 0) { actor->unk_044 = 2; @@ -1590,21 +1593,21 @@ void func_800656D4(Actor* actor) { if (gCurrentLevel == LEVEL_AREA_6) { actor->unk_044 = 22; } - func_80066254(actor); + func_enmy_80066254(actor); } - func_8007A6F0(&actor->obj.pos, 0x2903A008); + func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); } if (gLevelMode == LEVELMODE_ON_RAILS) { if (fabsf(actor->obj.pos.z - gPlayer[0].unk_138) < 100.0f) { actor->iwork[10] = 1; } - if (gPlayer[0].camEye.z < (actor->obj.pos.z + D_80177D20)) { + if (gPlayer[0].camEye.z < (actor->obj.pos.z + D_ctx_80177D20)) { Object_Kill(&actor->obj, actor->sfxSource); } } } -void func_800660F0(Actor* actor) { +void func_enmy_800660F0(Actor* actor) { Item* item = gItems; s32 i; @@ -1612,7 +1615,7 @@ void func_800660F0(Actor* actor) { if (item->obj.status == OBJ_FREE) { Item_Initialize(item); item->obj.status = OBJ_INIT; - item->obj.id = D_800CFDF4[actor->unk_044]; + item->obj.id = D_enmy_800CFDF4[actor->unk_044]; item->obj.pos.x = actor->obj.pos.x; item->obj.pos.y = actor->obj.pos.y; item->obj.pos.z = actor->obj.pos.z; @@ -1635,21 +1638,21 @@ void func_800660F0(Actor* actor) { } } -void func_80066254(Actor* actor) { +void func_enmy_80066254(Actor* actor) { Actor* otherActor; s32 i; if (gVersusMode) { if ((actor->unk_0D4 > 0) && (actor->unk_0D4 < 5) && - !((D_80178768[0] == 0) && (D_80178768[1] == 0) && (D_80178768[2] == 0))) { - D_80177C30[actor->unk_0D4 - 1] += actor->info.bonus; + !((D_versus_80178768[0] == 0) && (D_versus_80178768[1] == 0) && (D_versus_80178768[2] == 0))) { + D_ctx_80177C30[actor->unk_0D4 - 1] += actor->info.bonus; } } else if ((actor->obj.id != OBJ_ACTOR_197) || (actor->unk_0B6 != 1)) { if ((actor->unk_0D4 == 1) && (actor->info.bonus != 0)) { gHitCount += actor->info.bonus; - D_80177850 = 15; - if ((gLevelMode == LEVELMODE_ALL_RANGE) && (D_80161A62 != 0)) { - switch (D_80161A62) { + D_ctx_80177850 = 15; + if ((gLevelMode == LEVELMODE_ALL_RANGE) && (D_play_80161A62 != 0)) { + switch (D_play_80161A62) { case 9: if (gCurrentLevel == LEVEL_KATINA) { Radio_PlayMessage(gMsg_ID_18031, RCID_BILL); @@ -1664,16 +1667,16 @@ void func_80066254(Actor* actor) { actor->unk_044 = 9; break; } - D_80161A62 = 0; + D_play_80161A62 = 0; } if (actor->obj.id == OBJ_ACTOR_197) { if ((actor->aiType >= 4) && (actor->aiType < 8)) { - func_8002E3E0(actor); + func_360_8002E3E0(actor); } } } if (actor->unk_044) { - if (D_800CFE5C[actor->unk_044] < 0.0f) { + if (D_enmy_800CFE5C[actor->unk_044] < 0.0f) { otherActor = gActors; for (i = 0, otherActor = gActors; i < ARRAY_COUNT(gActors); i++, otherActor++) { if ((otherActor->obj.status != OBJ_FREE) && (otherActor->index != actor->index) && @@ -1681,7 +1684,7 @@ void func_80066254(Actor* actor) { return; } } - func_800660F0(actor); + func_enmy_800660F0(actor); AUDIO_PLAY_SFX(0x4900000C, gDefaultSfxSource, 4); } else if (actor->unk_044 == 24) { if (gTeamShields[3] > 0) { @@ -1691,14 +1694,14 @@ void func_80066254(Actor* actor) { } else if (gTeamShields[1] > 0) { Radio_PlayMessage(gMsg_ID_20262, RCID_FALCO); } - } else if (Rand_ZeroOne() <= D_800CFE5C[actor->unk_044]) { - func_800660F0(actor); + } else if (Rand_ZeroOne() <= D_enmy_800CFE5C[actor->unk_044]) { + func_enmy_800660F0(actor); } } } } -void func_8006654C(Actor* actor) { +void func_enmy_8006654C(Actor* actor) { actor->gravity = 0.4f; if (actor->obj.pos.y <= gGroundLevel + 130.0f) { actor->obj.pos.y = gGroundLevel + 130.0f; @@ -1750,12 +1753,12 @@ void func_8006654C(Actor* actor) { } actor->vel.z = -15.0f; actor->gravity = 0.5f; - func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 13.0f); + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 13.0f); AUDIO_PLAY_SFX(0x2903A008, actor->sfxSource, 4); } } -void func_8006684C(Actor* actor) { +void func_enmy_8006684C(Actor* actor) { s32 pad; if (actor->timer_0BE != 0) { @@ -1765,23 +1768,24 @@ void func_8006684C(Actor* actor) { if (actor->timer_0BE == 1) { Object_Kill(&actor->obj, actor->sfxSource); actor->unk_044 = 1; - func_80066254(actor); + func_enmy_80066254(actor); AUDIO_PLAY_SFX(0x2903B009, actor->sfxSource, 4); BonusText_Display(actor->obj.pos.x, actor->obj.pos.y + 250.0f, actor->obj.pos.z, 3); gHitCount += 3; - D_80177850 = 15; + D_ctx_80177850 = 15; } } else { actor->obj.rot.x += 11.0f; actor->obj.rot.y += 7.0f; if (actor->vel.y < -3.0f) { - func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 7.0f, 5); + func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 7.0f, + 5); actor->timer_0BE = 3; } } } -void func_800669A0(Actor* actor) { +void func_enmy_800669A0(Actor* actor) { if (actor->timer_0BC != 0) { if (actor->timer_0BC == 1) { Object_Kill(&actor->obj, actor->sfxSource); @@ -1789,18 +1793,19 @@ void func_800669A0(Actor* actor) { } else { actor->obj.rot.y += 5.0f; if (actor->unk_0D0 != 0) { - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y + 130.0f, actor->obj.pos.z, 8.0f); - func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 130.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 4.0f, 5); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y + 130.0f, actor->obj.pos.z, 8.0f); + func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 130.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 4.0f, + 5); actor->timer_0BC = 4; - func_8007A6F0(&actor->obj.pos, 0x1903400F); + func_effect_8007A6F0(&actor->obj.pos, 0x1903400F); } } } -void func_80066A80(Actor* actor) { +void func_enmy_80066A80(Actor* actor) { } -void func_80066A8C(Object_80* obj80) { +void func_enmy_80066A8C(Object_80* obj80) { Vec3f sp64; Vec3f sp58; f32 yf; @@ -1815,11 +1820,11 @@ void func_80066A8C(Object_80* obj80) { Matrix_RotateX(gCalcMatrix, obj80->obj.rot.x * M_DTOR, 1); sp64.y = yf; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp64, &sp58); - func_8007D0E0(obj80->obj.pos.x + sp58.x, obj80->obj.pos.y + sp58.y, obj80->obj.pos.z + sp58.z, 4.0f); + func_effect_8007D0E0(obj80->obj.pos.x + sp58.x, obj80->obj.pos.y + sp58.y, obj80->obj.pos.z + sp58.z, 4.0f); } } -void func_80066C00(Object_80* obj80) { +void func_enmy_80066C00(Object_80* obj80) { Vec3f sp64; Vec3f sp58; f32 zf; @@ -1834,15 +1839,15 @@ void func_80066C00(Object_80* obj80) { for (zf = -180.0f; zf <= 0.0f; zf += 30.0f) { sp64.z = zf; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp64, &sp58); - func_8007D0E0(obj80->obj.pos.x + sp58.x, obj80->obj.pos.y + sp58.y, obj80->obj.pos.z + sp58.z, - RAND_FLOAT(1.0f) + 2.0f); + func_effect_8007D0E0(obj80->obj.pos.x + sp58.x, obj80->obj.pos.y + sp58.y, obj80->obj.pos.z + sp58.z, + RAND_FLOAT(1.0f) + 2.0f); } } -void func_80066D5C(Object_80* obj80) { +void func_enmy_80066D5C(Object_80* obj80) { switch (obj80->state) { case 1: - func_80066C00(obj80); + func_enmy_80066C00(obj80); obj80->state++; AUDIO_PLAY_SFX(0x2900300F, obj80->sfxSource, 4); break; @@ -1852,9 +1857,9 @@ void func_80066D5C(Object_80* obj80) { if (obj80->obj.rot.x >= 90.0f) { obj80->obj.rot.x = 90.0f; obj80->unk_44 = 40; - func_80066A8C(obj80); + func_enmy_80066A8C(obj80); obj80->state = 0; - D_80178480 = 25; + D_ctx_80178480 = 25; AUDIO_PLAY_SFX(0x19130003, obj80->sfxSource, 4); } break; @@ -1863,30 +1868,30 @@ void func_80066D5C(Object_80* obj80) { } } -void func_80066E80(Object_80* obj80) { +void func_enmy_80066E80(Object_80* obj80) { } -void func_80066E8C(Object_4C* obj4C) { +void func_enmy_80066E8C(Object_4C* obj4C) { obj4C->obj.rot.y += 0.2f; } -void func_80066EA8(Object_80* obj80) { +void func_enmy_80066EA8(Object_80* obj80) { obj80->obj.rot.y = 0.0f; if (gPlayer[0].camEye.x < obj80->obj.pos.x) { obj80->obj.rot.y = 271.0f; } } -void func_80066EE4(Object_4C* obj4C) { +void func_enmy_80066EE4(Object_4C* obj4C) { } -void func_80066EF0(Item* item) { +void func_enmy_80066EF0(Item* item) { f32 var_fa1; if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7) || (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_0)) { Object_Kill(&item->obj, item->sfxSource); } - if ((gLevelMode == LEVELMODE_ON_RAILS) && (D_80161680 == 0)) { + if ((gLevelMode == LEVELMODE_ON_RAILS) && (D_enmy_80161680 == 0)) { var_fa1 = 900.0f; if (gPlayer[0].form != FORM_ARWING) { var_fa1 = 600.0f; @@ -1923,7 +1928,7 @@ void func_80066EF0(Item* item) { } } -void func_800671D0(Item* item) { +void func_enmy_800671D0(Item* item) { s32 var_v0; Vec3f sp40; Vec3f sp34; @@ -1942,13 +1947,13 @@ void func_800671D0(Item* item) { sp40.y = RAND_FLOAT_CENTERED(120.0f); sp40.z = 0.0f; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp40, &sp34); - func_80078E50(item->obj.pos.x + sp34.x, item->obj.pos.y + sp34.y, item->obj.pos.z + sp34.z, 3.0f); + func_effect_80078E50(item->obj.pos.x + sp34.x, item->obj.pos.y + sp34.y, item->obj.pos.z + sp34.z, 3.0f); } item->obj.rot.y += item->unk_50; item->obj.rot.y = Math_ModF(item->obj.rot.y, 360.0f); } -void func_80067348(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 arg6, f32 arg7, f32 arg8) { +void func_enmy_80067348(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 arg6, f32 arg7, f32 arg8) { Actor_Initialize(actor); actor->obj.status = OBJ_ACTIVE; actor->obj.id = OBJ_ACTOR_189; @@ -1966,18 +1971,18 @@ void func_80067348(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRo Object_SetInfo(&actor->info, actor->obj.id); } -void func_800674B4(f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 arg5, f32 arg6, f32 arg7) { +void func_enmy_800674B4(f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 arg5, f32 arg6, f32 arg7) { s32 i; for (i = 59; i >= 50; i--) { if (gActors[i].obj.status == OBJ_FREE) { - func_80067348(&gActors[i], xPos, yPos, zPos, xRot, yRot, arg5, arg6, arg7); + func_enmy_80067348(&gActors[i], xPos, yPos, zPos, xRot, yRot, arg5, arg6, arg7); break; } } } -void func_8006753C(Actor* actor) { +void func_enmy_8006753C(Actor* actor) { Player* player = &gPlayer[0]; s32 i; @@ -1995,8 +2000,8 @@ void func_8006753C(Actor* actor) { actor->unk_0D0 = 0; actor->health -= actor->damage; if (actor->health <= 0) { - func_8007A6F0(&actor->obj.pos, 0x2903A008); - func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 5.0f); + func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 5.0f); if (((player[0].wings.rightState <= WINGSTATE_BROKEN) || (player[0].wings.leftState <= WINGSTATE_BROKEN)) && (player[0].form != FORM_LANDMASTER)) { actor->unk_044 = 23; @@ -2007,13 +2012,13 @@ void func_8006753C(Actor* actor) { } else { actor->unk_044 = 5; } - func_80066254(actor); + func_enmy_80066254(actor); for (i = 0; i < 6; i++) { - func_800674B4(D_800CFEC4[i].x + actor->obj.pos.x, D_800CFEC4[i].y + actor->obj.pos.y, - D_800CFEC4[i].z + actor->obj.pos.z, D_800CFF0C[i].y + actor->obj.rot.y, - D_800CFF0C[i].x + actor->obj.rot.x, RAND_FLOAT_CENTERED(40.0f), RAND_FLOAT(10.0f) + 10.0f, - RAND_FLOAT_CENTERED(40.0f)); - func_800794CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 0.6f); + func_enmy_800674B4(D_enmy_800CFEC4[i].x + actor->obj.pos.x, D_enmy_800CFEC4[i].y + actor->obj.pos.y, + D_enmy_800CFEC4[i].z + actor->obj.pos.z, D_enmy_800CFF0C[i].y + actor->obj.rot.y, + D_enmy_800CFF0C[i].x + actor->obj.rot.x, RAND_FLOAT_CENTERED(40.0f), + RAND_FLOAT(10.0f) + 10.0f, RAND_FLOAT_CENTERED(40.0f)); + func_effect_800794CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 0.6f); } Object_Kill(&actor->obj, actor->sfxSource); } @@ -2026,15 +2031,15 @@ void func_8006753C(Actor* actor) { gRadarMarks[63].unk_10 = 0.0f; } -void func_80067874(Actor* actor) { +void func_enmy_80067874(Actor* actor) { s32 i; Lights_SetOneLight(&gMasterDisp, -60, -60, 60, 150, 150, 150, 20, 20, 20); for (i = 0; i < 6; i++) { Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, D_800CFEC4[i].x, D_800CFEC4[i].y, D_800CFEC4[i].z, 1); - Matrix_RotateY(gGfxMatrix, D_800CFF0C[i].y * M_DTOR, 1); - Matrix_RotateX(gGfxMatrix, D_800CFF0C[i].x * M_DTOR, 1); + Matrix_Translate(gGfxMatrix, D_enmy_800CFEC4[i].x, D_enmy_800CFEC4[i].y, D_enmy_800CFEC4[i].z, 1); + Matrix_RotateY(gGfxMatrix, D_enmy_800CFF0C[i].y * M_DTOR, 1); + Matrix_RotateX(gGfxMatrix, D_enmy_800CFF0C[i].x * M_DTOR, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_10177C0); Matrix_Pop(&gGfxMatrix); @@ -2043,14 +2048,14 @@ void func_80067874(Actor* actor) { gAmbientB); } -void func_80067A40(void) { +void func_enmy_80067A40(void) { AUDIO_PLAY_SFX(0x09008023, gPlayer[0].sfxSource, 0); if (gPlayer[0].wings.rightState <= WINGSTATE_BROKEN) { - D_80177D40[0] = 1050; + D_ctx_80177D40[0] = 1050; gPlayer[0].wings.rightState = WINGSTATE_INTACT; } if (gPlayer[0].wings.leftState <= WINGSTATE_BROKEN) { - D_80177D58[0] = 1050; + D_ctx_80177D58[0] = 1050; gPlayer[0].wings.leftState = WINGSTATE_INTACT; } if (gExpertMode) { @@ -2060,12 +2065,12 @@ void func_80067A40(void) { } } -void func_80067B1C(Item* item) { - func_80066EF0(item); - func_800671D0(item); +void func_enmy_80067B1C(Item* item) { + func_enmy_80066EF0(item); + func_enmy_800671D0(item); if (item->collected) { Object_Kill(&item->obj, item->sfxSource); - func_80060F30(gPlayer[item->playerNum].sfxSource, 0x4900C024, item->playerNum); + func_enmy_80060F30(gPlayer[item->playerNum].sfxSource, 0x4900C024, item->playerNum); if (gCurrentLevel != LEVEL_TRAINING) { gLifeCount[item->playerNum]++; } @@ -2075,9 +2080,9 @@ void func_80067B1C(Item* item) { } } -void func_80067BEC(Item* item) { - func_80066EF0(item); - func_800671D0(item); +void func_enmy_80067BEC(Item* item) { + func_enmy_80066EF0(item); + func_enmy_800671D0(item); if (item->state == 0) { switch (item->obj.id) { case OBJ_ITEM_BOMB: @@ -2088,8 +2093,8 @@ void func_80067BEC(Item* item) { item->timer_48 = 20; item->unk_50 = 60.0f; gBombCount[item->playerNum]++; - func_80060F30(gPlayer[item->playerNum].sfxSource, 0x49002005, item->playerNum); - func_80060F30(gPlayer[item->playerNum].sfxSource, 0x49002006, item->playerNum); + func_enmy_80060F30(gPlayer[item->playerNum].sfxSource, 0x49002005, item->playerNum); + func_enmy_80060F30(gPlayer[item->playerNum].sfxSource, 0x49002006, item->playerNum); } break; case OBJ_ITEM_LASERS: @@ -2103,14 +2108,14 @@ void func_80067BEC(Item* item) { if (gLaserStrength[item->playerNum] > LASERS_HYPER) { gLaserStrength[item->playerNum] = LASERS_HYPER; } - func_80060F30(gPlayer[item->playerNum].sfxSource, 0x49002004, item->playerNum); + func_enmy_80060F30(gPlayer[item->playerNum].sfxSource, 0x49002004, item->playerNum); if (gExpertMode) { gRightWingHealth[item->playerNum] = gLeftWingHealth[item->playerNum] = 10; } else { gRightWingHealth[item->playerNum] = gLeftWingHealth[item->playerNum] = 60; } - D_80177D40[item->playerNum] = 1030; - D_80177D58[item->playerNum] = 1030; + D_ctx_80177D40[item->playerNum] = 1030; + D_ctx_80177D58[item->playerNum] = 1030; } break; } @@ -2129,7 +2134,7 @@ void func_80067BEC(Item* item) { } } -void func_80067F6C(Item* item) { +void func_enmy_80067F6C(Item* item) { if (!gVersusMode && ((gPlayer[0].wings.leftState <= WINGSTATE_BROKEN) || (gPlayer[0].wings.rightState <= WINGSTATE_BROKEN))) { item->obj.id = OBJ_ITEM_WING_REPAIR; @@ -2137,31 +2142,31 @@ void func_80067F6C(Item* item) { item->timer_48 = 2000; AUDIO_PLAY_SFX(0x1900302B, item->sfxSource, 0); } else { - func_80067BEC(item); + func_enmy_80067BEC(item); } } -void func_80068020(Item* item) { +void func_enmy_80068020(Item* item) { Vec3f sp4C; Vec3f sp40; switch (item->state) { case 0: Math_SmoothStepToF(&item->scale, 0.4f, 1.0f, 0.05f, 0.0f); - func_80066EF0(item); - func_800671D0(item); + func_enmy_80066EF0(item); + func_enmy_800671D0(item); if (item->collected) { item->state = 1; item->timer_48 = 50; if (item->obj.id == OBJ_ITEM_SILVER_RING) { gPlayer[item->playerNum].heal += 0x20; - func_80060F30(gPlayer[item->playerNum].sfxSource, 0x4900200E, item->playerNum); + func_enmy_80060F30(gPlayer[item->playerNum].sfxSource, 0x4900200E, item->playerNum); } else if (item->obj.id == OBJ_ITEM_GOLD_RING) { gGoldRingCount[0]++; if (gGoldRingCount[0] == 3) { - func_80060F30(gPlayer[item->playerNum].sfxSource, 0x49008015, item->playerNum); + func_enmy_80060F30(gPlayer[item->playerNum].sfxSource, 0x49008015, item->playerNum); } else if (gGoldRingCount[0] == 6) { - func_80060F30(gPlayer[item->playerNum].sfxSource, 0x4900C024, item->playerNum); + func_enmy_80060F30(gPlayer[item->playerNum].sfxSource, 0x4900C024, item->playerNum); if (gCurrentLevel != LEVEL_TRAINING) { gLifeCount[item->playerNum]++; } @@ -2170,11 +2175,11 @@ void func_80068020(Item* item) { gPlayer[item->playerNum].unk_138, BONUS_TEXT_1UP); } else { gPlayer[item->playerNum].heal += 0x20; - func_80060F30(gPlayer[item->playerNum].sfxSource, 0x49003013, item->playerNum); + func_enmy_80060F30(gPlayer[item->playerNum].sfxSource, 0x49003013, item->playerNum); } } else { gPlayer[item->playerNum].heal += 0x80; - func_80060F30(gPlayer[item->playerNum].sfxSource, 0x4900200D, item->playerNum); + func_enmy_80060F30(gPlayer[item->playerNum].sfxSource, 0x4900200D, item->playerNum); } } if ((item->obj.id == OBJ_ITEM_GOLD_RING) && (item->timer_48 == 1)) { @@ -2211,25 +2216,26 @@ void func_80068020(Item* item) { sp4C.y = item->scale * 100.0f; sp4C.z = 0.0f; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp4C, &sp40); - func_80078E50(item->obj.pos.x + sp40.x, item->obj.pos.y + sp40.y, item->obj.pos.z + sp40.z, 3.5f); + func_effect_80078E50(item->obj.pos.x + sp40.x, item->obj.pos.y + sp40.y, item->obj.pos.z + sp40.z, + 3.5f); } break; } } -void func_800685D8(Item* item) { - func_80068020(item); +void func_enmy_800685D8(Item* item) { + func_enmy_80068020(item); } -void func_800685F8(Item* item) { - func_80068020(item); +void func_enmy_800685F8(Item* item) { + func_enmy_80068020(item); } -void func_80068618(Item* item) { - func_80066EF0(item); - func_800671D0(item); +void func_enmy_80068618(Item* item) { + func_enmy_80066EF0(item); + func_enmy_800671D0(item); if (item->collected) { - func_80067A40(); + func_enmy_80067A40(); Object_Kill(&item->obj, item->sfxSource); } if (item->timer_48 == 1) { @@ -2237,8 +2243,8 @@ void func_80068618(Item* item) { } } -void func_80068688(Item* item) { - func_80066EF0(item); +void func_enmy_80068688(Item* item) { + func_enmy_80066EF0(item); if (item->state > 0) { if (item->state == 1) { item->obj.rot.z -= 10.0f; @@ -2256,33 +2262,33 @@ void func_80068688(Item* item) { } } else { item->scale = 100.0f; - if (D_80177E80 < 0) { + if (D_ctx_80177E80 < 0) { item->state = 2; item->unk_44 = 255; } else if (item->collected) { item->state = 1; item->unk_44 = 255; gPlayer[item->playerNum].timer_27C = 100; - AUDIO_PLAY_SFX(D_800CFF54[D_80177E80], gPlayer[0].sfxSource, 0); - if (D_80177E80 == 0) { + AUDIO_PLAY_SFX(D_enmy_800CFF54[D_ctx_80177E80], gPlayer[0].sfxSource, 0); + if (D_ctx_80177E80 == 0) { gPlayer[0].unk_110 = 0.0f; } - D_80177E80++; - if (D_80177E80 >= 7) { + D_ctx_80177E80++; + if (D_ctx_80177E80 >= 7) { gPlayer[0].state_1C8 = PLAYERSTATE_1C8_8; gPlayer[0].unk_1D0 = 0; AUDIO_PLAY_SFX(0x1900602A, gDefaultSfxSource, 0); - D_80177930 = 2; - D_800D3180[gCurrentLevel] = 1; + D_ctx_80177930 = 2; + D_play_800D3180[gCurrentLevel] = 1; } } } } -void func_80068914(Item* item) { +void func_enmy_80068914(Item* item) { s32 i; - func_80066EF0(item); + func_enmy_80066EF0(item); item->unk_58 -= item->unk_44; if (item->state > 0) { item->unk_44++; @@ -2315,10 +2321,10 @@ void func_80068914(Item* item) { item->state++; item->timer_48 = 15; D_80161A8C = D_80161A88; - D_80177CB0 = -item->obj.pos.z; - D_80177CB0 -= 250.0f; - D_80177CA0 = D_80177DC8; - D_80161A50 = D_80161684; + D_ctx_80177CB0 = -item->obj.pos.z; + D_ctx_80177CB0 -= 250.0f; + D_ctx_80177CA0 = D_ctx_80177DC8; + D_play_80161A50 = D_enmy_80161684; gSavedHitCount = gHitCount; for (i = 1; i < 4; i++) { gSavedTeamShields[i] = gTeamShields[i]; @@ -2328,18 +2334,18 @@ void func_80068914(Item* item) { } } -void func_80068C48(Item* item) { +void func_enmy_80068C48(Item* item) { if (item->collected) { Object_Kill(&item->obj, item->sfxSource); - D_80177E80++; + D_ctx_80177E80++; } } -void func_80068C88(Item* item) { - D_80161680 = item->obj.id; +void func_enmy_80068C88(Item* item) { + D_enmy_80161680 = item->obj.id; if (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_3) { Object_Kill(&item->obj, item->sfxSource); - } else if (((gCurrentLevel == LEVEL_METEO) || (gCurrentLevel == LEVEL_SECTOR_X)) && (D_8017827C == 1)) { + } else if (((gCurrentLevel == LEVEL_METEO) || (gCurrentLevel == LEVEL_SECTOR_X)) && (D_ctx_8017827C == 1)) { gPlayer[0].state_1C8 = PLAYERSTATE_1C8_7; gPlayer[0].unk_1D0 = 0; Object_Kill(&item->obj, item->sfxSource); @@ -2348,7 +2354,7 @@ void func_80068C88(Item* item) { gPlayer[0].unk_1D0 = 0; Object_Kill(&item->obj, item->sfxSource); } else if (item->state == 0) { - if (((item->obj.pos.z + D_80177D20) > -2700.0f) && (fabsf(item->obj.pos.x - gPlayer[0].pos.x) < 1000.0f)) { + if (((item->obj.pos.z + D_ctx_80177D20) > -2700.0f) && (fabsf(item->obj.pos.x - gPlayer[0].pos.x) < 1000.0f)) { switch (item->obj.id) { case OBJ_ITEM_331: case OBJ_ITEM_332: @@ -2409,72 +2415,72 @@ void func_80068C88(Item* item) { } } -void func_80068FE0(Object_4C* obj4C) { - obj4C->obj.rot.y = - (Math_Atan2F(gPlayer[0].camEye.x - obj4C->obj.pos.x, gPlayer[0].camEye.z - (obj4C->obj.pos.z + D_80177D20)) * - 180.0f) / - M_PI; +void func_enmy_80068FE0(Object_4C* obj4C) { + obj4C->obj.rot.y = (Math_Atan2F(gPlayer[0].camEye.x - obj4C->obj.pos.x, + gPlayer[0].camEye.z - (obj4C->obj.pos.z + D_ctx_80177D20)) * + 180.0f) / + M_PI; if (obj4C->unk_46 != 0) { obj4C->obj.status = OBJ_FREE; - func_8007A6F0(&obj4C->obj.pos, 0x1903400F); + func_effect_8007A6F0(&obj4C->obj.pos, 0x1903400F); switch (obj4C->obj.id) { case OBJ_4C_161: - func_8007D074(obj4C->obj.pos.x, obj4C->obj.pos.y + 160.0f, obj4C->obj.pos.z, 4.0f); + func_effect_8007D074(obj4C->obj.pos.x, obj4C->obj.pos.y + 160.0f, obj4C->obj.pos.z, 4.0f); break; default: case OBJ_4C_169: - func_8007D074(obj4C->obj.pos.x, obj4C->obj.pos.y + 96.0f, obj4C->obj.pos.z, 5.0f); + func_effect_8007D074(obj4C->obj.pos.x, obj4C->obj.pos.y + 96.0f, obj4C->obj.pos.z, 5.0f); break; } } } -void func_800690D0(s32 index, ObjectId objId) { +void func_enmy_800690D0(s32 index, ObjectId objId) { switch (objId) { case OBJ_ACTOR_200: - func_8007717C(&gActors[index]); + func_enmy2_8007717C(&gActors[index]); break; case OBJ_ACTOR_197: if (gCurrentLevel == LEVEL_VENOM_ANDROSS) { - func_i6_801888F4(&gActors[index]); + Andross_801888F4(&gActors[index]); } else { - func_800763A4(&gActors[index]); + func_enmy2_800763A4(&gActors[index]); } break; case OBJ_ACTOR_202: - func_800763A4(&gActors[index]); + func_enmy2_800763A4(&gActors[index]); break; case OBJ_ACTOR_194: - func_8006B0A0(&gActors[index]); + func_enmy2_8006B0A0(&gActors[index]); break; case OBJ_ACTOR_186: - func_i2_80187B08(&gActors[index]); + Meteo_80187B08(&gActors[index]); break; case OBJ_ACTOR_181: Object_Kill(&gActors[index].obj, gActors[index].sfxSource); - func_8007D2C8(gActors[index].obj.pos.x, gActors[index].obj.pos.y, gActors[index].obj.pos.z, 20.0f); + func_effect_8007D2C8(gActors[index].obj.pos.x, gActors[index].obj.pos.y, gActors[index].obj.pos.z, 20.0f); break; case OBJ_ACTOR_182: Object_Kill(&gActors[index].obj, gActors[index].sfxSource); - func_8007D2C8(gActors[index].obj.pos.x, gActors[index].obj.pos.y, gActors[index].obj.pos.z, 10.0f); - func_80066254(&gActors[index]); + func_effect_8007D2C8(gActors[index].obj.pos.x, gActors[index].obj.pos.y, gActors[index].obj.pos.z, 10.0f); + func_enmy_80066254(&gActors[index]); break; case OBJ_ACTOR_192: - func_8006684C(&gActors[index]); + func_enmy_8006684C(&gActors[index]); break; case OBJ_BOSS_306: - func_i5_801990DC(&gBosses[index]); + Titania_801990DC(&gBosses[index]); break; case OBJ_ACTOR_232: - func_i5_8018B720(&gActors[index]); + Titania_8018B720(&gActors[index]); break; case OBJ_BOSS_319: - func_i1_80198594(&gBosses[index]); + Venom1_80198594(&gBosses[index]); break; } } -void func_800693E8(Actor* actor) { +void func_enmy_800693E8(Actor* actor) { actor->obj.pos.x += actor->vel.x; actor->obj.pos.z += actor->vel.z; actor->obj.pos.y += actor->vel.y; @@ -2490,49 +2496,49 @@ void func_800693E8(Actor* actor) { } else if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_8) { var_fv0 = 100000.0f; } - if (((gPlayer[0].camEye.z + actor->info.unk_10) < (actor->obj.pos.z + D_80177D20)) || - ((actor->obj.pos.z + D_80177D20) < -15000.0f) || (actor->obj.pos.y < (gPlayer[0].unk_0B0 - var_fv0)) || + if (((gPlayer[0].camEye.z + actor->info.unk_10) < (actor->obj.pos.z + D_ctx_80177D20)) || + ((actor->obj.pos.z + D_ctx_80177D20) < -15000.0f) || (actor->obj.pos.y < (gPlayer[0].unk_0B0 - var_fv0)) || ((gPlayer[0].unk_0B0 + var_fv0) < actor->obj.pos.y) || ((gPlayer[0].unk_0AC + var_fv0) < actor->obj.pos.x) || (actor->obj.pos.x < (gPlayer[0].unk_0AC - var_fv0))) { Object_Kill(&actor->obj, actor->sfxSource); switch (actor->obj.id) { case OBJ_ACTOR_236: - D_801784A4 = 0; + D_ctx_801784A4 = 0; break; case OBJ_ACTOR_229: - func_i5_8018E3B0(actor); + Titania_8018E3B0(actor); break; case OBJ_ACTOR_194: - D_80176550[actor->unk_046] = 0; + D_ctx_80176550[actor->unk_046] = 0; break; case OBJ_ACTOR_200: if ((actor->unk_0B4 >= 200) && (actor->unk_0B4 < 300)) { - D_80176550[actor->unk_046] = 0; + D_ctx_80176550[actor->unk_046] = 0; } else if ((actor->unk_0B4 == 38) && (actor->unk_046 != 2)) { - D_80177E80 = -1; + D_ctx_80177E80 = -1; } break; case OBJ_ACTOR_252: - D_80161684 = 1; + D_enmy_80161684 = 1; break; } } } } -void func_80069658(Boss* boss) { +void func_enmy_80069658(Boss* boss) { boss->obj.pos.x += boss->vel.x; boss->obj.pos.y += boss->vel.y; boss->obj.pos.z += boss->vel.z; boss->vel.y -= boss->gravity; - if ((D_80161AB8 != 0) && ((boss->obj.pos.z + D_80177D20) > (boss->info.unk_10 - gPlayer[0].camEye.z))) { + if ((D_80161AB8 != 0) && ((boss->obj.pos.z + D_ctx_80177D20) > (boss->info.unk_10 - gPlayer[0].camEye.z))) { if (gPlayer[0].camEye.z) {} // fake Object_Kill(&boss->obj, boss->sfxSource); } } -void func_800696F8(Object_80* obj80) { +void func_enmy_800696F8(Object_80* obj80) { if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_2) { obj80->obj.pos.z += obj80->unk_60; if (obj80->info.unk_10 < obj80->obj.pos.z) { @@ -2550,13 +2556,13 @@ void func_800696F8(Object_80* obj80) { temp_fv0 = 0.0f; } temp_fv0 -= gPlayer[0].camEye.z; - if ((obj80->info.unk_10 - temp_fv0) < (obj80->obj.pos.z + D_80177D20)) { + if ((obj80->info.unk_10 - temp_fv0) < (obj80->obj.pos.z + D_ctx_80177D20)) { Object_Kill(&obj80->obj, obj80->sfxSource); } } } -void func_80069858(Object_4C* obj4C) { +void func_enmy_80069858(Object_4C* obj4C) { if (D_80161AB8 != 0) { f32 temp_fv0 = fabsf(obj4C->obj.pos.x - gPlayer[0].camEye.x); f32 var_fa0 = 500.0f; @@ -2567,18 +2573,18 @@ void func_80069858(Object_4C* obj4C) { } temp_fv0 = ((temp_fv0 - var_fa0) < 0.0f) ? 0.0f * 1.7f : (temp_fv0 - var_fa0) * 1.7f; temp_fv0 -= gPlayer[0].camEye.z; - if ((obj4C->info.unk_10 - temp_fv0) < (obj4C->obj.pos.z + D_80177D20)) { + if ((obj4C->info.unk_10 - temp_fv0) < (obj4C->obj.pos.z + D_ctx_80177D20)) { obj4C->obj.status = OBJ_FREE; } } } -void func_80069924(Effect* effect) { +void func_enmy_80069924(Effect* effect) { effect->obj.pos.x += effect->vel.x; effect->obj.pos.y += effect->vel.y; effect->obj.pos.z += effect->vel.z; if (D_80161AB8 != 0) { - if ((gPlayer[0].camEye.z + effect->info.unk_10) < (effect->obj.pos.z + D_80177D20)) { + if ((gPlayer[0].camEye.z + effect->info.unk_10) < (effect->obj.pos.z + D_ctx_80177D20)) { Object_Kill(&effect->obj, effect->sfxSource); } else if ((fabsf(effect->obj.pos.y - gPlayer[0].camEye.y) > 25000.0f) || (fabsf(effect->obj.pos.x - gPlayer[0].camEye.x) > 25000.0f)) { @@ -2587,14 +2593,14 @@ void func_80069924(Effect* effect) { } } -void func_80069A10(Item* item) { +void func_enmy_80069A10(Item* item) { if (D_80161AB8 != 0) { f32 temp = (0.0f - gPlayer[0].camEye.z); - if ((item->info.unk_10 - temp) < (item->obj.pos.z + D_80177D20)) { + if ((item->info.unk_10 - temp) < (item->obj.pos.z + D_ctx_80177D20)) { Object_Kill(&item->obj, item->sfxSource); if ((item->obj.id == OBJ_ITEM_METEO_WARP) && (item->state == 0)) { - D_80177E80 = -1; + D_ctx_80177E80 = -1; } } } @@ -2641,19 +2647,19 @@ void Actor_Update(Actor* actor) { actor->obj.status = OBJ_ACTIVE; Object_Init(actor->index, actor->obj.id); if (actor->obj.id != OBJ_ACTOR_252) { - func_800693E8(actor); + func_enmy_800693E8(actor); } break; case OBJ_ACTIVE: - func_800693E8(actor); + func_enmy_800693E8(actor); if ((actor->obj.status != OBJ_FREE) && (actor->info.action != NULL)) { actor->info.action(&actor->obj); } break; case OBJ_DYING: - func_800693E8(actor); + func_enmy_800693E8(actor); if (actor->obj.status != OBJ_FREE) { - func_800690D0(actor->index, actor->obj.id); + func_enmy_800690D0(actor->index, actor->obj.id); } break; } @@ -2685,18 +2691,18 @@ void Boss_Update(Boss* boss) { case OBJ_INIT: boss->obj.status = OBJ_ACTIVE; Object_Init(boss->index, boss->obj.id); - func_80069658(boss); + func_enmy_80069658(boss); break; case OBJ_ACTIVE: - func_80069658(boss); + func_enmy_80069658(boss); if ((boss->obj.status != OBJ_FREE) && (boss->info.action != NULL)) { boss->info.action(&boss->obj); } break; case OBJ_DYING: - func_80069658(boss); + func_enmy_80069658(boss); if (boss->obj.status != OBJ_FREE) { - func_800690D0(boss->index, boss->obj.id); + func_enmy_800690D0(boss->index, boss->obj.id); } break; } @@ -2710,10 +2716,10 @@ void Object_80_Update(Object_80* obj80) { case OBJ_INIT: obj80->obj.status = OBJ_ACTIVE; Object_Init(obj80->index, obj80->obj.id); - func_800696F8(obj80); + func_enmy_800696F8(obj80); break; case OBJ_ACTIVE: - func_800696F8(obj80); + func_enmy_800696F8(obj80); if (obj80->info.action != NULL) { obj80->info.action(&obj80->obj); } @@ -2726,17 +2732,17 @@ void Object_4C_Update(Object_4C* obj4C) { case OBJ_INIT: obj4C->obj.status = OBJ_ACTIVE; Object_Init(obj4C->index, obj4C->obj.id); - func_80069858(obj4C); + func_enmy_80069858(obj4C); break; case OBJ_ACTIVE: - func_80069858(obj4C); + func_enmy_80069858(obj4C); if (obj4C->info.action != NULL) { obj4C->info.action(&obj4C->obj); } break; case OBJ_DYING: - func_80069858(obj4C); - func_800690D0(obj4C->index, obj4C->obj.id); + func_enmy_80069858(obj4C); + func_enmy_800690D0(obj4C->index, obj4C->obj.id); break; } } @@ -2752,10 +2758,10 @@ void Item_Update(Item* item) { case OBJ_INIT: item->obj.status = OBJ_ACTIVE; Object_Init(item->index, item->obj.id); - func_80069A10(item); + func_enmy_80069A10(item); break; case OBJ_ACTIVE: - func_80069A10(item); + func_enmy_80069A10(item); if (item->info.action != NULL) { item->info.action(&item->obj); } @@ -2773,7 +2779,7 @@ void Effect_Update(Effect* effect) { Object_Init(effect->index, effect->obj.id); /* fallthrough */ case OBJ_ACTIVE: - func_80069924(effect); + func_enmy_80069924(effect); if ((effect->obj.status != OBJ_FREE) && (effect->info.action != NULL)) { effect->info.action(&effect->obj); } @@ -2823,7 +2829,7 @@ void TexturedLine_Update(TexturedLine* texLine) { } } } - if (((texLine->unk_04.z + D_80177D20) > 1000.0f) && (gLevelMode != LEVELMODE_ALL_RANGE)) { + if (((texLine->unk_04.z + D_ctx_80177D20) > 1000.0f) && (gLevelMode != LEVELMODE_ALL_RANGE)) { texLine->mode = 0; } if (((texLine->mode == 3) || (texLine->mode == 50)) && (texLine->timer == 0)) { @@ -2862,8 +2868,8 @@ void Object_UpdateAll(void) { D_80161AB8 = 1; } if (gLevelMode != LEVELMODE_ALL_RANGE) { - if ((D_80178488 != 0) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_2)) { - func_80062664(); + if ((D_ctx_80178488 != 0) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_2)) { + func_enmy_80062664(); } for (i = 0, obj80 = gObjects80; i < ARRAY_COUNT(gObjects80); i++, obj80++) { if (obj80->obj.status != OBJ_FREE) { @@ -2913,9 +2919,9 @@ void Object_UpdateAll(void) { } } TexturedLine_UpdateAll(); - for (i = 0; i < ARRAY_COUNT(D_Timer_80161670); i++) { - if (D_Timer_80161670[i] != 0) { - D_Timer_80161670[i]--; + for (i = 0; i < ARRAY_COUNT(D_enmy_Timer_80161670); i++) { + if (D_enmy_Timer_80161670[i] != 0) { + D_enmy_Timer_80161670[i]--; } } } diff --git a/src/main/fox_enmy2.c b/src/main/fox_enmy2.c index 11232932..7a981ad3 100644 --- a/src/main/fox_enmy2.c +++ b/src/main/fox_enmy2.c @@ -1,9 +1,4 @@ #include "global.h" - -s32 D_800CFF80[4] = { 0, 0, 0, 0 }; -s32 D_800CFF90 = 0; -s32 D_80161690; - #include "assets/ast_arwing.h" #include "assets/ast_training.h" #include "assets/ast_corneria.h" @@ -26,14 +21,18 @@ s32 D_80161690; #include "assets/ast_ve1_boss.h" #include "assets/ast_zoness.h" -void func_8006A7B0(u16* msg, s32 character) { +s32 D_enmy2_800CFF80[4] = { 0, 0, 0, 0 }; +s32 D_enmy2_800CFF90 = 0; +s32 D_enmy2_80161690; + +void func_enmy2_8006A7B0(u16* msg, s32 character) { PRINTF("Enm->obj.pos.y + tmp_xyz.y=<%10.3f>\n"); - if ((gRadioState == 0) || (D_80177D68 != character)) { + if ((gRadioState == 0) || (D_ctx_80177D68 != character)) { Radio_PlayMessage(msg, character); } } -void func_8006A800(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 arg4) { +void func_enmy2_8006A800(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 arg4) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; @@ -59,24 +58,24 @@ void func_8006A800(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 arg4) { Object_SetInfo(&effect->info, effect->obj.id); } -void func_8006A900(f32 xPos, f32 yPos, f32 zPos, f32 arg3) { +void func_enmy2_8006A900(f32 xPos, f32 yPos, f32 zPos, f32 arg3) { s32 i; for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8006A800(&gEffects[i], xPos, yPos, zPos, arg3); + func_enmy2_8006A800(&gEffects[i], xPos, yPos, zPos, arg3); break; } } } -void func_8006A96C(Actor* actor) { +void func_enmy2_8006A96C(Actor* actor) { } -void func_8006A978(Actor* actor) { +void func_enmy2_8006A978(Actor* actor) { } -void func_8006A984(Effect* effect, f32 xPos, f32 yPos, f32 zPos) { +void func_enmy2_8006A984(Effect* effect, f32 xPos, f32 yPos, f32 zPos) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_365; @@ -93,18 +92,18 @@ void func_8006A984(Effect* effect, f32 xPos, f32 yPos, f32 zPos) { Object_SetInfo(&effect->info, effect->obj.id); } -void func_8006AA3C(f32 xPos, f32 yPos, f32 zPos) { +void func_enmy2_8006AA3C(f32 xPos, f32 yPos, f32 zPos) { s32 i; for (i = 0; i < ARRAY_COUNT(gEffects); i++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8006A984(&gEffects[i], xPos, yPos, zPos); + func_enmy2_8006A984(&gEffects[i], xPos, yPos, zPos); break; } } } -void func_8006AA98(Object_80* obj80) { +void func_enmy2_8006AA98(Object_80* obj80) { Vec3f sp24; Vec3f sp18; @@ -117,11 +116,11 @@ void func_8006AA98(Object_80* obj80) { sp18.z = 700.0f; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp18, &sp24); - func_8006AA3C(obj80->obj.pos.x + sp24.x, obj80->obj.pos.y + sp24.y + 50.0f, obj80->obj.pos.z + sp24.z); + func_enmy2_8006AA3C(obj80->obj.pos.x + sp24.x, obj80->obj.pos.y + sp24.y + 50.0f, obj80->obj.pos.z + sp24.z); } } -bool func_8006ABA4(Actor* actor) { +bool func_enmy2_8006ABA4(Actor* actor) { if ((fabsf(actor->obj.pos.x - gPlayer[0].pos.x) < 700.0f) && (fabsf(actor->obj.pos.y - gPlayer[0].pos.y) < 700.0f)) { return true; @@ -129,21 +128,21 @@ bool func_8006ABA4(Actor* actor) { return false; } -void func_8006AC08(Actor* actor) { +void func_enmy2_8006AC08(Actor* actor) { f32 sp2C; - if (func_8006ABA4(actor) && (actor->timer_0BC == 0)) { - func_8007F11C(OBJ_EFFECT_353, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, D_80177828); + if (func_enmy2_8006ABA4(actor) && (actor->timer_0BC == 0)) { + func_effect_8007F11C(OBJ_EFFECT_353, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, D_ctx_80177828); actor->timer_0BC = 20; } - sp2C = actor->obj.pos.z + D_80177D20; + sp2C = actor->obj.pos.z + D_ctx_80177D20; actor->obj.rot.y = Math_RadToDeg(Math_Atan2F(gPlayer[0].camEye.x - actor->obj.pos.x, gPlayer[0].camEye.z - sp2C)); actor->obj.rot.x = -Math_RadToDeg(Math_Atan2F(gPlayer[0].camEye.y - actor->obj.pos.y, sqrtf(SQ(gPlayer[0].camEye.z - sp2C) + SQ(gPlayer[0].camEye.x - actor->obj.pos.x)))); } -void func_8006AD18(Actor* actor) { +void func_enmy2_8006AD18(Actor* actor) { bool sp34; actor->gravity = 1.5f; @@ -160,7 +159,8 @@ void func_8006AD18(Actor* actor) { } if (!(gGameFrameCount & 0x1F)) { - func_8007F11C(OBJ_EFFECT_353, actor->obj.pos.x, actor->obj.pos.y + 180.0f, actor->obj.pos.z, D_80177828); + func_effect_8007F11C(OBJ_EFFECT_353, actor->obj.pos.x, actor->obj.pos.y + 180.0f, actor->obj.pos.z, + D_ctx_80177828); } switch (actor->state) { @@ -213,35 +213,35 @@ void func_8006AD18(Actor* actor) { if (actor->unk_0D0 != 0) { actor->health -= 10; if ((actor->health <= 0) || (actor->unk_0D0 >= 2)) { - func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 180.0f, actor->obj.pos.z, 10.0f); - func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 180.0f, actor->obj.pos.z, actor->vel.x, actor->vel.y, - actor->vel.z, 8.0f, 30); + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 180.0f, actor->obj.pos.z, 10.0f); + func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 180.0f, actor->obj.pos.z, actor->vel.x, + actor->vel.y, actor->vel.z, 8.0f, 30); Object_Kill(&actor->obj, actor->sfxSource); - func_8007A6F0(&actor->obj.pos, 0x2903A008); + func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); gHitCount += actor->info.bonus; - D_80177850 = 15; + D_ctx_80177850 = 15; } else { actor->unk_0D0 = 0; actor->timer_0C6 = 20; AUDIO_PLAY_SFX(0x2903300E, actor->sfxSource, 4); - func_8007D1E0(actor->obj.pos.x, actor->obj.pos.y + 180.0f, actor->obj.pos.z, 5.0f); + func_effect_8007D1E0(actor->obj.pos.x, actor->obj.pos.y + 180.0f, actor->obj.pos.z, 5.0f); } } } -void func_8006B094(Actor* actor) { +void func_enmy2_8006B094(Actor* actor) { } -s16 D_800CFF94[16] = { +static s16 D_800CFF94[16] = { 0, 98, 96, 94, 92, 90, 88, 86, 84, 82, 80, 78, 76, 74, 72, 70, }; -u8 D_800CFFB4[16] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2 }; -f32 D_800CFFC4[16] = { +static u8 D_800CFFB4[16] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2 }; +static f32 D_800CFFC4[16] = { 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.99f, 0.98f, 0.94f, 0.88f, 0.8f, 1.0f, }; -Gfx* D_800D0004[3] = { D_ENMY_SPACE_4000170, D_ENMY_SPACE_40084D0, D_ENMY_SPACE_400A630 }; +static Gfx* D_800D0004[3] = { D_ENMY_SPACE_4000170, D_ENMY_SPACE_40084D0, D_ENMY_SPACE_400A630 }; -void func_8006B0A0(Actor* actor) { +void func_enmy2_8006B0A0(Actor* actor) { Vec3f sp34; s32 temp_hi; @@ -251,12 +251,12 @@ void func_8006B0A0(Actor* actor) { actor->unk_04E = 0; } - D_80176558[actor->unk_046][actor->unk_04E] = actor->obj.pos.x; - D_80176878[actor->unk_046][actor->unk_04E] = actor->obj.pos.y; - D_80176B98[actor->unk_046][actor->unk_04E] = actor->obj.pos.z; - D_80176EB8[actor->unk_046][actor->unk_04E] = actor->obj.rot.x; - D_801771D8[actor->unk_046][actor->unk_04E] = actor->obj.rot.y; - D_80177500[actor->unk_046][actor->unk_04E] = actor->obj.rot.z; + D_ctx_80176558[actor->unk_046][actor->unk_04E] = actor->obj.pos.x; + D_ctx_80176878[actor->unk_046][actor->unk_04E] = actor->obj.pos.y; + D_ctx_80176B98[actor->unk_046][actor->unk_04E] = actor->obj.pos.z; + D_ctx_80176EB8[actor->unk_046][actor->unk_04E] = actor->obj.rot.x; + D_ctx_801771D8[actor->unk_046][actor->unk_04E] = actor->obj.rot.y; + D_ctx_80177500[actor->unk_046][actor->unk_04E] = actor->obj.rot.z; actor->obj.rot.x -= 10.0f; actor->obj.rot.y += 3.0f; @@ -271,11 +271,11 @@ void func_8006B0A0(Actor* actor) { if ((actor->timer_0BC == 0) && !(gGameFrameCount & 3)) { temp_hi = (D_800CFF94[actor->unk_04A] + actor->unk_04E) % 100; if (actor->unk_04A == 0) { - func_8007D2C8(D_80176558[actor->unk_046][temp_hi], D_80176878[actor->unk_046][temp_hi], - D_80176B98[actor->unk_046][temp_hi], 7.0f); + func_effect_8007D2C8(D_ctx_80176558[actor->unk_046][temp_hi], D_ctx_80176878[actor->unk_046][temp_hi], + D_ctx_80176B98[actor->unk_046][temp_hi], 7.0f); } else { - func_8007D2C8(D_80176558[actor->unk_046][temp_hi], D_80176878[actor->unk_046][temp_hi], - D_80176B98[actor->unk_046][temp_hi], 4.0f); + func_effect_8007D2C8(D_ctx_80176558[actor->unk_046][temp_hi], D_ctx_80176878[actor->unk_046][temp_hi], + D_ctx_80176B98[actor->unk_046][temp_hi], 4.0f); } AUDIO_PLAY_SFX(0x2903B009, actor->sfxSource, 4); @@ -283,19 +283,19 @@ void func_8006B0A0(Actor* actor) { if (actor->unk_04A > 15) { Object_Kill(&actor->obj, actor->sfxSource); - D_80176550[actor->unk_046] = 0; + D_ctx_80176550[actor->unk_046] = 0; gHitCount += actor->info.bonus; - D_80177850 = 15; + D_ctx_80177850 = 15; } } } -void func_8006B46C(Actor* actor, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, u8 arg7, f32 arg8, - s32 arg9) { +void func_enmy2_8006B46C(Actor* actor, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, u8 arg7, f32 arg8, + s32 arg9) { Vec3f sp34 = { 0.0f, 0.0f, 0.0f }; Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, arg1, arg2, arg3 + D_80177D20, 1); + Matrix_Translate(gGfxMatrix, arg1, arg2, arg3 + D_ctx_80177D20, 1); if (arg7 != 1) { Matrix_RotateY(gGfxMatrix, M_DTOR * arg5, 1); @@ -310,8 +310,8 @@ void func_8006B46C(Actor* actor, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); if ((arg7 == 0) && (actor->timer_0CA[0] != 0)) { sp34.y += actor->info.unk_1C; - Matrix_MultVec3f(gGfxMatrix, &sp34, D_80161578); - if (D_80161578->z > -500.0f) { + Matrix_MultVec3f(gGfxMatrix, &sp34, D_display_80161578); + if (D_display_80161578->z > -500.0f) { actor->timer_0CA[0] = 0; } } @@ -329,20 +329,20 @@ void func_8006B46C(Actor* actor, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } -void func_8006B74C(Actor* actor) { +void func_enmy2_8006B74C(Actor* actor) { s16 var_s0; s16 temp_hi; for (var_s0 = actor->unk_04A; var_s0 < 16; var_s0++) { temp_hi = (D_800CFF94[var_s0] + actor->unk_04E) % 100; - func_8006B46C(actor, D_80176558[actor->unk_046][temp_hi], D_80176878[actor->unk_046][temp_hi], - D_80176B98[actor->unk_046][temp_hi], D_80176EB8[actor->unk_046][temp_hi], - D_801771D8[actor->unk_046][temp_hi], D_80177500[actor->unk_046][temp_hi], D_800CFFB4[var_s0], - D_800CFFC4[var_s0], actor->timer_0C6 & 1); + func_enmy2_8006B46C(actor, D_ctx_80176558[actor->unk_046][temp_hi], D_ctx_80176878[actor->unk_046][temp_hi], + D_ctx_80176B98[actor->unk_046][temp_hi], D_ctx_80176EB8[actor->unk_046][temp_hi], + D_ctx_801771D8[actor->unk_046][temp_hi], D_ctx_80177500[actor->unk_046][temp_hi], + D_800CFFB4[var_s0], D_800CFFC4[var_s0], actor->timer_0C6 & 1); } } -void func_8006B95C(Object_80* obj80) { +void func_enmy2_8006B95C(Object_80* obj80) { obj80->obj.pos.x += obj80->vel.x; obj80->obj.pos.y += obj80->vel.y; obj80->obj.pos.z += obj80->vel.z; @@ -368,7 +368,7 @@ void func_8006B95C(Object_80* obj80) { } } -void func_8006BA64(Effect* effect, f32 xPos, f32 yPos, f32 zPos) { +void func_enmy2_8006BA64(Effect* effect, f32 xPos, f32 yPos, f32 zPos) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_375; @@ -384,18 +384,18 @@ void func_8006BA64(Effect* effect, f32 xPos, f32 yPos, f32 zPos) { Object_SetInfo(&effect->info, effect->obj.id); } -void func_8006BB1C(f32 xPos, f32 yPos, f32 zPos) { +void func_enmy2_8006BB1C(f32 xPos, f32 yPos, f32 zPos) { s32 i; for (i = 0; i < ARRAY_COUNT(gEffects); i++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8006BA64(&gEffects[i], xPos, yPos, zPos); + func_enmy2_8006BA64(&gEffects[i], xPos, yPos, zPos); break; } } } -void func_8006BB78(Actor* actor) { +void func_enmy2_8006BB78(Actor* actor) { Vec3f sp44; switch (actor->state) { @@ -446,7 +446,8 @@ void func_8006BB78(Actor* actor) { case 3: if (actor->timer_0BC == 1) { - func_8007F11C(OBJ_EFFECT_353, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, D_80177828); + func_effect_8007F11C(OBJ_EFFECT_353, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, + D_ctx_80177828); } if (actor->vel.y < 12.0f) { Math_SmoothStepToF(&actor->obj.rot.x, 180.0f, 0.1f, 7.0f, 0.01f); @@ -470,34 +471,34 @@ void func_8006BB78(Actor* actor) { } if ((actor->obj.pos.y <= (gGroundLevel + 10.0f)) && !(gGameFrameCount & 7)) { - func_8006BB1C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z); + func_enmy2_8006BB1C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z); } if (!(gGameFrameCount & 7)) { - func_8006A900(RAND_FLOAT_CENTERED(50.0f) + actor->obj.pos.x, actor->obj.pos.y + 10.0f, - RAND_FLOAT_CENTERED(50.0f) + actor->obj.pos.z, 0.5f); + func_enmy2_8006A900(RAND_FLOAT_CENTERED(50.0f) + actor->obj.pos.x, actor->obj.pos.y + 10.0f, + RAND_FLOAT_CENTERED(50.0f) + actor->obj.pos.z, 0.5f); } if ((actor->unk_0D0 != 0) && (actor->unk_0B6 != 0)) { - func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 0.0f, actor->vel.y, 0.0f, 3.0f, 5); + func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 0.0f, actor->vel.y, 0.0f, 3.0f, 5); Object_Kill(&actor->obj, actor->sfxSource); actor->unk_044 = 1; - func_80066254(actor); + func_enmy_80066254(actor); } actor->unk_0D0 = 0; } -f32 D_800D001C[5] = { 0.0f, 30.0f, 60.0f, -60.0f, -30.0f }; // could be in-function -void func_8006BF7C(f32 xPos, f32 yPos, f32 zPos) { +static f32 D_800D001C[5] = { 0.0f, 30.0f, 60.0f, -60.0f, -30.0f }; // could be in-function +void func_enmy2_8006BF7C(f32 xPos, f32 yPos, f32 zPos) { s32 i; for (i = 0; i < ARRAY_COUNT(D_800D001C); i++) { - func_8006A900(xPos + D_800D001C[i], yPos, zPos, 6.0f); + func_enmy2_8006A900(xPos + D_800D001C[i], yPos, zPos, 6.0f); } } -Vec3f D_800D0030 = { 0.0f, -10.0f, 0.0f }; // could be in-function -void func_8006C008(Actor* actor) { +static Vec3f D_800D0030 = { 0.0f, -10.0f, 0.0f }; // could be in-function +void func_enmy2_8006C008(Actor* actor) { f32 sp4C; f32 sp48; f32 sp44; @@ -515,7 +516,7 @@ void func_8006C008(Actor* actor) { actor->obj.rot.z += actor->fwork[2]; if (((actor->unk_04A & 1) == 1) && !(actor->timer_0BC & 3)) { - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->scale); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->scale); } if ((actor->fwork[5] + actor->obj.pos.y) < 0.0f) { @@ -566,7 +567,7 @@ void func_8006C008(Actor* actor) { actor->obj.rot.y += actor->fwork[1]; actor->obj.rot.z += actor->fwork[2]; - func_i5_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_80177D20, &sp4C, &sp48, &sp4C); + Ground_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_ctx_80177D20, &sp4C, &sp48, &sp4C); if (actor->obj.pos.y < sp48) { actor->obj.pos.y = sp48; @@ -586,7 +587,7 @@ void func_8006C008(Actor* actor) { break; case 47: - func_i5_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_80177D20, &sp4C, &sp48, &sp4C); + Ground_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_ctx_80177D20, &sp4C, &sp48, &sp4C); if (actor->obj.pos.y < actor->fwork[3] + (-100.0f + sp48)) { actor->obj.pos.y = actor->fwork[3] + sp48; @@ -606,12 +607,12 @@ void func_8006C008(Actor* actor) { actor->obj.rot.z += actor->fwork[2]; if ((actor->iwork[0] == 1) && !(gGameFrameCount & 7)) { - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 2.0f); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 2.0f); } if (actor->iwork[2] == 1) { if ((actor->iwork[1] == 1) && ((actor->unk_048 == 8) || (actor->unk_048 == 9))) { - func_8007D2C8(actor->obj.pos.x, sp48 + 20.0f, actor->obj.pos.z, 8.0f); + func_effect_8007D2C8(actor->obj.pos.x, sp48 + 20.0f, actor->obj.pos.z, 8.0f); } Object_Kill(&actor->obj, actor->sfxSource); } @@ -623,23 +624,25 @@ void func_8006C008(Actor* actor) { case 52: case 53: case 55: - if (((actor->timer_0BC == 0) || (func_8006351C(actor->index, &actor->obj.pos, &D_800D0030, 1) != 0) || + if (((actor->timer_0BC == 0) || (func_enmy_8006351C(actor->index, &actor->obj.pos, &D_800D0030, 1) != 0) || (actor->obj.pos.y < (gGroundLevel + 10.0f))) && (actor->timer_0BE == 0)) { - func_8007B8F8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 50.0f, actor->scale * 10.0f); + func_effect_8007B8F8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 50.0f, + actor->scale * 10.0f); Object_Kill(&actor->obj, actor->sfxSource); - func_8007A6F0(&actor->obj.pos, 0x2903A008); + func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); } break; case 56: Math_SmoothStepToF(&actor->scale, 0.0f, 0.1f, 2.0f, 0.0001f); - if (((actor->timer_0BC == 0) || (func_8006351C(actor->index, &actor->obj.pos, &D_800D0030, 1) != 0) || + if (((actor->timer_0BC == 0) || (func_enmy_8006351C(actor->index, &actor->obj.pos, &D_800D0030, 1) != 0) || (actor->obj.pos.y < (gGroundLevel + 10.0f))) && (actor->timer_0BE == 0)) { - func_8007B8F8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 50.0f, actor->scale * 10.0f); + func_effect_8007B8F8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 50.0f, + actor->scale * 10.0f); Object_Kill(&actor->obj, actor->sfxSource); - func_8007A6F0(&actor->obj.pos, 0x2903A008); + func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); } break; @@ -655,35 +658,38 @@ void func_8006C008(Actor* actor) { actor->obj.rot.y += actor->fwork[1]; actor->obj.rot.z += actor->fwork[2]; - if (((actor->timer_0BC == 0) || (func_8006351C(actor->index, &actor->obj.pos, &D_800D0030, 1) != 0) || + if (((actor->timer_0BC == 0) || (func_enmy_8006351C(actor->index, &actor->obj.pos, &D_800D0030, 1) != 0) || (actor->obj.pos.y < (gGroundLevel + 10.0f))) && (actor->timer_0BE == 0)) { - func_8007B8F8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 50.0f, actor->scale * 10.0f); + func_effect_8007B8F8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 50.0f, + actor->scale * 10.0f); Object_Kill(&actor->obj, actor->sfxSource); - func_8007A6F0(&actor->obj.pos, 0x2903A008); + func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); } break; case 54: - if (((actor->timer_0BC == 0) || (func_8006351C(actor->index, &actor->obj.pos, &D_800D0030, 1) != 0) || + if (((actor->timer_0BC == 0) || (func_enmy_8006351C(actor->index, &actor->obj.pos, &D_800D0030, 1) != 0) || (actor->obj.pos.y < (gGroundLevel + 10.0f))) && (actor->timer_0BE == 0)) { - func_8007B8F8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 70.0f, actor->scale * 20.0f); - func_8007B8F8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 70.0f, actor->scale * 20.0f); + func_effect_8007B8F8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 70.0f, + actor->scale * 20.0f); + func_effect_8007B8F8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 70.0f, + actor->scale * 20.0f); Object_Kill(&actor->obj, actor->sfxSource); - func_8007A6F0(&actor->obj.pos, 0x2903A008); + func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); } break; case 50: if ((actor->iwork[0] == 2) && (actor->timer_0BC == 0)) { - func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 5.0f); + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 5.0f); actor->timer_0BC = 4; } actor->obj.rot.x += actor->fwork[0]; actor->obj.rot.y += actor->fwork[1]; actor->obj.rot.z += actor->fwork[2]; - if (func_8006351C(actor->index, &actor->obj.pos, &D_800C9F2C, 1) != 0) { + if (func_enmy_8006351C(actor->index, &actor->obj.pos, &D_tank_800C9F2C, 1) != 0) { actor->vel.x *= -0.7f; } if (actor->obj.pos.y < gGroundLevel) { @@ -696,7 +702,7 @@ void func_8006C008(Actor* actor) { actor->obj.rot.y += actor->fwork[1]; actor->obj.rot.z += actor->fwork[2]; - if (func_8006351C(actor->index, &actor->obj.pos, &D_800C9F2C, 1) != 0) { + if (func_enmy_8006351C(actor->index, &actor->obj.pos, &D_tank_800C9F2C, 1) != 0) { actor->vel.x *= -0.7f; } @@ -731,49 +737,53 @@ void func_8006C008(Actor* actor) { actor->obj.rot.z += actor->fwork[12]; if (actor->state == 0x46) { - if ((actor->timer_0BC == 0) || (func_8006351C(actor->index, &actor->obj.pos, &D_800D0030, 1) != 0) || + if ((actor->timer_0BC == 0) || + (func_enmy_8006351C(actor->index, &actor->obj.pos, &D_800D0030, 1) != 0) || (actor->obj.pos.y < (gGroundLevel + 10.0f))) { Object_Kill(&actor->obj, actor->sfxSource); } } else if (actor->state == 0x27) { - if (((actor->timer_0BC == 0) || (func_8006351C(actor->index, &actor->obj.pos, &D_800D0030, 1) != 0) || + if (((actor->timer_0BC == 0) || + (func_enmy_8006351C(actor->index, &actor->obj.pos, &D_800D0030, 1) != 0) || (actor->obj.pos.y < (gGroundLevel + 10.0f))) && (actor->timer_0BE == 0)) { - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); Object_Kill(&actor->obj, actor->sfxSource); - func_8007A6F0(&actor->obj.pos, 0x2903A008); + func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); } } else if (((actor->state >= 0x29) && (actor->state < 0x2D)) || (actor->state == 0x3B)) { - if (((actor->timer_0BC == 0) || (func_8006351C(actor->index, &actor->obj.pos, &D_800D0030, 1) != 0)) && + if (((actor->timer_0BC == 0) || + (func_enmy_8006351C(actor->index, &actor->obj.pos, &D_800D0030, 1) != 0)) && (actor->timer_0BE == 0)) { - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 2.0f * actor->scale); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 2.0f * actor->scale); Object_Kill(&actor->obj, actor->sfxSource); - func_8007A6F0(&actor->obj.pos, 0x2903A008); + func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); } - if (func_800A73E4(&sp44, &sp40, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z)) { - func_8007B228(actor->obj.pos.x, sp44, actor->obj.pos.z, 2.0f); + if (func_play_800A73E4(&sp44, &sp40, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z)) { + func_effect_8007B228(actor->obj.pos.x, sp44, actor->obj.pos.z, 2.0f); Object_Kill(&actor->obj, actor->sfxSource); } } else if (actor->state >= 0xA) { if (!(actor->timer_0BC & 3)) { - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->scale); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->scale); } - if (((actor->timer_0BC == 0) || (func_8006351C(actor->index, &actor->obj.pos, &D_800D0030, 1) != 0) || + if (((actor->timer_0BC == 0) || + (func_enmy_8006351C(actor->index, &actor->obj.pos, &D_800D0030, 1) != 0) || (actor->obj.pos.y < (gGroundLevel + 10.0f))) && (actor->timer_0BE == 0)) { - func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->vel.x, actor->vel.y, - actor->vel.z, actor->scale * 1.5f, 4); + func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->vel.x, + actor->vel.y, actor->vel.z, actor->scale * 1.5f, 4); Object_Kill(&actor->obj, actor->sfxSource); - func_8007A6F0(&actor->obj.pos, 0x2903A008); + func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); } } else { if ((actor->state == 3) && !(actor->timer_0BC & 7)) { - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.5f); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.5f); } - if ((func_8006351C(actor->index, &actor->obj.pos, &D_800D0030, 1) != 0) || + if ((func_enmy_8006351C(actor->index, &actor->obj.pos, &D_800D0030, 1) != 0) || (actor->obj.pos.y < (gGroundLevel + 10.0f))) { if (gLevelType == LEVELTYPE_SPACE) { - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 2.0f); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 2.0f); Object_Kill(&actor->obj, actor->sfxSource); return; } @@ -787,14 +797,14 @@ void func_8006C008(Actor* actor) { } if ((actor->state != 2) && (actor->state != 4)) { - func_8006BF7C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z); + func_enmy2_8006BF7C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z); } else if (gCurrentLevel == LEVEL_FORTUNA) { - func_8007BC7C(RAND_FLOAT_CENTERED(10.0f) + actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, - 1.0f); - func_8007BC7C(RAND_FLOAT_CENTERED(10.0f) + actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, - 1.0f); - func_8007BC7C(RAND_FLOAT_CENTERED(10.0f) + actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, - 1.0f); + func_effect_8007BC7C(RAND_FLOAT_CENTERED(10.0f) + actor->obj.pos.x, actor->obj.pos.y, + actor->obj.pos.z, 1.0f); + func_effect_8007BC7C(RAND_FLOAT_CENTERED(10.0f) + actor->obj.pos.x, actor->obj.pos.y, + actor->obj.pos.z, 1.0f); + func_effect_8007BC7C(RAND_FLOAT_CENTERED(10.0f) + actor->obj.pos.x, actor->obj.pos.y, + actor->obj.pos.z, 1.0f); } } @@ -804,7 +814,7 @@ void func_8006C008(Actor* actor) { } } else { if (actor->timer_0BC & 1) { - func_8007D24C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f); + func_effect_8007D24C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f); } if ((gLevelType == LEVELTYPE_SPACE) && (actor->timer_0BC == 0)) { Object_Kill(&actor->obj, actor->sfxSource); @@ -815,7 +825,7 @@ void func_8006C008(Actor* actor) { } } -void func_8006D0F4(Actor* actor) { +void func_enmy2_8006D0F4(Actor* actor) { s32 i; s32 j; f32* hitboxData; @@ -830,11 +840,11 @@ void func_8006D0F4(Actor* actor) { D_80161A7C = 110; D_80161A80 = 110; D_80161A84 = 110; - D_80178544 = 40; + D_ctx_80178544 = 40; for (i = 0; i < ARRAY_COUNT(gObjects80); i++) { if ((gObjects80[i].obj.status == OBJ_ACTIVE) && ((gPlayer[0].unk_138 - 3000.0f) < gObjects80[i].obj.pos.z)) { - hitboxData = D_800CF964[gObjects80[i].obj.id]; + hitboxData = D_edata_800CF964[gObjects80[i].obj.id]; count = *hitboxData; if (count != 0) { Matrix_RotateY(gCalcMatrix, -gObjects80[i].obj.rot.y * M_DTOR, 0); @@ -852,8 +862,8 @@ void func_8006D0F4(Actor* actor) { for (j = 0; j < count; j++) { hitbox = (Hitbox*) hitboxData; - if (func_800A78C4(hitbox, gObjects80[i].obj.pos.x, gObjects80[i].obj.pos.y, gObjects80[i].obj.pos.z, - temp_fs0, temp_fs1, temp_fs2)) { + if (func_play_800A78C4(hitbox, gObjects80[i].obj.pos.x, gObjects80[i].obj.pos.y, + gObjects80[i].obj.pos.z, temp_fs0, temp_fs1, temp_fs2)) { D_80161A7C = 10; D_80161A80 = 10; D_80161A84 = 10; @@ -866,35 +876,35 @@ void func_8006D0F4(Actor* actor) { } } -void func_8006D350(Object_80* obj80) { +void func_enmy2_8006D350(Object_80* obj80) { obj80->obj.rot.z += 1.0f; } -UnkStruct_D003C D_800D003C[108] = { - { D_ENMY_PLANET_40068F0, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, - { D_ENMY_PLANET_4006E90, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, - { NULL, D_800CBE8C, 1.0f, 20000.0f, 3000.0f, 1, 0, 2, 0, 0.0f, 0 }, - { D_ENMY_PLANET_4009800, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, - { D_ENMY_PLANET_40073C0, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, - { D_ENMY_PLANET_4007AF0, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, - { NULL, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, - { D_CO_6011F90, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 0.0f, 1 }, - { D_ENMY_PLANET_4000710, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 2, 0, 1, 1, 1.0f, 1 }, - { NULL, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 6, 0, 1.0f, 1 }, - { D_ENMY_SPACE_400BD20, D_800CBEC4, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, - { D_ENMY_SPACE_4001310, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 6, 0, 1.0f, 1 }, - { D_ENMY_SPACE_400B390, D_800CBE8C, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, - { D_ME_6018C00, D_800CBE8C, 2.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, - { D_ME_601F2A0, D_800CBEFC, 7.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, - { D_ENMY_SPACE_400AAE0, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, - { D_ENMY_SPACE_4000650, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 6, 0, 1.0f, 1 }, +static UnkStruct_D003C D_800D003C[108] = { + { D_ENMY_PLANET_40068F0, D_edata_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { D_ENMY_PLANET_4006E90, D_edata_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { NULL, D_edata_800CBE8C, 1.0f, 20000.0f, 3000.0f, 1, 0, 2, 0, 0.0f, 0 }, + { D_ENMY_PLANET_4009800, D_edata_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, + { D_ENMY_PLANET_40073C0, D_edata_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { D_ENMY_PLANET_4007AF0, D_edata_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { NULL, D_edata_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, + { D_CO_6011F90, D_edata_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 0.0f, 1 }, + { D_ENMY_PLANET_4000710, D_edata_800CBE8C, 1.0f, 100.0f, 3000.0f, 2, 0, 1, 1, 1.0f, 1 }, + { NULL, D_edata_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 6, 0, 1.0f, 1 }, + { D_ENMY_SPACE_400BD20, D_edata_800CBEC4, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { D_ENMY_SPACE_4001310, D_edata_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 6, 0, 1.0f, 1 }, + { D_ENMY_SPACE_400B390, D_edata_800CBE8C, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { D_ME_6018C00, D_edata_800CBE8C, 2.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { D_ME_601F2A0, D_edata_800CBEFC, 7.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { D_ENMY_SPACE_400AAE0, D_edata_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { D_ENMY_SPACE_4000650, D_edata_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 6, 0, 1.0f, 1 }, { D_A6_6016190, D_A6_60282A0, -2.0f, 2100.0f, 3000.0f, 0, 0, 7, 0, 0.0f, 5 }, - { D_SX_6023500, D_800CBEC4, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, - { D_SX_6022DF0, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, - { NULL, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 2, 1, 1, 0, 0.0f, 1 }, - { NULL, D_800CBEC4, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 0.0f, 1 }, - { NULL, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 0.0f, 1 }, - { D_ENMY_SPACE_4008FA0, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { D_SX_6023500, D_edata_800CBEC4, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { D_SX_6022DF0, D_edata_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { NULL, D_edata_800CBE8C, 1.0f, 100.0f, 3000.0f, 2, 1, 1, 0, 0.0f, 1 }, + { NULL, D_edata_800CBEC4, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 0.0f, 1 }, + { NULL, D_edata_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 0.0f, 1 }, + { D_ENMY_SPACE_4008FA0, D_edata_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, { D_SX_60285F0, D_SX_603298C, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, { D_SX_600AF70, D_SX_6032904, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, { D_SX_6023E30, D_SX_6032970, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, @@ -904,89 +914,89 @@ UnkStruct_D003C D_800D003C[108] = { { D_A6_6012A40, D_A6_6028254, -2.0f, 2100.0f, 3001.0f, 0, 0, 7, 0, 0.0f, 2 }, { NULL, D_A6_60280E0, -2.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 3 }, { D_SX_6009950, D_SX_6032878, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, - { NULL, D_800CBEC4, 2.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, + { NULL, D_edata_800CBEC4, 2.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, { D_SX_600B2B0, D_SX_6032894, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, { D_SX_600A2E0, D_SX_60328B0, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, - { NULL, D_800CBEFC, 2.0f, 200.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, - { D_SX_600B830, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { NULL, D_edata_800CBEFC, 2.0f, 200.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { D_SX_600B830, D_edata_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, { NULL, D_SX_603238C, 1.0f, 500.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, { D_SX_6020D20, D_SX_60328CC, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, - { NULL, D_800CBF34, 1.0f, 100.0f, 3001.0f, 2, 0, 0, 0, 0.0f, 1 }, + { NULL, D_edata_800CBF34, 1.0f, 100.0f, 3001.0f, 2, 0, 0, 0, 0.0f, 1 }, { D_SY_60097E0, D_SY_6034478, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, { D_SY_601D730, D_SY_603450C, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, - { NULL, D_800CBE8C, 1.0f, 20000.0f, 3000.0f, 1, 0, 2, 0, 0.0f, 0 }, + { NULL, D_edata_800CBE8C, 1.0f, 20000.0f, 3000.0f, 1, 0, 2, 0, 0.0f, 0 }, { D_SY_60102C0, D_SY_6034588, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, - { D_ME_6017B60, D_800CBEC4, -1.0f, 300.0f, 3001.0f, 0, 0, 0, 0, 1.0f, 1 }, - { D_ZO_6004D00, D_800CBEC4, 1.0f, 100.0f, 3000.0f, 1, 0, 4, 0, 1.0f, 1 }, - { D_ME_601A880, D_800CBE8C, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, + { D_ME_6017B60, D_edata_800CBEC4, -1.0f, 300.0f, 3001.0f, 0, 0, 0, 0, 1.0f, 1 }, + { D_ZO_6004D00, D_edata_800CBEC4, 1.0f, 100.0f, 3000.0f, 1, 0, 4, 0, 1.0f, 1 }, + { D_ME_601A880, D_edata_800CBE8C, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, { NULL, D_SY_603405C, 0.3f, 100.0f, 3000.0f, 0, 0, 1, 0, 1.0f, 1 }, { NULL, D_SY_603405C, 0.3f, 100.0f, 3000.0f, 0, 0, 1, 0, 1.0f, 1 }, { NULL, D_SY_603405C, 0.3f, 100.0f, 3000.0f, 0, 0, 1, 0, 1.0f, 1 }, { D_SY_6015D60, D_SY_6034124, 2.0f, 100.0f, 3000.0f, 0, 0, 1, 0, 1.0f, 1 }, { NULL, D_ZO_602C1A0, -1.0f, 1000.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, { D_SX_600B540, D_SX_60328E8, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, - { D_ENMY_SPACE_4000EC0, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, - { D_ENMY_SPACE_4008D50, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, - { NULL, D_800CBF34, -1.0f, 2000.0f, 3000.0f, 0, 0, 3, 0, 0.0f, 1 }, - { D_SY_60102C0, D_800CBF34, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, - { D_SY_601F3D0, D_800CBF34, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, - { D_SY_6022B10, D_800CBF34, 2.0f, 100.0f, 3000.0f, 0, 0, 1, 0, 0.0f, 1 }, - { D_SY_60209F0, D_800CBF34, 2.0f, 100.0f, 3000.0f, 0, 0, 1, 0, 0.0f, 1 }, - { D_ME_6019430, D_800CBEC4, 2.5f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, - { D_ME_6018960, D_800CBE8C, 2.5f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, - { D_ME_6009F50, D_800CBF34, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, - { NULL, D_800CBEC4, 3.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, - { D_ME_600C2A0, D_800CBEC4, -1.0f, 100.0f, 8000.0f, 1, 0, 0, 0, 0.0f, 1 }, - { D_ME_600BD40, D_800CBE8C, -1.0f, 100.0f, 8000.0f, 1, 0, 0, 0, 0.0f, 1 }, + { D_ENMY_SPACE_4000EC0, D_edata_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { D_ENMY_SPACE_4008D50, D_edata_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { NULL, D_edata_800CBF34, -1.0f, 2000.0f, 3000.0f, 0, 0, 3, 0, 0.0f, 1 }, + { D_SY_60102C0, D_edata_800CBF34, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_SY_601F3D0, D_edata_800CBF34, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_SY_6022B10, D_edata_800CBF34, 2.0f, 100.0f, 3000.0f, 0, 0, 1, 0, 0.0f, 1 }, + { D_SY_60209F0, D_edata_800CBF34, 2.0f, 100.0f, 3000.0f, 0, 0, 1, 0, 0.0f, 1 }, + { D_ME_6019430, D_edata_800CBEC4, 2.5f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, + { D_ME_6018960, D_edata_800CBE8C, 2.5f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, + { D_ME_6009F50, D_edata_800CBF34, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, + { NULL, D_edata_800CBEC4, 3.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, + { D_ME_600C2A0, D_edata_800CBEC4, -1.0f, 100.0f, 8000.0f, 1, 0, 0, 0, 0.0f, 1 }, + { D_ME_600BD40, D_edata_800CBE8C, -1.0f, 100.0f, 8000.0f, 1, 0, 0, 0, 0.0f, 1 }, { NULL, D_ME_602F604, 3.0f, 100.0f, 3000.0f, 2, 0, 1, 0, 1.0f, 1 }, { D_SY_60205D0, D_SY_603445C, 3.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, { D_SY_60036A0, D_SY_6034664, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, - { D_SY_601AD70, D_800CBF34, 4.0f, 100.0f, 3000.0f, 0, 0, 1, 0, 0.0f, 1 }, - { D_arwing_3007650, D_800CBF34, 1.0f, 100.0f, 3000.0f, 2, 0, 5, 0, 0.0f, 1 }, + { D_SY_601AD70, D_edata_800CBF34, 4.0f, 100.0f, 3000.0f, 0, 0, 1, 0, 0.0f, 1 }, + { D_arwing_3007650, D_edata_800CBF34, 1.0f, 100.0f, 3000.0f, 2, 0, 5, 0, 0.0f, 1 }, { D_SY_60034D0, D_SY_60347D4, 3.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, { D_SY_6005360, D_SY_6034770, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, { D_SY_600F6C0, D_SY_60347F0, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, - { D_SY_601B610, D_800CBF34, -1.0f, 10000.0f, 3001.0f, 0, 0, 1, 0, 0.0f, 1 }, - { D_SY_601C6A0, D_800CBF34, -1.0f, 10000.0f, 3001.0f, 0, 0, 1, 0, 0.0f, 1 }, + { D_SY_601B610, D_edata_800CBF34, -1.0f, 10000.0f, 3001.0f, 0, 0, 1, 0, 0.0f, 1 }, + { D_SY_601C6A0, D_edata_800CBF34, -1.0f, 10000.0f, 3001.0f, 0, 0, 1, 0, 0.0f, 1 }, { D_SY_60188D0, D_SY_603486C, 3.0f, 100.0f, 3001.0f, 0, 0, 1, 0, 0.0f, 1 }, - { NULL, D_800CBEA8, 1.0f, 100.0f, 3000.0f, 2, 0, 0, 0, 1.0f, 0 }, + { NULL, D_edata_800CBEA8, 1.0f, 100.0f, 3000.0f, 2, 0, 0, 0, 1.0f, 0 }, { NULL, D_ZO_602C294, 1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 1.0f, 1 }, { NULL, D_VE1_601B474, -1.0f, 100.0f, 3000.0f, 2, 0, 0, 0, 0.0f, 1 }, - { NULL, D_800CBF34, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, - { NULL, D_800CBE8C, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { NULL, D_edata_800CBF34, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, + { NULL, D_edata_800CBE8C, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, { NULL, D_AQ_6030B4C, 1.0f, 100.0f, 3000.0f, 2, 0, 0, 0, 60.0f, 1 }, { D_VE1_9012180, D_VE1_601B43C, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, - { NULL, D_800CBE8C, 1.0f, 20000.0f, 3000.0f, 1, 0, 2, 0, 0.0f, 0 }, - { NULL, D_800CBE8C, 1.0f, 20000.0f, 3000.0f, 1, 0, 2, 0, 0.0f, 0 }, - { D_VE1_900EFC0, D_800CBF34, 1.0f, 100.0f, 3000.0f, 1, 1, 0, 0, 0.0f, 1 }, + { NULL, D_edata_800CBE8C, 1.0f, 20000.0f, 3000.0f, 1, 0, 2, 0, 0.0f, 0 }, + { NULL, D_edata_800CBE8C, 1.0f, 20000.0f, 3000.0f, 1, 0, 2, 0, 0.0f, 0 }, + { D_VE1_900EFC0, D_edata_800CBF34, 1.0f, 100.0f, 3000.0f, 1, 1, 0, 0, 0.0f, 1 }, { NULL, D_AQ_6030B30, 1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, { NULL, D_AQ_6030B14_f32, 1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, { D_MA_601C520, D_MA_60368FC, 1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, { D_MA_600AF40, D_MA_60368E0, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, - { D_WZ_7000C40, D_800CC0D4, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, - { D_WZ_70010E0, D_800CC0F0, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, - { D_WZ_7000E80, D_800CC054, 2.5f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, - { D_WZ_70008F0, D_800CBE8C, -1.0f, 100.0f, 8000.0f, 1, 0, 0, 0, 0.0f, 0 }, - { D_WZ_7000280, D_800CC070, -1.0f, 1000.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 0 }, - { D_ME_600AC70, D_800CBE8C, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, + { D_WZ_7000C40, D_edata_800CC0D4, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_WZ_70010E0, D_edata_800CC0F0, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_WZ_7000E80, D_edata_800CC054, 2.5f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, + { D_WZ_70008F0, D_edata_800CBE8C, -1.0f, 100.0f, 8000.0f, 1, 0, 0, 0, 0.0f, 0 }, + { D_WZ_7000280, D_edata_800CC070, -1.0f, 1000.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 0 }, + { D_ME_600AC70, D_edata_800CBE8C, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, { D_MA_601A2B0, D_MA_60364C0, 1.0f, 100.0f, 3000.0f, 1, 1, 0, 0, 0.0f, 1 }, { D_VE1_6002500, D_VE1_601B944, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, - { D_VE1_60043F0, D_800CBF34, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, - { D_VE1_6004310, D_800CBF34, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_VE1_60043F0, D_edata_800CBF34, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_VE1_6004310, D_edata_800CBF34, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, { D_TR_6002740, D_TR_6009D18, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, - { NULL, D_800CBF34, -1.0f, 500.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 0 }, - { NULL, D_800CBF34, -1.0f, 500.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 0 }, - { NULL, D_800CBEC4, 1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 1.0f, 1 }, - { NULL, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 0, 0, 6, 0, 0.0f, 0 }, + { NULL, D_edata_800CBF34, -1.0f, 500.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 0 }, + { NULL, D_edata_800CBF34, -1.0f, 500.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 0 }, + { NULL, D_edata_800CBEC4, 1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 1.0f, 1 }, + { NULL, D_edata_800CBE8C, 1.0f, 100.0f, 3000.0f, 0, 0, 6, 0, 0.0f, 0 }, { D_MA_6002890, D_MA_60368E0, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, }; -u8 D_800D0DBC[6][4] = { +static u8 D_800D0DBC[6][4] = { // could be in-function { 255, 255, 255, 255 }, { 160, 160, 255, 255 }, { 80, 80, 255, 255 }, { 80, 255, 80, 255 }, { 255, 80, 80, 255 }, { 255, 255, 80, 255 }, }; -void func_8006D36C(Actor* actor) { +void func_enmy2_8006D36C(Actor* actor) { u16** levelScripts; u16* actorScript; u16* msg; @@ -1075,16 +1085,16 @@ void func_8006D36C(Actor* actor) { if ((actor->unk_0B4 >= 200) && (actor->unk_0B4 < 300)) { actor->unk_046 = 100; - actor->info.hitbox = D_800CBEC4; + actor->info.hitbox = D_edata_800CBEC4; actor->info.unk_1C = 1.0f; for (i = 0; i < 2; i++) { - if (D_80176550[i] == 0) { - D_80176550[i] = 1; + if (D_ctx_80176550[i] == 0) { + D_ctx_80176550[i] = 1; actor->unk_046 = i; for (j = 0; j < 100; j++) { - D_80176878[i][j] = actor->obj.pos.y; - D_80176B98[i][j] = actor->obj.pos.z; + D_ctx_80176878[i][j] = actor->obj.pos.y; + D_ctx_80176B98[i][j] = actor->obj.pos.z; } if (actor->unk_0B4 == 200) { AUDIO_PLAY_SFX(0x11032049, actor->sfxSource, 4); @@ -1178,37 +1188,37 @@ void func_8006D36C(Actor* actor) { } } } - func_8006D36C(actor); + func_enmy2_8006D36C(actor); break; case EVOP_105 << 9: actor->iwork[12] = actorScript[actor->aiIndex + 1]; if (actor->iwork[12] < 4) { - D_800CFF80[actor->iwork[12]] = actor->index; + D_enmy2_800CFF80[actor->iwork[12]] = actor->index; } actor->aiIndex += 2; - func_8006D36C(actor); + func_enmy2_8006D36C(actor); break; case EVOP_113 << 9: actor->iwork[15] = actorScript[actor->aiIndex + 1]; actor->iwork[16] = actorScript[actor->aiIndex] & 0x1FF; actor->aiIndex += 2; - func_8006D36C(actor); + func_enmy2_8006D36C(actor); break; case EVOP_3 << 9: - D_80177E78 = actor->index; - D_80177F10.x = actor->obj.pos.x; - D_80177F10.y = actor->obj.pos.y; - D_80177F10.z = actor->obj.pos.z; - D_80177E88.x = actor->obj.rot.x; - D_80177E88.y = actor->obj.rot.y; - D_80177E88.z = actor->obj.rot.z; + D_ctx_80177E78 = actor->index; + D_ctx_80177F10.x = actor->obj.pos.x; + D_ctx_80177F10.y = actor->obj.pos.y; + D_ctx_80177F10.z = actor->obj.pos.z; + D_ctx_80177E88.x = actor->obj.rot.x; + D_ctx_80177E88.y = actor->obj.rot.y; + D_ctx_80177E88.z = actor->obj.rot.z; actor->aiIndex += 2; - func_8006D36C(actor); + func_enmy2_8006D36C(actor); break; case EVOP_112 << 9: @@ -1220,7 +1230,7 @@ void func_8006D36C(Actor* actor) { } if (actorScript[actor->aiIndex + 1] == 15) { - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_800CBEC4); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_edata_800CBEC4); actor->state = 11; actor->aiIndex += 2; break; @@ -1237,19 +1247,19 @@ void func_8006D36C(Actor* actor) { } actor->aiIndex += 2; - func_8006D36C(actor); + func_enmy2_8006D36C(actor); break; case EVOP_116 << 9: actor->unk_044 = actorScript[actor->aiIndex + 1]; actor->aiIndex += 2; - func_8006D36C(actor); + func_enmy2_8006D36C(actor); break; case EVOP_118 << 9: Audio_SetBaseSfxReverb(actorScript[actor->aiIndex + 1]); actor->aiIndex += 2; - func_8006D36C(actor); + func_enmy2_8006D36C(actor); break; case EVOP_PLAY_MSG << 9: @@ -1258,7 +1268,7 @@ void func_8006D36C(Actor* actor) { Radio_PlayMessage(msg, actorScript[actor->aiIndex] & 0x1FF); } actor->aiIndex += 2; - func_8006D36C(actor); + func_enmy2_8006D36C(actor); break; case EVOP_119 << 9: @@ -1267,40 +1277,40 @@ void func_8006D36C(Actor* actor) { } D_80161A88 = actorScript[actor->aiIndex + 1]; actor->aiIndex += 2; - func_8006D36C(actor); + func_enmy2_8006D36C(actor); actor->obj.status = OBJ_FREE; break; case EVOP_56 << 9: - D_800CFF90 = actorScript[actor->aiIndex] & 0x1FF; - D_80161690 = actorScript[actor->aiIndex + 1]; + D_enmy2_800CFF90 = actorScript[actor->aiIndex] & 0x1FF; + D_enmy2_80161690 = actorScript[actor->aiIndex + 1]; actor->aiIndex += 2; - func_8006D36C(actor); + func_enmy2_8006D36C(actor); break; case EVOP_57 << 9: gTeamShields[actorScript[actor->aiIndex + 1]] = 0xFF; actor->aiIndex += 2; - func_8006D36C(actor); + func_enmy2_8006D36C(actor); break; case EVOP_58 << 9: func_8001D2FC(actor->sfxSource, actorScript[actor->aiIndex + 1]); actor->aiIndex += 2; - func_8006D36C(actor); + func_enmy2_8006D36C(actor); break; case EVOP_59 << 9: func_8001D3A0(actor->sfxSource, actorScript[actor->aiIndex + 1]); actor->aiIndex += 2; - func_8006D36C(actor); + func_enmy2_8006D36C(actor); break; case EVOP_122 << 9: SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 50); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 50); actor->aiIndex += 2; - func_8006D36C(actor); + func_enmy2_8006D36C(actor); break; case EVOP_121 << 9: @@ -1312,7 +1322,7 @@ void func_8006D36C(Actor* actor) { gTeamDamage[actorScript[actor->aiIndex + 1]] = actorScript[actor->aiIndex] & 0x1FF; } actor->aiIndex += 2; - func_8006D36C(actor); + func_enmy2_8006D36C(actor); break; case EVOP_MAKE_TEXLINE << 9: @@ -1333,13 +1343,13 @@ void func_8006D36C(Actor* actor) { } } actor->aiIndex += 2; - func_8006D36C(actor); + func_enmy2_8006D36C(actor); break; case EVOP_STOP_TEXLINE << 9: actor->iwork[7] = 0; actor->aiIndex += 2; - func_8006D36C(actor); + func_enmy2_8006D36C(actor); break; case EVOP_40 << 9: @@ -1372,7 +1382,7 @@ void func_8006D36C(Actor* actor) { case EVOP_45 << 9: actor->state = 1; - actor->iwork[1] = D_800CFF80[actorScript[actor->aiIndex] & 0x1FF]; + actor->iwork[1] = D_enmy2_800CFF80[actorScript[actor->aiIndex] & 0x1FF]; actor->fwork[17] = actorScript[actor->aiIndex + 1]; actor->timer_0BC = 0; actor->aiIndex += 2; @@ -1403,7 +1413,7 @@ void func_8006D36C(Actor* actor) { actor->iwork[2] = actorScript[actor->aiIndex + 1]; actor->iwork[3] = actorScript[actor->aiIndex] & 0x1FF; actor->aiIndex += 2; - func_8006D36C(actor); + func_enmy2_8006D36C(actor); break; case EVOP_LOOP << 9: @@ -1418,7 +1428,7 @@ void func_8006D36C(Actor* actor) { actor->aiIndex = 0; actor->iwork[0] = 0; } - func_8006D36C(actor); + func_enmy2_8006D36C(actor); break; case EVOP_48 << 9: @@ -1439,7 +1449,7 @@ void func_8006D36C(Actor* actor) { case EVOP_2 << 9: actor->fwork[22] = actorScript[actor->aiIndex + 1] & 0xFF; actor->aiIndex += 2; - func_8006D36C(actor); + func_enmy2_8006D36C(actor); break; case EVOP_SET_ACCEL << 9: @@ -1454,13 +1464,13 @@ void func_8006D36C(Actor* actor) { actor->timer_0C0 = actorScript[actor->aiIndex + 1]; actor->iwork[13] = 1; actor->aiIndex += 2; - func_8006D36C(actor); + func_enmy2_8006D36C(actor); break; case EVOP_8 << 9: actor->iwork[13] = 0; actor->aiIndex += 2; - func_8006D36C(actor); + func_enmy2_8006D36C(actor); break; case EVOP_9 << 9: @@ -1496,7 +1506,7 @@ void func_8006D36C(Actor* actor) { actor->fwork[5] = actorScript[actor->aiIndex + 1] * 0.1f; actor->fwork[6] = 1.0f; actor->aiIndex += 2; - func_8006D36C(actor); + func_enmy2_8006D36C(actor); break; case EVOP_17 << 9: @@ -1504,7 +1514,7 @@ void func_8006D36C(Actor* actor) { actor->fwork[5] = actorScript[actor->aiIndex + 1] * 0.1f; actor->fwork[6] = -1.0f; actor->aiIndex += 2; - func_8006D36C(actor); + func_enmy2_8006D36C(actor); break; case EVOP_18 << 9: @@ -1512,7 +1522,7 @@ void func_8006D36C(Actor* actor) { actor->fwork[8] = actorScript[actor->aiIndex + 1] * 0.1f; actor->fwork[9] = 1.0f; actor->aiIndex += 2; - func_8006D36C(actor); + func_enmy2_8006D36C(actor); break; case EVOP_19 << 9: @@ -1520,7 +1530,7 @@ void func_8006D36C(Actor* actor) { actor->fwork[8] = actorScript[actor->aiIndex + 1] * 0.1f; actor->fwork[9] = -1.0f; actor->aiIndex += 2; - func_8006D36C(actor); + func_enmy2_8006D36C(actor); break; case EVOP_20 << 9: @@ -1528,7 +1538,7 @@ void func_8006D36C(Actor* actor) { actor->fwork[11] = actorScript[actor->aiIndex + 1] * 0.1f; actor->fwork[12] = 1.0f; actor->aiIndex += 2; - func_8006D36C(actor); + func_enmy2_8006D36C(actor); break; case EVOP_21 << 9: @@ -1536,24 +1546,24 @@ void func_8006D36C(Actor* actor) { actor->fwork[11] = actorScript[actor->aiIndex + 1] * 0.1f; actor->fwork[12] = -1.0f; actor->aiIndex += 2; - func_8006D36C(actor); + func_enmy2_8006D36C(actor); break; case EVOP_SET_ROTATE << 9: actor->iwork[6] = 1; actor->aiIndex += 2; - func_8006D36C(actor); + func_enmy2_8006D36C(actor); break; case EVOP_STOP_ROTATE << 9: actor->iwork[6] = 0; actor->aiIndex += 2; - func_8006D36C(actor); + func_enmy2_8006D36C(actor); break; } } -void func_8006EA50(Actor* actor) { +void func_enmy2_8006EA50(Actor* actor) { if ((actor->iwork[7] != 0) && (gTexturedLines[actor->iwork[8]].mode != 0)) { gTexturedLines[actor->iwork[8]].unk_10.x = actor->obj.pos.x; gTexturedLines[actor->iwork[8]].unk_10.y = actor->obj.pos.y; @@ -1561,7 +1571,7 @@ void func_8006EA50(Actor* actor) { } } -void func_8006EAC4(Effect* effect, f32 xPos, f32 yPos, f32 zPos) { +void func_enmy2_8006EAC4(Effect* effect, f32 xPos, f32 yPos, f32 zPos) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_374; @@ -1575,18 +1585,18 @@ void func_8006EAC4(Effect* effect, f32 xPos, f32 yPos, f32 zPos) { AUDIO_PLAY_SFX(0x2900201D, effect->sfxSource, 4); } -void func_8006EB64(f32 xPos, f32 yPos, f32 zPos) { +void func_enmy2_8006EB64(f32 xPos, f32 yPos, f32 zPos) { s32 i; for (i = 50; i < ARRAY_COUNT(gEffects); i++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8006EAC4(&gEffects[i], xPos, yPos, zPos); + func_enmy2_8006EAC4(&gEffects[i], xPos, yPos, zPos); break; } } } -void func_8006EBC0(Actor* actor, f32 xPos, f32 yPos, f32 zPos) { +void func_enmy2_8006EBC0(Actor* actor, f32 xPos, f32 yPos, f32 zPos) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; actor->obj.id = OBJ_ACTOR_225; @@ -1600,19 +1610,19 @@ void func_8006EBC0(Actor* actor, f32 xPos, f32 yPos, f32 zPos) { AUDIO_PLAY_SFX(0x2900201D, actor->sfxSource, 4); } -void func_8006EC60(f32 xPos, f32 yPos, f32 zPos) { +void func_enmy2_8006EC60(f32 xPos, f32 yPos, f32 zPos) { s32 i; for (i = 0; i < ARRAY_COUNT(gActors); i++) { if (gActors[i].obj.status == OBJ_FREE) { - func_8006EBC0(&gActors[i], xPos, yPos, zPos); + func_enmy2_8006EBC0(&gActors[i], xPos, yPos, zPos); break; } } } -void func_8006ECBC(PlayerShotId objId, PlayerShot* shot, s32 unk0E4, f32 xPos, f32 yPos, f32 zPos, f32 arg6, f32 arg7, - f32 arg8, f32 xRot, f32 yRot, f32 zRot) { +void func_enmy2_8006ECBC(PlayerShotId objId, PlayerShot* shot, s32 unk0E4, f32 xPos, f32 yPos, f32 zPos, f32 arg6, + f32 arg7, f32 arg8, f32 xRot, f32 yRot, f32 zRot) { PlayerShot_Initialize(shot); shot->obj.status = 1; @@ -1655,31 +1665,33 @@ void func_8006ECBC(PlayerShotId objId, PlayerShot* shot, s32 unk0E4, f32 xPos, f } } -void func_8006EEFC(s32 unk0E4, f32 xPos, f32 yPos, f32 zPos, f32 arg4, f32 arg5, f32 arg6, f32 xRot, f32 yRot, - f32 zRot) { +void func_enmy2_8006EEFC(s32 unk0E4, f32 xPos, f32 yPos, f32 zPos, f32 arg4, f32 arg5, f32 arg6, f32 xRot, f32 yRot, + f32 zRot) { s32 i; for (i = 0; i < 10; i++) { if (gPlayerShots[i].obj.status == 0) { - func_8006ECBC(PLAYERSHOT_1, &gPlayerShots[i], unk0E4, xPos, yPos, zPos, arg4, arg5, arg6, xRot, yRot, zRot); + func_enmy2_8006ECBC(PLAYERSHOT_1, &gPlayerShots[i], unk0E4, xPos, yPos, zPos, arg4, arg5, arg6, xRot, yRot, + zRot); break; } } } -void func_8006EFA0(s32 unk0E4, f32 xPos, f32 yPos, f32 zPos, f32 arg4, f32 arg5, f32 arg6, f32 xRot, f32 yRot, - f32 zRot) { +void func_enmy2_8006EFA0(s32 unk0E4, f32 xPos, f32 yPos, f32 zPos, f32 arg4, f32 arg5, f32 arg6, f32 xRot, f32 yRot, + f32 zRot) { s32 i; for (i = 0; i < 10; i++) { if (gPlayerShots[i].obj.status == 0) { - func_8006ECBC(PLAYERSHOT_9, &gPlayerShots[i], unk0E4, xPos, yPos, zPos, arg4, arg5, arg6, xRot, yRot, zRot); + func_enmy2_8006ECBC(PLAYERSHOT_9, &gPlayerShots[i], unk0E4, xPos, yPos, zPos, arg4, arg5, arg6, xRot, yRot, + zRot); break; } } } -void func_8006F044(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 arg4) { +void func_enmy2_8006F044(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 arg4) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_347; @@ -1691,21 +1703,21 @@ void func_8006F044(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 arg4) { effect->scale1 = arg4; effect->unk_44 = 100; Object_SetInfo(&effect->info, effect->obj.id); - func_8007A6F0(&effect->obj.pos, 0x2903B009); + func_effect_8007A6F0(&effect->obj.pos, 0x2903B009); } -void func_8006F0D8(f32 xPos, f32 yPos, f32 zPos, f32 arg3) { +void func_enmy2_8006F0D8(f32 xPos, f32 yPos, f32 zPos, f32 arg3) { s32 i; for (i = 0; i < ARRAY_COUNT(gEffects); i++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8006F044(&gEffects[i], xPos, yPos, zPos, arg3); + func_enmy2_8006F044(&gEffects[i], xPos, yPos, zPos, arg3); break; } } } -void func_8006F140(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 arg4) { +void func_enmy2_8006F140(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 arg4) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_394; @@ -1720,21 +1732,21 @@ void func_8006F140(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 arg4) { effect->unk_7A = 18; Object_SetInfo(&effect->info, effect->obj.id); effect->info.damage = 40; - func_8007A6F0(&effect->obj.pos, 0x2903B009); + func_effect_8007A6F0(&effect->obj.pos, 0x2903B009); } -void func_8006F1EC(f32 xPos, f32 yPos, f32 zPos, f32 arg3) { +void func_enmy2_8006F1EC(f32 xPos, f32 yPos, f32 zPos, f32 arg3) { s32 i; for (i = 0; i < ARRAY_COUNT(gEffects); i++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8006F140(&gEffects[i], xPos, yPos, zPos, arg3); + func_enmy2_8006F140(&gEffects[i], xPos, yPos, zPos, arg3); break; } } } -void func_8006F254(Actor* actor) { +void func_enmy2_8006F254(Actor* actor) { Vec3f sp54; Vec3f sp48; @@ -1746,15 +1758,16 @@ void func_8006F254(Actor* actor) { sp54.x = 0.0f; sp54.y = 0.0f; - sp54.z = D_80177828; + sp54.z = D_ctx_80177828; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp54, &sp48); - func_8007F04C(OBJ_EFFECT_353, actor->obj.pos.x + sp48.x, actor->obj.pos.y + sp48.y, actor->obj.pos.z + sp48.z, - actor->obj.rot.x, actor->obj.rot.y, actor->obj.rot.z, actor->vwork[29].x, actor->vwork[29].y, - actor->vwork[29].z + actor->unk_0F4.z, sp48.x, sp48.y, sp48.z, 1.0f); + func_effect_8007F04C(OBJ_EFFECT_353, actor->obj.pos.x + sp48.x, actor->obj.pos.y + sp48.y, + actor->obj.pos.z + sp48.z, actor->obj.rot.x, actor->obj.rot.y, actor->obj.rot.z, + actor->vwork[29].x, actor->vwork[29].y, actor->vwork[29].z + actor->unk_0F4.z, sp48.x, sp48.y, + sp48.z, 1.0f); } -void func_8006F40C(Actor* actor) { +void func_enmy2_8006F40C(Actor* actor) { s32 var_v1; Vec3f sp78; Vec3f sp6C; @@ -1767,13 +1780,14 @@ void func_8006F40C(Actor* actor) { break; case 1: - func_8006F254(actor); + func_enmy2_8006F254(actor); actor->unk_048 = 0; break; case 2: if (actor->obj.pos.z < (gPlayer[0].unk_138 - 600.0f)) { - func_8007F11C(OBJ_EFFECT_353, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, D_80177828); + func_effect_8007F11C(OBJ_EFFECT_353, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, + D_ctx_80177828); } actor->unk_048 = 0; break; @@ -1785,9 +1799,10 @@ void func_8006F40C(Actor* actor) { sp78.y = 0.0f; sp78.z = 100.0f; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp78, &sp6C); - func_8006EEFC(actor->index, actor->obj.pos.x + (sp6C.x * 1.5), actor->obj.pos.y + (sp6C.y * 1.5), - actor->obj.pos.z + (sp6C.z * 1.5), sp6C.x, sp6C.y, sp6C.z, actor->unk_0F4.x, - actor->unk_0F4.y, actor->vwork[29].z + actor->unk_0F4.z); + func_enmy2_8006EEFC(actor->index, actor->obj.pos.x + (sp6C.x * 1.5), + actor->obj.pos.y + (sp6C.y * 1.5), actor->obj.pos.z + (sp6C.z * 1.5), sp6C.x, + sp6C.y, sp6C.z, actor->unk_0F4.x, actor->unk_0F4.y, + actor->vwork[29].z + actor->unk_0F4.z); actor->timer_0C2 = 2; actor->timer_04C--; if (actor->timer_04C <= 0) { @@ -1797,7 +1812,7 @@ void func_8006F40C(Actor* actor) { break; case 4: - func_8006EB64(actor->obj.pos.x, actor->obj.pos.y - 20.0f, actor->obj.pos.z); + func_enmy2_8006EB64(actor->obj.pos.x, actor->obj.pos.y - 20.0f, actor->obj.pos.z); actor->unk_048 = 0; break; @@ -1810,26 +1825,27 @@ void func_8006F40C(Actor* actor) { sp78.x = 0.0f; sp78.y = 0.0f; - sp78.z = D_80177828; + sp78.z = D_ctx_80177828; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp78, &sp6C); - func_8007F04C(OBJ_EFFECT_355, actor->obj.pos.x + sp6C.x, actor->obj.pos.y + sp6C.y, - actor->obj.pos.z + sp6C.z, actor->obj.rot.x, actor->obj.rot.y, actor->obj.rot.z, - actor->vwork[29].x, actor->vwork[29].y, actor->vwork[29].z + actor->unk_0F4.z, sp6C.x, - sp6C.y, sp6C.z, 1.0f); + func_effect_8007F04C(OBJ_EFFECT_355, actor->obj.pos.x + sp6C.x, actor->obj.pos.y + sp6C.y, + actor->obj.pos.z + sp6C.z, actor->obj.rot.x, actor->obj.rot.y, actor->obj.rot.z, + actor->vwork[29].x, actor->vwork[29].y, actor->vwork[29].z + actor->unk_0F4.z, + sp6C.x, sp6C.y, sp6C.z, 1.0f); actor->unk_048 = 0; break; case 6: if (actor->obj.pos.z < (gPlayer[0].unk_138 - 600.0f)) { - func_8007F11C(OBJ_EFFECT_355, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, D_80177828); + func_effect_8007F11C(OBJ_EFFECT_355, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, + D_ctx_80177828); } actor->unk_048 = 0; break; case 7: if (actor->obj.pos.z < (gPlayer[0].unk_138 - 600.0f)) { - func_8007F11C(OBJ_EFFECT_356, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 60.0f); + func_effect_8007F11C(OBJ_EFFECT_356, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 60.0f); } actor->unk_048 = 0; break; @@ -1839,7 +1855,8 @@ void func_8006F40C(Actor* actor) { sp6C.y = gPlayer[0].pos.y; gPlayer[0].pos.x += RAND_FLOAT_CENTERED(300.0f); gPlayer[0].pos.y += RAND_FLOAT_CENTERED(300.0f); - func_8007F11C(OBJ_EFFECT_353, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, D_80177828); + func_effect_8007F11C(OBJ_EFFECT_353, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, + D_ctx_80177828); gPlayer[0].pos.x = sp6C.x; gPlayer[0].pos.y = sp6C.y; actor->unk_048 = 0; @@ -1847,32 +1864,32 @@ void func_8006F40C(Actor* actor) { case 9: if (gCurrentLevel == LEVEL_AQUAS) { - func_8006F1EC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 12.0f); + func_enmy2_8006F1EC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 12.0f); } else { - func_8006F0D8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 40.0f); + func_enmy2_8006F0D8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 40.0f); } Object_Kill(&actor->obj, actor->sfxSource); break; case 10: if (gCurrentLevel == LEVEL_AQUAS) { - func_8006F1EC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 6.0f); + func_enmy2_8006F1EC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 6.0f); } else { - func_8006F0D8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 15.0f); + func_enmy2_8006F0D8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 15.0f); } Object_Kill(&actor->obj, actor->sfxSource); break; case 11: - func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->vel.x, actor->vel.y, - actor->vel.z, actor->scale * 3.0f, 15); - func_80066254(actor); + func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->vel.x, actor->vel.y, + actor->vel.z, actor->scale * 3.0f, 15); + func_enmy_80066254(actor); Object_Kill(&actor->obj, actor->sfxSource); - func_8007A6F0(&actor->obj.pos, 0x2903B009); + func_effect_8007A6F0(&actor->obj.pos, 0x2903B009); break; case 12: - func_80066254(actor); + func_enmy_80066254(actor); Object_Kill(&actor->obj, actor->sfxSource); break; @@ -1884,7 +1901,7 @@ void func_8006F40C(Actor* actor) { Math_SmoothStepToF(&actor->fwork[15], 0.0f, 0.2f, 8.0f, 0.01f); } if (actor->timer_0BE == 30) { - func_8006EC60(actor->obj.pos.x, actor->obj.pos.y - 50.0f, actor->obj.pos.z); + func_enmy2_8006EC60(actor->obj.pos.x, actor->obj.pos.y - 50.0f, actor->obj.pos.z); } if (actor->timer_0BE == 0) { actor->unk_048 = 0; @@ -1892,16 +1909,17 @@ void func_8006F40C(Actor* actor) { break; case 16: - func_8007F11C(OBJ_EFFECT_353, actor->obj.pos.x + 190.0f, actor->obj.pos.y + 90.0f, - actor->obj.pos.z + 220.0f, D_80177828); - func_8007F11C(OBJ_EFFECT_353, actor->obj.pos.x - 190.0f, actor->obj.pos.y + 90.0f, - actor->obj.pos.z + 220.0f, D_80177828); + func_effect_8007F11C(OBJ_EFFECT_353, actor->obj.pos.x + 190.0f, actor->obj.pos.y + 90.0f, + actor->obj.pos.z + 220.0f, D_ctx_80177828); + func_effect_8007F11C(OBJ_EFFECT_353, actor->obj.pos.x - 190.0f, actor->obj.pos.y + 90.0f, + actor->obj.pos.z + 220.0f, D_ctx_80177828); actor->unk_048 = 0; break; case 17: if (actor->obj.pos.z < (gPlayer[0].camEye.z - 600.0f)) { - func_8007F20C(OBJ_EFFECT_353, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, D_80177828); + func_effect_8007F20C(OBJ_EFFECT_353, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, + D_ctx_80177828); } actor->unk_048 = 0; break; @@ -1930,8 +1948,8 @@ void func_8006F40C(Actor* actor) { sp6C.y = 0.0f; sp6C.z = 50.0f; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp6C, &sp78); - func_8006EFA0(100, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, sp78.x, sp78.y, sp78.z, - sp58, sp54, 0.0f); + func_enmy2_8006EFA0(100, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, sp78.x, sp78.y, + sp78.z, sp58, sp54, 0.0f); break; } } @@ -1940,24 +1958,24 @@ void func_8006F40C(Actor* actor) { break; case 19: - func_80083D2C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 40.0f); + func_effect_80083D2C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 40.0f); actor->unk_048 = 0; break; } } } -void func_8006FE28(Actor* actor) { +void func_enmy2_8006FE28(Actor* actor) { if ((fabsf(actor->obj.pos.x - gPlayer[0].pos.x) < 100.0f) && (fabsf(actor->obj.pos.y - gPlayer[0].pos.y) < 100.0f) && (fabsf(actor->obj.pos.z - gPlayer[0].unk_138) < 50.0f)) { - func_80067A40(); + func_enmy_80067A40(); Audio_KillSfxBySourceAndId(actor->sfxSource, 0x1900302B); Object_Kill(&actor->obj, actor->sfxSource); } } -void func_8006FEEC(Actor* actor) { +void func_enmy2_8006FEEC(Actor* actor) { s32 i; if ((actor->unk_0D0 != 0) && (actor->health != 0)) { @@ -1967,21 +1985,21 @@ void func_8006FEEC(Actor* actor) { if (actor->health <= 0) { for (i = 3; i < 11; i++) { - func_i3_801900FC(&actor->vwork[i], &actor->vwork[i + 11], RAND_FLOAT_CENTERED(20.0f), - RAND_FLOAT(-10.0f), RAND_FLOAT(10.0f), 41, actor->scale, 200, i); + Zoness_801900FC(&actor->vwork[i], &actor->vwork[i + 11], RAND_FLOAT_CENTERED(20.0f), RAND_FLOAT(-10.0f), + RAND_FLOAT(10.0f), 41, actor->scale, 200, i); } actor->unk_044 = 0; - func_80066254(actor); + func_enmy_80066254(actor); Object_Kill(&actor->obj, actor->sfxSource); - func_8007A6F0(&actor->obj.pos, 0x29018036); - func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 4.0f); + func_effect_8007A6F0(&actor->obj.pos, 0x29018036); + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 4.0f); } else { AUDIO_PLAY_SFX(0x29033037, actor->sfxSource, 4); } } } -bool func_800700A4(Actor* actor) { +bool func_enmy2_800700A4(Actor* actor) { if ((actor->state != 12) && (actor->iwork[12] > 0) && (actor->iwork[12] < 4) && (gTeamShields[actor->iwork[12]] <= 0)) { actor->state = 12; @@ -2010,12 +2028,12 @@ bool func_800700A4(Actor* actor) { return false; } -void func_800701E0(Actor* actor) { +void func_enmy2_800701E0(Actor* actor) { Vec3f sp3C; f32 var_fv1; f32 temp_fv1; - if (func_800700A4(actor)) { + if (func_enmy2_800700A4(actor)) { return; } if ((actor->unk_0D0 != 0) && (actor->unk_0B4 == 0x43) && (actor->unk_0D2 == 0)) { @@ -2044,7 +2062,7 @@ void func_800701E0(Actor* actor) { BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 3); if (1) {} gHitCount += 4; - D_80177850 = 15; + D_ctx_80177850 = 15; } if (actor->unk_0B4 != 83) { @@ -2065,7 +2083,7 @@ void func_800701E0(Actor* actor) { (actor->unk_0B4 != 13) && (actor->unk_0B4 != 14) && (actor->unk_0B4 != 61) && (actor->damage <= 30) && (actor->unk_0B4 != 62) && (actor->unk_0B4 != 64) && (actor->unk_0B4 != 72) && (actor->unk_0B4 != 68)) { - func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->scale * 4.0f); + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->scale * 4.0f); actor->unk_0D0 = 0; } @@ -2080,10 +2098,10 @@ void func_800701E0(Actor* actor) { if (actor->unk_0B4 == 2) { actor->timer_04C = 1; if (actor->obj.pos.x < actor->unk_0D8.x) { - func_800A69F8(1, actor->obj.pos.x + 20.0f, actor->obj.pos.y, actor->obj.pos.z); + func_play_800A69F8(1, actor->obj.pos.x + 20.0f, actor->obj.pos.y, actor->obj.pos.z); actor->fwork[17] = 777.0f; } else { - func_800A69F8(0, actor->obj.pos.x - 20.0f, actor->obj.pos.y, actor->obj.pos.z); + func_play_800A69F8(0, actor->obj.pos.x - 20.0f, actor->obj.pos.y, actor->obj.pos.z); actor->fwork[18] = 777.0f; } } @@ -2097,7 +2115,7 @@ void func_800701E0(Actor* actor) { } else { actor->vel.z = actor->vel.z * 0.3f; } - if (((actor->obj.pos.z + D_80177D20) > -3000.0f) && (actor->vel.z > 0.0f)) { + if (((actor->obj.pos.z + D_ctx_80177D20) > -3000.0f) && (actor->vel.z > 0.0f)) { actor->vel.z = RAND_FLOAT(-10.0f); } } @@ -2108,23 +2126,23 @@ void func_800701E0(Actor* actor) { } else { switch (actor->unk_0B4) { case 13: - func_800654E4(&actor->obj); + func_enmy_800654E4(&actor->obj); break; case 61: - func_i2_8018CCF8(actor); + Meteo_8018CCF8(actor); break; case 27: actor->obj.pos.y -= actor->vel.y; actor->obj.status = OBJ_ACTIVE; - func_8007D0E0(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y + 30.0f, - actor->obj.pos.z - actor->vel.z, actor->scale * 5.0f); + func_effect_8007D0E0(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y + 30.0f, + actor->obj.pos.z - actor->vel.z, actor->scale * 5.0f); actor->unk_0D0 = 0; actor->timer_0C2 = 10000; actor->info.unk_1C = 0.0f; gHitCount += actor->info.bonus; - D_80177850 = 0xF; + D_ctx_80177850 = 0xF; break; default: @@ -2141,7 +2159,7 @@ void func_800701E0(Actor* actor) { if (actor->unk_0B4 == 0x52) { AUDIO_PLAY_SFX(0x11000055, actor->sfxSource, 0); actor->unk_0D0 = 1; - func_8007C688(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 3.0f, 0x3C); + func_effect_8007C688(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 3.0f, 0x3C); } } else { actor->timer_0C6 = 20; @@ -2154,7 +2172,7 @@ void func_800701E0(Actor* actor) { } if ((actor->unk_0B4 != 0xD) && (actor->unk_0B4 != 0x3D) && (actor->unk_0B4 != 0x53)) { - func_8007D10C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->scale * 1.5f); + func_effect_8007D10C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->scale * 1.5f); } if (((gLevelMode == LEVELMODE_ALL_RANGE) || (gLevelMode == LEVELMODE_UNK_2)) && (actor->unk_0B4 != 0x15) && @@ -2169,34 +2187,34 @@ void func_800701E0(Actor* actor) { switch (actor->iwork[12]) { case 1: if (actor->unk_0D0 == 3) { - func_8006A7B0(gMsg_ID_20210, RCID_FALCO); + func_enmy2_8006A7B0(gMsg_ID_20210, RCID_FALCO); } else { - func_8006A7B0(gMsg_ID_20060, RCID_FALCO); + func_enmy2_8006A7B0(gMsg_ID_20060, RCID_FALCO); } break; case 3: if (actor->unk_0D0 == 3) { - func_8006A7B0(gMsg_ID_20200, RCID_PEPPY); + func_enmy2_8006A7B0(gMsg_ID_20200, RCID_PEPPY); } else { - func_8006A7B0(gMsg_ID_20070, RCID_PEPPY); + func_enmy2_8006A7B0(gMsg_ID_20070, RCID_PEPPY); } break; case 2: if (actor->unk_0D0 == 3) { - func_8006A7B0(gMsg_ID_20190, RCID_SLIPPY); + func_enmy2_8006A7B0(gMsg_ID_20190, RCID_SLIPPY); } else { - func_8006A7B0(gMsg_ID_20080, RCID_SLIPPY); + func_enmy2_8006A7B0(gMsg_ID_20080, RCID_SLIPPY); } break; case 4: - func_8006A7B0(gMsg_ID_20084, RCID_KATT); + func_enmy2_8006A7B0(gMsg_ID_20084, RCID_KATT); break; case 5: - func_8006A7B0(gMsg_ID_20085, RCID_BILL); + func_enmy2_8006A7B0(gMsg_ID_20085, RCID_BILL); break; } } @@ -2209,36 +2227,36 @@ void func_800701E0(Actor* actor) { sp3C.y = actor->vel.y; sp3C.z = actor->vel.z; - if ((func_8006351C(actor->index, &actor->obj.pos, &sp3C, 0) != 0) || + if ((func_enmy_8006351C(actor->index, &actor->obj.pos, &sp3C, 0) != 0) || (actor->obj.pos.y < (gGroundLevel + 20.0f))) { actor->obj.status = OBJ_DYING; actor->obj.pos.z -= actor->vel.z; actor->unk_0D0 = 1; if (actor->unk_0B4 == 13) { actor->obj.id = OBJ_ACTOR_182; - func_800654E4(&actor->obj); + func_enmy_800654E4(&actor->obj); } if (actor->unk_0B4 == 61) { - func_i2_8018CCF8(actor); + Meteo_8018CCF8(actor); } } } } -void func_80070BA8(Actor* actor) { +void func_enmy2_80070BA8(Actor* actor) { if (actor->unk_0D0 != 0) { actor->unk_0D0 = 0; if ((actor->unk_0B4 != 17) || ((actor->unk_0B4 == 17) && (actor->unk_0D2 == 0))) { actor->timer_0C6 = 10; - func_8007C120(actor->unk_0D8.x, actor->unk_0D8.y, actor->unk_0D8.z, actor->vel.x, actor->vel.y, - actor->vel.z, 0.2f, 10); + func_effect_8007C120(actor->unk_0D8.x, actor->unk_0D8.y, actor->unk_0D8.z, actor->vel.x, actor->vel.y, + actor->vel.z, 0.2f, 10); actor->health -= actor->damage; AUDIO_PLAY_SFX(0x29033064, actor->sfxSource, 4); if (actor->health <= 0) { BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->info.bonus); gHitCount += actor->info.bonus + 1; - D_80177850 = 15; + D_ctx_80177850 = 15; } } else { AUDIO_PLAY_SFX(0x29121007, actor->sfxSource, 4); @@ -2246,22 +2264,22 @@ void func_80070BA8(Actor* actor) { } } -void func_80070CEC(Actor* actor) { +void func_enmy2_80070CEC(Actor* actor) { if (actor->iwork[3] < 200) { actor->aiIndex = actor->iwork[3] * 2; actor->iwork[0] = 0; actor->iwork[2] = 0; - func_8006D36C(actor); + func_enmy2_8006D36C(actor); } else { actor->aiType = actor->iwork[3] - 200; actor->aiIndex = 0; actor->iwork[0] = 0; actor->iwork[2] = 0; - func_8006D36C(actor); + func_enmy2_8006D36C(actor); } } -void func_80070D44(Actor* actor) { +void func_enmy2_80070D44(Actor* actor) { s32 i; s32 var_v1 = 0; s32 var_v1_4; @@ -2275,7 +2293,7 @@ void func_80070D44(Actor* actor) { if (actor->iwork[2] >= 100) { if (fabsf(actor->obj.pos.z - gPlayer[0].unk_138) <= ((actor->iwork[2] - 100) * 100.0f)) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } return; } @@ -2287,229 +2305,229 @@ void func_80070D44(Actor* actor) { case EVC_1: if ((gActors[actor->iwork[1]].obj.status != OBJ_ACTIVE) || (gActors[actor->iwork[1]].health <= 0) || (actor->iwork[10] != gActors[actor->iwork[1]].aiType)) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_2: if (var_v1 == 3) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_3: if (var_v1 == 2) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_4: if (var_v1 == 1) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_5: if (var_v1 == 0) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_6: if (gTeamShields[1] > 0) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_7: if (gTeamShields[3] > 0) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_8: if (gTeamShields[2] > 0) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_9: if (((actor->obj.pos.x - gPlayer[0].pos.x) <= 100.0f) && ((actor->obj.pos.x - gPlayer[0].pos.x) >= 0.0f)) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_10: if (((actor->obj.pos.x - gPlayer[0].pos.x) <= 400.0f) && ((actor->obj.pos.x - gPlayer[0].pos.x) >= 0.0f)) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_11: if (((actor->obj.pos.x - gPlayer[0].pos.x) <= 700.0f) && ((actor->obj.pos.x - gPlayer[0].pos.x) >= 0.0f)) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_12: if (((actor->obj.pos.x - gPlayer[0].pos.x) <= 200.0f) && ((actor->obj.pos.x - gPlayer[0].pos.x) >= 0.0f)) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_13: if (((actor->obj.pos.x - gPlayer[0].pos.x) >= -100.0f) && ((actor->obj.pos.x - gPlayer[0].pos.x) <= 0.0f)) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_14: if (((actor->obj.pos.x - gPlayer[0].pos.x) >= -400.0f) && ((actor->obj.pos.x - gPlayer[0].pos.x) <= 0.0f)) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_15: if (((actor->obj.pos.x - gPlayer[0].pos.x) >= -700.0f) && ((actor->obj.pos.x - gPlayer[0].pos.x) <= 0.0f)) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_16: if (((actor->obj.pos.x - gPlayer[0].pos.x) >= -200.0f) && ((actor->obj.pos.x - gPlayer[0].pos.x) <= 0.0f)) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_17: if (((actor->obj.pos.y - gPlayer[0].pos.y) <= 100.0f) && ((actor->obj.pos.y - gPlayer[0].pos.y) >= 0.0f)) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_18: if (((actor->obj.pos.y - gPlayer[0].pos.y) <= 400.0f) && ((actor->obj.pos.y - gPlayer[0].pos.y) >= 0.0f)) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_19: if (((actor->obj.pos.y - gPlayer[0].pos.y) <= 700.0f) && ((actor->obj.pos.y - gPlayer[0].pos.y) >= 0.0f)) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_20: if (((actor->obj.pos.y - gPlayer[0].pos.y) <= 200.0f) && ((actor->obj.pos.y - gPlayer[0].pos.y) >= 0.0f)) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_21: if (((actor->obj.pos.y - gPlayer[0].pos.y) >= -100.0f) && ((actor->obj.pos.y - gPlayer[0].pos.y) <= 0.0f)) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_22: if (((actor->obj.pos.y - gPlayer[0].pos.y) >= -400.0f) && ((actor->obj.pos.y - gPlayer[0].pos.y) <= 0.0f)) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_23: if (((actor->obj.pos.y - gPlayer[0].pos.y) >= -700.0f) && ((actor->obj.pos.y - gPlayer[0].pos.y) <= 0.0f)) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_24: if (((actor->obj.pos.y - gPlayer[0].pos.y) >= -200.0f) && ((actor->obj.pos.y - gPlayer[0].pos.y) <= 0.0f)) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_25: if (gPlayer[0].shields >= Play_GetMaxShields()) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_26: if (gPlayer[0].shields >= (Play_GetMaxShields() * 3 / 4)) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_27: if (gPlayer[0].shields >= (Play_GetMaxShields() / 2)) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_28: if (gPlayer[0].shields >= (Play_GetMaxShields() / 4)) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_29: if (gPlayer[0].shields == 0) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_30: if (gPlayer[0].unk_270 >= 5) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_31: if (gPlayer[0].unk_270 != 0) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_32: if (gPlayer[0].unk_270 == 0) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_33: if (gPlayer[0].unk_250 >= 16.8f) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_34: if (gPlayer[0].unk_250 <= 8.4f) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_35: if (gPlayer[0].wings.unk_14 > -8.0f) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_36: if ((gPlayer[0].wings.unk_14 < -8.0f) && (gLaserStrength[0] == LASERS_TWIN)) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_37: if ((gPlayer[0].wings.unk_14 < -8.0f) && (gLaserStrength[0] == LASERS_HYPER)) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_38: if ((gPlayer[0].wings.unk_14 < -8.0f) && (gLaserStrength[0] == LASERS_UNK_3)) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; @@ -2519,7 +2537,7 @@ void func_80070D44(Actor* actor) { (fabsf(actor->obj.pos.x - gPlayerShots[i].obj.pos.x) < 150.0f) && (fabsf(actor->obj.pos.y - gPlayerShots[i].obj.pos.y) < 150.0f) && (fabsf(actor->obj.pos.z - gPlayerShots[i].obj.pos.z) < 150.0f)) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); break; } } @@ -2531,7 +2549,7 @@ void func_80070D44(Actor* actor) { (fabsf(actor->obj.pos.x - gPlayerShots[i].obj.pos.x) < 300.0f) && (fabsf(actor->obj.pos.y - gPlayerShots[i].obj.pos.y) < 300.0f) && (fabsf(actor->obj.pos.z - gPlayerShots[i].obj.pos.z) < 300.0f)) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); break; } } @@ -2540,7 +2558,7 @@ void func_80070D44(Actor* actor) { case EVC_41: if ((gActors[actor->iwork[9]].obj.status != OBJ_ACTIVE) || ((gActors[actor->iwork[9]].scale < 0.0f) && (actor->health <= 0))) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; @@ -2551,14 +2569,14 @@ void func_80070D44(Actor* actor) { return; } } - func_80070CEC(actor); + func_enmy2_80070CEC(actor); break; case EVC_43: for (i = 0; i < ARRAY_COUNT(gActors); i++) { if ((gActors[i].obj.status == OBJ_ACTIVE) && (gActors[i].obj.id == OBJ_ACTOR_200) && (gActors[i].iwork[13] != 0) && (i != actor->index) && (actor->index == gActors[i].iwork[9])) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); break; } } @@ -2566,7 +2584,7 @@ void func_80070D44(Actor* actor) { case EVC_44: if (actor->unk_0D0 != 0) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; @@ -2583,8 +2601,8 @@ void func_80070D44(Actor* actor) { break; } - if (((gCurrentLevel != LEVEL_CORNERIA) || (gTeamShields[1] > 0)) && (D_80177E80 >= var_v1_4)) { - func_80070CEC(actor); + if (((gCurrentLevel != LEVEL_CORNERIA) || (gTeamShields[1] > 0)) && (D_ctx_80177E80 >= var_v1_4)) { + func_enmy2_80070CEC(actor); } break; @@ -2592,7 +2610,7 @@ void func_80070D44(Actor* actor) { for (i = 0, otherActor = gActors; i < ARRAY_COUNT(gActors); i++, otherActor++) { if (((otherActor->obj.status == OBJ_DYING) || (otherActor->obj.status == OBJ_FREE)) && (otherActor->iwork[15] == actor->iwork[15]) && (otherActor->iwork[16] != 0)) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } } break; @@ -2600,136 +2618,136 @@ void func_80070D44(Actor* actor) { case EVC_47: if (gControllerPress[gMainController].button & R_CBUTTONS) { func_8001AF40(0); - D_800CFF90 = 0; - D_80161690 = 0; - func_80070CEC(actor); + D_enmy2_800CFF90 = 0; + D_enmy2_80161690 = 0; + func_enmy2_80070CEC(actor); } break; case EVC_48: if ((gPlayer[0].wings.rightState <= WINGSTATE_BROKEN) || (gPlayer[0].wings.leftState <= WINGSTATE_BROKEN)) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_49: - if (D_800D3180[LEVEL_METEO] != 0) { - func_80070CEC(actor); + if (D_play_800D3180[LEVEL_METEO] != 0) { + func_enmy2_80070CEC(actor); } break; case EVC_50: - if (D_800D3180[LEVEL_FORTUNA] != 0) { - func_80070CEC(actor); + if (D_play_800D3180[LEVEL_FORTUNA] != 0) { + func_enmy2_80070CEC(actor); } break; case EVC_51: - if (D_800D3180[LEVEL_SECTOR_X] != 0) { - func_80070CEC(actor); + if (D_play_800D3180[LEVEL_SECTOR_X] != 0) { + func_enmy2_80070CEC(actor); } break; case EVC_52: - if (D_800D3180[LEVEL_TITANIA] != 0) { - func_80070CEC(actor); + if (D_play_800D3180[LEVEL_TITANIA] != 0) { + func_enmy2_80070CEC(actor); } break; case EVC_53: - if (D_800D3180[LEVEL_BOLSE] != 0) { - func_80070CEC(actor); + if (D_play_800D3180[LEVEL_BOLSE] != 0) { + func_enmy2_80070CEC(actor); } break; case EVC_54: - if (D_800D3180[LEVEL_SECTOR_Y] != 0) { - func_80070CEC(actor); + if (D_play_800D3180[LEVEL_SECTOR_Y] != 0) { + func_enmy2_80070CEC(actor); } break; case EVC_55: - if (D_800D3180[LEVEL_KATINA] != 0) { - func_80070CEC(actor); + if (D_play_800D3180[LEVEL_KATINA] != 0) { + func_enmy2_80070CEC(actor); } break; case EVC_56: - if (D_800D3180[LEVEL_SOLAR] != 0) { - func_80070CEC(actor); + if (D_play_800D3180[LEVEL_SOLAR] != 0) { + func_enmy2_80070CEC(actor); } break; case EVC_57: - if (D_800D3180[LEVEL_MACBETH] != 0) { - func_80070CEC(actor); + if (D_play_800D3180[LEVEL_MACBETH] != 0) { + func_enmy2_80070CEC(actor); } break; case EVC_58: - if (D_800D3180[LEVEL_AQUAS] != 0) { - func_80070CEC(actor); + if (D_play_800D3180[LEVEL_AQUAS] != 0) { + func_enmy2_80070CEC(actor); } break; case EVC_59: - if (D_800D3180[LEVEL_ZONESS] != 0) { - func_80070CEC(actor); + if (D_play_800D3180[LEVEL_ZONESS] != 0) { + func_enmy2_80070CEC(actor); } break; case EVC_60: - if (D_800D3180[LEVEL_SECTOR_Z] != 0) { - func_80070CEC(actor); + if (D_play_800D3180[LEVEL_SECTOR_Z] != 0) { + func_enmy2_80070CEC(actor); } break; case EVC_61: - if (D_800D3180[LEVEL_AREA_6] != 0) { - func_80070CEC(actor); + if (D_play_800D3180[LEVEL_AREA_6] != 0) { + func_enmy2_80070CEC(actor); } break; case EVC_62: - if (D_Timer_80161670[actor->iwork[12]] == 0) { - func_80070CEC(actor); + if (D_enmy_Timer_80161670[actor->iwork[12]] == 0) { + func_enmy2_80070CEC(actor); } break; case EVC_63: - if (D_Timer_80161670[actor->iwork[12]] != 0) { - func_80070CEC(actor); + if (D_enmy_Timer_80161670[actor->iwork[12]] != 0) { + func_enmy2_80070CEC(actor); } break; case EVC_64: - if (D_80161684 != 0) { - func_80070CEC(actor); + if (D_enmy_80161684 != 0) { + func_enmy2_80070CEC(actor); } break; case EVC_65: if (gHitCount >= 30) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_66: if (gHitCount >= 80) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; case EVC_67: if (gExpertMode) { - func_80070CEC(actor); + func_enmy2_80070CEC(actor); } break; } } // could be in-function, but probably weren't -Vec3f D_800D0DD4[56] = { +static Vec3f D_800D0DD4[56] = { { 158.0f, 256.0f, 1513.0f }, { 384.0f, 42.0f, 1187.0f }, { 284.0f, 129.0f, 769.0f }, { 482.0f, 19.0f, 769.0f }, { 386.0f, 105.0f, 253.0f }, { 221.0f, 209.0f, 33.0f }, { 78.0f, 263.0f, 637.0f }, { 78.0f, 263.0f, 76.0f }, { 18.0f, 263.0f, 1683.0f }, @@ -2750,7 +2768,7 @@ Vec3f D_800D0DD4[56] = { { -73.0f, 337.0f, -426.0f }, { -73.0f, 548.0f, -411.0f }, { -65.0f, 391.0f, -1237.0f }, { -193.0f, 250.0f, -1026.0f }, { -292.0f, 271.0f, -587.0f }, }; -Vec3f D_800D1074[24] = { +static Vec3f D_800D1074[24] = { { 100.0f, 55.0f, 450.0f }, { 117.0f, 57.0f, 738.0f }, { 14.0f, 31.0f, 894.0f }, { 204.0f, 0.0f, -72.0f }, { 204.0f, 33.0f, -253.0f }, { 344.0f, 0.0f, -295.0f }, { 344.0f, -51.0f, -457.0f }, { 87.0f, 124.0f, -699.0f }, { 169.0f, -40.0f, -564.0f }, @@ -2760,7 +2778,7 @@ Vec3f D_800D1074[24] = { { -344.0f, -51.0f, -457.0f }, { -87.0f, 124.0f, -699.0f }, { -169.0f, -40.0f, -564.0f }, { -113.0f, -147.0f, -367.0f }, { -112.0f, -146.0f, -13.0f }, { -69.0f, -118.0f, 158.0f }, }; -Vec3f D_800D1194[21] = { +static Vec3f D_800D1194[21] = { { 764.0f, 13.0f, 71.0f }, { 390.0f, 13.0f, 67.0f }, { 390.0f, 332.0f, 67.0f }, { 504.0f, 508.0f, 67.0f }, { 251.0f, 508.0f, 67.0f }, { -35.0f, 341.0f, 67.0f }, { -35.0f, 673.0f, 67.0f }, { -354.0f, 594.0f, 67.0f }, { -354.0f, 273.0f, 67.0f }, { -695.0f, 97.0f, 67.0f }, { -378.0f, -57.0f, 67.0f }, { -378.0f, -266.0f, 67.0f }, @@ -2769,7 +2787,7 @@ Vec3f D_800D1194[21] = { { 453.0f, 420.0f, 67.0f }, }; -void func_80071DC0(Actor* actor) { +void func_enmy2_80071DC0(Actor* actor) { s32 rInd; Vec3f sp38; @@ -2793,13 +2811,13 @@ void func_80071DC0(Actor* actor) { } if (!(gGameFrameCount & 1)) { - func_8007C120(actor->obj.pos.x + sp38.x, actor->obj.pos.y + sp38.y, actor->obj.pos.z + sp38.z, actor->vel.x, - actor->vel.y, actor->vel.z, 0.3f, 0x14); + func_effect_8007C120(actor->obj.pos.x + sp38.x, actor->obj.pos.y + sp38.y, actor->obj.pos.z + sp38.z, + actor->vel.x, actor->vel.y, actor->vel.z, 0.3f, 0x14); } if (!(gGameFrameCount & 7)) { - func_8007BFFC(actor->obj.pos.x + sp38.x, actor->obj.pos.y + sp38.y, actor->obj.pos.z + sp38.z, actor->vel.x, - actor->vel.y, actor->vel.z, 10.0f, 9); + func_effect_8007BFFC(actor->obj.pos.x + sp38.x, actor->obj.pos.y + sp38.y, actor->obj.pos.z + sp38.z, + actor->vel.x, actor->vel.y, actor->vel.z, 10.0f, 9); } if (!(gGameFrameCount & 0xF)) { @@ -2816,7 +2834,7 @@ void func_80071DC0(Actor* actor) { } } -void func_800720E8(Actor* actor) { +void func_enmy2_800720E8(Actor* actor) { switch (actor->unk_046) { case 0: if (actor->unk_0D0 != 0) { @@ -2857,7 +2875,7 @@ void func_800720E8(Actor* actor) { } } -void func_800722EC(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot) { +void func_enmy2_800722EC(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot) { Vec3f sp2C; Vec3f sp20; @@ -2881,18 +2899,18 @@ void func_800722EC(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot) { Object_SetInfo(&effect->info, effect->obj.id); } -void func_8007240C(f32 xPos, f32 yPos, f32 zPos, f32 yRot) { +void func_enmy2_8007240C(f32 xPos, f32 yPos, f32 zPos, f32 yRot) { s32 i; for (i = 0; i < ARRAY_COUNT(gEffects); i++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_800722EC(&gEffects[i], xPos, yPos, zPos, yRot); + func_enmy2_800722EC(&gEffects[i], xPos, yPos, zPos, yRot); break; } } } -void func_80072474(Actor* actor) { +void func_enmy2_80072474(Actor* actor) { f32 var_fv1; if (actor->unk_048 != 0) { switch (actor->unk_048) { @@ -2924,8 +2942,8 @@ void func_80072474(Actor* actor) { Math_SmoothStepToAngle(&actor->fwork[15], actor->fwork[16], 0.5f, 8.0f, 0.0f); } -Vec3f D_800D1290 = { 0.0f, 837.00006f, 0.0f }; // could be in-function -void func_80072594(Actor* actor) { +static Vec3f D_800D1290 = { 0.0f, 837.00006f, 0.0f }; // could be in-function +void func_enmy2_80072594(Actor* actor) { s32 spFC; f32 var_fv0; s32 var_s0; @@ -2945,7 +2963,7 @@ void func_80072594(Actor* actor) { Vec3f spAC; Vec3f spA0; - if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7) || (D_8017828C != 0)) { + if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7) || (D_ctx_8017828C != 0)) { Object_Kill(&actor->obj, actor->sfxSource); return; } @@ -2954,13 +2972,13 @@ void func_80072594(Actor* actor) { actor->obj.rot.y += actor->fwork[15]; actor->obj.rot.x += actor->fwork[16]; if (!(gGameFrameCount & 0xF)) { - func_8007C120(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->vel.x, actor->vel.y, - actor->vel.z, 0.3f, 0xA); + func_effect_8007C120(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->vel.x, actor->vel.y, + actor->vel.z, 0.3f, 0xA); } } else { if (((actor->unk_0B4 == 0x11) || (actor->unk_0B4 == 0x1E) || (actor->unk_0B4 == 0x1F)) && (actor->health <= 0)) { - func_80071DC0(actor); + func_enmy2_80071DC0(actor); return; } if (actor->unk_0B4 == 300) { @@ -2973,12 +2991,12 @@ void func_80072594(Actor* actor) { actor->unk_04E = 0; } - D_80176558[actor->unk_046][actor->unk_04E] = actor->obj.pos.x; - D_80176878[actor->unk_046][actor->unk_04E] = actor->obj.pos.y; - D_80176B98[actor->unk_046][actor->unk_04E] = actor->obj.pos.z; - D_80176EB8[actor->unk_046][actor->unk_04E] = actor->obj.rot.x; - D_801771D8[actor->unk_046][actor->unk_04E] = actor->obj.rot.y; - D_80177500[actor->unk_046][actor->unk_04E] = actor->obj.rot.z; + D_ctx_80176558[actor->unk_046][actor->unk_04E] = actor->obj.pos.x; + D_ctx_80176878[actor->unk_046][actor->unk_04E] = actor->obj.pos.y; + D_ctx_80176B98[actor->unk_046][actor->unk_04E] = actor->obj.pos.z; + D_ctx_80176EB8[actor->unk_046][actor->unk_04E] = actor->obj.rot.x; + D_ctx_801771D8[actor->unk_046][actor->unk_04E] = actor->obj.rot.y; + D_ctx_80177500[actor->unk_046][actor->unk_04E] = actor->obj.rot.z; if (actor->unk_0D0 != 0) { actor->unk_0D0 = 0; @@ -2990,7 +3008,7 @@ void func_80072594(Actor* actor) { if (actor->health <= 0) { actor->timer_0C6 = 200; actor->obj.status = OBJ_DYING; - func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 8.0f); + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 8.0f); actor->obj.status = OBJ_DYING; actor->timer_0BC = 20; actor->obj.id = OBJ_ACTOR_194; @@ -3004,12 +3022,12 @@ void func_80072594(Actor* actor) { switch (actor->state) { case 0: - func_8006D36C(actor); + func_enmy2_8006D36C(actor); break; case 1: if (actor->timer_0BC == 0) { - func_8006D36C(actor); + func_enmy2_8006D36C(actor); } break; @@ -3072,7 +3090,7 @@ void func_80072594(Actor* actor) { spB8.x = 0.0f; spB8.y = 0.0f; - spB8.z = D_80177828; + spB8.z = D_ctx_80177828; Matrix_MultVec3fNoTranslate(gCalcMatrix, &spB8, &spAC); @@ -3082,11 +3100,11 @@ void func_80072594(Actor* actor) { var_fv0 = 0.0f; } - func_8007F04C(OBJ_EFFECT_353, actor->obj.pos.x + spAC.x + spA0.x, - actor->obj.pos.y + spAC.y + spA0.y + var_fv0, actor->obj.pos.z + spAC.z + spA0.z, - actor->fwork[15], actor->obj.rot.y, actor->obj.rot.z, actor->vwork[29].x, - actor->vwork[29].y, actor->vwork[29].z + actor->unk_0F4.z, spAC.x, spAC.y, spAC.z, - 1.0f); + func_effect_8007F04C(OBJ_EFFECT_353, actor->obj.pos.x + spAC.x + spA0.x, + actor->obj.pos.y + spAC.y + spA0.y + var_fv0, + actor->obj.pos.z + spAC.z + spA0.z, actor->fwork[15], actor->obj.rot.y, + actor->obj.rot.z, actor->vwork[29].x, actor->vwork[29].y, + actor->vwork[29].z + actor->unk_0F4.z, spAC.x, spAC.y, spAC.z, 1.0f); actor->fwork[16] = -15.0f; } } else { @@ -3127,7 +3145,7 @@ void func_80072594(Actor* actor) { } if (actor->timer_0BC == 0) { - func_8006D36C(actor); + func_enmy2_8006D36C(actor); } break; @@ -3136,7 +3154,7 @@ void func_80072594(Actor* actor) { spD8 = COS_DEG((actor->index * 45) + (gGameFrameCount * 2)) * actor->fwork[17]; pad = actor->iwork[1]; pad = gActors[pad].iwork[12]; - D_Timer_80161670[pad] = 5; + D_enmy_Timer_80161670[pad] = 5; case 8: case 9: @@ -3170,7 +3188,7 @@ void func_80072594(Actor* actor) { } if (actor->timer_0BC == 0) { - func_8006D36C(actor); + func_enmy2_8006D36C(actor); } break; @@ -3178,7 +3196,7 @@ void func_80072594(Actor* actor) { actor->unk_0F4.x += actor->fwork[3]; actor->fwork[2] -= actor->fwork[3]; if (actor->fwork[2] <= 0.0f) { - func_8006D36C(actor); + func_enmy2_8006D36C(actor); } break; @@ -3186,7 +3204,7 @@ void func_80072594(Actor* actor) { actor->unk_0F4.x -= actor->fwork[3]; actor->fwork[2] -= actor->fwork[3]; if (actor->fwork[2] <= 0.0f) { - func_8006D36C(actor); + func_enmy2_8006D36C(actor); } break; @@ -3194,7 +3212,7 @@ void func_80072594(Actor* actor) { actor->unk_0F4.y += actor->fwork[3]; actor->fwork[2] -= actor->fwork[3]; if (actor->fwork[2] <= 0.0f) { - func_8006D36C(actor); + func_enmy2_8006D36C(actor); } break; @@ -3202,7 +3220,7 @@ void func_80072594(Actor* actor) { actor->unk_0F4.y -= actor->fwork[3]; actor->fwork[2] -= actor->fwork[3]; if (actor->fwork[2] <= 0.0f) { - func_8006D36C(actor); + func_enmy2_8006D36C(actor); } break; @@ -3222,13 +3240,13 @@ void func_80072594(Actor* actor) { if (var_s0 == 3) { actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_ME_602F638); - func_8006D36C(actor); + func_enmy2_8006D36C(actor); } break; case 11: if (Math_SmoothStepToF(&actor->fwork[15], 0.0f, 0.3f, 10.0f, 1.0f) == 0.0f) { - func_8006D36C(actor); + func_enmy2_8006D36C(actor); } break; @@ -3349,28 +3367,28 @@ void func_80072594(Actor* actor) { if (actor->iwork[5] == 0x80) { actor->vel.z -= actor->fwork[22]; - if ((gCurrentLevel == LEVEL_SECTOR_Y) && (D_80177D08 < 0.0f)) { - actor->vel.z -= D_80177D08; + if ((gCurrentLevel == LEVEL_SECTOR_Y) && (D_ctx_80177D08 < 0.0f)) { + actor->vel.z -= D_ctx_80177D08; } } if (actor->iwork[5] == 0x100) { - actor->vel.z -= D_80177D08; + actor->vel.z -= D_ctx_80177D08; } if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_8) { actor->vel.z = 100.0f; } - func_80070D44(actor); - func_8006F40C(actor); - func_8006EA50(actor); + func_enmy2_80070D44(actor); + func_enmy2_8006F40C(actor); + func_enmy2_8006EA50(actor); if (actor->unk_0B4 == 0x26) { - func_800720E8(actor); + func_enmy2_800720E8(actor); } else { if (actor->scale <= -1.999f) { - func_80070BA8(actor); + func_enmy2_80070BA8(actor); } else { if ((actor->unk_0D0 == 1) && (actor->scale < 0.5f) && (actor->unk_0B4 != 0x30) && (actor->unk_0B4 != 0x31) && (actor->unk_0B4 != 0x32)) { @@ -3385,13 +3403,13 @@ void func_80072594(Actor* actor) { if ((actor->unk_0B4 < 200) && (actor->unk_0B4 != 78) && (actor->scale >= 0.5f)) { switch (actor->unk_0B4) { case 71: - func_8006FE28(actor); + func_enmy2_8006FE28(actor); break; case 79: - func_8006FEEC(actor); + func_enmy2_8006FEEC(actor); break; default: - func_800701E0(actor); + func_enmy2_800701E0(actor); break; } } @@ -3414,13 +3432,13 @@ void func_80072594(Actor* actor) { break; case 46: - if (func_800A73E4(&spEC, &spFC, actor->obj.pos.x, -100.0f, actor->obj.pos.z)) { + if (func_play_800A73E4(&spEC, &spFC, actor->obj.pos.x, -100.0f, actor->obj.pos.z)) { spF0 = 10.0f; if (Math_SmoothStepToF(&actor->obj.pos.y, spEC, 0.5f, 7.0f, 0.0f) >= 0.0f) { spF0 = 350.0f; if (!(gGameFrameCount & 3)) { - func_8007240C(actor->obj.pos.x, spEC, actor->obj.pos.z, actor->obj.rot.y); + func_enmy2_8007240C(actor->obj.pos.x, spEC, actor->obj.pos.z, actor->obj.rot.y); AUDIO_PLAY_SFX(0x19800017, actor->sfxSource, 4); } } @@ -3459,8 +3477,8 @@ void func_80072594(Actor* actor) { actor->unk_0B6 = 0; } if (((s32) gGameFrameCount % 3) == 0) { - func_i3_8019E9F4(actor->obj.pos.x, actor->obj.pos.y - 20, actor->obj.pos.z - 180.0f, 0.0f, - RAND_FLOAT(20.0f) * -1.0f, 0.0f, 4.0f, 2); + Solar_8019E9F4(actor->obj.pos.x, actor->obj.pos.y - 20, actor->obj.pos.z - 180.0f, 0.0f, + RAND_FLOAT(20.0f) * -1.0f, 0.0f, 4.0f, 2); } } else if (actor->unk_0B6 >= Animation_GetFrameCount(&D_ENMY_PLANET_40057AC)) { actor->unk_0B6 = 0; @@ -3480,15 +3498,15 @@ void func_80072594(Actor* actor) { case 48: case 49: case 50: - func_i6_801A3BD4(actor); + SectorY_801A3BD4(actor); break; case 52: - func_80072474(actor); + func_enmy2_80072474(actor); break; case 78: - func_8006753C(actor); + func_enmy_8006753C(actor); break; case 79: @@ -3517,7 +3535,7 @@ void func_80072594(Actor* actor) { if ((actor->obj.pos.y + sp90.y) > -30.0f) { for (sp74 = 0; sp74 < 7; sp74++) { - effect = func_8007783C(OBJ_EFFECT_394); + effect = func_effect_8007783C(OBJ_EFFECT_394); if (effect != NULL) { effect->unk_78 = effect->unk_7A = 12; @@ -3549,7 +3567,7 @@ void func_80072594(Actor* actor) { } if ((fabsf(actor->fwork[0]) > 10.0f) && !(gGameFrameCount & 1)) { - effect = func_8007783C(OBJ_EFFECT_394); + effect = func_effect_8007783C(OBJ_EFFECT_394); if (effect != NULL) { Matrix_RotateZ(gCalcMatrix, actor->unk_0F4.z * M_DTOR, 0); Matrix_MultVec3fNoTranslate(gCalcMatrix, &D_800D1290, &sp90); @@ -3580,7 +3598,7 @@ void func_80072594(Actor* actor) { } if (!(gGameFrameCount & 3)) { - effect = func_8007783C(OBJ_EFFECT_394); + effect = func_effect_8007783C(OBJ_EFFECT_394); if (effect != NULL) { effect->unk_78 = effect->unk_7A = 11; effect->obj.status = OBJ_ACTIVE; @@ -3637,13 +3655,14 @@ void func_80072594(Actor* actor) { actor->obj.pos.y += 80.0f; actor->obj.pos.z += 40.0f; - func_80066254(actor); + func_enmy_80066254(actor); actor->obj.pos.y = spD8; actor->obj.pos.z = spD4; } if ((actor->unk_0B6 >= 0x12) && (actor->unk_0B6 < 0x18)) { - func_8007BC7C(actor->obj.pos.x, actor->obj.pos.y + 80.0f, actor->obj.pos.z + 60.0f, 20.0f); + func_effect_8007BC7C(actor->obj.pos.x, actor->obj.pos.y + 80.0f, actor->obj.pos.z + 60.0f, + 20.0f); } if (actor->unk_0B6 < 49) { @@ -3652,9 +3671,9 @@ void func_80072594(Actor* actor) { actor->unk_0B6 = 49; } if (gGameFrameCount & 1) { - func_i3_801AC8A8(RAND_FLOAT_CENTERED(100.0f) + actor->obj.pos.x, - RAND_FLOAT(50.0f) + actor->obj.pos.y, - RAND_FLOAT_CENTERED(100.0f) + actor->obj.pos.z, 1.0f, 0); + Aquas_801AC8A8(RAND_FLOAT_CENTERED(100.0f) + actor->obj.pos.x, + RAND_FLOAT(50.0f) + actor->obj.pos.y, + RAND_FLOAT_CENTERED(100.0f) + actor->obj.pos.z, 1.0f, 0); } } actor->timer_0C2 = 10000; @@ -3679,7 +3698,7 @@ void func_80072594(Actor* actor) { case 103: case 104: - func_i6_80187530(actor); // might be i5 or i2 + Andross_80187530(actor); // might be i5 or i2 break; case 106: @@ -3691,17 +3710,17 @@ void func_80072594(Actor* actor) { } if (gLevelMode == LEVELMODE_ALL_RANGE) { - D_80177F20[actor->index + 1] = actor->obj.pos.x; - D_80178028[actor->index + 1] = actor->obj.pos.z; - D_80178130[actor->index + 1] = Math_ModF(actor->unk_0F4.y, 360.0f) + 180.0f; - D_80178238[actor->index + 1] = 1; + D_ctx_80177F20[actor->index + 1] = actor->obj.pos.x; + D_ctx_80178028[actor->index + 1] = actor->obj.pos.z; + D_ctx_80178130[actor->index + 1] = Math_ModF(actor->unk_0F4.y, 360.0f) + 180.0f; + D_ctx_80178238[actor->index + 1] = 1; } } } -UNK_TYPE D_800D129C[0x8C] = { 0 }; // unused +static UNK_TYPE D_800D129C[0x8C] = { 0 }; // unused -bool func_80074BFC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +bool func_enmy2_80074BFC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { Actor* actor = data; if (limbIndex == 1) { @@ -3713,7 +3732,7 @@ bool func_80074BFC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* dat return false; } -bool func_80074C44(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +bool func_enmy2_80074C44(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { Actor* actor = data; s32 var_s1; @@ -3744,17 +3763,17 @@ bool func_80074C44(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* dat return false; } -void func_80074E3C(Actor* actor) { +void func_enmy2_80074E3C(Actor* actor) { Vec3f sp30[10]; Animation_GetFrameData(&D_SX_6013820, 0, sp30); sp30[6].y += actor->fwork[15]; sp30[5].z += actor->fwork[16] + ((actor->timer_0BE >> 2) & 1); sp30[4].z -= actor->fwork[16] + ((actor->timer_0BE >> 2) & 1); - Animation_DrawSkeleton(1, D_SX_601390C, sp30, func_80074C44, NULL, actor, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_SX_601390C, sp30, func_enmy2_80074C44, NULL, actor, &gIdentityMatrix); } -bool func_80074F04(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { +bool func_enmy2_80074F04(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { gSPClearGeometryMode(gMasterDisp++, G_TEXTURE_GEN); if ((limbIndex == 3) || (limbIndex == 5)) { gSPTexture(gMasterDisp++, 5000, 5000, 0, G_TX_RENDERTILE, G_ON); @@ -3763,14 +3782,14 @@ bool func_80074F04(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thi return false; } -s32 func_80074F90(Object_80* obj80) { +s32 func_enmy2_80074F90(Object_80* obj80) { RCP_SetupDL(&gMasterDisp, 0x3C); gSPDisplayList(gMasterDisp++, D_SY_601AD70); RCP_SetupDL(&gMasterDisp, 0x40); return 0; } -void func_80074FF0(Actor* actor) { +void func_enmy2_80074FF0(Actor* actor) { Vec3f sp114[31]; f32 sp40; s16 temp_s0; @@ -3779,9 +3798,9 @@ void func_80074FF0(Actor* actor) { if (actor->timer_0C6 && (actor->unk_0B4 != 0x5A) && (actor->unk_0B4 != 0x44) && (actor->unk_0B4 != 0x48)) { if ((actor->unk_0B4 != 0xD) && (actor->unk_0B4 != 0xE) && (actor->unk_0B4 != 0x3D) && (actor->unk_0B4 != 0x3E) && (actor->unk_0B4 != 0x53) && (actor->unk_0B4 != 0x62) && (actor->scale > 0.5f) && - (actor->timer_0C6 >= 9) && !(actor->timer_0C6 & 3) && (D_80177854 != 0x64)) { - func_8007C120(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->vel.x, actor->vel.y, - actor->vel.z, actor->scale * 0.07f, 3); + (actor->timer_0C6 >= 9) && !(actor->timer_0C6 & 3) && (D_ctx_80177854 != 0x64)) { + func_effect_8007C120(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->vel.x, actor->vel.y, + actor->vel.z, actor->scale * 0.07f, 3); } if ((actor->unk_0B4 != 0x15) && (actor->unk_0B4 != 0x17) && (actor->unk_0B4 != 0x4F) && @@ -3831,12 +3850,12 @@ void func_80074FF0(Actor* actor) { switch (actor->unk_0B4) { case 56: - func_800515C4(); + func_demo_800515C4(); break; case 0: actor->iwork[11] = 1; - func_8005ADAC(actor); + func_edisplay_8005ADAC(actor); break; case 2: @@ -3854,7 +3873,7 @@ void func_80074FF0(Actor* actor) { actor->fwork[16] += (-actor->obj.rot.z * 0.7f - actor->fwork[16]) * 0.2f; actor->fwork[27] += (actor->obj.rot.z * 0.7f - actor->fwork[27]) * 0.2f; } - func_8005B388(actor); + func_edisplay_8005B388(actor); break; case 43: @@ -3863,12 +3882,12 @@ void func_80074FF0(Actor* actor) { } else { gSPDisplayList(gMasterDisp++, D_ENMY_SPACE_4007870); } - func_8005ADAC(actor); + func_edisplay_8005ADAC(actor); break; case 5: actor->iwork[11] = 1; - func_8005ADAC(actor); + func_edisplay_8005ADAC(actor); break; case 6: @@ -3885,7 +3904,7 @@ void func_80074FF0(Actor* actor) { case 7: actor->iwork[11] = 1; - func_8005ADAC(actor); + func_edisplay_8005ADAC(actor); break; case 9: @@ -3899,7 +3918,7 @@ void func_80074FF0(Actor* actor) { actor->iwork[11] = 1; Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -30.0f, 1); Matrix_Scale(gGfxMatrix, 2.5f, 2.5f, 2.5f, 1); - func_8005B1E8(actor, 2); + func_edisplay_8005B1E8(actor, 2); } break; @@ -3908,7 +3927,7 @@ void func_80074FF0(Actor* actor) { actor->iwork[11] = 1; Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -30.0f, 1); Matrix_Scale(gGfxMatrix, 2.5f, 2.5f, 2.5f, 1); - func_8005B1E8(actor, 2); + func_edisplay_8005B1E8(actor, 2); } break; @@ -3923,7 +3942,7 @@ void func_80074FF0(Actor* actor) { gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -30.0f, 1); actor->iwork[11] = 1; - func_8005B1E8(actor, 2); + func_edisplay_8005B1E8(actor, 2); break; case 22: @@ -3932,15 +3951,16 @@ void func_80074FF0(Actor* actor) { gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -30.0f, 1); actor->iwork[11] = 1; - func_8005B1E8(actor, 2); + func_edisplay_8005B1E8(actor, 2); break; case 27: if (actor->timer_0C2 != 0) { - if (!(actor->timer_0C2 & 3) && (D_80177854 != 0x64)) { - func_8007D0E0(RAND_FLOAT_CENTERED(200.0f) + actor->obj.pos.x, - RAND_FLOAT_CENTERED(200.0f) + actor->obj.pos.y, - RAND_FLOAT_CENTERED(200.0f) + actor->obj.pos.z, RAND_FLOAT(1.5f) + 2.5f); + if (!(actor->timer_0C2 & 3) && (D_ctx_80177854 != 0x64)) { + func_effect_8007D0E0(RAND_FLOAT_CENTERED(200.0f) + actor->obj.pos.x, + RAND_FLOAT_CENTERED(200.0f) + actor->obj.pos.y, + RAND_FLOAT_CENTERED(200.0f) + actor->obj.pos.z, + RAND_FLOAT(1.5f) + 2.5f); } RCP_SetupDL(&gMasterDisp, 0x39); gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); @@ -3960,7 +3980,7 @@ void func_80074FF0(Actor* actor) { Animation_GetFrameData(&D_ENMY_SPACE_400A30C, actor->unk_0B6, sp114); Matrix_RotateY(gGfxMatrix, M_PI, 1); Matrix_Scale(gGfxMatrix, 1.5f, 1.5f, 1.5f, 1); - Animation_DrawSkeleton(1, D_ENMY_SPACE_400A398, sp114, func_80074BFC, NULL, actor, + Animation_DrawSkeleton(1, D_ENMY_SPACE_400A398, sp114, func_enmy2_80074BFC, NULL, actor, &gIdentityMatrix); Math_SmoothStepToF(&actor->fwork[16], 0.0f, 0.3f, 2.0f, 0.0001f); break; @@ -3972,13 +3992,13 @@ void func_80074FF0(Actor* actor) { break; case 38: - func_80074E3C(actor); + func_enmy2_80074E3C(actor); break; case 48: case 49: case 50: - func_i6_801A4CB0(actor); + SectorY_801A4CB0(actor); break; case 52: @@ -4013,13 +4033,13 @@ void func_80074FF0(Actor* actor) { break; case 78: - func_80067874(actor); + func_enmy_80067874(actor); break; case 79: temp_s0 = actor->state; actor->state = 2; - func_i3_80190430(actor); + Zoness_80190430(actor); actor->state = temp_s0; break; @@ -4052,12 +4072,12 @@ void func_80074FF0(Actor* actor) { case 85: gSPDisplayList(gMasterDisp++, D_D00B880); - func_8005ADAC(actor); + func_edisplay_8005ADAC(actor); break; case 86: gSPDisplayList(gMasterDisp++, D_D009A40); - func_8005ADAC(actor); + func_edisplay_8005ADAC(actor); break; case 88: @@ -4073,7 +4093,7 @@ void func_80074FF0(Actor* actor) { case 103: case 104: - func_i6_8018769C(actor); + Andross_8018769C(actor); break; case 105: @@ -4093,21 +4113,21 @@ void func_80074FF0(Actor* actor) { break; } - if ((D_80161410 > 0) && ((actor->iwork[12] > 0) && (actor->iwork[12] < 6))) { + if ((D_display_80161410 > 0) && ((actor->iwork[12] > 0) && (actor->iwork[12] < 6))) { Vec3f sp58 = { 0.0f, 0.0f, 0.0f }; if ((actor->iwork[12] == 4) || (actor->iwork[12] == 5)) { - Matrix_MultVec3f(gGfxMatrix, &sp58, &D_80177E98[actor->iwork[12] + 4]); + Matrix_MultVec3f(gGfxMatrix, &sp58, &D_ctx_80177E98[actor->iwork[12] + 4]); return; } else { - Matrix_MultVec3f(gGfxMatrix, &sp58, &D_80177E98[actor->iwork[12]]); + Matrix_MultVec3f(gGfxMatrix, &sp58, &D_ctx_80177E98[actor->iwork[12]]); } } break; } } -void func_800763A4(Actor* actor) { +void func_enmy2_800763A4(Actor* actor) { s32 var_s0; s32 sp60; s32 sp5C; @@ -4118,8 +4138,8 @@ void func_800763A4(Actor* actor) { if (actor->unk_0B4 == 27) { actor->obj.pos.y -= actor->vel.y; actor->obj.status = OBJ_ACTIVE; - func_8007D0E0(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z - actor->vel.z, - actor->scale * 5.0f); + func_effect_8007D0E0(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z - actor->vel.z, + actor->scale * 5.0f); actor->timer_0C2 = 10000; return; } @@ -4131,12 +4151,12 @@ void func_800763A4(Actor* actor) { if (actor->timer_0BE == 1) { Object_Kill(&actor->obj, actor->sfxSource); - func_80066254(actor); + func_enmy_80066254(actor); if (gLevelMode == LEVELMODE_ALL_RANGE) { - D_80177F20[actor->index + 1] = actor->obj.pos.x; - D_80178028[actor->index + 1] = actor->obj.pos.z; - D_80178130[actor->index + 1] = 1001.0f; + D_ctx_80177F20[actor->index + 1] = actor->obj.pos.x; + D_ctx_80178028[actor->index + 1] = actor->obj.pos.z; + D_ctx_80178130[actor->index + 1] = 1001.0f; } return; } @@ -4171,25 +4191,27 @@ void func_800763A4(Actor* actor) { } if (((actor->timer_0BC & 3) == 1) && (actor->unk_0B4 != 13) && (actor->unk_0B4 != 61)) { - func_8007D24C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 2.2f); + func_effect_8007D24C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 2.2f); } - if ((D_80178294 != 0) && func_800A73E4(&sp58, &sp5C, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z)) { - func_8007BFFC(actor->obj.pos.x, sp58 + 20.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, actor->scale * 3.0f, 5); - func_8007B228(actor->obj.pos.x, sp58, actor->obj.pos.z, 2.0f); + if ((D_ctx_80178294 != 0) && + func_play_800A73E4(&sp58, &sp5C, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z)) { + func_effect_8007BFFC(actor->obj.pos.x, sp58 + 20.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, + actor->scale * 3.0f, 5); + func_effect_8007B228(actor->obj.pos.x, sp58, actor->obj.pos.z, 2.0f); actor->timer_0BE = 2; - func_8007A6F0(&actor->obj.pos, 0x2903A008); + func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); return; } - if (D_801784AC == 4) { - 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); - func_80062C38(actor->obj.pos.x, actor->obj.pos.z); + if (D_ctx_801784AC == 4) { + if (Ground_801B6AEC(actor->obj.pos.x, actor->obj.pos.y - 10.0f, actor->obj.pos.z + D_ctx_80177D20) != 0) { + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 20.0f, actor->obj.pos.z, actor->scale * 6.0f); + func_effect_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); + func_enmy_80062C38(actor->obj.pos.x, actor->obj.pos.z); actor->timer_0BE = 2; - func_8007A6F0(&actor->obj.pos, 0x2903A008); + func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); return; } } else { @@ -4197,14 +4219,14 @@ void func_800763A4(Actor* actor) { sp4C.y = actor->vel.y; sp4C.z = actor->vel.z; - sp60 = func_8006351C(actor->index, &actor->obj.pos, &sp4C, 0); + sp60 = func_enmy_8006351C(actor->index, &actor->obj.pos, &sp4C, 0); if ((sp60 != 0) || (actor->obj.pos.y < (gGroundLevel + 30.0f))) { if ((Rand_ZeroOne() < 0.5f) && (actor->timer_04C < 3) && (gLevelType == LEVELTYPE_PLANET) && (sp60 != 999) && (D_80161A88 != 2) && ((actor->vel.z < -20.0f) || (actor->vel.z > 0.0f))) { if (gCurrentLevel == LEVEL_FORTUNA) { - func_8006BF7C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z - actor->vel.z); - func_80062C38(actor->obj.pos.x, actor->obj.pos.z); + func_enmy2_8006BF7C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z - actor->vel.z); + func_enmy_80062C38(actor->obj.pos.x, actor->obj.pos.z); } actor->obj.pos.y -= actor->vel.y; @@ -4212,26 +4234,26 @@ void func_800763A4(Actor* actor) { actor->timer_04C = 3; if (gLevelMode == LEVELMODE_ALL_RANGE) { - func_8007D2C8(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y, - actor->obj.pos.z - actor->vel.z, actor->scale * 3.0f); + func_effect_8007D2C8(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y, + actor->obj.pos.z - actor->vel.z, actor->scale * 3.0f); } - func_8007D2C8(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y, actor->obj.pos.z - actor->vel.z, - actor->scale * 3.0f); + func_effect_8007D2C8(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y, + actor->obj.pos.z - actor->vel.z, actor->scale * 3.0f); if ((actor->obj.id == OBJ_ACTOR_197) && (actor->aiType < 8)) { - func_8007A6F0(&actor->obj.pos, 0x2903B009); + func_effect_8007A6F0(&actor->obj.pos, 0x2903B009); } else { - func_8007A6F0(&actor->obj.pos, 0x2903A008); + func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); } if ((actor->obj.id == OBJ_ACTOR_200) && (actor->unk_0B4 == 2)) { if (actor->fwork[17] < 360.0f) { - func_800A69F8(1, actor->obj.pos.x + 20.0f, actor->obj.pos.y, actor->obj.pos.z); + func_play_800A69F8(1, actor->obj.pos.x + 20.0f, actor->obj.pos.y, actor->obj.pos.z); actor->fwork[17] = 777.0f; } if (actor->fwork[18] < 360.0f) { - func_800A69F8(0, actor->obj.pos.x - 20.0f, actor->obj.pos.y, actor->obj.pos.z); + func_play_800A69F8(0, actor->obj.pos.x - 20.0f, actor->obj.pos.y, actor->obj.pos.z); actor->fwork[18] = 777.0f; } } @@ -4239,55 +4261,58 @@ void func_800763A4(Actor* actor) { if ((actor->obj.pos.y < (gGroundLevel + 30.0f)) && (gLevelType == LEVELTYPE_PLANET)) { actor->vel.z = 0.0f; if (D_80161A88 == 2) { - func_8007D9DC(actor->obj.pos.x, gGroundLevel + 2.0f, actor->obj.pos.z, 3.0f, 20.0f, 0); - func_8007D9DC(actor->obj.pos.x, gGroundLevel + 2.0f, actor->obj.pos.z, 3.0f, 20.0f, 10); - func_8007D9DC(actor->obj.pos.x, gGroundLevel + 2.0f, actor->obj.pos.z, 3.0f, 20.0f, 20); - func_8007ADF4(actor->obj.pos.x, gGroundLevel, actor->obj.pos.z, 0.1f, 3.0f); + func_effect_8007D9DC(actor->obj.pos.x, gGroundLevel + 2.0f, actor->obj.pos.z, 3.0f, 20.0f, + 0); + func_effect_8007D9DC(actor->obj.pos.x, gGroundLevel + 2.0f, actor->obj.pos.z, 3.0f, 20.0f, + 10); + func_effect_8007D9DC(actor->obj.pos.x, gGroundLevel + 2.0f, actor->obj.pos.z, 3.0f, 20.0f, + 20); + func_effect_8007ADF4(actor->obj.pos.x, gGroundLevel, actor->obj.pos.z, 0.1f, 3.0f); } else { - func_800365E4(actor->obj.pos.x, 3.0f, actor->obj.pos.z, actor->obj.pos.x, actor->obj.pos.z, - 0.0f, 0.0f, 90.0f, 6.5f, 0, 0); + func_beam_800365E4(actor->obj.pos.x, 3.0f, actor->obj.pos.z, actor->obj.pos.x, + actor->obj.pos.z, 0.0f, 0.0f, 90.0f, 6.5f, 0, 0); } - func_8007C120(actor->obj.pos.x, 20.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, actor->scale * 0.05f, - 0x1E); + func_effect_8007C120(actor->obj.pos.x, 20.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, + actor->scale * 0.05f, 0x1E); if ((gCurrentLevel == LEVEL_FORTUNA) || (gCurrentLevel == LEVEL_VENOM_2)) { - func_8007C688(actor->obj.pos.x, gGroundLevel + 30.0f, actor->obj.pos.z, 3.0f, 60); + func_effect_8007C688(actor->obj.pos.x, gGroundLevel + 30.0f, actor->obj.pos.z, 3.0f, 60); if (gCurrentLevel == LEVEL_FORTUNA) { - func_80062C38(actor->obj.pos.x, actor->obj.pos.z); + func_enmy_80062C38(actor->obj.pos.x, actor->obj.pos.z); } } } actor->obj.pos.y -= actor->vel.y; - func_8007D0E0(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y + 30.0f, - actor->obj.pos.z - actor->vel.z, actor->scale * 5.0f); + func_effect_8007D0E0(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y + 30.0f, + actor->obj.pos.z - actor->vel.z, actor->scale * 5.0f); if (gLevelMode == LEVELMODE_ALL_RANGE) { - func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, actor->vel.x, 10.0f, - actor->vel.z, actor->scale * 3.0f, 20); + func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, actor->vel.x, + 10.0f, actor->vel.z, actor->scale * 3.0f, 20); if (sp60 == 999) { - func_8007C688(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->scale * 3.0f, - 70); + func_effect_8007C688(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, + actor->scale * 3.0f, 70); } for (var_s0 = 0; var_s0 < 4; var_s0++) { if (Rand_ZeroOne() < 0.7f) { if (gCurrentLevel == LEVEL_FORTUNA) { - func_800A69F8(4, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z); + func_play_800A69F8(4, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z); } else { - func_800794CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f); + func_effect_800794CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f); } } } } else { - func_8007BFFC(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y + 30.0f, - (actor->obj.pos.z - actor->vel.z) + 48.0f, 0.0f, 0.0f, 0.0f, actor->scale * 3.0f, - 5); + func_effect_8007BFFC(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y + 30.0f, + (actor->obj.pos.z - actor->vel.z) + 48.0f, 0.0f, 0.0f, 0.0f, + actor->scale * 3.0f, 5); } actor->timer_0BE = 2; if ((actor->obj.id == OBJ_ACTOR_197) && (actor->aiType < 8)) { - func_8007A6F0(&actor->obj.pos, 0x2903B009); + func_effect_8007A6F0(&actor->obj.pos, 0x2903B009); } else { - func_8007A6F0(&actor->obj.pos, 0x2903A008); + func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); } } } @@ -4298,58 +4323,58 @@ void func_800763A4(Actor* actor) { for (var_s0 = 0; var_s0 < 4; var_s0++) { if (Rand_ZeroOne() < 0.7f) { if (gCurrentLevel == LEVEL_FORTUNA) { - func_800A69F8(4, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z); + func_play_800A69F8(4, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z); } else { - func_800794CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f); + func_effect_800794CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f); } } } - func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->vel.x, actor->vel.y, - actor->vel.z, 5.0f, 15); - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z - actor->vel.z, 8.0f); + func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->vel.x, actor->vel.y, + actor->vel.z, 5.0f, 15); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z - actor->vel.z, 8.0f); } else { if ((actor->unk_0B4 != 0xD) && (actor->unk_0B4 != 61)) { - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z - actor->vel.z, - actor->scale * 5.0f); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z - actor->vel.z, + actor->scale * 5.0f); } if (actor->unk_0B4 == 0x24) { - func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->vel.x, actor->vel.y, - actor->vel.z, 5.0f, 0xF); + func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->vel.x, + actor->vel.y, actor->vel.z, 5.0f, 0xF); } } actor->timer_0BE = 2; if ((actor->obj.id == OBJ_ACTOR_197) && (actor->aiType < 8)) { - func_8007A6F0(&actor->obj.pos, 0x2903B009); + func_effect_8007A6F0(&actor->obj.pos, 0x2903B009); } else { - func_8007A6F0(&actor->obj.pos, 0x2903A008); + func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); } } } if (gLevelMode == LEVELMODE_ALL_RANGE) { - D_80177F20[actor->index + 1] = actor->obj.pos.x; - D_80178028[actor->index + 1] = actor->obj.pos.z; - D_80178130[actor->index + 1] = actor->unk_0F4.y + 180.0f; + D_ctx_80177F20[actor->index + 1] = actor->obj.pos.x; + D_ctx_80178028[actor->index + 1] = actor->obj.pos.z; + D_ctx_80178130[actor->index + 1] = actor->unk_0F4.y + 180.0f; } if (actor->obj.id == OBJ_ACTOR_197) { - func_8002EE64(actor); + func_360_8002EE64(actor); } } -void func_8007717C(Actor* actor) { +void func_enmy2_8007717C(Actor* actor) { if ((actor->unk_0B4 == 0x30) || (actor->unk_0B4 == 0x31) || (actor->unk_0B4 == 0x32)) { - func_i6_801A3BD4(actor); + SectorY_801A3BD4(actor); } else { - func_800763A4(actor); + func_enmy2_800763A4(actor); } } -void func_800771CC(Actor* actor) { +void func_enmy2_800771CC(Actor* actor) { Vec3f sp24; Math_Vec3fFromAngles(&sp24, actor->obj.rot.x, actor->obj.rot.y, 50.0f); @@ -4358,6 +4383,6 @@ void func_800771CC(Actor* actor) { actor->vel.z = sp24.z; } -void func_80077218(Actor* actor) { - func_800515C4(); +void func_enmy2_80077218(Actor* actor) { + func_demo_800515C4(); } diff --git a/src/main/fox_fade.c b/src/main/fox_fade.c index 1f1e9240..8bb57049 100644 --- a/src/main/fox_fade.c +++ b/src/main/fox_fade.c @@ -1,16 +1,16 @@ #include "global.h" -void func_80084370(s32 arg0) { +void func_fade_80084370(s32 arg0) { Graphics_FillRectangle(&gMasterDisp, 0, 0, arg0, SCREEN_HEIGHT, 0, 0, 0, 255); Graphics_FillRectangle(&gMasterDisp, SCREEN_WIDTH - arg0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0, 0, 255); } -void func_800843FC(s32 arg0) { +void func_fade_800843FC(s32 arg0) { Graphics_FillRectangle(&gMasterDisp, 0, 0, SCREEN_WIDTH, arg0, 0, 0, 0, 255); Graphics_FillRectangle(&gMasterDisp, 0, SCREEN_HEIGHT - arg0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0, 0, 255); } -void func_80084488(s32 arg0) { +void func_fade_80084488(s32 arg0) { s32 var_s1; RCP_SetupDL_12(); @@ -28,17 +28,17 @@ void func_80084488(s32 arg0) { Matrix_Pop(&gGfxMatrix); } -void func_80084688(s32 arg0, s32 arg1) { +void func_fade_80084688(s32 arg0, s32 arg1) { if (arg1 != 0) { switch (arg0) { case 0: - func_80084488(arg1); + func_fade_80084488(arg1); break; case 1: - func_80084370(arg1); + func_fade_80084370(arg1); break; case 2: - func_800843FC(arg1); + func_fade_800843FC(arg1); break; default: (void) "そのような フェード は ない (%d)\n"; // There is no such fade diff --git a/src/main/fox_game.c b/src/main/fox_game.c index 6f34e278..b9537167 100644 --- a/src/main/fox_game.c +++ b/src/main/fox_game.c @@ -3,29 +3,29 @@ #include "sf64dma.h" #include "assets/ast_logo.h" -f32 D_80161A10; -f32 D_80161A14; +f32 D_game_80161A10; +f32 D_game_80161A14; s32 gPlayerInactive[4]; -s32 D_80161A28; -u8 D_80161A2C; -u16 D_80161A2E; +s32 D_game_80161A28; +u8 D_game_80161A2C; +u16 D_game_80161A2E; u16 gNextLevel; u16 gNextGameState; -u16 D_80161A34; +u16 D_game_80161A34; u16 gBgColor; u8 gBlurAlpha; -u8 D_80161A39; -f32 D_80161A3C; -f32 D_80161A40; -f32 D_80161A44; +u8 D_game_80161A39; +f32 D_game_80161A3C; +f32 D_game_80161A40; +f32 D_game_80161A44; -s32 D_800D2860[4] = { true, true, true, true }; -s32 D_800D2870 = 0; -s32 D_800D2874[] = { 0, 160, 0, 160 }; -s32 D_800D2884[] = { 159, 319, 159, 319 }; -s32 D_800D2894[] = { 0, 0, 120, 120 }; -s32 D_800D28A4[] = { 119, 119, 239, 239 }; -s32 sOverlaySetups[] = { +s32 D_game_800D2860[4] = { true, true, true, true }; +s32 D_game_800D2870 = 0; +static s32 D_game_800D2874[] = { 0, 160, 0, 160 }; +static s32 D_game_800D2884[] = { 159, 319, 159, 319 }; +static s32 D_game_800D2894[] = { 0, 0, 120, 120 }; +static s32 D_game_800D28A4[] = { 119, 119, 239, 239 }; +static s32 sOverlaySetups[] = { /* LEVEL_CORNERIA */ OVL_SETUP_CORNERIA, /* LEVEL_METEO */ OVL_SETUP_METEO, /* LEVEL_SECTOR_X */ OVL_SETUP_SECTOR_X, @@ -57,18 +57,18 @@ void Game_Initialize(void) { D_Timer_8017783C = 0; gBgColor = 0; gBlurAlpha = 0xFF; - D_80161A3C = 45.0f; - D_80161A40 = 10.0f; - D_80161A44 = 12800.0f; - D_80161A10 = D_80161A14 = 0.0f; + D_game_80161A3C = 45.0f; + D_game_80161A40 = 10.0f; + D_game_80161A44 = 12800.0f; + D_game_80161A10 = D_game_80161A14 = 0.0f; gOverlaySetup = OVL_SETUP_LOGO; gOverlayStage = 0; Overlay_InitDma(); - D_80161A39 = true; + D_game_80161A39 = true; } void Game_SetGameState(void) { - D_80161A14 = D_80161A10; + D_game_80161A14 = D_game_80161A10; if (gNextGameState == GSTATE_NONE) { return; @@ -77,48 +77,48 @@ void Game_SetGameState(void) { switch (gNextGameState) { case GSTATE_PLAY: gCurrentLevel = gNextLevel; - func_800A5844(); - D_80177854 = 0; - D_8017827C = D_80161A2E; - D_80161A2E = 0; - if ((D_8017827C != 0) && (gCurrentLevel != LEVEL_VENOM_ANDROSS)) { - D_8017782C = 0; + func_play_800A5844(); + D_ctx_80177854 = 0; + D_ctx_8017827C = D_game_80161A2E; + D_game_80161A2E = 0; + if ((D_ctx_8017827C != 0) && (gCurrentLevel != LEVEL_VENOM_ANDROSS)) { + D_ctx_8017782C = 0; } break; case GSTATE_MAP: - D_80177B40 = 0; + D_ctx_80177B40 = 0; break; case GSTATE_GAME_OVER: - D_80177868 = 0; + D_ctx_80177868 = 0; break; } Memory_FreeAll(); - func_800A6148(); + func_play_800A6148(); gGameState = gNextGameState; D_Timer_8017783C = 3; - D_8015F924 = 0; + D_360_8015F924 = 0; gNextGameState = GSTATE_NONE; gOverlayStage = 0; gFillScreenColor = gBgColor = 0; - D_80177D20 = 0.0f; - if ((gCurrentLevel == LEVEL_VENOM_2) && (D_8017827C == 2)) { + D_ctx_80177D20 = 0.0f; + if ((gCurrentLevel == LEVEL_VENOM_2) && (D_ctx_8017827C == 2)) { gFillScreenColor = gBgColor = 0xFFFF; // 248, 248, 248 - D_80178348 = D_80178350 = D_80178354 = 255; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; } else { - D_80178348 = D_80178350 = D_80178354 = 0; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; Audio_FadeOutAll(1); } - D_80178340 = 255; - D_80178380[0] = 0; + D_ctx_80178340 = 255; + D_ctx_80178380[0] = 0; gRadioState = 0; - D_80178428 = 0.0f; + D_ctx_80178428 = 0.0f; gBlurAlpha = 255; gDrawMode = DRAWMODE_0; Audio_ClearVoice(); Audio_SetBaseSfxReverb(0); } -bool func_800A1B6C(void) { +bool func_game_800A1B6C(void) { static u8 sHoldTimer = 0; static u8 sOverlaySelect = 99; static u8 sCurrentOverlay = 99; @@ -141,7 +141,7 @@ bool func_800A1B6C(void) { return false; } -void func_800A1C14(Gfx** arg0) { +void func_game_800A1C14(Gfx** arg0) { gSPDisplayList((*arg0)++, D_Gfx_800DBAA0); gDPSetScissor((*arg0)++, G_SC_NON_INTERLACE, 8, 8, SCREEN_WIDTH - 8, SCREEN_HEIGHT - 8); gDPSetDepthImage((*arg0)++, &gZBuffer); @@ -165,7 +165,7 @@ void func_800A1C14(Gfx** arg0) { gDPSetColorDither((*arg0)++, G_CD_MAGICSQ); } -void func_800A1E68(Gfx** arg0) { +void func_game_800A1E68(Gfx** arg0) { gSPDisplayList((*arg0)++, D_Gfx_800DBAA0); gDPSetScissor((*arg0)++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT * 3); gDPSetFillColor((*arg0)++, FILL_COLOR(0x0001)); @@ -175,112 +175,112 @@ void func_800A1E68(Gfx** arg0) { gDPSetColorDither((*arg0)++, G_CD_MAGICSQ); } -void func_800A1F44(void) { +void func_game_800A1F44(void) { gViewport->vp.vscale[0] = gViewport->vp.vtrans[0] = SCREEN_WIDTH * 2; gViewport->vp.vscale[1] = gViewport->vp.vtrans[1] = SCREEN_HEIGHT * 2; gViewport->vp.vscale[2] = gViewport->vp.vtrans[2] = G_MAXZ / 2; gViewport->vp.vscale[3] = gViewport->vp.vtrans[3] = 0; } -void func_800A1FB0(Gfx** arg0, u8 arg1, u8 arg2) { +void func_game_800A1FB0(Gfx** arg0, u8 arg1, u8 arg2) { if ((arg1 != 1) && (arg1 == 4)) { switch (arg2) { case 0: - gViewport->vp.vscale[0] = SCREEN_WIDTH * (D_80161A14 - 1.0f) * 2; - gViewport->vp.vscale[1] = SCREEN_HEIGHT * (D_80161A14 - 1.0f) * 2; + gViewport->vp.vscale[0] = SCREEN_WIDTH * (D_game_80161A14 - 1.0f) * 2; + gViewport->vp.vscale[1] = SCREEN_HEIGHT * (D_game_80161A14 - 1.0f) * 2; gViewport->vp.vscale[2] = G_MAXZ / 2; gViewport->vp.vscale[3] = 0; - gViewport->vp.vtrans[0] = SCREEN_WIDTH * (2.0f - D_80161A14) * 2; - gViewport->vp.vtrans[1] = SCREEN_HEIGHT * (2.0f - D_80161A14) * 2; + gViewport->vp.vtrans[0] = SCREEN_WIDTH * (2.0f - D_game_80161A14) * 2; + gViewport->vp.vtrans[1] = SCREEN_HEIGHT * (2.0f - D_game_80161A14) * 2; gViewport->vp.vtrans[2] = G_MAXZ / 2; gViewport->vp.vtrans[3] = 0; gDPSetScissor((*arg0)++, G_SC_NON_INTERLACE, 8, 8, SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2); break; case 1: - gViewport->vp.vscale[0] = SCREEN_WIDTH * (D_80161A14 - 1.0f) * 2; - gViewport->vp.vscale[1] = SCREEN_HEIGHT * (D_80161A14 - 1.0f) * 2; + gViewport->vp.vscale[0] = SCREEN_WIDTH * (D_game_80161A14 - 1.0f) * 2; + gViewport->vp.vscale[1] = SCREEN_HEIGHT * (D_game_80161A14 - 1.0f) * 2; gViewport->vp.vscale[2] = G_MAXZ / 2; gViewport->vp.vscale[3] = 0; - gViewport->vp.vtrans[0] = SCREEN_WIDTH * D_80161A14 * 2; - gViewport->vp.vtrans[1] = SCREEN_HEIGHT * (2.0f - D_80161A14) * 2; + gViewport->vp.vtrans[0] = SCREEN_WIDTH * D_game_80161A14 * 2; + gViewport->vp.vtrans[1] = SCREEN_HEIGHT * (2.0f - D_game_80161A14) * 2; gViewport->vp.vtrans[2] = G_MAXZ / 2; gViewport->vp.vtrans[3] = 0; gDPSetScissor((*arg0)++, G_SC_NON_INTERLACE, SCREEN_WIDTH / 2, 8, SCREEN_WIDTH - 8, SCREEN_HEIGHT / 2); break; case 2: - gViewport->vp.vscale[0] = SCREEN_WIDTH * (D_80161A14 - 1.0f) * 2; - gViewport->vp.vscale[1] = SCREEN_HEIGHT * (D_80161A14 - 1.0f) * 2; + gViewport->vp.vscale[0] = SCREEN_WIDTH * (D_game_80161A14 - 1.0f) * 2; + gViewport->vp.vscale[1] = SCREEN_HEIGHT * (D_game_80161A14 - 1.0f) * 2; gViewport->vp.vscale[2] = G_MAXZ / 2; gViewport->vp.vscale[3] = 0; - gViewport->vp.vtrans[0] = SCREEN_WIDTH * (2.0f - D_80161A14) * 2; - gViewport->vp.vtrans[1] = SCREEN_HEIGHT * D_80161A14 * 2; + gViewport->vp.vtrans[0] = SCREEN_WIDTH * (2.0f - D_game_80161A14) * 2; + gViewport->vp.vtrans[1] = SCREEN_HEIGHT * D_game_80161A14 * 2; gViewport->vp.vtrans[2] = G_MAXZ / 2; gViewport->vp.vtrans[3] = 0; gDPSetScissor((*arg0)++, G_SC_NON_INTERLACE, 8, SCREEN_HEIGHT / 2, SCREEN_WIDTH / 2, SCREEN_HEIGHT - 8); break; case 3: - gViewport->vp.vscale[0] = SCREEN_WIDTH * (D_80161A14 - 1.0f) * 2; - gViewport->vp.vscale[1] = SCREEN_HEIGHT * (D_80161A14 - 1.0f) * 2; + gViewport->vp.vscale[0] = SCREEN_WIDTH * (D_game_80161A14 - 1.0f) * 2; + gViewport->vp.vscale[1] = SCREEN_HEIGHT * (D_game_80161A14 - 1.0f) * 2; gViewport->vp.vscale[2] = G_MAXZ / 2; gViewport->vp.vscale[3] = 0; - gViewport->vp.vtrans[0] = SCREEN_WIDTH * D_80161A14 * 2; - gViewport->vp.vtrans[1] = SCREEN_HEIGHT * D_80161A14 * 2; + gViewport->vp.vtrans[0] = SCREEN_WIDTH * D_game_80161A14 * 2; + gViewport->vp.vtrans[1] = SCREEN_HEIGHT * D_game_80161A14 * 2; gViewport->vp.vtrans[2] = G_MAXZ / 2; gViewport->vp.vtrans[3] = 0; gDPSetScissor((*arg0)++, G_SC_NON_INTERLACE, SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2, SCREEN_WIDTH - 8, SCREEN_HEIGHT - 8); break; default: - func_800A1F44(); + func_game_800A1F44(); break; } } else { - func_800A1F44(); + func_game_800A1F44(); if (1) {} } gSPViewport((*arg0)++, gViewport++); } -void func_800A24DC(s32 arg0) { +void func_game_800A24DC(s32 arg0) { switch (gDrawMode) { case DRAWMODE_0: break; case DRAWMODE_1: - func_8003DAF0(); - func_menu_80187520(104, NULL); + func_bg_8003DAF0(); + OvlMenu_CallFunction(104, NULL); break; case DRAWMODE_2: - func_8003DAF0(); - func_menu_80187520(108, NULL); + func_bg_8003DAF0(); + OvlMenu_CallFunction(108, NULL); break; case DRAW_MAP: - func_8003DAF0(); - func_menu_80187520(106, NULL); + func_bg_8003DAF0(); + OvlMenu_CallFunction(106, NULL); break; case DRAWMODE_4: gPlayerNum = arg0; - func_80057D00(); + func_display_80057D00(); break; case DRAWMODE_5: - func_8003DAF0(); - func_menu_80187520(110, NULL); + func_bg_8003DAF0(); + OvlMenu_CallFunction(110, NULL); break; case DRAWMODE_6: - func_800C2190(); + func_versus_800C2190(); break; case DRAWMODE_7: gPlayerNum = arg0; func_800A3CA0(); break; case DRAWMODE_8: - func_8003DAF0(); + func_bg_8003DAF0(); gPlayerNum = arg0; - func_ending_8018AAC4(); + Ending_8018AAC4(); break; } } -void func_800A25DC(void) { +void func_game_800A25DC(void) { switch (gGameState) { case GSTATE_INIT: gOverlaySetup = OVL_SETUP_TITLE; @@ -320,16 +320,16 @@ void Game_Update(void) { u8 var_v0_3; Game_SetGameState(); - if (D_80161A39) { - func_800A1E68(&gUnkDisp1); - D_80161A39 = false; + if (D_game_80161A39) { + func_game_800A1E68(&gUnkDisp1); + D_game_80161A39 = false; return; } - func_800A1C14(&gUnkDisp1); - func_800A25DC(); - if (func_800A1B6C() != true) { + func_game_800A1C14(&gUnkDisp1); + func_game_800A25DC(); + if (func_game_800A1B6C() != true) { Lib_Perspective(&gUnkDisp1); - func_800A1FB0(&gUnkDisp1, gCamCount, 0); + func_game_800A1FB0(&gUnkDisp1, gCamCount, 0); if (D_Timer_8017783C != 0) { D_Timer_8017783C--; } @@ -377,36 +377,37 @@ void Game_Update(void) { break; case GSTATE_INIT: gGameState = GSTATE_TITLE; - D_80177AE0 = 1; - D_80177824 = 1; + D_ctx_80177AE0 = 1; + D_ctx_80177824 = 1; Memory_FreeAll(); - func_800A6148(); + func_play_800A6148(); gCamCount = 1; gLifeCount[0] = 2; - D_80177D20 = 0.0f; - D_8016170C = gCsFrameCount = D_80177830 = D_80177838 = D_80177840 = D_80178754 = gVersusMode = - D_80177AE0 = D_80178410 = D_80177B40 = D_80177854 = gOptionMenuStatus = gDrawMode = - gShowBossHealth = D_80161A2C = gBgColor = D_80178340 = 0; - gNextGameState = D_80177C94 = D_80177CAC = D_80177CB4 = D_80177CBC = D_80177CC4 = D_80177C9C = - D_80177CA4 = D_80161A5C = D_80161A34 = 0; + D_ctx_80177D20 = 0.0f; + D_hud_8016170C = gCsFrameCount = D_ctx_80177830 = D_ctx_80177838 = D_ctx_80177840 = D_versus_80178754 = + gVersusMode = D_ctx_80177AE0 = D_ctx_80178410 = D_ctx_80177B40 = D_ctx_80177854 = + gOptionMenuStatus = gDrawMode = gShowBossHealth = D_game_80161A2C = gBgColor = D_ctx_80178340 = + 0; + gNextGameState = D_ctx_80177C94 = D_ctx_80177CAC = D_ctx_80177CB4 = D_ctx_80177CBC = D_ctx_80177CC4 = + D_ctx_80177C9C = D_ctx_80177CA4 = D_play_80161A5C = D_game_80161A34 = 0; for (i = 0; i < 4; i++) { gBoostButton[i] = L_CBUTTONS; gBrakeButton[i] = D_CBUTTONS; gShootButton[i] = A_BUTTON; gBombButton[i] = B_BUTTON; - D_80177958[i] = 1.0f; + D_ctx_80177958[i] = 1.0f; - D_80177858[i] = 3; - D_80177870[i] = 0; - D_800D2860[i] = true; - D_80178380[i] = 0; + D_ctx_80177858[i] = 3; + D_ctx_80177870[i] = 0; + D_game_800D2860[i] = true; + D_ctx_80178380[i] = 0; } gVersusStage = 0; - D_801778A4 = 3; + D_ctx_801778A4 = 3; gBlurAlpha = 255; for (i = 0; i < 30; i++) { - D_800D3180[i] = 0; + D_play_800D3180[i] = 0; } gExpertMode = false; gSoundMode = gSaveFile.save.data.soundMode; @@ -443,43 +444,43 @@ void Game_Update(void) { func_8001D8A8(2, gVolumeSettings[2]); break; case GSTATE_TITLE: - func_menu_80187520(103, NULL); + OvlMenu_CallFunction(103, NULL); break; case GSTATE_MENU: - func_menu_80187520(107, NULL); + OvlMenu_CallFunction(107, NULL); break; case GSTATE_MAP: - func_menu_8019E8D0(); + Map_8019E8D0(); break; case GSTATE_VS_INIT: - func_800C20B0(); + func_versus_800C20B0(); break; case GSTATE_PLAY: - func_800B86CC(); + func_play_800B86CC(); break; case GSTATE_GAME_OVER: - func_menu_80187520(109, NULL); + OvlMenu_CallFunction(109, NULL); break; case GSTATE_CREDITS: gDrawMode = DRAWMODE_8; - func_ending_8018A96C(); + Ending_8018A96C(); break; default: break; } - func_800A24DC(0); + func_game_800A24DC(0); if (gCamCount == 2) { - func_800A1FB0(&gMasterDisp, gCamCount, 1); - func_800A24DC(1); + func_game_800A1FB0(&gMasterDisp, gCamCount, 1); + func_game_800A24DC(1); gDPPipeSync(gMasterDisp++); gDPSetScissor(gMasterDisp++, G_SC_NON_INTERLACE, 8, 8, SCREEN_WIDTH - 8, SCREEN_HEIGHT - 8); } else if ((gCamCount == 4) && (gDrawMode != DRAWMODE_0)) { - func_800A1FB0(&gMasterDisp, gCamCount, 3); - func_800A24DC(3); - func_800A1FB0(&gMasterDisp, gCamCount, 2); - func_800A24DC(2); - func_800A1FB0(&gMasterDisp, gCamCount, 1); - func_800A24DC(1); + func_game_800A1FB0(&gMasterDisp, gCamCount, 3); + func_game_800A24DC(3); + func_game_800A1FB0(&gMasterDisp, gCamCount, 2); + func_game_800A24DC(2); + func_game_800A1FB0(&gMasterDisp, gCamCount, 1); + func_game_800A24DC(1); gDPPipeSync(gMasterDisp++); gDPSetScissor(gMasterDisp++, G_SC_NON_INTERLACE, 8, 8, SCREEN_WIDTH - 8, SCREEN_HEIGHT - 8); gDPSetColorDither(gMasterDisp++, G_CD_NOISE); @@ -499,49 +500,51 @@ void Game_Update(void) { gDPFillRectangle(gMasterDisp++, SCREEN_WIDTH / 2 - 2, 8, SCREEN_WIDTH / 2 + 1, SCREEN_HEIGHT - 8); gDPFillRectangle(gMasterDisp++, 8, SCREEN_HEIGHT / 2 - 2, SCREEN_WIDTH - 8, SCREEN_HEIGHT / 2 + 1); - func_8008CB8C(); + func_hud_8008CB8C(); } spBB = 0; if (gCamCount == 1) { - Graphics_FillRectangle(&gMasterDisp, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, D_80178390[0], - D_801783A0[0], D_801783B0[0], D_80178380[0]); + Graphics_FillRectangle(&gMasterDisp, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, D_ctx_80178390[0], + D_ctx_801783A0[0], D_ctx_801783B0[0], D_ctx_80178380[0]); if ((gDrawMode == DRAWMODE_4) || (gDrawMode == DRAWMODE_8)) { - func_800BB5D0(); - if (D_80161A2C != 0) { - func_8008FA84(); - func_8008CA44(); + func_radio_800BB5D0(); + if (D_game_80161A2C != 0) { + func_hud_8008FA84(); + func_hud_8008CA44(); } - func_8008DE68(); + func_hud_8008DE68(); } } else { for (i = 0; i < gCamCount; i++) { if (gPlayer[i].timer_224 != 0) { - Graphics_FillRectangle(&gMasterDisp, D_800D2874[i], D_800D2894[i], D_800D2884[i], D_800D28A4[i], - D_80178348, D_80178350, D_80178354, D_80178340); + Graphics_FillRectangle(&gMasterDisp, D_game_800D2874[i], D_game_800D2894[i], D_game_800D2884[i], + D_game_800D28A4[i], D_ctx_80178348, D_ctx_80178350, D_ctx_80178354, + D_ctx_80178340); spBB = 1; } else { - Graphics_FillRectangle(&gMasterDisp, D_800D2874[i], D_800D2894[i], D_800D2884[i], D_800D28A4[i], - D_80178390[i], D_801783A0[i], D_801783B0[i], D_80178380[i]); + Graphics_FillRectangle(&gMasterDisp, D_game_800D2874[i], D_game_800D2894[i], D_game_800D2884[i], + D_game_800D28A4[i], D_ctx_80178390[i], D_ctx_801783A0[i], D_ctx_801783B0[i], + D_ctx_80178380[i]); } } } - func_80040CDC(); - func_8008865C(); - func_8002E548(); + func_bg_80040CDC(); + func_hud_8008865C(); + func_360_8002E548(); if ((gGameState == GSTATE_PLAY) && gVersusMode) { - func_800C1ED4(); + func_versus_800C1ED4(); } - func_80084688(0, D_80177C50); + func_fade_80084688(0, D_ctx_80177C50); if (spBB == 0) { - Graphics_FillRectangle(&gMasterDisp, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, D_80178348, D_80178350, - D_80178354, D_80178340); + Graphics_FillRectangle(&gMasterDisp, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, D_ctx_80178348, + D_ctx_80178350, D_ctx_80178354, D_ctx_80178340); } func_80016A50(); } } -Actor* func_800A3608(ObjectId objId) { +Actor* func_game_800A3608(ObjectId objId) { Actor* actor = gActors; s32 i; diff --git a/src/main/fox_hud.c b/src/main/fox_hud.c index 9ad48204..c6381dc3 100644 --- a/src/main/fox_hud.c +++ b/src/main/fox_hud.c @@ -16,16 +16,16 @@ f32 D_801616C0; f32 D_801616C4; f32 D_801616C8; s32 D_801616D0[13]; -s32 D_80161704; -s32 D_80161708; -s32 D_8016170C; -s32 D_80161710; +s32 D_hud_80161704; +s32 D_hud_80161708; +s32 D_hud_8016170C; +s32 D_hud_80161710; s32 gTotalHits; s32 D_80161718; s32 D_8016171C; -f32 D_80161720[3]; -s32 D_8016172C; -s32 D_80161730; +f32 D_hud_80161720[3]; +s32 D_hud_8016172C; +s32 D_hud_80161730; s32 gShowBossHealth; s32 D_80161738[4]; s32 D_80161748[4]; @@ -75,6 +75,9 @@ s32 D_80161900[20]; #include "assets/ast_venom_2.h" #include "assets/ast_katina.h" #include "assets/ast_macbeth.h" +#include "assets/ast_meteo.h" +#include "assets/ast_zoness.h" +#include "assets/ast_solar.h" #include "assets/ast_titania.h" #include "assets/ast_bolse.h" #include "assets/ast_fortuna.h" @@ -85,17 +88,9 @@ s32 D_80161900[20]; #include "assets/ast_allies.h" #include "assets/ast_star_wolf.h" -void func_80087788(void); +void func_hud_80087788(void); -extern u8 D_ME_6000000[]; -extern u8 D_KA_6000000[]; -extern u8 D_SO_6000000[]; -extern u8 D_ZO_6000000[]; -extern u8 D_BO_6000000[]; -extern u8 D_VE1_6000D80[]; -extern u8 D_VE2_60012D0[]; - -s16 D_800D1970 = 0; +s16 D_hud_800D1970 = 0; // unused UNK_TYPE D_800D1974[14] = { 0 }; @@ -129,7 +124,7 @@ Gfx D_800D1A40[] = { gsSPEndDisplayList(), }; -void func_80084930(f32 arg0, f32 arg1, s32 arg2) { +void func_hud_80084930(f32 arg0, f32 arg1, s32 arg2) { u8* D_800D1A58[] = { D_arwing_3000000, D_blue_marine_3000000, @@ -188,11 +183,11 @@ void func_80084930(f32 arg0, f32 arg1, s32 arg2) { } arg0 += 16.0f + 8 * (2 - i); - func_800869A0(arg0, arg1, arg2, 1.0f, 1, 99); + func_hud_800869A0(arg0, arg1, arg2, 1.0f, 1, 99); } } -void func_80084B94(s32 arg0) { +void func_hud_80084B94(s32 arg0) { s32 i; Vec3f D_800D1A70[] = { { 191.0f, -129.0f, -600.0f }, @@ -231,8 +226,8 @@ void func_80084B94(s32 arg0) { } } -void func_80084E78(Gfx** gfxP, void* arg1, void* arg2, u32 arg3, u32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8, - f32 arg9, f32 argA) { +void func_hud_80084E78(Gfx** gfxP, void* arg1, void* arg2, u32 arg3, u32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8, + f32 arg9, f32 argA) { gDPPipeSync((*gfxP)++); gDPLoadTLUT((*gfxP)++, 0x100, 0x100, arg2); gDPLoadTextureBlock((*gfxP)++, arg1, G_IM_FMT_CI, G_IM_SIZ_8b, arg3, arg4, 0, G_TX_NOMIRROR, G_TX_NOMIRROR, @@ -242,47 +237,47 @@ void func_80084E78(Gfx** gfxP, void* arg1, void* arg2, u32 arg3, u32 arg4, f32 a (s32) (1 / arg8 * 0x400)); } -void func_800853A4(f32 xPos, f32 yPos, f32 xScale, f32 yScale) { +void func_hud_800853A4(f32 xPos, f32 yPos, f32 xScale, f32 yScale) { TextureRect_8bCI(&gMasterDisp, D_1013170, D_1013570, 24, 17, xPos, yPos, xScale, yScale); } -void func_80085404(f32 xPos, f32 yPos, f32 xScale, f32 yScale) { +void func_hud_80085404(f32 xPos, f32 yPos, f32 xScale, f32 yScale) { TextureRect_4bCI(&gMasterDisp, D_1011280, D_10116A0, 48, 44, xPos, yPos, xScale, yScale); } -void func_80085464(f32 arg0, f32 arg1) { +void func_hud_80085464(f32 arg0, f32 arg1) { TextureRect_4bCI(&gMasterDisp, D_1011AC0, D_1011B90, 16, 26, arg0, arg1, 1.0f, 1.0f); } -void func_800854BC(f32 arg0, f32 arg1) { +void func_hud_800854BC(f32 arg0, f32 arg1) { TextureRect_4bCI(&gMasterDisp, D_1011BB0, D_1011C80, 16, 26, arg0, arg1, 1.0f, 1.0f); } -void func_80085514(f32 arg0, f32 arg1) { +void func_hud_80085514(f32 arg0, f32 arg1) { TextureRect_4bCI(&gMasterDisp, D_1011CA0, D_1011D70, 16, 26, arg0, arg1, 1.0f, 1.0f); } -void func_8008556C(f32 arg0, f32 arg1) { +void func_hud_8008556C(f32 arg0, f32 arg1) { TextureRect_4bCI(&gMasterDisp, D_1011D90, D_1011E60, 16, 26, arg0, arg1, 1.0f, 1.0f); } -void func_800855C4(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { +void func_hud_800855C4(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { TextureRect_8bIA_MirX(&gMasterDisp, D_1002280, 8, 12, arg0, arg1, arg2, arg3); } -void func_80085618(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { +void func_hud_80085618(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { TextureRect_8bIA(&gMasterDisp, D_1002280, 8, 12, arg0, arg1, arg2, arg3); } -void func_8008566C(f32 x, f32 y, f32 arg2, f32 arg3) { +void func_hud_8008566C(f32 x, f32 y, f32 arg2, f32 arg3) { TextureRect_8bIA(&gMasterDisp, D_10030D0, 8, 12, x, y, arg2, arg3); } -void func_800856C0(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { - func_80084E78(&gMasterDisp, &D_1013580, &D_1013700, 48, 12, arg0, arg1, arg2, arg3, 48.0f * arg4, 8.0f); +void func_hud_800856C0(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { + func_hud_80084E78(&gMasterDisp, &D_1013580, &D_1013700, 48, 12, arg0, arg1, arg2, arg3, 48.0f * arg4, 8.0f); } -void func_80085740(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { +void func_hud_80085740(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { if (gVersusMode) { TextureRect_8bIA(&gMasterDisp, D_versus_3000B20, 32, 5, arg0, arg1, arg2, arg3); } else { @@ -290,7 +285,7 @@ void func_80085740(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { } } -void func_800857DC(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { +void func_hud_800857DC(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { if (gVersusMode) { TextureRect_8bCI(&gMasterDisp, D_versus_300D3C0, D_versus_300D408, 24, 3, arg0, arg1, arg2, arg3); } else { @@ -298,7 +293,7 @@ void func_800857DC(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { } } -void func_80085890(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { +void func_hud_80085890(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { if (gVersusMode) { TextureRect_8bCI(&gMasterDisp, D_versus_300D350, D_versus_300D398, 24, 3, arg0, arg1, arg2, arg3); } else { @@ -306,7 +301,7 @@ void func_80085890(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { } } -void func_80085944(void) { +void func_hud_80085944(void) { Gfx* D_800D1A94[] = { D_101C170, D_101C000, D_101BE90, D_101BD20, D_101BBB0, D_101BA40, D_101B8D0, D_101B760, D_101B5F0, D_101B480, D_101B310, D_101B1A0 }; s32 i; @@ -365,7 +360,7 @@ void func_80085944(void) { y = D_800D1AD8[i + 1]; scale = 0.28f; - if (D_80177C70 == 2) { + if (D_ctx_80177C70 == 2) { x -= 7.00f; y += 7.00f; scale += 0.06f; @@ -414,7 +409,7 @@ void func_80085944(void) { y = D_800D1AD8[i + 1]; scale = 0.28f; - if (D_80177C70 == 2) { + if (D_ctx_80177C70 == 2) { x -= 7.00f; y += 7.00f; scale += 0.06f; @@ -458,7 +453,7 @@ void func_80085944(void) { D_801618B0[1] += 10.0f; } -void func_80086110(f32 arg0, f32 arg1, s32 arg2) { +void func_hud_80086110(f32 arg0, f32 arg1, s32 arg2) { f32 temp = 0.82f; s32 pad; @@ -466,10 +461,10 @@ void func_80086110(f32 arg0, f32 arg1, s32 arg2) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); if (arg2 != 0) { - func_800856C0((8.0f * temp) + arg0, arg1 + 2.0f, temp, 1.0f, arg2 / 255.0f); + func_hud_800856C0((8.0f * temp) + arg0, arg1 + 2.0f, temp, 1.0f, arg2 / 255.0f); } - if ((arg2 <= 0) && (arg2 != -2) && ((D_80177854 == 100) || (D_80177830 == 1) || (D_80177838 != 0))) { + if ((arg2 <= 0) && (arg2 != -2) && ((D_ctx_80177854 == 100) || (D_ctx_80177830 == 1) || (D_ctx_80177838 != 0))) { RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255); if ((arg2 == 0) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7)) { @@ -481,12 +476,12 @@ void func_80086110(f32 arg0, f32 arg1, s32 arg2) { RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - func_80085618(arg0, arg1, temp, 1.0f); - func_800855C4(arg0 + (7.0f * temp) + (temp * 6.0f) * 8.0f, arg1, 1.0f, 1.0f); - func_8008566C(arg0 + (7.0f * temp), arg1, temp * 6.0f, 1.0f); + func_hud_80085618(arg0, arg1, temp, 1.0f); + func_hud_800855C4(arg0 + (7.0f * temp) + (temp * 6.0f) * 8.0f, arg1, 1.0f, 1.0f); + func_hud_8008566C(arg0 + (7.0f * temp), arg1, temp * 6.0f, 1.0f); } -s32 func_800863C8(void) { +s32 func_hud_800863C8(void) { s32 ret = 0; switch (gCurrentLevel) { @@ -559,7 +554,7 @@ UnkStruct_D_800D1AEC D_800D1AEC[] = { { D_500A5F0, 16, 15, D_ANDROSS_C000A80, 128, 28 }, { D_5009F60, 16, 15, D_5000D50, 80, 12 }, }; -void func_80086444(void) { +void func_hud_80086444(void) { s32 i = 9; s32 j; @@ -595,7 +590,7 @@ void func_80086444(void) { } } -void func_80086664(f32 x, f32 y) { +void func_hud_80086664(f32 x, f32 y) { s32 i; s32 j; f32 x0; @@ -605,7 +600,7 @@ void func_80086664(f32 x, f32 y) { f32 x2; f32 y2; - j = func_800863C8(); + j = func_hud_800863C8(); x0 = x; y0 = y; @@ -666,7 +661,7 @@ void func_80086664(f32 x, f32 y) { TextureRect_8bIA(&gMasterDisp, D_800D1AEC[j].unk_00, D_800D1AEC[j].width, D_800D1AEC[j].height, x1 + 28.0f, y1 + 4.0f, 1.0f, 1.0f); } else { - func_80086444(); + func_hud_80086444(); } for (i = 0; i < D_800D1AEC[j].unk_14; i++) { @@ -674,18 +669,18 @@ void func_80086664(f32 x, f32 y) { y2 + i, 1.0f, 1.0f); } - if ((D_80177CA0 == 0) && (D_8015F924 == 0) && (gCurrentLevel != LEVEL_VENOM_ANDROSS) && + if ((D_ctx_80177CA0 == 0) && (D_360_8015F924 == 0) && (gCurrentLevel != LEVEL_VENOM_ANDROSS) && (gCurrentLevel != LEVEL_TRAINING)) { - func_80087788(); - func_80084B94(0); + func_hud_80087788(); + func_hud_80084B94(0); } if (gCurrentLevel != LEVEL_TRAINING) { - func_80084930(132.0f, 124.0f, gLifeCount[gPlayerNum]); + func_hud_80084930(132.0f, 124.0f, gLifeCount[gPlayerNum]); } } -void func_800869A0(f32 arg0, f32 arg1, s32 k, f32 arg3, s32 arg4, s32 arg5) { +void func_hud_800869A0(f32 arg0, f32 arg1, s32 k, f32 arg3, s32 arg4, s32 arg5) { s32 var_s2; s32 i; s32 j; @@ -716,23 +711,23 @@ void func_800869A0(f32 arg0, f32 arg1, s32 k, f32 arg3, s32 arg4, s32 arg5) { TextureRect_8bIA(&gMasterDisp, D_800D1CD4[k], 16, 15, arg0, arg1, arg3, arg3); } -void func_80086C08(f32 xPos, f32 yPos, f32 xScale, f32 yScale) { +void func_hud_80086C08(f32 xPos, f32 yPos, f32 xScale, f32 yScale) { RCP_SetupDL(&gMasterDisp, 0x4E); gDPSetPrimColor(gMasterDisp++, 0, 0, 60, 60, 128, 96); gDPSetAlphaDither(gMasterDisp++, G_AD_DISABLE); TextureRect_8bCI(&gMasterDisp, D_1013170, D_1013570, 24, 17, xPos, yPos, xScale, yScale); } -void func_80086CC8(void) { +void func_hud_80086CC8(void) { char pad; f32 sp18; f32 temp; - if ((D_80177854 != 0x64) && (D_80177838 != 0)) { - D_80177838 -= 1; + if ((D_ctx_80177854 != 0x64) && (D_ctx_80177838 != 0)) { + D_ctx_80177838 -= 1; } - if (D_80177838 == 1) { + if (D_ctx_80177838 == 1) { D_80161718 = 30; D_8016171C = 0; } @@ -740,20 +735,20 @@ void func_80086CC8(void) { temp = 108.0f; sp18 = 81.0f; - if (D_80177838 != 0) { - func_80086C08(temp - 4.5f - 32.0f, sp18 - 24.0f - 4.0f, 7.4f, 3.9f); + if (D_ctx_80177838 != 0) { + func_hud_80086C08(temp - 4.5f - 32.0f, sp18 - 24.0f - 4.0f, 7.4f, 3.9f); if (gCurrentLevel != LEVEL_TRAINING) { - func_80086C08(122.0f, 122.0f, 2.9f, 1.2f); + func_hud_80086C08(122.0f, 122.0f, 2.9f, 1.2f); } - func_80086664(temp, sp18 - 24.0f); + func_hud_80086664(temp, sp18 - 24.0f); } } f32 D_800D1CFC = 0.0f; -void func_80086DCC(void) { +void func_hud_80086DCC(void) { s32 i; s32 j; s32 temp; @@ -761,11 +756,11 @@ void func_80086DCC(void) { f32 x; f32 y; - if ((D_80177854 != 100) && (D_80177840)) { - D_80177840--; + if ((D_ctx_80177854 != 100) && (D_ctx_80177840)) { + D_ctx_80177840--; } - boolTemp = D_80177930; + boolTemp = D_ctx_80177930; if ((gCurrentLevel == LEVEL_TITANIA) || (gCurrentLevel == LEVEL_BOLSE) || (gCurrentLevel == LEVEL_VENOM_1) || (gCurrentLevel == LEVEL_VENOM_2) || (gCurrentLevel == LEVEL_AREA_6) || (gCurrentLevel == LEVEL_AQUAS) || @@ -776,55 +771,55 @@ void func_80086DCC(void) { temp = 0; if (gCurrentLevel == LEVEL_AQUAS) { - if (D_80177840 <= 100) { + if (D_ctx_80177840 <= 100) { temp = 5; } - if (D_80177840 <= 96) { + if (D_ctx_80177840 <= 96) { temp = 5; } - if (D_80177840 <= 92) { + if (D_ctx_80177840 <= 92) { temp = 4; } - if (D_80177840 <= 87) { + if (D_ctx_80177840 <= 87) { temp = 3; } - if (D_80177840 <= 82) { + if (D_ctx_80177840 <= 82) { temp = 2; } - if (D_80177840 <= 77) { + if (D_ctx_80177840 <= 77) { temp = 1; } - if (D_80177840 == 0) { + if (D_ctx_80177840 == 0) { temp = 0; } - if ((D_80177840 == 92) || (D_80177840 == 87) || (D_80177840 == 82) || (D_80177840 == 77)) { + if ((D_ctx_80177840 == 92) || (D_ctx_80177840 == 87) || (D_ctx_80177840 == 82) || (D_ctx_80177840 == 77)) { AUDIO_PLAY_SFX(0x49008031U, gDefaultSfxSource, 4U); } } else { - if (D_80177840 <= 100) { + if (D_ctx_80177840 <= 100) { temp = 5; } - if (D_80177840 <= 90) { + if (D_ctx_80177840 <= 90) { temp = 5; } - if (D_80177840 <= 80) { + if (D_ctx_80177840 <= 80) { temp = 4; } - if (D_80177840 <= 72) { + if (D_ctx_80177840 <= 72) { temp = 3; } - if (D_80177840 <= 64) { + if (D_ctx_80177840 <= 64) { temp = 2; } - if (D_80177840 <= 56) { + if (D_ctx_80177840 <= 56) { temp = 1; } - if (D_80177840 == 0) { + if (D_ctx_80177840 == 0) { temp = 0; } - if ((D_80177840 == 80) || (D_80177840 == 72) || (D_80177840 == 64) || (D_80177840 == 56)) { + if ((D_ctx_80177840 == 80) || (D_ctx_80177840 == 72) || (D_ctx_80177840 == 64) || (D_ctx_80177840 == 56)) { if (!boolTemp) { AUDIO_PLAY_SFX(0x49008034U, gDefaultSfxSource, 4U); } else { @@ -854,7 +849,7 @@ void func_80086DCC(void) { break; } - j = func_800863C8(); + j = func_hud_800863C8(); if (temp != 0) { RCP_SetupDL(&gMasterDisp, 0x4C); @@ -907,7 +902,7 @@ void func_80086DCC(void) { y, 1.0f, 1.0f); case 5: - func_80086C08(30.0f + D_800D1CFC, 60.0f, 10.97f, 4.78f); + func_hud_80086C08(30.0f + D_800D1CFC, 60.0f, 10.97f, 4.78f); break; default: @@ -915,7 +910,7 @@ void func_80086DCC(void) { } } -void func_80087530(f32 x, f32 y, s32 number) { +void func_hud_80087530(f32 x, f32 y, s32 number) { u8* D_800D1D00[] = { D_arwing_3000000, D_blue_marine_3000000, D_landmaster_3000000 }; u16* D_800D1D0C[] = { D_arwing_3000080, D_blue_marine_3000080, D_landmaster_3000080 }; Player* player = &gPlayer[0]; @@ -978,7 +973,7 @@ void func_80087530(f32 x, f32 y, s32 number) { Graphics_DisplayHUDNumber(x2, y2, number); } -void func_80087788(void) { +void func_hud_80087788(void) { u16* D_800D1D18[] = { D_10050E0, D_100BAC0, D_100D900, D_10032A0 }; u8* D_800D1D28[] = { D_5006CB0, D_5006E90, D_5006B30 }; s32 shield; @@ -1011,7 +1006,7 @@ void func_80087788(void) { for (j = 0; j < 3; j++) { - func_80086C08(x[j][0] - 6.0f, y[j][1] - 1.0f, 2.4f, 0.7f); + func_hud_80086C08(x[j][0] - 6.0f, y[j][1] - 1.0f, 2.4f, 0.7f); RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); @@ -1032,11 +1027,11 @@ void func_80087788(void) { } TextureRect_16bRGBA(&gMasterDisp, D_800D1D18[j + 1] + (44 * 40), 44, 4, x[j][0], y[j][0] + 40.0f, 1.0f, 1.0f); - func_80086110(x[j][2], y[j][2], shield); + func_hud_80086110(x[j][2], y[j][2], shield); } } -void func_80087B5C(void) { +void func_hud_80087B5C(void) { s32 i; s32 temp; f32 x0; @@ -1054,12 +1049,12 @@ void func_80087B5C(void) { f32 y5; f32 y6; - if (D_80177830 == 0) { + if (D_ctx_80177830 == 0) { Audio_KillSfxById(0x41007012U); D_801617C0[0] = 0; } - if ((D_80177854 != 100) && (D_80177830 == 1) && (!D_801617E8[0])) { + if ((D_ctx_80177854 != 100) && (D_ctx_80177830 == 1) && (!D_801617E8[0])) { switch (D_801617C0[0]) { case 0: D_801617C0[5] = gHitCount; @@ -1078,7 +1073,7 @@ void func_80087B5C(void) { D_801617C0[4] = gHitCount / 2; D_801617C0[6] = 0; - func_800884E4(); + func_hud_800884E4(); break; case 1: @@ -1177,7 +1172,7 @@ void func_80087B5C(void) { D_801617C0[6]--; } - if (D_80177830 == 1) { + if (D_ctx_80177830 == 1) { x0 = 128.0f; y0 = 30.0f; @@ -1199,9 +1194,9 @@ void func_80087B5C(void) { x6 = x2 - 56.0f + 16.0f; y6 = y3 + 18.0f; - func_80086C08(x0 - 4.0f, y0 - 4.0f, 2.9f, 3.6f); - func_80086C08(x3 - 4.0f, y3 - 4.0f, 10.0f, 1.0f); - func_80086C08(x6 - 12.0f, y6 + 8.0f, 5.2f, 1.0f); + func_hud_80086C08(x0 - 4.0f, y0 - 4.0f, 2.9f, 3.6f); + func_hud_80086C08(x3 - 4.0f, y3 - 4.0f, 10.0f, 1.0f); + func_hud_80086C08(x6 - 12.0f, y6 + 8.0f, 5.2f, 1.0f); if (D_801617C0[1] < 0) { D_801617C0[1] = 0; @@ -1231,19 +1226,19 @@ void func_80087B5C(void) { RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0, 0, 90, 160, 200, 255); - func_800869A0(24.0f, 30.0f + 3.0f, D_801617C0[5], 1.0f, 0, 999); + func_hud_800869A0(24.0f, 30.0f + 3.0f, D_801617C0[5], 1.0f, 0, 999); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); TextureRect_8bIA(&gMasterDisp, D_5001110, 64, 25, x0, y0 + 4.0f, 1.0f, 1.0f); - func_800869A0(x1, y1 + 12.0f, D_801617C0[1], 1.0f, 1, 999); + func_hud_800869A0(x1, y1 + 12.0f, D_801617C0[1], 1.0f, 1, 999); TextureRect_8bIA(&gMasterDisp, D_5001750, 128, 10, x3, y3, 1.0f, 1.0f); - func_800869A0(x4 + 4.0f, y4 + 3.0f, D_801617C0[2], 1.00f, 1, 9999); + func_hud_800869A0(x4 + 4.0f, y4 + 3.0f, D_801617C0[2], 1.00f, 1, 9999); if (!(D_801617C0[6] & 1)) { - func_80087530(232.0f, 90.0f, D_801617C0[3]); + func_hud_80087530(232.0f, 90.0f, D_801617C0[3]); } RCP_SetupDL(&gMasterDisp, 0x4C); @@ -1251,30 +1246,30 @@ void func_80087B5C(void) { TextureRect_8bIA(&gMasterDisp, D_5001C50, 120, 12, x6 - 8.0f, y6 + 10.0f, 1.0f, 1.0f); - func_80087788(); - func_80084B94(0); - func_8008B5B0(20.0f, 18.0f); + func_hud_80087788(); + func_hud_80084B94(0); + func_hud_8008B5B0(20.0f, 18.0f); } } -void func_800884E4(void) { +void func_hud_800884E4(void) { s32 mask; s32 i; - D_80177B70[gCurrentPlanet] = gHitCount; + D_ctx_80177B70[gCurrentPlanet] = gHitCount; mask = 0x00FF0000; for (i = 0; i < 3; i++) { if (gTeamShields[3 - i] <= 0) { - D_80177B50[gCurrentPlanet] ^= mask; + D_ctx_80177B50[gCurrentPlanet] ^= mask; } else { - D_80177B50[gCurrentPlanet] |= mask; + D_ctx_80177B50[gCurrentPlanet] |= mask; } mask >>= 8; } } -void func_80088564(void) { +void func_hud_80088564(void) { PlanetId planetId; if ((gCurrentLevel == LEVEL_BOLSE) || (gCurrentLevel == LEVEL_AREA_6)) { @@ -1292,8 +1287,8 @@ void func_80088564(void) { gSaveFile.save.data.planet[planetId].normalClear = 1; } - if (D_800D3180[gCurrentLevel] == 2) { - D_80177BB0[gCurrentPlanet] = 1; + if (D_play_800D3180[gCurrentLevel] == 2) { + D_ctx_80177BB0[gCurrentPlanet] = 1; if (gExpertMode) { gSaveFile.save.data.planet[planetId].expertMedal = 1; @@ -1309,7 +1304,7 @@ void func_80088564(void) { } } -void func_8008865C(void) { +void func_hud_8008865C(void) { s32 i; for (i = 0; i < 5; i++) { @@ -1317,12 +1312,12 @@ void func_8008865C(void) { D_801617E8[i]--; } } - func_80086CC8(); - func_80086DCC(); - func_80087B5C(); + func_hud_80086CC8(); + func_hud_80086DCC(); + func_hud_80087B5C(); } -s32 func_800886B8(void) { +s32 func_hud_800886B8(void) { s32 var_v1 = 0; f32 var_fv1 = gInputPress->stick_y; // related to the vertical height of the arwing @@ -1351,7 +1346,7 @@ s32 func_800886B8(void) { return var_v1; } -void func_80088784(s32 arg0) { +void func_hud_80088784(s32 arg0) { Gfx* D_800D1D4C[] = { D_BG_PLANET_200B630, D_BG_PLANET_200A5A0, D_BG_PLANET_2009510, D_BG_PLANET_2008480, D_BG_PLANET_20073F0, D_BG_PLANET_2006360, D_BG_PLANET_200C6C0, D_BG_PLANET_20052D0, D_BG_PLANET_2004240, D_BG_PLANET_20031B0, @@ -1386,7 +1381,7 @@ void func_80088784(s32 arg0) { } } -void func_80088970(void) { +void func_hud_80088970(void) { s32 i; s32 j; Player* player; @@ -1402,7 +1397,7 @@ void func_80088970(void) { D_80161838[0]++; - if (D_80177854 != 100) { + if (D_ctx_80177854 != 100) { D_80161838[0] = 0; D_80161838[1] = 0; // clang-format off @@ -1412,12 +1407,12 @@ void func_80088970(void) { } if (D_80161810[0] >= 2) { - D_801779BC = 0; + D_ctx_801779BC = 0; } player = &gPlayer[gPlayerNum]; - if ((D_80177854 == 100) && !D_80177838 && !gVersusMode) { + if ((D_ctx_80177854 == 100) && !D_ctx_80177838 && !gVersusMode) { switch (D_80161810[0]) { case 0: D_80161838[0] = 0; @@ -1426,7 +1421,7 @@ void func_80088970(void) { break; case 1: - ret = func_800886B8(); + ret = func_hud_800886B8(); if (ret != 0) { D_80161838[0] = 0; if (((ret > 0) && (D_80161810[1] == 1)) || ((ret < 0) && (D_80161810[1] == 0))) { @@ -1450,12 +1445,12 @@ void func_80088970(void) { case 2: gPlayer[0].state_1C8 = PLAYERSTATE_1C8_0; - D_80178348 = D_80178350 = D_80178354 = 0; - D_80178358 = 255; - D_8017835C = 32; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; + D_ctx_80178358 = 255; + D_ctx_8017835C = 32; - D_80178340 += 32; - if (D_80178340 < 255) { + D_ctx_80178340 += 32; + if (D_ctx_80178340 < 255) { break; } @@ -1464,10 +1459,10 @@ void func_80088970(void) { gRadioState = 0; - func_800A6148(); + func_play_800A6148(); gShowBossHealth = false; - D_80178340 = 255; + D_ctx_80178340 = 255; if (gLifeCount[gPlayerNum] == 0) { D_80161810[0] = 3; @@ -1481,10 +1476,10 @@ void func_80088970(void) { case 3: Graphics_FillRectangle(&gMasterDisp, 0, 0, 319, 239, 0, 0, 0, 255); - D_80178358 = 0; + D_ctx_80178358 = 0; - if ((D_80178340 -= 32) <= 0) { - D_80178340 = 0; + if ((D_ctx_80178340 -= 32) <= 0) { + D_ctx_80178340 = 0; } if (gCurrentLevel == LEVEL_TRAINING) { @@ -1492,11 +1487,11 @@ void func_80088970(void) { D_Timer_8017783C = 2; gOptionMenuStatus = OPTION_WAIT; gDrawMode = DRAWMODE_0; - D_80161A34 = 7; - D_80178410 = 0; + D_game_80161A34 = 7; + D_ctx_80178410 = 0; break; } else { - if (D_80178340 == 0) { + if (D_ctx_80178340 == 0) { if (gLevelType == LEVELTYPE_PLANET) { if (D_80161838[1] == 0) { func_8001D520(); @@ -1533,13 +1528,13 @@ void func_80088970(void) { break; } - D_80178348 = D_80178350 = D_80178354 = 0; - D_80178358 = 255; - D_8017835C = 32; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; + D_ctx_80178358 = 255; + D_ctx_8017835C = 32; - D_80178340 += 32; - if (D_80178340 > 255) { - D_80178340 = 255; + D_ctx_80178340 += 32; + if (D_ctx_80178340 > 255) { + D_ctx_80178340 = 255; }; if (D_80161838[0] < 160) { break; @@ -1549,48 +1544,48 @@ void func_80088970(void) { Graphics_FillRectangle(&gMasterDisp, 0, 0, 319, 239, 0, 0, 0, 255); for (i = 0; i < 6; i++) { - if (D_80177C38[i] == -1) { + if (D_ctx_80177C38[i] == -1) { gSavedTeamShields[i] = 0; } else { - gSavedTeamShields[i] = D_80177C38[i]; + gSavedTeamShields[i] = D_ctx_80177C38[i]; } - D_80177CD0[i] = D_80177CF0[i]; + D_ctx_80177CD0[i] = D_ctx_80177CF0[i]; } - if ((gCurrentLevel == LEVEL_VENOM_ANDROSS) && (D_8015F924 != 0)) { - D_80177CA4 = D_80161A5C; + if ((gCurrentLevel == LEVEL_VENOM_ANDROSS) && (D_360_8015F924 != 0)) { + D_ctx_80177CA4 = D_play_80161A5C; } - D_80177CB0 = 0.0f; - D_8015F924 = 0; - D_80161A50 = 0; + D_ctx_80177CB0 = 0.0f; + D_360_8015F924 = 0; + D_play_80161A50 = 0; - gSavedHitCount = D_80177CA0 = 0; + gSavedHitCount = D_ctx_80177CA0 = 0; func_8001CA24(0); gPlayer[0].state_1C8 = PLAYERSTATE_1C8_6; - D_Timer_80161A60 = 0; + D_play_Timer_80161A60 = 0; gPlayer[0].timer_1F8 = 0; - D_80178340 = D_80178358 = 255; - D_8017837C = 7; + D_ctx_80178340 = D_ctx_80178358 = 255; + D_ctx_8017837C = 7; gDrawMode = DRAWMODE_4; - D_80177854 = 2; + D_ctx_80177854 = 2; break; case 10: func_8001D638(0); gDrawMode = DRAWMODE_4; - D_80177854 = 2; + D_ctx_80177854 = 2; break; } } - if ((D_80161810[3] == 0) && (D_80177854 == 100) && !gVersusMode && (D_80177838 == 0)) { + if ((D_80161810[3] == 0) && (D_ctx_80177854 == 100) && !gVersusMode && (D_ctx_80177838 == 0)) { switch (D_80161810[0]) { case 0: case 1: - j = func_800863C8(); + j = func_hud_800863C8(); x0 = 140.0f; y0 = 92.0f + 4.0f; @@ -1601,7 +1596,7 @@ void func_80088970(void) { x2 = 160.0f - (D_800D1AEC[j].unk_10 / 2.0f); y2 = y0 - 40.0f; - func_80086C08(69.0f, y2 - 4.0f, 7.6f, 2.1f); + func_hud_80086C08(69.0f, y2 - 4.0f, 7.6f, 2.1f); switch (gCurrentLevel) { case LEVEL_CORNERIA: @@ -1647,7 +1642,7 @@ void func_80088970(void) { D_800D1AEC[j].unk_10, 1, x2, y2 + i, 1.0f, 1.0f); } - func_80086C08(x1 - 10.0f, y0 - 4.0f, 4.7f, 2.8f); + func_hud_80086C08(x1 - 10.0f, y0 - 4.0f, 4.7f, 2.8f); RCP_SetupDL(&gMasterDisp, 0x4C); @@ -1690,16 +1685,16 @@ void func_80088970(void) { } if ((gCurrentLevel != LEVEL_VENOM_ANDROSS) && (gCurrentLevel != LEVEL_TRAINING)) { - func_80087788(); - func_80084B94(0); + func_hud_80087788(); + func_hud_80084B94(0); } break; case 3: case 4: if (gCurrentLevel != LEVEL_TRAINING) { - func_80084930(132.0f, 124.0f, gLifeCount[gPlayerNum]); - func_80088784(D_80161838[1]); + func_hud_80084930(132.0f, 124.0f, gLifeCount[gPlayerNum]); + func_hud_80088784(D_80161838[1]); } break; @@ -1709,7 +1704,7 @@ void func_80088970(void) { } } -void func_80089670(void) { +void func_hud_80089670(void) { RCP_SetupDL(&gMasterDisp, 0x3E); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); Matrix_Scale(gGfxMatrix, 18.64f, 21.04f, 1.0f, 1); @@ -1717,7 +1712,7 @@ void func_80089670(void) { gSPDisplayList(gMasterDisp++, D_1024AC0); } -void func_80089710(void) { +void func_hud_80089710(void) { RCP_SetupDL(&gMasterDisp, 0x3E); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); Matrix_Scale(gGfxMatrix, 11.0f, 11.0f, 1.0f, 1); @@ -1725,7 +1720,7 @@ void func_80089710(void) { gSPDisplayList(gMasterDisp++, D_1024AC0); } -void func_800897B0(void) { +void func_hud_800897B0(void) { RCP_SetupDL(&gMasterDisp, 0x3E); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); Matrix_Scale(gGfxMatrix, 130.0f, 130.0f, 1.0f, 1); @@ -1733,7 +1728,7 @@ void func_800897B0(void) { gSPDisplayList(gMasterDisp++, D_1024830); } -void func_80089850(void) { +void func_hud_80089850(void) { RCP_SetupDL(&gMasterDisp, 0x3E); gDPSetPrimColor(gMasterDisp++, 0, 0, 0, 0, 0, 255); Matrix_Scale(gGfxMatrix, 125.0f, 125.0f, 1.0f, 1); @@ -1741,7 +1736,7 @@ void func_80089850(void) { gSPDisplayList(gMasterDisp++, D_102A8A0); } -void func_800898F0(void) { +void func_hud_800898F0(void) { RCP_SetupDL(&gMasterDisp, 1); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 208, 80, 255); Matrix_Scale(gGfxMatrix, 30.0f, 30.0f, 1.0f, 1); @@ -1751,7 +1746,7 @@ void func_800898F0(void) { f32 D_800D1E10 = 0.0f; -void func_80089994(s32 arg0) { +void func_hud_80089994(s32 arg0) { s32 D_800D1E14[][4] = { { 177, 242, 12, 255 }, { 89, 121, 6, 128 }, { 90, 90, 255, 255 }, { 45, 45, 128, 128 }, { 0, 179, 67, 255 }, { 0, 90, 34, 128 }, { 255, 30, 0, 255 }, { 128, 15, 0, 128 }, @@ -1775,7 +1770,7 @@ void func_80089994(s32 arg0) { gSPDisplayList(gMasterDisp++, D_1015510); } -void func_80089AF4(void) { +void func_hud_80089AF4(void) { RCP_SetupDL(&gMasterDisp, 0x3E); gDPSetPrimColor(gMasterDisp++, 0, 0, 0, 0, 0, 255); Matrix_Scale(gGfxMatrix, 54.0f, 54.0f, 1.0f, 1); @@ -1783,7 +1778,7 @@ void func_80089AF4(void) { gSPDisplayList(gMasterDisp++, D_STAR_WOLF_F014180); } -void func_80089B94(void) { +void func_hud_80089B94(void) { RCP_SetupDL(&gMasterDisp, 0x3E); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 92, 92, 255); Matrix_Scale(gGfxMatrix, 54.0f, 54.0f, 1.0f, 1); @@ -1791,7 +1786,7 @@ void func_80089B94(void) { gSPDisplayList(gMasterDisp++, D_D0098B0); } -void func_80089C38(void) { +void func_hud_80089C38(void) { s32 alpha; RCP_SetupDL(&gMasterDisp, 0xC); @@ -1809,7 +1804,7 @@ void func_80089C38(void) { gSPDisplayList(gMasterDisp++, D_1024230); } -void func_80089D28(void) { +void func_hud_80089D28(void) { s32 gb; RCP_SetupDL(&gMasterDisp, 1); @@ -1863,55 +1858,55 @@ void RadarMark_Draw(s32 arg0) { } else { var_a1 = var_a1 * 2; } - func_80089994(var_a1); + func_hud_80089994(var_a1); break; case 4: case 5: case 6: case 7: - func_80089AF4(); + func_hud_80089AF4(); break; case 8: - func_80089B94(); + func_hud_80089B94(); break; case 100: - func_800898F0(); + func_hud_800898F0(); break; case 101: - func_80089850(); + func_hud_80089850(); break; case 102: - func_800897B0(); + func_hud_800897B0(); break; case 103: if (gVersusMode == true) { - func_80089670(); + func_hud_80089670(); } else { - func_80089C38(); + func_hud_80089C38(); } break; case 200: case 201: - func_80089670(); + func_hud_80089670(); break; case 999: break; default: - func_80089710(); + func_hud_80089710(); break; } } -void func_8008A07C(f32 x, f32 y) { +void func_hud_8008A07C(f32 x, f32 y) { f32 D_800D1E94[] = { 20.0f, 180.0f, 20.0f, 180.0f }; f32 D_800D1EA4[] = { 72.0f, 72.0f, 192.0f, 192.0f }; f32 xPos; @@ -1939,13 +1934,13 @@ void func_8008A07C(f32 x, f32 y) { RCP_SetupDL(&gMasterDisp, 0x4E); gDPSetPrimColor(gMasterDisp++, 0, 0, 60, 60, 255, 170); - func_800853A4(xPos + 1.0f, yPos + 1.0f, xScale, yScale); + func_hud_800853A4(xPos + 1.0f, yPos + 1.0f, xScale, yScale); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - func_80085404(xPos, yPos, xScale1, yScale1); + func_hud_80085404(xPos, yPos, xScale1, yScale1); } -void func_8008A240(void) { +void func_hud_8008A240(void) { s32 i; Item* item; @@ -1994,7 +1989,7 @@ void func_8008A240(void) { } } -s32 func_8008A4DC(void) { +s32 func_hud_8008A4DC(void) { s32 i; f32 scale; f32 x1; @@ -2012,11 +2007,11 @@ s32 func_8008A4DC(void) { return 0; } - if (D_80177AB0 >= 5) { + if (D_ctx_80177AB0 >= 5) { return 0; } - if (D_80177838) { + if (D_ctx_80177838) { D_800D1E10 = 60.0f; } else { Math_SmoothStepToF(&D_800D1E10, 0.0f, 0.3f, 10.0f, 0.1f); @@ -2068,7 +2063,7 @@ s32 func_8008A4DC(void) { y = 162.000f; x1 += D_800D1E10 * temp3; } else { - if ((D_80177E7C == 0) || (D_80178750 != 0)) { + if ((D_ctx_80177E7C == 0) || (D_versus_80178750 != 0)) { return 0; } temp2 = 13000.00f; @@ -2079,8 +2074,8 @@ s32 func_8008A4DC(void) { y1 = -166.00f; } - func_8008A240(); - func_8008A07C(x, y); + func_hud_8008A240(); + func_hud_8008A07C(x, y); if (!gVersusMode && ((gCurrentLevel == LEVEL_SECTOR_Z) || (gCurrentLevel == LEVEL_FORTUNA) || (gCurrentLevel == LEVEL_VENOM_2) || @@ -2127,11 +2122,11 @@ s32 func_8008A4DC(void) { Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, x1, y1, z1, 1); - if ((gCurrentLevel == LEVEL_SECTOR_Z) && (D_80161710 != 0)) { + if ((gCurrentLevel == LEVEL_SECTOR_Z) && (D_hud_80161710 != 0)) { Matrix_Push(&gGfxMatrix); - func_80089D28(); + func_hud_80089D28(); Matrix_Pop(&gGfxMatrix); - D_80161710--; + D_hud_80161710--; } for (i = 64; i >= 0; i--) { @@ -2161,7 +2156,7 @@ s32 func_8008A4DC(void) { return 0; } -s32 func_8008AC54(s32 arg0) { +s32 func_hud_8008AC54(s32 arg0) { Actor* actor; s32 i; s32 ret = 0; @@ -2192,12 +2187,12 @@ s32 func_8008AC54(s32 arg0) { return ret; } -void func_8008AD94(void) { +void func_hud_8008AD94(void) { if (gGameState == GSTATE_PLAY) { RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255); - switch ((s32) D_80177D68) { + switch ((s32) D_ctx_80177D68) { case RCID_FOX: Graphics_DisplaySmallText(73, 173, 1.0f, 1.0f, "FOX"); break; @@ -2245,23 +2240,23 @@ void func_8008AD94(void) { } } -void func_8008B044(void) { +void func_hud_8008B044(void) { switch (D_80161798) { case 0: - if (D_80161690 == 0) { + if (D_enmy2_80161690 == 0) { return; } AUDIO_PLAY_SFX(0x49002018, gDefaultSfxSource, 4); - if (D_800CFF90 != 0) { + if (D_enmy2_800CFF90 != 0) { func_8001AF40(1); } D_80161794 = 0; D_80161798 = 1; case 1: - if (D_80161690 != 0) { + if (D_enmy2_80161690 != 0) { D_80161790++; if (D_80161790 >= 7) { if (D_80161794 & 1) { @@ -2270,9 +2265,9 @@ void func_8008B044(void) { D_80161790 = 0; D_80161794++; } - D_80161690--; + D_enmy2_80161690--; } else { - D_800CFF90 = 0; + D_enmy2_800CFF90 = 0; D_80161790 = 0; D_80161798 = 0; Audio_KillSfxById(0x49002018); @@ -2281,7 +2276,7 @@ void func_8008B044(void) { } } -void func_8008B1B0(void) { +void func_hud_8008B1B0(void) { f32 temp = 142.0f; f32 temp2 = 18.0f; @@ -2290,25 +2285,25 @@ void func_8008B1B0(void) { switch (D_80161790 / 2) { case 3: - func_8008556C(temp + 31.0f, temp2); + func_hud_8008556C(temp + 31.0f, temp2); case 2: - func_80085514(temp + 24.0f, temp2); + func_hud_80085514(temp + 24.0f, temp2); case 1: - func_800854BC(temp + 18.0f, temp2); + func_hud_800854BC(temp + 18.0f, temp2); case 0: - func_80085464(temp, temp2); + func_hud_80085464(temp, temp2); break; default: break; } } -void func_8008B2A4(void) { - if (D_80177854 != 100) { - func_8008B044(); +void func_hud_8008B2A4(void) { + if (D_ctx_80177854 != 100) { + func_hud_8008B044(); } - if (D_80161690 != 0) { - func_8008B1B0(); + if (D_enmy2_80161690 != 0) { + func_hud_8008B1B0(); } } @@ -2316,10 +2311,10 @@ s32 D_800D1EB4 = 255; s32 D_800D1EB8 = 255; s32 D_800D1EBC = 255; -void func_8008B2F0(void) { +void func_hud_8008B2F0(void) { f32 var_fv0; - switch (D_80161730) { + switch (D_hud_80161730) { case 0: D_801617B0 = 0; D_8016179C = 20.0f; @@ -2335,16 +2330,16 @@ void func_8008B2F0(void) { D_801617AC = var_fv0 / ((256.0f * D_801617A8) - 1.0f); if (gGoldRingCount[0] >= 3) { - D_80161730 = 2; + D_hud_80161730 = 2; } else { - D_80161730 = 1; + D_hud_80161730 = 1; } break; case 1: if (gGoldRingCount[0] >= 3) { D_801617B0 = 55; - D_80161730 = 2; + D_hud_80161730 = 2; } case 2: @@ -2378,29 +2373,29 @@ void func_8008B2F0(void) { } } -void func_8008B5B0(f32 x, f32 y) { +void func_hud_8008B5B0(f32 x, f32 y) { RCP_SetupDL(&gMasterDisp, 0x4B); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - func_800856C0(x + 8.0f, y + 2.0f, D_801617A8, 1.0f, D_801617AC); + func_hud_800856C0(x + 8.0f, y + 2.0f, D_801617A8, 1.0f, D_801617AC); RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0, 0, D_800D1EB4, D_800D1EB8, D_800D1EBC, 0xFF); - func_80085618(x, y, 1.0f, 1.0f); - func_800855C4(x + 7.0f + (D_801617A8 * 6.0f * 8.0f), y, 1.0f, 1.0f); - func_8008566C(x + 7.0f, y, D_801617A8 * 6.0f, 1.0f); + func_hud_80085618(x, y, 1.0f, 1.0f); + func_hud_800855C4(x + 7.0f + (D_801617A8 * 6.0f * 8.0f), y, 1.0f, 1.0f); + func_hud_8008566C(x + 7.0f, y, D_801617A8 * 6.0f, 1.0f); } -void func_8008B734(void) { - func_8008B2F0(); - func_8008B5B0(20.0f, 18.0f); - func_80085944(); +void func_hud_8008B734(void) { + func_hud_8008B2F0(); + func_hud_8008B5B0(20.0f, 18.0f); + func_hud_80085944(); } -s32 func_8008B774(void) { +s32 func_hud_8008B774(void) { s32 i; s32 ret = 0; s32 temp; - switch (D_801782A4) { + switch (D_ctx_801782A4) { case 0: case 1: i = 0; @@ -2511,7 +2506,7 @@ s32 func_8008B774(void) { return ret; } -void func_8008B9E8(void) { +void func_hud_8008B9E8(void) { s32 temp; // clang-format off @@ -2523,8 +2518,8 @@ void func_8008B9E8(void) { } if ((D_80161788 == 0) && (D_8016178C == 0)) { - if ((gRadioState >= 4) && (D_801782A4 != 2) && (D_801782A4 != 3)) { - temp = func_8008B774(); + if ((gRadioState >= 4) && (D_ctx_801782A4 != 2) && (D_ctx_801782A4 != 3)) { + temp = func_hud_8008B774(); if (temp == 1) { D_80161788 = 20; } @@ -2536,13 +2531,13 @@ void func_8008B9E8(void) { } } - if ((D_801782A4 == 2) || (D_801782A4 == 3)) { + if ((D_ctx_801782A4 == 2) || (D_ctx_801782A4 == 3)) { D_80161788 = 0; D_8016178C = 0; } } -void func_8008BAE4(void) { +void func_hud_8008BAE4(void) { s32 r; s32 g; s32 b; @@ -2570,14 +2565,14 @@ void func_8008BAE4(void) { } } -void func_8008BC80(void) { - if (D_80177854 != 100) { - func_8008B9E8(); - func_8008BAE4(); +void func_hud_8008BC80(void) { + if (D_ctx_80177854 != 100) { + func_hud_8008B9E8(); + func_hud_8008BAE4(); } } -s32 func_8008BCBC(s32 arg0) { +s32 func_hud_8008BCBC(s32 arg0) { s32 temp = 10; s32 ret; @@ -2595,7 +2590,7 @@ s32 func_8008BCBC(s32 arg0) { return ret; } -void func_8008BD00(u8* texturePtr, s32 xPos, s32 yPos, u8 arg3) { +void func_hud_8008BD00(u8* texturePtr, s32 xPos, s32 yPos, u8 arg3) { u8* texture = SEGMENTED_TO_VIRTUAL(texturePtr); u8 temp; s32 x; @@ -2647,7 +2642,7 @@ void func_8008BD00(u8* texturePtr, s32 xPos, s32 yPos, u8 arg3) { } } -void func_8008C104(u16* texture, u16* arg1) { +void func_hud_8008C104(u16* texture, u16* arg1) { u16 *temp, *dst; u16 src[1024]; f32 temp1; @@ -2694,7 +2689,7 @@ void func_8008C104(u16* texture, u16* arg1) { Texture_Mottle(dst, src, 2); } -void func_8008C390(f32 arg0, f32 arg1, f32 arg2, s32 arg3) { +void func_hud_8008C390(f32 arg0, f32 arg1, f32 arg2, s32 arg3) { void* D_800D1EC0[] = { D_5000000, D_5000080, D_5000100, D_5000180, D_5000200, D_5000280, D_5000300, D_5000380, D_5000400, D_5000480, }; @@ -2713,7 +2708,7 @@ void func_8008C390(f32 arg0, f32 arg1, f32 arg2, s32 arg3) { } } -void func_8008C5C8(f32 arg0, f32 arg1, f32 arg2, s32 arg3) { +void func_hud_8008C5C8(f32 arg0, f32 arg1, f32 arg2, s32 arg3) { u16* D_800D1EE8[] = { D_10050E0, D_100BAC0, @@ -2729,7 +2724,7 @@ void func_8008C5C8(f32 arg0, f32 arg1, f32 arg2, s32 arg3) { TextureRect_16bRGBA(&gMasterDisp, D_800D1EE8[arg3] + 1760, 44, 4, arg0, (40.0f * arg2) + arg1, arg2, arg2); } -void func_8008C6F4(s32 idx, s32 arg1) { +void func_hud_8008C6F4(s32 idx, s32 arg1) { f32 D_800D1EF8[] = { 0.0f, 0.0f, -9.0f, 9.0f, 10.0f, 10.0f, 10.0f, 10.0f, 0.0f, 0.0f, -8.0f, 8.0f }; f32 D_800D1F28[] = { -7.0f, 7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 8.0f, -8.0f, 0.0f, 0.0f }; f32 D_800D1F58[] = { @@ -2768,14 +2763,14 @@ void func_8008C6F4(s32 idx, s32 arg1) { Matrix_Pop(&gGfxMatrix); } -void func_8008CA44(void) { +void func_hud_8008CA44(void) { s32 D_800D2048[] = { 0x80, 0x40, 0x20, 0x10, 0x0A, 0x09, 0x06, 0x05, 0x08, 0x04, 0x02, 0x01, }; s32 i; s32 j; - if ((gPlayer[gPlayerNum].unk_228 != 0) && (gPlayer[gPlayerNum].timer_210 == 0) && (D_80177854 != 100)) { + if ((gPlayer[gPlayerNum].unk_228 != 0) && (gPlayer[gPlayerNum].timer_210 == 0) && (D_ctx_80177854 != 100)) { j = gPlayer[gPlayerNum].unk_228; for (i = 0; i < 12; i++) { @@ -2786,25 +2781,25 @@ void func_8008CA44(void) { j = (D_800D2048[i] ^ 0xFF) & j; if (gGameFrameCount & 4) { - func_8008C6F4(i, 0); + func_hud_8008C6F4(i, 0); } if ((gGameFrameCount - 2) & 4) { - func_8008C6F4(i, 1); + func_hud_8008C6F4(i, 1); } } - func_8008BD00(D_1024A58, 8, 8, 2); + func_hud_8008BD00(D_1024A58, 8, 8, 2); } } -s32 func_8008CB8C(void) { +s32 func_hud_8008CB8C(void) { return 0; } -void func_8008CB98(f32 arg0, f32 arg1, f32 arg2) { +void func_hud_8008CB98(f32 arg0, f32 arg1, f32 arg2) { TextureRect_8bIA(&gMasterDisp, D_versus_30013E0, 8, 8, arg0, arg1, arg2, arg2); } -void func_8008CBE4(void) { +void func_hud_8008CBE4(void) { f32 D_800D2078[] = { 62.0f, 222.0f, 62.0f, 222.0f }; // X f32 D_800D2088[] = { 86.0f, 86.0f, 206.0f, 206.0f }; // Y s32 D_800D2098[] = { 177, 255, 0, 30 }; // R @@ -2813,7 +2808,7 @@ void func_8008CBE4(void) { s32 i; s32 j; - if (D_801778AC != 0) { + if (D_ctx_801778AC != 0) { return; } @@ -2828,7 +2823,7 @@ void func_8008CBE4(void) { break; case 1: - if (D_80177E7C == 0) { + if (D_ctx_80177E7C == 0) { D_80161758 = 0; break; } @@ -2840,9 +2835,9 @@ void func_8008CBE4(void) { } } - for (i = 0; i < D_80177DB8[gPlayerNum]; i++) { + for (i = 0; i < D_ctx_80177DB8[gPlayerNum]; i++) { if (D_80161748[gPlayerNum] < (i + 1)) { - if (((i + 1) != 1) && ((i + 1) == (D_801778A4 - 1))) { + if (((i + 1) != 1) && ((i + 1) == (D_ctx_801778A4 - 1))) { D_80161760[gPlayerNum] = 50; D_80161738[gPlayerNum] = 0; } else { @@ -2858,20 +2853,20 @@ void func_8008CBE4(void) { } } - j = D_80177DD0[gPlayerNum][i]; + j = D_ctx_80177DD0[gPlayerNum][i]; RCP_SetupDL(&gMasterDisp, 0x4D); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); gDPSetEnvColor(gMasterDisp++, D_800D2098[j], D_800D20A8[j], D_800D20B8[j], 0); - func_8008CB98(D_800D2078[gPlayerNum] + (i * 9.0f), D_800D2088[gPlayerNum], 1.0f); + func_hud_8008CB98(D_800D2078[gPlayerNum] + (i * 9.0f), D_800D2088[gPlayerNum], 1.0f); } break; } } -void func_8008CFB8(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { +void func_hud_8008CFB8(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { s32 i; for (i = 0; i < 3; i++) { @@ -2882,26 +2877,26 @@ void func_8008CFB8(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { arg3); } -void func_8008D0DC(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { +void func_hud_8008D0DC(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { u32 var_t8 = 48.0f * arg4; - func_80084E78(&gMasterDisp, D_versus_300D440, D_versus_300D500, 48, 4, arg0, arg1, arg2, arg3, var_t8, 4); + func_hud_80084E78(&gMasterDisp, D_versus_300D440, D_versus_300D500, 48, 4, arg0, arg1, arg2, arg3, var_t8, 4); } -void func_8008D1F0(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { +void func_hud_8008D1F0(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { TextureRect_4bCI(&gMasterDisp, D_10116B0, D_1011730, 16, 16, arg0, arg1, arg2, arg3); } -void func_8008D250(void) { +void func_hud_8008D250(void) { f32 D_800D20C8[] = { 113.0f, 273.0f, 113.0f, 273.0f }; f32 D_800D20D8[] = { 79.0f, 79.0f, 199.0f, 199.0f }; RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - func_8008C5C8(D_800D20C8[gPlayerNum], D_800D20D8[gPlayerNum], 0.54f, gPlayerNum); + func_hud_8008C5C8(D_800D20C8[gPlayerNum], D_800D20D8[gPlayerNum], 0.54f, gPlayerNum); } -void func_8008D31C(void) { +void func_hud_8008D31C(void) { f32 D_800D20E8[] = { 60.0f, 220.0f, 60.0f, 220.0f }; f32 D_800D20F8[] = { 78.0f, 78.0f, 198.0f, 198.0f }; @@ -2909,15 +2904,16 @@ void func_8008D31C(void) { RCP_SetupDL(&gMasterDisp, 0x4E); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - func_8008D0DC(D_800D20E8[gPlayerNum] + 3.0f, D_800D20F8[gPlayerNum] + 18.0f, 1.0f, 1.0f, D_800D19E0[gPlayerNum]); + func_hud_8008D0DC(D_800D20E8[gPlayerNum] + 3.0f, D_800D20F8[gPlayerNum] + 18.0f, 1.0f, 1.0f, + D_800D19E0[gPlayerNum]); RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - func_8008CFB8(D_800D20E8[gPlayerNum], D_800D20F8[gPlayerNum], 1.0f, 1.0f); + func_hud_8008CFB8(D_800D20E8[gPlayerNum], D_800D20F8[gPlayerNum], 1.0f, 1.0f); } -void func_8008D4F0(f32 arg0, f32 arg1) { +void func_hud_8008D4F0(f32 arg0, f32 arg1) { f32 D_800D2108[] = { 110.0f, 270.0f, 110.0f, 270.0f, 0.0f, }; @@ -2965,17 +2961,17 @@ void func_8008D4F0(f32 arg0, f32 arg1) { gDPSetPrimColor(gMasterDisp++, 0, 0, temp_t9, temp_t9, temp_t9, 255); if (temp_fv0 > 0.01f) { - func_80085890(D_800D2108[var_v1] + temp + temp2, D_800D211C[var_v1] + sp60, temp_fv0, 1.0f); + func_hud_80085890(D_800D2108[var_v1] + temp + temp2, D_800D211C[var_v1] + sp60, temp_fv0, 1.0f); } if (temp_fs0 > 0.01f) { - func_800857DC(D_800D2108[var_v1] + temp + 1.0f, D_800D211C[var_v1] + sp60, temp_fs0, 1.0f); + func_hud_800857DC(D_800D2108[var_v1] + temp + 1.0f, D_800D211C[var_v1] + sp60, temp_fs0, 1.0f); } RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - func_80085740(D_800D2108[var_v1], D_800D211C[var_v1], 1.0f, 1.0f); + func_hud_80085740(D_800D2108[var_v1], D_800D211C[var_v1], 1.0f, 1.0f); } -void func_8008D7F4(void) { +void func_hud_8008D7F4(void) { s32 D_800D2130[] = { 146, 165, 146, 165 }; s32 D_800D2140[] = { 106, 106, 125, 125 }; s32 D_800D2150[] = { 177, 255, 0, 30 }; @@ -2992,7 +2988,7 @@ s32 D_800D2190[4] = { 0, 0, 0, 0 }; f32 D_800D21A0 = 255.0f; f32 D_800D21A4 = 0.0f; -void func_8008D984(void) { +void func_hud_8008D984(void) { s32 D_800D21A8[] = { 146, 165, 146, 165 }; s32 D_800D21B8[] = { 94, 94, 137, 137 }; @@ -3023,42 +3019,42 @@ void func_8008D984(void) { D_800D21A4 = 255.0f; } gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_800D21A4); - func_8008D1F0(D_800D21A8[gPlayerNum], D_800D21B8[gPlayerNum], 1.0f, 1.0f); + func_hud_8008D1F0(D_800D21A8[gPlayerNum], D_800D21B8[gPlayerNum], 1.0f, 1.0f); } } -void func_8008DC34(void) { - if ((D_80177E7C != 0) && (D_80178750 == 0)) { - func_8008D250(); - func_8008D7F4(); - func_8008D4F0(0, 0); - func_8008D31C(); - func_8008D984(); +void func_hud_8008DC34(void) { + if ((D_ctx_80177E7C != 0) && (D_versus_80178750 == 0)) { + func_hud_8008D250(); + func_hud_8008D7F4(); + func_hud_8008D4F0(0, 0); + func_hud_8008D31C(); + func_hud_8008D984(); } - if (D_80178750 == 0) { - func_8008CBE4(); + if (D_versus_80178750 == 0) { + func_hud_8008CBE4(); } } -void func_8008DCB0(f32 arg0, f32 arg1, s32 arg2, s32 arg3, s32 arg4) { +void func_hud_8008DCB0(f32 arg0, f32 arg1, s32 arg2, s32 arg3, s32 arg4) { RCP_SetupDL_78(); - gDPSetPrimColor(gMasterDisp++, 0, 0, arg2, arg3, arg4, D_80161708); + gDPSetPrimColor(gMasterDisp++, 0, 0, arg2, arg3, arg4, D_hud_80161708); TextureRect_4bCI(&gMasterDisp, D_1011ED0, D_1011F08, 16, 7, arg0, arg1, 1.0f, 1.0f); } -void func_8008DD78(f32 arg0, f32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { +void func_hud_8008DD78(f32 arg0, f32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { RCP_SetupDL_78(); - gDPSetPrimColor(gMasterDisp++, 0, 0, arg3, arg4, arg5, D_80161708); + gDPSetPrimColor(gMasterDisp++, 0, 0, arg3, arg4, arg5, D_hud_80161708); if (arg2 >= 10) { - Graphics_DisplayHUDNumber((s32) arg0 - (func_8008BCBC(arg2) * 8) + 11, arg1, arg2); + Graphics_DisplayHUDNumber((s32) arg0 - (func_hud_8008BCBC(arg2) * 8) + 11, arg1, arg2); } else { Graphics_DisplayHUDNumber(arg0, arg1, arg2); } } -void func_8008DE68(void) { +void func_hud_8008DE68(void) { f32 sp3C; f32 temp1; f32 temp2; @@ -3132,7 +3128,7 @@ void func_8008DE68(void) { } } -void func_8008E2C8(f32 arg0, f32 arg1, s32* arg2, f32 arg3) { +void func_hud_8008E2C8(f32 arg0, f32 arg1, s32* arg2, f32 arg3) { f32 var_fs0 = 0.0f; s32 var_s2 = 0; s32 i; @@ -3156,18 +3152,18 @@ void func_8008E2C8(f32 arg0, f32 arg1, s32* arg2, f32 arg3) { } else { RCP_SetupDL_76(); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255); - func_8008C390((var_fs0 * arg3) + arg0, arg1, arg3, var_s2); + func_hud_8008C390((var_fs0 * arg3) + arg0, arg1, arg3, var_s2); var_fs0 += 9.0f; } var_fs0 += 9.0f; } } -void func_8008E51C(s32* arg0, f32 arg1) { +void func_hud_8008E51C(s32* arg0, f32 arg1) { //! FAKE: if (1) {} - if (D_80177854 != 100) { + if (D_ctx_80177854 != 100) { arg0[2] -= 3; if (arg0[2] >= 3) { } else { @@ -3187,19 +3183,19 @@ void func_8008E51C(s32* arg0, f32 arg1) { } } - if (D_80177854 != 100) { - func_8008E2C8(176.0f, 22.0f, arg0, arg1); + if (D_ctx_80177854 != 100) { + func_hud_8008E2C8(176.0f, 22.0f, arg0, arg1); } } -void func_8008E5E8(void) { +void func_hud_8008E5E8(void) { if (gVersusMode) { - func_8008DC34(); + func_hud_8008DC34(); } - func_8008A4DC(); + func_hud_8008A4DC(); } -void func_8008E620(f32 arg0, f32 arg1) { +void func_hud_8008E620(f32 arg0, f32 arg1) { f32 r; f32 g; f32 b; @@ -3298,15 +3294,15 @@ void func_8008E620(f32 arg0, f32 arg1) { } RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0, 0, r, g, b, 255); - func_80094D20(arg0, arg1); + func_hud_80094D20(arg0, arg1); } -void func_8008E9EC(f32 arg0, f32 arg1) { - func_8008E620(arg0, arg1); - func_8008B734(); +void func_hud_8008E9EC(f32 arg0, f32 arg1) { + func_hud_8008E620(arg0, arg1); + func_hud_8008B734(); } -void func_8008EA14(f32 x, f32 y) { +void func_hud_8008EA14(f32 x, f32 y) { s32 i; s32 sp68; f32 temp_fv0; @@ -3432,7 +3428,7 @@ void func_8008EA14(f32 x, f32 y) { } RCP_SetupDL_78(); - gDPSetPrimColor(gMasterDisp++, 0, 0, (s32) D_80161770, (s32) D_80161774, (s32) D_80161778, D_80161708); + gDPSetPrimColor(gMasterDisp++, 0, 0, (s32) D_80161770, (s32) D_80161774, (s32) D_80161778, D_hud_80161708); if (gCurrentLevel == LEVEL_AQUAS) { sp68 = 6; @@ -3442,8 +3438,8 @@ void func_8008EA14(f32 x, f32 y) { case 0: if (D_800D19F4 >= 5) { TextureRect_4bCI(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x, y, 1.0f, 1.0f); - func_8008DCB0(x + 14.0f, y + 2.0f, D_8016177C, D_80161780, D_80161784); - func_8008DD78(x + 29.0f, y + 1.0f, D_800D19F4, D_8016177C, D_80161780, D_80161784); + func_hud_8008DCB0(x + 14.0f, y + 2.0f, D_8016177C, D_80161780, D_80161784); + func_hud_8008DD78(x + 29.0f, y + 1.0f, D_800D19F4, D_8016177C, D_80161780, D_80161784); } else { for (i = (D_800D19F4 - 1); i >= 0; i--) { TextureRect_4bCI(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x + (30.0f - (i * 10)), y, 1.0f, 1.0f); @@ -3488,8 +3484,8 @@ void func_8008EA14(f32 x, f32 y) { break; case 5: - func_8008DCB0(x + D_800D19F0, y + 2.0f, D_8016177C, D_80161780, D_80161784); - func_8008DD78(x + 15.0f + D_800D19F0, y + 1.0f, D_800D19F4, D_8016177C, D_80161780, D_80161784); + func_hud_8008DCB0(x + D_800D19F0, y + 2.0f, D_8016177C, D_80161780, D_80161784); + func_hud_8008DD78(x + 15.0f + D_800D19F0, y + 1.0f, D_800D19F4, D_8016177C, D_80161780, D_80161784); TextureRect_4bCI(&gMasterDisp, D_10116B0, D_1011730, 16, 16, x, y, 1.0f, 1.0f); break; @@ -3502,42 +3498,42 @@ void func_8008EA14(f32 x, f32 y) { } } -void func_8008F94C(void) { - func_8008E5E8(); +void func_hud_8008F94C(void) { + func_hud_8008E5E8(); } -void func_8008F96C(void) { - if (D_80177854 != 100) { - func_8008E5E8(); +void func_hud_8008F96C(void) { + if (D_ctx_80177854 != 100) { + func_hud_8008E5E8(); } RCP_SetupDL_36(); - if ((gLevelMode != LEVELMODE_UNK_2) && (D_80161708 != 0)) { - func_8008D4F0(246.0f, 28.0f); - func_8008EA14(250.0f, 38.0f); + if ((gLevelMode != LEVELMODE_UNK_2) && (D_hud_80161708 != 0)) { + func_hud_8008D4F0(246.0f, 28.0f); + func_hud_8008EA14(250.0f, 38.0f); } - func_8008B2A4(); + func_hud_8008B2A4(); - if (D_80161708 != 0) { - func_8008E9EC(24.0f, 30.0f); + if (D_hud_80161708 != 0) { + func_hud_8008E9EC(24.0f, 30.0f); if (gCurrentLevel != LEVEL_TRAINING) { - func_80087530(248.0f, 11.0f, gLifeCount[gPlayerNum]); + func_hud_80087530(248.0f, 11.0f, gLifeCount[gPlayerNum]); } } if (gCurrentLevel == LEVEL_TRAINING) { - func_i1_801988E0(); + Training_801988E0(); } } -void func_8008FA84(void) { +void func_hud_8008FA84(void) { s32 i; s32 goldRings; bool medalStatus; - if (D_80161730 == 0) { + if (D_hud_80161730 == 0) { for (i = 0; i < 10; i++) { D_801617E8[i] = 0; D_801617C0[i] = 0; @@ -3630,23 +3626,23 @@ void func_8008FA84(void) { } } - if ((D_80161704 != 0) && (D_80177854 != 100)) { - D_80161708 += 16; - if (D_80161708 >= D_80161704) { - D_80161708 = D_80161704; + if ((D_hud_80161704 != 0) && (D_ctx_80177854 != 100)) { + D_hud_80161708 += 16; + if (D_hud_80161708 >= D_hud_80161704) { + D_hud_80161708 = D_hud_80161704; } } if (gCamCount != 1) { - func_8008F94C(); + func_hud_8008F94C(); } else { - func_8008F96C(); + func_hud_8008F96C(); } - func_8008BC80(); - func_80088970(); + func_hud_8008BC80(); + func_hud_80088970(); } -void func_8008FE78(Boss* boss) { +void func_hud_8008FE78(Boss* boss) { RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); gSPDisplayList(gMasterDisp++, D_FO_6003090); RCP_SetupDL_34(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); @@ -3657,7 +3653,7 @@ void func_8008FE78(Boss* boss) { gDPSetTextureFilter(gMasterDisp++, G_TF_BILERP); } -void func_8008FFF0(Boss* boss, s32 arg1) { +void func_hud_8008FFF0(Boss* boss, s32 arg1) { Vec3s D_800D21C8[] = { { -385, 54, 233 }, { -324, 148, 193 }, { -267, 186, 136 }, { -128, 430, 180 }, { -231, 584, 140 }, { -431, 551, -120 }, { -285, 516, -32 }, { -285, 601, 18 }, { 300, 596, 18 }, { 300, 529, -65 }, @@ -3692,25 +3688,25 @@ void func_8008FFF0(Boss* boss, s32 arg1) { i = RAND_INT(36.0f); if (!(gGameFrameCount & 2)) { - func_8007C120(boss->obj.pos.x + D_800D21C8[i].x, boss->obj.pos.y + D_800D21C8[i].y, - boss->obj.pos.z + D_800D21C8[i].z, 0.0f, 0.0f, 0.0f, 0.3f * temp, 20); + func_effect_8007C120(boss->obj.pos.x + D_800D21C8[i].x, boss->obj.pos.y + D_800D21C8[i].y, + boss->obj.pos.z + D_800D21C8[i].z, 0.0f, 0.0f, 0.0f, 0.3f * temp, 20); } if (!(gGameFrameCount & 7)) { - func_8007BFFC(boss->obj.pos.x + D_800D21C8[i].x, boss->obj.pos.y + D_800D21C8[i].y, - boss->obj.pos.z + D_800D21C8[i].z, 0.0f, 0.0f, 0.0f, 7.0f * temp, 10); + func_effect_8007BFFC(boss->obj.pos.x + D_800D21C8[i].x, boss->obj.pos.y + D_800D21C8[i].y, + boss->obj.pos.z + D_800D21C8[i].z, 0.0f, 0.0f, 0.0f, 7.0f * temp, 10); } break; } } -s32 func_80090200(Boss* boss) { +s32 func_hud_80090200(Boss* boss) { Vec3f dest, src; Player* player; s32 ret = 0; if (boss->swork[0] == 1) { - func_8008FFF0(boss, 8596); + func_hud_8008FFF0(boss, 8596); player = &gPlayer[0]; ret = 1; @@ -3810,7 +3806,7 @@ s32 func_80090200(Boss* boss) { return ret; } -void func_800907C4(Boss* boss) { +void func_hud_800907C4(Boss* boss) { switch (boss->state) { case 0: if ((boss->fwork[1] == 255.0f) && (boss->fwork[2] == 212.0f)) { @@ -3831,10 +3827,10 @@ void func_800907C4(Boss* boss) { } break; } - func_8008FFF0(boss, D_8015F928); + func_hud_8008FFF0(boss, D_360_8015F928); } -bool func_8009092C(Actor* actor) { +bool func_hud_8009092C(Actor* actor) { bool var_s5 = false; Boss* boss; s32 i = 0; @@ -3860,7 +3856,7 @@ bool func_8009092C(Actor* actor) { return var_s5; } -bool func_80090A00(Actor* actor) { +bool func_hud_80090A00(Actor* actor) { switch (actor->iwork[5]) { case 0: actor->fwork[8] = 0.0f; @@ -3934,10 +3930,10 @@ bool func_80090A00(Actor* actor) { return false; } -bool func_80090CCC(Actor* actor) { +bool func_hud_80090CCC(Actor* actor) { bool ret = false; - if (func_8009092C(actor)) { + if (func_hud_8009092C(actor)) { actor->fwork[6] = gBosses[actor->aiIndex].obj.pos.z; actor->fwork[5] = gBosses[actor->aiIndex].obj.pos.y; actor->fwork[4] = gBosses[actor->aiIndex].obj.pos.x; @@ -3977,7 +3973,7 @@ bool func_80090CCC(Actor* actor) { return ret; } -s32 func_80090E8C(Actor* actor) { +s32 func_hud_80090E8C(Actor* actor) { f32 x; f32 y; f32 z; @@ -4020,7 +4016,7 @@ s32 func_80090E8C(Actor* actor) { return false; } -bool func_800910C0(Actor* actor) { +bool func_hud_800910C0(Actor* actor) { f32 var_fv1; if (actor->timer_0BC == 0) { @@ -4052,15 +4048,15 @@ bool func_800910C0(Actor* actor) { return false; } -void func_80091254(Actor* actor) { +void func_hud_80091254(Actor* actor) { if (gLevelMode == LEVELMODE_ALL_RANGE) { - func_80090E8C(actor); + func_hud_80090E8C(actor); } else { - func_800910C0(actor); + func_hud_800910C0(actor); } } -bool func_80091298(Actor* actor) { +bool func_hud_80091298(Actor* actor) { actor->fwork[1] = gPlayer[0].unk_0D0 + 10.0f; actor->fwork[3] = 3.6f; actor->fwork[4] = gPlayer[0].pos.x + ((f32) (actor->aiType - 2) * 700.0f); @@ -4074,7 +4070,7 @@ bool func_80091298(Actor* actor) { return false; } -bool func_80091368(Actor* actor) { +bool func_hud_80091368(Actor* actor) { switch (actor->iwork[5]) { case 0: actor->fwork[5] = 20000.0f; @@ -4117,26 +4113,26 @@ bool func_80091368(Actor* actor) { return false; } -void func_800914FC(Actor* actor) { +void func_hud_800914FC(Actor* actor) { switch (actor->state) { case 0: - if (!func_80090CCC(actor)) { + if (!func_hud_80090CCC(actor)) { break; } case 1: - func_80091254(actor); + func_hud_80091254(actor); break; case 2: - func_80091298(actor); + func_hud_80091298(actor); break; case 3: - func_80091368(actor); + func_hud_80091368(actor); break; case 7: - func_80090A00(actor); + func_hud_80090A00(actor); break; } @@ -4153,7 +4149,7 @@ void func_800914FC(Actor* actor) { } } -bool func_800915FC(Actor* actor) { +bool func_hud_800915FC(Actor* actor) { s32 i; f32 y; Vec3f vec; @@ -4219,7 +4215,7 @@ bool func_800915FC(Actor* actor) { return ret; } -bool func_80091864(Actor* actor) { +bool func_hud_80091864(Actor* actor) { f32 sp44; f32 sp40; f32 sp3C; @@ -4236,7 +4232,7 @@ bool func_80091864(Actor* actor) { sp40 = Math_RadToDeg(Math_Atan2F(x, z)); sp44 = Math_RadToDeg(Math_Atan2F(y, sqrtf(SQ(x) + SQ(z)))); - if ((func_800915FC(actor) != 0) && (actor->iwork[4] == 0)) { + if ((func_hud_800915FC(actor) != 0) && (actor->iwork[4] == 0)) { sp44 += 40.0f; if (sp44 >= 360.0f) { sp44 -= 360.0f; @@ -4278,7 +4274,7 @@ bool func_80091864(Actor* actor) { return false; } -bool func_80091B90(Actor* actor) { +bool func_hud_80091B90(Actor* actor) { Vec3f vec; actor->obj.rot.x = -actor->unk_0F4.x; @@ -4301,12 +4297,12 @@ bool func_80091B90(Actor* actor) { actor->obj.pos.y = gGroundLevel + 40.0f; actor->vel.y = 0.0f; } - actor->vel.z -= D_80177D08; + actor->vel.z -= D_ctx_80177D08; return false; } -bool func_80091CF8(Actor* actor) { +bool func_hud_80091CF8(Actor* actor) { if (actor->iwork[1] != 0) { if (actor->fwork[10] < 0.1f) { actor->fwork[10] = 20.0f; @@ -4325,7 +4321,7 @@ bool func_80091CF8(Actor* actor) { return false; } -bool func_80091DF4(Actor* actor) { +bool func_hud_80091DF4(Actor* actor) { Vec3f sp44; Vec3f sp38; @@ -4335,14 +4331,14 @@ bool func_80091DF4(Actor* actor) { sp44.y = 0.0f; sp44.z = 100.0f; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp44, &sp38); - func_8006EEFC(actor->aiType, actor->obj.pos.x + (sp38.x * 1.5), actor->obj.pos.y + (sp38.y * 1.5), - actor->obj.pos.z + (sp38.z * 1.5), sp38.x, sp38.y, sp38.z, actor->obj.rot.x, actor->obj.rot.y, - actor->obj.rot.z); + func_enmy2_8006EEFC(actor->aiType, actor->obj.pos.x + (sp38.x * 1.5), actor->obj.pos.y + (sp38.y * 1.5), + actor->obj.pos.z + (sp38.z * 1.5), sp38.x, sp38.y, sp38.z, actor->obj.rot.x, + actor->obj.rot.y, actor->obj.rot.z); } return false; } -bool func_80091F00(Actor* actor) { +bool func_hud_80091F00(Actor* actor) { u8 temp_v0 = actor->unk_0D0; Vec3f sp40; Vec3f sp34; @@ -4360,7 +4356,7 @@ bool func_80091F00(Actor* actor) { actor->timer_0C6 = 20; AUDIO_PLAY_SFX(0x2903300E, actor->sfxSource, 4); - func_8007D10C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.5f); + func_effect_8007D10C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.5f); Matrix_RotateY(gCalcMatrix, actor->unk_0F4.y * M_DTOR, 0); if (Rand_ZeroOne() < 0.5f) { @@ -4430,7 +4426,7 @@ bool func_80091F00(Actor* actor) { return false; } -void func_80092244(Actor* actor) { +void func_hud_80092244(Actor* actor) { gRadarMarks[actor->index].unk_00 = 1; gRadarMarks[actor->index].unk_02 = actor->aiType; gRadarMarks[actor->index].pos.x = actor->obj.pos.x; @@ -4439,7 +4435,7 @@ void func_80092244(Actor* actor) { gRadarMarks[actor->index].unk_10 = actor->unk_0F4.y + 180.0f; } -void func_800922F4(Actor* actor) { +void func_hud_800922F4(Actor* actor) { s32 temp; if ((gTeamShields[actor->aiType] < 64) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_7)) { @@ -4455,19 +4451,19 @@ void func_800922F4(Actor* actor) { } if (!(gGameFrameCount & temp)) { - func_8007D10C(actor->obj.pos.x + RAND_FLOAT_CENTERED(10.0f), actor->obj.pos.y + RAND_FLOAT(10.0f), - actor->obj.pos.z + RAND_FLOAT_CENTERED(10.0f), 2.2f); + func_effect_8007D10C(actor->obj.pos.x + RAND_FLOAT_CENTERED(10.0f), actor->obj.pos.y + RAND_FLOAT(10.0f), + actor->obj.pos.z + RAND_FLOAT_CENTERED(10.0f), 2.2f); } if (!(gGameFrameCount & (temp >> 2)) && (Rand_ZeroOne() < 0.5f)) { - func_8007C120(actor->obj.pos.x + RAND_FLOAT_CENTERED(30.0f), actor->obj.pos.y + RAND_FLOAT(10.0f), - actor->obj.pos.z + RAND_FLOAT_CENTERED(30.0f), actor->vel.x, actor->vel.y, actor->vel.z, - actor->scale * 0.07f, 3); + func_effect_8007C120(actor->obj.pos.x + RAND_FLOAT_CENTERED(30.0f), actor->obj.pos.y + RAND_FLOAT(10.0f), + actor->obj.pos.z + RAND_FLOAT_CENTERED(30.0f), actor->vel.x, actor->vel.y, + actor->vel.z, actor->scale * 0.07f, 3); } } } -bool func_800924E0(Actor* actor) { +bool func_hud_800924E0(Actor* actor) { Vec3f src; Vec3f dest; f32 var_fv0; @@ -4533,7 +4529,7 @@ bool func_800924E0(Actor* actor) { return ret; } -bool func_800927A0(Actor* actor) { +bool func_hud_800927A0(Actor* actor) { Vec3f src; Vec3f dest; f32 sp54; @@ -4667,14 +4663,14 @@ bool func_800927A0(Actor* actor) { return ret; } -void func_80092D48(Actor* actor) { +void func_hud_80092D48(Actor* actor) { s32 D_800D22A8[] = { 1, 2, 3 }; if (gCurrentLevel != LEVEL_TITANIA) { actor->fwork[1] = 40.0f; actor->fwork[3] = 1.2f; - actor->aiType = (D_800D1970 & 3) + 1; - D_800D1970++; + actor->aiType = (D_hud_800D1970 & 3) + 1; + D_hud_800D1970++; } else { actor->state = 7; actor->aiType = 2; @@ -4691,7 +4687,7 @@ void func_80092D48(Actor* actor) { AUDIO_PLAY_SFX(0x3100000CU, actor->sfxSource, 4U); - if (((D_800D1970 & 3) == 2) && (gCurrentLevel == LEVEL_SECTOR_X)) { + if (((D_hud_800D1970 & 3) == 2) && (gCurrentLevel == LEVEL_SECTOR_X)) { Object_Kill(&actor->obj, actor->sfxSource); } @@ -4700,20 +4696,20 @@ void func_80092D48(Actor* actor) { } } -void func_80092EC0(Actor* actor) { +void func_hud_80092EC0(Actor* actor) { f32 var_fv1; actor->health = gTeamShields[actor->aiType]; switch (actor->unk_048) { case 0: - func_800914FC(actor); - func_80091864(actor); - func_80091B90(actor); - func_80091DF4(actor); + func_hud_800914FC(actor); + func_hud_80091864(actor); + func_hud_80091B90(actor); + func_hud_80091DF4(actor); if (actor->unk_0D0 != 0) { - func_80091F00(actor); + func_hud_80091F00(actor); } if (actor->state == 3) { @@ -4753,14 +4749,14 @@ void func_80092EC0(Actor* actor) { break; case 1: - if (func_800924E0(actor) != 0) { + if (func_hud_800924E0(actor) != 0) { actor->unk_048 = 0; actor->iwork[9] = RAND_INT(30.0f) + 90; } break; case 2: - if (func_800927A0(actor) != 0) { + if (func_hud_800927A0(actor) != 0) { actor->unk_04A = 0; actor->unk_048 = actor->unk_04A; actor->iwork[9] = RAND_INT(30.0f) + 90; @@ -4768,9 +4764,9 @@ void func_80092EC0(Actor* actor) { break; } - func_80091CF8(actor); - func_800922F4(actor); - func_80092244(actor); + func_hud_80091CF8(actor); + func_hud_800922F4(actor); + func_hud_80092244(actor); if (actor->iwork[9] != 0) { actor->iwork[9]--; @@ -4778,7 +4774,7 @@ void func_80092EC0(Actor* actor) { actor->iwork[10] = 0; } -void func_80093164(Actor* actor) { +void func_hud_80093164(Actor* actor) { Vec3f src; Vec3f dest; Player* player = &gPlayer[0]; @@ -4797,7 +4793,7 @@ void func_80093164(Actor* actor) { break; case 41: - func_i3_801BE034(actor); + Aquas_801BE034(actor); break; case 44: @@ -4823,7 +4819,7 @@ void func_80093164(Actor* actor) { actor->obj.rot.z = -actor->unk_0F4.z; } -void func_80093310(void) { +void func_hud_80093310(void) { Actor* this = &gActors[0]; Actor_Initialize(this); @@ -4838,7 +4834,7 @@ void func_80093310(void) { AUDIO_PLAY_SFX(0x11030010, this->sfxSource, 0); } -void func_800933D8(f32 x, f32 y, f32 z, f32 arg3) { +void func_hud_800933D8(f32 x, f32 y, f32 z, f32 arg3) { s32 i; Effect* effect = &gEffects[ARRAY_COUNT(gEffects) - 1]; Player* player = gPlayer; @@ -4897,7 +4893,7 @@ f32 D_800D22CC = 260.0f; s32 D_800D22D0 = 50; s32 D_800D22D4 = 2; -void func_800935E8(Player* player) { +void func_hud_800935E8(Player* player) { Vec3f D_800D22D8[] = { { -1730.0f, 1600.0f, -6690.0f }, { -830.0f, 1600.0f, -7380.0f }, { 0.0f, 1600.0f, -7380.0f } }; @@ -4929,18 +4925,18 @@ void func_800935E8(Player* player) { switch (player->unk_1D0) { case 0: - func_80093310(); + func_hud_80093310(); gCsFrameCount = 0; - D_80177AB0 = 1; - D_80177AC8 = 1; + D_ctx_80177AB0 = 1; + D_ctx_80177AC8 = 1; player->unk_234 = 0; player->unk_1D0 = 1; player->unk_208 = 0; player->unk_0D0 = 0.0f; - D_80178340 = 255; - D_80178348 = D_80178350 = D_80178354 = 0; - D_80178358 = 0; + D_ctx_80178340 = 255; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; + D_ctx_80178358 = 0; player->camEye.x = gCsCamEyeX = -3061.2f; player->camEye.y = gCsCamEyeY = 1745.9f; @@ -4956,12 +4952,12 @@ void func_800935E8(Player* player) { actor->unk_0F4.y = 30.0f; - D_80177A48[5] = 14.0f; - D_80177A48[0] = 0.2f; - D_80177A10[6] = 0; - D_80177A10[7] = 0; + D_ctx_80177A48[5] = 14.0f; + D_ctx_80177A48[0] = 0.2f; + D_ctx_80177A10[6] = 0; + D_ctx_80177A10[7] = 0; D_801616B0.x = D_801616B0.y = D_801616B0.z = 0.0f; - D_80177A48[7] = 0.0f; + D_ctx_80177A48[7] = 0.0f; case 1: if ((player->unk_208 == 0) && (gCsFrameCount < 250)) { @@ -4980,7 +4976,7 @@ void func_800935E8(Player* player) { y = dest.y; z = dest.z; - func_800933D8(x, y, z, 20.0f); + func_hud_800933D8(x, y, z, 20.0f); i = (i + 1) % 32; } @@ -4999,7 +4995,7 @@ void func_800935E8(Player* player) { y = dest.y; z = dest.z; - func_800933D8(x, y, z, 20.0f); + func_hud_800933D8(x, y, z, 20.0f); i = (i + 1) % 32; } @@ -5009,9 +5005,9 @@ void func_800935E8(Player* player) { player->unk_208--; } - if (D_80177A10[6] < 3) { - i = D_80177A10[6]; - stepSize = D_80177A48[5]; + if (D_ctx_80177A10[6] < 3) { + i = D_ctx_80177A10[6]; + stepSize = D_ctx_80177A48[5]; src.x = gCsCamEyeX; src.y = gCsCamEyeY; @@ -5022,19 +5018,19 @@ void func_800935E8(Player* player) { dest.z = D_800D22D8[i].z; if (Math_PursueVec3f(&src, &dest, &D_801616A0, stepSize, 0.4f, 4.8f, stepSize)) { - if (D_80177A10[6] == 0) { - D_80177A10[7]++; + if (D_ctx_80177A10[6] == 0) { + D_ctx_80177A10[7]++; } - D_80177A10[6]++; + D_ctx_80177A10[6]++; } gCsCamEyeX = src.x; gCsCamEyeY = src.y; gCsCamEyeZ = src.z; } - if (D_80177A10[7] == 1) { - i = D_80177A10[7]; - stepSize = D_80177A48[5]; + if (D_ctx_80177A10[7] == 1) { + i = D_ctx_80177A10[7]; + stepSize = D_ctx_80177A48[5]; src.x = gCsCamAtX; src.y = gCsCamAtY; @@ -5044,9 +5040,9 @@ void func_800935E8(Player* player) { dest.y = D_800D22FC[i].y; dest.z = D_800D22FC[i].z; - if (D_80177A10[6] <= D_80177A10[7]) { + if (D_ctx_80177A10[6] <= D_ctx_80177A10[7]) { if (Math_PursueVec3f(&src, &dest, &D_801616B0, stepSize, 0.4f, 4.8f, stepSize)) { - D_80177A10[7]++; + D_ctx_80177A10[7]++; } } @@ -5057,24 +5053,24 @@ void func_800935E8(Player* player) { if (gCsFrameCount >= 50) { // clang-format off - if (D_80178340 == 255) { player->unk_1D0 = 2; } + if (D_ctx_80178340 == 255) { player->unk_1D0 = 2; } // clang-format on - D_80178348 = D_80178350 = D_80178354 = 255; - D_80178358 = 255; - Math_SmoothStepToF(&D_80177A48[7], 16.0f, 0.04f, 0.05f, 0.0f); - D_8017835C = D_80177A48[7]; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; + D_ctx_80178358 = 255; + Math_SmoothStepToF(&D_ctx_80177A48[7], 16.0f, 0.04f, 0.05f, 0.0f); + D_ctx_8017835C = D_ctx_80177A48[7]; } break; case 2: - D_80178380[0] = 0; + D_ctx_80178380[0] = 0; - D_80177A10[0] = gLight1R; - D_80177A10[1] = gLight1G; - D_80177A10[2] = gLight1B; - D_80177A10[3] = gAmbientR; - D_80177A10[4] = gAmbientG; - D_80177A10[5] = gAmbientB; + D_ctx_80177A10[0] = gLight1R; + D_ctx_80177A10[1] = gLight1G; + D_ctx_80177A10[2] = gLight1B; + D_ctx_80177A10[3] = gAmbientR; + D_ctx_80177A10[4] = gAmbientG; + D_ctx_80177A10[5] = gAmbientB; gLight1R = 40; gLight1G = 100; @@ -5084,13 +5080,13 @@ void func_800935E8(Player* player) { gAmbientG = 30; gAmbientB = 50; - D_80177A48[2] = 0.0f; - D_80177A48[3] = -1600.0f; - D_80177A48[4] = 520.0f; + D_ctx_80177A48[2] = 0.0f; + D_ctx_80177A48[3] = -1600.0f; + D_ctx_80177A48[4] = 520.0f; player->unk_1D0 = 3; - D_80177AB0 = 0; + D_ctx_80177AB0 = 0; player->unk_034 = 60.0f; player->timer_1F8 = 1000; @@ -5101,25 +5097,25 @@ void func_800935E8(Player* player) { player->pos.x = -50.0f; player->pos.y = 1200.0f; - D_80178358 = 0; + D_ctx_80178358 = 0; - func_i3_801BDF14(); + Aquas_801BDF14(); AUDIO_PLAY_BGM(SEQ_ID_45); case 3: - D_8017835C = 16; + D_ctx_8017835C = 16; if (player->timer_1F8 > 774) { - if (D_80177A48[4] >= 200.0f) { - Math_SmoothStepToF(&D_80177A48[4], -200.0f, 1.00f, 4.0f, 4.0f); + if (D_ctx_80177A48[4] >= 200.0f) { + Math_SmoothStepToF(&D_ctx_80177A48[4], -200.0f, 1.00f, 4.0f, 4.0f); } else { - Math_SmoothStepToF(&D_80177A48[4], -200.0f, 0.06f, 4.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[4], -200.0f, 0.06f, 4.0f, 0.0f); } - src.x = D_80177A48[2]; - src.y = D_80177A48[3]; - src.z = D_80177A48[4]; + src.x = D_ctx_80177A48[2]; + src.y = D_ctx_80177A48[3]; + src.z = D_ctx_80177A48[4]; Matrix_Translate(gCalcMatrix, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 0); Matrix_RotateY(gCalcMatrix, M_DTOR * 30.0f, 1); @@ -5140,16 +5136,16 @@ void func_800935E8(Player* player) { if (player->timer_1F8 == 774) { AUDIO_PLAY_SFX(0x01038026U, player->sfxSource, 0U); - D_80177A10[9] = 40; + D_ctx_80177A10[9] = 40; } if (player->timer_1F8 <= 774) { - D_80177A48[0] = 0.0f; + D_ctx_80177A48[0] = 0.0f; temp2 = 0.0f; - if (D_80177A10[9]) { - D_80177A10[9] -= 1; - temp = D_80177A10[9]; + if (D_ctx_80177A10[9]) { + D_ctx_80177A10[9] -= 1; + temp = D_ctx_80177A10[9]; if (temp > 20.0f) { temp = 20.0f; } @@ -5174,38 +5170,38 @@ void func_800935E8(Player* player) { player->pos.z = dest.z; if (((player->timer_1F8 % 8) == 0) && (player->timer_1F8 > 740)) { - func_8007D9DC(player->camEye.x, 1600.0f, player->camEye.z, 10.0f, 100.0f, 0); + func_effect_8007D9DC(player->camEye.x, 1600.0f, player->camEye.z, 10.0f, 100.0f, 0); } - if ((player->unk_018 > -200.0f) && (D_80177A10[8] < 6)) { - if (D_80177A10[8] < 2) { - func_800933D8(player->pos.x, player->pos.y - 400.0f, player->pos.z, 20.0f); + if ((player->unk_018 > -200.0f) && (D_ctx_80177A10[8] < 6)) { + if (D_ctx_80177A10[8] < 2) { + func_hud_800933D8(player->pos.x, player->pos.y - 400.0f, player->pos.z, 20.0f); } - if (D_80177A10[8] >= 2) { - func_800933D8(player->pos.x, player->pos.y, player->pos.z, 10.0f); + if (D_ctx_80177A10[8] >= 2) { + func_hud_800933D8(player->pos.x, player->pos.y, player->pos.z, 10.0f); } - D_80177A10[8]++; + D_ctx_80177A10[8]++; } if (((gGameFrameCount % 3) == 0) && (player->timer_1F8 <= 740)) { for (i = 0; i < 8; i++) { - func_i3_801AC8A8(player->camEye.x + RAND_FLOAT_CENTERED(D_800D22C4), - player->camEye.y + 260.0f + RAND_FLOAT_CENTERED(D_800D22C8), - player->camEye.z + RAND_FLOAT_CENTERED(D_800D22CC), 1.0f, 0); + Aquas_801AC8A8(player->camEye.x + RAND_FLOAT_CENTERED(D_800D22C4), + player->camEye.y + 260.0f + RAND_FLOAT_CENTERED(D_800D22C8), + player->camEye.z + RAND_FLOAT_CENTERED(D_800D22CC), 1.0f, 0); } } } if (player->timer_1F8 < 736) { player->unk_1D0 = 4; - D_80177AC8 = 1; - D_80178348 = D_80178350 = D_80178354 = 255; - D_80178358 = 255; + D_ctx_80177AC8 = 1; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; + D_ctx_80178358 = 255; } break; case 4: - if (D_80178340 == 255) { + if (D_ctx_80178340 == 255) { player->unk_1D0 = 5; } break; @@ -5226,7 +5222,7 @@ void func_800935E8(Player* player) { player->pos.z += 1000.0f; player->unk_034 = 0.0f; - D_80177A48[0] = 0.1f; + D_ctx_80177A48[0] = 0.1f; player->unk_0E8 = 0.0f; player->unk_0D0 = 20.0f; @@ -5235,8 +5231,8 @@ void func_800935E8(Player* player) { player->timer_1F8 = 1000; - D_80177AC8 = 0; - D_80178358 = 0; + D_ctx_80177AC8 = 0; + D_ctx_80178358 = 0; Object_Kill(&actor->obj, actor->sfxSource); @@ -5260,29 +5256,29 @@ void func_800935E8(Player* player) { Math_SmoothStepToF(&player->pos.z, 0.0f, 0.1f, 40.0f, 0.1f); - D_80177A48[0] = 0.03f; + D_ctx_80177A48[0] = 0.03f; gCsCamEyeZ = 240.0f; - gCsCamAtZ = player->pos.z + (D_80177D20 - 1.0f); + gCsCamAtZ = player->pos.z + (D_ctx_80177D20 - 1.0f); if (((player->timer_1F8 % 2) == 0) && (player->timer_1F8 > 962)) { - func_800933D8(player->pos.x, player->pos.y, player->pos.z + 50.0f, 20.0f); + func_hud_800933D8(player->pos.x, player->pos.y, player->pos.z + 50.0f, 20.0f); } if (player->timer_1F8 <= 900) { - D_80177838 = 50; + D_ctx_80177838 = 50; player->state_1C8 = PLAYERSTATE_1C8_3; player->unk_1D0 = 0; player->timer_1F8 = 0; - D_80178488 = 1; + D_ctx_80178488 = 1; SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 50); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 50); AUDIO_PLAY_BGM(SEQ_ID_14); } - func_i3_801AC8A8(player->pos.x + RAND_FLOAT_CENTERED(10.0f), player->pos.y + RAND_FLOAT_CENTERED(10.0f), - player->pos.z - 65.0f + RAND_FLOAT_CENTERED(10.0f), 0.4f, 1); + Aquas_801AC8A8(player->pos.x + RAND_FLOAT_CENTERED(10.0f), player->pos.y + RAND_FLOAT_CENTERED(10.0f), + player->pos.z - 65.0f + RAND_FLOAT_CENTERED(10.0f), 0.4f, 1); break; default: @@ -5304,16 +5300,16 @@ void func_800935E8(Player* player) { player->pos.x += player->vel.x; player->pos.y += player->vel.y; - D_80177CE8 -= player->vel.z; + D_ctx_80177CE8 -= player->vel.z; player->unk_0F8 = player->unk_0EC + player->unk_12C + player->unk_130; - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_ctx_80177A48[0], 50000.0f, 0.0f); } // unused data @@ -5323,7 +5319,7 @@ f32 D_800D24C0[] = { 128.0f, 128.0f, 255.0f, 128.0f }; s32 D_800D24C8[] = { 0, 900 }; f32 D_800D24CC = 0.02f; -void func_80094954(Effect* effect) { +void func_hud_80094954(Effect* effect) { Player* player = &gPlayer[0]; if ((player->state_1C8 == PLAYERSTATE_1C8_2) && (gCurrentLevel == LEVEL_AQUAS) && (player->unk_1D0 < 2)) { @@ -5380,7 +5376,7 @@ void func_80094954(Effect* effect) { } } -void func_80094BBC(Effect* effect) { +void func_hud_80094BBC(Effect* effect) { if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_2) && (gCurrentLevel == LEVEL_AQUAS) && (gPlayer[0].unk_1D0 < 2)) { RCP_SetupDL(&gMasterDisp, 0x44); gDPSetPrimColor(gMasterDisp++, 0, 0, 0, 21, 34, effect->unk_4A); @@ -5399,7 +5395,7 @@ void stub_80094D10(void) { void stub_80094D18(void) { } -void func_80094D20(f32 x, f32 y) { +void func_hud_80094D20(f32 x, f32 y) { u8* D_800D24DC[] = { D_5009F60, D_500A050, D_500A140, D_500A230, D_500A320, D_500A410, D_500A500, D_500A5F0, D_500A6E0, D_500A7D0 }; s32 D_800D2504[] = { 100, 10, 1 }; @@ -5414,12 +5410,12 @@ void func_80094D20(f32 x, f32 y) { f32 y1; f32 xScale; - if (gHitCount > D_8016172C) { - temp3 = D_8016172C + 1; - temp4 = D_8016172C; + if (gHitCount > D_hud_8016172C) { + temp3 = D_hud_8016172C + 1; + temp4 = D_hud_8016172C; } else { temp3 = gHitCount; - temp4 = D_8016172C; + temp4 = D_hud_8016172C; } boolTemp = 0; @@ -5437,31 +5433,31 @@ void func_80094D20(f32 x, f32 y) { if ((temp != 0) || (boolTemp == 1)) { if (temp != temp2) { - D_80161720[j] += 0.4f; - if (D_80161720[j] <= 0.9f) { - xScale = D_80161720[j]; + D_hud_80161720[j] += 0.4f; + if (D_hud_80161720[j] <= 0.9f) { + xScale = D_hud_80161720[j]; x1 += 8.0f * xScale; xScale = 1.0f - xScale; } - if ((D_80161720[j] > 0.9f) && (D_80161720[j] < 1.1f)) { + if ((D_hud_80161720[j] > 0.9f) && (D_hud_80161720[j] < 1.1f)) { xScale = 0.0f; } - if (D_80161720[j] >= 2.0f) { + if (D_hud_80161720[j] >= 2.0f) { temp2++; if (temp2 >= 10) { temp2 = 0; } - D_80161720[j] = 0.0f; + D_hud_80161720[j] = 0.0f; } - if ((D_80161720[j] < 2.0f) && (D_80161720[j] >= 1.1f)) { + if ((D_hud_80161720[j] < 2.0f) && (D_hud_80161720[j] >= 1.1f)) { temp2++; if (temp2 >= 10) { temp2 = 0; } - xScale = 2.0f - D_80161720[j]; + xScale = 2.0f - D_hud_80161720[j]; x1 += 8.0f * xScale; xScale = 1.0f - xScale; } @@ -5488,31 +5484,31 @@ void func_80094D20(f32 x, f32 y) { y1 = y + 3.0f; if (temp3 != temp4) { - D_80161720[j] += 0.4f; - if (D_80161720[j] <= 0.9f) { - xScale = D_80161720[j]; + D_hud_80161720[j] += 0.4f; + if (D_hud_80161720[j] <= 0.9f) { + xScale = D_hud_80161720[j]; x1 += 8.0f * xScale; xScale = 1.0f - xScale; } - if ((D_80161720[j] > 0.9f) && (D_80161720[j] < 1.1f)) { + if ((D_hud_80161720[j] > 0.9f) && (D_hud_80161720[j] < 1.1f)) { xScale = 0.0f; } - if (D_80161720[j] >= 2.0f) { + if (D_hud_80161720[j] >= 2.0f) { temp4++; if (temp4 >= 10) { temp4 = 0; } - D_80161720[j] = 0.0f; + D_hud_80161720[j] = 0.0f; } - if ((D_80161720[j] < 2.0f) && (D_80161720[j] >= 1.1f)) { + if ((D_hud_80161720[j] < 2.0f) && (D_hud_80161720[j] >= 1.1f)) { temp4++; if (temp4 >= 10) { temp4 = 0; } - xScale = 2.0f - D_80161720[j]; + xScale = 2.0f - D_hud_80161720[j]; x1 += 8.0f * xScale; xScale = 1.0f - xScale; } @@ -5523,17 +5519,18 @@ void func_80094D20(f32 x, f32 y) { TextureRect_8bIA(&gMasterDisp, D_800D24DC[temp3], 16, 15, x1, y1, xScale, 1.0f); } - if ((gHitCount != D_8016172C) && (D_80161720[0] == 0.0f) && (D_80161720[1] == 0.0f) && (D_80161720[2] == 0.0f)) { - D_8016172C++; + if ((gHitCount != D_hud_8016172C) && (D_hud_80161720[0] == 0.0f) && (D_hud_80161720[1] == 0.0f) && + (D_hud_80161720[2] == 0.0f)) { + D_hud_8016172C++; - if ((D_8016172C == 4) || (D_8016172C == 9) || (D_8016172C == 14) || (D_8016172C == 19) || (D_8016172C == 24) || - (D_8016172C == 29)) { - D_80161A62 = D_8016172C; + if ((D_hud_8016172C == 4) || (D_hud_8016172C == 9) || (D_hud_8016172C == 14) || (D_hud_8016172C == 19) || + (D_hud_8016172C == 24) || (D_hud_8016172C == 29)) { + D_play_80161A62 = D_hud_8016172C; } } } -void func_80095350(Actor* actor) { +void func_hud_80095350(Actor* actor) { Actor_Initialize(actor); actor->obj.status = OBJ_ACTIVE; actor->obj.id = OBJ_ACTOR_195; @@ -5541,7 +5538,7 @@ void func_80095350(Actor* actor) { Object_SetInfo(&actor->info, actor->obj.id); } -void func_800953A0(Actor* actor, s32 arg1) { +void func_hud_800953A0(Actor* actor, s32 arg1) { Vec3f D_800D2510[] = { { 1800.0f, 0.0f, -4000.0f }, { -1000.0f, 0.0f, -4800.0f }, @@ -5553,12 +5550,12 @@ void func_800953A0(Actor* actor, s32 arg1) { actor->obj.status = OBJ_ACTIVE; actor->obj.id = OBJ_ACTOR_195; actor->obj.pos = D_800D2510[arg1]; - actor->obj.pos.z -= D_80177D20; + actor->obj.pos.z -= D_ctx_80177D20; actor->unk_0B6 = 45; Object_SetInfo(&actor->info, actor->obj.id); } -void func_8009546C(Actor* actor, s32 arg1) { +void func_hud_8009546C(Actor* actor, s32 arg1) { Vec3f D_800D2540[] = { { 1300.0f, 0.0f, -2000.0f }, { -1000.0f, 0.0f, -3000.0f }, { 800.0f, 0.0f, 0.0f }, { -1200.0f, 0.0f, -1000.0f }, { -1400.0f, 0.0f, 700.0f }, @@ -5568,12 +5565,12 @@ void func_8009546C(Actor* actor, s32 arg1) { actor->obj.status = OBJ_ACTIVE; actor->obj.id = OBJ_ACTOR_195; actor->obj.pos = D_800D2540[arg1]; - actor->obj.pos.z -= D_80177D20; + actor->obj.pos.z -= D_ctx_80177D20; actor->unk_0B6 = 46; Object_SetInfo(&actor->info, actor->obj.id); } -void func_80095538(Actor* actor, s32 arg1) { +void func_hud_80095538(Actor* actor, s32 arg1) { Vec3f D_800D257C[] = { { 0.0f, 0.0f, -200.0f }, { -300.0f, 0.0f, -700.0f }, { 400.0f, 0.0f, -900.0f }, { 300.0f, 0.0f, -1700.0f }, { -260.0f, 0.0f, -2000.0f }, { -200.0f, 0.0f, -2600.0f }, @@ -5583,11 +5580,11 @@ void func_80095538(Actor* actor, s32 arg1) { actor->obj.status = OBJ_ACTIVE; actor->obj.id = OBJ_ACTOR_195; actor->obj.pos = D_800D257C[arg1]; - actor->obj.pos.z -= D_80177D20; + actor->obj.pos.z -= D_ctx_80177D20; actor->unk_0B6 = 47; Object_SetInfo(&actor->info, actor->obj.id); } -void func_80095604(Player* player) { +void func_hud_80095604(Player* player) { s32 i; s32 j; Actor* actor; @@ -5610,42 +5607,42 @@ void func_80095604(Player* player) { player->unk_280 = 0; player->unk_1D0 = 1; - D_80177A48[1] = gBosses[0].obj.pos.x; - D_80177A48[2] = gBosses[0].obj.pos.y; - D_80177A48[3] = gBosses[0].obj.pos.z; - D_80177A48[4] = 0.0f; - D_80177A48[5] = 0.0f; - D_80177A48[6] = 0.05f; + D_ctx_80177A48[1] = gBosses[0].obj.pos.x; + D_ctx_80177A48[2] = gBosses[0].obj.pos.y; + D_ctx_80177A48[3] = gBosses[0].obj.pos.z; + D_ctx_80177A48[4] = 0.0f; + D_ctx_80177A48[5] = 0.0f; + D_ctx_80177A48[6] = 0.05f; - D_80177A48[7] = 0.0f; - D_80177A48[8] = 0.0f; - D_80177A48[9] = 0.0f; - D_80177A48[0] = 0.0f; + D_ctx_80177A48[7] = 0.0f; + D_ctx_80177A48[8] = 0.0f; + D_ctx_80177A48[9] = 0.0f; + D_ctx_80177A48[0] = 0.0f; case 1: if (gCsFrameCount > 240) { - D_80178348 = D_80178350 = D_80178354 = 255; - D_80178358 = 255; - D_8017835C = 16; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; + D_ctx_80178358 = 255; + D_ctx_8017835C = 16; if (gCsFrameCount == 280) { player->unk_1D0 = 10; } } if ((gCsFrameCount >= 30) && (gCsFrameCount < 90)) { - D_80177A48[5] -= 0.6f; - if ((D_80177A48[5]) < 0.0f) { - D_80177A48[5] += 360.0f; + D_ctx_80177A48[5] -= 0.6f; + if ((D_ctx_80177A48[5]) < 0.0f) { + D_ctx_80177A48[5] += 360.0f; } - if ((D_80177A48[5]) > 360.0f) { - D_80177A48[5] -= 360.0f; + if ((D_ctx_80177A48[5]) > 360.0f) { + D_ctx_80177A48[5] -= 360.0f; } src.x = 1000.0f; src.y = 300.0f; src.z = 1000.0f; - Matrix_Translate(gCalcMatrix, D_80177A48[1], D_80177A48[2], D_80177A48[3], 0); - Matrix_RotateY(gCalcMatrix, -(M_DTOR * D_80177A48[5]), 1); + Matrix_Translate(gCalcMatrix, D_ctx_80177A48[1], D_ctx_80177A48[2], D_ctx_80177A48[3], 0); + Matrix_RotateY(gCalcMatrix, -(M_DTOR * D_ctx_80177A48[5]), 1); Matrix_MultVec3f(gCalcMatrix, &src, &dest); } @@ -5657,7 +5654,7 @@ void func_80095604(Player* player) { if (gCsFrameCount >= 90) { dest.x = player->camEye.x; dest.y = player->camEye.y; - dest.z = player->camEye.z + 200.0f - D_80177D20; + dest.z = player->camEye.z + 200.0f - D_ctx_80177D20; } Math_SmoothStepToAngle(&player->unk_130, 0.0f, 0.05f, 1.2f, 0.0001f); @@ -5684,17 +5681,17 @@ void func_80095604(Player* player) { Math_SmoothStepToAngle(&player->unk_0E4, x1, 0.5f, 2.0f, 0.0001f); Math_SmoothStepToAngle(&player->unk_0EC, z1, 0.1f, 5.0f, 0.0001f); - Math_SmoothStepToAngle(&D_80177A48[4], 30.0f, 0.05f, 1.0f, 0.001f); - Math_SmoothStepToF(&D_80177A48[8], 600.0f, 0.05f, 1000.0f, 0.001f); - Math_SmoothStepToF(&D_80177A48[9], 2400.0f, 0.05f, 1000.0f, 0.001f); + Math_SmoothStepToAngle(&D_ctx_80177A48[4], 30.0f, 0.05f, 1.0f, 0.001f); + Math_SmoothStepToF(&D_ctx_80177A48[8], 600.0f, 0.05f, 1000.0f, 0.001f); + Math_SmoothStepToF(&D_ctx_80177A48[9], 2400.0f, 0.05f, 1000.0f, 0.001f); src.x = 0.0f; - src.y = D_80177A48[8]; - src.z = D_80177A48[9]; + src.y = D_ctx_80177A48[8]; + src.z = D_ctx_80177A48[9]; - Matrix_Translate(gCalcMatrix, gBosses[0].obj.pos.x, gBosses[0].obj.pos.y, gBosses[0].obj.pos.z + D_80177D20, - 0); - Matrix_RotateY(gCalcMatrix, -(M_DTOR * D_80177A48[4]), 1); + Matrix_Translate(gCalcMatrix, gBosses[0].obj.pos.x, gBosses[0].obj.pos.y, + gBosses[0].obj.pos.z + D_ctx_80177D20, 0); + Matrix_RotateY(gCalcMatrix, -(M_DTOR * D_ctx_80177A48[4]), 1); Matrix_MultVec3f(gCalcMatrix, &src, &dest); Math_SmoothStepToF(&gCsCamEyeX, dest.x, 0.02f, player->unk_0D0, 0.001f); @@ -5708,15 +5705,15 @@ void func_80095604(Player* player) { if (gCsFrameCount < 200) { Math_SmoothStepToF(&gCsCamAtX, gBosses[0].obj.pos.x, 0.03f, 100.0f, 0.001f); Math_SmoothStepToF(&gCsCamAtY, gBosses[0].obj.pos.y, 0.03f, 100.0f, 0.001f); - Math_SmoothStepToF(&gCsCamAtZ, gBosses[0].obj.pos.z + 600.0f + D_80177D20, 0.03f, 100.0f, 0.001f); + Math_SmoothStepToF(&gCsCamAtZ, gBosses[0].obj.pos.z + 600.0f + D_ctx_80177D20, 0.03f, 100.0f, 0.001f); } else { - Math_SmoothStepToF(&gCsCamAtX, player->pos.x, D_80177A48[6], 1000.0f, 0.001f); - Math_SmoothStepToF(&gCsCamAtY, player->pos.y, D_80177A48[6], 1000.0f, 0.001f); - Math_SmoothStepToF(&gCsCamAtZ, player->pos.z + D_80177D20, D_80177A48[6], 1000.0f, 0.001f); + Math_SmoothStepToF(&gCsCamAtX, player->pos.x, D_ctx_80177A48[6], 1000.0f, 0.001f); + Math_SmoothStepToF(&gCsCamAtY, player->pos.y, D_ctx_80177A48[6], 1000.0f, 0.001f); + Math_SmoothStepToF(&gCsCamAtZ, player->pos.z + D_ctx_80177D20, D_ctx_80177A48[6], 1000.0f, 0.001f); if (gCsFrameCount > 180) { - D_80177A48[6] += 0.005f; + D_ctx_80177A48[6] += 0.005f; } else { - D_80177A48[6] += 0.005f; + D_ctx_80177A48[6] += 0.005f; } } @@ -5724,12 +5721,12 @@ void func_80095604(Player* player) { player->camAt.y = gCsCamAtY; player->camAt.z = gCsCamAtZ; - D_80177A48[0] = 0.0f; + D_ctx_80177A48[0] = 0.0f; break; case 10: player->unk_234 = 1; - D_80177AC8 = 2; + D_ctx_80177AC8 = 2; player->unk_1D0 = 11; player->unk_0F8 = player->unk_0EC = player->unk_12C = player->unk_130 = 0.0f; @@ -5743,8 +5740,8 @@ void func_80095604(Player* player) { player->unk_280 = 0; player->unk_17C = player->unk_180 = 0.0f; - D_8015F974 = D_8015F978 = D_8015F97C = 255; - D_8015F980 = 0; + D_bg_8015F974 = D_bg_8015F978 = D_bg_8015F97C = 255; + D_bg_8015F980 = 0; gLight1R = 40; gLight1G = 100; @@ -5754,27 +5751,27 @@ void func_80095604(Player* player) { gAmbientG = 30; gAmbientB = 50; - func_800A6148(); + func_play_800A6148(); - player->unk_144 = D_80177D20 = 0; + player->unk_144 = D_ctx_80177D20 = 0; j = 0; - func_80095350(actor); + func_hud_80095350(actor); j++; for (i = 0; i < 6; i++, j++) { - func_80095538(&gActors[j], i); + func_hud_80095538(&gActors[j], i); } for (i = 0; i < 5; i++, j++) { - func_8009546C(&gActors[j], i); + func_hud_8009546C(&gActors[j], i); } for (i = 0; i < 4; i++, j++) { - func_800953A0(&gActors[j], i); + func_hud_800953A0(&gActors[j], i); } - player->pos.z -= D_80177D20; + player->pos.z -= D_ctx_80177D20; player->unk_138 = player->pos.z; actor->fwork[1] = 0.0f; @@ -5788,26 +5785,26 @@ void func_80095604(Player* player) { src.y = actor->fwork[2]; src.z = actor->fwork[3]; - Matrix_Translate(gCalcMatrix, player->pos.x, player->pos.y, player->unk_138 + D_80177D20, 0); + Matrix_Translate(gCalcMatrix, player->pos.x, player->pos.y, player->unk_138 + D_ctx_80177D20, 0); Matrix_RotateY(gCalcMatrix, -(M_DTOR * actor->unk_0F4.y), 1); Matrix_MultVec3f(gCalcMatrix, &src, &dest); player->camAt.x = gCsCamAtX = player->pos.x; player->camAt.y = gCsCamAtY = player->pos.y; - player->camAt.z = gCsCamAtZ = player->pos.z - 50.0f + D_80177D20; + player->camAt.z = gCsCamAtZ = player->pos.z - 50.0f + D_ctx_80177D20; player->camEye.x = gCsCamEyeX = dest.x; player->camEye.y = gCsCamEyeY = dest.y; player->camEye.z = gCsCamEyeZ = dest.z; - D_80177A48[0] = 1.0f; + D_ctx_80177A48[0] = 1.0f; case 11: - D_80178348 = D_80178350 = D_80178354 = 255; - D_80178358 = 0; - D_8017835C = 8; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; + D_ctx_80178358 = 0; + D_ctx_8017835C = 8; - if (D_80178340 == 0) { + if (D_ctx_80178340 == 0) { player->unk_1D0 = 12; } @@ -5828,19 +5825,19 @@ void func_80095604(Player* player) { } else { actor->fwork[4] = player->pos.x; actor->fwork[5] = player->pos.y; - actor->fwork[6] = player->unk_138 + D_80177D20; + actor->fwork[6] = player->unk_138 + D_ctx_80177D20; } if (gCsFrameCount < 1200) { gCsCamAtX = player->pos.x; gCsCamAtY = player->pos.y; - gCsCamAtZ = player->pos.z - 50.0f + D_80177D20; + gCsCamAtZ = player->pos.z - 50.0f + D_ctx_80177D20; } else { gCsCamAtX = player->pos.x; gCsCamAtY = player->pos.y + 10.0f; - gCsCamAtZ = player->pos.z - 50.0f + D_80177D20; + gCsCamAtZ = player->pos.z - 50.0f + D_ctx_80177D20; } - D_80177A48[0] = 0.05f; + D_ctx_80177A48[0] = 0.05f; actor->unk_0F4.y += actor->fwork[7]; if ((actor->unk_0F4.y) < 0.0f) { @@ -5863,16 +5860,16 @@ void func_80095604(Player* player) { gCsCamEyeZ = dest.z; if (gCsFrameCount >= 1360) { - D_80178348 = D_80178350 = D_80178354 = 0; - D_80178358 = 255; - D_8017835C = 16; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; + D_ctx_80178358 = 255; + D_ctx_8017835C = 16; - if (D_80178340 == 255) { - D_800D3180[LEVEL_AQUAS] = Play_CheckMedalStatus(150) + 1; + if (D_ctx_80178340 == 255) { + D_play_800D3180[LEVEL_AQUAS] = Play_CheckMedalStatus(150) + 1; player->state_1C8 = PLAYERSTATE_1C8_6; player->timer_1F8 = 0; Audio_FadeOutAll(10); - D_8017837C = 4; + D_ctx_8017837C = 4; } } @@ -5896,7 +5893,7 @@ void func_80095604(Player* player) { break; case 440: - D_80177840 = 100; + D_ctx_80177840 = 100; break; case 520: @@ -5932,11 +5929,11 @@ void func_80095604(Player* player) { break; case 1000: - D_80177830 = 1; + D_ctx_80177830 = 1; break; case 1200: - D_80177830 = 0; + D_ctx_80177830 = 0; break; } @@ -5972,22 +5969,22 @@ void func_80095604(Player* player) { src.y = 0.0f; src.z = -70.0f; Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &dest); - func_i3_801AC8A8(player->pos.x + dest.x + RAND_FLOAT_CENTERED(10.0f), - player->pos.y + dest.y + RAND_FLOAT_CENTERED(10.0f), - player->pos.z + dest.z + RAND_FLOAT_CENTERED(10.0f), 0.4f, 1); + Aquas_801AC8A8(player->pos.x + dest.x + RAND_FLOAT_CENTERED(10.0f), + player->pos.y + dest.y + RAND_FLOAT_CENTERED(10.0f), + player->pos.z + dest.z + RAND_FLOAT_CENTERED(10.0f), 0.4f, 1); } player->unk_178 += 20.0f; - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 50000.0f, 0.001f); - Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 50000.0f, 0.001f); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 50000.0f, 0.001f); - Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 50000.0f, 0.001f); - Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 50000.0f, 0.001f); - Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 50000.0f, 0.001f); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], 50000.0f, 0.001f); + Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_ctx_80177A48[0], 50000.0f, 0.001f); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], 50000.0f, 0.001f); + Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_ctx_80177A48[0], 50000.0f, 0.001f); + Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_ctx_80177A48[0], 50000.0f, 0.001f); + Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_ctx_80177A48[0], 50000.0f, 0.001f); } -void func_80096A74(Player* player) { +void func_hud_80096A74(Player* player) { Vec3f src, dest; s32 button; @@ -5997,41 +5994,41 @@ void func_80096A74(Player* player) { player->unk_0E4 = 270.0f; gPlayer[0].unk_0D0 = 0.0f; - D_80177A48[1] = 100.0f; - D_80177A48[2] = 0.0f; - D_80177A48[0] = 0.2f; + D_ctx_80177A48[1] = 100.0f; + D_ctx_80177A48[2] = 0.0f; + D_ctx_80177A48[0] = 0.2f; gCsFrameCount = 0; player->unk_1D0 = 1; - D_80178340 = D_80178358 = 255; + D_ctx_80178340 = D_ctx_80178358 = 255; player->camEye.x = gCsCamEyeX = 0.0f; - player->camEye.y = gCsCamEyeY = player->pos.y + D_80177A48[1]; + player->camEye.y = gCsCamEyeY = player->pos.y + D_ctx_80177A48[1]; player->camEye.z = gCsCamEyeZ = 0.0f; player->camAt.x = gCsCamAtX = 0.0f; player->camAt.y = gCsCamAtY = 0.0f; player->camAt.z = gCsCamAtZ = 0.0f; - D_80177A48[0] = 1.0f; - D_80177A48[2] = 0.0f; - D_80177A48[4] = 0.0f; + D_ctx_80177A48[0] = 1.0f; + D_ctx_80177A48[2] = 0.0f; + D_ctx_80177A48[4] = 0.0f; case 1: if (gCsFrameCount < 30) { break; } - if ((gCsFrameCount >= 40) && (D_80178340 != 0)) { - D_80178358 = 0; - D_8017835C = 8; + if ((gCsFrameCount >= 40) && (D_ctx_80178340 != 0)) { + D_ctx_80178358 = 0; + D_ctx_8017835C = 8; } if (gCsFrameCount < 140) { - Math_SmoothStepToF(&D_80177A48[1], 800.0f, 0.2f, 10.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[1], 800.0f, 0.2f, 10.0f, 0.0f); if (gCsFrameCount > 60) { - Math_SmoothStepToF(&D_80177A48[4], 3.0f, 0.05f, 1000.0f, 0.001f); + Math_SmoothStepToF(&D_ctx_80177A48[4], 3.0f, 0.05f, 1000.0f, 0.001f); } - player->unk_034 += D_80177A48[4]; + player->unk_034 += D_ctx_80177A48[4]; if (player->unk_034 >= 360.0f) { player->unk_034 -= 360.0f; } @@ -6042,14 +6039,14 @@ void func_80096A74(Player* player) { if (gCsFrameCount >= 140) { Math_SmoothStepToAngle(&player->unk_034, 0.0f, 0.05f, 3.0f, 0.001f); - Math_SmoothStepToF(&D_80177A48[1], 200.0f, 0.2f, 6.0f, 0.0f); - Math_SmoothStepToF(&D_80177A48[2], 200.0f, 0.2f, 6.0f, 0.0f); - D_80177A48[0] = 0.2f; + Math_SmoothStepToF(&D_ctx_80177A48[1], 200.0f, 0.2f, 6.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[2], 200.0f, 0.2f, 6.0f, 0.0f); + D_ctx_80177A48[0] = 0.2f; } gCsCamEyeX = player->pos.x; - gCsCamEyeY = player->pos.y + D_80177A48[1]; - gCsCamEyeZ = player->pos.z + D_80177A48[2]; + gCsCamEyeY = player->pos.y + D_ctx_80177A48[1]; + gCsCamEyeZ = player->pos.z + D_ctx_80177A48[2]; gCsCamAtX = player->pos.x; gCsCamAtY = player->pos.y; @@ -6058,17 +6055,17 @@ void func_80096A74(Player* player) { if (gCsFrameCount == 270) { player->unk_190 = player->unk_194 = 10.0f; player->unk_1D0 = 2; - D_80177A48[1] = 400.0f; + D_ctx_80177A48[1] = 400.0f; AUDIO_PLAY_SFX(0x09004002U, player->sfxSource, 0U); } break; case 2: - D_80177A48[0] = 0.12f; + D_ctx_80177A48[0] = 0.12f; Math_SmoothStepToAngle(&player->unk_034, 0.0f, 0.05f, 3.0f, 0.001f); - Math_SmoothStepToF(&D_80177A48[1], (player->pos.y * player->unk_148 + 50.0f), 0.2f, 10.0f, 0.0f); - Math_SmoothStepToF(&D_80177A48[2], 400.0f, 0.2f, 6.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[1], (player->pos.y * player->unk_148 + 50.0f), 0.2f, 10.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[2], 400.0f, 0.2f, 6.0f, 0.0f); Math_SmoothStepToF(&player->pos.y, 350.0f, 0.1f, 40.0f, 0.0f); button = gControllerHold[player->num].button; @@ -6076,30 +6073,30 @@ void func_80096A74(Player* player) { player->unk_2BC = 1; player->timer_1F8 = 60; - func_800B2574(player); + func_play_800B2574(player); D_80137E84[0] = 0; gControllerHold[player->num].button = button; gCsCamEyeX = player->pos.x; gCsCamEyeY = (player->pos.y * player->unk_148 + 50.0f); - gCsCamEyeZ = D_80177A48[2]; + gCsCamEyeZ = D_ctx_80177A48[2]; gCsCamAtX = player->pos.x; gCsCamAtY = (player->pos.y * player->unk_148 + 20.0f); gCsCamAtZ = player->pos.z; if (gCsFrameCount == 300) { - D_80177CE8 = 0; - D_80177838 = 50; + D_ctx_80177CE8 = 0; + D_ctx_80177838 = 50; player->state_1C8 = PLAYERSTATE_1C8_3; - player->unk_0D0 = D_80161A54; + player->unk_0D0 = D_play_80161A54; player->unk_1D0 = 0; player->timer_1F8 = 0; player->unk_014 = 0.0f; player->unk_018 = 0.0f; player->unk_034 = 0.0f; - D_80178488 = 1; + D_ctx_80178488 = 1; } break; } @@ -6108,7 +6105,7 @@ void func_80096A74(Player* player) { Math_SmoothStepToF(&player->unk_0D0, 30.0f, 0.05f, 1000.0f, 0.001f); if (gCsFrameCount < 110) { - player->unk_0EC += (D_80177A48[4] * 2.0f); + player->unk_0EC += (D_ctx_80177A48[4] * 2.0f); if (player->unk_0EC >= 360.0f) { player->unk_0EC -= 360.0f; } @@ -6116,7 +6113,7 @@ void func_80096A74(Player* player) { player->unk_0EC += 360.0f; } } else { - Math_SmoothStepToAngle(&player->unk_0EC, 0.0f, 0.4f, (D_80177A48[4] * 2.0f), 1.0f); + Math_SmoothStepToAngle(&player->unk_0EC, 0.0f, 0.4f, (D_ctx_80177A48[4] * 2.0f), 1.0f); if (player->unk_0EC == 0.0f) { if (player->unk_0E4 != 0.0f) { Math_SmoothStepToAngle(&player->unk_0E4, 0.0f, 0.1f, 2.4f, 0.001f); @@ -6144,15 +6141,15 @@ void func_80096A74(Player* player) { player->pos.x += player->vel.x; player->pos.y += player->vel.y; - D_80177CE8 += player->vel.z; + D_ctx_80177CE8 += player->vel.z; player->unk_0F8 = player->unk_0EC + player->unk_12C + player->unk_130; } - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_ctx_80177A48[0], 50000.0f, 0.0f); } diff --git a/src/main/fox_load.c b/src/main/fox_load.c index e58dbb5a..556a6c50 100644 --- a/src/main/fox_load.c +++ b/src/main/fox_load.c @@ -36,7 +36,7 @@ void Overlay_LoadSegment(void* vRomAddress, void* dest, ptrdiff_t size) { } else { Lib_FillScreen(true); sFillTimer = 3; - D_80161A39 = true; + D_game_80161A39 = true; Lib_DmaRead(gDmaTable[i].pRom.start, gFrameBuffers, SEGMENT_SIZE(gDmaTable[i].pRom)); Mio0_Decompress(gFrameBuffers, dest); } diff --git a/src/main/fox_play.c b/src/main/fox_play.c index 5693b75c..ec20f51f 100644 --- a/src/main/fox_play.c +++ b/src/main/fox_play.c @@ -27,7 +27,7 @@ f32 D_800D2F58 = 0.0f; f32 D_800D2F5C = 0.0f; f32 D_800D2F60 = 0.0f; f32 D_800D2F64 = 0.0f; -u8 D_800D2F68 = false; +u8 D_play_800D2F68 = false; u8 D_800D2F6C[20] = { PLANET_CORNERIA, PLANET_METEO, PLANET_SECTOR_X, PLANET_AREA_6, PLANET_AREA_6, PLANET_SECTOR_Y, SAVE_SLOT_VENOM_1, SAVE_SLOT_SOLAR, PLANET_ZONESS, SAVE_SLOT_VENOM_1, @@ -35,18 +35,15 @@ u8 D_800D2F6C[20] = { PLANET_METEO, PLANET_KATINA, PLANET_BOLSE, PLANET_SECTOR_Z, SAVE_SLOT_VENOM_2, }; -u8 D_80161A50; -f32 D_80161A54; -s32 D_80161A58; -s32 D_80161A5C; -u16 D_Timer_80161A60; -u16 D_80161A62; -s32 D_80161A64; +u8 D_play_80161A50; +f32 D_play_80161A54; +s32 D_play_80161A58; +s32 D_play_80161A5C; +u16 D_play_Timer_80161A60; +u16 D_play_80161A62; +s32 D_play_80161A64; EnvSettings* sEnvSettings; -extern f32 D_i3_801C4188; -extern s32 D_i4_801A03DC; - #define MEM_ARRAY_ALLOCATE(arr, count) ((arr) = Memory_Allocate((count) * sizeof(*(arr)))) bool Play_CheckMedalStatus(u16 hitCount) { @@ -57,7 +54,7 @@ bool Play_CheckMedalStatus(u16 hitCount) { } } -void func_800A3FB0(void) { +void func_play_800A3FB0(void) { D_800D2F64 = 0.0f; } @@ -68,7 +65,7 @@ s32 Play_GetMaxShields(void) { return 255; } -void func_800A3FEC(void) { +void func_play_800A3FEC(void) { Vec3f spC4; Vec3f spB8; Vtx* spB4; @@ -85,7 +82,7 @@ void func_800A3FEC(void) { f32 sp88; f32 sp84; - D_801782FC++; + D_ctx_801782FC++; switch (gCurrentLevel) { case LEVEL_SOLAR: if (gGameFrameCount & 1) { @@ -114,15 +111,15 @@ void func_800A3FEC(void) { sp84 = 2.0f; break; } - var_s3 = D_801782CC; - var_s5 = D_801782D4; - var_s4 = D_801782DC; - var_s0 = D_801782E4; - var_s1 = D_801782EC; + var_s3 = D_ctx_801782CC; + var_s5 = D_ctx_801782D4; + var_s4 = D_ctx_801782DC; + var_s0 = D_ctx_801782E4; + var_s1 = D_ctx_801782EC; for (i = 0; i < 17 * 17; i++, var_s3++, var_s5++, var_s4++, var_s0++, var_s1++, spB0++) { Math_SmoothStepToF(var_s3, *var_s5, sp8C, *var_s4, 0.0f); Math_SmoothStepToF(var_s4, 100.0f, 1.0f, sp84, 0.0f); - if ((D_801782FC & spA8) == (i & spA8)) { + if ((D_ctx_801782FC & spA8) == (i & spA8)) { *var_s5 = RAND_FLOAT(sp90); *var_s4 = 0.0f; } @@ -143,14 +140,13 @@ void func_800A3FEC(void) { } } -void func_800A4460(Player* player) { +void func_play_800A4460(Player* player) { if ((gCurrentLevel == LEVEL_VENOM_ANDROSS) && (gBosses[0].obj.status == OBJ_ACTIVE) && (gBosses[0].state == 17)) { player->unk_060 = SIN_DEG(player->unk_0F4 * 0.7f) * 0.5f; player->unk_088 += 13.0f; player->unk_0F4 += 20.0f; player->unk_080 = -SIN_DEG(player->unk_088) * 5.0f; player->unk_0F0 = SIN_DEG(player->unk_0F4) * 10.0f; - return; } else { player->unk_060 = SIN_DEG(player->unk_0F4 * 0.7f) * 0.5f; player->unk_088 += 10.0f; @@ -166,31 +162,31 @@ void func_800A4460(Player* player) { } } -void func_800A46A0(Player* player) { +void func_play_800A46A0(Player* player) { s32 var_v1; f32 sp40; if ((player->unk_238 == 0) || (gLevelMode == LEVELMODE_ALL_RANGE)) { if (player->wings.rightState <= WINGSTATE_BROKEN) { - if (!(gGameFrameCount & 1) && (D_80177D70[player->num] != 0)) { - func_8007D10C(RAND_FLOAT_CENTERED(10.0f) + player->hit1.x, RAND_FLOAT(5.0f) + player->hit1.y, - player->hit1.z, 1.0f); + if (!(gGameFrameCount & 1) && (D_ctx_80177D70[player->num] != 0)) { + func_effect_8007D10C(RAND_FLOAT_CENTERED(10.0f) + player->hit1.x, RAND_FLOAT(5.0f) + player->hit1.y, + player->hit1.z, 1.0f); } if (!(gGameFrameCount & 1) && (Rand_ZeroOne() < 0.5f) && !gVersusMode) { - func_8007C484(RAND_FLOAT_CENTERED(5.0f) + player->hit1.x, RAND_FLOAT(5.0f) + player->hit1.y, - player->hit1.z, player->vel.x, player->vel.y, player->vel.z, RAND_FLOAT(0.02f) + 0.02f, - player->num + 1); + func_effect_8007C484(RAND_FLOAT_CENTERED(5.0f) + player->hit1.x, RAND_FLOAT(5.0f) + player->hit1.y, + player->hit1.z, player->vel.x, player->vel.y, player->vel.z, + RAND_FLOAT(0.02f) + 0.02f, player->num + 1); } } if (player->wings.leftState <= WINGSTATE_BROKEN) { - if (!(gGameFrameCount & 1) && (D_80177D88[player->num] != 0)) { - func_8007D10C(RAND_FLOAT_CENTERED(10.0f) + player->hit2.x, RAND_FLOAT(5.0f) + player->hit2.y, - player->hit2.z, 1.0f); + if (!(gGameFrameCount & 1) && (D_ctx_80177D88[player->num] != 0)) { + func_effect_8007D10C(RAND_FLOAT_CENTERED(10.0f) + player->hit2.x, RAND_FLOAT(5.0f) + player->hit2.y, + player->hit2.z, 1.0f); } if (!(gGameFrameCount & 1) && (Rand_ZeroOne() < 0.5f) && !gVersusMode) { - func_8007C484(RAND_FLOAT_CENTERED(5.0f) + player->hit2.x, RAND_FLOAT(5.0f) + player->hit2.y, - player->hit2.z, player->vel.x, player->vel.y, player->vel.z, RAND_FLOAT(0.02f) + 0.02f, - player->num + 1); + func_effect_8007C484(RAND_FLOAT_CENTERED(5.0f) + player->hit2.x, RAND_FLOAT(5.0f) + player->hit2.y, + player->hit2.z, player->vel.x, player->vel.y, player->vel.z, + RAND_FLOAT(0.02f) + 0.02f, player->num + 1); } } } @@ -211,13 +207,15 @@ void func_800A46A0(Player* player) { sp40 = 30.0f; } if (!(gGameFrameCount & var_v1)) { - func_8007D10C(player->pos.x + RAND_FLOAT_CENTERED(10.0f), player->pos.y + sp40 + RAND_FLOAT(10.0f), - player->unk_138 + RAND_FLOAT_CENTERED(10.0f), 2.2f); + func_effect_8007D10C(player->pos.x + RAND_FLOAT_CENTERED(10.0f), + player->pos.y + sp40 + RAND_FLOAT(10.0f), + player->unk_138 + RAND_FLOAT_CENTERED(10.0f), 2.2f); } if (!(gGameFrameCount & (var_v1 >> 2)) && (Rand_ZeroOne() < 0.5f)) { - func_8007C484(player->pos.x + RAND_FLOAT_CENTERED(30.0f), player->pos.y + sp40 + RAND_FLOAT(10.0f), - player->unk_138 + RAND_FLOAT_CENTERED(30.0f), player->vel.x, player->vel.y, player->vel.z, - 0.04f + RAND_FLOAT(0.03f), player->num + 1); + func_effect_8007C484(player->pos.x + RAND_FLOAT_CENTERED(30.0f), + player->pos.y + sp40 + RAND_FLOAT(10.0f), + player->unk_138 + RAND_FLOAT_CENTERED(30.0f), player->vel.x, player->vel.y, + player->vel.z, 0.04f + RAND_FLOAT(0.03f), player->num + 1); if (player->timer_224 == 0) { player->timer_224 = 2; } @@ -228,7 +226,7 @@ void func_800A46A0(Player* player) { } } -void func_800A4C40(Player* player) { +void func_play_800A4C40(Player* player) { Vec3f sp54 = { -65.0f, -22.0f, -65.0f }; Vec3f sp48 = { 65.0f, -22.0f, -65.0f }; Vec3f sp3C; @@ -243,20 +241,22 @@ void func_800A4C40(Player* player) { Matrix_MultVec3f(gCalcMatrix, &sp48, &sp30); if (player->pos.y < (gGroundLevel + 100.0f)) { if ((sp3C.y < gGroundLevel + 80.0f) && !(gGameFrameCount & 1)) { - if (D_80161A64) {} - func_8007ACE0(sp3C.x, gGroundLevel, sp3C.z, 0.1f, 2.0f, player->unk_0E8 + player->unk_114 + 20.0f); + if (D_play_80161A64) {} + func_effect_8007ACE0(sp3C.x, gGroundLevel, sp3C.z, 0.1f, 2.0f, + player->unk_0E8 + player->unk_114 + 20.0f); } if ((sp30.y < gGroundLevel + 80.0f) && !(gGameFrameCount & 1)) { - func_8007ACE0(sp30.x, gGroundLevel, sp30.z, 0.1f, 2.0f, player->unk_0E8 + player->unk_114 - 20.0f); + func_effect_8007ACE0(sp30.x, gGroundLevel, sp30.z, 0.1f, 2.0f, + player->unk_0E8 + player->unk_114 - 20.0f); } } if ((sp30.y < gGroundLevel + 80.0f) || (sp3C.y < gGroundLevel + 80.0f)) { - if (D_80161A64 == 0) { - D_80161A64 = 1; + if (D_play_80161A64 == 0) { + D_play_80161A64 = 1; AUDIO_PLAY_SFX(0x1100000B, player->sfxSource, 0); } } else { - D_80161A64 = 0; + D_play_80161A64 = 0; Audio_KillSfxBySourceAndId(player->sfxSource, 0x1100000B); } } @@ -271,7 +271,7 @@ void Object_58_Initialize(Object_58* obj58) { } } -void func_800A4F7C(void) { +void func_play_800A4F7C(void) { s16 temp_v0; s16 temp_v0_2; s32 var_s1; @@ -282,75 +282,75 @@ void func_800A4F7C(void) { switch (gVersusStage) { case VS_STAGE_CORNERIA: - D_80178310 = SEGMENTED_TO_VIRTUAL(D_versus_302DE3C); + D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_versus_302DE3C); break; case VS_STAGE_KATINA: - D_80178310 = SEGMENTED_TO_VIRTUAL(D_versus_302E0E4); + D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_versus_302E0E4); break; case VS_STAGE_SECTOR_Z: - if (D_801778AC == 2) { - D_80178310 = SEGMENTED_TO_VIRTUAL(D_versus_302E378); + if (D_ctx_801778AC == 2) { + D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_versus_302E378); } else { - D_80178310 = SEGMENTED_TO_VIRTUAL(D_versus_302E170); + D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_versus_302E170); } break; } for (i = 0, j = 0; i < 199; j++) { - if (D_80178310[j].id <= OBJ_INVALID) { + if (D_ctx_80178310[j].id <= OBJ_INVALID) { break; } - if (D_80178310[j].id == OBJ_80_147) { + if (D_ctx_80178310[j].id == OBJ_80_147) { Object_58_Initialize(&gObjects58[i]); gObjects58[i].obj.status = OBJ_ACTIVE; - gObjects58[i].obj.id = D_80178310[j].id; - gObjects58[i].obj.pos.x = D_80178310[j].xPos; - gObjects58[i].obj.pos.z = D_80178310[j].zPos1; - gObjects58[i].obj.pos.y = D_80178310[j].yPos; + gObjects58[i].obj.id = D_ctx_80178310[j].id; + gObjects58[i].obj.pos.x = D_ctx_80178310[j].xPos; + gObjects58[i].obj.pos.z = D_ctx_80178310[j].zPos1; + gObjects58[i].obj.pos.y = D_ctx_80178310[j].yPos; Object_SetInfo(&gObjects58[i].info, gObjects58[i].obj.id); i++; } } for (i = 5, j = 0; i < 199; j++) { - if (D_80178310[j].id <= OBJ_INVALID) { + if (D_ctx_80178310[j].id <= OBJ_INVALID) { break; } - if (D_80178310[j].id != OBJ_80_147) { + if (D_ctx_80178310[j].id != OBJ_80_147) { Object_58_Initialize(&gObjects58[i]); gObjects58[i].obj.status = OBJ_ACTIVE; - gObjects58[i].obj.id = D_80178310[j].id; - gObjects58[i].obj.pos.x = D_80178310[j].xPos; - gObjects58[i].obj.pos.z = D_80178310[j].zPos1; - gObjects58[i].obj.pos.y = D_80178310[j].yPos; - gObjects58[i].obj.rot.y = D_80178310[j].rot.y; + gObjects58[i].obj.id = D_ctx_80178310[j].id; + gObjects58[i].obj.pos.x = D_ctx_80178310[j].xPos; + gObjects58[i].obj.pos.z = D_ctx_80178310[j].zPos1; + gObjects58[i].obj.pos.y = D_ctx_80178310[j].yPos; + gObjects58[i].obj.rot.y = D_ctx_80178310[j].rot.y; Object_SetInfo(&gObjects58[i].info, gObjects58[i].obj.id); i++; } } } -void func_800A5330(void) { +void func_play_800A5330(void) { } -void func_800A5338(void) { +void func_play_800A5338(void) { Object_4C* obj4C; Object_58* obj58; s32 i; s32 j; - D_80178310 = SEGMENTED_TO_VIRTUAL(D_CO_603B074); + D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_CO_603B074); for (j = 0, obj58 = gObjects58; j < 200; j++) { - if (D_80178310[j].id <= OBJ_INVALID) { + if (D_ctx_80178310[j].id <= OBJ_INVALID) { break; } - if (D_80178310[j].id < OBJ_4C_161) { + if (D_ctx_80178310[j].id < OBJ_4C_161) { Object_58_Initialize(obj58); obj58->obj.status = OBJ_ACTIVE; - obj58->obj.id = D_80178310[j].id; - obj58->obj.pos.x = D_80178310[j].xPos; - obj58->obj.pos.z = D_80178310[j].zPos1; - obj58->obj.pos.y = D_80178310[j].yPos; - obj58->obj.rot.y = D_80178310[j].rot.y; + obj58->obj.id = D_ctx_80178310[j].id; + obj58->obj.pos.x = D_ctx_80178310[j].xPos; + obj58->obj.pos.z = D_ctx_80178310[j].zPos1; + obj58->obj.pos.y = D_ctx_80178310[j].yPos; + obj58->obj.rot.y = D_ctx_80178310[j].rot.y; Object_SetInfo(&obj58->info, obj58->obj.id); if (obj58->obj.id == OBJ_80_1) { obj58->info.dList = D_CO_6020760; @@ -360,16 +360,16 @@ void func_800A5338(void) { } for (j = 0, obj4C = gObjects4C; j < ARRAY_COUNT(gObjects4C); j++) { - if (D_80178310[j].id <= OBJ_INVALID) { + if (D_ctx_80178310[j].id <= OBJ_INVALID) { break; } - if (D_80178310[j].id == OBJ_4C_162) { + if (D_ctx_80178310[j].id == OBJ_4C_162) { Object_4C_Initialize(obj4C); obj4C->obj.status = OBJ_INIT; - obj4C->obj.id = D_80178310[j].id; - obj4C->obj.pos.x = D_80178310[j].xPos; - obj4C->obj.pos.z = D_80178310[j].zPos1; - obj4C->obj.pos.y = D_80178310[j].yPos; + obj4C->obj.id = D_ctx_80178310[j].id; + obj4C->obj.pos.x = D_ctx_80178310[j].xPos; + obj4C->obj.pos.z = D_ctx_80178310[j].zPos1; + obj4C->obj.pos.y = D_ctx_80178310[j].yPos; Object_SetInfo(&obj4C->info, obj4C->obj.id); obj4C++; } @@ -384,25 +384,25 @@ void func_800A5338(void) { Object_SetInfo(&gBosses[i].info, gBosses[i].obj.id); } -void func_800A55B0(void) { +void func_play_800A55B0(void) { Object_58* obj58; s32 i; s32 j; - D_80178310 = SEGMENTED_TO_VIRTUAL(D_SY_6030B14); + D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_SY_6030B14); for (j = 0, obj58 = gObjects58; j < 200; j++) { - if (D_80178310[j].id <= OBJ_INVALID) { + if (D_ctx_80178310[j].id <= OBJ_INVALID) { break; } - if (D_80178310[j].id < OBJ_4C_161) { + if (D_ctx_80178310[j].id < OBJ_4C_161) { Object_58_Initialize(obj58); obj58->obj.status = OBJ_ACTIVE; - obj58->obj.id = D_80178310[j].id; - obj58->obj.pos.x = D_80178310[j].xPos; - obj58->obj.pos.z = D_80178310[j].zPos1; - obj58->obj.pos.y = D_80178310[j].yPos; - obj58->obj.rot.y = D_80178310[j].rot.y; + obj58->obj.id = D_ctx_80178310[j].id; + obj58->obj.pos.x = D_ctx_80178310[j].xPos; + obj58->obj.pos.z = D_ctx_80178310[j].zPos1; + obj58->obj.pos.y = D_ctx_80178310[j].yPos; + obj58->obj.rot.y = D_ctx_80178310[j].rot.y; Object_SetInfo(&obj58->info, obj58->obj.id); obj58++; } @@ -433,7 +433,7 @@ void func_800A55B0(void) { Object_SetInfo(&gBosses[i].info, gBosses[i].obj.id); } -void func_800A57E0(void) { +void func_play_800A57E0(void) { s32 i = 0; // fake? Boss_Initialize(&gBosses[i]); @@ -445,19 +445,19 @@ void func_800A57E0(void) { Object_SetInfo(&gBosses[i].info, gBosses[i].obj.id); } -void func_800A5844(void) { +void func_play_800A5844(void) { s32 i; - D_80178410 = 0; - D_8017827C = 0; - D_80161684 = 0; - D_80161A50 = 0; + D_ctx_80178410 = 0; + D_ctx_8017827C = 0; + D_enmy_80161684 = 0; + D_play_80161A50 = 0; gOverlayStage = 0; - D_8015F924 = D_80177CA0 = 0; - D_80177CB0 = 0.0f; - gSavedHitCount = gCsFrameCount = D_80177838 = D_80177840 = gRadioState = 0; - D_8017782C = 1; - if (((gCurrentLevel == LEVEL_VENOM_2) && (D_80161A2E == 2)) || (gCurrentLevel == LEVEL_VENOM_ANDROSS)) { + D_360_8015F924 = D_ctx_80177CA0 = 0; + D_ctx_80177CB0 = 0.0f; + gSavedHitCount = gCsFrameCount = D_ctx_80177838 = D_ctx_80177840 = gRadioState = 0; + D_ctx_8017782C = 1; + if (((gCurrentLevel == LEVEL_VENOM_2) && (D_game_80161A2E == 2)) || (gCurrentLevel == LEVEL_VENOM_ANDROSS)) { return; } for (i = 1; i < 4; i++) { @@ -477,7 +477,7 @@ EnvSettings* D_800D2F98[21] = { &D_FO_600EA90, NULL, &D_KA_6011000, &D_BO_600FF30, &D_SZ_6006E70, &D_VE2_6014D50, &D_versus_302DD70, }; -void func_800A594C(void) { +void func_play_800A594C(void) { if (gVersusMode) { switch (gVersusStage) { case 0: @@ -493,7 +493,7 @@ void func_800A594C(void) { } else { sEnvSettings = SEGMENTED_TO_VIRTUAL(D_800D2F98[gCurrentLevel]); } - if (D_8017782C == 0) { + if (D_ctx_8017782C == 0) { if (gCurrentLevel == LEVEL_SOLAR) { func_8001D1C8(0xFF, 1); AUDIO_PLAY_SFX(0x4100C023, gDefaultSfxSource, 4); @@ -502,9 +502,9 @@ void func_800A594C(void) { } else if (gCurrentLevel == LEVEL_AQUAS) { sEnvSettings = SEGMENTED_TO_VIRTUAL(&D_AQ_602E584); } - D_80177C90 = sEnvSettings->seqId; + D_ctx_80177C90 = sEnvSettings->seqId; gLevelType = sEnvSettings->type; - D_801784AC = sEnvSettings->unk_04; + D_ctx_801784AC = sEnvSettings->unk_04; gBgColor = sEnvSettings->bgColor; gFogRed = sEnvSettings->fogR; gFogGreen = sEnvSettings->fogG; @@ -517,59 +517,59 @@ void func_800A594C(void) { gAmbientR = sEnvSettings->ambR; gAmbientG = sEnvSettings->ambG; gAmbientB = sEnvSettings->ambB; - D_801784D0 = D_801784F8 = D_80178520 = D_801784B8 = D_801784C4 = sEnvSettings->unk_20.x; - D_801784D4 = D_801784FC = D_80178524 = D_801784BC = D_801784C8 = sEnvSettings->unk_20.y; - D_801784D8 = D_80178500 = D_80178528 = D_801784C0 = D_801784CC = sEnvSettings->unk_20.z; - D_80161A44 = 12800.0f; - D_80178540 = 40; - D_80178544 = 40; - D_80161A3C = 45.0f; + D_ctx_801784D0 = D_ctx_801784F8 = D_ctx_80178520 = D_ctx_801784B8 = D_ctx_801784C4 = sEnvSettings->unk_20.x; + D_ctx_801784D4 = D_ctx_801784FC = D_ctx_80178524 = D_ctx_801784BC = D_ctx_801784C8 = sEnvSettings->unk_20.y; + D_ctx_801784D8 = D_ctx_80178500 = D_ctx_80178528 = D_ctx_801784C0 = D_ctx_801784CC = sEnvSettings->unk_20.z; + D_game_80161A44 = 12800.0f; + D_ctx_80178540 = 40; + D_ctx_80178544 = 40; + D_game_80161A3C = 45.0f; } -void func_800A5D6C(void) { +void func_play_800A5D6C(void) { u32 i; - MEM_ARRAY_ALLOCATE(D_80178288, 1000); - MEM_ARRAY_ALLOCATE(D_80178290, 1000); - MEM_ARRAY_ALLOCATE(D_80178298, 1000); + MEM_ARRAY_ALLOCATE(D_ctx_80178288, 1000); + MEM_ARRAY_ALLOCATE(D_ctx_80178290, 1000); + MEM_ARRAY_ALLOCATE(D_ctx_80178298, 1000); Rand_SetSeed(1, 29000, 9876); for (i = 0; i < 1000; i++) { - D_80178288[i] = RAND_FLOAT_SEEDED(480.0f) - 80.0f; - D_80178290[i] = RAND_FLOAT_SEEDED(360.0f) - 60.0f; - D_80178298[i] = FILL_COLOR(D_800C9C3C[i % ARRAY_COUNT(D_800C9C3C)]); + D_ctx_80178288[i] = RAND_FLOAT_SEEDED(480.0f) - 80.0f; + D_ctx_80178290[i] = RAND_FLOAT_SEEDED(360.0f) - 60.0f; + D_ctx_80178298[i] = FILL_COLOR(D_bg_800C9C3C[i % ARRAY_COUNT(D_bg_800C9C3C)]); } } -void func_800A5EBC(void) { - func_800A5D6C(); +void func_play_800A5EBC(void) { + func_play_800A5D6C(); gGroundLevel = -25000.0f; - D_80178410 = 600; + D_ctx_80178410 = 600; if (gCurrentLevel == LEVEL_AREA_6) { - D_80178410 = 300; + D_ctx_80178410 = 300; } if (gCurrentLevel == LEVEL_UNK_15) { - D_80178410 = 400; + D_ctx_80178410 = 400; } if (gGameState != GSTATE_PLAY) { - D_80178410 = 800; + D_ctx_80178410 = 800; } if (gCurrentLevel == LEVEL_FORTUNA) { - D_80178410 = 500; + D_ctx_80178410 = 500; } if (gVersusMode) { - D_80178410 = 0; + D_ctx_80178410 = 0; } if (gCurrentLevel == LEVEL_BOLSE) { - D_80178410 = 300; + D_ctx_80178410 = 300; gGroundLevel = -0.0f; } if (gCurrentLevel == LEVEL_TRAINING) { - D_80178410 = 800; + D_ctx_80178410 = 800; gGroundLevel = -0.0f; } } -void func_800A5FA0(f32* sfxSrc, u32 sfxId, s32 mode) { +void func_play_800A5FA0(f32* sfxSrc, u32 sfxId, s32 mode) { if (!gVersusMode) { AUDIO_PLAY_SFX(sfxId, sfxSrc, 0); } else { @@ -577,11 +577,11 @@ void func_800A5FA0(f32* sfxSrc, u32 sfxId, s32 mode) { } } -void func_800A6028(f32* sfxSrc, u32 sfxId) { +void func_play_800A6028(f32* sfxSrc, u32 sfxId) { AUDIO_PLAY_SFX(sfxId, sfxSrc, 0); } -void func_800A6070(f32* sfxSrc, u32 sfxId) { +void func_play_800A6070(f32* sfxSrc, u32 sfxId) { AUDIO_PLAY_SFX(sfxId, sfxSrc, 4); } @@ -612,7 +612,7 @@ void RadarMark_Initialize(RadarMark* radarMark) { } } -void func_800A6148(void) { +void func_play_800A6148(void) { s16 i; s16 j; @@ -652,50 +652,51 @@ void func_800A6148(void) { Object_Kill(&gPlayerShots[i].obj, gPlayerShots[i].sfxSource); PlayerShot_Initialize(&gPlayerShots[i]); } - D_801782B8 = D_801782BC = D_801782C0 = D_801782D0 = gBossActive = D_8017828C = D_8017812C = D_80177E70 = - D_80177E78 = D_80177E80 = 0; - D_80177F10.x = D_80177F10.y = D_80177F10.z = D_80177E88.x = D_80177E88.y = D_80177E88.z = 0.0f; - for (i = 0; i < ARRAY_COUNT(D_80177E98); i++) { - D_80177E98[i].x = D_80177E98[i].y = D_80177E98[i].z = 100.0f; + D_ctx_801782B8 = D_ctx_801782BC = D_ctx_801782C0 = D_ctx_801782D0 = gBossActive = D_ctx_8017828C = D_ctx_8017812C = + D_ctx_80177E70 = D_ctx_80177E78 = D_ctx_80177E80 = 0; + D_ctx_80177F10.x = D_ctx_80177F10.y = D_ctx_80177F10.z = D_ctx_80177E88.x = D_ctx_80177E88.y = D_ctx_80177E88.z = + 0.0f; + for (i = 0; i < ARRAY_COUNT(D_ctx_80177E98); i++) { + D_ctx_80177E98[i].x = D_ctx_80177E98[i].y = D_ctx_80177E98[i].z = 100.0f; } - for (i = 0; i < ARRAY_COUNT(D_80176878); i++) { - D_80176550[i] = 0; - for (j = 0; j < ARRAY_COUNT(*D_80176878); j++) { - D_80176878[i][j] = -5000.0f; + for (i = 0; i < ARRAY_COUNT(D_ctx_80176878); i++) { + D_ctx_80176550[i] = 0; + for (j = 0; j < ARRAY_COUNT(*D_ctx_80176878); j++) { + D_ctx_80176878[i][j] = -5000.0f; } } } -void func_800A6590(void) { - if (D_80178340 != D_80178358) { - if (D_80178340 < D_80178358) { - D_80178340 += D_8017835C; - if (D_80178340 >= D_80178358) { - D_80178340 = D_80178358; +void func_play_800A6590(void) { + if (D_ctx_80178340 != D_ctx_80178358) { + if (D_ctx_80178340 < D_ctx_80178358) { + D_ctx_80178340 += D_ctx_8017835C; + if (D_ctx_80178340 >= D_ctx_80178358) { + D_ctx_80178340 = D_ctx_80178358; } } else { - D_80178340 -= D_8017835C; - if (D_80178358 >= D_80178340) { - D_80178340 = D_80178358; + D_ctx_80178340 -= D_ctx_8017835C; + if (D_ctx_80178358 >= D_ctx_80178340) { + D_ctx_80178340 = D_ctx_80178358; } } } - D_8017835C = 16; - Math_SmoothStepToF(&D_8017836C, 0.0f, 1.0f, 0.04f, 0.001f); - if (D_Timer_80161A60 != 0) { - D_Timer_80161A60--; - if (D_Timer_80161A60 & 2) { - D_80178348 = 255; - D_80178350 = 255; - D_80178354 = 255; - D_80178340 = 254; + D_ctx_8017835C = 16; + Math_SmoothStepToF(&D_ctx_8017836C, 0.0f, 1.0f, 0.04f, 0.001f); + if (D_play_Timer_80161A60 != 0) { + D_play_Timer_80161A60--; + if (D_play_Timer_80161A60 & 2) { + D_ctx_80178348 = 255; + D_ctx_80178350 = 255; + D_ctx_80178354 = 255; + D_ctx_80178340 = 254; } else { - D_80178340 = 0; + D_ctx_80178340 = 0; } } } -void func_800A668C(f32 xPos, f32 yPos, f32 zPos) { +void func_play_800A668C(f32 xPos, f32 yPos, f32 zPos) { s32 i; for (i = 0; i < ARRAY_COUNT(gPlayerShots); i++) { @@ -711,7 +712,7 @@ void func_800A668C(f32 xPos, f32 yPos, f32 zPos) { } } -void func_800A670C(Actor* actor, s32 state, f32 xPos, f32 yPos, f32 zPos) { +void func_play_800A670C(Actor* actor, s32 state, f32 xPos, f32 yPos, f32 zPos) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; actor->obj.id = OBJ_ACTOR_189; @@ -755,13 +756,13 @@ void func_800A670C(Actor* actor, s32 state, f32 xPos, f32 yPos, f32 zPos) { Object_SetInfo(&actor->info, actor->obj.id); } -void func_800A69F8(s32 state, f32 xPos, f32 yPos, f32 zPos) { +void func_play_800A69F8(s32 state, f32 xPos, f32 yPos, f32 zPos) { s32 i; if (!gVersusMode) { for (i = ARRAY_COUNT(gActors) - 1; i >= 10; i--) { if (gActors[i].obj.status == OBJ_FREE) { - func_800A670C(&gActors[i], state, xPos, yPos, zPos); + func_play_800A670C(&gActors[i], state, xPos, yPos, zPos); break; } } @@ -769,39 +770,39 @@ void func_800A69F8(s32 state, f32 xPos, f32 yPos, f32 zPos) { } // has to be int. s32 and u32 don't match -int func_800A6A74(void) { +int func_play_800A6A74(void) { return gGoldRingCount[0] && gGoldRingCount[1] && gGoldRingCount[2] && gGoldRingCount[3]; } void Player_DamageWings(Player* player, s32 side, s32 damage) { - if ((player->form == FORM_ARWING) && (D_80177AB8[player->num] < 1.0f)) { + if ((player->form == FORM_ARWING) && (D_ctx_80177AB8[player->num] < 1.0f)) { if (side == 1) { - D_80177D40[player->num] = 30; + D_ctx_80177D40[player->num] = 30; if (player->wings.rightState == WINGSTATE_INTACT) { gRightWingHealth[player->num] -= damage; if (gRightWingHealth[player->num] <= 0) { - func_800A69F8(1, player->hit1.x, player->hit1.y, player->hit1.z); + func_play_800A69F8(1, player->hit1.x, player->hit1.y, player->hit1.z); player->wings.rightState = WINGSTATE_BROKEN; - func_8007D0E0(player->hit1.x, player->hit1.y, player->hit1.z, 2.0f); - D_80177D70[player->num] = 50; - func_800A5FA0(player->sfxSource, 0x0900A02C, player->num); - if (D_8015F90C == 0) { - D_8015F90C = 1000; + func_effect_8007D0E0(player->hit1.x, player->hit1.y, player->hit1.z, 2.0f); + D_ctx_80177D70[player->num] = 50; + func_play_800A5FA0(player->sfxSource, 0x0900A02C, player->num); + if (D_360_8015F90C == 0) { + D_360_8015F90C = 1000; } } } } else if (side == 2) { - D_80177D58[player->num] = 30; + D_ctx_80177D58[player->num] = 30; if (player->wings.leftState == WINGSTATE_INTACT) { gLeftWingHealth[player->num] -= damage; if (gLeftWingHealth[player->num] <= 0) { - func_800A69F8(0, player->hit2.x, player->hit2.y, player->hit2.z); + func_play_800A69F8(0, player->hit2.x, player->hit2.y, player->hit2.z); player->wings.leftState = WINGSTATE_BROKEN; - func_8007D0E0(player->hit2.x, player->hit2.y, player->hit2.z, 2.0f); - D_80177D88[player->num] = 50; - func_800A5FA0(player->sfxSource, 0x0900A02C, player->num); - if (D_8015F90C == 0) { - D_8015F90C = 1000; + func_effect_8007D0E0(player->hit2.x, player->hit2.y, player->hit2.z, 2.0f); + D_ctx_80177D88[player->num] = 50; + func_play_800A5FA0(player->sfxSource, 0x0900A02C, player->num); + if (D_360_8015F90C == 0) { + D_360_8015F90C = 1000; } } } @@ -839,10 +840,10 @@ void Player_ApplyDamage(Player* player, s32 direction, s32 damage) { } else { player->timer_498 = 20; } - if (D_80177AD0[player->num] != 0) { - func_800A5FA0(player->sfxSource, 0x0903900E, player->num); - D_80177AE8[player->num] = 5; - D_80177AB8[player->num] = 2.0f; + if (D_ctx_80177AD0[player->num] != 0) { + func_play_800A5FA0(player->sfxSource, 0x0903900E, player->num); + D_ctx_80177AE8[player->num] = 5; + D_ctx_80177AB8[player->num] = 2.0f; player->damage = 0; } else { if (player->shields != 0) { @@ -853,9 +854,9 @@ void Player_ApplyDamage(Player* player, s32 direction, s32 damage) { } } if (damage < 25) { - func_800A5FA0(player->sfxSource, 0x0903900E, player->num); + func_play_800A5FA0(player->sfxSource, 0x0903900E, player->num); } else { - func_800A5FA0(player->sfxSource, 0x0903A00F, player->num); + func_play_800A5FA0(player->sfxSource, 0x0903A00F, player->num); } } Matrix_RotateY(gCalcMatrix, player->unk_114 * M_DTOR, 0); @@ -876,7 +877,7 @@ void Player_ApplyDamage(Player* player, s32 direction, s32 damage) { player->unk_0D8.x = sp38.x; player->unk_0D8.y = sp38.y; player->unk_0D8.z = sp38.z; - func_800A668C(player->hit1.x - player->vel.x, player->hit1.y, player->hit1.z - player->vel.z); + func_play_800A668C(player->hit1.x - player->vel.x, player->hit1.y, player->hit1.z - player->vel.z); Player_DamageWings(player, 1, 20); break; case 2: @@ -887,12 +888,12 @@ void Player_ApplyDamage(Player* player, s32 direction, s32 damage) { player->unk_0D8.x = sp38.x; player->unk_0D8.y = sp38.y; player->unk_0D8.z = sp38.z; - func_800A668C(player->hit2.x - player->vel.x, player->hit2.y, player->hit2.z - player->vel.z); + func_play_800A668C(player->hit2.x - player->vel.x, player->hit2.y, player->hit2.z - player->vel.z); Player_DamageWings(player, 2, 20); break; case 3: player->timer_224 = 20; - func_800A668C(player->hit4.x - player->vel.x, player->hit4.y, player->hit4.z - player->vel.z); + func_play_800A668C(player->hit4.x - player->vel.x, player->hit4.y, player->hit4.z - player->vel.z); if (player->form != FORM_LANDMASTER) { sp44.x = 0.0f; sp44.y = -sp34; @@ -909,7 +910,7 @@ void Player_ApplyDamage(Player* player, s32 direction, s32 damage) { break; case 4: player->timer_224 = 20; - func_800A668C(player->hit3.x - player->vel.x, player->hit3.y, player->hit3.z - player->vel.z); + func_play_800A668C(player->hit3.x - player->vel.x, player->hit3.y, player->hit3.z - player->vel.z); sp44.x = 0.0f; sp44.y = sp34; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp44, &sp38); @@ -937,7 +938,7 @@ f32 D_800D2FEC[5] = { 0.0f, 0.5f, -0.5f, 0.5f, -0.5f, }; -void func_800A729C(Player* player, u32 arg1, f32 arg2, f32 arg3) { +void func_play_800A729C(Player* player, u32 arg1, f32 arg2, f32 arg3) { player->unk_21C = arg1; switch (arg1) { case 1: @@ -967,7 +968,7 @@ void func_800A729C(Player* player, u32 arg1, f32 arg2, f32 arg3) { } } -bool func_800A73E4(f32* arg0, s32* arg1, f32 xPos, f32 yPos, f32 zPos) { +bool func_play_800A73E4(f32* arg0, s32* arg1, f32 xPos, f32 yPos, f32 zPos) { Vtx* spA4; u16* spA0; s32 sp9C; @@ -1010,12 +1011,12 @@ bool func_800A73E4(f32* arg0, s32* arg1, f32 xPos, f32 yPos, f32 zPos) { } sp9C = (s32) ((xPos + 2400.0f) / 300.0f); - sp98 = (s32) ((zPos + D_80177D20 + 1500.0f + 2400.0f) / 300.0f); + sp98 = (s32) ((zPos + D_ctx_80177D20 + 1500.0f + 2400.0f) / 300.0f); if ((sp9C < 0) || (sp9C >= 16) || (sp98 < 0) || (sp98 >= 16)) { return false; } sp90 = Math_ModF(xPos + 2400.0f, 300.0f); - sp94 = Math_ModF(zPos + D_80177D20 + 1500.0f + 2400.0f, 300.0f); + sp94 = Math_ModF(zPos + D_ctx_80177D20 + 1500.0f + 2400.0f, 300.0f); sp8C = (sp98 * 17) + sp9C; x0 = spA4[spA0[sp8C]].n.ob[0] * 3.0f; y0 = spA4[spA0[sp8C]].n.ob[1] * 2.0f; @@ -1048,7 +1049,7 @@ bool func_800A73E4(f32* arg0, s32* arg1, f32 xPos, f32 yPos, f32 zPos) { crz = (dx10 * dy21) - (dy10 * dx21); temp1 = -crx * x0 - cry * y0 - crz * z0; - sp48 = (-temp1 - crx * xPos - crz * (zPos + D_80177D20 + 1500.0f)) / cry; + sp48 = (-temp1 - crx * xPos - crz * (zPos + D_ctx_80177D20 + 1500.0f)) / cry; if (yPos < sp48) { *arg0 = sp48; *arg1 = sp8C; @@ -1057,17 +1058,17 @@ bool func_800A73E4(f32* arg0, s32* arg1, f32 xPos, f32 yPos, f32 zPos) { return false; } -bool func_800A78C4(Hitbox* hitbox, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6) { - if ((fabsf(hitbox->z.offset + arg3 - arg6) < (hitbox->z.size + D_8017853C)) && - (fabsf(hitbox->x.offset + arg1 - arg4) < (hitbox->x.size + D_8017853C)) && - (fabsf(hitbox->y.offset + arg2 - arg5) < (hitbox->y.size + D_8017853C))) { +bool func_play_800A78C4(Hitbox* hitbox, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6) { + if ((fabsf(hitbox->z.offset + arg3 - arg6) < (hitbox->z.size + D_ctx_8017853C)) && + (fabsf(hitbox->x.offset + arg1 - arg4) < (hitbox->x.size + D_ctx_8017853C)) && + (fabsf(hitbox->y.offset + arg2 - arg5) < (hitbox->y.size + D_ctx_8017853C))) { return true; } return false; } -s32 func_800A7974(Player* player, f32* hitboxData, s32* index, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, - f32 zRot, f32 arg9, f32 argA, f32 argB) { +s32 func_play_800A7974(Player* player, f32* hitboxData, s32* index, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, + f32 zRot, f32 arg9, f32 argA, f32 argB) { s32 count; s32 i; f32 var_fv0; @@ -1117,7 +1118,7 @@ s32 func_800A7974(Player* player, f32* hitboxData, s32* index, f32 xPos, f32 yPo var_fv1 = sp88.y + yPos; var_fa0 = sp88.z + zPos; } - if (func_800A78C4((Hitbox*) hitboxData, xPos, yPos, zPos, var_fv0, var_fv1, var_fa0)) { + if (func_play_800A78C4((Hitbox*) hitboxData, xPos, yPos, zPos, var_fv0, var_fv1, var_fa0)) { *index = i + 1; if (hitboxData[-1] == HITBOX_TYPE_3) { return -1; @@ -1141,7 +1142,7 @@ s32 func_800A7974(Player* player, f32* hitboxData, s32* index, f32 xPos, f32 yPo var_fv1 = sp88.y + yPos; var_fa0 = sp88.z + zPos; } - if (func_800A78C4((Hitbox*) hitboxData, xPos, yPos, zPos, var_fv0, var_fv1, var_fa0)) { + if (func_play_800A78C4((Hitbox*) hitboxData, xPos, yPos, zPos, var_fv0, var_fv1, var_fa0)) { *index = i + 1; return 4; } @@ -1158,7 +1159,7 @@ s32 func_800A7974(Player* player, f32* hitboxData, s32* index, f32 xPos, f32 yPo var_fv1 = sp88.y + yPos; var_fa0 = sp88.z + zPos; } - if (func_800A78C4((Hitbox*) hitboxData, xPos, yPos, zPos, var_fv0, var_fv1, var_fa0)) { + if (func_play_800A78C4((Hitbox*) hitboxData, xPos, yPos, zPos, var_fv0, var_fv1, var_fa0)) { *index = i + 1; return 1; } @@ -1175,7 +1176,7 @@ s32 func_800A7974(Player* player, f32* hitboxData, s32* index, f32 xPos, f32 yPo var_fv1 = sp88.y + yPos; var_fa0 = sp88.z + zPos; } - if (func_800A78C4((Hitbox*) hitboxData, xPos, yPos, zPos, var_fv0, var_fv1, var_fa0)) { + if (func_play_800A78C4((Hitbox*) hitboxData, xPos, yPos, zPos, var_fv0, var_fv1, var_fa0)) { *index = i + 1; return 2; } @@ -1185,8 +1186,8 @@ s32 func_800A7974(Player* player, f32* hitboxData, s32* index, f32 xPos, f32 yPo return 0; } -bool func_800A8054(ObjectId objId, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, Vec3f* arg7, - Vec3f* arg8) { +bool func_play_800A8054(ObjectId objId, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, Vec3f* arg7, + Vec3f* arg8) { Vec3f sp54; Vec3f sp48; Vec3f sp3C; @@ -1360,11 +1361,11 @@ bool func_800A8054(ObjectId objId, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 a } if (!useCol2) { - if (func_800998FC(&sp54, &sp48, arg8, colId, &sp3C, &sp34) > 0) { + if (func_col1_800998FC(&sp54, &sp48, arg8, colId, &sp3C, &sp34) > 0) { return true; } } else { - if (func_800A3690(&sp54, &sp48, colId, arg7)) { + if (func_col2_800A3690(&sp54, &sp48, colId, arg7)) { return true; } } @@ -1372,7 +1373,7 @@ bool func_800A8054(ObjectId objId, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 a } // arg5 could be Vec3f (not Vec3f*) -s32 func_800A8304(Player* player, ObjectId objId, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7) { +s32 func_play_800A8304(Player* player, ObjectId objId, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7) { Vec3f sp84; Vec3f sp78; Vec3f sp6C; @@ -1392,8 +1393,8 @@ s32 func_800A8304(Player* player, ObjectId objId, f32 arg2, f32 arg3, f32 arg4, sp78.y = player->pos.y - sp84.y; sp78.z = player->unk_138 - sp84.z; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp78, &sp6C); - if (func_800A8054(objId, sp84.x, sp84.y, sp84.z, sp6C.x + sp84.x, sp6C.y + sp84.y, sp6C.z + sp84.z, &sp60, - &sp54)) { + if (func_play_800A8054(objId, sp84.x, sp84.y, sp84.z, sp6C.x + sp84.x, sp6C.y + sp84.y, sp6C.z + sp84.z, &sp60, + &sp54)) { player->pos.y = sp60.y; player->unk_104 = Math_RadToDeg(sp60.x); player->unk_10C = Math_RadToDeg(sp60.z); @@ -1410,34 +1411,38 @@ s32 func_800A8304(Player* player, ObjectId objId, f32 arg2, f32 arg3, f32 arg4, sp78.y = player->hit3.y - sp84.y; sp78.z = player->hit3.z - sp84.z; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp78, &sp6C); - if (func_800A8054(objId, sp84.x, sp84.y, sp84.z, sp6C.x + sp84.x, sp6C.y + sp84.y, sp6C.z + sp84.z, &sp60, &sp54)) { + if (func_play_800A8054(objId, sp84.x, sp84.y, sp84.z, sp6C.x + sp84.x, sp6C.y + sp84.y, sp6C.z + sp84.z, &sp60, + &sp54)) { return 3; } sp78.x = player->hit4.x - sp84.x; sp78.y = player->hit4.y - sp84.y; sp78.z = player->hit4.z - sp84.z; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp78, &sp6C); - if (func_800A8054(objId, sp84.x, sp84.y, sp84.z, sp6C.x + sp84.x, sp6C.y + sp84.y, sp6C.z + sp84.z, &sp60, &sp54)) { + if (func_play_800A8054(objId, sp84.x, sp84.y, sp84.z, sp6C.x + sp84.x, sp6C.y + sp84.y, sp6C.z + sp84.z, &sp60, + &sp54)) { return 4; } sp78.x = player->hit1.x - sp84.x; sp78.y = player->hit1.y - sp84.y; sp78.z = player->hit1.z - sp84.z; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp78, &sp6C); - if (func_800A8054(objId, sp84.x, sp84.y, sp84.z, sp6C.x + sp84.x, sp6C.y + sp84.y, sp6C.z + sp84.z, &sp60, &sp54)) { + if (func_play_800A8054(objId, sp84.x, sp84.y, sp84.z, sp6C.x + sp84.x, sp6C.y + sp84.y, sp6C.z + sp84.z, &sp60, + &sp54)) { return 1; } sp78.x = player->hit2.x - sp84.x; sp78.y = player->hit2.y - sp84.y; sp78.z = player->hit2.z - sp84.z; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp78, &sp6C); - if (func_800A8054(objId, sp84.x, sp84.y, sp84.z, sp6C.x + sp84.x, sp6C.y + sp84.y, sp6C.z + sp84.z, &sp60, &sp54)) { + if (func_play_800A8054(objId, sp84.x, sp84.y, sp84.z, sp6C.x + sp84.x, sp6C.y + sp84.y, sp6C.z + sp84.z, &sp60, + &sp54)) { return 2; } return 0; } -void func_800A86E4(Player* player) { +void func_play_800A86E4(Player* player) { s32 i; Item* item; s32 sp6C; @@ -1446,8 +1451,8 @@ void func_800A86E4(Player* player) { if ((item->obj.status == OBJ_ACTIVE) && ((player->state_1C8 == PLAYERSTATE_1C8_3) || (player->state_1C8 == PLAYERSTATE_1C8_5)) && (item->timer_4A == 0) && - func_800A7974(player, item->info.hitbox, &sp6C, item->obj.pos.x, item->obj.pos.y, item->obj.pos.z, 0.0f, - 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)) { + func_play_800A7974(player, item->info.hitbox, &sp6C, item->obj.pos.x, item->obj.pos.y, item->obj.pos.z, + 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)) { item->collected = true; item->playerNum = gPlayerNum; } @@ -1477,7 +1482,7 @@ Vec3f D_800D30B8[4] = { { 20.0f, 0.0f, 0.0f }, }; -void func_800A8804(Player* playerA, Player* playerB) { +void func_play_800A8804(Player* playerA, Player* playerB) { if (playerA->timer_498 == 0) { Player_ApplyDamage(playerA, 0, D_800D3000[playerA->form][playerB->form]); playerA->unk_288 = playerB->num + 1; @@ -1485,7 +1490,7 @@ void func_800A8804(Player* playerA, Player* playerB) { } } -void func_800A887C(Player* player) { +void func_play_800A887C(Player* player) { Vec3f sp3C; Matrix_Translate(gCalcMatrix, player->pos.x, player->pos.y, player->unk_138, 0); @@ -1552,7 +1557,7 @@ void func_800A887C(Player* player) { } } -void func_800A8BA4(Player* player) { +void func_play_800A8BA4(Player* player) { s32 i; s32 j; s32 temp_v0; @@ -1575,15 +1580,15 @@ void func_800A8BA4(Player* player) { s32 sp90; f32 sp8C; - func_800A887C(player); - if (D_801784AC == 4) { + func_play_800A887C(player); + if (D_ctx_801784AC == 4) { switch (player->form) { case FORM_LANDMASTER: - func_800444BC(player); + func_tank_800444BC(player); break; case FORM_BLUE_MARINE: - if (func_i5_801B6AEC(player->pos.x, player->pos.y - 12.0f, player->unk_138 + player->unk_144)) { - func_i5_801B6E20(player->pos.x, player->unk_138 + player->unk_144, &spE8, &spE0, &spE4); + if (Ground_801B6AEC(player->pos.x, player->pos.y - 12.0f, player->unk_138 + player->unk_144)) { + Ground_801B6E20(player->pos.x, player->unk_138 + player->unk_144, &spE8, &spE0, &spE4); player->pos.y = spE0 + 10.0f; } break; @@ -1597,9 +1602,9 @@ void func_800A8BA4(Player* player) { Player_ApplyDamage(player, 1, 21); } if (gCurrentLevel == LEVEL_FORTUNA) { - func_8007BC7C(player->hit1.x, player->hit1.y, player->hit1.z, 6.0f); - func_8007BC7C(player->hit1.x, player->hit1.y, player->hit1.z, 6.0f); - func_8007BC7C(player->hit1.x, player->hit1.y, player->hit1.z, 6.0f); + func_effect_8007BC7C(player->hit1.x, player->hit1.y, player->hit1.z, 6.0f); + func_effect_8007BC7C(player->hit1.x, player->hit1.y, player->hit1.z, 6.0f); + func_effect_8007BC7C(player->hit1.x, player->hit1.y, player->hit1.z, 6.0f); } } if ((player->hit2.y < (gGroundLevel + 13.0f)) && (player->state_1C8 != PLAYERSTATE_1C8_4)) { @@ -1610,13 +1615,13 @@ void func_800A8BA4(Player* player) { Player_ApplyDamage(player, 2, 21); } if (gCurrentLevel == LEVEL_FORTUNA) { - func_8007BC7C(player->hit2.x, player->hit2.y, player->hit2.z, 6.0f); - func_8007BC7C(player->hit2.x, player->hit2.y, player->hit2.z, 6.0f); - func_8007BC7C(player->hit2.x, player->hit2.y, player->hit2.z, 6.0f); + func_effect_8007BC7C(player->hit2.x, player->hit2.y, player->hit2.z, 6.0f); + func_effect_8007BC7C(player->hit2.x, player->hit2.y, player->hit2.z, 6.0f); + func_effect_8007BC7C(player->hit2.x, player->hit2.y, player->hit2.z, 6.0f); } } } else if ((player->form == FORM_LANDMASTER) && !gVersusMode) { - func_800444BC(player); + func_tank_800444BC(player); } if ((player->timer_498 == 0) || ((gCamCount != 1) && (player->form != FORM_ARWING))) { @@ -1637,23 +1642,23 @@ void func_800A8BA4(Player* player) { (obj58->obj.id == OBJ_80_150) || (obj58->obj.id == OBJ_80_148) || (obj58->obj.id == OBJ_80_160) || (obj58->obj.id == OBJ_80_1) || (obj58->obj.id == OBJ_80_3) || (obj58->obj.id == OBJ_80_140)) { - temp_v0 = - func_800A8304(player, obj58->obj.id, obj58->obj.pos.x, obj58->obj.pos.y, - obj58->obj.pos.z, obj58->obj.rot.x, obj58->obj.rot.y, obj58->obj.rot.z); + temp_v0 = func_play_800A8304(player, obj58->obj.id, obj58->obj.pos.x, obj58->obj.pos.y, + obj58->obj.pos.z, obj58->obj.rot.x, obj58->obj.rot.y, + obj58->obj.rot.z); if (temp_v0 != 0) { if ((player->form == FORM_LANDMASTER) || (player->form == FORM_ON_FOOT)) { - func_800A729C(player, temp_v0, obj58->obj.pos.x, obj58->obj.pos.z); + func_play_800A729C(player, temp_v0, obj58->obj.pos.x, obj58->obj.pos.z); } else { Player_ApplyDamage(player, temp_v0, obj58->info.damage); } } if ((gCurrentLevel == LEVEL_FORTUNA) || (gCurrentLevel == LEVEL_VENOM_2)) { - temp_v0 = func_800A7974(player, obj58->info.hitbox, &sp98, obj58->obj.pos.x, - obj58->obj.pos.y, obj58->obj.pos.z, obj58->obj.rot.x, - obj58->obj.rot.y, obj58->obj.rot.z, 0.0f, 0.0f, 0.0f); + temp_v0 = func_play_800A7974(player, obj58->info.hitbox, &sp98, obj58->obj.pos.x, + obj58->obj.pos.y, obj58->obj.pos.z, obj58->obj.rot.x, + obj58->obj.rot.y, obj58->obj.rot.z, 0.0f, 0.0f, 0.0f); if ((temp_v0 != 0) && (temp_v0 < 0)) { if (player->unk_22C == 0) { - func_8007A6F0(&obj58->obj.pos, 0x19000001); + func_effect_8007A6F0(&obj58->obj.pos, 0x19000001); } player->unk_22C += 2; if (player->unk_22C >= 4) { @@ -1662,20 +1667,20 @@ void func_800A8BA4(Player* player) { } } } else { - temp_v0 = func_800A7974(player, obj58->info.hitbox, &sp98, obj58->obj.pos.x, - obj58->obj.pos.y, obj58->obj.pos.z, obj58->obj.rot.x, - obj58->obj.rot.y, obj58->obj.rot.z, 0.0f, 0.0f, 0.0f); + temp_v0 = func_play_800A7974(player, obj58->info.hitbox, &sp98, obj58->obj.pos.x, + obj58->obj.pos.y, obj58->obj.pos.z, obj58->obj.rot.x, + obj58->obj.rot.y, obj58->obj.rot.z, 0.0f, 0.0f, 0.0f); if (temp_v0 != 0) { if (temp_v0 < 0) { if (player->unk_22C == 0) { - func_8007A6F0(&obj58->obj.pos, 0x19000001); + func_effect_8007A6F0(&obj58->obj.pos, 0x19000001); } player->unk_22C += 2; if (player->unk_22C >= 4) { player->unk_22C = 4; } } else if ((player->form == FORM_LANDMASTER) || (player->form == FORM_ON_FOOT)) { - func_800A729C(player, temp_v0, obj58->obj.pos.x, obj58->obj.pos.z); + func_play_800A729C(player, temp_v0, obj58->obj.pos.x, obj58->obj.pos.z); } else { Player_ApplyDamage(player, temp_v0, obj58->info.damage); if (obj58->obj.id == OBJ_80_131) { @@ -1736,28 +1741,28 @@ void func_800A8BA4(Player* player) { spC8.x = obj80->obj.pos.x - player->pos.x; spC8.z = obj80->obj.pos.z - player->unk_138; if (sqrtf(SQ(spC8.x) + SQ(spC8.z)) < 1100.0f) { - temp_v0 = - func_800A8304(player, obj80->obj.id, obj80->obj.pos.x, obj80->obj.pos.y, - obj80->obj.pos.z, obj80->obj.rot.x, obj80->obj.rot.y, obj80->obj.rot.z); + temp_v0 = func_play_800A8304(player, obj80->obj.id, obj80->obj.pos.x, obj80->obj.pos.y, + obj80->obj.pos.z, obj80->obj.rot.x, obj80->obj.rot.y, + obj80->obj.rot.z); if (temp_v0 != 0) { Player_ApplyDamage(player, temp_v0, obj80->info.damage); } } } else { padB0 = obj80->obj.rot.y; - if (obj80->info.action == (ObjectFunc) func_80066EA8) { + if (obj80->info.action == (ObjectFunc) func_enmy_80066EA8) { padB0 = 0.0f; } - temp_v0 = func_800A7974(player, obj80->info.hitbox, &sp98, obj80->obj.pos.x, obj80->obj.pos.y, - obj80->obj.pos.z, obj80->obj.rot.x, padB0, obj80->obj.rot.z, 0.0f, 0.0f, - 0.0f); + temp_v0 = func_play_800A7974(player, obj80->info.hitbox, &sp98, obj80->obj.pos.x, + obj80->obj.pos.y, obj80->obj.pos.z, obj80->obj.rot.x, padB0, + obj80->obj.rot.z, 0.0f, 0.0f, 0.0f); if (temp_v0 != 0) { if (temp_v0 < 0) { if (temp_v0 == -1) { - D_80178540 = 40; - D_80178570 = 20; - D_80178574 = 20; - D_80178578 = 20; + D_ctx_80178540 = 40; + D_ctx_80178570 = 20; + D_ctx_80178574 = 20; + D_ctx_80178578 = 20; player->unk_23C = 80; } if (player->unk_22C == 0) { @@ -1822,8 +1827,8 @@ void func_800A8BA4(Player* player) { if (boss->obj.status == OBJ_ACTIVE) { if ((boss->obj.id == OBJ_BOSS_312) || (boss->obj.id == OBJ_BOSS_308) || (boss->obj.id == OBJ_BOSS_313) || (boss->obj.id == OBJ_BOSS_309)) { - temp_v0 = func_800A8304(player, boss->obj.id, boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, - boss->obj.rot.x, boss->obj.rot.y, boss->obj.rot.z); + temp_v0 = func_play_800A8304(player, boss->obj.id, boss->obj.pos.x, boss->obj.pos.y, + boss->obj.pos.z, boss->obj.rot.x, boss->obj.rot.y, boss->obj.rot.z); if (temp_v0 != 0) { Player_ApplyDamage(player, temp_v0, boss->info.damage); break; @@ -1839,13 +1844,14 @@ void func_800A8BA4(Player* player) { player->timer_498 = 5; player->unk_0D8.y = 30.0f; boss->dmgType = DMG_BEAM; - func_8007BFFC(player->pos.x + RAND_FLOAT_CENTERED(10.0f), player->pos.y + RAND_FLOAT(10.0f), - player->unk_138 + RAND_FLOAT_CENTERED(10.0f), 0.0f, 15.0f, 0.0f, 2.0f, 5); + func_effect_8007BFFC(player->pos.x + RAND_FLOAT_CENTERED(10.0f), + player->pos.y + RAND_FLOAT(10.0f), + player->unk_138 + RAND_FLOAT_CENTERED(10.0f), 0.0f, 15.0f, 0.0f, 2.0f, 5); for (j = 0; j < 10; j++) { - func_8007C484(player->pos.x + RAND_FLOAT_CENTERED(30.0f), player->pos.y + RAND_FLOAT(10.0f), - player->unk_138 + RAND_FLOAT_CENTERED(30.0f), player->vel.x, - 20.0f + player->vel.y, player->vel.z, RAND_FLOAT(0.1f) + 0.1f, - player->num + 11); + func_effect_8007C484( + player->pos.x + RAND_FLOAT_CENTERED(30.0f), player->pos.y + RAND_FLOAT(10.0f), + player->unk_138 + RAND_FLOAT_CENTERED(30.0f), player->vel.x, 20.0f + player->vel.y, + player->vel.z, RAND_FLOAT(0.1f) + 0.1f, player->num + 11); } break; } @@ -1858,9 +1864,9 @@ void func_800A8BA4(Player* player) { Player_ApplyDamage(player, 3, boss->info.damage); } } - temp_v0 = func_800A7974(player, boss->info.hitbox, &sp98, boss->obj.pos.x, boss->obj.pos.y, - boss->obj.pos.z, boss->obj.rot.x, boss->obj.rot.y, boss->obj.rot.z, 0.0f, - 0.0f, 0.0f); + temp_v0 = func_play_800A7974(player, boss->info.hitbox, &sp98, boss->obj.pos.x, boss->obj.pos.y, + boss->obj.pos.z, boss->obj.rot.x, boss->obj.rot.y, boss->obj.rot.z, + 0.0f, 0.0f, 0.0f); if (temp_v0 != 0) { if (temp_v0 < 0) { if (player->unk_22C == 0) { @@ -1891,15 +1897,17 @@ void func_800A8BA4(Player* player) { for (i = 0, actor = gActors; i < ARRAY_COUNT(gActors); i++, actor++) { if ((actor->obj.status == OBJ_ACTIVE) && (actor->timer_0C2 == 0)) { if (actor->obj.id == OBJ_ACTOR_180) { - temp_v0 = func_800A8304(player, actor->obj.id, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, - actor->obj.rot.x, actor->obj.rot.y, actor->obj.rot.z); + temp_v0 = + func_play_800A8304(player, actor->obj.id, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, + actor->obj.rot.x, actor->obj.rot.y, actor->obj.rot.z); if (temp_v0 != 0) { Player_ApplyDamage(player, temp_v0, actor->info.damage); } } else if (actor->obj.id == OBJ_ACTOR_200) { if (actor->unk_0B4 == 42) { - temp_v0 = func_800A8304(player, OBJ_UNK_1000, actor->obj.pos.x, actor->obj.pos.y, - actor->obj.pos.z, actor->obj.rot.x, actor->obj.rot.y, actor->obj.rot.z); + temp_v0 = + func_play_800A8304(player, OBJ_UNK_1000, actor->obj.pos.x, actor->obj.pos.y, + actor->obj.pos.z, actor->obj.rot.x, actor->obj.rot.y, actor->obj.rot.z); if (temp_v0 != 0) { Player_ApplyDamage(player, temp_v0, actor->info.damage); } @@ -1912,20 +1920,20 @@ void func_800A8BA4(Player* player) { actor->unk_0D0 = 3; } } else { - temp_v0 = func_800A7974(player, actor->info.hitbox, &sp98, actor->obj.pos.x, actor->obj.pos.y, - actor->obj.pos.z, actor->obj.rot.x, actor->obj.rot.y, actor->obj.rot.z, - actor->vwork[29].x, actor->vwork[29].y, - actor->vwork[29].z + actor->unk_0F4.z); + temp_v0 = func_play_800A7974(player, actor->info.hitbox, &sp98, actor->obj.pos.x, + actor->obj.pos.y, actor->obj.pos.z, actor->obj.rot.x, + actor->obj.rot.y, actor->obj.rot.z, actor->vwork[29].x, + actor->vwork[29].y, actor->vwork[29].z + actor->unk_0F4.z); if (temp_v0 != 0) { if ((temp_v0 < 0) && (actor->unk_0B4 == 38)) { actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SX_6032328); - if (D_80177E80 >= 0) { + if (D_ctx_80177E80 >= 0) { actor->unk_046 = 2; - D_80177E80++; - if (D_80177E80 == 3) { + D_ctx_80177E80++; + if (D_ctx_80177E80 == 3) { Radio_PlayMessage(gMsg_ID_5504, RCID_FALCO); } - AUDIO_PLAY_SFX(D_800CFF54[D_80177E80], gPlayer[0].sfxSource, 0); + AUDIO_PLAY_SFX(D_enmy_800CFF54[D_ctx_80177E80], gPlayer[0].sfxSource, 0); AUDIO_PLAY_SFX(0x49008025, gDefaultSfxSource, 4); } } else if (temp_v0 < 0) { @@ -1944,9 +1952,10 @@ void func_800A8BA4(Player* player) { } } } else if ((actor->obj.id >= OBJ_ACTOR_205) && (actor->obj.id < OBJ_ACTOR_214)) { - temp_v0 = func_800A7974(player, actor->info.hitbox, &sp98, actor->fwork[25] + actor->obj.pos.x, - actor->fwork[8] + actor->obj.pos.y + 25.0f, actor->obj.pos.z, - actor->fwork[29], actor->fwork[26], actor->obj.rot.z, 0.0f, 0.0f, 0.0f); + temp_v0 = + func_play_800A7974(player, actor->info.hitbox, &sp98, actor->fwork[25] + actor->obj.pos.x, + actor->fwork[8] + actor->obj.pos.y + 25.0f, actor->obj.pos.z, + actor->fwork[29], actor->fwork[26], actor->obj.rot.z, 0.0f, 0.0f, 0.0f); if (temp_v0 != 0) { actor->unk_0D0 = 3; if (actor->info.damage) { @@ -1956,9 +1965,9 @@ void func_800A8BA4(Player* player) { } } } else { - temp_v0 = func_800A7974(player, actor->info.hitbox, &sp98, actor->obj.pos.x, actor->obj.pos.y, - actor->obj.pos.z, actor->obj.rot.x, actor->obj.rot.y, actor->obj.rot.z, - 0.0f, 0.0f, 0.0f); + temp_v0 = func_play_800A7974(player, actor->info.hitbox, &sp98, actor->obj.pos.x, actor->obj.pos.y, + actor->obj.pos.z, actor->obj.rot.x, actor->obj.rot.y, actor->obj.rot.z, + 0.0f, 0.0f, 0.0f); if (temp_v0 != 0) { if (temp_v0 < 0) { if (player->unk_22C == 0) { @@ -1989,8 +1998,8 @@ void func_800A8BA4(Player* player) { for (i = 0, obj4C = gObjects4C; i < ARRAY_COUNT(gObjects4C); i++, obj4C++) { if (obj4C->obj.status == OBJ_ACTIVE) { if ((player->unk_138 - 200.0f) < obj4C->obj.pos.z) { - temp_v0 = func_800A7974(player, obj4C->info.hitbox, &sp98, obj4C->obj.pos.x, obj4C->obj.pos.y, - obj4C->obj.pos.z, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); + temp_v0 = func_play_800A7974(player, obj4C->info.hitbox, &sp98, obj4C->obj.pos.x, obj4C->obj.pos.y, + obj4C->obj.pos.z, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); if (temp_v0 != 0) { if ((obj4C->obj.id == OBJ_4C_163) || (obj4C->obj.id == OBJ_4C_161) || (obj4C->obj.id == OBJ_4C_169) || (obj4C->obj.id == OBJ_4C_162)) { @@ -2005,7 +2014,7 @@ void func_800A8BA4(Player* player) { } } } - func_800A86E4(player); + func_play_800A86E4(player); if (gCamCount == 4) { for (opponent = &gPlayer[3], i = 3; i >= 0; i--, opponent--) { if ((i != gPlayerNum) && (opponent->state_1C8 == PLAYERSTATE_1C8_3)) { @@ -2043,19 +2052,19 @@ void func_800A8BA4(Player* player) { opponent->unk_0D8.z = -player->unk_0D8.z; opponent->unk_0D0 = player->unk_0D0 = 2.0f; } else { - func_800A8804(player, opponent); - func_800A8804(opponent, player); + func_play_800A8804(player, opponent); + func_play_800A8804(opponent, player); } } } } } - if (D_80178294 != 0) { - if (func_800A73E4(&sp94, &sp90, player->hit4.x, player->hit4.y, player->hit4.z)) { + if (D_ctx_80178294 != 0) { + if (func_play_800A73E4(&sp94, &sp90, player->hit4.x, player->hit4.y, player->hit4.z)) { if (gCurrentLevel == LEVEL_ZONESS) { player->unk_0E4 = (player->unk_0D0 + player->unk_110) * 0.8f; player->unk_1F4 = 15; - func_8007B228(player->hit4.x, sp94, player->hit4.z, 1.0f); + func_effect_8007B228(player->hit4.x, sp94, player->hit4.z, 1.0f); } else { if (player->unk_1F4 == 0) { Player_ApplyDamage(player, 4, 10); @@ -2065,14 +2074,15 @@ void func_800A8BA4(Player* player) { } if (player->state_1C8 == PLAYERSTATE_1C8_4) { player->timer_220 = 2; - func_8007AFD0(player->pos.x, player->unk_138, 30.0f, 0.0f, 5.0f); - func_8007AFD0(player->pos.x, player->unk_138, -30.0f, 0.0f, 5.0f); + func_effect_8007AFD0(player->pos.x, player->unk_138, 30.0f, 0.0f, 5.0f); + func_effect_8007AFD0(player->pos.x, player->unk_138, -30.0f, 0.0f, 5.0f); } } - if (func_800A73E4(&sp94, &sp90, player->pos.x + ((player->hit1.x - player->pos.x) * 1.5f), - player->pos.y + (player->hit1.y - player->pos.y) * 1.5f, player->hit1.z)) { + if (func_play_800A73E4(&sp94, &sp90, player->pos.x + ((player->hit1.x - player->pos.x) * 1.5f), + player->pos.y + (player->hit1.y - player->pos.y) * 1.5f, player->hit1.z)) { if (gCurrentLevel == LEVEL_ZONESS) { - func_8007B228(player->pos.x + (player->hit1.x - player->pos.x) * 1.5f, sp94, player->hit1.z, 1.0f); + func_effect_8007B228(player->pos.x + (player->hit1.x - player->pos.x) * 1.5f, sp94, player->hit1.z, + 1.0f); } else { if (player->unk_1F4 == 0) { Player_ApplyDamage(player, 1, 10); @@ -2080,10 +2090,11 @@ void func_800A8BA4(Player* player) { player->unk_0D8.y = 30.0f; } } - if (func_800A73E4(&sp94, &sp90, player->pos.x + ((player->hit2.x - player->pos.x) * 1.5f), - player->pos.y + (player->hit2.y - player->pos.y) * 1.5f, player->hit2.z)) { + if (func_play_800A73E4(&sp94, &sp90, player->pos.x + ((player->hit2.x - player->pos.x) * 1.5f), + player->pos.y + (player->hit2.y - player->pos.y) * 1.5f, player->hit2.z)) { if (gCurrentLevel == LEVEL_ZONESS) { - func_8007B228(player->pos.x + (player->hit2.x - player->pos.x) * 1.5f, sp94, player->hit2.z, 1.0f); + func_effect_8007B228(player->pos.x + (player->hit2.x - player->pos.x) * 1.5f, sp94, player->hit2.z, + 1.0f); } else { if (player->unk_1F4 == 0) { Player_ApplyDamage(player, 2, 40); @@ -2094,7 +2105,7 @@ void func_800A8BA4(Player* player) { } } -void func_800AA800(Player* player) { +void func_play_800AA800(Player* player) { s32 sp144; Object_58* obj58; Object_80* obj80; @@ -2130,7 +2141,7 @@ void func_800AA800(Player* player) { if (player->unk_240 == 0) { player->unk_064 = player->pos.x; player->unk_06C = player->unk_138 - player->pos.y; - if (D_801784AC != 4) { + if (D_ctx_801784AC != 4) { if (gCamCount == 1) { player->unk_068 = gGroundLevel + 3.0f; } else { @@ -2165,7 +2176,7 @@ void func_800AA800(Player* player) { } else if (obj58->obj.id == OBJ_80_143) { colId = COL2_17; } - if (func_800A3690(&spD4, &spC8, colId, &spBC)) { + if (func_col2_800A3690(&spD4, &spC8, colId, &spBC)) { player->unk_068 = spBC.y + 1.0f; player->unk_248 = spBC.x; player->unk_24C = spBC.z; @@ -2206,7 +2217,7 @@ void func_800AA800(Player* player) { } else { colId = COL1_6; } - if (func_800998FC(&spD4, &spC8, &sp9C, colId, &spB0, spA8) > 0) { + if (func_col1_800998FC(&spD4, &spC8, &sp9C, colId, &spB0, spA8) > 0) { player->unk_068 = spB0.y; player->unk_248 = spA8[0]; player->unk_24C = spA8[1]; @@ -2217,7 +2228,7 @@ void func_800AA800(Player* player) { if (obj58->obj.id == OBJ_80_3) { colId = COL2_3; } - if (func_800A3690(&spD4, &spC8, colId, &spBC)) { + if (func_col2_800A3690(&spD4, &spC8, colId, &spBC)) { player->unk_068 = spBC.y; player->unk_248 = spBC.x; player->unk_24C = spBC.z; @@ -2266,7 +2277,7 @@ void func_800AA800(Player* player) { } else if ((obj80->obj.id == OBJ_80_4) || (obj80->obj.id == OBJ_80_5)) { colId = COL2_1; } - if (func_800A3690(&spD4, &spC8, colId, &spBC)) { + if (func_col2_800A3690(&spD4, &spC8, colId, &spBC)) { player->unk_068 = spBC.y; player->unk_06C = player->unk_138 + var_fs1; player->unk_248 = spBC.x; @@ -2279,7 +2290,7 @@ void func_800AA800(Player* player) { hitboxData = obj80->info.hitbox; count = *hitboxData; if (count != 0) { - if (obj80->info.action == (ObjectFunc) func_80066EA8) { + if (obj80->info.action == (ObjectFunc) func_enmy_80066EA8) { sp120 = 0.0f; } hitboxData++; @@ -2313,7 +2324,7 @@ void func_800AA800(Player* player) { break; } - if (func_800A78C4(hitbox, tempx, tempy, tempz, tempx2, tempy2, tempz2)) { + if (func_play_800A78C4(hitbox, tempx, tempy, tempz, tempx2, tempy2, tempz2)) { if (gGroundLevel < player->unk_068) { player->unk_068 = spEC.y + 15.0f + tempy; player->unk_06C = spEC.z + 10.0f + tempz; @@ -2332,7 +2343,7 @@ void func_800AA800(Player* player) { } } -void func_800AB2AC(void) { +void func_play_800AB2AC(void) { u8* ptr = (u8*) gPlayer; u32 i; @@ -2341,7 +2352,7 @@ void func_800AB2AC(void) { } } -void func_800AB304(Player* player) { +void func_play_800AB304(Player* player) { u8* ptr = (u8*) player; u32 i; @@ -2350,7 +2361,7 @@ void func_800AB304(Player* player) { } } -void func_800AB334(void) { +void func_play_800AB334(void) { Vtx* mesh; u8* ptr; s32 i; @@ -2359,7 +2370,7 @@ void func_800AB334(void) { switch (gCurrentLevel) { case LEVEL_TRAINING: Audio_SetAudioSpec(0, 28); - D_8017796C = -1; + D_ctx_8017796C = -1; break; case LEVEL_VENOM_1: Audio_SetAudioSpec(0, 6); @@ -2370,17 +2381,17 @@ void func_800AB334(void) { case LEVEL_VENOM_ANDROSS: Audio_SetAudioSpec(0, 15); Audio_SetBaseSfxReverb(0); - D_8017796C = -1; + D_ctx_8017796C = -1; break; } - D_80178294 = 0; + D_ctx_80178294 = 0; switch (gCurrentLevel) { case LEVEL_SECTOR_Z: gGreatFoxIntact = true; break; case LEVEL_METEO: case LEVEL_SECTOR_X: - if (D_8017827C == 1) { + if (D_ctx_8017827C == 1) { gFogRed = 178; gFogGreen = 190; gFogBlue = 90; @@ -2393,51 +2404,52 @@ void func_800AB334(void) { } break; case LEVEL_VENOM_ANDROSS: - D_80177A98 = 0; - D_80177AB0 = 6; - D_i6_801A7F58 = D_i6_801A7F60 = D_i6_801A7F68 = D_i6_801A7F70 = D_i6_801A7F78 = 0.0f; + D_ctx_80177A98 = 0; + D_ctx_80177AB0 = 6; + D_Andross_801A7F58 = D_Andross_801A7F60 = D_Andross_801A7F68 = D_Andross_801A7F70 = D_Andross_801A7F78 = + 0.0f; break; case LEVEL_AQUAS: D_80137E78 = 3; - D_8015F970 = 1600.0f; - D_i3_801C4188 = 128.0f; - func_i3_801A9824(); + D_bg_8015F970 = 1600.0f; + D_AQ_801C4188 = 128.0f; + Aquas_801A9824(); break; case LEVEL_TITANIA: - func_i5_80188F30(); + Titania_80188F30(); gTeamShields[2] = -2; break; case LEVEL_MACBETH: - func_i5_80199920(); + Macbeth_80199920(); break; case LEVEL_ZONESS: - MEM_ARRAY_ALLOCATE(D_801782C4, 200); - ptr = (u8*) D_801782C4; - for (i = 0; i < 200 * sizeof(*D_801782C4); i++, ptr++) { + MEM_ARRAY_ALLOCATE(D_ctx_801782C4, 200); + ptr = (u8*) D_ctx_801782C4; + for (i = 0; i < 200 * sizeof(*D_ctx_801782C4); i++, ptr++) { *ptr = 0; } - D_801784A4 = 0; + D_ctx_801784A4 = 0; /* fallthrough */ case LEVEL_SOLAR: - D_80178294 = 1; + D_ctx_80178294 = 1; gGroundLevel = -20000.0f; - fptr = MEM_ARRAY_ALLOCATE(D_801782CC, 17 * 17); + fptr = MEM_ARRAY_ALLOCATE(D_ctx_801782CC, 17 * 17); for (i = 0; i < 17 * 17; i++, fptr++) { *fptr = 0.0f; } - fptr = MEM_ARRAY_ALLOCATE(D_801782D4, 17 * 17); + fptr = MEM_ARRAY_ALLOCATE(D_ctx_801782D4, 17 * 17); for (i = 0; i < 17 * 17; i++, fptr++) { *fptr = 0.0f; } - fptr = MEM_ARRAY_ALLOCATE(D_801782DC, 17 * 17); + fptr = MEM_ARRAY_ALLOCATE(D_ctx_801782DC, 17 * 17); for (i = 0; i < 17 * 17; i++, fptr++) { *fptr = 0.0f; } - fptr = MEM_ARRAY_ALLOCATE(D_801782E4, 17 * 17); + fptr = MEM_ARRAY_ALLOCATE(D_ctx_801782E4, 17 * 17); for (i = 0; i < 17 * 17; i++, fptr++) { *fptr = 0.0f; } - fptr = MEM_ARRAY_ALLOCATE(D_801782EC, 17 * 17); + fptr = MEM_ARRAY_ALLOCATE(D_ctx_801782EC, 17 * 17); for (i = 0; i < 17 * 17; i++, fptr++) { *fptr = 0.0f; } @@ -2485,128 +2497,129 @@ void func_800AB334(void) { } } -void func_800AB964(void) { +void func_play_800AB964(void) { s32 i; s32 j; - D_80178754 = 0; + D_versus_80178754 = 0; for (i = 0; i < 4; i++) { - D_80177DB8[i] = 0; + D_ctx_80177DB8[i] = 0; for (j = 0; j < 10; j++) { - D_80177DD0[i][j] = 0; + D_ctx_80177DD0[i][j] = 0; } gLaserStrength[i] = LASERS_SINGLE; gBombCount[i] = 0; } - D_80177E7C = D_80177E74 = 0; + D_ctx_80177E7C = D_ctx_80177E74 = 0; } -void func_800ABA08(void) { +void func_play_800ABA08(void) { s32 i; - func_800AB964(); + func_play_800AB964(); for (i = 0; i < 4; i++) { gPlayerNum = i; - func_800AB304(&gPlayer[i]); - func_800B0F50(&gPlayer[i]); - func_800B44C4(&gPlayer[i]); - func_800B7184(&gPlayer[i], 1); + func_play_800AB304(&gPlayer[i]); + func_play_800B0F50(&gPlayer[i]); + func_play_800B44C4(&gPlayer[i]); + func_play_800B7184(&gPlayer[i], 1); } - func_800A6148(); + func_play_800A6148(); } -void func_800ABAB4(void) { +void func_play_800ABAB4(void) { s32 i; - D_80161A54 = 40.0f; + D_play_80161A54 = 40.0f; for (i = 0; i < 4; i++) { gControllerRumble[i] = 0; } if (gExpertMode) { - D_80177828 = 200; + D_ctx_80177828 = 200; } else { - D_80177828 = 100; + D_ctx_80177828 = 100; } - D_801779BC = 0; + D_ctx_801779BC = 0; D_80137E78 = 2; - D_80177C70 = 0; - D_800CA234 = NULL; - D_Timer_800CA238 = 0; + D_ctx_80177C70 = 0; + D_display_800CA234 = NULL; + D_display_Timer_800CA238 = 0; Audio_KillSfxById(0x11403076); Audio_KillSfxById(0x49000014); Memory_FreeAll(); - D_80177C78 = D_80177C8C = gShowBossHealth = D_8015F908 = D_8015F90C = D_8015F910 = 0; - D_800CA220 = 0; - D_80177830 = 0; + D_ctx_80177C78 = D_ctx_80177C8C = gShowBossHealth = D_360_8015F908 = D_360_8015F90C = D_360_8015F910 = 0; + D_display_800CA220 = 0; + D_ctx_80177830 = 0; if (gCurrentLevel != LEVEL_VERSUS) { gOverlayStage = 0; } - D_80161A2C = 1; - D_80177A98 = D_80177AB0 = 1; - D_80177AC8 = D_800D2F54 = 0; - D_800CA230 = D_800D2F58 = 0.0f; + D_game_80161A2C = 1; + D_ctx_80177A98 = D_ctx_80177AB0 = 1; + D_ctx_80177AC8 = D_800D2F54 = 0; + D_display_800CA230 = D_800D2F58 = 0.0f; gLevelMode = LEVELMODE_ON_RAILS; - D_80177CE8 = D_8015F968 = 0.0f; - D_800D1970 = gVersusMode = D_80178300 = D_80177E84 = 0; + D_ctx_80177CE8 = D_bg_8015F968 = 0.0f; + D_hud_800D1970 = gVersusMode = D_ctx_80178300 = D_ctx_80177E84 = 0; if (gCurrentLevel >= LEVEL_FORTUNA) { gLevelMode = LEVELMODE_ALL_RANGE; if (gCurrentLevel == LEVEL_VERSUS) { gVersusMode = true; - func_800AB964(); + func_play_800AB964(); } } - if ((gCurrentLevel == LEVEL_VENOM_ANDROSS) && (D_8017827C == 1)) { + if ((gCurrentLevel == LEVEL_VENOM_ANDROSS) && (D_ctx_8017827C == 1)) { gLevelMode = LEVELMODE_ALL_RANGE; } - D_80177E7C = 0; - func_800A594C(); - D_80161A62 = D_8017796C = D_Timer_80177B44 = D_80177B4C = D_8015F928 = D_8015F940 = gBossActive = gGameFrameCount = - D_80178480 = D_801782FC = gBossFrameCount = D_80161690 = D_8015F900 = D_80177930 = 0; + D_ctx_80177E7C = 0; + func_play_800A594C(); + D_play_80161A62 = D_ctx_8017796C = D_Timer_80177B44 = D_ctx_80177B4C = D_360_8015F928 = D_360_8015F940 = + gBossActive = gGameFrameCount = D_ctx_80178480 = D_ctx_801782FC = gBossFrameCount = D_enmy2_80161690 = + D_360_8015F900 = D_ctx_80177930 = 0; if (gCurrentLevel == LEVEL_SECTOR_X) { - D_80177930 = 1; + D_ctx_80177930 = 1; } - D_80177CC0 = -25000.0f; - D_80177950 = 1.0f; - if ((gCurrentLevel == LEVEL_VENOM_2) && (D_8017827C == 2)) { - D_80178348 = D_80178350 = D_80178354 = 255; + D_ctx_80177CC0 = -25000.0f; + D_ctx_80177950 = 1.0f; + if ((gCurrentLevel == LEVEL_VENOM_2) && (D_ctx_8017827C == 2)) { + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; } else { - D_80178348 = D_80178350 = D_80178354 = 0; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; } - D_Timer_80161A60 = D_80178360 = D_80178364 = D_80178368 = D_80161704 = D_80161708 = D_80178340 = D_80177C50 = - D_8015F93C = D_80177B6C = 0; + D_play_Timer_80161A60 = D_ctx_80178360 = D_ctx_80178364 = D_ctx_80178368 = D_hud_80161704 = D_hud_80161708 = + D_ctx_80178340 = D_ctx_80177C50 = D_360_8015F93C = D_ctx_80177B6C = 0; gCsFrameCount = 0; - D_80178340 = D_80178358 = 255; + D_ctx_80178340 = D_ctx_80178358 = 255; - D_8017835C = 16; - D_8017836C = 0.0f; - D_8015F960 = 0.0f; + D_ctx_8017835C = 16; + D_ctx_8017836C = 0.0f; + D_bg_8015F960 = 0.0f; gGroundLevel = 0.0f; - D_80178414 = D_80178420 = D_80178424 = D_80178428 = D_8017842C = D_80178430 = 0.0f; + D_ctx_80178414 = D_ctx_80178420 = D_ctx_80178424 = D_ctx_80178428 = D_ctx_8017842C = D_ctx_80178430 = 0.0f; if ((gLevelType == LEVELTYPE_SPACE) || (gCurrentLevel == LEVEL_TRAINING)) { - func_800A5EBC(); + func_play_800A5EBC(); if (gCurrentLevel != LEVEL_TRAINING) { - D_80177A98 = 0; + D_ctx_80177A98 = 0; } } else { - D_80178410 = 0; + D_ctx_80178410 = 0; } gFogAlpha = 255; - D_801784E8 = 5.0f; - D_80178510 = 5.0f; - D_80178538 = 5.0f; - func_800A6148(); - D_801782C8 = 0; + D_ctx_801784E8 = 5.0f; + D_ctx_80178510 = 5.0f; + D_ctx_80178538 = 5.0f; + func_play_800A6148(); + D_ctx_801782C8 = 0; if (gCurrentLevel == LEVEL_TITANIA) { - func_i5_801B5110(0.0f, 0.0f, 200.0f); + Ground_801B5110(0.0f, 0.0f, 200.0f); } if (gCurrentLevel == LEVEL_AQUAS) { - D_80177CC0 = 1000.0f; + D_ctx_80177CC0 = 1000.0f; } - D_80178488 = false; + D_ctx_80178488 = false; gCamCount = 1; if (gCurrentLevel == LEVEL_VERSUS) { gCamCount = 4; @@ -2615,12 +2628,12 @@ void func_800ABAB4(void) { gTeamShields[i] = gSavedTeamShields[i]; } MEM_ARRAY_ALLOCATE(gPlayer, gCamCount); - func_800AB2AC(); + func_play_800AB2AC(); for (i = 0; i < gCamCount; i++) { gPlayer[i].state_1C8 = PLAYERSTATE_1C8_1; - D_80178380[i] = D_801783C0[i] = 0; + D_ctx_80178380[i] = D_ctx_801783C0[i] = 0; D_Timer_80177BD0[i] = 0; - D_80177C30[i] = 0; + D_ctx_80177C30[i] = 0; } if (gLevelMode == LEVELMODE_ALL_RANGE) { MEM_ARRAY_ALLOCATE(gObjects58, 200); @@ -2629,52 +2642,52 @@ void func_800ABAB4(void) { } switch (gCurrentLevel) { case LEVEL_SECTOR_Z: - if (D_8017782C == 0) { - func_i4_8019EA68(); - func_8002F180(); + if (D_ctx_8017782C == 0) { + SectorZ_8019EA68(); + func_360_8002F180(); } break; case LEVEL_FORTUNA: - func_i4_8018BA2C(); - func_8002F180(); + Fortuna_8018BA2C(); + func_360_8002F180(); break; case LEVEL_KATINA: - func_i4_80198930(); - if (D_8017782C == 0) { - func_8002F180(); + Katina_80198930(); + if (D_ctx_8017782C == 0) { + func_360_8002F180(); } break; case LEVEL_BOLSE: - if (D_8017782C == 0) { - func_i4_80191ED8(); - func_8002F180(); + if (D_ctx_8017782C == 0) { + Bolse_80191ED8(); + func_360_8002F180(); } break; case LEVEL_VENOM_2: - func_i6_80196968(); - if (D_8017827C == 0) { - func_8002F180(); + Venom2_80196968(); + if (D_ctx_8017827C == 0) { + func_360_8002F180(); } break; case LEVEL_VENOM_ANDROSS: - if (D_8017827C == 1) { - if (D_8015F924 == 0) { - func_i6_801878A8(); + if (D_ctx_8017827C == 1) { + if (D_360_8015F924 == 0) { + Andross_801878A8(); } else { - func_i6_801961AC(); + Andross_801961AC(); } } break; case LEVEL_VERSUS: - func_800A4F7C(); - D_8017796C = -1; + func_play_800A4F7C(); + D_ctx_8017796C = -1; break; } } - func_800AB334(); + func_play_800AB334(); } -void func_800AC290(Player* player, PlayerShot* shot, f32 arg2, f32 arg3, PlayerShotId shotId, f32 arg5) { +void func_play_800AC290(Player* player, PlayerShot* shot, f32 arg2, f32 arg3, PlayerShotId shotId, f32 arg5) { Vec3f sp44; Vec3f sp38; Vec3f sp2C; @@ -2727,7 +2740,7 @@ void func_800AC290(Player* player, PlayerShot* shot, f32 arg2, f32 arg3, PlayerS shot->unk_2C = player->unk_0E4 + player->unk_4D8; shot->unk_30 = player->unk_0E8; shot->unk_34 = player->unk_0F8; - shot->unk_5C = D_80178494; + shot->unk_5C = D_ctx_80178494; } else { shot->unk_30 = player->unk_0E8 + player->unk_114; shot->unk_2C = player->unk_0E4 + player->unk_4D8; @@ -2740,7 +2753,7 @@ void func_800AC290(Player* player, PlayerShot* shot, f32 arg2, f32 arg3, PlayerS shot->playerNum = player->num; } -void func_800AC650(Player* player, PlayerShot* shot, PlayerShotId shotId, f32 arg3) { +void func_play_800AC650(Player* player, PlayerShot* shot, PlayerShotId shotId, f32 arg3) { Vec3f sp54; Vec3f sp48; Vec3f sp3C; @@ -2798,20 +2811,20 @@ void func_800AC650(Player* player, PlayerShot* shot, PlayerShotId shotId, f32 ar } } -void func_800ACA40(Player* player) { +void func_play_800ACA40(Player* player) { s32 i; for (i = 0; i < ARRAY_COUNT(gPlayerShots) - 1; i++) { if (gPlayerShots[i].obj.status == 0) { - func_800AC650(player, &gPlayerShots[i], PLAYERSHOT_5, 100.0f); - func_800A5FA0(player->sfxSource, 0x09000014, player->num); + func_play_800AC650(player, &gPlayerShots[i], PLAYERSHOT_5, 100.0f); + func_play_800A5FA0(player->sfxSource, 0x09000014, player->num); player->unk_1A0 = 2; break; } } } -void func_800ACABC(Player* player) { +void func_play_800ACABC(Player* player) { s32 i; LaserStrength laser = gLaserStrength[gPlayerNum]; @@ -2822,9 +2835,9 @@ void func_800ACABC(Player* player) { case LASERS_SINGLE: for (i = 0; i < ARRAY_COUNT(gPlayerShots) - 1; i++) { if (gPlayerShots[i].obj.status == 0) { - func_800AC290(player, &gPlayerShots[i], 0.0f, 0.0f, PLAYERSHOT_0, 400.0f / 3.0f); - func_800A5FA0(player->sfxSource, 0x09400000, player->num); - D_80177AA0[player->num] = 0.5f; + func_play_800AC290(player, &gPlayerShots[i], 0.0f, 0.0f, PLAYERSHOT_0, 400.0f / 3.0f); + func_play_800A5FA0(player->sfxSource, 0x09400000, player->num); + D_ctx_80177AA0[player->num] = 0.5f; break; } } @@ -2833,13 +2846,13 @@ void func_800ACABC(Player* player) { case LASERS_HYPER: for (i = 0; i < ARRAY_COUNT(gPlayerShots) - 1; i++) { if (gPlayerShots[i].obj.status == 0) { - func_800AC290(player, &gPlayerShots[i], 0.0f, -10.0f, PLAYERSHOT_1, 400.0f / 3.0f); + func_play_800AC290(player, &gPlayerShots[i], 0.0f, -10.0f, PLAYERSHOT_1, 400.0f / 3.0f); if (laser == LASERS_TWIN) { - func_800A5FA0(player->sfxSource, 0x0940800C, player->num); - D_80177AA0[player->num] = 0.5f; + func_play_800A5FA0(player->sfxSource, 0x0940800C, player->num); + D_ctx_80177AA0[player->num] = 0.5f; } else { - func_800A5FA0(player->sfxSource, 0x0940802B, player->num); - D_80177AA0[player->num] = 0.75f; + func_play_800A5FA0(player->sfxSource, 0x0940802B, player->num); + D_ctx_80177AA0[player->num] = 0.75f; } break; } @@ -2848,7 +2861,7 @@ void func_800ACABC(Player* player) { } } -void func_800ACC7C(Player* player) { +void func_play_800ACC7C(Player* player) { if ((gBombCount[player->num] != 0) && (gBombButton[player->num] & gInputPress->button) && (gPlayerShots[ARRAY_COUNT(gPlayerShots) - 1].obj.status == OBJ_FREE)) { if (gVersusMode) { @@ -2857,11 +2870,11 @@ void func_800ACC7C(Player* player) { gBombCount[player->num]--; } if (player->form == FORM_ARWING) { - func_800AC290(player, &gPlayerShots[ARRAY_COUNT(gPlayerShots) - 1], 0.0f, 0.0f, PLAYERSHOT_3, 180.0f); + func_play_800AC290(player, &gPlayerShots[ARRAY_COUNT(gPlayerShots) - 1], 0.0f, 0.0f, PLAYERSHOT_3, 180.0f); } else if (player->form == FORM_LANDMASTER) { - func_800AC650(player, &gPlayerShots[ARRAY_COUNT(gPlayerShots) - 1], PLAYERSHOT_3, 180.0f); + func_play_800AC650(player, &gPlayerShots[ARRAY_COUNT(gPlayerShots) - 1], PLAYERSHOT_3, 180.0f); } else { - func_800ACDC0(player, &gPlayerShots[ARRAY_COUNT(gPlayerShots) - 1], PLAYERSHOT_3); + func_play_800ACDC0(player, &gPlayerShots[ARRAY_COUNT(gPlayerShots) - 1], PLAYERSHOT_3); } gPlayerShots[ARRAY_COUNT(gPlayerShots) - 1].unk_48 = 30.0f; gPlayerShots[ARRAY_COUNT(gPlayerShots) - 1].unk_60 = 0; @@ -2870,7 +2883,7 @@ void func_800ACC7C(Player* player) { } } -void func_800ACDC0(Player* player, PlayerShot* shot, PlayerShotId shotId) { +void func_play_800ACDC0(Player* player, PlayerShot* shot, PlayerShotId shotId) { Vec3f sp5C; Vec3f sp50; Vec3f sp44; @@ -2915,13 +2928,13 @@ void func_800ACDC0(Player* player, PlayerShot* shot, PlayerShotId shotId) { shot->playerNum = player->num; } -void func_800AD094(Player* player) { +void func_play_800AD094(Player* player) { s32 i; for (i = 0; i < ARRAY_COUNT(gPlayerShots); i++) { if (gPlayerShots[i].obj.status == 0) { - func_800ACDC0(player, &gPlayerShots[i], PLAYERSHOT_6); - func_800A5FA0(player->sfxSource, 0x09000014, player->num); + func_play_800ACDC0(player, &gPlayerShots[i], PLAYERSHOT_6); + func_play_800A5FA0(player->sfxSource, 0x09000014, player->num); player->timer_1F8 = 2; player->unk_180 = 10.0f; break; @@ -2929,7 +2942,7 @@ void func_800AD094(Player* player) { } } -bool func_800AD118(s32 playerNum) { +bool func_play_800AD118(s32 playerNum) { Actor* actor; s32 i; @@ -2942,7 +2955,7 @@ bool func_800AD118(s32 playerNum) { for (i = 0; i < gCamCount; i++) { if (((gPlayer[playerNum].state_1C8 == PLAYERSTATE_1C8_3) || (gPlayer[playerNum].state_1C8 == PLAYERSTATE_1C8_5)) && - (D_80177B00[i][playerNum] != 0)) { + (D_ctx_80177B00[i][playerNum] != 0)) { return false; } } @@ -2950,7 +2963,7 @@ bool func_800AD118(s32 playerNum) { return true; } -bool func_800AD1F4(Player* player) { +bool func_play_800AD1F4(Player* player) { bool var_a2; s32 i; @@ -2960,18 +2973,18 @@ bool func_800AD1F4(Player* player) { gChargeTimers[player->num] = 21; } if (gChargeTimers[player->num] == 20) { - func_80060F30(player->sfxSource, 0x0900302D, player->num); + func_enmy_80060F30(player->sfxSource, 0x0900302D, player->num); } if ((!(gInputHold->button & R_TRIG) || !(gInputHold->button & Z_TRIG) || (player->form != FORM_ARWING) || (player->state_1C8 != PLAYERSTATE_1C8_3)) && - !(gGameFrameCount & 3) && func_800AD118(player->num)) { + !(gGameFrameCount & 3) && func_play_800AD118(player->num)) { if (gChargeTimers[player->num] >= 21) { for (i = 0; i < 13; i++) { if (gPlayerShots[i].obj.status == 0) { if (player->form == FORM_ARWING) { - func_800AC290(player, &gPlayerShots[i], 0.0f, 0.0f, PLAYERSHOT_4, 400.0f); + func_play_800AC290(player, &gPlayerShots[i], 0.0f, 0.0f, PLAYERSHOT_4, 400.0f); } else { - func_800AC650(player, &gPlayerShots[i], PLAYERSHOT_4, 400.0f); + func_play_800AC650(player, &gPlayerShots[i], PLAYERSHOT_4, 400.0f); } return true; } @@ -2992,11 +3005,11 @@ bool func_800AD1F4(Player* player) { ((gPlayerShots[14 - player->num].obj.id == PLAYERSHOT_8) && (gPlayerShots[14 - player->num].unk_60 != 0))) { if (player->form == FORM_ARWING) { - func_800AC290(player, &gPlayerShots[14 - player->num], 0.0f, 0.0f, PLAYERSHOT_8, 70.0f); + func_play_800AC290(player, &gPlayerShots[14 - player->num], 0.0f, 0.0f, PLAYERSHOT_8, 70.0f); } else { - func_800AC650(player, &gPlayerShots[14 - player->num], PLAYERSHOT_8, 70.0f); + func_play_800AC650(player, &gPlayerShots[14 - player->num], PLAYERSHOT_8, 70.0f); } - func_80060F30(player->sfxSource, 0x09007029, player->num); + func_enmy_80060F30(player->sfxSource, 0x09007029, player->num); D_Timer_80177BD0[player->num] = 5; return true; } @@ -3009,11 +3022,11 @@ bool func_800AD1F4(Player* player) { ((gPlayerShots[14 - player->num].obj.id == PLAYERSHOT_8) && (gPlayerShots[14 - player->num].unk_44 > 1.0f))) { if (player->form == FORM_ARWING) { - func_800AC290(player, &gPlayerShots[14 - player->num], 0.0f, 0.0f, PLAYERSHOT_8, 70.0f); + func_play_800AC290(player, &gPlayerShots[14 - player->num], 0.0f, 0.0f, PLAYERSHOT_8, 70.0f); } else { - func_800AC650(player, &gPlayerShots[14 - player->num], PLAYERSHOT_8, 70.0f); + func_play_800AC650(player, &gPlayerShots[14 - player->num], PLAYERSHOT_8, 70.0f); } - func_80060F30(player->sfxSource, 0x09007029, player->num); + func_enmy_80060F30(player->sfxSource, 0x09007029, player->num); gChargeTimers[player->num] = 0; D_Timer_80177BD0[player->num] = 5; return true; @@ -3030,7 +3043,7 @@ bool func_800AD1F4(Player* player) { } } for (i = 0; i < gCamCount; i++) { - if (D_80177B00[i][player->num] != 0) { + if (D_ctx_80177B00[i][player->num] != 0) { var_a2 = true; break; } @@ -3039,10 +3052,10 @@ bool func_800AD1F4(Player* player) { if ((gBombCount[player->num] != 0) && (gPlayerShots[ARRAY_COUNT(gPlayerShots) - 1].obj.status == 0)) { gBombCount[player->num]--; if (player->form == FORM_ARWING) { - func_800AC290(player, &gPlayerShots[ARRAY_COUNT(gPlayerShots) - 1], 0.0f, 0.0f, PLAYERSHOT_8, - 60.0f); + func_play_800AC290(player, &gPlayerShots[ARRAY_COUNT(gPlayerShots) - 1], 0.0f, 0.0f, PLAYERSHOT_8, + 60.0f); } else { - func_800AC650(player, &gPlayerShots[ARRAY_COUNT(gPlayerShots) - 1], PLAYERSHOT_8, 60.0f); + func_play_800AC650(player, &gPlayerShots[ARRAY_COUNT(gPlayerShots) - 1], PLAYERSHOT_8, 60.0f); } gPlayerShots[ARRAY_COUNT(gPlayerShots) - 1].unk_48 = 30.0f; gPlayerShots[ARRAY_COUNT(gPlayerShots) - 1].unk_60 = 0; @@ -3055,37 +3068,37 @@ bool func_800AD1F4(Player* player) { return false; } -void func_800AD7F0(Player* player) { +void func_play_800AD7F0(Player* player) { switch (player->form) { case FORM_ARWING: if ((player->wings.rightState <= WINGSTATE_BROKEN) || (player->wings.leftState <= WINGSTATE_BROKEN)) { gLaserStrength[player->num] = LASERS_SINGLE; } - if (!func_800AD1F4(player)) { + if (!func_play_800AD1F4(player)) { if (gLaserStrength[gPlayerNum] > LASERS_SINGLE) { Math_SmoothStepToF(&player->wings.unk_14, -10.0f, 1.0f, 0.5f, 0.0f); } else { Math_SmoothStepToF(&player->wings.unk_14, 0.0f, 1.0f, 0.5f, 0.0f); } if (gShootButton[player->num] & gInputPress->button) { - func_800ACABC(player); + func_play_800ACABC(player); player->timer_244 = 8; } if (player->timer_244 != 0) { player->timer_244--; if ((gShootButton[player->num] & gInputHold->button) && !(player->timer_244 & 3)) { - func_800ACABC(player); + func_play_800ACABC(player); } } - func_800ACC7C(player); + func_play_800ACC7C(player); } break; case FORM_LANDMASTER: - if (!func_800AD1F4(player)) { + if (!func_play_800AD1F4(player)) { if (gShootButton[player->num] & gInputPress->button) { - func_800ACA40(player); + func_play_800ACA40(player); } - func_800ACC7C(player); + func_play_800ACC7C(player); } break; case FORM_ON_FOOT: @@ -3094,19 +3107,19 @@ void func_800AD7F0(Player* player) { } if (gInputHold->button & A_BUTTON) { if (player->timer_244 == 0) { - func_800AD094(player); + func_play_800AD094(player); } player->timer_244++; if (player->timer_244 > 4) { player->timer_244 = 0; } } - func_800ACC7C(player); + func_play_800ACC7C(player); break; } } -void func_800ADA28(Player* player) { +void func_play_800ADA28(Player* player) { f32 sp3C; f32 sp38; @@ -3169,7 +3182,7 @@ void func_800ADA28(Player* player) { } } -void func_800ADD98(Player* player) { +void func_play_800ADD98(Player* player) { Math_SmoothStepToF(&player->unk_170, 0.0f, 1.0f, 0.2f, 0.0f); Math_SmoothStepToF(&player->unk_16C, 0.0f, 1.0f, 0.2f, 0.0f); if (gInputPress->button & Z_TRIG) { @@ -3194,24 +3207,24 @@ void func_800ADD98(Player* player) { player->unk_18C += fabsf(SIN_DEG(player->unk_130) * 20.0f); } -void func_800ADF58(Player* player) { +void func_play_800ADF58(Player* player) { f32 temp_fv0; f32 temp_fv0_2; s32 temp_v0; player->unk_140 = -player->vel.z; player->unk_144 += -player->vel.z; - D_80177D08 = -player->vel.z; - D_80177D20 = player->unk_144; - D_80177CE8 += player->unk_140; - if (D_801784AC == 4) { - D_80177CC8 = player->unk_140; + D_ctx_80177D08 = -player->vel.z; + D_ctx_80177D20 = player->unk_144; + D_ctx_80177CE8 += player->unk_140; + if (D_ctx_801784AC == 4) { + D_ctx_80177CC8 = player->unk_140; } if ((gBossActive == 0) && (player->unk_144 > 500000.0f)) { player->unk_144 = 0.0f; player->pos.z = 0.0f; - D_80177DC8 = 0; - func_800A6148(); + D_ctx_80177DC8 = 0; + func_play_800A6148(); } player->unk_138 = player->pos.z + player->unk_08C; player->unk_0F8 = player->unk_0EC + player->unk_12C + player->unk_130; @@ -3235,9 +3248,9 @@ void func_800ADF58(Player* player) { player->pos.x += Math_SmoothStepToF(&player->unk_0AC, player->unk_0B8, 0.1f, player->unk_0B4, 0.0001f); player->pos.y += Math_SmoothStepToF(&player->unk_0B0, player->unk_0BC, 0.1f, player->unk_0B4, 0.0001f); } else { - Math_SmoothStepToF(&player->unk_0B4, D_80177D08 * 0.54f, 0.1f, 2.0f, 0.0001f); - D_801779E4 = Math_SmoothStepToF(&player->unk_0AC, player->unk_0B8, 0.1f, player->unk_0B4, 0.0001f); - D_801779F4 = Math_SmoothStepToF(&player->unk_0B0, player->unk_0BC, 0.1f, player->unk_0B4, 0.0001f); + Math_SmoothStepToF(&player->unk_0B4, D_ctx_80177D08 * 0.54f, 0.1f, 2.0f, 0.0001f); + D_ctx_801779E4 = Math_SmoothStepToF(&player->unk_0AC, player->unk_0B8, 0.1f, player->unk_0B4, 0.0001f); + D_ctx_801779F4 = Math_SmoothStepToF(&player->unk_0B0, player->unk_0BC, 0.1f, player->unk_0B4, 0.0001f); } if (player->timer_210 != 0) { player->timer_210--; @@ -3249,7 +3262,7 @@ void func_800ADF58(Player* player) { } } -void func_800AE278(Player* player) { +void func_play_800AE278(Player* player) { f32 var_fv1; bool var_v0 = false; @@ -3280,8 +3293,8 @@ void func_800AE278(Player* player) { player->camAt.z += 24000.0f; } if (var_v0) { - D_80177B00[player->num][0] = D_80177B00[player->num][1] = D_80177B00[player->num][2] = - D_80177B00[player->num][3] = 0; + D_ctx_80177B00[player->num][0] = D_ctx_80177B00[player->num][1] = D_ctx_80177B00[player->num][2] = + D_ctx_80177B00[player->num][3] = 0; } } else { var_fv1 = 12500.0f; @@ -3291,7 +3304,7 @@ void func_800AE278(Player* player) { var_fv1 = 10000.0f; } else if (gCurrentLevel == LEVEL_SECTOR_Z) { var_fv1 = 20000.0f; - } else if ((gCurrentLevel == LEVEL_VENOM_ANDROSS) && (D_80177AB0 >= 4)) { + } else if ((gCurrentLevel == LEVEL_VENOM_ANDROSS) && (D_ctx_80177AB0 >= 4)) { var_fv1 = 100000.0f; } if ((var_fv1 < fabsf(player->pos.x)) || (var_fv1 < fabsf(player->pos.z))) { @@ -3304,7 +3317,7 @@ void func_800AE278(Player* player) { } } -void func_800AE4A4(Player* player) { +void func_play_800AE4A4(Player* player) { f32 sp7C; f32 sp78; f32 var_fa0; @@ -3318,8 +3331,8 @@ void func_800AE4A4(Player* player) { Vec3f sp4C; Vec3f sp40; - D_80177968 = 2.3f; - D_80177970 = 0.68f; + D_ctx_80177968 = 2.3f; + D_ctx_80177970 = 0.68f; sp7C = -gInputPress->stick_x; sp78 = gInputPress->stick_y; Math_SmoothStepToAngle(&player->unk_4D8, 0.0f, 0.1f, 5.0f, 0.01f); @@ -3344,14 +3357,14 @@ void func_800AE4A4(Player* player) { Math_SmoothStepToF(&player->wings.unk_10, -sp60 - sp58, 0.1f, 100.0f, 0.0f); var_fa0 = 0.1f; if ((player->unk_12C > 10.0f) && (sp7C > 0)) { - D_80177968 *= 2.0f; + D_ctx_80177968 *= 2.0f; var_fa0 = 0.2f; } if ((player->unk_12C < -10.0f) && (sp7C < 0)) { - D_80177968 *= 2.0f; + D_ctx_80177968 *= 2.0f; var_fa0 = 0.2f; } - Math_SmoothStepToF(&player->unk_0E8, sp7C * D_80177970, var_fa0, D_80177968, 0.03f); + Math_SmoothStepToF(&player->unk_0E8, sp7C * D_ctx_80177970, var_fa0, D_ctx_80177968, 0.03f); var_fa0 = 0.03f; if ((player->unk_12C > 10.0f) && (sp7C > 0)) { var_fa0 = 0.05f; @@ -3367,15 +3380,15 @@ void func_800AE4A4(Player* player) { if (player->unk_114 < 0.0f) { player->unk_114 += 360.0f; } - D_80177968 = 2.3f; + D_ctx_80177968 = 2.3f; var_fa1 = 0.1f; - temp = -sp78 * D_80177970; + temp = -sp78 * D_ctx_80177970; if ((temp <= 0.0f) && (player->pos.y < (gGroundLevel + 50.0f))) { - D_80177968 *= 2.0f; + D_ctx_80177968 *= 2.0f; temp = 0.0f; var_fa1 = 0.2f; } - Math_SmoothStepToF(&player->unk_0E4, temp, var_fa1, D_80177968, 0.03f); + Math_SmoothStepToF(&player->unk_0E4, temp, var_fa1, D_ctx_80177968, 0.03f); var_fv1 = 1.5f; if (player->pos.y < (gGroundLevel + 70.0f)) { var_fv1 = 0.8f; @@ -3426,13 +3439,13 @@ void func_800AE4A4(Player* player) { if (player->pos.y < -(player->unk_0A0 - 100.0f)) { player->unk_228 = 4; } - func_800AE278(player); + func_play_800AE278(player); player->unk_138 = player->pos.z; - func_800A4460(player); - func_800A46A0(player); + func_play_800A4460(player); + func_play_800A46A0(player); } -void func_800AECAC(Player* player) { +void func_play_800AECAC(Player* player) { f32 temp; f32 sp58; Vec3f sp4C; @@ -3440,8 +3453,8 @@ void func_800AECAC(Player* player) { sp58 = 60.0f; if (gVersusMode) { - D_80177B00[player->num][0] = D_80177B00[player->num][1] = D_80177B00[player->num][2] = - D_80177B00[player->num][3] = 0; + D_ctx_80177B00[player->num][0] = D_ctx_80177B00[player->num][1] = D_ctx_80177B00[player->num][2] = + D_ctx_80177B00[player->num][3] = 0; } if (player->unk_4D8 > 240.0f) { sp58 = -50.0f; @@ -3498,10 +3511,10 @@ void func_800AECAC(Player* player) { } player->pos.z += player->vel.z; player->unk_138 = player->pos.z; - func_800A46A0(player); + func_play_800A46A0(player); } -void func_800AF07C(Player* player) { +void func_play_800AF07C(Player* player) { f32 stickX; f32 stickY; f32 var_fa0; @@ -3518,11 +3531,11 @@ void func_800AF07C(Player* player) { Vec3f sp50; Vec3f sp44; - D_80177968 = 2.3f; - D_80177970 = 0.68f; + D_ctx_80177968 = 2.3f; + D_ctx_80177970 = 0.68f; if ((gInputPress->stick_x != 0) || (gInputPress->stick_y != 0)) { - D_80177970 = 0.68f; //! FAKE ? + D_ctx_80177970 = 0.68f; //! FAKE ? } stickX = -gInputPress->stick_x; @@ -3570,30 +3583,30 @@ void func_800AF07C(Player* player) { if ((player->unk_12C > 10.0f) && (stickX > 0)) { sp84 = 0.2f; - D_80177968 *= 2.0f; + D_ctx_80177968 *= 2.0f; } if ((player->unk_12C < (-10.0f)) && (stickX < 0)) { sp84 = 0.2f; - D_80177968 *= 2.0f; + D_ctx_80177968 *= 2.0f; } if (player->unk_1DC != 0) { sp84 = 0.2f; - D_80177968 = 6.8999996f; + D_ctx_80177968 = 6.8999996f; } - Math_SmoothStepToF(&player->unk_0E8, stickX * D_80177970, sp84, D_80177968, 0.03f); + Math_SmoothStepToF(&player->unk_0E8, stickX * D_ctx_80177970, sp84, D_ctx_80177968, 0.03f); - D_80177968 = 2.3f; + D_ctx_80177968 = 2.3f; sp84 = 0.1f; - var_fa1 = -stickY * D_80177970; + var_fa1 = -stickY * D_ctx_80177970; if ((var_fa1 <= 0.0f) && (player->pos.y < (gGroundLevel + 50.0f))) { var_fa1 = 0.0f; sp84 = 0.2f; - D_80177968 *= 2.0f; + D_ctx_80177968 *= 2.0f; } - Math_SmoothStepToF(&player->unk_0E4, var_fa1, sp84, D_80177968, 0.03f); + Math_SmoothStepToF(&player->unk_0E4, var_fa1, sp84, D_ctx_80177968, 0.03f); var_fv1 = 1.0f; if (player->pos.y < (gGroundLevel + 70.0f)) { @@ -3638,7 +3651,7 @@ void func_800AF07C(Player* player) { player->vel.z = sp5C.z + sp50.z; if (gCurrentLevel == LEVEL_VENOM_ANDROSS) { - player->vel.z += D_i6_801A7F58; + player->vel.z += D_Andross_801A7F58; } sp68.x = 0.0f; sp68.y = 0.0f; @@ -3696,10 +3709,10 @@ void func_800AF07C(Player* player) { player->pos.z += player->vel.z; - func_800A4460(player); + func_play_800A4460(player); } -void func_800AF928(Player* player) { +void func_play_800AF928(Player* player) { f32 sp5C; f32 var_fa0; f32 var_fa1; @@ -3726,13 +3739,13 @@ void func_800AF928(Player* player) { if (player->unk_180 > 0) { player->unk_180 -= 3.0f; } - D_80177968 = 3.0f; - D_80177970 = 0.6666f; + D_ctx_80177968 = 3.0f; + D_ctx_80177970 = 0.6666f; sp5C = gInputPress->stick_x; if (sp5C == 0) { - Math_SmoothStepToF(&player->unk_0E8, -sp5C * D_80177970, 0.1f, D_80177968 * 0.5f, 0.1f); + Math_SmoothStepToF(&player->unk_0E8, -sp5C * D_ctx_80177970, 0.1f, D_ctx_80177968 * 0.5f, 0.1f); } else { - Math_SmoothStepToF(&player->unk_0E8, -sp5C * D_80177970, 0.1f, D_80177968, 0.1f); + Math_SmoothStepToF(&player->unk_0E8, -sp5C * D_ctx_80177970, 0.1f, D_ctx_80177968, 0.1f); } player->unk_108 = player->unk_0E8; var_fa0 = 0.03f; @@ -3816,20 +3829,20 @@ void func_800AF928(Player* player) { player->vel.y = 20.0f; } player->pos.z += player->vel.z; - func_800AE278(player); + func_play_800AE278(player); player->unk_138 = player->pos.z; player->unk_0F8 = player->unk_0EC + player->unk_12C + player->unk_130; if (player->unk_1D4 != 0) { player->unk_0F4 += player->unk_0D0 * 5.0f; player->unk_0F0 = SIN_DEG(player->unk_0F4) * 0.7f; } - func_800A46A0(player); + func_play_800A46A0(player); } f32 D_800D30F4[4] = { 3.0f, 4.0f, 5.0f, 3.0f }; f32 D_800D3104[4] = { 0.2f, 0.25f, 0.3f, 0.2f }; -void func_800B00C0(Player* player) { +void func_play_800B00C0(Player* player) { f32 sp2C = 0.0f; f32 sp28 = 0.7f; f32 sp24 = 0.1f; @@ -3843,7 +3856,7 @@ void func_800B00C0(Player* player) { Math_SmoothStepToF(&player->unk_008, sp28, 0.1f, sp24, 0.00001f); } -void func_800B0194(Player* player) { +void func_play_800B0194(Player* player) { Vec3f sp78[30]; f32 sp74; f32 sp70; @@ -3874,15 +3887,15 @@ void func_800B0194(Player* player) { Math_SmoothStepToF(&player->unk_154, sp74, 0.1f, 3.0f, 0.00001f); Math_SmoothStepToF(&player->unk_180, 0.0f, 0.15f, 5.0f, 0.00001f); Math_SmoothStepToF(&player->unk_158, sp74, 0.2f, 5.0f, 0.00001f); - D_80177968 = 3.0f; - D_80177970 = 0.666f; + D_ctx_80177968 = 3.0f; + D_ctx_80177970 = 0.666f; sp74 = gInputPress->stick_x; sp70 = gInputPress->stick_y; - Math_SmoothStepToF(&player->unk_0E8, -sp74 * D_80177970 * 0.6f, 0.5f, D_80177968, 0.001f); - Math_SmoothStepToF(&player->unk_0EC, -sp74 * D_80177970 * 0.2f * player->unk_0D0 / 15.0f, 0.2f, 5.0f, 0.001f); + Math_SmoothStepToF(&player->unk_0E8, -sp74 * D_ctx_80177970 * 0.6f, 0.5f, D_ctx_80177968, 0.001f); + Math_SmoothStepToF(&player->unk_0EC, -sp74 * D_ctx_80177970 * 0.2f * player->unk_0D0 / 15.0f, 0.2f, 5.0f, 0.001f); player->unk_0F8 = player->unk_0EC; if ((sp74 != 0.0f) || (sp70 != 0.0f)) { - Math_SmoothStepToF(&player->unk_15C, sp74 * D_80177970, 0.9f, 2.0f * D_80177968, 0.1f); + Math_SmoothStepToF(&player->unk_15C, sp74 * D_ctx_80177970, 0.9f, 2.0f * D_ctx_80177968, 0.1f); Math_SmoothStepToF(&player->unk_164, sp74 * 0.3f, 0.1f, 10.0f, 0.00001f); Math_SmoothStepToF(&player->unk_168, -sp74 * 0.3f, 0.1f, 10.0f, 0.00001f); } else { @@ -3907,7 +3920,7 @@ void func_800B0194(Player* player) { var_fv0 = 0.08f; var_fa0 = 1.5f; } - Math_SmoothStepToF(&player->unk_11C, -sp74 * D_80177970 * var_fv0, 0.2f, var_fa0, 0.0f); + Math_SmoothStepToF(&player->unk_11C, -sp74 * D_ctx_80177970 * var_fv0, 0.2f, var_fa0, 0.0f); player->unk_114 += player->unk_11C; player->unk_114 = Math_ModF(player->unk_114, 360.0f); Matrix_RotateX(gCalcMatrix, player->unk_104 * M_DTOR, 0); @@ -4031,7 +4044,7 @@ void func_800B0194(Player* player) { player->vel.y = 20.0f; } player->pos.z += player->vel.z; - func_800AE278(player); + func_play_800AE278(player); player->unk_138 = player->pos.z; } @@ -4043,7 +4056,7 @@ f32 D_800D3134[8] = { }; f32 D_800D3154[4] = { 45.0f, -135.0f, 135.0f, -45.0f }; -void func_800B0F50(Player* playerx) { +void func_play_800B0F50(Player* playerx) { s32 j; Vec3f* sp38; ObjectInit* sp34; @@ -4051,7 +4064,7 @@ void func_800B0F50(Player* playerx) { s16 sp2E; Player* player = playerx; // fake? - D_80177BAC = 0; + D_ctx_80177BAC = 0; player->shields = 0xFF; if (gVersusMode) { switch (gHandicap[gPlayerNum]) { @@ -4073,23 +4086,23 @@ void func_800B0F50(Player* playerx) { gRightWingHealth[gPlayerNum] = 60; } D_Timer_80177A00[gPlayerNum] = D_Timer_80177A38[gPlayerNum] = D_Timer_80177A70[gPlayerNum] = - D_Timer_80177A88[gPlayerNum] = D_80177AE8[gPlayerNum] = D_80177AD0[gPlayerNum] = gChargeTimers[gPlayerNum] = - D_80177B00[gPlayerNum][0] = D_80177B00[gPlayerNum][1] = D_80177B00[gPlayerNum][2] = - D_80177B00[gPlayerNum][3] = 0; - D_80177D40[gPlayerNum] = D_80177D58[gPlayerNum] = D_80177D70[gPlayerNum] = D_80177D88[gPlayerNum] = - D_80177990[gPlayerNum] = D_801779A8[gPlayerNum] = D_80177AA0[gPlayerNum] = 0.0f; - D_80177AB8[gPlayerNum] = 0.0f; + D_Timer_80177A88[gPlayerNum] = D_ctx_80177AE8[gPlayerNum] = D_ctx_80177AD0[gPlayerNum] = + gChargeTimers[gPlayerNum] = D_ctx_80177B00[gPlayerNum][0] = D_ctx_80177B00[gPlayerNum][1] = + D_ctx_80177B00[gPlayerNum][2] = D_ctx_80177B00[gPlayerNum][3] = 0; + D_ctx_80177D40[gPlayerNum] = D_ctx_80177D58[gPlayerNum] = D_ctx_80177D70[gPlayerNum] = D_ctx_80177D88[gPlayerNum] = + D_ctx_80177990[gPlayerNum] = D_ctx_801779A8[gPlayerNum] = D_ctx_80177AA0[gPlayerNum] = 0.0f; + D_ctx_80177AB8[gPlayerNum] = 0.0f; player->unk_190 = 1.0f; player->unk_194 = 1.0f; - gRadioState = D_80177D68 = D_801782A4 = 0; - D_8017853C = D_80177D50 = 0.0f; + gRadioState = D_ctx_80177D68 = D_ctx_801782A4 = 0; + D_ctx_8017853C = D_ctx_80177D50 = 0.0f; player->camEye.z = 400.0f; player->unk_148 = 0.77699995f; player->unk_14C = 0.77699995f; player->unk_01C = 1.0f; player->unk_068 = -1000.0f; player->camAt.z = player->camEye.z - 1000.0f; - D_80177950 = 1.0f; + D_ctx_80177950 = 1.0f; if ((gLevelType == LEVELTYPE_SPACE) && (gCurrentLevel != LEVEL_BOLSE)) { player->unk_240 = 1; player->unk_0A8 = 3000.0f; @@ -4106,7 +4119,7 @@ void func_800B0F50(Player* playerx) { player->unk_0A4 = gGroundLevel + 40.0f; player->unk_0A8 = 3000.0f; } - player->unk_0D0 = D_80161A54; + player->unk_0D0 = D_play_80161A54; player->pos.y = 350.0f; switch (gCurrentLevel) { case LEVEL_MACBETH: @@ -4153,37 +4166,37 @@ void func_800B0F50(Player* playerx) { gGoldRingCount[0] = 0; } gHitCount = gSavedHitCount; - if ((gCurrentLevel == LEVEL_VENOM_ANDROSS) || ((gCurrentLevel == LEVEL_VENOM_2) && (D_8017827C == 2))) { - if (D_80177C9C != 0) { - player->shields = D_80177C9C - 1; - gGoldRingCount[0] = D_80177C94; - player->wings.rightState = D_80177CAC; - player->wings.leftState = D_80177CB4; - gRightWingHealth[0] = D_80177CBC; - gLeftWingHealth[0] = D_80177CC4; + if ((gCurrentLevel == LEVEL_VENOM_ANDROSS) || ((gCurrentLevel == LEVEL_VENOM_2) && (D_ctx_8017827C == 2))) { + if (D_ctx_80177C9C != 0) { + player->shields = D_ctx_80177C9C - 1; + gGoldRingCount[0] = D_ctx_80177C94; + player->wings.rightState = D_ctx_80177CAC; + player->wings.leftState = D_ctx_80177CB4; + gRightWingHealth[0] = D_ctx_80177CBC; + gLeftWingHealth[0] = D_ctx_80177CC4; if (gCurrentLevel == LEVEL_VENOM_ANDROSS) { - D_80177C94 = D_80177CAC = D_80177CB4 = D_80177CBC = D_80177CC4 = D_80177C9C = 0; + D_ctx_80177C94 = D_ctx_80177CAC = D_ctx_80177CB4 = D_ctx_80177CBC = D_ctx_80177CC4 = D_ctx_80177C9C = 0; } } - gHitCount = gSavedHitCount = D_80177CA4; + gHitCount = gSavedHitCount = D_ctx_80177CA4; } - D_80161720[0] = 0.0f; - D_80161720[1] = 0.0f; - D_80161720[2] = 0.0f; - D_8016172C = gHitCount; - D_80161730 = 0; - D_80161684 = D_80161A50; - D_80177DC8 = D_80177CA0; + D_hud_80161720[0] = 0.0f; + D_hud_80161720[1] = 0.0f; + D_hud_80161720[2] = 0.0f; + D_hud_8016172C = gHitCount; + D_hud_80161730 = 0; + D_enmy_80161684 = D_play_80161A50; + D_ctx_80177DC8 = D_ctx_80177CA0; D_80161A88 = D_80161A8C; - D_80177D20 = player->unk_144 = D_80177CB0; + D_ctx_80177D20 = player->unk_144 = D_ctx_80177CB0; player->pos.z = player->unk_138 = -player->unk_144; - if ((D_80177CA0 > 0) && (gLevelMode == LEVELMODE_ON_RAILS)) { + if ((D_ctx_80177CA0 > 0) && (gLevelMode == LEVELMODE_ON_RAILS)) { if (gCurrentLevel == LEVEL_MACBETH) { - sp2E = D_80177DC8; - func_i5_801AD080(); - D_80177DC8 = sp2E; + sp2E = D_ctx_80177DC8; + Macbeth_801AD080(); + D_ctx_80177DC8 = sp2E; } - func_80062568(); + func_enmy_80062568(); } if (player->form == FORM_LANDMASTER) { player->pos.z -= 200.0f; @@ -4192,7 +4205,8 @@ void func_800B0F50(Player* playerx) { player->camEye.y = (player->pos.y * player->unk_148) + 10.0f; player->camEye.x = player->pos.x * player->unk_148; - D_801779E8.x = D_801779E8.y = D_801779E8.z = D_801779D8.x = D_801779D8.y = D_801779D8.z = 0.0f; + D_ctx_801779E8.x = D_ctx_801779E8.y = D_ctx_801779E8.z = D_ctx_801779D8.x = D_ctx_801779D8.y = D_ctx_801779D8.z = + 0.0f; if (gVersusMode) { gLaserStrength[gPlayerNum] = LASERS_SINGLE; @@ -4200,7 +4214,7 @@ void func_800B0F50(Player* playerx) { player->pos.x = D_800D3114[gPlayerNum]; player->pos.z = D_800D3124[gPlayerNum]; player->unk_114 = D_800D3154[gPlayerNum]; - player->form = D_80177870[gPlayerNum]; + player->form = D_ctx_80177870[gPlayerNum]; switch (player->form) { case FORM_ARWING: break; @@ -4232,7 +4246,7 @@ void func_800B0F50(Player* playerx) { } break; } - func_800B7184(player, 1); + func_play_800B7184(player, 1); } player->state_1C8 = PLAYERSTATE_1C8_3; player->unk_204 = gLevelType; @@ -4241,7 +4255,7 @@ void func_800B0F50(Player* playerx) { player->pos.y = 670.0f; player->unk_0A0 = 730.0f; player->unk_204 = 2; - if ((gCurrentLevel == LEVEL_VENOM_ANDROSS) && (D_8017827C == 1)) { + if ((gCurrentLevel == LEVEL_VENOM_ANDROSS) && (D_ctx_8017827C == 1)) { player->pos.x = -7910.0f; player->pos.y = 300.0f; @@ -4249,29 +4263,29 @@ void func_800B0F50(Player* playerx) { player->unk_114 = 188.0f; player->unk_240 = 1; } - func_800B63BC(player, 1); + func_play_800B63BC(player, 1); } else { player->unk_014 = 1.0f; player->unk_018 = 1.0f; } - if ((D_8017782C != 0) && (D_80177CA0 == 0)) { - D_800D3180[gCurrentLevel] = 0; + if ((D_ctx_8017782C != 0) && (D_ctx_80177CA0 == 0)) { + D_play_800D3180[gCurrentLevel] = 0; for (j = 0; j < 10; j++) { - D_80177A10[j] = 0; - D_80177A48[j] = 0.0f; + D_ctx_80177A10[j] = 0; + D_ctx_80177A48[j] = 0.0f; } - D_8017782C = 0; - D_8015F924 = 0; + D_ctx_8017782C = 0; + D_360_8015F924 = 0; switch (gCurrentLevel) { case LEVEL_CORNERIA: player->state_1C8 = PLAYERSTATE_1C8_2; player->unk_204 = 1; D_80161A88 = D_80161A8C = 2; - func_800A3FB0(); + func_play_800A3FB0(); break; case LEVEL_BOLSE: player->unk_204 = 1; - D_i4_801A03DC = 6; + D_BO_801A03DC = 6; /* fallthrough */ case LEVEL_SECTOR_X: case LEVEL_AREA_6: @@ -4293,24 +4307,24 @@ void func_800B0F50(Player* playerx) { break; } } else { - if (!gVersusMode && !((gCurrentLevel == LEVEL_VENOM_2) && (D_8017827C == 2))) { - D_80177838 = 80; + if (!gVersusMode && !((gCurrentLevel == LEVEL_VENOM_2) && (D_ctx_8017827C == 2))) { + D_ctx_80177838 = 80; } if (gCurrentLevel == LEVEL_BOLSE) { - D_80177A98 = 1; + D_ctx_80177A98 = 1; } - if ((gCurrentLevel == LEVEL_MACBETH) && (D_80177CA0 == 0)) { + if ((gCurrentLevel == LEVEL_MACBETH) && (D_ctx_80177CA0 == 0)) { player->pos.z = -4115.0f; - D_80177D20 = player->unk_144 = 3932.0f; + D_ctx_80177D20 = player->unk_144 = 3932.0f; - D_80177DC8 = 40; - D_80178310 = SEGMENTED_TO_VIRTUAL(D_800CFDA0[gCurrentLevel]); - for (sp34 = D_80178310, i = 0; i < D_80177DC8; i++, sp34++) { + D_ctx_80177DC8 = 40; + D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_enmy_800CFDA0[gCurrentLevel]); + for (sp34 = D_ctx_80178310, i = 0; i < D_ctx_80177DC8; i++, sp34++) { Object_Load(sp34, 4000.0f, -4000.0f, 4000.0f, -4000.0f); } - func_i5_801ACFBC(); + Macbeth_801ACFBC(); } } if (player->state_1C8 == PLAYERSTATE_1C8_2) { @@ -4351,20 +4365,21 @@ void func_800B0F50(Player* playerx) { case LEVEL_SOLAR: break; } - } else if (!gVersusMode && (D_80177C90 != 0xFFFF) && ((gLevelMode != LEVELMODE_ALL_RANGE) || (D_8015F924 == 0))) { - AUDIO_PLAY_BGM(D_80177C90); + } else if (!gVersusMode && (D_ctx_80177C90 != 0xFFFF) && + ((gLevelMode != LEVELMODE_ALL_RANGE) || (D_360_8015F924 == 0))) { + AUDIO_PLAY_BGM(D_ctx_80177C90); } - D_80177840 = gBossHealthBar = D_80177850 = 0; + D_ctx_80177840 = gBossHealthBar = D_ctx_80177850 = 0; if ((gCurrentLevel == LEVEL_TRAINING)) { - D_80177824 = 1; + D_ctx_80177824 = 1; } - if (D_80177824 && !gVersusMode) { + if (D_ctx_80177824 && !gVersusMode) { for (j = 1; j < 6; j++) { - gTeamShields[j] = gSavedTeamShields[j] = D_80177C38[j] = D_801778F0[j] = 0xFF; + gTeamShields[j] = gSavedTeamShields[j] = D_ctx_80177C38[j] = D_ctx_801778F0[j] = 0xFF; } for (j = 0; j < 6; j++) { - D_80177CD0[j] = D_80177CF0[j] = 1; + D_ctx_80177CD0[j] = D_ctx_80177CF0[j] = 1; } gLaserStrength[gPlayerNum] = LASERS_SINGLE; gGoldRingCount[0] = D_80161A94[0] = gTotalHits = 0; @@ -4372,20 +4387,20 @@ void func_800B0F50(Player* playerx) { gBombCount[gPlayerNum] = 3; gGreatFoxIntact = true; if (gCamCount == (gPlayerNum + 1)) { - D_80161720[0] = 0.0f; - D_80161720[1] = 0.0f; - D_80161720[2] = 0.0f; - D_8016172C = 0; + D_hud_80161720[0] = 0.0f; + D_hud_80161720[1] = 0.0f; + D_hud_80161720[2] = 0.0f; + D_hud_8016172C = 0; gHitCount = 0; - D_80177824 = 0; + D_ctx_80177824 = 0; } } if ((gCurrentLevel == LEVEL_TRAINING)) { - D_80177824 = 1; + D_ctx_80177824 = 1; } player->sfx.levelType = gLevelType; player->sfx.form = player->form; - func_80057814(player); + func_display_80057814(player); if (!gVersusMode && (((gCurrentLevel != LEVEL_TITANIA) && (gCurrentLevel != LEVEL_SOLAR)) || gVersusMode || (player->state_1C8 != PLAYERSTATE_1C8_2))) { func_8001C8B8(gPlayerNum); @@ -4406,10 +4421,10 @@ void func_800B0F50(Player* playerx) { if (gLaserStrength[gPlayerNum] > LASERS_SINGLE) { player->wings.unk_14 = -10.0f; } - D_801779BC = 0; + D_ctx_801779BC = 0; } -void func_800B2130(Player* player) { +void func_play_800B2130(Player* player) { s32 temp_t6; s32 temp_t7; s32 temp_t8; @@ -4475,7 +4490,7 @@ void func_800B2130(Player* player) { } } -void func_800B22C0(Player* player) { +void func_play_800B22C0(Player* player) { f32 temp_fv0; f32 temp_fv0_2; s32* temp_v1; @@ -4540,7 +4555,7 @@ void func_800B22C0(Player* player) { player->unk_1DC = 0; } } else { - Math_SmoothStepToF(&D_801779A8[player->num], 30.0f, 1.0f, 30.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_801779A8[player->num], 30.0f, 1.0f, 30.0f, 0.0f); } if ((player->timer_1E8 >= 5) && (player->timer_498 == 0)) { if (player->unk_1EC > 0) { @@ -4551,13 +4566,13 @@ void func_800B22C0(Player* player) { } } if (gVersusMode) { - D_80177B00[player->num][0] = D_80177B00[player->num][1] = D_80177B00[player->num][2] = - D_80177B00[player->num][3] = 0; + D_ctx_80177B00[player->num][0] = D_ctx_80177B00[player->num][1] = D_ctx_80177B00[player->num][2] = + D_ctx_80177B00[player->num][3] = 0; } } } -void func_800B2574(Player* player) { +void func_play_800B2574(Player* player) { f32 sp2C; f32 sp28; s32 var; @@ -4583,7 +4598,7 @@ void func_800B2574(Player* player) { if (D_Timer_80177A88[gPlayerNum] != 0) { D_Timer_80177A88[gPlayerNum]--; } - if ((player->unk_4DC == 0) && (D_80177AB0 < 5)) { + if ((player->unk_4DC == 0) && (D_ctx_80177AB0 < 5)) { if (var >= -50) { D_Timer_80177A70[gPlayerNum] = 5; } @@ -4604,8 +4619,8 @@ void func_800B2574(Player* player) { if (player->timer_27C != 0) { player->timer_27C--; player->unk_2B4 = true; - if (D_80177E80 > 0) { - Math_SmoothStepToF(&D_801779A8[player->num], D_80177E80 * 10.0f, 1.0f, 5.0f, 0.0f); + if (D_ctx_80177E80 > 0) { + Math_SmoothStepToF(&D_ctx_801779A8[player->num], D_ctx_80177E80 * 10.0f, 1.0f, 5.0f, 0.0f); } player->unk_110 += 0.3f; Math_SmoothStepToF(&player->unk_08C, -130.0f, 0.2f, 10.0f, 0.0f); @@ -4635,7 +4650,7 @@ void func_800B2574(Player* player) { if ((gInputHold->button & gBoostButton[player->num]) && !(gInputHold->button & gBrakeButton[player->num]) && (player->state_1C8 != PLAYERSTATE_1C8_5) && !player->unk_2B4) { if (player->unk_2BC == 0.0f) { - func_800A5FA0(player->sfxSource, 0x09000002, player->num); + func_play_800A5FA0(player->sfxSource, 0x09000002, player->num); player->unk_194 = 5.0f; player->unk_190 = 5.0f; if (gBoostButton[player->num] & gInputPress->button) { @@ -4665,7 +4680,7 @@ void func_800B2574(Player* player) { } Math_SmoothStepToF(&player->unk_08C, -400.0f, 0.1f, 30.0f, 0.0f); player->sfx.boost = 1; - Math_SmoothStepToF(&D_801779A8[player->num], 50.0f, 1.0f, 10.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_801779A8[player->num], 50.0f, 1.0f, 10.0f, 0.0f); } else { if (player->unk_2BC > 0.0f) { player->unk_2BC -= sp2C; @@ -4684,11 +4699,11 @@ void func_800B2574(Player* player) { } } -void func_800B2BE0(Player* player) { - func_800B2574(player); +void func_play_800B2BE0(Player* player) { + func_play_800B2574(player); } -void func_800B2C00(Player* player) { +void func_play_800B2C00(Player* player) { f32 sp34; f32 sp30; s32 var; @@ -4711,7 +4726,7 @@ void func_800B2C00(Player* player) { if (var >= -50) { D_Timer_80177A00[gPlayerNum] = 5; } - if ((D_Timer_80177A00[gPlayerNum] > 0) && (D_Timer_80177A00[gPlayerNum] < 5) && (D_80177AB0 < 5) && + if ((D_Timer_80177A00[gPlayerNum] > 0) && (D_Timer_80177A00[gPlayerNum] < 5) && (D_ctx_80177AB0 < 5) && (D_Timer_80177A38[gPlayerNum] != 0)) { D_Timer_80177A00[gPlayerNum] = 0; D_Timer_80177A38[gPlayerNum] = 0; @@ -4723,13 +4738,13 @@ void func_800B2C00(Player* player) { player->unk_194 = 5.0f; player->unk_190 = 5.0f; if (gCurrentLevel == LEVEL_CORNERIA) { - D_80177B6C++; + D_ctx_80177B6C++; } } if ((gInputHold->button & gBrakeButton[player->num]) && !(gInputHold->button & gBoostButton[player->num]) && (player->state_1C8 != PLAYERSTATE_1C8_5) && !player->unk_2B4) { if (player->unk_2BC == 0.0f) { - func_800A5FA0(player->sfxSource, 0x09000003, player->num); + func_play_800A5FA0(player->sfxSource, 0x09000003, player->num); if ((gLevelMode == LEVELMODE_ALL_RANGE) && (gInputPress->button & gBrakeButton[player->num])) { D_Timer_80177A38[gPlayerNum] = 5; } @@ -4752,7 +4767,7 @@ void func_800B2C00(Player* player) { } Math_SmoothStepToF(&player->unk_08C, 180.0f, 0.1f, 10.0f, 0.0f); player->sfx.brake = 1; - Math_SmoothStepToF(&D_801779A8[player->num], 25.0f, 1.0f, 5.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_801779A8[player->num], 25.0f, 1.0f, 5.0f, 0.0f); } else if (player->unk_2BC > 0.0f) { player->unk_2BC -= sp34; if (player->unk_2BC <= 0.0f) { @@ -4769,7 +4784,7 @@ void func_800B2C00(Player* player) { Math_SmoothStepToF(&player->unk_08C, 0.0f, 0.1f, 5.0f, 0.0f); } -void func_800B3010(Player* player) { +void func_play_800B3010(Player* player) { f32 sp2C; if (!player->unk_2B8) { @@ -4787,9 +4802,9 @@ void func_800B3010(Player* player) { if (player->unk_2BC == 0.0f) { player->unk_194 = 4.0f; player->unk_190 = 4.0f; - func_800A5FA0(player->sfxSource, 0x09000002, player->num); + func_play_800A5FA0(player->sfxSource, 0x09000002, player->num); } - Math_SmoothStepToF(&D_801779A8[player->num], 30.0f, 1.0f, 10.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_801779A8[player->num], 30.0f, 1.0f, 10.0f, 0.0f); player->unk_190 = 2.0f; sp2C = 35.0f; player->unk_2B8 = true; @@ -4800,9 +4815,9 @@ void func_800B3010(Player* player) { } if ((gInputHold->button & gBrakeButton[player->num]) && !player->unk_2B4) { if (player->unk_2BC == 0.0f) { - func_800A5FA0(player->sfxSource, 0x09000003, player->num); + func_play_800A5FA0(player->sfxSource, 0x09000003, player->num); } - Math_SmoothStepToF(&D_801779A8[player->num], 20.0f, 1.0f, 10.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_801779A8[player->num], 20.0f, 1.0f, 10.0f, 0.0f); sp2C = 5.0f; player->unk_2B8 = true; Math_SmoothStepToF(&player->unk_2BC, 90.0f, 1.0f, 1.0f, 0.0f); @@ -4813,14 +4828,14 @@ void func_800B3010(Player* player) { Math_SmoothStepToF(&player->unk_0D0, sp2C, 0.1f, 2.0f, 0.001f); } -void func_800B3314(Player* player) { +void func_play_800B3314(Player* player) { f32 temp; f32 temp2; player->unk_0D4 = 3.0f; if ((gInputHold->button & Z_TRIG) && !player->unk_2B4) { if (player->unk_2BC == 0.0f) { - func_800A5FA0(player->sfxSource, 0x09000002, player->num); + func_play_800A5FA0(player->sfxSource, 0x09000002, player->num); } player->unk_188 = 0.0f; player->unk_12C += 4.0f; @@ -4848,7 +4863,7 @@ void func_800B3314(Player* player) { } if ((gInputHold->button & R_TRIG) && !player->unk_2B4) { if (player->unk_2BC == 0.0f) { - func_800A5FA0(player->sfxSource, 0x09000002, player->num); + func_play_800A5FA0(player->sfxSource, 0x09000002, player->num); } player->unk_188 = 0.0f; player->unk_12C -= 4.0f; @@ -4880,19 +4895,19 @@ void func_800B3314(Player* player) { Math_SmoothStepToF(&player->unk_000, temp * 0.5f, 0.05f, 5.0f, 0.00001f); Math_SmoothStepToF(&player->unk_110, 30.0f, 0.5f, 5.0f, 0.0f); player->unk_0D4 = -0.4f; - Math_SmoothStepToF(&D_801779A8[player->num], 30.0f, 1.0f, 10.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_801779A8[player->num], 30.0f, 1.0f, 10.0f, 0.0f); if ((gCamCount == 1) && !(gGameFrameCount & 1)) { - func_8007BC7C(RAND_FLOAT_CENTERED(20.0f) + player->pos.x, player->unk_068 + 10.0f, player->unk_138 - 10.0f, - RAND_FLOAT(2.0f) + 4.0f); + func_effect_8007BC7C(RAND_FLOAT_CENTERED(20.0f) + player->pos.x, player->unk_068 + 10.0f, + player->unk_138 - 10.0f, RAND_FLOAT(2.0f) + 4.0f); } } else if ((gCamCount == 1) && !(gGameFrameCount & 3) && (player->unk_1DC == 0)) { if ((player->unk_16C > 0.2f) && (player->timer_220 == 0)) { - func_8007BC7C(RAND_FLOAT_CENTERED(10.0f) + (player->pos.x - 57.0f), player->unk_068 + 10.0f, - player->unk_138 - 10.0f, RAND_FLOAT(2.0f) + 3.0f); + func_effect_8007BC7C(RAND_FLOAT_CENTERED(10.0f) + (player->pos.x - 57.0f), player->unk_068 + 10.0f, + player->unk_138 - 10.0f, RAND_FLOAT(2.0f) + 3.0f); } if ((player->unk_170 > 0.2f) && (player->timer_220 == 0)) { - func_8007BC7C(RAND_FLOAT_CENTERED(10.0f) + (player->pos.x + 57.0f), player->unk_068 + 10.0f, - player->unk_138 - 10.0f, RAND_FLOAT(2.0f) + 3.0f); + func_effect_8007BC7C(RAND_FLOAT_CENTERED(10.0f) + (player->pos.x + 57.0f), player->unk_068 + 10.0f, + player->unk_138 - 10.0f, RAND_FLOAT(2.0f) + 3.0f); } } } @@ -4901,7 +4916,7 @@ s32 D_800D3164[6] = { 1, 1, -1, 1, -1, 1, }; -void func_800B39E0(Player* player) { +void func_play_800B39E0(Player* player) { s32 i; player->unk_084 = 0.0f; @@ -4925,61 +4940,61 @@ void func_800B39E0(Player* player) { } if (gVersusMode) { for (i = 0; i < gCamCount; i++) { - if ((D_80177B00[player->num][i] != 0) && !(gControllerHold[i].button & A_BUTTON)) { - D_80177B00[player->num][i]--; + if ((D_ctx_80177B00[player->num][i] != 0) && !(gControllerHold[i].button & A_BUTTON)) { + D_ctx_80177B00[player->num][i]--; } } } - if (D_80177D40[player->num] != 0) { - D_80177D40[player->num]--; - if (D_80177D40[player->num] == 1000) { - D_80177D40[player->num] = 0; + if (D_ctx_80177D40[player->num] != 0) { + D_ctx_80177D40[player->num]--; + if (D_ctx_80177D40[player->num] == 1000) { + D_ctx_80177D40[player->num] = 0; } } - if (D_80177D58[player->num] != 0) { - D_80177D58[player->num]--; - if (D_80177D58[player->num] == 1000) { - D_80177D58[player->num] = 0; + if (D_ctx_80177D58[player->num] != 0) { + D_ctx_80177D58[player->num]--; + if (D_ctx_80177D58[player->num] == 1000) { + D_ctx_80177D58[player->num] = 0; } } - if (D_80177D88[player->num] != 0) { - D_80177D88[player->num]--; + if (D_ctx_80177D88[player->num] != 0) { + D_ctx_80177D88[player->num]--; } - if (D_80177D70[player->num] != 0) { - D_80177D70[player->num]--; + if (D_ctx_80177D70[player->num] != 0) { + D_ctx_80177D70[player->num]--; } - if (D_80177AE8[player->num] != 0) { - D_80177AE8[player->num]--; - Math_SmoothStepToF(&D_80177AB8[player->num], 128.0f, 1.0f, 40.0f, 0.01f); + if (D_ctx_80177AE8[player->num] != 0) { + D_ctx_80177AE8[player->num]--; + Math_SmoothStepToF(&D_ctx_80177AB8[player->num], 128.0f, 1.0f, 40.0f, 0.01f); } else { - Math_SmoothStepToF(&D_80177AB8[player->num], 0.0f, 1.0f, 10.0f, 0.01f); + Math_SmoothStepToF(&D_ctx_80177AB8[player->num], 0.0f, 1.0f, 10.0f, 0.01f); } - Math_SmoothStepToF(&D_80177AA0[player->num], 0.0f, 1.0f, 0.4f, 0.01f); + Math_SmoothStepToF(&D_ctx_80177AA0[player->num], 0.0f, 1.0f, 0.4f, 0.01f); if ((player->form == FORM_LANDMASTER) && (player->unk_1A0 != 0)) { player->unk_1A0--; } player->unk_200 = player->timer_224 & 1; if (player->timer_224 != 0) { - D_8017835C = 8; + D_ctx_8017835C = 8; } if (player->timer_224 == 19) { - D_80178340 = 128; - D_80178348 = 255; - D_80178350 = D_80178354 = 0; + D_ctx_80178340 = 128; + D_ctx_80178348 = 255; + D_ctx_80178350 = D_ctx_80178354 = 0; } if (player->timer_278 != 0) { if (!(player->timer_278 & 7)) { if (player->timer_278 & 8) { - D_80177DB8[gPlayerNum]++; + D_ctx_80177DB8[gPlayerNum]++; } else { - D_80177DB8[gPlayerNum]--; + D_ctx_80177DB8[gPlayerNum]--; } } player->timer_278--; } if (player->unk_1F4 > 0) { if (player->unk_1F4 > 3) { - *D_80177984 = 1; + *D_ctx_80177984 = 1; } player->unk_1F4--; if (player->form == FORM_ARWING) { @@ -5019,7 +5034,7 @@ void func_800B39E0(Player* player) { } } -void func_800B40AC(Player* player) { +void func_play_800B40AC(Player* player) { if (player->damage > 0) { player->damage -= 2; if (player->damage <= 0) { @@ -5046,10 +5061,10 @@ void func_800B40AC(Player* player) { } } -void func_800B415C(Player* player) { +void func_play_800B415C(Player* player) { s32 var_v0; - func_800B40AC(player); + func_play_800B40AC(player); if (player->shields < 0x80) { if (player->shields > 0x50) { @@ -5060,15 +5075,15 @@ void func_800B415C(Player* player) { var_v0 = 0xF; } if (!(gGameFrameCount & var_v0)) { - func_80060F30(player->sfxSource, 0x49001026, player->num); + func_enmy_80060F30(player->sfxSource, 0x49001026, player->num); } } } -void func_800B41E0(Player* player) { +void func_play_800B41E0(Player* player) { } -void func_800B41EC(Player* player) { +void func_play_800B41EC(Player* player) { player->state_1C8 = PLAYERSTATE_1C8_4; if (!gVersusMode) { SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1); @@ -5079,16 +5094,16 @@ void func_800B41EC(Player* player) { Audio_KillSfxById(0x4100C023); } func_8001CA24(player->num); - func_800A5FA0(player->sfxSource, 0x0900C010, player->num); + func_play_800A5FA0(player->sfxSource, 0x0900C010, player->num); player->shields = 0; player->unk_1D0 = 0; player->unk_1F4 = 0; player->timer_220 = 0; player->unk_134 = 0.0f; - D_80161A2C = 0; + D_game_80161A2C = 0; } -void func_800B42B0(Player* player) { +void func_play_800B42B0(Player* player) { switch (player->form) { case FORM_ARWING: if (player->timer_1F8 != 0) { @@ -5098,25 +5113,25 @@ void func_800B42B0(Player* player) { gInputHold->button = gBoostButton[player->num]; player->unk_2BC = 1.0f; } - func_800ADA28(player); - func_800B2574(player); - func_800B2C00(player); - func_800B41E0(player); - func_800B2130(player); + func_play_800ADA28(player); + func_play_800B2574(player); + func_play_800B2C00(player); + func_play_800B41E0(player); + func_play_800B2130(player); if (player->unk_4DC != 0) { - func_800AECAC(player); + func_play_800AECAC(player); } else { - func_800AF07C(player); + func_play_800AF07C(player); } - func_800ADF58(player); - func_800AD7F0(player); - func_800A8BA4(player); - func_800A46A0(player); - func_800A4C40(player); - func_800AA800(player); - func_800B415C(player); + func_play_800ADF58(player); + func_play_800AD7F0(player); + func_play_800A8BA4(player); + func_play_800A46A0(player); + func_play_800A4C40(player); + func_play_800AA800(player); + func_play_800B415C(player); if ((player->shields <= 0) && (player->timer_220 != 0)) { - func_800B41EC(player); + func_play_800B41EC(player); player->vel.x *= 0.2f; player->vel.y = 5.0f; player->unk_0E4 = player->unk_0E8 = 0.0f; @@ -5129,45 +5144,45 @@ void func_800B42B0(Player* player) { } break; case FORM_LANDMASTER: - func_80047504(player); + func_tank_80047504(player); break; case FORM_BLUE_MARINE: - func_i3_801ACE50(player); - func_i3_801AD328(player); - func_800B41E0(player); - func_i3_801AACF8(player); - func_800ADF58(player); - func_i3_801AC274(player); - func_800A8BA4(player); - func_800AA800(player); - func_800B415C(player); + Aquas_801ACE50(player); + Aquas_801AD328(player); + func_play_800B41E0(player); + Aquas_801AACF8(player); + func_play_800ADF58(player); + Aquas_801AC274(player); + func_play_800A8BA4(player); + func_play_800AA800(player); + func_play_800B415C(player); if ((player->shields <= 0) && (player->timer_220 != 0)) { - func_800B41EC(player); + func_play_800B41EC(player); } break; } } -void func_800B44C4(Player* player) { +void func_play_800B44C4(Player* player) { switch (player->form) { case FORM_ARWING: - func_800ADA28(player); - func_800B2574(player); - func_800B2C00(player); - func_800B41E0(player); - func_800B2130(player); + func_play_800ADA28(player); + func_play_800B2574(player); + func_play_800B2C00(player); + func_play_800B41E0(player); + func_play_800B2130(player); if (player->unk_4DC != 0) { - func_800AECAC(player); + func_play_800AECAC(player); } else { - func_800AE4A4(player); + func_play_800AE4A4(player); } - func_800AD7F0(player); - func_800A8BA4(player); - func_800A4C40(player); - func_800AA800(player); - func_800B415C(player); + func_play_800AD7F0(player); + func_play_800A8BA4(player); + func_play_800A4C40(player); + func_play_800AA800(player); + func_play_800B415C(player); if ((player->shields <= 0) && (player->timer_220 != 0)) { - func_800B41EC(player); + func_play_800B41EC(player); player->vel.y = 5.0f; if (gLevelType == LEVELTYPE_SPACE) { player->vel.y = 0.0f; @@ -5184,44 +5199,44 @@ void func_800B44C4(Player* player) { } break; case FORM_LANDMASTER: - func_800ADD98(player); - func_800B3314(player); - func_800B3010(player); - func_800B41E0(player); - func_800B22C0(player); - func_800AF928(player); - func_800AD7F0(player); - func_800A8BA4(player); - func_800AA800(player); - func_800B415C(player); + func_play_800ADD98(player); + func_play_800B3314(player); + func_play_800B3010(player); + func_play_800B41E0(player); + func_play_800B22C0(player); + func_play_800AF928(player); + func_play_800AD7F0(player); + func_play_800A8BA4(player); + func_play_800AA800(player); + func_play_800B415C(player); if ((player->shields <= 0) && (player->timer_220 != 0)) { - func_800B41EC(player); + func_play_800B41EC(player); } break; case FORM_BLUE_MARINE: - func_i3_801BEC80(player); + Aquas_801BEC80(player); break; case FORM_ON_FOOT: - func_800B00C0(player); - func_800B0194(player); - func_800AD7F0(player); - func_800A8BA4(player); - func_800AA800(player); - func_800B415C(player); + func_play_800B00C0(player); + func_play_800B0194(player); + func_play_800AD7F0(player); + func_play_800A8BA4(player); + func_play_800AA800(player); + func_play_800B415C(player); if ((player->shields <= 0) && (player->timer_220 != 0)) { - func_800B41EC(player); + func_play_800B41EC(player); } break; } } -void func_800B46F8(Player* player) { +void func_play_800B46F8(Player* player) { s32 teamId; - if ((player->state_1C8 == PLAYERSTATE_1C8_3) && (D_8017796C >= 0)) { - D_8017796C++; - if (D_8017796C > 960) { - D_8017796C = 0; + if ((player->state_1C8 == PLAYERSTATE_1C8_3) && (D_ctx_8017796C >= 0)) { + D_ctx_8017796C++; + if (D_ctx_8017796C > 960) { + D_ctx_8017796C = 0; if (1) {} if ((player->shields < 0x40) && ((gTeamShields[1] > 0) || (gTeamShields[3] > 0) || (gTeamShields[2] > 0))) { do { @@ -5258,7 +5273,7 @@ void func_800B46F8(Player* player) { } // lots of fakery -void func_800B48BC(Player* player) { +void func_play_800B48BC(Player* player) { f32 sp1CC; f32 sp1C8; s32 sp1C4; @@ -5269,27 +5284,27 @@ void func_800B48BC(Player* player) { if (gVersusMode) { gInputHold = &gControllerHold[player->num]; gInputPress = &gControllerPress[player->num]; - D_80177984 = &D_80137E84[player->num]; + D_ctx_80177984 = &D_80137E84[player->num]; } else { gInputHold = &gControllerHold[gMainController]; gInputPress = &gControllerPress[gMainController]; - D_80177984 = &D_80137E84[gMainController]; + D_ctx_80177984 = &D_80137E84[gMainController]; } - D_80177990[player->num] += (s32) D_801779A8[player->num]; - Math_SmoothStepToF(&D_801779A8[player->num], 0.0f, 1.0f, 1.5f, 0.0f); - if (D_80177990[player->num] >= 100) { - D_80177990[player->num] -= 100; - *D_80177984 = 1; + D_ctx_80177990[player->num] += (s32) D_ctx_801779A8[player->num]; + Math_SmoothStepToF(&D_ctx_801779A8[player->num], 0.0f, 1.0f, 1.5f, 0.0f); + if (D_ctx_80177990[player->num] >= 100) { + D_ctx_80177990[player->num] -= 100; + *D_ctx_80177984 = 1; } if (D_Timer_80177BD0[player->num] != 0) { D_Timer_80177BD0[player->num]--; if (!(gGameFrameCount & 1)) { - *D_80177984 = 1; + *D_ctx_80177984 = 1; } } if (player->state_1C8 >= PLAYERSTATE_1C8_2) { - func_800B39E0(player); + func_play_800B39E0(player); } player->unk_228 = 0; if ((player->state_1C8 >= PLAYERSTATE_1C8_2) && (player->form == FORM_ARWING) && !gVersusMode) { @@ -5314,26 +5329,27 @@ void func_800B48BC(Player* player) { switch (player->state_1C8) { case PLAYERSTATE_1C8_0: player->unk_234 = 0; - D_80161A2C = 0; - D_801779BC = 0; + D_game_80161A2C = 0; + D_ctx_801779BC = 0; break; case PLAYERSTATE_1C8_1: - func_800B0F50(player); - D_80178358 = 0; - D_801779BC = 0; + func_play_800B0F50(player); + D_ctx_80178358 = 0; + D_ctx_801779BC = 0; break; case PLAYERSTATE_1C8_2: - D_80161A2C = 0; - D_801779BC = 0; + D_game_80161A2C = 0; + D_ctx_801779BC = 0; player->wings.unk_2C = 1; - func_8004A52C(player); + func_demo_8004A52C(player); break; case PLAYERSTATE_1C8_3: - D_80161A2C = 1; - func_800B46F8(player); + D_game_80161A2C = 1; + func_play_800B46F8(player); player->wings.unk_2C = 0; - D_80161704 = 0xFF; - if ((!gVersusMode || (D_80177E7C != 0)) && (player->unk_4DC == 0) && (gInputPress->button & U_CBUTTONS) && + D_hud_80161704 = 0xFF; + if ((!gVersusMode || (D_ctx_80177E7C != 0)) && (player->unk_4DC == 0) && + (gInputPress->button & U_CBUTTONS) && ((player->form == FORM_ARWING) || (gVersusMode && (player->form == FORM_LANDMASTER)))) { if (player->unk_238 = 1 - player->unk_238) { AUDIO_PLAY_SFX(0x4900002C, gDefaultSfxSource, 4); @@ -5347,15 +5363,15 @@ void func_800B48BC(Player* player) { } switch (gLevelMode) { case LEVELMODE_ON_RAILS: - D_80178488 = true; - func_800B42B0(player); + D_ctx_80178488 = true; + func_play_800B42B0(player); player->unk_234 = 1; break; case LEVELMODE_ALL_RANGE: if (!gVersusMode) { - func_800B44C4(player); + func_play_800B44C4(player); player->unk_234 = 1; - } else if (D_80177E7C != 0) { + } else if (D_ctx_80177E7C != 0) { if (gPlayerInactive[player->num] == true) { do { sp1C4 = RAND_INT(3.9f); @@ -5363,133 +5379,133 @@ void func_800B48BC(Player* player) { player->unk_288 = sp1C4 + 1; player->state_1C8 = PLAYERSTATE_1C8_13; player->unk_1D0 = 0; - func_800B5FBC(player, player->unk_288 - 1, 1); + func_play_800B5FBC(player, player->unk_288 - 1, 1); } else { - if (D_80177E7C == 1) { - D_80177E7C += 1; + if (D_ctx_80177E7C == 1) { + D_ctx_80177E7C += 1; for (i = 0; i < 4; i++) { - func_800A5FA0(gPlayer[i].sfxSource, 0x09000002, gPlayer[i].num); + func_play_800A5FA0(gPlayer[i].sfxSource, 0x09000002, gPlayer[i].num); gPlayer[i].unk_190 = gPlayer[i].unk_194 = 5.0f; } } - func_800B44C4(player); + func_play_800B44C4(player); player->unk_234 = 1; } } else { gInputPress->stick_x = gInputPress->stick_y = 0; - D_80177844 = 0; - D_801779BC = 0; + D_ctx_80177844 = 0; + D_ctx_801779BC = 0; } break; case LEVELMODE_UNK_2: - D_80178488 = true; - func_i6_801A5AD4(player); - func_800A8BA4(player); + D_ctx_80178488 = true; + Turret_801A5AD4(player); + func_play_800A8BA4(player); break; } break; case PLAYERSTATE_1C8_4: - func_8004E3D8(player); + func_demo_8004E3D8(player); break; case PLAYERSTATE_1C8_5: if (gVersusMode) { - D_80177B00[player->num][0] = D_80177B00[player->num][1] = D_80177B00[player->num][2] = - D_80177B00[player->num][3] = 0; + D_ctx_80177B00[player->num][0] = D_ctx_80177B00[player->num][1] = D_ctx_80177B00[player->num][2] = + D_ctx_80177B00[player->num][3] = 0; } player->wings.unk_2C = 1; Math_SmoothStepToF(&player->wings.unk_04, 0.0f, 0.1f, 5.0f, 0); Math_SmoothStepToF(&player->wings.unk_08, 0.0f, 0.1f, 5.0f, 0); Math_SmoothStepToF(&player->wings.unk_0C, 0.0f, 0.1f, 5.0f, 0); Math_SmoothStepToF(&player->wings.unk_10, 0.0f, 0.1f, 5.0f, 0); - func_800B40AC(player); - func_8004CCC0(player); + func_play_800B40AC(player); + func_demo_8004CCC0(player); if (gCurrentLevel == LEVEL_KATINA) { - func_800A8BA4(player); + func_play_800A8BA4(player); } else { - func_800A887C(player); - func_800A86E4(player); + func_play_800A887C(player); + func_play_800A86E4(player); } break; case PLAYERSTATE_1C8_7: player->unk_238 = 0; - D_801779BC = 0; - func_800B40AC(player); - func_8004C930(player); - func_800A4C40(player); - D_80161A2C = gChargeTimers[player->num] = 0; + D_ctx_801779BC = 0; + func_play_800B40AC(player); + func_demo_8004C930(player); + func_play_800A4C40(player); + D_game_80161A2C = gChargeTimers[player->num] = 0; break; case PLAYERSTATE_1C8_8: - D_801779BC = 0; - func_800B40AC(player); - func_80049C0C(player); - D_80161A2C = 0; + D_ctx_801779BC = 0; + func_play_800B40AC(player); + func_demo_80049C0C(player); + D_game_80161A2C = 0; break; case PLAYERSTATE_1C8_9: - D_801779BC = 0; - func_800B40AC(player); - func_8004AAF4(player); - func_800B2130(player); - gChargeTimers[player->num] = player->unk_238 = D_80161A2C = 0; + D_ctx_801779BC = 0; + func_play_800B40AC(player); + func_demo_8004AAF4(player); + func_play_800B2130(player); + gChargeTimers[player->num] = player->unk_238 = D_game_80161A2C = 0; break; case PLAYERSTATE_1C8_10: - D_801779BC = 0; - func_8002E700(player); - D_80161A2C = 0; + D_ctx_801779BC = 0; + func_360_8002E700(player); + D_game_80161A2C = 0; break; case PLAYERSTATE_1C8_11: - func_i6_8018C390(player); - func_800B40AC(player); + Andross_8018C390(player); + func_play_800B40AC(player); break; case PLAYERSTATE_1C8_12: break; case PLAYERSTATE_1C8_13: player->unk_234 = 0; if (gPlayerInactive[player->num] == true) { - func_800B5FBC(player, player->unk_288 - 1, 0); - } else if ((D_80177E74 == 0) && (player->unk_1D0 != 0)) { + func_play_800B5FBC(player, player->unk_288 - 1, 0); + } else if ((D_ctx_80177E74 == 0) && (player->unk_1D0 != 0)) { player->unk_1D0 = 0; - func_800AB304(player); - func_800B0F50(player); - func_800B44C4(player); - func_800B7184(player, 1); - func_800A5FA0(player->sfxSource, 0x09000002, player->num); + func_play_800AB304(player); + func_play_800B0F50(player); + func_play_800B44C4(player); + func_play_800B7184(player, 1); + func_play_800A5FA0(player->sfxSource, 0x09000002, player->num); player->unk_190 = player->unk_194 = 5.0f; } else if (player->unk_288 >= 0) { if (player->unk_288 == 0) { player->unk_288 = 1; } - func_800B5FBC(player, player->unk_288 - 1, 0); + func_play_800B5FBC(player, player->unk_288 - 1, 0); } break; case PLAYERSTATE_1C8_6: - D_80161A2C = 0; + D_game_80161A2C = 0; if (!gVersusMode) { - D_801779BC = 0; + D_ctx_801779BC = 0; } player->unk_234 = 0; player->vel.z = player->vel.x = player->vel.y = player->unk_0D8.x = player->unk_0D8.y = 0.0f; - if ((gLevelMode == LEVELMODE_ALL_RANGE) && (D_8017837C == 7)) { + if ((gLevelMode == LEVELMODE_ALL_RANGE) && (D_ctx_8017837C == 7)) { player->camEye.x += 1.0f; player->camEye.z += 1.5f; } if ((gCurrentLevel == LEVEL_ZONESS) || (gCurrentLevel == LEVEL_SOLAR)) { Math_SmoothStepToF(&player->camEye.y, 500.0f, 0.05f, 10.0f, 0.0f); - Math_SmoothStepToF(&player->camEye.z, player->unk_138 + D_80177D20 + 500.0f, 0.05f, 20.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.z, player->unk_138 + D_ctx_80177D20 + 500.0f, 0.05f, 20.0f, 0.0f); } if (player->timer_1F8 == 0) { if (gCamCount == 4) { player->state_1C8 = PLAYERSTATE_1C8_13; player->timer_1F8 = 200; } else { - D_80178348 = D_80178350 = D_80178354 = 0; - D_80178358 = 0xFF; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; + D_ctx_80178358 = 0xFF; } - if (D_80178340 == 0xFF) { - func_800A6148(); - D_80177D20 = gPlayer[0].unk_144 = 0.0f; - D_80178380[0] = 0; - D_8015F93C = gRadioState = 0; + if (D_ctx_80178340 == 0xFF) { + func_play_800A6148(); + D_ctx_80177D20 = gPlayer[0].unk_144 = 0.0f; + D_ctx_80178380[0] = 0; + D_360_8015F93C = gRadioState = 0; Audio_ClearVoice(); Audio_SetBaseSfxReverb(0); D_80161A94[0] = gGoldRingCount[0]; @@ -5499,36 +5515,36 @@ void func_800B48BC(Player* player) { if (1) {} if (1) {} if (1) {} - D_80177C94 = gGoldRingCount[0]; + D_ctx_80177C94 = gGoldRingCount[0]; } - if (D_8017837C != 4) { - if (D_8017837C != 7) { + if (D_ctx_8017837C != 4) { + if (D_ctx_8017837C != 7) { gDrawMode = DRAWMODE_0; } else if (gCurrentLevel == LEVEL_TRAINING) { gGameState = GSTATE_MENU; D_Timer_8017783C = 2; gOptionMenuStatus = OPTION_WAIT; gDrawMode = DRAWMODE_0; - D_80161A34 = 7; - D_80178410 = 0; + D_game_80161A34 = 7; + D_ctx_80178410 = 0; } else { if ((gCurrentLevel == LEVEL_SECTOR_X) || (gCurrentLevel == LEVEL_METEO)) { - D_8017827C = 0; + D_ctx_8017827C = 0; } if (gLifeCount[gPlayerNum] < 0) { gNextGameState = GSTATE_GAME_OVER; D_80161A94[0] = 0; } else { - D_80177854 = 1; + D_ctx_80177854 = 1; } gBombCount[gPlayerNum] = 3; gLaserStrength[gPlayerNum] = LASERS_SINGLE; - D_80178488 = true; + D_ctx_80178488 = true; gDrawMode = DRAWMODE_0; } } else { gNextGameState = GSTATE_MAP; - D_80161A34 = 7; + D_game_80161A34 = 7; gDrawMode = DRAWMODE_0; } if (1) {} @@ -5538,10 +5554,10 @@ void func_800B48BC(Player* player) { default: break; } - if ((D_80177C70 == 0) && (player->form == FORM_ARWING)) { + if ((D_ctx_80177C70 == 0) && (player->form == FORM_ARWING)) { sp1CC = 0.77699995f; sp1C8 = 1100.0f; - } else if (D_80177C70 == 2) { + } else if (D_ctx_80177C70 == 2) { sp1CC = 0.77699995f; sp1C8 = 1100.0f; } else { @@ -5565,7 +5581,7 @@ void func_800B48BC(Player* player) { } } -void func_800B56BC(Player* player) { +void func_play_800B56BC(Player* player) { f32 var_fv1; f32 var_fv0; f32 temp; @@ -5609,9 +5625,9 @@ void func_800B56BC(Player* player) { gCsCamEyeX += player->unk_0AC; gCsCamAtX += player->unk_0AC; gCsCamEyeY += player->unk_0B0 + D_800D2F58; - gCsCamAtZ = (player->unk_138 + D_80177D20) - 1.0f; + gCsCamAtZ = (player->unk_138 + D_ctx_80177D20) - 1.0f; gCsCamEyeZ = 400.0f + D_800D2F58; - if (D_80177C70 == 2) { + if (D_ctx_80177C70 == 2) { gCsCamEyeZ -= 50.0f; } if (player->unk_4DC != 0) { @@ -5638,7 +5654,7 @@ void func_800B56BC(Player* player) { } } -void func_800B5D30(Player* player, s32 arg1) { +void func_play_800B5D30(Player* player, s32 arg1) { Vec3f sp4C; Vec3f sp40; s32 pad; @@ -5653,10 +5669,10 @@ void func_800B5D30(Player* player, s32 arg1) { Matrix_MultVec3f(gCalcMatrix, &sp4C, &sp40); gCsCamEyeX = player->pos.x; gCsCamEyeY = player->pos.y + player->unk_080; - gCsCamEyeZ = player->unk_138 + D_80177D20; + gCsCamEyeZ = player->unk_138 + D_ctx_80177D20; gCsCamAtX = player->pos.x + sp40.x; gCsCamAtY = player->pos.y + player->unk_080 + sp40.y; - gCsCamAtZ = player->unk_138 + D_80177D20 + sp40.z; + gCsCamAtZ = player->unk_138 + D_ctx_80177D20 + sp40.z; Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, player->unk_014, 100.0f, 0.0f); Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, player->unk_014, 100.0f, 0.0f); Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, player->unk_014, 50.0f, 0.0f); @@ -5675,7 +5691,7 @@ void func_800B5D30(Player* player, s32 arg1) { } } -void func_800B5FBC(Player* player, s32 playerNum, bool arg2) { +void func_play_800B5FBC(Player* player, s32 playerNum, bool arg2) { u8 i; u8 var_v0; Vec3f sp58; @@ -5742,7 +5758,7 @@ void func_800B5FBC(Player* player, s32 playerNum, bool arg2) { Math_SmoothStepToF(&player->unk_034, 0.0f, 0.05f, 5.0f, 0.00001f); } -void func_800B63BC(Player* player, s32 arg1) { +void func_play_800B63BC(Player* player, s32 arg1) { Vec3f sp74; Vec3f sp68; f32 temp1; @@ -5820,7 +5836,7 @@ void func_800B63BC(Player* player, s32 arg1) { } } -void func_800B6848(Player* player, s32 arg1) { +void func_play_800B6848(Player* player, s32 arg1) { Vec3f sp54; Vec3f sp48; f32 sp44; @@ -5872,7 +5888,7 @@ void func_800B6848(Player* player, s32 arg1) { } } -void func_800B6BFC(Player* player, s32 arg1) { +void func_play_800B6BFC(Player* player, s32 arg1) { Vec3f sp64; Vec3f sp58; Vec3f sp4C; @@ -5917,7 +5933,7 @@ void func_800B6BFC(Player* player, s32 arg1) { } } -void func_800B6F50(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5) { +void func_play_800B6F50(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5) { f32 sp34; f32 sp30; f32 sp2C; @@ -5938,63 +5954,63 @@ void func_800B6F50(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5) { if (gCurrentLevel == LEVEL_UNK_15) { var_ft5 = gPlayer[0].camEye.y * 0.03f; } - sp30 = (2.0f * (-sp2C * (-8.0f / 3.0f * M_RTOD))) + 3000.0f + D_80178430 + var_ft5; - sp34 = (2.0f * (sp28 * (-8.0f / 3.0f * M_RTOD))) + 3000.0f + D_8017842C; - sp20 = D_80178420; - D_80178420 = Math_ModF(sp34, 480.0f); - D_80178424 = Math_ModF(sp30, 360.0f); + sp30 = (2.0f * (-sp2C * (-8.0f / 3.0f * M_RTOD))) + 3000.0f + D_ctx_80178430 + var_ft5; + sp34 = (2.0f * (sp28 * (-8.0f / 3.0f * M_RTOD))) + 3000.0f + D_ctx_8017842C; + sp20 = D_ctx_80178420; + D_ctx_80178420 = Math_ModF(sp34, 480.0f); + D_ctx_80178424 = Math_ModF(sp30, 360.0f); if ((gGameState == GSTATE_PLAY) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_2) && (gCurrentLevel == LEVEL_METEO)) { - if (fabsf(D_80178420 - sp20) < 50.0f) { - D_8015F96C = 0.0f; - if (fabsf(D_80178420 - sp20) > 3.0f) { - D_8015F96C = fabsf(D_80178420 - sp20 - 3.0f) * 0.5f; + if (fabsf(D_ctx_80178420 - sp20) < 50.0f) { + D_bg_8015F96C = 0.0f; + if (fabsf(D_ctx_80178420 - sp20) > 3.0f) { + D_bg_8015F96C = fabsf(D_ctx_80178420 - sp20 - 3.0f) * 0.5f; } } } } -void func_800B7184(Player* player, s32 arg1) { +void func_play_800B7184(Player* player, s32 arg1) { switch (player->form) { case FORM_ON_FOOT: - func_800B6BFC(player, arg1); + func_play_800B6BFC(player, arg1); break; case FORM_LANDMASTER: - func_800B6848(player, arg1); + func_play_800B6848(player, arg1); break; case FORM_ARWING: - func_800B63BC(player, arg1); + func_play_800B63BC(player, arg1); break; } } -void func_800B71E4(Player* player) { +void func_play_800B71E4(Player* player) { switch (player->state_1C8) { case PLAYERSTATE_1C8_3: switch (gLevelMode) { case LEVELMODE_ON_RAILS: if (player->form == FORM_ARWING) { if (player->unk_238 == 0) { - func_800B56BC(player); + func_play_800B56BC(player); } else { - func_800B5D30(player, 0); + func_play_800B5D30(player, 0); } } else if (player->form == FORM_LANDMASTER) { - func_80043468(player); + func_tank_80043468(player); } else if (player->form == FORM_BLUE_MARINE) { - func_i3_801AA8E8(player); + Aquas_801AA8E8(player); } break; case LEVELMODE_ALL_RANGE: - func_800B7184(player, 0); + func_play_800B7184(player, 0); break; case LEVELMODE_UNK_2: - func_i6_801A5FC0(player); + Turret_801A5FC0(player); break; } break; case PLAYERSTATE_1C8_5: player->unk_034 -= player->unk_034 * 0.1f; - func_800B7184(player, 0); + func_play_800B7184(player, 0); break; case PLAYERSTATE_1C8_4: if ((gLevelMode == LEVELMODE_ON_RAILS) && (player->form == FORM_ARWING)) { @@ -6006,7 +6022,7 @@ void func_800B71E4(Player* player) { } player->camAt.x += (player->pos.x - player->camAt.x) * 0.1f; player->camAt.y += (player->pos.y - player->camAt.y) * 0.1f; - player->camAt.z = player->unk_138 + D_80177D20 - 1.0f; + player->camAt.z = player->unk_138 + D_ctx_80177D20 - 1.0f; } break; case PLAYERSTATE_1C8_6: @@ -6015,76 +6031,76 @@ void func_800B71E4(Player* player) { } } -void func_800B73E0(Player* player) { +void func_play_800B73E0(Player* player) { Vec3f sp44; Vec3f sp38; f32 pad; if ((gCurrentLevel == LEVEL_AQUAS) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_2)) { - D_801784D4 = D_801784C8 = D_801784C8 = D_801784FC = D_801784C8 = 110.0f; + D_ctx_801784D4 = D_ctx_801784C8 = D_ctx_801784C8 = D_ctx_801784FC = D_ctx_801784C8 = 110.0f; if (gGameFrameCount & 0x20) { - D_801784D4 = D_801784C8 = D_801784C8 = D_801784FC = D_801784C8 = 90.0f; + D_ctx_801784D4 = D_ctx_801784C8 = D_ctx_801784C8 = D_ctx_801784FC = D_ctx_801784C8 = 90.0f; } - D_801784E8 = D_80178510 = D_80178538 = 1.0f; + D_ctx_801784E8 = D_ctx_80178510 = D_ctx_80178538 = 1.0f; } - Math_SmoothStepToAngle(&D_801784B8, D_801784C4, 1.0f, D_801784E8, 0.0f); - Math_SmoothStepToAngle(&D_801784BC, D_801784C8, 1.0f, D_801784E8, 0.0f); - Math_SmoothStepToAngle(&D_801784C0, D_801784CC, 1.0f, D_801784E8, 0.0f); + Math_SmoothStepToAngle(&D_ctx_801784B8, D_ctx_801784C4, 1.0f, D_ctx_801784E8, 0.0f); + Math_SmoothStepToAngle(&D_ctx_801784BC, D_ctx_801784C8, 1.0f, D_ctx_801784E8, 0.0f); + Math_SmoothStepToAngle(&D_ctx_801784C0, D_ctx_801784CC, 1.0f, D_ctx_801784E8, 0.0f); - if (gLight2R < D_80178570) { - gLight2R += D_80178540; - if (D_80178570 < gLight2R) { - gLight2R = D_80178570; + if (gLight2R < D_ctx_80178570) { + gLight2R += D_ctx_80178540; + if (D_ctx_80178570 < gLight2R) { + gLight2R = D_ctx_80178570; } } - if (D_80178570 < gLight2R) { - gLight2R -= D_80178540; - if (gLight2R < D_80178570) { - gLight2R = D_80178570; + if (D_ctx_80178570 < gLight2R) { + gLight2R -= D_ctx_80178540; + if (gLight2R < D_ctx_80178570) { + gLight2R = D_ctx_80178570; } } - if (gLight2G < D_80178574) { - gLight2G += D_80178540; - if (D_80178574 < gLight2G) { - gLight2G = D_80178574; + if (gLight2G < D_ctx_80178574) { + gLight2G += D_ctx_80178540; + if (D_ctx_80178574 < gLight2G) { + gLight2G = D_ctx_80178574; } } - if (D_80178574 < gLight2G) { - gLight2G -= D_80178540; - if (gLight2G < D_80178574) { - gLight2G = D_80178574; + if (D_ctx_80178574 < gLight2G) { + gLight2G -= D_ctx_80178540; + if (gLight2G < D_ctx_80178574) { + gLight2G = D_ctx_80178574; } } - if (gLight2B < D_80178578) { - gLight2B += D_80178540; - if (D_80178578 < gLight2B) { - gLight2B = D_80178578; + if (gLight2B < D_ctx_80178578) { + gLight2B += D_ctx_80178540; + if (D_ctx_80178578 < gLight2B) { + gLight2B = D_ctx_80178578; } } - if (D_80178578 < gLight2B) { - gLight2B -= D_80178540; - if (gLight2B < D_80178578) { - gLight2B = D_80178578; + if (D_ctx_80178578 < gLight2B) { + gLight2B -= D_ctx_80178540; + if (gLight2B < D_ctx_80178578) { + gLight2B = D_ctx_80178578; } } - Math_SmoothStepToAngle(&D_801784EC, D_801784F8, 1.0f, D_80178510, 0.0f); - Math_SmoothStepToAngle(&D_801784F0, D_801784FC, 1.0f, D_80178510, 0.0f); - Math_SmoothStepToAngle(&D_801784F4, D_80178500, 1.0f, D_80178510, 0.0f); - D_801784F8 = D_801784C4 = D_801784D0; - D_801784FC = D_801784C8 = D_801784D4; - D_80178500 = D_801784CC = D_801784D8; - D_801784E8 = 5.0f; - D_80178570 = gLight1R; - D_80178574 = gLight1G; - D_80178578 = gLight1B; + Math_SmoothStepToAngle(&D_ctx_801784EC, D_ctx_801784F8, 1.0f, D_ctx_80178510, 0.0f); + Math_SmoothStepToAngle(&D_ctx_801784F0, D_ctx_801784FC, 1.0f, D_ctx_80178510, 0.0f); + Math_SmoothStepToAngle(&D_ctx_801784F4, D_ctx_80178500, 1.0f, D_ctx_80178510, 0.0f); + D_ctx_801784F8 = D_ctx_801784C4 = D_ctx_801784D0; + D_ctx_801784FC = D_ctx_801784C8 = D_ctx_801784D4; + D_ctx_80178500 = D_ctx_801784CC = D_ctx_801784D8; + D_ctx_801784E8 = 5.0f; + D_ctx_80178570 = gLight1R; + D_ctx_80178574 = gLight1G; + D_ctx_80178578 = gLight1B; pad = player->unk_034; Matrix_RotateZ(gCalcMatrix, M_DTOR * pad, 0); Matrix_RotateX(gCalcMatrix, -player->unk_05C, 1); Matrix_RotateY(gCalcMatrix, player->unk_058, 1); Matrix_Push(&gCalcMatrix); - Matrix_RotateX(gCalcMatrix, M_DTOR * D_801784B8, 1); - Matrix_RotateY(gCalcMatrix, M_DTOR * D_801784BC, 1); - Matrix_RotateZ(gCalcMatrix, M_DTOR * D_801784C0, 1); + Matrix_RotateX(gCalcMatrix, M_DTOR * D_ctx_801784B8, 1); + Matrix_RotateY(gCalcMatrix, M_DTOR * D_ctx_801784BC, 1); + Matrix_RotateZ(gCalcMatrix, M_DTOR * D_ctx_801784C0, 1); sp44.x = 0.0f; sp44.y = 0.0f; sp44.z = 100.0f; @@ -6093,16 +6109,16 @@ void func_800B73E0(Player* player) { gLight1y = sp38.y; gLight1z = sp38.z; Matrix_Pop(&gCalcMatrix); - Matrix_RotateX(gCalcMatrix, M_DTOR * D_801784EC, 1); - Matrix_RotateY(gCalcMatrix, M_DTOR * D_801784F0, 1); - Matrix_RotateZ(gCalcMatrix, M_DTOR * D_801784F4, 1); + Matrix_RotateX(gCalcMatrix, M_DTOR * D_ctx_801784EC, 1); + Matrix_RotateY(gCalcMatrix, M_DTOR * D_ctx_801784F0, 1); + Matrix_RotateZ(gCalcMatrix, M_DTOR * D_ctx_801784F4, 1); Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp44, &sp38); gLight2x = sp38.x; gLight2y = sp38.y; gLight2z = sp38.z; } -void func_800B79B0(void) { +void func_play_800B79B0(void) { s32 var_v0_2; s32 sp40; f32 sp3C; @@ -6112,47 +6128,48 @@ void func_800B79B0(void) { switch (gCurrentLevel) { case LEVEL_TRAINING: if (gLevelMode == LEVELMODE_ALL_RANGE) { - func_i1_8019949C(); + Training_8019949C(); } break; case LEVEL_VERSUS: - func_800C26C8(); - D_80177844++; - if ((D_80177844 == 200) && (gLaserStrength[0] == LASERS_SINGLE) && (gLaserStrength[1] == LASERS_SINGLE) && - (gLaserStrength[2] == LASERS_SINGLE) && (gLaserStrength[3] == LASERS_SINGLE)) { - func_800B852C(OBJ_ITEM_LASERS, &gItems[0]); + func_versus_800C26C8(); + D_ctx_80177844++; + if ((D_ctx_80177844 == 200) && (gLaserStrength[0] == LASERS_SINGLE) && + (gLaserStrength[1] == LASERS_SINGLE) && (gLaserStrength[2] == LASERS_SINGLE) && + (gLaserStrength[3] == LASERS_SINGLE)) { + func_play_800B852C(OBJ_ITEM_LASERS, &gItems[0]); } - if ((D_80177844 == 400) && (gBombCount[0] == 0) && (gBombCount[1] == 0) && (gBombCount[2] == 0) && + if ((D_ctx_80177844 == 400) && (gBombCount[0] == 0) && (gBombCount[1] == 0) && (gBombCount[2] == 0) && (gBombCount[3] == 0)) { - func_800B852C(OBJ_ITEM_BOMB, &gItems[1]); + func_play_800B852C(OBJ_ITEM_BOMB, &gItems[1]); } - if (D_80177844 == 500) { - D_80177844 = 0; + if (D_ctx_80177844 == 500) { + D_ctx_80177844 = 0; } break; case LEVEL_VENOM_2: - if ((gPlayer[0].state_1C8 != PLAYERSTATE_1C8_7) && (D_8017827C == 2)) { + if ((gPlayer[0].state_1C8 != PLAYERSTATE_1C8_7) && (D_ctx_8017827C == 2)) { gPlayer[0].state_1C8 = PLAYERSTATE_1C8_7; gPlayer[0].unk_1D0 = 0; gPlayer[0].unk_234 = 1; gPlayer[0].pos.z = 15000.0f; - func_800B7184(gPlayer, 1); - D_80178340 = 255; - D_8017835C = 255; - D_80178358 = 255; + func_play_800B7184(gPlayer, 1); + D_ctx_80178340 = 255; + D_ctx_8017835C = 255; + D_ctx_80178358 = 255; - D_80178348 = D_80178350 = D_80178354 = 255; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; } break; case LEVEL_VENOM_ANDROSS: - func_i6_8018BDD8(); + Andross_8018BDD8(); gGroundLevel = -25000.0f; gPlayer[0].unk_0A0 = 612.0f; gPlayer[0].unk_0A4 = -544.0f; if (D_Timer_80177B44 != 0) { D_Timer_80177B44--; if (D_Timer_80177B44 == 0) { - func_i6_80189214(); + Andross_80189214(); } } break; @@ -6160,37 +6177,37 @@ void func_800B79B0(void) { Texture_Scroll(D_102FF08, 8, 8, 1); /* fallthrough */ case LEVEL_SECTOR_X: - if (D_8017827C == 1) { + if (D_ctx_8017827C == 1) { gBlurAlpha = 128; if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7) { - Math_SmoothStepToF(&D_8015F960, 0.0f, 1.0f, 1.0f, 0.0f); + Math_SmoothStepToF(&D_bg_8015F960, 0.0f, 1.0f, 1.0f, 0.0f); } else { - Math_SmoothStepToF(&D_8015F960, 128.0f, 1.0f, 1.0f, 0.0f); + Math_SmoothStepToF(&D_bg_8015F960, 128.0f, 1.0f, 1.0f, 0.0f); } } - if ((gCurrentLevel == LEVEL_SECTOR_X) && (D_8017827C == 0) && (D_80177E80 == 4)) { - D_80177E80++; + if ((gCurrentLevel == LEVEL_SECTOR_X) && (D_ctx_8017827C == 0) && (D_ctx_80177E80 == 4)) { + D_ctx_80177E80++; gPlayer[0].state_1C8 = PLAYERSTATE_1C8_8; gPlayer[0].unk_1D0 = 0; gOverlayStage = 1; AUDIO_PLAY_SFX(0x1900602A, gDefaultSfxSource, 0); - D_80177930 = 2; - D_800D3180[gCurrentLevel] = 1; + D_ctx_80177930 = 2; + D_play_800D3180[gCurrentLevel] = 1; } break; case LEVEL_CORNERIA: - func_8008C104(D_CO_603EB38, D_CO_6028A60); + func_hud_8008C104(D_CO_603EB38, D_CO_6028A60); if (gGameFrameCount & 1) { Texture_Scroll(D_CO_600CBD8, 64, 32, 3); } break; case LEVEL_AQUAS: - func_8008C104(D_AQ_603158C, D_AQ_602ACC0); + func_hud_8008C104(D_AQ_603158C, D_AQ_602ACC0); break; case LEVEL_SOLAR: - func_800A3FEC(); + func_play_800A3FEC(); - for (D_80177CE8; D_80177CE8 >= 10.0f; D_80177CE8 -= 10.0f) { + for (D_ctx_80177CE8; D_ctx_80177CE8 >= 10.0f; D_ctx_80177CE8 -= 10.0f) { Texture_Scroll(D_SO_6005710, 32, 32, 1); } if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_6) { @@ -6236,26 +6253,26 @@ void func_800B79B0(void) { var_a0 = MIN(gPlayer[0].shields, 0xFF); func_8001D1C8(var_a0, sp3A); if (!(gGameFrameCount & 7) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_7)) { - func_i3_8019E8B8(RAND_FLOAT_CENTERED(6000.0f), -80.0f, - gPlayer[0].unk_138 + (RAND_FLOAT(2000.0f) + -6000.0f), - RAND_FLOAT(10.0f) + 20.0f); // check + Solar_8019E8B8(RAND_FLOAT_CENTERED(6000.0f), -80.0f, + gPlayer[0].unk_138 + (RAND_FLOAT(2000.0f) + -6000.0f), + RAND_FLOAT(10.0f) + 20.0f); // check } - func_8008C104(D_SO_60229A4, D_SO_6010198); + func_hud_8008C104(D_SO_60229A4, D_SO_6010198); if (gPlayer[0].shields == 0) { - D_80177B4C = 1; + D_ctx_80177B4C = 1; } break; case LEVEL_ZONESS: - func_800A3FEC(); - for (D_80177CE8; D_80177CE8 >= 20.0f; D_80177CE8 -= 20.0f) { + func_play_800A3FEC(); + for (D_ctx_80177CE8; D_ctx_80177CE8 >= 20.0f; D_ctx_80177CE8 -= 20.0f) { Texture_Scroll(D_ZO_602C2CC, 32, 32, 1); } if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_6) { Texture_Scroll(D_ZO_602C2CC, 32, 32, 1); } - func_8008C104(D_ZO_602C2CC, D_ZO_600D990); - if (func_800A73E4(&sp3C, &sp40, gPlayer[0].camEye.x, gPlayer[0].camEye.y, - gPlayer[0].camEye.z - D_80177D20)) { + func_hud_8008C104(D_ZO_602C2CC, D_ZO_600D990); + if (func_play_800A73E4(&sp3C, &sp40, gPlayer[0].camEye.x, gPlayer[0].camEye.y, + gPlayer[0].camEye.z - D_ctx_80177D20)) { gLight1R = 0; gLight1G = 7; gLight1B = 10; @@ -6278,10 +6295,10 @@ void func_800B79B0(void) { } } -void func_800B832C(void) { +void func_play_800B832C(void) { s32 i; - func_800A6590(); + func_play_800A6590(); for (i = 1; i < 4; i++) { if (gTeamDamage[i] > 0) { gTeamDamage[i] -= 2; @@ -6293,36 +6310,36 @@ void func_800B832C(void) { } for (i = 0; i < gCamCount; i++) { gPlayer[i].num = gPlayerNum = i; - func_800B48BC(&gPlayer[i]); + func_play_800B48BC(&gPlayer[i]); } Object_UpdateAll(); - func_8003D9B8(); + func_beam_8003D9B8(); BonusText_Update(); for (i = 0; i < gCamCount; i++) { gPlayer[i].num = gPlayerNum = i; - func_800B71E4(&gPlayer[i]); + func_play_800B71E4(&gPlayer[i]); } - D_8017847C = 0.0f; - if (D_80178480 != 0) { + D_ctx_8017847C = 0.0f; + if (D_ctx_80178480 != 0) { f32 var_fv1; - D_80178480--; - var_fv1 = D_80178480; + D_ctx_80178480--; + var_fv1 = D_ctx_80178480; if (var_fv1 > 20.0f) { var_fv1 = 20.0f; } - D_8017847C = var_fv1 * SIN_DEG(gGameFrameCount * 70.0f); + D_ctx_8017847C = var_fv1 * SIN_DEG(gGameFrameCount * 70.0f); } - func_800B79B0(); + func_play_800B79B0(); } u8 D_800D317C = 255; -void func_800B852C(ObjectId objId, Item* item) { +void func_play_800B852C(ObjectId objId, Item* item) { u8 sp1F = (u8) RAND_FLOAT(5.0f); if (D_800D317C == sp1F) { - D_80177844 -= 1; + D_ctx_80177844 -= 1; } else { D_800D317C = sp1F; if (item->obj.status == OBJ_FREE) { @@ -6337,18 +6354,18 @@ void func_800B852C(ObjectId objId, Item* item) { } } -void func_800B86A4(f32* arg0) { - *arg0 += D_80177D20 + 15000.0f; +void func_play_800B86A4(f32* arg0) { + *arg0 += D_ctx_80177D20 + 15000.0f; } -void func_800B86CC(void) { +void func_play_800B86CC(void) { s32 pad1; s32 pad2; s32 pad3; s32 i; f32 sp34; - switch (D_80177C70) { + switch (D_ctx_80177C70) { case 0: sp34 = 45.0f; break; @@ -6359,9 +6376,9 @@ void func_800B86CC(void) { sp34 = 55.0f; break; } - Math_SmoothStepToF(&D_80161A3C, sp34, 0.1f, 5.0f, 0.0f); - if (D_80177E84 != 0) { - D_80177E84 = 0; + Math_SmoothStepToF(&D_game_80161A3C, sp34, 0.1f, 5.0f, 0.0f); + if (D_ctx_80177E84 != 0) { + D_ctx_80177E84 = 0; gLevelMode = LEVELMODE_ALL_RANGE; if (gCurrentLevel != LEVEL_VENOM_ANDROSS) { MEM_ARRAY_ALLOCATE(gObjects58, 200); @@ -6369,79 +6386,79 @@ void func_800B86CC(void) { for (i = 0; i < 200; i++) { gObjects58[i].obj.status = OBJ_FREE; } - func_800A6148(); + func_play_800A6148(); if (gCurrentLevel == LEVEL_CORNERIA) { - func_800A5338(); + func_play_800A5338(); } else if (gCurrentLevel == LEVEL_SECTOR_Y) { - func_800A55B0(); + func_play_800A55B0(); } else if (gCurrentLevel == LEVEL_VENOM_ANDROSS) { - func_800A57E0(); + func_play_800A57E0(); } else if (gCurrentLevel == LEVEL_TRAINING) { - func_i1_80198C50(); + Training_80198C50(); } - func_800B86A4(&gPlayer[0].pos.z); - func_800B86A4(&gPlayer[0].unk_138); + func_play_800B86A4(&gPlayer[0].pos.z); + func_play_800B86A4(&gPlayer[0].unk_138); gPlayer[0].camEye.z += 15000.0f; gPlayer[0].camAt.z += 15000.0f; - gPlayer[0].unk_144 = gPlayer[0].unk_140 = D_80177D08 = D_80177D20 = 0.0f; + gPlayer[0].unk_144 = gPlayer[0].unk_140 = D_ctx_80177D08 = D_ctx_80177D20 = 0.0f; } - if (D_80177854 != 100) { + if (D_ctx_80177854 != 100) { (void) "play_time = %d\n"; gGameFrameCount++; } - switch (D_80177854) { + switch (D_ctx_80177854) { case 0: if (D_Timer_8017783C == 0) { - D_80177854 = 1; + D_ctx_80177854 = 1; } break; case 1: - func_800ABAB4(); + func_play_800ABAB4(); D_800D2F5C = gVolumeSettings[0]; D_800D2F60 = gVolumeSettings[1]; D_800D2F64 = gVolumeSettings[2]; - D_80177854 = 2; + D_ctx_80177854 = 2; break; case 2: - if (!((D_80177838 == 0) && (D_80177840 == 0))) { - D_801779BC = 0; + if (!((D_ctx_80177838 == 0) && (D_ctx_80177840 == 0))) { + D_ctx_801779BC = 0; } else { - D_801779BC = 1; + D_ctx_801779BC = 1; } gDrawMode = DRAWMODE_4; - func_800B832C(); + func_play_800B832C(); if ((gControllerPress[gMainController].button & START_BUTTON) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_2) && gSaveFile.save.data.planet[D_800D2F6C[gCurrentLevel]].normalClear) { Audio_ClearVoice(); Audio_SetBaseSfxReverb(0); - func_800A6148(); + func_play_800A6148(); for (i = 0; i < gCamCount; i++) { Audio_KillSfxBySource(gPlayer[i].sfxSource); func_8001CA24(i); } - D_80177854 = 1; + D_ctx_80177854 = 1; gDrawMode = gVersusMode = 0; gCamCount = 1; gBgColor = 0; - gCsFrameCount = D_80177840 = D_80177838 = gRadioState = 0; - D_8017782C = 0; + gCsFrameCount = D_ctx_80177840 = D_ctx_80177838 = gRadioState = 0; + D_ctx_8017782C = 0; } if (gVersusMode) { - func_800C1E9C(); + func_versus_800C1E9C(); } - if ((gControllerPress[gMainController].button & START_BUTTON) && (D_801779BC != 0)) { + if ((gControllerPress[gMainController].button & START_BUTTON) && (D_ctx_801779BC != 0)) { func_8001D638(1); - D_80177854 = 100; - D_80177868 = 4; - D_80178484 = 100000; + D_ctx_80177854 = 100; + D_ctx_80177868 = 4; + D_ctx_80178484 = 100000; } break; case 100: if (!gVersusMode) { if ((gControllerPress[gMainController].button & R_TRIG) && (gPlayer[0].form != FORM_BLUE_MARINE) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_0)) { - if (D_800D2860[0] = 1 - D_800D2860[0]) { + if (D_game_800D2860[0] = 1 - D_game_800D2860[0]) { AUDIO_PLAY_SFX(0x49000019, gDefaultSfxSource, 4); } else { AUDIO_PLAY_SFX(0x4900101A, gDefaultSfxSource, 4); @@ -6450,20 +6467,21 @@ void func_800B86CC(void) { } else { for (i = 0; i < 4; i++) { if ((gControllerPress[i].button & R_TRIG) && (gPlayer[i].form != FORM_ON_FOOT)) { - if (D_800D2860[i] = 1 - D_800D2860[i]) { - func_80060F30(gPlayer[i].sfxSource, 0x49000019, i); + if (D_game_800D2860[i] = 1 - D_game_800D2860[i]) { + func_enmy_80060F30(gPlayer[i].sfxSource, 0x49000019, i); } else { - func_80060F30(gPlayer[i].sfxSource, 0x4900101A, i); + func_enmy_80060F30(gPlayer[i].sfxSource, 0x4900101A, i); } } } } - if ((D_80177868 == 4) && (gControllerPress[gMainController].button & START_BUTTON) && (D_801779BC != 0)) { + if ((D_ctx_80177868 == 4) && (gControllerPress[gMainController].button & START_BUTTON) && + (D_ctx_801779BC != 0)) { func_8001D638(0); - D_80177854 = 2; + D_ctx_80177854 = 2; gDrawMode = DRAWMODE_4; } - D_801779BC = 1; + D_ctx_801779BC = 1; break; } } diff --git a/src/main/fox_radio.c b/src/main/fox_radio.c index fa88c1c9..de4b97ae 100644 --- a/src/main/fox_radio.c +++ b/src/main/fox_radio.c @@ -5,19 +5,6 @@ */ #include "global.h" - -u16** D_80178720; -s32 D_80178724; -s32 D_80178728; -s32 D_8017872C; -f32 D_80178730; -f32 D_80178734; -f32 D_80178738; -f32 D_8017873C; -f32 D_80178740; -s32 D_80178744; -s32 D_80178748; - #include "assets/ast_allies.h" #include "assets/ast_corneria.h" #include "assets/ast_meteo.h" @@ -31,16 +18,26 @@ s32 D_80178748; #include "assets/ast_title.h" #include "assets/ast_zoness.h" +u16** D_radio_80178720; +s32 D_radio_80178724; +s32 D_radio_80178728; +s32 D_radio_8017872C; +f32 D_radio_80178730; +f32 D_radio_80178734; +f32 D_radio_80178738; +f32 D_radio_8017873C; +f32 D_radio_80178740; + s32 gCurrentMsgPri = 0; -void func_800BA760(void) { +void func_radio_800BA760(void) { RCP_SetupDL_36(); - if (D_80177D50 == 1.3f) { - D_801782F8 = Message_IsPrintingChar(D_80178308, D_801782D8); + if (D_ctx_80177D50 == 1.3f) { + D_ctx_801782F8 = Message_IsPrintingChar(D_ctx_80178308, D_ctx_801782D8); } } -s32 func_800BA7BC(u16* msg, s32 priority) { +s32 func_radio_800BA7BC(u16* msg, s32 priority) { if (priority == gCurrentMsgPri) { return 0; } @@ -93,64 +90,66 @@ void Radio_PlayMessage(u16* msg, RadioCharacterId character) { } } - if ((gRadioState != 0) && (func_800BA7BC(msg, priority) == 1)) { + if ((gRadioState != 0) && (func_radio_800BA7BC(msg, priority) == 1)) { return; } gCurrentMsgPri = priority; - D_80177D68 = character; + D_ctx_80177D68 = character; if (gExpertMode && ((character == RCID_FOX) || (character == RCID_FOX_RED))) { - D_80177D68 = RCID_FOX_EXPERT; + D_ctx_80177D68 = RCID_FOX_EXPERT; } if (gCurrentLevel == LEVEL_VENOM_2) { switch (character) { case RCID_WOLF: - D_80177D68 = RCID_WOLF_2; + D_ctx_80177D68 = RCID_WOLF_2; break; case RCID_PIGMA: - D_80177D68 = RCID_PIGMA_2; + D_ctx_80177D68 = RCID_PIGMA_2; break; case RCID_LEON: - D_80177D68 = RCID_LEON_2; + D_ctx_80177D68 = RCID_LEON_2; break; case RCID_ANDREW: - D_80177D68 = RCID_ANDREW_2; + D_ctx_80177D68 = RCID_ANDREW_2; break; } } - D_80178308 = msg; + D_ctx_80178308 = msg; gRadioState = 100; switch (gGameState) { case GSTATE_TITLE: case GSTATE_CREDITS: - D_8017872C = 176; - D_80178728 = 85; - D_80178730 = 80.0f; - D_80178734 = 174.0f; - D_80178738 = 4.63f; - D_8017873C = 32.0f; - D_80178740 = 174.0f; + D_radio_8017872C = 176; + D_radio_80178728 = 85; + D_radio_80178730 = 80.0f; + D_radio_80178734 = 174.0f; + D_radio_80178738 = 4.63f; + D_radio_8017873C = 32.0f; + D_radio_80178740 = 174.0f; break; case GSTATE_PLAY: - D_8017872C = 180; - D_80178728 = 79; - D_80178730 = 74.0f; - D_80178734 = 178.0f; - D_80178738 = 4.53f; - D_8017873C = 26.0f; - D_80178740 = 178.0f; + D_radio_8017872C = 180; + D_radio_80178728 = 79; + D_radio_80178730 = 74.0f; + D_radio_80178734 = 178.0f; + D_radio_80178738 = 4.53f; + D_radio_8017873C = 26.0f; + D_radio_80178740 = 178.0f; break; } - D_801782E8 = Message_IdFromPtr(msg); - Audio_PlayVoice(D_801782E8); + D_ctx_801782E8 = Message_IdFromPtr(msg); + Audio_PlayVoice(D_ctx_801782E8); } -void func_800BAAE8(void) { +s32 D_radio_80178744; + +void func_radio_800BAAE8(void) { static f32 D_800D4A74 = -1.0f; u16* sp44; s32 mirror; @@ -159,19 +158,19 @@ void func_800BAAE8(void) { f32 temp_fa0; s32 j; - D_80178744 = 0; + D_radio_80178744 = 0; mirror = false; - switch (D_801782A4) { + switch (D_ctx_801782A4) { case RCID_FOX_RED: - D_80178744 = 1; + D_radio_80178744 = 1; /* fallthrough */ case RCID_FOX: sp44 = D_10050E0; break; case RCID_FOX_RED_OPEN: - D_80178744 = 1; + D_radio_80178744 = 1; /* fallthrough */ case RCID_FOX_OPEN: sp44 = D_1006000; @@ -183,37 +182,37 @@ void func_800BAAE8(void) { sp44 = D_1007E40; break; case RCID_FALCO_RED: - D_80178744 = 1; + D_radio_80178744 = 1; /* fallthrough */ case RCID_FALCO: sp44 = D_10032A0; break; case RCID_FALCO_RED_OPEN: - D_80178744 = 1; + D_radio_80178744 = 1; /* fallthrough */ case RCID_FALCO_OPEN: sp44 = D_10041C0; break; case RCID_SLIPPY_RED: - D_80178744 = 1; + D_radio_80178744 = 1; /* fallthrough */ case RCID_SLIPPY: sp44 = D_100D900; break; case RCID_SLIPPY_RED_OPEN: - D_80178744 = 1; + D_radio_80178744 = 1; /* fallthrough */ case RCID_SLIPPY_OPEN: sp44 = D_100E820; break; case RCID_PEPPY_RED: - D_80178744 = 1; + D_radio_80178744 = 1; /* fallthrough */ case RCID_PEPPY: sp44 = D_100BAC0; break; case RCID_PEPPY_RED_OPEN: - D_80178744 = 1; + D_radio_80178744 = 1; /* fallthrough */ case RCID_PEPPY_OPEN: sp44 = D_100C9E0; @@ -321,14 +320,14 @@ void func_800BAAE8(void) { sp44 = D_MA_6011B40; break; case RCID_ROB64_RED: - D_80178744 = 1; + D_radio_80178744 = 1; /* fallthrough */ case RCID_ROB64: case RCID_ROB64_2: sp44 = D_1009C80; break; case RCID_ROB64_RED_OPEN: - D_80178744 = 1; + D_radio_80178744 = 1; /* fallthrough */ case RCID_ROB64_OPEN: case RCID_ROB64_2_OPEN: @@ -346,7 +345,7 @@ void func_800BAAE8(void) { if ((gGameState == GSTATE_PLAY) && (gCurrentLevel == LEVEL_AREA_6)) { sp44 = D_A6_6000B60; } - D_80178744 = 1; + D_radio_80178744 = 1; break; case RCID_ANDROSS_RED_OPEN: case RCID_ANDROSS_OPEN: @@ -354,7 +353,7 @@ void func_800BAAE8(void) { if ((gGameState == GSTATE_PLAY) && (gCurrentLevel == LEVEL_AREA_6)) { sp44 = D_A6_6001A80; } - D_80178744 = 1; + D_radio_80178744 = 1; break; case RCID_JAMES: sp44 = D_D005C30; @@ -408,54 +407,56 @@ void func_800BAAE8(void) { sp44 = gTitleRadioStatic; break; } - if (((s32) D_80177D68 == RCID_ANDROSS) || ((s32) D_80177D68 == RCID_ANDROSS_RED)) { - D_80178744 = 1; + if (((s32) D_ctx_80177D68 == RCID_ANDROSS) || ((s32) D_ctx_80177D68 == RCID_ANDROSS_RED)) { + D_radio_80178744 = 1; } break; } - if ((sp44 != NULL) && (D_80177D38 != 0.0f)) { - temp_fa0 = (2.0f * D_80177D38) + D_80178740; - if ((D_80178740 + 20.0f) <= temp_fa0) { + if ((sp44 != NULL) && (D_ctx_80177D38 != 0.0f)) { + temp_fa0 = (2.0f * D_ctx_80177D38) + D_radio_80178740; + if ((D_radio_80178740 + 20.0f) <= temp_fa0) { D_800D4A74 = 1.0f; } - if (temp_fa0 <= D_80178740) { + if (temp_fa0 <= D_radio_80178740) { D_800D4A74 = -1.0f; } - sp38 = D_80177D38 * 20.0f * D_800D4A74; + sp38 = D_ctx_80177D38 * 20.0f * D_800D4A74; RCP_SetupDL_76(); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255); if (mirror) { for (i = 0, j = 0; i < 2; i++, j += 880) { - TextureRect_16bRGBA_MirX(&gMasterDisp, &sp44[j], 44, 20, D_8017873C, - D_80178740 + 20.0f + sp38 + (i * 20.0f * D_80177D38), 1.0f, D_80177D38); + TextureRect_16bRGBA_MirX(&gMasterDisp, &sp44[j], 44, 20, D_radio_8017873C, + D_radio_80178740 + 20.0f + sp38 + (i * 20.0f * D_ctx_80177D38), 1.0f, + D_ctx_80177D38); } - TextureRect_16bRGBA_MirX(&gMasterDisp, &sp44[2 * 880], 44, 4, D_8017873C, - D_80178740 + 20.0f + sp38 + (40.0f * D_80177D38), 1.0f, D_80177D38); + TextureRect_16bRGBA_MirX(&gMasterDisp, &sp44[2 * 880], 44, 4, D_radio_8017873C, + D_radio_80178740 + 20.0f + sp38 + (40.0f * D_ctx_80177D38), 1.0f, D_ctx_80177D38); } else { for (i = 0, j = 0; i < 2; i++, j += 880) { - TextureRect_16bRGBA(&gMasterDisp, &sp44[j], 44, 20, D_8017873C, - D_80178740 + 20.0f + sp38 + (i * 20.0f * D_80177D38), 1.0f, D_80177D38); + TextureRect_16bRGBA(&gMasterDisp, &sp44[j], 44, 20, D_radio_8017873C, + D_radio_80178740 + 20.0f + sp38 + (i * 20.0f * D_ctx_80177D38), 1.0f, + D_ctx_80177D38); } - TextureRect_16bRGBA(&gMasterDisp, &sp44[2 * 880], 44, 4, D_8017873C, - D_80178740 + 20.0f + sp38 + (40.0f * D_80177D38), 1.0f, D_80177D38); + TextureRect_16bRGBA(&gMasterDisp, &sp44[2 * 880], 44, 4, D_radio_8017873C, + D_radio_80178740 + 20.0f + sp38 + (40.0f * D_ctx_80177D38), 1.0f, D_ctx_80177D38); } } } -void func_800BB388(void) { +void func_radio_800BB388(void) { static f32 D_800D4A78 = -1.0f; f32 temp_fa0; u8* sp38; u16* sp34; f32 sp30; - if ((gGameState != GSTATE_MAP) && (D_80177D50 != 0.0f)) { - temp_fa0 = (D_80177D50 / 0.26f) * 3.0f; - if ((D_80178734 + 16.0f) <= temp_fa0 + D_80178734) { + if ((gGameState != GSTATE_MAP) && (D_ctx_80177D50 != 0.0f)) { + temp_fa0 = (D_ctx_80177D50 / 0.26f) * 3.0f; + if ((D_radio_80178734 + 16.0f) <= temp_fa0 + D_radio_80178734) { D_800D4A78 = 1.0f; } - if (temp_fa0 + D_80178734 <= D_80178734) { + if (temp_fa0 + D_radio_80178734 <= D_radio_80178734) { D_800D4A78 = -1.0f; } sp30 = temp_fa0 * D_800D4A78; @@ -471,29 +472,31 @@ void func_800BB388(void) { sp34 = D_1013570; break; } - if (D_80178744 == 1) { + if (D_radio_80178744 == 1) { gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 25, 25, 170); } else { gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 60, 60, 255, 170); } - TextureRect_8bCI(&gMasterDisp, sp38, sp34, 32, 32, D_80178730, D_80178734 + 16.0f + sp30, D_80178738, - D_80177D50); + TextureRect_8bCI(&gMasterDisp, sp38, sp34, 32, 32, D_radio_80178730, D_radio_80178734 + 16.0f + sp30, + D_radio_80178738, D_ctx_80177D50); } - if (D_80177D50 == 1.3f) { + if (D_ctx_80177D50 == 1.3f) { RCP_SetupDL(&gMasterDisp, 0x55); - D_801782F8 = Message_DisplayText(&gMasterDisp, D_80178308, D_80178728, D_8017872C, D_801782D8); + D_ctx_801782F8 = + Message_DisplayText(&gMasterDisp, D_ctx_80178308, D_radio_80178728, D_radio_8017872C, D_ctx_801782D8); } } -s32 D_8017874C; +s32 D_radio_80178748; +s32 D_radio_8017874C; -void func_800BB5D0(void) { +void func_radio_800BB5D0(void) { s32 var_v1; s32 temp_ft0; u32 temp_v0; s32 fakeTemp; - if ((D_80177854 == 100) && (gGameState != GSTATE_CREDITS)) { + if ((D_ctx_80177854 == 100) && (gGameState != GSTATE_CREDITS)) { return; } @@ -507,27 +510,27 @@ void func_800BB5D0(void) { switch (gRadioState) { case 100: - D_80178748 = 1; - D_801782A4 = 1000; + D_radio_80178748 = 1; + D_ctx_801782A4 = 1000; gRadioState = 1; - D_801782D8 = 0; - D_80177D38 = 0.0f; - D_80177D50 = 0.0f; - D_8017874C = 0; + D_ctx_801782D8 = 0; + D_ctx_80177D38 = 0.0f; + D_ctx_80177D50 = 0.0f; + D_radio_8017874C = 0; if (gCamCount != 1) { gRadioState = 0; } break; case 1: - D_80177D38 += 0.25f; - if (D_80177D38 == 1.0f) { + D_ctx_80177D38 += 0.25f; + if (D_ctx_80177D38 == 1.0f) { gRadioState++; D_Timer_801782AC = 10; } - D_801782A4 = 2; + D_ctx_801782A4 = 2; if (gGameFrameCount & 1) { - D_801782A4 = 3; + D_ctx_801782A4 = 3; } break; @@ -536,16 +539,16 @@ void func_800BB5D0(void) { gRadioState++; D_Timer_801782AC = 10; } - D_801782A4 = 2; + D_ctx_801782A4 = 2; if (gGameFrameCount & 1) { - D_801782A4 = 3; + D_ctx_801782A4 = 3; } break; case 3: if (D_Timer_801782AC == 0) { gRadioState++; - temp_v0 = Message_GetWidth(D_80178308); + temp_v0 = Message_GetWidth(D_ctx_80178308); if (D_80137E78 == 3) { D_Timer_801782AC = temp_v0 + 16; } else { @@ -555,10 +558,10 @@ void func_800BB5D0(void) { D_Timer_801782AC = temp_v0 * 2; } } - D_801782A4 = (s32) D_80177D68; - D_80177D50 += 0.26f; - if (D_80177D50 > 1.3f) { - D_80177D50 = 1.3f; + D_ctx_801782A4 = (s32) D_ctx_80177D68; + D_ctx_80177D50 += 0.26f; + if (D_ctx_80177D50 > 1.3f) { + D_ctx_80177D50 = 1.3f; } break; @@ -569,13 +572,13 @@ void func_800BB5D0(void) { case 32: if (Audio_GetCurrentVoice() == 0) { - D_80178724++; - D_80178308 = D_80178720[D_80178724]; - Audio_PlayVoice(Message_IdFromPtr(D_80178308)); - D_801782D8 = 0; - D_8017874C = 0; + D_radio_80178724++; + D_ctx_80178308 = D_radio_80178720[D_radio_80178724]; + Audio_PlayVoice(Message_IdFromPtr(D_ctx_80178308)); + D_ctx_801782D8 = 0; + D_radio_8017874C = 0; D_Timer_801782AC = 80; - D_Timer_801782AC = Message_GetWidth(D_80178308) * 2; + D_Timer_801782AC = Message_GetWidth(D_ctx_80178308) * 2; gRadioState = 4; } break; @@ -583,12 +586,12 @@ void func_800BB5D0(void) { case 4: if ((Audio_GetCurrentVoice() == 0) && (D_Timer_801782AC == 0)) { D_Timer_801782AC = 10; - D_801782A4 = (s32) D_80177D68; + D_ctx_801782A4 = (s32) D_ctx_80177D68; gRadioState = 6; } - D_801782A4 = (s32) D_80177D68; + D_ctx_801782A4 = (s32) D_ctx_80177D68; if (D_Timer_801782B4 > 0) { - D_801782A4 = (s32) D_80177D68 + 1; + D_ctx_801782A4 = (s32) D_ctx_80177D68 + 1; } if (!D_80137E78) {} @@ -600,19 +603,19 @@ void func_800BB5D0(void) { if (!(fakeTemp)) { temp_v0 = Audio_GetCurrentVoiceStatus(); - if (D_801782D8 < 60) { - if (D_80178308[D_801782D8 + 1] == MSGCHAR_NPF) { + if (D_ctx_801782D8 < 60) { + if (D_ctx_80178308[D_ctx_801782D8 + 1] == MSGCHAR_NPF) { if (temp_v0 == 0) { gRadioState = 31; } } else { - D_801782D8++; + D_ctx_801782D8++; } } - if (D_8017874C != 0) { - if ((D_801782E8 >= 23000) && (D_801782E8 < 23033)) { - if (D_801782F8 != 0) { + if (D_radio_8017874C != 0) { + if ((D_ctx_801782E8 >= 23000) && (D_ctx_801782E8 < 23033)) { + if (D_ctx_801782F8 != 0) { D_Timer_801782B4 = 2; AUDIO_PLAY_SFX(0x49000017, gDefaultSfxSource, 4); } @@ -623,7 +626,7 @@ void func_800BB5D0(void) { } } } - D_8017874C ^= 1; + D_radio_8017874C ^= 1; break; case 5: @@ -631,7 +634,7 @@ void func_800BB5D0(void) { gRadioState++; D_Timer_801782AC = 10; } - D_801782A4 = (s32) D_80177D68; + D_ctx_801782A4 = (s32) D_ctx_80177D68; break; case 6: @@ -643,44 +646,44 @@ void func_800BB5D0(void) { } gRadioState++; } - D_801782A4 = 2; + D_ctx_801782A4 = 2; if (gGameFrameCount & 1) { - D_801782A4 = 3; + D_ctx_801782A4 = 3; } - D_80177D50 -= 0.26f; - if (D_80177D50 < 0.0f) { - D_80177D50 = 0.0f; + D_ctx_80177D50 -= 0.26f; + if (D_ctx_80177D50 < 0.0f) { + D_ctx_80177D50 = 0.0f; } break; case 7: - D_80177D38 -= 0.25f; - if (D_80177D38 == 0) { - D_80178300 = 0; + D_ctx_80177D38 -= 0.25f; + if (D_ctx_80177D38 == 0) { + D_ctx_80178300 = 0; gCurrentMsgPri = 0; gRadioState = 0; } - D_801782A4 = 2; + D_ctx_801782A4 = 2; if (gGameFrameCount & 1) { - D_801782A4 = 3; + D_ctx_801782A4 = 3; } break; case 8: - D_801782A4 = (s32) D_80177D68; - D_80177D50 = 1.3f; - D_80177D38 = 1.0f; + D_ctx_801782A4 = (s32) D_ctx_80177D68; + D_ctx_80177D50 = 1.3f; + D_ctx_80177D38 = 1.0f; break; case 0: break; } - if (((gRadioState > 0) && (gRadioState != 100)) && (D_80178300 == 0)) { - func_800BAAE8(); - func_800BB388(); + if (((gRadioState > 0) && (gRadioState != 100)) && (D_ctx_80178300 == 0)) { + func_radio_800BAAE8(); + func_radio_800BB388(); - temp_ft0 = (s32) D_80177D68; + temp_ft0 = (s32) D_ctx_80177D68; if (((temp_ft0 == RCID_FALCO) || (temp_ft0 == RCID_SLIPPY)) || (temp_ft0 == RCID_PEPPY)) { if (temp_ft0 == RCID_FALCO) { @@ -693,18 +696,18 @@ void func_800BB5D0(void) { var_v1 = 3; } if ((gTeamShields[var_v1] <= 0) && (gGameFrameCount & 4) && (gTeamShields[var_v1] != -2) && - (D_801782A4 != 2) && (D_801782A4 != 3) && (D_801782A4 != 1000)) { + (D_ctx_801782A4 != 2) && (D_ctx_801782A4 != 3) && (D_ctx_801782A4 != 1000)) { RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 0, 255); Graphics_DisplaySmallText(31, 167, 1.0f, 1.0f, "DOWN"); - func_80084B94(1); + func_hud_80084B94(1); } - if (((D_801782A4 != 2) && (D_801782A4 != 3)) && (D_801782A4 != 1000)) { - func_80086110(22.0f, 165.0f, gTeamShields[var_v1]); + if (((D_ctx_801782A4 != 2) && (D_ctx_801782A4 != 3)) && (D_ctx_801782A4 != 1000)) { + func_hud_80086110(22.0f, 165.0f, gTeamShields[var_v1]); } } - temp_ft0 = (s32) D_80177D68; + temp_ft0 = (s32) D_ctx_80177D68; if ((temp_ft0 == RCID_WOLF) || (temp_ft0 == RCID_PIGMA) || (temp_ft0 == RCID_LEON) || (temp_ft0 == RCID_ANDREW) || (temp_ft0 == RCID_WOLF_2) || (temp_ft0 == RCID_PIGMA_2) || @@ -740,28 +743,28 @@ void func_800BB5D0(void) { } if ((gActors[var_v1].obj.status != OBJ_ACTIVE) && (gGameFrameCount & 4) && - (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) && (D_801782A4 != 2) && (D_801782A4 != 3) && - (D_801782A4 != 1000)) { + (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) && (D_ctx_801782A4 != 2) && (D_ctx_801782A4 != 3) && + (D_ctx_801782A4 != 1000)) { RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 0, 255); Graphics_DisplaySmallText(31, 167, 1.0f, 1.0f, "DOWN"); } - if (((D_801782A4 != 2) && (D_801782A4 != 3)) && (D_801782A4 != 1000)) { - func_80086110(22.0f, 165.0f, gActors[var_v1].health * 2.55f); + if (((D_ctx_801782A4 != 2) && (D_ctx_801782A4 != 3)) && (D_ctx_801782A4 != 1000)) { + func_hud_80086110(22.0f, 165.0f, gActors[var_v1].health * 2.55f); } } - if (((D_801782A4 != 2) && (D_801782A4 != 3)) && (D_801782A4 != 1000)) { - func_8008AD94(); + if (((D_ctx_801782A4 != 2) && (D_ctx_801782A4 != 3)) && (D_ctx_801782A4 != 1000)) { + func_hud_8008AD94(); } } - if (D_80178300 == 1) { - func_800BA760(); + if (D_ctx_80178300 == 1) { + func_radio_800BA760(); } } -void func_800BC040(void) { - if (D_80177854 != 100) { +void func_radio_800BC040(void) { + if (D_ctx_80177854 != 100) { if (D_Timer_801782AC > 0) { D_Timer_801782AC--; } @@ -771,19 +774,19 @@ void func_800BC040(void) { switch (gRadioState) { case 100: - D_801782A4 = 1000; + D_ctx_801782A4 = 1000; gRadioState = 1; - D_80177D38 = 0.0f; - D_80177D50 = 0.0f; - D_801782D8 = Message_GetWidth(D_80178308); + D_ctx_80177D38 = 0.0f; + D_ctx_80177D50 = 0.0f; + D_ctx_801782D8 = Message_GetWidth(D_ctx_80178308); if (gCamCount != 1) { gRadioState = 0; } break; case 1: - D_80177D38 += 0.02f; - if (D_80177D38 == 0.04f) { + D_ctx_80177D38 += 0.02f; + if (D_ctx_80177D38 == 0.04f) { gRadioState++; D_Timer_801782AC = 5; } @@ -795,10 +798,10 @@ void func_800BC040(void) { D_Timer_801782AC = 5; } - D_801782A4 = 2; + D_ctx_801782A4 = 2; if (gGameFrameCount & 1) { - D_801782A4 = 3; + D_ctx_801782A4 = 3; } break; @@ -812,11 +815,11 @@ void func_800BC040(void) { } } - D_801782A4 = (s32) D_80177D68; - D_80177D50 += 0.015f; + D_ctx_801782A4 = (s32) D_ctx_80177D68; + D_ctx_80177D50 += 0.015f; - if (D_80177D50 > 0.07f) { - D_80177D50 = 0.07f; + if (D_ctx_80177D50 > 0.07f) { + D_ctx_80177D50 = 0.07f; } break; @@ -832,7 +835,7 @@ void func_800BC040(void) { gRadioState++; D_Timer_801782AC = 5; } - D_801782A4 = (s32) D_80177D68; + D_ctx_801782A4 = (s32) D_ctx_80177D68; break; case 6: @@ -841,28 +844,28 @@ void func_800BC040(void) { gRadioState++; } - D_801782A4 = 2; + D_ctx_801782A4 = 2; if (gGameFrameCount & 1) { - D_801782A4 = 3; + D_ctx_801782A4 = 3; } - D_80177D50 -= 0.015f; + D_ctx_80177D50 -= 0.015f; - if (D_80177D50 < 0.0f) { - D_80177D50 = 0.0f; + if (D_ctx_80177D50 < 0.0f) { + D_ctx_80177D50 = 0.0f; } break; case 7: - D_80177D38 -= 0.02f; - if (D_80177D38 == 0) { + D_ctx_80177D38 -= 0.02f; + if (D_ctx_80177D38 == 0) { gRadioState = 0; D_Timer_801782AC = 5; } - D_801782A4 = 2; + D_ctx_801782A4 = 2; if (gGameFrameCount & 1) { - D_801782A4 = 3; + D_ctx_801782A4 = 3; } break; @@ -871,10 +874,10 @@ void func_800BC040(void) { } if ((gRadioState > 0) && (gRadioState != 100)) { - func_800BAAE8(); - func_800BB388(); - if (((s32) D_80177D68 == RCID_FALCO) || ((s32) D_80177D68 == RCID_SLIPPY) || - ((s32) D_80177D68 == RCID_PEPPY)) { + func_radio_800BAAE8(); + func_radio_800BB388(); + if (((s32) D_ctx_80177D68 == RCID_FALCO) || ((s32) D_ctx_80177D68 == RCID_SLIPPY) || + ((s32) D_ctx_80177D68 == RCID_PEPPY)) { Matrix_Push(&gGfxMatrix); RCP_SetupDL_36(); Matrix_Translate(gGfxMatrix, -150.0f, -115.0f, -443.0f, 1); diff --git a/src/main/fox_std_lib.c b/src/main/fox_std_lib.c index e2391efe..ed556dd7 100644 --- a/src/main/fox_std_lib.c +++ b/src/main/fox_std_lib.c @@ -1,9 +1,8 @@ #include "global.h" +#include "assets/ast_font.h" char D_801619A0[100]; -#include "assets/ast_font.h" - char* Graphics_ClearPrintBuffer(char* buf, s32 fill, s32 len) { s32 i; char* ptr = buf; @@ -26,7 +25,7 @@ s32 Graphics_Printf(const char* fmt, ...) { return 0; } -void Texture_Scroll(void* texture, s32 width, s32 height, u8 mode) { +void Texture_Scroll(u16* texture, s32 width, s32 height, u8 mode) { u16* temp_t0 = SEGMENTED_TO_VIRTUAL(texture); u16 temp_a3; s32 var_a0; @@ -72,7 +71,7 @@ void Texture_Scroll(void* texture, s32 width, s32 height, u8 mode) { } } -void Texture_Mottle(void* dst, void* src, u8 mode) { +void Texture_Mottle(u16* dst, u16* src, u8 mode) { s32 var_v1; s32 var_s3; u8* var_s0_2; @@ -86,7 +85,7 @@ void Texture_Mottle(void* dst, void* src, u8 mode) { for (var_s3 = 0; var_s3 < 32 * 32; var_s3 += 32) { temp_ft3 = 3.0f * __sinf((s32) (((var_s3 / 32) + (gGameFrameCount / 4)) % 32U) * (2 * M_PI / 32)); for (var_v1 = 0; var_v1 < 32; var_v1++) { - ((u16*) dst)[var_s3 + (temp_ft3 + var_v1) % 0x20U] = ((u16*) src)[var_s3 + var_v1]; + dst[var_s3 + (temp_ft3 + var_v1) % 0x20U] = src[var_s3 + var_v1]; } } break; @@ -94,7 +93,7 @@ void Texture_Mottle(void* dst, void* src, u8 mode) { for (var_s3 = 0; var_s3 < 22 * 64; var_s3 += 64) { temp_ft3 = __sinf((s32) (((var_s3 / 64) + (gGameFrameCount / 4)) % 32U) * (2 * M_PI / 8)); for (var_v1 = 0; var_v1 < 64; var_v1++) { - ((u16*) dst)[var_s3 + (temp_ft3 + var_v1) % 64U] = ((u16*) src)[var_s3 + var_v1]; + dst[var_s3 + (temp_ft3 + var_v1) % 64U] = src[var_s3 + var_v1]; } } break; @@ -102,7 +101,7 @@ void Texture_Mottle(void* dst, void* src, u8 mode) { for (var_s3 = 0; var_s3 < 16 * 16; var_s3 += 16) { temp_ft3 = 2.0f * __sinf((s32) (((var_s3 / 16) + (gGameFrameCount / 2)) % 16U) * (2 * M_PI / 16)); for (var_v1 = 0; var_v1 < 16; var_v1++) { - ((u16*) dst)[var_s3 + (temp_ft3 + var_v1) % 16U] = ((u16*) src)[var_s3 + var_v1]; + dst[var_s3 + (temp_ft3 + var_v1) % 16U] = src[var_s3 + var_v1]; } } break; @@ -110,7 +109,7 @@ void Texture_Mottle(void* dst, void* src, u8 mode) { for (var_s3 = 0; var_s3 < 32 * 32; var_s3 += 32) { temp_ft3 = 2.0f * __sinf((s32) (((var_s3 / 32) + (gGameFrameCount / 2)) % 32U) * (2 * M_PI / 32)); for (var_v1 = 0; var_v1 < 32; var_v1++) { - ((u16*) dst)[var_s3 + (temp_ft3 + var_v1) % 32U] = ((u16*) src)[var_s3 + var_v1]; + dst[var_s3 + (temp_ft3 + var_v1) % 32U] = src[var_s3 + var_v1]; } } break; @@ -172,7 +171,7 @@ void Animation_DrawLimb(s32 mode, Limb* limb, Limb** skeleton, Vec3f* jointTable if (mode >= 2) { Matrix_MultVec3f(gCalcMatrix, &origin, &pos); if (mode != 5) { - func_8005F670(&pos); + func_edisplay_8005F670(&pos); } } Matrix_Mult(gGfxMatrix, gCalcMatrix, 1); @@ -757,7 +756,7 @@ u16* Graphics_SetupTextureRender(Gfx** gfxPtr, u8 width, u8 height) { gDPSetFillColor((*gfxPtr)++, FILL_COLOR(gBgColor | 1)); gDPFillRectangle((*gfxPtr)++, 0, 0, width - 1, height - 1); gDPPipeSync((*gfxPtr)++); - guPerspective(gGfxMtx, &norm, D_80161A3C, (f32) width / height, 10.0f, 12800.0f, 1.0f); + guPerspective(gGfxMtx, &norm, D_game_80161A3C, (f32) width / height, 10.0f, 12800.0f, 1.0f); gSPPerspNormalize((*gfxPtr)++, norm); gSPMatrix((*gfxPtr)++, gGfxMtx++, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); guLookAt(gGfxMtx, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -12800.0f, 0.0f, 1.0f, 0.0f); @@ -1176,7 +1175,7 @@ s32 Graphics_GetSmallTextWidth(char* text) { return xPos; } -void func_800A1540(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { +void func_stdlib_800A1540(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { } // 20 kinds of fake. Try to improve it here: https://decomp.me/scratch/NMQZB diff --git a/src/main/fox_tank.c b/src/main/fox_tank.c index 23b2ca37..ea9376bd 100644 --- a/src/main/fox_tank.c +++ b/src/main/fox_tank.c @@ -2,13 +2,13 @@ #include "assets/ast_landmaster.h" #include "assets/ast_titania.h" -void func_80047754(Player* player); -void func_80047D38(Player* player, f32); -void func_80047E7C(Player* player, f32, f32); -void func_80047FBC(Player* player); -void func_800481F4(Player* player); -s32 func_80046E40(Player* player, f32* hitboxData, s32* index, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, - f32 zRot, f32 arg9, f32 argA, f32 argB); +void func_tank_80047754(Player* player); +void func_tank_80047D38(Player* player, f32); +void func_tank_80047E7C(Player* player, f32, f32); +void func_tank_80047FBC(Player* player); +void func_tank_800481F4(Player* player); +s32 func_tank_80046E40(Player* player, f32* hitboxData, s32* index, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, + f32 zRot, f32 arg9, f32 argA, f32 argB); static u8 D_800C9F00 = 0; static u8 D_800C9F04 = 0; @@ -20,13 +20,10 @@ static s32 D_800C9F18[2] = { 0, 0 }; // unused. static f32 D_800C9F20 = 0.0f; static f32 D_800C9F24 = 0.0f; static f32 D_800C9F28 = 0.0f; -Vec3f D_800C9F2C = { 0.0f, 0.0f, 0.0f }; +Vec3f D_tank_800C9F2C = { 0.0f, 0.0f, 0.0f }; static s32 D_800C9F38 = 0; // unused -extern f32 D_i5_801BE250[40]; -extern s16 D_i5_801BE2F0[9]; - -void func_80043280(u16* text0, u16* text1, f32 zRot) { +void func_tank_80043280(u16* text0, u16* text1, f32 zRot) { s32 py; s32 px; s32 i; @@ -57,7 +54,7 @@ void func_80043280(u16* text0, u16* text1, f32 zRot) { Matrix_Pop(&gCalcMatrix); } -void func_80043468(Player* player) { +void func_tank_80043468(Player* player) { f32 sp54; f32 sp50; f32 sp4C; @@ -77,18 +74,18 @@ void func_80043468(Player* player) { sp50 += player->unk_17C * 0.5f; sp4C += player->unk_17C * -5.0f; - if (0 || (gCurrentLevel == LEVEL_MACBETH) && (D_i5_801BA1E8 == 102)) { + if (0 || (gCurrentLevel == LEVEL_MACBETH) && (D_MA_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_i5_801BA1E8 == 99) { + if (D_MA_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_i5_801BA1E8 == 98) { + } else if (D_MA_801BA1E8 == 98) { sp50 = player->pos.y + 100.0f; sp4C = player->pos.y + (player->unk_0E4 * 10.0f); sp4C += player->unk_17C * -3.0f; @@ -97,10 +94,10 @@ void func_80043468(Player* player) { sp50 = player->pos.y + 50.0f; sp4C = player->pos.y; - if (0 || (gCurrentLevel == LEVEL_MACBETH) && (D_i5_801BA1E8 == 102)) { + if (0 || (gCurrentLevel == LEVEL_MACBETH) && (D_MA_801BA1E8 == 102)) { sp4C = player->pos.y + 150.0f; } - if (D_i5_801BA1E8 == 0x63) { + if (D_MA_801BA1E8 == 0x63) { sp4C = player->pos.y + 150.0f; } } @@ -117,7 +114,7 @@ void func_80043468(Player* player) { Math_SmoothStepToF(&player->unk_014, 1.0f, 1.0f, 0.1f, 0.0f); } -void func_800438E0(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale) { +void func_tank_800438E0(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale) { f32 pad[12]; Effect_Initialize(effect); @@ -138,21 +135,21 @@ void func_800438E0(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale) { Object_SetInfo(&effect->info, effect->obj.id); } -void func_80043AA0(f32 xPos, f32 yPos, f32 zPos, f32 scale) { +void func_tank_80043AA0(f32 xPos, f32 yPos, f32 zPos, f32 scale) { s32 i; for (i = 50; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_800438E0(&gEffects[i], xPos, yPos, zPos, scale); + func_tank_800438E0(&gEffects[i], xPos, yPos, zPos, scale); break; } } } -void func_80043B0C(s32 arg0) { +void func_tank_80043B0C(s32 arg0) { } -void func_80043B18(Player* player) { +void func_tank_80043B18(Player* player) { f32 pad; Vec3f sp48; Vec3f sp3C; @@ -179,15 +176,15 @@ void func_80043B18(Player* player) { } Matrix_MultVec3f(gCalcMatrix, &sp48, &sp3C); if (gCurrentLevel == LEVEL_MACBETH) { - func_80043AA0(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z, 0.2f); + func_tank_80043AA0(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z, 0.2f); } else { if (!(gGameFrameCount & 1)) { - func_i5_80189120(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z, + Titania_80189120(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z, player->unk_0E8 + sp38, 1.3f); } if (!(gGameFrameCount & 3)) { - func_8007A900(player->pos.x + sp3C.x, player->pos.y + sp3C.y + 20.0f, player->unk_138 + sp3C.z, 2.0f, - 0xFF, 0xF, 0); + func_effect_8007A900(player->pos.x + sp3C.x, player->pos.y + sp3C.y + 20.0f, player->unk_138 + sp3C.z, + 2.0f, 0xFF, 0xF, 0); } } } else { @@ -197,16 +194,16 @@ void func_80043B18(Player* player) { Matrix_MultVec3f(gCalcMatrix, &sp48, &sp3C); if (gCurrentLevel == LEVEL_MACBETH) { if (gGameFrameCount & 1) { - func_80043AA0(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z, 0.2f); + func_tank_80043AA0(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z, 0.2f); } } else { if (!(gGameFrameCount & 1)) { - func_i5_80189120(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z, + Titania_80189120(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z, player->unk_0E8 + sp38, 1.0f); } if (!(gGameFrameCount & 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, - 2.0f, 0xFF, 0xF, 0); + func_effect_8007A900(player->pos.x + sp3C.x, player->pos.y + sp3C.y + 20.0f, + player->unk_138 + sp3C.z, 2.0f, 0xFF, 0xF, 0); } } } @@ -215,23 +212,23 @@ void func_80043B18(Player* player) { Matrix_MultVec3f(gCalcMatrix, &sp48, &sp3C); if (gCurrentLevel == LEVEL_MACBETH) { if (!(gGameFrameCount & 1)) { - func_80043AA0(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z, 0.2f); + func_tank_80043AA0(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z, 0.2f); } } else { if (!(gGameFrameCount & 1)) { - func_i5_80189120(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z, + Titania_80189120(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z, player->unk_0E8 + sp38, 1.0f); } if (!(gGameFrameCount & 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, - 2.0f, 0xFF, 0xF, 0); + func_effect_8007A900(player->pos.x + sp3C.x, player->pos.y + sp3C.y + 20.0f, + player->unk_138 + sp3C.z, 2.0f, 0xFF, 0xF, 0); } } } } } -s32 func_80044120(Hitbox* hitbox, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6) { +s32 func_tank_80044120(Hitbox* hitbox, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6) { Vec3f sp34; Vec3f sp28; @@ -239,10 +236,10 @@ s32 func_80044120(Hitbox* hitbox, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 ar sp34.y = arg2 - arg5; sp34.z = arg3 - arg6; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp34, &sp28); - return func_800A78C4(hitbox, arg4, arg5, arg6, sp28.x + arg4, sp28.y + arg5, sp28.z + arg6); + return func_play_800A78C4(hitbox, arg4, arg5, arg6, sp28.x + arg4, sp28.y + arg5, sp28.z + arg6); } -void func_800441C8(Player* player, f32* hitboxData, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 zRot) { +void func_tank_800441C8(Player* player, f32* hitboxData, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 zRot) { Hitbox* hitbox; s32 count; s32 i; @@ -260,7 +257,7 @@ void func_800441C8(Player* player, f32* hitboxData, f32 xPos, f32 yPos, f32 zPos x = player->pos.x; y = player->pos.y - 10.0f; z = player->unk_138; - if (func_80044120(hitbox, x, y, z, xPos, yPos, zPos)) { + if (func_tank_80044120(hitbox, x, y, z, xPos, yPos, zPos)) { player->unk_1D4 = 1; if (player->vel.y < -20.0f) { player->unk_1F4 = 20; @@ -274,7 +271,7 @@ void func_800441C8(Player* player, f32* hitboxData, f32 xPos, f32 yPos, f32 zPos x = player->pos.x; y = player->pos.y + 30.0f; z = player->unk_138; - if (func_80044120(hitbox, x, y, z, xPos, yPos, zPos)) { + if (func_tank_80044120(hitbox, x, y, z, xPos, yPos, zPos)) { player->vel.y = 0.0f; player->pos.y = yPos - 75.0f; } @@ -283,20 +280,20 @@ void func_800441C8(Player* player, f32* hitboxData, f32 xPos, f32 yPos, f32 zPos } } -void func_800443DC(Player* player) { +void func_tank_800443DC(Player* player) { Object_80* obj80; s32 i; for (i = 0, obj80 = gObjects80; i < ARRAY_COUNT(gObjects80); i++, obj80++) { if ((obj80->obj.status == OBJ_ACTIVE) && (obj80->obj.id == OBJ_80_58) && ((player->unk_138 - 2000.0f) < obj80->obj.pos.z)) { - func_800441C8(player, obj80->info.hitbox, obj80->obj.pos.x, obj80->obj.pos.y, obj80->obj.pos.z, - obj80->obj.rot.x, obj80->obj.rot.y, obj80->obj.rot.z); + func_tank_800441C8(player, obj80->info.hitbox, obj80->obj.pos.x, obj80->obj.pos.y, obj80->obj.pos.z, + obj80->obj.rot.x, obj80->obj.rot.y, obj80->obj.rot.z); } } } -void func_800444BC(Player* player) { +void func_tank_800444BC(Player* player) { f32 pad; f32 sp40; f32 sp3C; @@ -311,17 +308,17 @@ void func_800444BC(Player* player) { } sp40 = sp3C = 0.0f; sp38 = gGroundLevel; - if (D_801784AC == 4) { - func_i5_801B6E20(player->pos.x, player->unk_138 + player->unk_144, &sp40, &sp38, &sp3C); + if (D_ctx_801784AC == 4) { + Ground_801B6E20(player->pos.x, player->unk_138 + player->unk_144, &sp40, &sp38, &sp3C); } if (gCurrentLevel == LEVEL_MACBETH) { - D_i5_801BE250[27] = gGroundLevel; - D_i5_801BE250[28] = D_i5_801BE250[29] = 0.0f; + D_MA_801BE250[27] = gGroundLevel; + D_MA_801BE250[28] = D_MA_801BE250[29] = 0.0f; D_800C9F10 = 0.0f; - func_80047754(player); - sp38 = D_i5_801BE250[27]; - sp40 = D_i5_801BE250[28]; - sp3C = D_i5_801BE250[29]; + func_tank_80047754(player); + sp38 = D_MA_801BE250[27]; + sp40 = D_MA_801BE250[28]; + sp3C = D_MA_801BE250[29]; } if ((player->pos.y - sp30) < sp38) { if (player->vel.y < -10.0f) { @@ -331,8 +328,8 @@ void func_800444BC(Player* player) { if (player->vel.y < -20.0f) { player->unk_1F4 = 20; } - if (D_80177BAC != 0) { - D_80177BAC = 0; + if (D_ctx_80177BAC != 0) { + D_ctx_80177BAC = 0; AUDIO_PLAY_BGM(SEQ_ID_4 | 0x8000); func_8001C8B8(0); } @@ -374,11 +371,11 @@ void func_800444BC(Player* player) { } } if (gCurrentLevel == LEVEL_TITANIA) { - func_800443DC(player); + func_tank_800443DC(player); } } -void func_80044868(Player* player) { +void func_tank_80044868(Player* player) { f32 pad; f32 var_fv1; f32 sp2C; @@ -402,13 +399,13 @@ void func_80044868(Player* player) { if (player->unk_180 > 0.0f) { player->unk_180 -= 3.0f; } - D_80177968 = 3.0f; - D_80177970 = 0.66f; + D_ctx_80177968 = 3.0f; + D_ctx_80177970 = 0.66f; var_fv1 = gInputPress->stick_x; if (var_fv1 == 0.0f) { - Math_SmoothStepToF(&player->unk_0E8, -var_fv1 * D_80177970, 0.1f, D_80177968 * 0.5f, 0.1f); + Math_SmoothStepToF(&player->unk_0E8, -var_fv1 * D_ctx_80177970, 0.1f, D_ctx_80177968 * 0.5f, 0.1f); } else { - Math_SmoothStepToF(&player->unk_0E8, -var_fv1 * D_80177970, 0.1f, D_80177968, 0.1f); + Math_SmoothStepToF(&player->unk_0E8, -var_fv1 * D_ctx_80177970, 0.1f, D_ctx_80177968, 0.1f); } player->unk_108 = player->unk_0E8; sp2C = player->unk_0D0; @@ -481,32 +478,32 @@ void func_80044868(Player* player) { player->unk_0F0 = SIN_DEG(player->unk_0F4) * 0.7f; if (D_800C9F04 == 0) { if (player->unk_0D0 != 0.0f) { - func_80043B18(player); + func_tank_80043B18(player); } if (player->unk_1DC != 0.0f) { - func_80043B18(player); + func_tank_80043B18(player); } } } if (player->unk_0D0 > 0.0f) { Texture_Scroll(D_landmaster_3002E80, 0x20, 0x20, 0); if ((gCurrentLevel == LEVEL_TITANIA) && (gBossActive == 0)) { - func_80043280(D_landmaster_3005EA8, D_TI_6009BB8, gGameFrameCount * -55.0f); + func_tank_80043280(D_landmaster_3005EA8, D_TI_6009BB8, gGameFrameCount * -55.0f); } if ((gCurrentLevel == LEVEL_MACBETH) && (player->state_1C8 == PLAYERSTATE_1C8_7)) { - func_80043280(D_landmaster_3005EA8, *D_Unk_800DACB8, gGameFrameCount * -55.0f); + func_tank_80043280(D_landmaster_3005EA8, *D_Unk_800DACB8, gGameFrameCount * -55.0f); } } if (player->unk_0D0 > 10.0f) { Texture_Scroll(D_landmaster_3002E80, 0x20, 0x20, 0); if ((gCurrentLevel == LEVEL_TITANIA) && (gBossActive == 0)) { - func_80043280(D_landmaster_3005EA8, D_TI_6009BB8, gGameFrameCount * -55.0f); + func_tank_80043280(D_landmaster_3005EA8, D_TI_6009BB8, gGameFrameCount * -55.0f); } } - func_800A46A0(player); + func_play_800A46A0(player); } -void func_80045130(Player* player) { +void func_tank_80045130(Player* player) { Math_SmoothStepToF(&player->unk_170, 0.0f, 1.0f, 0.2f, 0.0f); Math_SmoothStepToF(&player->unk_16C, 0.0f, 1.0f, 0.2f, 0.0f); if (gInputPress->button & Z_TRIG) { @@ -539,7 +536,7 @@ void func_80045130(Player* player) { player->unk_18C += fabsf(SIN_DEG(player->unk_130) * 20.0f); } -void func_80045348(Player* player) { +void func_tank_80045348(Player* player) { f32 sp44 = 15.0f; f32 sp40 = 0; f32 sp3C = 0.1f; @@ -564,11 +561,11 @@ void func_80045348(Player* player) { sp38 = 6.0f; D_800C9F24 += 1.0f; - if (D_801779A8[player->num] < 25.0f) { - D_801779A8[player->num] = 25.0f; + if (D_ctx_801779A8[player->num] < 25.0f) { + D_ctx_801779A8[player->num] = 25.0f; } - Math_SmoothStepToF(&D_801779A8[player->num], 50.0f, 1.0f, 10.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_801779A8[player->num], 50.0f, 1.0f, 10.0f, 0.0f); } else { D_800C9F24 = 0.0f; } @@ -578,7 +575,7 @@ void func_80045348(Player* player) { sp40 = 100.0f; sp3C = 0.2f; D_800C9F28 += 1.0f; - Math_SmoothStepToF(&D_801779A8[player->num], 25.0f, 1.0f, 5.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_801779A8[player->num], 25.0f, 1.0f, 5.0f, 0.0f); } else { D_800C9F28 = 0.0f; } @@ -589,7 +586,7 @@ void func_80045348(Player* player) { } } -void func_80045678(Player* player) { +void func_tank_80045678(Player* player) { static u8 D_800C9F3C = 0; f32 temp; f32 pad; @@ -676,25 +673,25 @@ void func_80045678(Player* player) { Math_SmoothStepToF(&player->vel.y, 0.0f, 0.1f, 2.0f, 0); } if ((gCamCount == 1) && !(gGameFrameCount & 1)) { - func_8007A900(RAND_FLOAT_CENTERED(20.0f) + player->pos.x, player->unk_068 + 10.0f, player->unk_138 - 10.0f, - RAND_FLOAT(2.0f) + 3.5f, 0xFF, 0x10, 1); + func_effect_8007A900(RAND_FLOAT_CENTERED(20.0f) + player->pos.x, player->unk_068 + 10.0f, + player->unk_138 - 10.0f, RAND_FLOAT(2.0f) + 3.5f, 0xFF, 0x10, 1); } } else { D_800C9F3C = 0; if ((gCamCount == 1) && !(gGameFrameCount & 3) && (player->unk_1DC == 0)) { if ((player->unk_16C > 0.2f) && (player->timer_220 == 0)) { - func_8007A900(RAND_FLOAT_CENTERED(10.0f) + (player->pos.x - 57.0f), player->unk_068 + 10.0f, - player->unk_138 - 10.0f, RAND_FLOAT(1.0f) + 1.5f, 0xFF, 0xF, 0); + func_effect_8007A900(RAND_FLOAT_CENTERED(10.0f) + (player->pos.x - 57.0f), player->unk_068 + 10.0f, + player->unk_138 - 10.0f, RAND_FLOAT(1.0f) + 1.5f, 0xFF, 0xF, 0); } if ((player->unk_170 > 0.2f) && (player->timer_220 == 0)) { - func_8007A900(RAND_FLOAT_CENTERED(10.0f) + (player->pos.x + 57.0f), player->unk_068 + 10.0f, - player->unk_138 - 10.0f, RAND_FLOAT(1.0f) + 1.5f, 0xFF, 0xF, 0); + func_effect_8007A900(RAND_FLOAT_CENTERED(10.0f) + (player->pos.x + 57.0f), player->unk_068 + 10.0f, + player->unk_138 - 10.0f, RAND_FLOAT(1.0f) + 1.5f, 0xFF, 0xF, 0); } } } } -void func_80045E7C(Player* player) { +void func_tank_80045E7C(Player* player) { player->unk_130 = Math_ModF(player->unk_130, 360.0f); if (player->unk_1DC == 0) { if (player->unk_130 > 0.0f) { @@ -736,7 +733,7 @@ void func_80045E7C(Player* player) { } } if (player->timer_1E8 == 0) { - D_801779A8[player->num] = 25.0f; + D_ctx_801779A8[player->num] = 25.0f; if (player->unk_1EC > 0) { player->unk_1EC -= 2; } @@ -759,7 +756,7 @@ void func_80045E7C(Player* player) { } } -void func_800460E0(Player* player, f32* hitboxData, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7) { +void func_tank_800460E0(Player* player, f32* hitboxData, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7) { s32 i; s32 count; @@ -780,27 +777,27 @@ void func_800460E0(Player* player, f32* hitboxData, f32 arg2, f32 arg3, f32 arg4 sp88.y = spf94.y - arg3; sp88.z = spf94.z - arg4; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp88, &sp7C); - if (func_800A78C4(hitbox, arg2, arg3, arg4, sp7C.x + arg2, sp7C.y + arg3, sp7C.z + arg4)) { + if (func_play_800A78C4(hitbox, arg2, arg3, arg4, sp7C.x + arg2, sp7C.y + arg3, sp7C.z + arg4)) { player->unk_068 = arg3 + 20.0f + 3.0f; } } } } -void func_80046260(Player* player) { +void func_tank_80046260(Player* player) { Object_80* obj80; s32 i; for (i = 0, obj80 = gObjects80; i < ARRAY_COUNT(gObjects80); i++, obj80++) { if ((obj80->obj.status == OBJ_ACTIVE) && (obj80->obj.id == OBJ_80_58) && ((player->unk_138 - 2000.0f) < obj80->obj.pos.z) && (obj80->obj.pos.y < player->pos.y)) { - func_800460E0(player, obj80->info.hitbox, obj80->obj.pos.x, obj80->obj.pos.y, obj80->obj.pos.z, - obj80->obj.rot.x, obj80->obj.rot.y, obj80->obj.rot.z); + func_tank_800460E0(player, obj80->info.hitbox, obj80->obj.pos.x, obj80->obj.pos.y, obj80->obj.pos.z, + obj80->obj.rot.x, obj80->obj.rot.y, obj80->obj.rot.z); } } } -void func_80046358(Player* player) { +void func_tank_80046358(Player* player) { f32 spD4; f32 spD0; f32 spCC; @@ -815,13 +812,13 @@ void func_80046358(Player* player) { player->unk_248 = 0.0f; player->unk_24C = 0.0f; player->unk_070 = 0.0f; - func_i5_801B6E20(player->unk_064, player->unk_06C + player->unk_144, &spD4, &spD0, &spCC); + Ground_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; } -void func_8004641C(Player* player, s32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7) { +void func_tank_8004641C(Player* player, s32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7) { s32 pad1; s32 pad2; f32 sp84; @@ -844,18 +841,18 @@ void func_8004641C(Player* player, s32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 a sp84 = sp64.x + arg2; sp80 = sp64.y + arg3; sp7C = sp64.z + arg4; - if (func_800A8054(arg1, arg2, arg3, arg4, sp84, sp80, sp7C, &sp58, &sp4C)) { - if (D_i5_801BE250[27] < arg3 + sp58.y) { - D_i5_801BE250[27] = arg3 + sp58.y; + if (func_play_800A8054(arg1, arg2, arg3, arg4, sp84, sp80, sp7C, &sp58, &sp4C)) { + if (D_MA_801BE250[27] < arg3 + sp58.y) { + D_MA_801BE250[27] = arg3 + sp58.y; if (arg1 == OBJ_80_67) { player->unk_1DC = 0; D_800C9F04 = 1; } } - D_i5_801BE250[28] = sp58.x; - D_i5_801BE250[29] = sp58.z; - } else if ((arg1 == OBJ_80_67) && (D_i5_801BE250[27] == 0.0f) && - func_800A8054(arg1, arg2 + 20.0f, arg3, arg4, sp84, sp80, sp7C, &sp58, &sp4C)) { + D_MA_801BE250[28] = sp58.x; + D_MA_801BE250[29] = sp58.z; + } else if ((arg1 == OBJ_80_67) && (D_MA_801BE250[27] == 0.0f) && + func_play_800A8054(arg1, arg2 + 20.0f, arg3, arg4, sp84, sp80, sp7C, &sp58, &sp4C)) { player->unk_1DC = 9; player->timer_1E8 = 15; if ((arg6 > 90.0f) && (arg6 < 270.0f)) { @@ -864,7 +861,7 @@ void func_8004641C(Player* player, s32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 a player->unk_1EC = player->unk_1F0 = -20; } } - if (func_800A8054(arg1, arg2, arg3, arg4, sp84, arg3, sp7C, &sp58, &sp4C) && (D_800C9F10 <= arg3 + sp58.y)) { + if (func_play_800A8054(arg1, arg2, arg3, arg4, sp84, arg3, sp7C, &sp58, &sp4C) && (D_800C9F10 <= arg3 + sp58.y)) { D_800C9F10 = arg3 + sp58.y; player->unk_064 = player->pos.x; player->unk_068 = D_800C9F10 - 2.0f; @@ -875,7 +872,7 @@ void func_8004641C(Player* player, s32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 a static f32 D_800C9F4C[5] = { 0.0f, -1.0f, 1.0f, 0.5f, -0.5f }; -void func_80046704(Player* player) { +void func_tank_80046704(Player* player) { s32 pad[7]; s16 i; Object_80* obj80; @@ -894,16 +891,16 @@ void func_80046704(Player* player) { temp2 = obj80->obj.pos.z - player->unk_138; if (sqrtf(SQ(temp1) + SQ(temp2)) < 2000.0f) { - func_8004641C(player, obj80->obj.id, obj80->obj.pos.x, obj80->obj.pos.y, obj80->obj.pos.z, - obj80->obj.rot.x, obj80->obj.rot.y, obj80->obj.rot.z); + func_tank_8004641C(player, obj80->obj.id, obj80->obj.pos.x, obj80->obj.pos.y, obj80->obj.pos.z, + obj80->obj.rot.x, obj80->obj.rot.y, obj80->obj.rot.z); } } else if (obj80->obj.id == OBJ_80_74) { 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_i5_801BE250[27] = obj80->obj.pos.y; + D_MA_801BE250[27] = obj80->obj.pos.y; player->unk_064 = player->pos.x; - player->unk_068 = D_i5_801BE250[27] - 3.0f; + player->unk_068 = D_MA_801BE250[27] - 3.0f; } } if ((obj80->obj.id == OBJ_80_59) || (obj80->obj.id == OBJ_80_60) || (obj80->obj.id == OBJ_80_61) || @@ -912,9 +909,9 @@ void func_80046704(Player* player) { s32 temp_v0; s32 sp94; - temp_v0 = func_80046E40(player, obj80->info.hitbox, &sp94, obj80->obj.pos.x, obj80->obj.pos.y, - obj80->obj.pos.z, obj80->obj.rot.x, obj80->obj.rot.y, obj80->obj.rot.z, 0.0f, - 0.0f, 0.0f); + temp_v0 = func_tank_80046E40(player, obj80->info.hitbox, &sp94, obj80->obj.pos.x, obj80->obj.pos.y, + obj80->obj.pos.z, obj80->obj.rot.x, obj80->obj.rot.y, obj80->obj.rot.z, + 0.0f, 0.0f, 0.0f); switch (temp_v0) { case 0: break; @@ -953,7 +950,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_i5_801BE250[27] == 0.f) && (player->vel.y < 0.f)) { + (D_MA_801BE250[27] == 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) { @@ -963,7 +960,7 @@ void func_80046704(Player* player) { } } else { D_800C9F04 = 1; - D_i5_801BE250[27] = obj80->obj.pos.y + 206.0f; + D_MA_801BE250[27] = obj80->obj.pos.y + 206.0f; player->unk_1DC = 0; } } @@ -973,10 +970,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_i5_801A3C20(player->unk_138)) { - if (((player->pos.x - 200.0f) < D_i5_801BE250[21]) && - (D_i5_801BE250[21] < (player->pos.x + 200.0f))) { - player->unk_068 = D_i5_801BE250[22] - 1.0f; + } else if ((obj80->obj.id == OBJ_80_105) && Macbeth_801A3C20(player->unk_138)) { + if (((player->pos.x - 200.0f) < D_MA_801BE250[21]) && + (D_MA_801BE250[21] < (player->pos.x + 200.0f))) { + player->unk_068 = D_MA_801BE250[22] - 1.0f; } } } @@ -984,8 +981,8 @@ void func_80046704(Player* player) { } } -s32 func_80046E40(Player* player, f32* hitboxData, s32* index, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, - f32 zRot, f32 arg9, f32 argA, f32 argB) { +s32 func_tank_80046E40(Player* player, f32* hitboxData, s32* index, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, + f32 zRot, f32 arg9, f32 argA, f32 argB) { s32 spB4; s32 i; f32 var_fa0; @@ -1034,7 +1031,7 @@ s32 func_80046E40(Player* player, f32* hitboxData, s32* index, f32 xPos, f32 yPo var_fv1 = sp88.y + yPos; var_fa0 = sp88.z + zPos; } - if (func_800A78C4((Hitbox*) hitboxData, xPos, yPos, zPos, var_fv0, var_fv1, var_fa0)) { + if (func_play_800A78C4((Hitbox*) hitboxData, xPos, yPos, zPos, var_fv0, var_fv1, var_fa0)) { *index = i + 1; return 1; } @@ -1051,7 +1048,7 @@ s32 func_80046E40(Player* player, f32* hitboxData, s32* index, f32 xPos, f32 yPo var_fv1 = sp88.y + yPos; var_fa0 = sp88.z + zPos; } - if (func_800A78C4((Hitbox*) hitboxData, xPos, yPos, zPos, var_fv0, var_fv1, var_fa0)) { + if (func_play_800A78C4((Hitbox*) hitboxData, xPos, yPos, zPos, var_fv0, var_fv1, var_fa0)) { *index = i + 1; return 2; } @@ -1068,7 +1065,7 @@ s32 func_80046E40(Player* player, f32* hitboxData, s32* index, f32 xPos, f32 yPo var_fv1 = sp88.y + yPos; var_fa0 = sp88.z + zPos; } - if (func_800A78C4((Hitbox*) hitboxData, xPos, yPos, zPos, var_fv0, var_fv1, var_fa0)) { + if (func_play_800A78C4((Hitbox*) hitboxData, xPos, yPos, zPos, var_fv0, var_fv1, var_fa0)) { *index = i + 1; if (hitboxData[-1] == HITBOX_TYPE_3) { return -1; @@ -1092,7 +1089,7 @@ s32 func_80046E40(Player* player, f32* hitboxData, s32* index, f32 xPos, f32 yPo var_fv1 = sp88.y + yPos; var_fa0 = sp88.z + zPos; } - if (func_800A78C4((Hitbox*) hitboxData, xPos, yPos, zPos, var_fv0, var_fv1, var_fa0)) { + if (func_play_800A78C4((Hitbox*) hitboxData, xPos, yPos, zPos, var_fv0, var_fv1, var_fa0)) { *index = i + 1; return 4; } @@ -1101,14 +1098,14 @@ s32 func_80046E40(Player* player, f32* hitboxData, s32* index, f32 xPos, f32 yPo return 0; } -void func_80047504(Player* player) { +void func_tank_80047504(Player* player) { s32 pad; player->unk_204 = 1; - func_80045130(player); + func_tank_80045130(player); D_800C9F14 = 0; - func_80045678(player); - func_80045348(player); + func_tank_80045678(player); + func_tank_80045348(player); if (!player->unk_2B4) { if (D_800C9F14 != 0) { if (D_800C9F14 >= 2) { @@ -1136,14 +1133,14 @@ void func_80047504(Player* player) { player->unk_2BC = 0.0f; } } - func_800B41E0(player); - func_80045E7C(player); - func_80044868(player); + func_play_800B41E0(player); + func_tank_80045E7C(player); + func_tank_80044868(player); D_800C9F04 = 0; - func_800ADF58(player); - func_800AD7F0(player); + func_play_800ADF58(player); + func_play_800AD7F0(player); if (gCurrentLevel != LEVEL_MACBETH) { - func_800A8BA4(player); + func_play_800A8BA4(player); } else { player->unk_064 = player->pos.x; player->unk_06C = player->unk_138 + -10.0f; @@ -1151,64 +1148,64 @@ void func_80047504(Player* player) { player->unk_248 = 0.0f; player->unk_24C = 0.0f; player->unk_070 = 0.0f; - func_800481F4(player); + func_tank_800481F4(player); } if (gCurrentLevel == LEVEL_TITANIA) { - func_80046358(player); - func_80046260(player); + func_tank_80046358(player); + func_tank_80046260(player); } - func_800B415C(player); + func_play_800B415C(player); if ((player->shields <= 0) && (player->timer_220 != 0)) { - func_800B41EC(player); + func_play_800B41EC(player); } } // lots of fake stuff here -void func_80047754(Player* player) { +void func_tank_80047754(Player* player) { u8 sp2F = false; - if ((D_i5_801BE2F0[5] == 0) && (func_i5_801A3300(player, player->unk_138, player->unk_0E8) == 0)) { - if (((player->pos.x - 110.0f) < D_i5_801BE250[9]) && (D_i5_801BE250[9] < (player->pos.x + 110.0f)) && - ((player->pos.y - 60.0f) < (D_i5_801BE250[2] + 30.0f)) && - ((D_i5_801BE250[2] + 30.0f) < (player->pos.y + 60.f))) { - func_80047D38(player, D_i5_801BE250[2] + 29.0f); - player->unk_0E4 = D_i5_801BE250[3]; - func_80047FBC(player); + if ((D_MA_801BE2F0[5] == 0) && (Macbeth_801A3300(player, player->unk_138, player->unk_0E8) == 0)) { + if (((player->pos.x - 110.0f) < D_MA_801BE250[9]) && (D_MA_801BE250[9] < (player->pos.x + 110.0f)) && + ((player->pos.y - 60.0f) < (D_MA_801BE250[2] + 30.0f)) && + ((D_MA_801BE250[2] + 30.0f) < (player->pos.y + 60.f))) { + func_tank_80047D38(player, D_MA_801BE250[2] + 29.0f); + player->unk_0E4 = D_MA_801BE250[3]; + func_tank_80047FBC(player); sp2F = true; } else { - if (((player->pos.x - 150.0f) < D_i5_801BE250[9]) && (D_i5_801BE250[9] < (player->pos.x + 150.0f)) && - ((player->pos.y - 60.0f) < (D_i5_801BE250[2] + 30.0f)) && - ((D_i5_801BE250[2] + 30.0f) < (player->pos.y + 60.0f))) { - func_80047E7C(player, D_i5_801BE250[9], D_i5_801BE250[2] + 30.0f); + if (((player->pos.x - 150.0f) < D_MA_801BE250[9]) && (D_MA_801BE250[9] < (player->pos.x + 150.0f)) && + ((player->pos.y - 60.0f) < (D_MA_801BE250[2] + 30.0f)) && + ((D_MA_801BE250[2] + 30.0f) < (player->pos.y + 60.0f))) { + func_tank_80047E7C(player, D_MA_801BE250[9], D_MA_801BE250[2] + 30.0f); } if (1) {} } } - if (func_i5_801A3C20(player->unk_138)) { - player->unk_0E4 = D_i5_801BE250[23]; - if (((player->pos.x - 200.0f) < D_i5_801BE250[21]) && (D_i5_801BE250[21] < (player->pos.x + 200.0f))) { - if (((player->pos.y - 60.0f) < D_i5_801BE250[22]) && (D_i5_801BE250[22] < (player->pos.y + 60.0f))) { - func_80047D38(player, D_i5_801BE250[22]); + if (Macbeth_801A3C20(player->unk_138)) { + player->unk_0E4 = D_MA_801BE250[23]; + if (((player->pos.x - 200.0f) < D_MA_801BE250[21]) && (D_MA_801BE250[21] < (player->pos.x + 200.0f))) { + if (((player->pos.y - 60.0f) < D_MA_801BE250[22]) && (D_MA_801BE250[22] < (player->pos.y + 60.0f))) { + func_tank_80047D38(player, D_MA_801BE250[22]); } else { - if ((100.0f < (D_i5_801BE250[22] - player->pos.y)) && ((D_i5_801BE250[22] - player->pos.y) < 130.0f)) { + if ((100.0f < (D_MA_801BE250[22] - player->pos.y)) && ((D_MA_801BE250[22] - 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_i5_801BE250[21]) && (D_i5_801BE250[21] < (player->pos.x + 65.0f)))) { - if (!(((player->pos.x - 100.0f) < D_i5_801BE250[21]) && - (D_i5_801BE250[21] < (player->pos.x + 100.0f)))) { + if (!(((player->pos.x - 65.0f) < D_MA_801BE250[21]) && (D_MA_801BE250[21] < (player->pos.x + 65.0f)))) { + if (!(((player->pos.x - 100.0f) < D_MA_801BE250[21]) && + (D_MA_801BE250[21] < (player->pos.x + 100.0f)))) { player->unk_1D4 = 9; - Math_SmoothStepToF(&player->pos.y, D_i5_801BE250[22] + 100.0f, 0.5f, 20.0f, 0); + Math_SmoothStepToF(&player->pos.y, D_MA_801BE250[22] + 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_i5_801BE250[21], 0.02f, 30.0f, 0); + Math_SmoothStepToF(&player->pos.x, D_MA_801BE250[21], 0.02f, 30.0f, 0); Math_SmoothStepToF(&player->unk_12C, -30.0f, 1.0f, 10.0f, 0); - D_i5_801BE250[13] += 0; // fake? + D_MA_801BE250[13] += 0; // fake? } player->unk_188 = 0; - if (player->pos.x < D_i5_801BE250[21]) { + if (player->pos.x < D_MA_801BE250[21]) { player->vel.x = 0.0f; player->pos.x += 8.0f; } else { @@ -1220,32 +1217,32 @@ void func_80047754(Player* player) { } label_29: - if (((D_i5_801BE2F0[5] == 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_801BE250[19]) && (D_i5_801BE250[19] < (player->pos.x + 110.0f)) && - ((player->pos.y - 60.0f) < (D_i5_801BE250[12] + 30.0f)) && - ((D_i5_801BE250[12] + 30.0f) < (player->pos.y + 60.0f))) { + if (((D_MA_801BE2F0[5] == 1) || (player->unk_138 < -116467.875f)) && + (Macbeth_801A3790(player, player->unk_138, player->unk_0E8) == 0)) { + if (((player->pos.x - 110.0f) < D_MA_801BE250[19]) && (D_MA_801BE250[19] < (player->pos.x + 110.0f)) && + ((player->pos.y - 60.0f) < (D_MA_801BE250[12] + 30.0f)) && + ((D_MA_801BE250[12] + 30.0f) < (player->pos.y + 60.0f))) { sp2F = true; - func_80047D38(player, D_i5_801BE250[12] + 29.0f); - player->unk_0E4 = D_i5_801BE250[13]; // not fake, but weird - player->unk_0E4 = D_i5_801BE250[13]; - func_80047FBC(player); + func_tank_80047D38(player, D_MA_801BE250[12] + 29.0f); + player->unk_0E4 = D_MA_801BE250[13]; // not fake, but weird + player->unk_0E4 = D_MA_801BE250[13]; + func_tank_80047FBC(player); } else { - if (((player->pos.x - 150.0f) < D_i5_801BE250[19]) && (D_i5_801BE250[19] < (player->pos.x + 150.0f)) && - ((player->pos.y - 60.0f) < (D_i5_801BE250[12] + 30.0f)) && - ((D_i5_801BE250[12] + 30.0f) < (player->pos.y + 60.0f))) { - func_80047E7C(player, D_i5_801BE250[19], D_i5_801BE250[12] + 30.0f); + if (((player->pos.x - 150.0f) < D_MA_801BE250[19]) && (D_MA_801BE250[19] < (player->pos.x + 150.0f)) && + ((player->pos.y - 60.0f) < (D_MA_801BE250[12] + 30.0f)) && + ((D_MA_801BE250[12] + 30.0f) < (player->pos.y + 60.0f))) { + func_tank_80047E7C(player, D_MA_801BE250[19], D_MA_801BE250[12] + 30.0f); } } } if (!sp2F) { - if (!D_i5_801BE250) {} + if (!D_MA_801BE250) {} - func_80046704(player); + func_tank_80046704(player); } } -void func_80047D38(Player* player, f32 arg1) { +void func_tank_80047D38(Player* player, f32 arg1) { if ((player->unk_16C > 0.2f) && (player->unk_170 > 0.2f) && (player->timer_220 == 0) && (player->vel.y >= 0.0f)) { return; } @@ -1263,7 +1260,7 @@ void func_80047D38(Player* player, f32 arg1) { } } -void func_80047E7C(Player* player, f32 arg1, f32 arg2) { +void func_tank_80047E7C(Player* player, f32 arg1, f32 arg2) { player->unk_188 = 0.0f; if (player->pos.x < arg1) { if (player->unk_12C >= -10.0f) { @@ -1290,7 +1287,7 @@ void func_80047E7C(Player* player, f32 arg1, f32 arg2) { } } -void func_80047FBC(Player* player) { +void func_tank_80047FBC(Player* player) { f32 temp_fv0; f32 temp_fv0_2; @@ -1325,7 +1322,7 @@ void func_80047FBC(Player* player) { } } -void func_800481F4(Player* player) { +void func_tank_800481F4(Player* player) { s32 pad[17]; s32 i; s32 temp_v0; @@ -1337,8 +1334,8 @@ void func_800481F4(Player* player) { s32 pad2; f32 var_fv1; - func_800A887C(player); - func_800444BC(player); + func_play_800A887C(player); + func_tank_800444BC(player); if (player->timer_498 == 0) { for (i = 0, obj80 = gObjects80; i < ARRAY_COUNT(gObjects80); i++, obj80++) { if ((obj80->obj.status == OBJ_ACTIVE) && (obj80->obj.id != OBJ_80_58) && (obj80->obj.id != OBJ_80_105) && @@ -1348,19 +1345,19 @@ void func_800481F4(Player* player) { (obj80->obj.id != OBJ_80_73) && (obj80->obj.id != OBJ_80_74) && (obj80->obj.id != OBJ_80_69) && ((player->unk_138 - 2000.0f) < obj80->obj.pos.z)) { var_fv1 = obj80->obj.rot.y; - if (obj80->info.action == (ObjectFunc) func_80066EA8) { + if (obj80->info.action == (ObjectFunc) func_enmy_80066EA8) { var_fv1 = 0.0f; } temp_v0 = - func_800A7974(player, obj80->info.hitbox, &sp98, obj80->obj.pos.x, obj80->obj.pos.y, - obj80->obj.pos.z, obj80->obj.rot.x, var_fv1, obj80->obj.rot.z, 0.0f, 0.0f, 0.0f); + func_play_800A7974(player, obj80->info.hitbox, &sp98, obj80->obj.pos.x, obj80->obj.pos.y, + obj80->obj.pos.z, obj80->obj.rot.x, var_fv1, obj80->obj.rot.z, 0.0f, 0.0f, 0.0f); if (temp_v0 != 0) { if (temp_v0 < 0) { if (temp_v0 == -1) { - D_80178540 = 40; - D_80178570 = 20; - D_80178574 = 20; - D_80178578 = 20; + D_ctx_80178540 = 40; + D_ctx_80178570 = 20; + D_ctx_80178574 = 20; + D_ctx_80178578 = 20; player->unk_23C = 80; if (player->unk_22C == 0) { AUDIO_PLAY_SFX(0x19000001, player->sfxSource, 0); @@ -1381,9 +1378,9 @@ void func_800481F4(Player* player) { for (i = 0, boss = gBosses; i < ARRAY_COUNT(gBosses); i++, boss++) { if (boss->obj.status == OBJ_ACTIVE) { - temp_v0 = - func_800A7974(player, boss->info.hitbox, &sp98, boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, - boss->obj.rot.x, boss->obj.rot.y, boss->obj.rot.z, 0.0f, 0.0f, 0.0f); + temp_v0 = func_play_800A7974(player, boss->info.hitbox, &sp98, boss->obj.pos.x, boss->obj.pos.y, + boss->obj.pos.z, boss->obj.rot.x, boss->obj.rot.y, boss->obj.rot.z, 0.0f, + 0.0f, 0.0f); if (temp_v0 != 0) { Player_ApplyDamage(player, temp_v0, boss->info.damage); } @@ -1393,19 +1390,19 @@ void func_800481F4(Player* player) { for (i = 0, actor = gActors; i < ARRAY_COUNT(gActors); i++, actor++) { if ((actor->obj.status == OBJ_ACTIVE) && (actor->timer_0C2 == 0)) { if (actor->obj.id == OBJ_ACTOR_200) { - temp_v0 = - func_800A7974(player, actor->info.hitbox, &sp98, actor->obj.pos.x, actor->obj.pos.y, - actor->obj.pos.z, actor->obj.rot.x, actor->obj.rot.y, actor->obj.rot.z, - actor->vwork[29].x, actor->vwork[29].y, actor->vwork[29].z + actor->unk_0F4.z); + temp_v0 = func_play_800A7974(player, actor->info.hitbox, &sp98, actor->obj.pos.x, actor->obj.pos.y, + actor->obj.pos.z, actor->obj.rot.x, actor->obj.rot.y, actor->obj.rot.z, + actor->vwork[29].x, actor->vwork[29].y, + actor->vwork[29].z + actor->unk_0F4.z); if (temp_v0 != 0) { Player_ApplyDamage(player, temp_v0, actor->info.damage); actor->unk_0D0 = 3; actor->unk_0D4 = player->num + 1; } } else if (actor->obj.id == OBJ_ACTOR_207) { - if (func_80046E40(player, actor->info.hitbox, &sp98, actor->obj.pos.x, actor->obj.pos.y, - actor->obj.pos.z, actor->obj.rot.x, actor->obj.rot.y, actor->obj.rot.z, 0.0f, - 0.0f, 0.0f) != 0) { + if (func_tank_80046E40(player, actor->info.hitbox, &sp98, actor->obj.pos.x, actor->obj.pos.y, + actor->obj.pos.z, actor->obj.rot.x, actor->obj.rot.y, actor->obj.rot.z, 0.0f, + 0.0f, 0.0f) != 0) { if (player->pos.x < actor->obj.pos.x) { player->unk_0D8.x = (actor->vel.z > 5.0f) ? -5.0f : -1.5f; player->unk_1DC = 8; @@ -1427,9 +1424,10 @@ void func_800481F4(Player* player) { player->timer_498 = 1; } } else if ((actor->obj.id >= 205) && (actor->obj.id < 214)) { - if (func_80046E40(player, actor->info.hitbox, &sp98, actor->fwork[25] + actor->obj.pos.x, - actor->fwork[8] + actor->obj.pos.y + 25.0f, actor->obj.pos.z, actor->fwork[29], - actor->fwork[26], actor->obj.rot.z, 0.0f, 0.0f, 0.0f) != 0) { + if (func_tank_80046E40(player, actor->info.hitbox, &sp98, actor->fwork[25] + actor->obj.pos.x, + actor->fwork[8] + actor->obj.pos.y + 25.0f, actor->obj.pos.z, + actor->fwork[29], actor->fwork[26], actor->obj.rot.z, 0.0f, 0.0f, + 0.0f) != 0) { Math_SmoothStepToF(&player->unk_0D0, 15.0f, 0.3f, 3.5f, 0.001f); Math_SmoothStepToF(&player->unk_08C, 0, 0.3f, 3.5f, 0.001f); if (player->pos.x < (actor->fwork[23] + actor->obj.pos.x)) { @@ -1454,9 +1452,9 @@ void func_800481F4(Player* player) { } } } else { - temp_v0 = func_800A7974(player, actor->info.hitbox, &sp98, actor->obj.pos.x, actor->obj.pos.y, - actor->obj.pos.z, actor->obj.rot.x, actor->obj.rot.y, actor->obj.rot.z, - 0.0f, 0.0f, 0.0f); + temp_v0 = func_play_800A7974(player, actor->info.hitbox, &sp98, actor->obj.pos.x, actor->obj.pos.y, + actor->obj.pos.z, actor->obj.rot.x, actor->obj.rot.y, actor->obj.rot.z, + 0.0f, 0.0f, 0.0f); if (temp_v0 != 0) { actor->unk_0D0 = 3; if ((actor->obj.id == OBJ_ACTOR_225) || (actor->obj.id == OBJ_ACTOR_190)) { @@ -1477,8 +1475,8 @@ void func_800481F4(Player* player) { for (i = 0, obj4C = gObjects4C; i < ARRAY_COUNT(gObjects4C); i++, obj4C++) { if (obj4C->obj.status == OBJ_ACTIVE) { if ((player->unk_138 - 200.0f) < obj4C->obj.pos.z) { - temp_v0 = func_800A7974(player, obj4C->info.hitbox, &sp98, obj4C->obj.pos.x, obj4C->obj.pos.y, - obj4C->obj.pos.z, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); + temp_v0 = func_play_800A7974(player, obj4C->info.hitbox, &sp98, obj4C->obj.pos.x, obj4C->obj.pos.y, + obj4C->obj.pos.z, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); if (temp_v0 != 0) { if ((obj4C->obj.id == OBJ_4C_163) || (obj4C->obj.id == OBJ_4C_161) || (obj4C->obj.id == OBJ_4C_162)) { @@ -1495,5 +1493,5 @@ void func_800481F4(Player* player) { } } } - func_800A86E4(player); + func_play_800A86E4(player); } diff --git a/src/main/fox_versus.c b/src/main/fox_versus.c index e7aefa35..a4af5ffe 100644 --- a/src/main/fox_versus.c +++ b/src/main/fox_versus.c @@ -1,13 +1,15 @@ #include "global.h" #include "fox_option.h" #include "assets/ast_vs_menu.h" +#include "assets/ast_font.h" +#include "assets/ast_versus.h" -s32 D_80178750; -s32 D_80178754; -s32 D_80178758; +s32 D_versus_80178750; +s32 D_versus_80178754; +s32 D_versus_80178758; s32 sUnlockLandmaster; s32 sUnlockOnFoot; -s32 D_80178768[4]; +s32 D_versus_80178768[4]; s32 D_80178778; s32 D_80178780[4]; s32 D_80178790; @@ -39,20 +41,17 @@ s32 D_80178850[4]; OSTime D_80178860; OSTime D_80178868; -#include "assets/ast_font.h" -#include "assets/ast_versus.h" - s32 D_800D4A90 = 0; s32 D_800D4A94 = 0; s32 D_800D4A98 = 0; s32 D_800D4A9C = 0; s32 D_800D4AA0 = 0; -void func_800BC760(void) { +void func_versus_800BC760(void) { s32 i; Memory_FreeAll(); - func_800A6148(); + func_play_800A6148(); for (i = 0; i < gCamCount; i++) { Audio_KillSfxBySource(gPlayer[i].sfxSource); @@ -62,29 +61,29 @@ void func_800BC760(void) { gGameState = GSTATE_INIT; D_Timer_8017783C = 2; gCamCount = GSTATE_INIT; - D_80177854 = 0; + D_ctx_80177854 = 0; gDrawMode = DRAWMODE_0; - D_80177AE0 = 0; + D_ctx_80177AE0 = 0; gOptionMenuStatus = OPTION_WAIT; - D_80177B40 = 0; + D_ctx_80177B40 = 0; gBgColor = 0; - D_80178380[0] = 0; - D_80178380[1] = 0; - D_80178380[2] = 0; - D_80178380[3] = 0; + D_ctx_80178380[0] = 0; + D_ctx_80178380[1] = 0; + D_ctx_80178380[2] = 0; + D_ctx_80178380[3] = 0; gOverlayStage = 0; gRadioState = 0; gVersusMode = 0; - D_80178358 = 0; - D_80178340 = 0xFF; - D_80177824 = GSTATE_INIT; + D_ctx_80178358 = 0; + D_ctx_80178340 = 0xFF; + D_ctx_80177824 = GSTATE_INIT; } -void func_800BC88C(f32 xPos, f32 yPos, f32 scale) { +void func_versus_800BC88C(f32 xPos, f32 yPos, f32 scale) { TextureRect_8bIA(&gMasterDisp, D_VS_MENU_7003830, 64, 17, xPos, yPos, scale, scale); } -void func_800BC8D8(f32 xPos, f32 yPos, f32 scale) { +void func_versus_800BC8D8(f32 xPos, f32 yPos, f32 scale) { s32 i; for (i = 0; i < 2; i++) { @@ -96,7 +95,7 @@ void func_800BC8D8(f32 xPos, f32 yPos, f32 scale) { yPos + (8 * i * scale), scale, scale); } -void func_800BC9DC(f32 xPos, f32 yPos, f32 scale, s32 yScale) { +void func_versus_800BC9DC(f32 xPos, f32 yPos, f32 scale, s32 yScale) { u16* D_800D4AA4[] = { D_versus_3008DE0, D_versus_30098C0, D_versus_300A390 }; u8* D_800D4ABC[] = { D_versus_30087A0, D_versus_3008EC0, D_versus_3009990 }; s32 D_800D4AB0[] = { 40, 64, 64 }; @@ -108,7 +107,7 @@ void func_800BC9DC(f32 xPos, f32 yPos, f32 scale, s32 yScale) { } } -void func_800BCB44(f32 xPos, f32 yPos, f32 scale) { +void func_versus_800BCB44(f32 xPos, f32 yPos, f32 scale) { s32 i; for (i = 0; i < 2; i++) { @@ -119,7 +118,7 @@ void func_800BCB44(f32 xPos, f32 yPos, f32 scale) { yPos + (8 * i * scale), scale, scale); } -void func_800BCC48(f32 xPos, f32 yPos, f32 xScale, f32 yScale, s32 arg4) { +void func_versus_800BCC48(f32 xPos, f32 yPos, f32 xScale, f32 yScale, s32 arg4) { u16* D_800D4AC8[] = { D_versus_3006A68, D_versus_3008598, D_versus_300C458, D_versus_3005E38 }; u8* D_800D4AD8[] = { D_versus_3006040, D_versus_30076C0, D_versus_300B3F0, D_versus_3004F60 }; s32 D_800D4AE8[] = { 104, 152, 168, 152 }; @@ -133,7 +132,7 @@ void func_800BCC48(f32 xPos, f32 yPos, f32 xScale, f32 yScale, s32 arg4) { xPos, yPos + (8 * i * yScale), xScale, yScale); } -void func_800BCE24(f32 xPos, f32 yPos, f32 xScale, f32 yScale) { +void func_versus_800BCE24(f32 xPos, f32 yPos, f32 xScale, f32 yScale) { s32 i; for (i = 0; i < 6; i++) { @@ -142,7 +141,7 @@ void func_800BCE24(f32 xPos, f32 yPos, f32 xScale, f32 yScale) { } } -void func_800BCEF8(f32 xPos, f32 yPos, f32 scale) { +void func_versus_800BCEF8(f32 xPos, f32 yPos, f32 scale) { s32 i; for (i = 0; i < 12; i++) { @@ -153,51 +152,51 @@ void func_800BCEF8(f32 xPos, f32 yPos, f32 scale) { yPos + (2 * i * scale), scale, scale); } -void func_800BCFFC(f32 xPos, f32 yPos, f32 xScale, f32 yScale) { +void func_versus_800BCFFC(f32 xPos, f32 yPos, f32 xScale, f32 yScale) { TextureRect_8bCI(&gMasterDisp, D_1013170, D_1013570, 24, 17, xPos, yPos, xScale, yScale); } -void func_800BD05C(f32 xPos, f32 yPos, f32 scale) { +void func_versus_800BD05C(f32 xPos, f32 yPos, f32 scale) { TextureRect_4bCI(&gMasterDisp, D_versus_30003A0, D_versus_30004E0, 64, 10, xPos, yPos, scale, scale); } -void func_800BD0B4(f32 xPos, f32 yPos, f32 scale) { +void func_versus_800BD0B4(f32 xPos, f32 yPos, f32 scale) { TextureRect_4bCI(&gMasterDisp, D_versus_3000510, D_versus_30006A0, 80, 10, xPos, yPos, scale, scale); } -void func_800BD10C(f32 xPos, f32 yPos, f32 scale) { +void func_versus_800BD10C(f32 xPos, f32 yPos, f32 scale) { TextureRect_4bCI(&gMasterDisp, D_versus_30006D0, D_versus_3000810, 64, 10, xPos, yPos, scale, scale); } -void func_800BD164(f32 xPos, f32 yPos) { +void func_versus_800BD164(f32 xPos, f32 yPos) { TextureRect_8bIA(&gMasterDisp, D_VS_MENU_7003C70, 16, 16, xPos, yPos, 1.0f, 1.0f); } -void func_800BD1B0(f32 xPos, f32 yPos) { +void func_versus_800BD1B0(f32 xPos, f32 yPos) { TextureRect_8bIA(&gMasterDisp, D_VS_MENU_7003F10, 16, 16, xPos, yPos, 1.0f, 1.0f); } -void func_800BD1FC(f32 xPos, f32 yPos) { +void func_versus_800BD1FC(f32 xPos, f32 yPos) { TextureRect_8bIA(&gMasterDisp, D_VS_MENU_7003E10, 16, 16, xPos, yPos, 1.0f, 1.0f); } -void func_800BD248(f32 xPos, f32 yPos) { +void func_versus_800BD248(f32 xPos, f32 yPos) { TextureRect_8bCI(&gMasterDisp, D_VS_MENU_7004050, D_VS_MENU_7004150, 16, 16, xPos, yPos, 1.0f, 1.0f); } -void func_800BD2A0(f32 xPos, f32 yPos) { +void func_versus_800BD2A0(f32 xPos, f32 yPos) { TextureRect_8bCI(&gMasterDisp, D_VS_MENU_70041F0, D_VS_MENU_70042F0, 16, 16, xPos, yPos, 1.0f, 1.0f); } -void func_800BD2F8(f32 xPos, f32 yPos) { +void func_versus_800BD2F8(f32 xPos, f32 yPos) { TextureRect_8bCI(&gMasterDisp, D_VS_MENU_7004360, D_VS_MENU_7004460, 16, 16, xPos, yPos, 1.0f, 1.0f); } -void func_800BD350(f32 xPos, f32 yPos) { +void func_versus_800BD350(f32 xPos, f32 yPos) { TextureRect_8bCI(&gMasterDisp, D_VS_MENU_70044D0, D_VS_MENU_7004990, 64, 19, xPos, yPos, 1.0f, 1.0f); } -void func_800BD3A8(f32 xPos, f32 yPos) { +void func_versus_800BD3A8(f32 xPos, f32 yPos) { s32 i; for (i = 0; i < 8; i++) { @@ -208,7 +207,7 @@ void func_800BD3A8(f32 xPos, f32 yPos) { yPos + (i * 8), 1.0f, 1.0f); } -void func_800BD4D4(f32 xPos, f32 yPos, s32 arg2) { +void func_versus_800BD4D4(f32 xPos, f32 yPos, s32 arg2) { u8* D_800D4AF8[] = { D_5000000, D_5000080, D_5000100, D_5000180, D_5000200, D_5000280, D_5000300, D_5000380, D_5000400, D_5000480 }; bool var_s2 = false; @@ -229,15 +228,15 @@ void func_800BD4D4(f32 xPos, f32 yPos, s32 arg2) { TextureRect_8bIA(&gMasterDisp, D_800D4AF8[arg2 / i], 16, 8, xPos, yPos, 1.0f, 1.0f); } -void func_800BD720(f32 xPos, f32 yPos) { +void func_versus_800BD720(f32 xPos, f32 yPos) { TextureRect_8bIA(&gMasterDisp, D_versus_30013E0, 8, 8, xPos, yPos, 1.0f, 1.0f); } -void func_800BD76C(f32 xPos, f32 yPos) { +void func_versus_800BD76C(f32 xPos, f32 yPos) { TextureRect_4bCI(&gMasterDisp, D_versus_30001E0, D_versus_3000380, 64, 13, xPos, yPos, 1.0f, 1.0f); } -void func_800BD7C4(f32 xPos, f32 yPos, s32 arg2) { +void func_versus_800BD7C4(f32 xPos, f32 yPos, s32 arg2) { u8* D_800D4B20[] = { D_5000000, D_5000080, D_5000100, D_5000180, D_5000200, D_5000280, D_5000300, D_5000380, D_5000400, D_5000480 }; s32 i; @@ -255,15 +254,15 @@ void func_800BD7C4(f32 xPos, f32 yPos, s32 arg2) { } } -void func_800BD9FC(f32 xPos, f32 yPos) { +void func_versus_800BD9FC(f32 xPos, f32 yPos) { TextureRect_4bCI(&gMasterDisp, D_1011E80, D_1011EC0, 16, 8, xPos, yPos, 1.0f, 1.0f); } -void func_800BDA54(f32 xPos, f32 yPos) { +void func_versus_800BDA54(f32 xPos, f32 yPos) { TextureRect_8bIA(&gMasterDisp, D_5007F60, 8, 8, xPos, yPos, 1.0f, 1.0f); } -void func_800BDAA0(f32 xPos, f32 yPos, s32 arg2, s32 arg3, s32 arg4) { +void func_versus_800BDAA0(f32 xPos, f32 yPos, s32 arg2, s32 arg3, s32 arg4) { u8* D_800D4B48[] = { D_5009F60, D_500A050, D_500A140, D_500A230, D_500A320, D_500A410, D_500A500, D_500A5F0, D_500A6E0, D_500A7D0 }; s32 i = 1000; @@ -299,10 +298,10 @@ void func_800BDAA0(f32 xPos, f32 yPos, s32 arg2, s32 arg3, s32 arg4) { } } -void func_800BDE3C(void) { +void func_versus_800BDE3C(void) { } -void func_800BDE44(void) { +void func_versus_800BDE44(void) { s32 i; f32 D_800D4B70[] = { 82.0f, @@ -322,16 +321,16 @@ void func_800BDE44(void) { for (i = 0; i < 4; i++) { if ((gPlayer[i].state_1C8 == 3) || (gPlayer[i].state_1C8 == 5)) { - if ((D_80177C30[i] != D_80178808[i]) || (D_80178810[i])) { + if ((D_ctx_80177C30[i] != D_80178808[i]) || (D_80178810[i])) { D_80178810[i] += 4; if (D_80178810[i] > 15) { - if (D_80177C30[i] > D_80178808[i]) { + if (D_ctx_80177C30[i] > D_80178808[i]) { D_80178808[i] += 1; } else { D_80178808[i] -= 1; } - if (D_80177C30[i] != D_80178808[i]) { + if (D_ctx_80177C30[i] != D_80178808[i]) { D_80178810[i] -= 15; } else { D_80178810[i] = 0; @@ -340,56 +339,56 @@ void func_800BDE44(void) { } } - if (D_80177C30[i] >= D_80178808[i]) { - func_800BDAA0(D_800D4B70[i], D_800D4B80[i], D_80178808[i] + 1, D_80178808[i], D_80178810[i]); + if (D_ctx_80177C30[i] >= D_80178808[i]) { + func_versus_800BDAA0(D_800D4B70[i], D_800D4B80[i], D_80178808[i] + 1, D_80178808[i], D_80178810[i]); } else { - func_800BDAA0(D_800D4B70[i], D_800D4B80[i], D_80178808[i] - 1, D_80178808[i], D_80178810[i]); + func_versus_800BDAA0(D_800D4B70[i], D_800D4B80[i], D_80178808[i] - 1, D_80178808[i], D_80178810[i]); } } } } -s32 func_800BE078(void) { +s32 func_versus_800BE078(void) { s32 temp; while (true) { temp = (s32) CYCLES_TO_USEC((D_80178860 - D_80178868)) / 10000; - if ((D_80178768[2] -= temp) >= 0) { + if ((D_versus_80178768[2] -= temp) >= 0) { break; } - D_80178768[2] *= -1; - temp = (D_80178768[2] / 100) + 1; - D_80178768[2] %= 100; - D_80178768[2] = (100 - D_80178768[2]) % 100; + D_versus_80178768[2] *= -1; + temp = (D_versus_80178768[2] / 100) + 1; + D_versus_80178768[2] %= 100; + D_versus_80178768[2] = (100 - D_versus_80178768[2]) % 100; - if ((D_80178768[1] -= temp) >= 0) { - if ((D_80178768[0] == 0) && (D_80178768[1] < 15) && (D_80178768[1] >= 0)) { + if ((D_versus_80178768[1] -= temp) >= 0) { + if ((D_versus_80178768[0] == 0) && (D_versus_80178768[1] < 15) && (D_versus_80178768[1] >= 0)) { AUDIO_PLAY_SFX(0x4900C02AU, gDefaultSfxSource, 4U); } break; } // clang-format off - if (D_80178768[0] == 0) { AUDIO_PLAY_SFX(0x4900D036U, gDefaultSfxSource, 4U); } + if (D_versus_80178768[0] == 0) { AUDIO_PLAY_SFX(0x4900D036U, gDefaultSfxSource, 4U); } // clang-format on - D_80178768[1] *= -1; - temp = (D_80178768[1] / 60) + 1; - D_80178768[1] %= 60; - D_80178768[1] = (60 - D_80178768[1]) % 60; + D_versus_80178768[1] *= -1; + temp = (D_versus_80178768[1] / 60) + 1; + D_versus_80178768[1] %= 60; + D_versus_80178768[1] = (60 - D_versus_80178768[1]) % 60; - if ((D_80178768[0] -= temp) >= 0) { + if ((D_versus_80178768[0] -= temp) >= 0) { break; } - D_80178768[0] = 0; - D_80178768[1] = 0; - D_80178768[2] = 0; + D_versus_80178768[0] = 0; + D_versus_80178768[1] = 0; + D_versus_80178768[2] = 0; break; } return 0; } -s32 func_800BE300(f32 xPos, f32 yPos, s32* arg2) { +s32 func_versus_800BE300(f32 xPos, f32 yPos, s32* arg2) { s32 i; f32 xTemp; f32 x; @@ -417,11 +416,11 @@ s32 func_800BE300(f32 xPos, f32 yPos, s32* arg2) { if ((i % 2) == 1) { RCP_SetupDL(&gMasterDisp, 0x4E); - func_800BD9FC(x + xTemp, y); + func_versus_800BD9FC(x + xTemp, y); } else { RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255); - func_800BD7C4(x + xTemp, y, temp); + func_versus_800BD7C4(x + xTemp, y, temp); xTemp += 9.0f; } @@ -431,7 +430,7 @@ s32 func_800BE300(f32 xPos, f32 yPos, s32* arg2) { return 0; } -s32 func_800BE564(void) { +s32 func_versus_800BE564(void) { s32 i; s32 ret = 0; @@ -441,7 +440,7 @@ s32 func_800BE564(void) { continue; } D_80178780[i] = 1; - D_80177870[i] = 0; + D_ctx_80177870[i] = 0; ret++; } return ret; @@ -485,16 +484,16 @@ s32 func_800BE564(void) { if (D_80178780[i]) { switch (D_80178780[i]) { case 1: - D_80177870[i] = 0; + D_ctx_80177870[i] = 0; break; case 2: - D_80177870[i] = 1; + D_ctx_80177870[i] = 1; break; case 3: - D_80177870[i] = 3; + D_ctx_80177870[i] = 3; break; default: - D_80177870[i] = 0; + D_ctx_80177870[i] = 0; break; } ret++; @@ -504,65 +503,65 @@ s32 func_800BE564(void) { return ret; } -void func_800BE924(s32 index) { +void func_versus_800BE924(s32 index) { f32 D_800D4B90[] = { 40.0f, 200.0f, 40.0f, 200.0f }; f32 D_800D4BA0[] = { 20.0f, 20.0f, 140.0f, 140.0f }; RCP_SetupDL(&gMasterDisp, 0x4E); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - func_800BD3A8(D_800D4B90[index] + 0.0f, D_800D4BA0[index] + 10.0f); - func_800BD350(D_800D4B90[index] + 5.0f, D_800D4BA0[index] + 0.0f); + func_versus_800BD3A8(D_800D4B90[index] + 0.0f, D_800D4BA0[index] + 10.0f); + func_versus_800BD350(D_800D4B90[index] + 5.0f, D_800D4BA0[index] + 0.0f); if (sUnlockLandmaster && sUnlockOnFoot) { RCP_SetupDL(&gMasterDisp, 0x4E); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - func_800BD248(D_800D4B90[index] + 15.0f, D_800D4BA0[index] + 22.0f); - func_800BD2A0(D_800D4B90[index] + 15.0f, D_800D4BA0[index] + 40.0f); - func_800BD2F8(D_800D4B90[index] + 15.0f, D_800D4BA0[index] + 58.0f); + func_versus_800BD248(D_800D4B90[index] + 15.0f, D_800D4BA0[index] + 22.0f); + func_versus_800BD2A0(D_800D4B90[index] + 15.0f, D_800D4BA0[index] + 40.0f); + func_versus_800BD2F8(D_800D4B90[index] + 15.0f, D_800D4BA0[index] + 58.0f); RCP_SetupDL(&gMasterDisp, 0x4C); - func_800BD164(D_800D4B90[index] + 43.0f, D_800D4BA0[index] + 22.0f); - func_800BD1B0(D_800D4B90[index] + 43.0f, D_800D4BA0[index] + 40.0f); - func_800BD1FC(D_800D4B90[index] + 43.0f, D_800D4BA0[index] + 58.0f); + func_versus_800BD164(D_800D4B90[index] + 43.0f, D_800D4BA0[index] + 22.0f); + func_versus_800BD1B0(D_800D4B90[index] + 43.0f, D_800D4BA0[index] + 40.0f); + func_versus_800BD1FC(D_800D4B90[index] + 43.0f, D_800D4BA0[index] + 58.0f); } if (sUnlockLandmaster && !sUnlockOnFoot) { RCP_SetupDL(&gMasterDisp, 0x4E); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - func_800BD248(D_800D4B90[index] + 15.0f, D_800D4BA0[index] + 29.0f); - func_800BD2A0(D_800D4B90[index] + 15.0f, D_800D4BA0[index] + 51.0f); + func_versus_800BD248(D_800D4B90[index] + 15.0f, D_800D4BA0[index] + 29.0f); + func_versus_800BD2A0(D_800D4B90[index] + 15.0f, D_800D4BA0[index] + 51.0f); RCP_SetupDL(&gMasterDisp, 0x4C); - func_800BD164(D_800D4B90[index] + 43.0f, D_800D4BA0[index] + 29.0f); - func_800BD1B0(D_800D4B90[index] + 43.0f, D_800D4BA0[index] + 51.0f); + func_versus_800BD164(D_800D4B90[index] + 43.0f, D_800D4BA0[index] + 29.0f); + func_versus_800BD1B0(D_800D4B90[index] + 43.0f, D_800D4BA0[index] + 51.0f); } RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255); - func_800BD4D4(D_800D4B90[index] + 32.0f, D_800D4BA0[index] + 84.0f, (D_801787F8[index] / 30) + 1); + func_versus_800BD4D4(D_800D4B90[index] + 32.0f, D_800D4BA0[index] + 84.0f, (D_801787F8[index] / 30) + 1); } -void func_800BECA8(s32 index) { +void func_versus_800BECA8(s32 index) { f32 D_800D4BB0[] = { 40.0f, 200.0f, 40.0f, 200.0f }; f32 D_800D4BC0[] = { 40.0f, 40.0f, 160.0f, 160.0f }; RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 30, 0, 255); - func_800BC88C(D_800D4BB0[index], D_800D4BC0[index], 1.0f); + func_versus_800BC88C(D_800D4BB0[index], D_800D4BC0[index], 1.0f); } -void func_800BED78(void) { +void func_versus_800BED78(void) { RCP_SetupDL(&gMasterDisp, 0x4E); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - func_800BC8D8(84.0f, 108.0f, 1.0f); + func_versus_800BC8D8(84.0f, 108.0f, 1.0f); } -s32 func_800BEDDC(void) { +s32 func_versus_800BEDDC(void) { s32 i; s32 var_s4 = 0; if (!sUnlockLandmaster && !sUnlockOnFoot || (gVersusStage == VS_STAGE_SECTOR_Z)) { - func_800BED78(); + func_versus_800BED78(); return 0; } @@ -572,15 +571,15 @@ s32 func_800BEDDC(void) { } if (!D_80178780[i]) { - func_800BE924(i); + func_versus_800BE924(i); } else { - func_800BECA8(i); + func_versus_800BECA8(i); } if (D_80178780[i]) { var_s4++; if (var_s4 == D_801787B4) { - func_800BED78(); + func_versus_800BED78(); } } } @@ -588,7 +587,7 @@ s32 func_800BEDDC(void) { return 0; } -s32 func_800BEF00(void) { +s32 func_versus_800BEF00(void) { s32 ret; ret = 0; @@ -613,7 +612,7 @@ s32 func_800BEF00(void) { return ret; } -s32 func_800BEFE4(void) { +s32 func_versus_800BEFE4(void) { f32 D_800D4BD0[] = { 46.0f, 206.0f, 46.0f, 206.0f }; f32 D_800D4BE0[] = { 40.0f, 40.0f, 160.0f, 160.0f }; f32 D_800D4BF0[] = { 12.0f, 0.0f, 0.0f }; @@ -628,15 +627,15 @@ s32 func_800BEFE4(void) { } if (D_80178790 != 0) { - func_800BC9DC(D_800D4BD0[i] + D_800D4BF0[D_80178790 - 1], D_800D4BE0[i], 1.0f, D_80178790 - 1); + func_versus_800BC9DC(D_800D4BD0[i] + D_800D4BF0[D_80178790 - 1], D_800D4BE0[i], 1.0f, D_80178790 - 1); } else { - func_800BCB44(D_800D4BD0[i] - 16.0f, D_800D4BE0[i], 1.0f); + func_versus_800BCB44(D_800D4BD0[i] - 16.0f, D_800D4BE0[i], 1.0f); } } return 0; } -s32 func_800BF17C(void) { +s32 func_versus_800BF17C(void) { s32 i; f32 ret; @@ -649,8 +648,9 @@ s32 func_800BF17C(void) { continue; } - if ((gPlayerInactive[i]) || (D_801778AC == 1) || ((D_801787B4 == 1) && (D_801778AC != 2)) || - ((D_801778AC == 2) && (D_80178768[0] == 0) && (D_80178768[1] == 0) && (D_80178768[2] == 0))) { + if ((gPlayerInactive[i]) || (D_ctx_801778AC == 1) || ((D_801787B4 == 1) && (D_ctx_801778AC != 2)) || + ((D_ctx_801778AC == 2) && (D_versus_80178768[0] == 0) && (D_versus_80178768[1] == 0) && + (D_versus_80178768[2] == 0))) { ret = Math_SmoothStepToF(&D_801787D8[i], D_801787E8[i], 0.3f, 100.0f, 1.0f); if (ret == 0.0f) { if (D_801787E8[i] == 32.0f) { @@ -698,26 +698,26 @@ s32 func_800BF17C(void) { if (D_80178780[i] != 0) { switch (D_80178780[i]) { case 1: - D_80177870[i] = 0; + D_ctx_80177870[i] = 0; break; case 2: - D_80177870[i] = 1; + D_ctx_80177870[i] = 1; break; case 3: - D_80177870[i] = 3; + D_ctx_80177870[i] = 3; break; default: - D_80177870[i] = 0; + D_ctx_80177870[i] = 0; break; } D_80178820[i]++; - if (D_801778AC == 2) { - D_80177C30[i] = D_80178838[i] = D_80178808[i] = D_80178810[i] = 0; + if (D_ctx_801778AC == 2) { + D_ctx_80177C30[i] = D_80178838[i] = D_80178808[i] = D_80178810[i] = 0; } gPlayer[i].unk_1D0 = 1; } @@ -727,7 +727,7 @@ s32 func_800BF17C(void) { return 0; } -s32 func_800BF59C(void) { +s32 func_versus_800BF59C(void) { s32 i; f32 D_800D4BFC[] = { 83.0f, 226.0f, 83.0f, 226.0f }; f32 D_800D4C0C[] = { 102.0f, 102.0f, 209.0f, 209.0f }; @@ -740,20 +740,20 @@ s32 func_800BF59C(void) { continue; } - if ((gPlayerInactive[i]) || (D_801778AC == 1)) { + if ((gPlayerInactive[i]) || (D_ctx_801778AC == 1)) { colorGB = D_801787D8[i]; gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255); - func_800BD76C(D_800D4BFC[i], D_800D4C0C[i]); + func_versus_800BD76C(D_800D4BFC[i], D_800D4C0C[i]); } else { if (sUnlockLandmaster || sUnlockOnFoot) { - func_800BE924(i); + func_versus_800BE924(i); } } } return 0; } -void func_800BF750(void) { +void func_versus_800BF750(void) { s32 i; s32 j; f32 D_800D4C1C[] = { 112.0f, 272.0f, 112.0f, 272.0f }; @@ -770,23 +770,23 @@ void func_800BF750(void) { continue; } for (j = 0, temp = 0; j < 4; j++) { - if ((D_80177B00[i][j] != 0) && (gGameFrameCount & 4)) { + if ((D_ctx_80177B00[i][j] != 0) && (gGameFrameCount & 4)) { gDPSetPrimColor(gMasterDisp++, 0, 0, D_800D4C3C[j], D_800D4C4C[j], D_800D4C5C[j], 255); - func_800BDA54(D_800D4C1C[i] + temp * 9.0f, D_800D4C2C[i]); + func_versus_800BDA54(D_800D4C1C[i] + temp * 9.0f, D_800D4C2C[i]); temp++; } } } } -s32 func_800BF9AC(void) { +s32 func_versus_800BF9AC(void) { s32 i; s32 j; s32 temp; s32 var_a3; s32 temp2[4]; - switch (D_801778AC) { + switch (D_ctx_801778AC) { case 0: for (i = 0, var_a3 = 0; i < 4; i++) { if (gPlayer[i].state_1C8 != PLAYERSTATE_1C8_13) { @@ -798,16 +798,16 @@ s32 func_800BF9AC(void) { } if ((D_801787B4 == 1) && (var_a3 == 4)) { - D_80177E74 = 1; + D_ctx_80177E74 = 1; D_801787A8 = 99; break; } for (i = 0; i < 4; i++) { - if (D_80177DB8[i] == D_801778A4) { + if (D_ctx_80177DB8[i] == D_ctx_801778A4) { break; } - if (D_80177DB8[i] == (D_801778A4 - 1)) { + if (D_ctx_80177DB8[i] == (D_ctx_801778A4 - 1)) { D_800D4A9C = 1; } } @@ -829,7 +829,7 @@ s32 func_800BF9AC(void) { } gPlayer[j].state_1C8 = PLAYERSTATE_1C8_13; } - D_80177E74 = 1; + D_ctx_80177E74 = 1; D_801787A8 = i; break; @@ -844,7 +844,7 @@ s32 func_800BF9AC(void) { } } if ((D_801787B4 == 1) && (var_a3 == 4)) { - D_80177E74 = 1; + D_ctx_80177E74 = 1; D_801787A8 = 99; break; } @@ -870,18 +870,18 @@ s32 func_800BF9AC(void) { } gPlayer[j].state_1C8 = PLAYERSTATE_1C8_13; } - D_80177E74 = 1; + D_ctx_80177E74 = 1; break; case 2: - if ((D_80178768[0] != 0) || (D_80178768[1] != 0) || (D_80178768[2] != 0)) { + if ((D_versus_80178768[0] != 0) || (D_versus_80178768[1] != 0) || (D_versus_80178768[2] != 0)) { return (0); } - if (D_801778AC == 2) { + if (D_ctx_801778AC == 2) { for (i = 0; i < 4; i++) { if ((gPlayer[i].state_1C8 == PLAYERSTATE_1C8_4) || (gPlayer[i].state_1C8 == PLAYERSTATE_1C8_13)) { - D_80177C30[i] = D_80178838[i] = D_80178808[i] = D_80178810[i] = 0; + D_ctx_80177C30[i] = D_80178838[i] = D_80178808[i] = D_80178810[i] = 0; D_80178820[i] += 1; } } @@ -904,11 +904,11 @@ s32 func_800BF9AC(void) { } if (i != j) { - if (D_80177C30[i] < D_80177C30[j]) { + if (D_ctx_80177C30[i] < D_ctx_80177C30[j]) { temp2[i] = 1; break; } - if (D_80177C30[i] == D_80177C30[j]) { + if (D_ctx_80177C30[i] == D_ctx_80177C30[j]) { temp = 1; } } @@ -995,7 +995,7 @@ s32 func_800BF9AC(void) { gPlayer[j].state_1C8 = 13; } - D_80177E74 = 1; + D_ctx_80177E74 = 1; break; default: @@ -1005,7 +1005,7 @@ s32 func_800BF9AC(void) { return 1; } -void func_800C024C(void) { +void func_versus_800C024C(void) { D_801787BC = 1; D_80178798 = 0; D_801787C4 = 0.0f; @@ -1013,7 +1013,7 @@ void func_800C024C(void) { D_801787C0 = 400.0f; } -bool func_800C0294(s32 index) { +bool func_versus_800C0294(s32 index) { f32 D_800D4C6C[] = { 108.0f, 84.0f, 79.0f, 84.0f, 36.0f }; s32 ret = false; s32 temp; @@ -1061,17 +1061,17 @@ bool func_800C0294(s32 index) { return ret; } -s32 func_800C04DC(f32 xPos, f32 scale, s32 arg2) { +s32 func_versus_800C04DC(f32 xPos, f32 scale, s32 arg2) { f32 x; f32 y; - if ((D_801778AC == 2) && (D_800D4A98 & 32) && (D_801787A8 != 99)) { + if ((D_ctx_801778AC == 2) && (D_800D4A98 & 32) && (D_801787A8 != 99)) { x = 118.0f; y = 110.0f; RCP_SetupDL(&gMasterDisp, 0x4E); gDPSetPrimColor(gMasterDisp++, 0, 0, 0, 0, 0, 200); - func_800BCFFC(98.0f, 100.0f, 5.2f, 2.98f); + func_versus_800BCFFC(98.0f, 100.0f, 5.2f, 2.98f); RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255); @@ -1080,30 +1080,30 @@ s32 func_800C04DC(f32 xPos, f32 scale, s32 arg2) { Graphics_DisplaySmallText(x + 45.0f, y, 1.0f, 1.0f, "SCORE"); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - func_800869A0(x + 18.0f, y + 16.0f, D_800D4A94, 1.0f, 0, 9999); + func_hud_800869A0(x + 18.0f, y + 16.0f, D_800D4A94, 1.0f, 0, 9999); } else { if (arg2 < 4) { RCP_SetupDL(&gMasterDisp, 0x4E); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - func_800BCC48(xPos, 100.0f, scale, 1.0f, arg2); + func_versus_800BCC48(xPos, 100.0f, scale, 1.0f, arg2); } else { RCP_SetupDL(&gMasterDisp, 0x4E); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - func_800BCE24(xPos, 104.0f, scale, 1.0f); + func_versus_800BCE24(xPos, 104.0f, scale, 1.0f); } } return 0; } -s32 func_800C075C(void) { +s32 func_versus_800C075C(void) { RCP_SetupDL(&gMasterDisp, 0x4E); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - func_800BCEF8(94.0f, 126.0f, 1.0f); + func_versus_800BCEF8(94.0f, 126.0f, 1.0f); return 0; } -s32 func_800C07C4(void) { +s32 func_versus_800C07C4(void) { s32 i; s32 stick_y = 0; s32 ret = 0; @@ -1138,7 +1138,7 @@ s32 func_800C07C4(void) { return ret; } -bool func_800C08D0(void) { +bool func_versus_800C08D0(void) { f32 temp = 0.0f; temp += Math_SmoothStepToF(&D_801787CC, 1.55f, 0.6f, 10.0f, 0.04f); @@ -1151,15 +1151,15 @@ bool func_800C08D0(void) { } } -void func_800C0970(f32 yScale1, f32 yScale2) { +void func_versus_800C0970(f32 yScale1, f32 yScale2) { RCP_SetupDL(&gMasterDisp, 0x4E); gDPSetPrimColor(gMasterDisp++, 0, 0, 0, 0, 0, 255); - func_800BCFFC(98.0f, 72.0f, 5.19f, yScale1); - func_800BCFFC(98.0f, 152.0f, 5.19f, yScale2); + func_versus_800BCFFC(98.0f, 72.0f, 5.19f, yScale1); + func_versus_800BCFFC(98.0f, 152.0f, 5.19f, yScale2); } -s32 func_800C0A04(void) { - s32 ret = func_800C07C4(); +s32 func_versus_800C0A04(void) { + s32 ret = func_versus_800C07C4(); s32 var_v1; if (ret != 0) { @@ -1188,7 +1188,7 @@ s32 func_800C0A04(void) { return D_801787A4; } -s32 func_800C0B0C(void) { +s32 func_versus_800C0B0C(void) { s32 i; s32 colorGB[3]; @@ -1203,16 +1203,16 @@ s32 func_800C0B0C(void) { } gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB[0], colorGB[0], 255); - func_800BD05C(140.0f, 74.0f, 1.0f); + func_versus_800BD05C(140.0f, 74.0f, 1.0f); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB[1], colorGB[1], 255); - func_800BD0B4(124.0f, 86.0f, 1.0f); + func_versus_800BD0B4(124.0f, 86.0f, 1.0f); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB[2], colorGB[2], 255); - func_800BD10C(144.0f, 154.0f, 1.0f); + func_versus_800BD10C(144.0f, 154.0f, 1.0f); return 0; } -bool func_800C0C84(void) { +bool func_versus_800C0C84(void) { s32 i; for (i = 0; i < 4; i++) { @@ -1224,12 +1224,12 @@ bool func_800C0C84(void) { } } - func_800C0A04(); + func_versus_800C0A04(); return false; } -bool func_800C0D10(void) { +bool func_versus_800C0D10(void) { s32 i; s32 cont; bool ret = false; @@ -1247,7 +1247,7 @@ bool func_800C0D10(void) { cont = 0; for (i = 0; i < 4; i++) { - if (D_80177C30[i] == D_80178838[i]) { + if (D_ctx_80177C30[i] == D_80178838[i]) { cont++; continue; } @@ -1277,7 +1277,7 @@ bool func_800C0D10(void) { return ret; } -s32 func_800C0E78(void) { +s32 func_versus_800C0E78(void) { s32 i; u8* D_800D4C80[] = { "FOX", @@ -1299,14 +1299,14 @@ s32 func_800C0E78(void) { Graphics_DisplaySmallText(D_800D4C90[i], D_800D4CA4[i], 1.0f, 1.0f, D_800D4C80[i]); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - func_800869A0(D_800D4C90[i], D_800D4CA4[i] + 9.0f, D_80178838[i], 1.0f, 0, 999); + func_hud_800869A0(D_800D4C90[i], D_800D4CA4[i] + 9.0f, D_80178838[i], 1.0f, 0, 999); } } return 0; } -bool func_800C107C(s32 arg0) { +bool func_versus_800C107C(s32 arg0) { D_80178798++; if (D_80178798 == 10) { AUDIO_PLAY_SFX(0x49004007U, gDefaultSfxSource, 4U); @@ -1314,14 +1314,14 @@ bool func_800C107C(s32 arg0) { D_80178798 = 0; } - if (D_801787B8 < D_80177DB8[arg0]) { + if (D_801787B8 < D_ctx_80177DB8[arg0]) { return false; } else { return true; } } -s32 func_800C1138(s32 max, s32 arg1) { +s32 func_versus_800C1138(s32 max, s32 arg1) { f32 D_800D4CB8[] = { 24.0f, 248.0f, 24.0f, 248.0f }; f32 D_800D4CC8[] = { 104.0f, 104.0f, 216.0f, 216.0f }; s32 D_800D4CD8[] = { 177, 255, 0, 30 }; @@ -1332,16 +1332,16 @@ s32 func_800C1138(s32 max, s32 arg1) { for (i = 0; i < max; i++) { RCP_SetupDL(&gMasterDisp, 0x4D); - j = D_80177DD0[arg1][i]; + j = D_ctx_80177DD0[arg1][i]; gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); gDPSetEnvColor(gMasterDisp++, D_800D4CD8[j], D_800D4CE8[j], D_800D4CF8[j], 0); - func_800BD720(D_800D4CB8[arg1] + (i * 9.0f), D_800D4CC8[arg1]); + func_versus_800BD720(D_800D4CB8[arg1] + (i * 9.0f), D_800D4CC8[arg1]); } return 0; } -void func_800C1368(void) { +void func_versus_800C1368(void) { s32 i; for (i = 0, D_801787B4 = 0; i < 4; i++) { @@ -1357,7 +1357,7 @@ void func_800C1368(void) { D_801787D0 = 0.0f; D_801787AC = 255.0f; D_801787B0 = 0.0f; - D_80161A10 = 0.5f; + D_game_80161A10 = 0.5f; D_80178778 = 0; D_80178790 = 4; D_80178794 = 1; @@ -1366,18 +1366,18 @@ void func_800C1368(void) { D_801787A4 = 0; D_801787A8 = 99; D_801787B8 = 0; - D_80178750 = 0; + D_versus_80178750 = 0; gBgColor = 0; D_80178830 = 0; D_800D4A90 = 0; D_800D4A98 = 0; D_800D4A9C = D_800D4AA0 = 0; - D_80178340 = 0xFF; - D_8017835C = 0; - D_80178358 = 0; + D_ctx_80178340 = 0xFF; + D_ctx_8017835C = 0; + D_ctx_80178358 = 0; for (i = 0; i < 4; i++) { - D_80177C30[i] = 0; + D_ctx_80177C30[i] = 0; D_80178808[i] = 0; D_80178810[i] = 0; D_80178820[i] = 0; @@ -1399,23 +1399,23 @@ void func_800C1368(void) { sUnlockOnFoot = false; } - if (D_801778AC == 2) { - D_801778A4 = 10000; + if (D_ctx_801778AC == 2) { + D_ctx_801778A4 = 10000; } if (!sUnlockLandmaster) { sUnlockOnFoot = false; } - D_80178768[0] = D_801778C8 + 1; - D_80178768[1] = 0; - D_80178768[2] = 0; + D_versus_80178768[0] = D_ctx_801778C8 + 1; + D_versus_80178768[1] = 0; + D_versus_80178768[2] = 0; } -bool func_800C15D8(void) { +bool func_versus_800C15D8(void) { bool ret = false; - if (D_80161A10 >= 1.5f) { - D_80161A10 = 1.5f; + if (D_game_80161A10 >= 1.5f) { + D_game_80161A10 = 1.5f; switch (gVersusStage) { case VS_STAGE_CORNERIA: gBgColor = 0x8FBD; // 136, 240, 240 @@ -1435,19 +1435,19 @@ bool func_800C15D8(void) { } ret = true; } else { - D_80161A10 += 0.05f; + D_game_80161A10 += 0.05f; gBgColor = 0; } return ret; } -/* return type needs to be s32 for func_800C176C to match */ -s32 func_800C1690(void) { +/* return type needs to be s32 for func_versus_800C176C to match */ +s32 func_versus_800C1690(void) { D_80178798 = 0; } -bool func_800C16A0(s32 arg0) { +bool func_versus_800C16A0(s32 arg0) { if (arg0 != D_80178798) { D_80178798++; } else { @@ -1456,75 +1456,75 @@ bool func_800C16A0(s32 arg0) { return false; } -void func_800C16D0(void) { - func_800ABA08(); - D_80178754 = 0; +void func_versus_800C16D0(void) { + func_play_800ABA08(); + D_versus_80178754 = 0; D_80178778 = 0; } -void func_800C1700(void) { - func_800BC760(); +void func_versus_800C1700(void) { + func_versus_800BC760(); gGameState = GSTATE_MENU; D_Timer_8017783C = 2; gOptionMenuStatus = OPTION_WAIT; - D_800D2870 = 1; + D_game_800D2870 = 1; gBgColor = 0; } void dummy(void) { } -void func_800C175C(void) { +void func_versus_800C175C(void) { } -void func_800C1764(void) { +void func_versus_800C1764(void) { } -bool func_800C176C(void) { +bool func_versus_800C176C(void) { s32 ret = 0; - switch (D_80178754) { + switch (D_versus_80178754) { case 0: - func_800C1368(); - D_80178754 = 1; - func_800C1690(); + func_versus_800C1368(); + D_versus_80178754 = 1; + func_versus_800C1690(); break; case 1: - if (!func_800C15D8()) { + if (!func_versus_800C15D8()) { break; } - if (func_800C16A0(30)) { - AUDIO_PLAY_BGM(D_80177C90); - D_80178754 = 2; - func_800C1690(); + if (func_versus_800C16A0(30)) { + AUDIO_PLAY_BGM(D_ctx_80177C90); + D_versus_80178754 = 2; + func_versus_800C1690(); } break; case 2: D_80178778 = 1; - if (D_801787B4 != func_800BE564()) { + if (D_801787B4 != func_versus_800BE564()) { break; } - if (func_800C16A0(30)) { - func_800ABA08(); - D_80178754 = 3; - func_800C1690(); + if (func_versus_800C16A0(30)) { + func_play_800ABA08(); + D_versus_80178754 = 3; + func_versus_800C1690(); } break; case 3: D_80178778 = 2; - ret = func_800BEF00(); + ret = func_versus_800BEF00(); if (ret == 0) { break; } if (ret == 1) { - D_80177E7C = 1; + D_ctx_80177E7C = 1; } - if (func_800C16A0(30)) { - D_80178754 = 4; + if (func_versus_800C16A0(30)) { + D_versus_80178754 = 4; } break; @@ -1534,31 +1534,31 @@ bool func_800C176C(void) { D_800D4AA0 = 1; } - if (D_801778AC == 2) { + if (D_ctx_801778AC == 2) { D_80178778 = 10; - func_800BE078(); - func_800BDE3C(); + func_versus_800BE078(); + func_versus_800BDE3C(); } else { D_80178778 = 8; } - if (func_800BF9AC()) { + if (func_versus_800BF9AC()) { SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1); - if (D_801778AC == 2) { + if (D_ctx_801778AC == 2) { D_80178778 = 11; } else { D_80178778 = 0; } - D_80178754 = 5; - func_800C1690(); + D_versus_80178754 = 5; + func_versus_800C1690(); } else { - func_800BF17C(); + func_versus_800BF17C(); } break; case 5: - if (func_800C16A0(60)) { + if (func_versus_800C16A0(60)) { switch (D_801787A8) { case 0: @@ -1578,47 +1578,47 @@ bool func_800C176C(void) { break; } - D_80178750 = 1; - D_80178754 = 6; - func_800C024C(); + D_versus_80178750 = 1; + D_versus_80178754 = 6; + func_versus_800C024C(); } break; case 6: D_80178778 = 3; - if (!func_800C0294(D_801787A8)) { + if (!func_versus_800C0294(D_801787A8)) { break; } - if (func_800C16A0(30)) { - func_800C1690(); - D_80178754 = 7; + if (func_versus_800C16A0(30)) { + func_versus_800C1690(); + D_versus_80178754 = 7; } break; case 7: D_80178778 = 4; - if (func_800C16A0(15)) { - func_800C1690(); - if (((D_801778AC == 0) && (D_801787B4 > 1)) || (D_801778AC == 2)) { - D_80178754 = 8; + if (func_versus_800C16A0(15)) { + func_versus_800C1690(); + if (((D_ctx_801778AC == 0) && (D_801787B4 > 1)) || (D_ctx_801778AC == 2)) { + D_versus_80178754 = 8; } else { - D_80178754 = 9; + D_versus_80178754 = 9; } } break; case 8: D_80178778 = 5; - switch (D_801778AC) { + switch (D_ctx_801778AC) { case 0: - if (func_800C107C(D_801787A8)) { - D_80178754 = 9; + if (func_versus_800C107C(D_801787A8)) { + D_versus_80178754 = 9; } break; case 2: - if (func_800C0D10()) { - D_80178754 = 9; + if (func_versus_800C0D10()) { + D_versus_80178754 = 9; } break; @@ -1630,32 +1630,32 @@ bool func_800C176C(void) { case 9: D_80178778 = 6; - if (func_800C08D0()) { - func_800C1690(); + if (func_versus_800C08D0()) { + func_versus_800C1690(); D_801787AC = 0.0f; D_80178830 = 0; - D_80178754 = 10; + D_versus_80178754 = 10; } break; case 10: D_80178778 = 7; - if (func_800C16A0(60) && func_800C0C84()) { + if (func_versus_800C16A0(60) && func_versus_800C0C84()) { switch (D_801787A4) { case 0: - D_80178754 = 11; + D_versus_80178754 = 11; break; case 1: - D_80178754 = 12; + D_versus_80178754 = 12; break; case 2: - D_80178754 = 13; + D_versus_80178754 = 13; break; default: - D_80178754 = 14; + D_versus_80178754 = 14; break; } @@ -1667,10 +1667,10 @@ bool func_800C176C(void) { case 11: D_80178830 += 16; if (D_80178830 > 480) { - D_80178348 = D_80178350 = D_80178354 = 0; - D_80178340 = D_80178358 = 255; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; + D_ctx_80178340 = D_ctx_80178358 = 255; gBgColor = 0; - func_800C16D0(); + func_versus_800C16D0(); } break; @@ -1680,10 +1680,10 @@ bool func_800C176C(void) { if (D_80178830 > 176) { gCamCount = 1; } - D_80178348 = D_80178350 = D_80178354 = 0; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; gBgColor = 0; if (D_80178830 > 224) { - func_800C1700(); + func_versus_800C1700(); } } break; @@ -1695,11 +1695,11 @@ bool func_800C176C(void) { gCamCount = 1; } - D_80178348 = D_80178350 = D_80178354 = 0; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; gBgColor = 0; if (D_80178830 > 224) { - func_800BC760(); + func_versus_800BC760(); D_menu_801B827C = 1; } } @@ -1711,32 +1711,32 @@ bool func_800C176C(void) { case 20: D_80178778 = 9; if (gInputPress->button & B_BUTTON) { - D_80178754 = 13; + D_versus_80178754 = 13; } else { - func_800C175C(); + func_versus_800C175C(); } break; } - if (((D_80178754 == 8) || (D_80178754 == 9)) || (D_80178754 == 10)) { + if (((D_versus_80178754 == 8) || (D_versus_80178754 == 9)) || (D_versus_80178754 == 10)) { D_800D4A98++; } - if (D_80178754 >= 5) { - D_801779BC = 0; + if (D_versus_80178754 >= 5) { + D_ctx_801779BC = 0; } return false; } -s32 func_800C1E9C(void) { - if (D_80177854 != 100) { - func_800C176C(); +s32 func_versus_800C1E9C(void) { + if (D_ctx_80177854 != 100) { + func_versus_800C176C(); } return 0; } -void func_800C1ED4(void) { +void func_versus_800C1ED4(void) { s32 var_a1; D_80178868 = D_80178860; @@ -1744,56 +1744,56 @@ void func_800C1ED4(void) { switch (D_80178778) { case 1: - func_800BEDDC(); + func_versus_800BEDDC(); break; case 2: - func_800BEFE4(); + func_versus_800BEFE4(); break; case 7: case 6: - func_800C0970(D_801787CC, D_801787D0); + func_versus_800C0970(D_801787CC, D_801787D0); case 5: - switch (D_801778AC) { + switch (D_ctx_801778AC) { case 0: - func_800C1138(D_801787B8, D_801787A8); + func_versus_800C1138(D_801787B8, D_801787A8); break; case 2: - func_800C0E78(); + func_versus_800C0E78(); break; } case 4: - if ((D_801778AC != 2) || (!(D_800D4A98 & 32))) { + if ((D_ctx_801778AC != 2) || (!(D_800D4A98 & 32))) { if (D_801787A8 < 4) { - func_800C075C(); + func_versus_800C075C(); } } case 3: - func_800C04DC(D_801787C0, D_801787C8, D_801787A8); + func_versus_800C04DC(D_801787C0, D_801787C8, D_801787A8); if (D_80178778 == 7) { - func_800C0B0C(); + func_versus_800C0B0C(); } break; case 10: - func_800BDE44(); + func_versus_800BDE44(); case 8: - func_800BF750(); - func_800BF59C(); + func_versus_800BF750(); + func_versus_800BF59C(); case 11: - if (D_801778AC == 2) { - func_800BE300(124.0f, 116.0f, D_80178768); + if (D_ctx_801778AC == 2) { + func_versus_800BE300(124.0f, 116.0f, D_versus_80178768); } break; case 9: - func_800C1764(); + func_versus_800C1764(); break; } @@ -1801,15 +1801,15 @@ void func_800C1ED4(void) { if (var_a1 >= 121) { var_a1 = 121; } - func_80084688(2, var_a1); + func_fade_80084688(2, var_a1); } -void func_800C20B0(void) { +void func_versus_800C20B0(void) { switch (gOptionMenuStatus) { case 0: if (D_Timer_8017783C == 0) { gOptionMenuStatus = OPTION_SETUP; - D_80178410 = 0; + D_ctx_80178410 = 0; } break; @@ -1819,7 +1819,7 @@ void func_800C20B0(void) { case 2: gDrawMode = DRAWMODE_0; - func_800A5844(); + func_play_800A5844(); if (gVersusStage == VS_STAGE_SECTOR_Z) { gOverlayStage = 1; @@ -1828,17 +1828,17 @@ void func_800C20B0(void) { gCurrentLevel = LEVEL_VERSUS; gGameState = GSTATE_PLAY; D_Timer_8017783C = 2; - D_80177854 = 0; - D_80178758 = 0; + D_ctx_80177854 = 0; + D_versus_80178758 = 0; break; } gGameFrameCount++; } -void func_800C2190(void) { +void func_versus_800C2190(void) { } -bool func_800C2198(Actor* actor, f32 arg1, f32 arg2) { +bool func_versus_800C2198(Actor* actor, f32 arg1, f32 arg2) { if ((fabsf(gBosses[0].obj.pos.x - (actor->obj.pos.x + (arg1 * 650.0f))) < 1500.0f) && (fabsf(gBosses[0].obj.pos.z - (actor->obj.pos.z + (arg2 * 650.0f))) < 1500.0f) && (fabsf(gBosses[0].obj.pos.y - actor->obj.pos.y) < 700.0f)) { @@ -1848,7 +1848,7 @@ bool func_800C2198(Actor* actor, f32 arg1, f32 arg2) { } } -void func_800C2244(Actor* actor) { +void func_versus_800C2244(Actor* actor) { bool boolTemp2; bool boolTemp; s32 pad2[6]; @@ -1905,7 +1905,7 @@ void func_800C2244(Actor* actor) { x3 = actor->fwork[20]; - boolTemp2 = func_800C2198(actor, sinY, cosY); + boolTemp2 = func_versus_800C2198(actor, sinY, cosY); if (boolTemp2) { x3 += 40.0f * boolTemp2; @@ -1958,29 +1958,29 @@ void func_800C2244(Actor* actor) { actor->vel.y = 0.0f; } - func_8003088C(actor); + func_360_8003088C(actor); if (actor->iwork[8]) { actor->iwork[8]--; } } -void func_800C26C8(void) { +void func_versus_800C26C8(void) { s32 i; Vec3f src; Vec3f dest; Actor* actor; - if ((D_801778AC != 2) || (D_80177E7C == 0)) { + if ((D_ctx_801778AC != 2) || (D_ctx_80177E7C == 0)) { return; } - if (D_80178758 != 0) { - D_80178758--; + if (D_versus_80178758 != 0) { + D_versus_80178758--; } - if (D_80178758 == 0) { - D_80178758 = 2; + if (D_versus_80178758 == 0) { + D_versus_80178758 = 2; src.x = 0.0f; src.y = 500.0f; @@ -2001,7 +2001,7 @@ void func_800C26C8(void) { actor->timer_0C2 = 30; Object_SetInfo(&actor->info, actor->obj.id); - actor->info.action = (ObjectFunc) func_800C2244; + actor->info.action = (ObjectFunc) func_versus_800C2244; break; } } diff --git a/src/main/sys_lib.c b/src/main/sys_lib.c index 953b5084..ffb3cb91 100644 --- a/src/main/sys_lib.c +++ b/src/main/sys_lib.c @@ -84,7 +84,8 @@ void Lib_QuickSort(u8* first, u32 length, u32 size, CompareFunc cFunc) { void Lib_Perspective(Gfx** dList) { u16 norm; - guPerspective(gGfxMtx, &norm, D_80161A3C, (f32) SCREEN_WIDTH / SCREEN_HEIGHT, D_80161A40, D_80161A44, 1.0f); + guPerspective(gGfxMtx, &norm, D_game_80161A3C, (f32) SCREEN_WIDTH / SCREEN_HEIGHT, D_game_80161A40, D_game_80161A44, + 1.0f); gSPPerspNormalize((*dList)++, norm); gSPMatrix((*dList)++, gGfxMtx++, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); guLookAt(gGfxMtx, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -12800.0f, 0.0f, 1.0f, 0.0f); @@ -93,7 +94,7 @@ void Lib_Perspective(Gfx** dList) { } void Lib_Ortho(Gfx** dList) { - guOrtho(gGfxMtx, -160.0f, 160.0f, -120.0f, 120.0f, D_80161A40, D_80161A44, 1.0f); + guOrtho(gGfxMtx, -160.0f, 160.0f, -120.0f, 120.0f, D_game_80161A40, D_game_80161A44, 1.0f); gSPMatrix((*dList)++, gGfxMtx++, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); guLookAt(gGfxMtx, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -12800.0f, 0.0f, 1.0f, 0.0f); gSPMatrix((*dList)++, gGfxMtx++, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); diff --git a/src/overlays/ovl_ending/fox_end1.c b/src/overlays/ovl_ending/fox_end1.c index 6e1c928f..6aeb606c 100644 --- a/src/overlays/ovl_ending/fox_end1.c +++ b/src/overlays/ovl_ending/fox_end1.c @@ -6,15 +6,15 @@ #include "assets/ast_great_fox.h" #include "assets/ast_ending.h" -void func_ending_8018CE20(s32); -void func_ending_801926D4(void); +void Ending_8018CE20(s32); +void Ending_801926D4(void); extern u32 D_ending_80192E70; -bool func_ending_80189C64(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data); -void func_ending_8018ABE8(void); -void func_ending_8018B3D8(void); -bool func_ending_8018BCB0(void); -void func_ending_8018C21C(void); +bool Ending_80189C64(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data); +void Ending_8018ABE8(void); +void Ending_8018B3D8(void); +bool Ending_8018BCB0(void); +void Ending_8018C21C(void); typedef struct { Animation* anim; @@ -73,7 +73,7 @@ const char str22[] = "xp= %f, yp= %f, zp= %f\n"; const char str23[] = "xa= %f, ya= %f, za= %f\n"; const char str24[] = "sz= %f\n"; -void func_ending_80187520(s32 arg0) { +void Ending_80187520(s32 arg0) { s32 i; s32 j; @@ -96,7 +96,7 @@ void func_ending_80187520(s32 arg0) { } } -void func_ending_801876A4(void) { +void Ending_801876A4(void) { s32 i; for (i = 0; i < 4; i++) { @@ -118,7 +118,7 @@ void func_ending_801876A4(void) { #ifdef NON_MATCHING // regswaps before the matrix translates https://decomp.me/scratch/nweXT -void func_ending_80187860(s32 arg0, s32 arg1) { +void Ending_80187860(s32 arg0, s32 arg1) { Vec3f sp88[50]; s32 i; s32 sp80; @@ -164,18 +164,18 @@ void func_ending_80187860(s32 arg0, s32 arg1) { Animation_GetFrameCount(D_ending_80196D08[i].anim), D_ending_80197900[i]); } - Animation_DrawSkeleton(0, D_ending_80196D08[i].skeleton, D_ending_80197900[i], func_ending_80189C64, NULL, &i, + Animation_DrawSkeleton(0, D_ending_80196D08[i].skeleton, D_ending_80197900[i], Ending_80189C64, NULL, &i, &gIdentityMatrix); Matrix_Pop(&gGfxMatrix); } } #else Animation* D_ending_80192820[4] = { &D_TITLE_60246F8, &D_TITLE_60338DC, &D_TITLE_6036278, &D_TITLE_603531C }; -void func_ending_80187860(s32, s32); -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/fox_end1/func_ending_80187860.s") +void Ending_80187860(s32, s32); +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/fox_end1/Ending_80187860.s") #endif -void func_ending_80187D3C(s32 arg0) { +void Ending_80187D3C(s32 arg0) { s32 i; s32 j; Vec3f sp23C = { 0.0f, 0.0f, 0.0f }; @@ -289,7 +289,7 @@ void func_ending_80187D3C(s32 arg0) { } } -void func_ending_80188030(s32 arg0) { +void Ending_80188030(s32 arg0) { s32 i; f32 sp30; f32 sp2C; @@ -337,7 +337,7 @@ void func_ending_80188030(s32 arg0) { } } -s32 func_ending_80188394(void) { +s32 Ending_80188394(void) { s32 i; UnkStruct_196D08 sp14[2] = { { (void*) D_END_70143C0, @@ -369,7 +369,7 @@ s32 func_ending_80188394(void) { #ifdef NON_MATCHING // stupid loop thing https://decomp.me/scratch/cyOva -void func_ending_8018845C(void) { +void Ending_8018845C(void) { s32 var_a2; u32 temp_a3; @@ -377,7 +377,7 @@ void func_ending_8018845C(void) { if (var_a2 != D_ending_8019858C) {} } - D_80178300 = 1; + D_ctx_80178300 = 1; switch (gCsFrameCount) { case 10: @@ -399,18 +399,18 @@ void func_ending_8018845C(void) { } } #else -void func_ending_8018845C(void); -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/fox_end1/func_ending_8018845C.s") +void Ending_8018845C(void); +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/fox_end1/Ending_8018845C.s") #endif -s32 func_ending_80188634(void) { - if (D_80161690 != 0) { +s32 Ending_80188634(void) { + if (D_enmy2_80161690 != 0) { if ((D_ending_80196F90 % 14) == 0) { AUDIO_PLAY_SFX(0x49002018, gDefaultSfxSource, 4); } D_ending_80196F90++; - D_80161690--; - if (D_80161690 == 0) { + D_enmy2_80161690--; + if (D_enmy2_80161690 == 0) { Audio_KillSfxById(0x49002018); } } else { @@ -419,10 +419,10 @@ s32 func_ending_80188634(void) { return 0; } -void func_ending_801886F4(void) { +void Ending_801886F4(void) { f32 temp = 142.0f; - if (D_80161690 == 0) { + if (D_enmy2_80161690 == 0) { return; } @@ -444,7 +444,7 @@ void func_ending_801886F4(void) { } } -void func_ending_801888F4(void) { +void Ending_801888F4(void) { s32 sp29C = 4; s32 temp_s0_5; s32 sp294; @@ -485,12 +485,12 @@ void func_ending_801888F4(void) { break; } - Animation_DrawSkeleton(0, D_ending_80196D08[sp29C].skeleton, D_ending_80197900[0], func_ending_80189C64, NULL, - &sp29C, &gIdentityMatrix); + Animation_DrawSkeleton(0, D_ending_80196D08[sp29C].skeleton, D_ending_80197900[0], Ending_80189C64, NULL, &sp29C, + &gIdentityMatrix); Matrix_Pop(&gGfxMatrix); } -void func_ending_80188DB4(void) { +void Ending_80188DB4(void) { s32 i; s32 j; Vec3f sp1B4 = { 0.0f, 0.0f, 0.0f }; @@ -559,19 +559,19 @@ void func_ending_80188DB4(void) { } } - D_80161690 = 0; + D_enmy2_80161690 = 0; D_ending_80196F94 = 0; D_ending_80196F98 = 0; D_ending_80198580 = 0.0f; D_ending_80196F88 = 4; } -void func_ending_80189108(void) { +void Ending_80189108(void) { u32 temp_a0; switch (D_ending_80196D08[4].unk_38) { case 0: - D_80178300 = 1; + D_ctx_80178300 = 1; switch (gCsFrameCount) { case 30: Radio_PlayMessage(gMsg_ID_21030, RCID_FOX); @@ -594,17 +594,17 @@ void func_ending_80189108(void) { } if ((D_ending_80196D08[4].unk_38 == 0) && (gCsFrameCount == 180)) { - D_80161690 = 120; + D_enmy2_80161690 = 120; gRadioState = 0; } - if (func_ending_80188634() || (gCsFrameCount == 230)) { + if (Ending_80188634() || (gCsFrameCount == 230)) { D_ending_80196D08[4].unk_34 = 0; D_ending_80196D08[4].unk_38 = 1; gCsFrameCount = 0; Audio_KillSfxById(0x49002018); D_ending_80196F90 = 0; - D_80161690 = 0; + D_enmy2_80161690 = 0; } temp_a0 = (u32) (D_ending_80196D08[4].unk_34 * D_ending_80196D08[4].unk_30) % @@ -618,7 +618,7 @@ void func_ending_80189108(void) { break; case 1: - D_80178300 = 0; + D_ctx_80178300 = 0; if (gCsFrameCount == 20) { Radio_PlayMessage(gMsg_ID_21050, RCID_ROB64_TITLE); } @@ -631,13 +631,13 @@ void func_ending_80189108(void) { break; case 2: - D_80178300 = 1; + D_ctx_80178300 = 1; switch (gCsFrameCount) { case 20: Radio_PlayMessage(gMsg_ID_21060, RCID_FOX); break; case 80: - D_80178358 = 255; + D_ctx_80178358 = 255; break; } @@ -659,7 +659,7 @@ void func_ending_80189108(void) { D_ending_80196F98--; } - if ((D_80161690 == 0) && (D_ending_80196F94 != 0)) { + if ((D_enmy2_80161690 == 0) && (D_ending_80196F94 != 0)) { if (D_ending_80198260[1][1] == 0) { D_ending_80196FA0[1][1].x -= 2.4f; D_ending_80196FA0[1][1].z -= 12.0f; @@ -675,7 +675,7 @@ void func_ending_80189108(void) { } } - if ((D_80161690 == 0) && (D_ending_80196F98 != 0)) { + if ((D_enmy2_80161690 == 0) && (D_ending_80196F98 != 0)) { if (D_ending_80198260[2][0] == 0) { Math_SmoothStepToF(&D_ending_80196FA0[2][0].y, -10.0f, 0.4f, 100.0f, 0.1f); if (D_ending_80196FA0[2][0].y <= -10.0f) { @@ -699,22 +699,22 @@ void func_ending_80189108(void) { } if (D_ending_80196D08[4].unk_38 != 2) { - if ((D_80161690 != 0) && (D_80161690 < 121)) { + if ((D_enmy2_80161690 != 0) && (D_enmy2_80161690 < 121)) { Math_SmoothStepToF(&D_ending_80196FA0[1][0].x, -50.0f, 0.2f, 1000.0f, 0.01f); Math_SmoothStepToF(&D_ending_80196FA0[1][0].z, 18.0f, 0.2f, 1000.0f, 0.01f); } - if ((D_80161690 != 0) && (D_80161690 < 116)) { + if ((D_enmy2_80161690 != 0) && (D_enmy2_80161690 < 116)) { Math_SmoothStepToF(&D_ending_80196FA0[3][0].x, 20.0f, 0.2f, 1000.0f, 0.01f); } - if ((D_80161690 != 0) && (D_80161690 < 111)) { + if ((D_enmy2_80161690 != 0) && (D_enmy2_80161690 < 111)) { Math_SmoothStepToF(&D_ending_80196FA0[2][0].x, 20.0f, 0.2f, 1000.0f, 0.01f); Math_SmoothStepToF(&D_ending_80196FA0[2][0].y, 20.0f, 0.2f, 1000.0f, 0.01f); } - if ((D_ending_80196F94 == 0) && (D_80161690 == 0)) { + if ((D_ending_80196F94 == 0) && (D_enmy2_80161690 == 0)) { Math_SmoothStepToF(&D_ending_80196FA0[1][0].x, 0.0f, 0.2f, 1000.0f, 0.01f); Math_SmoothStepToF(&D_ending_80196FA0[1][0].z, 0.0f, 0.2f, 1000.0f, 0.01f); } - if ((D_ending_80196F98 == 0) && (D_80161690 == 0)) { + if ((D_ending_80196F98 == 0) && (D_enmy2_80161690 == 0)) { Math_SmoothStepToF(&D_ending_80196FA0[3][0].x, 0.0f, 0.2f, 1000.0f, 0.01f); Math_SmoothStepToF(&D_ending_80196FA0[2][0].x, 0.0f, 0.2f, 1000.0f, 0.01f); Math_SmoothStepToF(&D_ending_80196FA0[2][0].y, 0.0f, 0.2f, 1000.0f, 0.01f); @@ -742,7 +742,7 @@ void func_ending_80189108(void) { } } -s32 func_ending_80189C64(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +s32 Ending_80189C64(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { s32 temp_v0 = *(s32*) data; if (temp_v0 == 3) { @@ -817,22 +817,22 @@ s32 func_ending_80189C64(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, voi return false; } -void func_ending_8018A024(void) { +void Ending_8018A024(void) { Vec3f src; Vec3f dest; src.x = src.y = 0.0f; src.z = -100.0f; - Matrix_RotateX(gCalcMatrix, D_801784D0 * M_DTOR, 0); - Matrix_RotateY(gCalcMatrix, D_801784D4 * M_DTOR, 1); - Matrix_RotateZ(gCalcMatrix, D_801784D8 * M_DTOR, 1); + Matrix_RotateX(gCalcMatrix, D_ctx_801784D0 * M_DTOR, 0); + Matrix_RotateY(gCalcMatrix, D_ctx_801784D4 * M_DTOR, 1); + Matrix_RotateZ(gCalcMatrix, D_ctx_801784D8 * M_DTOR, 1); Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &dest); gLight1x = dest.x; gLight1y = dest.y; gLight1z = dest.z; } -void func_ending_8018A124(s32 arg0) { +void Ending_8018A124(s32 arg0) { f32 sp2C[3] = { 0.0f, 0.0f, 0.0f }; f32 sp20[3] = { 0.0f, 0.0f, -100.0f }; s32 sp14[3] = { 110, 80, 40 }; @@ -855,11 +855,11 @@ void func_ending_8018A124(s32 arg0) { gAmbientG = (&sp8)[arg0][1]; gAmbientB = (&sp8)[arg0][2]; - D_801784D0 = (&sp0)[arg0][0]; - D_801784D4 = (&sp0)[arg0][1]; + D_ctx_801784D0 = (&sp0)[arg0][0]; + D_ctx_801784D4 = (&sp0)[arg0][1]; } -void func_ending_8018A2A8(void) { +void Ending_8018A2A8(void) { s32 i; Vec3f sp6C[50]; @@ -890,8 +890,8 @@ void func_ending_8018A2A8(void) { } } -void func_ending_8018A570(void) { - func_ending_8018A024(); +void Ending_8018A570(void) { + Ending_8018A024(); Lights_SetOneLight(&gMasterDisp, gLight1x, gLight1y, gLight1z, gLight1R, gLight1G, gLight1B, gAmbientR, gAmbientG, gAmbientB); @@ -924,22 +924,22 @@ void func_ending_8018A570(void) { switch (D_ending_80196F8C) { case 0: - func_ending_8018A124(0); + Ending_8018A124(0); /* fallthrough */ case 1: - func_ending_80187D3C(0); - D_80178358 = 0; + Ending_80187D3C(0); + D_ctx_80178358 = 0; D_ending_8019858C = 0; D_ending_80196F8C = 2; gCsFrameCount = 0; /* fallthrough */ case 2: - func_ending_80188030(0); + Ending_80188030(0); break; case 3: - func_ending_80187D3C(1); - D_80178358 = 0; + Ending_80187D3C(1); + D_ctx_80178358 = 0; D_ending_8019858C = 0; D_ending_80196F8C = 4; gCsFrameCount = 0; @@ -947,12 +947,12 @@ void func_ending_8018A570(void) { break; case 4: - func_ending_80188030(1); + Ending_80188030(1); break; case 5: - func_ending_80188394(); - D_80178358 = 0; + Ending_80188394(); + D_ctx_80178358 = 0; D_ending_8019858C = 0; D_ending_80196F8C = 6; gCsFrameCount = 0; @@ -960,76 +960,76 @@ void func_ending_8018A570(void) { break; case 6: - func_ending_8018845C(); + Ending_8018845C(); break; case 7: - func_ending_80188DB4(); - D_80178358 = 0; + Ending_80188DB4(); + D_ctx_80178358 = 0; D_ending_8019858C = 0; D_ending_80196F8C = 8; gCsFrameCount = 0; /* fallthrough */ case 8: - func_ending_80189108(); + Ending_80189108(); break; case 9: - D_80178358 = 0; + D_ctx_80178358 = 0; gCsFrameCount = 0; D_ending_80196D00 = 7; break; } } -void func_ending_8018A828(void) { +void Ending_8018A828(void) { switch (D_ending_80196F8C) { case 2: - func_ending_80187520(0); - func_ending_801876A4(); - func_ending_80187860(0, 0); + Ending_80187520(0); + Ending_801876A4(); + Ending_80187860(0, 0); break; case 4: - func_ending_80187520(1); - func_ending_801876A4(); - func_ending_80187860(0, 1); + Ending_80187520(1); + Ending_801876A4(); + Ending_80187860(0, 1); break; case 6: - func_ending_8018A2A8(); + Ending_8018A2A8(); break; case 7: case 8: D_ending_80196F88 = 1; - func_ending_8018A2A8(); + Ending_8018A2A8(); D_ending_80196F88 = 4; - func_ending_80187860(1, 0); - func_ending_801888F4(); - func_ending_801886F4(); + Ending_80187860(1, 0); + Ending_801888F4(); + Ending_801886F4(); break; } } -void func_ending_8018A8FC(void) { - if (D_80178340 != D_80178358) { - if (D_80178340 < D_80178358) { - D_80178340 += D_8017835C; - if (D_80178340 >= D_80178358) { - D_80178340 = D_80178358; +void Ending_8018A8FC(void) { + if (D_ctx_80178340 != D_ctx_80178358) { + if (D_ctx_80178340 < D_ctx_80178358) { + D_ctx_80178340 += D_ctx_8017835C; + if (D_ctx_80178340 >= D_ctx_80178358) { + D_ctx_80178340 = D_ctx_80178358; } } else { - D_80178340 -= D_8017835C; - if (D_80178340 <= D_80178358) { - D_80178340 = D_80178358; + D_ctx_80178340 -= D_ctx_8017835C; + if (D_ctx_80178340 <= D_ctx_80178358) { + D_ctx_80178340 = D_ctx_80178358; } } } - D_8017835C = 16; + D_ctx_8017835C = 16; } -void func_ending_8018A96C(void) { +void Ending_8018A96C(void) { gCsFrameCount++; gGameFrameCount++; @@ -1053,7 +1053,7 @@ void func_ending_8018A96C(void) { gCsFrameCount = 0; case 3: - if (func_ending_8018BCB0() == 0) { + if (Ending_8018BCB0() == 0) { break; } case 4: @@ -1066,47 +1066,47 @@ void func_ending_8018A96C(void) { D_ending_80196D00 = 6; case 6: - func_ending_8018A570(); + Ending_8018A570(); break; case 7: break; } - func_ending_8018A8FC(); - func_ending_8018B3D8(); - func_ending_8018ABE8(); + Ending_8018A8FC(); + Ending_8018B3D8(); + Ending_8018ABE8(); } -void func_ending_8018AAC4(void) { +void Ending_8018AAC4(void) { Matrix_Push(&gGfxMatrix); Matrix_LookAt(gGfxMatrix, gCsCamEyeX, gCsCamEyeY, gCsCamEyeZ, gCsCamAtX, gCsCamAtY, gCsCamAtZ, 0.0f, 100.0f, 0.0f, 0); switch (D_ending_80196D00) { case 1: - func_ending_801926D4(); + Ending_801926D4(); break; case 3: - func_ending_8018C21C(); + Ending_8018C21C(); break; case 6: - func_ending_8018A828(); + Ending_8018A828(); break; case 7: - func_ending_801926D4(); + Ending_801926D4(); break; } - func_ending_8018CE20(D_ending_80196D04); + Ending_8018CE20(D_ending_80196D04); D_ending_80196D04++; - func_800BB5D0(); + func_radio_800BB5D0(); Matrix_Pop(&gGfxMatrix); } -void func_ending_8018ABE8(void) { +void Ending_8018ABE8(void) { if (gControllerPress[3].button & Z_TRIG) { D_ending_80198584 ^= 1; } @@ -1242,39 +1242,39 @@ void func_ending_8018ABE8(void) { case 3: if (gControllerHold[3].button & B_BUTTON) { - D_801784D0 += 1.0f; - if (D_801784D0 > 360.0f) { - D_801784D0 = 0.0f; + D_ctx_801784D0 += 1.0f; + if (D_ctx_801784D0 > 360.0f) { + D_ctx_801784D0 = 0.0f; } } if (gControllerHold[3].button & A_BUTTON) { - D_801784D0 -= 1.0f; - if (D_801784D0 < -360.0f) { - D_801784D0 = 0.0f; + D_ctx_801784D0 -= 1.0f; + if (D_ctx_801784D0 < -360.0f) { + D_ctx_801784D0 = 0.0f; } } if (gControllerHold[3].button & L_CBUTTONS) { - D_801784D4 += 1.0f; - if (D_801784D4 > 360.0f) { - D_801784D4 = 0.0f; + D_ctx_801784D4 += 1.0f; + if (D_ctx_801784D4 > 360.0f) { + D_ctx_801784D4 = 0.0f; } } if (gControllerHold[3].button & D_CBUTTONS) { - D_801784D4 -= 1.0f; - if (D_801784D4 < -360.0f) { - D_801784D4 = 0.0f; + D_ctx_801784D4 -= 1.0f; + if (D_ctx_801784D4 < -360.0f) { + D_ctx_801784D4 = 0.0f; } } if (gControllerHold[3].button & U_CBUTTONS) { - D_801784D8 += 1.0f; - if (D_801784D8 > 360.0f) { - D_801784D8 = 0.0f; + D_ctx_801784D8 += 1.0f; + if (D_ctx_801784D8 > 360.0f) { + D_ctx_801784D8 = 0.0f; } } if (gControllerHold[3].button & R_CBUTTONS) { - D_801784D8 -= 1.0f; - if (D_801784D8 < -360.0f) { - D_801784D8 = 0.0f; + D_ctx_801784D8 -= 1.0f; + if (D_ctx_801784D8 < -360.0f) { + D_ctx_801784D8 = 0.0f; } } break; @@ -1299,10 +1299,10 @@ void func_ending_8018ABE8(void) { } } -void func_ending_8018B16C(void) { +void Ending_8018B16C(void) { } -void func_ending_8018B174(Vec3f* arg0, Vec3f* arg1, f32* arg2) { +void Ending_8018B174(Vec3f* arg0, Vec3f* arg1, f32* arg2) { f32 sp4C; f32 var_fv0 = 0.0f; f32 var_fv1 = 0.0f; @@ -1377,13 +1377,13 @@ void func_ending_8018B174(Vec3f* arg0, Vec3f* arg1, f32* arg2) { *arg2 = sp4C; } -void func_ending_8018B3D8(void) { +void Ending_8018B3D8(void) { } -void func_ending_8018B3E0(void) { +void Ending_8018B3E0(void) { } -void func_ending_8018B3E8(Actor* arg0, s32 arg1) { +void Ending_8018B3E8(Actor* arg0, s32 arg1) { Vec3f sp38[2] = { { 2880.0f, 860.0f, -1440.0f }, { -6000.0f, 3400.0f, 3600.0f }, @@ -1410,7 +1410,7 @@ void func_ending_8018B3E8(Actor* arg0, s32 arg1) { arg0->scale = 1.0f; } -void func_ending_8018B52C(Actor* arg0, s32 arg1) { +void Ending_8018B52C(Actor* arg0, s32 arg1) { Vec3f sp44[3] = { { -230.0f, -750.0f, -1300.0f }, { 230.0f, -240.0f, -1150.0f }, @@ -1432,7 +1432,7 @@ void func_ending_8018B52C(Actor* arg0, s32 arg1) { arg0->scale = 1.0f; } -void func_ending_8018B624(Actor* arg0) { +void Ending_8018B624(Actor* arg0) { Vec3f sp24 = { -40.0f, -560.0f, 400.0f }; Vec3f sp18 = { 0.0f, 290.0f, 0.0f }; @@ -1446,7 +1446,7 @@ void func_ending_8018B624(Actor* arg0) { arg0->scale = 1.0f; } -void func_ending_8018B6D8(Actor* arg0, s32 arg1) { +void Ending_8018B6D8(Actor* arg0, s32 arg1) { Vec3f sp80[6] = { { -400.0f, 500.0f, -1200.0f }, { -160.0f, 500.0f, -1400.0f }, { 80.0f, 500.0f, -1600.0f }, { 320.0f, 500.0f, -1800.0f }, { 560.0f, 500.0f, -2000.0f }, { 800.0f, 500.0f, -2200.0f }, @@ -1474,7 +1474,7 @@ void func_ending_8018B6D8(Actor* arg0, s32 arg1) { arg0->unk_046 = arg1; } -void func_ending_8018B860(void) { +void Ending_8018B860(void) { Vec3f sp4C = { 0.0f, -830.0f, -933.0f }; Vec3f sp40 = { 0.0f, -550.0f, -1280.0f }; s32 sp34[3] = { 240, 180, 54 }; @@ -1493,35 +1493,35 @@ void func_ending_8018B860(void) { gLight1G = sp28[1]; gLight1B = sp28[2]; - D_801784D0 = sp34[0]; - D_801784D4 = sp34[1]; - D_801784D8 = sp34[2]; + D_ctx_801784D0 = sp34[0]; + D_ctx_801784D4 = sp34[1]; + D_ctx_801784D8 = sp34[2]; gAmbientR = sp1C[0]; gAmbientG = sp1C[1]; gAmbientB = sp1C[2]; - func_800A6148(); + func_play_800A6148(); - func_ending_8018B3E8(&gActors[0], 0); - func_ending_8018B52C(&gActors[1], 0); - func_ending_8018B52C(&gActors[2], 1); - func_ending_8018B52C(&gActors[3], 2); - func_ending_8018B6D8(&gActors[4], 0); - func_ending_8018B6D8(&gActors[5], 1); - func_ending_8018B6D8(&gActors[6], 2); - func_ending_8018B6D8(&gActors[7], 3); - func_ending_8018B6D8(&gActors[8], 4); - func_ending_8018B6D8(&gActors[9], 5); + Ending_8018B3E8(&gActors[0], 0); + Ending_8018B52C(&gActors[1], 0); + Ending_8018B52C(&gActors[2], 1); + Ending_8018B52C(&gActors[3], 2); + Ending_8018B6D8(&gActors[4], 0); + Ending_8018B6D8(&gActors[5], 1); + Ending_8018B6D8(&gActors[6], 2); + Ending_8018B6D8(&gActors[7], 3); + Ending_8018B6D8(&gActors[8], 4); + Ending_8018B6D8(&gActors[9], 5); - D_80177A48[0] = gCsCamAtX; - D_80177A10[0] = 0; + D_ctx_80177A48[0] = gCsCamAtX; + D_ctx_80177A10[0] = 0; D_ending_8019858C = 0; gBgColor = 0x4AE5; // 72, 88, 144 - D_80178410 = 0; + D_ctx_80178410 = 0; } -void func_ending_8018BAD0(void) { +void Ending_8018BAD0(void) { Vec3f sp4C = { 240.0f, -110.0f, -200.0f }; Vec3f sp40 = { 0.0f, 0.0f, 100.0f }; s32 sp34[3] = { 240, 250, 0 }; @@ -1540,29 +1540,29 @@ void func_ending_8018BAD0(void) { gLight1G = sp28[1]; gLight1B = sp28[2]; - D_801784D0 = sp34[0]; - D_801784D4 = sp34[1]; - D_801784D8 = sp34[2]; + D_ctx_801784D0 = sp34[0]; + D_ctx_801784D4 = sp34[1]; + D_ctx_801784D8 = sp34[2]; gAmbientR = sp1C[0]; gAmbientG = sp1C[1]; gAmbientB = sp1C[2]; - func_800A6148(); - func_ending_8018B3E8(&gActors[0], 1); - func_ending_8018B624(&gActors[1]); + func_play_800A6148(); + Ending_8018B3E8(&gActors[0], 1); + Ending_8018B624(&gActors[1]); - D_80177A10[0] = 1; + D_ctx_80177A10[0] = 1; D_ending_8019858C = 0; gBgColor = 0x4AE5; // 72, 88, 144 - D_80178410 = 0; + D_ctx_80178410 = 0; } f32 D_ending_80192DF0[8] = { 80.0f, 0.0f, 40.0f, 90.0f, 0.0f, 0.1f, 0.1f, 50.0f, }; -bool func_ending_8018BCB0(void) { +bool Ending_8018BCB0(void) { s32 i; Vec3f sp78; Vec3f sp6C; @@ -1574,21 +1574,21 @@ bool func_ending_8018BCB0(void) { switch (gCsFrameCount) { case 0: - D_80178358 = 0; - func_ending_8018B860(); + D_ctx_80178358 = 0; + Ending_8018B860(); break; case 780: - func_ending_8018BAD0(); + Ending_8018BAD0(); break; case 1010: sp5C = true; - func_800A6148(); + func_play_800A6148(); break; } - func_ending_8018A024(); + Ending_8018A024(); Lights_SetOneLight(&gMasterDisp, gLight1x, gLight1y, gLight1z, gLight1R, gLight1G, gLight1B, gAmbientR, gAmbientG, gAmbientB); @@ -1613,19 +1613,19 @@ bool func_ending_8018BCB0(void) { } if (i == D_ending_8019858C) { - func_ending_8018B174(&gActors[i].obj.pos, &gActors[i].obj.rot, &gActors[i].scale); + Ending_8018B174(&gActors[i].obj.pos, &gActors[i].obj.rot, &gActors[i].scale); } break; case 1: if (i == D_ending_8019858C) { - func_ending_8018B174(&gActors[i].obj.pos, &gActors[i].obj.rot, &gActors[i].scale); + Ending_8018B174(&gActors[i].obj.pos, &gActors[i].obj.rot, &gActors[i].scale); } break; case 2: if (i == D_ending_8019858C) { - func_ending_8018B174(&gActors[i].obj.pos, &gActors[i].obj.rot, &gActors[i].scale); + Ending_8018B174(&gActors[i].obj.pos, &gActors[i].obj.rot, &gActors[i].scale); } break; @@ -1642,7 +1642,7 @@ bool func_ending_8018BCB0(void) { } if (i == D_ending_8019858C) { - func_ending_8018B174(&gActors[i].obj.pos, &gActors[i].obj.rot, &gActors[i].scale); + Ending_8018B174(&gActors[i].obj.pos, &gActors[i].obj.rot, &gActors[i].scale); } break; } @@ -1674,12 +1674,12 @@ bool func_ending_8018BCB0(void) { } } - if (D_80177A10[0] == 0) { + if (D_ctx_80177A10[0] == 0) { if ((gActors[0].obj.pos.x <= gCsCamAtX) && (gActors[0].obj.pos.x > -400.0f)) { - D_80177A48[0] = gActors[0].obj.pos.x; + D_ctx_80177A48[0] = gActors[0].obj.pos.x; } if (gCsFrameCount >= 30) { - Math_SmoothStepToF(&gCsCamAtX, D_80177A48[0], 0.004f, 1000.0f, 0.0001f); + Math_SmoothStepToF(&gCsCamAtX, D_ctx_80177A48[0], 0.004f, 1000.0f, 0.0001f); Math_SmoothStepToF(&gCsCamAtY, 156.0f, 0.002f, 1000.0f, 0.0001f); } } else { @@ -1689,31 +1689,31 @@ bool func_ending_8018BCB0(void) { } if ((gCsFrameCount < 548) && (gCsFrameCount >= 240)) { - D_801784D0 -= 0.2f; - if (D_801784D0 < 180.0f) { - D_801784D0 = 180.0f; + D_ctx_801784D0 -= 0.2f; + if (D_ctx_801784D0 < 180.0f) { + D_ctx_801784D0 = 180.0f; } } if (gCsFrameCount >= 549) { - D_801784D0 += 0.2f; - if (D_801784D0 > 240.0f) { - D_801784D0 = 240.0f; + D_ctx_801784D0 += 0.2f; + if (D_ctx_801784D0 > 240.0f) { + D_ctx_801784D0 = 240.0f; } } if ((gCsFrameCount == 760) || (gCsFrameCount == 994)) { - D_80178358 = 255; + D_ctx_80178358 = 255; } if (gCsFrameCount == 780) { - D_80178358 = 0; + D_ctx_80178358 = 0; } return sp5C; } -void func_ending_8018C21C(void) { +void Ending_8018C21C(void) { Vec3f sp124[3] = { { 0.0f, 40.0f, -2530.0f }, { 335.0f, -92.0f, -1529.0f }, @@ -1807,7 +1807,7 @@ void func_ending_8018C21C(void) { Matrix_RotateX(gGfxMatrix, gActors[i].obj.rot.x * M_DTOR, 1); Matrix_RotateZ(gGfxMatrix, gActors[i].obj.rot.z * M_DTOR, 1); Matrix_SetGfxMtx(&gMasterDisp); - func_800515C4(); + func_demo_800515C4(); } break; diff --git a/src/overlays/ovl_ending/fox_end2.c b/src/overlays/ovl_ending/fox_end2.c index 5a18614f..d5fff94e 100644 --- a/src/overlays/ovl_ending/fox_end2.c +++ b/src/overlays/ovl_ending/fox_end2.c @@ -11,7 +11,7 @@ Vec3f D_ending_80198600[300]; #include "fox_end2_data.c" -void func_ending_8018CE20(u32 arg0) { +void Ending_8018CE20(u32 arg0) { u8 alpha; s32 i; s32 xPos; @@ -31,7 +31,7 @@ void func_ending_8018CE20(u32 arg0) { D_ending_80192E74[i].unk_13; } - if ((D_ending_80192E74[i].unk_11 == 0) || (D_800D2F68 == true)) { + if ((D_ending_80192E74[i].unk_11 == 0) || (D_play_800D2F68 == true)) { if (D_ending_80192E74[i].unk_10 == 1) { xPos = (320 - Graphics_GetLargeTextWidth(D_ending_80192E74[i].unk_00)) / 2; RCP_SetupDL(&gMasterDisp, 0x53); @@ -69,18 +69,18 @@ void func_ending_8018CE20(u32 arg0) { } } -void func_ending_8018D250(u32 arg0, AssetInfo* asset) { +void Ending_8018D250(u32 arg0, AssetInfo* asset) { gOverlayStage = asset->unk_08; D_80137E78 = asset->unk_70; - D_80178410 = asset->unk_14; + D_ctx_80178410 = asset->unk_14; } -void func_ending_8018D28C(s32 arg0, AssetInfo* asset) { - D_8017842C += asset->unk_18.x; - D_80178430 += asset->unk_18.y; +void Ending_8018D28C(s32 arg0, AssetInfo* asset) { + D_ctx_8017842C += asset->unk_18.x; + D_ctx_80178430 += asset->unk_18.y; } -void func_ending_8018D2C8(u32 arg0, AssetInfo* asset) { +void Ending_8018D2C8(u32 arg0, AssetInfo* asset) { u8 alpha = 255; if ((asset->unk_0C + asset->fogNear) > arg0) { @@ -91,15 +91,15 @@ void func_ending_8018D2C8(u32 arg0, AssetInfo* asset) { alpha = (asset->unk_0C + asset->unk_10 - arg0 - 1) * 255 / asset->fogFar; } - D_80178348 = asset->primRed; - D_80178350 = asset->primGreen; - D_80178354 = asset->primBlue; + D_ctx_80178348 = asset->primRed; + D_ctx_80178350 = asset->primGreen; + D_ctx_80178354 = asset->primBlue; - D_80178340 = D_80178358 = alpha; - D_8017835C = 0; + D_ctx_80178340 = D_ctx_80178358 = alpha; + D_ctx_8017835C = 0; } -void func_ending_8018D398(u32 arg0, AssetInfo* asset) { +void Ending_8018D398(u32 arg0, AssetInfo* asset) { u8 alpha = 255; if ((asset->unk_0C + asset->fogNear) > arg0) { @@ -110,13 +110,13 @@ void func_ending_8018D398(u32 arg0, AssetInfo* asset) { alpha = (asset->unk_0C + asset->unk_10 - arg0) * 255 / asset->fogFar; } - D_80178348 = D_80178350 = D_80178354 = D_80178340 = D_80178358 = D_8017835C = 0; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = D_ctx_80178340 = D_ctx_80178358 = D_ctx_8017835C = 0; Graphics_FillRectangle(&gMasterDisp, 8, 8, SCREEN_WIDTH - 8, SCREEN_HEIGHT - 8, asset->primRed, asset->primGreen, asset->primBlue, alpha); } -void func_ending_8018D4BC(s32 arg0, AssetInfo* asset) { +void Ending_8018D4BC(s32 arg0, AssetInfo* asset) { Vec3f src; Vec3f dest; @@ -134,7 +134,7 @@ void func_ending_8018D4BC(s32 arg0, AssetInfo* asset) { asset->unk_30.x, asset->unk_30.y, asset->unk_30.z); } -void func_ending_8018D638(u32 arg0, AssetInfo* asset) { +void Ending_8018D638(u32 arg0, AssetInfo* asset) { u8 alpha = 0; s32 i; @@ -142,12 +142,12 @@ void func_ending_8018D638(u32 arg0, AssetInfo* asset) { alpha = (asset->unk_0C + asset->fogFar - arg0) * 255 / asset->fogFar; } - D_80178348 = asset->primRed; - D_80178350 = asset->primGreen; - D_80178354 = asset->primBlue; + D_ctx_80178348 = asset->primRed; + D_ctx_80178350 = asset->primGreen; + D_ctx_80178354 = asset->primBlue; - D_80178340 = D_80178358 = alpha; - D_8017835C = 0; + D_ctx_80178340 = D_ctx_80178358 = alpha; + D_ctx_8017835C = 0; RCP_SetupDL(&gMasterDisp, 0x53); @@ -155,7 +155,7 @@ void func_ending_8018D638(u32 arg0, AssetInfo* asset) { if (gExpertMode != 0) { for (i = 0; i < 240; i += 4) { - if (!D_800D2F68) { + if (!D_play_800D2F68) { TextureRect_16bRGBA(&gMasterDisp, gEndingNormalReward + 316 * i, 316, 4, 0.0f, i, 1.0f, 1.0f); } else { TextureRect_16bRGBA(&gMasterDisp, gEndingExpertReward + 316 * i, 316, 4, 0.0f, i, 1.0f, 1.0f); @@ -166,7 +166,7 @@ void func_ending_8018D638(u32 arg0, AssetInfo* asset) { } } -void func_ending_8018D814(u32 arg0, AssetInfo* asset) { +void Ending_8018D814(u32 arg0, AssetInfo* asset) { u8 alpha = 255; if ((asset->unk_0C + asset->fogNear) > arg0) { @@ -187,7 +187,7 @@ void func_ending_8018D814(u32 arg0, AssetInfo* asset) { TextureRect_8bIA(&gMasterDisp, D_5007330, 16, 15, asset->unk_18.x + 16.0f * 3, asset->unk_18.y, 1.0f, 1.0f); } -void func_ending_8018DA0C(u32 arg0, AssetInfo* asset) { +void Ending_8018DA0C(u32 arg0, AssetInfo* asset) { u8 alpha = 255; if ((asset->unk_0C + asset->fogNear) > arg0) { @@ -201,7 +201,7 @@ void func_ending_8018DA0C(u32 arg0, AssetInfo* asset) { "TOTAL HITS"); Graphics_DisplayLargeNumber((s16) (asset->unk_18.x + 5), (s16) (asset->unk_18.y + 13), gTotalHits); - if ((func_ending_8018DCB4() == true) && (alpha == 255)) { + if ((Ending_8018DCB4() == true) && (alpha == 255)) { alpha = (arg0 - (asset->unk_0C + asset->fogNear)) % 10; switch (alpha) { @@ -226,7 +226,7 @@ void func_ending_8018DA0C(u32 arg0, AssetInfo* asset) { } } -bool func_ending_8018DCB4(void) { +bool Ending_8018DCB4(void) { s32 i; s32 j; s32 k; @@ -239,9 +239,9 @@ bool func_ending_8018DCB4(void) { s32 unk40[10]; for (i = 0; i < gCurrentPlanet + 1; i++) { - temp2 += ((D_80177B50[i] & 0x00FF0000) >> 16) & 1; - temp2 += ((D_80177B50[i] & 0x0000FF00) >> 8) & 1; - temp2 += (D_80177B50[i] & 0x000000FF) & 1; + temp2 += ((D_ctx_80177B50[i] & 0x00FF0000) >> 16) & 1; + temp2 += ((D_ctx_80177B50[i] & 0x0000FF00) >> 8) & 1; + temp2 += (D_ctx_80177B50[i] & 0x000000FF) & 1; } for (i = 0; i < 10; i += 1) { @@ -306,7 +306,7 @@ bool func_ending_8018DCB4(void) { } } -void func_ending_8018E1B8(u32 arg0, AssetInfo* asset) { +void Ending_8018E1B8(u32 arg0, AssetInfo* asset) { f32 temp; if ((asset->unk_18.z + (arg0 - asset->unk_0C) * asset->unk_3C.z) < D_ending_801985D0.z) { @@ -362,7 +362,7 @@ void func_ending_8018E1B8(u32 arg0, AssetInfo* asset) { gSPDisplayList(gMasterDisp++, D_END_7010970); } -void func_ending_8018E7B8(u32 arg0, AssetInfo* asset) { +void Ending_8018E7B8(u32 arg0, AssetInfo* asset) { f32 temp; if ((asset->unk_18.z + (arg0 - asset->unk_0C) * asset->unk_3C.z) < D_ending_801985D0.z) { @@ -419,10 +419,10 @@ void func_ending_8018E7B8(u32 arg0, AssetInfo* asset) { gSPDisplayList(gMasterDisp++, D_END_7010970); } -void func_ending_8018EDB8(u32 arg0, AssetInfo* asset) { +void Ending_8018EDB8(u32 arg0, AssetInfo* asset) { f32 temp; - D_80178410 = 0; + D_ctx_80178410 = 0; RCP_SetupDL(&gMasterDisp, asset->unk_08); @@ -454,7 +454,7 @@ void func_ending_8018EDB8(u32 arg0, AssetInfo* asset) { gSPDisplayList(gMasterDisp++, D_END_700E9E0); } -void func_ending_8018F2A8(u32 arg0, AssetInfo* asset) { +void Ending_8018F2A8(u32 arg0, AssetInfo* asset) { f32 temp; RCP_SetupDL(&gMasterDisp, asset->unk_08); @@ -482,13 +482,13 @@ void func_ending_8018F2A8(u32 arg0, AssetInfo* asset) { gCurrentLevel = LEVEL_UNK_M1; - func_800515C4(); + func_demo_800515C4(); } -void func_ending_8018F64C(u32 arg0, AssetInfo* asset) { +void Ending_8018F64C(u32 arg0, AssetInfo* asset) { f32 temp; - if (D_800D3180[8] == 0) { + if (D_play_800D3180[8] == 0) { return; } @@ -548,10 +548,10 @@ void func_ending_8018F64C(u32 arg0, AssetInfo* asset) { gSPDisplayList(gMasterDisp++, D_END_7010970); } -void func_ending_8018FC60(u32 arg0, AssetInfo* asset) { +void Ending_8018FC60(u32 arg0, AssetInfo* asset) { f32 temp; - if (D_800D3180[16] == 0) { + if (D_play_800D3180[16] == 0) { return; } @@ -611,7 +611,7 @@ void func_ending_8018FC60(u32 arg0, AssetInfo* asset) { gSPDisplayList(gMasterDisp++, D_END_7010970); } -void func_ending_80190274(u32 arg0, AssetInfo* asset) { +void Ending_80190274(u32 arg0, AssetInfo* asset) { f32 temp; RCP_SetupDL(&gMasterDisp, asset->unk_08); @@ -640,7 +640,7 @@ void func_ending_80190274(u32 arg0, AssetInfo* asset) { gSPDisplayList(gMasterDisp++, D_END_7004240); } -void func_ending_80190648(s32 arg0, AssetInfo* asset) { +void Ending_80190648(s32 arg0, AssetInfo* asset) { RCP_SetupDL(&gMasterDisp, asset->unk_08); Matrix_RotateY(gGfxMatrix, M_DTOR * D_ending_801985F0.y, 0); @@ -654,7 +654,7 @@ void func_ending_80190648(s32 arg0, AssetInfo* asset) { gSPDisplayList(gMasterDisp++, D_END_7002120); } -void func_ending_80190778(u32 arg0, AssetInfo* asset) { +void Ending_80190778(u32 arg0, AssetInfo* asset) { f32 temp; RCP_SetupDL(&gMasterDisp, asset->unk_08); @@ -708,11 +708,11 @@ void func_ending_80190778(u32 arg0, AssetInfo* asset) { gSPDisplayList(gMasterDisp++, D_arwing_3005AB0); } -void func_ending_80190CF0(u32 arg0, AssetInfo* asset) { +void Ending_80190CF0(u32 arg0, AssetInfo* asset) { u8 alpha = 255; f32 temp; - if (D_800D2F68 == true) { + if (D_play_800D2F68 == true) { return; } @@ -772,18 +772,18 @@ void func_ending_80190CF0(u32 arg0, AssetInfo* asset) { gSPDisplayList(gMasterDisp++, D_END_7000000); } -void func_ending_80191234(s32 arg0, s32 arg1) { - D_80161A34 = 8; +void Ending_80191234(s32 arg0, s32 arg1) { + D_game_80161A34 = 8; gGameState = GSTATE_MENU; D_Timer_8017783C = 2; gOptionMenuStatus = OPTION_WAIT; gDrawMode = DRAWMODE_0; gBgColor = 0; - D_80178410 = 0; + D_ctx_80178410 = 0; gControllerLock = 10; } -void func_ending_80191294(u32 arg0, AssetInfo* asset) { +void Ending_80191294(u32 arg0, AssetInfo* asset) { f32 temp; RCP_SetupDL(&gMasterDisp, asset->unk_08); @@ -831,13 +831,13 @@ void func_ending_80191294(u32 arg0, AssetInfo* asset) { D_ending_80198590.unk_30 = +D_ending_801985F0.x; D_ending_80198590.unk_34 = -D_ending_801985F0.y; - func_80053658(&D_ending_80198590); + func_display_80053658(&D_ending_80198590); } -void func_ending_80191700(u32 arg0, AssetInfo* asset) { +void Ending_80191700(u32 arg0, AssetInfo* asset) { } -void func_ending_80191710(u32 arg0, AssetInfo* asset) { +void Ending_80191710(u32 arg0, AssetInfo* asset) { f32 temp; RCP_SetupDL(&gMasterDisp, asset->unk_08); @@ -889,11 +889,11 @@ void func_ending_80191710(u32 arg0, AssetInfo* asset) { gSPDisplayList(gMasterDisp++, asset->unk_00); } -void func_ending_80191C58(u32 arg0, AssetInfo* asset) { +void Ending_80191C58(u32 arg0, AssetInfo* asset) { ((void (*)(u32, AssetInfo*)) asset->unk_04)(arg0, asset); } -void func_ending_80191C7C(u32 arg0, AssetInfo* asset) { +void Ending_80191C7C(u32 arg0, AssetInfo* asset) { f32 temp; RCP_SetupDL(&gMasterDisp, asset->unk_08); @@ -926,7 +926,7 @@ void func_ending_80191C7C(u32 arg0, AssetInfo* asset) { Animation_DrawSkeleton(0, asset->unk_04, D_ending_80198600, NULL, NULL, NULL, &gIdentityMatrix); } -void func_ending_80192164(u32 arg0) { +void Ending_80192164(u32 arg0) { s32 i; for (i = 0; i < 94; i++) { @@ -934,20 +934,20 @@ void func_ending_80192164(u32 arg0) { ((D_ending_801934B4[i].unk_0C + D_ending_801934B4[i].unk_10) > arg0)) { Matrix_Push(&gGfxMatrix); if ((D_ending_801934B4[i].unk_00 == NULL) && (D_ending_801934B4[i].unk_04 == NULL)) { - func_ending_80191700(arg0, &D_ending_801934B4[i]); + Ending_80191700(arg0, &D_ending_801934B4[i]); } else if ((D_ending_801934B4[i].unk_00 != NULL) && (D_ending_801934B4[i].unk_04 == NULL)) { - func_ending_80191710(arg0, &D_ending_801934B4[i]); + Ending_80191710(arg0, &D_ending_801934B4[i]); } else if ((D_ending_801934B4[i].unk_00 == NULL) && (D_ending_801934B4[i].unk_04 != NULL)) { - func_ending_80191C58(arg0, &D_ending_801934B4[i]); + Ending_80191C58(arg0, &D_ending_801934B4[i]); } else if ((D_ending_801934B4[i].unk_00 != NULL) && (D_ending_801934B4[i].unk_04 != NULL)) { - func_ending_80191C7C(arg0, &D_ending_801934B4[i]); + Ending_80191C7C(arg0, &D_ending_801934B4[i]); } Matrix_Pop(&gGfxMatrix); } } } -void func_ending_80192290(u32 arg0, UnkEnd54* unkEnd54) { +void Ending_80192290(u32 arg0, UnkEnd54* unkEnd54) { s32 i; for (i = 0; i < (arg0 - unkEnd54->unk_00); i++) { @@ -960,7 +960,7 @@ void func_ending_80192290(u32 arg0, UnkEnd54* unkEnd54) { } } -void func_ending_8019237C(u32 arg0, UnkEnd54* unkEnd54) { +void Ending_8019237C(u32 arg0, UnkEnd54* unkEnd54) { s32 i; s32 j; @@ -984,7 +984,7 @@ void func_ending_8019237C(u32 arg0, UnkEnd54* unkEnd54) { } } -void func_ending_801924EC(u32 arg0) { +void Ending_801924EC(u32 arg0) { s32 i; UnkEnd54* unkEnd54 = D_ending_80195F4C; @@ -995,11 +995,11 @@ void func_ending_801924EC(u32 arg0) { switch (unkEnd54->unk_08) { case 1: - func_ending_8019237C(arg0, unkEnd54); + Ending_8019237C(arg0, unkEnd54); break; default: - func_ending_80192290(arg0, unkEnd54); + Ending_80192290(arg0, unkEnd54); break; } @@ -1013,8 +1013,8 @@ void func_ending_801924EC(u32 arg0) { Matrix_LookAt(gGfxMatrix, D_ending_801985D0.x, D_ending_801985D0.y, D_ending_801985D0.z, D_ending_801985E0.x, D_ending_801985E0.y, D_ending_801985E0.z, 0.0f, 1.0f, 0.0f, 1); - func_800B6F50(D_ending_801985D0.x, D_ending_801985D0.y, D_ending_801985D0.z, D_ending_801985E0.x, - D_ending_801985E0.y, D_ending_801985E0.z); + func_play_800B6F50(D_ending_801985D0.x, D_ending_801985D0.y, D_ending_801985D0.z, D_ending_801985E0.x, + D_ending_801985E0.y, D_ending_801985E0.z); Matrix_GetYRPAngles(gGfxMatrix, &D_ending_801985F0); break; @@ -1022,13 +1022,13 @@ void func_ending_801924EC(u32 arg0) { } } -void func_ending_801926D4(void) { +void Ending_801926D4(void) { gControllerLock = 10000; Matrix_Push(&gGfxMatrix); - func_ending_801924EC(D_ending_80192E70); - func_ending_80192164(D_ending_80192E70); + Ending_801924EC(D_ending_80192E70); + Ending_80192164(D_ending_80192E70); Matrix_Pop(&gGfxMatrix); @@ -1036,7 +1036,7 @@ void func_ending_801926D4(void) { if ((0 <= D_ending_80192E70) && (D_ending_80192E70 < 100)) { D_ending_80192E70 = 100; - if (D_80177824 == 0) { + if (D_ctx_80177824 == 0) { D_ending_80198590 = gPlayer[0].wings; } else { D_ending_80198590.rightState = D_ending_80198590.leftState = 2; diff --git a/src/overlays/ovl_ending/fox_end2_data.c b/src/overlays/ovl_ending/fox_end2_data.c index c6d3b95e..a0f98f1f 100644 --- a/src/overlays/ovl_ending/fox_end2_data.c +++ b/src/overlays/ovl_ending/fox_end2_data.c @@ -61,27 +61,27 @@ typedef struct AssetInfo { /* 0x71 */ u8 unk_71; } AssetInfo; // size = 0x72 -void func_ending_8018D250(u32 arg0, AssetInfo* asset); -void func_ending_8018D28C(s32 arg0, AssetInfo* asset); -void func_ending_8018D2C8(u32 arg0, AssetInfo* asset); -void func_ending_8018D398(u32 arg0, AssetInfo* asset); -void func_ending_8018D4BC(s32 arg0, AssetInfo* asset); -void func_ending_8018D638(u32 arg0, AssetInfo* asset); -void func_ending_8018D814(u32 arg0, AssetInfo* asset); -void func_ending_8018DA0C(u32 arg0, AssetInfo* asset); -bool func_ending_8018DCB4(void); -void func_ending_8018E1B8(u32 arg0, AssetInfo* asset); -void func_ending_8018E7B8(u32 arg0, AssetInfo* asset); -void func_ending_8018EDB8(u32 arg0, AssetInfo* asset); -void func_ending_8018F2A8(u32 arg0, AssetInfo* asset); -void func_ending_8018F64C(u32 arg0, AssetInfo* asset); -void func_ending_8018FC60(u32 arg0, AssetInfo* asset); -void func_ending_80190274(u32 arg0, AssetInfo* asset); -void func_ending_80190648(s32 arg0, AssetInfo* asset); -void func_ending_80190778(u32 arg0, AssetInfo* asset); -void func_ending_80190CF0(u32 arg0, AssetInfo* asset); -void func_ending_80191234(s32 arg0, s32 arg1); -void func_ending_80191294(u32 arg0, AssetInfo* asset); +void Ending_8018D250(u32 arg0, AssetInfo* asset); +void Ending_8018D28C(s32 arg0, AssetInfo* asset); +void Ending_8018D2C8(u32 arg0, AssetInfo* asset); +void Ending_8018D398(u32 arg0, AssetInfo* asset); +void Ending_8018D4BC(s32 arg0, AssetInfo* asset); +void Ending_8018D638(u32 arg0, AssetInfo* asset); +void Ending_8018D814(u32 arg0, AssetInfo* asset); +void Ending_8018DA0C(u32 arg0, AssetInfo* asset); +bool Ending_8018DCB4(void); +void Ending_8018E1B8(u32 arg0, AssetInfo* asset); +void Ending_8018E7B8(u32 arg0, AssetInfo* asset); +void Ending_8018EDB8(u32 arg0, AssetInfo* asset); +void Ending_8018F2A8(u32 arg0, AssetInfo* asset); +void Ending_8018F64C(u32 arg0, AssetInfo* asset); +void Ending_8018FC60(u32 arg0, AssetInfo* asset); +void Ending_80190274(u32 arg0, AssetInfo* asset); +void Ending_80190648(s32 arg0, AssetInfo* asset); +void Ending_80190778(u32 arg0, AssetInfo* asset); +void Ending_80190CF0(u32 arg0, AssetInfo* asset); +void Ending_80191234(s32 arg0, s32 arg1); +void Ending_80191294(u32 arg0, AssetInfo* asset); // clang-format off @@ -192,31 +192,31 @@ Credit D_ending_80192E74[] = { }; AssetInfo D_ending_801934B4[] = { - { NULL, func_ending_8018D250, 0, 0, 3000, 1000.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0 }, - { NULL, func_ending_8018D4BC, 0, 100, 2800, 0.0f, 59.0f, 58.0f, 13.0f, 100.0f, 60.0f, 50.0f, 40.0f, 40.0f, 40.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { NULL, func_ending_8018D28C, 36, 690, 30, 1.0f, 0.7f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { NULL, func_ending_8018D28C, 36, 800, 119, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { NULL, func_ending_8018D28C, 36, 920, 200, 1.0f, -1.2f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { NULL, func_ending_80190648, 36, 100, 1710, 1.0f, 0.0f, 0.0f, -10000.0f, 0.0f, 0.0f, 0.0f, 40.0f, 40.0f, 40.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { NULL, func_ending_8018F2A8, 29, 520, 800, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { NULL, func_ending_8018F64C, 29, 100, 820, 1.0f, -900.0f, 600.0f, -1200.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 255, 0, 255, 255, 255, 255, 4, 0 }, - { NULL, func_ending_8018F64C, 29, 920, 960, 1.0f, -900.0f, 600.0f, -1200.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 6.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 255, 0, 255, 255, 255, 255, 4, 0 }, + { NULL, Ending_8018D250, 0, 0, 3000, 1000.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0 }, + { NULL, Ending_8018D4BC, 0, 100, 2800, 0.0f, 59.0f, 58.0f, 13.0f, 100.0f, 60.0f, 50.0f, 40.0f, 40.0f, 40.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { NULL, Ending_8018D28C, 36, 690, 30, 1.0f, 0.7f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { NULL, Ending_8018D28C, 36, 800, 119, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { NULL, Ending_8018D28C, 36, 920, 200, 1.0f, -1.2f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { NULL, Ending_80190648, 36, 100, 1710, 1.0f, 0.0f, 0.0f, -10000.0f, 0.0f, 0.0f, 0.0f, 40.0f, 40.0f, 40.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { NULL, Ending_8018F2A8, 29, 520, 800, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { NULL, Ending_8018F64C, 29, 100, 820, 1.0f, -900.0f, 600.0f, -1200.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 255, 0, 255, 255, 255, 255, 4, 0 }, + { NULL, Ending_8018F64C, 29, 920, 960, 1.0f, -900.0f, 600.0f, -1200.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 6.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 255, 0, 255, 255, 255, 255, 4, 0 }, { &D_arwing_3015C28, D_arwing_3016610, 29, 100, 1780, 1.0f, -1000.0f, 500.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0 }, { D_arwing_3016CC0, NULL, 29, 920, 150, 1.0f, -1000.0f, 506.8f, -16.0f, 5.0f, -40.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0 }, { D_arwing_3016CC0, NULL, 29, 1070, 19, 1.0f, -1000.0f, 506.8f, -16.0f, 5.0f, -40.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 2.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0 }, { D_arwing_3016CC0, NULL, 29, 1089, 1, 1.0f, -1000.0f, 506.8f, -16.0f, 5.0f, -1.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0 }, { D_arwing_3016CC0, NULL, 29, 1090, 30, 1.0f, -1000.0f, 506.8f, -16.0f, 5.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0 }, { D_arwing_30194E0, NULL, 45, 100, 1020, 1.0f, -1000.0f, 516.9f, -25.9f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 255, 255, 255, 140, 7, 0 }, - { NULL, func_ending_8018E1B8, 67, 100, 1780, 1.0f, -1000.0f, 500.0f, -64.0f, 0.0f, 0.0f, 0.0f, 0.5f, 0.3f, 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 240, 176, 64, 996, 1000, 0, 0, 255, 0, 255, 255, 255, 255, 0, 0 }, + { NULL, Ending_8018E1B8, 67, 100, 1780, 1.0f, -1000.0f, 500.0f, -64.0f, 0.0f, 0.0f, 0.0f, 0.5f, 0.3f, 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 240, 176, 64, 996, 1000, 0, 0, 255, 0, 255, 255, 255, 255, 0, 0 }, { &D_arwing_3015C28, D_arwing_3016610, 29, 100, 1780, 1.0f, -1000.0f, -500.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0 }, - { NULL, func_ending_80190778, 29, 1120, 200, 1.0f, -1000.0f, -493.2f, -16.0f, 0.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 5.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0 }, + { NULL, Ending_80190778, 29, 1120, 200, 1.0f, -1000.0f, -493.2f, -16.0f, 0.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 5.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0 }, { D_arwing_30194E0, NULL, 45, 1120, 200, 1.0f, -1000.0f, -483.1f, -25.9f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 255, 255, 255, 140, 7, 0 }, - { NULL, func_ending_8018E1B8, 67, 100, 1780, 1.0f, -1000.0f, -500.0f, -57.0f, 0.0f, 0.0f, 0.0f, 0.5f, 0.3f, 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 240, 176, 64, 996, 1000, 0, 0, 255, 0, 255, 255, 255, 255, 0, 0 }, - { NULL, func_ending_8018FC60, 29, 100, 420, 1.0f, 1000.0f, 560.0f, -440.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 255, 0, 255, 255, 255, 255, 4, 0 }, - { NULL, func_ending_8018FC60, 29, 520, 130, 1.0f, 1000.0f, 560.0f, -440.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 4.0f, 0.0f, 0.0f, 1.8f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 255, 0, 255, 255, 255, 255, 4, 0 }, - { NULL, func_ending_8018FC60, 29, 650, 1230, 1.0f, 800.0f, -300.0f, 350.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 255, 0, 255, 255, 255, 255, 4, 0 }, - { NULL, func_ending_80191294, 29, 100, 1780, 1.0f, 1000.0f, 500.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0 }, - { NULL, func_ending_8018E1B8, 67, 100, 1780, 1.0f, 1000.0f, 500.0f, -57.0f, 0.0f, 0.0f, 0.0f, 0.5f, 0.3f, 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 240, 176, 64, 996, 1000, 0, 0, 255, 0, 255, 255, 255, 255, 0, 0 }, + { NULL, Ending_8018E1B8, 67, 100, 1780, 1.0f, -1000.0f, -500.0f, -57.0f, 0.0f, 0.0f, 0.0f, 0.5f, 0.3f, 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 240, 176, 64, 996, 1000, 0, 0, 255, 0, 255, 255, 255, 255, 0, 0 }, + { NULL, Ending_8018FC60, 29, 100, 420, 1.0f, 1000.0f, 560.0f, -440.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 255, 0, 255, 255, 255, 255, 4, 0 }, + { NULL, Ending_8018FC60, 29, 520, 130, 1.0f, 1000.0f, 560.0f, -440.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 4.0f, 0.0f, 0.0f, 1.8f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 255, 0, 255, 255, 255, 255, 4, 0 }, + { NULL, Ending_8018FC60, 29, 650, 1230, 1.0f, 800.0f, -300.0f, 350.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 255, 0, 255, 255, 255, 255, 4, 0 }, + { NULL, Ending_80191294, 29, 100, 1780, 1.0f, 1000.0f, 500.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0 }, + { NULL, Ending_8018E1B8, 67, 100, 1780, 1.0f, 1000.0f, 500.0f, -57.0f, 0.0f, 0.0f, 0.0f, 0.5f, 0.3f, 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 240, 176, 64, 996, 1000, 0, 0, 255, 0, 255, 255, 255, 255, 0, 0 }, { &D_arwing_3015C28, D_arwing_3016610, 29, 100, 1780, 1.0f, 1000.0f, -500.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0 }, { D_arwing_3003CE0, NULL, 29, 850, 20, 1.0f, 1000.0f, -493.2f, -16.0f, 5.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 }, { D_arwing_3003CE0, NULL, 29, 870, 1, 1.0f, 1000.0f, -493.2f, -16.0f, 7.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 }, @@ -235,27 +235,27 @@ AssetInfo D_ending_801934B4[] = { { D_arwing_3003CE0, NULL, 29, 883, 1, 1.0f, 1000.0f, -493.2f, -16.0f, 7.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 }, { D_arwing_3003CE0, NULL, 29, 884, 36, 1.0f, 1000.0f, -493.2f, -16.0f, 5.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 }, { D_arwing_30194E0, NULL, 45, 850, 70, 1.0f, 999.0f, -483.1f, -25.9f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 255, 255, 255, 140, 11, 0 }, - { NULL, func_ending_8018E1B8, 67, 100, 1780, 1.0f, 1000.0f, -500.0f, -34.0f, 0.0f, 0.0f, 0.0f, 0.5f, 0.3f, 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 240, 176, 64, 996, 1000, 0, 0, 255, 0, 255, 255, 255, 255, 0, 0 }, - { NULL, func_ending_8018F2A8, 29, 100, 420, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { NULL, func_ending_8018F2A8, 29, 1320, 470, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { NULL, func_ending_80190274, 36, 1810, 1090, 1.0f, -200.0f, 0.0f, -10000.0f, 0.0f, 0.0f, 0.0f, 150.0f, 150.0f, 150.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { NULL, func_ending_8018F2A8, 29, 1920, 980, 1.0f, 0.0f, 1000.0f, -700.0f, 0.0f, 180.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, -10.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { NULL, func_ending_8018D2C8, 36, 100, 11, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { NULL, func_ending_8018D2C8, 36, 1770, 30, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { NULL, func_ending_8018D2C8, 36, 2780, 30, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { NULL, func_ending_8018D2C8, 36, 510, 20, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { NULL, func_ending_8018D2C8, 36, 710, 20, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { NULL, func_ending_8018D2C8, 36, 910, 20, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { NULL, func_ending_8018D2C8, 36, 1110, 20, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { NULL, func_ending_8018D2C8, 36, 1310, 20, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { NULL, func_ending_8018D250, 4, 3000, 2000, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0 }, - { NULL, func_ending_8018D4BC, 0, 3100, 1800, 0.0f, 0.0f, 13.0f, -32.0f, 200.0f, 70.0f, 10.0f, 10.0f, 6.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { NULL, Ending_8018E1B8, 67, 100, 1780, 1.0f, 1000.0f, -500.0f, -34.0f, 0.0f, 0.0f, 0.0f, 0.5f, 0.3f, 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 240, 176, 64, 996, 1000, 0, 0, 255, 0, 255, 255, 255, 255, 0, 0 }, + { NULL, Ending_8018F2A8, 29, 100, 420, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { NULL, Ending_8018F2A8, 29, 1320, 470, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { NULL, Ending_80190274, 36, 1810, 1090, 1.0f, -200.0f, 0.0f, -10000.0f, 0.0f, 0.0f, 0.0f, 150.0f, 150.0f, 150.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { NULL, Ending_8018F2A8, 29, 1920, 980, 1.0f, 0.0f, 1000.0f, -700.0f, 0.0f, 180.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, -10.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { NULL, Ending_8018D2C8, 36, 100, 11, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { NULL, Ending_8018D2C8, 36, 1770, 30, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { NULL, Ending_8018D2C8, 36, 2780, 30, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { NULL, Ending_8018D2C8, 36, 510, 20, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { NULL, Ending_8018D2C8, 36, 710, 20, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { NULL, Ending_8018D2C8, 36, 910, 20, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { NULL, Ending_8018D2C8, 36, 1110, 20, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { NULL, Ending_8018D2C8, 36, 1310, 20, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { NULL, Ending_8018D250, 4, 3000, 2000, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0 }, + { NULL, Ending_8018D4BC, 0, 3100, 1800, 0.0f, 0.0f, 13.0f, -32.0f, 200.0f, 70.0f, 10.0f, 10.0f, 6.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { D_END_7016540, NULL, 17, 3100, 1800, 1.0f, 0.0f, -2700.0f, -6900.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { NULL, func_ending_8018F2A8, 23, 3800, 950, 1.0f, 8000.0f, -5500.0f, -10000.0f, -10.0f, -90.0f, 0.0f, 3.0f, 3.0f, 3.0f, -22.0f, 12.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { NULL, func_ending_8018E7B8, 67, 3800, 950, 1.0f, 12330.0f, -6500.0f, -9200.0f, 0.0f, 0.0f, -10.0f, 35.0f, 10.0f, 20.0f, -22.0f, 12.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 240, 176, 64, 996, 1000, 255, 255, 0, 0, 255, 255, 255, 164, 0, 0 }, - { NULL, func_ending_8018E7B8, 67, 3800, 950, 1.0f, 15600.0f, -6710.0f, -9960.0f, 0.0f, 0.0f, -10.0f, 35.0f, 10.0f, 20.0f, -22.0f, 12.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 240, 176, 64, 996, 1000, 255, 255, 0, 0, 255, 255, 255, 164, 0, 0 }, - { NULL, func_ending_8018D4BC, 0, 3100, 1800, 0.0f, 0.0f, 32.0f, -32.0f, 200.0f, 70.0f, 10.0f, 10.0f, 6.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { NULL, func_ending_8018EDB8, 20, 3100, 1800, 1.0f, 0.0f, -470.0f, -3500.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 996, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { NULL, Ending_8018F2A8, 23, 3800, 950, 1.0f, 8000.0f, -5500.0f, -10000.0f, -10.0f, -90.0f, 0.0f, 3.0f, 3.0f, 3.0f, -22.0f, 12.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { NULL, Ending_8018E7B8, 67, 3800, 950, 1.0f, 12330.0f, -6500.0f, -9200.0f, 0.0f, 0.0f, -10.0f, 35.0f, 10.0f, 20.0f, -22.0f, 12.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 240, 176, 64, 996, 1000, 255, 255, 0, 0, 255, 255, 255, 164, 0, 0 }, + { NULL, Ending_8018E7B8, 67, 3800, 950, 1.0f, 15600.0f, -6710.0f, -9960.0f, 0.0f, 0.0f, -10.0f, 35.0f, 10.0f, 20.0f, -22.0f, 12.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 240, 176, 64, 996, 1000, 255, 255, 0, 0, 255, 255, 255, 164, 0, 0 }, + { NULL, Ending_8018D4BC, 0, 3100, 1800, 0.0f, 0.0f, 32.0f, -32.0f, 200.0f, 70.0f, 10.0f, 10.0f, 6.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { NULL, Ending_8018EDB8, 20, 3100, 1800, 1.0f, 0.0f, -470.0f, -3500.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 996, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { &D_TITLE_602F8E0, D_TITLE_602FBAC, 12, 3100, 1800, 5.0f, -300.0f, -300.0f, -1300.0f, 5.0f, -90.0f, -90.0f, 0.6f, 0.1f, 6.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 200, 10, 0 }, { &D_TITLE_602F8E0, D_TITLE_602FBAC, 23, 3100, 1800, 5.0f, -300.0f, -300.0f, -1300.0f, 5.0f, -90.0f, 0.0f, 0.6f, 0.6f, 0.6f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 }, { &D_TITLE_60305C0, D_TITLE_603088C, 12, 3100, 1800, 5.0f, -100.0f, -300.0f, -1300.0f, 10.0f, -90.0f, -90.0f, 0.6f, 0.1f, 6.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 200, 0, 0 }, @@ -264,11 +264,11 @@ AssetInfo D_ending_801934B4[] = { { &D_TITLE_6031DB8, D_TITLE_6032084, 23, 3100, 1800, 6.0f, 100.0f, -300.0f, -1300.0f, -10.0f, -90.0f, 0.0f, 0.6f, 0.6f, 0.6f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { &D_TITLE_6031120, D_TITLE_60313AC, 12, 3100, 1800, 7.0f, 300.0f, -300.0f, -1300.0f, -15.0f, -90.0f, -90.0f, 0.6f, 0.1f, 6.0f, 0.1f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.1f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 200, 0, 0 }, { &D_TITLE_6031120, D_TITLE_60313AC, 23, 3100, 1800, 7.0f, 300.0f, -300.0f, -1300.0f, -15.0f, -90.0f, 0.0f, 0.6f, 0.6f, 0.6f, 0.1f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.1f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { NULL, func_ending_8018D250, 5, 5000, 2000, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0 }, - { NULL, func_ending_8018D4BC, 0, 5100, 1800, 0.0f, 0.0f, 32.0f, -32.0f, 200.0f, 70.0f, 10.0f, 10.0f, 6.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { NULL, Ending_8018D250, 5, 5000, 2000, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0 }, + { NULL, Ending_8018D4BC, 0, 5100, 1800, 0.0f, 0.0f, 32.0f, -32.0f, 200.0f, 70.0f, 10.0f, 10.0f, 6.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { D_END_7016540, NULL, 17, 5100, 310, 1.0f, 0.0f, -2800.0f, -6900.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, -4.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { D_END_7016540, NULL, 17, 5410, 1490, 1.0f, 0.0f, -4040.0f, -6900.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { NULL, func_ending_80190CF0, 62, 6520, 380, 1.0f, 0.0f, 0.0f, -7000.0f, 0.0f, 0.0f, 0.0f, 12.0f, 12.0f, 12.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 200, 0, 0, 0, 0, 0, 255, 255, 255, 0, 0, 0 }, + { NULL, Ending_80190CF0, 62, 6520, 380, 1.0f, 0.0f, 0.0f, -7000.0f, 0.0f, 0.0f, 0.0f, 12.0f, 12.0f, 12.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 200, 0, 0, 0, 0, 0, 255, 255, 255, 0, 0, 0 }, { &D_arwing_3015AF4, D_arwing_3016610, 29, 5100, 1800, 1.0f, 100.0f, 100.0f, -230.0f, 0.0f, 180.0f, 0.0f, 0.5f, 0.5f, 0.5f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, 240, 176, 64, 996, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0 }, { D_END_7010970, NULL, 38, 5100, 1800, 1.0f, 100.0f, 95.0f, -200.0f, 0.0f, 0.0f, 0.0f, 0.4f, 0.3f, 0.4f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, 240, 176, 64, 996, 1000, 255, 0, 0, 0, 255, 255, 255, 255, 0, 0 }, { &D_arwing_3015AF4, D_arwing_3016610, 29, 5100, 1800, 1.0f, 100.0f, -100.0f, -230.0f, 0.0f, 180.0f, 0.0f, 0.5f, 0.5f, 0.5f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, 240, 176, 64, 996, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0 }, @@ -277,15 +277,15 @@ AssetInfo D_ending_801934B4[] = { { D_END_7010970, NULL, 38, 5100, 1800, 1.0f, -100.0f, 95.0f, -200.0f, 0.0f, 0.0f, 0.0f, 0.4f, 0.3f, 0.4f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, 240, 176, 64, 996, 1000, 255, 0, 0, 0, 255, 255, 255, 255, 7, 0 }, { &D_arwing_3015AF4, D_arwing_3016610, 29, 5100, 1800, 1.0f, -100.0f, -100.0f, -230.0f, 0.0f, 180.0f, 0.0f, 0.5f, 0.5f, 0.5f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, 240, 176, 64, 996, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0 }, { D_END_7010970, NULL, 38, 5100, 1800, 1.0f, -100.0f, -105.0f, -200.0f, 0.0f, 0.0f, 0.0f, 0.4f, 0.3f, 0.4f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, 240, 176, 64, 996, 1000, 255, 0, 0, 0, 255, 255, 255, 255, 11, 0 }, - { NULL, func_ending_8018F2A8, 29, 5100, 1800, 1.0f, 0.0f, 0.0f, -220.0f, 0.0f, 180.0f, 0.0f, 0.1f, 0.1f, 0.1f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 240, 176, 64, 996, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { NULL, func_ending_8018DA0C, 76, 6520, 380, 1.0f, 224.0f, 164.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 20, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0 }, - { NULL, func_ending_8018D638, 36, 6900, 300, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { NULL, func_ending_8018D398, 36, 3000, 370, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { NULL, func_ending_8018D814, 76, 6122, 200, 1.0f, 128.0f, 100.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 20, 20, 0, 0, 0, 0, 255, 255, 255, 0, 0, 0 }, - { NULL, func_ending_8018D2C8, 36, 4880, 240, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { NULL, func_ending_8018D2C8, 36, 6800, 100, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { NULL, func_ending_8018D2C8, 36, 7100, 100, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { NULL, func_ending_80191234, 0, 7200, 100, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } + { NULL, Ending_8018F2A8, 29, 5100, 1800, 1.0f, 0.0f, 0.0f, -220.0f, 0.0f, 180.0f, 0.0f, 0.1f, 0.1f, 0.1f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 240, 176, 64, 996, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { NULL, Ending_8018DA0C, 76, 6520, 380, 1.0f, 224.0f, 164.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 20, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0 }, + { NULL, Ending_8018D638, 36, 6900, 300, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { NULL, Ending_8018D398, 36, 3000, 370, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { NULL, Ending_8018D814, 76, 6122, 200, 1.0f, 128.0f, 100.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 20, 20, 0, 0, 0, 0, 255, 255, 255, 0, 0, 0 }, + { NULL, Ending_8018D2C8, 36, 4880, 240, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { NULL, Ending_8018D2C8, 36, 6800, 100, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { NULL, Ending_8018D2C8, 36, 7100, 100, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { NULL, Ending_80191234, 0, 7200, 100, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }; UnkEnd54 D_ending_80195F4C[] = { diff --git a/src/overlays/ovl_i1/fox_co.c b/src/overlays/ovl_i1/fox_co.c index 01921c2a..c67c101f 100644 --- a/src/overlays/ovl_i1/fox_co.c +++ b/src/overlays/ovl_i1/fox_co.c @@ -12,17 +12,17 @@ u8 D_i1_8019B6D0; f32 D_i1_8019B6D8[68]; -void func_i1_80187530(Object_80* obj80) { +void Corneria_80187530(Object_80* obj80) { } -void func_i1_8018753C(Object_80* obj80) { +void Corneria_8018753C(Object_80* obj80) { gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); gSPDisplayList(gMasterDisp++, D_CO_60199D0); gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); } -void func_i1_801875A4(Object_4C* obj4C) { +void Corneria_801875A4(Object_4C* obj4C) { f32 sp1C; f32 sp18; f32 var_f; @@ -31,21 +31,21 @@ void func_i1_801875A4(Object_4C* obj4C) { sp1C = RAND_FLOAT_CENTERED(10.0f); sp18 = RAND_FLOAT_CENTERED(10.0f); var_f = RAND_FLOAT(0.5f) + 1.0f; - func_8007C85C(obj4C->obj.pos.x + sp1C, obj4C->obj.pos.y + sp18, obj4C->obj.pos.z, 4.0f * var_f); + func_effect_8007C85C(obj4C->obj.pos.x + sp1C, obj4C->obj.pos.y + sp18, obj4C->obj.pos.z, 4.0f * var_f); } } -void func_i1_80187670(Actor* actor, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, s32 arg7, s32 arg8, - s32 arg9) { +void Corneria_80187670(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 arg4, f32 xRot, f32 yRot, s32 arg7, s32 arg8, + ObjectId objId) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; - actor->obj.id = arg9; - actor->obj.pos.x = arg1; - actor->obj.pos.y = arg2; - actor->obj.pos.z = arg3; - actor->obj.rot.x = arg5; - actor->obj.rot.y = arg6; + actor->obj.id = objId; + actor->obj.pos.x = xPos; + actor->obj.pos.y = yPos; + actor->obj.pos.z = zPos; + actor->obj.rot.x = xRot; + actor->obj.rot.y = yRot; actor->timer_0BC = arg7; actor->timer_0BE = 20; actor->unk_0B4 = arg8; @@ -53,19 +53,19 @@ void func_i1_80187670(Actor* actor, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 Object_SetInfo(&actor->info, actor->obj.id); } -void func_i1_80187710(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, s32 arg6, s32 arg7, s32 arg8) { +void Corneria_80187710(f32 xPos, f32 yPos, f32 zPos, f32 arg3, f32 xRot, f32 yRot, s32 arg6, s32 arg7, ObjectId objId) { s32 i; for (i = 0; i < ARRAY_COUNT(gActors); i++) { if (gActors[i].obj.status == OBJ_FREE) { (void) "Enms[1].obj.mode %d\n"; - func_i1_80187670(&gActors[i], arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); + Corneria_80187670(&gActors[i], xPos, yPos, zPos, arg3, xRot, yRot, arg6, arg7, objId); return; } } } -void func_i1_801877A0(Boss* boss, f32 arg1, f32 arg2, f32 arg3) { +void Corneria_801877A0(Boss* boss, f32 arg1, f32 arg2, f32 arg3) { Vec3f sp2C; Vec3f sp20; @@ -73,10 +73,11 @@ void func_i1_801877A0(Boss* boss, f32 arg1, f32 arg2, f32 arg3) { sp2C.y = arg2; sp2C.z = arg3; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp2C, &sp20); - 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); + func_effect_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_i1_80187838(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { +void Corneria_80187838(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { s32 i; for (i = 0; i < ARRAY_COUNT(gItems); i++) { @@ -94,7 +95,7 @@ void func_i1_80187838(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { } } -void func_i1_801878D8(Boss* boss) { +void Corneria_801878D8(Boss* boss) { s32 i; gBossFrameCount = 0; @@ -114,21 +115,21 @@ void func_i1_801878D8(Boss* boss) { } } -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 Corneria_8018798C(Boss* boss, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { + func_effect_8007BFFC(arg1, arg2, arg3, 0.0f, 0.0f, 0.0f, arg4, 30); + func_effect_8007A6F0(&boss->obj.pos, 0x29034003); } -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 Corneria_801879F0(Boss* boss, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { + func_effect_8007D1E0(arg1, arg2, arg3, arg4); + func_effect_8007A6F0(&boss->obj.pos, 0x29034003); } -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); +void Corneria_80187A38(Boss* boss, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5) { + func_effect_8007C120(arg1, arg2, arg3, boss->vel.x, boss->vel.y, boss->vel.z, arg4, arg5); } -f32 func_i1_80187A88(s32 arg0) { +f32 Corneria_80187A88(s32 arg0) { f32 ret = arg0 * 0.5f; if (ret > 8.0f) { @@ -137,7 +138,7 @@ f32 func_i1_80187A88(s32 arg0) { return ret; } -void func_i1_80187AC8(Boss* boss) { +void Corneria_80187AC8(Boss* boss) { Object_4C* obj4C; s32 var_v0; s32 var_s1; @@ -148,19 +149,19 @@ void func_i1_80187AC8(Boss* boss) { if (boss->dmgPart == 0) { boss->swork[10] = 15; boss->swork[29] -= boss->damage; - func_i1_80187A38(boss, D_i1_8019B6D8[62], D_i1_8019B6D8[63], D_i1_8019B6D8[64], 0.2f, 20); + Corneria_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); + func_effect_8007A6F0(&boss->obj.pos, 0x2943500F); } else { - func_8007A6F0(&boss->obj.pos, 0x29034003); + func_effect_8007A6F0(&boss->obj.pos, 0x29034003); } Radio_PlayMessage(gMsg_ID_2270, RCID_BOSS_CORNERIA); if (boss->swork[29] <= 0) { boss->swork[10] = 1000; boss->info.hitbox[1 + 0] = 100000.0f; - func_i1_8018798C(boss, D_i1_8019B6D8[62], D_i1_8019B6D8[63], D_i1_8019B6D8[64], 10.0f); + Corneria_8018798C(boss, D_i1_8019B6D8[62], D_i1_8019B6D8[63], D_i1_8019B6D8[64], 10.0f); AUDIO_PLAY_SFX(0x2940D09A, boss->sfxSource, 4); - D_Timer_80161A60 = 8; + D_play_Timer_80161A60 = 8; if (fabsf(boss->obj.rot.x) < 20.0f) { boss->swork[32] = 1; } @@ -183,7 +184,7 @@ void func_i1_80187AC8(Boss* boss) { gPlayer[0].unk_114 = 0.0f; } Radio_PlayMessage(gMsg_ID_2280, RCID_BOSS_CORNERIA); - func_80042EC0(boss); + func_boss_80042EC0(boss); gBossFrameCount = 100000; return; } @@ -191,13 +192,13 @@ void func_i1_80187AC8(Boss* boss) { boss->swork[3] = 15; boss->swork[20] = 30; boss->swork[28] -= boss->damage; - func_i1_801879F0(boss, D_i1_8019B6D8[12] + RAND_FLOAT_CENTERED(60.0f), D_i1_8019B6D8[13], - D_i1_8019B6D8[14] + RAND_FLOAT_CENTERED(60.0f), 2.0f); - func_i1_80187A38(boss, D_i1_8019B6D8[12], D_i1_8019B6D8[13], D_i1_8019B6D8[14], 0.1f, 20); + Corneria_801879F0(boss, D_i1_8019B6D8[12] + RAND_FLOAT_CENTERED(60.0f), D_i1_8019B6D8[13], + D_i1_8019B6D8[14] + RAND_FLOAT_CENTERED(60.0f), 2.0f); + Corneria_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_i1_8018798C(boss, D_i1_8019B6D8[12], D_i1_8019B6D8[13], D_i1_8019B6D8[14], 10.0f); + Corneria_8018798C(boss, D_i1_8019B6D8[12], D_i1_8019B6D8[13], D_i1_8019B6D8[14], 10.0f); } } @@ -206,25 +207,25 @@ void func_i1_80187AC8(Boss* boss) { boss->swork[21] = 30; boss->swork[26] -= boss->damage; - func_i1_801879F0(boss, D_i1_8019B6D8[6] + RAND_FLOAT_CENTERED(60.0f), D_i1_8019B6D8[7], - D_i1_8019B6D8[8] + RAND_FLOAT_CENTERED(60.0f), 2.0f); - func_i1_80187A38(boss, D_i1_8019B6D8[6], D_i1_8019B6D8[7], D_i1_8019B6D8[8], 0.1f, 20); + Corneria_801879F0(boss, D_i1_8019B6D8[6] + RAND_FLOAT_CENTERED(60.0f), D_i1_8019B6D8[7], + D_i1_8019B6D8[8] + RAND_FLOAT_CENTERED(60.0f), 2.0f); + Corneria_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_i1_8018798C(boss, D_i1_8019B6D8[6], D_i1_8019B6D8[7], D_i1_8019B6D8[8], 7.0f); + Corneria_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_i1_801879F0(boss, D_i1_8019B6D8[0] + RAND_FLOAT_CENTERED(60.0f), D_i1_8019B6D8[1], - D_i1_8019B6D8[2] + RAND_FLOAT_CENTERED(60.0f), 2.0f); - func_i1_80187A38(boss, D_i1_8019B6D8[0], D_i1_8019B6D8[1], D_i1_8019B6D8[2], 0.1f, 20); + Corneria_801879F0(boss, D_i1_8019B6D8[0] + RAND_FLOAT_CENTERED(60.0f), D_i1_8019B6D8[1], + D_i1_8019B6D8[2] + RAND_FLOAT_CENTERED(60.0f), 2.0f); + Corneria_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_i1_8018798C(boss, D_i1_8019B6D8[0], D_i1_8019B6D8[1], D_i1_8019B6D8[2], 7.0f); + Corneria_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_PLAY_SFX(0x2903300E, boss->sfxSource, 4); @@ -237,10 +238,10 @@ void func_i1_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_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_FLOAT(20.0f), 0.0f, 5.5f, var_s1 + 0x1C, RAND_INT(30.0f) + 60.0f); + func_boss_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_FLOAT(20.0f), 0.0f, 5.5f, var_s1 + 0x1C, RAND_INT(30.0f) + 60.0f); } if (boss->state < 5) { boss->state = 5; @@ -256,10 +257,10 @@ void func_i1_80187AC8(Boss* boss) { boss->info.hitbox[1 + 30] = 100000.0f; for (var_s1 = 0; var_s1 < 3; var_s1++) { - 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_FLOAT(20.0f), 0.0f, 5.5f, var_s1 + 0x1C, RAND_INT(30.0f) + 60.0f); + func_boss_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_FLOAT(20.0f), 0.0f, 5.5f, var_s1 + 0x1C, RAND_INT(30.0f) + 60.0f); } if (boss->state < 5) { boss->state = 6; @@ -279,7 +280,7 @@ void func_i1_80187AC8(Boss* boss) { } else { var_v0 = 0x147; } - func_i1_80187838(boss, boss->obj.pos.x, boss->obj.pos.y + 100.0f, boss->obj.pos.z, var_v0); + Corneria_80187838(boss, boss->obj.pos.x, boss->obj.pos.y + 100.0f, boss->obj.pos.z, var_v0); } if (boss->state < 5) { boss->state = 0; @@ -298,11 +299,11 @@ void func_i1_80187AC8(Boss* boss) { } } } else { - func_8007A6F0(&boss->obj.pos, 0x29121007); + func_effect_8007A6F0(&boss->obj.pos, 0x29121007); } } - if (!(D_801615D0.y < 0.0f)) { + if (!(D_edisplay_801615D0.y < 0.0f)) { obj4C = gObjects4C; for (var_s1 = 0; var_s1 < 40; var_s1++, obj4C++) { @@ -319,92 +320,89 @@ void func_i1_80187AC8(Boss* boss) { } } if ((boss->swork[1] == 1000) && !(gGameFrameCount & 3)) { - 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); + func_effect_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) && !(gGameFrameCount & 3)) { - 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); + func_effect_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) && !(gGameFrameCount & 3)) { - func_8007BFFC(D_i1_8019B6D8[12], D_i1_8019B6D8[13], D_i1_8019B6D8[14], 0.0f, 20.0f, 0.0f, 2.0f, 5); + func_effect_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) && !(gGameFrameCount & 3)) { - func_8007BFFC(D_i1_8019B6D8[56], D_i1_8019B6D8[57], D_i1_8019B6D8[58], 0.0f, 10.0f, 0.0f, 2.0f, 5); + func_effect_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) && !(gGameFrameCount & 3)) { - func_8007BFFC(D_i1_8019B6D8[59], D_i1_8019B6D8[60], D_i1_8019B6D8[61], 0.0f, 10.0f, 0.0f, 2.0f, 5); + func_effect_8007BFFC(D_i1_8019B6D8[59], D_i1_8019B6D8[60], D_i1_8019B6D8[61], 0.0f, 10.0f, 0.0f, 2.0f, 5); } } } -s32 func_i1_80188750(Boss* boss) { - +ObjectId Corneria_80188750(Boss* boss) { boss->swork[35]++; if (boss->swork[35] >= 5) { boss->swork[35] = 0; - return 0xBF; + return OBJ_ACTOR_191; } - if (func_8008AC54(0) < 4) { - return 0xBE; + if (func_hud_8008AC54(0) < 4) { + return OBJ_ACTOR_190; } else { return 0; } } -void func_i1_801887AC(Boss* boss) { +void Corneria_801887AC(Boss* boss) { Vec3f sp3C; - s32 sp38; - s32 temp_v0; + ObjectId sp38; - if ((gBossFrameCount >= 500)) { - temp_v0 = boss->swork[30]; - if (temp_v0 != 0) { - switch (temp_v0) { - case 1: - sp38 = func_i1_80188750(boss); - if (sp38 != 0) { - if (boss->swork[1] != 1000) { - 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_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_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: - if (boss->swork[3] != 1000) { - sp3C.x = gPlayer[0].pos.x; - sp3C.y = gPlayer[0].pos.y; - sp3C.z = gPlayer[0].unk_138; - gPlayer[0].pos.x += RAND_FLOAT_CENTERED(300.0f); - gPlayer[0].pos.y += RAND_FLOAT_CENTERED(300.0f); - gPlayer[0].unk_138 += RAND_FLOAT_CENTERED(300.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; - } - boss->swork[30] = 0; - break; + if ((gBossFrameCount < 500)) { + return; + } + switch (boss->swork[30]) { + case 0: + break; + case 1: + sp38 = Corneria_80188750(boss); + if (sp38 != 0) { + if (boss->swork[1] != 1000) { + Corneria_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) { + Corneria_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: + Corneria_801877A0(boss, 40.0f, 228.0f, 212.0f); + Corneria_801877A0(boss, -40.0f, 228.0f, 212.0f); + boss->swork[30] = 0; + break; + case 3: + if (boss->swork[3] != 1000) { + sp3C.x = gPlayer[0].pos.x; + sp3C.y = gPlayer[0].pos.y; + sp3C.z = gPlayer[0].unk_138; + gPlayer[0].pos.x += RAND_FLOAT_CENTERED(300.0f); + gPlayer[0].pos.y += RAND_FLOAT_CENTERED(300.0f); + gPlayer[0].unk_138 += RAND_FLOAT_CENTERED(300.0f); + func_effect_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; + } + boss->swork[30] = 0; + break; } } -void func_i1_80188A18(Boss* boss) { - +void Corneria_80188A18(Boss* boss) { if (boss->timer_050 == 0) { boss->state = 0; boss->timer_050 = RAND_INT(20.0f) + 20; @@ -420,7 +418,7 @@ void func_i1_80188A18(Boss* boss) { boss->swork[31] = 2; break; case 4: - if (D_801615D0.y < 0.0f) { + if (D_edisplay_801615D0.y < 0.0f) { boss->swork[31] = 4; } else { boss->swork[31] = 3; @@ -435,16 +433,16 @@ void func_i1_80188A18(Boss* boss) { if ((gBossFrameCount >= 1001) && (Rand_ZeroOne() < 0.3f)) { if (Rand_ZeroOne() < 0.5f) { - func_8002E4F8(gMsg_ID_2263, RCID_BOSS_CORNERIA); + func_360_8002E4F8(gMsg_ID_2263, RCID_BOSS_CORNERIA); } else { - func_8002E4F8(gMsg_ID_2265, RCID_BOSS_CORNERIA); + func_360_8002E4F8(gMsg_ID_2265, RCID_BOSS_CORNERIA); } } } if ((gBossFrameCount >= 801) && !(gBossFrameCount & 0x1FF)) { - if (D_80177B6C < 2) { + if (D_ctx_80177B6C < 2) { Radio_PlayMessage(gMsg_ID_20237, RCID_PEPPY); - } else if (D_801615D0.z > 0.0f) { + } else if (D_edisplay_801615D0.z > 0.0f) { Radio_PlayMessage(gMsg_ID_2233, RCID_FALCO); } else { Radio_PlayMessage(gMsg_ID_2282, RCID_PEPPY); @@ -452,25 +450,25 @@ void func_i1_80188A18(Boss* boss) { } } -void func_i1_80188C7C(Boss* boss) { +void Corneria_80188C7C(Boss* boss) { if (boss->unk_044 == 0) { boss->unk_044++; boss->fwork[12] *= -0.2f; AUDIO_PLAY_SFX(0x19030004, boss->sfxSource, 4); - func_80062B60(D_i1_8019B6D8[56], D_i1_8019B6D8[58], 0, 30.0f); + func_enmy_80062B60(D_i1_8019B6D8[56], D_i1_8019B6D8[58], 0, 30.0f); boss->swork[18] = 13; boss->swork[19] = 15; boss->swork[21] = 10; boss->swork[22] = 12; boss->swork[20] = 17; - D_80178480 = 20; + D_ctx_80178480 = 20; } else { boss->fwork[12] = 0.0f; } } -void func_i1_80188D50(Boss* boss) { +void Corneria_80188D50(Boss* boss) { static s32 D_i1_801997E0 = 0; s32 i; Vec3f sp48; @@ -524,7 +522,7 @@ void func_i1_80188D50(Boss* boss) { gItems[i].obj.pos.z = gPlayer[0].unk_138 + sp3C.z; gItems[i].timer_4A = 8; Object_SetInfo(&gItems[i].info, gItems[i].obj.id); - func_8007B344(gItems[i].obj.pos.x, gItems[i].obj.pos.y, gItems[i].obj.pos.z, 5.0f, 0); + func_effect_8007B344(gItems[i].obj.pos.x, gItems[i].obj.pos.y, gItems[i].obj.pos.z, 5.0f, 0); break; } } @@ -532,7 +530,7 @@ void func_i1_80188D50(Boss* boss) { } } -void func_i1_80189058(Boss* boss) { +void Corneria_80189058(Boss* boss) { Vec3f sp21C = { 0.0f, 0.0f, 0.0f }; s32 sp218; f32 sp214; @@ -584,9 +582,9 @@ void func_i1_80189058(Boss* boss) { gRadarMarks[59].pos.z = boss->obj.pos.z; gRadarMarks[59].unk_10 = boss->obj.rot.y + 180.0f; - func_i1_80188D50(boss); - if (D_801615D0.z > 0.0f) { - if (D_801615D0.x > 0.0f) { + Corneria_80188D50(boss); + if (D_edisplay_801615D0.z > 0.0f) { + if (D_edisplay_801615D0.x > 0.0f) { gPlayer[0].unk_228 = 0x10; } else { gPlayer[0].unk_228 = 0x20; @@ -630,15 +628,15 @@ void func_i1_80189058(Boss* boss) { } } - func_i1_80187AC8(boss); - boss->fwork[0] = SIN_DEG(boss->swork[18] * 50.0f) * func_i1_80187A88(boss->swork[18]); - boss->fwork[1] = SIN_DEG(boss->swork[19] * 50.0f) * func_i1_80187A88(boss->swork[19]); - boss->fwork[2] = SIN_DEG(boss->swork[20] * 50.0f) * func_i1_80187A88(boss->swork[20]); - boss->fwork[3] = SIN_DEG(boss->swork[21] * 50.0f) * func_i1_80187A88(boss->swork[21]); - boss->fwork[4] = SIN_DEG(boss->swork[22] * 50.0f) * func_i1_80187A88(boss->swork[22]); + Corneria_80187AC8(boss); + boss->fwork[0] = SIN_DEG(boss->swork[18] * 50.0f) * Corneria_80187A88(boss->swork[18]); + boss->fwork[1] = SIN_DEG(boss->swork[19] * 50.0f) * Corneria_80187A88(boss->swork[19]); + boss->fwork[2] = SIN_DEG(boss->swork[20] * 50.0f) * Corneria_80187A88(boss->swork[20]); + boss->fwork[3] = SIN_DEG(boss->swork[21] * 50.0f) * Corneria_80187A88(boss->swork[21]); + boss->fwork[4] = SIN_DEG(boss->swork[22] * 50.0f) * Corneria_80187A88(boss->swork[22]); if (boss->state < 5) { - sp5C = SIN_DEG(boss->swork[23] * 12.0f) * func_i1_80187A88(boss->swork[23]) * 0.3f; + sp5C = SIN_DEG(boss->swork[23] * 12.0f) * Corneria_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) { @@ -736,7 +734,7 @@ void func_i1_80189058(Boss* boss) { boss->timer_052 = 150; boss->swork[30] = 1; } - func_i1_80188A18(boss); + Corneria_80188A18(boss); break; case 2: D_i1_8019B6D8[17] = D_i1_8019B6D8[66] = gPlayer[0].pos.x; @@ -757,7 +755,7 @@ void func_i1_80189058(Boss* boss) { boss->timer_054 = 9; boss->swork[30] = 3; } - func_i1_80188A18(boss); + Corneria_80188A18(boss); break; case 3: D_i1_8019B6D8[17] = D_i1_8019B6D8[66] = gPlayer[0].pos.x; @@ -778,7 +776,7 @@ void func_i1_80189058(Boss* boss) { boss->timer_054 = 9; boss->swork[30] = 3; } - func_i1_80188A18(boss); + Corneria_80188A18(boss); break; case 4: D_i1_8019B6D8[17] = gPlayer[0].pos.x; @@ -791,12 +789,12 @@ void func_i1_80189058(Boss* boss) { } Animation_GetFrameData(&D_CO_602BC18, boss->unk_04C, sp84); Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp78, &sp21C); - func_i1_80188A18(boss); + Corneria_80188A18(boss); break; case 5: case 6: boss->unk_05E = 0; - D_8017812C = 1; + D_ctx_8017812C = 1; if (!(gGameFrameCount & 7)) { D_i1_8019B6D8[17] = gPlayer[0].pos.x + RAND_FLOAT_CENTERED(2000.0f); D_i1_8019B6D8[18] = gPlayer[0].pos.y; @@ -807,7 +805,7 @@ void func_i1_80189058(Boss* boss) { boss->obj.rot.z += boss->fwork[12]; if (boss->obj.rot.z > 60.0f) { boss->obj.rot.z = 60.0f; - func_i1_80188C7C(boss); + Corneria_80188C7C(boss); if ((gGameFrameCount & 0x1FF) == 0) { Radio_PlayMessage(gMsg_ID_2275, RCID_BOSS_CORNERIA); @@ -822,7 +820,7 @@ void func_i1_80189058(Boss* boss) { boss->obj.rot.z -= boss->fwork[12]; if (boss->obj.rot.z < -60.0f) { boss->obj.rot.z = -60.0f; - func_i1_80188C7C(boss); + Corneria_80188C7C(boss); if ((gGameFrameCount & 0x1FF) == 0) { Radio_PlayMessage(gMsg_ID_2275, RCID_BOSS_CORNERIA); @@ -834,14 +832,14 @@ void func_i1_80189058(Boss* boss) { boss->obj.rot.x = -boss->obj.rot.z; } if (boss->timer_050 == 0) { - s32 temp_v0_3; + ObjectId objId; boss->timer_050 = 60; - temp_v0_3 = func_i1_80188750(boss); + objId = Corneria_80188750(boss); - if (temp_v0_3 != 0) { - 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); + if (objId != 0) { + Corneria_80187710(D_i1_8019B6D8[62], D_i1_8019B6D8[63], D_i1_8019B6D8[64], 65.0f, 270.0f, 0.0f, + 0, 0, objId); } } @@ -858,7 +856,7 @@ void func_i1_80189058(Boss* boss) { boss->obj.rot.x += boss->fwork[12]; if (boss->obj.rot.x > 60.0f) { boss->obj.rot.x = 60.0f; - func_i1_80188C7C(boss); + Corneria_80188C7C(boss); } } @@ -866,7 +864,7 @@ void func_i1_80189058(Boss* boss) { if (boss->timer_050 == 12) { Object_Kill(&gEffects[0].obj, gEffects[0].sfxSource); - func_8007D0E0(D_i1_8019B6D8[62], D_i1_8019B6D8[63] - 100.0f, D_i1_8019B6D8[64], 25.0f); + func_effect_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++) { @@ -874,16 +872,16 @@ void func_i1_80189058(Boss* boss) { Object_Kill(&gEffects[sp218].obj, gEffects[sp218].sfxSource); } } - 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; + func_effect_8007A568(D_i1_8019B6D8[62], D_i1_8019B6D8[63] - 100.0f, D_i1_8019B6D8[64], 40.0f); + func_effect_8007D0E0(D_i1_8019B6D8[62], D_i1_8019B6D8[63] - 100.0f, D_i1_8019B6D8[64], 30.0f); + func_enmy_80062B60(D_i1_8019B6D8[62], D_i1_8019B6D8[64], 0, 120.0f); + D_ctx_80178480 = 25; gShowBossHealth = 0; for (sp218 = 0; sp218 < 100; sp218++) { - func_80079618(D_i1_8019B6D8[62] + RAND_FLOAT_CENTERED(600.0f), - (D_i1_8019B6D8[63] + RAND_FLOAT_CENTERED(500.0f)) - 100.0f, - D_i1_8019B6D8[64] + RAND_FLOAT_CENTERED(600.0f), 2.0f); + func_effect_80079618(D_i1_8019B6D8[62] + RAND_FLOAT_CENTERED(600.0f), + (D_i1_8019B6D8[63] + RAND_FLOAT_CENTERED(500.0f)) - 100.0f, + D_i1_8019B6D8[64] + RAND_FLOAT_CENTERED(600.0f), 2.0f); } } if (boss->timer_050 < 50) { @@ -926,7 +924,7 @@ void func_i1_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_i1_801887AC(boss); + Corneria_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); @@ -951,7 +949,7 @@ void func_i1_80189058(Boss* boss) { } } -s32 func_i1_8018A434(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +s32 Corneria_8018A434(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { Boss* boss = (Boss*) data; if (boss->swork[limbIndex] == 1000) { @@ -1014,7 +1012,7 @@ s32 func_i1_8018A434(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d return false; } -void func_i1_8018A730(s32 limbIndex, Vec3f* rot, void* data) { +void Corneria_8018A730(s32 limbIndex, Vec3f* rot, void* data) { s32 pad; Vec3f sp80 = { 0.0f, 0.0f, 0.0f }; Vec3f sp74; @@ -1084,14 +1082,14 @@ void func_i1_8018A730(s32 limbIndex, Vec3f* rot, void* data) { } } -void func_i1_8018AA74(Boss* boss) { +void Corneria_8018AA74(Boss* boss) { Matrix_Translate(gCalcMatrix, 0.0f, 700.0f, 0.0f, 1); - Animation_DrawSkeleton(2, D_CO_602BE64, boss->vwork, func_i1_8018A434, func_i1_8018A730, boss, gCalcMatrix); + Animation_DrawSkeleton(2, D_CO_602BE64, boss->vwork, Corneria_8018A434, Corneria_8018A730, boss, gCalcMatrix); Matrix_Pop(&gGfxMatrix); Matrix_Push(&gGfxMatrix); } -s32 func_i1_8018AB08(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +s32 Corneria_8018AB08(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { Actor* actor = (Actor*) data; if (limbIndex == 1) { @@ -1103,7 +1101,7 @@ s32 func_i1_8018AB08(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d return false; } -s32 func_i1_8018AB64(Actor* actor) { +s32 Corneria_8018AB64(Actor* actor) { s32 pad[2]; s32 i; s32 temp_v0; @@ -1116,7 +1114,7 @@ s32 func_i1_8018AB64(Actor* actor) { sp7C.x = sp60[i] + actor->obj.pos.x; sp7C.y = actor->obj.pos.y; sp7C.z = sp50[i] + actor->obj.pos.z; - temp_v0 = func_8006351C(actor->index, &sp7C, &sp70, 1); + temp_v0 = func_enmy_8006351C(actor->index, &sp7C, &sp70, 1); if ((temp_v0 != 0) && (temp_v0 >= 10)) { if ((gObjects80[temp_v0 - 10].obj.status == OBJ_ACTIVE) && (gObjects80[temp_v0 - 10].obj.id == OBJ_80_40)) { return temp_v0 - 9; @@ -1126,14 +1124,14 @@ s32 func_i1_8018AB64(Actor* actor) { return 0; } -void func_i1_8018ACE0(Actor* actor) { +void Corneria_8018ACE0(Actor* actor) { if (actor->unk_0D0 != 0) { actor->unk_0D0 = 0; if (actor->unk_0D2 == 0) { AUDIO_PLAY_SFX(0x29034003, actor->sfxSource, 4); - func_8007C120(actor->obj.pos.x, actor->obj.pos.y + 200.0f, actor->obj.pos.z, actor->vel.x, actor->vel.y, - actor->vel.z, 0.1f, 20); + func_effect_8007C120(actor->obj.pos.x, actor->obj.pos.y + 200.0f, actor->obj.pos.z, actor->vel.x, + actor->vel.y, actor->vel.z, 0.1f, 20); actor->timer_0C6 = 15; actor->health -= actor->damage; if (actor->health <= 0) { @@ -1147,20 +1145,20 @@ void func_i1_8018ACE0(Actor* actor) { } } if ((actor->health < 11) && !(gGameFrameCount & 3)) { - func_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(100.0f), - actor->obj.pos.y + 200.0f + RAND_FLOAT_CENTERED(100.0f), - actor->obj.pos.z + 50.0f + RAND_FLOAT(50.0f), 3.0f); - func_8007C120(actor->obj.pos.x, actor->obj.pos.y + 200.0f, actor->obj.pos.z, actor->vel.x, actor->vel.y, - actor->vel.z, 0.1f, 10); + func_effect_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(100.0f), + actor->obj.pos.y + 200.0f + RAND_FLOAT_CENTERED(100.0f), + actor->obj.pos.z + 50.0f + RAND_FLOAT(50.0f), 3.0f); + func_effect_8007C120(actor->obj.pos.x, actor->obj.pos.y + 200.0f, actor->obj.pos.z, actor->vel.x, actor->vel.y, + actor->vel.z, 0.1f, 10); } } -void func_i1_8018AED0(Actor* actor) { +void Corneria_8018AED0(Actor* actor) { Vec3f sp40[20]; f32 temp_sin; f32 temp_cos; - func_i1_8018ACE0(actor); + Corneria_8018ACE0(actor); Math_SmoothStepToVec3fArray(sp40, actor->vwork, 0, Animation_GetFrameData(&D_CO_602991C, actor->unk_0B6, sp40), 1.0f, 1.0f, 1.0f); temp_sin = SIN_DEG(actor->obj.rot.y); @@ -1170,14 +1168,14 @@ void func_i1_8018AED0(Actor* actor) { switch (actor->state) { case 0: actor->fwork[1] += 20.0f; - Texture_Scroll(&D_CO_60329C0, 16, 16, 1); + Texture_Scroll(D_CO_60329C0, 16, 16, 1); actor->unk_0B6 = 0; actor->fwork[0] += 1.0f; if (actor->fwork[0] > 10.0f) { actor->fwork[0] = 10.0f; } - actor->iwork[0] = func_i1_8018AB64(actor); + actor->iwork[0] = Corneria_8018AB64(actor); if (actor->iwork[0] != 0) { actor->state++; return; @@ -1201,7 +1199,7 @@ void func_i1_8018AED0(Actor* actor) { } } -void func_i1_8018B0B4(Actor* actor) { +void Corneria_8018B0B4(Actor* actor) { s32 i; for (i = 0; i < 50; i++) { @@ -1220,7 +1218,7 @@ void func_i1_8018B0B4(Actor* actor) { } } -void func_i1_8018B15C(Actor* actor) { +void Corneria_8018B15C(Actor* actor) { Vec3f sp60[20]; Vec3f sp54; Vec3f sp48; @@ -1228,7 +1226,7 @@ void func_i1_8018B15C(Actor* actor) { f32 temp_sin; f32 temp_cos; - func_i1_8018ACE0(actor); + Corneria_8018ACE0(actor); obj80 = &gObjects80[actor->iwork[0]]; temp_sin = SIN_DEG(actor->obj.rot.y); @@ -1250,7 +1248,7 @@ void func_i1_8018B15C(Actor* actor) { case 1: actor->fwork[0] = -10.0f; - Texture_Scroll(&D_CO_60329C0, 16, 16, 1); + Texture_Scroll(D_CO_60329C0, 16, 16, 1); if (actor->timer_0BC == 0) { actor->state = 2; actor->iwork[2] = RAND_INT(10.0f) + 10; @@ -1259,7 +1257,7 @@ void func_i1_8018B15C(Actor* actor) { case 2: actor->fwork[0] = -10.0f; - Texture_Scroll(&D_CO_60329C0, 16, 16, 1); + Texture_Scroll(D_CO_60329C0, 16, 16, 1); actor->unk_0B6++; if (actor->unk_0B6 >= Animation_GetFrameCount(&D_CO_602AA04)) { @@ -1292,7 +1290,7 @@ void func_i1_8018B15C(Actor* actor) { 1.0f, 1.0f, 1.0f); } -void func_i1_8018B418(Actor* actor) { +void Corneria_8018B418(Actor* actor) { s32 pad; Vec3f sp54[20]; Object_80* temp_v0_2; @@ -1300,7 +1298,7 @@ void func_i1_8018B418(Actor* actor) { f32 temp_cos; s32 pad2[4]; - func_i1_8018ACE0(actor); + Corneria_8018ACE0(actor); temp_sin = SIN_DEG(actor->obj.rot.y); actor->vel.x = actor->fwork[0] * temp_sin; @@ -1315,7 +1313,7 @@ void func_i1_8018B418(Actor* actor) { case 1: actor->fwork[0] = 5.0f; actor->fwork[1] += 5.0f; - Texture_Scroll(&D_CO_60329C0, 16, 16, 1); + Texture_Scroll(D_CO_60329C0, 16, 16, 1); actor->unk_0B6++; if (actor->unk_0B6 >= Animation_GetFrameCount(&D_CO_602A520)) { actor->unk_0B6 = 0; @@ -1336,7 +1334,7 @@ void func_i1_8018B418(Actor* actor) { 1.0f, 1.0f, 1.0f); } -void func_i1_8018B58C(Actor* actor) { +void Corneria_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 }; @@ -1349,11 +1347,11 @@ void func_i1_8018B58C(Actor* actor) { case 100: if (!(actor->timer_0BC & 3)) { - func_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(100.0f), - actor->obj.pos.y + 200.0f + RAND_FLOAT_CENTERED(100.0f), - actor->obj.pos.z + 50.0f + RAND_FLOAT(50.0f), 3.0f); - func_8007C120(actor->obj.pos.x, actor->obj.pos.y + 200.0f, actor->obj.pos.z, actor->vel.x, actor->vel.y, - actor->vel.z, 0.1f, 10); + func_effect_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(100.0f), + actor->obj.pos.y + 200.0f + RAND_FLOAT_CENTERED(100.0f), + actor->obj.pos.z + 50.0f + RAND_FLOAT(50.0f), 3.0f); + func_effect_8007C120(actor->obj.pos.x, actor->obj.pos.y + 200.0f, actor->obj.pos.z, actor->vel.x, + actor->vel.y, actor->vel.z, 0.1f, 10); AUDIO_PLAY_SFX(0x2903A008, actor->sfxSource, 4); } @@ -1361,9 +1359,9 @@ void func_i1_8018B58C(Actor* actor) { for (i = 0; i < 4; i++) { - func_800430DC(actor->fwork[2 + i], actor->fwork[6 + i], actor->fwork[10 + i], 0.0f, 0.0f, 0.0f, - spB4[i] * (RAND_FLOAT(0.75f) + 0.5f), spA4[i] * (RAND_FLOAT(0.75f) + 0.5f), - RAND_FLOAT_CENTERED(20.0f), 3.0f, i + 24, RAND_INT(30.0f) + 60.0f); + func_boss_800430DC(actor->fwork[2 + i], actor->fwork[6 + i], actor->fwork[10 + i], 0.0f, 0.0f, 0.0f, + spB4[i] * (RAND_FLOAT(0.75f) + 0.5f), spA4[i] * (RAND_FLOAT(0.75f) + 0.5f), + RAND_FLOAT_CENTERED(20.0f), 3.0f, i + 24, RAND_INT(30.0f) + 60.0f); } if ((fabsf(actor->obj.pos.z - gPlayer[0].unk_138) < 500.0f) && @@ -1373,29 +1371,30 @@ void func_i1_8018B58C(Actor* actor) { } BonusText_Display(actor->obj.pos.x, actor->obj.pos.y + 250.0f, actor->obj.pos.z, 5); gHitCount += 6; - D_80177850 = 15; + D_ctx_80177850 = 15; actor->state = 101; actor->timer_0BE = 50; } if (actor->timer_0BC == 8) { - func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 200.0f, actor->obj.pos.z + 50.0f, 0.0f, 0.0f, 0.0f, - 5.0f, 30); + func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 200.0f, actor->obj.pos.z + 50.0f, 0.0f, 0.0f, + 0.0f, 5.0f, 30); AUDIO_PLAY_SFX(0x2903B009, actor->sfxSource, 4); } break; case 101: if ((actor->timer_0BE != 0) && !(gGameFrameCount & 1)) { - func_8007797C(actor->obj.pos.x, actor->obj.pos.y + 150.0f, actor->obj.pos.z, 0.0f, 10.0f, 0.0f, 3.0f); + func_effect_8007797C(actor->obj.pos.x, actor->obj.pos.y + 150.0f, actor->obj.pos.z, 0.0f, 10.0f, 0.0f, + 3.0f); } break; } } -void func_i1_8018BAAC(Actor* actor) { - Animation_DrawSkeleton(3, D_CO_6029A48, actor->vwork, func_i1_8018AB08, NULL, actor, gCalcMatrix); +void Corneria_8018BAAC(Actor* actor) { + Animation_DrawSkeleton(3, D_CO_6029A48, actor->vwork, Corneria_8018AB08, NULL, actor, gCalcMatrix); } -void func_i1_8018BAFC(s32 limbIndex, Vec3f* rot, void* data) { +void Corneria_8018BAFC(s32 limbIndex, Vec3f* rot, void* data) { Actor* actor = (Actor*) data; Vec3f sp28 = { 120.0f, 0.0f, 0.0f }; Vec3f sp1C; @@ -1411,15 +1410,15 @@ void func_i1_8018BAFC(s32 limbIndex, Vec3f* rot, void* data) { } } -void func_i1_8018BBA4(Actor* actor) { - Animation_DrawSkeleton(3, D_CO_6029A48, actor->vwork, NULL, func_i1_8018BAFC, actor, gCalcMatrix); +void Corneria_8018BBA4(Actor* actor) { + Animation_DrawSkeleton(3, D_CO_6029A48, actor->vwork, NULL, Corneria_8018BAFC, actor, gCalcMatrix); } -void func_i1_8018BBF8(Actor* actor) { - Animation_DrawSkeleton(3, D_CO_6029A48, actor->vwork, func_i1_8018AB08, func_i1_8018BAFC, actor, gCalcMatrix); +void Corneria_8018BBF8(Actor* actor) { + Animation_DrawSkeleton(3, D_CO_6029A48, actor->vwork, Corneria_8018AB08, Corneria_8018BAFC, actor, gCalcMatrix); } -s32 func_i1_8018BC50(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +s32 Corneria_8018BC50(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { Actor* actor = (Actor*) data; if ((actor->state == 101) && (limbIndex != 8)) { @@ -1428,7 +1427,7 @@ s32 func_i1_8018BC50(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d return false; } -void func_i1_8018BC84(s32 limbIndex, Vec3f* rot, void* data) { +void Corneria_8018BC84(s32 limbIndex, Vec3f* rot, void* data) { Actor* actor = (Actor*) data; Vec3f sp28 = { 0.0f, 0.0f, 0.0f }; Vec3f sp1C; @@ -1458,24 +1457,22 @@ void func_i1_8018BC84(s32 limbIndex, Vec3f* rot, void* data) { } } -void func_i1_8018BD7C(Actor* actor) { - Animation_DrawSkeleton(3, D_CO_6029A48, actor->vwork, func_i1_8018BC50, func_i1_8018BC84, actor, gCalcMatrix); +void Corneria_8018BD7C(Actor* actor) { + Animation_DrawSkeleton(3, D_CO_6029A48, actor->vwork, Corneria_8018BC50, Corneria_8018BC84, actor, gCalcMatrix); } -void func_i1_8018BDD4(Boss* boss, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5, s32 arg6) { - s32 var_v1; +void Corneria_8018BDD4(Boss* boss, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5, s32 arg6) { + ObjectId objId = OBJ_ACTOR_191; - var_v1 = 0xBF; - - if (func_8008AC54(0) < 4) { - var_v1 = 0xBE; + if (func_hud_8008AC54(0) < 4) { + objId = OBJ_ACTOR_190; } - 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); + Corneria_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, objId); } -void func_i1_8018BE7C(Boss* boss) { +void Corneria_8018BE7C(Boss* boss) { s32 i; s16 temp_s1; @@ -1484,10 +1481,10 @@ void func_i1_8018BE7C(Boss* boss) { boss->unk_05E = 1; boss->timer_050 = 354; boss->health = 601; - boss->fwork[18] = -D_80161A54 - 10.0f; + boss->fwork[18] = -D_play_80161A54 - 10.0f; if (fabsf(gPlayer[0].unk_0AC) < 1.0f) { boss->timer_05A = 30000; - boss->obj.pos.z = (gPlayer[0].camEye.z - D_80177D20) - 2000.0f; + boss->obj.pos.z = (gPlayer[0].camEye.z - D_ctx_80177D20) - 2000.0f; AUDIO_PLAY_SFX(0x31038018, boss->sfxSource, 4); D_i1_8019B6D0 = 0; } else { @@ -1520,11 +1517,11 @@ void func_i1_8018BE7C(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); +void Corneria_8018C0B0(Boss* boss) { + func_effect_8007D9DC(boss->obj.pos.x, gGroundLevel + 2.0f, boss->obj.pos.z, 5.0f, 100.0f, 0); + func_effect_8007D9DC(boss->obj.pos.x, gGroundLevel + 2.0f, boss->obj.pos.z, 5.0f, 100.0f, 5); + func_effect_8007D9DC(boss->obj.pos.x, gGroundLevel + 2.0f, boss->obj.pos.z, 5.0f, 100.0f, 10); + func_effect_8007ADF4(boss->obj.pos.x, gGroundLevel, boss->obj.pos.z, 1.0f, 10.0f); } static Vec3f D_i1_801998CC = { 442.0f, 5.0f, 360.0f }; @@ -1555,7 +1552,7 @@ static s32 D_i1_80199A4C[4] = { 150, 200, 150, 200 }; static f32 D_i1_80199A5C[4] = { -225.0f, 0.0f, 225.0f, 0.0f }; -void func_i1_8018C19C(Boss* boss) { +void Corneria_8018C19C(Boss* boss) { // todo: figure out vec3f stack s32 pad[9]; Vec3f sp84[30]; @@ -1589,22 +1586,25 @@ void func_i1_8018C19C(Boss* boss) { Matrix_MultVec3f(gCalcMatrix, &sp78, &sp6C); boss->vel.x = sp6C.x; boss->vel.y = sp6C.y; - boss->vel.z = sp6C.z - D_80177D08; + boss->vel.z = sp6C.z - D_ctx_80177D08; boss->fwork[16] = 4.0f; if (!(gGameFrameCount & 1)) { 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); + func_effect_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_effect_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_effect_8007BC7C(sp84[8].x + boss->obj.pos.x, sp84[8].y + boss->obj.pos.y, sp84[8].z + boss->obj.pos.z, + 10.0f); } } else { if ((gBossFrameCount >= 381) && (gBossFrameCount < 430)) { - D_80178540 = 5; - D_80178570 = 20; - D_80178574 = 20; - D_80178578 = 20; + D_ctx_80178540 = 5; + D_ctx_80178570 = 20; + D_ctx_80178574 = 20; + D_ctx_80178578 = 20; gPlayer[0].unk_23C = 100; } Matrix_MultVec3f(gCalcMatrix, &D_i1_801998CC, &sp84[0]); @@ -1623,10 +1623,11 @@ void func_i1_8018C19C(Boss* boss) { for (var_v0 = 0, var_v1 = 13; var_v0 < i; var_v0++, var_v1++) { if ((gGameFrameCount & 0xF) == (var_v0 & 0xF)) { 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, - sp84[var_v1].z + boss->obj.pos.z, boss->vel.x, boss->vel.y, boss->vel.z, 0.1f, 7); + func_effect_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_effect_8007C120(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->vel.x, boss->vel.y, boss->vel.z, 0.1f, + 7); } } } @@ -1649,7 +1650,7 @@ void func_i1_8018C19C(Boss* boss) { } boss->vel.z = boss->fwork[18]; if (boss->state > 0) { - boss->fwork[3] = (gPlayer[0].camEye.z - D_80177D20) - 2500.0f; + boss->fwork[3] = (gPlayer[0].camEye.z - D_ctx_80177D20) - 2500.0f; } if (boss->state != 7) { Math_SmoothStepToF(&boss->fwork[4], boss->fwork[5], 0.1f, 2.0f, 0.00001f); @@ -1670,39 +1671,42 @@ void func_i1_8018C19C(Boss* boss) { } if ((gBosses[1].state != 0) && !(gGameFrameCount & 0xF)) { 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); + func_effect_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); } if (gBosses[2].state != 0) { gBosses[3].unk_05E = 1; if (gBosses[3].state != 0) { if (!(gGameFrameCount & 7)) { 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); + func_effect_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 (!(gGameFrameCount & 0xF)) { 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); + func_effect_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].state != 0) && (gBosses[2].state == 0) && !(gGameFrameCount & 0xF)) { 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); + func_effect_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->state == 1) || (boss->state == 2)) && !(gGameFrameCount & 7)) { 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); + func_effect_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_effect_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_effect_8007BC7C(sp84[8].x + boss->obj.pos.x, sp84[8].y + boss->obj.pos.y, sp84[8].z + boss->obj.pos.z, + 10.0f); } if (boss->timer_052 != 0) { - Math_SmoothStepToF(&D_801779A8[0], 50.0f, 1.0f, 1.6f, 0.0001f); + Math_SmoothStepToF(&D_ctx_801779A8[0], 50.0f, 1.0f, 1.6f, 0.0001f); } switch (boss->state) { @@ -1723,8 +1727,8 @@ void func_i1_8018C19C(Boss* boss) { boss->fwork[13] = 180.0f; boss->fwork[12] = 1.5f; boss->fwork[6] = 800.0f; - boss->fwork[3] = gPlayer[0].camEye.z - D_80177D20 - 2500.0f; - boss->fwork[18] = -D_80161A54; + boss->fwork[3] = gPlayer[0].camEye.z - D_ctx_80177D20 - 2500.0f; + boss->fwork[18] = -D_play_80161A54; AUDIO_PLAY_BGM(SEQ_ID_48 | 0x8000); boss->timer_050 = 40; } @@ -1779,7 +1783,7 @@ void func_i1_8018C19C(Boss* boss) { boss->swork[5] &= 3; } else if ((boss->fwork[2] > 60.0f) && (boss->timer_054 == 0)) { boss->timer_054 = 20; - func_i1_8018BDD4(boss, sp84[0].x, sp84[0].y, sp84[0].z, 30.0f, 0, 1); + Corneria_8018BDD4(boss, sp84[0].x, sp84[0].y, sp84[0].z, 30.0f, 0, 1); } break; case 5: @@ -1787,15 +1791,15 @@ void func_i1_8018C19C(Boss* boss) { boss->fwork[10] = 120.0f; boss->fwork[13] = 20.0f; if ((boss->fwork[0] > 60.0f) && (gBosses[2].state == 0) && (boss->swork[1] == 0)) { - func_i1_8018BDD4(boss, sp84[1].x, sp84[1].y + 50.0f, sp84[1].z, 45.0f, 0, 0); + Corneria_8018BDD4(boss, sp84[1].x, sp84[1].y + 50.0f, sp84[1].z, 45.0f, 0, 0); AUDIO_PLAY_SFX(0x2903201B, boss->sfxSource, 4); - func_i1_8018BDD4(boss, sp84[1].x, sp84[1].y - 50.0f, sp84[1].z, 40.0f, 0, 0); + Corneria_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].state == 0) && (boss->swork[2] == 0)) { - func_i1_8018BDD4(boss, sp84[2].x, sp84[2].y + 50.0f, sp84[2].z, 35.0f, 0, 0); + Corneria_8018BDD4(boss, sp84[2].x, sp84[2].y + 50.0f, sp84[2].z, 35.0f, 0, 0); AUDIO_PLAY_SFX(0x2903201B, boss->sfxSource, 4); - func_i1_8018BDD4(boss, sp84[2].x, sp84[2].y - 50.0f, sp84[2].z, 30.0f, 0, 0); + Corneria_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].state != 0) && (gBosses[2].state != 0))) { @@ -1831,7 +1835,7 @@ void func_i1_8018C19C(Boss* boss) { } break; case 7: - boss->fwork[3] = (gPlayer[0].camEye.z - D_80177D20) - 4000.0f; + boss->fwork[3] = (gPlayer[0].camEye.z - D_ctx_80177D20) - 4000.0f; Math_SmoothStepToF(&boss->obj.pos.z, boss->fwork[3], 0.1f, 15.0f, 0.00001f); if (boss->timer_058 == 0) { @@ -1889,12 +1893,12 @@ void func_i1_8018C19C(Boss* boss) { } } if (boss->health < 2) { - D_8017796C = -1; + D_ctx_8017796C = -1; Audio_KillSfxBySourceAndId(boss->sfxSource, 0x31034025); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 40); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 40); AUDIO_PLAY_SFX(0x2940D09A, boss->sfxSource, 4); - D_Timer_80161A60 = 8; + D_play_Timer_80161A60 = 8; gShowBossHealth = false; Radio_PlayMessage(gMsg_ID_2294, RCID_BOSS_CORNERIA2); boss->health = 1; @@ -1918,15 +1922,15 @@ void func_i1_8018C19C(Boss* boss) { Matrix_MultVec3f(gCalcMatrix, &sp78, &sp6C); boss->vel.x = sp6C.x; boss->vel.y = sp6C.y; - boss->vel.z = sp6C.z - D_80177D08; + boss->vel.z = sp6C.z - D_ctx_80177D08; } break; case 8: - D_801779A8[0] = 20.0f; + D_ctx_801779A8[0] = 20.0f; if (!(gGameFrameCount & 0x1F)) { for (i = 0; i < 10; i++) { - func_80079618(RAND_FLOAT_CENTERED(300.0f) + boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, - 1.0f); + func_effect_80079618(RAND_FLOAT_CENTERED(300.0f) + boss->obj.pos.x, boss->obj.pos.y, + boss->obj.pos.z, 1.0f); } } Math_SmoothStepToF(&boss->obj.pos.x, boss->fwork[7], 1.0f, 10.0f, 0.00001f); @@ -1943,12 +1947,12 @@ void func_i1_8018C19C(Boss* boss) { Math_SmoothStepToAngle(&boss->obj.rot.z, boss->fwork[14], 1.0f, 1.0f, 0.001f); if (boss->health != 0) { if (boss->timer_056 == 0) { - func_80042EC0(boss); + func_boss_80042EC0(boss); boss->fwork[17] = 10.0f; boss->vel.y *= 1.5f; - D_80177930 = 1; + D_ctx_80177930 = 1; if ((gPlayer[0].state_1C8 == 3) || (gPlayer[0].state_1C8 == 5)) { - func_8004319C(gPlayer, boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z); + func_boss_8004319C(gPlayer, boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z); } boss->health--; boss->fwork[8] = 0.0f; @@ -1961,7 +1965,7 @@ void func_i1_8018C19C(Boss* boss) { Matrix_MultVec3f(gCalcMatrix, &sp78, &sp6C); boss->vel.x = sp6C.x; boss->vel.y = sp6C.y; - boss->vel.z = sp6C.z - D_80177D08; + boss->vel.z = sp6C.z - D_ctx_80177D08; if (boss->timer_056 == 60) { Radio_PlayMessage(gMsg_ID_2295, RCID_FOX); } @@ -1973,8 +1977,8 @@ void func_i1_8018C19C(Boss* boss) { case 9: if (!(gGameFrameCount & 0xF)) { for (i = 0; i < 10; i++) { - func_80079618(RAND_FLOAT_CENTERED(300.0f) + boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, - 1.0f); + func_effect_80079618(RAND_FLOAT_CENTERED(300.0f) + boss->obj.pos.x, boss->obj.pos.y, + boss->obj.pos.z, 1.0f); } } Math_SmoothStepToF(&boss->vel.x, 0.0f, 0.1f, 2.0f, 0.00001f); @@ -1983,25 +1987,25 @@ void func_i1_8018C19C(Boss* boss) { boss->obj.rot.z -= 2.0f; boss->gravity = 1.0f; if (boss->obj.pos.y < (gGroundLevel + 150.0f)) { - D_80178480 = 100; - func_80081A8C(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 40.0f, 12); + D_ctx_80178480 = 100; + func_effect_80081A8C(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 40.0f, 12); boss->timer_050 = 20; boss->vel.y = -10.0f; boss->gravity = 0.0f; boss->fwork[17] = 20.0f; - func_i1_8018C0B0(boss); + Corneria_8018C0B0(boss); boss->state = 10; } break; case 10: if (!(gGameFrameCount & 7)) { for (i = 0; i < 10; i++) { - func_80079618(RAND_FLOAT_CENTERED(300.0f) + boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, - 1.0f); + func_effect_80079618(RAND_FLOAT_CENTERED(300.0f) + boss->obj.pos.x, boss->obj.pos.y, + boss->obj.pos.z, 1.0f); } } if (boss->timer_050 == 0) { - func_8007A568(boss->obj.pos.x, boss->obj.pos.y + 500.0f, boss->obj.pos.z, 120.0f); + func_effect_8007A568(boss->obj.pos.x, boss->obj.pos.y + 500.0f, boss->obj.pos.z, 120.0f); Object_Kill(&boss->obj, boss->sfxSource); } break; @@ -2047,7 +2051,7 @@ void func_i1_8018C19C(Boss* boss) { static Vec3f D_i1_80199A6C = { -270.0f, 0.0f, 200.0f }; static Vec3f D_i1_80199A78 = { 440.0f, 0.0f, 0.0f }; -void func_i1_8018DDAC(Boss* boss) { +void Corneria_8018DDAC(Boss* boss) { Vec3f sp4C; Vec3f sp40; s32 i; @@ -2081,8 +2085,8 @@ void func_i1_8018DDAC(Boss* boss) { 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, - boss->obj.pos.z + sp4C.z, 1.0f); + func_effect_80079618(boss->obj.pos.x + sp4C.x, boss->obj.pos.y + sp4C.y, + boss->obj.pos.z + sp4C.z, 1.0f); } if ((gBosses[2].state == 1) && (gBosses[3].state == 1)) { @@ -2117,8 +2121,8 @@ void func_i1_8018DDAC(Boss* boss) { if (!(gGameFrameCount & 1)) { 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); + func_effect_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); } if (boss->obj.pos.y < (gGroundLevel + 150.0f)) { @@ -2126,7 +2130,7 @@ void func_i1_8018DDAC(Boss* boss) { boss->vel.y = -5.0f; boss->swork[0] = 1; boss->gravity = 0.0f; - func_i1_8018C0B0(boss); + Corneria_8018C0B0(boss); AUDIO_PLAY_SFX(0x19000014, boss->sfxSource, 4); } } else { @@ -2138,10 +2142,9 @@ void func_i1_8018DDAC(Boss* boss) { } static Vec3f D_i1_80199A84 = { 20.0f, -90.0f, 0.0f }; - static Vec3f D_i1_80199A90 = { -440.0f, 210.0f, 0.0f }; -void func_i1_8018E290(Boss* boss) { +void Corneria_8018E290(Boss* boss) { Vec3f sp4C; Vec3f sp40; s32 i; @@ -2175,8 +2178,8 @@ void func_i1_8018E290(Boss* boss) { boss->state = 1; 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); + func_effect_80079618(boss->obj.pos.x + sp4C.x, boss->obj.pos.y + sp4C.y, + boss->obj.pos.z + sp4C.z, 1.0f); } if (gBosses[1].state == 1) { gBosses[0].fwork[14] = 25.0f; @@ -2210,8 +2213,8 @@ void func_i1_8018E290(Boss* boss) { if (!(gGameFrameCount & 1)) { 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); + func_effect_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); } if (boss->obj.pos.y < (gGroundLevel + 150.0f)) { @@ -2219,7 +2222,7 @@ void func_i1_8018E290(Boss* boss) { boss->vel.y = -5.0f; boss->swork[0] = 1; boss->gravity = 0.0f; - func_i1_8018C0B0(boss); + Corneria_8018C0B0(boss); AUDIO_PLAY_SFX(0x19000014, boss->sfxSource, 4); } } else { @@ -2231,10 +2234,9 @@ void func_i1_8018E290(Boss* boss) { } static Vec3f D_i1_80199A9C = { 20.0f, 90.0f, 0.0f }; - static Vec3f D_i1_80199AA8 = { -440.0f, -210.0f, 0.0f }; -void func_i1_8018E76C(Boss* boss) { +void Corneria_8018E76C(Boss* boss) { Vec3f sp4C; Vec3f sp40; s32 i; @@ -2270,8 +2272,8 @@ void func_i1_8018E76C(Boss* boss) { 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, - boss->obj.pos.z + sp4C.z, 1.0f); + func_effect_80079618(boss->obj.pos.x + sp4C.x, boss->obj.pos.y + sp4C.y, + boss->obj.pos.z + sp4C.z, 1.0f); } if (gBosses[1].state == 1) { @@ -2304,15 +2306,15 @@ void func_i1_8018E76C(Boss* boss) { } if (!(gGameFrameCount & 1)) { 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); + func_effect_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); } if (boss->obj.pos.y < (gGroundLevel + 150.0f)) { if (boss->swork[0] == 0) { boss->vel.y = -5.0f; boss->swork[0] = 1; boss->gravity = 0.0f; - func_i1_8018C0B0(boss); + Corneria_8018C0B0(boss); AUDIO_PLAY_SFX(0x19000014, boss->sfxSource, 4); } } else { @@ -2323,7 +2325,7 @@ void func_i1_8018E76C(Boss* boss) { } } -s32 func_i1_8018EC54(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +s32 Corneria_8018EC54(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { if ((limbIndex == 10) && (gBosses[2].state != 0) && (gBosses[3].state != 0)) { *dList = NULL; } @@ -2333,13 +2335,13 @@ s32 func_i1_8018EC54(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d return false; } -void func_i1_8018ECAC(Boss* boss) { +void Corneria_8018ECAC(Boss* boss) { Animation_GetFrameData(&D_CO_602D400, 0, boss->vwork); - Animation_DrawSkeleton(1, D_CO_602D5AC, boss->vwork, func_i1_8018EC54, NULL, &boss->index, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_CO_602D5AC, boss->vwork, Corneria_8018EC54, NULL, &boss->index, &gIdentityMatrix); } -s32 func_i1_8018ED1C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +s32 Corneria_8018ED1C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { if (limbIndex == 5) { rot->y -= gBosses[*(s32*) data].fwork[2]; } @@ -2349,15 +2351,15 @@ s32 func_i1_8018ED1C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d return false; } -void func_i1_8018ED78(Boss* boss) { +void Corneria_8018ED78(Boss* boss) { Matrix_Translate(gGfxMatrix, -D_i1_80199A78.x, -D_i1_80199A78.y, 0.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); Animation_GetFrameData(&D_CO_602D400, 0, boss->vwork); - Animation_DrawSkeleton(1, D_CO_602D5AC, boss->vwork, func_i1_8018ED1C, NULL, &boss->index, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_CO_602D5AC, boss->vwork, Corneria_8018ED1C, NULL, &boss->index, &gIdentityMatrix); } -s32 func_i1_8018EE2C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +s32 Corneria_8018EE2C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { if (limbIndex == 1) { rot->z -= gBosses[*(s32*) data].fwork[0]; } @@ -2367,15 +2369,15 @@ s32 func_i1_8018EE2C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d return false; } -void func_i1_8018EE84(Boss* boss) { +void Corneria_8018EE84(Boss* boss) { Matrix_Translate(gGfxMatrix, -D_i1_80199A90.x, -D_i1_80199A90.y, 0.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); Animation_GetFrameData(&D_CO_602D400, 0, boss->vwork); - Animation_DrawSkeleton(1, D_CO_602D5AC, boss->vwork, func_i1_8018EE2C, NULL, &boss->index, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_CO_602D5AC, boss->vwork, Corneria_8018EE2C, NULL, &boss->index, &gIdentityMatrix); } -s32 func_i1_8018EF38(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +s32 Corneria_8018EF38(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { if (limbIndex == 3) { rot->z -= gBosses[*(s32*) data].fwork[1]; } @@ -2385,15 +2387,15 @@ s32 func_i1_8018EF38(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d return false; } -void func_i1_8018EF90(Boss* boss) { +void Corneria_8018EF90(Boss* boss) { Matrix_Translate(gGfxMatrix, -D_i1_80199AA8.x, -D_i1_80199AA8.y, 0.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); Animation_GetFrameData(&D_CO_602D400, 0, boss->vwork); - Animation_DrawSkeleton(1, D_CO_602D5AC, boss->vwork, func_i1_8018EF38, NULL, &boss->index, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_CO_602D5AC, boss->vwork, Corneria_8018EF38, NULL, &boss->index, &gIdentityMatrix); } -void func_i1_8018F044(Object_80* obj80) { +void Corneria_8018F044(Object_80* obj80) { switch (obj80->state) { case 0: @@ -2421,7 +2423,7 @@ void func_i1_8018F044(Object_80* obj80) { } } -s32 func_i1_8018F1C8(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +s32 Corneria_8018F1C8(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { Object_80* obj80 = (Object_80*) data; RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); @@ -2442,15 +2444,15 @@ s32 func_i1_8018F1C8(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d return 0; } -void func_i1_8018F31C(Object_80* obj80) { +void Corneria_8018F31C(Object_80* obj80) { Vec3f sp28[10]; Animation_GetFrameData(&D_CO_602AA7C, 0, sp28); - Animation_DrawSkeleton(3, D_CO_602AB48, sp28, func_i1_8018F1C8, NULL, obj80, gCalcMatrix); + Animation_DrawSkeleton(3, D_CO_602AB48, sp28, Corneria_8018F1C8, NULL, obj80, gCalcMatrix); RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } -void func_i1_8018F3BC(Object_80* obj80, f32 arg1) { +void Corneria_8018F3BC(Object_80* obj80, f32 arg1) { Object_80_Initialize(obj80); obj80->obj.status = OBJ_INIT; obj80->obj.pos.x = RAND_FLOAT_CENTERED(1000.0f) + arg1; @@ -2466,27 +2468,27 @@ void func_i1_8018F3BC(Object_80* obj80, f32 arg1) { obj80->info.unk_10 = 15000.0f; } -void func_i1_8018F4A4(void) { +void Corneria_8018F4A4(void) { s32 i; if (!(gGameFrameCount & 0xF) && !(gPlayer[0].unk_1D0 < 4)) { for (i = 0; i < 50; i++) { if (gObjects80[i].obj.status == OBJ_FREE) { - func_i1_8018F3BC(&gObjects80[i], 4000.0f); + Corneria_8018F3BC(&gObjects80[i], 4000.0f); break; } } for (i = 0; i < ARRAY_COUNT(gObjects80); i++) { if (gObjects80[i].obj.status == OBJ_FREE) { - func_i1_8018F3BC(&gObjects80[i], -4000.0f); + Corneria_8018F3BC(&gObjects80[i], -4000.0f); break; } } } } -void func_i1_8018F55C(Effect* effect) { +void Corneria_8018F55C(Effect* effect) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; @@ -2504,14 +2506,14 @@ void func_i1_8018F55C(Effect* effect) { Object_SetInfo(&effect->info, effect->obj.id); } -void func_i1_8018F678(void) { +void Corneria_8018F678(void) { s32 i; if (!(gGameFrameCount & 0x1F) && gPlayer[0].pos.x == 0.0f) { for (i = 0; i < ARRAY_COUNT(gEffects); i++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i1_8018F55C(&gEffects[i]); + Corneria_8018F55C(&gEffects[i]); return; } } @@ -2526,7 +2528,7 @@ static f32 D_i1_80199ACC[3] = { 160.0f, 160.0f, 320.0f }; static f32 D_i1_80199AD8[3] = { -60.0f, 60.0f, -45.0f }; -void func_i1_8018F6F8(Actor* actor, s32 arg1) { +void Corneria_8018F6F8(Actor* actor, s32 arg1) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; actor->obj.id = OBJ_ACTOR_195; @@ -2547,7 +2549,7 @@ void func_i1_8018F6F8(Actor* actor, s32 arg1) { AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); } -void func_i1_8018F880(Player* player) { +void Corneria_8018F880(Player* player) { s32 i; Actor* actor0 = &gActors[0]; Actor* actor1 = &gActors[1]; @@ -2582,8 +2584,8 @@ void func_i1_8018F880(Player* player) { sp2C = -Math_Atan2F(player->camEye.x - sp3C, player->camEye.z - sp34); sp30 = -Math_Atan2F(player->camEye.y - sp38, sqrtf(SQ(player->camEye.z - sp34) + SQ(player->camEye.x - sp3C))); - sp44 = Math_RadToDeg(sp2C) - D_80177A48[4]; - sp40 = Math_RadToDeg(sp30) - D_80177A48[5]; + sp44 = Math_RadToDeg(sp2C) - D_ctx_80177A48[4]; + sp40 = Math_RadToDeg(sp30) - D_ctx_80177A48[5]; if (sp44 > 180.0f) { sp44 -= 360.0f; } @@ -2597,39 +2599,39 @@ void func_i1_8018F880(Player* player) { sp40 += 360.0f; } - D_80177A48[6] += fabsf(sp44); - D_80177A48[7] += fabsf(sp40); + D_ctx_80177A48[6] += fabsf(sp44); + D_ctx_80177A48[7] += fabsf(sp40); if (sp2C >= 0.0f) { - Texture_Scroll(&D_arwing_30184D8, 64, 32, 2); - Texture_Scroll(&D_arwing_30184D8, 64, 32, 2); + Texture_Scroll(D_arwing_30184D8, 64, 32, 2); + Texture_Scroll(D_arwing_30184D8, 64, 32, 2); } else { - Texture_Scroll(&D_arwing_30184D8, 64, 32, 3); - Texture_Scroll(&D_arwing_30184D8, 64, 32, 3); + Texture_Scroll(D_arwing_30184D8, 64, 32, 3); + Texture_Scroll(D_arwing_30184D8, 64, 32, 3); } - for (i = 0; (i < 40 && D_80177A48[6] >= 0.2f); i++, D_80177A48[6] -= 0.2f) { + for (i = 0; (i < 40 && D_ctx_80177A48[6] >= 0.2f); i++, D_ctx_80177A48[6] -= 0.2f) { if (sp44 >= 0) { - Texture_Scroll(&D_arwing_30184D8, 64, 32, 2); + Texture_Scroll(D_arwing_30184D8, 64, 32, 2); } else { - Texture_Scroll(&D_arwing_30184D8, 64, 32, 3); + Texture_Scroll(D_arwing_30184D8, 64, 32, 3); } } - for (i = 0; (i < 40 && D_80177A48[7] >= 0.3f); i++, D_80177A48[7] -= 0.3f) { + for (i = 0; (i < 40 && D_ctx_80177A48[7] >= 0.3f); i++, D_ctx_80177A48[7] -= 0.3f) { if (sp40 >= 0) { - Texture_Scroll(&D_arwing_30184D8, 64, 32, 0); + Texture_Scroll(D_arwing_30184D8, 64, 32, 0); } else { - Texture_Scroll(&D_arwing_30184D8, 64, 32, 1); + Texture_Scroll(D_arwing_30184D8, 64, 32, 1); } } - D_80177A48[4] = Math_RadToDeg(sp2C); - D_80177A48[5] = Math_RadToDeg(sp30); + D_ctx_80177A48[4] = Math_RadToDeg(sp2C); + D_ctx_80177A48[5] = Math_RadToDeg(sp30); player->unk_228 = 0; - D_80177950 = -1.0f; + D_ctx_80177950 = -1.0f; if ((Math_RadToDeg(gPlayer[0].unk_058) < 90.0f) || (Math_RadToDeg(gPlayer[0].unk_058) > 270.0f)) { - D_80177950 = 1.0f; + D_ctx_80177950 = 1.0f; } player->vel.z = 0.0f; player->pos.z = player->pos.z; @@ -2638,7 +2640,7 @@ void func_i1_8018F880(Player* player) { player->unk_080 = -SIN_DEG(player->unk_088) * 0.5f; player->unk_0F4 += 3.0f; player->unk_0F0 = SIN_DEG(player->unk_0F4) * 1.5f; - func_i1_8018F678(); + Corneria_8018F678(); player->wings.unk_30 = 0; switch (player->unk_1D0) { @@ -2648,9 +2650,9 @@ void func_i1_8018F880(Player* player) { player->timer_1F8 = 600; player->pos.y = 6000.0f; player->pos.x = 0.1f; - func_i1_8018F6F8(&gActors[0], 0); - func_i1_8018F6F8(&gActors[1], 1); - func_i1_8018F6F8(&gActors[2], 2); + Corneria_8018F6F8(&gActors[0], 0); + Corneria_8018F6F8(&gActors[1], 1); + Corneria_8018F6F8(&gActors[2], 2); actor0->iwork[14] = 2; actor1->iwork[14] = 3; actor2->iwork[14] = 4; @@ -2660,17 +2662,17 @@ void func_i1_8018F880(Player* player) { player->camAt.x = gCsCamAtX = player->pos.x; player->camAt.y = gCsCamAtY = player->pos.y; player->camAt.z = gCsCamAtZ = player->unk_138 + 300.0f; - D_80177A48[0] = 0; - D_80177A48[1] = D_80177A48[2] = 0; - D_80178358 = 0xFF; - D_80178340 = 0xFF; - D_80178348 = D_80178350 = D_80178354 = 0xFF; + D_ctx_80177A48[0] = 0; + D_ctx_80177A48[1] = D_ctx_80177A48[2] = 0; + D_ctx_80178358 = 0xFF; + D_ctx_80178340 = 0xFF; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0xFF; break; case 1: if (player->timer_1F8 < 0x226) { - D_80178358 = 0; - D_8017835C = 3; - Math_SmoothStepToF(&D_80177A48[0], 0.01f, 1.0f, 0.0005f, 0.0f); + D_ctx_80178358 = 0; + D_ctx_8017835C = 3; + Math_SmoothStepToF(&D_ctx_80177A48[0], 0.01f, 1.0f, 0.0005f, 0.0f); } gCsCamEyeX = player->pos.x - 150.0f; gCsCamEyeY = player->pos.y - 70.0f; @@ -2681,13 +2683,13 @@ void func_i1_8018F880(Player* player) { if (player->timer_1F8 == 0) { player->unk_1D0 = 2; player->timer_1F8 = 130; - D_80177A48[0] = 0.0f; + D_ctx_80177A48[0] = 0.0f; } if (player->timer_1F8 == 315) { player->pos.x = 0.0f; } if (player->timer_1F8 == 270) { - D_80178300 = 0; + D_ctx_80178300 = 0; Radio_PlayMessage(gMsg_ID_2005, RCID_FOX); } if (player->timer_1F8 == 180) { @@ -2703,16 +2705,16 @@ void func_i1_8018F880(Player* player) { player->unk_204 = 0; } if ((player->timer_1F8 < 120) && !(player->timer_1F8 & 0xF)) { - D_80177A48[1] = RAND_FLOAT_CENTERED(60.0f); - D_80177A48[2] = RAND_FLOAT_CENTERED(60.0f); + D_ctx_80177A48[1] = RAND_FLOAT_CENTERED(60.0f); + D_ctx_80177A48[2] = RAND_FLOAT_CENTERED(60.0f); } if (player->timer_1F8 == 0) { - D_80177A48[1] = 0.0f; - D_80177A48[2] = D_80177A48[1]; + D_ctx_80177A48[1] = 0.0f; + D_ctx_80177A48[2] = D_ctx_80177A48[1]; } break; case 2: - Math_SmoothStepToF(&D_80177A48[0], 0.1f, 1.0f, 0.001f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[0], 0.1f, 1.0f, 0.001f, 0.0f); gCsCamEyeX = player->pos.x - 50.0f; gCsCamEyeY = player->pos.y + 10.0f; gCsCamEyeZ = player->unk_138 - 10.0f; @@ -2732,27 +2734,27 @@ void func_i1_8018F880(Player* player) { actor0->obj.pos.y = player->pos.y + 80.0f; actor0->obj.pos.z += 100.0f; } - if ((D_801782F8 != 0) && (gGameFrameCount & 2)) { + if ((D_ctx_801782F8 != 0) && (gGameFrameCount & 2)) { player->wings.unk_30 = 5.0f; } break; case 3: if (fabsf(Math_SmoothStepToF(&actor0->obj.pos.z, player->pos.z + 100.0f, 0.05f, 5.0f, 0.0f)) < 1.0f) { player->unk_1D0 = 4; - D_80177A48[0] = 0.0f; + D_ctx_80177A48[0] = 0.0f; player->timer_1F8 = 190; } - if ((D_801782F8 != 0) && (gGameFrameCount & 2)) { + if ((D_ctx_801782F8 != 0) && (gGameFrameCount & 2)) { player->wings.unk_30 = 5.0f; } gCsCamEyeY = player->pos.y + 10.0f; gCsCamAtY = player->pos.y + 10.0f; break; case 4: - if ((D_801782F8 != 0) && (gGameFrameCount & 2)) { + if ((D_ctx_801782F8 != 0) && (gGameFrameCount & 2)) { player->wings.unk_30 = 5.0f; } - Math_SmoothStepToF(&D_80177A48[0], 0.1f, 1.0f, 0.001f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[0], 0.1f, 1.0f, 0.001f, 0.0f); gCsCamEyeX = actor0->obj.pos.x - 50.0f; gCsCamEyeY = actor0->obj.pos.y + 10.0f; gCsCamEyeZ = actor0->obj.pos.z - 10.0f; @@ -2770,7 +2772,7 @@ void func_i1_8018F880(Player* player) { Math_SmoothStepToF(&actor0->fwork[19], 50.0f, 0.1f, 3.0f, 0.01f); } actor0->fwork[20] = 0.0f; - if ((D_801782F8 != 0) && (gGameFrameCount & 2)) { + if ((D_ctx_801782F8 != 0) && (gGameFrameCount & 2)) { actor0->fwork[20] = 5.0f; } break; @@ -2778,7 +2780,7 @@ void func_i1_8018F880(Player* player) { Math_SmoothStepToF(&actor0->fwork[19], 0, 0.1f, 3.0f, 0.01f); if (player->timer_1F8 == 0) { player->unk_1D0 = 6; - D_80177A48[0] = 0.0f; + D_ctx_80177A48[0] = 0.0f; player->timer_1F8 = 190; } @@ -2787,22 +2789,22 @@ void func_i1_8018F880(Player* player) { break; case 6: Math_SmoothStepToF(&actor0->fwork[19], 0.0f, 0.1f, 3.0f, 0.01f); - Math_SmoothStepToF(&D_80177A48[0], 0.1f, 1.0f, 0.001f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[0], 0.1f, 1.0f, 0.001f, 0.0f); - D_80177A48[3] -= 0.5f; + D_ctx_80177A48[3] -= 0.5f; - gCsCamEyeX = actor2->obj.pos.x + 100.0f + D_80177A48[3]; + gCsCamEyeX = actor2->obj.pos.x + 100.0f + D_ctx_80177A48[3]; gCsCamEyeY = actor2->obj.pos.y + 10.0f; gCsCamEyeZ = actor2->obj.pos.z - 70.0f; - gCsCamAtX = actor2->obj.pos.x + 20.0f + (D_80177A48[3] * 0.5f); + gCsCamAtX = actor2->obj.pos.x + 20.0f + (D_ctx_80177A48[3] * 0.5f); gCsCamAtY = actor2->obj.pos.y + 10.0f; gCsCamAtZ = actor2->obj.pos.z + 10.0f; if (player->timer_1F8 == 0) { player->unk_1D0 = 7; player->timer_1F8 = 190; - D_80177A48[0] = 0.0f; + D_ctx_80177A48[0] = 0.0f; actor0->obj.pos.y = player->pos.y; actor0->obj.pos.z = player->unk_138 + 240.0f; } @@ -2810,12 +2812,12 @@ void func_i1_8018F880(Player* player) { Radio_PlayMessage(gMsg_ID_2030, RCID_PEPPY); } actor2->fwork[20] = 0.0f; - if ((D_801782F8 != 0) && (gGameFrameCount & 2)) { + if ((D_ctx_801782F8 != 0) && (gGameFrameCount & 2)) { actor2->fwork[20] = 5.0f; } break; case 7: - Math_SmoothStepToF(&D_80177A48[0], 0.1f, 1.0f, 0.001f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[0], 0.1f, 1.0f, 0.001f, 0.0f); gCsCamEyeX = actor1->obj.pos.x + 20.0f; gCsCamEyeY = actor1->obj.pos.y + 10.0f; gCsCamEyeZ = actor1->obj.pos.z - 50.0f; @@ -2824,10 +2826,10 @@ void func_i1_8018F880(Player* player) { gCsCamAtZ = actor1->obj.pos.z + 10.0f; if (player->timer_1F8 == 0) { player->unk_1D0 = 8; - D_80177A48[0] = 0.0f; + D_ctx_80177A48[0] = 0.0f; player->timer_1F8 = 300; - D_80177A48[8] = 50.0f; - D_80177A48[3] = 0.0f; + D_ctx_80177A48[8] = 50.0f; + D_ctx_80177A48[3] = 0.0f; } if (player->timer_1F8 == 80) { Radio_PlayMessage(gMsg_ID_2040, RCID_SLIPPY); @@ -2837,30 +2839,30 @@ void func_i1_8018F880(Player* player) { Math_SmoothStepToF(&actor1->fwork[19], -20.0f, 0.1f, 3.0f, 0.01f); } actor1->fwork[20] = 0.0f; - if ((D_801782F8 != 0) && (gGameFrameCount & 2)) { + if ((D_ctx_801782F8 != 0) && (gGameFrameCount & 2)) { actor1->fwork[20] = 5.0f; } break; case 8: - Math_SmoothStepToF(&D_80177A48[0], 0.1f, 1.0f, 0.001f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[0], 0.1f, 1.0f, 0.001f, 0.0f); if (player->timer_1F8 < 150) { - D_80177A48[3] += player->unk_004; + D_ctx_80177A48[3] += player->unk_004; Math_SmoothStepToF(&player->unk_004, 2.0f, 1.0f, 0.2f, 0.0f); } gCsCamEyeX = player->pos.x; - gCsCamEyeZ = (player->unk_138 - 600.0f) + D_80177A48[3]; - gCsCamEyeY = player->pos.y + D_80177A48[8]; + gCsCamEyeZ = (player->unk_138 - 600.0f) + D_ctx_80177A48[3]; + gCsCamEyeY = player->pos.y + D_ctx_80177A48[8]; gCsCamAtX = player->pos.x; gCsCamAtY = player->pos.y + 20.0f; gCsCamAtZ = player->unk_138 + 100.0f; if (player->timer_1F8 < 100) { - Math_SmoothStepToF(&D_80177A48[8], 10.0f, 0.1f, 0.7f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[8], 10.0f, 0.1f, 0.7f, 0.0f); } if (player->timer_1F8 == 200) { Radio_PlayMessage(gMsg_ID_2050, RCID_FOX); } player->wings.unk_30 = 0.0f; - if ((D_801782F8 != 0) && (gGameFrameCount & 2)) { + if ((D_ctx_801782F8 != 0) && (gGameFrameCount & 2)) { player->wings.unk_30 = 5.0f; } if (player->timer_1F8 == 80) { @@ -2883,19 +2885,19 @@ void func_i1_8018F880(Player* player) { } if (player->timer_1F8 == 70) { actor0->state = 1; - func_800A6028(player->sfxSource, 0x09000002); + func_play_800A6028(player->sfxSource, 0x09000002); } if (player->timer_1F8 == 50) { actor1->state = 2; - func_800A6028(player->sfxSource, 0x09000002); + func_play_800A6028(player->sfxSource, 0x09000002); } if (player->timer_1F8 == 30) { actor2->state = 3; - func_800A6028(player->sfxSource, 0x09000002); + func_play_800A6028(player->sfxSource, 0x09000002); } if (player->timer_1F8 == 0) { player->unk_1D0 = 9; - func_800A6028(player->sfxSource, 0x09000002); + func_play_800A6028(player->sfxSource, 0x09000002); player->timer_1F8 = 3; player->unk_194 = 5.0f; player->unk_190 = 5.0f; @@ -2908,20 +2910,20 @@ void func_i1_8018F880(Player* player) { gCsCamAtX = player->pos.x; gCsCamAtY = player->pos.y; gCsCamAtZ = player->unk_138 + 1100.0f; - D_80177A48[0] = 0.03f; + D_ctx_80177A48[0] = 0.03f; player->unk_190 = 2.0f; if (player->timer_1F8 == 0) { - D_80178358 = 0xFF; - D_8017835C = 0x30; - D_80178348 = D_80178350 = D_80178354 = 0xFF; + D_ctx_80178358 = 0xFF; + D_ctx_8017835C = 0x30; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0xFF; } - if (D_80178340 == 0xFF) { - AUDIO_PLAY_BGM(D_80177C90); + if (D_ctx_80178340 == 0xFF) { + AUDIO_PLAY_BGM(D_ctx_80177C90); Object_Kill(&actor0->obj, actor0->sfxSource); Object_Kill(&actor1->obj, actor1->sfxSource); Object_Kill(&actor2->obj, actor2->sfxSource); - D_80177838 = 80; + D_ctx_80177838 = 80; player->pos.y = 350.0f; player->camEye.x = player->pos.x; player->camEye.y = (player->pos.y * player->unk_148) + 50.0f; @@ -2931,24 +2933,24 @@ void func_i1_8018F880(Player* player) { player->camAt.x = player->pos.x; player->camAt.y = (player->pos.y * player->unk_148) + 20.0f; player->camAt.z = player->unk_138; - D_80177950 = 1.0f; - D_80178380[0] = D_80178380[1] = D_80178380[2] = D_80178380[3] = 0; - D_80178488 = 1; - D_80178358 = 0; + D_ctx_80177950 = 1.0f; + D_ctx_80178380[0] = D_ctx_80178380[1] = D_ctx_80178380[2] = D_ctx_80178380[3] = 0; + D_ctx_80178488 = 1; + D_ctx_80178358 = 0; player->timer_1F8 = 15; } break; case 10: break; } - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 20000.0f, 0.0f); - Math_SmoothStepToF(&player->camEye.y, player->unk_080 + gCsCamEyeY, D_80177A48[0], 20000.0f, 0.0f); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 20000.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 20000.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.y, gCsCamAtY - player->unk_080, D_80177A48[0], 20000.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 20000.0f, 0.0f); - Math_SmoothStepToF(&player->wings.unk_04, D_80177A48[1], 0.2f, 1.0f, 0.0f); - Math_SmoothStepToF(&player->wings.unk_0C, D_80177A48[2], 0.2f, 1.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], 20000.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.y, player->unk_080 + gCsCamEyeY, D_ctx_80177A48[0], 20000.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], 20000.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_ctx_80177A48[0], 20000.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.y, gCsCamAtY - player->unk_080, D_ctx_80177A48[0], 20000.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_ctx_80177A48[0], 20000.0f, 0.0f); + Math_SmoothStepToF(&player->wings.unk_04, D_ctx_80177A48[1], 0.2f, 1.0f, 0.0f); + Math_SmoothStepToF(&player->wings.unk_0C, D_ctx_80177A48[2], 0.2f, 1.0f, 0.0f); player->wings.unk_08 = player->wings.unk_04; player->wings.unk_10 = player->wings.unk_0C; player->camEye.y -= 3.0f; @@ -2976,7 +2978,7 @@ static f32 D_i1_80199B20[3] = { 200.0f, 200.0f, 400.0f }; static f32 D_i1_80199B2C[3] = { 180.0f, -120.0f, 180.0f }; -void func_i1_80190F74(Actor* actor, s32 arg1) { +void Corneria_80190F74(Actor* actor, s32 arg1) { Vec3f sp5C; Vec3f sp50; Vec3f sp44; @@ -3012,7 +3014,7 @@ void func_i1_80190F74(Actor* actor, s32 arg1) { AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); } -void func_i1_80191160(Player* player) { +void Corneria_80191160(Player* player) { Vec3f sp64; Vec3f sp58; f32 sp54; @@ -3045,26 +3047,26 @@ void func_i1_80191160(Player* player) { 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)); + D_ctx_80177A48[0] = Math_RadToDeg(Math_Atan2F(sp54, sp4C)); + D_ctx_80177A48[1] = sqrtf(SQ(sp54) + SQ(sp4C)); player->unk_1D0++; - D_80177A48[5] = 0.0f; - D_80177A48[4] = D_80177A48[5]; - D_80177A48[2] = D_80177A48[5]; + D_ctx_80177A48[5] = 0.0f; + D_ctx_80177A48[4] = D_ctx_80177A48[5]; + D_ctx_80177A48[2] = D_ctx_80177A48[5]; /* fallthrough */ case 1: Math_SmoothStepToF(&player->unk_0E4, 0.0f, 0.1f, 5.0f, 0.0f); Math_SmoothStepToF(&player->pos.y, 400.0f, 0.05f, 3.0f, 0.0f); - Math_SmoothStepToF(&D_80177A48[1], 1300.0f, 0.05f, 1000.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[1], 1300.0f, 0.05f, 1000.0f, 0.0f); if (player->unk_0E8 > 180.0f) { - D_80177A48[0] += 0.5f; + D_ctx_80177A48[0] += 0.5f; } else { - D_80177A48[0] -= 0.5f; + D_ctx_80177A48[0] -= 0.5f; } - Matrix_RotateY(gCalcMatrix, D_80177A48[0] * M_DTOR, 0); + Matrix_RotateY(gCalcMatrix, D_ctx_80177A48[0] * M_DTOR, 0); sp64.x = 0.0f; sp64.y = 0.0f; - sp64.z = D_80177A48[1]; + sp64.z = D_ctx_80177A48[1]; Matrix_MultVec3f(gCalcMatrix, &sp64, &sp58); 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); @@ -3089,50 +3091,50 @@ void func_i1_80191160(Player* player) { case 2: Math_SmoothStepToAngle(&player->unk_0E4, 20.0f, 0.1f, 0.5f, 0.0001f); Math_SmoothStepToAngle(&player->unk_0EC, 0.0f, 0.1f, 1.0f, 0.0001f); - Math_SmoothStepToF(&D_80177A48[2], 0.05f, 1.0f, 0.005f, 0.0001f); - Math_SmoothStepToF(&player->camAt.x, player->pos.x, D_80177A48[2], 500.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.y, player->pos.y, D_80177A48[2], 500.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.z, player->pos.z, D_80177A48[2], 500.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[2], 0.05f, 1.0f, 0.005f, 0.0001f); + Math_SmoothStepToF(&player->camAt.x, player->pos.x, D_ctx_80177A48[2], 500.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.y, player->pos.y, D_ctx_80177A48[2], 500.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.z, player->pos.z, D_ctx_80177A48[2], 500.0f, 0.0f); if (gCsFrameCount == 350) { player->unk_1D0++; - D_80177A48[2] = 0.0f; - D_80177A48[3] = 0.05f; + D_ctx_80177A48[2] = 0.0f; + D_ctx_80177A48[3] = 0.05f; } break; case 3: if ((gCsFrameCount >= 701) && (gCsFrameCount < 1000)) { - func_8004AA84(); + func_demo_8004AA84(); } Math_SmoothStepToAngle(&player->unk_0E4, 20.0f, 0.1f, 0.5f, 0); Math_SmoothStepToAngle(&player->unk_0EC, 0.0f, 0.1f, 1.0f, 0); Math_SmoothStepToF(&player->unk_0D0, 0.0f, 0.1f, 2.0f, 0.0f); - Math_SmoothStepToF(&D_80177A48[2], 0.1f, 1.0f, 0.002f, 0); - Math_SmoothStepToF(&D_80177A48[3], 0.1f, 1.0f, 0.002f, 0); + Math_SmoothStepToF(&D_ctx_80177A48[2], 0.1f, 1.0f, 0.002f, 0); + Math_SmoothStepToF(&D_ctx_80177A48[3], 0.1f, 1.0f, 0.002f, 0); Matrix_RotateY(gCalcMatrix, player->unk_0E8 * M_DTOR, 0); Matrix_Push(&gCalcMatrix); - Matrix_RotateY(gCalcMatrix, D_80177A48[5] * M_DTOR, 1); + Matrix_RotateY(gCalcMatrix, D_ctx_80177A48[5] * M_DTOR, 1); sp64.x = 0.0f; sp64.y = -200.0f; sp64.z = 800.0f; Matrix_MultVec3f(gCalcMatrix, &sp64, &sp58); - Math_SmoothStepToF(&player->camEye.x, player->pos.x + sp58.x, D_80177A48[2], 500.0f, 0.0f); - Math_SmoothStepToF(&player->camEye.y, player->pos.y + sp58.y, D_80177A48[2], 500.0f, 0.0f); - Math_SmoothStepToF(&player->camEye.z, player->pos.z + sp58.z, D_80177A48[2], 500.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.x, player->pos.x + sp58.x, D_ctx_80177A48[2], 500.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.y, player->pos.y + sp58.y, D_ctx_80177A48[2], 500.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.z, player->pos.z + sp58.z, D_ctx_80177A48[2], 500.0f, 0.0f); Matrix_Pop(&gCalcMatrix); sp64.x = 0.0f; sp64.y = 0; sp64.z = 150.0f; Matrix_MultVec3f(gCalcMatrix, &sp64, &sp58); - Math_SmoothStepToF(&player->camAt.x, player->pos.x + sp58.x, D_80177A48[3], 500.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.y, player->pos.y + sp58.y, D_80177A48[3], 500.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.z, player->pos.z + sp58.z, D_80177A48[3], 500.0f, 0.0f); - D_80177A48[5] += D_80177A48[4]; + Math_SmoothStepToF(&player->camAt.x, player->pos.x + sp58.x, D_ctx_80177A48[3], 500.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.y, player->pos.y + sp58.y, D_ctx_80177A48[3], 500.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.z, player->pos.z + sp58.z, D_ctx_80177A48[3], 500.0f, 0.0f); + D_ctx_80177A48[5] += D_ctx_80177A48[4]; if ((gCsFrameCount >= 401) && (gCsFrameCount < 1000)) { - Math_SmoothStepToF(&D_80177A48[4], 0.5f, 1.0f, 0.003f, 0); + Math_SmoothStepToF(&D_ctx_80177A48[4], 0.5f, 1.0f, 0.003f, 0); } if (gCsFrameCount >= 1101) { - Math_SmoothStepToF(&D_80177A48[4], 0.0f, 1.0f, 0.003f, 0); + Math_SmoothStepToF(&D_ctx_80177A48[4], 0.0f, 1.0f, 0.003f, 0); } if (gCsFrameCount == 1270) { SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 50); @@ -3157,14 +3159,14 @@ void func_i1_80191160(Player* player) { Audio_FadeOutAll(50); } if (gCsFrameCount >= 1301) { - D_80178358 = 0xFF; - D_80178348 = D_80178350 = D_80178354 = 0; - D_8017835C = 8; - if (D_80178340 == 0xFF) { + D_ctx_80178358 = 0xFF; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; + D_ctx_8017835C = 8; + if (D_ctx_80178340 == 0xFF) { player->state_1C8 = 6; player->timer_1F8 = 0; - D_8017837C = 4; - D_800D3180[gCurrentLevel] = Play_CheckMedalStatus(150) + 1; + D_ctx_8017837C = 4; + D_play_800D3180[gCurrentLevel] = Play_CheckMedalStatus(150) + 1; } } break; @@ -3172,27 +3174,27 @@ void func_i1_80191160(Player* player) { switch (gCsFrameCount) { case 981: - D_80177830 = 1; + D_ctx_80177830 = 1; break; case 1181: - D_80177830 = 0; + D_ctx_80177830 = 0; break; case 240: AUDIO_PLAY_BGM(SEQ_ID_38); break; case 330: - D_80177840 = 100; + D_ctx_80177840 = 100; break; case 470: - func_800A6148(); + func_play_800A6148(); if (gTeamShields[1] > 0) { - func_i1_80190F74(&gActors[0], 0); + Corneria_80190F74(&gActors[0], 0); } if (gTeamShields[2] > 0) { - func_i1_80190F74(&gActors[1], 1); + Corneria_80190F74(&gActors[1], 1); } if (gTeamShields[3] > 0) { - func_i1_80190F74(&gActors[2], 2); + Corneria_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 index e572e0ad..a2239359 100644 --- a/src/overlays/ovl_i1/fox_i1.c +++ b/src/overlays/ovl_i1/fox_i1.c @@ -4,5 +4,5 @@ static s32 D_i1_801997D0 = 0; s32 D_i1_8019B6C0; -void func_i1_80187520(s32 arg0, void* arg1) { +void OvlI1_CallFunction(s32 arg0, void* arg1) { } diff --git a/src/overlays/ovl_i1/fox_tr.c b/src/overlays/ovl_i1/fox_tr.c index acb3db4f..7eb30682 100644 --- a/src/overlays/ovl_i1/fox_tr.c +++ b/src/overlays/ovl_i1/fox_tr.c @@ -7,15 +7,15 @@ #include "global.h" #include "assets/ast_training.h" -void func_i1_801988E0(void) { - if (D_80177E80 != 0) { +void Training_801988E0(void) { + if (D_ctx_80177E80 != 0) { RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - func_800869A0(250.0f, 50.0f, D_80177E80, 1.0f, 0, 999); + func_hud_800869A0(250.0f, 50.0f, D_ctx_80177E80, 1.0f, 0, 999); } } -void func_i1_80198968(Item* item) { +void Training_80198968(Item* item) { f32 var_fv0; switch (item->state) { @@ -32,7 +32,7 @@ void func_i1_80198968(Item* item) { item->unk_44 = 1; PRINTF("♪:リング未通過音\n"); // Ring not passed sound AUDIO_PLAY_SFX(0x4900402F, gDefaultSfxSource, 4); - D_80177E80 = 0; + D_ctx_80177E80 = 0; } } if (item->collected) { @@ -41,8 +41,8 @@ void func_i1_80198968(Item* item) { item->info.unk_10 = 10000.0f; PRINTF("♪:リング通過音\n"); // Ring passing sound AUDIO_PLAY_SFX(0x49008025, gDefaultSfxSource, 4); - D_80177E80++; - if ((item->obj.rot.x != 0.0f) && (D_80177E80 >= 100)) { + D_ctx_80177E80++; + if ((item->obj.rot.x != 0.0f) && (D_ctx_80177E80 >= 100)) { Radio_PlayMessage(gMsg_ID_20330, RCID_ROB64); } } diff --git a/src/overlays/ovl_i1/fox_tr360.c b/src/overlays/ovl_i1/fox_tr360.c index 74c37bac..a288b86e 100644 --- a/src/overlays/ovl_i1/fox_tr360.c +++ b/src/overlays/ovl_i1/fox_tr360.c @@ -7,24 +7,24 @@ #include "global.h" #include "assets/ast_training.h" -void func_i1_80198C50(void) { +void Training_80198C50(void) { Object_58* obj58; s32 i; - D_80178310 = SEGMENTED_TO_VIRTUAL(D_TR_6008EF8); + D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_TR_6008EF8); Rand_SetSeed(1, 29000, 9876); obj58 = gObjects58; for (i = 0; i < 1000; i++) { - if (D_80178310[i].id >= 0) { - if (D_80178310[i].id <= 160) { + if (D_ctx_80178310[i].id >= 0) { + if (D_ctx_80178310[i].id <= 160) { Object_58_Initialize(obj58); obj58->obj.status = OBJ_ACTIVE; - obj58->obj.id = D_80178310[i].id; - obj58->obj.pos.x = D_80178310[i].xPos; - obj58->obj.pos.z = -D_80178310[i].zPos1; - obj58->obj.pos.y = D_80178310[i].yPos - RAND_FLOAT_SEEDED(300.0f); - obj58->obj.rot.y = D_80178310[i].rot.y; + obj58->obj.id = D_ctx_80178310[i].id; + obj58->obj.pos.x = D_ctx_80178310[i].xPos; + obj58->obj.pos.z = -D_ctx_80178310[i].zPos1; + obj58->obj.pos.y = D_ctx_80178310[i].yPos - RAND_FLOAT_SEEDED(300.0f); + obj58->obj.rot.y = D_ctx_80178310[i].rot.y; Object_SetInfo(&obj58->info, obj58->obj.id); obj58++; } @@ -34,7 +34,7 @@ void func_i1_80198C50(void) { } } -bool func_i1_80198DCC(Actor* actor, f32 x, f32 z) { +bool Training_80198DCC(Actor* actor, f32 x, f32 z) { Object_58* obj58; s32 i; @@ -73,7 +73,7 @@ bool func_i1_80198DCC(Actor* actor, f32 x, f32 z) { return false; } -void func_i1_80199024(Actor* actor) { +void Training_80199024(Actor* actor) { s32 pad[8]; Vec3f sp54; f32 var_fv0; @@ -111,7 +111,7 @@ void func_i1_80199024(Actor* actor) { } var_fv0 = actor->fwork[20]; - temp_v0 = func_i1_80198DCC(actor, sinRotY, cosRotY); + temp_v0 = Training_80198DCC(actor, sinRotY, cosRotY); if (temp_v0 != 0) { var_fv0 += 40.0f * (f32) temp_v0; if (var_fv0 >= 360.0f) { @@ -147,7 +147,7 @@ void func_i1_80199024(Actor* actor) { actor->obj.pos.y = gGroundLevel + 40.0f; actor->vel.y = 0.0f; } - func_8003088C(actor); + func_360_8003088C(actor); radarMark = &gRadarMarks[actor->index]; radarMark->unk_00 = 1; radarMark->unk_02 = actor->aiType; @@ -173,7 +173,7 @@ UnkMsg_D_i1_8019AE50 D_i1_8019AE50[] = { { gMsg_ID_20330, 0 }, { gMsg_ID_23026, 256 }, { gMsg_ID_23032, 256 }, { NULL, -1 }, }; -void func_i1_8019949C(void) { +void Training_8019949C(void) { s32 i; Actor* actor; Vec3f sp44; @@ -211,7 +211,7 @@ void func_i1_8019949C(void) { actor->health = 50; } else { actor->aiIndex = -1; - actor->info.action = (ObjectFunc) func_i1_80199024; + actor->info.action = (ObjectFunc) Training_80199024; } break; } @@ -219,28 +219,28 @@ void func_i1_8019949C(void) { } } - if (D_80177C78 != 0) { - D_80177C78--; + if (D_ctx_80177C78 != 0) { + D_ctx_80177C78--; } - if (D_80177C78 == 0) { - if (D_i1_8019AE50[D_80177C8C].msg == 0) { - D_80177C8C = 1; + if (D_ctx_80177C78 == 0) { + if (D_i1_8019AE50[D_ctx_80177C8C].msg == 0) { + D_ctx_80177C8C = 1; } - if (D_i1_8019AE50[D_80177C8C].unk != 0) { - Radio_PlayMessage(D_i1_8019AE50[D_80177C8C].msg, RCID_TR); - D_80177C78 = D_i1_8019AE50[D_80177C8C].unk; + if (D_i1_8019AE50[D_ctx_80177C8C].unk != 0) { + Radio_PlayMessage(D_i1_8019AE50[D_ctx_80177C8C].msg, RCID_TR); + D_ctx_80177C78 = D_i1_8019AE50[D_ctx_80177C8C].unk; } else { - D_80161690 = 80; - D_80177C78 = 320; + D_enmy2_80161690 = 80; + D_ctx_80177C78 = 320; } - D_80177C8C++; + D_ctx_80177C8C++; } - if ((D_80161690 != 0) && (gControllerPress[gMainController].button & R_CBUTTONS)) { + if ((D_enmy2_80161690 != 0) && (gControllerPress[gMainController].button & R_CBUTTONS)) { func_8001AF40(0); - D_800CFF90 = 0; - D_80161690 = 0; + D_enmy2_800CFF90 = 0; + D_enmy2_80161690 = 0; // This is ROB 64. Keep up the good work. Radio_PlayMessage(gMsg_ID_20329, RCID_ROB64); } diff --git a/src/overlays/ovl_i1/fox_ve1.c b/src/overlays/ovl_i1/fox_ve1.c index 4a350c5d..0a587d0d 100644 --- a/src/overlays/ovl_i1/fox_ve1.c +++ b/src/overlays/ovl_i1/fox_ve1.c @@ -193,7 +193,7 @@ const char D_i1_8019B2B0[] = "--アタックオフ!!\n"; //--Attack off!! const char D_i1_8019B2C4[] = "--レベルアップ!!\n"; //--Level Up! const char D_i1_8019B2D8[] = "wk_f00=<%10.3f>\n"; -f32 func_i1_801920F0(f32* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32* arg5) { +f32 Venom1_801920F0(f32* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32* arg5) { f32 temp; *arg5 = arg1 - *arg0; @@ -251,7 +251,7 @@ f32 func_i1_801920F0(f32* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32* arg return temp; } -void func_i1_801922DC(Object_4C* this) { +void Venom1_801922DC(Object_4C* this) { Boss* boss = &gBosses[0]; s32 i; @@ -266,7 +266,7 @@ void func_i1_801922DC(Object_4C* this) { } } -void func_i1_80192358(Object_4C* this) { +void Venom1_80192358(Object_4C* this) { Boss* boss = &gBosses[0]; s32 i; @@ -281,7 +281,7 @@ void func_i1_80192358(Object_4C* this) { } } -void func_i1_801923C0(Object_4C* obj4C) { +void Venom1_801923C0(Object_4C* obj4C) { Boss* boss = &gBosses[0]; s32 i; @@ -296,7 +296,7 @@ void func_i1_801923C0(Object_4C* obj4C) { } } -void func_i1_8019243C(Object_4C* obj4C) { +void Venom1_8019243C(Object_4C* obj4C) { Boss* boss = &gBosses[0]; s32 i; @@ -311,12 +311,12 @@ void func_i1_8019243C(Object_4C* obj4C) { } } -void func_i1_801924A8(Object_80* obj80) { +void Venom1_801924A8(Object_80* obj80) { switch (obj80->state) { case 0: if (gPlayer[0].pos.z < obj80->obj.pos.z) { - D_80177AB0 = 0; - D_80177A98 = 0; + D_ctx_80177AB0 = 0; + D_ctx_80177A98 = 0; obj80->state++; } @@ -326,10 +326,10 @@ void func_i1_801924A8(Object_80* obj80) { } } -void func_i1_8019250C(Actor* actor) { +void Venom1_8019250C(Actor* actor) { } -void func_i1_80192518(Actor* actor) { +void Venom1_80192518(Actor* actor) { Object_80* obj80; f32 var_ft4; f32 var_ft5; @@ -341,7 +341,7 @@ void func_i1_80192518(Actor* actor) { if (actor->unk_0D0 == 1) { actor->unk_0D0 = 0; - func_8007A6F0(&actor->obj.pos, 0x29121007); + func_effect_8007A6F0(&actor->obj.pos, 0x29121007); } if ((actor->state == 1) || (actor->state == 2) || (actor->state == 3)) { @@ -407,7 +407,7 @@ void func_i1_80192518(Actor* actor) { actor->obj.pos.y += dest.y; actor->obj.pos.z += dest.z; - effect = func_8007783C(OBJ_EFFECT_394); + effect = func_effect_8007783C(OBJ_EFFECT_394); if (effect != NULL) { effect->unk_7A = 11; @@ -468,7 +468,7 @@ void func_i1_80192518(Actor* actor) { actor->iwork[0]++; } -void func_i1_80192AA4(Actor* actor) { +void Venom1_80192AA4(Actor* actor) { static Vec3f D_i1_80199FFC = { 0.0f, 460.0f, 0.0f }; Vec3f src; Vec3f dest; @@ -496,7 +496,7 @@ void func_i1_80192AA4(Actor* actor) { } } -Gfx* D_i1_8019A008[17] = { +Gfx* D_VE1_8019A008[17] = { D_VE1_90150A0, D_VE1_9015BB0, D_VE1_9015900, D_VE1_9000000, D_VE1_9022A20, D_VE1_9021630, D_VE1_9015480, D_VE1_90007F0, D_VE1_9014DF0, D_VE1_9022D80, D_VE1_901E350, D_VE1_901F990, D_VE1_901F6D0, D_VE1_9021900, D_VE1_901FC40, D_VE1_9021B80, D_VE1_9013880, @@ -568,7 +568,7 @@ UnkStruct_i1_8019A820 D_i1_8019A820[17] = { { 20, 150, 34, 3, -1, -1, 5, -1, -1, -1, -1, 1 }, { 21, 250, 37, 3, -1, -1, 5, 14, 16, 12, 13, 1 }, { 25, 200, 40, 3, -1, -1, 5, 2, 5, -1, -1, 1 }, }; -f32 D_i1_8019A9B8[199] = { +f32 D_VE1_8019A9B8[199] = { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, @@ -614,15 +614,15 @@ f32 D_i1_8019AE20[6] = { }; Vec3f D_i1_8019AE38 = { 130.0f, 0.0f, 0.0f }; -void func_i1_80192CB0(Actor* actor) { +void Venom1_80192CB0(Actor* actor) { actor->iwork[0] = actor->obj.rot.x; actor->obj.rot.x = 0.0f; } -void func_i1_80192CD4(Actor* actor) { +void Venom1_80192CD4(Actor* actor) { if (actor->unk_0D0 == 1) { actor->unk_0D0 = 0; - func_8007A6F0(&actor->obj.pos, 0x29121007); + func_effect_8007A6F0(&actor->obj.pos, 0x29121007); } if (actor->iwork[1] > 0) { @@ -646,8 +646,8 @@ void func_i1_80192CD4(Actor* actor) { actor->obj.rot.x += actor->fwork[0]; if (actor->obj.rot.x >= 90.0f) { - D_80178480 = 12; - func_i1_80192AA4(actor); + D_ctx_80178480 = 12; + Venom1_80192AA4(actor); actor->iwork[1] = 5; actor->obj.rot.x = 90.0f; AUDIO_PLAY_SFX(0x1903205C, actor->sfxSource, 0); @@ -661,16 +661,16 @@ void func_i1_80192CD4(Actor* actor) { } } -void func_i1_80192E2C(Actor* actor) { +void Venom1_80192E2C(Actor* actor) { Matrix_Scale(gGfxMatrix, 1.0f, 0.5f, 1.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_VE1_901DA50); } -void func_i1_80192EA4(Actor* actor) { +void Venom1_80192EA4(Actor* actor) { } -void func_i1_80192EB0(Actor* actor) { +void Venom1_80192EB0(Actor* actor) { Object_80* obj80; Vec3f sp50; Vec3f sp44; @@ -716,7 +716,7 @@ void func_i1_80192EB0(Actor* actor) { actor->obj.pos.x += sp44.x; actor->obj.pos.y += sp44.y; actor->obj.pos.z += sp44.z; - effect = func_8007783C(OBJ_EFFECT_394); + effect = func_effect_8007783C(OBJ_EFFECT_394); if (effect != NULL) { effect->unk_7A = 11; effect->unk_78 = effect->unk_7A; @@ -763,17 +763,17 @@ void func_i1_80192EB0(Actor* actor) { } if (actor->unk_0D0 == 1) { actor->unk_0D0 = 0; - func_8007A6F0(&actor->obj.pos, 0x29121007); + func_effect_8007A6F0(&actor->obj.pos, 0x29121007); } actor->iwork[0]++; } -void func_i1_801933B4(Actor* actor) { +void Venom1_801933B4(Actor* actor) { actor->scale = -1.0f; actor->obj.pos.y += 488.0f; } -void func_i1_801933DC(Actor* actor) { +void Venom1_801933DC(Actor* actor) { f32* hitboxData; if (actor->unk_0D0 == 1) { @@ -796,23 +796,23 @@ void func_i1_801933DC(Actor* actor) { hitboxData[1 + (10 * 1) + 7] = -actor->vwork[2].y; } -void func_i1_801934D0(Actor* actor) { +void Venom1_801934D0(Actor* actor) { Matrix_Translate(gGfxMatrix, 0.0f, -488.0f, 0.0f, 1); Animation_DrawSkeleton(0, D_VE1_900D164, actor->vwork, NULL, NULL, actor, &gIdentityMatrix); } -void func_i1_80193540(Object_80* obj80) { +void Venom1_80193540(Object_80* obj80) { if (((gPlayer[0].unk_138 - obj80->obj.pos.z) <= 3500.0f) && !(gGameFrameCount & 3)) { - func_8007C120(obj80->obj.pos.x, obj80->obj.pos.y, obj80->obj.pos.z, 0.0f, 0.0f, 0.0f, 0.2f, 10); + func_effect_8007C120(obj80->obj.pos.x, obj80->obj.pos.y, obj80->obj.pos.z, 0.0f, 0.0f, 0.0f, 0.2f, 10); } } -void func_i1_801935CC(Boss* boss) { +void Venom1_801935CC(Boss* boss) { s32 i; s32 var_v0; s32 j; - D_8017812C = 1; + D_ctx_8017812C = 1; D_i1_8019C0B8 = 0; D_i1_8019C0BC = 0; D_i1_8019C0C0 = 0; @@ -858,7 +858,7 @@ void func_i1_801935CC(Boss* boss) { AUDIO_PLAY_BGM(SEQ_ID_24 | 0x8000); } -bool func_i1_801937F4(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { +bool Venom1_801937F4(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { Boss* this = thisx; s32 override; s32 i; @@ -949,7 +949,7 @@ bool func_i1_801937F4(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* return override; } -void func_i1_80193D64(s32 limbIndex, Vec3f* rot, void* thisx) { +void Venom1_80193D64(s32 limbIndex, Vec3f* rot, void* thisx) { s32 spBC; Boss* this = thisx; Vec3f spAC; @@ -1002,7 +1002,7 @@ void func_i1_80193D64(s32 limbIndex, Vec3f* rot, void* thisx) { var_s7->unk_7C |= 0x10; } if (var_s7->unk_7C & 0x20) { - Matrix_MultVec3f(gCalcMatrix, &D_800C9F2C, &var_s7->unk_0C[0]); + Matrix_MultVec3f(gCalcMatrix, &D_tank_800C9F2C, &var_s7->unk_0C[0]); Matrix_GetYRPAngles(gCalcMatrix, &var_s7->unk_30[0]); var_s7->unk_7C &= ~0x20; var_s7->unk_7C |= 0x40; @@ -1012,7 +1012,7 @@ void func_i1_80193D64(s32 limbIndex, Vec3f* rot, void* thisx) { var_s7->unk_7C |= 0x200; } if (var_s7->unk_7C & 0x800) { - Matrix_MultVec3f(gCalcMatrix, &D_800C9F2C, &var_s7->unk_0C[1]); + Matrix_MultVec3f(gCalcMatrix, &D_tank_800C9F2C, &var_s7->unk_0C[1]); var_s7->unk_7C &= ~0x800; var_s7->unk_7C |= 0x1000; } @@ -1072,7 +1072,7 @@ void func_i1_80193D64(s32 limbIndex, Vec3f* rot, void* thisx) { #ifdef NON_MATCHING // Lots of problems with loop at 2082. Seems related to spE8. https://decomp.me/scratch/gOy2L -void func_i1_80194398(Boss* boss) { +void Venom1_80194398(Boss* boss) { s32 is0; Vec3f sp118[27]; Actor* actor; @@ -1142,7 +1142,7 @@ void func_i1_80194398(Boss* boss) { } if ((boss->swork[16] & 3) == 1) { for (spF4 = 0; spF4 < (RAND_INT(5.0f) + 2); spF4++) { - effect = func_8007783C(OBJ_EFFECT_394); + effect = func_effect_8007783C(OBJ_EFFECT_394); if (effect != NULL) { effect->obj.pos.x = boss->obj.pos.x + RAND_FLOAT_CENTERED(400.0f); effect->obj.pos.y = boss->obj.pos.y + 1250.0f; @@ -1162,7 +1162,7 @@ void func_i1_80194398(Boss* boss) { } } if (boss->swork[10] & 2) { - effect = func_8007783C(OBJ_EFFECT_394); + effect = func_effect_8007783C(OBJ_EFFECT_394); if (effect != NULL) { effect->obj.status = OBJ_ACTIVE; effect->unk_78 = effect->unk_7A = 11; @@ -1180,7 +1180,7 @@ void func_i1_80194398(Boss* boss) { effect->unk_60.z = -effect->unk_60.z; } } - effect = func_8007783C(OBJ_EFFECT_394); + effect = func_effect_8007783C(OBJ_EFFECT_394); if (effect != NULL) { effect->obj.status = OBJ_ACTIVE; effect->unk_78 = effect->unk_7A = 11; @@ -1216,7 +1216,7 @@ void func_i1_80194398(Boss* boss) { /* fallthrough */ case 3: Math_SmoothStepToF(&boss->fwork[14], 12.0f, 1.0f, 1.0f, 0.01f); - func_i1_801920F0(&boss->fwork[6], boss->fwork[13], 1.0f, boss->fwork[14], 0.01f, &spCC); + Venom1_801920F0(&boss->fwork[6], boss->fwork[13], 1.0f, boss->fwork[14], 0.01f, &spCC); if (fabsf(spCC) <= 45.0f) { boss->fwork[12] = boss->fwork[13] + (SIGN_OF(spCC) * 20.0f); boss->swork[20]++; @@ -1291,10 +1291,10 @@ void func_i1_80194398(Boss* boss) { spF8.y += boss->obj.pos.y + RAND_FLOAT_CENTERED(60.0f); spF8.z += boss->obj.pos.z; if (D_i1_8019AD80[is4][2] > 0) { - func_8007D2C8(spF8.x, spF8.y, spF8.z, D_i1_8019AD80[is4][2]); + func_effect_8007D2C8(spF8.x, spF8.y, spF8.z, D_i1_8019AD80[is4][2]); } for (is1 = 0; is1 < D_i1_8019AD80[is4][0]; is1++) { - actor = func_800A3608(OBJ_ACTOR_189); + actor = func_game_800A3608(OBJ_ACTOR_189); if (actor != NULL) { actor->obj.status = OBJ_ACTIVE; actor->obj.pos.x = spF8.x + RAND_FLOAT_CENTERED(60.0f); @@ -1321,7 +1321,7 @@ void func_i1_80194398(Boss* boss) { } } for (is1 = 0; is1 < D_i1_8019AD80[is4][1]; is1++) { - actor = func_800A3608(OBJ_ACTOR_189); + actor = func_game_800A3608(OBJ_ACTOR_189); if (actor != NULL) { actor->obj.status = OBJ_ACTIVE; actor->obj.pos.x = spF8.x + RAND_FLOAT_CENTERED(60.0f); @@ -1355,7 +1355,7 @@ void func_i1_80194398(Boss* boss) { spF8.y += boss->obj.pos.y + RAND_FLOAT_CENTERED(60.0f); spF8.z += boss->obj.pos.z; for (is1 = 0; is1 < 5; is1++) { - actor = func_800A3608(OBJ_ACTOR_189); + actor = func_game_800A3608(OBJ_ACTOR_189); if (actor != NULL) { actor->obj.status = OBJ_ACTIVE; actor->obj.pos.x = spF8.x + RAND_FLOAT_CENTERED(60.0f); @@ -1382,7 +1382,7 @@ void func_i1_80194398(Boss* boss) { D_i1_8019B838[spF4].unk_7C &= ~0x10; } if (D_i1_8019B838[spF4].unk_7C & 0x40) { - actor = func_800A3608(OBJ_ACTOR_189); + actor = func_game_800A3608(OBJ_ACTOR_189); if (actor != NULL) { actor->obj.status = OBJ_ACTIVE; actor->obj.pos.x = boss->obj.pos.x + D_i1_8019B838[spF4].unk_0C[0].x; @@ -1417,7 +1417,7 @@ void func_i1_80194398(Boss* boss) { actor->gravity = 2.0f; } for (is1 = 0; is1 < 6; is1++) { - actor = func_800A3608(OBJ_ACTOR_189); + actor = func_game_800A3608(OBJ_ACTOR_189); if (actor != NULL) { actor->obj.status = OBJ_ACTIVE; actor->obj.pos.x = boss->obj.pos.x + D_i1_8019B838[spF4].unk_0C[0].x; @@ -1491,11 +1491,11 @@ void func_i1_80194398(Boss* boss) { D_i1_8019B838[spF4].unk_7C &= ~0x200; } if (D_i1_8019B838[spF4].unk_7C & 0x1000) { - Matrix_MultVec3f(gCalcMatrix, &D_800C9F2C, &spF8); + Matrix_MultVec3f(gCalcMatrix, &D_tank_800C9F2C, &spF8); spF8.x += boss->obj.pos.x + D_i1_8019B838[spF4].unk_0C[1].x + RAND_FLOAT_CENTERED(60.0f); spF8.y += boss->obj.pos.y + D_i1_8019B838[spF4].unk_0C[1].y + RAND_FLOAT_CENTERED(60.0f); spF8.z += boss->obj.pos.z + D_i1_8019B838[spF4].unk_0C[1].z; - func_8007D2C8(spF8.x, spF8.y, spF8.z, D_i1_8019B838[spF4].unk_60); + func_effect_8007D2C8(spF8.x, spF8.y, spF8.z, D_i1_8019B838[spF4].unk_60); D_i1_8019B838[spF4].unk_7C &= ~0x1000; } } @@ -1577,9 +1577,9 @@ void func_i1_80194398(Boss* boss) { boss->timer_05A = 18; if (boss->health <= 0) { - D_Timer_80161A60 = 8; - D_8017796C = -1; - D_8017828C = 1; + D_play_Timer_80161A60 = 8; + D_ctx_8017796C = -1; + D_ctx_8017828C = 1; AUDIO_PLAY_SFX(0x2940D09A, boss->sfxSource, 4); boss->health = 0; } @@ -1625,9 +1625,9 @@ void func_i1_80194398(Boss* boss) { boss->health -= 10; boss->timer_05A = 35; if (boss->health <= 0) { - D_Timer_80161A60 = 8; - D_8017796C = -1; - D_8017828C = 1; + D_play_Timer_80161A60 = 8; + D_ctx_8017796C = -1; + D_ctx_8017828C = 1; AUDIO_PLAY_SFX(0x2940D09A, boss->sfxSource, 4); boss->health = 0; } @@ -1717,7 +1717,7 @@ void func_i1_80194398(Boss* boss) { boss->gravity = 0.f; boss->swork[6] = 2; boss->swork[10] = 16; - D_80178480 = 40; + D_ctx_80178480 = 40; boss->swork[23] = RAND_FLOAT(5.0f); AUDIO_PLAY_SFX(0x29034082, boss->sfxSource, 4); spB8 = 3; @@ -1815,7 +1815,7 @@ void func_i1_80194398(Boss* boss) { spF8.x = boss->obj.pos.x + boss->fwork[3]; spF8.y = boss->obj.pos.y + boss->fwork[4]; spF8.z = boss->obj.pos.z + boss->fwork[5]; - func_8007D2C8(spF8.x, spF8.y, spF8.z, 5.0f); + func_effect_8007D2C8(spF8.x, spF8.y, spF8.z, 5.0f); boss->timer_050 = 3; } } @@ -1828,7 +1828,7 @@ void func_i1_80194398(Boss* boss) { D_i1_8019B838[6].unk_7C |= 0x20; break; case 122: - D_80178480 = 20; + D_ctx_80178480 = 20; boss->swork[28] = 7; AUDIO_PLAY_SFX(0x29405084, boss->sfxSource, 4); D_i1_8019B838[2].unk_60 = 5.0f; @@ -1844,7 +1844,7 @@ void func_i1_80194398(Boss* boss) { D_i1_8019B838[8].unk_7C |= 0x20; break; case 118: - D_80178480 = 30; + D_ctx_80178480 = 30; boss->swork[28] = 7; AUDIO_PLAY_SFX(0x29405084, boss->sfxSource, 4); D_i1_8019B838[8].unk_7C |= 0x800; @@ -1860,7 +1860,7 @@ void func_i1_80194398(Boss* boss) { case 78: boss->swork[28] = 7; AUDIO_PLAY_SFX(0x29405084, boss->sfxSource, 4); - D_80178480 = 20; + D_ctx_80178480 = 20; D_i1_8019B838[10].unk_7C |= 0x800; D_i1_8019B838[10].unk_60 = 10.0f; break; @@ -1888,16 +1888,16 @@ void func_i1_80194398(Boss* boss) { spF8.x = boss->obj.pos.x + boss->fwork[3]; spF8.y = boss->obj.pos.y + boss->fwork[4]; spF8.z = boss->obj.pos.z + boss->fwork[5]; - func_8007BFFC(spF8.x, spF8.y, spF8.z, 0, 0, 0, 25.0f, 5); - D_80178348 = D_80178350 = D_80178354 = 255; - D_80178340 = D_80178358 = 255; + func_effect_8007BFFC(spF8.x, spF8.y, spF8.z, 0, 0, 0, 25.0f, 5); + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; + D_ctx_80178340 = D_ctx_80178358 = 255; break; case 59: - D_80178348 = D_80178350 = D_80178354 = 255; - D_80178340 = D_80178358 = 128; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; + D_ctx_80178340 = D_ctx_80178358 = 128; break; case 58: - D_80178340 = D_80178358 = 0; + D_ctx_80178340 = D_ctx_80178358 = 0; break; case 50: boss->swork[25] = 1; @@ -1908,21 +1908,21 @@ void func_i1_80194398(Boss* boss) { } break; case 49: - func_80042EC0(boss); + func_boss_80042EC0(boss); gShowBossHealth = 0; boss->swork[28] = 9; AUDIO_PLAY_SFX(0x29405084, boss->sfxSource, 4); boss->swork[26] = 1; - boss->info.hitbox = D_800CBF34; + boss->info.hitbox = D_edata_800CBF34; boss->unk_05E = 0; - func_8007A568(boss->obj.pos.x, boss->obj.pos.y + 10.0f, boss->obj.pos.z, 40.0f); - D_80178480 = 40; + func_effect_8007A568(boss->obj.pos.x, boss->obj.pos.y + 10.0f, boss->obj.pos.z, 40.0f); + D_ctx_80178480 = 40; break; case 12: - D_80178348 = D_80178350 = D_80178354 = 255; - D_80178340 = 0; - D_80178358 = 255; - D_8017835C = 5; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; + D_ctx_80178340 = 0; + D_ctx_80178358 = 255; + D_ctx_8017835C = 5; boss->obj.status = OBJ_DYING; boss->timer_052 = 80; break; @@ -1937,7 +1937,7 @@ void func_i1_80194398(Boss* boss) { break; case 1: AUDIO_PLAY_SFX(0x31030083, boss->sfxSource, 4); - D_80178480 = 40; + D_ctx_80178480 = 40; boss->swork[28] = 5; spB8 = spB4 = 1; boss->swork[18]++; @@ -1955,7 +1955,7 @@ void func_i1_80194398(Boss* boss) { case 1: spB4 = 1; AUDIO_PLAY_SFX(0x31030083, boss->sfxSource, 4); - D_80178480 = 40; + D_ctx_80178480 = 40; boss->swork[28] = 5; spB8 = 2; boss->swork[19]++; @@ -2188,7 +2188,7 @@ void func_i1_80194398(Boss* boss) { SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 0); } if ((spB4 == 1) || (spB4 == 2)) { - effect = func_8007783C(OBJ_EFFECT_394); + effect = func_effect_8007783C(OBJ_EFFECT_394); if (effect != NULL) { Matrix_MultVec3f(gCalcMatrix, (Vec3f*) &boss->fwork[3], &spF8); effect->unk_78 = effect->unk_7A = 11; @@ -2314,60 +2314,59 @@ void func_i1_80194398(Boss* boss) { } } #else -void func_i1_80194398(Boss* boss); -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/fox_ve1/func_i1_80194398.s") +void Venom1_80194398(Boss* boss); +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/fox_ve1/Venom1_80194398.s") #endif -void func_i1_80198310(Boss* boss) { +void Venom1_80198310(Boss* boss) { RCP_SetupDL(&gMasterDisp, 0x41); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 255); gDPSetEnvColor(gMasterDisp++, 0, 0, 0, 0); - Matrix_Translate(gGfxMatrix, 0.0f, -5.0f + D_8017847C, 0.0f, 1); + Matrix_Translate(gGfxMatrix, 0.0f, -5.0f + D_ctx_8017847C, 0.0f, 1); Matrix_Scale(gGfxMatrix, 10.0f, 0.0f, 8.0f, 1); Matrix_RotateX(gGfxMatrix, -90.0f * M_DTOR, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_1024AC0); } -void func_i1_80198414(void) { +void Venom1_80198414(void) { s32 i; for (i = 1; i < ARRAY_COUNT(gTeamShields); i++) { - D_80177C38[i] = gSavedTeamShields[i]; - D_801778F0[i] = gSavedTeamShields[i]; + D_ctx_80177C38[i] = gSavedTeamShields[i]; + D_ctx_801778F0[i] = gSavedTeamShields[i]; gSavedTeamShields[i] = gTeamShields[i]; } gBgColor = 0xFFFF; // 248, 248, 248 gNextGameState = GSTATE_PLAY; gNextLevel = LEVEL_VENOM_2; - D_80161A2E = 2; - D_80177C94 = gGoldRingCount[0]; - D_80177C9C = gPlayer[0].shields + 1; - D_80177CA4 = gHitCount; - D_80177CAC = gPlayer[0].wings.rightState; - D_80177CB4 = gPlayer[0].wings.leftState; - D_80177CBC = gRightWingHealth[0]; - D_80177CC4 = gLeftWingHealth[0]; + D_game_80161A2E = 2; + D_ctx_80177C94 = gGoldRingCount[0]; + D_ctx_80177C9C = gPlayer[0].shields + 1; + D_ctx_80177CA4 = gHitCount; + D_ctx_80177CAC = gPlayer[0].wings.rightState; + D_ctx_80177CB4 = gPlayer[0].wings.leftState; + D_ctx_80177CBC = gRightWingHealth[0]; + D_ctx_80177CC4 = gLeftWingHealth[0]; func_8001CA24(0); Audio_KillSfxBySource(gPlayer[0].sfxSource); } -void func_i1_80198594(Boss* boss) { +void Venom1_80198594(Boss* boss) { boss->obj.pos.z = gPlayer[0].pos.z; if ((boss->timer_052 <= 0) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3)) { - func_i1_80198414(); + Venom1_80198414(); } } -void func_i1_801985E4(Boss* boss) { +void Venom1_801985E4(Boss* boss) { if (boss->swork[26] == 0) { - Animation_DrawSkeleton(0, D_VE1_901C0F4, boss->vwork, func_i1_801937F4, func_i1_80193D64, boss, - &gIdentityMatrix); + Animation_DrawSkeleton(0, D_VE1_901C0F4, boss->vwork, Venom1_801937F4, Venom1_80193D64, boss, &gIdentityMatrix); } boss->state = boss->swork[9]; } -void func_i1_8019864C(PlayerShot* playerShot) { +void Venom1_8019864C(PlayerShot* playerShot) { s32 i; s32 j; s32 count; @@ -2410,6 +2409,6 @@ void func_i1_8019864C(PlayerShot* playerShot) { } } -void func_i1_801988B8(Player* player) { - func_80096A74(player); +void Venom1_801988B8(Player* player) { + func_hud_80096A74(player); } diff --git a/src/overlays/ovl_i2/fox_i2.c b/src/overlays/ovl_i2/fox_i2.c index cb291145..b502ddab 100644 --- a/src/overlays/ovl_i2/fox_i2.c +++ b/src/overlays/ovl_i2/fox_i2.c @@ -4,5 +4,5 @@ UNK_TYPE D_i2_80195D70; s32 D_i2_80195420 = 0; -void func_i2_80187520(s32 arg0, void* arg1) { +void OvlI2_CallFunction(s32 arg0, void* arg1) { } diff --git a/src/overlays/ovl_i2/fox_me.c b/src/overlays/ovl_i2/fox_me.c index 371a99fe..14c60930 100644 --- a/src/overlays/ovl_i2/fox_me.c +++ b/src/overlays/ovl_i2/fox_me.c @@ -7,10 +7,6 @@ #include "global.h" #include "assets/ast_meteo.h" -extern s32 D_800C9E90[]; - -extern Gfx D_6024AD0[]; - Vec3f D_i2_80195430[] = { { 122.0, -5.0, -1200.0 }, { 122.0, -103.0, -727.0 }, { 142.0, -323.0, -848.0 }, { 362.0, -59.0, -435.0 }, { 692.0, -84.0, -308.0 }, { 1000.0, -7.0, -308.0 }, { 164.0, -700.0, -308.0 }, { 263.0, -370.0, -11.0 }, @@ -47,14 +43,14 @@ Vec3f D_i2_80195610[] = { { -2000.0f, -1000.0f, 0.0f }, }; -void func_i2_80187530(Actor* actor) { +void Meteo_80187530(Actor* actor) { if (actor->unk_0D0 == 1) { actor->unk_0D0 = 0; - func_8007A6F0(&actor->obj.pos, 0x2902107D); + func_effect_8007A6F0(&actor->obj.pos, 0x2902107D); } } -void func_i2_8018756C(Actor* actor) { +void Meteo_8018756C(Actor* actor) { Vec3f vec; if (actor->unk_0D0 != 0) { @@ -72,13 +68,14 @@ void func_i2_8018756C(Actor* actor) { vec.y = actor->vel.y; vec.z = actor->vel.z; - if ((func_8006351C(actor->index, &actor->obj.pos, &vec, 0) != 0) || (actor->obj.pos.y < (gGroundLevel + 20.0f))) { + if ((func_enmy_8006351C(actor->index, &actor->obj.pos, &vec, 0) != 0) || + (actor->obj.pos.y < (gGroundLevel + 20.0f))) { actor->obj.status = OBJ_DYING; } - func_i2_80187530(actor); + Meteo_80187530(actor); } -void func_i2_80187650(Actor* actor) { +void Meteo_80187650(Actor* actor) { Vec3f vec; actor->obj.rot.y += 1.7f; @@ -95,12 +92,12 @@ void func_i2_80187650(Actor* actor) { } if ((actor->timer_0BC & 3) == 1) { - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 6.0f); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 6.0f); } if (actor->unk_0D0 != 0) { - func_8007A6F0(&actor->obj.pos, 0x2903A008); - func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); + func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); Object_Kill(&actor->obj, actor->sfxSource); } @@ -108,17 +105,17 @@ void func_i2_80187650(Actor* actor) { vec.x = actor->vel.x; vec.y = actor->vel.y; vec.z = actor->vel.z; - if ((func_8006351C(actor->index, &actor->obj.pos, &vec, 0) != 0) || + if ((func_enmy_8006351C(actor->index, &actor->obj.pos, &vec, 0) != 0) || (actor->obj.pos.y < (gGroundLevel + 20.0f))) { - func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); actor->obj.status = OBJ_DYING; } } - func_i2_80187530(actor); + Meteo_80187530(actor); } -void func_i2_801877C4(Actor* actor) { +void Meteo_801877C4(Actor* actor) { Vec3f sp44; Vec3f sp38; @@ -136,22 +133,22 @@ void func_i2_801877C4(Actor* actor) { actor->obj.pos.y = actor->fwork[1] + sp44.y; if (actor->unk_0D0 != 0) { - func_80066254(actor); - func_8007A6F0(&actor->obj.pos, 0x2903A008); + func_enmy_80066254(actor); + func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); Object_Kill(&actor->obj, actor->sfxSource); - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 5.0f); - func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 3.0f, 10); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 5.0f); + func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 3.0f, 10); } if (actor->timer_0BC == 0) { actor->timer_0BC = 40; if (actor->obj.pos.z < (gPlayer[0].unk_138 - 1000.0f)) { - func_8007F11C(0x161, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 120.0f); + func_effect_8007F11C(0x161, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 120.0f); } } } -void func_i2_8018795C(Actor* actor) { +void Meteo_8018795C(Actor* actor) { Vec3f vec; s32 pad[2]; @@ -159,23 +156,23 @@ void func_i2_8018795C(Actor* actor) { actor->obj.rot.x += 3.3f; if (actor->unk_0D0 != 0) { - func_80066254(actor); - func_8007A6F0(&actor->obj.pos, 0x2903A008); + func_enmy_80066254(actor); + func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); Object_Kill(&actor->obj, actor->sfxSource); - func_8007D0E0(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y, actor->obj.pos.z - actor->vel.z, 8.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, 4.0f, 10); + func_effect_8007D0E0(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y, actor->obj.pos.z - actor->vel.z, 8.0f); + func_effect_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, 4.0f, 10); } if (!(gGameFrameCount & 7)) { Math_Vec3fFromAngles(&vec, actor->obj.rot.x, actor->obj.rot.y, 100.0f); - func_8007F04C(0x161, actor->obj.pos.x + (vec.x * 3.0f), actor->obj.pos.y + (vec.y * 3.0f), - actor->obj.pos.z + (vec.z * 3.0f), actor->obj.rot.x, actor->obj.rot.y, actor->obj.rot.z, 0.0f, - 0.0f, 0.0f, vec.x, vec.y, vec.z, 1.0f); + func_effect_8007F04C(0x161, actor->obj.pos.x + (vec.x * 3.0f), actor->obj.pos.y + (vec.y * 3.0f), + actor->obj.pos.z + (vec.z * 3.0f), actor->obj.rot.x, actor->obj.rot.y, actor->obj.rot.z, + 0.0f, 0.0f, 0.0f, vec.x, vec.y, vec.z, 1.0f); } } -void func_i2_80187B08(Actor* actor) { +void Meteo_80187B08(Actor* actor) { actor->obj.rot.y += 7.0f; actor->obj.rot.x += 3.3f; @@ -191,19 +188,19 @@ void func_i2_80187B08(Actor* actor) { } if (!(actor->timer_0BC & 3)) { - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 6.0f); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 6.0f); } if ((actor->unk_0D0 != 0) || (actor->timer_0BC == 0)) { - func_8007A6F0(&actor->obj.pos, 0x2903A008); + func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); Object_Kill(&actor->obj, actor->sfxSource); - func_8007D0E0(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y, actor->obj.pos.z - actor->vel.z, 8.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, 4.0f, 10); + func_effect_8007D0E0(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y, actor->obj.pos.z - actor->vel.z, 8.0f); + func_effect_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, 4.0f, 10); } } -void func_i2_80187C68(Actor* actor, f32 x, f32 y, f32 z, f32 arg4, f32 xRot, f32 yRot, s32 timerBC, s32 arg8, s32 id) { +void Meteo_80187C68(Actor* actor, f32 x, f32 y, f32 z, f32 arg4, f32 xRot, f32 yRot, s32 timerBC, s32 arg8, s32 id) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; actor->obj.id = (u16) id; @@ -222,18 +219,18 @@ void func_i2_80187C68(Actor* actor, f32 x, f32 y, f32 z, f32 arg4, f32 xRot, f32 Object_SetInfo(&actor->info, actor->obj.id); } -void func_i2_80187D08(f32 x, f32 y, f32 z, f32 arg3, f32 xRot, f32 yRot, s32 arg6, s32 arg7, s32 id) { +void Meteo_80187D08(f32 x, f32 y, f32 z, f32 arg3, f32 xRot, f32 yRot, s32 arg6, s32 arg7, s32 id) { s32 i; for (i = 0; i < ARRAY_COUNT(gActors); i++) { if (gActors[i].obj.status == OBJ_FREE) { - func_i2_80187C68(&gActors[i], x, y, z, arg3, xRot, yRot, arg6, arg7, id); + Meteo_80187C68(&gActors[i], x, y, z, arg3, xRot, yRot, arg6, arg7, id); return; } } } -void func_i2_80187D98(Effect* effect, f32 x, f32 y, f32 z, f32 arg4, bool arg5) { +void Meteo_80187D98(Effect* effect, f32 x, f32 y, f32 z, f32 arg4, bool arg5) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_369; @@ -253,12 +250,12 @@ void func_i2_80187D98(Effect* effect, f32 x, f32 y, f32 z, f32 arg4, bool arg5) Object_SetInfo(&effect->info, effect->obj.id); } -void func_i2_80187E38(f32 x, f32 y, f32 z, f32 arg3) { +void Meteo_80187E38(f32 x, f32 y, f32 z, f32 arg3) { s32 i; for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i2_80187D98(&gEffects[i], x, y, z, arg3, 0); + Meteo_80187D98(&gEffects[i], x, y, z, arg3, 0); AUDIO_PLAY_SFX(0x31037057U, gEffects[i].sfxSource, 4U); break; } @@ -266,27 +263,27 @@ void func_i2_80187E38(f32 x, f32 y, f32 z, f32 arg3) { for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i2_80187D98(&gEffects[i], x, y, z, arg3, 1); + Meteo_80187D98(&gEffects[i], x, y, z, arg3, 1); break; } } for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i2_80187D98(&gEffects[i], x, y, z, arg3 + 90.0f, 0); + Meteo_80187D98(&gEffects[i], x, y, z, arg3 + 90.0f, 0); break; } } for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i2_80187D98(&gEffects[i], x, y, z, arg3 + 90.0f, 1); + Meteo_80187D98(&gEffects[i], x, y, z, arg3 + 90.0f, 1); break; } } } -void func_i2_80187FF8(Effect* effect, f32 x, f32 y, f32 z) { +void Meteo_80187FF8(Effect* effect, f32 x, f32 y, f32 z) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_371; @@ -301,12 +298,12 @@ void func_i2_80187FF8(Effect* effect, f32 x, f32 y, f32 z) { Object_SetInfo(&effect->info, effect->obj.id); } -void func_i2_80188088(Boss* boss) { +void Meteo_80188088(Boss* boss) { s32 i; for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i2_80187FF8(&gEffects[i], boss->obj.pos.x + 700.0f, boss->obj.pos.y, boss->obj.pos.z + 1235.0f); + Meteo_80187FF8(&gEffects[i], boss->obj.pos.x + 700.0f, boss->obj.pos.y, boss->obj.pos.z + 1235.0f); AUDIO_PLAY_SFX(0x19006035U, gEffects[i].sfxSource, 4U); break; } @@ -314,13 +311,13 @@ void func_i2_80188088(Boss* boss) { for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i2_80187FF8(&gEffects[i], boss->obj.pos.x - 700.0f, boss->obj.pos.y, boss->obj.pos.z + 1235.0f); + Meteo_80187FF8(&gEffects[i], boss->obj.pos.x - 700.0f, boss->obj.pos.y, boss->obj.pos.z + 1235.0f); break; } } } -void func_i2_801881A8(Effect* effect, f32 x, f32 y, f32 z, f32 zRot, s32 arg5) { +void Meteo_801881A8(Effect* effect, f32 x, f32 y, f32 z, f32 zRot, s32 arg5) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_370; @@ -335,30 +332,30 @@ void func_i2_801881A8(Effect* effect, f32 x, f32 y, f32 z, f32 zRot, s32 arg5) { Object_SetInfo(&effect->info, effect->obj.id); } -void func_i2_80188228(f32 x, f32 y, f32 z, f32 zRot) { +void Meteo_80188228(f32 x, f32 y, f32 z, f32 zRot) { s32 i; for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i2_801881A8(&gEffects[i], x, y, z, zRot, 0); + Meteo_801881A8(&gEffects[i], x, y, z, zRot, 0); break; } } } -void func_i2_80188298(f32 x, f32 y, f32 z, f32 zRot) { +void Meteo_80188298(f32 x, f32 y, f32 z, f32 zRot) { s32 i; for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i2_801881A8(&gEffects[i], x, y, z, zRot, -1); + Meteo_801881A8(&gEffects[i], x, y, z, zRot, -1); AUDIO_PLAY_SFX(0x3102705CU, gEffects[i].sfxSource, 4); break; } } } -void func_i2_80188344(Boss* boss) { +void Meteo_80188344(Boss* boss) { Vec3f src; Vec3f dest; f32 temp; @@ -423,12 +420,12 @@ void func_i2_80188344(Boss* boss) { Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &dest); - func_i2_80188298(boss->obj.pos.x + dest.x, boss->obj.pos.y + dest.y, boss->obj.pos.z + dest.z, - boss->obj.rot.z - 45.0f); - func_i2_80188228(boss->obj.pos.x - dest.x, boss->obj.pos.y - dest.y, boss->obj.pos.z + dest.z, - boss->obj.rot.z - 45.0f); - func_i2_80188228(boss->obj.pos.x + dest.y, boss->obj.pos.y - dest.x, boss->obj.pos.z + dest.z, - (boss->obj.rot.z - 45.0f) + 90.0f); + Meteo_80188298(boss->obj.pos.x + dest.x, boss->obj.pos.y + dest.y, boss->obj.pos.z + dest.z, + boss->obj.rot.z - 45.0f); + Meteo_80188228(boss->obj.pos.x - dest.x, boss->obj.pos.y - dest.y, boss->obj.pos.z + dest.z, + boss->obj.rot.z - 45.0f); + Meteo_80188228(boss->obj.pos.x + dest.y, boss->obj.pos.y - dest.x, boss->obj.pos.z + dest.z, + (boss->obj.rot.z - 45.0f) + 90.0f); } } break; @@ -442,8 +439,9 @@ void func_i2_80188344(Boss* boss) { case 4: if (boss->timer_050 == 0) { - func_8007D2C8(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z + 500.0f, 30.0f); - func_8007BFFC(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z + 500.0f, 0.0f, 0.0f, 0.0f, 20.0f, 30); + func_effect_8007D2C8(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z + 500.0f, 30.0f); + func_effect_8007BFFC(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z + 500.0f, 0.0f, 0.0f, 0.0f, + 20.0f, 30); boss->state = 5; boss->info.unk_10 = 1000.0f; @@ -469,7 +467,7 @@ void func_i2_80188344(Boss* boss) { } } -void func_i2_801887D0(Boss* boss) { +void Meteo_801887D0(Boss* boss) { s32 i; if (boss->timer_054 & 1) { @@ -503,10 +501,10 @@ void func_i2_801887D0(Boss* boss) { } } -void func_i2_80188A40(Boss* boss) { +void Meteo_80188A40(Boss* boss) { s32 i; - AUDIO_PLAY_BGM(D_800C9E90[gCurrentLevel]); + AUDIO_PLAY_BGM(D_boss_800C9E90[gCurrentLevel]); gBossActive = 1; @@ -536,7 +534,7 @@ void func_i2_80188A40(Boss* boss) { AUDIO_PLAY_SFX(0x3102505AU, boss->sfxSource, 4U); } -void func_i2_80188B84(Effect* effect, f32 x, f32 y, f32 z, f32 xRot, f32 yRot, f32 arg6, f32 arg7) { +void Meteo_80188B84(Effect* effect, f32 x, f32 y, f32 z, f32 xRot, f32 yRot, f32 arg6, f32 arg7) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_369; @@ -556,18 +554,18 @@ void func_i2_80188B84(Effect* effect, f32 x, f32 y, f32 z, f32 xRot, f32 yRot, f Object_SetInfo(&effect->info, effect->obj.id); } -void func_i2_80188C2C(f32 x, f32 y, f32 z, f32 xRot, f32 yRot, f32 arg5, f32 arg6) { +void Meteo_80188C2C(f32 x, f32 y, f32 z, f32 xRot, f32 yRot, f32 arg5, f32 arg6) { s32 i; for (i = 0; i < ARRAY_COUNT(gEffects); i++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i2_80188B84(&gEffects[i], x, y, z, xRot, yRot, arg5, arg6); + Meteo_80188B84(&gEffects[i], x, y, z, xRot, yRot, arg5, arg6); return; } } } -void func_i2_80188CAC(Effect* effect) { +void Meteo_80188CAC(Effect* effect) { Vec3f src; Vec3f dest; @@ -605,16 +603,16 @@ void func_i2_80188CAC(Effect* effect) { effect->vel.y = dest.y; effect->vel.z = dest.z; - func_i2_80188C2C(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, effect->obj.rot.x, effect->obj.rot.y, - effect->unk_60.z, 1.0f); + Meteo_80188C2C(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, effect->obj.rot.x, effect->obj.rot.y, + effect->unk_60.z, 1.0f); } else if (effect->timer_50 == 0) { Object_Kill(&effect->obj, effect->sfxSource); } - func_8007A774(gPlayer, effect, 90.0f); + func_effect_8007A774(gPlayer, effect, 90.0f); } -void func_i2_80188E8C(Effect* effect, f32 x, f32 y, f32 z, f32 xRot, f32 yRot, f32 zRot, f32 scale) { +void Meteo_80188E8C(Effect* effect, f32 x, f32 y, f32 z, f32 xRot, f32 yRot, f32 zRot, f32 scale) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_370; @@ -633,18 +631,18 @@ void func_i2_80188E8C(Effect* effect, f32 x, f32 y, f32 z, f32 xRot, f32 yRot, f Object_SetInfo(&effect->info, effect->obj.id); } -void func_i2_80188F2C(f32 x, f32 y, f32 z, f32 xRot, f32 yRot, f32 arg5, f32 scale) { +void Meteo_80188F2C(f32 x, f32 y, f32 z, f32 xRot, f32 yRot, f32 arg5, f32 scale) { s32 i; for (i = 0; i < ARRAY_COUNT(gEffects); i++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i2_80188E8C(&gEffects[i], x, y, z, xRot, yRot, arg5, scale); + Meteo_80188E8C(&gEffects[i], x, y, z, xRot, yRot, arg5, scale); return; } } } -void func_i2_80188FAC(Effect* effect) { +void Meteo_80188FAC(Effect* effect) { Vec3f src; Vec3f dest; @@ -666,8 +664,8 @@ void func_i2_80188FAC(Effect* effect) { effect->vel.z = dest.z; if (!(gGameFrameCount & 1)) { - func_i2_80188F2C(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, effect->obj.rot.x, - effect->obj.rot.y, effect->obj.rot.z, 5.0f); + Meteo_80188F2C(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, effect->obj.rot.x, + effect->obj.rot.y, effect->obj.rot.z, 5.0f); } } else { effect->unk_44 -= 8; @@ -675,10 +673,10 @@ void func_i2_80188FAC(Effect* effect) { Object_Kill(&effect->obj, effect->sfxSource); } } - func_8007A774(gPlayer, effect, 60.0f); + func_effect_8007A774(gPlayer, effect, 60.0f); } -void func_i2_80189114(Effect* effect) { +void Meteo_80189114(Effect* effect) { if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7) { Object_Kill(&effect->obj, effect->sfxSource); } @@ -717,28 +715,30 @@ void func_i2_80189114(Effect* effect) { } } - func_8007A774(gPlayer, effect, 100.0f); + func_effect_8007A774(gPlayer, effect, 100.0f); } -void func_i2_801892F0(Boss* boss, s32 arg1) { +void Meteo_801892F0(Boss* boss, s32 arg1) { Vec3f dest; Vec3f src; - func_8007A6F0(&boss->obj.pos, 0x2903B009); + func_effect_8007A6F0(&boss->obj.pos, 0x2903B009); if (arg1 == 7) { - func_8007D2C8(boss->obj.pos.x, boss->obj.pos.y + 330.0f, boss->obj.pos.z + 1020.0f, 15.0f); - func_8007BFFC(boss->obj.pos.x, boss->obj.pos.y + 330.0f, boss->obj.pos.z + 1020.0f, 0.0f, 0.0f, 0.0f, 7.0f, 20); + func_effect_8007D2C8(boss->obj.pos.x, boss->obj.pos.y + 330.0f, boss->obj.pos.z + 1020.0f, 15.0f); + func_effect_8007BFFC(boss->obj.pos.x, boss->obj.pos.y + 330.0f, boss->obj.pos.z + 1020.0f, 0.0f, 0.0f, 0.0f, + 7.0f, 20); } if (arg1 == 5) { - func_8007D2C8(boss->obj.pos.x, boss->obj.pos.y - 330.0f, boss->obj.pos.z + 1020.0f, 15.0f); - func_8007BFFC(boss->obj.pos.x, boss->obj.pos.y - 330.0f, boss->obj.pos.z + 1020.0f, 0.0f, 0.0f, 0.0f, 7.0f, 20); + func_effect_8007D2C8(boss->obj.pos.x, boss->obj.pos.y - 330.0f, boss->obj.pos.z + 1020.0f, 15.0f); + func_effect_8007BFFC(boss->obj.pos.x, boss->obj.pos.y - 330.0f, boss->obj.pos.z + 1020.0f, 0.0f, 0.0f, 0.0f, + 7.0f, 20); } if (arg1 == 4) { - func_8007D2C8(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z + 300.0f, 20.0f); - func_8007BFFC(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z + 300.0f, 0.0f, 0.0f, 0.0f, 10.0f, 0x19); + func_effect_8007D2C8(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z + 300.0f, 20.0f); + func_effect_8007BFFC(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z + 300.0f, 0.0f, 0.0f, 0.0f, 10.0f, 0x19); } if (arg1 < 4) { @@ -753,31 +753,31 @@ void func_i2_801892F0(Boss* boss, s32 arg1) { Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &dest); - func_8007D2C8(boss->obj.pos.x + dest.x, boss->obj.pos.y + dest.y, boss->obj.pos.z + dest.z, 10.0f); - func_8007BFFC(boss->obj.pos.x + dest.x, boss->obj.pos.y + dest.y, boss->obj.pos.z + dest.z, 0.0f, 0.0f, 0.0f, - 5.0f, 15); + func_effect_8007D2C8(boss->obj.pos.x + dest.x, boss->obj.pos.y + dest.y, boss->obj.pos.z + dest.z, 10.0f); + func_effect_8007BFFC(boss->obj.pos.x + dest.x, boss->obj.pos.y + dest.y, boss->obj.pos.z + dest.z, 0.0f, 0.0f, + 0.0f, 5.0f, 15); } } -void func_i2_80189624(void) { +void Meteo_80189624(void) { if (gGameFrameCount & 1) { - D_801784B8 = D_801784C4 = 0.0f; - D_801784BC = D_801784C8 = 5.0f; - D_801784C0 = D_801784CC = 0.0f; - D_801784EC = D_801784F8 = 0.0f; - D_801784F0 = D_801784FC = 100.0f; - D_801784F4 = D_80178500 = 0.0f; + D_ctx_801784B8 = D_ctx_801784C4 = 0.0f; + D_ctx_801784BC = D_ctx_801784C8 = 5.0f; + D_ctx_801784C0 = D_ctx_801784CC = 0.0f; + D_ctx_801784EC = D_ctx_801784F8 = 0.0f; + D_ctx_801784F0 = D_ctx_801784FC = 100.0f; + D_ctx_801784F4 = D_ctx_80178500 = 0.0f; } else { - D_801784B8 = D_801784C4 = 0.0f; - D_801784BC = D_801784C8 = -5.0f; - D_801784C0 = D_801784CC = 0.0f; - D_801784EC = D_801784F8 = 0.0f; - D_801784F0 = D_801784FC = 110.0f; - D_801784F4 = D_80178500 = 0.0f; + D_ctx_801784B8 = D_ctx_801784C4 = 0.0f; + D_ctx_801784BC = D_ctx_801784C8 = -5.0f; + D_ctx_801784C0 = D_ctx_801784CC = 0.0f; + D_ctx_801784EC = D_ctx_801784F8 = 0.0f; + D_ctx_801784F0 = D_ctx_801784FC = 110.0f; + D_ctx_801784F4 = D_ctx_80178500 = 0.0f; } } -void func_i2_8018978C(Boss* boss) { +void Meteo_8018978C(Boss* boss) { f32 sp7C; f32 rand; s32 i; @@ -874,7 +874,7 @@ void func_i2_8018978C(Boss* boss) { if (boss[0].swork[2 + boss->dmgPart] <= 0) { boss[0].swork[2 + boss->dmgPart] = 0; - func_i2_801892F0(boss, boss->dmgPart); + Meteo_801892F0(boss, boss->dmgPart); boss->swork[20] += 1; if (boss->swork[20] == 2) { Radio_PlayMessage(gMsg_ID_17160, RCID_PEPPY); @@ -899,7 +899,7 @@ void func_i2_8018978C(Boss* boss) { boss->swork[7] -= boss->damage; if (boss->swork[7] <= 0) { boss->swork[7] = 0; - func_i2_801892F0(boss, boss->dmgPart); + Meteo_801892F0(boss, boss->dmgPart); } } else { AUDIO_PLAY_SFX(0x29121007U, boss->sfxSource, 4U); @@ -913,7 +913,7 @@ void func_i2_8018978C(Boss* boss) { boss->swork[8] -= boss->damage; if (boss->swork[8] <= 0) { boss->swork[8] = 0; - func_i2_801892F0(boss, boss->dmgPart); + Meteo_801892F0(boss, boss->dmgPart); } } else { AUDIO_PLAY_SFX(0x29121007U, boss->sfxSource, 4U); @@ -922,7 +922,7 @@ void func_i2_8018978C(Boss* boss) { if (boss->swork[7] <= 0) { if (boss->swork[8] <= 0) { - func_80042EC0(boss); + func_boss_80042EC0(boss); boss->state = 20; boss->timer_050 = 300; @@ -940,18 +940,18 @@ void func_i2_8018978C(Boss* boss) { SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 50); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 50); AUDIO_PLAY_SFX(0x2940D09AU, boss->sfxSource, 4U); - D_Timer_80161A60 = 8; + D_play_Timer_80161A60 = 8; } } } } } - sp7C = boss->obj.pos.z + D_80177D20; + sp7C = boss->obj.pos.z + D_ctx_80177D20; if (boss->state >= 3) { if (boss->state < 20) { - Math_SmoothStepToF(&boss->vel.z, -D_80161A54, 0.1f, 2.0f, 0.0f); + Math_SmoothStepToF(&boss->vel.z, -D_play_80161A54, 0.1f, 2.0f, 0.0f); if ((boss->fwork[9] + 200.0f) < sp7C) { Math_SmoothStepToF(&boss->vel.z, -60.0f, 0.1f, 4.0f, 0.0f); } @@ -1037,7 +1037,7 @@ void func_i2_8018978C(Boss* boss) { if (boss->swork[18] != 0) { s32 id; - if (func_8008AC54(0) >= 4) { + if (func_hud_8008AC54(0) >= 4) { id = 191; } else { id = 190; @@ -1052,11 +1052,11 @@ void func_i2_8018978C(Boss* boss) { Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &dest); if (boss->swork[18] == 1) { - func_i2_80187D08(boss->obj.pos.x + dest.x, boss->obj.pos.y + dest.y, boss->obj.pos.z + dest.z, 50.0f, - 270.0f, 0.0f, 0x1E, 0, id); + Meteo_80187D08(boss->obj.pos.x + dest.x, boss->obj.pos.y + dest.y, boss->obj.pos.z + dest.z, 50.0f, 270.0f, + 0.0f, 0x1E, 0, id); } else { - func_i2_80187D08(boss->obj.pos.x + dest.x, boss->obj.pos.y + dest.y, boss->obj.pos.z + dest.z, 50.0f, 0.0f, - 0.0f, 0, 0, id); + Meteo_80187D08(boss->obj.pos.x + dest.x, boss->obj.pos.y + dest.y, boss->obj.pos.z + dest.z, 50.0f, 0.0f, + 0.0f, 0, 0, id); } src.y = -330.0f; @@ -1064,19 +1064,19 @@ void func_i2_8018978C(Boss* boss) { Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &dest); if (boss->swork[18] == 1) { - func_i2_80187D08(boss->obj.pos.x + dest.x, boss->obj.pos.y + dest.y, boss->obj.pos.z + dest.z, 50.0f, 90.0f, - 0.0f, 0x1E, 0, id); + Meteo_80187D08(boss->obj.pos.x + dest.x, boss->obj.pos.y + dest.y, boss->obj.pos.z + dest.z, 50.0f, 90.0f, + 0.0f, 0x1E, 0, id); } else { - func_i2_80187D08(boss->obj.pos.x + dest.x, boss->obj.pos.y + dest.y, boss->obj.pos.z + dest.z, 50.0f, 0.0f, - 0.0f, 0, 0, id); + Meteo_80187D08(boss->obj.pos.x + dest.x, boss->obj.pos.y + dest.y, boss->obj.pos.z + dest.z, 50.0f, 0.0f, + 0.0f, 0, 0, id); } boss->swork[18] = 0; } if ((sp7C < 200.0f) && (sp7C > -1500.0f)) { - D_801784F8 = 0.0f; - D_801784FC = 150.0f; - D_80178500 = 0.0f; + D_ctx_801784F8 = 0.0f; + D_ctx_801784FC = 150.0f; + D_ctx_80178500 = 0.0f; } switch (boss->state) { @@ -1085,7 +1085,7 @@ void func_i2_8018978C(Boss* boss) { boss->swork[1] = 10; boss->obj.pos.y += ((0.0f - boss->obj.pos.y) * boss->fwork[1]); - boss->vel.z = boss->fwork[0] - D_80177D08; + boss->vel.z = boss->fwork[0] - D_ctx_80177D08; if (sp7C < boss->fwork[9]) { boss->state = 1; @@ -1101,7 +1101,7 @@ void func_i2_8018978C(Boss* boss) { case 1: boss->obj.pos.y += ((0.0f - boss->obj.pos.y) * boss->fwork[1]); - boss->vel.z = boss->fwork[0] - D_80177D08; + boss->vel.z = boss->fwork[0] - D_ctx_80177D08; if (boss->fwork[0] < 0.0f) { boss->fwork[0] += 0.5f; @@ -1119,7 +1119,7 @@ void func_i2_8018978C(Boss* boss) { case 2: boss->obj.pos.y += ((0.0f - boss->obj.pos.y) * boss->fwork[1]); - boss->vel.z = boss->fwork[0] - D_80177D08; + boss->vel.z = boss->fwork[0] - D_ctx_80177D08; if (boss->fwork[1] < 0.05f) { boss->fwork[1] = boss->fwork[1] + 0.0004f; @@ -1231,14 +1231,14 @@ void func_i2_8018978C(Boss* boss) { } if (boss->timer_050 == 0) { - D_801784C4 = 0.0f; - D_801784C8 = 5.0f; - D_801784CC = 0.0f; - D_801784F8 = 0.0f; - D_801784FC = 100.0f; - D_80178500 = 0.0f; - D_801784E8 = 5.0f; - D_80178510 = 5.0f; + D_ctx_801784C4 = 0.0f; + D_ctx_801784C8 = 5.0f; + D_ctx_801784CC = 0.0f; + D_ctx_801784F8 = 0.0f; + D_ctx_801784FC = 100.0f; + D_ctx_80178500 = 0.0f; + D_ctx_801784E8 = 5.0f; + D_ctx_80178510 = 5.0f; if (boss->fwork[11] < 70.0f) { boss->fwork[11] += 1.0f; @@ -1251,7 +1251,7 @@ void func_i2_8018978C(Boss* boss) { } if (boss->fwork[11] > 30.0f) { - func_i2_80189624(); + Meteo_80189624(); } } break; @@ -1261,32 +1261,32 @@ void func_i2_8018978C(Boss* boss) { Math_SmoothStepToF(&boss->fwork[0x15], 4.0f, 1.0f, 0.1f, 0.0f); if (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_6) { - D_80178348 = D_80178340 = D_80178350 = D_80178354 = 0; + D_ctx_80178348 = D_ctx_80178340 = D_ctx_80178350 = D_ctx_80178354 = 0; if ((boss->timer_050 == 10) || (boss->timer_050 == 30) || (boss->timer_050 == 50) || (boss->timer_050 == 70)) { - D_80178340 = 150; - D_80178348 = D_80178350 = D_80178354 = 0xFF; - func_i2_80187E38(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z + 1300.0f, - boss->fwork[12] + boss->obj.rot.z); + D_ctx_80178340 = 150; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0xFF; + Meteo_80187E38(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z + 1300.0f, + boss->fwork[12] + boss->obj.rot.z); boss->fwork[12] = RAND_FLOAT(360.0f); } if ((boss->timer_050 == 13) || (boss->timer_050 == 33) || (boss->timer_050 == 53) || (boss->timer_050 == 73)) { - D_80178340 = 150; - D_80178348 = D_80178350 = D_80178354 = 255; + D_ctx_80178340 = 150; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; } if (boss->timer_050 == 0) { boss->state = 7; AUDIO_PLAY_SFX(0x29038058U, boss->sfxSource, 4U); } - func_i2_80189624(); + Meteo_80189624(); } break; case 7: if (boss->fwork[11] > 26.0f) { - func_i2_80189624(); + Meteo_80189624(); } if (boss->fwork[11] > 0.0f) { @@ -1406,7 +1406,7 @@ void func_i2_8018978C(Boss* boss) { boss->fwork[15] = 8.0f; AUDIO_PLAY_SFX(0x11015034U, boss->sfxSource, 4U); } else if ((boss->timer_050 & 1) == 1) { - func_i2_80188088(boss); + Meteo_80188088(boss); } break; @@ -1425,12 +1425,12 @@ void func_i2_8018978C(Boss* boss) { Matrix_MultVec3fNoTranslate(gCalcMatrix, &D_i2_80195430[RAND_INT(19.9f)], &dest); if (!(gGameFrameCount & 1)) { - func_8007C120(boss->obj.pos.x + dest.x, boss->obj.pos.y + dest.y, boss->obj.pos.z + dest.z, boss->vel.x, - boss->vel.y, boss->vel.z, 0.3f, 20); + func_effect_8007C120(boss->obj.pos.x + dest.x, boss->obj.pos.y + dest.y, boss->obj.pos.z + dest.z, + boss->vel.x, boss->vel.y, boss->vel.z, 0.3f, 20); } if (!(gGameFrameCount & 3)) { - func_8007BFFC(boss->obj.pos.x + dest.x, boss->obj.pos.y + dest.y, boss->obj.pos.z + dest.z, boss->vel.x, - boss->vel.y, boss->vel.z, 10.0f, 10); + func_effect_8007BFFC(boss->obj.pos.x + dest.x, boss->obj.pos.y + dest.y, boss->obj.pos.z + dest.z, + boss->vel.x, boss->vel.y, boss->vel.z, 10.0f, 10); } boss->vel.y = -5.0f; @@ -1438,11 +1438,11 @@ void func_i2_8018978C(Boss* boss) { boss->obj.rot.z -= 0.1f; if (boss->timer_050 == 0) { - func_8007D2C8(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 40.0f); + func_effect_8007D2C8(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 40.0f); Object_Kill(&boss->obj, boss->sfxSource); } if (boss->timer_050 == 20) { - func_8007A568(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 80.0f); + func_effect_8007A568(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 80.0f); AUDIO_PLAY_SFX(0x2940F026U, boss->sfxSource, 4U); D_Timer_80177BD0[0] = 60; for (i = 0; i < ARRAY_COUNT(gActors); i++) { @@ -1460,13 +1460,13 @@ void func_i2_8018978C(Boss* boss) { case 5: case 10: case 15: - func_8007B344(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 71.0f, 5); + func_effect_8007B344(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 71.0f, 5); case 0: for (i = 0; i < 0x64; i++) { - func_80079618(RAND_FLOAT_CENTERED(1000.0f) + boss->obj.pos.x, - RAND_FLOAT_CENTERED(1000.0f) + boss->obj.pos.y, - RAND_FLOAT_CENTERED(1000.0f) + boss->obj.pos.z, 3.0f); + func_effect_80079618(RAND_FLOAT_CENTERED(1000.0f) + boss->obj.pos.x, + RAND_FLOAT_CENTERED(1000.0f) + boss->obj.pos.y, + RAND_FLOAT_CENTERED(1000.0f) + boss->obj.pos.z, 3.0f); } break; } @@ -1498,7 +1498,7 @@ void func_i2_8018978C(Boss* boss) { } } -void func_i2_8018B7C4(s32 arg0) { +void Meteo_8018B7C4(s32 arg0) { f32 effect = arg0 * 0.83333f; if (gGameFrameCount & 1) { @@ -1544,7 +1544,7 @@ void func_i2_8018B7C4(s32 arg0) { gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); } -void func_i2_8018BACC(Boss* boss) { +void Meteo_8018BACC(Boss* boss) { s32 i; f32 var_fs0; f32 var_fs1; @@ -1757,7 +1757,7 @@ void func_i2_8018BACC(Boss* boss) { Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, 0.0f, 650.0f, 600.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); - func_i2_8018B7C4(boss->swork[0] - 1); + Meteo_8018B7C4(boss->swork[0] - 1); Matrix_Pop(&gGfxMatrix); } @@ -1765,14 +1765,14 @@ void func_i2_8018BACC(Boss* boss) { Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, 0.0f, -650.0f, 600.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); - func_i2_8018B7C4(boss->swork[1] - 1); + Meteo_8018B7C4(boss->swork[1] - 1); Matrix_Pop(&gGfxMatrix); } gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); } -void func_i2_8018C77C(Actor* actor, s32 arg1) { +void Meteo_8018C77C(Actor* actor, s32 arg1) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; actor->obj.id = OBJ_ACTOR_195; @@ -1796,7 +1796,7 @@ void func_i2_8018C77C(Actor* actor, s32 arg1) { AUDIO_PLAY_SFX(0x31024059U, actor->sfxSource, 0U); } -void func_i2_8018C8F4(Actor* actor1, Actor* actor2) { +void Meteo_8018C8F4(Actor* actor1, Actor* actor2) { Actor_Initialize(actor1); actor1->obj.status = OBJ_INIT; actor1->obj.id = OBJ_ACTOR_182; @@ -1813,7 +1813,7 @@ void func_i2_8018C8F4(Actor* actor1, Actor* actor2) { Object_SetInfo(&actor1->info, actor1->obj.id); } -void func_i2_8018CA10(Actor* actor1, Actor* actor2, f32 x, f32 y, f32 z) { +void Meteo_8018CA10(Actor* actor1, Actor* actor2, f32 x, f32 y, f32 z) { Actor_Initialize(actor1); actor1->obj.status = OBJ_INIT; actor1->obj.id = OBJ_ACTOR_182; @@ -1830,7 +1830,7 @@ void func_i2_8018CA10(Actor* actor1, Actor* actor2, f32 x, f32 y, f32 z) { Object_SetInfo(&actor1->info, actor1->obj.id); } -void func_i2_8018CAD8(void) { +void Meteo_8018CAD8(void) { Actor* actor = &gActors[50]; Actor_Initialize(actor); @@ -1843,7 +1843,7 @@ void func_i2_8018CAD8(void) { Object_SetInfo(&actor->info, actor->obj.id); } -void func_i2_8018CB50(Effect* effect, Actor* actor) { +void Meteo_8018CB50(Effect* effect, Actor* actor) { Effect_Initialize(effect); effect->obj.status = OBJ_ACTIVE; effect->obj.id = OBJ_EFFECT_346; @@ -1862,23 +1862,23 @@ void func_i2_8018CB50(Effect* effect, Actor* actor) { Object_SetInfo(&effect->info, effect->obj.id); } -void func_i2_8018CCF8(Actor* actor) { +void Meteo_8018CCF8(Actor* actor) { s32 i; s32 j; - func_8007A6F0(&actor->obj.pos, 0x2903A008); + func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); for (i = 0; i < 25; ++i) { for (j = 0; j < ARRAY_COUNT(gEffects); j++) { if (gEffects[j].obj.status == OBJ_FREE) { - func_i2_8018CB50(&gEffects[j], actor); + Meteo_8018CB50(&gEffects[j], actor); break; } } } } -void func_i2_8018CD8C(Player* player) { +void Meteo_8018CD8C(Player* player) { u8 sp8F; s32 i; Actor* actor0 = &gActors[0]; @@ -1893,7 +1893,7 @@ void func_i2_8018CD8C(Player* player) { Vec3f sp58; Vec3f sp4C; - D_8017835C = 4; + D_ctx_8017835C = 4; PRINTF("Demo_Time %d\n"); @@ -1902,52 +1902,52 @@ void func_i2_8018CD8C(Player* player) { gCsFrameCount = 0; if (gTeamShields[1] > 0) { - func_i2_8018C77C(actor0, 0); + Meteo_8018C77C(actor0, 0); } if (gTeamShields[2] > 0) { - func_i2_8018C77C(actor1, 1); + Meteo_8018C77C(actor1, 1); } if (gTeamShields[3] > 0) { - func_i2_8018C77C(actor2, 2); + Meteo_8018C77C(actor2, 2); } - func_i2_8018C77C(actor3, 3); - func_i2_8018CAD8(); + Meteo_8018C77C(actor3, 3); + Meteo_8018CAD8(); for (i = 5; i < 15; i++) { - func_i2_8018C8F4(&gActors[i], actor3); + Meteo_8018C8F4(&gActors[i], actor3); } - D_80177A48[1] = -13000.0f; - D_80177A48[2] = -13000.0f; - D_80177A48[4] = -22000.0f; + D_ctx_80177A48[1] = -13000.0f; + D_ctx_80177A48[2] = -13000.0f; + D_ctx_80177A48[4] = -22000.0f; player->camEye.x = gCsCamEyeX = player->pos.x + 100.0f; player->camEye.y = gCsCamEyeY = player->pos.y; - player->camEye.z = gCsCamEyeZ = D_80177A48[1] + player->unk_138; + player->camEye.z = gCsCamEyeZ = D_ctx_80177A48[1] + player->unk_138; - player->camAt.x = gCsCamAtX = D_80177A48[2] + player->pos.x; + player->camAt.x = gCsCamAtX = D_ctx_80177A48[2] + player->pos.x; player->camAt.y = gCsCamAtY = player->pos.y; - player->camAt.z = gCsCamAtZ = D_80177A48[4] + player->unk_138; + player->camAt.z = gCsCamAtZ = D_ctx_80177A48[4] + player->unk_138; player->unk_1D0 = 1; - D_80177A48[3] = 1.0f; + D_ctx_80177A48[3] = 1.0f; case 1: actor3->vel.z = 4.0f; gCsCamEyeX = player->pos.x + 100.0f; gCsCamEyeY = player->pos.y; - gCsCamEyeZ = D_80177A48[1] + player->unk_138; - gCsCamAtX = D_80177A48[2] + player->pos.x; + gCsCamEyeZ = D_ctx_80177A48[1] + player->unk_138; + gCsCamAtX = D_ctx_80177A48[2] + player->pos.x; gCsCamAtY = player->pos.y + 20.0f; - gCsCamAtZ = D_80177A48[4] + player->unk_138; - Math_SmoothStepToF(&D_80177A48[1], 8000.0f, 0.05f, 20.0f, 0); - Math_SmoothStepToF(&D_80177A48[2], 0.0f, 0.05f, 25.0f, 0); - Math_SmoothStepToF(&D_80177A48[4], 0.0f, 0.05f, 200.0f, 0); + gCsCamAtZ = D_ctx_80177A48[4] + player->unk_138; + Math_SmoothStepToF(&D_ctx_80177A48[1], 8000.0f, 0.05f, 20.0f, 0); + Math_SmoothStepToF(&D_ctx_80177A48[2], 0.0f, 0.05f, 25.0f, 0); + Math_SmoothStepToF(&D_ctx_80177A48[4], 0.0f, 0.05f, 200.0f, 0); Math_SmoothStepToF(&player->unk_0EC, 0.0f, 0.05f, 0.3f, 0); - D_80177A48[0] = 0.1f; + D_ctx_80177A48[0] = 0.1f; if (gCsFrameCount == 680) { actor3->state = 10; } @@ -1962,7 +1962,7 @@ void func_i2_8018CD8C(Player* player) { } if (gCsFrameCount > 810) { player->unk_1D0 = 2; - D_80177A48[0] = 0.0f; + D_ctx_80177A48[0] = 0.0f; player->timer_1F8 = 40; } sp8F = false; @@ -1987,8 +1987,8 @@ void func_i2_8018CD8C(Player* player) { sp8F = true; } if (gCsFrameCount == 600) { - func_i2_8018CA10(&gActors[16], &gActors[3], 100.0f, 500.0f, 1500.0f); - func_i2_8018CA10(&gActors[17], &gActors[3], 300.0f, 400.0f, 2000.0f); + Meteo_8018CA10(&gActors[16], &gActors[3], 100.0f, 500.0f, 1500.0f); + Meteo_8018CA10(&gActors[17], &gActors[3], 300.0f, 400.0f, 2000.0f); } if (gCsFrameCount == 660) { for (i = 4; i < 15; i++) { @@ -1999,15 +1999,15 @@ void func_i2_8018CD8C(Player* player) { actor3->obj.pos.z += 4000.0f; for (i = 4; i < 9; i++) { - func_i2_8018C8F4(&gActors[i], &gActors[3]); + Meteo_8018C8F4(&gActors[i], &gActors[3]); } actor3->obj.pos.x -= 1000.0f; actor3->obj.pos.z -= 4000.0f; - func_i2_8018CA10(&gActors[13], &gActors[3], 1500.0f, 200.0f, 100.0f); - func_i2_8018CA10(&gActors[14], &gActors[3], 1200.0f, -200.0f, -500.0f); - func_i2_8018CA10(&gActors[15], &gActors[3], 2000.0f, -100.0f, -1000.0f); + Meteo_8018CA10(&gActors[13], &gActors[3], 1500.0f, 200.0f, 100.0f); + Meteo_8018CA10(&gActors[14], &gActors[3], 1200.0f, -200.0f, -500.0f); + Meteo_8018CA10(&gActors[15], &gActors[3], 2000.0f, -100.0f, -1000.0f); gActors[50].obj.status = gActors[16].obj.status = gActors[17].obj.status = OBJ_FREE; } @@ -2017,16 +2017,16 @@ void func_i2_8018CD8C(Player* player) { } if (gCsFrameCount == 340) { - func_8007D2C8(gActors[8].obj.pos.x, gActors[8].obj.pos.y, gActors[8].obj.pos.z, 10.0f); + func_effect_8007D2C8(gActors[8].obj.pos.x, gActors[8].obj.pos.y, gActors[8].obj.pos.z, 10.0f); gActors[8].obj.status = OBJ_FREE; - func_i2_8018CCF8(&gActors[8]); + Meteo_8018CCF8(&gActors[8]); } if (player->timer_1FC != 0) { if (sp8F != 0) { sp58 = D_i2_801955C4; - D_80177A48[3] *= -1.0f; - x = gActors[player->unk_1D8].obj.pos.x - (actor3->obj.pos.x + (D_80177A48[3] * 74.0f)); + D_ctx_80177A48[3] *= -1.0f; + x = gActors[player->unk_1D8].obj.pos.x - (actor3->obj.pos.x + (D_ctx_80177A48[3] * 74.0f)); y = gActors[player->unk_1D8].obj.pos.y - (actor3->obj.pos.y - 232.0f); z = gActors[player->unk_1D8].obj.pos.z - (actor3->obj.pos.z - 1190.0f); @@ -2038,16 +2038,16 @@ void func_i2_8018CD8C(Player* player) { Matrix_RotateX(gCalcMatrix, M_DTOR * sp68, 1); Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp58, &sp4C); - func_8006EFA0(100, actor3->obj.pos.x + (D_80177A48[3] * 74.0f) + (sp4C.x * 0.6f), - actor3->obj.pos.y - 232.0f + (sp4C.y * 0.8f), - actor3->obj.pos.z - 1190.0f + (sp4C.z * 0.8f), sp4C.x, sp4C.y, sp4C.z, sp68, sp64, - 0.0f); + func_enmy2_8006EFA0(100, actor3->obj.pos.x + (D_ctx_80177A48[3] * 74.0f) + (sp4C.x * 0.6f), + actor3->obj.pos.y - 232.0f + (sp4C.y * 0.8f), + actor3->obj.pos.z - 1190.0f + (sp4C.z * 0.8f), sp4C.x, sp4C.y, sp4C.z, sp68, + sp64, 0.0f); } if (player->timer_1FC == 1) { - func_8007D2C8(gActors[player->unk_1D8].obj.pos.x, gActors[player->unk_1D8].obj.pos.y, - gActors[player->unk_1D8].obj.pos.z, 10.0f); + func_effect_8007D2C8(gActors[player->unk_1D8].obj.pos.x, gActors[player->unk_1D8].obj.pos.y, + gActors[player->unk_1D8].obj.pos.z, 10.0f); gActors[player->unk_1D8].obj.status = OBJ_FREE; - func_i2_8018CCF8(&gActors[player->unk_1D8]); + Meteo_8018CCF8(&gActors[player->unk_1D8]); Object_Kill(&gPlayerShots[0].obj, gPlayerShots[0].sfxSource); } } @@ -2061,11 +2061,11 @@ void func_i2_8018CD8C(Player* player) { gCsCamAtY = (player->pos.y * player->unk_148) + 20.0f; gCsCamAtZ = player->unk_138; - Math_SmoothStepToF(D_80177A48, 1.0f, 1.0f, 0.01f, 0.0f); + Math_SmoothStepToF(D_ctx_80177A48, 1.0f, 1.0f, 0.01f, 0.0f); if (player->timer_1F8 == 0) { - AUDIO_PLAY_BGM(D_80177C90); - D_80177838 = 80; + AUDIO_PLAY_BGM(D_ctx_80177C90); + D_ctx_80177838 = 80; player->state_1C8 = PLAYERSTATE_1C8_3; player->unk_1D0 = 0; player->timer_1F8 = 0; @@ -2081,7 +2081,7 @@ void func_i2_8018CD8C(Player* player) { Object_Kill(&gActors[i].obj, gActors[i].sfxSource); } - D_80178488 = 1; + D_ctx_80178488 = 1; break; } } @@ -2104,15 +2104,15 @@ void func_i2_8018CD8C(Player* player) { break; } - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 20000.0f, 0.0f); - Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 20000.0f, 0.0f); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 20000.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 20000.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 20000.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 20000.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], 20000.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_ctx_80177A48[0], 20000.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], 20000.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_ctx_80177A48[0], 20000.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_ctx_80177A48[0], 20000.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_ctx_80177A48[0], 20000.0f, 0.0f); } -void func_i2_8018D9EC(Actor* actor) { +void Meteo_8018D9EC(Actor* actor) { switch (actor->state) { case 0: actor->fwork[0] = RAND_FLOAT_CENTERED(10.0f); @@ -2122,25 +2122,25 @@ void func_i2_8018D9EC(Actor* actor) { actor->obj.rot.z += actor->fwork[0]; break; } - func_i2_80187530(actor); + Meteo_80187530(actor); } -void func_i2_8018DA6C(Actor* actor) { +void Meteo_8018DA6C(Actor* actor) { RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); gSPDisplayList(gMasterDisp++, D_ME_6017AD0); } -void func_i2_8018DAEC(Actor* actor) { +void Meteo_8018DAEC(Actor* actor) { RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); gSPDisplayList(gMasterDisp++, D_ME_6016240); } -void func_i2_8018DB6C(Actor* actor) { +void Meteo_8018DB6C(Actor* actor) { RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); gSPDisplayList(gMasterDisp++, D_ME_600CD60); } -void func_i2_8018DBEC(Effect* effect) { +void Meteo_8018DBEC(Effect* effect) { if (effect->state == 1) { Matrix_RotateX(gGfxMatrix, effect->obj.rot.x * M_DTOR, 1); Matrix_Scale(gGfxMatrix, effect->scale2, effect->scale2, effect->scale2, 1); @@ -2151,7 +2151,7 @@ void func_i2_8018DBEC(Effect* effect) { } } -void func_i2_8018DCE4(Effect* effect) { +void Meteo_8018DCE4(Effect* effect) { if (effect->state != 0) { Matrix_RotateX(gGfxMatrix, effect->obj.rot.x * M_DTOR, 1); Matrix_Scale(gGfxMatrix, effect->scale2, effect->scale2, effect->scale2 * 3.0f, 1); @@ -2167,7 +2167,7 @@ void func_i2_8018DCE4(Effect* effect) { } } -void func_i2_8018DE14(Effect* effect) { +void Meteo_8018DE14(Effect* effect) { Matrix_RotateX(gGfxMatrix, effect->obj.rot.x * M_DTOR, 1); Matrix_Scale(gGfxMatrix, effect->scale2, effect->scale2, effect->scale2, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -2181,7 +2181,7 @@ void func_i2_8018DE14(Effect* effect) { } } -void func_i2_8018DF08(Actor* actor, s32 idx) { +void Meteo_8018DF08(Actor* actor, s32 idx) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; actor->obj.id = OBJ_ACTOR_195; @@ -2205,7 +2205,7 @@ void func_i2_8018DF08(Actor* actor, s32 idx) { } } -void func_i2_8018E084(Player* player) { +void Meteo_8018E084(Player* player) { Vec3f src; Vec3f dest; s32 pad[5]; @@ -2226,43 +2226,43 @@ void func_i2_8018E084(Player* player) { Audio_StopSfxByBankAndSource(1, player->sfxSource); player->unk_1D0++; - D_80177A48[0] = 0.0f; - D_80177A48[1] = 0.0f; - D_80177A48[2] = 0.0f; + D_ctx_80177A48[0] = 0.0f; + D_ctx_80177A48[1] = 0.0f; + D_ctx_80177A48[2] = 0.0f; player->wings.unk_2C = 1; gCsFrameCount = 0; case 1: - Matrix_RotateY(gCalcMatrix, D_80177A48[1] * M_DTOR, 0); + Matrix_RotateY(gCalcMatrix, D_ctx_80177A48[1] * M_DTOR, 0); src.x = 0.0f; src.y = 0.0f; - src.z = D_80177A48[2] + 2000.0f; + src.z = D_ctx_80177A48[2] + 2000.0f; Matrix_MultVec3f(gCalcMatrix, &src, &dest); gCsCamEyeX = gBosses[0].obj.pos.x + dest.x; gCsCamEyeY = gBosses[0].obj.pos.y + dest.y; - gCsCamEyeZ = gBosses[0].obj.pos.z + D_80177D20 + dest.z; + gCsCamEyeZ = gBosses[0].obj.pos.z + D_ctx_80177D20 + dest.z; gCsCamAtX = gBosses[0].obj.pos.x; gCsCamAtY = gBosses[0].obj.pos.y; - gCsCamAtZ = gBosses[0].obj.pos.z + D_80177D20; + gCsCamAtZ = gBosses[0].obj.pos.z + D_ctx_80177D20; - Math_SmoothStepToF(&D_80177A48[1], 180.0f, 0.05f, 1.0f, 0.0f); - Math_SmoothStepToF(&D_80177A48[2], 1500.0f, 0.1f, 10.0f, 0.0f); - Math_SmoothStepToF(&D_80177A48[0], 0.1f, 0.1f, 0.001f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[1], 180.0f, 0.05f, 1.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[2], 1500.0f, 0.1f, 10.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[0], 0.1f, 0.1f, 0.001f, 0.0f); Math_SmoothStepToF(&player->unk_0D0, 0.0f, 1.0f, 0.5f, 0.0f); Math_SmoothStepToF(&gBosses[0].vel.z, 0.0f, 1.0f, 0.5f, 0.0f); Math_SmoothStepToF(&player->unk_0E4, 0.0f, 0.1f, 3.0f, 0.0f); if (gCsFrameCount == 320) { gCsFrameCount = 200; - D_80177A48[0] = 0.0f; - D_80177A48[3] = 0.0f; - D_80177A48[4] = 0.0f; + D_ctx_80177A48[0] = 0.0f; + D_ctx_80177A48[3] = 0.0f; + D_ctx_80177A48[4] = 0.0f; player->unk_1D0++; player->timer_1F8 = 100; } @@ -2270,48 +2270,48 @@ void func_i2_8018E084(Player* player) { case 2: if (player->timer_1F8 == 0) { - Math_SmoothStepToF(&D_80177A48[3], 1.0f, 1.0f, 0.01f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[3], 1.0f, 1.0f, 0.01f, 0.0f); } if (player->timer_1F8 == 50) { AUDIO_PLAY_BGM(SEQ_ID_38); } - Math_SmoothStepToF(&D_80177A48[1], 1080.0f, 0.01f, D_80177A48[3], 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[1], 1080.0f, 0.01f, D_ctx_80177A48[3], 0.0f); if (gCsFrameCount < 500) { - Math_SmoothStepToF(&D_80177A48[2], -1700.0f, 0.1f, 30.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[2], -1700.0f, 0.1f, 30.0f, 0.0f); } else if (gCsFrameCount < 800) { - Math_SmoothStepToF(&D_80177A48[2], -1000.0f, 0.1f, 4.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[2], -1000.0f, 0.1f, 4.0f, 0.0f); } else if (gCsFrameCount < 1150) { - Math_SmoothStepToF(&D_80177A48[2], -1250.0f, 0.1f, 4.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[2], -1250.0f, 0.1f, 4.0f, 0.0f); } else { - Math_SmoothStepToF(&D_80177A48[2], -1500.0f, 0.1f, 4.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[2], -1500.0f, 0.1f, 4.0f, 0.0f); } if (gCsFrameCount < 400) { - Math_SmoothStepToF(&D_80177A48[4], 0.0f, 0.03f, 0.2f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[4], 0.0f, 0.03f, 0.2f, 0.0f); } else if (gCsFrameCount < 700) { - Math_SmoothStepToF(&D_80177A48[4], -40.0f, 0.03f, 0.4f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[4], -40.0f, 0.03f, 0.4f, 0.0f); } else if (gCsFrameCount < 1100) { - Math_SmoothStepToF(&D_80177A48[4], 40.0f, 0.03f, 0.4f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[4], 40.0f, 0.03f, 0.4f, 0.0f); } else { - Math_SmoothStepToF(&D_80177A48[4], 7.0f, 0.03f, 0.2f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[4], 7.0f, 0.03f, 0.2f, 0.0f); } - Math_SmoothStepToF(D_80177A48, 0.1f, 0.1f, 0.002f, 0.0f); + Math_SmoothStepToF(D_ctx_80177A48, 0.1f, 0.1f, 0.002f, 0.0f); - Matrix_RotateX(gCalcMatrix, D_80177A48[4] * M_DTOR, 0); - Matrix_RotateY(gCalcMatrix, D_80177A48[1] * M_DTOR, 1); + Matrix_RotateX(gCalcMatrix, D_ctx_80177A48[4] * M_DTOR, 0); + Matrix_RotateY(gCalcMatrix, D_ctx_80177A48[1] * M_DTOR, 1); src.x = 0.0f; src.y = 0.0f; - src.z = D_80177A48[2] + 2000.0f; + src.z = D_ctx_80177A48[2] + 2000.0f; Matrix_MultVec3f(gCalcMatrix, &src, &dest); gCsCamAtX = player->pos.x; gCsCamAtY = player->pos.y; - gCsCamAtZ = player->unk_138 + D_80177D20 + 150.0f; + gCsCamAtZ = player->unk_138 + D_ctx_80177D20 + 150.0f; if (gCsFrameCount > 1390) { player->unk_0D0 += 2.0f; @@ -2323,20 +2323,20 @@ void func_i2_8018E084(Player* player) { } if (gCsFrameCount > 1465) { - D_80178358 = 255; - D_80178348 = D_80178350 = D_80178354 = 0; - D_8017835C = 8; - if (D_80178340 == 255) { + D_ctx_80178358 = 255; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; + D_ctx_8017835C = 8; + if (D_ctx_80178340 == 255) { player->state_1C8 = PLAYERSTATE_1C8_6; player->timer_1F8 = 0; - D_8017837C = 4; - D_800D3180[LEVEL_METEO] = Play_CheckMedalStatus(0xC8) + 1; + D_ctx_8017837C = 4; + D_play_800D3180[LEVEL_METEO] = Play_CheckMedalStatus(0xC8) + 1; } } } else { gCsCamEyeX = player->pos.x + dest.x; gCsCamEyeY = player->pos.y + dest.y; - gCsCamEyeZ = player->unk_138 + D_80177D20 + 150.0f + dest.z; + gCsCamEyeZ = player->unk_138 + D_ctx_80177D20 + 150.0f + dest.z; } break; } @@ -2348,19 +2348,19 @@ void func_i2_8018E084(Player* player) { Object_Kill(&gActors[2].obj, gActors[2].sfxSource); if (gTeamShields[1] > 0) { - func_i2_8018DF08(&gActors[0], 0); + Meteo_8018DF08(&gActors[0], 0); } if (gTeamShields[2] > 0) { - func_i2_8018DF08(&gActors[1], 1); + Meteo_8018DF08(&gActors[1], 1); } if (gTeamShields[3] > 0) { - func_i2_8018DF08(&gActors[2], 2); + Meteo_8018DF08(&gActors[2], 2); } - func_i2_8018DF08(&gActors[3], 3); + Meteo_8018DF08(&gActors[3], 3); break; case 370: - D_80177840 = 100; + D_ctx_80177840 = 100; break; case 450: @@ -2376,7 +2376,7 @@ void func_i2_8018E084(Player* player) { Radio_PlayMessage(gMsg_ID_20345, RCID_ROB64); break; default: - func_80048AC0(2); + func_demo_80048AC0(2); break; } break; @@ -2390,7 +2390,7 @@ void func_i2_8018E084(Player* player) { Radio_PlayMessage(gMsg_ID_20344, RCID_ROB64); break; default: - func_80048AC0(3); + func_demo_80048AC0(3); break; } break; @@ -2404,17 +2404,17 @@ void func_i2_8018E084(Player* player) { Radio_PlayMessage(gMsg_ID_20340, RCID_ROB64); break; default: - func_80048AC0(1); + func_demo_80048AC0(1); break; } break; case 976: - D_80177830 = 1; + D_ctx_80177830 = 1; break; case 1176: - D_80177830 = 0; + D_ctx_80177830 = 0; break; case 1300: @@ -2439,16 +2439,16 @@ void func_i2_8018E084(Player* player) { gActors[3].state = 1; gActors[3].obj.pos.x = player->camEye.x - 700.0f; gActors[3].obj.pos.y = player->camEye.y; - gActors[3].obj.pos.z = player->camEye.z - D_80177D20 + 1000.0f; + gActors[3].obj.pos.z = player->camEye.z - D_ctx_80177D20 + 1000.0f; break; } - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_ctx_80177A48[0], 50000.0f, 0); Matrix_RotateY(gCalcMatrix, (player->unk_0E8 + 180.0f) * M_DTOR, 0); Matrix_RotateX(gCalcMatrix, -((player->unk_0E4 + player->unk_4D8) * M_DTOR), 1); @@ -2475,7 +2475,7 @@ void func_i2_8018E084(Player* player) { player->unk_0F0 = SIN_DEG(player->unk_0F4); } -void func_i2_8018ED9C(Actor* actor) { +void Meteo_8018ED9C(Actor* actor) { Vec3f sp3C; Vec3f sp30; diff --git a/src/overlays/ovl_i2/fox_sx.c b/src/overlays/ovl_i2/fox_sx.c index 19d01462..a68fe736 100644 --- a/src/overlays/ovl_i2/fox_sx.c +++ b/src/overlays/ovl_i2/fox_sx.c @@ -12,14 +12,10 @@ Vec3f D_i2_80195650 = { 90.0f, 0.0f, 0.0f }; Vec3f D_i2_8019565C = { 73.0f, -102.0f, -80.0f }; Vec3f D_i2_80195668 = { 90.0f, 0.0f, 0.0f }; -extern s32 D_800C9E90[]; +bool SectorX_80192AF0(s32, Gfx**, Vec3f*, Vec3f*, void*); +void SectorX_80193208(s32, Vec3f*, void*); -extern void func_i2_8018F030(void); -extern s32 func_i2_80192AF0(s32, Gfx**, Vec3f*, Vec3f*, void*); -extern void func_i2_80193208(s32, Vec3f*, void*); -extern void func_800B5D30(Player*, s32); - -void func_i2_8018F030(void) { +void SectorX_8018F030(void) { s32 i; Actor* actor = &gActors[0]; @@ -32,7 +28,7 @@ void func_i2_8018F030(void) { actor->obj.rot.y = 180.0f; actor->obj.pos.x = gPlayer[0].camEye.x - 300.0f; actor->obj.pos.y = gPlayer[0].camEye.y + 200.0f; - actor->obj.pos.z = gPlayer[0].camEye.z - D_80177D20 + 300.0f; + actor->obj.pos.z = gPlayer[0].camEye.z - D_ctx_80177D20 + 300.0f; actor->iwork[11] = 1; actor->aiType = 2; Object_SetInfo(&actor->info, actor->obj.id); @@ -42,7 +38,7 @@ void func_i2_8018F030(void) { } } -void func_i2_8018F124(void) { +void SectorX_8018F124(void) { Actor* actor = &gActors[50]; Actor_Initialize(actor); @@ -56,7 +52,7 @@ void func_i2_8018F124(void) { actor->info.unk_10 = 100000.0f; } -void func_i2_8018F1DC(Actor* actor) { +void SectorX_8018F1DC(Actor* actor) { Vec3f src; Vec3f dest; @@ -66,12 +62,12 @@ void func_i2_8018F1DC(Actor* actor) { Matrix_RotateY(gCalcMatrix, (actor->unk_0F4.y + 180.0f) * M_DTOR, 0); Matrix_RotateX(gCalcMatrix, actor->unk_0F4.x * M_DTOR, 1); Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &dest); - func_8006EEFC(actor->index, actor->obj.pos.x + (dest.x * 1.5), actor->obj.pos.y + (dest.y * 1.5), - actor->obj.pos.z + (dest.z * 1.5), dest.x, dest.y, dest.z, actor->unk_0F4.x, - actor->unk_0F4.y + 180.0f, 0.0f); + func_enmy2_8006EEFC(actor->index, actor->obj.pos.x + (dest.x * 1.5), actor->obj.pos.y + (dest.y * 1.5), + actor->obj.pos.z + (dest.z * 1.5), dest.x, dest.y, dest.z, actor->unk_0F4.x, + actor->unk_0F4.y + 180.0f, 0.0f); } -void func_i2_8018F330(Actor* actor) { +void SectorX_8018F330(Actor* actor) { f32 sp34; switch (actor->unk_0B6) { @@ -94,7 +90,7 @@ void func_i2_8018F330(Actor* actor) { } if (!(gGameFrameCount & 3) && (Rand_ZeroOne() < 0.2f)) { - func_i2_8018F1DC(actor); + SectorX_8018F1DC(actor); } if ((gBosses[0].unk_04C == 75) && (gBosses[0].state == 85)) { @@ -103,7 +99,7 @@ void func_i2_8018F330(Actor* actor) { actor->vel.y = -10.0f; actor->vel.z = 30.0f; Radio_PlayMessage(gMsg_ID_4111, RCID_SLIPPY); - func_8007A6F0(&actor->obj.pos, 0x2903A008); + func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); gBosses[0].swork[6] = 0; gTeamShields[2] = -2; gPlayer[0].state_1C8 = PLAYERSTATE_1C8_0; @@ -111,8 +107,8 @@ void func_i2_8018F330(Actor* actor) { actor->iwork[14] = 3; actor->fwork[0] = 0.0f; actor->fwork[1] = 0.0f; - D_80161A44 = 30000.0f; - func_i2_8018F124(); + D_game_80161A44 = 30000.0f; + SectorX_8018F124(); } break; @@ -125,22 +121,22 @@ void func_i2_8018F330(Actor* actor) { actor->obj.rot.y += 5.0f; if (!(gGameFrameCount & 7)) { - func_8007D10C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.5f); + func_effect_8007D10C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.5f); } Math_SmoothStepToF(&actor->fwork[0], 0.5f, 1.0f, 0.01f, 0); Math_SmoothStepToF(&actor->fwork[1], 0.1f, 1.0f, 0.01f, 0); Math_SmoothStepToF(&gPlayer[0].camAt.x, actor->obj.pos.x, actor->fwork[0], 100.0f, 0.0f); Math_SmoothStepToF(&gPlayer[0].camAt.y, actor->obj.pos.y, actor->fwork[0], 100.0f, 0.0f); - Math_SmoothStepToF(&gPlayer[0].camAt.z, actor->obj.pos.z + D_80177D20, actor->fwork[0], 100.0f, 0.0f); + Math_SmoothStepToF(&gPlayer[0].camAt.z, actor->obj.pos.z + D_ctx_80177D20, actor->fwork[0], 100.0f, 0.0f); Math_SmoothStepToF(&gPlayer[0].camEye.x, actor->obj.pos.x - 30.0f, actor->fwork[1], 20.0f, 0.0f); Math_SmoothStepToF(&gPlayer[0].camEye.y, actor->obj.pos.y, actor->fwork[1], 20.0f, 0.0f); if (actor->timer_0BC == 0) { gPlayer[0].state_1C8 = PLAYERSTATE_1C8_3; if (gPlayer[0].unk_238 != 0) { - func_800B5D30(gPlayer, 1); + func_play_800B5D30(&gPlayer[0], 1); } - D_80161A44 = 12800.0f; + D_game_80161A44 = 12800.0f; Object_Kill(&gActors[50].obj, gActors[50].sfxSource); } break; @@ -155,7 +151,7 @@ void func_i2_8018F330(Actor* actor) { } } -void func_i2_8018F884(Actor* actor) { +void SectorX_8018F884(Actor* actor) { switch (actor->unk_0B6) { case 0: gSPDisplayList(gMasterDisp++, D_SX_6020D20); @@ -164,7 +160,7 @@ void func_i2_8018F884(Actor* actor) { case 1: case 2: case 10: - func_8005B388(actor); + func_edisplay_8005B388(actor); break; case -1: @@ -181,7 +177,7 @@ void func_i2_8018F884(Actor* actor) { } } -void func_i2_8018FA04(f32 x, f32 y, f32 z) { +void SectorX_8018FA04(f32 x, f32 y, f32 z) { s32 i; Actor* actor; f32 yRot; @@ -212,13 +208,13 @@ void func_i2_8018FA04(f32 x, f32 y, f32 z) { Matrix_MultVec3f(gCalcMatrix, &src, &dest); actor->vel.x = dest.x; actor->vel.y = dest.y; - actor->vel.z = dest.z - D_80177D08; + actor->vel.z = dest.z - D_ctx_80177D08; break; } } } -void func_i2_8018FBBC(Vec3f* pos) { +void SectorX_8018FBBC(Vec3f* pos) { s32 i; Actor* actor; f32 xRot; @@ -231,9 +227,9 @@ void func_i2_8018FBBC(Vec3f* pos) { if ((actor->obj.status >= OBJ_ACTIVE) && (fabsf(pos->x - actor->obj.pos.x) < 2500.0f) && (fabsf(pos->z - actor->obj.pos.z) < 2500.0f) && (actor->state != 1000) && (actor->timer_0C2 == 0) && (actor->scale < 0.0f) && - func_80062DBC(pos, actor->info.hitbox, &actor->obj, actor->vwork[29].x, actor->vwork[29].y, - actor->vwork[29].z + actor->unk_0F4.z)) { - func_800A6028(actor->sfxSource, 0x09000004); + func_enmy_80062DBC(pos, actor->info.hitbox, &actor->obj, actor->vwork[29].x, actor->vwork[29].y, + actor->vwork[29].z + actor->unk_0F4.z)) { + func_play_800A6028(actor->sfxSource, 0x09000004); actor->state = 1000; xRot = Math_Atan2F(actor->obj.pos.x - pos->x, actor->obj.pos.z - pos->z); yRot = -Math_Atan2F(actor->obj.pos.y - pos->y, @@ -254,7 +250,7 @@ void func_i2_8018FBBC(Vec3f* pos) { } } -void func_i2_8018FE38(Boss* boss) { +void SectorX_8018FE38(Boss* boss) { Vec3f sp2C; Vec3f sp20; @@ -275,19 +271,19 @@ void func_i2_8018FE38(Boss* boss) { sp2C.y = boss->fwork[9]; sp2C.z = boss->fwork[10]; } - func_i2_8018FBBC(&sp2C); + SectorX_8018FBBC(&sp2C); } if (boss->dmgType == DMG_BEAM) { boss->dmgType = DMG_NONE; - func_8007A6F0(&boss->obj.pos, 0x29121007); + func_effect_8007A6F0(&boss->obj.pos, 0x29121007); } } -void func_i2_8018FF20(Boss* boss) { - func_i2_8018FE38(boss); +void SectorX_8018FF20(Boss* boss) { + SectorX_8018FE38(boss); } -bool func_i2_8018FF40(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +bool SectorX_8018FF40(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { if (((limbIndex >= 12) && (limbIndex < 22)) || ((limbIndex >= 36) && (limbIndex < 40))) { return 0; } @@ -295,11 +291,11 @@ bool func_i2_8018FF40(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* return 0; } -void func_i2_8018FF84(Boss* boss) { - Animation_DrawSkeleton(3, D_SX_6020C68, boss->vwork, func_i2_8018FF40, func_i2_80193208, boss, gCalcMatrix); +void SectorX_8018FF84(Boss* boss) { + Animation_DrawSkeleton(3, D_SX_6020C68, boss->vwork, SectorX_8018FF40, SectorX_80193208, boss, gCalcMatrix); } -bool func_i2_8018FFDC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +bool SectorX_8018FFDC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { if (((limbIndex >= 2) && (limbIndex < 12)) || ((limbIndex >= 32) && (limbIndex < 36))) { return 0; } @@ -307,11 +303,11 @@ bool func_i2_8018FFDC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* return 0; } -void func_i2_80190020(Boss* boss) { - Animation_DrawSkeleton(3, D_SX_6020C68, boss->vwork, func_i2_8018FFDC, func_i2_80193208, boss, gCalcMatrix); +void SectorX_80190020(Boss* boss) { + Animation_DrawSkeleton(3, D_SX_6020C68, boss->vwork, SectorX_8018FFDC, SectorX_80193208, boss, gCalcMatrix); } -void func_i2_80190078(Boss* boss) { +void SectorX_80190078(Boss* boss) { u8 attack; s32 i; Vec3f sp80[50]; @@ -324,13 +320,13 @@ void func_i2_80190078(Boss* boss) { s32 frameData; gBossFrameCount++; - D_80178540 = 5; + D_ctx_80178540 = 5; attack = false; if (gBossFrameCount < 150) { - D_80178570 = 20; - D_80178574 = 20; - D_80178578 = 20; + D_ctx_80178570 = 20; + D_ctx_80178574 = 20; + D_ctx_80178578 = 20; } PRINTF("たかおちゃん よう見ときや！\n"); // Takao-chan, look at it! @@ -404,20 +400,20 @@ void func_i2_80190078(Boss* boss) { AUDIO_PLAY_SFX(0x2903300E, boss->sfxSource, 4); boss->swork[3] -= boss->damage; boss->timer_054 = 20; - func_8007C120(boss->obj.pos.x, boss->obj.pos.y + 334.0f, -237.0f + boss->obj.pos.z, boss->vel.x, - boss->vel.y, boss->vel.z, 0.2f, 20); + func_effect_8007C120(boss->obj.pos.x, boss->obj.pos.y + 334.0f, -237.0f + boss->obj.pos.z, boss->vel.x, + boss->vel.y, boss->vel.z, 0.2f, 20); if (boss->swork[3] <= 0) { - func_8007BFFC(boss->obj.pos.x, boss->obj.pos.y + 300.0f, boss->obj.pos.z, 0.0f, 0.0f, 0.0f, 10.0f, - 50); + func_effect_8007BFFC(boss->obj.pos.x, boss->obj.pos.y + 300.0f, boss->obj.pos.z, 0.0f, 0.0f, 0.0f, + 10.0f, 50); - func_8007C120(boss->obj.pos.x, boss->obj.pos.y + 334.0f, -237.0f + boss->obj.pos.z, boss->vel.x, - boss->vel.y, boss->vel.z, 0.15f, 70); + func_effect_8007C120(boss->obj.pos.x, boss->obj.pos.y + 334.0f, -237.0f + boss->obj.pos.z, + boss->vel.x, boss->vel.y, boss->vel.z, 0.15f, 70); for (i = 0; i < 10; i++) { - func_800A69F8(4, boss->obj.pos.x, boss->obj.pos.y + 334.0f, -237.0f + boss->obj.pos.z); + func_play_800A69F8(4, boss->obj.pos.x, boss->obj.pos.y + 334.0f, -237.0f + boss->obj.pos.z); } - func_8007A6F0(&boss->obj.pos, 0x2940C00A); + func_effect_8007A6F0(&boss->obj.pos, 0x2940C00A); boss->state = 7; boss->timer_050 = 80; boss->swork[0] = 0; @@ -434,13 +430,13 @@ void func_i2_80190078(Boss* boss) { SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1); boss->timer_052 = 40; - D_Timer_80161A60 = 5; + D_play_Timer_80161A60 = 5; } } else { - func_8007A6F0(&boss->obj.pos, 0x29121007); + func_effect_8007A6F0(&boss->obj.pos, 0x29121007); } } else { - func_8007A6F0(&boss->obj.pos, 0x29121007); + func_effect_8007A6F0(&boss->obj.pos, 0x29121007); } if (boss->swork[0] == 2) { @@ -450,7 +446,7 @@ void func_i2_80190078(Boss* boss) { AUDIO_PLAY_SFX(0x2903300E, boss->sfxSource, 4); if (boss->health <= 0) { - D_8017796C = -1; + D_ctx_8017796C = -1; boss->obj.rot.y = Math_ModF(boss->obj.rot.y, 360.0f); boss->state = 20; boss->timer_050 = 300; @@ -459,33 +455,33 @@ void func_i2_80190078(Boss* boss) { Radio_PlayMessage(gMsg_ID_5499, RCID_BOSS_SECTORX); - func_8007BFFC(boss->obj.pos.x, boss->obj.pos.y + 300.0f, boss->obj.pos.z, 0.0f, 0.0f, 0.0f, 10.0f, - 50); + func_effect_8007BFFC(boss->obj.pos.x, boss->obj.pos.y + 300.0f, boss->obj.pos.z, 0.0f, 0.0f, 0.0f, + 10.0f, 50); - func_8007C120(boss->obj.pos.x, boss->obj.pos.y + 334.0f, -237.0f + boss->obj.pos.z, boss->vel.x, - boss->vel.y, boss->vel.z, 0.15f, 70); + func_effect_8007C120(boss->obj.pos.x, boss->obj.pos.y + 334.0f, -237.0f + boss->obj.pos.z, + boss->vel.x, boss->vel.y, boss->vel.z, 0.15f, 70); for (i = 0; i < 10; i++) { - func_800A69F8(4, boss->obj.pos.x, boss->obj.pos.y + 334.0f, -237.0f + boss->obj.pos.z); + func_play_800A69F8(4, boss->obj.pos.x, boss->obj.pos.y + 334.0f, -237.0f + boss->obj.pos.z); } boss->swork[4] = 2; AUDIO_PLAY_SFX(0x2940D09A, boss->sfxSource, 4); - D_Timer_80161A60 = 8; + D_play_Timer_80161A60 = 8; SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1); - func_80042EC0(boss); - boss->info.hitbox = D_800CBF34; + func_boss_80042EC0(boss); + boss->info.hitbox = D_edata_800CBF34; } boss->timer_054 = 20; boss->timer_05C = boss->timer_054; - func_8007C120(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, boss->vel.x, boss->vel.y, boss->vel.z, - 0.2f, 10); + func_effect_8007C120(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, boss->vel.x, boss->vel.y, + boss->vel.z, 0.2f, 10); } else { - func_8007A6F0(&boss->obj.pos, 0x29121007); + func_effect_8007A6F0(&boss->obj.pos, 0x29121007); } } } @@ -516,7 +512,7 @@ void func_i2_80190078(Boss* boss) { boss->health = 300; boss->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SX_6032550); gBossActive = 1; - AUDIO_PLAY_BGM(D_800C9E90[gCurrentLevel]); + AUDIO_PLAY_BGM(D_boss_800C9E90[gCurrentLevel]); boss->swork[6] = 1; boss->fwork[44] = 5.0f; boss->fwork[43] = 5.0f; @@ -531,16 +527,16 @@ void func_i2_80190078(Boss* boss) { if (fabsf(Math_SmoothStepToF(&boss->fwork[16], 0.0f, 0.1f, 10.0f, 0)) < 8.0f) { Math_SmoothStepToF(&boss->fwork[14], 0.0f, 0.2f, 10.0f, 0); if (!(boss->timer_050 & 7)) { - func_8007C120(boss->obj.pos.x + 312.0f, boss->obj.pos.y, boss->obj.pos.z - 173.0f, boss->vel.x, - boss->vel.y, boss->vel.z, 0.2f, 8); + func_effect_8007C120(boss->obj.pos.x + 312.0f, boss->obj.pos.y, boss->obj.pos.z - 173.0f, + boss->vel.x, boss->vel.y, boss->vel.z, 0.2f, 8); } } if (fabsf(Math_SmoothStepToF(&boss->fwork[19], 0.0f, 0.1f, 10.0f, 0)) < 8.0f) { Math_SmoothStepToF(&boss->fwork[17], 0.0f, 0.2f, 10.0f, 0); if (!(boss->timer_050 & 7)) { - func_8007C120(boss->obj.pos.x - 312.0f, boss->obj.pos.y, boss->obj.pos.z - 173.0f, boss->vel.x, - boss->vel.y, boss->vel.z, 0.2f, 8); + func_effect_8007C120(boss->obj.pos.x - 312.0f, boss->obj.pos.y, boss->obj.pos.z - 173.0f, + boss->vel.x, boss->vel.y, boss->vel.z, 0.2f, 8); } } @@ -706,14 +702,14 @@ void func_i2_80190078(Boss* boss) { sp74.y = boss->fwork[9] + boss->obj.pos.y; sp74.z = boss->fwork[10] + boss->obj.pos.z; - func_8005F0E8(D_i2_80195D88, &sp74); + func_edisplay_8005F0E8(D_i2_80195D88, &sp74); AUDIO_PLAY_SFX(0x31032061, D_i2_80195D88, 4); sp74.x = boss->fwork[11] + boss->obj.pos.x; sp74.y = boss->fwork[12] + boss->obj.pos.y; sp74.z = boss->fwork[13] + boss->obj.pos.z; - func_8005F0E8(D_i2_80195D98, &sp74); + func_edisplay_8005F0E8(D_i2_80195D98, &sp74); AUDIO_PLAY_SFX(0x31032061, D_i2_80195D98, 4); Math_SmoothStepToF(&boss->fwork[27], 30.0f, 0.05f, 1.0f, 0); @@ -842,7 +838,7 @@ void func_i2_80190078(Boss* boss) { boss->fwork[0] = 0.0f; boss->unk_04C = 0; boss->health = 300; - Audio_PlaySequenceDistorted(0, D_800C9E90[gCurrentLevel], 1121, 25, 255); + Audio_PlaySequenceDistorted(0, D_boss_800C9E90[gCurrentLevel], 1121, 25, 255); Radio_PlayMessage(gMsg_ID_19205, RCID_FOX); boss->timer_052 = 100; } @@ -930,7 +926,7 @@ void func_i2_80190078(Boss* boss) { } if (boss->unk_04C == 70) { - func_i2_8018FA04(boss->fwork[11] + boss->obj.pos.x, boss->fwork[12] + boss->obj.pos.y, + SectorX_8018FA04(boss->fwork[11] + boss->obj.pos.x, boss->fwork[12] + boss->obj.pos.y, boss->fwork[13] + boss->obj.pos.z); AUDIO_PLAY_SFX(0x2902401C, boss->sfxSource, 4); } @@ -967,7 +963,7 @@ void func_i2_80190078(Boss* boss) { } } else { boss->state = 85; - func_i2_8018F030(); + SectorX_8018F030(); boss->timer_050 = 100; } } @@ -1019,7 +1015,7 @@ void func_i2_80190078(Boss* boss) { boss->state = 9; } else { boss->state = 85; - func_i2_8018F030(); + SectorX_8018F030(); boss->timer_050 = 100; } } @@ -1043,9 +1039,9 @@ void func_i2_80190078(Boss* boss) { } if (!(boss->timer_050 & 3)) { - func_8007D2C8(RAND_FLOAT_CENTERED(500.0f) + boss->obj.pos.x, - RAND_FLOAT_CENTERED(500.0f) + boss->obj.pos.y, boss->obj.pos.z + 100.0f, - RAND_FLOAT(5.0f) + 5.0f); + func_effect_8007D2C8(RAND_FLOAT_CENTERED(500.0f) + boss->obj.pos.x, + RAND_FLOAT_CENTERED(500.0f) + boss->obj.pos.y, boss->obj.pos.z + 100.0f, + RAND_FLOAT(5.0f) + 5.0f); } if ((!(gGameFrameCount & 7)) && (Rand_ZeroOne() < 0.5f)) { @@ -1053,8 +1049,8 @@ void func_i2_80190078(Boss* boss) { } if (!(boss->timer_050 & 3)) { - func_8007C120(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, boss->vel.x, boss->vel.y, boss->vel.z, - 0.3f, 10); + func_effect_8007C120(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, boss->vel.x, boss->vel.y, + boss->vel.z, 0.3f, 10); } if (boss->timer_050 < 230) { @@ -1064,8 +1060,8 @@ void func_i2_80190078(Boss* boss) { if (boss->timer_050 == 230) { gShowBossHealth = 0; - func_8007BFFC(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 0.0f, 0.0f, 0.0f, 30.0f, 40); - func_8007A568(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 40.0f); + func_effect_8007BFFC(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 0.0f, 0.0f, 0.0f, 30.0f, 40); + func_effect_8007A568(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 40.0f); } if (boss->timer_050 == 210) { @@ -1080,7 +1076,7 @@ void func_i2_80190078(Boss* boss) { gPlayer[0].unk_234 = 1; } Object_Kill(&boss->obj, boss->sfxSource); - D_80177930 = boss->swork[6]; + D_ctx_80177930 = boss->swork[6]; } break; @@ -1090,7 +1086,7 @@ void func_i2_80190078(Boss* boss) { D_i2_80195640 = 1; - Animation_DrawSkeleton(1, D_SX_6020C68, boss->vwork, func_i2_80192AF0, func_i2_80193208, boss, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_SX_6020C68, boss->vwork, SectorX_80192AF0, SectorX_80193208, boss, &gIdentityMatrix); if (((boss->swork[1] != 0) && (boss->swork[3] > 0)) && ((boss->fwork[4] < 45.0f) || (boss->fwork[4] > 315.0f))) { boss->swork[1]++; @@ -1098,10 +1094,10 @@ void func_i2_80190078(Boss* boss) { if (boss->swork[1] > 50) { boss->swork[1] = 0; } - func_8007F11C(377, boss->fwork[20] + boss->obj.pos.x, boss->fwork[21] + boss->obj.pos.y, - boss->fwork[22] + boss->obj.pos.z, 100.0f); - func_8007F11C(377, boss->fwork[23] + boss->obj.pos.x, boss->fwork[24] + boss->obj.pos.y, - boss->fwork[25] + boss->obj.pos.z, 100.0f); + func_effect_8007F11C(377, boss->fwork[20] + boss->obj.pos.x, boss->fwork[21] + boss->obj.pos.y, + boss->fwork[22] + boss->obj.pos.z, 100.0f); + func_effect_8007F11C(377, boss->fwork[23] + boss->obj.pos.x, boss->fwork[24] + boss->obj.pos.y, + boss->fwork[25] + boss->obj.pos.z, 100.0f); } } else { boss->swork[1] = 0; @@ -1148,13 +1144,13 @@ void func_i2_80190078(Boss* boss) { } } -s32 func_i2_80192AF0(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4) { +bool SectorX_80192AF0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { Vec3f sp64 = { 0.0f, 0.0f, 0.0f }; Vec3f sp58; - Boss* boss = (Boss*) arg4; + Boss* boss = (Boss*) data; if (D_i2_80195640 != 0) { - *arg1 = NULL; + *dList = NULL; } if (!(boss->timer_05C & 1)) { @@ -1164,33 +1160,33 @@ s32 func_i2_80192AF0(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4) gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 0, 0, 255); } - switch (arg0) { + switch (limbIndex) { case 1: - arg3->x += boss->fwork[4] + boss->fwork[5]; - arg3->z += boss->fwork[6] + boss->fwork[7]; + rot->x += boss->fwork[4] + boss->fwork[5]; + rot->z += boss->fwork[6] + boss->fwork[7]; if (boss->timer_054 & 1) { RCP_SetupDL_27(); gDPSetPrimColor(gMasterDisp++, 0, 0, 64, 64, 255, 255); } if (boss->swork[4] == 1) { - *arg1 = D_SX_6006810; + *dList = D_SX_6006810; } else if (boss->swork[4] == 2) { - *arg1 = NULL; + *dList = NULL; } - Matrix_Translate(gCalcMatrix, arg2->x, arg2->y, arg2->z, 1); - Matrix_RotateZ(gCalcMatrix, arg3->z * M_DTOR, 1); - Matrix_RotateY(gCalcMatrix, arg3->y * M_DTOR, 1); - Matrix_RotateX(gCalcMatrix, arg3->x * M_DTOR, 1); + Matrix_Translate(gCalcMatrix, pos->x, pos->y, pos->z, 1); + Matrix_RotateZ(gCalcMatrix, rot->z * M_DTOR, 1); + Matrix_RotateY(gCalcMatrix, rot->y * M_DTOR, 1); + Matrix_RotateX(gCalcMatrix, rot->x * M_DTOR, 1); - if (*arg1 != NULL) { + if (*dList != NULL) { Matrix_Push(&gGfxMatrix); Matrix_Push(&gCalcMatrix); Matrix_MultVec3f(gCalcMatrix, &sp64, &sp58); - func_8005F670(&sp58); + func_edisplay_8005F670(&sp58); Matrix_Mult(gGfxMatrix, gCalcMatrix, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, *arg1); + gSPDisplayList(gMasterDisp++, *dList); if (boss->swork[4] == 0) { RCP_SetupDL(&gMasterDisp, 0x29); if (!(gGameFrameCount & 1)) { @@ -1223,42 +1219,42 @@ s32 func_i2_80192AF0(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4) return 1; case 34: - arg3->x += boss->fwork[27]; + rot->x += boss->fwork[27]; break; case 33: - arg2->z -= boss->fwork[31]; - arg2->y -= boss->fwork[29]; - arg2->x -= boss->fwork[30]; + pos->z -= boss->fwork[31]; + pos->y -= boss->fwork[29]; + pos->x -= boss->fwork[30]; break; case 38: - arg3->x += boss->fwork[28]; + rot->x += boss->fwork[28]; break; case 37: - arg2->z += boss->fwork[34]; - arg2->y += boss->fwork[32]; - arg2->x -= boss->fwork[33]; + pos->z += boss->fwork[34]; + pos->y += boss->fwork[32]; + pos->x -= boss->fwork[33]; break; case 35: - arg2->x -= boss->fwork[14]; - arg2->y -= boss->fwork[16]; - arg2->z -= boss->fwork[15]; + pos->x -= boss->fwork[14]; + pos->y -= boss->fwork[16]; + pos->z -= boss->fwork[15]; if (boss->state == 20) { - arg3->x += boss->fwork[14] * 0.2f; - arg3->y += boss->fwork[14] * 0.1f; + rot->x += boss->fwork[14] * 0.2f; + rot->y += boss->fwork[14] * 0.1f; } break; case 39: - arg2->x += boss->fwork[17]; - arg2->y -= boss->fwork[19]; - arg2->z += boss->fwork[18]; + pos->x += boss->fwork[17]; + pos->y -= boss->fwork[19]; + pos->z += boss->fwork[18]; if (boss->state == 20) { - arg3->x += boss->fwork[17] * 0.1f; - arg3->z += boss->fwork[17] * 0.2f; + rot->x += boss->fwork[17] * 0.1f; + rot->z += boss->fwork[17] * 0.2f; } break; } @@ -1266,7 +1262,7 @@ s32 func_i2_80192AF0(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4) return 0; } -void func_i2_80193208(s32 limbIndex, Vec3f* rot, void* data) { +void SectorX_80193208(s32 limbIndex, Vec3f* rot, void* data) { Vec3f sp64 = { 87.0f, -323.0f, 200.0f }; Vec3f sp58 = { 87.0f, -323.0f, -200.0f }; Vec3f sp4C = { 87.0f, -323.0f, 200.0f }; @@ -1343,12 +1339,12 @@ f32 D_i2_80195760[4] = { -250.0f, -200.0f, -400.0f, -8000.0f }; f32 D_i2_80195770[3] = { 120.0f, 180.0f, -150.0f }; s16 D_i2_8019577C[3] = { 2, 3, 4 }; -void func_i2_80193434(Boss* boss) { +void SectorX_80193434(Boss* boss) { f32 fwork; if (boss->swork[5] == 0) { D_i2_80195640 = 0; - Animation_DrawSkeleton(3, D_SX_6020C68, boss->vwork, func_i2_80192AF0, 0, boss, gCalcMatrix); + Animation_DrawSkeleton(3, D_SX_6020C68, boss->vwork, SectorX_80192AF0, 0, boss, gCalcMatrix); RCP_SetupDL_64(); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 96); @@ -1412,7 +1408,7 @@ void func_i2_80193434(Boss* boss) { } } -void func_i2_80193800(Actor* actor, s32 arg1) { +void SectorX_80193800(Actor* actor, s32 arg1) { Actor_Initialize(actor); actor->obj.status = OBJ_ACTIVE; @@ -1429,7 +1425,7 @@ void func_i2_80193800(Actor* actor, s32 arg1) { AUDIO_PLAY_SFX(0x31000011, actor->sfxSource, 4); } -void func_i2_801938D8(Actor* actor, s32 arg1) { +void SectorX_801938D8(Actor* actor, s32 arg1) { Actor_Initialize(actor); actor->obj.status = OBJ_ACTIVE; actor->obj.id = OBJ_ACTOR_195; @@ -1450,7 +1446,7 @@ void func_i2_801938D8(Actor* actor, s32 arg1) { AUDIO_PLAY_SFX(0x09000002, actor->sfxSource, 0); } -void func_i2_80193A30(Player* player) { +void SectorX_80193A30(Player* player) { s32 i; Vec3f src; Vec3f dest; @@ -1464,7 +1460,7 @@ void func_i2_80193A30(Player* player) { case 0: gCsFrameCount = 0; for (i = 0; i < 5; i++) { - func_i2_80193800(&gActors[5 + i], i); + SectorX_80193800(&gActors[5 + i], i); } player->unk_1D0 = 1; player->camEye.x = gCsCamEyeX = 100.0f; @@ -1475,13 +1471,13 @@ void func_i2_80193A30(Player* player) { player->camAt.z = gCsCamAtZ = -1000.0f; player->unk_034 = -5.0f; player->unk_0D0 = 0.0f; - D_80178340 = 255; + D_ctx_80178340 = 255; /* fallthrough */ case 1: if (gCsFrameCount < 3) { - D_80178340 = 255; + D_ctx_80178340 = 255; } - D_80177A48[0] = 0.5f; + D_ctx_80177A48[0] = 0.5f; gCsCamAtX = gActors[5].obj.pos.x; gCsCamAtZ = gActors[5].obj.pos.z; player->unk_034 -= 0.1f; @@ -1496,22 +1492,22 @@ void func_i2_80193A30(Player* player) { src.y = src.x = 0.0f; src.z = 100.0f; Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &dest); - func_8006EEFC(100, 0.0f, player->camEye.y + 50.0f, player->camEye.z + 20.0f, dest.x, dest.y, dest.z, - xyzDeg, xzDeg, 0.0f); + func_enmy2_8006EEFC(100, 0.0f, player->camEye.y + 50.0f, player->camEye.z + 20.0f, dest.x, dest.y, + dest.z, xyzDeg, xzDeg, 0.0f); } if (gCsFrameCount == 143) { Object_Kill(&gPlayerShots[0].obj, gPlayerShots[0].sfxSource); - func_8007BFFC(gActors[5].obj.pos.x, gActors[5].obj.pos.y, gActors[5].obj.pos.z, 0.0f, 0.0f, 0.0f, 3.0f, - 40); - func_8007D2C8(gActors[5].obj.pos.x, gActors[5].obj.pos.y, gActors[5].obj.pos.z, 6.0f); - func_8007B344(gActors[5].obj.pos.x, gActors[5].obj.pos.y, gActors[5].obj.pos.z, 5.0f, 5); + func_effect_8007BFFC(gActors[5].obj.pos.x, gActors[5].obj.pos.y, gActors[5].obj.pos.z, 0.0f, 0.0f, 0.0f, + 3.0f, 40); + func_effect_8007D2C8(gActors[5].obj.pos.x, gActors[5].obj.pos.y, gActors[5].obj.pos.z, 6.0f); + func_effect_8007B344(gActors[5].obj.pos.x, gActors[5].obj.pos.y, gActors[5].obj.pos.z, 5.0f, 5); Object_Kill(&gActors[5].obj, gActors[5].sfxSource); for (i = 0; i < 20; i++) { - func_80079618(gActors[5].obj.pos.x, gActors[5].obj.pos.y, gActors[5].obj.pos.z, 0.5f); + func_effect_80079618(gActors[5].obj.pos.x, gActors[5].obj.pos.y, gActors[5].obj.pos.z, 0.5f); } - func_8007A6F0(&gActors[5].obj.pos, 0x2903B009); + func_effect_8007A6F0(&gActors[5].obj.pos, 0x2903B009); player->unk_1D0 += 1; - D_80177A48[0] = 0.1f; + D_ctx_80177A48[0] = 0.1f; } break; @@ -1530,7 +1526,7 @@ void func_i2_80193A30(Player* player) { for (i = 6; i < 10; i++) { Object_Kill(&gActors[i].obj, gActors[i].sfxSource); } - D_80177A48[0] = 0.0f; + D_ctx_80177A48[0] = 0.0f; } break; @@ -1539,7 +1535,7 @@ void func_i2_80193A30(Player* player) { gCsCamAtX = player->pos.x; gCsCamAtY = player->pos.y; gCsCamAtZ = player->pos.z; - Math_SmoothStepToF(D_80177A48, 0.1f, 1.0f, 0.01f, 0); + Math_SmoothStepToF(D_ctx_80177A48, 0.1f, 1.0f, 0.01f, 0); } Math_SmoothStepToF(&player->unk_034, 0.0f, 0.5f, 0.07f, 0); @@ -1549,17 +1545,17 @@ void func_i2_80193A30(Player* player) { switch (gCsFrameCount) { case 195: if (gTeamShields[1] > 0) { - func_i2_801938D8(&gActors[0], 0); + SectorX_801938D8(&gActors[0], 0); } break; case 213: if (gTeamShields[2] > 0) { - func_i2_801938D8(&gActors[1], 1); + SectorX_801938D8(&gActors[1], 1); } break; case 229: if (gTeamShields[3] > 0) { - func_i2_801938D8(&gActors[2], 2); + SectorX_801938D8(&gActors[2], 2); } break; } @@ -1567,7 +1563,7 @@ void func_i2_80193A30(Player* player) { if (gCsFrameCount >= 301) { player->unk_1D0 += 1; player->timer_1F8 = 40; - D_80177A48[0] = 0.0f; + D_ctx_80177A48[0] = 0.0f; gActors[0].obj.pos.z -= player->pos.z; gActors[1].obj.pos.z -= player->pos.z; gActors[2].obj.pos.z -= player->pos.z; @@ -1590,12 +1586,12 @@ void func_i2_80193A30(Player* player) { gCsCamAtX = player->pos.x; gCsCamAtY = (player->pos.y * player->unk_148) + 20.0f; gCsCamAtZ = player->unk_138; - Math_SmoothStepToF(D_80177A48, 1.0f, 1.0f, 0.01f, 0); + Math_SmoothStepToF(D_ctx_80177A48, 1.0f, 1.0f, 0.01f, 0); if (player->timer_1F8 == 0) { - player->unk_0D0 = D_80161A54; - AUDIO_PLAY_BGM(D_80177C90); - D_80177838 = 80; + player->unk_0D0 = D_play_80161A54; + AUDIO_PLAY_BGM(D_ctx_80177C90); + D_ctx_80177838 = 80; player->state_1C8 = PLAYERSTATE_1C8_3; player->unk_1D0 = player->timer_1F8 = player->timer_1FC = 0; player->camEye.y = player->pos.y * player->unk_148 + 50.0f; @@ -1603,19 +1599,19 @@ void func_i2_80193A30(Player* player) { player->camAt.y = player->pos.y * player->unk_148 + 20.0f; player->camAt.z = player->unk_138; player->camAt.x = player->camEye.x = player->pos.x; - D_80178488 = 1; + D_ctx_80178488 = 1; for (i = 0; i < 3; i++) { Object_Kill(&gActors[i].obj, gActors[i].sfxSource); } } break; } - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 20000.0f, 0); - Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 20000.0f, 0); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 20000.0f, 0); - Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 20000.0f, 0); - Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 20000.0f, 0); - Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_ctx_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_ctx_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_ctx_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_ctx_80177A48[0], 20000.0f, 0); Matrix_RotateY(gCalcMatrix, (player->unk_0E8 + 180.0f) * M_DTOR, 0); Matrix_RotateX(gCalcMatrix, -(player->unk_0E4 * M_DTOR), 1); src.x = 0.0f; @@ -1631,7 +1627,7 @@ void func_i2_80193A30(Player* player) { player->unk_138 = player->pos.z + player->unk_08C; } -void func_i2_801944D4(Actor* actor, s32 arg1) { +void SectorX_801944D4(Actor* actor, s32 arg1) { Vec3f srcA; Vec3f destA; Vec3f srcB; @@ -1677,7 +1673,7 @@ void func_i2_801944D4(Actor* actor, s32 arg1) { } } -void func_i2_80194728(Player* player) { +void SectorX_80194728(Player* player) { Vec3f sp54; Vec3f sp48; s32 pad[5]; @@ -1692,55 +1688,57 @@ void func_i2_80194728(Player* player) { Math_SmoothStepToAngle(&player->unk_4D8, 0.0f, 0.1f, 20.0f, 0.0f); Math_SmoothStepToF(&player->unk_110, 0.0f, 0.1f, 3.0f, 0.0f); - D_80178430 += 0.2f; - D_8017842C -= 0.2f; + D_ctx_80178430 += 0.2f; + D_ctx_8017842C -= 0.2f; switch (player->unk_1D0) { case 0: Audio_StopSfxByBankAndSource(1, player->sfxSource); player->unk_1D0 += 1; - D_80177A48[1] = 0.05f; - D_80177A48[0] = 0.02f; - D_80177A48[2] = 0.0f; - D_80177A48[3] = D_80177A48[2]; + D_ctx_80177A48[1] = 0.05f; + D_ctx_80177A48[0] = 0.02f; + D_ctx_80177A48[2] = 0.0f; + D_ctx_80177A48[3] = D_ctx_80177A48[2]; gCsFrameCount = 0; - D_80177A48[2] = 100.0f; - D_80177A48[4] = 100.0f; - D_80177A48[5] = 0.0f; + D_ctx_80177A48[2] = 100.0f; + D_ctx_80177A48[4] = 100.0f; + D_ctx_80177A48[5] = 0.0f; player->wings.unk_2C = 1; - func_800A6148(); + func_play_800A6148(); case 1: if (gCsFrameCount >= 991) { - Math_SmoothStepToF(D_80177A48 + 3, 0.0f, 0.1f, 0.01f, 0.0f); + Math_SmoothStepToF(D_ctx_80177A48 + 3, 0.0f, 0.1f, 0.01f, 0.0f); } else if (gCsFrameCount >= 121) { - Math_SmoothStepToF(D_80177A48 + 3, -0.5f, 0.1f, 0.02f, 0.0f); - Math_SmoothStepToF(D_80177A48 + 4, 300.0f, 0.1f, 2.0f, 0.0f); - Math_SmoothStepToF(D_80177A48 + 5, -50.0f, 0.1f, 1.0f, 0.0f); + Math_SmoothStepToF(D_ctx_80177A48 + 3, -0.5f, 0.1f, 0.02f, 0.0f); + Math_SmoothStepToF(D_ctx_80177A48 + 4, 300.0f, 0.1f, 2.0f, 0.0f); + Math_SmoothStepToF(D_ctx_80177A48 + 5, -50.0f, 0.1f, 1.0f, 0.0f); } - D_80177A48[2] += D_80177A48[3]; + D_ctx_80177A48[2] += D_ctx_80177A48[3]; Math_SmoothStepToF(&player->unk_0D0, 0.0f, 0.1f, 2.0f, 0.0f); - Math_SmoothStepToF(D_80177A48, 0.1f, 1.0f, 0.002f, 0.0f); - Math_SmoothStepToF(D_80177A48 + 1, 0.1f, 1.0f, 0.002f, 0.0f); + Math_SmoothStepToF(D_ctx_80177A48, 0.1f, 1.0f, 0.002f, 0.0f); + Math_SmoothStepToF(D_ctx_80177A48 + 1, 0.1f, 1.0f, 0.002f, 0.0f); Matrix_RotateY(gCalcMatrix, player->unk_0E8 * M_DTOR, 0); Matrix_RotateX(gCalcMatrix, player->unk_0E4 * M_DTOR, 1); Matrix_Push(&gCalcMatrix); - Matrix_RotateY(gCalcMatrix, D_80177A48[2] * M_DTOR, 1); + Matrix_RotateY(gCalcMatrix, D_ctx_80177A48[2] * M_DTOR, 1); sp54.x = 0.0f; sp54.y = 30.0f; - sp54.z = D_80177A48[4]; + sp54.z = D_ctx_80177A48[4]; Matrix_MultVec3f(gCalcMatrix, &sp54, &sp48); - Math_SmoothStepToF(&player->camEye.x, player->pos.x + sp48.x, D_80177A48[0], 500.0f, 0.0f); - Math_SmoothStepToF(&player->camEye.y, player->pos.y + sp48.y, D_80177A48[0], 500.0f, 0.0f); - Math_SmoothStepToF(&player->camEye.z, player->unk_138 + D_80177D20 + sp48.z, D_80177A48[0], 500.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.x, player->pos.x + sp48.x, D_ctx_80177A48[0], 500.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.y, player->pos.y + sp48.y, D_ctx_80177A48[0], 500.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.z, player->unk_138 + D_ctx_80177D20 + sp48.z, D_ctx_80177A48[0], 500.0f, + 0.0f); Matrix_Pop(&gCalcMatrix); sp54.x = 0.0f; sp54.y = 0; - sp54.z = D_80177A48[5]; + sp54.z = D_ctx_80177A48[5]; Matrix_MultVec3f(gCalcMatrix, &sp54, &sp48); - Math_SmoothStepToF(&player->camAt.x, player->pos.x + sp48.x, D_80177A48[1], 500.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.y, player->pos.y + sp48.y, D_80177A48[1], 500.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.z, player->unk_138 + D_80177D20 + sp48.z, D_80177A48[1], 500.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.x, player->pos.x + sp48.x, D_ctx_80177A48[1], 500.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.y, player->pos.y + sp48.y, D_ctx_80177A48[1], 500.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.z, player->unk_138 + D_ctx_80177D20 + sp48.z, D_ctx_80177A48[1], 500.0f, + 0.0f); break; case 2: player->unk_0D0 += 2.0f; @@ -1753,14 +1751,14 @@ void func_i2_80194728(Player* player) { } if (gCsFrameCount >= 1196) { - D_80178348 = D_80178350 = D_80178354 = 0; - D_80178358 = 255; - if (D_80178340 == 255) { + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; + D_ctx_80178358 = 255; + if (D_ctx_80178340 == 255) { player->state_1C8 = PLAYERSTATE_1C8_6; - D_8017837C = 4; + D_ctx_8017837C = 4; player->timer_1F8 = 0; - func_800A6148(); - D_800D3180[LEVEL_SECTOR_X] = Play_CheckMedalStatus(150) + 1; + func_play_800A6148(); + D_play_800D3180[LEVEL_SECTOR_X] = Play_CheckMedalStatus(150) + 1; } } break; @@ -1768,22 +1766,22 @@ void func_i2_80194728(Player* player) { switch (gCsFrameCount) { case 706: - D_80177830 = 1; + D_ctx_80177830 = 1; break; case 906: - D_80177830 = 0; + D_ctx_80177830 = 0; break; case 100: if (gTeamShields[1] > 0) { - func_i2_801944D4(&gActors[1], 0); + SectorX_801944D4(&gActors[1], 0); } if (gTeamShields[2] > 0) { - func_i2_801944D4(&gActors[2], 1); + SectorX_801944D4(&gActors[2], 1); } if (gTeamShields[3] > 0) { - func_i2_801944D4(&gActors[3], 2); + SectorX_801944D4(&gActors[3], 2); } break; @@ -1792,7 +1790,7 @@ void func_i2_80194728(Player* player) { break; case 60: - D_80177840 = 100; + D_ctx_80177840 = 100; break; case 910: @@ -1801,7 +1799,7 @@ void func_i2_80194728(Player* player) { case 920: gActors[1].iwork[14] = gActors[2].iwork[14] = gActors[3].iwork[14] = 0; - func_i2_801944D4(&gActors[0], 3); + SectorX_801944D4(&gActors[0], 3); AUDIO_PLAY_SFX(0x11030010, gActors[0].sfxSource, 0); break; @@ -1844,7 +1842,7 @@ void func_i2_80194728(Player* player) { break; default: - func_80048AC0(2); + func_demo_80048AC0(2); break; } break; @@ -1860,13 +1858,13 @@ void func_i2_80194728(Player* player) { break; default: - func_80048AC0(3); + func_demo_80048AC0(3); break; } break; case 521: - func_80048AC0(1); + func_demo_80048AC0(1); switch (gTeamShields[1]) { case -1: Radio_PlayMessage(gMsg_ID_20337, RCID_ROB64); @@ -1877,7 +1875,7 @@ void func_i2_80194728(Player* player) { break; default: - func_80048AC0(1); + func_demo_80048AC0(1); break; } break; @@ -1909,7 +1907,7 @@ void func_i2_80194728(Player* player) { break; case 569: - func_80048AC0(1); + func_demo_80048AC0(1); switch (gTeamShields[1]) { case -1: Radio_PlayMessage(gMsg_ID_20337, RCID_ROB64); diff --git a/src/overlays/ovl_i3/fox_a6.c b/src/overlays/ovl_i3/fox_a6.c index c8f0ea5c..97a77614 100644 --- a/src/overlays/ovl_i3/fox_a6.c +++ b/src/overlays/ovl_i3/fox_a6.c @@ -7,13 +7,10 @@ #include "global.h" #include "assets/ast_area_6.h" -void func_i3_8018A1B0(Boss* bossA6, s32 arg1); -void func_i3_8018A2C4(Boss* bossA6); -void func_i3_8018A464(Boss* bossA6, s32 arg1); -void func_i3_8018B9BC(Boss* bossA6); -void func_i3_8018BCD4(Vec3f* arg0, f32 arg1, f32 arg2, Vec3f* arg3, s32 arg4, f32 arg5, s32 arg6, f32 arg7); -void func_i3_8018C0D0(f32* arg0, f32 arg1, Vec3f* arg2, f32 arg3, s32 arg4); -void func_i3_8018C54C(Boss* bossA6); +void Area6_8018A1B0(Boss* bossA6, s32 arg1); +void Area6_8018A2C4(Boss* bossA6); +void Area6_8018A464(Boss* bossA6, s32 arg1); +void Area6_8018B9BC(Boss* bossA6); // f32 bossA6hit1[] = { // 10.0f, @@ -442,8 +439,8 @@ f32 D_i3_801BF494[12] = { -90.0f, 30.0f, 26.0f, 22.0f, 18.0f, 11.0f, 8.0f, 5.0f, 3.0f, 2.0f, 1.0f, 0.0f, }; -void func_i3_80187530(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 fwork6, f32 xRot, f32 yRot, s32 timer0BC, - s32 unk0B4) { +void Area6_80187530(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 fwork6, f32 xRot, f32 yRot, s32 timer0BC, + s32 unk0B4) { (void) "おん\n"; (void) "おふ\n"; @@ -460,23 +457,23 @@ void func_i3_80187530(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 fwork6, f3 actor->unk_0B4 = unk0B4; actor->fwork[5] = fwork6; Object_SetInfo(&actor->info, actor->obj.id); - func_8007A6F0(&actor->obj.pos, 0x2903201B); + func_effect_8007A6F0(&actor->obj.pos, 0x2903201B); } -void func_i3_801875E4(f32 xPos, f32 yPos, f32 zPos, f32 fwork6, f32 xRot, f32 yRot, s32 timer0BC, s32 unk0B4) { +void Area6_801875E4(f32 xPos, f32 yPos, f32 zPos, f32 fwork6, f32 xRot, f32 yRot, s32 timer0BC, s32 unk0B4) { s32 i; Actor* actor; for (i = 0, actor = gActors; i < ARRAY_COUNT(gActors); i++, actor++) { if (actor->obj.status == OBJ_FREE) { - func_i3_80187530(actor, xPos, yPos, zPos, fwork6, xRot, yRot, timer0BC, unk0B4); + Area6_80187530(actor, xPos, yPos, zPos, fwork6, xRot, yRot, timer0BC, unk0B4); D_i3_801C2250[A6_BSS_11] = i + 1; break; } } } -void func_i3_8018767C(Effect* effect) { +void Area6_8018767C(Effect* effect) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_395; @@ -488,23 +485,23 @@ void func_i3_8018767C(Effect* effect) { Object_SetInfo(&effect->info, effect->obj.id); } -void func_i3_80187704(void) { +void Area6_80187704(void) { s32 i; for (i = 0; i < ARRAY_COUNT(gEffects); i++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i3_8018767C(&gEffects[i]); + Area6_8018767C(&gEffects[i]); break; } } } -void func_i3_80187754(Boss* bossA6) { +void Area6_80187754(Boss* bossA6) { Hitbox* hitbox; s32 i; gBossActive = 1; - D_80161A44 = 25000.0f; + D_game_80161A44 = 25000.0f; gBossFrameCount = 0; bossA6->health = 780; bossA6->fwork[A6_FWK_2] = bossA6->fwork[A6_FWK_34] = 2.0f; @@ -538,7 +535,7 @@ void func_i3_80187754(Boss* bossA6) { #ifdef NON_MATCHING // var_s0 = D_i3_801C2250[A6_BSS_9]; is using the wrong variable, but unclear what correct one is. // https://decomp.me/scratch/P3kGr -void func_i3_80187944(Boss* bossA6) { +void Area6_80187944(Boss* bossA6) { s32 i; s32 pad; s32 var_s0; @@ -561,10 +558,11 @@ void func_i3_80187944(Boss* bossA6) { gBossFrameCount++; if ((bossA6->state < 6) || ((bossA6->state >= 8) && (bossA6->state < 12))) { bossA6->obj.rot.y = RAD_TO_DEG(Math_Atan2F(gPlayer[0].camEye.x - bossA6->obj.pos.x, - gPlayer[0].camEye.z - (bossA6->obj.pos.z + D_80177D20))); - bossA6->obj.rot.x = RAD_TO_DEG(-Math_Atan2F(gPlayer[0].camEye.y - bossA6->obj.pos.y, - sqrtf(SQ(gPlayer[0].camEye.z - (bossA6->obj.pos.z + D_80177D20)) + - SQ(gPlayer[0].camEye.x - bossA6->obj.pos.x)))); + gPlayer[0].camEye.z - (bossA6->obj.pos.z + D_ctx_80177D20))); + bossA6->obj.rot.x = + RAD_TO_DEG(-Math_Atan2F(gPlayer[0].camEye.y - bossA6->obj.pos.y, + sqrtf(SQ(gPlayer[0].camEye.z - (bossA6->obj.pos.z + D_ctx_80177D20)) + + SQ(gPlayer[0].camEye.x - bossA6->obj.pos.x)))); } Matrix_RotateY(gCalcMatrix, bossA6->obj.rot.y * M_DTOR, 0); Matrix_RotateX(gCalcMatrix, bossA6->obj.rot.x * M_DTOR, 1); @@ -583,10 +581,10 @@ void func_i3_80187944(Boss* bossA6) { } if (bossA6->health <= 0) { bossA6->health = 0; - func_80042EC0(bossA6); + func_boss_80042EC0(bossA6); Radio_PlayMessage(gMsg_ID_15252, RCID_SLIPPY); - D_8017796C = -1; - D_8015F984 = (D_80177D20 * 0.00004f) + 0.5f; + D_ctx_8017796C = -1; + D_bg_8015F984 = (D_ctx_80177D20 * 0.00004f) + 0.5f; AUDIO_PLAY_SFX(0x2940D09A, bossA6->sfxSource, 4); gShowBossHealth = 0; SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 40); @@ -599,14 +597,14 @@ void func_i3_80187944(Boss* bossA6) { Matrix_MultVec3f(gCalcMatrix, &D_i3_801BECEC, &spA4[1]); Matrix_MultVec3f(gCalcMatrix, &D_i3_801BECF8, &spA4[2]); for (i = 0; i < 3; i++) { - func_8007D0E0(spA4[i].x + bossA6->obj.pos.x, spA4[i].y + bossA6->obj.pos.y, - spA4[i].z + bossA6->obj.pos.z, 10.0f); + func_effect_8007D0E0(spA4[i].x + bossA6->obj.pos.x, spA4[i].y + bossA6->obj.pos.y, + spA4[i].z + bossA6->obj.pos.z, 10.0f); } bossA6->timer_052 = 170; D_i3_801C2250[A6_BSS_2_0] = D_i3_801C2250[A6_BSS_2_1] = D_i3_801C2250[A6_BSS_2_2] = bossA6->swork[A6_SWK_33 + 0] = bossA6->swork[A6_SWK_33 + 1] = bossA6->swork[A6_SWK_33 + 2] = 0; - D_Timer_80161A60 = 4; + D_play_Timer_80161A60 = 4; bossA6->state = 11; AUDIO_PLAY_SFX(0x2940C00A, bossA6->sfxSource, 4); AUDIO_PLAY_SFX(0x3143402E, bossA6->sfxSource, 4); @@ -614,11 +612,11 @@ void func_i3_80187944(Boss* bossA6) { } if (((bossA6->dmgPart == 4) || (bossA6->dmgPart == 5) || (bossA6->dmgPart == 6)) && (bossA6->swork[A6_SWK_25] != 0)) { - func_i3_8018B9BC(bossA6); + Area6_8018B9BC(bossA6); } } if ((bossA6->dmgPart == 1) || (bossA6->dmgPart == 2) || (bossA6->dmgPart == 3)) { - func_i3_8018A2C4(bossA6); + Area6_8018A2C4(bossA6); } if (bossA6->dmgPart >= 7) { AUDIO_PLAY_SFX(0x29121007, bossA6->sfxSource, 4); @@ -635,8 +633,8 @@ void func_i3_80187944(Boss* bossA6) { } if ((bossA6->swork[A6_SWK_15 + 0] == 0) && (bossA6->swork[A6_SWK_15 + 1] == 0) && (bossA6->swork[A6_SWK_15 + 2] == 0) && (bossA6->fwork[A6_FWK_0] != 0) && !(gGameFrameCount & 1)) { - func_8007C120(bossA6->obj.pos.x, bossA6->obj.pos.y, bossA6->obj.pos.z + 200.0f, bossA6->vel.x, bossA6->vel.y, - bossA6->vel.z, 0.3f, 1); + func_effect_8007C120(bossA6->obj.pos.x, bossA6->obj.pos.y, bossA6->obj.pos.z + 200.0f, bossA6->vel.x, + bossA6->vel.y, bossA6->vel.z, 0.3f, 1); } sp120 = 0.5f; if (gBosses[0].swork[A6_SWK_25] == 1) { @@ -676,7 +674,7 @@ void func_i3_80187944(Boss* bossA6) { } if (bossA6->state != 0) { Math_SmoothStepToF(&bossA6->fwork[A6_FWK_4], bossA6->fwork[A6_FWK_5], 0.1f, 2.0f, 0.00001f); - Math_SmoothStepToF(&bossA6->obj.pos.z, gPlayer[0].camEye.z - D_80177D20 + bossA6->fwork[A6_FWK_3], 0.1f, + Math_SmoothStepToF(&bossA6->obj.pos.z, gPlayer[0].camEye.z - D_ctx_80177D20 + bossA6->fwork[A6_FWK_3], 0.1f, bossA6->fwork[A6_FWK_4], 0.00001f); if (bossA6->state < 5) { sp120 = 2.0f; @@ -705,9 +703,9 @@ void func_i3_80187944(Boss* bossA6) { bossA6->obj.rot.z = Math_ModF(bossA6->obj.rot.z, 360.0f); Math_SmoothStepToF(&bossA6->fwork[A6_FWK_28], 5.0f, 0.1f, 0.2f, 0.0001f); for (i = 0; i < 10; i++) { - func_80079618(bossA6->obj.pos.x + RAND_FLOAT_CENTERED(500.0f), - bossA6->obj.pos.y + RAND_FLOAT_CENTERED(500.0f), - bossA6->obj.pos.z + RAND_FLOAT_CENTERED(100.0f), RAND_FLOAT(4.0f) + 1.0f); + func_effect_80079618(bossA6->obj.pos.x + RAND_FLOAT_CENTERED(500.0f), + bossA6->obj.pos.y + RAND_FLOAT_CENTERED(500.0f), + bossA6->obj.pos.z + RAND_FLOAT_CENTERED(100.0f), RAND_FLOAT(4.0f) + 1.0f); } if (bossA6->timer_05C == 0) { bossA6->timer_05C = 15; @@ -723,13 +721,13 @@ void func_i3_80187944(Boss* bossA6) { if (i == 0) { var_s0 = RAND_FLOAT_CENTERED(100.0f); } - func_8007D0E0(bossA6->obj.pos.x + var_s0 + spC8[i].x, bossA6->obj.pos.y + var_s0 + spC8[i].y, - bossA6->obj.pos.z + spC8[i].z, 10.0f); + func_effect_8007D0E0(bossA6->obj.pos.x + var_s0 + spC8[i].x, bossA6->obj.pos.y + var_s0 + spC8[i].y, + bossA6->obj.pos.z + spC8[i].z, 10.0f); } } if (!(gGameFrameCount & 0x1F)) { - func_8007C120(bossA6->obj.pos.x, bossA6->obj.pos.y, bossA6->obj.pos.z + 300.0f, bossA6->vel.x, - bossA6->vel.y, bossA6->vel.z, 0.5f, 70); + func_effect_8007C120(bossA6->obj.pos.x, bossA6->obj.pos.y, bossA6->obj.pos.z + 300.0f, bossA6->vel.x, + bossA6->vel.y, bossA6->vel.z, 0.5f, 70); } } if (!(gGameFrameCount & 0xF)) { @@ -761,7 +759,7 @@ void func_i3_80187944(Boss* bossA6) { if ((bossA6->timer_050 != 0) && (bossA6->timer_050 < 200)) { dx_11C = gPlayer[0].camEye.x - bossA6->obj.pos.x; dy_118 = gPlayer[0].camEye.y - bossA6->obj.pos.y; - dz_114 = gPlayer[0].camEye.z - D_80177D20 + bossA6->fwork[A6_FWK_3] - bossA6->obj.pos.z; + dz_114 = gPlayer[0].camEye.z - D_ctx_80177D20 + bossA6->fwork[A6_FWK_3] - bossA6->obj.pos.z; sp104 = 100.0f; } yaw_10C = Math_RadToDeg(Math_Atan2F(dx_11C, dz_114)); @@ -787,7 +785,7 @@ void func_i3_80187944(Boss* bossA6) { Audio_KillSfxBySource(bossA6->sfxSource); AUDIO_PLAY_SFX(0x19004051, bossA6->sfxSource, 4); bossA6->timer_050 = 20; - bossA6->obj.pos.z = gPlayer[0].camEye.z - D_80177D20 + bossA6->fwork[A6_FWK_3]; + bossA6->obj.pos.z = gPlayer[0].camEye.z - D_ctx_80177D20 + bossA6->fwork[A6_FWK_3]; bossA6->fwork[A6_FWK_6] = bossA6->obj.pos.x = gPlayer[0].camEye.x; bossA6->fwork[A6_FWK_7] = bossA6->obj.pos.y = gPlayer[0].camEye.y; bossA6->state = 2; @@ -800,7 +798,7 @@ void func_i3_80187944(Boss* bossA6) { } break; case 1: - Math_SmoothStepToF(D_801779A8, 10.0f, 1.0f, 5.0f, 0.0f); + Math_SmoothStepToF(D_ctx_801779A8, 10.0f, 1.0f, 5.0f, 0.0f); bossA6->info.hitbox[0] = 0; Math_SmoothStepToAngle(&bossA6->obj.rot.z, 0.0f, 1.0f, 10.0f, 0.0001f); if (bossA6->obj.rot.z < 1.0f) { @@ -830,7 +828,7 @@ void func_i3_80187944(Boss* bossA6) { if ((bossA6->swork[A6_SWK_25] != 1) && (D_i3_801C2250[A6_BSS_0] != 2)) { bossA6->fwork[A6_FWK_3] = RAND_FLOAT_CENTERED(1000.0f) + -3700.0f; } - bossA6->obj.pos.z = gPlayer[0].camEye.z - D_80177D20 + bossA6->fwork[A6_FWK_3]; + bossA6->obj.pos.z = gPlayer[0].camEye.z - D_ctx_80177D20 + bossA6->fwork[A6_FWK_3]; bossA6->fwork[A6_FWK_6] = bossA6->obj.pos.x = gPlayer[0].camEye.x; bossA6->fwork[A6_FWK_7] = bossA6->obj.pos.y = gPlayer[0].camEye.y; } @@ -843,18 +841,18 @@ void func_i3_80187944(Boss* bossA6) { } break; case 2: - Math_SmoothStepToF(D_801779A8, 10.0f, 1.0f, 5.0f, 0.0f); + Math_SmoothStepToF(D_ctx_801779A8, 10.0f, 1.0f, 5.0f, 0.0f); if (bossA6->timer_050 == 10) { - D_80178348 = D_80178350 = D_80178354 = 255; - D_80178340 = D_80178358 = 255; - D_80178358 = 0; - D_8017835C = 25; - D_80178480 = 50; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; + D_ctx_80178340 = D_ctx_80178358 = 255; + D_ctx_80178358 = 0; + D_ctx_8017835C = 25; + D_ctx_80178480 = 50; } if (bossA6->timer_050 == 0) { if (D_i3_801C2250[A6_BSS_8] == 0) { D_i3_801C2250[A6_BSS_8] = 1; - D_80178348 = D_80178350 = D_80178354 = D_80178340 = 0; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = D_ctx_80178340 = 0; } Math_SmoothStepToF(&D_i3_801C22F0.unk_24, 255.0f, 0.1f, 10.0f, 0.0f); Math_SmoothStepToF(&bossA6->fwork[A6_FWK_34], 1.0f, 0.1f, 0.1f, 0.0f); @@ -939,11 +937,11 @@ void func_i3_80187944(Boss* bossA6) { AUDIO_PLAY_SFX(0x31404067, bossA6->sfxSource, 4); bossA6->swork[A6_SWK_30 + 0] = bossA6->swork[A6_SWK_30 + 1] = bossA6->swork[A6_SWK_30 + 2] = 0; } else if (bossA6->swork[A6_SWK_30 + 0] == 0) { - func_i3_8018A1B0(bossA6, 0); + Area6_8018A1B0(bossA6, 0); } else if (bossA6->swork[A6_SWK_30 + 1] == 0) { - func_i3_8018A1B0(bossA6, 1); + Area6_8018A1B0(bossA6, 1); } else if (bossA6->swork[A6_SWK_30 + 2] == 0) { - func_i3_8018A1B0(bossA6, 2); + Area6_8018A1B0(bossA6, 2); } } break; @@ -1004,7 +1002,7 @@ void func_i3_80187944(Boss* bossA6) { break; case 5: if (bossA6->timer_050 == 1) { - func_i3_80187704(); + Area6_80187704(); AUDIO_PLAY_SFX(0x39033093, bossA6->sfxSource, 4); D_i3_801C2250[A6_BSS_33] = 120; } @@ -1116,8 +1114,8 @@ void func_i3_80187944(Boss* bossA6) { if (bossA6->swork[A6_SWK_25] == 1) { spf124 = 1; } - func_i3_801875E4(bossA6->obj.pos.x + sp8C.x, bossA6->obj.pos.y + sp8C.y, - bossA6->obj.pos.z + sp8C.z, 25.0f, pitch_110, yaw_10C, 10, spf124); + Area6_801875E4(bossA6->obj.pos.x + sp8C.x, bossA6->obj.pos.y + sp8C.y, + bossA6->obj.pos.z + sp8C.z, 25.0f, pitch_110, yaw_10C, 10, spf124); D_i3_801C2250[A6_BSS_12_0 + var_s0] = D_i3_801C2250[A6_BSS_11]; } } @@ -1150,9 +1148,9 @@ void func_i3_80187944(Boss* bossA6) { gPlayer[0].unk_1D0 = 0; } if (bossA6->timer_052 < 50) { - D_801779A8[0] = 50.0f; + D_ctx_801779A8[0] = 50.0f; } else { - D_801779A8[0] = 20.0f; + D_ctx_801779A8[0] = 20.0f; } if (bossA6->timer_052 == 0) { gShowBossHealth = 0; @@ -1160,9 +1158,9 @@ void func_i3_80187944(Boss* bossA6) { } break; } - func_i3_8018A464(bossA6, 0); - func_i3_8018A464(bossA6, 1); - func_i3_8018A464(bossA6, 2); + Area6_8018A464(bossA6, 0); + Area6_8018A464(bossA6, 1); + Area6_8018A464(bossA6, 2); for (i = 0; i < 5; i++) { if (!(gGameFrameCount & 3)) { D_i3_801BF280[i] = RAND_FLOAT_CENTERED(10.0f); @@ -1211,11 +1209,11 @@ void func_i3_80187944(Boss* bossA6) { } } #else -void func_i3_80187944(Boss* bossA6); -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i3/fox_a6/func_i3_80187944.s") +void Area6_80187944(Boss* bossA6); +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i3/fox_a6/Area6_80187944.s") #endif -void func_i3_8018A1B0(Boss* bossA6, s32 arg1) { +void Area6_8018A1B0(Boss* bossA6, s32 arg1) { switch (D_i3_801C2250[A6_BSS_2_0 + arg1]) { case 0: bossA6->swork[A6_SWK_27 + arg1] = 12; @@ -1245,7 +1243,7 @@ void func_i3_8018A1B0(Boss* bossA6, s32 arg1) { } } -void func_i3_8018A2C4(Boss* bossA6) { +void Area6_8018A2C4(Boss* bossA6) { s32 i; Vec3f sp58; s32 pad1; @@ -1260,19 +1258,19 @@ void func_i3_8018A2C4(Boss* bossA6) { sp58.x = D_i3_801BF334[0]; sp58.y = D_i3_801BF3C4[0]; sp58.z = bossA6->obj.pos.z; - func_8007A6F0(&sp58, 0x29034003); + func_effect_8007A6F0(&sp58, 0x29034003); } if (i == 1) { sp58.x = D_i3_801BF364[0]; sp58.y = D_i3_801BF3F4[0]; sp58.z = bossA6->obj.pos.z; - func_8007A6F0(&sp58, 0x29034003); + func_effect_8007A6F0(&sp58, 0x29034003); } if (i == 2) { sp58.x = D_i3_801BF394[0]; sp58.y = D_i3_801BF424[0]; sp58.z = bossA6->obj.pos.z; - func_8007A6F0(&sp58, 0x29034003); + func_effect_8007A6F0(&sp58, 0x29034003); } if (bossA6->swork[A6_SWK_33 + i] < 0) { bossA6->swork[A6_SWK_33 + i] = 0; @@ -1282,7 +1280,7 @@ void func_i3_8018A2C4(Boss* bossA6) { } } -void func_i3_8018A464(Boss* bossA6, s32 arg1) { +void Area6_8018A464(Boss* bossA6, s32 arg1) { s32 i; s32 j; f32 var_fs0; @@ -1517,19 +1515,19 @@ void func_i3_8018A464(Boss* bossA6, s32 arg1) { spE0.x = D_i3_801BF334[0]; spE0.y = D_i3_801BF3C4[0]; spE0.z = bossA6->obj.pos.z; - func_8007A6F0(&spE0, 0x29034065); + func_effect_8007A6F0(&spE0, 0x29034065); } if (arg1 == 1) { spE0.x = D_i3_801BF364[0]; spE0.y = D_i3_801BF3F4[0]; spE0.z = bossA6->obj.pos.z; - func_8007A6F0(&spE0, 0x29034065); + func_effect_8007A6F0(&spE0, 0x29034065); } if (arg1 == 2) { spE0.x = D_i3_801BF394[0]; spE0.y = D_i3_801BF424[0]; spE0.z = bossA6->obj.pos.z; - func_8007A6F0(&spE0, 0x29034065); + func_effect_8007A6F0(&spE0, 0x29034065); } bossA6->swork[A6_SWK_18 + arg1] = 2; } @@ -1621,7 +1619,7 @@ void func_i3_8018A464(Boss* bossA6, s32 arg1) { } } -void func_i3_8018B9BC(Boss* bossA6) { +void Area6_8018B9BC(Boss* bossA6) { s32 i; s32 j; Vec3f sp94; @@ -1630,7 +1628,7 @@ void func_i3_8018B9BC(Boss* bossA6) { if (D_i3_801C2250[A6_BSS_0] == 0) { for (i = 3, j = 15; j < 18; j++, i++) { if (bossA6->swork[A6_SWK_0 + j] != 0) { - if ((D_8017812C != 0) && (gPlayerShots[15].unk_64 > 0)) { + if ((D_ctx_8017812C != 0) && (gPlayerShots[15].unk_64 > 0)) { bossA6->swork[A6_SWK_0 + j] -= bossA6->damage; } else if (i + 1 == bossA6->dmgPart) { bossA6->swork[A6_SWK_0 + j] -= bossA6->damage; @@ -1644,14 +1642,14 @@ void func_i3_8018B9BC(Boss* bossA6) { if (bossA6->swork[A6_SWK_0 + j] <= 0) { bossA6->swork[A6_SWK_0 + j] = 0; Matrix_MultVec3f(gCalcMatrix, &bossA6->vwork[A6_VWK_1 + i], &sp94); - func_8007D0E0(bossA6->obj.pos.x + sp94.x, bossA6->obj.pos.y + sp94.y, bossA6->obj.pos.z + sp94.z, - 10.0f); + func_effect_8007D0E0(bossA6->obj.pos.x + sp94.x, bossA6->obj.pos.y + sp94.y, + bossA6->obj.pos.z + sp94.z, 10.0f); sp88.x = bossA6->obj.pos.x + sp94.x; sp88.y = bossA6->obj.pos.y + sp94.y; sp88.z = bossA6->obj.pos.z + sp94.z; - func_8007A6F0(&sp88, 0x2903B009); - func_8007C120(bossA6->obj.pos.x, bossA6->obj.pos.y, bossA6->obj.pos.z + 150.0f, bossA6->vel.x, - bossA6->vel.y, bossA6->vel.z, 0.2f, 50); + func_effect_8007A6F0(&sp88, 0x2903B009); + func_effect_8007C120(bossA6->obj.pos.x, bossA6->obj.pos.y, bossA6->obj.pos.z + 150.0f, + bossA6->vel.x, bossA6->vel.y, bossA6->vel.z, 0.2f, 50); } if ((bossA6->swork[A6_SWK_15] == 0) && (bossA6->swork[A6_SWK_16] == 0) && (bossA6->swork[A6_SWK_17] == 0)) { @@ -1674,7 +1672,7 @@ void func_i3_8018B9BC(Boss* bossA6) { } } -void func_i3_8018BCD4(Vec3f* arg0, f32 arg1, f32 arg2, Vec3f* arg3, s32 arg4, f32 arg5, s32 arg6, f32 arg7) { +void Area6_8018BCD4(Vec3f* arg0, f32 arg1, f32 arg2, Vec3f* arg3, s32 arg4, f32 arg5, s32 arg6, f32 arg7) { s32 i; Vec3f sp90 = { 0.0f, 0.0f, 0.0f }; @@ -1727,7 +1725,7 @@ void func_i3_8018BCD4(Vec3f* arg0, f32 arg1, f32 arg2, Vec3f* arg3, s32 arg4, f3 } } -void func_i3_8018C0D0(f32* arg0, f32 arg1, Vec3f* arg2, f32 arg3, s32 arg4) { +void Area6_8018C0D0(f32* arg0, f32 arg1, Vec3f* arg2, f32 arg3, s32 arg4) { s32 i; Vec3f spB0 = { 0.0f, 0.0f, 0.0f }; f32 spAC; @@ -1786,7 +1784,7 @@ void func_i3_8018C0D0(f32* arg0, f32 arg1, Vec3f* arg2, f32 arg3, s32 arg4) { #ifdef NON_MATCHING // weirdness on setting spAC.x to 0.0f and in loading bossA6 near the fakeness // https://decomp.me/scratch/mwrs8 -void func_i3_8018C54C(Boss* bossA6) { +void Area6_8018C54C(Boss* bossA6) { Vec3f spD0[30]; Vec3f spC4; Vec3f spB8; @@ -1838,19 +1836,19 @@ void func_i3_8018C54C(Boss* bossA6) { for (i = 0; i < 3; i++) { if ((bossA6->swork[A6_SWK_33 + i] == 0) && (bossA6->state != 3) && (D_i3_801C2250[A6_BSS_2_0 + i] == 0) && !(gGameFrameCount & 3) && - (bossA6->swork[A6_SWK_27 + i] != 0) && (D_80177854 != 0x64)) { + (bossA6->swork[A6_SWK_27 + i] != 0) && (D_ctx_80177854 != 0x64)) { Matrix_RotateY(gCalcMatrix, bossA6->obj.rot.y * M_DTOR, 0); Matrix_RotateX(gCalcMatrix, bossA6->obj.rot.x * M_DTOR, 1); Matrix_RotateZ(gCalcMatrix, bossA6->obj.rot.z * M_DTOR, 1); Matrix_MultVec3f(gCalcMatrix, &bossA6->vwork[A6_VWK_1] + i, &spC4); - func_8007D0E0(bossA6->obj.pos.x + spC4.x, bossA6->obj.pos.y + spC4.y, bossA6->obj.pos.z + spC4.z, - 20.0f); + func_effect_8007D0E0(bossA6->obj.pos.x + spC4.x, bossA6->obj.pos.y + spC4.y, + bossA6->obj.pos.z + spC4.z, 20.0f); spB8.x = bossA6->obj.pos.x + spC4.x; spB8.y = bossA6->obj.pos.y + spC4.y; spB8.z = bossA6->obj.pos.z + spC4.z; if ((!bossA6) && (!bossA6)) {} // fake if (D_i3_801C2250[A6_BSS_26] == 0) { - func_8007A6F0(&spB8, 0x2903B009); + func_effect_8007A6F0(&spB8, 0x2903B009); } D_i3_801C2250[A6_BSS_26]++; D_i3_801C2250[A6_BSS_26] &= 1; @@ -1885,26 +1883,26 @@ void func_i3_8018C54C(Boss* bossA6) { } } } - func_i3_8018BCD4(D_i3_801BED70, 0.0f, bossA6->fwork[A6_FWK_25], &bossA6->vwork[A6_VWK_1], - bossA6->swork[A6_SWK_0] & 1, bossA6->fwork[A6_FWK_10] + bossA6->fwork[A6_FWK_19], - bossA6->swork[A6_SWK_27], bossA6->fwork[A6_FWK_0]); - func_i3_8018BCD4(D_i3_801BEEF0, -120.0f, bossA6->fwork[A6_FWK_26], &bossA6->vwork[A6_VWK_2], - bossA6->swork[A6_SWK_1] & 1, bossA6->fwork[A6_FWK_11] + bossA6->fwork[A6_FWK_20], - bossA6->swork[A6_SWK_28], bossA6->fwork[A6_FWK_0]); - func_i3_8018BCD4(D_i3_801BF070, 120.0f, bossA6->fwork[A6_FWK_27], &bossA6->vwork[A6_VWK_3], - bossA6->swork[A6_SWK_2] & 1, bossA6->fwork[A6_FWK_12] + bossA6->fwork[A6_FWK_21], - bossA6->swork[A6_SWK_29], bossA6->fwork[A6_FWK_0]); + Area6_8018BCD4(D_i3_801BED70, 0.0f, bossA6->fwork[A6_FWK_25], &bossA6->vwork[A6_VWK_1], + bossA6->swork[A6_SWK_0] & 1, bossA6->fwork[A6_FWK_10] + bossA6->fwork[A6_FWK_19], + bossA6->swork[A6_SWK_27], bossA6->fwork[A6_FWK_0]); + Area6_8018BCD4(D_i3_801BEEF0, -120.0f, bossA6->fwork[A6_FWK_26], &bossA6->vwork[A6_VWK_2], + bossA6->swork[A6_SWK_1] & 1, bossA6->fwork[A6_FWK_11] + bossA6->fwork[A6_FWK_20], + bossA6->swork[A6_SWK_28], bossA6->fwork[A6_FWK_0]); + Area6_8018BCD4(D_i3_801BF070, 120.0f, bossA6->fwork[A6_FWK_27], &bossA6->vwork[A6_VWK_3], + bossA6->swork[A6_SWK_2] & 1, bossA6->fwork[A6_FWK_12] + bossA6->fwork[A6_FWK_21], + bossA6->swork[A6_SWK_29], bossA6->fwork[A6_FWK_0]); if ((bossA6->swork[A6_SWK_15] != 0) && (bossA6->state >= 3) && (D_i3_801C22F0.unk_24 == 255.0f) && (D_i3_801C2250[A6_BSS_0] == 0)) { - func_i3_8018C0D0(D_i3_801BF1F0, 0.0f, &bossA6->vwork[A6_VWK_4], bossA6->fwork[A6_FWK_0], 0); + Area6_8018C0D0(D_i3_801BF1F0, 0.0f, &bossA6->vwork[A6_VWK_4], bossA6->fwork[A6_FWK_0], 0); } if ((bossA6->swork[A6_SWK_16] != 0) && (bossA6->state >= 3) && (D_i3_801C22F0.unk_24 == 255.0f) && (D_i3_801C2250[A6_BSS_0] == 0)) { - func_i3_8018C0D0(D_i3_801BF220, -120.0f, &bossA6->vwork[A6_VWK_5], bossA6->fwork[A6_FWK_0], 1); + Area6_8018C0D0(D_i3_801BF220, -120.0f, &bossA6->vwork[A6_VWK_5], bossA6->fwork[A6_FWK_0], 1); } if ((bossA6->swork[A6_SWK_17] != 0) && (bossA6->state >= 3) && (D_i3_801C22F0.unk_24 == 255.0f) && (D_i3_801C2250[A6_BSS_0] == 0)) { - func_i3_8018C0D0(D_i3_801BF250, 120.0f, &bossA6->vwork[A6_VWK_6], bossA6->fwork[A6_FWK_0], 2); + Area6_8018C0D0(D_i3_801BF250, 120.0f, &bossA6->vwork[A6_VWK_6], bossA6->fwork[A6_FWK_0], 2); } if (bossA6->swork[A6_SWK_25] != 0) { j = bossA6->swork[A6_SWK_25] - 1; @@ -1976,12 +1974,12 @@ void func_i3_8018C54C(Boss* bossA6) { } } #else -void func_i3_8018C54C(Boss* bossA6); -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i3/fox_a6/func_i3_8018C54C.s") +void Area6_8018C54C(Boss* bossA6); +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i3/fox_a6/Area6_8018C54C.s") #endif -void func_i3_8018D3CC(s32 arg0, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 xRot, f32 yRot, - f32 zRot) { +void Area6_8018D3CC(s32 arg0, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 xRot, f32 yRot, + f32 zRot) { s32 i; for (i = 0; i < 10; i++) { @@ -2009,20 +2007,20 @@ void func_i3_8018D3CC(s32 arg0, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel } } -void func_i3_8018D4E0(Actor* actor) { +void Area6_8018D4E0(Actor* actor) { s32 i; - func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 4.0f, 0x14); - func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 7.0f); - func_8007B344(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 6.0f, 5); + func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 4.0f, 0x14); + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 7.0f); + func_effect_8007B344(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 6.0f, 5); Object_Kill(&actor->obj, actor->sfxSource); for (i = 0; i < 15; i++) { - func_800794CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f); + func_effect_800794CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f); } - func_8007A6F0(&actor->obj.pos, 0x2903B009); + func_effect_8007A6F0(&actor->obj.pos, 0x2903B009); } -void func_i3_8018D5C8(void) { +void Area6_8018D5C8(void) { s32 i = 0; Actor_Initialize(&gActors[i]); @@ -2038,7 +2036,7 @@ void func_i3_8018D5C8(void) { AUDIO_PLAY_SFX(0x11030010, gActors[i].sfxSource, 0); } -void func_i3_8018D694(Actor* actor, s32 arg1) { +void Area6_8018D694(Actor* actor, s32 arg1) { Vec3f sp2C[5] = { { -150.0f, 0.0f, 200.0f }, { 0.0f, 50.0f, 0.0f }, { 150.0f, -50.0f, 100.0f }, { -350.0f, 100.0f, 300.0f }, { 100.0f, -300.0f, 100.0f }, @@ -2062,7 +2060,7 @@ void func_i3_8018D694(Actor* actor, s32 arg1) { AUDIO_PLAY_SFX(0x31000011, actor->sfxSource, 4); } -void func_i3_8018D804(Actor* actor, s32 arg1) { +void Area6_8018D804(Actor* actor, s32 arg1) { Vec3f sp2C[3] = { { -200.0f, 0.0f, -500.0f }, { 200.0f, 30.0f, -600.0f }, @@ -2083,7 +2081,7 @@ void func_i3_8018D804(Actor* actor, s32 arg1) { AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); } -void func_i3_8018D920(Vec3f* arg0) { +void Area6_8018D920(Vec3f* arg0) { f32 sp6C = arg0->x - arg0->x; f32 sp68 = arg0->y - arg0->y; f32 sp64 = arg0->z - 1000.0f - arg0->z; @@ -2098,10 +2096,10 @@ void func_i3_8018D920(Vec3f* arg0) { sp50.y = 0.0f; sp50.z = 100.0f; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp50, &sp44); - func_i3_8018D3CC(100, arg0->x, arg0->y, arg0->z, sp44.x, sp44.y, sp44.z, sp5C, sp60, 0.0f); + Area6_8018D3CC(100, arg0->x, arg0->y, arg0->z, sp44.x, sp44.y, sp44.z, sp5C, sp60, 0.0f); } -void func_i3_8018DA58(Actor* actor) { +void Area6_8018DA58(Actor* actor) { Vec3f sp5C; Vec3f sp50; f32 sp4C; @@ -2191,7 +2189,7 @@ void func_i3_8018DA58(Actor* actor) { actor->obj.rot.z = -actor->unk_0F4.z; } -void func_i3_8018DF74(Player* player) { +void Area6_8018DF74(Player* player) { Vec3f sp74; Vec3f sp68; Vec3f sp5C; @@ -2205,78 +2203,78 @@ void func_i3_8018DF74(Player* player) { gCsFrameCount = 0; player->unk_1D0 = 1; Rand_SetSeed(1, 29000, 9876); - func_i3_8018D694(&gActors[1], 0); - func_i3_8018D694(&gActors[2], 1); - func_i3_8018D694(&gActors[6], 2); - func_i3_8018D694(&gActors[7], 3); - func_i3_8018D694(&gActors[8], 4); - func_i3_8018D5C8(); + Area6_8018D694(&gActors[1], 0); + Area6_8018D694(&gActors[2], 1); + Area6_8018D694(&gActors[6], 2); + Area6_8018D694(&gActors[7], 3); + Area6_8018D694(&gActors[8], 4); + Area6_8018D5C8(); player->pos.x = 0.0f; player->pos.y = 350.0f; player->pos.z = 16000.0f; player->unk_0D0 = 30.0f; if (gTeamShields[1] > 0) { - func_i3_8018D804(&gActors[3], 0); + Area6_8018D804(&gActors[3], 0); } if (gTeamShields[2] > 0) { - func_i3_8018D804(&gActors[4], 1); + Area6_8018D804(&gActors[4], 1); } if (gTeamShields[3] > 0) { - func_i3_8018D804(&gActors[5], 2); + Area6_8018D804(&gActors[5], 2); } gActors[0].fwork[0] = 20.0f; gActors[3].fwork[0] = 30.0f; gActors[4].fwork[0] = 30.0f; gActors[5].fwork[0] = 30.0f; - D_80177A48[4] = 270.0f; - D_80177A48[5] = 1000.0f; - D_80177A48[6] = 1100.0f; - D_80177A48[3] = 0.001f; + D_ctx_80177A48[4] = 270.0f; + D_ctx_80177A48[5] = 1000.0f; + D_ctx_80177A48[6] = 1100.0f; + D_ctx_80177A48[3] = 0.001f; /* fallthrough */ case 1: Math_SmoothStepToF(&gActors[0].obj.pos.y, 0.0f, 0.01f, 10.0f, 0.001f); if (gCsFrameCount < 490) { sp74.x = 0.0f; sp74.y = 0.0f; - sp74.z = D_80177A48[5]; - Matrix_Translate(gCalcMatrix, 0.0f, 350.0f, D_80177A48[6], 0); - Matrix_RotateY(gCalcMatrix, -(D_80177A48[4] * M_DTOR), 1); + sp74.z = D_ctx_80177A48[5]; + Matrix_Translate(gCalcMatrix, 0.0f, 350.0f, D_ctx_80177A48[6], 0); + Matrix_RotateY(gCalcMatrix, -(D_ctx_80177A48[4] * M_DTOR), 1); Matrix_MultVec3f(gCalcMatrix, &sp74, &sp68); gCsCamEyeX = sp68.x; gCsCamEyeY = sp68.y; gCsCamEyeZ = sp68.z; if (gCsFrameCount < 200) { - Math_SmoothStepToF(&D_80177A48[4], 0.0f, 0.05f, 0.56f, 0.001f); + Math_SmoothStepToF(&D_ctx_80177A48[4], 0.0f, 0.05f, 0.56f, 0.001f); gCsCamAtX = gActors[1].obj.pos.x; gCsCamAtY = gActors[1].obj.pos.y; gCsCamAtZ = gActors[1].obj.pos.z; - D_80177A48[0] = 1.0f; - D_80177A48[1] = 1.0f; + D_ctx_80177A48[0] = 1.0f; + D_ctx_80177A48[1] = 1.0f; } else { - Math_SmoothStepToF(&D_80177A48[4], 0.0f, 0.05f, 0.56f, 0.001f); - Math_SmoothStepToF(&D_80177A48[5], 0.0f, 0.003f, 100.0f, 0.001f); + Math_SmoothStepToF(&D_ctx_80177A48[4], 0.0f, 0.05f, 0.56f, 0.001f); + Math_SmoothStepToF(&D_ctx_80177A48[5], 0.0f, 0.003f, 100.0f, 0.001f); Math_SmoothStepToF(&gCsCamAtX, player->pos.x, 0.01f, 20.0f, 0.0001f); Math_SmoothStepToF(&gCsCamAtY, player->pos.y, 0.01f, 20.0f, 0.0001f); Math_SmoothStepToF(&gCsCamAtZ, player->pos.z - 2500.0f, 0.01f, 20.0f, 0.0001f); - D_80177A48[0] = 1.0f; - D_80177A48[1] = 1.0f; + D_ctx_80177A48[0] = 1.0f; + D_ctx_80177A48[1] = 1.0f; } } else { - Math_SmoothStepToF(&D_80177A48[3], 0.1f, 0.3f, 0.1f, 0.00001f); - temp1 = fabsf(player->pos.x - gCsCamEyeX) * D_80177A48[3]; - temp2 = fabsf(player->pos.y * player->unk_148 + 50.0f - gCsCamEyeY) * D_80177A48[3]; - temp3 = fabsf(player->pos.z + 400.0f - gCsCamEyeZ) * D_80177A48[3]; + Math_SmoothStepToF(&D_ctx_80177A48[3], 0.1f, 0.3f, 0.1f, 0.00001f); + temp1 = fabsf(player->pos.x - gCsCamEyeX) * D_ctx_80177A48[3]; + temp2 = fabsf(player->pos.y * player->unk_148 + 50.0f - gCsCamEyeY) * D_ctx_80177A48[3]; + temp3 = fabsf(player->pos.z + 400.0f - gCsCamEyeZ) * D_ctx_80177A48[3]; gCsCamEyeX += temp1; gCsCamEyeY -= temp2; gCsCamEyeZ -= temp3; - temp1 = fabsf(player->pos.x - gCsCamAtX) * D_80177A48[3]; - temp2 = fabsf(player->pos.y * player->unk_148 + 20.0f - gCsCamAtY) * D_80177A48[3]; - temp3 = fabsf(player->pos.z - 51.0f - gCsCamAtZ) * D_80177A48[3]; + temp1 = fabsf(player->pos.x - gCsCamAtX) * D_ctx_80177A48[3]; + temp2 = fabsf(player->pos.y * player->unk_148 + 20.0f - gCsCamAtY) * D_ctx_80177A48[3]; + temp3 = fabsf(player->pos.z - 51.0f - gCsCamAtZ) * D_ctx_80177A48[3]; gCsCamAtX += temp1; gCsCamAtY -= temp2; gCsCamAtZ -= temp3; - D_80177A48[0] = 1.0f; - D_80177A48[1] = 1.0f; + D_ctx_80177A48[0] = 1.0f; + D_ctx_80177A48[1] = 1.0f; } if (gCsFrameCount == 460) { player->unk_190 = 2.0f; @@ -2290,12 +2288,12 @@ void func_i3_8018DF74(Player* player) { player->unk_0D0 = player->pos.z = 0.0f; } if (gCsFrameCount == 540) { - D_80178488 = 1; - D_80177838 = 50; + D_ctx_80178488 = 1; + D_ctx_80177838 = 50; player->pos.x = 0.0f; player->pos.z = 0.0f; player->pos.y = 350.0f; - player->unk_0D0 = D_80161A54; + player->unk_0D0 = D_play_80161A54; player->unk_1D0 = 0; player->timer_1F8 = 0; @@ -2315,25 +2313,25 @@ void func_i3_8018DF74(Player* player) { sp5C.x = player->pos.x; sp5C.y = player->pos.y; sp5C.z = player->pos.z; - func_i3_8018D920(&sp5C); + Area6_8018D920(&sp5C); break; case 176: if (gTeamShields[1] > 0) { - func_i3_8018D920(&gActors[3].obj.pos); + Area6_8018D920(&gActors[3].obj.pos); } break; case 187: if (gTeamShields[2] > 0) { - func_i3_8018D920(&gActors[4].obj.pos); + Area6_8018D920(&gActors[4].obj.pos); } break; case 198: if (gTeamShields[3] > 0) { - func_i3_8018D920(&gActors[5].obj.pos); + Area6_8018D920(&gActors[5].obj.pos); } break; case 199: - func_i3_8018D4E0(&gActors[1]); + Area6_8018D4E0(&gActors[1]); break; case 210: Radio_PlayMessage(gMsg_ID_7006, RCID_CAIMAN_AREA6); @@ -2363,7 +2361,7 @@ void func_i3_8018DF74(Player* player) { gActors[3].state = 6; break; case 480: - func_800A6148(); + func_play_800A6148(); break; } Matrix_RotateY(gCalcMatrix, (player->unk_0E8 + player->unk_114 + 180.0f) * M_DTOR, 0); @@ -2382,15 +2380,15 @@ void func_i3_8018DF74(Player* player) { player->unk_138 = player->pos.z; } player->unk_0F8 = player->unk_0EC + player->unk_12C + player->unk_130; - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 50000.0f, 0.001f); - Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 50000.0f, 0.001f); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 50000.0f, 0.001f); - Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[1], 50000.0f, 0.001f); - Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[1], 50000.0f, 0.001f); - Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[1], 50000.0f, 0.001f); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], 50000.0f, 0.001f); + Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_ctx_80177A48[0], 50000.0f, 0.001f); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], 50000.0f, 0.001f); + Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_ctx_80177A48[1], 50000.0f, 0.001f); + Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_ctx_80177A48[1], 50000.0f, 0.001f); + Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_ctx_80177A48[1], 50000.0f, 0.001f); } -void func_i3_8018EA88(Actor* actor) { +void Area6_8018EA88(Actor* actor) { Actor_Initialize(actor); actor->obj.status = OBJ_ACTIVE; actor->obj.id = OBJ_ACTOR_195; @@ -2412,7 +2410,7 @@ void func_i3_8018EA88(Actor* actor) { Object_SetInfo(&actor->info, actor->obj.id); } -void func_i3_8018EB3C(Actor* actor) { +void Area6_8018EB3C(Actor* actor) { Player* player = &gPlayer[0]; Actor_Initialize(actor); @@ -2429,7 +2427,7 @@ void func_i3_8018EB3C(Actor* actor) { AUDIO_PLAY_SFX(0x31024059, actor->sfxSource, 0); } -void func_i3_8018EC38(Actor* actor, s32 arg1) { +void Area6_8018EC38(Actor* actor, s32 arg1) { Vec3f sp2C[3] = { { -150.0f, 40.0f, 75.0f }, { 150.0f, 40.0f, 150.0f }, @@ -2455,7 +2453,7 @@ void func_i3_8018EC38(Actor* actor, s32 arg1) { } } -void func_i3_8018ED78(Player* player) { +void Area6_8018ED78(Player* player) { s32 i; Vec3f spf90; f32 sp8C; @@ -2475,7 +2473,7 @@ void func_i3_8018ED78(Player* player) { player->unk_190 = 2.0f; player->unk_0D0 = 60.0f; AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); - D_80177A48[3] = 0.0f; + D_ctx_80177A48[3] = 0.0f; /* fallthrough */ case 1: Math_SmoothStepToAngle(&player->unk_130, 0.0f, 0.05f, 1.2f, 0.0001f); @@ -2505,35 +2503,35 @@ void func_i3_8018ED78(Player* player) { } Math_SmoothStepToF(&gCsCamEyeX, gBosses[0].obj.pos.x, 0.05f, 1000.0f, 0.001f); Math_SmoothStepToF(&gCsCamEyeY, gBosses[0].obj.pos.y, 0.05f, 1000.0f, 0.001f); - Math_SmoothStepToF(&gCsCamEyeZ, gBosses[0].obj.pos.z + D_80177D20, 0.05f, 10.0f, 0.0001f); + Math_SmoothStepToF(&gCsCamEyeZ, gBosses[0].obj.pos.z + D_ctx_80177D20, 0.05f, 10.0f, 0.0001f); player->camEye.x = gCsCamEyeX; player->camEye.y = gCsCamEyeY; player->camEye.z = gCsCamEyeZ; gCsCamAtX = gBosses[0].obj.pos.x; gCsCamAtY = gBosses[0].obj.pos.y; - gCsCamAtZ = gBosses[0].obj.pos.z + D_80177D20; - D_80177A48[0] = 0.04f; + gCsCamAtZ = gBosses[0].obj.pos.z + D_ctx_80177D20; + D_ctx_80177A48[0] = 0.04f; if (gCsFrameCount == 140) { - func_i3_8018EA88(actor4); - func_i3_8018EA88(&gActors[5]); - func_i3_8018EA88(&gActors[6]); + Area6_8018EA88(actor4); + Area6_8018EA88(&gActors[5]); + Area6_8018EA88(&gActors[6]); actor4->fwork[4] = 0.5f; } if (gCsFrameCount >= 200) { - if (D_80178340 == 255) { + if (D_ctx_80178340 == 255) { player->unk_1D0 = 2; - func_800A6148(); + func_play_800A6148(); } else { - D_80178348 = D_80178350 = D_80178354 = 255; - D_80178358 = 255; - D_8017835C = 16; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; + D_ctx_80178358 = 255; + D_ctx_8017835C = 16; } } else if ((gCsFrameCount == 131) || (gCsFrameCount == 134) || (gCsFrameCount == 137)) { - D_80178348 = D_80178350 = D_80178354 = 255; - D_80178340 = 192; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; + D_ctx_80178340 = 192; } else { - D_80178348 = D_80178350 = D_80178354 = D_80178340 = 0; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = D_ctx_80178340 = 0; } if ((gCsFrameCount == 146) || (gCsFrameCount == 150)) { AUDIO_PLAY_SFX(0x2940F026, gActors[5].sfxSource, 4); @@ -2574,21 +2572,21 @@ void func_i3_8018ED78(Player* player) { player->unk_08C = player->unk_0EC = player->unk_0E8 = player->unk_0E4 = player->unk_0D0 = player->unk_110 = player->unk_034 = player->unk_12C = player->unk_130 = player->unk_4D8 = 0.0f; - D_8015F984 = (D_80177D20 * 0.00004f) + 0.5f; - func_i3_8018EC38(&gActors[1], 0); - func_i3_8018EC38(&gActors[2], 1); - func_i3_8018EC38(&gActors[3], 2); - func_i3_8018EB3C(&gActors[0]); - D_80177A48[5] = 300.0f; - D_80177A48[4] = 0.0f; - D_80177A48[9] = 50.0f; + D_bg_8015F984 = (D_ctx_80177D20 * 0.00004f) + 0.5f; + Area6_8018EC38(&gActors[1], 0); + Area6_8018EC38(&gActors[2], 1); + Area6_8018EC38(&gActors[3], 2); + Area6_8018EB3C(&gActors[0]); + D_ctx_80177A48[5] = 300.0f; + D_ctx_80177A48[4] = 0.0f; + D_ctx_80177A48[9] = 50.0f; player->camAt.x = gCsCamAtX = player->pos.x; player->camAt.y = gCsCamAtY = 0.0f; - player->camAt.z = gCsCamAtZ = player->pos.z + 50.0f + D_80177D20; + player->camAt.z = gCsCamAtZ = player->pos.z + 50.0f + D_ctx_80177D20; } - if (D_80178340 != 0) { - D_80178358 = 0; - D_8017835C = 4; + if (D_ctx_80178340 != 0) { + D_ctx_80178358 = 0; + D_ctx_8017835C = 4; } else { player->unk_1D0 = 3; } @@ -2599,38 +2597,38 @@ void func_i3_8018ED78(Player* player) { Math_SmoothStepToF(&gActors[3].obj.pos.y, 88.0f, 0.01f, 10.0f, 0.001f); Math_SmoothStepToF(&gActors[0].obj.pos.y, 60.0f, 0.01f, 2.0f, 0.001f); if (gCsFrameCount < 1077) { - D_80177A48[1] = player->pos.x; - D_80177A48[3] = player->pos.z; + D_ctx_80177A48[1] = player->pos.x; + D_ctx_80177A48[3] = player->pos.z; } if (gCsFrameCount >= 940) { - Math_SmoothStepToF(&D_80177A48[9], 0.0f, 0.01f, 1000.0f, 0.001f); + Math_SmoothStepToF(&D_ctx_80177A48[9], 0.0f, 0.01f, 1000.0f, 0.001f); } if (gCsFrameCount < 1077) { - D_80177A48[4] = D_80177A48[4] + 0.3f; - if (D_80177A48[4] >= 360.0f) { - D_80177A48[4] = D_80177A48[4] - 360.0f; + D_ctx_80177A48[4] = D_ctx_80177A48[4] + 0.3f; + if (D_ctx_80177A48[4] >= 360.0f) { + D_ctx_80177A48[4] = D_ctx_80177A48[4] - 360.0f; } - if (D_80177A48[4] < 0.0f) { - D_80177A48[4] = D_80177A48[4] + 360.0f; + if (D_ctx_80177A48[4] < 0.0f) { + D_ctx_80177A48[4] = D_ctx_80177A48[4] + 360.0f; } gCsCamAtX = player->pos.x; gCsCamAtY = 0.0f; - gCsCamAtZ = D_80177A48[9] + player->pos.z + D_80177D20; - D_80177A48[0] = 0.008f; + gCsCamAtZ = D_ctx_80177A48[9] + player->pos.z + D_ctx_80177D20; + D_ctx_80177A48[0] = 0.008f; } else { - Math_SmoothStepToAngle(&D_80177A48[4], 0.0f, 0.1f, 10.0f, 0.001f); - Math_SmoothStepToF(&D_80177A48[5], 0.0f, 0.1f, 1000.0f, 0.001f); - D_8015F984 -= 0.005f; + Math_SmoothStepToAngle(&D_ctx_80177A48[4], 0.0f, 0.1f, 10.0f, 0.001f); + Math_SmoothStepToF(&D_ctx_80177A48[5], 0.0f, 0.1f, 1000.0f, 0.001f); + D_bg_8015F984 -= 0.005f; gCsCamAtX += 2.0f; player->camAt.x = gCsCamAtX = player->pos.x; player->camAt.y = gCsCamAtY = 0.0f; - player->camAt.z = gCsCamAtZ = D_80177A48[9] + player->pos.z + D_80177D20; + player->camAt.z = gCsCamAtZ = D_ctx_80177A48[9] + player->pos.z + D_ctx_80177D20; } sp78.x = 0.0f; sp78.y = 0.0f; - sp78.z = D_80177A48[5]; - Matrix_Translate(gCalcMatrix, D_80177A48[1], 0.0f, D_80177A48[3] + D_80177D20, 0); - Matrix_RotateY(gCalcMatrix, -(D_80177A48[4] * M_DTOR), 1); + sp78.z = D_ctx_80177A48[5]; + Matrix_Translate(gCalcMatrix, D_ctx_80177A48[1], 0.0f, D_ctx_80177A48[3] + D_ctx_80177D20, 0); + Matrix_RotateY(gCalcMatrix, -(D_ctx_80177A48[4] * M_DTOR), 1); Matrix_MultVec3f(gCalcMatrix, &sp78, &sp6C); player->camEye.x = gCsCamEyeX = sp6C.x; player->camEye.y = gCsCamEyeY = sp6C.y; @@ -2643,28 +2641,28 @@ void func_i3_8018ED78(Player* player) { AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); } if (gCsFrameCount >= 1090) { - D_80178348 = D_80178350 = D_80178354 = 0; - D_80178358 = 255; - D_8017835C = 8; - if (D_80178340 == 255) { - D_800D3180[LEVEL_AREA_6] = Play_CheckMedalStatus(300) + 1; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; + D_ctx_80178358 = 255; + D_ctx_8017835C = 8; + if (D_ctx_80178340 == 255) { + D_play_800D3180[LEVEL_AREA_6] = Play_CheckMedalStatus(300) + 1; for (i = 1; i < 6; i++) { - D_80177C38[i] = gTeamShields[i]; - D_801778F0[i] = gSavedTeamShields[i]; + D_ctx_80177C38[i] = gTeamShields[i]; + D_ctx_801778F0[i] = gSavedTeamShields[i]; gSavedTeamShields[i] = gTeamShields[i]; } for (i = 1; i < 4; i++) { - if (D_80177C38[i] == 0) { - D_80177C38[i] = 255; + if (D_ctx_80177C38[i] == 0) { + D_ctx_80177C38[i] = 255; } } D_80161A94[0] = gGoldRingCount[0]; func_8001CA24(0); Audio_KillSfxBySource(player->sfxSource); - func_800A6148(); + func_play_800A6148(); gNextGameState = GSTATE_PLAY; gNextLevel = LEVEL_VENOM_2; - func_80088564(); + func_hud_80088564(); } } if (gCsFrameCount == 1040) { @@ -2678,13 +2676,13 @@ void func_i3_8018ED78(Player* player) { AUDIO_PLAY_BGM(SEQ_ID_38); break; case 550: - D_80177840 = 100; + D_ctx_80177840 = 100; break; case 700: - D_80177830 = 1; + D_ctx_80177830 = 1; break; case 900: - D_80177830 = 0; + D_ctx_80177830 = 0; break; case 940: Radio_PlayMessage(gMsg_ID_7093, RCID_FOX); @@ -2728,10 +2726,10 @@ void func_i3_8018ED78(Player* player) { player->pos.z += player->vel.z; player->unk_138 = player->pos.z; player->unk_0F8 = player->unk_0EC + player->unk_12C + player->unk_130; - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 50000.0f, 0.0001f); - Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 50000.0f, 0.0001f); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 50000.0f, 0.0001f); - Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 50000.0f, 0.0001f); - Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 50000.0f, 0.0001f); - Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 50000.0f, 0.0001f); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], 50000.0f, 0.0001f); + Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_ctx_80177A48[0], 50000.0f, 0.0001f); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], 50000.0f, 0.0001f); + Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_ctx_80177A48[0], 50000.0f, 0.0001f); + Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_ctx_80177A48[0], 50000.0f, 0.0001f); + Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_ctx_80177A48[0], 50000.0f, 0.0001f); } diff --git a/src/overlays/ovl_i3/fox_aq.c b/src/overlays/ovl_i3/fox_aq.c index 3f2a36a4..3edc1c2f 100644 --- a/src/overlays/ovl_i3/fox_aq.c +++ b/src/overlays/ovl_i3/fox_aq.c @@ -195,6 +195,17 @@ typedef enum { /* 50 */ AQ_VWK_MAX, } BossAQvwork; +f32 D_AQ_801C4188; +s32 D_i3_801C4190[10]; +f32 D_i3_801C41B8[30]; +s32 sBossAQlimbTimers[AQ_LIMB_MAX]; +s32 D_i3_801C42A0[25]; +f32 D_i3_801C4308[82]; +s32 D_i3_801C4450; +s32 D_i3_801C4454; +f32 D_i3_801C4458; +f32 D_i3_801C445C; + f32 D_i3_801BFB60 = 0.0f; s32 D_i3_801BFB64[11] = { 0, 30, 27, 24, 21, 18, 15, 12, 9, 6, 3, @@ -289,18 +300,8 @@ f32 D_i3_801C0190[5] = { PosRot* D_i3_801C27C0; PosRot D_i3_801C27C8[4 * 50]; Vtx D_i3_801C3A88[2][2][28]; -f32 D_i3_801C4188; -s32 D_i3_801C4190[10]; -f32 D_i3_801C41B8[30]; -s32 sBossAQlimbTimers[AQ_LIMB_MAX]; -s32 D_i3_801C42A0[25]; -f32 D_i3_801C4308[82]; -s32 D_i3_801C4450; -s32 D_i3_801C4454; -f32 D_i3_801C4458; -f32 D_i3_801C445C; -void func_i3_801A8E30(void) { +void Aquas_801A8E30(void) { s32 i; f32 spA8[17]; f32 sp64[17]; @@ -324,7 +325,7 @@ void func_i3_801A8E30(void) { } } -void func_i3_801A92EC(Actor* actor, f32 xUnk, f32 yUnk, f32 zUnk, s32 index, s32 mode) { +void Aquas_801A92EC(Actor* actor, f32 xUnk, f32 yUnk, f32 zUnk, s32 index, s32 mode) { gTexturedLines[index].mode = mode; gTexturedLines[index].unk_28 = 10.0f; gTexturedLines[index].unk_04.x = actor->obj.pos.x; @@ -338,8 +339,8 @@ void func_i3_801A92EC(Actor* actor, f32 xUnk, f32 yUnk, f32 zUnk, s32 index, s32 gTexturedLines[index].timer = 3; } -void func_i3_801A9374(Actor* actor, Vec3f* pos, Vec3f* rot, f32 xVel, f32 yVel, f32 zVel, s32 state, f32 scale, - s32 timerBC, s32 unk48) { +void Aquas_801A9374(Actor* actor, Vec3f* pos, Vec3f* rot, f32 xVel, f32 yVel, f32 zVel, s32 state, f32 scale, + s32 timerBC, s32 unk48) { Actor_Initialize(actor); actor->obj.status = OBJ_ACTIVE; actor->obj.id = OBJ_ACTOR_189; @@ -356,19 +357,19 @@ void func_i3_801A9374(Actor* actor, Vec3f* pos, Vec3f* rot, f32 xVel, f32 yVel, Object_SetInfo(&actor->info, actor->obj.id); } -void func_i3_801A9448(Vec3f* pos, Vec3f* rot, f32 xVel, f32 yVel, f32 zVel, s32 unkB8, f32 scale, s32 timerBC, - s32 unk48) { +void Aquas_801A9448(Vec3f* pos, Vec3f* rot, f32 xVel, f32 yVel, f32 zVel, s32 unkB8, f32 scale, s32 timerBC, + s32 unk48) { s32 i; for (i = 59; i >= 0; i--) { if (gActors[i].obj.status == OBJ_FREE) { - func_i3_801A9374(&gActors[i], pos, rot, xVel, yVel, zVel, unkB8, scale, timerBC, unk48); + Aquas_801A9374(&gActors[i], pos, rot, xVel, yVel, zVel, unkB8, scale, timerBC, unk48); break; } } } -void func_i3_801A94EC(Vec3f* pos, ObjectId objId) { +void Aquas_801A94EC(Vec3f* pos, ObjectId objId) { Item* sp18; Item* item; s32 i; @@ -388,7 +389,7 @@ void func_i3_801A94EC(Vec3f* pos, ObjectId objId) { } } -f32 func_i3_801A958C(s32 arg0, f32 arg1) { +f32 Aquas_801A958C(s32 arg0, f32 arg1) { f32 var_fv1 = arg0 / 2.0f; var_fv1 = MIN(arg1, var_fv1); @@ -396,7 +397,7 @@ f32 func_i3_801A958C(s32 arg0, f32 arg1) { return var_fv1; } -void func_i3_801A95C8(void) { +void Aquas_801A95C8(void) { Math_SmoothStepToF(&gPlayer[0].camEye.x, gCsCamEyeX, 0.1f, 50.0f, 0.0001f); Math_SmoothStepToF(&gPlayer[0].camEye.y, gCsCamEyeY, 0.1f, 50.0f, 0.0001f); Math_SmoothStepToF(&gPlayer[0].camEye.z, gCsCamEyeZ, 0.1f, 50.0f, 0.0001f); @@ -405,12 +406,12 @@ void func_i3_801A95C8(void) { Math_SmoothStepToF(&gPlayer[0].camAt.z, gCsCamAtZ, 0.1f, 50.0f, 0.0001f); } -void func_i3_801A96DC(Actor* actor) { +void Aquas_801A96DC(Actor* actor) { actor->obj.rot.y = RAD_TO_DEG(-gPlayer[0].unk_058); actor->obj.rot.x = RAD_TO_DEG(gPlayer[0].unk_05C); } -void func_i3_801A9728(Actor* actor, f32 radius, f32 scale, s32 spread) { +void Aquas_801A9728(Actor* actor, f32 radius, f32 scale, s32 spread) { f32 temp_fs0; f32 temp_fs1; f32 temp; @@ -420,11 +421,11 @@ void func_i3_801A9728(Actor* actor, f32 radius, f32 scale, s32 spread) { temp_fs1 = SIN_DEG(i * 10.0f) * radius; temp_fs0 = COS_DEG(i * 10.0f) * radius; temp = gGroundLevel + 30.0f; - func_8007B8F8(actor->obj.pos.x + temp_fs1, temp, actor->obj.pos.z + temp_fs0, scale); + func_effect_8007B8F8(actor->obj.pos.x + temp_fs1, temp, actor->obj.pos.z + temp_fs0, scale); } } -void func_i3_801A9824(void) { +void Aquas_801A9824(void) { s32 i; f32* var_v0; f32* var_v0_4; @@ -456,7 +457,7 @@ void func_i3_801A9824(void) { D_i3_801C41B8[15] = 20.0f; D_i3_801C41B8[16] = 30.0f; D_i3_801C41B8[17] = 50.0f; - if (D_80177CA0 != 0) { + if (D_ctx_80177CA0 != 0) { D_i3_801C41B8[12] = 0.0f; D_i3_801C41B8[13] = 3.0f; D_i3_801C41B8[14] = 5.0f; @@ -465,19 +466,19 @@ void func_i3_801A9824(void) { D_i3_801C41B8[17] = 0.0f; } D_i3_801C4190[5] = 0; - D_i3_801C41B8[25] = D_8015F970; + D_i3_801C41B8[25] = D_bg_8015F970; D_i3_801C41B8[26] = 128.0f; } -void func_i3_801A99D4(Player* player) { +void Aquas_801A99D4(Player* player) { s32 sp24 = fabsf(player->unk_138 / 1000.0f); - Math_SmoothStepToF(&D_8015F970, D_i3_801C41B8[25], 1.0f, 10.0f, 0.00001f); - Math_SmoothStepToF(&D_i3_801C4188, D_i3_801C41B8[26], 0.1f, 10.0f, 0.00001f); + Math_SmoothStepToF(&D_bg_8015F970, D_i3_801C41B8[25], 1.0f, 10.0f, 0.00001f); + Math_SmoothStepToF(&D_AQ_801C4188, D_i3_801C41B8[26], 0.1f, 10.0f, 0.00001f); if ((D_i3_801C4190[8] < sp24) && (D_i3_801C41B8[25] < 4600.0f)) { D_i3_801C4190[8] = sp24; D_i3_801C41B8[25] += 150.0f; - D_i3_801C41B8[26] = D_i3_801C4188 - 6.0f; + D_i3_801C41B8[26] = D_AQ_801C4188 - 6.0f; if (D_i3_801C41B8[26] < 0.0f) { D_i3_801C41B8[26] = 0.0f; } @@ -517,7 +518,7 @@ void func_i3_801A99D4(Player* player) { } } -void func_i3_801A9C98(Player* player) { +void Aquas_801A9C98(Player* player) { Actor* actor; s32 i; s32 var_v0; @@ -543,7 +544,7 @@ void func_i3_801A9C98(Player* player) { } } -void func_i3_801A9DE4(Player* player) { +void Aquas_801A9DE4(Player* player) { s32 i; if (D_i3_801C4190[0] == 777) { @@ -561,7 +562,7 @@ void func_i3_801A9DE4(Player* player) { } // Loop looks really fake. optimized out index? -void func_i3_801A9ED0(Player* player) { +void Aquas_801A9ED0(Player* player) { s32 j; s32 i; s32 sp8C; @@ -618,10 +619,10 @@ void func_i3_801A9ED0(Player* player) { } } } - func_i3_801A9DE4(player); + Aquas_801A9DE4(player); } -void func_i3_801AA20C(void) { +void Aquas_801AA20C(void) { f32 var_fs1; f32 var_fs2; s32 i; @@ -659,7 +660,7 @@ void func_i3_801AA20C(void) { } } -void func_i3_801AA4BC(Player* player) { +void Aquas_801AA4BC(Player* player) { f32 sp3C; f32 sp38; @@ -761,7 +762,7 @@ void func_i3_801AA4BC(Player* player) { } } -void func_i3_801AA8E8(Player* player) { +void Aquas_801AA8E8(Player* player) { f32 var_fv0 = gInputPress->stick_x; f32 var_fv1 = -gInputPress->stick_y; f32 temp; @@ -793,7 +794,7 @@ void func_i3_801AA8E8(Player* player) { gCsCamAtY = 20.0f; } gCsCamEyeZ = 240.0f; - gCsCamAtZ = player->unk_138 + (D_80177D20 - 1.0f); + gCsCamAtZ = player->unk_138 + (D_ctx_80177D20 - 1.0f); Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, player->unk_014, 1000.0f, 0); Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, player->unk_014, 1000.0f, 0); Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, 0.2f, 30.0f, 0.0f); @@ -805,7 +806,7 @@ void func_i3_801AA8E8(Player* player) { Math_SmoothStepToF(&player->unk_034, temp * 0.3f, 0.1f, 1.5f, 0.0f); } -void func_i3_801AACF8(Player* player) { +void Aquas_801AACF8(Player* player) { Vec3f sp8C; Vec3f sp80; Vec3f sp74; @@ -819,13 +820,13 @@ void func_i3_801AACF8(Player* player) { f32 var_fv1_2; s32 pad; - func_i3_801AA4BC(player); - func_i3_801A99D4(player); - func_i3_801A8E30(); + Aquas_801AA4BC(player); + Aquas_801A99D4(player); + Aquas_801A8E30(); sp64 = -gInputPress->stick_x; sp5C = gInputPress->stick_y; - D_80177970 = 0.68f; - Math_SmoothStepToF(&player->unk_180, sp64 * D_80177970, 1.0f, 10.0f, 0.0001f); + D_ctx_80177970 = 0.68f; + Math_SmoothStepToF(&player->unk_180, sp64 * D_ctx_80177970, 1.0f, 10.0f, 0.0001f); var_fa0 = fabsf(player->unk_180 * 0.5f); if (var_fa0 > 2.0f) { var_fa0 = 2.0f; @@ -841,20 +842,20 @@ void func_i3_801AACF8(Player* player) { } Math_SmoothStepToF(&D_i3_801C41B8[3], player->unk_180, 0.1f, 2.0f, 0.00001f); sp60 = D_i3_801C41B8[3]; - D_80177968 = 7.0f; + D_ctx_80177968 = 7.0f; if ((player->pos.x < (-player->unk_09C + player->unk_0AC + 10.0f)) && (sp60 >= 20.0f)) { - D_80177968 = 2.0f; + D_ctx_80177968 = 2.0f; Math_SmoothStepToF(&D_i3_801C41B8[9], 30.0f, 0.1f, 10.0f, 0.0001f); } if ((player->pos.x > (player->unk_09C + player->unk_0AC - 10.0f)) && (sp60 <= -20.0f)) { - D_80177968 = 2.0f; + D_ctx_80177968 = 2.0f; Math_SmoothStepToF(&D_i3_801C41B8[9], -30.0f, 0.1f, 10.0f, 0.0001f); } - Math_SmoothStepToF(&player->unk_0E8, sp60, 0.3f, D_80177968, 0.00001f); - if (D_80177968 != 2.0f) { + Math_SmoothStepToF(&player->unk_0E8, sp60, 0.3f, D_ctx_80177968, 0.00001f); + if (D_ctx_80177968 != 2.0f) { Math_SmoothStepToF(&D_i3_801C41B8[9], 0.0f, 0.1f, 20.0f, 0.0001f); } - Math_SmoothStepToF(&player->unk_17C, sp5C * D_80177970, 1.0f, 7.0f, 0.0001f); + Math_SmoothStepToF(&player->unk_17C, sp5C * D_ctx_80177970, 1.0f, 7.0f, 0.0001f); var_fa1 = fabsf(player->unk_17C * 0.05f); if (var_fa1 > 2.0f) { var_fa1 = 2.0f; @@ -870,11 +871,11 @@ void func_i3_801AACF8(Player* player) { } Math_SmoothStepToF(&D_i3_801C41B8[4], player->unk_17C * -1.0f, 0.1f, 3.0f, 0.00001f); sp58 = D_i3_801C41B8[4] * 0.8f; - D_80177968 = 10.0f; + D_ctx_80177968 = 10.0f; if (player->pos.y < (gGroundLevel + 50.0f)) { if (sp58 <= 0.0f) { sp58 = 0.0f; - D_80177968 = 2.0f; + D_ctx_80177968 = 2.0f; if (D_i3_801C4190[7] == 0) { AUDIO_PLAY_SFX(0x9404028, player->sfxSource, 0); D_i3_801C4190[7] = 1; @@ -890,7 +891,7 @@ void func_i3_801AACF8(Player* player) { } else { Math_SmoothStepToF(&D_i3_801C41B8[10], 0.0f, 0.1f, 1.0f, 0.00001f); } - Math_SmoothStepToF(&player->unk_0E4, sp58, 1.0f, D_80177968, 0.00001f); + Math_SmoothStepToF(&player->unk_0E4, sp58, 1.0f, D_ctx_80177968, 0.00001f); var_fv1_2 = 2.0f; if (sp64 == 0.0f) { var_fv1_2 = 1.0f; @@ -958,7 +959,7 @@ void func_i3_801AACF8(Player* player) { player->unk_0F4 += 8.0f + D_i3_801C41B8[24]; player->unk_080 = -SIN_DEG(player->unk_088) * 0.5f; player->unk_0F0 = SIN_DEG(player->unk_0F4) * 1.5f; - if (player->pos.y < (D_80177CC0 + 50.0f)) { + if (player->pos.y < (D_ctx_80177CC0 + 50.0f)) { Matrix_RotateY(gCalcMatrix, (player->unk_0E8 + player->unk_114) * M_DTOR, 0); Matrix_RotateX(gCalcMatrix, player->unk_0E4 * M_DTOR, 1); sp8C.x = sp8C.y = 0.0f; @@ -966,28 +967,28 @@ void func_i3_801AACF8(Player* player) { Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp8C, &sp80); if (player->unk_110 > 1.0f) { player->unk_178 -= 30.0f; - func_i3_801AC8A8(player->pos.x + RAND_FLOAT_CENTERED(10.0f) + sp80.x, - player->pos.y + RAND_FLOAT_CENTERED(10.0f) + sp80.y, - player->unk_138 + RAND_FLOAT_CENTERED(10.0f) + (sp80.z * -1.0f), 0.4f, 1); + Aquas_801AC8A8(player->pos.x + RAND_FLOAT_CENTERED(10.0f) + sp80.x, + player->pos.y + RAND_FLOAT_CENTERED(10.0f) + sp80.y, + player->unk_138 + RAND_FLOAT_CENTERED(10.0f) + (sp80.z * -1.0f), 0.4f, 1); } else { player->unk_178 -= 10.0f; if (!(gGameFrameCount & 7)) { - func_i3_801AC8A8(player->pos.x + RAND_FLOAT_CENTERED(10.0f) + sp80.x, - player->pos.y + RAND_FLOAT_CENTERED(10.0f) + sp80.y, - player->unk_138 + RAND_FLOAT_CENTERED(20.0f) + sp80.z, 0.4f, 0); + Aquas_801AC8A8(player->pos.x + RAND_FLOAT_CENTERED(10.0f) + sp80.x, + player->pos.y + RAND_FLOAT_CENTERED(10.0f) + sp80.y, + player->unk_138 + RAND_FLOAT_CENTERED(20.0f) + sp80.z, 0.4f, 0); } } } } -void func_i3_801AB9B0(Player* player) { - func_8007D0E0(player->pos.x, player->pos.y, player->unk_138, 6.0f); - func_8007B344(player->pos.x, player->pos.y, player->unk_138, 3.0f, 5); - func_8007BFFC(player->pos.x, player->pos.y, player->unk_138, 0.0f, 0.0f, 0.0f, 3.0f, 80); - func_8004D440(player); +void Aquas_801AB9B0(Player* player) { + func_effect_8007D0E0(player->pos.x, player->pos.y, player->unk_138, 6.0f); + func_effect_8007B344(player->pos.x, player->pos.y, player->unk_138, 3.0f, 5); + func_effect_8007BFFC(player->pos.x, player->pos.y, player->unk_138, 0.0f, 0.0f, 0.0f, 3.0f, 80); + func_demo_8004D440(player); } -void func_i3_801ABA40(PlayerShot* shot) { +void Aquas_801ABA40(PlayerShot* shot) { f32 sp7C; f32 sp78; f32 sp74; @@ -999,29 +1000,30 @@ void func_i3_801ABA40(PlayerShot* shot) { D_i3_801C41B8[21] = shot->obj.pos.x; D_i3_801C41B8[22] = shot->obj.pos.y; D_i3_801C41B8[23] = shot->obj.pos.z; - if ((fabsf(shot->obj.pos.z - (gPlayer[0].camEye.z - D_80177D20)) > 10000.0f) || + if ((fabsf(shot->obj.pos.z - (gPlayer[0].camEye.z - D_ctx_80177D20)) > 10000.0f) || (fabsf(shot->obj.pos.y - gPlayer[0].camEye.y) > 1500.0f) || ((fabsf(shot->obj.pos.x - gPlayer[0].camEye.x) > 4000.0f) && (shot->unk_5C != 0))) { shot->unk_64 = 0; } if (shot->obj.pos.y < gGroundLevel) { shot->obj.pos.y = gGroundLevel + 2.0f; - func_800365E4(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 0.0f, 0.0f, 0.0f, 0.0f, 90.0f, 2.0f, 0, 0); - func_8007CF30(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 1.2f); + func_beam_800365E4(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 0.0f, 0.0f, 0.0f, 0.0f, 90.0f, 2.0f, 0, + 0); + func_effect_8007CF30(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 1.2f); D_i3_801C4190[5] = D_i3_801C4190[3] = 0; - func_80036318(shot); + func_beam_80036318(shot); } else if (((shot->unk_64 == 0) || (D_i3_801C4454 == 0)) && (shot->unk_5C != 0)) { - func_8007CF30(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 1.2f); + func_effect_8007CF30(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 1.2f); D_i3_801C41B8[21] = D_i3_801C41B8[22] = D_i3_801C41B8[23] = 0.0f; D_i3_801C4190[5] = D_i3_801C4190[3] = 0; - func_80036318(shot); + func_beam_80036318(shot); } else { Math_SmoothStepToF(&shot->unk_48, 50.0f, 0.2f, 10.0f, 0.00001f); shot->obj.rot.z += shot->unk_48; if (!(gGameFrameCount & 1)) { - func_80035DEC(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z); + func_beam_80035DEC(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z); } - func_80038140(shot); + func_beam_80038140(shot); shot->unk_2C = (shot->obj.pos.y * 0.01f) + 1.2f; shot->unk_30 = (shot->obj.pos.y * 0.003f) + 0.6f; shot->unk_34 = (shot->obj.pos.y * 0.001f) + 0.6f; @@ -1075,13 +1077,13 @@ void func_i3_801ABA40(PlayerShot* shot) { break; } if (D_i3_801C4454 < 297) { - D_80178370 = shot->obj.pos.x; - D_80178374 = shot->obj.pos.y; - D_80178378 = shot->obj.pos.z; - D_80178360 = 255; - D_80178364 = 200; - D_80178368 = 150; - Math_SmoothStepToF(&D_8017836C, 0.8f, 1.0f, 0.08f, 0.001f); + D_ctx_80178370 = shot->obj.pos.x; + D_ctx_80178374 = shot->obj.pos.y; + D_ctx_80178378 = shot->obj.pos.z; + D_ctx_80178360 = 255; + D_ctx_80178364 = 200; + D_ctx_80178368 = 150; + Math_SmoothStepToF(&D_ctx_8017836C, 0.8f, 1.0f, 0.08f, 0.001f); } if (D_i3_801C4454 != 0) { D_i3_801C4454--; @@ -1089,30 +1091,30 @@ void func_i3_801ABA40(PlayerShot* shot) { } } -void func_i3_801AC09C(Player* player) { +void Aquas_801AC09C(Player* player) { s32 i; PlayerShot* shot; for (i = 15, shot = &gPlayerShots[15]; i < 16; i++, shot++) { if (shot->obj.status == OBJ_FREE) { - func_800AC290(player, shot, 0.0f, 0.0f, PLAYERSHOT_8, 50.0f); + func_play_800AC290(player, shot, 0.0f, 0.0f, PLAYERSHOT_8, 50.0f); AUDIO_PLAY_SFX(0x1000025, shot->sfxSource, 0); D_i3_801C4190[5] = i + 1; D_i3_801C4454 = 300; D_i3_801C4458 = -100.0f; D_i3_801C445C = 0.1f; - D_8017836C = 1.0f; + D_ctx_8017836C = 1.0f; break; } } } -void func_i3_801AC18C(Player* player) { +void Aquas_801AC18C(Player* player) { s32 i; for (i = 0; i < 3; i++) { if (gPlayerShots[i].obj.status == OBJ_FREE) { - func_800AC290(player, &gPlayerShots[i], 0.0f, -10.0f, PLAYERSHOT_0, 120.0f); + func_play_800AC290(player, &gPlayerShots[i], 0.0f, -10.0f, PLAYERSHOT_0, 120.0f); if (gLaserStrength[gPlayerNum] == LASERS_SINGLE) { AUDIO_PLAY_SFX(0x9400021, gPlayerShots[i].sfxSource, 0); } else { @@ -1123,7 +1125,7 @@ void func_i3_801AC18C(Player* player) { } } -void func_i3_801AC274(Player* player) { +void Aquas_801AC274(Player* player) { s32 temp; s32 i; f32 tempy1; @@ -1185,46 +1187,46 @@ void func_i3_801AC274(Player* player) { D_i3_801C41B8[5] = 20.0f; } if (D_i3_801C4190[0] != 0) { - func_i3_801A9C98(player); + Aquas_801A9C98(player); } if (gBosses[0].health != 0) { - func_i3_801A9ED0(player); + Aquas_801A9ED0(player); } } else { - func_i3_801A9C98(player); - func_i3_801A9DE4(player); + Aquas_801A9C98(player); + Aquas_801A9DE4(player); } if (gInputPress->button & A_BUTTON) { - func_i3_801AC18C(player); + Aquas_801AC18C(player); } if (gInputPress->button & B_BUTTON) { - func_i3_801AC09C(player); + Aquas_801AC09C(player); if (D_i3_801C4190[0] != 0) { D_i3_801C4190[3] = 1; } } if (D_i3_801C4190[5] == 0) { - D_80178370 = player->pos.x; - D_80178374 = player->pos.y - 5.0f; - D_80178378 = player->unk_138 - 60.0f; + D_ctx_80178370 = player->pos.x; + D_ctx_80178374 = player->pos.y - 5.0f; + D_ctx_80178378 = player->unk_138 - 60.0f; - D_80178360 += 4; - D_80178364 += 3; - D_80178368 += 2; - if (D_80178360 >= 255) { - D_80178360 = 255; + D_ctx_80178360 += 4; + D_ctx_80178364 += 3; + D_ctx_80178368 += 2; + if (D_ctx_80178360 >= 255) { + D_ctx_80178360 = 255; } - if (D_80178364 > 200) { - D_80178364 = 200; + if (D_ctx_80178364 > 200) { + D_ctx_80178364 = 200; } - if (D_80178368 > 150) { - D_80178368 = 150; + if (D_ctx_80178368 > 150) { + D_ctx_80178368 = 150; } - Math_SmoothStepToF(&D_8017836C, 0.2f, 1.0f, 0.04f, 0.001f); + Math_SmoothStepToF(&D_ctx_8017836C, 0.2f, 1.0f, 0.04f, 0.001f); } } -void func_i3_801AC7C8(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 state) { +void Aquas_801AC7C8(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 state) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_366; @@ -1243,19 +1245,19 @@ void func_i3_801AC7C8(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2, Object_SetInfo(&effect->info, effect->obj.id); } -void func_i3_801AC8A8(f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 unk4E) { +void Aquas_801AC8A8(f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 unk4E) { s32 i; for (i = 0; i < 95; i++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i3_801AC7C8(&gEffects[i], xPos, yPos, zPos, scale2, unk4E); + Aquas_801AC7C8(&gEffects[i], xPos, yPos, zPos, scale2, unk4E); break; } } } // OBJ_EFFECT_366 action -void func_i3_801AC918(Effect* effect) { +void Aquas_801AC918(Effect* effect) { f32 temp_fs0; if (effect->unk_46 != 0) { @@ -1301,7 +1303,7 @@ void func_i3_801AC918(Effect* effect) { } } -void func_i3_801ACBB4(Player* player) { +void Aquas_801ACBB4(Player* player) { Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -40.0f, 1); Matrix_RotateY(gGfxMatrix, M_PI, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -1332,7 +1334,7 @@ void func_i3_801ACBB4(Player* player) { Matrix_Pop(&gGfxMatrix); } -void func_i3_801ACE50(Player* player) { +void Aquas_801ACE50(Player* player) { f32 pad; f32 pad2; Vec3f sp54; @@ -1347,9 +1349,9 @@ void func_i3_801ACE50(Player* player) { sp54.x = sp54.y = 0.0f; sp54.z = 70.0f; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp54, &sp48); - func_i3_801AC8A8(player->pos.x + RAND_FLOAT_CENTERED(10.0f) + sp48.x, - player->pos.y + RAND_FLOAT_CENTERED(10.0f) + sp48.y, - player->unk_138 + RAND_FLOAT_CENTERED(10.0f) + (sp48.z * -1.0f), 0.4f, 1); + Aquas_801AC8A8(player->pos.x + RAND_FLOAT_CENTERED(10.0f) + sp48.x, + player->pos.y + RAND_FLOAT_CENTERED(10.0f) + sp48.y, + player->unk_138 + RAND_FLOAT_CENTERED(10.0f) + (sp48.z * -1.0f), 0.4f, 1); Math_SmoothStepToF(&player->unk_08C, -130.0f, 0.1f, 10.0f, 0.00001f); player->unk_130 -= player->unk_258; player->unk_258 += 0.2f; @@ -1390,7 +1392,7 @@ void func_i3_801ACE50(Player* player) { Math_SmoothStepToF(&D_i3_801C41B8[27], 10.0f, 0.1f, 2.0f, 0.00001f); Math_SmoothStepToF(&player->unk_08C, -200.0f, 0.1f, D_i3_801C41B8[27], 0.00001f); player->sfx.boost = 1; - Math_SmoothStepToF(&D_801779A8[0], 50.0f, 1.0f, 10.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_801779A8[0], 50.0f, 1.0f, 10.0f, 0.0f); } else { D_i3_801C41B8[27] = 0.0f; if (player->unk_2BC > 0.0f) { @@ -1411,7 +1413,7 @@ void func_i3_801ACE50(Player* player) { Math_SmoothStepToF(&player->unk_08C, 0.0f, 0.1f, 2.0f, 0.0f); } -void func_i3_801AD328(Player* player) { +void Aquas_801AD328(Player* player) { player->sfx.brake = 0; if ((gBrakeButton[player->num] & gInputHold->button) && (player->unk_230 == 0) && (player->state_1C8 != PLAYERSTATE_1C8_5) && (player->unk_2B4 == 0)) { @@ -1430,7 +1432,7 @@ void func_i3_801AD328(Player* player) { Math_SmoothStepToF(&D_i3_801C41B8[28], 10.0f, 1.0f, 2.0f, 0.00001f); Math_SmoothStepToF(&player->unk_08C, 180.0f, 0.1f, D_i3_801C41B8[28], 0.0f); player->sfx.brake = 1; - Math_SmoothStepToF(&D_801779A8[0], 25.0f, 1.0f, 5.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_801779A8[0], 25.0f, 1.0f, 5.0f, 0.0f); } else { if (player->unk_2BC > 0.0f) { player->unk_2BC -= 0.5f; @@ -1451,7 +1453,7 @@ void func_i3_801AD328(Player* player) { Math_SmoothStepToF(&player->unk_08C, 0.0f, 0.1f, 2.0f, 0.0f); } -void func_i3_801AD598(Actor* actor) { +void Aquas_801AD598(Actor* actor) { s32 i; D_i3_801C27C0 = &D_i3_801C27C8[50 * actor->iwork[0]]; @@ -1468,14 +1470,14 @@ void func_i3_801AD598(Actor* actor) { } } -void func_i3_801AD688(Actor* actor) { - func_i3_801AD598(actor); +void Aquas_801AD688(Actor* actor) { + Aquas_801AD598(actor); actor->iwork[1] = 10; actor->scale = 1.0f; } // OBJ_ACTOR_255 action -void func_i3_801AD6C0(Actor* actor) { +void Aquas_801AD6C0(Actor* actor) { s32 var_v0; f32 sp80; f32 sp7C; @@ -1597,16 +1599,16 @@ void func_i3_801AD6C0(Actor* actor) { var_v0 = var_v0 + (actor->iwork[0] + 1) * 50; } D_i3_801C27C0 = &D_i3_801C27C8[var_v0]; - func_800815DC(); + func_effect_800815DC(); actor->iwork[1]--; if (actor->iwork[1] <= 0) { actor->unk_044 = 0; actor->unk_0D4 = 2; - func_80066254(actor); + func_enmy_80066254(actor); Object_Kill(&actor->obj, actor->sfxSource); } actor->timer_0BC = 4; - func_8007D0E0(D_i3_801C27C0->pos.x, D_i3_801C27C0->pos.y, D_i3_801C27C0->pos.z, 3.0f); + func_effect_8007D0E0(D_i3_801C27C0->pos.x, D_i3_801C27C0->pos.y, D_i3_801C27C0->pos.z, 3.0f); AUDIO_PLAY_SFX(0x29018049, actor->sfxSource, 4); } break; @@ -1620,10 +1622,10 @@ void func_i3_801AD6C0(Actor* actor) { D_i3_801C27C0->rot.z = actor->unk_0F4.z; } -void func_i3_801ADF7C(f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 zRot, u8 type, s32 flag, f32 scale, - s32 index) { +void Aquas_801ADF7C(f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 zRot, u8 type, s32 flag, f32 scale, + s32 index) { Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, xPos, yPos, zPos + D_80177D20, 1); + Matrix_Translate(gGfxMatrix, xPos, yPos, zPos + D_ctx_80177D20, 1); Matrix_RotateY(gGfxMatrix, M_DTOR * yRot, 1); Matrix_RotateX(gGfxMatrix, M_DTOR * xRot, 1); Matrix_RotateZ(gGfxMatrix, M_DTOR * zRot, 1); @@ -1648,7 +1650,7 @@ void func_i3_801ADF7C(f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 zRot } // OBJ_ACTOR_255 draw -void func_i3_801AE168(Actor* actor) { +void Aquas_801AE168(Actor* actor) { s32 i; f32 xz; f32 yRot; @@ -1679,26 +1681,26 @@ void func_i3_801AE168(Actor* actor) { if (i >= 2) { yRot = RAD_TO_DEG(Math_Atan2F(gPlayer[0].camEye.x - D_i3_801C27C0->pos.x, - gPlayer[0].camEye.z - (D_i3_801C27C0->pos.z + D_80177D20))); - xz = sqrtf(((gPlayer[0].camEye.z - (D_i3_801C27C0->pos.z + D_80177D20)) * - (gPlayer[0].camEye.z - (D_i3_801C27C0->pos.z + D_80177D20))) + + gPlayer[0].camEye.z - (D_i3_801C27C0->pos.z + D_ctx_80177D20))); + xz = sqrtf(((gPlayer[0].camEye.z - (D_i3_801C27C0->pos.z + D_ctx_80177D20)) * + (gPlayer[0].camEye.z - (D_i3_801C27C0->pos.z + D_ctx_80177D20))) + ((gPlayer[0].camEye.x - D_i3_801C27C0->pos.x) * (gPlayer[0].camEye.x - D_i3_801C27C0->pos.x))); xRot = RAD_TO_DEG(-Math_Atan2F(gPlayer[0].camEye.y - D_i3_801C27C0->pos.y, xz)); } - func_i3_801ADF7C(D_i3_801C27C0->pos.x, D_i3_801C27C0->pos.y, D_i3_801C27C0->pos.z, xRot, yRot, - D_i3_801C27C0->rot.z, D_i3_801BFB90[i], actor->timer_0C6 & 1, actor->scale, i); + Aquas_801ADF7C(D_i3_801C27C0->pos.x, D_i3_801C27C0->pos.y, D_i3_801C27C0->pos.z, xRot, yRot, + D_i3_801C27C0->rot.z, D_i3_801BFB90[i], actor->timer_0C6 & 1, actor->scale, i); } } -void func_i3_801AE3AC(Actor* actor) { +void Aquas_801AE3AC(Actor* actor) { actor->fwork[1] = 1.0f; actor->obj.rot.x = 336.0f; actor->scale = 0.5f; } // OBJ_ACTOR_256 action -void func_i3_801AE3D8(Actor* actor) { +void Aquas_801AE3D8(Actor* actor) { s32 i; switch (actor->state) { @@ -1773,10 +1775,10 @@ void func_i3_801AE3D8(Actor* actor) { break; case 1: if (!(gGameFrameCount & 1)) { - func_8007C120(actor->obj.pos.x, actor->fwork[0] + actor->obj.pos.y, actor->obj.pos.z, actor->vel.x, - actor->vel.y, actor->vel.z, 0.1f, 10); - func_8007C120(actor->obj.pos.x, actor->obj.pos.y + (actor->fwork[0] * -1.0f), actor->obj.pos.z + 200.0f, - actor->vel.x, actor->vel.y, actor->vel.z, 0.1f, 10); + func_effect_8007C120(actor->obj.pos.x, actor->fwork[0] + actor->obj.pos.y, actor->obj.pos.z, + actor->vel.x, actor->vel.y, actor->vel.z, 0.1f, 10); + func_effect_8007C120(actor->obj.pos.x, actor->obj.pos.y + (actor->fwork[0] * -1.0f), + actor->obj.pos.z + 200.0f, actor->vel.x, actor->vel.y, actor->vel.z, 0.1f, 10); actor->fwork[0] += 40.0f; } if ((actor->fwork[2] * 400.0f) <= actor->fwork[0]) { @@ -1787,8 +1789,8 @@ void func_i3_801AE3D8(Actor* actor) { case 2: if (actor->timer_0BC == 0) { for (i = 0; i < 6; i++) { - func_8007B8F8(actor->obj.pos.x, actor->obj.pos.y + 450.0f, actor->obj.pos.z + 50.0f, 50.0f); - func_8007B8F8(actor->obj.pos.x, actor->obj.pos.y - 420.0f, actor->obj.pos.z + 300.0f, 50.0f); + func_effect_8007B8F8(actor->obj.pos.x, actor->obj.pos.y + 450.0f, actor->obj.pos.z + 50.0f, 50.0f); + func_effect_8007B8F8(actor->obj.pos.x, actor->obj.pos.y - 420.0f, actor->obj.pos.z + 300.0f, 50.0f); } actor->fwork[3] = 0.7f; actor->timer_0BC = 10; @@ -1801,9 +1803,9 @@ void func_i3_801AE3D8(Actor* actor) { Math_SmoothStepToF(&actor->fwork[3], 0.0f, 0.1f, 2.0f, 0); Math_SmoothStepToF(&actor->scale, 0.0f, actor->fwork[3], 10.0f, 0); if (actor->scale <= 0.2f) { - func_8007BC7C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 50.0f); - func_8007BC7C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 50.0f); - func_8007BC7C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 50.0f); + func_effect_8007BC7C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 50.0f); + func_effect_8007BC7C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 50.0f); + func_effect_8007BC7C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 50.0f); Object_Kill(&actor->obj, actor->sfxSource); D_i3_801C42A0[23]--; gBosses[0].swork[AQ_SWK_0] = 3; @@ -1812,9 +1814,9 @@ void func_i3_801AE3D8(Actor* actor) { if (D_i3_801C42A0[23] == 0) { D_i3_801C4308[79] = -180.0f; for (i = 0; i < 60; i++) { - func_i3_801AC8A8(gBosses[0].obj.pos.x + RAND_FLOAT_CENTERED(1800.0f), - gBosses[0].obj.pos.y + 400.0f + RAND_FLOAT_CENTERED(1000.0f), - gBosses[0].obj.pos.z + 700.0f + RAND_FLOAT_CENTERED(1000.0f), 7.0f, 2); + Aquas_801AC8A8(gBosses[0].obj.pos.x + RAND_FLOAT_CENTERED(1800.0f), + gBosses[0].obj.pos.y + 400.0f + RAND_FLOAT_CENTERED(1000.0f), + gBosses[0].obj.pos.z + 700.0f + RAND_FLOAT_CENTERED(1000.0f), 7.0f, 2); } gBosses[0].timer_052 = 0; gBosses[0].timer_056 = 60; @@ -1828,14 +1830,14 @@ void func_i3_801AE3D8(Actor* actor) { } // OBJ_ACTOR_256 draw -void func_i3_801AEB44(Actor* actor) { +void Aquas_801AEB44(Actor* actor) { f32 var_fv0; u8 var_t1; u8 i; Vtx* var_t5; Vtx* temp_v1_2; - if ((actor->timer_0C6 != 0) && (actor->state == 0) && (D_80177854 != 100)) { + if ((actor->timer_0C6 != 0) && (actor->state == 0) && (D_ctx_80177854 != 100)) { actor->iwork[1]++; actor->iwork[1] %= 8; } @@ -1938,7 +1940,7 @@ void func_i3_801AEB44(Actor* actor) { gDPSetTextureLUT(gMasterDisp++, G_TT_NONE); } -void func_i3_801AF9FC(Actor* actor) { +void Aquas_801AF9FC(Actor* actor) { s32 temp = actor->iwork[0]; actor->fwork[0] = actor->fwork[1] = actor->fwork[2] = 1.0f; @@ -1951,7 +1953,7 @@ void func_i3_801AF9FC(Actor* actor) { #ifdef NON_MATCHING // saved register use at start of case 3 // https://decomp.me/scratch/gNkkb -void func_i3_801AFA5C(Actor* actor) { +void Aquas_801AFA5C(Actor* actor) { s32 i; f32 sp70; f32 sp6C; @@ -1989,7 +1991,7 @@ void func_i3_801AFA5C(Actor* actor) { actor->health = actor->timer_0BE = 0; BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 200.0f, 3); gHitCount += 4; - D_80177850 = 15; + D_ctx_80177850 = 15; actor->info.bonus = 0; actor->state = 4; } @@ -1999,8 +2001,8 @@ void func_i3_801AFA5C(Actor* actor) { Object_Kill(&actor->obj, actor->sfxSource); } if (actor->timer_0C6 & 1) { - func_8007C120(actor->obj.pos.x, actor->obj.pos.y + 100.0f, actor->obj.pos.z + RAND_FLOAT(500.0f), actor->vel.x, - actor->vel.y, actor->vel.z, actor->scale * 0.2f, 10); + func_effect_8007C120(actor->obj.pos.x, actor->obj.pos.y + 100.0f, actor->obj.pos.z + RAND_FLOAT(500.0f), + actor->vel.x, actor->vel.y, actor->vel.z, actor->scale * 0.2f, 10); } switch (actor->state) { case 0: @@ -2110,8 +2112,8 @@ void func_i3_801AFA5C(Actor* actor) { Math_SmoothStepToF(&actor->vel.y, -10.0f, 0.1f, 1.0f, 0.001f); Math_SmoothStepToAngle(&actor->obj.rot.x, 80.0f, 0.1f, 1.0f, 0.001f); if (!(gGameFrameCount & 1)) { - func_i3_801AC8A8(actor->obj.pos.x + RAND_FLOAT_CENTERED(300.0f), - actor->obj.pos.y + RAND_FLOAT_CENTERED(200.0f), actor->obj.pos.z, 4.0f, 2); + Aquas_801AC8A8(actor->obj.pos.x + RAND_FLOAT_CENTERED(300.0f), + actor->obj.pos.y + RAND_FLOAT_CENTERED(200.0f), actor->obj.pos.z, 4.0f, 2); } if (actor->timer_0C6 == 0) { actor->timer_0C6 = 70; @@ -2126,7 +2128,7 @@ void func_i3_801AFA5C(Actor* actor) { sp6C = __sinf(sp70 + (i * 10.0f * M_DTOR)) * actor->fwork[6] * 10.0f; sp68 = __cosf(sp70 + (i * 10.0f * M_DTOR)) * actor->fwork[6] * 10.0f; pad64 = gGroundLevel + 30.0f; - func_8007B8F8(actor->obj.pos.x + sp6C, pad64, actor->obj.pos.z + sp68, 20.0f); + func_effect_8007B8F8(actor->obj.pos.x + sp6C, pad64, actor->obj.pos.z + sp68, 20.0f); } } if (actor->vel.z != 0) { @@ -2146,9 +2148,9 @@ void func_i3_801AFA5C(Actor* actor) { Math_SmoothStepToF(&actor->obj.pos.y, -300.0f, 0.1f, 1.0f, 0.001f); if (actor->fwork[0] <= 0.2f) { for (i = 0; i < 5; i++) { - func_8007BC7C(actor->obj.pos.x, gGroundLevel + 50.0f, actor->obj.pos.z, 20.0f); - func_i3_801AC8A8(actor->obj.pos.x + RAND_FLOAT_CENTERED(300.0f), gGroundLevel + (i * 20.0f), - actor->obj.pos.z, 5.0f, 2); + func_effect_8007BC7C(actor->obj.pos.x, gGroundLevel + 50.0f, actor->obj.pos.z, 20.0f); + Aquas_801AC8A8(actor->obj.pos.x + RAND_FLOAT_CENTERED(300.0f), gGroundLevel + (i * 20.0f), + actor->obj.pos.z, 5.0f, 2); } if (gBosses[0].state < 13) { gBosses[0].state++; @@ -2163,18 +2165,18 @@ void func_i3_801AFA5C(Actor* actor) { break; } if (actor->timer_0BE != 0) { - actor->fwork[3] = SIN_DEG(actor->timer_0BE * 20.0f) * func_i3_801A958C(actor->timer_0BE, 20.0f); - actor->fwork[4] = SIN_DEG(actor->timer_0BE * 20.0f) * func_i3_801A958C(actor->timer_0BE, 20.0f); - actor->fwork[5] = SIN_DEG(actor->timer_0BE * 20.0f) * func_i3_801A958C(actor->timer_0BE, 20.0f); + actor->fwork[3] = SIN_DEG(actor->timer_0BE * 20.0f) * Aquas_801A958C(actor->timer_0BE, 20.0f); + actor->fwork[4] = SIN_DEG(actor->timer_0BE * 20.0f) * Aquas_801A958C(actor->timer_0BE, 20.0f); + actor->fwork[5] = SIN_DEG(actor->timer_0BE * 20.0f) * Aquas_801A958C(actor->timer_0BE, 20.0f); } } #else // OBJ_ACTOR_257 action -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i3/fox_aq/func_i3_801AFA5C.s") +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i3/fox_aq/Aquas_801AFA5C.s") #endif // OBJ_ACTOR_257 draw -void func_i3_801B099C(Actor* actor) { +void Aquas_801B099C(Actor* actor) { Matrix_RotateY(gGfxMatrix, (actor->obj.rot.x + actor->fwork[3]) * M_DTOR, 1); Matrix_RotateX(gGfxMatrix, (actor->obj.rot.y + actor->fwork[4]) * M_DTOR, 1); Matrix_RotateZ(gGfxMatrix, (actor->obj.rot.z + actor->fwork[5]) * M_DTOR, 1); @@ -2200,7 +2202,7 @@ void func_i3_801B099C(Actor* actor) { } // OBJ_ACTOR_258 action -void func_i3_801B0B60(Actor* actor) { +void Aquas_801B0B60(Actor* actor) { Vec3f sp44; Vec3f sp38; @@ -2253,23 +2255,23 @@ void func_i3_801B0B60(Actor* actor) { if (Rand_ZeroOne() < 0.1) { actor->unk_044 = 22; actor->unk_0D4 = 2; - func_80066254(actor); + func_enmy_80066254(actor); } Object_Kill(&actor->obj, actor->sfxSource); - func_800815DC(); - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 50.0f, 5.0f); - func_8007A6F0(&actor->obj.pos, 0x29018049); + func_effect_800815DC(); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 50.0f, 5.0f); + func_effect_8007A6F0(&actor->obj.pos, 0x29018049); break; } if (!(gGameFrameCount & 0xF)) { - func_i3_801AC8A8(actor->obj.pos.x + RAND_FLOAT_CENTERED(10.0f), actor->obj.pos.y + RAND_FLOAT_CENTERED(10.0f), - actor->obj.pos.z + RAND_FLOAT_CENTERED(10.0f), 2.0f, 1); + Aquas_801AC8A8(actor->obj.pos.x + RAND_FLOAT_CENTERED(10.0f), actor->obj.pos.y + RAND_FLOAT_CENTERED(10.0f), + actor->obj.pos.z + RAND_FLOAT_CENTERED(10.0f), 2.0f, 1); } - func_i3_801A96DC(actor); + Aquas_801A96DC(actor); } // OBJ_ACTOR_258 draw -void func_i3_801B0EC0(Actor* actor) { +void Aquas_801B0EC0(Actor* actor) { if (actor->timer_0BC == 0) { Graphics_SetScaleMtx(0.8f); RCP_SetupDL(&gMasterDisp, 0x3D); @@ -2279,7 +2281,7 @@ void func_i3_801B0EC0(Actor* actor) { } } -void func_i3_801B0F88(Boss* bossAQ) { +void Aquas_801B0F88(Boss* bossAQ) { if ((D_i3_801C42A0[23] != 0) && (bossAQ->swork[AQ_SWK_0] < 2)) { bossAQ->swork[AQ_SWK_19] = 30; D_i3_801C4308[79] = 0.0f; @@ -2287,13 +2289,13 @@ void func_i3_801B0F88(Boss* bossAQ) { } } -void func_i3_801B0FCC(Boss* bossAQ) { +void Aquas_801B0FCC(Boss* bossAQ) { D_i3_801C4308[54] = D_i3_801C4308[61] = D_i3_801C4308[68] = 0.1f; bossAQ->swork[AQ_SWK_19] = 500; D_i3_801C4308[79] = -28.0f; } -void func_i3_801B1008(Boss* bossAQ, s32 timer) { +void Aquas_801B1008(Boss* bossAQ, s32 timer) { if ((bossAQ->swork[AQ_SWK_19] == 0) && (fabsf(D_i3_801C4308[10]) <= 1.0f) && (bossAQ->swork[AQ_SWK_0] == 0)) { D_i3_801C4308[79] = -28.0f; bossAQ->swork[AQ_SWK_19] = timer; @@ -2311,7 +2313,7 @@ void func_i3_801B1008(Boss* bossAQ, s32 timer) { } // OBJ_BOSS_AQ init -void func_i3_801B10F8(Boss* bossAQ) { +void Aquas_801B10F8(Boss* bossAQ) { s32 i; Actor* actor; @@ -2363,7 +2365,7 @@ void func_i3_801B10F8(Boss* bossAQ) { // loop at 2854 unrolls incorrectly // sp100 shouldn't be on the stack // https://decomp.me/scratch/M6ghQ -void func_i3_801B134C(Boss* bossAQ) { +void Aquas_801B134C(Boss* bossAQ) { s32 i; s32 i2; s32 i3; @@ -2423,12 +2425,12 @@ void func_i3_801B134C(Boss* bossAQ) { } break; case 2: - func_i3_801B0FCC(bossAQ); + Aquas_801B0FCC(bossAQ); if (!(bossAQ->timer_056 & 1)) { for (i3 = 0; i3 < 30; i3++) { - func_i3_801AC8A8(gBosses[0].obj.pos.x + RAND_FLOAT_CENTERED(1800.0f), - gBosses[0].obj.pos.y + RAND_FLOAT_CENTERED(500.0f), - gBosses[0].obj.pos.z + 700.0f + RAND_FLOAT_CENTERED(1000.0f), 7.0f, 2); + Aquas_801AC8A8(gBosses[0].obj.pos.x + RAND_FLOAT_CENTERED(1800.0f), + gBosses[0].obj.pos.y + RAND_FLOAT_CENTERED(500.0f), + gBosses[0].obj.pos.z + 700.0f + RAND_FLOAT_CENTERED(1000.0f), 7.0f, 2); } } if (bossAQ->timer_056 == 0) { @@ -2437,7 +2439,7 @@ void func_i3_801B134C(Boss* bossAQ) { } break; case 3: - func_i3_801B0FCC(bossAQ); + Aquas_801B0FCC(bossAQ); Math_SmoothStepToF(&D_i3_801C4308[12], -45.0f, 0.5f, 1.0f, 0.01f); Math_SmoothStepToF(&D_i3_801C4308[13], 30.0f, 0.5f, 1.0f, 0.01f); Math_SmoothStepToAngle(&D_i3_801C4308[14], 0.0f, 1.0f, 2.0f, 0.0f); @@ -2451,7 +2453,7 @@ void func_i3_801B134C(Boss* bossAQ) { } break; case 4: - func_i3_801B0FCC(bossAQ); + Aquas_801B0FCC(bossAQ); Math_SmoothStepToF(&D_i3_801C4308[58], 0.25f, 0.3f, 1.0f, 0.0f); if (bossAQ->timer_056 == 0) { bossAQ->timer_056 = 20; @@ -2459,7 +2461,7 @@ void func_i3_801B134C(Boss* bossAQ) { } break; case 5: - func_i3_801B0FCC(bossAQ); + Aquas_801B0FCC(bossAQ); Math_SmoothStepToF(&D_i3_801C4308[58], 0.25f, 0.3f, 1.0f, 0.0f); if (bossAQ->timer_056 == 0) { bossAQ->timer_056 = 30; @@ -2467,7 +2469,7 @@ void func_i3_801B134C(Boss* bossAQ) { } break; case 6: - func_i3_801B0FCC(bossAQ); + Aquas_801B0FCC(bossAQ); if (bossAQ->timer_056 == 0) { bossAQ->state = 7; } @@ -2502,10 +2504,10 @@ void func_i3_801B134C(Boss* bossAQ) { case 10: case 11: case 12: - func_i3_801B1008(bossAQ, 500); + Aquas_801B1008(bossAQ, 500); break; case 13: - func_i3_801B1008(bossAQ, 60); + Aquas_801B1008(bossAQ, 60); break; case 14: if (bossAQ->timer_056 == 58) { @@ -2528,19 +2530,19 @@ void func_i3_801B134C(Boss* bossAQ) { } break; case 16: - D_801779A8[0] = 20.0f; - if (D_80178480 == 0) { + D_ctx_801779A8[0] = 20.0f; + if (D_ctx_80178480 == 0) { - D_80178340 = D_80178348 = D_80178350 = D_80178354 = D_80178358 = 255; + D_ctx_80178340 = D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = D_ctx_80178358 = 255; - D_80178358 = 0; - D_8017835C = 25; - D_80178480 = 20 + RAND_FLOAT(20); + D_ctx_80178358 = 0; + D_ctx_8017835C = 25; + D_ctx_80178480 = 20 + RAND_FLOAT(20); } - if (D_80178480 == 29) { - D_80178348 = D_80178350 = D_80178354 = D_80178340 = 0; + if (D_ctx_80178480 == 29) { + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = D_ctx_80178340 = 0; } - Math_SmoothStepToF(&D_i3_801C41B8[25], D_8015F970, 1.0f, 100, 0.f); + Math_SmoothStepToF(&D_i3_801C41B8[25], D_bg_8015F970, 1.0f, 100, 0.f); Math_SmoothStepToF(&D_i3_801C41B8[26], 128.0f, 1.0f, 100, 0.f); for (i3 = 0; i3 < AQ_LIMB_MAX; i3++) { if (sBossAQlimbTimers[i3] == 0) { @@ -2553,29 +2555,30 @@ void func_i3_801B134C(Boss* bossAQ) { D_i3_801C42A0[7] = 50; } if (!(gGameFrameCount & 1)) { - func_8007C120(bossAQ->obj.pos.x + RAND_FLOAT_CENTERED(1200.0f), - bossAQ->obj.pos.y + 400.0f + RAND_FLOAT_CENTERED(400.0f), - bossAQ->obj.pos.z + 1000.0f + RAND_FLOAT_CENTERED(800.0f), bossAQ->vel.x, bossAQ->vel.y, - bossAQ->vel.z, 0.5f, 10); - func_8007D0E0(bossAQ->obj.pos.x + RAND_FLOAT_CENTERED(1200.0f), - bossAQ->obj.pos.y + 200.0f + RAND_FLOAT_CENTERED(400.0f), - bossAQ->obj.pos.z + 1000.0f + RAND_FLOAT_CENTERED(800.0f), 10.0f); + func_effect_8007C120(bossAQ->obj.pos.x + RAND_FLOAT_CENTERED(1200.0f), + bossAQ->obj.pos.y + 400.0f + RAND_FLOAT_CENTERED(400.0f), + bossAQ->obj.pos.z + 1000.0f + RAND_FLOAT_CENTERED(800.0f), bossAQ->vel.x, + bossAQ->vel.y, bossAQ->vel.z, 0.5f, 10); + func_effect_8007D0E0(bossAQ->obj.pos.x + RAND_FLOAT_CENTERED(1200.0f), + bossAQ->obj.pos.y + 200.0f + RAND_FLOAT_CENTERED(400.0f), + bossAQ->obj.pos.z + 1000.0f + RAND_FLOAT_CENTERED(800.0f), 10.0f); } if (i3 && i3) {} for (i3 = 0; i3 < 3; i3++) { - func_80081A8C(bossAQ->obj.pos.x + RAND_FLOAT_CENTERED(1200.0f), - bossAQ->obj.pos.y + 200.0f + RAND_FLOAT_CENTERED(200.0f), - bossAQ->obj.pos.z + 1000.0f + RAND_FLOAT_CENTERED(800.0f), 3.0f + RAND_FLOAT(3.0f), 5); + func_effect_80081A8C(bossAQ->obj.pos.x + RAND_FLOAT_CENTERED(1200.0f), + bossAQ->obj.pos.y + 200.0f + RAND_FLOAT_CENTERED(200.0f), + bossAQ->obj.pos.z + 1000.0f + RAND_FLOAT_CENTERED(800.0f), 3.0f + RAND_FLOAT(3.0f), + 5); } if (bossAQ->timer_056 == 0) { gEffects[98].obj.status = OBJ_FREE; gEffects[99].obj.status = OBJ_FREE; - func_8007A568(bossAQ->obj.pos.x, bossAQ->obj.pos.y, bossAQ->obj.pos.z + 600.0f, 40.0f); + func_effect_8007A568(bossAQ->obj.pos.x, bossAQ->obj.pos.y, bossAQ->obj.pos.z + 600.0f, 40.0f); bossAQ->timer_056 = 50; for (i3 = 0; i3 < AQ_LIMB_MAX; i3++) { sBossAQlimbTimers[i3] = 100; } - D_80178348 = D_80178350 = D_80178354 = D_80178340 = 0; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = D_ctx_80178340 = 0; bossAQ->state = 17; } break; @@ -2583,7 +2586,7 @@ void func_i3_801B134C(Boss* bossAQ) { if (bossAQ->timer_056 == 20) { gEffects[96].obj.status = OBJ_FREE; gEffects[97].obj.status = OBJ_FREE; - func_8007A568(bossAQ->obj.pos.x, bossAQ->obj.pos.y, bossAQ->obj.pos.z + 600.0f, 80.0f); + func_effect_8007A568(bossAQ->obj.pos.x, bossAQ->obj.pos.y, bossAQ->obj.pos.z + 600.0f, 80.0f); } D_i3_801C42A0[0] -= 4; if (D_i3_801C42A0[0] < 0) { @@ -2596,10 +2599,10 @@ void func_i3_801B134C(Boss* bossAQ) { Math_SmoothStepToF(&bossAQ->fwork[AQ_FWK_9], 0.1f, 0.1f, 1.0f, 0.0f); Math_SmoothStepToF(&bossAQ->fwork[AQ_FWK_10], 0.1f, 0.1f, 1.0f, 0.0f); if (!(gGameFrameCount & 1)) { - func_8007C120(bossAQ->obj.pos.x + RAND_FLOAT_CENTERED(1200.0f), - bossAQ->obj.pos.y + 400.0f + RAND_FLOAT_CENTERED(400.0f), - bossAQ->obj.pos.z + 1000.0f + RAND_FLOAT_CENTERED(800.0f), bossAQ->vel.x, bossAQ->vel.y, - bossAQ->vel.z, 0.7f, 15); + func_effect_8007C120(bossAQ->obj.pos.x + RAND_FLOAT_CENTERED(1200.0f), + bossAQ->obj.pos.y + 400.0f + RAND_FLOAT_CENTERED(400.0f), + bossAQ->obj.pos.z + 1000.0f + RAND_FLOAT_CENTERED(800.0f), bossAQ->vel.x, + bossAQ->vel.y, bossAQ->vel.z, 0.7f, 15); } if (bossAQ->timer_056 == 1) { for (i3 = 0; i3 < AQ_LIMB_MAX; i3++) { @@ -2616,9 +2619,9 @@ void func_i3_801B134C(Boss* bossAQ) { case 18: if (bossAQ->timer_056 != 0) { for (i3 = 0; i3 < 30; i3++) { - func_i3_801AC8A8(gBosses[0].obj.pos.x + RAND_FLOAT_CENTERED(1800.0f), - gBosses[0].obj.pos.y + RAND_FLOAT_CENTERED(500.0f), - gBosses[0].obj.pos.z + 700.0f + RAND_FLOAT_CENTERED(1000.0f), 7.0f, 2); + Aquas_801AC8A8(gBosses[0].obj.pos.x + RAND_FLOAT_CENTERED(1800.0f), + gBosses[0].obj.pos.y + RAND_FLOAT_CENTERED(500.0f), + gBosses[0].obj.pos.z + 700.0f + RAND_FLOAT_CENTERED(1000.0f), 7.0f, 2); } } break; @@ -2635,7 +2638,7 @@ void func_i3_801B134C(Boss* bossAQ) { case 1: Math_SmoothStepToF(&D_i3_801C4308[10], -28.0f, 0.05f, 0.3f, 0.0f); if (bossAQ->timer_052 < 3) { - func_i3_801B0F88(bossAQ); + Aquas_801B0F88(bossAQ); } break; case 2: @@ -2656,17 +2659,17 @@ void func_i3_801B134C(Boss* bossAQ) { } bossAQ->timer_058 = 30; bossAQ->swork[AQ_SWK_0] = 4; - D_80178480 = 50; + D_ctx_80178480 = 50; AUDIO_PLAY_SFX(0x1900002D, bossAQ->sfxSource, 0); - func_80062B60(bossAQ->obj.pos.x, bossAQ->obj.pos.z + 800.0f, 0, 100.0f); + func_enmy_80062B60(bossAQ->obj.pos.x, bossAQ->obj.pos.z + 800.0f, 0, 100.0f); var_fs3 = 80.0f; for (i2 = 0; i2 < 3; i2++, var_fs3 += 10.0f) { for (i3 = 0; i3 < 9; i3++) { var_fs0 = SIN_DEG((27 + 2 * i3) * (10.0f + 3 * i2)) * var_fs3 * 10.0f; var_fs1 = COS_DEG((27 + 2 * i3) * (10.0f + 3 * i2)) * var_fs3 * 10.0f; temp3 = gGroundLevel + 30.0f; - func_8007B8F8(bossAQ->obj.pos.x + var_fs0, temp3, bossAQ->obj.pos.z + 1000.0f + var_fs1, - 20.0f); + func_effect_8007B8F8(bossAQ->obj.pos.x + var_fs0, temp3, + bossAQ->obj.pos.z + 1000.0f + var_fs1, 20.0f); } } } @@ -2676,7 +2679,7 @@ void func_i3_801B134C(Boss* bossAQ) { bossAQ->swork[AQ_SWK_19] = 50; Math_SmoothStepToF(&D_i3_801C4308[10], D_i3_801C4308[79], 0.5f, 5.0f, 0.0f); if (bossAQ->timer_058 > 10) { - Math_SmoothStepToF(D_801779A8, 20.0f, 1.0f, 5.0f, 0.0f); + Math_SmoothStepToF(D_ctx_801779A8, 20.0f, 1.0f, 5.0f, 0.0f); } if (bossAQ->timer_058 != 0) { gPlayer[0].unk_2B4 = 1; @@ -2725,7 +2728,7 @@ void func_i3_801B134C(Boss* bossAQ) { spD4.x = D_i3_801C4308[73]; spD4.y = D_i3_801C4308[74]; spD4.z = D_i3_801C4308[75]; // 74? - func_8007A6F0(&spD4, 0x19000033); + func_effect_8007A6F0(&spD4, 0x19000033); bossAQ->swork[AQ_SWK_10] = 250.0f + RAND_FLOAT(50.0f); } } @@ -2744,7 +2747,7 @@ void func_i3_801B134C(Boss* bossAQ) { spD4.x = D_i3_801C4308[76]; spD4.y = D_i3_801C4308[77]; // 76? spD4.z = D_i3_801C4308[78]; - func_8007A6F0(&spD4, 0x19000033); + func_effect_8007A6F0(&spD4, 0x19000033); bossAQ->swork[AQ_SWK_11] = 250.0f + RAND_FLOAT(50.0f); } } @@ -2791,9 +2794,9 @@ void func_i3_801B134C(Boss* bossAQ) { if (bossAQ->health <= 0) { SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 40); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 40); - func_80042EC0(bossAQ); + func_boss_80042EC0(bossAQ); Radio_PlayMessage(gMsg_ID_15252, RCID_SLIPPY); - D_8017796C = -1; + D_ctx_8017796C = -1; if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) || (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_5)) { gPlayer[0].state_1C8 = PLAYERSTATE_1C8_7; @@ -2977,7 +2980,7 @@ void func_i3_801B134C(Boss* bossAQ) { spD4.x = D_i3_801C4308[73 + 3 * i7]; spD4.y = D_i3_801C4308[74 + 3 * i7]; spD4.z = D_i3_801C4308[75 + 3 * i7]; - func_8007A6F0(&spD4, 0x2903404B); + func_effect_8007A6F0(&spD4, 0x2903404B); i2 = 0; for (i3 = 0; i2 <= i && i3 < 60; i3++) { if ((gActors[i3].obj.status == OBJ_FREE) && (i3 < 60)) { @@ -3050,12 +3053,12 @@ void func_i3_801B134C(Boss* bossAQ) { D_i3_801C42A0[9] = sp110; } if (D_i3_801C42A0[7] != 0) { - Math_SmoothStepToF(&D_801779A8[0], 20.0f, 1.0f, 5.0f, 0); + Math_SmoothStepToF(&D_ctx_801779A8[0], 20.0f, 1.0f, 5.0f, 0); } for (i2 = 45, i3 = 1, i7 = 0; i7 < 14; i3++, i2++, i7 += 2) { if (D_i3_801C42A0[i3] != 0) { D_i3_801C4308[i2] = SIN_DEG(D_i3_801C0060[i7 + 0] * D_i3_801C42A0[i3]) * - func_i3_801A958C(D_i3_801C42A0[i3], D_i3_801C0060[i7 + 1]); + Aquas_801A958C(D_i3_801C42A0[i3], D_i3_801C0060[i7 + 1]); D_i3_801C42A0[i3]--; } } @@ -3109,7 +3112,7 @@ void func_i3_801B134C(Boss* bossAQ) { spD4.x = D_i3_801C4308[73 + 3 * i3]; spD4.y = D_i3_801C4308[74 + 3 * i3]; spD4.z = D_i3_801C4308[75 + 3 * i3]; - func_8007A6F0(&spD4, 0x29400052); + func_effect_8007A6F0(&spD4, 0x29400052); } if ((fabsf(D_i3_801C4308[10]) <= 3.0f) || (bossAQ->swork[AQ_SWK_10 + i3] == 0)) { Math_SmoothStepToF(&D_i3_801C4308[52 + i3], 1.0f, 0.1f, 0.5f, 0.0f); @@ -3120,7 +3123,7 @@ void func_i3_801B134C(Boss* bossAQ) { spD4.x = D_i3_801C4308[73 + 3 * i3] + RAND_FLOAT(i * 200.0f); spD4.y = D_i3_801C4308[74 + 3 * i3] + RAND_FLOAT(i * 200.0f); spD4.z = D_i3_801C4308[75 + 3 * i3] + RAND_FLOAT(i * 400.0f); - func_i3_801A94EC(&spD4, OBJ_ITEM_SILVER_RING); + Aquas_801A94EC(&spD4, OBJ_ITEM_SILVER_RING); } bossAQ->swork[AQ_SWK_8 + i3] = 2; } @@ -3161,11 +3164,11 @@ void func_i3_801B134C(Boss* bossAQ) { } } #else -void func_i3_801B134C(Boss* bossAQ); -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i3/fox_aq/func_i3_801B134C.s") +void Aquas_801B134C(Boss* bossAQ); +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i3/fox_aq/Aquas_801B134C.s") #endif -bool func_i3_801B42AC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { +bool Aquas_801B42AC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { Vec3f sp6C = { 0.0f, 0.0f, 0.0f }; Vec3f sp60; f32 sp5C = 0.0f; @@ -3176,7 +3179,7 @@ bool func_i3_801B42AC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* if (sBossAQlimbTimers[limbIndex] >= 1000) { *dList = NULL; - } else if ((sBossAQlimbTimers[limbIndex] != 0) && (D_80177854 != 100)) { + } else if ((sBossAQlimbTimers[limbIndex] != 0) && (D_ctx_80177854 != 100)) { sBossAQlimbTimers[limbIndex]--; } gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); @@ -3302,7 +3305,7 @@ bool func_i3_801B42AC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* Matrix_RotateX(gCalcMatrix, rot->x * M_DTOR, 1); if (*dList != NULL) { Matrix_MultVec3f(gCalcMatrix, &sp6C, &sp60); - func_8005F670(&sp60); + func_edisplay_8005F670(&sp60); Matrix_Mult(gGfxMatrix, gCalcMatrix, 1); Matrix_Push(&gGfxMatrix); Matrix_Scale(gGfxMatrix, sp5C, sp58, sp54, 1); @@ -3315,7 +3318,7 @@ bool func_i3_801B42AC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* return false; } -void func_i3_801B49DC(s32 limbIndex, Vec3f* rot, void* thisx) { +void Aquas_801B49DC(s32 limbIndex, Vec3f* rot, void* thisx) { Vec3f sp6C; Vec3f sp60 = { 0.0f, 0.0f, 0.0f }; Vec3f sp54 = { 340.0f, 600.0f, 1480.0f }; @@ -3401,8 +3404,8 @@ void func_i3_801B49DC(s32 limbIndex, Vec3f* rot, void* thisx) { } // OBJ_BOSS_AQ draw -void func_i3_801B4D84(Boss* bossAQ) { - Animation_DrawSkeleton(3, D_AQ_602BD60, bossAQ->vwork, func_i3_801B42AC, func_i3_801B49DC, bossAQ, gCalcMatrix); +void Aquas_801B4D84(Boss* bossAQ) { + Animation_DrawSkeleton(3, D_AQ_602BD60, bossAQ->vwork, Aquas_801B42AC, Aquas_801B49DC, bossAQ, gCalcMatrix); } f32 D_i3_801C01F8[11] = { @@ -3413,7 +3416,7 @@ f32 D_i3_801C0224[11] = { }; Vec3f D_i3_801C0250 = { 0.0f, 0.0f, 0.0f }; -s32 func_i3_801B4DDC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { +s32 Aquas_801B4DDC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { Actor* this = thisx; if (!(this->timer_0C6 & 1)) { @@ -3428,7 +3431,7 @@ s32 func_i3_801B4DDC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* t return false; } -void func_i3_801B4E94(s32 limbIndex, Vec3f* rot, void* thisx) { +void Aquas_801B4E94(s32 limbIndex, Vec3f* rot, void* thisx) { Vec3f sp24 = D_i3_801C0250; Actor* this = thisx; @@ -3471,12 +3474,12 @@ void func_i3_801B4E94(s32 limbIndex, Vec3f* rot, void* thisx) { } // OBJ_ACTOR_261 draw -void func_i3_801B504C(Actor* actor) { +void Aquas_801B504C(Actor* actor) { Vec3f sp30[30]; Matrix_Scale(gCalcMatrix, actor->scale, actor->scale, actor->scale, 1); Animation_GetFrameData(&D_AQ_6005954, actor->unk_0B6, sp30); - Animation_DrawSkeleton(3, D_AQ_6005A80, sp30, func_i3_801B4DDC, func_i3_801B4E94, actor, gCalcMatrix); + Animation_DrawSkeleton(3, D_AQ_6005A80, sp30, Aquas_801B4DDC, Aquas_801B4E94, actor, gCalcMatrix); } f32 D_i3_801C025C[2] = { 120.0f, 0.0f }; @@ -3485,7 +3488,7 @@ s32 D_i3_801C0264[19] = { }; // OBJ_ACTOR_261 action -void func_i3_801B50E8(Actor* actor) { +void Aquas_801B50E8(Actor* actor) { s32 i; Vec3f sp88; Vec3f sp7C; @@ -3494,12 +3497,12 @@ void func_i3_801B50E8(Actor* actor) { if ((actor->health == 0) && (actor->state != 0)) { for (i = 0; i < 5; i++) { - func_80081A8C(actor->obj.pos.x + RAND_FLOAT(i * 15.0f), actor->obj.pos.y + RAND_FLOAT(i * 3.0f), - actor->obj.pos.z + RAND_FLOAT(i * 5.0f), 0.4f + RAND_FLOAT(0.4f), 7); + func_effect_80081A8C(actor->obj.pos.x + RAND_FLOAT(i * 15.0f), actor->obj.pos.y + RAND_FLOAT(i * 3.0f), + actor->obj.pos.z + RAND_FLOAT(i * 5.0f), 0.4f + RAND_FLOAT(0.4f), 7); } actor->health = 0; actor->state = 7; - func_8007A6F0(&actor->obj.pos, 0x29038090); + func_effect_8007A6F0(&actor->obj.pos, 0x29038090); } switch (actor->state) { case 0: @@ -3519,11 +3522,11 @@ void func_i3_801B50E8(Actor* actor) { case 2: Math_SmoothStepToF(&actor->obj.pos.z, gPlayer[0].unk_138, 1.0f, 10.0f, 0); if (fabsf(actor->obj.pos.z - gPlayer[0].unk_138) < actor->fwork[4]) { - func_i3_801A9728(actor, 50.0f, 10.0f, 8); + Aquas_801A9728(actor, 50.0f, 10.0f, 8); actor->state = 3; actor->vel.y = 30.0f; } else if (!(gGameFrameCount & 0xF)) { - func_8007B8F8(actor->obj.pos.x, gGroundLevel + 30.0f, actor->obj.pos.z, 10.0f); + func_effect_8007B8F8(actor->obj.pos.x, gGroundLevel + 30.0f, actor->obj.pos.z, 10.0f); } break; case 3: @@ -3545,9 +3548,9 @@ void func_i3_801B50E8(Actor* actor) { actor->state = 5; } if (!(gGameFrameCount & 7)) { - func_i3_801AC8A8(actor->obj.pos.x + RAND_FLOAT_CENTERED(100.0f), - actor->obj.pos.y + RAND_FLOAT_CENTERED(100.0f), - actor->obj.pos.z + RAND_FLOAT_CENTERED(100.0f), 1.0f, 1); + Aquas_801AC8A8(actor->obj.pos.x + RAND_FLOAT_CENTERED(100.0f), + actor->obj.pos.y + RAND_FLOAT_CENTERED(100.0f), + actor->obj.pos.z + RAND_FLOAT_CENTERED(100.0f), 1.0f, 1); } break; case 5: @@ -3579,22 +3582,22 @@ void func_i3_801B50E8(Actor* actor) { Math_SmoothStepToAngle(&actor->obj.rot.x, actor->fwork[3], 1.0f, 5.0f, 0); Math_SmoothStepToAngle(&actor->obj.rot.y, actor->fwork[2], 1.0f, 5.0f, 0); if (!(gGameFrameCount & 3)) { - func_i3_801AC8A8(actor->obj.pos.x + RAND_FLOAT_CENTERED(100.0f), - actor->obj.pos.y + RAND_FLOAT_CENTERED(100.0f), - actor->obj.pos.z + RAND_FLOAT_CENTERED(100.0f), 1.0f, 1); + Aquas_801AC8A8(actor->obj.pos.x + RAND_FLOAT_CENTERED(100.0f), + actor->obj.pos.y + RAND_FLOAT_CENTERED(100.0f), + actor->obj.pos.z + RAND_FLOAT_CENTERED(100.0f), 1.0f, 1); } break; case 7: for (i = 0; i < 8; i++) { - func_i3_801A9448(&actor->vwork[i], &actor->vwork[8 + i], RAND_FLOAT_CENTERED(20.0f), RAND_FLOAT(5.0f), - RAND_FLOAT_CENTERED(10.0f), 49, actor->scale, 200, i); - func_8007BC7C(actor->vwork[i].x, actor->vwork[i].y, actor->vwork[i].z + 100.0f, 6.0f); + Aquas_801A9448(&actor->vwork[i], &actor->vwork[8 + i], RAND_FLOAT_CENTERED(20.0f), RAND_FLOAT(5.0f), + RAND_FLOAT_CENTERED(10.0f), 49, actor->scale, 200, i); + func_effect_8007BC7C(actor->vwork[i].x, actor->vwork[i].y, actor->vwork[i].z + 100.0f, 6.0f); } actor->unk_044 = 0; - func_80066254(actor); - func_800815DC(); + func_enmy_80066254(actor); + func_effect_800815DC(); Object_Kill(&actor->obj, actor->sfxSource); - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 6.0f); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 6.0f); break; } if (actor->state >= 2) { @@ -3637,7 +3640,7 @@ void func_i3_801B50E8(Actor* actor) { } } -s32 func_i3_801B5C18(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { +s32 Aquas_801B5C18(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { f32 sp6C = 1.0f; f32 sp68 = 1.0f; f32 sp64 = 1.0f; @@ -3672,7 +3675,7 @@ s32 func_i3_801B5C18(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* t Matrix_RotateX(gCalcMatrix, rot->x * M_DTOR, 1); if (*dList != NULL) { Matrix_MultVec3f(gCalcMatrix, &sp4C, &sp58); - func_8005F670(&sp58); + func_edisplay_8005F670(&sp58); Matrix_Mult(gGfxMatrix, gCalcMatrix, 1); Matrix_Push(&gGfxMatrix); Matrix_Scale(gGfxMatrix, sp6C, sp68, sp64, 1); @@ -3685,7 +3688,7 @@ s32 func_i3_801B5C18(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* t return false; } -void func_i3_801B5F68(s32 limbIndex, Vec3f* rot, void* thisx) { +void Aquas_801B5F68(s32 limbIndex, Vec3f* rot, void* thisx) { Vec3f sp3C = { 0.0f, 0.0f, 0.0f }; Vec3f sp30; Vec3f sp24; @@ -3746,14 +3749,14 @@ f32 D_i3_801C02C8[2] = { 255.0f, 68.0f }; s32 D_i3_801C02D0[2] = { 70, 100 }; // OBJ_ACTOR_259 draw -void func_i3_801B619C(Actor* actor) { +void Aquas_801B619C(Actor* actor) { Vec3f sp40[30]; Matrix_Push(&gCalcMatrix); Matrix_Push(&gGfxMatrix); Matrix_Scale(gCalcMatrix, actor->scale, actor->scale, actor->scale, 1); Animation_GetFrameData(&D_AQ_6002628, actor->unk_0B6, sp40); - Animation_DrawSkeleton(3, D_AQ_6002874, sp40, func_i3_801B5C18, func_i3_801B5F68, actor, gCalcMatrix); + Animation_DrawSkeleton(3, D_AQ_6002874, sp40, Aquas_801B5C18, Aquas_801B5F68, actor, gCalcMatrix); Matrix_Pop(&gGfxMatrix); Matrix_Pop(&gCalcMatrix); Matrix_Push(&gGfxMatrix); @@ -3767,7 +3770,7 @@ void func_i3_801B619C(Actor* actor) { Matrix_Pop(&gGfxMatrix); } -void func_i3_801B6344(Actor* actor) { +void Aquas_801B6344(Actor* actor) { actor->health = 200; actor->iwork[13] = actor->fwork[4] = 255.0f; actor->fwork[12] = actor->obj.rot.y; @@ -3777,7 +3780,7 @@ void func_i3_801B6344(Actor* actor) { #ifdef NON_MATCHING // The big spherical angle calculation has a reg swap. // https://decomp.me/scratch/DLrGN -void func_i3_801B638C(Actor* actor) { +void Aquas_801B638C(Actor* actor) { Actor* var_v0; s32 i; f32 spB4; @@ -3795,26 +3798,26 @@ void func_i3_801B638C(Actor* actor) { if (actor->health == 0) { for (i = 0; i < 9; i++) { - func_i3_801A9448(&actor->vwork[i], &actor->vwork[9 + i], RAND_FLOAT_CENTERED(20.0f), RAND_FLOAT(5.0f), - RAND_FLOAT_CENTERED(10.0f), 48, actor->scale, 200, i); - func_8007BC7C(actor->vwork[i].x, actor->vwork[i].y, actor->vwork[i].z, 10.0f); + Aquas_801A9448(&actor->vwork[i], &actor->vwork[9 + i], RAND_FLOAT_CENTERED(20.0f), RAND_FLOAT(5.0f), + RAND_FLOAT_CENTERED(10.0f), 48, actor->scale, 200, i); + func_effect_8007BC7C(actor->vwork[i].x, actor->vwork[i].y, actor->vwork[i].z, 10.0f); } - func_800815DC(); - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 150.0f, 10.0f); - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 150.0f, 10.0f); - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 150.0f, 10.0f); + func_effect_800815DC(); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 150.0f, 10.0f); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 150.0f, 10.0f); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 150.0f, 10.0f); for (i = 0; i < 5; i++) { - func_80081A8C(actor->obj.pos.x + RAND_FLOAT(i * 15.0f), actor->obj.pos.y + RAND_FLOAT(i * 3.0f), - actor->obj.pos.z + RAND_FLOAT(i * 5.0f), 1.0f + RAND_FLOAT(1.0f), 7); + func_effect_80081A8C(actor->obj.pos.x + RAND_FLOAT(i * 15.0f), actor->obj.pos.y + RAND_FLOAT(i * 3.0f), + actor->obj.pos.z + RAND_FLOAT(i * 5.0f), 1.0f + RAND_FLOAT(1.0f), 7); } actor->unk_044 = 2; if (actor->iwork[16] != 0) { actor->unk_044 = 14; } - func_80066254(actor); + func_enmy_80066254(actor); Object_Kill(&actor->obj, actor->sfxSource); AUDIO_PLAY_SFX(0x1903001D, actor->sfxSource, 4); - func_8007A6F0(&actor->obj.pos, 0x29038090); + func_effect_8007A6F0(&actor->obj.pos, 0x29038090); } actor->fwork[5] = (actor->obj.pos.y * 0.01f) + 2.5f; actor->fwork[6] = (actor->obj.pos.y * 0.003f) + 0.8f; @@ -3928,17 +3931,17 @@ void func_i3_801B638C(Actor* actor) { actor->health = 0; BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 200.0f, 3); gHitCount += 4; - D_80177850 = 15; + D_ctx_80177850 = 15; } } } } #else // OBJ_ACTOR_259 action -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i3/fox_aq/func_i3_801B638C.s") +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i3/fox_aq/Aquas_801B638C.s") #endif -void func_i3_801B6E54(Actor* actor) { +void Aquas_801B6E54(Actor* actor) { s32 i; for (i = 0; i < 15; i++) { @@ -3962,7 +3965,7 @@ void func_i3_801B6E54(Actor* actor) { // reloads 0.0f for temp_fs2_2. // https://decomp.me/scratch/02s9H -void func_i3_801B6FF8(Actor* actor) { +void Aquas_801B6FF8(Actor* actor) { s32 i; f32 temp_dx; f32 temp_dy; @@ -3975,15 +3978,15 @@ void func_i3_801B6FF8(Actor* actor) { if (actor->health == -100) { actor->unk_044 = 2; - func_80066254(actor); + func_enmy_80066254(actor); for (i = 0; i < 15; i++) { - func_i3_801A9448(&actor->vwork[i], &actor->vwork[15 + i], RAND_FLOAT_CENTERED(20.0f), RAND_FLOAT(5.0f), - RAND_FLOAT_CENTERED(10.0f), 51, actor->scale, 200, i); - func_800815DC(); - func_8007D0E0(actor->vwork[i].x, actor->vwork[i].y, actor->vwork[i].z + 100.0f, 6.0f); + Aquas_801A9448(&actor->vwork[i], &actor->vwork[15 + i], RAND_FLOAT_CENTERED(20.0f), RAND_FLOAT(5.0f), + RAND_FLOAT_CENTERED(10.0f), 51, actor->scale, 200, i); + func_effect_800815DC(); + func_effect_8007D0E0(actor->vwork[i].x, actor->vwork[i].y, actor->vwork[i].z + 100.0f, 6.0f); } Object_Kill(&actor->obj, actor->sfxSource); - func_8007A6F0(&actor->obj.pos, 0x29038090); + func_effect_8007A6F0(&actor->obj.pos, 0x29038090); } switch (actor->state) { case 0: @@ -4043,8 +4046,9 @@ void func_i3_801B6FF8(Actor* actor) { } if (!(gGameFrameCount & 3)) { for (i = 0; i < 3; i++) { - func_80081A8C(actor->obj.pos.x + RAND_FLOAT_CENTERED(70.0f), actor->obj.pos.y + RAND_FLOAT_CENTERED(70.0f), - actor->obj.pos.z + RAND_FLOAT_CENTERED(70.0f), 1.0f, 1); + func_effect_80081A8C(actor->obj.pos.x + RAND_FLOAT_CENTERED(70.0f), + actor->obj.pos.y + RAND_FLOAT_CENTERED(70.0f), + actor->obj.pos.z + RAND_FLOAT_CENTERED(70.0f), 1.0f, 1); } } actor->unk_0B6++; @@ -4057,25 +4061,25 @@ void func_i3_801B6FF8(Actor* actor) { actor->timer_0C6 = 15; actor->health -= actor->damage; for (i = 0; i < 10; i++) { - func_80081A8C(actor->unk_0D8.x + RAND_FLOAT_CENTERED(70.0f), - actor->unk_0D8.y + RAND_FLOAT_CENTERED(70.0f), - actor->unk_0D8.z + RAND_FLOAT_CENTERED(70.0f), 1.0f, 1); + func_effect_80081A8C(actor->unk_0D8.x + RAND_FLOAT_CENTERED(70.0f), + actor->unk_0D8.y + RAND_FLOAT_CENTERED(70.0f), + actor->unk_0D8.z + RAND_FLOAT_CENTERED(70.0f), 1.0f, 1); } AUDIO_PLAY_SFX(0x2903408F, actor->sfxSource, 4); if (actor->health <= -100) { actor->health = -100; BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 200.0f, 3); gHitCount += 4; - D_80177850 = 15; + D_ctx_80177850 = 15; } } } } #else -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i3/fox_aq/func_i3_801B6FF8.s") +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i3/fox_aq/Aquas_801B6FF8.s") #endif -s32 func_i3_801B76EC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { +s32 Aquas_801B76EC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); if ((limbIndex >= 4) && (limbIndex < 14)) { gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); @@ -4083,7 +4087,7 @@ s32 func_i3_801B76EC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* t return false; } -void func_i3_801B7754(s32 limbIndex, Vec3f* rot, void* thisx) { +void Aquas_801B7754(s32 limbIndex, Vec3f* rot, void* thisx) { Vec3f sp24 = { 0.0f, 0.0f, 0.0f }; Actor* this = thisx; @@ -4154,7 +4158,7 @@ void func_i3_801B7754(s32 limbIndex, Vec3f* rot, void* thisx) { } // OBJ_ACTOR_262 draw -void func_i3_801B7A24(Actor* actor) { +void Aquas_801B7A24(Actor* actor) { Vec3f sp30[30]; RCP_SetupDL(&gMasterDisp, 0x39); @@ -4163,10 +4167,10 @@ void func_i3_801B7A24(Actor* actor) { gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255); } Animation_GetFrameData(&D_AQ_60260EC, actor->unk_0B6, sp30); - Animation_DrawSkeleton(3, D_AQ_60263F8, sp30, func_i3_801B76EC, func_i3_801B7754, actor, gCalcMatrix); + Animation_DrawSkeleton(3, D_AQ_60263F8, sp30, Aquas_801B76EC, Aquas_801B7754, actor, gCalcMatrix); } -void func_i3_801B7AF0(Actor* actor) { +void Aquas_801B7AF0(Actor* actor) { s32 i; actor->fwork[4] = 10.0f; @@ -4187,7 +4191,7 @@ void func_i3_801B7AF0(Actor* actor) { } // OBJ_ACTOR_260 action -void func_i3_801B7C78(Actor* actor) { +void Aquas_801B7C78(Actor* actor) { s32 i; s32 j; f32 spAC; @@ -4201,13 +4205,13 @@ void func_i3_801B7C78(Actor* actor) { if (actor->health == 0) { for (i = 0; i < 10; i++) { - func_80081A8C(actor->obj.pos.x + RAND_FLOAT(i * 15.0f), actor->obj.pos.y + RAND_FLOAT(i * 3.0f), - actor->obj.pos.z + RAND_FLOAT(i * 5.0f), 1.0f + RAND_FLOAT(0.5f), 7); + func_effect_80081A8C(actor->obj.pos.x + RAND_FLOAT(i * 15.0f), actor->obj.pos.y + RAND_FLOAT(i * 3.0f), + actor->obj.pos.z + RAND_FLOAT(i * 5.0f), 1.0f + RAND_FLOAT(0.5f), 7); } for (i = 0; i < 10; i++) { - func_i3_801A9448(&actor->vwork[0 + i], &actor->vwork[10 + i], RAND_FLOAT_CENTERED(20.0f), RAND_FLOAT(5.0f), - RAND_FLOAT_CENTERED(10.0f), 52, actor->scale, 200, i); - func_8007BC7C(actor->vwork[0 + i].x, actor->vwork[0 + i].y, actor->vwork[0 + i].z + 100.0f, 6.0f); + Aquas_801A9448(&actor->vwork[0 + i], &actor->vwork[10 + i], RAND_FLOAT_CENTERED(20.0f), RAND_FLOAT(5.0f), + RAND_FLOAT_CENTERED(10.0f), 52, actor->scale, 200, i); + func_effect_8007BC7C(actor->vwork[0 + i].x, actor->vwork[0 + i].y, actor->vwork[0 + i].z + 100.0f, 6.0f); } for (i = 0; i < 2; i++) { @@ -4220,12 +4224,12 @@ void func_i3_801B7C78(Actor* actor) { } } } - func_800815DC(); - func_8007D0E0(actor->vwork[7].x, actor->vwork[7].y, actor->vwork[7].z, 5.0f); + func_effect_800815DC(); + func_effect_8007D0E0(actor->vwork[7].x, actor->vwork[7].y, actor->vwork[7].z, 5.0f); actor->unk_044 = 4; - func_80066254(actor); + func_enmy_80066254(actor); Object_Kill(&actor->obj, actor->sfxSource); - func_8007A6F0(&actor->obj.pos, 0x29038090); + func_effect_8007A6F0(&actor->obj.pos, 0x29038090); } if (actor->state != 6) { spAC = gPlayer[0].pos.x - actor->obj.pos.x; @@ -4244,10 +4248,10 @@ void func_i3_801B7C78(Actor* actor) { Math_SmoothStepToF(&actor->fwork[6], 255.0f, 0.1f, 10.0f, 0); } if (((actor->state < 5) || (actor->state == 7)) && (actor->health != 0) && !(gGameFrameCount & 0xF)) { - func_8007B8F8(actor->vwork[22].x, gGroundLevel, actor->vwork[22].z, 5.0f); + func_effect_8007B8F8(actor->vwork[22].x, gGroundLevel, actor->vwork[22].z, 5.0f); } Math_SmoothStepToF(&actor->fwork[1], actor->fwork[2], 0.1f, 2.0f, 0.00001f); - Math_SmoothStepToF(&actor->obj.pos.z, gPlayer[0].camEye.z - D_80177D20 + actor->fwork[3], 0.1f, actor->fwork[1], + Math_SmoothStepToF(&actor->obj.pos.z, gPlayer[0].camEye.z - D_ctx_80177D20 + actor->fwork[3], 0.1f, actor->fwork[1], 0.00001); if ((actor->state == 1) && (fabsf(actor->fwork[7] - actor->obj.pos.z) >= 10000.0f)) { actor->timer_0C0 = 20; @@ -4274,9 +4278,9 @@ void func_i3_801B7C78(Actor* actor) { } } if (!(gGameFrameCount & 3)) { - func_i3_801AC8A8(actor->vwork[7].x + RAND_FLOAT_CENTERED(120.0f), - actor->vwork[7].y + RAND_FLOAT_CENTERED(50.0f), - actor->vwork[7].z + 100.0f + RAND_FLOAT_CENTERED(100.0f), 1.0f, 0); + Aquas_801AC8A8(actor->vwork[7].x + RAND_FLOAT_CENTERED(120.0f), + actor->vwork[7].y + RAND_FLOAT_CENTERED(50.0f), + actor->vwork[7].z + 100.0f + RAND_FLOAT_CENTERED(100.0f), 1.0f, 0); } break; case 2: @@ -4288,9 +4292,9 @@ void func_i3_801B7C78(Actor* actor) { actor->timer_0BE = 30; } for (i = 0; i < 10; i++) { - func_i3_801AC8A8(actor->vwork[7].x + RAND_FLOAT_CENTERED(120.0f), - actor->vwork[7].y + RAND_FLOAT_CENTERED(50.0f), - actor->vwork[7].z + 100.0f + RAND_FLOAT_CENTERED(100.0f), 2.0f, 0); + Aquas_801AC8A8(actor->vwork[7].x + RAND_FLOAT_CENTERED(120.0f), + actor->vwork[7].y + RAND_FLOAT_CENTERED(50.0f), + actor->vwork[7].z + 100.0f + RAND_FLOAT_CENTERED(100.0f), 2.0f, 0); } actor->state = 3; } @@ -4298,8 +4302,9 @@ void func_i3_801B7C78(Actor* actor) { case 3: if (actor->timer_0BE == 0) { for (i = 0; i < 2; i++) { - actor->iwork[2 + i] = - func_80081B24(actor->vwork[20 + i].x, actor->vwork[20 + i].y, actor->vwork[20 + i].z, 0.1f) + 1; + actor->iwork[2 + i] = func_effect_80081B24(actor->vwork[20 + i].x, actor->vwork[20 + i].y, + actor->vwork[20 + i].z, 0.1f) + + 1; } actor->timer_0C0 = 10; AUDIO_PLAY_SFX(0x2900208D, actor->sfxSource, 4); @@ -4400,9 +4405,9 @@ void func_i3_801B7C78(Actor* actor) { } Math_SmoothStepToAngle(&actor->obj.rot.x, 30.0f, 0.1f, 10.0f, 0); if (!(gGameFrameCount & 1)) { - func_i3_801AC8A8(actor->vwork[7].x + RAND_FLOAT_CENTERED(120.0f), - actor->vwork[7].y + RAND_FLOAT_CENTERED(50.0f), - actor->vwork[7].z + RAND_FLOAT_CENTERED(100.0f), 2.0f, 0); + Aquas_801AC8A8(actor->vwork[7].x + RAND_FLOAT_CENTERED(120.0f), + actor->vwork[7].y + RAND_FLOAT_CENTERED(50.0f), + actor->vwork[7].z + RAND_FLOAT_CENTERED(100.0f), 2.0f, 0); } break; case 7: @@ -4447,7 +4452,7 @@ void func_i3_801B7C78(Actor* actor) { } } -s32 func_i3_801B8C50(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { +s32 Aquas_801B8C50(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { Actor* this = thisx; RCP_SetupDL(&gMasterDisp, 0x3A); @@ -4463,7 +4468,7 @@ s32 func_i3_801B8C50(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* t return false; } -void func_i3_801B8D7C(s32 limbIndex, Vec3f* rot, void* thisx) { +void Aquas_801B8D7C(s32 limbIndex, Vec3f* rot, void* thisx) { Vec3f sp4C = { 0.0f, 0.0f, 0.0f }; Vec3f sp40 = { 108.0f, 0.0f, 24.0f }; Vec3f sp34 = { 102.0f, 14.0f, -21.0f }; @@ -4544,7 +4549,7 @@ void func_i3_801B8D7C(s32 limbIndex, Vec3f* rot, void* thisx) { } // OBJ_ACTOR_260 draw -void func_i3_801B90DC(Actor* actor) { +void Aquas_801B90DC(Actor* actor) { Vec3f sp30[30]; if ((actor->state >= 3) && (actor->state < 5)) { @@ -4553,11 +4558,11 @@ void func_i3_801B90DC(Actor* actor) { Animation_GetFrameData(&D_AQ_6024F80, actor->unk_0B6, sp30); } Matrix_Translate(gCalcMatrix, 0.0f, -150.0f, 100.0f, 1); - Animation_DrawSkeleton(3, D_AQ_602512C, sp30, func_i3_801B8C50, func_i3_801B8D7C, actor, gCalcMatrix); + Animation_DrawSkeleton(3, D_AQ_602512C, sp30, Aquas_801B8C50, Aquas_801B8D7C, actor, gCalcMatrix); } // OBJ_ACTOR_263 action -void func_i3_801B91A4(Actor* actor) { +void Aquas_801B91A4(Actor* actor) { Vec3f spDC = { 0.0f, 0.0f, 50.0f }; Vec3f spD0; Vec3f spC4; @@ -4574,20 +4579,20 @@ void func_i3_801B91A4(Actor* actor) { Matrix_RotateX(gCalcMatrix, actor->obj.rot.x * M_DTOR, 1); if ((actor->health == 0) && (actor->state > 0)) { actor->unk_044 = 0; - func_80066254(actor); + func_enmy_80066254(actor); for (i = 0; i < 5; i++) { - func_80081A8C(actor->obj.pos.x + RAND_FLOAT(i * 15.0f), actor->obj.pos.y + RAND_FLOAT(i * 3.0f), - actor->obj.pos.z + RAND_FLOAT(i * 5.0f), 0.5f + RAND_FLOAT(0.3f), 7); + func_effect_80081A8C(actor->obj.pos.x + RAND_FLOAT(i * 15.0f), actor->obj.pos.y + RAND_FLOAT(i * 3.0f), + actor->obj.pos.z + RAND_FLOAT(i * 5.0f), 0.5f + RAND_FLOAT(0.3f), 7); } for (i = RAND_INT(10.0f); i < 13; i++) { - func_i3_801A9448(&actor->vwork[0 + i], &actor->vwork[13 + i], RAND_FLOAT_CENTERED(20.0f), RAND_FLOAT(5.0f), - RAND_FLOAT_CENTERED(10.0f), 53, actor->scale, 200, i); - func_8007BC7C(actor->vwork[0 + i].x, actor->vwork[0 + i].y, actor->vwork[0 + i].z + 100.0f, 6.0f); + Aquas_801A9448(&actor->vwork[0 + i], &actor->vwork[13 + i], RAND_FLOAT_CENTERED(20.0f), RAND_FLOAT(5.0f), + RAND_FLOAT_CENTERED(10.0f), 53, actor->scale, 200, i); + func_effect_8007BC7C(actor->vwork[0 + i].x, actor->vwork[0 + i].y, actor->vwork[0 + i].z + 100.0f, 6.0f); } Object_Kill(&actor->obj, actor->sfxSource); - func_800815DC(); - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 5.0f); - func_8007A6F0(&actor->obj.pos, 0x29038090); + func_effect_800815DC(); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 5.0f); + func_effect_8007A6F0(&actor->obj.pos, 0x29038090); } switch (actor->state) { case 0: @@ -4658,9 +4663,9 @@ void func_i3_801B91A4(Actor* actor) { spC4.x = spC4.y = 0.0f; spC4.z = 70.0f; Matrix_MultVec3fNoTranslate(gCalcMatrix, &spC4, &spAC); - func_8007F04C(353, actor->vwork[26].x + RAND_FLOAT_CENTERED(200.0f), - actor->vwork[26].y + RAND_FLOAT_CENTERED(200.0f), actor->vwork[26].z, spf98, sp94, 0.0f, - 0.0f, 0.0f, 0.0f, spAC.x, spAC.y, spAC.z, 1.0f); + func_effect_8007F04C(353, actor->vwork[26].x + RAND_FLOAT_CENTERED(200.0f), + actor->vwork[26].y + RAND_FLOAT_CENTERED(200.0f), actor->vwork[26].z, spf98, sp94, + 0.0f, 0.0f, 0.0f, 0.0f, spAC.x, spAC.y, spAC.z, 1.0f); } break; case 2: @@ -4670,14 +4675,14 @@ void func_i3_801B91A4(Actor* actor) { } if (actor->unk_0B6 == 40) { actor->fwork[8] = 700.0f; - func_i3_801A9728(actor, 50.0f, 10.0f, 8); + Aquas_801A9728(actor, 50.0f, 10.0f, 8); } Math_SmoothStepToF(&actor->obj.pos.y, actor->fwork[7] + actor->fwork[8], 0.1f, 10.0f, 0.00001f); Math_SmoothStepToF(&actor->fwork[8], 0.0f, 0.1f, 10.0f, 0.0001f); if (actor->unk_0B6 >= 40) { - func_i3_801AC8A8(actor->obj.pos.x + RAND_FLOAT_CENTERED(70.0f), - actor->obj.pos.y - 50.0f + RAND_FLOAT_CENTERED(50.0f), - actor->obj.pos.z + RAND_FLOAT_CENTERED(100.0f), 1.0f, 0); + Aquas_801AC8A8(actor->obj.pos.x + RAND_FLOAT_CENTERED(70.0f), + actor->obj.pos.y - 50.0f + RAND_FLOAT_CENTERED(50.0f), + actor->obj.pos.z + RAND_FLOAT_CENTERED(100.0f), 1.0f, 0); } if (actor->unk_0B6 >= 37) { actor->obj.rot.y += 20.0f; @@ -4686,13 +4691,13 @@ void func_i3_801B91A4(Actor* actor) { Matrix_RotateY(gCalcMatrix, actor->fwork[2] * M_DTOR, 0); Matrix_RotateX(gCalcMatrix, actor->vwork[27].x * M_DTOR, 1); Matrix_RotateZ(gCalcMatrix, actor->vwork[27].z * M_DTOR, 1); - func_i3_801AC8A8(actor->vwork[11].x + RAND_FLOAT_CENTERED(120.0f), - actor->vwork[11].y + RAND_FLOAT_CENTERED(50.0f), - actor->vwork[11].z + RAND_FLOAT_CENTERED(100.0f), 2.0f, 0); + Aquas_801AC8A8(actor->vwork[11].x + RAND_FLOAT_CENTERED(120.0f), + actor->vwork[11].y + RAND_FLOAT_CENTERED(50.0f), + actor->vwork[11].z + RAND_FLOAT_CENTERED(100.0f), 2.0f, 0); Matrix_MultVec3fNoTranslate(gCalcMatrix, &spDC, &spD0); - func_8007F04C(353, actor->vwork[26].x + spD0.x, actor->vwork[26].y + spD0.y, - actor->vwork[26].z + spD0.z, actor->vwork[27].x, actor->fwork[2], actor->vwork[27].z, - 0.0f, 0.0f, 0.0f, spD0.x, spD0.y, spD0.z, 1.0f); + func_effect_8007F04C(353, actor->vwork[26].x + spD0.x, actor->vwork[26].y + spD0.y, + actor->vwork[26].z + spD0.z, actor->vwork[27].x, actor->fwork[2], + actor->vwork[27].z, 0.0f, 0.0f, 0.0f, spD0.x, spD0.y, spD0.z, 1.0f); } } break; @@ -4708,14 +4713,14 @@ void func_i3_801B91A4(Actor* actor) { if (actor->scale > 1.0f) { BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 200.0f, 2); gHitCount += 2; - D_80177850 = 15; + D_ctx_80177850 = 15; } } } } } -void func_i3_801B9DB0(s32 limbIndex, Vec3f* rot, void* thisx) { +void Aquas_801B9DB0(s32 limbIndex, Vec3f* rot, void* thisx) { Vec3f sp34 = { 0.0f, 0.0f, 0.0f }; Vec3f sp28 = { -27.0f, 7.0f, 5.0f }; Actor* this = thisx; @@ -4796,7 +4801,7 @@ void func_i3_801B9DB0(s32 limbIndex, Vec3f* rot, void* thisx) { } // OBJ_ACTOR_263 draw -void func_i3_801BA108(Actor* actor) { +void Aquas_801BA108(Actor* actor) { Vec3f sp40[30]; RCP_SetupDL(&gMasterDisp, 0x1D); @@ -4812,11 +4817,11 @@ void func_i3_801BA108(Actor* actor) { Matrix_RotateX(gCalcMatrix, (actor->obj.rot.x + 90.0f) * M_DTOR, 1); } Animation_GetFrameData(&D_AQ_6000AE4, actor->unk_0B6, sp40); - Animation_DrawSkeleton(3, D_AQ_6000DB0, sp40, NULL, func_i3_801B9DB0, actor, gCalcMatrix); + Animation_DrawSkeleton(3, D_AQ_6000DB0, sp40, NULL, Aquas_801B9DB0, actor, gCalcMatrix); } // OBJ_ACTOR_264 action -void func_i3_801BA26C(Actor* actor) { +void Aquas_801BA26C(Actor* actor) { Vec3f sp40[30]; u16 sp3E; @@ -4857,13 +4862,13 @@ void func_i3_801BA26C(Actor* actor) { } // OBJ_ACTOR_264 draw -void func_i3_801BA4E4(Actor* actor) { +void Aquas_801BA4E4(Actor* actor) { gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); Animation_DrawSkeleton(1, D_AQ_6020C6C, actor->vwork, NULL, NULL, &actor->index, &gIdentityMatrix); gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); } -void func_i3_801BA57C(Actor* actor) { +void Aquas_801BA57C(Actor* actor) { if (actor->state == 0) { actor->scale = 1.0f; actor->gravity = 0.3f; @@ -4880,7 +4885,7 @@ void func_i3_801BA57C(Actor* actor) { } // OBJ_ACTOR_265 action -void func_i3_801BA6A4(Actor* actor) { +void Aquas_801BA6A4(Actor* actor) { s32 i; s32 var_s2; Actor* var_s0; @@ -4890,9 +4895,9 @@ void func_i3_801BA6A4(Actor* actor) { if (actor->iwork[1] == 0) { actor->obj.rot.z += actor->fwork[2]; if (!(gGameFrameCount & 1)) { - func_i3_801AC8A8(actor->obj.pos.x + RAND_FLOAT_CENTERED(120.0f), - actor->obj.pos.y + RAND_FLOAT_CENTERED(50.0f), - actor->obj.pos.z + RAND_FLOAT_CENTERED(100.0f), 2.0f, 0); + Aquas_801AC8A8(actor->obj.pos.x + RAND_FLOAT_CENTERED(120.0f), + actor->obj.pos.y + RAND_FLOAT_CENTERED(50.0f), + actor->obj.pos.z + RAND_FLOAT_CENTERED(100.0f), 2.0f, 0); } actor->fwork[1] += 10.0f; actor->vel.x = SIN_DEG(actor->fwork[1]) * 10.0f; @@ -4901,8 +4906,10 @@ void func_i3_801BA6A4(Actor* actor) { actor->iwork[1] = 1; actor->vel.x = actor->vel.y = actor->vel.z = 0.0f; actor->gravity = 0.0f; - func_8007B8F8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 100.0f, actor->scale * 30.0f); - func_8007B8F8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 100.0f, actor->scale * 30.0f); + func_effect_8007B8F8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 100.0f, + actor->scale * 30.0f); + func_effect_8007B8F8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 100.0f, + actor->scale * 30.0f); } } break; @@ -4910,9 +4917,9 @@ void func_i3_801BA6A4(Actor* actor) { if (actor->iwork[1] == 0) { actor->obj.rot.z += actor->fwork[2]; if (!(gGameFrameCount & 3)) { - func_i3_801AC8A8(actor->obj.pos.x + RAND_FLOAT_CENTERED(70.0f), - actor->obj.pos.y + RAND_FLOAT_CENTERED(50.0f), - actor->obj.pos.z + RAND_FLOAT_CENTERED(50.0f), 1.0f, 0); + Aquas_801AC8A8(actor->obj.pos.x + RAND_FLOAT_CENTERED(70.0f), + actor->obj.pos.y + RAND_FLOAT_CENTERED(50.0f), + actor->obj.pos.z + RAND_FLOAT_CENTERED(50.0f), 1.0f, 0); } Math_SmoothStepToF(&actor->vel.y, -7.0f, 0.1f, 1.0f, 0.0001f); if (actor->obj.pos.y < (gGroundLevel + 20.0f)) { @@ -4922,7 +4929,8 @@ void func_i3_801BA6A4(Actor* actor) { } actor->iwork[1] = 1; AUDIO_PLAY_SFX(0x19400007, actor->sfxSource, 4); - func_8007B8F8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 100.0f, actor->scale * 30.0f); + func_effect_8007B8F8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 100.0f, + actor->scale * 30.0f); } } else { Math_SmoothStepToF(&actor->vel.y, 0.0f, 0.1f, 1.0f, 0.0001f); @@ -4936,7 +4944,7 @@ void func_i3_801BA6A4(Actor* actor) { actor->health -= actor->damage; if (actor->health <= 0) { actor->health = actor->unk_044 = 0; - func_80066254(actor); + func_enmy_80066254(actor); if (actor->state == 0) { for (i = 0, var_s2 = 0, var_s0 = gActors; i < 60 && var_s2 < 4; i++, var_s0++) { if (var_s0->obj.status == OBJ_FREE) { @@ -4960,28 +4968,28 @@ void func_i3_801BA6A4(Actor* actor) { } } else { for (i = 0; i < 4; i++) { - func_i3_801A9448(&actor->obj.pos, &actor->obj.rot, RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT(5.0f), - RAND_FLOAT_CENTERED(10.0f), 54, 0.1f, 200, i); + Aquas_801A9448(&actor->obj.pos, &actor->obj.rot, RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT(5.0f), + RAND_FLOAT_CENTERED(10.0f), 54, 0.1f, 200, i); } } - func_8007BC7C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 130.0f, actor->scale * 30.0f); - func_8007BC7C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 130.0f, actor->scale * 30.0f); - func_8007BC7C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 130.0f, actor->scale * 30.0f); + func_effect_8007BC7C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 130.0f, actor->scale * 30.0f); + func_effect_8007BC7C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 130.0f, actor->scale * 30.0f); + func_effect_8007BC7C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 130.0f, actor->scale * 30.0f); Object_Kill(&actor->obj, actor->sfxSource); - func_8007A6F0(&actor->obj.pos, 0x2903A008); + func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); } } } // OBJ_ACTOR_265 draw -void func_i3_801BAD7C(Actor* actor) { +void Aquas_801BAD7C(Actor* actor) { Matrix_Scale(gGfxMatrix, actor->scale, actor->scale, actor->scale, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_AQ_6014FD0); } // OBJ_ACTOR_266 action -void func_i3_801BADF8(Actor* actor) { +void Aquas_801BADF8(Actor* actor) { s32 i; switch (actor->state) { @@ -5008,16 +5016,17 @@ void func_i3_801BADF8(Actor* actor) { break; case 2: for (i = 0; i < 5; i++) { - func_i3_801A9448(&actor->vwork[0 + i], &actor->vwork[5 + i], RAND_FLOAT_CENTERED(20.0f), - RAND_FLOAT(5.0f), RAND_FLOAT_CENTERED(10.0f), 55, actor->scale, 200, i); - func_8007BC7C(actor->vwork[0 + i].x, actor->vwork[0 + i].y, actor->vwork[0 + i].z + 100.0f, 6.0f); + Aquas_801A9448(&actor->vwork[0 + i], &actor->vwork[5 + i], RAND_FLOAT_CENTERED(20.0f), RAND_FLOAT(5.0f), + RAND_FLOAT_CENTERED(10.0f), 55, actor->scale, 200, i); + func_effect_8007BC7C(actor->vwork[0 + i].x, actor->vwork[0 + i].y, actor->vwork[0 + i].z + 100.0f, + 6.0f); } Object_Kill(&actor->obj, actor->sfxSource); break; } } -void func_i3_801BB0C4(s32 limbIndex, Vec3f* rot, void* thisx) { +void Aquas_801BB0C4(s32 limbIndex, Vec3f* rot, void* thisx) { Vec3f sp24 = { 0.0f, 0.0f, 0.0f }; Actor* this = thisx; @@ -5048,11 +5057,11 @@ void func_i3_801BB0C4(s32 limbIndex, Vec3f* rot, void* thisx) { } // OBJ_ACTOR_266 draw -void func_i3_801BB204(Actor* actor) { +void Aquas_801BB204(Actor* actor) { Vec3f sp28[30]; Animation_GetFrameData(&D_AQ_601EC68, 0, sp28); - Animation_DrawSkeleton(3, D_AQ_601EDB4, sp28, NULL, func_i3_801BB0C4, actor, gCalcMatrix); + Animation_DrawSkeleton(3, D_AQ_601EDB4, sp28, NULL, Aquas_801BB0C4, actor, gCalcMatrix); } Vec3f D_i3_801C0344[4] = { @@ -5074,7 +5083,7 @@ s32 D_i3_801C04A0[6] = { 15, -15, 10, -10, 7, -7, }; -void func_i3_801BB26C(Actor* actor) { +void Aquas_801BB26C(Actor* actor) { s32 sp64; s32 sp60; Vec3f sp54; @@ -5173,7 +5182,7 @@ void func_i3_801BB26C(Actor* actor) { } // OBJ_ACTOR_267 action -void func_i3_801BB79C(Actor* actor) { +void Aquas_801BB79C(Actor* actor) { s32 i; s32 it0; s32 it1; @@ -5199,7 +5208,7 @@ void func_i3_801BB79C(Actor* actor) { } else { for (i = 0, sp68 = gObjects80; i < 50; i++, sp68++) { if ((sp68->obj.status == OBJ_ACTIVE) && (sp68->obj.id == OBJ_80_122) && - func_80062DBC(&actor->obj.pos, sp68->info.hitbox, &sp68->obj, 0.0f, 0.0f, 0.0f) && + func_enmy_80062DBC(&actor->obj.pos, sp68->info.hitbox, &sp68->obj, 0.0f, 0.0f, 0.0f) && (actor->iwork[20] == 0)) { actor->iwork[20] = 50; actor->iwork[19]++; @@ -5223,7 +5232,7 @@ void func_i3_801BB79C(Actor* actor) { } else { for (i = 0, sp68 = gObjects80; i < 50; i++, sp68++) { if ((sp68->obj.status == OBJ_ACTIVE) && (sp68->obj.id == OBJ_80_122) && - (func_80062DBC(&actor->obj.pos, sp68->info.hitbox, &sp68->obj, 0.0f, 0.0f, 0.0f) || + (func_enmy_80062DBC(&actor->obj.pos, sp68->info.hitbox, &sp68->obj, 0.0f, 0.0f, 0.0f) || (actor->obj.pos.y < (gGroundLevel + 30.0f))) && (actor->iwork[20] == 0)) { actor->iwork[20] = 50; @@ -5259,9 +5268,9 @@ void func_i3_801BB79C(Actor* actor) { } } if (!(gGameFrameCount & 7)) { - func_8007A6F0(&sp70->obj.pos, 0x3100208E); + func_effect_8007A6F0(&sp70->obj.pos, 0x3100208E); } - func_i3_801A92EC(actor, sp70->obj.pos.x, sp70->obj.pos.y, sp70->obj.pos.z, actor->iwork[13], i); + Aquas_801A92EC(actor, sp70->obj.pos.x, sp70->obj.pos.y, sp70->obj.pos.z, actor->iwork[13], i); if ((actor->fwork[21] > 200.0f) && (actor->iwork[17] != 0)) { Matrix_RotateZ(gCalcMatrix, actor->fwork[20] * M_DTOR, 0); sp80.x = 0.0f; @@ -5290,9 +5299,9 @@ void func_i3_801BB79C(Actor* actor) { } } if (!(gGameFrameCount & 3)) { - func_8007A6F0(&sp6C->obj.pos, 0x3100208E); + func_effect_8007A6F0(&sp6C->obj.pos, 0x3100208E); } - func_i3_801A92EC(actor, sp6C->obj.pos.x, sp6C->obj.pos.y, sp6C->obj.pos.z, actor->iwork[13] + 1, i); + Aquas_801A92EC(actor, sp6C->obj.pos.x, sp6C->obj.pos.y, sp6C->obj.pos.z, actor->iwork[13] + 1, i); if ((actor->fwork[21] > 200.0f) && (actor->iwork[17] != 0)) { Matrix_RotateZ(gCalcMatrix, (actor->fwork[20] + 90.0f) * M_DTOR, 0); sp80.x = 0.0f; @@ -5323,15 +5332,16 @@ void func_i3_801BB79C(Actor* actor) { } } if (!(gGameFrameCount & 0xF)) { - func_8007A6F0(&sp70->obj.pos, 0x3100208E); + func_effect_8007A6F0(&sp70->obj.pos, 0x3100208E); } - func_i3_801A92EC(actor, sp70->obj.pos.x, sp70->obj.pos.y, sp70->obj.pos.z, actor->iwork[13] + 2, i); + Aquas_801A92EC(actor, sp70->obj.pos.x, sp70->obj.pos.y, sp70->obj.pos.z, actor->iwork[13] + 2, i); } } if (!(gGameFrameCount & 3)) { - func_8007C120(actor->obj.pos.x + RAND_FLOAT_CENTERED(100.0f), actor->obj.pos.y + RAND_FLOAT_CENTERED(100.0f), - actor->obj.pos.z + RAND_FLOAT_CENTERED(50.0f), actor->vel.x, actor->vel.y, actor->vel.z, - 0.05f + RAND_FLOAT(0.03f), 10); + func_effect_8007C120(actor->obj.pos.x + RAND_FLOAT_CENTERED(100.0f), + actor->obj.pos.y + RAND_FLOAT_CENTERED(100.0f), + actor->obj.pos.z + RAND_FLOAT_CENTERED(50.0f), actor->vel.x, actor->vel.y, actor->vel.z, + 0.05f + RAND_FLOAT(0.03f), 10); } if (actor->timer_0BE == 0) { D_i3_801C41B8[18] = 255.0f; @@ -5436,10 +5446,10 @@ void func_i3_801BB79C(Actor* actor) { if (actor->iwork[20] != 0) { actor->iwork[20]--; } - func_i3_801A96DC(actor); + Aquas_801A96DC(actor); } -s32 func_i3_801BC530(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { +s32 Aquas_801BC530(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { Vec3f sp64 = { 0.0f, 0.0f, 0.0f }; Vec3f sp58; f32 sp54 = 0.0f; @@ -5488,7 +5498,7 @@ s32 func_i3_801BC530(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* t Matrix_RotateX(gCalcMatrix, rot->x * M_DTOR, 1); if (*dList != NULL) { Matrix_MultVec3f(gCalcMatrix, &sp64, &sp58); - func_8005F670(&sp58); + func_edisplay_8005F670(&sp58); Matrix_Mult(gGfxMatrix, gCalcMatrix, 1); Matrix_Push(&gGfxMatrix); Matrix_Scale(gGfxMatrix, sp54, sp50, sp4C, 1); @@ -5501,15 +5511,15 @@ s32 func_i3_801BC530(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* t return false; } -void func_i3_801BC91C(s32 limbIndex, Vec3f* rot, void* thisx) { +void Aquas_801BC91C(s32 limbIndex, Vec3f* rot, void* thisx) { } // OBJ_ACTOR_267 draw -void func_i3_801BC930(Actor* actor) { +void Aquas_801BC930(Actor* actor) { Vec3f sp28[30]; Animation_GetFrameData(&D_AQ_6023780, actor->unk_0B6, sp28); - Animation_DrawSkeleton(3, D_AQ_602390C, sp28, func_i3_801BC530, func_i3_801BC91C, actor, gCalcMatrix); + Animation_DrawSkeleton(3, D_AQ_602390C, sp28, Aquas_801BC530, Aquas_801BC91C, actor, gCalcMatrix); } s32 D_i3_801C04C4[9] = { @@ -5517,7 +5527,7 @@ s32 D_i3_801C04C4[9] = { }; // OBJ_ACTOR_269 action -void func_i3_801BC9A0(Actor* actor) { +void Aquas_801BC9A0(Actor* actor) { s32 j; s32 i; Vec3f spA4; @@ -5604,19 +5614,19 @@ void func_i3_801BC9A0(Actor* actor) { } } for (j = 0; j < 10; j++) { - func_i3_801A9448(&actor->vwork[4], &actor->vwork[5], RAND_FLOAT_CENTERED(20.0f), RAND_FLOAT(5.0f), - RAND_FLOAT_CENTERED(10.0f), 58, 0.2f + RAND_FLOAT(1.0f), 200, 0); - func_8007BC7C(actor->vwork[4].x, actor->vwork[4].y, actor->vwork[4].z + 50.0f, 6.0f); + Aquas_801A9448(&actor->vwork[4], &actor->vwork[5], RAND_FLOAT_CENTERED(20.0f), RAND_FLOAT(5.0f), + RAND_FLOAT_CENTERED(10.0f), 58, 0.2f + RAND_FLOAT(1.0f), 200, 0); + func_effect_8007BC7C(actor->vwork[4].x, actor->vwork[4].y, actor->vwork[4].z + 50.0f, 6.0f); } - func_800815DC(); - func_8007D0E0(actor->vwork[4].x, actor->vwork[4].y, actor->vwork[4].z, 10.0f); + func_effect_800815DC(); + func_effect_8007D0E0(actor->vwork[4].x, actor->vwork[4].y, actor->vwork[4].z, 10.0f); for (j = 0; j < 20; j++) { - func_i3_801AC8A8(actor->vwork[4].x + RAND_FLOAT_CENTERED(100.0f), - actor->vwork[4].y + RAND_FLOAT_CENTERED(200.0f), - actor->vwork[4].z + 100.0f + RAND_FLOAT_CENTERED(200.0f), 6.0f, 2); + Aquas_801AC8A8(actor->vwork[4].x + RAND_FLOAT_CENTERED(100.0f), + actor->vwork[4].y + RAND_FLOAT_CENTERED(200.0f), + actor->vwork[4].z + 100.0f + RAND_FLOAT_CENTERED(200.0f), 6.0f, 2); } - func_800815DC(); - func_8007D0E0(actor->vwork[4].x, actor->vwork[4].y, actor->vwork[4].z + 150.0f, 10.0f); + func_effect_800815DC(); + func_effect_8007D0E0(actor->vwork[4].x, actor->vwork[4].y, actor->vwork[4].z + 150.0f, 10.0f); actor->timer_0BC = 4; actor->state = 4; break; @@ -5626,34 +5636,34 @@ void func_i3_801BC9A0(Actor* actor) { actor->obj.pos.y = actor->vwork[4].y; actor->obj.pos.z = actor->vwork[4].z; actor->unk_044 = D_i3_801C04C4[actor->iwork[1]]; - func_80066254(actor); + func_enmy_80066254(actor); Object_Kill(&actor->obj, actor->sfxSource); - func_8007A6F0(&actor->obj.pos, 0x19021078); + func_effect_8007A6F0(&actor->obj.pos, 0x19021078); } break; case 5: Math_SmoothStepToAngle(&actor->obj.rot.y, actor->fwork[0], 0.1f, 10.0f, 0.0001f); Math_SmoothStepToAngle(&actor->obj.rot.x, 90.0f, 0.1f, 1.0f, 0.0001f); if (!(gGameFrameCount & 1) && (actor->iwork[2] == 0)) { - func_i3_801AC8A8(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f), - actor->obj.pos.y + RAND_RANGE(-45.0f, 105.0f), - actor->obj.pos.z + RAND_FLOAT_CENTERED(200.0f), 6.0f, 2); + Aquas_801AC8A8(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f), + actor->obj.pos.y + RAND_RANGE(-45.0f, 105.0f), + actor->obj.pos.z + RAND_FLOAT_CENTERED(200.0f), 6.0f, 2); } if ((actor->obj.pos.y < (gGroundLevel + 30.0f)) && (actor->iwork[2] == 0)) { actor->iwork[2] = 1; actor->vel.x = actor->vel.y = actor->vel.z = actor->gravity = 0.0f; - func_8007A6F0(&actor->obj.pos, 0x19400007); + func_effect_8007A6F0(&actor->obj.pos, 0x19400007); for (j = 0; j < 6; j++) { - func_8007B8F8(actor->obj.pos.x + RAND_FLOAT_CENTERED(100.0f), - actor->obj.pos.y + RAND_RANGE(-9.0f, 21.0f), - actor->obj.pos.z + RAND_FLOAT_CENTERED(200.0f), 20.0f); + func_effect_8007B8F8(actor->obj.pos.x + RAND_FLOAT_CENTERED(100.0f), + actor->obj.pos.y + RAND_RANGE(-9.0f, 21.0f), + actor->obj.pos.z + RAND_FLOAT_CENTERED(200.0f), 20.0f); } } break; } } -void func_i3_801BD17C(s32 limbIndex, Vec3f* rot, void* thisx) { +void Aquas_801BD17C(s32 limbIndex, Vec3f* rot, void* thisx) { Vec3f sp2C = { 0.0f, 0.0f, 0.0f }; Actor* this = thisx; @@ -5676,7 +5686,7 @@ void func_i3_801BD17C(s32 limbIndex, Vec3f* rot, void* thisx) { } // OBJ_ACTOR_269 draw -void func_i3_801BD264(Actor* actor) { +void Aquas_801BD264(Actor* actor) { Vec3f sp40[30]; if (actor->state != 0) { @@ -5686,7 +5696,7 @@ void func_i3_801BD264(Actor* actor) { if (actor->state != 0) { if ((actor->iwork[3] == 0) && (actor->info.drawType == 2)) { Animation_GetFrameData(&D_AQ_6014438, 0, sp40); - Animation_DrawSkeleton(3, D_AQ_6014504, sp40, NULL, func_i3_801BD17C, actor, gCalcMatrix); + Animation_DrawSkeleton(3, D_AQ_6014504, sp40, NULL, Aquas_801BD17C, actor, gCalcMatrix); } else { gSPDisplayList(gMasterDisp++, D_AQ_6014520); } @@ -5702,7 +5712,7 @@ void func_i3_801BD264(Actor* actor) { } } -void func_i3_801BD3B0(Actor* actor, f32 x, f32 y, f32 z) { +void Aquas_801BD3B0(Actor* actor, f32 x, f32 y, f32 z) { f32 temp; Vec3f sp38; Vec3f sp2C; @@ -5730,7 +5740,7 @@ void func_i3_801BD3B0(Actor* actor, f32 x, f32 y, f32 z) { f32 D_i3_801C04F4[4] = { 700.0f, 300.0f, 600.0f, 400.0f }; // OBJ_ACTOR_268 action -void func_i3_801BD54C(Actor* actor) { +void Aquas_801BD54C(Actor* actor) { s32 sp6C; s32 sp68; s32 sp64; @@ -5797,8 +5807,8 @@ void func_i3_801BD54C(Actor* actor) { actor->timer_0BC = 0; } else { Math_SmoothStepToF(&actor->fwork[3], D_i3_801C04F4[actor->iwork[1]], 0.1f, 30.0f, 0.0001f); - Math_SmoothStepToF(&actor->obj.pos.z, gPlayer[0].camEye.z - D_80177D20 - actor->fwork[3], 0.1f, 30.0f, - 0.00001f); + Math_SmoothStepToF(&actor->obj.pos.z, gPlayer[0].camEye.z - D_ctx_80177D20 - actor->fwork[3], 0.1f, + 30.0f, 0.00001f); } if ((actor->timer_0BC == 0) && (actor->iwork[2] == 0) && (actor->timer_0BE == 0)) { actor->timer_0BC = 60; @@ -5861,14 +5871,14 @@ void func_i3_801BD54C(Actor* actor) { actor->fwork[4] = 40.0f; actor->timer_0BE = 20; } - func_i3_801BD3B0(actor, sp5C, sp58, sp54); + Aquas_801BD3B0(actor, sp5C, sp58, sp54); break; case 3: sp5C = gPlayer[0].pos.x + actor->fwork[1] - actor->obj.pos.x; sp58 = gPlayer[0].pos.y + actor->fwork[2] - actor->obj.pos.y; sp54 = gPlayer[0].unk_138 + 10000.0f - actor->fwork[3] - actor->obj.pos.z; actor->iwork[2] = 1; - func_i3_801BD3B0(actor, sp5C, sp58, sp54); + Aquas_801BD3B0(actor, sp5C, sp58, sp54); if ((gPlayer[0].unk_138 + 1000.0f) < actor->obj.pos.z) { Object_Kill(&actor->obj, actor->sfxSource); } @@ -5880,7 +5890,7 @@ void func_i3_801BD54C(Actor* actor) { } } -s32 func_i3_801BDDFC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { +s32 Aquas_801BDDFC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); if ((limbIndex == 1) || (limbIndex == 2) || (limbIndex == 5)) { gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); @@ -5889,12 +5899,12 @@ s32 func_i3_801BDDFC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* t } // OBJ_ACTOR_268 draw -void func_i3_801BDE6C(Actor* actor) { +void Aquas_801BDE6C(Actor* actor) { Animation_GetFrameData(&D_AQ_60135E0, actor->unk_0B6, actor->vwork); if (actor->iwork[3] == 0) { - Animation_DrawSkeleton(1, D_AQ_60136CC, actor->vwork, func_i3_801BDDFC, NULL, actor, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_AQ_60136CC, actor->vwork, Aquas_801BDDFC, NULL, actor, &gIdentityMatrix); } else { - Animation_DrawSkeleton(1, D_AQ_60137CC, actor->vwork, func_i3_801BDDFC, NULL, actor, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_AQ_60137CC, actor->vwork, Aquas_801BDDFC, NULL, actor, &gIdentityMatrix); } } @@ -5930,7 +5940,7 @@ f32 D_i3_801C0828[51] = { 346.0f, 30.0f, 97.0f, 30.0f, 30.0f, 30.0f, 30.0f, 162.0f, 98.0f, 10.0f, 213.0f, 30.0f, }; -void func_i3_801BDF14(void) { +void Aquas_801BDF14(void) { Actor* var_s0 = &gActors[1]; s32 i; @@ -5951,7 +5961,7 @@ void func_i3_801BDF14(void) { } } -void func_i3_801BE034(Actor* actor) { +void Aquas_801BE034(Actor* actor) { f32 temp; if (actor->timer_0BC == 0) { @@ -5968,7 +5978,7 @@ void func_i3_801BE034(Actor* actor) { } } -void func_i3_801BE0F0(Actor* actor) { +void Aquas_801BE0F0(Actor* actor) { RCP_SetupDL(&gMasterDisp, 0x3D); Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 0.5f, 1); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 255, 255, 255); @@ -5980,13 +5990,13 @@ void func_i3_801BE0F0(Actor* actor) { } // OBJ_80_126 draw -void func_i3_801BE1FC(Object_80* obj80) { +void Aquas_801BE1FC(Object_80* obj80) { Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 0.5f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_AQ_600EEF0); } -void func_i3_801BE274(Actor* actor, f32 yRot, f32 xRot) { +void Aquas_801BE274(Actor* actor, f32 yRot, f32 xRot) { Vec3f sp64; Vec3f sp58; Vec3f sp4C = { 0.0f, 0.0f, 0.0f }; @@ -6003,11 +6013,11 @@ void func_i3_801BE274(Actor* actor, f32 yRot, f32 xRot) { sp40.x = sp40.y = 0.0f; sp40.z = 80.0f; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp40, &sp58); - func_8007F04C(355, sp64.x, sp64.y, sp64.z, xRot, yRot, 0.0f, 0.0f, 0.0f, 0.0f, sp58.x, sp58.y, sp58.z, 1.0f); + func_effect_8007F04C(355, sp64.x, sp64.y, sp64.z, xRot, yRot, 0.0f, 0.0f, 0.0f, 0.0f, sp58.x, sp58.y, sp58.z, 1.0f); } // OBJ_ACTOR_270 action -void func_i3_801BE3F8(Actor* actor) { +void Aquas_801BE3F8(Actor* actor) { s32 i; f32 sp68; f32 sp64; @@ -6036,9 +6046,9 @@ void func_i3_801BE3F8(Actor* actor) { actor->unk_0B6++; if (actor->unk_0B6 == 10) { for (i = 0; i < 10; i++) { - func_i3_801AC8A8(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f), - actor->obj.pos.y + 50.0f + RAND_FLOAT_CENTERED(70.0f), actor->obj.pos.z + 100.0f, - 3.0f, 2); + Aquas_801AC8A8(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f), + actor->obj.pos.y + 50.0f + RAND_FLOAT_CENTERED(70.0f), actor->obj.pos.z + 100.0f, + 3.0f, 2); } } if ((actor->unk_0B6 == 18) && (actor->health != 0)) { @@ -6050,7 +6060,7 @@ void func_i3_801BE3F8(Actor* actor) { sp60 = gPlayer[0].unk_138 - actor->obj.pos.z; sp58 = Math_RadToDeg(Math_Atan2F(sp68, sp60)); sp5C = Math_RadToDeg(-Math_Atan2F(sp64, sqrtf(SQ(sp68) + SQ(sp60)))); - func_i3_801BE274(actor, sp58, sp5C); + Aquas_801BE274(actor, sp58, sp5C); if (actor->timer_0BC == 0) { actor->timer_0BC = 40.0f + RAND_FLOAT(30.0f); } @@ -6072,18 +6082,18 @@ void func_i3_801BE3F8(Actor* actor) { actor->health -= actor->damage; if (actor->health <= 0) { actor->health = actor->unk_044 = 0; - func_80066254(actor); + func_enmy_80066254(actor); for (i = 0; i < 10; i++) { - func_i3_801AC8A8(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f), - actor->obj.pos.y + 50.0f + RAND_FLOAT_CENTERED(70.0f), - actor->obj.pos.z + 100.0f, 3.0f, 2); + Aquas_801AC8A8(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f), + actor->obj.pos.y + 50.0f + RAND_FLOAT_CENTERED(70.0f), actor->obj.pos.z + 100.0f, + 3.0f, 2); } for (i = 0; i < 3; i++) { - func_80081A8C(actor->obj.pos.x + RAND_FLOAT(15.0f), actor->obj.pos.y + RAND_FLOAT(3.0f), - actor->obj.pos.z + RAND_FLOAT(5.0f), 1.0f + RAND_FLOAT(0.5f), 7); + func_effect_80081A8C(actor->obj.pos.x + RAND_FLOAT(15.0f), actor->obj.pos.y + RAND_FLOAT(3.0f), + actor->obj.pos.z + RAND_FLOAT(5.0f), 1.0f + RAND_FLOAT(0.5f), 7); } - func_800815DC(); - func_8007CF30(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 51.0f, 10.0f); + func_effect_800815DC(); + func_effect_8007CF30(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 51.0f, 10.0f); } } if (actor->state == 1) { @@ -6097,7 +6107,7 @@ void func_i3_801BE3F8(Actor* actor) { } // OBJ_ACTOR_270 draw -void func_i3_801BEB1C(Actor* actor) { +void Aquas_801BEB1C(Actor* actor) { Graphics_SetScaleMtx(3.0f); RCP_SetupDL(&gMasterDisp, 0x38); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 143, 143, 255); @@ -6113,23 +6123,23 @@ void func_i3_801BEB1C(Actor* actor) { } // OBJ_BOSS_301 action -void func_i3_801BEC50(Boss* boss301) { +void Aquas_801BEC50(Boss* boss301) { } // OBJ_BOSS_301 draw -void func_i3_801BEC5C(Boss* boss301) { +void Aquas_801BEC5C(Boss* boss301) { } // OBJ_ACTOR_188 action -void func_i3_801BEC68(Actor* actor) { +void Aquas_801BEC68(Actor* actor) { } // OBJ_ACTOR_188 draw -void func_i3_801BEC74(Actor* actor) { +void Aquas_801BEC74(Actor* actor) { } -void func_i3_801BEC80(Player* player) { +void Aquas_801BEC80(Player* player) { } -void func_i3_801BEC8C(void* arg0) { +void Aquas_801BEC8C(void* arg0) { } diff --git a/src/overlays/ovl_i3/fox_i3.c b/src/overlays/ovl_i3/fox_i3.c index e2522168..6d847319 100644 --- a/src/overlays/ovl_i3/fox_i3.c +++ b/src/overlays/ovl_i3/fox_i3.c @@ -3,5 +3,5 @@ static s32 D_i3_801BECA0 = 0; static s32 D_i3_801C2240; -void func_i3_80187520(s32 arg0, void* arg1) { +void OvlI3_CallFunction(s32 arg0, void* arg1) { } diff --git a/src/overlays/ovl_i3/fox_so.c b/src/overlays/ovl_i3/fox_so.c index 6fe5b872..e8ab0add 100644 --- a/src/overlays/ovl_i3/fox_so.c +++ b/src/overlays/ovl_i3/fox_so.c @@ -162,18 +162,18 @@ typedef enum { /* 50 */ SO_VWK_MAX, } BossSOvwork; -void func_i3_801A239C(Boss* bossSO); -void func_i3_801A2C3C(Boss* bossSO); -void func_i3_801A3468(Boss* bossSO); -void func_i3_801A48B8(Boss* bossSO); -void func_i3_801A4EC0(Boss* bossSO); -void func_i3_801A8DB8(Vec3f* pos, u32 sfxId, f32 zVel); +void Solar_801A239C(Boss* bossSO); +void Solar_801A2C3C(Boss* bossSO); +void Solar_801A3468(Boss* bossSO); +void Solar_801A48B8(Boss* bossSO); +void Solar_801A4EC0(Boss* bossSO); +void Solar_801A8DB8(Vec3f* pos, u32 sfxId, f32 zVel); s32 D_i3_801C2740[10]; f32 D_i3_801C2768[14]; s32 D_i3_801C27A0[8]; // unused? part of previous? -void func_i3_8019E7F0(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2) { +void Solar_8019E7F0(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2) { Effect_Initialize(effect); effect->obj.status = OBJ_ACTIVE; effect->obj.id = OBJ_EFFECT_392; @@ -192,19 +192,18 @@ void func_i3_8019E7F0(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2) effect->info.unk_14 = 0; } -void func_i3_8019E8B8(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { +void Solar_8019E8B8(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { s32 i; for (i = 0; i < ARRAY_COUNT(gEffects); i++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i3_8019E7F0(&gEffects[i], xPos, yPos, zPos, scale2); + Solar_8019E7F0(&gEffects[i], xPos, yPos, zPos, scale2); break; } } } -void func_i3_8019E920(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, - s32 state) { +void Solar_8019E920(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, s32 state) { Effect_Initialize(effect); effect->obj.status = OBJ_ACTIVE; effect->obj.id = OBJ_EFFECT_392; @@ -225,26 +224,26 @@ void func_i3_8019E920(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f3 Object_SetInfo(&effect->info, effect->obj.id); } -void func_i3_8019E9F4(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, s32 unk4E) { +void Solar_8019E9F4(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, s32 unk4E) { s32 i; for (i = 99; i >= 34; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i3_8019E920(&gEffects[i], xPos, yPos, zPos, xVel, yVel, zVel, scale2, unk4E); + Solar_8019E920(&gEffects[i], xPos, yPos, zPos, xVel, yVel, zVel, scale2, unk4E); break; } } } -void func_i3_8019EA7C(Actor* actor) { +void Solar_8019EA7C(Actor* actor) { f32 sp34; s32 sp30; if (actor->state == 0) { - actor->vel.z = 20.0f - D_80177D08; + actor->vel.z = 20.0f - D_ctx_80177D08; actor->fwork[0] = 12.0f; } else { - actor->vel.z = actor->fwork[1] - D_80177D08; + actor->vel.z = actor->fwork[1] - D_ctx_80177D08; if (actor->state == 2) { Math_SmoothStepToF(&actor->obj.pos.x, gPlayer[0].pos.x, 1.0f, 100.0f, 10.0f); } else { @@ -253,50 +252,50 @@ void func_i3_8019EA7C(Actor* actor) { } if ((actor->unk_046 == 0) || (actor->unk_046 == 1)) { actor->unk_046 = 3; - func_8005F0E8(actor->sfxSource, &actor->obj.pos); + func_edisplay_8005F0E8(actor->sfxSource, &actor->obj.pos); AUDIO_PLAY_SFX(0x11002052, actor->sfxSource, 0); } - if (func_800A73E4(&sp34, &sp30, actor->obj.pos.x, -100.0f, actor->obj.pos.z)) { - D_801782EC[sp30] = actor->fwork[0]; - D_801782EC[sp30 + 1] = actor->fwork[0] * 0.95f; - D_801782EC[sp30 - 1] = actor->fwork[0] * 0.95f; - D_801782EC[sp30 + 2] = actor->fwork[0] * 0.9f; - D_801782EC[sp30 - 2] = actor->fwork[0] * 0.9f; - D_801782EC[sp30 + 3] = actor->fwork[0] * 0.8f; - D_801782EC[sp30 - 3] = actor->fwork[0] * 0.8f; + if (func_play_800A73E4(&sp34, &sp30, actor->obj.pos.x, -100.0f, actor->obj.pos.z)) { + D_ctx_801782EC[sp30] = actor->fwork[0]; + D_ctx_801782EC[sp30 + 1] = actor->fwork[0] * 0.95f; + D_ctx_801782EC[sp30 - 1] = actor->fwork[0] * 0.95f; + D_ctx_801782EC[sp30 + 2] = actor->fwork[0] * 0.9f; + D_ctx_801782EC[sp30 - 2] = actor->fwork[0] * 0.9f; + D_ctx_801782EC[sp30 + 3] = actor->fwork[0] * 0.8f; + D_ctx_801782EC[sp30 - 3] = actor->fwork[0] * 0.8f; if (actor->state != 2) { - D_801782EC[sp30 + 4] = actor->fwork[0] * 0.65f; - D_801782EC[sp30 - 4] = actor->fwork[0] * 0.65f; - D_801782EC[sp30 + 5] = actor->fwork[0] * 0.45f; - D_801782EC[sp30 - 5] = actor->fwork[0] * 0.45f; - D_801782EC[sp30 + 6] = actor->fwork[0] * 0.2f; - D_801782EC[sp30 - 6] = actor->fwork[0] * 0.2f; - D_801782EC[sp30 + 7] = actor->fwork[0] * 0.1f; - D_801782EC[sp30 - 7] = actor->fwork[0] * 0.1f; + D_ctx_801782EC[sp30 + 4] = actor->fwork[0] * 0.65f; + D_ctx_801782EC[sp30 - 4] = actor->fwork[0] * 0.65f; + D_ctx_801782EC[sp30 + 5] = actor->fwork[0] * 0.45f; + D_ctx_801782EC[sp30 - 5] = actor->fwork[0] * 0.45f; + D_ctx_801782EC[sp30 + 6] = actor->fwork[0] * 0.2f; + D_ctx_801782EC[sp30 - 6] = actor->fwork[0] * 0.2f; + D_ctx_801782EC[sp30 + 7] = actor->fwork[0] * 0.1f; + D_ctx_801782EC[sp30 - 7] = actor->fwork[0] * 0.1f; } else { - D_801782EC[sp30 + 4] = actor->fwork[0] * 0.75f; - D_801782EC[sp30 - 4] = actor->fwork[0] * 0.75f; - D_801782EC[sp30 + 5] = actor->fwork[0] * 0.7f; - D_801782EC[sp30 - 5] = actor->fwork[0] * 0.7f; - D_801782EC[sp30 + 6] = actor->fwork[0] * 0.65f; - D_801782EC[sp30 - 6] = actor->fwork[0] * 0.65f; - D_801782EC[sp30 + 7] = actor->fwork[0] * 0.6f; - D_801782EC[sp30 - 7] = actor->fwork[0] * 0.6f; - D_801782EC[sp30 + 8] = actor->fwork[0] * 0.55f; - D_801782EC[sp30 - 8] = actor->fwork[0] * 0.55f; - D_801782EC[sp30 + 9] = actor->fwork[0] * 0.4f; - D_801782EC[sp30 - 9] = actor->fwork[0] * 0.4f; - D_801782EC[sp30 + 10] = actor->fwork[0] * 0.3f; - D_801782EC[sp30 - 10] = actor->fwork[0] * 0.3f; - D_801782EC[sp30 + 11] = actor->fwork[0] * 0.2f; - D_801782EC[sp30 - 11] = actor->fwork[0] * 0.2f; - D_801782EC[sp30 + 12] = actor->fwork[0] * 0.1f; - D_801782EC[sp30 - 12] = actor->fwork[0] * 0.1f; + D_ctx_801782EC[sp30 + 4] = actor->fwork[0] * 0.75f; + D_ctx_801782EC[sp30 - 4] = actor->fwork[0] * 0.75f; + D_ctx_801782EC[sp30 + 5] = actor->fwork[0] * 0.7f; + D_ctx_801782EC[sp30 - 5] = actor->fwork[0] * 0.7f; + D_ctx_801782EC[sp30 + 6] = actor->fwork[0] * 0.65f; + D_ctx_801782EC[sp30 - 6] = actor->fwork[0] * 0.65f; + D_ctx_801782EC[sp30 + 7] = actor->fwork[0] * 0.6f; + D_ctx_801782EC[sp30 - 7] = actor->fwork[0] * 0.6f; + D_ctx_801782EC[sp30 + 8] = actor->fwork[0] * 0.55f; + D_ctx_801782EC[sp30 - 8] = actor->fwork[0] * 0.55f; + D_ctx_801782EC[sp30 + 9] = actor->fwork[0] * 0.4f; + D_ctx_801782EC[sp30 - 9] = actor->fwork[0] * 0.4f; + D_ctx_801782EC[sp30 + 10] = actor->fwork[0] * 0.3f; + D_ctx_801782EC[sp30 - 10] = actor->fwork[0] * 0.3f; + D_ctx_801782EC[sp30 + 11] = actor->fwork[0] * 0.2f; + D_ctx_801782EC[sp30 - 11] = actor->fwork[0] * 0.2f; + D_ctx_801782EC[sp30 + 12] = actor->fwork[0] * 0.1f; + D_ctx_801782EC[sp30 - 12] = actor->fwork[0] * 0.1f; } } switch (actor->unk_0D0) { case 3: - func_i3_801A8DB8(&actor->obj.pos, 0x11002052, actor->vel.z); + Solar_801A8DB8(&actor->obj.pos, 0x11002052, actor->vel.z); /* fallthrough */ case 2: Object_Kill(&actor->obj, actor->sfxSource); @@ -304,7 +303,7 @@ void func_i3_8019EA7C(Actor* actor) { } } -void func_i3_8019EF30(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { +void Solar_8019EF30(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { Actor_Initialize(actor); actor->obj.status = OBJ_ACTIVE; actor->obj.id = OBJ_ACTOR_275; @@ -327,18 +326,18 @@ void func_i3_8019EF30(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 AUDIO_PLAY_SFX(0x29000071, actor->sfxSource, 0); } -void func_i3_8019F038(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { +void Solar_8019F038(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { s32 i; for (i = 4; i < ARRAY_COUNT(gActors); i++) { if (gActors[i].obj.status == OBJ_FREE) { - func_i3_8019EF30(&gActors[i], xPos, yPos, zPos, xVel, yVel, zVel); + Solar_8019EF30(&gActors[i], xPos, yPos, zPos, xVel, yVel, zVel); break; } } } -void func_i3_8019F0B0(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { +void Solar_8019F0B0(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { Actor_Initialize(actor); actor->obj.status = OBJ_ACTIVE; actor->obj.id = OBJ_ACTOR_277; @@ -358,12 +357,12 @@ void func_i3_8019F0B0(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 AUDIO_PLAY_SFX(0x29000071, actor->sfxSource, 0); } -void func_i3_8019F194(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { +void Solar_8019F194(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { s32 i; for (i = 4; i < ARRAY_COUNT(gActors); i++) { if (gActors[i].obj.status == OBJ_FREE) { - func_i3_8019F0B0(&gActors[i], xPos, yPos, zPos, xVel, yVel, zVel); + Solar_8019F0B0(&gActors[i], xPos, yPos, zPos, xVel, yVel, zVel); break; } } @@ -389,7 +388,7 @@ Vec3f D_i3_801BF95C[3] = { { 180.0f, 0.0f, 240.0f }, }; -void func_i3_8019F20C(Actor* actor) { +void Solar_8019F20C(Actor* actor) { f32 sp8C = 0.0f; s32 sp88; s32 i; @@ -413,38 +412,38 @@ void func_i3_8019F20C(Actor* actor) { case 1: actor->state = 2; actor->vel.y = actor->fwork[0]; - func_800A73E4(&sp8C, &sp88, actor->obj.pos.x, actor->obj.pos.y - 100.0f, actor->obj.pos.z); + func_play_800A73E4(&sp8C, &sp88, actor->obj.pos.x, actor->obj.pos.y - 100.0f, actor->obj.pos.z); actor->obj.pos.y = sp8C; for (i = 0; i < 4; i++) { - func_i3_8019E9F4(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, D_i3_801BF8E0[i], - RAND_FLOAT(10.0f) + 10.0f, 0.0f, actor->scale * 5.0f, 1); + Solar_8019E9F4(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, D_i3_801BF8E0[i], + RAND_FLOAT(10.0f) + 10.0f, 0.0f, actor->scale * 5.0f, 1); } actor->timer_0C2 = 5; AUDIO_PLAY_SFX(0x29000071, actor->sfxSource, 0); break; case 2: actor->gravity = 0.5f; - if (func_800A73E4(&sp8C, &sp88, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z)) { + if (func_play_800A73E4(&sp8C, &sp88, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z)) { Object_Kill(&actor->obj, actor->sfxSource); - func_8007A6F0(&actor->obj.pos, 0x29000072); + func_effect_8007A6F0(&actor->obj.pos, 0x29000072); for (i = 0; i < 4; i++) { - func_i3_8019E9F4(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, D_i3_801BF8E0[i], - RAND_FLOAT(10.0f) + 10.0f, 0.0f, actor->scale * 5.0f, 1); + Solar_8019E9F4(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, D_i3_801BF8E0[i], + RAND_FLOAT(10.0f) + 10.0f, 0.0f, actor->scale * 5.0f, 1); } } if (actor->timer_0BC == 0) { actor->timer_0BC = 5; - func_i3_8019E9F4(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, - actor->scale * 6.5f, 2); + Solar_8019E9F4(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, + actor->scale * 6.5f, 2); } if ((actor->unk_0D0 != 0) || ((actor->obj.id == OBJ_ACTOR_277) && (actor->vel.y < 0.0f))) { - func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->scale * 4.0f); + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->scale * 4.0f); Object_Kill(&actor->obj, actor->sfxSource); if (actor->obj.id == OBJ_ACTOR_277) { for (i = 0; i < 4; i++) { - func_i3_8019F038(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, - D_i3_801BF8F0[i].x + RAND_FLOAT_CENTERED(3.0f), - D_i3_801BF8F0[i].y + RAND_FLOAT_CENTERED(3.0f), RAND_FLOAT(-10.0f) - 10.0f); + Solar_8019F038(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, + D_i3_801BF8F0[i].x + RAND_FLOAT_CENTERED(3.0f), + D_i3_801BF8F0[i].y + RAND_FLOAT_CENTERED(3.0f), RAND_FLOAT(-10.0f) - 10.0f); } } else if (actor->obj.id == OBJ_ACTOR_275) { actor->unk_044 = 1; @@ -455,15 +454,15 @@ void func_i3_8019F20C(Actor* actor) { actor->unk_044 = 25; } } - func_80066254(actor); + func_enmy_80066254(actor); for (i = 0; i < 3; i++) { - func_800794CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 0.3f); + func_effect_800794CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 0.3f); } for (i = 0; i < 7; i++) { - func_i3_8019E9F4(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, RAND_FLOAT_CENTERED(30.0f), - RAND_FLOAT_CENTERED(30.0f), 0.0f, (RAND_FLOAT(2.0f) + 2.0f) * actor->scale, 1); + Solar_8019E9F4(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, RAND_FLOAT_CENTERED(30.0f), + RAND_FLOAT_CENTERED(30.0f), 0.0f, (RAND_FLOAT(2.0f) + 2.0f) * actor->scale, 1); } - func_8007A6F0(&actor->obj.pos, 0x2903A008); + func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); } break; } @@ -477,7 +476,7 @@ void func_i3_8019F20C(Actor* actor) { } } -void func_i3_8019F7AC(Actor* actor) { +void Solar_8019F7AC(Actor* actor) { if (actor->state != 0) { Matrix_Push(&gGfxMatrix); Matrix_RotateY(gGfxMatrix, actor->unk_0F4.y * M_DTOR, 1); @@ -507,7 +506,7 @@ void func_i3_8019F7AC(Actor* actor) { } } -void func_i3_8019F99C(Actor* actor, Effect* effect, f32 scale1) { +void Solar_8019F99C(Actor* actor, Effect* effect, f32 scale1) { Effect_Initialize(effect); effect->obj.status = OBJ_ACTIVE; effect->obj.id = OBJ_EFFECT_392; @@ -527,7 +526,7 @@ void func_i3_8019F99C(Actor* actor, Effect* effect, f32 scale1) { Object_SetInfo(&effect->info, effect->obj.id); } -void func_i3_8019FAA4(Boss* bossSO, Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yVel, f32 hVelMod) { +void Solar_8019FAA4(Boss* bossSO, Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yVel, f32 hVelMod) { Vec3f sp44; Vec3f sp38; Vec3f sp2C = D_i3_801BF920; @@ -586,7 +585,7 @@ void func_i3_8019FAA4(Boss* bossSO, Effect* effect, f32 xPos, f32 yPos, f32 zPos Object_SetInfo(&effect->info, effect->obj.id); } -void func_i3_8019FDE0(Boss* bossSO, Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 state) { +void Solar_8019FDE0(Boss* bossSO, Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 state) { Effect_Initialize(effect); effect->obj.status = OBJ_ACTIVE; effect->obj.id = OBJ_EFFECT_392; @@ -609,40 +608,40 @@ void func_i3_8019FDE0(Boss* bossSO, Effect* effect, f32 xPos, f32 yPos, f32 zPos effect->info.damage = 40; } -void func_i3_8019FEE8(Actor* actor, f32 scale1) { +void Solar_8019FEE8(Actor* actor, f32 scale1) { s32 i; for (i = 70; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i3_8019F99C(actor, &gEffects[i], scale1); + Solar_8019F99C(actor, &gEffects[i], scale1); break; } } } -void func_i3_8019FF44(Boss* bossSO, f32 xPos, f32 yPos, f32 zPos, f32 yVel, f32 hVelMod) { +void Solar_8019FF44(Boss* bossSO, f32 xPos, f32 yPos, f32 zPos, f32 yVel, f32 hVelMod) { s32 i; for (i = 70; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i3_8019FAA4(bossSO, &gEffects[i], xPos, yPos, zPos, yVel, hVelMod); + Solar_8019FAA4(bossSO, &gEffects[i], xPos, yPos, zPos, yVel, hVelMod); break; } } } -void func_i3_8019FFC0(Boss* bossSO, f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 unk4E) { +void Solar_8019FFC0(Boss* bossSO, f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 unk4E) { s32 i; for (i = 70; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i3_8019FDE0(bossSO, &gEffects[i], xPos, yPos, zPos, scale2, unk4E); + Solar_8019FDE0(bossSO, &gEffects[i], xPos, yPos, zPos, scale2, unk4E); break; } } } -void func_i3_801A003C(Actor* actor) { +void Solar_801A003C(Actor* actor) { switch (actor->state) { case 0: if (actor->timer_0BE == 0) { @@ -650,7 +649,7 @@ void func_i3_801A003C(Actor* actor) { actor->timer_0BE = 50; } else if (actor->timer_0BC == 0) { actor->timer_0BC = 2; - func_i3_8019FEE8(actor, 1000.0f); + Solar_8019FEE8(actor, 1000.0f); actor->unk_04E++; } break; @@ -659,14 +658,14 @@ void func_i3_801A003C(Actor* actor) { actor->state = 0; actor->timer_0BE = 50; actor->unk_04E = 0; - func_8005F0E8(actor->sfxSource, &actor->obj.pos); + func_edisplay_8005F0E8(actor->sfxSource, &actor->obj.pos); AUDIO_PLAY_SFX(0x19035053, actor->sfxSource, 4); } break; } } -void func_i3_801A0120(Effect* effect) { +void Solar_801A0120(Effect* effect) { f32 sp5C; f32 sp58; f32 sp54; @@ -692,13 +691,13 @@ void func_i3_801A0120(Effect* effect) { } } if (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_7) { - func_8007A774(&gPlayer[0], effect, effect->scale2 * 12.0f); + func_effect_8007A774(&gPlayer[0], effect, effect->scale2 * 12.0f); } if (effect->unk_60.x > 190.0f) { Object_Kill(&effect->obj, effect->sfxSource); } sp48 = effect->unk_48; - if (func_800A73E4(&sp5C, &sp4C, effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z)) { + if (func_play_800A73E4(&sp5C, &sp4C, effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z)) { effect->unk_48 = 1; if (effect->scale2 == 20.0f) { AUDIO_PLAY_SFX(0x19035054, effect->sfxSource, 4); @@ -717,8 +716,8 @@ void func_i3_801A0120(Effect* effect) { } else { sp58 = -100.0f; } - func_i3_8019E9F4(effect->obj.pos.x + sp58, effect->obj.pos.y + sp54, effect->obj.pos.z, sp58 * 0.25f, - RAND_FLOAT(10.0f) + 20.0f, sp58 * 0.25f, 20.0f, 1); + Solar_8019E9F4(effect->obj.pos.x + sp58, effect->obj.pos.y + sp54, effect->obj.pos.z, sp58 * 0.25f, + RAND_FLOAT(10.0f) + 20.0f, sp58 * 0.25f, 20.0f, 1); } break; case 1: @@ -759,7 +758,7 @@ void func_i3_801A0120(Effect* effect) { Math_SmoothStepToF(&effect->vel.y, -65.0f, 2.0f, 1.0f, 0.5f); } if (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_7) { - func_8007A774(&gPlayer[0], effect, effect->scale2 * 12.0f); + func_effect_8007A774(&gPlayer[0], effect, effect->scale2 * 12.0f); } if (effect->obj.pos.y < -20.0f) { Object_Kill(&effect->obj, effect->sfxSource); @@ -769,7 +768,7 @@ void func_i3_801A0120(Effect* effect) { effect->obj.rot.z = 0.0f; } sp48 = effect->unk_48; - if (func_800A73E4(&sp5C, &sp4C, effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z)) { + if (func_play_800A73E4(&sp5C, &sp4C, effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z)) { effect->unk_48 = 1; if (effect->scale2 == 20.0f) { AUDIO_PLAY_SFX(0x19035054, effect->sfxSource, 4); @@ -783,8 +782,8 @@ void func_i3_801A0120(Effect* effect) { } else { sp58 = -100.0f; } - func_i3_8019E9F4(effect->obj.pos.x + sp58, effect->obj.pos.y + -50.0f, effect->obj.pos.z, sp58 * 0.25f, - RAND_FLOAT(10.0f) + 20.0f, sp58 * 0.25f, 20.0f, 1); + Solar_8019E9F4(effect->obj.pos.x + sp58, effect->obj.pos.y + -50.0f, effect->obj.pos.z, sp58 * 0.25f, + RAND_FLOAT(10.0f) + 20.0f, sp58 * 0.25f, 20.0f, 1); } break; case 5: @@ -800,7 +799,7 @@ void func_i3_801A0120(Effect* effect) { effect->vel.y = COS_DEG(effect->unk_60.z) * (effect->unk_60.x * 10.0f); effect->vel.z = gPlayer[0].vel.z + 15.0f; if (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_7) { - func_8007A774(&gPlayer[0], effect, effect->scale2 * 18.0f); + func_effect_8007A774(&gPlayer[0], effect, effect->scale2 * 18.0f); if ((effect->unk_4C == 0) && ((effect->scale2 >= 9.8f) || (effect->scale2 <= 4.4f))) { AUDIO_PLAY_SFX(0x31033078, effect->sfxSource, 4); } @@ -824,7 +823,7 @@ void func_i3_801A0120(Effect* effect) { effect->vel.y = COS_DEG(effect->unk_60.z) * sp50 * 50.0f; effect->vel.z = gPlayer[0].vel.z + 80.0f; if (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_7) { - func_8007A774(&gPlayer[0], effect, effect->scale2 * 18.0f); + func_effect_8007A774(&gPlayer[0], effect, effect->scale2 * 18.0f); if ((effect->unk_4C == 0) && ((effect->scale2 >= 9.8f) || (effect->scale2 <= 4.4f))) { AUDIO_PLAY_SFX(0x31033078, effect->sfxSource, 4); } @@ -835,7 +834,7 @@ void func_i3_801A0120(Effect* effect) { } } -void func_i3_801A0AF0(Effect* effect) { +void Solar_801A0AF0(Effect* effect) { Graphics_SetScaleMtx(effect->scale2); switch (effect->state) { case 0: @@ -863,7 +862,7 @@ void func_i3_801A0AF0(Effect* effect) { } } -void func_i3_801A0CEC(Actor* actor, f32 xPos, f32 zPos, f32 zVel, s32 unkB8) { +void Solar_801A0CEC(Actor* actor, f32 xPos, f32 zPos, f32 zVel, s32 unkB8) { Actor_Initialize(actor); actor->obj.status = OBJ_ACTIVE; actor->obj.id = OBJ_ACTOR_278; @@ -880,28 +879,28 @@ void func_i3_801A0CEC(Actor* actor, f32 xPos, f32 zPos, f32 zVel, s32 unkB8) { actor->info.bonus = 0; } -void func_i3_801A0D90(f32 xPos, f32 zPos, f32 zVel, s32 unkB8) { +void Solar_801A0D90(f32 xPos, f32 zPos, f32 zVel, s32 unkB8) { s32 i; for (i = 4; i < ARRAY_COUNT(gActors); i++) { if (gActors[i].obj.status == OBJ_FREE) { - func_i3_801A0CEC(&gActors[i], xPos, zPos, zVel, unkB8); + Solar_801A0CEC(&gActors[i], xPos, zPos, zVel, unkB8); break; } } } -void func_i3_801A0DF8(f32 xPos, f32 zPos, f32 yRot, s32 index, f32 yPos) { +void Solar_801A0DF8(f32 xPos, f32 zPos, f32 yRot, s32 index, f32 yPos) { s32 sp2C; switch (index) { case 0: - if (D_80177A10[0] != 0) { + if (D_ctx_80177A10[0] != 0) { sp2C = 5; - D_80177A10[1] = RAND_INT(10.0f) + 128; + D_ctx_80177A10[1] = RAND_INT(10.0f) + 128; } else { sp2C = 4; - D_80177A10[0] = RAND_INT(10.0f) + 128; + D_ctx_80177A10[0] = RAND_INT(10.0f) + 128; } break; case 1: @@ -930,12 +929,12 @@ void func_i3_801A0DF8(f32 xPos, f32 zPos, f32 yRot, s32 index, f32 yPos) { gActors[sp2C].timer_0BE = 50; gActors[sp2C].unk_04E = 0; gActors[sp2C].obj.pos.y = -1.0f * yPos; - func_8005F0E8(gActors[sp2C].sfxSource, &gActors[sp2C].obj.pos); + func_edisplay_8005F0E8(gActors[sp2C].sfxSource, &gActors[sp2C].obj.pos); AUDIO_PLAY_SFX(0x19035053, gActors[sp2C].sfxSource, 4); } } -void func_i3_801A0FD4(Actor* actor, s32 index) { +void Solar_801A0FD4(Actor* actor, s32 index) { if (gTeamShields[3 - index] > 0) { Actor_Initialize(actor); actor->obj.status = OBJ_ACTIVE; @@ -954,16 +953,16 @@ void func_i3_801A0FD4(Actor* actor, s32 index) { } } -void func_i3_801A10F4(Player* player) { +void Solar_801A10F4(Player* player) { s32 i; Vec3f sp50; Vec3f sp44; - if (D_80177A10[0] != 0) { - D_80177A10[0]--; + if (D_ctx_80177A10[0] != 0) { + D_ctx_80177A10[0]--; } - if (D_80177A10[1] != 0) { - D_80177A10[1]--; + if (D_ctx_80177A10[1] != 0) { + D_ctx_80177A10[1]--; } switch (player->unk_1D0) { case 0: @@ -981,23 +980,23 @@ void func_i3_801A10F4(Player* player) { gCsCamAtY = 400.0f; player->camAt.z = gCsCamAtZ = -2300.0f; - D_80177A48[0] = 0.0045f; + D_ctx_80177A48[0] = 0.0045f; player->unk_034 = 0.0f; player->unk_0D0 = 0.0f; - D_80178340 = 255; - D_80178358 = 0; - func_i3_801A0DF8(-750.0f, -2600.0f, 300.0f, 2, 1.0f); + D_ctx_80178340 = 255; + D_ctx_80178358 = 0; + Solar_801A0DF8(-750.0f, -2600.0f, 300.0f, 2, 1.0f); AUDIO_PLAY_SFX(0x3140807E, player->sfxSource, 0); break; case 1: - D_80177CE8 += 30.0f; + D_ctx_80177CE8 += 30.0f; if (gCsFrameCount == 140) { - func_i3_801A0DF8(-400.0f, -2000.0f, 45.0f, 3, 1.0f); + Solar_801A0DF8(-400.0f, -2000.0f, 45.0f, 3, 1.0f); } if (gCsFrameCount == 280) { - func_i3_801A0DF8(-1730.0f, -2300.0f, 250.0f, 1, 1.0f); + Solar_801A0DF8(-1730.0f, -2300.0f, 250.0f, 1, 1.0f); } if (gCsFrameCount == 100) { Object_Kill(&gActors[4].obj, gActors[4].sfxSource); @@ -1009,24 +1008,24 @@ void func_i3_801A10F4(Player* player) { Object_Kill(&gActors[6].obj, gActors[6].sfxSource); } if (gCsFrameCount < 3) { - D_80178340 = 255; + D_ctx_80178340 = 255; } if (gCsFrameCount == 370) { - D_80178358 = 255; - D_80178348 = 255; - D_80178350 = 255; - D_80178354 = 255; - D_8017835C = 8; + D_ctx_80178358 = 255; + D_ctx_80178348 = 255; + D_ctx_80178350 = 255; + D_ctx_80178354 = 255; + D_ctx_8017835C = 8; } if (!(gGameFrameCount & 7)) { - func_i3_8019E8B8(RAND_FLOAT_CENTERED(6000.0f), RAND_FLOAT_CENTERED(5.0f) - 90.0f, - RAND_FLOAT(2000.0f) - 6000.0f + D_80177D20, RAND_FLOAT(20.0f) + 20.0f); + Solar_8019E8B8(RAND_FLOAT_CENTERED(6000.0f), RAND_FLOAT_CENTERED(5.0f) - 90.0f, + RAND_FLOAT(2000.0f) - 6000.0f + D_ctx_80177D20, RAND_FLOAT(20.0f) + 20.0f); } if (gCsFrameCount == 380) { for (i = 0; i < 100; i++) { Object_Kill(&gEffects[i].obj, gEffects[i].sfxSource); } - func_i3_801A0DF8(400.0f, -2800.0f, 340.0f, 1, 1.0f); + Solar_801A0DF8(400.0f, -2800.0f, 340.0f, 1, 1.0f); } if (gCsFrameCount == 410) { player->unk_1D0++; @@ -1044,29 +1043,29 @@ void func_i3_801A10F4(Player* player) { player->pos.y = 1200.0f; player->pos.z = -2500.0f; - func_i3_801A0FD4(&gActors[0], 0); - func_i3_801A0FD4(&gActors[1], 1); - func_i3_801A0FD4(&gActors[2], 2); + Solar_801A0FD4(&gActors[0], 0); + Solar_801A0FD4(&gActors[1], 1); + Solar_801A0FD4(&gActors[2], 2); gCsCamAtZ = -3000.0f; gCsCamEyeZ = -3400.0f; Audio_KillSfxBySourceAndId(player->sfxSource, 0x3140807E); AUDIO_PLAY_BGM(SEQ_ID_51); - func_80057814(player); + func_display_80057814(player); func_8001C8B8(gPlayerNum); - D_80177A48[0] = 0.01f; + D_ctx_80177A48[0] = 0.01f; } break; case 2: - D_80177CE8 += 60.0f; - D_80178358 = 0; - D_8017835C = 8; - Math_SmoothStepToF(D_80177A48, 0.02f, 1.0f, 0.0000003f, 0.0f); + D_ctx_80177CE8 += 60.0f; + D_ctx_80178358 = 0; + D_ctx_8017835C = 8; + Math_SmoothStepToF(D_ctx_80177A48, 0.02f, 1.0f, 0.0000003f, 0.0f); if (gCsFrameCount == 525) { Radio_PlayMessage(gMsg_ID_10010, RCID_FOX); } if (gCsFrameCount == 550) { Object_Kill(&gActors[5].obj, gActors[5].sfxSource); - func_i3_801A0DF8(30.0f, -1500.0f, 160.0f, 3, 2.0f); + Solar_801A0DF8(30.0f, -1500.0f, 160.0f, 3, 2.0f); } if (player->camEye.z <= -2465.0f) { player->unk_1D0++; @@ -1074,17 +1073,17 @@ void func_i3_801A10F4(Player* player) { gCsCamAtX = 0.0f; gCsCamEyeX = 0.0f; gCsCamAtZ = -2800.0f; - D_80177A48[0] = 0.06f; + D_ctx_80177A48[0] = 0.06f; } break; case 3: - D_80177CE8 += 60.0f; + D_ctx_80177CE8 += 60.0f; if (!(gGameFrameCount & 3)) { - func_i3_8019E8B8(RAND_FLOAT_CENTERED(6000.0f), -400.0f - ((player->camEye.y - 1380.0f) * 0.3f), - RAND_FLOAT_CENTERED(2000.0f) + 500.0f + D_80177D20, RAND_FLOAT(20.0f) + 20.0f); + Solar_8019E8B8(RAND_FLOAT_CENTERED(6000.0f), -400.0f - ((player->camEye.y - 1380.0f) * 0.3f), + RAND_FLOAT_CENTERED(2000.0f) + 500.0f + D_ctx_80177D20, RAND_FLOAT(20.0f) + 20.0f); } if (gCsFrameCount == 615) { - func_800A6028(player->sfxSource, 0x09000002); + func_play_800A6028(player->sfxSource, 0x09000002); gActors[0].fwork[29] = gActors[1].fwork[29] = gActors[2].fwork[29] = 5.0f; gActors[0].state = 3; gActors[1].state = 2; @@ -1102,20 +1101,20 @@ void func_i3_801A10F4(Player* player) { gCsCamAtX = player->pos.x; gCsCamAtY = player->pos.y; gCsCamAtZ = player->unk_138 + 1100.0f; - D_80177A48[0] = 0.03f; - D_801779A8[gMainController] = 60.0f; + D_ctx_80177A48[0] = 0.03f; + D_ctx_801779A8[gMainController] = 60.0f; player->unk_190 = 2.0f; if (player->timer_1F8 == 0) { - D_80178358 = 255; - D_8017835C = 24; - D_80178348 = D_80178350 = D_80178354 = 255; + D_ctx_80178358 = 255; + D_ctx_8017835C = 24; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; } - if (D_80178340 == 255) { + if (D_ctx_80178340 == 255) { AUDIO_PLAY_BGM(SEQ_ID_11 | 0x8000); player->pos.z = 0.0f; - player->unk_0D0 = D_80161A54; - func_800A6148(); - D_80177838 = 50; + player->unk_0D0 = D_play_80161A54; + func_play_800A6148(); + D_ctx_80177838 = 50; player->state_1C8 = PLAYERSTATE_1C8_3; player->unk_1D0 = 0; player->pos.y = 350.0f; @@ -1128,25 +1127,25 @@ void func_i3_801A10F4(Player* player) { player->camAt.y = 20.0f + player->pos.y * player->unk_148; player->camAt.z = player->unk_138; - D_80177950 = 1.0f; + D_ctx_80177950 = 1.0f; func_8001D1C8(0xFF, 3); AUDIO_PLAY_SFX(0x4100C023, gDefaultSfxSource, 4); - D_80178488 = 1; - D_80178358 = 0; + D_ctx_80178488 = 1; + D_ctx_80178358 = 0; player->timer_1F8 = 15; gPlayer[0].shields = 255; } break; case 10: - D_80177CE8 += 60.0f; + D_ctx_80177CE8 += 60.0f; break; } - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 20000.0f, 0); - Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 20000.0f, 0); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 20000.0f, 0); - Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 20000.0f, 0); - Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 20000.0f, 0); - Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_ctx_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_ctx_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_ctx_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_ctx_80177A48[0], 20000.0f, 0); Matrix_RotateY(gCalcMatrix, (player->unk_0E8 + 180.0f) * M_DTOR, 0); Matrix_RotateX(gCalcMatrix, -(player->unk_0E4 * M_DTOR), 1); sp50.x = 0.f; @@ -1162,8 +1161,8 @@ void func_i3_801A10F4(Player* player) { player->unk_138 = player->pos.z + player->unk_08C; } -void func_i3_801A1CD8(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 zRot, f32 xVel, f32 yVel, - f32 zVel, s32 unk46) { +void Solar_801A1CD8(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 zRot, f32 xVel, f32 yVel, + f32 zVel, s32 unk46) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; actor->obj.id = OBJ_ACTOR_189; @@ -1190,24 +1189,24 @@ void func_i3_801A1CD8(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 Object_SetInfo(&actor->info, actor->obj.id); } -void func_i3_801A1E14(f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 zRot, f32 xVel, f32 yVel, f32 zVel, - s32 unk46) { +void Solar_801A1E14(f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 zRot, f32 xVel, f32 yVel, f32 zVel, + s32 unk46) { s32 i; for (i = 59; i >= 0; i--) { if (gActors[i].obj.status == OBJ_FREE) { - func_i3_801A1CD8(&gActors[i], xPos, yPos, zPos, xRot, yRot, zRot, xVel, yVel, zVel, unk46); + Solar_801A1CD8(&gActors[i], xPos, yPos, zPos, xRot, yRot, zRot, xVel, yVel, zVel, unk46); break; } } } -void func_i3_801A1EB0(Boss* bossSO, f32 xPos, f32 xOffset, f32 yPos, f32 zPos) { - func_i3_8019E9F4(xPos + xOffset, yPos, zPos, 20.0f, RAND_FLOAT(10.0f) + 20.0f, 0.0f, 20.0f, 1); - func_i3_8019E9F4(xPos - xOffset, yPos, zPos, -20.0f, RAND_FLOAT(10.0f) + 20.0f, 0.0f, 20.0f, 1); +void Solar_801A1EB0(Boss* bossSO, f32 xPos, f32 xOffset, f32 yPos, f32 zPos) { + Solar_8019E9F4(xPos + xOffset, yPos, zPos, 20.0f, RAND_FLOAT(10.0f) + 20.0f, 0.0f, 20.0f, 1); + Solar_8019E9F4(xPos - xOffset, yPos, zPos, -20.0f, RAND_FLOAT(10.0f) + 20.0f, 0.0f, 20.0f, 1); } -void func_i3_801A1F80(Boss* bossSO) { +void Solar_801A1F80(Boss* bossSO) { if (gBossActive != 0) { bossSO->unk_3F8 = 5.5f; } @@ -1224,9 +1223,9 @@ void func_i3_801A1F80(Boss* bossSO) { bossSO->obj.pos.y = -3000.0f; - func_i3_801A0CEC(&gActors[10], bossSO->obj.pos.x, bossSO->obj.pos.z + 2000.0f, 20.0f, 1); - D_801779A8[gMainController] = 10.0f; - D_80178480 = 120; + Solar_801A0CEC(&gActors[10], bossSO->obj.pos.x, bossSO->obj.pos.z + 2000.0f, 20.0f, 1); + D_ctx_801779A8[gMainController] = 10.0f; + D_ctx_80178480 = 120; bossSO->fwork[SO_FWK_3] = 2400.0f; bossSO->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SO_60231A4); bossSO->unk_04C = 0; @@ -1260,7 +1259,7 @@ void func_i3_801A1F80(Boss* bossSO) { AUDIO_PLAY_BGM(SEQ_ID_27 | 0x8000); } if (gBossFrameCount <= 60) { - Math_SmoothStepToF(&D_801779A8[gMainController], 120.0f, 1.0f, 3.5f, 0.0f); + Math_SmoothStepToF(&D_ctx_801779A8[gMainController], 120.0f, 1.0f, 3.5f, 0.0f); } if (gBossFrameCount == 60) { gActors[10].unk_0D0 = 3; @@ -1271,7 +1270,7 @@ void func_i3_801A1F80(Boss* bossSO) { bossSO->swork[SO_SWK_1] = 1; } if (gBossFrameCount == 150) { - func_i3_801A239C(bossSO); + Solar_801A239C(bossSO); bossSO->fwork[SO_FWK_0] = 0.01f; } if ((gBossFrameCount == 100) && (gTeamShields[3] != 0)) { @@ -1279,7 +1278,7 @@ void func_i3_801A1F80(Boss* bossSO) { } } -void func_i3_801A239C(Boss* bossSO) { +void Solar_801A239C(Boss* bossSO) { bossSO->swork[SO_SWK_0] = 1; if ((bossSO->swork[SO_SWK_2] != 0) || (bossSO->swork[SO_SWK_3] != 0)) { if (bossSO->swork[SO_SWK_3] != 0) { @@ -1293,7 +1292,7 @@ void func_i3_801A239C(Boss* bossSO) { bossSO->unk_04C = 0; } -void func_i3_801A23F4(Boss* bossSO) { +void Solar_801A23F4(Boss* bossSO) { s32 i; Vec3f sp58; Vec3f sp4C; @@ -1324,7 +1323,7 @@ void func_i3_801A23F4(Boss* bossSO) { bossSO->info.hitbox[42] = 110.0f; } if (bossSO->unk_04C == 29) { - func_8005F0E8(bossSO->sfxSource, &bossSO->obj.pos); + func_edisplay_8005F0E8(bossSO->sfxSource, &bossSO->obj.pos); AUDIO_PLAY_SFX(0x19035053, bossSO->sfxSource, 4); } if (bossSO->unk_04C == 80) { @@ -1351,7 +1350,7 @@ void func_i3_801A23F4(Boss* bossSO) { bossSO->info.hitbox[24] = 275.0f; } if (bossSO->unk_04C == 10) { - func_8005F0E8(bossSO->sfxSource, &bossSO->obj.pos); + func_edisplay_8005F0E8(bossSO->sfxSource, &bossSO->obj.pos); AUDIO_PLAY_SFX(0x19035053, bossSO->sfxSource, 4); } if (bossSO->unk_04C == 50) { @@ -1378,15 +1377,15 @@ void func_i3_801A23F4(Boss* bossSO) { sp58.y = RAND_FLOAT_CENTERED(2.0f); sp58.z = RAND_FLOAT(10.0f) + 2.5f; Matrix_MultVec3f(gCalcMatrix, &sp58, &sp4C); - func_i3_8019F038(bossSO->fwork[SO_FWK_4] + sp34.x, bossSO->fwork[SO_FWK_5] + sp34.y, - bossSO->fwork[SO_FWK_6] + sp34.z, sp4C.x, sp4C.y, sp4C.z); + Solar_8019F038(bossSO->fwork[SO_FWK_4] + sp34.x, bossSO->fwork[SO_FWK_5] + sp34.y, + bossSO->fwork[SO_FWK_6] + sp34.z, sp4C.x, sp4C.y, sp4C.z); } } if (bossSO->unk_04C == 99) { if ((bossSO->swork[SO_SWK_2] != 0) || (bossSO->swork[SO_SWK_3] != 0)) { - func_i3_801A2C3C(bossSO); + Solar_801A2C3C(bossSO); } else { - func_i3_801A4EC0(bossSO); + Solar_801A4EC0(bossSO); } } break; @@ -1443,7 +1442,7 @@ void func_i3_801A23F4(Boss* bossSO) { bossSO->info.hitbox[24] = 110.0f; } if (bossSO->unk_04C == 5) { - func_8005F0E8(bossSO->sfxSource, &bossSO->obj.pos); + func_edisplay_8005F0E8(bossSO->sfxSource, &bossSO->obj.pos); AUDIO_PLAY_SFX(0x19035053, bossSO->sfxSource, 4); } if (bossSO->unk_04C == 20) { @@ -1458,7 +1457,7 @@ void func_i3_801A23F4(Boss* bossSO) { } } -void func_i3_801A2C3C(Boss* bossSO) { +void Solar_801A2C3C(Boss* bossSO) { bossSO->swork[SO_SWK_0] = 2; bossSO->swork[SO_SWK_1] = 0; bossSO->fwork[SO_FWK_0] = 0.05f; @@ -1467,7 +1466,7 @@ void func_i3_801A2C3C(Boss* bossSO) { bossSO->swork[SO_SWK_11] = 15; } -void func_i3_801A2C98(Boss* bossSO) { +void Solar_801A2C98(Boss* bossSO) { s32 i; if (bossSO->swork[SO_SWK_11] != 0) { @@ -1479,20 +1478,18 @@ void func_i3_801A2C98(Boss* bossSO) { Math_SmoothStepToF(&bossSO->obj.pos.y, -1000.0f, 0.1f, 10.0f, 0.1f); Math_SmoothStepToAngle(&bossSO->obj.rot.y, 181.0f, 1.0f, 3.0f, 1.0f); if (bossSO->unk_04C == 50) { - func_i3_801A0CEC(&gActors[10], bossSO->obj.pos.x, bossSO->obj.pos.z + 1000.0f, 20.0f, 1); + Solar_801A0CEC(&gActors[10], bossSO->obj.pos.x, bossSO->obj.pos.z + 1000.0f, 20.0f, 1); D_80137E84[gMainController] = 1; D_Timer_80177BD0[gMainController] = 70; } if (bossSO->unk_04C == 60) { for (i = 0; i < 4; i++) { - func_i3_8019F038(bossSO->obj.pos.x + 100.0f, 100.0f, bossSO->obj.pos.z + 1100.0f, - D_i3_801BF8F0[i].x + RAND_FLOAT_CENTERED(2.0f), - D_i3_801BF8F0[i].y + 10.0f + RAND_FLOAT_CENTERED(2.0f), - RAND_FLOAT(-10.0f) - 10.0f); - func_i3_8019F038(bossSO->obj.pos.x - 100.0f, 100.0f, bossSO->obj.pos.z + 1100.0f, - D_i3_801BF8F0[i].x + RAND_FLOAT_CENTERED(2.0f), - D_i3_801BF8F0[i].y + 10.0f + RAND_FLOAT_CENTERED(2.0f), - RAND_FLOAT(-10.0f) - 10.0f); + Solar_8019F038(bossSO->obj.pos.x + 100.0f, 100.0f, bossSO->obj.pos.z + 1100.0f, + D_i3_801BF8F0[i].x + RAND_FLOAT_CENTERED(2.0f), + D_i3_801BF8F0[i].y + 10.0f + RAND_FLOAT_CENTERED(2.0f), RAND_FLOAT(-10.0f) - 10.0f); + Solar_8019F038(bossSO->obj.pos.x - 100.0f, 100.0f, bossSO->obj.pos.z + 1100.0f, + D_i3_801BF8F0[i].x + RAND_FLOAT_CENTERED(2.0f), + D_i3_801BF8F0[i].y + 10.0f + RAND_FLOAT_CENTERED(2.0f), RAND_FLOAT(-10.0f) - 10.0f); } } if (bossSO->unk_04C == 20) { @@ -1513,7 +1510,7 @@ void func_i3_801A2C98(Boss* bossSO) { } else { Math_SmoothStepToAngle(&bossSO->obj.rot.y, 0.0f, 1.0f, 1.5f, 1.0f); if (bossSO->swork[SO_SWK_11] == 80) { - func_i3_801A0CEC(&gActors[9], bossSO->obj.pos.x, bossSO->obj.pos.z + 1000.0f, 20.0f, 1); + Solar_801A0CEC(&gActors[9], bossSO->obj.pos.x, bossSO->obj.pos.z + 1000.0f, 20.0f, 1); } if (bossSO->swork[SO_SWK_11] == 0) { bossSO->swork[SO_SWK_11] = 220; @@ -1527,7 +1524,7 @@ void func_i3_801A2C98(Boss* bossSO) { Math_SmoothStepToF(&bossSO->obj.pos.y, 180.0f, 0.1f, 10.0f, 0.1f); } if (bossSO->swork[SO_SWK_11] == 150) { - func_i3_801A3468(bossSO); + Solar_801A3468(bossSO); } if (bossSO->swork[SO_SWK_11] == 50) { gActors[9].unk_0D0 = 3; @@ -1536,7 +1533,7 @@ void func_i3_801A2C98(Boss* bossSO) { } } -void func_i3_801A30CC(Boss* bossSO) { +void Solar_801A30CC(Boss* bossSO) { bossSO->swork[SO_SWK_0] = 3; bossSO->swork[SO_SWK_1] = 0; bossSO->fwork[SO_FWK_0] = 0.1f; @@ -1545,7 +1542,7 @@ void func_i3_801A30CC(Boss* bossSO) { bossSO->swork[SO_SWK_11] = 15; } -void func_i3_801A3128(Boss* bossSO) { +void Solar_801A3128(Boss* bossSO) { if (bossSO->swork[SO_SWK_11] != 0) { bossSO->swork[SO_SWK_11]--; } @@ -1554,7 +1551,7 @@ void func_i3_801A3128(Boss* bossSO) { bossSO->unk_04C -= 2; Math_SmoothStepToF(&bossSO->obj.pos.y, -1000.0f, 0.1f, 10.0f, 0.1f); if (bossSO->unk_04C == 50) { - func_i3_801A0CEC(&gActors[10], bossSO->obj.pos.x, bossSO->obj.pos.z + 2000.0f, 10.0f, 1); + Solar_801A0CEC(&gActors[10], bossSO->obj.pos.x, bossSO->obj.pos.z + 2000.0f, 10.0f, 1); } if (bossSO->unk_04C == 40) { gActors[10].unk_0D0 = 3; @@ -1572,7 +1569,7 @@ void func_i3_801A3128(Boss* bossSO) { } } else { if (bossSO->swork[SO_SWK_11] == 80) { - func_i3_801A0CEC(&gActors[9], bossSO->obj.pos.x, bossSO->obj.pos.z + 850.0f, 20.0f, 1); + Solar_801A0CEC(&gActors[9], bossSO->obj.pos.x, bossSO->obj.pos.z + 850.0f, 20.0f, 1); D_80137E84[gMainController] = 1; D_Timer_80177BD0[gMainController] = 70; D_i3_801C2740[2]++; @@ -1599,7 +1596,7 @@ void func_i3_801A3128(Boss* bossSO) { Math_SmoothStepToF(&bossSO->obj.pos.y, 180.0f, 0.1f, 20.0f, 0.1f); } if (bossSO->swork[SO_SWK_11] == 150) { - func_i3_801A239C(bossSO); + Solar_801A239C(bossSO); bossSO->fwork[SO_FWK_0] = 0.01f; if ((Rand_ZeroOne() >= 0.4f) && (gTeamShields[3] > 0) && (bossSO->swork[SO_SWK_2] != 0) && (bossSO->swork[SO_SWK_3] != 0)) { @@ -1613,7 +1610,7 @@ void func_i3_801A3128(Boss* bossSO) { } } -void func_i3_801A3468(Boss* bossSO) { +void Solar_801A3468(Boss* bossSO) { bossSO->swork[SO_SWK_0] = 4; bossSO->unk_048 = 0; if ((bossSO->swork[SO_SWK_2] != 0) || (bossSO->swork[SO_SWK_3] != 0)) { @@ -1635,7 +1632,7 @@ void func_i3_801A3468(Boss* bossSO) { bossSO->fwork[SO_FWK_0] = 0.01f; } -void func_i3_801A3510(Boss* bossSO) { +void Solar_801A3510(Boss* bossSO) { s32 i; switch (bossSO->swork[SO_SWK_1]) { @@ -1649,15 +1646,14 @@ void func_i3_801A3510(Boss* bossSO) { } } if (bossSO->unk_04C == 29) { - func_8005F0E8(bossSO->sfxSource, &bossSO->obj.pos); + func_edisplay_8005F0E8(bossSO->sfxSource, &bossSO->obj.pos); AUDIO_PLAY_SFX(0x19035053, bossSO->sfxSource, 4); } if (bossSO->unk_04C == 80) { AUDIO_PLAY_SFX(0x29432077, bossSO->sfxSource, 4); } if (bossSO->unk_04C == 94) { - func_i3_801A0DF8(bossSO->fwork[SO_FWK_13], bossSO->fwork[SO_FWK_15], RAND_FLOAT_CENTERED(60.0f), 4, - 2.0f); + Solar_801A0DF8(bossSO->fwork[SO_FWK_13], bossSO->fwork[SO_FWK_15], RAND_FLOAT_CENTERED(60.0f), 4, 2.0f); bossSO->timer_050 = 90; } break; @@ -1668,14 +1664,14 @@ void func_i3_801A3510(Boss* bossSO) { } Math_SmoothStepToAngle(&bossSO->obj.rot.x, 20.0f, 0.1f, 10.0f, 0.1f); if (bossSO->unk_04C == 10) { - func_8005F0E8(bossSO->sfxSource, &bossSO->obj.pos); + func_edisplay_8005F0E8(bossSO->sfxSource, &bossSO->obj.pos); AUDIO_PLAY_SFX(0x19035053, bossSO->sfxSource, 4); } if (bossSO->unk_04C == 50) { AUDIO_PLAY_SFX(0x29432077, bossSO->sfxSource, 4); } if (bossSO->unk_04C == 60) { - func_i3_801A0D90(bossSO->obj.pos.x, bossSO->obj.pos.z + 1600.0f, 80.0f, 2); + Solar_801A0D90(bossSO->obj.pos.x, bossSO->obj.pos.z + 1600.0f, 80.0f, 2); D_80137E84[gMainController] = 1; D_Timer_80177BD0[gMainController] = 100; } @@ -1684,9 +1680,9 @@ void func_i3_801A3510(Boss* bossSO) { Math_SmoothStepToAngle(&bossSO->obj.rot.x, 0.0f, 0.1f, 10.0f, 0.1f); if (bossSO->unk_04C == 65) { for (i = 0; i < 4; i++) { - func_i3_8019F194(bossSO->obj.pos.x, bossSO->obj.pos.y + 300.0f, bossSO->obj.pos.z + 1000.0f, - D_i3_801BF8F0[i].x + RAND_FLOAT_CENTERED(0.25f), - D_i3_801BF8F0[i].y + RAND_FLOAT_CENTERED(0.25f), RAND_FLOAT(10.0f) + 100.0f); + Solar_8019F194(bossSO->obj.pos.x, bossSO->obj.pos.y + 300.0f, bossSO->obj.pos.z + 1000.0f, + D_i3_801BF8F0[i].x + RAND_FLOAT_CENTERED(0.25f), + D_i3_801BF8F0[i].y + RAND_FLOAT_CENTERED(0.25f), RAND_FLOAT(10.0f) + 100.0f); } } if ((bossSO->unk_048 != 0) && (bossSO->unk_04C == 68)) { @@ -1695,7 +1691,7 @@ void func_i3_801A3510(Boss* bossSO) { bossSO->unk_04C = 20; } if (bossSO->unk_04C == 99) { - func_i3_801A30CC(bossSO); + Solar_801A30CC(bossSO); } break; case 8: @@ -1707,10 +1703,10 @@ void func_i3_801A3510(Boss* bossSO) { bossSO->unk_04C = 65; } if ((bossSO->unk_04C == 65) && !(gGameFrameCount & 1)) { - func_i3_8019FFC0(bossSO, bossSO->fwork[SO_FWK_4], bossSO->fwork[SO_FWK_5] - 100.0f, - bossSO->fwork[SO_FWK_6] + 600.0f, (bossSO->timer_050 * 0.2f) + 4.0f, 0); - func_i3_801A1EB0(bossSO, bossSO->fwork[SO_FWK_4], 25.0f, bossSO->fwork[SO_FWK_5] - 100.0f, - bossSO->fwork[SO_FWK_6] + 300.0f); + Solar_8019FFC0(bossSO, bossSO->fwork[SO_FWK_4], bossSO->fwork[SO_FWK_5] - 100.0f, + bossSO->fwork[SO_FWK_6] + 600.0f, (bossSO->timer_050 * 0.2f) + 4.0f, 0); + Solar_801A1EB0(bossSO, bossSO->fwork[SO_FWK_4], 25.0f, bossSO->fwork[SO_FWK_5] - 100.0f, + bossSO->fwork[SO_FWK_6] + 300.0f); } if (bossSO->unk_04C == 75) { Audio_KillSfxBySourceAndId(bossSO->sfxSource, 0x31033078); @@ -1730,18 +1726,18 @@ void func_i3_801A3510(Boss* bossSO) { bossSO->unk_04C = 66; } if ((bossSO->unk_04C == 66) && !(gGameFrameCount & 1)) { - func_i3_8019FFC0(bossSO, bossSO->fwork[SO_FWK_4] + 125.0f, bossSO->fwork[SO_FWK_5] - 100.0f, - bossSO->fwork[SO_FWK_6] + 600.0f, (bossSO->timer_050 * 0.2f) + 4.0f, 1); - func_i3_8019FFC0(bossSO, bossSO->fwork[SO_FWK_4] - 125.0f, bossSO->fwork[SO_FWK_5] - 100.0f, - bossSO->fwork[SO_FWK_6] + 600.0f, (bossSO->timer_050 * 0.2f) + 4.0f, 2); - func_i3_801A1EB0(bossSO, bossSO->fwork[SO_FWK_4], 25.0f, bossSO->fwork[SO_FWK_5] - 100.0f, - bossSO->fwork[SO_FWK_6] + 300.0f); + Solar_8019FFC0(bossSO, bossSO->fwork[SO_FWK_4] + 125.0f, bossSO->fwork[SO_FWK_5] - 100.0f, + bossSO->fwork[SO_FWK_6] + 600.0f, (bossSO->timer_050 * 0.2f) + 4.0f, 1); + Solar_8019FFC0(bossSO, bossSO->fwork[SO_FWK_4] - 125.0f, bossSO->fwork[SO_FWK_5] - 100.0f, + bossSO->fwork[SO_FWK_6] + 600.0f, (bossSO->timer_050 * 0.2f) + 4.0f, 2); + Solar_801A1EB0(bossSO, bossSO->fwork[SO_FWK_4], 25.0f, bossSO->fwork[SO_FWK_5] - 100.0f, + bossSO->fwork[SO_FWK_6] + 300.0f); } if (bossSO->unk_04C == 76) { Audio_KillSfxBySourceAndId(bossSO->sfxSource, 0x31033078); } if (bossSO->unk_04C >= 99) { - func_i3_801A30CC(bossSO); + Solar_801A30CC(bossSO); } break; } @@ -1752,7 +1748,7 @@ void func_i3_801A3510(Boss* bossSO) { } } -void func_i3_801A3C4C(Boss* bossSO) { +void Solar_801A3C4C(Boss* bossSO) { s32 i; if ((bossSO->swork[SO_SWK_2] == 0) && (bossSO->swork[SO_SWK_3] == 0) && @@ -1780,7 +1776,7 @@ void func_i3_801A3C4C(Boss* bossSO) { bossSO->info.hitbox[7 + i] = bossSO->info.hitbox[13 + i] = bossSO->info.hitbox[19 + i] = 0.0f; } bossSO->swork[SO_SWK_2] = -1; - func_i3_801A48B8(bossSO); + Solar_801A48B8(bossSO); } else { bossSO->swork[SO_SWK_8] = 20; } @@ -1796,7 +1792,7 @@ void func_i3_801A3C4C(Boss* bossSO) { bossSO->info.hitbox[25 + i] = bossSO->info.hitbox[31 + i] = bossSO->info.hitbox[37 + i] = 0.0f; } bossSO->swork[SO_SWK_3] = -1; - func_i3_801A48B8(bossSO); + Solar_801A48B8(bossSO); } else { bossSO->swork[SO_SWK_9] = 20; } @@ -1806,12 +1802,12 @@ void func_i3_801A3C4C(Boss* bossSO) { bossSO->state = 0; bossSO->swork[SO_SWK_1] = 1; bossSO->fwork[SO_FWK_0] = 0.01f; - bossSO->info.hitbox = SEGMENTED_TO_VIRTUAL(D_800CBF34); + bossSO->info.hitbox = SEGMENTED_TO_VIRTUAL(D_edata_800CBF34); bossSO->timer_058 = 20000; - D_8017796C = -1; - D_80178348 = D_80178350 = D_80178354 = D_80178340 = 255; - D_80178358 = 0; - D_8017835C = 255; + D_ctx_8017796C = -1; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = D_ctx_80178340 = 255; + D_ctx_80178358 = 0; + D_ctx_8017835C = 255; gCsFrameCount = 0; D_80137E84[gMainController] = 1; D_Timer_80177BD0[gMainController] = 10; @@ -1838,7 +1834,7 @@ void func_i3_801A3C4C(Boss* bossSO) { } } -void func_i3_801A4214(Boss* bossSO) { +void Solar_801A4214(Boss* bossSO) { s32 i; Vec3f sp50; Vec3f sp44; @@ -1859,7 +1855,7 @@ void func_i3_801A4214(Boss* bossSO) { sp50.z = 1100.0f; Matrix_MultVec3f(gCalcMatrix, &sp50, &sp44); if (bossSO->state >= 2) { - Math_SmoothStepToF(&D_801779A8[gMainController], 30.0f, 1.0f, 2.5f, 0.0f); + Math_SmoothStepToF(&D_ctx_801779A8[gMainController], 30.0f, 1.0f, 2.5f, 0.0f); } switch (bossSO->state) { case 0: @@ -1880,18 +1876,18 @@ void func_i3_801A4214(Boss* bossSO) { bossSO->state++; gShowBossHealth = false; AUDIO_PLAY_SFX(0x39439076, bossSO->sfxSource, 4); - func_i3_801A1E14(bossSO->fwork[SO_FWK_4], bossSO->fwork[SO_FWK_5] + 300.0f, bossSO->fwork[SO_FWK_6], - bossSO->fwork[SO_FWK_1], bossSO->fwork[SO_FWK_2], 73.0f, RAND_FLOAT_CENTERED(50.0f), - 80.0f, 40.0f, 8); + Solar_801A1E14(bossSO->fwork[SO_FWK_4], bossSO->fwork[SO_FWK_5] + 300.0f, bossSO->fwork[SO_FWK_6], + bossSO->fwork[SO_FWK_1], bossSO->fwork[SO_FWK_2], 73.0f, RAND_FLOAT_CENTERED(50.0f), + 80.0f, 40.0f, 8); D_i3_801C2768[3] = 6.0f; D_i3_801C2768[2] = 100.0f; - D_80178340 = 255; - D_80178348 = 255; - D_80178350 = 255; - D_80178354 = 255; - D_80178358 = 0; - D_8017835C = 4; - func_80042EC0(bossSO); + D_ctx_80178340 = 255; + D_ctx_80178348 = 255; + D_ctx_80178350 = 255; + D_ctx_80178354 = 255; + D_ctx_80178358 = 0; + D_ctx_8017835C = 4; + func_boss_80042EC0(bossSO); bossSO->swork[SO_SWK_4]++; Math_SmoothStepToF(&bossSO->obj.pos.y, 180.0f, 0.1f, 10.0f, 0.1f); } @@ -1943,7 +1939,7 @@ void func_i3_801A4214(Boss* bossSO) { } if (gCsFrameCount == 230) { AUDIO_PLAY_SFX(0x2940F026, gActors[5].sfxSource, 4); - D_801779A8[gMainController] = 120.0f; + D_ctx_801779A8[gMainController] = 120.0f; } if (gCsFrameCount == 250) { bossSO->state++; @@ -1966,7 +1962,7 @@ void func_i3_801A4214(Boss* bossSO) { } } -void func_i3_801A48B8(Boss* bossSO) { +void Solar_801A48B8(Boss* bossSO) { s32 i; AUDIO_PLAY_SFX(0x29434075, bossSO->sfxSource, 4); @@ -1985,9 +1981,9 @@ void func_i3_801A48B8(Boss* bossSO) { } } } - D_80178348 = D_80178350 = D_80178354 = D_80178340 = 255; - D_80178358 = 0; - D_8017835C = 64; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = D_ctx_80178340 = 255; + D_ctx_80178358 = 0; + D_ctx_8017835C = 64; bossSO->swork[SO_SWK_0] = 6; bossSO->swork[SO_SWK_1] = 6; bossSO->unk_04C = 0; @@ -1997,30 +1993,30 @@ void func_i3_801A48B8(Boss* bossSO) { } } -void func_i3_801A4A34(Boss* bossSO) { +void Solar_801A4A34(Boss* bossSO) { if (bossSO->swork[SO_SWK_2] < 0) { bossSO->swork[SO_SWK_2] = 0; - func_i3_801A1E14(bossSO->fwork[SO_FWK_28], bossSO->fwork[SO_FWK_29], bossSO->fwork[SO_FWK_30], - bossSO->fwork[SO_FWK_41], bossSO->fwork[SO_FWK_42], bossSO->fwork[SO_FWK_43], - RAND_FLOAT(-25.0f) - 10.0f, RAND_FLOAT(25.0f) + 30.0f, RAND_FLOAT_CENTERED(25.0f) - 50.0f, 0); - func_i3_801A1E14(bossSO->fwork[SO_FWK_22], bossSO->fwork[SO_FWK_23], bossSO->fwork[SO_FWK_24], - bossSO->fwork[SO_FWK_47], bossSO->fwork[SO_FWK_48], bossSO->fwork[SO_FWK_49], - RAND_FLOAT(-25.0f) - 10.0f, RAND_FLOAT(25.0f) + 30.0f, RAND_FLOAT_CENTERED(25.0f) - 50.0f, 1); - func_i3_801A1E14(bossSO->fwork[SO_FWK_10], bossSO->fwork[SO_FWK_11], bossSO->fwork[SO_FWK_12], - bossSO->fwork[SO_FWK_35], bossSO->fwork[SO_FWK_36], bossSO->fwork[SO_FWK_37], - RAND_FLOAT(-25.0f) - 10.0f, RAND_FLOAT(25.0f) + 30.0f, RAND_FLOAT_CENTERED(25.0f) - 50.0f, 2); + Solar_801A1E14(bossSO->fwork[SO_FWK_28], bossSO->fwork[SO_FWK_29], bossSO->fwork[SO_FWK_30], + bossSO->fwork[SO_FWK_41], bossSO->fwork[SO_FWK_42], bossSO->fwork[SO_FWK_43], + RAND_FLOAT(-25.0f) - 10.0f, RAND_FLOAT(25.0f) + 30.0f, RAND_FLOAT_CENTERED(25.0f) - 50.0f, 0); + Solar_801A1E14(bossSO->fwork[SO_FWK_22], bossSO->fwork[SO_FWK_23], bossSO->fwork[SO_FWK_24], + bossSO->fwork[SO_FWK_47], bossSO->fwork[SO_FWK_48], bossSO->fwork[SO_FWK_49], + RAND_FLOAT(-25.0f) - 10.0f, RAND_FLOAT(25.0f) + 30.0f, RAND_FLOAT_CENTERED(25.0f) - 50.0f, 1); + Solar_801A1E14(bossSO->fwork[SO_FWK_10], bossSO->fwork[SO_FWK_11], bossSO->fwork[SO_FWK_12], + bossSO->fwork[SO_FWK_35], bossSO->fwork[SO_FWK_36], bossSO->fwork[SO_FWK_37], + RAND_FLOAT(-25.0f) - 10.0f, RAND_FLOAT(25.0f) + 30.0f, RAND_FLOAT_CENTERED(25.0f) - 50.0f, 2); } if (bossSO->swork[SO_SWK_3] < 0) { bossSO->swork[SO_SWK_3] = 0; - func_i3_801A1E14(bossSO->fwork[SO_FWK_25], bossSO->fwork[SO_FWK_26], bossSO->fwork[SO_FWK_27], - bossSO->fwork[SO_FWK_38], bossSO->fwork[SO_FWK_39], bossSO->fwork[SO_FWK_40], - RAND_FLOAT(25.0f) + 10.0f, RAND_FLOAT(25.0f) + 30.0f, RAND_FLOAT_CENTERED(25.0f) - 50.0f, 5); - func_i3_801A1E14(bossSO->fwork[SO_FWK_19], bossSO->fwork[SO_FWK_20], bossSO->fwork[SO_FWK_21], - bossSO->fwork[SO_FWK_44], bossSO->fwork[SO_FWK_45], bossSO->fwork[SO_FWK_46], - RAND_FLOAT(25.0f) + 10.0f, RAND_FLOAT(25.0f) + 30.0f, RAND_FLOAT_CENTERED(25.0f) - 50.0f, 4); - func_i3_801A1E14(bossSO->fwork[SO_FWK_7], bossSO->fwork[SO_FWK_8], bossSO->fwork[SO_FWK_9], - bossSO->fwork[SO_FWK_32], bossSO->fwork[SO_FWK_33], bossSO->fwork[SO_FWK_34], - RAND_FLOAT(25.0f) + 10.0f, RAND_FLOAT(25.0f) + 30.0f, RAND_FLOAT_CENTERED(25.0f) - 50.0f, 3); + Solar_801A1E14(bossSO->fwork[SO_FWK_25], bossSO->fwork[SO_FWK_26], bossSO->fwork[SO_FWK_27], + bossSO->fwork[SO_FWK_38], bossSO->fwork[SO_FWK_39], bossSO->fwork[SO_FWK_40], + RAND_FLOAT(25.0f) + 10.0f, RAND_FLOAT(25.0f) + 30.0f, RAND_FLOAT_CENTERED(25.0f) - 50.0f, 5); + Solar_801A1E14(bossSO->fwork[SO_FWK_19], bossSO->fwork[SO_FWK_20], bossSO->fwork[SO_FWK_21], + bossSO->fwork[SO_FWK_44], bossSO->fwork[SO_FWK_45], bossSO->fwork[SO_FWK_46], + RAND_FLOAT(25.0f) + 10.0f, RAND_FLOAT(25.0f) + 30.0f, RAND_FLOAT_CENTERED(25.0f) - 50.0f, 4); + Solar_801A1E14(bossSO->fwork[SO_FWK_7], bossSO->fwork[SO_FWK_8], bossSO->fwork[SO_FWK_9], + bossSO->fwork[SO_FWK_32], bossSO->fwork[SO_FWK_33], bossSO->fwork[SO_FWK_34], + RAND_FLOAT(25.0f) + 10.0f, RAND_FLOAT(25.0f) + 30.0f, RAND_FLOAT_CENTERED(25.0f) - 50.0f, 3); } switch (bossSO->unk_04C) { case 30: @@ -2043,7 +2039,7 @@ void func_i3_801A4A34(Boss* bossSO) { } } -void func_i3_801A4EC0(Boss* bossSO) { +void Solar_801A4EC0(Boss* bossSO) { bossSO->swork[SO_SWK_0] = 7; bossSO->swork[SO_SWK_1] = 5; bossSO->fwork[SO_FWK_0] = 0.01f; @@ -2052,7 +2048,7 @@ void func_i3_801A4EC0(Boss* bossSO) { bossSO->fwork[SO_FWK_31] = bossSO->obj.rot.y = 0.0f; } -void func_i3_801A4EF8(Boss* bossSO) { +void Solar_801A4EF8(Boss* bossSO) { s32 i; if (bossSO->swork[SO_SWK_11] != 0) { @@ -2089,18 +2085,16 @@ void func_i3_801A4EF8(Boss* bossSO) { Math_SmoothStepToF(&bossSO->obj.pos.y, -1000.0f, 0.1f, 20.0f, 0.1f); } if (bossSO->swork[SO_SWK_11] == 30) { - func_i3_801A0CEC(&gActors[10], bossSO->obj.pos.x, bossSO->obj.pos.z + 1000.0f, 20.0f, 1); + Solar_801A0CEC(&gActors[10], bossSO->obj.pos.x, bossSO->obj.pos.z + 1000.0f, 20.0f, 1); D_80137E84[gMainController] = 1; D_Timer_80177BD0[gMainController] = 70; for (i = 0; i < 4; i++) { - func_i3_8019F038(bossSO->obj.pos.x + 100.0f, 100.0f, bossSO->obj.pos.z + 1100.0f, - D_i3_801BF8F0[i].x + RAND_FLOAT_CENTERED(2.0f), - D_i3_801BF8F0[i].y + 10.0f + RAND_FLOAT_CENTERED(2.0f), - RAND_FLOAT(-10.0f) - 10.0f); - func_i3_8019F038(bossSO->obj.pos.x - 100.0f, 100.0f, bossSO->obj.pos.z + 1100.0f, - D_i3_801BF8F0[i].x + RAND_FLOAT_CENTERED(2.0f), - D_i3_801BF8F0[i].y + 10.0f + RAND_FLOAT_CENTERED(2.0f), - RAND_FLOAT(-10.0f) - 10.0f); + Solar_8019F038(bossSO->obj.pos.x + 100.0f, 100.0f, bossSO->obj.pos.z + 1100.0f, + D_i3_801BF8F0[i].x + RAND_FLOAT_CENTERED(2.0f), + D_i3_801BF8F0[i].y + 10.0f + RAND_FLOAT_CENTERED(2.0f), RAND_FLOAT(-10.0f) - 10.0f); + Solar_8019F038(bossSO->obj.pos.x - 100.0f, 100.0f, bossSO->obj.pos.z + 1100.0f, + D_i3_801BF8F0[i].x + RAND_FLOAT_CENTERED(2.0f), + D_i3_801BF8F0[i].y + 10.0f + RAND_FLOAT_CENTERED(2.0f), RAND_FLOAT(-10.0f) - 10.0f); } } if (bossSO->swork[SO_SWK_11] == 16) { @@ -2124,10 +2118,10 @@ void func_i3_801A4EF8(Boss* bossSO) { if (bossSO->swork[SO_SWK_11] == 300) { D_80137E84[gMainController] = 1; D_Timer_80177BD0[gMainController] = 170; - D_80178480 = 130; + D_ctx_80178480 = 130; } if (bossSO->swork[SO_SWK_11] == 200) { - func_i3_801A0CEC(&gActors[9], bossSO->obj.pos.x, bossSO->obj.pos.z + 1000.0f, 20.0f, 1); + Solar_801A0CEC(&gActors[9], bossSO->obj.pos.x, bossSO->obj.pos.z + 1000.0f, 20.0f, 1); } if (bossSO->swork[SO_SWK_11] < 200) { bossSO->unk_04C = 98; @@ -2145,10 +2139,10 @@ void func_i3_801A4EF8(Boss* bossSO) { bossSO->obj.rot.x += 1.0f; } if (bossSO->swork[SO_SWK_11] == 50) { - func_i3_801A0CEC(&gActors[10], bossSO->obj.pos.x, bossSO->obj.pos.z + 1000.0f, 80.0f, 2); + Solar_801A0CEC(&gActors[10], bossSO->obj.pos.x, bossSO->obj.pos.z + 1000.0f, 80.0f, 2); D_80137E84[gMainController] = 1; D_Timer_80177BD0[gMainController] = 100; - D_80178480 = 10; + D_ctx_80178480 = 10; } if (bossSO->obj.pos.y < -1500.0f) { bossSO->state++; @@ -2166,7 +2160,7 @@ void func_i3_801A4EF8(Boss* bossSO) { case 3: Math_SmoothStepToAngle(&bossSO->obj.rot.y, 0.0f, 1.0f, 1.5f, 1.0f); if (bossSO->swork[SO_SWK_11] == 65) { - func_i3_801A0CEC(&gActors[9], bossSO->obj.pos.x, bossSO->obj.pos.z + 1000.0f, 20.0f, 1); + Solar_801A0CEC(&gActors[9], bossSO->obj.pos.x, bossSO->obj.pos.z + 1000.0f, 20.0f, 1); } if (bossSO->swork[SO_SWK_11] == 0) { bossSO->swork[SO_SWK_11] = 220; @@ -2179,7 +2173,7 @@ void func_i3_801A4EF8(Boss* bossSO) { Math_SmoothStepToF(&bossSO->obj.pos.y, 180.0f, 0.1f, 10.0f, 0.1f); } if (bossSO->swork[SO_SWK_11] == 150) { - func_i3_801A3468(bossSO); + Solar_801A3468(bossSO); bossSO->fwork[SO_FWK_0] = 0.01f; } if (bossSO->swork[SO_SWK_11] == 50) { @@ -2189,7 +2183,7 @@ void func_i3_801A4EF8(Boss* bossSO) { } } -void func_i3_801A56B8(Boss* bossSO) { +void Solar_801A56B8(Boss* bossSO) { switch (bossSO->swork[SO_SWK_1]) { case 2: if (((bossSO->unk_04C == 89) && (bossSO->state == 2)) || (bossSO->swork[SO_SWK_2] == 0)) { @@ -2242,12 +2236,12 @@ void func_i3_801A56B8(Boss* bossSO) { bossSO->unk_04C = 65; } if ((bossSO->unk_04C == 65) && !(gGameFrameCount & 3)) { - func_i3_8019FFC0(bossSO, bossSO->fwork[SO_FWK_4] + 125.0f, bossSO->fwork[SO_FWK_5] - 100.0f, - bossSO->fwork[SO_FWK_6] + 600.0f, ((f32) bossSO->timer_050 * 0.2f) + 4.0f, 1); - func_i3_8019FFC0(bossSO, bossSO->fwork[SO_FWK_4] - 125.0f, bossSO->fwork[SO_FWK_5] - 100.0f, - bossSO->fwork[SO_FWK_6] + 600.0f, ((f32) bossSO->timer_050 * 0.2f) + 4.0f, 2); - func_i3_801A1EB0(bossSO, bossSO->fwork[SO_FWK_4], 25.0f, bossSO->fwork[SO_FWK_5] - 100.0f, - bossSO->fwork[SO_FWK_6] + 300.0f); + Solar_8019FFC0(bossSO, bossSO->fwork[SO_FWK_4] + 125.0f, bossSO->fwork[SO_FWK_5] - 100.0f, + bossSO->fwork[SO_FWK_6] + 600.0f, ((f32) bossSO->timer_050 * 0.2f) + 4.0f, 1); + Solar_8019FFC0(bossSO, bossSO->fwork[SO_FWK_4] - 125.0f, bossSO->fwork[SO_FWK_5] - 100.0f, + bossSO->fwork[SO_FWK_6] + 600.0f, ((f32) bossSO->timer_050 * 0.2f) + 4.0f, 2); + Solar_801A1EB0(bossSO, bossSO->fwork[SO_FWK_4], 25.0f, bossSO->fwork[SO_FWK_5] - 100.0f, + bossSO->fwork[SO_FWK_6] + 300.0f); } break; case 7: @@ -2277,11 +2271,11 @@ void func_i3_801A56B8(Boss* bossSO) { } BossSOfunc D_i3_801BF980[9] = { - func_i3_801A1F80, func_i3_801A23F4, func_i3_801A2C98, func_i3_801A3128, func_i3_801A3510, - func_i3_801A4214, func_i3_801A4A34, func_i3_801A4EF8, func_i3_801A56B8, + Solar_801A1F80, Solar_801A23F4, Solar_801A2C98, Solar_801A3128, Solar_801A3510, + Solar_801A4214, Solar_801A4A34, Solar_801A4EF8, Solar_801A56B8, }; -void func_i3_801A5B3C(Boss* bossSO) { +void Solar_801A5B3C(Boss* bossSO) { f32 sp1CC; f32 sp1C8; f32 sp1C4; @@ -2315,7 +2309,7 @@ void func_i3_801A5B3C(Boss* bossSO) { if (bossSO->health != 0) { Math_SmoothStepToF(&bossSO->obj.pos.z, gPlayer[0].unk_138 - bossSO->fwork[SO_FWK_3], 1.0f, 60.0f, 1.0f); } else { - Math_SmoothStepToF(&bossSO->obj.pos.z, -(D_80177D20 + 2600.0f), 1.0f, 40.0f, 1.0f); + Math_SmoothStepToF(&bossSO->obj.pos.z, -(D_ctx_80177D20 + 2600.0f), 1.0f, 40.0f, 1.0f); } if (bossSO->swork[SO_SWK_2] != 0) { bossSO->info.hitbox[7] = bossSO->fwork[SO_FWK_12] - bossSO->obj.pos.z; @@ -2345,28 +2339,27 @@ void func_i3_801A5B3C(Boss* bossSO) { bossSO->info.hitbox[41] = bossSO->fwork[SO_FWK_25] - bossSO->obj.pos.x; } if (!(gGameFrameCount & 7) && (bossSO->fwork[SO_FWK_3] < 4800.0f)) { - if (func_800A73E4(&sp1C0, &sp1B8, bossSO->obj.pos.x, bossSO->obj.pos.y - 160.0f, bossSO->obj.pos.z)) { - func_i3_801A1EB0(bossSO, bossSO->obj.pos.x, 50.0f, sp1C0 - 170.0f, bossSO->obj.pos.z + 100.0f); + if (func_play_800A73E4(&sp1C0, &sp1B8, bossSO->obj.pos.x, bossSO->obj.pos.y - 160.0f, bossSO->obj.pos.z)) { + Solar_801A1EB0(bossSO, bossSO->obj.pos.x, 50.0f, sp1C0 - 170.0f, bossSO->obj.pos.z + 100.0f); } - if ((bossSO->swork[SO_SWK_2] != 0) && func_800A73E4(&sp1C0, &sp1B8, bossSO->fwork[SO_FWK_16], - bossSO->fwork[SO_FWK_17], bossSO->fwork[SO_FWK_18])) { - func_i3_801A1EB0(bossSO, bossSO->fwork[SO_FWK_16], 50.0f, sp1C0 - 150.f, bossSO->fwork[SO_FWK_18] + 150.0f); + if ((bossSO->swork[SO_SWK_2] != 0) && func_play_800A73E4(&sp1C0, &sp1B8, bossSO->fwork[SO_FWK_16], + bossSO->fwork[SO_FWK_17], bossSO->fwork[SO_FWK_18])) { + Solar_801A1EB0(bossSO, bossSO->fwork[SO_FWK_16], 50.0f, sp1C0 - 150.f, bossSO->fwork[SO_FWK_18] + 150.0f); } - if ((bossSO->swork[SO_SWK_3] != 0) && func_800A73E4(&sp1C0, &sp1B8, bossSO->fwork[SO_FWK_13], - bossSO->fwork[SO_FWK_14], bossSO->fwork[SO_FWK_15])) { - func_i3_801A1EB0(bossSO, bossSO->fwork[SO_FWK_13], 50.0f, sp1C0 - 150.0f, - bossSO->fwork[SO_FWK_15] + 150.0f); + if ((bossSO->swork[SO_SWK_3] != 0) && func_play_800A73E4(&sp1C0, &sp1B8, bossSO->fwork[SO_FWK_13], + bossSO->fwork[SO_FWK_14], bossSO->fwork[SO_FWK_15])) { + Solar_801A1EB0(bossSO, bossSO->fwork[SO_FWK_13], 50.0f, sp1C0 - 150.0f, bossSO->fwork[SO_FWK_15] + 150.0f); } } if ((!(gGameFrameCount & 3) || (bossSO->fwork[SO_FWK_31] != 0.0f)) && ((bossSO->swork[SO_SWK_0] != 7) || !(gGameFrameCount & 1))) { if ((bossSO->swork[SO_SWK_2] == 0) && ((bossSO->health > 0) || (bossSO->state < 2))) { - func_i3_8019FF44(bossSO, bossSO->fwork[SO_FWK_10], bossSO->fwork[SO_FWK_11], bossSO->fwork[SO_FWK_12], - bossSO->fwork[SO_FWK_31] - 20.0f, -1.0f); + Solar_8019FF44(bossSO, bossSO->fwork[SO_FWK_10], bossSO->fwork[SO_FWK_11], bossSO->fwork[SO_FWK_12], + bossSO->fwork[SO_FWK_31] - 20.0f, -1.0f); } if ((bossSO->swork[SO_SWK_3] == 0) && ((bossSO->health > 0) || (bossSO->state < 2))) { - func_i3_8019FF44(bossSO, bossSO->fwork[SO_FWK_7], bossSO->fwork[SO_FWK_8], bossSO->fwork[SO_FWK_9], - bossSO->fwork[SO_FWK_31] - 20.0f, 1.0f); + Solar_8019FF44(bossSO, bossSO->fwork[SO_FWK_7], bossSO->fwork[SO_FWK_8], bossSO->fwork[SO_FWK_9], + bossSO->fwork[SO_FWK_31] - 20.0f, 1.0f); } } Math_SmoothStepToF(&bossSO->fwork[0], 1.0f, 0.01f, 0.01f, 0.0f); @@ -2374,7 +2367,7 @@ void func_i3_801A5B3C(Boss* bossSO) { D_i3_801BF980[bossSO->swork[SO_SWK_0]](bossSO); } if (bossSO->timer_058 != 0) { - func_i3_801A4214(bossSO); + Solar_801A4214(bossSO); } switch (bossSO->swork[SO_SWK_1]) { case 0: @@ -2486,7 +2479,7 @@ void func_i3_801A5B3C(Boss* bossSO) { AUDIO_PLAY_SFX(0x29121007, bossSO->sfxSource, 4); if (!((bossSO->swork[SO_SWK_0] == 0) || (bossSO->swork[SO_SWK_0] == 2) || (bossSO->swork[SO_SWK_0] == 3) || (bossSO->swork[SO_SWK_0] == 6) || ((bossSO->swork[SO_SWK_0] == 7) && (bossSO->state == 2)))) { - func_i3_801A3C4C(bossSO); + Solar_801A3C4C(bossSO); } } if (gBossFrameCount == 400) { @@ -2497,7 +2490,7 @@ void func_i3_801A5B3C(Boss* bossSO) { } } -s32 func_i3_801A68A8(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { +s32 Solar_801A68A8(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { Boss* this = thisx; Vec3f sp58 = { 0.0f, 0.0f, 0.0f }; Vec3f sp4C = { 10.0f, 0.0f, 0.0f }; @@ -2560,7 +2553,7 @@ s32 func_i3_801A68A8(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* t return false; } -void func_i3_801A6BDC(s32 limbIndex, Vec3f* rot, void* thisx) { +void Solar_801A6BDC(s32 limbIndex, Vec3f* rot, void* thisx) { Boss* this = thisx; Vec3f spA0 = { 90.0f, 0.0f, -10.0f }; Vec3f sp94 = { 135.0f, 0.0f, -40.0f }; @@ -2697,7 +2690,7 @@ void func_i3_801A6BDC(s32 limbIndex, Vec3f* rot, void* thisx) { } } -void func_i3_801A71B8(Boss* bossSO) { +void Solar_801A71B8(Boss* bossSO) { s32 i; Vec3f spE8[9] = { { 150.0f, 300.0f, 100.0f }, { -100.0f, 200.0f, 100.0f }, { 50.0f, 100.0f, 100.0f }, @@ -2713,7 +2706,7 @@ void func_i3_801A71B8(Boss* bossSO) { Matrix_Scale(gCalcMatrix, bossSO->unk_3F8, bossSO->unk_3F8, bossSO->unk_3F8, 1); if (gBossActive != 0) { - Animation_DrawSkeleton(2, D_SO_600E470, bossSO->vwork, func_i3_801A68A8, func_i3_801A6BDC, bossSO, gCalcMatrix); + Animation_DrawSkeleton(2, D_SO_600E470, bossSO->vwork, Solar_801A68A8, Solar_801A6BDC, bossSO, gCalcMatrix); } if (bossSO->health <= 0) { RCP_SetupDL_49(); @@ -2721,7 +2714,8 @@ void func_i3_801A71B8(Boss* bossSO) { gDPSetEnvColor(gMasterDisp++, 255, 192, 0, 255); Matrix_Pop(&gGfxMatrix); Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, bossSO->obj.pos.x, bossSO->obj.pos.y, bossSO->obj.pos.z - 500.0f + D_80177D20, 1); + Matrix_Translate(gGfxMatrix, bossSO->obj.pos.x, bossSO->obj.pos.y, bossSO->obj.pos.z - 500.0f + D_ctx_80177D20, + 1); Matrix_Scale(gGfxMatrix, D_i3_801C2768[3], D_i3_801C2768[2], 1.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_1024AC0); @@ -2729,7 +2723,7 @@ void func_i3_801A71B8(Boss* bossSO) { Matrix_Pop(&gGfxMatrix); Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, bossSO->obj.pos.x + spE8[i].x, bossSO->obj.pos.y + spE8[i].y, - bossSO->obj.pos.z + D_80177D20 + spE8[i].z, 1); + bossSO->obj.pos.z + D_ctx_80177D20 + spE8[i].z, 1); Matrix_RotateY(gGfxMatrix, spC4[i] * M_DTOR, 1); Matrix_RotateX(gGfxMatrix, spA0[i] * M_DTOR, 1); Matrix_Scale(gGfxMatrix, D_i3_801C2768[4 + i], 100.0f, 1.0f, 1); @@ -2741,7 +2735,7 @@ void func_i3_801A71B8(Boss* bossSO) { Matrix_Pop(&gGfxMatrix); Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, bossSO->obj.pos.x, bossSO->obj.pos.y + 230.0f, - bossSO->obj.pos.z - 300.0f + D_80177D20, 1); + bossSO->obj.pos.z - 300.0f + D_ctx_80177D20, 1); Matrix_RotateX(gGfxMatrix, M_DTOR * 5.0f, 1); Matrix_Scale(gGfxMatrix, D_i3_801C2768[13], 1.0f, D_i3_801C2768[13], 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -2752,7 +2746,7 @@ void func_i3_801A71B8(Boss* bossSO) { Matrix_Pop(&gGfxMatrix); Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, bossSO->obj.pos.x, bossSO->obj.pos.y + 270.0f, - (bossSO->obj.pos.z - 300.0f) + D_80177D20, 1); + (bossSO->obj.pos.z - 300.0f) + D_ctx_80177D20, 1); Matrix_RotateX(gGfxMatrix, -3.0f * M_DTOR, 1); Matrix_Scale(gGfxMatrix, D_i3_801C2768[13], 1.0f, D_i3_801C2768[13], 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -2775,7 +2769,7 @@ Vec3f D_i3_801BFB30[3] = { { 500.0f, 0.0f, 250.0f }, }; -void func_i3_801A7750(void) { +void Solar_801A7750(void) { Actor* actor = gActors; s32 i; @@ -2806,7 +2800,7 @@ void func_i3_801A7750(void) { } } -void func_i3_801A7930(Player* player) { +void Solar_801A7930(Player* player) { s32 i; f32 sp78; f32 sp74; @@ -2840,15 +2834,15 @@ void func_i3_801A7930(Player* player) { Object_Kill(&gActors[3].obj, gActors[3].sfxSource); Object_Kill(&gActors[4].obj, gActors[4].sfxSource); player->unk_1D0 = 1; - D_80177A48[0] = 0.1f; + D_ctx_80177A48[0] = 0.1f; if (Rand_ZeroOne() > 0.5f) { - D_80177A48[9] = -1.0f; + D_ctx_80177A48[9] = -1.0f; } else { - D_80177A48[9] = 1.0f; + D_ctx_80177A48[9] = 1.0f; } break; case 1: - D_80177CE8 += 30.0f; + D_ctx_80177CE8 += 30.0f; Math_SmoothStepToF(&player->unk_0E4, 0.0f, 0.1f, 5.0f, 0.0f); Math_SmoothStepToF(&player->pos.y, 200.0f, 0.05f, 10.0f, 0.0f); dx = player->pos.x - bossSO->obj.pos.x; @@ -2872,8 +2866,8 @@ void func_i3_801A7930(Player* player) { player->unk_0EC += 1.0f; } if (gCsFrameCount >= 230) { - D_80178358 = 255; - D_80178348 = D_80178354 = D_80178350 = 255; + D_ctx_80178358 = 255; + D_ctx_80178348 = D_ctx_80178354 = D_ctx_80178350 = 255; } if (gCsFrameCount == 230) { SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 50); @@ -2881,10 +2875,10 @@ void func_i3_801A7930(Player* player) { } if (gCsFrameCount == 400) { player->unk_1D0++; - func_800A6148(); + func_play_800A6148(); func_8001CA24(0); Audio_KillSfxBySource(player->sfxSource); - D_80178340 = 250; + D_ctx_80178340 = 250; player->timer_1F8 = 20; player->unk_0D0 = 0.0f; player->unk_0E4 = 0.0f; @@ -2893,44 +2887,44 @@ void func_i3_801A7930(Player* player) { } break; case 2: - D_80177CE8 += 60.0f; + D_ctx_80177CE8 += 60.0f; if (player->timer_1F8 == 0) { player->pos.x = 0.0f; player->pos.y = 200.0f; - player->pos.z = -(D_80177D20 - 500.0f); + player->pos.z = -(D_ctx_80177D20 - 500.0f); player->unk_1D0++; player->wings.unk_2C = 1; func_8001C8B8(0); AUDIO_PLAY_BGM(SEQ_ID_38); - D_80177A98 = 1; - func_800A6148(); - D_80177A48[1] = 0.0f; - D_80177A48[2] = 0.0f; + D_ctx_80177A98 = 1; + func_play_800A6148(); + D_ctx_80177A48[1] = 0.0f; + D_ctx_80177A48[2] = 0.0f; player->camEye.x = 0.0f; player->camEye.y = player->pos.y + 80.0f; - player->camEye.z = player->pos.z + D_80177D20 - 4000.0f; - gCsCamEyeZ = player->pos.z + D_80177D20 - 4900.0f; + player->camEye.z = player->pos.z + D_ctx_80177D20 - 4000.0f; + gCsCamEyeZ = player->pos.z + D_ctx_80177D20 - 4900.0f; player->camAt.x = gCsCamAtX = 0.0f; player->camAt.y = gCsCamAtY = 200.0f; - player->camAt.z = gCsCamAtZ = player->pos.z + D_80177D20; - D_80177A48[0] = 0.0f; + player->camAt.z = gCsCamAtZ = player->pos.z + D_ctx_80177D20; + D_ctx_80177A48[0] = 0.0f; Object_Kill(&gActors[4].obj, gActors[4].sfxSource); Object_Kill(&gActors[5].obj, gActors[5].sfxSource); } break; case 3: - D_80177CE8 += 60.0f; - D_80178358 = 0; - D_8017835C = 4; - if (D_801782F8) { + D_ctx_80177CE8 += 60.0f; + D_ctx_80178358 = 0; + D_ctx_8017835C = 4; + if (D_ctx_801782F8) { player->wings.unk_30 = (gGameFrameCount & 1) * 5.0f; } switch (gCsFrameCount) { case 450: - func_i3_801A0DF8(-1200.0f, -(D_80177D20 + 2500.0f), 90.0f, 2, 1.0f); + Solar_801A0DF8(-1200.0f, -(D_ctx_80177D20 + 2500.0f), 90.0f, 2, 1.0f); break; case 545: - func_i3_801A0DF8(1400.0f, -(D_80177D20 + 3250.0f), -90.0f, 3, 1.0f); + Solar_801A0DF8(1400.0f, -(D_ctx_80177D20 + 3250.0f), -90.0f, 3, 1.0f); break; case 550: Object_Kill(&gActors[4].obj, gActors[4].sfxSource); @@ -2940,7 +2934,7 @@ void func_i3_801A7930(Player* player) { break; case 700: player->unk_1D0++; - func_i3_801A7750(); + Solar_801A7750(); D_i3_801C2768[3] = 1000.0f; break; } @@ -2968,22 +2962,22 @@ void func_i3_801A7930(Player* player) { if (gCsFrameCount >= 600) { Math_SmoothStepToF(&player->pos.y, 950.0f, 0.1f, 10.0f, 0.0001f); } - Math_SmoothStepToF(&player->pos.z, -(D_80177D20 + 4350.0f), 1.0f, 20.0f, 0.0001f); + Math_SmoothStepToF(&player->pos.z, -(D_ctx_80177D20 + 4350.0f), 1.0f, 20.0f, 0.0001f); if (gCsFrameCount >= 620) { Math_SmoothStepToF(&player->camEye.x, 0.0f, 1.0f, 10.0f, 0); Math_SmoothStepToF(&player->camEye.y, player->pos.y + 52.0f, 1.0f, 16.0f, 0.0f); - Math_SmoothStepToF(&player->camEye.z, (player->pos.z + D_80177D20) - 50.0f, 1.0f, 21.5f, 0.0f); + Math_SmoothStepToF(&player->camEye.z, (player->pos.z + D_ctx_80177D20) - 50.0f, 1.0f, 21.5f, 0.0f); } player->camAt.x = gCsCamAtX = player->pos.x; player->camAt.y = gCsCamAtY = player->pos.y; - player->camAt.z = gCsCamAtZ = player->pos.z + D_80177D20; + player->camAt.z = gCsCamAtZ = player->pos.z + D_ctx_80177D20; break; case 4: - D_80177CE8 += 60.0f; - D_80178358 = 0; - D_8017835C = 4; - D_80177A48[1] += D_80177A48[2] * 0.8f; - Matrix_RotateY(gCalcMatrix, D_80177A48[1] * M_DTOR, 0); + D_ctx_80177CE8 += 60.0f; + D_ctx_80178358 = 0; + D_ctx_8017835C = 4; + D_ctx_80177A48[1] += D_ctx_80177A48[2] * 0.8f; + Matrix_RotateY(gCalcMatrix, D_ctx_80177A48[1] * M_DTOR, 0); sp60.x = 0.0f; sp60.y = 0.0f; sp60.z = -700.0f; @@ -2991,11 +2985,11 @@ void func_i3_801A7930(Player* player) { if (gCsFrameCount < 1440) { gCsCamEyeX = sp54.x; gCsCamEyeY = D_i3_801C2768[3] + sp54.y; - gCsCamEyeZ = player->pos.z + D_80177D20 + sp54.z; + gCsCamEyeZ = player->pos.z + D_ctx_80177D20 + sp54.z; gCsCamAtX = 0.0f; gCsCamAtY = player->pos.y + 75.0f; Math_SmoothStepToF(&D_i3_801C2768[3], 500.0f, 0.1f, 1.0f, 0.0001f); - gCsCamAtZ = player->pos.z + D_80177D20 + 200.0f; + gCsCamAtZ = player->pos.z + D_ctx_80177D20 + 200.0f; if (gCsFrameCount >= 1400) { gCsCamAtZ -= (gCsFrameCount * 8) - 11200; } @@ -3003,38 +2997,38 @@ void func_i3_801A7930(Player* player) { Math_SmoothStepToF(&gCsCamEyeX, 0.0f, 0.1f, 1.0f, 0.0001f); gCsCamAtX = 0.0f; gCsCamAtY = player->pos.y + 75.0f; - gCsCamAtZ = player->pos.z + D_80177D20 + 200.0f - ((gCsFrameCount * 8) - 11200); + gCsCamAtZ = player->pos.z + D_ctx_80177D20 + 200.0f - ((gCsFrameCount * 8) - 11200); } if (gCsFrameCount > 1460) { player->unk_0D0 += 2.0f; player->unk_0E4 += 0.2f; - Math_SmoothStepToF(&D_80177A48[2], 0.0f, 1.0f, 0.001f, 0); + Math_SmoothStepToF(&D_ctx_80177A48[2], 0.0f, 1.0f, 0.001f, 0); player->unk_190 = 2.0f; } else { - Math_SmoothStepToF(&D_80177A48[2], 0.23f, 1.0f, 0.001f, 0.0f); - Math_SmoothStepToF(&D_80177A48[0], 0.5f, 0.1f, 0.0005f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[2], 0.23f, 1.0f, 0.001f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[0], 0.5f, 0.1f, 0.0005f, 0.0f); } if (gCsFrameCount == 1560) { - func_800A6148(); + func_play_800A6148(); } if (gCsFrameCount > 1530) { - D_80178358 = 255; - D_80178348 = D_80178350 = D_80178354 = 0; - D_8017835C = 8; - if (D_80178340 == 255) { + D_ctx_80178358 = 255; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; + D_ctx_8017835C = 8; + if (D_ctx_80178340 == 255) { func_8001CA24(0); Audio_FadeOutAll(10); player->state_1C8 = PLAYERSTATE_1C8_6; player->timer_1F8 = 0; - D_8017837C = 4; - D_800D3180[LEVEL_SOLAR] = Play_CheckMedalStatus(100) + 1; + D_ctx_8017837C = 4; + D_play_800D3180[LEVEL_SOLAR] = Play_CheckMedalStatus(100) + 1; } } break; } switch (gCsFrameCount) { case 440: - D_80177840 = 100; + D_ctx_80177840 = 100; break; case 640: Radio_PlayMessage(gMsg_ID_20010, RCID_FOX); @@ -3048,7 +3042,7 @@ void func_i3_801A7930(Player* player) { Radio_PlayMessage(gMsg_ID_20339, RCID_ROB64); break; default: - func_80048AC0(2); + func_demo_80048AC0(2); break; } break; @@ -3061,7 +3055,7 @@ void func_i3_801A7930(Player* player) { Radio_PlayMessage(gMsg_ID_20338, RCID_ROB64); break; default: - func_80048AC0(3); + func_demo_80048AC0(3); break; } break; @@ -3074,15 +3068,15 @@ void func_i3_801A7930(Player* player) { Radio_PlayMessage(gMsg_ID_20337, RCID_ROB64); break; default: - func_80048AC0(1); + func_demo_80048AC0(1); break; } break; case 1186: - D_80177830 = 1; + D_ctx_80177830 = 1; break; case 1386: - D_80177830 = 0; + D_ctx_80177830 = 0; break; case 1460: AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); @@ -3124,19 +3118,19 @@ void func_i3_801A7930(Player* player) { player->unk_138 = player->pos.z; player->unk_0F8 = player->unk_0EC; - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_ctx_80177A48[0], 50000.0f, 0.0f); player->unk_088 += 10.0f; player->unk_080 = -SIN_DEG(player->unk_088) * 0.3f; player->unk_0F4 += 8.0f; player->unk_0F0 = SIN_DEG(player->unk_0F4); } -void func_i3_801A8BE8(Actor* actor) { +void Solar_801A8BE8(Actor* actor) { Vec3f sp3C; Vec3f sp30; @@ -3174,12 +3168,12 @@ void func_i3_801A8BE8(Actor* actor) { actor->obj.rot.z = -actor->unk_0F4.z; } -void func_i3_801A8DB8(Vec3f* pos, u32 sfxId, f32 zVel) { +void Solar_801A8DB8(Vec3f* pos, u32 sfxId, f32 zVel) { s32 i; for (i = 0; i < ARRAY_COUNT(gEffects); i++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_8007A5F8(&gEffects[i], pos, sfxId); + func_effect_8007A5F8(&gEffects[i], pos, sfxId); gEffects[i].vel.z = zVel; break; } diff --git a/src/overlays/ovl_i3/fox_zo.c b/src/overlays/ovl_i3/fox_zo.c index 299adb5d..f51b4aed 100644 --- a/src/overlays/ovl_i3/fox_zo.c +++ b/src/overlays/ovl_i3/fox_zo.c @@ -54,34 +54,18 @@ typedef struct { #define ZO_HIT_10(bossZO, index) ((Hitbox*) ((f32*) (ZO_HIT_8(bossZO, 0) + 2) + 6 * (index))) #define ZO_HIT_12(bossZO) ((Hitbox*) (ZO_HIT_10(bossZO, 0) + 2)) -void func_80081BEC(f32, f32, f32, f32, s32); -void func_8008377C(f32, f32, f32, f32, f32); -void func_i3_801A7750(void); -void func_i3_801986FC(Boss* bossZO, s32 arg1, f32 xOff, f32 yOff, f32 zOff, f32 yRot); -void func_i3_801989FC(Boss* bossZO); -void func_i3_80198BE8(Boss* bossZO, s32 arg1); -void func_i3_80198ECC(Boss* bossZO); -void func_i3_80198F3C(Boss* bossZO, s32 arg1, s32 arg2); -void func_i3_8019907C(Boss* bossZO); -void func_i3_8019914C(Boss* bossZO, s32 arg1); -void func_i3_801991D0(Boss* bossZO, s32 arg1); -void func_i3_80199394(Boss* bossZO, s32 arg1); -void func_i3_80199470(Boss* bossZO, s32 arg1); -void func_i3_8019962C(Boss* bossZO, f32 arg1); - -// /* 0x1 */ ROM_SEGMENT(ast_873CB0), -// /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), -// /* 0x3 */ ROM_SEGMENT(ast_8BFC00), -// /* 0x4 */ ROM_SEGMENT(ast_918430), -// /* 0x5 */ ROM_SEGMENT(ast_CD2410), -// /* 0x6 */ ROM_SEGMENT(ast_B84560), -// /* 0x7 */ NO_SEGMENT, -// /* 0x8 */ NO_SEGMENT, -// /* 0x9 */ NO_SEGMENT, -// /* 0xA */ NO_SEGMENT, -// /* 0xB */ NO_SEGMENT, -// /* 0xC */ NO_SEGMENT, -// /* 0xD */ ROM_SEGMENT(ast_955270), +void Solar_801A7750(void); +void Zoness_801986FC(Boss* bossZO, s32 arg1, f32 xOff, f32 yOff, f32 zOff, f32 yRot); +void Zoness_801989FC(Boss* bossZO); +void Zoness_80198BE8(Boss* bossZO, s32 arg1); +void Zoness_80198ECC(Boss* bossZO); +void Zoness_80198F3C(Boss* bossZO, s32 arg1, s32 arg2); +void Zoness_8019907C(Boss* bossZO); +void Zoness_8019914C(Boss* bossZO, s32 arg1); +void Zoness_801991D0(Boss* bossZO, s32 arg1); +void Zoness_80199394(Boss* bossZO, s32 arg1); +void Zoness_80199470(Boss* bossZO, s32 arg1); +void Zoness_8019962C(Boss* bossZO, f32 arg1); // typedef struct { // /* 0 */ char pad0[4]; @@ -550,19 +534,19 @@ s32 sZoLimbTimers[ZO_LIMB_MAX]; s32 sZoSwork[ZO_BSS_MAX]; f32 sZoFwork[ZO_BSF_MAX]; -void func_i3_8018FF50(Actor* actor) { +void Zoness_8018FF50(Actor* actor) { f32 temp; (void) " Enm->hitNO %d\n"; // Unclear where this goes. hitNO can't be info.bonus. Damage related? actor->obj.rot.y = RAD_TO_DEG( - Math_Atan2F(gPlayer[0].camEye.x - actor->obj.pos.x, gPlayer[0].camEye.z - (actor->obj.pos.z + D_80177D20))); - temp = - sqrtf(SQ(gPlayer[0].camEye.z - (actor->obj.pos.z + D_80177D20)) + SQ(gPlayer[0].camEye.x - actor->obj.pos.x)); + Math_Atan2F(gPlayer[0].camEye.x - actor->obj.pos.x, gPlayer[0].camEye.z - (actor->obj.pos.z + D_ctx_80177D20))); + temp = sqrtf(SQ(gPlayer[0].camEye.z - (actor->obj.pos.z + D_ctx_80177D20)) + + SQ(gPlayer[0].camEye.x - actor->obj.pos.x)); actor->obj.rot.x = RAD_TO_DEG(-Math_Atan2F(gPlayer[0].camEye.y - actor->obj.pos.y, temp)); } -void func_i3_80190028(Actor* actor, Vec3f* pos, Vec3f* rot, f32 xVel, f32 yVel, f32 zVel, s32 arg6, f32 scale, s32 arg8, - s32 arg9) { +void Zoness_80190028(Actor* actor, Vec3f* pos, Vec3f* rot, f32 xVel, f32 yVel, f32 zVel, s32 arg6, f32 scale, s32 arg8, + s32 arg9) { Actor_Initialize(actor); actor->obj.status = OBJ_ACTIVE; actor->obj.id = OBJ_ACTOR_189; @@ -580,18 +564,18 @@ void func_i3_80190028(Actor* actor, Vec3f* pos, Vec3f* rot, f32 xVel, f32 yVel, Object_SetInfo(&actor->info, actor->obj.id); } -void func_i3_801900FC(Vec3f* pos, Vec3f* rot, f32 xVel, f32 yVel, f32 zVel, s32 arg6, f32 scale, s32 arg8, s32 arg9) { +void Zoness_801900FC(Vec3f* pos, Vec3f* rot, f32 xVel, f32 yVel, f32 zVel, s32 arg6, f32 scale, s32 arg8, s32 arg9) { s32 i; for (i = 59; i > 0; i--) { if (gActors[i].obj.status == OBJ_FREE) { - func_i3_80190028(&gActors[i], pos, rot, xVel, yVel, zVel, arg6, scale, arg8, arg9); + Zoness_80190028(&gActors[i], pos, rot, xVel, yVel, zVel, arg6, scale, arg8, arg9); break; } } } -s32 func_i3_8019019C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { +s32 Zoness_8019019C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); if ((limbIndex >= 4) && (limbIndex < 10)) { gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); @@ -599,7 +583,7 @@ s32 func_i3_8019019C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* t return false; } -void func_i3_80190204(s32 limbIndex, Vec3f* rot, void* thisx) { +void Zoness_80190204(s32 limbIndex, Vec3f* rot, void* thisx) { Vec3f sp24 = { 0.0f, 0.0f, 0.0f }; Actor* this = thisx; @@ -653,15 +637,15 @@ void func_i3_80190204(s32 limbIndex, Vec3f* rot, void* thisx) { } } -void func_i3_80190430(Actor* actor) { +void Zoness_80190430(Actor* actor) { Vec3f sp30[30]; Matrix_Scale(gCalcMatrix, actor->scale, actor->scale, actor->scale, 1); Animation_GetFrameData(&D_ZO_600E5EC, actor->unk_0B6, sp30); - Animation_DrawSkeleton(3, D_ZO_600E7D8, sp30, func_i3_8019019C, func_i3_80190204, actor, gCalcMatrix); + Animation_DrawSkeleton(3, D_ZO_600E7D8, sp30, Zoness_8019019C, Zoness_80190204, actor, gCalcMatrix); } -void func_i3_801904CC(Actor* actor) { +void Zoness_801904CC(Actor* actor) { Vec3f spA4; Vec3f sp98; s32 i; @@ -682,14 +666,14 @@ void func_i3_801904CC(Actor* actor) { break; case 1: for (i = 0; i < 11; i++) { - func_i3_801900FC(&actor->vwork[i], &actor->vwork[i + 11], RAND_FLOAT_CENTERED(20.0f), - RAND_FLOAT(-10.0f), RAND_FLOAT(10.0f), 41, actor->scale, 200, i); + Zoness_801900FC(&actor->vwork[i], &actor->vwork[i + 11], RAND_FLOAT_CENTERED(20.0f), RAND_FLOAT(-10.0f), + RAND_FLOAT(10.0f), 41, actor->scale, 200, i); } actor->unk_044 = 0; - func_80066254(actor); + func_enmy_80066254(actor); Object_Kill(&actor->obj, actor->sfxSource); - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 4.0f); - func_8007A6F0(&actor->obj.pos, 0x29018036); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 4.0f); + func_effect_8007A6F0(&actor->obj.pos, 0x29018036); break; } actor->unk_0B6++; @@ -710,7 +694,7 @@ void func_i3_801904CC(Actor* actor) { } } -void func_i3_80190790(Actor* actor) { +void Zoness_80190790(Actor* actor) { s32 pad[2]; f32 temp1; PosRot* temp2; @@ -748,7 +732,7 @@ void func_i3_80190790(Actor* actor) { Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp44, &sp38); actor->vel.x = sp38.x; actor->vel.z = sp38.z; - temp2 = &D_801782C4[actor->unk_04E]; + temp2 = &D_ctx_801782C4[actor->unk_04E]; temp2->pos.x = actor->obj.pos.x; temp2->pos.y = actor->obj.pos.y; temp2->pos.z = actor->obj.pos.z; @@ -757,13 +741,13 @@ void func_i3_80190790(Actor* actor) { temp2->rot.z = actor->unk_0F4.z; } -void func_i3_80190A00(Actor* actor) { +void Zoness_80190A00(Actor* actor) { f32 sp2C; s32 sp28; if ((actor->timer_0C0 == 0) && - func_800A73E4(&sp2C, &sp28, actor->obj.pos.x, actor->obj.pos.y - 50.0f, actor->obj.pos.z)) { - func_8008377C(actor->obj.pos.x, sp2C, actor->obj.pos.z + 150.0f, 0.0f, 1.7f); + func_play_800A73E4(&sp2C, &sp28, actor->obj.pos.x, actor->obj.pos.y - 50.0f, actor->obj.pos.z)) { + func_effect_8008377C(actor->obj.pos.x, sp2C, actor->obj.pos.z + 150.0f, 0.0f, 1.7f); if (actor->vel.y >= 0.0f) { AUDIO_PLAY_SFX(0x1983201A, actor->sfxSource, 4); } else { @@ -771,7 +755,7 @@ void func_i3_80190A00(Actor* actor) { } actor->timer_0C0 = 30; } - func_i3_80190790(actor); + Zoness_80190790(actor); if (actor->unk_0D0 != 0) { actor->unk_0D0 = 0; AUDIO_PLAY_SFX(0x29121007, actor->sfxSource, 4); @@ -786,9 +770,9 @@ u8 D_i3_801BF594[20] = { }; Gfx* D_i3_801BF5A8[3] = { D_ZO_60012A0, D_ZO_60239E0, D_ZO_6023730 }; -void func_i3_80190B4C(f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 zRot, u8 arg6, s32 arg7) { +void Zoness_80190B4C(f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 zRot, u8 arg6, s32 arg7) { Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, xPos, yPos, zPos + D_80177D20, 1); + Matrix_Translate(gGfxMatrix, xPos, yPos, zPos + D_ctx_80177D20, 1); Matrix_RotateY(gGfxMatrix, M_DTOR * yRot, 1); Matrix_RotateX(gGfxMatrix, M_DTOR * xRot, 1); Matrix_RotateZ(gGfxMatrix, M_DTOR * zRot, 1); @@ -808,7 +792,7 @@ typedef struct { Hitbox boxes[1]; } JntHitbox; -void func_i3_80190D0C(Actor* actor) { +void Zoness_80190D0C(Actor* actor) { Hitbox* var_s2 = (((JntHitbox*) SEGMENTED_TO_VIRTUAL(D_ZO_602BC58))->boxes); s32 i; s32 k; @@ -817,24 +801,24 @@ void func_i3_80190D0C(Actor* actor) { actor->unk_04A = 0; for (i = actor->unk_04A; i < 20; i++, var_s2++) { k = (D_i3_801BF56C[i] + actor->unk_04E) % 200; - temp_s0 = &D_801782C4[k]; + temp_s0 = &D_ctx_801782C4[k]; var_s2->z.offset = temp_s0->pos.z - actor->obj.pos.z; var_s2->y.offset = temp_s0->pos.y - actor->obj.pos.y; var_s2->x.offset = temp_s0->pos.x - actor->obj.pos.x; - func_i3_80190B4C(temp_s0->pos.x, temp_s0->pos.y, temp_s0->pos.z, temp_s0->rot.x, temp_s0->rot.y, temp_s0->rot.z, - D_i3_801BF594[i], actor->timer_0C6 & 1); - if (D_80177854 != 100) { + Zoness_80190B4C(temp_s0->pos.x, temp_s0->pos.y, temp_s0->pos.z, temp_s0->rot.x, temp_s0->rot.y, temp_s0->rot.z, + D_i3_801BF594[i], actor->timer_0C6 & 1); + if (D_ctx_80177854 != 100) { Math_SmoothStepToF(&temp_s0->pos.y, actor->fwork[2], 1.0f, 10.0f, 0.0f); } } } -void func_i3_80190F08(Actor* actor) { - func_i3_80190D0C(actor); +void Zoness_80190F08(Actor* actor) { + Zoness_80190D0C(actor); } -void func_i3_80190F28(s32 limbIndex, Vec3f* rot, void* thisx) { +void Zoness_80190F28(s32 limbIndex, Vec3f* rot, void* thisx) { Vec3f sp2C = { 0.0f, 0.0f, 0.0f }; Actor* this = thisx; @@ -856,7 +840,7 @@ void func_i3_80190F28(s32 limbIndex, Vec3f* rot, void* thisx) { } } -void func_i3_80191010(Actor* actor) { +void Zoness_80191010(Actor* actor) { Vec3f sp8C; Vec3f sp80; f32 sp7C; @@ -909,7 +893,7 @@ void func_i3_80191010(Actor* actor) { actor->vel.y = 0.0f; Object_Kill(&actor->obj, actor->sfxSource); } - if (func_800A73E4(&sp7C, &sp70, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z) && + if (func_play_800A73E4(&sp7C, &sp70, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z) && (actor->iwork[0] < 2) && (actor->timer_0C0 == 0)) { if (var_fs0 == 5.0f) { AUDIO_PLAY_SFX(0x1983201A, actor->sfxSource, 4); @@ -918,20 +902,20 @@ void func_i3_80191010(Actor* actor) { } actor->timer_0C0 = 10; actor->iwork[0] += 1; - func_8008377C(actor->obj.pos.x, sp7C, actor->obj.pos.z, 0.0f, 0.7f); + func_effect_8008377C(actor->obj.pos.x, sp7C, actor->obj.pos.z, 0.0f, 0.7f); } break; case 3: for (i = 0; i < 3; i++) { - func_i3_801900FC(&actor->vwork[i], &actor->vwork[3 + i], RAND_FLOAT_CENTERED(20.0f), RAND_FLOAT(-10.0f), - RAND_FLOAT(10.0f), 42, actor->scale, 200, i); + Zoness_801900FC(&actor->vwork[i], &actor->vwork[3 + i], RAND_FLOAT_CENTERED(20.0f), RAND_FLOAT(-10.0f), + RAND_FLOAT(10.0f), 42, actor->scale, 200, i); } actor->unk_044 = 4; - func_80066254(actor); - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 3.0f); + func_enmy_80066254(actor); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 3.0f); AUDIO_PLAY_SFX(0x2903A008, actor->sfxSource, 4); Object_Kill(&actor->obj, actor->sfxSource); - func_8007A6F0(&actor->obj.pos, 0x29018036); + func_effect_8007A6F0(&actor->obj.pos, 0x29018036); break; } if ((actor->unk_0D0 != 0) && (actor->health != 0)) { @@ -945,17 +929,17 @@ void func_i3_80191010(Actor* actor) { } } -void func_i3_801914C4(Actor* actor) { +void Zoness_801914C4(Actor* actor) { Vec3f sp38[20]; Matrix_Scale(gCalcMatrix, actor->scale, actor->scale, actor->scale, 1); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); Animation_GetFrameData(&D_ZO_601AA48, actor->unk_0B6, sp38); - Animation_DrawSkeleton(3, D_ZO_601AB14, sp38, NULL, func_i3_80190F28, actor, gCalcMatrix); + Animation_DrawSkeleton(3, D_ZO_601AB14, sp38, NULL, Zoness_80190F28, actor, gCalcMatrix); gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); } -void func_i3_801915A4(Actor* actor) { +void Zoness_801915A4(Actor* actor) { s32 i; Actor* var_a2; @@ -980,7 +964,7 @@ void func_i3_801915A4(Actor* actor) { } } -void func_i3_80191680(Actor* actor) { +void Zoness_80191680(Actor* actor) { f32 sp64; f32 sp60; f32 sp5C; @@ -1000,7 +984,7 @@ void func_i3_80191680(Actor* actor) { AUDIO_PLAY_SFX(0x29033037, actor->sfxSource, 4); if (actor->health <= 0) { actor->health = actor->unk_044 = 0; - func_80066254(actor); + func_enmy_80066254(actor); actor->state = 1; AUDIO_PLAY_SFX(0x29018036, actor->sfxSource, 4); } @@ -1058,7 +1042,7 @@ void func_i3_80191680(Actor* actor) { actor->fwork[5] = sp38->obj.pos.y; actor->fwork[6] = sp38->obj.pos.z; if (!(gGameFrameCount & 0xF) && (fabsf(gPlayer[0].pos.x - actor->obj.pos.x) < 100.0f)) { - func_80081BEC(actor->fwork[4], actor->fwork[5], actor->fwork[6], 1.0f, 0); + func_effect_80081BEC(actor->fwork[4], actor->fwork[5], actor->fwork[6], 1.0f, 0); } } else { sp38->vel.y -= 1.0f; @@ -1066,15 +1050,15 @@ void func_i3_80191680(Actor* actor) { } } -void func_i3_80191B4C(Actor* actor) { +void Zoness_80191B4C(Actor* actor) { Animation_GetFrameData(&D_ENMY_PLANET_40057AC, actor->unk_0B6, actor->vwork); Animation_DrawSkeleton(1, D_ENMY_PLANET_40058B8, actor->vwork, NULL, NULL, &actor->index, &gIdentityMatrix); } -void func_i3_80191BB8(Actor* actor) { +void Zoness_80191BB8(Actor* actor) { } -void func_i3_80191BC4(Actor* actor) { +void Zoness_80191BC4(Actor* actor) { f32 sp4C; s32 sp48; @@ -1082,23 +1066,24 @@ void func_i3_80191BC4(Actor* actor) { actor->iwork[1] = 1; AUDIO_PLAY_SFX(0x2900201D, actor->sfxSource, 4); } - if (func_800A73E4(&sp4C, &sp48, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z) && (actor->state == 0)) { - func_8007B344(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 20.0f, 7); - func_8007C120(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 0.5f, 50); + if (func_play_800A73E4(&sp4C, &sp48, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z) && (actor->state == 0)) { + func_effect_8007B344(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 20.0f, 7); + func_effect_8007C120(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 0.5f, 50); Object_Kill(&actor->obj, actor->sfxSource); actor->iwork[0] = 0; - func_8007A6F0(&actor->obj.pos, 0x1903001D); + func_effect_8007A6F0(&actor->obj.pos, 0x1903001D); } actor->fwork[0] += 10.0f; - func_i3_8018FF50(actor); + Zoness_8018FF50(actor); if (!(gGameFrameCount & 1)) { - func_8007C484(RAND_FLOAT_CENTERED(50.0f) + actor->obj.pos.x, RAND_FLOAT_CENTERED(50.0f) + actor->obj.pos.y, - RAND_FLOAT_CENTERED(50.0f) + actor->obj.pos.z, actor->vel.x, actor->vel.y, actor->vel.z, - RAND_FLOAT(0.05f) + 0.05f, 0); + func_effect_8007C484(RAND_FLOAT_CENTERED(50.0f) + actor->obj.pos.x, + RAND_FLOAT_CENTERED(50.0f) + actor->obj.pos.y, + RAND_FLOAT_CENTERED(50.0f) + actor->obj.pos.z, actor->vel.x, actor->vel.y, actor->vel.z, + RAND_FLOAT(0.05f) + 0.05f, 0); } } -void func_i3_80191DB0(Actor* actor) { +void Zoness_80191DB0(Actor* actor) { RCP_SetupDL_40(); gSPDisplayList(gMasterDisp++, D_ZO_6019EB0); Matrix_RotateY(gGfxMatrix, actor->fwork[0] * 0.7f * M_DTOR, 1); @@ -1107,7 +1092,7 @@ void func_i3_80191DB0(Actor* actor) { gSPDisplayList(gMasterDisp++, D_ZO_6023D50); } -void func_i3_80191E94(s32 limbIndex, Vec3f* rot, void* thisx) { +void Zoness_80191E94(s32 limbIndex, Vec3f* rot, void* thisx) { Vec3f sp24 = { 0.0f, 0.0f, 0.0f }; Actor* this = thisx; @@ -1141,15 +1126,15 @@ void func_i3_80191E94(s32 limbIndex, Vec3f* rot, void* thisx) { } } -void func_i3_80191FFC(Actor* actor) { +void Zoness_80191FFC(Actor* actor) { Vec3f sp30[20]; Matrix_Scale(gCalcMatrix, actor->scale, actor->scale, actor->scale, 1); Animation_GetFrameData(&D_ZO_60195EC, actor->unk_0B6, sp30); - Animation_DrawSkeleton(3, D_ZO_6019738, sp30, NULL, func_i3_80191E94, actor, gCalcMatrix); + Animation_DrawSkeleton(3, D_ZO_6019738, sp30, NULL, Zoness_80191E94, actor, gCalcMatrix); } -void func_i3_80192094(Actor* actor) { +void Zoness_80192094(Actor* actor) { s32 i; f32 spB8; f32 temp_fs0; @@ -1172,8 +1157,8 @@ void func_i3_80192094(Actor* actor) { Math_SmoothStepToAngle(&actor->obj.rot.x, temp_fs0_2, 0.1f, 10.0f, 0.00001f); Math_SmoothStepToAngle(&actor->obj.rot.y, spA4, 0.1f, 10.0f, 0.00001f); if ((actor->iwork[0] == 0) && - (func_800A73E4(&spB8, &spA0, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z) != 0)) { - func_8008377C(actor->obj.pos.x, spB8, actor->obj.pos.z + 100.0f, 0.0f, 1.5f); + (func_play_800A73E4(&spB8, &spA0, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z) != 0)) { + func_effect_8008377C(actor->obj.pos.x, spB8, actor->obj.pos.z + 100.0f, 0.0f, 1.5f); actor->iwork[0] += 1; if (actor->vel.y >= 0.0f) { AUDIO_PLAY_SFX(0x1983201A, actor->sfxSource, 4); @@ -1229,7 +1214,7 @@ void func_i3_80192094(Actor* actor) { sp70.y = 0.0f; sp70.z = 100.0f; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp70, &sp88); - func_8007EE68(OBJ_EFFECT_355, &sp94, &sp7C, &sp7C, &sp88, 1.0f); + func_effect_8007EE68(OBJ_EFFECT_355, &sp94, &sp7C, &sp7C, &sp88, 1.0f); actor->fwork[2] += 40.0f; actor->fwork[2] = Math_ModF(actor->fwork[2], 360.0f); Math_SmoothStepToF(&actor->fwork[3], 0.0f, 1.0f, 5.0f, 0.0001f); @@ -1250,27 +1235,27 @@ void func_i3_80192094(Actor* actor) { break; case 4: for (i = 0; i < 6; i++) { - func_i3_801900FC(&actor->vwork[i], &actor->vwork[i + 6], RAND_FLOAT_CENTERED(40.0f), RAND_FLOAT(-10.0f), - RAND_FLOAT(20.0f), 44, actor->scale, 200, i); + Zoness_801900FC(&actor->vwork[i], &actor->vwork[i + 6], RAND_FLOAT_CENTERED(40.0f), RAND_FLOAT(-10.0f), + RAND_FLOAT(20.0f), 44, actor->scale, 200, i); } actor->unk_044 = 5; - func_80066254(actor); + func_enmy_80066254(actor); Object_Kill(&actor->obj, actor->sfxSource); - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); break; } if ((actor->unk_0D0 != 0) && (actor->state < 3)) { if (actor->unk_0D0 != 1) { BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 200.0f, 5); gHitCount += 6; - D_80177850 = 15; + D_ctx_80177850 = 15; actor->state = 4; } actor->unk_0D0 = 0; } } -void func_i3_801926F4(s32 limbIndex, Vec3f* rot, void* thisx) { +void Zoness_801926F4(s32 limbIndex, Vec3f* rot, void* thisx) { Vec3f sp24 = { 0.0f, 0.0f, 0.0f }; Actor* this = thisx; @@ -1300,7 +1285,7 @@ void func_i3_801926F4(s32 limbIndex, Vec3f* rot, void* thisx) { } } -void func_i3_80192834(Actor* actor) { +void Zoness_80192834(Actor* actor) { Vec3f sp84; Vec3f sp78; f32 sp74; @@ -1351,20 +1336,20 @@ void func_i3_80192834(Actor* actor) { break; case 2: for (i = 0; i < 5; i++) { - func_i3_801900FC(&actor->vwork[i], &actor->vwork[5 + i], RAND_FLOAT_CENTERED(20.0f), RAND_FLOAT(-10.0f), - RAND_FLOAT(10.0f), 43, actor->scale, 200, i); + Zoness_801900FC(&actor->vwork[i], &actor->vwork[5 + i], RAND_FLOAT_CENTERED(20.0f), RAND_FLOAT(-10.0f), + RAND_FLOAT(10.0f), 43, actor->scale, 200, i); } actor->unk_044 = 0; - func_80066254(actor); + func_enmy_80066254(actor); Object_Kill(&actor->obj, actor->sfxSource); - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 3.0f); - func_8007A6F0(&actor->obj.pos, 0x29018036); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 3.0f); + func_effect_8007A6F0(&actor->obj.pos, 0x29018036); break; } if ((actor->iwork[0] == 0) && - (func_800A73E4(&sp74, &sp70, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z) != 0)) { + (func_play_800A73E4(&sp74, &sp70, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z) != 0)) { actor->iwork[0]++; - func_8008377C(actor->obj.pos.x, sp74, actor->obj.pos.z, 0.0f, 0.7f); + func_effect_8008377C(actor->obj.pos.x, sp74, actor->obj.pos.z, 0.0f, 0.7f); if (actor->vel.y >= 0.0f) { AUDIO_PLAY_SFX(0x1983201A, actor->sfxSource, 4); } else { @@ -1373,14 +1358,14 @@ void func_i3_80192834(Actor* actor) { } } -void func_i3_80192C18(Actor* actor) { +void Zoness_80192C18(Actor* actor) { Vec3f sp28[20]; Animation_GetFrameData(&D_ZO_6021ABC, actor->unk_0B6, sp28); - Animation_DrawSkeleton(3, D_ZO_6021B88, sp28, NULL, func_i3_801926F4, actor, gCalcMatrix); + Animation_DrawSkeleton(3, D_ZO_6021B88, sp28, NULL, Zoness_801926F4, actor, gCalcMatrix); } -void func_i3_80192C84(s32 limbIndex, Vec3f* rot, void* thisx) { +void Zoness_80192C84(s32 limbIndex, Vec3f* rot, void* thisx) { Vec3f sp24 = { 0.0f, 0.0f, 0.0f }; Actor* this = thisx; @@ -1426,7 +1411,7 @@ void func_i3_80192C84(s32 limbIndex, Vec3f* rot, void* thisx) { } } -void func_i3_80192E64(Actor* actor) { +void Zoness_80192E64(Actor* actor) { s32 i; Vec3f sp80; Vec3f sp74; @@ -1468,13 +1453,13 @@ void func_i3_80192E64(Actor* actor) { break; case 3: for (i = 0; i < 9; i++) { - func_i3_801900FC(&actor->vwork[i], &actor->vwork[9 + i], RAND_FLOAT_CENTERED(40.0f), RAND_FLOAT(-10.0f), - RAND_FLOAT(20.0f), 59, actor->scale, 200, i); + Zoness_801900FC(&actor->vwork[i], &actor->vwork[9 + i], RAND_FLOAT_CENTERED(40.0f), RAND_FLOAT(-10.0f), + RAND_FLOAT(20.0f), 59, actor->scale, 200, i); } actor->unk_044 = 7; - func_80066254(actor); + func_enmy_80066254(actor); Object_Kill(&actor->obj, actor->sfxSource); - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); break; } if (actor->unk_0D0 != 0) { @@ -1482,7 +1467,7 @@ void func_i3_80192E64(Actor* actor) { if ((actor->state != 0) && (actor->state != 3)) { BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 200.0f, 2); gHitCount += 3; - D_80177850 = 15; + D_ctx_80177850 = 15; actor->state = 3; } } else { @@ -1490,16 +1475,16 @@ void func_i3_80192E64(Actor* actor) { } actor->unk_0D0 = 0; } - if (func_800A73E4(&sp70, &sp6C, actor->obj.pos.x, actor->obj.pos.y - 1000.0f, actor->obj.pos.z)) { + if (func_play_800A73E4(&sp70, &sp6C, actor->obj.pos.x, actor->obj.pos.y - 1000.0f, actor->obj.pos.z)) { Math_SmoothStepToF(&actor->obj.pos.y, sp70 + 300.0f, 0.1f, 20.0f, 0); } } -void func_i3_80193240(Actor* actor) { +void Zoness_80193240(Actor* actor) { Vec3f sp28[30]; Animation_GetFrameData(&D_ZO_601AFB8, actor->unk_0B6, sp28); - Animation_DrawSkeleton(2, D_ZO_601B184, sp28, NULL, func_i3_80192C84, actor, gCalcMatrix); + Animation_DrawSkeleton(2, D_ZO_601B184, sp28, NULL, Zoness_80192C84, actor, gCalcMatrix); } s32 D_i3_801BF5F0[6] = { @@ -1509,7 +1494,7 @@ f32 D_i3_801BF608[6] = { -45.0f, 0.0f, -45.0f, 0.0f, -45.0f, 0.0f, }; -void func_i3_801932AC(Boss* bossZO) { +void Zoness_801932AC(Boss* bossZO) { s32 i; gBossActive = 1; @@ -1586,7 +1571,7 @@ void func_i3_801932AC(Boss* bossZO) { ZO_HIT_12(bossZO)->x.size = 93.6f; } -void func_i3_80193628(Object* obj, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6) { +void Zoness_80193628(Object* obj, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6) { Vec3f sp54 = { 0.0f, 0.0f, 40.0f }; Vec3f sp48; @@ -1596,11 +1581,11 @@ void func_i3_80193628(Object* obj, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 a Matrix_RotateY(gCalcMatrix, M_DTOR * arg5, 1); Matrix_RotateX(gCalcMatrix, M_DTOR * arg4, 1); Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp54, &sp48); - func_8007F04C(OBJ_EFFECT_353, arg1 + sp48.x + arg6, arg2 + sp48.y, arg3 + sp48.z, arg4, arg5, 0.0f, obj->rot.x, - obj->rot.y, obj->rot.z, sp48.x + arg6, sp48.y, sp48.z, 1.0f); + func_effect_8007F04C(OBJ_EFFECT_353, arg1 + sp48.x + arg6, arg2 + sp48.y, arg3 + sp48.z, arg4, arg5, 0.0f, + obj->rot.x, obj->rot.y, obj->rot.z, sp48.x + arg6, sp48.y, sp48.z, 1.0f); } -void func_i3_801937D8(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot) { +void Zoness_801937D8(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot) { Vec3f sp2C; Vec3f sp20; @@ -1627,18 +1612,18 @@ void func_i3_801937D8(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot) { Object_SetInfo(&effect->info, effect->obj.id); } -void func_i3_80193908(f32 xPos, f32 yPos, f32 zPos, f32 yRot) { +void Zoness_80193908(f32 xPos, f32 yPos, f32 zPos, f32 yRot) { s32 i; for (i = 0; i < ARRAY_COUNT(gEffects); i++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i3_801937D8(&gEffects[i], xPos, yPos, zPos, yRot); + Zoness_801937D8(&gEffects[i], xPos, yPos, zPos, yRot); break; } } } -void func_i3_80193970(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot, s32 arg5) { +void Zoness_80193970(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot, s32 arg5) { Vec3f sp2C; Vec3f sp20; @@ -1664,18 +1649,18 @@ void func_i3_80193970(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot, s3 Object_SetInfo(&effect->info, effect->obj.id); } -void func_i3_80193A98(f32 xPos, f32 yPos, f32 zPos, f32 yRot, s32 arg5) { +void Zoness_80193A98(f32 xPos, f32 yPos, f32 zPos, f32 yRot, s32 arg5) { s32 i; for (i = 0; i < ARRAY_COUNT(gEffects); i++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i3_80193970(&gEffects[i], xPos, yPos, zPos, yRot, arg5); + Zoness_80193970(&gEffects[i], xPos, yPos, zPos, yRot, arg5); break; } } } -void func_i3_80193B08(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale) { +void Zoness_80193B08(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale) { f32 temp_ft2; Effect_Initialize(effect); @@ -1702,18 +1687,18 @@ void func_i3_80193B08(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale) { Object_SetInfo(&effect->info, effect->obj.id); } -void func_i3_80193C5C(f32 xPos, f32 yPos, f32 zPos, f32 scale) { +void Zoness_80193C5C(f32 xPos, f32 yPos, f32 zPos, f32 scale) { s32 i; for (i = 80; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i3_80193B08(&gEffects[i], xPos, yPos, zPos, scale); + Zoness_80193B08(&gEffects[i], xPos, yPos, zPos, scale); break; } } } -f32 func_i3_80193CC8(s32 arg0) { +f32 Zoness_80193CC8(s32 arg0) { f32 var_fv1 = arg0 * 0.5f; if (var_fv1 > 8.0f) { @@ -1722,7 +1707,7 @@ f32 func_i3_80193CC8(s32 arg0) { return var_fv1; } -s32 func_i3_80193D08(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { +s32 Zoness_80193D08(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { Boss* this = thisx; f32 temp; @@ -1866,7 +1851,7 @@ s32 func_i3_80193D08(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* t return false; } -void func_i3_80194394(s32 limbIndex, Vec3f* rot, void* thisx) { +void Zoness_80194394(s32 limbIndex, Vec3f* rot, void* thisx) { Vec3f spB4; Boss* this = thisx; Vec3f spA4 = { 96.0f, 199.0f, -9.0f }; @@ -1998,10 +1983,10 @@ void func_i3_80194394(s32 limbIndex, Vec3f* rot, void* thisx) { } } -void func_i3_801949DC(Boss* bossZO) { +void Zoness_801949DC(Boss* bossZO) { Matrix_Translate(gCalcMatrix, 0.0f, bossZO->fwork[ZO_FWK_3], 0.0f, 1); Matrix_Scale(gCalcMatrix, 2.6f, 2.6f, 2.6f, 1); - Animation_DrawSkeleton(3, D_ZO_6019E18, bossZO->vwork, func_i3_80193D08, func_i3_80194394, bossZO, gCalcMatrix); + Animation_DrawSkeleton(3, D_ZO_6019E18, bossZO->vwork, Zoness_80193D08, Zoness_80194394, bossZO, gCalcMatrix); } f32 D_i3_801BF6BC[2] = { -600.0f, -3400.0f }; @@ -2015,7 +2000,7 @@ f32 D_i3_801BF6D4[2] = { 330.0f, 30.0f }; // incorrect loading of sZoLimbTimers // compiler stack too large // https://decomp.me/scratch/jNmle -void func_i3_80194A84(Boss* bossZO) { +void Zoness_80194A84(Boss* bossZO) { f32 sp134; s32 sp130; s32 i; @@ -2054,7 +2039,7 @@ void func_i3_80194A84(Boss* bossZO) { } if (sZoSwork[ZO_BSS_24] == 0) { Math_SmoothStepToF(&sZoFwork[ZO_BSF_27], sZoFwork[ZO_BSF_26], 0.1f, 2.0f, 0.00001f); - Math_SmoothStepToF(&bossZO->obj.pos.z, gPlayer[0].camEye.z - D_80177D20 + sZoFwork[ZO_BSF_28], 0.1f, + Math_SmoothStepToF(&bossZO->obj.pos.z, gPlayer[0].camEye.z - D_ctx_80177D20 + sZoFwork[ZO_BSF_28], 0.1f, sZoFwork[ZO_BSF_27], 0.00001f); } if (!(gGameFrameCount & 3)) { @@ -2068,8 +2053,8 @@ void func_i3_80194A84(Boss* bossZO) { if (sZoSwork[ZO_BSS_43] < 0) { sZoSwork[ZO_BSS_43] = 0; } - func_i3_80193A98(sZoFwork[ZO_BSF_102_X], sZoFwork[ZO_BSF_102_Y], sZoFwork[ZO_BSF_102_Z], bossZO->obj.rot.y, - sZoSwork[ZO_BSS_43]); + Zoness_80193A98(sZoFwork[ZO_BSF_102_X], sZoFwork[ZO_BSF_102_Y], sZoFwork[ZO_BSF_102_Z], bossZO->obj.rot.y, + sZoSwork[ZO_BSS_43]); sZoSwork[ZO_BSS_44] = 255; } else { sZoSwork[ZO_BSS_44] = (s32) bossZO->obj.rot.y - 180.0f; @@ -2081,8 +2066,8 @@ void func_i3_80194A84(Boss* bossZO) { if (sZoSwork[ZO_BSS_44] < 0) { sZoSwork[ZO_BSS_44] = 0; } - func_i3_80193A98(sZoFwork[ZO_BSF_99_X], sZoFwork[ZO_BSF_99_Y], sZoFwork[ZO_BSF_99_Z], bossZO->obj.rot.y, - sZoSwork[ZO_BSS_44]); + Zoness_80193A98(sZoFwork[ZO_BSF_99_X], sZoFwork[ZO_BSF_99_Y], sZoFwork[ZO_BSF_99_Z], bossZO->obj.rot.y, + sZoSwork[ZO_BSS_44]); sZoSwork[ZO_BSS_43] = 255; } } @@ -2097,17 +2082,17 @@ void func_i3_80194A84(Boss* bossZO) { } if ((bossZO->swork[ZO_SWK_9] == 0) && (bossZO->state >= 2) && (bossZO->health != 0)) { if (bossZO->swork[ZO_SWK_10] == 0) { - func_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, 50.0f, 0.0f, 5.0f); - func_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, 46.0f, 19.0f, 5.0f); - func_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, 35.0f, 35.0f, 5.0f); - func_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, 19.0f, 46.0f, 5.0f); - func_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, 0.0f, 50.0f, 5.0f); + func_effect_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, 50.0f, 0.0f, 5.0f); + func_effect_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, 46.0f, 19.0f, 5.0f); + func_effect_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, 35.0f, 35.0f, 5.0f); + func_effect_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, 19.0f, 46.0f, 5.0f); + func_effect_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, 0.0f, 50.0f, 5.0f); } else { - func_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, -50.0f, 0.0f, 5.0f); - func_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, -46.0f, 19.0f, 5.0f); - func_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, -35.0f, 35.0f, 5.0f); - func_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, -19.0f, 46.0f, 5.0f); - func_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, 0.0f, 50.0f, 5.0f); + func_effect_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, -50.0f, 0.0f, 5.0f); + func_effect_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, -46.0f, 19.0f, 5.0f); + func_effect_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, -35.0f, 35.0f, 5.0f); + func_effect_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, -19.0f, 46.0f, 5.0f); + func_effect_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, 0.0f, 50.0f, 5.0f); } bossZO->swork[ZO_SWK_11] += 1; @@ -2127,9 +2112,9 @@ void func_i3_80194A84(Boss* bossZO) { case 0: if ((!(gGameFrameCount & 7) || (bossZO->timer_050 == 43)) && (bossZO->swork[ZO_SWK_13] == 0) && ((bossZO->swork[ZO_SWK_12] < 7) || (bossZO->timer_050 == 43))) { - D_801779A8[0] = 20.0f; - if (func_800A73E4(&sp134, &sp130, sZoFwork[ZO_BSF_43_X], sZoFwork[ZO_BSF_43_Y] - 300.0f, - sZoFwork[ZO_BSF_43_Z])) { + D_ctx_801779A8[0] = 20.0f; + if (func_play_800A73E4(&sp134, &sp130, sZoFwork[ZO_BSF_43_X], sZoFwork[ZO_BSF_43_Y] - 300.0f, + sZoFwork[ZO_BSF_43_Z])) { sp100 = 1.5f; spFC = 2.0f; if (bossZO->timer_050 == 43) { @@ -2139,10 +2124,10 @@ void func_i3_80194A84(Boss* bossZO) { AUDIO_PLAY_BGM(SEQ_ID_22 | 0x8000); sZoSwork[ZO_BSS_55] = 1; } - func_8008377C(sZoFwork[ZO_BSF_43_X], sp134, sZoFwork[ZO_BSF_43_Z] + 100.0f, 5.0f, 3.0f); - func_8008377C(sZoFwork[ZO_BSF_43_X], sp134, sZoFwork[ZO_BSF_43_Z] + 100.0f, 5.0f, 3.0f); + func_effect_8008377C(sZoFwork[ZO_BSF_43_X], sp134, sZoFwork[ZO_BSF_43_Z] + 100.0f, 5.0f, 3.0f); + func_effect_8008377C(sZoFwork[ZO_BSF_43_X], sp134, sZoFwork[ZO_BSF_43_Z] + 100.0f, 5.0f, 3.0f); } - func_8008377C(sZoFwork[ZO_BSF_43_X], sp134, sZoFwork[ZO_BSF_43_Z] + 100.0f, sp100, spFC); + func_effect_8008377C(sZoFwork[ZO_BSF_43_X], sp134, sZoFwork[ZO_BSF_43_Z] + 100.0f, sp100, spFC); if (bossZO->timer_050 == 43) { AUDIO_PLAY_SFX(0x1983201A, bossZO->sfxSource, 4); } else { @@ -2152,7 +2137,7 @@ void func_i3_80194A84(Boss* bossZO) { } } if ((bossZO->timer_050 < 43) && (bossZO->timer_050 >= 31)) { - D_801779A8[0] = 20.0f; + D_ctx_801779A8[0] = 20.0f; } Math_SmoothStepToF(&bossZO->fwork[ZO_FWK_4], 1.0f, 0.1f, 10.0f, 0.0f); if (bossZO->timer_050 == 0) { @@ -2172,17 +2157,17 @@ void func_i3_80194A84(Boss* bossZO) { break; case 1: Math_SmoothStepToF(&bossZO->fwork[ZO_FWK_4], 100.0f, 0.1f, 1.0f, 0.0f); - func_i3_8019962C(bossZO, 0.0f); + Zoness_8019962C(bossZO, 0.0f); Math_SmoothStepToF(&sZoFwork[ZO_BSF_1], sZoFwork[ZO_BSF_74], 0.1f, 2.0f, 0.00001f); Math_SmoothStepToF(&sZoFwork[ZO_BSF_11], sZoFwork[ZO_BSF_75], 0.1f, 2.0f, 0.00001f); if ((bossZO->timer_050 == 0) && !(gGameFrameCount & 3)) { if (sZoSwork[ZO_BSS_9] != 0) { - func_i3_80193908(sZoFwork[ZO_BSF_29_X], sZoFwork[ZO_BSF_29_Y], sZoFwork[ZO_BSF_29_Z], - bossZO->obj.rot.y); + Zoness_80193908(sZoFwork[ZO_BSF_29_X], sZoFwork[ZO_BSF_29_Y], sZoFwork[ZO_BSF_29_Z], + bossZO->obj.rot.y); } if (sZoSwork[ZO_BSS_10] != 0) { - func_i3_80193908(sZoFwork[ZO_BSF_32_X], sZoFwork[ZO_BSF_32_Y], sZoFwork[ZO_BSF_32_Z], - bossZO->obj.rot.y); + Zoness_80193908(sZoFwork[ZO_BSF_32_X], sZoFwork[ZO_BSF_32_Y], sZoFwork[ZO_BSF_32_Z], + bossZO->obj.rot.y); } sZoSwork[ZO_BSS_6]++; if (sZoSwork[ZO_BSS_6] > 10) { @@ -2266,7 +2251,7 @@ void func_i3_80194A84(Boss* bossZO) { } } if ((bossZO->swork[ZO_SWK_4] == 0) && ((sZoSwork[ZO_BSS_9] != 0) || (sZoSwork[ZO_BSS_10] != 0))) { - func_i3_80198ECC(bossZO); + Zoness_80198ECC(bossZO); } if ((sZoSwork[ZO_BSS_32] == 0) && (sZoSwork[ZO_BSS_34] == 1) && (sZoSwork[ZO_BSS_24] == 0)) { Radio_PlayMessage(gMsg_ID_6080, RCID_PEPPY); @@ -2274,7 +2259,7 @@ void func_i3_80194A84(Boss* bossZO) { } if (sZoSwork[ZO_BSS_4] == 0) { sZoSwork[ZO_BSS_4] = 100; - func_i3_801989FC(bossZO); + Zoness_801989FC(bossZO); } if (sZoSwork[ZO_BSS_24] != 0) { sZoSwork[ZO_BSS_20] = 1; @@ -2293,7 +2278,7 @@ void func_i3_80194A84(Boss* bossZO) { Math_SmoothStepToAngle( &bossZO->fwork[ZO_FWK_7], Math_RadToDeg(Math_Atan2F(bossZO->fwork[ZO_FWK_6] - bossZO->obj.pos.x, - gPlayer[0].camEye.z - D_80177D20 + + gPlayer[0].camEye.z - D_ctx_80177D20 + D_i3_801BF6BC[bossZO->swork[ZO_SWK_1]] - bossZO->obj.pos.z)), 0.1f, 100.0f, 0.001f); Matrix_RotateY(gCalcMatrix, bossZO->fwork[ZO_FWK_7] * M_DTOR, 0); @@ -2301,7 +2286,7 @@ void func_i3_80194A84(Boss* bossZO) { spE4.z = 20.0f; Matrix_MultVec3fNoTranslate(gCalcMatrix, &spE4, &spCC); var_s0 = 0; - bossZO->vel.z = spCC.z - D_80177D08; + bossZO->vel.z = spCC.z - D_ctx_80177D08; if (bossZO->vel.x > 0.0f) { var_s0 = 1; } @@ -2356,42 +2341,42 @@ void func_i3_80194A84(Boss* bossZO) { Math_SmoothStepToAngle(&sZoFwork[ZO_BSF_7], sp110, 0.2f, 2.0f, 0.0f); Math_SmoothStepToAngle(&sZoFwork[ZO_BSF_10], sp104, 0.2f, 2.0f, 0.0f); Math_SmoothStepToAngle(&sZoFwork[ZO_BSF_9], sp108, 0.2f, 2.0f, 0.0f); - func_i3_80198BE8(bossZO, 0); - func_i3_80198BE8(bossZO, 1); + Zoness_80198BE8(bossZO, 0); + Zoness_80198BE8(bossZO, 1); } break; case 4: if (bossZO->swork[ZO_SWK_15] == 0) { - D_80178348 = D_80178350 = D_80178354 = D_80178340 = 0; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = D_ctx_80178340 = 0; } Math_SmoothStepToAngle(&bossZO->obj.rot.z, bossZO->fwork[ZO_FWK_9], 0.1f, 100.0f, 0.00001f); Math_SmoothStepToAngle(&bossZO->fwork[ZO_FWK_9], 0.0f, 0.1f, 100.0f, 0.00001f); if ((sZoSwork[ZO_BSS_11] == 0) && (sZoLimbTimers[ZO_LIMB_7] != LIMB_DESTROYED)) { - func_i3_80198F3C(bossZO, 0, 46); + Zoness_80198F3C(bossZO, 0, 46); if (sZoFwork[ZO_BSF_17] > -400.0f) { sZoFwork[ZO_BSF_17] -= 10.0f; } else { Audio_KillSfxBySource(bossZO->sfxSource); if (bossZO->obj.rot.z > 359.0f) { if (sZoSwork[ZO_BSS_13] != 0) { - func_i3_8019907C(bossZO); + Zoness_8019907C(bossZO); } else { - func_i3_8019914C(bossZO, 0); + Zoness_8019914C(bossZO, 0); } } } } if ((sZoSwork[ZO_BSS_12] == 0) && (sZoLimbTimers[ZO_LIMB_11] != LIMB_DESTROYED)) { - func_i3_80198F3C(bossZO, 1, 49); + Zoness_80198F3C(bossZO, 1, 49); if (sZoFwork[ZO_BSF_18] > -400.0f) { sZoFwork[ZO_BSF_18] -= 10.0f; } else { Audio_KillSfxBySource(bossZO->sfxSource); if (bossZO->obj.rot.z < 1.0f) { if (sZoSwork[ZO_BSS_13] != 0) { - func_i3_8019907C(bossZO); + Zoness_8019907C(bossZO); } else { - func_i3_8019914C(bossZO, 1); + Zoness_8019914C(bossZO, 1); } } } @@ -2403,12 +2388,12 @@ void func_i3_80194A84(Boss* bossZO) { switch (sZoSwork[ZO_BSS_16]) { case 0: if (sZoSwork[ZO_BSS_13] != 0) { - func_i3_8019962C(bossZO, 180.0f); + Zoness_8019962C(bossZO, 180.0f); if (bossZO->obj.rot.y == 180.0f) { if ((sZoSwork[ZO_BSS_11] == 0) && (sZoLimbTimers[ZO_LIMB_7] != LIMB_DESTROYED)) { - func_i3_801991D0(bossZO, 0); + Zoness_801991D0(bossZO, 0); } else { - func_i3_801991D0(bossZO, 1); + Zoness_801991D0(bossZO, 1); } } } else { @@ -2416,22 +2401,22 @@ void func_i3_80194A84(Boss* bossZO) { sZoSwork[ZO_BSS_36]++; sZoFwork[ZO_BSF_77] = 0.0f; } - func_i3_8019962C(bossZO, 0.0f); + Zoness_8019962C(bossZO, 0.0f); if (bossZO->obj.rot.y == 0.0f) { if (sZoSwork[ZO_BSS_11] == 0) { - func_i3_8019914C(bossZO, 0); + Zoness_8019914C(bossZO, 0); } if (sZoSwork[ZO_BSS_12] == 0) { - func_i3_8019914C(bossZO, 1); + Zoness_8019914C(bossZO, 1); } } } break; case 1: - func_i3_80199470(bossZO, 0); + Zoness_80199470(bossZO, 0); break; case 2: - func_i3_80199470(bossZO, 1); + Zoness_80199470(bossZO, 1); break; case 3: if (sZoSwork[ZO_BSS_13] != 0) { @@ -2439,7 +2424,7 @@ void func_i3_80194A84(Boss* bossZO) { Math_SmoothStepToF(&sZoFwork[ZO_BSF_4], 0.0f, 1.0f, 5.0f, 0.001f); Math_SmoothStepToF(&sZoFwork[ZO_BSF_3], 0.0f, 1.0f, 3.0f, 0.001f); if (sZoFwork[ZO_BSF_3] == 0.0f) { - func_i3_8019962C(bossZO, 0.0f); + Zoness_8019962C(bossZO, 0.0f); if (bossZO->obj.rot.y == 0.0f) { sZoSwork[ZO_BSS_16] = 0; bossZO->swork[ZO_SWK_4] = 1000; @@ -2452,7 +2437,7 @@ void func_i3_80194A84(Boss* bossZO) { sZoSwork[ZO_BSS_36]++; sZoFwork[ZO_BSF_77] = 0.0f; } - func_i3_8019962C(bossZO, 0.0f); + Zoness_8019962C(bossZO, 0.0f); if (bossZO->obj.rot.y == 0.0f) { sZoSwork[ZO_BSS_16] = 0; sZoSwork[ZO_BSS_36] = 0; @@ -2465,16 +2450,16 @@ void func_i3_80194A84(Boss* bossZO) { } break; case 6: - D_801779A8[0] = 20.0f; - if (D_80178480 == 0) { - D_80178348 = D_80178350 = D_80178354 = 255; - D_80178340 = D_80178358 = 255; - D_80178358 = 0; - D_8017835C = 25; - D_80178480 = (s32) (RAND_FLOAT(20.0f) + 20.0f); + D_ctx_801779A8[0] = 20.0f; + if (D_ctx_80178480 == 0) { + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; + D_ctx_80178340 = D_ctx_80178358 = 255; + D_ctx_80178358 = 0; + D_ctx_8017835C = 25; + D_ctx_80178480 = (s32) (RAND_FLOAT(20.0f) + 20.0f); } - if (D_80178480 == 29) { - D_80178348 = D_80178350 = D_80178354 = D_80178340 = 0; + if (D_ctx_80178480 == 29) { + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = D_ctx_80178340 = 0; } if (!(gGameFrameCount & 3)) { spE4.x = RAND_FLOAT_CENTERED(300.0f) + bossZO->obj.pos.x; @@ -2484,9 +2469,9 @@ void func_i3_80194A84(Boss* bossZO) { spD8.y = Math_ModF(RAND_FLOAT_CENTERED(60.0f) + 360.0f, 360.0f); spD8.z = bossZO->obj.rot.z; for (i = 0; i < 5; i++) { - func_i3_801900FC(&spE4, &spD8, RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(20.0f), - RAND_FLOAT_CENTERED(30.0f), 4, 1.0f, RAND_FLOAT(15.0f) + (bossZO->unk_3F8 * 10.0f), - 0); + Zoness_801900FC(&spE4, &spD8, RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(20.0f), + RAND_FLOAT_CENTERED(30.0f), 4, 1.0f, RAND_FLOAT(15.0f) + (bossZO->unk_3F8 * 10.0f), + 0); } } bossZO->vel.x = 0.0f; @@ -2495,10 +2480,10 @@ void func_i3_80194A84(Boss* bossZO) { sZoLimbTimers[ZO_LIMB_36] = 15; sZoLimbTimers[ZO_LIMB_25] = 15; } - func_8007C120(sZoFwork[ZO_BSF_55_X], sZoFwork[ZO_BSF_55_Y], sZoFwork[ZO_BSF_55_Z], bossZO->vel.x, - bossZO->vel.y, bossZO->vel.z, 0.2f, 10); - func_8007D0E0(sZoFwork[ZO_BSF_55_X] + RAND_FLOAT_CENTERED(200.0f), - sZoFwork[ZO_BSF_55_Y] + RAND_RANGE(-160.0f, 640.0f), sZoFwork[ZO_BSF_55_Z], 10.0f); + func_effect_8007C120(sZoFwork[ZO_BSF_55_X], sZoFwork[ZO_BSF_55_Y], sZoFwork[ZO_BSF_55_Z], bossZO->vel.x, + bossZO->vel.y, bossZO->vel.z, 0.2f, 10); + func_effect_8007D0E0(sZoFwork[ZO_BSF_55_X] + RAND_FLOAT_CENTERED(200.0f), + sZoFwork[ZO_BSF_55_Y] + RAND_RANGE(-160.0f, 640.0f), sZoFwork[ZO_BSF_55_Z], 10.0f); if (bossZO->timer_050 == 30) { Radio_PlayMessage(gMsg_ID_6079, RCID_BOSS_ZONESS); } @@ -2507,7 +2492,7 @@ void func_i3_80194A84(Boss* bossZO) { sZoFwork[ZO_BSF_25] = -1000.0f; sZoFwork[ZO_BSF_23] = 10.0f; gShowBossHealth = 0; - func_8007A568(bossZO->obj.pos.x, bossZO->obj.pos.y, bossZO->obj.pos.z, 80.0f); + func_effect_8007A568(bossZO->obj.pos.x, bossZO->obj.pos.y, bossZO->obj.pos.z, 80.0f); if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) || (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_5)) { gCsFrameCount = 0; gPlayer[0].state_1C8 = PLAYERSTATE_1C8_7; @@ -2520,21 +2505,21 @@ void func_i3_80194A84(Boss* bossZO) { gPlayer[0].unk_0E8 += 360.0f; } gPlayer[0].unk_114 = 0.0f; - func_8004319C(&gPlayer[0], bossZO->obj.pos.x, 0.0f, bossZO->obj.pos.z); + func_boss_8004319C(&gPlayer[0], bossZO->obj.pos.x, 0.0f, bossZO->obj.pos.z); } bossZO->timer_050 = 70; sZoSwork[ZO_BSS_5] = 0; - D_80178348 = D_80178350 = D_80178354 = D_80178340 = 0; - func_80042EC0(bossZO); + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = D_ctx_80178340 = 0; + func_boss_80042EC0(bossZO); bossZO->state = 7; } break; case 7: - D_801779A8[0] = 20.0f; + D_ctx_801779A8[0] = 20.0f; if (!(gGameFrameCount & 7) && - (func_800A73E4(&sp134, &sp130, bossZO->obj.pos.x, -300.0f, bossZO->obj.pos.z) != 0)) { - func_8008377C(RAND_FLOAT_CENTERED(500.0f) + bossZO->obj.pos.x, sp134 - 300.0f, - RAND_FLOAT_CENTERED(3000.0f) + bossZO->obj.pos.z, 5.0f, 2.0f); + (func_play_800A73E4(&sp134, &sp130, bossZO->obj.pos.x, -300.0f, bossZO->obj.pos.z) != 0)) { + func_effect_8008377C(RAND_FLOAT_CENTERED(500.0f) + bossZO->obj.pos.x, sp134 - 300.0f, + RAND_FLOAT_CENTERED(3000.0f) + bossZO->obj.pos.z, 5.0f, 2.0f); } if ((bossZO->timer_050 == 0) || (bossZO->obj.pos.y < -800.0f)) { Object_Kill(&bossZO->obj, bossZO->sfxSource); @@ -2546,7 +2531,7 @@ void func_i3_80194A84(Boss* bossZO) { ((sZoSwork[ZO_BSS_33] == 0) || (sZoSwork[ZO_BSS_33] >= 30))) { sZoSwork[ZO_BSS_18]--; } - func_i3_8019962C(bossZO, 0.0f); + Zoness_8019962C(bossZO, 0.0f); Math_SmoothStepToF(&sZoFwork[ZO_BSF_1], -130.0f, 0.1f, 2.0f, 0.00001f); Math_SmoothStepToF(&sZoFwork[ZO_BSF_11], 130.0f, 0.1f, 2.0f, 0.00001f); if (sZoSwork[ZO_BSS_18] < 331) { @@ -2586,7 +2571,7 @@ void func_i3_80194A84(Boss* bossZO) { bossZO->timer_050 = 50; sZoFwork[ZO_BSF_37_X] = RAND_RANGE(-330.0f, 770.0f); sZoFwork[ZO_BSF_40_X] = RAND_RANGE(-560.0f, 240.0f); - func_i3_801989FC(bossZO); + Zoness_801989FC(bossZO); } } else { if (sZoSwork[ZO_BSS_28] == 0) { @@ -2603,7 +2588,7 @@ void func_i3_80194A84(Boss* bossZO) { sZoFwork[ZO_BSF_16]; for (i = 0; i < 2; i++) { - func_i3_80199394(bossZO, i); + Zoness_80199394(bossZO, i); } bossZO->timer_050 = 100; bossZO->state = 0; @@ -2658,10 +2643,10 @@ void func_i3_80194A84(Boss* bossZO) { if ((bossZO->obj.rot.y >= 330.0f) || (bossZO->obj.rot.y <= 30.0f) || ((bossZO->obj.rot.y <= 200.0f) && (bossZO->obj.rot.y >= 160.0f))) { if ((sZoFwork[ZO_BSF_15] > 315.0f) || (sZoFwork[ZO_BSF_15] < 215.0f)) { - func_i3_801986FC(bossZO, 0, sp78.x, sp78.y, sp78.z, sZoFwork[ZO_BSF_5]); + Zoness_801986FC(bossZO, 0, sp78.x, sp78.y, sp78.z, sZoFwork[ZO_BSF_5]); } if ((sZoFwork[ZO_BSF_16] < 45.0f) || (sZoFwork[ZO_BSF_16] > 145.0f)) { - func_i3_801986FC(bossZO, 1, sp6C.x, sp6C.y, sp6C.z, sZoFwork[ZO_BSF_12]); + Zoness_801986FC(bossZO, 1, sp6C.x, sp6C.y, sp6C.z, sZoFwork[ZO_BSF_12]); } Math_SmoothStepToF(&sZoFwork[ZO_BSF_35], 0.0f, 1.0f, 2.0f, 0.00001f); Math_SmoothStepToF(&sZoFwork[ZO_BSF_36], 0.0f, 1.0f, 2.0f, 0.00001f); @@ -2677,11 +2662,11 @@ void func_i3_80194A84(Boss* bossZO) { sZoFwork[ZO_BSF_86] += 5.0f; sZoFwork[ZO_BSF_87] -= 10.0f; sZoFwork[ZO_BSF_88] += 20.0f; - func_8007D0E0(sZoFwork[ZO_BSF_43_X], sZoFwork[ZO_BSF_43_Y], sZoFwork[ZO_BSF_43_Z], 5.0f); - if ((func_800A73E4(&sp134, &sp130, sZoFwork[ZO_BSF_43_X], sZoFwork[ZO_BSF_43_Y] - 100.0f, - sZoFwork[ZO_BSF_43_Z]) != 0) && + func_effect_8007D0E0(sZoFwork[ZO_BSF_43_X], sZoFwork[ZO_BSF_43_Y], sZoFwork[ZO_BSF_43_Z], 5.0f); + if ((func_play_800A73E4(&sp134, &sp130, sZoFwork[ZO_BSF_43_X], sZoFwork[ZO_BSF_43_Y] - 100.0f, + sZoFwork[ZO_BSF_43_Z]) != 0) && (sZoSwork[ZO_BSS_45] == 0)) { - func_8008377C(sZoFwork[ZO_BSF_43_X], sp134, sZoFwork[ZO_BSF_43_Z] + 30.0f, 0.0f, 2.0f); + func_effect_8008377C(sZoFwork[ZO_BSF_43_X], sp134, sZoFwork[ZO_BSF_43_Z] + 30.0f, 0.0f, 2.0f); sZoSwork[ZO_BSS_45]++; } } @@ -2694,11 +2679,11 @@ void func_i3_80194A84(Boss* bossZO) { sZoFwork[ZO_BSF_80] -= 5.0f; sZoFwork[ZO_BSF_81] += 12.0f; sZoFwork[ZO_BSF_82] -= 10.0f; - func_8007D0E0(sZoFwork[ZO_BSF_29_X], sZoFwork[ZO_BSF_29_Y], sZoFwork[ZO_BSF_29_Z], 5.0f); - if ((func_800A73E4(&sp134, &sp130, sZoFwork[ZO_BSF_29_X], sZoFwork[ZO_BSF_29_Y] - 100.0f, - sZoFwork[ZO_BSF_29_Z]) != 0) && + func_effect_8007D0E0(sZoFwork[ZO_BSF_29_X], sZoFwork[ZO_BSF_29_Y], sZoFwork[ZO_BSF_29_Z], 5.0f); + if ((func_play_800A73E4(&sp134, &sp130, sZoFwork[ZO_BSF_29_X], sZoFwork[ZO_BSF_29_Y] - 100.0f, + sZoFwork[ZO_BSF_29_Z]) != 0) && (sZoSwork[ZO_BSS_46] == 0)) { - func_8008377C(sZoFwork[ZO_BSF_29_X], sp134, sZoFwork[ZO_BSF_29_Z] + 30.0f, 0.0f, 2.0f); + func_effect_8008377C(sZoFwork[ZO_BSF_29_X], sp134, sZoFwork[ZO_BSF_29_Z] + 30.0f, 0.0f, 2.0f); sZoSwork[ZO_BSS_46]++; } } @@ -2711,21 +2696,21 @@ void func_i3_80194A84(Boss* bossZO) { sZoFwork[ZO_BSF_83] -= 5.0f; sZoFwork[ZO_BSF_84] += 12.0f; sZoFwork[ZO_BSF_85] -= 10.0f; - func_8007D0E0(sZoFwork[ZO_BSF_32_X], sZoFwork[ZO_BSF_32_Y], sZoFwork[ZO_BSF_32_Z], 5.0f); - if ((func_800A73E4(&sp134, &sp130, sZoFwork[ZO_BSF_32_X], sZoFwork[ZO_BSF_32_Y] - 100.0f, - sZoFwork[ZO_BSF_32_Z]) != 0) && + func_effect_8007D0E0(sZoFwork[ZO_BSF_32_X], sZoFwork[ZO_BSF_32_Y], sZoFwork[ZO_BSF_32_Z], 5.0f); + if ((func_play_800A73E4(&sp134, &sp130, sZoFwork[ZO_BSF_32_X], sZoFwork[ZO_BSF_32_Y] - 100.0f, + sZoFwork[ZO_BSF_32_Z]) != 0) && (sZoSwork[ZO_BSS_47] == 0)) { - func_8008377C(sZoFwork[ZO_BSF_32_X], sp134, sZoFwork[ZO_BSF_32_Z] + 30.0f, 0.0f, 2.0f); + func_effect_8008377C(sZoFwork[ZO_BSF_32_X], sp134, sZoFwork[ZO_BSF_32_Z] + 30.0f, 0.0f, 2.0f); sZoSwork[ZO_BSS_47]++; } } } if ((sZoSwork[ZO_BSS_13] < 2) && (sZoLimbTimers[ZO_LIMB_5] != LIMB_DESTROYED)) { - D_801779A8[0] = 20.0f; + D_ctx_801779A8[0] = 20.0f; if (!(gGameFrameCount & 1)) { - func_8007D0E0(sZoFwork[ZO_BSF_52_X] + RAND_FLOAT_CENTERED(200.0f), - sZoFwork[ZO_BSF_52_Y] + RAND_FLOAT_CENTERED(200.0f), - sZoFwork[ZO_BSF_52_Z] + RAND_FLOAT_CENTERED(100.0f), 5.0f); + func_effect_8007D0E0(sZoFwork[ZO_BSF_52_X] + RAND_FLOAT_CENTERED(200.0f), + sZoFwork[ZO_BSF_52_Y] + RAND_FLOAT_CENTERED(200.0f), + sZoFwork[ZO_BSF_52_Z] + RAND_FLOAT_CENTERED(100.0f), 5.0f); } if (bossZO->swork[ZO_SWK_14] != 0) { if (sZoLimbTimers[ZO_LIMB_5] == 0) { @@ -2743,11 +2728,11 @@ void func_i3_80194A84(Boss* bossZO) { sZoFwork[ZO_BSF_90] -= 2.0f; sZoFwork[ZO_BSF_91] -= 5.0f; sZoFwork[ZO_BSF_92] -= 5.0f; - func_8007D0E0(sZoFwork[ZO_BSF_52_X], sZoFwork[ZO_BSF_52_Y], sZoFwork[ZO_BSF_52_Z], 5.0f); - if ((func_800A73E4(&sp134, &sp130, sZoFwork[ZO_BSF_52_X], sZoFwork[ZO_BSF_52_Y] - 100.0f, - sZoFwork[ZO_BSF_52_Z]) != 0) && + func_effect_8007D0E0(sZoFwork[ZO_BSF_52_X], sZoFwork[ZO_BSF_52_Y], sZoFwork[ZO_BSF_52_Z], 5.0f); + if ((func_play_800A73E4(&sp134, &sp130, sZoFwork[ZO_BSF_52_X], sZoFwork[ZO_BSF_52_Y] - 100.0f, + sZoFwork[ZO_BSF_52_Z]) != 0) && (sZoSwork[ZO_BSS_48] == 0)) { - func_8008377C(sZoFwork[ZO_BSF_52_X], sp134, sZoFwork[ZO_BSF_52_Z] + 100.0f, 0.0f, 2.0f); + func_effect_8008377C(sZoFwork[ZO_BSF_52_X], sp134, sZoFwork[ZO_BSF_52_Z] + 100.0f, 0.0f, 2.0f); sZoSwork[ZO_BSS_48]++; } } @@ -2785,7 +2770,7 @@ void func_i3_80194A84(Boss* bossZO) { spD8.x = sZoFwork[ZO_BSF_29_X]; spD8.y = sZoFwork[ZO_BSF_29_Y]; spD8.z = sZoFwork[ZO_BSF_29_Z]; - func_8007A6F0(&spD8, 0x2903A008); + func_effect_8007A6F0(&spD8, 0x2903A008); } } break; @@ -2801,7 +2786,7 @@ void func_i3_80194A84(Boss* bossZO) { spD8.x = sZoFwork[ZO_BSF_32_X]; spD8.y = sZoFwork[ZO_BSF_32_Y]; spD8.z = sZoFwork[ZO_BSF_32_Z]; - func_8007A6F0(&spD8, 0x2903A008); + func_effect_8007A6F0(&spD8, 0x2903A008); } } break; @@ -2817,7 +2802,7 @@ void func_i3_80194A84(Boss* bossZO) { spD8.x = sZoFwork[ZO_BSF_29_X]; spD8.y = sZoFwork[ZO_BSF_29_Y]; spD8.z = sZoFwork[ZO_BSF_29_Z]; - func_8007A6F0(&spD8, 0x2903A008); + func_effect_8007A6F0(&spD8, 0x2903A008); } } if ((sZoSwork[ZO_BSS_10] != 0) && (bossZO->state == 3) && (dmgType == DMG_BOMB) && @@ -2831,7 +2816,7 @@ void func_i3_80194A84(Boss* bossZO) { spD8.x = sZoFwork[ZO_BSF_32_X]; spD8.y = sZoFwork[ZO_BSF_32_Y]; spD8.z = sZoFwork[ZO_BSF_32_Z]; - func_8007A6F0(&spD8, 0x2903A008); + func_effect_8007A6F0(&spD8, 0x2903A008); } } /* fallthrough */ @@ -2847,7 +2832,7 @@ void func_i3_80194A84(Boss* bossZO) { AUDIO_PLAY_SFX(0x29034003, bossZO->sfxSource, 4); } if (bossZO->health <= 0) { - D_8017796C = -1; + D_ctx_8017796C = -1; SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 40); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 40); Audio_KillSfxBySource(bossZO->sfxSource); @@ -2876,7 +2861,7 @@ void func_i3_80194A84(Boss* bossZO) { spD8.x = sZoFwork[ZO_BSF_52_X]; spD8.y = sZoFwork[ZO_BSF_52_Y]; spD8.z = sZoFwork[ZO_BSF_52_Z]; - func_8007A6F0(&spD8, 0x2940983C); + func_effect_8007A6F0(&spD8, 0x2940983C); } } break; @@ -2889,16 +2874,16 @@ void func_i3_80194A84(Boss* bossZO) { sZoSwork[ZO_BSS_11] -= bossZO->damage; if (sZoSwork[ZO_BSS_11] <= 0) { sZoSwork[ZO_BSS_11] = 0; - D_80178480 = 30; - D_80178348 = D_80178350 = D_80178354 = 255; - D_80178340 = D_80178358 = 255; - D_80178358 = 0; - D_8017835C = 25; + D_ctx_80178480 = 30; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; + D_ctx_80178340 = D_ctx_80178358 = 255; + D_ctx_80178358 = 0; + D_ctx_8017835C = 25; bossZO->swork[ZO_SWK_15] = 3; spD8.x = sZoFwork[ZO_BSF_106_X]; spD8.y = sZoFwork[ZO_BSF_106_Y]; spD8.z = sZoFwork[ZO_BSF_106_Z]; - func_8007A6F0(&spD8, 0x2940983C); + func_effect_8007A6F0(&spD8, 0x2940983C); sZoSwork[ZO_BSS_16] = 0; ZO_HIT_8(bossZO, 0)->z.offset = ZO_HIT_10(bossZO, 0)->z.offset = 100000.0f; bossZO->state = 4; @@ -2915,16 +2900,16 @@ void func_i3_80194A84(Boss* bossZO) { sZoSwork[ZO_BSS_12] -= bossZO->damage; if (sZoSwork[ZO_BSS_12] <= 0) { sZoSwork[ZO_BSS_12] = 0; - D_80178480 = 30; - D_80178348 = D_80178350 = D_80178354 = 255; - D_80178340 = D_80178358 = 255; - D_80178358 = 0; - D_8017835C = 25; + D_ctx_80178480 = 30; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; + D_ctx_80178340 = D_ctx_80178358 = 255; + D_ctx_80178358 = 0; + D_ctx_8017835C = 25; bossZO->swork[ZO_SWK_15] = 3; spCC.x = sZoFwork[ZO_BSF_109_X]; spCC.y = sZoFwork[ZO_BSF_109_Y]; spCC.z = sZoFwork[ZO_BSF_109_Z]; - func_8007A6F0(&spCC, 0x2940983C); + func_effect_8007A6F0(&spCC, 0x2940983C); sZoSwork[ZO_BSS_16] = 0; ZO_HIT_8(bossZO, 1)->z.offset = ZO_HIT_10(bossZO, 1)->z.offset = 100000.0f; bossZO->state = 4; @@ -2997,45 +2982,45 @@ void func_i3_80194A84(Boss* bossZO) { spCC.y = sZoFwork[ZO_BSF_109_Y]; spCC.z = sZoFwork[ZO_BSF_109_Z]; if ((sZoSwork[ZO_BSS_53] & 1) && (sZoSwork[ZO_BSS_11] != 0)) { - func_8007A6F0(&spD8, 0x29034003); + func_effect_8007A6F0(&spD8, 0x29034003); } if ((sZoSwork[ZO_BSS_54] & 1) && (sZoSwork[ZO_BSS_12] != 0)) { - func_8007A6F0(&spCC, 0x29034003); + func_effect_8007A6F0(&spCC, 0x29034003); } } if (sZoSwork[ZO_BSS_50] & 1) { spD8.x = sZoFwork[ZO_BSF_29_X]; spD8.y = sZoFwork[ZO_BSF_29_Y]; spD8.z = sZoFwork[ZO_BSF_29_Z]; - func_8007A6F0(&spD8, 0x2903300E); + func_effect_8007A6F0(&spD8, 0x2903300E); } if (sZoSwork[ZO_BSS_51] & 1) { spD8.x = sZoFwork[ZO_BSF_32_X]; spD8.y = sZoFwork[ZO_BSF_32_Y]; spD8.z = sZoFwork[ZO_BSF_32_Z]; - func_8007A6F0(&spD8, 0x2903300E); + func_effect_8007A6F0(&spD8, 0x2903300E); } if (sZoSwork[ZO_BSS_52] & 1) { spD8.x = sZoFwork[ZO_BSF_52_X]; spD8.y = sZoFwork[ZO_BSF_52_Y]; spD8.z = sZoFwork[ZO_BSF_52_Z]; - func_8007A6F0(&spD8, 0x29034003); + func_effect_8007A6F0(&spD8, 0x29034003); } - if (func_800A73E4(&sp134, &sp130, bossZO->obj.pos.x, bossZO->obj.pos.y - 500.0f, bossZO->obj.pos.z) != 0) { + if (func_play_800A73E4(&sp134, &sp130, bossZO->obj.pos.x, bossZO->obj.pos.y - 500.0f, bossZO->obj.pos.z) != 0) { Math_SmoothStepToF(&bossZO->obj.pos.y, sp134 - 20.0f, 0.1f, bossZO->fwork[ZO_FWK_4], 0.0f); bossZO->fwork[ZO_FWK_1] = SIN_DEG(gGameFrameCount * 7.0f) * 12.0f; bossZO->fwork[ZO_FWK_2] = COS_DEG(gGameFrameCount * 9.0f) * 12.0f; bossZO->fwork[ZO_FWK_3] = SIN_DEG(gGameFrameCount * 10.0f) * 30.0f; if ((bossZO->timer_054 == 0) && (sZoSwork[ZO_BSS_5] < 2)) { - func_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, 50.0f, 0.0f, 5.0f); - func_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, 46.0f, 19.0f, 5.0f); - func_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, 35.0f, 35.0f, 5.0f); - func_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, 19.0f, 46.0f, 5.0f); - func_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, 0.0f, 50.0f, 5.0f); - func_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, -50.0f, 0.0f, 5.0f); - func_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, -46.0f, 19.0f, 5.0f); - func_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, -35.0f, 35.0f, 5.0f); - func_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, -19.0f, 46.0f, 5.0f); + func_effect_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, 50.0f, 0.0f, 5.0f); + func_effect_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, 46.0f, 19.0f, 5.0f); + func_effect_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, 35.0f, 35.0f, 5.0f); + func_effect_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, 19.0f, 46.0f, 5.0f); + func_effect_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, 0.0f, 50.0f, 5.0f); + func_effect_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, -50.0f, 0.0f, 5.0f); + func_effect_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, -46.0f, 19.0f, 5.0f); + func_effect_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, -35.0f, 35.0f, 5.0f); + func_effect_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, -19.0f, 46.0f, 5.0f); bossZO->timer_054 = 20; sZoSwork[ZO_BSS_5]++; } @@ -3073,7 +3058,7 @@ void func_i3_80194A84(Boss* bossZO) { for (sp124 = 0; sp124 < 6; sp124++) { // may be using pointer iterators sZoFwork[ZO_BSF_112 + sp124] = - SIN_DEG(sZoSwork[ZO_BSS_49 + sp124] * 50.0f) * func_i3_80193CC8(sZoSwork[ZO_BSS_49 + sp124]); + SIN_DEG(sZoSwork[ZO_BSS_49 + sp124] * 50.0f) * Zoness_80193CC8(sZoSwork[ZO_BSS_49 + sp124]); } } #else @@ -3083,10 +3068,10 @@ Vec3f D_i3_801BF6F4 = { 0.0f, 0.0f, 0.0f }; Vec3f D_i3_801BF700 = { 0.0f, 0.0f, 0.0f }; Vec3f D_i3_801BF70C = { 0.0f, 0.0f, 40.0f }; // OBJ_BOSS_ZO action -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i3/fox_zo/func_i3_80194A84.s") +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i3/fox_zo/Zoness_80194A84.s") #endif -void func_i3_801986FC(Boss* bossZO, s32 arg1, f32 xOff, f32 yOff, f32 zOff, f32 yRot) { +void Zoness_801986FC(Boss* bossZO, s32 arg1, f32 xOff, f32 yOff, f32 zOff, f32 yRot) { Actor* newActor; Vec3f sp60 = { 0.0f, 0.0f, 50.0f }; Vec3f sp54; @@ -3103,7 +3088,7 @@ void func_i3_801986FC(Boss* bossZO, s32 arg1, f32 xOff, f32 yOff, f32 zOff, f32 } for (sp50 = 0, newActor = gActors; sp50 < 60; sp50++, newActor++) { if (newActor->obj.status == OBJ_FREE) { - D_801779A8[0] = 20.0f; + D_ctx_801779A8[0] = 20.0f; Actor_Initialize(newActor); newActor->obj.status = OBJ_INIT; newActor->obj.id = OBJ_ACTOR_245; @@ -3124,8 +3109,8 @@ void func_i3_801986FC(Boss* bossZO, s32 arg1, f32 xOff, f32 yOff, f32 zOff, f32 sZoFwork[ZO_BSF_35 + arg1] = 40.0f; AUDIO_PLAY_SFX(0x2903203B, bossZO->sfxSource, 4); for (sp50 = 0; sp50 < 4; sp50++) { - func_i3_80193C5C(newActor->obj.pos.x + (sp54.x * 4.3f), newActor->obj.pos.y + (sp54.y * 4.3f), - newActor->obj.pos.z + (sp54.z * 4.3f) + 100.0f, 30.0f); + Zoness_80193C5C(newActor->obj.pos.x + (sp54.x * 4.3f), newActor->obj.pos.y + (sp54.y * 4.3f), + newActor->obj.pos.z + (sp54.z * 4.3f) + 100.0f, 30.0f); } break; } @@ -3136,7 +3121,7 @@ void func_i3_801986FC(Boss* bossZO, s32 arg1, f32 xOff, f32 yOff, f32 zOff, f32 } } -void func_i3_801989FC(Boss* bossZO) { +void Zoness_801989FC(Boss* bossZO) { s32 i; Vec3f sp70 = { 0.0f, 0.0f, 20.0f }; Vec3f sp64; @@ -3171,7 +3156,7 @@ void func_i3_801989FC(Boss* bossZO) { } } -void func_i3_80198BE8(Boss* bossZO, s32 arg1) { +void Zoness_80198BE8(Boss* bossZO, s32 arg1) { s32 var_s1; Effect* effect; Vec3f sp3C = { 0.0f, 0.0f, 100.0f }; @@ -3210,7 +3195,7 @@ void func_i3_80198BE8(Boss* bossZO, s32 arg1) { Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp3C, &sp30); effect->vel.x = sp30.x; effect->vel.y = sp30.y; - effect->vel.z = sp30.z - D_80177D08; + effect->vel.z = sp30.z - D_ctx_80177D08; Object_SetInfo(&effect->info, effect->obj.id); break; } @@ -3221,7 +3206,7 @@ void func_i3_80198BE8(Boss* bossZO, s32 arg1) { } } -void func_i3_80198ECC(Boss* bossZO) { +void Zoness_80198ECC(Boss* bossZO) { sZoSwork[ZO_BSS_18] = 500; bossZO->timer_050 = 100; bossZO->timer_054 = 0; @@ -3234,20 +3219,20 @@ void func_i3_80198ECC(Boss* bossZO) { bossZO->fwork[ZO_FWK_4] = 1.0f; } -void func_i3_80198F3C(Boss* bossZO, s32 arg1, s32 arg2) { +void Zoness_80198F3C(Boss* bossZO, s32 arg1, s32 arg2) { if ((!(gGameFrameCount & 7) && (Rand_ZeroOne() < 0.5f))) { sZoLimbTimers[ZO_LIMB_7 + 4 * arg1] = sZoLimbTimers[ZO_LIMB_21 + 2 * arg1] = sZoLimbTimers[ZO_LIMB_22 + 2 * arg1] = 15; } - func_8007D0E0(sZoFwork[ZO_BSF_0 + arg2] + RAND_FLOAT_CENTERED(400.0f), - sZoFwork[ZO_BSF_1 + arg2] + RAND_RANGE(-160.0f, 640.0f), sZoFwork[ZO_BSF_2 + arg2], 7.0f); + func_effect_8007D0E0(sZoFwork[ZO_BSF_0 + arg2] + RAND_FLOAT_CENTERED(400.0f), + sZoFwork[ZO_BSF_1 + arg2] + RAND_RANGE(-160.0f, 640.0f), sZoFwork[ZO_BSF_2 + arg2], 7.0f); if (!(gGameFrameCount & 1)) { - func_8007C120(sZoFwork[ZO_BSF_0 + arg2], sZoFwork[ZO_BSF_1 + arg2], sZoFwork[ZO_BSF_2 + arg2], bossZO->vel.x, - bossZO->vel.y, bossZO->vel.z, 0.2f, 10); + func_effect_8007C120(sZoFwork[ZO_BSF_0 + arg2], sZoFwork[ZO_BSF_1 + arg2], sZoFwork[ZO_BSF_2 + arg2], + bossZO->vel.x, bossZO->vel.y, bossZO->vel.z, 0.2f, 10); } } -void func_i3_8019907C(Boss* bossZO) { +void Zoness_8019907C(Boss* bossZO) { if ((sZoSwork[ZO_BSS_9] == 0) && (sZoSwork[ZO_BSS_10] == 0)) { if ((sZoSwork[ZO_BSS_31] == 0) && (sZoSwork[ZO_BSS_30] != 0)) { Radio_PlayMessage(gMsg_ID_6082, RCID_PEPPY); @@ -3262,11 +3247,11 @@ void func_i3_8019907C(Boss* bossZO) { bossZO->state = 5; } else { - func_i3_80198ECC(bossZO); + Zoness_80198ECC(bossZO); } } -void func_i3_8019914C(Boss* bossZO, s32 arg1) { +void Zoness_8019914C(Boss* bossZO, s32 arg1) { sZoLimbTimers[ZO_LIMB_7 + 4 * arg1] = sZoLimbTimers[ZO_LIMB_21 + arg1 * 2] = sZoLimbTimers[ZO_LIMB_22 + arg1 * 2] = LIMB_DESTROYED; sZoFwork[ZO_BSF_77] = 0.0f; @@ -3281,7 +3266,7 @@ void func_i3_8019914C(Boss* bossZO, s32 arg1) { f32 D_i3_801BF73C[2] = { -80.0f, 80.0f }; -void func_i3_801991D0(Boss* bossZO, s32 arg1) { +void Zoness_801991D0(Boss* bossZO, s32 arg1) { Math_SmoothStepToF(&sZoFwork[ZO_BSF_4], D_i3_801BF73C[arg1], 1.0f, 5.0f, 0.001f); if (sZoFwork[ZO_BSF_4] == D_i3_801BF73C[arg1]) { Math_SmoothStepToF(&sZoFwork[ZO_BSF_3], -30.0f, 1.0f, 3.0f, 0.001f); @@ -3313,7 +3298,7 @@ void func_i3_801991D0(Boss* bossZO, s32 arg1) { #define ZO_HIT_8_2(bossZO, index) ((Hitbox*) (ZO_HIT_7(bossZO) + 1) + (index)) #define ZO_HIT_10_2(bossZO, index) ((Hitbox*) (ZO_HIT_8(bossZO, 0) + 2) + (index)) -void func_i3_80199394(Boss* bossZO, s32 arg1) { +void Zoness_80199394(Boss* bossZO, s32 arg1) { sZoSwork[ZO_BSS_11 + arg1] = 20; ZO_HIT_8(bossZO, arg1)->z.offset = -213.2f; @@ -3324,7 +3309,7 @@ void func_i3_80199394(Boss* bossZO, s32 arg1) { AUDIO_PLAY_SFX(0x29433022, bossZO->sfxSource, 4); } -void func_i3_80199470(Boss* bossZO, s32 arg1) { +void Zoness_80199470(Boss* bossZO, s32 arg1) { if (sZoSwork[ZO_BSS_13] == 0) { if (sZoFwork[ZO_BSF_17 + arg1] > -400.0f) { sZoFwork[ZO_BSF_17 + arg1] -= 4.0f; @@ -3333,7 +3318,7 @@ void func_i3_80199470(Boss* bossZO, s32 arg1) { sZoSwork[ZO_BSS_36]++; sZoFwork[ZO_BSF_77] = 0.0f; } - func_i3_8019962C(bossZO, 0.0f); + Zoness_8019962C(bossZO, 0.0f); if (bossZO->obj.rot.y == 0.0f) { sZoSwork[ZO_BSS_36] = sZoSwork[ZO_BSS_16] = 0; sZoFwork[ZO_BSF_77] = 0; @@ -3342,24 +3327,24 @@ void func_i3_80199470(Boss* bossZO, s32 arg1) { if ((sZoSwork[ZO_BSS_11] == 0) && (sZoSwork[ZO_BSS_12] == 0)) { sZoSwork[ZO_BSS_20] = sZoSwork[ZO_BSS_24] = 1; } - func_i3_8019914C(bossZO, arg1); + Zoness_8019914C(bossZO, arg1); } } } else if ((sZoSwork[ZO_BSS_13] != 1) && (bossZO->timer_052 == 0)) { Math_SmoothStepToF(&sZoFwork[ZO_BSF_17 + arg1], 0.0f, 1.0f, 5.0f, 0.001f); Math_SmoothStepToF(&sZoFwork[ZO_BSF_3], -30.0f, 1.0f, 3.0f, 0.001f); if (sZoFwork[ZO_BSF_17 + arg1] == 0.0f) { - func_i3_80199394(bossZO, arg1); + Zoness_80199394(bossZO, arg1); } } } -void func_i3_8019962C(Boss* bossZO, f32 arg1) { +void Zoness_8019962C(Boss* bossZO, f32 arg1) { Math_SmoothStepToF(&sZoFwork[ZO_BSF_77], 2.0f, 0.1f, 0.5f, 0.0001f); Math_SmoothStepToAngle(&bossZO->obj.rot.y, arg1, 1.0f, sZoFwork[ZO_BSF_77], 0.0001f); } -void func_i3_8019969C(Actor* actor) { +void Zoness_8019969C(Actor* actor) { s32 i; if ((actor->unk_0D0 != 0) && (actor->health != 0)) { @@ -3367,25 +3352,25 @@ void func_i3_8019969C(Actor* actor) { if (actor->health <= 0) { actor->health = 0; for (i = 0; i < 5; i++) { - func_80079618(RAND_FLOAT_CENTERED(50.0f) + actor->obj.pos.x, - RAND_FLOAT_CENTERED(50.0f) + actor->obj.pos.y, - RAND_FLOAT_CENTERED(50.0f) + actor->obj.pos.z, 1.0f); + func_effect_80079618(RAND_FLOAT_CENTERED(50.0f) + actor->obj.pos.x, + RAND_FLOAT_CENTERED(50.0f) + actor->obj.pos.y, + RAND_FLOAT_CENTERED(50.0f) + actor->obj.pos.z, 1.0f); } - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 200.0f, 5.0f); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 200.0f, 5.0f); actor->unk_044 = 5; actor->unk_0D4 = 2; actor->obj.pos.z -= 100.0f; - func_80066254(actor); + func_enmy_80066254(actor); Object_Kill(&actor->obj, actor->sfxSource); - func_8007A6F0(&actor->obj.pos, 0x2903A008); + func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); } actor->unk_0D0 = 0; } actor->fwork[0] += 10.0f; - func_i3_8018FF50(actor); + Zoness_8018FF50(actor); } -void func_i3_8019983C(Actor* actor) { +void Zoness_8019983C(Actor* actor) { RCP_SetupDL(&gMasterDisp, 70); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); Matrix_Scale(gGfxMatrix, 2.6f, 2.6f, 2.6f, 1); @@ -3393,7 +3378,7 @@ void func_i3_8019983C(Actor* actor) { gSPDisplayList(gMasterDisp++, D_ZO_6017950); } -void func_i3_801998E0(Effect* effect, f32 xPos, f32 yPos, f32 zPos) { +void Zoness_801998E0(Effect* effect, f32 xPos, f32 yPos, f32 zPos) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_374; @@ -3404,23 +3389,23 @@ void func_i3_801998E0(Effect* effect, f32 xPos, f32 yPos, f32 zPos) { effect->obj.pos.z = zPos; effect->obj.pos.x = xPos; effect->scale1 = effect->scale2 = 2.5f; - func_8007D0E0(xPos, yPos + 30.0f, zPos, 7.0f); - func_8007BFFC(effect->obj.pos.x, effect->obj.pos.y + 30.0f, effect->obj.pos.z, 0.0f, 0.0f, 0.0f, 4.0f, 5); + func_effect_8007D0E0(xPos, yPos + 30.0f, zPos, 7.0f); + func_effect_8007BFFC(effect->obj.pos.x, effect->obj.pos.y + 30.0f, effect->obj.pos.z, 0.0f, 0.0f, 0.0f, 4.0f, 5); Object_SetInfo(&effect->info, effect->obj.id); } -void func_i3_801999CC(f32 xPos, f32 yPos, f32 zPos) { +void Zoness_801999CC(f32 xPos, f32 yPos, f32 zPos) { s32 i; for (i = 0; i < ARRAY_COUNT(gEffects); i++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i3_801998E0(&gEffects[i], xPos, yPos, zPos); + Zoness_801998E0(&gEffects[i], xPos, yPos, zPos); break; } } } -void func_i3_80199A28(Actor* actor) { +void Zoness_80199A28(Actor* actor) { f32 sp3C; f32 sp38; s32 sp34; @@ -3444,9 +3429,9 @@ void func_i3_80199A28(Actor* actor) { } break; case 1: - if ((func_800A73E4(&sp3C, &sp34, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z) != 0) && + if ((func_play_800A73E4(&sp3C, &sp34, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z) != 0) && (actor->iwork[1] == 0)) { - func_8008377C(actor->obj.pos.x, sp3C, actor->obj.pos.z, 0.0f, 0.5f); + func_effect_8008377C(actor->obj.pos.x, sp3C, actor->obj.pos.z, 0.0f, 0.5f); actor->iwork[1]++; AUDIO_PLAY_SFX(0x19000020, actor->sfxSource, 4); } @@ -3460,8 +3445,8 @@ void func_i3_80199A28(Actor* actor) { break; case 2: actor->gravity = 1.0f; - if (func_800A73E4(&sp3C, &sp34, actor->obj.pos.x, actor->fwork[0] + actor->obj.pos.y, actor->obj.pos.z) != - 0) { + if (func_play_800A73E4(&sp3C, &sp34, actor->obj.pos.x, actor->fwork[0] + actor->obj.pos.y, + actor->obj.pos.z) != 0) { actor->gravity = 0.0f; Math_SmoothStepToF(&actor->fwork[0], -50.0f, 0.1f, 2.0f, 0.001f); sp38 = 10.0f; @@ -3473,45 +3458,45 @@ void func_i3_80199A28(Actor* actor) { if ((actor->unk_0D0 != 0) && (actor->health != 0)) { actor->unk_0D0 = 0; actor->unk_044 = 2; - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y + 100.0f, actor->obj.pos.z, 7.0f); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y + 100.0f, actor->obj.pos.z, 7.0f); actor->unk_0D4 = 2; actor->obj.pos.y += 200.0f; - func_80066254(actor); + func_enmy_80066254(actor); Object_Kill(&actor->obj, actor->sfxSource); - func_8007A6F0(&actor->obj.pos, 0x1903400F); + func_effect_8007A6F0(&actor->obj.pos, 0x1903400F); } else { if ((fabsf(actor->obj.pos.z - gPlayer[0].unk_138) < 800.0f) || (actor->unk_0D0 != 0)) { - func_i3_801999CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z); + Zoness_801999CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z); Object_Kill(&actor->obj, actor->sfxSource); - func_8007A6F0(&actor->obj.pos, 0x2903B009); + func_effect_8007A6F0(&actor->obj.pos, 0x2903B009); } } break; } if ((actor->timer_0BC == 0) && (actor->iwork[0] == 0)) { - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y + 100.0f, actor->obj.pos.z, 7.0f); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y + 100.0f, actor->obj.pos.z, 7.0f); actor->unk_044 = 2; actor->unk_0D4 = 2; actor->obj.pos.y += 200.0f; - func_80066254(actor); + func_enmy_80066254(actor); Object_Kill(&actor->obj, actor->sfxSource); } } -void func_i3_80199E24(Actor* actor) { +void Zoness_80199E24(Actor* actor) { Matrix_Scale(gGfxMatrix, 2.0f, 2.0f, 2.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_ZO_6025E60); } -void func_i3_80199E9C(Actor* actor, f32 arg1, f32 arg2) { +void Zoness_80199E9C(Actor* actor, f32 arg1, f32 arg2) { actor->obj.pos.x = sZoFwork[ZO_BSF_60_X]; Math_SmoothStepToF(&actor->fwork[0], arg1, 1.0f, arg2, 0.001f); actor->obj.pos.y = sZoFwork[ZO_BSF_60_Y] + actor[0].fwork[0]; actor->obj.pos.z = sZoFwork[ZO_BSF_60_Z]; } -void func_i3_80199F10(Actor* actor) { +void Zoness_80199F10(Actor* actor) { if (sZoSwork[ZO_BSS_13] == 0) { actor->state = 3; actor->vel.y = -50.0f; @@ -3525,7 +3510,7 @@ void func_i3_80199F10(Actor* actor) { switch (actor->state) { /* irregular */ case 0: actor->obj.rot.y += 2.0f; - func_i3_80199E9C(actor, 0.0f, 20.0f); + Zoness_80199E9C(actor, 0.0f, 20.0f); switch (sZoSwork[ZO_BSS_16]) { /* switch 1; irregular */ case 1: actor->fwork[1] = sZoFwork[ZO_BSF_68_Y] - sZoFwork[ZO_BSF_60_Y]; @@ -3542,21 +3527,21 @@ void func_i3_80199F10(Actor* actor) { case 1: if (gBosses[0].timer_052 != 0) { actor->obj.rot.y += 2.0f; - func_i3_80199E9C(actor, actor->fwork[1], 20.0f); + Zoness_80199E9C(actor, actor->fwork[1], 20.0f); } else { switch (sZoSwork[ZO_BSS_16]) { case 1: actor->fwork[1] = sZoFwork[ZO_BSF_68_Y] - sZoFwork[ZO_BSF_60_Y]; - func_i3_80199E9C(actor, actor->fwork[1], 20.0f); + Zoness_80199E9C(actor, actor->fwork[1], 20.0f); break; case 2: actor->fwork[1] = sZoFwork[ZO_BSF_71_Y] - sZoFwork[ZO_BSF_60_Y]; - func_i3_80199E9C(actor, actor->fwork[1], 20.0f); + Zoness_80199E9C(actor, actor->fwork[1], 20.0f); break; case 3: actor->obj.rot.y += 2.0f; if (gBosses[0].timer_050 != 0) { - func_i3_80199E9C(actor, 0.0f, 10.0f); + Zoness_80199E9C(actor, 0.0f, 10.0f); } else { actor->state = 0; Audio_KillSfxBySource(actor->sfxSource); @@ -3574,7 +3559,7 @@ void func_i3_80199F10(Actor* actor) { } } -void func_i3_8019A1FC(Actor* actor) { +void Zoness_8019A1FC(Actor* actor) { f32 var_fv0; s32 var_s0; s32 var_s1; @@ -3610,7 +3595,7 @@ void func_i3_8019A1FC(Actor* actor) { } } -void func_i3_8019A4E0(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 arg4) { +void Zoness_8019A4E0(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 arg4) { f32 sp4C = xPos - actor->obj.pos.x; f32 sp48 = yPos - actor->obj.pos.y; f32 sp44 = zPos - actor->obj.pos.z; @@ -3632,7 +3617,7 @@ void func_i3_8019A4E0(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 arg4) { actor->vel.z = sp24.z; } -void func_i3_8019A5D4(Actor* actor) { +void Zoness_8019A5D4(Actor* actor) { f32 sp4C; f32 sp48; f32 sp44; @@ -3660,12 +3645,11 @@ void func_i3_8019A5D4(Actor* actor) { var_fv1 = 0.0f; var_fa0 = 100.0f; } - func_i3_8019A4E0(actor, gPlayer[0].pos.x + var_fv1, gPlayer[0].pos.y + var_fa0, gPlayer[0].pos.z, - 80.0f); - actor->vel.z -= D_80177D08; - func_i3_80193C5C(sZoFwork[ZO_BSF_65_X], sZoFwork[ZO_BSF_65_Y], sZoFwork[ZO_BSF_65_Z], 30.0f); - func_i3_80193C5C(sZoFwork[ZO_BSF_65_X], sZoFwork[ZO_BSF_65_Y], sZoFwork[ZO_BSF_65_Z], 30.0f); - func_i3_80193C5C(sZoFwork[ZO_BSF_65_X], sZoFwork[ZO_BSF_65_Y], sZoFwork[ZO_BSF_65_Z], 30.0f); + Zoness_8019A4E0(actor, gPlayer[0].pos.x + var_fv1, gPlayer[0].pos.y + var_fa0, gPlayer[0].pos.z, 80.0f); + actor->vel.z -= D_ctx_80177D08; + Zoness_80193C5C(sZoFwork[ZO_BSF_65_X], sZoFwork[ZO_BSF_65_Y], sZoFwork[ZO_BSF_65_Z], 30.0f); + Zoness_80193C5C(sZoFwork[ZO_BSF_65_X], sZoFwork[ZO_BSF_65_Y], sZoFwork[ZO_BSF_65_Z], 30.0f); + Zoness_80193C5C(sZoFwork[ZO_BSF_65_X], sZoFwork[ZO_BSF_65_Y], sZoFwork[ZO_BSF_65_Z], 30.0f); actor->timer_0BC = (s32) ((fabsf(sZoFwork[ZO_BSF_28] - -2600.0f) / 100.0f) + 30.0f); actor->timer_0C0 = 3; @@ -3675,12 +3659,12 @@ void func_i3_8019A5D4(Actor* actor) { break; case 1: if (actor->timer_0C0 != 0) { - D_801779A8[0] = 40.0f; + D_ctx_801779A8[0] = 40.0f; } actor->iwork[0] = 0; if (actor->timer_0BC == 0) { actor->vel.x = 0.0f; - actor->vel.z = -D_80177D08; + actor->vel.z = -D_ctx_80177D08; actor->gravity = 5.0f; actor->fwork[5] = actor->vel.y * -3.0f; if (actor->obj.pos.y < -150.0f) { @@ -3702,11 +3686,11 @@ void func_i3_8019A5D4(Actor* actor) { sp4C = fabsf(actor->obj.pos.x - sZoFwork[ZO_BSF_65_X]); sp48 = fabsf(actor->obj.pos.z - sZoFwork[ZO_BSF_65_Z]); var_fa0 = sqrtf(SQ(sp4C) + SQ(sp48)) * 0.5f; - func_i3_8019A4E0(actor, sZoFwork[ZO_BSF_65_X], sZoFwork[ZO_BSF_65_Y] - var_fa0, sZoFwork[ZO_BSF_65_Z], - 30.0f); - actor->vel.z -= D_80177D08; + Zoness_8019A4E0(actor, sZoFwork[ZO_BSF_65_X], sZoFwork[ZO_BSF_65_Y] - var_fa0, sZoFwork[ZO_BSF_65_Z], + 30.0f); + actor->vel.z -= D_ctx_80177D08; } - if (func_80062DBC(&actor->obj.pos, gBosses[0].info.hitbox, &gBosses[0].obj, 0.0f, 0.0f, 0.0f) != 0) { + if (func_enmy_80062DBC(&actor->obj.pos, gBosses[0].info.hitbox, &gBosses[0].obj, 0.0f, 0.0f, 0.0f) != 0) { actor->fwork[6] = 50.0f; AUDIO_PLAY_SFX(0x19030003, actor->sfxSource, 4); } @@ -3727,7 +3711,7 @@ void func_i3_8019A5D4(Actor* actor) { } break; } - func_i3_8018FF50(actor); + Zoness_8018FF50(actor); if (actor->unk_0D0 != 0) { if (actor->unk_0D0 == 1) { AUDIO_PLAY_SFX(0x29121007, actor->sfxSource, 4); @@ -3735,8 +3719,8 @@ void func_i3_8019A5D4(Actor* actor) { actor->unk_0D0 = 0; } if (!(gGameFrameCount & 7) && (actor->state != 0) && (actor->iwork[0] < 8) && - (func_800A73E4(&sp44, &sp40, actor->obj.pos.x, actor->obj.pos.y - 100.0f, actor->obj.pos.z) != 0)) { - func_8008377C(actor->obj.pos.x, sp44, actor->obj.pos.z, 0.0f, 0.7f); + (func_play_800A73E4(&sp44, &sp40, actor->obj.pos.x, actor->obj.pos.y - 100.0f, actor->obj.pos.z) != 0)) { + func_effect_8008377C(actor->obj.pos.x, sp44, actor->obj.pos.z, 0.0f, 0.7f); actor->iwork[0]++; if (actor->vel.y >= 0.0f) { AUDIO_PLAY_SFX(0x1983201A, actor->sfxSource, 4); @@ -3746,7 +3730,7 @@ void func_i3_8019A5D4(Actor* actor) { } } -void func_i3_8019ACCC(Actor* actor) { +void Zoness_8019ACCC(Actor* actor) { f32 temp_fa0; f32 temp_fa1; f32 temp_fs0; @@ -3781,7 +3765,7 @@ void func_i3_8019ACCC(Actor* actor) { if (var_s4 < 0) { var_s4 = 0; } - Matrix_Translate(gGfxMatrix, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + D_80177D20, 1); + Matrix_Translate(gGfxMatrix, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + D_ctx_80177D20, 1); Matrix_RotateY(gGfxMatrix, temp_fs4, 1); Matrix_RotateX(gGfxMatrix, temp_fs0_2, 1); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 0.0f, 1); @@ -3806,7 +3790,7 @@ void func_i3_8019ACCC(Actor* actor) { } Matrix_Pop(&gGfxMatrix); Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + D_80177D20, 1); + Matrix_Translate(gGfxMatrix, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + D_ctx_80177D20, 1); Matrix_RotateY(gGfxMatrix, actor->obj.rot.y * M_DTOR, 1); Matrix_RotateX(gGfxMatrix, actor->obj.rot.x * M_DTOR, 1); Matrix_Scale(gGfxMatrix, 2.6f, 2.6f, 2.6f, 1); @@ -3837,7 +3821,7 @@ s32 D_i3_801BF78C[30] = { }; f32 D_i3_801BF804[8] = { 0.0f, 0.0f, 270.0f, 90.0f, 0.0f, 180.0f, 400.0f, 400.0f }; -void func_i3_8019B1F0(Actor* actor) { +void Zoness_8019B1F0(Actor* actor) { s32 temp_v1; s32 var_s3; s32 i; @@ -3905,7 +3889,7 @@ void func_i3_8019B1F0(Actor* actor) { AUDIO_PLAY_SFX(0x3100203A, actor->sfxSource, 4); } -void func_i3_8019B548(Actor* actor) { +void Zoness_8019B548(Actor* actor) { f32 sp6C; s32 sp68; s32 i; @@ -3940,16 +3924,16 @@ void func_i3_8019B548(Actor* actor) { break; } if ((fabsf(actor->obj.pos.z - gPlayer[0].unk_138) < 1000.0f) && - func_800A73E4(&sp6C, &sp68, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z)) { + func_play_800A73E4(&sp6C, &sp68, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z)) { Math_SmoothStepToF(&actor->obj.pos.y, sp6C, 0.1f, 4.0f, 0.0f); } } -void func_i3_8019B7DC(Actor* actor) { +void Zoness_8019B7DC(Actor* actor) { gSPDisplayList(gMasterDisp++, D_ZO_6006360); } -void func_i3_8019B810(Actor* actor) { +void Zoness_8019B810(Actor* actor) { if (actor->iwork[3] == 0) { actor->iwork[0] = actor->obj.rot.z / 10.0f; actor->obj.rot.z = 0.0f; @@ -3963,7 +3947,7 @@ Vec3f D_i3_801BF84C[6] = { { -5.0f, -10.0f, 0.0f }, { -10.0f, 0.0f, 0.0f }, { -5.0f, 10.0f, 0.0f }, }; -void func_i3_8019B854(Actor* actor) { +void Zoness_8019B854(Actor* actor) { s32 i; s32 j; Vec3f spB4; @@ -3985,24 +3969,24 @@ void func_i3_8019B854(Actor* actor) { break; case 1: for (i = 0; i < 6; i++) { - func_i3_801900FC(&actor->vwork[i], &actor->vwork[6 + i], RAND_FLOAT_CENTERED(50.0f), - RAND_FLOAT(10.0f) + 20.0f, RAND_FLOAT_CENTERED(50.0f), 39, actor->scale, - RAND_FLOAT(15.0f) + (actor->scale * 10.0f), i); + Zoness_801900FC(&actor->vwork[i], &actor->vwork[6 + i], RAND_FLOAT_CENTERED(50.0f), + RAND_FLOAT(10.0f) + 20.0f, RAND_FLOAT_CENTERED(50.0f), 39, actor->scale, + RAND_FLOAT(15.0f) + (actor->scale * 10.0f), i); } for (i = 0; i < 10; i++) { - func_80079618(RAND_FLOAT_CENTERED(50.0f) + actor->obj.pos.x, - RAND_FLOAT_CENTERED(50.0f) + actor->obj.pos.y, - RAND_FLOAT_CENTERED(50.0f) + actor->obj.pos.z, 2.0f); + func_effect_80079618(RAND_FLOAT_CENTERED(50.0f) + actor->obj.pos.x, + RAND_FLOAT_CENTERED(50.0f) + actor->obj.pos.y, + RAND_FLOAT_CENTERED(50.0f) + actor->obj.pos.z, 2.0f); } for (i = 0; i < 3; i++) { - func_8007D0E0(actor->obj.pos.x + RAND_FLOAT_CENTERED(50.0f), - actor->obj.pos.y + RAND_FLOAT_CENTERED(50.0f) + 20.0f, - actor->obj.pos.z + RAND_FLOAT_CENTERED(30.0f), 10.0f + 2 * i); + func_effect_8007D0E0(actor->obj.pos.x + RAND_FLOAT_CENTERED(50.0f), + actor->obj.pos.y + RAND_FLOAT_CENTERED(50.0f) + 20.0f, + actor->obj.pos.z + RAND_FLOAT_CENTERED(30.0f), 10.0f + 2 * i); } actor->obj.pos.y += 100.0f; if (D_i3_801BF824[actor->iwork[0]] < 1000) { actor->unk_044 = D_i3_801BF824[actor->iwork[0]]; - func_80066254(actor); + func_enmy_80066254(actor); } else { if (D_i3_801BF824[actor->iwork[0]] == 1000) { for (i = 0, j = 0; i < 10; i++, j++) { @@ -4015,19 +3999,19 @@ void func_i3_8019B854(Actor* actor) { sp9C.x = RAND_FLOAT_CENTERED(10.0f); sp9C.y = RAND_FLOAT_CENTERED(10.0f); sp9C.z = 50.0f; - func_8007EE68(353, &spB4, &spA8, &spA8, &sp9C, 1.0f); + func_effect_8007EE68(353, &spB4, &spA8, &spA8, &sp9C, 1.0f); } } actor->unk_044 = 0; - func_80066254(actor); + func_enmy_80066254(actor); } Object_Kill(&actor->obj, actor->sfxSource); - func_8007A6F0(&actor->obj.pos, 0x1903901C); + func_effect_8007A6F0(&actor->obj.pos, 0x1903901C); break; } } -void func_i3_8019BC78(s32 limbIndex, Vec3f* rot, void* thisx) { +void Zoness_8019BC78(s32 limbIndex, Vec3f* rot, void* thisx) { Vec3f sp24 = { 0.0f, 0.0f, 0.0f }; Actor* this = thisx; @@ -4061,14 +4045,14 @@ void func_i3_8019BC78(s32 limbIndex, Vec3f* rot, void* thisx) { } } -void func_i3_8019BDE0(Actor* actor) { +void Zoness_8019BDE0(Actor* actor) { Vec3f sp28[20]; Animation_GetFrameData(&D_ZO_6018550, 0, sp28); - Animation_DrawSkeleton(3, D_ZO_601863C, sp28, NULL, func_i3_8019BC78, actor, gCalcMatrix); + Animation_DrawSkeleton(3, D_ZO_601863C, sp28, NULL, Zoness_8019BC78, actor, gCalcMatrix); } -void func_i3_8019BE48(Actor* actor) { +void Zoness_8019BE48(Actor* actor) { Actor* pad; f32 sp40; f32 sp3C; @@ -4108,12 +4092,12 @@ void func_i3_8019BE48(Actor* actor) { actor->timer_0C6 = 15; actor->health -= actor->damage; if (actor->health <= 0) { - if (D_80161684 == 0) { + if (D_enmy_80161684 == 0) { BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z + 200.0f, 2); gHitCount += 2; } actor->health = actor->unk_044 = 0; - func_80066254(actor); + func_enmy_80066254(actor); actor->state++; } } @@ -4123,14 +4107,14 @@ void func_i3_8019BE48(Actor* actor) { newActor = &gActors[actor->iwork[0]]; newActor->iwork[0] = 777; - func_8008377C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 5.0f, 0.7f); - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y + 50.0f, actor->obj.pos.z, 5.0f); + func_effect_8008377C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 5.0f, 0.7f); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y + 50.0f, actor->obj.pos.z, 5.0f); Object_Kill(&actor->obj, actor->sfxSource); - func_8007A6F0(&actor->obj.pos, 0x29038033); + func_effect_8007A6F0(&actor->obj.pos, 0x29038033); break; } if ((actor->state < 2) && - (func_800A73E4(&sp40, &sp38, actor->obj.pos.x, actor->obj.pos.y - 60.0f, actor->obj.pos.z) != 0)) { + (func_play_800A73E4(&sp40, &sp38, actor->obj.pos.x, actor->obj.pos.y - 60.0f, actor->obj.pos.z) != 0)) { actor->gravity = 0.0f; sp3C = 10.0f; if (Math_SmoothStepToF(&actor->obj.pos.y, sp40 - 20.0f, 0.1f, 5.0f, 0) >= 0.0f) { @@ -4143,14 +4127,14 @@ void func_i3_8019BE48(Actor* actor) { } } -void func_i3_8019C1CC(Actor* actor) { +void Zoness_8019C1CC(Actor* actor) { gSPDisplayList(gMasterDisp++, D_ZO_6002E10); } Vec3f D_i3_801BF8AC = { 230.0f, -50.0f, 0.0f }; Vec3f D_i3_801BF8B8 = { 230.0f, -250.0f, 0.0f }; -void func_i3_8019C200(Actor* actor) { +void Zoness_8019C200(Actor* actor) { s32 i; s32 sp38; Vec3f sp2C; @@ -4200,7 +4184,7 @@ void func_i3_8019C200(Actor* actor) { } } -void func_i3_8019C454(Actor* actor) { +void Zoness_8019C454(Actor* actor) { Vec3f sp34; Actor* otherActor; @@ -4268,7 +4252,7 @@ void func_i3_8019C454(Actor* actor) { } } -void func_i3_8019C83C(Actor* actor) { +void Zoness_8019C83C(Actor* actor) { f32 var_fv1; s32 i; s32 var_s1; @@ -4323,12 +4307,12 @@ void func_i3_8019C83C(Actor* actor) { f32 D_i3_801BF8C4[2] = { 46.0f, 314.0f }; f32 D_i3_801BF8CC[2] = { 23.0f, 337.0f }; -void func_i3_8019CBEC(Actor* actor) { +void Zoness_8019CBEC(Actor* actor) { actor->timer_0C2 = 30000; switch (actor->state) { case 0: actor->fwork[5] = D_i3_801BF8CC[gGameFrameCount & 1]; - if (D_80161684 != 0) { + if (D_enmy_80161684 != 0) { actor->fwork[5] = D_i3_801BF8C4[gGameFrameCount & 1]; actor->iwork[1] = 1; } @@ -4341,7 +4325,7 @@ void func_i3_8019CBEC(Actor* actor) { } else { Math_SmoothStepToAngle(&actor->fwork[4], actor->fwork[5], 0.1f, actor->fwork[6], 0.0001f); } - if ((D_80161684 != 0) && (actor->iwork[1] == 0)) { + if ((D_enmy_80161684 != 0) && (actor->iwork[1] == 0)) { if (actor->fwork[5] < 300.0f) { actor->fwork[5] = D_i3_801BF8C4[0]; } else { @@ -4368,11 +4352,11 @@ void func_i3_8019CBEC(Actor* actor) { } break; } - func_i3_8018FF50(actor); + Zoness_8018FF50(actor); actor->obj.rot.x = 0.0f; } -void func_i3_8019CE58(Actor* actor) { +void Zoness_8019CE58(Actor* actor) { Gfx* temp_v0; Gfx* temp_v0_2; Gfx* temp_v0_3; @@ -4389,14 +4373,14 @@ void func_i3_8019CE58(Actor* actor) { Matrix_RotateZ(gGfxMatrix, (actor->fwork[4] + actor->obj.rot.z) * M_DTOR, 1); Matrix_Scale(gGfxMatrix, actor->fwork[1], actor->fwork[2], actor->fwork[3], 1); Matrix_SetGfxMtx(&gMasterDisp); - if (D_80161684 != 0) { + if (D_enmy_80161684 != 0) { gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 191, 43, 255); gDPSetEnvColor(gMasterDisp++, 255, 0, 0, 255); } else { gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255); gDPSetEnvColor(gMasterDisp++, 255, 255, 127, 255); } - } else if (D_80161684 != 0) { + } else if (D_enmy_80161684 != 0) { gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 191, 43, 50); gDPSetEnvColor(gMasterDisp++, 255, 0, 0, 255); } else { @@ -4406,7 +4390,7 @@ void func_i3_8019CE58(Actor* actor) { gSPDisplayList(gMasterDisp++, D_ZO_60181E0); } -void func_i3_8019D060(Actor* actor) { +void Zoness_8019D060(Actor* actor) { s32 i; for (i = 0; i < 60; i++) { @@ -4429,7 +4413,7 @@ void func_i3_8019D060(Actor* actor) { } } -void func_i3_8019D15C(Actor* actor) { +void Zoness_8019D15C(Actor* actor) { Actor* temp_v0; if (actor->state == 0) { @@ -4462,7 +4446,7 @@ void func_i3_8019D15C(Actor* actor) { } } -s32 func_i3_8019D340(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { +s32 Zoness_8019D340(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) { Actor* this = thisx; switch (this->state) { @@ -4484,14 +4468,14 @@ s32 func_i3_8019D340(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* t return false; } -void func_i3_8019D3C4(Actor* actor) { +void Zoness_8019D3C4(Actor* actor) { Vec3f sp28[10]; Animation_GetFrameData(&D_ZO_601FBC4, 0, sp28); - Animation_DrawSkeleton(1, D_ZO_601FC90, sp28, func_i3_8019D340, NULL, actor, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_ZO_601FC90, sp28, Zoness_8019D340, NULL, actor, &gIdentityMatrix); } -void func_i3_8019D428(Player* player) { +void Zoness_8019D428(Player* player) { s32 sp2C; player->unk_088 += 10.0f; @@ -4520,28 +4504,28 @@ void func_i3_8019D428(Player* player) { gControllerHold[gMainController].button = gBoostButton[gMainController]; player->timer_1F8 = 60; player->unk_2BC = 1.0f; - func_800B2574(player); + func_play_800B2574(player); if (gCsFrameCount > 195) { - D_801779A8[0] = 50.0f; + D_ctx_801779A8[0] = 50.0f; } else { - D_801779A8[0] = 0.0f; + D_ctx_801779A8[0] = 0.0f; } gControllerHold[gMainController].button = sp2C; if (gCsFrameCount >= 270) { AUDIO_PLAY_BGM(SEQ_ID_6 | 0x8000); - D_80177838 = 80; + D_ctx_80177838 = 80; player->state_1C8 = PLAYERSTATE_1C8_3; player->unk_1D0 = 0; player->timer_1F8 = 0; player->timer_1FC = 0; - D_80178488 = 1; + D_ctx_80178488 = 1; } break; } - D_80177CE8 += 40.0f; + D_ctx_80177CE8 += 40.0f; } -void func_i3_8019D76C(Player* player) { +void Zoness_8019D76C(Player* player) { f32 temp_fa0; f32 temp_ft5; f32 dx; @@ -4576,15 +4560,15 @@ void func_i3_8019D76C(Player* player) { Object_Kill(&gActors[3].obj, gActors[3].sfxSource); Object_Kill(&gActors[4].obj, gActors[4].sfxSource); player->unk_1D0 = 1; - D_80177A48[0] = 0.05f; + D_ctx_80177A48[0] = 0.05f; if (Rand_ZeroOne() > 0.5f) { - D_80177A48[9] = -1.0f; + D_ctx_80177A48[9] = -1.0f; } else { - D_80177A48[9] = 1.0f; + D_ctx_80177A48[9] = 1.0f; } break; case 1: - D_80177CE8 += 30.0f; + D_ctx_80177CE8 += 30.0f; Math_SmoothStepToF(&player->unk_0E4, 0.0f, 0.1f, 5.0f, 0.0f); Math_SmoothStepToF(&player->pos.y, 200.0f, 0.05f, 10.0f, 0.0f); Math_SmoothStepToF(&gCsCamEyeY, 250.0f, 1.0f, 20.0f, 0.0f); @@ -4601,15 +4585,15 @@ void func_i3_8019D76C(Player* player) { player->unk_0EC += 30.0f; } if (gCsFrameCount >= 140) { - D_80178358 = 255; - D_80178348 = D_80178350 = D_80178354 = 255; + D_ctx_80178358 = 255; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; } if (gCsFrameCount == 160) { player->unk_1D0++; - func_800A6148(); + func_play_800A6148(); func_8001CA24(0); Audio_KillSfxBySource(player->sfxSource); - D_80178340 = 250; + D_ctx_80178340 = 250; player->timer_1F8 = 20; player->wings.unk_2C = 1; player->unk_0D0 = 0.0f; @@ -4619,90 +4603,90 @@ void func_i3_8019D76C(Player* player) { } break; case 2: - D_80177CE8 += 60.0f; + D_ctx_80177CE8 += 60.0f; if (player->timer_1F8 == 0) { player->pos.x = 0.0f; player->pos.y = 200.0f; - player->pos.z = -(D_80177D20 + 1500.0f); + player->pos.z = -(D_ctx_80177D20 + 1500.0f); player->unk_1D0++; func_8001C8B8(0); AUDIO_PLAY_BGM(SEQ_ID_38); - D_80177A98 = 1; - func_800A6148(); - func_i3_801A7750(); - D_80177A48[1] = 0.0f; - D_80177A48[2] = 0.0f; - if (D_80161684 == 0) { - D_80177A48[1] = 330.0f; + D_ctx_80177A98 = 1; + func_play_800A6148(); + Solar_801A7750(); + D_ctx_80177A48[1] = 0.0f; + D_ctx_80177A48[2] = 0.0f; + if (D_enmy_80161684 == 0) { + D_ctx_80177A48[1] = 330.0f; player->camEye.x = 1350.0f; player->camAt.x = gCsCamAtX = 1450.0f; - D_80177A48[3] = 800.0f; - D_80177A48[4] = -0.15f; - D_80177A48[5] = -250.0f; - player->camEye.z = player->pos.z + D_80177D20 - 1780.0f; + D_ctx_80177A48[3] = 800.0f; + D_ctx_80177A48[4] = -0.15f; + D_ctx_80177A48[5] = -250.0f; + player->camEye.z = player->pos.z + D_ctx_80177D20 - 1780.0f; } else { player->camEye.x = -1500.0f; player->camAt.x = gCsCamAtX = -1500.0f; - D_80177A48[3] = -800.0f; - D_80177A48[4] = 0.2f; - D_80177A48[5] = 250.0f; - player->camEye.z = player->pos.z + D_80177D20 - 2000.0f; + D_ctx_80177A48[3] = -800.0f; + D_ctx_80177A48[4] = 0.2f; + D_ctx_80177A48[5] = 250.0f; + player->camEye.z = player->pos.z + D_ctx_80177D20 - 2000.0f; } player->camEye.y = 200.0f; player->camAt.y = gCsCamAtY = player->pos.y; - player->camAt.z = gCsCamAtZ = player->pos.z + D_80177D20; - D_80177A48[0] = 0.0f; + player->camAt.z = gCsCamAtZ = player->pos.z + D_ctx_80177D20; + D_ctx_80177A48[0] = 0.0f; } break; case 3: - D_80177CE8 += 60.0f; - D_80178358 = 0; - D_8017835C = 4; - D_80177A48[1] += D_80177A48[2]; - Matrix_RotateY(gCalcMatrix, D_80177A48[1] * M_DTOR, 0); + D_ctx_80177CE8 += 60.0f; + D_ctx_80178358 = 0; + D_ctx_8017835C = 4; + D_ctx_80177A48[1] += D_ctx_80177A48[2]; + Matrix_RotateY(gCalcMatrix, D_ctx_80177A48[1] * M_DTOR, 0); sp58.x = 0.0f; sp58.y = 0.0f; - sp58.z = D_80177A48[3]; + sp58.z = D_ctx_80177A48[3]; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp58, &sp4C); if (gCsFrameCount < 1180) { gCsCamEyeX = sp4C.x; gCsCamEyeY = 200.0f + sp4C.y; - gCsCamEyeZ = player->pos.z + D_80177D20 + sp4C.z; + gCsCamEyeZ = player->pos.z + D_ctx_80177D20 + sp4C.z; gCsCamAtX = 0.0f; gCsCamAtY = player->pos.y; - gCsCamAtZ = D_80177A48[5] + (player->pos.z + D_80177D20); - Math_SmoothStepToF(&D_80177A48[5], 250.0f, 1.0f, 1.0f, 0.0f); + gCsCamAtZ = D_ctx_80177A48[5] + (player->pos.z + D_ctx_80177D20); + Math_SmoothStepToF(&D_ctx_80177A48[5], 250.0f, 1.0f, 1.0f, 0.0f); } else { gCsCamAtX = 0.0f; gCsCamAtY = player->pos.y; - gCsCamAtZ = player->pos.z + D_80177D20; + gCsCamAtZ = player->pos.z + D_ctx_80177D20; } if (gCsFrameCount >= 1181) { player->unk_0D0 += 2.0f; player->unk_0E4 += 0.1f; - Math_SmoothStepToF(&D_80177A48[2], 0.0f, 1.0f, 0.001f, 0); + Math_SmoothStepToF(&D_ctx_80177A48[2], 0.0f, 1.0f, 0.001f, 0); player->unk_190 = 2.0f; - if (D_80161684 == 0) { - Math_SmoothStepToF(&D_80177A48[0], 1.0f, 1.0f, 0.025f, 0.0f); + if (D_enmy_80161684 == 0) { + Math_SmoothStepToF(&D_ctx_80177A48[0], 1.0f, 1.0f, 0.025f, 0.0f); } } else { - Math_SmoothStepToF(&D_80177A48[2], D_80177A48[4], 1.0f, 0.001f, 0.0f); - Math_SmoothStepToF(&D_80177A48[0], 0.05f, 1.0f, 0.00005f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[2], D_ctx_80177A48[4], 1.0f, 0.001f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[0], 0.05f, 1.0f, 0.00005f, 0.0f); } if (gCsFrameCount == 1300) { - func_800A6148(); + func_play_800A6148(); } if (gCsFrameCount >= 1271) { - D_80178358 = 255; - D_80178348 = D_80178350 = D_80178354 = 0; - D_8017835C = 8; - if (D_80178340 == 255) { + D_ctx_80178358 = 255; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; + D_ctx_8017835C = 8; + if (D_ctx_80178340 == 255) { func_8001CA24(0); Audio_FadeOutAll(10); player->state_1C8 = PLAYERSTATE_1C8_6; player->timer_1F8 = 0; - D_8017837C = 4; - D_800D3180[LEVEL_ZONESS] = Play_CheckMedalStatus(250) + 1; + D_ctx_8017837C = 4; + D_play_800D3180[LEVEL_ZONESS] = Play_CheckMedalStatus(250) + 1; } } break; @@ -4710,10 +4694,10 @@ void func_i3_8019D76C(Player* player) { (void) "Demo_Time %d\n"; switch (gCsFrameCount) { case 320: - if (D_80161684 == 0) { - D_80177930 = 1; + if (D_enmy_80161684 == 0) { + D_ctx_80177930 = 1; } - D_80177840 = 100; + D_ctx_80177840 = 100; break; case 380: Radio_PlayMessage(gMsg_ID_20010, RCID_FOX); @@ -4727,7 +4711,7 @@ void func_i3_8019D76C(Player* player) { Radio_PlayMessage(gMsg_ID_20339, RCID_ROB64); break; default: - func_80048AC0(2); + func_demo_80048AC0(2); break; } break; @@ -4740,8 +4724,8 @@ void func_i3_8019D76C(Player* player) { Radio_PlayMessage(gMsg_ID_20338, RCID_ROB64); break; default: - if (D_80161684 == 0) { - func_80048AC0(3); + if (D_enmy_80161684 == 0) { + func_demo_80048AC0(3); } else { Radio_PlayMessage(gMsg_ID_6100, RCID_PEPPY); } @@ -4762,10 +4746,10 @@ void func_i3_8019D76C(Player* player) { } break; case 906: - D_80177830 = 1; + D_ctx_80177830 = 1; break; case 1106: - D_80177830 = 0; + D_ctx_80177830 = 0; break; case 1180: AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); @@ -4810,19 +4794,19 @@ void func_i3_8019D76C(Player* player) { player->pos.y += player->vel.y; player->unk_138 = player->pos.z += player->vel.z; player->unk_0F8 = player->unk_0EC; - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_ctx_80177A48[0], 50000.0f, 0.0f); player->unk_088 += 10.0f; player->unk_080 = -SIN_DEG(player->unk_088) * 0.3f; player->unk_0F4 += 8.0f; player->unk_0F0 = SIN_DEG(player->unk_0F4); } -void func_i3_8019E5F0(Actor* actor) { +void Zoness_8019E5F0(Actor* actor) { Vec3f sp34; Vec3f sp28; diff --git a/src/overlays/ovl_i4/fox_bo.c b/src/overlays/ovl_i4/fox_bo.c index de4264c1..a7296202 100644 --- a/src/overlays/ovl_i4/fox_bo.c +++ b/src/overlays/ovl_i4/fox_bo.c @@ -6,6 +6,67 @@ #include "global.h" #include "assets/ast_bolse.h" +#include "prevent_bss_reordering.h" +struct Dummy200 { + int x; +}; +struct Dummy201 { + int x; +}; +struct Dummy202 { + int x; +}; +struct Dummy203 { + int x; +}; +struct Dummy204 { + int x; +}; +struct Dummy205 { + int x; +}; +struct Dummy206 { + int x; +}; +struct Dummy210 { + int x; +}; +struct Dummy211 { + int x; +}; +struct Dummy212 { + int x; +}; +struct Dummy213 { + int x; +}; +struct Dummy214 { + int x; +}; +struct Dummy215 { + int x; +}; +struct Dummy216 { + int x; +}; +struct Dummy220 { + int x; +}; +struct Dummy221 { + int x; +}; +struct Dummy222 { + int x; +}; +struct Dummy223 { + int x; +}; +struct Dummy224 { + int x; +}; +struct Dummy225 { + int x; +}; typedef struct UnkStruct_D_i4_801A03E0 { f32 unk_00; @@ -20,33 +81,20 @@ typedef struct UnkStruct_D_i4_801A03E0 { f32 D_i4_801A03D0; f32 D_i4_801A03D4; f32 D_i4_801A03D8; -s32 D_i4_801A03DC; +s32 D_BO_801A03DC; UnkStruct_D_i4_801A03E0 D_i4_801A03E0[6]; UnkStruct_D_i4_801A03E0 D_i4_801A0488[6]; s32 D_i4_801A0530; -extern s16 D_800C9C34; // fox_bg -extern s32 D_80177C3C[]; -extern s32 D_801778F4[]; - f32 D_i4_8019EEC0 = 0.0f; -void func_8002FC00(Actor*); -s32 func_i4_8018CCE8(Actor*); -s32 func_i4_8018CE5C(Actor*); -bool func_i4_8018D008(Actor*); -void func_i4_8018D124(Actor*); -s32 func_i4_8018DE8C(Boss*); -s32 func_i4_8018E3FC(Boss*); -void func_i4_8018F83C(Actor* actor, s32); - -void func_i4_8018BD60(Actor* actor) { +void Bolse_8018BD60(Actor* actor) { s32 i; Actor* actorPtr; f32 D_i4_8019EEC4[4] = { 8000.0f, -8000.0f, 8000.0f, -8000.0f }; f32 D_i4_8019EED4[4] = { 8000.0f, 8000.0f, -8000.0f, -8000.0f }; - if (D_8015F924 == 0) { + if (D_360_8015F924 == 0) { actor->unk_04E++; if (actor->unk_04E >= 4) { actor->unk_04E = 0; @@ -71,13 +119,13 @@ void func_i4_8018BD60(Actor* actor) { } } } - func_8002F69C(actor); - func_8002FC00(actor); + func_360_8002F69C(actor); + func_360_8002FC00(actor); } f32 D_i4_8019EEE4[] = { -200.0f, -100.0f, -0.0f, 100.0f, 200.0f }; -void func_i4_8018BEF8(Actor* actor, s32 arg1) { +void Bolse_8018BEF8(Actor* actor, s32 arg1) { s32 i; Actor* actorPtr; @@ -147,41 +195,41 @@ void func_i4_8018BEF8(Actor* actor, s32 arg1) { } } -void func_i4_8018C158(Actor* actor) { +void Bolse_8018C158(Actor* actor) { s32 i; Player* player = &gPlayer[0]; s32 pad; Actor* actorPtr; - D_800C9C34 = 1; + D_bg_800C9C34 = 1; D_i4_801A0530++; switch (actor->state) { case 0: - D_800C9B4C = 500000; - D_8015F928 = 0; - D_8015F908 = 0; + D_360_800C9B4C = 500000; + D_360_8015F928 = 0; + D_360_8015F908 = 0; actor->state = 2; - if (D_8015F924 == 0) { + if (D_360_8015F924 == 0) { gBosses[0].fwork[1] = 0.3f; - D_i4_801A03DC = 6; + D_BO_801A03DC = 6; } else { - D_8015F924 = 1; + D_360_8015F924 = 1; gHitCount = gSavedHitCount; gBosses[1].state = 2; - D_8015F928 = 3000; + D_360_8015F928 = 3000; actor->iwork[1] = gHitCount; } for (i = 0; i < 6; i++) { - D_80177CD0[i] = D_80177CF0[i]; + D_ctx_80177CD0[i] = D_ctx_80177CF0[i]; } case 2: - func_i4_8018BD60(actor); + Bolse_8018BD60(actor); - switch (D_8015F928) { + switch (D_360_8015F928) { case 300: Radio_PlayMessage(gMsg_ID_11020, RCID_PEPPY); break; @@ -206,7 +254,7 @@ void func_i4_8018C158(Actor* actor) { } if ((D_i4_801A0530 < 9600) && (D_i4_801A0530 & 1024)) { - func_i4_8018BEF8(actor, 8); + Bolse_8018BEF8(actor, 8); } if (gBosses[2].state == 10) { @@ -218,11 +266,11 @@ void func_i4_8018C158(Actor* actor) { gPlayer[0].unk_1D0 = 0; gPlayer[0].unk_000 = 0.0f; } - func_8002EE34(); + func_360_8002EE34(); actor->state = 6; AUDIO_PLAY_SFX(0x31009063U, actor->sfxSource, 0U); AUDIO_PLAY_SFX(0x2940D09AU, actor->sfxSource, 4U); - D_Timer_80161A60 = 8; + D_play_Timer_80161A60 = 8; for (actorPtr = &gActors[10], i = 0; i < 20; i++, actorPtr++) { if (actorPtr->obj.status == OBJ_ACTIVE) { @@ -238,7 +286,7 @@ void func_i4_8018C158(Actor* actor) { actor->timer_0BC = 150; gPlayer[0].state_1C8 = PLAYERSTATE_1C8_0; AUDIO_PLAY_BGM(SEQ_ID_28 | 0x8000); - func_8002EE34(); + func_360_8002EE34(); gPlayer[0].camEye.x = 400.0f; gPlayer[0].camEye.y = 50.0f; gPlayer[0].camEye.z = 3000.0f; @@ -248,21 +296,22 @@ void func_i4_8018C158(Actor* actor) { for (i = 10; i < 30; i++) { Object_Kill(&gActors[i].obj, gActors[i].sfxSource); } - } else if ((D_8015F924 == 1) && (((gHitCount - actor->iwork[1]) >= 5) || (D_i4_801A0530 == 0xFA0))) { - D_8015F924 = 2; + } else if ((D_360_8015F924 == 1) && (((gHitCount - actor->iwork[1]) >= 5) || (D_i4_801A0530 == 0xFA0))) { + D_360_8015F924 = 2; actor->iwork[1] = gHitCount; - if ((D_80177CD0[0] != 0) || (D_80177CD0[1] != 0) || (D_80177CD0[2] != 0) || (D_80177CD0[3] != 0)) { - D_800C9B4C = D_8015F928 + 120; - D_8015F908 = 1000; + if ((D_ctx_80177CD0[0] != 0) || (D_ctx_80177CD0[1] != 0) || (D_ctx_80177CD0[2] != 0) || + (D_ctx_80177CD0[3] != 0)) { + D_360_800C9B4C = D_360_8015F928 + 120; + D_360_8015F908 = 1000; } } break; case 3: - D_800C9C34 = 0; + D_bg_800C9C34 = 0; for (i = 0; i < 4; i++) { - if (D_80177CD0[i] != 0) { + if (D_ctx_80177CD0[i] != 0) { actorPtr = &gActors[i + 4]; break; } @@ -282,14 +331,14 @@ void func_i4_8018C158(Actor* actor) { Math_SmoothStepToF(&player->camAt.z, actorPtr->obj.pos.z, 1.0f, 20000.0f, 0.0f); Math_SmoothStepToF(&player->unk_034, 0.0f, 0.1f, 0.2f, 0); - if ((gControllerPress->button & START_BUTTON) || ((D_800C9B4C + 300) == D_8015F928)) { + if ((gControllerPress->button & START_BUTTON) || ((D_360_800C9B4C + 300) == D_360_8015F928)) { actor->state = 2; player->state_1C8 = PLAYERSTATE_1C8_3; - func_800B7184(player, 1); + func_play_800B7184(player, 1); player->unk_014 = 0.0f; - D_80161708 = 0; + D_hud_80161708 = 0; } - D_801779BC = 0; + D_ctx_801779BC = 0; break; case 10: @@ -319,7 +368,7 @@ void func_i4_8018C158(Actor* actor) { if (actor->timer_0BC == 130) { Radio_PlayMessage(gMsg_ID_11060, RCID_FALCO); - D_8015F924 = 1; + D_360_8015F924 = 1; gSavedHitCount = gHitCount; for (i = 1; i < 4; i++) { gSavedTeamShields[i] = gTeamShields[i]; @@ -327,14 +376,14 @@ void func_i4_8018C158(Actor* actor) { } if (!(actor->timer_0BC & 7)) { - func_i4_8018BEF8(actor, 15); + Bolse_8018BEF8(actor, 15); } if (!actor->timer_0BC) { - D_8015F928 = 3000; + D_360_8015F928 = 3000; actor->state = 2; player->state_1C8 = PLAYERSTATE_1C8_3; - func_800B7184(player, 1); + func_play_800B7184(player, 1); player->unk_014 = 0.0f; Audio_KillSfxBySource(gBosses[1].sfxSource); actor->iwork[1] = gHitCount; @@ -352,35 +401,35 @@ void func_i4_8018C158(Actor* actor) { break; } - if (D_8015F908 != 0) { - D_8015F908--; - switch (D_8015F908) { + if (D_360_8015F908 != 0) { + D_360_8015F908--; + switch (D_360_8015F908) { case 860: - if (D_80177CD0[0] != 0) { + if (D_ctx_80177CD0[0] != 0) { Radio_PlayMessage(gMsg_ID_11100, RCID_WOLF); } break; case 760: - if (D_80177CD0[1] != 0) { + if (D_ctx_80177CD0[1] != 0) { Radio_PlayMessage(gMsg_ID_11110, RCID_LEON); } break; case 660: - if (D_80177CD0[2] != 0) { + if (D_ctx_80177CD0[2] != 0) { Radio_PlayMessage(gMsg_ID_11120, RCID_PIGMA); } break; case 550: - if (D_80177CD0[3] != 0) { + if (D_ctx_80177CD0[3] != 0) { Radio_PlayMessage(gMsg_ID_11130, RCID_ANDREW); } break; case 390: - if (D_800D3180[LEVEL_FORTUNA] == 0) { + if (D_play_800D3180[LEVEL_FORTUNA] == 0) { Radio_PlayMessage(gMsg_ID_9285, RCID_FOX); } else { Radio_PlayMessage(gMsg_ID_11241, RCID_FOX); @@ -390,21 +439,21 @@ void func_i4_8018C158(Actor* actor) { } } -s32 func_i4_8018CC60(Actor* actor) { +s32 Bolse_8018CC60(Actor* actor) { Vec3f sp1C; - if (D_8015F924 == 0) { + if (D_360_8015F924 == 0) { actor->obj.pos.x = sp1C.x = actor->fwork[10]; actor->obj.pos.y = sp1C.y = actor->fwork[11]; actor->obj.pos.z = sp1C.z = actor->fwork[12]; - Matrix_MultVec3fNoTranslate(&D_i4_8019EE80, &sp1C, &actor->obj.pos); + Matrix_MultVec3fNoTranslate(&D_BO_8019EE80, &sp1C, &actor->obj.pos); actor->fwork[13] = gBosses[0].obj.rot.y; } return 0; } -s32 func_i4_8018CCE8(Actor* actor) { +s32 Bolse_8018CCE8(Actor* actor) { s32 i; s32 var_v0; f32 temp_fs0; @@ -473,7 +522,7 @@ s32 func_i4_8018CCE8(Actor* actor) { return 0; } -s32 func_i4_8018CE5C(Actor* actor) { +s32 Bolse_8018CE5C(Actor* actor) { f32 x; f32 y; f32 z; @@ -504,7 +553,7 @@ s32 func_i4_8018CE5C(Actor* actor) { return 0; } -bool func_i4_8018D008(Actor* actor) { +bool Bolse_8018D008(Actor* actor) { f32 x; f32 y; f32 z; @@ -537,7 +586,7 @@ bool func_i4_8018D008(Actor* actor) { return true; } -void func_i4_8018D124(Actor* actor) { +void Bolse_8018D124(Actor* actor) { Vec3f src; Vec3f dest; @@ -546,15 +595,15 @@ void func_i4_8018D124(Actor* actor) { src.y = 0.0f; src.x = 0.0f; - src.z = D_80177828; + src.z = D_ctx_80177828; Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &dest); - func_8007F04C(OBJ_EFFECT_353, actor->obj.pos.x + dest.x, actor->obj.pos.y + 180.0f + dest.y, - actor->obj.pos.z + dest.z, -actor->unk_0F4.x, actor->unk_0F4.y + actor->obj.rot.y, 0.0f, 0.0f, 0.0f, - 0.0f, dest.x, dest.y, dest.z, 1.0f); + func_effect_8007F04C(OBJ_EFFECT_353, actor->obj.pos.x + dest.x, actor->obj.pos.y + 180.0f + dest.y, + actor->obj.pos.z + dest.z, -actor->unk_0F4.x, actor->unk_0F4.y + actor->obj.rot.y, 0.0f, 0.0f, + 0.0f, 0.0f, dest.x, dest.y, dest.z, 1.0f); } -bool func_i4_8018D278(Actor* actor) { +bool Bolse_8018D278(Actor* actor) { s32 i; if (actor->unk_0D0 == 0) { @@ -564,19 +613,19 @@ bool func_i4_8018D278(Actor* actor) { actor->unk_0D0 = 0; actor->obj.pos.y += 150.0f; - func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 8.0f, 15); + func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 8.0f, 15); for (i = 0; i < 3; i++) { if (Rand_ZeroOne() >= 0.5f) { - func_800A69F8(4, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z); + func_play_800A69F8(4, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z); } } - func_8007A6F0(&actor->obj.pos, 0x2903A008); + func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); actor->unk_044 = 1; - func_80066254(actor); + func_enmy_80066254(actor); Object_Kill(&actor->obj, actor->sfxSource); actor->info.bonus = 0; @@ -586,20 +635,20 @@ bool func_i4_8018D278(Actor* actor) { return true; } -void func_i4_8018D394(Actor* actor) { - func_i4_8018CC60(actor); +void Bolse_8018D394(Actor* actor) { + Bolse_8018CC60(actor); if ((gPlayer[0].state_1C8 != PLAYERSTATE_1C8_0) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_7)) { - func_i4_8018CCE8(actor); - func_i4_8018CE5C(actor); - if (func_i4_8018D008(actor)) { - func_i4_8018D124(actor); + Bolse_8018CCE8(actor); + Bolse_8018CE5C(actor); + if (Bolse_8018D008(actor)) { + Bolse_8018D124(actor); } } - func_i4_8018D278(actor); + Bolse_8018D278(actor); actor->iwork[0] = 0; } -s32 func_i4_8018D414(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* this) { +s32 Bolse_8018D414(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* this) { Actor* actor = (Actor*) this; if (limbIndex == 2) { @@ -609,14 +658,14 @@ s32 func_i4_8018D414(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* t return false; } -void func_i4_8018D454(Actor* actor) { +void Bolse_8018D454(Actor* actor) { Matrix_Scale(gGfxMatrix, 2.0f, 2.0f, 2.0f, 1); Animation_GetFrameData(&D_BO_600F2E0, 0, actor->vwork); - Animation_DrawSkeleton(1, D_BO_600F36C, actor->vwork, func_i4_8018D414, NULL, actor, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_BO_600F36C, actor->vwork, Bolse_8018D414, NULL, actor, &gIdentityMatrix); actor->iwork[0] = 1; } -s32 func_i4_8018D4F0(Actor* actor) { +s32 Bolse_8018D4F0(Actor* actor) { s32 i; for (i = 0; i < 6; i++) { @@ -640,7 +689,7 @@ s32 func_i4_8018D4F0(Actor* actor) { return 0; } -bool func_i4_8018D584(Actor* actor) { +bool Bolse_8018D584(Actor* actor) { s32 i; if (actor->unk_0D0 == 0) { @@ -659,40 +708,41 @@ bool func_i4_8018D584(Actor* actor) { BonusText_Display(actor->obj.pos.x, actor->obj.pos.y + 730.0f, actor->obj.pos.z, 3); gHitCount += 4; - D_80177850 = 15; - D_i4_801A03DC--; + D_ctx_80177850 = 15; + D_BO_801A03DC--; if (1) {} actor->state = 1; - func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 730.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 10.0f, 15); + func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 730.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 10.0f, + 15); for (i = 0; i < 10; i++) { if (!(Rand_ZeroOne() >= 0.5f)) { - func_800A69F8(4, actor->obj.pos.x, actor->obj.pos.y + 730.0f, actor->obj.pos.z); + func_play_800A69F8(4, actor->obj.pos.x, actor->obj.pos.y + 730.0f, actor->obj.pos.z); } } - func_8007B344(actor->obj.pos.x, actor->obj.pos.y + 730.0f, actor->obj.pos.z, 10.0f, 5); + func_effect_8007B344(actor->obj.pos.x, actor->obj.pos.y + 730.0f, actor->obj.pos.z, 10.0f, 5); actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_BO_6011BA4); Audio_KillSfxBySourceAndId(actor->sfxSource, 0x11000028U); AUDIO_PLAY_SFX(0x2903B009U, actor->sfxSource, 0U); } else { - func_8007A6F0(&actor->obj.pos, 0x29121007); + func_effect_8007A6F0(&actor->obj.pos, 0x29121007); } return true; } -void func_i4_8018D7F0(Actor* actor) { - if (D_8015F924 != 0) { +void Bolse_8018D7F0(Actor* actor) { + if (D_360_8015F924 != 0) { actor->state = 1; } - func_i4_8018CC60(actor); + Bolse_8018CC60(actor); if (actor->state == 0) { - func_i4_8018D4F0(actor); - func_i4_8018D584(actor); + Bolse_8018D4F0(actor); + Bolse_8018D584(actor); } else { actor->timer_0CA[0] = 0; actor->info.bonus = 0; @@ -701,7 +751,7 @@ void func_i4_8018D7F0(Actor* actor) { actor->scale = -1.0f; } -s32 func_i4_8018D874(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* this) { +s32 Bolse_8018D874(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* this) { Actor* actor = (Actor*) this; RCP_SetupDL(&gMasterDisp, 0x1D); @@ -709,19 +759,19 @@ s32 func_i4_8018D874(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* t RCP_SetupDL(&gMasterDisp, 0x29); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 64, 64, 255); } - if (((limbIndex == 1) || (limbIndex == 2)) && ((actor->health >= 100) || (D_8015F924 != 0))) { + if (((limbIndex == 1) || (limbIndex == 2)) && ((actor->health >= 100) || (D_360_8015F924 != 0))) { *dList = NULL; } return false; } -void func_i4_8018D960(Actor* actor) { +void Bolse_8018D960(Actor* actor) { Animation_GetFrameData(&D_BO_600F3D8, 0, actor->vwork); - Animation_DrawSkeleton(3, D_BO_600F4A4, actor->vwork, func_i4_8018D874, NULL, actor, gCalcMatrix); + Animation_DrawSkeleton(3, D_BO_600F4A4, actor->vwork, Bolse_8018D874, NULL, actor, gCalcMatrix); } -s32 func_i4_8018D9CC(void) { +s32 Bolse_8018D9CC(void) { s32 i; f32 spA8[17]; f32 sp64[17]; @@ -747,7 +797,7 @@ s32 func_i4_8018D9CC(void) { return 0; } -s32 func_i4_8018DE8C(Boss* boss) { +s32 Bolse_8018DE8C(Boss* boss) { Vec3s D_i4_8019EEF8[26] = { { -81, 220, -4 }, { 635, 66, -362 }, { 677, 231, 1063 }, { 370, 340, 650 }, { -191, 478, -616 }, { 30, 210, -593 }, { 1321, 83, -2 }, { 458, 340, 518 }, { -312, 478, -561 }, { 646, 66, -362 }, @@ -759,19 +809,19 @@ s32 func_i4_8018DE8C(Boss* boss) { s32 index = RAND_FLOAT(26); if (!(gGameFrameCount % 2)) { - func_8007C120(D_i4_8019EEF8[index].x + boss->obj.pos.x, D_i4_8019EEF8[index].y + boss->obj.pos.y - 10.0f, - D_i4_8019EEF8[index].z + boss->obj.pos.z, 0.0f, 0.0f, 0.0f, 0.2f, 20); + func_effect_8007C120(D_i4_8019EEF8[index].x + boss->obj.pos.x, D_i4_8019EEF8[index].y + boss->obj.pos.y - 10.0f, + D_i4_8019EEF8[index].z + boss->obj.pos.z, 0.0f, 0.0f, 0.0f, 0.2f, 20); } if (!(gGameFrameCount % 5)) { - func_8007BFFC(D_i4_8019EEF8[index].x + boss->obj.pos.x, D_i4_8019EEF8[index].y + boss->obj.pos.y - 10.0f, - D_i4_8019EEF8[index].z + boss->obj.pos.z, 0.0f, 0.0f, 0.0f, 8.0f, 10); + func_effect_8007BFFC(D_i4_8019EEF8[index].x + boss->obj.pos.x, D_i4_8019EEF8[index].y + boss->obj.pos.y - 10.0f, + D_i4_8019EEF8[index].z + boss->obj.pos.z, 0.0f, 0.0f, 0.0f, 8.0f, 10); } return 0; } -s32 func_i4_8018E05C(Boss* boss, s32 index) { +s32 Bolse_8018E05C(Boss* boss, s32 index) { s32 i; f32 temp_fs0; f32 temp_fs1; @@ -816,14 +866,15 @@ s32 func_i4_8018E05C(Boss* boss, s32 index) { } for (i = 0; i < 5; i++) { - func_8007C484(gPlayer[0].pos.x + RAND_FLOAT_CENTERED(30.0f), gPlayer[0].pos.y + RAND_FLOAT(10.0f), - gPlayer[0].unk_138 + RAND_FLOAT_CENTERED(30.0f), gPlayer[0].vel.x, - gPlayer[0].vel.y + gPlayer[0].unk_0D8.y, gPlayer[0].vel.z, RAND_FLOAT(0.1f) + 0.1f, - gPlayer[0].num + 11); + func_effect_8007C484(gPlayer[0].pos.x + RAND_FLOAT_CENTERED(30.0f), + gPlayer[0].pos.y + RAND_FLOAT(10.0f), + gPlayer[0].unk_138 + RAND_FLOAT_CENTERED(30.0f), gPlayer[0].vel.x, + gPlayer[0].vel.y + gPlayer[0].unk_0D8.y, gPlayer[0].vel.z, RAND_FLOAT(0.1f) + 0.1f, + gPlayer[0].num + 11); } - func_8007BFFC(gPlayer[0].pos.x + RAND_FLOAT_CENTERED(10.0f), gPlayer[0].pos.y + RAND_FLOAT(10.0f), - gPlayer[0].unk_138 + RAND_FLOAT_CENTERED(10.0f), 0.0f, 15.0f, 0.0f, 2.0f, 5); + func_effect_8007BFFC(gPlayer[0].pos.x + RAND_FLOAT_CENTERED(10.0f), gPlayer[0].pos.y + RAND_FLOAT(10.0f), + gPlayer[0].unk_138 + RAND_FLOAT_CENTERED(10.0f), 0.0f, 15.0f, 0.0f, 2.0f, 5); } ret = true; } @@ -833,7 +884,7 @@ s32 func_i4_8018E05C(Boss* boss, s32 index) { return ret; } -s32 func_i4_8018E3FC(Boss* boss) { +s32 Bolse_8018E3FC(Boss* boss) { s32 i; s32 j; f32 D_i4_8019EF94[6] = { 31.0f, 91.0f, 151.0f, 211.0f, 271.0f, 331.0f }; @@ -890,7 +941,7 @@ s32 func_i4_8018E3FC(Boss* boss) { D_i4_801A0488[i].unk_18 = 1; D_i4_801A0488[i].unk_08 = (z / 400.0f); - func_i4_8018E05C(boss, i); + Bolse_8018E05C(boss, i); D_i4_801A03E0[i].unk_18 = 0; } @@ -900,9 +951,9 @@ s32 func_i4_8018E3FC(Boss* boss) { return 0; } -void func_i4_8018E710(Boss* boss) { +void Bolse_8018E710(Boss* boss) { if (boss->state == 1) { - func_i4_8018DE8C(boss); + Bolse_8018DE8C(boss); } else if (boss->swork[0] == 0) { boss->fwork[2] += 8.0f; if (boss->fwork[2] >= 100.0f) { @@ -917,8 +968,8 @@ void func_i4_8018E710(Boss* boss) { } } - func_i4_8018D9CC(); - func_i4_8018E3FC(boss); + Bolse_8018D9CC(); + Bolse_8018E3FC(boss); if (boss->fwork[1] != 0.0f) { boss->obj.rot.y += boss->fwork[1]; @@ -928,10 +979,10 @@ void func_i4_8018E710(Boss* boss) { } boss->fwork[0] += 2.0f; - Matrix_RotateY(&D_i4_8019EE80, gBosses[0].obj.rot.y * M_DTOR, 0); + Matrix_RotateY(&D_BO_8019EE80, gBosses[0].obj.rot.y * M_DTOR, 0); } -void func_i4_8018E870(Boss* boss) { +void Bolse_8018E870(Boss* boss) { s32 i; s32 alpha; @@ -974,7 +1025,7 @@ s32 D_i4_8019F000[] = { 0, 0, 0 }; f32 D_i4_8019F00C[] = { 0.0f, 80.0f, 150.0f }; f32 D_i4_8019F018[] = { 3.0f, -4.0f, 5.0f, 700.0f, 300.0f, 1000.0f }; -void func_i4_8018EAEC(Actor* actor, s32 index) { +void Bolse_8018EAEC(Actor* actor, s32 index) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; actor->obj.id = OBJ_ACTOR_195; @@ -991,7 +1042,7 @@ void func_i4_8018EAEC(Actor* actor, s32 index) { AUDIO_PLAY_SFX(0x3100000CU, actor->sfxSource, 4U); } -void func_i4_8018EC1C(void) { +void Bolse_8018EC1C(void) { Actor* actor = &gActors[50]; Actor_Initialize(actor); @@ -1006,7 +1057,7 @@ void func_i4_8018EC1C(void) { actor->info.bonus = 1; } -void func_i4_8018ECB4(void) { +void Bolse_8018ECB4(void) { Boss* boss = &gBosses[1]; Boss_Initialize(boss); @@ -1020,7 +1071,7 @@ void func_i4_8018ECB4(void) { Object_SetInfo(&boss->info, boss->obj.id); } -void func_i4_8018ED44(void) { +void Bolse_8018ED44(void) { Actor* actor = &gActors[0]; s32 i; @@ -1042,7 +1093,7 @@ void func_i4_8018ED44(void) { } } -void func_i4_8018EE4C(f32 x, f32 y) { +void Bolse_8018EE4C(f32 x, f32 y) { Actor* actor = &gActors[0]; s32 i; @@ -1080,7 +1131,7 @@ f32 D_i4_8019F078[] = { -30.0f, -60.0f, -90.0f }; f32 D_i4_8019F084[] = { 200.0f, 260.0f, 400.0f }; f32 D_i4_8019F090[] = { 70.0f, -80.0f, -65.0f }; -void func_i4_8018EF6C(Player* player) { +void Bolse_8018EF6C(Player* player) { s32 i; f32 sp60 = 0.0f; Vec3f sp54; @@ -1098,7 +1149,7 @@ void func_i4_8018EF6C(Player* player) { gAmbientG = 15; gAmbientB = 30; - D_80178410 = 1000; + D_ctx_80178410 = 1000; gCsFrameCount = 0; @@ -1109,21 +1160,21 @@ void func_i4_8018EF6C(Player* player) { player->unk_0D0 = 30.0f; if (gTeamShields[1] > 0) { - func_i4_8018EAEC(&gActors[0], 0); + Bolse_8018EAEC(&gActors[0], 0); } if (gTeamShields[2] > 0) { - func_i4_8018EAEC(&gActors[1], 1); + Bolse_8018EAEC(&gActors[1], 1); } if (gTeamShields[3] > 0) { - func_i4_8018EAEC(&gActors[2], 2); + Bolse_8018EAEC(&gActors[2], 2); } - func_i4_8018EC1C(); - func_i4_8018ECB4(); + Bolse_8018EC1C(); + Bolse_8018ECB4(); - D_80177A48[1] = -13000.0f; - D_80177A48[2] = -13000.0f; - D_80177A48[4] = -22000.0f; + D_ctx_80177A48[1] = -13000.0f; + D_ctx_80177A48[2] = -13000.0f; + D_ctx_80177A48[4] = -22000.0f; gCsCamEyeX = player->pos.x - 150; gCsCamEyeY = player->pos.y; @@ -1136,63 +1187,63 @@ void func_i4_8018EF6C(Player* player) { player->unk_1D0 = 1; player->unk_204 = 1; - D_80177A48[0] = 1.0f; - D_80178340 = D_80178358 = 255; + D_ctx_80177A48[0] = 1.0f; + D_ctx_80178340 = D_ctx_80178358 = 255; break; case 1: - D_80178358 = 0; + D_ctx_80178358 = 0; gCsCamAtX = 0.0f; gCsCamAtY = player->pos.y; gCsCamAtZ = player->pos.z; - D_80177A48[2] += 4.5f; - sp60 = SIN_DEG(D_80177A48[2]) * 10.0f; - player->unk_0EC = SIN_DEG(D_80177A48[2]) * -60.0f; + D_ctx_80177A48[2] += 4.5f; + sp60 = SIN_DEG(D_ctx_80177A48[2]) * 10.0f; + player->unk_0EC = SIN_DEG(D_ctx_80177A48[2]) * -60.0f; if (!(gCsFrameCount & 7) && (Rand_ZeroOne() < 0.5f)) { - func_i4_8018ED44(); + Bolse_8018ED44(); } switch (gCsFrameCount) { case 2: - func_i4_8018EE4C(600.0f, -100.0f); + Bolse_8018EE4C(600.0f, -100.0f); break; case 30: - func_i4_8018EE4C(400.0f, 0.0f); + Bolse_8018EE4C(400.0f, 0.0f); break; case 40: - func_i4_8018EE4C(0.0f, 100.0f); + Bolse_8018EE4C(0.0f, 100.0f); break; case 50: - func_i4_8018EE4C(-200.0f, 200.0f); + Bolse_8018EE4C(-200.0f, 200.0f); break; case 70: - func_i4_8018EE4C(200.0f, -300.0f); + Bolse_8018EE4C(200.0f, -300.0f); break; case 80: - func_i4_8018EE4C(700.0f, 400.0f); + Bolse_8018EE4C(700.0f, 400.0f); break; case 85: - func_i4_8018EE4C(600.0f, -200.0f); + Bolse_8018EE4C(600.0f, -200.0f); break; case 100: - func_i4_8018EE4C(-500.0f, 0.0f); + Bolse_8018EE4C(-500.0f, 0.0f); break; case 120: - func_i4_8018EE4C(-500.0f, 0.0f); + Bolse_8018EE4C(-500.0f, 0.0f); break; case 127: - func_800A6148(); - func_i4_80191ED8(); - func_8002F180(); + func_play_800A6148(); + Bolse_80191ED8(); + func_360_8002F180(); player->unk_1D0 = 2; @@ -1217,8 +1268,8 @@ void func_i4_8018EF6C(Player* player) { gCsCamAtX = player->pos.x; gCsCamAtY = player->pos.y; gCsCamAtZ = player->pos.z; - D_80178410 = 300; - D_80177A98 = 1; + D_ctx_80178410 = 300; + D_ctx_80177A98 = 1; gLight1R = 200; gLight1G = 80; @@ -1246,7 +1297,7 @@ void func_i4_8018EF6C(Player* player) { if (gCsFrameCount == 270) { player->state_1C8 = PLAYERSTATE_1C8_3; - player->unk_0D0 = D_80161A54; + player->unk_0D0 = D_play_80161A54; player->unk_014 = 0.0001f; for (i = 0, actor = &gActors[1]; i < 3; i++, actor++) { @@ -1256,8 +1307,8 @@ void func_i4_8018EF6C(Player* player) { actor->state = 3; actor->timer_0BC = 80; } - AUDIO_PLAY_BGM(D_80177C90); - D_80177838 = 80; + AUDIO_PLAY_BGM(D_ctx_80177C90); + D_ctx_80177838 = 80; } break; } @@ -1282,15 +1333,15 @@ void func_i4_8018EF6C(Player* player) { player->unk_138 = player->pos.z; player->unk_0F8 = (player->unk_0EC + player->unk_12C) + player->unk_130; - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_ctx_80177A48[0], 50000.0f, 0); } -void func_i4_8018F83C(Actor* actor, s32 arg1) { +void Bolse_8018F83C(Actor* actor, s32 arg1) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; actor->obj.id = OBJ_ACTOR_195; @@ -1305,7 +1356,7 @@ void func_i4_8018F83C(Actor* actor, s32 arg1) { AUDIO_PLAY_SFX(0x3100000CU, actor->sfxSource, 4U); } -void func_i4_8018F94C(Player* player) { +void Bolse_8018F94C(Player* player) { f32 sp8C; f32 sp88; s32 i; @@ -1337,7 +1388,7 @@ void func_i4_8018F94C(Player* player) { AUDIO_PLAY_SFX(0x09000002U, player->sfxSource, 0U); player->unk_194 = 5.0f; player->unk_190 = 5.0f; - D_80161A44 = 30000.0f; + D_game_80161A44 = 30000.0f; } break; @@ -1358,13 +1409,13 @@ void func_i4_8018F94C(Player* player) { player->timer_1F8 = 1000; func_8001CA24(0); Audio_KillSfxBySource(player->sfxSource); - func_800A6148(); + func_play_800A6148(); for (i = 0; i < 200; i++) { gObjects58[i].obj.status = OBJ_FREE; } - func_i4_8018EC1C(); + Bolse_8018EC1C(); player->pos.x = actor50->obj.pos.x; player->pos.y = actor50->obj.pos.y; @@ -1377,25 +1428,25 @@ void func_i4_8018F94C(Player* player) { player->unk_0D0 = 40.0f; if (gTeamShields[1] > 0) { - func_i4_8018F83C(&gActors[0], 0); + Bolse_8018F83C(&gActors[0], 0); } if (gTeamShields[2] > 0) { - func_i4_8018F83C(&gActors[1], 1); + Bolse_8018F83C(&gActors[1], 1); } if (gTeamShields[3] > 0) { - func_i4_8018F83C(&gActors[2], 2); + Bolse_8018F83C(&gActors[2], 2); } - D_80177A48[0] = 1.0f; - D_80178410 = 1000; - D_80177A98 = 0; + D_ctx_80177A48[0] = 1.0f; + D_ctx_80178410 = 1000; + D_ctx_80177A98 = 0; gCsCamEyeY = 0; gCsCamEyeX = 200.0f; gCsCamEyeZ = -15000.0f; gCsCamAtX = gPlayer[0].pos.x; gCsCamAtY = gPlayer[0].pos.y; gCsCamAtZ = gPlayer[0].pos.z; - D_80178340 = D_80178358 = 255; + D_ctx_80178340 = D_ctx_80178358 = 255; SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 50); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 50); gCsFrameCount = 0; @@ -1408,7 +1459,7 @@ void func_i4_8018F94C(Player* player) { break; case 5: - D_80178340 = D_80178358 = 0; + D_ctx_80178340 = D_ctx_80178358 = 0; player->unk_1D0 = 10; case 10: @@ -1420,22 +1471,23 @@ void func_i4_8018F94C(Player* player) { if (gCsFrameCount < 92) { if (!(gGameFrameCount & 1)) { - func_8007C484(actor50->obj.pos.x + RAND_FLOAT_CENTERED(1000.0f), actor50->obj.pos.y + 100.0f, - actor50->obj.pos.z + RAND_FLOAT_CENTERED(1000.0f), 0.0f, 0.0f, 0.0f, - RAND_FLOAT(0.4f) + 0.4f, 0.0f); + func_effect_8007C484(actor50->obj.pos.x + RAND_FLOAT_CENTERED(1000.0f), actor50->obj.pos.y + 100.0f, + actor50->obj.pos.z + RAND_FLOAT_CENTERED(1000.0f), 0.0f, 0.0f, 0.0f, + RAND_FLOAT(0.4f) + 0.4f, 0.0f); } if (!(gGameFrameCount & 1)) { //! FAKE: do { } while (0); - func_8007BFFC(RAND_FLOAT_CENTERED(1000.0f) + actor50->obj.pos.x, actor50->obj.pos.y + 100.0f, - RAND_FLOAT_CENTERED(1000.0f) + actor50->obj.pos.z, 0.0f, 0.0f, 0.0f, 10.0f, 5.0f); + func_effect_8007BFFC(RAND_FLOAT_CENTERED(1000.0f) + actor50->obj.pos.x, actor50->obj.pos.y + 100.0f, + RAND_FLOAT_CENTERED(1000.0f) + actor50->obj.pos.z, 0.0f, 0.0f, 0.0f, 10.0f, + 5.0f); } } if ((gCsFrameCount > 110) && (gCsFrameCount < 200)) { - D_801779A8[0] = 60.0f; + D_ctx_801779A8[0] = 60.0f; } switch (gCsFrameCount) { @@ -1444,7 +1496,7 @@ void func_i4_8018F94C(Player* player) { break; case 92: - D_Timer_80161A60 = 8; + D_play_Timer_80161A60 = 8; break; case 95: @@ -1455,71 +1507,71 @@ void func_i4_8018F94C(Player* player) { Object_Kill(&gEffects[i].obj, gEffects[i].sfxSource); } - func_8007B344(actor50->obj.pos.x, actor50->obj.pos.y, actor50->obj.pos.z, 400.0f, 4); + func_effect_8007B344(actor50->obj.pos.x, actor50->obj.pos.y, actor50->obj.pos.z, 400.0f, 4); break; case 100: case 105: case 110: - func_8007B344(actor50->obj.pos.x, actor50->obj.pos.y, actor50->obj.pos.z, 250.0f, 6); + func_effect_8007B344(actor50->obj.pos.x, actor50->obj.pos.y, actor50->obj.pos.z, 250.0f, 6); break; case 130: for (i = 0; i < 100; i++) { - func_80079618(RAND_FLOAT_CENTERED(300.0f) + actor50->obj.pos.x, - actor50->obj.pos.y - RAND_FLOAT(2000.0f), - RAND_FLOAT_CENTERED(300.0f) + actor50->obj.pos.z, 5.11f); + func_effect_80079618(RAND_FLOAT_CENTERED(300.0f) + actor50->obj.pos.x, + actor50->obj.pos.y - RAND_FLOAT(2000.0f), + RAND_FLOAT_CENTERED(300.0f) + actor50->obj.pos.z, 5.11f); }; for (i = 0; i < 100; i++) { - func_800795AC(RAND_FLOAT_CENTERED(300.0f) + actor50->obj.pos.x, - actor50->obj.pos.y - RAND_FLOAT(2000.0f), - RAND_FLOAT_CENTERED(300.0f) + actor50->obj.pos.z, 5.11f); + func_effect_800795AC(RAND_FLOAT_CENTERED(300.0f) + actor50->obj.pos.x, + actor50->obj.pos.y - RAND_FLOAT(2000.0f), + RAND_FLOAT_CENTERED(300.0f) + actor50->obj.pos.z, 5.11f); }; actor50->unk_046 = 1; break; case 235: player->unk_204 = 1; - D_80177840 = 100; + D_ctx_80177840 = 100; break; case 240: player->unk_1D0++; - D_80177A48[0] = 0; - D_80177A48[5] = 20.0f; - D_80177A48[6] = 0.0f; + D_ctx_80177A48[0] = 0; + D_ctx_80177A48[5] = 20.0f; + D_ctx_80177A48[6] = 0.0f; break; } if ((gCsFrameCount > 100) && (gCsFrameCount < 200)) { - D_801784D0 = 0.0f; + D_ctx_801784D0 = 0.0f; sp8C = 255.0f; - D_801784D4 = 16.0f; - D_801784D8 = 0.0f; + D_ctx_801784D4 = 16.0f; + D_ctx_801784D8 = 0.0f; sp88 = 255.0f; } else { - D_801784D0 = -80.0f; - D_801784D4 = 60.0f; - D_801784D8 = 0.0f; + D_ctx_801784D0 = -80.0f; + D_ctx_801784D4 = 60.0f; + D_ctx_801784D8 = 0.0f; } gCsCamEyeZ += gPlayer[0].vel.z * 0.3f; break; case 11: - D_80177A48[5] += D_80177A48[6]; + D_ctx_80177A48[5] += D_ctx_80177A48[6]; if (gCsFrameCount < 680) { gCsCamEyeZ += gPlayer[0].vel.z * 0.3f; - Math_SmoothStepToF(&D_80177A48[6], 0.7f, 0.1f, 0.005f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[6], 0.7f, 0.1f, 0.005f, 0.0f); gActors[0].vel.z = gActors[1].vel.z = gActors[2].vel.z = player->vel.z; } else { - Math_SmoothStepToF(&D_80177A48[6], 0.0f, 0.1f, 0.005f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[6], 0.0f, 0.1f, 0.005f, 0.0f); } Math_SmoothStepToF(&player->unk_0D0, 0.0f, 0.1f, 1.5f, 0.0f); - Math_SmoothStepToF(D_80177A48, 0.2f, 1.0f, 0.001f, 0.0f); - Matrix_RotateY(gCalcMatrix, D_80177A48[5] * M_DTOR, 0); + Math_SmoothStepToF(D_ctx_80177A48, 0.2f, 1.0f, 0.001f, 0.0f); + Matrix_RotateY(gCalcMatrix, D_ctx_80177A48[5] * M_DTOR, 0); Matrix_RotateX(gCalcMatrix, 0, 1); sp74.x = 0.0f; @@ -1571,28 +1623,28 @@ void func_i4_8018F94C(Player* player) { } if (player->timer_1F8 == 0) { - D_80178348 = D_80178350 = D_80178354 = 0; - D_80178358 = 255; - if (D_80178340 == 255) { + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; + D_ctx_80178358 = 255; + if (D_ctx_80178340 == 255) { D_80161A94[0] = gGoldRingCount[0]; gNextGameState = GSTATE_PLAY; gNextLevel = LEVEL_VENOM_1; func_8001CA24(0); Audio_KillSfxBySource(player->sfxSource); - D_800D3180[LEVEL_BOLSE] = Play_CheckMedalStatus(150) + 1; + D_play_800D3180[LEVEL_BOLSE] = Play_CheckMedalStatus(150) + 1; for (i = 1; i < 6; i++) { - D_80177C38[i] = gTeamShields[i]; - D_801778F0[i] = gSavedTeamShields[i]; + D_ctx_80177C38[i] = gTeamShields[i]; + D_ctx_801778F0[i] = gSavedTeamShields[i]; gSavedTeamShields[i] = gTeamShields[i]; } for (i = 1; i < 4; i++) { - if (D_80177C38[i] == 0) { - D_80177C38[i] = 255; + if (D_ctx_80177C38[i] == 0) { + D_ctx_80177C38[i] = 255; } } - func_80088564(); + func_hud_80088564(); } } break; @@ -1600,11 +1652,11 @@ void func_i4_8018F94C(Player* player) { switch (gCsFrameCount) { case 400: - D_80177830 = 1; + D_ctx_80177830 = 1; break; case 600: - D_80177830 = 0; + D_ctx_80177830 = 0; break; case 620: @@ -1615,12 +1667,12 @@ void func_i4_8018F94C(Player* player) { if (actor50->unk_046 != 0) { Math_SmoothStepToF(&actor50->fwork[20], 3.0f, 0.03f, 0.01f, 0); if (!(gGameFrameCount & 1)) { - func_8007C484( + func_effect_8007C484( RAND_FLOAT_CENTERED(5000.0f) + actor50->obj.pos.x, RAND_FLOAT_CENTERED(5000.0f) + actor50->obj.pos.y, RAND_FLOAT_CENTERED(5000.0f) + actor50->obj.pos.z, 0.0f, 0.0f, 0.0f, RAND_FLOAT(0.8f) + 0.8f, 0); } if (!(gGameFrameCount & 1)) { - func_8007BFFC( + func_effect_8007BFFC( RAND_FLOAT_CENTERED(5000.0f) + actor50->obj.pos.x, RAND_FLOAT_CENTERED(5000.0f) + actor50->obj.pos.y, RAND_FLOAT_CENTERED(5000.0f) + actor50->obj.pos.z, 0.0f, 0.0f, 0.0f, RAND_FLOAT(10.0f) + 20.0f, 5); } @@ -1665,18 +1717,18 @@ void func_i4_8018F94C(Player* player) { Math_SmoothStepToF(&player->pos.y, 700.0f, 0.1f, 10.0f, 0.0f); } - func_800B7184(player, 0); + func_play_800B7184(player, 0); player->camEye.x += player->vel.x * 0.1f; player->camEye.y += player->vel.y * 0.1f; player->camEye.z += player->vel.z * 0.1f; } else { - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 50000, 0); - Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 50000, 0); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 50000, 0); - Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 50000, 0); - Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 50000, 0); - Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 50000, 0); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], 50000, 0); + Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_ctx_80177A48[0], 50000, 0); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], 50000, 0); + Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_ctx_80177A48[0], 50000, 0); + Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_ctx_80177A48[0], 50000, 0); + Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_ctx_80177A48[0], 50000, 0); } player->unk_088 += 10.0f; player->unk_080 = -__sinf(player->unk_088 * M_DTOR) * 0.3f; @@ -1684,7 +1736,7 @@ void func_i4_8018F94C(Player* player) { player->unk_0F0 = __sinf(player->unk_0F4 * M_DTOR); } -void func_i4_80190D98(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot) { +void Bolse_80190D98(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot) { Vec3f src; Vec3f dest; @@ -1711,18 +1763,18 @@ void func_i4_80190D98(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f3 Object_SetInfo(&effect->info, effect->obj.id); } -void func_i4_80190EE4(f32 x, f32 y, f32 z, f32 arg3, f32 arg4) { +void Bolse_80190EE4(f32 x, f32 y, f32 z, f32 arg3, f32 arg4) { s32 i; for (i = 99; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i4_80190D98(&gEffects[i], x, y, z, arg3, arg4); + Bolse_80190D98(&gEffects[i], x, y, z, arg3, arg4); break; } } } -void func_i4_80190F58(Effect* effect, f32 x, f32 y, f32 z, f32 scale) { +void Bolse_80190F58(Effect* effect, f32 x, f32 y, f32 z, f32 scale) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_397; @@ -1736,22 +1788,22 @@ void func_i4_80190F58(Effect* effect, f32 x, f32 y, f32 z, f32 scale) { effect->info.unk_14 = 1; } -void func_i4_80190FE8(f32 x, f32 y, f32 z, f32 scale) { +void Bolse_80190FE8(f32 x, f32 y, f32 z, f32 scale) { s32 i; for (i = 99; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i4_80190F58(&gEffects[i], x, y, z, scale); + Bolse_80190F58(&gEffects[i], x, y, z, scale); break; } } } -void func_i4_80191054(Effect* effect) { +void Bolse_80191054(Effect* effect) { switch (effect->state) { case 0: if (gPlayer[0].unk_280 == 0) { - func_8007A774(gPlayer, effect, 150.0f); + func_effect_8007A774(gPlayer, effect, 150.0f); } Math_SmoothStepToF(&effect->scale2, 30.0f, 1.0f, 10.0f, 0.0f); @@ -1761,7 +1813,7 @@ void func_i4_80191054(Effect* effect) { } if (effect->obj.pos.y < gGroundLevel + 50.0f) { - func_i4_80190FE8(effect->obj.pos.x, gGroundLevel + 50.0f, effect->obj.pos.z, 3.0f); + Bolse_80190FE8(effect->obj.pos.x, gGroundLevel + 50.0f, effect->obj.pos.z, 3.0f); Object_Kill(&effect->obj, effect->sfxSource); } break; @@ -1776,7 +1828,7 @@ void func_i4_80191054(Effect* effect) { } } -void func_i4_80191180(Effect* effect) { +void Bolse_80191180(Effect* effect) { switch (effect->state) { case 0: gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 192); @@ -1799,7 +1851,7 @@ void func_i4_80191180(Effect* effect) { f32 D_i4_8019F09C[12] = { 0.0f, 0.0f, 60.0f, 60.0f, 120.0f, 120.0f, 180.0f, 180.0f, 240.0f, 240.0f, 300.0f, 300.0f }; -void func_i4_801912FC(Boss* boss) { +void Bolse_801912FC(Boss* boss) { s32 i; Vec3f src; Vec3f dest; @@ -1812,7 +1864,7 @@ void func_i4_801912FC(Boss* boss) { switch (boss->state) { case 0: - if (D_8015F924 == 2) { + if (D_360_8015F924 == 2) { boss->state = 1; } boss->dmgType = DMG_NONE; @@ -1873,7 +1925,7 @@ void func_i4_801912FC(Boss* boss) { gBosses[0].state = 1; } boss->obj.pos.y += 300.0f; - func_80042EC0(boss); + func_boss_80042EC0(boss); boss->obj.pos.y -= 300.0f; } else { boss->swork[12 + boss->dmgPart] = 20; @@ -1888,16 +1940,16 @@ void func_i4_801912FC(Boss* boss) { if (boss->swork[i + 24] != 0) { boss->swork[i + 24]--; if (!(gGameFrameCount & 1)) { - func_8007797C(boss->vwork[i].x, boss->vwork[i].y, boss->vwork[i].z, boss->vwork[i].x * 0.2f, 0.0f, - boss->vwork[i].z * 0.2f, 5.0f); + func_effect_8007797C(boss->vwork[i].x, boss->vwork[i].y, boss->vwork[i].z, boss->vwork[i].x * 0.2f, + 0.0f, boss->vwork[i].z * 0.2f, 5.0f); } } if (boss->swork[i] <= 0) { boss->info.hitbox[i * 6 + 4] = -200.0f; if (!((gGameFrameCount + i) & 7)) { - func_i4_80190EE4(boss->vwork[i].x, boss->vwork[i].y, boss->vwork[i].z, RAND_FLOAT_CENTERED(30.0f), - boss->obj.rot.y + D_i4_8019F09C[i] + RAND_FLOAT_CENTERED(30.0f)); + Bolse_80190EE4(boss->vwork[i].x, boss->vwork[i].y, boss->vwork[i].z, RAND_FLOAT_CENTERED(30.0f), + boss->obj.rot.y + D_i4_8019F09C[i] + RAND_FLOAT_CENTERED(30.0f)); boss->swork[i + 12] = 1003; } } else { @@ -1914,7 +1966,7 @@ void func_i4_801912FC(Boss* boss) { } } -s32 func_i4_801918E4(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* this) { +s32 Bolse_801918E4(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* this) { Boss* boss = (Boss*) this; RCP_SetupDL(&gMasterDisp, 0x1D); @@ -1959,7 +2011,7 @@ s32 func_i4_801918E4(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* t return false; } -void func_i4_80191A6C(s32 index, Vec3f* vec, void* ptr) { +void Bolse_80191A6C(s32 index, Vec3f* vec, void* ptr) { Vec3f src = { 0.0f, 0.0f, 0.0f }; Boss* boss = (Boss*) ptr; @@ -1977,29 +2029,29 @@ void func_i4_80191A6C(s32 index, Vec3f* vec, void* ptr) { } } -void func_i4_80191AFC(Boss* boss) { +void Bolse_80191AFC(Boss* boss) { Animation_GetFrameData(&D_BO_6001C64, 0, boss->vwork); if (boss->state >= 2) { - Animation_DrawSkeleton(3, D_BO_6001FB0, boss->vwork, func_i4_801918E4, func_i4_80191A6C, boss, gCalcMatrix); + Animation_DrawSkeleton(3, D_BO_6001FB0, boss->vwork, Bolse_801918E4, Bolse_80191A6C, boss, gCalcMatrix); } else { Animation_DrawSkeleton(3, D_BO_6001FB0, boss->vwork, NULL, NULL, boss, gCalcMatrix); } } -void func_i4_80191BAC(Boss* boss) { +void Bolse_80191BAC(Boss* boss) { D_i4_801A0530 = 0; - Math_SmoothStepToF(&boss->fwork[0], D_i4_801A03DC * 9.0f + 10.0f, 1.0f, 10.0f, 0.0f); + Math_SmoothStepToF(&boss->fwork[0], D_BO_801A03DC * 9.0f + 10.0f, 1.0f, 10.0f, 0.0f); - Texture_Scroll(&D_BO_600CF88, 16, 16, 0); - Texture_Scroll(&D_BO_600CF88, 16, 16, 0); + Texture_Scroll(D_BO_600CF88, 16, 16, 0); + Texture_Scroll(D_BO_600CF88, 16, 16, 0); switch (boss->state) { case 2: break; case 0: - if (D_i4_801A03DC == 0) { + if (D_BO_801A03DC == 0) { boss->timer_052 = 130; boss->state = 1; Radio_PlayMessage(gMsg_ID_11050, RCID_FOX); @@ -2017,22 +2069,22 @@ void func_i4_80191BAC(Boss* boss) { break; } - if (D_8017812C == 0) { + if (D_ctx_8017812C == 0) { if (!(gGameFrameCount & 1)) { - D_8017836C = 0.0f; + D_ctx_8017836C = 0.0f; } else { - D_8017836C = 0.5f; + D_ctx_8017836C = 0.5f; } - D_80178370 = boss->obj.pos.x; - D_80178374 = boss->obj.pos.y; - D_80178378 = boss->obj.pos.z; - D_80178360 = 255; - D_80178364 = 128; - D_80178368 = 128; + D_ctx_80178370 = boss->obj.pos.x; + D_ctx_80178374 = boss->obj.pos.y; + D_ctx_80178378 = boss->obj.pos.z; + D_ctx_80178360 = 255; + D_ctx_80178364 = 128; + D_ctx_80178368 = 128; } } -void func_i4_80191DB0(Boss* boss) { +void Bolse_80191DB0(Boss* boss) { s32 alpha; Matrix_Scale(gGfxMatrix, boss->unk_3F8, boss->unk_3F8, boss->unk_3F8, 1); @@ -2049,46 +2101,46 @@ void func_i4_80191DB0(Boss* boss) { } } -void func_i4_80191ED8(void) { +void Bolse_80191ED8(void) { s32 i; Actor* actor; Boss* boss; Object_58* obj58; - D_80178310 = SEGMENTED_TO_VIRTUAL(D_800CFDA0[gCurrentLevel]); + D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_enmy_800CFDA0[gCurrentLevel]); for (obj58 = gObjects58, i = 0; i < 1000; i++) { - if (D_80178310[i].id < 0) { + if (D_ctx_80178310[i].id < 0) { break; } - if (D_80178310[i].id < 161) { + if (D_ctx_80178310[i].id < 161) { Object_58_Initialize(obj58); obj58->obj.status = OBJ_ACTIVE; - obj58->obj.id = D_80178310[i].id; - obj58->sfxSource[0] = obj58->obj.pos.x = D_80178310[i].xPos; - obj58->sfxSource[1] = obj58->obj.pos.y = D_80178310[i].yPos; - obj58->sfxSource[2] = obj58->obj.pos.z = -D_80178310[i].zPos1; - obj58->unk_54 = obj58->obj.rot.y = D_80178310[i].rot.y; + obj58->obj.id = D_ctx_80178310[i].id; + obj58->sfxSource[0] = obj58->obj.pos.x = D_ctx_80178310[i].xPos; + obj58->sfxSource[1] = obj58->obj.pos.y = D_ctx_80178310[i].yPos; + obj58->sfxSource[2] = obj58->obj.pos.z = -D_ctx_80178310[i].zPos1; + obj58->unk_54 = obj58->obj.rot.y = D_ctx_80178310[i].rot.y; Object_SetInfo(&obj58->info, obj58->obj.id); obj58++; } } for (actor = &gActors[30], i = 0; i < 1000; i++) { - if (D_80178310[i].id < 0) { + if (D_ctx_80178310[i].id < 0) { break; } - if ((D_80178310[i].id >= OBJ_ACTOR_176) && (D_80178310[i].id <= OBJ_ACTOR_291)) { + if ((D_ctx_80178310[i].id >= OBJ_ACTOR_176) && (D_ctx_80178310[i].id <= OBJ_ACTOR_291)) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; - actor->obj.id = D_80178310[i].id; - if ((actor->obj.id == OBJ_ACTOR_271) && (D_8015F924 == 0)) { + actor->obj.id = D_ctx_80178310[i].id; + if ((actor->obj.id == OBJ_ACTOR_271) && (D_360_8015F924 == 0)) { AUDIO_PLAY_SFX(0x11000028U, actor->sfxSource, 0U); } - actor->fwork[10] = actor->obj.pos.x = D_80178310[i].xPos; - actor->fwork[11] = actor->obj.pos.y = D_80178310[i].yPos; - actor->fwork[12] = actor->obj.pos.z = -D_80178310[i].zPos1; - actor->fwork[13] = actor->obj.rot.y = D_80178310[i].rot.y; + actor->fwork[10] = actor->obj.pos.x = D_ctx_80178310[i].xPos; + actor->fwork[11] = actor->obj.pos.y = D_ctx_80178310[i].yPos; + actor->fwork[12] = actor->obj.pos.z = -D_ctx_80178310[i].zPos1; + actor->fwork[13] = actor->obj.rot.y = D_ctx_80178310[i].rot.y; Object_SetInfo(&actor->info, actor->obj.id); actor++; } @@ -2122,7 +2174,7 @@ void func_i4_80191ED8(void) { Object_SetInfo(&boss->info, boss->obj.id); } -void func_i4_80192264(void) { +void Bolse_80192264(void) { Vec3f spDC = { 0.0f, 0.0f, 0.0f }; Vec3f spD0; f32 rnd; @@ -2145,7 +2197,7 @@ void func_i4_80192264(void) { Matrix_Push(&gGfxMatrix); Rand_SetSeed(1, 29100, 9786); - Matrix_Translate(gGfxMatrix, 0.0f, D_8017847C, 0.0f, 1); + Matrix_Translate(gGfxMatrix, 0.0f, D_ctx_8017847C, 0.0f, 1); Matrix_RotateY(gGfxMatrix, gBosses[0].obj.rot.y * M_DTOR, 1); Matrix_Scale(gGfxMatrix, 5.0f, 1.0f, 5.0f, 1); diff --git a/src/overlays/ovl_i4/fox_fo.c b/src/overlays/ovl_i4/fox_fo.c index 5c5a67bd..3ed00f42 100644 --- a/src/overlays/ovl_i4/fox_fo.c +++ b/src/overlays/ovl_i4/fox_fo.c @@ -7,7 +7,7 @@ #include "global.h" #include "assets/ast_fortuna.h" -void func_i4_801875F0(Actor* actor) { +void Fortuna_801875F0(Actor* actor) { s32 i; s32 counter; Actor* actorPtr = &gActors[10]; @@ -20,7 +20,7 @@ void func_i4_801875F0(Actor* actor) { } if ((counter < 10) && (actor->timer_0C0 == 0)) { - if (D_8015F928 < (D_800C9B4C - 500)) { + if (D_360_8015F928 < (D_360_800C9B4C - 500)) { actor->timer_0C0 = 40; actor->unk_04E++; @@ -63,12 +63,12 @@ void func_i4_801875F0(Actor* actor) { } } } - func_8002F69C(actor); + func_360_8002F69C(actor); } f32 D_8019EDEC[] = { 0.0f, 700.0f, 12000.0f }; -void func_i4_80187884(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 arg4) { +void Fortuna_80187884(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 arg4) { s32 health = actor->health; PRINTF("Enm->work[0]=%d\n"); PRINTF("tim %d\n"); @@ -94,7 +94,7 @@ void func_i4_80187884(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 arg4) { Vec3f D_i4_8019EDF8[] = { { -300.0f, 1000.0f, 13000.0f }, { 300.0f, 700.0f, 14000.0f }, { 1000.0f, 300.0f, 0.0f } }; Vec3f D_i4_8019EE1C[] = { { -1000.0f, 300.0f, 0 }, { 0.0f, 500.0f, 0 } }; -void func_i4_80187960(Actor* actor) { +void Fortuna_80187960(Actor* actor) { s32 i; Player* player = &gPlayer[0]; Actor* actorPtr; @@ -107,101 +107,103 @@ void func_i4_80187960(Actor* actor) { s32 pad[2]; if ((player->state_1C8 == PLAYERSTATE_1C8_4) || (player->state_1C8 == PLAYERSTATE_1C8_6)) { - D_8015F928 = 20000; + D_360_8015F928 = 20000; return; } - if (D_8015F928 == 50) { + if (D_360_8015F928 == 50) { Radio_PlayMessage(gMsg_ID_9000, RCID_FOX); } - if ((D_8015F928 + 400) == (0, D_800C9B4C)) { + if ((D_360_8015F928 + 400) == (0, D_360_800C9B4C)) { Radio_PlayMessage(gMsg_ID_9010, RCID_SLIPPY); } - if ((D_8015F928 + 240) == (0, D_800C9B4C)) { + if ((D_360_8015F928 + 240) == (0, D_360_800C9B4C)) { Radio_PlayMessage(gMsg_ID_9375, RCID_ROB64); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1); } - if ((D_8015F928 + 100) == (0, D_800C9B4C)) { + if ((D_360_8015F928 + 100) == (0, D_360_800C9B4C)) { Radio_PlayMessage(gMsg_ID_9380, RCID_FOX); } - if (D_8015F928 == 7160) { + if (D_360_8015F928 == 7160) { Radio_PlayMessage(gMsg_ID_9385, RCID_FOX); } - if (D_8015F928 == 7000) { + if (D_360_8015F928 == 7000) { AUDIO_PLAY_SFX(0x11030016U, gBosses[0].sfxSource, 4U); - func_8002EE34(); + func_360_8002EE34(); Radio_PlayMessage(gMsg_ID_9390, RCID_ROB64); - D_8015F944 = 1.0f; - D_8015F93C = 1; - D_8015F930[0] = 1; - D_8015F930[1] = PLAYERSTATE_1C8_4; - D_8015F930[2] = 99; + D_360_8015F944 = 1.0f; + D_360_8015F93C = 1; + D_360_8015F930[0] = 1; + D_360_8015F930[1] = PLAYERSTATE_1C8_4; + D_360_8015F930[2] = 99; } - if (D_8015F928 == 8036) { + if (D_360_8015F928 == 8036) { Radio_PlayMessage(gMsg_ID_9395, RCID_ROB64); } - if (D_8015F928 == 8540) { + if (D_360_8015F928 == 8540) { Radio_PlayMessage(gMsg_ID_9400, RCID_ROB64); Audio_PlaySequence(SEQ_PLAYER_BGM, SEQ_ID_10 | 0x8000, 0, 0); gActors[1].aiIndex = gActors[2].aiIndex = gActors[3].aiIndex = gActors[4].aiIndex = gActors[5].aiIndex = gActors[6].aiIndex = gActors[7].aiIndex = -1; } - if ((D_800C9B4C < D_8015F928) && (D_8015F928 < 9970) && (D_80177CD0[0] == 0) && (D_80177CD0[1] == 0) && - (D_80177CD0[2] == 0) && (D_80177CD0[3] == 0)) { - D_8015F928 = 9970; + if ((D_360_800C9B4C < D_360_8015F928) && (D_360_8015F928 < 9970) && (D_ctx_80177CD0[0] == 0) && + (D_ctx_80177CD0[1] == 0) && (D_ctx_80177CD0[2] == 0) && (D_ctx_80177CD0[3] == 0)) { + D_360_8015F928 = 9970; } - if (D_8015F928 == 9056) { - if ((D_80177CD0[0] != 0) || (D_80177CD0[1] != 0) || (D_80177CD0[2] != 0) || ((D_80177CD0[3] != 0))) { + if (D_360_8015F928 == 9056) { + if ((D_ctx_80177CD0[0] != 0) || (D_ctx_80177CD0[1] != 0) || (D_ctx_80177CD0[2] != 0) || + ((D_ctx_80177CD0[3] != 0))) { Radio_PlayMessage(gMsg_ID_9405, RCID_ROB64); } else { - D_8015F928 = 9995; + D_360_8015F928 = 9995; } } - if (D_8015F928 == 9206) { - D_8015F93C = 0; + if (D_360_8015F928 == 9206) { + D_360_8015F93C = 0; actor->state = 5; gPlayer[0].state_1C8 = PLAYERSTATE_1C8_0; actor->iwork[0] = 0; actor->fwork[0] = 0.0f; - func_8002EE34(); + func_360_8002EE34(); for (i = 4; i < 8; i++) { Object_Kill(&gActors[i].obj, gActors[i].sfxSource); } } - if ((D_8015F928 == 10000) && - ((D_80177CD0[0] != 0) || (D_80177CD0[1] != 0) || (D_80177CD0[2] != 0) || (D_80177CD0[3] != 0))) { + if ((D_360_8015F928 == 10000) && ((D_ctx_80177CD0[0] != 0) || (D_ctx_80177CD0[1] != 0) || + (D_ctx_80177CD0[2] != 0) || (D_ctx_80177CD0[3] != 0))) { Radio_PlayMessage(gMsg_ID_9420, RCID_FOX); } - if (D_8015F928 == 10100) { - D_8015F93C = 0; + if (D_360_8015F928 == 10100) { + D_360_8015F93C = 0; actor->iwork[0] = 0; actor->state = 6; gPlayer[0].state_1C8 = PLAYERSTATE_1C8_7; gPlayer[0].unk_1D0 = 0; gPlayer[0].unk_000 = 0.0f; - func_8002EE34(); + func_360_8002EE34(); for (i = 4; i < 8; i++) { Object_Kill(&gActors[i].obj, gActors[i].sfxSource); } - if ((D_80177CD0[0] == 0) && (D_80177CD0[1] == 0) && (D_80177CD0[2] == 0) && (D_80177CD0[3] == 0)) { + if ((D_ctx_80177CD0[0] == 0) && (D_ctx_80177CD0[1] == 0) && (D_ctx_80177CD0[2] == 0) && + (D_ctx_80177CD0[3] == 0)) { Radio_PlayMessage(gMsg_ID_9411, RCID_FOX); - D_80177930 = 1; + D_ctx_80177930 = 1; gPlayer[0].timer_1F8 = 50; player->unk_190 = 5.0f; player->unk_194 = 5.0f; @@ -209,28 +211,28 @@ void func_i4_80187960(Actor* actor) { SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 30); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 30); } else { - D_80177930 = 0; + D_ctx_80177930 = 0; gPlayer[0].timer_1F8 = 30; } } switch (actor->state) { case 0: - D_800C9B4C = 2880; + D_360_800C9B4C = 2880; for (i = 0; i < 6; i++) { - D_80177CF0[i] = 1; - D_80177CD0[i] = 1; + D_ctx_80177CF0[i] = 1; + D_ctx_80177CD0[i] = 1; } - D_8015F928 = 0; - D_8015F908 = 0; + D_360_8015F928 = 0; + D_360_8015F908 = 0; if (player->state_1C8 == PLAYERSTATE_1C8_3) { actor->state = 2; player->pos.x = 0.0f; player->pos.z = 8000.0f; player->pos.y = 670.0f; - D_8015F928 = 200; - if (D_8015F924 != 0) { - D_8015F928 = D_800C9B4C - 1; + D_360_8015F928 = 200; + if (D_360_8015F924 != 0) { + D_360_8015F928 = D_360_800C9B4C - 1; gHitCount = gSavedHitCount; } } else { @@ -246,7 +248,7 @@ void func_i4_80187960(Actor* actor) { actorPtr->obj.pos.z = D_i4_8019EDF8[i - 1].z; } } - func_800B63BC(player, 1); + func_play_800B63BC(player, 1); break; case 1: @@ -261,14 +263,14 @@ void func_i4_80187960(Actor* actor) { actor->state = 2; player->state_1C8 = 3; player->unk_014 = 0.0001f; - AUDIO_PLAY_BGM(D_80177C90); - D_80177838 = 80; + AUDIO_PLAY_BGM(D_ctx_80177C90); + D_ctx_80177838 = 80; } }; break; case 2: - func_i4_801875F0(actor); + Fortuna_801875F0(actor); break; case 3: @@ -279,9 +281,9 @@ void func_i4_80187960(Actor* actor) { Math_SmoothStepToF(&player->camAt.y, actor4->obj.pos.y, 1.0f, 20000.0f, 0.0f); Math_SmoothStepToF(&player->camAt.z, actor4->obj.pos.z, 1.0f, 20000.0f, 0.0f); Math_SmoothStepToF(&player->unk_034, 0.0f, 1.0f, 1000.0f, 0.0f); - if (D_8015F928 == (D_800C9B4C + 2)) { - D_8015F908 = 883; - D_8015F924 = 1; + if (D_360_8015F928 == (D_360_800C9B4C + 2)) { + D_360_8015F908 = 883; + D_360_8015F924 = 1; gSavedHitCount = gHitCount; @@ -290,18 +292,18 @@ void func_i4_80187960(Actor* actor) { }; } - if ((gControllerPress->button & 0x1000) || (D_8015F928 == (D_800C9B4C + 0x1B8))) { + if ((gControllerPress->button & 0x1000) || (D_360_8015F928 == (D_360_800C9B4C + 0x1B8))) { actor->state = 2; player->state_1C8 = PLAYERSTATE_1C8_3; - func_800B7184(player, 1); + func_play_800B7184(player, 1); player->unk_014 = 0.0f; - D_80161708 = 0; + D_hud_80161708 = 0; } - D_801779BC = 0; + D_ctx_801779BC = 0; break; case 5: - D_8015F928 = 9207; + D_360_8015F928 = 9207; actor->iwork[0] += 1; actor->fwork[0] += 10.0f; player->camEye.x = 300.0f; @@ -312,56 +314,56 @@ void func_i4_80187960(Actor* actor) { player->camAt.z = -15000.0f; player->unk_034 = 0.0f; - if ((actor->iwork[0] == 50) && (D_80177CD0[0] != 0)) { + if ((actor->iwork[0] == 50) && (D_ctx_80177CD0[0] != 0)) { if (gRadioState == 0) { Radio_PlayMessage(gMsg_ID_9431, RCID_WOLF); } - func_i4_80187884(&gActors[4], player->camEye.x - 200.0f, player->camEye.y, player->camEye.z, 160.0f); + Fortuna_80187884(&gActors[4], player->camEye.x - 200.0f, player->camEye.y, player->camEye.z, 160.0f); } - if ((actor->iwork[0] == 70) && (D_80177CD0[1] != 0)) { + if ((actor->iwork[0] == 70) && (D_ctx_80177CD0[1] != 0)) { if (gRadioState == 0) { Radio_PlayMessage(gMsg_ID_9432, RCID_LEON); } - func_i4_80187884(&gActors[5], player->camEye.x, player->camEye.y + 50.0f, player->camEye.z, 160.0f); + Fortuna_80187884(&gActors[5], player->camEye.x, player->camEye.y + 50.0f, player->camEye.z, 160.0f); } - if ((actor->iwork[0] == 90) && (D_80177CD0[2] != 0)) { + if ((actor->iwork[0] == 90) && (D_ctx_80177CD0[2] != 0)) { if (gRadioState == 0) { Radio_PlayMessage(gMsg_ID_9433, RCID_PIGMA); } - func_i4_80187884(gActors + 6, player->camEye.x - 200.0f, player->camEye.y + 200.0f, player->camEye.z, + Fortuna_80187884(gActors + 6, player->camEye.x - 200.0f, player->camEye.y + 200.0f, player->camEye.z, 160.0f); } - if ((actor->iwork[0] == 110) && (D_80177CD0[3] != 0)) { + if ((actor->iwork[0] == 110) && (D_ctx_80177CD0[3] != 0)) { if (gRadioState == 0) { Radio_PlayMessage(gMsg_ID_9434, RCID_ANDREW); } - func_i4_80187884(gActors + 7, player->camEye.x - 300.0f, player->camEye.y, player->camEye.z, 160.0f); + Fortuna_80187884(gActors + 7, player->camEye.x - 300.0f, player->camEye.y, player->camEye.z, 160.0f); } if (actor->iwork[0] == 250) { actor->state = 2; player->state_1C8 = PLAYERSTATE_1C8_3; - func_800B7184(player, 1); + func_play_800B7184(player, 1); player->unk_014 = 0.0f; - D_80161708 = 0; + D_hud_80161708 = 0; for (i = 4; i < 8; i++) { Object_Kill(&gActors[i].obj, gActors[i].sfxSource); } - D_8015F93C = 1; - D_8015F928 = 9970; + D_360_8015F93C = 1; + D_360_8015F928 = 9970; } break; case 6: actor->iwork[0] += 1; - if (D_80177930 == 0) { + if (D_ctx_80177930 == 0) { actor1->aiIndex = 0; actor1->state = 2; actor2->aiIndex = 0; @@ -389,30 +391,30 @@ void func_i4_80187960(Actor* actor) { } } gOverlayStage = 1; - D_80161A44 = 30000.0f; + D_game_80161A44 = 30000.0f; break; default: break; } - if (D_8015F908 != 0) { - D_8015F908--; - switch (D_8015F908) { + if (D_360_8015F908 != 0) { + D_360_8015F908--; + switch (D_360_8015F908) { case 860: - if (D_80177CD0[0] != 0) { + if (D_ctx_80177CD0[0] != 0) { Radio_PlayMessage(gMsg_ID_9250, RCID_WOLF); } break; case 760: - if (D_80177CD0[1] != 0) { + if (D_ctx_80177CD0[1] != 0) { Radio_PlayMessage(gMsg_ID_9260, RCID_LEON); } break; case 660: - if (D_80177CD0[2] != 0) { + if (D_ctx_80177CD0[2] != 0) { if (gTeamShields[3] > 0) { Radio_PlayMessage(gMsg_ID_9275, RCID_PIGMA); } else { @@ -422,7 +424,7 @@ void func_i4_80187960(Actor* actor) { break; case 540: - if (D_80177CD0[3] != 0) { + if (D_ctx_80177CD0[3] != 0) { Radio_PlayMessage(gMsg_ID_9280, RCID_ANDREW); } break; @@ -438,7 +440,7 @@ void func_i4_80187960(Actor* actor) { } } -void func_i4_801888C0(Actor* actor, Vec3f* pos, Vec3f* rot, f32 xVel, f32 yVel, f32 zVel, s32 state) { +void Fortuna_801888C0(Actor* actor, Vec3f* pos, Vec3f* rot, f32 xVel, f32 yVel, f32 zVel, s32 state) { Actor_Initialize(actor); actor->obj.status = OBJ_ACTIVE; actor->obj.id = OBJ_ACTOR_189; @@ -457,33 +459,33 @@ void func_i4_801888C0(Actor* actor, Vec3f* pos, Vec3f* rot, f32 xVel, f32 yVel, Object_SetInfo(&actor->info, actor->obj.id); } -void func_i4_80188A48(Vec3f* pos, Vec3f* rot, f32 xVel, f32 yVel, f32 zVel, s32 state) { +void Fortuna_80188A48(Vec3f* pos, Vec3f* rot, f32 xVel, f32 yVel, f32 zVel, s32 state) { s32 i; for (i = ARRAY_COUNT(gActors) - 1; i >= 30; i--) { if (gActors[i].obj.status == 0) { - func_i4_801888C0(&gActors[i], pos, rot, xVel, yVel, zVel, state); + Fortuna_801888C0(&gActors[i], pos, rot, xVel, yVel, zVel, state); break; } } } -void func_i4_80188AD0(Actor* actor) { +void Fortuna_80188AD0(Actor* actor) { actor->fwork[0] += 2.0f; if (actor->state == 2) { actor->state = 3; - func_i4_80188A48(actor->vwork, &actor->vwork[6], RAND_FLOAT_CENTERED(50.0f), RAND_FLOAT(10.0f) + 10.0f, + Fortuna_80188A48(actor->vwork, &actor->vwork[6], RAND_FLOAT_CENTERED(50.0f), RAND_FLOAT(10.0f) + 10.0f, RAND_FLOAT_CENTERED(50.0f), 36); - func_i4_80188A48(&actor->vwork[1], &actor->vwork[7], RAND_FLOAT_CENTERED(50.0f), RAND_FLOAT(10.0f) + 10.0f, + Fortuna_80188A48(&actor->vwork[1], &actor->vwork[7], RAND_FLOAT_CENTERED(50.0f), RAND_FLOAT(10.0f) + 10.0f, RAND_FLOAT_CENTERED(50.0f), 36); - func_i4_80188A48(&actor->vwork[2], &actor->vwork[8], RAND_FLOAT_CENTERED(50.0f), RAND_FLOAT(10.0f) + 10.0f, + Fortuna_80188A48(&actor->vwork[2], &actor->vwork[8], RAND_FLOAT_CENTERED(50.0f), RAND_FLOAT(10.0f) + 10.0f, RAND_FLOAT_CENTERED(50.0f), 35); - func_i4_80188A48(&actor->vwork[3], &actor->vwork[9], RAND_FLOAT_CENTERED(50.0f), RAND_FLOAT(10.0f) + 10.0f, + Fortuna_80188A48(&actor->vwork[3], &actor->vwork[9], RAND_FLOAT_CENTERED(50.0f), RAND_FLOAT(10.0f) + 10.0f, RAND_FLOAT_CENTERED(50.0f), 35); - func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 180.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 5.0f, 10); + func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 180.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 5.0f, 10); actor->unk_044 = 1; actor->obj.pos.y += 230.0f; - func_80066254(actor); + func_enmy_80066254(actor); actor->obj.pos.y -= 230.0f; } @@ -498,7 +500,7 @@ void func_i4_80188AD0(Actor* actor) { } } -void func_i4_80188DA0(s32 limbIndex, Vec3f* rot, void* ptr) { +void Fortuna_80188DA0(s32 limbIndex, Vec3f* rot, void* ptr) { Vec3f vec = { 0.0f, 0.0f, 0.0f }; Actor* actor = (Actor*) ptr; @@ -537,7 +539,7 @@ void func_i4_80188DA0(s32 limbIndex, Vec3f* rot, void* ptr) { } } -s32 func_i4_80188F08(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* ptr) { +s32 Fortuna_80188F08(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* ptr) { Actor* actor = (Actor*) ptr; gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); @@ -568,18 +570,18 @@ s32 func_i4_80188F08(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* p return false; } -void func_i4_80188FE4(Actor* actor) { +void Fortuna_80188FE4(Actor* actor) { Vec3f vec[20]; Animation_GetFrameData(&D_FO_6007854, 0, vec); - Animation_DrawSkeleton(3, D_FO_6007980, vec, func_i4_80188F08, func_i4_80188DA0, actor, gCalcMatrix); + Animation_DrawSkeleton(3, D_FO_6007980, vec, Fortuna_80188F08, Fortuna_80188DA0, actor, gCalcMatrix); if (actor->state == 1) { actor->state = 2; } } -void func_i4_8018906C(void) { +void Fortuna_8018906C(void) { Actor* actor = &gActors[50]; Actor_Initialize(actor); @@ -597,14 +599,14 @@ f32 D_i4_8019EE4C[] = { -200.0f, 200.0f, -50.0f, -2000.0f }; f32 D_i4_8019EE5C[] = { 0.0f, 30.0f, -90.0f, 0.0f }; f32 D_i4_8019EE6C[] = { -100.0f, -200.0f, -300.0f, 0.0f }; s32 D_i4_8019EE7C = 0; // padding for dword aligned matrix? -Matrix D_i4_8019EE80 = { { +Matrix D_BO_8019EE80 = { { { 0.0f, 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f, 0.0f }, } }; -void func_i4_801890EC(Actor* actor, s32 arg1) { +void Fortuna_801890EC(Actor* actor, s32 arg1) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; actor->obj.id = OBJ_ACTOR_195; @@ -628,7 +630,7 @@ void func_i4_801890EC(Actor* actor, s32 arg1) { } } -void func_i4_8018927C(Player* player) { +void Fortuna_8018927C(Player* player) { s32 i; Vec3f src; Vec3f dest; @@ -643,14 +645,14 @@ void func_i4_8018927C(Player* player) { Math_SmoothStepToF(&player->unk_12C, 0.0f, 0.1f, 15.0f, 0.0f); Math_SmoothStepToF(&player->unk_034, 0.0f, 0.1f, 3.0f, 0.0f); Math_SmoothStepToAngle(&player->unk_4D8, 0.0f, 0.1f, 20.0f, 0.0f); - if (D_80177930 == 0) { + if (D_ctx_80177930 == 0) { if (player->pos.y < 700.0f) { Math_SmoothStepToF(&player->pos.y, 700.0f, 0.1f, 10.0f, 0.0f); } } else if (player->pos.y < 500.0f) { Math_SmoothStepToF(&player->pos.y, 500.0f, 0.1f, 5.0f, 0.0f); } - func_800B7184(player, 0); + func_play_800B7184(player, 0); player->camEye.x += player->vel.x * 0.1f; player->camEye.y += player->vel.y * 0.1f; player->camEye.z += player->vel.z * 0.1f; @@ -682,9 +684,9 @@ void func_i4_8018927C(Player* player) { player->camAt.z = player->unk_138; if (player->timer_1F8 < 80) { - D_80178358 = 255; - D_8017835C = 10; - D_80178350 = D_80178348 = D_80178354 = 0; + D_ctx_80178358 = 255; + D_ctx_8017835C = 10; + D_ctx_80178350 = D_ctx_80178348 = D_ctx_80178354 = 0; if (player->timer_1F8 == 0) { player->timer_1F8 = 0; player->unk_1D0 = 1; @@ -693,7 +695,7 @@ void func_i4_8018927C(Player* player) { break; case 0: - if (D_80177930 == 0) { + if (D_ctx_80177930 == 0) { Math_SmoothStepToF(&player->unk_0E8, 40.0f, 0.1f, 2.5f, 0.0f); Math_SmoothStepToF(&player->unk_0EC, 60.0f, 0.2f, 5.0f, 0.0f); Math_SmoothStepToF(&player->unk_0E4, 0.0f, 0.1f, 2.5f, 0.0f); @@ -710,7 +712,7 @@ void func_i4_8018927C(Player* player) { } if (player->timer_1F8 == 0) { - if (D_80177930 != 0) { + if (D_ctx_80177930 != 0) { player->timer_1F8 = 150; player->unk_1D0 = -1; player->pos.x = 0.0f; @@ -753,32 +755,32 @@ void func_i4_8018927C(Player* player) { func_8001CA24(0); Audio_KillSfxBySource(player->sfxSource); player->unk_234 = 0; - D_80178340 = 255; - D_80178358 = 255; - D_80178348 = D_80178350 = D_80178354 = 0; - D_8017835C = 0; + D_ctx_80178340 = 255; + D_ctx_80178358 = 255; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; + D_ctx_8017835C = 0; } break; case 2: - if (!(D_80177930) && (player->timer_1F8) > 830) { - D_80178358 = 0; - D_8017835C = 8; + if (!(D_ctx_80177930) && (player->timer_1F8) > 830) { + D_ctx_80178358 = 0; + D_ctx_8017835C = 8; } if (player->timer_1F8 == 810) { Audio_KillSfxBySource(gBosses[0].sfxSource); } if (player->timer_1F8 == 830) { - D_80178358 = 255; - D_8017835C = 2; - D_80178348 = D_80178350 = D_80178354 = 255; + D_ctx_80178358 = 255; + D_ctx_8017835C = 2; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; } gBosses[0].swork[0] = 1; - if ((func_80090200(&gBosses[0]) == 2) || (D_80177930 != 0)) { - func_800A6148(); - if (D_80177930 == 0) { + if ((func_hud_80090200(&gBosses[0]) == 2) || (D_ctx_80177930 != 0)) { + func_play_800A6148(); + if (D_ctx_80177930 == 0) { player->unk_1D0 = 10; } else { player->unk_1D0 = 20; @@ -788,20 +790,20 @@ void func_i4_8018927C(Player* player) { gObjects58[i].obj.status = OBJ_FREE; } - func_800A5EBC(); + func_play_800A5EBC(); gLevelType = 1; - D_801784AC = gBgColor = gFogRed = gFogGreen = gFogBlue = 0; + D_ctx_801784AC = gBgColor = gFogRed = gFogGreen = gFogBlue = 0; gLight1R = gLight2R = D_80161A70 = 86; gLight1G = gLight2G = D_80161A74 = 58; gLight1B = gLight2B = D_80161A78 = 25; gAmbientR = 11; gAmbientG = 8; gAmbientB = 24; - D_801784D0 = D_801784C4 = D_801784C4 = D_801784F8 = D_801784C4 = -59.0f; - D_801784D4 = D_801784C8 = D_801784C8 = D_801784FC = D_801784C8 = 58.0f; - D_801784D8 = D_801784CC = D_801784CC = D_80178500 = D_801784CC = 13.0f; + D_ctx_801784D0 = D_ctx_801784C4 = D_ctx_801784C4 = D_ctx_801784F8 = D_ctx_801784C4 = -59.0f; + D_ctx_801784D4 = D_ctx_801784C8 = D_ctx_801784C8 = D_ctx_801784FC = D_ctx_801784C8 = 58.0f; + D_ctx_801784D8 = D_ctx_801784CC = D_ctx_801784CC = D_ctx_80178500 = D_ctx_801784CC = 13.0f; - if (D_80177930 == 0) { + if (D_ctx_80177930 == 0) { player->pos.x = 0.0f; player->pos.y = 0.0f; player->unk_0E4 = 0.0f; @@ -809,7 +811,7 @@ void func_i4_8018927C(Player* player) { player->unk_0D0 = 0.0f; player->unk_114 = 0.0f; player->unk_0E8 = 180.0f; - func_i4_8018906C(); + Fortuna_8018906C(); } else { player->pos.x = 0.0f; player->unk_0E4 = 0.0f; @@ -827,16 +829,16 @@ void func_i4_8018927C(Player* player) { SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 100); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 100); func_8001C8B8(0); - if (D_80177930 == 0) { - func_i4_801890EC(actor0, 3); + if (D_ctx_80177930 == 0) { + Fortuna_801890EC(actor0, 3); } } break; case 10: player->unk_234 = 1; - D_80178358 = 0; - D_8017835C = 4; + D_ctx_80178358 = 0; + D_ctx_8017835C = 4; player->camEye.x = 400.0f; player->camEye.y = 0; player->camEye.z = 0.0f; @@ -847,29 +849,29 @@ void func_i4_8018927C(Player* player) { if (gCsFrameCount == 100) { player->unk_0D0 = 30.0f; if (gTeamShields[1] > 0) { - func_i4_801890EC(actor3, 0); + Fortuna_801890EC(actor3, 0); } if (gTeamShields[2] > 0) { - func_i4_801890EC(actor1, 1); + Fortuna_801890EC(actor1, 1); } if (gTeamShields[3] > 0) { - func_i4_801890EC(actor2, 2); + Fortuna_801890EC(actor2, 2); } } if (gCsFrameCount == 496) { player->unk_1D0 = 11; - D_80177A48[0] = 0.01f; - D_80177A48[1] = 0.0f; - D_80177A48[2] = -400.0f; - D_80177A48[3] = 0.0f; + D_ctx_80177A48[0] = 0.01f; + D_ctx_80177A48[1] = 0.0f; + D_ctx_80177A48[2] = -400.0f; + D_ctx_80177A48[3] = 0.0f; actor3->iwork[14] = 2; actor1->iwork[14] = 3; actor2->iwork[14] = 4; } if (gCsFrameCount == 200) { - if (D_80177930 == 0) { + if (D_ctx_80177930 == 0) { AUDIO_PLAY_BGM(SEQ_ID_49); } else { AUDIO_PLAY_BGM(SEQ_ID_38); @@ -877,17 +879,17 @@ void func_i4_8018927C(Player* player) { } if (gCsFrameCount == 420) { - D_80177840 = 0x64; + D_ctx_80177840 = 0x64; } break; case 11: - D_80177A48[1] += D_80177A48[3]; + D_ctx_80177A48[1] += D_ctx_80177A48[3]; Matrix_RotateX(gCalcMatrix, -0.17453292f, 0); - Matrix_RotateY(gCalcMatrix, D_80177A48[1] * M_DTOR, 1); + Matrix_RotateY(gCalcMatrix, D_ctx_80177A48[1] * M_DTOR, 1); src.x = 0; src.y = 0.0f; - src.z = D_80177A48[2]; + src.z = D_ctx_80177A48[2]; Matrix_MultVec3f(gCalcMatrix, &src, player->jointTable); gCsCamEyeX = player->jointTable[0].x + player->pos.x; gCsCamEyeY = player->jointTable[0].y + player->pos.y; @@ -896,15 +898,15 @@ void func_i4_8018927C(Player* player) { gCsCamAtY = player->pos.y; gCsCamAtZ = player->pos.z - 250.0f; - Math_SmoothStepToF(D_80177A48, 0.05f, 1.0f, 0.001f, 0); + Math_SmoothStepToF(D_ctx_80177A48, 0.05f, 1.0f, 0.001f, 0); - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 20000.0f, 0); - Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 20000.0f, 0); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_ctx_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], 20000.0f, 0); - Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 20000.0f, 0); - Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 20000.0f, 0); - Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_ctx_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_ctx_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_ctx_80177A48[0], 20000.0f, 0); Math_SmoothStepToF(&player->unk_0D0, 0.0f, 0.05f, 2.0f, 0); @@ -917,7 +919,7 @@ void func_i4_8018927C(Player* player) { Radio_PlayMessage(gMsg_ID_20010, RCID_FOX); } - if (D_80177930 == 0) { + if (D_ctx_80177930 == 0) { switch (gCsFrameCount) { case 588: switch (gTeamShields[2]) { @@ -1008,15 +1010,15 @@ void func_i4_8018927C(Player* player) { } if (gCsFrameCount < 1136) { - Math_SmoothStepToF(&D_80177A48[3], 0.55f, 1.0f, 0.02f, 0); + Math_SmoothStepToF(&D_ctx_80177A48[3], 0.55f, 1.0f, 0.02f, 0); } else { - D_80178430 += 0.3f; - D_8017842C += 0.3f; - Math_SmoothStepToF(&D_80177A48[3], 0.0f, 1.0f, 0.02f, 0); + D_ctx_80178430 += 0.3f; + D_ctx_8017842C += 0.3f; + Math_SmoothStepToF(&D_ctx_80177A48[3], 0.0f, 1.0f, 0.02f, 0); if (gCsFrameCount == 0x4C0) { player->unk_1D0 = 12; player->timer_1F8 = 1000; - D_80177A48[4] = 1.0f; + D_ctx_80177A48[4] = 1.0f; actor2->vel.y = 0.1f; actor1->vel.y = 0.1f; AUDIO_PLAY_SFX(0x09000002U, player->sfxSource, 0U); @@ -1029,12 +1031,12 @@ void func_i4_8018927C(Player* player) { break; case 12: - D_80178430 += 0.3f; - D_8017842C += 0.3f; + D_ctx_80178430 += 0.3f; + D_ctx_8017842C += 0.3f; player->unk_0D0 += 1.0f; player->unk_0D0 *= 1.15f; - player->pos.y += D_80177A48[4]; - D_80177A48[4] *= 1.19f; + player->pos.y += D_ctx_80177A48[4]; + D_ctx_80177A48[4] *= 1.19f; player->unk_190 = 2.0f; if (gTeamShields[1] > 0) { @@ -1094,37 +1096,37 @@ void func_i4_8018927C(Player* player) { if (gCsFrameCount == 1382) { player->state_1C8 = PLAYERSTATE_1C8_6; player->timer_1F8 = 0; - D_8017837C = 4; + D_ctx_8017837C = 4; Audio_FadeOutAll(10); for (i = 0; i < 6; i++) { - D_80177CF0[i] = D_80177CD0[i]; + D_ctx_80177CF0[i] = D_ctx_80177CD0[i]; } - D_800D3180[LEVEL_FORTUNA] = Play_CheckMedalStatus(50) + 1; + D_play_800D3180[LEVEL_FORTUNA] = Play_CheckMedalStatus(50) + 1; } break; case 20: if (gTeamShields[1] > 0) { - func_i4_801890EC(actor3, 0); + Fortuna_801890EC(actor3, 0); actor3->obj.pos.x = (player->pos.x - 100.0f) - 400.0f; actor3->obj.pos.y = player->pos.y + 400.0f; actor3->obj.pos.z = player->unk_138 - 150.0f; actor3->obj.rot.z = 90.0f; } if (gTeamShields[2] > 0) { - func_i4_801890EC(actor1, 1); + Fortuna_801890EC(actor1, 1); actor1->obj.pos.x = player->pos.x + 100.0f + 400.0f; actor1->obj.pos.y = player->pos.y + 400.0f; actor1->obj.pos.z = player->unk_138 - 150.0f; actor1->obj.rot.z = -90.0f; } if (gTeamShields[3] > 0) { - func_i4_801890EC(actor2, 2); + Fortuna_801890EC(actor2, 2); actor2->obj.pos.x = player->pos.x; actor2->obj.pos.y = player->pos.y + 100.0f + 400.0f; actor2->obj.pos.z = player->unk_138 - 250.0f; } - func_i4_801890EC(actor0, 3); + Fortuna_801890EC(actor0, 3); actor0->obj.pos.z = player->pos.z + 400.0f; actor0->vel.z = 0.0f; @@ -1134,10 +1136,10 @@ void func_i4_8018927C(Player* player) { player->unk_234 = 1; for (i = 0; i < 9; i++) { - D_80177A48[i] = 0.0f; + D_ctx_80177A48[i] = 0.0f; } - D_80177A48[5] = 94.0f; + D_ctx_80177A48[5] = 94.0f; gCsCamAtX = 0.0f; gCsCamAtY = 30.0f; gCsCamAtZ = 0.0f; @@ -1147,9 +1149,9 @@ void func_i4_8018927C(Player* player) { break; } - if (D_80178340 != 0) { - D_80178358 = 0; - D_8017835C = 1; + if (D_ctx_80178340 != 0) { + D_ctx_80178358 = 0; + D_ctx_8017835C = 1; } if (gCsFrameCount == 140) { @@ -1193,14 +1195,14 @@ void func_i4_8018927C(Player* player) { AUDIO_PLAY_BGM(SEQ_ID_38); break; case 450: - D_80177840 = 100; + D_ctx_80177840 = 100; break; } src.x = 0.0f; - src.y = D_80177A48[7]; - src.z = D_80177A48[5]; - Matrix_Translate(gCalcMatrix, player->pos.x, 0.0f, player->pos.z + D_80177D20, 0); - Matrix_RotateY(gCalcMatrix, -(D_80177A48[4] * M_DTOR), 1); + src.y = D_ctx_80177A48[7]; + src.z = D_ctx_80177A48[5]; + Matrix_Translate(gCalcMatrix, player->pos.x, 0.0f, player->pos.z + D_ctx_80177D20, 0); + Matrix_RotateY(gCalcMatrix, -(D_ctx_80177A48[4] * M_DTOR), 1); Matrix_MultVec3f(gCalcMatrix, &src, &dest); player->camEye.x = gCsCamEyeX = dest.x; player->camEye.y = gCsCamEyeY = dest.y; @@ -1208,7 +1210,7 @@ void func_i4_8018927C(Player* player) { Math_SmoothStepToF(&gCsCamAtY, 0.0f, 0.005f, 1000.0f, 0.0001f); player->camAt.x = player->pos.x; player->camAt.y = gCsCamAtY; - player->camAt.z = player->pos.z + D_80177D20; + player->camAt.z = player->pos.z + D_ctx_80177D20; break; case 22: @@ -1271,7 +1273,7 @@ void func_i4_8018927C(Player* player) { break; case 1080: - D_80177830 = 1; + D_ctx_80177830 = 1; break; case 1240: @@ -1296,7 +1298,7 @@ void func_i4_8018927C(Player* player) { actor2->fwork[29] = 5.0f; actor2->iwork[11] = 2; } - D_80177830 = 0; + D_ctx_80177830 = 0; break; case 1300: @@ -1312,68 +1314,68 @@ void func_i4_8018927C(Player* player) { } if ((gCsFrameCount >= 1400)) { - D_80178358 = 255; - D_8017835C = 16; - if (D_80178340 == 255) { + D_ctx_80178358 = 255; + D_ctx_8017835C = 16; + if (D_ctx_80178340 == 255) { player->state_1C8 = PLAYERSTATE_1C8_6; player->timer_1F8 = 0; - D_8017837C = 4; + D_ctx_8017837C = 4; Audio_FadeOutAll(10); // clang-format off for (i = 0; i < 6; i++) { \ - D_80177CF0[i] = D_80177CD0[i]; + D_ctx_80177CF0[i] = D_ctx_80177CD0[i]; } // clang-format on - D_800D3180[LEVEL_FORTUNA] = Play_CheckMedalStatus(50) + 1; - func_800A6148(); + D_play_800D3180[LEVEL_FORTUNA] = Play_CheckMedalStatus(50) + 1; + func_play_800A6148(); break; } } if (gCsFrameCount > 1060) { - Math_SmoothStepToF(D_80177A48, 300.0f, 0.02f, 1000.0f, 0.001f); - Math_SmoothStepToF(&D_80177A48[1], -100.0f, 0.02f, 1000.0f, 0.001f); + Math_SmoothStepToF(D_ctx_80177A48, 300.0f, 0.02f, 1000.0f, 0.001f); + Math_SmoothStepToF(&D_ctx_80177A48[1], -100.0f, 0.02f, 1000.0f, 0.001f); } else if (gCsFrameCount > 770) { - Math_SmoothStepToF(D_80177A48, 600.0f, 0.02f, 1000.0f, 0.001f); + Math_SmoothStepToF(D_ctx_80177A48, 600.0f, 0.02f, 1000.0f, 0.001f); } else { - Math_SmoothStepToF(D_80177A48, 400.0f, 0.03f, 1000.0f, 0.001f); + Math_SmoothStepToF(D_ctx_80177A48, 400.0f, 0.03f, 1000.0f, 0.001f); } - Math_SmoothStepToF(&D_80177A48[5], D_80177A48[0], 0.01f, 1000.0f, 0.001f); - Math_SmoothStepToF(&D_80177A48[7], D_80177A48[1], 0.01f, 1000.0f, 0.001f); + Math_SmoothStepToF(&D_ctx_80177A48[5], D_ctx_80177A48[0], 0.01f, 1000.0f, 0.001f); + Math_SmoothStepToF(&D_ctx_80177A48[7], D_ctx_80177A48[1], 0.01f, 1000.0f, 0.001f); if (gCsFrameCount > 1060) { - Math_SmoothStepToF(&D_80177A48[2], -70.0f, 0.05f, 1000.0f, 0.001f); + Math_SmoothStepToF(&D_ctx_80177A48[2], -70.0f, 0.05f, 1000.0f, 0.001f); } else if (gCsFrameCount < 770) { - Math_SmoothStepToF(&D_80177A48[2], 100.0f, 0.05f, 1000.0f, 0.001f); + Math_SmoothStepToF(&D_ctx_80177A48[2], 100.0f, 0.05f, 1000.0f, 0.001f); } - Math_SmoothStepToF(&D_80177A48[6], D_80177A48[2], 0.01f, 1000.0f, 0.001f); + Math_SmoothStepToF(&D_ctx_80177A48[6], D_ctx_80177A48[2], 0.01f, 1000.0f, 0.001f); if (gCsFrameCount < 1180) { - Math_SmoothStepToF(&D_80177A48[8], 0.41f, 0.01f, 10.0f, 0.001f); + Math_SmoothStepToF(&D_ctx_80177A48[8], 0.41f, 0.01f, 10.0f, 0.001f); } else { - Math_SmoothStepToF(&D_80177A48[8], 0.0f, 0.001f, 1.0f, 0.0001f); + Math_SmoothStepToF(&D_ctx_80177A48[8], 0.0f, 0.001f, 1.0f, 0.0001f); } - D_80177A48[4] += D_80177A48[8]; + D_ctx_80177A48[4] += D_ctx_80177A48[8]; - if (D_80177A48[4] >= 360.0f) { - D_80177A48[4] = D_80177A48[4] - 360.0f; + if (D_ctx_80177A48[4] >= 360.0f) { + D_ctx_80177A48[4] = D_ctx_80177A48[4] - 360.0f; } - if (D_80177A48[4] < 0.0f) { - D_80177A48[4] = D_80177A48[4] + 360.0f; + if (D_ctx_80177A48[4] < 0.0f) { + D_ctx_80177A48[4] = D_ctx_80177A48[4] + 360.0f; } if (gCsFrameCount < 1300) { src.x = 0.0f; - src.y = D_80177A48[7]; - src.z = D_80177A48[5]; - Matrix_Translate(gCalcMatrix, player->pos.x, 0.0f, player->pos.z + D_80177D20, 0); - Matrix_RotateY(gCalcMatrix, -(D_80177A48[4] * M_DTOR), 1); + src.y = D_ctx_80177A48[7]; + src.z = D_ctx_80177A48[5]; + Matrix_Translate(gCalcMatrix, player->pos.x, 0.0f, player->pos.z + D_ctx_80177D20, 0); + Matrix_RotateY(gCalcMatrix, -(D_ctx_80177A48[4] * M_DTOR), 1); Matrix_MultVec3f(gCalcMatrix, &src, &dest); player->camEye.x = gCsCamEyeX = dest.x; player->camEye.y = gCsCamEyeY = dest.y; @@ -1397,17 +1399,17 @@ void func_i4_8018927C(Player* player) { player->camAt.x = gCsCamAtX = player->pos.x; player->camAt.y = gCsCamAtY; - player->camAt.z = gCsCamAtZ = player->pos.z - D_80177A48[6] + D_80177D20; + player->camAt.z = gCsCamAtZ = player->pos.z - D_ctx_80177A48[6] + D_ctx_80177D20; break; } if (player->unk_1D0 < 20) { switch (gCsFrameCount) { case 1020: - D_80177830 = 1; + D_ctx_80177830 = 1; break; case 1220: - D_80177830 = 0; + D_ctx_80177830 = 0; break; } } @@ -1431,59 +1433,59 @@ void func_i4_8018927C(Player* player) { player->unk_0F8 = player->unk_0EC + player->unk_12C + player->unk_130; } -void func_i4_8018BA2C(void) { +void Fortuna_8018BA2C(void) { s32 i; Actor* actor; Object_4C* obj4C; Object_58* obj58; Boss* boss = &gBosses[0]; - D_80178310 = SEGMENTED_TO_VIRTUAL(D_800CFDA0[gCurrentLevel]); + D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_enmy_800CFDA0[gCurrentLevel]); for (obj58 = &gObjects58[0], i = 0; i < 1000; i++) { - if (D_80178310[i].id < 0) { + if (D_ctx_80178310[i].id < 0) { break; } - if (D_80178310[i].id < 161) { + if (D_ctx_80178310[i].id < 161) { Object_58_Initialize(obj58); obj58->obj.status = OBJ_ACTIVE; - obj58->obj.id = D_80178310[i].id; - obj58->obj.pos.x = D_80178310[i].xPos; - obj58->obj.pos.z = D_80178310[i].zPos1; - obj58->obj.pos.y = D_80178310[i].yPos; - obj58->obj.rot.y = D_80178310[i].rot.y; + obj58->obj.id = D_ctx_80178310[i].id; + obj58->obj.pos.x = D_ctx_80178310[i].xPos; + obj58->obj.pos.z = D_ctx_80178310[i].zPos1; + obj58->obj.pos.y = D_ctx_80178310[i].yPos; + obj58->obj.rot.y = D_ctx_80178310[i].rot.y; Object_SetInfo(&obj58->info, obj58->obj.id); obj58++; } } for (actor = &gActors[20], i = 0; i < 1000; i++) { - if (D_80178310[i].id < 0) { + if (D_ctx_80178310[i].id < 0) { break; } - if ((D_80178310[i].id >= 176) && (D_80178310[i].id < 292)) { + if ((D_ctx_80178310[i].id >= 176) && (D_ctx_80178310[i].id < 292)) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; - actor->obj.id = D_80178310[i].id; - actor->obj.pos.x = D_80178310[i].xPos; - actor->obj.pos.z = D_80178310[i].zPos1; - actor->obj.pos.y = D_80178310[i].yPos; + actor->obj.id = D_ctx_80178310[i].id; + actor->obj.pos.x = D_ctx_80178310[i].xPos; + actor->obj.pos.z = D_ctx_80178310[i].zPos1; + actor->obj.pos.y = D_ctx_80178310[i].yPos; Object_SetInfo(&actor->info, actor->obj.id); actor++; } } for (obj4C = &gObjects4C[0], i = 0; i < 1000; i++) { - if (D_80178310[i].id < 0) { + if (D_ctx_80178310[i].id < 0) { break; } - if (D_80178310[i].id == 163) { + if (D_ctx_80178310[i].id == 163) { Object_4C_Initialize(obj4C); obj4C->obj.status = OBJ_INIT; - obj4C->obj.id = D_80178310[i].id; - obj4C->obj.pos.x = D_80178310[i].xPos; - obj4C->obj.pos.z = D_80178310[i].zPos1; - obj4C->obj.pos.y = D_80178310[i].yPos; + obj4C->obj.id = D_ctx_80178310[i].id; + obj4C->obj.pos.x = D_ctx_80178310[i].xPos; + obj4C->obj.pos.z = D_ctx_80178310[i].zPos1; + obj4C->obj.pos.y = D_ctx_80178310[i].yPos; Object_SetInfo(&obj4C->info, obj4C->obj.id); obj4C++; } diff --git a/src/overlays/ovl_i4/fox_i4.c b/src/overlays/ovl_i4/fox_i4.c index d24a59d7..e155f030 100644 --- a/src/overlays/ovl_i4/fox_i4.c +++ b/src/overlays/ovl_i4/fox_i4.c @@ -1,46 +1,46 @@ #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); +void Fortuna_8018927C(u32); +void Bolse_8018D394(u32); +void Bolse_8018D454(u32); +void Bolse_8018D7F0(u32); +void Bolse_8018D960(u32); +void Bolse_8018E710(u32); +void Bolse_8018E870(u32); +void Bolse_80191BAC(u32); +void Bolse_80191DB0(u32); UNK_TYPE D_i4_801A03C0; s32 D_i4_8019EDD0 = 0; -void func_i4_80187520(u32 arg0, void* arg1) { +void OvlI4_CallFunction(u32 arg0, void* arg1) { switch (arg0) { case 0x5A: - func_i4_8018927C(arg1); + Fortuna_8018927C(arg1); break; case 0x5B: - func_i4_8018E710(arg1); + Bolse_8018E710(arg1); break; case 0x5C: - func_i4_8018E870(arg1); + Bolse_8018E870(arg1); break; case 0x5D: - func_i4_80191BAC(arg1); + Bolse_80191BAC(arg1); break; case 0x5E: - func_i4_80191DB0(arg1); + Bolse_80191DB0(arg1); break; case 0x5F: - func_i4_8018D7F0(arg1); + Bolse_8018D7F0(arg1); break; case 0x60: - func_i4_8018D960(arg1); + Bolse_8018D960(arg1); break; case 0x61: - func_i4_8018D394(arg1); + Bolse_8018D394(arg1); break; case 0x62: - func_i4_8018D454(arg1); + Bolse_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 index 0cca3422..3a574f4d 100644 --- a/src/overlays/ovl_i4/fox_ka.c +++ b/src/overlays/ovl_i4/fox_ka.c @@ -53,14 +53,11 @@ f32 D_i4_801A0550; f32 D_i4_801A0554; f32 D_i4_801A0558; -extern void func_i4_80194458(Boss*, Vec3f*, f32); -extern void func_i4_801995B4(Actor*); -extern void func_i4_80198AA0(Actor*); -extern void func_i4_801981F8(Actor*); -extern s32 func_80031900(Actor*); -extern void func_800A3FB0(void); +void Katina_801995B4(Actor*); +void Katina_80198AA0(Actor*); +void Katina_801981F8(Actor*); -void func_i4_801927E0(Effect* effect, f32 x, f32 y, f32 z, f32 x2, f32 y2, f32 z2) { +void Katina_801927E0(Effect* effect, f32 x, f32 y, f32 z, f32 x2, f32 y2, f32 z2) { f32 yRot; f32 xRot; f32 distXZ; @@ -88,18 +85,18 @@ void func_i4_801927E0(Effect* effect, f32 x, f32 y, f32 z, f32 x2, f32 y2, f32 z Object_SetInfo(&effect->info, effect->obj.id); } -void func_i4_80192908(f32 x, f32 y, f32 z, f32 x2, f32 y2, f32 z2) { +void Katina_80192908(f32 x, f32 y, f32 z, f32 x2, f32 y2, f32 z2) { s32 i; for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i4_801927E0(&gEffects[i], x, y, z, x2, y2, z2); + Katina_801927E0(&gEffects[i], x, y, z, x2, y2, z2); break; } } } -void func_i4_80192984(Effect* effect) { +void Katina_80192984(Effect* effect) { effect->vel.x = effect->unk_60.x * effect->scale1; effect->vel.y = effect->unk_60.y * effect->scale1; effect->vel.z = effect->unk_60.z * effect->scale1; @@ -116,7 +113,7 @@ void func_i4_80192984(Effect* effect) { } } -void func_i4_80192A68(Effect* effect) { +void Katina_80192A68(Effect* effect) { RCP_SetupDL(&gMasterDisp, 67); gDPSetPrimColor(gMasterDisp++, 0, 0, 48, 48, 255, effect->unk_44); @@ -130,7 +127,7 @@ void func_i4_80192A68(Effect* effect) { RCP_SetupDL(&gMasterDisp, 64); } -void func_i4_80192B4C(Effect* effect, f32 x, f32 y, f32 z, f32 xVel, f32 yVel, f32 zVel, f32 scale) { +void Katina_80192B4C(Effect* effect, f32 x, f32 y, f32 z, f32 xVel, f32 yVel, f32 zVel, f32 scale) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; @@ -152,18 +149,18 @@ void func_i4_80192B4C(Effect* effect, f32 x, f32 y, f32 z, f32 xVel, f32 yVel, f effect->unk_44 = 230; } -void func_i4_80192C08(f32 x, f32 y, f32 z, f32 xVel, f32 yVel, f32 zVel, f32 scale) { +void Katina_80192C08(f32 x, f32 y, f32 z, f32 xVel, f32 yVel, f32 zVel, f32 scale) { s32 i; for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i4_80192B4C(&gEffects[i], x, y, z, xVel, yVel, zVel, scale); + Katina_80192B4C(&gEffects[i], x, y, z, xVel, yVel, zVel, scale); break; } } } -void func_i4_80192C8C(void) { +void Katina_80192C8C(void) { Actor* actor = &gActors[4]; s32 i; Vec3f dest; @@ -190,17 +187,17 @@ void func_i4_80192C8C(void) { } } -void func_i4_80192E20(Player* player) { +void Katina_80192E20(Player* player) { s32 j; s32 i; Vec3f src; Vec3f dest; Actor* actor; - D_8015F928 = 0; + D_360_8015F928 = 0; if (player->unk_1D0 != 0) { - func_i4_801981F8(&gActors[4]); + Katina_801981F8(&gActors[4]); } switch (player->unk_1D0) { @@ -218,7 +215,7 @@ void func_i4_80192E20(Player* player) { case 0: gCsFrameCount = 0; - func_i4_80192C8C(); + Katina_80192C8C(); gCsCamEyeX = 3535.0f; gCsCamEyeY = 500.0f; gCsCamEyeZ = 3535.0f; @@ -226,7 +223,7 @@ void func_i4_80192E20(Player* player) { gCsCamAtY = gActors[4].obj.pos.y; gCsCamAtZ = gActors[4].obj.pos.z; player->unk_1D0 = 11; - D_80177A48[0] = 1.0f; + D_ctx_80177A48[0] = 1.0f; break; case 11: @@ -247,7 +244,7 @@ void func_i4_80192E20(Player* player) { gActors[4].vel.z += 0.7f; gActors[4].obj.rot.z -= 1.0f; if (gCsFrameCount == 120) { - func_8002F180(); + func_360_8002F180(); player->unk_1D0 = 13; player->pos.x = 0.0f; player->pos.y = 1300.0f; @@ -276,12 +273,12 @@ void func_i4_80192E20(Player* player) { Object_Kill(&gActors[6].obj, gActors[6].sfxSource); player->state_1C8 = PLAYERSTATE_1C8_3; player->unk_014 = 0.0001f; - AUDIO_PLAY_BGM(D_80177C90); - D_80177838 = 80; + AUDIO_PLAY_BGM(D_ctx_80177C90); + D_ctx_80177838 = 80; for (actor = &gActors[1], i = 1; i < 4; i += 1, actor++) { actor->timer_0BC = 0; } - D_8015F928 = -610; + D_360_8015F928 = -610; } break; } @@ -301,9 +298,9 @@ void func_i4_80192E20(Player* player) { Matrix_RotateY(gCalcMatrix, actor->obj.rot.y * M_DTOR, 0); Matrix_RotateX(gCalcMatrix, actor->obj.rot.x * M_DTOR, 1); Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &dest); - func_8006EEFC(5, actor->obj.pos.x + (dest.x * 1.5), actor->obj.pos.y + (dest.y * 1.5), - actor->obj.pos.z + (dest.z * 1.5), dest.x, dest.y, dest.z, actor->obj.rot.x, actor->obj.rot.y, - actor->obj.rot.z); + func_enmy2_8006EEFC(5, actor->obj.pos.x + (dest.x * 1.5), actor->obj.pos.y + (dest.y * 1.5), + actor->obj.pos.z + (dest.z * 1.5), dest.x, dest.y, dest.z, actor->obj.rot.x, + actor->obj.rot.y, actor->obj.rot.z); break; case 35: @@ -313,18 +310,18 @@ void func_i4_80192E20(Player* player) { Matrix_RotateY(gCalcMatrix, actor->obj.rot.y * M_DTOR, 0); Matrix_RotateX(gCalcMatrix, actor->obj.rot.x * M_DTOR, 1); Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &dest); - func_8006EEFC(6, actor->obj.pos.x + (dest.x * 1.5), actor->obj.pos.y + (dest.y * 1.5), - actor->obj.pos.z + (dest.z * 1.5), dest.x, dest.y, dest.z, actor->obj.rot.x, actor->obj.rot.y, - actor->obj.rot.z); + func_enmy2_8006EEFC(6, actor->obj.pos.x + (dest.x * 1.5), actor->obj.pos.y + (dest.y * 1.5), + actor->obj.pos.z + (dest.z * 1.5), dest.x, dest.y, dest.z, actor->obj.rot.x, + actor->obj.rot.y, actor->obj.rot.z); break; case 45: - func_8007D2C8(gActors[5].obj.pos.x, gActors[5].obj.pos.y, gActors[5].obj.pos.z, 10.0f); + func_effect_8007D2C8(gActors[5].obj.pos.x, gActors[5].obj.pos.y, gActors[5].obj.pos.z, 10.0f); for (j = 0; j < 10; j++) { - func_800794CC(gActors[5].obj.pos.x, gActors[5].obj.pos.y, gActors[5].obj.pos.z, 1.0f); + func_effect_800794CC(gActors[5].obj.pos.x, gActors[5].obj.pos.y, gActors[5].obj.pos.z, 1.0f); } - func_8007A6F0(&gActors[5].obj.pos, 0x2903B009); + func_effect_8007A6F0(&gActors[5].obj.pos, 0x2903B009); break; case 47: @@ -345,15 +342,15 @@ void func_i4_80192E20(Player* player) { player->pos.z += player->vel.z; player->unk_138 = player->pos.z; player->unk_0F8 = player->unk_0EC + player->unk_12C + player->unk_130; - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_ctx_80177A48[0], 50000.0f, 0.0f); } -void func_i4_80193718(Boss* boss) { +void Katina_80193718(Boss* boss) { s32 i; f32 posX; Vec3f src; @@ -367,8 +364,8 @@ void func_i4_80193718(Boss* boss) { case 1: boss->timer_050 = 4; boss->state++; - func_8007B344(boss->obj.pos.x, boss->obj.pos.y + 250.0f, boss->obj.pos.z + 600.0f, 71.0f, 5); - D_80178480 = 25; + func_effect_8007B344(boss->obj.pos.x, boss->obj.pos.y + 250.0f, boss->obj.pos.z + 600.0f, 71.0f, 5); + D_ctx_80178480 = 25; gLight1R = 255; gLight1G = 0; gLight1B = 0; @@ -382,7 +379,7 @@ void func_i4_80193718(Boss* boss) { Matrix_RotateY(gCalcMatrix, i * 13.0f * M_DTOR, 0); Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &dest); if (dest.z > 0.0f) { - func_8007953C(dest.x, posX, dest.z, 1.3f); + func_effect_8007953C(dest.x, posX, dest.z, 1.3f); posX += 6.25f; src.z -= 6.0f; } @@ -396,10 +393,10 @@ void func_i4_80193718(Boss* boss) { } } for (i = 0; i < 1; i++) { - func_i4_80192C08(RAND_FLOAT_CENTERED(700.0f) + boss->obj.pos.x, - RAND_FLOAT_CENTERED(400.0f) + (boss->obj.pos.y + 200.0f), - RAND_FLOAT_CENTERED(700.0f) + boss->obj.pos.z, RAND_FLOAT_CENTERED(50.0f), - RAND_FLOAT(40.0f) + 30.0f, RAND_FLOAT_CENTERED(50.0f), RAND_FLOAT(10.0f) + 10.0f); + Katina_80192C08(RAND_FLOAT_CENTERED(700.0f) + boss->obj.pos.x, + RAND_FLOAT_CENTERED(400.0f) + (boss->obj.pos.y + 200.0f), + RAND_FLOAT_CENTERED(700.0f) + boss->obj.pos.z, RAND_FLOAT_CENTERED(50.0f), + RAND_FLOAT(40.0f) + 30.0f, RAND_FLOAT_CENTERED(50.0f), RAND_FLOAT(10.0f) + 10.0f); } break; } @@ -409,7 +406,7 @@ void func_i4_80193718(Boss* boss) { } } -void func_i4_80193B1C(Boss* boss) { +void Katina_80193B1C(Boss* boss) { gSPFogPosition(gMasterDisp++, gFogNear, 1002); Matrix_Translate(gGfxMatrix, 0.0f, 20.0f, 0.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -422,7 +419,7 @@ void func_i4_80193B1C(Boss* boss) { } } -void func_i4_80193CA4(Boss* boss) { +void Katina_80193CA4(Boss* boss) { boss->swork[10] = 100; boss->swork[11] = 100; boss->swork[12] = 100; @@ -433,31 +430,32 @@ void func_i4_80193CA4(Boss* boss) { boss->vwork[0].y = 1000.0f; } -void func_i4_80193CE4(Boss* boss, s32 idx) { +void Katina_80193CE4(Boss* boss, s32 idx) { s32 i; Vec3f pos; - func_8007D2C8(boss->obj.pos.x + (boss->vwork[idx + 1].x * 1.3f), boss->obj.pos.y + (boss->vwork[idx + 1].y * 1.3f), - boss->obj.pos.z + (boss->vwork[idx + 1].z * 1.3f), 15.0f); + func_effect_8007D2C8(boss->obj.pos.x + (boss->vwork[idx + 1].x * 1.3f), + boss->obj.pos.y + (boss->vwork[idx + 1].y * 1.3f), + boss->obj.pos.z + (boss->vwork[idx + 1].z * 1.3f), 15.0f); boss->swork[idx + 5] = 60; for (i = 0; i < 20; i++) { - func_800794CC(boss->obj.pos.x + RAND_FLOAT_CENTERED(300.0f) + (boss->vwork[idx + 1].x * 1.3f), - boss->obj.pos.y + RAND_FLOAT_CENTERED(300.0f) + (boss->vwork[idx + 1].y * 1.3f), - boss->obj.pos.z + RAND_FLOAT_CENTERED(300.0f) + (boss->vwork[idx + 1].z * 1.3f), 1.55f); + func_effect_800794CC(boss->obj.pos.x + RAND_FLOAT_CENTERED(300.0f) + (boss->vwork[idx + 1].x * 1.3f), + boss->obj.pos.y + RAND_FLOAT_CENTERED(300.0f) + (boss->vwork[idx + 1].y * 1.3f), + boss->obj.pos.z + RAND_FLOAT_CENTERED(300.0f) + (boss->vwork[idx + 1].z * 1.3f), 1.55f); } pos.x = boss->obj.pos.x + (boss->vwork[idx + 1].x * 1.3f); pos.y = boss->obj.pos.y + (boss->vwork[idx + 1].y * 1.3f); pos.z = boss->obj.pos.z + (boss->vwork[idx + 1].z * 1.3f); - func_8007A6F0(&pos, 0x2903B009); + func_effect_8007A6F0(&pos, 0x2903B009); boss->swork[15] += 1; BonusText_Display(pos.x, pos.y - 300.0f, pos.z, 5); gHitCount += 6; - D_80177850 = 15; + D_ctx_80177850 = 15; } -void func_i4_80193EF0(Boss* boss) { +void Katina_80193EF0(Boss* boss) { s32 i; s32 pad; Vec3f src; @@ -483,10 +481,10 @@ void func_i4_80193EF0(Boss* boss) { sfxSource.x = (boss->vwork[1 + boss->dmgPart].x * 1.3f) + boss->obj.pos.x; sfxSource.y = (boss->vwork[1 + boss->dmgPart].y * 1.3f) + boss->obj.pos.y; sfxSource.z = (boss->vwork[1 + boss->dmgPart].z * 1.3f) + boss->obj.pos.z; - func_8007A6F0(&sfxSource, 0x29034003); + func_effect_8007A6F0(&sfxSource, 0x29034003); if (boss->swork[10 + boss->dmgPart] <= 0) { boss->swork[10 + boss->dmgPart] = 0; - func_i4_80193CE4(boss, boss->dmgPart); + Katina_80193CE4(boss, boss->dmgPart); } } break; @@ -500,13 +498,13 @@ void func_i4_80193EF0(Boss* boss) { boss->swork[14] = boss->swork[14] - boss->damage; if (boss->swork[14] < 100) { - func_8007A6F0(&boss->obj.pos, 0x2943500F); + func_effect_8007A6F0(&boss->obj.pos, 0x2943500F); } else { - func_8007A6F0(&boss->obj.pos, 0x29034003); + func_effect_8007A6F0(&boss->obj.pos, 0x29034003); } if (boss->swork[14] <= 0) { - func_8007D2C8(boss->obj.pos.x, boss->obj.pos.y - 1000.0f, boss->obj.pos.z, 15.0f); + func_effect_8007D2C8(boss->obj.pos.x, boss->obj.pos.y - 1000.0f, boss->obj.pos.z, 15.0f); y = 0.0f; boss->swork[9] = 80; src.x = 0.0f; @@ -516,18 +514,18 @@ void func_i4_80193EF0(Boss* boss) { for (i = 0; i < 130; i++, y += 5.0f, src.z += 1.4f) { Matrix_RotateY(gCalcMatrix, i * 35.0f * M_DTOR, 0); Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &dest); - func_800794CC(boss->obj.pos.x + dest.x, boss->obj.pos.y - 1200.0f + y, - boss->obj.pos.z + dest.z, 1.6f); + func_effect_800794CC(boss->obj.pos.x + dest.x, boss->obj.pos.y - 1200.0f + y, + boss->obj.pos.z + dest.z, 1.6f); } AUDIO_PLAY_SFX(0x2940D09AU, boss->sfxSource, 4U); - D_Timer_80161A60 = 8; + D_play_Timer_80161A60 = 8; boss->state = 20; boss->timer_050 = 50; SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 50); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 50); Radio_PlayMessage(gMsg_ID_18066, RCID_BILL); boss->obj.pos.y -= 1000.0f; - func_80042EC0(boss); + func_boss_80042EC0(boss); boss->obj.pos.y += 1000.0f; } } @@ -539,10 +537,10 @@ void func_i4_80193EF0(Boss* boss) { if (!(gGameFrameCount & 15)) { for (i = 0; i < 4; i++) { if ((boss->swork[10 + i] <= 0) && (Rand_ZeroOne() < 0.2f)) { - func_8007BFFC((boss->vwork[1 + i].x * 1.3f) + boss->obj.pos.x, - (boss->vwork[1 + i].y * 1.3f) + boss->obj.pos.y, - (boss->vwork[1 + i].z * 1.3f) + boss->obj.pos.z, boss->vel.x, boss->vel.y, - boss->vel.z, 7.0f, 5); + func_effect_8007BFFC((boss->vwork[1 + i].x * 1.3f) + boss->obj.pos.x, + (boss->vwork[1 + i].y * 1.3f) + boss->obj.pos.y, + (boss->vwork[1 + i].z * 1.3f) + boss->obj.pos.z, boss->vel.x, boss->vel.y, + boss->vel.z, 7.0f, 5); } } } @@ -552,18 +550,18 @@ void func_i4_80193EF0(Boss* boss) { if (boss->swork[5 + i] != 0) { boss->swork[5 + i]--; if (i < 4) { - func_i4_80192C08(boss->vwork[1 + i].x * 1.3f + boss->obj.pos.x, - boss->vwork[1 + i].y * 1.1f + boss->obj.pos.y, - boss->vwork[1 + i].z * 1.3f + boss->obj.pos.z, boss->vwork[1 + i].x * 0.05f, - boss->vwork[1 + i].y * 0.05f, boss->vwork[1 + i].z * 0.05f, 15.0f); + Katina_80192C08(boss->vwork[1 + i].x * 1.3f + boss->obj.pos.x, + boss->vwork[1 + i].y * 1.1f + boss->obj.pos.y, + boss->vwork[1 + i].z * 1.3f + boss->obj.pos.z, boss->vwork[1 + i].x * 0.05f, + boss->vwork[1 + i].y * 0.05f, boss->vwork[1 + i].z * 0.05f, 15.0f); } else { - func_i4_80192C08(boss->obj.pos.x, boss->obj.pos.y - 700.0f, boss->obj.pos.z, 0.0f, -40.0f, 0.0f, 10.0f); + Katina_80192C08(boss->obj.pos.x, boss->obj.pos.y - 700.0f, boss->obj.pos.z, 0.0f, -40.0f, 0.0f, 10.0f); } } } } -void func_i4_80194458(Boss* boss, Vec3f* pos, f32 arg2) { +void Katina_80194458(Boss* boss, Vec3f* pos, f32 arg2) { s32 i; Actor* actor = &gActors[20]; @@ -594,14 +592,14 @@ void func_i4_80194458(Boss* boss, Vec3f* pos, f32 arg2) { actor->timer_0C4 = 400; Object_SetInfo(&actor->info, actor->obj.id); AUDIO_PLAY_SFX(0x2903305FU, actor->sfxSource, 4); - actor->info.action = (ObjectFunc) func_i4_80198AA0; - actor->info.draw = (ObjectFunc) func_i4_801995B4; + actor->info.action = (ObjectFunc) Katina_80198AA0; + actor->info.draw = (ObjectFunc) Katina_801995B4; break; } } } -void func_i4_801945FC(Boss* boss) { +void Katina_801945FC(Boss* boss) { f32 angle; f32 distY; s32 i; @@ -612,13 +610,13 @@ void func_i4_801945FC(Boss* boss) { if (distY > 360.0f) { distY -= 360.0f; } - func_i4_80194458(boss, &boss->vwork[i + 1], distY); + Katina_80194458(boss, &boss->vwork[i + 1], distY); } angle -= 90.0f; } } -void func_i4_801946C4(Boss* boss) { +void Katina_801946C4(Boss* boss) { s32 i; s32 rot_count; s32 en_count; @@ -656,8 +654,8 @@ void func_i4_801946C4(Boss* boss) { switch (boss->state) { case 0: - if (((gHitCount >= 10) || (D_8015F928 > 3840))) { - if ((D_801615D0.y < 0.0f)) { + if (((gHitCount >= 10) || (D_360_8015F928 > 3840))) { + if ((D_edisplay_801615D0.y < 0.0f)) { boss->state = 1; boss->vwork[0].y = 2000.0f; boss->unk_05E = 1; @@ -692,7 +690,7 @@ void func_i4_801946C4(Boss* boss) { boss->obj.pos.z = 4500.0f; boss->timer_050 = 500; boss->fwork[10] = 60.0f; - D_8015F924 = 1; + D_360_8015F924 = 1; gSavedHitCount = gHitCount; for (i = 1; i < 4; i++) { gSavedTeamShields[i] = gTeamShields[i]; @@ -705,7 +703,7 @@ void func_i4_801946C4(Boss* boss) { case 2: gPlayer[0].camAt.y += 0.2f; - Math_SmoothStepToF(&D_801779A8[gMainController], 30.0f, 1.0f, 1.65f, 0.0f); + Math_SmoothStepToF(&D_ctx_801779A8[gMainController], 30.0f, 1.0f, 1.65f, 0.0f); if (boss->timer_050 == 460) { D_i4_801A0548 = 10.0f; D_i4_801A0550 = 7.0f; @@ -771,7 +769,7 @@ void func_i4_801946C4(Boss* boss) { } if ((boss->timer_050 == 0) && !(boss->timer_052 & 15)) { - func_i4_801945FC(boss); + Katina_801945FC(boss); } if (boss->timer_052 == 0) { @@ -779,7 +777,7 @@ void func_i4_801946C4(Boss* boss) { boss->state++; if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_0) { gPlayer[0].state_1C8 = PLAYERSTATE_1C8_3; - func_800B7184(&gPlayer[0], 1); + func_play_800B7184(&gPlayer[0], 1); } gPlayer[0].unk_014 = 0.0f; boss->fwork[5] = 0.0f; @@ -825,7 +823,7 @@ void func_i4_801946C4(Boss* boss) { case 7: Math_SmoothStepToF(&boss->fwork[10], 0.0f, 0.1f, 0.5f, 0.0f); if ((boss->timer_050 < 200) && !(boss->timer_050 & 15)) { - func_i4_801945FC(boss); + Katina_801945FC(boss); } if (boss->timer_050 == 240) { @@ -852,11 +850,11 @@ void func_i4_801946C4(Boss* boss) { boss->state = 11; boss->timer_050 = 100; Radio_PlayMessage(gMsg_ID_18050, RCID_BILL); - D_8015F944 = 1.0f; - D_8015F93C = 1; - D_8015F930[0] = 1; - D_8015F930[1] = 1; - D_8015F930[2] = 30; + D_360_8015F944 = 1.0f; + D_360_8015F93C = 1; + D_360_8015F930[0] = 1; + D_360_8015F930[1] = 1; + D_360_8015F930[2] = 30; } break; @@ -879,7 +877,7 @@ void func_i4_801946C4(Boss* boss) { Math_SmoothStepToF(&boss->fwork[10], 5.0f, 0.1f, 0.5f, 0.0f); if (boss->timer_050 == 0 && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3 || gPlayer[0].state_1C8 == PLAYERSTATE_1C8_5)) { - D_8015F93C = 0; + D_360_8015F93C = 0; boss->timer_050 = 1000; boss->state = 15; boss->obj.rot.y = 0.0f; @@ -952,10 +950,10 @@ void func_i4_801946C4(Boss* boss) { break; case 16: - Math_SmoothStepToF(&D_801779A8[gMainController], 30.0f, 1.0f, 1.6f, 0.0f); + Math_SmoothStepToF(&D_ctx_801779A8[gMainController], 30.0f, 1.0f, 1.6f, 0.0f); Math_SmoothStepToF(&gPlayer[0].camEye.z, 0.0f, 0.05f, 5.0f, 0.0f); boss->fwork[13] += 0.1f; - Math_SmoothStepToF(&D_801784D4, 200.0f, 1.0f, 0.5f, 0.0f); + Math_SmoothStepToF(&D_ctx_801784D4, 200.0f, 1.0f, 0.5f, 0.0f); scale = 0.5f; D_i4_801A0548 = 0.0f; D_i4_801A0550 = 100.0f; @@ -986,14 +984,14 @@ void func_i4_801946C4(Boss* boss) { src.y = 0.0f; src.z = RAND_FLOAT(400.0f) + 300.0f; Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &dest); - func_i4_80192908(boss->obj.pos.x + dest.x, boss->obj.pos.y - 500.0f, boss->obj.pos.z + dest.z, - boss->obj.pos.x, boss->obj.pos.y - 500.0f, boss->obj.pos.z); + Katina_80192908(boss->obj.pos.x + dest.x, boss->obj.pos.y - 500.0f, boss->obj.pos.z + dest.z, + boss->obj.pos.x, boss->obj.pos.y - 500.0f, boss->obj.pos.z); } if ((boss->timer_052 == 700) || (boss->timer_052 == 697)) { i = gGameFrameCount & 63; Object_Kill(&gEffects[i].obj, gEffects[i].sfxSource); - func_8007B344(boss->obj.pos.x, boss->obj.pos.y - 600.0f, boss->obj.pos.z, 90.0f, 0); + func_effect_8007B344(boss->obj.pos.x, boss->obj.pos.y - 600.0f, boss->obj.pos.z, 90.0f, 0); AUDIO_PLAY_SFX(0x1140B045U, boss->sfxSource, 0); } @@ -1010,7 +1008,7 @@ void func_i4_801946C4(Boss* boss) { gPlayer[0].camAt.x = boss->obj.pos.x; gPlayer[0].camAt.y = 1500.0f; gPlayer[0].camAt.z = boss->obj.pos.z; - D_801784D4 = 60.0f; + D_ctx_801784D4 = 60.0f; gLight1R = 100; gLight1G = 70; gLight1B = 50; @@ -1032,14 +1030,14 @@ void func_i4_801946C4(Boss* boss) { break; case 18: - Math_SmoothStepToF(&D_801779A8[gMainController], 100.0f, 1.0f, 100.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_801779A8[gMainController], 100.0f, 1.0f, 100.0f, 0.0f); Math_SmoothStepToF(&gPlayer[0].camAt.y, 525.0f, 0.3f, 50.0f, 0.0f); if (boss->timer_050 == 0) { - D_80178358 = 255; - D_80178348 = 255; - D_80178350 = 255; - D_80178354 = 255; - if (D_80178340 == 255) { + D_ctx_80178358 = 255; + D_ctx_80178348 = 255; + D_ctx_80178350 = 255; + D_ctx_80178354 = 255; + if (D_ctx_80178340 == 255) { gPlayer[0].state_1C8 = PLAYERSTATE_1C8_7; gPlayer[0].unk_1D0 = 2; gPlayer[0].unk_234 = 1; @@ -1052,8 +1050,8 @@ void func_i4_801946C4(Boss* boss) { gPlayer[0].unk_0EC = gPlayer[0].unk_0E8 = gPlayer[0].unk_0E4 = gPlayer[0].unk_120 = gPlayer[0].unk_114; - func_800A6148(); - D_801784D4 = 60.0f; + func_play_800A6148(); + D_ctx_801784D4 = 60.0f; gLight1R = 100; gLight1G = 70; gLight1B = 50; @@ -1062,13 +1060,13 @@ void func_i4_801946C4(Boss* boss) { break; case 20: - D_8015F93C = 0; + D_360_8015F93C = 0; Math_SmoothStepToF(&boss->fwork[10], 0.0f, 0.1f, 3.0f, 0.0f); if ((boss->timer_050 == 0) && (((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3)) || (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_5))) { gPlayer[0].state_1C8 = PLAYERSTATE_1C8_7; gPlayer[0].unk_1D0 = 0; - D_80177930 = 1; + D_ctx_80177930 = 1; boss->obj.pos.z = 0.0f; boss->health = -1; boss->fwork[10] = 0.0f; @@ -1102,13 +1100,14 @@ void func_i4_801946C4(Boss* boss) { src.y = -800.0f; src.z = RAND_FLOAT_CENTERED(3000.0f); Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &dest); - func_800794CC(boss->obj.pos.x + dest.x, boss->obj.pos.y + dest.y, boss->obj.pos.z + dest.z, 1.55f); + func_effect_800794CC(boss->obj.pos.x + dest.x, boss->obj.pos.y + dest.y, boss->obj.pos.z + dest.z, + 1.55f); } else { boss->obj.rot.x -= 0.06f; boss->vel.y = 0.0f; boss->gravity = 0.0f; Math_SmoothStepToF(&boss->unk_078.z, 0.0f, 1.0f, 1.0f, 0.0f); - func_i4_80192C08( + Katina_80192C08( boss->obj.pos.x + 2000.0f + RAND_FLOAT(500.0f), (boss->obj.pos.y - 500.0f) + RAND_FLOAT(500.0f), boss->obj.pos.z + 600.0f + RAND_FLOAT(1000.0f), 0.0f, 20.0f, 0.0f, RAND_FLOAT(20.0f) + 15.0f); } @@ -1118,8 +1117,8 @@ void func_i4_801946C4(Boss* boss) { src.y = RAND_FLOAT_CENTERED(600.0f) + -300.0f; src.z = RAND_FLOAT_CENTERED(4000.0f); Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &dest); - func_i4_80192C08(boss->obj.pos.x + dest.x, boss->obj.pos.y + dest.y, boss->obj.pos.z + dest.z, 0.0f, - 5.0f, 0.0f, RAND_FLOAT(15.0f) + 10.0f); + Katina_80192C08(boss->obj.pos.x + dest.x, boss->obj.pos.y + dest.y, boss->obj.pos.z + dest.z, 0.0f, + 5.0f, 0.0f, RAND_FLOAT(15.0f) + 10.0f); } break; } @@ -1189,11 +1188,11 @@ void func_i4_801946C4(Boss* boss) { boss->info.hitbox[49] = boss->fwork[4] - 200.0f + -850.0f; boss->info.hitbox[55] = boss->fwork[4] - 200.0f + -950.0f; boss->info.hitbox[61] = boss->fwork[4] - 200.0f + -1200.0f; - func_i4_80193EF0(boss); + Katina_80193EF0(boss); } } -s32 func_i4_801965A8(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +s32 Katina_801965A8(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { Boss* boss = (Boss*) data; RCP_SetupDL(&gMasterDisp, 29); @@ -1276,7 +1275,7 @@ s32 func_i4_801965A8(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d return 0; } -void func_i4_801968F4(Boss* boss) { +void Katina_801968F4(Boss* boss) { Vec3f jointTable[30]; if (boss->state != 0) { @@ -1288,7 +1287,7 @@ void func_i4_801968F4(Boss* boss) { Matrix_RotateY(gGfxMatrix, boss->fwork[13] * M_DTOR, 1); Animation_GetFrameData(&D_KA_60105D8, 0, jointTable); - Animation_DrawSkeleton(1, D_KA_6010744, jointTable, func_i4_801965A8, NULL, boss, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_KA_6010744, jointTable, Katina_801965A8, NULL, boss, &gIdentityMatrix); gSPFogPosition(gMasterDisp++, gFogNear, gFogFar); if (boss->fwork[14] > 0.0f) { @@ -1324,7 +1323,7 @@ void func_i4_801968F4(Boss* boss) { } } -void func_i4_80196E30(Actor* actor, s32 idx) { +void Katina_80196E30(Actor* actor, s32 idx) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; @@ -1342,7 +1341,7 @@ void func_i4_80196E30(Actor* actor, s32 idx) { AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); } -void func_i4_80196F40(Actor* actor, s32 idx) { +void Katina_80196F40(Actor* actor, s32 idx) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; @@ -1360,21 +1359,21 @@ void func_i4_80196F40(Actor* actor, s32 idx) { AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); } -void func_i4_80197024(void) { +void Katina_80197024(void) { s32 i; s32 target; Actor* actor = &gActors[0]; Rand_SetSeed(1, 29100, 9786); - if (D_80177930 != 0) { + if (D_ctx_80177930 != 0) { target = 19; } else { target = 2; } for (i = 0; i <= target; i++, actor++) { - if ((D_i4_8019F2F0[i] >= D_8015F921) && ((i >= 3) || (gTeamShields[i + 1] > 0))) { + if ((D_i4_8019F2F0[i] >= D_360_8015F921) && ((i >= 3) || (gTeamShields[i + 1] > 0))) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; actor->obj.id = OBJ_ACTOR_195; @@ -1396,7 +1395,7 @@ void func_i4_80197024(void) { } } -void func_i4_80197290(Player* player) { +void Katina_80197290(Player* player) { s32 i; Boss* boss = &gBosses[1]; Vec3f src; @@ -1408,7 +1407,7 @@ void func_i4_80197290(Player* player) { player->wings.unk_08 = 0.0f; player->wings.unk_04 = 0.0f; player->unk_4D8 = 0.0f; - D_80177A48[0] = 1.0f; + D_ctx_80177A48[0] = 1.0f; switch (player->unk_1D0) { case 0: Audio_StopSfxByBankAndSource(1, &player->sfxSource[0]); @@ -1433,15 +1432,15 @@ void func_i4_80197290(Player* player) { } player->unk_1D0 += 1; if (gTeamShields[1] > 0) { - func_i4_80196E30(&gActors[1], 0); + Katina_80196E30(&gActors[1], 0); } if (gTeamShields[2] > 0) { - func_i4_80196E30(&gActors[2], 1); + Katina_80196E30(&gActors[2], 1); } if (gTeamShields[3] > 0) { - func_i4_80196E30(&gActors[3], 2); + Katina_80196E30(&gActors[3], 2); } break; @@ -1474,13 +1473,13 @@ void func_i4_80197290(Player* player) { } if (gCsFrameCount >= 225) { - D_80178358 = 255; - D_80178348 = D_80178350 = D_80178354 = 255; + D_ctx_80178358 = 255; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; } if (gCsFrameCount == 250) { player->unk_1D0 = 2; - func_800A6148(); + func_play_800A6148(); func_8001CA24(0); Audio_KillSfxBySource(&player->sfxSource[0]); player->timer_1F8 = 50; @@ -1499,25 +1498,25 @@ void func_i4_80197290(Player* player) { player->pos.z = 150.0f; player->unk_1D0 = 3; func_8001C8B8(0); - if (D_80177930 != 0) { + if (D_ctx_80177930 != 0) { AUDIO_PLAY_BGM(SEQ_ID_38); } else { AUDIO_PLAY_BGM(SEQ_ID_49); } - D_80177A98 = 0; - D_80177A48[1] = 0.0f; - D_80177A48[2] = 0.0f; - func_i4_80197024(); - func_800A3FB0(); + D_ctx_80177A98 = 0; + D_ctx_80177A48[1] = 0.0f; + D_ctx_80177A48[2] = 0.0f; + Katina_80197024(); + func_play_800A3FB0(); gCsFrameCount = 0; } break; case 3: - D_80178358 = 0; - D_8017835C = 2; - D_80177A48[1] -= D_80177A48[2]; - Matrix_RotateY(gCalcMatrix, D_80177A48[1] * M_DTOR, 0); + D_ctx_80178358 = 0; + D_ctx_8017835C = 2; + D_ctx_80177A48[1] -= D_ctx_80177A48[2]; + Matrix_RotateY(gCalcMatrix, D_ctx_80177A48[1] * M_DTOR, 0); src.x = -1000.0f; src.y = 0.0f; src.z = 0.0f; @@ -1531,14 +1530,14 @@ void func_i4_80197290(Player* player) { if (gCsFrameCount >= 1011) { player->unk_0D0 += 2.0f; player->unk_0E4 += 0.1f; - Math_SmoothStepToF(&D_80177A48[2], 0.0f, 1.0f, 0.001f, 0); + Math_SmoothStepToF(&D_ctx_80177A48[2], 0.0f, 1.0f, 0.001f, 0); player->unk_190 = 2.0f; player->unk_25C += 0.04f; if (player->unk_25C > 0.6f) { player->unk_25C = 0.6f; } } else { - Math_SmoothStepToF(&D_80177A48[2], 0.2f, 1.0f, 0.005f, 0); + Math_SmoothStepToF(&D_ctx_80177A48[2], 0.2f, 1.0f, 0.005f, 0); } if (gCsFrameCount == 1050) { @@ -1546,27 +1545,27 @@ void func_i4_80197290(Player* player) { } if (gCsFrameCount >= 1101) { - D_80178358 = 255; - D_80178348 = D_80178350 = D_80178354 = 0; - D_8017835C = 8; - if (D_80178340 == 255) { + D_ctx_80178358 = 255; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; + D_ctx_8017835C = 8; + if (D_ctx_80178340 == 255) { player->state_1C8 = PLAYERSTATE_1C8_6; player->timer_1F8 = 0; - D_8017837C = 4; - D_800D3180[LEVEL_KATINA] = Play_CheckMedalStatus(150) + 1; + D_ctx_8017837C = 4; + D_play_800D3180[LEVEL_KATINA] = Play_CheckMedalStatus(150) + 1; } } switch (gCsFrameCount) { case 190: - D_80177840 = 100; + D_ctx_80177840 = 100; break; case 350: - D_80177830 = 1; + D_ctx_80177830 = 1; break; case 550: - D_80177830 = 0; + D_ctx_80177830 = 0; break; case 1010: @@ -1587,8 +1586,8 @@ void func_i4_80197290(Player* player) { break; case 570: - if (D_80177930 != 0) { - if (D_8015F921 == 0) { + if (D_ctx_80177930 != 0) { + if (D_360_8015F921 == 0) { Radio_PlayMessage(gMsg_ID_18100, RCID_BILL); } else { Radio_PlayMessage(gMsg_ID_18090, RCID_BILL); @@ -1599,8 +1598,8 @@ void func_i4_80197290(Player* player) { break; case 700: - if (D_80177930 != 0) { - if (D_8015F921 == 0) { + if (D_ctx_80177930 != 0) { + if (D_360_8015F921 == 0) { Radio_PlayMessage(gMsg_ID_18105, RCID_FOX); } else { Radio_PlayMessage(gMsg_ID_18095, RCID_FOX); @@ -1613,17 +1612,17 @@ void func_i4_80197290(Player* player) { break; case 100: - func_i4_80196F40(&gActors[1], 0); + Katina_80196F40(&gActors[1], 0); if (gTeamShields[1] > 0) { - func_i4_80196F40(&gActors[2], 1); + Katina_80196F40(&gActors[2], 1); } if (gTeamShields[2] > 0) { - func_i4_80196F40(&gActors[3], 2); + Katina_80196F40(&gActors[3], 2); } if (gTeamShields[3] > 0) { - func_i4_80196F40(&gActors[4], 3); + Katina_80196F40(&gActors[4], 3); } player->unk_1D0 += 1; break; @@ -1654,12 +1653,12 @@ void func_i4_80197290(Player* player) { player->unk_0F8 = player->unk_0EC; player->unk_138 = player->pos.z; if (player->unk_1D0 < 100) { - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_ctx_80177A48[0], 50000.0f, 0); } player->unk_088 += 10.0f; player->unk_080 = -__sinf(player->unk_088 * M_DTOR) * 0.3f; @@ -1667,7 +1666,7 @@ void func_i4_80197290(Player* player) { player->unk_0F0 = __sinf(player->unk_0F4 * M_DTOR); } -void func_i4_80197F10(Actor* actor) { +void Katina_80197F10(Actor* actor) { Vec3f src; Vec3f dest; @@ -1718,7 +1717,7 @@ void func_i4_80197F10(Actor* actor) { actor->obj.rot.z = -actor->unk_0F4.z; } -void func_i4_801981F8(Actor* actor) { +void Katina_801981F8(Actor* actor) { s32 i; Actor* actor_it; Vec3f src; @@ -1768,8 +1767,8 @@ void func_i4_801981F8(Actor* actor) { actor_it->info.bonus = 0; AUDIO_PLAY_SFX(0x3100000C, actor_it->sfxSource, 4); } - actor_it->info.action = (ObjectFunc) func_i4_80198AA0; - actor_it->info.draw = (ObjectFunc) func_i4_801995B4; + actor_it->info.action = (ObjectFunc) Katina_80198AA0; + actor_it->info.draw = (ObjectFunc) Katina_801995B4; actor->unk_04E++; } break; @@ -1778,7 +1777,7 @@ void func_i4_801981F8(Actor* actor) { } } -void func_i4_8019848C(void) { +void Katina_8019848C(void) { Actor* actor = &gActors[9]; Actor_Initialize(actor); @@ -1800,35 +1799,35 @@ void func_i4_8019848C(void) { AUDIO_PLAY_SFX(0x3100000CU, actor->sfxSource, 4); } -void func_i4_80198594(Actor* actor) { +void Katina_80198594(Actor* actor) { s32 pad[4]; f32 D_i4_8019F494[5] = { -200.0f, -100.0f, -0.0f, 100.0f, 200.0f }; switch (actor->state) { case 0: - D_80161A44 = 30000.0f; + D_game_80161A44 = 30000.0f; D_i4_801A0540 = 0; - D_8015F920 = D_8015F921 = 0; + D_360_8015F920 = D_360_8015F921 = 0; actor->state = 2; - if (D_8015F924 != 0) { + if (D_360_8015F924 != 0) { gHitCount = gSavedHitCount; gBosses[1].state = 6; gBosses[1].obj.pos.x = 0.0f; gBosses[1].obj.pos.z = 0.0f; gBosses[1].obj.pos.y = 2000.0f; AUDIO_PLAY_SFX(0x11037025U, gBosses[1].sfxSource, 0); - D_8015F928 = 20000; + D_360_8015F928 = 20000; gBosses[1].swork[16] = 5760; - D_8015F920 = 1; + D_360_8015F920 = 1; AUDIO_PLAY_BGM(SEQ_ID_29 | 0x8000); } - func_i4_8019848C(); + Katina_8019848C(); case 2: D_i4_801A0540++; PRINTF("KT_time %d\n", D_i4_801A0540); - func_i4_801981F8(actor); + Katina_801981F8(actor); break; case 6: @@ -1842,7 +1841,7 @@ void func_i4_80198594(Actor* actor) { } if (gBosses[1].state < 15) { - switch (D_8015F928) { + switch (D_360_8015F928) { case -500: Radio_PlayMessage(gMsg_ID_18005, RCID_BILL); break; @@ -1861,32 +1860,32 @@ void func_i4_80198594(Actor* actor) { } if (gBosses[1].state == 12) { - if (!(D_8015F928 & 255) && (Rand_ZeroOne() < 0.5f)) { - func_8002E4F8(gMsg_ID_18060, RCID_BILL); + if (!(D_360_8015F928 & 255) && (Rand_ZeroOne() < 0.5f)) { + func_360_8002E4F8(gMsg_ID_18060, RCID_BILL); } - } else if ((D_8015F928 > 500) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) && !(D_8015F928 & 511)) { + } else if ((D_360_8015F928 > 500) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) && !(D_360_8015F928 & 511)) { switch (RAND_INT(3.99f)) { case 0: - func_8002E4F8(gMsg_ID_18020, RCID_BILL); + func_360_8002E4F8(gMsg_ID_18020, RCID_BILL); break; case 1: - func_8002E4F8(gMsg_ID_18021, RCID_BILL); + func_360_8002E4F8(gMsg_ID_18021, RCID_BILL); break; case 2: - func_8002E4F8(gMsg_ID_18022, RCID_BILL); + func_360_8002E4F8(gMsg_ID_18022, RCID_BILL); break; case 3: - func_8002E4F8(gMsg_ID_18025, RCID_FALCO); + func_360_8002E4F8(gMsg_ID_18025, RCID_FALCO); break; } } } } -void func_i4_80198930(void) { +void Katina_80198930(void) { Boss* boss = &gBosses[0]; Boss_Initialize(&boss[1]); @@ -1908,7 +1907,7 @@ void func_i4_80198930(void) { Object_SetInfo(&boss[0].info, boss[0].obj.id); } -bool func_i4_801989F4(Actor* boss, f32 posX, f32 posY) { +bool Katina_801989F4(Actor* boss, f32 posX, f32 posY) { if ((fabsf(gBosses[0].obj.pos.x - (boss->obj.pos.x + (posX * 650.0f))) < 1500.0f) && (fabsf(gBosses[0].obj.pos.z - (boss->obj.pos.z + (posY * 650.0f))) < 1500.0f) && (fabsf(gBosses[0].obj.pos.y - boss->obj.pos.y) < 700.0f)) { @@ -1918,7 +1917,7 @@ bool func_i4_801989F4(Actor* boss, f32 posX, f32 posY) { } } -void func_i4_80198AA0(Actor* actor) { +void Katina_80198AA0(Actor* actor) { s32 isClose; s32 state; s32 pad; @@ -1992,7 +1991,7 @@ void func_i4_80198AA0(Actor* actor) { actor->iwork[5] = 1; if (!((actor->index + gGameFrameCount) & 11) && (Rand_ZeroOne() < 0.1f) && - (func_80031900(actor) != 0) && (gActors[0].state == 2)) { + (func_360_80031900(actor) != 0) && (gActors[0].state == 2)) { actor->iwork[0] = 1; } } else { @@ -2054,7 +2053,7 @@ void func_i4_80198AA0(Actor* actor) { actor->fwork[20] = Math_RadToDeg(Math_Atan2F(yRand, xAngle)); } xAngle = actor->fwork[20]; - isClose = func_i4_801989F4(actor, ySin, yCos); + isClose = Katina_801989F4(actor, ySin, yCos); if (isClose != 0) { xAngle += 40.0f * isClose; if (xAngle >= 360.0f) { @@ -2105,12 +2104,12 @@ void func_i4_80198AA0(Actor* actor) { yVel = (-xSin * 200.0f * 0.5f); xVel = (xCos * 200.0f * 0.5f); zVel = (xCos * 200.0f * 0.5f); - func_8006EEFC(actor->aiType, actor->obj.pos.x + ((ySin * xVel) * 1.5f), actor->obj.pos.y + (yVel * 1.5f), - actor->obj.pos.z + ((yCos * zVel) * 1.5f), (ySin * (xCos * 200.0f * 0.5f)), - (-xSin * 200.0f * 0.5f), (yCos * (xCos * 200.0f * 0.5f)), actor->obj.rot.x, actor->obj.rot.y, - actor->obj.rot.z); + func_enmy2_8006EEFC(actor->aiType, actor->obj.pos.x + ((ySin * xVel) * 1.5f), actor->obj.pos.y + (yVel * 1.5f), + actor->obj.pos.z + ((yCos * zVel) * 1.5f), (ySin * (xCos * 200.0f * 0.5f)), + (-xSin * 200.0f * 0.5f), (yCos * (xCos * 200.0f * 0.5f)), actor->obj.rot.x, + actor->obj.rot.y, actor->obj.rot.z); } - func_8003088C(actor); + func_360_8003088C(actor); radarMark = &gRadarMarks[actor->index]; radarMark->unk_00 = 1; radarMark->unk_02 = actor->aiType; @@ -2123,7 +2122,7 @@ void func_i4_80198AA0(Actor* actor) { } } -void func_i4_801995B4(Actor* actor) { +void Katina_801995B4(Actor* actor) { s32 pad3[3]; f32 angle; Vec3f D_i4_8019F4A8 = { 0.0f, 0.0f, 0.0f }; @@ -2165,7 +2164,7 @@ void func_i4_801995B4(Actor* actor) { case 1: gSPDisplayList(gMasterDisp++, D_KA_600E050); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, 1); - func_8005B1E8(actor, 0); + func_edisplay_8005B1E8(actor, 0); break; } } diff --git a/src/overlays/ovl_i4/fox_sz.c b/src/overlays/ovl_i4/fox_sz.c index fc6f7f17..3e8cf8da 100644 --- a/src/overlays/ovl_i4/fox_sz.c +++ b/src/overlays/ovl_i4/fox_sz.c @@ -22,12 +22,7 @@ Vec3f D_i4_8019F4E4[] = { { 200.0f, 400.0f, 500.0f }, }; -extern s32 D_80161710; - -void func_8002EE34(void); -void func_8002FC00(Actor*); - -void func_i4_80199900(Actor* actor, s32 arg1) { +void SectorZ_80199900(Actor* actor, s32 arg1) { s32 i; PRINTF("MISS_MOVE_TIME %d\n"); @@ -35,18 +30,18 @@ void func_i4_80199900(Actor* actor, s32 arg1) { PRINTF("time0 %d\n"); PRINTF("Demo_Time=%d\n"); - D_Timer_80161A60 = 8; + D_play_Timer_80161A60 = 8; Object_Kill(&actor->obj, actor->sfxSource); - func_8007A6F0(&actor->obj.pos, 0x2903A060); + func_effect_8007A6F0(&actor->obj.pos, 0x2903A060); for (i = 0; i < 20; i++) { - func_800794CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f); - func_80079618(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f); + func_effect_800794CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f); + func_effect_80079618(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f); } - func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 20.0f, 30); - func_8007B344(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 20.0f, 5); + func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 20.0f, 30); + func_effect_8007B344(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 20.0f, 5); if (arg1 != 0) { D_i4_801A0560++; @@ -63,13 +58,13 @@ void func_i4_80199900(Actor* actor, s32 arg1) { SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1); } - if ((D_i4_801A0560 == 3) && (D_800D3180[LEVEL_ZONESS] != 0)) { - D_800C9B4C = D_8015F928 + 110; + if ((D_i4_801A0560 == 3) && (D_play_800D3180[LEVEL_ZONESS] != 0)) { + D_360_800C9B4C = D_360_8015F928 + 110; } } } -void func_i4_80199B18(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale) { +void SectorZ_80199B18(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_339; @@ -94,12 +89,12 @@ void func_i4_80199B18(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f3 effect->unk_46 = 2; } -void func_i4_80199BDC(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale) { +void SectorZ_80199BDC(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale) { s32 i; for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == 0) { - func_i4_80199B18(&gEffects[i], xPos, yPos, zPos, xVel, yVel, zVel, scale); + SectorZ_80199B18(&gEffects[i], xPos, yPos, zPos, xVel, yVel, zVel, scale); break; } } @@ -112,7 +107,7 @@ typedef enum { // https://decomp.me/scratch/7td7r #ifdef NON_MATCHING -void func_i4_80199C60(Actor* missile) { +void SectorZ_80199C60(Actor* missile) { f32 xDist; f32 yDist; f32 zDist; @@ -159,8 +154,8 @@ void func_i4_80199C60(Actor* missile) { if (((fabsf(missile->fwork[MISSILE_TARGET_X] - missile->obj.pos.x) < 800.0f) && (fabsf(missile->fwork[MISSILE_TARGET_Y] - missile->obj.pos.y) < 800.0f)) && (fabsf(missile->fwork[MISSILE_TARGET_Z] - missile->obj.pos.z) < 800.0f)) { - func_i4_80199900(missile, 0); - D_80178480 = 25; + SectorZ_80199900(missile, 0); + D_ctx_80178480 = 25; gBosses[0].dmgType = DMG_UNK_100; if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) || (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_5)) { gPlayer[0].state_1C8 = PLAYERSTATE_1C8_7; @@ -170,7 +165,8 @@ void func_i4_80199C60(Actor* missile) { } } if (((fabsf(missile->fwork[MISSILE_TARGET_Z] - missile->obj.pos.z) < 2000.0f) && - (((gPlayer[0].camEye.z < 0.0f) || (D_801615D0.y < 0.0f)) || (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_10))) && + (((gPlayer[0].camEye.z < 0.0f) || (D_edisplay_801615D0.y < 0.0f)) || + (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_10))) && (((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) || (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_10)) || (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_5))) { gPlayer[0].state_1C8 = PLAYERSTATE_1C8_7; @@ -179,10 +175,10 @@ void func_i4_80199C60(Actor* missile) { } } #else -#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/SectorZ_80199C60.s") #endif -void func_i4_80199FCC(Actor* actor, s32 arg1) { +void SectorZ_80199FCC(Actor* actor, s32 arg1) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; actor->obj.id = OBJ_ACTOR_197; @@ -206,7 +202,7 @@ void func_i4_80199FCC(Actor* actor, s32 arg1) { AUDIO_PLAY_SFX(0x3103A061U, actor->sfxSource, 4U); } -void func_i4_8019A0F8(Actor* actor, s32 arg1) { +void SectorZ_8019A0F8(Actor* actor, s32 arg1) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; actor->obj.id = OBJ_ACTOR_197; @@ -225,7 +221,7 @@ void func_i4_8019A0F8(Actor* actor, s32 arg1) { actor->iwork[11] = 1; } -void func_i4_8019A1D0(void) { +void SectorZ_8019A1D0(void) { Actor* actor = &gActors[8]; Actor_Initialize(actor); @@ -253,16 +249,16 @@ void func_i4_8019A1D0(void) { AUDIO_PLAY_SFX(0x31000011U, actor->sfxSource, 4U); } -void func_i4_8019A2F4(Actor* actor) { - if (D_8015F928 == D_800C9B4C) { - func_i4_8019A1D0(); +void SectorZ_8019A2F4(Actor* actor) { + if (D_360_8015F928 == D_360_800C9B4C) { + SectorZ_8019A1D0(); gCsFrameCount = 0; actor->timer_0BC = 400; actor->state = 3; gPlayer[0].state_1C8 = PLAYERSTATE_1C8_0; Audio_PlayFanfare(SEQ_ID_54, 20, 10, 10); - func_8002EE34(); + func_360_8002EE34(); gPlayer[0].camEye.x = 250.0f; gPlayer[0].camEye.y = 2500.0f; @@ -275,13 +271,13 @@ void func_i4_8019A2F4(Actor* actor) { } } -void func_i4_8019A3E8(Actor* actor) { +void SectorZ_8019A3E8(Actor* actor) { s32 i; Vec3f sp40; Vec3f sp34; Actor* actorPtr; - if (D_8015F928 >= 0) { + if (D_360_8015F928 >= 0) { if (gTeamShields[1] > 0) { if (gActors[1].iwork[2] == 0) { if (gActors[10].obj.status == 2) { @@ -337,12 +333,12 @@ void func_i4_8019A3E8(Actor* actor) { } } - if (D_8015F928 == 100) { + if (D_360_8015F928 == 100) { Radio_PlayMessage(gMsg_ID_16030, RCID_FALCO); } if (((actor->timer_0C0 == 0) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_0)) && - ((D_8015F928 < 200) || ((D_8015F928 > 4000) && (D_8015F928 < 4200)))) { + ((D_360_8015F928 < 200) || ((D_360_8015F928 > 4000) && (D_360_8015F928 < 4200)))) { actor->timer_0C0 = 5; actorPtr = &gActors[13]; sp40.x = 0.0f; @@ -366,7 +362,7 @@ void func_i4_8019A3E8(Actor* actor) { actorPtr->aiType = i + 13; actorPtr->aiIndex = -1; - if (D_8015F928 >= 0) { + if (D_360_8015F928 >= 0) { if (((i + 13) == 23) || ((i + 13) == 24)) { actorPtr->aiIndex = 2; actorPtr->state = 2; @@ -396,16 +392,16 @@ void func_i4_8019A3E8(Actor* actor) { } } - switch (D_8015F928) { + switch (D_360_8015F928) { case 5850: Radio_PlayMessage(gMsg_ID_16110, RCID_ROB64); break; case 6000: - func_i4_80199FCC(&gActors[12], 2); - func_i4_80199FCC(&gActors[11], 1); - func_i4_80199FCC(&gActors[10], 0); - D_80161710 = 580; + SectorZ_80199FCC(&gActors[12], 2); + SectorZ_80199FCC(&gActors[11], 1); + SectorZ_80199FCC(&gActors[10], 0); + D_hud_80161710 = 580; break; case 3850: @@ -413,22 +409,22 @@ void func_i4_8019A3E8(Actor* actor) { break; case 4000: - func_i4_80199FCC(&gActors[11], 1); - func_i4_80199FCC(&gActors[10], 0); - D_80161710 = 580; + SectorZ_80199FCC(&gActors[11], 1); + SectorZ_80199FCC(&gActors[10], 0); + D_hud_80161710 = 580; break; case 2000: - D_80161710 = 490; - func_i4_80199FCC(&gActors[10], 0); + D_hud_80161710 = 490; + SectorZ_80199FCC(&gActors[10], 0); gActors[10].fwork[1] = 10.0f; gActors[10].obj.pos.z = 25000.0f; - func_i4_8019A0F8(&gActors[13], 0); - func_i4_8019A0F8(&gActors[14], 1); - func_i4_8019A0F8(&gActors[15], 2); - func_i4_8019A0F8(&gActors[16], 3); + SectorZ_8019A0F8(&gActors[13], 0); + SectorZ_8019A0F8(&gActors[14], 1); + SectorZ_8019A0F8(&gActors[15], 2); + SectorZ_8019A0F8(&gActors[16], 3); gPlayer[0].state_1C8 = PLAYERSTATE_1C8_0; actor->state = 10; @@ -444,31 +440,31 @@ void func_i4_8019A3E8(Actor* actor) { gPlayer[0].camAt.z = gActors[10].obj.pos.z; actor->timer_0BC = 10000; - D_80178340 = D_80178358 = 255; - D_80178348 = D_80178350 = D_80178354 = 0; + D_ctx_80178340 = D_ctx_80178358 = 255; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; AUDIO_PLAY_BGM(SEQ_ID_31 | 0x8000); break; } - func_8002FC00(actor); - func_i4_8019A2F4(actor); + func_360_8002FC00(actor); + SectorZ_8019A2F4(actor); } -bool func_i4_8019AA9C(Player* player) { +bool SectorZ_8019AA9C(Player* player) { if (player->state_1C8 == PLAYERSTATE_1C8_3) { if ((player->unk_114 > 30.0f) && (player->unk_114 < 150.0f) && (fabsf(player->pos.x - 1270.0f) < 450.0f) && (fabsf(player->pos.y - 265.0f) < 100.0f) && (fabsf(player->unk_138) < 172.0f)) { player->state_1C8 = PLAYERSTATE_1C8_10; player->unk_1D0 = 0; gActors[0].state = 20; - D_8015F928--; + D_360_8015F928--; return true; } } return false; } -void func_i4_8019AB8C(Actor* actor) { +void SectorZ_8019AB8C(Actor* actor) { s32 i; Player* player; Actor* actor8; @@ -480,20 +476,20 @@ void func_i4_8019AB8C(Actor* actor) { switch ((s32) actor->state) { case 0: D_i4_801A0564 = D_i4_801A0560 = 0; - D_8015F914 = 63.0f; - D_8015F918 = 255.0f; - D_8015F91C = 158.0f; - D_80161A44 = 30000.0f; - D_8015F928 = 0; + D_360_8015F914 = 63.0f; + D_360_8015F918 = 255.0f; + D_360_8015F91C = 158.0f; + D_game_80161A44 = 30000.0f; + D_360_8015F928 = 0; actor->state = 2; - if (D_8015F924 != 0) { + if (D_360_8015F924 != 0) { gHitCount = gSavedHitCount; } - D_800C9B4C = 1000000; + D_360_800C9B4C = 1000000; case 2: - if (func_i4_8019AA9C(player) == 0) { - func_i4_8019A3E8(actor); + if (SectorZ_8019AA9C(player) == 0) { + SectorZ_8019A3E8(actor); switch (actor->timer_0BE) { case 548: Radio_PlayMessage(gMsg_ID_16050, RCID_ROB64); @@ -514,14 +510,14 @@ void func_i4_8019AB8C(Actor* actor) { break; case 20: - D_8015F928--; + D_360_8015F928--; break; case 3: actor8 = &gActors[8]; gCsFrameCount++; if (gCsFrameCount == 3) { - func_80078E50(actor8->obj.pos.x, actor8->obj.pos.y, actor8->obj.pos.z, 30.0f); + func_effect_80078E50(actor8->obj.pos.x, actor8->obj.pos.y, actor8->obj.pos.z, 30.0f); } player->camEye.x += actor8->vel.x * 0.23f; player->camEye.y += actor8->vel.y * 0.23f; @@ -560,7 +556,7 @@ void func_i4_8019AB8C(Actor* actor) { if (actor->timer_0BC == 70) { actor->state = 2; player->state_1C8 = PLAYERSTATE_1C8_3; - func_800B7184(player, 1); + func_play_800B7184(player, 1); player->unk_014 = 0.0f; } break; @@ -580,7 +576,7 @@ void func_i4_8019AB8C(Actor* actor) { break; case 10: - D_80178340 = D_80178358 = 0; + D_ctx_80178340 = D_ctx_80178358 = 0; switch (actor->timer_0BC) { case 9800: AUDIO_PLAY_SFX(0x09000002U, gActors[10].sfxSource, 0U); @@ -626,7 +622,7 @@ void func_i4_8019AB8C(Actor* actor) { if (actor->timer_0BC < 9680) { actor->state = 2; player->state_1C8 = PLAYERSTATE_1C8_3; - func_800B7184(player, 1); + func_play_800B7184(player, 1); player->unk_014 = 0.0f; gActors[10].fwork[1] = 25.0f; gActors[10].fwork[29] = 5.0f; @@ -642,13 +638,13 @@ void func_i4_8019AB8C(Actor* actor) { } if (!(gGameFrameCount & 24)) { - Math_SmoothStepToF(&D_8015F914, 63.0f, 1.0f, 9.450001f, 0); - Math_SmoothStepToF(&D_8015F918, 255.0f, 1.0f, 35.25f, 0); - Math_SmoothStepToF(&D_8015F91C, 158.0f, 1.0f, 21.6f, 0); + Math_SmoothStepToF(&D_360_8015F914, 63.0f, 1.0f, 9.450001f, 0); + Math_SmoothStepToF(&D_360_8015F918, 255.0f, 1.0f, 35.25f, 0); + Math_SmoothStepToF(&D_360_8015F91C, 158.0f, 1.0f, 21.6f, 0); } else { - Math_SmoothStepToF(&D_8015F914, 0.0f, 1.0f, 3.15f, 0); - Math_SmoothStepToF(&D_8015F918, 20.0f, 1.0f, 11.75f, 0); - Math_SmoothStepToF(&D_8015F91C, 14.0f, 1.0f, 7.2000003f, 0); + Math_SmoothStepToF(&D_360_8015F914, 0.0f, 1.0f, 3.15f, 0); + Math_SmoothStepToF(&D_360_8015F918, 20.0f, 1.0f, 11.75f, 0); + Math_SmoothStepToF(&D_360_8015F91C, 14.0f, 1.0f, 7.2000003f, 0); } } @@ -658,7 +654,7 @@ Vec3f D_i4_8019F528[] = { { 2000.0f, 2500.0f, -2500.0f }, }; -void func_i4_8019B48C(void) { +void SectorZ_8019B48C(void) { Actor* actor = &gActors[1]; s32 i; @@ -676,7 +672,7 @@ void func_i4_8019B48C(void) { } } -void func_i4_8019B568(void) { +void SectorZ_8019B568(void) { Actor* actor = &gActors[0]; Actor_Initialize(actor); @@ -699,7 +695,7 @@ Vec3f D_i4_8019F57C[] = { f32 D_i4_8019F5AC[] = { -30.0f, 20.0f, 30.0f, -40.0f }; -void func_i4_8019B630(Actor* actor, s32 index) { +void SectorZ_8019B630(Actor* actor, s32 index) { Actor_Initialize(actor); actor->obj.status = OBJ_ACTIVE; actor->obj.id = OBJ_ACTOR_195; @@ -725,7 +721,7 @@ Vec3f D_i4_8019F5BC[] = { { 200.0f, 0.0f, 0.0f }, { 200.0f, 0.0f, 0.0f }, { 200.0f, 0.0f, 0.0f }, { 200.0f, 0.0f, 0.0f } }; -void func_i4_8019B75C(Actor* actor, s32 arg1) { +void SectorZ_8019B75C(Actor* actor, s32 arg1) { Actor* newActor = &gActors[0]; Actor_Initialize(actor); @@ -736,7 +732,7 @@ void func_i4_8019B75C(Actor* actor, s32 arg1) { actor->obj.pos.y = newActor->obj.pos.y - 500.0f; actor->obj.pos.z = D_i4_8019F5BC[arg1].z + newActor->obj.pos.z; - actor->vel.x = -D_80161A54; + actor->vel.x = -D_play_80161A54; actor->obj.rot.y = 270.0f; Object_SetInfo(&actor->info, actor->obj.id); @@ -750,7 +746,7 @@ Vec3f D_i4_8019F5EC[] = { { 0.0f, 20000.0f, 0.0f }, { -1000.0f, 100.0f, 500.0f }, { -1300.0f, -50.0f, 0.0f }, { -1600.0f, 50.0f, -500.0f } }; -void func_i4_8019B888(void) { +void SectorZ_8019B888(void) { s32 i; Actor* actor; @@ -772,7 +768,7 @@ void func_i4_8019B888(void) { actor->health = 255; actor->iwork[11] = 1; AUDIO_PLAY_SFX(0x3100000CU, actor->sfxSource, 4U); - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_800CC01C); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_edata_800CC01C); actor->info.unk_16 = 0; actor->info.unk_1C = 0.0f; } @@ -780,14 +776,14 @@ void func_i4_8019B888(void) { } } -void func_i4_8019BA64(Player* player) { +void SectorZ_8019BA64(Player* player) { s32 i; s32 j; Vec3f sp74; Vec3f sp68; Actor* actor = gActors; - D_8015F928 = 0; + D_360_8015F928 = 0; switch (player->unk_1D0) { case 0: @@ -795,8 +791,8 @@ void func_i4_8019BA64(Player* player) { player->unk_1D0++; - func_i4_8019B568(); - func_i4_8019B48C(); + SectorZ_8019B568(); + SectorZ_8019B48C(); gCsCamEyeX = 0.0f; gCsCamEyeY = 0.0f; @@ -804,17 +800,17 @@ void func_i4_8019BA64(Player* player) { gCsCamAtX = 2500.0f; gCsCamAtY = 0.0f; gCsCamAtZ = 0.0f; - D_80177A48[0] = 1.0f; + D_ctx_80177A48[0] = 1.0f; player->unk_234 = 0; player->unk_0D0 = 0.0f; player->unk_034 = -20.0f; - D_80161A44 = 30000.0f; + D_game_80161A44 = 30000.0f; case 1: if (gCsFrameCount < 7) { - D_80178340 = 255; + D_ctx_80178340 = 255; } gCsCamAtX -= 10.0f; @@ -831,12 +827,12 @@ void func_i4_8019BA64(Player* player) { gCsCamAtX = 0.0f; gCsCamAtY = 0.0f; gCsCamAtZ = 0.0f; - D_80178340 = 255; + D_ctx_80178340 = 255; } break; case 2: - D_80178340 = 0; + D_ctx_80178340 = 0; player->unk_034 += 0.05f; for (i = 30; i < 34; i++) { @@ -867,8 +863,8 @@ void func_i4_8019BA64(Player* player) { player->camAt.y = gCsCamAtY = actor->obj.pos.y; player->camAt.z = gCsCamAtZ = actor->obj.pos.z; - D_80177A48[0] = 0.0f; - D_80178340 = 255; + D_ctx_80177A48[0] = 0.0f; + D_ctx_80178340 = 255; for (i = 0; i < 4; i++) { Object_Kill(&gActors[i + 30].obj, gActors[i + 30].sfxSource); @@ -883,7 +879,7 @@ void func_i4_8019BA64(Player* player) { break; case 3: - D_80178340 = 0; + D_ctx_80178340 = 0; gCsCamEyeX = -1250.0f; gCsCamEyeY = -395.0f; @@ -891,7 +887,7 @@ void func_i4_8019BA64(Player* player) { gCsCamAtY = player->pos.y; gCsCamAtZ = player->pos.z; - Math_SmoothStepToF(D_80177A48, 0.05f, 1.0f, 0.0005f, 0.0f); + Math_SmoothStepToF(D_ctx_80177A48, 0.05f, 1.0f, 0.0005f, 0.0f); gActors[30].obj.rot.x -= 0.65f; gActors[31].obj.rot.x -= 0.65f; @@ -918,7 +914,7 @@ void func_i4_8019BA64(Player* player) { if (gCsFrameCount > 765) { gCsCamEyeZ += 3.0f; - Math_SmoothStepToF(D_80177A48, 0.9f, 1.0f, 0.07f, 0.0f); + Math_SmoothStepToF(D_ctx_80177A48, 0.9f, 1.0f, 0.07f, 0.0f); } else { gCsCamEyeZ = 0.0f; } @@ -927,16 +923,16 @@ void func_i4_8019BA64(Player* player) { for (i = 0; i < ARRAY_COUNT(gActors); i++) { Object_Kill(&gActors[i].obj, gActors[i].sfxSource); } - func_i4_8019EA68(); - func_i4_8019B888(); + SectorZ_8019EA68(); + SectorZ_8019B888(); } if (gCsFrameCount == 0x334) { Audio_KillSfxById(0x49000014U); player->state_1C8 = PLAYERSTATE_1C8_3; player->unk_01C = player->unk_018 = player->unk_014 = 0.f; - AUDIO_PLAY_BGM(D_80177C90); - D_80177838 = 0x32; + AUDIO_PLAY_BGM(D_ctx_80177C90); + D_ctx_80177838 = 0x32; } break; } @@ -954,19 +950,19 @@ void func_i4_8019BA64(Player* player) { break; case 370: - func_i4_8019B630(&gActors[30], 0); + SectorZ_8019B630(&gActors[30], 0); break; case 390: - func_i4_8019B630(&gActors[31], 1); + SectorZ_8019B630(&gActors[31], 1); break; case 405: - func_i4_8019B630(&gActors[32], 2); + SectorZ_8019B630(&gActors[32], 2); break; case 425: - func_i4_8019B630(&gActors[33], 3); + SectorZ_8019B630(&gActors[33], 3); break; case 560: @@ -975,19 +971,19 @@ void func_i4_8019BA64(Player* player) { case 700: if (gTeamShields[2] > 0) { - func_i4_8019B75C(&gActors[30], 0); + SectorZ_8019B75C(&gActors[30], 0); } break; case 720: if (gTeamShields[1] > 0) { - func_i4_8019B75C(&gActors[31], 1); + SectorZ_8019B75C(&gActors[31], 1); } break; case 740: if (gTeamShields[3] > 0) { - func_i4_8019B75C(&gActors[32], 2); + SectorZ_8019B75C(&gActors[32], 2); } break; @@ -995,7 +991,7 @@ void func_i4_8019BA64(Player* player) { player->unk_194 = 5.0f; player->unk_190 = 5.0f; player->unk_114 = 90.0f; - player->unk_0D0 = D_80161A54; + player->unk_0D0 = D_play_80161A54; player->unk_234 = 1; AUDIO_PLAY_SFX(0x09000002U, player->sfxSource, 0U); break; @@ -1021,12 +1017,12 @@ void func_i4_8019BA64(Player* player) { player->unk_138 = player->pos.z; player->unk_0F8 = player->unk_0EC + player->unk_12C + player->unk_130; - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_ctx_80177A48[0], 50000.0f, 0); } f32 D_i4_8019F61C[] = { -300.0f, 350.0f, -50.0f, 800.0f }; @@ -1035,7 +1031,7 @@ f32 D_i4_8019F62C[] = { 0.0f, -30.0f, -90.0f, -550.0f }; f32 D_i4_8019F63C[] = { -200.0f, -250.0f, -500.0f, 5000.0f }; -void func_i4_8019C574(Actor* actor, s32 index) { +void SectorZ_8019C574(Actor* actor, s32 index) { f32 var_fv0 = 1.0f; if (!gGreatFoxIntact) { @@ -1067,7 +1063,7 @@ void func_i4_8019C574(Actor* actor, s32 index) { } } -void func_i4_8019C70C(void) { +void SectorZ_8019C70C(void) { Actor* actor = &gActors[8]; Actor_Initialize(actor); @@ -1096,7 +1092,7 @@ void func_i4_8019C70C(void) { AUDIO_PLAY_SFX(0x3100000CU, actor->sfxSource, 4U); } -void func_i4_8019C85C(Player* player) { +void SectorZ_8019C85C(Player* player) { s32 i; Vec3f src; Vec3f dest; @@ -1124,7 +1120,7 @@ void func_i4_8019C85C(Player* player) { AUDIO_PLAY_SFX(0x09000002U, player->sfxSource, 0U); player->unk_194 = 5.0f; player->unk_190 = 5.0f; - D_80161A44 = 30000.0f; + D_game_80161A44 = 30000.0f; } break; @@ -1154,8 +1150,8 @@ void func_i4_8019C85C(Player* player) { gCsCamAtY = boss0->obj.pos.y; gCsCamAtZ = boss0->obj.pos.z; - D_80177A48[0] = 1.0f; - D_80161A44 = 30000.0f; + D_ctx_80177A48[0] = 1.0f; + D_game_80161A44 = 30000.0f; player->unk_234 = 0; player->unk_0D0 = 0.0f; @@ -1175,18 +1171,18 @@ void func_i4_8019C85C(Player* player) { gCsCamEyeY = boss0->obj.pos.y; gCsCamEyeZ = boss0->obj.pos.z + 4000.0f; - D_80177A48[0] = 1.0f; + D_ctx_80177A48[0] = 1.0f; player->unk_1D0 = 1; - D_80161A44 = 30000.0f; + D_game_80161A44 = 30000.0f; player->timer_1F8 = 550; player->unk_0D0 = 0.0f; player->unk_034 = 0.0f; - D_80178358 = 255; - D_80178340 = D_80178358; + D_ctx_80178358 = 255; + D_ctx_80178340 = D_ctx_80178358; for (i = 0; i < ARRAY_COUNT(gActors); i++) { Object_Kill(&gActors[i].obj, gActors[i].sfxSource); @@ -1195,8 +1191,8 @@ void func_i4_8019C85C(Player* player) { break; case 1: - D_80178358 = 0; - D_80178340 = 0; + D_ctx_80178358 = 0; + D_ctx_80178340 = 0; Math_SmoothStepToAngle(&boss0->unk_078.x, 20.0f, 0.03f, boss0->fwork[1], 0.0f); Math_SmoothStepToAngle(&boss0->unk_078.y, 180.0f, 0.03f, boss0->fwork[2], 0.0f); @@ -1211,16 +1207,16 @@ void func_i4_8019C85C(Player* player) { } if ((gCsFrameCount == 210) && gGreatFoxIntact) { - D_80177840 = 100; - D_80177930 = 1; + D_ctx_80177840 = 100; + D_ctx_80177930 = 1; } if ((gCsFrameCount == 230) && (D_i4_801A0564 != 0)) { - func_i4_8019C70C(); + SectorZ_8019C70C(); } gCsCamAtX = boss0->obj.pos.x; - gCsCamAtY = boss0->obj.pos.y + (2.0f * D_8017847C); + gCsCamAtY = boss0->obj.pos.y + (2.0f * D_ctx_8017847C); gCsCamAtZ = boss0->obj.pos.z; if (player->timer_1F8 == 0) { @@ -1229,8 +1225,8 @@ void func_i4_8019C85C(Player* player) { break; case 2: - D_80178358 = 0; - D_80178340 = 0; + D_ctx_80178358 = 0; + D_ctx_80178340 = 0; if (player->timer_1F8 == 0) { if (!gGreatFoxIntact) { @@ -1245,7 +1241,7 @@ void func_i4_8019C85C(Player* player) { func_8001CA24(0U); Audio_KillSfxBySource(player->sfxSource); - func_800A6148(); + func_play_800A6148(); player->pos.x = 0.0f; player->pos.y = 0.0f; @@ -1267,31 +1263,31 @@ void func_i4_8019C85C(Player* player) { gCsCamAtZ = player->pos.z; if (gTeamShields[1] > 0) { - func_i4_8019C574(actor1, 0); + SectorZ_8019C574(actor1, 0); } if (gTeamShields[2] > 0) { - func_i4_8019C574(actor3, 1); + SectorZ_8019C574(actor3, 1); } if (gTeamShields[3] > 0) { - func_i4_8019C574(actor2, 2); + SectorZ_8019C574(actor2, 2); } - func_i4_8019C574(actor0, 3); - D_80178340 = D_80178358 = 255; + SectorZ_8019C574(actor0, 3); + D_ctx_80178340 = D_ctx_80178358 = 255; } break; case 10: - D_80178340 = D_80178358 = 0; + D_ctx_80178340 = D_ctx_80178358 = 0; gCsCamAtX = player->pos.x; gCsCamAtY = player->pos.y; gCsCamAtZ = player->pos.z; if (gCsFrameCount == 1620) { player->unk_1D0 += 1; - D_80177A48[0] = 0.0f; - D_80177A48[1] = 0.0f; - D_80177A48[2] = 0.0f; - D_80177A48[3] = 300.0f; + D_ctx_80177A48[0] = 0.0f; + D_ctx_80177A48[1] = 0.0f; + D_ctx_80177A48[2] = 0.0f; + D_ctx_80177A48[3] = 300.0f; for (i = 0; i < 200; i++) { gObjects58[i].obj.status = OBJ_FREE; @@ -1300,11 +1296,11 @@ void func_i4_8019C85C(Player* player) { break; case 11: - Matrix_RotateY(gCalcMatrix, D_80177A48[1] * M_DTOR, 0); - D_80177A48[1] += D_80177A48[2] * var_fv1; + Matrix_RotateY(gCalcMatrix, D_ctx_80177A48[1] * M_DTOR, 0); + D_ctx_80177A48[1] += D_ctx_80177A48[2] * var_fv1; src.x = -800.0f * var_fv1; - src.y = D_80177A48[3]; + src.y = D_ctx_80177A48[3]; src.z = 0.0f; Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &dest); @@ -1314,16 +1310,16 @@ void func_i4_8019C85C(Player* player) { Math_SmoothStepToF(&actor3->fwork[0], 0, 0.05f, 1.0f, 0); Math_SmoothStepToF(&actor2->fwork[0], 0.0f, 0.05f, 1.0f, 0); Math_SmoothStepToF(&actor0->fwork[0], 0.0f, 0.05f, 1.0f, 0); - Math_SmoothStepToF(D_80177A48, 0.02f, 1.0f, 0.001f, 0); + Math_SmoothStepToF(D_ctx_80177A48, 0.02f, 1.0f, 0.001f, 0); if (gCsFrameCount > 2000) { - Math_SmoothStepToF(&D_80177A48[3], 50.0f, 0.05f, 1.5f, 0); + Math_SmoothStepToF(&D_ctx_80177A48[3], 50.0f, 0.05f, 1.5f, 0); } if (gCsFrameCount < 2330) { - Math_SmoothStepToF(&D_80177A48[2], 0.5f, 1.0f, 0.008f, 0); + Math_SmoothStepToF(&D_ctx_80177A48[2], 0.5f, 1.0f, 0.008f, 0); } else { - Math_SmoothStepToF(&D_80177A48[2], 0.0f, 1.0f, 0.002f, 0); + Math_SmoothStepToF(&D_ctx_80177A48[2], 0.0f, 1.0f, 0.002f, 0); } if (gCsFrameCount > 2510) { @@ -1333,7 +1329,7 @@ void func_i4_8019C85C(Player* player) { } if (gCsFrameCount > 2550) { - Math_SmoothStepToF(&D_80177A48[0], 0.1f, 1.0f, 0.005f, 0); + Math_SmoothStepToF(&D_ctx_80177A48[0], 0.1f, 1.0f, 0.005f, 0); } else { gCsCamEyeX = actor0->obj.pos.x - (800.0f * var_fv1) + dest.x; gCsCamEyeY = actor0->obj.pos.y + 550.0f + dest.y; @@ -1349,14 +1345,14 @@ void func_i4_8019C85C(Player* player) { } if (gCsFrameCount > 2710) { - D_80178358 = 255; - D_80178348 = D_80178350 = D_80178354 = 0; - D_8017835C = 8; - if (D_80178340 == 255) { + D_ctx_80178358 = 255; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; + D_ctx_8017835C = 8; + if (D_ctx_80178340 == 255) { player->state_1C8 = PLAYERSTATE_1C8_6; player->timer_1F8 = 0; - D_8017837C = 4; - D_800D3180[LEVEL_SECTOR_Z] = Play_CheckMedalStatus(100) + 1; + D_ctx_8017837C = 4; + D_play_800D3180[LEVEL_SECTOR_Z] = Play_CheckMedalStatus(100) + 1; } } break; @@ -1479,25 +1475,25 @@ void func_i4_8019C85C(Player* player) { break; case 2277: - D_80177830 = 1; + D_ctx_80177830 = 1; break; case 2477: - D_80177830 = 0; + D_ctx_80177830 = 0; break; case 1370: if (gGreatFoxIntact) { - D_80177930 = 1; + D_ctx_80177930 = 1; } else { AUDIO_PLAY_BGM(SEQ_ID_49); - D_80177930 = 0; + D_ctx_80177930 = 0; } break; case 1560: if (!gGreatFoxIntact) { - D_80177840 = 100; + D_ctx_80177840 = 100; } break; @@ -1556,17 +1552,17 @@ void func_i4_8019C85C(Player* player) { if (player->pos.y < 700.0f) { Math_SmoothStepToF(&player->pos.y, 700.0f, 0.1f, 10.0f, 0.0f); } - func_800B7184(player, 0); + func_play_800B7184(player, 0); player->camEye.x += player->vel.x * 0.1f; player->camEye.y += player->vel.y * 0.1f; player->camEye.z += player->vel.z * 0.1f; } else { - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_ctx_80177A48[0], 50000.0f, 0.0f); } player->unk_088 += 10.0f; @@ -1575,7 +1571,7 @@ void func_i4_8019C85C(Player* player) { player->unk_0F0 = SIN_DEG(player->unk_0F4); } -void func_i4_8019DD20(Actor* actor) { +void SectorZ_8019DD20(Actor* actor) { Vec3f src; Vec3f dest; @@ -1650,7 +1646,8 @@ void func_i4_8019DD20(Actor* actor) { src.y = 70.0f; src.z = -70.0f; Matrix_MultVec3fNoTranslate(gCalcMatrix, &src, &dest); - func_80078E50(actor->obj.pos.x + dest.x, actor->obj.pos.y + dest.y, actor->obj.pos.z + dest.z, 3.1f); + func_effect_80078E50(actor->obj.pos.x + dest.x, actor->obj.pos.y + dest.y, actor->obj.pos.z + dest.z, + 3.1f); } } } @@ -1673,7 +1670,7 @@ void func_i4_8019DD20(Actor* actor) { actor->obj.rot.z = -actor->unk_0F4.z; } -void func_i4_8019E234(Actor* actor) { +void SectorZ_8019E234(Actor* actor) { s32 i; actor->obj.rot.x += actor->unk_0F4.x; @@ -1685,21 +1682,21 @@ void func_i4_8019E234(Actor* actor) { actor->health -= actor->damage; AUDIO_PLAY_SFX(0x2903300EU, actor->sfxSource, 4U); if (actor->health <= 0) { - func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 5.0f, 10); - func_80066254(actor); + func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 5.0f, 10); + func_enmy_80066254(actor); BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 2); gHitCount += 3; - D_80177850 = 15; + D_ctx_80177850 = 15; for (i = 0; i < 6; i++) { - func_800794CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f); + func_effect_800794CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f); } Object_Kill(&actor->obj, actor->sfxSource); - func_8007A6F0(&actor->obj.pos, 0x1903400F); + func_effect_8007A6F0(&actor->obj.pos, 0x1903400F); } } } -void func_i4_8019E3A8(Actor* actor) { +void SectorZ_8019E3A8(Actor* actor) { gSPDisplayList(gMasterDisp++, D_SZ_6001A10); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); RCP_SetupDL(&gMasterDisp, 0x39); @@ -1712,7 +1709,7 @@ Vec3f D_i4_8019F64C[] = { { 612.0f, 409.0f, 386.0f }, { 1027.0f, 141.0f, 383.0f { 600.0f, 385.0f, 380.0f }, { 776.0f, 245.0f, 384.0f }, { 376.0f, 123.0f, 384.0f }, { 428.0f, 174.0f, 383.0f }, { 722.0f, 306.0f, 383.0f }, { 530.0f, 380.0f, 385.0f } }; -void func_i4_8019E454(Boss* boss) { +void SectorZ_8019E454(Boss* boss) { s32 i; s32 j; f32 x; @@ -1739,16 +1736,16 @@ void func_i4_8019E454(Boss* boss) { z = boss->obj.pos.z + 1000.0f; for (i = 0; i < 25; i++) { - func_800794CC(x + RAND_FLOAT_CENTERED(300.0f), y + RAND_FLOAT_CENTERED(100.0f), z, 2.0f); - func_80079618(x + RAND_FLOAT_CENTERED(300.0f), y + RAND_FLOAT_CENTERED(100.0f), z, 2.0f); + func_effect_800794CC(x + RAND_FLOAT_CENTERED(300.0f), y + RAND_FLOAT_CENTERED(100.0f), z, 2.0f); + func_effect_80079618(x + RAND_FLOAT_CENTERED(300.0f), y + RAND_FLOAT_CENTERED(100.0f), z, 2.0f); } - func_8007BFFC(x, y, z, 0.0f, 0.0f, 0.0f, 20.0f, 30); + func_effect_8007BFFC(x, y, z, 0.0f, 0.0f, 0.0f, 20.0f, 30); } if (boss->timer_052 != 0) { for (j = 0; j < 1; j++) { i = RAND_INT(11.99f); - func_i4_80199BDC(D_i4_8019F64C[i].x + boss->obj.pos.x, D_i4_8019F64C[i].y + boss->obj.pos.y, + SectorZ_80199BDC(D_i4_8019F64C[i].x + boss->obj.pos.x, D_i4_8019F64C[i].y + boss->obj.pos.y, D_i4_8019F64C[i].z + boss->obj.pos.z, RAND_FLOAT_CENTERED(5.0f), RAND_FLOAT_CENTERED(5.0f), 10.0f, RAND_FLOAT(2.0f) + 4.0f); } @@ -1776,61 +1773,61 @@ void func_i4_8019E454(Boss* boss) { Matrix_RotateX(gCalcMatrix, boss->obj.rot.x * M_DTOR, 1); Matrix_RotateZ(gCalcMatrix, boss->obj.rot.z * M_DTOR, 1); Matrix_MultVec3fNoTranslate(gCalcMatrix, &D_i4_8019F64C[RAND_INT(11.99f)], &dest); - func_8007C484(boss->obj.pos.x + dest.x, boss->obj.pos.y + dest.y, boss->obj.pos.z + dest.z, boss->vel.x, - boss->vel.y, boss->vel.z, RAND_FLOAT(0.1f) + 0.15f, 0); + func_effect_8007C484(boss->obj.pos.x + dest.x, boss->obj.pos.y + dest.y, boss->obj.pos.z + dest.z, boss->vel.x, + boss->vel.y, boss->vel.z, RAND_FLOAT(0.1f) + 0.15f, 0); if (((gGameFrameCount % 7) == 0) && (Rand_ZeroOne() < 0.5f)) { - func_i4_80199BDC(boss->obj.pos.x + dest.x, boss->obj.pos.y + dest.y, boss->obj.pos.z + dest.z, boss->vel.x, + SectorZ_80199BDC(boss->obj.pos.x + dest.x, boss->obj.pos.y + dest.y, boss->obj.pos.z + dest.z, boss->vel.x, boss->vel.y, boss->vel.z + 5.0f, RAND_FLOAT(2.0f) + 4.0f); } } } -void func_i4_8019E98C(Boss* boss) { +void SectorZ_8019E98C(Boss* boss) { gSPFogPosition(gMasterDisp++, gFogNear, 1005); - func_800515C4(); + func_demo_800515C4(); } -void func_i4_8019EA68(void) { +void SectorZ_8019EA68(void) { s32 i; s32 j; Actor* actor; Object_58* obj58; Boss* boss = &gBosses[0]; - D_80178310 = SEGMENTED_TO_VIRTUAL(D_800CFDA0[gCurrentLevel]); + D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_enmy_800CFDA0[gCurrentLevel]); Rand_SetSeed(1, 0x7148, 0x2694); for (obj58 = gObjects58, i = 0; i < 1000; i++) { - if (D_80178310[i].id < 0) { + if (D_ctx_80178310[i].id < 0) { break; } - if (D_80178310[i].id < 161) { + if (D_ctx_80178310[i].id < 161) { Object_58_Initialize(obj58); obj58->obj.status = OBJ_ACTIVE; - obj58->obj.id = D_80178310[i].id; - obj58->obj.pos.x = D_80178310[i].xPos; - obj58->obj.pos.y = D_80178310[i].yPos; - obj58->obj.pos.z = -D_80178310[i].zPos1; - obj58->obj.rot.y = D_80178310[i].rot.y; + obj58->obj.id = D_ctx_80178310[i].id; + obj58->obj.pos.x = D_ctx_80178310[i].xPos; + obj58->obj.pos.y = D_ctx_80178310[i].yPos; + obj58->obj.pos.z = -D_ctx_80178310[i].zPos1; + obj58->obj.rot.y = D_ctx_80178310[i].rot.y; Object_SetInfo(&obj58->info, obj58->obj.id); obj58++; } } for (j = 50, actor = &gActors[j], i = 0; i < 1000; i++) { - if (D_80178310[i].id < 0) { + if (D_ctx_80178310[i].id < 0) { break; } - if ((D_80178310[i].id >= 176) && (D_80178310[i].id < 292)) { + if ((D_ctx_80178310[i].id >= 176) && (D_ctx_80178310[i].id < 292)) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; - actor->obj.id = D_80178310[i].id; - actor->obj.pos.x = D_80178310[i].xPos; - actor->obj.pos.y = D_80178310[i].yPos; - actor->obj.pos.z = -D_80178310[i].zPos1; + actor->obj.id = D_ctx_80178310[i].id; + actor->obj.pos.x = D_ctx_80178310[i].xPos; + actor->obj.pos.y = D_ctx_80178310[i].yPos; + actor->obj.pos.z = -D_ctx_80178310[i].zPos1; actor->health = 24; actor->unk_0F4.x = RAND_FLOAT_CENTERED(4.0f); actor->unk_0F4.y = RAND_FLOAT_CENTERED(4.0f); diff --git a/src/overlays/ovl_i5/fox_ground.c b/src/overlays/ovl_i5/fox_ground.c index 54dd765f..21a01a23 100644 --- a/src/overlays/ovl_i5/fox_ground.c +++ b/src/overlays/ovl_i5/fox_ground.c @@ -1,9 +1,9 @@ #include "global.h" #include "assets/ast_titania.h" -void func_i5_801B5244(s32 arg0, s32 arg1); -void func_i5_801B5FE0(s32 arg0, s32 arg1, s32 arg2); -void func_i5_801B68A8(Gfx** dlist, s32 arg1, s32 arg2); +void Ground_801B5244(s32 arg0, s32 arg1); +void Ground_801B5FE0(s32 arg0, s32 arg1, s32 arg2); +void Ground_801B68A8(Gfx** dlist, s32 arg1, s32 arg2); typedef struct { /* 0x00 */ s32 unk_00; @@ -69,7 +69,7 @@ UnkStruct_801C62E8 D_i5_801C62E8[20]; Vec3fa D_i5_801C65B8[3][15][4]; s32 D_i5_801C6E28[4][3]; -bool func_i5_801B49D0(Actor* actor) { +bool Ground_801B49D0(Actor* actor) { s32 i; bool found = false; UnkStruct_801C62E8* var_v0 = D_i5_801C62E8; @@ -91,13 +91,13 @@ bool func_i5_801B49D0(Actor* actor) { return found; } -void func_i5_801B4A54(UnkStruct_801C62E8* arg0) { +void Ground_801B4A54(UnkStruct_801C62E8* arg0) { // Lots of conversions between floats, and ints unnecessarily here because of this chain assignment. arg0->unk_00 = arg0->unk_04 = arg0->unk_08 = arg0->unk_0C = arg0->unk_10 = arg0->unk_14 = arg0->unk_18 = arg0->unk_1C = arg0->unk_20 = 0; } -void func_i5_801B4AA8(s32* arg0, s32* arg1) { +void Ground_801B4AA8(s32* arg0, s32* arg1) { Actor actor; UnkStruct_801C62E8* var_s2 = D_i5_801C62E8; s32* var_s1; @@ -181,7 +181,7 @@ void func_i5_801B4AA8(s32* arg0, s32* arg1) { var_s2->unk_20 -= 220.0f; if (var_s2->unk_20 <= 0.0f) { - func_i5_801B4A54(var_s2); + Ground_801B4A54(var_s2); } break; @@ -203,7 +203,7 @@ void func_i5_801B4AA8(s32* arg0, s32* arg1) { var_s2->unk_20 += 220.0f; if (unk_18 <= var_s2->unk_20) { - func_i5_801B4A54(var_s2); + Ground_801B4A54(var_s2); } break; @@ -226,7 +226,7 @@ void func_i5_801B4AA8(s32* arg0, s32* arg1) { var_s2->unk_20 -= 220.0f; if (var_s2->unk_20 <= 0.0f) { - func_i5_801B4A54(var_s2); + Ground_801B4A54(var_s2); } break; @@ -240,12 +240,12 @@ void func_i5_801B4AA8(s32* arg0, s32* arg1) { actor.obj.rot.x = var_s2->unk_10 + RAND_FLOAT(var_s2->unk_10) * 0.25f; actor.obj.rot.z = 2.0f * actor.obj.rot.x; // Should this have been obj.rot.y? actor.obj.rot.z = var_s2->unk_14 + RAND_FLOAT(var_s2->unk_14) * 0.25f; - func_i5_801B49D0(&actor); + Ground_801B49D0(&actor); } var_s2->unk_20 -= 220.0f; if (var_s2->unk_20 <= 0.0f) { - func_i5_801B4A54(var_s2); + Ground_801B4A54(var_s2); } } else { var_s2->unk_1C--; @@ -253,14 +253,14 @@ void func_i5_801B4AA8(s32* arg0, s32* arg1) { break; default: - func_i5_801B4A54(var_s2); + Ground_801B4A54(var_s2); break; } } } } -void func_i5_801B5110(f32 arg0, f32 arg1, f32 arg2) { +void Ground_801B5110(f32 arg0, f32 arg1, f32 arg2) { UnkStruct_801C62E8* ptr; s32 i; s32 k; @@ -276,7 +276,7 @@ void func_i5_801B5110(f32 arg0, f32 arg1, f32 arg2) { D_i5_801C5C14 = 1; for (i = 0, ptr = D_i5_801C62E8; i < ARRAY_COUNT(D_i5_801C62E8); i++, ptr++) { - func_i5_801B4A54(ptr); + Ground_801B4A54(ptr); } for (i = 0; i < ARRAY_COUNT(D_i5_801C1D48); i++) { @@ -285,10 +285,10 @@ void func_i5_801B5110(f32 arg0, f32 arg1, f32 arg2) { } D_i5_801C2448[i] = D_i5_801C24B8[i] = 1.0f; } - func_i5_801B5244(D_i5_801C5C04, D_i5_801C5C08); + Ground_801B5244(D_i5_801C5C04, D_i5_801C5C08); } -void func_i5_801B5244(s32 arg0, s32 arg1) { +void Ground_801B5244(s32 arg0, s32 arg1) { s32 var_s5; s32 var_s6; s32 sp6C; @@ -352,10 +352,10 @@ void func_i5_801B5244(s32 arg0, s32 arg1) { sp5C = (sp5C + 1) % 28; sp60 = (sp60 + 1) % 27; } - func_i5_801B5FE0(arg1, arg0, 27); + Ground_801B5FE0(arg1, arg0, 27); } -void func_i5_801B58AC(Gfx** dList, f32 arg1) { +void Ground_801B58AC(Gfx** dList, f32 arg1) { s32 spC4; s32 temp_hi; s32 i; @@ -377,7 +377,7 @@ void func_i5_801B58AC(Gfx** dList, f32 arg1) { gSPMatrix((*dList)++, gGfxMtx++, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList((*dList)++, D_i5_801BA950); gSPPopMatrix((*dList)++, G_MTX_MODELVIEW); - func_i5_801B4AA8(NULL, &spC4); + Ground_801B4AA8(NULL, &spC4); } if (D_i5_801C5C14 & 1) { @@ -389,7 +389,7 @@ void func_i5_801B58AC(Gfx** dList, f32 arg1) { } D_i5_801C2448[temp_hi] = D_i5_801BE740; D_i5_801C24B8[temp_hi] = D_i5_801BE744; - func_i5_801B4AA8(D_i5_801C1D48[temp_hi], &spC4); + Ground_801B4AA8(D_i5_801C1D48[temp_hi], &spC4); for (i = 0; i < 16; i++) { temp_v0 = &D_i5_801BE748[D_i5_801C5C04][i][0]; temp_t1 = &D_i5_801BE748[D_i5_801C5C04][i][1]; @@ -417,10 +417,10 @@ void func_i5_801B58AC(Gfx** dList, f32 arg1) { Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, D_i5_801C24B8[D_i5_801C5C08] * -220.0f, 0); Matrix_ToMtx(&D_i5_801C5C18[D_i5_801C5C04]); } - func_i5_801B5FE0(D_i5_801C5C08, D_i5_801C5C04, 1); + Ground_801B5FE0(D_i5_801C5C08, D_i5_801C5C04, 1); } gSPMatrix((*dList)++, &gIdentityMtx, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - func_i5_801B68A8(dList, D_i5_801C5C04, 1); + Ground_801B68A8(dList, D_i5_801C5C04, 1); gSPPopMatrix((*dList)++, G_MTX_MODELVIEW); } @@ -440,7 +440,7 @@ void func_i5_801B58AC(Gfx** dList, f32 arg1) { D_i5_801C5C14 = spC4; } -void func_i5_801B5FE0(s32 arg0, s32 arg1, s32 arg2) { +void Ground_801B5FE0(s32 arg0, s32 arg1, s32 arg2) { f32 spF4; f32 spF0; f32 spEC; @@ -554,7 +554,7 @@ void func_i5_801B5FE0(s32 arg0, s32 arg1, s32 arg2) { } } -void func_i5_801B68A8(Gfx** dlist, s32 arg1, s32 arg2) { +void Ground_801B68A8(Gfx** dlist, s32 arg1, s32 arg2) { s32 var_a0; s32 var_a1; s32 var; @@ -574,12 +574,12 @@ void func_i5_801B68A8(Gfx** dlist, s32 arg1, s32 arg2) { } } -bool func_i5_801B6AEC(f32 arg0, f32 arg1, f32 arg2) { +bool Ground_801B6AEC(f32 arg0, f32 arg1, f32 arg2) { f32 sp2C; f32 sp28; f32 sp24; - func_i5_801B6E20(arg0, arg2, &sp2C, &sp28, &sp24); + Ground_801B6E20(arg0, arg2, &sp2C, &sp28, &sp24); if (arg1 < sp28) { return true; } else { @@ -587,7 +587,7 @@ bool func_i5_801B6AEC(f32 arg0, f32 arg1, f32 arg2) { } } -s32 func_i5_801B6B40(f32 arg0, f32 arg1, Vec3f* arg2, PlaneF* arg3) { +s32 Ground_801B6B40(f32 arg0, f32 arg1, Vec3f* arg2, PlaneF* arg3) { f32 x1; f32 y1; f32 z1; @@ -666,7 +666,7 @@ s32 func_i5_801B6B40(f32 arg0, f32 arg1, Vec3f* arg2, PlaneF* arg3) { return var_v1; } -s32 func_i5_801B6E20(f32 arg0, f32 arg1, f32* arg2, f32* arg3, f32* arg4) { +s32 Ground_801B6E20(f32 arg0, f32 arg1, f32* arg2, f32* arg3, f32* arg4) { s32 var_s1; s32 var_s6; s32 var_s7; @@ -712,7 +712,7 @@ s32 func_i5_801B6E20(f32 arg0, f32 arg1, f32* arg2, f32* arg3, f32* arg4) { spA4[3].z = var_s2[1][0].v.ob[2] + var_fs0; if (((spA4[0].x <= arg0) || (spA4[1].x <= arg0)) && ((arg0 <= spA4[2].x) || (arg0 <= spA4[3].x))) { - var_v1 = func_i5_801B6B40(arg0, temp_fs2, spA4, &sp84); + var_v1 = Ground_801B6B40(arg0, temp_fs2, spA4, &sp84); } } } @@ -759,12 +759,12 @@ s32 func_i5_801B6E20(f32 arg0, f32 arg1, f32* arg2, f32* arg3, f32* arg4) { return 1; } -void func_i5_801B7240(f32 arg0, f32 arg1, f32* arg2, f32* arg3, f32* arg4) { +void Ground_801B7240(f32 arg0, f32 arg1, f32* arg2, f32* arg3, f32* arg4) { s32 pad; f32 sp28; f32 sp24; - func_i5_801B6E20(arg0, arg1, &sp28, arg3, &sp24); + Ground_801B6E20(arg0, arg1, &sp28, arg3, &sp24); *arg2 = sp28 * M_RTOD; *arg4 = sp24 * M_RTOD; } diff --git a/src/overlays/ovl_i5/fox_i5.c b/src/overlays/ovl_i5/fox_i5.c index dc8eaaf4..7ae59549 100644 --- a/src/overlays/ovl_i5/fox_i5.c +++ b/src/overlays/ovl_i5/fox_i5.c @@ -3,6 +3,6 @@ UNK_TYPE D_i5_801BBEE0; s32 D_i5_801B7290 = 0; -void func_i5_80187520(u32 mode, void* ptr) { +void OvlI5_CallFunction(u32 mode, void* ptr) { PRINTF("i5 指定外！\n"); // i5 not specified! } diff --git a/src/overlays/ovl_i5/fox_ma.c b/src/overlays/ovl_i5/fox_ma.c index 07067963..a52a14a0 100644 --- a/src/overlays/ovl_i5/fox_ma.c +++ b/src/overlays/ovl_i5/fox_ma.c @@ -4,36 +4,32 @@ * Description: Level: Macbeth */ +#include "prevent_bss_reordering.h" #include "global.h" #include "assets/ast_macbeth.h" #include "assets/ast_landmaster.h" #include "assets/ast_enmy_planet.h" +// #include "prevent_bss_reordering2.h" +// #include "prevent_bss_reordering.h" -extern u8 D_Unk_800DB4B8[]; +void Macbeth_801AD624(f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, s16, s16, f32); +bool Macbeth_801A0308(Actor*, f32, f32, u8); +void Macbeth_801AF200(f32, f32, f32, f32, f32, f32); +void Macbeth_801A015C(Actor*); +void Macbeth_8019D048(Actor*); +void Macbeth_8019FC54(Actor*, s32*, s32*, s32, s32, f32, f32, s32*); +void Macbeth_8019D670(f32, f32, f32, f32, f32, f32, f32, s32, u8); +void Macbeth_8019D910(Actor*, s32*, s32*, s32, f32, f32, s32*, s32*); +bool Macbeth_801AC5AC(s32, Gfx**, Vec3f*, Vec3f*, void*); +void Macbeth_801A49B8(Actor*); +void Macbeth_801ADCEC(f32, f32, f32, f32, f32, f32); +void Macbeth_801AE610(f32, f32, f32, f32, f32, f32, s16); +void Macbeth_801AE800(f32, f32, f32, f32, f32, f32); +void Macbeth_801ACF6C(void); -void func_i5_80199A40(u8*, u8*, f32); -void func_i5_80199C20(u8*, s32, s32, s32, s32); -void func_i5_801AD624(f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, s16, s16, f32); -bool func_i5_801A0308(Actor*, f32, f32, u8); -void func_i5_801AF200(f32, f32, f32, f32, f32, f32); -void func_i5_801A015C(Actor*); -void func_i5_8019D048(Actor*); -void func_i5_8019FC54(Actor*, s32*, s32*, s32, s32, f32, f32, s32*); -void func_i5_8019D670(f32, f32, f32, f32, f32, f32, f32, s32, u8); -void func_i5_8019D910(Actor*, s32*, s32*, s32, f32, f32, s32*, s32*); -bool func_i5_801AC5AC(s32, Gfx**, Vec3f*, Vec3f*, void*); -void func_i5_801A49B8(Actor*); -void func_i5_801ADCEC(f32, f32, f32, f32, f32, f32); -void func_i5_801AE610(f32, f32, f32, f32, f32, f32, s16); -void func_i5_801AE800(f32, f32, f32, f32, f32, f32); -void func_i5_801ACF6C(void); +f32 D_MA_801BE250[40]; +s16 D_MA_801BE2F0[9]; -f32 D_i5_801BE240; -f32 D_i5_801BE244; -f32 D_i5_801BE248; -f32 D_i5_801BE24C; -f32 D_i5_801BE250[40]; -s16 D_i5_801BE2F0[9]; char D_i5_801BE308[8]; s16 D_i5_801BE310; u8 D_i5_801BE312; @@ -188,7 +184,7 @@ static u8 D_i5_801BA1D8 = 0; static f32 D_i5_801BA1DC = 0.0f; static f32 D_i5_801BA1E0 = 10000000.0f; static u8 D_i5_801BA1E4 = 0; -u8 D_i5_801BA1E8 = 0; +u8 D_MA_801BA1E8 = 0; static UnkStruct_D_i5_801BA1EC D_i5_801BA1EC[45] = { { -0.0f, 16, -2000.0f, -3500.0f, 0 }, { -3500.0f, 16, -2000.0f, -5500.0f, 0 }, @@ -234,21 +230,21 @@ static f32 D_i5_801BA638[5][10] = { static f32 D_i5_801BA700[] = { 610.0f, 0.0f }; // unused? -void func_i5_80199920(void) { +void Macbeth_80199920(void) { s16 i; D_i5_801BA1DC = -15.0f; - D_i5_801BE2F0[0] = 0; - D_i5_801BE2F0[1] = 999; - D_i5_801BE2F0[2] = 0; - D_i5_801BE2F0[3] = 999; - D_i5_801BE2F0[4] = -1; - D_i5_801BE2F0[5] = 0; + D_MA_801BE2F0[0] = 0; + D_MA_801BE2F0[1] = 999; + D_MA_801BE2F0[2] = 0; + D_MA_801BE2F0[3] = 999; + D_MA_801BE2F0[4] = -1; + D_MA_801BE2F0[5] = 0; D_i5_801BA1E4 = 0; - D_i5_801BE250[6] = 0.0f; - D_i5_801BE250[16] = 0.0f; - D_i5_801BE250[20] = 0.0f; - D_i5_801BA1E8 = 98; + D_MA_801BE250[6] = 0.0f; + D_MA_801BE250[16] = 0.0f; + D_MA_801BE250[20] = 0.0f; + D_MA_801BA1E8 = 98; D_i5_801BA1E0 = 1e7f; D_i5_801BE310 = 999; D_i5_801BE312 = 0; @@ -265,7 +261,7 @@ void func_i5_80199920(void) { } } -void func_i5_80199A40(u8* arg0, u8* arg1, f32 arg2) { +void Macbeth_80199A40(u8* arg0, u8* arg1, f32 arg2) { s32 pad; s32 i; s32 j; @@ -296,7 +292,7 @@ void func_i5_80199A40(u8* arg0, u8* arg1, f32 arg2) { Matrix_Pop(&gCalcMatrix); } -void func_i5_80199C20(u8* arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { +void Macbeth_80199C20(u8* arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { u8* temp_v1; s32 i; s32 j; @@ -318,7 +314,7 @@ void func_i5_80199C20(u8* arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { } } -void func_i5_80199D88(u16* arg0, s32 arg1, s32 arg2) { +void Macbeth_80199D88(u16* arg0, s32 arg1, s32 arg2) { u16* temp_t1; u16 a; s32 i; @@ -337,7 +333,7 @@ void func_i5_80199D88(u16* arg0, s32 arg1, s32 arg2) { } } -void func_i5_80199F8C(Actor* actor) { +void Macbeth_80199F8C(Actor* actor) { actor->state = 0; actor->iwork[1] = 0; actor->iwork[2] = 0; @@ -421,17 +417,17 @@ void func_i5_80199F8C(Actor* actor) { D_i5_801BA1E4++; } -void func_i5_8019A128(void) { - func_i5_80199C20(D_MA_6023228, 16, 16, 0, 8); - func_i5_80199A40(D_MA_6023388, D_Unk_800DB4B8, gGameFrameCount * -20.0f); +void Macbeth_8019A128(void) { + Macbeth_80199C20(D_MA_6023228, 16, 16, 0, 8); + Macbeth_80199A40(D_MA_6023388, D_Unk_800DB4B8, gGameFrameCount * -20.0f); } -void func_i5_8019A198(Actor* actor) { - if ((actor->iwork[5] >= D_i5_801BA1E4) || (actor->iwork[5] >= D_i5_801BE2F0[3])) { +void Macbeth_8019A198(Actor* actor) { + if ((actor->iwork[5] >= D_i5_801BA1E4) || (actor->iwork[5] >= D_MA_801BE2F0[3])) { Math_SmoothStepToF(&actor->vel.z, 0.0f, 0.02f, 10.0f, 0.01f); } else { actor->vel.z = D_i5_801BA1DC; - if ((actor->iwork[5] == D_i5_801BE2F0[3] - 1) || (actor->iwork[5] == D_i5_801BA1E4 - 1)) { + if ((actor->iwork[5] == D_MA_801BE2F0[3] - 1) || (actor->iwork[5] == D_i5_801BA1E4 - 1)) { if (D_i5_801BE310 != actor->iwork[5]) { if (actor->vel.z > -6.0f) { func_8001CFA8(-6.0f); @@ -453,26 +449,26 @@ void func_i5_8019A198(Actor* actor) { } } -void func_i5_8019A2F4(Actor* actor) { +void Macbeth_8019A2F4(Actor* actor) { f32 var_fa1 = 0.0f; f32 var_ft4 = 0.0f; u8 var_v0; s32 var_a0; - for (var_v0 = D_i5_801BE2F0[0]; D_i5_801BA1EC[var_v0].unk_00 != -1.0f; var_v0++) { + for (var_v0 = D_MA_801BE2F0[0]; D_i5_801BA1EC[var_v0].unk_00 != -1.0f; var_v0++) { if (D_i5_801BA1EC[var_v0].unk_00 < gPlayer[0].unk_138) { var_a0 = var_v0; if (var_v0 == 0) { var_a0 = 1; } - D_i5_801BE2F0[0] = var_a0; + D_MA_801BE2F0[0] = var_a0; if (D_i5_801BA1E4 != D_i5_801BA1EC[var_a0 - 1].unk_04) { AUDIO_PLAY_SFX(0x1940205E, actor->sfxSource, 0); } D_i5_801BA1E4 = D_i5_801BA1EC[var_a0 - 1].unk_04; var_fa1 = D_i5_801BA1EC[var_a0 - 1].unk_08; var_ft4 = D_i5_801BA1EC[var_a0 - 1].unk_0C; - D_i5_801BE2F0[4] = D_i5_801BA1EC[var_a0 - 1].unk_10; + D_MA_801BE2F0[4] = D_i5_801BA1EC[var_a0 - 1].unk_10; if (D_i5_801BA1EC[var_a0 - 1].unk_10 >= 300) { D_i5_801BE320[18] = (D_i5_801BA1EC[var_a0 - 1].unk_10 - 300); } else if (D_i5_801BA1EC[var_a0 - 1].unk_10 == 200) { @@ -486,7 +482,7 @@ void func_i5_8019A2F4(Actor* actor) { } else if (D_i5_801BA1EC[var_a0 - 1].unk_10 == 203) { D_i5_801BE320[26] = 1; } else if (D_i5_801BA1EC[var_a0 - 1].unk_10 >= 100) { - D_i5_801BA1E8 = D_i5_801BA1EC[var_a0 - 1].unk_10; + D_MA_801BA1E8 = D_i5_801BA1EC[var_a0 - 1].unk_10; } break; } @@ -522,7 +518,7 @@ void func_i5_8019A2F4(Actor* actor) { } } -void func_i5_8019A728(Actor* actor) { +void Macbeth_8019A728(Actor* actor) { f32 var_fv0; u32 var_v1; u8 var_v0; @@ -546,38 +542,38 @@ void func_i5_8019A728(Actor* actor) { } } -void func_i5_8019A830(Actor* actor) { +void Macbeth_8019A830(Actor* actor) { if ((gPlayer[0].unk_138 - actor->obj.pos.z) < -20000.0f) { Object_Kill(&actor->obj, actor->sfxSource); } } -void func_i5_8019A87C(Actor* actor) { +void Macbeth_8019A87C(Actor* actor) { if ((gPlayer[0].unk_138 - actor->obj.pos.z) < -2000.0f) { Object_Kill(&actor->obj, actor->sfxSource); } } -void func_i5_8019A8C8(Actor* actor, s16 arg1) { +void Macbeth_8019A8C8(Actor* actor, s16 arg1) { s32 i; - func_8007BFFC(actor->obj.pos.x + actor->fwork[25], actor->obj.pos.y + 290.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, - 22.0f, 5); + func_effect_8007BFFC(actor->obj.pos.x + actor->fwork[25], actor->obj.pos.y + 290.0f, actor->obj.pos.z, 0.0f, 0.0f, + 0.0f, 22.0f, 5); for (i = 0; i < 10; i++) { - func_i5_801AD624(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[21], + Macbeth_801AD624(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[21], actor->obj.pos.y + 280.0f + RAND_FLOAT_CENTERED(100.0f), actor->obj.pos.z - 420.0f + RAND_FLOAT(50.0f), RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT(7.0f) + 7.0f, RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), arg1, RAND_FLOAT(0.8f) + 0.3f); - func_i5_801AD624(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[25], + Macbeth_801AD624(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[25], actor->obj.pos.y + 280.0f + RAND_FLOAT_CENTERED(100.0f), actor->obj.pos.z + RAND_FLOAT(50.0f), RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT(7.0f) + 7.0f, RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), arg1, RAND_FLOAT(0.8f) + 0.3f); - func_i5_801AD624(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[23], + Macbeth_801AD624(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[23], actor->obj.pos.y + 280.0f + RAND_FLOAT_CENTERED(100.0f), actor->obj.pos.z + 420.0f + 100.0f + RAND_FLOAT(50.0f), RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT(7.0f) + 7.0f, RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), @@ -587,26 +583,26 @@ void func_i5_8019A8C8(Actor* actor, s16 arg1) { AUDIO_PLAY_SFX(0x2940C00A, actor->sfxSource, 4); } -void func_i5_8019AF34(Actor* actor) { +void Macbeth_8019AF34(Actor* actor) { s32 i; - func_8007BFFC(actor->obj.pos.x + actor->fwork[25], actor->obj.pos.y + 290.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, - 22.0f, 5); + func_effect_8007BFFC(actor->obj.pos.x + actor->fwork[25], actor->obj.pos.y + 290.0f, actor->obj.pos.z, 0.0f, 0.0f, + 0.0f, 22.0f, 5); for (i = 0; i < 10; i++) { - func_i5_801AD624(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[21], + Macbeth_801AD624(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[21], actor->obj.pos.y + 280.0f + RAND_FLOAT_CENTERED(100.0f), actor->obj.pos.z - 420.0f + RAND_FLOAT(50.0f), RAND_FLOAT_CENTERED(50.0f), RAND_FLOAT(30.0f) + 7.0f, RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), 1, RAND_FLOAT(0.8f) + 0.3f); - func_i5_801AD624(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[25], + Macbeth_801AD624(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[25], actor->obj.pos.y + 280.0f + RAND_FLOAT_CENTERED(100.0f), actor->obj.pos.z + RAND_FLOAT(50.0f), RAND_FLOAT_CENTERED(45.0f), RAND_FLOAT(25.0f) + 7.0f, RAND_FLOAT_CENTERED(20.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), 1, 2.0f * (RAND_FLOAT(0.8f) + 0.3f)); - func_i5_801AD624(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[23], + Macbeth_801AD624(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[23], actor->obj.pos.y + 280.0f + RAND_FLOAT_CENTERED(100.0f), actor->obj.pos.z + 420.0f + 100.0f + RAND_FLOAT(50.0f), RAND_FLOAT_CENTERED(40.0f), RAND_FLOAT(35.0f) + 7.0f, RAND_FLOAT_CENTERED(20.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), @@ -616,108 +612,108 @@ void func_i5_8019AF34(Actor* actor) { AUDIO_PLAY_SFX(0x2940C00A, actor->sfxSource, 4); } -void func_i5_8019B580(Actor* actor, s32* arg1) { +void Macbeth_8019B580(Actor* actor, s32* arg1) { if (*arg1 < 11) { if ((gGameFrameCount & 0x1F) == 0) { - func_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[21], - actor->obj.pos.y + 280.0f + RAND_FLOAT_CENTERED(100.0f), - actor->obj.pos.z - 420.0f + RAND_FLOAT(50.0f), 10.0f); + func_effect_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[21], + actor->obj.pos.y + 280.0f + RAND_FLOAT_CENTERED(100.0f), + actor->obj.pos.z - 420.0f + RAND_FLOAT(50.0f), 10.0f); } else if ((gGameFrameCount & 0x1F) == 8) { - func_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[25], - actor->obj.pos.y + 280.0f + RAND_FLOAT_CENTERED(100.0f), actor->obj.pos.z + RAND_FLOAT(50.0f), - 10.0f); + func_effect_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[25], + actor->obj.pos.y + 280.0f + RAND_FLOAT_CENTERED(100.0f), + actor->obj.pos.z + RAND_FLOAT(50.0f), 10.0f); } else if ((gGameFrameCount & 0x1F) == 16) { - func_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[23], - actor->obj.pos.y + 280.0f + RAND_FLOAT_CENTERED(100.0f), - (actor->obj.pos.z + 320.0f) + RAND_FLOAT(50.0f), 10.0f); + func_effect_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[23], + actor->obj.pos.y + 280.0f + RAND_FLOAT_CENTERED(100.0f), + (actor->obj.pos.z + 320.0f) + RAND_FLOAT(50.0f), 10.0f); } else if ((gGameFrameCount & 0x1F) == 24) { - func_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[25], - actor->obj.pos.y + 280.0f + RAND_FLOAT_CENTERED(100.0f), actor->obj.pos.z + RAND_FLOAT(50.0f), - 10.0f); + func_effect_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[25], + actor->obj.pos.y + 280.0f + RAND_FLOAT_CENTERED(100.0f), + actor->obj.pos.z + RAND_FLOAT(50.0f), 10.0f); } if (((gGameFrameCount & 3) & 0xFFFF) == 0) { - func_8007C120(actor->obj.pos.x + actor->fwork[25], actor->obj.pos.y + 350.0f, actor->obj.pos.z, - actor->vel.x, actor->vel.y, actor->vel.z, 0.2f, 10); + func_effect_8007C120(actor->obj.pos.x + actor->fwork[25], actor->obj.pos.y + 350.0f, actor->obj.pos.z, + actor->vel.x, actor->vel.y, actor->vel.z, 0.2f, 10); } } } -void func_i5_8019B8B0(Actor* actor) { +void Macbeth_8019B8B0(Actor* actor) { if ((gGameFrameCount & 3) == 0) { - func_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[21], - actor->obj.pos.y + 280.0f + RAND_FLOAT_CENTERED(100.0f), - actor->obj.pos.z - 420.0f + RAND_FLOAT(50.0f), 20.0f); + func_effect_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[21], + actor->obj.pos.y + 280.0f + RAND_FLOAT_CENTERED(100.0f), + actor->obj.pos.z - 420.0f + RAND_FLOAT(50.0f), 20.0f); } else if ((gGameFrameCount & 3) == 1) { - func_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[25], - actor->obj.pos.y + 280.0f + RAND_FLOAT_CENTERED(100.0f), RAND_FLOAT(50.0f) + actor->obj.pos.z, - 20.0f); + func_effect_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[25], + actor->obj.pos.y + 280.0f + RAND_FLOAT_CENTERED(100.0f), + RAND_FLOAT(50.0f) + actor->obj.pos.z, 20.0f); } else if ((gGameFrameCount & 3) == 2) { - func_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[23], - actor->obj.pos.y + 280.0f + RAND_FLOAT_CENTERED(100.0f), - RAND_FLOAT(50.0f) + (actor->obj.pos.z + 420.0f), 20.0f); + func_effect_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[23], + actor->obj.pos.y + 280.0f + RAND_FLOAT_CENTERED(100.0f), + RAND_FLOAT(50.0f) + (actor->obj.pos.z + 420.0f), 20.0f); } else if ((gGameFrameCount & 3) == 3) { - func_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[25], - actor->obj.pos.y + 280.0f + RAND_FLOAT_CENTERED(100.0f), RAND_FLOAT(50.0f) + actor->obj.pos.z, - 20.0f); + func_effect_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[25], + actor->obj.pos.y + 280.0f + RAND_FLOAT_CENTERED(100.0f), + RAND_FLOAT(50.0f) + actor->obj.pos.z, 20.0f); } if ((gGameFrameCount & 3) == 0) { - func_8007C120(actor->obj.pos.x + actor->fwork[25], actor->obj.pos.y + 350.0f, actor->obj.pos.z, actor->vel.x, - actor->vel.y, actor->vel.z, 0.2f, 20); + func_effect_8007C120(actor->obj.pos.x + actor->fwork[25], actor->obj.pos.y + 350.0f, actor->obj.pos.z, + actor->vel.x, actor->vel.y, actor->vel.z, 0.2f, 20); } } -void func_i5_8019BBEC(Actor* actor) { +void Macbeth_8019BBEC(Actor* actor) { if ((actor->timer_0BC & 0xF) == 0) { - func_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[21], - RAND_FLOAT_CENTERED(100.0f) + (actor->obj.pos.y + 100.0f), - RAND_FLOAT(50.0f) + (actor->obj.pos.z - 400.0f), 3.0f); + func_effect_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[21], + RAND_FLOAT_CENTERED(100.0f) + (actor->obj.pos.y + 100.0f), + RAND_FLOAT(50.0f) + (actor->obj.pos.z - 400.0f), 3.0f); } else if ((actor->timer_0BC & 0xF) == 4) { - func_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[25], - RAND_FLOAT_CENTERED(100.0f) + (actor->obj.pos.y + 100.0f), RAND_FLOAT(50.0f) + actor->obj.pos.z, - 3.0f); + func_effect_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[25], + RAND_FLOAT_CENTERED(100.0f) + (actor->obj.pos.y + 100.0f), + RAND_FLOAT(50.0f) + actor->obj.pos.z, 3.0f); } else if ((actor->timer_0BC & 0xF) == 8) { - func_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[23], - RAND_FLOAT_CENTERED(100.0f) + (actor->obj.pos.y + 100.0f), - RAND_FLOAT(50.0f) + (actor->obj.pos.z + 450.0f), 3.0f); + func_effect_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[23], + RAND_FLOAT_CENTERED(100.0f) + (actor->obj.pos.y + 100.0f), + RAND_FLOAT(50.0f) + (actor->obj.pos.z + 450.0f), 3.0f); } else if ((actor->timer_0BC & 0xF) == 12) { - func_8007C120(actor->obj.pos.x + actor->fwork[25], actor->obj.pos.y + 100.0f, actor->obj.pos.z, actor->vel.x, - actor->vel.y, actor->vel.z, 0.15f, 10); + func_effect_8007C120(actor->obj.pos.x + actor->fwork[25], actor->obj.pos.y + 100.0f, actor->obj.pos.z, + actor->vel.x, actor->vel.y, actor->vel.z, 0.15f, 10); } } -void func_i5_8019BE50(Actor* actor) { +void Macbeth_8019BE50(Actor* actor) { s16 i; - func_8007BFFC(actor->obj.pos.x + actor->fwork[25], actor->obj.pos.y + 90.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, - 10.0f, 5); - func_8007BFFC(actor->obj.pos.x + actor->fwork[23], actor->obj.pos.y + 90.0f, actor->obj.pos.z + 420.0f + 300.0f, - 0.0f, 0.0f, 0.0f, 10.0f, 5); + func_effect_8007BFFC(actor->obj.pos.x + actor->fwork[25], actor->obj.pos.y + 90.0f, actor->obj.pos.z, 0.0f, 0.0f, + 0.0f, 10.0f, 5); + func_effect_8007BFFC(actor->obj.pos.x + actor->fwork[23], actor->obj.pos.y + 90.0f, + actor->obj.pos.z + 420.0f + 300.0f, 0.0f, 0.0f, 0.0f, 10.0f, 5); for (i = 0; i < 10; i++) { - func_i5_801AD624(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[21], + Macbeth_801AD624(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[21], actor->obj.pos.y + 80.0f + RAND_FLOAT_CENTERED(100.0f), actor->obj.pos.z - 420.0f + RAND_FLOAT(50.0f), RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT(7.0f) + 7.0f, RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), 0, RAND_FLOAT(0.8f) + 0.3f); - func_i5_801AD624(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[25], + Macbeth_801AD624(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[25], actor->obj.pos.y + 80.0f + RAND_FLOAT_CENTERED(100.0f), actor->obj.pos.z + RAND_FLOAT(50.0f), RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT(10.0f) + 7.0f, RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), 0, (RAND_FLOAT(0.8f) + 0.3f)); - func_i5_801AD624(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[23], + Macbeth_801AD624(actor->obj.pos.x + RAND_FLOAT_CENTERED(200.0f) + actor->fwork[23], actor->obj.pos.y + 80.0f + RAND_FLOAT_CENTERED(100.0f), actor->obj.pos.z + 420.0f + 100.0f + RAND_FLOAT(50.0f), RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT(7.0f) + 7.0f, RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), 0, RAND_FLOAT(0.8f) + 0.3f); } - func_8007A6F0(&actor->obj.pos, 0x2940C00A); + func_effect_8007A6F0(&actor->obj.pos, 0x2940C00A); gHitCount++; } -bool func_i5_8019C4EC(Actor* actor) { +bool Macbeth_8019C4EC(Actor* actor) { if (actor->unk_0D0 != 0) { actor->unk_0D0 = 0; if (actor->unk_0D2 == 1) { @@ -735,10 +731,10 @@ bool func_i5_8019C4EC(Actor* actor) { return false; } -void func_i5_8019C5B8(Actor* actor) { +void Macbeth_8019C5B8(Actor* actor) { f32 var_ft4; - func_i5_801A0308(actor, actor->obj.pos.z + 520.0f, actor->obj.rot.y, 0); + Macbeth_801A0308(actor, actor->obj.pos.z + 520.0f, actor->obj.rot.y, 0); var_ft4 = RAND_FLOAT_CENTERED(12.0f); if ((var_ft4 > -2.0f) && (var_ft4 < 2.0f)) { if (var_ft4 >= 0.0f) { @@ -747,10 +743,10 @@ void func_i5_8019C5B8(Actor* actor) { var_ft4 = -2.5f; } } - func_i5_801AF200(actor->fwork[19], actor->obj.pos.y + 300.0f, actor->obj.pos.z + 520.0f, var_ft4, 10.0f, 0.0f); + Macbeth_801AF200(actor->fwork[19], actor->obj.pos.y + 300.0f, actor->obj.pos.z + 520.0f, var_ft4, 10.0f, 0.0f); } -void func_i5_8019C6C4(Actor* actor) { +void Macbeth_8019C6C4(Actor* actor) { s32 var_a3; if (gBossFrameCount < 3840) { @@ -770,20 +766,20 @@ void func_i5_8019C6C4(Actor* actor) { BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, var_a3); } gHitCount += var_a3 + 1; - D_80177850 = 15; + D_ctx_80177850 = 15; } -void func_i5_8019C778(Actor* actor) { +void Macbeth_8019C778(Actor* actor) { if (actor->vel.z < -3.0f) { - func_i5_8019A128(); + Macbeth_8019A128(); } D_i5_801BE368[4] = actor->vwork[0].x + actor->obj.pos.x; D_i5_801BE368[5] = actor->vwork[0].y + actor->obj.pos.y; D_i5_801BE368[6] = actor->vwork[0].z + actor->obj.pos.z; - func_i5_8019A2F4(actor); - func_i5_8019A198(actor); - func_i5_801A015C(actor); - func_i5_8019A830(actor); + Macbeth_8019A2F4(actor); + Macbeth_8019A198(actor); + Macbeth_801A015C(actor); + Macbeth_8019A830(actor); switch (actor->state) { s32 unused; case 0: @@ -804,10 +800,10 @@ void func_i5_8019C778(Actor* actor) { if (actor->timer_0BC <= 0) { Math_SmoothStepToF(&actor->fwork[2], -60.0f, 0.4f, 10.0f, 0.01f); if (actor->timer_0BE == 30) { - func_i5_8019C5B8(actor); + Macbeth_8019C5B8(actor); Radio_PlayMessage(gMsg_ID_17470, RCID_BOSS_MACBETH); } - if ((actor->fwork[2] < -58.0f) && ((func_i5_8019C4EC(actor) != 0) || (actor->timer_0BE <= 0))) { + if ((actor->fwork[2] < -58.0f) && ((Macbeth_8019C4EC(actor) != 0) || (actor->timer_0BE <= 0))) { actor->timer_0BC = 200; D_i5_801BE320[19] = 0; actor->state++; @@ -825,7 +821,7 @@ void func_i5_8019C778(Actor* actor) { break; case 3: Math_SmoothStepToF(&actor->fwork[2], -60.0f, 0.4f, 10.0f, 0.01f); - if ((actor->fwork[2] < -58.0f) && (func_i5_8019C4EC(actor) != 0)) { + if ((actor->fwork[2] < -58.0f) && (Macbeth_8019C4EC(actor) != 0)) { actor->timer_0BC = 150; actor->state--; D_i5_801BE320[30]++; @@ -846,39 +842,39 @@ void func_i5_8019C778(Actor* actor) { AUDIO_PLAY_SFX(0x1900000E, actor->sfxSource, 4); } if (actor->timer_0BC == 30) { - func_i5_8019C5B8(actor); + Macbeth_8019C5B8(actor); } break; case 4: - func_i5_8019AF34(actor); + Macbeth_8019AF34(actor); actor->health = 0; actor->timer_0BC = 200; - D_80178480 = 30; + D_ctx_80178480 = 30; actor->state++; break; case 5: if (actor->timer_0BC == 198) { - D_80178348 = D_80178350 = D_80178354 = D_80178340 = 255; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = D_ctx_80178340 = 255; } else if (actor->timer_0BC == 197) { - D_80178348 = D_80178350 = D_80178354 = D_80178340 = 0; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = D_ctx_80178340 = 0; } if (((actor->timer_0BC < 150) || (actor->timer_0BC > 170)) && (actor->timer_0BC > 80)) { - func_i5_8019B8B0(actor); + Macbeth_8019B8B0(actor); } if (actor->timer_0BC == 160) { gShowBossHealth = 0; Radio_PlayMessage(gMsg_ID_17440, RCID_BOSS_MACBETH); - func_8007A568(actor->obj.pos.x + actor->fwork[25], actor->obj.pos.y, actor->obj.pos.z, 40.0f); - func_i5_8019C6C4(actor); + func_effect_8007A568(actor->obj.pos.x + actor->fwork[25], actor->obj.pos.y, actor->obj.pos.z, 40.0f); + Macbeth_8019C6C4(actor); actor->vel.z = 0.0f; - D_80178480 = 25; + D_ctx_80178480 = 25; } if (actor->timer_0BC == 100) { Object_Kill(&actor->obj, actor->sfxSource); if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) { gPlayer[0].state_1C8 = PLAYERSTATE_1C8_7; gPlayer[0].unk_1D0 = 0; - D_80177930 = 0; + D_ctx_80177930 = 0; } actor->state++; Audio_KillSfxBySourceAndId(gPlayer[0].sfxSource, 0x1100000A); @@ -920,44 +916,44 @@ void func_i5_8019C778(Actor* actor) { } } -void func_i5_8019CE88(Actor* actor) { +void Macbeth_8019CE88(Actor* actor) { switch (actor->state) { case 0: - func_i5_8019A198(actor); - func_i5_801A015C(actor); - func_i5_8019FC54(actor, &actor->iwork[10], &actor->iwork[11], 1, 1, actor->fwork[25], 0.0f, + Macbeth_8019A198(actor); + Macbeth_801A015C(actor); + Macbeth_8019FC54(actor, &actor->iwork[10], &actor->iwork[11], 1, 1, actor->fwork[25], 0.0f, &actor->iwork[13]); - func_i5_8019A728(actor); + Macbeth_8019A728(actor); if (actor->iwork[1] != 0) { - func_i5_8019D048(actor); + Macbeth_8019D048(actor); } - func_i5_8019A830(actor); + Macbeth_8019A830(actor); break; case 1: - if (actor->iwork[5] < D_i5_801BE2F0[3]) { - D_i5_801BE2F0[3] = actor->iwork[5]; + if (actor->iwork[5] < D_MA_801BE2F0[3]) { + D_MA_801BE2F0[3] = actor->iwork[5]; } actor->state = 2; - func_i5_801A015C(actor); - func_i5_8019A830(actor); + Macbeth_801A015C(actor); + Macbeth_8019A830(actor); break; case 2: - func_i5_8019BBEC(actor); + Macbeth_8019BBEC(actor); if (actor->timer_0BC == 0) { actor->timer_0BC = 60; } Math_SmoothStepToF(&actor->vel.z, 0.0f, 0.02f, 10.0f, 0.01f); - func_i5_801A015C(actor); - func_i5_8019A87C(actor); + Macbeth_801A015C(actor); + Macbeth_8019A87C(actor); if (actor->unk_0D0 != 0) { actor->unk_0D0 = 0; actor->timer_0BC = 20; - func_i5_8019BE50(actor); + Macbeth_8019BE50(actor); actor->state = 3; } break; case 3: - func_i5_801A015C(actor); + Macbeth_801A015C(actor); Math_SmoothStepToF(&actor->scale, 0.0f, 0.02f, 10.0f, 0.01f); if (actor->timer_0BC <= 0) { Object_Kill(&actor->obj, actor->sfxSource); @@ -966,7 +962,7 @@ void func_i5_8019CE88(Actor* actor) { } } -void func_i5_8019D048(Actor* actor) { +void Macbeth_8019D048(Actor* actor) { switch (actor->iwork[3]) { case 0: if (D_i5_801BE320[28] != 0) { @@ -988,19 +984,19 @@ void func_i5_8019D048(Actor* actor) { case 1: Math_SmoothStepToF(&actor->fwork[4], actor->iwork[4] * -60.0f, 0.5f, 2.0f, 1.0f); if ((actor->fwork[4] < -30.0f) || (actor->fwork[4] > 30.0f)) { - func_i5_8019D670(actor->obj.pos.x + actor->fwork[25] + actor->iwork[4] * 73.0f, + Macbeth_8019D670(actor->obj.pos.x + actor->fwork[25] + actor->iwork[4] * 73.0f, actor->obj.pos.y + actor->fwork[8] + 330.0f, actor->obj.pos.z, actor->iwork[4] * 70.0f, actor->vel.z, actor->iwork[4] * -34.0f, 0.0f, 2, 5); - func_i5_8019D670(actor->obj.pos.x + actor->fwork[25] + actor->iwork[4] * 74.0f, + Macbeth_8019D670(actor->obj.pos.x + actor->fwork[25] + actor->iwork[4] * 74.0f, actor->obj.pos.y + actor->fwork[8] + 330.0f, actor->obj.pos.z - 350.0f, actor->iwork[4] * 38.0f, actor->vel.z, actor->iwork[4] * -34.0f, 0.0f, 4, 6); - func_i5_8019D670(actor->obj.pos.x + actor->fwork[25] + actor->iwork[4] * 74.0f, + Macbeth_8019D670(actor->obj.pos.x + actor->fwork[25] + actor->iwork[4] * 74.0f, actor->obj.pos.y + actor->fwork[8] + 330.0f, actor->obj.pos.z + 350.0f, actor->iwork[4] * 40.0f, actor->vel.z, actor->iwork[4] * -35.0f, 0.0f, 0, 7); - func_i5_8019D670(actor->obj.pos.x + actor->fwork[25] + actor->iwork[4] * 35.0f, + Macbeth_8019D670(actor->obj.pos.x + actor->fwork[25] + actor->iwork[4] * 35.0f, actor->obj.pos.y + actor->fwork[8] + 290.0f, actor->obj.pos.z - 175.0f, actor->iwork[4] * 20.0f, actor->vel.z, actor->iwork[4] * -35.0f, 0.0f, 12, 4); - func_i5_8019D670(actor->obj.pos.x + actor->fwork[25] + actor->iwork[4] * 35.0f, + Macbeth_8019D670(actor->obj.pos.x + actor->fwork[25] + actor->iwork[4] * 35.0f, actor->obj.pos.y + actor->fwork[8] + 290.0f, actor->obj.pos.z + 175.0f, actor->iwork[4] * 35.0f, actor->vel.z, actor->iwork[4] * -35.0f, 0.0f, 14, 5); actor->iwork[3]++; @@ -1028,7 +1024,7 @@ void func_i5_8019D048(Actor* actor) { } } -void func_i5_8019D5C8(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 arg4, f32 zVel, f32 zRot, f32 yRot, s32 arg8, +void Macbeth_8019D5C8(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 arg4, f32 zVel, f32 zRot, f32 yRot, s32 arg8, u8 arg9) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; @@ -1046,55 +1042,55 @@ void func_i5_8019D5C8(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 arg4, f32 Object_SetInfo(&actor->info, actor->obj.id); } -void func_i5_8019D670(f32 xPos, f32 yPos, f32 zPos, f32 arg3, f32 zVel, f32 zRot, f32 yRot, s32 arg7, u8 arg8) { +void Macbeth_8019D670(f32 xPos, f32 yPos, f32 zPos, f32 arg3, f32 zVel, f32 zRot, f32 yRot, s32 arg7, u8 arg8) { s32 i; for (i = 0; i < ARRAY_COUNT(gActors); i++) { if (gActors[i].obj.status == OBJ_FREE) { - func_i5_8019D5C8(&gActors[i], xPos, yPos, zPos, arg3, zVel, zRot, yRot, arg7, arg8); + Macbeth_8019D5C8(&gActors[i], xPos, yPos, zPos, arg3, zVel, zRot, yRot, arg7, arg8); break; } } } -void func_i5_8019D700(Actor* actor) { +void Macbeth_8019D700(Actor* actor) { switch (actor->state) { case 0: - func_i5_8019A198(actor); - func_i5_801A015C(actor); - func_i5_8019D910(actor, &actor->iwork[10], &actor->iwork[11], 1, actor->fwork[21], -420.0f, + Macbeth_8019A198(actor); + Macbeth_801A015C(actor); + Macbeth_8019D910(actor, &actor->iwork[10], &actor->iwork[11], 1, actor->fwork[21], -420.0f, &actor->iwork[12], &actor->iwork[13]); - func_i5_8019D910(actor, &actor->iwork[14], &actor->iwork[15], 2, actor->fwork[25], 0.0f, &actor->iwork[16], + Macbeth_8019D910(actor, &actor->iwork[14], &actor->iwork[15], 2, actor->fwork[25], 0.0f, &actor->iwork[16], &actor->iwork[17]); - func_i5_8019D910(actor, &actor->iwork[18], &actor->iwork[19], 3, actor->fwork[23], 420.0f, + Macbeth_8019D910(actor, &actor->iwork[18], &actor->iwork[19], 3, actor->fwork[23], 420.0f, &actor->iwork[20], &actor->iwork[21]); - func_i5_8019A830(actor); + Macbeth_8019A830(actor); break; case 1: - if (actor->iwork[5] < D_i5_801BE2F0[3]) { - D_i5_801BE2F0[3] = actor->iwork[5]; + if (actor->iwork[5] < D_MA_801BE2F0[3]) { + D_MA_801BE2F0[3] = actor->iwork[5]; } actor->state = 2; - func_i5_801A015C(actor); - func_i5_8019A830(actor); + Macbeth_801A015C(actor); + Macbeth_8019A830(actor); break; case 2: - func_i5_8019BBEC(actor); + Macbeth_8019BBEC(actor); if (actor->timer_0BC == 0) { actor->timer_0BC = 60; } Math_SmoothStepToF(&actor->vel.z, 0.0f, 0.02f, 10.0f, 0); - func_i5_801A015C(actor); - func_i5_8019A830(actor); + Macbeth_801A015C(actor); + Macbeth_8019A830(actor); if (actor->unk_0D0 != 0) { actor->unk_0D0 = 0; actor->timer_0BC = 20; - func_i5_8019BE50(actor); + Macbeth_8019BE50(actor); actor->state = 3; } break; case 3: - func_i5_801A015C(actor); + Macbeth_801A015C(actor); Math_SmoothStepToF(&actor->scale, 0.0f, 0.02f, 10.0f, 0.01f); if (actor->timer_0BC <= 0) { Object_Kill(&actor->obj, actor->sfxSource); @@ -1103,24 +1099,24 @@ void func_i5_8019D700(Actor* actor) { } } -void func_i5_8019D910(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f32 arg5, s32* arg6, s32* arg7) { +void Macbeth_8019D910(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f32 arg5, s32* arg6, s32* arg7) { s32 var_v0; u8 i; switch (*arg1) { case 0: if (((actor->unk_0D0 != 0) && (arg3 == actor->unk_0D2)) || - ((D_i5_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_i5_801BE2F0[3])) || - (((D_i5_801BE2F0[1] + 1) == actor->iwork[5]) && (D_i5_801BE2F0[3] < actor->iwork[5]))) { + ((D_MA_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_MA_801BE2F0[3])) || + (((D_MA_801BE2F0[1] + 1) == actor->iwork[5]) && (D_MA_801BE2F0[3] < actor->iwork[5]))) { AUDIO_PLAY_SFX(0x29034003, actor->sfxSource, 4); actor->unk_0D0 = 0; - func_8007C120(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5, actor->vel.x, - actor->vel.y, actor->vel.z, 0.15f, 20); + func_effect_8007C120(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5, + actor->vel.x, actor->vel.y, actor->vel.z, 0.15f, 20); actor->iwork[arg3 + 6] = 15; *arg2 -= actor->damage; if ((*arg2 <= 0) || - ((D_i5_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_i5_801BE2F0[3])) || - (((D_i5_801BE2F0[1] + 1) == actor->iwork[5]) && (D_i5_801BE2F0[3] < actor->iwork[5]))) { + ((D_MA_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_MA_801BE2F0[3])) || + (((D_MA_801BE2F0[1] + 1) == actor->iwork[5]) && (D_MA_801BE2F0[3] < actor->iwork[5]))) { (*arg1)++; } } else if ((actor->unk_0D0 != 0) && (actor->unk_0D2 == 0)) { @@ -1129,11 +1125,11 @@ void func_i5_8019D910(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3 } break; case 1: - func_8007BFFC(actor->obj.pos.x + arg4, actor->obj.pos.y + 250.0f, actor->obj.pos.z + arg5, 0.0f, 0.0f, 0.0f, - 10.0f, 5); + func_effect_8007BFFC(actor->obj.pos.x + arg4, actor->obj.pos.y + 250.0f, actor->obj.pos.z + arg5, 0.0f, + 0.0f, 0.0f, 10.0f, 5); for (i = 0; i < 10; i++) { - func_i5_801AD624( + Macbeth_801AD624( actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5 + RAND_FLOAT(80.0f), RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT(7.0f) + 7.0f, RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), @@ -1147,18 +1143,18 @@ void func_i5_8019D910(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3 break; case 2: if (((actor->unk_0D0 != 0) && (arg3 == actor->unk_0D2)) || - ((D_i5_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_i5_801BE2F0[3])) || - (((D_i5_801BE2F0[1] + 1) == actor->iwork[5]) && (D_i5_801BE2F0[3] < actor->iwork[5])) || + ((D_MA_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_MA_801BE2F0[3])) || + (((D_MA_801BE2F0[1] + 1) == actor->iwork[5]) && (D_MA_801BE2F0[3] < actor->iwork[5])) || ((actor->obj.id == OBJ_ACTOR_209) && (arg3 == 2))) { AUDIO_PLAY_SFX(0x29034003, actor->sfxSource, 4); actor->unk_0D0 = 0; - func_8007C120(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5, actor->vel.x, - actor->vel.y, actor->vel.z, 0.15f, 0x14); + func_effect_8007C120(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5, + actor->vel.x, actor->vel.y, actor->vel.z, 0.15f, 0x14); actor->iwork[arg3 + 6] = 20; *arg2 -= actor->damage; if ((*arg2 <= 0) || - ((D_i5_801BE2F0[1] - 1 == (actor->iwork[5])) && (actor->iwork[5] < D_i5_801BE2F0[3])) || - (((D_i5_801BE2F0[1] + 1) == actor->iwork[5]) && (D_i5_801BE2F0[3] < actor->iwork[5])) || + ((D_MA_801BE2F0[1] - 1 == (actor->iwork[5])) && (actor->iwork[5] < D_MA_801BE2F0[3])) || + (((D_MA_801BE2F0[1] + 1) == actor->iwork[5]) && (D_MA_801BE2F0[3] < actor->iwork[5])) || ((actor->obj.id == OBJ_ACTOR_209) && (arg3 == 2))) { gHitCount++; (*arg1)++; @@ -1169,11 +1165,11 @@ void func_i5_8019D910(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3 } break; case 3: - func_8007BFFC(actor->obj.pos.x + arg4, actor->obj.pos.y + 250.0f, actor->obj.pos.z + arg5, 0.0f, 0.0f, 0.0f, - 10.0f, 5); + func_effect_8007BFFC(actor->obj.pos.x + arg4, actor->obj.pos.y + 250.0f, actor->obj.pos.z + arg5, 0.0f, + 0.0f, 0.0f, 10.0f, 5); if ((actor->obj.id != OBJ_ACTOR_209) || (arg3 != 2)) { for (i = 0; i < 15; i++) { - func_i5_801AD624(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, + Macbeth_801AD624(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5 + RAND_FLOAT(20.0f), RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT(7.0f) + 7.0f, RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(30.0f), @@ -1223,44 +1219,44 @@ void func_i5_8019D910(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3 } } -void func_i5_8019E410(Actor* actor) { +void Macbeth_8019E410(Actor* actor) { switch (actor->state) { case 0: - func_i5_8019A198(actor); - func_i5_801A015C(actor); - func_i5_8019D910(actor, &actor->iwork[10], &actor->iwork[11], 1, actor->fwork[21], -420.0f, + Macbeth_8019A198(actor); + Macbeth_801A015C(actor); + Macbeth_8019D910(actor, &actor->iwork[10], &actor->iwork[11], 1, actor->fwork[21], -420.0f, &actor->iwork[12], &actor->iwork[13]); - func_i5_8019D910(actor, &actor->iwork[14], &actor->iwork[15], 2, actor->fwork[25], 0.0f, &actor->iwork[16], + Macbeth_8019D910(actor, &actor->iwork[14], &actor->iwork[15], 2, actor->fwork[25], 0.0f, &actor->iwork[16], &actor->iwork[17]); - func_i5_8019D910(actor, &actor->iwork[18], &actor->iwork[19], 3, actor->fwork[23], 420.0f, + Macbeth_8019D910(actor, &actor->iwork[18], &actor->iwork[19], 3, actor->fwork[23], 420.0f, &actor->iwork[20], &actor->iwork[21]); - func_i5_8019A830(actor); + Macbeth_8019A830(actor); break; case 1: - if (actor->iwork[5] < D_i5_801BE2F0[3]) { - D_i5_801BE2F0[3] = actor->iwork[5]; + if (actor->iwork[5] < D_MA_801BE2F0[3]) { + D_MA_801BE2F0[3] = actor->iwork[5]; } actor->state = 2; - func_i5_801A015C(actor); - func_i5_8019A830(actor); + Macbeth_801A015C(actor); + Macbeth_8019A830(actor); break; case 2: - func_i5_8019BBEC(actor); + Macbeth_8019BBEC(actor); if (actor->timer_0BC == 0) { actor->timer_0BC = 60; } Math_SmoothStepToF(&actor->vel.z, 0.0f, 0.02f, 10.0f, 0.01f); - func_i5_801A015C(actor); - func_i5_8019A87C(actor); + Macbeth_801A015C(actor); + Macbeth_8019A87C(actor); if (actor->unk_0D0 != 0) { actor->unk_0D0 = 0; actor->timer_0BC = 20; - func_i5_8019BE50(actor); + Macbeth_8019BE50(actor); actor->state = 3; } break; case 3: - func_i5_801A015C(actor); + Macbeth_801A015C(actor); Math_SmoothStepToF(&actor->scale, 0.0f, 0.02f, 10.0f, 0.01f); if (actor->timer_0BC <= 0) { Object_Kill(&actor->obj, actor->sfxSource); @@ -1268,49 +1264,52 @@ void func_i5_8019E410(Actor* actor) { break; } } - -void func_i5_8019E624(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f32 arg5, s32* arg6) { +f32 D_i5_801BE240; +f32 D_i5_801BE244; +f32 D_i5_801BE248; +f32 D_i5_801BE24C; +void Macbeth_8019E624(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f32 arg5, s32* arg6) { switch (*arg1) { case 0: if (((actor->unk_0D0 != 0) && (arg3 == actor->unk_0D2)) || - ((D_i5_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_i5_801BE2F0[3])) || - (((D_i5_801BE2F0[1] + 1) == actor->iwork[5]) && (D_i5_801BE2F0[3] < actor->iwork[5]))) { + ((D_MA_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_MA_801BE2F0[3])) || + (((D_MA_801BE2F0[1] + 1) == actor->iwork[5]) && (D_MA_801BE2F0[3] < actor->iwork[5]))) { AUDIO_PLAY_SFX(0x29034003, actor->sfxSource, 4); actor->unk_0D0 = 0; - func_8007C120(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5, actor->vel.x, - actor->vel.y, actor->vel.z, 0.15f, 10); + func_effect_8007C120(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5, + actor->vel.x, actor->vel.y, actor->vel.z, 0.15f, 10); actor->iwork[7] = 15; *arg2 -= actor->damage; if ((*arg2 <= 0) || - ((D_i5_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_i5_801BE2F0[3])) || - (((D_i5_801BE2F0[1] + 1) == actor->iwork[5]) && (D_i5_801BE2F0[3] < actor->iwork[5]))) { + ((D_MA_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_MA_801BE2F0[3])) || + (((D_MA_801BE2F0[1] + 1) == actor->iwork[5]) && (D_MA_801BE2F0[3] < actor->iwork[5]))) { (*arg1)++; } } else if (actor->unk_0D0 != 0) { actor->unk_0D0 = 0; AUDIO_PLAY_SFX(0x29121007, actor->sfxSource, 4); } - func_i5_8019B580(actor, arg2); + Macbeth_8019B580(actor, arg2); break; case 1: - func_i5_8019A8C8(actor, 5); + Macbeth_8019A8C8(actor, 5); *arg6 = 1; *arg2 = 80; (*arg1)++; break; case 2: if (((actor->unk_0D0 != 0) && (arg3 == actor->unk_0D2)) || - ((D_i5_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_i5_801BE2F0[3])) || - (((D_i5_801BE2F0[1] + 1) == actor->iwork[5]) && (D_i5_801BE2F0[3] < actor->iwork[5]))) { + ((D_MA_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_MA_801BE2F0[3])) || + (((D_MA_801BE2F0[1] + 1) == actor->iwork[5]) && (D_MA_801BE2F0[3] < actor->iwork[5]))) { AUDIO_PLAY_SFX(0x29034003, actor->sfxSource, 4); actor->unk_0D0 = 0; - func_8007C120(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5, actor->vel.x, - actor->vel.y, actor->vel.z, 0.2f, 10); + func_effect_8007C120(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5, + actor->vel.x, actor->vel.y, actor->vel.z, 0.2f, 10); actor->iwork[7] = 15; *arg2 -= actor->damage; if ((*arg2 <= 0) || - ((D_i5_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_i5_801BE2F0[3])) || - (((D_i5_801BE2F0[1] + 1) == actor->iwork[5]) && (D_i5_801BE2F0[3] < actor->iwork[5]))) { + ((D_MA_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_MA_801BE2F0[3])) || + (((D_MA_801BE2F0[1] + 1) == actor->iwork[5]) && (D_MA_801BE2F0[3] < actor->iwork[5]))) { gHitCount += 1; (*arg1)++; } @@ -1322,7 +1321,7 @@ void func_i5_8019E624(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3 } break; case 3: - func_i5_8019A8C8(actor, 1); + Macbeth_8019A8C8(actor, 1); *arg6 = 2; actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_60359AC); (*arg1)++; @@ -1333,40 +1332,40 @@ void func_i5_8019E624(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3 } } -void func_i5_8019EA60(Actor* actor) { +void Macbeth_8019EA60(Actor* actor) { switch (actor->state) { case 0: - func_i5_8019A198(actor); - func_i5_801A015C(actor); - func_i5_8019E624(actor, &actor->iwork[10], &actor->iwork[11], 1, actor->fwork[25], 0.0f, &actor->iwork[13]); - func_i5_8019A830(actor); + Macbeth_8019A198(actor); + Macbeth_801A015C(actor); + Macbeth_8019E624(actor, &actor->iwork[10], &actor->iwork[11], 1, actor->fwork[25], 0.0f, &actor->iwork[13]); + Macbeth_8019A830(actor); break; case 1: - if (actor->iwork[5] < D_i5_801BE2F0[3]) { - D_i5_801BE2F0[3] = actor->iwork[5]; + if (actor->iwork[5] < D_MA_801BE2F0[3]) { + D_MA_801BE2F0[3] = actor->iwork[5]; } - func_i5_801A015C(actor); - func_i5_8019A830(actor); + Macbeth_801A015C(actor); + Macbeth_8019A830(actor); actor->state = 2; break; case 2: - func_i5_8019BBEC(actor); + Macbeth_8019BBEC(actor); if (actor->timer_0BC == 0) { actor->timer_0BC = 60; } Math_SmoothStepToF(&actor->vel.z, 0.0f, 0.02f, 10.0f, 0.01f); - func_i5_801A015C(actor); - func_i5_8019A87C(actor); + Macbeth_801A015C(actor); + Macbeth_8019A87C(actor); if (actor->unk_0D0 != 0) { actor->unk_0D0 = 0; actor->timer_0BC = 20; - func_i5_8019BE50(actor); + Macbeth_8019BE50(actor); actor->state = 3; break; } break; case 3: - func_i5_801A015C(actor); + Macbeth_801A015C(actor); Math_SmoothStepToF(&actor->scale, 0.0f, 0.02f, 10.0f, 0.01f); if (actor->timer_0BC <= 0) { Object_Kill(&actor->obj, actor->sfxSource); @@ -1375,21 +1374,21 @@ void func_i5_8019EA60(Actor* actor) { } } -void func_i5_8019EBF8(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f32 arg5, s32* arg6) { +void Macbeth_8019EBF8(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f32 arg5, s32* arg6) { switch (*arg1) { case 0: if (((actor->unk_0D0 != 0) && (arg3 == actor->unk_0D2)) || - ((D_i5_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_i5_801BE2F0[3])) || - (((D_i5_801BE2F0[1] + 1) == actor->iwork[5]) && (D_i5_801BE2F0[3] < actor->iwork[5]))) { + ((D_MA_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_MA_801BE2F0[3])) || + (((D_MA_801BE2F0[1] + 1) == actor->iwork[5]) && (D_MA_801BE2F0[3] < actor->iwork[5]))) { AUDIO_PLAY_SFX(0x29034003, actor->sfxSource, 4); actor->unk_0D0 = 0; - func_8007C120(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5, actor->vel.x, - actor->vel.y, actor->vel.z, 0.15f, 10); + func_effect_8007C120(actor->obj.pos.x + arg4, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg5, + actor->vel.x, actor->vel.y, actor->vel.z, 0.15f, 10); actor->iwork[7] = 15; *arg2 -= actor->damage; if ((*arg2 <= 0) || - ((D_i5_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_i5_801BE2F0[3])) || - (((D_i5_801BE2F0[1] + 1) == actor->iwork[5]) && (D_i5_801BE2F0[3] < actor->iwork[5]))) { + ((D_MA_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_MA_801BE2F0[3])) || + (((D_MA_801BE2F0[1] + 1) == actor->iwork[5]) && (D_MA_801BE2F0[3] < actor->iwork[5]))) { gHitCount++; (*arg1)++; } @@ -1397,10 +1396,10 @@ void func_i5_8019EBF8(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3 actor->unk_0D0 = 0; AUDIO_PLAY_SFX(0x29121007, actor->sfxSource, 4); } - func_i5_8019B580(actor, arg2); + Macbeth_8019B580(actor, arg2); return; case 1: - func_i5_8019AF34(actor); + Macbeth_8019AF34(actor); *arg6 = 2; actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_60359AC); (*arg1)++; @@ -1411,52 +1410,52 @@ void func_i5_8019EBF8(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3 } } -void func_i5_8019EE68(Actor* actor) { +void Macbeth_8019EE68(Actor* actor) { switch (actor->state) { case 0: - func_i5_8019A198(actor); - func_i5_801A015C(actor); - func_i5_8019EBF8(actor, &actor->iwork[10], &actor->iwork[11], 1, actor->fwork[25], 0.0f, &actor->iwork[13]); - func_i5_8019A830(actor); + Macbeth_8019A198(actor); + Macbeth_801A015C(actor); + Macbeth_8019EBF8(actor, &actor->iwork[10], &actor->iwork[11], 1, actor->fwork[25], 0.0f, &actor->iwork[13]); + Macbeth_8019A830(actor); break; case 1: - if (actor->iwork[5] < D_i5_801BE2F0[3]) { - D_i5_801BE2F0[3] = actor->iwork[5]; + if (actor->iwork[5] < D_MA_801BE2F0[3]) { + D_MA_801BE2F0[3] = actor->iwork[5]; } - D_80178348 = D_80178350 = D_80178354 = D_80178340 = 255; - D_80178480 = 35; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = D_ctx_80178340 = 255; + D_ctx_80178480 = 35; if ((gPlayer[0].unk_138 - actor->obj.pos.z > -200.0f) && (gPlayer[0].unk_138 - actor->obj.pos.z < 200.0f) && (gPlayer[0].pos.y - actor->obj.pos.y > -300.0f) && (gPlayer[0].pos.y - actor->obj.pos.y < 300.0f) && (gPlayer[0].pos.x - actor->obj.pos.x > -800.0f) && (gPlayer[0].pos.x - actor->obj.pos.x < 800.0f)) { - D_80178348 = D_80178340 = 255; - D_80178350 = D_80178354 = 0; + D_ctx_80178348 = D_ctx_80178340 = 255; + D_ctx_80178350 = D_ctx_80178354 = 0; Player_ApplyDamage(&gPlayer[0], 0, 60); } - func_i5_801A015C(actor); - func_i5_8019A830(actor); - D_801779A8[gMainController] = 100.0f; + Macbeth_801A015C(actor); + Macbeth_8019A830(actor); + D_ctx_801779A8[gMainController] = 100.0f; actor->state = 2; break; case 2: - if (D_80178480 == 20) { - D_i5_801BE2F0[1] = actor->iwork[5]; + if (D_ctx_80178480 == 20) { + D_MA_801BE2F0[1] = actor->iwork[5]; } - func_i5_8019BBEC(actor); + Macbeth_8019BBEC(actor); if (actor->timer_0BC == 0) { actor->timer_0BC = 60; } Math_SmoothStepToF(&actor->vel.z, 0.0f, 0.02f, 10.0f, 0.01f); - func_i5_801A015C(actor); - func_i5_8019A87C(actor); - if (D_80178480 == 20) { + Macbeth_801A015C(actor); + Macbeth_8019A87C(actor); + if (D_ctx_80178480 == 20) { actor->unk_0D0 = 0; actor->timer_0BC = 20; - func_i5_8019BE50(actor); + Macbeth_8019BE50(actor); actor->state = 3; } break; case 3: - func_i5_801A015C(actor); + Macbeth_801A015C(actor); Math_SmoothStepToF(&actor->scale, 0.0f, 0.02f, 10.0f, 0.01f); if (actor->timer_0BC <= 0) { Object_Kill(&actor->obj, actor->sfxSource); @@ -1465,7 +1464,7 @@ void func_i5_8019EE68(Actor* actor) { } } -void func_i5_8019F164(Actor* actor) { +void Macbeth_8019F164(Actor* actor) { static Vec3f D_i5_801BA708 = { 0.0f, 610.0f, 0.0f }; static Vec3f D_i5_801BA714 = { 0.0f, 0.0f, 65.0f }; Vec3f sp84; @@ -1539,7 +1538,7 @@ void func_i5_8019F164(Actor* actor) { case 0: if (sp44 != 0) { sp60.x -= 60.0f; - func_8007EE68(OBJ_EFFECT_378, &sp60, &sp54, &sp48, &D_i5_801BA714, 1.0f); + func_effect_8007EE68(OBJ_EFFECT_378, &sp60, &sp54, &sp48, &D_i5_801BA714, 1.0f); AUDIO_PLAY_SFX(0x2903101B, actor->sfxSource, 4); actor->iwork[4]++; } else if ((D_i5_801BE310 == actor->iwork[5]) || @@ -1551,7 +1550,7 @@ void func_i5_8019F164(Actor* actor) { (gPlayer[0].unk_138 - actor->obj.pos.z > 200.0f) && (actor->timer_0BC == 0) && (actor->health != 0)) { sp60.x -= 60.0f; - func_8007EE68(OBJ_EFFECT_378, &sp60, &sp54, &sp48, &D_i5_801BA714, 1.0f); + func_effect_8007EE68(OBJ_EFFECT_378, &sp60, &sp54, &sp48, &D_i5_801BA714, 1.0f); AUDIO_PLAY_SFX(0x2903101B, actor->sfxSource, 4); actor->iwork[4]++; } @@ -1574,7 +1573,7 @@ void func_i5_8019F164(Actor* actor) { break; case 3: if ((actor->timer_0BC == 0) && (actor->health != 0)) { - func_8007EE68(OBJ_EFFECT_378, &sp60, &sp54, &sp48, &D_i5_801BA714, 1.0f); + func_effect_8007EE68(OBJ_EFFECT_378, &sp60, &sp54, &sp48, &D_i5_801BA714, 1.0f); AUDIO_PLAY_SFX(0x2903101B, actor->sfxSource, 4); actor->iwork[4]++; } @@ -1597,7 +1596,7 @@ void func_i5_8019F164(Actor* actor) { case 6: if ((actor->timer_0BC == 0) && (actor->health != 0)) { sp60.x += 60.0f; - func_8007EE68(OBJ_EFFECT_378, &sp60, &sp54, &sp48, &D_i5_801BA714, 1.0f); + func_effect_8007EE68(OBJ_EFFECT_378, &sp60, &sp54, &sp48, &D_i5_801BA714, 1.0f); AUDIO_PLAY_SFX(0x2903101B, actor->sfxSource, 4); actor->iwork[4]++; } @@ -1622,21 +1621,21 @@ void func_i5_8019F164(Actor* actor) { } } -void func_i5_8019FC54(Actor* actor, s32* arg1, s32* arg2, s32 arg3, s32 arg4, f32 arg5, f32 arg6, s32* arg7) { +void Macbeth_8019FC54(Actor* actor, s32* arg1, s32* arg2, s32 arg3, s32 arg4, f32 arg5, f32 arg6, s32* arg7) { switch (*arg1) { case 0: if (((actor->unk_0D0 != 0) && (actor->unk_0D2 >= arg3) && (arg4 >= actor->unk_0D2)) || - ((D_i5_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_i5_801BE2F0[3])) || - (((D_i5_801BE2F0[1] + 1) == actor->iwork[5]) && (D_i5_801BE2F0[3] < actor->iwork[5]))) { + ((D_MA_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_MA_801BE2F0[3])) || + (((D_MA_801BE2F0[1] + 1) == actor->iwork[5]) && (D_MA_801BE2F0[3] < actor->iwork[5]))) { AUDIO_PLAY_SFX(0x29034003, actor->sfxSource, 4); actor->unk_0D0 = 0; - func_8007C120(actor->obj.pos.x + arg5, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg6, actor->vel.x, - actor->vel.y, actor->vel.z, 0.15f, 10); + func_effect_8007C120(actor->obj.pos.x + arg5, actor->obj.pos.y + 200.0f, actor->obj.pos.z + arg6, + actor->vel.x, actor->vel.y, actor->vel.z, 0.15f, 10); actor->iwork[7] = 15; *arg2 -= actor->damage; if ((*arg2 <= 0) || - ((D_i5_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_i5_801BE2F0[3])) || - (((D_i5_801BE2F0[1] + 1) == actor->iwork[5]) && (D_i5_801BE2F0[3] < actor->iwork[5]))) { + ((D_MA_801BE2F0[1] - 1 == actor->iwork[5]) && (actor->iwork[5] < D_MA_801BE2F0[3])) || + (((D_MA_801BE2F0[1] + 1) == actor->iwork[5]) && (D_MA_801BE2F0[3] < actor->iwork[5]))) { gHitCount++; if ((actor->obj.id == OBJ_ACTOR_210) && (actor->iwork[3] < 2)) { gHitCount += 5; @@ -1647,15 +1646,15 @@ void func_i5_8019FC54(Actor* actor, s32* arg1, s32* arg2, s32 arg3, s32 arg4, f3 actor->unk_0D0 = 0; AUDIO_PLAY_SFX(0x29121007, actor->sfxSource, 4); } - func_i5_8019B580(actor, arg2); + Macbeth_8019B580(actor, arg2); break; case 1: - func_i5_8019A8C8(actor, 6); + Macbeth_8019A8C8(actor, 6); if (actor->obj.id == OBJ_ACTOR_212) { - func_8007BFFC(actor->obj.pos.x + actor->fwork[25], actor->obj.pos.y + 360.0f, actor->obj.pos.z, 0.0f, - 0.0f, 0.0f, 20.0f, 20); - func_8007BFFC(actor->obj.pos.x + actor->fwork[25], actor->obj.pos.y + 660.0f, actor->obj.pos.z, 0.0f, - 0.0f, 0.0f, 20.0f, 20); + func_effect_8007BFFC(actor->obj.pos.x + actor->fwork[25], actor->obj.pos.y + 360.0f, actor->obj.pos.z, + 0.0f, 0.0f, 0.0f, 20.0f, 20); + func_effect_8007BFFC(actor->obj.pos.x + actor->fwork[25], actor->obj.pos.y + 660.0f, actor->obj.pos.z, + 0.0f, 0.0f, 0.0f, 20.0f, 20); } *arg7 = 2; actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_60359AC); @@ -1667,44 +1666,44 @@ void func_i5_8019FC54(Actor* actor, s32* arg1, s32* arg2, s32 arg3, s32 arg4, f3 } } -void func_i5_8019FF9C(Actor* actor) { +void Macbeth_8019FF9C(Actor* actor) { switch (actor->state) { case 0: - func_i5_8019A198(actor); - func_i5_801A015C(actor); - func_i5_8019FC54(actor, &actor->iwork[10], &actor->iwork[11], 1, 3, actor->fwork[25], 0.0f, + Macbeth_8019A198(actor); + Macbeth_801A015C(actor); + Macbeth_8019FC54(actor, &actor->iwork[10], &actor->iwork[11], 1, 3, actor->fwork[25], 0.0f, &actor->iwork[13]); - func_i5_8019A728(actor); + Macbeth_8019A728(actor); if (actor->iwork[1] != 0) { - func_i5_8019F164(actor); + Macbeth_8019F164(actor); } - func_i5_8019A830(actor); + Macbeth_8019A830(actor); break; case 1: - if (actor->iwork[5] < D_i5_801BE2F0[3]) { - D_i5_801BE2F0[3] = actor->iwork[5]; + if (actor->iwork[5] < D_MA_801BE2F0[3]) { + D_MA_801BE2F0[3] = actor->iwork[5]; } actor->state = 2; - func_i5_801A015C(actor); - func_i5_8019A830(actor); + Macbeth_801A015C(actor); + Macbeth_8019A830(actor); break; case 2: - func_i5_8019BBEC(actor); + Macbeth_8019BBEC(actor); if (actor->timer_0BC == 0) { actor->timer_0BC = 60; } Math_SmoothStepToF(&actor->vel.z, 0.0f, 0.02f, 10.0f, 0.01f); - func_i5_801A015C(actor); - func_i5_8019A87C(actor); + Macbeth_801A015C(actor); + Macbeth_8019A87C(actor); if (actor->unk_0D0 != 0) { actor->unk_0D0 = 0; actor->timer_0BC = 20; - func_i5_8019BE50(actor); + Macbeth_8019BE50(actor); actor->state = 3; } break; case 3: - func_i5_801A015C(actor); + Macbeth_801A015C(actor); Math_SmoothStepToF(&actor->scale, 0.0f, 0.02f, 10.0f, 0.01f); if (actor->timer_0BC <= 0) { Object_Kill(&actor->obj, actor->sfxSource); @@ -1713,16 +1712,16 @@ void func_i5_8019FF9C(Actor* actor) { } } -void func_i5_801A015C(Actor* actor) { - if (!func_i5_801A0308(actor, actor->obj.pos.z, actor->obj.rot.y, 0)) { +void Macbeth_801A015C(Actor* actor) { + if (!Macbeth_801A0308(actor, actor->obj.pos.z, actor->obj.rot.y, 0)) { actor->obj.pos.x = actor->fwork[19]; actor->obj.pos.y = actor->fwork[5]; - if (!func_i5_801A0308(actor, actor->obj.pos.z - 420.0f, actor->fwork[22], 1)) { + if (!Macbeth_801A0308(actor, actor->obj.pos.z - 420.0f, actor->fwork[22], 1)) { actor->fwork[21] = actor->fwork[19] - actor->obj.pos.x; actor->fwork[22] = actor->fwork[20]; actor->fwork[6] = actor->fwork[5] - actor->obj.pos.y; actor->fwork[27] = actor->fwork[9]; - if (!func_i5_801A0308(actor, actor->obj.pos.z + 420.0f, actor->fwork[24], 2)) { + if (!Macbeth_801A0308(actor, actor->obj.pos.z + 420.0f, actor->fwork[24], 2)) { actor->fwork[23] = actor->fwork[19] - actor->obj.pos.x; actor->fwork[24] = actor->fwork[20]; actor->fwork[7] = actor->fwork[5] - actor->obj.pos.y; @@ -1745,7 +1744,7 @@ void func_i5_801A015C(Actor* actor) { } } -bool func_i5_801A0308(Actor* actor, f32 arg1, f32 arg2, u8 arg3) { +bool Macbeth_801A0308(Actor* actor, f32 arg1, f32 arg2, u8 arg3) { s16 var_a0; s16 sp4C; f32 temp_fv0; @@ -1759,7 +1758,7 @@ bool func_i5_801A0308(Actor* actor, f32 arg1, f32 arg2, u8 arg3) { f32 sp28; f32 sp24; - switch (D_i5_801BE2F0[5]) { + switch (D_MA_801BE2F0[5]) { case 0: for (var_a0 = actor->fwork[arg3 + 16]; D_i5_801B8E50[var_a0].unk_10 != 0; var_a0++) { @@ -1837,7 +1836,7 @@ bool func_i5_801A0308(Actor* actor, f32 arg1, f32 arg2, u8 arg3) { sp24 = 1.0f - ((sp2C - arg1) / (sp2C - sp3C)); if ((sp4C == OBJ_80_95) || (sp4C == OBJ_80_96) || (sp4C == OBJ_80_98) || (sp4C == OBJ_80_99)) { - if ((actor->iwork[5] < (s32) D_i5_801BA1E4) && (actor->iwork[5] < D_i5_801BE2F0[3])) { + if ((actor->iwork[5] < (s32) D_i5_801BA1E4) && (actor->iwork[5] < D_MA_801BE2F0[3])) { actor->vel.z *= 0.98f; } temp_fv0 = fabsf((sp2C - sp3C) / 3.0f); @@ -1864,7 +1863,7 @@ bool func_i5_801A0308(Actor* actor, f32 arg1, f32 arg2, u8 arg3) { } } else { if (sp4C == OBJ_80_104) { - if ((actor->iwork[5] < (s32) D_i5_801BA1E4) && (actor->iwork[5] < D_i5_801BE2F0[3])) { + if ((actor->iwork[5] < (s32) D_i5_801BA1E4) && (actor->iwork[5] < D_MA_801BE2F0[3])) { actor->vel.z *= 0.94f; } } @@ -1882,7 +1881,7 @@ bool func_i5_801A0308(Actor* actor, f32 arg1, f32 arg2, u8 arg3) { return false; } -bool func_i5_801A0A74(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +bool Macbeth_801A0A74(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { if ((limbIndex == 5) || (limbIndex == 6)) { gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); } else { @@ -1894,14 +1893,14 @@ bool func_i5_801A0A74(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* return false; } -bool func_i5_801A0B00(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +bool Macbeth_801A0B00(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { if (limbIndex == 3) { *dList = NULL; } return false; } -bool func_i5_801A0B20(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +bool Macbeth_801A0B20(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { Actor* actor = (Actor*) data; if ((limbIndex == 3) || (limbIndex == 7)) { @@ -1920,7 +1919,7 @@ bool func_i5_801A0B20(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* return false; } -void func_i5_801A0BD8(Object_80* obj80) { +void Macbeth_801A0BD8(Object_80* obj80) { switch (obj80->state) { case 0: obj80->vel.y = 0.0f; @@ -1960,7 +1959,7 @@ void func_i5_801A0BD8(Object_80* obj80) { } } -bool func_i5_801A0DD8(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +bool Macbeth_801A0DD8(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { Object_80* obj80 = (Object_80*) data; if (limbIndex == 5) { @@ -1972,7 +1971,7 @@ bool func_i5_801A0DD8(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* return false; } -void func_i5_801A0E2C(s32 limbIndex, Vec3f* rot, void* data) { +void Macbeth_801A0E2C(s32 limbIndex, Vec3f* rot, void* data) { Vec3f sp24 = { 0.0f, 0.0f, 0.0f }; s32 pad; @@ -1986,7 +1985,7 @@ void func_i5_801A0E2C(s32 limbIndex, Vec3f* rot, void* data) { } } -bool func_i5_801A0EB8(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +bool Macbeth_801A0EB8(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { Actor* actor = (Actor*) data; RCP_SetupDL(&gMasterDisp, 0x1D); @@ -2022,7 +2021,7 @@ bool func_i5_801A0EB8(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* return false; } -void func_i5_801A1268(s32 limbIndex, Vec3f* rot, void* data) { +void Macbeth_801A1268(s32 limbIndex, Vec3f* rot, void* data) { Vec3f sp1C = { 0.0f, 0.0f, 0.0f }; Actor* actor = (Actor*) data; @@ -2031,7 +2030,7 @@ void func_i5_801A1268(s32 limbIndex, Vec3f* rot, void* data) { } } -void func_i5_801A12C4(Actor* actor) { +void Macbeth_801A12C4(Actor* actor) { Vec3f spD0[50]; s32 id; @@ -2060,7 +2059,7 @@ void func_i5_801A12C4(Actor* actor) { } else { Matrix_Scale(gGfxMatrix, actor->scale, actor->scale, actor->scale, 1); Animation_GetFrameData(&D_MA_602EA0C, 0, spD0); - Animation_DrawSkeleton(1, D_MA_602EBB8, spD0, func_i5_801A0A74, NULL, actor, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_MA_602EBB8, spD0, Macbeth_801A0A74, NULL, actor, &gIdentityMatrix); } } switch (actor->obj.id) { @@ -2074,13 +2073,13 @@ void func_i5_801A12C4(Actor* actor) { actor->iwork[7]--; } Animation_GetFrameData(&D_MA_6027320, 0, spD0); - Animation_DrawSkeleton(1, D_MA_602742C, spD0, func_i5_801A0B20, NULL, actor, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_MA_602742C, spD0, Macbeth_801A0B20, NULL, actor, &gIdentityMatrix); } break; case OBJ_ACTOR_210: if (actor->iwork[13] == 0) { Animation_GetFrameData(&D_MA_6027A04, 0, spD0); - Animation_DrawSkeleton(1, D_MA_6027AF0, spD0, func_i5_801A0B00, NULL, actor, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_MA_6027AF0, spD0, Macbeth_801A0B00, NULL, actor, &gIdentityMatrix); Matrix_Translate(gGfxMatrix, 0.0f, 205.0f, 0.0f, 1); Matrix_RotateZ(gGfxMatrix, actor->fwork[4] * M_DTOR, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -2175,7 +2174,7 @@ void func_i5_801A12C4(Actor* actor) { break; case OBJ_ACTOR_206: Animation_GetFrameData(&D_MA_601EAB0, 0, spD0); - Animation_DrawSkeleton(1, D_MA_601EBBC, spD0, func_i5_801AC5AC, NULL, actor, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_MA_601EBBC, spD0, Macbeth_801AC5AC, NULL, actor, &gIdentityMatrix); break; case OBJ_ACTOR_205: Matrix_Translate(gGfxMatrix, actor->fwork[3], 0.0f, 0.0f, 1); @@ -2186,7 +2185,7 @@ void func_i5_801A12C4(Actor* actor) { } else { Animation_GetFrameData(&D_MA_6010144, D_i5_801BE320[22], spD0); } - Animation_DrawSkeleton(1, D_MA_601042C, spD0, func_i5_801A0EB8, func_i5_801A1268, actor, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_MA_601042C, spD0, Macbeth_801A0EB8, Macbeth_801A1268, actor, &gIdentityMatrix); if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7) { RCP_SetupDL(&gMasterDisp, 0x1D); gSPClearGeometryMode(gMasterDisp++, G_TEXTURE_GEN); @@ -2279,7 +2278,7 @@ void func_i5_801A12C4(Actor* actor) { } } -void func_i5_801A23AC(Object_80* obj80) { +void Macbeth_801A23AC(Object_80* obj80) { Vec3f sp78[50]; RCP_SetupDL(&gMasterDisp, 0x39); @@ -2317,7 +2316,7 @@ void func_i5_801A23AC(Object_80* obj80) { case OBJ_80_104: Matrix_Push(&gGfxMatrix); Animation_GetFrameData(&D_MA_6025CA0, 0, sp78); - Animation_DrawSkeleton(1, D_MA_6025DAC, sp78, func_i5_801A0DD8, func_i5_801A0E2C, obj80, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_MA_6025DAC, sp78, Macbeth_801A0DD8, Macbeth_801A0E2C, obj80, &gIdentityMatrix); Matrix_Pop(&gGfxMatrix); if ((obj80->state == 1) && (obj80->timer_4C <= 0)) { Matrix_Push(&gGfxMatrix); @@ -2354,7 +2353,7 @@ void func_i5_801A23AC(Object_80* obj80) { RCP_SetupDL(&gMasterDisp, 0x1D); Matrix_Pop(&gGfxMatrix); } - if (D_i5_801BE2F0[5] != 0) { + if (D_MA_801BE2F0[5] != 0) { Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -1800.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -2379,7 +2378,7 @@ void func_i5_801A23AC(Object_80* obj80) { RCP_SetupDL(&gMasterDisp, 0x1D); } -void func_i5_801A2A78(Object_80* obj80) { +void Macbeth_801A2A78(Object_80* obj80) { RCP_SetupDL(&gMasterDisp, 0x39); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); gSPDisplayList(gMasterDisp++, D_MA_60253E0); @@ -2388,7 +2387,7 @@ void func_i5_801A2A78(Object_80* obj80) { RCP_SetupDL(&gMasterDisp, 0x1D); } -void func_i5_801A2B24(Object_80* obj80) { +void Macbeth_801A2B24(Object_80* obj80) { if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7) { Object_Kill(&obj80->obj, obj80->sfxSource); } @@ -2440,7 +2439,7 @@ void func_i5_801A2B24(Object_80* obj80) { RCP_SetupDL(&gMasterDisp, 0x1D); } -void func_i5_801A2DD8(Object_80* obj80) { +void Macbeth_801A2DD8(Object_80* obj80) { s16 i; switch (obj80->state) { @@ -2450,13 +2449,13 @@ void func_i5_801A2DD8(Object_80* obj80) { } break; case 1: - func_8007A6F0(&obj80->obj.pos, 0x2903B009); + func_effect_8007A6F0(&obj80->obj.pos, 0x2903B009); D_80137E84[gMainController] = 1; D_Timer_80177BD0[gMainController] = 15; for (i = 0; i < 6; i++) { - func_8007D2C8(obj80->obj.pos.x + D_i5_801BE6A0[i].x, obj80->obj.pos.y + D_i5_801BE6A0[i].y, - obj80->obj.pos.z + D_i5_801BE6A0[i].z, 18.0f); - func_i5_801AD624(obj80->obj.pos.x + D_i5_801BE6A0[i].x, obj80->obj.pos.y + D_i5_801BE6A0[i].y, + func_effect_8007D2C8(obj80->obj.pos.x + D_i5_801BE6A0[i].x, obj80->obj.pos.y + D_i5_801BE6A0[i].y, + obj80->obj.pos.z + D_i5_801BE6A0[i].z, 18.0f); + Macbeth_801AD624(obj80->obj.pos.x + D_i5_801BE6A0[i].x, obj80->obj.pos.y + D_i5_801BE6A0[i].y, obj80->obj.pos.z + D_i5_801BE6A0[i].z, RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT(30.0f) + 30.0f, RAND_FLOAT(-50.0f), obj80->obj.rot.x + D_i5_801BE6A0[i + 6].x, obj80->obj.rot.y + D_i5_801BE6A0[i + 6].y, @@ -2469,7 +2468,7 @@ void func_i5_801A2DD8(Object_80* obj80) { } } -void func_i5_801A30B8(s32 limbIndex, Vec3f* rot, void* data) { +void Macbeth_801A30B8(s32 limbIndex, Vec3f* rot, void* data) { Vec3f sp24 = { 0.0f, 0.0f, 0.0f }; switch (limbIndex) { @@ -2502,17 +2501,17 @@ void func_i5_801A30B8(s32 limbIndex, Vec3f* rot, void* data) { } } -void func_i5_801A3240(Object_80* obj80) { +void Macbeth_801A3240(Object_80* obj80) { Vec3f sp38[50]; RCP_SetupDL(&gMasterDisp, 0x1D); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); Animation_GetFrameData(&D_MA_600C4D0, 0, sp38); - Animation_DrawSkeleton(1, D_MA_600C65C, sp38, NULL, func_i5_801A30B8, obj80, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_MA_600C65C, sp38, NULL, Macbeth_801A30B8, obj80, &gIdentityMatrix); gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); } -bool func_i5_801A3300(Player* player, f32 arg1, f32 arg2) { +bool Macbeth_801A3300(Player* player, f32 arg1, f32 arg2) { s16 temp_a0; s16 var_v1; f32 temp_ft4; @@ -2525,7 +2524,7 @@ bool func_i5_801A3300(Player* player, f32 arg1, f32 arg2) { f32 sp2C; s32 pad; - var_v1 = D_i5_801BE250[6]; + var_v1 = D_MA_801BE250[6]; while (true) { if (D_i5_801B8E50[var_v1].unk_10 == 0) { return true; @@ -2543,22 +2542,22 @@ bool func_i5_801A3300(Player* player, f32 arg1, f32 arg2) { sp30 = D_i5_801B8E50[var_v1].unk_00; sp38 = D_i5_801B8E50[var_v1].unk_04; sp34 = D_i5_801B8E50[var_v1].unk_08; - if (var_v1 != D_i5_801BE250[6]) { - D_i5_801BE250[7] = arg2; + if (var_v1 != D_MA_801BE250[6]) { + D_MA_801BE250[7] = arg2; switch (D_i5_801B8E50[var_v1 - 1].unk_10) { case OBJ_80_94: case OBJ_80_100: case OBJ_80_101: - D_i5_801BE250[8] = 0.0f; + D_MA_801BE250[8] = 0.0f; break; case OBJ_80_95: - D_i5_801BE250[8] = -10.0f; + D_MA_801BE250[8] = -10.0f; break; case OBJ_80_96: - D_i5_801BE250[8] = 10.0f; + D_MA_801BE250[8] = 10.0f; break; } - D_i5_801BE250[6] = var_v1; + D_MA_801BE250[6] = var_v1; } break; } else { @@ -2572,46 +2571,46 @@ bool func_i5_801A3300(Player* player, f32 arg1, f32 arg2) { temp_fv0_2 = fabsf((sp30 - temp_ft4) / 3.0f); if (sp2C < 0.3333333f) { if ((temp_a0 == OBJ_80_95) || (temp_a0 == OBJ_80_98)) { - D_i5_801BE250[9] = + D_MA_801BE250[9] = (((sp38 - temp_fa0) * sp2C) + temp_fa0) - (52.160667f * (1.0f - (((temp_ft4 - temp_fv0_2) - arg1) / ((temp_ft4 - temp_fv0_2) - temp_ft4)))); } else { - D_i5_801BE250[9] = + D_MA_801BE250[9] = ((sp38 - temp_fa0) * sp2C) + temp_fa0 + (52.160667f * (1.0f - (((temp_ft4 - temp_fv0_2) - arg1) / ((temp_ft4 - temp_fv0_2) - temp_ft4)))); } } else if (sp2C < 0.666666f) { if ((temp_a0 == OBJ_80_95) || (temp_a0 == OBJ_80_98)) { - D_i5_801BE250[9] = (((sp38 - temp_fa0) * sp2C) + temp_fa0) - 52.160667f; + D_MA_801BE250[9] = (((sp38 - temp_fa0) * sp2C) + temp_fa0) - 52.160667f; } else { - D_i5_801BE250[9] = (((sp38 - temp_fa0) * sp2C) + temp_fa0 + 52.160667f); + D_MA_801BE250[9] = (((sp38 - temp_fa0) * sp2C) + temp_fa0 + 52.160667f); } } else if ((temp_a0 == OBJ_80_95) || (temp_a0 == OBJ_80_98)) { - D_i5_801BE250[9] = + D_MA_801BE250[9] = (((sp38 - temp_fa0) * sp2C) + temp_fa0) - (52.160667f * (1.0f - (1.0f - ((sp30 - arg1) / (sp30 - (temp_ft4 - (temp_fv0_2 * 2))))))); } else { - D_i5_801BE250[9] = + D_MA_801BE250[9] = ((sp38 - temp_fa0) * sp2C) + temp_fa0 + (52.160667f * (1.0f - (1.0f - ((sp30 - arg1) / (sp30 - (temp_ft4 - (temp_fv0_2 * 2))))))); } } else { - D_i5_801BE250[9] = ((sp38 - temp_fa0) * sp2C) + temp_fa0; + D_MA_801BE250[9] = ((sp38 - temp_fa0) * sp2C) + temp_fa0; } - D_i5_801BE250[2] = (((sp34 - sp40) * sp2C) + sp40); + D_MA_801BE250[2] = (((sp34 - sp40) * sp2C) + sp40); if ((temp_a0 == 100) || (temp_a0 == OBJ_80_102)) { - Math_SmoothStepToF(&D_i5_801BE250[3], 3.0f, 0.05f, 1.0f, 0.0f); + Math_SmoothStepToF(&D_MA_801BE250[3], 3.0f, 0.05f, 1.0f, 0.0f); } else if ((temp_a0 == OBJ_80_101) || (temp_a0 == OBJ_80_103)) { - Math_SmoothStepToF(&D_i5_801BE250[3], -3.0f, 0.05f, 1.0f, 0.0f); + Math_SmoothStepToF(&D_MA_801BE250[3], -3.0f, 0.05f, 1.0f, 0.0f); } else { - Math_SmoothStepToF(&D_i5_801BE250[3], 0.0f, 0.05f, 1.0f, 0.0f); + Math_SmoothStepToF(&D_MA_801BE250[3], 0.0f, 0.05f, 1.0f, 0.0f); } - D_i5_801BE250[4] = (D_i5_801BE250[8] * sp2C) + D_i5_801BE250[7]; + D_MA_801BE250[4] = (D_MA_801BE250[8] * sp2C) + D_MA_801BE250[7]; return false; } -bool func_i5_801A3790(Player* player, f32 arg1, f32 arg2) { +bool Macbeth_801A3790(Player* player, f32 arg1, f32 arg2) { s16 temp_a0; s16 var_v1; f32 temp_ft4; @@ -2624,7 +2623,7 @@ bool func_i5_801A3790(Player* player, f32 arg1, f32 arg2) { f32 sp2C; s32 pad; - var_v1 = D_i5_801BE250[16]; + var_v1 = D_MA_801BE250[16]; while (true) { if (D_i5_801B9A80[var_v1].unk_10 == 0) { return true; @@ -2642,22 +2641,22 @@ bool func_i5_801A3790(Player* player, f32 arg1, f32 arg2) { sp30 = D_i5_801B9A80[var_v1].unk_00; sp38 = D_i5_801B9A80[var_v1].unk_04; sp34 = D_i5_801B9A80[var_v1].unk_08; - if (var_v1 != D_i5_801BE250[16]) { - D_i5_801BE250[17] = arg2; + if (var_v1 != D_MA_801BE250[16]) { + D_MA_801BE250[17] = arg2; switch (D_i5_801B9A80[var_v1 - 1].unk_10) { case OBJ_80_97: case OBJ_80_100: case OBJ_80_101: - D_i5_801BE250[18] = 0.0f; + D_MA_801BE250[18] = 0.0f; break; case OBJ_80_98: - D_i5_801BE250[18] = -10.0f; + D_MA_801BE250[18] = -10.0f; break; case OBJ_80_99: - D_i5_801BE250[18] = 10.0f; + D_MA_801BE250[18] = 10.0f; break; } - D_i5_801BE250[16] = var_v1; + D_MA_801BE250[16] = var_v1; } break; } else { @@ -2671,46 +2670,46 @@ bool func_i5_801A3790(Player* player, f32 arg1, f32 arg2) { temp_fv0_2 = fabsf((sp30 - temp_ft4) / 3.0f); if (sp2C < 0.3333333f) { if ((temp_a0 == OBJ_80_95) || (temp_a0 == OBJ_80_98)) { - D_i5_801BE250[19] = + D_MA_801BE250[19] = (((sp38 - temp_fa0) * sp2C) + temp_fa0) - (52.160667f * (1.0f - (((temp_ft4 - temp_fv0_2) - arg1) / ((temp_ft4 - temp_fv0_2) - temp_ft4)))); } else { - D_i5_801BE250[19] = + D_MA_801BE250[19] = ((sp38 - temp_fa0) * sp2C) + temp_fa0 + (52.160667f * (1.0f - (((temp_ft4 - temp_fv0_2) - arg1) / ((temp_ft4 - temp_fv0_2) - temp_ft4)))); } } else if (sp2C < 0.666666f) { if ((temp_a0 == OBJ_80_95) || (temp_a0 == OBJ_80_98)) { - D_i5_801BE250[19] = (((sp38 - temp_fa0) * sp2C) + temp_fa0) - 52.160667f; + D_MA_801BE250[19] = (((sp38 - temp_fa0) * sp2C) + temp_fa0) - 52.160667f; } else { - D_i5_801BE250[19] = (((sp38 - temp_fa0) * sp2C) + temp_fa0 + 52.160667f); + D_MA_801BE250[19] = (((sp38 - temp_fa0) * sp2C) + temp_fa0 + 52.160667f); } } else if ((temp_a0 == OBJ_80_95) || (temp_a0 == OBJ_80_98)) { - D_i5_801BE250[19] = + D_MA_801BE250[19] = (((sp38 - temp_fa0) * sp2C) + temp_fa0) - (52.160667f * (1.0f - (1.0f - ((sp30 - arg1) / (sp30 - (temp_ft4 - (temp_fv0_2 * 2))))))); } else { - D_i5_801BE250[19] = + D_MA_801BE250[19] = ((sp38 - temp_fa0) * sp2C) + temp_fa0 + (52.160667f * (1.0f - (1.0f - ((sp30 - arg1) / (sp30 - (temp_ft4 - (temp_fv0_2 * 2))))))); } } else { - D_i5_801BE250[19] = ((sp38 - temp_fa0) * sp2C) + temp_fa0; + D_MA_801BE250[19] = ((sp38 - temp_fa0) * sp2C) + temp_fa0; } - D_i5_801BE250[12] = (((sp34 - sp40) * sp2C) + sp40); + D_MA_801BE250[12] = (((sp34 - sp40) * sp2C) + sp40); if ((temp_a0 == OBJ_80_100) || (temp_a0 == OBJ_80_102)) { - Math_SmoothStepToF(&D_i5_801BE250[13], 2.0f, 0.05f, 1.0f, 0.0f); + Math_SmoothStepToF(&D_MA_801BE250[13], 2.0f, 0.05f, 1.0f, 0.0f); } else if ((temp_a0 == OBJ_80_101) || (temp_a0 == OBJ_80_103)) { - Math_SmoothStepToF(&D_i5_801BE250[13], -2.0f, 0.05f, 1.0f, 0.0f); + Math_SmoothStepToF(&D_MA_801BE250[13], -2.0f, 0.05f, 1.0f, 0.0f); } else { - Math_SmoothStepToF(&D_i5_801BE250[13], 0.0f, 0.05f, 1.0f, 0.0f); + Math_SmoothStepToF(&D_MA_801BE250[13], 0.0f, 0.05f, 1.0f, 0.0f); } - D_i5_801BE250[14] = (D_i5_801BE250[18] * sp2C) + D_i5_801BE250[17]; + D_MA_801BE250[14] = (D_MA_801BE250[18] * sp2C) + D_MA_801BE250[17]; return false; } -bool func_i5_801A3C20(f32 arg0) { +bool Macbeth_801A3C20(f32 arg0) { s16 var_a0; f32 sp40; f32 sp3C; @@ -2720,10 +2719,10 @@ bool func_i5_801A3C20(f32 arg0) { f32 sp2C; f32 temp_fv0_2; - for (var_a0 = D_i5_801BE250[20]; D_i5_801BA138[var_a0].unk_10 != 0; var_a0++) { + for (var_a0 = D_MA_801BE250[20]; D_i5_801BA138[var_a0].unk_10 != 0; var_a0++) { if ((arg0 < D_i5_801BA138[var_a0].unk_00) && ((D_i5_801BA138[var_a0].unk_00 - 1200) < arg0)) { - D_i5_801BE250[20] = var_a0; - D_i5_801BE250[22] = D_i5_801BA138[var_a0].unk_08; + D_MA_801BE250[20] = var_a0; + D_MA_801BE250[22] = D_i5_801BA138[var_a0].unk_08; sp38 = D_i5_801BA138[var_a0].unk_00; sp40 = D_i5_801BA138[var_a0].unk_04; sp3C = D_i5_801BA138[var_a0].unk_08; @@ -2737,25 +2736,25 @@ bool func_i5_801A3C20(f32 arg0) { return false; } temp_fv0_2 = 1.0f - ((sp2C - arg0) / (sp2C - sp38)); - D_i5_801BE250[21] = (((sp34 - sp40) * temp_fv0_2) + sp40); - D_i5_801BE250[22] = (((sp30 - sp3C) * temp_fv0_2) + sp3C); + D_MA_801BE250[21] = (((sp34 - sp40) * temp_fv0_2) + sp40); + D_MA_801BE250[22] = (((sp30 - sp3C) * temp_fv0_2) + sp3C); if (sp30 < sp3C) { - Math_SmoothStepToF(&D_i5_801BE250[23], -10.0f, 0.05f, 1.0f, 0); + Math_SmoothStepToF(&D_MA_801BE250[23], -10.0f, 0.05f, 1.0f, 0); } else if (sp3C < sp30) { - Math_SmoothStepToF(&D_i5_801BE250[23], 10.0f, 0.05f, 1.0f, 0); + Math_SmoothStepToF(&D_MA_801BE250[23], 10.0f, 0.05f, 1.0f, 0); } else { - Math_SmoothStepToF(&D_i5_801BE250[23], 0.0f, 0.05f, 1.0f, 0); + Math_SmoothStepToF(&D_MA_801BE250[23], 0.0f, 0.05f, 1.0f, 0); } return true; } -void func_i5_801A3E70(Actor* actor) { +void Macbeth_801A3E70(Actor* actor) { actor->state = 0; actor->unk_046 = D_i5_801BA1D8; D_i5_801BA1D8++; } -void func_i5_801A3E98(Actor* actor) { +void Macbeth_801A3E98(Actor* actor) { if ((gPlayer[0].unk_138 - actor->obj.pos.z) < -500.0f) { Object_Kill(&actor->obj, actor->sfxSource); } @@ -2808,7 +2807,7 @@ void func_i5_801A3E98(Actor* actor) { } } -bool func_i5_801A41B0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +bool Macbeth_801A41B0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { Actor* actor = (Actor*) data; RCP_SetupDL(&gMasterDisp, 0x1D); @@ -2826,12 +2825,12 @@ bool func_i5_801A41B0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* return false; } -void func_i5_801A43BC(Actor* actor) { +void Macbeth_801A43BC(Actor* actor) { Vec3f sp50[50]; Matrix_Push(&gGfxMatrix); Animation_GetFrameData(&D_MA_602FEB4, 0, sp50); - Animation_DrawSkeleton(1, D_MA_602FFA0, sp50, func_i5_801A41B0, NULL, actor, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_MA_602FFA0, sp50, Macbeth_801A41B0, NULL, actor, &gIdentityMatrix); Matrix_Pop(&gGfxMatrix); RCP_SetupDL(&gMasterDisp, 0x1D); Matrix_Push(&gGfxMatrix); @@ -2852,7 +2851,7 @@ void func_i5_801A43BC(Actor* actor) { Matrix_Pop(&gGfxMatrix); } -void func_i5_801A4660(Actor* actor) { +void Macbeth_801A4660(Actor* actor) { actor->gravity = 0; actor->unk_04A = actor->unk_046; actor->health = 60; @@ -2863,7 +2862,7 @@ void func_i5_801A4660(Actor* actor) { } } -void func_i5_801A46A0(Actor* actor) { +void Macbeth_801A46A0(Actor* actor) { if ((gPlayer[0].unk_138 - actor->obj.pos.z) < -500.0f) { Object_Kill(&actor->obj, actor->sfxSource); } @@ -2912,25 +2911,25 @@ void func_i5_801A46A0(Actor* actor) { actor->obj.rot.z += 1.0f; } } - func_i5_801A49B8(actor); + Macbeth_801A49B8(actor); break; case 1: - func_i5_801A49B8(actor); + Macbeth_801A49B8(actor); break; case 2: - func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); Object_Kill(&actor->obj, actor->sfxSource); break; } } -void func_i5_801A49B8(Actor* actor) { +void Macbeth_801A49B8(Actor* actor) { if (actor->unk_0D0 != 0) { AUDIO_PLAY_SFX(0x29024003, actor->sfxSource, 0); actor->timer_0C6 = 15; actor->health -= actor->damage; if (actor->health <= 0) { - func_8007A6F0(&actor->obj.pos, 0x2903B009); + func_effect_8007A6F0(&actor->obj.pos, 0x2903B009); gHitCount++; actor->state = 2; } @@ -2938,7 +2937,7 @@ void func_i5_801A49B8(Actor* actor) { } } -void func_i5_801A4A64(Actor* actor) { +void Macbeth_801A4A64(Actor* actor) { if (actor->state < 2) { if (actor->scale != 1.0f) { Matrix_Scale(gGfxMatrix, actor->scale, actor->scale, actor->scale, 1); @@ -2948,13 +2947,13 @@ void func_i5_801A4A64(Actor* actor) { } } -void func_i5_801A4AF8(Actor* actor) { +void Macbeth_801A4AF8(Actor* actor) { actor->fwork[1] = 10.0f; actor->fwork[6] = -100.0f; D_i5_801BE318 = actor->index; } -void func_i5_801A4B24(Actor* actor) { +void Macbeth_801A4B24(Actor* actor) { s32 pad[2]; s32 i; ObjectInit* objInit; @@ -2963,7 +2962,7 @@ void func_i5_801A4B24(Actor* actor) { var_s0 = 0; if ((gPlayer[0].unk_138 - actor->obj.pos.z) < -700.0f) { - if (D_i5_801BE2F0[5] == 0) { + if (D_MA_801BE2F0[5] == 0) { Radio_PlayMessage(gMsg_ID_17170, RCID_PEPPY); } Object_Kill(&actor->obj, actor->sfxSource); @@ -3012,18 +3011,18 @@ void func_i5_801A4B24(Actor* actor) { case 5: if ((actor->unk_0D0 != 0) && (actor->unk_0D2 == 3)) { actor->unk_0D0 = 0; - D_i5_801BE2F0[5] = 1; + D_MA_801BE2F0[5] = 1; - D_80178310 = SEGMENTED_TO_VIRTUAL(D_800CFDA0[gCurrentLevel]); + D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_enmy_800CFDA0[gCurrentLevel]); - for (i = D_80177DC8 - 5, objInit = &D_80178310[i]; i < D_80177DC8 + 50; i++, objInit++) { + for (i = D_ctx_80177DC8 - 5, objInit = &D_ctx_80178310[i]; i < D_ctx_80177DC8 + 50; i++, objInit++) { Object_Load(objInit, 40000.0f, -2000.0f, 40000.0f, -2000.0f); } - D_80177DC8 = i; - D_8017796C = -1; + D_ctx_80177DC8 = i; + D_ctx_8017796C = -1; gPlayer[0].state_1C8 = PLAYERSTATE_1C8_7; gPlayer[0].unk_1D0 = 0; - D_80177930 = 1; + D_ctx_80177930 = 1; actor->timer_0BC = 5; actor->state = 6; Audio_KillSfxBySourceAndId(gPlayer[0].sfxSource, 0x1100000A); @@ -3061,7 +3060,7 @@ void func_i5_801A4B24(Actor* actor) { } } -bool func_i5_801A5124(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +bool Macbeth_801A5124(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { Actor* actor = (Actor*) data; RCP_SetupDL(&gMasterDisp, 0x1D); @@ -3089,7 +3088,7 @@ bool func_i5_801A5124(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* return false; } -bool func_i5_801A54AC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +bool Macbeth_801A54AC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { Actor* actor = (Actor*) data; pos->y = actor->fwork[6] + pos->y; @@ -3099,21 +3098,21 @@ bool func_i5_801A54AC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* return false; } -void func_i5_801A54E8(Actor* actor) { +void Macbeth_801A54E8(Actor* actor) { Vec3f sp28[50]; Matrix_Push(&gGfxMatrix); Animation_GetFrameData(&D_MA_602F2E0, 0, sp28); - Animation_DrawSkeleton(1, D_MA_602F36C, sp28, func_i5_801A54AC, NULL, actor, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_MA_602F36C, sp28, Macbeth_801A54AC, NULL, actor, &gIdentityMatrix); Matrix_Pop(&gGfxMatrix); Matrix_Push(&gGfxMatrix); Animation_GetFrameData(&D_MA_602F098, 0, sp28); - Animation_DrawSkeleton(1, D_MA_602F264, sp28, func_i5_801A5124, NULL, actor, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_MA_602F264, sp28, Macbeth_801A5124, NULL, actor, &gIdentityMatrix); Matrix_Pop(&gGfxMatrix); RCP_SetupDL(&gMasterDisp, 0x1D); } -s32 func_i5_801A55D4(s32 arg0, Vec3f* arg1, Vec3f* arg2, s32 arg3) { +s32 Macbeth_801A55D4(s32 arg0, Vec3f* arg1, Vec3f* arg2, s32 arg3) { Object_80* obj80; Actor* actor; s32 i; @@ -3122,7 +3121,7 @@ s32 func_i5_801A55D4(s32 arg0, Vec3f* arg1, Vec3f* arg2, s32 arg3) { for (i = 0; i < 50; i++, obj80++) { if ((obj80->obj.status == OBJ_ACTIVE) && (obj80->obj.id != OBJ_80_68) && (fabsf(arg1->x - obj80->obj.pos.x) < 2000.0f) && (fabsf(arg1->z - obj80->obj.pos.z) < 2000.0f) && - (func_80062DBC(arg1, obj80->info.hitbox, &obj80->obj, 0.0f, 0.0f, 0.0f) != 0)) { + (func_enmy_80062DBC(arg1, obj80->info.hitbox, &obj80->obj, 0.0f, 0.0f, 0.0f) != 0)) { return i + 10; } } @@ -3131,7 +3130,7 @@ s32 func_i5_801A55D4(s32 arg0, Vec3f* arg1, Vec3f* arg2, s32 arg3) { for (i = 0; i < 60; i++, actor++) { if ((actor->obj.status >= OBJ_ACTIVE) && (fabsf(arg1->x - actor->obj.pos.x) < 1000.0f) && (fabsf(arg1->z - actor->obj.pos.z) < 1500.0f) && (arg0 != i) && (actor->info.unk_16 != 2) && - (actor->timer_0C2 == 0) && (func_800631A8(arg1, actor->info.hitbox, &actor->obj.pos) != 0)) { + (actor->timer_0C2 == 0) && (func_enmy_800631A8(arg1, actor->info.hitbox, &actor->obj.pos) != 0)) { actor->unk_0D0 = 1; actor->unk_0D2 = -1; actor->unk_0D8.x = arg1->x; @@ -3143,7 +3142,7 @@ s32 func_i5_801A55D4(s32 arg0, Vec3f* arg1, Vec3f* arg2, s32 arg3) { return 0; } -void func_i5_801A57D0(Effect* effect) { +void Macbeth_801A57D0(Effect* effect) { u8 i; Vec3f sp50; Vec3f sp44; @@ -3157,7 +3156,7 @@ void func_i5_801A57D0(Effect* effect) { effect->obj.rot.z = 0.0f; if (effect->timer_50 == 96) { for (i = 0; i < 2; i++) { - func_8007BC7C(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 6.0f); + func_effect_8007BC7C(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 6.0f); } } if ((fabsf(gPlayer[0].unk_138 - effect->obj.pos.z) < 50.0f) && @@ -3184,7 +3183,7 @@ void func_i5_801A57D0(Effect* effect) { } if (effect->obj.pos.y < gGroundLevel) { - func_i5_801ADCEC(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 999.9f, -10.0f, 5.0f); + Macbeth_801ADCEC(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 999.9f, -10.0f, 5.0f); Object_Kill(&effect->obj, effect->sfxSource); if (D_80161A88 != 2) { effect->obj.pos.y = gGroundLevel; @@ -3193,19 +3192,19 @@ void func_i5_801A57D0(Effect* effect) { sp38.x = effect->vel.x; sp38.y = effect->vel.y; sp38.z = effect->vel.z; - if (func_i5_801A55D4(1000, &effect->obj.pos, &sp38, 0) != 0) { - func_i5_801ADCEC(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 999.9f, -10.0f, 5.0f); + if (Macbeth_801A55D4(1000, &effect->obj.pos, &sp38, 0) != 0) { + Macbeth_801ADCEC(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 999.9f, -10.0f, 5.0f); Object_Kill(&effect->obj, effect->sfxSource); } } -void func_i5_801A5AF0(Effect* effect) { +void Macbeth_801A5AF0(Effect* effect) { RCP_SetupDL(&gMasterDisp, 0x3C); gSPDisplayList(gMasterDisp++, D_MA_601A840); RCP_SetupDL(&gMasterDisp, 0x40); } -void func_i5_801A5B4C(Effect* effect) { +void Macbeth_801A5B4C(Effect* effect) { if ((gPlayer[0].unk_138 - effect->obj.pos.z) < -2000.0f) { Object_Kill(&effect->obj, effect->sfxSource); } @@ -3239,7 +3238,7 @@ void func_i5_801A5B4C(Effect* effect) { } } -void func_i5_801A5D68(Effect* effect) { +void Macbeth_801A5D68(Effect* effect) { RCP_SetupDL(&gMasterDisp, 0x43); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 112, 255, 243, effect->unk_44); gDPSetEnvColor(gMasterDisp++, 255, 255, 255, effect->unk_44); @@ -3248,14 +3247,14 @@ void func_i5_801A5D68(Effect* effect) { RCP_SetupDL(&gMasterDisp, 0x40); } -void func_i5_801A5E2C(Actor* actor) { +void Macbeth_801A5E2C(Actor* actor) { actor->fwork[0] = actor->obj.pos.x; actor->fwork[1] = actor->obj.pos.y; actor->fwork[2] = actor->obj.rot.z; actor->obj.rot.z = 0.0f; } -void func_i5_801A5E54(Actor* actor) { +void Macbeth_801A5E54(Actor* actor) { if ((gPlayer[0].unk_138 - actor->obj.pos.z) < -500.0f) { Object_Kill(&actor->obj, actor->sfxSource); } @@ -3272,14 +3271,14 @@ void func_i5_801A5E54(Actor* actor) { } } -void func_i5_801A5F90(Actor* actor) { +void Macbeth_801A5F90(Actor* actor) { gSPDisplayList(gMasterDisp++, D_MA_60251A0); } -void func_i5_801A5FC4(s32 arg0) { +void Macbeth_801A5FC4(s32 arg0) { } -void func_i5_801A5FD0(Actor* actor) { +void Macbeth_801A5FD0(Actor* actor) { if (gPlayer[0].unk_138 - actor->obj.pos.z < -500.0f) { Object_Kill(&actor->obj, actor->sfxSource); } @@ -3296,15 +3295,15 @@ void func_i5_801A5FD0(Actor* actor) { } } -void func_i5_801A6100(Actor* actor) { +void Macbeth_801A6100(Actor* actor) { gSPDisplayList(gMasterDisp++, D_MA_6025850); } -void func_i5_801A6134(Actor* actor) { +void Macbeth_801A6134(Actor* actor) { actor->health = 30; } -void func_i5_801A6144(Actor* actor) { +void Macbeth_801A6144(Actor* actor) { s16 i; if ((gPlayer[0].unk_138 - actor->obj.pos.z) < -500.0f) { @@ -3314,8 +3313,8 @@ void func_i5_801A6144(Actor* actor) { switch (actor->state) { case 0: if (actor->unk_0D0 != 0) { - func_8007C120(actor->obj.pos.x, actor->obj.pos.y + 100.0f, actor->obj.pos.z, actor->vel.x, actor->vel.y, - actor->vel.z, 0.15f, 20); + func_effect_8007C120(actor->obj.pos.x, actor->obj.pos.y + 100.0f, actor->obj.pos.z, actor->vel.x, + actor->vel.y, actor->vel.z, 0.15f, 20); AUDIO_PLAY_SFX(0x2903300E, actor->sfxSource, 4); actor->health -= actor->damage; actor->timer_0C6 = 15; @@ -3324,10 +3323,10 @@ void func_i5_801A6144(Actor* actor) { } if (actor->health <= 0) { AUDIO_PLAY_SFX(0x2903B009, actor->sfxSource, 0); - func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 100.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, - 14.0f, 5); + func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 100.0f, actor->obj.pos.z, 0.0f, 0.0f, + 0.0f, 14.0f, 5); for (i = 0; i < 20; i++) { - func_i5_801AD624(RAND_FLOAT_CENTERED(500.0f) + actor->obj.pos.x, actor->obj.pos.y + 100.0f, + Macbeth_801AD624(RAND_FLOAT_CENTERED(500.0f) + actor->obj.pos.x, actor->obj.pos.y + 100.0f, RAND_FLOAT(150.0f) + actor->obj.pos.z, RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT(7.0f) + 7.0f, RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(30.0f), @@ -3349,7 +3348,7 @@ void func_i5_801A6144(Actor* actor) { } } -void func_i5_801A6540(Actor* actor) { +void Macbeth_801A6540(Actor* actor) { RCP_SetupDL(&gMasterDisp, 0x39); if (actor->timer_0C6 & 1) { RCP_SetupDL(&gMasterDisp, 0x3A); @@ -3359,16 +3358,16 @@ void func_i5_801A6540(Actor* actor) { RCP_SetupDL(&gMasterDisp, 0x1D); } -void func_i5_801A65E0(Object_80* obj80) { +void Macbeth_801A65E0(Object_80* obj80) { obj80->vel.x = obj80->obj.pos.x; obj80->vel.y = obj80->obj.pos.y; obj80->vel.z = obj80->obj.rot.z; obj80->obj.rot.z = 0.0f; } -void func_i5_801A6608(Object_80* obj80) { +void Macbeth_801A6608(Object_80* obj80) { if ((gPlayer[0].unk_138 - obj80->obj.pos.z) < obj80->vel.z) { - if (D_80177854 != 100) { + if (D_ctx_80177854 != 100) { Math_SmoothStepToF(&obj80->vel.x, 30, 0.5f, 30.0f, 0.0f); if (obj80->vel.x < 31.0f) { obj80->vel.x = 255.0f; @@ -3382,10 +3381,10 @@ void func_i5_801A6608(Object_80* obj80) { gSPDisplayList(gMasterDisp++, D_MA_601F270); } -void func_i5_801A67BC(s32 arg0) { +void Macbeth_801A67BC(s32 arg0) { } -void func_i5_801A67C8(Actor* actor) { +void Macbeth_801A67C8(Actor* actor) { if ((gPlayer[0].unk_138 - actor->obj.pos.z) < -300.0f) { Object_Kill(&actor->obj, actor->sfxSource); } @@ -3397,16 +3396,16 @@ void func_i5_801A67C8(Actor* actor) { actor->iwork[4] = -1; } - func_i5_8019D670(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, + Macbeth_8019D670(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, (RAND_FLOAT(2.0f) + 20.0f) * actor->iwork[4], 0.0f, actor->iwork[4] * -34.0f, 0.0f, 2, 3); Object_Kill(&actor->obj, actor->sfxSource); } } -void func_i5_801A68EC(Actor* actor) { +void Macbeth_801A68EC(Actor* actor) { } -void func_i5_801A68F8(Actor* actor, s16 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7) { +void Macbeth_801A68F8(Actor* actor, s16 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7) { gTexturedLines[arg1].mode = 3; gTexturedLines[arg1].unk_04.x = arg2; gTexturedLines[arg1].unk_04.y = arg3; @@ -3420,7 +3419,7 @@ void func_i5_801A68F8(Actor* actor, s16 arg1, f32 arg2, f32 arg3, f32 arg4, f32 gTexturedLines[arg1].unk_10.z = arg7; } -void func_i5_801A6984(Actor* actor) { +void Macbeth_801A6984(Actor* actor) { s16 var_s3; Vec3f test; f32 temp_fs3; @@ -3472,18 +3471,18 @@ void func_i5_801A6984(Actor* actor) { temp_fs2_2 = actor->obj.pos.x + (sp88 * i); temp_fs3_2 = actor->obj.pos.y + (sp84 * i) + temp; temp_fs4 = actor->obj.pos.z + (sp80 * i); - func_i5_801A68F8(actor, var_s3++, var_fs5, spA0, sp9C, temp_fs2_2, temp_fs3_2, temp_fs4); + Macbeth_801A68F8(actor, var_s3++, var_fs5, spA0, sp9C, temp_fs2_2, temp_fs3_2, temp_fs4); var_fs5 = temp_fs2_2; spA0 = temp_fs3_2; sp9C = temp_fs4; } - func_i5_80199D88(D_MA_6012C98, 4, 8); + Macbeth_80199D88(D_MA_6012C98, 4, 8); } -void func_i5_801A6C78(Actor* actor) { +void Macbeth_801A6C78(Actor* actor) { // FAKE if (1) {} - func_i5_801A0308(actor, actor->obj.pos.z, actor->obj.rot.y, 0); + Macbeth_801A0308(actor, actor->obj.pos.z, actor->obj.rot.y, 0); switch (D_i5_801BE320[0]) { case 0: Math_SmoothStepToF(&D_i5_801BE368[0], 30.0f, 0.1f, RAND_FLOAT(1.0f) + 1.0f, 0.01f); @@ -3530,10 +3529,10 @@ void func_i5_801A6C78(Actor* actor) { Math_SmoothStepToF(&actor->obj.pos.z, 1200.0f + D_i5_801BE368[6], 0.2f, 30.0f, 0.01f); } -void func_i5_801A6FB4(Actor* actor) { +void Macbeth_801A6FB4(Actor* actor) { // FAKE if (1) {} - func_i5_801A0308(actor, actor->obj.pos.z, actor->obj.rot.y, 0); + Macbeth_801A0308(actor, actor->obj.pos.z, actor->obj.rot.y, 0); switch (D_i5_801BE320[0]) { case 0: Math_SmoothStepToF(&D_i5_801BE368[0], 20.0f, 0.1f, RAND_FLOAT(1.0f) + 1.0f, 0.01f); @@ -3576,8 +3575,8 @@ void func_i5_801A6FB4(Actor* actor) { Math_SmoothStepToF(&actor->obj.pos.z, 1200.0f + D_i5_801BE368[6], 0.2f, 30.0f, 0.01f); } -void func_i5_801A72DC(Actor* actor) { - func_i5_801A0308(actor, actor->obj.pos.z, actor->obj.rot.y, 0); +void Macbeth_801A72DC(Actor* actor) { + Macbeth_801A0308(actor, actor->obj.pos.z, actor->obj.rot.y, 0); switch (D_i5_801BE320[0]) { case 0: Math_SmoothStepToF(&D_i5_801BE368[0], 5.0f, 0.1f, RAND_FLOAT(1.0f) + 0.3f, 0.01f); @@ -3599,8 +3598,8 @@ void func_i5_801A72DC(Actor* actor) { Math_SmoothStepToF(&actor->obj.pos.z, 1200.0f + D_i5_801BE368[6], 0.2f, 30.0f, 0.01f); } -void func_i5_801A74C4(Actor* actor) { - func_i5_801A0308(actor, actor->obj.pos.z, actor->obj.rot.y, 0); +void Macbeth_801A74C4(Actor* actor) { + Macbeth_801A0308(actor, actor->obj.pos.z, actor->obj.rot.y, 0); switch (D_i5_801BE320[0]) { case 0: Math_SmoothStepToF(&D_i5_801BE368[0], 22.0f, 0.1f, RAND_FLOAT(1.0f) + 1.0f, 0.01f); @@ -3659,8 +3658,8 @@ void func_i5_801A74C4(Actor* actor) { Math_SmoothStepToF(&actor->obj.pos.z, 1200.0f + D_i5_801BE368[6], 0.2f, 30.0f, 0.01f); } -void func_i5_801A78B0(Actor* actor) { - func_i5_801A0308(actor, actor->obj.pos.z, actor->obj.rot.y, 0); +void Macbeth_801A78B0(Actor* actor) { + Macbeth_801A0308(actor, actor->obj.pos.z, actor->obj.rot.y, 0); switch (D_i5_801BE320[0]) { case 0: Math_SmoothStepToF(&D_i5_801BE368[0], 10.0f, 0.1f, RAND_FLOAT(1.0f) + 1.0f, 0.01f); @@ -3681,8 +3680,8 @@ void func_i5_801A78B0(Actor* actor) { Math_SmoothStepToF(&actor->obj.pos.x, actor->fwork[19] + D_i5_801BE368[1], 0.1f, 10.0f, 0.01f); } -void func_i5_801A7A30(Actor* actor) { - func_i5_801A0308(actor, actor->obj.pos.z, actor->obj.rot.y, 0); +void Macbeth_801A7A30(Actor* actor) { + Macbeth_801A0308(actor, actor->obj.pos.z, actor->obj.rot.y, 0); switch (D_i5_801BE320[0]) { case 0: Math_SmoothStepToF(&D_i5_801BE368[0], 30.0f, 0.1f, RAND_FLOAT(1.0f) + 1.0f, 0.01f); @@ -3728,7 +3727,7 @@ void func_i5_801A7A30(Actor* actor) { actor->obj.pos.z = 1200.0f + D_i5_801BE368[6]; } -void func_i5_801A7CAC(Actor* actor) { +void Macbeth_801A7CAC(Actor* actor) { f32 temp_fa0; f32 temp_fa1; f32 sp34; @@ -3744,10 +3743,10 @@ void func_i5_801A7CAC(Actor* actor) { Math_SmoothStepToAngle(&actor->obj.rot.x, Math_RadToDeg(sp34), 0.1f, 20.0f, 0.01f); } -void func_i5_801A7D98(Actor* actor) { +void Macbeth_801A7D98(Actor* actor) { u8 i; - func_i5_80199F8C(actor); + Macbeth_80199F8C(actor); // clang-format off for (i = 0; i < 35; i++) { D_i5_801BE320[i] = 0; } for (i = 0; i < 50; i++) { D_i5_801BE368[i] = 0.0f; } @@ -3755,7 +3754,7 @@ void func_i5_801A7D98(Actor* actor) { D_i5_801BE320[29] = 250; D_i5_801BE320[9] = 200; D_i5_801BE320[10] = 250; - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_800CBF34); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_edata_800CBF34); D_i5_801BE320[14] = 0; D_i5_801BE320[15] = 0; gBossFrameCount = 0; @@ -3764,7 +3763,7 @@ void func_i5_801A7D98(Actor* actor) { static Vec3f D_i5_801BA744 = { 0.0f, 0.0f, 0.0f }; static Vec3f D_i5_801BA750 = { 0.0f, 0.0f, 30.0f }; -void func_i5_801A7E7C(Actor* actor) { +void Macbeth_801A7E7C(Actor* actor) { s32 pad; f32 temp; f32 sp374; @@ -3785,33 +3784,33 @@ void func_i5_801A7E7C(Actor* actor) { switch (actor->state) { case 0: - func_i5_8019A198(actor); - func_i5_801A015C(actor); + Macbeth_8019A198(actor); + Macbeth_801A015C(actor); actor->obj.pos.y += 250.0f; D_i5_801BE320[3] = 0; - func_i5_8019A830(actor); - func_i5_8019A728(actor); + Macbeth_8019A830(actor); + Macbeth_8019A728(actor); if (actor->iwork[1] != 0) { AUDIO_PLAY_BGM(SEQ_ID_32 | 0x8000); actor->state = 1; } - func_i5_801A6984(actor); + Macbeth_801A6984(actor); break; case 1: - func_i5_8019A198(actor); - func_i5_801A015C(actor); + Macbeth_8019A198(actor); + Macbeth_801A015C(actor); actor->obj.pos.y += 250.0f; D_i5_801BE320[3]++; if (D_i5_801BE320[3] >= 20) { actor->timer_0BC = 20; actor->state = 2; } - func_i5_8019A830(actor); - func_i5_801A6984(actor); + Macbeth_8019A830(actor); + Macbeth_801A6984(actor); break; case 2: - func_i5_8019A198(actor); - func_i5_801A0308(actor, actor->obj.pos.z, actor->obj.rot.y, 0); + Macbeth_8019A198(actor); + Macbeth_801A0308(actor, actor->obj.pos.z, actor->obj.rot.y, 0); if (actor->timer_0BC == 0) { Math_SmoothStepToF(&actor->obj.pos.y, actor->fwork[5] + 500.0f, 0.5f, 5.0f, 5.0f); D_i5_801BE320[5] = 1; @@ -3822,11 +3821,11 @@ void func_i5_801A7E7C(Actor* actor) { actor->state = 3; } } - func_i5_8019A830(actor); - func_i5_801A6984(actor); + Macbeth_8019A830(actor); + Macbeth_801A6984(actor); break; case 3: - func_i5_8019A198(actor); + Macbeth_8019A198(actor); if (actor->timer_0BC == 0) { actor->obj.pos.z -= 2.0f; if (D_i5_801BE320[3] < 70) { @@ -3849,19 +3848,19 @@ void func_i5_801A7E7C(Actor* actor) { actor->state = 4; } } - func_i5_8019A830(actor); - func_i5_801A6984(actor); + Macbeth_8019A830(actor); + Macbeth_801A6984(actor); break; case 4: Math_SmoothStepToAngle(&actor->obj.rot.z, 0.0f, 0.1f, 20.0f, 0.01f); - func_i5_8019A198(actor); + Macbeth_8019A198(actor); D_i5_801BE320[3]++; if (D_i5_801BE320[3] >= 60) { D_i5_801BE320[3] = 0; } - func_i5_801A6C78(actor); - func_i5_801A6984(actor); - func_i5_801A7CAC(actor); + Macbeth_801A6C78(actor); + Macbeth_801A6984(actor); + Macbeth_801A7CAC(actor); if ((D_i5_801BE320[16] != 0) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3)) { var_v1 = 0xFF; if (D_i5_801BE320[18] == 2) { @@ -3936,8 +3935,8 @@ void func_i5_801A7E7C(Actor* actor) { } break; case 5: - func_i5_8019A198(actor); - func_i5_801A0308(actor, actor->obj.pos.z, actor->obj.rot.y, 0); + Macbeth_8019A198(actor); + Macbeth_801A0308(actor, actor->obj.pos.z, actor->obj.rot.y, 0); Math_SmoothStepToF(&actor->obj.pos.x, gPlayer[0].pos.x, 0.1f, 10.0f, 0.01f); Math_SmoothStepToF(&actor->obj.pos.z, gPlayer[0].unk_138 - 1500.0f, 0.1f, 20.0f, 0.01f); Math_SmoothStepToF(&actor->obj.pos.y, @@ -3948,17 +3947,17 @@ void func_i5_801A7E7C(Actor* actor) { actor->timer_0BC = 0; actor->state = 6; } - func_i5_801A7CAC(actor); - func_i5_801A6984(actor); + Macbeth_801A7CAC(actor); + Macbeth_801A6984(actor); break; case 6: - func_i5_8019A198(actor); + Macbeth_8019A198(actor); if (actor->timer_0BC <= 0) { actor->state = 7; } D_i5_801BE368[9] = gPlayer[0].pos.x; - func_i5_801A7CAC(actor); - func_i5_801A6984(actor); + Macbeth_801A7CAC(actor); + Macbeth_801A6984(actor); break; case 7: if ((gPlayer[0].unk_138 - actor->obj.pos.z) < 1200.0f) { @@ -3969,7 +3968,7 @@ void func_i5_801A7E7C(Actor* actor) { AUDIO_PLAY_SFX(0x2902405E, actor->sfxSource, 4); } } else { - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_800CBF34); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_edata_800CBF34); if ((gPlayer[0].pos.y + 1200.0f) < actor->obj.pos.y) { actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_603677C); D_i5_801BE320[3] = 0; @@ -3998,7 +3997,7 @@ void func_i5_801A7E7C(Actor* actor) { break; } if (var_fv0 < (gPlayer[0].unk_138 - actor->obj.pos.z)) { - func_i5_801A7CAC(actor); + Macbeth_801A7CAC(actor); D_i5_801BE368[9] = gPlayer[0].pos.x; } Math_SmoothStepToF(&actor->obj.pos.x, D_i5_801BE368[9], 0.2f, 30.0f, 0.01f); @@ -4009,15 +4008,15 @@ void func_i5_801A7E7C(Actor* actor) { } Math_SmoothStepToF(&actor->obj.pos.z, gPlayer[0].unk_138 - 100.0f, 0.3f, 60.0f, 0.01f); Math_SmoothStepToF(&actor->obj.rot.x, 0.0f, 0.2f, 20.0f, 0.01f); - func_i5_801A6984(actor); + Macbeth_801A6984(actor); break; case 8: - func_i5_8019A198(actor); + Macbeth_8019A198(actor); if (!(gGameFrameCount & 0xF)) { AUDIO_PLAY_SFX(0x29036099, actor->sfxSource, 4); } - func_i5_801A74C4(actor); - func_i5_801A6984(actor); + Macbeth_801A74C4(actor); + Macbeth_801A6984(actor); if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_MA_6017714) - 1)) { D_i5_801BE320[3] = (s16) (D_i5_801BE320[3] + 1); } else { @@ -4044,11 +4043,11 @@ void func_i5_801A7E7C(Actor* actor) { if (D_i5_801BE320[29] <= 0) { SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1); - D_80178348 = D_80178350 = D_80178354 = D_80178340 = 255; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = D_ctx_80178340 = 255; AUDIO_PLAY_SFX(0x2940D09A, actor->sfxSource, 4); Radio_PlayMessage(gMsg_ID_17450, RCID_BOSS_MACBETH); - func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); - func_i5_801AD624(actor->vwork[2].x, actor->vwork[2].y, actor->vwork[2].z, + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); + Macbeth_801AD624(actor->vwork[2].x, actor->vwork[2].y, actor->vwork[2].z, RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT(7.0f) + 7.0f, -2.0f, RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), @@ -4106,7 +4105,7 @@ void func_i5_801A7E7C(Actor* actor) { case 9: if (D_i5_801BE368[6] < actor->obj.pos.z) { D_i5_801BE320[1] = 1; - func_i5_801A6984(actor); + Macbeth_801A6984(actor); } if ((actor->obj.pos.z - D_i5_801BE368[6]) < 500) { Math_SmoothStepToF(&actor->obj.pos.x, D_i5_801BE368[4], 0.1f, 10.0f, 1.0f); @@ -4119,12 +4118,12 @@ void func_i5_801A7E7C(Actor* actor) { actor->obj.rot.x += 10.0f; actor->obj.rot.z += 10.0f; if (!(gGameFrameCount & 7)) { - func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); - func_8007C688(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 5.0f, 8); + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); + func_effect_8007C688(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 5.0f, 8); } if ((actor->obj.pos.z <= D_i5_801BE368[6]) && (actor->obj.pos.y <= D_i5_801BE368[5])) { D_i5_801BE320[23] = 1; - D_8017796C = -1; + D_ctx_8017796C = -1; actor->state = 10; actor->timer_0BC = 50; } @@ -4136,9 +4135,9 @@ void func_i5_801A7E7C(Actor* actor) { Math_SmoothStepToAngle(&actor->obj.rot.y, 0.0f, 0.1f, 20.0f, 0.01f); Math_SmoothStepToAngle(&actor->obj.rot.x, 0.0f, 0.1f, 20.0f, 0.01f); Math_SmoothStepToAngle(&actor->obj.rot.z, 0.0f, 0.1f, 20.0f, 0.01f); - func_i5_8019A198(actor); - func_i5_801A6FB4(actor); - func_i5_801A6984(actor); + Macbeth_8019A198(actor); + Macbeth_801A6FB4(actor); + Macbeth_801A6984(actor); if (actor->timer_0BC == 0) { if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_MA_6016B2C) - 1)) { D_i5_801BE320[3]++; @@ -4166,7 +4165,7 @@ void func_i5_801A7E7C(Actor* actor) { break; } if (!(var_v0 & gGameFrameCount)) { - func_i5_801ADCEC(actor->obj.pos.x, actor->obj.pos.y - 90.0f, actor->obj.pos.z - 50.0f, + Macbeth_801ADCEC(actor->obj.pos.x, actor->obj.pos.y - 90.0f, actor->obj.pos.z - 50.0f, D_i5_801BE368[0] * 0.8f, -10.0f, 8.0f); D_i5_801BE320[11]++; if (D_i5_801BE320[11] >= var_s0) { @@ -4210,9 +4209,9 @@ void func_i5_801A7E7C(Actor* actor) { } else { D_i5_801BE320[3] = 0; } - func_i5_8019A198(actor); - func_i5_801A72DC(actor); - func_i5_801A6984(actor); + Macbeth_8019A198(actor); + Macbeth_801A72DC(actor); + Macbeth_801A6984(actor); if (D_i5_801BE320[9] <= 0) { Audio_KillSfxBySourceAndId(actor->sfxSource, 0x19022067); actor->state = 14; @@ -4224,11 +4223,11 @@ void func_i5_801A7E7C(Actor* actor) { if (actor->timer_0BC > 15) { for (i = 0; i < 2; i++) { D_i5_801BE368[23] = 3.0f; - func_i5_801AE800(actor->vwork[2].x + RAND_FLOAT_CENTERED(400.0f), + Macbeth_801AE800(actor->vwork[2].x + RAND_FLOAT_CENTERED(400.0f), actor->vwork[2].y + RAND_FLOAT_CENTERED(400.0f), actor->vwork[2].z + 50.0f, actor->vwork[2].x - 200.0f, actor->vwork[2].y, actor->vwork[2].z); D_i5_801BE368[23] = 4.0f; - func_i5_801AE800(actor->vwork[4].x + RAND_FLOAT_CENTERED(400.0f), + Macbeth_801AE800(actor->vwork[4].x + RAND_FLOAT_CENTERED(400.0f), actor->vwork[4].y + RAND_FLOAT_CENTERED(400.0f), actor->vwork[4].z + 50.0f, actor->vwork[4].x + 200.0f, actor->vwork[4].y, actor->vwork[4].z); } @@ -4250,9 +4249,9 @@ void func_i5_801A7E7C(Actor* actor) { if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_MA_6016040) - 1)) { D_i5_801BE320[3]++; } - func_i5_8019A198(actor); - func_i5_801A72DC(actor); - func_i5_801A6984(actor); + Macbeth_8019A198(actor); + Macbeth_801A72DC(actor); + Macbeth_801A6984(actor); D_i5_801BE320[5] = 0; D_i5_801BE320[7] = 0; if (actor->timer_0BC == 60) { @@ -4261,13 +4260,13 @@ void func_i5_801A7E7C(Actor* actor) { spC6 = RAND_INT(5.0f); for (i = 0; i < 10; i++) { - func_i5_801AE610(actor->vwork[0].x, actor->vwork[0].y + 100.0f, actor->vwork[0].z, + Macbeth_801AE610(actor->vwork[0].x, actor->vwork[0].y + 100.0f, actor->vwork[0].z, RAND_FLOAT_CENTERED(35.0f), RAND_FLOAT(80) + 90.0f, RAND_RANGE(-72.0f, 8.0f), spC6); } for (i = 0; i < 20; i++) { - func_i5_801AD624(actor->vwork[0].x, actor->vwork[0].y + 50.0f + RAND_FLOAT(50.0f), + Macbeth_801AD624(actor->vwork[0].x, actor->vwork[0].y + 50.0f + RAND_FLOAT(50.0f), actor->vwork[0].z, RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT(5.0f), actor->vel.z + 2.0f, RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), @@ -4285,9 +4284,9 @@ void func_i5_801A7E7C(Actor* actor) { if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_MA_6016040) - 1)) { D_i5_801BE320[3]++; } - func_i5_8019A198(actor); + Macbeth_8019A198(actor); actor->vel.y += 1.0f; - func_i5_801A6984(actor); + Macbeth_801A6984(actor); D_i5_801BE320[6] = 1; D_i5_801BE320[8] = 1; if (actor->timer_0BC == 0) { @@ -4309,8 +4308,8 @@ void func_i5_801A7E7C(Actor* actor) { if (D_i5_801BE320[3] < 15) { D_i5_801BE320[3]++; } - func_i5_8019A198(actor); - func_i5_801A6984(actor); + Macbeth_8019A198(actor); + Macbeth_801A6984(actor); if (actor->timer_0BC < 100) { if (actor->timer_0BC == 98) { AUDIO_PLAY_SFX(0x19022069, actor->sfxSource, 4); @@ -4321,10 +4320,10 @@ void func_i5_801A7E7C(Actor* actor) { sp360.z = RAND_FLOAT(200.0f) + 100.0f; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp360, &sp354); D_i5_801BE368[23] = 1.0f; - func_i5_801AE800(actor->vwork[2].x + sp354.x - 50.0f, actor->vwork[2].y + sp354.y + 100.0f, + Macbeth_801AE800(actor->vwork[2].x + sp354.x - 50.0f, actor->vwork[2].y + sp354.y + 100.0f, actor->vwork[2].z + sp354.z, actor->vwork[2].x, actor->vwork[2].y, actor->vwork[2].z); D_i5_801BE368[23] = 2.0f; - func_i5_801AE800(actor->vwork[4].x + sp354.x + 50.0f, actor->vwork[4].y + sp354.y + 100.0f, + Macbeth_801AE800(actor->vwork[4].x + sp354.x + 50.0f, actor->vwork[4].y + sp354.y + 100.0f, actor->vwork[4].z + sp354.z, actor->vwork[4].x, actor->vwork[4].y, actor->vwork[4].z); } if (actor->timer_0BC == 0) { @@ -4357,8 +4356,8 @@ void func_i5_801A7E7C(Actor* actor) { if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_MA_6015C24) - 1)) { D_i5_801BE320[3]++; } - func_i5_8019A198(actor); - func_i5_801A6984(actor); + Macbeth_8019A198(actor); + Macbeth_801A6984(actor); if (actor->timer_0BC < (D_i5_801BE320[27] - 40)) { if ((actor->timer_0BC + 42) == D_i5_801BE320[27]) { @@ -4400,7 +4399,7 @@ void func_i5_801A7E7C(Actor* actor) { sp330.x = actor->vwork[3].x; sp330.y = actor->vwork[3].y; sp330.z = actor->vwork[3].z; - func_8007EE68(OBJ_EFFECT_380, &sp348, &sp33C, &sp330, &D_i5_801BA750, 5.0f); + func_effect_8007EE68(OBJ_EFFECT_380, &sp348, &sp33C, &sp330, &D_i5_801BA750, 5.0f); sp348.x = actor->vwork[7].x - actor->vwork[4].x; sp348.y = actor->vwork[7].y - actor->vwork[4].y + 25.0f; sp348.z = actor->vwork[7].z - actor->vwork[4].z; @@ -4424,11 +4423,11 @@ void func_i5_801A7E7C(Actor* actor) { sp330.x = actor->vwork[5].x; sp330.y = actor->vwork[5].y; sp330.z = actor->vwork[5].z; - func_8007EE68(OBJ_EFFECT_380, &sp348, &sp33C, &sp330, &D_i5_801BA750, 10.0f); + func_effect_8007EE68(OBJ_EFFECT_380, &sp348, &sp33C, &sp330, &D_i5_801BA750, 10.0f); } } if (actor->timer_0BC < (D_i5_801BE320[27] - 50)) { - func_i5_801A78B0(actor); + Macbeth_801A78B0(actor); } if (actor->timer_0BC == 0) { Audio_KillSfxBySourceAndId(actor->sfxSource, 0x19006035); @@ -4441,8 +4440,8 @@ void func_i5_801A7E7C(Actor* actor) { } break; case 18: - func_i5_8019A198(actor); - func_i5_801A0308(actor, actor->obj.pos.z, actor->obj.rot.y, 0); + Macbeth_8019A198(actor); + Macbeth_801A0308(actor, actor->obj.pos.z, actor->obj.rot.y, 0); Math_SmoothStepToF(&actor->obj.pos.x, gPlayer[0].pos.x, 0.1f, 10.0f, 0.01f); Math_SmoothStepToF(&actor->obj.pos.z, gPlayer[0].unk_138 - 1200.0f, 0.1f, 35.0f, 0.01f); Math_SmoothStepToF(&actor->obj.pos.y, actor->fwork[5] + 600.0f + D_i5_801BE368[3], 0.1f, 20.0f, 10.0f); @@ -4453,12 +4452,12 @@ void func_i5_801A7E7C(Actor* actor) { actor->timer_0BC = 0; actor->state = 19; } - func_i5_801A7CAC(actor); - func_i5_801A6984(actor); + Macbeth_801A7CAC(actor); + Macbeth_801A6984(actor); break; case 19: actor->vel.z = gPlayer[0].vel.z; - func_i5_801A7CAC(actor); + Macbeth_801A7CAC(actor); D_i5_801BE368[4] += D_i5_801BE368[32]; D_i5_801BE368[5] += D_i5_801BE368[33]; D_i5_801BE368[6] += D_i5_801BE368[34]; @@ -4472,33 +4471,33 @@ void func_i5_801A7E7C(Actor* actor) { gPlayer[0].shields = 0; } if (!(gGameFrameCount & 0xF)) { - func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); } D_i5_801BE368[9] = gPlayer[0].pos.x; Math_SmoothStepToF(&actor->obj.pos.x, D_i5_801BE368[9], 0.2f, 35.0f, 0.01f); Math_SmoothStepToF(&actor->obj.pos.y, gPlayer[0].pos.y, 0.3f, 15.0f, 0.01f); Math_SmoothStepToF(&actor->obj.pos.z, gPlayer[0].unk_138, 0.3f, 20.0f, 0.01f); Math_SmoothStepToF(&actor->obj.rot.x, 60.0f, 0.2f, 20.0f, 0.01f); - func_i5_801A6984(actor); + Macbeth_801A6984(actor); break; case 20: Math_SmoothStepToF(&actor->obj.rot.z, 0.0f, 0.1f, 20.0f, 0.01f); - func_i5_8019A198(actor); + Macbeth_8019A198(actor); actor->vel.z = gActors[D_i5_801BE314].vel.z; D_i5_801BE320[3]++; if (D_i5_801BE320[3] >= 60) { D_i5_801BE320[3] = 0; } - func_i5_801A7A30(actor); - func_i5_801A6984(actor); + Macbeth_801A7A30(actor); + Macbeth_801A6984(actor); Math_SmoothStepToF(&actor->obj.rot.y, 0.0f, 0.1f, 20.0f, 0.01f); if (actor->obj.pos.z < -135200.0f) { BonusText_Display(actor->obj.pos.x, actor->obj.pos.y + sp374, actor->obj.pos.z, 50); if (1) {} gHitCount += 51; - D_80177850 = 15; - func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 20.0f); - func_i5_801AD624(actor->vwork[2].x, actor->vwork[2].y, actor->vwork[2].z, RAND_FLOAT_CENTERED(10.0f), + D_ctx_80177850 = 15; + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 20.0f); + Macbeth_801AD624(actor->vwork[2].x, actor->vwork[2].y, actor->vwork[2].z, RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT(7.0f) + 7.0f, 2.0f, RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT_CENTERED(10.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), 11, 1.0f); @@ -4520,22 +4519,22 @@ void func_i5_801A7E7C(Actor* actor) { AUDIO_PLAY_SFX(0x2903300E, actor->sfxSource, 4); actor->iwork[7] = 15; D_i5_801BE320[9] -= actor->damage; - func_i5_801AD624(actor->obj.pos.x, actor->obj.pos.y + 80, actor->obj.pos.z + 50.0f, + Macbeth_801AD624(actor->obj.pos.x, actor->obj.pos.y + 80, actor->obj.pos.z + 50.0f, RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT(5.0f), RAND_FLOAT_CENTERED(3.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), 3, RAND_FLOAT(1.0f)); if (D_i5_801BE320[9] <= 0) { AUDIO_PLAY_SFX(0x2903B009, actor->sfxSource, 4); - func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 80.0f, actor->obj.pos.z + 50.0f, 5.0f); + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 80.0f, actor->obj.pos.z + 50.0f, 5.0f); for (i = 0; i < 2; i++) { - func_i5_801AD624(actor->obj.pos.x, actor->obj.pos.y + 80.0f, actor->obj.pos.z + 50.0f, + Macbeth_801AD624(actor->obj.pos.x, actor->obj.pos.y + 80.0f, actor->obj.pos.z + 50.0f, RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT(5.0f), RAND_FLOAT_CENTERED(3.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.f), (s32) (RAND_FLOAT(50.0f) + 70.0f), 3, RAND_FLOAT(1.0f)); } - func_i5_801AD624(actor->obj.pos.x, actor->obj.pos.y + 80.0f, actor->obj.pos.z + 50.0f, + Macbeth_801AD624(actor->obj.pos.x, actor->obj.pos.y + 80.0f, actor->obj.pos.z + 50.0f, RAND_FLOAT_CENTERED(3.0f), RAND_FLOAT(15.0f), -2.0f, RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT_CENTERED(10.0f), @@ -4546,22 +4545,22 @@ void func_i5_801A7E7C(Actor* actor) { AUDIO_PLAY_SFX(0x2903300E, actor->sfxSource, 4); actor->iwork[8] = 16; D_i5_801BE320[10] -= actor->damage; - func_i5_801AD624(actor->obj.pos.x, actor->obj.pos.y - 30.0f, actor->obj.pos.z, RAND_FLOAT_CENTERED(10.0f), + Macbeth_801AD624(actor->obj.pos.x, actor->obj.pos.y - 30.0f, actor->obj.pos.z, RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT(7.0f) + 7.0f, RAND_FLOAT_CENTERED(3.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), 3, RAND_FLOAT(1.0f)); if (D_i5_801BE320[10] <= 0) { AUDIO_PLAY_SFX(0x2903B009, actor->sfxSource, 4); - func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y - 30.0f, actor->obj.pos.z, 6.0f); + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y - 30.0f, actor->obj.pos.z, 6.0f); for (i = 0; i < 10; i++) { - func_i5_801AD624(actor->obj.pos.x, actor->obj.pos.y - 30.0f, actor->obj.pos.z, + Macbeth_801AD624(actor->obj.pos.x, actor->obj.pos.y - 30.0f, actor->obj.pos.z, RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT(7.0f) + 7.0f, RAND_FLOAT_CENTERED(3.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), RAND_FLOAT_CENTERED(30.0f), (s32) (RAND_FLOAT(50.0f) + 70.0f), 3, RAND_FLOAT(1.0f)); } - func_i5_801AD624(actor->obj.pos.x, actor->obj.pos.y - 30.0f, actor->obj.pos.z + 50.0f, + Macbeth_801AD624(actor->obj.pos.x, actor->obj.pos.y - 30.0f, actor->obj.pos.z + 50.0f, RAND_FLOAT_CENTERED(3.0f), RAND_FLOAT(15.0f), -2.0f, RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT(360.0f), RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT_CENTERED(10.0f), @@ -4681,7 +4680,7 @@ void func_i5_801A7E7C(Actor* actor) { } } -bool func_i5_801ABC14(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +bool Macbeth_801ABC14(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { Actor* actor = (Actor*) data; s16 sp62; @@ -4796,7 +4795,7 @@ bool func_i5_801ABC14(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* return false; } -void func_i5_801AC1C0(s32 limbIndex, Vec3f* rot, void* data) { +void Macbeth_801AC1C0(s32 limbIndex, Vec3f* rot, void* data) { Vec3f sp2C = { 0.0f, 0.0f, 0.0f }; Actor* actor = (Actor*) data; @@ -4816,7 +4815,7 @@ void func_i5_801AC1C0(s32 limbIndex, Vec3f* rot, void* data) { } } -void func_i5_801AC294(Actor* actor) { +void Macbeth_801AC294(Actor* actor) { if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) { if (((gPlayer[0].unk_138 - actor->obj.pos.z) > 7000.0f) || ((gPlayer[0].unk_138 - actor->obj.pos.z) < -1000.0f)) { @@ -4835,31 +4834,31 @@ void func_i5_801AC294(Actor* actor) { Matrix_RotateX(gCalcMatrix, actor->fwork[29] * M_DTOR, 1); Animation_GetFrameData(&D_MA_601EA28, D_i5_801BE320[3], D_i5_801BE430); } - Animation_DrawSkeleton(3, D_MA_600D1E4, D_i5_801BE430, func_i5_801ABC14, func_i5_801AC1C0, actor, gCalcMatrix); + Animation_DrawSkeleton(3, D_MA_600D1E4, D_i5_801BE430, Macbeth_801ABC14, Macbeth_801AC1C0, actor, gCalcMatrix); } -void func_i5_801AC42C(s32 arg0) { +void Macbeth_801AC42C(s32 arg0) { } -void func_i5_801AC438(Actor* actor) { +void Macbeth_801AC438(Actor* actor) { switch (actor->state) { case 0: - func_i5_8019A198(actor); - func_i5_801A015C(actor); - func_i5_8019A728(actor); + Macbeth_8019A198(actor); + Macbeth_801A015C(actor); + Macbeth_8019A728(actor); if (actor->iwork[1] != 0) { Radio_PlayMessage(gMsg_ID_17420, RCID_BOSS_MACBETH); AUDIO_PLAY_SFX(0x19034066, actor->sfxSource, 4); actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6035A94); actor->state += 1; } - func_i5_8019A830(actor); + Macbeth_8019A830(actor); break; case 1: - func_i5_8019A198(actor); - func_i5_801A015C(actor); + Macbeth_8019A198(actor); + Macbeth_801A015C(actor); Math_SmoothStepToF(&D_i5_801BE368[8], 160.0f, 0.1f, 3.0f, 0.01f); - func_i5_8019A830(actor); + Macbeth_8019A830(actor); break; } if (actor->unk_0D0 != 0) { @@ -4868,7 +4867,7 @@ void func_i5_801AC438(Actor* actor) { } } -bool func_i5_801AC5AC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +bool Macbeth_801AC5AC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { RCP_SetupDL(&gMasterDisp, 0x1D); gSPClearGeometryMode(gMasterDisp++, G_TEXTURE_GEN); if ((limbIndex == 1) || (limbIndex == 3)) { @@ -4883,7 +4882,7 @@ bool func_i5_801AC5AC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* return false; } -void func_i5_801AC6B4(Actor* actor) { +void Macbeth_801AC6B4(Actor* actor) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; actor->obj.id = OBJ_ACTOR_195; @@ -4898,7 +4897,7 @@ void func_i5_801AC6B4(Actor* actor) { static f32 D_i5_801BA768 = 0.0f; -void func_i5_801AC754(Player* player) { +void Macbeth_801AC754(Player* player) { f32 sp4C; f32 sp48; f32 sp44; @@ -4909,24 +4908,24 @@ void func_i5_801AC754(Player* player) { sp4C = 0.0f; sp48 = 0.0f; sp44 = 0.0f; - func_800ADF58(player); + func_play_800ADF58(player); switch (player->unk_1D0) { case 0: - var_s0 = D_80178310 = SEGMENTED_TO_VIRTUAL(D_MA_6035678); + var_s0 = D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_MA_6035678); for (i = 0; var_s0->id != OBJ_INVALID; i++, var_s0++) { Object_Load(var_s0, 4000.0f, -4000.0f, 4000.0f, -4000.0f); } - var_s0 = D_80178310 = SEGMENTED_TO_VIRTUAL(D_800CFDA0[gCurrentLevel]); + var_s0 = D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_enmy_800CFDA0[gCurrentLevel]); for (i = 0; i < 40; i++, var_s0++) { Object_Load(var_s0, 4000.0f, -4000.0f, 4000.0f, -4000.0f); } - D_80178348 = D_80178350 = D_80178354 = D_80178340 = 255; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = D_ctx_80178340 = 255; player->unk_144 -= 800.0f; player->unk_1D0 = 1; D_i5_801BE24C = 8.0f; @@ -4946,19 +4945,19 @@ void func_i5_801AC754(Player* player) { player->camAt.z = gCsCamAtZ = -800.0f; player->unk_240 = 1; player->unk_1D0 = 2; - D_80178348 = D_80178350 = D_80178354 = 255; - D_80178340 = 255; - func_i5_801ACF6C(); + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; + D_ctx_80178340 = 255; + Macbeth_801ACF6C(); /* fallthrough */ case 2: if (gCsFrameCount < 30) { - D_80178348 = D_80178350 = D_80178354 = 255; - D_80178340 = 255; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; + D_ctx_80178340 = 255; } if ((gCsFrameCount < 60) && !(gCsFrameCount & 0xF)) { - func_i5_801ACF6C(); + Macbeth_801ACF6C(); } else if ((gCsFrameCount < 100) && !(gCsFrameCount & 0x1F)) { - func_i5_801ACF6C(); + Macbeth_801ACF6C(); } if (gCsFrameCount > 50) { gCsCamEyeX = zeroVar; @@ -4967,9 +4966,9 @@ void func_i5_801AC754(Player* player) { gCsCamAtX = zeroVar; gCsCamAtY = 42.0f; gCsCamAtZ = -800.0f; - D_80177A48[0] = 0.1f; - D_80177A48[1] = 0.1f; - D_80177A48[2] = 0.1f; + D_ctx_80177A48[0] = 0.1f; + D_ctx_80177A48[1] = 0.1f; + D_ctx_80177A48[2] = 0.1f; if (gCsFrameCount < 80) { sp4C = 5.0f; sp48 = 8.0f; @@ -4990,15 +4989,15 @@ void func_i5_801AC754(Player* player) { break; case 3: AUDIO_PLAY_BGM(SEQ_ID_16 | 0x8000); - D_80177838 = 50; + D_ctx_80177838 = 50; player->state_1C8 = PLAYERSTATE_1C8_3; player->unk_1D0 = player->timer_1F8 = player->timer_1FC = player->unk_240 = 0; player->unk_0D4 = 3.0f; player->unk_014 = 0.0f; - D_8017782C = 1; - func_800A594C(); - D_8017782C = 0; - D_80177DC8 = 40; + D_ctx_8017782C = 1; + func_play_800A594C(); + D_ctx_8017782C = 0; + D_ctx_80177DC8 = 40; player->unk_1D0 = 4; break; case 4: @@ -5006,12 +5005,12 @@ void func_i5_801AC754(Player* player) { break; } player->unk_138 = player->pos.z += player->vel.z; - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], sp4C, 0); - Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[1], sp48, 0); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[2], sp44, 0); - Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], sp4C, 0); - Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[1], sp48, 0); - Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[2], sp44, 0); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], sp4C, 0); + Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_ctx_80177A48[1], sp48, 0); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[2], sp44, 0); + Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_ctx_80177A48[0], sp4C, 0); + Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_ctx_80177A48[1], sp48, 0); + Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_ctx_80177A48[2], sp44, 0); player->unk_0A0 = 0.0f; player->unk_0F4 += player->vel.z * 5.0f; player->unk_0F0 = SIN_DEG(player->unk_0F4) * 0.7f; @@ -5024,7 +5023,7 @@ void func_i5_801AC754(Player* player) { } } -void func_i5_801ACE40(Effect* effect) { +void Macbeth_801ACE40(Effect* effect) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.pos.x = gPlayer[0].camEye.x + RAND_FLOAT_CENTERED(600.0f); @@ -5043,34 +5042,34 @@ void func_i5_801ACE40(Effect* effect) { Object_SetInfo(&effect->info, effect->obj.id); } -void func_i5_801ACF6C(void) { +void Macbeth_801ACF6C(void) { s32 i; for (i = 0; i < ARRAY_COUNT(gEffects); i++) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i5_801ACE40(&gEffects[i]); + Macbeth_801ACE40(&gEffects[i]); break; } } } -void func_i5_801ACFBC(void) { +void Macbeth_801ACFBC(void) { ObjectInit* var_s0; - for (var_s0 = D_80178310 = SEGMENTED_TO_VIRTUAL(D_MA_60357CC); var_s0->id != OBJ_INVALID; var_s0++) { + for (var_s0 = D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_MA_60357CC); var_s0->id != OBJ_INVALID; var_s0++) { Object_Load(var_s0, 4000.0f, -4000.0f, 4000.0f, -4000.0f); } } -void func_i5_801AD080(void) { +void Macbeth_801AD080(void) { ObjectInit* var_s0; - for (var_s0 = D_80178310 = SEGMENTED_TO_VIRTUAL(D_MA_6035920); var_s0->id != OBJ_INVALID; var_s0++) { + for (var_s0 = D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_MA_6035920); var_s0->id != OBJ_INVALID; var_s0++) { Object_Load(var_s0, 4000.0f, -4000.0f, 4000.0f, -4000.0f); } } -void func_i5_801AD144(PlayerShot* playerShot) { +void Macbeth_801AD144(PlayerShot* playerShot) { s32 i; s32 j; Actor* actor; @@ -5137,7 +5136,7 @@ void func_i5_801AD144(PlayerShot* playerShot) { } } -void func_i5_801AD554(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 xRot, f32 yRot, +void Macbeth_801AD554(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 xRot, f32 yRot, f32 zRot, f32 argA, f32 argB, f32 argC, s16 argD, s16 argE, f32 scale2) { Effect_Initialize(effect); effect->obj.status = OBJ_ACTIVE; @@ -5160,22 +5159,22 @@ void func_i5_801AD554(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f3 Object_SetInfo(&effect->info, effect->obj.id); } -void func_i5_801AD624(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 xRot, f32 yRot, f32 zRot, +void Macbeth_801AD624(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 xRot, f32 yRot, f32 zRot, f32 arg9, f32 argA, f32 argB, s16 argC, s16 argD, f32 scale2) { s32 i; for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i5_801AD554(&gEffects[i], xPos, yPos, zPos, xVel, yVel, zVel, xRot, yRot, zRot, arg9, argA, argB, argC, + Macbeth_801AD554(&gEffects[i], xPos, yPos, zPos, xVel, yVel, zVel, xRot, yRot, zRot, arg9, argA, argB, argC, argD, scale2); break; } } } -void func_i5_801AD6E8(void) { +void Macbeth_801AD6E8(void) { } -void func_i5_801AD6F0(Actor* actor) { +void Macbeth_801AD6F0(Actor* actor) { Vec3f sp4C = { 0.0f, -10.0f, 0.0f }; if ((gPlayer[0].unk_138 - actor->obj.pos.z) < -500.0f) { @@ -5185,7 +5184,7 @@ void func_i5_801AD6F0(Actor* actor) { switch (actor->state) { case 0: if ((actor->timer_0BC == 0) && - ((actor->vel.y -= 0.5f, (func_8006351C(actor->index, &actor->obj.pos, &sp4C, 1) != 0)) || + ((actor->vel.y -= 0.5f, (func_enmy_8006351C(actor->index, &actor->obj.pos, &sp4C, 1) != 0)) || (actor->obj.pos.y < (gGroundLevel + 10.0f)) || (actor->iwork[0] != 0))) { actor->vel.x = 0.0f; actor->vel.y = 0.0f; @@ -5199,11 +5198,12 @@ void func_i5_801AD6F0(Actor* actor) { actor->scale = 2.5f; actor->fwork[0] = 2.5f; AUDIO_PLAY_SFX(0x2903B009, actor->sfxSource, 4); - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 7.0f); - func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, 4.0f, 5); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 7.0f); + func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, + 4.0f, 5); if (actor->obj.pos.y < (gGroundLevel + 10.0f)) { - func_800365E4(actor->obj.pos.x, 3.0f, actor->obj.pos.z, actor->obj.pos.x, actor->obj.pos.z, 0.0f, - 0.0f, 90.0f, 5.0f, 0, 0); + func_beam_800365E4(actor->obj.pos.x, 3.0f, actor->obj.pos.z, actor->obj.pos.x, actor->obj.pos.z, + 0.0f, 0.0f, 90.0f, 5.0f, 0, 0); } D_80137E84[gMainController] = 1; D_Timer_80177BD0[gMainController] = 10; @@ -5230,7 +5230,7 @@ void func_i5_801AD6F0(Actor* actor) { } } -void func_i5_801ADAC8(Actor* actor) { +void Macbeth_801ADAC8(Actor* actor) { switch (actor->state) { case 0: Graphics_SetScaleMtx(actor->scale); @@ -5249,7 +5249,7 @@ void func_i5_801ADAC8(Actor* actor) { } } -void func_i5_801ADC08(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { +void Macbeth_801ADC08(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; actor->obj.id = OBJ_ACTOR_220; @@ -5270,18 +5270,18 @@ void func_i5_801ADC08(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 AUDIO_PLAY_SFX(0x2900201D, actor->sfxSource, 4); } -void func_i5_801ADCEC(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { +void Macbeth_801ADCEC(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { s32 i; for (i = ARRAY_COUNT(gActors) - 1; i >= 0; i--) { if (gActors[i].obj.status == OBJ_FREE) { - func_i5_801ADC08(&gActors[i], xPos, yPos, zPos, xVel, yVel, zVel); + Macbeth_801ADC08(&gActors[i], xPos, yPos, zPos, xVel, yVel, zVel); break; } } } -void func_i5_801ADD68(Actor* actor) { +void Macbeth_801ADD68(Actor* actor) { Vec3f sp3C = { 0.0f, -10.0f, 0.0f }; s32 var_v0; @@ -5323,7 +5323,7 @@ void func_i5_801ADD68(Actor* actor) { } } } - if ((func_8006351C(actor->index, &actor->obj.pos, &sp3C, 1) != 0) || + if ((func_enmy_8006351C(actor->index, &actor->obj.pos, &sp3C, 1) != 0) || (actor->obj.pos.y < (gGroundLevel + 200.0f))) { AUDIO_PLAY_SFX(0x19032064, actor->sfxSource, 4); D_80137E84[gMainController] = 1; @@ -5356,15 +5356,15 @@ void func_i5_801ADD68(Actor* actor) { actor->health -= actor->damage; if (actor->health <= 0) { - func_8007A6F0(&actor->obj.pos, 0x2903A008); - func_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(20.0f), actor->obj.pos.y - 200.0f, - actor->obj.pos.z, 8.0f); - func_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(20.0f), actor->obj.pos.y, actor->obj.pos.z, - 8.0f); - func_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(20.0f), actor->obj.pos.y + 200.0f, - actor->obj.pos.z, 7.0f); - func_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(20.0f), actor->obj.pos.y + 400.0f, - actor->obj.pos.z, 7.0f); + func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); + func_effect_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(20.0f), actor->obj.pos.y - 200.0f, + actor->obj.pos.z, 8.0f); + func_effect_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(20.0f), actor->obj.pos.y, + actor->obj.pos.z, 8.0f); + func_effect_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(20.0f), actor->obj.pos.y + 200.0f, + actor->obj.pos.z, 7.0f); + func_effect_8007D2C8(actor->obj.pos.x + RAND_FLOAT_CENTERED(20.0f), actor->obj.pos.y + 400.0f, + actor->obj.pos.z, 7.0f); Object_Kill(&actor->obj, actor->sfxSource); } else { AUDIO_PLAY_SFX(0x2903300E, actor->sfxSource, 4); @@ -5380,7 +5380,7 @@ static Vec3f D_i5_801BA784[8] = { { -40.0f, 10.0f, 30.0f }, { -41.0f, 10.0f, 10.0f }, { -43.0f, 10.0f, -10.0f }, { -45.0f, 10.0f, -30.0f }, }; // unused? -void func_i5_801AE2C0(Actor* actor) { +void Macbeth_801AE2C0(Actor* actor) { if (actor->state < 2) { Graphics_SetScaleMtx(actor->scale); if (actor->iwork[0] >= 128) { @@ -5408,7 +5408,7 @@ void func_i5_801AE2C0(Actor* actor) { } } -void func_i5_801AE4CC(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 arg4, f32 yVel, f32 arg6, s16 arg7) { +void Macbeth_801AE4CC(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 arg4, f32 yVel, f32 arg6, s16 arg7) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; actor->obj.id = OBJ_ACTOR_221; @@ -5432,18 +5432,18 @@ void func_i5_801AE4CC(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 arg4, f32 AUDIO_PLAY_SFX(0x2900201D, actor->sfxSource, 4); } -void func_i5_801AE610(f32 xPos, f32 yPos, f32 zPos, f32 arg3, f32 yVel, f32 arg5, s16 arg6) { +void Macbeth_801AE610(f32 xPos, f32 yPos, f32 zPos, f32 arg3, f32 yVel, f32 arg5, s16 arg6) { s32 i; for (i = ARRAY_COUNT(gActors) - 1; i >= 0; i--) { if (gActors[i].obj.status == OBJ_FREE) { - func_i5_801AE4CC(&gActors[i], xPos, yPos, zPos, arg3, yVel, arg5, arg6); + Macbeth_801AE4CC(&gActors[i], xPos, yPos, zPos, arg3, yVel, arg5, arg6); break; } } } -void func_i5_801AE694(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 arg4, f32 arg5, f32 arg6) { +void Macbeth_801AE694(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 arg4, f32 arg5, f32 arg6) { f32 sp4C; f32 sp48; f32 sp44; @@ -5476,18 +5476,18 @@ void func_i5_801AE694(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 arg4, f3 Object_SetInfo(&effect->info, effect->obj.id); } -void func_i5_801AE800(f32 xPos, f32 yPos, f32 zPos, f32 arg3, f32 arg4, f32 arg5) { +void Macbeth_801AE800(f32 xPos, f32 yPos, f32 zPos, f32 arg3, f32 arg4, f32 arg5) { s32 i; for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i5_801AE694(&gEffects[i], xPos, yPos, zPos, arg3, arg4, arg5); + Macbeth_801AE694(&gEffects[i], xPos, yPos, zPos, arg3, arg4, arg5); break; } } } -void func_i5_801AE87C(Effect* effect) { +void Macbeth_801AE87C(Effect* effect) { f32 sp34; f32 sp30; f32 sp2C; @@ -5531,7 +5531,7 @@ void func_i5_801AE87C(Effect* effect) { } } -void func_i5_801AEAA0(Effect* effect) { +void Macbeth_801AEAA0(Effect* effect) { RCP_SetupDL(&gMasterDisp, 0x43); if (effect->scale2 >= 3.0f) { gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, effect->unk_44); @@ -5546,7 +5546,7 @@ void func_i5_801AEAA0(Effect* effect) { RCP_SetupDL(&gMasterDisp, 0x40); } -void func_i5_801AEC04(Actor* actor) { +void Macbeth_801AEC04(Actor* actor) { if ((gPlayer[0].unk_138 - actor->obj.pos.z) < -300.0f) { Object_Kill(&actor->obj, actor->sfxSource); } @@ -5577,10 +5577,10 @@ void func_i5_801AEC04(Actor* actor) { } if (!(gGameFrameCount & 0xF)) { - func_8007C120(actor->obj.pos.x - 35.0f, actor->obj.pos.y + 15.0f, actor->obj.pos.z, -3.0f, 0.0f, 0.0f, - 0.1f, 20); - func_8007C120(actor->obj.pos.x + 35.0f, actor->obj.pos.y + 15.0f, actor->obj.pos.z, 3.0f, 0.0f, 0.0f, - 0.1f, 20); + func_effect_8007C120(actor->obj.pos.x - 35.0f, actor->obj.pos.y + 15.0f, actor->obj.pos.z, -3.0f, 0.0f, + 0.0f, 0.1f, 20); + func_effect_8007C120(actor->obj.pos.x + 35.0f, actor->obj.pos.y + 15.0f, actor->obj.pos.z, 3.0f, 0.0f, + 0.0f, 0.1f, 20); } break; default: @@ -5597,14 +5597,14 @@ void func_i5_801AEC04(Actor* actor) { actor->health -= actor->damage; actor->timer_0C6 = 15; if (actor->health <= 0) { - func_8007A6F0(&actor->obj.pos, 0x29000000); - func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 8.0f); + func_effect_8007A6F0(&actor->obj.pos, 0x29000000); + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 8.0f); Object_Kill(&actor->obj, actor->sfxSource); } } } -void func_i5_801AEEFC(Actor* actor) { +void Macbeth_801AEEFC(Actor* actor) { gSPDisplayList(gMasterDisp++, D_MA_6015510); Matrix_Scale(gGfxMatrix, actor->fwork[0], actor->fwork[2], 1.0f, 1); Matrix_Push(&gGfxMatrix); @@ -5617,7 +5617,7 @@ void func_i5_801AEEFC(Actor* actor) { Matrix_Pop(&gGfxMatrix); } -void func_i5_801AF134(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { +void Macbeth_801AF134(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; actor->obj.id = OBJ_ACTOR_222; @@ -5635,12 +5635,12 @@ void func_i5_801AF134(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 AUDIO_PLAY_SFX(0x2900201D, actor->sfxSource, 4); } -void func_i5_801AF200(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { +void Macbeth_801AF200(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { s32 i; for (i = ARRAY_COUNT(gActors) - 1; i >= 0; i--) { if (gActors[i].obj.status == OBJ_FREE) { - func_i5_801AF134(&gActors[i], xPos, yPos, zPos, xVel, yVel, zVel); + Macbeth_801AF134(&gActors[i], xPos, yPos, zPos, xVel, yVel, zVel); break; } } @@ -5654,7 +5654,7 @@ static f32 D_i5_801BA80C[5] = { 500.0f, 600.0f, 200.0f, 4500.0f, 2300.0f }; static f32 D_i5_801BA820[5] = { 90.0f, -90.0f, 25.0f, 0.0f, 225.0f }; -void func_i5_801AF27C(Actor* actor, s32 arg1) { +void Macbeth_801AF27C(Actor* actor, s32 arg1) { Player* player = &gPlayer[0]; Actor_Initialize(actor); @@ -5685,7 +5685,7 @@ void func_i5_801AF27C(Actor* actor, s32 arg1) { } } -void func_i5_801AF44C(void) { +void Macbeth_801AF44C(void) { Actor* actor = &gActors[8]; Actor_Initialize(actor); @@ -5722,13 +5722,13 @@ static Vec3f D_i5_801BA834[2] = { static f32 D_i5_801BA84C[2] = { 0.0f, 60.0f }; -void func_i5_801AF628(Actor* actor, s32 arg1) { +void Macbeth_801AF628(Actor* actor, s32 arg1) { Actor_Initialize(actor); actor->obj.status = OBJ_ACTIVE; actor->obj.id = OBJ_ACTOR_195; actor->obj.pos.x = gPlayer[0].unk_0AC + D_i5_801BA834[arg1].x; actor->obj.pos.y = D_i5_801BA834[arg1].y; - actor->obj.pos.z = D_i5_801BA834[arg1].z - D_80177D20; + actor->obj.pos.z = D_i5_801BA834[arg1].z - D_ctx_80177D20; actor->unk_0B6 = 37; actor->obj.rot.y = D_i5_801BA84C[arg1]; actor->iwork[4] = actor->iwork[5] = 192; @@ -5737,7 +5737,7 @@ void func_i5_801AF628(Actor* actor, s32 arg1) { Object_SetInfo(&actor->info, actor->obj.id); } -void func_i5_801AF70C(f32 xPos, f32 yPos, f32 zPos, f32 arg3) { +void Macbeth_801AF70C(f32 xPos, f32 yPos, f32 zPos, f32 arg3) { Effect* effect; Effect* effectPtr; f32 temp_ft1; @@ -5787,7 +5787,7 @@ static f32 D_i5_801BA890 = 100.0f; // unused? static f32 D_i5_801BA894[5] = { 200.0f, 250.0f, 220.0f, 0.0f, 200.0f }; static f32 D_i5_801BA8A8[3] = { 230.0f, 220.0f, 350.0f }; // unused? -void func_i5_801AF8F4(Player* player) { +void Macbeth_801AF8F4(Player* player) { s32 i; s32 j; Vec3f spE4; @@ -5797,25 +5797,25 @@ void func_i5_801AF8F4(Player* player) { switch (player->unk_1D0) { case 0: gCsFrameCount = 0; - D_80178488 = 1; + D_ctx_80178488 = 1; player->unk_234 = 0; SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 30); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 30); player->unk_1D0 = 1; - D_80177A48[0] = 0.0f; - D_80177A48[4] = -60.0f; - D_80177A48[5] = 240.0f; + D_ctx_80177A48[0] = 0.0f; + D_ctx_80177A48[4] = -60.0f; + D_ctx_80177A48[5] = 240.0f; player->unk_0D4 = 3.0f; - D_8017847C = player->vel.x = player->vel.y = player->vel.z = player->unk_0D0 = 0.0f; + D_ctx_8017847C = player->vel.x = player->vel.y = player->vel.z = player->unk_0D0 = 0.0f; if (player->shields <= 0) { player->shields = 1; } player->camEye.x = gCsCamEyeX = gActors[D_i5_801BE318].obj.pos.x - 250.0f; player->camEye.y = gCsCamEyeY = gActors[D_i5_801BE318].obj.pos.y + 150.0f; - player->camEye.z = gCsCamEyeZ = gActors[D_i5_801BE318].obj.pos.z + D_80177D20 + 500.0f; + player->camEye.z = gCsCamEyeZ = gActors[D_i5_801BE318].obj.pos.z + D_ctx_80177D20 + 500.0f; player->camAt.x = gCsCamAtX = gActors[D_i5_801BE318].obj.pos.x; player->camAt.y = gCsCamAtY = gActors[D_i5_801BE318].obj.pos.y + 200.0f; - player->camAt.z = gCsCamAtZ = gActors[D_i5_801BE318].obj.pos.z + D_80177D20; + player->camAt.z = gCsCamAtZ = gActors[D_i5_801BE318].obj.pos.z + D_ctx_80177D20; player->pos.x = 500.0f; player->pos.y = -3.0f; D_i5_801BA1DC = 0.0f; @@ -5833,7 +5833,7 @@ void func_i5_801AF8F4(Player* player) { case 1: gShowBossHealth = 0; if (gCsFrameCount == 70) { - D_80177DC8 = 498; + D_ctx_80177DC8 = 498; for (i = 0; i < ARRAY_COUNT(gActors); i++) { if (gActors[i].obj.id == OBJ_ACTOR_223) { @@ -5859,9 +5859,9 @@ void func_i5_801AF8F4(Player* player) { player->pos.x = 500.0f; player->pos.y = -3.0f; player->pos.z = player->unk_138 = -111130.0f; - player->unk_144 = D_80177D20 = 115930.0f; + player->unk_144 = D_ctx_80177D20 = 115930.0f; player->unk_228 = 16; - D_80161680 = 330; + D_enmy_80161680 = 330; D_i5_801BA1DC = 0.0f; gActors[D_i5_801BE314].obj.pos.x = -431.0f; gActors[D_i5_801BE314].obj.pos.y = 0.0f; @@ -5877,7 +5877,7 @@ void func_i5_801AF8F4(Player* player) { case 2: if (gCsFrameCount > 105) { - Math_SmoothStepToF(&D_80177A48[0], 1.0f, 1.0f, 0.005f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[0], 1.0f, 1.0f, 0.005f, 0.0f); } if (gCsFrameCount < 160) { gActors[D_i5_801BE314].obj.pos.x = -431.0f; @@ -5890,7 +5890,7 @@ void func_i5_801AF8F4(Player* player) { gActors[D_i5_801BE316].obj.pos.y = 874.0f; gActors[D_i5_801BE316].obj.pos.z = -109864.0f; } else { - D_80177A48[0] = 0.0f; + D_ctx_80177A48[0] = 0.0f; D_i5_801BA1DC = -40.0f; player->unk_1D0++; } @@ -5908,13 +5908,13 @@ void func_i5_801AF8F4(Player* player) { player->pos.x = gActors[D_i5_801BE314].obj.pos.x + 500.0f; player->unk_140 = -gActors[D_i5_801BE314].vel.z; player->unk_144 += player->unk_140; - D_80177D08 = player->unk_140; - D_80177D20 = player->unk_144; - D_80177CE8 += player->unk_140; - player->pos.z = player->unk_138 = -(D_80177D20 + 210.0f); - Math_SmoothStepToF(&D_80177A48[0], 1.0f, 0.1f, 0.00025f, 0.0f); + D_ctx_80177D08 = player->unk_140; + D_ctx_80177D20 = player->unk_144; + D_ctx_80177CE8 += player->unk_140; + player->pos.z = player->unk_138 = -(D_ctx_80177D20 + 210.0f); + Math_SmoothStepToF(&D_ctx_80177A48[0], 1.0f, 0.1f, 0.00025f, 0.0f); gCsCamAtX = gActors[D_i5_801BE314].obj.pos.x + 2500.0f; - gCsCamAtZ = (gActors[D_i5_801BE314].obj.pos.z + D_80177D20) - 2000.0f; + gCsCamAtZ = (gActors[D_i5_801BE314].obj.pos.z + D_ctx_80177D20) - 2000.0f; gCsCamEyeX = gCsCamAtX - 2340.0f; gCsCamEyeZ = gCsCamAtZ + 1410.0f; } @@ -5922,8 +5922,8 @@ void func_i5_801AF8F4(Player* player) { player->unk_1D0++; player->vel.z = 0.0f; player->unk_140 = 0.0f; - D_801779E4 = 0.0f; - D_801779F4 = 0.0f; + D_ctx_801779E4 = 0.0f; + D_ctx_801779F4 = 0.0f; player->timer_210 = 0; player->camEye.x = gCsCamEyeX = 2750.0f; player->camEye.y = gCsCamEyeY = 50.0f; @@ -5940,33 +5940,33 @@ void func_i5_801AF8F4(Player* player) { break; case 4: if (gCsFrameCount == 403) { - D_80178348 = D_80178350 = D_80178354 = 255; - D_80178358 = 255; - D_8017835C = 20; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; + D_ctx_80178358 = 255; + D_ctx_8017835C = 20; } if (gCsFrameCount == 416) { player->unk_1D0++; - D_80177A48[0] = 1.0f; + D_ctx_80177A48[0] = 1.0f; player->unk_114 = 30.0f; player->unk_0AC = 4600.0f; D_i5_801BA1DC = -80.0f; - player->unk_144 = D_80177D20 += 300.0f; - D_80177A48[5] = 0.0f; - D_80177A48[6] = 0.5f; - D_80177A48[7] = 1560.0f; - D_80177A48[8] = 2400.0f; + player->unk_144 = D_ctx_80177D20 += 300.0f; + D_ctx_80177A48[5] = 0.0f; + D_ctx_80177A48[6] = 0.5f; + D_ctx_80177A48[7] = 1560.0f; + D_ctx_80177A48[8] = 2400.0f; player->camAt.x = gCsCamAtX = gActors[D_i5_801BE314].obj.pos.x; - player->camAt.z = gCsCamAtZ = (gActors[D_i5_801BE314].obj.pos.z + D_80177D20) - 2000.0f; + player->camAt.z = gCsCamAtZ = (gActors[D_i5_801BE314].obj.pos.z + D_ctx_80177D20) - 2000.0f; player->camEye.y = gCsCamEyeY = 50.0f; player->camAt.y = gCsCamAtY = 10.0f; - player->camEye.x = gCsCamEyeX = D_80177A48[7] + gCsCamAtX; - player->camEye.z = gCsCamEyeZ = D_80177A48[8] + gCsCamAtZ; + player->camEye.x = gCsCamEyeX = D_ctx_80177A48[7] + gCsCamAtX; + player->camEye.z = gCsCamEyeZ = D_ctx_80177A48[8] + gCsCamAtZ; player->unk_118 = -30.0f; player->unk_0B8 = 10014.0f; player->timer_210 = 1000; player->unk_0B4 = 0.0f; - D_80178358 = 0; - D_8017835C = 127; + D_ctx_80178358 = 0; + D_ctx_8017835C = 127; } break; case 5: @@ -5974,23 +5974,24 @@ void func_i5_801AF8F4(Player* player) { Math_SmoothStepToF(&D_i5_801BA1DC, 0.0f, 0.1f, 0.05f, 0.0f); } if (gCsFrameCount >= 430) { - Math_SmoothStepToF(&D_80177A48[6], 22.0f, 0.1f, 1.0f, 0.0f); - Math_SmoothStepToF(&D_80177A48[7], 2600.0f, 0.1f, D_80177A48[6], 0.0f); - Math_SmoothStepToF(&D_80177A48[8], 3800.0f, 0.1f, D_80177A48[6], 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[6], 22.0f, 0.1f, 1.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[7], 2600.0f, 0.1f, D_ctx_80177A48[6], 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[8], 3800.0f, 0.1f, D_ctx_80177A48[6], 0.0f); Math_SmoothStepToF(&gCsCamEyeY, 1300.0f, 0.1f, 17.0f, 0.0f); } if (gCsFrameCount <= 505) { - gCsCamAtZ = gActors[D_i5_801BE314].obj.pos.z + D_80177D20 - 2000.0f; + gCsCamAtZ = gActors[D_i5_801BE314].obj.pos.z + D_ctx_80177D20 - 2000.0f; gCsCamAtX = gActors[D_i5_801BE314].obj.pos.x; player->vel.z = gActors[D_i5_801BE314].vel.z; player->pos.x = gActors[D_i5_801BE314].obj.pos.x + 500.0f; - player->pos.z = player->unk_138 = -(D_80177D20 + 210.0f); + player->pos.z = player->unk_138 = -(D_ctx_80177D20 + 210.0f); player->unk_140 = -gActors[D_i5_801BE314].vel.z; - gCsCamEyeX = D_80177A48[7] + gCsCamAtX; - gCsCamEyeZ = D_80177A48[8] + gCsCamAtZ; - func_8007C120(gActors[D_i5_801BE314].obj.pos.x + 480.0f, gActors[D_i5_801BE314].obj.pos.y + 15.0f, - gActors[D_i5_801BE314].obj.pos.z - 400.0f, gActors[D_i5_801BE314].vel.x, - gActors[D_i5_801BE314].vel.y, 0.0f, 0.2f, 10); + gCsCamEyeX = D_ctx_80177A48[7] + gCsCamAtX; + gCsCamEyeZ = D_ctx_80177A48[8] + gCsCamAtZ; + func_effect_8007C120(gActors[D_i5_801BE314].obj.pos.x + 480.0f, + gActors[D_i5_801BE314].obj.pos.y + 15.0f, + gActors[D_i5_801BE314].obj.pos.z - 400.0f, gActors[D_i5_801BE314].vel.x, + gActors[D_i5_801BE314].vel.y, 0.0f, 0.2f, 10); } else { player->vel.z = 0.0f; if (!(gGameFrameCount & 0xF)) { @@ -6000,189 +6001,205 @@ void func_i5_801AF8F4(Player* player) { } Math_SmoothStepToF(&player->unk_140, 0.0f, 1.0f, 0.6f, 0.0f); Math_SmoothStepToF(&gCsCamAtX, 11700.0f, 0.1f, 50.0f, 0.0f); - Math_SmoothStepToF(&D_80177A48[5], 30.0f, 0.1f, 0.05f, 0.0f); - Math_SmoothStepToF(&gCsCamAtY, 1600.0f, 0.1f, D_80177A48[5], 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[5], 30.0f, 0.1f, 0.05f, 0.0f); + Math_SmoothStepToF(&gCsCamAtY, 1600.0f, 0.1f, D_ctx_80177A48[5], 0.0f); if (player->unk_140 >= 2.5f) { player->pos.x = gActors[D_i5_801BE314].obj.pos.x + 500.0f; - player->pos.z = player->unk_138 = -(D_80177D20 + 210.0f); + player->pos.z = player->unk_138 = -(D_ctx_80177D20 + 210.0f); } else { player->unk_0B8 = player->unk_0AC; - D_801779E4 = 0.0f; + D_ctx_801779E4 = 0.0f; } - func_8007BC7C(gActors[D_i5_801BE314].obj.pos.x + 190.0f, gActors[D_i5_801BE314].obj.pos.y + 30.0f, - gActors[D_i5_801BE314].obj.pos.z - 100.0f, 6.0f); - func_8007BC7C(gActors[D_i5_801BE314].obj.pos.x + 190.0f, gActors[D_i5_801BE314].obj.pos.y + 30.0f, - gActors[D_i5_801BE314].obj.pos.z - 120.0f, 6.0f); - func_8007BC7C(gActors[D_i5_801BE314].obj.pos.x - 190.0f, gActors[D_i5_801BE314].obj.pos.y + 30.0f, - gActors[D_i5_801BE314].obj.pos.z - 100.0f, 6.0f); - func_8007BC7C(gActors[D_i5_801BE314].obj.pos.x - 190.0f, gActors[D_i5_801BE314].obj.pos.y + 30.0f, - gActors[D_i5_801BE314].obj.pos.z - 120.0f, 6.0f); + func_effect_8007BC7C(gActors[D_i5_801BE314].obj.pos.x + 190.0f, + gActors[D_i5_801BE314].obj.pos.y + 30.0f, + gActors[D_i5_801BE314].obj.pos.z - 100.0f, 6.0f); + func_effect_8007BC7C(gActors[D_i5_801BE314].obj.pos.x + 190.0f, + gActors[D_i5_801BE314].obj.pos.y + 30.0f, + gActors[D_i5_801BE314].obj.pos.z - 120.0f, 6.0f); + func_effect_8007BC7C(gActors[D_i5_801BE314].obj.pos.x - 190.0f, + gActors[D_i5_801BE314].obj.pos.y + 30.0f, + gActors[D_i5_801BE314].obj.pos.z - 100.0f, 6.0f); + func_effect_8007BC7C(gActors[D_i5_801BE314].obj.pos.x - 190.0f, + gActors[D_i5_801BE314].obj.pos.y + 30.0f, + gActors[D_i5_801BE314].obj.pos.z - 120.0f, 6.0f); } player->unk_144 += player->unk_140; - D_80177D08 = player->unk_140; - D_80177D20 = player->unk_144; - D_80177CE8 += player->unk_140; + D_ctx_80177D08 = player->unk_140; + D_ctx_80177D20 = player->unk_144; + D_ctx_80177CE8 += player->unk_140; if (gCsFrameCount == 630) { Audio_KillSfxBySourceAndId(gActors[D_i5_801BE314].sfxSource, 0x31408095); AUDIO_PLAY_SFX(0x2940C00A, gActors[D_i5_801BE314].sfxSource, 4); player->unk_1D0++; player->vel.z = 0.0f; player->unk_140 = 0.0f; - D_80177D08 = 0.0f; - D_801779E4 = 0.0f; - D_801779F4 = 0.0f; + D_ctx_80177D08 = 0.0f; + D_ctx_801779E4 = 0.0f; + D_ctx_801779F4 = 0.0f; player->timer_210 = 10000; - D_80177A48[0] = 1.0f; + D_ctx_80177A48[0] = 1.0f; D_i5_801BA1DC = 0.0f; D_80137E84[0] = 1; D_Timer_80177BD0[0] = 10; - D_80178480 = 10; - D_80177A48[4] = -70.0f; - D_80177A48[5] = 280.0f; + D_ctx_80178480 = 10; + D_ctx_80177A48[4] = -70.0f; + D_ctx_80177A48[5] = 280.0f; } break; case 6: - Math_SmoothStepToF(&D_80177A48[4], -60.0f, 1.0f, 0.5f, 0.0f); - Math_SmoothStepToF(&D_80177A48[5], 240.0f, 1.0f, 2.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[4], -60.0f, 1.0f, 0.5f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[5], 240.0f, 1.0f, 2.0f, 0.0f); if (!(gGameFrameCount & 1)) { - func_8007797C(11000.0f, 200.0f, -139000.0f, D_80177A48[4], 4.0f, D_80177A48[5], 20.0f); + func_effect_8007797C(11000.0f, 200.0f, -139000.0f, D_ctx_80177A48[4], 4.0f, D_ctx_80177A48[5], 20.0f); } if (gCsFrameCount == 710) { - D_80178348 = D_80178350 = D_80178354 = D_80178340 = 255; - D_80178358 = 0; - D_8017835C = 128; - func_8007D9DC(gActors[D_i5_801BE314].obj.pos.x + 1000.0f, gActors[D_i5_801BE314].obj.pos.y + 20.0f, - -138500.0f, 100.0f, 1000.0f, 0); - func_8007A568(gActors[D_i5_801BE314].obj.pos.x + 200.0f, gActors[D_i5_801BE314].obj.pos.y + 700.0f, - -137750.0f, 100.0f); + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = D_ctx_80178340 = 255; + D_ctx_80178358 = 0; + D_ctx_8017835C = 128; + func_effect_8007D9DC(gActors[D_i5_801BE314].obj.pos.x + 1000.0f, + gActors[D_i5_801BE314].obj.pos.y + 20.0f, -138500.0f, 100.0f, 1000.0f, 0); + func_effect_8007A568(gActors[D_i5_801BE314].obj.pos.x + 200.0f, + gActors[D_i5_801BE314].obj.pos.y + 700.0f, -137750.0f, 100.0f); for (i = 0; i < 8; i++) { - func_800794CC(gActors[D_i5_801BE314].obj.pos.x + RAND_FLOAT_CENTERED(1000.0f), - gActors[D_i5_801BE314].obj.pos.y + 1300.0f, - gActors[D_i5_801BE314].obj.pos.z + 700.0f + RAND_FLOAT_CENTERED(1000.0f), 6.0f); - func_i5_801AF70C(RAND_FLOAT_CENTERED(650.0f) + 11250.0f, 300.0f, RAND_FLOAT(650.0f) + -139000.0f, + func_effect_800794CC(gActors[D_i5_801BE314].obj.pos.x + RAND_FLOAT_CENTERED(1000.0f), + gActors[D_i5_801BE314].obj.pos.y + 1300.0f, + gActors[D_i5_801BE314].obj.pos.z + 700.0f + RAND_FLOAT_CENTERED(1000.0f), + 6.0f); + Macbeth_801AF70C(RAND_FLOAT_CENTERED(650.0f) + 11250.0f, 300.0f, RAND_FLOAT(650.0f) + -139000.0f, 0.7f); } gActors[58].scale = 0.8f; - func_8007D0E0(gActors[D_i5_801BE314].obj.pos.x + 500.0f + RAND_FLOAT_CENTERED(700.0f), - gActors[D_i5_801BE314].obj.pos.y + 500.0f + RAND_FLOAT_CENTERED(700.0f), - gActors[D_i5_801BE314].obj.pos.z + 3000.0f + RAND_FLOAT_CENTERED(700.0f), 30.0f); + func_effect_8007D0E0(gActors[D_i5_801BE314].obj.pos.x + 500.0f + RAND_FLOAT_CENTERED(700.0f), + gActors[D_i5_801BE314].obj.pos.y + 500.0f + RAND_FLOAT_CENTERED(700.0f), + gActors[D_i5_801BE314].obj.pos.z + 3000.0f + RAND_FLOAT_CENTERED(700.0f), 30.0f); } if ((gCsFrameCount > 710) && !(gGameFrameCount & 7)) { - func_8007D0E0(gActors[D_i5_801BE314].obj.pos.x + 500.0f + RAND_FLOAT_CENTERED(700.0f), - gActors[D_i5_801BE314].obj.pos.y + 500.0f + RAND_FLOAT_CENTERED(700.0f), - gActors[D_i5_801BE314].obj.pos.z + 3000.0f + RAND_FLOAT_CENTERED(700.0f), 30.0f); + func_effect_8007D0E0(gActors[D_i5_801BE314].obj.pos.x + 500.0f + RAND_FLOAT_CENTERED(700.0f), + gActors[D_i5_801BE314].obj.pos.y + 500.0f + RAND_FLOAT_CENTERED(700.0f), + gActors[D_i5_801BE314].obj.pos.z + 3000.0f + RAND_FLOAT_CENTERED(700.0f), 30.0f); } if ((gCsFrameCount > 725) && !(gGameFrameCount & 7)) { - func_8007D0E0(gActors[D_i5_801BE314].obj.pos.x - 1500.0f + RAND_FLOAT_CENTERED(700.0f), - gActors[D_i5_801BE314].obj.pos.y + 1000.0f + RAND_FLOAT_CENTERED(700.0f), - gActors[D_i5_801BE314].obj.pos.z + 1700.0f + RAND_FLOAT_CENTERED(700.0f), 30.0f); + func_effect_8007D0E0(gActors[D_i5_801BE314].obj.pos.x - 1500.0f + RAND_FLOAT_CENTERED(700.0f), + gActors[D_i5_801BE314].obj.pos.y + 1000.0f + RAND_FLOAT_CENTERED(700.0f), + gActors[D_i5_801BE314].obj.pos.z + 1700.0f + RAND_FLOAT_CENTERED(700.0f), 30.0f); } if ((gCsFrameCount > 740) && !(gGameFrameCount & 7)) { - func_8007D0E0(gActors[D_i5_801BE314].obj.pos.x - 3500.0f + RAND_FLOAT_CENTERED(700.0f), - gActors[D_i5_801BE314].obj.pos.y + 600.0f + RAND_FLOAT_CENTERED(700.0f), - gActors[D_i5_801BE314].obj.pos.z + 1200.0f + RAND_FLOAT_CENTERED(700.0f), 30.0f); + func_effect_8007D0E0(gActors[D_i5_801BE314].obj.pos.x - 3500.0f + RAND_FLOAT_CENTERED(700.0f), + gActors[D_i5_801BE314].obj.pos.y + 600.0f + RAND_FLOAT_CENTERED(700.0f), + gActors[D_i5_801BE314].obj.pos.z + 1200.0f + RAND_FLOAT_CENTERED(700.0f), 30.0f); } if ((gCsFrameCount > 755) && !(gGameFrameCount & 7)) { - func_8007D0E0(gActors[D_i5_801BE314].obj.pos.x - 3000.0f + RAND_FLOAT_CENTERED(700.0f), - gActors[D_i5_801BE314].obj.pos.y + 400.0f + RAND_FLOAT_CENTERED(700.0f), - gActors[D_i5_801BE314].obj.pos.z + 1300.0f + RAND_FLOAT_CENTERED(700.0f), 30.0f); + func_effect_8007D0E0(gActors[D_i5_801BE314].obj.pos.x - 3000.0f + RAND_FLOAT_CENTERED(700.0f), + gActors[D_i5_801BE314].obj.pos.y + 400.0f + RAND_FLOAT_CENTERED(700.0f), + gActors[D_i5_801BE314].obj.pos.z + 1300.0f + RAND_FLOAT_CENTERED(700.0f), 30.0f); } if (gCsFrameCount == 800) { - func_8007A568(gActors[D_i5_801BE314].obj.pos.x - 3000.0f, gActors[D_i5_801BE314].obj.pos.y + 500.0f, - gActors[D_i5_801BE314].obj.pos.z + 1600.0f, 10000.0f); + func_effect_8007A568(gActors[D_i5_801BE314].obj.pos.x - 3000.0f, + gActors[D_i5_801BE314].obj.pos.y + 500.0f, + gActors[D_i5_801BE314].obj.pos.z + 1600.0f, 10000.0f); for (i = 0; i < 8; i++) { - func_800794CC(gActors[D_i5_801BE314].obj.pos.x - 3000.0f + RAND_FLOAT_CENTERED(1000.0f), - gActors[D_i5_801BE314].obj.pos.y + 700.0f, - gActors[D_i5_801BE314].obj.pos.z + 1600.0f + RAND_FLOAT_CENTERED(1000.0f), 6.0f); - func_i5_801AF70C(RAND_FLOAT_CENTERED(650.0f) + 11250.0f, 300.0f, RAND_FLOAT(650.0f) + -139000.0f, + func_effect_800794CC(gActors[D_i5_801BE314].obj.pos.x - 3000.0f + RAND_FLOAT_CENTERED(1000.0f), + gActors[D_i5_801BE314].obj.pos.y + 700.0f, + gActors[D_i5_801BE314].obj.pos.z + 1600.0f + RAND_FLOAT_CENTERED(1000.0f), + 6.0f); + Macbeth_801AF70C(RAND_FLOAT_CENTERED(650.0f) + 11250.0f, 300.0f, RAND_FLOAT(650.0f) + -139000.0f, 0.7f); } } if (gCsFrameCount == 820) { - func_8007A568(gActors[D_i5_801BE314].obj.pos.x, gActors[D_i5_801BE314].obj.pos.y + 500.0f, - gActors[D_i5_801BE314].obj.pos.z + 3300.0f, 14000.0f); + func_effect_8007A568(gActors[D_i5_801BE314].obj.pos.x, gActors[D_i5_801BE314].obj.pos.y + 500.0f, + gActors[D_i5_801BE314].obj.pos.z + 3300.0f, 14000.0f); for (i = 0; i < 8; i++) { - func_800794CC(gActors[D_i5_801BE314].obj.pos.x + 500.0f + RAND_FLOAT_CENTERED(1000.0f), - gActors[D_i5_801BE314].obj.pos.y + 900.0f, - gActors[D_i5_801BE314].obj.pos.z + 3300.0f + RAND_FLOAT_CENTERED(1000.0f), 6.0f); - func_i5_801AF70C(RAND_FLOAT_CENTERED(650.0f) + 11250.0f, 300.0f, RAND_FLOAT(650.0f) + -139000.0f, + func_effect_800794CC(gActors[D_i5_801BE314].obj.pos.x + 500.0f + RAND_FLOAT_CENTERED(1000.0f), + gActors[D_i5_801BE314].obj.pos.y + 900.0f, + gActors[D_i5_801BE314].obj.pos.z + 3300.0f + RAND_FLOAT_CENTERED(1000.0f), + 6.0f); + Macbeth_801AF70C(RAND_FLOAT_CENTERED(650.0f) + 11250.0f, 300.0f, RAND_FLOAT(650.0f) + -139000.0f, 0.7f); } } if (gCsFrameCount == 835) { - func_8007A568(gActors[D_i5_801BE314].obj.pos.x - 1500.0f, gActors[D_i5_801BE314].obj.pos.y + 500.0f, - gActors[D_i5_801BE314].obj.pos.z + 2000.0f, 80.0f); + func_effect_8007A568(gActors[D_i5_801BE314].obj.pos.x - 1500.0f, + gActors[D_i5_801BE314].obj.pos.y + 500.0f, + gActors[D_i5_801BE314].obj.pos.z + 2000.0f, 80.0f); for (i = 0; i < 8; i++) { - func_800794CC(gActors[D_i5_801BE314].obj.pos.x - 1500.0f + RAND_FLOAT_CENTERED(1000.0f), - gActors[D_i5_801BE314].obj.pos.y + 1200.0f, - gActors[D_i5_801BE314].obj.pos.z + 2000.0f + RAND_FLOAT_CENTERED(1000.0f), 6.0f); - func_i5_801AF70C(RAND_FLOAT_CENTERED(650.0f) + 11250.0f, 300.0f, RAND_FLOAT(650.0f) + -139000.0f, + func_effect_800794CC(gActors[D_i5_801BE314].obj.pos.x - 1500.0f + RAND_FLOAT_CENTERED(1000.0f), + gActors[D_i5_801BE314].obj.pos.y + 1200.0f, + gActors[D_i5_801BE314].obj.pos.z + 2000.0f + RAND_FLOAT_CENTERED(1000.0f), + 6.0f); + Macbeth_801AF70C(RAND_FLOAT_CENTERED(650.0f) + 11250.0f, 300.0f, RAND_FLOAT(650.0f) + -139000.0f, 0.7f); } } if (gCsFrameCount == 845) { - func_8007A568(gActors[D_i5_801BE314].obj.pos.x - 500.0f, gActors[D_i5_801BE314].obj.pos.y + 500.0f, - gActors[D_i5_801BE314].obj.pos.z + 2800.0f, 10000.0f); + func_effect_8007A568(gActors[D_i5_801BE314].obj.pos.x - 500.0f, + gActors[D_i5_801BE314].obj.pos.y + 500.0f, + gActors[D_i5_801BE314].obj.pos.z + 2800.0f, 10000.0f); for (i = 0; i < 11; i++) { - func_800794CC(gActors[D_i5_801BE314].obj.pos.x - 500.0f + RAND_FLOAT_CENTERED(1000.0f), - gActors[D_i5_801BE314].obj.pos.y + 900.0f, - gActors[D_i5_801BE314].obj.pos.z + 2800.0f + RAND_FLOAT_CENTERED(1000.0f), 6.0f); - func_i5_801AF70C(RAND_FLOAT_CENTERED(650.0f) + 11250.0f, 300.0f, RAND_FLOAT(650.0f) + -139000.0f, + func_effect_800794CC(gActors[D_i5_801BE314].obj.pos.x - 500.0f + RAND_FLOAT_CENTERED(1000.0f), + gActors[D_i5_801BE314].obj.pos.y + 900.0f, + gActors[D_i5_801BE314].obj.pos.z + 2800.0f + RAND_FLOAT_CENTERED(1000.0f), + 6.0f); + Macbeth_801AF70C(RAND_FLOAT_CENTERED(650.0f) + 11250.0f, 300.0f, RAND_FLOAT(650.0f) + -139000.0f, 0.7f); } } if (gCsFrameCount == 853) { - func_8007A568(gActors[D_i5_801BE314].obj.pos.x - 3500.0f, gActors[D_i5_801BE314].obj.pos.y + 500.0f, - gActors[D_i5_801BE314].obj.pos.z + 2500.0f, 14000.0f); + func_effect_8007A568(gActors[D_i5_801BE314].obj.pos.x - 3500.0f, + gActors[D_i5_801BE314].obj.pos.y + 500.0f, + gActors[D_i5_801BE314].obj.pos.z + 2500.0f, 14000.0f); for (i = 0; i < 8; i++) { - func_800794CC(gActors[D_i5_801BE314].obj.pos.x - 3500.0f + RAND_FLOAT_CENTERED(1000.0f), - gActors[D_i5_801BE314].obj.pos.y + 900.0f, - gActors[D_i5_801BE314].obj.pos.z + 1500.0f + RAND_FLOAT_CENTERED(1000.0f), 6.0f); - func_i5_801AF70C(RAND_FLOAT_CENTERED(650.0f) + 11250.0f, 300.0f, RAND_FLOAT(650.0f) + -139000.0f, + func_effect_800794CC(gActors[D_i5_801BE314].obj.pos.x - 3500.0f + RAND_FLOAT_CENTERED(1000.0f), + gActors[D_i5_801BE314].obj.pos.y + 900.0f, + gActors[D_i5_801BE314].obj.pos.z + 1500.0f + RAND_FLOAT_CENTERED(1000.0f), + 6.0f); + Macbeth_801AF70C(RAND_FLOAT_CENTERED(650.0f) + 11250.0f, 300.0f, RAND_FLOAT(650.0f) + -139000.0f, 0.7f); } - D_80178480 = 30; + D_ctx_80178480 = 30; } if (gCsFrameCount == 860) { - func_8007D9DC(gActors[D_i5_801BE314].obj.pos.x + 1000.0f, gActors[D_i5_801BE314].obj.pos.y + 20.0f, - -138500.0f, 100.0f, 1000.0f, 0); - func_8007A568(gActors[D_i5_801BE314].obj.pos.x - 1500.0f, gActors[D_i5_801BE314].obj.pos.y + 700.0f, - gActors[D_i5_801BE314].obj.pos.z + 3000.0f, 180.0f); + func_effect_8007D9DC(gActors[D_i5_801BE314].obj.pos.x + 1000.0f, + gActors[D_i5_801BE314].obj.pos.y + 20.0f, -138500.0f, 100.0f, 1000.0f, 0); + func_effect_8007A568(gActors[D_i5_801BE314].obj.pos.x - 1500.0f, + gActors[D_i5_801BE314].obj.pos.y + 700.0f, + gActors[D_i5_801BE314].obj.pos.z + 3000.0f, 180.0f); for (i = 0; i < 8; i++) { - func_800794CC(gActors[D_i5_801BE314].obj.pos.x - 1500.0f + RAND_FLOAT_CENTERED(1000.0f), - gActors[D_i5_801BE314].obj.pos.y + 1300.0f, - gActors[D_i5_801BE314].obj.pos.z + 2500.0f + RAND_FLOAT_CENTERED(1000.0f), 6.0f); - func_i5_801AF70C(RAND_FLOAT_CENTERED(650.0f) + 11250.0f, 300.0f, RAND_FLOAT(650.0f) + -139000.0f, + func_effect_800794CC(gActors[D_i5_801BE314].obj.pos.x - 1500.0f + RAND_FLOAT_CENTERED(1000.0f), + gActors[D_i5_801BE314].obj.pos.y + 1300.0f, + gActors[D_i5_801BE314].obj.pos.z + 2500.0f + RAND_FLOAT_CENTERED(1000.0f), + 6.0f); + Macbeth_801AF70C(RAND_FLOAT_CENTERED(650.0f) + 11250.0f, 300.0f, RAND_FLOAT(650.0f) + -139000.0f, 0.7f); } } if (gCsFrameCount == 880) { D_80137E84[0] = 1; D_Timer_80177BD0[0] = 10; - D_80178348 = D_80178350 = D_80178354 = 255; - D_80178358 = 255; - D_8017835C = 20; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; + D_ctx_80178358 = 255; + D_ctx_8017835C = 20; AUDIO_PLAY_SFX(0x2940F026, gActors[D_i5_801BE314].sfxSource, 4); - gBossActive = D_80178488 = 0; + gBossActive = D_ctx_80178488 = 0; } if (gCsFrameCount == 940) { player->unk_1D0++; - func_800A6148(); - player->pos.z = player->unk_138 = -(D_80177D20 + 210.0f); + func_play_800A6148(); + player->pos.z = player->unk_138 = -(D_ctx_80177D20 + 210.0f); player->pos.x = player->unk_0AC; - func_8007A568(player->pos.x - 1800.0f, -50.0f, player->pos.z + 5000.0f, 40.0f); - D_80178348 = D_80178350 = D_80178354 = D_80178340 = 255; - D_80178358 = 0; - D_8017835C = 8; - D_80177A48[0] = 0.0f; + func_effect_8007A568(player->pos.x - 1800.0f, -50.0f, player->pos.z + 5000.0f, 40.0f); + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = D_ctx_80178340 = 255; + D_ctx_80178358 = 0; + D_ctx_8017835C = 8; + D_ctx_80177A48[0] = 0.0f; player->unk_234 = 1; player->camAt.x = gCsCamAtX = player->camEye.x = gCsCamEyeX = player->pos.x; player->camAt.y = gCsCamAtY = player->pos.y + 70.0f; player->camEye.y = gCsCamEyeY = player->pos.y + 30.0f; - player->camEye.z = gCsCamEyeZ = (player->unk_138 + D_80177D20) - 300.0f; - player->camAt.z = gCsCamAtZ = player->unk_138 + D_80177D20; + player->camEye.z = gCsCamEyeZ = (player->unk_138 + D_ctx_80177D20) - 300.0f; + player->camAt.z = gCsCamAtZ = player->unk_138 + D_ctx_80177D20; player->unk_198 = player->timer_210 = 0; player->unk_190 = player->unk_194 = player->unk_188 = player->unk_18C = player->unk_118 = player->unk_114 = player->unk_4D8 = player->unk_034 = player->unk_174 = player->unk_178 = @@ -6191,7 +6208,7 @@ void func_i5_801AF8F4(Player* player) { player->wings.unk_08 = player->wings.unk_10 = player->unk_130 = player->unk_12C = player->unk_110 = 0.0f; player->unk_0D0 = 5.0f; - D_80177A48[3] = D_80177A48[6] = D_80177A48[7] = D_80177A48[8] = 0.0f; + D_ctx_80177A48[3] = D_ctx_80177A48[6] = D_ctx_80177A48[7] = D_ctx_80177A48[8] = 0.0f; player->unk_1D4 = 1; player->unk_1F4 = 0; player->pos.y = gGroundLevel - 3.0f; @@ -6203,65 +6220,65 @@ void func_i5_801AF8F4(Player* player) { break; case 7: if (!(gGameFrameCount & 3)) { - func_8007D0E0(player->pos.x - 1750.0f + RAND_FLOAT_CENTERED(700.0f), 10.0f, - player->pos.z + 5000.0f + RAND_FLOAT_CENTERED(700.0f), 5.0f); - func_8007C85C(player->pos.x - 1800.0f + RAND_FLOAT_CENTERED(40.0f), -100.0f, - player->pos.z + 5000.0f + RAND_FLOAT_CENTERED(40.0f), 9.0f); + func_effect_8007D0E0(player->pos.x - 1750.0f + RAND_FLOAT_CENTERED(700.0f), 10.0f, + player->pos.z + 5000.0f + RAND_FLOAT_CENTERED(700.0f), 5.0f); + func_effect_8007C85C(player->pos.x - 1800.0f + RAND_FLOAT_CENTERED(40.0f), -100.0f, + player->pos.z + 5000.0f + RAND_FLOAT_CENTERED(40.0f), 9.0f); } if ((gCsFrameCount >= 1059) && (gCsFrameCount < 2120)) { - Math_SmoothStepToF(&D_80177A48[0], 1.0f, 1.0f, 0.005f, 0.0f); - Math_SmoothStepToF(&D_80177A48[3], 1080.0f, 0.1f, D_80177A48[0] * 1.2f, 0.0f); - Matrix_RotateY(gCalcMatrix, -D_80177A48[3] * M_DTOR, 0); + Math_SmoothStepToF(&D_ctx_80177A48[0], 1.0f, 1.0f, 0.005f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[3], 1080.0f, 0.1f, D_ctx_80177A48[0] * 1.2f, 0.0f); + Matrix_RotateY(gCalcMatrix, -D_ctx_80177A48[3] * M_DTOR, 0); spE4.x = 0.0f; spE4.y = 0.0f; spE4.z = -300.0f; Matrix_MultVec3fNoTranslate(gCalcMatrix, &spE4, &spD8); gCsCamEyeX = player->pos.x + spD8.x; - gCsCamEyeZ = player->pos.z + D_80177D20 + spD8.z; + gCsCamEyeZ = player->pos.z + D_ctx_80177D20 + spD8.z; } if (gCsFrameCount >= 2120) { - Math_SmoothStepToF(&D_80177A48[0], 1.0f, 1.0f, 0.001f, 0.0f); - Math_SmoothStepToF(&D_80177A48[8], 20.0f, 0.1f, 0.1f, 0.0f); - Math_SmoothStepToF(&gCsCamEyeX, player->pos.x - 2000.0f, 0.1f, D_80177A48[8], 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[0], 1.0f, 1.0f, 0.001f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[8], 20.0f, 0.1f, 0.1f, 0.0f); + Math_SmoothStepToF(&gCsCamEyeX, player->pos.x - 2000.0f, 0.1f, D_ctx_80177A48[8], 0.0f); gCsCamEyeZ -= 1.0f; } if ((gCsFrameCount >= 2120) || (gCsFrameCount < 2175)) { Math_SmoothStepToF(&gCsCamAtY, player->pos.y + 70.0f, 0.1f, 8.0f, 0.0f); } if (gCsFrameCount == 2120) { - D_80177A48[0] = 0.0f; + D_ctx_80177A48[0] = 0.0f; } if (gCsFrameCount >= 2160) { player->vel.y = 4.0f; Math_SmoothStepToF(&player->unk_170, 2.0f, 1.0f, 0.3f, 0.0f); Math_SmoothStepToF(&player->unk_16C, 2.0f, 1.0f, 0.3f, 0.0f); if ((gCsFrameCount >= 2165) && (gCsFrameCount <= 2180)) { - func_8007BC7C(player->pos.x + RAND_FLOAT_CENTERED(30.0f), 0.0f, - RAND_FLOAT_CENTERED(30.0f) + player->unk_138, RAND_FLOAT(2.0f) + 3.5f); - func_8007BC7C(player->pos.x - RAND_FLOAT_CENTERED(30.0f), 0.0f, - RAND_FLOAT_CENTERED(30.0f) + player->unk_138, RAND_FLOAT(2.0f) + 3.5f); + func_effect_8007BC7C(player->pos.x + RAND_FLOAT_CENTERED(30.0f), 0.0f, + RAND_FLOAT_CENTERED(30.0f) + player->unk_138, RAND_FLOAT(2.0f) + 3.5f); + func_effect_8007BC7C(player->pos.x - RAND_FLOAT_CENTERED(30.0f), 0.0f, + RAND_FLOAT_CENTERED(30.0f) + player->unk_138, RAND_FLOAT(2.0f) + 3.5f); } - Math_SmoothStepToF(&D_80177A48[7], 4.5f, 0.1f, 0.3f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[7], 4.5f, 0.1f, 0.3f, 0.0f); player->unk_138 = player->pos.z; } - func_80045130(player); - func_80044868(player); - func_800444BC(player); - func_800ADF58(player); + func_tank_80045130(player); + func_tank_80044868(player); + func_tank_800444BC(player); + func_play_800ADF58(player); if (gCsFrameCount >= 2175) { - Math_SmoothStepToF(&gCsCamAtZ, gActors[3].obj.pos.z + D_80177D20 - 300.0f, 0.1f, 20.0f, 0.0f); + Math_SmoothStepToF(&gCsCamAtZ, gActors[3].obj.pos.z + D_ctx_80177D20 - 300.0f, 0.1f, 20.0f, 0.0f); Math_SmoothStepToF(&gCsCamAtY, gActors[3].obj.pos.y + 100.0f, 0.1f, 10.0f, 0.0f); } else { - player->camAt.z = gCsCamAtZ = player->unk_138 + D_80177D20; + player->camAt.z = gCsCamAtZ = player->unk_138 + D_ctx_80177D20; } - Math_SmoothStepToF(&player->pos.y, 260.0f, 0.1f, D_80177A48[7], 0.0f); + Math_SmoothStepToF(&player->pos.y, 260.0f, 0.1f, D_ctx_80177A48[7], 0.0f); break; } switch (gCsFrameCount) { case 973: - D_80177840 = 100; + D_ctx_80177840 = 100; break; case 340: Radio_PlayMessage(gMsg_ID_17471, RCID_BOSS_MACBETH); @@ -6275,9 +6292,9 @@ void func_i5_801AF8F4(Player* player) { case 835: case 845: case 860: - D_80178480 = 20; - D_80177A48[4] = -90.0f; - D_80177A48[5] = 360.0f; + D_ctx_80178480 = 20; + D_ctx_80177A48[4] = -90.0f; + D_ctx_80177A48[5] = 360.0f; break; case 910: AUDIO_PLAY_BGM(SEQ_ID_38); @@ -6287,7 +6304,7 @@ void func_i5_801AF8F4(Player* player) { break; case 1060: if (gTeamShields[2] > 0) { - func_i5_801AF27C(&gActors[5], 0); + Macbeth_801AF27C(&gActors[5], 0); } break; case 1130: @@ -6305,7 +6322,7 @@ void func_i5_801AF8F4(Player* player) { break; case 1240: if (gTeamShields[3] > 0) { - func_i5_801AF27C(&gActors[6], 1); + Macbeth_801AF27C(&gActors[6], 1); } break; case 1310: @@ -6325,21 +6342,21 @@ void func_i5_801AF8F4(Player* player) { } break; case 1420: - if (D_800D3180[LEVEL_ZONESS] != 0) { - func_i5_801AF44C(); + if (D_play_800D3180[LEVEL_ZONESS] != 0) { + Macbeth_801AF44C(); } break; case 1460: D_i5_801BA88C = 170.0f; break; case 1500: - if (D_800D3180[LEVEL_ZONESS] != 0) { + if (D_play_800D3180[LEVEL_ZONESS] != 0) { Radio_PlayMessage(gMsg_ID_17300, RCID_KATT); } break; case 1640: if (gTeamShields[1] > 0) { - func_i5_801AF27C(&gActors[7], 2); + Macbeth_801AF27C(&gActors[7], 2); } break; case 1660: @@ -6363,14 +6380,14 @@ void func_i5_801AF8F4(Player* player) { gOverlayStage = 1; break; case 1817: - D_80177830 = 1; + D_ctx_80177830 = 1; break; case 1960: - func_i5_801AF27C(&gActors[3], 3); - gActors[3].info.hitbox = SEGMENTED_TO_VIRTUAL(D_800CBF34); + Macbeth_801AF27C(&gActors[3], 3); + gActors[3].info.hitbox = SEGMENTED_TO_VIRTUAL(D_edata_800CBF34); break; case 2017: - D_80177830 = 0; + D_ctx_80177830 = 0; break; case 2040: gActors[5].state++; @@ -6382,7 +6399,7 @@ void func_i5_801AF8F4(Player* player) { gActors[7].state++; break; case 2160: - D_80161A44 = 30000.0f; + D_game_80161A44 = 30000.0f; player->unk_240 = 1; func_8001CA24(0); AUDIO_PLAY_SFX(0x01008016, player->sfxSource, 0); @@ -6399,36 +6416,36 @@ void func_i5_801AF8F4(Player* player) { if (player->timer_210 != 0) { player->timer_210--; Math_SmoothStepToF(&player->unk_114, -player->unk_118, 0.03f, 0.5f, 0.0001f); - Math_SmoothStepToF(&player->unk_0B4, D_80177D08 * .3f, 0.1f, 2.0f, 0.0001f); - D_801779E4 = Math_SmoothStepToF(&player->unk_0AC, player->unk_0B8, 0.1f, player->unk_0B4, 0.0001f); - D_801779F4 = Math_SmoothStepToF(&player->unk_0B0, player->unk_0BC, 0.1f, player->unk_0B4, 0.0001f); + Math_SmoothStepToF(&player->unk_0B4, D_ctx_80177D08 * .3f, 0.1f, 2.0f, 0.0001f); + D_ctx_801779E4 = Math_SmoothStepToF(&player->unk_0AC, player->unk_0B8, 0.1f, player->unk_0B4, 0.0001f); + D_ctx_801779F4 = Math_SmoothStepToF(&player->unk_0B0, player->unk_0BC, 0.1f, player->unk_0B4, 0.0001f); } else { Math_SmoothStepToF(&player->unk_114, 0.0f, 0.03f, 0.5f, 0.0001f); } - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 20000.0f, 0); - Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 20000.0f, 0); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 20000.0f, 0); - Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 20000.0f, 0); - Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 20000.0f, 0); - Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_ctx_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_ctx_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_ctx_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_ctx_80177A48[0], 20000.0f, 0); player->camAt.y += zeroVar; if (player->unk_1D0 >= 6) { - player->camEye.y += D_8017847C * 10.0f; + player->camEye.y += D_ctx_8017847C * 10.0f; } if (gCsFrameCount > 2500) { - D_80178348 = D_80178350 = D_80178354 = 0; - D_80178358 = 255; - if (D_80178340 == 255) { + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; + D_ctx_80178358 = 255; + if (D_ctx_80178340 == 255) { player->state_1C8 = PLAYERSTATE_1C8_6; - D_8017837C = 4; - func_800A6148(); + D_ctx_8017837C = 4; + func_play_800A6148(); Audio_FadeOutAll(10); - D_800D3180[LEVEL_MACBETH] = Play_CheckMedalStatus(150) + 1; + D_play_800D3180[LEVEL_MACBETH] = Play_CheckMedalStatus(150) + 1; } } } -void func_i5_801B28BC(Actor* actor) { +void Macbeth_801B28BC(Actor* actor) { Vec3f sp5C; Vec3f sp50; Vec3f sp44; @@ -6497,7 +6514,8 @@ void func_i5_801B28BC(Actor* actor) { sp5C.y = 70.0f; sp5C.z = -70.0f; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp5C, &sp44); - func_80078E50(actor->obj.pos.x + sp44.x, actor->obj.pos.y + sp44.y, actor->obj.pos.z + sp44.z, 3.1f); + func_effect_80078E50(actor->obj.pos.x + sp44.x, actor->obj.pos.y + sp44.y, actor->obj.pos.z + sp44.z, + 3.1f); } break; case 15: @@ -6533,7 +6551,8 @@ void func_i5_801B28BC(Actor* actor) { sp5C.y = 70.0f; sp5C.z = -70.0f; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp5C, &sp44); - func_80078E50(actor->obj.pos.x + sp44.x, actor->obj.pos.y + sp44.y, actor->obj.pos.z + sp44.z, 3.1f); + func_effect_80078E50(actor->obj.pos.x + sp44.x, actor->obj.pos.y + sp44.y, actor->obj.pos.z + sp44.z, + 3.1f); } break; case 20: @@ -6601,7 +6620,7 @@ static f32 D_i5_801BA8DC[5] = { 500.0f, 500.0f, 600.0f, 2500.0f, 590.0f }; static f32 D_i5_801BA8F0[4] = { 90.0f, -90.0f, 0.0f, 0.0f }; -void func_i5_801B3554(Actor* actor, s32 arg1) { +void Macbeth_801B3554(Actor* actor, s32 arg1) { Player* player; player = &gPlayer[0]; @@ -6634,7 +6653,7 @@ void func_i5_801B3554(Actor* actor, s32 arg1) { static f32 D_i5_801BA900 = 90.0f; -void func_i5_801B3718(void) { +void Macbeth_801B3718(void) { Actor* actor = &gActors[8]; Actor_Initialize(actor); @@ -6662,7 +6681,7 @@ void func_i5_801B3718(void) { AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); } -void func_i5_801B38E0(void) { +void Macbeth_801B38E0(void) { s16 i; s16 j; @@ -6711,23 +6730,24 @@ void func_i5_801B38E0(void) { PlayerShot_Initialize(&gPlayerShots[i]); } - D_801782B8 = D_801782BC = D_801782C0 = D_801782D0 = gBossActive = D_8017828C = D_8017812C = D_80177E70 = - D_80177E78 = D_80177E80 = 0; - D_80177F10.x = D_80177F10.y = D_80177F10.z = D_80177E88.x = D_80177E88.y = D_80177E88.z = 0.0f; + D_ctx_801782B8 = D_ctx_801782BC = D_ctx_801782C0 = D_ctx_801782D0 = gBossActive = D_ctx_8017828C = D_ctx_8017812C = + D_ctx_80177E70 = D_ctx_80177E78 = D_ctx_80177E80 = 0; + D_ctx_80177F10.x = D_ctx_80177F10.y = D_ctx_80177F10.z = D_ctx_80177E88.x = D_ctx_80177E88.y = D_ctx_80177E88.z = + 0.0f; for (i = 0; i < 10; i++) { - D_80177E98[i].x = D_80177E98[i].y = D_80177E98[i].z = 100.0f; + D_ctx_80177E98[i].x = D_ctx_80177E98[i].y = D_ctx_80177E98[i].z = 100.0f; } for (i = 0; i < 2; i++) { - D_80176550[i] = 0; + D_ctx_80176550[i] = 0; for (j = 0; j < 100; j++) { - D_80176878[i][j] = -5000.0f; + D_ctx_80176878[i][j] = -5000.0f; } } } -void func_i5_801B3D04(Player* player) { +void Macbeth_801B3D04(Player* player) { f32 zeroVar = 0.0f; gCsCamEyeX = player->pos.x; @@ -6735,24 +6755,24 @@ void func_i5_801B3D04(Player* player) { gCsCamEyeZ = player->pos.z + player->unk_144 + 50.0f; switch (player->unk_1D0) { case 0: - gCsFrameCount = gBossActive = D_80178488 = 1; + gCsFrameCount = gBossActive = D_ctx_80178488 = 1; D_i5_801BA894[4] = 80.0f; D_i5_801BA894[3] = D_i5_801BA894[4]; D_i5_801BA894[2] = D_i5_801BA894[4]; D_i5_801BA894[1] = D_i5_801BA894[4]; D_i5_801BA894[0] = D_i5_801BA894[4]; - D_80178348 = 255; - D_80178350 = 255; - D_80178354 = 255; - D_80178340 = D_80178358 = D_80177A10[9] = 0; - D_80177A48[0] = 0.0f; + D_ctx_80178348 = 255; + D_ctx_80178350 = 255; + D_ctx_80178354 = 255; + D_ctx_80178340 = D_ctx_80178358 = D_ctx_80177A10[9] = 0; + D_ctx_80177A48[0] = 0.0f; player->unk_1D0++; /* fallthrough */ case 1: D_i5_801BE240 = 2000.0f; D_i5_801BE244 = 2000.0f; D_i5_801BE248 = 2000.0f; - Math_SmoothStepToF(D_80177A48, 0.1f, 1.0f, 0.01f, 0.0f); + Math_SmoothStepToF(D_ctx_80177A48, 0.1f, 1.0f, 0.01f, 0.0f); Math_SmoothStepToF(&player->unk_0D0, 4.9f, 0.1f, 1.0f, 0.0f); Math_SmoothStepToF(&player->unk_08C, 0.0f, 0.1f, 1.0f, 0.0f); gCsCamEyeX = player->pos.x; @@ -6764,17 +6784,17 @@ void func_i5_801B3D04(Player* player) { gCsCamAtX = player->pos.x; gCsCamAtY = player->pos.y + 30.0f; gCsCamAtZ = player->pos.z + player->unk_144; - D_80178348 = 255; - D_80178350 = 255; - D_80178354 = 255; - if (D_80177A10[9] >= 248) { - D_80177A10[9] = 255; + D_ctx_80178348 = 255; + D_ctx_80178350 = 255; + D_ctx_80178354 = 255; + if (D_ctx_80177A10[9] >= 248) { + D_ctx_80177A10[9] = 255; } else { - D_80177A10[9] += 8; + D_ctx_80177A10[9] += 8; } - D_80178340 = D_80178358 = D_80177A10[9]; + D_ctx_80178340 = D_ctx_80178358 = D_ctx_80177A10[9]; if (gCsFrameCount >= 41) { - D_80177A10[9] = 255; + D_ctx_80177A10[9] = 255; player->camEye.x = gCsCamEyeX = 0.0f; player->camEye.y = gCsCamEyeY = 21.182106f; player->camEye.z = gCsCamEyeZ = -112.08748f; @@ -6785,17 +6805,17 @@ void func_i5_801B3D04(Player* player) { player->pos.x = 0.0f; player->pos.y = -3.0f; player->unk_08C = 0.0f; - func_i5_801B38E0(); + Macbeth_801B38E0(); } - func_80045130(player); - func_80044868(player); - func_80045678(player); - func_80045E7C(player); - func_800A8BA4(player); - func_800ADF58(player); + func_tank_80045130(player); + func_tank_80044868(player); + func_tank_80045678(player); + func_tank_80045E7C(player); + func_play_800A8BA4(player); + func_play_800ADF58(player); break; case 2: - Math_SmoothStepToF(D_80177A48, 0.01f, 0.1f, 0.01f, 0.0f); + Math_SmoothStepToF(D_ctx_80177A48, 0.01f, 0.1f, 0.01f, 0.0f); gCsCamEyeX = gCsCamAtX = player->pos.x; gCsCamEyeY = 3520.0f; gCsCamAtY = 0.0f; @@ -6805,19 +6825,19 @@ void func_i5_801B3D04(Player* player) { D_i5_801BE244 = 2.0f; D_i5_801BE248 = 2.0f; if (gCsFrameCount >= 86) { - D_80178358 = D_80178340 = D_80177A10[9]; - D_80177A10[9] -= 10; - if (D_80177A10[9] < 11) { - D_80178358 = D_80178340 = 0; + D_ctx_80178358 = D_ctx_80178340 = D_ctx_80177A10[9]; + D_ctx_80177A10[9] -= 10; + if (D_ctx_80177A10[9] < 11) { + D_ctx_80178358 = D_ctx_80178340 = 0; player->unk_1D0 = 10; } } - func_80045130(player); - func_80044868(player); - func_80045678(player); - func_80045E7C(player); - func_800A8BA4(player); - func_800ADF58(player); + func_tank_80045130(player); + func_tank_80044868(player); + func_tank_80045678(player); + func_tank_80045E7C(player); + func_play_800A8BA4(player); + func_play_800ADF58(player); break; case 10: player->unk_1D0 = 11; @@ -6825,7 +6845,7 @@ void func_i5_801B3D04(Player* player) { D_i5_801BE240 = 0.2f; /* fallthrough */ case 11: - Math_SmoothStepToF(D_80177A48, 0.01f, 0.1f, 0.01f, 0.0f); + Math_SmoothStepToF(D_ctx_80177A48, 0.01f, 0.1f, 0.01f, 0.0f); gCsCamEyeX = gCsCamAtX = player->pos.x; gCsCamEyeY = 3520.0f; gCsCamAtY = 0.0f; @@ -6849,35 +6869,35 @@ void func_i5_801B3D04(Player* player) { } Math_SmoothStepToF(&player->unk_0D0, 4.9f, 0.1f, 1.0f, 0.0f); Math_SmoothStepToF(&player->unk_08C, 0.0f, 0.1f, 1.0f, 0.0f); - func_80045130(player); - func_80044868(player); - func_80045678(player); - func_80045E7C(player); - func_800A8BA4(player); - func_800ADF58(player); + func_tank_80045130(player); + func_tank_80044868(player); + func_tank_80045678(player); + func_tank_80045E7C(player); + func_play_800A8BA4(player); + func_play_800ADF58(player); break; case 12: break; } switch (gCsFrameCount) { case 755: - D_80177830 = 1; + D_ctx_80177830 = 1; break; case 1025: - D_80177830 = 0; + D_ctx_80177830 = 0; break; case 50: AUDIO_PLAY_BGM(SEQ_ID_38); break; case 100: - D_80177840 = 100; + D_ctx_80177840 = 100; break; case 160: Radio_PlayMessage(gMsg_ID_20010, RCID_FOX); break; case 230: if (gTeamShields[2] > 0.0f) { - func_i5_801B3554(&gActors[0], 0); + Macbeth_801B3554(&gActors[0], 0); } break; case 260: @@ -6889,13 +6909,13 @@ void func_i5_801B3D04(Player* player) { Radio_PlayMessage(gMsg_ID_20333, RCID_ROB64); break; default: - func_80048AC0(2); + func_demo_80048AC0(2); break; } break; case 380: if (gTeamShields[3] > 0.0f) { - func_i5_801B3554(&gActors[1], 1); + Macbeth_801B3554(&gActors[1], 1); } break; case 410: @@ -6907,13 +6927,13 @@ void func_i5_801B3D04(Player* player) { Radio_PlayMessage(gMsg_ID_20332, RCID_ROB64); break; default: - func_80048AC0(3); + func_demo_80048AC0(3); break; } break; case 530: if (gTeamShields[1] > 0.0f) { - func_i5_801B3554(&gActors[2], 2); + Macbeth_801B3554(&gActors[2], 2); } break; case 560: @@ -6925,22 +6945,22 @@ void func_i5_801B3D04(Player* player) { Radio_PlayMessage(gMsg_ID_20331, RCID_ROB64); break; default: - func_80048AC0(1); + func_demo_80048AC0(1); break; } break; case 680: - if (D_800D3180[LEVEL_ZONESS] != 0) { - func_i5_801B3718(); + if (D_play_800D3180[LEVEL_ZONESS] != 0) { + Macbeth_801B3718(); } break; case 1027: - if (D_800D3180[LEVEL_ZONESS] != 0) { + if (D_play_800D3180[LEVEL_ZONESS] != 0) { Radio_PlayMessage(gMsg_ID_17350, RCID_KATT); } break; case 1065: - if (D_800D3180[LEVEL_ZONESS] != 0) { + if (D_play_800D3180[LEVEL_ZONESS] != 0) { gActors[8].state++; } break; @@ -6954,7 +6974,7 @@ void func_i5_801B3D04(Player* player) { gActors[2].state++; break; case 1158: - if (D_800D3180[LEVEL_ZONESS] != 0) { + if (D_play_800D3180[LEVEL_ZONESS] != 0) { Object_Kill(&gActors[8].obj, gActors[8].sfxSource); } /* fallthrough */ @@ -6962,34 +6982,34 @@ void func_i5_801B3D04(Player* player) { gOverlayStage = 1; break; case 1200: - func_i5_801B3554(&gActors[3], 3); - D_80178488 = 0; + Macbeth_801B3554(&gActors[3], 3); + D_ctx_80178488 = 0; break; } - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], D_i5_801BE240, 0.0f); - Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], D_i5_801BE244, 0.0f); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], D_i5_801BE248, 0.0f); - Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], D_i5_801BE240, 0.0f); - Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], D_i5_801BE244, 0.0f); - Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], D_i5_801BE248, 0.0f); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], D_i5_801BE240, 0.0f); + Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_ctx_80177A48[0], D_i5_801BE244, 0.0f); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], D_i5_801BE248, 0.0f); + Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_ctx_80177A48[0], D_i5_801BE240, 0.0f); + Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_ctx_80177A48[0], D_i5_801BE244, 0.0f); + Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_ctx_80177A48[0], D_i5_801BE248, 0.0f); player->camAt.y += zeroVar; if ((gCsFrameCount >= 850) && !(gGameFrameCount & 0xF)) { - func_i5_801ACF6C(); + Macbeth_801ACF6C(); } if (gCsFrameCount == 1220) { SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 60); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 60); } if (gCsFrameCount > 1280) { - D_80178348 = D_80178350 = D_80178354 = 0; - D_80178358 = 255; - if (D_80178340 == 255) { + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; + D_ctx_80178358 = 255; + if (D_ctx_80178340 == 255) { player->state_1C8 = PLAYERSTATE_1C8_6; - D_8017837C = 4; - func_800A6148(); + D_ctx_8017837C = 4; + func_play_800A6148(); Audio_FadeOutAll(10); - D_800D3180[LEVEL_MACBETH] = Play_CheckMedalStatus(150) + 1; + D_play_800D3180[LEVEL_MACBETH] = Play_CheckMedalStatus(150) + 1; } } } diff --git a/src/overlays/ovl_i5/fox_ti.c b/src/overlays/ovl_i5/fox_ti.c index 970660a7..ff5d3d20 100644 --- a/src/overlays/ovl_i5/fox_ti.c +++ b/src/overlays/ovl_i5/fox_ti.c @@ -15,7 +15,26 @@ #include "assets/ast_landmaster.h" #include "assets/ast_enmy_planet.h" -extern Gfx D_Gfx_800D94D0[]; +typedef struct { + /* 0x00 */ PosRot unk_00; + /* 0x18 */ u16 unk_18; +} UnkStruct_i5_801BD738; // size = 0x1C + +typedef struct { + /* 0x00 */ PosRot unk_00; + /* 0x18 */ f32 unk_18; + /* 0x1C */ f32 unk_1C; + /* 0x20 */ f32 unk_20; + /* 0x24 */ s16 unk_24; + /* 0x26 */ u16 unk_26; +} UnkStruct_i5_801BBF00; // size = 0x28 + +typedef struct { + s32 unk_00; + s32 unk_04; + Actor* actor; + s32 unk_0C; +} UnkStruct_i5_801B8198; // size = 0x10 s32* D_i5_801BBEF0; f32* D_i5_801BBEF4; @@ -55,16 +74,16 @@ static bool D_i5_801B750C[3] = { false, false, false }; static f32 D_i5_801B7518[2] = { 20.0f, 60.0f }; -void func_i5_80188F30(void) { +void Titania_80188F30(void) { s32 i; for (i = 0; i < 3; i++) { D_i5_801B750C[i] = false; } - D_i5_801BA1E8 = 99; + D_MA_801BA1E8 = 99; } -void func_i5_80188F60(Effect* effect) { +void Titania_80188F60(Effect* effect) { if (effect->timer_50 == 0) { effect->unk_44 -= 16; if (effect->unk_44 < 17) { @@ -73,7 +92,7 @@ void func_i5_80188F60(Effect* effect) { } } -void func_i5_80188FA8(Effect* effect) { +void Titania_80188FA8(Effect* effect) { Matrix_Scale(gGfxMatrix, effect->scale2 * 0.5f, effect->scale2, effect->scale2, 1); Matrix_RotateX(gGfxMatrix, -(M_DTOR * 90), 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -82,7 +101,7 @@ void func_i5_80188FA8(Effect* effect) { gSPDisplayList(gMasterDisp++, D_landmaster_3007E70); } -void func_i5_80189090(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot, f32 scale2) { +void Titania_80189090(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot, f32 scale2) { Effect_Initialize(effect); effect->obj.status = OBJ_INIT; effect->obj.id = OBJ_EFFECT_368; @@ -96,24 +115,24 @@ void func_i5_80189090(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot, f3 Object_SetInfo(&effect->info, effect->obj.id); } -void func_i5_80189120(f32 xPos, f32 yPos, f32 zPos, f32 yRot, f32 scale2) { +void Titania_80189120(f32 xPos, f32 yPos, f32 zPos, f32 yRot, f32 scale2) { s32 i; for (i = 50; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i5_80189090(&gEffects[i], xPos, yPos, zPos, yRot, scale2); + Titania_80189090(&gEffects[i], xPos, yPos, zPos, yRot, scale2); break; } } } -void func_i5_80189194(Actor* actor) { - func_i5_801B49D0(actor); +void Titania_80189194(Actor* actor) { + Ground_801B49D0(actor); } static Vec3f D_i5_801B7520 = { -150.0f, 0.0f, 0.0f }; -void func_i5_801891B4(s32 limbIndex, Vec3f* rot, void* data) { +void Titania_801891B4(s32 limbIndex, Vec3f* rot, void* data) { Actor* actor = (Actor*) data; if (limbIndex == 2) { @@ -121,7 +140,7 @@ void func_i5_801891B4(s32 limbIndex, Vec3f* rot, void* data) { } } -void func_i5_801891F4(Actor* actor) { +void Titania_801891F4(Actor* actor) { f32 temp_fs0; f32 temp_fs1; f32 var_fv1; @@ -148,7 +167,7 @@ void func_i5_801891F4(Actor* actor) { Math_SmoothStepToAngle(&actor->fwork[5], Math_RadToDeg(Math_Atan2F(temp2, temp)), 0.2f, 5.0f, 0.01f); } -void func_i5_80189380(Actor* actor) { +void Titania_80189380(Actor* actor) { Vec3f sp8C; Vec3f sp80; Vec3f sp74; @@ -194,15 +213,15 @@ void func_i5_80189380(Actor* actor) { sp5C.y = 0.0f; sp5C.z = 70.0f; - func_8007EE68(0x161, &sp80, &sp74, &sp68, &sp5C, 1.0f); + func_effect_8007EE68(0x161, &sp80, &sp74, &sp68, &sp5C, 1.0f); sp80.y += 20.0f; - func_8007EE68(0x161, &sp80, &sp74, &sp68, &sp5C, 1.0f); + func_effect_8007EE68(0x161, &sp80, &sp74, &sp68, &sp5C, 1.0f); } static Vec3f D_i5_801B752C = { -50.0f, 0.0f, -20.0f }; static Vec3f D_i5_801B7538 = { 50.0f, 0.0f, -20.0f }; -void func_i5_801895B8(Actor* actor) { +void Titania_801895B8(Actor* actor) { Vec3f sp54; Vec3f sp48; f32 sp44; @@ -233,11 +252,11 @@ void func_i5_801895B8(Actor* actor) { if (fabsf(actor->obj.pos.z - gPlayer[0].unk_138) < 200.0f) { actor->fwork[7] = 0.0f; } - func_i5_801891F4(actor); + Titania_801891F4(actor); } if (actor->timer_0BC == 0) { actor->timer_0BC = 40; - func_i5_80189380(actor); + Titania_80189380(actor); if ((fabsf(actor->obj.pos.z - gPlayer[0].unk_138) > 200.0f) && (actor->iwork[0] == 1)) { actor->fwork[6] = -10.0f; } @@ -245,7 +264,7 @@ void func_i5_801895B8(Actor* actor) { break; } - func_i5_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_80177D20, &sp44, &sp3C, &sp40); + Ground_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_ctx_80177D20, &sp44, &sp3C, &sp40); actor->obj.pos.y = sp3C; if (actor->obj.rot.x < sp44 * M_RTOD) { @@ -265,14 +284,14 @@ void func_i5_801895B8(Actor* actor) { Matrix_RotateY(gCalcMatrix, actor->obj.rot.y * M_DTOR, 0); Matrix_Push(&gCalcMatrix); - if (!(actor->iwork[2] & 1) && ((actor->obj.pos.z + D_80177D20) > -3800.0f)) { + if (!(actor->iwork[2] & 1) && ((actor->obj.pos.z + D_ctx_80177D20) > -3800.0f)) { Matrix_RotateX(gCalcMatrix, actor->obj.rot.x * M_DTOR, 1); Matrix_RotateZ(gCalcMatrix, actor->obj.rot.z * M_DTOR, 1); Matrix_MultVec3fNoTranslate(gCalcMatrix, &D_i5_801B752C, &sp48); - func_i5_80189120(actor->obj.pos.x + sp48.x, actor->obj.pos.y + sp48.y, actor->obj.pos.z + sp48.z, + Titania_80189120(actor->obj.pos.x + sp48.x, actor->obj.pos.y + sp48.y, actor->obj.pos.z + sp48.z, actor->obj.pos.y, 1.3f); Matrix_MultVec3fNoTranslate(gCalcMatrix, &D_i5_801B7538, &sp48); - func_i5_80189120(actor->obj.pos.x + sp48.x, actor->obj.pos.y + sp48.y, actor->obj.pos.z + sp48.z, + Titania_80189120(actor->obj.pos.x + sp48.x, actor->obj.pos.y + sp48.y, actor->obj.pos.z + sp48.z, actor->obj.pos.y, 1.3f); } @@ -295,28 +314,28 @@ void func_i5_801895B8(Actor* actor) { } else { actor->unk_044 = 0; } - func_80066254(actor); + func_enmy_80066254(actor); actor->info.bonus = 0; - func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 8.0f); - func_8007C120(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, actor->vel.x, actor->vel.y, - actor->vel.z, 0.1f, 30); - func_8007A6F0(&actor->obj.pos, 0x2903A008); + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, 8.0f); + func_effect_8007C120(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, actor->vel.x, actor->vel.y, + actor->vel.z, 0.1f, 30); + func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); Object_Kill(&actor->obj, actor->sfxSource); } } -void func_i5_80189AFC(Actor* actor) { +void Titania_80189AFC(Actor* actor) { Animation_GetFrameData(&D_TI1_700C8D8, 0, actor->vwork); actor->vwork[3].z = actor->fwork[5] + 270.0f; - Animation_DrawSkeleton(1, D_TI1_700C964, actor->vwork, NULL, func_i5_801891B4, actor, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_TI1_700C964, actor->vwork, NULL, Titania_801891B4, actor, &gIdentityMatrix); } static Vec3f D_i5_801B7544 = { 0.0f, -50.0f, 178.0f }; -void func_i5_80189B80(Actor* actor) { +void Titania_80189B80(Actor* actor) { f32 sp2C; - func_i5_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_80177D20, &sp2C, &actor->obj.pos.y, &sp2C); + Ground_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_ctx_80177D20, &sp2C, &actor->obj.pos.y, &sp2C); actor->health = 10; actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_TI_60068F0); Matrix_RotateY(gCalcMatrix, actor->obj.rot.y * M_DTOR, 0); @@ -328,7 +347,7 @@ void func_i5_80189B80(Actor* actor) { actor->fwork[2] += actor->obj.pos.z; } -void func_i5_80189CC8(Actor* actor) { +void Titania_80189CC8(Actor* actor) { static Vec3f D_i5_801B7550 = { 0.0f, -50.0f, 178.0f }; static Vec3f D_i5_801B755C = { 0.0f, 0.0f, 90.0f }; Vec3f sp64; @@ -347,10 +366,10 @@ void func_i5_80189CC8(Actor* actor) { AUDIO_PLAY_SFX(0x2903A008, actor->sfxSource, 4); actor->timer_0CA[0] = actor->unk_044 = 0; actor->info.unk_1C = 0.0f; - func_80066254(actor); + func_enmy_80066254(actor); actor->info.bonus = 0; actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_TI_6006924); - func_8007D0E0(actor->fwork[0], actor->fwork[1], actor->fwork[2], 2.0f); + func_effect_8007D0E0(actor->fwork[0], actor->fwork[1], actor->fwork[2], 2.0f); } } @@ -397,19 +416,19 @@ void func_i5_80189CC8(Actor* actor) { sp40.z = 0.0f; if ((actor->timer_0BC < 15) && ((actor->timer_0BC % 7) == 0)) { - func_8007EE68(0x161, (Vec3f*) &actor->fwork[0], &sp40, &actor->obj.rot, &D_i5_801B755C, 1.0f); + func_effect_8007EE68(0x161, (Vec3f*) &actor->fwork[0], &sp40, &actor->obj.rot, &D_i5_801B755C, 1.0f); if (actor->timer_0BC == 0) { actor->timer_0BC = 90; } } } else if (!(gGameFrameCount & 7) && (Rand_ZeroOne() < 0.5f)) { AUDIO_PLAY_SFX(0x11000027, actor->sfxSource, 4); - func_8007C120(actor->fwork[0], actor->fwork[1], actor->fwork[2], 0.0f, 0.0f, 0.0f, 0.1f, 7); + func_effect_8007C120(actor->fwork[0], actor->fwork[1], actor->fwork[2], 0.0f, 0.0f, 0.0f, 0.1f, 7); actor->timer_0C6 = 4; } } -void func_i5_8018A1C0(Actor* actor) { +void Titania_8018A1C0(Actor* actor) { gSPDisplayList(gMasterDisp++, D_TI1_700C4B0); Matrix_Translate(gGfxMatrix, 0.0f, -50.0f, 178.0f, 1); Matrix_RotateY(gGfxMatrix, actor->fwork[4] * M_DTOR, 1); @@ -424,12 +443,12 @@ void func_i5_8018A1C0(Actor* actor) { static f32 D_i5_801B7568[7] = { 1.0f, 0.0f, 25.0f, 0.0f, 12.0f, 0.0f, 12.0f }; -Gfx* D_i5_801B7584[10] = { +Gfx* D_TI_801B7584[10] = { D_TI1_700DDF0, D_TI1_700D9B0, D_TI1_700DF70, D_TI1_700DC50, D_TI1_700DED0, D_TI1_700DAD0, D_TI1_700DBB0, D_TI1_700E030, D_TI1_700D880, D_TI1_700D740, }; -void func_i5_8018A2E8(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { +void Titania_8018A2E8(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { Actor_Initialize(actor); actor->obj.status = OBJ_ACTIVE; @@ -447,28 +466,28 @@ void func_i5_8018A2E8(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_i5_801B7568); } -void func_i5_8018A3F4(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { +void Titania_8018A3F4(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { s32 i; for (i = 0; i < ARRAY_COUNT(gActors); i++) { if (gActors[i].obj.status == OBJ_FREE) { - func_i5_8018A2E8(&gActors[i], xPos, yPos, zPos, xVel, yVel, zVel); + Titania_8018A2E8(&gActors[i], xPos, yPos, zPos, xVel, yVel, zVel); gActors[i].info.damage = 0; break; } } } -void func_i5_8018A474(Actor* actor) { +void Titania_8018A474(Actor* actor) { s32 i; for (i = 0; i < 4; i++) { - func_i5_8018A3F4(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, RAND_FLOAT_CENTERED(40.0f), + Titania_8018A3F4(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, RAND_FLOAT_CENTERED(40.0f), RAND_FLOAT_CENTERED(40.0f), RAND_FLOAT(-20.0f)); } } -void func_i5_8018A544(Actor* actor) { +void Titania_8018A544(Actor* actor) { f32 temp_fv0; f32 temp_fv1; f32 sp4C; @@ -487,23 +506,23 @@ void func_i5_8018A544(Actor* actor) { actor->health += actor->damage; if (actor->scale == 1.0f) { if (actor->health >= 10) { - func_8007A6F0(&actor->obj.pos, 0x1903400F); + func_effect_8007A6F0(&actor->obj.pos, 0x1903400F); if ((Actor*) actor->iwork[0] != NULL) { ((Actor*) actor->iwork[0])->iwork[actor->iwork[1]] = 0; } - func_8007A900(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 8.0f, 0xFF, 8, 1); + func_effect_8007A900(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 8.0f, 0xFF, 8, 1); if (Rand_ZeroOne() < 0.3f) { actor->unk_044 = 1; } else { - func_i5_8018A474(actor); + Titania_8018A474(actor); actor->unk_044 = 0; } - func_80066254(actor); + func_enmy_80066254(actor); actor->info.bonus = 0; } Object_Kill(&actor->obj, actor->sfxSource); } else { - func_8007A900(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 8.0f, 0xFF, 8, 1); + func_effect_8007A900(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 8.0f, 0xFF, 8, 1); Object_Kill(&actor->obj, actor->sfxSource); if ((Actor*) actor->iwork[0] != NULL) { @@ -514,7 +533,7 @@ void func_i5_8018A544(Actor* actor) { if (actor->unk_046 == 2) { actor->gravity = 0.0f; - func_i5_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_80177D20, &sp4C, &sp44, &sp48); + Ground_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_ctx_80177D20, &sp4C, &sp44, &sp48); actor->fwork[0] = sp4C; actor->fwork[1] = sp44; actor->fwork[2] = sp48; @@ -522,7 +541,7 @@ void func_i5_8018A544(Actor* actor) { } actor->gravity = 3.0f; - func_i5_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_80177D20, &sp4C, &sp44, &sp48); + Ground_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_ctx_80177D20, &sp4C, &sp44, &sp48); actor->fwork[0] = sp4C; actor->fwork[1] = sp44; actor->fwork[2] = sp48; @@ -576,7 +595,7 @@ void func_i5_8018A544(Actor* actor) { } } -void func_i5_8018AABC(Actor* actor) { +void Titania_8018AABC(Actor* actor) { if (actor->scale != 1.0f) { Matrix_Scale(gGfxMatrix, actor->scale, actor->scale, actor->scale, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -584,7 +603,7 @@ void func_i5_8018AABC(Actor* actor) { gSPDisplayList(gMasterDisp++, D_TI1_700E3F0); } -void func_i5_8018AB44(Actor* actor) { +void Titania_8018AB44(Actor* actor) { f32 sp3C; f32 sp38; f32 sp34; @@ -592,7 +611,7 @@ void func_i5_8018AB44(Actor* actor) { switch (actor->state) { case 0: actor->gravity = 1.0f; - func_i5_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_80177D20, &sp3C, &sp34, &sp38); + Ground_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_ctx_80177D20, &sp3C, &sp34, &sp38); if (actor->obj.pos.y <= (sp34 + 3.0f)) { AUDIO_PLAY_SFX(0x19000024, actor->sfxSource, 4); actor->obj.pos.y = sp34 + 3.0f; @@ -615,16 +634,16 @@ void func_i5_8018AB44(Actor* actor) { case 2: actor->unk_044 = 0; - func_80066254(actor); + func_enmy_80066254(actor); actor->info.bonus = 0; - func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 10.0f, actor->obj.pos.z, 6.0f); - func_8007A6F0(&actor->obj.pos, 0x2903B009); + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 10.0f, actor->obj.pos.z, 6.0f); + func_effect_8007A6F0(&actor->obj.pos, 0x2903B009); Object_Kill(&actor->obj, actor->sfxSource); break; case 3: - func_8007A6F0(&actor->obj.pos, 0x2903B009); - func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 50.0f, actor->obj.pos.z, (10.0f / 3.0f)); + func_effect_8007A6F0(&actor->obj.pos, 0x2903B009); + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 50.0f, actor->obj.pos.z, (10.0f / 3.0f)); gPlayer[0].vel.y = 20.0f; gPlayer[0].pos.y += 15.0f; gPlayer[0].unk_1DC = 1; @@ -642,7 +661,7 @@ void func_i5_8018AB44(Actor* actor) { static Vec3f D_i5_801B75AC = { -70.0f, 50.0f, 212.0f }; static Vec3f D_i5_801B75B8 = { 70.0f, 50.0f, 212.0f }; -void func_i5_8018ADC4(Actor* actor) { +void Titania_8018ADC4(Actor* actor) { Vec3f sp68[2]; s32 i; s32 k; @@ -656,7 +675,7 @@ void func_i5_8018ADC4(Actor* actor) { actor->obj.rot.z = 0.0f; actor->obj.rot.x = 0.0f; - func_i5_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_80177D20, &sp54, &sp58, &sp54); + Ground_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_ctx_80177D20, &sp54, &sp58, &sp54); actor->obj.pos.y = sp58; @@ -696,12 +715,12 @@ void func_i5_8018ADC4(Actor* actor) { } } -bool func_i5_8018AFD4(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +bool Titania_8018AFD4(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { *dList = NULL; return false; } -bool func_i5_8018AFF0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +bool Titania_8018AFF0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { if ((limbIndex == 2) || (limbIndex == 3) || (limbIndex == 4)) { Matrix_Translate(gCalcMatrix, pos->x, pos->y, pos->z, 1); Matrix_RotateZ(gCalcMatrix, rot->z * M_DTOR, 1); @@ -720,7 +739,7 @@ bool func_i5_8018AFF0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* static Vec3f D_i5_801B75C4 = { 110.0f, 0.0f, 0.0f }; -void func_i5_8018B144(s32 limbIndex, Vec3f* rot, void* data) { +void Titania_8018B144(s32 limbIndex, Vec3f* rot, void* data) { Actor* actor = (Actor*) data; switch (limbIndex) { @@ -737,7 +756,7 @@ static s16 D_i5_801B75D0[] = { 1, 2, 3, 4, 5, 6, 7, 10, 12, 13, }; -void func_i5_8018B1B4(s32 limbIndex, Vec3f* rot, void* data) { +void Titania_8018B1B4(s32 limbIndex, Vec3f* rot, void* data) { s32 i; PosRot* var_a2; @@ -745,14 +764,14 @@ void func_i5_8018B1B4(s32 limbIndex, Vec3f* rot, void* data) { for (i = 0; i < 10; i++, var_a2++) { if (limbIndex == D_i5_801B75D0[i]) { - Matrix_MultVec3f(gCalcMatrix, &D_800C9F2C, &var_a2->pos); + Matrix_MultVec3f(gCalcMatrix, &D_tank_800C9F2C, &var_a2->pos); Matrix_GetYRPAngles(gCalcMatrix, &var_a2->rot); break; } } } -void func_i5_8018B268(Actor* actor) { +void Titania_8018B268(Actor* actor) { Vec3f src; Vec3f dest; Actor* sp3C = actor->iwork[0]; @@ -764,7 +783,7 @@ void func_i5_8018B268(Actor* actor) { actor->health -= actor->damage; if (actor->health <= 0) { actor->health = actor->unk_044 = 0; - func_80066254(actor); + func_enmy_80066254(actor); actor->info.bonus = 0; } } @@ -847,20 +866,20 @@ void func_i5_8018B268(Actor* actor) { if (actor->health == 0) { actor->obj.status = OBJ_DYING; Animation_GetFrameData(&D_TI1_700D534, actor->unk_0B6, actor->vwork); - Animation_DrawSkeleton(0, D_TI1_700D700, actor->vwork, func_i5_8018AFD4, func_i5_8018B1B4, actor, + Animation_DrawSkeleton(0, D_TI1_700D700, actor->vwork, Titania_8018AFD4, Titania_8018B1B4, actor, &gIdentityMatrix); - func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); actor->timer_0CA[0] = 0; actor->info.unk_1C = 0.0f; } } -void func_i5_8018B6AC(Actor* actor) { +void Titania_8018B6AC(Actor* actor) { Animation_GetFrameData(&D_TI1_700D534, actor->unk_0B6, actor->vwork); - Animation_DrawSkeleton(0, D_TI1_700D700, actor->vwork, func_i5_8018AFF0, func_i5_8018B144, actor, &gIdentityMatrix); + Animation_DrawSkeleton(0, D_TI1_700D700, actor->vwork, Titania_8018AFF0, Titania_8018B144, actor, &gIdentityMatrix); } -void func_i5_8018B720(Actor* actor) { +void Titania_8018B720(Actor* actor) { PosRot* var_s1; Actor* actorPtr; s32 i; @@ -871,7 +890,7 @@ void func_i5_8018B720(Actor* actor) { var_s1 = SEGMENTED_TO_VIRTUAL(D_i5_801BDA30); for (i = 0; i < 10; i++, var_s1++) { - actorPtr = func_800A3608(OBJ_ACTOR_189); + actorPtr = func_game_800A3608(OBJ_ACTOR_189); if (actorPtr != NULL) { actorPtr->obj.status = OBJ_ACTIVE; actorPtr->state = 46; @@ -909,15 +928,15 @@ void func_i5_8018B720(Actor* actor) { Object_Kill(&actor->obj, actor->sfxSource); } -void func_i5_8018B96C(Actor* actor) { +void Titania_8018B96C(Actor* actor) { f32 sp24; - func_i5_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_80177D20, &sp24, &actor->obj.pos.y, &sp24); + Ground_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_ctx_80177D20, &sp24, &actor->obj.pos.y, &sp24); actor->obj.rot.x = actor->obj.rot.y = actor->obj.rot.z = 0.0f; actor->obj.pos.y -= 20.0f; } -void func_i5_8018B9D0(Actor* actor) { +void Titania_8018B9D0(Actor* actor) { f32 var_fa0; f32 sp50; f32 sp4C; @@ -957,7 +976,7 @@ void func_i5_8018B9D0(Actor* actor) { } if (actor->timer_0BE == 1) { - func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); Object_Kill(&actor->obj, actor->sfxSource); Player_ApplyDamage(gPlayer, 0, 60); gPlayer[0].vel.y = 20.0f; @@ -972,15 +991,15 @@ void func_i5_8018B9D0(Actor* actor) { break; case 1: - func_i5_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_80177D20, &sp4C, &sp50, &sp48); + Ground_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_ctx_80177D20, &sp4C, &sp50, &sp48); actor->fwork[0] = sp50; actor->fwork[1] = sp4C; actor->fwork[2] = sp48; if (actor->vel.y <= 0.0f) { actor->unk_044 = 0; - func_80066254(actor); - func_8007A6F0(&actor->obj.pos, 0x2903B009); - func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); + func_enmy_80066254(actor); + func_effect_8007A6F0(&actor->obj.pos, 0x2903B009); + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); Object_Kill(&actor->obj, actor->sfxSource); } break; @@ -1024,12 +1043,12 @@ static s32 D_i5_801B75E4[3][3] = { { 0, 0, 0 }, }; -Gfx* D_i5_801B7608[10] = { +Gfx* D_TI_801B7608[10] = { D_TI1_7005280, D_TI1_7003C50, D_TI1_7003E30, D_TI1_7004370, D_TI1_7004560, D_TI1_7003A90, D_TI1_7005420, D_TI1_7003FC0, D_TI1_7002930, D_TI1_7002490, }; -void func_i5_8018BE84(Actor* actor) { +void Titania_8018BE84(Actor* actor) { s32 index; RCP_SetupDL(&gMasterDisp, 0x1E); @@ -1044,7 +1063,7 @@ void func_i5_8018BE84(Actor* actor) { gSPDisplayList(gMasterDisp++, D_TI1_700A990); } -void func_i5_8018BFB0(Actor* actor) { +void Titania_8018BFB0(Actor* actor) { UnkStruct_i5_801BD738* temp_a1; s32 temp_a2; s32 i; @@ -1075,7 +1094,7 @@ void func_i5_8018BFB0(Actor* actor) { } } -bool func_i5_8018C118(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +bool Titania_8018C118(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { *dList = NULL; return false; } @@ -1084,7 +1103,7 @@ static s16 D_i5_801B7630[18] = { 1, 0, 2, 1, 3, 0, 4, 1, 5, 1, 6, 0, 7, 1, 8, 0, 13, 1, }; -bool func_i5_8018C134(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +bool Titania_8018C134(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { Actor* actor = (Actor*) data; s32 sp58; s32 i; @@ -1120,7 +1139,7 @@ bool func_i5_8018C134(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* return sp58; } -void func_i5_8018C370(s32 limbIndex, Vec3f* rot, void* data) { +void Titania_8018C370(s32 limbIndex, Vec3f* rot, void* data) { Actor* actor = (Actor*) data; if ((limbIndex == 13) && !(D_i5_801BD738[actor->iwork[0]][8].unk_18 & 1)) { @@ -1131,7 +1150,7 @@ void func_i5_8018C370(s32 limbIndex, Vec3f* rot, void* data) { static Vec3f D_i5_801B7654 = { 387.0f, 0.0f, 0.0f }; static Vec3f D_i5_801B7660 = { 199.5f, 0.0f, 0.0f }; -void func_i5_8018C3D8(s32 limbIndex, Vec3f* rot, void* data) { +void Titania_8018C3D8(s32 limbIndex, Vec3f* rot, void* data) { s32 i; s32 j; Vec3f sp54; @@ -1148,7 +1167,7 @@ void func_i5_8018C3D8(s32 limbIndex, Vec3f* rot, void* data) { for (i = 0; i < 9U; i++, var_s0++) { if ((limbIndex == D_i5_801B7630[i * 2]) && (var_s0->unk_18 & 2)) { - Matrix_MultVec3f(gCalcMatrix, &D_800C9F2C, &var_s0->unk_00.pos); + Matrix_MultVec3f(gCalcMatrix, &D_tank_800C9F2C, &var_s0->unk_00.pos); Matrix_GetYRPAngles(gCalcMatrix, &var_s0->unk_00.rot); var_s0->unk_18 &= ~2; break; @@ -1178,16 +1197,16 @@ void func_i5_8018C3D8(s32 limbIndex, Vec3f* rot, void* data) { case 1: switch (limbIndex) { case 1: - Matrix_MultVec3f(gCalcMatrix, &D_800C9F2C, (Vec3f*) &actor->fwork[12]); + Matrix_MultVec3f(gCalcMatrix, &D_tank_800C9F2C, (Vec3f*) &actor->fwork[12]); break; case 3: - Matrix_MultVec3f(gCalcMatrix, &D_800C9F2C, (Vec3f*) &actor->fwork[9]); + Matrix_MultVec3f(gCalcMatrix, &D_tank_800C9F2C, (Vec3f*) &actor->fwork[9]); break; case 5: - Matrix_MultVec3f(gCalcMatrix, &D_800C9F2C, (Vec3f*) &actor->fwork[3]); + Matrix_MultVec3f(gCalcMatrix, &D_tank_800C9F2C, (Vec3f*) &actor->fwork[3]); break; case 7: - Matrix_MultVec3f(gCalcMatrix, &D_800C9F2C, (Vec3f*) &actor->fwork[6]); + Matrix_MultVec3f(gCalcMatrix, &D_tank_800C9F2C, (Vec3f*) &actor->fwork[6]); break; } break; @@ -1226,7 +1245,7 @@ void func_i5_8018C3D8(s32 limbIndex, Vec3f* rot, void* data) { } } -void func_i5_8018C72C(Actor* actor) { +void Titania_8018C72C(Actor* actor) { s32 i; f32 sp30; @@ -1239,7 +1258,7 @@ void func_i5_8018C72C(Actor* actor) { sp30 = actor->vwork[0].y; actor->vwork[0].y += actor->fwork[26]; - Animation_DrawSkeleton(0, D_TI1_7006990, actor->vwork, func_i5_8018C118, func_i5_8018C3D8, actor, &gIdentityMatrix); + Animation_DrawSkeleton(0, D_TI1_7006990, actor->vwork, Titania_8018C118, Titania_8018C3D8, actor, &gIdentityMatrix); actor->vwork[0].y = sp30; actor->iwork[7] = 0; actor->iwork[8] = 0; @@ -1247,7 +1266,7 @@ void func_i5_8018C72C(Actor* actor) { static Vec3f D_i5_801B766C = { 0.0f, 0.0f, 15.0f }; -void func_i5_8018C8A8(Actor* actor) { +void Titania_8018C8A8(Actor* actor) { s32 i; f32 sp170; f32 temp_fs0; @@ -1297,7 +1316,7 @@ void func_i5_8018C8A8(Actor* actor) { BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->fwork[27] + actor->obj.pos.z, 3); gHitCount += 3; actor->health = actor->unk_044 = 0; - func_80066254(actor); + func_enmy_80066254(actor); actor->info.bonus = 0; actor->timer_0BC = 20; actor->unk_0B6 = 0; @@ -1306,7 +1325,7 @@ void func_i5_8018C8A8(Actor* actor) { AUDIO_PLAY_SFX(0x29034041, actor->sfxSource, 4); } } else if (actor->unk_0D0 == 1) { - func_8007A6F0(&actor->obj.pos, 0x29121007); + func_effect_8007A6F0(&actor->obj.pos, 0x29121007); } actor->unk_0D0 = 0; } @@ -1322,19 +1341,19 @@ void func_i5_8018C8A8(Actor* actor) { actor->vel.y = 20.0f; actor->vel.z = -70.0f; Animation_GetFrameData(&D_TI1_700733C, 0, actor->vwork); - Animation_DrawSkeleton(1, D_TI1_7006990, actor->vwork, func_i5_8018C118, func_i5_8018C3D8, actor, + Animation_DrawSkeleton(1, D_TI1_7006990, actor->vwork, Titania_8018C118, Titania_8018C3D8, actor, &gIdentityMatrix); actor->state = 1; break; case 1: - func_i5_801B6E20(actor->obj.pos.x, actor->obj.pos.z + gPlayer->unk_144, &spA0, &sp9C, &sp98); + Ground_801B6E20(actor->obj.pos.x, actor->obj.pos.z + gPlayer->unk_144, &spA0, &sp9C, &sp98); actor->fwork[0] = sp9C; actor->fwork[1] = spA0; actor->fwork[2] = sp98; Animation_GetFrameData(&D_TI1_700733C, 0, spA4); Math_SmoothStepToVec3fArray(spA4, actor->vwork, 1, 15, 0.2f, 10.0f, 0.01f); - Animation_DrawSkeleton(1, D_TI1_7006990, actor->vwork, func_i5_8018C118, func_i5_8018C3D8, actor, + Animation_DrawSkeleton(1, D_TI1_7006990, actor->vwork, Titania_8018C118, Titania_8018C3D8, actor, &gIdentityMatrix); if (actor->obj.pos.z <= gPlayer[0].pos.z) { Math_SmoothStepToAngle(&actor->obj.rot.y, actor->unk_0F4.y, 0.2f, 10.0f, 0.01f); @@ -1350,11 +1369,11 @@ void func_i5_8018C8A8(Actor* actor) { x = actor->obj.pos.x + actor->fwork[6]; y = actor->obj.pos.y + actor->fwork[7] + actor->fwork[26]; z = actor->obj.pos.z + actor->fwork[8]; - func_8007A900(x, y, z, 20.0f, 0xFF, 8, 0); + func_effect_8007A900(x, y, z, 20.0f, 0xFF, 8, 0); x = actor->obj.pos.x + actor->fwork[3]; y = actor->obj.pos.y + actor->fwork[4] + actor->fwork[26]; z = actor->obj.pos.z + actor->fwork[5]; - func_8007A900(x, y, z, 20.0f, 0xFF, 8, 0); + func_effect_8007A900(x, y, z, 20.0f, 0xFF, 8, 0); sp88 = fabsf(sp88); if (sp88 < 5000.0f) { actor->iwork[4] = (s32) (sp88 / 200.0f); @@ -1394,7 +1413,7 @@ void func_i5_8018C8A8(Actor* actor) { Math_SmoothStepToVec3fArray(spA4, actor->vwork, 1, 15, 0.5f, 7.0f, 0.1f); temp_fs0 = actor->vwork[0].y; actor->vwork[0].y += actor->fwork[26]; - Animation_DrawSkeleton(0, D_TI1_7006990, actor->vwork, func_i5_8018C118, func_i5_8018C3D8, actor, + Animation_DrawSkeleton(0, D_TI1_7006990, actor->vwork, Titania_8018C118, Titania_8018C3D8, actor, &gIdentityMatrix); actor->vwork[0].y = temp_fs0; actor->fwork[15] = 0.0f; @@ -1414,7 +1433,7 @@ void func_i5_8018C8A8(Actor* actor) { Math_SmoothStepToVec3fArray(spA4, actor->vwork, 1, 15, 0.1f, 3.0f, 0.01f); temp_fs0 = actor->vwork[0].y; actor->vwork[0].y += actor->fwork[26]; - Animation_DrawSkeleton(0, D_TI1_7006990, actor->vwork, func_i5_8018C118, func_i5_8018C3D8, actor, + Animation_DrawSkeleton(0, D_TI1_7006990, actor->vwork, Titania_8018C118, Titania_8018C3D8, actor, &gIdentityMatrix); actor->vwork[0].y = temp_fs0; actor->fwork[15] = 0.0f; @@ -1429,7 +1448,7 @@ void func_i5_8018C8A8(Actor* actor) { break; case 4: - func_i5_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_80177D20, &spA0, &sp9C, &sp98); + Ground_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_ctx_80177D20, &spA0, &sp9C, &sp98); actor->fwork[0] = sp9C; actor->fwork[1] = spA0; actor->fwork[2] = sp98; @@ -1469,7 +1488,7 @@ void func_i5_8018C8A8(Actor* actor) { Math_SmoothStepToVec3fArray(spA4, actor->vwork, 1, 15, actor->fwork[15], 360.0f, 0.01f); temp_fs0 = actor->vwork[0].y; actor->vwork[0].y += actor->fwork[26]; - Animation_DrawSkeleton(0, D_TI1_7006990, actor->vwork, func_i5_8018C118, func_i5_8018C3D8, actor, + Animation_DrawSkeleton(0, D_TI1_7006990, actor->vwork, Titania_8018C118, Titania_8018C3D8, actor, &gIdentityMatrix); actor->vwork[0].y = temp_fs0; Math_SmoothStepToF(&actor->fwork[26], -60.0f, actor->fwork[15], 500.0f, 0.01f); @@ -1491,7 +1510,7 @@ void func_i5_8018C8A8(Actor* actor) { Math_SmoothStepToF(&actor->fwork[26], -40.0f, actor->fwork[15], 500.0f, 0.01f); temp_fs0 = actor->vwork[0].y; actor->vwork[0].y += actor->fwork[26]; - Animation_DrawSkeleton(0, D_TI1_7006990, actor->vwork, func_i5_8018C118, func_i5_8018C3D8, actor, + Animation_DrawSkeleton(0, D_TI1_7006990, actor->vwork, Titania_8018C118, Titania_8018C3D8, actor, &gIdentityMatrix); actor->vwork[0].y = temp_fs0; actor->unk_0B6++; @@ -1515,7 +1534,7 @@ void func_i5_8018C8A8(Actor* actor) { Math_SmoothStepToVec3fArray(spA4, actor->vwork, 1, 15, actor->fwork[15], 360.0f, 0.01f); temp_fs0 = actor->vwork[0].y; actor->vwork[0].y += actor->fwork[26]; - Animation_DrawSkeleton(0, D_TI1_7006990, actor->vwork, func_i5_8018C118, func_i5_8018C3D8, actor, + Animation_DrawSkeleton(0, D_TI1_7006990, actor->vwork, Titania_8018C118, Titania_8018C3D8, actor, &gIdentityMatrix); actor->vwork[0].y = temp_fs0; if (actor->unk_0B6 == 0x15) { @@ -1524,17 +1543,17 @@ void func_i5_8018C8A8(Actor* actor) { Matrix_RotateZ(gCalcMatrix, actor->obj.rot.z * M_DTOR, 1); Matrix_MultVec3f(gCalcMatrix, (Vec3f*) &actor->fwork[12], &sp158); - func_8007A900(actor->obj.pos.x + sp158.x, actor->obj.pos.y + sp158.y, actor->obj.pos.z + sp158.z, 20.0f, - 0xFF, 8, 0); + func_effect_8007A900(actor->obj.pos.x + sp158.x, actor->obj.pos.y + sp158.y, actor->obj.pos.z + sp158.z, + 20.0f, 0xFF, 8, 0); Matrix_MultVec3f(gCalcMatrix, (Vec3f*) &actor->fwork[9], &sp158); - func_8007A900(actor->obj.pos.x + sp158.x, actor->obj.pos.y + sp158.y, actor->obj.pos.z + sp158.z, 20.0f, - 0xFF, 8, 0); + func_effect_8007A900(actor->obj.pos.x + sp158.x, actor->obj.pos.y + sp158.y, actor->obj.pos.z + sp158.z, + 20.0f, 0xFF, 8, 0); Matrix_MultVec3f(gCalcMatrix, (Vec3f*) &actor->fwork[3], &sp158); - func_8007A900(actor->obj.pos.x + sp158.x, actor->obj.pos.y + sp158.y, actor->obj.pos.z + sp158.z, 20.0f, - 0xFF, 8, 0); + func_effect_8007A900(actor->obj.pos.x + sp158.x, actor->obj.pos.y + sp158.y, actor->obj.pos.z + sp158.z, + 20.0f, 0xFF, 8, 0); Matrix_MultVec3f(gCalcMatrix, (Vec3f*) &actor->fwork[6], &sp158); - func_8007A900(actor->obj.pos.x + sp158.x, actor->obj.pos.y + sp158.y, actor->obj.pos.z + sp158.z, 20.0f, - 0xFF, 8, 0); + func_effect_8007A900(actor->obj.pos.x + sp158.x, actor->obj.pos.y + sp158.y, actor->obj.pos.z + sp158.z, + 20.0f, 0xFF, 8, 0); AUDIO_PLAY_SFX(0x19030003, actor->sfxSource, 4); } @@ -1543,19 +1562,23 @@ void func_i5_8018C8A8(Actor* actor) { Matrix_RotateX(gCalcMatrix, actor->obj.rot.x * M_DTOR, 1); Matrix_RotateZ(gCalcMatrix, actor->obj.rot.z * M_DTOR, 1); Matrix_MultVec3f(gCalcMatrix, (Vec3f*) &actor->fwork[12], &sp158); - func_8007D2C8(actor->obj.pos.x + sp158.x, actor->obj.pos.y + sp158.y, actor->obj.pos.z + sp158.z, 1.5f); + func_effect_8007D2C8(actor->obj.pos.x + sp158.x, actor->obj.pos.y + sp158.y, actor->obj.pos.z + sp158.z, + 1.5f); Matrix_MultVec3f(gCalcMatrix, (Vec3f*) &actor->fwork[9], &sp158); - func_8007D2C8(actor->obj.pos.x + sp158.x, actor->obj.pos.y + sp158.y, actor->obj.pos.z + sp158.z, 1.5f); + func_effect_8007D2C8(actor->obj.pos.x + sp158.x, actor->obj.pos.y + sp158.y, actor->obj.pos.z + sp158.z, + 1.5f); Matrix_MultVec3f(gCalcMatrix, (Vec3f*) &actor->fwork[3], &sp158); - func_8007D2C8(actor->obj.pos.x + sp158.x, actor->obj.pos.y + sp158.y, actor->obj.pos.z + sp158.z, 1.5f); + func_effect_8007D2C8(actor->obj.pos.x + sp158.x, actor->obj.pos.y + sp158.y, actor->obj.pos.z + sp158.z, + 1.5f); Matrix_MultVec3f(gCalcMatrix, (Vec3f*) &actor->fwork[6], &sp158); - func_8007D2C8(actor->obj.pos.x + sp158.x, actor->obj.pos.y + sp158.y, actor->obj.pos.z + sp158.z, 1.5f); + func_effect_8007D2C8(actor->obj.pos.x + sp158.x, actor->obj.pos.y + sp158.y, actor->obj.pos.z + sp158.z, + 1.5f); } if (actor->unk_0B6 < (Animation_GetFrameCount(&D_TI1_7006F74) - 1)) { actor->unk_0B6++; } else { - func_i5_8018C72C(actor); + Titania_8018C72C(actor); } break; @@ -1571,15 +1594,16 @@ void func_i5_8018C8A8(Actor* actor) { D_i5_801BD738[actor->iwork[0]][i].unk_18 |= 1; } AUDIO_PLAY_SFX(0x2940C00A, actor->sfxSource, 4); - D_80178480 = 20; + D_ctx_80178480 = 20; D_Timer_80177BD0[0] = 16; Matrix_RotateY(gCalcMatrix, actor->obj.rot.y * M_DTOR, 0); Matrix_RotateX(gCalcMatrix, actor->obj.rot.x * M_DTOR, 1); Matrix_RotateZ(gCalcMatrix, actor->obj.rot.z * M_DTOR, 1); - func_8007D2C8(actor->obj.pos.x, actor->fwork[27] + actor->obj.pos.y, actor->obj.pos.z, 15.0f); + func_effect_8007D2C8(actor->obj.pos.x, actor->fwork[27] + actor->obj.pos.y, actor->obj.pos.z, + 15.0f); var_s1 = D_i5_801BD738[actor->iwork[0]]; for (i = 0; i < 9U; i++, var_s1++) { - actorPtr = func_800A3608(0xBD); + actorPtr = func_game_800A3608(0xBD); if ((actorPtr != NULL) && ((s16(*)[2]) D_i5_801B7630)[i][1] == 1) { actorPtr->state = 0x2F; actorPtr->unk_048 = i; @@ -1615,7 +1639,7 @@ void func_i5_8018C8A8(Actor* actor) { } if (i == 8) { - actorPtr = func_800A3608(0xBD); + actorPtr = func_game_800A3608(0xBD); if (actorPtr != NULL) { actorPtr->state = 0x2F; actorPtr->unk_048 = 9; @@ -1642,9 +1666,9 @@ void func_i5_8018C8A8(Actor* actor) { break; case 4: - D_80178348 = D_80178350 = D_80178354 = D_80178340 = 255; - D_80178358 = 0; - D_8017835C = 0x40; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = D_ctx_80178340 = 255; + D_ctx_80178358 = 0; + D_ctx_8017835C = 0x40; break; case 5: @@ -1664,7 +1688,7 @@ void func_i5_8018C8A8(Actor* actor) { actor->unk_0D0 = 0; } -void func_i5_8018E2D8(Actor* actor) { +void Titania_8018E2D8(Actor* actor) { f32 sp34; if (actor->iwork[6] & 1) { @@ -1674,24 +1698,24 @@ void func_i5_8018E2D8(Actor* actor) { } sp34 = actor->vwork[0].y; actor->vwork[0].y += actor->fwork[26]; - Animation_DrawSkeleton(0, D_TI1_7006990, actor->vwork, func_i5_8018C134, func_i5_8018C370, actor, &gIdentityMatrix); + Animation_DrawSkeleton(0, D_TI1_7006990, actor->vwork, Titania_8018C134, Titania_8018C370, actor, &gIdentityMatrix); actor->vwork[0].y = sp34; } -void func_i5_8018E3B0(Actor* actor) { +void Titania_8018E3B0(Actor* actor) { D_i5_801B750C[actor->iwork[0]] = false; } static Vec3f D_i5_801B7678 = { 0.0f, 388.0f, 103.0f }; static Vec3f D_i5_801B7684 = { 0.0f, 0.0f, 0.0f }; // unused -void func_i5_8018E3CC(Actor* actor) { +void Titania_8018E3CC(Actor* actor) { Actor* actorPtr; f32 sp40; Vec3f sp34; s32 i; - func_i5_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_80177D20, &sp40, &actor->obj.pos.y, &sp40); + Ground_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_ctx_80177D20, &sp40, &actor->obj.pos.y, &sp40); actor->obj.pos.y -= 20.0f; actorPtr = gActors; @@ -1721,23 +1745,23 @@ void func_i5_8018E3CC(Actor* actor) { } } -void func_i5_8018E54C(Actor* actor) { +void Titania_8018E54C(Actor* actor) { actor->iwork[1]++; if ((actor->iwork[0] == (uintptr_t) NULL) && !(actor->iwork[1] & 3)) { - func_8007C120(actor->fwork[0], actor->fwork[1], actor->fwork[2], 0.0f, 0.0f, 0.0f, 0.0625f, 10); + func_effect_8007C120(actor->fwork[0], actor->fwork[1], actor->fwork[2], 0.0f, 0.0f, 0.0f, 0.0625f, 10); } } -void func_i5_8018E5B4(Actor* actor) { +void Titania_8018E5B4(Actor* actor) { gSPDisplayList(gMasterDisp++, D_TI1_70098E0); } -void func_i5_8018E5E8(Actor* actor) { +void Titania_8018E5E8(Actor* actor) { actor->health = 100; } -void func_i5_8018E5F8(Actor* actor) { +void Titania_8018E5F8(Actor* actor) { f32 spA4; f32 spA0; f32 sp9C; @@ -1795,7 +1819,7 @@ void func_i5_8018E5F8(Actor* actor) { } actor->fwork[9] = 0.0f; actor->timer_0BC = 10; - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); actor->iwork[2] = 1; index = actor->iwork[3]; if (index > 0) { @@ -1810,10 +1834,10 @@ void func_i5_8018E5F8(Actor* actor) { actor->gravity = 0.5f; } if (actor->timer_0BE == 0) { - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f); actor->timer_0BE = 0xA; } - func_i5_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_80177D20, &sp80, &sp7C, &sp80); + Ground_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_ctx_80177D20, &sp80, &sp7C, &sp80); if (actor->obj.pos.y < (94.0f + sp7C)) { spA4 = fabsf(spA4); if (spA4 < 5000.0f) { @@ -1863,7 +1887,7 @@ void func_i5_8018E5F8(Actor* actor) { gHitCount += 2; actor->timer_0CA[0] = actor->health = actor->unk_044 = 0; actor->info.unk_1C = 0.0f; - func_80066254(actor); + func_enmy_80066254(actor); actor->info.bonus = 0; ((Actor*) actor->iwork[4])->iwork[0] = 0; actor->iwork[5] = 0; @@ -1892,7 +1916,7 @@ void func_i5_8018E5F8(Actor* actor) { for (i = 0; i <= 3000; i += 50) { sp5C = (sp68 * i) + sp40; sp54 = (sp60 * i) + sp48; - func_i5_801B6E20(sp5C, sp54 + D_80177D20, &sp74, &sp70, &sp6C); + Ground_801B6E20(sp5C, sp54 + D_ctx_80177D20, &sp74, &sp70, &sp6C); if ((sp64 * i) + sp44 < sp70) { break; } @@ -1923,11 +1947,11 @@ void func_i5_8018E5F8(Actor* actor) { } if (i < 0xBB9) { if (actor->timer_0C0 == 0) { - func_8007D1E0(sp5C, sp70 + 5.0f, sp54, 2.0f); + func_effect_8007D1E0(sp5C, sp70 + 5.0f, sp54, 2.0f); } temp_v0_3 = actor->iwork[5]; if (temp_v0_3 == NULL) { - temp_v0_4 = func_8007783C(OBJ_EFFECT_373); + temp_v0_4 = func_effect_8007783C(OBJ_EFFECT_373); if (temp_v0_4 != NULL) { temp_v0_4->obj.status = OBJ_ACTIVE; temp_v0_4->obj.pos.x = sp5C; @@ -1952,7 +1976,7 @@ void func_i5_8018E5F8(Actor* actor) { } } -void func_i5_8018EF14(Actor* actor) { +void Titania_8018EF14(Actor* actor) { gSPDisplayList(gMasterDisp++, D_TI1_7008930); if (!(actor->timer_0C6 & 1)) { @@ -1965,26 +1989,26 @@ void func_i5_8018EF14(Actor* actor) { gSPDisplayList(gMasterDisp++, D_TI1_7009510); } -void func_i5_8018EFF0(Object_4C* obj4C) { +void Titania_8018EFF0(Object_4C* obj4C) { f32 sp24; f32 sp20; - func_i5_801B6E20(obj4C->obj.pos.x, obj4C->obj.pos.z + D_80177D20, &sp20, &sp24, &sp20); + Ground_801B6E20(obj4C->obj.pos.x, obj4C->obj.pos.z + D_ctx_80177D20, &sp20, &sp24, &sp20); obj4C->obj.pos.y = sp24; } -void func_i5_8018F038(Object_4C* obj4C) { +void Titania_8018F038(Object_4C* obj4C) { obj4C->obj.rot.y = - Math_Atan2F(gPlayer[0].camEye.x - obj4C->obj.pos.x, gPlayer[0].camEye.z - (obj4C->obj.pos.z + D_80177D20)) * + Math_Atan2F(gPlayer[0].camEye.x - obj4C->obj.pos.x, gPlayer[0].camEye.z - (obj4C->obj.pos.z + D_ctx_80177D20)) * M_RTOD; if (obj4C->unk_46 != 0) { - func_8007D074(obj4C->obj.pos.x, obj4C->obj.pos.y + 96.0f, obj4C->obj.pos.z, 4.0f); + func_effect_8007D074(obj4C->obj.pos.x, obj4C->obj.pos.y + 96.0f, obj4C->obj.pos.z, 4.0f); obj4C->obj.status = OBJ_FREE; - func_8007A6F0(&obj4C->obj.pos, 0x1903400F); + func_effect_8007A6F0(&obj4C->obj.pos, 0x1903400F); } } -void func_i5_8018F0D8(Object_80* obj80) { +void Titania_8018F0D8(Object_80* obj80) { if (obj80->obj.rot.x != 0.0f) { if (obj80->obj.rot.x >= 10000.0f) { @@ -1999,7 +2023,7 @@ void func_i5_8018F0D8(Object_80* obj80) { static Vec3f D_i5_801B7690 = { 0.0f, 460.0f, 0.0f }; -Gfx* D_i5_801B769C[39] = { +Gfx* D_TI_801B769C[39] = { D_TI2_7009700, D_TI2_7004E80, D_TI2_70049C0, D_TI2_70045D0, D_TI_A001FA0, D_TI_900FE80, D_TI_80018D0, D_TI_9005450, NULL, D_TI_8009000, D_TI_A002170, D_TI_8001FB0, D_TI_90058A0, D_TI_90042A0, D_TI_90043D0, D_TI_90044E0, D_TI_90045F0, D_TI_80020D0, D_TI2_7003F00, D_TI_8001D20, D_TI_8001E20, NULL, D_TI_80011C0, D_TI_8002360, @@ -2007,7 +2031,7 @@ Gfx* D_i5_801B769C[39] = { D_TI2_7004400, D_TI2_7009890, D_TI_8001A80, D_TI_A001DB0, D_TI_A001EC0, D_TI_A001BE0, D_TI2_7004270, }; -void func_i5_8018F134(Object_80* obj80) { +void Titania_8018F134(Object_80* obj80) { Vec3f sp7C; Vec3f sp70; f32 i; @@ -2020,8 +2044,8 @@ void func_i5_8018F134(Object_80* obj80) { if ((obj80->obj.rot.y <= 30.0f) || (obj80->obj.rot.y >= 330.0f)) { for (*j = -80.0f; *j <= 80.0f; *j += 40.0f) { Matrix_MultVec3fNoTranslate(gCalcMatrix, &D_i5_801B7690, &sp70); - func_8007A900(obj80->obj.pos.x + sp70.x, obj80->obj.pos.y + sp70.y, obj80->obj.pos.z + sp70.z, - 10.0f, 0xFF, 15, 0); + func_effect_8007A900(obj80->obj.pos.x + sp70.x, obj80->obj.pos.y + sp70.y, + obj80->obj.pos.z + sp70.z, 10.0f, 0xFF, 15, 0); } } else { sp7C.z = 0.0f; @@ -2035,8 +2059,8 @@ void func_i5_8018F134(Object_80* obj80) { Matrix_RotateX(gCalcMatrix, obj80->obj.rot.x * M_DTOR, 1); sp7C.y = i; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp7C, &sp70); - func_8007A900(obj80->obj.pos.x + sp70.x, obj80->obj.pos.y + sp70.y, obj80->obj.pos.z + sp70.z, - 10.0f, 0xFF, 15, 0); + func_effect_8007A900(obj80->obj.pos.x + sp70.x, obj80->obj.pos.y + sp70.y, + obj80->obj.pos.z + sp70.z, 10.0f, 0xFF, 15, 0); } } break; @@ -2047,14 +2071,14 @@ void func_i5_8018F134(Object_80* obj80) { for (i = 0.0f; i <= 450.0f; i += 50.0f) { sp7C.y = i; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp7C, &sp70); - func_8007A900(obj80->obj.pos.x + sp70.x, obj80->obj.pos.y + sp70.y, obj80->obj.pos.z + sp70.z, 10.0f, - 0xFF, 15, 0); + func_effect_8007A900(obj80->obj.pos.x + sp70.x, obj80->obj.pos.y + sp70.y, obj80->obj.pos.z + sp70.z, + 10.0f, 0xFF, 15, 0); } break; } } -void func_i5_8018F4D8(Object_80* obj80) { +void Titania_8018F4D8(Object_80* obj80) { f32 temp; switch (obj80->state) { @@ -2079,8 +2103,8 @@ void func_i5_8018F4D8(Object_80* obj80) { obj80->obj.rot.x = 90.0f; obj80->state++; D_Timer_80177BD0[0] = 7; - D_80178480 = 12; - func_i5_8018F134(obj80); + D_ctx_80178480 = 12; + Titania_8018F134(obj80); AUDIO_PLAY_SFX(0x19130003, obj80->sfxSource, 4); } break; @@ -2089,8 +2113,8 @@ void func_i5_8018F4D8(Object_80* obj80) { if (obj80->obj.rot.z >= 90.0f) { obj80->obj.rot.z = 90.0f; D_Timer_80177BD0[0] = 7; - D_80178480 = 12; - func_i5_8018F134(obj80); + D_ctx_80178480 = 12; + Titania_8018F134(obj80); AUDIO_PLAY_SFX(0x19130003, obj80->sfxSource, 4); obj80->state++; } @@ -2100,8 +2124,8 @@ void func_i5_8018F4D8(Object_80* obj80) { if (obj80->obj.rot.z <= -90.0f) { obj80->obj.rot.z = -90.0f; D_Timer_80177BD0[0] = 7; - D_80178480 = 12; - func_i5_8018F134(obj80); + D_ctx_80178480 = 12; + Titania_8018F134(obj80); AUDIO_PLAY_SFX(0x19130003, obj80->sfxSource, 4); obj80->state++; } @@ -2125,7 +2149,7 @@ void func_i5_8018F4D8(Object_80* obj80) { } } -void func_i5_8018F8B8(Object_80* obj80) { +void Titania_8018F8B8(Object_80* obj80) { switch (obj80->unk_44) { case 0: @@ -2155,7 +2179,7 @@ void func_i5_8018F8B8(Object_80* obj80) { } } -void func_i5_8018FA48(Boss* boss) { +void Titania_8018FA48(Boss* boss) { s32 pad[2]; f32* sp1C; s32 i; @@ -2212,7 +2236,7 @@ void func_i5_8018FA48(Boss* boss) { D_i5_801BBEF8 = SEGMENTED_TO_VIRTUAL(D_TI_8000FC0); } -bool func_i5_8018FC70(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +bool Titania_8018FC70(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { f32 sp24; if (D_i5_801BBEF0[30] != 0) { @@ -2371,7 +2395,7 @@ static UnkStruct_i5_801B8198 D_i5_801B8198[33] = { { 18, 15, NULL, 0 }, { 19, 10, NULL, 0 }, { 58, 5, NULL, 0 }, }; -f32 D_i5_801B83A8[517] = { +f32 D_TI_801B83A8[517] = { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, @@ -2440,7 +2464,7 @@ static Vec3f D_i5_801B8D30 = { 47.0f, 0.0f, 0.0f }; static Vec3f D_i5_801B8D3C = { 158.0f, 4.0f, 0.0f }; static Vec3f D_i5_801B8D48 = { 0.0f, 0.0f, 60.0f }; -void func_i5_8019002C(s32 limbIndex, Vec3f* rot, void* data) { +void Titania_8019002C(s32 limbIndex, Vec3f* rot, void* data) { Boss* boss = (Boss*) data; s32 i; s32 j; @@ -2456,7 +2480,7 @@ void func_i5_8019002C(s32 limbIndex, Vec3f* rot, void* data) { var_s6 = D_i5_801B8C24[i]; temp_s3 = var_s6[2]; if (limbIndex == var_s6[0]) { - var_s0 = &D_i5_801B83A8[D_i5_801B8CF4[D_i5_801BBEF0[25]] * 6 + var_s6[3] * 6 + 1]; + var_s0 = &D_TI_801B83A8[D_i5_801B8CF4[D_i5_801BBEF0[25]] * 6 + var_s6[3] * 6 + 1]; temp = var_s6[1]; for (j = 0; j < temp_s3; j++) { @@ -2498,7 +2522,7 @@ void func_i5_8019002C(s32 limbIndex, Vec3f* rot, void* data) { } } -bool func_i5_801903A0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +bool Titania_801903A0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { f32 sp24; s32 sp20; @@ -2563,7 +2587,7 @@ bool func_i5_801903A0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* return true; } -void func_i5_8019081C(s32 limbIndex, Vec3f* rot, void* data) { +void Titania_8019081C(s32 limbIndex, Vec3f* rot, void* data) { s32 i; s32 j; f32* var_s0; @@ -2575,7 +2599,7 @@ void func_i5_8019081C(s32 limbIndex, Vec3f* rot, void* data) { for (i = 0; i < 2; i++) { temp_s3 = D_i5_801B8CD4[i][2]; if (limbIndex == D_i5_801B8CD4[i][0]) { - var_s0 = &D_i5_801B83A8[D_i5_801B8CF4[D_i5_801BBEF0[25]] * 6 + D_i5_801B8CD4[i][3] * 6 + 1]; + var_s0 = &D_TI_801B83A8[D_i5_801B8CF4[D_i5_801BBEF0[25]] * 6 + D_i5_801B8CD4[i][3] * 6 + 1]; temp = D_i5_801B8CD4[i][1]; for (j = 0; j < temp_s3; j++) { sp5C.x = D_i5_801B8C64[temp + j][0]; @@ -2610,7 +2634,7 @@ void func_i5_8019081C(s32 limbIndex, Vec3f* rot, void* data) { // float regalloc starting with the spherical angle calculation // https://decomp.me/scratch/9ewO1 -bool func_i5_80190A08(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +bool Titania_80190A08(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { Vec3f spCC; Vec3f spC0; // f32 spBC; @@ -2736,7 +2760,7 @@ bool func_i5_80190A08(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* Matrix_RotateY(gCalcMatrix, rot->y * M_DTOR, 1); Matrix_RotateX(gCalcMatrix, rot->x * M_DTOR, 1); Matrix_GetYRPAngles(gCalcMatrix, &sp8C); - Matrix_MultVec3f(gCalcMatrix, &D_800C9F2C, &sp7C); + Matrix_MultVec3f(gCalcMatrix, &D_tank_800C9F2C, &sp7C); if ((limbIndex == 0x47) && (boss->fwork[0x2E] != 0.0f)) { sp70.x = (gPlayer[0].pos.x - (boss->obj.pos.x + sp7C.x)) * boss->fwork[0x2E]; @@ -2900,11 +2924,11 @@ bool func_i5_80190A08(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* return ret; } #else -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_80190A08.s") -bool func_i5_80190A08(s32, Gfx**, Vec3f*, Vec3f*, void*); +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/Titania_80190A08.s") +bool Titania_80190A08(s32, Gfx**, Vec3f*, Vec3f*, void*); #endif -void func_i5_80191AE8(s32 limbIndex, Vec3f* rot, void* data) { +void Titania_80191AE8(s32 limbIndex, Vec3f* rot, void* data) { Boss* boss = (Boss*) data; f32* var_s0_2; Vec3f spB4; @@ -2922,14 +2946,14 @@ void func_i5_80191AE8(s32 limbIndex, Vec3f* rot, void* data) { var_s0 = D_i5_801BBF00; for (i = 0; i < ARRAY_COUNTU(D_i5_801B7770); i++, var_s0++) { if ((var_s0->unk_26 & 1) && (limbIndex == D_i5_801B7770[i][0])) { - Matrix_MultVec3f(gCalcMatrix, &D_800C9F2C, &var_s0->unk_00.pos); + Matrix_MultVec3f(gCalcMatrix, &D_tank_800C9F2C, &var_s0->unk_00.pos); Matrix_GetYRPAngles(gCalcMatrix, &var_s0->unk_00.rot); var_s0->unk_26 &= ~1; break; } } - var_s0_2 = D_i5_801B83A8; + var_s0_2 = D_TI_801B83A8; *var_s0_2++ = 86.0f; for (i = 0; i < ARRAY_COUNTU(D_i5_801B7FD0); i++) { @@ -3025,7 +3049,7 @@ void func_i5_80191AE8(s32 limbIndex, Vec3f* rot, void* data) { } } -void func_i5_80192118(Boss* boss) { +void Titania_80192118(Boss* boss) { Vec3f sp54; Effect* effect; f32 temp_ft2; @@ -3174,17 +3198,17 @@ void func_i5_80192118(Boss* boss) { sp54.x = (boss->obj.pos.x + D_i5_801BBEF4[39]) + D_i5_801BBEF4[68]; sp54.y = 0.0f; sp54.z = (boss->obj.pos.z + D_i5_801BBEF4[41]) + D_i5_801BBEF4[70]; - func_8007A6F0(&sp54, 0x29403031); + func_effect_8007A6F0(&sp54, 0x29403031); boss->swork[39] = 5; - D_80178480 = 5; + D_ctx_80178480 = 5; } if (D_i5_801BBEF0[23] == 37) { sp54.x = (boss->obj.pos.x + D_i5_801BBEF4[42]) + D_i5_801BBEF4[71]; sp54.y = 0.0f; sp54.z = (boss->obj.pos.z + D_i5_801BBEF4[44]) + D_i5_801BBEF4[73]; - func_8007A6F0(&sp54, 0x29403031); + func_effect_8007A6F0(&sp54, 0x29403031); boss->swork[39] = 5; - D_80178480 = 5; + D_ctx_80178480 = 5; } if (boss->dmgType == DMG_BEAM) { switch (D_i5_801B8C0C[boss->dmgPart]) { @@ -3401,7 +3425,7 @@ void func_i5_80192118(Boss* boss) { if ((s32) sqrtf(SQ(temp_fa1) + SQ(temp_fv1)) > 50.0f) { - effect = func_8007783C(OBJ_EFFECT_394); + effect = func_effect_8007783C(OBJ_EFFECT_394); if (effect != NULL) { effect->obj.status = OBJ_ACTIVE; effect->unk_7A = 10; @@ -3419,7 +3443,7 @@ void func_i5_80192118(Boss* boss) { D_i5_801BBEF4[58] = temp_ft4; } if (!(boss->swork[38] & 3)) { - func_8007A900(temp_ft2, boss->obj.pos.y, temp_ft4, 10.0f, 0xC0, 0x10, 0); + func_effect_8007A900(temp_ft2, boss->obj.pos.y, temp_ft4, 10.0f, 0xC0, 0x10, 0); } } if ((boss->state != 4) || (boss->swork[31] < 90)) { @@ -3431,7 +3455,7 @@ void func_i5_80192118(Boss* boss) { if ((s32) sqrtf(SQ(temp_fa1) + SQ(temp_fv1)) > 50.0f) { - effect = func_8007783C(OBJ_EFFECT_394); + effect = func_effect_8007783C(OBJ_EFFECT_394); if (effect != NULL) { effect->obj.status = OBJ_ACTIVE; @@ -3450,7 +3474,7 @@ void func_i5_80192118(Boss* boss) { D_i5_801BBEF4[60] = temp_ft4; } if (!(boss->swork[38] & 3)) { - func_8007A900(temp_ft2, boss->obj.pos.y, temp_ft4, 10.0f, 0xC0, 0x10, 0); + func_effect_8007A900(temp_ft2, boss->obj.pos.y, temp_ft4, 10.0f, 0xC0, 0x10, 0); } } if ((boss->state != 4) || (boss->swork[31] < 102)) { @@ -3462,7 +3486,7 @@ void func_i5_80192118(Boss* boss) { if ((s32) sqrtf(SQ(temp_fa1) + SQ(temp_fv1)) > 50.0f) { - effect = func_8007783C(OBJ_EFFECT_394); + effect = func_effect_8007783C(OBJ_EFFECT_394); if (effect != NULL) { effect->state = 10; @@ -3481,14 +3505,14 @@ void func_i5_80192118(Boss* boss) { D_i5_801BBEF4[62] = temp_ft4; } if (!(boss->swork[38] & 3)) { - func_8007A900(temp_ft2, boss->obj.pos.y, temp_ft4, 10.0f, 0xC0, 0x10, 0); + func_effect_8007A900(temp_ft2, boss->obj.pos.y, temp_ft4, 10.0f, 0xC0, 0x10, 0); } } } boss->dmgType = DMG_NONE; } -void func_i5_80193B30(Boss* boss) { +void Titania_80193B30(Boss* boss) { if (boss->state == boss->swork[1]) { if (boss->swork[1] != 11) { boss->swork[1] = 11; @@ -3619,7 +3643,7 @@ const s16 D_i5_801BAB5C[8] = { // Regalloc in the random ternary. Can't be a temp as it's too low on stack // https://decomp.me/scratch/KiTNa -void func_i5_80193DF0(Boss* boss) { +void Titania_80193DF0(Boss* boss) { Vec3f spD4; Vec3f spC8; Actor* actor; @@ -3645,7 +3669,7 @@ void func_i5_80193DF0(Boss* boss) { D_i5_801BBEF0[44] = 0; D_i5_801BBEF0[8] = -1; D_i5_801BBEF0[41] = 1; - actor = func_800A3608(OBJ_ACTOR_198); + actor = func_game_800A3608(OBJ_ACTOR_198); if (actor != NULL) { Matrix_MultVec3f(gCalcMatrix, &D_i5_801BBF00[i].unk_00.pos, &spC8); actor->obj.pos.x = boss->obj.pos.x + spC8.x; @@ -3659,7 +3683,7 @@ void func_i5_80193DF0(Boss* boss) { D_i5_801BBF00[i].unk_26 &= ~16; } if (D_i5_801BBF00[i].unk_26 & 2) { - actor = func_800A3608(OBJ_ACTOR_189); + actor = func_game_800A3608(OBJ_ACTOR_189); if (actor != NULL) { actor->state = 40; actor->unk_046 = D_i5_801B7770[i][5]; @@ -3843,9 +3867,9 @@ void func_i5_80193DF0(Boss* boss) { (boss->swork[21] > 0)) { boss->swork[21] -= boss->damage; if (boss->swork[21] <= 0) { - D_8017796C = -1; + D_ctx_8017796C = -1; boss->swork[21] = 0; - D_Timer_80161A60 = 8; + D_play_Timer_80161A60 = 8; AUDIO_PLAY_SFX(0x2940D09A, boss->sfxSource, 4); } else { AUDIO_PLAY_SFX(0x2940802C, boss->sfxSource, 4); @@ -3912,8 +3936,8 @@ void func_i5_80193DF0(Boss* boss) { boss->swork[21] -= boss->damage; if (boss->swork[21] <= 0) { boss->swork[21] = 0; - D_Timer_80161A60 = 8; - D_8017796C = -1; + D_play_Timer_80161A60 = 8; + D_ctx_8017796C = -1; AUDIO_PLAY_SFX(0x2940D09A, boss->sfxSource, 4); } else { AUDIO_PLAY_SFX(0x2940802C, boss->sfxSource, 4); @@ -4005,7 +4029,7 @@ void func_i5_80193DF0(Boss* boss) { AUDIO_PLAY_SFX(0x11033022, boss->sfxSource, 4); for (i = 0; i < 33; i++) { - actor = func_800A3608(OBJ_ACTOR_189); + actor = func_game_800A3608(OBJ_ACTOR_189); if (actor != NULL) { actor->state = 40; actor->obj.pos.x = 0.0f; @@ -4186,9 +4210,9 @@ void func_i5_80193DF0(Boss* boss) { if (D_i5_801BBF00[i].unk_24 > 0) { D_i5_801BBF00[i].unk_24--; if (!(D_i5_801BBF00[i].unk_24 & 1)) { - func_8007A900(boss->obj.pos.x + D_i5_801BBF00[i].unk_00.pos.x, - boss->obj.pos.y + D_i5_801BBF00[i].unk_00.pos.y, - boss->obj.pos.z + D_i5_801BBF00[i].unk_00.pos.z, 7.0f, 160, 16, 0); + func_effect_8007A900(boss->obj.pos.x + D_i5_801BBF00[i].unk_00.pos.x, + boss->obj.pos.y + D_i5_801BBF00[i].unk_00.pos.y, + boss->obj.pos.z + D_i5_801BBF00[i].unk_00.pos.z, 7.0f, 160, 16, 0); } } if (D_i5_801BBF00[i].unk_24 != 0) { @@ -4222,7 +4246,7 @@ void func_i5_80193DF0(Boss* boss) { sp84.x = -boss->fwork[28]; sp84.y = boss->fwork[27] + 90.0f; sp84.z = 0.0f; - func_8007EE68(OBJ_EFFECT_353, &sp90, &sp84, &D_800C9F2C, &D_i5_801B8D48, 1.0f); + func_effect_8007EE68(OBJ_EFFECT_353, &sp90, &sp84, &D_tank_800C9F2C, &D_i5_801B8D48, 1.0f); } } } @@ -4235,7 +4259,7 @@ void func_i5_80193DF0(Boss* boss) { sp84.x = -boss->fwork[34]; sp84.y = boss->fwork[33] + 90.0f; sp84.z = 0.0f; - func_8007EE68(OBJ_EFFECT_353, &sp90, &sp84, &D_800C9F2C, &D_i5_801B8D48, 1.0f); + func_effect_8007EE68(OBJ_EFFECT_353, &sp90, &sp84, &D_tank_800C9F2C, &D_i5_801B8D48, 1.0f); } } } @@ -4290,12 +4314,12 @@ void func_i5_80193DF0(Boss* boss) { spD4.y = 0.0f; spD4.z = boss->obj.pos.z + D_i5_801BBEF4[70]; if (boss->unk_04C & 1) { - func_8007A900(spD4.x, 0.0f, spD4.z, 10.0f, 255, 8, 0); + func_effect_8007A900(spD4.x, 0.0f, spD4.z, 10.0f, 255, 8, 0); } if (boss->unk_04C == 38) { - func_8007A6F0(&spD4, 0x29403031); + func_effect_8007A6F0(&spD4, 0x29403031); boss->swork[39] = 5; - D_80178480 = 20; + D_ctx_80178480 = 20; } } if ((boss->unk_04C >= 97) && (boss->unk_04C < 101) && (boss->swork[12] > 0)) { @@ -4303,12 +4327,12 @@ void func_i5_80193DF0(Boss* boss) { spD4.y = 0.0f; spD4.z = boss->obj.pos.z + D_i5_801BBEF4[73]; if (boss->unk_04C & 1) { - func_8007A900(spD4.x, 0.0f, spD4.z, 10.0f, 255, 8, 0); + func_effect_8007A900(spD4.x, 0.0f, spD4.z, 10.0f, 255, 8, 0); } if (boss->unk_04C == 98) { - func_8007A6F0(&spD4, 0x29403031); + func_effect_8007A6F0(&spD4, 0x29403031); boss->swork[39] = 5; - D_80178480 = 20; + D_ctx_80178480 = 20; } } Math_SmoothStepToF(&boss->fwork[0], 0.5f, 1.0f, 0.02f, 0.0f); @@ -4405,10 +4429,10 @@ void func_i5_80193DF0(Boss* boss) { boss->swork[32] = 0; } if (D_i5_801BBEF0[26] != 0) { - D_80178348 = 255; - D_80178350 = 255; - D_80178354 = 255; - D_80178340 = (D_i5_801BBEF0[26] * 255.0f) / 3.0f; + D_ctx_80178348 = 255; + D_ctx_80178350 = 255; + D_ctx_80178354 = 255; + D_ctx_80178340 = (D_i5_801BBEF0[26] * 255.0f) / 3.0f; } if ((boss->unk_04C >= 54) && (boss->unk_04C < 120)) { boss->fwork[46] += 0.04f; @@ -4559,7 +4583,7 @@ void func_i5_80193DF0(Boss* boss) { boss->swork[3]--; if (boss->swork[3] <= 0) { boss->swork[1] = 7 + RAND_INT(6.0f); - func_i5_80193B30(boss); + Titania_80193B30(boss); } boss->swork[4]++; if (boss->swork[37] & 0x18) { @@ -4635,7 +4659,7 @@ void func_i5_80193DF0(Boss* boss) { } if (boss->state >= 7) { if ((boss->fwork[15] <= 0.0f) && (boss->fwork[9] > 0.0f)) { - effect = func_8007783C(OBJ_EFFECT_394); + effect = func_effect_8007783C(OBJ_EFFECT_394); if (effect != NULL) { Matrix_RotateY(gCalcMatrix, boss->obj.rot.y * M_DTOR, 0); Matrix_MultVec3f(gCalcMatrix, (Vec3f*) &boss->fwork[8], &spC8); @@ -4652,7 +4676,7 @@ void func_i5_80193DF0(Boss* boss) { } } if ((boss->fwork[12] <= 0.0f) && (boss->fwork[6] > 0.0f)) { - effect = func_8007783C(OBJ_EFFECT_394); + effect = func_effect_8007783C(OBJ_EFFECT_394); if (effect != NULL) { Matrix_RotateY(gCalcMatrix, boss->obj.rot.y * M_DTOR, 0); Matrix_MultVec3f(gCalcMatrix, (Vec3f*) &boss->fwork[5], &spC8); @@ -4672,7 +4696,7 @@ void func_i5_80193DF0(Boss* boss) { if ((boss->state == 6) && ((boss->unk_04C == 134) || (boss->unk_04C == 188))) { AUDIO_PLAY_SFX(0x29406029, boss->sfxSource, 4); boss->swork[39] = 4; - D_80178480 = 7; + D_ctx_80178480 = 7; } if (boss->state >= 7) { if (((boss->fwork[15] > 0.0f) && (boss->fwork[9] <= 0.0f)) || @@ -4680,10 +4704,10 @@ void func_i5_80193DF0(Boss* boss) { AUDIO_PLAY_SFX(0x29406029, boss->sfxSource, 4); if (boss->state == 12) { boss->swork[39] = 4; - D_80178480 = 20; + D_ctx_80178480 = 20; } else { boss->swork[39] = 2; - D_80178480 = 5; + D_ctx_80178480 = 5; } } boss->fwork[12] = boss->fwork[6]; @@ -4698,13 +4722,13 @@ void func_i5_80193DF0(Boss* boss) { boss->dmgType = DMG_NONE; } #else -#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/func_i5_80193DF0.s") -void func_i5_80193DF0(Boss*); +#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/fox_ti/Titania_80193DF0.s") +void Titania_80193DF0(Boss*); #endif static s16 D_i5_801B8D54[4] = { 30, 35, 60, 70 }; -void func_i5_80197A94(Boss* boss) { +void Titania_80197A94(Boss* boss) { Vec3f sp3C; boss->swork[38]++; @@ -4753,7 +4777,7 @@ void func_i5_80197A94(Boss* boss) { case 2: case 3: case 4: - func_i5_80192118(boss); + Titania_80192118(boss); break; case 5: case 6: @@ -4764,7 +4788,7 @@ void func_i5_80197A94(Boss* boss) { case 11: case 12: case 13: - func_i5_80193DF0(boss); + Titania_80193DF0(boss); break; } @@ -4885,7 +4909,7 @@ void func_i5_80197A94(Boss* boss) { sp3C.x = boss->fwork[29] + boss->obj.pos.x; sp3C.y = boss->fwork[30] + boss->obj.pos.y; sp3C.z = boss->fwork[31] + boss->obj.pos.z; - func_8007A6F0(&sp3C, 0x09004002); + func_effect_8007A6F0(&sp3C, 0x09004002); D_i5_801BBEF0[49] = D_i5_801B8D54[RAND_INT(4.0f)]; D_i5_801BBEF4[74] = RAND_FLOAT(0.4f) + 0.9f; D_i5_801BBEF4[75] = 0.6f; @@ -4911,7 +4935,7 @@ static f32 D_i5_801B8E24[4][2] = { { 1.0f, -1.0f }, }; -void func_i5_801982A8(Boss* boss) { +void Titania_801982A8(Boss* boss) { TexturedLine* temp_v0_6; f32 sp120; f32 temp_fs0; @@ -4939,23 +4963,23 @@ void func_i5_801982A8(Boss* boss) { case 4: Matrix_Push(&gGfxMatrix); D_i5_801BBEF0[25] = 0; - Animation_DrawSkeleton(0, D_TI_A000EDC, D_i5_801BCE88, func_i5_8018FC70, func_i5_8019002C, boss, + Animation_DrawSkeleton(0, D_TI_A000EDC, D_i5_801BCE88, Titania_8018FC70, Titania_8019002C, boss, &gIdentityMatrix); Matrix_Pop(&gGfxMatrix); - D_i5_801B83A8[0] = 22.0f; + D_TI_801B83A8[0] = 22.0f; Matrix_Push(&gGfxMatrix); D_i5_801BBEF0[25] = 1; - Animation_DrawSkeleton(0, D_TI_A000568, D_i5_801BCDC8, func_i5_801903A0, func_i5_8019081C, boss, + Animation_DrawSkeleton(0, D_TI_A000568, D_i5_801BCDC8, Titania_801903A0, Titania_8019081C, boss, &gIdentityMatrix); Matrix_Pop(&gGfxMatrix); Matrix_Push(&gGfxMatrix); D_i5_801BBEF0[25] = 2; - Animation_DrawSkeleton(0, D_TI_A000568, D_i5_801BCE28, func_i5_801903A0, func_i5_8019081C, boss, + Animation_DrawSkeleton(0, D_TI_A000568, D_i5_801BCE28, Titania_801903A0, Titania_8019081C, boss, &gIdentityMatrix); Matrix_Pop(&gGfxMatrix); break; case 6: - Animation_DrawSkeleton(0, D_TI_A001A70, D_i5_801BCDC8, func_i5_80190A08, func_i5_80191AE8, boss, + Animation_DrawSkeleton(0, D_TI_A001A70, D_i5_801BCDC8, Titania_80190A08, Titania_80191AE8, boss, &gIdentityMatrix); break; case 7: @@ -4965,7 +4989,7 @@ void func_i5_801982A8(Boss* boss) { case 11: case 12: case 13: - Animation_DrawSkeleton(0, D_TI_A001A70, D_i5_801BCDC8, func_i5_80190A08, func_i5_80191AE8, boss, + Animation_DrawSkeleton(0, D_TI_A001A70, D_i5_801BCDC8, Titania_80190A08, Titania_80191AE8, boss, &gIdentityMatrix); break; case 0: @@ -5136,7 +5160,7 @@ void func_i5_801982A8(Boss* boss) { static Vec3f D_i5_801B8E44 = { 3.0f, 0.0f, 0.0f }; -void func_i5_801990DC(Boss* boss) { +void Titania_801990DC(Boss* boss) { s32 i; Vec3f sp60; Actor* actor; @@ -5145,8 +5169,8 @@ void func_i5_801990DC(Boss* boss) { AUDIO_PLAY_SFX(0x2940902D, boss->sfxSource, 4); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 50); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 50); - func_8007A568(boss->obj.pos.x, boss->obj.pos.y + 250.0f, boss->obj.pos.z, 40.0f); - func_80042EC0(boss); + func_effect_8007A568(boss->obj.pos.x, boss->obj.pos.y + 250.0f, boss->obj.pos.z, 40.0f); + func_boss_80042EC0(boss); gShowBossHealth = 0; actor = gActors; for (i = 0; i < ARRAY_COUNT(gActors); i++, actor++) { @@ -5157,7 +5181,7 @@ void func_i5_801990DC(Boss* boss) { for (i = 0; i < ARRAY_COUNTU(D_i5_801BBF00); i++) { if (!(D_i5_801BBF00[i].unk_26 & 4)) { - actor = func_800A3608(OBJ_ACTOR_189); + actor = func_game_800A3608(OBJ_ACTOR_189); if (actor != NULL) { actor->state = 40; actor->unk_046 = D_i5_801B7770[i][5]; @@ -5198,7 +5222,7 @@ void func_i5_801990DC(Boss* boss) { switch (boss->timer_050) { case 100: - actor = func_800A3608(OBJ_ACTOR_189); + actor = func_game_800A3608(OBJ_ACTOR_189); if (actor != NULL) { actor->fwork[0] = ((Rand_ZeroOne() < 0.5f) ? -1 : 1) * (RAND_FLOAT(1.0f) + 1.0f); actor->fwork[1] = ((Rand_ZeroOne() < 0.5f) ? -1 : 1) * (RAND_FLOAT(1.0f) + 1.0f); @@ -5218,7 +5242,7 @@ void func_i5_801990DC(Boss* boss) { } break; case 120: - actor = func_800A3608(OBJ_ACTOR_189); + actor = func_game_800A3608(OBJ_ACTOR_189); if (actor != NULL) { actor->fwork[0] = ((Rand_ZeroOne() < 0.5f) ? -1 : 1) * (RAND_FLOAT(5.0f) + 5.0f); actor->fwork[1] = ((Rand_ZeroOne() < 0.5f) ? -1 : 1) * (RAND_FLOAT(5.0f) + 5.0f); @@ -5239,7 +5263,7 @@ void func_i5_801990DC(Boss* boss) { } break; case 140: - actor = func_800A3608(OBJ_ACTOR_189); + actor = func_game_800A3608(OBJ_ACTOR_189); if (actor != NULL) { actor->fwork[0] = ((Rand_ZeroOne() < 0.5f) ? -1 : 1) * (RAND_FLOAT(1.0f) + 1.0f); actor->fwork[1] = ((Rand_ZeroOne() < 0.5f) ? -1 : 1) * (RAND_FLOAT(1.0f) + 1.0f); diff --git a/src/overlays/ovl_i5/fox_ti_cs.c b/src/overlays/ovl_i5/fox_ti_cs.c index a4538dae..44de72d7 100644 --- a/src/overlays/ovl_i5/fox_ti_cs.c +++ b/src/overlays/ovl_i5/fox_ti_cs.c @@ -8,7 +8,7 @@ f32 D_i5_801B7328[] = { 1000.0f, 1000.0f, 1000.0f, 4000.0f }; f32 D_i5_801B7338[] = { 1000.0f, 1000.0f, 1000.0f, -4000.0f }; f32 D_i5_801B7348[] = { 90.0f, -90.0f, 0.0f }; -void func_i5_80187530(Actor* actor) { +void Titania_80187530(Actor* actor) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; actor->obj.id = OBJ_ACTOR_195; @@ -23,7 +23,7 @@ void func_i5_80187530(Actor* actor) { actor->unk_0B6 = 1; } -void func_i5_801875D0(Actor* actor, s32 arg1) { +void Titania_801875D0(Actor* actor, s32 arg1) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; actor->obj.id = OBJ_ACTOR_195; @@ -38,7 +38,7 @@ void func_i5_801875D0(Actor* actor, s32 arg1) { AUDIO_PLAY_SFX(0x3100000CU, actor->sfxSource, 4U); } -void func_i5_8018769C(Player* player) { +void Titania_8018769C(Player* player) { f32 sp64; Actor* actor = &gActors[3]; Vec3f sp54; @@ -49,17 +49,17 @@ void func_i5_8018769C(Player* player) { switch (player->unk_1D0) { case 0: gCsFrameCount = 0; - D_80177BAC = 1; + D_ctx_80177BAC = 1; player->unk_0D4 = 0.0f; - func_i5_80187530(&gActors[3]); + Titania_80187530(&gActors[3]); if (gTeamShields[1] > 0) { - func_i5_801875D0(&gActors[10], 0); + Titania_801875D0(&gActors[10], 0); } if (gTeamShields[3] > 0) { - func_i5_801875D0(&gActors[11], 1); + Titania_801875D0(&gActors[11], 1); } player->pos.x = actor->obj.pos.x; @@ -81,7 +81,7 @@ void func_i5_8018769C(Player* player) { gBgColor = 0x78C1; // 120, 24, 0 case 1: - D_80177A48[0] = 0.01f; + D_ctx_80177A48[0] = 0.01f; sp64 = 20.0f; gCsCamEyeX = actor->obj.pos.x - 500.0f; gCsCamEyeY = actor->obj.pos.y - 500.0f; @@ -109,7 +109,7 @@ void func_i5_8018769C(Player* player) { if (player->timer_1F8 == 1) { player->unk_0D4 = 1.0f; - D_80177A48[0] = 0.05f; + D_ctx_80177A48[0] = 0.05f; } if (player->timer_1F8 == 0) { @@ -132,10 +132,10 @@ void func_i5_8018769C(Player* player) { player->unk_1D0 = 3; player->unk_144 = 200.0f; - D_80177D20 = 200.0f; - D_80177CC8 = D_80177D20; + D_ctx_80177D20 = 200.0f; + D_ctx_80177CC8 = D_ctx_80177D20; - player->pos.z = -(D_80177D20) -200.0f; + player->pos.z = -(D_ctx_80177D20) -200.0f; player->unk_0D4 = 0.0f; player->vel.y = 0.0f; player->pos.y = 2000.0f; @@ -152,17 +152,17 @@ void func_i5_8018769C(Player* player) { player->unk_16C = 0.5f; player->unk_170 = 0.5f; - D_80177A48[2] = -270.0f; - D_80177A48[3] = 200.0f; - D_80177A48[1] = 0.0f; + D_ctx_80177A48[2] = -270.0f; + D_ctx_80177A48[3] = 200.0f; + D_ctx_80177A48[1] = 0.0f; - *D_80177A10 = 0; + *D_ctx_80177A10 = 0; - Matrix_RotateY(gCalcMatrix, D_80177A48[2] * M_DTOR, 0); + Matrix_RotateY(gCalcMatrix, D_ctx_80177A48[2] * M_DTOR, 0); sp54.x = 0.0f; sp54.y = 30.0f; - sp54.z = D_80177A48[3]; + sp54.z = D_ctx_80177A48[3]; Matrix_MultVec3f(gCalcMatrix, &sp54, &sp48); @@ -178,12 +178,12 @@ void func_i5_8018769C(Player* player) { break; case 3: - Math_SmoothStepToF(&D_80177A48[2], 0.0f, 0.1f, 4.0f, 0.0f); - Matrix_RotateY(gCalcMatrix, D_80177A48[2] * M_DTOR, 0); + Math_SmoothStepToF(&D_ctx_80177A48[2], 0.0f, 0.1f, 4.0f, 0.0f); + Matrix_RotateY(gCalcMatrix, D_ctx_80177A48[2] * M_DTOR, 0); sp54.x = 0.0f; sp54.y = 30.0f; - sp54.z = D_80177A48[3]; + sp54.z = D_ctx_80177A48[3]; Matrix_MultVec3f(gCalcMatrix, &sp54, &sp48); @@ -196,37 +196,37 @@ void func_i5_8018769C(Player* player) { player->camAt.y = gCsCamAtY = player->pos.y; player->camAt.z = gCsCamAtZ = player->pos.z + player->unk_144; - Math_SmoothStepToF(&player->pos.y, D_80177A48[1], 0.1f, 50.0f, 0.0f); + Math_SmoothStepToF(&player->pos.y, D_ctx_80177A48[1], 0.1f, 50.0f, 0.0f); if (player->pos.y < 200.0f) { Math_SmoothStepToF(&player->unk_170, 1.0f, 1.0f, 0.2f, 0.0f); Math_SmoothStepToF(&player->unk_16C, 1.0f, 1.0f, 0.2f, 0.0f); - Math_SmoothStepToF(&D_80177A48[1], 70.0f, 0.05f, 1.0f, 0.0f); - Math_SmoothStepToF(&D_80177A48[3], 400.0f, 1.0f, 5.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[1], 70.0f, 0.05f, 1.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[3], 400.0f, 1.0f, 5.0f, 0.0f); - if (D_80177A10[0] == 0) { - D_80177A10[0]++; + if (D_ctx_80177A10[0] == 0) { + D_ctx_80177A10[0]++; AUDIO_PLAY_SFX(0x01008016U, player->sfxSource, 0U); } } if (player->pos.y < 100.0f) { - func_8007A900(RAND_FLOAT_CENTERED(30.0f) + player->pos.x, 30.0f, - RAND_FLOAT_CENTERED(30.0f) + player->unk_138, RAND_FLOAT(2.0f) + 3.5f, 255, 12, 1); + func_effect_8007A900(RAND_FLOAT_CENTERED(30.0f) + player->pos.x, 30.0f, + RAND_FLOAT_CENTERED(30.0f) + player->unk_138, RAND_FLOAT(2.0f) + 3.5f, 255, 12, 1); Object_Kill(&gActors[3].obj, gActors[3].sfxSource); } Math_SmoothStepToF(&player->unk_0F0, SIN_DEG(gGameFrameCount * 5.0f) * 10.0f, 0.1f, 100.0f, 0.0f); if (gCsFrameCount == 0x244) { - D_80177838 = 0x32; + D_ctx_80177838 = 0x32; player->state_1C8 = PLAYERSTATE_1C8_3; player->unk_1D0 = player->timer_1F8 = player->timer_1FC = player->unk_240 = 0; player->unk_0D4 = 3.0f; player->unk_014 = 0.0f; - D_8017782C = 1; - func_800A594C(); - D_8017782C = 0; + D_ctx_8017782C = 1; + func_play_800A594C(); + D_ctx_8017782C = 0; if ((gControllerHold[player->num].button & Z_TRIG) && (gControllerHold[player->num].button & R_TRIG)) { Audio_KillSfxBySourceAndId(player->sfxSource, 0x01008016); } @@ -239,15 +239,15 @@ void func_i5_8018769C(Player* player) { player->pos.z += player->vel.z; player->unk_138 = player->pos.z; - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], sp64, 0.00f); - Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], sp64, 0.00f); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], sp64, 0.00f); - Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], sp64, 0.00f); - Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], sp64, 0.00f); - Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], sp64, 0.00f); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], sp64, 0.00f); + Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_ctx_80177A48[0], sp64, 0.00f); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], sp64, 0.00f); + Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_ctx_80177A48[0], sp64, 0.00f); + Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_ctx_80177A48[0], sp64, 0.00f); + Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_ctx_80177A48[0], sp64, 0.00f); } -void func_i5_80188108(Actor* actor, s32 arg1) { +void Titania_80188108(Actor* actor, s32 arg1) { Player* player = &gPlayer[0]; Actor_Initialize(actor); @@ -282,7 +282,7 @@ void func_i5_80188108(Actor* actor, s32 arg1) { } } -void func_i5_801882CC(Player* player) { +void Titania_801882CC(Player* player) { f32 x; f32 camAtY = 0.0f; Vec3f src; @@ -291,49 +291,49 @@ void func_i5_801882CC(Player* player) { switch (player->unk_1D0) { case 0: - gCsFrameCount = gBossActive = D_80178488 = 0; + gCsFrameCount = gBossActive = D_ctx_80178488 = 0; - func_800A6148(); + func_play_800A6148(); player->unk_1D0 = 1; - D_80177A48[0] = 0.0f; - D_80177A48[1] = 0.0f; - D_80177A48[2] = 0.0f; - D_80177A48[3] = 250.0f; + D_ctx_80177A48[0] = 0.0f; + D_ctx_80177A48[1] = 0.0f; + D_ctx_80177A48[2] = 0.0f; + D_ctx_80177A48[3] = 250.0f; player->unk_0D4 = 3.0f; - func_i5_80188108(&gActors[0], 0); + Titania_80188108(&gActors[0], 0); if (gTeamShields[1] > 0) { - func_i5_80188108(&gActors[1], 1); + Titania_80188108(&gActors[1], 1); } if (gTeamShields[3] > 0) { - func_i5_80188108(&gActors[2], 2); + Titania_80188108(&gActors[2], 2); } Audio_KillSfxBySourceAndId(player->sfxSource, 0x01004024U); case 1: - Math_SmoothStepToF(D_80177A48, 0.1f, 1.0f, 0.01f, 0.0f); + Math_SmoothStepToF(D_ctx_80177A48, 0.1f, 1.0f, 0.01f, 0.0f); Math_SmoothStepToF(&player->unk_0D0, 4.9f, 0.1f, 1.0f, 0.0f); Math_SmoothStepToF(&player->unk_08C, 0.0f, 0.1f, 1.0f, 0.0f); if (gCsFrameCount < 0x460) { - Math_SmoothStepToF(&D_80177A48[1], 0.65f, 0.1f, 0.01f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[1], 0.65f, 0.1f, 0.01f, 0.0f); } else { - Math_SmoothStepToF(&D_80177A48[1], 0.0f, 0.1f, 0.02f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[1], 0.0f, 0.1f, 0.02f, 0.0f); } - D_80177A48[2] = D_80177A48[1] + D_80177A48[2]; + D_ctx_80177A48[2] = D_ctx_80177A48[1] + D_ctx_80177A48[2]; Matrix_RotateX(gCalcMatrix, -10.0f * M_DTOR, 0); - Matrix_RotateY(gCalcMatrix, D_80177A48[2] * M_DTOR, 1); + Matrix_RotateY(gCalcMatrix, D_ctx_80177A48[2] * M_DTOR, 1); src.x = 0.0f; src.y = 0.0f; - src.z = D_80177A48[3]; + src.z = D_ctx_80177A48[3]; Matrix_MultVec3f(gCalcMatrix, &src, &dest); @@ -349,12 +349,12 @@ void func_i5_801882CC(Player* player) { gCsCamAtY = player->pos.y + 30.0f; gCsCamAtZ = player->pos.z + player->unk_144; - func_80045130(player); - func_80044868(player); - func_80045678(player); - func_80045E7C(player); - func_800A8BA4(player); - func_800ADF58(player); + func_tank_80045130(player); + func_tank_80044868(player); + func_tank_80045678(player); + func_tank_80045E7C(player); + func_play_800A8BA4(player); + func_play_800ADF58(player); if (!(gGameFrameCount & 3)) { f32 x; @@ -366,14 +366,14 @@ void func_i5_801882CC(Player* player) { y = D_i5_801B72B8[i].y + RAND_FLOAT_CENTERED(10.0f); z = D_i5_801B72B8[i].z; - func_8007A900(player->pos.x + x, player->pos.y + y, player->unk_138 + z, RAND_FLOAT(0.5f) + 0.5f, - 255, 21, 0); + func_effect_8007A900(player->pos.x + x, player->pos.y + y, player->unk_138 + z, + RAND_FLOAT(0.5f) + 0.5f, 255, 21, 0); } } break; case 2: - Math_SmoothStepToF(D_80177A48, 0.1f, 1.0f, 0.01f, 0.0f); + Math_SmoothStepToF(D_ctx_80177A48, 0.1f, 1.0f, 0.01f, 0.0f); gCsCamEyeX -= 2.5f; gCsCamEyeZ -= 1.0f; @@ -389,12 +389,12 @@ void func_i5_801882CC(Player* player) { Math_SmoothStepToF(&player->unk_16C, 2.0f, 1.0f, 0.2f, 0.0f); if (gCsFrameCount < 1470) { - func_8007A900(RAND_FLOAT_CENTERED(30.0f) + (player->pos.x + 30.0f), 30.0f, - RAND_FLOAT_CENTERED(30.0f) + player->unk_138, RAND_FLOAT(2.0f) + 3.5f, 255, 12, 1); + func_effect_8007A900(RAND_FLOAT_CENTERED(30.0f) + (player->pos.x + 30.0f), 30.0f, + RAND_FLOAT_CENTERED(30.0f) + player->unk_138, RAND_FLOAT(2.0f) + 3.5f, 255, 12, 1); } - func_8007A900(RAND_FLOAT_CENTERED(30.0f) + (player->pos.x - 30.0f), 30.0f, - RAND_FLOAT_CENTERED(30.0f) + player->unk_138, RAND_FLOAT(2.0f) + 3.5f, 255, 12, 1); + func_effect_8007A900(RAND_FLOAT_CENTERED(30.0f) + (player->pos.x - 30.0f), 30.0f, + RAND_FLOAT_CENTERED(30.0f) + player->unk_138, RAND_FLOAT(2.0f) + 3.5f, 255, 12, 1); Math_SmoothStepToF(&player->unk_0F0, SIN_DEG(gGameFrameCount * 6.0f) * 18.0f, 0.1f, 100.0f, 0.0f); Math_SmoothStepToF(&player->unk_080, SIN_DEG(gGameFrameCount * 3.0f) * 5.0f, 0.1f, 100.0f, 0.0f); @@ -414,11 +414,11 @@ void func_i5_801882CC(Player* player) { switch (gCsFrameCount) { case 831: - D_80177830 = 1; + D_ctx_80177830 = 1; break; case 1031: - D_80177830 = 0; + D_ctx_80177830 = 0; break; case 50: @@ -426,7 +426,7 @@ void func_i5_801882CC(Player* player) { break; case 80: - D_80177840 = 100; + D_ctx_80177840 = 100; break; case 160: @@ -492,23 +492,23 @@ void func_i5_801882CC(Player* player) { case 1300: player->unk_1D0++; - D_80177A48[0] = 0.0f; + D_ctx_80177A48[0] = 0.0f; player->vel.z = 0.0f; player->vel.y = 0.0f; - func_i5_80188108(&gActors[3], 3); - D_80161A44 = 30000.0f; + Titania_80188108(&gActors[3], 3); + D_game_80161A44 = 30000.0f; player->unk_240 = 1; func_8001CA24(0); AUDIO_PLAY_SFX(0x01008016U, player->sfxSource, 0U); break; } - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 20000.0f, 0.00f); - Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 20000.0f, 0.00f); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 20000.0f, 0.00f); - Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 20000.0f, 0.00f); - Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 20000.0f, 0.00f); - Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 20000.0f, 0.00f); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], 20000.0f, 0.00f); + Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_ctx_80177A48[0], 20000.0f, 0.00f); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], 20000.0f, 0.00f); + Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_ctx_80177A48[0], 20000.0f, 0.00f); + Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_ctx_80177A48[0], 20000.0f, 0.00f); + Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_ctx_80177A48[0], 20000.0f, 0.00f); player->camAt.y += camAtY; @@ -518,15 +518,15 @@ void func_i5_801882CC(Player* player) { } if (gCsFrameCount > 1440) { - D_80178348 = D_80178350 = D_80178354 = 0; - D_80178358 = 255; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; + D_ctx_80178358 = 255; - if (D_80178340 == 255) { + if (D_ctx_80178340 == 255) { player->state_1C8 = PLAYERSTATE_1C8_6; - D_8017837C = 4; - func_800A6148(); + D_ctx_8017837C = 4; + func_play_800A6148(); Audio_FadeOutAll(10); - D_800D3180[LEVEL_TITANIA] = Play_CheckMedalStatus(150) + 1; + D_play_800D3180[LEVEL_TITANIA] = Play_CheckMedalStatus(150) + 1; } } } diff --git a/src/overlays/ovl_i6/fox_andross.c b/src/overlays/ovl_i6/fox_andross.c index c7d4a0d8..74548e80 100644 --- a/src/overlays/ovl_i6/fox_andross.c +++ b/src/overlays/ovl_i6/fox_andross.c @@ -1,35 +1,34 @@ -#include "prevent_bss_reordering.h" + +// #include "prevent_bss_reordering.h" #include "global.h" #include "assets/ast_venom_2.h" #include "assets/ast_andross.h" #include "assets/ast_arwing.h" #include "assets/ast_bg_planet.h" - -f32 D_i6_801A7F40; -f32 D_i6_801A7F44; -f32 D_i6_801A7F48; -f32 D_i6_801A7F4C; -f32 D_i6_801A7F50; -f32 D_i6_801A7F54; -f32 D_i6_801A7F58; +#include "prevent_bss_reordering.h" +#include "prevent_bss_reordering2.h" f32 D_i6_801A7F5C; -f32 D_i6_801A7F60; f32 D_i6_801A7F64; -f32 D_i6_801A7F68; f32 D_i6_801A7F6C; -f32 D_i6_801A7F70; f32 D_i6_801A7F74; -f32 D_i6_801A7F78; f32 D_i6_801A7F7C; Vec3f D_i6_801A7F80[100]; f32 D_i6_801A8430; +f32 D_Andross_801A7F58; +f32 D_Andross_801A7F60; +f32 D_Andross_801A7F68; +f32 D_Andross_801A7F70; +f32 D_Andross_801A7F78; + static f32* D_i6_801A6760[12] = { D_ANDROSS_C037FCC, D_ANDROSS_C0380C0, D_ANDROSS_C0381B4, D_ANDROSS_C0382A8, D_ANDROSS_C03839C, D_ANDROSS_C038490, D_ANDROSS_C038584, D_ANDROSS_C038678, D_ANDROSS_C03876C, D_ANDROSS_C038860, D_ANDROSS_C038954, D_ANDROSS_C038954, }; -void func_i6_80187530(Actor* actor) { +void Andross_80193710(void); + +void Andross_80187530(Actor* actor) { s32 index; switch (actor->unk_048) { @@ -53,24 +52,24 @@ void func_i6_80187530(Actor* actor) { index = actor->unk_0B6 / 18.0f; actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_i6_801A6760[index]); - actor->obj.rot.z = D_i6_801A7F68; + actor->obj.rot.z = D_Andross_801A7F68; } -s32 func_i6_8018767C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +s32 Andross_8018767C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { if (limbIndex == 13) { *dList = NULL; } return 0; } -void func_i6_8018769C(Actor* actor) { +void Andross_8018769C(Actor* actor) { Vec3f sp28[20]; Animation_GetFrameData(&D_VE2_6014658, actor->unk_0B6, sp28); - Animation_DrawSkeleton(1, D_VE2_6014844, sp28, func_i6_8018767C, NULL, NULL, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_VE2_6014844, sp28, Andross_8018767C, NULL, NULL, &gIdentityMatrix); } -void func_i6_801876FC(void) { +void Andross_801876FC(void) { s32 temp_ft3; s32* var_s0; s32* var_s3; @@ -89,28 +88,28 @@ void func_i6_801876FC(void) { } } -void func_i6_801878A8() { +void Andross_801878A8() { Actor* actor; Item* item; Object_58* obj58; s32 i; - D_80178310 = SEGMENTED_TO_VIRTUAL(&D_ANDROSS_C0356CC); + D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(&D_ANDROSS_C0356CC); for (obj58 = gObjects58, i = 0; i < 1000; i++) { - if (D_80178310[i].id < 0) { + if (D_ctx_80178310[i].id < 0) { break; } - if (D_80178310[i].id <= OBJ_80_160) { + if (D_ctx_80178310[i].id <= OBJ_80_160) { Object_58_Initialize(obj58); obj58->obj.status = OBJ_ACTIVE; - obj58->obj.id = D_80178310[i].id; - obj58->obj.pos.x = D_80178310[i].xPos; - obj58->obj.pos.z = -D_80178310[i].zPos1; - obj58->obj.pos.z += D_80178310[i].zPos2; - obj58->obj.pos.y = D_80178310[i].yPos; - obj58->obj.rot.y = D_80178310[i].rot.y; + obj58->obj.id = D_ctx_80178310[i].id; + obj58->obj.pos.x = D_ctx_80178310[i].xPos; + obj58->obj.pos.z = -D_ctx_80178310[i].zPos1; + obj58->obj.pos.z += D_ctx_80178310[i].zPos2; + obj58->obj.pos.y = D_ctx_80178310[i].yPos; + obj58->obj.rot.y = D_ctx_80178310[i].rot.y; Object_SetInfo(&obj58->info, obj58->obj.id); if (obj58->obj.id == OBJ_80_131) { obj58->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_ANDROSS_C038CCC); @@ -120,43 +119,43 @@ void func_i6_801878A8() { } for (actor = &gActors[1], i = 0; i < 1000; i++) { - if (D_80178310[i].id < 0) { + if (D_ctx_80178310[i].id < 0) { break; } - if ((D_80178310[i].id <= OBJ_ACTOR_291) && (D_80178310[i].id >= OBJ_ACTOR_176)) { + if ((D_ctx_80178310[i].id <= OBJ_ACTOR_291) && (D_ctx_80178310[i].id >= OBJ_ACTOR_176)) { Actor_Initialize(actor); actor->obj.status = OBJ_ACTIVE; - actor->obj.id = D_80178310[i].id; - actor->obj.pos.x = D_80178310[i].xPos; - actor->obj.pos.z = -D_80178310[i].zPos1; - actor->obj.pos.z += D_80178310[i].zPos2; - actor->obj.pos.y = D_80178310[i].yPos; - actor->obj.rot.y = D_80178310[i].rot.y; + actor->obj.id = D_ctx_80178310[i].id; + actor->obj.pos.x = D_ctx_80178310[i].xPos; + actor->obj.pos.z = -D_ctx_80178310[i].zPos1; + actor->obj.pos.z += D_ctx_80178310[i].zPos2; + actor->obj.pos.y = D_ctx_80178310[i].yPos; + actor->obj.rot.y = D_ctx_80178310[i].rot.y; Object_SetInfo(&actor->info, actor->obj.id); actor++; } } for (item = gItems, i = 0; i < 1000; i++) { - if (D_80178310[i].id < 0) { + if (D_ctx_80178310[i].id < 0) { break; } - if ((D_80178310[i].id <= OBJ_ITEM_TRAINING_RING) && (D_80178310[i].id >= OBJ_ITEM_LASERS)) { + if ((D_ctx_80178310[i].id <= OBJ_ITEM_TRAINING_RING) && (D_ctx_80178310[i].id >= OBJ_ITEM_LASERS)) { Item_Initialize(item); item->obj.status = OBJ_ACTIVE; - item->obj.id = D_80178310[i].id; - item->obj.pos.x = D_80178310[i].xPos; - item->obj.pos.z = -D_80178310[i].zPos1; - item->obj.pos.z += D_80178310[i].zPos2; - item->obj.pos.y = D_80178310[i].yPos; + item->obj.id = D_ctx_80178310[i].id; + item->obj.pos.x = D_ctx_80178310[i].xPos; + item->obj.pos.z = -D_ctx_80178310[i].zPos1; + item->obj.pos.z += D_ctx_80178310[i].zPos2; + item->obj.pos.y = D_ctx_80178310[i].yPos; Object_SetInfo(&item->info, item->obj.id); item++; } } } -void func_i6_80187C5C(void) { +void Andross_80187C5C(void) { Actor* actor; Item* item; Object_58* obj58; @@ -164,33 +163,33 @@ void func_i6_80187C5C(void) { switch (RAND_INT(2.9f)) { case 0: - D_80178310 = SEGMENTED_TO_VIRTUAL(&D_ANDROSS_C036310); + D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(&D_ANDROSS_C036310); break; case 1: - D_80178310 = SEGMENTED_TO_VIRTUAL(&D_ANDROSS_C036B6C); + D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(&D_ANDROSS_C036B6C); break; default: case 2: - D_80178310 = SEGMENTED_TO_VIRTUAL(&D_ANDROSS_C03733C); + D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(&D_ANDROSS_C03733C); break; } for (obj58 = gObjects58, i = 0; i < 1000; i++) { - if (D_80178310[i].id < 0) { + if (D_ctx_80178310[i].id < 0) { break; } - if (D_80178310[i].id <= OBJ_80_160) { + if (D_ctx_80178310[i].id <= OBJ_80_160) { Object_58_Initialize(obj58); obj58->obj.status = OBJ_ACTIVE; - obj58->obj.id = D_80178310[i].id; - obj58->obj.pos.x = D_80178310[i].xPos; - obj58->obj.pos.z = -D_80178310[i].zPos1; - obj58->obj.pos.z += D_80178310[i].zPos2; - obj58->obj.pos.y = D_80178310[i].yPos; - obj58->obj.rot.y = D_80178310[i].rot.y; + obj58->obj.id = D_ctx_80178310[i].id; + obj58->obj.pos.x = D_ctx_80178310[i].xPos; + obj58->obj.pos.z = -D_ctx_80178310[i].zPos1; + obj58->obj.pos.z += D_ctx_80178310[i].zPos2; + obj58->obj.pos.y = D_ctx_80178310[i].yPos; + obj58->obj.rot.y = D_ctx_80178310[i].rot.y; if (obj58->obj.id == OBJ_80_147) { - obj58->unk40[0] = D_80178310[i].rot.z; + obj58->unk40[0] = D_ctx_80178310[i].rot.z; } Object_SetInfo(&obj58->info, obj58->obj.id); if (obj58->obj.id == OBJ_80_131) { @@ -201,43 +200,43 @@ void func_i6_80187C5C(void) { } for (actor = &gActors[1], i = 0; i < 1000; i++) { - if (D_80178310[i].id < 0) { + if (D_ctx_80178310[i].id < 0) { break; } - if ((D_80178310[i].id <= OBJ_ACTOR_291) && (D_80178310[i].id >= OBJ_ACTOR_176)) { + if ((D_ctx_80178310[i].id <= OBJ_ACTOR_291) && (D_ctx_80178310[i].id >= OBJ_ACTOR_176)) { Actor_Initialize(actor); actor->obj.status = OBJ_ACTIVE; - actor->obj.id = D_80178310[i].id; - actor->obj.pos.x = D_80178310[i].xPos; - actor->obj.pos.z = -D_80178310[i].zPos1; - actor->obj.pos.z += D_80178310[i].zPos2; - actor->obj.pos.y = D_80178310[i].yPos; - actor->obj.rot.y = D_80178310[i].rot.y; + actor->obj.id = D_ctx_80178310[i].id; + actor->obj.pos.x = D_ctx_80178310[i].xPos; + actor->obj.pos.z = -D_ctx_80178310[i].zPos1; + actor->obj.pos.z += D_ctx_80178310[i].zPos2; + actor->obj.pos.y = D_ctx_80178310[i].yPos; + actor->obj.rot.y = D_ctx_80178310[i].rot.y; Object_SetInfo(&actor->info, actor->obj.id); actor++; } } for (item = gItems, i = 0; i < 1000; i++) { - if (D_80178310[i].id < 0) { + if (D_ctx_80178310[i].id < 0) { break; } - if ((D_80178310[i].id <= OBJ_ITEM_TRAINING_RING) && (D_80178310[i].id >= OBJ_ITEM_LASERS)) { + if ((D_ctx_80178310[i].id <= OBJ_ITEM_TRAINING_RING) && (D_ctx_80178310[i].id >= OBJ_ITEM_LASERS)) { Item_Initialize(item); item->obj.status = OBJ_ACTIVE; - item->obj.id = D_80178310[i].id; - item->obj.pos.x = D_80178310[i].xPos; - item->obj.pos.z = -D_80178310[i].zPos1; - item->obj.pos.z += D_80178310[i].zPos2; - item->obj.pos.y = D_80178310[i].yPos; + item->obj.id = D_ctx_80178310[i].id; + item->obj.pos.x = D_ctx_80178310[i].xPos; + item->obj.pos.z = -D_ctx_80178310[i].zPos1; + item->obj.pos.z += D_ctx_80178310[i].zPos2; + item->obj.pos.y = D_ctx_80178310[i].yPos; Object_SetInfo(&item->info, item->obj.id); item++; } } } -void func_i6_801880E4(Actor* actor) { +void Andross_801880E4(Actor* actor) { s32 i; f32 xDisplacement; f32 yDisplacement; @@ -301,11 +300,11 @@ void func_i6_801880E4(Actor* actor) { actor->vel.z = vel.z; } -void func_i6_80188448(Actor* actor) { - func_8005B388(actor); +void Andross_80188448(Actor* actor) { + func_edisplay_8005B388(actor); } -void func_i6_80188468(void) { +void Andross_80188468(void) { Actor* actor = &gActors[0]; Actor_Initialize(actor); @@ -320,14 +319,14 @@ void func_i6_80188468(void) { AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); } -void func_i6_80188528(Actor* actor) { +void Andross_80188528(Actor* actor) { Math_SmoothStepToF(&actor->vel.x, 0.0f, 0.2f, 0.5f, 0.0f); Math_SmoothStepToF(&actor->vel.y, 0.0f, 0.2f, 0.5f, 0.0f); Math_SmoothStepToF(&actor->vel.z, 0.0f, 0.2f, 0.5f, 0.0f); if (actor->unk_0D0 != 0) { - func_8007A6F0(&actor->obj.pos, 0x2903A008); + func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); Object_Kill(&actor->obj, actor->sfxSource); - func_8007B344(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 3.0f, 5); + func_effect_8007B344(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 3.0f, 5); } else if (actor->timer_0BC == 0) { Object_Kill(&actor->obj, actor->sfxSource); } @@ -336,7 +335,7 @@ void func_i6_80188528(Actor* actor) { actor->unk_0F4.z += actor->fwork[0]; } -void func_i6_80188660(Actor* actor) { +void Andross_80188660(Actor* actor) { RCP_SetupDL(&gMasterDisp, 0x3D); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255); Matrix_RotateZ(gGfxMatrix, actor->unk_0F4.z * M_DTOR, 1); @@ -348,7 +347,7 @@ void func_i6_80188660(Actor* actor) { gSPDisplayList(gMasterDisp++, D_VE2_6009300); } -void func_i6_801887B0(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { +void Andross_801887B0(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { Actor_Initialize(actor); actor->obj.status = OBJ_ACTIVE; actor->obj.id = OBJ_ACTOR_286; @@ -367,42 +366,42 @@ void func_i6_801887B0(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 Object_SetInfo(&actor->info, actor->obj.id); } -void func_i6_8018887C(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { +void Andross_8018887C(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) { s32 i; for (i = 0; i < ARRAY_COUNT(gActors); i++) { if (gActors[i].obj.status == OBJ_FREE) { - func_i6_801887B0(&gActors[i], xPos, yPos, zPos, xVel, yVel, zVel); + Andross_801887B0(&gActors[i], xPos, yPos, zPos, xVel, yVel, zVel); break; } } } -void func_i6_801888F4(Actor* actor) { +void Andross_801888F4(Actor* actor) { s32 i; actor->obj.rot.z -= 8.0f; if ((actor->timer_0BC & 1) == 1) { - func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 5.0f); + func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 5.0f); } if ((actor->timer_0BC == 0) || (actor->unk_0D0 != 0)) { - func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->vel.x, actor->vel.y, actor->vel.z, - 7.0f, 20); - func_8007B344(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f, 5); + func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->vel.x, actor->vel.y, + actor->vel.z, 7.0f, 20); + func_effect_8007B344(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f, 5); for (i = 0; i < 6; i++) { - func_800794CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f); + func_effect_800794CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f); } - func_8007A6F0(&actor->obj.pos, 0x2903B009); + func_effect_8007A6F0(&actor->obj.pos, 0x2903B009); Object_Kill(&actor->obj, actor->sfxSource); BonusText_Display(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 5); gHitCount += 6; - D_80177850 = 15; + D_ctx_80177850 = 15; } } -void func_i6_80188A4C(Boss* boss) { +void Andross_80188A4C(Boss* boss) { if (boss->damage > 20) { boss->damage = 20; @@ -423,16 +422,16 @@ void func_i6_80188A4C(Boss* boss) { AUDIO_PLAY_SFX(0x2943500FU, boss->sfxSource, 4); boss->health -= boss->damage; if ((boss->health != 0) && (boss->health <= 0)) { - D_Timer_80161A60 = 8; + D_play_Timer_80161A60 = 8; AUDIO_PLAY_SFX(0x2940D09AU, boss->sfxSource, 4); - func_80042EC0(boss); + func_boss_80042EC0(boss); gPlayer[0].state_1C8 = PLAYERSTATE_1C8_0; boss->state = 20; boss->swork[1] = 1000; boss->swork[2] = 1000; boss->swork[6] = 1; - D_80177A48[0] = 0.0f; - D_80177A48[1] = 0.1f; + D_ctx_80177A48[0] = 0.0f; + D_ctx_80177A48[1] = 0.1f; gCsFrameCount = 0; Audio_KillSfxBySourceAndId(boss->sfxSource, 0x11034074U); Audio_KillSfxBySourceAndId(boss->sfxSource, 0x31408097U); @@ -459,7 +458,7 @@ void func_i6_80188A4C(Boss* boss) { } } -void func_i6_80188CB8(Boss* boss) { +void Andross_80188CB8(Boss* boss) { s32 i; Vec3f sp50; Vec3f sp44; @@ -497,7 +496,7 @@ void func_i6_80188CB8(Boss* boss) { if (boss->swork[7] != 0) { boss->swork[7]--; if (!(gGameFrameCount & 1)) { - func_i6_8018887C(RAND_FLOAT_CENTERED(100.0f) + boss->obj.pos.x, + Andross_8018887C(RAND_FLOAT_CENTERED(100.0f) + boss->obj.pos.x, RAND_FLOAT_CENTERED(300.0f) + (boss->obj.pos.y - 250.0f), RAND_FLOAT_CENTERED(100.0f) + boss->obj.pos.z, RAND_FLOAT_CENTERED(50.0f), RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT_CENTERED(50.0f)); @@ -530,7 +529,7 @@ void func_i6_80188CB8(Boss* boss) { } } -void func_i6_80189098(Boss* boss) { +void Andross_80189098(Boss* boss) { Actor* actor = &gActors[10]; Actor_Initialize(actor); @@ -543,7 +542,7 @@ void func_i6_80189098(Boss* boss) { actor->obj.pos.y = 0.0f; actor->obj.pos.z = boss->obj.pos.z; Object_SetInfo(&actor->info, actor->obj.id); - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_800CBEA8); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_edata_800CBEA8); actor++; @@ -557,18 +556,16 @@ void func_i6_80189098(Boss* boss) { actor->obj.pos.y = 0.0f; actor->obj.pos.z = boss->obj.pos.z; Object_SetInfo(&actor->info, actor->obj.id); - actor->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_800CBEA8); + actor->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_edata_800CBEA8); gActors[0].state = 2; } -extern void func_800B56BC(Player*); - -void func_i6_80189214(void) { +void Andross_80189214(void) { s32 i; Player* player = &gPlayer[0]; - func_800A6148(); + func_play_800A6148(); for (i = 0; i < 200; i++) { gObjects58[i].obj.status = OBJ_FREE; @@ -582,7 +579,7 @@ void func_i6_80189214(void) { player->unk_148 = player->unk_14C = 0.74f; player->camEye.y = player->pos.y * player->unk_14C + 10.0f; player->camEye.x = player->pos.x * player->unk_148; - D_80177DC8 = 0; + D_ctx_80177DC8 = 0; // FAKE if (1) {} PRINTF("FO_Game_Sw %d\n"); @@ -590,13 +587,13 @@ void func_i6_80189214(void) { player->camAt.y = 0.0f; player->unk_114 = 0.0f; player->unk_144 = 0.0f; - D_80177D20 = 0.0f; + D_ctx_80177D20 = 0.0f; player->unk_018 = player->unk_014 = 1.0f; player->pos.z = player->unk_138 = -player->unk_144; - func_800B56BC(player); + func_play_800B56BC(player); } -void func_i6_8018933C(Actor* actor) { +void Andross_8018933C(Actor* actor) { if ((fabsf(actor->obj.pos.x - gPlayer[0].pos.x) < 1000.0f) && (fabsf(actor->obj.pos.z - gPlayer[0].unk_138) < 1000.0f)) { D_Timer_80177B44 = 50; @@ -604,9 +601,9 @@ void func_i6_8018933C(Actor* actor) { } } -void func_i6_801893B8(Actor* actor) { +void Andross_801893B8(Actor* actor) { - if (D_8015F924 == 0) { + if (D_360_8015F924 == 0) { actor->unk_04E++; switch (actor->unk_04E) { case 200: @@ -625,16 +622,14 @@ void func_i6_801893B8(Actor* actor) { } } -void func_i6_80193710(void); - -void func_i6_80189470(Actor* actor) { +void Andross_80189470(Actor* actor) { s32 i; Player* player = &gPlayer[0]; - if ((D_80177AB0 != 7) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) && + if ((D_ctx_80177AB0 != 7) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) && (fabsf(actor->obj.pos.x - gPlayer[0].pos.x) < 9000.0f) && (fabsf(actor->obj.pos.z - gPlayer[0].unk_138) < 9000.0f)) { - D_80177AB0 = 7; + D_ctx_80177AB0 = 7; Radio_PlayMessage(gMsg_ID_19370, RCID_JAMES); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 20); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 20); @@ -645,12 +640,12 @@ void func_i6_80189470(Actor* actor) { Audio_KillSfxById(0x11403076); Audio_SetBaseSfxReverb(0); gCurrentLevel = LEVEL_VENOM_2; - D_8017827C = 1; - D_800D2F68 = 1; + D_ctx_8017827C = 1; + D_play_800D2F68 = 1; player->state_1C8 = PLAYERSTATE_1C8_7; player->unk_1D0 = 3; - player->unk_144 = D_80177D20 = 0.0f; - D_80177AB0 = D_80177A98 = 1; + player->unk_144 = D_ctx_80177D20 = 0.0f; + D_ctx_80177AB0 = D_ctx_80177A98 = 1; player->camEye.x = 1200.0f; player->camEye.z = 1200.0f; player->camEye.y = 1800.0f; @@ -659,27 +654,25 @@ void func_i6_80189470(Actor* actor) { gCsCamAtZ = 0.0f; player->unk_234 = 0; player->unk_034 = 0.0f; - D_80177A48[0] = 1.0f; - func_800A6148(); + D_ctx_80177A48[0] = 1.0f; + func_play_800A6148(); for (i = 0; i < 200; i++) { gObjects58[i].obj.status = OBJ_FREE; } - func_i6_80193710(); - D_8017782C = 1; - func_800A594C(); - D_80178348 = D_80178350 = D_80178354 = 0; - D_80178340 = D_80178358 = 255; + Andross_80193710(); + D_ctx_8017782C = 1; + func_play_800A594C(); + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; + D_ctx_80178340 = D_ctx_80178358 = 255; player->timer_1F8 = 2; gCsFrameCount = 0; - D_80177A48[1] = 0.0f; + D_ctx_80177A48[1] = 0.0f; } } -extern void func_8004D440(Player*); - -void func_i6_80189724(Actor* actor) { +void Andross_80189724(Actor* actor) { s32 i; Vec3f vec; Vec3f displacement; @@ -702,8 +695,8 @@ void func_i6_80189724(Actor* actor) { actor->vel.y = vel.y * 0.2f; actor->vel.z = vel.z * 0.2f; for (i = 0; i < 1; i++) { - func_8007797C(actor->obj.pos.x + displacement.x, actor->obj.pos.y + displacement.y, - actor->obj.pos.z + displacement.z, vel.x, vel.y, vel.z, RAND_FLOAT(2.5f) + 15.5f); + func_effect_8007797C(actor->obj.pos.x + displacement.x, actor->obj.pos.y + displacement.y, + actor->obj.pos.z + displacement.z, vel.x, vel.y, vel.z, RAND_FLOAT(2.5f) + 15.5f); } } if ((fabsf(actor->obj.pos.x - gPlayer[0].pos.x) < 500.0f) && @@ -718,11 +711,11 @@ void func_i6_80189724(Actor* actor) { } } if (actor->timer_0BC == 1) { - func_8004D440(&gPlayer[0]); + func_demo_8004D440(&gPlayer[0]); } } -void func_i6_801899E4(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2, u8 arg5) { +void Andross_801899E4(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2, u8 arg5) { Effect_Initialize(effect); effect->obj.status = OBJ_ACTIVE; @@ -740,23 +733,18 @@ void func_i6_801899E4(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2, Object_SetInfo(&effect->info, effect->obj.id); } -void func_i6_80189B00(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { +void Andross_80189B00(f32 xPos, f32 yPos, f32 zPos, f32 scale2) { s32 i; for (i = 50; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i6_801899E4(&gEffects[i], xPos, yPos, zPos, scale2, 0); + Andross_801899E4(&gEffects[i], xPos, yPos, zPos, scale2, 0); break; } } } -extern f32 D_800C9C30; -extern s32 D_800C9E90[]; - -void func_i6_801876FC(void); - -void func_i6_80189B70(Boss* boss) { +void Andross_80189B70(Boss* boss) { s32 i; s32 sp98; s32 frameCountMask; @@ -771,10 +759,10 @@ void func_i6_80189B70(Boss* boss) { Vec3f sp58; s32 pad; - func_i6_80188A4C(boss); - func_i6_80188CB8(boss); + Andross_80188A4C(boss); + Andross_80188CB8(boss); boss->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_ANDROSS_C038F24); - Math_SmoothStepToF(&D_800C9C30, 255.0f, 1.0f, 4.0f, 0); + Math_SmoothStepToF(&D_bg_800C9C30, 255.0f, 1.0f, 4.0f, 0); Math_SmoothStepToF(&boss->unk_3F8, 10.0f, 0.2f, 0.2f, 0); if (!(gGameFrameCount & 0x10)) { Math_SmoothStepToF(&boss->fwork[25], 255.0f, 1.0f, 10.0f, 0); @@ -792,10 +780,10 @@ void func_i6_80189B70(Boss* boss) { switch (boss->state) { case 0: boss->health = 200; - D_80177AB0 = 3; + D_ctx_80177AB0 = 3; boss->fwork[19] = -26.0f; boss->fwork[10] = 8.0f; - func_i6_80189098(boss); + Andross_80189098(boss); boss->swork[5] = 300; boss->state++; AUDIO_PLAY_SFX(0x11034074, boss->sfxSource, 4); @@ -845,14 +833,14 @@ void func_i6_80189B70(Boss* boss) { } break; case 11: - boss->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_800CBF34); + boss->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_edata_800CBF34); if (boss->timer_050 < 120) { - D_80178348 = D_80178350 = D_80178354 = 255; - D_80178358 = 80; - D_8017835C = 1; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; + D_ctx_80178358 = 80; + D_ctx_8017835C = 1; gPlayer[0].timer_224 = gGameFrameCount & 7; gPlayer[0].timer_220 = 3; - Math_SmoothStepToF(&D_801779A8[gMainController], 40.0f, 1.0f, 3.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_801779A8[gMainController], 40.0f, 1.0f, 3.0f, 0.0f); if (!(gGameFrameCount & 0x1F) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3)) { Player_ApplyDamage(&gPlayer[0], 3, 10); } @@ -867,14 +855,14 @@ void func_i6_80189B70(Boss* boss) { boss->fwork[19] = 23.0f; boss->fwork[1] = 0.0f; gPlayer[0].unk_238 = 1; - Math_SmoothStepToF(&D_800CA230, 0.15f, 0.2f, 0.004f, 0.0f); + Math_SmoothStepToF(&D_display_800CA230, 0.15f, 0.2f, 0.004f, 0.0f); if (boss->timer_050 == 120) { AUDIO_PLAY_SFX(0x1940306E, boss->sfxSource, 4); } if (boss->timer_050 == 0) { - gPlayer[0].unk_0D0 = D_80161A54; + gPlayer[0].unk_0D0 = D_play_80161A54; gPlayer[0].unk_238 = 0; - D_80178358 = 0; + D_ctx_80178358 = 0; boss->timer_05A = 50; if (boss->swork[4] != 0) { boss->state = 1; @@ -894,7 +882,7 @@ void func_i6_80189B70(Boss* boss) { boss->fwork[5] = gPlayer[0].unk_138; break; case 12: - boss->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_800CBF34); + boss->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_edata_800CBF34); boss->fwork[1] = 0; boss->fwork[24] = 0.2f; boss->fwork[22] = 0.0f; @@ -915,7 +903,7 @@ void func_i6_80189B70(Boss* boss) { } break; case 13: - boss->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_800CBF34); + boss->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_edata_800CBF34); boss->fwork[24] = 0.0f; boss->fwork[22] = 255.0f; if (250.0f < boss->fwork[22]) { @@ -934,25 +922,25 @@ void func_i6_80189B70(Boss* boss) { vec.y = RAND_FLOAT_CENTERED(300.0f); vec.z = 500.0f; Matrix_MultVec3f(gCalcMatrix, &vec, &sp64); - func_8007797C(boss->obj.pos.x + sp64.x, boss->obj.pos.y + sp64.y, boss->obj.pos.z + sp64.z, 0.0f, 0.0f, - 0.0f, RAND_FLOAT(5.0f) + 7.0f); + func_effect_8007797C(boss->obj.pos.x + sp64.x, boss->obj.pos.y + sp64.y, boss->obj.pos.z + sp64.z, 0.0f, + 0.0f, 0.0f, RAND_FLOAT(5.0f) + 7.0f); if (!(gGameFrameCount & 1)) { - func_8007C484(RAND_FLOAT_CENTERED(600.0f) + boss->obj.pos.x, - RAND_FLOAT(100.0f) + (boss->obj.pos.y + 100.0f), boss->obj.pos.z, 0.0f, 0.0f, 0.0f, - RAND_FLOAT(0.3f) + 0.5f, 0); + func_effect_8007C484(RAND_FLOAT_CENTERED(600.0f) + boss->obj.pos.x, + RAND_FLOAT(100.0f) + (boss->obj.pos.y + 100.0f), boss->obj.pos.z, 0.0f, 0.0f, 0.0f, + RAND_FLOAT(0.3f) + 0.5f, 0); } vec.x = 0.0f; vec.y = 0.0f; vec.z = 2000.0f; Matrix_MultVec3f(gCalcMatrix, &vec, &sp64); - Math_SmoothStepToF(&D_80177A48[0], 100.0f, 1.0f, 2.0f, 0.0f); - Math_SmoothStepToF(&D_80177A48[1], 100.0f, 1.0f, 10.0f, 0.0f); - Math_SmoothStepToF(&gPlayer[0].camEye.x, boss->obj.pos.x + sp64.x, 0.02f, D_80177A48[0], 0.0f); - Math_SmoothStepToF(&gPlayer[0].camEye.y, boss->obj.pos.y + sp64.y, 0.02f, D_80177A48[0], 0.0f); - Math_SmoothStepToF(&gPlayer[0].camEye.z, boss->obj.pos.z + sp64.z, 0.02f, D_80177A48[0], 0.0f); - Math_SmoothStepToF(&gPlayer[0].camAt.x, boss->obj.pos.x, 0.05f, D_80177A48[1], 0.0f); - Math_SmoothStepToF(&gPlayer[0].camAt.y, boss->obj.pos.y, 0.05f, D_80177A48[1], 0.0f); - Math_SmoothStepToF(&gPlayer[0].camAt.z, boss->obj.pos.z, 0.05f, D_80177A48[1], 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[0], 100.0f, 1.0f, 2.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[1], 100.0f, 1.0f, 10.0f, 0.0f); + Math_SmoothStepToF(&gPlayer[0].camEye.x, boss->obj.pos.x + sp64.x, 0.02f, D_ctx_80177A48[0], 0.0f); + Math_SmoothStepToF(&gPlayer[0].camEye.y, boss->obj.pos.y + sp64.y, 0.02f, D_ctx_80177A48[0], 0.0f); + Math_SmoothStepToF(&gPlayer[0].camEye.z, boss->obj.pos.z + sp64.z, 0.02f, D_ctx_80177A48[0], 0.0f); + Math_SmoothStepToF(&gPlayer[0].camAt.x, boss->obj.pos.x, 0.05f, D_ctx_80177A48[1], 0.0f); + Math_SmoothStepToF(&gPlayer[0].camAt.y, boss->obj.pos.y, 0.05f, D_ctx_80177A48[1], 0.0f); + Math_SmoothStepToF(&gPlayer[0].camAt.z, boss->obj.pos.z, 0.05f, D_ctx_80177A48[1], 0.0f); Math_SmoothStepToF(&gPlayer[0].unk_034, 0.0f, 0.5f, 0.5f, 0.0f); if (gCsFrameCount == 50) { @@ -960,33 +948,33 @@ void func_i6_80189B70(Boss* boss) { } if (gCsFrameCount == 200) { gBossActive = 0; - gPlayer[0].unk_0D0 = D_80161A54; + gPlayer[0].unk_0D0 = D_play_80161A54; func_8001CA24(0); boss->state = 21; - func_8007B344(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 60.0f, 5); - func_8007A568(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 40.0f); + func_effect_8007B344(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 60.0f, 5); + func_effect_8007A568(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 40.0f); for (i = 0; i < ARRAY_COUNT(gActors); i++) { if ((gActors[i].obj.status == OBJ_ACTIVE) && (gActors[i].obj.id == OBJ_ACTOR_286)) { Object_Kill(&gActors[i].obj, gActors[i].sfxSource); } } - D_80177AB0 = 4; + D_ctx_80177AB0 = 4; gCsFrameCount = 0; } break; case 21: - func_i6_801876FC(); + Andross_801876FC(); gCsFrameCount++; - D_80178480 = 10; + D_ctx_80178480 = 10; if (gCsFrameCount < 200) { - D_80178380[0] += 4; - if (D_80178380[0] >= 0xFF) { - D_80178380[0] = 0xFF; + D_ctx_80178380[0] += 4; + if (D_ctx_80178380[0] >= 0xFF) { + D_ctx_80178380[0] = 0xFF; } - D_80178390[0] = D_801783A0[0] = D_801783B0[0] = 0xFF; - Math_SmoothStepToF(&D_800CA230, 0.15f, 0.2f, 0.004f, 0.0f); - Math_SmoothStepToF(&D_801779A8[gMainController], 70.0f, 1.0f, 4.0f, 0.0f); + D_ctx_80178390[0] = D_ctx_801783A0[0] = D_ctx_801783B0[0] = 0xFF; + Math_SmoothStepToF(&D_display_800CA230, 0.15f, 0.2f, 0.004f, 0.0f); + Math_SmoothStepToF(&D_ctx_801779A8[gMainController], 70.0f, 1.0f, 4.0f, 0.0f); } switch (gCsFrameCount) { case 30: @@ -999,17 +987,17 @@ void func_i6_80189B70(Boss* boss) { break; case 500: Radio_PlayMessage(gMsg_ID_19350, RCID_FOX); - D_8015F924 = 1; + D_360_8015F924 = 1; break; case 600: - D_80177AB0 = 5; + D_ctx_80177AB0 = 5; gFogRed = 129; gFogGreen = 27; gFogBlue = 0; gFogNear = 996; gFogFar = 1007; gBgColor = 0x4081; // 64, 16, 0 - D_80161A44 = 30000.0f; + D_game_80161A44 = 30000.0f; gGroundLevel = -50.0f; gPlayer[0].pos.x = -25995.0f; gPlayer[0].pos.y = 300.0f; @@ -1024,17 +1012,17 @@ void func_i6_80189B70(Boss* boss) { gPlayer[0].unk_1D0 = 100; gPlayer[0].timer_1F8 = 240; gPlayer[0].unk_234 = 1; - D_80177A48[5] = -1200.0f; + D_ctx_80177A48[5] = -1200.0f; - func_i6_80188468(); - func_i6_80187C5C(); + Andross_80188468(); + Andross_80187C5C(); gPlayer[0].unk_014 = 1.0f; - func_800B7184(gPlayer, 1); + func_play_800B7184(gPlayer, 1); func_8001C8B8(0); - AUDIO_PLAY_BGM(D_800C9E90[gCurrentLevel]); + AUDIO_PLAY_BGM(D_boss_800C9E90[gCurrentLevel]); AUDIO_PLAY_SFX(0x11403076, gDefaultSfxSource, 0); - D_80177CA4 = gHitCount; + D_ctx_80177CA4 = gHitCount; break; case 800: Radio_PlayMessage(gMsg_ID_19340, RCID_JAMES); @@ -1050,7 +1038,7 @@ void func_i6_80189B70(Boss* boss) { break; } if (gCsFrameCount > 600) { - Math_SmoothStepToF(&D_801779A8[gMainController], 10.0f, 1.0f, 2.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_801779A8[gMainController], 10.0f, 1.0f, 2.0f, 0.0f); } boss->obj.pos.y = 10000.0f; @@ -1060,7 +1048,7 @@ void func_i6_80189B70(Boss* boss) { vec.y = 600.0f; vec.z = RAND_FLOAT(1000.0f) + -3000.0f; Matrix_MultVec3fNoTranslate(gCalcMatrix, &vec, &sp64); - func_i6_80189B00(gPlayer[0].pos.x + sp64.x, sp64.y, gPlayer[0].unk_138 + sp64.z, 1.2f); + Andross_80189B00(gPlayer[0].pos.x + sp64.x, sp64.y, gPlayer[0].unk_138 + sp64.z, 1.2f); } if (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_0) { Matrix_RotateY(gCalcMatrix, -gPlayer[0].unk_058, 0); @@ -1085,8 +1073,9 @@ void func_i6_80189B70(Boss* boss) { sp98 = 1; if (!(gGameFrameCount & frameCountMask)) { for (i = 0; i < sp98; i++) { - func_8007797C(gPlayer[0].camEye.x + sp64.x, gPlayer[0].camEye.y + sp64.y, - gPlayer[0].camEye.z + sp64.z, sp58.x, sp58.y, sp58.z, RAND_FLOAT(2.5f) + 2.5f); + func_effect_8007797C(gPlayer[0].camEye.x + sp64.x, gPlayer[0].camEye.y + sp64.y, + gPlayer[0].camEye.z + sp64.z, sp58.x, sp58.y, sp58.z, + RAND_FLOAT(2.5f) + 2.5f); } } } @@ -1114,7 +1103,7 @@ void func_i6_80189B70(Boss* boss) { Matrix_MultVec3fNoTranslate(gCalcMatrix, &vec, &sp64); boss->vel.x = sp64.x; boss->vel.y = sp64.y; - boss->vel.z = sp64.z - D_80177D08; + boss->vel.z = sp64.z - D_ctx_80177D08; if (boss->state < 20) { gRadarMarks[59].unk_00 = 1; gRadarMarks[59].unk_02 = 0x66; @@ -1150,7 +1139,7 @@ void func_i6_80189B70(Boss* boss) { Math_SmoothStepToF(&boss->fwork[23], boss->fwork[24], 0.3f, 0.01f, 0); } -s32 func_i6_8018B47C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +s32 Andross_8018B47C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { Boss* boss = (Boss*) data; if (boss->fwork[21] >= 254.0f) { @@ -1201,7 +1190,7 @@ s32 func_i6_8018B47C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d return false; } -void func_i6_8018B8C0(Boss* boss) { +void Andross_8018B8C0(Boss* boss) { s32 j; s32 i; f32 temp; @@ -1215,7 +1204,7 @@ void func_i6_8018B8C0(Boss* boss) { Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 20.0f * M_DTOR, 1); Matrix_Scale(gGfxMatrix, boss->fwork[23] + 1.0f, 1.0f - boss->fwork[23], 1.0f, 1); Matrix_Scale(gGfxMatrix, boss->unk_3F8, boss->unk_3F8, boss->unk_3F8, 1); - Animation_DrawSkeleton(0, D_VE2_600C0A4, boss->vwork, func_i6_8018B47C, NULL, boss, &gIdentityMatrix); + Animation_DrawSkeleton(0, D_VE2_600C0A4, boss->vwork, Andross_8018B47C, NULL, boss, &gIdentityMatrix); if (boss->fwork[21] >= 254) { RCP_SetupDL(&gMasterDisp, 0x36); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 64, 64, 255); @@ -1257,7 +1246,7 @@ void func_i6_8018B8C0(Boss* boss) { } } -void func_i6_8018BDD8(void) { +void Andross_8018BDD8(void) { s32 i; f32 spC0[17]; f32 sp7C[17]; @@ -1288,16 +1277,16 @@ void func_i6_8018BDD8(void) { } if (gBossActive != 0) { - Math_SmoothStepToF(&D_i6_801A7F58, 0.0f, 1.0f, 10.0f, 0.0f); + Math_SmoothStepToF(&D_Andross_801A7F58, 0.0f, 1.0f, 10.0f, 0.0f); } else { - Math_SmoothStepToF(&D_i6_801A7F58, D_i6_801A7F60, 1.0f, 1.0f, 0.0f); + Math_SmoothStepToF(&D_Andross_801A7F58, D_Andross_801A7F60, 1.0f, 1.0f, 0.0f); } - D_i6_801A7F68 += D_i6_801A7F70; - Math_SmoothStepToF(&D_i6_801A7F70, D_i6_801A7F78, 1.0f, 0.1f, 0.0f); + D_Andross_801A7F68 += D_Andross_801A7F70; + Math_SmoothStepToF(&D_Andross_801A7F70, D_Andross_801A7F78, 1.0f, 0.1f, 0.0f); } -void func_i6_8018C390(Player* player) { +void Andross_8018C390(Player* player) { player->unk_2B4 = 1; player->unk_280 = 0; @@ -1309,7 +1298,7 @@ void func_i6_8018C390(Player* player) { Math_SmoothStepToF(&player->pos.x, gBosses[0].obj.pos.x, 0.5f, 30.0f, 0); Math_SmoothStepToF(&player->pos.y, gBosses[0].obj.pos.y - 150.0f, 0.5f, 30.0f, 0); Math_SmoothStepToF(&player->pos.z, gBosses[0].obj.pos.z - 100.0f, 0.5f, 60.0f, 0); - D_80177D20 = player->unk_144 = -player->pos.z; + D_ctx_80177D20 = player->unk_144 = -player->pos.z; Math_SmoothStepToF(&player->camEye.z, 2000.0f, 0.05f, 20.0f, 0); Math_SmoothStepToF(&player->camEye.x, 0.0f, 0.05f, 10.0f, 0); Math_SmoothStepToF(&player->camEye.y, 0.0f, 0.05f, 10.0f, 0); @@ -1341,10 +1330,10 @@ void func_i6_8018C390(Player* player) { break; } player->unk_138 = player->pos.z + player->unk_08C; - func_800A46A0(player); + func_play_800A46A0(player); } -void func_i6_8018C660(Effect* effect, f32 xPos, f32 yPos, f32 zPos, s32 arg4) { +void Andross_8018C660(Effect* effect, f32 xPos, f32 yPos, f32 zPos, s32 arg4) { Effect_Initialize(effect); effect->obj.status = OBJ_ACTIVE; effect->obj.id = OBJ_EFFECT_396; @@ -1358,18 +1347,18 @@ void func_i6_8018C660(Effect* effect, f32 xPos, f32 yPos, f32 zPos, s32 arg4) { Object_SetInfo(&effect->info, effect->obj.id); } -void func_i6_8018C734(f32 xPos, f32 yPos, f32 zPos, s32 arg3) { +void Andross_8018C734(f32 xPos, f32 yPos, f32 zPos, s32 arg3) { s32 i; for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i6_8018C660(&gEffects[i], xPos, yPos, zPos, arg3); + Andross_8018C660(&gEffects[i], xPos, yPos, zPos, arg3); break; } } } -void func_i6_8018C7A0(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, s32 arg7) { +void Andross_8018C7A0(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, s32 arg7) { Effect_Initialize(effect); effect->obj.status = OBJ_ACTIVE; effect->obj.id = OBJ_EFFECT_396; @@ -1392,18 +1381,18 @@ void func_i6_8018C7A0(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f3 effect->info.unk_10 = 100.0f; } -void func_i6_8018C8D4(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, s32 arg6) { +void Andross_8018C8D4(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, s32 arg6) { s32 i; for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i6_8018C7A0(&gEffects[i], xPos, yPos, zPos, xVel, yVel, zVel, arg6); + Andross_8018C7A0(&gEffects[i], xPos, yPos, zPos, xVel, yVel, zVel, arg6); break; } } } -void func_i6_8018C958(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale) { +void Andross_8018C958(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale) { Effect_Initialize(effect); effect->obj.status = OBJ_ACTIVE; effect->obj.id = OBJ_EFFECT_396; @@ -1424,18 +1413,18 @@ void func_i6_8018C958(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f3 effect->info.unk_10 = 100.0f; } -void func_i6_8018CA50(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale) { +void Andross_8018CA50(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale) { s32 i; for (i = ARRAY_COUNT(gEffects) - 1; i >= 0; i--) { if (gEffects[i].obj.status == OBJ_FREE) { - func_i6_8018C958(&gEffects[i], xPos, yPos, zPos, xVel, yVel, zVel, scale); + Andross_8018C958(&gEffects[i], xPos, yPos, zPos, xVel, yVel, zVel, scale); break; } } } -void func_i6_8018CAD4(Effect* effect) { +void Andross_8018CAD4(Effect* effect) { s32 i; Item* item; Vec3f vec; @@ -1474,7 +1463,7 @@ void func_i6_8018CAD4(Effect* effect) { Matrix_MultVec3f(gCalcMatrix, &vec, &vel); effect->vel.x = vel.x; effect->vel.y = vel.y; - effect->vel.z = vel.z - D_80177D08; + effect->vel.z = vel.z - D_ctx_80177D08; if ((fabsf(effect->obj.pos.x - gBosses[0].obj.pos.x) <= 100.0f) && (fabsf(effect->obj.pos.z - (gBosses[0].obj.pos.z - 100.0f)) <= 100.0f)) { Object_Kill(&effect->obj, effect->sfxSource); @@ -1484,20 +1473,20 @@ void func_i6_8018CAD4(Effect* effect) { Math_SmoothStepToF(&effect->vel.x, 0.0f, 0.05f, 1.0f, 0); Math_SmoothStepToF(&effect->vel.y, 0.0f, 0.05f, 1.0f, 0); Math_SmoothStepToF(&effect->vel.z, 70.0f, 0.05f, 2.0f, 0); - func_8007A774(&gPlayer[0], effect, 100.0f); + func_effect_8007A774(&gPlayer[0], effect, 100.0f); if (effect->unk_44 != 0) { - func_8007D0E0(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 10.0f); - func_8007A6F0(&effect->obj.pos, 0x2903A008); + func_effect_8007D0E0(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 10.0f); + func_effect_8007A6F0(&effect->obj.pos, 0x2903A008); Object_Kill(&effect->obj, effect->sfxSource); } } effect->unk_44 = 0; break; case 1: - func_8007A774(&gPlayer[0], effect, 100.0f); + func_effect_8007A774(&gPlayer[0], effect, 100.0f); if (effect->unk_44 != 0) { - func_8007D0E0(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 10.0f); - func_8007A6F0(&effect->obj.pos, 0x2903A008); + func_effect_8007D0E0(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 10.0f); + func_effect_8007A6F0(&effect->obj.pos, 0x2903A008); Object_Kill(&effect->obj, effect->sfxSource); if (Rand_ZeroOne() < 0.1f) { item = gItems; @@ -1540,7 +1529,7 @@ static Gfx* D_i6_801A6790[10] = { D_ANDROSS_C001880, D_ANDROSS_C001880, D_ANDROSS_C001880, D_arwing_3016660, D_arwing_3015D80, }; -void func_i6_8018CF98(Effect* effect) { +void Andross_8018CF98(Effect* effect) { if (effect->state == 10) { gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, effect->unk_44); @@ -1558,7 +1547,7 @@ void func_i6_8018CF98(Effect* effect) { } } -void func_i6_8018D0D8(Boss* boss) { +void Andross_8018D0D8(Boss* boss) { if ((gPlayer[0].timer_498 == 0) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) && (fabsf(boss->vwork[10].x - gPlayer[0].pos.x) < 700.0f) && (fabsf(boss->vwork[10].y - gPlayer[0].pos.y) < 700.0f)) { @@ -1566,10 +1555,10 @@ void func_i6_8018D0D8(Boss* boss) { } } -void func_i6_8018D16C(Boss* boss) { +void Andross_8018D16C(Boss* boss) { Audio_SetBaseSfxReverb(0x18); D_i6_801A7F5C = D_i6_801A7F64 = D_i6_801A7F6C = D_i6_801A7F74 = D_i6_801A7F7C = D_i6_801A8430 = 0.0f; - D_800C9C30 = 0.0f; + D_bg_800C9C30 = 0.0f; boss->health = 100; boss->fwork[18] = 1.0f; boss->fwork[17] = 1.0f; @@ -1583,13 +1572,13 @@ void func_i6_8018D16C(Boss* boss) { boss->swork[4] = boss->swork[5] = 200; boss->swork[6] = 100; gBossActive = 1; - D_80177AB0 = 1; + D_ctx_80177AB0 = 1; boss->info.hitbox[16] = 200.0f; boss->info.hitbox[22] = 200.0f; Audio_PlaySequence(SEQ_PLAYER_BGM, SEQ_ID_33 | 0x8000, 0, 0); } -void func_i6_8018D2B0(Boss* boss) { +void Andross_8018D2B0(Boss* boss) { s32 i; Vec3f sp68; @@ -1601,7 +1590,7 @@ void func_i6_8018D2B0(Boss* boss) { boss->timer_05C = 20; if ((boss->state == 9) || (boss->state == 10)) { if (boss->health <= 0) { - D_Timer_80161A60 = 8; + D_play_Timer_80161A60 = 8; AUDIO_PLAY_SFX(0x2940D09A, boss->sfxSource, 4); AUDIO_PLAY_SFX(0x31009063, boss->sfxSource, 4); AUDIO_PLAY_SFX(0x19403070, boss->sfxSource, 4); @@ -1621,7 +1610,7 @@ void func_i6_8018D2B0(Boss* boss) { AUDIO_PLAY_SFX(0x19403070, boss->sfxSource, 4); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1); - if (D_8017827C == 0) { + if (D_ctx_8017827C == 0) { boss->state = 30; } else { boss->state = 32; @@ -1678,18 +1667,18 @@ void func_i6_8018D2B0(Boss* boss) { boss->swork[4] -= boss->damage; if (boss->swork[4] < 0) { boss->info.hitbox[16] = 0.0f; - func_8007BFFC(boss->vwork[0].x, boss->vwork[0].y, boss->vwork[0].z, 0.0f, 0.0f, 0.0f, 20.0f, - 15); + func_effect_8007BFFC(boss->vwork[0].x, boss->vwork[0].y, boss->vwork[0].z, 0.0f, 0.0f, 0.0f, + 20.0f, 15); for (i = 0; i < 30; i++) { - func_800794CC(boss->vwork[0].x + RAND_FLOAT_CENTERED(500.0f), - boss->vwork[0].y + RAND_FLOAT_CENTERED(500.0f), boss->vwork[0].z, - RAND_FLOAT(1.0f) + 1.0f); + func_effect_800794CC(boss->vwork[0].x + RAND_FLOAT_CENTERED(500.0f), + boss->vwork[0].y + RAND_FLOAT_CENTERED(500.0f), boss->vwork[0].z, + RAND_FLOAT(1.0f) + 1.0f); } - func_8007B344(boss->vwork[0].x, boss->vwork[0].y, boss->vwork[0].z, 20.0f, 5); - func_8007A6F0(&sp68, 0x2903B009); + func_effect_8007B344(boss->vwork[0].x, boss->vwork[0].y, boss->vwork[0].z, 20.0f, 5); + func_effect_8007A6F0(&sp68, 0x2903B009); } else { - func_8007A6F0(&sp68, 0x29034003); + func_effect_8007A6F0(&sp68, 0x29034003); } } else { sp68.x = boss->vwork[1].x; @@ -1698,18 +1687,18 @@ void func_i6_8018D2B0(Boss* boss) { boss->swork[5] -= boss->damage; if (boss->swork[5] < 0) { boss->info.hitbox[22] = 0.0f; - func_8007BFFC(boss->vwork[1].x, boss->vwork[1].y, boss->vwork[1].z, 0.0f, 0.0f, 0.0f, 20.0f, - 15); + func_effect_8007BFFC(boss->vwork[1].x, boss->vwork[1].y, boss->vwork[1].z, 0.0f, 0.0f, 0.0f, + 20.0f, 15); for (i = 0; i < 30; i++) { - func_800794CC(boss->vwork[1].x + RAND_FLOAT_CENTERED(500.0f), - boss->vwork[1].y + RAND_FLOAT_CENTERED(500.0f), boss->vwork[1].z, - RAND_FLOAT(1.0f) + 1.0f); + func_effect_800794CC(boss->vwork[1].x + RAND_FLOAT_CENTERED(500.0f), + boss->vwork[1].y + RAND_FLOAT_CENTERED(500.0f), boss->vwork[1].z, + RAND_FLOAT(1.0f) + 1.0f); } - func_8007B344(boss->vwork[1].x, boss->vwork[1].y, boss->vwork[1].z, 20.0f, 5); - func_8007A6F0(&sp68, 0x2903B009); + func_effect_8007B344(boss->vwork[1].x, boss->vwork[1].y, boss->vwork[1].z, 20.0f, 5); + func_effect_8007A6F0(&sp68, 0x2903B009); } else { - func_8007A6F0(&sp68, 0x29034003); + func_effect_8007A6F0(&sp68, 0x29034003); } } } @@ -1719,7 +1708,7 @@ void func_i6_8018D2B0(Boss* boss) { } } -void func_i6_8018D9C0(Boss* boss) { +void Andross_8018D9C0(Boss* boss) { switch (boss->state) { case 2: @@ -1758,21 +1747,21 @@ void func_i6_8018D9C0(Boss* boss) { boss->fwork[7] = 0.0f; } -void func_i6_8018DA94(Boss* boss, Vec3f* arg1) { +void Andross_8018DA94(Boss* boss, Vec3f* arg1) { s32 i; - func_8007BFFC(arg1->x, arg1->y, arg1->z, 0.0f, 0.0f, 0.0f, 10.0f, 10); + func_effect_8007BFFC(arg1->x, arg1->y, arg1->z, 0.0f, 0.0f, 0.0f, 10.0f, 10); for (i = 0; i < 7; i++) { - func_800794CC(RAND_FLOAT_CENTERED(200.0f) + arg1->x, RAND_FLOAT_CENTERED(200.0f) + arg1->y, arg1->z, - RAND_FLOAT(0.5f) + 1.0f); + func_effect_800794CC(RAND_FLOAT_CENTERED(200.0f) + arg1->x, RAND_FLOAT_CENTERED(200.0f) + arg1->y, arg1->z, + RAND_FLOAT(0.5f) + 1.0f); } - func_8007B344(arg1->x, arg1->y, arg1->z, 10.0f, 5); + func_effect_8007B344(arg1->x, arg1->y, arg1->z, 10.0f, 5); AUDIO_PLAY_SFX(0x2903B009, boss->sfxSource, 4); } static f32 D_i6_801A67B8[] = { 0.0f, 0.0f, 0.0f }; -void func_i6_8018DBF0(Boss* boss) { +void Andross_8018DBF0(Boss* boss) { s32 i; s32 frameCountMask; Vec3f spD0[100]; @@ -1794,11 +1783,11 @@ void func_i6_8018DBF0(Boss* boss) { initialstate = boss->state; - func_i6_801876FC(); + Andross_801876FC(); gAmbientR = 10; gAmbientG = 0; gAmbientB = 20; - D_8017812C = 0; + D_ctx_8017812C = 0; boss->fwork[19] += 5.0f; if (boss->swork[9] != 0) { boss->swork[9]--; @@ -1820,15 +1809,15 @@ void func_i6_8018DBF0(Boss* boss) { frameCountMask = 0; } if (!(gGameFrameCount & frameCountMask)) { - func_i6_8018CA50(boss->vwork[6].x, boss->vwork[6].y, boss->vwork[6].z, 0.0f, -30.0f, 0.0f, 30.0f); - func_i6_8018CA50(boss->vwork[7].x, boss->vwork[7].y, boss->vwork[7].z, 0.0f, -30.0f, 0.0f, 30.0f); - func_i6_8018CA50(boss->vwork[8].x, boss->vwork[8].y, boss->vwork[8].z, -30.0f, 0.0f, 0.0f, 30.0f); - func_i6_8018CA50(boss->vwork[9].x, boss->vwork[9].y, boss->vwork[9].z, 30.0f, 0.0f, 0.0f, 30.0f); + Andross_8018CA50(boss->vwork[6].x, boss->vwork[6].y, boss->vwork[6].z, 0.0f, -30.0f, 0.0f, 30.0f); + Andross_8018CA50(boss->vwork[7].x, boss->vwork[7].y, boss->vwork[7].z, 0.0f, -30.0f, 0.0f, 30.0f); + Andross_8018CA50(boss->vwork[8].x, boss->vwork[8].y, boss->vwork[8].z, -30.0f, 0.0f, 0.0f, 30.0f); + Andross_8018CA50(boss->vwork[9].x, boss->vwork[9].y, boss->vwork[9].z, 30.0f, 0.0f, 0.0f, 30.0f); } } Math_SmoothStepToF(&boss->fwork[20], 0.0f, 1.0f, 0.1f, 0.01f); Math_SmoothStepToF(&boss->fwork[21], 0.0f, 1.0f, 0.05f, 0.001f); - func_i6_8018D2B0(boss); + Andross_8018D2B0(boss); boss->swork[7] = 0; boss->fwork[14] = boss->fwork[15] = 0.0f; if (boss->state >= 2) { @@ -1921,7 +1910,7 @@ void func_i6_8018DBF0(Boss* boss) { Math_SmoothStepToF(&D_i6_801A7F7C, gAmbientG, 1.0f, 2.0f, 0.0f); Math_SmoothStepToF(&D_i6_801A8430, gAmbientB, 1.0f, 2.0f, 0.0f); } - Math_SmoothStepToF(&D_800C9C30, 32.0f, 1.0f, 0.5f, 0.0f); + Math_SmoothStepToF(&D_bg_800C9C30, 32.0f, 1.0f, 0.5f, 0.0f); Math_SmoothStepToF(&player->unk_034, 0.0f, 0.2f, 3.0f, 0); boss->fwork[8] = 0.1f; Math_SmoothStepToF(&boss->fwork[7], 200.0f, 1.0f, 10.0f, 0); @@ -1966,14 +1955,14 @@ void func_i6_8018DBF0(Boss* boss) { Math_SmoothStepToF(&boss->fwork[9], 0.7f, 1.0f, 0.005f, 0); boss->unk_04C++; if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C033780)) { - func_i6_8018D9C0(boss); + Andross_8018D9C0(boss); } limbCount = Animation_GetFrameData(&D_ANDROSS_C033780, boss->unk_04C, spD0); Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f); break; case 3: if (boss->swork[4] < 0) { - func_i6_8018D9C0(boss); + Andross_8018D9C0(boss); } else { boss->fwork[0] = player->pos.x; boss->fwork[3] = player->pos.y + 1000.0f; @@ -2013,7 +2002,7 @@ void func_i6_8018DBF0(Boss* boss) { Math_SmoothStepToF(&boss->fwork[9], 1.0f, 1.0f, 0.01f, 0); boss->unk_04C++; if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C029F74)) { - func_i6_8018D9C0(boss); + Andross_8018D9C0(boss); } limbCount = Animation_GetFrameData(&D_ANDROSS_C029F74, boss->unk_04C, spD0); Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f); @@ -2021,7 +2010,7 @@ void func_i6_8018DBF0(Boss* boss) { break; case 4: if (boss->swork[4] < 0) { - func_i6_8018D9C0(boss); + Andross_8018D9C0(boss); } else { boss->fwork[0] = player->pos.x; boss->fwork[3] = player->pos.y; @@ -2051,7 +2040,7 @@ void func_i6_8018DBF0(Boss* boss) { Math_SmoothStepToF(&boss->fwork[9], 1.0f, 1.0f, 0.01f, 0); boss->unk_04C++; if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C02E494)) { - func_i6_8018D9C0(boss); + Andross_8018D9C0(boss); } limbCount = Animation_GetFrameData(&D_ANDROSS_C02E494, boss->unk_04C, spD0); Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f); @@ -2059,7 +2048,7 @@ void func_i6_8018DBF0(Boss* boss) { break; case 5: if (boss->swork[5] < 0) { - func_i6_8018D9C0(boss); + Andross_8018D9C0(boss); } else { boss->fwork[0] = player->pos.x; boss->fwork[3] = player->pos.y + 500.0f; @@ -2088,7 +2077,7 @@ void func_i6_8018DBF0(Boss* boss) { } Math_SmoothStepToF(&boss->fwork[9], 1.0f, 1.0f, 0.01f, 0); if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C030244)) { - func_i6_8018D9C0(boss); + Andross_8018D9C0(boss); } limbCount = Animation_GetFrameData(&D_ANDROSS_C030244, boss->unk_04C, spD0); Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f); @@ -2096,7 +2085,7 @@ void func_i6_8018DBF0(Boss* boss) { break; case 6: if ((boss->swork[4] < 0) || (boss->swork[5] < 0)) { - func_i6_8018D9C0(boss); + Andross_8018D9C0(boss); } else { if (boss->timer_050 == 1) { AUDIO_PLAY_SFX(0x1940306C, boss->sfxSource, 4); @@ -2132,7 +2121,7 @@ void func_i6_8018DBF0(Boss* boss) { } Math_SmoothStepToF(&boss->fwork[9], 1.0f, 1.0f, 0.01f, 0); if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C02EDA0)) { - func_i6_8018D9C0(boss); + Andross_8018D9C0(boss); } limbCount = Animation_GetFrameData(&D_ANDROSS_C02EDA0, boss->unk_04C, spD0); Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f); @@ -2140,13 +2129,13 @@ void func_i6_8018DBF0(Boss* boss) { break; case 7: if (boss->swork[5] < 0) { - func_i6_8018D9C0(boss); + Andross_8018D9C0(boss); } else { if (boss->unk_04C == 48) { AUDIO_PLAY_SFX(0x3103108B, boss->sfxSource, 4); } if (boss->unk_04C > 48) { - func_i6_8018D0D8(boss); + Andross_8018D0D8(boss); } if (boss->unk_04C > 45) { Math_SmoothStepToF(&boss->fwork[20], 1.0f, 1.0f, 0.2f, 0.01f); @@ -2178,7 +2167,7 @@ void func_i6_8018DBF0(Boss* boss) { if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C018BC4)) { boss->unk_04C = Animation_GetFrameCount(&D_ANDROSS_C018BC4) - 1; if (boss->timer_050 == 0) { - func_i6_8018D9C0(boss); + Andross_8018D9C0(boss); } } limbCount = Animation_GetFrameData(&D_ANDROSS_C018BC4, boss->unk_04C, spD0); @@ -2205,7 +2194,7 @@ void func_i6_8018DBF0(Boss* boss) { if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C025C00)) { boss->unk_04C = Animation_GetFrameCount(&D_ANDROSS_C025C00) - 1; if (boss->timer_050 == 0) { - func_i6_8018D9C0(boss); + Andross_8018D9C0(boss); } } limbCount = Animation_GetFrameData(&D_ANDROSS_C025C00, boss->unk_04C, spD0); @@ -2232,7 +2221,7 @@ void func_i6_8018DBF0(Boss* boss) { if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C006F08)) { boss->unk_04C = Animation_GetFrameCount(&D_ANDROSS_C006F08) - 1; if (boss->timer_050 == 0) { - func_i6_8018D9C0(boss); + Andross_8018D9C0(boss); } } limbCount = Animation_GetFrameData(&D_ANDROSS_C006F08, boss->unk_04C, spD0); @@ -2254,7 +2243,7 @@ void func_i6_8018DBF0(Boss* boss) { if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C002654)) { boss->unk_04C = 0; if (boss->timer_050 == 0) { - func_i6_8018D9C0(boss); + Andross_8018D9C0(boss); } } limbCount = Animation_GetFrameData(&D_ANDROSS_C002654, boss->unk_04C, spD0); @@ -2331,7 +2320,7 @@ void func_i6_8018DBF0(Boss* boss) { boss->unk_04C++; if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C023B54)) { boss->unk_04C = Animation_GetFrameCount(&D_ANDROSS_C023B54) - 1; - func_i6_8018D9C0(boss); + Andross_8018D9C0(boss); } } limbCount = Animation_GetFrameData(&D_ANDROSS_C023B54, boss->unk_04C, spD0); @@ -2349,19 +2338,19 @@ void func_i6_8018DBF0(Boss* boss) { if (player->wings.rightState == 2) { gRightWingHealth[0] = 0; player->wings.rightState = 1; - func_i6_8018C8D4(boss->obj.pos.x, boss->obj.pos.y - 200.0f, boss->obj.pos.z, + Andross_8018C8D4(boss->obj.pos.x, boss->obj.pos.y - 200.0f, boss->obj.pos.z, RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT_CENTERED(10.0f), 10.0f, 8); } if (player->wings.leftState == 2) { gLeftWingHealth[0] = 0; player->wings.leftState = 1; - func_i6_8018C8D4(boss->obj.pos.x, boss->obj.pos.y - 200.0f, boss->obj.pos.z, + Andross_8018C8D4(boss->obj.pos.x, boss->obj.pos.y - 200.0f, boss->obj.pos.z, RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT_CENTERED(10.0f), 10.0f, 9); } } if (boss->unk_04C >= 10 && boss->unk_04C < 20) { for (i = 0; i < 10; i++) { - func_i6_8018C8D4(boss->obj.pos.x + RAND_FLOAT_CENTERED(100.0f), + Andross_8018C8D4(boss->obj.pos.x + RAND_FLOAT_CENTERED(100.0f), (boss->obj.pos.y - 200.0f) + RAND_FLOAT_CENTERED(100.0f), boss->obj.pos.z, RAND_FLOAT_CENTERED(50.0f), RAND_FLOAT_CENTERED(50.0f), RAND_FLOAT(5.0f) + 5.0f, RAND_INT(7.9)); @@ -2374,13 +2363,13 @@ void func_i6_8018DBF0(Boss* boss) { if (1) {} if (1) {} if (1) {} - Math_SmoothStepToF(&D_801779A8[gMainController], 50.0f, 1.0f, 1.8f, 0.0f); + Math_SmoothStepToF(&D_ctx_801779A8[gMainController], 50.0f, 1.0f, 1.8f, 0.0f); boss->timer_056 = 50; if ((boss->timer_050 > 70) && (boss->timer_050 < 1000) && !(gGameFrameCount & 3)) { - func_i6_8018C734(gPlayer[0].camEye.x + RAND_FLOAT_CENTERED(3000.0f), - gPlayer[0].camEye.y + RAND_FLOAT_CENTERED(3000.0f), gPlayer[0].camEye.z - D_80177D20, - RAND_INT(7.9)); + Andross_8018C734(gPlayer[0].camEye.x + RAND_FLOAT_CENTERED(3000.0f), + gPlayer[0].camEye.y + RAND_FLOAT_CENTERED(3000.0f), + gPlayer[0].camEye.z - D_ctx_80177D20, RAND_INT(7.9)); } if (boss->timer_050 > 0) { playerShot = gPlayerShots; @@ -2500,7 +2489,7 @@ void func_i6_8018DBF0(Boss* boss) { break; case 2: if (boss->timer_050 == 0) { - func_i6_8018D9C0(boss); + Andross_8018D9C0(boss); } boss->unk_04C++; if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C00E598)) { @@ -2522,7 +2511,7 @@ void func_i6_8018DBF0(Boss* boss) { Math_SmoothStepToF(&boss->fwork[9], 1.0f, 1.0f, 0.05f, 0); boss->unk_04C++; if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C017050)) { - func_i6_8018D9C0(boss); + Andross_8018D9C0(boss); } limbCount = Animation_GetFrameData(&D_ANDROSS_C017050, boss->unk_04C, spD0); Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f); @@ -2545,13 +2534,14 @@ void func_i6_8018DBF0(Boss* boss) { limbCount = Animation_GetFrameData(&D_ANDROSS_C017050, boss->unk_04C, spD0); Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f); if (!(gGameFrameCount & 1)) { - func_8007C484(boss->obj.pos.x + RAND_FLOAT_CENTERED(1000.0f), - boss->obj.pos.y + RAND_FLOAT_CENTERED(1000.0f), boss->obj.pos.z, 0.0f, 0.0f, boss->vel.z, - RAND_FLOAT(0.2f) + 0.2f, 0); + func_effect_8007C484(boss->obj.pos.x + RAND_FLOAT_CENTERED(1000.0f), + boss->obj.pos.y + RAND_FLOAT_CENTERED(1000.0f), boss->obj.pos.z, 0.0f, 0.0f, + boss->vel.z, RAND_FLOAT(0.2f) + 0.2f, 0); } if (gCsFrameCount >= 0x33) { - func_8007D0E0(boss->obj.pos.x + RAND_FLOAT_CENTERED(1000.0f), - boss->obj.pos.y + RAND_FLOAT_CENTERED(1000.0f), boss->obj.pos.z, RAND_FLOAT(3.0f) + 3.0f); + func_effect_8007D0E0(boss->obj.pos.x + RAND_FLOAT_CENTERED(1000.0f), + boss->obj.pos.y + RAND_FLOAT_CENTERED(1000.0f), boss->obj.pos.z, + RAND_FLOAT(3.0f) + 3.0f); } gCsFrameCount++; @@ -2559,31 +2549,31 @@ void func_i6_8018DBF0(Boss* boss) { switch (gCsFrameCount) { case 60: boss->swork[17] = 1; - func_i6_8018DA94(boss, &boss->vwork[19]); + Andross_8018DA94(boss, &boss->vwork[19]); break; case 70: boss->swork[19] = 1; - func_i6_8018DA94(boss, &boss->vwork[21]); + Andross_8018DA94(boss, &boss->vwork[21]); break; case 80: boss->swork[11] = 1; - func_i6_8018DA94(boss, &boss->vwork[13]); + Andross_8018DA94(boss, &boss->vwork[13]); break; case 90: boss->swork[12] = 1; - func_i6_8018DA94(boss, &boss->vwork[14]); + Andross_8018DA94(boss, &boss->vwork[14]); break; case 100: boss->swork[22] = 1; - func_i6_8018DA94(boss, &boss->vwork[24]); + Andross_8018DA94(boss, &boss->vwork[24]); break; case 110: boss->swork[23] = 1; - func_i6_8018DA94(boss, &boss->vwork[25]); + Andross_8018DA94(boss, &boss->vwork[25]); break; case 120: boss->swork[18] = 1; - func_i6_8018DA94(boss, &boss->vwork[19]); + Andross_8018DA94(boss, &boss->vwork[19]); boss->state = 9; boss->health = 100; boss->timer_050 = 50; @@ -2611,8 +2601,9 @@ void func_i6_8018DBF0(Boss* boss) { limbCount = Animation_GetFrameData(&D_ANDROSS_C00208C, boss->unk_04C, spD0); Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f); - func_8007C484(boss->obj.pos.x + RAND_FLOAT_CENTERED(700.0f), boss->obj.pos.y + RAND_FLOAT_CENTERED(700.0f), - boss->obj.pos.z, 0.0f, 0.0f, gPlayer[0].vel.z, RAND_FLOAT(0.15f) + 0.15f, 0); + func_effect_8007C484(boss->obj.pos.x + RAND_FLOAT_CENTERED(700.0f), + boss->obj.pos.y + RAND_FLOAT_CENTERED(700.0f), boss->obj.pos.z, 0.0f, 0.0f, + gPlayer[0].vel.z, RAND_FLOAT(0.15f) + 0.15f, 0); break; case 10: boss->fwork[6] = 0.0f; @@ -2626,8 +2617,9 @@ void func_i6_8018DBF0(Boss* boss) { limbCount = Animation_GetFrameData(&D_ANDROSS_C00208C, boss->unk_04C, spD0); Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f); - func_8007C484(boss->obj.pos.x + RAND_FLOAT_CENTERED(700.0f), boss->obj.pos.y + RAND_FLOAT_CENTERED(700.0f), - boss->obj.pos.z, 0.0f, 0.0f, gPlayer[0].vel.z, RAND_FLOAT(0.15f) + 0.15f, 0); + func_effect_8007C484(boss->obj.pos.x + RAND_FLOAT_CENTERED(700.0f), + boss->obj.pos.y + RAND_FLOAT_CENTERED(700.0f), boss->obj.pos.z, 0.0f, 0.0f, + gPlayer[0].vel.z, RAND_FLOAT(0.15f) + 0.15f, 0); if (boss->timer_050 == 0) { boss->state = 9; boss->timer_050 = 130; @@ -2647,12 +2639,13 @@ void func_i6_8018DBF0(Boss* boss) { boss->fwork[0] = 0.0f; boss->fwork[3] = 0.0f; if (!(gGameFrameCount & 1)) { - func_8007C484(boss->obj.pos.x + RAND_FLOAT_CENTERED(1000.0f), - boss->obj.pos.y + RAND_FLOAT_CENTERED(1000.0f), boss->obj.pos.z, 0.0f, 0.0f, boss->vel.z, - RAND_FLOAT(0.2f) + 0.2f, 0); + func_effect_8007C484(boss->obj.pos.x + RAND_FLOAT_CENTERED(1000.0f), + boss->obj.pos.y + RAND_FLOAT_CENTERED(1000.0f), boss->obj.pos.z, 0.0f, 0.0f, + boss->vel.z, RAND_FLOAT(0.2f) + 0.2f, 0); } - func_8007D0E0(boss->obj.pos.x + RAND_FLOAT_CENTERED(1000.0f), - boss->obj.pos.y + RAND_FLOAT_CENTERED(1000.0f), boss->obj.pos.z, RAND_FLOAT(5.0f) + 5.0f); + func_effect_8007D0E0(boss->obj.pos.x + RAND_FLOAT_CENTERED(1000.0f), + boss->obj.pos.y + RAND_FLOAT_CENTERED(1000.0f), boss->obj.pos.z, + RAND_FLOAT(5.0f) + 5.0f); break; case 32: boss->fwork[6] = -3000.0f; @@ -2672,14 +2665,15 @@ void func_i6_8018DBF0(Boss* boss) { limbCount = Animation_GetFrameData(&D_ANDROSS_C017050, boss->unk_04C, spD0); Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f); if (!(gGameFrameCount & 1)) { - func_8007C484(boss->obj.pos.x + RAND_FLOAT_CENTERED(1000.0f), - boss->obj.pos.y + RAND_FLOAT_CENTERED(1000.0f), boss->obj.pos.z, 0.0f, 0.0f, boss->vel.z, - RAND_FLOAT(0.2f) + 0.2f, 0); + func_effect_8007C484(boss->obj.pos.x + RAND_FLOAT_CENTERED(1000.0f), + boss->obj.pos.y + RAND_FLOAT_CENTERED(1000.0f), boss->obj.pos.z, 0.0f, 0.0f, + boss->vel.z, RAND_FLOAT(0.2f) + 0.2f, 0); } if (gCsFrameCount > 50) { - func_8007D0E0(boss->obj.pos.x + RAND_FLOAT_CENTERED(1000.0f), - boss->obj.pos.y + RAND_FLOAT_CENTERED(1000.0f), boss->obj.pos.z, RAND_FLOAT(3.0f) + 3.0f); + func_effect_8007D0E0(boss->obj.pos.x + RAND_FLOAT_CENTERED(1000.0f), + boss->obj.pos.y + RAND_FLOAT_CENTERED(1000.0f), boss->obj.pos.z, + RAND_FLOAT(3.0f) + 3.0f); } gCsFrameCount++; @@ -2687,53 +2681,53 @@ void func_i6_8018DBF0(Boss* boss) { switch (gCsFrameCount) { case 60: boss->swork[17] = 2; - func_i6_8018DA94(boss, &boss->vwork[19]); + Andross_8018DA94(boss, &boss->vwork[19]); break; case 70: boss->swork[19] = 2; - func_i6_8018DA94(boss, &boss->vwork[21]); + Andross_8018DA94(boss, &boss->vwork[21]); break; case 80: boss->swork[14] = 2; - func_i6_8018DA94(boss, &boss->vwork[16]); + Andross_8018DA94(boss, &boss->vwork[16]); break; case 90: boss->swork[13] = 2; - func_i6_8018DA94(boss, &boss->vwork[15]); + Andross_8018DA94(boss, &boss->vwork[15]); break; case 100: - func_i6_8018DA94(boss, &boss->vwork[13]); + Andross_8018DA94(boss, &boss->vwork[13]); break; case 110: - func_i6_8018DA94(boss, &boss->vwork[14]); + Andross_8018DA94(boss, &boss->vwork[14]); break; case 120: boss->swork[20] = 2; - func_i6_8018DA94(boss, &boss->vwork[22]); + Andross_8018DA94(boss, &boss->vwork[22]); break; case 130: boss->swork[21] = 2; - func_i6_8018DA94(boss, &boss->vwork[23]); + Andross_8018DA94(boss, &boss->vwork[23]); break; case 140: boss->swork[22] = 2; - func_i6_8018DA94(boss, &boss->vwork[24]); + Andross_8018DA94(boss, &boss->vwork[24]); break; case 150: boss->swork[23] = 2; - func_i6_8018DA94(boss, &boss->vwork[25]); + Andross_8018DA94(boss, &boss->vwork[25]); break; case 160: boss->swork[16] = 1; - func_i6_8018DA94(boss, &boss->vwork[18]); + Andross_8018DA94(boss, &boss->vwork[18]); break; case 170: boss->swork[15] = 1; - func_i6_8018DA94(boss, &boss->vwork[17]); + Andross_8018DA94(boss, &boss->vwork[17]); break; case 173: - func_8007A6F0(&boss->obj.pos, 0x2940C00A); - func_8007B344(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 100.0f, 4); + func_effect_8007A6F0(&boss->obj.pos, 0x2940C00A); + func_effect_8007B344(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 100.0f, 4); break; case 180: boss1 = &gBosses[1]; @@ -2749,12 +2743,12 @@ void func_i6_8018DBF0(Boss* boss) { boss1->unk_3F8 = 5.0f; Object_SetInfo(&boss1->info, boss1->obj.id); Object_Kill(&boss->obj, boss->sfxSource); - D_80177AB0 = 3; - func_i6_80189098(boss); + D_ctx_80177AB0 = 3; + Andross_80189098(boss); Radio_PlayMessage(gMsg_ID_19330, RCID_ANDROSS_RED); break; } - Math_SmoothStepToF(&D_800C9C30, 0.0f, 1.0f, 0.3f, 0.0f); + Math_SmoothStepToF(&D_bg_800C9C30, 0.0f, 1.0f, 0.3f, 0.0f); break; } if (boss->swork[4] >= 0) { @@ -2813,7 +2807,7 @@ static f32 D_i6_801A67EC = 0.0f; static f32 D_i6_801A67F0 = 0.0f; static Vec3f D_i6_801A67F4 = { 0.0f, 0.0f, 0.0f }; -s32 func_i6_801917F0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +s32 Andross_801917F0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { Vec3f sp94; Vec3f sp88; f32 scale; @@ -3036,7 +3030,7 @@ s32 func_i6_801917F0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d Matrix_Scale(gCalcMatrix, scale, scale, scale, 1); if (*dList != NULL) { Matrix_MultVec3f(gCalcMatrix, &sp94, &sp88); - func_8005F670(&sp88); + func_edisplay_8005F670(&sp88); Matrix_Mult(gGfxMatrix, gCalcMatrix, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, *dList); @@ -3045,7 +3039,7 @@ s32 func_i6_801917F0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d return true; } -void func_i6_801924B4(s32 limbIndex, Vec3f* rot, void* data) { +void Andross_801924B4(s32 limbIndex, Vec3f* rot, void* data) { Vec3f sp94 = { 0.0f, 0.0f, 0.0f }; Vec3f sp88 = { 33.0f, 0.0f, 0.0f }; Vec3f sp7C = { 20.0f, 0.0f, 0.0f }; @@ -3127,7 +3121,7 @@ void func_i6_801924B4(s32 limbIndex, Vec3f* rot, void* data) { } } -void func_i6_801928C8(Boss* boss) { +void Andross_801928C8(Boss* boss) { if (boss->timer_058 == 0) { // FAKE @@ -3138,12 +3132,12 @@ void func_i6_801928C8(Boss* boss) { D_i6_801A7F74, D_i6_801A7F7C, D_i6_801A8430); } Matrix_Scale(gCalcMatrix, 10.0f, 10.0f, 10.0f, 1); - Animation_DrawSkeleton(2, D_ANDROSS_C01CC3C, D_i6_801A7F80, func_i6_801917F0, func_i6_801924B4, boss, + Animation_DrawSkeleton(2, D_ANDROSS_C01CC3C, D_i6_801A7F80, Andross_801917F0, Andross_801924B4, boss, gCalcMatrix); Matrix_Pop(&gGfxMatrix); Matrix_Push(&gGfxMatrix); if (boss->fwork[20] > 0.05f) { - Matrix_Translate(gGfxMatrix, boss->vwork[10].x, boss->vwork[10].y, boss->vwork[10].z + D_80177D20, 1); + Matrix_Translate(gGfxMatrix, boss->vwork[10].x, boss->vwork[10].y, boss->vwork[10].z + D_ctx_80177D20, 1); if (boss->fwork[21] > 0.05f) { Matrix_Push(&gGfxMatrix); RCP_SetupDL(&gMasterDisp, 0x43); @@ -3195,7 +3189,7 @@ void func_i6_801928C8(Boss* boss) { } } -void func_i6_80192E94(Actor* actor) { +void Andross_80192E94(Actor* actor) { Actor* otherActor; s32 i; @@ -3235,8 +3229,8 @@ void func_i6_80192E94(Actor* actor) { } /* fallthrough */ case 2: - actor->obj.rot.z = actor->unk_0F4.z + D_i6_801A7F68; - Matrix_RotateZ(gCalcMatrix, M_DTOR * D_i6_801A7F68, 0); + actor->obj.rot.z = actor->unk_0F4.z + D_Andross_801A7F68; + Matrix_RotateZ(gCalcMatrix, M_DTOR * D_Andross_801A7F68, 0); Matrix_MultVec3fNoTranslate(gCalcMatrix, actor->vwork, &actor->obj.pos); actor->obj.pos.y += 300.0f; break; @@ -3246,18 +3240,19 @@ void func_i6_80192E94(Actor* actor) { actor->unk_0D0 = 0; actor->health -= actor->damage; if (actor->health <= 0) { - func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 5.0f); + func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 5.0f); for (i = 0; i < 7; i++) { - func_80079618(RAND_FLOAT_CENTERED(10.0f) + actor->obj.pos.x, - RAND_FLOAT_CENTERED(10.0f) + actor->obj.pos.y, actor->obj.pos.z, RAND_FLOAT(0.5f) + 0.5f); + func_effect_80079618(RAND_FLOAT_CENTERED(10.0f) + actor->obj.pos.x, + RAND_FLOAT_CENTERED(10.0f) + actor->obj.pos.y, actor->obj.pos.z, + RAND_FLOAT(0.5f) + 0.5f); } - func_8007A6F0(&actor->obj.pos, 0x2903A008); + func_effect_8007A6F0(&actor->obj.pos, 0x2903A008); Object_Kill(&actor->obj, actor->sfxSource); } } } -void func_i6_80193244(Actor* actor) { +void Andross_80193244(Actor* actor) { gSPDisplayList(gMasterDisp++, D_VE2_6007E20); if (actor->timer_0BC != 0) { @@ -3280,7 +3275,7 @@ void func_i6_80193244(Actor* actor) { } } -void func_i6_80193380(Object_80* obj80) { +void Andross_80193380(Object_80* obj80) { switch (obj80->state) { case 0: @@ -3299,49 +3294,49 @@ void func_i6_80193380(Object_80* obj80) { } break; } - obj80->obj.rot.z = D_i6_801A7F68; + obj80->obj.rot.z = D_Andross_801A7F68; } -s32 func_i6_801934EC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +s32 Andross_801934EC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { if (limbIndex == 13) { *dList = NULL; } return false; } -void func_i6_8019350C(Object_80* obj80) { +void Andross_8019350C(Object_80* obj80) { Vec3f frameTable[20]; Animation_GetFrameData(&D_VE2_6014658, obj80->unk_44, frameTable); - Animation_DrawSkeleton(1, D_VE2_6014844, frameTable, func_i6_801934EC, NULL, NULL, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_VE2_6014844, frameTable, Andross_801934EC, NULL, NULL, &gIdentityMatrix); } -void func_i6_8019356C(Object_80* obj80) { - obj80->obj.rot.z = D_i6_801A7F68; +void Andross_8019356C(Object_80* obj80) { + obj80->obj.rot.z = D_Andross_801A7F68; obj80->obj.pos.z += obj80->unk_60; if (obj80->timer_4C == 1) { Object_Kill(&obj80->obj, obj80->sfxSource); } } -s32 func_i6_801935B4(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +s32 Andross_801935B4(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { if (limbIndex != 13) { *dList = NULL; } return false; } -void func_i6_801935D4(Object_80* obj80) { +void Andross_801935D4(Object_80* obj80) { Vec3f frameTable[20]; Animation_GetFrameData(&D_VE2_6014658, obj80->unk_44, frameTable); if (gLevelMode == LEVELMODE_ALL_RANGE) { gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); } - Animation_DrawSkeleton(1, D_VE2_6014844, frameTable, func_i6_801935B4, NULL, NULL, &gIdentityMatrix); + Animation_DrawSkeleton(1, D_VE2_6014844, frameTable, Andross_801935B4, NULL, NULL, &gIdentityMatrix); } -void func_i6_80193668(Object_80* obj80, f32 xPos, f32 yPos, f32 zPos, s32 arg4) { +void Andross_80193668(Object_80* obj80, f32 xPos, f32 yPos, f32 zPos, s32 arg4) { Object_80_Initialize(obj80); obj80->obj.status = OBJ_ACTIVE; obj80->obj.id = OBJ_80_131; @@ -3354,45 +3349,45 @@ void func_i6_80193668(Object_80* obj80, f32 xPos, f32 yPos, f32 zPos, s32 arg4) obj80->info.unk_10 = 100000.0f; } -void func_i6_80193710(void) { +void Andross_80193710(void) { Actor* actor; Object_58* obj58; Boss* boss; s32 i; - D_80178310 = SEGMENTED_TO_VIRTUAL(D_800CFDA0[gCurrentLevel]); + D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_enmy_800CFDA0[gCurrentLevel]); for (obj58 = gObjects58, i = 0; i < 1000; i++) { - if (D_80178310[i].id < 0) { + if (D_ctx_80178310[i].id < 0) { break; } - if (D_80178310[i].id <= OBJ_80_160) { + if (D_ctx_80178310[i].id <= OBJ_80_160) { Object_58_Initialize(obj58); obj58->obj.status = OBJ_ACTIVE; - obj58->obj.id = D_80178310[i].id; - obj58->sfxSource[0] = obj58->obj.pos.x = D_80178310[i].xPos; - obj58->sfxSource[1] = obj58->obj.pos.y = D_80178310[i].yPos; - obj58->sfxSource[2] = obj58->obj.pos.z = -D_80178310[i].zPos1; - obj58->unk_54 = obj58->obj.rot.y = D_80178310[i].rot.y; + obj58->obj.id = D_ctx_80178310[i].id; + obj58->sfxSource[0] = obj58->obj.pos.x = D_ctx_80178310[i].xPos; + obj58->sfxSource[1] = obj58->obj.pos.y = D_ctx_80178310[i].yPos; + obj58->sfxSource[2] = obj58->obj.pos.z = -D_ctx_80178310[i].zPos1; + obj58->unk_54 = obj58->obj.rot.y = D_ctx_80178310[i].rot.y; Object_SetInfo(&obj58->info, obj58->obj.id); obj58++; } } for (actor = &gActors[30], i = 0; i < 1000; i++) { - if (D_80178310[i].id < 0) { + if (D_ctx_80178310[i].id < 0) { break; } - if ((D_80178310[i].id >= OBJ_ACTOR_176) && (D_80178310[i].id <= OBJ_ACTOR_291)) { + if ((D_ctx_80178310[i].id >= OBJ_ACTOR_176) && (D_ctx_80178310[i].id <= OBJ_ACTOR_291)) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; - actor->obj.id = D_80178310[i].id; - actor->fwork[10] = actor->obj.pos.x = D_80178310[i].xPos; - actor->fwork[11] = actor->obj.pos.y = D_80178310[i].yPos; - actor->fwork[12] = actor->obj.pos.z = -D_80178310[i].zPos1; - actor->fwork[13] = actor->obj.rot.y = D_80178310[i].rot.y; + actor->obj.id = D_ctx_80178310[i].id; + actor->fwork[10] = actor->obj.pos.x = D_ctx_80178310[i].xPos; + actor->fwork[11] = actor->obj.pos.y = D_ctx_80178310[i].yPos; + actor->fwork[12] = actor->obj.pos.z = -D_ctx_80178310[i].zPos1; + actor->fwork[13] = actor->obj.rot.y = D_ctx_80178310[i].rot.y; Object_SetInfo(&actor->info, actor->obj.id); actor++; } @@ -3405,7 +3400,7 @@ void func_i6_80193710(void) { Object_SetInfo(&boss->info, boss->obj.id); } -void func_i6_801939A0(s32 actorIndex) { +void Andross_801939A0(s32 actorIndex) { Actor* actor = &gActors[actorIndex]; Actor_Initialize(actor); @@ -3438,7 +3433,7 @@ static Vec3f D_i6_801A6878[4] = { { 500.0f, 14930.0f, -300.0f }, }; -void func_i6_80193AE4(s32 actorIndex) { +void Andross_80193AE4(s32 actorIndex) { Actor* actor = &gActors[actorIndex]; Actor_Initialize(actor); @@ -3462,11 +3457,18 @@ void func_i6_80193AE4(s32 actorIndex) { } //! @bug This references a variable in another overlay, causing undefined behavior. -//! In US v1.1, that address contains the store instruction for player->vel.y = vel.y; in func_i6_80196BF8. Setting this +//! In US v1.1, that address contains the store instruction for player->vel.y = vel.y; in Venom2_80196BF8. Setting this //! to nop is harmless, as the overlay will be unloaded next frame. extern s32 D_ending_80196D00; -void func_i6_80193C4C(Player* player) { +f32 D_i6_801A7F40; +f32 D_i6_801A7F44; +f32 D_i6_801A7F48; +f32 D_i6_801A7F4C; +f32 D_i6_801A7F50; +f32 D_i6_801A7F54; + +void Andross_80193C4C(Player* player) { s32 i; s32 sp90; f32 sp8C; @@ -3477,13 +3479,13 @@ void func_i6_80193C4C(Player* player) { Vec3f sp68; s32 temp_v0_2; - Math_SmoothStepToF(D_80177A48, 1.0f, 1.0f, 0.01f, 0.0f); + Math_SmoothStepToF(D_ctx_80177A48, 1.0f, 1.0f, 0.01f, 0.0f); player->wings.unk_04 = player->wings.unk_08 = player->wings.unk_0C = player->wings.unk_10 = 0.0f; switch (player->unk_1D0) { case 0: gCsFrameCount = 0; player->wings.unk_2C = 1; - D_80177A48[0] = 0.0f; + D_ctx_80177A48[0] = 0.0f; if (player->unk_4D8 > 180.0f) { player->unk_4D8 -= 360.0f; } @@ -3510,37 +3512,37 @@ void func_i6_80193C4C(Player* player) { player->camEye.z += player->vel.z * 0.5f; switch (gCsFrameCount) { case 80: - func_8007A568(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 40.0f); - func_8007A6F0(&boss->obj.pos, 0x2940C00A); + func_effect_8007A568(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 40.0f); + func_effect_8007A6F0(&boss->obj.pos, 0x2940C00A); /* fallthrough */ case 85: case 90: - func_8007B344(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 250.0f, 6); + func_effect_8007B344(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 250.0f, 6); break; case 86: Object_Kill(&boss->obj, boss->sfxSource); - D_80177AB0 = 0; + D_ctx_80177AB0 = 0; break; case 111: player->unk_1D0 = 2; AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); player->unk_190 = player->unk_194 = 7.0f; - D_80177A48[0] = 0.0f; - D_80177A48[1] = 0.0f; - D_80177A48[2] = 0.5f; - D_80177A48[3] = 1000.0f; - D_80177A48[4] = D_80177A48[5] = D_80177A48[6] = D_80177A48[7] = 0.0f; - D_80177A48[8] = 1.5f; + D_ctx_80177A48[0] = 0.0f; + D_ctx_80177A48[1] = 0.0f; + D_ctx_80177A48[2] = 0.5f; + D_ctx_80177A48[3] = 1000.0f; + D_ctx_80177A48[4] = D_ctx_80177A48[5] = D_ctx_80177A48[6] = D_ctx_80177A48[7] = 0.0f; + D_ctx_80177A48[8] = 1.5f; gCsFrameCount = 0; break; } gCsCamAtX = gBosses[0].obj.pos.x; gCsCamAtY = gBosses[0].obj.pos.y; - gCsCamAtZ = gBosses[0].obj.pos.z + D_80177D20; + gCsCamAtZ = gBosses[0].obj.pos.z + D_ctx_80177D20; Math_SmoothStepToF(&player->unk_034, 0.0f, 0.1f, 3.0f, 0.0f); break; case 2: - player->unk_190 = D_80177A48[8]; + player->unk_190 = D_ctx_80177A48[8]; sp90 = 0; sp68.x = RAND_FLOAT_CENTERED(150.0f); sp68.y = RAND_FLOAT_CENTERED(150.0f); @@ -3553,56 +3555,56 @@ void func_i6_80193C4C(Player* player) { sp90 = 1; } if (gCsFrameCount < 30) { - Math_SmoothStepToF(&D_80177A48[2], 0.5f, 1.0f, 0.05f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[2], 0.5f, 1.0f, 0.05f, 0.0f); } else if (gCsFrameCount <= 150) { - Math_SmoothStepToF(&D_80177A48[1], 300.0f, 0.1f, D_80177A48[5], 0.0f); - Math_SmoothStepToF(&D_80177A48[2], 0.95f, 1.0f, 0.05f, 0.0f); - Math_SmoothStepToF(&D_80177A48[3], 300.0f, 0.1f, 5.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[1], 300.0f, 0.1f, D_ctx_80177A48[5], 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[2], 0.95f, 1.0f, 0.05f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[3], 300.0f, 0.1f, 5.0f, 0.0f); if (gCsFrameCount == 150) { - D_80177A48[5] = 0.0f; + D_ctx_80177A48[5] = 0.0f; } } else { - Math_SmoothStepToF(&D_80177A48[1], 0.0f, 0.1f, D_80177A48[5], 0.0f); - Math_SmoothStepToF(&D_80177A48[2], 0.85f, 1.0f, 0.01f, 0.0f); - Math_SmoothStepToF(&D_80177A48[3], 200.0f, 0.1f, 5.0f, 0.0f); - D_80177A48[4] += 4.5f; - D_80177AB0 = 2; + Math_SmoothStepToF(&D_ctx_80177A48[1], 0.0f, 0.1f, D_ctx_80177A48[5], 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[2], 0.85f, 1.0f, 0.01f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[3], 200.0f, 0.1f, 5.0f, 0.0f); + D_ctx_80177A48[4] += 4.5f; + D_ctx_80177AB0 = 2; Matrix_RotateZ(gCalcMatrix, 2.0f * RAND_FLOAT(M_PI), 0); sp74.x = RAND_FLOAT(50.0f) + 120.0f; sp74.y = 0.0f; sp74.z = 0.0f; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp74, &sp68); } - Math_SmoothStepToF(&D_80177A48[5], 3.0f, 1.0f, 0.05f, 0.0f); - player->camEye.z += player->vel.z * D_80177A48[2]; + Math_SmoothStepToF(&D_ctx_80177A48[5], 3.0f, 1.0f, 0.05f, 0.0f); + player->camEye.z += player->vel.z * D_ctx_80177A48[2]; if (gCsFrameCount > 230) { player->unk_08C -= 7.0f; } if (gCsFrameCount > 230) { - Math_SmoothStepToF(&D_80177A48[7], 3.0f, 1.0f, 0.1f, 0.0f); - player->unk_034 -= D_80177A48[7]; + Math_SmoothStepToF(&D_ctx_80177A48[7], 3.0f, 1.0f, 0.1f, 0.0f); + player->unk_034 -= D_ctx_80177A48[7]; } for (i = 0; i < sp90; i++) { - func_8007797C(player->pos.x + sp68.x, player->pos.y + sp68.y, - player->pos.z - (D_80177A48[3] + D_80177A48[4]), 0.0f, 0.0f, 50.0f, - RAND_FLOAT(2.5f) + 2.5f); + func_effect_8007797C(player->pos.x + sp68.x, player->pos.y + sp68.y, + player->pos.z - (D_ctx_80177A48[3] + D_ctx_80177A48[4]), 0.0f, 0.0f, 50.0f, + RAND_FLOAT(2.5f) + 2.5f); } - Math_SmoothStepToF(&player->camEye.x, D_80177A48[1] + player->pos.x, 0.1f, 15.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.x, D_ctx_80177A48[1] + player->pos.x, 0.1f, 15.0f, 0.0f); Math_SmoothStepToF(&player->camEye.y, player->pos.y + 30.0f, 0.1f, 15.0f, 0.0f); - Math_SmoothStepToF(&player->unk_0EC, -180.0f, 0.02f, D_80177A48[6], 0.0f); - Math_SmoothStepToF(&D_80177A48[6], 3.0f, 1.0f, 0.05f, 0.0f); + Math_SmoothStepToF(&player->unk_0EC, -180.0f, 0.02f, D_ctx_80177A48[6], 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[6], 3.0f, 1.0f, 0.05f, 0.0f); gCsCamAtX = player->pos.x; gCsCamAtY = player->pos.y; - gCsCamAtZ = player->unk_138 + D_80177D20; + gCsCamAtZ = player->unk_138 + D_ctx_80177D20; if (gCsFrameCount > 200) { player->unk_25C += 0.03f; if (player->unk_25C > 0.6f) { player->unk_25C = 0.6f; } Math_SmoothStepToF(&player->unk_034, 3.0f, 0.5f, 0.1f, 0.0f); - Math_SmoothStepToF(D_801779A8, 70.0f, 1.0f, 2.0f, 0.0f); + Math_SmoothStepToF(D_ctx_801779A8, 70.0f, 1.0f, 2.0f, 0.0f); } switch (gCsFrameCount) { @@ -3616,8 +3618,8 @@ void func_i6_80193C4C(Player* player) { break; case 25: for (i = 0; i < 12; i++) { - func_i6_80193668(&gObjects80[i], player->pos.x, player->pos.y, - (player->camEye.z - D_80177D20) + (2195.0f * i), i); + Andross_80193668(&gObjects80[i], player->pos.x, player->pos.y, + (player->camEye.z - D_ctx_80177D20) + (2195.0f * i), i); } break; case 150: @@ -3626,14 +3628,14 @@ void func_i6_80193C4C(Player* player) { case 340: Audio_KillSfxBySourceAndId(player->sfxSource, 0x11403071); Audio_SetBaseSfxReverb(0); - D_800D2F68 = 0; + D_play_800D2F68 = 0; gBlurAlpha = 0xFF; gCurrentLevel = LEVEL_VENOM_2; - D_8017827C = 1; + D_ctx_8017827C = 1; gLevelMode = LEVELMODE_ALL_RANGE; player->unk_1D0 = 3; - player->unk_144 = D_80177D20 = 0.0f; - D_80177AB0 = D_80177A98 = 1; + player->unk_144 = D_ctx_80177D20 = 0.0f; + D_ctx_80177AB0 = D_ctx_80177A98 = 1; player->camEye.x = 1200.0f; player->camEye.z = 1200.0f; player->camEye.y = 1800.0f; @@ -3642,50 +3644,50 @@ void func_i6_80193C4C(Player* player) { gCsCamAtZ = 0.0f; player->unk_034 = 0.0f; player->unk_234 = 0; - D_80177A48[0] = 1.0f; - func_800A6148(); + D_ctx_80177A48[0] = 1.0f; + func_play_800A6148(); gObjects58 = Memory_Allocate(200 * sizeof(Object_58)); for (i = 0; i < 200; i++) { gObjects58[i].obj.status = OBJ_FREE; } - func_i6_80193710(); - D_8017782C = 1; - func_800A594C(); - D_80178348 = D_80178350 = D_80178354 = 0; - D_80178340 = D_80178358 = 255; + Andross_80193710(); + D_ctx_8017782C = 1; + func_play_800A594C(); + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; + D_ctx_80178340 = D_ctx_80178358 = 255; player->timer_1F8 = 2; gCsFrameCount = 0; - D_80177A48[1] = 0.0f; + D_ctx_80177A48[1] = 0.0f; break; } break; case 3: if (player->timer_1F8 == 0) { - D_80178348 = D_80178350 = D_80178354 = 0; - D_80178340 = D_80178358 = 0; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; + D_ctx_80178340 = D_ctx_80178358 = 0; } else { - D_80178348 = D_80178350 = D_80178354 = 0; - D_80178340 = D_80178358 = 255; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; + D_ctx_80178340 = D_ctx_80178358 = 255; } - if ((gCsFrameCount == 20) && (D_800D2F68 != 0)) { - func_i6_801939A0(1); + if ((gCsFrameCount == 20) && (D_play_800D2F68 != 0)) { + Andross_801939A0(1); } if (gCsFrameCount == 40) { - func_i6_801939A0(10); + Andross_801939A0(10); AUDIO_PLAY_SFX(0x2940F026, boss->sfxSource, 4); - D_80178480 = 30; + D_ctx_80178480 = 30; gOverlayStage = 1; D_Timer_80177BD0[0] = 30; } if (gCsFrameCount > 40) { for (i = 0; i < 3; i++) { - func_8007797C(boss->obj.pos.x + RAND_FLOAT_CENTERED(150.0f), boss->obj.pos.y + 500.0f, - boss->obj.pos.z + RAND_FLOAT_CENTERED(150.0f), RAND_FLOAT_CENTERED(10.0f), 60.0f, - RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT(5.5f) + 5.5f); + func_effect_8007797C(boss->obj.pos.x + RAND_FLOAT_CENTERED(150.0f), boss->obj.pos.y + 500.0f, + boss->obj.pos.z + RAND_FLOAT_CENTERED(150.0f), RAND_FLOAT_CENTERED(10.0f), + 60.0f, RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT(5.5f) + 5.5f); } - Math_SmoothStepToF(&gCsCamAtY, gActors[10].obj.pos.y, 1.0f, D_80177A48[1], 0.0f); - Math_SmoothStepToF(&D_80177A48[1], 1000.0f, 1.0f, 5.0f, 0.0f); + Math_SmoothStepToF(&gCsCamAtY, gActors[10].obj.pos.y, 1.0f, D_ctx_80177A48[1], 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[1], 1000.0f, 1.0f, 5.0f, 0.0f); } else { Math_SmoothStepToF(&player->camEye.z, 1640.0f, 0.05f, 50.0f, 0.0f); Math_SmoothStepToF(&player->camEye.y, 110.0f, 0.05f, 50.0f, 0.0f); @@ -3698,13 +3700,13 @@ void func_i6_80193C4C(Player* player) { } if (gCsFrameCount == 150) { player->unk_1D0++; - D_80177A48[0] = 1.0f; - D_80177A48[1] = 1000.0f; - D_80177A48[2] = 0; - D_80177A48[3] = 1.0f; + D_ctx_80177A48[0] = 1.0f; + D_ctx_80177A48[1] = 1000.0f; + D_ctx_80177A48[2] = 0; + D_ctx_80177A48[3] = 1.0f; gActors[10].obj.pos.y = 1500.0f; gActors[10].unk_0F4.z = 180.0f; - D_80177AB0 = 0; + D_ctx_80177AB0 = 0; gFogFar = 1030; D_i6_801A7F40 = gLight1R; D_i6_801A7F44 = gLight1G; @@ -3712,17 +3714,17 @@ void func_i6_80193C4C(Player* player) { D_i6_801A7F4C = gAmbientR; D_i6_801A7F50 = gAmbientG; D_i6_801A7F54 = gAmbientB; - D_801784D4 = -50.0f; - D_80177930 = 1; + D_ctx_801784D4 = -50.0f; + D_ctx_80177930 = 1; for (i = 0; i < 200; i++) { gObjects58[i].obj.status = OBJ_FREE; } } break; case 4: - player->unk_034 += D_80177A48[3]; + player->unk_034 += D_ctx_80177A48[3]; if (gCsFrameCount > 190) { - Math_SmoothStepToF(&D_80177A48[3], 0.3f, 0.05f, 0.02f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[3], 0.3f, 0.05f, 0.02f, 0.0f); } if (gCsFrameCount > 205) { Math_SmoothStepToF(&D_i6_801A7F40, 130.0f, 1.0f, 10.0f, 0.0f); @@ -3738,51 +3740,51 @@ void func_i6_80193C4C(Player* player) { gAmbientR = D_i6_801A7F4C; gAmbientG = D_i6_801A7F50; gAmbientB = D_i6_801A7F54; - Math_SmoothStepToF(&D_80177A48[1], -5000.0f, 0.05f, 15.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[1], -5000.0f, 0.05f, 15.0f, 0.0f); player->camEye.x = gActors[10].obj.pos.x + 50.0f; - player->camEye.y = gActors[10].obj.pos.y + D_80177A48[1]; + player->camEye.y = gActors[10].obj.pos.y + D_ctx_80177A48[1]; player->camEye.z = gActors[10].obj.pos.z; gCsCamAtX = gActors[10].obj.pos.x; gCsCamAtY = gActors[10].obj.pos.y + 50.0f; gCsCamAtZ = gActors[10].obj.pos.z; if (!(gGameFrameCount & 3) && (gCsFrameCount < 215)) { - func_8007797C(boss->obj.pos.x + RAND_FLOAT_CENTERED(350.0f), boss->obj.pos.y + 500.0f, - boss->obj.pos.z + RAND_FLOAT_CENTERED(350.0f), RAND_FLOAT_CENTERED(10.0f), 60.0f, - RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT(5.5f) + 15.5f); + func_effect_8007797C(boss->obj.pos.x + RAND_FLOAT_CENTERED(350.0f), boss->obj.pos.y + 500.0f, + boss->obj.pos.z + RAND_FLOAT_CENTERED(350.0f), RAND_FLOAT_CENTERED(10.0f), 60.0f, + RAND_FLOAT_CENTERED(10.0f), RAND_FLOAT(5.5f) + 15.5f); } sp80 = RAND_FLOAT(40.0f); for (i = 0; i < 36; i += 4) { - sp8C = __sinf((i * 10.0f * M_DTOR) + sp80) * D_80177A48[2]; - sp84 = __cosf((i * 10.0f * M_DTOR) + sp80) * D_80177A48[2]; - func_8007797C(sp8C, 300.0f, sp84, 0.0f, 0.0f, 0.0f, RAND_FLOAT(5.5f) + 15.5f); + sp8C = __sinf((i * 10.0f * M_DTOR) + sp80) * D_ctx_80177A48[2]; + sp84 = __cosf((i * 10.0f * M_DTOR) + sp80) * D_ctx_80177A48[2]; + func_effect_8007797C(sp8C, 300.0f, sp84, 0.0f, 0.0f, 0.0f, RAND_FLOAT(5.5f) + 15.5f); } - Math_SmoothStepToF(&D_80177A48[2], 10000.0f, 0.05f, 20.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[2], 10000.0f, 0.05f, 20.0f, 0.0f); if (gCsFrameCount == 220) { - func_i6_80193AE4(0); + Andross_80193AE4(0); if (gTeamShields[1] > 0) { - func_i6_80193AE4(1); + Andross_80193AE4(1); } if (gTeamShields[2] > 0) { - func_i6_80193AE4(2); + Andross_80193AE4(2); } if (gTeamShields[3] > 0) { - func_i6_80193AE4(3); + Andross_80193AE4(3); } } if (gCsFrameCount == 190) { - func_800A5D6C(); - D_80178410 = 1000; + func_play_800A5D6C(); + D_ctx_80178410 = 1000; player->unk_204 = 0; } if (gCsFrameCount == 360) { gCsFrameCount = 340; player->unk_1D0++; - D_80177A48[0] = 1.0f; - D_80177A48[1] = 0.0f; - D_80177A48[2] = 0.0f; - D_80177A48[3] = 0.0f; - D_80177A48[4] = 0.0f; + D_ctx_80177A48[0] = 1.0f; + D_ctx_80177A48[1] = 0.0f; + D_ctx_80177A48[2] = 0.0f; + D_ctx_80177A48[3] = 0.0f; + D_ctx_80177A48[4] = 0.0f; player->camEye.x = gCsCamEyeX = 100.0f; player->camEye.y = gCsCamEyeY = 14800.0f; player->camEye.z = gCsCamEyeZ = -1500.0f; @@ -3795,24 +3797,24 @@ void func_i6_80193C4C(Player* player) { gActors[10].obj.pos.y = 14500.0f; gActors[10].unk_0F4.z = 70.0f; gActors[10].unk_0F4.x = gActors[10].unk_0F4.y = 0.0f; - D_80178340 = D_80178358 = 255; - D_80178348 = D_80178350 = D_80178354 = 0; + D_ctx_80178340 = D_ctx_80178358 = 255; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; player->timer_1F8 = 3; - D_80178410 = 500; + D_ctx_80178410 = 500; } if (gCsFrameCount == 250) { - D_80177840 = 100; + D_ctx_80177840 = 100; } break; case 5: if (player->timer_1F8 == 1) { - D_80178340 = D_80178358 = 0; + D_ctx_80178340 = D_ctx_80178358 = 0; } - if (D_800D2F68 != 0) { + if (D_play_800D2F68 != 0) { if (gCsFrameCount >= 1000) { - gCsCamAtX += D_80177A48[4] * 0.15f; - gCsCamEyeZ += D_80177A48[4]; - Math_SmoothStepToF(&D_80177A48[4], 20.0f, 1.0f, 0.1f, 0.0f); + gCsCamAtX += D_ctx_80177A48[4] * 0.15f; + gCsCamEyeZ += D_ctx_80177A48[4]; + Math_SmoothStepToF(&D_ctx_80177A48[4], 20.0f, 1.0f, 0.1f, 0.0f); } else { gCsCamEyeZ = gActors[10].obj.pos.z - 20.0f; } @@ -3825,30 +3827,30 @@ void func_i6_80193C4C(Player* player) { if (gCsFrameCount < 850) { switch (gCsFrameCount) { case 600: - D_80177A48[2] = 80.0f; - D_80177A48[3] = -45.0f; + D_ctx_80177A48[2] = 80.0f; + D_ctx_80177A48[3] = -45.0f; break; case 650: - D_80177A48[2] = 0.0f; + D_ctx_80177A48[2] = 0.0f; break; case 680: - D_80177A48[2] = 45.0f; - D_80177A48[3] = -20.0f; + D_ctx_80177A48[2] = 45.0f; + D_ctx_80177A48[3] = -20.0f; break; case 750: - D_80177A48[2] = 90.0f; - D_80177A48[3] = -30.0f; + D_ctx_80177A48[2] = 90.0f; + D_ctx_80177A48[3] = -30.0f; break; case 780: - D_80177A48[2] = 30.0f; - D_80177A48[3] = -45.0f; + D_ctx_80177A48[2] = 30.0f; + D_ctx_80177A48[3] = -45.0f; break; case 830: - D_80177A48[2] = -20.0f; - D_80177A48[3] = -25.0f; + D_ctx_80177A48[2] = -20.0f; + D_ctx_80177A48[3] = -25.0f; break; default: - // D_80177A48[2] = 0.0f; + // D_ctx_80177A48[2] = 0.0f; break; } } @@ -3856,26 +3858,28 @@ void func_i6_80193C4C(Player* player) { Math_SmoothStepToF(&gActors[10].fwork[19], 0.0f, 0.2f, 2.0f, 0.0f); Math_SmoothStepToF(&gActors[10].fwork[20], 0.0f, 0.2f, 2.0f, 0.0f); } else { - Math_SmoothStepToF(&gActors[10].fwork[19], D_80177A48[2], 0.2f, 2.0f, 0.0f); - Math_SmoothStepToF(&gActors[10].fwork[20], D_80177A48[3], 0.2f, 2.0f, 0.0f); + Math_SmoothStepToF(&gActors[10].fwork[19], D_ctx_80177A48[2], 0.2f, 2.0f, 0.0f); + Math_SmoothStepToF(&gActors[10].fwork[20], D_ctx_80177A48[3], 0.2f, 2.0f, 0.0f); } } - D_80177A48[0] = 0.01f; - Math_SmoothStepToF(&D_80177A48[1], 10.0f, 1.0f, 0.1f, 0.0f); - Math_SmoothStepToF(&player->camEye.x, gActors[10].obj.pos.x - 50.0f, D_80177A48[0], D_80177A48[1], 0); - Math_SmoothStepToF(&player->camEye.y, gActors[10].obj.pos.y + 10.0f, D_80177A48[0], D_80177A48[1], 0); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], D_80177A48[1], 0); + D_ctx_80177A48[0] = 0.01f; + Math_SmoothStepToF(&D_ctx_80177A48[1], 10.0f, 1.0f, 0.1f, 0.0f); + Math_SmoothStepToF(&player->camEye.x, gActors[10].obj.pos.x - 50.0f, D_ctx_80177A48[0], + D_ctx_80177A48[1], 0); + Math_SmoothStepToF(&player->camEye.y, gActors[10].obj.pos.y + 10.0f, D_ctx_80177A48[0], + D_ctx_80177A48[1], 0); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], D_ctx_80177A48[1], 0); gCsCamAtY = SIN_DEG(gGameFrameCount * 5.5f) + 15000.0f; } else { gCsCamEyeX -= 1.0f; gCsCamEyeY += 0.3f; gCsCamEyeZ += 4.0f; gCsCamAtY = (SIN_DEG(gGameFrameCount * 1.5f) * 10.0f) + 15000.0f; - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], 50000.0f, 0); } - if (D_800D2F68 != 0) { + if (D_play_800D2F68 != 0) { switch (gCsFrameCount) { case 400: Radio_PlayMessage(gMsg_ID_19400, RCID_PEPPY); @@ -3895,17 +3899,17 @@ void func_i6_80193C4C(Player* player) { } break; case 1050: - D_80177830 = 1; + D_ctx_80177830 = 1; break; case 1250: - D_80177830 = 0; + D_ctx_80177830 = 0; break; } if (gCsFrameCount > 1300) { - D_80178288[109] += 1.0f; - D_80178290[109] += 0.5f; + D_ctx_80178288[109] += 1.0f; + D_ctx_80178290[109] += 0.5f; temp_v0_2 = RAND_INT(100.0f); - D_80178298[109] = FILL_COLOR(D_800C9C3C[temp_v0_2 & 0xF]); + D_ctx_80178298[109] = FILL_COLOR(D_bg_800C9C3C[temp_v0_2 & 0xF]); } } else { switch (gCsFrameCount) { @@ -3920,10 +3924,10 @@ void func_i6_80193C4C(Player* player) { gCsFrameCount += 230; break; case 1050: - D_80177830 = 1; + D_ctx_80177830 = 1; break; case 1250: - D_80177830 = 0; + D_ctx_80177830 = 0; break; } } @@ -3931,21 +3935,21 @@ void func_i6_80193C4C(Player* player) { Audio_FadeOutAll(40); } if (gCsFrameCount > 1400) { - D_8017835C = 4; - D_80178348 = D_80178350 = D_80178354 = 0; - D_80178358 = 255; - if (D_80178340 == 0xFF) { + D_ctx_8017835C = 4; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; + D_ctx_80178358 = 255; + if (D_ctx_80178340 == 0xFF) { gNextGameState = GSTATE_CREDITS; D_ending_80196D00 = 0; - D_800D3180[LEVEL_VENOM_ANDROSS] = Play_CheckMedalStatus(200) + 1; + D_play_800D3180[LEVEL_VENOM_ANDROSS] = Play_CheckMedalStatus(200) + 1; Audio_SetAudioSpec(0, 0x1B); } } break; case 100: - D_80178380[0] -= 4; - if (D_80178380[0] >= 0x100) { - D_80178380[0] = 0; + D_ctx_80178380[0] -= 4; + if (D_ctx_80178380[0] >= 0x100) { + D_ctx_80178380[0] = 0; } Matrix_RotateY(gCalcMatrix, (player->unk_114 + player->unk_0E8 + 180.0f) * M_DTOR, 0); Matrix_RotateX(gCalcMatrix, -((player->unk_120 + player->unk_0E4 + player->unk_4D8) * M_DTOR), 1); @@ -3961,24 +3965,24 @@ void func_i6_80193C4C(Player* player) { player->unk_014 = 0.2f; player->unk_018 = 0.0f; player->unk_01C = 0.05f; - D_80177AB0 = 6; - D_80161A44 = 12800.0f; + D_ctx_80177AB0 = 6; + D_game_80161A44 = 12800.0f; } - D_80177A48[0] = 1.0f; + D_ctx_80177A48[0] = 1.0f; gCsCamAtX = (2.0f * SIN_DEG(gGameFrameCount * 40.0f)) + player->pos.x; gCsCamAtY = (2.0f * SIN_DEG(gGameFrameCount * 30.0f)) + player->pos.y; gCsCamAtZ = (2.0f * SIN_DEG(gGameFrameCount * 50.0f)) + player->pos.z; sp74.x = 0.0f; sp74.y = 0.0f; - sp74.z = D_80177A48[5]; - Math_SmoothStepToF(&D_80177A48[5], -400.0f, 0.05f, 5.0f, 0.0f); + sp74.z = D_ctx_80177A48[5]; + Math_SmoothStepToF(&D_ctx_80177A48[5], -400.0f, 0.05f, 5.0f, 0.0f); Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp74, &sp68); gCsCamEyeX = player->pos.x + sp68.x; gCsCamEyeY = player->pos.y + sp68.y; gCsCamEyeZ = player->pos.z + sp68.z; - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], 50000.0f, 0); Math_SmoothStepToF(&player->unk_12C, 0.0f, 0.1f, 0.7f, 0.0f); Math_SmoothStepToF(&player->unk_034, 0.0f, 0.1f, 0.4f, 0.0f); break; @@ -3990,12 +3994,12 @@ void func_i6_80193C4C(Player* player) { player->unk_0F8 = player->unk_0EC + player->unk_12C + player->unk_130; Math_SmoothStepToF(&player->unk_130, 0.0f, 0.1f, 15.0f, 0.0f); Math_SmoothStepToAngle(&player->unk_4D8, 0.0f, 0.1f, 20.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 50000.0f, 0); - Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_ctx_80177A48[0], 50000.0f, 0); + Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_ctx_80177A48[0], 50000.0f, 0); } -void func_i6_80195E44(Actor* actor) { +void Andross_80195E44(Actor* actor) { Vec3f sp44; Vec3f sp38; f32 sp34; @@ -4056,7 +4060,7 @@ void func_i6_80195E44(Actor* actor) { actor->obj.rot.z = -actor->unk_0F4.z; } -void func_i6_801961AC(void) { +void Andross_801961AC(void) { Boss* boss = &gBosses[0]; Boss_Initialize(boss); diff --git a/src/overlays/ovl_i6/fox_i6.c b/src/overlays/ovl_i6/fox_i6.c index 92803661..d977691d 100644 --- a/src/overlays/ovl_i6/fox_i6.c +++ b/src/overlays/ovl_i6/fox_i6.c @@ -3,6 +3,6 @@ UNK_TYPE D_i6_801A7F30; s32 D_i6_801A6750 = 0; -void func_i6_80187520(u32 mode, void* ptr) { +void OvlI6_CallFunction(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 index 9ef57249..716f59d7 100644 --- a/src/overlays/ovl_i6/fox_sy.c +++ b/src/overlays/ovl_i6/fox_sy.c @@ -1,27 +1,27 @@ #include "global.h" #include "assets/ast_sector_y.h" -void func_i6_80198244(Boss*); -void func_i6_80198ABC(Boss*); -void func_i6_80199D64(Boss*); -void func_i6_8019AA08(Boss*); -void func_i6_8019AEC0(Boss*); -void func_i6_8019A434(Boss*); -void func_i6_8019A640(Boss*); -void func_i6_8019A82C(Boss*); -s32 func_i6_8019B528(Boss*); -s32 func_i6_8019B5CC(Boss*); -void func_i6_8019B6E8(Boss*); -void func_i6_8019BBBC(Boss*); -void func_i6_8019BC14(Boss*); -void func_i6_8019C194(Boss*, f32, f32); -void func_i6_801A0510(Actor*, s32); -void func_i6_801A39FC(Actor*, f32, f32, f32, f32, f32, f32, s32); -void func_i6_801A3B50(f32, f32, f32, f32, f32, f32, s32); +void SectorY_80198244(Boss*); +void SectorY_80198ABC(Boss*); +void SectorY_80199D64(Boss*); +void SectorY_8019AA08(Boss*); +void SectorY_8019AEC0(Boss*); +void SectorY_8019A434(Boss*); +void SectorY_8019A640(Boss*); +void SectorY_8019A82C(Boss*); +bool SectorY_8019B528(Boss*); +bool SectorY_8019B5CC(Boss*); +void SectorY_8019B6E8(Boss*); +void SectorY_8019BBBC(Boss*); +void SectorY_8019BC14(Boss*); +void SectorY_8019C194(Boss*, f32, f32); +void SectorY_801A0510(Actor*, s32); +void SectorY_801A39FC(Actor*, f32, f32, f32, f32, f32, f32, s32); +void SectorY_801A3B50(f32, f32, f32, f32, f32, f32, s32); f32 D_i6_801A8440[3]; -void func_i6_80197B30(Actor* actor, s32 timer) { +void SectorY_80197B30(Actor* actor, s32 timer) { Actor_Initialize(actor); actor->obj.status = OBJ_ACTIVE; actor->obj.id = OBJ_ACTOR_195; @@ -42,21 +42,21 @@ void func_i6_80197B30(Actor* actor, s32 timer) { AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4); } -void func_i6_80197C64(Effect* effect) { +void SectorY_80197C64(Effect* effect) { RCP_SetupDL_21(); gSPDisplayList(gMasterDisp++, D_SY_6014A40); RCP_SetupDL(&gMasterDisp, 0x40); } -void func_i6_80197CB8(Object_80* obj80) { +void SectorY_80197CB8(Object_80* obj80) { } -void func_i6_80197CC4(Boss* boss) { +void SectorY_80197CC4(Boss* boss) { boss->fwork[9] = 0.0f; boss->swork[33] = 5500; boss->timer_050 = 10; boss->timer_058 = 0; - D_80177A10[8] = 0; + D_ctx_80177A10[8] = 0; if (boss->index == 0) { boss->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SY_60342A0); @@ -72,7 +72,7 @@ void func_i6_80197CC4(Boss* boss) { } boss->unk_078.y = 0.0f; - func_i6_8019AEC0(boss); + SectorY_8019AEC0(boss); } else { boss->fwork[34] = 2.8f; boss->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SY_6034304); @@ -89,7 +89,7 @@ void func_i6_80197CC4(Boss* boss) { boss->vel.x = SIN_DEG(boss->unk_078.y) * boss->fwork[45] * 0.2f; boss->vel.z = COS_DEG(boss->unk_078.y) * boss->fwork[45] * 0.2f; - func_i6_80198244(boss); + SectorY_80198244(boss); boss->timer_056 = 250; } @@ -104,7 +104,7 @@ void func_i6_80197CC4(Boss* boss) { } } -void func_i6_80197F18(Boss* boss) { +void SectorY_80197F18(Boss* boss) { boss->swork[20] = 0; boss->swork[21] = 3; boss->fwork[9] = 0.0f; @@ -114,7 +114,7 @@ void func_i6_80197F18(Boss* boss) { } } -void func_i6_80197F84(Boss* boss) { +void SectorY_80197F84(Boss* boss) { f32 yaw; Math_SmoothStepToF(&boss->obj.pos.y, 0.0f, 0.5f, 15.0f, 0.1f); @@ -123,15 +123,15 @@ void func_i6_80197F84(Boss* boss) { Math_SmoothStepToF(&boss->vel.x, 0.0f, 0.1f, 0.2f, 0.1f); Math_SmoothStepToAngle(&boss->unk_078.x, 0.0f, 0.1f, 4.0f, 0.1f); - if (func_i6_8019B5CC(boss) != 0) { + if (SectorY_8019B5CC(boss)) { Math_SmoothStepToF(&boss->obj.pos.y, 1000.0f, 0.1f, 30.0f, 0.1f); } else { Math_SmoothStepToF(&boss->obj.pos.y, 0.0f, 0.1f, 10.0f, 0.1f); } - func_i6_8019B6E8(boss); + SectorY_8019B6E8(boss); if (boss->timer_052 == 0) { - func_i6_8019BC14(boss); + SectorY_8019BC14(boss); } yaw = Math_RadToDeg(Math_Atan2F(boss->fwork[18] - boss->obj.pos.x, boss->fwork[20] - boss->obj.pos.z)); @@ -139,7 +139,7 @@ void func_i6_80197F84(Boss* boss) { Math_SmoothStepToAngle(&boss->unk_078.y, yaw, 0.1f, 8.0f, 0.1f); if (boss->timer_050 == 0) { - func_i6_80198244(boss); + SectorY_80198244(boss); } if (boss->swork[22] == 1) { @@ -147,23 +147,23 @@ void func_i6_80197F84(Boss* boss) { (fabsf(boss->fwork[18] - boss->obj.pos.x) <= 400.0f) && (fabsf(boss->fwork[20] - boss->obj.pos.z) <= 1400.0f)) { if ((Rand_ZeroOne() < 0.2f) && (boss->unk_078.x == 0.0f)) { - func_i6_8019AA08(boss); + SectorY_8019AA08(boss); } if (Rand_ZeroOne() < 0.2f) { - func_i6_80198244(boss); + SectorY_80198244(boss); } } } - if (func_i6_8019B528(boss) != 0) { - func_i6_80198ABC(boss); + if (SectorY_8019B528(boss)) { + SectorY_80198ABC(boss); } } -void func_i6_80198238(Boss* boss) { +void SectorY_80198238(Boss* boss) { } -void func_i6_80198244(Boss* boss) { +void SectorY_80198244(Boss* boss) { f32 speed; boss->swork[20] = 3; @@ -186,15 +186,15 @@ void func_i6_80198244(Boss* boss) { AUDIO_PLAY_SFX(0x2902306C, boss->sfxSource, 4); } -void func_i6_801983E4(Boss* boss) { +void SectorY_801983E4(Boss* boss) { f32 yAngle; f32 xSpeed; f32 zSpeed; - func_i6_8019B6E8(boss); + SectorY_8019B6E8(boss); if (boss->timer_052 == 0) { - func_i6_8019BC14(boss); + SectorY_8019BC14(boss); } Math_SmoothStepToAngle(&boss->unk_078.z, 0.0f, 0.1f, 2.0f, 0.1f); @@ -227,7 +227,7 @@ void func_i6_801983E4(Boss* boss) { } } - func_i6_8019C194(boss, zSpeed, xSpeed); + SectorY_8019C194(boss, zSpeed, xSpeed); if (boss->swork[22] == 1) { yAngle = gPlayer[0].unk_114 - 180.0f; @@ -243,7 +243,7 @@ void func_i6_801983E4(Boss* boss) { if ((zSpeed <= 1300.0f) && (xSpeed <= 800.0f) && (yAngle < 260.0f) && (yAngle > 100.0f) && (boss->unk_078.x == 0.0f) && (boss->fwork[34] <= 2.0f)) { if (Rand_ZeroOne() < 0.2f) { - func_i6_8019AA08(boss); + SectorY_8019AA08(boss); } } @@ -251,9 +251,9 @@ void func_i6_801983E4(Boss* boss) { if (((yAngle >= 60.0f) && (yAngle <= 100.0f)) || ((yAngle <= 300.0f) && (yAngle >= 260.0f))) { if (Rand_ZeroOne() < 0.3f) { if (Rand_ZeroOne() < 0.4f) { - func_i6_80197F18(boss); + SectorY_80197F18(boss); } else { - func_i6_80199D64(boss); + SectorY_80199D64(boss); } } } @@ -261,9 +261,9 @@ void func_i6_801983E4(Boss* boss) { if (((yAngle > 300.0f) || (yAngle < 60.0f)) && (boss->unk_078.x == 0.0f)) { if (Rand_ZeroOne() < 0.3f) { if (Rand_ZeroOne() < 0.4f) { - func_i6_80197F18(boss); + SectorY_80197F18(boss); } else { - func_i6_80199D64(boss); + SectorY_80199D64(boss); } } else if (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_5) { Math_SmoothStepToAngle(&boss->unk_078.x, 181.0f, 0.1f, 6.0f, 0.1f); @@ -276,7 +276,7 @@ void func_i6_801983E4(Boss* boss) { } } - if (func_i6_8019B5CC(boss) != 0) { + if (SectorY_8019B5CC(boss)) { Math_SmoothStepToF(&boss->obj.pos.y, 1000.0f, 0.1f, 30.0f, 0.1f); } else { Math_SmoothStepToF(&boss->obj.pos.y, 0.0f, 0.1f, 5.0f, 0.1f); @@ -284,18 +284,18 @@ void func_i6_801983E4(Boss* boss) { if (boss->timer_056 == 0) { if (Rand_ZeroOne() <= 0.7f) { - func_i6_80199D64(boss); + SectorY_80199D64(boss); } else { - func_i6_80197F18(boss); + SectorY_80197F18(boss); } } - if (func_i6_8019B528(boss) != 0) { - func_i6_80198ABC(boss); + if (SectorY_8019B528(boss)) { + SectorY_80198ABC(boss); } } -void func_i6_80198ABC(Boss* boss) { +void SectorY_80198ABC(Boss* boss) { f32 yAngle; yAngle = Math_RadToDeg(Math_Atan2F(-boss->obj.pos.x, -300.0f - boss->obj.pos.z)) - boss->unk_078.y; @@ -323,37 +323,37 @@ void func_i6_80198ABC(Boss* boss) { } AUDIO_PLAY_SFX(0x2902306C, boss->sfxSource, 4); - switch (D_80177A10[8]) { + switch (D_ctx_80177A10[8]) { case 0: if (gTeamShields[1] > 0) { - func_8002E4F8(gMsg_ID_14200, RCID_FALCO); + func_360_8002E4F8(gMsg_ID_14200, RCID_FALCO); } break; case 1: if ((gBosses[1].obj.status == OBJ_FREE) && (gBosses[2].obj.status == OBJ_FREE)) { - func_8002E4F8(gMsg_ID_14320, RCID_BOSS_SECTORY); + func_360_8002E4F8(gMsg_ID_14320, RCID_BOSS_SECTORY); } break; case 2: if ((gTeamShields[2] > 0) && (gBosses[1].obj.status != OBJ_FREE) && (gBosses[2].obj.status != OBJ_FREE)) { - func_8002E4F8(gMsg_ID_14220, RCID_SLIPPY); + func_360_8002E4F8(gMsg_ID_14220, RCID_SLIPPY); } break; } - D_80177A10[8] += (gGameFrameCount & 1) + 1; - D_80177A10[8] &= 3; + D_ctx_80177A10[8] += (gGameFrameCount & 1) + 1; + D_ctx_80177A10[8] &= 3; } -void func_i6_80198CE4(Boss* boss) { +void SectorY_80198CE4(Boss* boss) { f32 yAngle; - func_i6_8019B6E8(boss); + SectorY_8019B6E8(boss); if (boss->timer_052 == 0) { - func_i6_8019BC14(boss); + SectorY_8019BC14(boss); } Math_SmoothStepToAngle(&boss->unk_078.z, boss->fwork[27], 0.1f, 0.5f, 0.1f); @@ -374,7 +374,7 @@ void func_i6_80198CE4(Boss* boss) { boss->vel.z = COS_DEG(boss->unk_078.y) * boss->fwork[45]; } - if (func_i6_8019B5CC(boss) != 0) { + if (SectorY_8019B5CC(boss)) { Math_SmoothStepToF(&boss->obj.pos.y, 1000.0f, 0.1f, 30.0f, 0.1f); } else { Math_SmoothStepToF(&boss->obj.pos.y, 0.0f, 0.1f, 5.0f, 0.1f); @@ -387,12 +387,12 @@ void func_i6_80198CE4(Boss* boss) { yAngle += 360.0f; } - if ((func_i6_8019B528(boss) == 0) && ((yAngle <= 20.0f) || (yAngle >= 320.0f))) { - func_i6_80198244(boss); + if (!SectorY_8019B528(boss) && ((yAngle <= 20.0f) || (yAngle >= 320.0f))) { + SectorY_80198244(boss); } } -void func_i6_80198F5C(Boss* boss) { +void SectorY_80198F5C(Boss* boss) { Vec3f vec; Vec3f sp48; f32 xDisplacement; @@ -400,7 +400,8 @@ void func_i6_80198F5C(Boss* boss) { s32 i; boss->timer_05C = 20; - func_8007C120(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, boss->vel.x, boss->vel.y, boss->vel.z, 0.1f, 10); + func_effect_8007C120(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, boss->vel.x, boss->vel.y, boss->vel.z, 0.1f, + 10); boss->health -= boss->damage; if (boss->health < 0) { @@ -413,7 +414,7 @@ void func_i6_80198F5C(Boss* boss) { boss->unk_04C = 0; boss->swork[36] = 0; boss->swork[21] = 9; - boss->info.hitbox = SEGMENTED_TO_VIRTUAL(D_800CBF34); + boss->info.hitbox = SEGMENTED_TO_VIRTUAL(D_edata_800CBF34); if (boss->index == 0) { boss->timer_058 = 20000; @@ -445,8 +446,8 @@ void func_i6_80198F5C(Boss* boss) { for (i = 4; i < 60; i++) { if (gActors[i].obj.status == OBJ_FREE) { - func_i6_80197B30(&gActors[i], boss->index); - D_80177A10[9] = i; + SectorY_80197B30(&gActors[i], boss->index); + D_ctx_80177A10[9] = i; break; } } @@ -461,8 +462,8 @@ void func_i6_80198F5C(Boss* boss) { gCsFrameCount = 0; xDisplacement = gPlayer[0].camEye.x - boss->obj.pos.x; zDisplacement = gPlayer[0].camEye.z - boss->obj.pos.z; - D_80177A48[8] = Math_RadToDeg(Math_Atan2F(xDisplacement, zDisplacement)); - Matrix_RotateY(gCalcMatrix, D_80177A48[8] * M_DTOR, 0); + D_ctx_80177A48[8] = Math_RadToDeg(Math_Atan2F(xDisplacement, zDisplacement)); + Matrix_RotateY(gCalcMatrix, D_ctx_80177A48[8] * M_DTOR, 0); vec.x = 0.0f; vec.y = 0.0f; vec.z = 900.0f; @@ -473,12 +474,12 @@ void func_i6_80198F5C(Boss* boss) { gCsCamAtX = boss->obj.pos.x; gCsCamAtY = boss->obj.pos.y; gCsCamAtZ = boss->obj.pos.z; - D_80177A48[0] = 0.1f; + D_ctx_80177A48[0] = 0.1f; if (Rand_ZeroOne() > 0.5f) { - D_80177A48[9] = -3.0f; + D_ctx_80177A48[9] = -3.0f; return; } - D_80177A48[9] = 3.0f; + D_ctx_80177A48[9] = 3.0f; } } else { if (boss->index != 0) { @@ -489,12 +490,12 @@ void func_i6_80198F5C(Boss* boss) { AUDIO_PLAY_SFX(0x2943500F, boss->sfxSource, 4); } if ((gBosses[1].obj.status == OBJ_FREE) && (gBosses[2].obj.status == OBJ_FREE)) { - func_8002E4F8(gMsg_ID_14350, RCID_BOSS_SECTORY); + func_360_8002E4F8(gMsg_ID_14350, RCID_BOSS_SECTORY); } } } -void func_i6_80199438(Boss* boss) { +void SectorY_80199438(Boss* boss) { s32 i; s32 j; Vec3f vec; @@ -514,8 +515,8 @@ void func_i6_80199438(Boss* boss) { boss->fwork[0] = 1.0f; } } else { - D_80177A48[8] += D_80177A48[9]; - Matrix_RotateY(gCalcMatrix, D_80177A48[8] * M_DTOR, 0); + D_ctx_80177A48[8] += D_ctx_80177A48[9]; + Matrix_RotateY(gCalcMatrix, D_ctx_80177A48[8] * M_DTOR, 0); vec.x = 0.0f; vec.y = 0.0f; vec.z = 900.0f; @@ -539,32 +540,32 @@ void func_i6_80199438(Boss* boss) { AUDIO_PLAY_SFX(0x2903A060, boss->sfxSource, 4); D_80137E84[gMainController] = 1; D_Timer_80177BD0[gMainController] = 20; - D_80177850 = 15; + D_ctx_80177850 = 15; boss->swork[36]++; - func_8007BFFC(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, boss->vel.x, boss->vel.y, boss->vel.z, - 8.0f, 10); - func_8007B344(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 8.0f, 5); + func_effect_8007BFFC(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, boss->vel.x, boss->vel.y, + boss->vel.z, 8.0f, 10); + func_effect_8007B344(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 8.0f, 5); for (i = 10; i < 24; i++) { if (i != 15) { - func_i6_801A3B50(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, RAND_FLOAT_CENTERED(50.0f), + SectorY_801A3B50(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, RAND_FLOAT_CENTERED(50.0f), RAND_FLOAT_CENTERED(50.0f), RAND_FLOAT_CENTERED(50.0f) + boss->vel.z, i); } } } - Math_SmoothStepToF(&gPlayer[0].camEye.x, gCsCamEyeX, D_80177A48[0], 20000.0f, 0); - Math_SmoothStepToF(&gPlayer[0].camEye.y, gCsCamEyeY, D_80177A48[0], 20000.0f, 0); - Math_SmoothStepToF(&gPlayer[0].camEye.z, gCsCamEyeZ, D_80177A48[0], 20000.0f, 0); - Math_SmoothStepToF(&gPlayer[0].camAt.x, gCsCamAtX, D_80177A48[0], 20000.0f, 0); - Math_SmoothStepToF(&gPlayer[0].camAt.y, gCsCamAtY, D_80177A48[0], 20000.0f, 0); - Math_SmoothStepToF(&gPlayer[0].camAt.z, gCsCamAtZ, D_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&gPlayer[0].camEye.x, gCsCamEyeX, D_ctx_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&gPlayer[0].camEye.y, gCsCamEyeY, D_ctx_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&gPlayer[0].camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&gPlayer[0].camAt.x, gCsCamAtX, D_ctx_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&gPlayer[0].camAt.y, gCsCamAtY, D_ctx_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&gPlayer[0].camAt.z, gCsCamAtZ, D_ctx_80177A48[0], 20000.0f, 0); } if (!(gGameFrameCount & 3) && (boss->swork[36] == 0)) { - func_8007C120(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, boss->vel.x, boss->vel.y, boss->vel.z, - 0.1f, 5); + func_effect_8007C120(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, boss->vel.x, boss->vel.y, + boss->vel.z, 0.1f, 5); } if ((gCsFrameCount == 120) && (boss->swork[36] == 0) && (boss->index == 0)) { if (boss->swork[19] == 0) { - func_80042EC0(boss); + func_boss_80042EC0(boss); } for (i = 0; i < 2; i++) { @@ -574,15 +575,15 @@ void func_i6_80199438(Boss* boss) { } Audio_KillSfxBySource(boss->sfxSource); gShowBossHealth = 0; - func_8007A568(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 40.0f); - func_8007D0E0(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 30.0f); - func_80062B60(boss->obj.pos.x, boss->obj.pos.z, 0, 120.0f); - D_80178480 = 25; + func_effect_8007A568(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 40.0f); + func_effect_8007D0E0(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, 30.0f); + func_enmy_80062B60(boss->obj.pos.x, boss->obj.pos.z, 0, 120.0f); + D_ctx_80178480 = 25; boss->swork[36]++; for (i = 10; i < 24; i++) { if (i != 15) { - func_i6_801A3B50(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, RAND_FLOAT_CENTERED(50.0f), + SectorY_801A3B50(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, RAND_FLOAT_CENTERED(50.0f), RAND_FLOAT_CENTERED(50.0f), RAND_FLOAT_CENTERED(50.0f) + boss->vel.z, i); } } @@ -591,17 +592,17 @@ void func_i6_80199438(Boss* boss) { } if (boss->timer_058 == 1) { if (boss->index != 0) { - Object_Kill(&gActors[D_80177A10[9]].obj, gActors[D_80177A10[9]].sfxSource); + Object_Kill(&gActors[D_ctx_80177A10[9]].obj, gActors[D_ctx_80177A10[9]].sfxSource); if ((gBosses[1].obj.status == OBJ_FREE) || (gBosses[2].obj.status == OBJ_FREE)) { gBosses[0].unk_04A = 1; gObjects58[0].info.dList = D_SY_601F3D0; gObjects58[0].info.drawType = 0; } else { gPlayer[0].state_1C8 = PLAYERSTATE_1C8_3; - func_800B63BC(&gPlayer[0], 1); + func_play_800B63BC(&gPlayer[0], 1); gPlayer[0].unk_014 = 0.0f; if (gTeamShields[3] > 0) { - func_8002E4F8(gMsg_ID_14230, RCID_PEPPY); + func_360_8002E4F8(gMsg_ID_14230, RCID_PEPPY); } } } @@ -614,13 +615,13 @@ void func_i6_80199438(Boss* boss) { for (j = 59; j >= 0; j--) { if (gActors[j].obj.status == OBJ_FREE) { - func_i6_801A39FC(&gActors[j], boss->fwork[28], boss->fwork[29], boss->fwork[30], + SectorY_801A39FC(&gActors[j], boss->fwork[28], boss->fwork[29], boss->fwork[30], RAND_FLOAT_CENTERED(50.0f), RAND_FLOAT_CENTERED(50.0f), RAND_FLOAT_CENTERED(50.0f) + boss->vel.z, 15); break; } } - func_8007D2C8(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z + 30.0f, 4.0f); + func_effect_8007D2C8(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z + 30.0f, 4.0f); boss->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SY_6034304); AUDIO_PLAY_SFX(0x2903A06F, boss->sfxSource, 4); } @@ -643,7 +644,7 @@ void func_i6_80199438(Boss* boss) { } } -void func_i6_80199D64(Boss* boss) { +void SectorY_80199D64(Boss* boss) { if (boss->swork[34] >= 2) { boss->swork[20] = 6; boss->swork[21] = 1; @@ -654,15 +655,15 @@ void func_i6_80199D64(Boss* boss) { } } -void func_i6_80199DAC(Boss* boss) { +void SectorY_80199DAC(Boss* boss) { f32 sp34; f32 zSpeed; f32 xSpeed; f32 yAngle; - func_i6_8019B6E8(boss); + SectorY_8019B6E8(boss); if (boss->timer_052 == 0) { - func_i6_8019BC14(boss); + SectorY_8019BC14(boss); } sp34 = Math_RadToDeg(Math_Atan2F(0.0f - boss->obj.pos.x, -300.0f - boss->obj.pos.z)); @@ -725,25 +726,25 @@ void func_i6_80199DAC(Boss* boss) { boss->swork[21] = 3; boss->fwork[34] = 2.8f; } - if (func_i6_8019B5CC(boss) == 0) { - func_i6_8019C194(boss, zSpeed, xSpeed); + if (!SectorY_8019B5CC(boss)) { + SectorY_8019C194(boss, zSpeed, xSpeed); } } if (boss->timer_056 == 1) { sp34 = Rand_ZeroOne(); if (sp34 >= 0.3f) { - func_i6_8019A82C(boss); + SectorY_8019A82C(boss); } if (sp34 < 0.2f) { - func_i6_8019A434(boss); + SectorY_8019A434(boss); } if ((sp34 < 0.3f) && (sp34 >= 0.2f)) { - func_i6_8019A640(boss); + SectorY_8019A640(boss); } } } -void func_i6_8019A434(Boss* boss) { +void SectorY_8019A434(Boss* boss) { boss->swork[20] = 7; boss->swork[21] = 5; boss->timer_056 = (s32) (RAND_FLOAT(130.0f) + 60.0f); @@ -754,18 +755,18 @@ void func_i6_8019A434(Boss* boss) { AUDIO_PLAY_SFX(0x19031003, boss->sfxSource, 4); } -void func_i6_8019A520(Boss* boss) { +void SectorY_8019A520(Boss* boss) { - func_i6_8019B6E8(boss); + SectorY_8019B6E8(boss); if (boss->timer_052 == 0) { - func_i6_8019BC14(boss); + SectorY_8019BC14(boss); } Math_SmoothStepToAngle(&boss->unk_078.y, 0.0f, 0.1f, 2.0f, 0.1f); Math_SmoothStepToF(&boss->vel.x, 0.0f, 0.1f, 0.2f, 0.1f); Math_SmoothStepToF(&boss->vel.z, 6.0f, 0.1f, 0.2f, 0.1f); Math_SmoothStepToF(&boss->vel.y, 0.0f, 0.1f, 0.2f, 0.1f); if (boss->timer_056 == 0) { - func_i6_8019A640(boss); + SectorY_8019A640(boss); } else { boss->fwork[0] = 1.0f; } @@ -775,7 +776,7 @@ void func_i6_8019A520(Boss* boss) { } } -void func_i6_8019A640(Boss* boss) { +void SectorY_8019A640(Boss* boss) { boss->swork[20] = 8; boss->swork[21] = 0; boss->vel.x = 0.0f; @@ -784,19 +785,19 @@ void func_i6_8019A640(Boss* boss) { boss->timer_056 = 80; } -void func_i6_8019A66C(Boss* boss) { +void SectorY_8019A66C(Boss* boss) { - func_i6_8019B6E8(boss); + SectorY_8019B6E8(boss); if (boss->timer_052 == 0) { - func_i6_8019BC14(boss); + SectorY_8019BC14(boss); } if (boss->timer_056 == 60) { AUDIO_PLAY_SFX(0x2902306C, boss->sfxSource, 4); boss->fwork[34] = 4.5f; if (Rand_ZeroOne() > 0.5f) { - func_8002E4F8(gMsg_ID_14330, 160); + func_360_8002E4F8(gMsg_ID_14330, 160); } else { - func_8002E4F8(gMsg_ID_14320, 160); + func_360_8002E4F8(gMsg_ID_14320, 160); } } if (boss->timer_056 <= 60) { @@ -809,26 +810,26 @@ void func_i6_8019A66C(Boss* boss) { Math_SmoothStepToF(&boss->vel.y, 10.0f, 0.1f, 0.5f, 0.5f); } if (boss->timer_056 == 0) { - func_i6_80198244(boss); + SectorY_80198244(boss); } } -void func_i6_8019A82C(Boss* boss) { +void SectorY_8019A82C(Boss* boss) { boss->swork[20] = 9; boss->fwork[9] = 0.0f; boss->timer_050 = RAND_INT(150.0f) + 340; boss->timer_056 = 0; - func_8002E4F8(gMsg_ID_14340, 160); + func_360_8002E4F8(gMsg_ID_14340, 160); } -void func_i6_8019A898(Boss* boss) { +void SectorY_8019A898(Boss* boss) { f32 yAngle1; f32 yAngle2; - func_i6_8019B6E8(boss); + SectorY_8019B6E8(boss); if (boss->timer_052 == 0) { - func_i6_8019BC14(boss); + SectorY_8019BC14(boss); } yAngle1 = Math_RadToDeg(Math_Atan2F(boss->fwork[18] - boss->obj.pos.x, boss->fwork[20] - boss->obj.pos.z)); @@ -849,37 +850,38 @@ void func_i6_8019A898(Boss* boss) { boss->timer_056 = 0; } if (boss->timer_050 == 0) { - func_i6_8019A434(boss); + SectorY_8019A434(boss); } } -void func_i6_8019AA08(Boss* boss) { - if (func_i6_8019B5CC(boss) == 0) { - if ((gBosses[1].obj.status == OBJ_FREE) && (gBosses[2].obj.status == OBJ_FREE)) { - func_8002E4F8(gMsg_ID_14330, RCID_BOSS_SECTORY); - } - - if (Rand_ZeroOne() >= 0.5f) { - boss->swork[21] = 7; - boss->swork[31] = 11; - boss->swork[32] = Animation_GetFrameCount(&D_SY_602645C) - 1; - - } else if (boss->index == 0) { - boss->swork[21] = 8; - boss->swork[31] = 13; - boss->swork[32] = Animation_GetFrameCount(&D_SY_60258A0) - 1; - - } else { - return; - } - - boss->swork[20] = 10; - boss->unk_04C = 0; - boss->fwork[34] = 2.8f; +void SectorY_8019AA08(Boss* boss) { + if (SectorY_8019B5CC(boss)) { + return; } + if ((gBosses[1].obj.status == OBJ_FREE) && (gBosses[2].obj.status == OBJ_FREE)) { + func_360_8002E4F8(gMsg_ID_14330, RCID_BOSS_SECTORY); + } + + if (Rand_ZeroOne() >= 0.5f) { + boss->swork[21] = 7; + boss->swork[31] = 11; + boss->swork[32] = Animation_GetFrameCount(&D_SY_602645C) - 1; + + } else if (boss->index == 0) { + boss->swork[21] = 8; + boss->swork[31] = 13; + boss->swork[32] = Animation_GetFrameCount(&D_SY_60258A0) - 1; + + } else { + return; + } + + boss->swork[20] = 10; + boss->unk_04C = 0; + boss->fwork[34] = 2.8f; } -void func_i6_8019AAF0(Boss* boss) { +void SectorY_8019AAF0(Boss* boss) { f32 var_fv1; f32 xAngle; f32 yAngle; @@ -887,7 +889,7 @@ void func_i6_8019AAF0(Boss* boss) { Vec3f vec; Vec3f vel; - func_i6_8019BBBC(boss); + SectorY_8019BBBC(boss); yAngle = Math_Atan2F(boss->fwork[18] - boss->obj.pos.x, boss->fwork[20] - boss->obj.pos.z); var_fv1 = 500.0f; if (boss->health != 0) { @@ -908,7 +910,7 @@ void func_i6_8019AAF0(Boss* boss) { } } if (boss->unk_04C >= (boss->swork[32] - 5)) { - func_i6_80198244(boss); + SectorY_80198244(boss); } } else { Math_SmoothStepToF(&boss->fwork[9], boss->fwork[45] + 10.0f, 0.1f, 2.0f, 0.1f); @@ -934,11 +936,11 @@ void func_i6_8019AAF0(Boss* boss) { } } Math_SmoothStepToF(&boss->obj.pos.y, boss->fwork[19], 0.1f, 40.0f, 0.1f); - if (D_801615D0.z > 0.0f) { + if (D_edisplay_801615D0.z > 0.0f) { boss->swork[32] = 0; } - if (func_i6_8019B528(boss) != 0) { - func_i6_80198ABC(boss); + if (SectorY_8019B528(boss)) { + SectorY_80198ABC(boss); } if (boss->swork[20] == 10) { boss->fwork[0] = 0.25f; @@ -948,7 +950,7 @@ void func_i6_8019AAF0(Boss* boss) { } } -void func_i6_8019AEC0(Boss* boss) { +void SectorY_8019AEC0(Boss* boss) { boss->swork[20] = 11; boss->swork[21] = 8; boss->vel.x = 0.0f; @@ -957,7 +959,7 @@ void func_i6_8019AEC0(Boss* boss) { boss->unk_044 = 0; } -void func_i6_8019AEEC(Boss* boss) { +void SectorY_8019AEEC(Boss* boss) { if ((boss->obj.pos.y != 365.0f) && (boss->swork[21] != 1)) { if (boss->unk_04A != 0) { @@ -972,7 +974,7 @@ void func_i6_8019AEEC(Boss* boss) { gPlayer[0].camAt.z = boss->obj.pos.z; gPlayer[0].unk_034 = 0.0f; Radio_PlayMessage(gMsg_ID_14300, RCID_BOSS_SECTORY); - func_i6_801A0510(&gActors[59], 7); + SectorY_801A0510(&gActors[59], 7); gActors[59].obj.pos.y = boss->obj.pos.y - 202.0f; gActors[59].obj.pos.x = boss->obj.pos.x; gActors[59].obj.pos.z = boss->obj.pos.z - 30.0f; @@ -1011,8 +1013,8 @@ void func_i6_8019AEEC(Boss* boss) { Math_SmoothStepToF(&boss->vel.z, 80.0f, 0.1f, 2.0f, 0.5f); Math_SmoothStepToF(&gActors[59].vel.z, 80.0f, 0.1f, 2.0f, 0.5f); if (!(gGameFrameCount & 1)) { - func_8007C120(boss->obj.pos.x, boss->obj.pos.y - 150.0f, boss->obj.pos.z, 0.0f, 0.0f, 0.0f, 0.1f, - 5); + func_effect_8007C120(boss->obj.pos.x, boss->obj.pos.y - 150.0f, boss->obj.pos.z, 0.0f, 0.0f, 0.0f, + 0.1f, 5); } } } @@ -1033,7 +1035,7 @@ void func_i6_8019AEEC(Boss* boss) { Math_SmoothStepToF(&gActors[59].vel.z, 0.0f, 0.1f, 1.0f, 0.5f); } if (boss->timer_056 == 0.0f) { - func_i6_80198244(boss); + SectorY_80198244(boss); boss->vel.z = 80.0f; boss->fwork[13] = 80.0f; boss->obj.pos.z = -12000.0f; @@ -1041,7 +1043,7 @@ void func_i6_8019AEEC(Boss* boss) { boss->fwork[43] = 0.0f; boss->vel.y = 0.0f; gPlayer[0].state_1C8 = PLAYERSTATE_1C8_3; - func_800B63BC(&gPlayer[0], 1); + func_play_800B63BC(&gPlayer[0], 1); gPlayer[0].unk_014 = 0.0f; boss->swork[34]++; Radio_PlayMessage(gMsg_ID_14310, RCID_BOSS_SECTORY); @@ -1050,7 +1052,7 @@ void func_i6_8019AEEC(Boss* boss) { } } -s32 func_i6_8019B528(Boss* boss) { +bool SectorY_8019B528(Boss* boss) { if (boss->timer_050 != 0) { return false; @@ -1066,7 +1068,7 @@ s32 func_i6_8019B528(Boss* boss) { return false; } -s32 func_i6_8019B5CC(Boss* boss) { +bool SectorY_8019B5CC(Boss* boss) { f32 pad; Vec3f pos; @@ -1088,7 +1090,7 @@ s32 func_i6_8019B5CC(Boss* boss) { return false; } -void func_i6_8019B6E8(Boss* boss) { +void SectorY_8019B6E8(Boss* boss) { f32 var4; f32 var3; f32 var2; @@ -1144,7 +1146,7 @@ void func_i6_8019B6E8(Boss* boss) { } } -void func_i6_8019BBBC(Boss* boss) { +void SectorY_8019BBBC(Boss* boss) { boss->fwork[18] = gPlayer[0].pos.x; boss->fwork[19] = gPlayer[0].pos.y; boss->fwork[20] = gPlayer[0].pos.z; @@ -1153,7 +1155,7 @@ void func_i6_8019BBBC(Boss* boss) { boss->fwork[26] = gPlayer[0].vel.z; } -void func_i6_8019BC14(Boss* boss) { +void SectorY_8019BC14(Boss* boss) { f32 sp4C; f32 sp48; f32 sp44; @@ -1166,7 +1168,7 @@ void func_i6_8019BC14(Boss* boss) { boss->timer_052 = 2; return; } - if ((boss->swork[0x16] == 1) && (D_801615D0.z > 0.0f)) { + if ((boss->swork[0x16] == 1) && (D_edisplay_801615D0.z > 0.0f)) { boss->timer_052 = 2; return; } @@ -1205,7 +1207,7 @@ void func_i6_8019BC14(Boss* boss) { gPlayer[0].pos.x = boss->fwork[0x12]; gPlayer[0].pos.y = boss->fwork[0x13]; gPlayer[0].unk_138 = gPlayer[0].pos.z = boss->fwork[0x14]; - func_8007F11C(OBJ_EFFECT_354, boss->fwork[1], boss->fwork[2], boss->fwork[3], 100.0f); + func_effect_8007F11C(OBJ_EFFECT_354, boss->fwork[1], boss->fwork[2], boss->fwork[3], 100.0f); gPlayer[0].pos.x = sp4C; gPlayer[0].pos.y = sp48; gPlayer[0].unk_138 = gPlayer[0].pos.z = sp44; @@ -1223,32 +1225,32 @@ void func_i6_8019BC14(Boss* boss) { } } -void func_i6_8019C194(Boss* boss, f32 zSpeed, f32 xSpeed) { +void SectorY_8019C194(Boss* boss, f32 zSpeed, f32 xSpeed) { f32 sp2C; f32 sp28; if ((gBossFrameCount > 250) && (boss->fwork[34] == 2.8f)) { - switch (D_80177A10[8]) { + switch (D_ctx_80177A10[8]) { case 0: if (gTeamShields[1] > 0) { - func_8002E4F8(gMsg_ID_14200, RCID_FALCO); + func_360_8002E4F8(gMsg_ID_14200, RCID_FALCO); } break; case 1: if (gTeamShields[3] > 0) { - func_8002E4F8(gMsg_ID_14210, RCID_PEPPY); + func_360_8002E4F8(gMsg_ID_14210, RCID_PEPPY); } break; case 2: if ((gTeamShields[2] > 0) && (gBosses[1].obj.status != OBJ_FREE) && (gBosses[2].obj.status != OBJ_FREE)) { - func_8002E4F8(gMsg_ID_14220, RCID_SLIPPY); + func_360_8002E4F8(gMsg_ID_14220, RCID_SLIPPY); } break; } - D_80177A10[8] += (gGameFrameCount & 1) + 1; - D_80177A10[8] &= 3; + D_ctx_80177A10[8] += (gGameFrameCount & 1) + 1; + D_ctx_80177A10[8] &= 3; } if ((xSpeed > 800.0f) || (zSpeed > 300.0f)) { @@ -1272,7 +1274,7 @@ void func_i6_8019C194(Boss* boss, f32 zSpeed, f32 xSpeed) { boss->obj.pos.z += sp28; } - if (func_i6_8019B5CC(boss) == 0) { + if (!SectorY_8019B5CC(boss)) { if (boss->index == 0) { boss->obj.pos.y += SIN_DEG(boss->fwork[44]) * 30.0f; } else { @@ -1321,11 +1323,11 @@ void func_i6_8019C194(Boss* boss, f32 zSpeed, f32 xSpeed) { } static void (*D_i6_801A6910[12])(Boss*) = { - func_i6_80197F84, func_i6_80198238, func_i6_80198238, func_i6_801983E4, func_i6_80198CE4, func_i6_80199438, - func_i6_80199DAC, func_i6_8019A520, func_i6_8019A66C, func_i6_8019A898, func_i6_8019AAF0, func_i6_8019AEEC, + SectorY_80197F84, SectorY_80198238, SectorY_80198238, SectorY_801983E4, SectorY_80198CE4, SectorY_80199438, + SectorY_80199DAC, SectorY_8019A520, SectorY_8019A66C, SectorY_8019A898, SectorY_8019AAF0, SectorY_8019AEEC, }; -void func_i6_8019C888(Boss* boss) { +void SectorY_8019C888(Boss* boss) { s32 i; f32 sp1E8; f32 sp1E4; @@ -1372,12 +1374,12 @@ void func_i6_8019C888(Boss* boss) { D_i6_801A6910[boss->swork[20]](boss); } if (boss->timer_058 != 0) { - func_i6_80199438(boss); + SectorY_80199438(boss); } if ((boss->swork[29] != 0) && !(boss->swork[29] & gGameFrameCount)) { - func_8007C120(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, boss->vel.x, boss->vel.y, boss->vel.z, - 0.1f, 5); + func_effect_8007C120(boss->obj.pos.x, boss->obj.pos.y, boss->obj.pos.z, boss->vel.x, boss->vel.y, + boss->vel.z, 0.1f, 5); } switch (boss->swork[21]) { @@ -1556,10 +1558,10 @@ void func_i6_8019C888(Boss* boss) { boss->swork[24] = 15; AUDIO_PLAY_SFX(0x29121007, boss->sfxSource, 4); } else { - func_i6_80198F5C(boss); + SectorY_80198F5C(boss); } } else { - func_i6_80198F5C(boss); + SectorY_80198F5C(boss); } } @@ -1584,7 +1586,7 @@ void func_i6_8019C888(Boss* boss) { if (gBossFrameCount == 250) { for (i = 59; i >= 0; i--) { if (gActors[i].obj.status == OBJ_ACTIVE) { - D_800CFF80[gActors[i].iwork[12]] = i; + D_enmy2_800CFF80[gActors[i].iwork[12]] = i; } } } @@ -1601,9 +1603,10 @@ void func_i6_8019C888(Boss* boss) { gBossHealthBar = (gBosses[1].health + gBosses[2].health) * 1.275f; } } - if (D_801615D0.z > 0.0f) { + if (D_edisplay_801615D0.z > 0.0f) { boss->swork[30]++; - if (boss->swork[30] > 300 && ((ABS(D_801615D0.z) + ABS(D_801615D0.x)) < 3500.0f) && (gRadioState == 0)) { + if (boss->swork[30] > 300 && ((ABS(D_edisplay_801615D0.z) + ABS(D_edisplay_801615D0.x)) < 3500.0f) && + (gRadioState == 0)) { if (gTeamShields[3] > 0) { Radio_PlayMessage(gMsg_ID_2282, RCID_PEPPY); } @@ -1612,11 +1615,11 @@ void func_i6_8019C888(Boss* boss) { if (boss->swork[30] > 100) { - if ((((ABS(D_801615D0.z) + ABS(D_801615D0.x)) < 500.0f) && gTeamShields[1] > 0)) { + if ((((ABS(D_edisplay_801615D0.z) + ABS(D_edisplay_801615D0.x)) < 500.0f) && gTeamShields[1] > 0)) { Radio_PlayMessage(gMsg_ID_2233, RCID_FALCO); } } - if (D_801615D0.x > 0.0f) { + if (D_edisplay_801615D0.x > 0.0f) { gPlayer[0].unk_228 = 0x10; } else { gPlayer[0].unk_228 = 0x20; @@ -1628,7 +1631,7 @@ void func_i6_8019C888(Boss* boss) { } } -s32 func_i6_8019DC4C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +s32 SectorY_8019DC4C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { Boss* boss = (Boss*) data; Vec3f sp10 = { 0.0f, 0.0f, 0.0f }; @@ -1668,12 +1671,12 @@ s32 func_i6_8019DC4C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d return false; } -s32 func_i6_8019DE10(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +s32 SectorY_8019DE10(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { Boss* boss = (Boss*) data; Vec3f sp38 = { 0.0f, 0.0f, 0.0f }; if (boss->index != 0) { - return func_i6_8019DC4C(limbIndex, dList, pos, rot, boss); + return SectorY_8019DC4C(limbIndex, dList, pos, rot, boss); } if (boss->timer_05C & 1) { gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 32, 32, 255, 255); @@ -1714,7 +1717,7 @@ s32 func_i6_8019DE10(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d return false; } -void func_i6_8019E014(s32 limbIndex, Vec3f* rot, void* data) { +void SectorY_8019E014(s32 limbIndex, Vec3f* rot, void* data) { Vec3f sp7C = { 40.0f, -30.0f, 0.0f }; Vec3f sp70 = { -40.0f, -30.0f, 0.0f }; Vec3f sp64 = { 0.0f, 0.0f, 0.0f }; @@ -1780,7 +1783,7 @@ void func_i6_8019E014(s32 limbIndex, Vec3f* rot, void* data) { static f32 D_i6_801A69AC[20] = { 0.3f, 0.7f, 1.3f, 0.7f, 0.3f, 0.0f, 10.0f, 20.0f, 300.0f, 100.0f, 200.0f, 100.0f, 60.0f, -260.0f, 80.0f, 100.0f, 80.0f, 262.0f, 285.0f, 252.0f }; -void func_i6_8019E2C4(Boss* boss) { +void SectorY_8019E2C4(Boss* boss) { f32 sp9C; f32 sp98; f32 sp94; @@ -1794,7 +1797,7 @@ void func_i6_8019E2C4(Boss* boss) { RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } if ((boss->health > 0) || (boss->swork[36] == 0)) { - Animation_DrawSkeleton(2, D_SY_602D140, boss->vwork, func_i6_8019DE10, func_i6_8019E014, boss, gCalcMatrix); + Animation_DrawSkeleton(2, D_SY_602D140, boss->vwork, SectorY_8019DE10, SectorY_8019E014, boss, gCalcMatrix); if (boss->timer_054 != 0) { sp9C = D_i6_801A69AC[boss->timer_054]; RCP_SetupDL_49(); @@ -1819,7 +1822,7 @@ void func_i6_8019E2C4(Boss* boss) { Matrix_RotateZ(gGfxMatrix, -boss->obj.rot.z * M_DTOR, 1); sp98 = gPlayer[0].camEye.x - boss->obj.pos.x; sp94 = gPlayer[0].camEye.y - boss->obj.pos.y; - sp90 = gPlayer[0].camEye.z - (boss->obj.pos.z + D_80177D20); + sp90 = gPlayer[0].camEye.z - (boss->obj.pos.z + D_ctx_80177D20); sp8C = -Math_Atan2F(sp98, sp90); sp9C = sqrtf(SQ(sp90) + SQ(sp98)); sp88 = Math_Atan2F(sp94, sp9C); @@ -1895,7 +1898,7 @@ static Vec3f D_i6_801A69FC[10] = { { 2500.0f, 0.0f, 4000.0f }, }; -void func_i6_8019EB80(void) { +void SectorY_8019EB80(void) { Actor* actor; s32 i; s32 var_s1; @@ -1938,7 +1941,7 @@ void func_i6_8019EB80(void) { } } -void func_i6_8019EE60(Player* player) { +void SectorY_8019EE60(Player* player) { s32 i; f32 temp1; f32 temp2; @@ -1958,9 +1961,9 @@ void func_i6_8019EE60(Player* player) { player->wings.unk_04 = player->wings.unk_0C = player->wings.unk_08 = player->wings.unk_10 = player->unk_130 = player->unk_12C = 0.0f; player->unk_234 = 1; - D_80177A48[8] = Math_RadToDeg( + D_ctx_80177A48[8] = Math_RadToDeg( Math_Atan2F(gPlayer[0].camEye.x - boss->obj.pos.x, gPlayer[0].camEye.z - boss->obj.pos.z)); - Matrix_RotateY(gCalcMatrix, D_80177A48[8] * M_DTOR, 0); + Matrix_RotateY(gCalcMatrix, D_ctx_80177A48[8] * M_DTOR, 0); sp60.x = 0.0f; sp60.y = 0.0f; sp60.z = 1400.0f; @@ -1981,11 +1984,11 @@ void func_i6_8019EE60(Player* player) { Object_Kill(&gActors[3].obj, gActors[3].sfxSource); Object_Kill(&gActors[4].obj, gActors[4].sfxSource); player->unk_1D0++; - D_80177A48[0] = 0.05f; + D_ctx_80177A48[0] = 0.05f; if (Rand_ZeroOne() > 0.5f) { - D_80177A48[9] = -1.0f; + D_ctx_80177A48[9] = -1.0f; } else { - D_80177A48[9] = 1.0f; + D_ctx_80177A48[9] = 1.0f; } break; case 1: @@ -1997,8 +2000,8 @@ void func_i6_8019EE60(Player* player) { temp_ft1 = Math_SmoothStepToAngle(&player->unk_0E8, temp_ft1, 0.5f, 2.0f, 0.0001f) * 30.0f; Math_SmoothStepToAngle(&player->unk_0EC, -temp_ft1, 0.1f, 5.0f, 0.0001f); if (gCsFrameCount < 180) { - D_80177A48[8] += D_80177A48[9]; - Matrix_RotateY(gCalcMatrix, D_80177A48[8] * M_DTOR, 0); + D_ctx_80177A48[8] += D_ctx_80177A48[9]; + Matrix_RotateY(gCalcMatrix, D_ctx_80177A48[8] * M_DTOR, 0); sp60.x = 0.0f; sp60.y = 0.0f; sp60.z = 1400.0f; @@ -2015,16 +2018,16 @@ void func_i6_8019EE60(Player* player) { } if (gCsFrameCount >= 180) { - D_80178358 = 255; - D_80178348 = D_80178350 = D_80178354 = 255; + D_ctx_80178358 = 255; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; } if (gCsFrameCount == 230) { - D_80177A48[0] = 1.0f; + D_ctx_80177A48[0] = 1.0f; player->unk_1D0++; - func_800A6148(); + func_play_800A6148(); func_8001CA24(0); Audio_KillSfxBySource(player->sfxSource); - D_80178340 = 250; + D_ctx_80178340 = 250; player->timer_1F8 = 50; player->unk_0D0 = 0.0f; player->unk_0E4 = 0.0f; @@ -2041,30 +2044,30 @@ void func_i6_8019EE60(Player* player) { player->unk_1D0++; func_8001C8B8(0); AUDIO_PLAY_BGM(SEQ_ID_38); - D_80177A98 = 0; + D_ctx_80177A98 = 0; for (i = 0; i < 200; i++) { gObjects58[i].obj.status = OBJ_FREE; } - func_800A6148(); - func_i6_8019EB80(); - D_80177A48[1] = 10.0f; - D_80177A48[2] = 0.5f; - D_80177A48[6] = 0.0f; - D_80177A48[7] = 25.0f; - D_80177A48[8] = 500.0f; - D_80177A48[9] = 3600.0f; + func_play_800A6148(); + SectorY_8019EB80(); + D_ctx_80177A48[1] = 10.0f; + D_ctx_80177A48[2] = 0.5f; + D_ctx_80177A48[6] = 0.0f; + D_ctx_80177A48[7] = 25.0f; + D_ctx_80177A48[8] = 500.0f; + D_ctx_80177A48[9] = 3600.0f; player->wings.unk_2C = 1; } break; case 3: - if ((gCsFrameCount < 720) && (D_801782F8 != 0)) { + if ((gCsFrameCount < 720) && (D_ctx_801782F8 != 0)) { player->wings.unk_30 = (f32) (gGameFrameCount & 2) * 5.0f; } - D_80178358 = 0; - D_8017835C = 4; - if (D_80178340 == 0) { + D_ctx_80178358 = 0; + D_ctx_8017835C = 4; + if (D_ctx_80178340 == 0) { player->unk_204 = 1; } @@ -2074,52 +2077,52 @@ void func_i6_8019EE60(Player* player) { if (gCsFrameCount == 395) { AUDIO_PLAY_SFX(0x09000013, player->sfxSource, 0); } - D_80177A48[1] += D_80177A48[2]; - Matrix_RotateY(gCalcMatrix, D_80177A48[1] * M_DTOR, 0); + D_ctx_80177A48[1] += D_ctx_80177A48[2]; + Matrix_RotateY(gCalcMatrix, D_ctx_80177A48[1] * M_DTOR, 0); sp60.y = 0.0f; sp60.z = 0.0f; - sp60.x = D_80177A48[8]; + sp60.x = D_ctx_80177A48[8]; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp60, &sp54); - Math_SmoothStepToF(&D_80177A48[9], 3400.0f, 1.0f, 0.1f, 0.0f); - if (D_80177A48[1] >= 93.0f) { + Math_SmoothStepToF(&D_ctx_80177A48[9], 3400.0f, 1.0f, 0.1f, 0.0f); + if (D_ctx_80177A48[1] >= 93.0f) { if (gCsFrameCount < 1380) { - Math_SmoothStepToF(&D_80177A48[7], 300.0f, 1.0f, 0.7f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[7], 300.0f, 1.0f, 0.7f, 0.0f); } else { - D_80177A48[7] -= 5.0f; + D_ctx_80177A48[7] -= 5.0f; } } if (gCsFrameCount >= 640) { - Math_SmoothStepToF(&D_80177A48[6], 1.0f, 0.1f, 0.025f, 0.0f); - Math_SmoothStepToF(&D_80177A48[8], 1600.0f, 1.0f, D_80177A48[6], 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[6], 1.0f, 0.1f, 0.025f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[8], 1600.0f, 1.0f, D_ctx_80177A48[6], 0.0f); } else { - Math_SmoothStepToF(&D_80177A48[8], 350.0f, 0.1f, 0.7f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[8], 350.0f, 0.1f, 0.7f, 0.0f); } gCsCamEyeX = sp54.x; - gCsCamEyeY = D_80177A48[9]; + gCsCamEyeY = D_ctx_80177A48[9]; gCsCamEyeZ = 295.0f + sp54.z; gCsCamAtX = 0.0f; gCsCamAtY = 3500.0f; - gCsCamAtZ = D_80177A48[7] + player->pos.z; + gCsCamAtZ = D_ctx_80177A48[7] + player->pos.z; if (gCsFrameCount > 1440) { player->unk_0D0 += 2.0f; player->unk_0E4 += 0.1f; - Math_SmoothStepToF(&D_80177A48[2], 0.0f, 1.0f, 0.001f, 0); + Math_SmoothStepToF(&D_ctx_80177A48[2], 0.0f, 1.0f, 0.001f, 0); player->unk_190 = 2.0f; - } else if (D_80177A48[1] >= 92.0f) { - Math_SmoothStepToF(&D_80177A48[2], 0.3f, 1.0f, 0.0018f, 0); + } else if (D_ctx_80177A48[1] >= 92.0f) { + Math_SmoothStepToF(&D_ctx_80177A48[2], 0.3f, 1.0f, 0.0018f, 0); } else { - Math_SmoothStepToF(&D_80177A48[2], 0.01f, 1.0f, 0.0016f, 0); + Math_SmoothStepToF(&D_ctx_80177A48[2], 0.01f, 1.0f, 0.0016f, 0); } if (gCsFrameCount > 1530) { - D_80178358 = 255; - D_80178348 = D_80178350 = D_80178354 = 0; - D_8017835C = 8; - if (D_80178340 == 0xFF) { + D_ctx_80178358 = 255; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; + D_ctx_8017835C = 8; + if (D_ctx_80178340 == 0xFF) { Audio_FadeOutAll(10); player->state_1C8 = PLAYERSTATE_1C8_6; player->timer_1F8 = 0; - D_8017837C = 4; - D_800D3180[LEVEL_SECTOR_Y] = Play_CheckMedalStatus(150) + 1; + D_ctx_8017837C = 4; + D_play_800D3180[LEVEL_SECTOR_Y] = Play_CheckMedalStatus(150) + 1; } } break; @@ -2127,9 +2130,9 @@ void func_i6_8019EE60(Player* player) { switch (gCsFrameCount) { case 520: if (gHitCount >= 100) { - D_80177930 = 1; + D_ctx_80177930 = 1; } - D_80177840 = 100; + D_ctx_80177840 = 100; break; case 580: if (gHitCount >= 100) { @@ -2150,7 +2153,7 @@ void func_i6_8019EE60(Player* player) { if (gHitCount >= 100) { Radio_PlayMessage(gMsg_ID_2305, RCID_SLIPPY); } else { - func_80048AC0(2); + func_demo_80048AC0(2); } break; } @@ -2168,7 +2171,7 @@ void func_i6_8019EE60(Player* player) { if (gHitCount >= 100) { Radio_PlayMessage(gMsg_ID_20261, RCID_PEPPY); } else { - func_80048AC0(3); + func_demo_80048AC0(3); } break; } @@ -2185,16 +2188,16 @@ void func_i6_8019EE60(Player* player) { if (gHitCount >= 100) { Radio_PlayMessage(gMsg_ID_20262, RCID_FALCO); } else { - func_80048AC0(1); + func_demo_80048AC0(1); } break; } break; case 1163: - D_80177830 = 1; + D_ctx_80177830 = 1; break; case 1363: - D_80177830 = 0; + D_ctx_80177830 = 0; break; case 1440: AUDIO_PLAY_SFX(0x09000002, player->sfxSource, 0); @@ -2233,19 +2236,19 @@ void func_i6_8019EE60(Player* player) { player->pos.z += player->vel.z; player->unk_138 = player->pos.z; player->unk_0F8 = player->unk_0EC; - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 50000.0f, 0.0f); - Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_ctx_80177A48[0], 50000.0f, 0.0f); + Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_ctx_80177A48[0], 50000.0f, 0.0f); player->unk_088 += 10.0f; player->unk_080 = -SIN_DEG(player->unk_088) * 0.3f; player->unk_0F4 += 8.0f; player->unk_0F0 = SIN_DEG(player->unk_0F4); } -void func_i6_8019FF00(Actor* actor) { +void SectorY_8019FF00(Actor* actor) { Vec3f sp4C; Vec3f sp40; f32 temp1; @@ -2348,7 +2351,7 @@ static Vec3f D_i6_801A6A74[10] = { { -10100.0f, -300.0f, -600.0f }, { -10300.0f { -200.0f, -2400.0f, -12650.0f }, { 0.0f, 4000.0f, -600.0f }, { -10800.0f, 900.0f, -600.0f }, { -2750.0f, 900.0f, -9150.0f } }; -void func_i6_801A0510(Actor* actor, s32 arg1) { +void SectorY_801A0510(Actor* actor, s32 arg1) { Actor_Initialize(actor); actor->obj.status = OBJ_ACTIVE; @@ -2403,7 +2406,7 @@ static Vec3f D_i6_801A6AEC[5] = { { 0.0f, 345.0f, 350.0f }, { 90.0f, 87.0f, 93.0f }, }; -void func_i6_801A06A4(Actor* actor, s32 arg1) { +void SectorY_801A06A4(Actor* actor, s32 arg1) { if (gTeamShields[1 + arg1] > 0) { Actor_Initialize(actor); @@ -2423,7 +2426,7 @@ void func_i6_801A06A4(Actor* actor, s32 arg1) { } } -void func_i6_801A07FC(Actor* actor0, Actor* actor1) { +void SectorY_801A07FC(Actor* actor0, Actor* actor1) { Vec3f sp3C; Vec3f sp30; @@ -2458,7 +2461,7 @@ void func_i6_801A07FC(Actor* actor0, Actor* actor1) { AUDIO_PLAY_SFX(0x2900306B, actor1->sfxSource, 4); } -void func_i6_801A0A08(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 arg4) { +void SectorY_801A0A08(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 arg4) { Actor_Initialize(actor); actor->obj.status = OBJ_ACTIVE; actor->obj.id = OBJ_ACTOR_195; @@ -2473,7 +2476,7 @@ void func_i6_801A0A08(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 arg4) { AUDIO_PLAY_SFX(0x2900306B, actor->sfxSource, 4); } -void func_i6_801A0AC0(Player* player) { +void SectorY_801A0AC0(Player* player) { s32 i; s32 spB0; Vec3f spA4; @@ -2489,7 +2492,7 @@ void func_i6_801A0AC0(Player* player) { case 0: gCsFrameCount = 0; for (i = 0; i < 5; i++) { - func_i6_801A0510(&gActors[i + 5], i); + SectorY_801A0510(&gActors[i + 5], i); } player->unk_1D0 = 1; player->camEye.x = gCsCamEyeX = -2000.0f; @@ -2498,7 +2501,7 @@ void func_i6_801A0AC0(Player* player) { player->camAt.x = gCsCamAtX = gActors[8].obj.pos.x; player->camAt.y = gCsCamAtY = gActors[8].obj.pos.y; player->camAt.z = gCsCamAtZ = gActors[8].obj.pos.z; - D_80177A48[0] = 0.0f; + D_ctx_80177A48[0] = 0.0f; player->pos.y = 5000.0f; player->unk_034 = 0.0f; player->unk_0D0 = 0.0f; @@ -2506,19 +2509,19 @@ void func_i6_801A0AC0(Player* player) { gActors[5].obj.rot.z = 30.0f; gActors[6].obj.rot.z = 30.0f; gActors[7].obj.rot.z = 320.0f; - D_801784D4 = D_801784FC = D_80178524 = D_801784BC = D_801784C8 = 230.0f; + D_ctx_801784D4 = D_ctx_801784FC = D_ctx_80178524 = D_ctx_801784BC = D_ctx_801784C8 = 230.0f; gActors[6].fwork[1] = 15.0f; /* fallthrough */ case 1: if (gCsFrameCount < 3) { - D_80178340 = 0xFF; + D_ctx_80178340 = 0xFF; } if ((gGameFrameCount & 0xC) && !(gGameFrameCount & 3)) { spB0 = (((gGameFrameCount & 0xC) >> 2) + 4); for (i = 10; i < ARRAY_COUNT(gActors); i++) { if (gActors[i].obj.status == OBJ_FREE) { - func_i6_801A07FC(&gActors[spB0], &gActors[i]); + SectorY_801A07FC(&gActors[spB0], &gActors[i]); break; } } @@ -2548,8 +2551,9 @@ void func_i6_801A0AC0(Player* player) { for (i = 0; i < 10; i++) { if (gPlayerShots[i].obj.status == OBJ_FREE) { - func_8006ECBC(PLAYERSHOT_1, &gPlayerShots[i], 100, gActors[8].obj.pos.x, - gActors[8].obj.pos.y - 200.0f, sp80, sp98.x, sp98.y, sp98.z, sp88, sp84, 0.0f); + func_enmy2_8006ECBC(PLAYERSHOT_1, &gPlayerShots[i], 100, gActors[8].obj.pos.x, + gActors[8].obj.pos.y - 200.0f, sp80, sp98.x, sp98.y, sp98.z, sp88, sp84, + 0.0f); gPlayerShots[i].unk_64 = 200; break; } @@ -2560,7 +2564,7 @@ void func_i6_801A0AC0(Player* player) { gCsCamAtX = gActors[5].obj.pos.x; gCsCamAtY = 0.0f; gCsCamAtZ = gActors[5].obj.pos.z; - Math_SmoothStepToF(D_80177A48, 1.0f, 1.0f, 0.005f, 0.0f); + Math_SmoothStepToF(D_ctx_80177A48, 1.0f, 1.0f, 0.005f, 0.0f); gActors[5].vel.x = gActors[6].vel.x = gActors[7].vel.x = 80.0f; } if (gCsFrameCount >= 189) { @@ -2576,7 +2580,7 @@ void func_i6_801A0AC0(Player* player) { for (i = 10; i < ARRAY_COUNT(gActors); i++) { if (gActors[i].obj.status == OBJ_FREE) { - func_i6_801A07FC(&gActors[11], &gActors[i]); + SectorY_801A07FC(&gActors[11], &gActors[i]); break; } } @@ -2612,17 +2616,17 @@ void func_i6_801A0AC0(Player* player) { spA4.y = RAND_FLOAT_CENTERED(500.0f) + -500.0f; spA4.z = RAND_FLOAT_CENTERED(5000.0f) + 170.0f; Matrix_MultVec3f(gCalcMatrix, &spA4, &sp98); - func_8007C120(gActors[8].obj.pos.x + sp98.x, gActors[8].obj.pos.y + sp98.y, - gActors[8].obj.pos.z + sp98.z, gActors[8].vel.x, gActors[8].vel.y, gActors[8].vel.z, 0.8f, - 5); - func_8007D2C8(gActors[8].obj.pos.x - 2000.0f + RAND_FLOAT_CENTERED(500.0f), - gActors[8].obj.pos.y - 500.0f + RAND_FLOAT_CENTERED(1000.0f), - gActors[8].obj.pos.z + RAND_FLOAT_CENTERED(3000.0f), 8); + func_effect_8007C120(gActors[8].obj.pos.x + sp98.x, gActors[8].obj.pos.y + sp98.y, + gActors[8].obj.pos.z + sp98.z, gActors[8].vel.x, gActors[8].vel.y, + gActors[8].vel.z, 0.8f, 5); + func_effect_8007D2C8(gActors[8].obj.pos.x - 2000.0f + RAND_FLOAT_CENTERED(500.0f), + gActors[8].obj.pos.y - 500.0f + RAND_FLOAT_CENTERED(1000.0f), + gActors[8].obj.pos.z + RAND_FLOAT_CENTERED(3000.0f), 8); } if (gGameFrameCount & 0x14) { for (i = 12; i < ARRAY_COUNT(gActors); i++) { if (gActors[i].obj.status == OBJ_FREE) { - func_i6_801A0A08(&gActors[i], gActors[8].obj.pos.x + 1000.0f, + SectorY_801A0A08(&gActors[i], gActors[8].obj.pos.x + 1000.0f, (gActors[8].obj.pos.y + 2000.0f + (((gGameFrameCount & 3) - 2) * 2000.0f)) + RAND_FLOAT_CENTERED(4000.0f), (gActors[8].obj.pos.z + 4000.0f + (((gGameFrameCount & 3) - 2) * 3000.0f)) + @@ -2636,10 +2640,10 @@ void func_i6_801A0AC0(Player* player) { gActors[9].scale += 32.0f; if (gCsFrameCount >= 245) { gActors[9].fwork[4] += 8; - D_80178348 = 255; - D_80178350 = 255; - D_80178354 = 255; - D_80178358 = 255; + D_ctx_80178348 = 255; + D_ctx_80178350 = 255; + D_ctx_80178354 = 255; + D_ctx_80178358 = 255; } else { gActors[9].fwork[4] = 0.5f; } @@ -2661,14 +2665,14 @@ void func_i6_801A0AC0(Player* player) { for (i = 0; i < 11; i++) { if (gPlayerShots[i].obj.status == OBJ_FREE) { - func_8006ECBC(PLAYERSHOT_1, &gPlayerShots[i], 100, gActors[8].obj.pos.x, - gActors[8].obj.pos.y, gActors[8].obj.pos.z, sp98.x, sp98.y, sp98.z, sp88, - sp84, 0.0f); + func_enmy2_8006ECBC(PLAYERSHOT_1, &gPlayerShots[i], 100, gActors[8].obj.pos.x, + gActors[8].obj.pos.y, gActors[8].obj.pos.z, sp98.x, sp98.y, sp98.z, + sp88, sp84, 0.0f); gPlayerShots[i].unk_64 = 0xAE; break; } } - func_i6_801A0510(&gActors[11], 8); + SectorY_801A0510(&gActors[11], 8); gActors[11].vel.x = 80.0f; gActors[11].vel.z = -10.0f; gActors[11].fwork[2] = 0.2f; @@ -2677,9 +2681,9 @@ void func_i6_801A0AC0(Player* player) { gActors[11].obj.rot.z = 0.0f; break; case 145: - func_8007BFFC(gActors[11].obj.pos.x, gActors[11].obj.pos.y, gActors[11].obj.pos.z, - gActors[11].vel.x, gActors[11].vel.y, gActors[11].vel.z, 8, 10); - func_8007B344(gActors[11].obj.pos.x, gActors[11].obj.pos.y, gActors[11].obj.pos.z, 8, 5); + func_effect_8007BFFC(gActors[11].obj.pos.x, gActors[11].obj.pos.y, gActors[11].obj.pos.z, + gActors[11].vel.x, gActors[11].vel.y, gActors[11].vel.z, 8, 10); + func_effect_8007B344(gActors[11].obj.pos.x, gActors[11].obj.pos.y, gActors[11].obj.pos.z, 8, 5); AUDIO_PLAY_SFX(0x2903A060, gActors[11].sfxSource, 4); break; case 188: @@ -2691,7 +2695,7 @@ void func_i6_801A0AC0(Player* player) { case 150: Object_Kill(&gActors[11].obj, gActors[11].sfxSource); for (i = 10; i < 24; i++) { - func_i6_801A3B50(gActors[11].obj.pos.x, gActors[11].obj.pos.y, gActors[11].obj.pos.z, + SectorY_801A3B50(gActors[11].obj.pos.x, gActors[11].obj.pos.y, gActors[11].obj.pos.z, RAND_FLOAT_CENTERED(50.0f), RAND_FLOAT_CENTERED(50.0f), RAND_FLOAT_CENTERED(50.0f), i); } @@ -2714,16 +2718,16 @@ void func_i6_801A0AC0(Player* player) { gActors[9].iwork[6] = 255; gActors[9].iwork[7] = 100; AUDIO_PLAY_SFX(0x2940F026, gActors[5].sfxSource, 4); - D_801779A8[gMainController] = 100.0f; + D_ctx_801779A8[gMainController] = 100.0f; break; case 260: gActors[9].fwork[4] = gActors[9].scale = 1000; gActors[9].obj.pos.x = -8300.0f; - D_80178348 = 255; - D_80178350 = 255; - D_80178354 = 255; - D_80178340 = 255; - D_80178358 = 0; + D_ctx_80178348 = 255; + D_ctx_80178350 = 255; + D_ctx_80178354 = 255; + D_ctx_80178340 = 255; + D_ctx_80178358 = 0; Object_Kill(&gActors[8].obj, gActors[8].sfxSource); player->unk_1D0++; player->camEye.x = gCsCamEyeX = 0.0f; @@ -2748,32 +2752,32 @@ void func_i6_801A0AC0(Player* player) { gActors[7].obj.pos.z = 100.0f; gActors[7].obj.rot.x = 359.0f; gActors[7].obj.rot.z = 60.0f; - D_80177A48[0] = 0.0f; - D_80177A48[1] = D_80177A48[2] = D_80177A48[3] = D_80177A48[4] = 0.0f; + D_ctx_80177A48[0] = 0.0f; + D_ctx_80177A48[1] = D_ctx_80177A48[2] = D_ctx_80177A48[3] = D_ctx_80177A48[4] = 0.0f; break; } break; case 2: if (gCsFrameCount < 300) { - D_80178348 = 255; - D_80178350 = 255; - D_80178354 = 255; - D_80178340 = 255; - D_801784D4 = -58.0f; + D_ctx_80178348 = 255; + D_ctx_80178350 = 255; + D_ctx_80178354 = 255; + D_ctx_80178340 = 255; + D_ctx_801784D4 = -58.0f; } if (gCsFrameCount >= 300) { - Math_SmoothStepToF(&D_80177A48[1], 120.0f, 0.1f, D_80177A48[2], 0); - Math_SmoothStepToF(&D_80177A48[2], 2.0f, 0.1f, 0.05f, 0); - Math_SmoothStepToF(&D_80177A48[3], 100.0f, 1.0f, 1.0f, 0); - Math_SmoothStepToF(&D_80177A48[4], 400.0f, 1.0f, 10.0f, 0); + Math_SmoothStepToF(&D_ctx_80177A48[1], 120.0f, 0.1f, D_ctx_80177A48[2], 0); + Math_SmoothStepToF(&D_ctx_80177A48[2], 2.0f, 0.1f, 0.05f, 0); + Math_SmoothStepToF(&D_ctx_80177A48[3], 100.0f, 1.0f, 1.0f, 0); + Math_SmoothStepToF(&D_ctx_80177A48[4], 400.0f, 1.0f, 10.0f, 0); gCsCamAtX = player->camAt.x = gActors[5].obj.pos.x; - Matrix_RotateY(gCalcMatrix, D_80177A48[1] * M_DTOR, 0); - spA4.x = D_80177A48[4] + 400.0f; + Matrix_RotateY(gCalcMatrix, D_ctx_80177A48[1] * M_DTOR, 0); + spA4.x = D_ctx_80177A48[4] + 400.0f; spA4.y = 0.0f; spA4.z = 0.0f; Matrix_MultVec3fNoTranslate(gCalcMatrix, &spA4, &sp98); player->camEye.x = gCsCamEyeX = sp98.x; - player->camEye.y = gCsCamEyeY = D_80177A48[3] + sp98.y; + player->camEye.y = gCsCamEyeY = D_ctx_80177A48[3] + sp98.y; player->camEye.z = gCsCamEyeZ = sp98.z; } if (gCsFrameCount == 280) { @@ -2908,20 +2912,20 @@ void func_i6_801A0AC0(Player* player) { break; case 3: if (gCsFrameCount < 520) { - Math_SmoothStepToAngle(&D_80177A48[1], 120.0f, 0.1f, D_80177A48[2], 0); - Math_SmoothStepToF(&D_80177A48[2], 2.0f, 0.1f, 0.05f, 0); - Math_SmoothStepToF(&D_80177A48[3], 100.0f, 1.0f, 1.0f, 0); - Math_SmoothStepToF(&D_80177A48[4], 400.0f, 1.0f, 10.0f, 0); + Math_SmoothStepToAngle(&D_ctx_80177A48[1], 120.0f, 0.1f, D_ctx_80177A48[2], 0); + Math_SmoothStepToF(&D_ctx_80177A48[2], 2.0f, 0.1f, 0.05f, 0); + Math_SmoothStepToF(&D_ctx_80177A48[3], 100.0f, 1.0f, 1.0f, 0); + Math_SmoothStepToF(&D_ctx_80177A48[4], 400.0f, 1.0f, 10.0f, 0); if (gCsFrameCount <= 410) { gCsCamAtX = player->camAt.x = gActors[5].obj.pos.x; } - Matrix_RotateY(gCalcMatrix, D_80177A48[1] * M_DTOR, 0); - spA4.x = D_80177A48[4] + 400.0f; + Matrix_RotateY(gCalcMatrix, D_ctx_80177A48[1] * M_DTOR, 0); + spA4.x = D_ctx_80177A48[4] + 400.0f; spA4.y = 0.0f; spA4.z = 0.0f; Matrix_MultVec3fNoTranslate(gCalcMatrix, &spA4, &sp98); player->camEye.x = gCsCamEyeX = sp98.x; - player->camEye.y = gCsCamEyeY = D_80177A48[3] + sp98.y; + player->camEye.y = gCsCamEyeY = D_ctx_80177A48[3] + sp98.y; player->camEye.z = gCsCamEyeZ = sp98.z; } if (gCsFrameCount >= 390) { @@ -2991,7 +2995,7 @@ void func_i6_801A0AC0(Player* player) { } if (gCsFrameCount >= 470) { - Math_SmoothStepToAngle(&D_801784D4, 58.0f, 1.0f, 2.0f, 0.0f); + Math_SmoothStepToAngle(&D_ctx_801784D4, 58.0f, 1.0f, 2.0f, 0.0f); gActors[5].obj.rot.y += 1.2f; if (gActors[5].iwork[4] != 6) { gActors[5].obj.rot.z -= 0.25f; @@ -3010,7 +3014,7 @@ void func_i6_801A0AC0(Player* player) { gCsCamAtZ = player->pos.z; gCsCamEyeX = 50.0f; gCsCamEyeY = 10.0f; - Math_SmoothStepToF(D_80177A48, 1.0f, 0.1f, 0.005f, 0.0f); + Math_SmoothStepToF(D_ctx_80177A48, 1.0f, 0.1f, 0.005f, 0.0f); } if ((gActors[5].iwork[4] == 6) && (gCsFrameCount >= 550) && (gActors[5].obj.rot.y <= 174.0f)) { Math_SmoothStepToAngle(&gActors[5].obj.rot.z, 0.0f, 1.0f, 1.5f, 1.0f); @@ -3023,7 +3027,7 @@ void func_i6_801A0AC0(Player* player) { if ((gActors[5].iwork[4] == 6) && (gCsFrameCount == 550)) { Object_Kill(&gActors[10].obj, gActors[10].sfxSource); - D_80178488 = 1; + D_ctx_80178488 = 1; } if (gCsFrameCount >= 530) { Math_SmoothStepToF(&gActors[5].vel.z, -40.0f, 1.0f, 1.0f, 1.0f); @@ -3040,7 +3044,7 @@ void func_i6_801A0AC0(Player* player) { switch (gCsFrameCount) { case 390: - func_i6_801A07FC(&gActors[5], &gActors[10]); + SectorY_801A07FC(&gActors[5], &gActors[10]); gActors[5].vel.x -= 0.25f; gActors[5].vel.z -= 2.0f; break; @@ -3052,18 +3056,18 @@ void func_i6_801A0AC0(Player* player) { player->unk_0E8 = 80.0f; player->unk_0EC = 240.0f; for (i = 0; i < 3; i++) { - func_i6_801A06A4(&gActors[i], i); + SectorY_801A06A4(&gActors[i], i); } break; case 425: gActors[5].vel.x -= 0.5f; gActors[5].vel.z -= 1.5f; Object_Kill(&gActors[10].obj, gActors[10].sfxSource); - func_i6_801A07FC(&gActors[5], &gActors[10]); + SectorY_801A07FC(&gActors[5], &gActors[10]); break; case 435: Object_Kill(&gActors[10].obj, gActors[10].sfxSource); - func_i6_801A07FC(&gActors[5], &gActors[10]); + SectorY_801A07FC(&gActors[5], &gActors[10]); gActors[7].fwork[0] = 1.8f; AUDIO_PLAY_SFX(0x2902306C, gActors[7].sfxSource, 4); break; @@ -3074,7 +3078,7 @@ void func_i6_801A0AC0(Player* player) { gActors[5].vel.x -= 0.5f; gActors[5].vel.z -= 1.5f; Object_Kill(&gActors[10].obj, gActors[10].sfxSource); - func_i6_801A07FC(&gActors[5], &gActors[10]); + SectorY_801A07FC(&gActors[5], &gActors[10]); gActors[10].timer_0BC = 180; break; case 470: @@ -3098,7 +3102,7 @@ void func_i6_801A0AC0(Player* player) { gActors[5].fwork[0] = 1.8f; break; case 560: - D_80177A48[0] = 0.1f; + D_ctx_80177A48[0] = 0.1f; gActors[5].vel.x = gActors[5].vel.z = 0.0f; gActors[5].obj.rot.y = gActors[6].obj.rot.y = 180.0f; gActors[7].obj.rot.y = 140.0f; @@ -3111,7 +3115,7 @@ void func_i6_801A0AC0(Player* player) { case 4: Math_SmoothStepToAngle(&player->unk_0EC, 0.0f, 1.0f, 0.5f, 0); Math_SmoothStepToF(&gPlayer[0].pos.x, 0.0f, 1.0f, 1.0f, 0.0f); - Math_SmoothStepToF(D_80177A48, 1.0f, 0.1f, 0.05f, 0.0f); + Math_SmoothStepToF(D_ctx_80177A48, 1.0f, 0.1f, 0.05f, 0.0f); if (gCsFrameCount < 595) { Math_SmoothStepToF(&gActors[5].obj.pos.z, -12000.0f, 1.0f, 100.0f, 1.0f); Math_SmoothStepToF(&gActors[5].obj.pos.x, 0.0f, 1.0f, 40.0f, 1.0f); @@ -3142,7 +3146,7 @@ void func_i6_801A0AC0(Player* player) { Math_SmoothStepToF(&gCsCamEyeZ, player->pos.z + 400.0f, 1.0f, 80.0f, 0.0f); gCsCamAtZ = player->pos.z - 41.0f; gCsCamAtY = (player->pos.y * player->unk_148) + 20.0f; - Math_SmoothStepToF(D_80177A48, 1.0f, 0.1f, 0.1f, 0); + Math_SmoothStepToF(D_ctx_80177A48, 1.0f, 0.1f, 0.1f, 0); } switch (gCsFrameCount) { case 580: @@ -3152,9 +3156,9 @@ void func_i6_801A0AC0(Player* player) { } for (i = 5; i < 7; i++) { - func_i6_801A0510(&gActors[i + 2], i); + SectorY_801A0510(&gActors[i + 2], i); } - func_i6_801A0510(&gActors[9], 9); + SectorY_801A0510(&gActors[9], 9); break; case 590: Object_Kill(&gActors[0].obj, gActors[0].sfxSource); @@ -3168,11 +3172,11 @@ void func_i6_801A0AC0(Player* player) { gActors[7].obj.pos.z = -7100.0f; gActors[8].obj.pos.z = -8100.0f; gActors[9].obj.pos.z = -7100.0f; - D_80177A48[0] = 1.0f; + D_ctx_80177A48[0] = 1.0f; player->pos.z = player->unk_138 = 0.0f; - player->unk_0D0 = D_80161A54; + player->unk_0D0 = D_play_80161A54; AUDIO_PLAY_BGM(SEQ_ID_9 | 0x8000); - D_80177838 = 100; + D_ctx_80177838 = 100; player->state_1C8 = PLAYERSTATE_1C8_3; player->unk_1D0 = 0; player->timer_1F8 = 0; @@ -3197,12 +3201,12 @@ void func_i6_801A0AC0(Player* player) { } break; } - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 20000.0f, 0); - Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 20000.0f, 0); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 20000.0f, 0); - Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[0], 20000.0f, 0); - Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[0], 20000.0f, 0); - Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_ctx_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_ctx_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_ctx_80177A48[0], 20000.0f, 0); + Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_ctx_80177A48[0], 20000.0f, 0); Matrix_RotateY(gCalcMatrix, (player->unk_0E8 + 180.0f) * M_DTOR, 0); Matrix_RotateX(gCalcMatrix, -(player->unk_0E4 * M_DTOR), 1); spA4.x = 0.0f; @@ -3218,7 +3222,7 @@ void func_i6_801A0AC0(Player* player) { player->unk_138 = player->pos.z + player->unk_08C; } -void func_i6_801A39FC(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, s32 arg7) { +void SectorY_801A39FC(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, s32 arg7) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; actor->obj.id = OBJ_ACTOR_189; @@ -3234,18 +3238,18 @@ void func_i6_801A39FC(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 Object_SetInfo(&actor->info, actor->obj.id); } -void func_i6_801A3B50(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, s32 arg6) { +void SectorY_801A3B50(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, s32 arg6) { s32 i; for (i = 59; i >= 0; i--) { if (gActors[i].obj.status == OBJ_FREE) { - func_i6_801A39FC(&gActors[i], xPos, yPos, zPos, xVel, yVel, zVel, arg6); + SectorY_801A39FC(&gActors[i], xPos, yPos, zPos, xVel, yVel, zVel, arg6); break; } } } -void func_i6_801A3BD4(Actor* actor) { +void SectorY_801A3BD4(Actor* actor) { f32 sp1E4; f32 sp1E0; s32 i; @@ -3356,7 +3360,7 @@ void func_i6_801A3BD4(Actor* actor) { actor->timer_0C4 = 4; actor->fwork[19] = 30.0f; if (actor->iwork[19] < 0) { - func_8006F254(actor); + func_enmy2_8006F254(actor); } else { sp1E4 = gPlayer[0].pos.x; sp1E0 = gPlayer[0].pos.y; @@ -3364,7 +3368,7 @@ void func_i6_801A3BD4(Actor* actor) { gPlayer[0].pos.x += RAND_FLOAT_CENTERED(300.0f); gPlayer[0].pos.y += RAND_FLOAT_CENTERED(300.0f); } - func_8007F11C(0x162, actor->fwork[16], actor->fwork[17], actor->fwork[18], 100.0f); + func_effect_8007F11C(0x162, actor->fwork[16], actor->fwork[17], actor->fwork[18], 100.0f); gPlayer[0].pos.x = sp1E4; gPlayer[0].pos.y = sp1E0; AUDIO_PLAY_SFX(0x2900306B, actor->sfxSource, 4); @@ -3413,20 +3417,20 @@ void func_i6_801A3BD4(Actor* actor) { } sp4C = Animation_GetFrameData(&D_SY_6003348, actor->unk_0B6, sp68); if ((actor->timer_0BE % 4U) == 0) { - func_8007D2C8(RAND_FLOAT_CENTERED(150.0f) + actor->obj.pos.x, - RAND_FLOAT_CENTERED(150.0f) + actor->obj.pos.y, actor->obj.pos.z + 30.0f, 4.0f); + func_effect_8007D2C8(RAND_FLOAT_CENTERED(150.0f) + actor->obj.pos.x, + RAND_FLOAT_CENTERED(150.0f) + actor->obj.pos.y, actor->obj.pos.z + 30.0f, 4.0f); } if (actor->timer_0BE == 5U) { - func_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->vel.x, actor->vel.y, - actor->vel.z, 8.0f, 0xA); - func_8007B344(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 8.0f, 5); + func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->vel.x, actor->vel.y, + actor->vel.z, 8.0f, 0xA); + func_effect_8007B344(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 8.0f, 5); AUDIO_PLAY_SFX(0x2903A060, actor->sfxSource, 4); } if (actor->timer_0BE == 0) { Object_Kill(&actor->obj, actor->sfxSource); - func_80066254(actor); + func_enmy_80066254(actor); for (i = 10; i < 24; i++) { - func_i6_801A3B50(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, RAND_FLOAT_CENTERED(50.0f), + SectorY_801A3B50(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, RAND_FLOAT_CENTERED(50.0f), RAND_FLOAT_CENTERED(50.0f), actor->vel.z + RAND_FLOAT_CENTERED(50.0f), i); } } @@ -3521,8 +3525,8 @@ void func_i6_801A3BD4(Actor* actor) { } else { AUDIO_PLAY_SFX(0x2903300E, actor->sfxSource, 4); actor->timer_0C6 = 15; - func_8007C120(actor->unk_0D8.x, actor->unk_0D8.y, actor->unk_0D8.z, actor->vel.x, actor->vel.y, - actor->vel.z, 0.1f, 10); + func_effect_8007C120(actor->unk_0D8.x, actor->unk_0D8.y, actor->unk_0D8.z, actor->vel.x, actor->vel.y, + actor->vel.z, 0.1f, 10); actor->health -= actor->damage; if (actor->health <= 0) { @@ -3540,7 +3544,7 @@ static s32 D_i6_801A6B28[3] = { 255, 150, 150 }; static s32 D_i6_801A6B34[3] = { 150, 255, 150 }; static s32 D_i6_801A6B40[6] = { 150, 150, 255 }; -s32 func_i6_801A4A18(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +s32 SectorY_801A4A18(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { Actor* actor = (Actor*) data; if (limbIndex == 4) { @@ -3577,7 +3581,7 @@ s32 func_i6_801A4A18(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d return false; } -void func_i6_801A4C34(s32 limbIndex, Vec3f* rot, void* data) { +void SectorY_801A4C34(s32 limbIndex, Vec3f* rot, void* data) { Vec3f sp2C = { 40.0f, -30.0f, 0.0f }; Vec3f sp20; Actor* actor = (Actor*) data; @@ -3594,11 +3598,11 @@ static f32 D_i6_801A6B64[5] = { 0.3f, 0.7f, 1.3f, 0.7f, 0.3f, }; -void func_i6_801A4CB0(Actor* actor) { +void SectorY_801A4CB0(Actor* actor) { f32 scale; RCP_SetupDL_30(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); - Animation_DrawSkeleton(2, D_SY_602D140, actor->vwork, func_i6_801A4A18, func_i6_801A4C34, actor, gCalcMatrix); + Animation_DrawSkeleton(2, D_SY_602D140, actor->vwork, SectorY_801A4A18, SectorY_801A4C34, actor, gCalcMatrix); if (actor->timer_0C4 != 0) { scale = D_i6_801A6B64[actor->timer_0C4]; @@ -3607,7 +3611,7 @@ void func_i6_801A4CB0(Actor* actor) { gDPSetEnvColor(gMasterDisp++, 255, 48, 0, 255); Matrix_Pop(&gGfxMatrix); Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, actor->fwork[16], actor->fwork[17], actor->fwork[18] + D_80177D20, 1); + Matrix_Translate(gGfxMatrix, actor->fwork[16], actor->fwork[17], actor->fwork[18] + D_ctx_80177D20, 1); Matrix_Scale(gGfxMatrix, scale, scale, scale, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -3615,7 +3619,7 @@ void func_i6_801A4CB0(Actor* actor) { } } -void func_i6_801A4E44(Object_80* obj80) { +void SectorY_801A4E44(Object_80* obj80) { Vec3f sp3C; Vec3f sp30; @@ -3631,30 +3635,30 @@ void func_i6_801A4E44(Object_80* obj80) { sp3C.y = RAND_FLOAT_CENTERED(900.0f) + -150.0f; sp3C.z = 90.0f - RAND_FLOAT(50.0f); Matrix_MultVec3f(gCalcMatrix, &sp3C, &sp30); - func_8007C120(obj80->obj.pos.x + sp30.x, obj80->obj.pos.y + sp30.y, obj80->obj.pos.z + sp30.z, obj80->unk_58, - obj80->unk_5C, obj80->unk_60, 0.2f, 5); + func_effect_8007C120(obj80->obj.pos.x + sp30.x, obj80->obj.pos.y + sp30.y, obj80->obj.pos.z + sp30.z, + obj80->unk_58, obj80->unk_5C, obj80->unk_60, 0.2f, 5); sp3C.x = RAND_FLOAT_CENTERED(100.0f) + -500.0f; sp3C.y = RAND_FLOAT_CENTERED(900.0f); sp3C.z = 80.0f - RAND_FLOAT(50.0f); Matrix_MultVec3f(gCalcMatrix, &sp3C, &sp30); - func_8007C120(obj80->obj.pos.x + sp30.x, obj80->obj.pos.y + sp30.y, obj80->obj.pos.z + sp30.z, obj80->unk_58, - obj80->unk_5C, obj80->unk_60, 0.2f, 5); + func_effect_8007C120(obj80->obj.pos.x + sp30.x, obj80->obj.pos.y + sp30.y, obj80->obj.pos.z + sp30.z, + obj80->unk_58, obj80->unk_5C, obj80->unk_60, 0.2f, 5); sp3C.x = RAND_FLOAT_CENTERED(100.0f) + 500.0f; sp3C.y = RAND_FLOAT_CENTERED(900.0f) + -50.0f; sp3C.z = 1900.0f - RAND_FLOAT(50.0f); Matrix_MultVec3f(gCalcMatrix, &sp3C, &sp30); - func_8007C120(obj80->obj.pos.x + sp30.x, obj80->obj.pos.y + sp30.y, obj80->obj.pos.z + sp30.z, obj80->unk_58, - obj80->unk_5C, obj80->unk_60, 0.2f, 5); + func_effect_8007C120(obj80->obj.pos.x + sp30.x, obj80->obj.pos.y + sp30.y, obj80->obj.pos.z + sp30.z, + obj80->unk_58, obj80->unk_5C, obj80->unk_60, 0.2f, 5); sp3C.x = RAND_FLOAT_CENTERED(100.0f) + -1000.0f; sp3C.y = RAND_FLOAT_CENTERED(900.0f) + -250.0f; sp3C.z = 1100.0f - RAND_FLOAT(50.0f); Matrix_MultVec3f(gCalcMatrix, &sp3C, &sp30); - func_8007C120(obj80->obj.pos.x + sp30.x, obj80->obj.pos.y + sp30.y, obj80->obj.pos.z + sp30.z, obj80->unk_58, - obj80->unk_5C, obj80->unk_60, 0.2f, 5); + func_effect_8007C120(obj80->obj.pos.x + sp30.x, obj80->obj.pos.y + sp30.y, obj80->obj.pos.z + sp30.z, + obj80->unk_58, obj80->unk_5C, obj80->unk_60, 0.2f, 5); } } -void func_i6_801A52B8(Object_80* obj80) { +void SectorY_801A52B8(Object_80* obj80) { Vec3f sp44; Vec3f sp38; @@ -3670,13 +3674,13 @@ void func_i6_801A52B8(Object_80* obj80) { sp44.y = RAND_FLOAT_CENTERED(300.0f) + -100.0f; sp44.z = RAND_FLOAT_CENTERED(5000.0f) + 500.0f; Matrix_MultVec3f(gCalcMatrix, &sp44, &sp38); - func_8007C120(obj80->obj.pos.x + sp38.x, obj80->obj.pos.y + sp38.y, obj80->obj.pos.z + sp38.z, obj80->unk_58, - obj80->unk_5C, obj80->unk_60, 0.3f, 5); + func_effect_8007C120(obj80->obj.pos.x + sp38.x, obj80->obj.pos.y + sp38.y, obj80->obj.pos.z + sp38.z, + obj80->unk_58, obj80->unk_5C, obj80->unk_60, 0.3f, 5); sp44.x = RAND_FLOAT_CENTERED(100.0f) + -600.0f; sp44.y = RAND_FLOAT_CENTERED(250.0f) + 300.0f; sp44.z = RAND_FLOAT_CENTERED(1500.0f) + -1650.0f; Matrix_MultVec3f(gCalcMatrix, &sp44, &sp38); - func_8007C120(obj80->obj.pos.x + sp38.x, obj80->obj.pos.y + sp38.y, obj80->obj.pos.z + sp38.z, obj80->unk_58, - obj80->unk_5C, obj80->unk_60, 0.2f, 5); + func_effect_8007C120(obj80->obj.pos.x + sp38.x, obj80->obj.pos.y + sp38.y, obj80->obj.pos.z + sp38.z, + obj80->unk_58, obj80->unk_5C, obj80->unk_60, 0.2f, 5); } } diff --git a/src/overlays/ovl_i6/fox_i6_4.c b/src/overlays/ovl_i6/fox_turret.c similarity index 92% rename from src/overlays/ovl_i6/fox_i6_4.c rename to src/overlays/ovl_i6/fox_turret.c index 9dc7e27f..595a9a74 100644 --- a/src/overlays/ovl_i6/fox_i6_4.c +++ b/src/overlays/ovl_i6/fox_turret.c @@ -1,6 +1,6 @@ #include "global.h" -void func_i6_801A5560(Player* player, PlayerShot* shot, f32 xOffset, f32 yOffset, f32 zOffset, s32 shotId, f32 speed) { +void Turret_801A5560(Player* player, PlayerShot* shot, f32 xOffset, f32 yOffset, f32 zOffset, s32 shotId, f32 speed) { Vec3f sp4C; Vec3f sp40; Vec3f sp34; @@ -54,20 +54,20 @@ void func_i6_801A5560(Player* player, PlayerShot* shot, f32 xOffset, f32 yOffset shot->playerNum = player->num; } -void func_i6_801A581C(Player* player, f32 xOffset) { +void Turret_801A581C(Player* player, f32 xOffset) { s32 i; PlayerShot* shot; for (i = 0; i < ARRAY_COUNT(gPlayerShots); i++) { if (gPlayerShots[i].obj.status == 0) { - func_i6_801A5560(player, &gPlayerShots[i], xOffset, -100.0f, 200.0f, PLAYERSHOT_9, 100.0f); - func_800A6028(gPlayerShots[i].sfxSource, 0x09000000); + Turret_801A5560(player, &gPlayerShots[i], xOffset, -100.0f, 200.0f, PLAYERSHOT_9, 100.0f); + func_play_800A6028(gPlayerShots[i].sfxSource, 0x09000000); break; } } } -void func_i6_801A58A8(Player* player) { +void Turret_801A58A8(Player* player) { s32 i; if (gControllerPress[player->num].button & A_BUTTON) { @@ -75,8 +75,8 @@ void func_i6_801A58A8(Player* player) { } if (gControllerHold[player->num].button & A_BUTTON) { if (player->timer_244 == 0) { - func_i6_801A581C(player, -100.0f); - func_i6_801A581C(player, 100.0f); + Turret_801A581C(player, -100.0f); + Turret_801A581C(player, 100.0f); player->unk_1BC = 30; } player->timer_244++; @@ -127,7 +127,7 @@ void func_i6_801A58A8(Player* player) { } } -void func_i6_801A5AD4(Player* player) { +void Turret_801A5AD4(Player* player) { f32 sp2C; f32 sp28; @@ -146,7 +146,7 @@ void func_i6_801A5AD4(Player* player) { if (player->unk_1BC == 0) { gControllerLock = 0; player->unk_1B0++; - D_80177838 = 50; + D_ctx_80177838 = 50; } } sp2C = (f32) gControllerPress[player->num].stick_x; @@ -157,8 +157,8 @@ void func_i6_801A5AD4(Player* player) { player->unk_140 = -gActors[player->unk_1B4].vel.z; player->unk_144 += player->unk_140; - D_80177D08 = player->unk_140; - D_80177D20 = player->unk_144; + D_ctx_80177D08 = player->unk_140; + D_ctx_80177D20 = player->unk_144; if (!(gControllerHold[player->num].button & Z_TRIG) && (sqrtf((sp2C * sp2C) + (sp28 * sp28)) > 55.0f)) { if ((gControllerHold[player->num].button & R_CBUTTONS) || (sp2C > 40.0f)) { @@ -205,10 +205,10 @@ void func_i6_801A5AD4(Player* player) { } Math_SmoothStepToF(&player->unk_180, -player->unk_008, 0.5f, 3.0f, 0.00001f); Math_SmoothStepToF(&player->unk_17C, -player->unk_00C, 0.5f, 3.0f, 0.00001f); - func_i6_801A58A8(player); + Turret_801A58A8(player); } -void func_i6_801A5FC0(Player* player) { +void Turret_801A5FC0(Player* player) { Vec3f sp3C; Vec3f sp30; @@ -226,13 +226,13 @@ void func_i6_801A5FC0(Player* player) { Matrix_MultVec3f(gCalcMatrix, &sp3C, &sp30); player->camAt.x = player->pos.x + sp30.x; player->camAt.y = player->pos.y + sp30.y; - player->camAt.z = player->pos.z + D_80177D20 + sp30.z; + player->camAt.z = player->pos.z + D_ctx_80177D20 + sp30.z; player->camEye.x = player->pos.x; player->camEye.y = player->pos.y; - player->camEye.z = player->pos.z + D_80177D20; + player->camEye.z = player->pos.z + D_ctx_80177D20; } -void func_i6_801A6164(Player* player) { +void Turret_801A6164(Player* player) { static f32 D_i6_801A6B80 = -100.0f; if (gControllerHold[player->num].button & U_JPAD) { diff --git a/src/overlays/ovl_i6/fox_ve2.c b/src/overlays/ovl_i6/fox_ve2.c index 2f7732e3..dd5f51e6 100644 --- a/src/overlays/ovl_i6/fox_ve2.c +++ b/src/overlays/ovl_i6/fox_ve2.c @@ -1,11 +1,11 @@ #include "global.h" #include "assets/ast_venom_2.h" -void func_i6_80196210(Boss* boss) { +void Venom2_80196210(Boss* boss) { Math_SmoothStepToF(&boss->fwork[0], boss->fwork[1], 0.5f, 5.0f, 0.0f); } -s32 func_i6_8019624C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +s32 Venom2_8019624C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { Boss* boss = (Boss*) data; if ((limbIndex == 1) || (limbIndex == 2)) { @@ -15,13 +15,13 @@ s32 func_i6_8019624C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d return false; } -void func_i6_80196288(Boss* boss) { +void Venom2_80196288(Boss* boss) { Animation_GetFrameData(&D_VE2_6014904, 0, boss->vwork); - Animation_DrawSkeleton(3, D_VE2_60149D0, boss->vwork, func_i6_8019624C, NULL, boss, gCalcMatrix); + Animation_DrawSkeleton(3, D_VE2_60149D0, boss->vwork, Venom2_8019624C, NULL, boss, gCalcMatrix); } -void func_i6_801962F4(Actor* actor) { - func_8002F69C(actor); +void Venom2_801962F4(Actor* actor) { + func_360_8002F69C(actor); } static Vec3f D_i6_801A68B0[6] = { @@ -31,7 +31,7 @@ static Vec3f D_i6_801A68B0[6] = { static f32 D_i6_801A68F8[3] = { 300.0f, 70.0f, 280.0f }; -void func_i6_80196314(Actor* actor) { +void Venom2_80196314(Actor* actor) { Actor* otherActor; Actor* actor4 = &gActors[4]; Player* player = &gPlayer[0]; @@ -39,12 +39,12 @@ void func_i6_80196314(Actor* actor) { switch (actor->state) { case 0: - D_8015F928 = 0; - D_8015F908 = 0; + D_360_8015F928 = 0; + D_360_8015F908 = 0; for (i = 0; i < 6; i++) { - D_80177CF0[i] = 1; - D_80177CD0[i] = 1; + D_ctx_80177CF0[i] = 1; + D_ctx_80177CD0[i] = 1; } if (player->state_1C8 == PLAYERSTATE_1C8_3) { @@ -52,11 +52,11 @@ void func_i6_80196314(Actor* actor) { player->pos.x = 0.0f; player->pos.z = 8000.0f; player->pos.y = 670.0f; - D_800C9B4C = 120; - D_8015F908 = 1000; + D_360_800C9B4C = 120; + D_360_8015F908 = 1000; } else { - D_800C9B4C = 320; - D_8015F908 = 1200; + D_360_800C9B4C = 320; + D_360_8015F908 = 1200; actor->state = 1; player->pos.x = 0.0f; player->pos.z = 16000.0f; @@ -72,9 +72,9 @@ void func_i6_80196314(Actor* actor) { otherActor->unk_0F4.x = 340.0f; } - D_80178340 = D_80178358 = 255; + D_ctx_80178340 = D_ctx_80178358 = 255; } - func_800B63BC(player, 1); + func_play_800B63BC(player, 1); /* fallthrough */ case 1: @@ -86,16 +86,16 @@ void func_i6_80196314(Actor* actor) { actor->state = 2; player->state_1C8 = PLAYERSTATE_1C8_3; player->unk_014 = 0.0001f; - D_80177838 = 80; + D_ctx_80177838 = 80; } } - if (D_8015F928 == 80) { + if (D_360_8015F928 == 80) { Radio_PlayMessage(gMsg_ID_19010, RCID_FOX); } break; case 2: - func_i6_801962F4(actor); - if (((D_800C9B4C + 100) < D_8015F928) && (gActors[4].obj.status == OBJ_FREE) && + Venom2_801962F4(actor); + if (((D_360_800C9B4C + 100) < D_360_8015F928) && (gActors[4].obj.status == OBJ_FREE) && (gActors[5].obj.status == OBJ_FREE) && (gActors[6].obj.status == OBJ_FREE) && (gActors[7].obj.status == OBJ_FREE) && (actor->timer_0BE == 0)) { actor->timer_0BE = 80; @@ -103,26 +103,26 @@ void func_i6_80196314(Actor* actor) { if ((actor->timer_0BE == 1) && (player->state_1C8 != PLAYERSTATE_1C8_7)) { for (i = 1; i < ARRAY_COUNT(gTeamShields); i++) { - D_80177C38[i] = gSavedTeamShields[i]; - D_801778F0[i] = gSavedTeamShields[i]; + D_ctx_80177C38[i] = gSavedTeamShields[i]; + D_ctx_801778F0[i] = gSavedTeamShields[i]; gSavedTeamShields[i] = gTeamShields[i]; } player->state_1C8 = PLAYERSTATE_1C8_7; player->unk_1D0 = 0; - D_800D3180[gCurrentLevel] = 2; - D_80177C94 = gGoldRingCount[0]; - D_80177C9C = player->shields + 1; - D_80161A5C = D_80177CA4 = gHitCount; - D_80177CAC = player->wings.rightState; - D_80177CB4 = player->wings.leftState; - D_80177CBC = gRightWingHealth[0]; - D_80177CC4 = gLeftWingHealth[0]; + D_play_800D3180[gCurrentLevel] = 2; + D_ctx_80177C94 = gGoldRingCount[0]; + D_ctx_80177C9C = player->shields + 1; + D_play_80161A5C = D_ctx_80177CA4 = gHitCount; + D_ctx_80177CAC = player->wings.rightState; + D_ctx_80177CB4 = player->wings.leftState; + D_ctx_80177CBC = gRightWingHealth[0]; + D_ctx_80177CC4 = gLeftWingHealth[0]; } break; case 3: - D_801779BC = 0; - if (D_8015F908 < 600) { + D_ctx_801779BC = 0; + if (D_360_8015F908 < 600) { player->camEye.x += actor4->vel.x * 0.23f; player->camEye.y += actor4->vel.y * 0.23f; player->camEye.z += actor4->vel.z * 0.23f; @@ -131,19 +131,19 @@ void func_i6_80196314(Actor* actor) { Math_SmoothStepToF(&player->camAt.y, actor4->obj.pos.y, 1.0f, 20000.0f, 0.0f); Math_SmoothStepToF(&player->camAt.z, actor4->obj.pos.z, 1.0f, 20000.0f, 0.0f); Math_SmoothStepToF(&player->unk_034, 0, 0.1f, 0.2f, 0.0f); - if ((gControllerPress->button & START_BUTTON) || (D_8015F928 == (D_800C9B4C + 300))) { + if ((gControllerPress->button & START_BUTTON) || (D_360_8015F928 == (D_360_800C9B4C + 300))) { actor->state = 2; player->state_1C8 = PLAYERSTATE_1C8_3; - func_800B7184(player, 1); + func_play_800B7184(player, 1); player->unk_014 = 0.0f; - D_80161708 = 0; + D_hud_80161708 = 0; } break; } - if (D_8015F908 != 0) { - D_8015F908--; + if (D_360_8015F908 != 0) { + D_360_8015F908--; - switch (D_8015F908) { + switch (D_360_8015F908) { case 860: Radio_PlayMessage(gMsg_ID_19200, RCID_WOLF); break; @@ -166,27 +166,27 @@ void func_i6_80196314(Actor* actor) { } } -void func_i6_80196968(void) { +void Venom2_80196968(void) { Actor* actor; Boss* boss; Object_58* obj58; s32 i; - D_80178310 = SEGMENTED_TO_VIRTUAL(D_800CFDA0[gCurrentLevel]); + D_ctx_80178310 = SEGMENTED_TO_VIRTUAL(D_enmy_800CFDA0[gCurrentLevel]); for (obj58 = gObjects58, i = 0; i < 1000; i++) { - if (D_80178310[i].id < 0) { + if (D_ctx_80178310[i].id < 0) { break; } - if (D_80178310[i].id <= OBJ_80_160) { + if (D_ctx_80178310[i].id <= OBJ_80_160) { Object_58_Initialize(obj58); obj58->obj.status = OBJ_ACTIVE; - obj58->obj.id = D_80178310[i].id; - obj58->sfxSource[0] = obj58->obj.pos.x = D_80178310[i].xPos; - obj58->sfxSource[1] = obj58->obj.pos.y = D_80178310[i].yPos; - obj58->sfxSource[2] = obj58->obj.pos.z = -D_80178310[i].zPos1; - obj58->unk_54 = obj58->obj.rot.y = D_80178310[i].rot.y; + obj58->obj.id = D_ctx_80178310[i].id; + obj58->sfxSource[0] = obj58->obj.pos.x = D_ctx_80178310[i].xPos; + obj58->sfxSource[1] = obj58->obj.pos.y = D_ctx_80178310[i].yPos; + obj58->sfxSource[2] = obj58->obj.pos.z = -D_ctx_80178310[i].zPos1; + obj58->unk_54 = obj58->obj.rot.y = D_ctx_80178310[i].rot.y; Object_SetInfo(&obj58->info, obj58->obj.id); @@ -195,18 +195,18 @@ void func_i6_80196968(void) { } for (actor = &gActors[30], i = 0; i < 1000; i++) { - if (D_80178310[i].id < 0) { + if (D_ctx_80178310[i].id < 0) { break; } - if ((D_80178310[i].id >= OBJ_ACTOR_176) && (D_80178310[i].id <= OBJ_ACTOR_291)) { + if ((D_ctx_80178310[i].id >= OBJ_ACTOR_176) && (D_ctx_80178310[i].id <= OBJ_ACTOR_291)) { Actor_Initialize(actor); actor->obj.status = OBJ_INIT; - actor->obj.id = D_80178310[i].id; - actor->fwork[10] = actor->obj.pos.x = D_80178310[i].xPos; - actor->fwork[11] = actor->obj.pos.y = D_80178310[i].yPos; - actor->fwork[12] = actor->obj.pos.z = -D_80178310[i].zPos1; - actor->fwork[13] = actor->obj.rot.y = D_80178310[i].rot.y; + actor->obj.id = D_ctx_80178310[i].id; + actor->fwork[10] = actor->obj.pos.x = D_ctx_80178310[i].xPos; + actor->fwork[11] = actor->obj.pos.y = D_ctx_80178310[i].yPos; + actor->fwork[12] = actor->obj.pos.z = -D_ctx_80178310[i].zPos1; + actor->fwork[13] = actor->obj.rot.y = D_ctx_80178310[i].rot.y; Object_SetInfo(&actor->info, actor->obj.id); actor++; } @@ -218,14 +218,14 @@ void func_i6_80196968(void) { Object_SetInfo(&boss->info, boss->obj.id); } -void func_i6_80196BF8(Player* player) { +void Venom2_80196BF8(Player* player) { Vec3f vec; Vec3f vel; f32 temp_fv0; if (gCsFrameCount > 50) { - D_8017835C = 3; - D_80178358 = 0; + D_ctx_8017835C = 3; + D_ctx_80178358 = 0; } Matrix_RotateY(gCalcMatrix, (player->unk_114 + player->unk_0E8 + 180.0f) * M_DTOR, 0); Matrix_RotateX(gCalcMatrix, -((player->unk_120 + player->unk_0E4 + player->unk_4D8) * M_DTOR), 1); @@ -250,7 +250,7 @@ void func_i6_80196BF8(Player* player) { player->camAt.z = player->pos.z; } -void func_i6_80196D88(Player* player) { +void Venom2_80196D88(Player* player) { s32 i; f32 var_fa0; f32 sp94; @@ -296,10 +296,10 @@ void func_i6_80196D88(Player* player) { player->unk_1D0++; player->wings.unk_04 = player->wings.unk_0C = player->wings.unk_08 = player->wings.unk_10 = 0.0f; player->wings.unk_2C = 1; - D_80177A48[0] = 0.0f; - D_80177A48[1] = 0.1f; - D_80177A48[3] = 0.0f; - D_80177A48[4] = 0.0f; + D_ctx_80177A48[0] = 0.0f; + D_ctx_80177A48[1] = 0.1f; + D_ctx_80177A48[3] = 0.0f; + D_ctx_80177A48[4] = 0.0f; player->timer_1F8 = 0; if ((fabsf(sp94) < 4000.0f) && (fabsf(sp8C) < 4000.0f)) { player->timer_1F8 = 250; @@ -308,10 +308,10 @@ void func_i6_80196D88(Player* player) { sp64.z = 5000.0f; Matrix_RotateY(gCalcMatrix, player->unk_114, 0); Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp64, &sp58); - D_80177A48[5] = sp58.x; - D_80177A48[6] = sp58.z; + D_ctx_80177A48[5] = sp58.x; + D_ctx_80177A48[6] = sp58.z; } - if (D_8017827C == 2) { + if (D_ctx_8017827C == 2) { player->timer_1FC = 240; } else { player->timer_1FC = 180; @@ -320,32 +320,32 @@ void func_i6_80196D88(Player* player) { SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 60); /* fallthrough */ case 1: - if (D_8017827C == 2) { - D_8017835C = 2; - D_80178358 = 0; - D_80178348 = D_80178350 = D_80178354 = 255; + if (D_ctx_8017827C == 2) { + D_ctx_8017835C = 2; + D_ctx_80178358 = 0; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 255; } - Math_SmoothStepToF(&D_80177A48[1], 0.8f, 1.0f, 0.05f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[1], 0.8f, 1.0f, 0.05f, 0.0f); Math_SmoothStepToF(&player->unk_12C, 0.0f, 0.1f, 15.0f, 0.0f); if (player->timer_1F8 == 1) { - D_80177A48[4] = 0.0f; + D_ctx_80177A48[4] = 0.0f; } if (player->timer_1F8 != 0) { - sp94 = player->pos.x - (gBosses[0].obj.pos.x + D_80177A48[5]); + sp94 = player->pos.x - (gBosses[0].obj.pos.x + D_ctx_80177A48[5]); sp90 = player->pos.y - (gBosses[0].obj.pos.y + 700.0f); - sp8C = player->pos.z - (gBosses[0].obj.pos.z + D_80177A48[6]); + sp8C = player->pos.z - (gBosses[0].obj.pos.z + D_ctx_80177A48[6]); } sp84 = Math_RadToDeg(Math_Atan2F(sp94, sp8C)); sp8C = sqrtf(SQ(sp94) + SQ(sp8C)); - Math_SmoothStepToAngle(&player->unk_120, Math_RadToDeg(-Math_Atan2F(sp90, sp8C)), 0.1f, D_80177A48[4], + Math_SmoothStepToAngle(&player->unk_120, Math_RadToDeg(-Math_Atan2F(sp90, sp8C)), 0.1f, D_ctx_80177A48[4], 0.0f); Math_SmoothStepToF(&player->unk_0EC, - Math_SmoothStepToAngle(&player->unk_114, sp84, 0.1f, D_80177A48[4], 0.0f) * 20.0f, 0.1f, - 3.0f, 0.0f); - Math_SmoothStepToF(&D_80177A48[4], 3.0f, 1.0f, 0.1f, 0.0f); + Math_SmoothStepToAngle(&player->unk_114, sp84, 0.1f, D_ctx_80177A48[4], 0.0f) * 20.0f, + 0.1f, 3.0f, 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[4], 3.0f, 1.0f, 0.1f, 0.0f); Matrix_RotateX(gCalcMatrix, -(D_PI / 9), 0); - Matrix_RotateY(gCalcMatrix, (D_80177A48[3] + player->unk_114) * M_DTOR, 1); - D_80177A48[3] += 1.0f; + Matrix_RotateY(gCalcMatrix, (D_ctx_80177A48[3] + player->unk_114) * M_DTOR, 1); + D_ctx_80177A48[3] += 1.0f; sp64.x = 0.0f; sp64.y = 0.0f; sp64.z = 400.0f; @@ -353,13 +353,13 @@ void func_i6_80196D88(Player* player) { gCsCamEyeX = player->pos.x + sp58.x; gCsCamEyeY = player->pos.y + sp58.y; gCsCamEyeZ = player->pos.z + sp58.z; - Math_SmoothStepToF(D_80177A48, 0.5f, 1.0f, 0.01f, 0.0f); + Math_SmoothStepToF(D_ctx_80177A48, 0.5f, 1.0f, 0.01f, 0.0f); Math_SmoothStepToF(&player->unk_034, 0.0f, 0.1f, 3.0f, 0.0f); if ((player->timer_1F8 == 0) && (fabsf(sp94) < 50.0f) && (fabsf(sp8C) < 50.0f)) { player->unk_1D0++; - D_80177A48[2] = 0.75f; - D_80177A48[3] = 0.0f; - D_80177A48[4] = 0.0f; + D_ctx_80177A48[2] = 0.75f; + D_ctx_80177A48[3] = 0.0f; + D_ctx_80177A48[4] = 0.0f; if (player->unk_120 >= 180.0f) { player->unk_120 -= 360.0f; @@ -373,21 +373,21 @@ void func_i6_80196D88(Player* player) { break; case 2: player->unk_190 = 2.0f; - Math_SmoothStepToF(&player->unk_120, 270.0f, 0.1f, D_80177A48[2], 0.0f); - Math_SmoothStepToF(&D_80177A48[2], 4.0f, 1.0f, 0.05f, 0.0f); + Math_SmoothStepToF(&player->unk_120, 270.0f, 0.1f, D_ctx_80177A48[2], 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[2], 4.0f, 1.0f, 0.05f, 0.0f); if (player->unk_120 > 80.0f) { Math_SmoothStepToF(&player->unk_12C, 10000.0f, 0.1f, 8.0f, 0.0f); } if (player->unk_120 > 250.0f) { - Math_SmoothStepToF(&player->pos.x, 0.0f, 0.3f, D_80177A48[3], 0.0f); - Math_SmoothStepToF(&player->pos.z, 0.0f, 0.3f, D_80177A48[3], 0.0f); - Math_SmoothStepToF(&D_80177A48[3], 30.0f, 1.0f, 1.0f, 0.0f); + Math_SmoothStepToF(&player->pos.x, 0.0f, 0.3f, D_ctx_80177A48[3], 0.0f); + Math_SmoothStepToF(&player->pos.z, 0.0f, 0.3f, D_ctx_80177A48[3], 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[3], 30.0f, 1.0f, 1.0f, 0.0f); } if (player->unk_120 > 200.0f) { - Math_SmoothStepToF(&D_80177A48[4], 20.0f, 1.0f, 1.0f, 0.0f); - Math_SmoothStepToF(&gCsCamEyeX, player->pos.x, 0.1f, D_80177A48[4], 0.0f); - Math_SmoothStepToF(&gCsCamEyeY, player->pos.y + 200.0f, 0.1f, D_80177A48[4], 0.0f); - Math_SmoothStepToF(&gCsCamEyeZ, player->pos.z, 0.1f, D_80177A48[4], 0.0f); + Math_SmoothStepToF(&D_ctx_80177A48[4], 20.0f, 1.0f, 1.0f, 0.0f); + Math_SmoothStepToF(&gCsCamEyeX, player->pos.x, 0.1f, D_ctx_80177A48[4], 0.0f); + Math_SmoothStepToF(&gCsCamEyeY, player->pos.y + 200.0f, 0.1f, D_ctx_80177A48[4], 0.0f); + Math_SmoothStepToF(&gCsCamEyeZ, player->pos.z, 0.1f, D_ctx_80177A48[4], 0.0f); } else { Math_SmoothStepToF(&gCsCamEyeY, player->pos.y, 0.1f, 2.0f, 0.0f); } @@ -398,21 +398,21 @@ void func_i6_80196D88(Player* player) { player->unk_190 = 5.0f; } if (gCsFrameCount > 110) { - D_80178358 = 255; - D_8017835C = 8; - D_80178348 = D_80178350 = D_80178354 = 0; - if (D_80178340 == 255) { + D_ctx_80178358 = 255; + D_ctx_8017835C = 8; + D_ctx_80178348 = D_ctx_80178350 = D_ctx_80178354 = 0; + if (D_ctx_80178340 == 255) { for (i = 1; i < ARRAY_COUNT(gTeamShields); i++) { - D_80177C38[i] = gSavedTeamShields[i]; - D_801778F0[i] = gSavedTeamShields[i]; + D_ctx_80177C38[i] = gSavedTeamShields[i]; + D_ctx_801778F0[i] = gSavedTeamShields[i]; gSavedTeamShields[i] = gTeamShields[i]; } gNextGameState = GSTATE_PLAY; gNextLevel = LEVEL_VENOM_ANDROSS; - if (D_800D3180[gCurrentLevel] != 0) { - D_80161A2E = 1; + if (D_play_800D3180[gCurrentLevel] != 0) { + D_game_80161A2E = 1; } func_8001CA24(0); Audio_KillSfxBySource(player->sfxSource); @@ -459,12 +459,12 @@ void func_i6_80196D88(Player* player) { player->unk_0F8 = player->unk_0EC + player->unk_12C + player->unk_130; Math_SmoothStepToF(&player->unk_130, 0.0f, 0.1f, 15.0f, 0.0f); Math_SmoothStepToAngle(&player->unk_4D8, 0.0f, 0.1f, 5.0f, 0.0f); - Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_80177A48[0], 100.0f, 0); - Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_80177A48[0], 100.0f, 0); - Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_80177A48[0], 100.0f, 0); - Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_80177A48[1], 100.0f, 0); - Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_80177A48[1], 100.0f, 0); - Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_80177A48[1], 100.0f, 0); + Math_SmoothStepToF(&player->camEye.x, gCsCamEyeX, D_ctx_80177A48[0], 100.0f, 0); + Math_SmoothStepToF(&player->camEye.y, gCsCamEyeY, D_ctx_80177A48[0], 100.0f, 0); + Math_SmoothStepToF(&player->camEye.z, gCsCamEyeZ, D_ctx_80177A48[0], 100.0f, 0); + Math_SmoothStepToF(&player->camAt.x, gCsCamAtX, D_ctx_80177A48[1], 100.0f, 0); + Math_SmoothStepToF(&player->camAt.y, gCsCamAtY, D_ctx_80177A48[1], 100.0f, 0); + Math_SmoothStepToF(&player->camAt.z, gCsCamAtZ, D_ctx_80177A48[1], 100.0f, 0); player->unk_088 += 10.0f; player->unk_080 = -SIN_DEG(player->unk_088) * 0.3f; player->unk_0F4 += 8.0f; diff --git a/src/overlays/ovl_menu/fox_i_menu.c b/src/overlays/ovl_menu/fox_i_menu.c index 7304b7e4..4f1b3ba3 100644 --- a/src/overlays/ovl_menu/fox_i_menu.c +++ b/src/overlays/ovl_menu/fox_i_menu.c @@ -1,33 +1,33 @@ #include "global.h" -void func_menu_80187754(void); -void func_menu_801878D8(void); +void Title_80187754(void); +void Title_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 Map_8019E85C(void); +void Map_8019E8C8(void); +void Map_8019E8D0(void); +void Map_801A01A8(void); s32 D_menu_801B7BA0; s32 D_menu_801AD9F0 = 0; -void func_menu_80187520(u32 mode, void* ptr) { +void OvlMenu_CallFunction(u32 mode, void* ptr) { switch (mode) { case 103: - func_menu_80187754(); + Title_80187754(); break; case 104: - func_menu_801878D8(); + Title_801878D8(); break; case 105: - func_menu_8019E8D0(); + Map_8019E8D0(); break; case 106: - func_menu_801A01A8(); + Map_801A01A8(); break; case 107: @@ -39,11 +39,11 @@ void func_menu_80187520(u32 mode, void* ptr) { break; case 109: - func_menu_8019E85C(); + Map_8019E85C(); break; case 110: - func_menu_8019E8C8(); + Map_8019E8C8(); default: break; diff --git a/src/overlays/ovl_menu/fox_map.c b/src/overlays/ovl_menu/fox_map.c index 682a97cb..131c5914 100644 --- a/src/overlays/ovl_menu/fox_map.c +++ b/src/overlays/ovl_menu/fox_map.c @@ -1107,116 +1107,116 @@ Gfx* D_menu_801B68F8[] = { D_menu_801B5B10, D_menu_801B5440, D_menu_801B50D8, D_menu_801B57A8, D_MAP_604DB10, }; -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(PlanetId start, PlanetId end); -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_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(PathType); -void func_menu_801AC9A0(s32); -void func_menu_801ACD90(s32 index, Vec3f* src, Vec3f* dest); -void func_menu_801AD048(void); +void Map_8019E800(void); +void Map_8019E99C(void); +void Map_8019F164(void); +void Map_8019F42C(void); +void Map_8019F600(void); +void Map_8019F910(void); +void Map_8019F97C(void); +void Map_8019F83C(void); +void Map_8019FA1C(void); +void Map_8019FC04(void); +s32 Map_8019FD1C(LevelId levelId, s32 arg1); +void Map_8019FF48(void); +s32 Map_801A05B4(void); +void Map_801A0788(void); +void Map_801A0954(void); +void Map_801A0D14(void); +void Map_801A1528(void); +void Map_801A116C(void); +void Map_801A19A8(void); +void Map_801A1C14(void); +bool Map_801A2304(void); +f32 Map_801A25C8(PlanetId); +void Map_801A2674(void); +void Map_801A281C(void); +void Map_801A2B8C(void); +void Map_801A2EB8(void); +void Map_801A3440(f32); +void Map_801A3550(Vec3f*, Vec3f*, Vec3f*, f32); +void Map_801A36A8(void); +void Map_801A3A00(void); +void Map_801A4394(void); +void Map_801A4650(void); +void Map_801A48C0(f32 speed); +void Map_801A4A38(f32 arg0); +void Map_801A4AE8(void); +void Map_801A4D0C(u32); +void Map_801A4D7C(void); +void Map_801A4F8C(void); +void Map_801A4FC4(void); +void Map_801A53C8(void); +void Map_801A5834(void); +void Map_801A5C90(void); +s32 Map_801A5770(void); +void Map_801A5E80(void); +void Map_801A6368(void); +void Map_801A61B4(LevelId level); +bool Map_801A62FC(PlanetId planet); +s32 Map_801A655C(PlanetId start, PlanetId end); +void Map_801A6628(void); +void Map_801A6694(void); +void Map_801A68E4(void); +void Map_801A6A24(void); +void Map_801A6A98(PlanetId); +s32 Map_801A6DAC(PlanetId planetId); +void Map_801A6EC0(PlanetId planetId); +void Map_801A7230(PlanetId planetId); +void Map_801A74F4(PlanetId); +void Map_801A7684(PlanetId planetId); +void Map_801A77B0(PlanetId planetId); +void Map_801A791C(PlanetId planetId); +void Map_801A7A84(PlanetId planetId); +void Map_801A7BEC(f32* zAngle, f32 next, f32 scale); +void Map_801A7D3C(PlanetId planetId); +void Map_801A7F1C(PlanetId planetId); +void Map_801A914C(void); +void Map_801A9EE4(void); +void Map_801AD11C(void); +void Map_801AD718(f32, f32, f32, f32*, f32*, f32*, f32, f32, f32); +PlanetId Map_GetPlanetId(LevelId level); +void Map_801A809C(PlanetId planetId); +void Map_801A8738(void); +void Map_801A89BC(PlanetId, s32); +void Map_801A8F40(void); +void Map_801A9224(void); +void Map_801A9448(void); +void Map_801A9814(void); +void Map_801A9910(void); +void Map_801A9A8C(void); +void Map_801A9DE8(void); +void Map_801AA1CC(s32); +void Map_801AA434(s32, f32, f32, s32); +void Map_801AA778(s32, f32, f32, PlanetId); +void Map_801AB17C(f32 x, f32 y, f32 z); +void Map_801AB284(void); +void Map_801AB300(void); +void Map_801AB978(s32); +void Map_801ABCDC(s32 arg0, s32 alpha); +void Map_801ABF1C(void); +void Map_801AC200(s32); +void Map_801AC530(s32 index); +void Map_801AC80C(PathType); +void Map_801AC9A0(s32); +void Map_801ACD90(s32 index, Vec3f* src, Vec3f* dest); +void Map_801AD048(void); -void func_menu_8019E800(void) { +void Map_8019E800(void) { Memory_FreeAll(); - func_800A5D6C(); - D_80178410 = 0; + func_play_800A5D6C(); + D_ctx_80178410 = 0; gNextGameState = 4; - D_80161A34 = 5; - D_80177868 = 2; + D_game_80161A34 = 5; + D_ctx_80177868 = 2; gDrawMode = DRAWMODE_0; } -void func_menu_8019E85C(void) { - switch (D_80177868) { +void Map_8019E85C(void) { + switch (D_ctx_80177868) { case 0: if (D_Timer_8017783C == 0) { - D_80177868 = 1; + D_ctx_80177868 = 1; } break; @@ -1224,15 +1224,15 @@ void func_menu_8019E85C(void) { break; case 1: - func_menu_8019E800(); + Map_8019E800(); break; } } -void func_menu_8019E8C8(void) { +void Map_8019E8C8(void) { } -void func_menu_8019E8D0(void) { +void Map_8019E8D0(void) { if (D_menu_801CD9B8 > 0) { D_menu_801CD9B8--; } @@ -1243,26 +1243,26 @@ void func_menu_8019E8D0(void) { D_menu_801CD9C0--; } - switch (D_80177B40) { + switch (D_ctx_80177B40) { case 0: if (D_Timer_8017783C == 0) { - D_80177B40 = 1; + D_ctx_80177B40 = 1; } break; case 1: gDrawMode = DRAWMODE_0; - func_menu_8019E99C(); + Map_8019E99C(); break; case 2: gDrawMode = DRAW_MAP; - func_menu_8019FF48(); + Map_8019FF48(); break; } } -void func_menu_8019E99C(void) { +void Map_8019E99C(void) { s32 i; s32 j; @@ -1271,9 +1271,9 @@ void func_menu_8019E99C(void) { D_80137E78 = 2; gGameFrameCount = 0; - func_menu_80188010(); + Title_80188010(); - D_menu_801CD83C = func_menu_801A05B4(); + D_menu_801CD83C = Map_801A05B4(); D_menu_801CD980 = 0; D_menu_801CD984 = 0; @@ -1326,9 +1326,9 @@ void func_menu_8019E99C(void) { D_menu_801CDA18 = 0.0f; D_menu_801CDA1C = 0.0f; - 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); + Map_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_menu_801CD8A0[i] = i; @@ -1336,11 +1336,11 @@ void func_menu_8019E99C(void) { D_menu_801CD960 = 0; - D_80178340 = 0xFF; - D_80178348 = 0; - D_80178350 = 0; - D_80178354 = 0; - D_80177D20 = 0.0f; + D_ctx_80178340 = 0xFF; + D_ctx_80178348 = 0; + D_ctx_80178350 = 0; + D_ctx_80178354 = 0; + D_ctx_80177D20 = 0.0f; D_menu_801CF018 = 0; @@ -1350,7 +1350,7 @@ void func_menu_8019E99C(void) { D_menu_801CEA5C = 0.0f; D_menu_801CEA60 = 0.0f; - func_menu_801A0788(); + Map_801A0788(); D_menu_801B8280 = 0; D_menu_801B8284 = 0; @@ -1375,24 +1375,24 @@ void func_menu_8019E99C(void) { sPaths[i].unk_14 = 0; } - func_menu_801A6694(); + Map_801A6694(); - switch (D_80161A34) { + switch (D_game_80161A34) { default: case 0: - func_menu_8019F600(); + Map_8019F600(); break; case 7: - func_menu_8019F164(); + Map_8019F164(); break; case 5: - func_menu_8019F42C(); + Map_8019F42C(); break; } - func_menu_801A914C(); + Map_801A914C(); for (i = 0; i < 96 * 96; i++) { D_menu_801BB810[i] = 106; @@ -1408,12 +1408,12 @@ void func_menu_8019E99C(void) { for (i = 0; i < 9; 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]); + Map_801A07E8(D_menu_801B68B0[i], SEGMENTED_TO_VIRTUAL(D_menu_801B68D4[i]), &D_menu_801CD818[i]); } D_menu_801CD810 = 0; - D_80177B40 = 2; + D_ctx_80177B40 = 2; D_menu_801CD948 = 0; D_menu_801CEEC4 = 0; @@ -1429,7 +1429,7 @@ void func_menu_8019E99C(void) { D_menu_801CEB34 = -1; } -void func_menu_8019F164(void) { +void Map_8019F164(void) { s32 i; D_menu_801CD974 = 1; @@ -1439,40 +1439,40 @@ void func_menu_8019F164(void) { } for (i = 0; i < 6; i++) { - D_80177C38[i] = gTeamShields[i]; - D_801778F0[i] = gSavedTeamShields[i]; + D_ctx_80177C38[i] = gTeamShields[i]; + D_ctx_801778F0[i] = gSavedTeamShields[i]; gSavedTeamShields[i] = gTeamShields[i]; } for (i = 1; i < 4; i++) { - if (D_80177C38[i] == 0) { - D_80177C38[i] = 255; + if (D_ctx_80177C38[i] == 0) { + D_ctx_80177C38[i] = 255; } } - D_menu_801CD93C = D_80177930; + D_menu_801CD93C = D_ctx_80177930; - sCurrentPlanetId = GetPlanetId(gCurrentLevel); + sCurrentPlanetId = Map_GetPlanetId(gCurrentLevel); D_menu_801CD950 = sCurrentPlanetId; - D_menu_801CD980 = func_menu_8019FD1C(gCurrentLevel, 0); + D_menu_801CD980 = Map_8019FD1C(gCurrentLevel, 0); - func_menu_8019FD1C(gCurrentLevel, 2); + Map_8019FD1C(gCurrentLevel, 2); - if (D_800D3180[gCurrentLevel] == 2) { + if (D_play_800D3180[gCurrentLevel] == 2) { D_menu_801CD98C = 1; - D_80177BB0[gCurrentPlanet] = 1; - func_menu_8019FD1C(gCurrentLevel, 1); + D_ctx_80177BB0[gCurrentPlanet] = 1; + Map_8019FD1C(gCurrentLevel, 1); } Save_Write(); - func_menu_8019F97C(); + Map_8019F97C(); - func_menu_8019F83C(); + Map_8019F83C(); - func_menu_8019FA1C(); + Map_8019FA1C(); switch (D_menu_801CD93C) { case 0: @@ -1490,7 +1490,7 @@ void func_menu_8019F164(void) { gCurrentPlanet++; - func_menu_8019FC04(); + Map_8019FC04(); D_menu_801CEFC4 = 0; D_menu_801CEFD0 = 0; @@ -1512,21 +1512,21 @@ void func_menu_8019F164(void) { D_menu_801CD944 = 5; } -void func_menu_8019F42C(void) { +void Map_8019F42C(void) { s32 i; gTotalHits += gHitCount; gLifeCount[gPlayerNum] = 0; D_menu_801CD974 = 1; - sCurrentPlanetId = GetPlanetId(gCurrentLevel); + sCurrentPlanetId = Map_GetPlanetId(gCurrentLevel); - D_80177B70[gCurrentPlanet] = gHitCount; + D_ctx_80177B70[gCurrentPlanet] = gHitCount; - func_menu_8019F910(); - func_menu_8019FD1C(gCurrentLevel, 0); + Map_8019F910(); + Map_8019FD1C(gCurrentLevel, 0); Save_Write(); - func_menu_8019F83C(); + Map_8019F83C(); for (i = 0; i < 7; i++) { D_menu_801CD8E0[i] = 0; @@ -1534,19 +1534,19 @@ void func_menu_8019F42C(void) { if (gCurrentPlanet != 0) { for (i = 0; i < gCurrentPlanet; i++) { - D_menu_801CD8E0[i] = func_menu_801A655C(D_80177B90[i], D_80177B90[i + 1]); + D_menu_801CD8E0[i] = Map_801A655C(D_ctx_80177B90[i], D_ctx_80177B90[i + 1]); } } for (i = 0; i < 24; i++) { - D_80177BD8[i] = 0; + D_ctx_80177BD8[i] = 0; } for (i = 0; i < 15; i++) { sPlanets[i].alpha = 0; } - func_menu_8019FC04(); + Map_8019FC04(); D_menu_801CD9AC = 0; @@ -1557,7 +1557,7 @@ void func_menu_8019F42C(void) { D_menu_801CD944 = 7; } -void func_menu_8019F600(void) { +void Map_8019F600(void) { s32 i; s32 sp18; s32 temp_t4; @@ -1571,12 +1571,12 @@ void func_menu_8019F600(void) { gSavedTeamShields[1] = 255; gSavedTeamShields[2] = 255; gSavedTeamShields[3] = 255; - D_80177C38[1] = 255; - D_80177C38[2] = 255; - D_80177C38[3] = 255; - D_80177C58[1] = 255; - D_80177C58[2] = 255; - D_80177C58[3] = 255; + D_ctx_80177C38[1] = 255; + D_ctx_80177C38[2] = 255; + D_ctx_80177C38[3] = 255; + D_ctx_80177C58[1] = 255; + D_ctx_80177C58[2] = 255; + D_ctx_80177C58[3] = 255; D_menu_801CD950 = -1; @@ -1586,22 +1586,22 @@ void func_menu_8019F600(void) { D_menu_801CD970 = 0; for (i = 0; i < 24; i++) { - D_80177BD8[i] = 0; + D_ctx_80177BD8[i] = 0; gTexturedLines[i].unk_24 = 0.0f; } for (i = 0; i < 7; i++) { - D_80177BB0[i] = 0; - D_80177B70[i] = 0; - D_80177B50[i] = 0x00FFFFFF; + D_ctx_80177BB0[i] = 0; + D_ctx_80177B70[i] = 0; + D_ctx_80177B50[i] = 0x00FFFFFF; } - D_80177B90[0] = PLANET_CORNERIA; - D_80177B90[1] = PLANET_NONE; - D_80177B90[2] = PLANET_NONE; - D_80177B90[3] = PLANET_NONE; - D_80177B90[4] = PLANET_NONE; - D_80177B90[5] = PLANET_NONE; - D_80177B90[6] = PLANET_VENOM; + D_ctx_80177B90[0] = PLANET_CORNERIA; + D_ctx_80177B90[1] = PLANET_NONE; + D_ctx_80177B90[2] = PLANET_NONE; + D_ctx_80177B90[3] = PLANET_NONE; + D_ctx_80177B90[4] = PLANET_NONE; + D_ctx_80177B90[5] = PLANET_NONE; + D_ctx_80177B90[6] = PLANET_VENOM; for (i = 0; i < 24; i++) { sPaths[i].alpha = 255; @@ -1616,23 +1616,24 @@ void func_menu_8019F600(void) { D_menu_801CD9B4 = 0.01f; D_menu_801CD944 = 0; - sp18 = func_menu_801A655C(sCurrentPlanetId, sPlanets[sCurrentPlanetId].dest1); - temp_t4 = func_menu_801A655C(sCurrentPlanetId, sPlanets[sCurrentPlanetId].dest2); - D_80177BD8[sp18] = 1; - D_80177BD8[temp_t4] = 1; + sp18 = Map_801A655C(sCurrentPlanetId, sPlanets[sCurrentPlanetId].dest1); + temp_t4 = Map_801A655C(sCurrentPlanetId, sPlanets[sCurrentPlanetId].dest2); + D_ctx_80177BD8[sp18] = 1; + D_ctx_80177BD8[temp_t4] = 1; } -void func_menu_8019F83C(void) { +void Map_8019F83C(void) { s32 i; 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)) { - D_80177BD8[i] = 0; + if ((D_ctx_80177BD8[i] == 4) || (D_ctx_80177BD8[i] == 5) || (D_ctx_80177BD8[i] == 1) || + (D_ctx_80177BD8[i] == 11)) { + D_ctx_80177BD8[i] = 0; } - if (D_80177BD8[i] == 6) { + if (D_ctx_80177BD8[i] == 6) { sPaths[i].unk_14 = 5; } @@ -1641,22 +1642,22 @@ void func_menu_8019F83C(void) { } } -void func_menu_8019F910(void) { +void Map_8019F910(void) { s32 i; s32 mask = 0x00FF0000; for (i = 0; i < 3; i++) { if (gTeamShields[3 - i] <= 0) { - D_80177B50[gCurrentPlanet] ^= mask; + D_ctx_80177B50[gCurrentPlanet] ^= mask; } else { - D_80177B50[gCurrentPlanet] |= mask; + D_ctx_80177B50[gCurrentPlanet] |= mask; } mask >>= 8; } } -void func_menu_8019F97C(void) { - D_menu_801CEA54 = func_menu_801A25C8(sCurrentPlanetId); +void Map_8019F97C(void) { + D_menu_801CEA54 = Map_801A25C8(sCurrentPlanetId); D_menu_801CD9F4 = D_menu_801CDA00 = sPlanets[sCurrentPlanetId].pos.x; D_menu_801CD9F8 = D_menu_801CDA04 = sPlanets[sCurrentPlanetId].pos.y; @@ -1664,7 +1665,7 @@ void func_menu_8019F97C(void) { D_menu_801CD9FC = sPlanets[sCurrentPlanetId].pos.z + D_menu_801CEA54; } -void func_menu_8019FA1C(void) { +void Map_8019FA1C(void) { PlanetId planetId; for (planetId = 0; planetId < PLANET_MAX; planetId++) { @@ -1680,7 +1681,7 @@ void func_menu_8019FA1C(void) { } } -void func_menu_8019FC04(void) { +void Map_8019FC04(void) { s32 i; if (gCurrentPlanet != PLANET_METEO) { @@ -1689,16 +1690,16 @@ void func_menu_8019FC04(void) { } for (i = 0; i < 7; i++) { - if (D_80177B90[i] == PLANET_KATINA) { + if (D_ctx_80177B90[i] == PLANET_KATINA) { D_menu_801CEB48[1] = false; } - if (D_80177B90[i] == PLANET_SECTOR_Y) { + if (D_ctx_80177B90[i] == PLANET_SECTOR_Y) { D_menu_801CEB48[2] = false; } } } -bool func_menu_8019FD1C(LevelId levelId, s32 arg1) { +bool Map_8019FD1C(LevelId levelId, s32 arg1) { s32 ret; s32 planetSaveSlot; @@ -1768,7 +1769,7 @@ bool func_menu_8019FD1C(LevelId levelId, s32 arg1) { break; case LEVEL_VENOM_ANDROSS: - if (D_8017827C == 0) { + if (D_ctx_8017827C == 0) { planetSaveSlot = SAVE_SLOT_VENOM_1; } else { planetSaveSlot = SAVE_SLOT_VENOM_2; @@ -1818,45 +1819,45 @@ bool func_menu_8019FD1C(LevelId levelId, s32 arg1) { return ret; } -void func_menu_8019FF48(void) { - func_menu_801A6694(); - func_menu_801A68E4(); - func_menu_801A6A24(); +void Map_8019FF48(void) { + Map_801A6694(); + Map_801A68E4(); + Map_801A6A24(); switch (D_menu_801CD944) { case 0: - func_menu_801A0954(); - D_8017842C += 0.09f; + Map_801A0954(); + D_ctx_8017842C += 0.09f; break; case 1: - func_menu_801A1528(); + Map_801A1528(); D_menu_801CDA1C += 0.03f; break; case 3: - func_menu_801AD11C(); + Map_801AD11C(); D_menu_801CDA1C += 0.03f; break; case 2: - func_menu_801A1C14(); + Map_801A1C14(); break; case 4: - func_menu_801A5E80(); + Map_801A5E80(); break; case 5: - func_menu_801A2B8C(); + Map_801A2B8C(); break; case 6: - func_menu_801A4AE8(); + Map_801A4AE8(); break; case 7: - func_menu_801A36A8(); + Map_801A36A8(); break; default: @@ -1864,11 +1865,11 @@ void func_menu_8019FF48(void) { } 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); + Map_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_play_800B6F50(D_menu_801CD9F4, D_menu_801CD9F8, D_menu_801CD9FC, D_menu_801CDA00, D_menu_801CDA04, + D_menu_801CDA08); } gGameFrameCount++; #if MODS_LEVEL_SELECT == true @@ -1876,7 +1877,7 @@ void func_menu_8019FF48(void) { #endif } -void func_menu_801A01A8(void) { +void Map_801A01A8(void) { s32 i; s32* ptr; @@ -1888,85 +1889,84 @@ void func_menu_801A01A8(void) { if (D_menu_801CD974 && D_menu_801CD944 != 0) { for (i = 0; i < 24; i++) { - if (D_80177BD8[i] == 0) { + if (D_ctx_80177BD8[i] == 0) { continue; } if (sPaths[i].alpha == 0) { continue; } - func_menu_801AC9A0(i); + Map_801AC9A0(i); if (sPaths[i].unk_14) { - func_menu_801AC200(i); + Map_801AC200(i); } - func_80060D94(i); + func_edisplay_80060D94(i); } } - func_menu_801A8F40(); + Map_801A8F40(); - func_menu_801A9224(); + Map_801A9224(); - func_menu_801A9448(); + Map_801A9448(); for (ptr = D_menu_801CD8A0, i = 0; i < 15; i++, ptr++) { - func_menu_801A6A98(*ptr); + Map_801A6A98(*ptr); } - func_menu_801A8738(); + Map_801A8738(); Matrix_Pop(&gGfxMatrix); if (D_menu_801CD96C) { - func_menu_801ABF1C(); + Map_801ABF1C(); } - func_menu_801AB300(); + Map_801AB300(); if (D_menu_801CEFC4) { - func_menu_801A5834(); + Map_801A5834(); } if (D_menu_801CD964) { - func_menu_801A9910(); + Map_801A9910(); } - func_menu_801A9814(); + Map_801A9814(); if (D_menu_801CD968) { - func_menu_801A9A8C(); + Map_801A9A8C(); } - func_menu_801A9DE8(); + Map_801A9DE8(); - func_menu_801A5C90(); + Map_801A5C90(); if ((D_menu_801CD944 == 7) && (D_menu_801CD948 == 1)) { - func_menu_801A4650(); + Map_801A4650(); } if (D_menu_801CD944 == 0) { - func_menu_801A0D14(); + Map_801A0D14(); } if (D_menu_801CD944 == 1) { - func_menu_801A19A8(); + Map_801A19A8(); } 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])); + Map_801A07E8((u8*) D_menu_801B68B0[8], (u8*) SEGMENTED_TO_VIRTUAL(D_menu_801B68D4[8]), &(D_menu_801CD818[8])); D_menu_801CEEC8 = 5; } else { D_menu_801CEEC8--; } - 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])); + Map_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])); + Map_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; @@ -1975,7 +1975,7 @@ void func_menu_801A01A8(void) { Texture_Mottle((u16*) D_MAP_6047F80, (u16*) D_MAP_6048F80, 5); } -s32 func_menu_801A05B4(void) { +s32 Map_801A05B4(void) { s32 i; s32 j; s32 sp30[10]; @@ -2009,19 +2009,19 @@ s32 func_menu_801A05B4(void) { return ret; } -void func_menu_801A0788(void) { - D_80178410 = 800; +void Map_801A0788(void) { + D_ctx_80178410 = 800; Memory_FreeAll(); - func_800A5D6C(); + func_play_800A5D6C(); - D_80178420 = 320.0f; - D_80178424 = 240.0f; - D_8017842C = 0.0f; - D_80178430 = 0.0f; + D_ctx_80178420 = 320.0f; + D_ctx_80178424 = 240.0f; + D_ctx_8017842C = 0.0f; + D_ctx_80178430 = 0.0f; } -void func_menu_801A07E8(u8* arg0, u8* arg1, f32* arg2) { +void Map_801A07E8(u8* arg0, u8* arg1, f32* arg2) { s32* var_v0 = D_menu_801B0004; s32 temp; s32 i; @@ -2055,7 +2055,7 @@ void func_menu_801A07E8(u8* arg0, u8* arg1, f32* arg2) { } } -void func_menu_801A0954(void) { +void Map_801A0954(void) { PlanetId planetId; static f32 D_menu_801B6934[] = { 99.0f, 24, -90.0f, -150.0f, -208.0f, -276.0f, @@ -2072,7 +2072,7 @@ void func_menu_801A0954(void) { D_menu_801CD9E8 = 0; D_menu_801CD9E4 = 0; D_menu_801CD9EC = 0.29f; - D_80178410 = 800; + D_ctx_80178410 = 800; D_menu_801CD9C0 = 5; D_menu_801CD948++; break; @@ -2082,7 +2082,7 @@ void func_menu_801A0954(void) { break; } - if (D_80178340 != 0) { + if (D_ctx_80178340 != 0) { break; } @@ -2156,7 +2156,7 @@ void func_menu_801A0954(void) { } } -void func_menu_801A0D14(void) { +void Map_801A0D14(void) { s32 i; static f32 D_menu_801B694C = 71.0f; static f32 D_menu_801B6950 = 205.0f; @@ -2164,7 +2164,7 @@ void func_menu_801A0D14(void) { D_MAP_6041A80, D_MAP_6035780, D_MAP_6033080, D_MAP_603A580, D_MAP_603F380, D_MAP_6037E80, D_MAP_603CC80, }; - func_menu_801A116C(); + Map_801A116C(); RCP_SetupDL(&gMasterDisp, 0x51); @@ -2180,8 +2180,8 @@ void func_menu_801A0D14(void) { TextureRect_8bIA(&gMasterDisp, D_MAP_6019030, 8, 16, 0.0f, D_menu_801B694C, 40.0f, 1.66f); TextureRect_8bIA_MirY(&gMasterDisp, D_MAP_6019030, 8, 16, 0.0f, D_menu_801B6950, 40.0f, 1.68f); - func_8003DE68(0x47, 0x76); - func_8003DE68(0xCD, 0xEF); + func_bg_8003DE68(0x47, 0x76); + func_bg_8003DE68(0xCD, 0xEF); RCP_SetupDL(&gMasterDisp, 0x4C); @@ -2207,7 +2207,7 @@ void func_menu_801A0D14(void) { } } -void func_menu_801A116C(void) { +void Map_801A116C(void) { static f32 D_menu_801B6970 = 35.0f; WingInfo wings; Vec3f dest; @@ -2275,7 +2275,7 @@ void func_menu_801A116C(void) { wings.unk_34 = 0.0f; wings.unk_38 = 0.0f; - func_80053658(&wings); + func_display_80053658(&wings); Matrix_Pop(&gGfxMatrix); Matrix_Pop(&gGfxMatrix); @@ -2295,7 +2295,7 @@ 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_menu_801A1528(void) { +void Map_801A1528(void) { PlanetId planetId; f32 temp; @@ -2371,7 +2371,7 @@ void func_menu_801A1528(void) { } } -void func_menu_801A19A8(void) { +void Map_801A19A8(void) { s32 i; RCP_SetupDL(&gMasterDisp, 0x53); @@ -2384,14 +2384,14 @@ void func_menu_801A19A8(void) { TextureRect_8bIA(&gMasterDisp, D_MAP_600D590 + (168 * 16), 168, 3, 72.0f, 104.0f + 16.0f, 1.0f, 1.0f); } -void func_menu_801A1AE8(void) { +void Map_801A1AE8(void) { f32 x; f32 y; f32 z; D_menu_801CEA64 = 0.04f; - D_menu_801CEA54 = func_menu_801A25C8(sCurrentPlanetId); + D_menu_801CEA54 = Map_801A25C8(sCurrentPlanetId); D_menu_801CDA40.x = sPlanets[sCurrentPlanetId].pos.x; D_menu_801CDA40.y = sPlanets[sCurrentPlanetId].pos.y; @@ -2414,12 +2414,12 @@ void func_menu_801A1AE8(void) { D_menu_801CEA68 = sqrtf(SQ(x) + SQ(y) + SQ(z)); } -void func_menu_801A1C14(void) { +void Map_801A1C14(void) { s32 i; switch (D_menu_801CD948) { case 0: - func_menu_801A1AE8(); + Map_801A1AE8(); D_menu_801CD94C = 0; D_menu_801CD9C4 = 0; @@ -2445,12 +2445,12 @@ void func_menu_801A1C14(void) { for (i = 0; i < 24; i++) { sPaths[i].alpha = 0; } - D_80178410 = 0; + D_ctx_80178410 = 0; - D_80178348 = 255; - D_80178350 = 255; - D_80178354 = 255; - D_80178340 = 0; + D_ctx_80178348 = 255; + D_ctx_80178350 = 255; + D_ctx_80178354 = 255; + D_ctx_80178340 = 0; D_menu_801CEB3C = 0.0f; D_menu_801CEB38 = 255; @@ -2461,7 +2461,7 @@ void func_menu_801A1C14(void) { case 1: if (D_menu_801CD95C == 0) { if (sCurrentPlanetId == PLANET_CORNERIA) { - D_80178340 = 0; + D_ctx_80178340 = 0; D_menu_801CD948 = 10; AUDIO_PLAY_SFX(0x0940A00BU, gDefaultSfxSource, 4U); } else { @@ -2470,7 +2470,7 @@ void func_menu_801A1C14(void) { } } else { if (sCurrentPlanetId == PLANET_CORNERIA) { - D_80178340 ^= 0xFF; + D_ctx_80178340 ^= 0xFF; if (D_menu_801CD95C == 2) { D_menu_801CEB34 = 0; } @@ -2487,7 +2487,7 @@ void func_menu_801A1C14(void) { break; case 2: - func_menu_801A2674(); + Map_801A2674(); if ((D_menu_801CD9FC == D_menu_801CDA50.z) && (D_menu_801CD9D8 == 0)) { AUDIO_PLAY_SFX(0x19004013U, gDefaultSfxSource, 4U); D_menu_801CD9D8 = 1; @@ -2514,7 +2514,7 @@ void func_menu_801A1C14(void) { // clang-format on D_menu_801CD970 = 0; - if (func_menu_801A2304()) { + if (Map_801A2304()) { D_menu_801CD948 = 3; } } @@ -2544,7 +2544,7 @@ void func_menu_801A1C14(void) { // clang-format on D_menu_801CD970 = 0; - if (func_menu_801A2304()) { + if (Map_801A2304()) { D_menu_801CD948 = 3; } break; @@ -2557,7 +2557,7 @@ void func_menu_801A1C14(void) { D_menu_801CD9C4++; } -bool func_menu_801A2304(void) { +bool Map_801A2304(void) { s32 ret = false; f32 sp28; f32 sp24; @@ -2621,7 +2621,7 @@ bool func_menu_801A2304(void) { return ret; } -f32 func_menu_801A25C8(PlanetId planetId) { +f32 Map_801A25C8(PlanetId planetId) { f32 sp4; switch (planetId) { @@ -2671,12 +2671,12 @@ f32 func_menu_801A25C8(PlanetId planetId) { return sp4; } -void func_menu_801A2674(void) { +void Map_801A2674(void) { s32 i; - func_menu_801A48C0(D_menu_801CEA64); + Map_801A48C0(D_menu_801CEA64); - func_menu_801A4A38(D_menu_801CEA64); + Map_801A4A38(D_menu_801CEA64); D_menu_801CEA64 *= 1.03f; @@ -2699,7 +2699,7 @@ void func_menu_801A2674(void) { } for (i = 0; i < 24; i++) { - if (D_80177BD8[i] == 0) { + if (D_ctx_80177BD8[i] == 0) { continue; } @@ -2727,11 +2727,11 @@ void func_menu_801A2674(void) { SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 45); } -void func_menu_801A281C(void) { - D_80178348 = 0; - D_80178350 = 0; - D_80178354 = 0; - D_80178340 = 255; +void Map_801A281C(void) { + D_ctx_80178348 = 0; + D_ctx_80178350 = 0; + D_ctx_80178354 = 0; + D_ctx_80178340 = 255; D_menu_801CD988 = 5; D_menu_801CEED8 = 0; @@ -2757,8 +2757,8 @@ void func_menu_801A281C(void) { D_menu_801CDA10 = 0.0f; D_menu_801CDA14 = 500.0f; - 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); + Map_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_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; @@ -2772,47 +2772,47 @@ void func_menu_801A281C(void) { D_menu_801CDA10 = -9.849999f; D_menu_801CDA14 = 3375.000000f; - 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); + Map_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_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_menu_801CEECC = func_menu_801A655C(sCurrentPlanetId, sNextPlanetId); + D_menu_801CEECC = Map_801A655C(sCurrentPlanetId, sNextPlanetId); if (D_menu_801CD93C == 2) { - D_80177BD8[D_menu_801CEECC] = 5; + D_ctx_80177BD8[D_menu_801CEECC] = 5; sPaths[D_menu_801CEECC].unk_14 = 5; } else { - D_80177BD8[D_menu_801CEECC] = 2; + D_ctx_80177BD8[D_menu_801CEECC] = 2; sPaths[D_menu_801CEECC].unk_14 = 1; } } -void func_menu_801A2B8C(void) { +void Map_801A2B8C(void) { s32 i; switch (D_menu_801CD94C) { case 0: - func_menu_801A281C(); + Map_801A281C(); D_menu_801CD94C = 100; break; case 100: - if (D_80178340 != 0) { - D_80178340 -= 64; - if (D_80178340 < 0) { - D_80178340 = 0; + if (D_ctx_80178340 != 0) { + D_ctx_80178340 -= 64; + if (D_ctx_80178340 < 0) { + D_ctx_80178340 = 0; } } else { D_menu_801CD9C0 = 30; if ((D_menu_801CD98C == 1) || (D_menu_801CD980 == 1)) { - D_80178348 = 255; - D_80178350 = 255; - D_80178354 = 255; - D_80178340 = 0; + D_ctx_80178348 = 255; + D_ctx_80178350 = 255; + D_ctx_80178354 = 255; + D_ctx_80178340 = 0; D_menu_801CD984 = 0; D_menu_801CD94C = 10; break; @@ -2827,27 +2827,27 @@ void func_menu_801A2B8C(void) { break; } - if ((D_menu_801CD984 == 255) && (D_80178340 == 0)) { + if ((D_menu_801CD984 == 255) && (D_ctx_80178340 == 0)) { D_menu_801CD980 = 0; D_menu_801CD9C0 = 30; D_menu_801CD94C = 20; } else if (D_menu_801CD988 != 0) { - D_80178340 ^= 255; + D_ctx_80178340 ^= 255; D_menu_801CD988--; } else { D_menu_801CD988 = 0; - if (D_80178340 != 0) { - D_80178340 -= 21; - if (D_80178340 < 0) { - D_80178340 = 0; + if (D_ctx_80178340 != 0) { + D_ctx_80178340 -= 21; + if (D_ctx_80178340 < 0) { + D_ctx_80178340 = 0; } } D_menu_801CD984 += 8; if (D_menu_801CD984 > 255) { - D_80178340 = 0; + D_ctx_80178340 = 0; D_menu_801CD984 = 255; } } @@ -2870,7 +2870,7 @@ void func_menu_801A2B8C(void) { if (D_menu_801CD9C0 != 0) { break; } - func_menu_801A2EB8(); + Map_801A2EB8(); break; case 2: @@ -2896,12 +2896,13 @@ void func_menu_801A2B8C(void) { break; } - func_800B6F50(D_menu_801CD9F4, D_menu_801CD9F8, D_menu_801CD9FC, D_menu_801CDA00, D_menu_801CDA04, D_menu_801CDA08); + func_play_800B6F50(D_menu_801CD9F4, D_menu_801CD9F8, D_menu_801CD9FC, D_menu_801CDA00, D_menu_801CDA04, + D_menu_801CDA08); D_menu_801CD9C4++; } -void func_menu_801A2EB8(void) { +void Map_801A2EB8(void) { s32 i; s32 temp1; s32 temp2; @@ -2914,12 +2915,12 @@ void func_menu_801A2EB8(void) { } } - func_menu_801A3440(D_menu_801CEEE0); + Map_801A3440(D_menu_801CEEE0); if (D_menu_801CD9C4 == 80) { sCurrentPlanetId = sNextPlanetId; - D_80177B90[gCurrentPlanet] = sCurrentPlanetId; - func_menu_801A6368(); + D_ctx_80177B90[gCurrentPlanet] = sCurrentPlanetId; + Map_801A6368(); } if (D_menu_801CD9C4 < 80) { @@ -2945,7 +2946,7 @@ void func_menu_801A2EB8(void) { } for (i = 0; i < 24; i++) { - if (D_80177BD8[i] == 0) { + if (D_ctx_80177BD8[i] == 0) { continue; } sPaths[i].alpha += 16; @@ -2995,16 +2996,16 @@ void func_menu_801A2EB8(void) { D_menu_801CEED4 = -1; if (sPlanets[sNextPlanetId].dest1 != PLANET_NONE) { - temp1 = func_menu_801A655C(sNextPlanetId, sPlanets[sNextPlanetId].dest1); - D_80177BD8[temp1] = 1; + temp1 = Map_801A655C(sNextPlanetId, sPlanets[sNextPlanetId].dest1); + D_ctx_80177BD8[temp1] = 1; sPaths[temp1].alpha = 255; D_menu_801CEED4 = temp1; } D_menu_801CEED0 = -1; if (sPlanets[sNextPlanetId].dest2 != PLANET_NONE) { - temp2 = func_menu_801A655C(sNextPlanetId, sPlanets[sNextPlanetId].dest2); - D_80177BD8[temp2] = 1; + temp2 = Map_801A655C(sNextPlanetId, sPlanets[sNextPlanetId].dest2); + D_ctx_80177BD8[temp2] = 1; sPaths[temp2].alpha = 255; D_menu_801CEED0 = temp2; } @@ -3013,11 +3014,11 @@ void func_menu_801A2EB8(void) { } } -void func_menu_801A3440(f32 arg0) { +void Map_801A3440(f32 arg0) { Vec3f vec[2]; if (D_menu_801CEED8 != -1) { - func_menu_801A3550(vec, &D_menu_801CEEE8[D_menu_801CEED8], &D_menu_801CEF58[D_menu_801CEED8], D_menu_801CEEDC); + Map_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; @@ -3036,7 +3037,7 @@ void func_menu_801A3440(f32 arg0) { } } -void func_menu_801A3550(Vec3f* arg0, Vec3f* arg1, Vec3f* arg2, f32 arg3) { +void Map_801A3550(Vec3f* arg0, Vec3f* arg1, Vec3f* arg2, f32 arg3) { f32 temp_fa1; f32 temp_fs0; f32 temp_ft5; @@ -3054,16 +3055,16 @@ void func_menu_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_menu_801A36A8(void) { +void Map_801A36A8(void) { s32 i; f32 temp; switch (D_menu_801CD948) { case 0: - D_80178348 = 0; - D_80178350 = 0; - D_80178354 = 0; - D_80178340 = 0xFF; + D_ctx_80178348 = 0; + D_ctx_80178350 = 0; + D_ctx_80178354 = 0; + D_ctx_80178340 = 0xFF; for (i = 0; i < 8; i++) { D_menu_801CF020[i] = D_menu_801B69D4[i]; @@ -3086,10 +3087,10 @@ void func_menu_801A36A8(void) { case 10: temp = Math_SmoothStepToF(&D_menu_801CEA9C, 0.0f, 1.0f, 100.0f, 1.0f); - D_80178340 = D_menu_801CEA9C; + D_ctx_80178340 = D_menu_801CEA9C; if (temp == 0.0f) { - D_80178340 = 0; + D_ctx_80178340 = 0; D_menu_801CD9C0 = 0; D_menu_801CD948 = 20; } @@ -3111,17 +3112,17 @@ void func_menu_801A36A8(void) { if (D_menu_801CD9C0) { break; } - func_menu_801A3A00(); + Map_801A3A00(); break; case 2: - func_menu_801A4394(); + Map_801A4394(); break; case 3: - D_80178340 += 32; - if (D_80178340 > 255) { - D_80178340 = 255; + D_ctx_80178340 += 32; + if (D_ctx_80178340 > 255) { + D_ctx_80178340 = 255; D_menu_801CD948++; } break; @@ -3131,7 +3132,7 @@ void func_menu_801A36A8(void) { D_Timer_8017783C = 2; gOptionMenuStatus = OPTION_WAIT; gDrawMode = 0; - D_80178410 = 0; + D_ctx_80178410 = 0; break; } @@ -3141,7 +3142,7 @@ void func_menu_801A36A8(void) { } } -void func_menu_801A3A00(void) { +void Map_801A3A00(void) { s32 i; bool boolTemp; f32 temp1[8]; @@ -3330,7 +3331,7 @@ void func_menu_801A3A00(void) { } } -void func_menu_801A4394(void) { +void Map_801A4394(void) { s32 i; switch (D_menu_801CD94C) { @@ -3352,10 +3353,10 @@ void func_menu_801A4394(void) { if ((sPaths[D_menu_801CD8E0[D_menu_801CD9AC]].type == 3) || (sPaths[D_menu_801CD8E0[D_menu_801CD9AC]].type == 4)) { - D_80177BD8[D_menu_801CD8E0[D_menu_801CD9AC]] = 5; + D_ctx_80177BD8[D_menu_801CD8E0[D_menu_801CD9AC]] = 5; sPaths[D_menu_801CD8E0[D_menu_801CD9AC]].unk_14 = 5; } else { - D_80177BD8[D_menu_801CD8E0[D_menu_801CD9AC]] = 2; + D_ctx_80177BD8[D_menu_801CD8E0[D_menu_801CD9AC]] = 2; sPaths[D_menu_801CD8E0[D_menu_801CD9AC]].unk_14 = 0; } @@ -3366,8 +3367,8 @@ void func_menu_801A4394(void) { break; case 2: - if ((D_80177BD8[D_menu_801CD8E0[D_menu_801CD9AC]] == 3) || - (D_80177BD8[D_menu_801CD8E0[D_menu_801CD9AC]] == 6)) { + if ((D_ctx_80177BD8[D_menu_801CD8E0[D_menu_801CD9AC]] == 3) || + (D_ctx_80177BD8[D_menu_801CD8E0[D_menu_801CD9AC]] == 6)) { D_menu_801CD9AC++; D_menu_801CD94C = 1; } @@ -3400,7 +3401,7 @@ void func_menu_801A4394(void) { } } -void func_menu_801A4650(void) { +void Map_801A4650(void) { s32 i; static Gfx* D_menu_801B6A4C[] = { D_FONT3D_9006AE0, D_FONT3D_90086F0, D_FONT3D_9005380, D_FONT3D_90075A0, @@ -3438,7 +3439,7 @@ void func_menu_801A4650(void) { Matrix_Pop(&gGfxMatrix); } -void func_menu_801A48C0(f32 speed) { +void Map_801A48C0(f32 speed) { f32 x; f32 y; f32 z; @@ -3461,7 +3462,7 @@ void func_menu_801A48C0(f32 speed) { D_menu_801CD9F8 = D_menu_801CDA38 * (1 + __sinf(angle) * 1.3f); } -void func_menu_801A4A38(f32 arg0) { +void Map_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); @@ -3469,13 +3470,13 @@ void func_menu_801A4A38(f32 arg0) { D_menu_801CDA04 = D_menu_801CDA30; } -void func_menu_801A4AE8(void) { +void Map_801A4AE8(void) { s32 var_a0; s32 i; switch (D_menu_801CD94C) { case 0: - func_menu_801A4D7C(); + Map_801A4D7C(); break; case 1: @@ -3512,11 +3513,11 @@ void func_menu_801A4AE8(void) { var_a0 += 2; } - func_menu_801A4D0C(var_a0); + Map_801A4D0C(var_a0); if (D_menu_801CEFDC == 0) { for (i = 0; i < 6; i++) { - D_80177C58[i] = gTeamShields[i]; + D_ctx_80177C58[i] = gTeamShields[i]; } D_menu_801CEFC8 = 0; D_menu_801CD948 = 0; @@ -3530,19 +3531,19 @@ void func_menu_801A4AE8(void) { } } -void func_menu_801A4D0C(u32 arg0) { +void Map_801A4D0C(u32 arg0) { switch (arg0) { case 1: case 4: if (D_menu_801CD9D4 != 0) { - func_menu_801A4F8C(); + Map_801A4F8C(); } else { - func_menu_801A4FC4(); + Map_801A4FC4(); } break; case 3: - func_menu_801A53C8(); + Map_801A53C8(); case 0: case 2: @@ -3550,10 +3551,10 @@ void func_menu_801A4D0C(u32 arg0) { } } -void func_menu_801A4D7C(void) { +void Map_801A4D7C(void) { f32 temp; - if (func_menu_801A5770() != 0) { + if (Map_801A5770() != 0) { D_menu_801CEFE8[D_menu_801CEFDC] = 255.0f; if (D_menu_801CD93C != 0) { if (D_menu_801CEFD4 < 0) { @@ -3602,15 +3603,15 @@ void func_menu_801A4D7C(void) { } } -void func_menu_801A4F8C(void) { - D_80178410 = 0; +void Map_801A4F8C(void) { + D_ctx_80178410 = 0; gGameState = GSTATE_GAME_OVER; - D_80177868 = 0; + D_ctx_80177868 = 0; D_Timer_8017783C = 2; gDrawMode = DRAWMODE_0; } -void func_menu_801A4FC4(void) { +void Map_801A4FC4(void) { s32 i; s32 temp; s32 temp2; @@ -3618,14 +3619,14 @@ void func_menu_801A4FC4(void) { gPlayerNum = 0; for (i = 0; i < 6; i++) { - gSavedTeamShields[i] = D_80177C58[i]; - gTeamShields[i] = D_80177C58[i]; - D_80177C38[i] = D_80177C58[i]; + gSavedTeamShields[i] = D_ctx_80177C58[i]; + gTeamShields[i] = D_ctx_80177C58[i]; + D_ctx_80177C38[i] = D_ctx_80177C58[i]; } for (i = 1; i < 4; i++) { - if (D_80177C38[i] == 0) { - D_80177C38[i] = 255; + if (D_ctx_80177C38[i] == 0) { + D_ctx_80177C38[i] = 255; } } @@ -3633,20 +3634,20 @@ void func_menu_801A4FC4(void) { gBombCount[gPlayerNum] = 3; if (sPlanets[sCurrentPlanetId].dest1 != PLANET_NONE) { - temp2 = func_menu_801A655C(sCurrentPlanetId, sPlanets[sCurrentPlanetId].dest1); - D_80177BD8[temp2] = 0; + temp2 = Map_801A655C(sCurrentPlanetId, sPlanets[sCurrentPlanetId].dest1); + D_ctx_80177BD8[temp2] = 0; sPaths[temp2].alpha = 0; } if (sPlanets[sCurrentPlanetId].dest2 != PLANET_NONE) { - temp = func_menu_801A655C(sCurrentPlanetId, sPlanets[sCurrentPlanetId].dest2); - D_80177BD8[temp] = 0; + temp = Map_801A655C(sCurrentPlanetId, sPlanets[sCurrentPlanetId].dest2); + D_ctx_80177BD8[temp] = 0; sPaths[temp].alpha = 0; } if (sPlanets[sCurrentPlanetId].warp != PLANET_NONE) { - temp = func_menu_801A655C(sCurrentPlanetId, sPlanets[sCurrentPlanetId].warp); - D_80177BD8[temp] = 0; + temp = Map_801A655C(sCurrentPlanetId, sPlanets[sCurrentPlanetId].warp); + D_ctx_80177BD8[temp] = 0; sPaths[temp].alpha = 0; } @@ -3656,58 +3657,58 @@ void func_menu_801A4FC4(void) { D_menu_801CEEA8 = 255; D_menu_801CEEAC = 255; - gTotalHits -= D_80177B70[gCurrentPlanet - 1]; - D_80177B90[gCurrentPlanet] = PLANET_NONE; - D_80177B70[gCurrentPlanet - 1] = 0; - D_80177BB0[gCurrentPlanet - 1] = 0; - D_80177B50[gCurrentPlanet - 1] = 0x00FFFFFF; + gTotalHits -= D_ctx_80177B70[gCurrentPlanet - 1]; + D_ctx_80177B90[gCurrentPlanet] = PLANET_NONE; + D_ctx_80177B70[gCurrentPlanet - 1] = 0; + D_ctx_80177BB0[gCurrentPlanet - 1] = 0; + D_ctx_80177B50[gCurrentPlanet - 1] = 0x00FFFFFF; gHitCount = 0; gCurrentPlanet--; - D_menu_801CD83C = func_menu_801A05B4(); + D_menu_801CD83C = Map_801A05B4(); sCurrentPlanetId = D_menu_801CD950; if (sPlanets[sCurrentPlanetId].dest1 != PLANET_NONE) { - temp2 = func_menu_801A655C(sCurrentPlanetId, sPlanets[sCurrentPlanetId].dest1); - D_80177BD8[temp2] = 1; + temp2 = Map_801A655C(sCurrentPlanetId, sPlanets[sCurrentPlanetId].dest1); + D_ctx_80177BD8[temp2] = 1; sPaths[temp2].alpha = 255; } if (sPlanets[sCurrentPlanetId].dest2 != PLANET_NONE) { - temp = func_menu_801A655C(sCurrentPlanetId, sPlanets[sCurrentPlanetId].dest2); - D_80177BD8[temp] = 1; + temp = Map_801A655C(sCurrentPlanetId, sPlanets[sCurrentPlanetId].dest2); + D_ctx_80177BD8[temp] = 1; sPaths[temp].alpha = 255; } if (sPlanets[sCurrentPlanetId].warp != PLANET_NONE) { - temp = func_menu_801A655C(sCurrentPlanetId, sPlanets[sCurrentPlanetId].warp); - D_80177BD8[temp] = 0; + temp = Map_801A655C(sCurrentPlanetId, sPlanets[sCurrentPlanetId].warp); + D_ctx_80177BD8[temp] = 0; sPaths[temp].alpha = 0; } - func_menu_801A6368(); + Map_801A6368(); } -void func_menu_801A53C8(void) { +void Map_801A53C8(void) { s32 temp; s32 temp2; D_menu_801CEFD8 ^= 1; if (sPlanets[sCurrentPlanetId].dest1 != PLANET_NONE) { - temp2 = func_menu_801A655C(sCurrentPlanetId, sPlanets[sCurrentPlanetId].dest1); - D_80177BD8[temp2] = 0; + temp2 = Map_801A655C(sCurrentPlanetId, sPlanets[sCurrentPlanetId].dest1); + D_ctx_80177BD8[temp2] = 0; sPaths[temp2].alpha = 0; } if (sPlanets[sCurrentPlanetId].dest2 != PLANET_NONE) { - temp = func_menu_801A655C(sCurrentPlanetId, sPlanets[sCurrentPlanetId].dest2); - D_80177BD8[temp] = 0; + temp = Map_801A655C(sCurrentPlanetId, sPlanets[sCurrentPlanetId].dest2); + D_ctx_80177BD8[temp] = 0; sPaths[temp].alpha = 0; } - D_80177BD8[D_menu_801CEECC] = 0; + D_ctx_80177BD8[D_menu_801CEECC] = 0; sPaths[D_menu_801CEECC].alpha = 0; sPaths[D_menu_801CEECC].unk_14 = 0; @@ -3728,16 +3729,16 @@ void func_menu_801A53C8(void) { sNextPlanetId = sPlanets[sCurrentPlanetId].dest1; } - D_menu_801CEECC = func_menu_801A655C(sCurrentPlanetId, sNextPlanetId); + D_menu_801CEECC = Map_801A655C(sCurrentPlanetId, sNextPlanetId); sPaths[D_menu_801CEECC].alpha = 255; - D_80177BD8[D_menu_801CEECC] = 3; + D_ctx_80177BD8[D_menu_801CEECC] = 3; sPaths[D_menu_801CEECC].unk_14 = 2; if ((sPaths[D_menu_801CEECC].type == PL_WARP_YLW) || (sPaths[D_menu_801CEECC].type == PL_WARP_RED)) { - D_80177BD8[D_menu_801CEECC] = 5; + D_ctx_80177BD8[D_menu_801CEECC] = 5; sPaths[D_menu_801CEECC].unk_14 = 5; } @@ -3747,24 +3748,24 @@ void func_menu_801A53C8(void) { D_menu_801CEEAC = 255; sCurrentPlanetId = sNextPlanetId; - D_80177B90[gCurrentPlanet] = sCurrentPlanetId; + D_ctx_80177B90[gCurrentPlanet] = sCurrentPlanetId; - func_menu_801A6368(); + Map_801A6368(); if (sPlanets[sNextPlanetId].dest1 != PLANET_NONE) { - temp2 = func_menu_801A655C(sNextPlanetId, sPlanets[sNextPlanetId].dest1); - D_80177BD8[temp2] = 1; + temp2 = Map_801A655C(sNextPlanetId, sPlanets[sNextPlanetId].dest1); + D_ctx_80177BD8[temp2] = 1; sPaths[temp2].alpha = 255; } if (sPlanets[sNextPlanetId].dest2 != PLANET_NONE) { - temp = func_menu_801A655C(sNextPlanetId, sPlanets[sNextPlanetId].dest2); - D_80177BD8[temp] = 1; + temp = Map_801A655C(sNextPlanetId, sPlanets[sNextPlanetId].dest2); + D_ctx_80177BD8[temp] = 1; sPaths[temp].alpha = 255; } } -bool func_menu_801A5770(void) { +bool Map_801A5770(void) { bool ret = false; s8 y = gControllerPress[gMainController].stick_y; @@ -3788,7 +3789,7 @@ bool func_menu_801A5770(void) { return ret; } -void func_menu_801A5834(void) { +void Map_801A5834(void) { s32 i; f32 x; f32 y; @@ -3877,7 +3878,7 @@ void func_menu_801A5834(void) { } } -void func_menu_801A5C90(void) { +void Map_801A5C90(void) { s32 pad[3]; f32 scale; @@ -3930,14 +3931,14 @@ void func_menu_801A5C90(void) { } } -void func_menu_801A5E80(void) { +void Map_801A5E80(void) { switch (D_menu_801B8280) { case 0: D_menu_801B8284 = 0; D_menu_801CD9A0 = 1; - func_menu_801A6368(); - D_menu_801CD9A8 = func_menu_801A62FC(sCurrentPlanetId); - func_menu_801AB284(); + Map_801A6368(); + D_menu_801CD9A8 = Map_801A62FC(sCurrentPlanetId); + Map_801AB284(); D_menu_801B8280++; break; @@ -4000,16 +4001,16 @@ void func_menu_801A5E80(void) { case 5: if (D_menu_801CD9B8 == 0) { - func_menu_801A61B4(gCurrentLevel); + Map_801A61B4(gCurrentLevel); D_menu_801B8280 = 0; D_menu_801CD968 = 0; - func_menu_801A6628(); + Map_801A6628(); } break; } } -void func_menu_801A61B4(LevelId level) { +void Map_801A61B4(LevelId level) { switch (level) { case LEVEL_CORNERIA: Audio_SetAudioSpec(0, 0); @@ -4071,7 +4072,7 @@ void func_menu_801A61B4(LevelId level) { } } -bool func_menu_801A62FC(PlanetId planet) { +bool Map_801A62FC(PlanetId planet) { u32 planetSaveSlot; s32 ret = true; @@ -4104,7 +4105,7 @@ bool func_menu_801A62FC(PlanetId planet) { return ret; } -void func_menu_801A6368(void) { +void Map_801A6368(void) { switch (sCurrentPlanetId) { case PLANET_CORNERIA: gCurrentLevel = LEVEL_CORNERIA; @@ -4170,7 +4171,7 @@ void func_menu_801A6368(void) { } } -PlanetId GetPlanetId(LevelId level) { +PlanetId Map_GetPlanetId(LevelId level) { PlanetId planet; switch (level) { @@ -4239,7 +4240,7 @@ PlanetId GetPlanetId(LevelId level) { return planet; } -s32 func_menu_801A655C(PlanetId start, PlanetId end) { +s32 Map_801A655C(PlanetId start, PlanetId end) { s32 i; for (i = 0; i < 24; i++) { @@ -4251,7 +4252,7 @@ s32 func_menu_801A655C(PlanetId start, PlanetId end) { return i; } -void func_menu_801A659C(void) { +void Map_801A659C(void) { Audio_KillSfxById(0x1100004C); Audio_KillSfxById(0x1100204C); @@ -4264,21 +4265,21 @@ void func_menu_801A659C(void) { D_menu_801CD948 = 0; } -void func_menu_801A6628(void) { +void Map_801A6628(void) { gGameState = GSTATE_PLAY; D_Timer_8017783C = 2; - D_80177854 = 0; + D_ctx_80177854 = 0; gDrawMode = DRAWMODE_0; gHitCount = 0; - func_800A5844(); + func_play_800A5844(); - D_80177CA0 = 0; - D_80177CB0 = 0.0f; - D_8017782C = 1; + D_ctx_80177CA0 = 0; + D_ctx_80177CB0 = 0.0f; + D_ctx_8017782C = 1; } -void func_menu_801A6694(void) { +void Map_801A6694(void) { PlanetId planetId; Vec3f dest; Vec3f src; @@ -4295,7 +4296,7 @@ void func_menu_801A6694(void) { Matrix_RotateY(gGfxMatrix, M_DTOR * -sPlanets[planetId].longitude, 1); - func_menu_801AD048(); + Map_801AD048(); Matrix_SetGfxMtx(&gMasterDisp); @@ -4324,7 +4325,7 @@ void func_menu_801A6694(void) { } } -void func_menu_801A68E4(void) { +void Map_801A68E4(void) { s32 i; s32 j; s32 var_a0; @@ -4340,19 +4341,19 @@ void func_menu_801A68E4(void) { } } -void func_menu_801A6A24(void) { +void Map_801A6A24(void) { switch (D_menu_801CD960) { case 0: - if (D_80178340 != 0) { - D_80178340 -= 5; + if (D_ctx_80178340 != 0) { + D_ctx_80178340 -= 5; } else { D_menu_801CD960 = 255; } break; case 1: - if (D_80178340 != 255) { - D_80178340 += 15; + if (D_ctx_80178340 != 255) { + D_ctx_80178340 += 15; } else { D_menu_801CD960 = 255; } @@ -4360,7 +4361,7 @@ void func_menu_801A6A24(void) { } } -void func_menu_801A6A98(PlanetId planetId) { +void Map_801A6A98(PlanetId planetId) { s32 mask; s32 temp; @@ -4374,79 +4375,79 @@ void func_menu_801A6A98(PlanetId planetId) { mask = 0xFFFFFFFF; } - temp = func_menu_801A6DAC(planetId); + temp = Map_801A6DAC(planetId); - func_menu_801A6EC0(planetId); - func_menu_801A7D3C(planetId); + Map_801A6EC0(planetId); + Map_801A7D3C(planetId); Matrix_Push(&gGfxMatrix); if (gGameFrameCount & mask) { if (planetId == PLANET_TITANIA) { - func_menu_801A791C(planetId); + Map_801A791C(planetId); } if ((temp == 1) && (D_menu_801CE960[planetId].z > D_menu_801CEA18[planetId]) && (planetId != PLANET_AREA_6) && (planetId != PLANET_BOLSE)) { - func_menu_801A7F1C(planetId); + Map_801A7F1C(planetId); } - func_menu_801A7230(planetId); + Map_801A7230(planetId); if (planetId == PLANET_SOLAR) { - func_menu_801A74F4(planetId); + Map_801A74F4(planetId); } if (sPlanets[planetId].anim == PL_ANIM_SPIN) { if (planetId != PLANET_VENOM) { if ((planetId != PLANET_AQUAS) && (planetId != PLANET_TITANIA)) { - func_menu_801A7684(planetId); + Map_801A7684(planetId); } - func_menu_801A77B0(planetId); + Map_801A77B0(planetId); } if (planetId == PLANET_VENOM) { - func_menu_801A7BEC(&D_menu_801CEEBC, 0.1f, 3.1f); - func_menu_801A7BEC(&D_menu_801CEEC0, -0.1f, 2.9f); + Map_801A7BEC(&D_menu_801CEEBC, 0.1f, 3.1f); + Map_801A7BEC(&D_menu_801CEEC0, -0.1f, 2.9f); } } if (planetId == PLANET_TITANIA) { - func_menu_801A7A84(planetId); + Map_801A7A84(planetId); } if ((planetId == PLANET_CORNERIA) && D_menu_801CEB48[0]) { - func_menu_801A89BC(PLANET_CORNERIA, 0); + Map_801A89BC(PLANET_CORNERIA, 0); } if ((planetId == PLANET_KATINA) && D_menu_801CEB48[1]) { - func_menu_801A89BC(PLANET_KATINA, 1); + Map_801A89BC(PLANET_KATINA, 1); } if ((planetId == PLANET_SECTOR_Y) && D_menu_801CEB48[2]) { - func_menu_801A89BC(PLANET_SECTOR_Y, 2); + Map_801A89BC(PLANET_SECTOR_Y, 2); } if ((temp == 1) && (D_menu_801CE960[planetId].z <= D_menu_801CEA18[planetId]) && (planetId != PLANET_AREA_6) && (planetId != PLANET_BOLSE)) { - func_menu_801A7F1C(planetId); + Map_801A7F1C(planetId); } if ((temp == 1) && ((planetId == PLANET_AREA_6) || (planetId == PLANET_BOLSE))) { - func_menu_801A7F1C(planetId); + Map_801A7F1C(planetId); } if (temp == 2) { - func_menu_801A809C(planetId); + Map_801A809C(planetId); } } Matrix_Pop(&gGfxMatrix); } -s32 func_menu_801A6DAC(PlanetId planetId) { +s32 Map_801A6DAC(PlanetId planetId) { s32 ret; s32 planetSaveSlot; s32 var_v0; @@ -4489,7 +4490,7 @@ s32 func_menu_801A6DAC(PlanetId planetId) { return ret; } -void func_menu_801A6EC0(PlanetId planetId) { +void Map_801A6EC0(PlanetId planetId) { f32 dirX; f32 dirY; f32 dirZ; @@ -4556,7 +4557,7 @@ void func_menu_801A6EC0(PlanetId planetId) { D_menu_801AFFFC -= 0.09f; } -void func_menu_801A7230(PlanetId planetId) { +void Map_801A7230(PlanetId planetId) { switch (sPlanets[planetId].anim) { case PL_ANIM_STATIC: if ((D_menu_801CD944 == 3 || planetId == sCurrentPlanetId || planetId == sNextPlanetId) && @@ -4605,7 +4606,7 @@ void func_menu_801A7230(PlanetId planetId) { Matrix_Pop(&gGfxMatrix); } -void func_menu_801A74F4(PlanetId planetId) { +void Map_801A74F4(PlanetId planetId) { static f32 D_menu_801B6A74 = 0.0f; s32 alpha = sPlanets[PLANET_VENOM].alpha; @@ -4633,7 +4634,7 @@ void func_menu_801A74F4(PlanetId planetId) { D_menu_801B6A74 -= 0.2f; } -void func_menu_801A7684(PlanetId planetId) { +void Map_801A7684(PlanetId planetId) { s32 r; s32 g; s32 b; @@ -4657,7 +4658,7 @@ void func_menu_801A7684(PlanetId planetId) { Matrix_Pop(&gGfxMatrix); } -void func_menu_801A77B0(PlanetId planetId) { +void Map_801A77B0(PlanetId planetId) { RCP_SetupDL(&gMasterDisp, 0x40); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, sPlanets[planetId].alpha); @@ -4680,7 +4681,7 @@ void func_menu_801A77B0(PlanetId planetId) { Matrix_Pop(&gGfxMatrix); } -void func_menu_801A791C(PlanetId planetId) { +void Map_801A791C(PlanetId planetId) { RCP_SetupDL(&gMasterDisp, 0x43); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 175, 175, sPlanets[planetId].alpha); @@ -4702,7 +4703,7 @@ void func_menu_801A791C(PlanetId planetId) { Matrix_Pop(&gGfxMatrix); } -void func_menu_801A7A84(PlanetId planetId) { +void Map_801A7A84(PlanetId planetId) { RCP_SetupDL(&gMasterDisp, 0x43); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 175, 175, sPlanets[planetId].alpha); @@ -4722,7 +4723,7 @@ void func_menu_801A7A84(PlanetId planetId) { Matrix_Pop(&gGfxMatrix); } -void func_menu_801A7BEC(f32* zAngle, f32 next, f32 scale) { +void Map_801A7BEC(f32* zAngle, f32 next, f32 scale) { s32 alpha = sPlanets[PLANET_VENOM].alpha; if (sPlanets[PLANET_VENOM].alpha > 128) { @@ -4749,7 +4750,7 @@ void func_menu_801A7BEC(f32* zAngle, f32 next, f32 scale) { *zAngle += next; } -void func_menu_801A7D3C(PlanetId planetId) { +void Map_801A7D3C(PlanetId planetId) { Vec3f src; Vec3f dest; f32 scale; @@ -4783,7 +4784,7 @@ void func_menu_801A7D3C(PlanetId planetId) { Matrix_Pop(&gGfxMatrix); } -void func_menu_801A7F1C(PlanetId planetId) { +void Map_801A7F1C(PlanetId planetId) { s32 alpha; if (D_menu_801CD980 != 1) { @@ -4815,7 +4816,7 @@ void func_menu_801A7F1C(PlanetId planetId) { } } -void func_menu_801A809C(PlanetId planetId) { +void Map_801A809C(PlanetId planetId) { static f32 D_menu_801B6A78 = 0.0f; s32 i; s32 alpha; @@ -4954,7 +4955,7 @@ void func_menu_801A809C(PlanetId planetId) { } } -void func_menu_801A8738(void) { +void Map_801A8738(void) { if (D_menu_801CEB34 >= 0) { RCP_SetupDL(&gMasterDisp, 0x43); @@ -5009,7 +5010,7 @@ void func_menu_801A8738(void) { } } -void func_menu_801A89BC(PlanetId planetId, s32 arg1) { +void Map_801A89BC(PlanetId planetId, s32 arg1) { s32 i; s32 temp2; f32 temp; @@ -5094,7 +5095,7 @@ void func_menu_801A89BC(PlanetId planetId, s32 arg1) { } } -void func_menu_801A8F40(void) { +void Map_801A8F40(void) { static f32 D_menu_801B6A7C = 0.0f; s32 temp; @@ -5128,7 +5129,7 @@ void func_menu_801A8F40(void) { } } -void func_menu_801A914C(void) { +void Map_801A914C(void) { D_menu_801CEAA8 = 140.0f; if (sCurrentPlanetId == 9) { @@ -5163,7 +5164,7 @@ void func_menu_801A914C(void) { D_menu_801CEAB0 = D_menu_801CEAA8; } -void func_menu_801A9224(void) { +void Map_801A9224(void) { s32 i; s32 mask; @@ -5189,7 +5190,7 @@ void func_menu_801A9224(void) { 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_menu_801AD048(); + Map_801AD048(); Matrix_Scale(gGfxMatrix, D_menu_801AFA38[i].scale, D_menu_801AFA38[i].scale, D_menu_801AFA38[i].scale, 1); @@ -5204,7 +5205,7 @@ void func_menu_801A9224(void) { } } -void func_menu_801A9448(void) { +void Map_801A9448(void) { Vec3f src; Vec3f dest; f32 x1; @@ -5245,7 +5246,7 @@ void func_menu_801A9448(void) { 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_menu_801AD048(); + Map_801AD048(); 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); @@ -5278,19 +5279,19 @@ void func_menu_801A9448(void) { } } -void func_menu_801A9814(void) { +void Map_801A9814(void) { if (D_menu_801B8280 != 0) { Matrix_Push(&gGfxMatrix); 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_menu_801B8284); + func_fade_80084688(2, D_menu_801B8284); Matrix_Pop(&gGfxMatrix); } } -void func_menu_801A9910(void) { +void Map_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_menu_801B6A84[sCurrentPlanetId]; @@ -5310,7 +5311,7 @@ void func_menu_801A9910(void) { D_menu_801CEA70 *= 1.08; } -void func_menu_801A9A8C(void) { +void Map_801A9A8C(void) { s32 i; s32 sp58; u8* sp54; @@ -5406,7 +5407,7 @@ void func_menu_801A9A8C(void) { } } -void func_menu_801A9DE8(void) { +void Map_801A9DE8(void) { s32 mask; if ((D_menu_801CD978 == 0) && @@ -5421,30 +5422,30 @@ void func_menu_801A9DE8(void) { } if (gGameFrameCount & mask) { - func_menu_801AD7EC(254, 16, gLifeCount[gPlayerNum]); + Map_801AD7EC(254, 16, gLifeCount[gPlayerNum]); } - if ((D_80161A34 == 7) || (D_80161A34 == 5)) { + if ((D_game_80161A34 == 7) || (D_game_80161A34 == 5)) { if (D_menu_801CD83C < gTotalHits) { D_menu_801CD83C = gTotalHits; } - func_menu_801A9EE4(); - func_menu_801A9FD4(0); + Map_801A9EE4(); + Map_801A9FD4(0); } } -void func_menu_801A9EE4(void) { +void Map_801A9EE4(void) { RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255); Graphics_DisplaySmallText(24, 14, 1.0f, 1.0f, "TOTAL HITS"); - Graphics_DisplaySmallNumber(71 - (func_8008BCBC(gTotalHits) * 8), 24, gTotalHits); + Graphics_DisplaySmallNumber(71 - (func_hud_8008BCBC(gTotalHits) * 8), 24, gTotalHits); Graphics_DisplaySmallText(143, 14, 1.0f, 1.0f, "TOP"); - Graphics_DisplaySmallNumber(167 - (func_8008BCBC(D_menu_801CD83C) * 8), 24, D_menu_801CD83C); + Graphics_DisplaySmallNumber(167 - (func_hud_8008BCBC(D_menu_801CD83C) * 8), 24, D_menu_801CD83C); } -void func_menu_801A9FD4(s32 arg0) { +void Map_801A9FD4(s32 arg0) { s32 i; s32 var_s3; f32 var_fs0, var_fs1; @@ -5454,21 +5455,21 @@ void func_menu_801A9FD4(s32 arg0) { if (arg0) { var_s3 = gCurrentPlanet; } else { - if ((D_80161A34 == 7) || (D_80161A34 == 8)) { + if ((D_game_80161A34 == 7) || (D_game_80161A34 == 8)) { var_s3 = gCurrentPlanet; } - if (D_80161A34 == 5) { + if (D_game_80161A34 == 5) { var_s3 = D_menu_801CD9AC; } } - func_menu_801AA1CC(var_s3); + Map_801AA1CC(var_s3); - if ((D_80161A34 == 7) || (D_80161A34 == 8)) { + if ((D_game_80161A34 == 7) || (D_game_80161A34 == 8)) { var_s3 = 7; } - if (D_80161A34 == 5) { + if (D_game_80161A34 == 5) { var_s3++; } @@ -5479,16 +5480,16 @@ void func_menu_801A9FD4(s32 arg0) { Matrix_SetGfxMtx(&gMasterDisp); 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] != PLANET_NONE) { - func_menu_801AA434(i, 28.0f + var_fs0, 182.0f, D_80177B90[i]); - func_menu_801AA778(i, var_fs1, -25.4f, D_80177B90[i]); + if (D_ctx_80177B90[i] != PLANET_NONE) { + Map_801AA434(i, 28.0f + var_fs0, 182.0f, D_ctx_80177B90[i]); + Map_801AA778(i, var_fs1, -25.4f, D_ctx_80177B90[i]); } } Matrix_Pop(&gGfxMatrix); } -void func_menu_801AA1CC(s32 arg0) { +void Map_801AA1CC(s32 arg0) { s32 i; f32 x; s32 r; @@ -5497,7 +5498,7 @@ void func_menu_801AA1CC(s32 arg0) { s32 temp; f32 y = 182.0f; f32 x2 = 16.0f; - PlanetId* ptr = &D_80177B90[0]; + PlanetId* ptr = &D_ctx_80177B90[0]; for (x = 0.0f, i = 0; i < 7; i++, x += 24.0f + x2, ptr++) { RCP_SetupDL(&gMasterDisp, 0x53); @@ -5505,7 +5506,7 @@ void func_menu_801AA1CC(s32 arg0) { if (i < 6) { r = g = b = 255; if (i < arg0) { - temp = func_menu_801A655C(*ptr, *(ptr + 1)); + temp = Map_801A655C(*ptr, *(ptr + 1)); switch (sPaths[temp].type) { case 0: r = 16; @@ -5536,7 +5537,7 @@ void func_menu_801AA1CC(s32 arg0) { } } -void func_menu_801AA434(s32 arg0, f32 x, f32 y, s32 idx) { +void Map_801AA434(s32 arg0, f32 x, f32 y, s32 idx) { s32 i; f32 x2; s32 pad; @@ -5553,13 +5554,13 @@ void func_menu_801AA434(s32 arg0, f32 x, f32 y, s32 idx) { Graphics_DisplaySmallText(x + 12.0f - Graphics_GetSmallTextWidth(sPlanetNames[idx]) * 0.5f, y - 8.0f, 1.0f, 1.0f, sPlanetNames[idx]); - Graphics_DisplaySmallNumber(x + 15.0f - ((func_8008BCBC(D_80177B70[arg0]) - 1) * 8), y + 24.0f + 1.0f, - D_80177B70[arg0]); + Graphics_DisplaySmallNumber(x + 15.0f - ((func_hud_8008BCBC(D_ctx_80177B70[arg0]) - 1) * 8), y + 24.0f + 1.0f, + D_ctx_80177B70[arg0]); - if (D_80161A34 == 7) { + if (D_game_80161A34 == 7) { temp = gCurrentPlanet; } - if ((D_80161A34 == 5) || (D_80161A34 == 8)) { + if ((D_game_80161A34 == 5) || (D_game_80161A34 == 8)) { temp = gCurrentPlanet + 1; } @@ -5567,7 +5568,7 @@ void func_menu_801AA434(s32 arg0, f32 x, f32 y, s32 idx) { mask = 0x00FF0000; x2 = 0.0f; for (i = 0; i < 3; i++, x2 += 9.0f) { - if ((D_80177B50[arg0] & mask)) { + if ((D_ctx_80177B50[arg0] & mask)) { RCP_SetupDL(&gMasterDisp, 0x53); 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, @@ -5578,7 +5579,7 @@ void func_menu_801AA434(s32 arg0, f32 x, f32 y, s32 idx) { } } -void func_menu_801AA778(s32 arg0, f32 x, f32 y, PlanetId planetId) { +void Map_801AA778(s32 arg0, f32 x, f32 y, PlanetId planetId) { s32 mask = 0xFFFFFFFF; if ((gGameState == GSTATE_MAP) && (planetId == sCurrentPlanetId)) { @@ -5739,12 +5740,12 @@ void func_menu_801AA778(s32 arg0, f32 x, f32 y, PlanetId planetId) { break; } - if (D_80177BB0[arg0] != 0) { - func_menu_801AB17C(x, y, 0.0f); + if (D_ctx_80177BB0[arg0] != 0) { + Map_801AB17C(x, y, 0.0f); } } -void func_menu_801AB17C(f32 x, f32 y, f32 z) { +void Map_801AB17C(f32 x, f32 y, f32 z) { static f32 scale = 0.23f; static f32 xPos = 4.4f; static f32 yPos = 1.0f; @@ -5763,16 +5764,16 @@ void func_menu_801AB17C(f32 x, f32 y, f32 z) { Matrix_Pop(&gGfxMatrix); } -void func_menu_801AB284(void) { +void Map_801AB284(void) { D_menu_801CD940 = 0; - D_80178308 = D_menu_801AF428[sCurrentPlanetId][D_menu_801CD940]; - D_80177D68 = D_menu_801AF420[D_menu_801CD940]; + D_ctx_80178308 = D_menu_801AF428[sCurrentPlanetId][D_menu_801CD940]; + D_ctx_80177D68 = D_menu_801AF420[D_menu_801CD940]; D_menu_801CF018 = 100; - D_80178728 = 78; - D_8017872C = 166; + D_radio_80178728 = 78; + D_radio_8017872C = 166; } -void func_menu_801AB300(void) { +void Map_801AB300(void) { if (D_Timer_801782AC > 0) { D_Timer_801782AC--; } @@ -5786,10 +5787,10 @@ void func_menu_801AB300(void) { case 100: D_menu_801CEA74 = 0; - D_801782A4 = 0 + D_80177D68; + D_ctx_801782A4 = 0 + D_ctx_80177D68; D_menu_801CF018 = 1; - D_80177D50 = 0.0f; - D_801782D8 = 0; + D_ctx_80177D50 = 0.0f; + D_ctx_801782D8 = 0; D_menu_801CF124 = 0.0f; D_menu_801CEAB4 = 0; break; @@ -5805,13 +5806,13 @@ void func_menu_801AB300(void) { } D_menu_801CD940 = 1; - D_80178308 = D_menu_801AF428[sCurrentPlanetId][D_menu_801CD940]; + D_ctx_80178308 = D_menu_801AF428[sCurrentPlanetId][D_menu_801CD940]; - Audio_PlayVoice(Message_IdFromPtr(D_80178308)); + Audio_PlayVoice(Message_IdFromPtr(D_ctx_80178308)); - D_80177D68 = D_menu_801AF420[D_menu_801CD940]; - D_Timer_801782AC = Message_GetCharCount(D_80178308) * 2; - D_801782A4 = D_80177D68; + D_ctx_80177D68 = D_menu_801AF420[D_menu_801CD940]; + D_Timer_801782AC = Message_GetCharCount(D_ctx_80178308) * 2; + D_ctx_801782A4 = D_ctx_80177D68; D_menu_801CF018 = 4; D_menu_801CD9A0 = 1; break; @@ -5820,12 +5821,12 @@ void func_menu_801AB300(void) { D_menu_801CEA74 += 8; if (D_menu_801CEA74 > 255) { D_menu_801CEA74 = 255; - D_80177D50 = 1.3f; + D_ctx_80177D50 = 1.3f; AUDIO_PLAY_SFX(0x4100001EU, gDefaultSfxSource, 4U); - Audio_PlayVoice(Message_IdFromPtr(D_80178308)); + Audio_PlayVoice(Message_IdFromPtr(D_ctx_80178308)); - D_Timer_801782AC = Message_GetCharCount(D_80178308) * 2; + D_Timer_801782AC = Message_GetCharCount(D_ctx_80178308) * 2; D_menu_801CD9A4 = 0; D_menu_801CF018 = 4; } @@ -5833,10 +5834,10 @@ void func_menu_801AB300(void) { case 4: if (!D_Timer_801782AC && !Audio_GetCurrentVoice()) { - D_801782A4 = D_80177D68; + D_ctx_801782A4 = D_ctx_80177D68; Audio_ClearVoice(); if (D_menu_801CD940 == 0) { - D_801782D8 = 0; + D_ctx_801782D8 = 0; D_Timer_801782AC = 30; } else { D_Timer_801782AC = 20; @@ -5845,21 +5846,21 @@ void func_menu_801AB300(void) { break; } - D_801782A4 = D_80177D68; + D_ctx_801782A4 = D_ctx_80177D68; if (D_Timer_801782B4 > 0) { - D_801782A4 = 1 + D_80177D68; + D_ctx_801782A4 = 1 + D_ctx_80177D68; } - if (D_801782D8 >= Message_GetCharCount(D_80178308)) { + if (D_ctx_801782D8 >= Message_GetCharCount(D_ctx_80178308)) { D_menu_801CD9A4 = 1; } if (D_menu_801CD9A0 == 1) { D_menu_801CF124 += 0.7f; - D_801782D8 = D_menu_801CF124; + D_ctx_801782D8 = D_menu_801CF124; } else { - D_801782D8 += 2; + D_ctx_801782D8 += 2; } if (D_menu_801CEAB4) { @@ -5883,13 +5884,13 @@ void func_menu_801AB300(void) { break; } else { D_menu_801CD940 = 1; - D_80178308 = D_menu_801AF428[sCurrentPlanetId][D_menu_801CD940]; - Audio_PlayVoice(Message_IdFromPtr(D_80178308)); - D_80177D68 = D_menu_801AF420[D_menu_801CD940]; - D_801782A4 = D_80177D68; - D_801782D8 = 0; + D_ctx_80178308 = D_menu_801AF428[sCurrentPlanetId][D_menu_801CD940]; + Audio_PlayVoice(Message_IdFromPtr(D_ctx_80178308)); + D_ctx_80177D68 = D_menu_801AF420[D_menu_801CD940]; + D_ctx_801782A4 = D_ctx_80177D68; + D_ctx_801782D8 = 0; D_menu_801CF124 = 0.0f; - D_Timer_801782AC = Message_GetCharCount(D_80178308) * 2; + D_Timer_801782AC = Message_GetCharCount(D_ctx_80178308) * 2; D_menu_801CD9A0 = 1; D_menu_801CD9A4 = 0; D_menu_801CF018 = 4; @@ -5898,7 +5899,7 @@ void func_menu_801AB300(void) { case 5: D_Timer_801782AC = 5; - D_801782A4 = D_80177D68; + D_ctx_801782A4 = D_ctx_80177D68; D_menu_801CF018++; break; @@ -5906,7 +5907,7 @@ void func_menu_801AB300(void) { if (D_Timer_801782AC == 0) { Audio_KillSfxById(0x4100001EU); Audio_PlayVoice(0); - D_80177D50 = 0.0f; + D_ctx_80177D50 = 0.0f; D_menu_801CF018++; D_menu_801CF018 = 7; } @@ -5916,20 +5917,20 @@ void func_menu_801AB300(void) { break; case 8: - D_801782A4 = D_80177D68; - D_80177D50 = 1.3f; + D_ctx_801782A4 = D_ctx_80177D68; + D_ctx_80177D50 = 1.3f; D_menu_801CEA74 = 255; break; } 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(); + Map_801AB978(D_ctx_801782A4); + Map_801AB978(D_menu_801AF420[!D_menu_801CD940]); + func_radio_800BB388(); } } -void func_menu_801AB978(s32 arg0) { +void Map_801AB978(s32 arg0) { s32 i; f32 xPos; f32 yPos; @@ -5992,14 +5993,14 @@ void func_menu_801AB978(s32 arg0) { 1.0f); if ((gSavedTeamShields[3 - i] < 0) && (gSavedTeamShields[3 - i] != -2)) { - func_menu_801ABCDC(i, D_menu_801CEA74); + Map_801ABCDC(i, D_menu_801CEA74); } } } } } -void func_menu_801ABCDC(s32 arg0, s32 alpha) { +void Map_801ABCDC(s32 arg0, s32 alpha) { static s32 D_menu_801B6B24[] = { 81.0f, 125.0f, 170.0f }; Matrix_Push(&gGfxMatrix); @@ -6038,7 +6039,7 @@ void func_menu_801ABCDC(s32 arg0, s32 alpha) { Matrix_Pop(&gGfxMatrix); } -void func_menu_801ABF1C(void) { +void Map_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); @@ -6052,7 +6053,7 @@ void func_menu_801ABF1C(void) { Matrix_Translate(gGfxMatrix, D_menu_801CEA88, D_menu_801CEA8C, D_menu_801CEA90, 1); Matrix_RotateY(gGfxMatrix, M_DTOR * D_menu_801CEA94, 1); - func_menu_801AD048(); + Map_801AD048(); Matrix_Scale(gGfxMatrix, D_menu_801CEA78, D_menu_801CEA7C, 1.0f, 1); @@ -6076,7 +6077,7 @@ void func_menu_801ABF1C(void) { 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_menu_801AD048(); + Map_801AD048(); Matrix_Scale(gGfxMatrix, D_menu_801CEA80, D_menu_801CEA84, 3.3f, 1); @@ -6091,7 +6092,7 @@ void func_menu_801ABF1C(void) { Matrix_Pop(&gGfxMatrix); } -void func_menu_801AC200(s32 index) { +void Map_801AC200(s32 index) { // f32 z; // f32 x; // f32 y; @@ -6176,13 +6177,13 @@ void func_menu_801AC200(s32 index) { } if (sPaths[index].unk_14 == 5) { - func_menu_801AC80C(sPaths[index].type); + Map_801AC80C(sPaths[index].type); } else { - func_menu_801AC530(index); + Map_801AC530(index); } } -void func_menu_801AC530(s32 index) { +void Map_801AC530(s32 index) { f32 dirX; f32 dirY; f32 dirZ; @@ -6245,7 +6246,7 @@ void func_menu_801AC530(s32 index) { Matrix_Pop(&gGfxMatrix); } -void func_menu_801AC80C(PathType pathType) { +void Map_801AC80C(PathType pathType) { static f32 D_menu_801B6B30 = 0.0f; s32 r; s32 g; @@ -6270,7 +6271,7 @@ void func_menu_801AC80C(PathType pathType) { Matrix_Translate(gGfxMatrix, D_menu_801CEEB0.x, D_menu_801CEEB0.y, D_menu_801CEEB0.z, 1); - func_menu_801AD048(); + Map_801AD048(); Matrix_RotateZ(gGfxMatrix, M_DTOR * D_menu_801B6B30, 1); Matrix_Scale(gGfxMatrix, 10.0f, 10.0f, 10.0f, 1); @@ -6314,7 +6315,7 @@ CameraPoint D_menu_801B6C60[] = { { { -118.46446f, 1.314066f, 27.860361f }, { -111.59918f, -2.346546f, -49.750645f } }, }; -void func_menu_801AC9A0(s32 index) { +void Map_801AC9A0(s32 index) { Vec3f srcPos; Vec3f destPos; f32 x; @@ -6323,7 +6324,7 @@ void func_menu_801AC9A0(s32 index) { f32 target; f32 temp; - func_menu_801ACD90(index, &srcPos, &destPos); + Map_801ACD90(index, &srcPos, &destPos); x = srcPos.x - destPos.x; y = srcPos.y - destPos.y; @@ -6344,10 +6345,10 @@ void func_menu_801AC9A0(s32 index) { gTexturedLines[index].unk_20 = Math_Atan2F(x, z); gTexturedLines[index].unk_1C = -Math_Atan2F(y, sqrtf(SQ(x) + SQ(z))); - switch (D_80177BD8[index]) { + switch (D_ctx_80177BD8[index]) { case 1: AUDIO_PLAY_SFX(0x1900404DU, gDefaultSfxSource, 4U); - D_80177BD8[index] = 11; + D_ctx_80177BD8[index] = 11; break; case 11: @@ -6355,7 +6356,7 @@ void func_menu_801AC9A0(s32 index) { gTexturedLines[index].unk_2F = 255; if (gTexturedLines[index].unk_24 == target) { Audio_KillSfxById(0x1900404DU); - D_80177BD8[index] = 4; + D_ctx_80177BD8[index] = 4; } break; @@ -6364,7 +6365,7 @@ void func_menu_801AC9A0(s32 index) { Math_SmoothStepToF(&gTexturedLines[index].unk_24, target, 0.1f, 100.0f, 1.0f); if (gTexturedLines[index].unk_24 == target) { gTexturedLines[index].unk_24 = 0.0f; - D_80177BD8[index] = 6; + D_ctx_80177BD8[index] = 6; D_menu_801CEEAC = 255; } break; @@ -6377,7 +6378,7 @@ void func_menu_801AC9A0(s32 index) { Math_SmoothStepToF(&gTexturedLines[index].unk_24, target, temp, 100.0f, 4.0f); gTexturedLines[index].unk_2F = 255; if (gTexturedLines[index].unk_24 == target) { - D_80177BD8[index] = 3; + D_ctx_80177BD8[index] = 3; } break; @@ -6388,7 +6389,7 @@ void func_menu_801AC9A0(s32 index) { break; } - if ((D_80177BD8[index] == 1) || (D_80177BD8[index] == 11) || (D_80177BD8[index] == 4)) { + if ((D_ctx_80177BD8[index] == 1) || (D_ctx_80177BD8[index] == 11) || (D_ctx_80177BD8[index] == 4)) { gTexturedLines[index].unk_2C = 32; gTexturedLines[index].unk_2D = 32; gTexturedLines[index].unk_2E = 32; @@ -6428,7 +6429,7 @@ void func_menu_801AC9A0(s32 index) { } } -void func_menu_801ACD90(s32 index, Vec3f* src, Vec3f* dest) { +void Map_801ACD90(s32 index, Vec3f* src, Vec3f* dest) { f32 x1; f32 y1; f32 z1; @@ -6526,7 +6527,7 @@ void func_menu_801ACD90(s32 index, Vec3f* src, Vec3f* dest) { dest->z = z2; } -void func_menu_801AD048(void) { +void Map_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); @@ -6535,7 +6536,7 @@ void func_menu_801AD048(void) { Matrix_RotateX(gGfxMatrix, -sp1C, 1); } -void func_menu_801AD11C(void) { +void Map_801AD11C(void) { s32 i; s32 var_t0; s32 var_a3; @@ -6549,7 +6550,7 @@ void func_menu_801AD11C(void) { var_t0 = 0; if (gControllerPress[gMainController].button & A_BUTTON) { - if ((D_80161A34 == 7) && (D_menu_801CD93C != 0) && (!D_menu_801CEFD0)) { + if ((D_game_80161A34 == 7) && (D_menu_801CD93C != 0) && (!D_menu_801CEFD0)) { func_8001D6DC(1); D_menu_801CEFC4 = 1; D_menu_801CEFD4 = 0; @@ -6558,15 +6559,15 @@ void func_menu_801AD11C(void) { D_menu_801CD94C = 0; } else { for (i = 0; i < 6; i++) { - D_80177C58[i] = gTeamShields[i]; + D_ctx_80177C58[i] = gTeamShields[i]; } - func_menu_801A659C(); + Map_801A659C(); } return; } if (gControllerPress[gMainController].button & START_BUTTON) { - if (D_menu_801CD944 == 3 && D_80161A34 == 7) { + if (D_menu_801CD944 == 3 && D_game_80161A34 == 7) { if (D_menu_801CEFD0) { AUDIO_PLAY_SFX(0x4900100AU, gDefaultSfxSource, 4U); } else { @@ -6680,7 +6681,7 @@ void func_menu_801AD11C(void) { void func_dummy_() { } -void func_menu_801AD718(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f32* arg5, f32 arg6, f32 arg7, f32 arg8) { +void Map_801AD718(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f32* arg5, f32 arg6, f32 arg7, f32 arg8) { Vec3f sp2C; Vec3f sp20; @@ -6698,7 +6699,7 @@ void func_menu_801AD718(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f32* *arg5 = sp2C.z; } -void func_menu_801AD7EC(s32 xPos, s32 yPos, s32 number) { +void Map_801AD7EC(s32 xPos, s32 yPos, s32 number) { RCP_SetupDL(&gMasterDisp, 0x55); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); @@ -6714,7 +6715,7 @@ void func_menu_801AD7EC(s32 xPos, s32 yPos, s32 number) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255); if (number >= 10) { - Graphics_DisplaySmallNumber(xPos + 33.0f - ((func_8008BCBC(number) - 1) * 8) + 3, yPos + 8.0f, number); + Graphics_DisplaySmallNumber(xPos + 33.0f - ((func_hud_8008BCBC(number) - 1) * 8) + 3, yPos + 8.0f, number); } else { Graphics_DisplaySmallNumber(xPos + 33.0f, yPos + 8.0f, number); } diff --git a/src/overlays/ovl_menu/fox_option.c b/src/overlays/ovl_menu/fox_option.c index e066f904..48ffff9f 100644 --- a/src/overlays/ovl_menu/fox_option.c +++ b/src/overlays/ovl_menu/fox_option.c @@ -7,6 +7,11 @@ #include "mods.h" #include "global.h" #include "fox_option.h" +#include "assets/ast_font.h" +#include "assets/ast_font_3d.h" +#include "assets/ast_option.h" +#include "assets/ast_vs_menu.h" +#include "assets/ast_map.h" extern s32 D_menu_801B81A8[][3]; extern Gfx D_menu_801B4A40[]; @@ -19,13 +24,6 @@ extern Gfx D_menu_801B5440[]; extern Gfx D_menu_801B50D8[]; extern Gfx D_menu_801B5E78[]; extern Gfx D_menu_801B57A8[]; - -#include "assets/ast_font.h" -#include "assets/ast_font_3d.h" -#include "assets/ast_option.h" -#include "assets/ast_vs_menu.h" -#include "assets/ast_map.h" - extern f32 D_menu_801CD818[]; s32 D_menu_801B9090; @@ -41,7 +39,7 @@ f32 D_menu_801B9100[3]; // gap f32 D_menu_801B9110[3]; f32 D_menu_801B911C; f32 D_menu_801B9120; -enum OptionId D_menu_801B9124; +OptionId D_menu_801B9124; s32 D_menu_801B9128; s32 D_menu_801B912C; s32 D_menu_801B9130; @@ -398,18 +396,18 @@ void Option_Setup(void) { } D_menu_801B91C8 = enableExpertModes; - D_80178348 = 0; - D_80178350 = 0; - D_80178354 = 0; - D_80178340 = 0; + D_ctx_80178348 = 0; + D_ctx_80178350 = 0; + D_ctx_80178354 = 0; + D_ctx_80178340 = 0; gBlurAlpha = 0xFF; gBgColor = 0; D_menu_801B91A4 = 0; - if ((D_80161A34 == 7) && (gCurrentLevel == LEVEL_TRAINING)) { - D_80161A34 = 0; + if ((D_game_80161A34 == 7) && (gCurrentLevel == LEVEL_TRAINING)) { + D_game_80161A34 = 0; D_menu_801B91A4 = 1; } @@ -426,10 +424,10 @@ void Option_Setup(void) { D_menu_801B9124 = OPTION_MAIN; - if ((D_80161A34 == 5) || (D_80161A34 == 8)) { - if (D_80161A34 == 8) { - D_80177B90[gCurrentPlanet] = PLANET_VENOM; - if (D_800D3180[LEVEL_VENOM_ANDROSS] == 1) { + if ((D_game_80161A34 == 5) || (D_game_80161A34 == 8)) { + if (D_game_80161A34 == 8) { + D_ctx_80177B90[gCurrentPlanet] = PLANET_VENOM; + if (D_play_800D3180[LEVEL_VENOM_ANDROSS] == 1) { gSaveFile.save.data.planet[SAVE_SLOT_VENOM_1].played = 1; if (playedExpertMode) { gSaveFile.save.data.planet[SAVE_SLOT_VENOM_1].expertClear = 1; @@ -437,8 +435,8 @@ void Option_Setup(void) { gSaveFile.save.data.planet[SAVE_SLOT_VENOM_1].normalClear = 1; } Save_Write(); - } else if (D_800D3180[LEVEL_VENOM_ANDROSS] == 2) { - D_80177BB0[gCurrentPlanet] = 1; + } else if (D_play_800D3180[LEVEL_VENOM_ANDROSS] == 2) { + D_ctx_80177BB0[gCurrentPlanet] = 1; gSaveFile.save.data.planet[SAVE_SLOT_VENOM_2].played = 1; if (playedExpertMode) { gSaveFile.save.data.planet[SAVE_SLOT_VENOM_2].expertClear = 1; @@ -451,8 +449,8 @@ void Option_Setup(void) { } } - func_menu_80188010(); - D_menu_801B9094 = func_menu_8019C8C4(); + Title_80188010(); + D_menu_801B9094 = Option_8019C8C4(); if (D_menu_801B9094 != -1) { D_menu_801B9124 = 200; @@ -460,9 +458,9 @@ void Option_Setup(void) { D_menu_801B9124 = 300; } } else { - if (D_800D2870 != 0) { + if (D_game_800D2870 != 0) { D_menu_801B91A4 = 2; - D_menu_801B91A8 = D_801778AC; + D_menu_801B91A8 = D_ctx_801778AC; for (i = 0; i < OPTION_COUNT; i++) { if (i == 2) { continue; @@ -506,10 +504,10 @@ void Option_Setup(void) { Memory_FreeAll(); - D_80178420 = 320.0f; - D_80178424 = 240.0f; + D_ctx_80178420 = 320.0f; + D_ctx_80178424 = 240.0f; - func_800A5D6C(); + func_play_800A5D6C(); gCsCamEyeX = 0.0f; gCsCamEyeY = 0.0f; @@ -613,11 +611,11 @@ void Option_UpdateEntry(void) { break; case OPTION_NAME: - func_menu_8019CAE0(); + Option_8019CAE0(); break; case OPTION_SCORE: - func_menu_8019DD44(); + Option_8019DD44(); break; case OPTION_INVOICE: @@ -668,11 +666,11 @@ void Option_DrawEntry(void) { break; case OPTION_NAME: - func_menu_8019D118(); + Option_8019D118(); break; case OPTION_SCORE: - func_menu_8019DF64(); + Option_8019DF64(); break; case OPTION_INVOICE: @@ -681,8 +679,8 @@ void Option_DrawEntry(void) { } if (D_menu_801B8280 != 0) { - func_menu_8019BDF0(); - func_80084688(2, D_menu_801B8284); + Option_8019BDF0(); + func_fade_80084688(2, D_menu_801B8284); Matrix_Pop(&gGfxMatrix); } } @@ -724,7 +722,7 @@ void Option_InitEntry(void) { } } -void func_menu_80192598(void) { +void Option_80192598(void) { s32 i; D_menu_801B93E8 = 0; @@ -745,24 +743,24 @@ void func_menu_80192598(void) { for (i = 0; i < 9; 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]); + Map_801A07E8(D_menu_801B68B0[i], SEGMENTED_TO_VIRTUAL(D_menu_801B68D4[i]), &D_menu_801CD818[i]); } } -void func_menu_80192738(void) { +void Option_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]); + Map_801A07E8(D_menu_801B68B0[8], SEGMENTED_TO_VIRTUAL(D_menu_801B68D4[8]), &D_menu_801CD818[8]); D_menu_801B93E8 = 0; } else { D_menu_801B93E8++; } - 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]); + Map_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_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]); + Map_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_menu_801B93EC++; if (D_menu_801B93EC >= 4) { @@ -771,50 +769,50 @@ void func_menu_80192738(void) { } void Option_MapUpdate(void) { - if (D_80178340 == 0xFF) { - D_80178410 = 0; + if (D_ctx_80178340 == 0xFF) { + D_ctx_80178410 = 0; D_menu_801B9124 = 100; gGameState = GSTATE_MAP; D_Timer_8017783C = 2; - D_80177B40 = 0; + D_ctx_80177B40 = 0; gDrawMode = DRAWMODE_0; gControllerLock = 3; } else { - D_80178340 += 0x20; - if (D_80178340 > 0xFF) { - D_80178340 = 0xFF; + D_ctx_80178340 += 0x20; + if (D_ctx_80178340 > 0xFF) { + D_ctx_80178340 = 0xFF; } } } void Option_TrainingUpdate(void) { - if (D_80178340 == 0xFF) { + if (D_ctx_80178340 == 0xFF) { gCurrentLevel = LEVEL_TRAINING; gGameState = GSTATE_PLAY; D_Timer_8017783C = 2; - D_80177854 = 0; + D_ctx_80177854 = 0; gDrawMode = DRAWMODE_0; - func_800A5844(); - D_80177CA0 = 0; - D_80177CB0 = 0.0f; - D_8017782C = 1; + func_play_800A5844(); + D_ctx_80177CA0 = 0; + D_ctx_80177CB0 = 0.0f; + D_ctx_8017782C = 1; gControllerLock = 3; Audio_SetAudioSpec(0, 28); } else { - D_80178340 += 0x20; - if (D_80178340 > 0xFF) { - D_80178340 = 0xFF; + D_ctx_80178340 += 0x20; + if (D_ctx_80178340 > 0xFF) { + D_ctx_80178340 = 0xFF; } } } -void func_menu_801929F0(void) { +void Option_801929F0(void) { s32 i; - D_800D2870 = 0; + D_game_800D2870 = 0; gBlurAlpha = 0xFF; gControllerLock = 0; - D_80178410 = 800; + D_ctx_80178410 = 800; D_menu_801B9248 = 0; if (D_menu_801B9244 == 0) { @@ -863,7 +861,7 @@ void Option_MainMenuUpdate(void) { switch (D_menu_801B912C) { case 0: - func_menu_801929F0(); + Option_801929F0(); if (D_menu_801B9244 == 0) { D_menu_801B912C++; } else { @@ -911,14 +909,14 @@ void Option_MainMenuUpdate(void) { break; case 1: - temp1 = func_menu_8019C418(&D_menu_801B91A4, OPTION_COUNT - 1, 1, 0, 20, 5, 4, gMainController, - &D_menu_801B9180); + temp1 = + Option_8019C418(&D_menu_801B91A4, OPTION_COUNT - 1, 1, 0, 20, 5, 4, gMainController, &D_menu_801B9180); // clang-format off if (temp1 != 0) { AUDIO_PLAY_SFX(0x49000022, gDefaultSfxSource, 4); } // clang-format on 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); + temp2 = Option_8019C418(&D_menu_801B91B0, 1, 0, 0, 20, 5, 4, gMainController, &D_menu_801B9190); if (temp2 != 0) { AUDIO_PLAY_SFX(0x49000022, gDefaultSfxSource, 4); if (D_menu_801B91B0) { @@ -938,7 +936,7 @@ void Option_MainMenuUpdate(void) { } } 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); + temp2 = Option_8019C418(&D_menu_801B91AC, 1, 0, 0, 20, 5, 4, gMainController, &D_menu_801B9198); if (temp2 != 0) { AUDIO_PLAY_SFX(0x49000022, gDefaultSfxSource, 4); if (D_menu_801B91AC) { @@ -1042,10 +1040,10 @@ void Option_MainMenuUpdate(void) { if (D_menu_801B8284 < 120) { D_menu_801B8284 += 18; } else { - D_80178410 = 0; + D_ctx_80178410 = 0; gGameState = GSTATE_TITLE; D_Timer_8017783C = 2; - D_80177AE0 = 0; + D_ctx_80177AE0 = 0; D_menu_801B827C = 1; gDrawMode = DRAWMODE_0; D_menu_801B8280 = 0; @@ -1059,7 +1057,7 @@ void Option_MainMenuUpdate(void) { void Option_MainMenuDraw(void) { s32 i; - func_menu_8019BDF0(); + Option_8019BDF0(); for (i = 0; i < OPTION_COUNT; i++) { if (sOptionCardList[i].unk_5C) { @@ -1075,23 +1073,23 @@ void Option_MainMenuDraw(void) { continue; } 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); + Option_8019B6D8(106.0f, 56.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_8019B6D8(106.0f, 152.0f, 98.0f, 20, 0, 75); } Option_DrawCardLabel(sOptionCardList[i].unk_00); } - func_menu_8019BF34(); + Option_8019BF34(); } -void func_menu_80193B04(void) { +void Option_80193B04(void) { s32 i; gBlurAlpha = 0xFF; gControllerLock = 0; - D_80178410 = 800; + D_ctx_80178410 = 800; if (D_menu_801B9248 == 0) { D_menu_801B91BC = 1; @@ -1132,7 +1130,7 @@ void Option_VersusUpdate(void) { switch (D_menu_801B912C) { case 0: - func_menu_80193B04(); + Option_80193B04(); if (D_menu_801B9248 == 0) { D_menu_801B912C++; } else { @@ -1183,7 +1181,7 @@ void Option_VersusUpdate(void) { case 1: // clang-format off - if (func_menu_8019C418(&D_menu_801B91A8, 2, 1, 0, 20, 5, 4, gMainController, &D_menu_801B9188)) { AUDIO_PLAY_SFX(0x49000022, gDefaultSfxSource, 4); } + if (Option_8019C418(&D_menu_801B91A8, 2, 1, 0, 20, 5, 4, gMainController, &D_menu_801B9188)) { AUDIO_PLAY_SFX(0x49000022, gDefaultSfxSource, 4); } // clang-format on if (gControllerPress[gMainController].button & (A_BUTTON | START_BUTTON)) { @@ -1257,7 +1255,7 @@ void Option_VersusUpdate(void) { (sOptionVSCardList[D_menu_801B91A8].unk_38.unk_04 == -15.5f)) { gBlurAlpha += 0xFF; D_menu_801B9124 = (D_menu_801B91A8 + 1) * 10; - D_801778AC = D_menu_801B91A8; + D_ctx_801778AC = D_menu_801B91A8; D_menu_801B91C4 = 1; Option_InitEntry(); } @@ -1270,7 +1268,7 @@ void Option_VersusDraw(void) { s32 i; Option_DrawMenuLabel(); - func_menu_8019BDF0(); + Option_8019BDF0(); for (i = 0; i < 3; i++) { if (sOptionVSCardList[i].unk_5C != 0) { @@ -1287,13 +1285,13 @@ void Option_VersusDraw(void) { } } - func_menu_8019BF34(); + Option_8019BF34(); } void Option_SoundInit(void) { s32 i; - D_80178410 = 800; + D_ctx_80178410 = 800; D_menu_801B91B4 = 0; D_menu_801B91B8 = 0; @@ -1359,16 +1357,16 @@ void Option_SoundUpdate(void) { s32 temp; sp34 = D_menu_801B9288; - temp = func_menu_8019C418(&D_menu_801B9288, 3, 1, 0, 20, 5, 4, gMainController, &D_menu_801B9250); + temp = Option_8019C418(&D_menu_801B9288, 3, 1, 0, 20, 5, 4, gMainController, &D_menu_801B9250); if (temp != 0) { D_menu_801B9270[sp34] = 255.0f; AUDIO_PLAY_SFX(0x49000002, gDefaultSfxSource, 4); } if (D_menu_801B9288 == 0) { - func_menu_80194AEC(); + Option_80194AEC(); } else { - func_menu_80194BD0(); + Option_80194BD0(); } // Test sound @@ -1396,11 +1394,11 @@ void Option_SoundUpdate(void) { } } -void func_menu_80194AEC(void) { +void Option_80194AEC(void) { s32 sp3C = gSoundMode; s32 pad; - if (func_menu_8019C418(&sp3C, 2, 0, 0, 20, 5, 4, gMainController, &D_menu_801B9260)) { + if (Option_8019C418(&sp3C, 2, 0, 0, 20, 5, 4, gMainController, &D_menu_801B9260)) { AUDIO_PLAY_SFX(0x49000002, gDefaultSfxSource, 4); gSoundMode = sp3C; if (gSoundMode >= OPTIONSOUND_MAX) { @@ -1411,12 +1409,12 @@ void func_menu_80194AEC(void) { } } -void func_menu_80194BD0(void) { +void Option_80194BD0(void) { s32 var_v1; D_menu_801B924C = D_menu_801AE99C[D_menu_801B9288 - 1]; - if (func_menu_8019C66C(&(D_menu_801AEB48[D_menu_801B9288 - 1].unk_18), 146.0f, 245.0f, &D_menu_801B9268)) { + if (Option_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_menu_801B9288 - 1] = var_v1; @@ -1456,7 +1454,7 @@ void Option_SoundDraw(void) { Option_DrawMenuLabel(); - func_menu_801952B4(); + Option_801952B4(); RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); @@ -1469,7 +1467,7 @@ void Option_SoundDraw(void) { for (i = 0; i < 4; i++) { if (D_menu_801B9288 == i) { - func_menu_8019C824(&D_menu_801B9270[i]); + Option_8019C824(&D_menu_801B9270[i]); } else { D_menu_801B9270[i] = 255.0f; } @@ -1521,7 +1519,7 @@ void Option_SoundDraw(void) { } } -void func_menu_801952B4(void) { +void Option_801952B4(void) { s32 i; if (D_menu_801B9284 == 1) { @@ -1631,7 +1629,7 @@ void func_menu_801952B4(void) { void Option_ExpertSoundInit(void) { s32 i; - D_80178410 = 800; + D_ctx_80178410 = 800; D_menu_801B931C = 0; D_menu_801B9290.unk_0 = 0; @@ -1653,7 +1651,7 @@ void Option_ExpertSoundUpdate(void) { s32 pad; f32 sp28 = D_menu_801B931C; - if (func_menu_8019C66C(&sp28, 0.0f, 49.0f, &D_menu_801B9290) != 0) { + if (Option_8019C66C(&sp28, 0.0f, 49.0f, &D_menu_801B9290) != 0) { AUDIO_PLAY_SFX(0x49000002, gDefaultSfxSource, 4); D_menu_801B931C = sp28; } @@ -1731,7 +1729,7 @@ void Option_ExpertSoundDraw(void) { TextureRect_8bIA(&gMasterDisp, D_menu_801AECF8[D_menu_801B931C % 10], 16, 15, 244.0f, 82.0f, 1.0f, 1.0f); - func_menu_8019B7D4(); + Option_8019B7D4(); RCP_SetupDL(&gMasterDisp, 0x4C); @@ -1793,7 +1791,7 @@ void Option_ExpertSoundDraw(void) { } void Option_DataInit(void) { - D_80178410 = 800; + D_ctx_80178410 = 800; D_menu_801B91E4 = 255.0f; D_menu_801B9330[0] = 0; D_menu_801B9330[1] = 0; @@ -1807,7 +1805,7 @@ void Option_DataUpdate(void) { switch (D_menu_801B912C) { case 0: - func_menu_8019669C(); + Option_8019669C(); break; case 2: @@ -1844,16 +1842,16 @@ void Option_DataUpdate(void) { case 1: D_menu_801B91CC = 2; AUDIO_PLAY_SFX(0x0940A00B, gDefaultSfxSource, 4); - D_801779A8[gMainController] = 50.0f; - D_80177990[gMainController] = 0; + D_ctx_801779A8[gMainController] = 50.0f; + D_ctx_80177990[gMainController] = 0; break; case 2: - D_80177990[gMainController] += (s32) D_801779A8[gMainController]; - temp_fv0 = Math_SmoothStepToF(&D_801779A8[gMainController], 100.0f, 0.05f, 100.0f, 0.1f); + D_ctx_80177990[gMainController] += (s32) D_ctx_801779A8[gMainController]; + temp_fv0 = Math_SmoothStepToF(&D_ctx_801779A8[gMainController], 100.0f, 0.05f, 100.0f, 0.1f); - if (D_80177990[gMainController] >= 100) { - D_80177990[gMainController] -= 100; + if (D_ctx_80177990[gMainController] >= 100) { + D_ctx_80177990[gMainController] -= 100; D_80137E84[gMainController] = 1; } @@ -1881,7 +1879,7 @@ void Option_DataUpdate(void) { sOptionCardCurTextPosX[i] = sOptionCardTextPosX[i]; sOptionCardCurTextPosY[i] = sOptionCardTextPosY[i]; } - func_menu_80188010(); + Title_80188010(); } break; @@ -1893,9 +1891,9 @@ void Option_DataUpdate(void) { } } -void func_menu_8019669C(void) { +void Option_8019669C(void) { if ((D_menu_801B91CC == 0) || (D_menu_801B91CC == 1)) { - if (func_menu_8019C5A0(&D_menu_801B91C0) != 0) { + if (Option_8019C5A0(&D_menu_801B91C0) != 0) { AUDIO_PLAY_SFX(0x49000002, gDefaultSfxSource, 4); } if (1) {} @@ -1958,7 +1956,7 @@ void Option_DataDraw(void) { TextureRect_8bIA_MirX(&gMasterDisp, D_OPT_800E130, 8, 8, D_menu_801AF084[D_menu_801B91C0], 140.0f, 1.0f, 1.0f); TextureRect_8bIA(&gMasterDisp, D_OPT_800E130, 8, 8, D_menu_801AF08C[D_menu_801B91C0], 140.0f, 1.0f, 1.0f); - func_menu_8019C824(&D_menu_801AED20[D_menu_801B91C0]); + Option_8019C824(&D_menu_801AED20[D_menu_801B91C0]); D_menu_801AED20[!D_menu_801B91C0] = 255.0f; sp74[0] = sp74[1] = 0xFFFFFFFF; @@ -2017,7 +2015,7 @@ void Option_DataDraw(void) { break; } - func_menu_8019B7D4(); + Option_8019B7D4(); } static char* D_menu_801AF0C4[3] = { "P", "S", "F" }; @@ -2026,9 +2024,9 @@ static s32 D_menu_801AF0DC[3] = { 30, 179, 30 }; static s32 D_menu_801AF0E8[3] = { 0, 67, 255 }; void Option_RankingInit(void) { - func_menu_80188010(); + Title_80188010(); - D_80178410 = 800; + D_ctx_80178410 = 800; D_menu_801B91D0 = 1; D_menu_801B93E4 = 0; @@ -2047,11 +2045,11 @@ void Option_RankingInit(void) { D_menu_801B9408.unk_0 = 0; D_menu_801B9408.unk_4 = 0; - func_menu_80192598(); + Option_80192598(); } void Option_RankingUpdate(void) { - func_menu_80196FC4(); + Option_80196FC4(); if (gControllerPress[gMainController].button & B_BUTTON) { AUDIO_PLAY_SFX(0x49000021, gDefaultSfxSource, 4); @@ -2067,22 +2065,22 @@ void Option_RankingDraw(void) { Option_DrawMenuLabel(); } -void func_menu_80196FC4(void) { +void Option_80196FC4(void) { if (gControllerPress[gMainController].button & A_BUTTON) { AUDIO_PLAY_SFX(0x49000003, gDefaultSfxSource, 4); D_menu_801B93E0 ^= 1; } if (D_menu_801B93E0 != 0) { - func_menu_8019715C(); + Option_8019715C(); return; } - func_menu_80197074(); + Option_80197074(); } -void func_menu_80197074(void) { - if (func_menu_8019C418(&D_menu_801B93E4, 9, 1, 0, 20, 5, 4, gMainController, &D_menu_801B9400)) { +void Option_80197074(void) { + if (Option_8019C418(&D_menu_801B93E4, 9, 1, 0, 20, 5, 4, gMainController, &D_menu_801B9400)) { AUDIO_PLAY_SFX(0x49000002, gDefaultSfxSource, 4); D_menu_801B91D4 = 114.0f - D_menu_801B93E4 * 130.0f; D_menu_801B91DC = 114.0f - D_menu_801B93E4 * 130.0f; @@ -2091,7 +2089,7 @@ void func_menu_80197074(void) { } } -void func_menu_8019715C(void) { +void Option_8019715C(void) { s32 pad; f32 sp30; f32 temp_fv0_2; @@ -2099,7 +2097,7 @@ void func_menu_8019715C(void) { s32 temp2; if (D_menu_801B91D0 != 0) { - if (func_menu_8019C418(&D_menu_801B93E4, 9, 1, 1, 20, 2, 9, gMainController, &D_menu_801B9408) != 0.00f) { + if (Option_8019C418(&D_menu_801B93E4, 9, 1, 1, 20, 2, 9, gMainController, &D_menu_801B9408) != 0.00f) { AUDIO_PLAY_SFX(0x49000002, gDefaultSfxSource, 4); D_menu_801B91DC = 114.0f - D_menu_801B93E4 * 130.0f; D_menu_801B91E0 = -6.0f + D_menu_801B93E4 * 130.0f; @@ -2137,11 +2135,11 @@ void Option_RankingMenuDraw(void) { s32 temp_t0; if (D_menu_801B93E0 != 0) { - func_menu_8019752C(); + Option_8019752C(); } else { - func_menu_80187E28(); + Title_80187E28(); RCP_SetupDL(&gMasterDisp, 0x53); - func_menu_8019C824(&D_menu_801B93F0); + Option_8019C824(&D_menu_801B93F0); temp_t0 = D_menu_801B93F0; gDPSetPrimColor(gMasterDisp++, 0, 0, 255, temp_t0, temp_t0, 255); TextureRect_8bIA(&gMasterDisp, D_VS_MENU_7004010, 8, 8, 70.0f, (D_menu_801B93E4 * 17.0f) + 55.0f, 1.0f, 1.0f); @@ -2151,7 +2149,7 @@ void Option_RankingMenuDraw(void) { Graphics_DisplaySmallText(242, 215, 1.0f, 1.0f, "PUSH A"); } -void func_menu_8019752C(void) { +void Option_8019752C(void) { f32 var_fs0; f32 var_fs1; s32 temp_a0; @@ -2164,19 +2162,19 @@ void func_menu_8019752C(void) { for (i = 0; i < 10; i++) { if ((var_fs0 > 69.0f) && (var_fs0 < 230.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); + Option_80197A3C(i, 41, var_fs0); + Option_80197D30(i, 75, var_fs0 - 25.0f); + Option_80197DE4(i, 130, (var_fs0 - 26.0f)); + Map_801AD7EC(210, (var_fs0 - 24.0f), gSaveFile.save.data.unk_40[i]); + Option_80197F74(i, 258, var_fs0 - 25.0f); } - func_menu_80198164(i, var_fs0, var_fs1); + Option_80198164(i, var_fs0, var_fs1); var_fs0 += D_menu_801AF0F4; var_fs1 -= D_menu_801AF0F4; } - func_menu_8019BDF0(); - func_menu_80197914(); + Option_8019BDF0(); + Option_80197914(); Matrix_Pop(&gGfxMatrix); RCP_SetupDL(&gMasterDisp, 0x4C); @@ -2186,14 +2184,14 @@ void func_menu_8019752C(void) { TextureRect_8bIA(&gMasterDisp, D_OPT_800D170, 8, 16, 0.0f, D_menu_801AF0F8[0], 40.0f, 1.5f); TextureRect_8bIA_MirY(&gMasterDisp, D_OPT_800D170, 8, 16, 0.0f, D_menu_801AF0F8[1], 40.0f, 1.5f); - func_8003DE68(0, 70); - func_8003DE68(170, 239); + func_bg_8003DE68(0, 70); + func_bg_8003DE68(170, 239); RCP_SetupDL(&gMasterDisp, 0x53); if (D_menu_801B91D4 >= 114.0f) { gDPSetPrimColor(gMasterDisp++, 0, 0, 32, 32, 32, 255); } else { - func_menu_8019C824(&D_menu_801B93F4); + Option_8019C824(&D_menu_801B93F4); temp_a0 = D_menu_801B93F4; gDPSetPrimColor(gMasterDisp++, 0, 0, 255, temp_a0, temp_a0, 255); } @@ -2203,7 +2201,7 @@ void func_menu_8019752C(void) { if (D_menu_801B91D4 <= -1055.0f) { gDPSetPrimColor(gMasterDisp++, 0, 0, 32, 32, 32, 255); } else { - func_menu_8019C824(&D_menu_801B93F8); + Option_8019C824(&D_menu_801B93F8); temp_a0 = D_menu_801B93F8; gDPSetPrimColor(gMasterDisp++, 0, 0, 255, temp_a0, temp_a0, 255); } @@ -2214,7 +2212,7 @@ void func_menu_8019752C(void) { 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_menu_80197914(void) { +void Option_80197914(void) { Vec3f* vec1; Vec3f* vec2; s32 i; @@ -2231,7 +2229,7 @@ void func_menu_80197914(void) { } } -void func_menu_80197A3C(s32 arg0, s32 arg1, s32 arg2) { +void Option_80197A3C(s32 arg0, s32 arg1, s32 arg2) { RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); @@ -2268,7 +2266,7 @@ void func_menu_80197A3C(s32 arg0, s32 arg1, s32 arg2) { } } -void func_menu_80197D30(s32 arg0, s32 arg1, s32 arg2) { +void Option_80197D30(s32 arg0, s32 arg1, s32 arg2) { char temp[4]; RCP_SetupDL(&gMasterDisp, 0x53); @@ -2283,18 +2281,18 @@ void func_menu_80197D30(s32 arg0, s32 arg1, s32 arg2) { Graphics_DisplayLargeText(arg1, arg2, 1.0f, 1.0f, temp); } -void func_menu_80197DE4(s32 arg0, s32 arg1, s32 arg2) { +void Option_80197DE4(s32 arg0, s32 arg1, s32 arg2) { RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 60, 60, 255, 170); TextureRect_8bIA(&gMasterDisp, D_MAP_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_menu_801B8220[arg0]) * 8) - 8), (arg2 + 9.0f), + Graphics_DisplaySmallNumber((arg1 + 40.0f) - ((func_hud_8008BCBC(D_menu_801B8220[arg0]) * 8) - 8), (arg2 + 9.0f), D_menu_801B8220[arg0]); } -void func_menu_80197F74(s32 arg0, s32 arg1, s32 arg2) { +void Option_80197F74(s32 arg0, s32 arg1, s32 arg2) { f32 temp_fs1; s32 i; @@ -2304,32 +2302,32 @@ void func_menu_80197F74(s32 arg0, s32 arg1, s32 arg2) { 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_menu_801B81A8[arg0][i]) - 1) * 8), arg2 + 9.0f, - D_menu_801B81A8[arg0][i]); + Graphics_DisplaySmallNumber(arg1 + temp_fs1 - ((func_hud_8008BCBC(D_menu_801B81A8[arg0][i]) - 1) * 8), + arg2 + 9.0f, D_menu_801B81A8[arg0][i]); } } -void func_menu_80198164(s32 arg0, f32 arg1, f32 arg2) { +void Option_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_menu_801982B0(arg0, i, 28.0f + var_fs2, arg1, temp_s2); + Option_801982B0(arg0, i, 28.0f + var_fs2, arg1, temp_s2); if (i < temp_s2) { - 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); + Option_8019882C(arg0, i, 28.0f + var_fs2, arg1); + Option_801984D0(arg0, i, 28.0f + var_fs2, arg1); + Option_80198608(arg0, i, 28.0f + var_fs2, arg1); } } if ((arg2 < 75.0f) && (arg2 > -80.0f)) { - func_menu_8019896C(arg0, arg2, temp_s2); + Option_8019896C(arg0, arg2, temp_s2); } } -void func_menu_801982B0(s32 arg0, s32 arg1, f32 arg2, f32 arg3, s32 arg4) { +void Option_801982B0(s32 arg0, s32 arg1, f32 arg2, f32 arg3, s32 arg4) { s32 r; s32 g; s32 b; @@ -2347,7 +2345,7 @@ void func_menu_801982B0(s32 arg0, s32 arg1, f32 arg2, f32 arg3, s32 arg4) { start = gSaveFile.save.data.unk_5E[arg0][arg1].unk_8 & 0xF; end = gSaveFile.save.data.unk_5E[arg0][arg1 + 1].unk_8 & 0xF; - temp_v0 = func_menu_80199284(start, end); + temp_v0 = Option_80199284(start, end); g = 255; b = 255; @@ -2380,7 +2378,7 @@ void func_menu_801982B0(s32 arg0, s32 arg1, f32 arg2, f32 arg3, s32 arg4) { } } -void func_menu_801984D0(s32 arg0, s32 arg1, f32 arg2, f32 arg3) { +void Option_801984D0(s32 arg0, s32 arg1, f32 arg2, f32 arg3) { s32 sp1C; if ((arg3 > 22.0f) && (arg3 < 162.0f)) { @@ -2388,11 +2386,11 @@ void func_menu_801984D0(s32 arg0, s32 arg1, f32 arg2, f32 arg3) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255); sp1C = (gSaveFile.save.data.unk_5E[arg0][arg1].unk_C & 1) << 8; sp1C |= gSaveFile.save.data.unk_5E[arg0][arg1].unk_0; - Graphics_DisplaySmallNumber(arg2 + 15.0f - (func_8008BCBC(sp1C) - 1) * 8, arg3 + 24.0f + 1.0f, sp1C); + Graphics_DisplaySmallNumber(arg2 + 15.0f - (func_hud_8008BCBC(sp1C) - 1) * 8, arg3 + 24.0f + 1.0f, sp1C); } } -void func_menu_80198608(s32 arg0, s32 arg1, f32 arg2, f32 arg3) { +void Option_80198608(s32 arg0, s32 arg1, f32 arg2, f32 arg3) { f32 var_fs1; s32 sp90[3]; s32 i; @@ -2415,7 +2413,7 @@ void func_menu_80198608(s32 arg0, s32 arg1, f32 arg2, f32 arg3) { } } -void func_menu_8019882C(s32 arg0, s32 arg1, f32 arg2, f32 arg3) { +void Option_8019882C(s32 arg0, s32 arg1, f32 arg2, f32 arg3) { PlanetId temp; char* sp20; f32 temp2; @@ -2430,7 +2428,7 @@ void func_menu_8019882C(s32 arg0, s32 arg1, f32 arg2, f32 arg3) { } } -void func_menu_8019896C(s32 arg0, f32 y, s32 arg2) { +void Option_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; @@ -2572,13 +2570,13 @@ void func_menu_8019896C(s32 arg0, f32 y, s32 arg2) { spF4 = (spFC >> i) & 1; if (spF4 != 0) { - func_menu_80199198(x, y, 0.0f); + Option_80199198(x, y, 0.0f); } } Matrix_Pop(&gGfxMatrix); - func_menu_80192738(); + Option_80192738(); D_menu_801AF130 += 0.1f; @@ -2589,7 +2587,7 @@ static f32 D_menu_801AF13C = 0.7f; static f32 D_menu_801AF140 = 11.0f; static f32 D_menu_801AF144 = 2.7f; -void func_menu_80199198(f32 arg0, f32 arg1, f32 arg2) { +void Option_80199198(f32 arg0, f32 arg1, f32 arg2) { RCP_SetupDL(&gMasterDisp, 0x35); Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, arg0 - D_menu_801AF140, arg1 + D_menu_801AF144, arg2, 1); @@ -2599,7 +2597,7 @@ void func_menu_80199198(f32 arg0, f32 arg1, f32 arg2) { Matrix_Pop(&gGfxMatrix); } -s32 func_menu_80199284(PlanetId start, PlanetId end) { +s32 Option_80199284(PlanetId start, PlanetId end) { s32 i; for (i = 0; i < 24; i++) { @@ -2620,17 +2618,17 @@ void Option_VersusMenuInit(void) { D_menu_801B93D0 = D_menu_801B9124; - if (D_800D2870) { + if (D_game_800D2870) { sOptionCardList[1].unk_00.unk_1C = 129.0f; sOptionCardList[1].unk_38.unk_04 = -7.5f; } - D_801778A4 = 3; + D_ctx_801778A4 = 3; D_menu_801B9340 = 2; - D_80161A28 = 0; - D_80178410 = 0; + D_game_80161A28 = 0; + D_ctx_80178410 = 0; D_menu_801B93C4 = 0; @@ -2651,7 +2649,7 @@ void Option_VersusMenuInit(void) { void Option_VersusMenuUpdate(void) { switch (D_menu_801B912C) { case 0: - func_menu_8019949C(); + Option_8019949C(); break; case 1: @@ -2663,13 +2661,13 @@ void Option_VersusMenuUpdate(void) { } } -void func_menu_8019949C(void) { +void Option_8019949C(void) { s32 i; for (i = 0; i < 4; 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])) { + Option_8019C824(&D_menu_801B9358[i]); + if (Option_8019C418(&D_menu_801AED3C[i], 2, 0, 0, 20, 2, 4, i, &D_menu_801B93A0[i])) { AUDIO_PLAY_SFX(0x49000002, gDefaultSfxSource, 4); } } @@ -2698,7 +2696,7 @@ void func_menu_8019949C(void) { } else { AUDIO_PLAY_BGM(SEQ_ID_36); AUDIO_PLAY_SFX(0x49000021, gDefaultSfxSource, 4); - func_menu_8019B8A0(2); + Option_8019B8A0(2); D_menu_801B9248 = 1; break; } @@ -2709,17 +2707,17 @@ void func_menu_8019949C(void) { void Option_VersusMenuDraw(void) { s32 i; - func_menu_8019B8C8(); - func_menu_80199EA8(); + Option_8019B8C8(); + Option_80199EA8(); for (i = 0; i < 4; i++) { if (gControllerPlugged[i] == 1) { - func_menu_80199820(i); + Option_80199820(i); } } if (D_menu_801B93C4 == 15) { - func_menu_8019B5AC(); + Option_8019B5AC(); } } @@ -2744,7 +2742,7 @@ static f32 D_menu_801AF1D4 = 7.0f; static f32 D_menu_801AF1D8 = 59.0f; static f32 D_menu_801AF1DC = 58.0f; -void func_menu_80199820(s32 arg0) { +void Option_80199820(s32 arg0) { s32 var_v0; s32 var_a2; s32 colorGB; @@ -2855,7 +2853,7 @@ void func_menu_80199820(s32 arg0) { D_menu_801AF158[arg0] + D_menu_801AF1AC, D_menu_801AF1B0, D_menu_801AF1B0); } -void func_menu_80199EA8(void) { +void Option_80199EA8(void) { s32 i; RCP_SetupDL_76(); @@ -2871,13 +2869,13 @@ void func_menu_80199EA8(void) { void Option_VersusStageInit(void) { s32 i; - D_80178410 = 0; + D_ctx_80178410 = 0; D_menu_801B933C = 0; D_menu_801B91E8 = 255.0f; - D_menu_801B93D4 = D_801778A4 - 1; - D_menu_801B93D8 = D_80161A28; + D_menu_801B93D4 = D_ctx_801778A4 - 1; + D_menu_801B93D8 = D_game_80161A28; D_menu_801B93DC = D_menu_801B9340; - D_801778C8 = D_menu_801B93DC; + D_ctx_801778C8 = D_menu_801B93DC; // clang-format off for (i = 0; i < 4; i++) {\ D_menu_801B9358[i] = 0; @@ -2891,11 +2889,11 @@ void Option_VersusStageInit(void) { D_menu_801B9368 = 255.0f; D_menu_801B9370 = 255.0f; D_menu_801B9378 = 255.0f; - func_menu_8019A080(); + Option_8019A080(); } // D_menu_801B9380 needs to be static but belongs to bss section? -void func_menu_8019A080(void) { +void Option_8019A080(void) { s32 i; for (i = 0; i < 4; i++) { @@ -2907,73 +2905,73 @@ void func_menu_8019A080(void) { void Option_VersusStageUpdate(void) { switch (D_menu_801B93D0) { case OPTION_POINT_MATCH: - func_menu_8019A124(); + Option_8019A124(); break; case OPTION_BR_MATCH: - func_menu_8019A1A8(); + Option_8019A1A8(); break; case OPTION_TT_MATCH: - func_menu_8019A214(); + Option_8019A214(); break; } } -void func_menu_8019A124(void) { +void Option_8019A124(void) { switch (D_menu_801B912C) { case 0: - func_menu_8019A2E0(); + Option_8019A2E0(); break; case 1: - func_menu_8019A6DC(); + Option_8019A6DC(); break; case 2: - func_menu_8019A954(); + Option_8019A954(); break; case 3: - func_menu_8019A298(); + Option_8019A298(); break; } } -void func_menu_8019A1A8(void) { +void Option_8019A1A8(void) { switch (D_menu_801B912C) { case 0: - func_menu_8019A6DC(); + Option_8019A6DC(); break; case 1: - func_menu_8019A954(); + Option_8019A954(); break; case 2: - func_menu_8019A298(); + Option_8019A298(); break; } } -void func_menu_8019A214(void) { +void Option_8019A214(void) { switch (D_menu_801B912C) { case 0: - func_menu_8019A4DC(); + Option_8019A4DC(); break; case 1: - func_menu_8019A6DC(); + Option_8019A6DC(); break; case 2: - func_menu_8019A954(); + Option_8019A954(); break; case 3: - func_menu_8019A298(); + Option_8019A298(); break; } } -void func_menu_8019A298(void) { +void Option_8019A298(void) { if (D_menu_801B91EC == 0.0f) { gGameState = GSTATE_VS_INIT; D_Timer_8017783C = 2; @@ -2982,7 +2980,7 @@ void func_menu_8019A298(void) { } } -void func_menu_8019A2E0(void) { +void Option_8019A2E0(void) { s32 i; if (D_menu_801B936C != 0) { @@ -3000,14 +2998,14 @@ void func_menu_8019A2E0(void) { continue; } - if (func_menu_8019C418(&D_menu_801B93D4, 4, 0, 0, 20, 2, 4, i, &D_menu_801B9380[i])) { + if (Option_8019C418(&D_menu_801B93D4, 4, 0, 0, 20, 2, 4, i, &D_menu_801B9380[i])) { AUDIO_PLAY_SFX(0x49000002, gDefaultSfxSource, 4); - D_801778A4 = D_menu_801B93D4 + 1; + D_ctx_801778A4 = D_menu_801B93D4 + 1; } if (gControllerPress[i].button & A_BUTTON) { AUDIO_PLAY_SFX(0x49000003, gDefaultSfxSource, 4); - func_menu_8019A080(); + Option_8019A080(); D_menu_801B936C = 10; break; } @@ -3022,7 +3020,7 @@ void func_menu_8019A2E0(void) { } } -void func_menu_8019A4DC(void) { +void Option_8019A4DC(void) { s32 i; if (D_menu_801B937C) { @@ -3040,15 +3038,15 @@ void func_menu_8019A4DC(void) { continue; } - if (func_menu_8019C418(&D_menu_801B93DC, 4, 0, 0, 20, 2, 4, i, &D_menu_801B9380[i])) { + if (Option_8019C418(&D_menu_801B93DC, 4, 0, 0, 20, 2, 4, i, &D_menu_801B9380[i])) { AUDIO_PLAY_SFX(0x49000002, gDefaultSfxSource, 4); D_menu_801B9340 = D_menu_801B93DC; - D_801778C8 = D_menu_801B93DC; + D_ctx_801778C8 = D_menu_801B93DC; } if (gControllerPress[i].button & A_BUTTON) { AUDIO_PLAY_SFX(0x49000003, gDefaultSfxSource, 4); - func_menu_8019A080(); + Option_8019A080(); D_menu_801B937C = 10; break; } @@ -3063,7 +3061,7 @@ void func_menu_8019A4DC(void) { } } -void func_menu_8019A6DC(void) { +void Option_8019A6DC(void) { s32 i; if (D_menu_801B9374) { @@ -3081,14 +3079,14 @@ void func_menu_8019A6DC(void) { if (gControllerPlugged[i] == 0) { continue; } - if (func_menu_8019C418(&D_menu_801B93D8, 1, 0, 1, 20, 2, 4, i, &D_menu_801B9380[i])) { + if (Option_8019C418(&D_menu_801B93D8, 1, 0, 1, 20, 2, 4, i, &D_menu_801B9380[i])) { AUDIO_PLAY_SFX(0x49000002, gDefaultSfxSource, 4); - D_80161A28 = D_menu_801B93D8; + D_game_80161A28 = D_menu_801B93D8; } if (gControllerPress[i].button & A_BUTTON) { AUDIO_PLAY_SFX(0x49000003, gDefaultSfxSource, 4); - if (D_80161A28 == 0) { + if (D_game_80161A28 == 0) { gVersusStage = VS_STAGE_CORNERIA; if (D_menu_801B93D0 == 30) { gVersusStage = VS_STAGE_KATINA; @@ -3098,7 +3096,7 @@ void func_menu_8019A6DC(void) { } D_menu_801B9374 = 10; - func_menu_8019A080(); + Option_8019A080(); break; } @@ -3109,7 +3107,7 @@ void func_menu_8019A6DC(void) { D_menu_801B91C4 = 0; Option_InitEntry(); } else { - func_menu_8019A080(); + Option_8019A080(); D_menu_801B91F0 = 0; D_menu_801B912C--; } @@ -3118,7 +3116,7 @@ void func_menu_8019A6DC(void) { } } -void func_menu_8019A954(void) { +void Option_8019A954(void) { s32 i; if (D_menu_801B91EC) { @@ -3145,7 +3143,7 @@ void func_menu_8019A954(void) { if (gControllerPress[i].button & B_BUTTON) { AUDIO_PLAY_SFX(0x4900101D, gDefaultSfxSource, 4); - func_menu_8019A080(); + Option_8019A080(); D_menu_801B933C = 0; D_menu_801B91F0 = 0; D_menu_801B912C--; @@ -3160,25 +3158,25 @@ void Option_VersusStageDraw(void) { break; case OPTION_POINT_MATCH: - func_menu_8019AB30(); + Option_8019AB30(); break; case OPTION_TT_MATCH: - func_menu_8019AD84(); + Option_8019AD84(); break; } - func_menu_8019AFFC(); + Option_8019AFFC(); if (D_menu_801B933C != 0) { - func_menu_8019B5AC(); + Option_8019B5AC(); } } -void func_menu_8019AB30(void) { +void Option_8019AB30(void) { s32 pad[5]; s32 colorGB; - s32 sp44 = D_801778A4; + s32 sp44 = D_ctx_801778A4; s32 var_v0; RCP_SetupDL(&gMasterDisp, 0x53); @@ -3188,8 +3186,8 @@ void func_menu_8019AB30(void) { TextureRect_8bIA(&gMasterDisp, D_MAP_601B4B0, 24, 17, 94.0f, 43.0f, 5.0f, 1.1f); if (D_menu_801B912C == 0) { - func_menu_8019B6D8(97.0f, 50.0f, 107.0f, 255, 255, 255); - func_menu_8019C824(&D_menu_801B9368); + Option_8019B6D8(97.0f, 50.0f, 107.0f, 255, 255, 255); + Option_8019C824(&D_menu_801B9368); } else { D_menu_801B9368 = 255.0f; } @@ -3220,7 +3218,7 @@ void func_menu_8019AB30(void) { } } -void func_menu_8019AD84(void) { +void Option_8019AD84(void) { 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 }; static f32 D_menu_801B9324; @@ -3243,8 +3241,8 @@ void func_menu_8019AD84(void) { 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); + Option_8019B6D8(D_menu_801B9324, D_menu_801B9328, D_menu_801B9338, 255, 255, 255); + Option_8019C824(&D_menu_801B9378); } else { D_menu_801B9378 = 255.0f; } @@ -3276,7 +3274,7 @@ void func_menu_8019AD84(void) { } } -void func_menu_8019AFFC(void) { +void Option_8019AFFC(void) { static f32 D_menu_801B93C0; static f32 D_menu_801B93C8; static f32 D_menu_801B93CC; @@ -3292,8 +3290,8 @@ void func_menu_8019AFFC(void) { RCP_SetupDL(&gMasterDisp, 0x53); - func_menu_8019B6D8(D_menu_801B93C0, D_menu_801B93C8, D_menu_801B93CC, 255, 255, 255); - func_menu_8019C824(&D_menu_801B9370); + Option_8019B6D8(D_menu_801B93C0, D_menu_801B93C8, D_menu_801B93CC, 255, 255, 255); + Option_8019C824(&D_menu_801B9370); } else { D_menu_801B9370 = 255.0f; } @@ -3319,13 +3317,13 @@ void func_menu_8019AFFC(void) { } if (D_menu_801B93D0 == 30) { - func_menu_8019B1F8(); + Option_8019B1F8(); } else { - func_menu_8019B3DC(); + Option_8019B3DC(); } } -void func_menu_8019B1F8(void) { +void Option_8019B1F8(void) { static f32 D_menu_801AF2A8 = 69.0f; static f32 D_menu_801AF2AC = 110.0f; static f32 D_menu_801AF2B0 = 123.0f; @@ -3339,7 +3337,7 @@ void func_menu_8019B1F8(void) { static u16* D_menu_801AF2CC[] = { D_VS_MENU_7006EA0, D_VS_MENU_7006630 }; for (xPos = D_menu_801AF2A8, i = 0; i < 2; i++, xPos += D_menu_801AF2B0) { - if (i == D_80161A28) { + if (i == D_game_80161A28) { sp8C[i] = 255; } else { sp8C[i] = 32; @@ -3363,7 +3361,7 @@ void func_menu_8019B1F8(void) { } } -void func_menu_8019B3DC(void) { +void Option_8019B3DC(void) { static f32 D_menu_801AF2D4 = 69.0f; static f32 D_menu_801AF2D8 = 110.0f; static f32 D_menu_801AF2DC = 123.0f; @@ -3385,7 +3383,7 @@ void func_menu_8019B3DC(void) { }; for (xPos = D_menu_801AF2D4, i = 0; i < 2; i++, xPos += D_menu_801AF2DC) { - if (i == D_80161A28) { + if (i == D_game_80161A28) { sp8C[i] = 255; } else { sp8C[i] = 32; @@ -3407,12 +3405,12 @@ void func_menu_8019B3DC(void) { } } -void func_menu_8019B5AC(void) { +void Option_8019B5AC(void) { s32 pad[2]; s32 colorGB; s32 var_v0; - func_menu_8019C824(&D_menu_801B91E8); + Option_8019C824(&D_menu_801B91E8); colorGB = D_menu_801B91E8; var_v0 = 0xFFFFFFFF; @@ -3433,36 +3431,36 @@ void func_menu_8019B5AC(void) { } } -void func_menu_8019B6D8(f32 xPos, f32 yPos, f32 offset, s32 r, s32 g, s32 b) { +void Option_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_VS_MENU_7004010, 8, 8, xPos, yPos, 1.0f, 1.0f); TextureRect_8bIA(&gMasterDisp, D_VS_MENU_7004010, 8, 8, xPos + offset, yPos, 1.0f, 1.0f); } -void func_menu_8019B7D4(void) { +void Option_8019B7D4(void) { RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); TextureRect_8bIA(&gMasterDisp, D_OPT_80080F0, 96, 10, 62.0f, 213.0f, 1.0f, 1.0f); TextureRect_8bIA(&gMasterDisp, D_OPT_8006E50, 96, 10, 166.0f, 213.0f, 1.0f, 1.0f); } -void func_menu_8019B8A0(s32 arg0) { +void Option_8019B8A0(s32 arg0) { D_menu_801B9124 = arg0; gDrawMode = DRAWMODE_0; D_menu_801B912C = 0; D_menu_801B91B4 = 0; } -void func_menu_8019B8C8(void) { - func_menu_8019BDF0(); +void Option_8019B8C8(void) { + Option_8019BDF0(); Option_DrawMenuCard(sOptionVSCardList[D_menu_801B91A8].unk_38); Matrix_Pop(&gGfxMatrix); Option_DrawCardLabel(sOptionVSCardList[D_menu_801B91A8].unk_00); } void Option_DrawMenuLabel(void) { - func_menu_8019BDF0(); + Option_8019BDF0(); Option_DrawMenuCard(sOptionCardList[D_menu_801B91A4].unk_38); Matrix_Pop(&gGfxMatrix); Option_DrawCardLabel(sOptionCardList[D_menu_801B91A4].unk_00); @@ -3490,18 +3488,17 @@ void Option_DrawMenuCard(MenuContext_38 arg0) { void Option_DrawMenuArwing(ArwingPosition arg0) { 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); + Option_8019BC44(arg0.unk_0, arg0.unk_4, D_menu_801B91F4, D_menu_801B9200, 90.0f, D_menu_801B91F8); + Option_8019BC44(arg0.unk_0 + arg0.unk_8, arg0.unk_4, D_menu_801B91F4, D_menu_801B91FC, -90.0f, D_menu_801B91F8); } } -void func_menu_8019BC44(f32 x, f32 y, f32 arg2, f32 arg3, f32 arg4, f32 arg5) { +void Option_8019BC44(f32 x, f32 y, f32 arg2, f32 arg3, f32 arg4, f32 arg5) { f32 sp44; f32 sp40; f32 sp3C; - func_menu_8019BE7C(D_menu_801B9224, D_menu_801B9228, 100.0f, &sp44, &sp40, &sp3C); + Option_8019BE7C(D_menu_801B9224, D_menu_801B9228, 100.0f, &sp44, &sp40, &sp3C); Lights_SetOneLight(&gMasterDisp, sp44, sp40, sp3C, D_menu_801B922C, D_menu_801B9230, D_menu_801B9234, D_menu_801B9238, D_menu_801B923C, D_menu_801B9240); @@ -3523,12 +3520,12 @@ void func_menu_8019BC44(f32 x, f32 y, f32 arg2, f32 arg3, f32 arg4, f32 arg5) { Matrix_Pop(&gGfxMatrix); } -void func_menu_8019BDF0(void) { +void Option_8019BDF0(void) { Matrix_Push(&gGfxMatrix); Matrix_LookAt(gGfxMatrix, gCsCamEyeX, gCsCamEyeY, gCsCamEyeZ, gCsCamAtX, gCsCamAtY, gCsCamAtZ, 0.0f, 1.0f, 0.0f, 1); } -void func_menu_8019BE7C(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f32* arg5) { +void Option_8019BE7C(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f32* arg5) { Vec3f sp24; Vec3f sp18; @@ -3545,18 +3542,18 @@ void func_menu_8019BE7C(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f32* *arg5 = sp24.z; } -void func_menu_8019BF34(void) { +void Option_8019BF34(void) { s32 i; f32 sp40; if (D_menu_801B9214 != 0) { sp40 = D_menu_801B9204; - func_menu_8019BDF0(); + Option_8019BDF0(); for (i = 0; i < 3; i++) { D_menu_801B920C = RAND_FLOAT(0.5f); D_menu_801B9210 = 0.5f; - func_menu_8019C04C(); + Option_8019C04C(); D_menu_801B9204 += 6.0f; } @@ -3572,7 +3569,7 @@ void func_menu_8019BF34(void) { } } -void func_menu_8019C04C(void) { +void Option_8019C04C(void) { RCP_SetupDL(&gMasterDisp, 0x24); Lib_Ortho(&gMasterDisp); @@ -3625,8 +3622,8 @@ void Option_DrawCardLabel(OptionTexture arg0) { } } -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) { +bool Option_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; @@ -3703,7 +3700,7 @@ bool func_menu_8019C418(s32* arg0, s32 arg1, bool arg2, s32 arg3, s32 arg4, s32 return ret; } -s32 func_menu_8019C5A0(s32* arg0) { +s32 Option_8019C5A0(s32* arg0) { s32 ret = 0; s32 temp = *arg0; s32 x = gControllerPress[gMainController].stick_x; @@ -3742,7 +3739,7 @@ s32 func_menu_8019C5A0(s32* arg0) { return ret; } -bool func_menu_8019C66C(f32* arg0, f32 arg1, f32 arg2, UnkStruct_D_menu_801B9250* arg3) { +bool Option_8019C66C(f32* arg0, f32 arg1, f32 arg2, UnkStruct_D_menu_801B9250* arg3) { f32 var_fv1; f32 temp2; bool var_a2 = false; @@ -3807,7 +3804,7 @@ bool func_menu_8019C66C(f32* arg0, f32 arg1, f32 arg2, UnkStruct_D_menu_801B9250 return var_a2; } -void func_menu_8019C824(f32* arg0) { +void Option_8019C824(f32* arg0) { if ((s32) Math_SmoothStepToF(arg0, D_menu_801B91E4, 0.5f, 100.0f, 1.0f) == 0.0f) { if (*arg0 == 32.0f) { D_menu_801B91E4 = 255.0f; @@ -3817,7 +3814,7 @@ void func_menu_8019C824(f32* arg0) { } } -s32 func_menu_8019C8C4(void) { +s32 Option_8019C8C4(void) { s32 i; s32 j; s32 k; @@ -3828,9 +3825,9 @@ s32 func_menu_8019C8C4(void) { s32 temp[10]; for (i = 0; i < gCurrentPlanet + 1; i++) { - var_v0 += ((D_80177B50[i] & 0x00FF0000) >> 16) & 1; - var_v0 += ((D_80177B50[i] & 0x0000FF00) >> 8) & 1; - var_v0 += (D_80177B50[i] & 0x000000FF) & 1; + var_v0 += ((D_ctx_80177B50[i] & 0x00FF0000) >> 16) & 1; + var_v0 += ((D_ctx_80177B50[i] & 0x0000FF00) >> 8) & 1; + var_v0 += (D_ctx_80177B50[i] & 0x000000FF) & 1; } for (i = 0; i < 10; i++) { @@ -3881,20 +3878,20 @@ s32 func_menu_8019C8C4(void) { return ret; } -void func_menu_8019CAE0(void) { +void Option_8019CAE0(void) { switch (D_menu_801B912C) { case 0: - func_menu_8019CBC0(); + Option_8019CBC0(); D_menu_801B912C++; break; case 1: - func_menu_8019CD54(); + Option_8019CD54(); break; case 2: - func_menu_8019D624(); - func_menu_80188010(); + Option_8019D624(); + Title_80188010(); D_menu_801B917C = 15; D_menu_801B912C++; break; @@ -3910,14 +3907,14 @@ void func_menu_8019CAE0(void) { } } -void func_menu_8019CBC0(void) { +void Option_8019CBC0(void) { s32 temp; s32 i; AUDIO_PLAY_BGM(SEQ_ID_36); gBlurAlpha = 0xD0; - D_80178410 = 800; + D_ctx_80178410 = 800; D_menu_801B9130 = 1; D_menu_801B9128 = 0; @@ -3935,7 +3932,7 @@ void func_menu_8019CBC0(void) { D_menu_801B9150[2][0] = gSaveFile.save.data.unk_18[temp][2] & 0xFF; for (i = 0; i < 3; i++) { - D_menu_801B90A0[i] = func_menu_8019DCE8(D_menu_801B9150[i][0]); + D_menu_801B90A0[i] = Option_8019DCE8(D_menu_801B9150[i][0]); D_menu_801B90B0[i] = 1; D_menu_801B9150[i][1] = 0; } @@ -3950,15 +3947,15 @@ void func_menu_8019CBC0(void) { D_menu_801B9150[i][1] = 0; } } - func_menu_80192598(); + Option_80192598(); } -void func_menu_8019CD54(void) { +void Option_8019CD54(void) { switch (D_menu_801B9128) { case 0: 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])) { + if (Option_8019C418(&D_menu_801B90A0[D_menu_801B9098], 36, 0, 0, 50, 5, 10, gMainController, + &D_menu_801B9160[D_menu_801B9098])) { AUDIO_PLAY_SFX(0x49000002, gDefaultSfxSource, 4); D_menu_801B9150[D_menu_801B9098][0] = D_menu_801AEF5C[D_menu_801B90A0[D_menu_801B9098]]; D_menu_801B90D0[D_menu_801B9098] = 0.0f; @@ -4043,7 +4040,7 @@ void func_menu_8019CD54(void) { } } -void func_menu_8019D118(void) { +void Option_8019D118(void) { static f32 D_menu_801AF300[] = { -120.0f, 0.0f, 120.0f }; f32 dirX; f32 dirY; @@ -4055,7 +4052,7 @@ void func_menu_8019D118(void) { RCP_SetupDL(&gMasterDisp, 0x4C); - if (D_80161A34 == 8) { + if (D_game_80161A34 == 8) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); Graphics_DisplayLargeText(D_menu_801AF30C[0], D_menu_801AF324[0], 1.0f, 1.0f, "CONGRATULATIONS"); } @@ -4075,18 +4072,18 @@ void func_menu_8019D118(void) { } } - func_menu_80197A3C(D_menu_801B9094, D_menu_801AF30C[4], D_menu_801AF324[4]); + Option_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_menu_801AF30C[3] - ((func_8008BCBC(gTotalHits) - 1) * 13), D_menu_801AF324[3], + Graphics_DisplayLargeNumber(D_menu_801AF30C[3] - ((func_hud_8008BCBC(gTotalHits) - 1) * 13), D_menu_801AF324[3], gTotalHits); - func_menu_801A9FD4(1); + Map_801A9FD4(1); - func_menu_80192738(); + Option_80192738(); for (i = 0; i < 3; i++) { if (i == D_menu_801B9098) { @@ -4103,7 +4100,7 @@ void func_menu_8019D118(void) { } } - func_menu_8019BE7C(D_menu_801B911C, D_menu_801B9120, 127.0f, &dirX, &dirY, &dirZ); + Option_8019BE7C(D_menu_801B911C, D_menu_801B9120, 127.0f, &dirX, &dirY, &dirZ); Lights_SetOneLight(&gMasterDisp, dirX, dirY, dirZ, 255, 255, 255, 65, 70, 48); @@ -4115,16 +4112,16 @@ void func_menu_8019D118(void) { for (i = 0; i < 3; i++) { if (gGameFrameCount & mask[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]); + Option_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_menu_8019D624(void) { +void Option_8019D624(void) { s32 i; s32 j; s32 var_t2; @@ -4147,13 +4144,13 @@ void func_menu_8019D624(void) { sp10A[10] = 0; for (i = 0; i < 7; i++) { - sp10A[10] |= (D_80177BB0[i] << i); + sp10A[10] |= (D_ctx_80177BB0[i] << i); } for (j = 0; j < 7; j++) { var_s0[10][j].unk_C = 0; - var_t2 = D_80177B70[j]; + var_t2 = D_ctx_80177B70[j]; if (var_t2 > 255) { var_t2 = var_t2 - 256; @@ -4162,21 +4159,21 @@ void func_menu_8019D624(void) { var_s0[10][j].unk_0 = var_t2; - var_a0 = D_80177B90[j]; + var_a0 = D_ctx_80177B90[j]; - if (D_80177B90[j] == PLANET_VENOM) { + if (D_ctx_80177B90[j] == PLANET_VENOM) { var_a0 = SAVE_SLOT_VENOM_1; } - if (D_80177B90[j] == PLANET_SOLAR) { + if (D_ctx_80177B90[j] == PLANET_SOLAR) { var_a0 = SAVE_SLOT_SOLAR; } var_s0[10][j].unk_8 = var_a0; - var_s0[10][j].unk_D = ((D_80177B50[j] & 0x00FF0000) >> 16) & 1; - var_s0[10][j].unk_F = ((D_80177B50[j] & 0x0000FF00) >> 8) & 1; - var_s0[10][j].unk_E = (D_80177B50[j] & 0x000000FF) & 1; + var_s0[10][j].unk_D = ((D_ctx_80177B50[j] & 0x00FF0000) >> 16) & 1; + var_s0[10][j].unk_F = ((D_ctx_80177B50[j] & 0x0000FF00) >> 8) & 1; + var_s0[10][j].unk_E = (D_ctx_80177B50[j] & 0x000000FF) & 1; } for (i = 0; i < 10; i++) { @@ -4231,7 +4228,7 @@ void func_menu_8019D624(void) { Save_Write(); } -void func_menu_8019DB20(s32 character, f32 x, f32 y, f32 z, f32 scale, f32 xAngle, f32 yAngle, f32 zAngle) { +void Option_8019DB20(s32 character, f32 x, f32 y, f32 z, f32 scale, f32 xAngle, f32 yAngle, f32 zAngle) { static Gfx* D_menu_801AF33C[37] = { D_FONT3D_90086F0, D_FONT3D_9007FD0, D_FONT3D_9007BB0, D_FONT3D_9000980, D_FONT3D_90075A0, D_FONT3D_90070C0, D_FONT3D_9006AE0, D_FONT3D_9006500, D_FONT3D_90062D0, D_FONT3D_9001120, D_FONT3D_9005CA0, D_FONT3D_9005980, @@ -4277,7 +4274,7 @@ void func_menu_8019DB20(s32 character, f32 x, f32 y, f32 z, f32 scale, f32 xAngl Matrix_Pop(&gGfxMatrix); } -s32 func_menu_8019DCE8(s32 arg0) { +s32 Option_8019DCE8(s32 arg0) { s32 i = 0; // 'for()' causes instruction reorder @@ -4295,7 +4292,7 @@ s32 func_menu_8019DCE8(s32 arg0) { return i; } -void func_menu_8019DD44(void) { +void Option_8019DD44(void) { switch (D_menu_801B912C) { case 0: Option_RankingInit(); @@ -4321,13 +4318,13 @@ void func_menu_8019DD44(void) { break; case 1: - func_menu_8019DE74(); + Option_8019DE74(); break; } } -void func_menu_8019DE74(void) { - func_menu_8019715C(); +void Option_8019DE74(void) { + Option_8019715C(); if (gControllerPress[gMainController].button & 0xD00E) { // START, A, B, C-UP, C-LEFT, C-DOWN AUDIO_PLAY_SFX(0x49000003, gDefaultSfxSource, 4); @@ -4335,12 +4332,12 @@ void func_menu_8019DE74(void) { gDrawMode = DRAWMODE_0; D_menu_801B912C = 0; - if (D_80161A34 == 5) { - D_80178410 = 0; + if (D_game_80161A34 == 5) { + D_ctx_80178410 = 0; gGameState = GSTATE_INIT; gLifeCount[0] = 2; gTotalHits = 0; - } else if (D_80161A34 == 8) { + } else if (D_game_80161A34 == 8) { SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1); D_menu_801B9124 = 400; @@ -4348,9 +4345,9 @@ void func_menu_8019DE74(void) { } } -void func_menu_8019DF64(void) { - func_menu_8019752C(); - func_menu_8019BDF0(); +void Option_8019DF64(void) { + Option_8019752C(); + Option_8019BDF0(); Option_DrawMenuCard(sOptionCardList[3].unk_38); Matrix_Pop(&gGfxMatrix); Option_DrawCardLabel(sOptionCardList[3].unk_00); @@ -4359,12 +4356,12 @@ void func_menu_8019DF64(void) { void Option_InvoiceUpdate(void) { switch (D_menu_801B912C) { case 0: - D_80178410 = 0; + D_ctx_80178410 = 0; gBgColor = 0; - D_80178348 = 0; - D_80178350 = 0; - D_80178354 = 0; - D_80178340 = 0; + D_ctx_80178348 = 0; + D_ctx_80178350 = 0; + D_ctx_80178354 = 0; + D_ctx_80178340 = 0; D_menu_801B9090 = 0; D_menu_801B9178 = 30; D_menu_801B912C++; @@ -4394,7 +4391,7 @@ void Option_InvoiceUpdate(void) { case 3: if (D_menu_801B9178 == 0) { - D_80178410 = 0; + D_ctx_80178410 = 0; gGameState = GSTATE_INIT; gDrawMode = DRAWMODE_0; *gLifeCount = 2; @@ -4450,12 +4447,13 @@ void Option_InvoiceDraw(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 0, 0, 0, 255); - Graphics_DisplayLargeNumber(D_menu_801AF3D0[6] - ((func_8008BCBC(gTotalHits) - 1) * 13), D_menu_801AF3F0[6], + Graphics_DisplayLargeNumber(D_menu_801AF3D0[6] - ((func_hud_8008BCBC(gTotalHits) - 1) * 13), D_menu_801AF3F0[6], gTotalHits); temp_a0 = gTotalHits * 64; - Graphics_DisplayLargeNumber(D_menu_801AF3D0[7] - ((func_8008BCBC(temp_a0) - 1) * 13), D_menu_801AF3F0[7], temp_a0); + Graphics_DisplayLargeNumber(D_menu_801AF3D0[7] - ((func_hud_8008BCBC(temp_a0) - 1) * 13), D_menu_801AF3F0[7], + temp_a0); if (D_menu_801B9090) { gDPSetPrimColor(gMasterDisp++, 0, 0, 120, 0, 0, 192); diff --git a/src/overlays/ovl_menu/fox_title.c b/src/overlays/ovl_menu/fox_title.c index e60abd2e..ea6468c9 100644 --- a/src/overlays/ovl_menu/fox_title.c +++ b/src/overlays/ovl_menu/fox_title.c @@ -7,6 +7,7 @@ #include "global.h" #include "fox_title.h" #include "assets/ast_title.h" +#include "assets/ast_font.h" f32 D_menu_801B7BB0; f32 D_menu_801B7BB4; @@ -142,8 +143,6 @@ f32 D_menu_801B907C; f32 D_menu_801B9080; f32 D_menu_801B9084; -#include "assets/ast_font.h" - typedef struct { /* 0x00 */ Animation* unk_0; /* 0x04 */ Animation* unk_4; @@ -162,22 +161,22 @@ u16* D_menu_801ADA30[5] = { gMsg_ID_10, gMsg_ID_20, gMsg_ID_30, gMsg_ID_40, gMsg_ID_50, }; -void func_menu_801875E0(void) { +void Title_801875E0(void) { D_80137E78 = 2; gGameFrameCount = 0; - D_80177AE0 = 2; + D_ctx_80177AE0 = 2; - D_80161A34 = 0; - D_800D2870 = 0; + D_game_80161A34 = 0; + D_game_800D2870 = 0; - gMainController = func_menu_80187ABC(); + gMainController = Title_80187ABC(); - D_80178348 = 0; - D_80178350 = 0; - D_80178354 = 0; - D_80178340 = 0; + D_ctx_80178348 = 0; + D_ctx_80178350 = 0; + D_ctx_80178354 = 0; + D_ctx_80178340 = 0; gFogRed = 0; gFogGreen = 0; @@ -199,11 +198,11 @@ void func_menu_801875E0(void) { Memory_FreeAll(); - func_800A5D6C(); - D_80178420 = 320.0f; - D_80178424 = 240.0f; + func_play_800A5D6C(); + D_ctx_80178420 = 320.0f; + D_ctx_80178424 = 240.0f; - func_menu_80188010(); + Title_80188010(); if ((gMainController == -1) || (D_menu_801B827C != 0)) { Audio_SetAudioSpec(0, 0x17); @@ -216,29 +215,29 @@ void func_menu_801875E0(void) { gControllerLock = 0x1E; } -void func_menu_80187754(void) { - switch (D_80177AE0) { +void Title_80187754(void) { + switch (D_ctx_80177AE0) { case 0: if (D_Timer_8017783C == 0) { gDrawMode = DRAWMODE_0; - D_80177AE0 = 1; + D_ctx_80177AE0 = 1; } break; case 1: gDrawMode = DRAWMODE_0; - func_menu_801875E0(); + Title_801875E0(); break; case 2: gDrawMode = DRAWMODE_1; - func_menu_801877F0(); + Title_801877F0(); break; } gGameFrameCount++; } -void func_menu_801877F0(void) { +void Title_801877F0(void) { if (D_menu_801B82A8 > 0) { D_menu_801B82A8 -= 1; } @@ -249,101 +248,101 @@ void func_menu_801877F0(void) { switch (D_menu_801B82C4) { case 7: - func_menu_80187B00(); + Title_80187B00(); break; case 0: - func_menu_801888E8(); - func_menu_8019111C(); + Title_801888E8(); + Title_8019111C(); break; case 1: - func_menu_8018994C(); + Title_8018994C(); break; case 2: - func_menu_8018A644(); + Title_8018A644(); break; case 3: - func_menu_8018ACEC(); + Title_8018ACEC(); break; case 4: - func_menu_8018B5C4(); + Title_8018B5C4(); break; case 5: - func_menu_8018C644(); + Title_8018C644(); break; } - func_menu_80190E64(); + Title_80190E64(); } -void func_menu_801878D8(void) { +void Title_801878D8(void) { switch (D_menu_801B82C4) { case 7: - func_menu_80187CA8(); + Title_80187CA8(); break; case 0: - func_menu_801918FC(); - func_menu_80189208(); + Title_801918FC(); + Title_80189208(); Matrix_Pop(&gGfxMatrix); - func_menu_8018F680(); - func_menu_8018F85C(); - func_menu_8018FC14(); - func_menu_8018F8E4(); - func_menu_801918FC(); - func_menu_8018F77C(); + Title_8018F680(); + Title_8018F85C(); + Title_8018FC14(); + Title_8018F8E4(); + Title_801918FC(); + Title_8018F77C(); Matrix_Pop(&gGfxMatrix); break; case 1: if (D_menu_801B8348 != 0) { - func_menu_801918FC(); - func_menu_8018A2F8(); + Title_801918FC(); + Title_8018A2F8(); Matrix_Pop(&gGfxMatrix); - func_800BB5D0(); - func_menu_80190C9C(); + func_radio_800BB5D0(); + Title_80190C9C(); } - func_menu_8018FF74(); - func_menu_801906A0(); + Title_8018FF74(); + Title_801906A0(); break; case 2: - func_menu_801918FC(); - func_menu_8018A990(); + Title_801918FC(); + Title_8018A990(); Matrix_Pop(&gGfxMatrix); if (D_menu_801B8344 != 0) { - func_menu_8018FD08(); + Title_8018FD08(); } break; case 3: - func_menu_801918FC(); - func_menu_8018B038(); + Title_801918FC(); + Title_8018B038(); Matrix_Pop(&gGfxMatrix); break; case 4: - func_menu_801918FC(); - func_menu_8018C114(); + Title_801918FC(); + Title_8018C114(); Matrix_Pop(&gGfxMatrix); - func_menu_80190C9C(); + Title_80190C9C(); break; case 5: - func_menu_801918FC(); - func_menu_8018CB90(); + Title_801918FC(); + Title_8018CB90(); Matrix_Pop(&gGfxMatrix); break; } if (D_menu_801B8284 != 0) { - D_80178340 = 0; - D_80178348 = 0; - D_80178350 = 0; - D_80178354 = 0; - func_80084688(2, D_menu_801B8284); + D_ctx_80178340 = 0; + D_ctx_80178348 = 0; + D_ctx_80178350 = 0; + D_ctx_80178354 = 0; + func_fade_80084688(2, D_menu_801B8284); } } -s32 func_menu_80187ABC(void) { +s32 Title_80187ABC(void) { s32 ret = -1; s32 i; @@ -357,11 +356,11 @@ s32 func_menu_80187ABC(void) { return ret; } -void func_menu_80187B00(void) { +void Title_80187B00(void) { switch (D_menu_801B82C0) { case 0: D_menu_801B8288 = 0; - D_80178410 = 800; + D_ctx_80178410 = 800; D_menu_801B82BC = 450; D_menu_801B82C0++; D_menu_801B82A8 = 20; @@ -369,14 +368,14 @@ void func_menu_80187B00(void) { case 1: if (D_menu_801B82BC != 0) { - func_800B6F50(gCsCamEyeX, gCsCamEyeY, gCsCamEyeZ, gCsCamAtX, gCsCamAtY, gCsCamAtZ); - D_8017842C -= 1.0f; + func_play_800B6F50(gCsCamEyeX, gCsCamEyeY, gCsCamEyeZ, gCsCamAtX, gCsCamAtY, gCsCamAtZ); + D_ctx_8017842C -= 1.0f; if (D_menu_801B82BC == 60) { SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 60); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 60); } } else { - D_80178410 = 0; + D_ctx_80178410 = 0; gRadioState = 0; D_menu_801B82C0 = 0; gDrawMode = DRAWMODE_0; @@ -395,7 +394,7 @@ void func_menu_80187B00(void) { } } -void func_menu_80187CA8(void) { +void Title_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; @@ -416,10 +415,10 @@ void func_menu_80187CA8(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); TextureRect_8bIA(&gMasterDisp, &D_5007690[48 * 6], 16, 2, 36, 32, 15.2f, 1.0f); - func_menu_80187E28(); + Title_80187E28(); } -void func_menu_80187E28(void) { +void Title_80187E28(void) { s32 temp; s32 i; @@ -435,7 +434,7 @@ void func_menu_80187E28(void) { 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); + Graphics_DisplaySmallNumber(105 - ((func_hud_8008BCBC(i + 1) - 1) * 8), temp, i + 1); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255); @@ -443,12 +442,12 @@ void func_menu_80187E28(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - Graphics_DisplaySmallNumber(211 - ((func_8008BCBC(D_menu_801B8220[i]) - 1) * 8), temp, D_menu_801B8220[i]); + Graphics_DisplaySmallNumber(211 - ((func_hud_8008BCBC(D_menu_801B8220[i]) - 1) * 8), temp, D_menu_801B8220[i]); temp += 17; } } -s32 func_menu_80188010(void) { +s32 Title_80188010(void) { s32 temp1; s32 temp2; s32 temp3; @@ -493,7 +492,7 @@ s32 func_menu_80188010(void) { return temp1; } -void func_menu_801881FC(void) { +void Title_801881FC(void) { bool var_a1 = true; s32 i; @@ -510,7 +509,7 @@ void func_menu_801881FC(void) { D_menu_801B869C = 255; - D_80178410 = 800; + D_ctx_80178410 = 800; D_menu_801B9040 = 0; D_menu_801B86C8 = 0.0f; @@ -537,10 +536,10 @@ void func_menu_801881FC(void) { D_menu_801B9060 = 242.0f; D_menu_801B9064 = 100.0f; - D_80178340 = 0; - D_80178348 = 0; - D_80178350 = 0; - D_80178354 = 0; + D_ctx_80178340 = 0; + D_ctx_80178348 = 0; + D_ctx_80178350 = 0; + D_ctx_80178354 = 0; D_menu_801B86A8 = 0.0f; D_menu_801B86AC = 0.0f; @@ -712,7 +711,7 @@ void func_menu_801881FC(void) { AUDIO_PLAY_BGM(SEQ_ID_34); } -void func_menu_801888E8(void) { +void Title_801888E8(void) { f32 temp_fv1; s32 i; static f32 D_menu_801ADA64[4] = { 10.0f, 20.0f, 20.0f, 20.0f }; @@ -720,7 +719,7 @@ void func_menu_801888E8(void) { switch (D_menu_801B82C0) { case 0: - func_menu_801881FC(); + Title_801881FC(); D_menu_801B82CC = 0.04f; D_menu_801B82D0 = 0.1f; D_menu_801B8340 = 0; @@ -839,11 +838,11 @@ void func_menu_801888E8(void) { D_menu_801B84E8->unk_18 += 0.6f; - func_menu_80191320(1, &gCsCamEyeX, &gCsCamEyeY, &gCsCamEyeZ, &gCsCamAtX, &gCsCamAtY, &gCsCamAtZ, D_menu_801B86A8, - D_menu_801B86AC, D_menu_801B86B0); - func_800B6F50(gCsCamEyeX, gCsCamEyeY, gCsCamEyeZ, gCsCamAtX, gCsCamAtY, gCsCamAtZ); + Title_80191320(1, &gCsCamEyeX, &gCsCamEyeY, &gCsCamEyeZ, &gCsCamAtX, &gCsCamAtY, &gCsCamAtZ, D_menu_801B86A8, + D_menu_801B86AC, D_menu_801B86B0); + func_play_800B6F50(gCsCamEyeX, gCsCamEyeY, gCsCamEyeZ, gCsCamAtX, gCsCamAtY, gCsCamAtZ); - D_8017842C -= 0.5f; + D_ctx_8017842C -= 0.5f; if (D_menu_801B82B0 > 0) { D_menu_801B82B0 -= 1; @@ -858,7 +857,7 @@ void func_menu_801888E8(void) { return; } - D_80178410 = 0; + D_ctx_80178410 = 0; D_menu_801B82C0 = 0; @@ -867,7 +866,7 @@ void func_menu_801888E8(void) { D_menu_801B82C4 = 7; } -void func_menu_80189208(void) { +void Title_80189208(void) { s32 i; static s32 D_menu_801ADA84[4] = { 0, 1, 3, 2 }; @@ -886,10 +885,10 @@ void func_menu_80189208(void) { Math_SmoothStepToF(&D_menu_801B86CC, D_menu_801B86DC, 0.1f, 100.0f, 0.0001f); } - func_menu_80191674(D_menu_801B86C8, D_menu_801B86CC, 100.0f, &D_menu_801B82E0, &D_menu_801B82E4, &D_menu_801B82E8); + Title_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_menu_8018EA78(D_menu_801ADA84[i]); + Title_8018EA78(D_menu_801ADA84[i]); D_menu_801B8350[D_menu_801ADA84[i]].unk_58 += D_menu_801B8350[D_menu_801ADA84[i]].unk_5C; } @@ -901,15 +900,15 @@ void func_menu_80189208(void) { gAmbientG = D_menu_801B8320; gAmbientB = D_menu_801B8324; - func_menu_80191674(D_menu_801B86D0, D_menu_801B86D4, 100.0f, &D_menu_801B82E0, &D_menu_801B82E4, &D_menu_801B82E8); + Title_80191674(D_menu_801B86D0, D_menu_801B86D4, 100.0f, &D_menu_801B82E0, &D_menu_801B82E4, &D_menu_801B82E8); - func_menu_8018D2B8(0); + Title_8018D2B8(0); } -void func_menu_801894E8(void) { +void Title_801894E8(void) { s32 i; - D_80178410 = 800; + D_ctx_80178410 = 800; D_menu_801B7C98 = 10; for (i = 0; i < 10; i++) { @@ -924,10 +923,10 @@ void func_menu_801894E8(void) { } D_menu_801B869C = 255; - D_80178340 = 255; - D_80178348 = 0; - D_80178350 = 0; - D_80178354 = 0; + D_ctx_80178340 = 255; + D_ctx_80178348 = 0; + D_ctx_80178350 = 0; + D_ctx_80178354 = 0; D_menu_801B9070 = 110.0f; D_menu_801B9074 = 70.0f; @@ -984,22 +983,22 @@ void func_menu_801894E8(void) { D_menu_801B82A0 = 1.0f; D_menu_801B82A4 = 0.0f; - func_menu_801914AC(D_menu_801B86BC, D_menu_801B86C0, D_menu_801B86C4, &gCsCamEyeX, &gCsCamEyeY, &gCsCamEyeZ, - D_menu_801B86B4, &gCsCamAtX, &gCsCamAtY, &gCsCamAtZ, D_menu_801B86B8, D_menu_801B86A8, - D_menu_801B86AC); + Title_801914AC(D_menu_801B86BC, D_menu_801B86C0, D_menu_801B86C4, &gCsCamEyeX, &gCsCamEyeY, &gCsCamEyeZ, + D_menu_801B86B4, &gCsCamAtX, &gCsCamAtY, &gCsCamAtZ, D_menu_801B86B8, D_menu_801B86A8, + D_menu_801B86AC); D_menu_801B7BF0 = 0; AUDIO_PLAY_BGM(SEQ_ID_35); } -void func_menu_8018994C(void) { +void Title_8018994C(void) { f32 temp; f32 temp2; switch (D_menu_801B82C0) { case 0: - func_menu_801894E8(); + Title_801894E8(); D_menu_801B8294 = D_menu_801B6B40; D_menu_801B7BE8 = 1.0f; D_menu_801B82CC = 0.002f; @@ -1007,13 +1006,13 @@ void func_menu_8018994C(void) { D_menu_801B82B8 = 0; gRadioState = 0; - D_80178300 = 0; + D_ctx_80178300 = 0; gCurrentMsgPri = 0; break; case 100: - if (D_80178340 != 0) { - D_80178340 -= 5; + if (D_ctx_80178340 != 0) { + D_ctx_80178340 -= 5; } else { D_menu_801B82A8 = 19; D_menu_801B82C0 = 1; @@ -1046,7 +1045,7 @@ void func_menu_8018994C(void) { D_menu_801B82D0 = 0.02f; D_menu_801B82C0++; D_menu_801B7BD8 = 1; - D_80178340 = 0; + D_ctx_80178340 = 0; } } } @@ -1110,7 +1109,7 @@ void func_menu_8018994C(void) { } if (D_menu_801B82B8 == 838) { - func_menu_801919C4(D_menu_801ADA30, RCID_GEN_PEPPER_TITLE); + Title_801919C4(D_menu_801ADA30, RCID_GEN_PEPPER_TITLE); } if (D_menu_801B82A8 == 1) { @@ -1136,10 +1135,10 @@ void func_menu_8018994C(void) { D_menu_801B7BD4 = -1; } - func_menu_8018CC30(D_menu_801B8294, 12, D_menu_801B8290); + Title_8018CC30(D_menu_801B8294, 12, D_menu_801B8290); - func_menu_80191798(&D_menu_801B86A8, &D_menu_801B86AC); - func_menu_80191844(D_menu_801B86A8, D_menu_801B86AC); + Title_80191798(&D_menu_801B86A8, &D_menu_801B86AC); + Title_80191844(D_menu_801B86A8, D_menu_801B86AC); if ((D_menu_801B82B8 > 960) && (D_menu_801B7BE8 > 0.0f)) { D_menu_801B7BE8 -= 0.0022f; @@ -1168,14 +1167,14 @@ void func_menu_8018994C(void) { } if (D_menu_801B82B4 == 750) { - D_80178340 = 0; - D_80178348 = 0; - D_80178350 = 0; - D_80178354 = 0; + D_ctx_80178340 = 0; + D_ctx_80178348 = 0; + D_ctx_80178350 = 0; + D_ctx_80178354 = 0; D_menu_801B869C = 1; } - if (D_80178340 == 255) { + if (D_ctx_80178340 == 255) { Audio_KillSfxBySourceAndId(D_menu_801B8658.unk_24, 0x11030010); Audio_KillSfxBySourceAndId(D_menu_801B8658.unk_24, 0x31024059); @@ -1189,33 +1188,33 @@ void func_menu_8018994C(void) { break; } - func_menu_801912A0(); - func_menu_80191674(D_menu_801B86C8, D_menu_801B86CC, 100.0f, &D_menu_801B82E0, &D_menu_801B82E4, &D_menu_801B82E8); + Title_801912A0(); + Title_80191674(D_menu_801B86C8, D_menu_801B86CC, 100.0f, &D_menu_801B82E0, &D_menu_801B82E4, &D_menu_801B82E8); if (D_menu_801B7BE8 != 0) { - func_800B6F50(gCsCamEyeX, gCsCamEyeY, gCsCamEyeZ, gCsCamAtX, gCsCamAtY, gCsCamAtZ); + func_play_800B6F50(gCsCamEyeX, gCsCamEyeY, gCsCamEyeZ, gCsCamAtX, gCsCamAtY, gCsCamAtZ); } - D_8017842C -= D_menu_801B7BE8; + D_ctx_8017842C -= D_menu_801B7BE8; D_menu_801B82B8++; } -void func_menu_8018A2F8(void) { +void Title_8018A2F8(void) { if (D_menu_801B8688.unk_0C != 0) { - func_menu_8018DF0C(-700.0f); + Title_8018DF0C(-700.0f); } - func_menu_8018E058(); + Title_8018E058(); } -void func_menu_8018A338(void) { - D_80178410 = 0; +void Title_8018A338(void) { + D_ctx_80178410 = 0; D_menu_801B869C = 255; - D_80178340 = 255; - D_80178348 = 0; - D_80178350 = 0; - D_80178354 = 0; + D_ctx_80178340 = 255; + D_ctx_80178348 = 0; + D_ctx_80178350 = 0; + D_ctx_80178354 = 0; D_menu_801B8344 = 0; D_menu_801B8334 = 0; @@ -1281,9 +1280,9 @@ void func_menu_8018A338(void) { D_menu_801B82A0 = 1.0f; D_menu_801B82A4 = 0.0f; - func_menu_801914AC(D_menu_801B86BC, D_menu_801B86C0, D_menu_801B86C4, &gCsCamEyeX, &gCsCamEyeY, &gCsCamEyeZ, - D_menu_801B86B4, &gCsCamAtX, &gCsCamAtY, &gCsCamAtZ, D_menu_801B86B8, D_menu_801B86A8, - D_menu_801B86AC); + Title_801914AC(D_menu_801B86BC, D_menu_801B86C0, D_menu_801B86C4, &gCsCamEyeX, &gCsCamEyeY, &gCsCamEyeZ, + D_menu_801B86B4, &gCsCamAtX, &gCsCamAtY, &gCsCamAtZ, D_menu_801B86B8, D_menu_801B86A8, + D_menu_801B86AC); } static CameraPoint D_menu_801ADA94[50] = { @@ -1323,12 +1322,12 @@ static CameraPoint D_menu_801ADA94[50] = { { -357.60858f, 192.84035f, -1394.141f, 41.881878f, 129.81488f, -738.9043f }, }; -void func_menu_8018A644(void) { +void Title_8018A644(void) { static s32 D_menu_801ADF44[] = { 63, 170, 268, 368 }; switch (D_menu_801B82C0) { case 0: - func_menu_8018A338(); + Title_8018A338(); AUDIO_PLAY_SFX(0x49000014, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(0x0140001C, D_menu_801B84D8, 0); @@ -1360,9 +1359,9 @@ void func_menu_8018A644(void) { break; case 2: - 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); + Title_80191798(&D_menu_801B86A8, &D_menu_801B86AC); + Title_80191844(D_menu_801B86A8, D_menu_801B86AC); + Title_8018CC30(D_menu_801B8294, 34, D_menu_801B8290); if (D_menu_801B82B4 == D_menu_801ADF44[D_menu_801B8340]) { D_menu_801B8344 = 1; @@ -1396,13 +1395,13 @@ void func_menu_8018A644(void) { break; } - func_menu_801912A0(); - func_menu_80191674(D_menu_801B86C8, D_menu_801B86CC, 100.0f, &D_menu_801B82E0, &D_menu_801B82E4, &D_menu_801B82E8); + Title_801912A0(); + Title_80191674(D_menu_801B86C8, D_menu_801B86CC, 100.0f, &D_menu_801B82E0, &D_menu_801B82E4, &D_menu_801B82E8); D_menu_801B7BEC++; } -void func_menu_8018A990(void) { +void Title_8018A990(void) { s32 i; static UnkStruct_D_menu_801ADF54 D_menu_801ADF54[4] = { { 255.0f, 155.0f, 155.0f }, @@ -1436,7 +1435,7 @@ void func_menu_8018A990(void) { gAmbientG = D_menu_801B832C; gAmbientB = D_menu_801B8330; - func_menu_8018F438(); + Title_8018F438(); gLight1R = D_menu_801B82F8; gLight1G = D_menu_801B82FC; @@ -1446,20 +1445,20 @@ void func_menu_8018A990(void) { gAmbientB = D_menu_801B830C; for (i = 0; i < 4; i++) { - func_menu_8018E67C(i); + Title_8018E67C(i); D_menu_801B8350[i].unk_58 += D_menu_801B8350[i].unk_5C; } } -void func_menu_8018ABC0(void) { - D_80178410 = 800; +void Title_8018ABC0(void) { + D_ctx_80178410 = 800; D_menu_801B869C = 255; - D_80178340 = 0; - D_80178348 = 0; - D_80178350 = 0; - D_80178354 = 0; + D_ctx_80178340 = 0; + D_ctx_80178348 = 0; + D_ctx_80178350 = 0; + D_ctx_80178354 = 0; gLight1R = 101; gLight1G = 106; gLight1B = 92; @@ -1489,10 +1488,10 @@ void func_menu_8018ABC0(void) { D_menu_801B8658.angleZ = 0.0f; } -void func_menu_8018ACEC(void) { +void Title_8018ACEC(void) { switch (D_menu_801B82C0) { case 0: - func_menu_8018ABC0(); + Title_8018ABC0(); AUDIO_PLAY_SFX(0x11030010, D_menu_801B8658.unk_24, 0); AUDIO_PLAY_SFX(0x31024059, D_menu_801B8658.unk_24, 0); @@ -1513,7 +1512,7 @@ void func_menu_8018ACEC(void) { D_menu_801B869C = 1; } - if (D_80178340 == 255) { + if (D_ctx_80178340 == 255) { Audio_KillSfxBySourceAndId(D_menu_801B8658.unk_24, 0x11030010); Audio_KillSfxBySourceAndId(D_menu_801B8658.unk_24, 0x31024059); @@ -1522,25 +1521,25 @@ void func_menu_8018ACEC(void) { D_menu_801B82C0 = 0; D_menu_801B82C4 = 4; } - func_menu_801912A0(); + Title_801912A0(); D_menu_801B82B4++; break; } - func_menu_80191320(1, &gCsCamEyeX, &gCsCamEyeY, &gCsCamEyeZ, &gCsCamAtX, &gCsCamAtY, &gCsCamAtZ, 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(gCsCamEyeX, gCsCamEyeY, gCsCamEyeZ, gCsCamAtX, gCsCamAtY, gCsCamAtZ); + Title_80191320(1, &gCsCamEyeX, &gCsCamEyeY, &gCsCamEyeZ, &gCsCamAtX, &gCsCamAtY, &gCsCamAtZ, D_menu_801B86A8, + D_menu_801B86AC, D_menu_801B86B0); + Title_80191674(D_menu_801B86C8, D_menu_801B86CC, 100.0f, &D_menu_801B82E0, &D_menu_801B82E4, &D_menu_801B82E8); + func_play_800B6F50(gCsCamEyeX, gCsCamEyeY, gCsCamEyeZ, gCsCamAtX, gCsCamAtY, gCsCamAtZ); - D_8017842C += 2.0f; - D_80178430 += 2.0f; + D_ctx_8017842C += 2.0f; + D_ctx_80178430 += 2.0f; } -void func_menu_8018B038(void) { - func_menu_8018E058(); +void Title_8018B038(void) { + Title_8018E058(); } -void func_menu_8018B058(void) { +void Title_8018B058(void) { f32 var_fv0; s32 i; @@ -1571,11 +1570,11 @@ void func_menu_8018B058(void) { D_menu_801B869C = 0xFF; - D_80178340 = 0; - D_80178348 = 0xFF; - D_80178350 = 0xFF; - D_80178354 = 0xFF; - D_80178410 = 0; + D_ctx_80178340 = 0; + D_ctx_80178348 = 0xFF; + D_ctx_80178350 = 0xFF; + D_ctx_80178354 = 0xFF; + D_ctx_80178410 = 0; D_menu_801B8334 = 0; D_menu_801B8338 = 1; @@ -1633,9 +1632,9 @@ void func_menu_8018B058(void) { D_menu_801B82A0 = 1.0f; D_menu_801B82A4 = 0.0f; - func_menu_801914AC(D_menu_801B86BC, D_menu_801B86C0, D_menu_801B86C4, &gCsCamEyeX, &gCsCamEyeY, &gCsCamEyeZ, - D_menu_801B86B4, &gCsCamAtX, &gCsCamAtY, &gCsCamAtZ, D_menu_801B86B8, D_menu_801B86A8, - D_menu_801B86AC); + Title_801914AC(D_menu_801B86BC, D_menu_801B86C0, D_menu_801B86C4, &gCsCamEyeX, &gCsCamEyeY, &gCsCamEyeZ, + D_menu_801B86B4, &gCsCamAtX, &gCsCamAtY, &gCsCamAtZ, D_menu_801B86B8, D_menu_801B86A8, + D_menu_801B86AC); D_menu_801B9044 = 25.0f; D_menu_801B9048 = 84.0f; @@ -1643,7 +1642,7 @@ void func_menu_8018B058(void) { D_menu_801B9050 = -33.0f; } -void func_menu_8018B5C4(void) { +void Title_8018B5C4(void) { s32 i; f32 temp[4]; @@ -1651,7 +1650,7 @@ void func_menu_8018B5C4(void) { case 0: D_menu_801B7BEC = 0; - func_menu_8018B058(); + Title_8018B058(); Audio_SetBaseSfxReverb(0x68); D_menu_801B82A8 = 30; @@ -1677,9 +1676,9 @@ void func_menu_8018B5C4(void) { break; case 1: - 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); + Title_80191798(&D_menu_801B86A8, &D_menu_801B86AC); + Title_80191844(D_menu_801B86A8, D_menu_801B86AC); + Title_8018CC30(D_menu_801B8294, 10, D_menu_801B8290); if (D_menu_801B9048 > 0.0f) { D_menu_801B9048 -= 0.41f; @@ -1744,9 +1743,9 @@ void func_menu_8018B5C4(void) { D_menu_801B86B4 = 36.0f; D_menu_801B86B8 = -70.0f; - func_menu_801914AC(D_menu_801B86BC, D_menu_801B86C0, D_menu_801B86C4, &gCsCamEyeX, &gCsCamEyeY, - &gCsCamEyeZ, D_menu_801B86B4, &gCsCamAtX, &gCsCamAtY, &gCsCamAtZ, D_menu_801B86B8, - D_menu_801B86A8, D_menu_801B86AC); + Title_801914AC(D_menu_801B86BC, D_menu_801B86C0, D_menu_801B86C4, &gCsCamEyeX, &gCsCamEyeY, &gCsCamEyeZ, + D_menu_801B86B4, &gCsCamAtX, &gCsCamAtY, &gCsCamAtZ, D_menu_801B86B8, D_menu_801B86A8, + D_menu_801B86AC); D_menu_801B82B4 = 0; @@ -1796,15 +1795,15 @@ void func_menu_8018B5C4(void) { gLight1B = D_menu_801B82F4; } - if ((D_menu_801B82B4 > 60) && (D_80178340 < 255)) { - D_80178340++; + if ((D_menu_801B82B4 > 60) && (D_ctx_80178340 < 255)) { + D_ctx_80178340++; } - if (D_80178340 == 0x80) { + if (D_ctx_80178340 == 0x80) { D_menu_801B82A8 = 7; D_menu_801B84E8[3].unk_3C = 0; D_menu_801B84E8[3].unk_40 = 0; - D_80178340 = 0xFF; + D_ctx_80178340 = 0xFF; D_menu_801B82C0++; } @@ -1819,9 +1818,9 @@ void func_menu_8018B5C4(void) { 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_menu_801914AC(D_menu_801B86BC, D_menu_801B86C0, D_menu_801B86C4, &gCsCamEyeX, &gCsCamEyeY, &gCsCamEyeZ, - D_menu_801B86B4, &gCsCamAtX, &gCsCamAtY, &gCsCamAtZ, D_menu_801B86B8, D_menu_801B86A8, - D_menu_801B86AC); + Title_801914AC(D_menu_801B86BC, D_menu_801B86C0, D_menu_801B86C4, &gCsCamEyeX, &gCsCamEyeY, &gCsCamEyeZ, + D_menu_801B86B4, &gCsCamAtX, &gCsCamAtY, &gCsCamAtZ, D_menu_801B86B8, D_menu_801B86A8, + D_menu_801B86AC); D_menu_801B82B4++; break; @@ -1832,7 +1831,7 @@ void func_menu_8018B5C4(void) { D_menu_801B82A8 = 4; - D_80178340 = 0; + D_ctx_80178340 = 0; for (i = 0; i < 4; i++) { D_menu_801B84E8[i].unk_3C = 1; @@ -1841,7 +1840,7 @@ void func_menu_8018B5C4(void) { D_menu_801B82B4 = 0; - D_80178410 = 800; + D_ctx_80178410 = 800; D_menu_801B82C0++; } @@ -1857,9 +1856,9 @@ void func_menu_8018B5C4(void) { 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_menu_801914AC(D_menu_801B86BC, D_menu_801B86C0, D_menu_801B86C4, &gCsCamEyeX, &gCsCamEyeY, - &gCsCamEyeZ, D_menu_801B86B4, &gCsCamAtX, &gCsCamAtY, &gCsCamAtZ, D_menu_801B86B8, - D_menu_801B86A8, D_menu_801B86AC); + Title_801914AC(D_menu_801B86BC, D_menu_801B86C0, D_menu_801B86C4, &gCsCamEyeX, &gCsCamEyeY, &gCsCamEyeZ, + D_menu_801B86B4, &gCsCamAtX, &gCsCamAtY, &gCsCamAtZ, D_menu_801B86B8, D_menu_801B86A8, + D_menu_801B86AC); if (D_menu_801B82B4 > 8) { Audio_SetBaseSfxReverb(0); @@ -1870,36 +1869,36 @@ void func_menu_8018B5C4(void) { } break; } - func_menu_80191674(D_menu_801B86C8, D_menu_801B86CC, 100.0f, &D_menu_801B82E0, &D_menu_801B82E4, &D_menu_801B82E8); + Title_80191674(D_menu_801B86C8, D_menu_801B86CC, 100.0f, &D_menu_801B82E0, &D_menu_801B82E4, &D_menu_801B82E8); D_menu_801B7BEC++; } -void func_menu_8018C114(void) { +void Title_8018C114(void) { s32 i; if (D_menu_801B8688.unk_0C != 0) { - func_menu_8018DF0C(0.0f); + Title_8018DF0C(0.0f); } - func_menu_80190950(); + Title_80190950(); for (i = 3; i >= 0; i--) { if (D_menu_801B84E8[i].unk_4C) { - func_menu_80190B30(i); + Title_80190B30(i); } } for (i = 0; i < 4; i++) { if (D_menu_801B84E8[i].unk_4C) { - func_menu_8018D2B8(i); + Title_8018D2B8(i); } } } -void func_menu_8018C1C0(void) { +void Title_8018C1C0(void) { s32 i; - D_80178410 = 1; + D_ctx_80178410 = 1; D_menu_801B7C98 = 10; for (i = 0; i < 10; i++) { @@ -1925,10 +1924,10 @@ void func_menu_8018C1C0(void) { D_menu_801B869C = 255; - D_80178340 = 0; - D_80178348 = 0; - D_80178350 = 0; - D_80178354 = 0; + D_ctx_80178340 = 0; + D_ctx_80178348 = 0; + D_ctx_80178350 = 0; + D_ctx_80178354 = 0; D_menu_801B8688.pos.x = 130.0f; D_menu_801B8688.pos.y = -30.0f; @@ -1988,9 +1987,9 @@ void func_menu_8018C1C0(void) { D_menu_801B82A0 = 1.0f; D_menu_801B82A4 = 0.0f; - func_menu_801914AC(D_menu_801B86BC, D_menu_801B86C0, D_menu_801B86C4, &gCsCamEyeX, &gCsCamEyeY, &gCsCamEyeZ, - D_menu_801B86B4, &gCsCamAtX, &gCsCamAtY, &gCsCamAtZ, D_menu_801B86B8, D_menu_801B86A8, - D_menu_801B86AC); + Title_801914AC(D_menu_801B86BC, D_menu_801B86C0, D_menu_801B86C4, &gCsCamEyeX, &gCsCamEyeY, &gCsCamEyeZ, + D_menu_801B86B4, &gCsCamAtX, &gCsCamAtY, &gCsCamAtZ, D_menu_801B86B8, D_menu_801B86A8, + D_menu_801B86AC); } static CameraPoint D_menu_801ADF84[50] = { @@ -2005,7 +2004,7 @@ static CameraPoint D_menu_801ADF84[50] = { { 481.63818f, -313.2934f, -628.9213f, 96.2103f, -5.343582f, -4.23885f }, }; -void func_menu_8018C644(void) { +void Title_8018C644(void) { s32 i; f32 x; f32 y; @@ -2019,7 +2018,7 @@ void func_menu_8018C644(void) { AUDIO_PLAY_SFX(0x11030010, D_menu_801B8658.unk_24, 0); AUDIO_PLAY_SFX(0x31024059, D_menu_801B8658.unk_24, 0); - func_menu_8018C1C0(); + Title_8018C1C0(); D_menu_801B82B4 = 0; D_menu_801B7BEC = 0; @@ -2079,18 +2078,18 @@ void func_menu_8018C644(void) { D_menu_801B869C = 1; } - if (D_80178340 == 0xFF) { + if (D_ctx_80178340 == 0xFF) { Audio_KillSfxBySourceAndId(D_menu_801B8658.unk_24, 0x11030010); Audio_KillSfxBySourceAndId(D_menu_801B8658.unk_24, 0x31024059); D_menu_801B82C0++; } - func_menu_801912A0(); + Title_801912A0(); D_menu_801B82B4++; break; case 2: - D_80178340 = 0; - D_80178410 = 0; + D_ctx_80178340 = 0; + D_ctx_80178410 = 0; D_menu_801B86A0 = 0; D_menu_801B82A8 = 20; D_menu_801B82C0++; @@ -2107,34 +2106,34 @@ void func_menu_8018C644(void) { break; } - 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(gCsCamEyeX, gCsCamEyeY, gCsCamEyeZ, gCsCamAtX, gCsCamAtY, gCsCamAtZ); + Title_80191798(&D_menu_801B86A8, &D_menu_801B86AC); + Title_80191844(D_menu_801B86A8, D_menu_801B86AC); + Title_8018CC30(D_menu_801B8294, 9, D_menu_801B8290); + Title_80191674(D_menu_801B86C8, D_menu_801B86CC, 100.0f, &D_menu_801B82E0, &D_menu_801B82E4, &D_menu_801B82E8); + func_play_800B6F50(gCsCamEyeX, gCsCamEyeY, gCsCamEyeZ, gCsCamAtX, gCsCamAtY, gCsCamAtZ); D_menu_801B7BEC++; } -void func_menu_8018CB90(void) { +void Title_8018CB90(void) { s32 i; if (D_menu_801B86A0 != 0) { if (D_menu_801B8688.unk_0C != 0) { - func_menu_8018DF0C(-1000.0f); + Title_8018DF0C(-1000.0f); } - func_menu_8018E058(); + Title_8018E058(); for (i = 0; i < 4; i++) { if ((D_menu_801B84E8[i].unk_38 <= 0) && (D_menu_801B84E8[i].unk_4C != 0)) { - func_menu_8018D2B8(i); + Title_8018D2B8(i); } } } } -void func_menu_8018CC30(CameraPoint* arg0, s32 arg1, f32 arg2) { +void Title_8018CC30(CameraPoint* arg0, s32 arg1, f32 arg2) { s32 var_a3; CameraPoint pos; @@ -2154,7 +2153,7 @@ void func_menu_8018CC30(CameraPoint* arg0, s32 arg1, f32 arg2) { var_a3 = 2; } - func_menu_8018CD9C(&pos, &arg0[D_menu_801B8298], D_menu_801B828C, var_a3); + Title_8018CD9C(&pos, &arg0[D_menu_801B8298], D_menu_801B828C, var_a3); gCsCamEyeX = pos.eye.x; gCsCamEyeY = pos.eye.y; gCsCamEyeZ = pos.eye.z; @@ -2174,7 +2173,7 @@ void func_menu_8018CC30(CameraPoint* arg0, s32 arg1, f32 arg2) { } } -void func_menu_8018CD9C(CameraPoint* pos, CameraPoint* arg1, f32 weight, s32 arg3) { +void Title_8018CD9C(CameraPoint* pos, CameraPoint* arg1, f32 weight, s32 arg3) { f32 temp1; f32 temp2; f32 temp3; @@ -2233,7 +2232,7 @@ void func_menu_8018CD9C(CameraPoint* pos, CameraPoint* arg1, f32 weight, s32 arg (temp4 * (arg1 + 3)->at.z); } -void func_menu_8018D2B8(s32 arg0) { +void Title_8018D2B8(s32 arg0) { WingInfo wings; Lights_SetOneLight(&gMasterDisp, D_menu_801B82E0, D_menu_801B82E4, D_menu_801B82E8, gLight1R, gLight1G, gLight1B, @@ -2265,26 +2264,26 @@ void func_menu_8018D2B8(s32 arg0) { wings.unk_34 = D_menu_801B84E8[arg0].unk_30; wings.unk_38 = D_menu_801B84E8[arg0].unk_24; - func_80053658(&wings); + func_display_80053658(&wings); - func_8005F1EC(D_menu_801B84E8[arg0].unk_50); + func_edisplay_8005F1EC(D_menu_801B84E8[arg0].unk_50); if (D_menu_801B84E8[arg0].unk_40 != 0) { - func_menu_8018D80C(arg0); + Title_8018D80C(arg0); } if (D_menu_801B84E8[arg0].unk_3C != 0) { - func_menu_8018D510(arg0); + Title_8018D510(arg0); } if (D_menu_801B84E8[arg0].unk_48 != 0) { - func_menu_8018DDB8(arg0); + Title_8018DDB8(arg0); } Matrix_Pop(&gGfxMatrix); } -void func_menu_8018D510(s32 arg0) { +void Title_8018D510(s32 arg0) { f32 var_fv0; f32 sp40; f32 sp3C; @@ -2334,7 +2333,7 @@ void func_menu_8018D510(s32 arg0) { Matrix_Pop(&gGfxMatrix); } -void func_menu_8018D80C(s32 arg0) { +void Title_8018D80C(s32 arg0) { s32 i; f32 sp70; f32 sp6C; @@ -2409,7 +2408,7 @@ void func_menu_8018D80C(s32 arg0) { } } -void func_menu_8018DDB8(s32 arg0) { +void Title_8018DDB8(s32 arg0) { Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, 0.0f, (D_menu_801B9050 - D_menu_801B84E8[arg0].unk_00.y * 2.05f) + (D_menu_801B9048 - 84.0f) * 1.99f, @@ -2426,11 +2425,11 @@ void func_menu_8018DDB8(s32 arg0) { Matrix_Pop(&gGfxMatrix); } -void func_menu_8018DF0C(f32 arg0) { +void Title_8018DF0C(f32 arg0) { f32 sp34; f32 sp30; - func_menu_80191798(&sp34, &sp30); + Title_80191798(&sp34, &sp30); RCP_SetupDL(&gMasterDisp, 0x35); if (arg0 != 0.0f) { @@ -2445,11 +2444,11 @@ void func_menu_8018DF0C(f32 arg0) { Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_TITLE_6037CF0); - func_menu_8018E200(); + Title_8018E200(); Matrix_Pop(&gGfxMatrix); } -void func_menu_8018E058(void) { +void Title_8018E058(void) { Lights_SetOneLight(&gMasterDisp, D_menu_801B82E0, D_menu_801B82E4, D_menu_801B82E8, gLight1R, gLight1G, gLight1B, gAmbientR, gAmbientG, gAmbientB); @@ -2468,13 +2467,13 @@ void func_menu_8018E058(void) { gGreatFoxIntact = true; - func_800515C4(); - func_8005F1EC(D_menu_801B8658.unk_24); + func_demo_800515C4(); + func_edisplay_8005F1EC(D_menu_801B8658.unk_24); Matrix_Pop(&gGfxMatrix); } -void func_menu_8018E200(void) { +void Title_8018E200(void) { f32 scale; s32 i; @@ -2545,7 +2544,7 @@ void func_menu_8018E200(void) { } } -void func_menu_8018E67C(s32 arg0) { +void Title_8018E67C(s32 arg0) { Vec3f sp60[50]; s32 sp5C; f32 temp_fv1; @@ -2576,7 +2575,7 @@ void func_menu_8018E67C(s32 arg0) { } if (arg0 == 0) { - func_8005F1EC(D_menu_801B84D8); + func_edisplay_8005F1EC(D_menu_801B84D8); } Matrix_Pop(&gGfxMatrix); @@ -2609,7 +2608,7 @@ void func_menu_8018E67C(s32 arg0) { D_menu_801B8350[arg0].unk_10 = 3.0f - (D_menu_801B8350[arg0].unk_0C / 100.0f); } -void func_menu_8018EA78(s32 arg0) { +void Title_8018EA78(s32 arg0) { Vec3f sp48[50]; s32 sp44; @@ -2634,13 +2633,13 @@ void func_menu_8018EA78(s32 arg0) { 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].skeleton, D_menu_801B86E0[arg0], func_menu_8018EDC8, NULL, &arg0, + Animation_DrawSkeleton(1, D_menu_801ADA00[arg0].skeleton, D_menu_801B86E0[arg0], Title_8018EDC8, NULL, &arg0, &gIdentityMatrix); Matrix_Pop(&gGfxMatrix); } -bool func_menu_8018EDC8(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { +bool Title_8018EDC8(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) { f32 x; f32 y; f32 z; @@ -2776,7 +2775,7 @@ bool func_menu_8018EDC8(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void return false; } -void func_menu_8018F438(void) { +void Title_8018F438(void) { f32 sp54; Lights_SetOneLight(&gMasterDisp, 0, 0, 0, 0, 0, 0, gAmbientR, gAmbientG, gAmbientB); @@ -2813,7 +2812,7 @@ void func_menu_8018F438(void) { Matrix_Pop(&gGfxMatrix); } -void func_menu_8018F680(void) { +void Title_8018F680(void) { s32 i; RCP_SetupDL(&gMasterDisp, 0x53); @@ -2825,7 +2824,7 @@ void func_menu_8018F680(void) { } } -void func_menu_8018F77C(void) { +void Title_8018F77C(void) { RCP_SetupDL(&gMasterDisp, 0x35); Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, D_menu_801B905C, D_menu_801B9060, D_menu_801B9064, 1); @@ -2836,13 +2835,13 @@ void func_menu_8018F77C(void) { Matrix_Pop(&gGfxMatrix); } -void func_menu_8018F85C(void) { +void Title_8018F85C(void) { RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); TextureRect_8bIA(&gMasterDisp, gTitleCopyrightSymbol, 16, 16, 234.0f, 20.0f, 1.0f, 1.0f); } -void func_menu_8018F8E4(void) { +void Title_8018F8E4(void) { f32 temp2; s32 i; static f32 D_menu_801AE464 = 68.0f; @@ -2891,7 +2890,7 @@ void func_menu_8018F8E4(void) { } } -void func_menu_8018FC14(void) { +void Title_8018FC14(void) { s32 i; RCP_SetupDL(&gMasterDisp, 0x53); @@ -2903,7 +2902,7 @@ void func_menu_8018FC14(void) { } } -void func_menu_8018FD08(void) { +void Title_8018FD08(void) { s32 i; Gfx* temp_v1; f32 temp_fs2; @@ -2966,9 +2965,9 @@ static s32 D_menu_801AE528[] = { 80, 64, 48, 32, 12, 32, 44, 32, 42, 36, 12, 38, }; -void func_menu_8018FF74(void) { +void Title_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 > -870.0f) && (D_menu_801B7BB8 < 900.0f) && (D_ctx_80178340 > 0)) { if ((D_menu_801B7BB8 < 0.0f) && (D_menu_801B7BD0 < 255)) { D_menu_801B7BD0 += 2; } @@ -2987,44 +2986,44 @@ void func_menu_8018FF74(void) { D_menu_801B9080 += 1.66f; } - func_menu_801918FC(); - func_menu_80190144(); - func_menu_801903B8(); + Title_801918FC(); + Title_80190144(); + Title_801903B8(); Matrix_Pop(&gGfxMatrix); } } -void func_menu_80190144(void) { +void Title_80190144(void) { s32 i; - if (D_80178340 > 0) { - D_80178340 -= 4; + if (D_ctx_80178340 > 0) { + D_ctx_80178340 -= 4; } - D_801783D0 = D_menu_801B7BB8; - D_801783D4 = D_menu_801B7BBC; + D_ctx_801783D0 = D_menu_801B7BB8; + D_ctx_801783D4 = D_menu_801B7BBC; - if (D_801783D0 < 950.0f) { - if (D_801783D0 > -900.0f) { - D_80178340 += 8; - if (D_80178340 > 60) { - D_80178340 = 60; + if (D_ctx_801783D0 < 950.0f) { + if (D_ctx_801783D0 > -900.0f) { + D_ctx_80178340 += 8; + if (D_ctx_80178340 > 60) { + D_ctx_80178340 = 60; } - D_80178348 = 208; - D_80178350 = 208; - D_80178354 = 208; + D_ctx_80178348 = 208; + D_ctx_80178350 = 208; + D_ctx_80178354 = 208; } } - if (D_80178340 > 0) { + if (D_ctx_80178340 > 0) { RCP_SetupDL(&gMasterDisp, 0x3E); gDPSetAlphaDither(gMasterDisp++, G_AD_NOISE); gDPSetColorDither(gMasterDisp++, G_CD_NOISE); Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, D_801783D0, D_801783D4, -200.0f, 1); + Matrix_Translate(gGfxMatrix, D_ctx_801783D0, D_ctx_801783D4, -200.0f, 1); for (i = 0; i < 4; i++) { Matrix_Push(&gGfxMatrix); @@ -3041,7 +3040,7 @@ void func_menu_80190144(void) { } } -void func_menu_801903B8(void) { +void Title_801903B8(void) { static s32 D_menu_801AE558 = 12; f32 temp_fs3; f32 temp_fs4; @@ -3054,19 +3053,19 @@ void func_menu_801903B8(void) { gDPSetAlphaDither(gMasterDisp++, G_AD_NOISE); gDPSetColorDither(gMasterDisp++, G_CD_NOISE); - if (D_80178340 > 0) { - temp_fs3 = D_801783D0 * -0.03f; - temp_fs4 = D_801783D4 * 0.03f; + if (D_ctx_80178340 > 0) { + temp_fs3 = D_ctx_801783D0 * -0.03f; + temp_fs4 = D_ctx_801783D4 * 0.03f; var_fs1 = 1.0f; - if (D_80178340 < 10) { - var_fs1 = D_80178340 / 10.0f; + if (D_ctx_80178340 < 10) { + var_fs1 = D_ctx_80178340 / 10.0f; } var_fs1 *= 0.5f; Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, D_801783D0, D_801783D4, -200.0f, 1); + Matrix_Translate(gGfxMatrix, D_ctx_801783D0, D_ctx_801783D4, -200.0f, 1); for (i = 4; i < 12; i++) { Matrix_Push(&gGfxMatrix); @@ -3090,7 +3089,7 @@ void func_menu_801903B8(void) { } } -void func_menu_801906A0(void) { +void Title_801906A0(void) { s32 i; switch (D_menu_801B7BD4) { @@ -3119,7 +3118,7 @@ void func_menu_801906A0(void) { } } -void func_menu_80190950(void) { +void Title_80190950(void) { Lights_SetOneLight(&gMasterDisp, D_menu_801B82E0, D_menu_801B82E4, D_menu_801B82E8, 0, 0, 0, gAmbientR, gAmbientG, gAmbientB); RCP_SetupDL(&gMasterDisp, 0x17); @@ -3132,20 +3131,20 @@ void func_menu_80190950(void) { gSPDisplayList(gMasterDisp++, D_TITLE_6018D40); if (D_menu_801B7BE4 != 0) { - func_menu_80190A98(); + Title_80190A98(); } Matrix_Pop(&gGfxMatrix); } -void func_menu_80190A98(void) { +void Title_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_TITLE_602A720); } -void func_menu_80190B30(s32 arg0) { +void Title_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); @@ -3160,7 +3159,7 @@ void func_menu_80190B30(s32 arg0) { Matrix_Pop(&gGfxMatrix); } -void func_menu_80190C9C(void) { +void Title_80190C9C(void) { s32 i; static f32 D_menu_801AE55C = 89.0f; static f32 D_menu_801AE560 = 17.0f; @@ -3190,15 +3189,15 @@ void func_menu_80190C9C(void) { } } -void func_menu_80190E64(void) { +void Title_80190E64(void) { if (D_menu_801B82C4 == 0) { - func_menu_80190FD0(); + Title_80190FD0(); } else { - func_menu_80190EA4(); + Title_80190EA4(); } } -void func_menu_80190EA4(void) { +void Title_80190EA4(void) { switch (D_menu_801B8280) { case 0: if (gControllerPress[gMainController].button & 0xD00F) { // START, A, B, C-left, C-Down, C-Up, C-Right @@ -3214,7 +3213,7 @@ void func_menu_80190EA4(void) { D_menu_801B8284 += 18; } else { Audio_SetAudioSpec(0, 0x17); - D_80178410 = 0; + D_ctx_80178410 = 0; gRadioState = 0; D_menu_801B82C0 = 0; gDrawMode = DRAWMODE_0; @@ -3227,7 +3226,7 @@ void func_menu_80190EA4(void) { } } -void func_menu_80190FD0(void) { +void Title_80190FD0(void) { if (gControllerLock == 0) { switch (D_menu_801B8280) { case 0: @@ -3250,7 +3249,7 @@ void func_menu_80190FD0(void) { D_Timer_8017783C = 2; gOptionMenuStatus = OPTION_WAIT; gDrawMode = DRAWMODE_0; - D_80178410 = 0; + D_ctx_80178410 = 0; D_menu_801B8280 = 0; D_menu_801B8284 = 0; gControllerLock = 3; @@ -3260,7 +3259,7 @@ void func_menu_80190FD0(void) { } } -void func_menu_8019111C(void) { +void Title_8019111C(void) { f32 x; f32 y; @@ -3290,28 +3289,28 @@ void func_menu_8019111C(void) { } } -void func_menu_801912A0(void) { +void Title_801912A0(void) { switch (D_menu_801B869C) { case 0: - D_80178340 -= 4; - if (D_80178340 < 0) { - D_80178340 = 0; + D_ctx_80178340 -= 4; + if (D_ctx_80178340 < 0) { + D_ctx_80178340 = 0; D_menu_801B869C = 255; } break; case 1: - D_80178340 += 15; - if (D_80178340 > 255) { - D_80178340 = 255; + D_ctx_80178340 += 15; + if (D_ctx_80178340 > 255) { + D_ctx_80178340 = 255; D_menu_801B869C = 255; } break; } } -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 Title_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; @@ -3364,8 +3363,8 @@ void func_menu_80191320(s32 arg0, f32* arg1, f32* arg2, f32* arg3, f32* arg4, f3 D_menu_801B82A4 = sp54.z; } -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 Title_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; @@ -3410,7 +3409,7 @@ void func_menu_801914AC(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f32* D_menu_801B82A4 = sp44.z; } -void func_menu_80191674(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f32* arg5) { +void Title_80191674(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f32* arg5) { f32 sp34; f32 sp30; Vec3f sp24; @@ -3420,7 +3419,7 @@ void func_menu_80191674(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f32* sp18.y = 0.0f; sp18.z = arg2; - func_menu_80191798(&sp34, &sp30); + Title_80191798(&sp34, &sp30); Matrix_RotateX(gCalcMatrix, M_DTOR * -sp34, 0); Matrix_RotateY(gCalcMatrix, M_DTOR * -sp30, 1); @@ -3434,7 +3433,7 @@ void func_menu_80191674(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f32* *arg5 = sp24.z; } -void func_menu_80191798(f32* arg0, f32* arg1) { +void Title_80191798(f32* arg0, f32* arg1) { f32 temp_fv1 = gCsCamEyeX - gCsCamAtX; f32 temp_fv2 = gCsCamEyeY - gCsCamAtY; f32 temp_ft4 = gCsCamEyeZ - gCsCamAtZ; @@ -3443,7 +3442,7 @@ void func_menu_80191798(f32* arg0, f32* arg1) { *arg1 = Math_Atan2F(temp_fv1, temp_ft4) * M_RTOD; } -void func_menu_80191844(f32 arg0, f32 arg1) { +void Title_80191844(f32 arg0, f32 arg1) { Vec3f sp24; Vec3f sp18; @@ -3461,7 +3460,7 @@ void func_menu_80191844(f32 arg0, f32 arg1) { D_menu_801B82A4 = sp24.z; } -void func_menu_801918FC(void) { +void Title_801918FC(void) { Matrix_Push(&gGfxMatrix); Matrix_LookAt(gGfxMatrix, gCsCamEyeX, gCsCamEyeY, gCsCamEyeZ, gCsCamAtX, gCsCamAtY, gCsCamAtZ, D_menu_801B829C, D_menu_801B82A0, D_menu_801B82A4, 1); @@ -3469,33 +3468,33 @@ void func_menu_801918FC(void) { Matrix_SetGfxMtx(&gMasterDisp); } -void func_menu_801919C4(u16** arg0, s32 arg1) { - D_80178720 = arg0; - D_80178724 = 0; - D_80178308 = arg0[D_80178724]; - D_80177D68 = arg1; +void Title_801919C4(u16** arg0, s32 arg1) { + D_radio_80178720 = arg0; + D_radio_80178724 = 0; + D_ctx_80178308 = arg0[D_radio_80178724]; + D_ctx_80177D68 = arg1; gRadioState = 100; switch (gGameState) { case GSTATE_TITLE: - D_8017872C = 176; - D_80178728 = 85; - D_80178730 = 80.0f; - D_80178734 = 174.0f; - D_80178738 = 4.63f; - D_8017873C = 32.0f; - D_80178740 = 174.0f; + D_radio_8017872C = 176; + D_radio_80178728 = 85; + D_radio_80178730 = 80.0f; + D_radio_80178734 = 174.0f; + D_radio_80178738 = 4.63f; + D_radio_8017873C = 32.0f; + D_radio_80178740 = 174.0f; break; case GSTATE_PLAY: - D_8017872C = 179; - D_80178728 = 79; - D_80178730 = 74.0f; - D_80178734 = 178.0f; - D_80178738 = 4.53f; - D_8017873C = 26.0f; - D_80178740 = 178.0f; + D_radio_8017872C = 179; + D_radio_80178728 = 79; + D_radio_80178730 = 74.0f; + D_radio_80178734 = 178.0f; + D_radio_80178738 = 4.53f; + D_radio_8017873C = 26.0f; + D_radio_80178740 = 178.0f; } - Audio_PlayVoice(Message_IdFromPtr(D_80178308)); + Audio_PlayVoice(Message_IdFromPtr(D_ctx_80178308)); } diff --git a/src/overlays/ovl_menu/fox_title.h b/src/overlays/ovl_menu/fox_title.h index 81811b4a..a82cc3eb 100644 --- a/src/overlays/ovl_menu/fox_title.h +++ b/src/overlays/ovl_menu/fox_title.h @@ -209,66 +209,66 @@ extern f32 D_menu_801B907C; extern f32 D_menu_801B9080; extern f32 D_menu_801B9084; -void func_menu_8019111C(void); -void func_menu_8018CC30(CameraPoint*, s32, f32); -void func_menu_8018CD9C(CameraPoint *pos, CameraPoint *arg1, f32 weight, 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, +void Title_8019111C(void); +void Title_8018CC30(CameraPoint*, s32, f32); +void Title_8018CD9C(CameraPoint *pos, CameraPoint *arg1, f32 weight, s32 arg3); +void Title_8018D510(s32); +void Title_8018D80C(s32); +void Title_8018DDB8(s32); +void Title_8018DF0C(f32 arg0); +void Title_8018E058(void); +void Title_8018E200(void); +s32 Title_8018EDC8(s32, Gfx **, Vec3f *, Vec3f *, void *); +void Title_8018E67C(s32); +void Title_8018F438(void); +void Title_80190144(void); +void Title_801903B8(void); +void Title_80190950(void); +void Title_80190A98(void); +void Title_80190B30(s32 arg0); +void Title_80190EA4(void); +void Title_80190FD0(void); +void Title_801912A0(void); +void Title_80191320(s32 arg0, f32* arg1, f32* arg2, f32* arg3, f32* arg4, f32* arg5, f32* arg6, f32 arg7, f32 arg8, f32 arg9); -void func_menu_801914AC(f32 arg0, f32 arg1, f32 arg2, f32* arg3, f32* arg4, f32* arg5, f32 arg6, f32* arg7, f32* arg8, +void Title_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_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); -s32 func_menu_80188010(void); -void func_menu_80190C9C(void); -void func_menu_8018D2B8(s32); -void func_menu_8018EA78(s32); -void func_menu_801906A0(void); -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_80190E64(void); -void func_menu_80191674(f32, f32, f32, f32*, f32*, f32*); +void Title_80191798(f32* arg0, f32* arg1); +void Title_80191844(f32 arg0, f32 arg1); +void Title_801918FC(void); +void Title_801919C4(u16** arg0, s32 arg1); +s32 Title_80188010(void); +void Title_80190C9C(void); +void Title_8018D2B8(s32); +void Title_8018EA78(s32); +void Title_801906A0(void); +void Title_801877F0(void); + s32 Title_80187ABC(void); +void Title_80187B00(void); +void Title_80187E28(void); +void Title_801888E8(void); +void Title_8018994C(void); +void Title_8018A644(void); +void Title_8018ACEC(void); +void Title_8018B5C4(void); +void Title_8018C644(void); +void Title_80187CA8(void); +s32 Title_80188010(void); +void Title_80189208(void); +void Title_8018A2F8(void); +void Title_8018A990(void); +void Title_8018B038(void); +void Title_8018C114(void); +void Title_8018CB90(void); +void Title_8018F680(void); +void Title_8018F77C(void); +void Title_8018F85C(void); +void Title_8018F8E4(void); +void Title_8018FC14(void); +void Title_8018FD08(void); +void Title_8018FF74(void); +void Title_80190E64(void); +void Title_80191674(f32, f32, f32, f32*, f32*, f32*); #endif diff --git a/src/overlays/ovl_unused/fox_unused.c b/src/overlays/ovl_unused/fox_unused.c index 781193f2..8b64d56b 100644 --- a/src/overlays/ovl_unused/fox_unused.c +++ b/src/overlays/ovl_unused/fox_unused.c @@ -10,5 +10,5 @@ f32* D_unused_80187530[] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, }; -void func_unused_80187520(void) { +void Unused_80187520(void) { } diff --git a/yamls/us/overlays.yaml b/yamls/us/overlays.yaml index ccb4f769..a82a57be 100644 --- a/yamls/us/overlays.yaml +++ b/yamls/us/overlays.yaml @@ -150,17 +150,17 @@ - [0xE9F1E0, c, fox_andross] - [0xEADEC0, c, fox_ve2] - [0xEAF7E0, c, fox_sy] - - [0xEBD210, c, fox_i6_4] + - [0xEBD210, c, fox_turret] - [0xEBE400, .data, fox_i6] - [0xEBE410, .data, fox_andross] - [0xEBE560, .data, fox_ve2] - [0xEBE5C0, .data, fox_sy] - - [0xEBE830, .data, fox_i6_4] + - [0xEBE830, .data, fox_turret] - [0xEBE840, .rodata, fox_i6] - [0xEBE850, .rodata, fox_andross] - [0xEBF0F0, .rodata, fox_ve2] - [0xEBF130, .rodata, fox_sy] - - [0xEBFB80, .rodata, fox_i6_4] + - [0xEBFB80, .rodata, fox_turret] - { start: 0xEBFBE0, type: .bss, vram: 0x801A7F30, name: fox_i6 } - { type: .bss, vram: 0x801A7F40, name: fox_andross } - { type: .bss, vram: 0x801A8440, name: fox_sy }