falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Decompile debugProcessInput

This commit is contained in:
Ryan Dwyer 2021-10-27 22:10:03 +10:00
parent 17fdc5fbec
commit 5dc0ecfd9a
21 changed files with 388 additions and 702 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/game/bg.c
View File

@ -2788,7 +2788,7 @@ glabel func0f15a2c4
/* f15a624: 00408825 */ or $s1,$v0,$zero
/* f15a628: 0c012d20 */ jal osVirtualToPhysical
/* f15a62c: 00402025 */ or $a0,$v0,$zero
/* f15a630: 0fc47b60 */ jal debugEnablePropRendering
/* f15a630: 0fc47b60 */ jal debugIsPropRenderingEnabled
/* f15a634: ae220004 */ sw $v0,0x4($s1)
/* f15a638: 10400013 */ beqz $v0,.L0f15a688
/* f15a63c: 00000000 */ nop
@ -3253,7 +3253,7 @@ glabel func0f15a6f4
/* f15aca0: 02202025 */ or $a0,$s1,$zero
/* f15aca4: 0fc599b2 */ jal gfxConsiderDisableFog
/* f15aca8: af220004 */ sw $v0,0x4($t9)
/* f15acac: 0fc47b60 */ jal debugEnablePropRendering
/* f15acac: 0fc47b60 */ jal debugIsPropRenderingEnabled
/* f15acb0: 00408825 */ or $s1,$v0,$zero
/* f15acb4: 50400014 */ beqzl $v0,.L0f15ad08
/* f15acb8: 3c0c0103 */ lui $t4,0x103
@ -3340,7 +3340,7 @@ glabel func0f15a6f4
/* f15adec: 02202025 */ or $a0,$s1,$zero
/* f15adf0: 0fc599b2 */ jal gfxConsiderDisableFog
/* f15adf4: ada20004 */ sw $v0,0x4($t5)
/* f15adf8: 0fc47b60 */ jal debugEnablePropRendering
/* f15adf8: 0fc47b60 */ jal debugIsPropRenderingEnabled
/* f15adfc: 00408825 */ or $s1,$v0,$zero
/* f15ae00: 10400013 */ beqz $v0,.L0f15ae50
/* f15ae04: 00000000 */ nop
@ -3492,7 +3492,7 @@ glabel func0f15a6f4
/* f15b02c: 02202025 */ or $a0,$s1,$zero
/* f15b030: 0fc599b2 */ jal gfxConsiderDisableFog
/* f15b034: af220004 */ sw $v0,0x4($t9)
/* f15b038: 0fc47b60 */ jal debugEnablePropRendering
/* f15b038: 0fc47b60 */ jal debugIsPropRenderingEnabled
/* f15b03c: 00408825 */ or $s1,$v0,$zero
/* f15b040: 10400013 */ beqz $v0,.L0f15b090
/* f15b044: 00000000 */ nop
@ -3963,7 +3963,7 @@ glabel func0f15a6f4
/* f155300: 02202025 */ or $a0,$s1,$zero
/* f155304: 0fc583b2 */ jal gfxConsiderDisableFog
/* f155308: af220004 */ sw $v0,0x4($t9)
/* f15530c: 0fc46640 */ jal debugEnablePropRendering
/* f15530c: 0fc46640 */ jal debugIsPropRenderingEnabled
/* f155310: 00408825 */ or $s1,$v0,$zero
/* f155314: 50400014 */ beqzl $v0,.NB0f155368
/* f155318: 3c0c0103 */ lui $t4,0x103
@ -4019,7 +4019,7 @@ glabel func0f15a6f4
/* f1553d8: 00402025 */ or $a0,$v0,$zero
/* f1553dc: 0fc58328 */ jal func0f1664a0
/* f1553e0: 00002825 */ or $a1,$zero,$zero
/* f1553e4: 0fc4663d */ jal debug0f1198f4nb
/* f1553e4: 0fc4663d */ jal debugIsBgRenderingEnabled
/* f1553e8: 00408825 */ or $s1,$v0,$zero
/* f1553ec: 5040000e */ beqzl $v0,.NB0f155428
/* f1553f0: 3c0c0103 */ lui $t4,0x103
@ -4050,7 +4050,7 @@ glabel func0f15a6f4
/* f15544c: 02202025 */ or $a0,$s1,$zero
/* f155450: 0fc583b2 */ jal gfxConsiderDisableFog
/* f155454: ada20004 */ sw $v0,0x4($t5)
/* f155458: 0fc46640 */ jal debugEnablePropRendering
/* f155458: 0fc46640 */ jal debugIsPropRenderingEnabled
/* f15545c: 00408825 */ or $s1,$v0,$zero
/* f155460: 10400013 */ beqz $v0,.NB0f1554b0
/* f155464: 00000000 */ sll $zero,$zero,0x0
@ -4176,7 +4176,7 @@ glabel func0f15a6f4
/* f15562c: 00402025 */ or $a0,$v0,$zero
/* f155630: 0fc58328 */ jal func0f1664a0
/* f155634: 24050001 */ addiu $a1,$zero,0x1
/* f155638: 0fc4663d */ jal debug0f1198f4nb
/* f155638: 0fc4663d */ jal debugIsBgRenderingEnabled
/* f15563c: 00408825 */ or $s1,$v0,$zero
/* f155640: 50400009 */ beqzl $v0,.NB0f155668
/* f155644: 3c0b0103 */ lui $t3,0x103
@ -4202,7 +4202,7 @@ glabel func0f15a6f4
/* f15568c: 02202025 */ or $a0,$s1,$zero
/* f155690: 0fc583b2 */ jal gfxConsiderDisableFog
/* f155694: af220004 */ sw $v0,0x4($t9)
/* f155698: 0fc46640 */ jal debugEnablePropRendering
/* f155698: 0fc46640 */ jal debugIsPropRenderingEnabled
/* f15569c: 00408825 */ or $s1,$v0,$zero
/* f1556a0: 10400013 */ beqz $v0,.NB0f1556f0
/* f1556a4: 00000000 */ sll $zero,$zero,0x0

2
src/game/bondgrab.c
View File

@ -3976,7 +3976,7 @@ glabel var7f1ada2c
/* f0cc3dc: 460a2200 */ add.s $f8,$f4,$f10
/* f0cc3e0: 0fc324de */ jal bmoveUpdateMoveInitSpeed
/* f0cc3e4: e7a8007c */ swc1 $f8,0x7c($sp)
/* f0cc3e8: 0fc46661 */ jal debug0f119984nb
/* f0cc3e8: 0fc46661 */ jal debugIsTurboModeEnabled
/* f0cc3ec: 00000000 */ sll $zero,$zero,0x0
/* f0cc3f0: 3c08800a */ lui $t0,0x800a
/* f0cc3f4: 1040001f */ beqz $v0,.NB0f0cc474

4
src/game/bondwalk.c
View File

@ -3099,7 +3099,7 @@ glabel var7f1a7b20nb
/* f0c31c8: c44e0080 */ lwc1 $f14,0x80($v0)
/* f0c31cc: e7a20084 */ swc1 $f2,0x84($sp)
/* f0c31d0: afa000ec */ sw $zero,0xec($sp)
/* f0c31d4: 0fc46661 */ jal debug0f119984nb
/* f0c31d4: 0fc46661 */ jal debugIsTurboModeEnabled
/* f0c31d8: e7ae0080 */ swc1 $f14,0x80($sp)
/* f0c31dc: 8fa300ec */ lw $v1,0xec($sp)
/* f0c31e0: c7ae0080 */ lwc1 $f14,0x80($sp)
@ -6407,7 +6407,7 @@ glabel var7f1ad854
/* f0c4940: e7a400cc */ swc1 $f4,0xcc($sp)
/* f0c4944: 0fc324de */ jal bmoveUpdateMoveInitSpeed
/* f0c4948: e7a600d4 */ swc1 $f6,0xd4($sp)
/* f0c494c: 0fc46661 */ jal debug0f119984nb
/* f0c494c: 0fc46661 */ jal debugIsTurboModeEnabled
/* f0c4950: 00000000 */ sll $zero,$zero,0x0
/* f0c4954: 3c08800a */ lui $t0,0x800a
/* f0c4958: 1040001f */ beqz $v0,.NB0f0c49d8

10
src/game/chr/chraction.c
View File

@ -23029,7 +23029,7 @@ void chrTick(struct chrdata *chr)
}
}
void func0f0482cc(u32 ailistid)
void cutsceneStart(u32 ailistid)
{
struct prop *prop;
@ -23217,7 +23217,7 @@ glabel func0f048398
/* f0485b0: 8042a492 */ lb $v0,%lo(g_Vars+0x4d2)($v0)
/* f0485b4: 04400009 */ bltz $v0,.L0f0485dc
/* f0485b8: 00000000 */ nop
/* f0485bc: 0fc120b3 */ jal func0f0482cc
/* f0485bc: 0fc120b3 */ jal cutsceneStart
/* f0485c0: 24440c00 */ addiu $a0,$v0,0xc00
/* f0485c4: 240bffff */ addiu $t3,$zero,-1
/* f0485c8: 3c01800a */ lui $at,%hi(g_Vars+0x4d2)
@ -23677,7 +23677,7 @@ glabel func0f048398
/* f0485b0: 8042a492 */ lb $v0,%lo(g_Vars+0x4d2)($v0)
/* f0485b4: 04400009 */ bltz $v0,.L0f0485dc
/* f0485b8: 00000000 */ nop
/* f0485bc: 0fc120b3 */ jal func0f0482cc
/* f0485bc: 0fc120b3 */ jal cutsceneStart
/* f0485c0: 24440c00 */ addiu $a0,$v0,0xc00
/* f0485c4: 240bffff */ addiu $t3,$zero,-1
/* f0485c8: 3c01800a */ lui $at,%hi(g_Vars+0x4d2)
@ -24014,7 +24014,7 @@ glabel func0f048398
/* f047b18: 8042eb92 */ lb $v0,-0x146e($v0)
/* f047b1c: 04400009 */ bltz $v0,.NB0f047b44
/* f047b20: 00000000 */ sll $zero,$zero,0x0
/* f047b24: 0fc11e7c */ jal func0f0482cc
/* f047b24: 0fc11e7c */ jal cutsceneStart
/* f047b28: 24440c00 */ addiu $a0,$v0,0xc00
/* f047b2c: 3c02800a */ lui $v0,0x800a
/* f047b30: 2442e6c0 */ addiu $v0,$v0,-6464
@ -24368,7 +24368,7 @@ glabel func0f048398
// }
//
// if (g_Vars.autocutnum >= 0) {
// func0f0482cc(g_Vars.autocutnum + 0xc00);
// cutsceneStart(g_Vars.autocutnum + 0xc00);
// g_Vars.autocutnum = -1;
// g_Vars.autocutplaying = true;
// }

20
src/game/debug.c
View File

@ -16,9 +16,9 @@
* which functions are the same between beta and 1.0.
*/
s32 var80075d60 = 0x00000002;
u32 var80075d64 = 0x00000002;
u32 var80075d68 = 0x00000002;
s32 var80075d60 = 2;
s32 var80075d64 = 2;
s32 var80075d68 = 2;
u32 var80075d6c = 0x00000002;
u32 var80075d70 = 0x00000000;
bool g_DebugTurboMode = false;
@ -122,7 +122,7 @@ bool debugEnableBgRendering(void)
return true;
}
bool debugEnablePropRendering(void)
bool debugIsPropRenderingEnabled(void)
{
return true;
}
@ -217,7 +217,7 @@ bool debugForceAllObjectivesComplete(void)
return false;
}
bool debug0f11ee28(void)
bool debugIsZBufferDisabled(void)
{
return false;
}
@ -262,7 +262,7 @@ bool debug0f11ee68(void) // not called
return false;
}
u32 debugGetSlowMotion(void)
s32 debugGetSlowMotion(void)
{
return SLOWMOTION_OFF;
}
@ -277,12 +277,12 @@ bool debug0f11ee80(void) // not called
return false;
}
bool debug0f11ee88(void)
bool debugGetTilesDebugMode(void)
{
return false;
}
bool debug0f11ee90(void)
bool debugGetPadsDebugMode(void)
{
return false;
}
@ -347,7 +347,7 @@ bool debug0f11eef0(void) // not called
return false;
}
bool debugEnableFootsteps(void)
bool debugIsFootstepsEnabled(void)
{
return true;
}
@ -427,7 +427,7 @@ bool debug0f11ef70(void) // not called
return false;
}
bool debug0f11ef78(void)
bool debugIsChrStatsEnabled(void)
{
return false;
}

4
src/game/debug1.c
View File

@ -185,7 +185,7 @@ glabel dmenuNavigateDown
);
GLOBAL_ASM(
glabel dmenuNavigateLeft
glabel dmenuNavigateRight
/* f119080: 3c038008 */ lui $v1,0x8008
/* f119084: 8c638134 */ lw $v1,-0x7ecc($v1)
/* f119088: 3c088008 */ lui $t0,0x8008
@ -255,7 +255,7 @@ glabel dmenuNavigateLeft
);
GLOBAL_ASM(
glabel dmenuNavigateRight
glabel dmenuNavigateLeft
/* f119174: 3c038008 */ lui $v1,0x8008
/* f119178: 8c638134 */ lw $v1,-0x7ecc($v1)
/* f11917c: 3c078008 */ lui $a3,0x8008

903
src/game/debug2.c
View File

File diff suppressed because it is too large Load Diff

10
src/game/game_005fd0.c
View File

@ -153,7 +153,7 @@ glabel chrCheckFootstep
/* f0061e0: afbf004c */ sw $ra,0x4c($sp)
/* f0061e4: afb10048 */ sw $s1,0x48($sp)
/* f0061e8: 00808825 */ move $s1,$a0
/* f0061ec: 0fc47e7e */ jal debugEnableFootsteps
/* f0061ec: 0fc47e7e */ jal debugIsFootstepsEnabled
/* f0061f0: afb00044 */ sw $s0,0x44($sp)
/* f0061f4: 104000c2 */ beqz $v0,.PF0f006500
/* f0061f8: 24010001 */ li $at,0x1
@ -386,7 +386,7 @@ glabel chrCheckFootstep
/* f0061e0: afbf004c */ sw $ra,0x4c($sp)
/* f0061e4: afb10048 */ sw $s1,0x48($sp)
/* f0061e8: 00808825 */ or $s1,$a0,$zero
/* f0061ec: 0fc47bbe */ jal debugEnableFootsteps
/* f0061ec: 0fc47bbe */ jal debugIsFootstepsEnabled
/* f0061f0: afb00044 */ sw $s0,0x44($sp)
/* f0061f4: 104000c5 */ beqz $v0,.L0f00650c
/* f0061f8: 24010001 */ addiu $at,$zero,0x1
@ -622,7 +622,7 @@ glabel chrCheckFootstep
/* f005f30: afbf004c */ sw $ra,0x4c($sp)
/* f005f34: afb10048 */ sw $s1,0x48($sp)
/* f005f38: 00808825 */ or $s1,$a0,$zero
/* f005f3c: 0fc466d2 */ jal debugEnableFootsteps
/* f005f3c: 0fc466d2 */ jal debugIsFootstepsEnabled
/* f005f40: afb00044 */ sw $s0,0x44($sp)
/* f005f44: 104000c3 */ beqz $v0,.NB0f006254
/* f005f48: 24010001 */ addiu $at,$zero,0x1
@ -859,7 +859,7 @@ glabel chrCheckFootstep
// Mismatch: load of 10.0f into $at is swapped with load of prevframe from stack
//void chrCheckFootstep(struct chrdata *chr)
//{
// if (debugEnableFootsteps() && PLAYERCOUNT() == 1 && chr) {
// if (debugIsFootstepsEnabled() && PLAYERCOUNT() == 1 && chr) {
// chr->footstep = 0;
// chr->magicanim = -1;
// chr->magicframe = 0;
@ -927,7 +927,7 @@ void chrCheckFootstepMagic(struct chrdata *chr)
f32 zdiff;
s32 soundnum;
if (debugEnableFootsteps() && PLAYERCOUNT() == 1 && chr->magicanim >= 0) {
if (debugIsFootstepsEnabled() && PLAYERCOUNT() == 1 && chr->magicanim >= 0) {
#if VERSION >= VERSION_PAL_FINAL
chr->magicframe += g_Vars.lvupdate240freal * chr->magicspeed;
#else

12
src/game/game_0f09f0.c
View File

@ -21091,8 +21091,8 @@ glabel var7f1b2a64
/* f0f93d0: 0080f025 */ or $s8,$a0,$zero
/* f0f93d4: 15000005 */ bnez $t0,.L0f0f93ec
/* f0f93d8: afa20114 */ sw $v0,0x114($sp)
/* f0f93dc: 3c098006 */ lui $t1,%hi(var8005dd58)
/* f0f93e0: 8d29dd58 */ lw $t1,%lo(var8005dd58)($t1)
/* f0f93dc: 3c098006 */ lui $t1,%hi(g_MainIsDebugMenuOpen)
/* f0f93e0: 8d29dd58 */ lw $t1,%lo(g_MainIsDebugMenuOpen)($t1)
/* f0f93e4: 5120001e */ beqzl $t1,.L0f0f9460
/* f0f93e8: 90580e40 */ lbu $t8,0xe40($v0)
.L0f0f93ec:
@ -21929,7 +21929,7 @@ glabel var7f1b2a64
.L0f0f9fcc:
/* f0f9fcc: 8d8c1448 */ lw $t4,%lo(g_MpPlayerNum)($t4)
/* f0f9fd0: 3c0d800a */ lui $t5,%hi(g_Menus+0xe40)
/* f0f9fd4: 3c0f8006 */ lui $t7,%hi(var8005dd58)
/* f0f9fd4: 3c0f8006 */ lui $t7,%hi(g_MainIsDebugMenuOpen)
/* f0f9fd8: 000c58c0 */ sll $t3,$t4,0x3
/* f0f9fdc: 016c5823 */ subu $t3,$t3,$t4
/* f0f9fe0: 000b5880 */ sll $t3,$t3,0x2
@ -21942,7 +21942,7 @@ glabel var7f1b2a64
/* f0f9ffc: 000d77c2 */ srl $t6,$t5,0x1f
/* f0fa000: 55c00023 */ bnezl $t6,.L0f0fa090
/* f0fa004: 92e90668 */ lbu $t1,0x668($s7)
/* f0fa008: 8defdd58 */ lw $t7,%lo(var8005dd58)($t7)
/* f0fa008: 8defdd58 */ lw $t7,%lo(g_MainIsDebugMenuOpen)($t7)
/* f0fa00c: 8fb40128 */ lw $s4,0x128($sp)
/* f0fa010: 15e0001e */ bnez $t7,.L0f0fa08c
/* f0fa014: 32980001 */ andi $t8,$s4,0x1
@ -22265,7 +22265,7 @@ glabel var7f1b2a64
.L0f0fa498:
/* f0fa498: 8d6b1448 */ lw $t3,%lo(g_MpPlayerNum)($t3)
/* f0fa49c: 3c0d800a */ lui $t5,%hi(g_Menus+0xe40)
/* f0fa4a0: 3c0f8006 */ lui $t7,%hi(var8005dd58)
/* f0fa4a0: 3c0f8006 */ lui $t7,%hi(g_MainIsDebugMenuOpen)
/* f0fa4a4: 000b60c0 */ sll $t4,$t3,0x3
/* f0fa4a8: 018b6023 */ subu $t4,$t4,$t3
/* f0fa4ac: 000c6080 */ sll $t4,$t4,0x2
@ -22280,7 +22280,7 @@ glabel var7f1b2a64
/* f0fa4d0: 000d77c2 */ srl $t6,$t5,0x1f
/* f0fa4d4: 55c00005 */ bnezl $t6,.L0f0fa4ec
/* f0fa4d8: a3000014 */ sb $zero,0x14($t8)
/* f0fa4dc: 8defdd58 */ lw $t7,%lo(var8005dd58)($t7)
/* f0fa4dc: 8defdd58 */ lw $t7,%lo(g_MainIsDebugMenuOpen)($t7)
/* f0fa4e0: 51e00019 */ beqzl $t7,.L0f0fa548
/* f0fa4e4: 8fbf0044 */ lw $ra,0x44($sp)
/* f0fa4e8: a3000014 */ sb $zero,0x14($t8)

2
src/game/game_19aa80.c
View File

@ -679,7 +679,7 @@ glabel mpDetermineUnlockedFeatures
/* f195164: 10000006 */ beqz $zero,.NB0f195180
/* f195168: 26940001 */ addiu $s4,$s4,0x1
.NB0f19516c:
/* f19516c: 0fc466d5 */ jal debug0f119b54nb
/* f19516c: 0fc466d5 */ jal debugIsAllChallengesEnabled
/* f195170: 00000000 */ sll $zero,$zero,0x0
/* f195174: 50400003 */ beqzl $v0,.NB0f195184
/* f195178: 922e0004 */ lbu $t6,0x4($s1)

34
src/game/lv.c
View File

@ -1282,7 +1282,7 @@ glabel var7f1b1f68
/* f163418: afbf003c */ sw $ra,0x3c($sp)
/* f16341c: afb10038 */ sw $s1,0x38($sp)
/* f163420: 00808825 */ or $s1,$a0,$zero
/* f163424: 0fc46646 */ jal debug0f119918nb
/* f163424: 0fc46646 */ jal debugIsManPosEnabled
/* f163428: afb00034 */ sw $s0,0x34($sp)
/* f16342c: 104000f6 */ beqz $v0,.NB0f163808
/* f163430: 3c10800a */ lui $s0,0x800a
@ -1828,7 +1828,7 @@ glabel var7f1b8e7cpf
/* f16a378: 3c0f0600 */ lui $t7,0x600
/* f16a37c: ac4f0000 */ sw $t7,0x0($v0)
/* f16a380: ac580004 */ sw $t8,0x4($v0)
/* f16a384: 0fc47e4a */ jal debug0f11ee28
/* f16a384: 0fc47e4a */ jal debugIsZBufferDisabled
/* f16a388: 26730008 */ addiu $s3,$s3,0x8
/* f16a38c: 10400008 */ beqz $v0,.PF0f16a3b0
/* f16a390: 02601025 */ move $v0,$s3
@ -2321,7 +2321,7 @@ glabel var7f1b8e7cpf
/* f16aad8: ac4e0000 */ sw $t6,0x0($v0)
/* f16aadc: 8fac006c */ lw $t4,0x6c($sp)
/* f16aae0: 26730008 */ addiu $s3,$s3,0x8
/* f16aae4: 0fc47e4a */ jal debug0f11ee28
/* f16aae4: 0fc47e4a */ jal debugIsZBufferDisabled
/* f16aae8: ac4c0004 */ sw $t4,0x4($v0)
/* f16aaec: 10400009 */ beqz $v0,.PF0f16ab14
/* f16aaf0: 3c0f0600 */ lui $t7,0x600
@ -3459,11 +3459,11 @@ glabel var7f1b8e7cpf
/* f16bb44: 00402025 */ move $a0,$v0
/* f16bb48: 00409825 */ move $s3,$v0
.PF0f16bb4c:
/* f16bb4c: 0fc47e62 */ jal debug0f11ee88
/* f16bb4c: 0fc47e62 */ jal debugGetTilesDebugMode
/* f16bb50: 00000000 */ nop
/* f16bb54: 14400013 */ bnez $v0,.PF0f16bba4
/* f16bb58: 00000000 */ nop
/* f16bb5c: 0fc47e64 */ jal debug0f11ee90
/* f16bb5c: 0fc47e64 */ jal debugGetPadsDebugMode
/* f16bb60: 00000000 */ nop
/* f16bb64: 1440000f */ bnez $v0,.PF0f16bba4
/* f16bb68: 00000000 */ nop
@ -3475,7 +3475,7 @@ glabel var7f1b8e7cpf
/* f16bb80: 00000000 */ nop
/* f16bb84: 14400007 */ bnez $v0,.PF0f16bba4
/* f16bb88: 00000000 */ nop
/* f16bb8c: 0fc47e9e */ jal debug0f11ef78
/* f16bb8c: 0fc47e9e */ jal debugIsChrStatsEnabled
/* f16bb90: 00000000 */ nop
/* f16bb94: 14400003 */ bnez $v0,.PF0f16bba4
/* f16bb98: 00000000 */ nop
@ -3718,7 +3718,7 @@ Gfx *lvRender(Gfx *gdl)
|| (g_Vars.stagenum == STAGE_TEST_OLD && titleIsKeepingMode())) {
gSPDisplayList(gdl++, &var800613a0);
if (debug0f11ee28()) {
if (debugIsZBufferDisabled()) {
gSPDisplayList(gdl++, &var80061360);
} else {
gSPDisplayList(gdl++, &var80061380);
@ -3843,7 +3843,7 @@ Gfx *lvRender(Gfx *gdl)
gSPDisplayList(gdl++, &var800613a0);
if (debug0f11ee28()) {
if (debugIsZBufferDisabled()) {
gSPDisplayList(gdl++, &var80061360);
} else {
gSPDisplayList(gdl++, &var80061380);
@ -4290,11 +4290,11 @@ Gfx *lvRender(Gfx *gdl)
gdl = frRenderHud(gdl);
}
if (debug0f11ee88() == 0
&& debug0f11ee90() == 0
if (debugGetTilesDebugMode() == 0
&& debugGetPadsDebugMode() == 0
&& debug0f11eea8() == 0
&& debug0f11ef80() == 0
&& debug0f11ef78() == 0) {
&& !debugIsChrStatsEnabled()) {
debug0f11ee40();
}
@ -4430,7 +4430,7 @@ glabel var7f1b1fd4nb
/* f1640c4: 3c0f0600 */ lui $t7,0x600
/* f1640c8: ac4f0000 */ sw $t7,0x0($v0)
/* f1640cc: ac580004 */ sw $t8,0x4($v0)
/* f1640d0: 0fc4666a */ jal debug0f11ee28
/* f1640d0: 0fc4666a */ jal debugIsZBufferDisabled
/* f1640d4: 26730008 */ addiu $s3,$s3,0x8
/* f1640d8: 10400008 */ beqz $v0,.NB0f1640fc
/* f1640dc: 02601025 */ or $v0,$s3,$zero
@ -4906,7 +4906,7 @@ glabel var7f1b1fd4nb
/* f1647dc: ac590000 */ sw $t9,0x0($v0)
/* f1647e0: 8fab006c */ lw $t3,0x6c($sp)
/* f1647e4: 26730008 */ addiu $s3,$s3,0x8
/* f1647e8: 0fc4666a */ jal debug0f11ee28
/* f1647e8: 0fc4666a */ jal debugIsZBufferDisabled
/* f1647ec: ac4b0004 */ sw $t3,0x4($v0)
/* f1647f0: 10400009 */ beqz $v0,.NB0f164818
/* f1647f4: 3c0e0600 */ lui $t6,0x600
@ -6196,11 +6196,11 @@ glabel var7f1b1fd4nb
/* f165a8c: 00402025 */ or $a0,$v0,$zero
/* f165a90: 00409825 */ or $s3,$v0,$zero
.NB0f165a94:
/* f165a94: 0fc46697 */ jal debug0f11ee88
/* f165a94: 0fc46697 */ jal debugGetTilesDebugMode
/* f165a98: 00000000 */ sll $zero,$zero,0x0
/* f165a9c: 54400016 */ bnezl $v0,.NB0f165af8
/* f165aa0: 8e4d0284 */ lw $t5,0x284($s2)
/* f165aa4: 0fc4669a */ jal debug0f11ee90
/* f165aa4: 0fc4669a */ jal debugGetPadsDebugMode
/* f165aa8: 00000000 */ sll $zero,$zero,0x0
/* f165aac: 54400012 */ bnezl $v0,.NB0f165af8
/* f165ab0: 8e4d0284 */ lw $t5,0x284($s2)
@ -6212,7 +6212,7 @@ glabel var7f1b1fd4nb
/* f165ac8: 00000000 */ sll $zero,$zero,0x0
/* f165acc: 5440000a */ bnezl $v0,.NB0f165af8
/* f165ad0: 8e4d0284 */ lw $t5,0x284($s2)
/* f165ad4: 0fc466ed */ jal debug0f11ef78
/* f165ad4: 0fc466ed */ jal debugIsChrStatsEnabled
/* f165ad8: 00000000 */ sll $zero,$zero,0x0
/* f165adc: 54400006 */ bnezl $v0,.NB0f165af8
/* f165ae0: 8e4d0284 */ lw $t5,0x284($s2)
@ -6261,7 +6261,7 @@ glabel var7f1b1fd4nb
/* f165b7c: 5684fff7 */ bnel $s4,$a0,.NB0f165b5c
/* f165b80: 02a02825 */ or $a1,$s5,$zero
.NB0f165b84:
/* f165b84: 0fc466ed */ jal debug0f11ef78
/* f165b84: 0fc466ed */ jal debugIsChrStatsEnabled
/* f165b88: 00000000 */ sll $zero,$zero,0x0
/* f165b8c: 10400004 */ beqz $v0,.NB0f165ba0
/* f165b90: 02602025 */ or $a0,$s3,$zero

2
src/game/mainmenu.c
View File

@ -1870,7 +1870,7 @@ glabel menuhandlerCoopBuddy
/* f10010c: 00000000 */ sll $zero,$zero,0x0
/* f100110: 24080001 */ addiu $t0,$zero,0x1
.NB0f100114:
/* f100114: 0fc466d8 */ jal debug0f119b60nb
/* f100114: 0fc466d8 */ jal debugIsAllBuddiesEnabled
/* f100118: afa80030 */ sw $t0,0x30($sp)
/* f10011c: 10400002 */ beqz $v0,.NB0f100128
/* f100120: 8fa80030 */ lw $t0,0x30($sp)

2
src/game/training/training.c
View File

@ -206,7 +206,7 @@ bool frIsWeaponAvailable(s32 weapon)
}
#if VERSION < VERSION_NTSC_1_0
if (debugAllFrWeapons() && weapon <= WEAPON_XRAYSCANNER) {
if (debugIsAllTrainingEnabled() && weapon <= WEAPON_XRAYSCANNER) {
return true;
}
#endif

6
src/include/data.h
View File

@ -31,7 +31,7 @@ extern u32 var8005cf84;
extern u8 g_LoadType;
extern s32 g_MainIsEndscreen;
extern s32 var8005dd18;
extern u32 var8005dd58;
extern bool g_MainIsDebugMenuOpen;
extern bool g_SndDisabled;
extern u16 g_SfxVolume;
extern s32 g_SoundMode;
@ -324,8 +324,8 @@ extern struct filelist *g_FileLists[];
extern bool var80075bd0[];
extern struct var80075c00 var80075c00[];
extern s32 var80075d60;
extern u32 var80075d64;
extern u32 var80075d68;
extern s32 var80075d64;
extern s32 var80075d68;
extern s32 var80075d78;
extern u8 unregistered_function1[];
extern u8 unregistered_function2[];

2
src/include/game/chr/chraction.h
View File

@ -178,7 +178,7 @@ void chrTickPatrol(struct chrdata *chr);
bool chrStartSkJump(struct chrdata *chr, u8 arg1, u8 arg2, s32 arg3, u8 arg4);
void chrTickSkJump(struct chrdata *chr);
void chrTick(struct chrdata *chr);
void func0f0482cc(u32 ailistid);
void cutsceneStart(u32 ailistid);
void func0f048398(void);
f32 chrGetAngleToPos(struct chrdata *chr, struct coord *pos);
void chrGetAttackEntityPos(struct chrdata *chr, u32 attackflags, s32 entityid, struct coord *pos, s16 *rooms);

26
src/include/game/debug.h
View File

@ -7,31 +7,37 @@
u32 dprint();
s32 debug0f11ed70(void);
bool debugEnableBgRendering(void);
bool debugEnablePropRendering(void);
bool debugIsPropRenderingEnabled(void);
bool debug0f11edb0(void);
bool debug0f11edb8(void);
bool debugIsRoomStateDebugEnabled(void);
s32 debugIsTurboModeEnabled(void);
bool debugForceAllObjectivesComplete(void);
bool debug0f11ee28(void);
bool debugIsZBufferDisabled(void);
bool debug0f11ee40(void);
u32 debugGetSlowMotion(void);
bool debug0f11ee88(void);
bool debug0f11ee90(void);
s32 debugGetSlowMotion(void);
s32 debugGetTilesDebugMode(void);
s32 debugGetPadsDebugMode(void);
bool debug0f11eea8(void);
bool debugDangerousProps(void);
s32 debugGetMotionBlur(void);
bool debugEnableFootsteps(void);
bool debugIsFootstepsEnabled(void);
bool debugAllowEndLevel(void);
bool debug0f11ef78(void);
bool debugIsChrStatsEnabled(void);
bool debug0f11ef80(void);
s32 dmenuGetSelectedOption(void);
void dmenuNavigateRight(void);
void dmenuNavigateLeft(void);
void dmenuNavigateUp(void);
void dmenuNavigateDown(void);
Gfx *dmenuRender(Gfx *gdl);
void debugTick(void);
s32 debug0f11946cnb(s8 stickx, s8 sticky, u16 buttons, u16 buttonsthisframe);
void debugUpdateMenu(void);
bool debugProcessInput(s8 stickx, s8 sticky, u16 buttons, u16 buttonsthisframe);
bool debugIsLineModeEnabled(void);
extern u32 var800786f4nb;
extern s32 var800786f4nb;
extern s32 g_DebugMenuPositions[][2];
extern char *g_DebugMenuLabels[];

2
src/include/lib/vm.h
View File

@ -4,6 +4,8 @@
#include "data.h"
#include "types.h"
extern u8 g_VmShowStats;
u32 vmInit(void);
#endif

2
src/lib/lib_13790.c
View File

@ -537,7 +537,7 @@ glabel func000137ec
#endif
#if VERSION >= VERSION_NTSC_1_0
void func000137fc(s32 arg0)
void func000137fc(char *text)
{
// empty
}

18
src/lib/main.c
View File

@ -1695,7 +1695,7 @@ u32 var8005dd48 = 0x00000000;
u32 var8005dd4c = 0x00000000;
u32 var8005dd50 = 0x00000000;
s32 g_MainChangeToStageNum = -1;
u32 var8005dd58 = 0x00000000;
bool g_MainIsDebugMenuOpen = false;
#if VERSION < VERSION_NTSC_1_0
GLOBAL_ASM(
@ -2770,7 +2770,7 @@ glabel mainTick
/* ea60: 01402025 */ or $a0,$t2,$zero
/* ea64: 83a5003b */ lb $a1,0x3b($sp)
/* ea68: 3206ffff */ andi $a2,$s0,0xffff
/* ea6c: 0fc4651b */ jal debug0f11946cnb
/* ea6c: 0fc4651b */ jal debugProcessInput
/* ea70: 3047ffff */ andi $a3,$v0,0xffff
/* ea74: 3c018006 */ lui $at,0x8006
/* ea78: 10000021 */ beqz $zero,.NB0000eb00
@ -2805,7 +2805,7 @@ glabel mainTick
/* eae4: 01a02025 */ or $a0,$t5,$zero
/* eae8: 83a5003b */ lb $a1,0x3b($sp)
/* eaec: 3206ffff */ andi $a2,$s0,0xffff
/* eaf0: 0fc4651b */ jal debug0f11946cnb
/* eaf0: 0fc4651b */ jal debugProcessInput
/* eaf4: 3047ffff */ andi $a3,$v0,0xffff
/* eaf8: 3c018006 */ lui $at,0x8006
/* eafc: ac22f678 */ sw $v0,-0x988($at)
@ -3005,7 +3005,7 @@ glabel mainTick
/* edc8: 8d6bf678 */ lw $t3,-0x988($t3)
/* edcc: 51600007 */ beqzl $t3,.NB0000edec
/* edd0: 8fac0094 */ lw $t4,0x94($sp)
/* edd4: 0fc4649c */ jal debugTick
/* edd4: 0fc4649c */ jal debugUpdateMenu
/* edd8: 00000000 */ sll $zero,$zero,0x0
/* eddc: 0fc4633d */ jal dmenuRender
/* ede0: 8fa40094 */ lw $a0,0x94($sp)
@ -3090,13 +3090,13 @@ u32 var8005f690nb[] = {
// gDPSetTile(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_4b, 0, 0x0100, 6, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
//
// // If menu is open (?) or player has pressed C down + C up
// if (var8005dd58 || joyGetButtons(0, U_CBUTTONS | D_CBUTTONS) == (U_CBUTTONS | D_CBUTTONS)) {
// if (g_MainIsDebugMenuOpen || joyGetButtons(0, U_CBUTTONS | D_CBUTTONS) == (U_CBUTTONS | D_CBUTTONS)) {
// stickx = joyGetStickX(0);
// sticky = joyGetStickY(0);
// buttons = joyGetButtons(0, 0xffff);
// buttonsthisframe = joyGetButtonsPressedThisFrame(0, 0xffff);
//
// var8005dd58 = debug0f11946cnb(stickx, sticky, buttons, buttonsthisframe);
// g_MainIsDebugMenuOpen = debugProcessInput(stickx, sticky, buttons, buttonsthisframe);
// } else if (joyGetButtons(0, START_BUTTON) == 0) {
// var80075d68 = var800786f4nb;
// } else {
@ -3105,7 +3105,7 @@ u32 var8005f690nb[] = {
// buttons = joyGetButtons(0, 0xffff);
// buttonsthisframe = joyGetButtonsPressedThisFrame(0, 0xffff);
//
// var8005dd58 = debug0f11946cnb(stickx, sticky, buttons, buttonsthisframe);
// g_MainIsDebugMenuOpen = debugProcessInput(stickx, sticky, buttons, buttonsthisframe);
// }
//
// lvTick();
@ -3146,8 +3146,8 @@ u32 var8005f690nb[] = {
// gdl = profileRender(gdl);
// }
//
// if (var8005dd58) {
// debugTick();
// if (g_MainIsDebugMenuOpen) {
// debugUpdateMenu();
// gdl = dmenuRender(gdl);
// }
//

8
src/lib/vi.c
View File

@ -2200,22 +2200,22 @@ Gfx *viSetFillColour(Gfx *gdl, s32 r, s32 g, s32 b)
return gdl;
}
void vi0000bf8c(void)
void viGrabJpg16(void)
{
// empty
}
void vi0000bf94(void)
void viGrabJpg32(void)
{
// empty
}
void vi0000bf9c(void)
void viGrabRgb16(void)
{
// empty
}
void vi0000bfa4(void)
void viGrabRgb32(void)
{
// empty
}

3
src/lib/vm.c
View File

@ -18,7 +18,8 @@ u32 var80090b08;
u32 var80090b0c;
#if VERSION < VERSION_NTSC_1_0
u8 fillnb[0x0c] = {0};
u8 g_VmShowStats = false;
u32 fillnb[2] = {0};
#endif
u32 var8005cf80 = 0;