mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-13 19:35:28 +00:00
Code Issues Projects Releases Wiki Activity

Fix various data issues in gc-eu-mq (#1921)

Browse source 
* Fix various data issues

* D_80153D78 -> sMessageDebuggerTextboxCount
This commit is contained in:
cadmic 2024-03-29 08:19:55 -07:00 • committed by GitHub
parent 731fe6da82
commit 4e1b0f6694
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/audio/general.c
View file

@ -127,7 +127,10 @@ u8 sAudioBaseFilter2 = 0;
u8 sAudioExtraFilter2 = 0; u8 sAudioExtraFilter2 = 0;
Vec3f* sSariaBgmPtr = NULL; Vec3f* sSariaBgmPtr = NULL;
f32 D_80130650 = 2000.0f; f32 D_80130650 = 2000.0f;
#if OOT_DEBUG
u8 sSeqModeInput = 0; u8 sSeqModeInput = 0;
#endif
#define SEQ_FLAG_ENEMY (1 << 0) // Allows enemy bgm #define SEQ_FLAG_ENEMY (1 << 0) // Allows enemy bgm
#define SEQ_FLAG_FANFARE (1 << 1) #define SEQ_FLAG_FANFARE (1 << 1)

2
src/code/graph.c
View file

@ -159,7 +159,9 @@ void Graph_Destroy(GraphicsContext* gfxCtx) {
} }
void Graph_TaskSet00(GraphicsContext* gfxCtx) { void Graph_TaskSet00(GraphicsContext* gfxCtx) {
#if OOT_DEBUG
static Gfx* sPrevTaskWorkBuffer = NULL; static Gfx* sPrevTaskWorkBuffer = NULL;
#endif
static s32 sGraphCfbInfoIdx = 0; static s32 sGraphCfbInfoIdx = 0;
OSTime timeNow; OSTime timeNow;

9
src/code/z_message_PAL.c
View file

@ -3060,7 +3060,6 @@ void Message_Update(PlayState* play) {
0x0015, 0x0016, 0x0017, 0x0003, 0x0000, 0x270B, 0x00C8, 0x012C, 0x012D, 0xFFDA, 0x0014, 0x0016, 0x0014, 0x0016, 0x0015, 0x0016, 0x0017, 0x0003, 0x0000, 0x270B, 0x00C8, 0x012C, 0x012D, 0xFFDA, 0x0014, 0x0016, 0x0014, 0x0016,
}; };
static u8 D_80153D74 = 0; static u8 D_80153D74 = 0;
static u16 D_80153D78 = 0;
MessageContext* msgCtx = &play->msgCtx; MessageContext* msgCtx = &play->msgCtx;
InterfaceContext* interfaceCtx = &play->interfaceCtx; InterfaceContext* interfaceCtx = &play->interfaceCtx;
Player* player = GET_PLAYER(play); Player* player = GET_PLAYER(play);
@ -3073,10 +3072,12 @@ void Message_Update(PlayState* play) {
#if OOT_DEBUG #if OOT_DEBUG
if (BREG(0) != 0) { 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)) { 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); Message_StartTextbox(play, R_MESSAGE_DEBUGGER_TEXTID, NULL);
D_80153D78 = (D_80153D78 + 1) % 10; sMessageDebuggerTextboxCount = (sMessageDebuggerTextboxCount + 1) % 10;
} }
if (R_MESSAGE_DEBUGGER_SELECT != 0) { if (R_MESSAGE_DEBUGGER_SELECT != 0) {
while (R_MESSAGE_DEBUGGER_TEXTID != 0x8000) { while (R_MESSAGE_DEBUGGER_TEXTID != 0x8000) {
@ -3358,8 +3359,10 @@ void Message_SetTables(void) {
sStaffMessageEntryTablePtr = sStaffMessageEntryTable; sStaffMessageEntryTablePtr = sStaffMessageEntryTable;
} }
#if OOT_DEBUG
// Appears to be file padding // Appears to be file padding
UNK_TYPE D_80153D7C = 0x00000000; UNK_TYPE D_80153D7C = 0x00000000;
#endif
// This should be part of z_game_over.c, but cannot be moved there as the entire // 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 // late_rodata section of this file is in the way

3
src/code/z_play.c
View file

@ -2,8 +2,11 @@
#include "quake.h" #include "quake.h"
#include "terminal.h" #include "terminal.h"
#if OOT_DEBUG
void* gDebugCutsceneScript = NULL; void* gDebugCutsceneScript = NULL;
UNK_TYPE D_8012D1F4 = 0; // unused UNK_TYPE D_8012D1F4 = 0; // unused
#endif
Input* D_8012D1F8 = NULL; Input* D_8012D1F8 = NULL;
TransitionTile sTransitionTile; TransitionTile sTransitionTile;