diff options
| author | cadmic <cadmic24@gmail.com> | 2024-03-29 08:19:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-29 11:19:55 -0400 |
| commit | 4e1b0f66943b2748d8ac2439176e2ddae9dc13b1 (patch) | |
| tree | 876902e4b63526d71357f4f5e4b314781504e2a1 /src/code | |
| parent | 731fe6da82ece67bee5c6ba441252a35588eaaca (diff) | |
Fix various data issues in gc-eu-mq (#1921)
* Fix various data issues
* D_80153D78 -> sMessageDebuggerTextboxCount
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/graph.c | 2 | ||||
| -rw-r--r-- | src/code/z_message_PAL.c | 9 | ||||
| -rw-r--r-- | src/code/z_play.c | 3 |
3 files changed, 11 insertions, 3 deletions
diff --git a/src/code/graph.c b/src/code/graph.c index 4f230b205..33b523ea2 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -159,7 +159,9 @@ void Graph_Destroy(GraphicsContext* gfxCtx) { } void Graph_TaskSet00(GraphicsContext* gfxCtx) { +#if OOT_DEBUG static Gfx* sPrevTaskWorkBuffer = NULL; +#endif static s32 sGraphCfbInfoIdx = 0; OSTime timeNow; diff --git a/src/code/z_message_PAL.c b/src/code/z_message_PAL.c index f63b41052..126841cea 100644 --- a/src/code/z_message_PAL.c +++ b/src/code/z_message_PAL.c @@ -3060,7 +3060,6 @@ void Message_Update(PlayState* play) { 0x0015, 0x0016, 0x0017, 0x0003, 0x0000, 0x270B, 0x00C8, 0x012C, 0x012D, 0xFFDA, 0x0014, 0x0016, 0x0014, 0x0016, }; static u8 D_80153D74 = 0; - static u16 D_80153D78 = 0; MessageContext* msgCtx = &play->msgCtx; InterfaceContext* interfaceCtx = &play->interfaceCtx; Player* player = GET_PLAYER(play); @@ -3073,10 +3072,12 @@ void Message_Update(PlayState* play) { #if OOT_DEBUG if (BREG(0) != 0) { + static u16 sMessageDebuggerTextboxCount = 0; + if (CHECK_BTN_ALL(input->press.button, BTN_DDOWN) && CHECK_BTN_ALL(input->cur.button, BTN_L)) { - PRINTF("msgno=%d\n", D_80153D78); + PRINTF("msgno=%d\n", sMessageDebuggerTextboxCount); Message_StartTextbox(play, R_MESSAGE_DEBUGGER_TEXTID, NULL); - D_80153D78 = (D_80153D78 + 1) % 10; + sMessageDebuggerTextboxCount = (sMessageDebuggerTextboxCount + 1) % 10; } if (R_MESSAGE_DEBUGGER_SELECT != 0) { while (R_MESSAGE_DEBUGGER_TEXTID != 0x8000) { @@ -3358,8 +3359,10 @@ void Message_SetTables(void) { sStaffMessageEntryTablePtr = sStaffMessageEntryTable; } +#if OOT_DEBUG // Appears to be file padding UNK_TYPE D_80153D7C = 0x00000000; +#endif // This should be part of z_game_over.c, but cannot be moved there as the entire // late_rodata section of this file is in the way diff --git a/src/code/z_play.c b/src/code/z_play.c index 2e499c9a0..c418c4089 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -2,8 +2,11 @@ #include "quake.h" #include "terminal.h" +#if OOT_DEBUG void* gDebugCutsceneScript = NULL; UNK_TYPE D_8012D1F4 = 0; // unused +#endif + Input* D_8012D1F8 = NULL; TransitionTile sTransitionTile; |