From 91245f09b3ef8e080ed7dbdcee17fd24f378ceb4 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 23 Mar 2020 21:00:01 +1000 Subject: [PATCH] Decompile 76 stubbed debug functions --- src/game/bondgrab.c | 2 +- src/game/bondwalk.c | 4 +- src/game/chr/chraction.c | 2 +- src/game/chr/chraicommands.c | 2 +- src/game/game_005fd0.c | 4 +- src/game/game_095320.c | 2 +- src/game/game_11ecf0.c | 598 +++++++++++++++++++++------------ src/game/game_157db0.c | 16 +- src/game/game_167ae0.c | 22 +- src/game/propobj.c | 6 +- src/include/game/game_11ecf0.h | 40 ++- src/lib/lib_0d520.c | 2 +- 12 files changed, 432 insertions(+), 268 deletions(-) diff --git a/src/game/bondgrab.c b/src/game/bondgrab.c index 7e312c93c..02900787e 100644 --- a/src/game/bondgrab.c +++ b/src/game/bondgrab.c @@ -2221,7 +2221,7 @@ glabel var7f1ada2c /* f0cebdc: 460a2200 */ add.s $f8,$f4,$f10 /* f0cebe0: 0fc32ed2 */ jal currentPlayerUpdateMoveInitSpeed /* f0cebe4: e7a8007c */ swc1 $f8,0x7c($sp) -/* f0cebe8: 0fc47b82 */ jal func0f11ee08 +/* f0cebe8: 0fc47b82 */ jal debug0f11ee08 /* f0cebec: 00000000 */ sll $zero,$zero,0x0 /* f0cebf0: 3c08800a */ lui $t0,%hi(g_Vars) /* f0cebf4: 1040001f */ beqz $v0,.L0f0cec74 diff --git a/src/game/bondwalk.c b/src/game/bondwalk.c index 002e54cd0..50b4e7afc 100644 --- a/src/game/bondwalk.c +++ b/src/game/bondwalk.c @@ -1900,7 +1900,7 @@ glabel var7f1ad7d0 /* f0c5758: c44e0080 */ lwc1 $f14,0x80($v0) /* f0c575c: e7a20090 */ swc1 $f2,0x90($sp) /* f0c5760: afa00104 */ sw $zero,0x104($sp) -/* f0c5764: 0fc47b82 */ jal func0f11ee08 +/* f0c5764: 0fc47b82 */ jal debug0f11ee08 /* f0c5768: e7ae008c */ swc1 $f14,0x8c($sp) /* f0c576c: 8fa30104 */ lw $v1,0x104($sp) /* f0c5770: c7ae008c */ lwc1 $f14,0x8c($sp) @@ -3511,7 +3511,7 @@ glabel var7f1ad854 /* f0c7074: e7aa00cc */ swc1 $f10,0xcc($sp) /* f0c7078: 0fc32ed2 */ jal currentPlayerUpdateMoveInitSpeed /* f0c707c: e7a600d4 */ swc1 $f6,0xd4($sp) -/* f0c7080: 0fc47b82 */ jal func0f11ee08 +/* f0c7080: 0fc47b82 */ jal debug0f11ee08 /* f0c7084: 00000000 */ sll $zero,$zero,0x0 /* f0c7088: 3c08800a */ lui $t0,%hi(g_Vars) /* f0c708c: 1040001f */ beqz $v0,.L0f0c710c diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c index fef54280c..939aaf279 100644 --- a/src/game/chr/chraction.c +++ b/src/game/chr/chraction.c @@ -27727,7 +27727,7 @@ glabel func0f048398 /* f04858c: 3c018007 */ lui $at,%hi(var80068454) /* f048590: ac208454 */ sw $zero,%lo(var80068454)($at) .L0f048594: -/* f048594: 0fc47bac */ jal func0f11eeb0 +/* f048594: 0fc47bac */ jal debug0f11eeb0 /* f048598: 00000000 */ sll $zero,$zero,0x0 /* f04859c: 10400003 */ beqz $v0,.L0f0485ac /* f0485a0: 00000000 */ sll $zero,$zero,0x0 diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 554039ed8..dd182fc1b 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -5325,7 +5325,7 @@ bool aiNoOp00db(void) */ bool aiEndLevel(void) { - if (func0f11ef48()) { + if (debugAllowEndLevel()) { if (var800624a4) { func0000e95c(90); } else if (g_Vars.unk0004d3) { diff --git a/src/game/game_005fd0.c b/src/game/game_005fd0.c index bc32116ee..2ae78abdd 100644 --- a/src/game/game_005fd0.c +++ b/src/game/game_005fd0.c @@ -158,7 +158,7 @@ glabel func0f0061dc /* f0061e0: afbf004c */ sw $ra,0x4c($sp) /* f0061e4: afb10048 */ sw $s1,0x48($sp) /* f0061e8: 00808825 */ or $s1,$a0,$zero -/* f0061ec: 0fc47bbe */ jal func0f11eef8 +/* f0061ec: 0fc47bbe */ jal debug0f11eef8 /* f0061f0: afb00044 */ sw $s0,0x44($sp) /* f0061f4: 104000c5 */ beqz $v0,.L0f00650c /* f0061f8: 24010001 */ addiu $at,$zero,0x1 @@ -402,7 +402,7 @@ glabel var7f1a7e6c /* f006534: afb00048 */ sw $s0,0x48($sp) /* f006538: 8dc700bc */ lw $a3,0xbc($t6) /* f00653c: 00808025 */ or $s0,$a0,$zero -/* f006540: 0fc47bbe */ jal func0f11eef8 +/* f006540: 0fc47bbe */ jal debug0f11eef8 /* f006544: afa70050 */ sw $a3,0x50($sp) /* f006548: 3c05800a */ lui $a1,%hi(g_Vars) /* f00654c: 24a59fc0 */ addiu $a1,$a1,%lo(g_Vars) diff --git a/src/game/game_095320.c b/src/game/game_095320.c index 676a03e15..46c8f869e 100644 --- a/src/game/game_095320.c +++ b/src/game/game_095320.c @@ -638,7 +638,7 @@ glabel var7f1ab7f4 /* f095b20: 5461fef5 */ bnel $v1,$at,.L0f0956f8 /* f095b24: 246effe9 */ addiu $t6,$v1,-23 .L0f095b28: -/* f095b28: 0fc47b88 */ jal func0f11ee20 +/* f095b28: 0fc47b88 */ jal debug0f11ee20 /* f095b2c: 00000000 */ sll $zero,$zero,0x0 /* f095b30: 10400002 */ beqz $v0,.L0f095b3c /* f095b34: 8fb00018 */ lw $s0,0x18($sp) diff --git a/src/game/game_11ecf0.c b/src/game/game_11ecf0.c index d1c91be1c..e63cc9ba0 100644 --- a/src/game/game_11ecf0.c +++ b/src/game/game_11ecf0.c @@ -43,276 +43,443 @@ u32 var80075dd4 = 0x00000000; u32 var80075dd8 = 0x3f800000; u32 var80075ddc = 0x00000000; -GLOBAL_ASM( -glabel func0f11ecf0 -/* f11ecf0: 03e00008 */ jr $ra -/* f11ecf4: afa40000 */ sw $a0,0x0($sp) -/* f11ecf8: afa40000 */ sw $a0,0x0($sp) -/* f11ecfc: afa50004 */ sw $a1,0x4($sp) -/* f11ed00: 03e00008 */ jr $ra -/* f11ed04: afa60008 */ sw $a2,0x8($sp) -/* f11ed08: 03e00008 */ jr $ra -/* f11ed0c: 00801025 */ or $v0,$a0,$zero -/* f11ed10: afa40000 */ sw $a0,0x0($sp) -/* f11ed14: afa50004 */ sw $a1,0x4($sp) -/* f11ed18: 03e00008 */ jr $ra -/* f11ed1c: afa60008 */ sw $a2,0x8($sp) -/* f11ed20: 03e00008 */ jr $ra -/* f11ed24: 00001025 */ or $v0,$zero,$zero -/* f11ed28: 03e00008 */ jr $ra -/* f11ed2c: afa40000 */ sw $a0,0x0($sp) -/* f11ed30: 03e00008 */ jr $ra -/* f11ed34: 00000000 */ sll $zero,$zero,0x0 -/* f11ed38: 03e00008 */ jr $ra -/* f11ed3c: 00000000 */ sll $zero,$zero,0x0 -/* f11ed40: 03e00008 */ jr $ra -/* f11ed44: 00000000 */ sll $zero,$zero,0x0 -/* f11ed48: 03e00008 */ jr $ra -/* f11ed4c: 00000000 */ sll $zero,$zero,0x0 -/* f11ed50: 03e00008 */ jr $ra -/* f11ed54: 00000000 */ sll $zero,$zero,0x0 -/* f11ed58: afa40000 */ sw $a0,0x0($sp) -/* f11ed5c: afa50004 */ sw $a1,0x4($sp) -/* f11ed60: afa60008 */ sw $a2,0x8($sp) -/* f11ed64: afa7000c */ sw $a3,0xc($sp) -/* f11ed68: 03e00008 */ jr $ra -/* f11ed6c: 00001025 */ or $v0,$zero,$zero -); +void debug0f11ecf0(s32 arg0) +{ + // empty +} -bool func0f11ed70(void) +void debug0f11ecf8(s32 arg0, s32 arg1, s32 arg2) +{ + // empty +} + +s32 debug0f11ed08(s32 arg0) +{ + return arg0; +} + +void debug0f11ed10(s32 arg0, s32 arg1, s32 arg2) +{ + // empty +} + +bool debug0f11ed20(void) { return false; } -bool func0f11ed78(void) +void debug0f11ed28(s32 arg0) +{ + // empty +} + +void debug0f11ed30(void) +{ + // empty +} + +void debug0f11ed38(void) +{ + // empty +} + +void debug0f11ed40(void) +{ + // empty +} + +void debug0f11ed48(void) +{ + // empty +} + +void debug0f11ed50(void) +{ + // empty +} + +bool debug0f11ed58(s32 arg0, s32 arg1, s32 arg2, s32 arg3) +{ + return false; +} + +bool debug0f11ed70(void) +{ + return false; +} + +bool debug0f11ed78(void) { return true; } -GLOBAL_ASM( -glabel func0f11ed80 -/* f11ed80: 03e00008 */ jr $ra -/* f11ed84: 24020001 */ addiu $v0,$zero,0x1 -/* f11ed88: 03e00008 */ jr $ra -/* f11ed8c: 00001025 */ or $v0,$zero,$zero -/* f11ed90: 03e00008 */ jr $ra -/* f11ed94: 00001025 */ or $v0,$zero,$zero -/* f11ed98: 03e00008 */ jr $ra -/* f11ed9c: afa40000 */ sw $a0,0x0($sp) -/* f11eda0: 03e00008 */ jr $ra -/* f11eda4: 00001025 */ or $v0,$zero,$zero -/* f11eda8: 03e00008 */ jr $ra -/* f11edac: 00001025 */ or $v0,$zero,$zero -); +bool debug0f11ed80(void) +{ + return true; +} -bool func0f11edb0(void) +bool debug0f11ed88(void) { return false; } -bool func0f11edb8(void) +bool debug0f11ed90(void) { return false; } -GLOBAL_ASM( -glabel func0f11edc0 -/* f11edc0: 03e00008 */ jr $ra -/* f11edc4: 00001025 */ or $v0,$zero,$zero -/* f11edc8: 3c028007 */ lui $v0,%hi(var80075d70) -/* f11edcc: 03e00008 */ jr $ra -/* f11edd0: 8c425d70 */ lw $v0,%lo(var80075d70)($v0) -/* f11edd4: 3c018007 */ lui $at,%hi(var80075d70) -/* f11edd8: 03e00008 */ jr $ra -/* f11eddc: ac245d70 */ sw $a0,%lo(var80075d70)($at) -/* f11ede0: 03e00008 */ jr $ra -/* f11ede4: 00001025 */ or $v0,$zero,$zero -/* f11ede8: 03e00008 */ jr $ra -/* f11edec: 00001025 */ or $v0,$zero,$zero -/* f11edf0: 03e00008 */ jr $ra -/* f11edf4: 00001025 */ or $v0,$zero,$zero -/* f11edf8: 03e00008 */ jr $ra -/* f11edfc: 00000000 */ sll $zero,$zero,0x0 -/* f11ee00: 03e00008 */ jr $ra -/* f11ee04: 00000000 */ sll $zero,$zero,0x0 -); +void debug0f11ed98(s32 arg0) +{ + // empty +} -GLOBAL_ASM( -glabel func0f11ee08 -/* f11ee08: 3c028007 */ lui $v0,%hi(var80075d74) -/* f11ee0c: 03e00008 */ jr $ra -/* f11ee10: 8c425d74 */ lw $v0,%lo(var80075d74)($v0) -/* f11ee14: 3c018007 */ lui $at,%hi(var80075d74) -/* f11ee18: 03e00008 */ jr $ra -/* f11ee1c: ac245d74 */ sw $a0,%lo(var80075d74)($at) -); - -bool func0f11ee20(void) +bool debug0f11eda0(void) { return false; } -GLOBAL_ASM( -glabel func0f11ee28 -/* f11ee28: 03e00008 */ jr $ra -/* f11ee2c: 00001025 */ or $v0,$zero,$zero -/* f11ee30: 03e00008 */ jr $ra -/* f11ee34: 00001025 */ or $v0,$zero,$zero -/* f11ee38: 03e00008 */ jr $ra -/* f11ee3c: 00001025 */ or $v0,$zero,$zero -); +bool debug0f11eda8(void) +{ + return false; +} -GLOBAL_ASM( -glabel func0f11ee40 -/* f11ee40: 03e00008 */ jr $ra -/* f11ee44: 00001025 */ or $v0,$zero,$zero -/* f11ee48: 03e00008 */ jr $ra -/* f11ee4c: 00001025 */ or $v0,$zero,$zero -/* f11ee50: 03e00008 */ jr $ra -/* f11ee54: 00001025 */ or $v0,$zero,$zero -/* f11ee58: 03e00008 */ jr $ra -/* f11ee5c: 00001025 */ or $v0,$zero,$zero -/* f11ee60: 03e00008 */ jr $ra -/* f11ee64: 00001025 */ or $v0,$zero,$zero -/* f11ee68: 03e00008 */ jr $ra -/* f11ee6c: 00001025 */ or $v0,$zero,$zero -); +bool debug0f11edb0(void) +{ + return false; +} + +bool debug0f11edb8(void) +{ + return false; +} + +bool debug0f11edc0(void) +{ + return false; +} + +s32 debug0f11edc8(void) +{ + return var80075d70; +} + +void debug0f11edd4(s32 arg0) +{ + var80075d70 = arg0; +} + +bool debug0f11ede0(void) +{ + return false; +} + +bool debug0f11ede8(void) +{ + return false; +} + +bool debug0f11edf0(void) +{ + return false; +} + +void debug0f11edf8(void) +{ + // empty +} + +void debug0f11ee00(void) +{ + // empty +} + +s32 debug0f11ee08(void) +{ + return var80075d74; +} + +void debug0f11ee14(s32 arg0) +{ + var80075d74 = arg0; +} + +bool debug0f11ee20(void) +{ + return false; +} + +bool debug0f11ee28(void) +{ + return false; +} + +bool debug0f11ee30(void) +{ + return false; +} + +bool debug0f11ee38(void) +{ + return false; +} + +bool debug0f11ee40(void) +{ + return false; +} + +bool debug0f11ee48(void) +{ + return false; +} + +bool debug0f11ee50(void) +{ + return false; +} + +bool debug0f11ee58(void) +{ + return false; +} + +bool debug0f11ee60(void) +{ + return false; +} + +bool debug0f11ee68(void) +{ + return false; +} u32 debugGetSlowMotion(void) { return SLOWMOTION_OFF; } -GLOBAL_ASM( -glabel func0f11ee78 -/* f11ee78: 03e00008 */ jr $ra -/* f11ee7c: 00001025 */ or $v0,$zero,$zero -/* f11ee80: 03e00008 */ jr $ra -/* f11ee84: 00001025 */ or $v0,$zero,$zero -); - -bool func0f11ee88(void) +bool debug0f11ee78(void) { return false; } -GLOBAL_ASM( -glabel func0f11ee90 -/* f11ee90: 03e00008 */ jr $ra -/* f11ee94: 00001025 */ or $v0,$zero,$zero -/* f11ee98: 03e00008 */ jr $ra -/* f11ee9c: 00001025 */ or $v0,$zero,$zero -/* f11eea0: 03e00008 */ jr $ra -/* f11eea4: 00001025 */ or $v0,$zero,$zero -); - -bool func0f11eea8(void) +bool debug0f11ee80(void) { return false; } -GLOBAL_ASM( -glabel func0f11eeb0 -/* f11eeb0: 03e00008 */ jr $ra -/* f11eeb4: 00001025 */ or $v0,$zero,$zero -/* f11eeb8: 03e00008 */ jr $ra -/* f11eebc: 00001025 */ or $v0,$zero,$zero -/* f11eec0: 03e00008 */ jr $ra -/* f11eec4: 00001025 */ or $v0,$zero,$zero -/* f11eec8: 03e00008 */ jr $ra -/* f11eecc: 00001025 */ or $v0,$zero,$zero -/* f11eed0: 03e00008 */ jr $ra -/* f11eed4: 00001025 */ or $v0,$zero,$zero -); +bool debug0f11ee88(void) +{ + return false; +} -GLOBAL_ASM( -glabel func0f11eed8 -/* f11eed8: 03e00008 */ jr $ra -/* f11eedc: 00001025 */ or $v0,$zero,$zero -/* f11eee0: 03e00008 */ jr $ra -/* f11eee4: 00001025 */ or $v0,$zero,$zero -); +bool debug0f11ee90(void) +{ + return false; +} + +bool debug0f11ee98(void) +{ + return false; +} + +bool debug0f11eea0(void) +{ + return false; +} + +bool debug0f11eea8(void) +{ + return false; +} + +bool debug0f11eeb0(void) +{ + return false; +} + +bool debug0f11eeb8(void) +{ + return false; +} + +bool debug0f11eec0(void) +{ + return false; +} + +bool debug0f11eec8(void) +{ + return false; +} + +bool debug0f11eed0(void) +{ + return false; +} + +bool debug0f11eed8(void) +{ + return false; +} + +bool debug0f11eee0(void) +{ + return false; +} u32 dprint() { return 0; } -bool func0f11eef0(void) +bool debug0f11eef0(void) { return false; } -GLOBAL_ASM( -glabel func0f11eef8 -/* f11eef8: 03e00008 */ jr $ra -/* f11eefc: 24020001 */ addiu $v0,$zero,0x1 -/* f11ef00: 03e00008 */ jr $ra -/* f11ef04: 00001025 */ or $v0,$zero,$zero -/* f11ef08: 03e00008 */ jr $ra -/* f11ef0c: 00001025 */ or $v0,$zero,$zero -/* f11ef10: 03e00008 */ jr $ra -/* f11ef14: 00001025 */ or $v0,$zero,$zero -/* f11ef18: 03e00008 */ jr $ra -/* f11ef1c: 00001025 */ or $v0,$zero,$zero -/* f11ef20: 03e00008 */ jr $ra -/* f11ef24: 00001025 */ or $v0,$zero,$zero -/* f11ef28: 03e00008 */ jr $ra -/* f11ef2c: 00001025 */ or $v0,$zero,$zero -/* f11ef30: 03e00008 */ jr $ra -/* f11ef34: 00001025 */ or $v0,$zero,$zero -/* f11ef38: 03e00008 */ jr $ra -/* f11ef3c: 00001025 */ or $v0,$zero,$zero -/* f11ef40: 03e00008 */ jr $ra -/* f11ef44: 00001025 */ or $v0,$zero,$zero -); +bool debug0f11eef8(void) +{ + return true; +} -GLOBAL_ASM( -glabel func0f11ef48 -/* f11ef48: 03e00008 */ jr $ra -/* f11ef4c: 24020001 */ addiu $v0,$zero,0x1 -/* f11ef50: 03e00008 */ jr $ra -/* f11ef54: 00001025 */ or $v0,$zero,$zero -/* f11ef58: 03e00008 */ jr $ra -/* f11ef5c: 00001025 */ or $v0,$zero,$zero -/* f11ef60: 03e00008 */ jr $ra -/* f11ef64: 00001025 */ or $v0,$zero,$zero -/* f11ef68: 03e00008 */ jr $ra -/* f11ef6c: 00001025 */ or $v0,$zero,$zero -/* f11ef70: 03e00008 */ jr $ra -/* f11ef74: 00001025 */ or $v0,$zero,$zero -); - -bool func0f11ef78(void) +bool debug0f11ef00(void) { return false; } +bool debug0f11ef08(void) +{ + return false; +} + +bool debug0f11ef10(void) +{ + return false; +} + +bool debug0f11ef18(void) +{ + return false; +} + +bool debug0f11ef20(void) +{ + return false; +} + +bool debug0f11ef28(void) +{ + return false; +} + +bool debug0f11ef30(void) +{ + return false; +} + +bool debug0f11ef38(void) +{ + return false; +} + +bool debug0f11ef40(void) +{ + return false; +} + +bool debugAllowEndLevel(void) +{ + return true; +} + +bool debug0f11ef50(void) +{ + return false; +} + +bool debug0f11ef58(void) +{ + return false; +} + +bool debug0f11ef60(void) +{ + return false; +} + +bool debug0f11ef68(void) +{ + return false; +} + +bool debug0f11ef70(void) +{ + return false; +} + +bool debug0f11ef78(void) +{ + return false; +} + +bool debug0f11ef80(void) +{ + return false; +} + +bool debug0f11ef88(void) +{ + return false; +} + +bool debug0f11ef90(void) +{ + return false; +} + +void debug0f11ef98(s32 arg0) +{ + // empty +} + +void debug0f11efa0(void) +{ + // empty +} + +void debug0f11efa8(void) +{ + // empty +} + +void debug0f11efb0(s32 arg0, s32 arg1) +{ + // empty +} + +void debug0f11efbc(s32 arg0) +{ + // empty +} + +s32 debug0f11efc4(s32 arg0) +{ + return arg0; +} + +void debug0f11efcc(void) +{ + // empty +} + +void debug0f11efd4(void) +{ + // empty +} + GLOBAL_ASM( -glabel func0f11ef80 -/* f11ef80: 03e00008 */ jr $ra -/* f11ef84: 00001025 */ or $v0,$zero,$zero -/* f11ef88: 03e00008 */ jr $ra -/* f11ef8c: 00001025 */ or $v0,$zero,$zero -/* f11ef90: 03e00008 */ jr $ra -/* f11ef94: 00001025 */ or $v0,$zero,$zero -/* f11ef98: 03e00008 */ jr $ra -/* f11ef9c: afa40000 */ sw $a0,0x0($sp) -/* f11efa0: 03e00008 */ jr $ra -/* f11efa4: 00000000 */ sll $zero,$zero,0x0 -/* f11efa8: 03e00008 */ jr $ra -/* f11efac: 00000000 */ sll $zero,$zero,0x0 -/* f11efb0: afa40000 */ sw $a0,0x0($sp) -/* f11efb4: 03e00008 */ jr $ra -/* f11efb8: afa50004 */ sw $a1,0x4($sp) -/* f11efbc: 03e00008 */ jr $ra -/* f11efc0: afa40000 */ sw $a0,0x0($sp) -/* f11efc4: 03e00008 */ jr $ra -/* f11efc8: 00801025 */ or $v0,$a0,$zero -/* f11efcc: 03e00008 */ jr $ra -/* f11efd0: 00000000 */ sll $zero,$zero,0x0 -/* f11efd4: 03e00008 */ jr $ra -/* f11efd8: 00000000 */ sll $zero,$zero,0x0 +glabel func0f11efdc /* f11efdc: 03e00008 */ jr $ra /* f11efe0: afa40000 */ sw $a0,0x0($sp) /* f11efe4: 00000000 */ sll $zero,$zero,0x0 @@ -323,4 +490,3 @@ glabel func0f11ef80 /* f11eff8: 00000000 */ sll $zero,$zero,0x0 /* f11effc: 00000000 */ sll $zero,$zero,0x0 ); - diff --git a/src/game/game_157db0.c b/src/game/game_157db0.c index 7a25ad88b..50c6bec82 100644 --- a/src/game/game_157db0.c +++ b/src/game/game_157db0.c @@ -2862,7 +2862,7 @@ glabel func0f15a2c4 /* f15a624: 00408825 */ or $s1,$v0,$zero /* f15a628: 0c012d20 */ jal osVirtualToPhysical /* f15a62c: 00402025 */ or $a0,$v0,$zero -/* f15a630: 0fc47b60 */ jal func0f11ed80 +/* f15a630: 0fc47b60 */ jal debug0f11ed80 /* f15a634: ae220004 */ sw $v0,0x4($s1) /* f15a638: 10400013 */ beqz $v0,.L0f15a688 /* f15a63c: 00000000 */ sll $zero,$zero,0x0 @@ -3326,7 +3326,7 @@ glabel func0f15a6f4 /* f15aca0: 02202025 */ or $a0,$s1,$zero /* f15aca4: 0fc599b2 */ jal func0f1666c8 /* f15aca8: af220004 */ sw $v0,0x4($t9) -/* f15acac: 0fc47b60 */ jal func0f11ed80 +/* f15acac: 0fc47b60 */ jal debug0f11ed80 /* f15acb0: 00408825 */ or $s1,$v0,$zero /* f15acb4: 50400014 */ beqzl $v0,.L0f15ad08 /* f15acb8: 3c0c0103 */ lui $t4,0x103 @@ -3382,7 +3382,7 @@ glabel func0f15a6f4 /* f15ad78: 00402025 */ or $a0,$v0,$zero /* f15ad7c: 0fc59928 */ jal func0f1664a0 /* f15ad80: 00002825 */ or $a1,$zero,$zero -/* f15ad84: 0fc47b5e */ jal func0f11ed78 +/* f15ad84: 0fc47b5e */ jal debug0f11ed78 /* f15ad88: 00408825 */ or $s1,$v0,$zero /* f15ad8c: 5040000e */ beqzl $v0,.L0f15adc8 /* f15ad90: 3c0c0103 */ lui $t4,0x103 @@ -3413,7 +3413,7 @@ glabel func0f15a6f4 /* f15adec: 02202025 */ or $a0,$s1,$zero /* f15adf0: 0fc599b2 */ jal func0f1666c8 /* f15adf4: ada20004 */ sw $v0,0x4($t5) -/* f15adf8: 0fc47b60 */ jal func0f11ed80 +/* f15adf8: 0fc47b60 */ jal debug0f11ed80 /* f15adfc: 00408825 */ or $s1,$v0,$zero /* f15ae00: 10400013 */ beqz $v0,.L0f15ae50 /* f15ae04: 00000000 */ sll $zero,$zero,0x0 @@ -3539,7 +3539,7 @@ glabel func0f15a6f4 /* f15afcc: 00402025 */ or $a0,$v0,$zero /* f15afd0: 0fc59928 */ jal func0f1664a0 /* f15afd4: 24050001 */ addiu $a1,$zero,0x1 -/* f15afd8: 0fc47b5e */ jal func0f11ed78 +/* f15afd8: 0fc47b5e */ jal debug0f11ed78 /* f15afdc: 00408825 */ or $s1,$v0,$zero /* f15afe0: 50400009 */ beqzl $v0,.L0f15b008 /* f15afe4: 3c0b0103 */ lui $t3,0x103 @@ -3565,7 +3565,7 @@ glabel func0f15a6f4 /* f15b02c: 02202025 */ or $a0,$s1,$zero /* f15b030: 0fc599b2 */ jal func0f1666c8 /* f15b034: af220004 */ sw $v0,0x4($t9) -/* f15b038: 0fc47b60 */ jal func0f11ed80 +/* f15b038: 0fc47b60 */ jal debug0f11ed80 /* f15b03c: 00408825 */ or $s1,$v0,$zero /* f15b040: 10400013 */ beqz $v0,.L0f15b090 /* f15b044: 00000000 */ sll $zero,$zero,0x0 @@ -6459,7 +6459,7 @@ glabel func0f15d870 /* f15d8c4: 00000000 */ sll $zero,$zero,0x0 /* f15d8c8: 27bdfd10 */ addiu $sp,$sp,-752 /* f15d8cc: afbf0014 */ sw $ra,0x14($sp) -/* f15d8d0: 0fc47b70 */ jal func0f11edc0 +/* f15d8d0: 0fc47b70 */ jal debug0f11edc0 /* f15d8d4: 00000000 */ sll $zero,$zero,0x0 /* f15d8d8: 1040002f */ beqz $v0,.L0f15d998 /* f15d8dc: 3c06800a */ lui $a2,%hi(g_Vars+0x2bc) @@ -6759,7 +6759,7 @@ glabel func0f15dc58 /* f15dcbc: 18400009 */ blez $v0,.L0f15dce4 /* f15dcc0: 00000000 */ sll $zero,$zero,0x0 /* f15dcc4: afa202f4 */ sw $v0,0x2f4($sp) -/* f15dcc8: 0fc47b6c */ jal func0f11edb0 +/* f15dcc8: 0fc47b6c */ jal debug0f11edb0 /* f15dccc: afa402f8 */ sw $a0,0x2f8($sp) /* f15dcd0: 10400007 */ beqz $v0,.L0f15dcf0 /* f15dcd4: 8fac02f4 */ lw $t4,0x2f4($sp) diff --git a/src/game/game_167ae0.c b/src/game/game_167ae0.c index 65aeed474..eba0a17b0 100644 --- a/src/game/game_167ae0.c +++ b/src/game/game_167ae0.c @@ -1588,7 +1588,7 @@ glabel var7f1b7868 /* f1693f4: 3c0f0600 */ lui $t7,0x600 /* f1693f8: ac4f0000 */ sw $t7,0x0($v0) /* f1693fc: ac580004 */ sw $t8,0x4($v0) -/* f169400: 0fc47b8a */ jal func0f11ee28 +/* f169400: 0fc47b8a */ jal debug0f11ee28 /* f169404: 26520008 */ addiu $s2,$s2,0x8 /* f169408: 10400008 */ beqz $v0,.L0f16942c /* f16940c: 02401025 */ or $v0,$s2,$zero @@ -2053,7 +2053,7 @@ glabel var7f1b7868 /* f169ae4: ac580000 */ sw $t8,0x0($v0) /* f169ae8: 8faa0068 */ lw $t2,0x68($sp) /* f169aec: 26520008 */ addiu $s2,$s2,0x8 -/* f169af0: 0fc47b8a */ jal func0f11ee28 +/* f169af0: 0fc47b8a */ jal debug0f11ee28 /* f169af4: ac4a0004 */ sw $t2,0x4($v0) /* f169af8: 10400009 */ beqz $v0,.L0f169b20 /* f169afc: 3c0c0600 */ lui $t4,0x600 @@ -3232,7 +3232,7 @@ glabel var7f1b7868 /* f16abfc: 00000000 */ sll $zero,$zero,0x0 /* f16ac00: 00409025 */ or $s2,$v0,$zero .L0f16ac04: -/* f16ac04: 0fc47bb6 */ jal func0f11eed8 +/* f16ac04: 0fc47bb6 */ jal debug0f11eed8 /* f16ac08: 00000000 */ sll $zero,$zero,0x0 /* f16ac0c: 145e0006 */ bne $v0,$s8,.L0f16ac28 /* f16ac10: 02402025 */ or $a0,$s2,$zero @@ -3242,7 +3242,7 @@ glabel var7f1b7868 /* f16ac20: 10000014 */ beqz $zero,.L0f16ac74 /* f16ac24: 00409025 */ or $s2,$v0,$zero .L0f16ac28: -/* f16ac28: 0fc47bb6 */ jal func0f11eed8 +/* f16ac28: 0fc47bb6 */ jal debug0f11eed8 /* f16ac2c: 00000000 */ sll $zero,$zero,0x0 /* f16ac30: 24010002 */ addiu $at,$zero,0x2 /* f16ac34: 14410006 */ bne $v0,$at,.L0f16ac50 @@ -3253,7 +3253,7 @@ glabel var7f1b7868 /* f16ac48: 1000000a */ beqz $zero,.L0f16ac74 /* f16ac4c: 00409025 */ or $s2,$v0,$zero .L0f16ac50: -/* f16ac50: 0fc47bb6 */ jal func0f11eed8 +/* f16ac50: 0fc47bb6 */ jal debug0f11eed8 /* f16ac54: 00000000 */ sll $zero,$zero,0x0 /* f16ac58: 24010003 */ addiu $at,$zero,0x3 /* f16ac5c: 14410005 */ bne $v0,$at,.L0f16ac74 @@ -3344,27 +3344,27 @@ glabel var7f1b7868 /* f16ad98: 00402025 */ or $a0,$v0,$zero /* f16ad9c: 00409025 */ or $s2,$v0,$zero .L0f16ada0: -/* f16ada0: 0fc47ba2 */ jal func0f11ee88 +/* f16ada0: 0fc47ba2 */ jal debug0f11ee88 /* f16ada4: 00000000 */ sll $zero,$zero,0x0 /* f16ada8: 14400013 */ bnez $v0,.L0f16adf8 /* f16adac: 00000000 */ sll $zero,$zero,0x0 -/* f16adb0: 0fc47ba4 */ jal func0f11ee90 +/* f16adb0: 0fc47ba4 */ jal debug0f11ee90 /* f16adb4: 00000000 */ sll $zero,$zero,0x0 /* f16adb8: 1440000f */ bnez $v0,.L0f16adf8 /* f16adbc: 00000000 */ sll $zero,$zero,0x0 -/* f16adc0: 0fc47baa */ jal func0f11eea8 +/* f16adc0: 0fc47baa */ jal debug0f11eea8 /* f16adc4: 00000000 */ sll $zero,$zero,0x0 /* f16adc8: 1440000b */ bnez $v0,.L0f16adf8 /* f16adcc: 00000000 */ sll $zero,$zero,0x0 -/* f16add0: 0fc47be0 */ jal func0f11ef80 +/* f16add0: 0fc47be0 */ jal debug0f11ef80 /* f16add4: 00000000 */ sll $zero,$zero,0x0 /* f16add8: 14400007 */ bnez $v0,.L0f16adf8 /* f16addc: 00000000 */ sll $zero,$zero,0x0 -/* f16ade0: 0fc47bde */ jal func0f11ef78 +/* f16ade0: 0fc47bde */ jal debug0f11ef78 /* f16ade4: 00000000 */ sll $zero,$zero,0x0 /* f16ade8: 14400003 */ bnez $v0,.L0f16adf8 /* f16adec: 00000000 */ sll $zero,$zero,0x0 -/* f16adf0: 0fc47b90 */ jal func0f11ee40 +/* f16adf0: 0fc47b90 */ jal debug0f11ee40 /* f16adf4: 00000000 */ sll $zero,$zero,0x0 .L0f16adf8: /* f16adf8: 0fc49d36 */ jal func0f1274d8 diff --git a/src/game/propobj.c b/src/game/propobj.c index 3069fcd20..7097a8056 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -31902,15 +31902,15 @@ glabel var7f1aa838 /* f081d28: afa20098 */ sw $v0,0x98($sp) /* f081d2c: 0fc249af */ jal func0f0926bc /* f081d30: e7b000bc */ swc1 $f16,0xbc($sp) -/* f081d34: 0fc47b6e */ jal func0f11edb8 +/* f081d34: 0fc47b6e */ jal debug0f11edb8 /* f081d38: afa00090 */ sw $zero,0x90($sp) /* f081d3c: c7b000bc */ lwc1 $f16,0xbc($sp) -/* f081d40: 0fc47b6e */ jal func0f11edb8 +/* f081d40: 0fc47b6e */ jal debug0f11edb8 /* f081d44: e7b000bc */ swc1 $f16,0xbc($sp) /* f081d48: c7b000bc */ lwc1 $f16,0xbc($sp) /* f081d4c: 0c004b70 */ jal random /* f081d50: e7b000bc */ swc1 $f16,0xbc($sp) -/* f081d54: 0fc47b6e */ jal func0f11edb8 +/* f081d54: 0fc47b6e */ jal debug0f11edb8 /* f081d58: afa20090 */ sw $v0,0x90($sp) /* f081d5c: 10400004 */ beqz $v0,.L0f081d70 /* f081d60: c7b000bc */ lwc1 $f16,0xbc($sp) diff --git a/src/include/game/game_11ecf0.h b/src/include/game/game_11ecf0.h index 8f03e9826..82993b4ba 100644 --- a/src/include/game/game_11ecf0.h +++ b/src/include/game/game_11ecf0.h @@ -4,27 +4,25 @@ #include "types.h" u32 dprint(); -u32 func0f11ecf0(void); -bool func0f11ed70(void); -bool func0f11ed78(void); -u32 func0f11ed80(void); -bool func0f11edb0(void); -bool func0f11edb8(void); -u32 func0f11edc0(void); -u32 func0f11ee08(void); -bool func0f11ee20(void); -u32 func0f11ee28(void); -u32 func0f11ee40(void); +bool debug0f11ed70(void); +bool debug0f11ed78(void); +bool debug0f11ed80(void); +bool debug0f11edb0(void); +bool debug0f11edb8(void); +bool debug0f11edc0(void); +s32 debug0f11ee08(void); +bool debug0f11ee20(void); +bool debug0f11ee28(void); +bool debug0f11ee40(void); u32 debugGetSlowMotion(void); -bool func0f11ee88(void); -u32 func0f11ee90(void); -bool func0f11eea8(void); -u32 func0f11eeb0(void); -u32 func0f11eed8(void); -bool func0f11eef0(void); -u32 func0f11eef8(void); -u32 func0f11ef48(void); -bool func0f11ef78(void); -u32 func0f11ef80(void); +bool debug0f11ee88(void); +bool debug0f11ee90(void); +bool debug0f11eea8(void); +bool debug0f11eeb0(void); +bool debug0f11eed8(void); +bool debug0f11eef8(void); +bool debugAllowEndLevel(void); +bool debug0f11ef78(void); +bool debug0f11ef80(void); #endif diff --git a/src/lib/lib_0d520.c b/src/lib/lib_0d520.c index 0986d527c..759249479 100644 --- a/src/lib/lib_0d520.c +++ b/src/lib/lib_0d520.c @@ -1343,7 +1343,7 @@ glabel func0000e324 /* e5b4: afa20074 */ sw $v0,0x74($sp) /* e5b8: 0c000d38 */ jal func000034e0 /* e5bc: 27a40074 */ addiu $a0,$sp,0x74 -/* e5c0: 0fc47b5c */ jal func0f11ed70 +/* e5c0: 0fc47b5c */ jal debug0f11ed70 /* e5c4: 00000000 */ sll $zero,$zero,0x0 /* e5c8: 28410002 */ slti $at,$v0,0x2 /* e5cc: 54200005 */ bnezl $at,.L0000e5e4