From a0e6688dcbb63b18c417bd0aa4bd74ba7c1f7ddd Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 3 Dec 2019 19:47:18 +1000 Subject: [PATCH] Attempt to decompile ai01d4 --- src/game/chr/chraicommands.c | 34 ++++++++++----- src/game/game_000920.c | 84 ++++++++++++++++++------------------ src/game/game_005fd0.c | 4 +- src/game/game_0125a0.c | 8 ++-- src/game/game_013540.c | 4 +- src/game/game_066310.c | 4 +- src/game/game_0b28d0.c | 16 +++---- src/game/game_129900.c | 48 ++++++++++----------- src/game/game_157db0.c | 68 ++++++++++++++--------------- src/game/game_16cfa0.c | 4 +- src/gvars/gvars.c | 2 +- src/include/gvars/gvars.h | 2 +- src/include/types.h | 38 ++++++++++++++++ 13 files changed, 184 insertions(+), 132 deletions(-) diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 6832e9541..46d91453d 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -14912,6 +14912,20 @@ glabel ai01d4 /* f05f830: aceb0438 */ sw $t3,0x438($a3) ); +//bool ai01d4(void) +//{ +// u8 *cmd = g_Vars.ailist + g_Vars.aioffset; +// s16 room_id = cmd[3] | (cmd[2] << 8); +// u32 value = cmd[5] | (cmd[4] << 8); +// +// struct room *room = &g_RoomPtrs[room_id]; +// room->unk00 |= value; +// +// g_Vars.aioffset += 6; +// +// return false; +//} + /** * @cmd 01d5 */ @@ -15102,9 +15116,9 @@ glabel ai01d6 /* f05fa4c: 3c018007 */ lui $at,0x8007 /* f05fa50: 10000085 */ beqz $zero,.L0f05fc68 /* f05fa54: a027ae28 */ sb $a3,-0x51d8($at) -/* f05fa58: 3c05800a */ lui $a1,%hi(var800a4928) +/* f05fa58: 3c05800a */ lui $a1,%hi(g_RoomPtrs) /* f05fa5c: 000418c0 */ sll $v1,$a0,0x3 -/* f05fa60: 24a54928 */ addiu $a1,$a1,%lo(var800a4928) +/* f05fa60: 24a54928 */ addiu $a1,$a1,%lo(g_RoomPtrs) /* f05fa64: 00641821 */ addu $v1,$v1,$a0 /* f05fa68: 8cac0000 */ lw $t4,0x0($a1) /* f05fa6c: 00031880 */ sll $v1,$v1,0x2 @@ -15123,9 +15137,9 @@ glabel ai01d6 .L0f05faa0: /* f05faa0: 10000071 */ beqz $zero,.L0f05fc68 /* f05faa4: 8d030438 */ lw $v1,0x438($t0) -/* f05faa8: 3c05800a */ lui $a1,%hi(var800a4928) +/* f05faa8: 3c05800a */ lui $a1,%hi(g_RoomPtrs) /* f05faac: 000418c0 */ sll $v1,$a0,0x3 -/* f05fab0: 24a54928 */ addiu $a1,$a1,%lo(var800a4928) +/* f05fab0: 24a54928 */ addiu $a1,$a1,%lo(g_RoomPtrs) /* f05fab4: 00641821 */ addu $v1,$v1,$a0 /* f05fab8: 8ca90000 */ lw $t1,0x0($a1) /* f05fabc: 00031880 */ sll $v1,$v1,0x2 @@ -15144,9 +15158,9 @@ glabel ai01d6 .L0f05faf0: /* f05faf0: 1000005d */ beqz $zero,.L0f05fc68 /* f05faf4: 8d030438 */ lw $v1,0x438($t0) -/* f05faf8: 3c05800a */ lui $a1,%hi(var800a4928) +/* f05faf8: 3c05800a */ lui $a1,%hi(g_RoomPtrs) /* f05fafc: 0004c0c0 */ sll $t8,$a0,0x3 -/* f05fb00: 24a54928 */ addiu $a1,$a1,%lo(var800a4928) +/* f05fb00: 24a54928 */ addiu $a1,$a1,%lo(g_RoomPtrs) /* f05fb04: 0304c021 */ addu $t8,$t8,$a0 /* f05fb08: 8caf0000 */ lw $t7,0x0($a1) /* f05fb0c: 0018c080 */ sll $t8,$t8,0x2 @@ -15160,9 +15174,9 @@ glabel ai01d6 /* f05fb2c: a04c004e */ sb $t4,0x4e($v0) /* f05fb30: 1000004d */ beqz $zero,.L0f05fc68 /* f05fb34: 8d030438 */ lw $v1,0x438($t0) -/* f05fb38: 3c05800a */ lui $a1,%hi(var800a4928) +/* f05fb38: 3c05800a */ lui $a1,%hi(g_RoomPtrs) /* f05fb3c: 000470c0 */ sll $t6,$a0,0x3 -/* f05fb40: 24a54928 */ addiu $a1,$a1,%lo(var800a4928) +/* f05fb40: 24a54928 */ addiu $a1,$a1,%lo(g_RoomPtrs) /* f05fb44: 01c47021 */ addu $t6,$t6,$a0 /* f05fb48: 8cad0000 */ lw $t5,0x0($a1) /* f05fb4c: 000e7080 */ sll $t6,$t6,0x2 @@ -15176,8 +15190,8 @@ glabel ai01d6 /* f05fb6c: 24040001 */ addiu $a0,$zero,0x1 /* f05fb70: 2b010002 */ slti $at,$t8,0x2 /* f05fb74: 1420003c */ bnez $at,.L0f05fc68 -/* f05fb78: 3c05800a */ lui $a1,%hi(var800a4928) -/* f05fb7c: 24a54928 */ addiu $a1,$a1,%lo(var800a4928) +/* f05fb78: 3c05800a */ lui $a1,%hi(g_RoomPtrs) +/* f05fb7c: 24a54928 */ addiu $a1,$a1,%lo(g_RoomPtrs) /* f05fb80: 2403008c */ addiu $v1,$zero,0x8c /* f05fb84: 2406bfff */ addiu $a2,$zero,-16385 .L0f05fb88: diff --git a/src/game/game_000920.c b/src/game/game_000920.c index 69d6ae52b..36763cb22 100644 --- a/src/game/game_000920.c +++ b/src/game/game_000920.c @@ -1141,10 +1141,10 @@ glabel func0f001734 /* f001758: afb1004c */ sw $s1,0x4c($sp) /* f00175c: 10c0000f */ beqz $a2,.L0f00179c /* f001760: afb00048 */ sw $s0,0x48($sp) -/* f001764: 3c1e800a */ lui $s8,%hi(var800a4928) +/* f001764: 3c1e800a */ lui $s8,%hi(g_RoomPtrs) /* f001768: 0006b8c0 */ sll $s7,$a2,0x3 /* f00176c: 02e6b821 */ addu $s7,$s7,$a2 -/* f001770: 27de4928 */ addiu $s8,$s8,%lo(var800a4928) +/* f001770: 27de4928 */ addiu $s8,$s8,%lo(g_RoomPtrs) /* f001774: 8fce0000 */ lw $t6,0x0($s8) /* f001778: 0017b880 */ sll $s7,$s7,0x2 /* f00177c: 02e6b823 */ subu $s7,$s7,$a2 @@ -1348,9 +1348,9 @@ glabel func0f001a64 /* f001a64: 27bdffd0 */ addiu $sp,$sp,-48 /* f001a68: afb40024 */ sw $s4,0x24($sp) /* f001a6c: afb30020 */ sw $s3,0x20($sp) -/* f001a70: 3c14800a */ lui $s4,%hi(var800a4928) +/* f001a70: 3c14800a */ lui $s4,%hi(g_RoomPtrs) /* f001a74: 000498c0 */ sll $s3,$a0,0x3 -/* f001a78: 26944928 */ addiu $s4,$s4,%lo(var800a4928) +/* f001a78: 26944928 */ addiu $s4,$s4,%lo(g_RoomPtrs) /* f001a7c: 02649821 */ addu $s3,$s3,$a0 /* f001a80: 8e8e0000 */ lw $t6,0x0($s4) /* f001a84: 00139880 */ sll $s3,$s3,0x2 @@ -1778,8 +1778,8 @@ glabel func0f001c0c /* f002084: 28a10002 */ slti $at,$a1,0x2 /* f002088: 14200010 */ bnez $at,.L0f0020cc /* f00208c: 2402008c */ addiu $v0,$zero,0x8c -/* f002090: 3c10800a */ lui $s0,%hi(var800a4928) -/* f002094: 26104928 */ addiu $s0,$s0,%lo(var800a4928) +/* f002090: 3c10800a */ lui $s0,%hi(g_RoomPtrs) +/* f002094: 26104928 */ addiu $s0,$s0,%lo(g_RoomPtrs) /* f002098: 8e090000 */ lw $t1,0x0($s0) .L0f00209c: /* f00209c: 3c08800a */ lui $t0,0x800a @@ -1795,9 +1795,9 @@ glabel func0f001c0c /* f0020c4: 8e090000 */ lw $t1,0x0($s0) /* f0020c8: 24130001 */ addiu $s3,$zero,0x1 .L0f0020cc: -/* f0020cc: 3c10800a */ lui $s0,%hi(var800a4928) +/* f0020cc: 3c10800a */ lui $s0,%hi(g_RoomPtrs) /* f0020d0: 0fc00cec */ jal func0f0033b0 -/* f0020d4: 26104928 */ addiu $s0,$s0,%lo(var800a4928) +/* f0020d4: 26104928 */ addiu $s0,$s0,%lo(g_RoomPtrs) /* f0020d8: 3c0d800a */ lui $t5,0x800a /* f0020dc: 8dada27c */ lw $t5,-0x5d84($t5) /* f0020e0: 2402008c */ addiu $v0,$zero,0x8c @@ -2020,11 +2020,11 @@ glabel func0f0023b8 /* f0023f0: 3c0142c8 */ lui $at,0x42c8 /* f0023f4: 4481a000 */ mtc1 $at,$f20 /* f0023f8: 3c013f80 */ lui $at,0x3f80 -/* f0023fc: 3c0a800a */ lui $t2,%hi(var800a4928) +/* f0023fc: 3c0a800a */ lui $t2,%hi(g_RoomPtrs) /* f002400: 44818000 */ mtc1 $at,$f16 /* f002404: 4480c000 */ mtc1 $zero,$f24 /* f002408: 44809000 */ mtc1 $zero,$f18 -/* f00240c: 254a4928 */ addiu $t2,$t2,%lo(var800a4928) +/* f00240c: 254a4928 */ addiu $t2,$t2,%lo(g_RoomPtrs) /* f002410: 00002825 */ or $a1,$zero,$zero /* f002414: 240b000c */ addiu $t3,$zero,0xc /* f002418: 8d4f0000 */ lw $t7,0x0($t2) @@ -2171,9 +2171,9 @@ glabel func0f00259c /* f002614: 8e8f0000 */ lw $t7,0x0($s4) /* f002618: 00008825 */ or $s1,$zero,$zero .L0f00261c: -/* f00261c: 3c15800a */ lui $s5,%hi(var800a4928) +/* f00261c: 3c15800a */ lui $s5,%hi(g_RoomPtrs) /* f002620: 0013b8c0 */ sll $s7,$s3,0x3 -/* f002624: 26b54928 */ addiu $s5,$s5,%lo(var800a4928) +/* f002624: 26b54928 */ addiu $s5,$s5,%lo(g_RoomPtrs) /* f002628: 02f3b821 */ addu $s7,$s7,$s3 /* f00262c: 8ea80000 */ lw $t0,0x0($s5) /* f002630: 0017b880 */ sll $s7,$s7,0x2 @@ -2500,8 +2500,8 @@ glabel func0f002a98 /* f002adc: 29c10002 */ slti $at,$t6,0x2 /* f002ae0: 1420000e */ bnez $at,.L0f002b1c /* f002ae4: 2411008c */ addiu $s1,$zero,0x8c -/* f002ae8: 3c12800a */ lui $s2,%hi(var800a4928) -/* f002aec: 26524928 */ addiu $s2,$s2,%lo(var800a4928) +/* f002ae8: 3c12800a */ lui $s2,%hi(g_RoomPtrs) +/* f002aec: 26524928 */ addiu $s2,$s2,%lo(g_RoomPtrs) /* f002af0: 8e4f0000 */ lw $t7,0x0($s2) .L0f002af4: /* f002af4: 0fc00436 */ jal func0f0010d8 @@ -2535,9 +2535,9 @@ glabel func0f002a98 GLOBAL_ASM( glabel func0f002b58 -/* f002b58: 3c08800a */ lui $t0,%hi(var800a4928) +/* f002b58: 3c08800a */ lui $t0,%hi(g_RoomPtrs) /* f002b5c: 000418c0 */ sll $v1,$a0,0x3 -/* f002b60: 25084928 */ addiu $t0,$t0,%lo(var800a4928) +/* f002b60: 25084928 */ addiu $t0,$t0,%lo(g_RoomPtrs) /* f002b64: 00641821 */ addu $v1,$v1,$a0 /* f002b68: 8d0e0000 */ lw $t6,0x0($t0) /* f002b6c: 00031880 */ sll $v1,$v1,0x2 @@ -2611,8 +2611,8 @@ glabel func0f002c28 /* f002c58: 144000a3 */ bnez $v0,.L0f002ee8 /* f002c5c: 93a70027 */ lbu $a3,0x27($sp) /* f002c60: 8fa20018 */ lw $v0,0x18($sp) -/* f002c64: 3c03800a */ lui $v1,%hi(var800a4928) -/* f002c68: 24634928 */ addiu $v1,$v1,%lo(var800a4928) +/* f002c64: 3c03800a */ lui $v1,%hi(g_RoomPtrs) +/* f002c68: 24634928 */ addiu $v1,$v1,%lo(g_RoomPtrs) /* f002c6c: 0002c0c0 */ sll $t8,$v0,0x3 /* f002c70: 0302c021 */ addu $t8,$t8,$v0 /* f002c74: 8c790000 */ lw $t9,0x0($v1) @@ -3129,8 +3129,8 @@ glabel func0f0033b0 /* f0033f0: 29e10002 */ slti $at,$t7,0x2 /* f0033f4: 1420000f */ bnez $at,.L0f003434 /* f0033f8: 2404008c */ addiu $a0,$zero,0x8c -/* f0033fc: 3c05800a */ lui $a1,%hi(var800a4928) -/* f003400: 24a54928 */ addiu $a1,$a1,%lo(var800a4928) +/* f0033fc: 3c05800a */ lui $a1,%hi(g_RoomPtrs) +/* f003400: 24a54928 */ addiu $a1,$a1,%lo(g_RoomPtrs) /* f003404: 2406efff */ addiu $a2,$zero,-4097 /* f003408: 8cb80000 */ lw $t8,0x0($a1) .L0f00340c: @@ -3173,9 +3173,9 @@ glabel func0f003444 /* f003484: 3c013f00 */ lui $at,0x3f00 /* f003488: 3c02800a */ lui $v0,%hi(var800a008c) /* f00348c: 3c16800a */ lui $s6,%hi(var800a4cd8) -/* f003490: 3c12800a */ lui $s2,%hi(var800a4928) +/* f003490: 3c12800a */ lui $s2,%hi(g_RoomPtrs) /* f003494: 4481a000 */ mtc1 $at,$f20 -/* f003498: 26524928 */ addiu $s2,$s2,%lo(var800a4928) +/* f003498: 26524928 */ addiu $s2,$s2,%lo(g_RoomPtrs) /* f00349c: 26d64cd8 */ addiu $s6,$s6,%lo(var800a4cd8) /* f0034a0: 8c424928 */ lw $v0,0x4928($v0) /* f0034a4: 00009825 */ or $s3,$zero,$zero @@ -3277,9 +3277,9 @@ glabel func0f0035c0 /* f0035fc: 0000a025 */ or $s4,$zero,$zero /* f003600: 3c02800a */ lui $v0,%hi(var800a008c) /* f003604: 3c16800a */ lui $s6,%hi(var800a4cd8) -/* f003608: 3c12800a */ lui $s2,%hi(var800a4928) +/* f003608: 3c12800a */ lui $s2,%hi(g_RoomPtrs) /* f00360c: 4480a000 */ mtc1 $zero,$f20 -/* f003610: 26524928 */ addiu $s2,$s2,%lo(var800a4928) +/* f003610: 26524928 */ addiu $s2,$s2,%lo(g_RoomPtrs) /* f003614: 26d64cd8 */ addiu $s6,$s6,%lo(var800a4cd8) /* f003618: 8c424928 */ lw $v0,0x4928($v0) /* f00361c: 00009825 */ or $s3,$zero,$zero @@ -3431,8 +3431,8 @@ glabel func0f0037ac /* f00381c: 2412008c */ addiu $s2,$zero,0x8c /* f003820: 28410002 */ slti $at,$v0,0x2 /* f003824: 14200010 */ bnez $at,.L0f003868 -/* f003828: 3c13800a */ lui $s3,%hi(var800a4928) -/* f00382c: 26734928 */ addiu $s3,$s3,%lo(var800a4928) +/* f003828: 3c13800a */ lui $s3,%hi(g_RoomPtrs) +/* f00382c: 26734928 */ addiu $s3,$s3,%lo(g_RoomPtrs) /* f003830: 2403fbff */ addiu $v1,$zero,-1025 /* f003834: 8e6f0000 */ lw $t7,0x0($s3) .L0f003838: @@ -3449,10 +3449,10 @@ glabel func0f0037ac /* f003860: 8e6f0000 */ lw $t7,0x0($s3) /* f003864: 241e0001 */ addiu $s8,$zero,0x1 .L0f003868: -/* f003868: 3c13800a */ lui $s3,%hi(var800a4928) +/* f003868: 3c13800a */ lui $s3,%hi(g_RoomPtrs) /* f00386c: 28410002 */ slti $at,$v0,0x2 /* f003870: 142001aa */ bnez $at,.L0f003f1c -/* f003874: 26734928 */ addiu $s3,$s3,%lo(var800a4928) +/* f003874: 26734928 */ addiu $s3,$s3,%lo(g_RoomPtrs) /* f003878: 4480b000 */ mtc1 $zero,$f22 /* f00387c: 2412008c */ addiu $s2,$zero,0x8c /* f003880: 2417008c */ addiu $s7,$zero,0x8c @@ -4261,10 +4261,10 @@ glabel func0f00438c /* f0043d4: f7b40018 */ sdc1 $f20,0x18($sp) /* f0043d8: 10600050 */ beqz $v1,.L0f00451c /* f0043dc: 00803825 */ or $a3,$a0,$zero -/* f0043e0: 3c15800a */ lui $s5,%hi(var800a4928) +/* f0043e0: 3c15800a */ lui $s5,%hi(g_RoomPtrs) /* f0043e4: 000488c0 */ sll $s1,$a0,0x3 /* f0043e8: 02248821 */ addu $s1,$s1,$a0 -/* f0043ec: 26b54928 */ addiu $s5,$s5,%lo(var800a4928) +/* f0043ec: 26b54928 */ addiu $s5,$s5,%lo(g_RoomPtrs) /* f0043f0: 8eae0000 */ lw $t6,0x0($s5) /* f0043f4: 00118880 */ sll $s1,$s1,0x2 /* f0043f8: 02248823 */ subu $s1,$s1,$a0 @@ -4368,9 +4368,9 @@ glabel func0f00438c GLOBAL_ASM( glabel func0f004558 /* f004558: 10800028 */ beqz $a0,.L0f0045fc -/* f00455c: 3c07800a */ lui $a3,%hi(var800a4928) +/* f00455c: 3c07800a */ lui $a3,%hi(g_RoomPtrs) /* f004560: 000410c0 */ sll $v0,$a0,0x3 -/* f004564: 24e74928 */ addiu $a3,$a3,%lo(var800a4928) +/* f004564: 24e74928 */ addiu $a3,$a3,%lo(g_RoomPtrs) /* f004568: 00441021 */ addu $v0,$v0,$a0 /* f00456c: 8cee0000 */ lw $t6,0x0($a3) /* f004570: 00021080 */ sll $v0,$v0,0x2 @@ -4416,9 +4416,9 @@ glabel func0f004558 GLOBAL_ASM( glabel func0f004604 -/* f004604: 3c06800a */ lui $a2,%hi(var800a4928) +/* f004604: 3c06800a */ lui $a2,%hi(g_RoomPtrs) /* f004608: 000428c0 */ sll $a1,$a0,0x3 -/* f00460c: 24c64928 */ addiu $a2,$a2,%lo(var800a4928) +/* f00460c: 24c64928 */ addiu $a2,$a2,%lo(g_RoomPtrs) /* f004610: 27bdff68 */ addiu $sp,$sp,-152 /* f004614: 00a42821 */ addu $a1,$a1,$a0 /* f004618: 8cce0000 */ lw $t6,0x0($a2) @@ -4459,8 +4459,8 @@ glabel func0f004604 /* f0046a0: 85e40016 */ lh $a0,0x16($t7) /* f0046a4: 0fc59e73 */ jal func0f1679cc /* f0046a8: afa40070 */ sw $a0,0x70($sp) -/* f0046ac: 3c07800a */ lui $a3,%hi(var800a4928) -/* f0046b0: 24e74928 */ addiu $a3,$a3,%lo(var800a4928) +/* f0046ac: 3c07800a */ lui $a3,%hi(g_RoomPtrs) +/* f0046b0: 24e74928 */ addiu $a3,$a3,%lo(g_RoomPtrs) /* f0046b4: 8fa60048 */ lw $a2,0x48($sp) /* f0046b8: 8cf80000 */ lw $t8,0x0($a3) /* f0046bc: 00402825 */ or $a1,$v0,$zero @@ -4841,8 +4841,8 @@ glabel func0f004604 /* f004c0c: afa00078 */ sw $zero,0x78($sp) /* f004c10: 8fb90080 */ lw $t9,0x80($sp) .L0f004c14: -/* f004c14: 3c07800a */ lui $a3,%hi(var800a4928) -/* f004c18: 24e74928 */ addiu $a3,$a3,%lo(var800a4928) +/* f004c14: 3c07800a */ lui $a3,%hi(g_RoomPtrs) +/* f004c18: 24e74928 */ addiu $a3,$a3,%lo(g_RoomPtrs) /* f004c1c: a1590000 */ sb $t9,0x0($t2) /* f004c20: 8fb8007c */ lw $t8,0x7c($sp) /* f004c24: a1580001 */ sb $t8,0x1($t2) @@ -5665,7 +5665,7 @@ glabel func0f0056f4 /* f0057c0: 52e20004 */ beql $s7,$v0,.L0f0057d4 /* f0057c4: c6040000 */ lwc1 $f4,0x0($s0) /* f0057c8: 17c20036 */ bne $s8,$v0,.L0f0058a4 -/* f0057cc: 3c16800a */ lui $s6,%hi(var800a4928) +/* f0057cc: 3c16800a */ lui $s6,%hi(g_RoomPtrs) .L0f0057d0: /* f0057d0: c6040000 */ lwc1 $f4,0x0($s0) .L0f0057d4: @@ -5726,7 +5726,7 @@ glabel func0f0056f4 /* f0058a0: e6400000 */ swc1 $f0,0x0($s2) .L0f0058a4: /* f0058a4: 001748c0 */ sll $t1,$s7,0x3 -/* f0058a8: 26d64928 */ addiu $s6,$s6,%lo(var800a4928) +/* f0058a8: 26d64928 */ addiu $s6,$s6,%lo(g_RoomPtrs) /* f0058ac: 01374821 */ addu $t1,$t1,$s7 /* f0058b0: 8ec20000 */ lw $v0,0x0($s6) /* f0058b4: 00094880 */ sll $t1,$t1,0x2 @@ -5844,9 +5844,9 @@ glabel func0f0056f4 /* f005a5c: e6400000 */ swc1 $f0,0x0($s2) .L0f005a60: /* f005a60: 001570c0 */ sll $t6,$s5,0x3 -/* f005a64: 3c1e800a */ lui $s8,%hi(var800a4928) +/* f005a64: 3c1e800a */ lui $s8,%hi(g_RoomPtrs) /* f005a68: 01d57021 */ addu $t6,$t6,$s5 -/* f005a6c: 27de4928 */ addiu $s8,$s8,%lo(var800a4928) +/* f005a6c: 27de4928 */ addiu $s8,$s8,%lo(g_RoomPtrs) /* f005a70: 000e7080 */ sll $t6,$t6,0x2 /* f005a74: 8fc20000 */ lw $v0,0x0($s8) /* f005a78: 01d57023 */ subu $t6,$t6,$s5 diff --git a/src/game/game_005fd0.c b/src/game/game_005fd0.c index b79c32032..bc3ef46d6 100644 --- a/src/game/game_005fd0.c +++ b/src/game/game_005fd0.c @@ -4055,8 +4055,8 @@ glabel func0f0099e4 /* f009a34: 8fbf0034 */ lw $ra,0x34($sp) /* f009a38: c4840000 */ lwc1 $f4,0x0($a0) /* f009a3c: c4860010 */ lwc1 $f6,0x10($a0) -/* f009a40: 3c13800a */ lui $s3,%hi(var800a4928) -/* f009a44: 26734928 */ addiu $s3,$s3,%lo(var800a4928) +/* f009a40: 3c13800a */ lui $s3,%hi(g_RoomPtrs) +/* f009a44: 26734928 */ addiu $s3,$s3,%lo(g_RoomPtrs) /* f009a48: 46062201 */ sub.s $f8,$f4,$f6 /* f009a4c: 24100001 */ addiu $s0,$zero,0x1 /* f009a50: 2403008c */ addiu $v1,$zero,0x8c diff --git a/src/game/game_0125a0.c b/src/game/game_0125a0.c index 8b8238f7a..5e3bbdcb3 100644 --- a/src/game/game_0125a0.c +++ b/src/game/game_0125a0.c @@ -646,8 +646,8 @@ glabel func0f012d50 /* f012ecc: 0000f025 */ or $s8,$zero,$zero .L0f012ed0: /* f012ed0: 8ead02bc */ lw $t5,0x2bc($s5) -/* f012ed4: 3c12800a */ lui $s2,%hi(var800a4928) -/* f012ed8: 26524928 */ addiu $s2,$s2,%lo(var800a4928) +/* f012ed4: 3c12800a */ lui $s2,%hi(g_RoomPtrs) +/* f012ed8: 26524928 */ addiu $s2,$s2,%lo(g_RoomPtrs) /* f012edc: 19a0000e */ blez $t5,.L0f012f18 /* f012ee0: 00001025 */ or $v0,$zero,$zero /* f012ee4: 8e4e0000 */ lw $t6,0x0($s2) @@ -666,8 +666,8 @@ glabel func0f012d50 /* f012f14: 0000f025 */ or $s8,$zero,$zero .L0f012f18: /* f012f18: 8fa90118 */ lw $t1,0x118($sp) -/* f012f1c: 3c12800a */ lui $s2,%hi(var800a4928) -/* f012f20: 26524928 */ addiu $s2,$s2,%lo(var800a4928) +/* f012f1c: 3c12800a */ lui $s2,%hi(g_RoomPtrs) +/* f012f20: 26524928 */ addiu $s2,$s2,%lo(g_RoomPtrs) /* f012f24: 1920002a */ blez $t1,.L0f012fd0 /* f012f28: 2410ffff */ addiu $s0,$zero,-1 /* f012f2c: 00008825 */ or $s1,$zero,$zero diff --git a/src/game/game_013540.c b/src/game/game_013540.c index 351ff16d9..d0335d67d 100644 --- a/src/game/game_013540.c +++ b/src/game/game_013540.c @@ -956,8 +956,8 @@ glabel func0f013ee0 /* f014204: 00002025 */ or $a0,$zero,$zero .L0f014208: /* f014208: 8d0f02bc */ lw $t7,0x2bc($t0) -/* f01420c: 3c03800a */ lui $v1,%hi(var800a4928) -/* f014210: 24634928 */ addiu $v1,$v1,%lo(var800a4928) +/* f01420c: 3c03800a */ lui $v1,%hi(g_RoomPtrs) +/* f014210: 24634928 */ addiu $v1,$v1,%lo(g_RoomPtrs) /* f014214: 19e0000a */ blez $t7,.L0f014240 /* f014218: 00001025 */ or $v0,$zero,$zero /* f01421c: 8c780000 */ lw $t8,0x0($v1) diff --git a/src/game/game_066310.c b/src/game/game_066310.c index 99bf5fb9c..10d8c5fe2 100644 --- a/src/game/game_066310.c +++ b/src/game/game_066310.c @@ -4407,9 +4407,9 @@ glabel func0f068c04 /* f068c80: 8c780014 */ lw $t8,0x14($v1) /* f068c84: 1300008f */ beqz $t8,.L0f068ec4 /* f068c88: 00000000 */ sll $zero,$zero,0x0 -/* f068c8c: 3c17800a */ lui $s7,%hi(var800a4928) +/* f068c8c: 3c17800a */ lui $s7,%hi(g_RoomPtrs) /* f068c90: 4480c000 */ mtc1 $zero,$f24 -/* f068c94: 26f74928 */ addiu $s7,$s7,%lo(var800a4928) +/* f068c94: 26f74928 */ addiu $s7,$s7,%lo(g_RoomPtrs) /* f068c98: 241e008c */ addiu $s8,$zero,0x8c /* f068c9c: 2416ffff */ addiu $s6,$zero,-1 /* f068ca0: afa70128 */ sw $a3,0x128($sp) diff --git a/src/game/game_0b28d0.c b/src/game/game_0b28d0.c index 8e6f3143c..92daf554b 100644 --- a/src/game/game_0b28d0.c +++ b/src/game/game_0b28d0.c @@ -4440,8 +4440,8 @@ glabel func0f0b6260 /* f0b628c: 00008825 */ or $s1,$zero,$zero /* f0b6290: 10d20036 */ beq $a2,$s2,.L0f0b636c /* f0b6294: 00808025 */ or $s0,$a0,$zero -/* f0b6298: 3c13800a */ lui $s3,%hi(var800a4928) -/* f0b629c: 26734928 */ addiu $s3,$s3,%lo(var800a4928) +/* f0b6298: 3c13800a */ lui $s3,%hi(g_RoomPtrs) +/* f0b629c: 26734928 */ addiu $s3,$s3,%lo(g_RoomPtrs) /* f0b62a0: 2414008c */ addiu $s4,$zero,0x8c .L0f0b62a4: /* f0b62a4: 00d40019 */ multu $a2,$s4 @@ -4831,10 +4831,10 @@ glabel func0f0b6764 /* f0b67c4: 3c013f80 */ lui $at,0x3f80 /* f0b67c8: 4481b000 */ mtc1 $at,$f22 /* f0b67cc: 3c0142c8 */ lui $at,0x42c8 -/* f0b67d0: 3c09800a */ lui $t1,%hi(var800a4928) +/* f0b67d0: 3c09800a */ lui $t1,%hi(g_RoomPtrs) /* f0b67d4: 44817000 */ mtc1 $at,$f14 /* f0b67d8: 44808000 */ mtc1 $zero,$f16 -/* f0b67dc: 25294928 */ addiu $t1,$t1,%lo(var800a4928) +/* f0b67dc: 25294928 */ addiu $t1,$t1,%lo(g_RoomPtrs) /* f0b67e0: 00002825 */ or $a1,$zero,$zero /* f0b67e4: 240c008c */ addiu $t4,$zero,0x8c /* f0b67e8: 240a000c */ addiu $t2,$zero,0xc @@ -17162,8 +17162,8 @@ glabel func0f0c1840 /* f0c1960: 8fad00bc */ lw $t5,0xbc($sp) /* f0c1964: 122f001e */ beq $s1,$t7,.L0f0c19e0 /* f0c1968: 27b00054 */ addiu $s0,$sp,0x54 -/* f0c196c: 3c12800a */ lui $s2,%hi(var800a4928) -/* f0c1970: 26524928 */ addiu $s2,$s2,%lo(var800a4928) +/* f0c196c: 3c12800a */ lui $s2,%hi(g_RoomPtrs) +/* f0c1970: 26524928 */ addiu $s2,$s2,%lo(g_RoomPtrs) /* f0c1974: 86050000 */ lh $a1,0x0($s0) /* f0c1978: 2413008c */ addiu $s3,$zero,0x8c .L0f0c197c: @@ -17196,8 +17196,8 @@ glabel func0f0c1840 .L0f0c19e0: /* f0c19e0: 8fad00bc */ lw $t5,0xbc($sp) .L0f0c19e4: -/* f0c19e4: 3c12800a */ lui $s2,%hi(var800a4928) -/* f0c19e8: 26524928 */ addiu $s2,$s2,%lo(var800a4928) +/* f0c19e4: 3c12800a */ lui $s2,%hi(g_RoomPtrs) +/* f0c19e8: 26524928 */ addiu $s2,$s2,%lo(g_RoomPtrs) /* f0c19ec: 15a0001f */ bnez $t5,.L0f0c1a6c /* f0c19f0: 2413008c */ addiu $s3,$zero,0x8c /* f0c19f4: 87ae0054 */ lh $t6,0x54($sp) diff --git a/src/game/game_129900.c b/src/game/game_129900.c index 9ab49f713..000df5791 100644 --- a/src/game/game_129900.c +++ b/src/game/game_129900.c @@ -1561,7 +1561,7 @@ glabel func0f129f54 /* f12a370: 8fab012c */ lw $t3,0x12c($sp) /* f12a374: 46168482 */ mul.s $f18,$f16,$f22 /* f12a378: c7b000cc */ lwc1 $f16,0xcc($sp) -/* f12a37c: 3c09800a */ lui $t1,%hi(var800a4928) +/* f12a37c: 3c09800a */ lui $t1,%hi(g_RoomPtrs) /* f12a380: 46163102 */ mul.s $f4,$f6,$f22 /* f12a384: e7aa00d4 */ swc1 $f10,0xd4($sp) /* f12a388: c7a600d0 */ lwc1 $f6,0xd0($sp) @@ -1570,7 +1570,7 @@ glabel func0f129f54 /* f12a394: 000b40c0 */ sll $t0,$t3,0x3 /* f12a398: 46168482 */ mul.s $f18,$f16,$f22 /* f12a39c: e7a400dc */ swc1 $f4,0xdc($sp) -/* f12a3a0: 25294928 */ addiu $t1,$t1,%lo(var800a4928) +/* f12a3a0: 25294928 */ addiu $t1,$t1,%lo(g_RoomPtrs) /* f12a3a4: 46163102 */ mul.s $f4,$f6,$f22 /* f12a3a8: 010b4021 */ addu $t0,$t0,$t3 /* f12a3ac: 8d2e0000 */ lw $t6,0x0($t1) @@ -1670,8 +1670,8 @@ glabel func0f129f54 /* f12a51c: 27a600d4 */ addiu $a2,$sp,0xd4 /* f12a520: 0fc593e7 */ jal func0f164f9c /* f12a524: 27a700c8 */ addiu $a3,$sp,0xc8 -/* f12a528: 3c09800a */ lui $t1,%hi(var800a4928) -/* f12a52c: 25294928 */ addiu $t1,$t1,%lo(var800a4928) +/* f12a528: 3c09800a */ lui $t1,%hi(g_RoomPtrs) +/* f12a52c: 25294928 */ addiu $t1,$t1,%lo(g_RoomPtrs) /* f12a530: 10400168 */ beqz $v0,.L0f12aad4 /* f12a534: 8faa0158 */ lw $t2,0x158($sp) /* f12a538: 8fa50118 */ lw $a1,0x118($sp) @@ -1897,9 +1897,9 @@ glabel func0f129f54 /* f12a864: afaa0158 */ sw $t2,0x158($sp) /* f12a868: 8fa30080 */ lw $v1,0x80($sp) /* f12a86c: c64a0000 */ lwc1 $f10,0x0($s2) -/* f12a870: 3c09800a */ lui $t1,%hi(var800a4928) +/* f12a870: 3c09800a */ lui $t1,%hi(g_RoomPtrs) /* f12a874: c4640000 */ lwc1 $f4,0x0($v1) -/* f12a878: 25294928 */ addiu $t1,$t1,%lo(var800a4928) +/* f12a878: 25294928 */ addiu $t1,$t1,%lo(g_RoomPtrs) /* f12a87c: 8fa70078 */ lw $a3,0x78($sp) /* f12a880: 46142200 */ add.s $f8,$f4,$f20 /* f12a884: 8fa80074 */ lw $t0,0x74($sp) @@ -12045,8 +12045,8 @@ glabel func0f132e28 .L0f133aa8: /* f133aa8: 1a800031 */ blez $s4,.L0f133b70 /* f133aac: 2415008c */ addiu $s5,$zero,0x8c -/* f133ab0: 3c16800a */ lui $s6,%hi(var800a4928) -/* f133ab4: 26d64928 */ addiu $s6,$s6,%lo(var800a4928) +/* f133ab0: 3c16800a */ lui $s6,%hi(g_RoomPtrs) +/* f133ab4: 26d64928 */ addiu $s6,$s6,%lo(g_RoomPtrs) /* f133ab8: 27b10cb8 */ addiu $s1,$sp,0xcb8 /* f133abc: 27be070c */ addiu $s8,$sp,0x70c /* f133ac0: 2413000c */ addiu $s3,$zero,0xc @@ -12097,8 +12097,8 @@ glabel func0f132e28 /* f133b6c: 26310004 */ addiu $s1,$s1,0x4 .L0f133b70: /* f133b70: 8fac0708 */ lw $t4,0x708($sp) -/* f133b74: 3c16800a */ lui $s6,%hi(var800a4928) -/* f133b78: 26d64928 */ addiu $s6,$s6,%lo(var800a4928) +/* f133b74: 3c16800a */ lui $s6,%hi(g_RoomPtrs) +/* f133b78: 26d64928 */ addiu $s6,$s6,%lo(g_RoomPtrs) /* f133b7c: 00008025 */ or $s0,$zero,$zero /* f133b80: 1980002d */ blez $t4,.L0f133c38 /* f133b84: e7b40c84 */ swc1 $f20,0xc84($sp) @@ -12148,8 +12148,8 @@ glabel func0f132e28 /* f133c30: 8e390000 */ lw $t9,0x0($s1) /* f133c34: e7b40c84 */ swc1 $f20,0xc84($sp) .L0f133c38: -/* f133c38: 3c16800a */ lui $s6,%hi(var800a4928) -/* f133c3c: 26d64928 */ addiu $s6,$s6,%lo(var800a4928) +/* f133c38: 3c16800a */ lui $s6,%hi(g_RoomPtrs) +/* f133c3c: 26d64928 */ addiu $s6,$s6,%lo(g_RoomPtrs) /* f133c40: 2415008c */ addiu $s5,$zero,0x8c /* f133c44: c7b40c84 */ lwc1 $f20,0xc84($sp) /* f133c48: 0fc59e73 */ jal func0f1679cc @@ -13337,9 +13337,9 @@ glabel func0f1346b0 /* f134dc4: 19000037 */ blez $t0,.L0f134ea4 /* f134dc8: 2411008c */ addiu $s1,$zero,0x8c /* f134dcc: 3c013f80 */ lui $at,0x3f80 -/* f134dd0: 3c14800a */ lui $s4,%hi(var800a4928) +/* f134dd0: 3c14800a */ lui $s4,%hi(g_RoomPtrs) /* f134dd4: 4481a000 */ mtc1 $at,$f20 -/* f134dd8: 26944928 */ addiu $s4,$s4,%lo(var800a4928) +/* f134dd8: 26944928 */ addiu $s4,$s4,%lo(g_RoomPtrs) /* f134ddc: 27ac126c */ addiu $t4,$sp,0x126c /* f134de0: 27b61078 */ addiu $s6,$sp,0x1078 /* f134de4: 27b50bc8 */ addiu $s5,$sp,0xbc8 @@ -24156,10 +24156,10 @@ glabel func0f13e994 /* f13e994: 27bdffd0 */ addiu $sp,$sp,-48 /* f13e998: afbf001c */ sw $ra,0x1c($sp) /* f13e99c: 3c0c800a */ lui $t4,%hi(var8009cc40) -/* f13e9a0: 3c0a800a */ lui $t2,%hi(var800a4928) +/* f13e9a0: 3c0a800a */ lui $t2,%hi(g_RoomPtrs) /* f13e9a4: afb00018 */ sw $s0,0x18($sp) /* f13e9a8: 0000f825 */ or $ra,$zero,$zero -/* f13e9ac: 254a4928 */ addiu $t2,$t2,%lo(var800a4928) +/* f13e9ac: 254a4928 */ addiu $t2,$t2,%lo(g_RoomPtrs) /* f13e9b0: 258ccc40 */ addiu $t4,$t4,%lo(var8009cc40) /* f13e9b4: 00004025 */ or $t0,$zero,$zero /* f13e9b8: 240d0001 */ addiu $t5,$zero,0x1 @@ -24250,10 +24250,10 @@ glabel func0f13e994 /* f13ead8: afbf0024 */ sw $ra,0x24($sp) /* f13eadc: 0fc4f9d1 */ jal func0f13e744 /* f13eae0: afa80028 */ sw $t0,0x28($sp) -/* f13eae4: 3c0a800a */ lui $t2,%hi(var800a4928) +/* f13eae4: 3c0a800a */ lui $t2,%hi(g_RoomPtrs) /* f13eae8: 3c0c800a */ lui $t4,%hi(var8009cc40) /* f13eaec: 258ccc40 */ addiu $t4,$t4,%lo(var8009cc40) -/* f13eaf0: 254a4928 */ addiu $t2,$t2,%lo(var800a4928) +/* f13eaf0: 254a4928 */ addiu $t2,$t2,%lo(g_RoomPtrs) /* f13eaf4: 8fa80028 */ lw $t0,0x28($sp) /* f13eaf8: 240b008c */ addiu $t3,$zero,0x8c /* f13eafc: 240d0001 */ addiu $t5,$zero,0x1 @@ -25165,12 +25165,12 @@ glabel func0f13f504 .L0f13f7fc: /* f13f7fc: 8faa024c */ lw $t2,0x24c($sp) /* f13f800: 87a2021a */ lh $v0,0x21a($sp) -/* f13f804: 3c03800a */ lui $v1,%hi(var800a4928) +/* f13f804: 3c03800a */ lui $v1,%hi(g_RoomPtrs) /* f13f808: 11400011 */ beqz $t2,.L0f13f850 /* f13f80c: 0002c0c0 */ sll $t8,$v0,0x3 /* f13f810: 87a2021a */ lh $v0,0x21a($sp) -/* f13f814: 3c03800a */ lui $v1,%hi(var800a4928) -/* f13f818: 24634928 */ addiu $v1,$v1,%lo(var800a4928) +/* f13f814: 3c03800a */ lui $v1,%hi(g_RoomPtrs) +/* f13f818: 24634928 */ addiu $v1,$v1,%lo(g_RoomPtrs) /* f13f81c: 0002c8c0 */ sll $t9,$v0,0x3 /* f13f820: 0322c821 */ addu $t9,$t9,$v0 /* f13f824: 8c690000 */ lw $t1,0x0($v1) @@ -25185,7 +25185,7 @@ glabel func0f13f504 /* f13f848: 1000000d */ beqz $zero,.L0f13f880 /* f13f84c: ad730088 */ sw $s3,0x88($t3) .L0f13f850: -/* f13f850: 24634928 */ addiu $v1,$v1,%lo(var800a4928) +/* f13f850: 24634928 */ addiu $v1,$v1,%lo(g_RoomPtrs) /* f13f854: 0302c021 */ addu $t8,$t8,$v0 /* f13f858: 8c6f0000 */ lw $t7,0x0($v1) /* f13f85c: 0018c080 */ sll $t8,$t8,0x2 @@ -26986,8 +26986,8 @@ glabel func0f141234 /* f141244: 8c6341b0 */ lw $v1,0x41b0($v1) /* f141248: 188000d2 */ blez $a0,.L0f141594 /* f14124c: 00001025 */ or $v0,$zero,$zero -/* f141250: 3c0d800a */ lui $t5,%hi(var800a4928) -/* f141254: 25ad4928 */ addiu $t5,$t5,%lo(var800a4928) +/* f141250: 3c0d800a */ lui $t5,%hi(g_RoomPtrs) +/* f141254: 25ad4928 */ addiu $t5,$t5,%lo(g_RoomPtrs) /* f141258: c7ac0004 */ lwc1 $f12,0x4($sp) /* f14125c: c7a20008 */ lwc1 $f2,0x8($sp) /* f141260: c7a0000c */ lwc1 $f0,0xc($sp) diff --git a/src/game/game_157db0.c b/src/game/game_157db0.c index b030b008d..43906e6ed 100644 --- a/src/game/game_157db0.c +++ b/src/game/game_157db0.c @@ -189,9 +189,9 @@ glabel func0f157db0 GLOBAL_ASM( glabel func0f157e94 -/* f157e94: 3c0c800a */ lui $t4,%hi(var800a4928) +/* f157e94: 3c0c800a */ lui $t4,%hi(g_RoomPtrs) /* f157e98: 000470c0 */ sll $t6,$a0,0x3 -/* f157e9c: 258c4928 */ addiu $t4,$t4,%lo(var800a4928) +/* f157e9c: 258c4928 */ addiu $t4,$t4,%lo(g_RoomPtrs) /* f157ea0: 01c47021 */ addu $t6,$t6,$a0 /* f157ea4: 8d8f0000 */ lw $t7,0x0($t4) /* f157ea8: 27bdffe0 */ addiu $sp,$sp,-32 @@ -326,8 +326,8 @@ glabel func0f157e94 /* f15808c: 8fa40020 */ lw $a0,0x20($sp) /* f158090: 0fc55f6c */ jal func0f157db0 /* f158094: afab0018 */ sw $t3,0x18($sp) -/* f158098: 3c0c800a */ lui $t4,%hi(var800a4928) -/* f15809c: 258c4928 */ addiu $t4,$t4,%lo(var800a4928) +/* f158098: 3c0c800a */ lui $t4,%hi(g_RoomPtrs) +/* f15809c: 258c4928 */ addiu $t4,$t4,%lo(g_RoomPtrs) /* f1580a0: 8fab0018 */ lw $t3,0x18($sp) /* f1580a4: 8d980000 */ lw $t8,0x0($t4) /* f1580a8: 3c058008 */ lui $a1,%hi(var8007fc10) @@ -4256,8 +4256,8 @@ glabel func0f15b908 /* f15b964: 0c0048f2 */ jal func000123c8 /* f15b968: 24050004 */ addiu $a1,$zero,0x4 /* f15b96c: 8e6402bc */ lw $a0,0x2bc($s3) -/* f15b970: 3c15800a */ lui $s5,%hi(var800a4928) -/* f15b974: 26b54928 */ addiu $s5,$s5,%lo(var800a4928) +/* f15b970: 3c15800a */ lui $s5,%hi(g_RoomPtrs) +/* f15b974: 26b54928 */ addiu $s5,$s5,%lo(g_RoomPtrs) /* f15b978: 0004c880 */ sll $t9,$a0,0x2 /* f15b97c: 2724000f */ addiu $a0,$t9,0xf /* f15b980: 348e000f */ ori $t6,$a0,0xf @@ -5696,7 +5696,7 @@ glabel func0f15cd90 /* f15cda4: afbf001c */ sw $ra,0x1c($sp) /* f15cda8: afb10018 */ sw $s1,0x18($sp) /* f15cdac: 02048023 */ subu $s0,$s0,$a0 -/* f15cdb0: 3c0c800a */ lui $t4,%hi(var800a4928) +/* f15cdb0: 3c0c800a */ lui $t4,%hi(g_RoomPtrs) /* f15cdb4: 00a03025 */ or $a2,$a1,$zero /* f15cdb8: 0000f825 */ or $ra,$zero,$zero /* f15cdbc: 00003825 */ or $a3,$zero,$zero @@ -5704,7 +5704,7 @@ glabel func0f15cd90 /* f15cdc4: 00004825 */ or $t1,$zero,$zero /* f15cdc8: 00005025 */ or $t2,$zero,$zero /* f15cdcc: 00005825 */ or $t3,$zero,$zero -/* f15cdd0: 258c4928 */ addiu $t4,$t4,%lo(var800a4928) +/* f15cdd0: 258c4928 */ addiu $t4,$t4,%lo(g_RoomPtrs) /* f15cdd4: 00108080 */ sll $s0,$s0,0x2 /* f15cdd8: 24110008 */ addiu $s1,$zero,0x8 /* f15cddc: 00001825 */ or $v1,$zero,$zero @@ -5751,10 +5751,10 @@ glabel func0f15cd90 /* f15ce64: afaa0030 */ sw $t2,0x30($sp) /* f15ce68: 0fc57423 */ jal func0f15d08c /* f15ce6c: afab002c */ sw $t3,0x2c($sp) -/* f15ce70: 3c0c800a */ lui $t4,%hi(var800a4928) +/* f15ce70: 3c0c800a */ lui $t4,%hi(g_RoomPtrs) /* f15ce74: 3c0d800a */ lui $t5,%hi(var800a4cf0) /* f15ce78: 25ad4cf0 */ addiu $t5,$t5,%lo(var800a4cf0) -/* f15ce7c: 258c4928 */ addiu $t4,$t4,%lo(var800a4928) +/* f15ce7c: 258c4928 */ addiu $t4,$t4,%lo(g_RoomPtrs) /* f15ce80: 8fa3005c */ lw $v1,0x5c($sp) /* f15ce84: 8fa60064 */ lw $a2,0x64($sp) /* f15ce88: 8fa7003c */ lw $a3,0x3c($sp) @@ -6893,8 +6893,8 @@ glabel func0f15dc58 /* f15dde8: 8c4b0000 */ lw $t3,0x0($v0) /* f15ddec: 0fc5766a */ jal func0f15d9a8 /* f15ddf0: 032b3023 */ subu $a2,$t9,$t3 -/* f15ddf4: 3c09800a */ lui $t1,%hi(var800a4928) -/* f15ddf8: 25294928 */ addiu $t1,$t1,%lo(var800a4928) +/* f15ddf4: 3c09800a */ lui $t1,%hi(g_RoomPtrs) +/* f15ddf8: 25294928 */ addiu $t1,$t1,%lo(g_RoomPtrs) /* f15ddfc: 8fa80054 */ lw $t0,0x54($sp) /* f15de00: 8d2c0000 */ lw $t4,0x0($t1) /* f15de04: afa202f0 */ sw $v0,0x2f0($sp) @@ -7414,8 +7414,8 @@ glabel func0f15e538 /* f15e554: afb00018 */ sw $s0,0x18($sp) /* f15e558: 14200011 */ bnez $at,.L0f15e5a0 /* f15e55c: 24110001 */ addiu $s1,$zero,0x1 -/* f15e560: 3c12800a */ lui $s2,%hi(var800a4928) -/* f15e564: 26524928 */ addiu $s2,$s2,%lo(var800a4928) +/* f15e560: 3c12800a */ lui $s2,%hi(g_RoomPtrs) +/* f15e564: 26524928 */ addiu $s2,$s2,%lo(g_RoomPtrs) /* f15e568: 2410008c */ addiu $s0,$zero,0x8c .L0f15e56c: /* f15e56c: 8e4e0000 */ lw $t6,0x0($s2) @@ -7503,8 +7503,8 @@ glabel func0f15e5b8 /* f15e688: 2411008c */ addiu $s1,$zero,0x8c /* f15e68c: 29c10002 */ slti $at,$t6,0x2 /* f15e690: 1420001c */ bnez $at,.L0f15e704 -/* f15e694: 3c13800a */ lui $s3,%hi(var800a4928) -/* f15e698: 26734928 */ addiu $s3,$s3,%lo(var800a4928) +/* f15e694: 3c13800a */ lui $s3,%hi(g_RoomPtrs) +/* f15e698: 26734928 */ addiu $s3,$s3,%lo(g_RoomPtrs) /* f15e69c: 8e6f0000 */ lw $t7,0x0($s3) .L0f15e6a0: /* f15e6a0: 01f1c021 */ addu $t8,$t7,$s1 @@ -7568,8 +7568,8 @@ glabel func0f15e728 /* f15e768: 24110001 */ addiu $s1,$zero,0x1 /* f15e76c: 3c17800a */ lui $s7,0x800a /* f15e770: 3c15800a */ lui $s5,%hi(var800a4bf0) -/* f15e774: 3c13800a */ lui $s3,%hi(var800a4928) -/* f15e778: 26734928 */ addiu $s3,$s3,%lo(var800a4928) +/* f15e774: 3c13800a */ lui $s3,%hi(g_RoomPtrs) +/* f15e778: 26734928 */ addiu $s3,$s3,%lo(g_RoomPtrs) /* f15e77c: 26b54bf0 */ addiu $s5,$s5,%lo(var800a4bf0) /* f15e780: 26f74bf2 */ addiu $s7,$s7,0x4bf2 /* f15e784: 2410008c */ addiu $s0,$zero,0x8c @@ -10845,7 +10845,7 @@ glabel func0f161520 /* f1615e0: e7a6009c */ swc1 $f6,0x9c($sp) /* f1615e4: 8defa27c */ lw $t7,-0x5d84($t7) /* f1615e8: 8fb500f0 */ lw $s5,0xf0($sp) -/* f1615ec: 3c16800a */ lui $s6,%hi(var800a4928) +/* f1615ec: 3c16800a */ lui $s6,%hi(g_RoomPtrs) /* f1615f0: 00cf082a */ slt $at,$a2,$t7 /* f1615f4: 14200003 */ bnez $at,.L0f161604 /* f1615f8: 0015c0c0 */ sll $t8,$s5,0x3 @@ -10853,7 +10853,7 @@ glabel func0f161520 /* f1615fc: 10000120 */ beqz $zero,.L0f161a80 /* f161600: 00001025 */ or $v0,$zero,$zero .L0f161604: -/* f161604: 26d64928 */ addiu $s6,$s6,%lo(var800a4928) +/* f161604: 26d64928 */ addiu $s6,$s6,%lo(g_RoomPtrs) /* f161608: 0315c021 */ addu $t8,$t8,$s5 /* f16160c: 8ed90000 */ lw $t9,0x0($s6) /* f161610: 0018c080 */ sll $t8,$t8,0x2 @@ -11689,8 +11689,8 @@ glabel func0f162194 /* f1621dc: 4600a006 */ mov.s $f0,$f20 /* f1621e0: 14200041 */ bnez $at,.L0f1622e8 /* f1621e4: e7a80050 */ swc1 $f8,0x50($sp) -/* f1621e8: 3c10800a */ lui $s0,%hi(var800a4928) -/* f1621ec: 26104928 */ addiu $s0,$s0,%lo(var800a4928) +/* f1621e8: 3c10800a */ lui $s0,%hi(g_RoomPtrs) +/* f1621ec: 26104928 */ addiu $s0,$s0,%lo(g_RoomPtrs) /* f1621f0: 2404008c */ addiu $a0,$zero,0x8c .L0f1621f4: /* f1621f4: 8e0e0000 */ lw $t6,0x0($s0) @@ -11760,10 +11760,10 @@ glabel func0f162194 .L0f1622e8: /* f1622e8: 8fae0064 */ lw $t6,0x64($sp) /* f1622ec: 8faf0068 */ lw $t7,0x68($sp) -/* f1622f0: 3c10800a */ lui $s0,%hi(var800a4928) +/* f1622f0: 3c10800a */ lui $s0,%hi(g_RoomPtrs) /* f1622f4: 00093040 */ sll $a2,$t1,0x1 /* f1622f8: 000a6040 */ sll $t4,$t2,0x1 -/* f1622fc: 26104928 */ addiu $s0,$s0,%lo(var800a4928) +/* f1622fc: 26104928 */ addiu $s0,$s0,%lo(g_RoomPtrs) /* f162300: 01c65821 */ addu $t3,$t6,$a2 /* f162304: 15200043 */ bnez $t1,.L0f162414 /* f162308: 01ec6821 */ addu $t5,$t7,$t4 @@ -12002,10 +12002,10 @@ glabel func0f1625ec .L0f162630: /* f162630: 3c17800a */ lui $s7,%hi(var800a4cc8) /* f162634: 3c15800a */ lui $s5,%hi(var800a65c0) -/* f162638: 3c14800a */ lui $s4,%hi(var800a4928) +/* f162638: 3c14800a */ lui $s4,%hi(g_RoomPtrs) /* f16263c: 3c138008 */ lui $s3,%hi(var8007fcac) /* f162640: 2673fcac */ addiu $s3,$s3,%lo(var8007fcac) -/* f162644: 26944928 */ addiu $s4,$s4,%lo(var800a4928) +/* f162644: 26944928 */ addiu $s4,$s4,%lo(g_RoomPtrs) /* f162648: 26b565c0 */ addiu $s5,$s5,%lo(var800a65c0) /* f16264c: 26f74cc8 */ addiu $s7,$s7,%lo(var800a4cc8) /* f162650: 24160001 */ addiu $s6,$zero,0x1 @@ -12636,7 +12636,7 @@ glabel func0f162d9c /* f162f48: 240d7fff */ addiu $t5,$zero,0x7fff /* f162f4c: 24120001 */ addiu $s2,$zero,0x1 /* f162f50: 2413008c */ addiu $s3,$zero,0x8c -/* f162f54: 3c15800a */ lui $s5,%hi(var800a4928) +/* f162f54: 3c15800a */ lui $s5,%hi(g_RoomPtrs) /* f162f58: 46809120 */ cvt.s.w $f4,$f18 /* f162f5c: 46082280 */ add.s $f10,$f4,$f8 /* f162f60: e6ca0028 */ swc1 $f10,0x28($s6) @@ -12683,7 +12683,7 @@ glabel func0f162d9c /* f163004: a4cc02da */ sh $t4,0x2da($a2) /* f163008: 3c013f00 */ lui $at,0x3f00 /* f16300c: 4481a000 */ mtc1 $at,$f20 -/* f163010: 26b54928 */ addiu $s5,$s5,%lo(var800a4928) +/* f163010: 26b54928 */ addiu $s5,$s5,%lo(g_RoomPtrs) .L0f163014: /* f163014: 8eae0000 */ lw $t6,0x0($s5) /* f163018: c7aa00ac */ lwc1 $f10,0xac($sp) @@ -13366,12 +13366,12 @@ glabel func0f16397c /* f1639b8: ae000000 */ sw $zero,0x0($s0) /* f1639bc: 954e0000 */ lhu $t6,0x0($t2) /* f1639c0: 0000a825 */ or $s5,$zero,$zero -/* f1639c4: 3c16800a */ lui $s6,%hi(var800a4928) +/* f1639c4: 3c16800a */ lui $s6,%hi(g_RoomPtrs) /* f1639c8: 11c000d0 */ beqz $t6,.L0f163d0c /* f1639cc: 01401825 */ or $v1,$t2,$zero /* f1639d0: 3c14800a */ lui $s4,%hi(var800a4ce0) /* f1639d4: 26944ce0 */ addiu $s4,$s4,%lo(var800a4ce0) -/* f1639d8: 26d64928 */ addiu $s6,$s6,%lo(var800a4928) +/* f1639d8: 26d64928 */ addiu $s6,$s6,%lo(g_RoomPtrs) /* f1639dc: 2411008c */ addiu $s1,$zero,0x8c /* f1639e0: 906f0006 */ lbu $t7,0x6($v1) .L0f1639e4: @@ -13594,8 +13594,8 @@ glabel func0f16397c /* f163d0c: 3c08800a */ lui $t0,%hi(g_Vars) /* f163d10: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) /* f163d14: 8d180314 */ lw $t8,0x314($t0) -/* f163d18: 3c16800a */ lui $s6,%hi(var800a4928) -/* f163d1c: 26d64928 */ addiu $s6,$s6,%lo(var800a4928) +/* f163d18: 3c16800a */ lui $s6,%hi(g_RoomPtrs) +/* f163d1c: 26d64928 */ addiu $s6,$s6,%lo(g_RoomPtrs) /* f163d20: 13000039 */ beqz $t8,.L0f163e08 /* f163d24: 240d0001 */ addiu $t5,$zero,0x1 /* f163d28: 8d02028c */ lw $v0,0x28c($t0) @@ -13712,9 +13712,9 @@ glabel func0f163e34 /* f163ebc: c508000c */ lwc1 $f8,0xc($t0) /* f163ec0: c5aa0074 */ lwc1 $f10,0x74($t5) /* f163ec4: 8e4e02bc */ lw $t6,0x2bc($s2) -/* f163ec8: 3c02800a */ lui $v0,%hi(var800a4928) +/* f163ec8: 3c02800a */ lui $v0,%hi(g_RoomPtrs) /* f163ecc: 460a4403 */ div.s $f16,$f8,$f10 -/* f163ed0: 24424928 */ addiu $v0,$v0,%lo(var800a4928) +/* f163ed0: 24424928 */ addiu $v0,$v0,%lo(g_RoomPtrs) /* f163ed4: 00002825 */ or $a1,$zero,$zero /* f163ed8: 00001825 */ or $v1,$zero,$zero /* f163edc: 24070001 */ addiu $a3,$zero,0x1 diff --git a/src/game/game_16cfa0.c b/src/game/game_16cfa0.c index 2fd790885..57b4bdec7 100644 --- a/src/game/game_16cfa0.c +++ b/src/game/game_16cfa0.c @@ -685,8 +685,8 @@ glabel func0f16d6c0 /* f16d774: 24040001 */ addiu $a0,$zero,0x1 .L0f16d778: /* f16d778: 8cac0064 */ lw $t4,0x64($a1) -/* f16d77c: 3c0a800a */ lui $t2,%hi(var800a4928) -/* f16d780: 254a4928 */ addiu $t2,$t2,%lo(var800a4928) +/* f16d77c: 3c0a800a */ lui $t2,%hi(g_RoomPtrs) +/* f16d780: 254a4928 */ addiu $t2,$t2,%lo(g_RoomPtrs) /* f16d784: 11800003 */ beqz $t4,.L0f16d794 /* f16d788: 240b008c */ addiu $t3,$zero,0x8c /* f16d78c: 10000001 */ beqz $zero,.L0f16d794 diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c index c2b01cc27..587921cac 100644 --- a/src/gvars/gvars.c +++ b/src/gvars/gvars.c @@ -23981,7 +23981,7 @@ u32 var800a4918 = 0; u32 var800a491c = 0; u32 var800a4920 = 0; u32 var800a4924 = 0; -u32 var800a4928 = 0; +struct room *g_RoomPtrs = NULL; u32 var800a492c = 0; u32 var800a4930 = 0; u32 var800a4934 = 0; diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index e6102a441..ed5f2e2ad 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -762,7 +762,7 @@ extern u32 var800a4640; extern u32 var800a491c; extern u32 var800a4920; extern u32 var800a4924; -extern u32 var800a4928; +extern struct room *g_RoomPtrs; extern u32 var800a492c; extern u32 var800a4930; extern u32 var800a4bec; diff --git a/src/include/types.h b/src/include/types.h index f0dad443a..cc14a894f 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -2643,4 +2643,42 @@ struct gvars800a3fc8 { u32 unk20; }; +struct room { + /*0x00*/ u16 unk00; + /*0x04*/ u32 unk04; + /*0x08*/ u32 unk08; + /*0x0c*/ u32 unk0c; + /*0x10*/ u32 unk10; + /*0x14*/ u32 unk14; + /*0x18*/ u32 unk18; + /*0x1c*/ u32 unk1c; + /*0x20*/ u32 unk20; + /*0x24*/ u32 unk24; + /*0x28*/ u32 unk28; + /*0x2c*/ u32 unk2c; + /*0x30*/ u32 unk30; + /*0x34*/ u32 unk34; + /*0x38*/ u32 unk38; + /*0x3c*/ u32 unk3c; + /*0x40*/ u32 unk40; + /*0x44*/ u32 unk44; + /*0x48*/ u32 unk48; + /*0x4c*/ u32 unk4c; + /*0x50*/ u32 unk50; + /*0x54*/ u32 unk54; + /*0x58*/ u32 unk58; + /*0x5c*/ u32 unk5c; + /*0x60*/ u32 unk60; + /*0x64*/ u32 unk64; + /*0x68*/ u32 unk68; + /*0x6c*/ u32 unk6c; + /*0x70*/ u32 unk70; + /*0x74*/ u32 unk74; + /*0x78*/ u32 unk78; + /*0x7c*/ u32 unk7c; + /*0x80*/ u32 unk80; + /*0x84*/ u32 unk84; + /*0x88*/ u32 unk88; +}; + #endif