From efa00d6c2387ad3c53c40c950c0b0b99f320ef9f Mon Sep 17 00:00:00 2001 From: Rachel Date: Wed, 30 Oct 2024 11:56:38 -0700 Subject: [PATCH] Label overlay templates for title screen and opening cutscene --- include/overlay077/const_ov77_021D742C.h | 2 +- src/field_system.c | 2 +- src/main.c | 4 ++-- src/overlay077/ov77_021D0D80.c | 6 +++--- src/overlay077/ov77_021D25B0.c | 6 +++--- src/overlay097/ov97_0222AE60.c | 2 +- src/overlay097/ov97_0222C174.c | 2 +- src/overlay097/ov97_0222D30C.c | 2 +- src/overlay097/ov97_02233B18.c | 2 +- src/overlay098/ov98_02246C20.c | 2 +- src/unk_02099DFC.c | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/overlay077/const_ov77_021D742C.h b/include/overlay077/const_ov77_021D742C.h index 48e5e7075..e5e9ffe0f 100644 --- a/include/overlay077/const_ov77_021D742C.h +++ b/include/overlay077/const_ov77_021D742C.h @@ -3,6 +3,6 @@ #include "overlay_manager.h" -extern const OverlayManagerTemplate Unk_ov77_021D742C; +extern const OverlayManagerTemplate gTitleScreenOverlayTemplate; #endif // POKEPLATINUM_CONST_OV77_021D742C_H diff --git a/src/field_system.c b/src/field_system.c index a26dfceb1..ca7b9cf83 100644 --- a/src/field_system.c +++ b/src/field_system.c @@ -87,7 +87,7 @@ static BOOL ExecuteFieldProcesses(OverlayManager *ovyManager, int *state) static BOOL ReturnToTitleScreen(OverlayManager *ovyManager, int *state) { TeardownFieldSystem(ovyManager); - EnqueueApplication(FS_OVERLAY_ID(overlay77), &Unk_ov77_021D742C); + EnqueueApplication(FS_OVERLAY_ID(overlay77), &gTitleScreenOverlayTemplate); return TRUE; } diff --git a/src/main.c b/src/main.c index dc3217da9..5f76e38dd 100644 --- a/src/main.c +++ b/src/main.c @@ -68,7 +68,7 @@ static Application sApplication; // repeatedly try to restore the backlight to its saved state. static PMBackLightSwitch sSavedBacklightState; BOOL gIgnoreCartridgeForWake; -extern const OverlayManagerTemplate Unk_ov77_021D788C; +extern const OverlayManagerTemplate gOpeningCutsceneOverlayTemplate; void NitroMain(void) { @@ -103,7 +103,7 @@ void NitroMain(void) switch (OS_GetResetParameter()) { case RESET_CLEAN: sApplication.args.error = FALSE; - EnqueueApplication(FS_OVERLAY_ID(overlay77), &Unk_ov77_021D788C); + EnqueueApplication(FS_OVERLAY_ID(overlay77), &gOpeningCutsceneOverlayTemplate); break; case RESET_ERROR: diff --git a/src/overlay077/ov77_021D0D80.c b/src/overlay077/ov77_021D0D80.c index e96a7efa8..6910fe48e 100644 --- a/src/overlay077/ov77_021D0D80.c +++ b/src/overlay077/ov77_021D0D80.c @@ -115,7 +115,7 @@ typedef struct { extern const OverlayManagerTemplate Unk_020F8A48; extern const OverlayManagerTemplate Unk_020F8AB4; -extern const OverlayManagerTemplate Unk_ov77_021D788C; +extern const OverlayManagerTemplate gOpeningCutsceneOverlayTemplate; static void ov77_021D1D48(BgConfig *param0, int param1); void EnqueueApplication(FSOverlayID param0, const OverlayManagerTemplate *param1); @@ -146,7 +146,7 @@ static void ov77_021D2428(BgConfig *param0, int param1, UnkStruct_ov77_021D1568 static void ov77_021D24C8(UnkStruct_ov77_021D1568 *param0); static void ov77_021D2438(UnkStruct_ov77_021D1568 *param0); -const OverlayManagerTemplate Unk_ov77_021D742C = { +const OverlayManagerTemplate gTitleScreenOverlayTemplate = { ov77_021D0D80, ov77_021D0E3C, ov77_021D10FC, @@ -338,7 +338,7 @@ static int ov77_021D10FC(OverlayManager *param0, int *param1) break; case 3: sub_02004234(0); - EnqueueApplication(FS_OVERLAY_ID(overlay77), &Unk_ov77_021D788C); + EnqueueApplication(FS_OVERLAY_ID(overlay77), &gOpeningCutsceneOverlayTemplate); break; } diff --git a/src/overlay077/ov77_021D25B0.c b/src/overlay077/ov77_021D25B0.c index 572bc253f..0367060a4 100644 --- a/src/overlay077/ov77_021D25B0.c +++ b/src/overlay077/ov77_021D25B0.c @@ -178,9 +178,9 @@ static void ov77_021D5308(UnkStruct_ov77_021D5308 *param0); static BOOL ov77_021D5390(UnkStruct_ov77_021D5308 *param0, const int param1); static void ov77_021D5478(UnkStruct_ov77_021D2E9C *param0); -extern const OverlayManagerTemplate Unk_ov77_021D742C; +extern const OverlayManagerTemplate gTitleScreenOverlayTemplate; -const OverlayManagerTemplate Unk_ov77_021D788C = { +const OverlayManagerTemplate gOpeningCutsceneOverlayTemplate = { ov77_021D2D08, ov77_021D2D94, ov77_021D2E60, @@ -1017,7 +1017,7 @@ static int ov77_021D2E60(OverlayManager *param0, int *param1) LCRNG_SetSeed(v0->unk_14); OverlayManager_FreeData(param0); Heap_Destroy(76); - EnqueueApplication(FS_OVERLAY_ID(overlay77), &Unk_ov77_021D742C); + EnqueueApplication(FS_OVERLAY_ID(overlay77), &gTitleScreenOverlayTemplate); return 1; } diff --git a/src/overlay097/ov97_0222AE60.c b/src/overlay097/ov97_0222AE60.c index b8dc5f06b..6ef1dd4f6 100644 --- a/src/overlay097/ov97_0222AE60.c +++ b/src/overlay097/ov97_0222AE60.c @@ -1190,7 +1190,7 @@ static void ov97_0222C094(UnkStruct_0222AE60 *param0) EnqueueApplication(FS_OVERLAY_ID(overlay98), &Unk_ov98_02249BAC); break; case 0: - EnqueueApplication(FS_OVERLAY_ID(overlay77), &Unk_ov77_021D742C); + EnqueueApplication(FS_OVERLAY_ID(overlay77), &gTitleScreenOverlayTemplate); break; } } diff --git a/src/overlay097/ov97_0222C174.c b/src/overlay097/ov97_0222C174.c index 0eee476ca..2e7f12dd0 100644 --- a/src/overlay097/ov97_0222C174.c +++ b/src/overlay097/ov97_0222C174.c @@ -783,7 +783,7 @@ static int ov97_0222C78C(OverlayManager *param0, int *param1) static int ov97_0222C948(OverlayManager *param0, int *param1) { Heap_Destroy(91); - EnqueueApplication(FS_OVERLAY_ID(overlay77), &Unk_ov77_021D742C); + EnqueueApplication(FS_OVERLAY_ID(overlay77), &gTitleScreenOverlayTemplate); OverlayManager_FreeData(param0); Heap_Destroy(85); diff --git a/src/overlay097/ov97_0222D30C.c b/src/overlay097/ov97_0222D30C.c index cd91aab06..61ead7623 100644 --- a/src/overlay097/ov97_0222D30C.c +++ b/src/overlay097/ov97_0222D30C.c @@ -2435,7 +2435,7 @@ static int ov97_022301BC(OverlayManager *param0, int *param1) UnkStruct_ov97_0222D04C *v0 = OverlayManager_Data(param0); if (v0->unk_440 == 0) { - EnqueueApplication(FS_OVERLAY_ID(overlay77), &Unk_ov77_021D742C); + EnqueueApplication(FS_OVERLAY_ID(overlay77), &gTitleScreenOverlayTemplate); } else if (v0->unk_440 == 1) { EnqueueApplication(FS_OVERLAY_ID(overlay97), &Unk_ov97_0223D7AC); } diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c index 7e99e8162..1e6114eab 100644 --- a/src/overlay097/ov97_02233B18.c +++ b/src/overlay097/ov97_02233B18.c @@ -2138,7 +2138,7 @@ static int ov97_02235CC8(OverlayManager *param0, int *param1) Strbuf_Free(v0->unk_12668); Strbuf_Free(v0->unk_1266C); Heap_FreeToHeap(v0->unk_20); - EnqueueApplication(FS_OVERLAY_ID(overlay77), &Unk_ov77_021D742C); + EnqueueApplication(FS_OVERLAY_ID(overlay77), &gTitleScreenOverlayTemplate); OverlayManager_FreeData(param0); Heap_Destroy(78); diff --git a/src/overlay098/ov98_02246C20.c b/src/overlay098/ov98_02246C20.c index 8e40c5fa1..0f891c1d4 100644 --- a/src/overlay098/ov98_02246C20.c +++ b/src/overlay098/ov98_02246C20.c @@ -180,7 +180,7 @@ int ov98_02246DC0(OverlayManager *param0, int *param1) OverlayManager_FreeData(param0); Heap_Destroy(108); Heap_Destroy(91); - EnqueueApplication(FS_OVERLAY_ID(overlay77), &Unk_ov77_021D742C); + EnqueueApplication(FS_OVERLAY_ID(overlay77), &gTitleScreenOverlayTemplate); return 1; } diff --git a/src/unk_02099DFC.c b/src/unk_02099DFC.c index 23465dd2d..4d62cbf79 100644 --- a/src/unk_02099DFC.c +++ b/src/unk_02099DFC.c @@ -49,7 +49,7 @@ static void sub_0209A0E0(UnkStruct_02099DFC *param0); static BOOL sub_0209A0F4(UnkStruct_02099DFC *param0); static BOOL sub_0209A200(UnkStruct_02099DFC *param0, u32 param1, int param2, int param3); -extern const OverlayManagerTemplate Unk_ov77_021D742C; +extern const OverlayManagerTemplate gTitleScreenOverlayTemplate; const OverlayManagerTemplate Unk_020F8A48 = { sub_02099DFC,