From 68f2cd6db65ef802e9a24612cca9953113255ced Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 12 Jan 2023 21:13:56 +1000 Subject: [PATCH] Merge version-specific debug files into one --- ld/gamefiles.jpn-final.inc | 3 +- ld/gamefiles.ntsc-final.inc | 3 +- ld/gamefiles.pal-final.inc | 3 +- src/game/bg.c | 6 +- src/game/debug.c | 463 -------------------------------- src/game/debug1.c | 31 +++ src/game/debug2.c | 507 +++++++++++++++++++++++++++--------- src/game/player.c | 2 +- src/include/game/debug.h | 6 +- src/lib/main.c | 2 +- 10 files changed, 423 insertions(+), 603 deletions(-) delete mode 100644 src/game/debug.c diff --git a/ld/gamefiles.jpn-final.inc b/ld/gamefiles.jpn-final.inc index c0b12641d..261fe950f 100644 --- a/ld/gamefiles.jpn-final.inc +++ b/ld/gamefiles.jpn-final.inc @@ -146,7 +146,8 @@ build/ROMID/game/padhalllv.o (section); \ build/ROMID/game/pad.o (section); \ build/ROMID/game/pak.o (section); \ - build/ROMID/game/debug.o (section); \ + build/ROMID/game/debug1.o (section); \ + build/ROMID/game/debug2.o (section); \ build/ROMID/game/debug3.o (section); \ build/ROMID/game/stubs/game_11eff0.o (section); \ build/ROMID/game/gailists.o (section); \ diff --git a/ld/gamefiles.ntsc-final.inc b/ld/gamefiles.ntsc-final.inc index c0b12641d..261fe950f 100644 --- a/ld/gamefiles.ntsc-final.inc +++ b/ld/gamefiles.ntsc-final.inc @@ -146,7 +146,8 @@ build/ROMID/game/padhalllv.o (section); \ build/ROMID/game/pad.o (section); \ build/ROMID/game/pak.o (section); \ - build/ROMID/game/debug.o (section); \ + build/ROMID/game/debug1.o (section); \ + build/ROMID/game/debug2.o (section); \ build/ROMID/game/debug3.o (section); \ build/ROMID/game/stubs/game_11eff0.o (section); \ build/ROMID/game/gailists.o (section); \ diff --git a/ld/gamefiles.pal-final.inc b/ld/gamefiles.pal-final.inc index c0b12641d..261fe950f 100644 --- a/ld/gamefiles.pal-final.inc +++ b/ld/gamefiles.pal-final.inc @@ -146,7 +146,8 @@ build/ROMID/game/padhalllv.o (section); \ build/ROMID/game/pad.o (section); \ build/ROMID/game/pak.o (section); \ - build/ROMID/game/debug.o (section); \ + build/ROMID/game/debug1.o (section); \ + build/ROMID/game/debug2.o (section); \ build/ROMID/game/debug3.o (section); \ build/ROMID/game/stubs/game_11eff0.o (section); \ build/ROMID/game/gailists.o (section); \ diff --git a/src/game/bg.c b/src/game/bg.c index 3a319a480..9b38a16bf 100644 --- a/src/game/bg.c +++ b/src/game/bg.c @@ -3134,7 +3134,7 @@ glabel bgLoadRoom /* f15dcbc: 18400009 */ blez $v0,.L0f15dce4 /* f15dcc0: 00000000 */ nop /* f15dcc4: afa202f4 */ sw $v0,0x2f4($sp) -/* f15dcc8: 0fc47b6c */ jal debug0f11edb0 +/* f15dcc8: 0fc47b6c */ jal debugIsRoomGfxExtraMemEnabled /* f15dccc: afa402f8 */ sw $a0,0x2f8($sp) /* f15dcd0: 10400007 */ beqz $v0,.L0f15dcf0 /* f15dcd4: 8fac02f4 */ lw $t4,0x2f4($sp) @@ -3703,7 +3703,7 @@ glabel bgLoadRoom /* f158468: 8c620080 */ lw $v0,0x80($v1) /* f15846c: 18400008 */ blez $v0,.NB0f158490 /* f158470: 00000000 */ sll $zero,$zero,0x0 -/* f158474: 0fc46652 */ jal debug0f11edb0 +/* f158474: 0fc46652 */ jal debugIsRoomGfxExtraMemEnabled /* f158478: afa202f4 */ sw $v0,0x2f4($sp) /* f15847c: 10400007 */ beqz $v0,.NB0f15849c /* f158480: 8fac02f4 */ lw $t4,0x2f4($sp) @@ -4308,7 +4308,7 @@ void bgLoadRoom(s32 roomnum) if (g_Rooms[roomnum].gfxdatalen > 0) { size = g_Rooms[roomnum].gfxdatalen; - if (debug0f11edb0()) { + if (debugIsRoomGfxExtraMemEnabled()) { size += 1024; } } else { diff --git a/src/game/debug.c b/src/game/debug.c deleted file mode 100644 index a283dde09..000000000 --- a/src/game/debug.c +++ /dev/null @@ -1,463 +0,0 @@ -#include -#include "constants.h" -#include "game/debug.h" -#include "bss.h" -#include "data.h" -#include "types.h" - -/** - * This file is used by ntsc-1.0 and above which has the debug functions - * ifdeffed out. - * - * ntsc-beta's debug implementations are in debug1.c and debug2.c. - * Those files are only linked into ntsc-beta. - * - * Splitting it like this is temporary due to it being difficult to identify - * which functions are the same between beta and 1.0. - */ - -s32 var80075d60 = 2; -s32 var80075d64 = 2; -s32 var80075d68 = 2; -u32 var80075d6c = 0x00000002; -u32 var80075d70 = 0x00000000; -bool g_DebugTurboMode = false; -s32 g_DebugScreenshotRgb = 0; -u32 var80075d7c = 0x00000000; -u32 var80075d80 = 0x00000000; -u32 var80075d84 = 0x00000000; -u32 var80075d88 = 0x00000000; -u32 var80075d8c = 0x00000000; -u32 var80075d90 = 0x00000000; -u32 var80075d94 = 0xbf800000; -u32 var80075d98 = 0x00000000; -u32 var80075d9c = 0x3f800000; -u32 var80075da0 = 0x00000000; -u32 var80075da4 = 0x00000000; -u32 var80075da8 = 0x3f800000; -u32 var80075dac = 0x00000000; -u32 var80075db0 = 0x00000000; -u32 var80075db4 = 0x3f800000; -u32 var80075db8 = 0x00000000; -u32 var80075dbc = 0x00000000; -u32 var80075dc0 = 0x00000000; -u32 var80075dc4 = 0x00000000; -u32 var80075dc8 = 0x00000000; -u32 var80075dcc = 0x00000000; -u32 var80075dd0 = 0x00000000; -u32 var80075dd4 = 0x00000000; -u32 var80075dd8 = 0x3f800000; -u32 var80075ddc = 0x00000000; - -void debug0f11ecf0(s32 arg0) // not called -{ - // empty -} - -void debug0f11ecf8(s32 arg0, s32 arg1, s32 arg2) // not called -{ - // empty -} - -s32 debug0f11ed08(s32 arg0) // not called -{ - return arg0; -} - -void debug0f11ed10(s32 arg0, s32 arg1, s32 arg2) // not called -{ - // empty -} - -bool debug0f11ed20(void) // not called -{ - return false; -} - -void debug0f11ed28(s32 arg0) // not called -{ - // empty -} - -void debug0f11ed30(void) // not called -{ - // empty -} - -void debug0f11ed38(void) // not called -{ - // empty -} - -void debug0f11ed40(void) // not called -{ - // empty -} - -void debug0f11ed48(void) // not called -{ - // empty -} - -void debug0f11ed50(void) // not called -{ - // empty -} - -bool debug0f11ed58(s32 arg0, s32 arg1, s32 arg2, s32 arg3) // not called -{ - return false; -} - -/** - * If 1, would render something but the render function is stubbed. - */ -s32 debug0f11ed70(void) -{ - return 0; -} - -bool debugIsBgRenderingEnabled(void) -{ - return true; -} - -bool debugIsPropRenderingEnabled(void) -{ - return true; -} - -bool debug0f11ed88(void) // not called -{ - return false; -} - -bool debug0f11ed90(void) // not called -{ - return false; -} - -void debug0f11ed98(s32 arg0) // not called -{ - // empty -} - -bool debug0f11eda0(void) // not called -{ - return false; -} - -bool debug0f11eda8(void) // not called -{ - return false; -} - -bool debug0f11edb0(void) -{ - return false; -} - -bool debugIsObjDeformDebugEnabled(void) -{ - return false; -} - -bool debugIsRoomStateDebugEnabled(void) -{ - return false; -} - -s32 debug0f11edc8(void) // not called -{ - return var80075d70; -} - -void debug0f11edd4(s32 arg0) // not called -{ - var80075d70 = arg0; -} - -bool debug0f11ede0(void) // not called -{ - return false; -} - -bool debug0f11ede8(void) // not called -{ - return false; -} - -bool debug0f11edf0(void) // not called -{ - return false; -} - -void debug0f11edf8(void) // not called -{ - // empty -} - -void debug0f11ee00(void) // not called -{ - // empty -} - -s32 debugIsTurboModeEnabled(void) -{ - return g_DebugTurboMode; -} - -void debugSetTurboMode(bool enabled) // not called -{ - g_DebugTurboMode = enabled; -} - -bool debugForceAllObjectivesComplete(void) -{ - return false; -} - -bool debugIsZBufferDisabled(void) -{ - return false; -} - -bool debug0f11ee30(void) // not called -{ - return false; -} - -bool debug0f11ee38(void) // not called -{ - return false; -} - -bool debug0f11ee40(void) -{ - return false; -} - -bool debug0f11ee48(void) // not called -{ - return false; -} - -bool debug0f11ee50(void) // not called -{ - return false; -} - -bool debug0f11ee58(void) // not called -{ - return false; -} - -bool debug0f11ee60(void) // not called -{ - return false; -} - -bool debug0f11ee68(void) // not called -{ - return false; -} - -s32 debugGetSlowMotion(void) -{ - return SLOWMOTION_OFF; -} - -bool debug0f11ee78(void) // not called -{ - return false; -} - -bool debug0f11ee80(void) // not called -{ - return false; -} - -bool debugGetTilesDebugMode(void) -{ - return false; -} - -bool debugGetPadsDebugMode(void) -{ - return false; -} - -bool debug0f11ee98(void) // not called -{ - return false; -} - -bool debug0f11eea0(void) // not called -{ - return false; -} - -bool debug0f11eea8(void) -{ - return false; -} - -bool debugDangerousProps(void) -{ - return false; -} - -bool debug0f11eeb8(void) // not called -{ - return false; -} - -bool debug0f11eec0(void) // not called -{ - return false; -} - -bool debug0f11eec8(void) // not called -{ - return false; -} - -bool debug0f11eed0(void) // not called -{ - return false; -} - -s32 debugGetMotionBlur(void) -{ - return 0; -} - -bool debug0f11eee0(void) // not called -{ - return false; -} - -u32 dprint() -{ - return 0; -} - -bool debug0f11eef0(void) // not called -{ - return false; -} - -bool debugIsFootstepsEnabled(void) -{ - return true; -} - -bool debug0f11ef00(void) // not called -{ - return false; -} - -bool debug0f11ef08(void) // not called -{ - return false; -} - -bool debug0f11ef10(void) // not called -{ - return false; -} - -bool debug0f11ef18(void) // not called -{ - return false; -} - -bool debug0f11ef20(void) // not called -{ - return false; -} - -bool debug0f11ef28(void) // not called -{ - return false; -} - -bool debug0f11ef30(void) // not called -{ - return false; -} - -bool debug0f11ef38(void) // not called -{ - return false; -} - -bool debug0f11ef40(void) // not called -{ - return false; -} - -bool debugAllowEndLevel(void) -{ - return true; -} - -bool debug0f11ef50(void) // not called -{ - return false; -} - -bool debug0f11ef58(void) // not called -{ - return false; -} - -bool debug0f11ef60(void) // not called -{ - return false; -} - -bool debug0f11ef68(void) // not called -{ - return false; -} - -bool debug0f11ef70(void) // not called -{ - return false; -} - -bool debugIsChrStatsEnabled(void) -{ - return false; -} - -bool debug0f11ef80(void) -{ - return false; -} - -bool debug0f11ef88(void) // not called -{ - return false; -} - -bool debug0f11ef90(void) // not called -{ - return false; -} - -void debug0f11ef98(s32 arg0) // not called -{ - // empty -} - -void debug0f11efa0(void) // not called -{ - // empty -} - -void debug0f11efa8(void) // not called -{ - // empty -} diff --git a/src/game/debug1.c b/src/game/debug1.c index a85043a6b..96b78804d 100644 --- a/src/game/debug1.c +++ b/src/game/debug1.c @@ -6,6 +6,7 @@ #include "data.h" #include "types.h" +#if VERSION == VERSION_NTSC_BETA || VERSION == VERSION_PAL_BETA s32 g_DMenuSelectedOption = 0; s32 g_DMenuNumOptions = 0; char **g_DMenuCurLabels = NULL; @@ -15,19 +16,25 @@ s32 *g_DMenuCurOffsets = NULL; u32 g_DMenuScaleIndex = 2; u8 g_DMenuXScales[] = { 4, 4, 4 }; u8 g_DMenuYScales[] = { 7, 7, 7 }; +#endif +#if VERSION == VERSION_NTSC_BETA || VERSION == VERSION_PAL_BETA void dmenu0f118c80nb(void) { // empty } +#endif void dmenuSetScaleIndex(s32 index) { +#if VERSION == VERSION_NTSC_BETA || VERSION == VERSION_PAL_BETA g_DMenuScaleIndex = index; +#endif } void dmenuSetMenu(char **labels, s32 (*positions)[2], s32 *offsets) { +#if VERSION == VERSION_NTSC_BETA || VERSION == VERSION_PAL_BETA s32 numgroups; g_DMenuCurLabels = labels; @@ -38,10 +45,12 @@ void dmenuSetMenu(char **labels, s32 (*positions)[2], s32 *offsets) g_DMenuNumOptions = offsets[numgroups - 1]; g_DMenuNumGroups = numgroups; +#endif } Gfx *dmenuRender(Gfx *gdl) { +#if VERSION == VERSION_NTSC_BETA || VERSION == VERSION_PAL_BETA s32 xscale = g_DMenuXScales[g_DMenuScaleIndex]; s32 yscale = g_DMenuYScales[g_DMenuScaleIndex]; s32 i; @@ -69,22 +78,37 @@ Gfx *dmenuRender(Gfx *gdl) dhudPrintString(g_DMenuCurLabels[i]); } } +#endif return gdl; } +#if VERSION != VERSION_NTSC_BETA && VERSION != VERSION_PAL_BETA +void debug0f11ed10(s32 arg0, s32 arg1, s32 arg2) +{ + // empty +} +#endif + s32 dmenuGetSelectedOption(void) { +#if VERSION == VERSION_NTSC_BETA || VERSION == VERSION_PAL_BETA return g_DMenuSelectedOption; +#else + return 0; +#endif } void dmenuSetSelectedOption(s32 option) { +#if VERSION == VERSION_NTSC_BETA || VERSION == VERSION_PAL_BETA g_DMenuSelectedOption = option; +#endif } void dmenuNavigateUp(void) { +#if VERSION == VERSION_NTSC_BETA || VERSION == VERSION_PAL_BETA s32 i; g_DMenuSelectedOption--; @@ -104,10 +128,12 @@ void dmenuNavigateUp(void) return; } } +#endif } void dmenuNavigateDown(void) { +#if VERSION == VERSION_NTSC_BETA || VERSION == VERSION_PAL_BETA s32 i; g_DMenuSelectedOption++; @@ -127,10 +153,12 @@ void dmenuNavigateDown(void) return; } } +#endif } void dmenuNavigateRight(void) { +#if VERSION == VERSION_NTSC_BETA || VERSION == VERSION_PAL_BETA s32 i; if (g_DMenuSelectedOption < g_DMenuCurOffsets[0]) { @@ -162,10 +190,12 @@ void dmenuNavigateRight(void) return; } } +#endif } void dmenuNavigateLeft(void) { +#if VERSION == VERSION_NTSC_BETA || VERSION == VERSION_PAL_BETA s32 i; // First group @@ -196,4 +226,5 @@ void dmenuNavigateLeft(void) if (g_DMenuSelectedOption >= g_DMenuCurOffsets[i - 1]) { g_DMenuSelectedOption = g_DMenuCurOffsets[i - 1] - 1; } +#endif } diff --git a/src/game/debug2.c b/src/game/debug2.c index 84f237739..95486ca8f 100644 --- a/src/game/debug2.c +++ b/src/game/debug2.c @@ -36,6 +36,13 @@ #define DEBUGOPT_MANPOS 101 #endif +// The DEBUG_VALUE macro is used for readability. +#if VERSION == VERSION_NTSC_BETA || VERSION == VERSION_PAL_BETA +#define DEBUG_VALUE(valueifdebug, valueifnotdebug) (valueifdebug) +#else +#define DEBUG_VALUE(valueifdebug, valueifnotdebug) (valueifnotdebug) +#endif + #if VERSION == VERSION_PAL_BETA s32 var80075d60 = 2; s32 var80075d64 = 2; @@ -43,6 +50,7 @@ s32 var80075d68 = 2; s32 var800786f4nb = 2; #endif +#if VERSION == VERSION_NTSC_BETA || VERSION == VERSION_PAL_BETA s32 g_DebugMenuOffsets[] = { 15, 30, @@ -181,7 +189,6 @@ s32 g_DebugMenuPositions[][2] = { { 57, 30 }, }; -// ntsc-beta rodata at 7f1af170 char *g_DebugMenuLabels[] = { "-", "-", @@ -339,15 +346,17 @@ u32 var800a7950nb; s32 g_DebugCurMenu = DEBUGMENU_MAIN; s32 g_DebugSelectedOptionsByMenu[2] = {0, 0}; +#endif -#if VERSION == VERSION_NTSC_BETA +#if VERSION != VERSION_PAL_BETA s32 var80075d60 = 2; s32 var80075d64 = 2; s32 var80075d68 = 2; s32 var800786f4nb = 2; #endif -s32 var800786f8nb = 0; +#if VERSION == VERSION_NTSC_BETA || VERSION == VERSION_PAL_BETA +s32 g_DebugProfileMode = 0; bool g_DebugRenderBg = true; bool g_DebugRenderProps = true; s32 var80078704nb = 1; @@ -355,14 +364,22 @@ s32 var80078708nb = 0; bool g_DebugRoomState = false; s32 var80078710nb = 0; s32 var80078714nb = 0; -s32 var80078718nb = 0; +s32 g_DebugRoomGfxExtraMem = 0; bool g_DebugObjDeform = false; +#endif + bool g_DebugLineMode = false; + +#if VERSION == VERSION_NTSC_BETA || VERSION == VERSION_PAL_BETA s32 var80078724nb = 0; s32 var80078728nb = 0; s32 var8007872cnb = 0; bool g_DebugManPos = false; +#endif + bool g_DebugTurboMode = false; + +#if VERSION == VERSION_NTSC_BETA || VERSION == VERSION_PAL_BETA bool g_DebugObjectives = false; bool g_DebugZBufferDisabled = false; s32 var80078740nb = 0; @@ -421,36 +438,42 @@ u32 var80078804nb = 0x80600000; u32 var80078808nb = 0x00040000; u32 var8007880cnb = 0x70000000; u32 var80078810nb = 0x70100000; +#endif + s32 g_DebugScreenshotRgb = 0; s32 g_DebugScreenshotJpg = 0; -bool g_DebugIsMenuOpen = false; -u32 var80078820nb = 0; -u32 var80078824nb = 0; -u32 var80078828nb = 0; -u32 var8007882cnb = 0; -u32 var80078830nb = 0; -u32 var80078834nb = 0xbf800000; -u32 var80078838nb = 0; -u32 var8007883cnb = 0x3f800000; -u32 var80078840nb = 0; -u32 var80078844nb = 0; -u32 var80078848nb = 0x3f800000; -u32 var8007884cnb = 0; -u32 var80078850nb = 0; -u32 var80078854nb = 0x3f800000; -u32 var80078858nb = 0; -u32 var8007885cnb = 0; -u32 var80078860nb = 0; -u32 var80078864nb = 0; -u32 var80078868nb = 0; -u32 var8007886cnb = 0; -u32 var80078870nb = 0; -u32 var80078874nb = 0; -u32 var80078878nb = 0x3f800000; +#if VERSION == VERSION_NTSC_BETA || VERSION == VERSION_PAL_BETA +bool g_DebugIsMenuOpen = false; +#endif + +f32 var80075d80 = 0; +f32 var80075d84 = 0; +f32 var80075d88 = 0; +f32 var80075d8c = 0; +f32 var80075d90 = 0; +f32 var80075d94 = -1; +f32 var80075d98 = 0; +f32 var80075d9c = 1; +f32 var80075da0 = 0; +f32 var80075da4 = 0; +f32 var80075da8 = 1; +f32 var80075dac = 0; +f32 var80075db0 = 0; +f32 var80075db4 = 1; +f32 var80075db8 = 0; +f32 var80075dbc = 0; +f32 var80075dc0 = 0; +f32 var80075dc4 = 0; +f32 var80075dc8 = 0; +f32 var80075dcc = 0; +f32 var80075dd0 = 0; +f32 var80075dd4 = 0; +f32 var80075dd8 = 1; void debugUpdateMenu(void) { +#if VERSION == VERSION_NTSC_BETA || VERSION == VERSION_PAL_BETA s32 i; if (g_DebugCurMenu == DEBUGMENU_MAIN) { @@ -478,41 +501,45 @@ void debugUpdateMenu(void) } dmenuSetSelectedOption(g_DebugSelectedOptionsByMenu[g_DebugCurMenu]); +#endif } +#if VERSION == VERSION_NTSC_BETA || VERSION == VERSION_PAL_BETA void debugSaveSelectedOption(void) { g_DebugSelectedOptionsByMenu[g_DebugCurMenu] = dmenuGetSelectedOption(); } -void debug0f1193e4nb(void) +void debug0f1193e4nb(void) // not called { // empty } -void debug0f1193ecnb(void) +void debug0f1193ecnb(void) // not called { // empty } -void debug0f1193f4nb(void) +void debug0f1193f4nb(void) // not called { var80075d60 = var80075d64 = var800786f4nb = 2; } -void debug0f11941cnb(void) +void debug0f11941cnb(void) // not called { rmon0002fa30(&var800787f4nb, 2); rmon0002fa38(250); } -void debug0f11944cnb(void) +void debug0f11944cnb(void) // not called { rmon0002fa40(); } +#endif bool debugProcessInput(s8 stickx, s8 sticky, u16 buttons, u16 buttonsthisframe) { +#if VERSION == VERSION_NTSC_BETA || VERSION == VERSION_PAL_BETA s32 i; s32 prev; s32 tmp = 3; @@ -708,61 +735,66 @@ bool debugProcessInput(s8 stickx, s8 sticky, u16 buttons, u16 buttonsthisframe) debugSaveSelectedOption(); return g_DebugIsMenuOpen; +#else + return false; +#endif } -bool debug0f11ed70(void) +s32 debugGetProfileMode(void) { - return var800786f8nb; + return DEBUG_VALUE(g_DebugProfileMode, 0); } bool debugIsBgRenderingEnabled(void) { - return g_DebugRenderBg; + return DEBUG_VALUE(g_DebugRenderBg, true); } bool debugIsPropRenderingEnabled(void) { - return g_DebugRenderProps; + return DEBUG_VALUE(g_DebugRenderProps, true); } -bool debug0f11990cnb(void) +bool debug0f11ed88(void) { - return var80078708nb; + return DEBUG_VALUE(var80078708nb, false); } bool debugIsManPosEnabled(void) { - return g_DebugManPos; + return DEBUG_VALUE(g_DebugManPos, false); } void debugSetManPos(bool enabled) { +#if VERSION == VERSION_NTSC_BETA || VERSION == VERSION_PAL_BETA g_DebugManPos = enabled; +#endif } -bool debug0f119930nb(void) +bool debug0f11eda0(void) // not called { - return var80078710nb; + return DEBUG_VALUE(var80078710nb, false); } -bool debug0f11993cnb(void) +bool debug0f11eda8(void) // not called { - return var80078714nb; + return DEBUG_VALUE(var80078714nb, false); } -bool debug0f11edb0(void) +bool debugIsRoomGfxExtraMemEnabled(void) { - return var80078718nb; + return DEBUG_VALUE(g_DebugRoomGfxExtraMem, false); } bool debugIsObjDeformDebugEnabled(void) { - return g_DebugObjDeform; + return DEBUG_VALUE(g_DebugObjDeform, false); } bool debugIsRoomStateDebugEnabled(void) { - return g_DebugRoomState; + return DEBUG_VALUE(g_DebugRoomState, false); } bool debugIsLineModeEnabled(void) @@ -775,6 +807,33 @@ void debugSetLineModeEnabled(bool enabled) g_DebugLineMode = enabled; } +#if VERSION != VERSION_NTSC_BETA && VERSION != VERSION_PAL_BETA +bool debug0f11ede0(void) // not called +{ + return false; +} + +bool debug0f11ede8(void) // not called +{ + return false; +} + +bool debug0f11edf0(void) // not called +{ + return false; +} + +void debug0f11edf8(void) // not called +{ + // empty +} + +void debug0f11ee00(void) // not called +{ + // empty +} +#endif + bool debugIsTurboModeEnabled(void) { return g_DebugTurboMode; @@ -787,35 +846,40 @@ void debugSetTurboMode(bool enabled) bool debugForceAllObjectivesComplete(void) { - return g_DebugObjectives; + return DEBUG_VALUE(g_DebugObjectives, false); } bool debugIsZBufferDisabled(void) { - return g_DebugZBufferDisabled; + return DEBUG_VALUE(g_DebugZBufferDisabled, false); } -bool debug0f11ee30(void) +bool debug0f11ee30(void) // not called { - return var80078744nb; + return DEBUG_VALUE(var80078744nb, false); } -bool debug0f11ee38(void) +bool debug0f11ee38(void) // not called { - return var80078750nb; + return DEBUG_VALUE(var80078750nb, false); } bool debug0f11ee40(void) { - return var80078754nb; + return DEBUG_VALUE(var80078754nb, false); } -bool debug0f1199d8nb(void) +//------------------------------------------------------------------------------ +// Unsure which functions are which between versions +// as none are called by both versions + +#if VERSION == VERSION_NTSC_BETA || VERSION == VERSION_PAL_BETA +bool debug0f1199d8nb(void) // not called { return var80078758nb; } -bool debug0f1199e4nb(void) +bool debug0f1199e4nb(void) // not called { return var80078740nb; } @@ -825,12 +889,12 @@ bool debug0f1199f0nb(void) return var80078724nb; } -bool debug0f1199fcnb(void) +bool debug0f1199fcnb(void) // not called { return var80078728nb; } -bool debug0f119a08nb(void) +bool debug0f119a08nb(void) // not called { return var8007872cnb; } @@ -840,102 +904,166 @@ bool debug0f119a14nb(void) return var80078748nb; } -bool debug0f119a20nb(void) +bool debug0f119a20nb(void) // not called { return var8007874cnb; } -bool debug0f119a2cnb(void) +bool debug0f119a2cnb(void) // not called { return var8007875cnb; } - -s32 debugGetSlowMotion(void) -{ - return g_DebugSlowMotion; -} - -bool debug0f119a44nb(void) -{ - return var80078768nb; -} - -bool debug0f119a50nb(void) -{ - return var80078760nb; -} - -s32 debugGetTilesDebugMode(void) -{ - return g_DebugTiles; -} - -s32 debugGetPadsDebugMode(void) -{ - return g_DebugPads; -} - -bool debug0f119a74nb(void) -{ - return var80078774nb; -} - -void debug0f119a80nb(void) -{ - var80078774nb = 0; -} - -bool debug0f119a8cnb(void) -{ - return var80078778nb; -} - -bool debug0f11eea8(void) -{ - return var80078780nb; -} - -bool debug0f119aa4nb(void) +#else +bool debug0f11ee48(void) // not called { return false; } -bool debugDangerousProps(void) +bool debug0f11ee50(void) // not called { - return var800787ecnb; + return false; } -bool debug0f119ab8nb(void) +bool debug0f11ee58(void) // not called +{ + return false; +} + +bool debug0f11ee60(void) // not called +{ + return false; +} + +bool debug0f11ee68(void) // not called +{ + return false; +} +#endif + +//------------------------------------------------------------------------------ + +s32 debugGetSlowMotion(void) +{ + return DEBUG_VALUE(g_DebugSlowMotion, SLOWMOTION_OFF); +} + +bool debug0f11ee78(void) // not called +{ + return DEBUG_VALUE(var80078768nb, false); +} + +bool debug0f11ee80(void) // not called +{ + return DEBUG_VALUE(var80078760nb, false); +} + +s32 debugGetTilesDebugMode(void) +{ + return DEBUG_VALUE(g_DebugTiles, 0); +} + +s32 debugGetPadsDebugMode(void) +{ + return DEBUG_VALUE(g_DebugPads, 0); +} + +bool debug0f11ee98(void) // not called +{ + return DEBUG_VALUE(var80078774nb, false); +} + +#if VERSION == VERSION_NTSC_BETA || VERSION == VERSION_PAL_BETA +void debug0f119a80nb(void) +{ + var80078774nb = 0; +} +#endif + +bool debug0f11eea0(void) // not called +{ + return DEBUG_VALUE(var80078778nb, false); +} + +bool debug0f11eea8(void) +{ + return DEBUG_VALUE(var80078780nb, false); +} + +#if VERSION == VERSION_NTSC_BETA || VERSION == VERSION_PAL_BETA +bool debug0f119aa4nb(void) +{ + return false; +} +#endif + +bool debugDangerousProps(void) +{ + return DEBUG_VALUE(var800787ecnb, false); +} + +//------------------------------------------------------------------------------ +// Unsure which functions are which between versions +// as none are called by both versions + +#if VERSION == VERSION_NTSC_BETA || VERSION == VERSION_PAL_BETA +bool debug0f119ab8nb(void) // not called { return var800787d8nb; } -bool debug0f119ac4nb(void) +bool debug0f119ac4nb(void) // not called { return var800787dcnb; } -bool debug0f119ad0nb(void) +bool debug0f119ad0nb(void) // not called { return var8007877cnb; } - -bool debugGetMotionBlur(void) +#else +bool debug0f11eeb8(void) // not called { - return var80078784nb; + return false; +} + +bool debug0f11eec0(void) // not called +{ + return false; +} + +bool debug0f11eec8(void) // not called +{ + return false; +} + +bool debug0f11eed0(void) // not called +{ + return false; +} +#endif + +//------------------------------------------------------------------------------ + +s32 debugGetMotionBlur(void) +{ + return DEBUG_VALUE(var80078784nb, 0); } bool debug0f119ae8nb(void) { - return var80078790nb; + return DEBUG_VALUE(var80078790nb, false); } u32 dprint() { - return var800787b8nb; + return DEBUG_VALUE(var800787b8nb, 0); } -bool debug0f119b00nb(void) +//------------------------------------------------------------------------------ +// Reordered functions between versions + +#if VERSION == VERSION_NTSC_BETA || VERSION == VERSION_PAL_BETA +bool debug0f119b00nb(void) // not called { return var800787c0nb; } @@ -945,22 +1073,22 @@ bool debugAllowEndLevel(void) return var800787c4nb; } -bool debug0f119b18nb(void) +bool debug0f119b18nb(void) // not called { return var800787c8nb; } -bool debug0f119b24nb(void) +bool debug0f119b24nb(void) // not called { return var800787ccnb; } -bool debug0f119b30nb(void) +bool debug0f119b30nb(void) // not called { return var800787d0nb; } -bool debug0f119b3cnb(void) +bool debug0f119b3cnb(void) // not called { return var800787d4nb; } @@ -992,12 +1120,12 @@ bool debugIsAllTrainingEnabled(void) return g_DebugAllTraining; } -bool debug0f119b78nb(void) +bool debug0f119b78nb(void) // not called { return var800787a4nb; } -bool debug0f119b84nb(void) +bool debug0f119b84nb(void) // not called { return var800787a8nb; } @@ -1007,12 +1135,12 @@ bool debugIsMemInfoEnabled(void) return g_DebugMemInfo; } -bool debug0f119b9cnb(void) +bool debug0f119b9cnb(void) // not called { return var800787b0nb; } -bool debug0f119ba8nb(void) +bool debug0f119ba8nb(void) // not called { return var800787bcnb; } @@ -1027,12 +1155,133 @@ bool debug0f11ef80(void) return var800787e8nb; } -bool debug0f119bccnb(void) +bool debug0f119bccnb(void) // not called { return var800787e0nb; } -bool debug0f119bd8nb(void) +bool debug0f119bd8nb(void) // not called { return var800787f0nb; } +#else +bool debug0f11eef0(void) // not called +{ + return false; +} + +bool debugIsFootstepsEnabled(void) +{ + return true; +} + +bool debug0f11ef00(void) // not called +{ + return false; +} + +bool debug0f11ef08(void) // not called +{ + return false; +} + +bool debug0f11ef10(void) // not called +{ + return false; +} + +bool debug0f11ef18(void) // not called +{ + return false; +} + +bool debug0f11ef20(void) // not called +{ + return false; +} + +bool debug0f11ef28(void) // not called +{ + return false; +} + +bool debug0f11ef30(void) // not called +{ + return false; +} + +bool debug0f11ef38(void) // not called +{ + return false; +} + +bool debug0f11ef40(void) // not called +{ + return false; +} + +bool debugAllowEndLevel(void) +{ + return true; +} + +bool debug0f11ef50(void) // not called +{ + return false; +} + +bool debug0f11ef58(void) // not called +{ + return false; +} + +bool debug0f11ef60(void) // not called +{ + return false; +} + +bool debug0f11ef68(void) // not called +{ + return false; +} + +bool debug0f11ef70(void) // not called +{ + return false; +} + +bool debugIsChrStatsEnabled(void) +{ + return false; +} + +bool debug0f11ef80(void) +{ + return false; +} + +bool debug0f11ef88(void) // not called +{ + return false; +} + +bool debug0f11ef90(void) // not called +{ + return false; +} + +void debug0f11ef98(s32 arg0) // not called +{ + // empty +} + +void debug0f11efa0(void) // not called +{ + // empty +} + +void debug0f11efa8(void) // not called +{ + // empty +} +#endif diff --git a/src/game/player.c b/src/game/player.c index c17862fc5..cf515ce46 100644 --- a/src/game/player.c +++ b/src/game/player.c @@ -4047,7 +4047,7 @@ void playerTick(bool arg0) } #if VERSION == VERSION_NTSC_BETA || VERSION == VERSION_PAL_BETA - if (debug0f11990cnb()) { + if (debug0f11ed88()) { debug0f119a14nb(); } #endif diff --git a/src/include/game/debug.h b/src/include/game/debug.h index 12f842e66..5b7776a23 100644 --- a/src/include/game/debug.h +++ b/src/include/game/debug.h @@ -6,12 +6,12 @@ void debug0f119a80nb(void); u32 dprint(); -s32 debug0f11ed70(void); +s32 debugGetProfileMode(void); bool debugIsBgRenderingEnabled(void); bool debugIsPropRenderingEnabled(void); -bool debug0f11990cnb(void); +bool debug0f11ed88(void); bool debugIsManPosEnabled(void); -bool debug0f11edb0(void); +bool debugIsRoomGfxExtraMemEnabled(void); bool debugIsObjDeformDebugEnabled(void); bool debugIsRoomStateDebugEnabled(void); s32 debugIsTurboModeEnabled(void); diff --git a/src/lib/main.c b/src/lib/main.c index 397b6223b..10dde08d4 100644 --- a/src/lib/main.c +++ b/src/lib/main.c @@ -1474,7 +1474,7 @@ void mainTick(void) dhudClear(); #endif - if (debug0f11ed70() >= 2) { + if (debugGetProfileMode() >= 2) { gdl = profileRender(gdl); }