From 14a59c10ab60a306ac1c402e224c5327d5eb3eb5 Mon Sep 17 00:00:00 2001 From: Robin Avery Date: Sun, 30 Aug 2026 08:21:53 -0400 Subject: [PATCH] Clean up naming of scenes and modes --- .clang-format | 1 + config/GALE01/splits.txt | 4 +- config/GALE01/symbols.txt | 396 ++++++++++++------------ configure.py | 20 +- src/MSL/printf.c | 3 +- src/melee/gm/forward.h | 8 +- src/melee/gm/gm_16AE.c | 14 +- src/melee/gm/gm_16AE.h | 12 +- src/melee/gm/gm_16F1.h | 2 +- src/melee/gm/gm_1736.c | 2 +- src/melee/gm/gm_1832.c | 14 +- src/melee/gm/gm_1832.h | 14 +- src/melee/gm/gm_19EF.c | 8 +- src/melee/gm/gm_19EF.h | 8 +- src/melee/gm/gm_1A33.c | 6 +- src/melee/gm/gm_1A33.h | 6 +- src/melee/gm/gm_1A36.c | 2 +- src/melee/gm/gm_1A3F.c | 257 ++++++++-------- src/melee/gm/gm_1A3F.dox | 24 +- src/melee/gm/gm_1A3F.h | 10 +- src/melee/gm/gm_1A45.c | 17 +- src/melee/gm/gm_1A45.dox | 10 +- src/melee/gm/gm_1A45.h | 4 +- src/melee/gm/gm_1A7A.h | 4 +- src/melee/gm/gm_1A9B.c | 6 +- src/melee/gm/gm_1AED.c | 6 +- src/melee/gm/gm_1AED.h | 6 +- src/melee/gm/gm_1BFA.c | 12 +- src/melee/gm/gm_1BFA.h | 10 +- src/melee/gm/gmadventure.c | 104 +++---- src/melee/gm/gmadventure.h | 62 ++-- src/melee/gm/gmallstar.c | 56 ++-- src/melee/gm/gmallstar.h | 22 +- src/melee/gm/gmapproach.c | 14 +- src/melee/gm/gmapproach.h | 6 +- src/melee/gm/gmboot.c | 16 +- src/melee/gm/gmcameramode.c | 40 +-- src/melee/gm/gmcameramode.h | 4 +- src/melee/gm/gmclassic.c | 46 +-- src/melee/gm/gmclassic.h | 20 +- src/melee/gm/gmdebugmode.c | 70 ++--- src/melee/gm/gmdebugmode.h | 2 +- src/melee/gm/gmevent.c | 28 +- src/melee/gm/gmevent.dox | 2 +- src/melee/gm/gmevent.h | 6 +- src/melee/gm/gmfixedcamera.c | 26 +- src/melee/gm/gmfixedcamera.h | 24 +- src/melee/gm/gmgiant.c | 26 +- src/melee/gm/gmgiant.h | 24 +- src/melee/gm/gmgover.c | 14 +- src/melee/gm/gmhanyucss.c | 10 +- src/melee/gm/gmhanyucss.h | 2 +- src/melee/gm/gmhanyusss.c | 6 +- src/melee/gm/gmhanyusss.h | 2 +- src/melee/gm/gmhomerun.c | 14 +- src/melee/gm/gmhomerun.h | 12 +- src/melee/gm/gmhowto.c | 4 +- src/melee/gm/gmhowto.h | 4 +- src/melee/gm/gminvisible.c | 26 +- src/melee/gm/gminvisible.h | 24 +- src/melee/gm/gmlightning.c | 26 +- src/melee/gm/gmlightning.h | 24 +- src/melee/gm/gmmenu.c | 8 +- src/melee/gm/gmmenu.h | 8 +- src/melee/gm/gmmenumode.c | 22 +- src/melee/gm/gmmenumode.h | 4 +- src/melee/gm/gmmovieend.c | 10 +- src/melee/gm/gmmovieend.h | 10 +- src/melee/gm/gmmultiman.c | 82 ++--- src/melee/gm/gmmultiman.h | 64 ++-- src/melee/gm/gmomake15.c | 4 +- src/melee/gm/gmomake15.h | 4 +- src/melee/gm/gmopening.c | 4 +- src/melee/gm/gmopening.h | 4 +- src/melee/gm/gmopeningmode.c | 38 +-- src/melee/gm/gmprogressive.c | 6 +- src/melee/gm/gmprogressive.h | 6 +- src/melee/gm/gmprogressivemode.c | 10 +- src/melee/gm/gmprogressivemode.h | 2 +- src/melee/gm/gmregclear.c | 6 +- src/melee/gm/gmregclear.h | 2 +- src/melee/gm/gmregtyfall.c | 4 +- src/melee/gm/gmregtyfall.h | 4 +- src/melee/gm/gmresult.c | 4 +- src/melee/gm/gmresult.h | 4 +- src/melee/gm/gmscdata.c | 506 +++++++++++++++---------------- src/melee/gm/gmscdata.h | 56 ++-- src/melee/gm/gmsinglebutton.c | 30 +- src/melee/gm/gmsinglebutton.h | 24 +- src/melee/gm/gmslomo.c | 26 +- src/melee/gm/gmslomo.h | 24 +- src/melee/gm/gmstaffroll.c | 6 +- src/melee/gm/gmstaffroll.h | 6 +- src/melee/gm/gmstamina.c | 18 +- src/melee/gm/gmstamina.h | 16 +- src/melee/gm/gmsupersudden.c | 26 +- src/melee/gm/gmsupersudden.h | 24 +- src/melee/gm/gmtiny.c | 26 +- src/melee/gm/gmtiny.h | 24 +- src/melee/gm/gmtitle.c | 4 +- src/melee/gm/gmtitle.h | 4 +- src/melee/gm/gmtitlemode.c | 8 +- src/melee/gm/gmtitlemode.h | 4 +- src/melee/gm/gmtou_0.c | 6 +- src/melee/gm/gmtou_1.c | 8 +- src/melee/gm/gmtou_2.c | 6 +- src/melee/gm/gmtoulib.h | 18 +- src/melee/gm/gmtoumode.c | 38 +-- src/melee/gm/gmtoumode.h | 2 +- src/melee/gm/gmtoycollection.c | 6 +- src/melee/gm/gmtoycollection.h | 2 +- src/melee/gm/gmtoygallery.c | 12 +- src/melee/gm/gmtoygallery.h | 2 +- src/melee/gm/gmtoylottery.c | 18 +- src/melee/gm/gmtoylottery.h | 2 +- src/melee/gm/gmtrainingmode.c | 32 +- src/melee/gm/gmtrainingmode.h | 6 +- src/melee/gm/gmvsmelee.c | 29 +- src/melee/gm/gmvsmelee.h | 29 +- src/melee/gm/gmvsmode.c | 50 +-- src/melee/gm/gmvsmode.h | 4 +- src/melee/gm/types.dox | 27 +- src/melee/gm/types.h | 62 ++-- src/melee/if/ifprize.c | 6 +- src/melee/if/ifprize.h | 4 +- src/melee/if/soundtest.c | 2 +- src/melee/it/items/ityaku.c | 3 +- src/melee/lb/forward.h | 2 +- src/melee/lb/lb_0195.c | 3 +- src/melee/lb/lbcardnew.c | 4 +- src/melee/lb/lbdvd.c | 8 +- src/melee/lb/lbdvd.h | 2 +- src/melee/lb/lbdvd.static.h | 2 +- src/melee/lb/types.h | 16 +- src/melee/mn/mncharsel.c | 6 +- src/melee/mn/mncharsel.h | 6 +- src/melee/mn/mnmain.c | 6 +- src/melee/mn/mnmain.h | 4 +- src/melee/mn/mnstagesel.c | 10 +- src/melee/mn/mnstagesel.h | 6 +- src/melee/ty/toy.c | 6 +- src/melee/ty/toy.h | 6 +- src/melee/ty/tydisplay.c | 4 +- src/melee/ty/tydisplay.h | 4 +- src/melee/ty/tyfigupon.c | 4 +- src/melee/ty/tyfigupon.h | 4 +- src/melee/vi/vi0102.c | 4 +- src/melee/vi/vi0102.h | 4 +- src/melee/vi/vi0401.c | 4 +- src/melee/vi/vi0401.h | 4 +- src/melee/vi/vi0402.c | 4 +- src/melee/vi/vi0402.h | 4 +- src/melee/vi/vi0501.c | 4 +- src/melee/vi/vi0501.h | 4 +- src/melee/vi/vi0502.c | 15 +- src/melee/vi/vi0502.h | 5 +- src/melee/vi/vi0601.c | 15 +- src/melee/vi/vi0601.h | 5 +- src/melee/vi/vi0801.c | 4 +- src/melee/vi/vi0801.h | 4 +- src/melee/vi/vi1101.c | 4 +- src/melee/vi/vi1101.h | 4 +- src/melee/vi/vi1201v1.c | 4 +- src/melee/vi/vi1201v1.h | 4 +- src/melee/vi/vi1201v2.c | 4 +- src/melee/vi/vi1201v2.h | 4 +- src/melee/vi/vi1202.c | 4 +- src/melee/vi/vi1202.h | 4 +- 168 files changed, 1695 insertions(+), 1688 deletions(-) diff --git a/.clang-format b/.clang-format index ca729f256e..6b3364c29f 100644 --- a/.clang-format +++ b/.clang-format @@ -10,6 +10,7 @@ BraceWrapping: AfterControlStatement: MultiLine InsertBraces: true AllowShortFunctionsOnASingleLine: Empty +AllowShortLoopsOnASingleLine: true AllowShortIfStatementsOnASingleLine: Never AllowShortEnumsOnASingleLine: false IndentCaseLabels: false diff --git a/config/GALE01/splits.txt b/config/GALE01/splits.txt index 307a74d8a8..832312d77a 100644 --- a/config/GALE01/splits.txt +++ b/config/GALE01/splits.txt @@ -4705,14 +4705,14 @@ melee/vi/vi0501.c: .sdata2 start:0x804DE060 end:0x804DE090 melee/vi/vi0502.c: - .text start:0x8031E110 end:0x8031E6CC + .text start:0x8031E110 end:0x8031E6EC .data start:0x804000D0 end:0x80400108 .sdata start:0x804D5AE8 end:0x804D5AF8 .sbss start:0x804D6F90 end:0x804D6FB0 .sdata2 start:0x804DE090 end:0x804DE0A8 melee/vi/vi0601.c: - .text start:0x8031E6CC end:0x8031ED70 + .text start:0x8031E6EC end:0x8031ED70 .data start:0x80400108 end:0x80400128 .sdata start:0x804D5AF8 end:0x804D5B08 .sbss start:0x804D6FB0 end:0x804D6FB8 diff --git a/config/GALE01/symbols.txt b/config/GALE01/symbols.txt index 75693a3779..dd83562812 100644 --- a/config/GALE01/symbols.txt +++ b/config/GALE01/symbols.txt @@ -8659,10 +8659,10 @@ gm_DoUnpauseChecksAndRoutine = .text:0x8016CBE8; // type:function size:0x1B0 fn_8016CD98 = .text:0x8016CD98; // type:function size:0x1B4 fn_8016CF4C = .text:0x8016CF4C; // type:function size:0x94 fn_8016CFE0 = .text:0x8016CFE0; // type:function size:0x34C -gm_8016D32C_OnFrame = .text:0x8016D32C; // type:function size:0x20C scope:global +gm_Scene_Training_OnFrame = .text:0x8016D32C; // type:function size:0x20C scope:global fn_8016D538 = .text:0x8016D538; // type:function size:0xFC fn_8016D634 = .text:0x8016D634; // type:function size:0x1CC -gm_8016D800 = .text:0x8016D800; // type:function size:0xAC scope:global +gm_Scene_Vs_OnFrame = .text:0x8016D800; // type:function size:0xAC scope:global fn_8016D8AC = .text:0x8016D8AC; // type:function size:0x414 fn_8016DCC0 = .text:0x8016DCC0; // type:function size:0x22C fn_8016DEEC = .text:0x8016DEEC; // type:function size:0x238 @@ -8670,10 +8670,10 @@ fn_8016E124 = .text:0x8016E124; // type:function size:0x198 fn_8016E2BC = .text:0x8016E2BC; // type:function size:0x304 fn_8016E5C0 = .text:0x8016E5C0; // type:function size:0x170 fn_8016E730 = .text:0x8016E730; // type:function size:0x204 -gm_8016E934_OnEnter = .text:0x8016E934; // type:function size:0x94 scope:global -gm_8016E9C8 = .text:0x8016E9C8; // type:function size:0x1F8 scope:global -gm_8016EBC0_OnEnter = .text:0x8016EBC0; // type:function size:0x68 scope:global -gm_8016EC28_OnEnter = .text:0x8016EC28; // type:function size:0xC0 scope:global +gm_Scene_Vs_OnEnter = .text:0x8016E934; // type:function size:0x94 scope:global +gm_Scene_Vs_OnExit = .text:0x8016E9C8; // type:function size:0x1F8 scope:global +gm_Scene_SuddenDeath_OnEnter = .text:0x8016EBC0; // type:function size:0x68 scope:global +gm_Scene_Training_OnEnter = .text:0x8016EC28; // type:function size:0xC0 scope:global gm_8016ECE8 = .text:0x8016ECE8; // type:function size:0xF4 scope:global gm_8016EDDC = .text:0x8016EDDC; // type:function size:0x1BC scope:global fn_8016EF98 = .text:0x8016EF98; // type:function size:0x74 @@ -8768,7 +8768,7 @@ gm_GetChallengerData = .text:0x801736DC; // type:function size:0xC scope:global gm_801736E8 = .text:0x801736E8; // type:function size:0x6C scope:global gm_80173754 = .text:0x80173754; // type:function size:0x84 scope:global gm_801737D8 = .text:0x801737D8; // type:function size:0x10 scope:global -gm_801737E8_OnLoad = .text:0x801737E8; // type:function size:0x4C scope:global +gm_Mode_ChallengerApproach_OnLoad = .text:0x801737E8; // type:function size:0x4C scope:global fn_80173834 = .text:0x80173834; // type:function size:0xD8 gm_8017390C = .text:0x8017390C; // type:function size:0x198 scope:global gm_80173AA4 = .text:0x80173AA4; // type:function size:0x8C scope:global @@ -8812,8 +8812,8 @@ fn_80176D18 = .text:0x80176D18; // type:function size:0x24 fn_80176D3C = .text:0x80176D3C; // type:function size:0x224 fn_80176F60 = .text:0x80176F60; // type:function size:0x260 fn_801771C0 = .text:0x801771C0; // type:function size:0x1A8 -gm_80177368_OnEnter = .text:0x80177368; // type:function size:0x39C scope:global -gm_80177704_OnLeave = .text:0x80177704; // type:function size:0x20 scope:global +gm_Scene_Results_OnEnter = .text:0x80177368; // type:function size:0x39C scope:global +gm_Scene_Results_OnExit = .text:0x80177704; // type:function size:0x20 scope:global gm_80177724 = .text:0x80177724; // type:function size:0x24 scope:global fn_80177748 = .text:0x80177748; // type:function size:0x1D8 fn_80177920 = .text:0x80177920; // type:function size:0x25C @@ -9021,23 +9021,23 @@ fn_80186080 = .text:0x80186080; // type:function size:0x138 fn_801861B8 = .text:0x801861B8; // type:function size:0x248 fn_80186400 = .text:0x80186400; // type:function size:0x234 fn_80186634 = .text:0x80186634; // type:function size:0x7C8 -gm_80186DFC_OnFrame = .text:0x80186DFC; // type:function size:0x34 scope:global -gm_80186E30_OnEnter = .text:0x80186E30; // type:function size:0xCC scope:global +gm_Scene_IntroEasy_OnFrame = .text:0x80186DFC; // type:function size:0x34 scope:global +gm_Scene_IntroEasy_OnEnter = .text:0x80186E30; // type:function size:0xCC scope:global fn_80186EFC = .text:0x80186EFC; // type:function size:0x70 fn_80186F6C = .text:0x80186F6C; // type:function size:0x484 fn_801873F0 = .text:0x801873F0; // type:function size:0xA4 fn_80187494 = .text:0x80187494; // type:function size:0x68 fn_801874FC = .text:0x801874FC; // type:function size:0x218 fn_80187714 = .text:0x80187714; // type:function size:0x58 -gm_8018776C_OnFrame = .text:0x8018776C; // type:function size:0x3C scope:global -gm_801877A8_OnEnter = .text:0x801877A8; // type:function size:0x168 scope:global +gm_Scene_IntroAllstar_OnFrame = .text:0x8018776C; // type:function size:0x3C scope:global +gm_Scene_IntroAllstar_OnEnter = .text:0x801877A8; // type:function size:0x168 scope:global fn_80187910 = .text:0x80187910; // type:function size:0x1A4 fn_80187AB4 = .text:0x80187AB4; // type:function size:0x1E8 fn_80187C9C = .text:0x80187C9C; // type:function size:0x58 fn_80187CF4 = .text:0x80187CF4; // type:function size:0x254 -gm_80187F48_OnEnter = .text:0x80187F48; // type:function size:0x41C scope:global -gm_80188364_OnLeave = .text:0x80188364; // type:function size:0x28 scope:global -gm_8018838C_OnFrame = .text:0x8018838C; // type:function size:0x34 scope:global +gm_Scene_IntroNormal_OnEnter = .text:0x80187F48; // type:function size:0x41C scope:global +gm_Scene_IntroNormal_OnLeave = .text:0x80188364; // type:function size:0x28 scope:global +gm_Scene_IntroNormal_OnFrame = .text:0x8018838C; // type:function size:0x34 scope:global gm_801883C0 = .text:0x801883C0; // type:function size:0x5C scope:global gm_8018841C = .text:0x8018841C; // type:function size:0x38 scope:global gm_80188454 = .text:0x80188454; // type:function size:0x18 scope:global @@ -9150,9 +9150,9 @@ fn_801953C8 = .text:0x801953C8; // type:function size:0x728 fn_80195AF0 = .text:0x80195AF0; // type:function size:0x1DC fn_80195CCC = .text:0x80195CCC; // type:function size:0x440 fn_8019610C = .text:0x8019610C; // type:function size:0x180 -gm_8019628C_OnFrame = .text:0x8019628C; // type:function size:0x128 scope:global -gm_801963B4_OnEnter = .text:0x801963B4; // type:function size:0xF0 scope:global -gm_801964A4_OnLeave = .text:0x801964A4; // type:function size:0x6C scope:global +gm_Scene_TouSetup_OnFrame = .text:0x8019628C; // type:function size:0x128 scope:global +gm_Scene_TouSetup_OnEnter = .text:0x801963B4; // type:function size:0xF0 scope:global +gm_Scene_TouSetup_OnExit = .text:0x801964A4; // type:function size:0x6C scope:global fn_80196510 = .text:0x80196510; // type:function size:0x4C fn_8019655C = .text:0x8019655C; // type:function size:0x8 fn_80196564 = .text:0x80196564; // type:function size:0x30 @@ -9188,12 +9188,12 @@ fn_8019A71C = .text:0x8019A71C; // type:function size:0x10C gm_8019A828 = .text:0x8019A828; // type:function size:0x44 scope:global fn_8019A86C = .text:0x8019A86C; // type:function size:0x6E4 fn_8019AF50 = .text:0x8019AF50; // type:function size:0x38C -gm_8019B2DC_OnFrame = .text:0x8019B2DC; // type:function size:0x17C scope:global +gm_Scene_TouBracket_OnFrame = .text:0x8019B2DC; // type:function size:0x17C scope:global fn_8019B458 = .text:0x8019B458; // type:function size:0x3C4 fn_8019B81C = .text:0x8019B81C; // type:function size:0x44 fn_8019B860 = .text:0x8019B860; // type:function size:0x64 -gm_8019B8C4_OnEnter = .text:0x8019B8C4; // type:function size:0x104 scope:global -gm_8019B9C8_OnLeave = .text:0x8019B9C8; // type:function size:0x3C scope:global +gm_Scene_TouBracket_OnEnter = .text:0x8019B8C4; // type:function size:0x104 scope:global +gm_Scene_TouBracket_OnExit = .text:0x8019B9C8; // type:function size:0x3C scope:global fn_8019BA04 = .text:0x8019BA04; // type:function size:0x4 fn_8019BA08 = .text:0x8019BA08; // type:function size:0x510 fn_8019BF18 = .text:0x8019BF18; // type:function size:0x74 @@ -9211,10 +9211,10 @@ fn_8019CFA4 = .text:0x8019CFA4; // type:function size:0xD0 fn_8019D074 = .text:0x8019D074; // type:function size:0x148 fn_8019D1BC = .text:0x8019D1BC; // type:function size:0xBA4 fn_8019DD60 = .text:0x8019DD60; // type:function size:0x22C -gm_8019DF8C_OnFrame = .text:0x8019DF8C; // type:function size:0x6A8 scope:global +gm_Scene_TouAlt_OnFrame = .text:0x8019DF8C; // type:function size:0x6A8 scope:global gm_8019E634 = .text:0x8019E634; // type:function size:0x678 scope:global -gm_8019ECAC_OnEnter = .text:0x8019ECAC; // type:function size:0x1A8 scope:global -gm_8019EE54_OnLeave = .text:0x8019EE54; // type:function size:0x2C scope:global +gm_Scene_TouAlt_OnEnter = .text:0x8019ECAC; // type:function size:0x1A8 scope:global +gm_Scene_TouAlt_OnExit = .text:0x8019EE54; // type:function size:0x2C scope:global fn_8019EE80 = .text:0x8019EE80; // type:function size:0x88 fn_8019EF08 = .text:0x8019EF08; // type:function size:0xBC fn_8019EFC4 = .text:0x8019EFC4; // type:function size:0x20C @@ -9223,11 +9223,11 @@ fn_8019F2D4 = .text:0x8019F2D4; // type:function size:0x418 fn_8019F6EC = .text:0x8019F6EC; // type:function size:0x124 fn_8019F810 = .text:0x8019F810; // type:function size:0x1B4 fn_8019F9C4 = .text:0x8019F9C4; // type:function size:0x104C -gm_801A0A10_OnEnter = .text:0x801A0A10; // type:function size:0x108 scope:global -gm_801A0B18_OnLeave = .text:0x801A0B18; // type:function size:0x48 scope:global +gm_Scene_GOver_OnEnter = .text:0x801A0A10; // type:function size:0x108 scope:global +gm_Scene_GOver_OnExit = .text:0x801A0B18; // type:function size:0x48 scope:global fn_801A0B60 = .text:0x801A0B60; // type:function size:0x10C -gm_801A0C6C_OnEnter = .text:0x801A0C6C; // type:function size:0x1A0 scope:global -gm_801A0E0C_OnLeave = .text:0x801A0E0C; // type:function size:0x28 scope:global +gm_Scene_ComingSoon_OnEnter = .text:0x801A0C6C; // type:function size:0x1A0 scope:global +gm_Scene_ComingSoon_OnExit = .text:0x801A0E0C; // type:function size:0x28 scope:global fn_801A0E34 = .text:0x801A0E34; // type:function size:0x1B8 gm_801A0FEC = .text:0x801A0FEC; // type:function size:0x110 scope:global gm_801A10FC = .text:0x801A10FC; // type:function size:0x38 scope:global @@ -9245,9 +9245,9 @@ gmTitle_801A19AC = .text:0x801A19AC; // type:function size:0x6C scope:global gmTitle_801A1A18 = .text:0x801A1A18; // type:function size:0x24 gmTitle_801A1A3C = .text:0x801A1A3C; // type:function size:0x84 scope:global gmTitle_801A1AC0 = .text:0x801A1AC0; // type:function size:0x158 scope:global -gmTitle_OnFrame = .text:0x801A1C18; // type:function size:0x120 scope:global +gm_Scene_Title_OnFrame = .text:0x801A1C18; // type:function size:0x120 scope:global gmTitle_801A1D38 = .text:0x801A1D38; // type:function size:0xE8 scope:global -gmTitle_OnEnter = .text:0x801A1E20; // type:function size:0x404 scope:global +gm_Scene_Title_OnEnter = .text:0x801A1E20; // type:function size:0x404 scope:global gmCamera_801A2224 = .text:0x801A2224; // type:function size:0x110 scope:global gmCamera_801A2334 = .text:0x801A2334; // type:function size:0x208 scope:global gmCamera_801A253C = .text:0x801A253C; // type:function size:0x8C scope:global @@ -9271,9 +9271,9 @@ gmCamera_801A30E4 = .text:0x801A30E4; // type:function size:0xF4 scope:global fn_801A31D8 = .text:0x801A31D8; // type:function size:0x24 gmCamera_801A31FC = .text:0x801A31FC; // type:function size:0x1C0 scope:global gmCamera_801A33BC = .text:0x801A33BC; // type:function size:0x140 scope:global -gmCamera_801A34FC_OnFrame = .text:0x801A34FC; // type:function size:0x138 scope:global -gmCamera_801A3634_OnEnter = .text:0x801A3634; // type:function size:0x48 scope:global -gmCamera_801A367C_OnLeave = .text:0x801A367C; // type:function size:0x4 scope:global +gm_Scene_CameraVs_OnFrame = .text:0x801A34FC; // type:function size:0x138 scope:global +gm_Scene_CameraVs_OnEnter = .text:0x801A3634; // type:function size:0x48 scope:global +gm_Scene_CameraVs_OnExit = .text:0x801A367C; // type:function size:0x4 scope:global gm_GetButtonsPressed = .text:0x801A3680; // type:function size:0x20 scope:global gm_GetButtonsTriggered = .text:0x801A36A0; // type:function size:0x20 scope:global gm_801A36C0 = .text:0x801A36C0; // type:function size:0x20 scope:global @@ -9284,7 +9284,7 @@ fn_801A396C = .text:0x801A396C; // type:function size:0x108 gm_EvaluateAllControllerInputs = .text:0x801A3A74; // type:function size:0x414 scope:global gm_801A3E88 = .text:0x801A3E88; // type:function size:0x6C scope:global gm_801A3EF4 = .text:0x801A3EF4; // type:function size:0x54 scope:global -gm_801A3F48 = .text:0x801A3F48; // type:function size:0xCC scope:global +preloadState = .text:0x801A3F48; // type:function size:0xCC scope:local gm_801A4014 = .text:0x801A4014; // type:function size:0x268 scope:global gm_GetGameSceneLoadData = .text:0x801A427C; // type:function size:0x8 scope:global gm_GetGameSceneLeaveData = .text:0x801A4284; // type:function size:0x8 scope:global @@ -9299,7 +9299,7 @@ gm_GetCurrentGameMode = .text:0x801A4310; // type:function size:0x10 scope:globa gm_GetPreviousGameMode = .text:0x801A4320; // type:function size:0x10 scope:global gm_SetGameModeOverride = .text:0x801A4330; // type:function size:0x10 scope:global gm_Is1PMode = .text:0x801A4340; // type:function size:0x60 scope:global -gm_RunGameMode = .text:0x801A43A0; // type:function size:0x170 scope:global +runGameMode = .text:0x801A43A0; // type:function size:0x170 scope:local gm_801A4510 = .text:0x801A4510; // type:function size:0xD8 scope:global gm_801A45E8 = .text:0x801A45E8; // type:function size:0x3C scope:global gm_801A4624 = .text:0x801A4624; // type:function size:0x10 scope:global @@ -9326,21 +9326,21 @@ fn_801A4BD0 = .text:0x801A4BD0; // type:function size:0x4 gm_801A4BD4 = .text:0x801A4BD4; // type:function size:0x10C scope:global gm_FindGameSceneHandler = .text:0x801A4CE0; // type:function size:0x54 scope:global gm_801A4D34 = .text:0x801A4D34; // type:function size:0x36C scope:global -gm_GetAllGameSceneHandlers = .text:0x801A50A0; // type:function size:0xC scope:global +gm_GetAllGameScenes = .text:0x801A50A0; // type:function size:0xC scope:global gm_GetAllGameModes = .text:0x801A50AC; // type:function size:0xC scope:global -gm_801A50B8_OnLoad = .text:0x801A50B8; // type:function size:0x78 scope:global -gm_801A5130_OnLoad = .text:0x801A5130; // type:function size:0x78 scope:global -gm_801A51A8_OnLoad = .text:0x801A51A8; // type:function size:0x78 scope:global -gm_801A5220_OnLoad = .text:0x801A5220; // type:function size:0x24 scope:global +gm_Mode_ClassicGOver_OnLoad = .text:0x801A50B8; // type:function size:0x78 scope:global +gm_Mode_AdventureGOver_OnLoad = .text:0x801A5130; // type:function size:0x78 scope:global +gm_Mode_AllstarGOver_OnLoad = .text:0x801A51A8; // type:function size:0x78 scope:global +gm_Mode_Opening_OnLoad = .text:0x801A5220; // type:function size:0x24 scope:global gm_801A5244 = .text:0x801A5244; // type:function size:0xC scope:global gm_801A5250 = .text:0x801A5250; // type:function size:0x8 scope:global gm_801A5258 = .text:0x801A5258; // type:function size:0x78 scope:global gm_801A52D0 = .text:0x801A52D0; // type:function size:0x90 scope:global gm_801A5360 = .text:0x801A5360; // type:function size:0x238 scope:global -gm_801A5598_OnInit = .text:0x801A5598; // type:function size:0x2C scope:global +gm_Mode_Vs_OnInit = .text:0x801A5598; // type:function size:0x2C scope:global gm_801A55C4 = .text:0x801A55C4; // type:function size:0x28 scope:global -gm_801A55EC_OnLoad = .text:0x801A55EC; // type:function size:0x28 scope:global -gm_801A5614_OnUnload = .text:0x801A5614; // type:function size:0x4 scope:global +gm_Mode_Vs_OnLoad = .text:0x801A55EC; // type:function size:0x28 scope:global +gm_Mode_Vs_OnUnload = .text:0x801A5614; // type:function size:0x4 scope:global gm_801A5618 = .text:0x801A5618; // type:function size:0x68 scope:global gm_801A5680 = .text:0x801A5680; // type:function size:0xD4 scope:global gm_801A5754 = .text:0x801A5754; // type:function size:0x54 scope:global @@ -9353,9 +9353,9 @@ gm_801A5F00 = .text:0x801A5F00; // type:function size:0x64 scope:global gm_801A5F64 = .text:0x801A5F64; // type:function size:0x2F0 scope:global gm_801A6254 = .text:0x801A6254; // type:function size:0xB4 scope:global gm_801A6308 = .text:0x801A6308; // type:function size:0x24 scope:global -gm_801A632C_OnEnter = .text:0x801A632C; // type:function size:0x50 scope:global -gm_801A637C_OnEnter = .text:0x801A637C; // type:function size:0x12C scope:global -gm_801A64A8_OnFrame = .text:0x801A64A8; // type:function size:0xF4 scope:global +gm_Scene_DebugMenu_OnEnter = .text:0x801A632C; // type:function size:0x50 scope:global +gm_Scene_MovieEnd_OnEnter = .text:0x801A637C; // type:function size:0x12C scope:global +gm_Scene_MovieEnd_OnFrame = .text:0x801A64A8; // type:function size:0xF4 scope:global gm_801A659C = .text:0x801A659C; // type:function size:0x94 scope:global gm_801A6630 = .text:0x801A6630; // type:function size:0x34 scope:global fn_801A6664 = .text:0x801A6664; // type:function size:0x1E0 @@ -9370,8 +9370,8 @@ gm_801A6C54 = .text:0x801A6C54; // type:function size:0x124 scope:global fn_801A6D78 = .text:0x801A6D78; // type:function size:0x48 gm_801A6DC0 = .text:0x801A6DC0; // type:function size:0x124 scope:global gm_801A6EE4 = .text:0x801A6EE4; // type:function size:0x18C scope:global -gm_801A7070_OnEnter = .text:0x801A7070; // type:function size:0x964 scope:global -gm_801A79D4_OnFrame = .text:0x801A79D4; // type:function size:0x70 scope:global +gm_Scene_ToyFall_OnEnter = .text:0x801A7070; // type:function size:0x964 scope:global +gm_Scene_ToyFall_OnFrame = .text:0x801A79D4; // type:function size:0x70 scope:global fn_801A7A44 = .text:0x801A7A44; // type:function size:0x24 fn_801A7A68 = .text:0x801A7A68; // type:function size:0x24 fn_801A7A8C = .text:0x801A7A8C; // type:function size:0x74 @@ -9387,20 +9387,20 @@ gm_801A9094 = .text:0x801A9094; // type:function size:0x404 scope:global fn_801A9498 = .text:0x801A9498; // type:function size:0x24 fn_801A94BC = .text:0x801A94BC; // type:function size:0x174 gm_801A9630 = .text:0x801A9630; // type:function size:0x500 scope:global -gm_801A9B30_OnEnter = .text:0x801A9B30; // type:function size:0x1DC scope:global -gm_801A9D0C_OnFrame = .text:0x801A9D0C; // type:function size:0xC4 scope:global +gm_Scene_Congrats_OnEnter = .text:0x801A9B30; // type:function size:0x1DC scope:global +gm_Scene_Congrats_OnFrame = .text:0x801A9D0C; // type:function size:0xC4 scope:global gm_801A9DD0 = .text:0x801A9DD0; // type:function size:0x1FC scope:global fn_801A9FCC = .text:0x801A9FCC; // type:function size:0x11C fn_801AA0E8 = .text:0x801AA0E8; // type:function size:0x28 -gm_801AA110_OnEnter = .text:0x801AA110; // type:function size:0x17C scope:global -gm_801AA28C_OnFrame = .text:0x801AA28C; // type:function size:0x3B8 scope:global +gm_Scene_Opening_OnEnter = .text:0x801AA110; // type:function size:0x17C scope:global +gm_Scene_Opening_OnFrame = .text:0x801AA28C; // type:function size:0x3B8 scope:global gm_801AA644 = .text:0x801AA644; // type:function size:0x20 scope:global gm_801AA664 = .text:0x801AA664; // type:function size:0x24 scope:global gm_801AA688 = .text:0x801AA688; // type:function size:0x50 scope:global gm_801AA6D8 = .text:0x801AA6D8; // type:function size:0x24 scope:global gm_801AA6FC = .text:0x801AA6FC; // type:function size:0x78 scope:global gm_801AA774 = .text:0x801AA774; // type:function size:0x50 scope:global -gm_801AA7C4_OnFrame = .text:0x801AA7C4; // type:function size:0x34 scope:global +gm_Scene_StaffRoll_OnFrame = .text:0x801AA7C4; // type:function size:0x34 scope:global fn_801AA7F8 = .text:0x801AA7F8; // type:function size:0x5C fn_801AA854 = .text:0x801AA854; // type:function size:0x1D4 fn_801AAA28 = .text:0x801AAA28; // type:function size:0x94 @@ -9409,23 +9409,23 @@ fn_801AAB18 = .text:0x801AAB18; // type:function size:0x5C fn_801AAB74 = .text:0x801AAB74; // type:function size:0x68C fn_801AB200 = .text:0x801AB200; // type:function size:0x147C fn_801AC67C = .text:0x801AC67C; // type:function size:0x5C -gm_801AC6D8_OnEnter = .text:0x801AC6D8; // type:function size:0x5B8 scope:global -gm_801ACC90_OnLeave = .text:0x801ACC90; // type:function size:0x4 scope:global +gm_Scene_StaffRoll_OnEnter = .text:0x801AC6D8; // type:function size:0x5B8 scope:global +gm_Scene_StaffRoll_OnExit = .text:0x801ACC90; // type:function size:0x4 scope:global gm_801ACC94 = .text:0x801ACC94; // type:function size:0xC scope:global -gm_801ACCA0_OnEnter = .text:0x801ACCA0; // type:function size:0xEC scope:global -gm_801ACD8C_OnFrame = .text:0x801ACD8C; // type:function size:0x108 scope:global -gm_801ACE94_OnEnter = .text:0x801ACE94; // type:function size:0xF8 scope:global -gm_801ACF8C_OnFrame = .text:0x801ACF8C; // type:function size:0xFC scope:global +gm_Scene_HowTo_OnEnter = .text:0x801ACCA0; // type:function size:0xEC scope:global +gm_Scene_HowTo_OnFrame = .text:0x801ACD8C; // type:function size:0x108 scope:global +gm_Scene_Omake15_OnEnter = .text:0x801ACE94; // type:function size:0xF8 scope:global +gm_Scene_Omake15_OnFrame = .text:0x801ACF8C; // type:function size:0xFC scope:global gm_801AD088 = .text:0x801AD088; // type:function size:0x1CC scope:global gm_801AD254 = .text:0x801AD254; // type:function size:0x3CC scope:global -gm_801AD620_OnFrame = .text:0x801AD620; // type:function size:0x254 scope:global -gm_801AD874_OnEnter = .text:0x801AD874; // type:function size:0x78 scope:global -gm_801AD8EC_OnLeave = .text:0x801AD8EC; // type:function size:0x34 scope:global +gm_Scene_ProgScan_OnFrame = .text:0x801AD620; // type:function size:0x254 scope:global +gm_Scene_ProgScan_OnEnter = .text:0x801AD874; // type:function size:0x78 scope:global +gm_Scene_ProgScan_OnExit = .text:0x801AD8EC; // type:function size:0x34 scope:global fn_801AD920 = .text:0x801AD920; // type:function size:0x1E4 gm_801ADB04 = .text:0x801ADB04; // type:function size:0x184 scope:global -gm_801ADC88_OnFrame = .text:0x801ADC88; // type:function size:0x5C scope:global -gm_801ADCE4_OnEnter = .text:0x801ADCE4; // type:function size:0xC4 scope:global -gm_801ADDA8_OnLeave = .text:0x801ADDA8; // type:function size:0x30 scope:global +gm_Scene_Approach_OnFrame = .text:0x801ADC88; // type:function size:0x5C scope:global +gm_Scene_Approach_OnEnter = .text:0x801ADCE4; // type:function size:0xC4 scope:global +gm_Scene_Approach_OnExit = .text:0x801ADDA8; // type:function size:0x30 scope:global gm_801ADDD8 = .text:0x801ADDD8; // type:function size:0x44 scope:global gm_801ADE1C = .text:0x801ADE1C; // type:function size:0x234 scope:global gm_801AE050 = .text:0x801AE050; // type:function size:0x3FC scope:global @@ -9441,9 +9441,9 @@ gm_801AEDC8 = .text:0x801AEDC8; // type:function size:0xA4 scope:global gm_801AEE6C = .text:0x801AEE6C; // type:function size:0x268 scope:global gm_801AF0D4 = .text:0x801AF0D4; // type:function size:0x17C scope:global gm_801AF250 = .text:0x801AF250; // type:function size:0x318 scope:global -gm_801AF568_OnFrame = .text:0x801AF568; // type:function size:0xCFC scope:global -gm_801B0264_OnEnter = .text:0x801B0264; // type:function size:0xA0 scope:global -gm_801B0304_OnLeave = .text:0x801B0304; // type:function size:0x44 scope:global +gm_Scene_MemCard_OnFrame = .text:0x801AF568; // type:function size:0xCFC scope:global +gm_Scene_MemCard_OnEnter = .text:0x801B0264; // type:function size:0xA0 scope:global +gm_Scene_MemCard_OnExit = .text:0x801B0304; // type:function size:0x44 scope:global gm_801B0348 = .text:0x801B0348; // type:function size:0x12C scope:global gm_801B0474 = .text:0x801B0474; // type:function size:0x180 scope:global gm_801B05F4 = .text:0x801B05F4; // type:function size:0x2C scope:global @@ -9504,8 +9504,8 @@ gm_801B1EEC = .text:0x801B1EEC; // type:function size:0x80 scope:local fn_801B1F6C = .text:0x801B1F6C; // type:function size:0x4 scope:local gm_801B1F70 = .text:0x801B1F70; // type:function size:0x294 scope:local gm_801B2204 = .text:0x801B2204; // type:function size:0x94 scope:local -gm_801B2298_OnInit = .text:0x801B2298; // type:function size:0x12C scope:global -gm_801B23C4_OnLoad = .text:0x801B23C4; // type:function size:0x2C scope:global +gm_Mode_Training_OnInit = .text:0x801B2298; // type:function size:0x12C scope:global +gm_Mode_Training_OnLoad = .text:0x801B23C4; // type:function size:0x2C scope:global gm_801B23F0 = .text:0x801B23F0; // type:function size:0xC4 scope:global gm_801B24B4 = .text:0x801B24B4; // type:function size:0x5C scope:local gm_801B2510 = .text:0x801B2510; // type:function size:0x3C scope:local @@ -9515,11 +9515,11 @@ gm_801B26AC = .text:0x801B26AC; // type:function size:0x58 scope:local gm_801B2704 = .text:0x801B2704; // type:function size:0x8C scope:local gm_PrepCameraModeVSScene = .text:0x801B2790; // type:function size:0x368 scope:local gm_801B2AF8 = .text:0x801B2AF8; // type:function size:0x84 scope:local -gm_801B2B7C_OnInit = .text:0x801B2B7C; // type:function size:0x28 scope:global +gm_Mode_Camera_OnInit = .text:0x801B2B7C; // type:function size:0x28 scope:global gmClassic_801B2BA4 = .text:0x801B2BA4; // type:function size:0x1B0 scope:global gmClassic_801B2D54 = .text:0x801B2D54; // type:function size:0x224 scope:global -gmClassic_OnLoad = .text:0x801B2F78; // type:function size:0x540 scope:global -gmClassic_OnInit = .text:0x801B34B8; // type:function size:0x48 scope:global +gm_Mode_Classic_OnLoad = .text:0x801B2F78; // type:function size:0x540 scope:global +gm_Mode_Classic_OnInit = .text:0x801B34B8; // type:function size:0x48 scope:global gmClassic_801B3500 = .text:0x801B3500; // type:function size:0x534 scope:global gmClassic_801B3A34 = .text:0x801B3A34; // type:function size:0x10C scope:global gmClassic_801B3B40 = .text:0x801B3B40; // type:function size:0x204 scope:global @@ -9556,8 +9556,8 @@ gm_801B4FCC = .text:0x801B4FCC; // type:function size:0xAC scope:global gm_801B5078 = .text:0x801B5078; // type:function size:0x4C scope:global gm_801B50C4 = .text:0x801B50C4; // type:function size:0xC8 scope:global gm_801B518C = .text:0x801B518C; // type:function size:0x40 scope:global -gm_801B51CC_OnInit = .text:0x801B51CC; // type:function size:0x48 scope:global -gm_801B5214_OnLoad = .text:0x801B5214; // type:function size:0x110 scope:global +gm_Mode_Adventure_OnInit = .text:0x801B51CC; // type:function size:0x48 scope:global +gm_Mode_Adventure_OnLoad = .text:0x801B5214; // type:function size:0x110 scope:global gm_801B5324 = .text:0x801B5324; // type:function size:0x300 scope:global gm_801B5624 = .text:0x801B5624; // type:function size:0x388 scope:global gm_801B59AC = .text:0x801B59AC; // type:function size:0xFC scope:global @@ -9569,17 +9569,17 @@ gm_801B5EE4 = .text:0x801B5EE4; // type:function size:0x6C scope:global gm_801B5F50 = .text:0x801B5F50; // type:function size:0x64 scope:global gm_801B5FB4 = .text:0x801B5FB4; // type:function size:0xC8 scope:global gm_801B607C = .text:0x801B607C; // type:function size:0x28 scope:global -gm_801B60A4_OnLoad = .text:0x801B60A4; // type:function size:0x234 scope:global -gm_801B62D8_OnInit = .text:0x801B62D8; // type:function size:0x48 scope:global +gm_Mode_AllStar_OnLoad = .text:0x801B60A4; // type:function size:0x234 scope:global +gm_Mode_AllStar_OnInit = .text:0x801B62D8; // type:function size:0x48 scope:global gm_801B6320 = .text:0x801B6320; // type:function size:0xC scope:global gm_801B632C = .text:0x801B632C; // type:function size:0x98 scope:global gm_801B63C4 = .text:0x801B63C4; // type:function size:0x64 scope:global gm_801B6428 = .text:0x801B6428; // type:function size:0x1AC scope:global gm_801B65D4 = .text:0x801B65D4; // type:function size:0x214 scope:global -gm_801B67E8_OnInit = .text:0x801B67E8; // type:function size:0x20 scope:global -gm_801B6808_OnLoad = .text:0x801B6808; // type:function size:0x2C scope:global -gm_801B6834 = .text:0x801B6834; // type:function size:0x28 scope:global -gm_801B685C = .text:0x801B685C; // type:function size:0x30 scope:global +gm_Mode_TargetTest_OnInit = .text:0x801B67E8; // type:function size:0x20 scope:global +gm_Mode_TargetTest_OnLoad = .text:0x801B6808; // type:function size:0x2C scope:global +gm_Mode_10ManVs_OnInit = .text:0x801B6834; // type:function size:0x28 scope:global +gm_Mode_10ManVs_OnLoad = .text:0x801B685C; // type:function size:0x30 scope:global gm_801B688C = .text:0x801B688C; // type:function size:0x134 scope:global gm_801B69C0 = .text:0x801B69C0; // type:function size:0x118 scope:global gm_801B6AD8 = .text:0x801B6AD8; // type:function size:0x98 scope:global @@ -9617,8 +9617,8 @@ gm_801B8CC4 = .text:0x801B8CC4; // type:function size:0x30 scope:global gm_801B8CF4 = .text:0x801B8CF4; // type:function size:0x20 scope:global gm_801B8D14 = .text:0x801B8D14; // type:function size:0x20 scope:global gm_801B8D34 = .text:0x801B8D34; // type:function size:0x2C scope:global -gm_801B8D60_OnInit = .text:0x801B8D60; // type:function size:0x28 scope:global -gm_801B8D88_OnLoad = .text:0x801B8D88; // type:function size:0x20 scope:global +gm_Mode_SuperSuddenDeath_OnInit = .text:0x801B8D60; // type:function size:0x28 scope:global +gm_Mode_SuperSuddenDeath_OnLoad = .text:0x801B8D88; // type:function size:0x20 scope:global gm_801B8DA8 = .text:0x801B8DA8; // type:function size:0x2C scope:global gm_801B8DD4 = .text:0x801B8DD4; // type:function size:0x28 scope:global gm_801B8DFC = .text:0x801B8DFC; // type:function size:0x28 scope:global @@ -9630,8 +9630,8 @@ gm_801B8ED0 = .text:0x801B8ED0; // type:function size:0x34 scope:global gm_801B8F04 = .text:0x801B8F04; // type:function size:0x20 scope:global gm_801B8F24 = .text:0x801B8F24; // type:function size:0x20 scope:global gm_801B8F44 = .text:0x801B8F44; // type:function size:0x2C scope:global -gm_801B8F70_OnInit = .text:0x801B8F70; // type:function size:0x28 scope:global -gm_801B8F98_OnLoad = .text:0x801B8F98; // type:function size:0x20 scope:global +gm_Mode_TinyVs_OnInit = .text:0x801B8F70; // type:function size:0x28 scope:global +gm_Mode_TinyVs_OnLoad = .text:0x801B8F98; // type:function size:0x20 scope:global gm_801B8FB8 = .text:0x801B8FB8; // type:function size:0x2C scope:global gm_801B8FE4 = .text:0x801B8FE4; // type:function size:0x28 scope:global gm_801B900C = .text:0x801B900C; // type:function size:0x28 scope:global @@ -9643,16 +9643,16 @@ gm_801B90E0 = .text:0x801B90E0; // type:function size:0x34 scope:global gm_801B9114 = .text:0x801B9114; // type:function size:0x20 scope:global gm_801B9134 = .text:0x801B9134; // type:function size:0x20 scope:global gm_801B9154 = .text:0x801B9154; // type:function size:0x2C scope:global -gm_801B9180_OnInit = .text:0x801B9180; // type:function size:0x28 scope:global -gm_801B91A8_OnLoad = .text:0x801B91A8; // type:function size:0x20 scope:global +gm_Mode_GiantVs_OnInit = .text:0x801B9180; // type:function size:0x28 scope:global +gm_Mode_GiantVs_OnLoad = .text:0x801B91A8; // type:function size:0x20 scope:global gm_801B91C8 = .text:0x801B91C8; // type:function size:0x64 scope:global gm_801B922C = .text:0x801B922C; // type:function size:0x28 scope:global gm_801B9254 = .text:0x801B9254; // type:function size:0x28 scope:global gm_801B927C = .text:0x801B927C; // type:function size:0xA0 scope:global gm_801B931C = .text:0x801B931C; // type:function size:0x244 scope:global gm_801B9560 = .text:0x801B9560; // type:function size:0x50 scope:global -gm_801B95B0_OnInit = .text:0x801B95B0; // type:function size:0x28 scope:global -gm_801B95D8_OnLoad = .text:0x801B95D8; // type:function size:0x28 scope:global +gm_Mode_StaminaVs_OnInit = .text:0x801B95B0; // type:function size:0x28 scope:global +gm_Mode_StaminaVs_OnLoad = .text:0x801B95D8; // type:function size:0x28 scope:global gm_801B9600 = .text:0x801B9600; // type:function size:0xE8 scope:global fn_801B96E8 = .text:0x801B96E8; // type:function size:0xDC gm_801B97C4 = .text:0x801B97C4; // type:function size:0x8C scope:global @@ -9661,8 +9661,8 @@ gm_801B98E8 = .text:0x801B98E8; // type:function size:0xB4 scope:global gm_801B999C = .text:0x801B999C; // type:function size:0xA0 scope:global gm_801B9A3C = .text:0x801B9A3C; // type:function size:0x39C scope:global gm_801B9DD8 = .text:0x801B9DD8; // type:function size:0xE0 scope:global -gm_801B9EB8_OnInit = .text:0x801B9EB8; // type:function size:0x2C scope:global -gm_801B9EE4_OnLoad = .text:0x801B9EE4; // type:function size:0x2C scope:global +gm_Mode_Homerun_OnInit = .text:0x801B9EB8; // type:function size:0x2C scope:global +gm_Mode_Homerun_OnLoad = .text:0x801B9EE4; // type:function size:0x2C scope:global gm_801B9F10 = .text:0x801B9F10; // type:function size:0x2C scope:global gm_801B9F3C = .text:0x801B9F3C; // type:function size:0x28 scope:global gm_801B9F64 = .text:0x801B9F64; // type:function size:0x28 scope:global @@ -9674,8 +9674,8 @@ gm_801BA024 = .text:0x801BA024; // type:function size:0x34 scope:global gm_801BA058 = .text:0x801BA058; // type:function size:0x20 scope:global gm_801BA078 = .text:0x801BA078; // type:function size:0x20 scope:global gm_801BA098 = .text:0x801BA098; // type:function size:0x2C scope:global -gm_801BA0C4_OnInit = .text:0x801BA0C4; // type:function size:0x28 scope:global -gm_801BA0EC_OnLoad = .text:0x801BA0EC; // type:function size:0x20 scope:global +gm_Mode_CameraVs_OnInit = .text:0x801BA0C4; // type:function size:0x28 scope:global +gm_Mode_CameraVs_OnLoad = .text:0x801BA0EC; // type:function size:0x20 scope:global gm_801BA10C = .text:0x801BA10C; // type:function size:0x2C scope:global gm_801BA138 = .text:0x801BA138; // type:function size:0x28 scope:global gm_801BA160 = .text:0x801BA160; // type:function size:0x28 scope:global @@ -9687,8 +9687,8 @@ gm_801BA224 = .text:0x801BA224; // type:function size:0x34 scope:global gm_801BA258 = .text:0x801BA258; // type:function size:0x20 scope:global gm_801BA278 = .text:0x801BA278; // type:function size:0x20 scope:global gm_801BA298 = .text:0x801BA298; // type:function size:0x2C scope:global -gm_801BA2C4_OnInit = .text:0x801BA2C4; // type:function size:0x28 scope:global -gm_801BA2EC_OnLoad = .text:0x801BA2EC; // type:function size:0x20 scope:global +gm_Mode_SingleButtonVs_OnInit = .text:0x801BA2C4; // type:function size:0x28 scope:global +gm_Mode_SingleButtonVs_OnLoad = .text:0x801BA2EC; // type:function size:0x20 scope:global gm_801BA30C = .text:0x801BA30C; // type:function size:0x2C scope:global gm_801BA338 = .text:0x801BA338; // type:function size:0x28 scope:global gm_801BA360 = .text:0x801BA360; // type:function size:0x28 scope:global @@ -9700,8 +9700,8 @@ gm_801BA424 = .text:0x801BA424; // type:function size:0x34 scope:global gm_801BA458 = .text:0x801BA458; // type:function size:0x20 scope:global gm_801BA478 = .text:0x801BA478; // type:function size:0x20 scope:global gm_801BA498 = .text:0x801BA498; // type:function size:0x2C scope:global -gm_801BA4C4_OnInit = .text:0x801BA4C4; // type:function size:0x28 scope:global -gm_801BA4EC_OnLoad = .text:0x801BA4EC; // type:function size:0x20 scope:global +gm_Mode_InvisibleVs_OnInit = .text:0x801BA4C4; // type:function size:0x28 scope:global +gm_Mode_InvisibleVs_OnLoad = .text:0x801BA4EC; // type:function size:0x20 scope:global gm_801BA50C = .text:0x801BA50C; // type:function size:0x2C scope:global gm_801BA538 = .text:0x801BA538; // type:function size:0x28 scope:global gm_801BA560 = .text:0x801BA560; // type:function size:0x28 scope:global @@ -9713,8 +9713,8 @@ gm_801BA61C = .text:0x801BA61C; // type:function size:0x34 scope:global gm_801BA650 = .text:0x801BA650; // type:function size:0x20 scope:global gm_801BA670 = .text:0x801BA670; // type:function size:0x20 scope:global gm_801BA690 = .text:0x801BA690; // type:function size:0x2C scope:global -gm_801BA6BC_OnInit = .text:0x801BA6BC; // type:function size:0x28 scope:global -gm_801BA6E4_OnLoad = .text:0x801BA6E4; // type:function size:0x20 scope:global +gm_Mode_SlowMo_OnInit = .text:0x801BA6BC; // type:function size:0x28 scope:global +gm_Mode_SlowMo_OnLoad = .text:0x801BA6E4; // type:function size:0x20 scope:global gm_801BA704 = .text:0x801BA704; // type:function size:0x2C scope:global gm_801BA730 = .text:0x801BA730; // type:function size:0x28 scope:global gm_801BA758 = .text:0x801BA758; // type:function size:0x28 scope:global @@ -9726,8 +9726,8 @@ gm_801BA814 = .text:0x801BA814; // type:function size:0x34 scope:global gm_801BA848 = .text:0x801BA848; // type:function size:0x20 scope:global gm_801BA868 = .text:0x801BA868; // type:function size:0x20 scope:global gm_801BA888 = .text:0x801BA888; // type:function size:0x2C scope:global -gm_801BA8B4_OnInit = .text:0x801BA8B4; // type:function size:0x28 scope:global -gm_801BA8DC_OnLoad = .text:0x801BA8DC; // type:function size:0x20 scope:global +gm_Mode_LightningVs_OnInit = .text:0x801BA8B4; // type:function size:0x28 scope:global +gm_Mode_LightningVs_OnLoad = .text:0x801BA8DC; // type:function size:0x20 scope:global gm_801BA8FC = .text:0x801BA8FC; // type:function size:0x3C scope:global gm_801BA938 = .text:0x801BA938; // type:function size:0x128 scope:global onEnterCss = .text:0x801BAA60; // type:function size:0x70 scope:local @@ -9736,10 +9736,10 @@ gm_801BAB40 = .text:0x801BAB40; // type:function size:0x15C scope:global gm_801BAC9C = .text:0x801BAC9C; // type:function size:0xD4 scope:global onEnterVs = .text:0x801BAD70; // type:function size:0x9E8 scope:local onExitVs = .text:0x801BB758; // type:function size:0x308 scope:local -gm_801BBA60_OnInit = .text:0x801BBA60; // type:function size:0x104 scope:global +gm_Mode_Event_OnInit = .text:0x801BBA60; // type:function size:0x104 scope:global gm_801BBB64 = .text:0x801BBB64; // type:function size:0x344 scope:global -gm_801BBEA8_OnLoad = .text:0x801BBEA8; // type:function size:0x13C scope:global -gm_801BBFE4_OnUnload = .text:0x801BBFE4; // type:function size:0x4 scope:global +gm_Mode_Event_OnLoad = .text:0x801BBEA8; // type:function size:0x13C scope:global +gm_Mode_Event_OnUnload = .text:0x801BBFE4; // type:function size:0x4 scope:global fn_801BBFE8 = .text:0x801BBFE8; // type:function size:0x24 gm_801BC00C = .text:0x801BC00C; // type:function size:0x47C scope:global gm_801BC488 = .text:0x801BC488; // type:function size:0x6C scope:global @@ -9781,9 +9781,9 @@ gm_801BEBA8 = .text:0x801BEBA8; // type:function size:0x18 scope:global gm_801BEBC0 = .text:0x801BEBC0; // type:function size:0x38 scope:global gm_801BEBF8 = .text:0x801BEBF8; // type:function size:0x5C scope:global gm_801BEC54 = .text:0x801BEC54; // type:function size:0x2C scope:global -gm_801BEC80 = .text:0x801BEC80; // type:function size:0x28 scope:global -gm_801BECA8 = .text:0x801BECA8; // type:function size:0x28 scope:global -gm_801BECD0 = .text:0x801BECD0; // type:function size:0x44 scope:global +onExit = .text:0x801BEC80; // type:function size:0x28 scope:local +onEnter = .text:0x801BECA8; // type:function size:0x28 scope:local +onExit = .text:0x801BECD0; // type:function size:0x44 scope:local gm_801BED14 = .text:0x801BED14; // type:function size:0x28 scope:global gm_801BED3C = .text:0x801BED3C; // type:function size:0x6C scope:global gm_801BEDA8 = .text:0x801BEDA8; // type:function size:0xB0 scope:global @@ -12574,8 +12574,8 @@ mn_8022D34C = .text:0x8022D34C; // type:function size:0x248 scope:global mn_8022D594 = .text:0x8022D594; // type:function size:0x260 scope:global mn_8022D7F4 = .text:0x8022D7F4; // type:function size:0x31C scope:global mn_8022DB10 = .text:0x8022DB10; // type:function size:0x228 scope:global -mn_8022DD38_OnFrame = .text:0x8022DD38; // type:function size:0x70 scope:global -mn_8022DDA8_OnEnter = .text:0x8022DDA8; // type:function size:0xBA8 scope:global +mnMain_Scene_OnFrame = .text:0x8022DD38; // type:function size:0x70 scope:global +mnMain_Scene_OnEnter = .text:0x8022DDA8; // type:function size:0xBA8 scope:global mn_IsFighterUnlocked = .text:0x8022E950; // type:function size:0x28 scope:global mn_8022E978 = .text:0x8022E978; // type:function size:0x90 scope:global mn_8022EA08 = .text:0x8022EA08; // type:function size:0x70 scope:global @@ -12936,9 +12936,9 @@ fn_8025A310 = .text:0x8025A310; // type:function size:0x250 fn_8025A560 = .text:0x8025A560; // type:function size:0x3BC fn_8025A91C = .text:0x8025A91C; // type:function size:0x58 fn_8025A974 = .text:0x8025A974; // type:function size:0x24 -mnStageSel_8025A998_OnEnter = .text:0x8025A998; // type:function size:0xEB8 scope:global -mnStageSel_8025B850_OnFrame = .text:0x8025B850; // type:function size:0x30C scope:global -mnStageSel_8025BB5C_OnLeave = .text:0x8025BB5C; // type:function size:0x78 scope:global +mnStageSel_Scene_OnEnter = .text:0x8025A998; // type:function size:0xEB8 scope:global +mnStageSel_Scene_OnFrame = .text:0x8025B850; // type:function size:0x30C scope:global +mnStageSel_Scene_OnExit = .text:0x8025BB5C; // type:function size:0x78 scope:global mnStageSel_8025BBD4 = .text:0x8025BBD4; // type:function size:0x34 scope:global mnStageSel_8025BC08 = .text:0x8025BC08; // type:function size:0x18 scope:global mnCharSel_8025BC20 = .text:0x8025BC20; // type:function size:0x110 scope:global @@ -12963,9 +12963,9 @@ fn_802633B0 = .text:0x802633B0; // type:function size:0xCC0 mnCharSel_80264070 = .text:0x80264070; // type:function size:0xC scope:global fn_8026407C = .text:0x8026407C; // type:function size:0x24 mnCharSel_802640A0 = .text:0x802640A0; // type:function size:0x27EC scope:global -mnCharSel_8026688C_OnEnter = .text:0x8026688C; // type:function size:0x168 scope:global -mnCharSel_802669F4_OnFrame = .text:0x802669F4; // type:function size:0x37C scope:global -mnCharSel_80266D70_OnLeave = .text:0x80266D70; // type:function size:0x1CC scope:global +mnCharSel_Scene_OnEnter = .text:0x8026688C; // type:function size:0x168 scope:global +mnCharSel_Scene_OnFrame = .text:0x802669F4; // type:function size:0x37C scope:global +mnCharSel_Scene_OnExit = .text:0x80266D70; // type:function size:0x1CC scope:global Item_80266F3C = .text:0x80266F3C; // type:function size:0x34 scope:global Item_80266F70 = .text:0x80266F70; // type:function size:0x38 scope:global Item_80266FA8 = .text:0x80266FA8; // type:function size:0x24 scope:global @@ -17389,8 +17389,8 @@ fn_802FE470 = .text:0x802FE470; // type:function size:0x238 un_802FE6A8 = .text:0x802FE6A8; // type:function size:0x224 scope:global un_802FE8CC = .text:0x802FE8CC; // type:function size:0x4C scope:global un_802FE918 = .text:0x802FE918; // type:function size:0x2C8 scope:global -un_802FEBE0_OnEnter = .text:0x802FEBE0; // type:function size:0x130 scope:global -un_802FED10_OnLeave = .text:0x802FED10; // type:function size:0x4 scope:global +ifPrize_Scene_OnEnter = .text:0x802FEBE0; // type:function size:0x130 scope:global +ifPrize_Scene_OnExit = .text:0x802FED10; // type:function size:0x4 scope:global fn_802FED14 = .text:0x802FED14; // type:function size:0x298 un_802FEFAC = .text:0x802FEFAC; // type:function size:0x17C scope:global un_802FF128 = .text:0x802FF128; // type:function size:0x68 scope:global @@ -17643,11 +17643,11 @@ _Toy_803114E8 = .text:0x803114E8; // type:function size:0x198 scope:local Toy_80311680 = .text:0x80311680; // type:function size:0x108 scope:global _Toy_80311788 = .text:0x80311788; // type:function size:0x1D8 scope:local Toy_80311960 = .text:0x80311960; // type:function size:0x150 scope:global -Toy_OnEnter_80311AB0 = .text:0x80311AB0; // type:function size:0x4AC scope:global +Toy_Scene_OnEnter = .text:0x80311AB0; // type:function size:0x4AC scope:global _Toy_80311F5C = .text:0x80311F5C; // type:function size:0xBC scope:local -Toy_OnFrame_80312018 = .text:0x80312018; // type:function size:0x38 scope:global +Toy_Scene_OnFrame = .text:0x80312018; // type:function size:0x38 scope:global _Toy_80312050 = .text:0x80312050; // type:function size:0x280 scope:local -Toy_OnInit_803122D0 = .text:0x803122D0; // type:function size:0x7C scope:global +Toy_Mode_OnInit = .text:0x803122D0; // type:function size:0x7C scope:global Toy_8031234C = .text:0x8031234C; // type:function size:0x170 scope:global Toy_803124BC = .text:0x803124BC; // type:function size:0x180 scope:global Toy_8031263C = .text:0x8031263C; // type:function size:0x198 scope:global @@ -17684,9 +17684,9 @@ _tyFigupon_80316BF8 = .text:0x80316BF8; // type:function size:0x2C scope:local _tyFigupon_80316C24 = .text:0x80316C24; // type:function size:0x918 scope:local _tyFigupon_8031753C = .text:0x8031753C; // type:function size:0x524 scope:local _tyFigupon_80317A60 = .text:0x80317A60; // type:function size:0x320 scope:local -tyFigupon_OnEnter_80317D80 = .text:0x80317D80; // type:function size:0x43C scope:global +tyFigupon_Scene_OnEnter = .text:0x80317D80; // type:function size:0x43C scope:global _tyFigupon_803181BC = .text:0x803181BC; // type:function size:0x118 scope:local -tyFigupon_OnFrame_803182D4 = .text:0x803182D4; // type:function size:0x38 scope:global +tyFigupon_Scene_OnFrame = .text:0x803182D4; // type:function size:0x38 scope:global _tyDisplay_8031830C = .text:0x8031830C; // type:function size:0x408 scope:local _tyDisplay_80318714 = .text:0x80318714; // type:function size:0x408 scope:local _tyDisplay_80318B1C = .text:0x80318B1C; // type:function size:0x198 scope:local @@ -17698,9 +17698,9 @@ _tyDisplay_8031A4EC = .text:0x8031A4EC; // type:function size:0x460 scope:local _tyDisplay_8031A94C = .text:0x8031A94C; // type:function size:0x8B0 scope:local _tyDisplay_8031B1FC = .text:0x8031B1FC; // type:function size:0x12C scope:local _tyDisplay_8031B328 = .text:0x8031B328; // type:function size:0x138 scope:local -tyDisplay_OnEnter_8031B460 = .text:0x8031B460; // type:function size:0x3F0 scope:global +tyDisplay_Scene_OnEnter = .text:0x8031B460; // type:function size:0x3F0 scope:global _tyDisplay_8031B850 = .text:0x8031B850; // type:function size:0x154 scope:local -tyDisplay_OnFrame_8031B9A4 = .text:0x8031B9A4; // type:function size:0x38 scope:global +tyDisplay_Scene_OnFrame = .text:0x8031B9A4; // type:function size:0x38 scope:global tyDisplay_8031B9DC = .text:0x8031B9DC; // type:function size:0x9C scope:global _tyDisplay_8031BA78 = .text:0x8031BA78; // type:function size:0xBC scope:local tyDisplay_8031BB34 = .text:0x8031BB34; // type:function size:0x60 scope:global @@ -17723,53 +17723,53 @@ vi0102_8031CB00 = .text:0x8031CB00; // type:function size:0x168 scope:global vi0102_JObjCallback = .text:0x8031CC68; // type:function size:0x24 vi0102_CameraCallback = .text:0x8031CC8C; // type:function size:0x94 vi0102_RunFrame = .text:0x8031CD20; // type:function size:0x74 scope:local -vi0102_Initialize_OnEnter = .text:0x8031CD94; // type:function size:0x26C scope:global -vi0102_8031D000_OnFrame = .text:0x8031D000; // type:function size:0x20 scope:global +vi0102_Scene_OnEnter = .text:0x8031CD94; // type:function size:0x26C scope:global +vi0102_Scene_OnFrame = .text:0x8031D000; // type:function size:0x20 scope:global vi0401_8031D020 = .text:0x8031D020; // type:function size:0x10 scope:global un_8031D030 = .text:0x8031D030; // type:function size:0x138 scope:global fn_8031D168 = .text:0x8031D168; // type:function size:0x24 vi0401_8031D18C = .text:0x8031D18C; // type:function size:0x24 vi0401_8031D1B0 = .text:0x8031D1B0; // type:function size:0x8C vi0401_8031D23C = .text:0x8031D23C; // type:function size:0x4C -un_8031D288_OnEnter = .text:0x8031D288; // type:function size:0x410 scope:global -un_8031D698_OnFrame = .text:0x8031D698; // type:function size:0x4C scope:global +vi0401_Scene_OnEnter = .text:0x8031D288; // type:function size:0x410 scope:global +vi0401_Scene_OnFrame = .text:0x8031D698; // type:function size:0x4C scope:global un_8031D6E4 = .text:0x8031D6E4; // type:function size:0x24 scope:global un_8031D708 = .text:0x8031D708; // type:function size:0x104 scope:global vi_8031D80C = .text:0x8031D80C; // type:function size:0x4C -un_8031D858_OnEnter = .text:0x8031D858; // type:function size:0x16C scope:global -vi_8031D9C4_OnFrame = .text:0x8031D9C4; // type:function size:0x20 scope:global +vi0402_Scene_OnEnter = .text:0x8031D858; // type:function size:0x16C scope:global +vi0402_Scene_OnFrame = .text:0x8031D9C4; // type:function size:0x20 scope:global un_8031D9E4 = .text:0x8031D9E4; // type:function size:0x14 scope:global un_8031D9F8 = .text:0x8031D9F8; // type:function size:0x288 scope:global vi_8031DC80 = .text:0x8031DC80; // type:function size:0x94 fn_8031DD14 = .text:0x8031DD14; // type:function size:0x144 -un_8031DE58_OnEnter = .text:0x8031DE58; // type:function size:0x298 scope:global -vi_8031E0F0_OnFrame = .text:0x8031E0F0; // type:function size:0x20 scope:global +vi0501_Scene_OnEnter = .text:0x8031DE58; // type:function size:0x298 scope:global +vi0501_Scene_OnFrame = .text:0x8031E0F0; // type:function size:0x20 scope:global un_8031E110 = .text:0x8031E110; // type:function size:0x14 scope:global vi0502_8031E124 = .text:0x8031E124; // type:function size:0x1E0 scope:global vi0502_8031E304 = .text:0x8031E304; // type:function size:0x24 -vi0502_8031E328 = .text:0x8031E328; // type:function size:0x94 -vi0502_RunFrame = .text:0x8031E3BC; // type:function size:0x88 -un_8031E444_OnEnter = .text:0x8031E444; // type:function size:0x288 scope:global -vi_8031E6CC_OnFrame = .text:0x8031E6CC; // type:function size:0x20 scope:global +vi0502_GObj_OnRender = .text:0x8031E328; // type:function size:0x94 scope:local +vi0502_GObj_OnProc = .text:0x8031E3BC; // type:function size:0x88 +vi0502_Scene_OnEnter = .text:0x8031E444; // type:function size:0x288 scope:global +vi0502_Scene_OnFrame = .text:0x8031E6CC; // type:function size:0x20 scope:global vi_8031E6EC = .text:0x8031E6EC; // type:function size:0x24 scope:global -vi0601_CameraCallback = .text:0x8031E710; // type:function size:0xF0 scope:local +vi0601_GObj_OnRender = .text:0x8031E710; // type:function size:0xF0 scope:local fn_8031E800 = .text:0x8031E800; // type:function size:0x1B8 un_8031E9B8 = .text:0x8031E9B8; // type:function size:0x180 scope:global vi0601_RunFrame = .text:0x8031EB38; // type:function size:0x84 -un_8031EBBC_OnEnter = .text:0x8031EBBC; // type:function size:0x194 scope:global -vi_8031ED50_OnFrame = .text:0x8031ED50; // type:function size:0x20 scope:global +vi0601_Scene_OnEnter = .text:0x8031EBBC; // type:function size:0x194 scope:global +vi0601_Scene_OnFrame = .text:0x8031ED50; // type:function size:0x20 scope:global vi0801_8031ED70 = .text:0x8031ED70; // type:function size:0xF0 scope:global vi0801_8031EE60 = .text:0x8031EE60; // type:function size:0x24 scope:global vi0801_8031EE84 = .text:0x8031EE84; // type:function size:0x160 scope:global vi0801_8031EFE4 = .text:0x8031EFE4; // type:function size:0x98 -vi0801_OnEnter = .text:0x8031F07C; // type:function size:0x1F8 scope:global -vi0801_OnFrame = .text:0x8031F274; // type:function size:0x20 scope:global +vi0801_Scene_OnEnter = .text:0x8031F07C; // type:function size:0x1F8 scope:global +vi0801_Scene_OnFrame = .text:0x8031F274; // type:function size:0x20 scope:global un_8031F294 = .text:0x8031F294; // type:function size:0x2B4 scope:global fn_8031F548 = .text:0x8031F548; // type:function size:0x24 fn_8031F56C = .text:0x8031F56C; // type:function size:0x94 fn_8031F600 = .text:0x8031F600; // type:function size:0x114 -un_8031F714_OnEnter = .text:0x8031F714; // type:function size:0x24C scope:global -un_8031F960_OnFrame = .text:0x8031F960; // type:function size:0x20 scope:global +vi1101_Scene_OnEnter = .text:0x8031F714; // type:function size:0x24C scope:global +vi1101_Scene_OnFrame = .text:0x8031F960; // type:function size:0x20 scope:global un_8031F980 = .text:0x8031F980; // type:function size:0x10 scope:global un_8031F990 = .text:0x8031F990; // type:function size:0x24 scope:global un_8031F9B4 = .text:0x8031F9B4; // type:function size:0x24 scope:global @@ -17778,8 +17778,8 @@ fn_8031FAA8 = .text:0x8031FAA8; // type:function size:0xE8 fn_8031FB90 = .text:0x8031FB90; // type:function size:0xA0 fn_8031FC30 = .text:0x8031FC30; // type:function size:0x8C fn_8031FCBC = .text:0x8031FCBC; // type:function size:0x5C -un_8031FD18_OnEnter = .text:0x8031FD18; // type:function size:0x778 scope:global -un_80320490_OnFrame = .text:0x80320490; // type:function size:0x20 scope:global +vi1201v1_Scene_OnEnter = .text:0x8031FD18; // type:function size:0x778 scope:global +vi1201v1_Scene_OnFrame = .text:0x80320490; // type:function size:0x20 scope:global un_803204B0 = .text:0x803204B0; // type:function size:0x10 scope:global un_803204C0 = .text:0x803204C0; // type:function size:0x24 scope:global un_803204E4 = .text:0x803204E4; // type:function size:0x24 scope:global @@ -17790,15 +17790,15 @@ un_803207C4 = .text:0x803207C4; // type:function size:0x12C scope:global un_803208F0 = .text:0x803208F0; // type:function size:0x94 scope:global un_80320984 = .text:0x80320984; // type:function size:0x98 scope:global fn_80320A1C = .text:0x80320A1C; // type:function size:0x24 -un_80320A40_OnEnter = .text:0x80320A40; // type:function size:0x6AC scope:global -un_803210EC_OnFrame = .text:0x803210EC; // type:function size:0x20 scope:global +vi1201v2_Scene_OnEnter = .text:0x80320A40; // type:function size:0x6AC scope:global +vi1201v2_Scene_OnFrame = .text:0x803210EC; // type:function size:0x20 scope:global un_8032110C = .text:0x8032110C; // type:function size:0x24 scope:global un_80321130 = .text:0x80321130; // type:function size:0x24 scope:global un_80321154 = .text:0x80321154; // type:function size:0x24 scope:global un_80321178 = .text:0x80321178; // type:function size:0x11C scope:global vi1202_RunFrame = .text:0x80321294; // type:function size:0x6C scope:global -vi1202_OnEnter = .text:0x80321300; // type:function size:0x5E0 scope:global -vi1202_OnFrame = .text:0x803218E0; // type:function size:0x20 scope:global +vi1202_Scene_OnEnter = .text:0x80321300; // type:function size:0x5E0 scope:global +vi1202_Scene_OnFrame = .text:0x803218E0; // type:function size:0x20 scope:global un_80321900 = .text:0x80321900; // type:function size:0x50 scope:global un_80321950 = .text:0x80321950; // type:function size:0x5C scope:global fn_803219AC = .text:0x803219AC; // type:function size:0x54 @@ -22295,8 +22295,8 @@ gm_803DA888 = .data:0x803DA888; // type:object size:0x40 scope:global data:4byte gm_803DA8C8 = .data:0x803DA8C8; // type:object size:0x10 scope:global @209 = .data:0x803DA8D8; // type:object size:0x21 scope:local data:string @211 = .data:0x803DA8FC; // type:object size:0x20 scope:local data:string -scene_handlers = .data:0x803DA920; // type:object size:0x384 scope:local -game_modes = .data:0x803DACA4; // type:object size:0x398 scope:local +scenes = .data:0x803DA920; // type:object size:0x384 scope:local +modes = .data:0x803DACA4; // type:object size:0x398 scope:local @197 = .data:0x803DB040; // type:object size:0xC scope:local data:string @28 = .data:0x803DB050; // type:object size:0x11 scope:local data:string ...data.0 = .data:0x803DB050; // type:label scope:local @@ -22505,42 +22505,42 @@ gm_803DD550_jp = .data:0x803DD550; // type:object size:0x5C scope:local gm_803DD550_us = .data:0x803DD5AC; // type:object size:0x5C scope:local @278 = .data:0x803DD608; // type:object size:0x40 scope:local @634 = .data:0x803DD648; // type:object size:0x54 scope:local -gm_803DD6A0_Scenes = .data:0x803DD6A0; // type:object size:0x30 scope:global -gm_803DD6D0_Scenes = .data:0x803DD6D0; // type:object size:0x180 scope:global +gm_Mode_Title_States = .data:0x803DD6A0; // type:object size:0x30 scope:global +gm_Mode_Debug_States = .data:0x803DD6D0; // type:object size:0x180 scope:global @206 = .data:0x803DD850; // type:object size:0x34 scope:local -gm_803DD888_Scenes = .data:0x803DD888; // type:object size:0x30 scope:global -gm_803DD8B8_Scenes = .data:0x803DD8B8; // type:object size:0x30 scope:global +gm_Mode_DebugMenu_States = .data:0x803DD888; // type:object size:0x30 scope:global +gm_Mode_Menu_States = .data:0x803DD8B8; // type:object size:0x30 scope:global @63 = .data:0x803DD8E8; // type:object size:0xB4 scope:local -gm_803DD9A0_Scenes = .data:0x803DD9A0; // type:object size:0xD8 scope:global -gm_803DDA78_Scenes = .data:0x803DDA78; // type:object size:0x48 scope:global -gm_803DDAC0_Scenes = .data:0x803DDAC0; // type:object size:0xC0 scope:global -gm_803DDB80_Scenes = .data:0x803DDB80; // type:object size:0x60 scope:global -gm_CameraModeScenes = .data:0x803DDBE0; // type:object size:0x78 scope:global -gm_803DDC58_Scenes = .data:0x803DDC58; // type:object size:0x270 scope:global +gm_Mode_Vs_States = .data:0x803DD9A0; // type:object size:0xD8 scope:global +gm_Mode_DebugVs_States = .data:0x803DDA78; // type:object size:0x48 scope:global +gm_Mode_Tournament_States = .data:0x803DDAC0; // type:object size:0xC0 scope:global +gm_Mode_Training_States = .data:0x803DDB80; // type:object size:0x60 scope:global +gm_Mode_Camera_States = .data:0x803DDBE0; // type:object size:0x78 scope:global +gm_Mode_Classic_States = .data:0x803DDC58; // type:object size:0x270 scope:global gmClassic_803DDEC8 = .data:0x803DDEC8; // type:object size:0x2F0 scope:local data:byte -gm_803DE1B8_Scenes = .data:0x803DE1B8; // type:object size:0x498 scope:global data:4byte +gm_Mode_Adventure_States = .data:0x803DE1B8; // type:object size:0x498 scope:global data:4byte gm_803DE650 = .data:0x803DE650; // type:object size:0x2E0 scope:local data:byte -gm_803DE930_Scenes = .data:0x803DE930; // type:object size:0x2B8 scope:global +gm_Mode_AllStar_States = .data:0x803DE930; // type:object size:0x2B8 scope:global gm_803DEBE8 = .data:0x803DEBE8; // type:object size:0x64 scope:local data:4byte gm_803DEC4C = .data:0x803DEC4C; // type:object size:0x68 -gm_803DECB8_Scenes = .data:0x803DECB8; // type:object size:0x48 scope:global -gm_803DED00_Scenes = .data:0x803DED00; // type:object size:0x48 scope:global -gm_803DED48_Scenes = .data:0x803DED48; // type:object size:0x48 scope:global -gm_803DED90_Scenes = .data:0x803DED90; // type:object size:0x48 scope:global -gm_803DEDD8_Scenes = .data:0x803DEDD8; // type:object size:0x48 scope:global -gm_803DEE20_Scenes = .data:0x803DEE20; // type:object size:0x48 scope:global -gm_803DEE68_Scenes = .data:0x803DEE68; // type:object size:0x48 scope:global -gm_803DEEB0_Scenes = .data:0x803DEEB0; // type:object size:0xD8 scope:global -gm_803DEF88_Scenes = .data:0x803DEF88; // type:object size:0xD8 scope:global -gm_803DF060_Scenes = .data:0x803DF060; // type:object size:0xD8 scope:global -gm_803DF138_Scenes = .data:0x803DF138; // type:object size:0x60 scope:global -gm_803DF198_Scenes = .data:0x803DF198; // type:object size:0x48 scope:global -gm_803DF1E0_Scenes = .data:0x803DF1E0; // type:object size:0xD8 scope:global -gm_803DF2B8_Scenes = .data:0x803DF2B8; // type:object size:0xD8 scope:global -gm_803DF390_Scenes = .data:0x803DF390; // type:object size:0xD8 scope:global -gm_803DF468_Scenes = .data:0x803DF468; // type:object size:0xD8 scope:global -gm_803DF540_Scenes = .data:0x803DF540; // type:object size:0xD8 scope:global -gm_803DF618_Scenes = .data:0x803DF618; // type:object size:0x48 scope:global +gm_Mode_TargetTest_States = .data:0x803DECB8; // type:object size:0x48 scope:global +gm_Mode_10ManVs_States = .data:0x803DED00; // type:object size:0x48 scope:global +gm_Mode_100ManVs_States = .data:0x803DED48; // type:object size:0x48 scope:global +gm_Mode_3Min_States = .data:0x803DED90; // type:object size:0x48 scope:global +gm_Mode_15Min_States = .data:0x803DEDD8; // type:object size:0x48 scope:global +gm_Mode_EndlessVs_States = .data:0x803DEE20; // type:object size:0x48 scope:global +gm_Mode_CruelVs_States = .data:0x803DEE68; // type:object size:0x48 scope:global +gm_Mode_SuperSuddenDeath_States = .data:0x803DEEB0; // type:object size:0xD8 scope:global +gm_Mode_TinyVs_States = .data:0x803DEF88; // type:object size:0xD8 scope:global +gm_Mode_GiantVs_States = .data:0x803DF060; // type:object size:0xD8 scope:global +gm_Mode_StaminaVs_States = .data:0x803DF138; // type:object size:0x60 scope:global +gm_Mode_Homerun_States = .data:0x803DF198; // type:object size:0x48 scope:global +gm_Mode_CameraVs_States = .data:0x803DF1E0; // type:object size:0xD8 scope:global +gm_Mode_SingleButtonVs_States = .data:0x803DF2B8; // type:object size:0xD8 scope:global +gm_Mode_InvisibleVs_States = .data:0x803DF390; // type:object size:0xD8 scope:global +gm_Mode_SlowMo_States = .data:0x803DF468; // type:object size:0xD8 scope:global +gm_Mode_LightningVs_States = .data:0x803DF540; // type:object size:0xD8 scope:global +gm_Mode_Event_States = .data:0x803DF618; // type:object size:0x48 scope:global @175 = .data:0x803DF660; // type:object size:0xC scope:local data:string @176 = .data:0x803DF66C; // type:object size:0x18 scope:local data:string @519 = .data:0x803DF684; // type:object size:0xA0 scope:local @@ -22549,20 +22549,20 @@ gm_803DF618_Scenes = .data:0x803DF618; // type:object size:0x48 scope:global @667 = .data:0x803DF864; // type:object size:0xB4 scope:local gm_803DF918 = .data:0x803DF918; // type:object size:0x33 scope:local data:byte gm_803DF94C = .data:0x803DF94C; // type:object size:0xCC scope:local -gm_803DFA18_Scenes = .data:0x803DFA18; // type:object size:0x30 scope:global -gm_803DFA48_Scenes = .data:0x803DFA48; // type:object size:0x30 scope:global -gm_803DFA78_Scenes = .data:0x803DFA78; // type:object size:0x30 scope:global -gm_803DFAA8_Scenes = .data:0x803DFAA8; // type:object size:0x30 scope:global -gm_803DFAD8_Scenes = .data:0x803DFAD8; // type:object size:0x30 scope:global -gm_803DFB08 = .data:0x803DFB08; // type:object size:0x78 scope:global -gm_803DFB80_Scenes = .data:0x803DFB80; // type:object size:0x48 scope:global -gm_803DFBC8_Scenes = .data:0x803DFBC8; // type:object size:0xA8 scope:global -gm_803DFC70_Scenes = .data:0x803DFC70; // type:object size:0x138 scope:global -gm_803DFDA8_Scenes = .data:0x803DFDA8; // type:object size:0x30 scope:global -gmBoot_BootScenes = .data:0x803DFDD8; // type:object size:0x30 scope:global +gm_Mode_ToyGallery_States = .data:0x803DFA18; // type:object size:0x30 scope:global +gm_Mode_ToyLottery_States = .data:0x803DFA48; // type:object size:0x30 scope:global +gm_Mode_ToyCollection_States = .data:0x803DFA78; // type:object size:0x30 scope:global +gm_Mode_HanyuCss_States = .data:0x803DFAA8; // type:object size:0x30 scope:global +gm_Mode_HanyuSss_States = .data:0x803DFAD8; // type:object size:0x30 scope:global +gm_Mode_GOver_States = .data:0x803DFB08; // type:object size:0x78 scope:global +gm_Mode_DebugGOver_States = .data:0x803DFB80; // type:object size:0x48 scope:global +gm_Mode_Opening_States = .data:0x803DFBC8; // type:object size:0xA8 scope:global +gm_Mode_DebugCutscene_States = .data:0x803DFC70; // type:object size:0x138 scope:global +gm_Mode_ProgScan_States = .data:0x803DFDA8; // type:object size:0x30 scope:global +gm_Mode_Boot_States = .data:0x803DFDD8; // type:object size:0x30 scope:global @20 = .data:0x803DFE08; // type:object size:0x10 scope:local data:string -gmBoot_MemCardScenes = .data:0x803DFE18; // type:object size:0x30 scope:global -gm_803DFE48_Scenes = .data:0x803DFE48; // type:object size:0x60 scope:global +gm_Mode_MemCard_States = .data:0x803DFE18; // type:object size:0x30 scope:global +gm_Mode_ChallengerApproach_States = .data:0x803DFE48; // type:object size:0x60 scope:global Ground_StageData = .data:0x803DFEA8; // type:object size:0x34 scope:local ...data.0 = .data:0x803DFEA8; // type:label scope:local stage_datas = .data:0x803DFEDC; // type:object size:0x1BC scope:local @@ -26157,7 +26157,7 @@ gmCamera_VsCameraTextLayout = .bss:0x80479C20; // type:object size:0x10 scope:lo ...bss.0 = .bss:0x80479C20; // type:label scope:local controller_map = .bss:0x80479C30; // type:object size:0x100 scope:local data:4byte ...bss.0 = .bss:0x80479C30; // type:label scope:local -gm_80479D30 = .bss:0x80479D30; // type:object size:0x14 scope:local data:byte +state_machine = .bss:0x80479D30; // type:object size:0x14 scope:local data:byte ...bss.0 = .bss:0x80479D30; // type:label scope:local gm_80479D48 = .bss:0x80479D48; // type:object size:0x10 scope:global ...bss.0 = .bss:0x80479D48; // type:label scope:local @@ -28587,8 +28587,8 @@ gm_804D68F1 = .sbss:0x804D68F1; // type:object size:0x1 scope:global data:byte gm_804D68F8 = .sbss:0x804D68F8; // type:object size:0x1 scope:global data:byte gm_804D68F9 = .sbss:0x804D68F9; // type:object size:0x1 scope:global data:byte gm_804D6900 = .sbss:0x804D6900; // type:object size:0x8 scope:global data:4byte -gm_804D6908 = .sbss:0x804D6908; // type:object size:0x8 scope:global -gm_804D6910 = .sbss:0x804D6910; // type:object size:0x8 scope:global +exit_data = .sbss:0x804D6908; // type:object size:0x8 scope:local +exit_data = .sbss:0x804D6910; // type:object size:0x8 scope:local gm_804D6918 = .sbss:0x804D6918; // type:object size:0x8 scope:global gm_804D6920 = .sbss:0x804D6920; // type:object size:0x8 scope:global regend_congrats_enter_data = .sbss:0x804D6928; // type:object size:0x4 scope:local diff --git a/configure.py b/configure.py index 5e6e7f62ef..f35138f3d8 100755 --- a/configure.py +++ b/configure.py @@ -162,6 +162,17 @@ default="off", help="warning level (default 'off')", ) +parser.add_argument( + "--lint-all", + action="store_true", + help="do not disable any clang warnings", +) +parser.add_argument( + "--no-lint-error", + dest="lint_error", + action="store_false", + help="do not treat clang warnings as errors", +) parser.add_argument( "--require-protos", dest="require_protos", @@ -248,7 +259,7 @@ config.ldflags = [ "-fp hardware", "-nodefaults", - "-warn off", + f"-warn {args.warn}", ] if args.debug: config.ldflags.append("-g") # Or -gdwarf-2 for Wii linkers @@ -373,7 +384,6 @@ clang_warnings = [ "all", "extra", - "error", "c2x-extensions", "implicit-function-declaration", "implicit-int", @@ -383,6 +393,9 @@ "typedef-redefinition", ] +if args.lint_error: + clang_warnings.append("error") + clang_disabled_warnings = [ "bitfield-constant-conversion", "integer-overflow", @@ -409,9 +422,10 @@ *[f"-I{s}" for s in clang_includes], *[f"-isystem{s}" for s in clang_system_includes], *[f"-W{s}" for s in clang_warnings], - *[f"-Wno-{s}" for s in clang_disabled_warnings], ] +if not args.lint_all: + clang_flags_base.extend(f"-Wno-{s}" for s in clang_disabled_warnings), config.extra_clang_flags.extend(clang_flags_base) diff --git a/src/MSL/printf.c b/src/MSL/printf.c index 423412f6f8..b0e8f1795b 100644 --- a/src/MSL/printf.c +++ b/src/MSL/printf.c @@ -510,8 +510,7 @@ static void round_decimal(decimal* dec, int new_length) if (c == 5) { char* q = &((char*) dec->sig.text)[dec->sig.length]; - while (--q > p && *q == '0') - ; + while (--q > p && *q == '0'); carry = (q == p) ? p[-1] & 1 : 1; } else { carry = (c > 5); diff --git a/src/melee/gm/forward.h b/src/melee/gm/forward.h index c8b30aebc5..43a6df2dd9 100644 --- a/src/melee/gm/forward.h +++ b/src/melee/gm/forward.h @@ -46,7 +46,7 @@ typedef enum GameModeKind { /* 27 */ GM_PROGRESSIVE_SCAN, /* 28 */ GM_BOOT, /* 29 */ GM_MEMCARD, - /* 2A */ GM_FIXED_CAMERA_VS, + /* 2A */ GM_CAMERA_VS, /* 2B */ GM_EVENT, /* 2C */ GM_SINGLE_BUTTON_VS, /* 2D */ GM_COUNT, @@ -57,13 +57,13 @@ typedef enum GameSceneKind { /* +01 */ GS_MENU, /* +02 */ GS_VS, /* +03 */ GS_SUDDEN_DEATH, - /* +04 */ GS_TRAINING_MODE, + /* +04 */ GS_TRAINING, /* +05 */ GS_RESULTS, /* +06 */ GS_0x6, ///< Unused? It is skipped in the table entirely /* +07 */ GS_DEBUG_MENU, /* +08 */ GS_CSS, /* +09 */ GS_SSS, - /* +0A */ GS_0xA, ///< Unused? Empty in the table + /* +0A */ GS_UNK10, ///< Unused? Empty in the table /* +0B */ GS_TOY_GALLERY, /* +0C */ GS_TOY_LOTTERY, /* +0D */ GS_TOY_COLLECTION, @@ -136,8 +136,8 @@ typedef struct datetime datetime; typedef struct DebugGameOverData DebugGameOverData; typedef struct GameMode GameMode; typedef struct GameRules GameRules; +typedef struct GameModeState GameModeState; typedef struct GameScene GameScene; -typedef struct GameSceneHandler GameSceneHandler; typedef struct GameSceneInfo GameSceneInfo; typedef struct gm_8016A92C_arg0_t gm_8016A92C_arg0_t; typedef struct gm_8017DB6C_arg0_t gm_8017DB6C_arg0_t; diff --git a/src/melee/gm/gm_16AE.c b/src/melee/gm/gm_16AE.c index 60a05952fa..98e28f4dd1 100644 --- a/src/melee/gm/gm_16AE.c +++ b/src/melee/gm/gm_16AE.c @@ -1424,7 +1424,7 @@ static inline int fn_8016CBE8_inline(void) return -1; } -void gm_8016D32C_OnFrame(void) +void gm_Scene_Training_OnFrame(void) { int i; lbl_8046B6A0_t* tmp = &lbl_8046B6A0; @@ -1524,7 +1524,7 @@ void fn_8016D634(void) } } -void gm_8016D800(void) +void gm_Scene_Vs_OnFrame(void) { PAD_STACK(8); if (lbl_8046B6A0.x24C8.x48 != NULL) { @@ -2031,7 +2031,7 @@ void fn_8016E730(StartMeleeData* arg0) } } -void gm_8016E934_OnEnter(void* arg0) +void gm_Scene_Vs_OnEnter(void* arg0) { StartMeleeData* tmp = arg0; fn_8016E730(tmp); @@ -2061,7 +2061,7 @@ static inline bool gm_8016E9C8_inline(void) case GM_TINY_VS: case GM_GIANT_VS: case GM_STAMINA_VS: - case GM_FIXED_CAMERA_VS: + case GM_CAMERA_VS: case GM_SINGLE_BUTTON_VS: return true; default: @@ -2069,7 +2069,7 @@ static inline bool gm_8016E9C8_inline(void) } } -void gm_8016E9C8(void* user_data) +void gm_Scene_Vs_OnExit(void* user_data) { struct EndMeleeData* data = user_data; lbl_8046B6A0_t* tmp = &lbl_8046B6A0; @@ -2114,7 +2114,7 @@ void gm_8016E9C8(void* user_data) } } -void gm_8016EBC0_OnEnter(void* user_data) +void gm_Scene_SuddenDeath_OnEnter(void* user_data) { StartMeleeData* data = user_data; data->rules.x6 = true; @@ -2124,7 +2124,7 @@ void gm_8016EBC0_OnEnter(void* user_data) ifStatus_802F665C(data->rules.x0_3); } -void gm_8016EC28_OnEnter(void* user_data) +void gm_Scene_Training_OnEnter(void* user_data) { StartMeleeData* data = user_data; struct lbl_8046B6A0_t* tmp2; diff --git a/src/melee/gm/gm_16AE.h b/src/melee/gm/gm_16AE.h index 3a43fcb4f0..e018250fc0 100644 --- a/src/melee/gm/gm_16AE.h +++ b/src/melee/gm/gm_16AE.h @@ -90,10 +90,10 @@ /* 16CD98 */ void fn_8016CD98(lbl_8046B6A0_t*); /* 16CF4C */ void fn_8016CF4C(int, MatchOutcome); /* 16CFE0 */ void fn_8016CFE0(void); -/* 16D32C */ void gm_8016D32C_OnFrame(void); +/* 16D32C */ void gm_Scene_Training_OnFrame(void); /* 16D538 */ bool fn_8016D538(void); /* 16D634 */ void fn_8016D634(void); -/* 16D800 */ void gm_8016D800(void); +/* 16D800 */ void gm_Scene_Vs_OnFrame(void); /* 16D8AC */ void fn_8016D8AC(int, struct PlayerInitData*); /* 16DCC0 */ void fn_8016DCC0(struct StartMeleeData*); /* 16DEEC */ void fn_8016DEEC(void); @@ -101,10 +101,10 @@ /* 16E2BC */ void fn_8016E2BC(void); /* 16E5C0 */ bool fn_8016E5C0(struct StartMeleeData*); /* 16E730 */ void fn_8016E730(struct StartMeleeData*); -/* 16E934 */ void gm_8016E934_OnEnter(void*); -/* 16E9C8 */ void gm_8016E9C8(void*); -/* 16EBC0 */ void gm_8016EBC0_OnEnter(void*); -/* 16EC28 */ void gm_8016EC28_OnEnter(void*); +/* 16E934 */ void gm_Scene_Vs_OnEnter(void*); +/* 16E9C8 */ void gm_Scene_Vs_OnExit(void*); +/* 16EBC0 */ void gm_Scene_SuddenDeath_OnEnter(void*); +/* 16EC28 */ void gm_Scene_Training_OnEnter(void*); /* 16ECE8 */ float gm_8016ECE8(void); /* 16EDDC */ bool gm_8016EDDC(int, struct PlayerInitData*); /* 16EF98 */ bool fn_8016EF98(int); diff --git a/src/melee/gm/gm_16F1.h b/src/melee/gm/gm_16F1.h index a2783ed697..a8cd6ddd17 100644 --- a/src/melee/gm/gm_16F1.h +++ b/src/melee/gm/gm_16F1.h @@ -98,7 +98,7 @@ struct lbl_804D65A8_t; /* 1736E8 */ void gm_801736E8(u8, u8, u8, u8, u8, u8); /* 173754 */ bool gm_80173754(u8, u8); /* 1737D8 */ u8 gm_801737D8(void); -/* 1737E8 */ void gm_801737E8_OnLoad(void); +/* 1737E8 */ void gm_Mode_ChallengerApproach_OnLoad(void); /* 173834 */ UNK_RET fn_80173834(u8 ckind, u8 major, bool); /* 17390C */ UNK_RET gm_8017390C(int, int); /* 173AA4 */ UNK_RET gm_80173AA4(UNK_PARAMS); diff --git a/src/melee/gm/gm_1736.c b/src/melee/gm/gm_1736.c index 7e4c8ffb44..d317e5e3f6 100644 --- a/src/melee/gm/gm_1736.c +++ b/src/melee/gm/gm_1736.c @@ -59,7 +59,7 @@ u8 gm_801737D8(void) return challenger_data.x6; } -void gm_801737E8_OnLoad(void) +void gm_Mode_ChallengerApproach_OnLoad(void) { challenger_data.x6 = gm_GetPreviousGameMode(); if (challenger_data.x0 == CHKIND_NONE) { diff --git a/src/melee/gm/gm_1832.c b/src/melee/gm/gm_1832.c index 2430f5b63d..cba511cd01 100644 --- a/src/melee/gm/gm_1832.c +++ b/src/melee/gm/gm_1832.c @@ -1188,7 +1188,7 @@ void fn_80186634(void* arg0) lbAudioAx_80023F28(0x2D); } -void gm_80186DFC_OnFrame(void) +void gm_Scene_IntroEasy_OnFrame(void) { if (lbl_804735A8.x0 != 0) { lbAudioAx_800236DC(); @@ -1226,7 +1226,7 @@ typedef struct ClassicModeEnterData { /* 0x1C */ int x1C; } ClassicModeEnterData; -void gm_80186E30_OnEnter(void* arg0_) +void gm_Scene_IntroEasy_OnEnter(void* arg0_) { ClassicModeEnterData* arg0 = arg0_; @@ -1423,7 +1423,7 @@ void fn_80187714(void) #pragma pop #endif -void gm_8018776C_OnFrame(void) +void gm_Scene_IntroAllstar_OnFrame(void) { if (lbl_804736B0.x0 != 0) { lbArchive_80016EFC(lbl_804D6610); @@ -1436,7 +1436,7 @@ void gm_8018776C_OnFrame(void) #pragma push #pragma dont_inline on #endif -void gm_801877A8_OnEnter(void* arg0_) +void gm_Scene_IntroAllstar_OnEnter(void* arg0_) { struct enterdata* arg0 = arg0_; HSD_GObj* temp_r30; @@ -1858,19 +1858,19 @@ static inline void gm_80187F48_OnEnter_inline(gm_80187F48_EnterData* arg0) lbAudioAx_80023F28(0x2E); } -void gm_80187F48_OnEnter(void* arg0) +void gm_Scene_IntroNormal_OnEnter(void* arg0) { PAD_STACK(32); gm_80187F48_OnEnter_inline(arg0); } -void gm_80188364_OnLeave(void* arg0) +void gm_Scene_IntroNormal_OnLeave(void* arg0) { HSD_Archive** var = &lbl_804D6620; lbArchive_80016EFC(*var); } -void gm_8018838C_OnFrame(void) +void gm_Scene_IntroNormal_OnFrame(void) { if (lbl_804736C0.x36.done) { gm_801A4B60(); diff --git a/src/melee/gm/gm_1832.h b/src/melee/gm/gm_1832.h index 1fbb3de885..b64a8fe9f5 100644 --- a/src/melee/gm/gm_1832.h +++ b/src/melee/gm/gm_1832.h @@ -30,23 +30,23 @@ /* 1861B8 */ UNK_RET fn_801861B8(UNK_PARAMS); /* 186400 */ UNK_RET fn_80186400(UNK_PARAMS); /* 186634 */ void fn_80186634(void*); -/* 186DFC */ void gm_80186DFC_OnFrame(void); -/* 186E30 */ void gm_80186E30_OnEnter(void*); +/* 186DFC */ void gm_Scene_IntroEasy_OnFrame(void); +/* 186E30 */ void gm_Scene_IntroEasy_OnEnter(void*); /* 186EFC */ void fn_80186EFC(HSD_GObj*); /* 186F6C */ void fn_80186F6C(HSD_GObj*); /* 1873F0 */ HSD_GObjProc* fn_801873F0(void); /* 187494 */ void fn_80187494(HSD_GObj*, int); /* 1874FC */ UNK_RET fn_801874FC(UNK_PARAMS); /* 187714 */ UNK_RET fn_80187714(UNK_PARAMS); -/* 18776C */ void gm_8018776C_OnFrame(void); -/* 1877A8 */ void gm_801877A8_OnEnter(UNK_T); +/* 18776C */ void gm_Scene_IntroAllstar_OnFrame(void); +/* 1877A8 */ void gm_Scene_IntroAllstar_OnEnter(UNK_T); /* 187910 */ void fn_80187910(HSD_GObj*); /* 187AB4 */ void fn_80187AB4(HSD_GObj*); /* 187C9C */ void fn_80187C9C(HSD_GObj*, int); /* 187CF4 */ void fn_80187CF4(HSD_GObj*); -/* 187F48 */ void gm_80187F48_OnEnter(UNK_T); -/* 188364 */ void gm_80188364_OnLeave(UNK_T); -/* 18838C */ void gm_8018838C_OnFrame(void); +/* 187F48 */ void gm_Scene_IntroNormal_OnEnter(UNK_T); +/* 188364 */ void gm_Scene_IntroNormal_OnLeave(UNK_T); +/* 18838C */ void gm_Scene_IntroNormal_OnFrame(void); /* 1883C0 */ f32 gm_801883C0(void); /* 18841C */ bool gm_8018841C(void); diff --git a/src/melee/gm/gm_19EF.c b/src/melee/gm/gm_19EF.c index 79c50b2e74..e5c6e1cf11 100644 --- a/src/melee/gm/gm_19EF.c +++ b/src/melee/gm/gm_19EF.c @@ -610,7 +610,7 @@ void fn_8019F9C4(u32 arg0) } } -void gm_801A0A10_OnEnter(void* arg0_) +void gm_Scene_GOver_OnEnter(void* arg0_) { DebugGameOverData* arg0 = arg0_; @@ -638,7 +638,7 @@ void gm_801A0A10_OnEnter(void* arg0_) fn_8019F9C4(arg0->ckind); } -void gm_801A0B18_OnLeave(void* arg0_) +void gm_Scene_GOver_OnExit(void* arg0_) { DebugGameOverData* arg0 = arg0_; arg0->x4 = lbl_80479A98.x8; @@ -670,7 +670,7 @@ static void fn_801A0B60(HSD_GObj* gobj) } } -void gm_801A0C6C_OnEnter(void* unused) +void gm_Scene_ComingSoon_OnEnter(void* unused) { SceneDesc* sp10; HSD_GObj* temp_r30; @@ -706,7 +706,7 @@ void gm_801A0C6C_OnEnter(void* unused) lb_80011E24(temp_r3, &lbl_804D66F4, 1, -1); } -void gm_801A0E0C_OnLeave(void* unused) +void gm_Scene_ComingSoon_OnExit(void* unused) { lbArchive_80016EFC(lbl_804D66F0); lbAudioAx_800236DC(); diff --git a/src/melee/gm/gm_19EF.h b/src/melee/gm/gm_19EF.h index 19f746fd72..8840dd8c4b 100644 --- a/src/melee/gm/gm_19EF.h +++ b/src/melee/gm/gm_19EF.h @@ -4,10 +4,10 @@ #include /* 19F9C4 */ void fn_8019F9C4(u32); -/* 1A0A10 */ void gm_801A0A10_OnEnter(void*); -/* 1A0B18 */ void gm_801A0B18_OnLeave(void*); +/* 1A0A10 */ void gm_Scene_GOver_OnEnter(void*); +/* 1A0B18 */ void gm_Scene_GOver_OnExit(void*); -/* 1A0C6C */ void gm_801A0C6C_OnEnter(void*); -/* 1A0E0C */ void gm_801A0E0C_OnLeave(void*); +/* 1A0C6C */ void gm_Scene_ComingSoon_OnEnter(void*); +/* 1A0E0C */ void gm_Scene_ComingSoon_OnExit(void*); #endif diff --git a/src/melee/gm/gm_1A33.c b/src/melee/gm/gm_1A33.c index f97634aec8..91d0a10efa 100644 --- a/src/melee/gm/gm_1A33.c +++ b/src/melee/gm/gm_1A33.c @@ -61,7 +61,7 @@ void gmCamera_801A33BC(void) } } -void gmCamera_801A34FC_OnFrame(void) +void gm_Scene_CameraVs_OnFrame(void) { CameraVsData* data; s32 i; @@ -96,7 +96,7 @@ void gmCamera_801A34FC_OnFrame(void) } } -void gmCamera_801A3634_OnEnter(void* arg0) +void gm_Scene_CameraVs_OnEnter(void* arg0) { u32* state = arg0; @@ -112,4 +112,4 @@ void gmCamera_801A3634_OnEnter(void* arg0) gmCamera_801A33BC(); } -void gmCamera_801A367C_OnLeave(UNK_T unused) {} +void gm_Scene_CameraVs_OnExit(UNK_T unused) {} diff --git a/src/melee/gm/gm_1A33.h b/src/melee/gm/gm_1A33.h index d950789e2a..6310a03cd3 100644 --- a/src/melee/gm/gm_1A33.h +++ b/src/melee/gm/gm_1A33.h @@ -4,8 +4,8 @@ #include /* 1A33BC */ void gmCamera_801A33BC(void); -/* 1A34FC */ void gmCamera_801A34FC_OnFrame(void); -/* 1A3634 */ void gmCamera_801A3634_OnEnter(UNK_T); -/* 1A367C */ void gmCamera_801A367C_OnLeave(UNK_T); +/* 1A34FC */ void gm_Scene_CameraVs_OnFrame(void); +/* 1A3634 */ void gm_Scene_CameraVs_OnEnter(UNK_T); +/* 1A367C */ void gm_Scene_CameraVs_OnExit(UNK_T); #endif diff --git a/src/melee/gm/gm_1A36.c b/src/melee/gm/gm_1A36.c index 1a7b4f1edb..55ec9af1b4 100644 --- a/src/melee/gm/gm_1A36.c +++ b/src/melee/gm/gm_1A36.c @@ -165,7 +165,7 @@ void gm_801A3E88(void) void gm_801A3EF4(void) { GameMode* scene; - for (scene = gm_GetAllGameModes(); scene->idx != GM_COUNT; scene++) { + for (scene = gm_GetAllGameModes(); scene->kind != GM_COUNT; scene++) { if (scene->on_init != NULL) { scene->on_init(); } diff --git a/src/melee/gm/gm_1A3F.c b/src/melee/gm/gm_1A3F.c index 8cf38685f9..2f76069da0 100644 --- a/src/melee/gm/gm_1A3F.c +++ b/src/melee/gm/gm_1A3F.c @@ -1,39 +1,59 @@ #include "gm_1A3F.h" +#include "gm_1A36.h" #include "gm_1A45.h" #include "gmmain_lib.h" +#include "gmscdata.h" +#include "types.h" #include "db/db.h" -#include "gm/gm_1A36.h" -#include "gm/gmscdata.h" +#include "lb/lb_00B0.h" #include "lb/lbaudio_ax.h" +#include "lb/lbcardgame.h" +#include "lb/lbcardnew.h" #include "lb/lbdvd.h" #include "lb/lbheap.h" #include "lb/lbmthp.h" #include "lb/lbsnap.h" #include "lb/types.h" #include "ty/toy.h" +#include "ty/tydisplay.h" #include #include #include #include #include -#include -#include -#include -#include -#include -/* 1A3F48 */ static void gm_801A3F48(GameScene*); -/* 479D30 */ static GameState gm_80479D30; - -void gm_801A3F48(GameScene* scene) +struct routingInfo { + u8 curr_mode; ///< ::GameModeKind + u8 pending_mode; ///< ::GameModeKind + u8 prev_mode; ///< ::GameModeKind + u8 curr_state_id; ///< from ::GameModeState::id + u8 prev_state_id; + u8 next_state_id; +}; +ASSERT_SIZE(struct routingInfo, 0x6); + +struct stateMachine { + struct routingInfo routing; + struct routingInfo backup_routing; + u8 pending_mode_change; ///< ::bool + u8 (*get_override)(void); +}; +ASSERT_SIZE(struct stateMachine, 0x14); + +/* 1A3F48 */ static void preloadState(GameModeState*); +/* 1A4014 */ static void gm_801A4014(GameMode*); +/* 1A43A0 */ static u8 runGameMode(u8 mode); +/* 479D30 */ static struct stateMachine state_machine; + +void preloadState(GameModeState* state) { - PreloadCacheScene* temp_r31; + PreloadedGameModeState* preloaded_state; - lbDvd_80018CF4(scene->preload); - switch (scene->info.scene_id) { + lbDvd_80018CF4(state->preload); + switch (state->info.scene_kind) { case GS_STAFFROLL: case GS_RESULTS: HSD_SisLib_803A6048(0xC000); @@ -45,12 +65,12 @@ void gm_801A3F48(GameScene* scene) HSD_SisLib_803A6048(0x4800); break; } - temp_r31 = lbDvd_GetPreloadCacheScene(); + preloaded_state = lbDvd_GetPreloadCacheScene(); if (lbHeap_80015BB8(2) == 0) { - temp_r31->is_heap_persistent[0] = true; + preloaded_state->is_heap_persistent[0] = true; } if (lbHeap_80015BB8(3) == 0) { - temp_r31->is_heap_persistent[1] = true; + preloaded_state->is_heap_persistent[1] = true; } lbDvd_80018254(); lb_8001C5A4(); @@ -60,45 +80,45 @@ void gm_801A3F48(GameScene* scene) tyDisplay_8031C8B8(); } -static inline u8 firstScene(GameScene* scene, u8 sentinel) +static inline u8 firstState(GameModeState* state, u8 next_id) { - for (; scene->idx != 0xFF; scene++) { + for (; state->id != (u8) -1; state++) { do { - if (scene->idx == sentinel) { + if (state->id == next_id) { break; } } while (0); - return scene->idx; + return state->id; } return 0; } -static inline u8 nextScene(GameScene* scenes) +static inline u8 nextState(GameModeState* states) { - GameScene* it = scenes; - u8 current = gm_80479D30.routing.curr_scene_idx; + GameModeState* next = states; + u8 curr_id = state_machine.routing.curr_state_id; int i; - u8 next_scene; - GameScene* cur = scenes; + u8 next_id; + GameModeState* cur = states; - for (i = 0; (next_scene = it->idx) != 0xFF; i++) { - if (cur->idx > current) { - return scenes[i].idx; + for (i = 0; (next_id = next->id) != (u8) -1; i++) { + if (cur->id > curr_id) { + return states[i].id; } cur++; - it++; + next++; } - return firstScene(scenes, next_scene); + return firstState(states, next_id); } -static inline GameScene* findScene(GameScene* scene) +static inline GameModeState* findState(GameModeState* state) { int i, j; - for (i = gm_80479D30.routing.curr_scene_idx; i < 0xFF; i++) { - for (j = 0; scene[j].idx != 0xFF; j++) { - if (i == scene[j].idx) { - return &scene[j]; + for (i = state_machine.routing.curr_state_id; i < U8_MAX; i++) { + for (j = 0; state[j].id != (u8) -1; j++) { + if (i == state[j].id) { + return &state[j]; } } } @@ -107,67 +127,63 @@ static inline GameScene* findScene(GameScene* scene) void gm_801A4014(GameMode* mode) { - GameSceneHandler* handler; GameScene* scene; - GameState* gm; + GameModeState* state; + struct stateMachine* sm; struct GameSceneInfo* info; - u32 dead; - u32 unused[2]; - - gm = &gm_80479D30; - - scene = findScene(mode->scenes); + u32 dead; ///< @todo regswap hack + PAD_STACK(2 * 4); - gm->routing.curr_scene_idx = scene->idx; + sm = &state_machine; + state = findState(mode->states); + sm->routing.curr_state_id = state->id; - gm_801A3F48(scene); - if (scene->on_enter != NULL) { - scene->on_enter(scene); + preloadState(state); + if (state->on_enter != NULL) { + state->on_enter(state); } - info = &scene->info; - handler = (GameSceneHandler*) ((uintptr_t) gm_FindGameSceneHandler( - info->scene_id) | - (dead = 0)); + info = &state->info; + scene = + (GameScene*) ((uintptr_t) gm_FindGameSceneHandler(info->scene_kind) | + (dead = 0)); gm_801A4BD4(); gm_801A4B88(info); - if (handler->on_load != NULL) { - handler->on_load(info->load_data); + if (scene->on_enter != NULL) { + scene->on_enter(info->enter_data); } - gm_801A4D34(handler->on_frame, info); - if (!gmMainLib_8046B0F0.resetting && handler->on_leave != NULL) { - handler->on_leave(info->leave_data); + gm_801A4D34(scene->on_frame, info); + if (!gmMainLib_8046B0F0.resetting && scene->on_exit != NULL) { + scene->on_exit(info->exit_data); } if (!gmMainLib_8046B0F0.resetting) { - if (scene->on_exit != NULL) { - scene->on_exit(scene); + if (state->on_exit != NULL) { + state->on_exit(state); } - gm_80479D30.routing.prev_scene_idx = gm->routing.curr_scene_idx; + state_machine.routing.prev_state_id = sm->routing.curr_state_id; - if (gm->routing.pending_scene_idx) { - gm->routing.curr_scene_idx = gm->routing.pending_scene_idx - 1; - gm->routing.pending_scene_idx = 0; + if (sm->routing.next_state_id) { + sm->routing.curr_state_id = sm->routing.next_state_id - 1; + sm->routing.next_state_id = 0; } else { - gm->routing.curr_scene_idx = nextScene(mode->scenes); + sm->routing.curr_state_id = nextState(mode->states); } } lb_8001CDB4(); - lb_8001B760(0xB); + lb_8001B760(11); lbMthp_8001F800(); if (gmMainLib_8046B0F0.resetting) { lbAudioAx_80027DBC(); HSD_PadReset(); - while (lb_8001B6F8() == 0xB) - ; + while (lb_8001B6F8() == 11); if (DVDCheckDisk() == 0) { OSResetSystem(1, 0, 0); } lbMthp_8001F800(); - while (HSD_DevComIsBusy(1)) - ; + while (HSD_DevComIsBusy(1)); gmMainLib_8015FBA4(); gm_GetAllGameModes(); - memzero(&gm_80479D30, sizeof(gm_80479D30)); + memzero(&state_machine, sizeof(state_machine)); gm_801A3EF4(); gmMainLib_8046B0F0.skip_intro = true; gm_ChangeGameModeAfterCurrentScene(GM_BOOT); @@ -175,67 +191,67 @@ void gm_801A4014(GameMode* mode) } } -void* gm_GetGameSceneLoadData(GameScene* scene) +void* gm_GetGameSceneLoadData(GameModeState* scene) { - return scene->info.load_data; + return scene->info.enter_data; } -void* gm_GetGameSceneLeaveData(GameScene* scene) +void* gm_GetGameSceneLeaveData(GameModeState* state) { - return scene->info.leave_data; + return state->info.exit_data; } void gm_SetSceneIndex(u8 arg0) { - gm_80479D30.routing.curr_scene_idx = arg0; - gm_80479D30.routing.prev_scene_idx = arg0; + state_machine.routing.curr_state_id = arg0; + state_machine.routing.prev_state_id = arg0; } /// @note Actually sets the pending scene to the scene following the input -void gm_SetPendingSceneIndex(u8 pending_scene) +void gm_SetPendingSceneIndex(u8 next_scene) { - gm_80479D30.routing.pending_scene_idx = pending_scene + 1; + state_machine.routing.next_state_id = next_scene + 1; } u8 gm_GetPreviousSceneIndex(void) { - return gm_80479D30.routing.prev_scene_idx; + return state_machine.routing.prev_state_id; } u8 gm_GetCurrentSceneIndex(void) { - return gm_80479D30.routing.curr_scene_idx; + return state_machine.routing.curr_state_id; } void gm_SetNewGameModePending(void) { - gm_80479D30.pending = 1; + state_machine.pending_mode_change = true; } -void gm_SetPendingGameMode(s8 pending_mode) +void gm_SetPendingGameMode(u8 pending_mode) { - gm_80479D30.routing.pending_mode = pending_mode; + state_machine.routing.pending_mode = pending_mode; } void gm_ChangeGameModeAfterCurrentScene(int pending_mode) { - gm_80479D30.routing.pending_mode = pending_mode; - gm_80479D30.pending = 1; + state_machine.routing.pending_mode = pending_mode; + state_machine.pending_mode_change = true; } u8 gm_GetCurrentGameMode(void) { - return gm_80479D30.routing.curr_mode; + return state_machine.routing.curr_mode; } u8 gm_GetPreviousGameMode(void) { - return gm_80479D30.routing.prev_mode; + return state_machine.routing.prev_mode; } void gm_SetGameModeOverride(u8 (*mode)(void)) { - gm_80479D30.game_mode_override = mode; + state_machine.get_override = mode; } bool gm_Is1PMode(u8 mode) @@ -259,50 +275,47 @@ bool gm_Is1PMode(u8 mode) return false; } -static inline GameMode* findMode(u8 idx) +static inline GameMode* findMode(u8 kind) { GameMode* cur; - for (cur = gm_GetAllGameModes(); cur->idx != GM_COUNT; cur++) { - if (cur->idx == idx) { + for (cur = gm_GetAllGameModes(); cur->kind != GM_COUNT; cur++) { + if (cur->kind == kind) { return cur; } } return NULL; } -u8 gm_RunGameMode(u8 mode_kind) +u8 runGameMode(u8 mode_kind) { - u8 temp_r3; + u8 override; GameMode* mode; - GameMode* var_r3_2; - GameState* gamestate = &gm_80479D30; - u64 unused; + struct stateMachine* sm = &state_machine; + PAD_STACK(2 * 4); mode = findMode(mode_kind); - gm_80479D30.pending = 0; - gm_80479D30.routing.curr_scene_idx = 0; - gm_80479D30.routing.prev_scene_idx = 0; - gm_80479D30.routing.pending_scene_idx = 0; - lbDvd_80018F58(mode->preload); + state_machine.pending_mode_change = false; + state_machine.routing.curr_state_id = 0; + state_machine.routing.prev_state_id = 0; + state_machine.routing.next_state_id = 0; + lbDvd_80018F58(mode->preloaded); if (mode->on_load != NULL) { mode->on_load(); } - while (!gamestate->pending) { - if (gm_80479D30.game_mode_override != NULL && - (temp_r3 = gm_80479D30.game_mode_override(), temp_r3 != GM_COUNT)) + while (!sm->pending_mode_change) { + if (state_machine.get_override != NULL && + (override = state_machine.get_override(), override != GM_COUNT)) { - gm_80479D30.backup = gm_80479D30.routing; - gamestate->pending = 0; - gamestate->routing.curr_scene_idx = 0; - gamestate->routing.prev_scene_idx = 0; - gamestate->routing.pending_scene_idx = 0; - - var_r3_2 = findMode(temp_r3); + state_machine.backup_routing = state_machine.routing; + sm->pending_mode_change = false; + sm->routing.curr_state_id = 0; + sm->routing.prev_state_id = 0; + sm->routing.next_state_id = 0; - gm_801A4014(var_r3_2); + gm_801A4014(findMode(override)); if (!gmMainLib_8046B0F0.resetting) { - gm_80479D30.routing = gm_80479D30.backup; + state_machine.routing = state_machine.backup_routing; } } else { gm_801A4014(mode); @@ -311,21 +324,21 @@ u8 gm_RunGameMode(u8 mode_kind) if (!gmMainLib_8046B0F0.resetting && mode->on_unload != NULL) { mode->on_unload(); } - return gm_80479D30.routing.pending_mode; + return state_machine.routing.pending_mode; } /// UnclePunch: Scene_Main void gm_801A4510(void) { - u32 unused; GameMode* modes; - GameState* gamestate = &gm_80479D30; + struct stateMachine* gamestate = &state_machine; int i; + PAD_STACK(2 * 4); gm_GetAllGameModes(); - memzero(&gm_80479D30, sizeof(GameState)); + memzero(&state_machine, sizeof(struct stateMachine)); modes = gm_GetAllGameModes(); - for (i = 0; modes[i].idx != GM_COUNT; i++) { + for (i = 0; modes[i].kind != GM_COUNT; i++) { if (modes[i].on_init != NULL) { modes[i].on_init(); } @@ -333,14 +346,14 @@ void gm_801A4510(void) if (VIGetDTVStatus() != 0 && (db_gameLaunchButtonState & HSD_PAD_B || OSGetProgressiveMode() == 1)) { - gm_80479D30.routing.curr_mode = GM_PROGRESSIVE_SCAN; + state_machine.routing.curr_mode = GM_PROGRESSIVE_SCAN; } else { - gm_80479D30.routing.curr_mode = GM_BOOT; + state_machine.routing.curr_mode = GM_BOOT; } - gm_80479D30.routing.prev_mode = GM_COUNT; + state_machine.routing.prev_mode = GM_COUNT; while (true) { - u8 next_mode = gm_RunGameMode(gm_80479D30.routing.curr_mode); + u8 next_mode = runGameMode(state_machine.routing.curr_mode); if (gmMainLib_8046B0F0.resetting) { gmMainLib_8046B0F0.resetting = false; } diff --git a/src/melee/gm/gm_1A3F.dox b/src/melee/gm/gm_1A3F.dox index e62ac6a3f2..7a619d2c2c 100644 --- a/src/melee/gm/gm_1A3F.dox +++ b/src/melee/gm/gm_1A3F.dox @@ -2,22 +2,22 @@ * @brief Runs one game-mode scene transition and invokes the run loop for a * given scene * - * Finds the current #GameScene in @p mode, runs its @c Prep handler, loads + * Finds the current #GameModeState in @p mode, runs its @c Prep handler, loads * the scene via #gm_FindGameSceneHandler / #gm_801A4D34, then advances * #GameRouting::curr_scene_idx when the scene loop exits. */ /* 1A4014 */ void gm_801A4014(GameMode* mode); -/* 1A427C */ void* gm_GetGameSceneLoadData(GameScene*); -/* 1A4284 */ void* gm_GetGameSceneLeaveData(GameScene*); +/* 1A427C */ void* gm_GetGameSceneLoadData(GameModeState*); +/* 1A4284 */ void* gm_GetGameSceneLeaveData(GameModeState*); /** * @brief Sets the scene index for both the current and previous scene. * * Sets #GameRouting::curr_scene_idx and #GameRouting::prev_scene_idx on - * #gm_80479D30. + * #state_machine. * - * See docs related to #GameScene. + * See docs related to #GameModeState. * * @param arg0 The index of the scene to use. Not to be confused with the scene * class_id, which is defined as a GameSceneKind. @@ -27,9 +27,9 @@ /** * @brief Sets the scene index for the pending scene * - * Sets #GameRouting::pending_scene_idx on #gm_80479D30 to @c arg0 + 1 + * Sets #GameRouting::pending_scene_idx on #state_machine to @c arg0 + 1 * - * See docs related to #GameScene. + * See docs related to #GameModeState. * * @param arg0 The scene index of the scene preceding the desired pending * scene. The method adds +1 to the input. Not to be confused with the scene @@ -41,7 +41,7 @@ /* 1A42C4 */ u8 gm_GetCurrentSceneIndex(void); /** - * @brief Sets #gm_80479D30's #GameState::pending value to @c true (1). + * @brief Sets #state_machine's #GameState::pending value to @c true (1). * Signaling that the game mode should change after the current scene exits. * * See also: ::gm_ChangeGameModeAfterCurrentScene, ::gm_SetPendingGameMode, @@ -50,10 +50,10 @@ /* 1A42D4 */ void gm_SetNewGameModePending(void); /** - * @brief Sets #GameRouting::pending_mode on #gm_80479D30 to @c pending_mode + * @brief Sets #GameRouting::pending_mode on #state_machine to @c pending_mode * for use after the current mode exits. * - * Sets the #gm_80479D30 #GameRouting::pending_mode to the provided value. + * Sets the #state_machine #GameRouting::pending_mode to the provided value. * The @c pending_mode is read when ::gm_RunGameMode exits, ultimately passing * the * @c pending_mode on to the next invocation of ::gm_RunGameMode. @@ -72,10 +72,10 @@ /** * @brief Sets #GameRouting::pending_mode and #GameState::pending on - * #gm_80479D30 to @c pending_mode and @c true (1) for use after the current + * #state_machine to @c pending_mode and @c true (1) for use after the current * scene exits, * - * Sets the #gm_80479D30 #GameRouting::pending_mode to the provided + * Sets the #state_machine #GameRouting::pending_mode to the provided * value, setting #GameState::pending to true (1) in the process. * The @c pending_mode is read when ::gm_RunGameMode exits, ultimately passing * the diff --git a/src/melee/gm/gm_1A3F.h b/src/melee/gm/gm_1A3F.h index 04446c2005..43adfa8e83 100644 --- a/src/melee/gm/gm_1A3F.h +++ b/src/melee/gm/gm_1A3F.h @@ -3,21 +3,19 @@ #include -/* 1A4014 */ void gm_801A4014(GameMode*); -/* 1A427C */ void* gm_GetGameSceneLoadData(GameScene*); -/* 1A4284 */ void* gm_GetGameSceneLeaveData(GameScene*); -/* 1A428C */ void gm_SetSceneIndex(u8 arg0); +/* 1A427C */ void* gm_GetGameSceneLoadData(GameModeState*); +/* 1A4284 */ void* gm_GetGameSceneLeaveData(GameModeState*); +/* 1A428C */ void gm_SetSceneIndex(u8 idx); /* 1A42A0 */ void gm_SetPendingSceneIndex(u8 pending_scene); /* 1A42B4 */ u8 gm_GetPreviousSceneIndex(void); /* 1A42C4 */ u8 gm_GetCurrentSceneIndex(void); /* 1A42D4 */ void gm_SetNewGameModePending(void); -/* 1A42E8 */ void gm_SetPendingGameMode(s8 pending_mode); +/* 1A42E8 */ void gm_SetPendingGameMode(u8 pending_mode); /* 1A42F8 */ void gm_ChangeGameModeAfterCurrentScene(int pending_mode); /* 1A4310 */ u8 gm_GetCurrentGameMode(void); /* 1A4320 */ u8 gm_GetPreviousGameMode(void); /* 1A4330 */ void gm_SetGameModeOverride(u8 (*)(void)); /* 1A4340 */ bool gm_Is1PMode(u8 mode); -/* 1A43A0 */ u8 gm_RunGameMode(u8 mode); /* 1A4510 */ void gm_801A4510(void); #endif diff --git a/src/melee/gm/gm_1A45.c b/src/melee/gm/gm_1A45.c index 88df00a479..ce3cb40dd9 100644 --- a/src/melee/gm/gm_1A45.c +++ b/src/melee/gm/gm_1A45.c @@ -189,13 +189,13 @@ void gm_801A4B88(struct GameSceneInfo* info) /// @brief returns a pointer to the current scenes enter data void* gm_GetCurrentSceneEnterData(void) { - return gm_804D6720->load_data; + return gm_804D6720->enter_data; } /// @brief returns a pointer to the current scenes exit data void* gm_GetCurrentSceneExitData(void) { - return gm_804D6720->leave_data; + return gm_804D6720->exit_data; } u32 gm_801A4BA8(void) @@ -244,12 +244,11 @@ void gm_801A4BD4(void) lb_80014534(); } -GameSceneHandler* gm_FindGameSceneHandler(u8 kind) +GameScene* gm_FindGameSceneHandler(u8 kind) { - GameSceneHandler* cur; - for (cur = gm_GetAllGameSceneHandlers(); cur->class_id != GS_COUNT; cur++) - { - if (cur->class_id == kind) { + GameScene* cur; + for (cur = gm_GetAllGameScenes(); cur->kind != GS_COUNT; cur++) { + if (cur->kind == kind) { return cur; } } @@ -266,7 +265,7 @@ static inline u64 maybe_gm_801A48A4(u8 i) } } -void gm_801A4D34(void (*on_frame)(void), GameSceneInfo* arg1) +void gm_801A4D34(void (*on_frame)(void), UNUSED GameSceneInfo* info) { int pad_queue_count; int i; @@ -313,7 +312,7 @@ void gm_801A4D34(void (*on_frame)(void), GameSceneInfo* arg1) if (lb_80019A30(0)) { gm_EvaluateAllControllerInputs(); } - if (lb_80019A30(0) && (on_frame != NULL)) { + if (lb_80019A30(0) && on_frame != NULL) { on_frame(); } } diff --git a/src/melee/gm/gm_1A45.dox b/src/melee/gm/gm_1A45.dox index 7819269dc5..77b6d3ccc6 100644 --- a/src/melee/gm/gm_1A45.dox +++ b/src/melee/gm/gm_1A45.dox @@ -23,17 +23,17 @@ /* 1A4BD4 */ void gm_801A4BD4(void); /** - * @brief Finds the #GameSceneHandler for a given scene kind. + * @brief Finds the #GameScene for a given scene kind. * - * Walks the global #GameSceneHandler table (from #gm_GetAllGameSceneHandlers) - * comparing each entry's #GameSceneHandler::class_id against @p kind until a + * Walks the global #GameScene table (from #gm_GetAllGameScenes) + * comparing each entry's #GameScene::class_id against @p kind until a * match is found or the @c GS_COUNT value is reached. * * @param kind The #GameSceneKind (passed as a @c u8) to look up. - * @returns The #GameSceneHandler whose #GameSceneHandler::class_id equals + * @returns The #GameScene whose #GameScene::class_id equals */ @p kind, or @c NULL if no entry matches. - /* 1A4CE0 */ GameSceneHandler * + /* 1A4CE0 */ GameScene * gm_FindGameSceneHandler(u8 kind); /** diff --git a/src/melee/gm/gm_1A45.h b/src/melee/gm/gm_1A45.h index 99c0919e91..40b259162f 100644 --- a/src/melee/gm/gm_1A45.h +++ b/src/melee/gm/gm_1A45.h @@ -29,8 +29,8 @@ /* 1A4BC8 */ HSD_GObj* gm_801A4BC8(void); /* 1A4BD0 */ void fn_801A4BD0(HSD_GObj*); /* 1A4BD4 */ void gm_801A4BD4(void); -/* 1A4CE0 */ GameSceneHandler* gm_FindGameSceneHandler(u8 id); -/* 1A4D34 */ void gm_801A4D34(void (*on_frame)(void), struct GameSceneInfo*); +/* 1A4CE0 */ GameScene* gm_FindGameSceneHandler(u8 id); +/* 1A4D34 */ void gm_801A4D34(void (*on_frame)(void), GameSceneInfo*); /* 4D6724 */ extern void (*gm_804D6724)(void); diff --git a/src/melee/gm/gm_1A7A.h b/src/melee/gm/gm_1A7A.h index f506f65900..11e066c4d6 100644 --- a/src/melee/gm/gm_1A7A.h +++ b/src/melee/gm/gm_1A7A.h @@ -20,7 +20,7 @@ /* 1A9498 */ void fn_801A9498(HSD_GObj*); /* 1A94BC */ void fn_801A94BC(HSD_GObj*); /* 1A9630 */ void gm_801A9630(void); -/* 1A9B30 */ void gm_801A9B30_OnEnter(UNK_T); -/* 1A9D0C */ void gm_801A9D0C_OnFrame(void); +/* 1A9B30 */ void gm_Scene_Congrats_OnEnter(UNK_T); +/* 1A9D0C */ void gm_Scene_Congrats_OnFrame(void); #endif diff --git a/src/melee/gm/gm_1A9B.c b/src/melee/gm/gm_1A9B.c index eaa35edf1c..cd391955a8 100644 --- a/src/melee/gm/gm_1A9B.c +++ b/src/melee/gm/gm_1A9B.c @@ -2,7 +2,7 @@ /// Game-over "Regend" ending THP playback scene (OnEnter/OnFrame pair). /// /// This TU is split from gmregenddisp.c: the retail object anchors the THP -/// table loads in gm_801A9B30_OnEnter at the first table literal +/// table loads in gm_Scene_Congrats_OnEnter at the first table literal /// (gm_803DB640, displacements 0x278/0x5B4/0x8D0), i.e. at this TU's own /// .data+0. MWCC 1.2.5n always places its merged-data anchor (..data.N) at /// the object's .data start, so these tables cannot share a TU with the @@ -82,7 +82,7 @@ static char* gmRegend_AllstarThpFiles[] = { "GmRegendAllstarPichu.thp", "GmRegendAllstarGanon.thp", }; -void gm_801A9B30_OnEnter(UNK_T unused) +void gm_Scene_Congrats_OnEnter(UNK_T unused) { HSD_SObj* thp_disp; s32 ckind; @@ -144,7 +144,7 @@ void gm_801A9B30_OnEnter(UNK_T unused) } } -void gm_801A9D0C_OnFrame(void) +void gm_Scene_Congrats_OnFrame(void) { if (gmRegend_InputDelayTimer != 0) { gmRegend_InputDelayTimer--; diff --git a/src/melee/gm/gm_1AED.c b/src/melee/gm/gm_1AED.c index 4e0d64ccc3..0856d00057 100644 --- a/src/melee/gm/gm_1AED.c +++ b/src/melee/gm/gm_1AED.c @@ -242,7 +242,7 @@ void gm_801AF250(void) } } -void gm_801AF568_OnFrame(void) +void gm_Scene_MemCard_OnFrame(void) { int temp_r29; u8 _[0x14]; @@ -447,7 +447,7 @@ static inline bool checkUnk0(void) return true; } -void gm_801B0264_OnEnter(void* user_data) +void gm_Scene_MemCard_OnEnter(void* user_data) { struct enterData* data = user_data; @@ -464,7 +464,7 @@ void gm_801B0264_OnEnter(void* user_data) gm_804D6872 = 6; } -void gm_801B0304_OnLeave(void* user_data) +void gm_Scene_MemCard_OnExit(void* user_data) { struct leaveData* data = user_data; if (data != NULL) { diff --git a/src/melee/gm/gm_1AED.h b/src/melee/gm/gm_1AED.h index 260fadc8c3..f1c9acc645 100644 --- a/src/melee/gm/gm_1AED.h +++ b/src/melee/gm/gm_1AED.h @@ -1,8 +1,8 @@ #ifndef MELEE_GM_1AED_H #define MELEE_GM_1AED_H -/* 1AF568 */ void gm_801AF568_OnFrame(void); -/* 1B0264 */ void gm_801B0264_OnEnter(void*); -/* 1B0304 */ void gm_801B0304_OnLeave(void*); +/* 1AF568 */ void gm_Scene_MemCard_OnFrame(void); +/* 1B0264 */ void gm_Scene_MemCard_OnEnter(void*); +/* 1B0304 */ void gm_Scene_MemCard_OnExit(void*); #endif diff --git a/src/melee/gm/gm_1BFA.c b/src/melee/gm/gm_1BFA.c index 0d794050d8..f611163f79 100644 --- a/src/melee/gm/gm_1BFA.c +++ b/src/melee/gm/gm_1BFA.c @@ -18,7 +18,7 @@ extern UNK_T gm_804D6860[]; extern StartMeleeData gm_80480530; extern MatchExitInfo gm_80479D98; -GameScene gm_803DFE48_Scenes[] = { +GameModeState gm_Mode_ChallengerApproach_States[] = { { 0, 2, @@ -58,7 +58,7 @@ GameScene gm_803DFE48_Scenes[] = { { -1 }, }; -void gm_801BFA6C(GameScene* arg0) +void gm_801BFA6C(GameModeState* arg0) { lbl_8046DBD8_t* temp_r3; VsApproachData* temp_r31; @@ -72,7 +72,7 @@ void gm_801BFA6C(GameScene* arg0) lb_8001CE00(); } -void gm_801BFABC(GameScene* arg0) +void gm_801BFABC(GameModeState* arg0) { lbl_8046DBD8_t* temp_r31; StartMeleeData* temp_r30; @@ -97,7 +97,7 @@ void gm_801BFABC(GameScene* arg0) gm_8016F088(temp_r30); } -void gm_801BFBA8(GameScene* arg0) +void gm_801BFBA8(GameModeState* arg0) { lbl_8046DBD8_t* temp_r31; u8 temp_r0; @@ -153,7 +153,7 @@ static UNK_T* gm_801BFC60(u32 arg0, s32 arg1, u32 arg2, u32 arg3, UNK_T* arg4) static u8 gm_8049E558[0x170]; -void gm_801BFCFC(GameScene* arg0) +void gm_801BFCFC(GameModeState* arg0) { u8* var_r28; u32* temp_r29_2; @@ -248,7 +248,7 @@ void gm_801BFCFC(GameScene* arg0) lb_8001CE00(); } -void gm_801BFF7C(GameScene* arg0) +void gm_801BFF7C(GameModeState* arg0) { gm_SetPendingGameMode((s8) gm_GetChallengerData()->x5); gm_SetNewGameModePending(); diff --git a/src/melee/gm/gm_1BFA.h b/src/melee/gm/gm_1BFA.h index 7be9183726..10e9752405 100644 --- a/src/melee/gm/gm_1BFA.h +++ b/src/melee/gm/gm_1BFA.h @@ -3,10 +3,10 @@ #include -/* 1BFA6C */ void gm_801BFA6C(GameScene*); -/* 1BFABC */ void gm_801BFABC(GameScene*); -/* 1BFBA8 */ void gm_801BFBA8(GameScene*); -/* 1BFCFC */ void gm_801BFCFC(GameScene*); -/* 1BFF7C */ void gm_801BFF7C(GameScene*); +/* 1BFA6C */ void gm_801BFA6C(GameModeState*); +/* 1BFABC */ void gm_801BFABC(GameModeState*); +/* 1BFBA8 */ void gm_801BFBA8(GameModeState*); +/* 1BFCFC */ void gm_801BFCFC(GameModeState*); +/* 1BFF7C */ void gm_801BFF7C(GameModeState*); #endif diff --git a/src/melee/gm/gmadventure.c b/src/melee/gm/gmadventure.c index 124313b426..a31f2d8ac6 100644 --- a/src/melee/gm/gmadventure.c +++ b/src/melee/gm/gmadventure.c @@ -54,7 +54,7 @@ enum { ADVENTURE_BACK_TO_CSS = 0x70, }; -GameScene gm_803DE1B8_Scenes[] = { +GameModeState gm_Mode_Adventure_States[] = { { ADVENTURE_INTRO, 2, @@ -1200,7 +1200,7 @@ static inline void setValUnk(int scene_id, bool temp_r30) } } -void gm_801B3F40(GameScene* arg0) +void gm_801B3F40(GameModeState* arg0) { struct gm_803DE650_t* temp_r31; UnkAdventureData* temp_r3; @@ -1210,10 +1210,10 @@ void gm_801B3F40(GameScene* arg0) temp_ret = 0; temp_r30 = gm_GetGameSceneLoadData(arg0); - temp_r31 = gm_8017E4C4(arg0->idx); + temp_r31 = gm_8017E4C4(arg0->id); temp_r3 = gm_GetAdventureData(); - temp_r3->x0.x7 = arg0->idx; - temp_r30->x1 = gm_8017BE84(arg0->idx); + temp_r3->x0.x7 = arg0->id; + temp_r30->x1 = gm_8017BE84(arg0->id); temp_r30->x2 = temp_r31->x6; temp_r30->x0 = temp_r3->x0.slot; temp_ret |= lbAudioAx_80026E84(temp_r3->x0.ckind); @@ -1237,7 +1237,7 @@ void gm_801B3F40(GameScene* arg0) lbAudioAx_80027168(); } -void gm_801B4064(GameScene* arg0) +void gm_801B4064(GameModeState* arg0) { struct gm_803DE650_t* temp_r31; int var_r30; @@ -1249,7 +1249,7 @@ void gm_801B4064(GameScene* arg0) PAD_STACK(8); temp_r28 = gm_GetGameSceneLoadData(arg0); - temp_r31 = gm_8017E4C4(arg0->idx); + temp_r31 = gm_8017E4C4(arg0->id); temp_r27 = gm_GetAdventureData(); if (temp_r31->x4 != 0) { var_r30 = 1; @@ -1262,7 +1262,7 @@ void gm_801B4064(GameScene* arg0) temp_r27->x0.x9 = 0; temp_r27->x0.xB = temp_r31->x8; temp_r27->x0.xA = temp_r31->x9; - tmp = gm_80490910[getIndex(arg0->idx)]; + tmp = gm_80490910[getIndex(arg0->id)]; gm_8017CE34(temp_r28, temp_r27, temp_r31->xA, temp_r31->x4, var_r30, var_r29, temp_r31->x2, temp_r31->x6, gm_8017E48C(arg0), tmp); @@ -1272,31 +1272,31 @@ void gm_801B4064(GameScene* arg0) } } -void gm_801B4170(GameScene* arg0) +void gm_801B4170(GameModeState* arg0) { MatchExitInfo* temp_r28 = gm_GetGameSceneLeaveData(arg0); UnkAdventureData* temp_r31 = gm_GetAdventureData(); - setValUnk(arg0->idx, temp_r28->x8); + setValUnk(arg0->id, temp_r28->x8); if (gm_8017D7AC(temp_r28, &temp_r31->x0, 0x69) && - gm_8017E4C4(arg0->idx)[1].x0 == 0xFF) + gm_8017E4C4(arg0->id)[1].x0 == 0xFF) { gm_8017CBAC(temp_r31, gmMainLib_8015CDD4(), 0x16); } } -void gm_801B4254(GameScene* scene) +void gm_801B4254(GameModeState* scene) { DebugGameOverData* data = gm_GetGameSceneLoadData(scene); gm_8017C9A8(data, &gm_GetAdventureData()->x0, 0); } -void gm_801B4294(GameScene* scene) +void gm_801B4294(GameModeState* scene) { DebugGameOverData* data = gm_GetGameSceneLeaveData(scene); gm_8017CA38(data, &gm_GetAdventureData()->x0, gmMainLib_8015CDD4(), 0); } -void gm_801B42E8(GameScene* scene) +void gm_801B42E8(GameModeState* scene) { CSSData* css = gm_GetGameSceneLoadData(scene); struct gmm_x0_528_t* temp_r31 = gmMainLib_8015CDD4(); @@ -1305,7 +1305,7 @@ void gm_801B42E8(GameScene* scene) gm_GetAdventureData()->x0.slot); } -void gm_801B4350(GameScene* scene) +void gm_801B4350(GameModeState* scene) { CSSData* css = gm_GetGameSceneLeaveData(scene); struct gmm_x0_528_t* temp_r29 = gmMainLib_8015CDD4(); @@ -1326,13 +1326,13 @@ void gm_801B4350(GameScene* scene) gm_80168F88(); } -void gm_801B4408(GameScene* scene) +void gm_801B4408(GameModeState* scene) { gm_SetPendingGameMode(GM_MENU); gm_SetNewGameModePending(); } -void gm_801B4430(GameScene* scene) +void gm_801B4430(GameModeState* scene) { CutsceneData* temp_r30 = gm_GetGameSceneLoadData(scene); struct gmm_x0_528_t* temp_r31 = gmMainLib_8015CDD4(); @@ -1348,12 +1348,12 @@ void gm_801B4430(GameScene* scene) temp_r30->x1 = temp_r31->color; } -void gm_801B44A0(GameScene* scene) +void gm_801B44A0(GameModeState* scene) { MatchExitInfo* temp_r30 = gm_GetGameSceneLeaveData(scene); UnkAdventureData* temp_r29 = gm_GetAdventureData(); - setValUnk(scene->idx, temp_r30->x8); + setValUnk(scene->id, temp_r30->x8); if (gm_8017D7AC(temp_r30, &temp_r29->x0, 0x69)) { /** @@ -1369,7 +1369,7 @@ void gm_801B44A0(GameScene* scene) } } -void gm_801B45A4(GameScene* scene) +void gm_801B45A4(GameModeState* scene) { CutsceneData* temp_r31 = gm_GetGameSceneLoadData(scene); UnkAdventureData* temp_r7 = gm_GetAdventureData(); @@ -1382,7 +1382,7 @@ void gm_801B45A4(GameScene* scene) temp_r31->x3 = colors[1]; } -void gm_801B461C(GameScene* scene) +void gm_801B461C(GameModeState* scene) { gm_801B4064(scene); @@ -1396,12 +1396,12 @@ void gm_801B461C(GameScene* scene) } } -void gm_801B4684(GameScene* scene) +void gm_801B4684(GameModeState* scene) { MatchExitInfo* temp_r29 = gm_GetGameSceneLeaveData(scene); UnkAdventureData* temp_r31 = gm_GetAdventureData(); - setValUnk(scene->idx, temp_r29->x8); + setValUnk(scene->id, temp_r29->x8); if (gm_8017D7AC(temp_r29, &temp_r31->x0, 0x69)) { /// Unlock conditions for Luigi (match completed in under 1 minute) @@ -1413,7 +1413,7 @@ void gm_801B4684(GameScene* scene) } } -void gm_801B4768(GameScene* scene) +void gm_801B4768(GameModeState* scene) { StartMeleeData* data = gm_GetGameSceneLoadData(scene); int i; @@ -1425,7 +1425,7 @@ void gm_801B4768(GameScene* scene) } } -void gm_801B47FC(GameScene* scene) +void gm_801B47FC(GameModeState* scene) { UnkAdventureData* temp_r31; StartMeleeData* temp_r30; @@ -1437,7 +1437,7 @@ void gm_801B47FC(GameScene* scene) temp_r31->x0.x7 = 0x20; } -static inline void gm_801B4860_inline0(GameScene* scene) +static inline void gm_801B4860_inline0(GameModeState* scene) { MatchExitInfo* exit_info = gm_GetGameSceneLeaveData(scene); if (exit_info->match_end.result != OUTCOME_TIMEOUT) { @@ -1448,30 +1448,30 @@ static inline void gm_801B4860_inline0(GameScene* scene) } } -static inline void gm_801B4860_inline1(GameScene* scene) +static inline void gm_801B4860_inline1(GameModeState* scene) { MatchExitInfo* exit_info = gm_GetGameSceneLeaveData(scene); UnkAdventureData* adv_data = gm_GetAdventureData(); - setValUnk(scene->idx, exit_info->x8); + setValUnk(scene->id, exit_info->x8); if (gm_8017D7AC(exit_info, &adv_data->x0, 0x69) && - gm_8017E4C4(scene->idx)[1].x0 == 0xFF) + gm_8017E4C4(scene->id)[1].x0 == 0xFF) { gm_8017CBAC(adv_data, gmMainLib_8015CDD4(), 0x16); } } -void gm_801B4860(GameScene* scene) +void gm_801B4860(GameModeState* scene) { gm_801B4860_inline0(scene); gm_801B4860_inline1(scene); } -static void gm_8016A22C_inline(GameScene* arg0, UnkAdventureData* temp_r29) +static void gm_8016A22C_inline(GameModeState* arg0, UnkAdventureData* temp_r29) { u8 count = gm_8017E48C(arg0); - struct gm_803DE650_t* temp_r25_2 = gm_8017E4C4(arg0->idx); + struct gm_803DE650_t* temp_r25_2 = gm_8017E4C4(arg0->id); gm_8016A22C(temp_r25_2->xA[0], temp_r25_2->xA[1], temp_r25_2->xA[2], temp_r25_2->xD, temp_r25_2->xE, temp_r25_2->xF, 1, 0, 1, temp_r29->x0.ckind, temp_r29->x0.color, @@ -1482,7 +1482,7 @@ static void gm_8016A22C_inline(GameScene* arg0, UnkAdventureData* temp_r29) temp_r29->x0.xC.x11 = 1; } -void gm_801B4974(GameScene* arg0) +void gm_801B4974(GameModeState* arg0) { u8 count; UnkAdventureData* temp_r29; @@ -1507,7 +1507,7 @@ void gm_801B4974(GameScene* arg0) } temp_r25->x0 = var_r4; temp_r25->x1 = temp_r24->color; - temp_r30 = gm_8017E4C4(arg0->idx); + temp_r30 = gm_8017E4C4(arg0->id); temp_r24_2 = gm_80169520(); temp_r31 = gm_80169540(); @@ -1519,7 +1519,7 @@ void gm_801B4974(GameScene* arg0) temp_r28->x6 = temp_r31[temp_r30->x4 - 3]; } -static inline void inline0(GameScene* scene) +static inline void inline0(GameModeState* scene) { UnkAdventureData* adv_data = gm_GetAdventureData(); if (adv_data->x0.xC.x11 != 1) { @@ -1529,18 +1529,18 @@ static inline void inline0(GameScene* scene) } } -void gm_801B4B28(GameScene* scene) +void gm_801B4B28(GameModeState* scene) { inline0(scene); gm_801B4064(scene); } -void gm_801B4C5C(GameScene* scene) +void gm_801B4C5C(GameModeState* scene) { MatchExitInfo* temp_r30 = gm_GetGameSceneLeaveData(scene); UnkAdventureData* temp_r29 = gm_GetAdventureData(); - setValUnk(scene->idx, temp_r30->x8); + setValUnk(scene->id, temp_r30->x8); /// If the player took longer than 30 seconds, skip the Giant Kirby battle. if (gm_8017D7AC(temp_r30, &temp_r29->x0, 0x69) && @@ -1551,10 +1551,10 @@ void gm_801B4C5C(GameScene* scene) } } -void gm_801B4D34(GameScene* scene) +void gm_801B4D34(GameModeState* scene) { UnkAdventureData* temp_r30 = gm_GetAdventureData(); - struct gm_803DE650_t* temp_r31 = gm_8017E4C4(scene->idx); + struct gm_803DE650_t* temp_r31 = gm_8017E4C4(scene->id); /** * If Falco is unlocked, @@ -1567,7 +1567,7 @@ void gm_801B4D34(GameScene* scene) } } -void gm_801B4DAC(GameScene* scene) +void gm_801B4DAC(GameModeState* scene) { UnkAdventureData* temp_r30 = gm_GetAdventureData(); StartMeleeData* data = gm_GetGameSceneLoadData(scene); @@ -1583,7 +1583,7 @@ void gm_801B4DAC(GameScene* scene) } } -void gm_801B4E58(GameScene* scene) +void gm_801B4E58(GameModeState* scene) { StartMeleeData* data; gm_GetAdventureData(); @@ -1593,7 +1593,7 @@ void gm_801B4E58(GameScene* scene) data->rules.xB = 4; } -void gm_801B4EB8(GameScene* scene) +void gm_801B4EB8(GameModeState* scene) { StartMeleeData* data = gm_GetGameSceneLoadData(scene); int i; @@ -1609,7 +1609,7 @@ void gm_801B4EB8(GameScene* scene) } } -void gm_801B4F44(GameScene* scene) +void gm_801B4F44(GameModeState* scene) { StartMeleeData* data = gm_GetGameSceneLoadData(scene); int i; @@ -1622,15 +1622,15 @@ void gm_801B4F44(GameScene* scene) data->rules.x50 = gm_8017E7FC; } -void gm_801B4FCC(GameScene* scene) +void gm_801B4FCC(GameModeState* scene) { MatchExitInfo* temp_r30 = gm_GetGameSceneLeaveData(scene); UnkAdventureData* temp_r29 = gm_GetAdventureData(); - setValUnk(scene->idx, temp_r30->x8); + setValUnk(scene->id, temp_r30->x8); gm_8017D7AC(temp_r30, &temp_r29->x0, 0x69); } -void gm_801B5078(GameScene* scene) +void gm_801B5078(GameModeState* scene) { UnkAdventureData* temp_r3 = gm_GetAdventureData(); if (temp_r3->x77 == 0) { @@ -1638,7 +1638,7 @@ void gm_801B5078(GameScene* scene) } } -void gm_801B50C4(GameScene* scene) +void gm_801B50C4(GameModeState* scene) { MatchExitInfo* temp_r31 = gm_GetGameSceneLeaveData(scene); UnkAdventureData* temp_r30 = gm_GetAdventureData(); @@ -1648,18 +1648,18 @@ void gm_801B50C4(GameScene* scene) temp_r3->x78 = 1; } - setValUnk(scene->idx, temp_r31->x8); + setValUnk(scene->id, temp_r31->x8); gm_8017D7AC(temp_r31, &temp_r30->x0, 0x69); } -void gm_801B518C(GameScene* scene) +void gm_801B518C(GameModeState* scene) { UnkAdventureData* data = gm_GetAdventureData(); gm_8017CBAC(data, gmMainLib_8015CDD4(), 0x16); } -void gm_801B51CC_OnInit(void) +void gm_Mode_Adventure_OnInit(void) { struct gmm_x0_528_t* temp_r3; @@ -1672,7 +1672,7 @@ void gm_801B51CC_OnInit(void) temp_r3->x5 = 0; } -void gm_801B5214_OnLoad(void) +void gm_Mode_Adventure_OnLoad(void) { int i; int j; diff --git a/src/melee/gm/gmadventure.h b/src/melee/gm/gmadventure.h index 9d5599a5b5..efa8a5d6a4 100644 --- a/src/melee/gm/gmadventure.h +++ b/src/melee/gm/gmadventure.h @@ -3,37 +3,37 @@ #include -/* 1B3F40 */ void gm_801B3F40(GameScene*); -/* 1B4064 */ void gm_801B4064(GameScene*); -/* 1B4170 */ void gm_801B4170(GameScene*); -/* 1B4254 */ void gm_801B4254(GameScene*); -/* 1B4294 */ void gm_801B4294(GameScene*); -/* 1B42E8 */ void gm_801B42E8(GameScene*); -/* 1B4350 */ void gm_801B4350(GameScene*); -/* 1B4408 */ void gm_801B4408(GameScene*); -/* 1B4430 */ void gm_801B4430(GameScene*); -/* 1B44A0 */ void gm_801B44A0(GameScene*); -/* 1B45A4 */ void gm_801B45A4(GameScene*); -/* 1B461C */ void gm_801B461C(GameScene*); -/* 1B4684 */ void gm_801B4684(GameScene*); -/* 1B4768 */ void gm_801B4768(GameScene*); -/* 1B47FC */ void gm_801B47FC(GameScene*); -/* 1B4860 */ void gm_801B4860(GameScene*); -/* 1B4974 */ void gm_801B4974(GameScene*); -/* 1B4B28 */ void gm_801B4B28(GameScene*); -/* 1B4C5C */ void gm_801B4C5C(GameScene*); -/* 1B4D34 */ void gm_801B4D34(GameScene*); -/* 1B4DAC */ void gm_801B4DAC(GameScene*); -/* 1B4E58 */ void gm_801B4E58(GameScene*); -/* 1B4EB8 */ void gm_801B4EB8(GameScene*); -/* 1B4F44 */ void gm_801B4F44(GameScene*); -/* 1B4FCC */ void gm_801B4FCC(GameScene*); -/* 1B5078 */ void gm_801B5078(GameScene*); -/* 1B50C4 */ void gm_801B50C4(GameScene*); -/* 1B518C */ void gm_801B518C(GameScene*); -/* 1B51CC */ void gm_801B51CC_OnInit(void); -/* 1B5214 */ void gm_801B5214_OnLoad(void); -/* 3DE1B8 */ extern GameScene gm_803DE1B8_Scenes[49]; +/* 1B3F40 */ void gm_801B3F40(GameModeState*); +/* 1B4064 */ void gm_801B4064(GameModeState*); +/* 1B4170 */ void gm_801B4170(GameModeState*); +/* 1B4254 */ void gm_801B4254(GameModeState*); +/* 1B4294 */ void gm_801B4294(GameModeState*); +/* 1B42E8 */ void gm_801B42E8(GameModeState*); +/* 1B4350 */ void gm_801B4350(GameModeState*); +/* 1B4408 */ void gm_801B4408(GameModeState*); +/* 1B4430 */ void gm_801B4430(GameModeState*); +/* 1B44A0 */ void gm_801B44A0(GameModeState*); +/* 1B45A4 */ void gm_801B45A4(GameModeState*); +/* 1B461C */ void gm_801B461C(GameModeState*); +/* 1B4684 */ void gm_801B4684(GameModeState*); +/* 1B4768 */ void gm_801B4768(GameModeState*); +/* 1B47FC */ void gm_801B47FC(GameModeState*); +/* 1B4860 */ void gm_801B4860(GameModeState*); +/* 1B4974 */ void gm_801B4974(GameModeState*); +/* 1B4B28 */ void gm_801B4B28(GameModeState*); +/* 1B4C5C */ void gm_801B4C5C(GameModeState*); +/* 1B4D34 */ void gm_801B4D34(GameModeState*); +/* 1B4DAC */ void gm_801B4DAC(GameModeState*); +/* 1B4E58 */ void gm_801B4E58(GameModeState*); +/* 1B4EB8 */ void gm_801B4EB8(GameModeState*); +/* 1B4F44 */ void gm_801B4F44(GameModeState*); +/* 1B4FCC */ void gm_801B4FCC(GameModeState*); +/* 1B5078 */ void gm_801B5078(GameModeState*); +/* 1B50C4 */ void gm_801B50C4(GameModeState*); +/* 1B518C */ void gm_801B518C(GameModeState*); +/* 1B51CC */ void gm_Mode_Adventure_OnInit(void); +/* 1B5214 */ void gm_Mode_Adventure_OnLoad(void); +/* 3DE1B8 */ extern GameModeState gm_Mode_Adventure_States[49]; /* 3DE650 */ extern struct gm_803DE650_t gm_803DE650[46]; #endif diff --git a/src/melee/gm/gmallstar.c b/src/melee/gm/gmallstar.c index e51ce221f5..9cb4531e03 100644 --- a/src/melee/gm/gmallstar.c +++ b/src/melee/gm/gmallstar.c @@ -19,7 +19,7 @@ extern DebugGameOverData gmClassic_80470850; extern MatchExitInfo gmClassic_8047086C; extern StartMeleeData gmClassic_80472AF8; -GameScene gm_803DE930_Scenes[] = { +GameModeState gm_Mode_AllStar_States[] = { { 0, 3, @@ -396,7 +396,7 @@ void gm_801B5324(UnkAllstarData* arg0, s32 arg1) s32 i; PAD_STACK(12); - base = (u8*) gm_803DE930_Scenes; + base = (u8*) gm_Mode_AllStar_States; is_last_round = 0; chars_ptr = chars; @@ -409,8 +409,8 @@ void gm_801B5324(UnkAllstarData* arg0, s32 arg1) chars_ptr[1] = 0x21; chars_ptr[2] = 0x21; - count = - ((AllstarRoundInfo*) ((u8*) gm_803DE930_Scenes + 0x31C))[arg1].count; + count = ((AllstarRoundInfo*) ((u8*) gm_Mode_AllStar_States + 0x31C))[arg1] + .count; for (count_processed = 0; count_processed < count; count_processed++) { chars[count_processed] = opp_data[count_processed].x3; } @@ -470,7 +470,7 @@ void gm_801B5324(UnkAllstarData* arg0, s32 arg1) lbAudioAx_80027168(); } -void gm_801B5624(GameScene* arg0) +void gm_801B5624(GameModeState* arg0) { s8 chars[3]; StartMeleeData* data; @@ -483,10 +483,10 @@ void gm_801B5624(GameScene* arg0) u8 color; PAD_STACK(16); - base = (u8*) gm_803DE930_Scenes; + base = (u8*) gm_Mode_AllStar_States; data = gm_GetGameSceneLoadData(arg0); allstar = &gm_80473A18; - round = gm_8017BE84(arg0->idx); + round = gm_8017BE84(arg0->id); { u32 start = ((AllstarRoundInfo*) (base + 0x31C))[round].start; @@ -505,14 +505,14 @@ void gm_801B5624(GameScene* arg0) allstar->x0.xB = 4; allstar->x0.x8 = 0; - round = gm_8017BE84(arg0->idx); + round = gm_8017BE84(arg0->id); { gm_803DEBE8_t* opp = (gm_803DEBE8_t*) (base + 0x2B8) + ((AllstarRoundInfo*) (base + 0x31C))[round].start; color = ((u8*) gm_80490940)[((u32) opp - (u32) (base + 0x2B8)) >> 2]; } - round = gm_8017BE84(arg0->idx); + round = gm_8017BE84(arg0->id); gm_8017CE34(data, (UnkAdventureData*) allstar, chars, 0, 0, 0, 0, (s32) opp_data->x2, (s32) round, (s32) color); @@ -524,13 +524,13 @@ void gm_801B5624(GameScene* arg0) data->rules.x14 = ((s32) allstar->x9C % 60) + 1; data->rules.x20 &= 0xFFFFFFFFFFFBFCFFULL; - if (arg0->idx == 0) { + if (arg0->id == 0) { data->players[0].xC_b1 = 1; } else { data->players[0].xC_b1 = 0; } - if (arg0->idx == 0x60) { + if (arg0->id == 0x60) { u8* cpu_level = &allstar->x0.cpu_level; f32 f31; f32 f30; @@ -551,14 +551,14 @@ void gm_801B5624(GameScene* arg0) data->players[0].x10 = allstar->x74; gm_8016F088(data); - allstar->x0.x7 = arg0->idx; + allstar->x0.x7 = arg0->id; } -void gm_801B59AC(GameScene* arg0) +void gm_801B59AC(GameModeState* arg0) { - u8* base = (u8*) gm_803DE930_Scenes; + u8* base = (u8*) gm_Mode_AllStar_States; MatchExitInfo* exit = gm_GetGameSceneLeaveData(arg0); - u8 idx = arg0->idx; + u8 idx = arg0->id; s32 result = exit->x8; UnkAllstarData* data = &gm_80473A18; u16 round = gm_8017BE84(idx); @@ -573,7 +573,7 @@ void gm_801B59AC(GameScene* arg0) } data->x74 = exit->match_end.player_standings[0].percent; data->x9C += exit->match_end.frame_count; - if (gm_8017D7AC(exit, &data->x0, 0x69) != 0 && arg0->idx == 0x60) { + if (gm_8017D7AC(exit, &data->x0, 0x69) != 0 && arg0->id == 0x60) { gm_8017CBAC((UnkAdventureData*) data, gmMainLib_8015CDE0(), 0x17); } } @@ -583,7 +583,7 @@ void fn_801B5AA8(int arg0) lbBgFlash_8002063C(0x78); } -void gm_801B5ACC(GameScene* arg0) +void gm_801B5ACC(GameModeState* arg0) { u8 operand_pad[8]; s8 chars[3]; @@ -599,12 +599,12 @@ void gm_801B5ACC(GameScene* arg0) chars[0] = 0x21; chars[1] = 0x21; chars[2] = 0x21; - base = (u8*) gm_803DE930_Scenes; + base = (u8*) gm_Mode_AllStar_States; data = gm_GetGameSceneLoadData(arg0); allstar = &gm_80473A18; allstar->x0.x8 |= 0x80; - round = gm_8017BE84(arg0->idx); + round = gm_8017BE84(arg0->id); { gm_803DEBE8_t* opp = (gm_803DEBE8_t*) (base + 0x2B8) + gm_803DEC4C[round].start; @@ -624,7 +624,7 @@ void gm_801B5ACC(GameScene* arg0) data->players[0].xD_b2 = 1; data->rules.x7 = 9; - round = gm_8017BE84(arg0->idx); + round = gm_8017BE84(arg0->id); { AllstarRoundInfo* ri = &gm_803DEC4C[round]; @@ -671,20 +671,20 @@ void gm_801B5ACC(GameScene* arg0) data->rules.x50 = (void (*)(u8))(Event) fn_801B5AA8; } -void gm_801B5E7C(GameScene* arg0) +void gm_801B5E7C(GameModeState* arg0) { MatchExitInfo* exit = gm_GetGameSceneLeaveData(arg0); gm_80473A18.x74 = exit->match_end.player_standings[0].percent; gm_8017D7AC(exit, &gm_80473A18.x0, 0x69); } -void gm_801B5EB4(GameScene* arg0) +void gm_801B5EB4(GameModeState* arg0) { DebugGameOverData* data = gm_GetGameSceneLoadData(arg0); gm_8017C9A8(data, &gm_80473A18.x0, 2); } -void gm_801B5EE4(GameScene* arg0) +void gm_801B5EE4(GameModeState* arg0) { DebugGameOverData* data = gm_GetGameSceneLeaveData(arg0); UnkAllstarData* r30 = &gm_80473A18; @@ -694,7 +694,7 @@ void gm_801B5EE4(GameScene* arg0) } } -void gm_801B5F50(GameScene* arg0) +void gm_801B5F50(GameModeState* arg0) { CSSData* temp_r31; struct gmm_x0_528_t* temp_r3; @@ -709,7 +709,7 @@ void gm_801B5F50(GameScene* arg0) /// #gm_801B5F50 -void gm_801B5FB4(GameScene* arg0) +void gm_801B5FB4(GameModeState* arg0) { CSSData* temp_r31 = gm_GetGameSceneLeaveData(arg0); struct gmm_x0_528_t* temp_r30 = gmMainLib_8015CDE0(); @@ -731,13 +731,13 @@ void gm_801B5FB4(GameScene* arg0) gm_801B5324(r29, temp_r30->x5); } -void gm_801B607C(GameScene* unused) +void gm_801B607C(GameModeState* unused) { gm_SetPendingGameMode(GM_MENU); gm_SetNewGameModePending(); } -void gm_801B60A4_OnLoad(void) +void gm_Mode_AllStar_OnLoad(void) { UnkAllstarData* data; u32 index; @@ -805,7 +805,7 @@ void gm_801B60A4_OnLoad(void) Ground_801C5A28(); } -void gm_801B62D8_OnInit(void) +void gm_Mode_AllStar_OnInit(void) { struct gmm_x0_528_t* temp_r3 = gmMainLib_8015CDE0(); temp_r3->c_kind = CHKIND_NONE; diff --git a/src/melee/gm/gmallstar.h b/src/melee/gm/gmallstar.h index 01bd97de3e..27cbe5a073 100644 --- a/src/melee/gm/gmallstar.h +++ b/src/melee/gm/gmallstar.h @@ -4,17 +4,17 @@ #include /* 1B5324 */ void gm_801B5324(UnkAllstarData*, s32); -/* 1B5624 */ void gm_801B5624(GameScene*); -/* 1B59AC */ void gm_801B59AC(GameScene*); +/* 1B5624 */ void gm_801B5624(GameModeState*); +/* 1B59AC */ void gm_801B59AC(GameModeState*); /* 1B5AA8 */ void fn_801B5AA8(int); -/* 1B5ACC */ void gm_801B5ACC(GameScene*); -/* 1B5E7C */ void gm_801B5E7C(GameScene*); -/* 1B5EB4 */ void gm_801B5EB4(GameScene*); -/* 1B5EE4 */ void gm_801B5EE4(GameScene*); -/* 1B5F50 */ void gm_801B5F50(GameScene*); -/* 1B5FB4 */ void gm_801B5FB4(GameScene*); -/* 1B607C */ void gm_801B607C(GameScene*); -/* 1B60A4 */ void gm_801B60A4_OnLoad(void); -/* 1B62D8 */ void gm_801B62D8_OnInit(void); +/* 1B5ACC */ void gm_801B5ACC(GameModeState*); +/* 1B5E7C */ void gm_801B5E7C(GameModeState*); +/* 1B5EB4 */ void gm_801B5EB4(GameModeState*); +/* 1B5EE4 */ void gm_801B5EE4(GameModeState*); +/* 1B5F50 */ void gm_801B5F50(GameModeState*); +/* 1B5FB4 */ void gm_801B5FB4(GameModeState*); +/* 1B607C */ void gm_801B607C(GameModeState*); +/* 1B60A4 */ void gm_Mode_AllStar_OnLoad(void); +/* 1B62D8 */ void gm_Mode_AllStar_OnInit(void); #endif diff --git a/src/melee/gm/gmapproach.c b/src/melee/gm/gmapproach.c index b67d094495..c42b5e8bd3 100644 --- a/src/melee/gm/gmapproach.c +++ b/src/melee/gm/gmapproach.c @@ -121,7 +121,7 @@ static void gm_801ADB04(void) HSD_GObj_SetupProc(gobj, fn_801AD920, 1); } -void gm_801ADC88_OnFrame(void) +void gm_Scene_Approach_OnFrame(void) { if (gm_80480D98.xC++ >= 0xB4 && (HSD_PadCopyStatus[gm_80480D98.xE].trigger & @@ -131,18 +131,18 @@ void gm_801ADC88_OnFrame(void) } } -void gm_801ADCE4_OnEnter(void* arg0_) +void gm_Scene_Approach_OnEnter(void* arg0_) { s8* arg0 = arg0_; int var_r0; gm_801ADB04(); var_r0 = arg0[0]; - if (var_r0 != 3 && var_r0 != 7 && var_r0 != 9 && var_r0 != 0xA && - var_r0 != 0xF && var_r0 != 0x14 && var_r0 != 0x15 && var_r0 != 0x16 && - var_r0 != 0x17 && var_r0 != 0x18 && var_r0 != 0x19) + if (var_r0 != 3 && var_r0 != 7 && var_r0 != 9 && var_r0 != 10 && + var_r0 != 15 && var_r0 != 20 && var_r0 != 21 && var_r0 != 22 && + var_r0 != 23 && var_r0 != 24 && var_r0 != 25) { - var_r0 = 0x19; + var_r0 = 25; } gm_80480D98.x4 = var_r0; @@ -153,7 +153,7 @@ void gm_801ADCE4_OnEnter(void* arg0_) lbAudioAx_80023F28(0x48); } -void gm_801ADDA8_OnLeave(void* unused) +void gm_Scene_Approach_OnExit(UNUSED void* exit_data) { lbArchive_80016EFC(gm_80480D98.x0); lbAudioAx_800236DC(); diff --git a/src/melee/gm/gmapproach.h b/src/melee/gm/gmapproach.h index 1c8b098f02..3334cc6373 100644 --- a/src/melee/gm/gmapproach.h +++ b/src/melee/gm/gmapproach.h @@ -1,8 +1,8 @@ #ifndef MELEE_GMAPPROACH_H #define MELEE_GMAPPROACH_H -void gm_801ADC88_OnFrame(void); -void gm_801ADCE4_OnEnter(void*); -void gm_801ADDA8_OnLeave(void*); +void gm_Scene_Approach_OnFrame(void); +void gm_Scene_Approach_OnEnter(void*); +void gm_Scene_Approach_OnExit(void*); #endif diff --git a/src/melee/gm/gmboot.c b/src/melee/gm/gmboot.c index 9c1d06eae9..737a54e9a9 100644 --- a/src/melee/gm/gmboot.c +++ b/src/melee/gm/gmboot.c @@ -9,9 +9,9 @@ #include #include -/* 1BF948 */ static void bootOnLoad(GameScene*); -/* 1BF9A8 */ static void bootOnLeave(GameScene*); -/* 1BFA3C */ static void memcardOnLoad(GameScene*); +/* 1BF948 */ static void bootOnLoad(GameModeState*); +/* 1BF9A8 */ static void bootOnLeave(GameModeState*); +/* 1BFA3C */ static void memcardOnLoad(GameModeState*); /// @todo Move to toy header enum { @@ -32,7 +32,7 @@ struct leaveData { static struct loadData load_data; static struct leaveData leave_data; -GameScene gmBoot_BootScenes[] = { +GameModeState gm_Mode_Boot_States[] = { { 0, 1, @@ -48,7 +48,7 @@ GameScene gmBoot_BootScenes[] = { }, }; -void bootOnLoad(GameScene* scene) +void bootOnLoad(GameModeState* scene) { struct loadData* scene_data = gm_GetGameSceneLoadData(scene); scene_data->x4 = 0; @@ -61,7 +61,7 @@ void bootOnLoad(GameScene* scene) } } -void bootOnLeave(GameScene* data) +void bootOnLeave(GameModeState* data) { struct leaveData* scene_data = gm_GetGameSceneLeaveData(data); @@ -83,7 +83,7 @@ void bootOnLeave(GameScene* data) gm_ChangeGameModeAfterCurrentScene(scene_data->mode_id); } -GameScene gmBoot_MemCardScenes[] = { +GameModeState gm_Mode_MemCard_States[] = { { 0, 3, @@ -99,7 +99,7 @@ GameScene gmBoot_MemCardScenes[] = { { -1 }, }; -void memcardOnLoad(GameScene* scene) +void memcardOnLoad(GameModeState* scene) { struct loadData* temp_r3 = gm_GetGameSceneLoadData(scene); temp_r3->x4 = 0; diff --git a/src/melee/gm/gmcameramode.c b/src/melee/gm/gmcameramode.c index 2527eb90e2..74f37c11f2 100644 --- a/src/melee/gm/gmcameramode.c +++ b/src/melee/gm/gmcameramode.c @@ -21,17 +21,17 @@ #include -/* 1B24B4 */ static void gm_801B24B4(GameScene*); -/* 1B2510 */ static void gm_801B2510(GameScene*); -/* 1B254C */ static void gm_801B254C(GameScene*); -/* 1B25D4 */ static void gm_801B25D4(GameScene*); -/* 1B26AC */ static void gm_801B26AC(GameScene*); -/* 1B2704 */ static void gm_801B2704(GameScene*); -/* 1B2790 */ static void gm_PrepCameraModeVSScene(GameScene*); -/* 1B2AF8 */ static void gm_801B2AF8(GameScene*); +/* 1B24B4 */ static void gm_801B24B4(GameModeState*); +/* 1B2510 */ static void gm_801B2510(GameModeState*); +/* 1B254C */ static void gm_801B254C(GameModeState*); +/* 1B25D4 */ static void gm_801B25D4(GameModeState*); +/* 1B26AC */ static void gm_801B26AC(GameModeState*); +/* 1B2704 */ static void gm_801B2704(GameModeState*); +/* 1B2790 */ static void gm_PrepCameraModeVSScene(GameModeState*); +/* 1B2AF8 */ static void gm_801B2AF8(GameModeState*); /* 4D68C8 */ static s64 gm_804D68C8; -GameScene gm_CameraModeScenes[] = { +GameModeState gm_Mode_Camera_States[] = { { 0, lbDvdPreload_3, @@ -91,21 +91,21 @@ void gm_801B23F0(void) lbDvd_80017740(0, 2008, 4, 4, lbSnap_8001E210(), 0, 1, 32, 0); } -void gm_801B24B4(GameScene* arg0) +void gm_801B24B4(GameModeState* arg0) { Unk80433380_48* temp_r31_2; struct GameCache* temp_r31; temp_r31 = &lbDvd_GetPreloadCacheScene()->game_cache; lbDvd_800174BC(); - temp_r31->mode_id = GM_CAMERA_MODE; + temp_r31->mode_kind = GM_CAMERA_MODE; lbDvd_80018254(); lb_8001C550(); temp_r31_2 = lbDvd_GetPreloadedArchive(0x7D8); lbSnap_8001E218(lbDvd_GetPreloadedArchive(0x7D7), temp_r31_2); } -void gm_801B2510(GameScene* arg0) +void gm_801B2510(GameModeState* arg0) { int* data = gm_GetGameSceneLeaveData(arg0); int temp_r0 = *data; @@ -114,7 +114,7 @@ void gm_801B2510(GameScene* arg0) } } -void gm_801B254C(GameScene* arg0) +void gm_801B254C(GameModeState* arg0) { VsModeData* temp_r31; u8* temp_r3; @@ -132,11 +132,11 @@ void gm_801B254C(GameScene* arg0) temp_r30_2 = &lbDvd_GetPreloadCacheScene()->game_cache; lbDvd_800174BC(); - temp_r30_2->mode_id = GM_CAMERA_MODE; + temp_r30_2->mode_kind = GM_CAMERA_MODE; lbDvd_80018254(); } -void gm_801B25D4(GameScene* arg0) +void gm_801B25D4(GameModeState* arg0) { VsModeData* temp_r31; u64 temp_ret; @@ -162,7 +162,7 @@ void gm_801B25D4(GameScene* arg0) lbAudioAx_80027168(); } -void gm_801B26AC(GameScene* arg0) +void gm_801B26AC(GameModeState* arg0) { SSSData* sss; VsModeData* vs; @@ -172,7 +172,7 @@ void gm_801B26AC(GameScene* arg0) gm_80167FC4(sss); } -void gm_801B2704(GameScene* arg0) +void gm_801B2704(GameModeState* arg0) { VsModeData* temp_r31; SSSData* var_r3; @@ -189,7 +189,7 @@ void gm_801B2704(GameScene* arg0) gm_SetPendingSceneIndex(1); } -void gm_PrepCameraModeVSScene(GameScene* arg0) +void gm_PrepCameraModeVSScene(GameModeState* arg0) { VsModeData* vs; StartMeleeData* start; @@ -235,7 +235,7 @@ void gm_PrepCameraModeVSScene(GameScene* arg0) lbDvd_GetPreloadedArchive(0x7D8)); } -void gm_801B2AF8(GameScene* arg0) +void gm_801B2AF8(GameModeState* arg0) { VsModeData* temp_r30; u8* temp_r29; @@ -249,7 +249,7 @@ void gm_801B2AF8(GameScene* arg0) gm_SetPendingSceneIndex(1); } -void gm_801B2B7C_OnInit(void) +void gm_Mode_Camera_OnInit(void) { gm_80167B50(&gmMainLib_804D3EE0->unk_950); } diff --git a/src/melee/gm/gmcameramode.h b/src/melee/gm/gmcameramode.h index 9079ea5bb0..7f36d903c3 100644 --- a/src/melee/gm/gmcameramode.h +++ b/src/melee/gm/gmcameramode.h @@ -4,7 +4,7 @@ #include "gm/types.h" /* 1B23F0 */ void gm_801B23F0(void); -/* 1B2B7C */ void gm_801B2B7C_OnInit(void); -/* 3DDBE0 */ extern GameScene gm_CameraModeScenes[]; +/* 1B2B7C */ void gm_Mode_Camera_OnInit(void); +/* 3DDBE0 */ extern GameModeState gm_Mode_Camera_States[]; #endif diff --git a/src/melee/gm/gmclassic.c b/src/melee/gm/gmclassic.c index 5f8b97e5cc..2100f13468 100644 --- a/src/melee/gm/gmclassic.c +++ b/src/melee/gm/gmclassic.c @@ -75,14 +75,14 @@ typedef struct gmClassic_803DDEC8Data { ASSERT_SIZE(gmClassic_803DDEC8Data, 0x2F0); typedef struct gmClassicSceneData { - /* 0x000 */ GameScene scenes[26]; + /* 0x000 */ GameModeState scenes[26]; /* 0x270 */ gmClassic_803DDEC8Data matchups; } gmClassicSceneData; ASSERT_SIZE(gmClassicSceneData, 0x560); static gmClassic_80490880Data gmClassic_80490880; -GameScene gm_803DDC58_Scenes[] = { +GameModeState gm_Mode_Classic_States[] = { { 0, lbDvdPreload_3, @@ -584,7 +584,8 @@ static gm_803DDEC8Struct* gmClassic_801B2D54(gm_803DDEC8Struct* arg0) { gmClassic_80490880Data* o = &gmClassic_80490880; gm_803DDEC8Struct* ptr; - gmClassicSceneData* scene_data = (gmClassicSceneData*) gm_803DDC58_Scenes; + gmClassicSceneData* scene_data = + (gmClassicSceneData*) gm_Mode_Classic_States; for (ptr = arg0; ptr->x0 != 0xD; ptr++) { if (ptr->x1 & 8) { @@ -667,10 +668,11 @@ static gm_803DDEC8Struct* gmClassic_801B2D54(gm_803DDEC8Struct* arg0) return ptr; } -void gmClassic_OnLoad(void) +void gm_Mode_Classic_OnLoad(void) { UnkAllstarData* data; - gmClassicSceneData* scene_data = (gmClassicSceneData*) gm_803DDC58_Scenes; + gmClassicSceneData* scene_data = + (gmClassicSceneData*) gm_Mode_Classic_States; gmClassic_80490880Data* o = &gmClassic_80490880; gm_803DDEC8Struct* entry; s32 i; @@ -719,7 +721,7 @@ void gmClassic_OnLoad(void) Ground_801C5A28(); } -void gmClassic_OnInit(void) +void gm_Mode_Classic_OnInit(void) { struct gmm_x0_528_t* temp_r3 = gmMainLib_8015CDC8(); temp_r3->c_kind = CHKIND_NONE; @@ -739,7 +741,7 @@ static inline StKind gmClassic_GetStKind(gm_803DDEC8Struct* entry, return entry->xC->x00; } -void gmClassic_801B3500(GameScene* arg0) +void gmClassic_801B3500(GameModeState* arg0) { gmClassicIntroData* sd; gm_803DDEC8Struct* entry; @@ -754,11 +756,11 @@ void gmClassic_801B3500(GameScene* arg0) gm_803DDEC8Struct* new_var; sd = gm_GetGameSceneLoadData(arg0); - entry = &gmClassic_803DDEC8.x00[(u8) gm_8017BE84(arg0->idx)]; + entry = &gmClassic_803DDEC8.x00[(u8) gm_8017BE84(arg0->id)]; new_var = entry; ad = gm_GetAllStarData(); enemy_count = 0; - ad->x0.x7 = arg0->idx; + ad->x0.x7 = arg0->id; sd->x0A = entry->x0 + 1; sd->x08 = ad->x0.slot; @@ -817,7 +819,7 @@ void gmClassic_801B3500(GameScene* arg0) sd->x13[0] = ad->x0.color; gm_8017DB88(ad->x0.xC.x24, entry->x1, ad->x0.cpu_level, - (u8) gm_8017BE84(arg0->idx), entry->xC->x02_u8, sd->x0D[0], + (u8) gm_8017BE84(arg0->id), entry->xC->x02_u8, sd->x0D[0], (u8 (*)(s32, s32, u8))(Event) ad->x58, (u8 (*)(s32, s32, u8))(Event) ad->x5C, (u8 (*)(s32, s32, u8))(Event) ad->x60, @@ -903,7 +905,7 @@ void gmClassic_801B3500(GameScene* arg0) lbAudioAx_80027168(); } -void gmClassic_801B3A34(GameScene* arg0) +void gmClassic_801B3A34(GameModeState* arg0) { StartMeleeData* temp_r30; gm_803DDEC8Struct* temp_r31; @@ -919,7 +921,7 @@ void gmClassic_801B3A34(GameScene* arg0) PAD_STACK(8); temp_r30 = gm_GetGameSceneLoadData(arg0); - temp_r31 = &gmClassic_803DDEC8.x00[(u8) gm_8017BE84(arg0->idx)]; + temp_r31 = &gmClassic_803DDEC8.x00[(u8) gm_8017BE84(arg0->id)]; temp_r29 = gm_GetAllStarData(); new_var = temp_r30; var_r27 = temp_r31->xC->x00; @@ -933,16 +935,16 @@ void gmClassic_801B3A34(GameScene* arg0) temp_r29->x0.x8 = flags; temp_r29->x0.x9 = temp_r31->x2; temp_r29->x0.xB = temp_r31->x8; - idx_val = (u16) gm_8017BE84(arg0->idx) - 1; + idx_val = (u16) gm_8017BE84(arg0->id) - 1; temp_r28 = gm_804908A0[idx_val]; - sp8 = (u16) gm_8017BE84(arg0->idx); + sp8 = (u16) gm_8017BE84(arg0->id); spC = temp_r28; gm_8017CE34(new_var, (UnkAdventureData*) temp_r29, temp_r31->xC->x02, temp_r31->x6, 1, 0, temp_r31->x4, var_r27, sp8, spC); gm_8016F088(new_var); } -void gmClassic_801B3B40(GameScene* arg0) +void gmClassic_801B3B40(GameModeState* arg0) { MatchExitInfo* mei; UnkAllstarData* asd; @@ -961,9 +963,9 @@ void gmClassic_801B3B40(GameScene* arg0) mei = (MatchExitInfo*) gm_GetGameSceneLeaveData(arg0); asd = gm_GetAllStarData(); - entry = &gmClassic_803DDEC8.x00[(u8) gm_8017BE84(arg0->idx)]; + entry = &gmClassic_803DDEC8.x00[(u8) gm_8017BE84(arg0->id)]; exit_result = mei->x8; - id = arg0->idx; + id = arg0->id; idx = ((u16) gm_8017BE84(id)) - 1; if (exit_result != 0) { gm_804908A0[idx] = 2; @@ -1017,19 +1019,19 @@ void gmClassic_801B3B40(GameScene* arg0) } } -void gmClassic_801B3D44(GameScene* scene) +void gmClassic_801B3D44(GameModeState* scene) { struct DebugGameOverData* temp_r31 = gm_GetGameSceneLoadData(scene); gm_8017C9A8(temp_r31, &gm_GetAllStarData()->x0, 1); } -void gmClassic_801B3D84(GameScene* scene) +void gmClassic_801B3D84(GameModeState* scene) { DebugGameOverData* temp_r30 = gm_GetGameSceneLeaveData(scene); gm_8017CA38(temp_r30, &gm_GetAllStarData()->x0, gmMainLib_8015CDC8(), 1); } -void gmClassic_801B3DD8(GameScene* scene) +void gmClassic_801B3DD8(GameModeState* scene) { CSSData* css = gm_GetGameSceneLoadData(scene); struct gmm_x0_528_t* temp_r31 = gmMainLib_8015CDC8(); @@ -1039,7 +1041,7 @@ void gmClassic_801B3DD8(GameScene* scene) lbDvd_800174BC(); } -void gmClassic_801B3E44(GameScene* scene) +void gmClassic_801B3E44(GameModeState* scene) { CSSData* temp_r30 = gm_GetGameSceneLeaveData(scene); gmm_x0_528_t* temp_r29 = gmMainLib_8015CDC8(); @@ -1063,7 +1065,7 @@ void gmClassic_801B3E44(GameScene* scene) gm_80168F88(); } -void gmClassic_801B3F18(GameScene* scene) +void gmClassic_801B3F18(GameModeState* scene) { gm_SetPendingGameMode(GM_MENU); gm_SetNewGameModePending(); diff --git a/src/melee/gm/gmclassic.h b/src/melee/gm/gmclassic.h index 1e84cb6eba..449d273bd8 100644 --- a/src/melee/gm/gmclassic.h +++ b/src/melee/gm/gmclassic.h @@ -5,15 +5,15 @@ #include -/* 1B2F78 */ void gmClassic_OnLoad(void); -/* 1B34B8 */ void gmClassic_OnInit(void); -/* 1B3500 */ void gmClassic_801B3500(GameScene*); -/* 1B3A34 */ void gmClassic_801B3A34(GameScene*); -/* 1B3B40 */ void gmClassic_801B3B40(GameScene*); -/* 1B3D44 */ void gmClassic_801B3D44(GameScene*); -/* 1B3D84 */ void gmClassic_801B3D84(GameScene*); -/* 1B3DD8 */ void gmClassic_801B3DD8(GameScene*); -/* 1B3E44 */ void gmClassic_801B3E44(GameScene*); -/* 1B3F18 */ void gmClassic_801B3F18(GameScene*); +/* 1B2F78 */ void gm_Mode_Classic_OnLoad(void); +/* 1B34B8 */ void gm_Mode_Classic_OnInit(void); +/* 1B3500 */ void gmClassic_801B3500(GameModeState*); +/* 1B3A34 */ void gmClassic_801B3A34(GameModeState*); +/* 1B3B40 */ void gmClassic_801B3B40(GameModeState*); +/* 1B3D44 */ void gmClassic_801B3D44(GameModeState*); +/* 1B3D84 */ void gmClassic_801B3D84(GameModeState*); +/* 1B3DD8 */ void gmClassic_801B3DD8(GameModeState*); +/* 1B3E44 */ void gmClassic_801B3E44(GameModeState*); +/* 1B3F18 */ void gmClassic_801B3F18(GameModeState*); #endif diff --git a/src/melee/gm/gmdebugmode.c b/src/melee/gm/gmdebugmode.c index b0471d34ca..cb35ffc434 100644 --- a/src/melee/gm/gmdebugmode.c +++ b/src/melee/gm/gmdebugmode.c @@ -43,25 +43,25 @@ struct exitIntroData { }; ASSERT_SIZE(struct exitIntroData, 0x4); -/* 1B099C */ static void onExitIntro(GameScene*); -/* 1B09C0 */ static void onEnterMenu0(GameScene*); +/* 1B099C */ static void onExitIntro(GameModeState*); +/* 1B09C0 */ static void onEnterMenu0(GameModeState*); /* 1B09F8 */ static int fn_801B09F8(int); -/* 1B0A34 */ static void onEnterMenu1(GameScene*); +/* 1B0A34 */ static void onEnterMenu1(GameModeState*); /* 1B0A8C */ static int fn_801B0A8C(int); -/* 1B0AC8 */ static void onEnterMenu2(GameScene*); -/* 1B0B00 */ static void onEnterPrize(GameScene*); -/* 1B0B24 */ static void onExitPrize(GameScene*); -/* 1B0B48 */ static void onEnterVs(GameScene*); -/* 1B0B8C */ static void onEnterResults0(GameScene*); -/* 1B0BF0 */ static void onExitResults0(GameScene*); -/* 1B0C18 */ static void onEnterIntroEasy(GameScene*); -/* 1B0C50 */ static void onEnterIntroAllstar(GameScene*); -/* 1B0C74 */ static void onEnterGameOver(GameScene*); -/* 1B0CF0 */ static void onEnterApproach(GameScene*); -/* 1B0DD0 */ static void onEnterResults1(GameScene*); -/* 1B0F1C */ static void onExitResults1(GameScene*); -/* 1B0F60 */ static void onEnterMemCard(GameScene*); -/* 1B0F90 */ static void onExitMemCard(GameScene*); +/* 1B0AC8 */ static void onEnterMenu2(GameModeState*); +/* 1B0B00 */ static void onEnterPrize(GameModeState*); +/* 1B0B24 */ static void onExitPrize(GameModeState*); +/* 1B0B48 */ static void onEnterVs(GameModeState*); +/* 1B0B8C */ static void onEnterResults0(GameModeState*); +/* 1B0BF0 */ static void onExitResults0(GameModeState*); +/* 1B0C18 */ static void onEnterIntroEasy(GameModeState*); +/* 1B0C50 */ static void onEnterIntroAllstar(GameModeState*); +/* 1B0C74 */ static void onEnterGameOver(GameModeState*); +/* 1B0CF0 */ static void onEnterApproach(GameModeState*); +/* 1B0DD0 */ static void onEnterResults1(GameModeState*); +/* 1B0F1C */ static void onExitResults1(GameModeState*); +/* 1B0F60 */ static void onEnterMemCard(GameModeState*); +/* 1B0F90 */ static void onExitMemCard(GameModeState*); /* 480DC8 */ static struct UnkSoundTestData1 intro_easy_enter_data; /* 480DE8 */ static StartMeleeData vs_enter_data; /* 480F20 */ static MatchExitInfo vs_exit_data; @@ -77,7 +77,7 @@ ASSERT_SIZE(struct exitIntroData, 0x4); /* 4D689C */ static struct DebugMemcardData memcard_enter_data; /* 4D68A4 */ static struct DebugMemcardData memcard_exit_data; -/* 3DD6D0 */ GameScene gm_803DD6D0_Scenes[] = { +/* 3DD6D0 */ GameModeState gm_Mode_Debug_States[] = { { 0, lbDvdPreload_2, @@ -261,12 +261,12 @@ ASSERT_SIZE(struct exitIntroData, 0x4); { -1 }, }; -void onExitIntro(GameScene* unused) +void onExitIntro(GameModeState* unused) { gm_SetPendingSceneIndex(0); // onEnterMenu0 } -void onEnterMenu0(GameScene* arg0) +void onEnterMenu0(GameModeState* arg0) { struct enterMenu0_Data* temp_r3 = gm_GetGameSceneLoadData(arg0); temp_r3->x0 = un_803FA4E0; @@ -283,7 +283,7 @@ int fn_801B09F8(int arg0) return 0; } -void onEnterMenu1(GameScene* arg0) +void onEnterMenu1(GameModeState* arg0) { struct enterMenu0_Data* temp_r3 = gm_GetGameSceneLoadData(arg0); temp_r3->x0 = un_803FA790; @@ -304,24 +304,24 @@ int fn_801B0A8C(int arg0) return 0; } -void onEnterMenu2(GameScene* arg0) +void onEnterMenu2(GameModeState* arg0) { struct enterMenu0_Data* temp_r3 = gm_GetGameSceneLoadData(arg0); temp_r3->x0 = un_803FC4CC; temp_r3->x4 = fn_801B0A8C; } -void onEnterPrize(GameScene* arg0) +void onEnterPrize(GameModeState* arg0) { un_802FFEE0(gm_GetGameSceneLoadData(arg0)); } -void onExitPrize(GameScene* arg0) +void onExitPrize(GameModeState* arg0) { gm_SetPendingSceneIndex(2); } -void onEnterVs(GameScene* arg0) +void onEnterVs(GameModeState* arg0) { un_802FFF2C(gm_GetGameSceneLoadData(arg0)); lbAudioAx_80026F2C(0x12); @@ -330,34 +330,34 @@ void onEnterVs(GameScene* arg0) lbAudioAx_80027648(); } -void onEnterResults0(GameScene* arg0) +void onEnterResults0(GameModeState* arg0) { struct ResultsMatchInfo* temp_r3 = gm_GetGameSceneLoadData(arg0); gm_80177724(temp_r3); temp_r3->match_end = vs_exit_data.match_end; } -void onExitResults0(GameScene* arg0) +void onExitResults0(GameModeState* arg0) { gm_GetGameSceneLeaveData(arg0); gm_SetPendingSceneIndex(0); } -void onEnterIntroEasy(GameScene* arg0) +void onEnterIntroEasy(GameModeState* arg0) { struct UnkSoundTestData1* temp_r31 = gm_GetGameSceneLoadData(arg0); gm_80168F88(); un_80301BA8(temp_r31); } -void onEnterIntroAllstar(GameScene* arg0) +void onEnterIntroAllstar(GameModeState* arg0) { un_80301C64(gm_GetGameSceneLoadData(arg0)); } extern int un_803FA258[]; -void onEnterGameOver(GameScene* arg0) +void onEnterGameOver(GameModeState* arg0) { struct DebugGameOverData* data; @@ -371,7 +371,7 @@ void onEnterGameOver(GameScene* arg0) data->x16 = (HSD_Randi(0xA) + 1); } -void onEnterApproach(GameScene* arg0) +void onEnterApproach(GameModeState* arg0) { u8* temp_r3 = gm_GetGameSceneLoadData(arg0); temp_r3[1] = 0; @@ -417,7 +417,7 @@ void onEnterApproach(GameScene* arg0) } } -void onEnterResults1(GameScene* arg0) +void onEnterResults1(GameModeState* arg0) { u64 sfx_result = 0; int i; @@ -453,7 +453,7 @@ void onEnterResults1(GameScene* arg0) PAD_STACK(8); } -void onExitResults1(GameScene* arg0) +void onExitResults1(GameModeState* arg0) { lbAudioAx_800236DC(); if (HSD_PadCopyStatus->button & HSD_PAD_L) { @@ -463,14 +463,14 @@ void onExitResults1(GameScene* arg0) } } -void onEnterMemCard(GameScene* arg0) +void onEnterMemCard(GameModeState* arg0) { struct DebugMemcardData* data = gm_GetGameSceneLoadData(arg0); data->x0 = 1; data->x4 = 0; } -void onExitMemCard(GameScene* arg0) +void onExitMemCard(GameModeState* arg0) { UNUSED struct DebugMemcardData* data = gm_GetGameSceneLeaveData(arg0); gm_SetPendingSceneIndex(0); diff --git a/src/melee/gm/gmdebugmode.h b/src/melee/gm/gmdebugmode.h index da03eee26d..a1281602e6 100644 --- a/src/melee/gm/gmdebugmode.h +++ b/src/melee/gm/gmdebugmode.h @@ -3,6 +3,6 @@ #include "melee/gm/types.h" -/* 3DD6D0 */ extern GameScene gm_803DD6D0_Scenes[]; +/* 3DD6D0 */ extern GameModeState gm_Mode_Debug_States[]; #endif diff --git a/src/melee/gm/gmevent.c b/src/melee/gm/gmevent.c index b92c5fb7ac..e4f450e9eb 100644 --- a/src/melee/gm/gmevent.c +++ b/src/melee/gm/gmevent.c @@ -132,12 +132,12 @@ struct gm_804D6900_t { }; /* 1BA938 */ static void gm_801BA938(struct EventData*, int lo, int hi, bool); -/* 1BAA60 */ static void onEnterCss(GameScene*); -/* 1BAAD0 */ static void onExitCss(GameScene*); +/* 1BAA60 */ static void onEnterCss(GameModeState*); +/* 1BAAD0 */ static void onExitCss(GameModeState*); /* 1BAB40 */ static void gm_801BAB40(PlayerInitData*, struct gm_801BAB40_src*); -/* 1BAC9C */ static s32 gm_801BAC9C(GameScene*, s32); -/* 1BAD70 */ static void onEnterVs(GameScene*); -/* 1BB758 */ static void onExitVs(GameScene*); +/* 1BAC9C */ static s32 gm_801BAC9C(GameModeState*, s32); +/* 1BAD70 */ static void onEnterVs(GameModeState*); +/* 1BB758 */ static void onExitVs(GameModeState*); /* 1BBB64 */ static void gm_801BBB64(void); /* 1BBFE8 */ static void fn_801BBFE8(void); /* 1BC00C */ static void gm_801BC00C(void); @@ -177,7 +177,7 @@ struct gm_804D6900_t { /* 4979D8 */ static MatchExitInfo vs_exit_data[2]; /* 4D6900 */ static struct gm_804D6900_t** gm_804D6900[2]; -GameScene gm_803DF618_Scenes[] = { +GameModeState gm_Mode_Event_States[] = { { 0, lbDvdPreload_3, @@ -245,7 +245,7 @@ void gm_801BA938(struct EventData* arg0, int lo, int hi, bool arg3) lbAudioAx_80027168(); } -void onEnterCss(GameScene* arg0) +void onEnterCss(GameModeState* arg0) { struct EventData* temp_r31 = &gmMainLib_804D3EE0->unk_530; CSSData* css = gm_GetGameSceneLoadData(arg0); @@ -258,7 +258,7 @@ void onEnterCss(GameScene* arg0) } } -void onExitCss(GameScene* arg0) +void onExitCss(GameModeState* arg0) { CSSData* temp_r3; struct EventData* temp_r31; @@ -310,7 +310,7 @@ void gm_801BAB40(PlayerInitData* arg0, gm_801BAB40_src* src) arg0->x20 = src->x20; } -s32 gm_801BAC9C(GameScene* arg0, s32 arg1) +s32 gm_801BAC9C(GameModeState* arg0, s32 arg1) { UNUSED u8 _[8]; u8 chars[CHKIND_MAX]; @@ -360,7 +360,7 @@ static inline u8 gm_GetNextColor(u8 color) return color; } -void onEnterVs(GameScene* arg0) +void onEnterVs(GameModeState* arg0) { struct EventData* ev = gm_GetEventData(); StartMeleeData* md = gm_GetGameSceneLoadData(arg0); @@ -633,7 +633,7 @@ void onEnterVs(GameScene* arg0) gm_80168F88(); } -void onExitVs(GameScene* arg0) +void onExitVs(GameModeState* arg0) { struct EventData* ev = &gmMainLib_804D3EE0->unk_530; MatchExitInfo* exit = gm_GetGameSceneLeaveData(arg0); @@ -742,7 +742,7 @@ void onExitVs(GameScene* arg0) } } -void gm_801BBA60_OnInit(void) +void gm_Mode_Event_OnInit(void) { struct EventData* temp_r6; int i; @@ -900,7 +900,7 @@ void gm_801BBB64(void) } } -void gm_801BBEA8_OnLoad(void) +void gm_Mode_Event_OnLoad(void) { struct EventData* temp_r30; struct gm_804D6900_t** temp_r29; @@ -944,7 +944,7 @@ void gm_801BBEA8_OnLoad(void) } } -void gm_801BBFE4_OnUnload(void) {} +void gm_Mode_Event_OnUnload(void) {} void fn_801BBFE8(void) { diff --git a/src/melee/gm/gmevent.dox b/src/melee/gm/gmevent.dox index 0527dbe5ca..bbb73a22f8 100644 --- a/src/melee/gm/gmevent.dox +++ b/src/melee/gm/gmevent.dox @@ -8,6 +8,6 @@ * #StartMeleeRules::check_for_pauser_override callback * (#gm_CameraModeVSGetPauser). */ -/* 3DDBE0 */ extern GameScene gm_CameraModeScenes[5]; +/* 3DDBE0 */ extern GameModeState gm_Mode_Camera_States[5]; #endif diff --git a/src/melee/gm/gmevent.h b/src/melee/gm/gmevent.h index 9bbbb76dae..814e88d0b4 100644 --- a/src/melee/gm/gmevent.h +++ b/src/melee/gm/gmevent.h @@ -6,9 +6,9 @@ #include "gm/types.h" /* 1BA8FC */ void gm_801BA8FC(void); -/* 1BBA60 */ void gm_801BBA60_OnInit(void); -/* 1BBEA8 */ void gm_801BBEA8_OnLoad(void); -/* 1BBFE4 */ void gm_801BBFE4_OnUnload(void); +/* 1BBA60 */ void gm_Mode_Event_OnInit(void); +/* 1BBEA8 */ void gm_Mode_Event_OnLoad(void); +/* 1BBFE4 */ void gm_Mode_Event_OnUnload(void); /* 1BEB68 */ void gm_801BEB68(int); /* 1BEB74 */ void gm_801BEB74(u8); /* 1BEB80 */ u8 gm_801BEB80(void); diff --git a/src/melee/gm/gmfixedcamera.c b/src/melee/gm/gmfixedcamera.c index 9632512422..f18137f8ee 100644 --- a/src/melee/gm/gmfixedcamera.c +++ b/src/melee/gm/gmfixedcamera.c @@ -10,7 +10,7 @@ #include "if/if_2FD9.h" #include "mn/types.h" -GameScene gm_803DF1E0_Scenes[] = { +GameModeState gm_Mode_CameraVs_States[] = { { 0, 3, @@ -110,22 +110,22 @@ GameScene gm_803DF1E0_Scenes[] = { { -1 }, }; -void gm_801B9F10(GameScene* scene) +void gm_801B9F10(GameModeState* scene) { gm_801A5618(scene, &gmMainLib_804D3EE0->unk_A90, 7); } -void gm_801B9F3C(GameScene* scene) +void gm_801B9F3C(GameModeState* scene) { gm_801A5680(scene, &gmMainLib_804D3EE0->unk_A90); } -void gm_801B9F64(GameScene* scene) +void gm_801B9F64(GameModeState* scene) { gm_801A5754(scene, &gmMainLib_804D3EE0->unk_A90); } -void gm_801B9F8C(GameScene* scene) +void gm_801B9F8C(GameModeState* scene) { gm_801A57A8(scene, &gmMainLib_804D3EE0->unk_A90, 0); } @@ -135,45 +135,45 @@ void fn_801B9FB8(StartMeleeData* arg0, StartMeleeData* arg1) arg0->rules.on_unpause_override = gm_80165290; } -void gm_801B9FC8(GameScene* scene) +void gm_801B9FC8(GameModeState* scene) { VsModeData* data = &gmMainLib_804D3EE0->unk_A90; gm_801A583C(scene, data, fn_801B9FB8, NULL); } -void gm_801B9FFC(GameScene* scene) +void gm_801B9FFC(GameModeState* scene) { gm_801A5AF0(scene, 4, 3); } -void gm_801BA024(GameScene* scene) +void gm_801BA024(GameModeState* scene) { VsModeData* data = &gmMainLib_804D3EE0->unk_A90; gm_801A5C3C(scene, data, fn_801B9FB8, NULL); } -void gm_801BA058(GameScene* scene) +void gm_801BA058(GameModeState* scene) { gm_801A5EC8(scene); } -void gm_801BA078(GameScene* scene) +void gm_801BA078(GameModeState* scene) { gm_801A5F00(scene); } -void gm_801BA098(GameScene* scene) +void gm_801BA098(GameModeState* scene) { VsModeData* data = &gmMainLib_804D3EE0->unk_A90; gm_801A5F64(scene, data, 0); } -void gm_801BA0C4_OnInit(void) +void gm_Mode_CameraVs_OnInit(void) { gm_80167B50(&gmMainLib_804D3EE0->unk_A90); } -void gm_801BA0EC_OnLoad(void) +void gm_Mode_CameraVs_OnLoad(void) { gm_801A55C4(); } diff --git a/src/melee/gm/gmfixedcamera.h b/src/melee/gm/gmfixedcamera.h index 9fc40a47a0..ca4fced18a 100644 --- a/src/melee/gm/gmfixedcamera.h +++ b/src/melee/gm/gmfixedcamera.h @@ -4,18 +4,18 @@ #include #include -/* 1B9F10 */ void gm_801B9F10(GameScene*); -/* 1B9F3C */ void gm_801B9F3C(GameScene*); -/* 1B9F64 */ void gm_801B9F64(GameScene*); -/* 1B9F8C */ void gm_801B9F8C(GameScene*); +/* 1B9F10 */ void gm_801B9F10(GameModeState*); +/* 1B9F3C */ void gm_801B9F3C(GameModeState*); +/* 1B9F64 */ void gm_801B9F64(GameModeState*); +/* 1B9F8C */ void gm_801B9F8C(GameModeState*); /* 1B9FB8 */ void fn_801B9FB8(StartMeleeData*, StartMeleeData*); -/* 1B9FC8 */ void gm_801B9FC8(GameScene*); -/* 1B9FFC */ void gm_801B9FFC(GameScene*); -/* 1BA024 */ void gm_801BA024(GameScene*); -/* 1BA058 */ void gm_801BA058(GameScene*); -/* 1BA078 */ void gm_801BA078(GameScene*); -/* 1BA098 */ void gm_801BA098(GameScene*); -/* 1BA0C4 */ void gm_801BA0C4_OnInit(void); -/* 1BA0EC */ void gm_801BA0EC_OnLoad(void); +/* 1B9FC8 */ void gm_801B9FC8(GameModeState*); +/* 1B9FFC */ void gm_801B9FFC(GameModeState*); +/* 1BA024 */ void gm_801BA024(GameModeState*); +/* 1BA058 */ void gm_801BA058(GameModeState*); +/* 1BA078 */ void gm_801BA078(GameModeState*); +/* 1BA098 */ void gm_801BA098(GameModeState*); +/* 1BA0C4 */ void gm_Mode_CameraVs_OnInit(void); +/* 1BA0EC */ void gm_Mode_CameraVs_OnLoad(void); #endif diff --git a/src/melee/gm/gmgiant.c b/src/melee/gm/gmgiant.c index 3fec1b5d79..bff0da9711 100644 --- a/src/melee/gm/gmgiant.c +++ b/src/melee/gm/gmgiant.c @@ -9,7 +9,7 @@ #include "if/if_2FD9.h" -GameScene gm_803DF060_Scenes[] = { +GameModeState gm_Mode_GiantVs_States[] = { { 0, 3, @@ -109,22 +109,22 @@ GameScene gm_803DF060_Scenes[] = { { -1 }, }; -void gm_801B8FB8(GameScene* scene) +void gm_801B8FB8(GameModeState* scene) { gm_801A5618(scene, &gmMainLib_804D3EE0->unk_F90, 4); } -void gm_801B8FE4(GameScene* scene) +void gm_801B8FE4(GameModeState* scene) { gm_801A5680(scene, &gmMainLib_804D3EE0->unk_F90); } -void gm_801B900C(GameScene* scene) +void gm_801B900C(GameModeState* scene) { gm_801A5754(scene, &gmMainLib_804D3EE0->unk_F90); } -void gm_801B9034(GameScene* scene) +void gm_801B9034(GameModeState* scene) { gm_801A57A8(scene, &gmMainLib_804D3EE0->unk_F90, 0); } @@ -137,44 +137,44 @@ void fn_801B9060(PlayerInitData* arg0, PlayerInitData* unused) arg0->xB = 2; } -void gm_801B9084(GameScene* scene) +void gm_801B9084(GameModeState* scene) { VsModeData* data = &gmMainLib_804D3EE0->unk_F90; gm_801A583C(scene, data, NULL, fn_801B9060); } -void gm_801B90B8(GameScene* scene) +void gm_801B90B8(GameModeState* scene) { gm_801A5AF0(scene, 4U, 3U); } -void gm_801B90E0(GameScene* scene) +void gm_801B90E0(GameModeState* scene) { VsModeData* data = &gmMainLib_804D3EE0->unk_F90; gm_801A5C3C(scene, data, NULL, fn_801B9060); } -void gm_801B9114(GameScene* scene) +void gm_801B9114(GameModeState* scene) { gm_801A5EC8(scene); } -void gm_801B9134(GameScene* scene) +void gm_801B9134(GameModeState* scene) { gm_801A5F00(scene); } -void gm_801B9154(GameScene* scene) +void gm_801B9154(GameModeState* scene) { gm_801A5F64(scene, &gmMainLib_804D3EE0->unk_F90, 0); } -void gm_801B9180_OnInit(void) +void gm_Mode_GiantVs_OnInit(void) { gm_80167B50(&gmMainLib_804D3EE0->unk_F90); } -void gm_801B91A8_OnLoad(void) +void gm_Mode_GiantVs_OnLoad(void) { gm_801A55C4(); } diff --git a/src/melee/gm/gmgiant.h b/src/melee/gm/gmgiant.h index ebce114ea8..790b70b817 100644 --- a/src/melee/gm/gmgiant.h +++ b/src/melee/gm/gmgiant.h @@ -4,18 +4,18 @@ #include #include -/* 1B8FB8 */ void gm_801B8FB8(GameScene*); -/* 1B8FE4 */ void gm_801B8FE4(GameScene*); -/* 1B900C */ void gm_801B900C(GameScene*); -/* 1B9034 */ void gm_801B9034(GameScene*); +/* 1B8FB8 */ void gm_801B8FB8(GameModeState*); +/* 1B8FE4 */ void gm_801B8FE4(GameModeState*); +/* 1B900C */ void gm_801B900C(GameModeState*); +/* 1B9034 */ void gm_801B9034(GameModeState*); /* 1B9060 */ void fn_801B9060(PlayerInitData*, PlayerInitData*); -/* 1B9084 */ void gm_801B9084(GameScene*); -/* 1B90B8 */ void gm_801B90B8(GameScene*); -/* 1B90E0 */ void gm_801B90E0(GameScene*); -/* 1B9114 */ void gm_801B9114(GameScene*); -/* 1B9134 */ void gm_801B9134(GameScene*); -/* 1B9154 */ void gm_801B9154(GameScene*); -/* 1B9180 */ void gm_801B9180_OnInit(void); -/* 1B91A8 */ void gm_801B91A8_OnLoad(void); +/* 1B9084 */ void gm_801B9084(GameModeState*); +/* 1B90B8 */ void gm_801B90B8(GameModeState*); +/* 1B90E0 */ void gm_801B90E0(GameModeState*); +/* 1B9114 */ void gm_801B9114(GameModeState*); +/* 1B9134 */ void gm_801B9134(GameModeState*); +/* 1B9154 */ void gm_801B9154(GameModeState*); +/* 1B9180 */ void gm_Mode_GiantVs_OnInit(void); +/* 1B91A8 */ void gm_Mode_GiantVs_OnLoad(void); #endif diff --git a/src/melee/gm/gmgover.c b/src/melee/gm/gmgover.c index 8805568e77..1a8f507f0a 100644 --- a/src/melee/gm/gmgover.c +++ b/src/melee/gm/gmgover.c @@ -9,14 +9,14 @@ #include "melee/gm/types.h" #include "melee/lb/lbmthp.h" -/* 1BEE9C */ static void gm_801BEE9C(GameScene*); -/* 1BEF84 */ static void gm_801BEF84(GameScene*); +/* 1BEE9C */ static void gm_801BEE9C(GameModeState*); +/* 1BEF84 */ static void gm_801BEF84(GameModeState*); /* 1BEFF0 */ static int gm_801BEFF0(void); /* 1BF030 */ static int gm_801BF030(void); /* 49C178 */ static u8 gm_8049C178[16]; /* 4D6920 */ static UNK_T gm_804D6920[2]; -GameScene gm_803DFB08[] = { +GameModeState gm_Mode_GOver_States[] = { { 0, lbDvdPreload_2, @@ -68,7 +68,7 @@ GameScene gm_803DFB08[] = { { -1 }, }; -GameScene gm_803DFB80_Scenes[] = { +GameModeState gm_Mode_DebugGOver_States[] = { { 0, lbDvdPreload_2, @@ -96,12 +96,12 @@ GameScene gm_803DFB80_Scenes[] = { { -1 }, }; -void gm_801BEE9C(GameScene* arg0) +void gm_801BEE9C(GameModeState* arg0) { s8* game_mode; u8 ckind; - game_mode = arg0->info.leave_data; + game_mode = arg0->info.exit_data; ckind = gm_80173224(gm_801BF030(), 1); if (gm_801BEFB0() == CKIND_GAMEWATCH && !gm_80164430(0x1B)) { gm_80164504(0x1B); @@ -121,7 +121,7 @@ void gm_801BEE9C(GameScene* arg0) gm_SetNewGameModePending(); } -void gm_801BEF84(GameScene* arg) +void gm_801BEF84(GameModeState* arg) { lbMthp_8001F800(); } diff --git a/src/melee/gm/gmhanyucss.c b/src/melee/gm/gmhanyucss.c index f5408e86d8..b69718d2f1 100644 --- a/src/melee/gm/gmhanyucss.c +++ b/src/melee/gm/gmhanyucss.c @@ -6,11 +6,11 @@ #include "melee/gm/types.h" #include "melee/mn/types.h" -/* 1BED3C */ static void gm_801BED3C(GameScene*); -/* 1BEDA8 */ static void gm_801BEDA8(GameScene*); +/* 1BED3C */ static void gm_801BED3C(GameModeState*); +/* 1BEDA8 */ static void gm_801BEDA8(GameModeState*); /* 49BEE8 */ static CSSData gm_8049BEE8; -GameScene gm_803DFAA8_Scenes[] = { +GameModeState gm_Mode_HanyuCss_States[] = { { 0, lbDvdPreload_2, @@ -26,7 +26,7 @@ GameScene gm_803DFAA8_Scenes[] = { { -1 }, }; -void gm_801BED3C(GameScene* arg0) +void gm_801BED3C(GameModeState* arg0) { CSSData* temp_r31 = gm_GetGameSceneLoadData(arg0); temp_r31->data = *gm_801A5244(); @@ -37,7 +37,7 @@ void gm_801BED3C(GameScene* arg0) } } -void gm_801BEDA8(GameScene* arg0) +void gm_801BEDA8(GameModeState* arg0) { CSSData* css = gm_GetGameSceneLoadData(arg0); VsModeData* vs = gm_801A5244(); diff --git a/src/melee/gm/gmhanyucss.h b/src/melee/gm/gmhanyucss.h index 17e57df646..a84facad90 100644 --- a/src/melee/gm/gmhanyucss.h +++ b/src/melee/gm/gmhanyucss.h @@ -3,6 +3,6 @@ #include "gm/types.h" -/* 3DFB08 */ extern GameScene gm_803DFB08[]; +/* 3DFB08 */ extern GameModeState gm_Mode_GOver_States[]; #endif diff --git a/src/melee/gm/gmhanyusss.c b/src/melee/gm/gmhanyusss.c index 75f86c67d0..0b2b763e07 100644 --- a/src/melee/gm/gmhanyusss.c +++ b/src/melee/gm/gmhanyusss.c @@ -6,10 +6,10 @@ #include "melee/lb/types.h" #include "melee/mn/types.h" -/* 1BEE58 */ static void gm_801BEE58(GameScene*); +/* 1BEE58 */ static void gm_801BEE58(GameModeState*); /* 49C030 */ static CSSData gm_8049C030; -GameScene gm_803DFAD8_Scenes[] = { +GameModeState gm_Mode_HanyuSss_States[] = { { 0, lbDvdPreload_2, @@ -25,7 +25,7 @@ GameScene gm_803DFAD8_Scenes[] = { { -1 }, }; -void gm_801BEE58(GameScene* arg0) +void gm_801BEE58(GameModeState* arg0) { SSSData* var_r3 = gm_GetGameSceneLoadData(arg0); var_r3->data = gmMainLib_804D3EE0->unk_590; diff --git a/src/melee/gm/gmhanyusss.h b/src/melee/gm/gmhanyusss.h index f4687e1255..4b70a88346 100644 --- a/src/melee/gm/gmhanyusss.h +++ b/src/melee/gm/gmhanyusss.h @@ -3,6 +3,6 @@ #include "gm/types.h" -/* 3DFAD8 */ extern GameScene gm_803DFAD8_Scenes[]; +/* 3DFAD8 */ extern GameModeState gm_Mode_HanyuSss_States[]; #endif diff --git a/src/melee/gm/gmhomerun.c b/src/melee/gm/gmhomerun.c index 1bc5d3bc86..e2abcc2e01 100644 --- a/src/melee/gm/gmhomerun.c +++ b/src/melee/gm/gmhomerun.c @@ -15,7 +15,7 @@ #include #include -GameScene gm_803DF198_Scenes[] = { +GameModeState gm_Mode_Homerun_States[] = { { 0, 3, @@ -47,7 +47,7 @@ VsModeData gm_80497618; static u8 gm_804D68F8; static u8 gm_804D68F9; -void gm_801B98E8(GameScene* scene) +void gm_801B98E8(GameModeState* scene) { CSSData* css; struct GameCache* game_cache; @@ -71,7 +71,7 @@ void gm_801B98E8(GameScene* scene) gm_804D68F9 = lbTime_8000AF74(gm_804D68F9, 1); } -void gm_801B999C(GameScene* scene) +void gm_801B999C(GameModeState* scene) { VsModeData* vs = &gm_80497618; CSSData* temp_r3; @@ -92,7 +92,7 @@ void gm_801B999C(GameScene* scene) vs->data.players[1].team = 1; } -void gm_801B9A3C(GameScene* arg0) +void gm_801B9A3C(GameModeState* arg0) { StartMeleeData* data; VsModeData* vs = &gm_80497618; @@ -138,7 +138,7 @@ void gm_801B9A3C(GameScene* arg0) gm_80180B18(); } -void gm_801B9DD8(GameScene* arg0) +void gm_801B9DD8(GameModeState* arg0) { u32 temp_r31; s32* temp_r3_2; @@ -172,13 +172,13 @@ void gm_801B9DD8(GameScene* arg0) } } -void gm_801B9EB8_OnInit(void) +void gm_Mode_Homerun_OnInit(void) { VsModeData* data = &gm_80497618; gm_80167B50(data); } -void gm_801B9EE4_OnLoad(void) +void gm_Mode_Homerun_OnLoad(void) { gm_804D68F8 = gm_801677F0(); gm_804D68F9 = 0; diff --git a/src/melee/gm/gmhomerun.h b/src/melee/gm/gmhomerun.h index caab09bbf5..01d8c6fdfd 100644 --- a/src/melee/gm/gmhomerun.h +++ b/src/melee/gm/gmhomerun.h @@ -3,11 +3,11 @@ #include -/* 1B98E8 */ void gm_801B98E8(GameScene*); -/* 1B999C */ void gm_801B999C(GameScene*); -/* 1B9A3C */ void gm_801B9A3C(GameScene*); -/* 1B9DD8 */ void gm_801B9DD8(GameScene*); -/* 1B9EB8 */ void gm_801B9EB8_OnInit(void); -/* 1B9EE4 */ void gm_801B9EE4_OnLoad(void); +/* 1B98E8 */ void gm_801B98E8(GameModeState*); +/* 1B999C */ void gm_801B999C(GameModeState*); +/* 1B9A3C */ void gm_801B9A3C(GameModeState*); +/* 1B9DD8 */ void gm_801B9DD8(GameModeState*); +/* 1B9EB8 */ void gm_Mode_Homerun_OnInit(void); +/* 1B9EE4 */ void gm_Mode_Homerun_OnLoad(void); #endif diff --git a/src/melee/gm/gmhowto.c b/src/melee/gm/gmhowto.c index a0584ac1f5..33df8b85c1 100644 --- a/src/melee/gm/gmhowto.c +++ b/src/melee/gm/gmhowto.c @@ -28,7 +28,7 @@ UNK_T gm_801ACC94(void) static HSD_GObj* gm_804D6850; -void gm_801ACCA0_OnEnter(void* unused) +void gm_Scene_HowTo_OnEnter(void* unused) { HSD_GObj* gobj; PAD_STACK(8); @@ -49,7 +49,7 @@ void gm_801ACCA0_OnEnter(void* unused) gm_804D6724 = fn_801AA0E8; } -void gm_801ACD8C_OnFrame(void) +void gm_Scene_HowTo_OnFrame(void) { bool var_r31 = false; PAD_STACK(4); diff --git a/src/melee/gm/gmhowto.h b/src/melee/gm/gmhowto.h index b6681f71a6..3da594df43 100644 --- a/src/melee/gm/gmhowto.h +++ b/src/melee/gm/gmhowto.h @@ -4,7 +4,7 @@ #include /* 1ACC94 */ UNK_T gm_801ACC94(void); -/* 1ACCA0 */ void gm_801ACCA0_OnEnter(void*); -/* 1ACD8C */ void gm_801ACD8C_OnFrame(void); +/* 1ACCA0 */ void gm_Scene_HowTo_OnEnter(void*); +/* 1ACD8C */ void gm_Scene_HowTo_OnFrame(void); #endif diff --git a/src/melee/gm/gminvisible.c b/src/melee/gm/gminvisible.c index c3add0286e..493dd3933d 100644 --- a/src/melee/gm/gminvisible.c +++ b/src/melee/gm/gminvisible.c @@ -9,7 +9,7 @@ #include "if/if_2FD9.h" -GameScene gm_803DF390_Scenes[] = { +GameModeState gm_Mode_InvisibleVs_States[] = { { 0, 3, @@ -109,23 +109,23 @@ GameScene gm_803DF390_Scenes[] = { { -1 }, }; -void gm_801BA30C(GameScene* scene) +void gm_801BA30C(GameModeState* scene) { VsModeData* data = &gmMainLib_804D3EE0->unk_810; gm_801A5618(scene, data, 6); } -void gm_801BA338(GameScene* scene) +void gm_801BA338(GameModeState* scene) { gm_801A5680(scene, &gmMainLib_804D3EE0->unk_810); } -void gm_801BA360(GameScene* scene) +void gm_801BA360(GameModeState* scene) { gm_801A5754(scene, &gmMainLib_804D3EE0->unk_810); } -void gm_801BA388(GameScene* scene) +void gm_801BA388(GameModeState* scene) { gm_801A57A8(scene, &gmMainLib_804D3EE0->unk_810, 0); } @@ -135,45 +135,45 @@ void fn_801BA3B4(PlayerInitData* arg0, PlayerInitData* unused) arg0->xC_b4 = true; } -void gm_801BA3C8(GameScene* scene) +void gm_801BA3C8(GameModeState* scene) { VsModeData* data = &gmMainLib_804D3EE0->unk_810; gm_801A583C(scene, data, NULL, fn_801BA3B4); } -void gm_801BA3FC(GameScene* scene) +void gm_801BA3FC(GameModeState* scene) { gm_801A5AF0(scene, 4, 3); } -void gm_801BA424(GameScene* scene) +void gm_801BA424(GameModeState* scene) { VsModeData* data = &gmMainLib_804D3EE0->unk_810; gm_801A5C3C(scene, data, NULL, fn_801BA3B4); } -void gm_801BA458(GameScene* scene) +void gm_801BA458(GameModeState* scene) { gm_801A5EC8(scene); } -void gm_801BA478(GameScene* scene) +void gm_801BA478(GameModeState* scene) { gm_801A5F00(scene); } -void gm_801BA498(GameScene* scene) +void gm_801BA498(GameModeState* scene) { VsModeData* data = &gmMainLib_804D3EE0->unk_810; gm_801A5F64(scene, data, 0); } -void gm_801BA4C4_OnInit(void) +void gm_Mode_InvisibleVs_OnInit(void) { gm_80167B50(&gmMainLib_804D3EE0->unk_810); } -void gm_801BA4EC_OnLoad(void) +void gm_Mode_InvisibleVs_OnLoad(void) { gm_801A55C4(); } diff --git a/src/melee/gm/gminvisible.h b/src/melee/gm/gminvisible.h index dfe9b92a5f..5ad8b98dc9 100644 --- a/src/melee/gm/gminvisible.h +++ b/src/melee/gm/gminvisible.h @@ -4,18 +4,18 @@ #include #include -void gm_801BA30C(GameScene* scene); -void gm_801BA338(GameScene* scene); -void gm_801BA360(GameScene* scene); -void gm_801BA388(GameScene* scene); +void gm_801BA30C(GameModeState* scene); +void gm_801BA338(GameModeState* scene); +void gm_801BA360(GameModeState* scene); +void gm_801BA388(GameModeState* scene); void fn_801BA3B4(PlayerInitData* arg0, PlayerInitData* unused); -void gm_801BA3C8(GameScene* scene); -void gm_801BA3FC(GameScene* scene); -void gm_801BA424(GameScene* scene); -void gm_801BA458(GameScene* scene); -void gm_801BA478(GameScene* scene); -void gm_801BA498(GameScene* scene); -void gm_801BA4C4_OnInit(void); -void gm_801BA4EC_OnLoad(void); +void gm_801BA3C8(GameModeState* scene); +void gm_801BA3FC(GameModeState* scene); +void gm_801BA424(GameModeState* scene); +void gm_801BA458(GameModeState* scene); +void gm_801BA478(GameModeState* scene); +void gm_801BA498(GameModeState* scene); +void gm_Mode_InvisibleVs_OnInit(void); +void gm_Mode_InvisibleVs_OnLoad(void); #endif diff --git a/src/melee/gm/gmlightning.c b/src/melee/gm/gmlightning.c index b0c1741151..21b8204b46 100644 --- a/src/melee/gm/gmlightning.c +++ b/src/melee/gm/gmlightning.c @@ -9,7 +9,7 @@ #include "if/if_2FD9.h" -GameScene gm_803DF540_Scenes[] = { +GameModeState gm_Mode_LightningVs_States[] = { { 0, 3, @@ -109,22 +109,22 @@ GameScene gm_803DF540_Scenes[] = { { -1 }, }; -void gm_801BA704(GameScene* scene) +void gm_801BA704(GameModeState* scene) { gm_801A5618(scene, &gmMainLib_804D3EE0->unk_1350, 9); } -void gm_801BA730(GameScene* scene) +void gm_801BA730(GameModeState* scene) { gm_801A5680(scene, &gmMainLib_804D3EE0->unk_1350); } -void gm_801BA758(GameScene* scene) +void gm_801BA758(GameModeState* scene) { gm_801A5754(scene, &gmMainLib_804D3EE0->unk_1350); } -void gm_801BA780(GameScene* scene) +void gm_801BA780(GameModeState* scene) { gm_801A57A8(scene, &gmMainLib_804D3EE0->unk_1350, 0); } @@ -135,44 +135,44 @@ static void fn_801BA7AC(StartMeleeData* data, StartMeleeData* unused) data->rules.x34 = 1.25F; } -void gm_801BA7B8(GameScene* scene) +void gm_801BA7B8(GameModeState* scene) { VsModeData* data = &gmMainLib_804D3EE0->unk_1350; gm_801A583C(scene, data, fn_801BA7AC, NULL); } -void gm_801BA7EC(GameScene* scene) +void gm_801BA7EC(GameModeState* scene) { gm_801A5AF0(scene, 4, 3); } -void gm_801BA814(GameScene* scene) +void gm_801BA814(GameModeState* scene) { VsModeData* data = &gmMainLib_804D3EE0->unk_1350; gm_801A5C3C(scene, data, fn_801BA7AC, NULL); } -void gm_801BA848(GameScene* scene) +void gm_801BA848(GameModeState* scene) { gm_801A5EC8(scene); } -void gm_801BA868(GameScene* scene) +void gm_801BA868(GameModeState* scene) { gm_801A5F00(scene); } -void gm_801BA888(GameScene* scene) +void gm_801BA888(GameModeState* scene) { gm_801A5F64(scene, &gmMainLib_804D3EE0->unk_1350, 0); } -void gm_801BA8B4_OnInit(void) +void gm_Mode_LightningVs_OnInit(void) { gm_80167B50(&gmMainLib_804D3EE0->unk_1350); } -void gm_801BA8DC_OnLoad(void) +void gm_Mode_LightningVs_OnLoad(void) { gm_801A55C4(); } diff --git a/src/melee/gm/gmlightning.h b/src/melee/gm/gmlightning.h index dfa574f42c..d46385c7b5 100644 --- a/src/melee/gm/gmlightning.h +++ b/src/melee/gm/gmlightning.h @@ -3,17 +3,17 @@ #include -/* 1BA704 */ void gm_801BA704(GameScene*); -/* 1BA730 */ void gm_801BA730(GameScene*); -/* 1BA758 */ void gm_801BA758(GameScene*); -/* 1BA780 */ void gm_801BA780(GameScene*); -/* 1BA7B8 */ void gm_801BA7B8(GameScene*); -/* 1BA7EC */ void gm_801BA7EC(GameScene*); -/* 1BA814 */ void gm_801BA814(GameScene*); -/* 1BA848 */ void gm_801BA848(GameScene*); -/* 1BA868 */ void gm_801BA868(GameScene*); -/* 1BA888 */ void gm_801BA888(GameScene*); -/* 1BA8B4 */ void gm_801BA8B4_OnInit(void); -/* 1BA8DC */ void gm_801BA8DC_OnLoad(void); +/* 1BA704 */ void gm_801BA704(GameModeState*); +/* 1BA730 */ void gm_801BA730(GameModeState*); +/* 1BA758 */ void gm_801BA758(GameModeState*); +/* 1BA780 */ void gm_801BA780(GameModeState*); +/* 1BA7B8 */ void gm_801BA7B8(GameModeState*); +/* 1BA7EC */ void gm_801BA7EC(GameModeState*); +/* 1BA814 */ void gm_801BA814(GameModeState*); +/* 1BA848 */ void gm_801BA848(GameModeState*); +/* 1BA868 */ void gm_801BA868(GameModeState*); +/* 1BA888 */ void gm_801BA888(GameModeState*); +/* 1BA8B4 */ void gm_Mode_LightningVs_OnInit(void); +/* 1BA8DC */ void gm_Mode_LightningVs_OnLoad(void); #endif diff --git a/src/melee/gm/gmmenu.c b/src/melee/gm/gmmenu.c index acc90299ee..b9878a2b3e 100644 --- a/src/melee/gm/gmmenu.c +++ b/src/melee/gm/gmmenu.c @@ -7,7 +7,7 @@ #include #include -void gm_801A50B8_OnLoad(void) +void gm_Mode_ClassicGOver_OnLoad(void) { u8 var_r0; UnkAllstarData* temp_r3; @@ -26,7 +26,7 @@ void gm_801A50B8_OnLoad(void) gm_801BF020(1); } -void gm_801A5130_OnLoad(void) +void gm_Mode_AdventureGOver_OnLoad(void) { u8 var_r0; UnkAdventureData* temp_r3; @@ -45,7 +45,7 @@ void gm_801A5130_OnLoad(void) gm_801BF020(0); } -void gm_801A51A8_OnLoad(void) +void gm_Mode_AllstarGOver_OnLoad(void) { UnkAllstarData* tmp = &gm_80473A18; u8 var_r0; @@ -62,7 +62,7 @@ void gm_801A51A8_OnLoad(void) gm_801BF020(2); } -void gm_801A5220_OnLoad(void) +void gm_Mode_Opening_OnLoad(void) { gm_SetSceneIndex(gm_801BF718()); } diff --git a/src/melee/gm/gmmenu.h b/src/melee/gm/gmmenu.h index 37fb594aac..22441c992e 100644 --- a/src/melee/gm/gmmenu.h +++ b/src/melee/gm/gmmenu.h @@ -1,9 +1,9 @@ #ifndef MELEE_GM_MENU_H #define MELEE_GM_MENU_H -/* 1A50B8 */ void gm_801A50B8_OnLoad(void); -/* 1A5130 */ void gm_801A5130_OnLoad(void); -/* 1A51A8 */ void gm_801A51A8_OnLoad(void); -/* 1A5220 */ void gm_801A5220_OnLoad(void); +/* 1A50B8 */ void gm_Mode_ClassicGOver_OnLoad(void); +/* 1A5130 */ void gm_Mode_AdventureGOver_OnLoad(void); +/* 1A51A8 */ void gm_Mode_AllstarGOver_OnLoad(void); +/* 1A5220 */ void gm_Mode_Opening_OnLoad(void); #endif diff --git a/src/melee/gm/gmmenumode.c b/src/melee/gm/gmmenumode.c index 5bbbf7e834..7ec2f3fa80 100644 --- a/src/melee/gm/gmmenumode.c +++ b/src/melee/gm/gmmenumode.c @@ -21,14 +21,14 @@ struct DebugSoundTestData { u32 x4; }; -/* 1B0FB8 */ static void onEnterDebug(GameScene*); -/* 1B0FF8 */ static void onEnter(GameScene*); -/* 1B138C */ static void onExit(GameScene*); +/* 1B0FB8 */ static void onEnterDebug(GameModeState*); +/* 1B0FF8 */ static void onEnter(GameModeState*); +/* 1B138C */ static void onExit(GameModeState*); /* 4D68B0 */ static struct DebugSoundTestData debug_enter_data; /* 4D68B8 */ static MenuEnterData* enter_data; /* 4D68BC */ static MenuExitData* exit_data; -GameScene gm_803DD888_Scenes[] = { +GameModeState gm_Mode_DebugMenu_States[] = { { 0, lbDvdPreload_2, @@ -44,7 +44,7 @@ GameScene gm_803DD888_Scenes[] = { { -1 }, }; -GameScene gm_803DD8B8_Scenes[] = { +GameModeState gm_Mode_Menu_States[] = { { 0, lbDvdPreload_2, @@ -60,7 +60,7 @@ GameScene gm_803DD8B8_Scenes[] = { { -1 }, }; -void onEnterDebug(GameScene* arg0) +void onEnterDebug(GameModeState* arg0) { struct DebugSoundTestData* data; @@ -71,13 +71,13 @@ void onEnterDebug(GameScene* arg0) un_802FF884("/audio"); } -void onEnter(GameScene* scene) +void onEnter(GameModeState* scene) { GameRules* rules; MenuEnterData* data; GameModeKind previous_mode; - data = scene->info.load_data; + data = scene->info.enter_data; lb_8001C550(); lb_8001D164(0); lbSnap_8001E218(HSD_MemAlloc(lbSnap_8001E204()), @@ -211,7 +211,7 @@ void onEnter(GameScene* scene) data->menu_kind = MENU_KIND_SPECIAL; data->hovered_selection = SEL_SPECIAL_VS_LIGHTNING; return; - case GM_FIXED_CAMERA_VS: + case GM_CAMERA_VS: data->menu_kind = MENU_KIND_SPECIAL; data->hovered_selection = SEL_SPECIAL_VS_FIXED_CAMERA; return; @@ -242,9 +242,9 @@ void onEnter(GameScene* scene) } } -void onExit(GameScene* arg0) +void onExit(GameModeState* arg0) { - MenuExitData* data = arg0->info.leave_data; + MenuExitData* data = arg0->info.exit_data; gm_SetPendingGameMode(data->pending_mode); gm_SetNewGameModePending(); diff --git a/src/melee/gm/gmmenumode.h b/src/melee/gm/gmmenumode.h index 7b226b27f2..e8c59821ef 100644 --- a/src/melee/gm/gmmenumode.h +++ b/src/melee/gm/gmmenumode.h @@ -3,7 +3,7 @@ #include "gm/types.h" -/* 3DD888 */ extern GameScene gm_803DD888_Scenes[]; -/* 3DD8B8 */ extern GameScene gm_803DD8B8_Scenes[]; +/* 3DD888 */ extern GameModeState gm_Mode_DebugMenu_States[]; +/* 3DD8B8 */ extern GameModeState gm_Mode_Menu_States[]; #endif diff --git a/src/melee/gm/gmmovieend.c b/src/melee/gm/gmmovieend.c index a27909ea85..10a1499f24 100644 --- a/src/melee/gm/gmmovieend.c +++ b/src/melee/gm/gmmovieend.c @@ -21,7 +21,7 @@ #include #include -void gm_801A6254(GameScene* arg0) +void gm_801A6254(GameModeState* arg0) { u8 temp_ret; u8 temp_r0; @@ -48,12 +48,12 @@ void gm_801A6254(GameScene* arg0) } } -void gm_801A6308(GameScene* arg0) +void gm_801A6308(GameModeState* arg0) { gm_SetPendingSceneIndex(0); } -void gm_801A632C_OnEnter(void* arg0_) +void gm_Scene_DebugMenu_OnEnter(void* arg0_) { struct { UNK_T unk0; @@ -105,7 +105,7 @@ static int gm_803DB25C[0x1A] = { // clang-format on }; -void gm_801A637C_OnEnter(void* arg0) +void gm_Scene_MovieEnd_OnEnter(void* arg0) { HSD_GObj* temp_r3; HSD_GObj* temp_r3_2; @@ -132,7 +132,7 @@ void gm_801A637C_OnEnter(void* arg0) gm_804D6724 = fn_801AA0E8; } -void gm_801A64A8_OnFrame(void) +void gm_Scene_MovieEnd_OnFrame(void) { int temp_r31; bool var_r30; diff --git a/src/melee/gm/gmmovieend.h b/src/melee/gm/gmmovieend.h index 811f1d84fd..03990f1149 100644 --- a/src/melee/gm/gmmovieend.h +++ b/src/melee/gm/gmmovieend.h @@ -3,10 +3,10 @@ #include -/* 1A6254 */ void gm_801A6254(GameScene*); -/* 1A6308 */ void gm_801A6308(GameScene*); -/* 1A632C */ void gm_801A632C_OnEnter(void*); -/* 1A637C */ void gm_801A637C_OnEnter(void*); -/* 1A64A8 */ void gm_801A64A8_OnFrame(void); +/* 1A6254 */ void gm_801A6254(GameModeState*); +/* 1A6308 */ void gm_801A6308(GameModeState*); +/* 1A632C */ void gm_Scene_DebugMenu_OnEnter(void*); +/* 1A637C */ void gm_Scene_MovieEnd_OnEnter(void*); +/* 1A64A8 */ void gm_Scene_MovieEnd_OnFrame(void); #endif diff --git a/src/melee/gm/gmmultiman.c b/src/melee/gm/gmmultiman.c index e1e64c2665..ca3cfe6bf2 100644 --- a/src/melee/gm/gmmultiman.c +++ b/src/melee/gm/gmmultiman.c @@ -34,7 +34,7 @@ static u32 pad; static u8 gm_804D68F0; static s8 gm_804D68F1; -GameScene gm_803DECB8_Scenes[] = { +GameModeState gm_Mode_TargetTest_States[] = { { 0, 3, @@ -62,7 +62,7 @@ GameScene gm_803DECB8_Scenes[] = { { 0xFF }, }; -GameScene gm_803DED00_Scenes[] = { +GameModeState gm_Mode_10ManVs_States[] = { { 0, 3, @@ -90,7 +90,7 @@ GameScene gm_803DED00_Scenes[] = { { -1 }, }; -GameScene gm_803DED48_Scenes[] = { +GameModeState gm_Mode_100ManVs_States[] = { { 0, 3, @@ -118,7 +118,7 @@ GameScene gm_803DED48_Scenes[] = { { -1 }, }; -GameScene gm_803DED90_Scenes[] = { +GameModeState gm_Mode_3Min_States[] = { { 0, 3, @@ -146,7 +146,7 @@ GameScene gm_803DED90_Scenes[] = { { 0xFF }, }; -GameScene gm_803DEDD8_Scenes[] = { +GameModeState gm_Mode_15Min_States[] = { { 0, 3, @@ -174,7 +174,7 @@ GameScene gm_803DEDD8_Scenes[] = { { 0xFF }, }; -GameScene gm_803DEE20_Scenes[] = { +GameModeState gm_Mode_EndlessVs_States[] = { { 0, 3, @@ -202,7 +202,7 @@ GameScene gm_803DEE20_Scenes[] = { { -1 }, }; -GameScene gm_803DEE68_Scenes[] = { +GameModeState gm_Mode_CruelVs_States[] = { { 0, 3, @@ -235,7 +235,7 @@ UNK_T gm_801B6320(void) return &gmMainLib_804D3EE0->unk_530.unk_584; } -void gm_801B632C(GameScene* arg0) +void gm_801B632C(GameModeState* arg0) { struct gmm_x0_584_t* temp_r31 = &gmMainLib_804D3EE0->unk_530.unk_584; CSSData* temp_r30 = gm_GetGameSceneLoadData(arg0); @@ -252,7 +252,7 @@ void gm_801B632C(GameScene* arg0) gm_804D68E9 = lbTime_8000AF74(gm_804D68E9, 1); } -void gm_801B63C4(GameScene* arg0) +void gm_801B63C4(GameModeState* arg0) { struct gmm_x0_584_t* temp_r31 = &gmMainLib_804D3EE0->unk_530.unk_584; CSSData* temp_r3 = gm_GetGameSceneLeaveData(arg0); @@ -267,7 +267,7 @@ void gm_801B63C4(GameScene* arg0) gm_80168F88(); } -void gm_801B6428(GameScene* arg0) +void gm_801B6428(GameModeState* arg0) { struct gmm_x0_584_t* temp_r31; StartMeleeData* temp_r3 = gm_GetGameSceneLoadData(arg0); @@ -310,14 +310,14 @@ void gm_801B6428(GameScene* arg0) temp_r3->players[0].xC_b1 = false; temp_r3->rules.stkind = gm_801647F8(temp_r3->players[0].c_kind); { - PreloadCacheScene* scene = lbDvd_GetPreloadCacheScene(); + PreloadedGameModeState* scene = lbDvd_GetPreloadCacheScene(); scene->game_cache.stkind = temp_r3->rules.stkind; } lbDvd_80018254(); gm_8016F088(temp_r3); } -void gm_801B65D4(GameScene* arg0) +void gm_801B65D4(GameModeState* arg0) { s32 temp_r25; u8 temp_r25_2; @@ -406,7 +406,7 @@ void gm_801B65D4(GameScene* arg0) } } -void gm_801B67E8_OnInit(void) +void gm_Mode_TargetTest_OnInit(void) { struct gmm_x0_584_t* temp_r4 = &gmMainLib_804D3EE0->unk_530.unk_584; gmMainLib_804D3EE0->unk_530.unk_584.unk_584 = 0x21; @@ -414,18 +414,18 @@ void gm_801B67E8_OnInit(void) temp_r4->unk_586 = 0x78; } -void gm_801B6808_OnLoad(void) +void gm_Mode_TargetTest_OnLoad(void) { gm_804D68E8 = gm_801677F0(); gm_804D68E9 = 0; } -void gm_801B6834(void) +void gm_Mode_10ManVs_OnInit(void) { gm_80167B50(&gmMainLib_804D3EE0->unk_1490); } -void gm_801B685C(void) +void gm_Mode_10ManVs_OnLoad(void) { gm_804D68F0 = gm_801677F0(); gm_804D68F1 = 0; @@ -474,7 +474,7 @@ bool gm_801B688C(bool arg0) return false; } -static void gm_801B6AD8_inline(GameScene* scene, int x) +static void gm_801B6AD8_inline(GameModeState* scene, int x) { CSSData* temp_r3; VsModeData* temp_r31; @@ -524,7 +524,7 @@ void gm_801B69C0(StartMeleeData* arg0) arg0->rules.x0_3 = 6; } -void gm_801B6AD8(GameScene* scene) +void gm_801B6AD8(GameModeState* scene) { gm_801B6AD8_inline(scene, 0x11); } @@ -578,7 +578,7 @@ static inline void gmMultiman_InitScoreRules(StartMeleeData* match) match->rules.x5_1 = false; } -void gm_801B6B70(GameScene* scene) +void gm_801B6B70(GameModeState* scene) { VsModeData* data; CSSData* css_data; @@ -594,7 +594,7 @@ void gm_801B6B70(GameScene* scene) gmMultiman_LeaveFinish(data, css_data); } -void gm_801B6BE8(GameScene* scene) +void gm_801B6BE8(GameModeState* scene) { VsModeData* temp_r31; UnkMultimanData* temp_r30; @@ -661,7 +661,7 @@ static inline void gmMultiman_SaveCompletionRecord(VsModeData* multiman, } } -void gm_801B6F44(GameScene* scene) +void gm_801B6F44(GameModeState* scene) { UnkMultimanData* temp_r3_2; VsModeData* temp_r29; @@ -684,12 +684,12 @@ void gm_801B6F44(GameScene* scene) GM_10MAN_VS); } -void gm_801B7044(GameScene* scene) +void gm_801B7044(GameModeState* scene) { gm_801B6AD8_inline(scene, 0x12); } -void gm_801B70DC(GameScene* scene) +void gm_801B70DC(GameModeState* scene) { VsModeData* data; CSSData* css_data; @@ -705,7 +705,7 @@ void gm_801B70DC(GameScene* scene) gmMultiman_LeaveFinish(data, css_data); } -void gm_801B7154(GameScene* scene) +void gm_801B7154(GameModeState* scene) { VsModeData* temp_r31; UnkMultimanData* temp_r30; @@ -737,7 +737,7 @@ void gm_801B7154(GameScene* scene) gm_80181B64(temp_r31->data.players[0].c_kind, 0x22, 0x0FFFFFFF); } -void gm_801B74F0(GameScene* scene) +void gm_801B74F0(GameModeState* scene) { UnkMultimanData* temp_r3_2; VsModeData* temp_r29; @@ -759,12 +759,12 @@ void gm_801B74F0(GameScene* scene) GM_100MAN_VS); } -void gm_801B75F0(GameScene* scene) +void gm_801B75F0(GameModeState* scene) { gm_801B6AD8_inline(scene, 0x13); } -void gm_801B7688(GameScene* scene) +void gm_801B7688(GameModeState* scene) { VsModeData* data; CSSData* css_data; @@ -840,7 +840,7 @@ static inline void gmMultiman_SaveScoreRecord(UnkMultimanData* data, } } -void gm_801B7700(GameScene* scene) +void gm_801B7700(GameModeState* scene) { StartMeleeData* temp_r3; VsModeData* temp_r30; @@ -860,7 +860,7 @@ void gm_801B7700(GameScene* scene) gmMultiman_InitRecord(temp_r30, temp_r27, 0x23); } -void gm_801B7AA0(GameScene* scene) +void gm_801B7AA0(GameModeState* scene) { UnkMultimanData* temp_r3_2; VsModeData* temp_r30; @@ -881,12 +881,12 @@ void gm_801B7AA0(GameScene* scene) gmMultiman_SaveTimedRecord(temp_r30, temp_r3_2, temp_r31, false); } -void gm_801B7B74(GameScene* scene) +void gm_801B7B74(GameModeState* scene) { gm_801B6AD8_inline(scene, 0x14); } -void gm_801B7C0C(GameScene* scene) +void gm_801B7C0C(GameModeState* scene) { VsModeData* data; CSSData* css_data; @@ -902,7 +902,7 @@ void gm_801B7C0C(GameScene* scene) gmMultiman_LeaveFinish(data, css_data); } -void gm_801B7C84(GameScene* scene) +void gm_801B7C84(GameModeState* scene) { VsModeData* temp_r30; StartMeleeData* temp_r3; @@ -923,7 +923,7 @@ void gm_801B7C84(GameScene* scene) gmMultiman_InitRecord(temp_r30, temp_r27, 0x24); } -void gm_801B8024(GameScene* scene) +void gm_801B8024(GameModeState* scene) { UnkMultimanData* temp_r3_2; VsModeData* temp_r29; @@ -944,12 +944,12 @@ void gm_801B8024(GameScene* scene) gmMultiman_SaveTimedRecord(temp_r29, temp_r3_2, temp_r30, true); } -void gm_801B8110(GameScene* scene) +void gm_801B8110(GameModeState* scene) { gm_801B6AD8_inline(scene, 0x15); } -void gm_801B81A8(GameScene* scene) +void gm_801B81A8(GameModeState* scene) { VsModeData* data; CSSData* css_data; @@ -965,7 +965,7 @@ void gm_801B81A8(GameScene* scene) gmMultiman_LeaveFinish(data, css_data); } -void gm_801B8220(GameScene* scene) +void gm_801B8220(GameModeState* scene) { VsModeData* temp_r30 = &gmMainLib_804D3EE0->unk_1490; StartMeleeData* temp_r3 = gm_GetGameSceneLoadData(scene); @@ -983,7 +983,7 @@ void gm_801B8220(GameScene* scene) gmMultiman_InitScoreRecord(temp_r30, temp_r29, 0x25); } -void gm_801B8580(GameScene* scene) +void gm_801B8580(GameModeState* scene) { UnkMultimanData* temp_r3_2; VsModeData* temp_r30; @@ -1004,12 +1004,12 @@ void gm_801B8580(GameScene* scene) gmMultiman_SaveScoreRecord(temp_r3_2, temp_r31); } -void gm_801B863C(GameScene* scene) +void gm_801B863C(GameModeState* scene) { gm_801B6AD8_inline(scene, 0x16); } -void gm_801B86D4(GameScene* scene) +void gm_801B86D4(GameModeState* scene) { VsModeData* data; CSSData* css_data; @@ -1025,7 +1025,7 @@ void gm_801B86D4(GameScene* scene) gmMultiman_LeaveFinish(data, css_data); } -void gm_801B874C(GameScene* scene) +void gm_801B874C(GameModeState* scene) { VsModeData* temp_r29 = &gmMainLib_804D3EE0->unk_1490; StartMeleeData* temp_r3 = gm_GetGameSceneLoadData(scene); @@ -1060,7 +1060,7 @@ void gm_801B874C(GameScene* scene) gmMultiman_InitScoreRecord(temp_r29, temp_r28, 0x26); } -void gm_801B8AF8(GameScene* arg0) +void gm_801B8AF8(GameModeState* arg0) { UnkMultimanData* temp_r3_2; VsModeData* temp_r30; diff --git a/src/melee/gm/gmmultiman.h b/src/melee/gm/gmmultiman.h index 620c462bbb..c43ad13014 100644 --- a/src/melee/gm/gmmultiman.h +++ b/src/melee/gm/gmmultiman.h @@ -7,39 +7,39 @@ #include /* 1B6320 */ UNK_T gm_801B6320(void); -/* 1B632C */ void gm_801B632C(GameScene*); -/* 1B63C4 */ void gm_801B63C4(GameScene*); -/* 1B6428 */ void gm_801B6428(GameScene*); -/* 1B65D4 */ void gm_801B65D4(GameScene*); -/* 1B67E8 */ void gm_801B67E8_OnInit(void); -/* 1B6808 */ void gm_801B6808_OnLoad(void); -/* 1B6834 */ void gm_801B6834(void); -/* 1B685C */ void gm_801B685C(void); +/* 1B632C */ void gm_801B632C(GameModeState*); +/* 1B63C4 */ void gm_801B63C4(GameModeState*); +/* 1B6428 */ void gm_801B6428(GameModeState*); +/* 1B65D4 */ void gm_801B65D4(GameModeState*); +/* 1B67E8 */ void gm_Mode_TargetTest_OnInit(void); +/* 1B6808 */ void gm_Mode_TargetTest_OnLoad(void); +/* 1B6834 */ void gm_Mode_10ManVs_OnInit(void); +/* 1B685C */ void gm_Mode_10ManVs_OnLoad(void); /* 1B688C */ bool gm_801B688C(bool); /* 1B69C0 */ void gm_801B69C0(StartMeleeData*); -/* 1B6AD8 */ void gm_801B6AD8(GameScene*); -/* 1B6B70 */ void gm_801B6B70(GameScene*); -/* 1B6BE8 */ void gm_801B6BE8(GameScene*); -/* 1B6F44 */ void gm_801B6F44(GameScene*); -/* 1B7044 */ void gm_801B7044(GameScene*); -/* 1B70DC */ void gm_801B70DC(GameScene*); -/* 1B7154 */ void gm_801B7154(GameScene*); -/* 1B74F0 */ void gm_801B74F0(GameScene*); -/* 1B75F0 */ void gm_801B75F0(GameScene*); -/* 1B7688 */ void gm_801B7688(GameScene*); -/* 1B7700 */ void gm_801B7700(GameScene*); -/* 1B7AA0 */ void gm_801B7AA0(GameScene*); -/* 1B7B74 */ void gm_801B7B74(GameScene*); -/* 1B7C0C */ void gm_801B7C0C(GameScene*); -/* 1B7C84 */ void gm_801B7C84(GameScene*); -/* 1B8024 */ void gm_801B8024(GameScene*); -/* 1B8110 */ void gm_801B8110(GameScene*); -/* 1B81A8 */ void gm_801B81A8(GameScene*); -/* 1B8220 */ void gm_801B8220(GameScene*); -/* 1B8580 */ void gm_801B8580(GameScene*); -/* 1B863C */ void gm_801B863C(GameScene*); -/* 1B86D4 */ void gm_801B86D4(GameScene*); -/* 1B874C */ void gm_801B874C(GameScene*); -/* 1B8AF8 */ void gm_801B8AF8(GameScene*); +/* 1B6AD8 */ void gm_801B6AD8(GameModeState*); +/* 1B6B70 */ void gm_801B6B70(GameModeState*); +/* 1B6BE8 */ void gm_801B6BE8(GameModeState*); +/* 1B6F44 */ void gm_801B6F44(GameModeState*); +/* 1B7044 */ void gm_801B7044(GameModeState*); +/* 1B70DC */ void gm_801B70DC(GameModeState*); +/* 1B7154 */ void gm_801B7154(GameModeState*); +/* 1B74F0 */ void gm_801B74F0(GameModeState*); +/* 1B75F0 */ void gm_801B75F0(GameModeState*); +/* 1B7688 */ void gm_801B7688(GameModeState*); +/* 1B7700 */ void gm_801B7700(GameModeState*); +/* 1B7AA0 */ void gm_801B7AA0(GameModeState*); +/* 1B7B74 */ void gm_801B7B74(GameModeState*); +/* 1B7C0C */ void gm_801B7C0C(GameModeState*); +/* 1B7C84 */ void gm_801B7C84(GameModeState*); +/* 1B8024 */ void gm_801B8024(GameModeState*); +/* 1B8110 */ void gm_801B8110(GameModeState*); +/* 1B81A8 */ void gm_801B81A8(GameModeState*); +/* 1B8220 */ void gm_801B8220(GameModeState*); +/* 1B8580 */ void gm_801B8580(GameModeState*); +/* 1B863C */ void gm_801B863C(GameModeState*); +/* 1B86D4 */ void gm_801B86D4(GameModeState*); +/* 1B874C */ void gm_801B874C(GameModeState*); +/* 1B8AF8 */ void gm_801B8AF8(GameModeState*); #endif diff --git a/src/melee/gm/gmomake15.c b/src/melee/gm/gmomake15.c index e4e5892c06..4bd645de35 100644 --- a/src/melee/gm/gmomake15.c +++ b/src/melee/gm/gmomake15.c @@ -15,7 +15,7 @@ static HSD_GObj* gm_804D6858; -void gm_801ACE94_OnEnter(void* unused) +void gm_Scene_Omake15_OnEnter(void* unused) { HSD_GObj* gobj; HSD_SObj* temp_r3_2; @@ -38,7 +38,7 @@ void gm_801ACE94_OnEnter(void* unused) gm_804D6724 = fn_801AA0E8; } -void gm_801ACF8C_OnFrame(void) +void gm_Scene_Omake15_OnFrame(void) { bool var_r31 = false; PAD_STACK(4); diff --git a/src/melee/gm/gmomake15.h b/src/melee/gm/gmomake15.h index 8be0b7a125..cf3008c260 100644 --- a/src/melee/gm/gmomake15.h +++ b/src/melee/gm/gmomake15.h @@ -1,7 +1,7 @@ #ifndef MELEE_GM_OMAKE15_H #define MELEE_GM_OMAKE15_H -/* 1ACE94 */ void gm_801ACE94_OnEnter(void*); -/* 1ACF8C */ void gm_801ACF8C_OnFrame(void); +/* 1ACE94 */ void gm_Scene_Omake15_OnEnter(void*); +/* 1ACF8C */ void gm_Scene_Omake15_OnFrame(void); #endif diff --git a/src/melee/gm/gmopening.c b/src/melee/gm/gmopening.c index 829d106cb2..c5cace69a6 100644 --- a/src/melee/gm/gmopening.c +++ b/src/melee/gm/gmopening.c @@ -140,7 +140,7 @@ void fn_801AA0E8(void) 1250, 2, 394, 1, 65536, 2, }; -void gm_801AA110_OnEnter(UNK_T arg0) +void gm_Scene_Opening_OnEnter(UNK_T arg0) { HSD_GObj* temp_r3; HSD_GObj* temp_r3_2; @@ -187,7 +187,7 @@ void gm_801AA110_OnEnter(UNK_T arg0) gm_804D6724 = fn_801AA0E8; } -void gm_801AA28C_OnFrame(void) +void gm_Scene_Opening_OnFrame(void) { HSD_GObj* temp_r3_2; int temp_r3; diff --git a/src/melee/gm/gmopening.h b/src/melee/gm/gmopening.h index 97d547ef2f..37d2fee8ad 100644 --- a/src/melee/gm/gmopening.h +++ b/src/melee/gm/gmopening.h @@ -8,8 +8,8 @@ /* 1A9DD0 */ void gm_801A9DD0(HSD_GObj*, u16, u16, int, int); /* 1A9FCC */ void* fn_801A9FCC(void); /* 1AA0E8 */ void fn_801AA0E8(void); -/* 1AA110 */ void gm_801AA110_OnEnter(void*); -/* 1AA28C */ void gm_801AA28C_OnFrame(void); +/* 1AA110 */ void gm_Scene_Opening_OnEnter(void*); +/* 1AA28C */ void gm_Scene_Opening_OnFrame(void); /* 4D67F0 */ extern HSD_SObjDesc* gm_804D67F0; /* 4D67EC */ extern u32 gm_804D67EC; diff --git a/src/melee/gm/gmopeningmode.c b/src/melee/gm/gmopeningmode.c index 55e4889105..4574e4be56 100644 --- a/src/melee/gm/gmopeningmode.c +++ b/src/melee/gm/gmopeningmode.c @@ -36,8 +36,8 @@ struct gm_random_history { u8 stage_usage[0x1D]; }; -/* 1BF060 */ static void onExitTitle(GameScene*); -/* 1BF4DC */ static void onEnterVs(GameScene*); +/* 1BF060 */ static void onExitTitle(GameModeState*); +/* 1BF4DC */ static void onEnterVs(GameModeState*); /* 1BF634 */ static void gm_801BF634(s32, s32); /* 1BF648 */ static int gm_801BF648(s32); /* 1BF65C */ static void gm_801BF65C(s32, s8); @@ -48,12 +48,12 @@ struct gm_random_history { /* 1BF6B8 */ static u8 gm_801BF6B8(void); /* 1BF6C8 */ static void gm_801BF6C8(int); /* 1BF6E8 */ static void gm_801BF6E8(int); -/* 1BF728 */ static void onEnterCutsceneLuigi(GameScene*); -/* 1BF834 */ static void onExitRegendCongrats(GameScene*); -/* 1BF85C */ static void onEnterMovie(GameScene*); -/* 1BF898 */ static void onExitMovie(GameScene*); -/* 1BF8B8 */ static void onExitHowto(GameScene*); -/* 1BF8D8 */ static void onExitOmake15(GameScene*); +/* 1BF728 */ static void onEnterCutsceneLuigi(GameModeState*); +/* 1BF834 */ static void onExitRegendCongrats(GameModeState*); +/* 1BF85C */ static void onEnterMovie(GameModeState*); +/* 1BF898 */ static void onExitMovie(GameModeState*); +/* 1BF8B8 */ static void onExitHowto(GameModeState*); +/* 1BF8D8 */ static void onExitOmake15(GameModeState*); /* 49C188 */ static StartMeleeData vs_enter_data; /* 49C2C0 */ static MatchExitInfo vs_exit_data; /* 4D6928 */ static UNK_T regend_congrats_enter_data; @@ -61,7 +61,7 @@ struct gm_random_history { /* 4D6930 */ static UNK_T title_exit_data[2]; /* 49E548 */ static struct gm_8049E548_t gm_8049E548; -GameScene gm_803DFBC8_Scenes[] = { +GameModeState gm_Mode_Opening_States[] = { { 0, lbDvdPreload_3, @@ -137,7 +137,7 @@ GameScene gm_803DFBC8_Scenes[] = { { -1 }, }; -GameScene gm_803DFC70_Scenes[] = { +GameModeState gm_Mode_DebugCutscene_States[] = { { 0, lbDvdPreload_2, @@ -285,7 +285,7 @@ GameScene gm_803DFC70_Scenes[] = { { -1 }, }; -void onExitTitle(GameScene* arg0) +void onExitTitle(GameModeState* arg0) { int* temp_r3 = gm_GetGameSceneLeaveData(arg0); if (DbLevel >= DbLKind_DebugRom) { @@ -466,7 +466,7 @@ void gm_PreloadTitleDemo(void) extern const f32 gm_804DAC88; -void onEnterVs(GameScene* arg0) +void onEnterVs(GameModeState* arg0) { StartMeleeData* md; VsModeData* temp_r30; @@ -619,7 +619,7 @@ static inline void gm_801BEFC0_noinline(int arg0) gm_801BEFC0_inner(arg0); } -void onEnterCutsceneLuigi(GameScene* arg) +void onEnterCutsceneLuigi(GameModeState* arg) { s32 temp_r31; s32 temp_r31_2; @@ -643,32 +643,32 @@ void onEnterCutsceneLuigi(GameScene* arg) gm_801BEFC0_noinline(HSD_Randi(4)); } -void onExitRegendCongrats(GameScene* arg) +void onExitRegendCongrats(GameModeState* arg) { gm_SetPendingGameMode(GM_TITLE); gm_SetNewGameModePending(); } -void onEnterMovie(GameScene* arg) +void onEnterMovie(GameModeState* arg) { - PreloadCacheScene* temp_r31 = lbDvd_GetPreloadCacheScene(); + PreloadedGameModeState* temp_r31 = lbDvd_GetPreloadCacheScene(); PAD_STACK(4); lbDvd_800174BC(); temp_r31->is_heap_persistent[1] = false; lbDvd_80018254(); } -void onExitMovie(GameScene* arg) +void onExitMovie(GameModeState* arg) { lbMthp_8001F800(); } -void onExitHowto(GameScene* arg) +void onExitHowto(GameModeState* arg) { lbMthp_8001F800(); } -void onExitOmake15(GameScene* arg) +void onExitOmake15(GameModeState* arg) { lbMthp_8001F800(); } diff --git a/src/melee/gm/gmprogressive.c b/src/melee/gm/gmprogressive.c index 8967706fcb..b45c0bc75a 100644 --- a/src/melee/gm/gmprogressive.c +++ b/src/melee/gm/gmprogressive.c @@ -115,7 +115,7 @@ static void gm_801AD254(int arg0) HSD_JObjAnimAll(jobj); } -void gm_801AD620_OnFrame(void) +void gm_Scene_ProgScan_OnFrame(void) { PAD_STACK(0x8); @@ -174,7 +174,7 @@ void gm_801AD620_OnFrame(void) } } -void gm_801AD874_OnEnter(UNK_T arg0) +void gm_Scene_ProgScan_OnEnter(UNK_T arg0) { int* dst = arg0; int var_r0; @@ -193,7 +193,7 @@ void gm_801AD874_OnEnter(UNK_T arg0) gm_80480D70.x20 = 0; } -void gm_801AD8EC_OnLeave(UNK_T arg0) +void gm_Scene_ProgScan_OnExit(UNK_T arg0) { int* dst = arg0; *dst = gm_80480D70.x14; diff --git a/src/melee/gm/gmprogressive.h b/src/melee/gm/gmprogressive.h index ad1f51d073..58d379c12a 100644 --- a/src/melee/gm/gmprogressive.h +++ b/src/melee/gm/gmprogressive.h @@ -1,8 +1,8 @@ #ifndef MELEE_GMPROGRESSIVE_H #define MELEE_GMPROGRESSIVE_H -void gm_801AD620_OnFrame(void); -void gm_801AD874_OnEnter(void*); -void gm_801AD8EC_OnLeave(void*); +void gm_Scene_ProgScan_OnFrame(void); +void gm_Scene_ProgScan_OnEnter(void*); +void gm_Scene_ProgScan_OnExit(void*); #endif diff --git a/src/melee/gm/gmprogressivemode.c b/src/melee/gm/gmprogressivemode.c index ff67aaa886..299b29dd6b 100644 --- a/src/melee/gm/gmprogressivemode.c +++ b/src/melee/gm/gmprogressivemode.c @@ -2,12 +2,12 @@ #include "gm/gm_1A3F.h" -/* 1BF8F8 */ static void gm_801BF8F8(GameScene*); -/* 1BF920 */ static void gm_801BF920(GameScene*); +/* 1BF8F8 */ static void gm_801BF8F8(GameModeState*); +/* 1BF920 */ static void gm_801BF920(GameModeState*); /* 4D6938 */ static UNK_T gm_804D6938; /* 4D693C */ static UNK_T gm_804D693C; -GameScene gm_803DFDA8_Scenes[] = { +GameModeState gm_Mode_ProgScan_States[] = { { 0, lbDvdPreload_2, @@ -23,13 +23,13 @@ GameScene gm_803DFDA8_Scenes[] = { { -1 }, }; -void gm_801BF8F8(GameScene* arg0) +void gm_801BF8F8(GameModeState* arg0) { int* val = gm_GetGameSceneLoadData(arg0); *val = 1; } -void gm_801BF920(GameScene* arg0) +void gm_801BF920(GameModeState* arg0) { gm_GetGameSceneLeaveData(arg0); gm_ChangeGameModeAfterCurrentScene(GM_BOOT); diff --git a/src/melee/gm/gmprogressivemode.h b/src/melee/gm/gmprogressivemode.h index 041bad8632..852ee4c730 100644 --- a/src/melee/gm/gmprogressivemode.h +++ b/src/melee/gm/gmprogressivemode.h @@ -3,6 +3,6 @@ #include "gm/types.h" -/* 3DFDA8 */ extern GameScene gm_803DFDA8_Scenes[]; +/* 3DFDA8 */ extern GameModeState gm_Mode_ProgScan_States[]; #endif diff --git a/src/melee/gm/gmregclear.c b/src/melee/gm/gmregclear.c index 6379399bda..adab9f1ac7 100644 --- a/src/melee/gm/gmregclear.c +++ b/src/melee/gm/gmregclear.c @@ -1501,12 +1501,12 @@ u8 gm_8017E440(void) return r31->x0.slot; } -u8 gm_8017E48C(GameScene* scene) +u8 gm_8017E48C(GameModeState* scene) { u8 count = 0; int i; - for (i = 0; scene->idx != gm_803DE1B8_Scenes[i].idx; i++) { - if (gm_803DE1B8_Scenes[i].info.scene_id == GS_VS) { + for (i = 0; scene->id != gm_Mode_Adventure_States[i].id; i++) { + if (gm_Mode_Adventure_States[i].info.scene_kind == GS_VS) { count++; } } diff --git a/src/melee/gm/gmregclear.h b/src/melee/gm/gmregclear.h index adcb14a38c..b1d6e87aff 100644 --- a/src/melee/gm/gmregclear.h +++ b/src/melee/gm/gmregclear.h @@ -51,7 +51,7 @@ /* 17E424 */ UnkAdventureData* gm_GetAdventureData(void); /* 17E430 */ u8 gm_8017E430(void); ///< returns a player slot /* 17E440 */ u8 gm_8017E440(void); -/* 17E48C */ u8 gm_8017E48C(GameScene*); +/* 17E48C */ u8 gm_8017E48C(GameModeState*); /* 17E4C4 */ struct gm_803DE650_t* gm_8017E4C4(u8); /* 17E500 */ u8 gm_8017E500(u8, u8); /* 17E528 */ f32 gm_8017E528(u8, u8); diff --git a/src/melee/gm/gmregtyfall.c b/src/melee/gm/gmregtyfall.c index a493cce55a..f7b437ed25 100644 --- a/src/melee/gm/gmregtyfall.c +++ b/src/melee/gm/gmregtyfall.c @@ -409,7 +409,7 @@ void gm_801A6EE4(void) } } -void gm_801A7070_OnEnter(void* unused) +void gm_Scene_ToyFall_OnEnter(void* unused) { s32 trophy; int i; @@ -549,7 +549,7 @@ void gm_801A7070_OnEnter(void* unused) lbAudioAx_800237A8(0x7EF40, 0x7FU, 0x40U); } -void gm_801A79D4_OnFrame(void) +void gm_Scene_ToyFall_OnFrame(void) { if (gm_804D6740 != 0) { gm_804D6740--; diff --git a/src/melee/gm/gmregtyfall.h b/src/melee/gm/gmregtyfall.h index 4765ba7830..3971cb2377 100644 --- a/src/melee/gm/gmregtyfall.h +++ b/src/melee/gm/gmregtyfall.h @@ -20,8 +20,8 @@ /* 1A6D78 */ void fn_801A6D78(HSD_GObj*, int); /* 1A6DC0 */ UNK_RET gm_801A6DC0(UNK_PARAMS); /* 1A6EE4 */ UNK_RET gm_801A6EE4(UNK_PARAMS); -/* 1A7070 */ void gm_801A7070_OnEnter(void* unused); -/* 1A79D4 */ void gm_801A79D4_OnFrame(void); +/* 1A7070 */ void gm_Scene_ToyFall_OnEnter(void* unused); +/* 1A79D4 */ void gm_Scene_ToyFall_OnFrame(void); /* 4D6798 */ extern HSD_Joint* gm_804D6798; /* 4D679C */ extern HSD_Archive* gm_804D679C; diff --git a/src/melee/gm/gmresult.c b/src/melee/gm/gmresult.c index 1f781e95c8..22d20c1619 100644 --- a/src/melee/gm/gmresult.c +++ b/src/melee/gm/gmresult.c @@ -1667,7 +1667,7 @@ static inline void gmResultReportModelGObj(void) HSD_ASSERT(0x6A2, 0); } -void gm_80177368_OnEnter(void* arg0_) +void gm_Scene_Results_OnEnter(void* arg0_) { ResultsMatchInfo* arg0 = arg0_; HSD_GObj* light_gobj; @@ -1764,7 +1764,7 @@ void gm_80177368_OnEnter(void* arg0_) } } -void gm_80177704_OnLeave(void* unused) +void gm_Scene_Results_OnExit(void* unused) { fn_801701AC(); } diff --git a/src/melee/gm/gmresult.h b/src/melee/gm/gmresult.h index b821f73647..060e3abe49 100644 --- a/src/melee/gm/gmresult.h +++ b/src/melee/gm/gmresult.h @@ -48,7 +48,7 @@ struct StatsList; /* 176D3C */ UNK_RET fn_80176D3C(Vec3*); /* 176F60 */ UNK_RET fn_80176F60(UNK_PARAMS); /* 1771C0 */ UNK_RET fn_801771C0(ResultsData*); -/* 177368 */ void gm_80177368_OnEnter(void*); -/* 177704 */ void gm_80177704_OnLeave(void*); +/* 177368 */ void gm_Scene_Results_OnEnter(void*); +/* 177704 */ void gm_Scene_Results_OnExit(void*); #endif diff --git a/src/melee/gm/gmscdata.c b/src/melee/gm/gmscdata.c index c448436a4e..d63459896d 100644 --- a/src/melee/gm/gmscdata.c +++ b/src/melee/gm/gmscdata.c @@ -65,72 +65,72 @@ #include "vi/vi1201v2.h" #include "vi/vi1202.h" -static GameSceneHandler scene_handlers[] = { +static GameScene scenes[] = { { GS_TITLE, - gmTitle_OnFrame, - gmTitle_OnEnter, + gm_Scene_Title_OnFrame, + gm_Scene_Title_OnEnter, NULL, NULL, }, { GS_MENU, - mn_8022DD38_OnFrame, - mn_8022DDA8_OnEnter, + mnMain_Scene_OnFrame, + mnMain_Scene_OnEnter, NULL, NULL, }, { GS_VS, - gm_8016D800, - gm_8016E934_OnEnter, - gm_8016E9C8, + gm_Scene_Vs_OnFrame, + gm_Scene_Vs_OnEnter, + gm_Scene_Vs_OnExit, NULL, }, { GS_SUDDEN_DEATH, - gm_8016D800, - gm_8016EBC0_OnEnter, - gm_8016E9C8, + gm_Scene_Vs_OnFrame, + gm_Scene_SuddenDeath_OnEnter, + gm_Scene_Vs_OnExit, NULL, }, { - GS_TRAINING_MODE, - gm_8016D32C_OnFrame, - gm_8016EC28_OnEnter, - gm_8016E9C8, + GS_TRAINING, + gm_Scene_Training_OnFrame, + gm_Scene_Training_OnEnter, + gm_Scene_Vs_OnExit, NULL, }, { GS_RESULTS, NULL, - gm_80177368_OnEnter, - gm_80177704_OnLeave, + gm_Scene_Results_OnEnter, + gm_Scene_Results_OnExit, NULL, }, { GS_DEBUG_MENU, NULL, - gm_801A632C_OnEnter, + gm_Scene_DebugMenu_OnEnter, NULL, NULL, }, { GS_CSS, - mnCharSel_802669F4_OnFrame, - mnCharSel_8026688C_OnEnter, - mnCharSel_80266D70_OnLeave, + mnCharSel_Scene_OnFrame, + mnCharSel_Scene_OnEnter, + mnCharSel_Scene_OnExit, NULL, }, { GS_SSS, - mnStageSel_8025B850_OnFrame, - mnStageSel_8025A998_OnEnter, - mnStageSel_8025BB5C_OnLeave, + mnStageSel_Scene_OnFrame, + mnStageSel_Scene_OnEnter, + mnStageSel_Scene_OnExit, NULL, }, { - GS_0xA, + GS_UNK10, NULL, NULL, NULL, @@ -138,240 +138,240 @@ static GameSceneHandler scene_handlers[] = { }, { GS_TOY_GALLERY, - Toy_OnFrame_80312018, - Toy_OnEnter_80311AB0, + Toy_Scene_OnFrame, + Toy_Scene_OnEnter, NULL, NULL, }, { GS_TOY_LOTTERY, - tyFigupon_OnFrame_803182D4, - tyFigupon_OnEnter_80317D80, + tyFigupon_Scene_OnFrame, + tyFigupon_Scene_OnEnter, NULL, NULL, }, { GS_TOY_COLLECTION, - tyDisplay_OnFrame_8031B9A4, - tyDisplay_OnEnter_8031B460, + tyDisplay_Scene_OnFrame, + tyDisplay_Scene_OnEnter, NULL, NULL, }, { GS_INTRO_NORMAL, - gm_8018838C_OnFrame, - gm_80187F48_OnEnter, - gm_80188364_OnLeave, + gm_Scene_IntroNormal_OnFrame, + gm_Scene_IntroNormal_OnEnter, + gm_Scene_IntroNormal_OnLeave, NULL, }, { GS_REGEND_TOYFALL, - gm_801A79D4_OnFrame, - gm_801A7070_OnEnter, + gm_Scene_ToyFall_OnFrame, + gm_Scene_ToyFall_OnEnter, NULL, NULL, }, { GS_REGEND_CONGRATS, - gm_801A9D0C_OnFrame, - gm_801A9B30_OnEnter, + gm_Scene_Congrats_OnFrame, + gm_Scene_Congrats_OnEnter, NULL, NULL, }, { GS_CUTSCENE_LUIGI, - vi0102_8031D000_OnFrame, - vi0102_Initialize_OnEnter, + vi0102_Scene_OnFrame, + vi0102_Scene_OnEnter, NULL, NULL, }, { GS_CUTSCENE_BRINSTAR, - un_8031D698_OnFrame, - un_8031D288_OnEnter, + vi0401_Scene_OnFrame, + vi0401_Scene_OnEnter, NULL, NULL, }, { GS_CUTSCENE_EXPLOSION, - vi_8031D9C4_OnFrame, - un_8031D858_OnEnter, + vi0402_Scene_OnFrame, + vi0402_Scene_OnEnter, NULL, NULL, }, { GS_CUTSCENE_3KIRBYS, - vi_8031E0F0_OnFrame, - un_8031DE58_OnEnter, + vi0501_Scene_OnFrame, + vi0501_Scene_OnEnter, NULL, NULL, }, { GS_CUTSCENE_GIANTKIRBY, - vi_8031E6CC_OnFrame, - un_8031E444_OnEnter, + vi0502_Scene_OnFrame, + vi0502_Scene_OnEnter, NULL, NULL, }, { GS_CUTSCENE_STARFOX, - vi_8031ED50_OnFrame, - un_8031EBBC_OnEnter, + vi0601_Scene_OnFrame, + vi0601_Scene_OnEnter, NULL, NULL, }, { GS_CUTSCENE_FZERO, - vi0801_OnFrame, - vi0801_OnEnter, + vi0801_Scene_OnFrame, + vi0801_Scene_OnEnter, NULL, NULL, }, { GS_CUTSCENE_METAL, - un_8031F960_OnFrame, - un_8031F714_OnEnter, + vi1101_Scene_OnFrame, + vi1101_Scene_OnEnter, NULL, NULL, }, { GS_CUTSCENE_BOWSERTOY, - un_80320490_OnFrame, - un_8031FD18_OnEnter, + vi1201v1_Scene_OnFrame, + vi1201v1_Scene_OnEnter, NULL, NULL, }, { GS_CUTSCENE_GIGATRANSFORM, - un_803210EC_OnFrame, - un_80320A40_OnEnter, + vi1201v2_Scene_OnFrame, + vi1201v2_Scene_OnEnter, NULL, NULL, }, { GS_CUTSCENE_GIGADEFEATED, - vi1202_OnFrame, - vi1202_OnEnter, + vi1202_Scene_OnFrame, + vi1202_Scene_OnEnter, NULL, NULL, }, { GS_MOVIE_OPENING, - gm_801AA28C_OnFrame, - gm_801AA110_OnEnter, + gm_Scene_Opening_OnFrame, + gm_Scene_Opening_OnEnter, NULL, NULL, }, { GS_MOVIE_END, - gm_801A64A8_OnFrame, - gm_801A637C_OnEnter, + gm_Scene_MovieEnd_OnFrame, + gm_Scene_MovieEnd_OnEnter, NULL, NULL, }, { GS_MOVIE_HOWTO, - gm_801ACD8C_OnFrame, - gm_801ACCA0_OnEnter, + gm_Scene_HowTo_OnFrame, + gm_Scene_HowTo_OnEnter, NULL, NULL, }, { GS_MOVIE_OMAKE15, - gm_801ACF8C_OnFrame, - gm_801ACE94_OnEnter, + gm_Scene_Omake15_OnFrame, + gm_Scene_Omake15_OnEnter, NULL, NULL, }, { GS_INTRO_EASY, - gm_80186DFC_OnFrame, - gm_80186E30_OnEnter, + gm_Scene_IntroEasy_OnFrame, + gm_Scene_IntroEasy_OnEnter, NULL, NULL, }, { GS_INTRO_ALLSTAR, - gm_8018776C_OnFrame, - gm_801877A8_OnEnter, + gm_Scene_IntroAllstar_OnFrame, + gm_Scene_IntroAllstar_OnEnter, NULL, NULL, }, { GS_GAMEOVER, NULL, - gm_801A0A10_OnEnter, - gm_801A0B18_OnLeave, + gm_Scene_GOver_OnEnter, + gm_Scene_GOver_OnExit, NULL, }, { GS_COMING_SOON, NULL, - gm_801A0C6C_OnEnter, - gm_801A0E0C_OnLeave, + gm_Scene_ComingSoon_OnEnter, + gm_Scene_ComingSoon_OnExit, NULL, }, { GS_TOU_SETUP, - gm_8019628C_OnFrame, - gm_801963B4_OnEnter, - gm_801964A4_OnLeave, + gm_Scene_TouSetup_OnFrame, + gm_Scene_TouSetup_OnEnter, + gm_Scene_TouSetup_OnExit, NULL, }, { GS_TOU_BRACKET, - gm_8019B2DC_OnFrame, - gm_8019B8C4_OnEnter, - gm_8019B9C8_OnLeave, + gm_Scene_TouBracket_OnFrame, + gm_Scene_TouBracket_OnEnter, + gm_Scene_TouBracket_OnExit, NULL, }, { GS_TOU_ALT, - gm_8019DF8C_OnFrame, - gm_8019ECAC_OnEnter, - gm_8019EE54_OnLeave, + gm_Scene_TouAlt_OnFrame, + gm_Scene_TouAlt_OnEnter, + gm_Scene_TouAlt_OnExit, NULL, }, { GS_PRIZE_INTERFACE, NULL, - un_802FEBE0_OnEnter, - un_802FED10_OnLeave, + ifPrize_Scene_OnEnter, + ifPrize_Scene_OnExit, NULL, }, { GS_PROG_SCAN, - gm_801AD620_OnFrame, - gm_801AD874_OnEnter, - gm_801AD8EC_OnLeave, + gm_Scene_ProgScan_OnFrame, + gm_Scene_ProgScan_OnEnter, + gm_Scene_ProgScan_OnExit, NULL, }, { GS_APPROACH, - gm_801ADC88_OnFrame, - gm_801ADCE4_OnEnter, - gm_801ADDA8_OnLeave, + gm_Scene_Approach_OnFrame, + gm_Scene_Approach_OnEnter, + gm_Scene_Approach_OnExit, NULL, }, { GS_MEMCARD, - gm_801AF568_OnFrame, - gm_801B0264_OnEnter, - gm_801B0304_OnLeave, + gm_Scene_MemCard_OnFrame, + gm_Scene_MemCard_OnEnter, + gm_Scene_MemCard_OnExit, NULL, }, { GS_STAFFROLL, - gm_801AA7C4_OnFrame, - gm_801AC6D8_OnEnter, - gm_801ACC90_OnLeave, + gm_Scene_StaffRoll_OnFrame, + gm_Scene_StaffRoll_OnEnter, + gm_Scene_StaffRoll_OnExit, NULL, }, { GS_CAMERA_VS, - gmCamera_801A34FC_OnFrame, - gmCamera_801A3634_OnEnter, - gmCamera_801A367C_OnLeave, + gm_Scene_CameraVs_OnFrame, + gm_Scene_CameraVs_OnEnter, + gm_Scene_CameraVs_OnExit, NULL, }, { @@ -383,369 +383,369 @@ static GameSceneHandler scene_handlers[] = { }, }; -static GameMode game_modes[] = { +static GameMode modes[] = { { - 1, + true, GM_TITLE, NULL, NULL, NULL, - gm_803DD6A0_Scenes, + gm_Mode_Title_States, }, { - 0, + false, GM_VS, - gm_801A55EC_OnLoad, - gm_801A5614_OnUnload, - gm_801A5598_OnInit, - gm_803DD9A0_Scenes, + gm_Mode_Vs_OnLoad, + gm_Mode_Vs_OnUnload, + gm_Mode_Vs_OnInit, + gm_Mode_Vs_States, }, { - 1, + true, GM_CLASSIC, - gmClassic_OnLoad, + gm_Mode_Classic_OnLoad, NULL, - gmClassic_OnInit, - gm_803DDC58_Scenes, + gm_Mode_Classic_OnInit, + gm_Mode_Classic_States, }, { - 0, + false, GM_ADVENTURE, - gm_801B5214_OnLoad, + gm_Mode_Adventure_OnLoad, NULL, - gm_801B51CC_OnInit, - gm_803DE1B8_Scenes, + gm_Mode_Adventure_OnInit, + gm_Mode_Adventure_States, }, { - 1, + true, GM_ALLSTAR, - gm_801B60A4_OnLoad, + gm_Mode_AllStar_OnLoad, NULL, - gm_801B62D8_OnInit, - gm_803DE930_Scenes, + gm_Mode_AllStar_OnInit, + gm_Mode_AllStar_States, }, { - 0, + false, GM_DEBUG, NULL, NULL, NULL, - gm_803DD6D0_Scenes, + gm_Mode_Debug_States, }, { - 0, + false, GM_DEBUG_SOUND_TEST, NULL, NULL, NULL, - gm_803DD888_Scenes, + gm_Mode_DebugMenu_States, }, { - 0, + false, GM_HANYU_CSS, NULL, NULL, NULL, - gm_803DFAA8_Scenes, + gm_Mode_HanyuCss_States, }, { - 0, + false, GM_HANYU_SSS, NULL, NULL, NULL, - gm_803DFAD8_Scenes, + gm_Mode_HanyuSss_States, }, { - 1, + true, GM_CAMERA_MODE, NULL, NULL, - gm_801B2B7C_OnInit, - gm_CameraModeScenes, + gm_Mode_Camera_OnInit, + gm_Mode_Camera_States, }, { - 0, + false, GM_TOY_GALLERY, NULL, NULL, - Toy_OnInit_803122D0, - gm_803DFA18_Scenes, + Toy_Mode_OnInit, + gm_Mode_ToyGallery_States, }, { - 0, + false, GM_TOY_LOTTERY, NULL, NULL, NULL, - gm_803DFA48_Scenes, + gm_Mode_ToyLottery_States, }, { - 0, + false, GM_TOY_COLLECTION, NULL, NULL, NULL, - gm_803DFA78_Scenes, + gm_Mode_ToyCollection_States, }, { - 0, + false, GM_DEBUG_VS, NULL, NULL, NULL, - gm_803DDA78_Scenes, + gm_Mode_DebugVs_States, }, { - 1, + true, GM_TARGET_TEST, - gm_801B6808_OnLoad, + gm_Mode_TargetTest_OnLoad, NULL, - gm_801B67E8_OnInit, - gm_803DECB8_Scenes, + gm_Mode_TargetTest_OnInit, + gm_Mode_TargetTest_States, }, { - 0, + false, GM_SUPER_SUDDEN_DEATH_VS, - gm_801B8D88_OnLoad, + gm_Mode_SuperSuddenDeath_OnLoad, NULL, - gm_801B8D60_OnInit, - gm_803DEEB0_Scenes, + gm_Mode_SuperSuddenDeath_OnInit, + gm_Mode_SuperSuddenDeath_States, }, { - 0, + false, GM_INVISIBLE_VS, - gm_801BA4EC_OnLoad, + gm_Mode_InvisibleVs_OnLoad, NULL, - gm_801BA4C4_OnInit, - gm_803DF390_Scenes, + gm_Mode_InvisibleVs_OnInit, + gm_Mode_InvisibleVs_States, }, { - 0, + false, GM_SLOMO_VS, - gm_801BA6E4_OnLoad, + gm_Mode_SlowMo_OnLoad, NULL, - gm_801BA6BC_OnInit, - gm_803DF468_Scenes, + gm_Mode_SlowMo_OnInit, + gm_Mode_SlowMo_States, }, { - 0, + false, GM_LIGHTNING_VS, - gm_801BA8DC_OnLoad, + gm_Mode_LightningVs_OnLoad, NULL, - gm_801BA8B4_OnInit, - gm_803DF540_Scenes, + gm_Mode_LightningVs_OnInit, + gm_Mode_LightningVs_States, }, { - 0, + false, GM_CHALLENGER_APPROACH, - gm_801737E8_OnLoad, + gm_Mode_ChallengerApproach_OnLoad, NULL, NULL, - gm_803DFE48_Scenes, + gm_Mode_ChallengerApproach_States, }, { - 1, + true, GM_MENU, NULL, NULL, NULL, - gm_803DD8B8_Scenes, + gm_Mode_Menu_States, }, { - 0, + false, GM_CLASSIC_GOVER, - gm_801A50B8_OnLoad, + gm_Mode_ClassicGOver_OnLoad, NULL, NULL, - gm_803DFB08, + gm_Mode_GOver_States, }, { - 0, + false, GM_ADVENTURE_GOVER, - gm_801A5130_OnLoad, + gm_Mode_AdventureGOver_OnLoad, NULL, NULL, - gm_803DFB08, + gm_Mode_GOver_States, }, { - 0, + false, GM_ALLSTAR_GOVER, - gm_801A51A8_OnLoad, + gm_Mode_AllstarGOver_OnLoad, NULL, NULL, - gm_803DFB08, + gm_Mode_GOver_States, }, { - 1, + true, GM_OPENING_MV, - gm_801A5220_OnLoad, + gm_Mode_Opening_OnLoad, NULL, NULL, - gm_803DFBC8_Scenes, + gm_Mode_Opening_States, }, { - 0, + false, GM_DEBUG_CUTSCENE, NULL, NULL, NULL, - gm_803DFC70_Scenes, + gm_Mode_DebugCutscene_States, }, { - 0, + false, GM_DEBUG_GOVER, NULL, NULL, NULL, - gm_803DFB80_Scenes, + gm_Mode_DebugGOver_States, }, { - 1, + true, GM_TOURNAMENT, NULL, NULL, NULL, - gm_803DDAC0_Scenes, + gm_Mode_Tournament_States, }, { - 1, + true, GM_TRAINING, - gm_801B23C4_OnLoad, + gm_Mode_Training_OnLoad, NULL, - gm_801B2298_OnInit, - gm_803DDB80_Scenes, + gm_Mode_Training_OnInit, + gm_Mode_Training_States, }, { - 0, + false, GM_TINY_VS, - gm_801B8F98_OnLoad, + gm_Mode_TinyVs_OnLoad, NULL, - gm_801B8F70_OnInit, - gm_803DEF88_Scenes, + gm_Mode_TinyVs_OnInit, + gm_Mode_TinyVs_States, }, { - 0, + false, GM_GIANT_VS, - gm_801B91A8_OnLoad, + gm_Mode_GiantVs_OnLoad, NULL, - gm_801B9180_OnInit, - gm_803DF060_Scenes, + gm_Mode_GiantVs_OnInit, + gm_Mode_GiantVs_States, }, { - 1, + true, GM_STAMINA_VS, - gm_801B95D8_OnLoad, + gm_Mode_StaminaVs_OnLoad, NULL, - gm_801B95B0_OnInit, - gm_803DF138_Scenes, + gm_Mode_StaminaVs_OnInit, + gm_Mode_StaminaVs_States, }, { - 1, + true, GM_HOME_RUN_CONTEST, - gm_801B9EE4_OnLoad, + gm_Mode_Homerun_OnLoad, NULL, - gm_801B9EB8_OnInit, - gm_803DF198_Scenes, + gm_Mode_Homerun_OnInit, + gm_Mode_Homerun_States, }, { - 1, + true, GM_10MAN_VS, - gm_801B685C, + gm_Mode_10ManVs_OnLoad, NULL, - gm_801B6834, - gm_803DED00_Scenes, + gm_Mode_10ManVs_OnInit, + gm_Mode_10ManVs_States, }, { - 1, + true, GM_100MAN_VS, - gm_801B685C, + gm_Mode_10ManVs_OnLoad, NULL, - gm_801B6834, - gm_803DED48_Scenes, + gm_Mode_10ManVs_OnInit, + gm_Mode_100ManVs_States, }, { - 1, + true, GM_3MIN_VS, - gm_801B685C, + gm_Mode_10ManVs_OnLoad, NULL, - gm_801B6834, - gm_803DED90_Scenes, + gm_Mode_10ManVs_OnInit, + gm_Mode_3Min_States, }, { - 1, + true, GM_15MIN_VS, - gm_801B685C, + gm_Mode_10ManVs_OnLoad, NULL, - gm_801B6834, - gm_803DEDD8_Scenes, + gm_Mode_10ManVs_OnInit, + gm_Mode_15Min_States, }, { - 1, + true, GM_ENDLESS_VS, - gm_801B685C, + gm_Mode_10ManVs_OnLoad, NULL, - gm_801B6834, - gm_803DEE20_Scenes, + gm_Mode_10ManVs_OnInit, + gm_Mode_EndlessVs_States, }, { - 1, + true, GM_CRUEL_VS, - gm_801B685C, + gm_Mode_10ManVs_OnLoad, NULL, - gm_801B6834, - gm_803DEE68_Scenes, + gm_Mode_10ManVs_OnInit, + gm_Mode_CruelVs_States, }, { - 0, + false, GM_PROGRESSIVE_SCAN, NULL, NULL, NULL, - gm_803DFDA8_Scenes, + gm_Mode_ProgScan_States, }, { - 1, + true, GM_BOOT, NULL, NULL, NULL, - gmBoot_BootScenes, + gm_Mode_Boot_States, }, { - 1, + true, GM_MEMCARD, NULL, NULL, NULL, - gmBoot_MemCardScenes, + gm_Mode_MemCard_States, }, { - 0, - GM_FIXED_CAMERA_VS, - gm_801BA0EC_OnLoad, + false, + GM_CAMERA_VS, + gm_Mode_CameraVs_OnLoad, NULL, - gm_801BA0C4_OnInit, - gm_803DF1E0_Scenes, + gm_Mode_CameraVs_OnInit, + gm_Mode_CameraVs_States, }, { - 1, + true, GM_EVENT, - gm_801BBEA8_OnLoad, - gm_801BBFE4_OnUnload, - gm_801BBA60_OnInit, - gm_803DF618_Scenes, + gm_Mode_Event_OnLoad, + gm_Mode_Event_OnUnload, + gm_Mode_Event_OnInit, + gm_Mode_Event_States, }, { - 0, + false, GM_SINGLE_BUTTON_VS, - gm_801BA2EC_OnLoad, + gm_Mode_SingleButtonVs_OnLoad, NULL, - gm_801BA2C4_OnInit, - gm_803DF2B8_Scenes, + gm_Mode_SingleButtonVs_OnInit, + gm_Mode_SingleButtonVs_States, }, { - 0, + false, GM_COUNT, NULL, NULL, @@ -754,12 +754,12 @@ static GameMode game_modes[] = { }, }; -GameSceneHandler* gm_GetAllGameSceneHandlers(void) +GameScene* gm_GetAllGameScenes(void) { - return scene_handlers; + return scenes; } GameMode* gm_GetAllGameModes(void) { - return game_modes; + return modes; } diff --git a/src/melee/gm/gmscdata.h b/src/melee/gm/gmscdata.h index b584efc043..055fa8c744 100644 --- a/src/melee/gm/gmscdata.h +++ b/src/melee/gm/gmscdata.h @@ -3,34 +3,34 @@ #include "melee/gm/types.h" -/* 1A50A0 */ GameSceneHandler* gm_GetAllGameSceneHandlers(void); +/* 1A50A0 */ GameScene* gm_GetAllGameScenes(void); /* 1A50AC */ GameMode* gm_GetAllGameModes(void); -/* 3DDC58 */ extern GameScene gm_803DDC58_Scenes[]; -/* 3DE930 */ extern GameScene gm_803DE930_Scenes[]; -/* 3DECB8 */ extern GameScene gm_803DECB8_Scenes[]; -/* 3DED00 */ extern GameScene gm_803DED00_Scenes[]; -/* 3DED48 */ extern GameScene gm_803DED48_Scenes[]; -/* 3DED90 */ extern GameScene gm_803DED90_Scenes[]; -/* 3DEDD8 */ extern GameScene gm_803DEDD8_Scenes[]; -/* 3DEE20 */ extern GameScene gm_803DEE20_Scenes[]; -/* 3DEE68 */ extern GameScene gm_803DEE68_Scenes[]; -/* 3DEEB0 */ extern GameScene gm_803DEEB0_Scenes[]; -/* 3DEF88 */ extern GameScene gm_803DEF88_Scenes[]; -/* 3DF060 */ extern GameScene gm_803DF060_Scenes[]; -/* 3DF138 */ extern GameScene gm_803DF138_Scenes[]; -/* 3DF198 */ extern GameScene gm_803DF198_Scenes[]; -/* 3DF1E0 */ extern GameScene gm_803DF1E0_Scenes[]; -/* 3DF2B8 */ extern GameScene gm_803DF2B8_Scenes[]; -/* 3DF390 */ extern GameScene gm_803DF390_Scenes[]; -/* 3DF468 */ extern GameScene gm_803DF468_Scenes[]; -/* 3DF540 */ extern GameScene gm_803DF540_Scenes[]; -/* 3DF618 */ extern GameScene gm_803DF618_Scenes[]; -/* 3DFAA8 */ extern GameScene gm_803DFAA8_Scenes[]; -/* 3DFB80 */ extern GameScene gm_803DFB80_Scenes[]; -/* 3DFBC8 */ extern GameScene gm_803DFBC8_Scenes[]; -/* 3DFC70 */ extern GameScene gm_803DFC70_Scenes[]; -/* 3DFDD8 */ extern GameScene gmBoot_BootScenes[]; -/* 3DFE18 */ extern GameScene gmBoot_MemCardScenes[]; -/* 3DFE48 */ extern GameScene gm_803DFE48_Scenes[]; +/* 3DDC58 */ extern GameModeState gm_Mode_Classic_States[]; +/* 3DE930 */ extern GameModeState gm_Mode_AllStar_States[]; +/* 3DECB8 */ extern GameModeState gm_Mode_TargetTest_States[]; +/* 3DED00 */ extern GameModeState gm_Mode_10ManVs_States[]; +/* 3DED48 */ extern GameModeState gm_Mode_100ManVs_States[]; +/* 3DED90 */ extern GameModeState gm_Mode_3Min_States[]; +/* 3DEDD8 */ extern GameModeState gm_Mode_15Min_States[]; +/* 3DEE20 */ extern GameModeState gm_Mode_EndlessVs_States[]; +/* 3DEE68 */ extern GameModeState gm_Mode_CruelVs_States[]; +/* 3DEEB0 */ extern GameModeState gm_Mode_SuperSuddenDeath_States[]; +/* 3DEF88 */ extern GameModeState gm_Mode_TinyVs_States[]; +/* 3DF060 */ extern GameModeState gm_Mode_GiantVs_States[]; +/* 3DF138 */ extern GameModeState gm_Mode_StaminaVs_States[]; +/* 3DF198 */ extern GameModeState gm_Mode_Homerun_States[]; +/* 3DF1E0 */ extern GameModeState gm_Mode_CameraVs_States[]; +/* 3DF2B8 */ extern GameModeState gm_Mode_SingleButtonVs_States[]; +/* 3DF390 */ extern GameModeState gm_Mode_InvisibleVs_States[]; +/* 3DF468 */ extern GameModeState gm_Mode_SlowMo_States[]; +/* 3DF540 */ extern GameModeState gm_Mode_LightningVs_States[]; +/* 3DF618 */ extern GameModeState gm_Mode_Event_States[]; +/* 3DFAA8 */ extern GameModeState gm_Mode_HanyuCss_States[]; +/* 3DFB80 */ extern GameModeState gm_Mode_DebugGOver_States[]; +/* 3DFBC8 */ extern GameModeState gm_Mode_Opening_States[]; +/* 3DFC70 */ extern GameModeState gm_Mode_DebugCutscene_States[]; +/* 3DFDD8 */ extern GameModeState gm_Mode_Boot_States[]; +/* 3DFE18 */ extern GameModeState gm_Mode_MemCard_States[]; +/* 3DFE48 */ extern GameModeState gm_Mode_ChallengerApproach_States[]; #endif diff --git a/src/melee/gm/gmsinglebutton.c b/src/melee/gm/gmsinglebutton.c index c8f2e1606a..b55bc52686 100644 --- a/src/melee/gm/gmsinglebutton.c +++ b/src/melee/gm/gmsinglebutton.c @@ -11,10 +11,10 @@ /* extern functions referenced in Scenes */ -extern void gm_801A6254(GameScene*); -extern void gm_801A6308(GameScene*); +extern void gm_801A6254(GameModeState*); +extern void gm_801A6308(GameModeState*); -GameScene gm_803DF2B8_Scenes[] = { +GameModeState gm_Mode_SingleButtonVs_States[] = { { 0, 3, @@ -114,25 +114,25 @@ GameScene gm_803DF2B8_Scenes[] = { { -1 }, }; -void gm_801BA10C(GameScene* scene) +void gm_801BA10C(GameModeState* scene) { VsModeData* data = &gmMainLib_804D3EE0->unk_BD0; gm_801A5618(scene, data, 8); } -void gm_801BA138(GameScene* scene) +void gm_801BA138(GameModeState* scene) { VsModeData* data = &gmMainLib_804D3EE0->unk_BD0; gm_801A5680(scene, data); } -void gm_801BA160(GameScene* scene) +void gm_801BA160(GameModeState* scene) { VsModeData* data = &gmMainLib_804D3EE0->unk_BD0; gm_801A5754(scene, data); } -void gm_801BA188(GameScene* scene) +void gm_801BA188(GameModeState* scene) { VsModeData* data = &gmMainLib_804D3EE0->unk_BD0; gm_801A57A8(scene, data, 0); @@ -143,45 +143,45 @@ void fn_801BA1B4(StartMeleeData* data, StartMeleeData* unused) data->rules.single_button = true; } -void gm_801BA1C8(GameScene* scene) +void gm_801BA1C8(GameModeState* scene) { VsModeData* data = &gmMainLib_804D3EE0->unk_BD0; gm_801A583C(scene, data, fn_801BA1B4, NULL); } -void gm_801BA1FC(GameScene* scene) +void gm_801BA1FC(GameModeState* scene) { gm_801A5AF0(scene, 4, 3); } -void gm_801BA224(GameScene* scene) +void gm_801BA224(GameModeState* scene) { VsModeData* data = &gmMainLib_804D3EE0->unk_BD0; gm_801A5C3C(scene, data, fn_801BA1B4, NULL); } -void gm_801BA258(GameScene* scene) +void gm_801BA258(GameModeState* scene) { gm_801A5EC8(scene); } -void gm_801BA278(GameScene* scene) +void gm_801BA278(GameModeState* scene) { gm_801A5F00(scene); } -void gm_801BA298(GameScene* scene) +void gm_801BA298(GameModeState* scene) { VsModeData* data = &gmMainLib_804D3EE0->unk_BD0; gm_801A5F64(scene, data, 0); } -void gm_801BA2C4_OnInit(void) +void gm_Mode_SingleButtonVs_OnInit(void) { gm_80167B50(&gmMainLib_804D3EE0->unk_BD0); } -void gm_801BA2EC_OnLoad(void) +void gm_Mode_SingleButtonVs_OnLoad(void) { gm_801A55C4(); } diff --git a/src/melee/gm/gmsinglebutton.h b/src/melee/gm/gmsinglebutton.h index 758663f695..0984d63156 100644 --- a/src/melee/gm/gmsinglebutton.h +++ b/src/melee/gm/gmsinglebutton.h @@ -4,18 +4,18 @@ #include #include -/* 1BA10C */ void gm_801BA10C(GameScene*); -/* 1BA138 */ void gm_801BA138(GameScene*); -/* 1BA160 */ void gm_801BA160(GameScene*); -/* 1BA188 */ void gm_801BA188(GameScene*); +/* 1BA10C */ void gm_801BA10C(GameModeState*); +/* 1BA138 */ void gm_801BA138(GameModeState*); +/* 1BA160 */ void gm_801BA160(GameModeState*); +/* 1BA188 */ void gm_801BA188(GameModeState*); /* 1BA1B8 */ void fn_801BA1B4(StartMeleeData*, StartMeleeData*); -/* 1BA1C8 */ void gm_801BA1C8(GameScene*); -/* 1BA1FC */ void gm_801BA1FC(GameScene*); -/* 1BA224 */ void gm_801BA224(GameScene*); -/* 1BA258 */ void gm_801BA258(GameScene*); -/* 1BA278 */ void gm_801BA278(GameScene*); -/* 1BA298 */ void gm_801BA298(GameScene*); -/* 1BA2C4 */ void gm_801BA2C4_OnInit(void); -/* 1BA2EC */ void gm_801BA2EC_OnLoad(void); +/* 1BA1C8 */ void gm_801BA1C8(GameModeState*); +/* 1BA1FC */ void gm_801BA1FC(GameModeState*); +/* 1BA224 */ void gm_801BA224(GameModeState*); +/* 1BA258 */ void gm_801BA258(GameModeState*); +/* 1BA278 */ void gm_801BA278(GameModeState*); +/* 1BA298 */ void gm_801BA298(GameModeState*); +/* 1BA2C4 */ void gm_Mode_SingleButtonVs_OnInit(void); +/* 1BA2EC */ void gm_Mode_SingleButtonVs_OnLoad(void); #endif diff --git a/src/melee/gm/gmslomo.c b/src/melee/gm/gmslomo.c index 0db74267d8..1c6410e489 100644 --- a/src/melee/gm/gmslomo.c +++ b/src/melee/gm/gmslomo.c @@ -9,7 +9,7 @@ #include "if/if_2FD9.h" -GameScene gm_803DF468_Scenes[] = { +GameModeState gm_Mode_SlowMo_States[] = { { 0, 3, @@ -109,22 +109,22 @@ GameScene gm_803DF468_Scenes[] = { { -1 }, }; -void gm_801BA50C(GameScene* scene) +void gm_801BA50C(GameModeState* scene) { gm_801A5618(scene, &gmMainLib_804D3EE0->unk_1210, 0xA); } -void gm_801BA538(GameScene* scene) +void gm_801BA538(GameModeState* scene) { gm_801A5680(scene, &gmMainLib_804D3EE0->unk_1210); } -void gm_801BA560(GameScene* scene) +void gm_801BA560(GameModeState* scene) { gm_801A5754(scene, &gmMainLib_804D3EE0->unk_1210); } -void gm_801BA588(GameScene* scene) +void gm_801BA588(GameModeState* scene) { gm_801A57A8(scene, &gmMainLib_804D3EE0->unk_1210, 0); } @@ -135,44 +135,44 @@ void fn_801BA5B4(StartMeleeData* data, StartMeleeData* unused) data->rules.x34 = 0.5F; } -void gm_801BA5C0(GameScene* scene) +void gm_801BA5C0(GameModeState* scene) { VsModeData* data = &gmMainLib_804D3EE0->unk_1210; gm_801A583C(scene, data, fn_801BA5B4, NULL); } -void gm_801BA5F4(GameScene* scene) +void gm_801BA5F4(GameModeState* scene) { gm_801A5AF0(scene, 4, 3); } -void gm_801BA61C(GameScene* scene) +void gm_801BA61C(GameModeState* scene) { VsModeData* data = &gmMainLib_804D3EE0->unk_1210; gm_801A5C3C(scene, data, fn_801BA5B4, NULL); } -void gm_801BA650(GameScene* scene) +void gm_801BA650(GameModeState* scene) { gm_801A5EC8(scene); } -void gm_801BA670(GameScene* scene) +void gm_801BA670(GameModeState* scene) { gm_801A5F00(scene); } -void gm_801BA690(GameScene* scene) +void gm_801BA690(GameModeState* scene) { gm_801A5F64(scene, &gmMainLib_804D3EE0->unk_1210, 0); } -void gm_801BA6BC_OnInit(void) +void gm_Mode_SlowMo_OnInit(void) { gm_80167B50(&gmMainLib_804D3EE0->unk_1210); } -void gm_801BA6E4_OnLoad(void) +void gm_Mode_SlowMo_OnLoad(void) { gm_801A55C4(); } diff --git a/src/melee/gm/gmslomo.h b/src/melee/gm/gmslomo.h index 091d02afda..ac37f98e29 100644 --- a/src/melee/gm/gmslomo.h +++ b/src/melee/gm/gmslomo.h @@ -4,18 +4,18 @@ #include #include -void gm_801BA50C(GameScene* scene); -void gm_801BA538(GameScene* scene); -void gm_801BA560(GameScene* scene); -void gm_801BA588(GameScene* scene); +void gm_801BA50C(GameModeState* scene); +void gm_801BA538(GameModeState* scene); +void gm_801BA560(GameModeState* scene); +void gm_801BA588(GameModeState* scene); void fn_801BA5B4(StartMeleeData* data, StartMeleeData* unused); -void gm_801BA5C0(GameScene* scene); -void gm_801BA5F4(GameScene* scene); -void gm_801BA61C(GameScene* scene); -void gm_801BA650(GameScene* scene); -void gm_801BA670(GameScene* scene); -void gm_801BA690(GameScene* scene); -void gm_801BA6BC_OnInit(void); -void gm_801BA6E4_OnLoad(void); +void gm_801BA5C0(GameModeState* scene); +void gm_801BA5F4(GameModeState* scene); +void gm_801BA61C(GameModeState* scene); +void gm_801BA650(GameModeState* scene); +void gm_801BA670(GameModeState* scene); +void gm_801BA690(GameModeState* scene); +void gm_Mode_SlowMo_OnInit(void); +void gm_Mode_SlowMo_OnLoad(void); #endif diff --git a/src/melee/gm/gmstaffroll.c b/src/melee/gm/gmstaffroll.c index d78b048067..8df99a4aa8 100644 --- a/src/melee/gm/gmstaffroll.c +++ b/src/melee/gm/gmstaffroll.c @@ -409,7 +409,7 @@ bool gm_801AA774(s16 arg0) return Toy_803048C0(0x107) || Toy_803048C0(0x108); } -void gm_801AA7C4_OnFrame(void) +void gm_Scene_StaffRoll_OnFrame(void) { if (gm_804D6814 >= 0x134D) { lbAudioAx_80028B90(); @@ -1235,7 +1235,7 @@ void fn_801AC67C(HSD_GObj* gobj) } } -void gm_801AC6D8_OnEnter(void* unused) +void gm_Scene_StaffRoll_OnEnter(void* unused) { HSD_JObj* jobj_arr[2]; HSD_CObj* cobj; @@ -1372,4 +1372,4 @@ void gm_801AC6D8_OnEnter(void* unused) } } -void gm_801ACC90_OnLeave(void* unused) {} +void gm_Scene_StaffRoll_OnExit(void* unused) {} diff --git a/src/melee/gm/gmstaffroll.h b/src/melee/gm/gmstaffroll.h index 6079484f3d..f0511745e3 100644 --- a/src/melee/gm/gmstaffroll.h +++ b/src/melee/gm/gmstaffroll.h @@ -9,7 +9,7 @@ /* 1AA6D8 */ bool gm_801AA6D8(s16); /* 1AA6FC */ bool gm_801AA6FC(s16); /* 1AA774 */ bool gm_801AA774(s16); -/* 1AA7C4 */ void gm_801AA7C4_OnFrame(void); +/* 1AA7C4 */ void gm_Scene_StaffRoll_OnFrame(void); /* 1AA7F8 */ void fn_801AA7F8(HSD_GObj*); /* 1AA854 */ void fn_801AA854(HSD_GObj*, int code); /* 1AAA28 */ void fn_801AAA28(HSD_GObj*, int code); @@ -18,7 +18,7 @@ /* 1AAB74 */ void fn_801AAB74(HSD_GObj*); /* 1AB200 */ void fn_801AB200(HSD_GObj*); /* 1AC67C */ void fn_801AC67C(HSD_GObj*); -/* 1AC6D8 */ void gm_801AC6D8_OnEnter(void*); -/* 1ACC90 */ void gm_801ACC90_OnLeave(void*); +/* 1AC6D8 */ void gm_Scene_StaffRoll_OnEnter(void*); +/* 1ACC90 */ void gm_Scene_StaffRoll_OnExit(void*); #endif diff --git a/src/melee/gm/gmstamina.c b/src/melee/gm/gmstamina.c index df5acc9838..ac00d0edd1 100644 --- a/src/melee/gm/gmstamina.c +++ b/src/melee/gm/gmstamina.c @@ -15,7 +15,7 @@ #include #include -GameScene gm_803DF138_Scenes[] = { +GameModeState gm_Mode_StaminaVs_States[] = { { 0, lbDvdPreload_3, @@ -61,7 +61,7 @@ static struct { u16 slomo_counter[4]; ///< Ticks up to 100 when player is eliminated } gm_804975F8; -void gm_801B91C8(GameScene* arg0) +void gm_801B91C8(GameModeState* arg0) { VsModeData* vs = &gmMainLib_804D3EE0->unk_10D0; CSSData* css = gm_GetGameSceneLoadData(arg0); @@ -71,17 +71,17 @@ void gm_801B91C8(GameScene* arg0) lbDvd_800174BC(); } -void gm_801B922C(GameScene* scene) +void gm_801B922C(GameModeState* scene) { gm_801A5680(scene, &gmMainLib_804D3EE0->unk_10D0); } -void gm_801B9254(GameScene* scene) +void gm_801B9254(GameModeState* scene) { gm_801A5754(scene, &gmMainLib_804D3EE0->unk_10D0); } -void gm_801B927C(GameScene* arg0) +void gm_801B927C(GameModeState* arg0) { VsModeData* vs = &gmMainLib_804D3EE0->unk_10D0; SSSData* sss = gm_GetGameSceneLeaveData(arg0); @@ -96,7 +96,7 @@ void gm_801B927C(GameScene* arg0) gm_SetPendingSceneIndex(0); } -void gm_801B931C(GameScene* arg0) +void gm_801B931C(GameModeState* arg0) { VsModeData* vs = &gmMainLib_804D3EE0->unk_10D0; StartMeleeData* start = gm_GetGameSceneLoadData(arg0); @@ -125,19 +125,19 @@ void gm_801B931C(GameScene* arg0) gm_80168FC4(); } -void gm_801B9560(GameScene* scene) +void gm_801B9560(GameModeState* scene) { VsModeData* vs = &gmMainLib_804D3EE0->unk_10D0; gm_80168710(&gm_80479D98.match_end, vs); gm_801A5AF0(scene, 0, 0); } -void gm_801B95B0_OnInit(void) +void gm_Mode_StaminaVs_OnInit(void) { gm_80167B50(&gmMainLib_804D3EE0->unk_10D0); } -void gm_801B95D8_OnLoad(void) +void gm_Mode_StaminaVs_OnLoad(void) { gm_SetGameSpeed(1.0F); gm_801A55C4(); diff --git a/src/melee/gm/gmstamina.h b/src/melee/gm/gmstamina.h index 7b818887d4..52e85cbf4b 100644 --- a/src/melee/gm/gmstamina.h +++ b/src/melee/gm/gmstamina.h @@ -5,14 +5,14 @@ #include -/* 1B91C8 */ void gm_801B91C8(GameScene*); -/* 1B922C */ void gm_801B922C(GameScene*); -/* 1B9254 */ void gm_801B9254(GameScene*); -/* 1B927C */ void gm_801B927C(GameScene*); -/* 1B931C */ void gm_801B931C(GameScene*); -/* 1B9560 */ void gm_801B9560(GameScene*); -/* 1B95B0 */ void gm_801B95B0_OnInit(void); -/* 1B95D8 */ void gm_801B95D8_OnLoad(void); +/* 1B91C8 */ void gm_801B91C8(GameModeState*); +/* 1B922C */ void gm_801B922C(GameModeState*); +/* 1B9254 */ void gm_801B9254(GameModeState*); +/* 1B927C */ void gm_801B927C(GameModeState*); +/* 1B931C */ void gm_801B931C(GameModeState*); +/* 1B9560 */ void gm_801B9560(GameModeState*); +/* 1B95B0 */ void gm_Mode_StaminaVs_OnInit(void); +/* 1B95D8 */ void gm_Mode_StaminaVs_OnLoad(void); /* 1B9600 */ int gm_801B9600(void); /* 1B97C4 */ void gm_801B97C4(int slot, bool); /* 1B9850 */ void fn_801B9850(void); diff --git a/src/melee/gm/gmsupersudden.c b/src/melee/gm/gmsupersudden.c index a1f7993a7d..d7a1cfd067 100644 --- a/src/melee/gm/gmsupersudden.c +++ b/src/melee/gm/gmsupersudden.c @@ -10,7 +10,7 @@ #include "if/if_2FD9.h" #include "mn/types.h" -GameScene gm_803DEEB0_Scenes[] = { +GameModeState gm_Mode_SuperSuddenDeath_States[] = { { 0, 3, @@ -110,22 +110,22 @@ GameScene gm_803DEEB0_Scenes[] = { { -1 }, }; -void gm_801B8BB4(GameScene* scene) +void gm_801B8BB4(GameModeState* scene) { gm_801A5618(scene, &gmMainLib_804D3EE0->unk_6D0, 3); } -void gm_801B8BE0(GameScene* scene) +void gm_801B8BE0(GameModeState* scene) { gm_801A5680(scene, &gmMainLib_804D3EE0->unk_6D0); } -void gm_801B8C08(GameScene* scene) +void gm_801B8C08(GameModeState* scene) { gm_801A5754(scene, &gmMainLib_804D3EE0->unk_6D0); } -void gm_801B8C30(GameScene* scene) +void gm_801B8C30(GameModeState* scene) { gm_801A57A8(scene, &gmMainLib_804D3EE0->unk_6D0, 0); } @@ -135,43 +135,43 @@ void fn_801B8C5C(PlayerInitData* arg0, PlayerInitData* unused) arg0->x12 = 0x12C; } -void gm_801B8C68(GameScene* scene) +void gm_801B8C68(GameModeState* scene) { VsModeData* data = &gmMainLib_804D3EE0->unk_6D0; gm_801A583C(scene, data, NULL, fn_801B8C5C); } -void gm_801B8C9C(GameScene* scene) +void gm_801B8C9C(GameModeState* scene) { gm_801A5AF0(scene, 4, 3); } -void gm_801B8CC4(GameScene* scene) +void gm_801B8CC4(GameModeState* scene) { gm_801A5C3C(scene, &gmMainLib_804D3EE0->unk_6D0, NULL, NULL); } -void gm_801B8CF4(GameScene* scene) +void gm_801B8CF4(GameModeState* scene) { gm_801A5EC8(scene); } -void gm_801B8D14(GameScene* scene) +void gm_801B8D14(GameModeState* scene) { gm_801A5F00(scene); } -void gm_801B8D34(GameScene* scene) +void gm_801B8D34(GameModeState* scene) { gm_801A5F64(scene, &gmMainLib_804D3EE0->unk_6D0, 0); } -void gm_801B8D60_OnInit(void) +void gm_Mode_SuperSuddenDeath_OnInit(void) { gm_80167B50(&gmMainLib_804D3EE0->unk_6D0); } -void gm_801B8D88_OnLoad(void) +void gm_Mode_SuperSuddenDeath_OnLoad(void) { gm_801A55C4(); } diff --git a/src/melee/gm/gmsupersudden.h b/src/melee/gm/gmsupersudden.h index 085afb3e5f..c40b1d5d7f 100644 --- a/src/melee/gm/gmsupersudden.h +++ b/src/melee/gm/gmsupersudden.h @@ -4,18 +4,18 @@ #include #include -/* 1B8BB4 */ void gm_801B8BB4(GameScene*); -/* 1B8BE0 */ void gm_801B8BE0(GameScene*); -/* 1B8C08 */ void gm_801B8C08(GameScene*); -/* 1B8C30 */ void gm_801B8C30(GameScene*); +/* 1B8BB4 */ void gm_801B8BB4(GameModeState*); +/* 1B8BE0 */ void gm_801B8BE0(GameModeState*); +/* 1B8C08 */ void gm_801B8C08(GameModeState*); +/* 1B8C30 */ void gm_801B8C30(GameModeState*); /* 1B8C5C */ void fn_801B8C5C(PlayerInitData*, PlayerInitData*); -/* 1B8C68 */ void gm_801B8C68(GameScene*); -/* 1B8C9C */ void gm_801B8C9C(GameScene*); -/* 1B8CC4 */ void gm_801B8CC4(GameScene*); -/* 1B8CF4 */ void gm_801B8CF4(GameScene*); -/* 1B8D14 */ void gm_801B8D14(GameScene*); -/* 1B8D34 */ void gm_801B8D34(GameScene*); -/* 1B8D60 */ void gm_801B8D60_OnInit(void); -/* 1B8D88 */ void gm_801B8D88_OnLoad(void); +/* 1B8C68 */ void gm_801B8C68(GameModeState*); +/* 1B8C9C */ void gm_801B8C9C(GameModeState*); +/* 1B8CC4 */ void gm_801B8CC4(GameModeState*); +/* 1B8CF4 */ void gm_801B8CF4(GameModeState*); +/* 1B8D14 */ void gm_801B8D14(GameModeState*); +/* 1B8D34 */ void gm_801B8D34(GameModeState*); +/* 1B8D60 */ void gm_Mode_SuperSuddenDeath_OnInit(void); +/* 1B8D88 */ void gm_Mode_SuperSuddenDeath_OnLoad(void); #endif diff --git a/src/melee/gm/gmtiny.c b/src/melee/gm/gmtiny.c index b16705f1f1..41d868fcc1 100644 --- a/src/melee/gm/gmtiny.c +++ b/src/melee/gm/gmtiny.c @@ -9,7 +9,7 @@ #include "if/if_2FD9.h" -GameScene gm_803DEF88_Scenes[] = { +GameModeState gm_Mode_TinyVs_States[] = { { 0, 3, @@ -109,22 +109,22 @@ GameScene gm_803DEF88_Scenes[] = { { -1 }, }; -void gm_801B8DA8(GameScene* scene) +void gm_801B8DA8(GameModeState* scene) { gm_801A5618(scene, &gmMainLib_804D3EE0->unk_E50, 5); } -void gm_801B8DD4(GameScene* scene) +void gm_801B8DD4(GameModeState* scene) { gm_801A5680(scene, &gmMainLib_804D3EE0->unk_E50); } -void gm_801B8DFC(GameScene* scene) +void gm_801B8DFC(GameModeState* scene) { gm_801A5754(scene, &gmMainLib_804D3EE0->unk_E50); } -void gm_801B8E24(GameScene* scene) +void gm_801B8E24(GameModeState* scene) { gm_801A57A8(scene, &gmMainLib_804D3EE0->unk_E50, 0); } @@ -137,44 +137,44 @@ void fn_801B8E50(PlayerInitData* arg0, PlayerInitData* unused) arg0->xB = 1; } -void gm_801B8E74(GameScene* scene) +void gm_801B8E74(GameModeState* scene) { VsModeData* data = &gmMainLib_804D3EE0->unk_E50; gm_801A583C(scene, data, NULL, fn_801B8E50); } -void gm_801B8EA8(GameScene* scene) +void gm_801B8EA8(GameModeState* scene) { gm_801A5AF0(scene, 4U, 3U); } -void gm_801B8ED0(GameScene* scene) +void gm_801B8ED0(GameModeState* scene) { VsModeData* data = &gmMainLib_804D3EE0->unk_E50; gm_801A5C3C(scene, data, NULL, fn_801B8E50); } -void gm_801B8F04(GameScene* scene) +void gm_801B8F04(GameModeState* scene) { gm_801A5EC8(scene); } -void gm_801B8F24(GameScene* scene) +void gm_801B8F24(GameModeState* scene) { gm_801A5F00(scene); } -void gm_801B8F44(GameScene* scene) +void gm_801B8F44(GameModeState* scene) { gm_801A5F64(scene, &gmMainLib_804D3EE0->unk_E50, 0); } -void gm_801B8F70_OnInit(void) +void gm_Mode_TinyVs_OnInit(void) { gm_80167B50(&gmMainLib_804D3EE0->unk_E50); } -void gm_801B8F98_OnLoad(void) +void gm_Mode_TinyVs_OnLoad(void) { gm_801A55C4(); } diff --git a/src/melee/gm/gmtiny.h b/src/melee/gm/gmtiny.h index ce0f814e49..ffe176ec0a 100644 --- a/src/melee/gm/gmtiny.h +++ b/src/melee/gm/gmtiny.h @@ -4,18 +4,18 @@ #include #include -/* 1B8DA8 */ void gm_801B8DA8(GameScene*); -/* 1B8DD4 */ void gm_801B8DD4(GameScene*); -/* 1B8DFC */ void gm_801B8DFC(GameScene*); -/* 1B8E24 */ void gm_801B8E24(GameScene*); +/* 1B8DA8 */ void gm_801B8DA8(GameModeState*); +/* 1B8DD4 */ void gm_801B8DD4(GameModeState*); +/* 1B8DFC */ void gm_801B8DFC(GameModeState*); +/* 1B8E24 */ void gm_801B8E24(GameModeState*); /* 1B8E50 */ void fn_801B8E50(PlayerInitData*, PlayerInitData*); -/* 1B8E74 */ void gm_801B8E74(GameScene*); -/* 1B8EA8 */ void gm_801B8EA8(GameScene*); -/* 1B8ED0 */ void gm_801B8ED0(GameScene*); -/* 1B8F04 */ void gm_801B8F04(GameScene*); -/* 1B8F24 */ void gm_801B8F24(GameScene*); -/* 1B8F44 */ void gm_801B8F44(GameScene*); -/* 1B8F70 */ void gm_801B8F70_OnInit(void); -/* 1B8F98 */ void gm_801B8F98_OnLoad(void); +/* 1B8E74 */ void gm_801B8E74(GameModeState*); +/* 1B8EA8 */ void gm_801B8EA8(GameModeState*); +/* 1B8ED0 */ void gm_801B8ED0(GameModeState*); +/* 1B8F04 */ void gm_801B8F04(GameModeState*); +/* 1B8F24 */ void gm_801B8F24(GameModeState*); +/* 1B8F44 */ void gm_801B8F44(GameModeState*); +/* 1B8F70 */ void gm_Mode_TinyVs_OnInit(void); +/* 1B8F98 */ void gm_Mode_TinyVs_OnLoad(void); #endif diff --git a/src/melee/gm/gmtitle.c b/src/melee/gm/gmtitle.c index 0ded89c091..189b8a00d5 100644 --- a/src/melee/gm/gmtitle.c +++ b/src/melee/gm/gmtitle.c @@ -254,7 +254,7 @@ HSD_Archive* gmTitle_801A1AC0(void) &gm_804D67F0, "TitleMark_sobjdesc", 0); } -void gmTitle_OnFrame(void) +void gm_Scene_Title_OnFrame(void) { int input = gm_GetButtonsTriggered(PAD_ALL_CONTROLLERS); int* tmp; @@ -327,7 +327,7 @@ static char* gmTitle_801A1D38(const char* src, char* dst) return dst; } -void gmTitle_OnEnter(void* unused) +void gm_Scene_Title_OnEnter(void* unused) { HSD_Text* text; int scale; diff --git a/src/melee/gm/gmtitle.h b/src/melee/gm/gmtitle.h index 269013236e..316a620e12 100644 --- a/src/melee/gm/gmtitle.h +++ b/src/melee/gm/gmtitle.h @@ -10,7 +10,7 @@ /* 1A19AC */ void gmTitle_801A19AC(void); /* 1A1A3C */ HSD_GObj* gmTitle_801A1A3C(void); /* 1A1AC0 */ HSD_Archive* gmTitle_801A1AC0(void); -/* 1A1C18 */ void gmTitle_OnFrame(void); -/* 1A1E20 */ void gmTitle_OnEnter(void*); +/* 1A1C18 */ void gm_Scene_Title_OnFrame(void); +/* 1A1E20 */ void gm_Scene_Title_OnEnter(void*); #endif diff --git a/src/melee/gm/gmtitlemode.c b/src/melee/gm/gmtitlemode.c index e02329f60c..28df6892e9 100644 --- a/src/melee/gm/gmtitlemode.c +++ b/src/melee/gm/gmtitlemode.c @@ -13,10 +13,10 @@ struct exitData { UNK_T x4; }; -/* 1B089C */ static void onExit(GameScene*); +/* 1B089C */ static void onExit(GameModeState*); /* 4D6878 */ static struct exitData exit_data; -/* 3DD6A0 */ GameScene gm_803DD6A0_Scenes[] = { +/* 3DD6A0 */ GameModeState gm_Mode_Title_States[] = { { 0, lbDvdPreload_3, @@ -32,12 +32,12 @@ struct exitData { { -1 }, }; -void gmTitleMode_OnEnter(GameScene* arg0) +void gmTitleMode_OnEnter(UNUSED GameModeState* state) { lbDvd_800174BC(); } -void onExit(GameScene* scene) +void onExit(GameModeState* scene) { int* buttons = gm_GetGameSceneLeaveData(scene); if (DbLevel >= DbLKind_DebugRom) { diff --git a/src/melee/gm/gmtitlemode.h b/src/melee/gm/gmtitlemode.h index 78793c4865..f8a27896f4 100644 --- a/src/melee/gm/gmtitlemode.h +++ b/src/melee/gm/gmtitlemode.h @@ -3,7 +3,7 @@ #include "melee/gm/types.h" -/* 1B087C */ void gmTitleMode_OnEnter(GameScene*); -/* 3DD6A0 */ extern GameScene gm_803DD6A0_Scenes[]; +/* 1B087C */ void gmTitleMode_OnEnter(GameModeState*); +/* 3DD6A0 */ extern GameModeState gm_Mode_Title_States[]; #endif diff --git a/src/melee/gm/gmtou_0.c b/src/melee/gm/gmtou_0.c index 744dc55c33..d87c15831e 100644 --- a/src/melee/gm/gmtou_0.c +++ b/src/melee/gm/gmtou_0.c @@ -2901,7 +2901,7 @@ void fn_8019610C(s32* state, u32 buttons, u32 trigger) } /// Tournament Mode per-frame update handler. -void gm_8019628C_OnFrame(void) +void gm_Scene_TouSetup_OnFrame(void) { TmData* tm; u32 r30; @@ -2940,7 +2940,7 @@ void gm_8019628C_OnFrame(void) lbl_803D9FD8[cur_option]((s32*) tm, r30, r29); } -void gm_801963B4_OnEnter(void* arg0) +void gm_Scene_TouSetup_OnEnter(void* arg0) { const char* filename; lbAudioAx_80026F2C(0x12); @@ -2964,7 +2964,7 @@ void gm_801963B4_OnEnter(void* arg0) } /// Scene OnLeave callback for gm_18A5. Frees archive resources. -void gm_801964A4_OnLeave(UNK_T arg) +void gm_Scene_TouSetup_OnExit(UNK_T arg) { (void) arg; lbArchive_80016EFC(lbl_804D6640); diff --git a/src/melee/gm/gmtou_1.c b/src/melee/gm/gmtou_1.c index 57c0ce7399..b531c86a08 100644 --- a/src/melee/gm/gmtou_1.c +++ b/src/melee/gm/gmtou_1.c @@ -2198,7 +2198,7 @@ void fn_8019AF50(s32* arg0, u32 arg1, u32 arg2) /// @todo Currently 89.97% match - permuter couldn't improve /// Per-frame update for tournament mode menu. -void gm_8019B2DC_OnFrame(void) +void gm_Scene_TouBracket_OnFrame(void) { s32 sp[13]; u32 arg1; @@ -2382,7 +2382,7 @@ void fn_8019B458(s32* arg0) } { - PreloadCacheScene* scene = lbDvd_GetPreloadCacheScene(); + PreloadedGameModeState* scene = lbDvd_GetPreloadCacheScene(); struct GameCache* gc = &scene->game_cache; lbDvd_800174BC(); @@ -2447,7 +2447,7 @@ void fn_8019B860(TmData* tm) tm->cur_option = 0x20; } -void gm_8019B8C4_OnEnter(void* arg0) +void gm_Scene_TouBracket_OnEnter(void* arg0) { lbl_804D6668 = NULL; lbl_804D6664 = NULL; @@ -2472,7 +2472,7 @@ void gm_8019B8C4_OnEnter(void* arg0) lbAudioAx_80023F28(0x5E); } -void gm_8019B9C8_OnLeave(void* arg0) +void gm_Scene_TouBracket_OnExit(void* arg0) { lbArchive_80016EFC(lbl_804D6660); lbArchive_80016EFC(lbl_804D6638); diff --git a/src/melee/gm/gmtou_2.c b/src/melee/gm/gmtou_2.c index 7a82bda956..f607bbd957 100644 --- a/src/melee/gm/gmtou_2.c +++ b/src/melee/gm/gmtou_2.c @@ -792,7 +792,7 @@ static inline s32 get_match_player_index_xF(s32 player) return 0; } -void gm_8019DF8C_OnFrame(void) +void gm_Scene_TouAlt_OnFrame(void) { TmVsData vsdata; TmData* tmd; @@ -1140,7 +1140,7 @@ void gm_8019E634(void) } } -void gm_8019ECAC_OnEnter(void* arg0) +void gm_Scene_TouAlt_OnEnter(void* arg0) { struct { StKind stkind; @@ -1193,7 +1193,7 @@ void gm_8019ECAC_OnEnter(void* arg0) lbAudioAx_80023F28(gmMainLib_8015ECB0()); } -void gm_8019EE54_OnLeave(void* arg0) +void gm_Scene_TouAlt_OnExit(void* arg0) { lbArchive_80016EFC(lbl_804D6688); lbArchive_80016EFC(lbl_804D668C); diff --git a/src/melee/gm/gmtoulib.h b/src/melee/gm/gmtoulib.h index 92716f0f94..0693873bbd 100644 --- a/src/melee/gm/gmtoulib.h +++ b/src/melee/gm/gmtoulib.h @@ -99,9 +99,9 @@ /* 195AF0 */ void fn_80195AF0(s32* arg, u32 arg0, u32 arg01); /* 195CCC */ void fn_80195CCC(s32* arg, u32 arg0, u32 arg01); /* 19610C */ void fn_8019610C(s32* arg, u32 arg0, u32 arg01); -/* 19628C */ void gm_8019628C_OnFrame(void); -/* 1963B4 */ void gm_801963B4_OnEnter(UNK_T); -/* 1964A4 */ void gm_801964A4_OnLeave(UNK_T); +/* 19628C */ void gm_Scene_TouSetup_OnFrame(void); +/* 1963B4 */ void gm_Scene_TouSetup_OnEnter(UNK_T); +/* 1964A4 */ void gm_Scene_TouSetup_OnExit(UNK_T); /* 196510 */ void fn_80196510(void); /* 19655C */ s32 fn_8019655C(void); /* 196564 */ bool fn_80196564(TmData*); @@ -137,12 +137,12 @@ /* 19A828 */ void gm_8019A828(void); /* 19A86C */ void fn_8019A86C(TmData*, u32, u32); /* 19AF50 */ void fn_8019AF50(s32*, u32, u32); -/* 19B2DC */ void gm_8019B2DC_OnFrame(void); +/* 19B2DC */ void gm_Scene_TouBracket_OnFrame(void); /* 19B458 */ void fn_8019B458(s32* arg0); /* 19B81C */ void fn_8019B81C(s32* arg0); /* 19B860 */ void fn_8019B860(TmData*); -/* 19B8C4 */ void gm_8019B8C4_OnEnter(void*); -/* 19B9C8 */ void gm_8019B9C8_OnLeave(void*); +/* 19B8C4 */ void gm_Scene_TouBracket_OnEnter(void*); +/* 19B9C8 */ void gm_Scene_TouBracket_OnExit(void*); /* 19BA04 */ void fn_8019BA04(s32* arg0); /* 19BA08 */ void fn_8019BA08(u8, HSD_JObj*); /* 19BF18 */ void fn_8019BF18(HSD_GObj*); @@ -160,10 +160,10 @@ /* 19D074 */ void fn_8019D074(HSD_GObj*); /* 19D1BC */ void fn_8019D1BC(void); /* 19DD60 */ void fn_8019DD60(void); -/* 19DF8C */ void gm_8019DF8C_OnFrame(void); +/* 19DF8C */ void gm_Scene_TouAlt_OnFrame(void); /* 19E634 */ void gm_8019E634(void); -/* 19ECAC */ void gm_8019ECAC_OnEnter(void*); -/* 19EE54 */ void gm_8019EE54_OnLeave(void*); +/* 19ECAC */ void gm_Scene_TouAlt_OnEnter(void*); +/* 19EE54 */ void gm_Scene_TouAlt_OnExit(void*); /* 19EE80 */ void fn_8019EE80(TmVsData*); /* 19EF08 */ void fn_8019EF08(TmVsData*); /* 4771C4 */ extern TmData gm_804771C4; diff --git a/src/melee/gm/gmtoumode.c b/src/melee/gm/gmtoumode.c index 08685a7189..fddda45b46 100644 --- a/src/melee/gm/gmtoumode.c +++ b/src/melee/gm/gmtoumode.c @@ -15,22 +15,22 @@ #include "melee/lb/types.h" #include "melee/mn/types.h" -/* 1B1724 */ static void gm_801B1724(GameScene*); -/* 1B174C */ static void gm_801B174C(GameScene*); -/* 1B1788 */ static void gm_801B1788(GameScene*); -/* 1B1810 */ static void gm_801B1810(GameScene*); -/* 1B1834 */ static void gm_801B1834(GameScene*); -/* 1B18D4 */ static void gm_801B18D4(GameScene*); -/* 1B1A2C */ static void gm_801B1A2C(GameScene*); -/* 1B1A84 */ static void gm_801B1A84(GameScene*); -/* 1B1AD4 */ static void gm_801B1AD4(GameScene*); +/* 1B1724 */ static void gm_801B1724(GameModeState*); +/* 1B174C */ static void gm_801B174C(GameModeState*); +/* 1B1788 */ static void gm_801B1788(GameModeState*); +/* 1B1810 */ static void gm_801B1810(GameModeState*); +/* 1B1834 */ static void gm_801B1834(GameModeState*); +/* 1B18D4 */ static void gm_801B18D4(GameModeState*); +/* 1B1A2C */ static void gm_801B1A2C(GameModeState*); +/* 1B1A84 */ static void gm_801B1A84(GameModeState*); +/* 1B1AD4 */ static void gm_801B1AD4(GameModeState*); /* 4876D8 */ static StartMeleeData gm_804876D8; /* 487810 */ static MatchExitInfo gm_80487810; /* 489A98 */ static UNK_T gm_80489A98[0x2288 / 4]; /* 48BD20 */ static UNK_T gm_8048BD20[0x148 / 4]; /* 48BE68 */ static UNK_T gm_8048BE68[0x23C8 / 4]; -GameScene gm_803DDAC0_Scenes[] = { +GameModeState gm_Mode_Tournament_States[] = { { 0, lbDvdPreload_3, @@ -118,13 +118,13 @@ GameScene gm_803DDAC0_Scenes[] = { { -1 }, }; -void gm_801B1724(GameScene* arg0) +void gm_801B1724(GameModeState* arg0) { lb_8001C550(); lb_8001D164(0); } -void gm_801B174C(GameScene* arg0) +void gm_801B174C(GameModeState* arg0) { SSSData* sss; @@ -135,7 +135,7 @@ void gm_801B174C(GameScene* arg0) sss->unk_stage = 0; } -void gm_801B1788(GameScene* arg0) +void gm_801B1788(GameModeState* arg0) { u16 stage; SSSData* sss; @@ -156,13 +156,13 @@ void gm_801B1788(GameScene* arg0) gm_SetPendingSceneIndex(2); } -void gm_801B1810(GameScene* arg0) +void gm_801B1810(GameModeState* arg0) { StartMeleeData* data = gm_GetGameSceneLoadData(arg0); gm_801905F0(data); } -void gm_801B1834(GameScene* arg0) +void gm_801B1834(GameModeState* arg0) { MatchExitInfo* mei; @@ -185,7 +185,7 @@ void gm_801B1834(GameScene* arg0) #pragma push #pragma dont_inline on #endif -void gm_801B18D4(GameScene* arg0) +void gm_801B18D4(GameModeState* arg0) { StartMeleeData* smd; StartMeleeData* src = &gm_804876D8; @@ -204,7 +204,7 @@ void gm_801B18D4(GameScene* arg0) #pragma pop #endif -void gm_801B1A2C(GameScene* arg0) +void gm_801B1A2C(GameModeState* arg0) { MatchExitInfo* mei; @@ -213,7 +213,7 @@ void gm_801B1A2C(GameScene* arg0) gm_80166CCC(&gm_80487810.match_end, &mei->match_end); } -void gm_801B1A84(GameScene* arg0) +void gm_801B1A84(GameModeState* arg0) { ResultsMatchInfo* rmi; @@ -221,7 +221,7 @@ void gm_801B1A84(GameScene* arg0) rmi->match_end = gm_80487810.match_end; } -void gm_801B1AD4(GameScene* arg0) +void gm_801B1AD4(GameModeState* arg0) { ResultsMatchInfo* rmi; diff --git a/src/melee/gm/gmtoumode.h b/src/melee/gm/gmtoumode.h index d58b016e76..3ba53d9d27 100644 --- a/src/melee/gm/gmtoumode.h +++ b/src/melee/gm/gmtoumode.h @@ -3,6 +3,6 @@ #include "gm/types.h" -/* 3DDAC0 */ extern GameScene gm_803DDAC0_Scenes[]; +/* 3DDAC0 */ extern GameModeState gm_Mode_Tournament_States[]; #endif diff --git a/src/melee/gm/gmtoycollection.c b/src/melee/gm/gmtoycollection.c index 718a5ccac6..7d40f128af 100644 --- a/src/melee/gm/gmtoycollection.c +++ b/src/melee/gm/gmtoycollection.c @@ -4,10 +4,10 @@ #include "melee/gm/types.h" #include "melee/lb/types.h" -/* 1BED14 */ static void gm_801BED14(GameScene*); +/* 1BED14 */ static void gm_801BED14(GameModeState*); /* 4D6910 */ static UNK_T gm_804D6918[2]; -GameScene gm_803DFA78_Scenes[] = { +GameModeState gm_Mode_ToyCollection_States[] = { { 0, lbDvdPreload_2, @@ -23,7 +23,7 @@ GameScene gm_803DFA78_Scenes[] = { { -1 }, }; -void gm_801BED14(GameScene* arg) +void gm_801BED14(GameModeState* arg) { gm_SetPendingGameMode(GM_MENU); gm_SetNewGameModePending(); diff --git a/src/melee/gm/gmtoycollection.h b/src/melee/gm/gmtoycollection.h index d509b96f49..a95db33cde 100644 --- a/src/melee/gm/gmtoycollection.h +++ b/src/melee/gm/gmtoycollection.h @@ -3,6 +3,6 @@ #include "gm/types.h" -/* 3DFA78 */ extern GameScene gm_803DFA78_Scenes[]; +/* 3DFA78 */ extern GameModeState gm_Mode_ToyCollection_States[]; #endif diff --git a/src/melee/gm/gmtoygallery.c b/src/melee/gm/gmtoygallery.c index 0135a51195..c7d25055e2 100644 --- a/src/melee/gm/gmtoygallery.c +++ b/src/melee/gm/gmtoygallery.c @@ -5,26 +5,26 @@ #include "melee/gm/gm_unsplit.h" #include "melee/gm/types.h" -/* 1BEC80 */ static void gm_801BEC80(GameScene*); -/* 4D6908 */ static UNK_T gm_804D6908[2]; +/* 1BEC80 */ static void onExit(GameModeState*); +/* 4D6908 */ static UNK_T exit_data[2]; -GameScene gm_803DFA18_Scenes[] = { +GameModeState gm_Mode_ToyGallery_States[] = { { 0, lbDvdPreload_2, 0, NULL, - gm_801BEC80, + onExit, { GS_TOY_GALLERY, NULL, - &gm_804D6908, + &exit_data, }, }, { -1 }, }; -void gm_801BEC80(GameScene* arg) +void onExit(UNUSED GameModeState* state) { gm_SetPendingGameMode(GM_MENU); gm_SetNewGameModePending(); diff --git a/src/melee/gm/gmtoygallery.h b/src/melee/gm/gmtoygallery.h index 3dca63e8b3..cfb6062a22 100644 --- a/src/melee/gm/gmtoygallery.h +++ b/src/melee/gm/gmtoygallery.h @@ -3,6 +3,6 @@ #include "gm/types.h" -/* 3DFA18 */ extern GameScene gm_803DFA18_Scenes[]; +/* 3DFA18 */ extern GameModeState gm_Mode_ToyGallery_States[]; #endif diff --git a/src/melee/gm/gmtoylottery.c b/src/melee/gm/gmtoylottery.c index c7bbf5492c..14408eab92 100644 --- a/src/melee/gm/gmtoylottery.c +++ b/src/melee/gm/gmtoylottery.c @@ -7,33 +7,33 @@ #include "melee/lb/lbcardnew.h" #include "melee/lb/types.h" -/* 1BECA8 */ static void gm_801BECA8(GameScene*); -/* 1BECD0 */ static void gm_801BECD0(GameScene*); -/* 4D6910 */ static UNK_T gm_804D6910[2]; +/* 1BECA8 */ static void onEnter(GameModeState*); +/* 1BECD0 */ static void onExit(GameModeState*); +/* 4D6910 */ static UNK_T exit_data[2]; -GameScene gm_803DFA48_Scenes[] = { +GameModeState gm_Mode_ToyLottery_States[] = { { 0, lbDvdPreload_2, 0, - gm_801BECA8, - gm_801BECD0, + onEnter, + onExit, { GS_TOY_LOTTERY, NULL, - &gm_804D6910, + &exit_data, }, }, { -1 }, }; -void gm_801BECA8(GameScene* arg) +void onEnter(UNUSED GameModeState* state) { lb_8001C550(); lb_8001D164(0); } -void gm_801BECD0(GameScene* arg) +void onExit(UNUSED GameModeState* state) { gm_80172898(4); if (!gm_80173754(1, 0)) { diff --git a/src/melee/gm/gmtoylottery.h b/src/melee/gm/gmtoylottery.h index 0d829e62ad..333cf64f87 100644 --- a/src/melee/gm/gmtoylottery.h +++ b/src/melee/gm/gmtoylottery.h @@ -3,6 +3,6 @@ #include "gm/types.h" -/* 3DFA48 */ extern GameScene gm_803DFA48_Scenes[]; +/* 3DFA48 */ extern GameModeState gm_Mode_ToyLottery_States[]; #endif diff --git a/src/melee/gm/gmtrainingmode.c b/src/melee/gm/gmtrainingmode.c index 901a3946d1..1c3d0a4d21 100644 --- a/src/melee/gm/gmtrainingmode.c +++ b/src/melee/gm/gmtrainingmode.c @@ -19,13 +19,13 @@ #include "melee/mn/types.h" #include "mn/inlines.h" -/* 1B1B74 */ static void gm_801B1B74(GameScene*); -/* 1B1C24 */ static void gm_801B1C24(GameScene*); -/* 1B1EB8 */ static void gm_801B1EB8(GameScene*); -/* 1B1EEC */ static void gm_801B1EEC(GameScene*); +/* 1B1B74 */ static void gm_801B1B74(GameModeState*); +/* 1B1C24 */ static void gm_801B1C24(GameModeState*); +/* 1B1EB8 */ static void gm_801B1EB8(GameModeState*); +/* 1B1EEC */ static void gm_801B1EEC(GameModeState*); /* 1B1F6C */ static void fn_801B1F6C(int); -/* 1B1F70 */ static void gm_801B1F70(GameScene*); -/* 1B2204 */ static void gm_801B2204(GameScene*); +/* 1B1F70 */ static void gm_801B1F70(GameModeState*); +/* 1B2204 */ static void gm_801B2204(GameModeState*); /* 4D68C0 */ static u8 gm_804D68C0; /* 4D68C1 */ static u8 gm_804D68C1; /* 48E230 */ static CSSData css_data; @@ -33,7 +33,7 @@ /* 48E4C0 */ static StartMeleeData training_enter_data; /* 48E5F8 */ static UNK_T training_exit_data[0x2288 / 4]; -GameScene gm_803DDB80_Scenes[] = { +GameModeState gm_Mode_Training_States[] = { { 0, lbDvdPreload_3, @@ -65,7 +65,7 @@ GameScene gm_803DDB80_Scenes[] = { gm_801B1F70, gm_801B2204, { - GS_TRAINING_MODE, + GS_TRAINING, &training_enter_data, &training_exit_data, }, @@ -77,7 +77,7 @@ GameScene gm_803DDB80_Scenes[] = { #pragma push #pragma dont_inline on #endif -void gm_801B1B74(GameScene* arg0) +void gm_801B1B74(GameModeState* arg0) { VsModeData* vs_data; CSSData* css; @@ -109,7 +109,7 @@ static void gm_801B07E8_layer(CSSData* css_data, s8* c_kind, s8* stocks, gm_801B07E8(css_data, c_kind, stocks, color, arg4, level); } -void gm_801B1C24(GameScene* arg0) +void gm_801B1C24(GameModeState* arg0) { VsModeData* vs = &gmMainLib_804D3EE0->unk_D10; CSSData* css = gm_GetGameSceneLeaveData(arg0); @@ -173,7 +173,7 @@ void gm_801B1C24(GameScene* arg0) } } -void gm_801B1EB8(GameScene* arg0) +void gm_801B1EB8(GameModeState* arg0) { SSSData* sss; @@ -183,7 +183,7 @@ void gm_801B1EB8(GameScene* arg0) sss->unk_stage = 0; } -void gm_801B1EEC(GameScene* arg0) +void gm_801B1EEC(GameModeState* arg0) { VsModeData* vs_data; SSSData* sss; @@ -209,7 +209,7 @@ void fn_801B1F6C(int unused) {} #pragma push #pragma dont_inline on #endif -void gm_801B1F70(GameScene* arg0) +void gm_801B1F70(GameModeState* arg0) { VsModeData* vs; StartMeleeData* data; @@ -253,7 +253,7 @@ void gm_801B1F70(GameScene* arg0) #pragma pop #endif -void gm_801B2204(GameScene* arg0) +void gm_801B2204(GameModeState* arg0) { MatchExitInfo* temp_r3; @@ -271,7 +271,7 @@ void gm_801B2204(GameScene* arg0) sfxForward(); } -void gm_801B2298_OnInit(void) +void gm_Mode_Training_OnInit(void) { VsModeData* temp_r31 = &gmMainLib_804D3EE0->unk_D10; int i; @@ -288,7 +288,7 @@ void gm_801B2298_OnInit(void) } } -void gm_801B23C4_OnLoad(void) +void gm_Mode_Training_OnLoad(void) { gm_804D68C0 = gm_801677F0(); gm_804D68C1 = 0; diff --git a/src/melee/gm/gmtrainingmode.h b/src/melee/gm/gmtrainingmode.h index a2feea6a3f..016a3d2e65 100644 --- a/src/melee/gm/gmtrainingmode.h +++ b/src/melee/gm/gmtrainingmode.h @@ -3,8 +3,8 @@ #include "gm/types.h" -/* 1B2298 */ void gm_801B2298_OnInit(void); -/* 1B23C4 */ void gm_801B23C4_OnLoad(void); -/* 3DDB80 */ extern GameScene gm_803DDB80_Scenes[]; +/* 1B2298 */ void gm_Mode_Training_OnInit(void); +/* 1B23C4 */ void gm_Mode_Training_OnLoad(void); +/* 3DDB80 */ extern GameModeState gm_Mode_Training_States[]; #endif diff --git a/src/melee/gm/gmvsmelee.c b/src/melee/gm/gmvsmelee.c index 0577453b9c..2540a7f0ed 100644 --- a/src/melee/gm/gmvsmelee.c +++ b/src/melee/gm/gmvsmelee.c @@ -90,7 +90,7 @@ u8 gm_801A5360(MatchEnd* match_end) return 0; } -void gm_801A5598_OnInit(void) +void gm_Mode_Vs_OnInit(void) { gm_80167B50(&gmMainLib_804D3EE0->unk_590); gmMainLib_8015CDEC(); @@ -101,14 +101,15 @@ void gm_801A55C4(void) memzero(&gm_804D6730, sizeof(gm_804D6730)); } -void gm_801A55EC_OnLoad(void) +void gm_Mode_Vs_OnLoad(void) { memzero(&gm_804D6730, sizeof(gm_804D6730)); } -void gm_801A5614_OnUnload(void) {} +void gm_Mode_Vs_OnUnload(void) {} -void gm_801A5618(GameScene* scene_data, VsModeData* vs_data, int match_type) +void gm_801A5618(GameModeState* scene_data, VsModeData* vs_data, + int match_type) { CSSData* css_data = gm_GetGameSceneLoadData(scene_data); css_data->match_type = match_type; @@ -117,7 +118,7 @@ void gm_801A5618(GameScene* scene_data, VsModeData* vs_data, int match_type) lbDvd_800174BC(); } -void gm_801A5680(GameScene* scene_data, VsModeData* vs_data) +void gm_801A5680(GameModeState* scene_data, VsModeData* vs_data) { CSSData* css_data; u64 mask; @@ -139,14 +140,14 @@ void gm_801A5680(GameScene* scene_data, VsModeData* vs_data) lbAudioAx_80027168(); } -void gm_801A5754(GameScene* scene_data, VsModeData* vs_data) +void gm_801A5754(GameModeState* scene_data, VsModeData* vs_data) { SSSData* sss_data = gm_GetGameSceneLoadData(scene_data); sss_data->data = *vs_data; gm_80167FC4(sss_data); } -void gm_801A57A8(GameScene* scene_data, VsModeData* vs_data, u8 id) +void gm_801A57A8(GameModeState* scene_data, VsModeData* vs_data, u8 id) { SSSData* sss_data; @@ -161,7 +162,7 @@ void gm_801A57A8(GameScene* scene_data, VsModeData* vs_data, u8 id) } } -void gm_801A583C(GameScene* scene_data, VsModeData* vs_data, +void gm_801A583C(GameModeState* scene_data, VsModeData* vs_data, void (*callback)(StartMeleeData*, StartMeleeData*), void (*callback2)(PlayerInitData*, PlayerInitData*)) { @@ -197,7 +198,7 @@ void gm_801A583C(GameScene* scene_data, VsModeData* vs_data, gm_80168FC4(); } -void gm_801A5AF0(GameScene* scene_data, u8 id, u8 id2) +void gm_801A5AF0(GameModeState* scene_data, u8 id, u8 id2) { MatchExitInfo* match_exit_info = gm_GetGameSceneLeaveData(scene_data); int i; @@ -226,7 +227,7 @@ void gm_801A5AF0(GameScene* scene_data, u8 id, u8 id2) } } -void gm_801A5C3C(GameScene* scene_data, VsModeData* vs_data, +void gm_801A5C3C(GameModeState* scene_data, VsModeData* vs_data, void (*callback)(StartMeleeData*, StartMeleeData*), void (*callback2)(PlayerInitData*, PlayerInitData*)) { @@ -255,7 +256,7 @@ void gm_801A5C3C(GameScene* scene_data, VsModeData* vs_data, gm_801B0474(match_start_data, &gm_80479D98.match_end); } -void gm_801A5EC8(GameScene* scene_data) +void gm_801A5EC8(GameModeState* scene_data) { MatchExitInfo* exit_info; @@ -263,14 +264,14 @@ void gm_801A5EC8(GameScene* scene_data) gm_80166CCC(&gm_80479D98.match_end, &exit_info->match_end); } -void gm_801A5F00(GameScene* scene_data) +void gm_801A5F00(GameModeState* scene_data) { struct ResultsMatchInfo* exit_info = gm_GetGameSceneLoadData(scene_data); gm_80177724(exit_info); exit_info->match_end = gm_80479D98.match_end; } -void gm_801A5F64(GameScene* scene_data, VsModeData* vs_data, u8 next_scene) +void gm_801A5F64(GameModeState* scene_data, VsModeData* vs_data, u8 next_scene) { MatchEnd* match_end; u8* tmp = gm_804D6730; @@ -289,7 +290,7 @@ void gm_801A5F64(GameScene* scene_data, VsModeData* vs_data, u8 next_scene) if (gm_801A52D0(match_end)) { gm_8016247C(gm_801688AC(match_end)); - if (scene_data[1].idx != 0xFF) { + if (scene_data[1].id != 0xFF) { gm_GetVsPlayMatchTotal(); unk_bool = false; idx = gm_801A5360(match_end); diff --git a/src/melee/gm/gmvsmelee.h b/src/melee/gm/gmvsmelee.h index d8082dd357..b879360d1d 100644 --- a/src/melee/gm/gmvsmelee.h +++ b/src/melee/gm/gmvsmelee.h @@ -11,29 +11,30 @@ /* 1A5258 */ void gm_801A5258(u8*, MatchEnd*); /* 1A52D0 */ bool gm_801A52D0(MatchEnd*); /* 1A5360 */ u8 gm_801A5360(MatchEnd*); -/* 1A5598 */ void gm_801A5598_OnInit(void); +/* 1A5598 */ void gm_Mode_Vs_OnInit(void); /* 1A55C4 */ void gm_801A55C4(void); /// Zeroes KO Star Counts -/* 1A55EC */ void gm_801A55EC_OnLoad(void); -/* 1A5614 */ void gm_801A5614_OnUnload(void); -/* 1A5618 */ void gm_801A5618(GameScene*, struct VsModeData*, - int); /// CSS_Enter -/* 1A5680 */ void gm_801A5680(GameScene*, struct VsModeData*); /// CSS_Exit -/* 1A5754 */ void gm_801A5754(GameScene*, struct VsModeData*); /// SSS_Enter -/* 1A57A8 */ void gm_801A57A8(GameScene*, struct VsModeData*, +/* 1A55EC */ void gm_Mode_Vs_OnLoad(void); +/* 1A5614 */ void gm_Mode_Vs_OnUnload(void); +/* 1A5618 */ void gm_801A5618(GameModeState*, struct VsModeData*, + int); /// CSS_Enter +/* 1A5680 */ void gm_801A5680(GameModeState*, struct VsModeData*); /// CSS_Exit +/* 1A5754 */ void gm_801A5754(GameModeState*, + struct VsModeData*); /// SSS_Enter +/* 1A57A8 */ void gm_801A57A8(GameModeState*, struct VsModeData*, u8); /// SSS_Exit /* 1A583C */ void gm_801A583C( - GameScene*, struct VsModeData*, + GameModeState*, struct VsModeData*, void (*callback)(StartMeleeData*, StartMeleeData*), void (*callback2)(PlayerInitData*, PlayerInitData*)); /// Match_Enter -/* 1A5AF0 */ void gm_801A5AF0(GameScene*, u8, u8); // Match_Exit +/* 1A5AF0 */ void gm_801A5AF0(GameModeState*, u8, u8); // Match_Exit /* 1A5C3C */ void -gm_801A5C3C(GameScene*, struct VsModeData*, +gm_801A5C3C(GameModeState*, struct VsModeData*, void (*callback)(StartMeleeData*, StartMeleeData*), void (*callback2)(PlayerInitData*, PlayerInitData*)); /// SuddenDeath_Enter ?? -/* 1A5EC8 */ void gm_801A5EC8(GameScene*); /// SuddenDeath_Exit ?? -/* 1A5F00 */ void gm_801A5F00(GameScene*); /// Results_Enter ?? -/* 1A5F64 */ void gm_801A5F64(GameScene*, struct VsModeData*, +/* 1A5EC8 */ void gm_801A5EC8(GameModeState*); /// SuddenDeath_Exit ?? +/* 1A5F00 */ void gm_801A5F00(GameModeState*); /// Results_Enter ?? +/* 1A5F64 */ void gm_801A5F64(GameModeState*, struct VsModeData*, u8); /// Results_Exit ?? #endif diff --git a/src/melee/gm/gmvsmode.c b/src/melee/gm/gmvsmode.c index 4828b7e3cf..deeae3d687 100644 --- a/src/melee/gm/gmvsmode.c +++ b/src/melee/gm/gmvsmode.c @@ -14,19 +14,19 @@ #include "melee/gm/types.h" #include "melee/lb/types.h" -/* 1B13B8 */ static void onEnterDebugVs(GameScene*); -/* 1B14A0 */ static void onEnterCss(GameScene*); -/* 1B14DC */ static void onExitCss(GameScene*); -/* 1B1514 */ static void onEnterSss(GameScene*); -/* 1B154C */ static void onExitSss(GameScene*); -/* 1B1588 */ static void onEnterVs(GameScene*); -/* 1B15C8 */ static void onExitVs(GameScene*); -/* 1B1648 */ static void onEnterSuddenDeath(GameScene*); -/* 1B1688 */ static void onExitSuddenDeath(GameScene*); -/* 1B16A8 */ static void onEnterResults(GameScene*); -/* 1B16C8 */ static void onExitResults(GameScene*); - -GameScene gm_803DD9A0_Scenes[] = { +/* 1B13B8 */ static void onEnterDebugVs(GameModeState*); +/* 1B14A0 */ static void onEnterCss(GameModeState*); +/* 1B14DC */ static void onExitCss(GameModeState*); +/* 1B1514 */ static void onEnterSss(GameModeState*); +/* 1B154C */ static void onExitSss(GameModeState*); +/* 1B1588 */ static void onEnterVs(GameModeState*); +/* 1B15C8 */ static void onExitVs(GameModeState*); +/* 1B1648 */ static void onEnterSuddenDeath(GameModeState*); +/* 1B1688 */ static void onExitSuddenDeath(GameModeState*); +/* 1B16A8 */ static void onEnterResults(GameModeState*); +/* 1B16C8 */ static void onExitResults(GameModeState*); + +GameModeState gm_Mode_Vs_States[] = { { 0, lbDvdPreload_3, @@ -126,7 +126,7 @@ GameScene gm_803DD9A0_Scenes[] = { { -1 }, }; -GameScene gm_803DDA78_Scenes[] = { +GameModeState gm_Mode_DebugVs_States[] = { { 1, lbDvdPreload_2, @@ -154,7 +154,7 @@ GameScene gm_803DDA78_Scenes[] = { { -1 }, }; -void onEnterDebugVs(GameScene* arg0) +void onEnterDebugVs(GameModeState* arg0) { StartMeleeData* data = gm_GetGameSceneLoadData(arg0); int i; @@ -189,32 +189,32 @@ void onEnterDebugVs(GameScene* arg0) gm_80168FC4(); } -void onEnterCss(GameScene* arg0) +void onEnterCss(GameModeState* arg0) { gm_801A5618(arg0, gm_801A5244(), 0); } -void onExitCss(GameScene* arg0) +void onExitCss(GameModeState* arg0) { gm_801A5680(arg0, gm_801A5244()); } -void onEnterSss(GameScene* arg0) +void onEnterSss(GameModeState* arg0) { gm_801A5754(arg0, gm_801A5244()); } -void onExitSss(GameScene* arg0) +void onExitSss(GameModeState* arg0) { gm_801A57A8(arg0, gm_801A5244(), 0); } -void onEnterVs(GameScene* arg0) +void onEnterVs(GameModeState* arg0) { gm_801A583C(arg0, gm_801A5244(), NULL, NULL); } -void onExitVs(GameScene* arg0) +void onExitVs(GameModeState* arg0) { s32 i; MatchExitInfo* mei; @@ -230,22 +230,22 @@ void onExitVs(GameScene* arg0) } } -void onEnterSuddenDeath(GameScene* arg0) +void onEnterSuddenDeath(GameModeState* arg0) { gm_801A5C3C(arg0, gm_801A5244(), NULL, NULL); } -void onExitSuddenDeath(GameScene* arg0) +void onExitSuddenDeath(GameModeState* arg0) { gm_801A5EC8(arg0); } -void onEnterResults(GameScene* arg0) +void onEnterResults(GameModeState* arg0) { gm_801A5F00(arg0); } -void onExitResults(GameScene* arg0) +void onExitResults(GameModeState* arg0) { gm_801A5F64(arg0, gm_801A5244(), 0); if (gm_801743A4(gm_8047C020.match_end.result) == 0) { diff --git a/src/melee/gm/gmvsmode.h b/src/melee/gm/gmvsmode.h index ca850d749d..81e7dc8fe9 100644 --- a/src/melee/gm/gmvsmode.h +++ b/src/melee/gm/gmvsmode.h @@ -3,7 +3,7 @@ #include "gm/types.h" -/* 3DD9A0 */ extern GameScene gm_803DD9A0_Scenes[]; -/* 3DDA78 */ extern GameScene gm_803DDA78_Scenes[]; +/* 3DD9A0 */ extern GameModeState gm_Mode_Vs_States[]; +/* 3DDA78 */ extern GameModeState gm_Mode_DebugVs_States[]; #endif diff --git a/src/melee/gm/types.dox b/src/melee/gm/types.dox index 0aa0e9a9f3..ff5685526b 100644 --- a/src/melee/gm/types.dox +++ b/src/melee/gm/types.dox @@ -1,4 +1,4 @@ -/// @var GameSceneHandler::OnFrame +/// @var GameScene::OnFrame /// Referenced from #gm_801A4014 when passed to #gm_801A4D34. /// @var GameState::game_mode_override @@ -6,25 +6,26 @@ /// is not #GM_COUNT, #gm_RunGameMode runs that game mode once before /// resuming the current mode's scene graph. -/// @struct GameScene +/// @struct GameModeState /// @note Colloquially known as "Minor Scene" /// /// A single entry in a #GameMode's scene graph. Each scene is looked up by -/// its #GameScene::idx during scene graph traversal. The scene graph is walked -/// comparing each entry's @c idx against #GameRouting::curr_scene_idx, and -/// #nextScene advances to the next scene whose @c idx is greater than the +/// its #GameModeState::idx during scene graph traversal. The scene graph is +/// walked comparing each entry's @c idx against #GameRouting::curr_scene_idx, +/// and #nextScene advances to the next scene whose @c idx is greater than the /// current one. An @c idx value of @c 0xFF terminates a collection of -/// GameScene. +/// GameModeState. -/// @var GameScene::idx +/// @var GameModeState::idx /// Scene graph index searched against #GameRouting::curr_scene_idx during /// scene graph traversal. This is the value matched when the scene graph is /// walked to find the current scene. Not to be confused with -/// #GameScene::info::class_id, which is the scene's #GameSceneKind. +/// #GameModeState::info::class_id, which is the scene's #GameSceneKind. -/// @var GameScene::GameSceneInfo::class_id +/// @var GameModeState::GameSceneInfo::class_id /// The #GameSceneKind associated with this scene. This is the value matched by -/// #gm_FindGameSceneHandler to look up the corresponding #GameSceneHandler -/// supplying the #GameSceneHandler::OnLoad, #GameSceneHandler::OnLeave, and -/// #GameSceneHandler::OnFrame callbacks invoked for this scene. Not to be -/// confused with #GameScene::idx, which is the scene graph traversal index. +/// #gm_FindGameSceneHandler to look up the corresponding #GameScene +/// supplying the #GameScene::OnLoad, #GameScene::OnLeave, and +/// #GameScene::OnFrame callbacks invoked for this scene. Not to be +/// confused with #GameModeState::idx, which is the scene graph traversal +/// index. diff --git a/src/melee/gm/types.h b/src/melee/gm/types.h index 4caa80bbcf..3c02b19980 100644 --- a/src/melee/gm/types.h +++ b/src/melee/gm/types.h @@ -59,62 +59,42 @@ typedef struct un_804A1F48_t { } un_804A1F48_t; ASSERT_SIZE(struct un_804A1F48_t, 0xC); -/// @note Colloquially known as "Minor Scene" -struct GameScene { - /* 00 */ u8 idx; - /* 01 */ u8 preload; - /* 02 */ u16 flags; +struct GameModeState { + /* +0 */ u8 id; ///< locally defined by game mode + /* +1 */ u8 preload; ///< ::lbDvdPreloadKind + /* +2 */ u16 flags; - /* 04 */ void (*on_enter)(GameScene*); - /* 08 */ void (*on_exit)(GameScene*); + /* +4 */ void (*on_enter)(GameModeState*); + /* +8 */ void (*on_exit)(GameModeState*); struct GameSceneInfo { - /* 0C */ u8 scene_id; - /* 10 */ void* load_data; ///< data passed to OnLoad callback - /* 14 */ void* leave_data; ///< data passed to OnLeave callback + /* +0 */ u8 scene_kind; ///< ::GameSceneKind + /* +4 */ void* enter_data; ///< data passed to GameScene::on_enter + /* +8 */ void* exit_data; ///< data passed to GameScene::on_exit } info; }; /// @note Colloquially known as "Major Scene" struct GameMode { - u8 preload; - u8 idx; ///< GameModeKind + u8 preloaded; ///< ::bool + u8 kind; ///< ::GameModeKind void (*on_load)(void); void (*on_unload)(void); void (*on_init)(void); - GameScene* scenes; -}; // 803DACA4 - -struct GameSceneHandler { - u8 class_id; + GameModeState* states; +}; +/// @note Colloquially known as "Minor Scene" +struct GameScene { + u8 kind; ///< ::GameSceneKind void (*on_frame)(void); - void (*on_load)(void*); - void (*on_leave)(void*); - void (*unk_func)(void); -}; // 803DA920 - -typedef struct { - u8 curr_mode; ///< GameModeKind - u8 pending_mode; ///< GameModeKind - u8 prev_mode; ///< GameModeKind - u8 curr_scene_idx; ///< scene graph scene index for associated GameMode - u8 prev_scene_idx; ///< scene graph scene index for associated GameMode - u8 pending_scene_idx; ///< scene graph scene index for associated GameMode -} GameRouting; - -typedef struct { - GameRouting routing; - GameRouting backup; - u8 pending; - u8 x0D; - u8 x0E; - u8 x0F; - u8 (*game_mode_override)(void); -} GameState; -ASSERT_SIZE(GameState, 0x14); + void (*on_enter)(void*); + void (*on_exit)(void*); + UNUSED UNK_T unused; +}; +ASSERT_SIZE(struct GameScene, 0x14); struct gmm_x1CB0 { /* +0 */ u8 item_freq; diff --git a/src/melee/if/ifprize.c b/src/melee/if/ifprize.c index 3aa6dcdb2a..7b78b42f67 100644 --- a/src/melee/if/ifprize.c +++ b/src/melee/if/ifprize.c @@ -111,7 +111,7 @@ static inline void un_802FE3F8_inner(int a, int b, s16* c, s16* d) un_802FE3F8(a, b, c, d); } -/// un_802FEBE0_OnEnter will inline un_802FE3F8 otherwise +/// ifPrize_Scene_OnEnter will inline un_802FE3F8 otherwise static inline void un_802FE3F8_noinline(int a, int b, s16* c, s16* d) { un_802FE3F8_inner(a, b, c, d); @@ -310,7 +310,7 @@ void un_802FE918(int a, int b, int c) HSD_SisLib_803A6B98(*text, 320.0f, 316.0f, sp1C); } -void un_802FEBE0_OnEnter(void* arg0_) +void ifPrize_Scene_OnEnter(void* arg0_) { struct un_802FEBE0_OnEnter_arg0* arg0 = arg0_; struct un_803F9B30* x; @@ -344,4 +344,4 @@ void un_802FEBE0_OnEnter(void* arg0_) un_802FE6A8(); } -void un_802FED10_OnLeave(void* unused) {} +void ifPrize_Scene_OnExit(void* unused) {} diff --git a/src/melee/if/ifprize.h b/src/melee/if/ifprize.h index a62da67ec5..e3de3d1b58 100644 --- a/src/melee/if/ifprize.h +++ b/src/melee/if/ifprize.h @@ -10,7 +10,7 @@ /* 2FE6A8 */ void un_802FE6A8(void); /* 2FE8CC */ void un_802FE8CC(void); /* 2FE918 */ void un_802FE918(int a, int b, int c); -/* 2FEBE0 */ void un_802FEBE0_OnEnter(void* arg0); -/* 2FED10 */ void un_802FED10_OnLeave(void*); +/* 2FEBE0 */ void ifPrize_Scene_OnEnter(void* arg0); +/* 2FED10 */ void ifPrize_Scene_OnExit(void*); #endif diff --git a/src/melee/if/soundtest.c b/src/melee/if/soundtest.c index f0de3685e1..9595b47723 100644 --- a/src/melee/if/soundtest.c +++ b/src/melee/if/soundtest.c @@ -2181,7 +2181,7 @@ bool un_80301D40(enum soundtest_callback_arg0 update_scene) { if (update_scene == true) { sfxForward(); - gm_ChangeGameModeAfterCurrentScene(GM_FIXED_CAMERA_VS); + gm_ChangeGameModeAfterCurrentScene(GM_CAMERA_VS); gm_801A4B60(); } diff --git a/src/melee/it/items/ityaku.c b/src/melee/it/items/ityaku.c index 34c0315109..491b425427 100644 --- a/src/melee/it/items/ityaku.c +++ b/src/melee/it/items/ityaku.c @@ -169,8 +169,7 @@ void it_2E6A_UnkMotion19_Phys(HSD_GObj* item_gobj) HSD_JObjSetRotation(item_jobj, &sp14); } else if (item->xDD4_itemVar.yaku.x2 != 2) { OSReport("%s:%d: oioi...\n", __FILE__, 215); - while (true) - ; + while (true); } } diff --git a/src/melee/lb/forward.h b/src/melee/lb/forward.h index 9bf59b3555..1fb80312ce 100644 --- a/src/melee/lb/forward.h +++ b/src/melee/lb/forward.h @@ -23,7 +23,7 @@ typedef struct HurtCapsule HurtCapsule; typedef struct lbCardNew_SnapshotEntry lbCardNew_SnapshotEntry; typedef struct lbRefract_CallbackData lbRefract_CallbackData; typedef struct PreloadCache PreloadCache; -typedef struct PreloadCacheScene PreloadCacheScene; +typedef struct PreloadedGameModeState PreloadedGameModeState; typedef struct PreloadCacheSceneEntry PreloadCacheSceneEntry; typedef struct PreloadEntry PreloadEntry; typedef struct ReflectDesc ReflectDesc; diff --git a/src/melee/lb/lb_0195.c b/src/melee/lb/lb_0195.c index 8482f36b1c..c213204fec 100644 --- a/src/melee/lb/lb_0195.c +++ b/src/melee/lb/lb_0195.c @@ -32,8 +32,7 @@ void lb_8001955C(void) { if (HSD_PadGetResetSwitch()) { lbAudioAx_80027DBC(); - do { - } while (lb_8001B6F8() == 0xB); + while (lb_8001B6F8() == 11); VISetPostRetraceCallback(0); VISetPreRetraceCallback(0); VISetBlack(1); diff --git a/src/melee/lb/lbcardnew.c b/src/melee/lb/lbcardnew.c index 7721f023b6..55f4b79705 100644 --- a/src/melee/lb/lbcardnew.c +++ b/src/melee/lb/lbcardnew.c @@ -728,9 +728,9 @@ int lb_8001B6F8(void) int lb_8001B760(int result) { - if (result == 0xB) { + if (result == 11) { do { - } while ((result = lb_8001B6F8()) == 0xB); + } while ((result = lb_8001B6F8()) == 11); } return result; } diff --git a/src/melee/lb/lbdvd.c b/src/melee/lb/lbdvd.c index e5d8cc8166..4cce1f6c57 100644 --- a/src/melee/lb/lbdvd.c +++ b/src/melee/lb/lbdvd.c @@ -183,8 +183,8 @@ void lbDvd_80017960(void) int i; u8 _[4]; - if (preloadCache.new_scene.game_cache.mode_id != GM_COUNT) { - switch (preloadCache.new_scene.game_cache.mode_id) { + if (preloadCache.new_scene.game_cache.mode_kind != GM_COUNT) { + switch (preloadCache.new_scene.game_cache.mode_kind) { case GM_CAMERA_MODE: gm_801B23F0(); break; @@ -474,7 +474,7 @@ HSD_Archive* lbDvd_8001819C(const char* basename) return archive; } -PreloadCacheScene* lbDvd_GetPreloadCacheScene(void) +PreloadedGameModeState* lbDvd_GetPreloadCacheScene(void) { return &preloadCache.scene; } @@ -537,7 +537,7 @@ void lbDvd_80018254(void) bool enabled; if (memcmp(&preloadCache.new_scene, &preloadCache.scene, - sizeof(PreloadCacheScene)) == 0) + sizeof(PreloadedGameModeState)) == 0) { return; } diff --git a/src/melee/lb/lbdvd.h b/src/melee/lb/lbdvd.h index 9390e43545..4b4f18e5b8 100644 --- a/src/melee/lb/lbdvd.h +++ b/src/melee/lb/lbdvd.h @@ -23,7 +23,7 @@ typedef void (*lbDvd_Callback)(int, int index, int, int); /* 017E64 */ void lbDvd_80017E64(int, int, void*, bool); /* 017EBC */ void* lbDvd_GetPreloadedArchive(ssize_t entry_num); /* 01819C */ HSD_Archive* lbDvd_8001819C(const char* basename); -/* 01822C */ PreloadCacheScene* lbDvd_GetPreloadCacheScene(void); +/* 01822C */ PreloadedGameModeState* lbDvd_GetPreloadCacheScene(void); /* 01823C */ void lbDvd_8001823C(void); /* 018254 */ void lbDvd_80018254(void); /* 0187F4 */ int lbDvd_800187F4(int); diff --git a/src/melee/lb/lbdvd.static.h b/src/melee/lb/lbdvd.static.h index ff0688e561..a7ccde74a4 100644 --- a/src/melee/lb/lbdvd.static.h +++ b/src/melee/lb/lbdvd.static.h @@ -8,7 +8,7 @@ #include -/* 3BA638 */ static PreloadCacheScene preload_cache_scene = { +/* 3BA638 */ static PreloadedGameModeState preload_cache_scene = { { 0, }, diff --git a/src/melee/lb/types.h b/src/melee/lb/types.h index 8ba54603c1..aaaa6a8d47 100644 --- a/src/melee/lb/types.h +++ b/src/melee/lb/types.h @@ -267,13 +267,13 @@ struct PreloadEntry { s32 effect_index; }; -struct PreloadCacheScene { +struct PreloadedGameModeState { bool is_heap_persistent[2]; struct GameCache { - u8 mode_id; - u8 field2_0x9; - u8 field3_0xa; - u8 field4_0xb; + u8 mode_kind; ///< ::GameModeKind + u8 x1; + u8 x2; + u8 x3; StKind stkind; PreloadCacheSceneEntry entries[8]; } game_cache; @@ -282,11 +282,11 @@ struct PreloadCacheScene { struct PreloadCache { s32 persistent_heaps; - PreloadCacheScene scene; - PreloadCacheScene new_scene; + PreloadedGameModeState scene; + PreloadedGameModeState new_scene; PreloadEntry entries[80]; s32 persistent_heap; - int preloaded; + bool preloaded; UNK_T x974; }; diff --git a/src/melee/mn/mncharsel.c b/src/melee/mn/mncharsel.c index 39ab3c34e3..aabc59024d 100644 --- a/src/melee/mn/mncharsel.c +++ b/src/melee/mn/mncharsel.c @@ -5303,7 +5303,7 @@ s32 mnCharSel_802640A0(void) #undef MODELS #undef ANIM -void mnCharSel_8026688C_OnEnter(void* arg0) +void mnCharSel_Scene_OnEnter(void* arg0) { PAD_STACK(8); @@ -5352,7 +5352,7 @@ void mnCharSel_8026688C_OnEnter(void* arg0) mnCharSel_802640A0(); } -void mnCharSel_802669F4_OnFrame(void) +void mnCharSel_Scene_OnFrame(void) { int num_slots; u8 slot_type; @@ -5470,7 +5470,7 @@ void mnCharSel_802669F4_OnFrame(void) } } -void mnCharSel_80266D70_OnLeave(void* unused) +void mnCharSel_Scene_OnExit(void* unused) { int num_slots; u64 tmp; diff --git a/src/melee/mn/mncharsel.h b/src/melee/mn/mncharsel.h index 4c1defbd58..fb2784a6c6 100644 --- a/src/melee/mn/mncharsel.h +++ b/src/melee/mn/mncharsel.h @@ -25,8 +25,8 @@ /* 264070 */ void mnCharSel_80264070(void); /* 26407C */ void fn_8026407C(HSD_GObj*); /* 2640A0 */ s32 mnCharSel_802640A0(void); -/* 26688C */ void mnCharSel_8026688C_OnEnter(void*); -/* 2669F4 */ void mnCharSel_802669F4_OnFrame(void); -/* 266D70 */ void mnCharSel_80266D70_OnLeave(void*); +/* 26688C */ void mnCharSel_Scene_OnEnter(void*); +/* 2669F4 */ void mnCharSel_Scene_OnFrame(void); +/* 266D70 */ void mnCharSel_Scene_OnExit(void*); #endif diff --git a/src/melee/mn/mnmain.c b/src/melee/mn/mnmain.c index 2dd4183811..c966a1f4bf 100644 --- a/src/melee/mn/mnmain.c +++ b/src/melee/mn/mnmain.c @@ -1953,7 +1953,7 @@ void mn_8022C4F4(HSD_GObj* gp) case SEL_SPECIAL_VS_FIXED_CAMERA: sfxForward(); data = gm_GetCurrentSceneExitData(); - data->pending_mode = GM_FIXED_CAMERA_VS; + data->pending_mode = GM_CAMERA_VS; gm_801A4B60(); break; case SEL_SPECIAL_VS_SINGLE_BUTTON: @@ -2723,7 +2723,7 @@ void mn_8022DB10(HSD_GObj* gp) } } -void mn_8022DD38_OnFrame(void) +void mnMain_Scene_OnFrame(void) { MenuExitData* data; if (mn_8022F218() && mn_804A04F0.cur_menu != MENU_KIND_MAIN) { @@ -2758,7 +2758,7 @@ static inline void mn_8022DDA8_inline(const u16* sp2B4) mn_8022C068(lobj, temp_r29, mn_804A04F0.light_lerp_frames); } -void mn_8022DDA8_OnEnter(void* user_data) +void mnMain_Scene_OnEnter(void* user_data) { u16* hovered_selection; HSD_GObj* temp_r3_8; diff --git a/src/melee/mn/mnmain.h b/src/melee/mn/mnmain.h index 986bce8b57..3d7bc558c9 100644 --- a/src/melee/mn/mnmain.h +++ b/src/melee/mn/mnmain.h @@ -85,8 +85,8 @@ typedef struct _MenuInputState { /* 22D594 */ void mn_8022D594(HSD_GObj*); /* 22D7F4 */ void mn_8022D7F4(HSD_GObj*); /* 22DB10 */ void mn_8022DB10(HSD_GObj*); -/* 22DD38 */ void mn_8022DD38_OnFrame(void); -/* 22DDA8 */ void mn_8022DDA8_OnEnter(void*); +/* 22DD38 */ void mnMain_Scene_OnFrame(void); +/* 22DDA8 */ void mnMain_Scene_OnEnter(void*); /* 22E950 */ bool mn_IsFighterUnlocked(SelectableCharacterKind); /* 22E978 */ void mn_8022E978(u8 item_idx, u8 enable); ///< set/unset item mask bit diff --git a/src/melee/mn/mnstagesel.c b/src/melee/mn/mnstagesel.c index 3202e11e71..1d37646a79 100644 --- a/src/melee/mn/mnstagesel.c +++ b/src/melee/mn/mnstagesel.c @@ -369,7 +369,7 @@ void fn_8025A974(HSD_GObj* gobj, int unused) } /// OnLoad -/// #mnStageSel_8025A998_OnEnter +/// #mnStageSel_Scene_OnEnter static const Vec3 mnStageSel_803B8550 = { 0, -13, 0 }; @@ -438,7 +438,7 @@ static inline HSD_JObj* get_jobj(HSD_GObj* gobj) return jobj; } -void mnStageSel_8025A998_OnEnter(void* arg0) +void mnStageSel_Scene_OnEnter(void* arg0) { HSD_JObj* spDC[0x13]; u8 _[0xDC - 0xD8]; @@ -767,7 +767,7 @@ static inline HSD_PadStatus* get_pad(u8 i) } /// OnFrame -void mnStageSel_8025B850_OnFrame(void) +void mnStageSel_Scene_OnFrame(void) { if (mnStageSel_804D6C90->force_stage_id >= 0) { mnStageSel_804D6CAF = 2; @@ -839,7 +839,7 @@ void mnStageSel_8025B850_OnFrame(void) } } -void mnStageSel_8025BB5C_OnLeave(UNK_T unused) +void mnStageSel_Scene_OnExit(UNK_T unused) { SSSData* tmp; @@ -850,7 +850,7 @@ void mnStageSel_8025BB5C_OnLeave(UNK_T unused) tmp = mnStageSel_804D6C90; tmp->start_game = mnStageSel_804D6CAF == 2 ? true : false; if (tmp->start_game) { - PreloadCacheScene* cache = lbDvd_GetPreloadCacheScene(); + PreloadedGameModeState* cache = lbDvd_GetPreloadCacheScene(); cache->game_cache.stkind = tmp->data.data.rules.stkind; lbDvd_80018254(); } diff --git a/src/melee/mn/mnstagesel.h b/src/melee/mn/mnstagesel.h index 647051cfc0..2bf07052e1 100644 --- a/src/melee/mn/mnstagesel.h +++ b/src/melee/mn/mnstagesel.h @@ -14,9 +14,9 @@ /* 25A560 */ void fn_8025A560(HSD_GObj*); /* 25A91C */ void fn_8025A91C(HSD_GObj*); /* 25A974 */ void fn_8025A974(HSD_GObj*, int); -/* 25A998 */ void mnStageSel_8025A998_OnEnter(UNK_T); -/* 25B850 */ void mnStageSel_8025B850_OnFrame(void); -/* 25BB5C */ void mnStageSel_8025BB5C_OnLeave(UNK_T); +/* 25A998 */ void mnStageSel_Scene_OnEnter(UNK_T); +/* 25B850 */ void mnStageSel_Scene_OnFrame(void); +/* 25BB5C */ void mnStageSel_Scene_OnExit(UNK_T); /* 25BBD4 */ int mnStageSel_8025BBD4(void); /* 25BC08 */ int mnStageSel_8025BC08(int); diff --git a/src/melee/ty/toy.c b/src/melee/ty/toy.c index 45a173d87d..8f3390e975 100644 --- a/src/melee/ty/toy.c +++ b/src/melee/ty/toy.c @@ -5895,7 +5895,7 @@ void Toy_80311960(void) ((u16*) base)[0x1F6] = 0; } -void Toy_OnEnter_80311AB0(void* arg0) +void Toy_Scene_OnEnter(void* arg0) { u8* base; s16* selp; @@ -6029,7 +6029,7 @@ void _Toy_80311F5C(void) } } -void Toy_OnFrame_80312018(void) +void Toy_Scene_OnFrame(void) { TyModeState* state = (TyModeState*) Toy_804A284C; @@ -6109,7 +6109,7 @@ void _Toy_80312050(HSD_GObj* gobj, int code) } } -void Toy_OnInit_803122D0(void) +void Toy_Mode_OnInit(void) { Toy* userData = (Toy*) &_Toy_804A26B8; void* targetPtr; diff --git a/src/melee/ty/toy.h b/src/melee/ty/toy.h index 527cee924a..c77d62b321 100644 --- a/src/melee/ty/toy.h +++ b/src/melee/ty/toy.h @@ -58,9 +58,9 @@ /* 310660 */ void Toy_80310660(s32 arg0); /* 311680 */ void Toy_80311680(void); /* 311960 */ void Toy_80311960(void); -/* 311AB0 */ void Toy_OnEnter_80311AB0(void*); -/* 312018 */ void Toy_OnFrame_80312018(void); -/* 3122D0 */ void Toy_OnInit_803122D0(void); +/* 311AB0 */ void Toy_Scene_OnEnter(void*); +/* 312018 */ void Toy_Scene_OnFrame(void); +/* 3122D0 */ void Toy_Mode_OnInit(void); /* 31234C */ void Toy_8031234C(s32); /* 3124BC */ void Toy_803124BC(void); /* 31263C */ void Toy_8031263C(void); diff --git a/src/melee/ty/tydisplay.c b/src/melee/ty/tydisplay.c index 5add76921c..c602492abf 100644 --- a/src/melee/ty/tydisplay.c +++ b/src/melee/ty/tydisplay.c @@ -1600,7 +1600,7 @@ static inline void tyDisplay_SetGridSize(TyDspConfig* cfg, TyDspGrid* grid) } } -void tyDisplay_OnEnter_8031B460(void* arg0) +void tyDisplay_Scene_OnEnter(void* arg0) { s32 sp18; TyDspConfig* cfg; @@ -1792,7 +1792,7 @@ void _tyDisplay_8031B850(void) } } -void tyDisplay_OnFrame_8031B9A4(void) +void tyDisplay_Scene_OnFrame(void) { TyModeState* state = (TyModeState*) Toy_804A284C; diff --git a/src/melee/ty/tydisplay.h b/src/melee/ty/tydisplay.h index 461ba56222..36529ff8a6 100644 --- a/src/melee/ty/tydisplay.h +++ b/src/melee/ty/tydisplay.h @@ -6,8 +6,8 @@ #include "baselib/forward.h" #include "ty/forward.h" -/* 31B460 */ void tyDisplay_OnEnter_8031B460(void*); -/* 31B9A4 */ void tyDisplay_OnFrame_8031B9A4(void); +/* 31B460 */ void tyDisplay_Scene_OnEnter(void*); +/* 31B9A4 */ void tyDisplay_Scene_OnFrame(void); /* 31B9DC */ TyDspEntry* tyDisplay_8031B9DC(s32 id); /* 31BB34 */ s32 tyDisplay_8031BB34(s8); /* 31BB94 */ char* tyDisplay_8031BB94(s8); diff --git a/src/melee/ty/tyfigupon.c b/src/melee/ty/tyfigupon.c index f135605033..9b8117598a 100644 --- a/src/melee/ty/tyfigupon.c +++ b/src/melee/ty/tyfigupon.c @@ -1526,7 +1526,7 @@ static inline TyFiguponED4* tyFigupon_InitScene(struct un_804D6EF4_t** ef4_2) return ed4; } -void tyFigupon_OnEnter_80317D80(void* arg0) +void tyFigupon_Scene_OnEnter(void* arg0) { TyFiguponData* data; struct un_804D6EF4_t* ef4; @@ -1661,7 +1661,7 @@ s32 _tyFigupon_803181BC(void) return lbAudioAx_800236DC(); } -void tyFigupon_OnFrame_803182D4(void) +void tyFigupon_Scene_OnFrame(void) { TyModeState* state = (TyModeState*) Toy_804A284C; diff --git a/src/melee/ty/tyfigupon.h b/src/melee/ty/tyfigupon.h index 159b6037b2..ca75f953ac 100644 --- a/src/melee/ty/tyfigupon.h +++ b/src/melee/ty/tyfigupon.h @@ -4,7 +4,7 @@ #include /* 31638C */ s32 _tyFigupon_8031638C(s16 arg0); -/* 317D80 */ void tyFigupon_OnEnter_80317D80(UNK_T); -/* 3182D4 */ void tyFigupon_OnFrame_803182D4(void); +/* 317D80 */ void tyFigupon_Scene_OnEnter(UNK_T); +/* 3182D4 */ void tyFigupon_Scene_OnFrame(void); #endif diff --git a/src/melee/vi/vi0102.c b/src/melee/vi/vi0102.c index a128a8c24e..f4363540b2 100644 --- a/src/melee/vi/vi0102.c +++ b/src/melee/vi/vi0102.c @@ -120,7 +120,7 @@ static void vi0102_RunFrame(HSD_GObj* gobj) } } -void vi0102_Initialize_OnEnter(void* arg) +void vi0102_Scene_OnEnter(void* arg) { int i; HSD_CObj* cobj; @@ -185,7 +185,7 @@ void vi0102_Initialize_OnEnter(void* arg) lbAudioAx_80024E50(0); } -void vi0102_8031D000_OnFrame(void) +void vi0102_Scene_OnFrame(void) { vi_8031CAAC(); } diff --git a/src/melee/vi/vi0102.h b/src/melee/vi/vi0102.h index 7a7540f23d..56e360e3ff 100644 --- a/src/melee/vi/vi0102.h +++ b/src/melee/vi/vi0102.h @@ -7,8 +7,8 @@ /* 31CC68 */ void vi0102_JObjCallback(HSD_GObj*); /* 31CC8C */ void vi0102_CameraCallback(HSD_GObj* gobj, int unused); /* 31CD20 */ void vi0102_8031CD20(HSD_GObj*); -/* 31CD94 */ void vi0102_Initialize_OnEnter(void*); -/* 31D000 */ void vi0102_8031D000_OnFrame(void); +/* 31CD94 */ void vi0102_Scene_OnEnter(void*); +/* 31D000 */ void vi0102_Scene_OnFrame(void); /* 4D6F3C */ extern u8 un_804D6F3C[8]; #endif diff --git a/src/melee/vi/vi0401.c b/src/melee/vi/vi0401.c index f138bbd990..43ec1ab887 100644 --- a/src/melee/vi/vi0401.c +++ b/src/melee/vi/vi0401.c @@ -114,7 +114,7 @@ static void vi0401_8031D23C(HSD_GObj* gobj) } } -void un_8031D288_OnEnter(void* data) +void vi0401_Scene_OnEnter(void* data) { HSD_CObj* cobj; HSD_GObj* cam_gobj; @@ -212,7 +212,7 @@ void un_8031D288_OnEnter(void* data) lbAudioAx_800237A8(0x61a8a, 0x7F, 0x40); } -void un_8031D698_OnFrame(void) +void vi0401_Scene_OnFrame(void) { u64 result = gm_GetButtonsTriggered(gm_8017E430()); if ((result & PAD_BUTTON_START) != 0) { diff --git a/src/melee/vi/vi0401.h b/src/melee/vi/vi0401.h index 8f8d8759e9..f731412264 100644 --- a/src/melee/vi/vi0401.h +++ b/src/melee/vi/vi0401.h @@ -5,8 +5,8 @@ /* 31D020 */ void vi0401_8031D020(int, int); /* 31D030 */ void un_8031D030(CharacterKind, int); -/* 31D288 */ void un_8031D288_OnEnter(void*); -/* 31D698 */ void un_8031D698_OnFrame(void); +/* 31D288 */ void vi0401_Scene_OnEnter(void*); +/* 31D698 */ void vi0401_Scene_OnFrame(void); /* 4D6F60 */ extern u8 un_804D6F60[8]; #endif diff --git a/src/melee/vi/vi0402.c b/src/melee/vi/vi0402.c index 8f1f43f3ef..b819df56b2 100644 --- a/src/melee/vi/vi0402.c +++ b/src/melee/vi/vi0402.c @@ -63,7 +63,7 @@ void vi_8031D80C(HSD_GObj* gobj) } } -void un_8031D858_OnEnter(void* arg0) +void vi0402_Scene_OnEnter(void* arg0) { HSD_GObj* light_gobj; HSD_LObj* lobj; @@ -98,7 +98,7 @@ void un_8031D858_OnEnter(void* arg0) Player_InitAllPlayers(); lbAudioAx_80024E50(0); } -void vi_8031D9C4_OnFrame(void) +void vi0402_Scene_OnFrame(void) { vi_8031CAAC(); } diff --git a/src/melee/vi/vi0402.h b/src/melee/vi/vi0402.h index 986326af95..02de9d6aa9 100644 --- a/src/melee/vi/vi0402.h +++ b/src/melee/vi/vi0402.h @@ -6,7 +6,7 @@ /* 31D6E4 */ void un_8031D6E4(HSD_GObj*); /* 31D708 */ void un_8031D708(void); /* 31D80C */ void vi_8031D80C(HSD_GObj* gobj); -/* 31D858 */ void un_8031D858_OnEnter(void*); -/* 31D9C4 */ void vi_8031D9C4_OnFrame(void); +/* 31D858 */ void vi0402_Scene_OnEnter(void*); +/* 31D9C4 */ void vi0402_Scene_OnFrame(void); #endif diff --git a/src/melee/vi/vi0501.c b/src/melee/vi/vi0501.c index bd1ac9c544..6b7457e7e5 100644 --- a/src/melee/vi/vi0501.c +++ b/src/melee/vi/vi0501.c @@ -176,7 +176,7 @@ void fn_8031DD14(HSD_GObj* gobj) } } -void un_8031DE58_OnEnter(void* arg) +void vi0501_Scene_OnEnter(void* arg) { u8 char_index; HSD_Fog* fog; @@ -237,7 +237,7 @@ void un_8031DE58_OnEnter(void* arg) lbAudioAx_800237A8(0x20C, 0x7F, 0x40); } -void vi_8031E0F0_OnFrame(void) +void vi0501_Scene_OnFrame(void) { vi_8031CAAC(); } diff --git a/src/melee/vi/vi0501.h b/src/melee/vi/vi0501.h index 8bc543236c..14b44b5ce4 100644 --- a/src/melee/vi/vi0501.h +++ b/src/melee/vi/vi0501.h @@ -9,8 +9,8 @@ int spawn_mode, int spawn_count); /* 31DC80 */ void vi_8031DC80(HSD_GObj*, int); /* 31DD14 */ void fn_8031DD14(HSD_GObj* gobj); -/* 31DE58 */ void un_8031DE58_OnEnter(void* arg); -/* 31E0F0 */ void vi_8031E0F0_OnFrame(void); +/* 31DE58 */ void vi0501_Scene_OnEnter(void* arg); +/* 31E0F0 */ void vi0501_Scene_OnFrame(void); /* 4D6F84 */ extern u8 un_804D6F84[8]; #endif diff --git a/src/melee/vi/vi0502.c b/src/melee/vi/vi0502.c index 5f226a63fe..ee17c4f786 100644 --- a/src/melee/vi/vi0502.c +++ b/src/melee/vi/vi0502.c @@ -124,14 +124,14 @@ void vi0502_8031E304(HSD_GObj* gobj) HSD_JObjAnimAll(GET_JOBJ(gobj)); } -static void vi0502_8031E328(HSD_GObj* gobj, int unused) +static void vi0502_GObj_OnRender(HSD_GObj* gobj, UNUSED int code) { PAD_STACK(8); lbShadow_8000F38C(0); vi_RunCamera(gobj, (u8*) &erase_colors_vi0502, 0x281); } -void vi0502_RunFrame(HSD_GObj* gobj) +void vi0502_GObj_OnProc(HSD_GObj* gobj) { HSD_CObj* cobj; @@ -148,7 +148,7 @@ void vi0502_RunFrame(HSD_GObj* gobj) } } -void un_8031E444_OnEnter(void* arg) +void vi0502_Scene_OnEnter(void* arg) { u8 char_index; Vi0502Data* data; @@ -196,11 +196,11 @@ void un_8031E444_OnEnter(void* arg) lb_80013B14((HSD_CameraDescPerspective*) un_804D6F90->cameras->desc); HSD_GObjObject_80390A70(camera_gobj, HSD_GObj_CameraKind, cobj); GObj_SetupGXLinkMax(camera_gobj, - (void (*)(HSD_GObj*, int)) vi0502_8031E328, 5); + (void (*)(HSD_GObj*, int)) vi0502_GObj_OnRender, 5); HSD_CObjAddAnim(cobj, un_804D6F90->cameras->anims[0]); HSD_CObjReqAnim(cobj, 0.0F); HSD_CObjAnim(cobj); - HSD_GObj_SetupProc(camera_gobj, vi0502_RunFrame, 0); + HSD_GObj_SetupProc(camera_gobj, vi0502_GObj_OnProc, 0); for (i = 0; un_804D6F90->models[i] != NULL; i++) { model_gobj = GObj_Create(0xE, 0xF, 0); @@ -221,6 +221,11 @@ void un_8031E444_OnEnter(void* arg) vi0502_8031E124(char_index, costume1, costume2); } +void vi0502_Scene_OnFrame(void) +{ + vi_8031CAAC(); +} + Vi0502Data un_804000D0 = { { 0, -3.0f, 0 }, "Vi0502.dat", diff --git a/src/melee/vi/vi0502.h b/src/melee/vi/vi0502.h index 914c549827..a1096413e7 100644 --- a/src/melee/vi/vi0502.h +++ b/src/melee/vi/vi0502.h @@ -8,8 +8,9 @@ /* 31E110 */ void un_8031E110(int arg0, int arg1, int arg2); /* 31E124 */ void vi0502_8031E124(CharacterKind, int, int); /* 31E304 */ void vi0502_8031E304(HSD_GObj*); -/* 31E3BC */ void vi0502_RunFrame(HSD_GObj*); -/* 31E444 */ void un_8031E444_OnEnter(void* arg); +/* 31E3BC */ void vi0502_GObj_OnProc(HSD_GObj*); +/* 31E444 */ void vi0502_Scene_OnEnter(void* arg); +/* 31E6CC */ void vi0502_Scene_OnFrame(void); /* 4D6FA8 */ extern ViCharaDesc* un_804D6FA8[2]; #endif diff --git a/src/melee/vi/vi0601.c b/src/melee/vi/vi0601.c index 9f189f4761..5ebfa498bf 100644 --- a/src/melee/vi/vi0601.c +++ b/src/melee/vi/vi0601.c @@ -31,17 +31,12 @@ static SceneDesc* un_804D6FB0; static GXColor erase_colors_vi0601; -void vi_8031E6CC_OnFrame(void) -{ - vi_8031CAAC(); -} - void vi_8031E6EC(HSD_GObj* gobj) { HSD_JObjAnimAll(GET_JOBJ(gobj)); } -static void vi0601_CameraCallback(HSD_GObj* gobj, int unused) +static void vi0601_GObj_OnRender(HSD_GObj* gobj, UNUSED int code) { HSD_CObj* cobj; cobj = GET_COBJ(gobj); @@ -90,7 +85,7 @@ void un_8031E9B8(void) HSD_GObj* gobj; HSD_JObj* jobj; s32 i; - char pad[8]; + PAD_STACK(2 * 4); gobj = GObj_Create(0xE, 0xF, 0); jobj = HSD_JObjLoadJoint((*un_804D6FB0->models)->joint); @@ -141,7 +136,7 @@ void vi0601_RunFrame(HSD_GObj* gobj) } } -void un_8031EBBC_OnEnter(void* unused) +void vi0601_Scene_OnEnter(UNUSED void* enter_data) { HSD_CObj* cobj; HSD_GObj* gobj; @@ -160,7 +155,7 @@ void un_8031EBBC_OnEnter(void* unused) cobj = lb_80013B14((HSD_CameraDescPerspective*) un_804D6FB0->cameras->desc); HSD_GObjObject_80390A70(gobj, HSD_GObj_CameraKind, cobj); - GObj_SetupGXLinkMax(gobj, vi0601_CameraCallback, 2); + GObj_SetupGXLinkMax(gobj, vi0601_GObj_OnRender, 2); HSD_CObjAddAnim(cobj, un_804D6FB0->cameras->anims[0]); HSD_CObjReqAnim(cobj, 0.0f); HSD_CObjAnim(cobj); @@ -188,7 +183,7 @@ void un_8031EBBC_OnEnter(void* unused) lbAudioAx_80024E50(0); } -void vi_8031ED50_OnFrame(void) +void vi0601_Scene_OnFrame(void) { vi_8031CAAC(); } diff --git a/src/melee/vi/vi0601.h b/src/melee/vi/vi0601.h index caba0bce73..1dedea82bf 100644 --- a/src/melee/vi/vi0601.h +++ b/src/melee/vi/vi0601.h @@ -3,12 +3,11 @@ #include -/* 31E6CC */ void vi_8031E6CC_OnFrame(void); /* 31E6EC */ void vi_8031E6EC(HSD_GObj*); /* 31E800 */ void fn_8031E800(HSD_GObj* gobj); /* 31E9B8 */ void un_8031E9B8(void); /* 31EB38 */ void vi0601_RunFrame(HSD_GObj* gobj); -/* 31EBBC */ void un_8031EBBC_OnEnter(void* unused); -/* 31ED50 */ void vi_8031ED50_OnFrame(void); +/* 31EBBC */ void vi0601_Scene_OnEnter(void* unused); +/* 31ED50 */ void vi0601_Scene_OnFrame(void); #endif diff --git a/src/melee/vi/vi0801.c b/src/melee/vi/vi0801.c index d3eac05683..b04d1203c8 100644 --- a/src/melee/vi/vi0801.c +++ b/src/melee/vi/vi0801.c @@ -117,7 +117,7 @@ void vi0801_8031EFE4(HSD_GObj* gobj) } } -void vi0801_OnEnter(void* unused) +void vi0801_Scene_OnEnter(void* unused) { HSD_CObj* cobj; HSD_GObj* gobj; @@ -172,7 +172,7 @@ void vi0801_OnEnter(void* unused) lbAudioAx_80024E50(0); } -void vi0801_OnFrame(void) +void vi0801_Scene_OnFrame(void) { vi_8031CAAC(); } diff --git a/src/melee/vi/vi0801.h b/src/melee/vi/vi0801.h index f1172e4c9c..a0a05f89ac 100644 --- a/src/melee/vi/vi0801.h +++ b/src/melee/vi/vi0801.h @@ -6,7 +6,7 @@ /* 31EE60 */ void vi0801_8031EE60(HSD_GObj*); /* 31EE84 */ void vi0801_8031EE84(void); /* 31EFE4 */ void vi0801_8031EFE4(HSD_GObj*); -/* 31F07C */ void vi0801_OnEnter(void* unused); -/* 31F274 */ void vi0801_OnFrame(void); +/* 31F07C */ void vi0801_Scene_OnEnter(void* unused); +/* 31F274 */ void vi0801_Scene_OnFrame(void); #endif diff --git a/src/melee/vi/vi1101.c b/src/melee/vi/vi1101.c index 23b93a122b..e6e317e61c 100644 --- a/src/melee/vi/vi1101.c +++ b/src/melee/vi/vi1101.c @@ -169,7 +169,7 @@ void fn_8031F600(HSD_GObj* gobj) } } -void un_8031F714_OnEnter(void* arg) +void vi1101_Scene_OnEnter(void* arg) { HSD_Joint* new_var2; SceneDesc* var_r28; @@ -234,7 +234,7 @@ void un_8031F714_OnEnter(void* arg) lbAudioAx_80024E50(0); } -void un_8031F960_OnFrame(void) +void vi1101_Scene_OnFrame(void) { vi_8031CAAC(); } diff --git a/src/melee/vi/vi1101.h b/src/melee/vi/vi1101.h index de3ca6894a..76f1f80d03 100644 --- a/src/melee/vi/vi1101.h +++ b/src/melee/vi/vi1101.h @@ -6,7 +6,7 @@ /* 31F294 */ void un_8031F294(s32 char_index, s32 costume_index); /* 31F548 */ void fn_8031F548(HSD_GObj* gobj); /* 31F600 */ void fn_8031F600(HSD_GObj* gobj); -/* 31F714 */ void un_8031F714_OnEnter(void*); -/* 31F960 */ void un_8031F960_OnFrame(void); +/* 31F714 */ void vi1101_Scene_OnEnter(void*); +/* 31F960 */ void vi1101_Scene_OnFrame(void); extern u8 un_804D6FD8[8]; #endif diff --git a/src/melee/vi/vi1201v1.c b/src/melee/vi/vi1201v1.c index 6c50eff619..ce4c3ed323 100644 --- a/src/melee/vi/vi1201v1.c +++ b/src/melee/vi/vi1201v1.c @@ -276,7 +276,7 @@ static void order_data(void) } #endif -void un_8031FD18_OnEnter(void* arg) +void vi1201v1_Scene_OnEnter(void* arg) { u8* input = arg; HSD_Fog* fog; @@ -326,7 +326,7 @@ void un_8031FD18_OnEnter(void* arg) lbAudioAx_80024E50(0); } -void un_80320490_OnFrame(void) +void vi1201v1_Scene_OnFrame(void) { vi_8031CAAC(); } diff --git a/src/melee/vi/vi1201v1.h b/src/melee/vi/vi1201v1.h index a02029c632..1ad03fe7f3 100644 --- a/src/melee/vi/vi1201v1.h +++ b/src/melee/vi/vi1201v1.h @@ -12,8 +12,8 @@ /* 31FB90 */ void fn_8031FB90(HSD_GObj*); /* 31FC30 */ void fn_8031FC30(HSD_GObj*); /* 31FCBC */ void fn_8031FCBC(HSD_GObj*); -/* 31FD18 */ void un_8031FD18_OnEnter(void* arg); -/* 320490 */ void un_80320490_OnFrame(void); +/* 31FD18 */ void vi1201v1_Scene_OnEnter(void* arg); +/* 320490 */ void vi1201v1_Scene_OnFrame(void); /* 4D7004 */ extern u8 un_804D7004[8]; #endif diff --git a/src/melee/vi/vi1201v2.c b/src/melee/vi/vi1201v2.c index baae82a93b..f28f351bec 100644 --- a/src/melee/vi/vi1201v2.c +++ b/src/melee/vi/vi1201v2.c @@ -308,7 +308,7 @@ static void order_data(void) } #endif -void un_80320A40_OnEnter(void* arg) +void vi1201v2_Scene_OnEnter(void* arg) { u8* input = arg; HSD_Fog* fog; @@ -351,7 +351,7 @@ void un_80320A40_OnEnter(void* arg) lbAudioAx_80024E50(0); } -void un_803210EC_OnFrame(void) +void vi1201v2_Scene_OnFrame(void) { vi_8031CAAC(); } diff --git a/src/melee/vi/vi1201v2.h b/src/melee/vi/vi1201v2.h index 602d081606..2497388e48 100644 --- a/src/melee/vi/vi1201v2.h +++ b/src/melee/vi/vi1201v2.h @@ -14,8 +14,8 @@ /* 3208F0 */ void un_803208F0(HSD_GObj*); /* 320984 */ void un_80320984(HSD_GObj*); /* 320A1C */ void fn_80320A1C(HSD_GObj*); -/* 320A40 */ void un_80320A40_OnEnter(void*); -/* 3210EC */ void un_803210EC_OnFrame(void); +/* 320A40 */ void vi1201v2_Scene_OnEnter(void*); +/* 3210EC */ void vi1201v2_Scene_OnFrame(void); /* 4D7038 */ extern u8 un_804D7038[8]; ///< @todo #ViCharaDesc? #endif diff --git a/src/melee/vi/vi1202.c b/src/melee/vi/vi1202.c index 8ceff62d77..b19eadaa4f 100644 --- a/src/melee/vi/vi1202.c +++ b/src/melee/vi/vi1202.c @@ -98,7 +98,7 @@ void vi1202_RunFrame(HSD_GObj* gobj) } } -void vi1202_OnEnter(void* arg) +void vi1202_Scene_OnEnter(void* arg) { HSD_LObj* lobj; HSD_CObj* cobj; @@ -169,7 +169,7 @@ void vi1202_OnEnter(void* arg) lbAudioAx_80024E50(0); } -void vi1202_OnFrame(void) +void vi1202_Scene_OnFrame(void) { vi_8031CAAC(); } diff --git a/src/melee/vi/vi1202.h b/src/melee/vi/vi1202.h index 6a9903f556..a98b2a0310 100644 --- a/src/melee/vi/vi1202.h +++ b/src/melee/vi/vi1202.h @@ -10,6 +10,6 @@ /* 321154 */ void un_80321154(HSD_GObj*); /* 321178 */ void un_80321178(void); /* 321294 */ void vi1202_RunFrame(HSD_GObj*); -/* 321300 */ void vi1202_OnEnter(UNK_T); -/* 3218E0 */ void vi1202_OnFrame(void); +/* 321300 */ void vi1202_Scene_OnEnter(UNK_T); +/* 3218E0 */ void vi1202_Scene_OnFrame(void); #endif