From d3b023476fdffbff355c808c4a8ae3c57e96681f Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Wed, 8 Apr 2020 21:24:51 +1000 Subject: [PATCH] Decompile func0f161ab4 and rename g_RoomPtrs to g_Rooms --- src/game/chr/chraction.c | 4 +- src/game/chr/chraicommands.c | 22 +-- src/game/dlights.c | 184 ++++++++--------- src/game/game_006bd0.c | 4 +- src/game/game_012d50.c | 8 +- src/game/game_013ee0.c | 4 +- src/game/game_0601b0.c | 8 +- src/game/game_0b3350.c | 4 +- src/game/game_0b63b0.c | 12 +- src/game/game_129900.c | 24 +-- src/game/game_12d3f0.c | 4 +- src/game/game_12f6c0.c | 4 +- src/game/game_13b670.c | 4 +- src/game/game_13c510.c | 20 +- src/game/game_157db0.c | 347 ++++++++++++++++----------------- src/game/game_1668e0.c | 12 +- src/game/game_16cfa0.c | 4 +- src/game/game_19aa80.c | 8 +- src/game/padhalllv.c | 8 +- src/game/propobj.c | 8 +- src/game/wallhit.c | 44 ++--- src/game/weather.c | 28 +-- src/gvars/gvars.c | 2 +- src/include/game/game_157db0.h | 2 +- src/include/gvars/gvars.h | 2 +- src/lib/lib_16110.c | 4 +- 26 files changed, 383 insertions(+), 392 deletions(-) diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c index 5f89da591..07c969557 100644 --- a/src/game/chr/chraction.c +++ b/src/game/chr/chraction.c @@ -9788,8 +9788,8 @@ glabel func0f036c08 /* f036d2c: 2404ffff */ addiu $a0,$zero,-1 /* f036d30: 108f0012 */ beq $a0,$t7,.L0f036d7c /* f036d34: 27a2007c */ addiu $v0,$sp,0x7c -/* f036d38: 3c05800a */ lui $a1,%hi(g_RoomPtrs) -/* f036d3c: 8ca54928 */ lw $a1,%lo(g_RoomPtrs)($a1) +/* f036d38: 3c05800a */ lui $a1,%hi(g_Rooms) +/* f036d3c: 8ca54928 */ lw $a1,%lo(g_Rooms)($a1) /* f036d40: 84430000 */ lh $v1,0x0($v0) /* f036d44: 2406008c */ addiu $a2,$zero,0x8c .L0f036d48: diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 4665952cd..d047adea4 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -11002,8 +11002,8 @@ glabel ai01d4 /* f05f7e8: 00095403 */ sra $t2,$t1,0x10 /* f05f7ec: 000ac8c0 */ sll $t9,$t2,0x3 /* f05f7f0: 032ac821 */ addu $t9,$t9,$t2 -/* f05f7f4: 3c18800a */ lui $t8,%hi(g_RoomPtrs) -/* f05f7f8: 8f184928 */ lw $t8,%lo(g_RoomPtrs)($t8) +/* f05f7f4: 3c18800a */ lui $t8,%hi(g_Rooms) +/* f05f7f8: 8f184928 */ lw $t8,%lo(g_Rooms)($t8) /* f05f7fc: 0019c880 */ sll $t9,$t9,0x2 /* f05f800: 032ac823 */ subu $t9,$t9,$t2 /* f05f804: 0019c880 */ sll $t9,$t9,0x2 @@ -11026,7 +11026,7 @@ glabel ai01d4 // s16 room_id = cmd[3] | (cmd[2] << 8); // u32 value = cmd[5] | (cmd[4] << 8); // -// struct room *room = &g_RoomPtrs[room_id]; +// struct room *room = &g_Rooms[room_id]; // room->unk00 |= value; // // g_Vars.aioffset += 6; @@ -11092,29 +11092,29 @@ bool aiMiscellaneous(void) var8006ae28 = value; break; case 5: - g_RoomPtrs[room_id].flags &= ~ROOMFLAG_4000; + g_Rooms[room_id].flags &= ~ROOMFLAG_4000; if (value) { - g_RoomPtrs[room_id].flags |= ROOMFLAG_4000; + g_Rooms[room_id].flags |= ROOMFLAG_4000; } break; case 6: - g_RoomPtrs[room_id].flags &= ~ROOMFLAG_8000; + g_Rooms[room_id].flags &= ~ROOMFLAG_8000; if (value) { - g_RoomPtrs[room_id].flags |= ROOMFLAG_8000; + g_Rooms[room_id].flags |= ROOMFLAG_8000; } break; case 7: - g_RoomPtrs[room_id].bitfield.b = value; + g_Rooms[room_id].bitfield.b = value; break; case 8: - g_RoomPtrs[room_id].unk4d = value; + g_Rooms[room_id].unk4d = value; break; case 9: for (i = 1; i < g_Vars.roomcount; i++) { if (value) { - g_RoomPtrs[i].flags |= ROOMFLAG_4000; + g_Rooms[i].flags |= ROOMFLAG_4000; } else { - g_RoomPtrs[i].flags &= ~ROOMFLAG_4000; + g_Rooms[i].flags &= ~ROOMFLAG_4000; } } break; diff --git a/src/game/dlights.c b/src/game/dlights.c index b81595054..2e8c69403 100644 --- a/src/game/dlights.c +++ b/src/game/dlights.c @@ -110,8 +110,8 @@ GLOBAL_ASM( glabel func0f00097c /* f00097c: 000478c0 */ sll $t7,$a0,0x3 /* f000980: 01e47821 */ addu $t7,$t7,$a0 -/* f000984: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) -/* f000988: 8dce4928 */ lw $t6,%lo(g_RoomPtrs)($t6) +/* f000984: 3c0e800a */ lui $t6,%hi(g_Rooms) +/* f000988: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) /* f00098c: 000f7880 */ sll $t7,$t7,0x2 /* f000990: 01e47823 */ subu $t7,$t7,$a0 /* f000994: 000f7880 */ sll $t7,$t7,0x2 @@ -131,8 +131,8 @@ GLOBAL_ASM( glabel func0f0009c0 /* f0009c0: 000478c0 */ sll $t7,$a0,0x3 /* f0009c4: 01e47821 */ addu $t7,$t7,$a0 -/* f0009c8: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) -/* f0009cc: 8dce4928 */ lw $t6,%lo(g_RoomPtrs)($t6) +/* f0009c8: 3c0e800a */ lui $t6,%hi(g_Rooms) +/* f0009cc: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) /* f0009d0: 000f7880 */ sll $t7,$t7,0x2 /* f0009d4: 01e47823 */ subu $t7,$t7,$a0 /* f0009d8: 000f7880 */ sll $t7,$t7,0x2 @@ -159,8 +159,8 @@ glabel func0f000a10 /* f000a14: 8ca5a244 */ lw $a1,%lo(g_Vars+0x284)($a1) /* f000a18: 000478c0 */ sll $t7,$a0,0x3 /* f000a1c: 01e47821 */ addu $t7,$t7,$a0 -/* f000a20: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) -/* f000a24: 8dce4928 */ lw $t6,%lo(g_RoomPtrs)($t6) +/* f000a20: 3c0e800a */ lui $t6,%hi(g_Rooms) +/* f000a24: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) /* f000a28: 000f7880 */ sll $t7,$t7,0x2 /* f000a2c: 8ca600d8 */ lw $a2,0xd8($a1) /* f000a30: 01e47823 */ subu $t7,$t7,$a0 @@ -292,8 +292,8 @@ glabel func0f000b24 /* f000be0: 000548c0 */ sll $t1,$a1,0x3 .L0f000be4: /* f000be4: 01254821 */ addu $t1,$t1,$a1 -/* f000be8: 3c08800a */ lui $t0,%hi(g_RoomPtrs) -/* f000bec: 8d084928 */ lw $t0,%lo(g_RoomPtrs)($t0) +/* f000be8: 3c08800a */ lui $t0,%hi(g_Rooms) +/* f000bec: 8d084928 */ lw $t0,%lo(g_Rooms)($t0) /* f000bf0: 00094880 */ sll $t1,$t1,0x2 /* f000bf4: 01254823 */ subu $t1,$t1,$a1 /* f000bf8: 00094880 */ sll $t1,$t1,0x2 @@ -315,8 +315,8 @@ GLOBAL_ASM( glabel roomGetBrightness /* f000c28: 000478c0 */ sll $t7,$a0,0x3 /* f000c2c: 01e47821 */ addu $t7,$t7,$a0 -/* f000c30: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) -/* f000c34: 8dce4928 */ lw $t6,%lo(g_RoomPtrs)($t6) +/* f000c30: 3c0e800a */ lui $t6,%hi(g_Rooms) +/* f000c34: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) /* f000c38: 000f7880 */ sll $t7,$t7,0x2 /* f000c3c: 01e47823 */ subu $t7,$t7,$a0 /* f000c40: 000f7880 */ sll $t7,$t7,0x2 @@ -330,8 +330,8 @@ GLOBAL_ASM( glabel func0f000c54 /* f000c54: 000478c0 */ sll $t7,$a0,0x3 /* f000c58: 01e47821 */ addu $t7,$t7,$a0 -/* f000c5c: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) -/* f000c60: 8dce4928 */ lw $t6,%lo(g_RoomPtrs)($t6) +/* f000c5c: 3c0e800a */ lui $t6,%hi(g_Rooms) +/* f000c60: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) /* f000c64: 000f7880 */ sll $t7,$t7,0x2 /* f000c68: 01e47823 */ subu $t7,$t7,$a0 /* f000c6c: 000f7880 */ sll $t7,$t7,0x2 @@ -369,8 +369,8 @@ glabel var7f1a7d88 .text /* f000cc4: 000478c0 */ sll $t7,$a0,0x3 /* f000cc8: 01e47821 */ addu $t7,$t7,$a0 -/* f000ccc: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) -/* f000cd0: 8dce4928 */ lw $t6,%lo(g_RoomPtrs)($t6) +/* f000ccc: 3c0e800a */ lui $t6,%hi(g_Rooms) +/* f000cd0: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) /* f000cd4: 000f7880 */ sll $t7,$t7,0x2 /* f000cd8: 01e47823 */ subu $t7,$t7,$a0 /* f000cdc: 000f7880 */ sll $t7,$t7,0x2 @@ -379,8 +379,8 @@ glabel var7f1a7d88 /* f000ce8: c700005c */ lwc1 $f0,0x5c($t8) /* f000cec: 000478c0 */ sll $t7,$a0,0x3 /* f000cf0: 01e47821 */ addu $t7,$t7,$a0 -/* f000cf4: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) -/* f000cf8: 8dce4928 */ lw $t6,%lo(g_RoomPtrs)($t6) +/* f000cf4: 3c0e800a */ lui $t6,%hi(g_Rooms) +/* f000cf8: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) /* f000cfc: 000f7880 */ sll $t7,$t7,0x2 /* f000d00: 01e47823 */ subu $t7,$t7,$a0 /* f000d04: 000f7880 */ sll $t7,$t7,0x2 @@ -413,8 +413,8 @@ glabel var7f1a7d88 /* f000d68: 46001006 */ mov.s $f0,$f2 /* f000d6c: 000478c0 */ sll $t7,$a0,0x3 /* f000d70: 01e47821 */ addu $t7,$t7,$a0 -/* f000d74: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) -/* f000d78: 8dce4928 */ lw $t6,%lo(g_RoomPtrs)($t6) +/* f000d74: 3c0e800a */ lui $t6,%hi(g_Rooms) +/* f000d78: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) /* f000d7c: 000f7880 */ sll $t7,$t7,0x2 /* f000d80: 01e47823 */ subu $t7,$t7,$a0 /* f000d84: 000f7880 */ sll $t7,$t7,0x2 @@ -438,8 +438,8 @@ GLOBAL_ASM( glabel func0f000dbc /* f000dbc: 000478c0 */ sll $t7,$a0,0x3 /* f000dc0: 01e47821 */ addu $t7,$t7,$a0 -/* f000dc4: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) -/* f000dc8: 8dce4928 */ lw $t6,%lo(g_RoomPtrs)($t6) +/* f000dc4: 3c0e800a */ lui $t6,%hi(g_Rooms) +/* f000dc8: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) /* f000dcc: 000f7880 */ sll $t7,$t7,0x2 /* f000dd0: 01e47823 */ subu $t7,$t7,$a0 /* f000dd4: 000f7880 */ sll $t7,$t7,0x2 @@ -458,8 +458,8 @@ GLOBAL_ASM( glabel func0f000dfc /* f000dfc: 000478c0 */ sll $t7,$a0,0x3 /* f000e00: 01e47821 */ addu $t7,$t7,$a0 -/* f000e04: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) -/* f000e08: 8dce4928 */ lw $t6,%lo(g_RoomPtrs)($t6) +/* f000e04: 3c0e800a */ lui $t6,%hi(g_Rooms) +/* f000e08: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) /* f000e0c: 000f7880 */ sll $t7,$t7,0x2 /* f000e10: 01e47823 */ subu $t7,$t7,$a0 /* f000e14: 000f7880 */ sll $t7,$t7,0x2 @@ -609,8 +609,8 @@ GLOBAL_ASM( glabel func0f001000 /* f001000: 000478c0 */ sll $t7,$a0,0x3 /* f001004: 01e47821 */ addu $t7,$t7,$a0 -/* f001008: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) -/* f00100c: 8dce4928 */ lw $t6,%lo(g_RoomPtrs)($t6) +/* f001008: 3c0e800a */ lui $t6,%hi(g_Rooms) +/* f00100c: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) /* f001010: 000f7880 */ sll $t7,$t7,0x2 /* f001014: 01e47823 */ subu $t7,$t7,$a0 /* f001018: 000f7880 */ sll $t7,$t7,0x2 @@ -619,8 +619,8 @@ glabel func0f001000 /* f001024: a7050052 */ sh $a1,0x52($t8) /* f001028: 000478c0 */ sll $t7,$a0,0x3 /* f00102c: 01e47821 */ addu $t7,$t7,$a0 -/* f001030: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) -/* f001034: 8dce4928 */ lw $t6,%lo(g_RoomPtrs)($t6) +/* f001030: 3c0e800a */ lui $t6,%hi(g_Rooms) +/* f001034: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) /* f001038: 000f7880 */ sll $t7,$t7,0x2 /* f00103c: 01e47823 */ subu $t7,$t7,$a0 /* f001040: 000f7880 */ sll $t7,$t7,0x2 @@ -876,9 +876,9 @@ GLOBAL_ASM( glabel func0f0013c8 /* f0013c8: 27bdffd0 */ addiu $sp,$sp,-48 /* f0013cc: afbf0014 */ sw $ra,0x14($sp) -/* f0013d0: 3c1f800a */ lui $ra,%hi(g_RoomPtrs) +/* f0013d0: 3c1f800a */ lui $ra,%hi(g_Rooms) /* f0013d4: 000438c0 */ sll $a3,$a0,0x3 -/* f0013d8: 27ff4928 */ addiu $ra,$ra,%lo(g_RoomPtrs) +/* f0013d8: 27ff4928 */ addiu $ra,$ra,%lo(g_Rooms) /* f0013dc: 00e43821 */ addu $a3,$a3,$a0 /* f0013e0: 8fee0000 */ lw $t6,0x0($ra) /* f0013e4: 00073880 */ sll $a3,$a3,0x2 @@ -892,10 +892,10 @@ glabel func0f0013c8 /* f001404: afa7001c */ sw $a3,0x1c($sp) /* f001408: 8fa8002c */ lw $t0,0x2c($sp) /* f00140c: 8fa7001c */ lw $a3,0x1c($sp) -/* f001410: 3c1f800a */ lui $ra,%hi(g_RoomPtrs) +/* f001410: 3c1f800a */ lui $ra,%hi(g_Rooms) /* f001414: 910f0048 */ lbu $t7,0x48($t0) /* f001418: 81030008 */ lb $v1,0x8($t0) -/* f00141c: 27ff4928 */ addiu $ra,$ra,%lo(g_RoomPtrs) +/* f00141c: 27ff4928 */ addiu $ra,$ra,%lo(g_Rooms) /* f001420: 05e10003 */ bgez $t7,.L0f001430 /* f001424: 000fc083 */ sra $t8,$t7,0x2 /* f001428: 25e10003 */ addiu $at,$t7,0x3 @@ -1139,10 +1139,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(g_RoomPtrs) +/* f001764: 3c1e800a */ lui $s8,%hi(g_Rooms) /* f001768: 0006b8c0 */ sll $s7,$a2,0x3 /* f00176c: 02e6b821 */ addu $s7,$s7,$a2 -/* f001770: 27de4928 */ addiu $s8,$s8,%lo(g_RoomPtrs) +/* f001770: 27de4928 */ addiu $s8,$s8,%lo(g_Rooms) /* f001774: 8fce0000 */ lw $t6,0x0($s8) /* f001778: 0017b880 */ sll $s7,$s7,0x2 /* f00177c: 02e6b823 */ subu $s7,$s7,$a2 @@ -1346,9 +1346,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(g_RoomPtrs) +/* f001a70: 3c14800a */ lui $s4,%hi(g_Rooms) /* f001a74: 000498c0 */ sll $s3,$a0,0x3 -/* f001a78: 26944928 */ addiu $s4,$s4,%lo(g_RoomPtrs) +/* f001a78: 26944928 */ addiu $s4,$s4,%lo(g_Rooms) /* f001a7c: 02649821 */ addu $s3,$s3,$a0 /* f001a80: 8e8e0000 */ lw $t6,0x0($s4) /* f001a84: 00139880 */ sll $s3,$s3,0x2 @@ -1425,13 +1425,13 @@ glabel func0f001b78 /* f001b80: 0fc0025f */ jal func0f00097c /* f001b84: afa40018 */ sw $a0,0x18($sp) /* f001b88: 904e0005 */ lbu $t6,0x5($v0) -/* f001b8c: 3c08800a */ lui $t0,%hi(g_RoomPtrs) +/* f001b8c: 3c08800a */ lui $t0,%hi(g_Rooms) /* f001b90: 31d8ffbf */ andi $t8,$t6,0xffbf /* f001b94: a0580005 */ sb $t8,0x5($v0) /* f001b98: 331900df */ andi $t9,$t8,0xdf /* f001b9c: a0590005 */ sb $t9,0x5($v0) /* f001ba0: 8fa90018 */ lw $t1,0x18($sp) -/* f001ba4: 8d084928 */ lw $t0,%lo(g_RoomPtrs)($t0) +/* f001ba4: 8d084928 */ lw $t0,%lo(g_Rooms)($t0) /* f001ba8: 000950c0 */ sll $t2,$t1,0x3 /* f001bac: 01495021 */ addu $t2,$t2,$t1 /* f001bb0: 000a5080 */ sll $t2,$t2,0x2 @@ -1776,8 +1776,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(g_RoomPtrs) -/* f002094: 26104928 */ addiu $s0,$s0,%lo(g_RoomPtrs) +/* f002090: 3c10800a */ lui $s0,%hi(g_Rooms) +/* f002094: 26104928 */ addiu $s0,$s0,%lo(g_Rooms) /* f002098: 8e090000 */ lw $t1,0x0($s0) .L0f00209c: /* f00209c: 3c08800a */ lui $t0,%hi(g_Vars+0x2bc) @@ -1793,9 +1793,9 @@ glabel func0f001c0c /* f0020c4: 8e090000 */ lw $t1,0x0($s0) /* f0020c8: 24130001 */ addiu $s3,$zero,0x1 .L0f0020cc: -/* f0020cc: 3c10800a */ lui $s0,%hi(g_RoomPtrs) +/* f0020cc: 3c10800a */ lui $s0,%hi(g_Rooms) /* f0020d0: 0fc00cec */ jal func0f0033b0 -/* f0020d4: 26104928 */ addiu $s0,$s0,%lo(g_RoomPtrs) +/* f0020d4: 26104928 */ addiu $s0,$s0,%lo(g_Rooms) /* f0020d8: 3c0d800a */ lui $t5,%hi(g_Vars+0x2bc) /* f0020dc: 8dada27c */ lw $t5,%lo(g_Vars+0x2bc)($t5) /* f0020e0: 2402008c */ addiu $v0,$zero,0x8c @@ -1983,8 +1983,8 @@ glabel func0f002334 /* f002364: 0fc56c9d */ jal func0f15b274 /* f002368: e7ac001c */ swc1 $f12,0x1c($sp) /* f00236c: 8faf0020 */ lw $t7,0x20($sp) -/* f002370: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) -/* f002374: 8dce4928 */ lw $t6,%lo(g_RoomPtrs)($t6) +/* f002370: 3c0e800a */ lui $t6,%hi(g_Rooms) +/* f002374: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) /* f002378: 000fc0c0 */ sll $t8,$t7,0x3 /* f00237c: 030fc021 */ addu $t8,$t8,$t7 /* f002380: 0018c080 */ sll $t8,$t8,0x2 @@ -2026,11 +2026,11 @@ glabel var7f1a7d90 /* f0023f0: 3c0142c8 */ lui $at,0x42c8 /* f0023f4: 4481a000 */ mtc1 $at,$f20 /* f0023f8: 3c013f80 */ lui $at,0x3f80 -/* f0023fc: 3c0a800a */ lui $t2,%hi(g_RoomPtrs) +/* f0023fc: 3c0a800a */ lui $t2,%hi(g_Rooms) /* f002400: 44818000 */ mtc1 $at,$f16 /* f002404: 4480c000 */ mtc1 $zero,$f24 /* f002408: 44809000 */ mtc1 $zero,$f18 -/* f00240c: 254a4928 */ addiu $t2,$t2,%lo(g_RoomPtrs) +/* f00240c: 254a4928 */ addiu $t2,$t2,%lo(g_Rooms) /* f002410: 00002825 */ or $a1,$zero,$zero /* f002414: 240b000c */ addiu $t3,$zero,0xc /* f002418: 8d4f0000 */ lw $t7,0x0($t2) @@ -2181,9 +2181,9 @@ glabel var7f1a7d94 /* f002614: 8e8f0000 */ lw $t7,0x0($s4) /* f002618: 00008825 */ or $s1,$zero,$zero .L0f00261c: -/* f00261c: 3c15800a */ lui $s5,%hi(g_RoomPtrs) +/* f00261c: 3c15800a */ lui $s5,%hi(g_Rooms) /* f002620: 0013b8c0 */ sll $s7,$s3,0x3 -/* f002624: 26b54928 */ addiu $s5,$s5,%lo(g_RoomPtrs) +/* f002624: 26b54928 */ addiu $s5,$s5,%lo(g_Rooms) /* f002628: 02f3b821 */ addu $s7,$s7,$s3 /* f00262c: 8ea80000 */ lw $t0,0x0($s5) /* f002630: 0017b880 */ sll $s7,$s7,0x2 @@ -2372,8 +2372,8 @@ glabel func0f002844 /* f0028d8: 001558c0 */ sll $t3,$s5,0x3 /* f0028dc: 01755821 */ addu $t3,$t3,$s5 /* f0028e0: 000b5880 */ sll $t3,$t3,0x2 -/* f0028e4: 3c0c800a */ lui $t4,%hi(g_RoomPtrs) -/* f0028e8: 8d8c4928 */ lw $t4,%lo(g_RoomPtrs)($t4) +/* f0028e4: 3c0c800a */ lui $t4,%hi(g_Rooms) +/* f0028e8: 8d8c4928 */ lw $t4,%lo(g_Rooms)($t4) /* f0028ec: 01755823 */ subu $t3,$t3,$s5 /* f0028f0: 000b5880 */ sll $t3,$t3,0x2 /* f0028f4: afab0050 */ sw $t3,0x50($sp) @@ -2461,8 +2461,8 @@ glabel func0f002844 /* f002a30: 0fc00a11 */ jal func0f002844 /* f002a34: 02002025 */ or $a0,$s0,$zero .L0f002a38: -/* f002a38: 3c0d800a */ lui $t5,%hi(g_RoomPtrs) -/* f002a3c: 8dad4928 */ lw $t5,%lo(g_RoomPtrs)($t5) +/* f002a38: 3c0d800a */ lui $t5,%hi(g_Rooms) +/* f002a3c: 8dad4928 */ lw $t5,%lo(g_Rooms)($t5) /* f002a40: 8fae0050 */ lw $t6,0x50($sp) /* f002a44: 26730001 */ addiu $s3,$s3,0x1 /* f002a48: 26940002 */ addiu $s4,$s4,0x2 @@ -2510,8 +2510,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(g_RoomPtrs) -/* f002aec: 26524928 */ addiu $s2,$s2,%lo(g_RoomPtrs) +/* f002ae8: 3c12800a */ lui $s2,%hi(g_Rooms) +/* f002aec: 26524928 */ addiu $s2,$s2,%lo(g_Rooms) /* f002af0: 8e4f0000 */ lw $t7,0x0($s2) .L0f002af4: /* f002af4: 0fc00436 */ jal func0f0010d8 @@ -2545,9 +2545,9 @@ glabel func0f002a98 GLOBAL_ASM( glabel func0f002b58 -/* f002b58: 3c08800a */ lui $t0,%hi(g_RoomPtrs) +/* f002b58: 3c08800a */ lui $t0,%hi(g_Rooms) /* f002b5c: 000418c0 */ sll $v1,$a0,0x3 -/* f002b60: 25084928 */ addiu $t0,$t0,%lo(g_RoomPtrs) +/* f002b60: 25084928 */ addiu $t0,$t0,%lo(g_Rooms) /* f002b64: 00641821 */ addu $v1,$v1,$a0 /* f002b68: 8d0e0000 */ lw $t6,0x0($t0) /* f002b6c: 00031880 */ sll $v1,$v1,0x2 @@ -2641,8 +2641,8 @@ glabel var7f1a7db8 /* f002c58: 144000a3 */ bnez $v0,.L0f002ee8 /* f002c5c: 93a70027 */ lbu $a3,0x27($sp) /* f002c60: 8fa20018 */ lw $v0,0x18($sp) -/* f002c64: 3c03800a */ lui $v1,%hi(g_RoomPtrs) -/* f002c68: 24634928 */ addiu $v1,$v1,%lo(g_RoomPtrs) +/* f002c64: 3c03800a */ lui $v1,%hi(g_Rooms) +/* f002c68: 24634928 */ addiu $v1,$v1,%lo(g_Rooms) /* f002c6c: 0002c0c0 */ sll $t8,$v0,0x3 /* f002c70: 0302c021 */ addu $t8,$t8,$v0 /* f002c74: 8c790000 */ lw $t9,0x0($v1) @@ -2823,8 +2823,8 @@ GLOBAL_ASM( glabel func0f002ef8 /* f002ef8: 0004c0c0 */ sll $t8,$a0,0x3 /* f002efc: 0304c021 */ addu $t8,$t8,$a0 -/* f002f00: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) -/* f002f04: 8dce4928 */ lw $t6,%lo(g_RoomPtrs)($t6) +/* f002f00: 3c0e800a */ lui $t6,%hi(g_Rooms) +/* f002f04: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) /* f002f08: 27bdff28 */ addiu $sp,$sp,-216 /* f002f0c: 0018c080 */ sll $t8,$t8,0x2 /* f002f10: 0304c023 */ subu $t8,$t8,$a0 @@ -3159,8 +3159,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(g_RoomPtrs) -/* f003400: 24a54928 */ addiu $a1,$a1,%lo(g_RoomPtrs) +/* f0033fc: 3c05800a */ lui $a1,%hi(g_Rooms) +/* f003400: 24a54928 */ addiu $a1,$a1,%lo(g_Rooms) /* f003404: 2406efff */ addiu $a2,$zero,-4097 /* f003408: 8cb80000 */ lw $t8,0x0($a1) .L0f00340c: @@ -3201,13 +3201,13 @@ glabel func0f003444 /* f00347c: 19c00044 */ blez $t6,.L0f003590 /* f003480: 0000a025 */ or $s4,$zero,$zero /* f003484: 3c013f00 */ lui $at,0x3f00 -/* f003488: 3c02800a */ lui $v0,%hi(g_RoomPtrs) +/* f003488: 3c02800a */ lui $v0,%hi(g_Rooms) /* f00348c: 3c16800a */ lui $s6,%hi(var800a4cd8) -/* f003490: 3c12800a */ lui $s2,%hi(g_RoomPtrs) +/* f003490: 3c12800a */ lui $s2,%hi(g_Rooms) /* f003494: 4481a000 */ mtc1 $at,$f20 -/* f003498: 26524928 */ addiu $s2,$s2,%lo(g_RoomPtrs) +/* f003498: 26524928 */ addiu $s2,$s2,%lo(g_Rooms) /* f00349c: 26d64cd8 */ addiu $s6,$s6,%lo(var800a4cd8) -/* f0034a0: 8c424928 */ lw $v0,%lo(g_RoomPtrs)($v0) +/* f0034a0: 8c424928 */ lw $v0,%lo(g_Rooms)($v0) /* f0034a4: 00009825 */ or $s3,$zero,$zero /* f0034a8: 24150022 */ addiu $s5,$zero,0x22 .L0f0034ac: @@ -3305,13 +3305,13 @@ glabel func0f0035c0 /* f0035f4: f7b40010 */ sdc1 $f20,0x10($sp) /* f0035f8: 19c00040 */ blez $t6,.L0f0036fc /* f0035fc: 0000a025 */ or $s4,$zero,$zero -/* f003600: 3c02800a */ lui $v0,%hi(g_RoomPtrs) +/* f003600: 3c02800a */ lui $v0,%hi(g_Rooms) /* f003604: 3c16800a */ lui $s6,%hi(var800a4cd8) -/* f003608: 3c12800a */ lui $s2,%hi(g_RoomPtrs) +/* f003608: 3c12800a */ lui $s2,%hi(g_Rooms) /* f00360c: 4480a000 */ mtc1 $zero,$f20 -/* f003610: 26524928 */ addiu $s2,$s2,%lo(g_RoomPtrs) +/* f003610: 26524928 */ addiu $s2,$s2,%lo(g_Rooms) /* f003614: 26d64cd8 */ addiu $s6,$s6,%lo(var800a4cd8) -/* f003618: 8c424928 */ lw $v0,%lo(g_RoomPtrs)($v0) +/* f003618: 8c424928 */ lw $v0,%lo(g_Rooms)($v0) /* f00361c: 00009825 */ or $s3,$zero,$zero /* f003620: 24150022 */ addiu $s5,$zero,0x22 .L0f003624: @@ -3477,8 +3477,8 @@ glabel var7f1a7dd4 /* f00381c: 2412008c */ addiu $s2,$zero,0x8c /* f003820: 28410002 */ slti $at,$v0,0x2 /* f003824: 14200010 */ bnez $at,.L0f003868 -/* f003828: 3c13800a */ lui $s3,%hi(g_RoomPtrs) -/* f00382c: 26734928 */ addiu $s3,$s3,%lo(g_RoomPtrs) +/* f003828: 3c13800a */ lui $s3,%hi(g_Rooms) +/* f00382c: 26734928 */ addiu $s3,$s3,%lo(g_Rooms) /* f003830: 2403fbff */ addiu $v1,$zero,-1025 /* f003834: 8e6f0000 */ lw $t7,0x0($s3) .L0f003838: @@ -3495,10 +3495,10 @@ glabel var7f1a7dd4 /* f003860: 8e6f0000 */ lw $t7,0x0($s3) /* f003864: 241e0001 */ addiu $s8,$zero,0x1 .L0f003868: -/* f003868: 3c13800a */ lui $s3,%hi(g_RoomPtrs) +/* f003868: 3c13800a */ lui $s3,%hi(g_Rooms) /* f00386c: 28410002 */ slti $at,$v0,0x2 /* f003870: 142001aa */ bnez $at,.L0f003f1c -/* f003874: 26734928 */ addiu $s3,$s3,%lo(g_RoomPtrs) +/* f003874: 26734928 */ addiu $s3,$s3,%lo(g_Rooms) /* f003878: 4480b000 */ mtc1 $zero,$f22 /* f00387c: 2412008c */ addiu $s2,$zero,0x8c /* f003880: 2417008c */ addiu $s7,$zero,0x8c @@ -4311,10 +4311,10 @@ glabel var7f1a7dd8 /* f0043d4: f7b40018 */ sdc1 $f20,0x18($sp) /* f0043d8: 10600050 */ beqz $v1,.L0f00451c /* f0043dc: 00803825 */ or $a3,$a0,$zero -/* f0043e0: 3c15800a */ lui $s5,%hi(g_RoomPtrs) +/* f0043e0: 3c15800a */ lui $s5,%hi(g_Rooms) /* f0043e4: 000488c0 */ sll $s1,$a0,0x3 /* f0043e8: 02248821 */ addu $s1,$s1,$a0 -/* f0043ec: 26b54928 */ addiu $s5,$s5,%lo(g_RoomPtrs) +/* f0043ec: 26b54928 */ addiu $s5,$s5,%lo(g_Rooms) /* f0043f0: 8eae0000 */ lw $t6,0x0($s5) /* f0043f4: 00118880 */ sll $s1,$s1,0x2 /* f0043f8: 02248823 */ subu $s1,$s1,$a0 @@ -4418,9 +4418,9 @@ glabel var7f1a7dd8 GLOBAL_ASM( glabel func0f004558 /* f004558: 10800028 */ beqz $a0,.L0f0045fc -/* f00455c: 3c07800a */ lui $a3,%hi(g_RoomPtrs) +/* f00455c: 3c07800a */ lui $a3,%hi(g_Rooms) /* f004560: 000410c0 */ sll $v0,$a0,0x3 -/* f004564: 24e74928 */ addiu $a3,$a3,%lo(g_RoomPtrs) +/* f004564: 24e74928 */ addiu $a3,$a3,%lo(g_Rooms) /* f004568: 00441021 */ addu $v0,$v0,$a0 /* f00456c: 8cee0000 */ lw $t6,0x0($a3) /* f004570: 00021080 */ sll $v0,$v0,0x2 @@ -4470,9 +4470,9 @@ glabel func0f004604 glabel var7f1a7ddc .word 0x3b808081 .text -/* f004604: 3c06800a */ lui $a2,%hi(g_RoomPtrs) +/* f004604: 3c06800a */ lui $a2,%hi(g_Rooms) /* f004608: 000428c0 */ sll $a1,$a0,0x3 -/* f00460c: 24c64928 */ addiu $a2,$a2,%lo(g_RoomPtrs) +/* f00460c: 24c64928 */ addiu $a2,$a2,%lo(g_Rooms) /* f004610: 27bdff68 */ addiu $sp,$sp,-152 /* f004614: 00a42821 */ addu $a1,$a1,$a0 /* f004618: 8cce0000 */ lw $t6,0x0($a2) @@ -4504,8 +4504,8 @@ glabel var7f1a7ddc /* f00467c: afa40098 */ sw $a0,0x98($sp) /* f004680: 0fc002c9 */ jal func0f000b24 /* f004684: afa50048 */ sw $a1,0x48($sp) -/* f004688: 3c18800a */ lui $t8,%hi(g_RoomPtrs) -/* f00468c: 8f184928 */ lw $t8,%lo(g_RoomPtrs)($t8) +/* f004688: 3c18800a */ lui $t8,%hi(g_Rooms) +/* f00468c: 8f184928 */ lw $t8,%lo(g_Rooms)($t8) /* f004690: 8fb90048 */ lw $t9,0x48($sp) /* f004694: 305200ff */ andi $s2,$v0,0xff /* f004698: 03197021 */ addu $t6,$t8,$t9 @@ -4513,8 +4513,8 @@ glabel var7f1a7ddc /* f0046a0: 85e40016 */ lh $a0,0x16($t7) /* f0046a4: 0fc59e73 */ jal func0f1679cc /* f0046a8: afa40070 */ sw $a0,0x70($sp) -/* f0046ac: 3c07800a */ lui $a3,%hi(g_RoomPtrs) -/* f0046b0: 24e74928 */ addiu $a3,$a3,%lo(g_RoomPtrs) +/* f0046ac: 3c07800a */ lui $a3,%hi(g_Rooms) +/* f0046b0: 24e74928 */ addiu $a3,$a3,%lo(g_Rooms) /* f0046b4: 8fa60048 */ lw $a2,0x48($sp) /* f0046b8: 8cf80000 */ lw $t8,0x0($a3) /* f0046bc: 00402825 */ or $a1,$v0,$zero @@ -4895,8 +4895,8 @@ glabel var7f1a7ddc /* f004c0c: afa00078 */ sw $zero,0x78($sp) /* f004c10: 8fb90080 */ lw $t9,0x80($sp) .L0f004c14: -/* f004c14: 3c07800a */ lui $a3,%hi(g_RoomPtrs) -/* f004c18: 24e74928 */ addiu $a3,$a3,%lo(g_RoomPtrs) +/* f004c14: 3c07800a */ lui $a3,%hi(g_Rooms) +/* f004c18: 24e74928 */ addiu $a3,$a3,%lo(g_Rooms) /* f004c1c: a1590000 */ sb $t9,0x0($t2) /* f004c20: 8fb8007c */ lw $t8,0x7c($sp) /* f004c24: a1580001 */ sb $t8,0x1($t2) @@ -5225,9 +5225,9 @@ glabel func0f00505c /* f0050a8: 8d4f0000 */ lw $t7,0x0($t2) .L0f0050ac: /* f0050ac: afa0007c */ sw $zero,0x7c($sp) -/* f0050b0: 3c03800a */ lui $v1,%hi(g_RoomPtrs) +/* f0050b0: 3c03800a */ lui $v1,%hi(g_Rooms) /* f0050b4: ade90000 */ sw $t1,0x0($t7) -/* f0050b8: 8c634928 */ lw $v1,%lo(g_RoomPtrs)($v1) +/* f0050b8: 8c634928 */ lw $v1,%lo(g_Rooms)($v1) /* f0050bc: 24060001 */ addiu $a2,$zero,0x1 .L0f0050c0: /* f0050c0: 8fb9007c */ lw $t9,0x7c($sp) @@ -5399,8 +5399,8 @@ glabel func0f00505c /* f005334: adb30000 */ sw $s3,0x0($t5) /* f005338: 01c03025 */ or $a2,$t6,$zero .L0f00533c: -/* f00533c: 3c03800a */ lui $v1,%hi(g_RoomPtrs) -/* f005340: 8c634928 */ lw $v1,%lo(g_RoomPtrs)($v1) +/* f00533c: 3c03800a */ lui $v1,%hi(g_Rooms) +/* f005340: 8c634928 */ lw $v1,%lo(g_Rooms)($v1) /* f005344: 27de0001 */ addiu $s8,$s8,0x1 /* f005348: 26f70002 */ addiu $s7,$s7,0x2 /* f00534c: 00681021 */ addu $v0,$v1,$t0 @@ -5727,7 +5727,7 @@ glabel var7f1a7de4 /* f0057c0: 52e20004 */ beql $s7,$v0,.L0f0057d4 /* f0057c4: c6040000 */ lwc1 $f4,0x0($s0) /* f0057c8: 17c20036 */ bne $s8,$v0,.L0f0058a4 -/* f0057cc: 3c16800a */ lui $s6,%hi(g_RoomPtrs) +/* f0057cc: 3c16800a */ lui $s6,%hi(g_Rooms) .L0f0057d0: /* f0057d0: c6040000 */ lwc1 $f4,0x0($s0) .L0f0057d4: @@ -5788,7 +5788,7 @@ glabel var7f1a7de4 /* f0058a0: e6400000 */ swc1 $f0,0x0($s2) .L0f0058a4: /* f0058a4: 001748c0 */ sll $t1,$s7,0x3 -/* f0058a8: 26d64928 */ addiu $s6,$s6,%lo(g_RoomPtrs) +/* f0058a8: 26d64928 */ addiu $s6,$s6,%lo(g_Rooms) /* f0058ac: 01374821 */ addu $t1,$t1,$s7 /* f0058b0: 8ec20000 */ lw $v0,0x0($s6) /* f0058b4: 00094880 */ sll $t1,$t1,0x2 @@ -5906,9 +5906,9 @@ glabel var7f1a7de4 /* f005a5c: e6400000 */ swc1 $f0,0x0($s2) .L0f005a60: /* f005a60: 001570c0 */ sll $t6,$s5,0x3 -/* f005a64: 3c1e800a */ lui $s8,%hi(g_RoomPtrs) +/* f005a64: 3c1e800a */ lui $s8,%hi(g_Rooms) /* f005a68: 01d57021 */ addu $t6,$t6,$s5 -/* f005a6c: 27de4928 */ addiu $s8,$s8,%lo(g_RoomPtrs) +/* f005a6c: 27de4928 */ addiu $s8,$s8,%lo(g_Rooms) /* f005a70: 000e7080 */ sll $t6,$t6,0x2 /* f005a74: 8fc20000 */ lw $v0,0x0($s8) /* f005a78: 01d57023 */ subu $t6,$t6,$s5 diff --git a/src/game/game_006bd0.c b/src/game/game_006bd0.c index 52ee6cb54..431a49f2a 100644 --- a/src/game/game_006bd0.c +++ b/src/game/game_006bd0.c @@ -3159,8 +3159,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(g_RoomPtrs) -/* f009a44: 26734928 */ addiu $s3,$s3,%lo(g_RoomPtrs) +/* f009a40: 3c13800a */ lui $s3,%hi(g_Rooms) +/* f009a44: 26734928 */ addiu $s3,$s3,%lo(g_Rooms) /* 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_012d50.c b/src/game/game_012d50.c index b52851a43..7293af5d9 100644 --- a/src/game/game_012d50.c +++ b/src/game/game_012d50.c @@ -121,8 +121,8 @@ glabel func0f012d50 /* f012ecc: 0000f025 */ or $s8,$zero,$zero .L0f012ed0: /* f012ed0: 8ead02bc */ lw $t5,0x2bc($s5) -/* f012ed4: 3c12800a */ lui $s2,%hi(g_RoomPtrs) -/* f012ed8: 26524928 */ addiu $s2,$s2,%lo(g_RoomPtrs) +/* f012ed4: 3c12800a */ lui $s2,%hi(g_Rooms) +/* f012ed8: 26524928 */ addiu $s2,$s2,%lo(g_Rooms) /* f012edc: 19a0000e */ blez $t5,.L0f012f18 /* f012ee0: 00001025 */ or $v0,$zero,$zero /* f012ee4: 8e4e0000 */ lw $t6,0x0($s2) @@ -141,8 +141,8 @@ glabel func0f012d50 /* f012f14: 0000f025 */ or $s8,$zero,$zero .L0f012f18: /* f012f18: 8fa90118 */ lw $t1,0x118($sp) -/* f012f1c: 3c12800a */ lui $s2,%hi(g_RoomPtrs) -/* f012f20: 26524928 */ addiu $s2,$s2,%lo(g_RoomPtrs) +/* f012f1c: 3c12800a */ lui $s2,%hi(g_Rooms) +/* f012f20: 26524928 */ addiu $s2,$s2,%lo(g_Rooms) /* f012f24: 1920002a */ blez $t1,.L0f012fd0 /* f012f28: 2410ffff */ addiu $s0,$zero,-1 /* f012f2c: 00008825 */ or $s1,$zero,$zero diff --git a/src/game/game_013ee0.c b/src/game/game_013ee0.c index 5ed18a0d3..00cc527b8 100644 --- a/src/game/game_013ee0.c +++ b/src/game/game_013ee0.c @@ -240,8 +240,8 @@ glabel func0f013ee0 /* f014204: 00002025 */ or $a0,$zero,$zero .L0f014208: /* f014208: 8d0f02bc */ lw $t7,0x2bc($t0) -/* f01420c: 3c03800a */ lui $v1,%hi(g_RoomPtrs) -/* f014210: 24634928 */ addiu $v1,$v1,%lo(g_RoomPtrs) +/* f01420c: 3c03800a */ lui $v1,%hi(g_Rooms) +/* f014210: 24634928 */ addiu $v1,$v1,%lo(g_Rooms) /* f014214: 19e0000a */ blez $t7,.L0f014240 /* f014218: 00001025 */ or $v0,$zero,$zero /* f01421c: 8c780000 */ lw $t8,0x0($v1) diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c index a5b23dd1a..aeabc7d4a 100644 --- a/src/game/game_0601b0.c +++ b/src/game/game_0601b0.c @@ -3612,8 +3612,8 @@ glabel func0f06302c /* f0632d8: 26070028 */ addiu $a3,$s0,0x28 /* f0632dc: 00e01825 */ or $v1,$a3,$zero /* f0632e0: 1248000f */ beq $s2,$t0,.L0f063320 -/* f0632e4: 3c04800a */ lui $a0,%hi(g_RoomPtrs) -/* f0632e8: 8c844928 */ lw $a0,%lo(g_RoomPtrs)($a0) +/* f0632e4: 3c04800a */ lui $a0,%hi(g_Rooms) +/* f0632e8: 8c844928 */ lw $a0,%lo(g_Rooms)($a0) /* f0632ec: 84620000 */ lh $v0,0x0($v1) .L0f0632f0: /* f0632f0: 00530019 */ multu $v0,$s3 @@ -3678,8 +3678,8 @@ glabel func0f06302c .L0f0633c0: /* f0633c0: 1248000f */ beq $s2,$t0,.L0f063400 /* f0633c4: 00e01825 */ or $v1,$a3,$zero -/* f0633c8: 3c04800a */ lui $a0,%hi(g_RoomPtrs) -/* f0633cc: 8c844928 */ lw $a0,%lo(g_RoomPtrs)($a0) +/* f0633c8: 3c04800a */ lui $a0,%hi(g_Rooms) +/* f0633cc: 8c844928 */ lw $a0,%lo(g_Rooms)($a0) /* f0633d0: 84e20000 */ lh $v0,0x0($a3) .L0f0633d4: /* f0633d4: 00530019 */ multu $v0,$s3 diff --git a/src/game/game_0b3350.c b/src/game/game_0b3350.c index 630d75b1b..82d0ebec8 100644 --- a/src/game/game_0b3350.c +++ b/src/game/game_0b3350.c @@ -3148,8 +3148,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(g_RoomPtrs) -/* f0b629c: 26734928 */ addiu $s3,$s3,%lo(g_RoomPtrs) +/* f0b6298: 3c13800a */ lui $s3,%hi(g_Rooms) +/* f0b629c: 26734928 */ addiu $s3,$s3,%lo(g_Rooms) /* f0b62a0: 2414008c */ addiu $s4,$zero,0x8c .L0f0b62a4: /* f0b62a4: 00d40019 */ multu $a2,$s4 diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index 9ecfdfe14..a9bfbe3e7 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -855,10 +855,10 @@ glabel func0f0b6764 /* f0b67c4: 3c013f80 */ lui $at,0x3f80 /* f0b67c8: 4481b000 */ mtc1 $at,$f22 /* f0b67cc: 3c0142c8 */ lui $at,0x42c8 -/* f0b67d0: 3c09800a */ lui $t1,%hi(g_RoomPtrs) +/* f0b67d0: 3c09800a */ lui $t1,%hi(g_Rooms) /* f0b67d4: 44817000 */ mtc1 $at,$f14 /* f0b67d8: 44808000 */ mtc1 $zero,$f16 -/* f0b67dc: 25294928 */ addiu $t1,$t1,%lo(g_RoomPtrs) +/* f0b67dc: 25294928 */ addiu $t1,$t1,%lo(g_Rooms) /* f0b67e0: 00002825 */ or $a1,$zero,$zero /* f0b67e4: 240c008c */ addiu $t4,$zero,0x8c /* f0b67e8: 240a000c */ addiu $t2,$zero,0xc @@ -12841,8 +12841,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(g_RoomPtrs) -/* f0c1970: 26524928 */ addiu $s2,$s2,%lo(g_RoomPtrs) +/* f0c196c: 3c12800a */ lui $s2,%hi(g_Rooms) +/* f0c1970: 26524928 */ addiu $s2,$s2,%lo(g_Rooms) /* f0c1974: 86050000 */ lh $a1,0x0($s0) /* f0c1978: 2413008c */ addiu $s3,$zero,0x8c .L0f0c197c: @@ -12875,8 +12875,8 @@ glabel func0f0c1840 .L0f0c19e0: /* f0c19e0: 8fad00bc */ lw $t5,0xbc($sp) .L0f0c19e4: -/* f0c19e4: 3c12800a */ lui $s2,%hi(g_RoomPtrs) -/* f0c19e8: 26524928 */ addiu $s2,$s2,%lo(g_RoomPtrs) +/* f0c19e4: 3c12800a */ lui $s2,%hi(g_Rooms) +/* f0c19e8: 26524928 */ addiu $s2,$s2,%lo(g_Rooms) /* 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 a5dd8e5b9..03e51944d 100644 --- a/src/game/game_129900.c +++ b/src/game/game_129900.c @@ -689,7 +689,7 @@ glabel var7f1b5584 /* f12a370: 8fab012c */ lw $t3,0x12c($sp) /* f12a374: 46168482 */ mul.s $f18,$f16,$f22 /* f12a378: c7b000cc */ lwc1 $f16,0xcc($sp) -/* f12a37c: 3c09800a */ lui $t1,%hi(g_RoomPtrs) +/* f12a37c: 3c09800a */ lui $t1,%hi(g_Rooms) /* f12a380: 46163102 */ mul.s $f4,$f6,$f22 /* f12a384: e7aa00d4 */ swc1 $f10,0xd4($sp) /* f12a388: c7a600d0 */ lwc1 $f6,0xd0($sp) @@ -698,7 +698,7 @@ glabel var7f1b5584 /* 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(g_RoomPtrs) +/* f12a3a0: 25294928 */ addiu $t1,$t1,%lo(g_Rooms) /* f12a3a4: 46163102 */ mul.s $f4,$f6,$f22 /* f12a3a8: 010b4021 */ addu $t0,$t0,$t3 /* f12a3ac: 8d2e0000 */ lw $t6,0x0($t1) @@ -798,8 +798,8 @@ glabel var7f1b5584 /* f12a51c: 27a600d4 */ addiu $a2,$sp,0xd4 /* f12a520: 0fc593e7 */ jal func0f164f9c /* f12a524: 27a700c8 */ addiu $a3,$sp,0xc8 -/* f12a528: 3c09800a */ lui $t1,%hi(g_RoomPtrs) -/* f12a52c: 25294928 */ addiu $t1,$t1,%lo(g_RoomPtrs) +/* f12a528: 3c09800a */ lui $t1,%hi(g_Rooms) +/* f12a52c: 25294928 */ addiu $t1,$t1,%lo(g_Rooms) /* f12a530: 10400168 */ beqz $v0,.L0f12aad4 /* f12a534: 8faa0158 */ lw $t2,0x158($sp) /* f12a538: 8fa50118 */ lw $a1,0x118($sp) @@ -1025,9 +1025,9 @@ glabel var7f1b5584 /* f12a864: afaa0158 */ sw $t2,0x158($sp) /* f12a868: 8fa30080 */ lw $v1,0x80($sp) /* f12a86c: c64a0000 */ lwc1 $f10,0x0($s2) -/* f12a870: 3c09800a */ lui $t1,%hi(g_RoomPtrs) +/* f12a870: 3c09800a */ lui $t1,%hi(g_Rooms) /* f12a874: c4640000 */ lwc1 $f4,0x0($v1) -/* f12a878: 25294928 */ addiu $t1,$t1,%lo(g_RoomPtrs) +/* f12a878: 25294928 */ addiu $t1,$t1,%lo(g_Rooms) /* f12a87c: 8fa70078 */ lw $a3,0x78($sp) /* f12a880: 46142200 */ add.s $f8,$f4,$f20 /* f12a884: 8fa80074 */ lw $t0,0x74($sp) @@ -1748,9 +1748,9 @@ glabel var7f1b559c /* f12b2a4: 3c09800a */ lui $t1,%hi(var800a4cc4) /* f12b2a8: 8d294cc4 */ lw $t1,%lo(var800a4cc4)($t1) /* f12b2ac: 0019c880 */ sll $t9,$t9,0x2 -/* f12b2b0: 3c18800a */ lui $t8,%hi(g_RoomPtrs) +/* f12b2b0: 3c18800a */ lui $t8,%hi(g_Rooms) /* f12b2b4: 00027880 */ sll $t7,$v0,0x2 -/* f12b2b8: 8f184928 */ lw $t8,%lo(g_RoomPtrs)($t8) +/* f12b2b8: 8f184928 */ lw $t8,%lo(g_Rooms)($t8) /* f12b2bc: 0322c823 */ subu $t9,$t9,$v0 /* f12b2c0: 01e27821 */ addu $t7,$t7,$v0 /* f12b2c4: 000f7880 */ sll $t7,$t7,0x2 @@ -2972,8 +2972,8 @@ glabel var7f1b55a8 /* f12c428: 8de30004 */ lw $v1,0x4($t7) .L0f12c42c: /* f12c42c: 862603ca */ lh $a2,0x3ca($s1) -/* f12c430: 3c18800a */ lui $t8,%hi(g_RoomPtrs) -/* f12c434: 8f184928 */ lw $t8,%lo(g_RoomPtrs)($t8) +/* f12c430: 3c18800a */ lui $t8,%hi(g_Rooms) +/* f12c434: 8f184928 */ lw $t8,%lo(g_Rooms)($t8) /* f12c438: 0006c8c0 */ sll $t9,$a2,0x3 /* f12c43c: 0326c821 */ addu $t9,$t9,$a2 /* f12c440: 0019c880 */ sll $t9,$t9,0x2 @@ -3146,8 +3146,8 @@ glabel func0f12c654 /* f12c69c: 2405ffff */ addiu $a1,$zero,-1 /* f12c6a0: 00003025 */ or $a2,$zero,$zero /* f12c6a4: 12050016 */ beq $s0,$a1,.L0f12c700 -/* f12c6a8: 3c03800a */ lui $v1,%hi(g_RoomPtrs) -/* f12c6ac: 8c634928 */ lw $v1,%lo(g_RoomPtrs)($v1) +/* f12c6a8: 3c03800a */ lui $v1,%hi(g_Rooms) +/* f12c6ac: 8c634928 */ lw $v1,%lo(g_Rooms)($v1) /* f12c6b0: 2404008c */ addiu $a0,$zero,0x8c .L0f12c6b4: /* f12c6b4: 02040019 */ multu $s0,$a0 diff --git a/src/game/game_12d3f0.c b/src/game/game_12d3f0.c index 0df3d11e1..edb727d6e 100644 --- a/src/game/game_12d3f0.c +++ b/src/game/game_12d3f0.c @@ -2157,8 +2157,8 @@ glabel func0f12f230 /* f12f26c: 2406ffff */ addiu $a2,$zero,-1 /* f12f270: 00001825 */ or $v1,$zero,$zero /* f12f274: 12060016 */ beq $s0,$a2,.L0f12f2d0 -/* f12f278: 3c04800a */ lui $a0,%hi(g_RoomPtrs) -/* f12f27c: 8c844928 */ lw $a0,%lo(g_RoomPtrs)($a0) +/* f12f278: 3c04800a */ lui $a0,%hi(g_Rooms) +/* f12f27c: 8c844928 */ lw $a0,%lo(g_Rooms)($a0) /* f12f280: 2405008c */ addiu $a1,$zero,0x8c .L0f12f284: /* f12f284: 02050019 */ multu $s0,$a1 diff --git a/src/game/game_12f6c0.c b/src/game/game_12f6c0.c index e327cecbf..26985e899 100644 --- a/src/game/game_12f6c0.c +++ b/src/game/game_12f6c0.c @@ -893,8 +893,8 @@ glabel func0f130044 /* f13030c: 00008825 */ or $s1,$zero,$zero .L0f130310: /* f130310: 8e780010 */ lw $t8,0x10($s3) -/* f130314: 3c0f800a */ lui $t7,%hi(g_RoomPtrs) -/* f130318: 8def4928 */ lw $t7,%lo(g_RoomPtrs)($t7) +/* f130314: 3c0f800a */ lui $t7,%hi(g_Rooms) +/* f130318: 8def4928 */ lw $t7,%lo(g_Rooms)($t7) /* f13031c: 0018c8c0 */ sll $t9,$t8,0x3 /* f130320: 0338c821 */ addu $t9,$t9,$t8 /* f130324: 0019c880 */ sll $t9,$t9,0x2 diff --git a/src/game/game_13b670.c b/src/game/game_13b670.c index a19e3b1c9..d93d76de3 100644 --- a/src/game/game_13b670.c +++ b/src/game/game_13b670.c @@ -806,13 +806,13 @@ glabel func0f13c07c /* f13c144: a5a00004 */ sh $zero,0x4($t5) /* f13c148: 8d4e0000 */ lw $t6,0x0($t2) /* f13c14c: 8d790000 */ lw $t9,0x0($t3) -/* f13c150: 3c0d800a */ lui $t5,%hi(g_RoomPtrs) +/* f13c150: 3c0d800a */ lui $t5,%hi(g_Rooms) /* f13c154: 01cc0019 */ multu $t6,$t4 /* f13c158: 00007812 */ mflo $t7 /* f13c15c: 032fc021 */ addu $t8,$t9,$t7 /* f13c160: af000008 */ sw $zero,0x8($t8) /* f13c164: 8d0e0000 */ lw $t6,0x0($t0) -/* f13c168: 8dad4928 */ lw $t5,%lo(g_RoomPtrs)($t5) +/* f13c168: 8dad4928 */ lw $t5,%lo(g_Rooms)($t5) /* f13c16c: 000ec8c0 */ sll $t9,$t6,0x3 /* f13c170: 032ec821 */ addu $t9,$t9,$t6 /* f13c174: 0019c880 */ sll $t9,$t9,0x2 diff --git a/src/game/game_13c510.c b/src/game/game_13c510.c index ed8d7d367..a31c98323 100644 --- a/src/game/game_13c510.c +++ b/src/game/game_13c510.c @@ -267,9 +267,9 @@ glabel func0f13c780 /* f13c7d0: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) /* f13c7d4: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f13c7d8: 0005c8c0 */ sll $t9,$a1,0x3 -/* f13c7dc: 3c18800a */ lui $t8,%hi(g_RoomPtrs) +/* f13c7dc: 3c18800a */ lui $t8,%hi(g_Rooms) /* f13c7e0: 0325c821 */ addu $t9,$t9,$a1 -/* f13c7e4: 8f184928 */ lw $t8,%lo(g_RoomPtrs)($t8) +/* f13c7e4: 8f184928 */ lw $t8,%lo(g_Rooms)($t8) /* f13c7e8: 0019c880 */ sll $t9,$t9,0x2 /* f13c7ec: 0325c823 */ subu $t9,$t9,$a1 /* f13c7f0: 0019c880 */ sll $t9,$t9,0x2 @@ -1218,8 +1218,8 @@ glabel func0f13d568 /* f13d5bc: 0fc00331 */ jal func0f000cc4 /* f13d5c0: 8fa40164 */ lw $a0,0x164($sp) /* f13d5c4: 8fa30164 */ lw $v1,0x164($sp) -/* f13d5c8: 3c0f800a */ lui $t7,%hi(g_RoomPtrs) -/* f13d5cc: 8def4928 */ lw $t7,%lo(g_RoomPtrs)($t7) +/* f13d5c8: 3c0f800a */ lui $t7,%hi(g_Rooms) +/* f13d5cc: 8def4928 */ lw $t7,%lo(g_Rooms)($t7) /* f13d5d0: 000370c0 */ sll $t6,$v1,0x3 /* f13d5d4: 01c37021 */ addu $t6,$t6,$v1 /* f13d5d8: 000e7080 */ sll $t6,$t6,0x2 @@ -1381,8 +1381,8 @@ glabel func0f13d568 /* f13d80c: 0c0068f7 */ jal sinf /* f13d810: 4600b306 */ mov.s $f12,$f22 /* f13d814: 4600a183 */ div.s $f6,$f20,$f0 -/* f13d818: 3c0d800a */ lui $t5,%hi(g_RoomPtrs) -/* f13d81c: 8dad4928 */ lw $t5,%lo(g_RoomPtrs)($t5) +/* f13d818: 3c0d800a */ lui $t5,%hi(g_Rooms) +/* f13d81c: 8dad4928 */ lw $t5,%lo(g_Rooms)($t5) /* f13d820: 8fae00a4 */ lw $t6,0xa4($sp) /* f13d824: 3c017f1b */ lui $at,%hi(var7f1b59e4) /* f13d828: c42859e4 */ lwc1 $f8,%lo(var7f1b59e4)($at) @@ -1395,9 +1395,9 @@ glabel func0f13d568 /* f13d844: 0fc003d4 */ jal func0f000f50 /* f13d848: 00000000 */ sll $zero,$zero,0x0 /* f13d84c: 1040000f */ beqz $v0,.L0f13d88c -/* f13d850: 3c19800a */ lui $t9,%hi(g_RoomPtrs) -/* f13d854: 3c0c800a */ lui $t4,%hi(g_RoomPtrs) -/* f13d858: 8d8c4928 */ lw $t4,%lo(g_RoomPtrs)($t4) +/* f13d850: 3c19800a */ lui $t9,%hi(g_Rooms) +/* f13d854: 3c0c800a */ lui $t4,%hi(g_Rooms) +/* f13d858: 8d8c4928 */ lw $t4,%lo(g_Rooms)($t4) /* f13d85c: 8fad00a4 */ lw $t5,0xa4($sp) /* f13d860: 8fa40164 */ lw $a0,0x164($sp) /* f13d864: 018d7021 */ addu $t6,$t4,$t5 @@ -1411,7 +1411,7 @@ glabel func0f13d568 /* f13d884: 1000000d */ beqz $zero,.L0f13d8bc /* f13d888: 8fb80140 */ lw $t8,0x140($sp) .L0f13d88c: -/* f13d88c: 8f394928 */ lw $t9,%lo(g_RoomPtrs)($t9) +/* f13d88c: 8f394928 */ lw $t9,%lo(g_Rooms)($t9) /* f13d890: 8fac00a4 */ lw $t4,0xa4($sp) /* f13d894: 8fa40164 */ lw $a0,0x164($sp) /* f13d898: 032c6821 */ addu $t5,$t9,$t4 diff --git a/src/game/game_157db0.c b/src/game/game_157db0.c index 09f246e39..6394e17ec 100644 --- a/src/game/game_157db0.c +++ b/src/game/game_157db0.c @@ -141,9 +141,9 @@ glabel func0f157db0 GLOBAL_ASM( glabel func0f157e94 -/* f157e94: 3c0c800a */ lui $t4,%hi(g_RoomPtrs) +/* f157e94: 3c0c800a */ lui $t4,%hi(g_Rooms) /* f157e98: 000470c0 */ sll $t6,$a0,0x3 -/* f157e9c: 258c4928 */ addiu $t4,$t4,%lo(g_RoomPtrs) +/* f157e9c: 258c4928 */ addiu $t4,$t4,%lo(g_Rooms) /* f157ea0: 01c47021 */ addu $t6,$t6,$a0 /* f157ea4: 8d8f0000 */ lw $t7,0x0($t4) /* f157ea8: 27bdffe0 */ addiu $sp,$sp,-32 @@ -278,8 +278,8 @@ glabel func0f157e94 /* f15808c: 8fa40020 */ lw $a0,0x20($sp) /* f158090: 0fc55f6c */ jal func0f157db0 /* f158094: afab0018 */ sw $t3,0x18($sp) -/* f158098: 3c0c800a */ lui $t4,%hi(g_RoomPtrs) -/* f15809c: 258c4928 */ addiu $t4,$t4,%lo(g_RoomPtrs) +/* f158098: 3c0c800a */ lui $t4,%hi(g_Rooms) +/* f15809c: 258c4928 */ addiu $t4,$t4,%lo(g_Rooms) /* f1580a0: 8fab0018 */ lw $t3,0x18($sp) /* f1580a4: 8d980000 */ lw $t8,0x0($t4) /* f1580a8: 3c058008 */ lui $a1,%hi(var8007fc10) @@ -2527,8 +2527,8 @@ glabel func0f15a0fc /* f15a13c: 1000005c */ beqz $zero,.L0f15a2b0 /* f15a140: 8fa20060 */ lw $v0,0x60($sp) .L0f15a144: -/* f15a144: 3c0f800a */ lui $t7,%hi(g_RoomPtrs) -/* f15a148: 8def4928 */ lw $t7,%lo(g_RoomPtrs)($t7) +/* f15a144: 3c0f800a */ lui $t7,%hi(g_Rooms) +/* f15a148: 8def4928 */ lw $t7,%lo(g_Rooms)($t7) /* f15a14c: 02308823 */ subu $s1,$s1,$s0 /* f15a150: 00118880 */ sll $s1,$s1,0x2 /* f15a154: 01f11021 */ addu $v0,$t7,$s1 @@ -2544,8 +2544,8 @@ glabel func0f15a0fc /* f15a17c: a4f80000 */ sh $t8,0x0($a3) /* f15a180: 0fc57716 */ jal func0f15dc58 /* f15a184: afa6003c */ sw $a2,0x3c($sp) -/* f15a188: 3c19800a */ lui $t9,%hi(g_RoomPtrs) -/* f15a18c: 8f394928 */ lw $t9,%lo(g_RoomPtrs)($t9) +/* f15a188: 3c19800a */ lui $t9,%hi(g_Rooms) +/* f15a18c: 8f394928 */ lw $t9,%lo(g_Rooms)($t9) /* f15a190: 8fa6003c */ lw $a2,0x3c($sp) /* f15a194: 03311021 */ addu $v0,$t9,$s1 /* f15a198: 84430002 */ lh $v1,0x2($v0) @@ -2594,8 +2594,8 @@ glabel func0f15a0fc /* f15a238: 440f4000 */ mfc1 $t7,$f8 /* f15a23c: 0fc59b5f */ jal func0f166d7c /* f15a240: a7af0044 */ sh $t7,0x44($sp) -/* f15a244: 3c18800a */ lui $t8,%hi(g_RoomPtrs) -/* f15a248: 8f184928 */ lw $t8,%lo(g_RoomPtrs)($t8) +/* f15a244: 3c18800a */ lui $t8,%hi(g_Rooms) +/* f15a248: 8f184928 */ lw $t8,%lo(g_Rooms)($t8) /* f15a24c: 27a90040 */ addiu $t1,$sp,0x40 /* f15a250: 00402025 */ or $a0,$v0,$zero /* f15a254: 0311c821 */ addu $t9,$t8,$s1 @@ -2605,8 +2605,8 @@ glabel func0f15a0fc /* f15a264: 8d060008 */ lw $a2,0x8($t0) /* f15a268: 0fc567c7 */ jal func0f159f1c /* f15a26c: afa90010 */ sw $t1,0x10($sp) -/* f15a270: 3c0a800a */ lui $t2,%hi(g_RoomPtrs) -/* f15a274: 8d4a4928 */ lw $t2,%lo(g_RoomPtrs)($t2) +/* f15a270: 3c0a800a */ lui $t2,%hi(g_Rooms) +/* f15a274: 8d4a4928 */ lw $t2,%lo(g_Rooms)($t2) /* f15a278: 27ad0040 */ addiu $t5,$sp,0x40 /* f15a27c: 00402025 */ or $a0,$v0,$zero /* f15a280: 01515821 */ addu $t3,$t2,$s1 @@ -2616,8 +2616,8 @@ glabel func0f15a0fc /* f15a290: 8d86000c */ lw $a2,0xc($t4) /* f15a294: 0fc567c7 */ jal func0f159f1c /* f15a298: afad0010 */ sw $t5,0x10($sp) -/* f15a29c: 3c0f800a */ lui $t7,%hi(g_RoomPtrs) -/* f15a2a0: 8def4928 */ lw $t7,%lo(g_RoomPtrs)($t7) +/* f15a29c: 3c0f800a */ lui $t7,%hi(g_Rooms) +/* f15a2a0: 8def4928 */ lw $t7,%lo(g_Rooms)($t7) /* f15a2a4: 240e0001 */ addiu $t6,$zero,0x1 /* f15a2a8: 01f1c021 */ addu $t8,$t7,$s1 /* f15a2ac: a70e0002 */ sh $t6,0x2($t8) @@ -2658,10 +2658,10 @@ glabel func0f15a2c4 /* f15a320: 8d0b034c */ lw $t3,0x34c($t0) /* f15a324: 846f0028 */ lh $t7,0x28($v1) /* f15a328: 24620028 */ addiu $v0,$v1,0x28 -/* f15a32c: 3c04800a */ lui $a0,%hi(g_RoomPtrs) +/* f15a32c: 3c04800a */ lui $a0,%hi(g_Rooms) /* f15a330: 52af0011 */ beql $s5,$t7,.L0f15a378 /* f15a334: 8d0b034c */ lw $t3,0x34c($t0) -/* f15a338: 8c844928 */ lw $a0,%lo(g_RoomPtrs)($a0) +/* f15a338: 8c844928 */ lw $a0,%lo(g_Rooms)($a0) /* f15a33c: 84430000 */ lh $v1,0x0($v0) .L0f15a340: /* f15a340: 00650019 */ multu $v1,$a1 @@ -3218,8 +3218,8 @@ glabel func0f15a6f4 /* f15ab18: 1246000f */ beq $s2,$a2,.L0f15ab58 /* f15ab1c: 2407008c */ addiu $a3,$zero,0x8c /* f15ab20: 02470019 */ multu $s2,$a3 -/* f15ab24: 3c18800a */ lui $t8,%hi(g_RoomPtrs) -/* f15ab28: 8f184928 */ lw $t8,%lo(g_RoomPtrs)($t8) +/* f15ab24: 3c18800a */ lui $t8,%hi(g_Rooms) +/* f15ab28: 8f184928 */ lw $t8,%lo(g_Rooms)($t8) /* f15ab2c: 00005812 */ mflo $t3 /* f15ab30: 030bc821 */ addu $t9,$t8,$t3 /* f15ab34: 872c0002 */ lh $t4,0x2($t9) @@ -3266,10 +3266,10 @@ glabel func0f15a6f4 /* f15abc4: 00000000 */ sll $zero,$zero,0x0 /* f15abc8: 846f0028 */ lh $t7,0x28($v1) /* f15abcc: 24620028 */ addiu $v0,$v1,0x28 -/* f15abd0: 3c04800a */ lui $a0,%hi(g_RoomPtrs) +/* f15abd0: 3c04800a */ lui $a0,%hi(g_Rooms) /* f15abd4: 10cf0010 */ beq $a2,$t7,.L0f15ac18 /* f15abd8: 00000000 */ sll $zero,$zero,0x0 -/* f15abdc: 8c844928 */ lw $a0,%lo(g_RoomPtrs)($a0) +/* f15abdc: 8c844928 */ lw $a0,%lo(g_Rooms)($a0) /* f15abe0: 84430000 */ lh $v1,0x0($v0) .L0f15abe4: /* f15abe4: 00670019 */ multu $v1,$a3 @@ -4229,8 +4229,8 @@ glabel var7f1b75d0 /* f15b964: 0c0048f2 */ jal malloc /* f15b968: 24050004 */ addiu $a1,$zero,0x4 /* f15b96c: 8e6402bc */ lw $a0,0x2bc($s3) -/* f15b970: 3c15800a */ lui $s5,%hi(g_RoomPtrs) -/* f15b974: 26b54928 */ addiu $s5,$s5,%lo(g_RoomPtrs) +/* f15b970: 3c15800a */ lui $s5,%hi(g_Rooms) +/* f15b974: 26b54928 */ addiu $s5,$s5,%lo(g_Rooms) /* f15b978: 0004c880 */ sll $t9,$a0,0x2 /* f15b97c: 2724000f */ addiu $a0,$t9,0xf /* f15b980: 348e000f */ ori $t6,$a0,0xf @@ -5125,8 +5125,8 @@ glabel var7f1b75d0 /* f15c66c: 2a210002 */ slti $at,$s1,0x2 .L0f15c670: /* f15c670: 1420000b */ bnez $at,.L0f15c6a0 -/* f15c674: 3c0c800a */ lui $t4,%hi(g_RoomPtrs) -/* f15c678: 8d8c4928 */ lw $t4,%lo(g_RoomPtrs)($t4) +/* f15c674: 3c0c800a */ lui $t4,%hi(g_Rooms) +/* f15c678: 8d8c4928 */ lw $t4,%lo(g_Rooms)($t4) /* f15c67c: 3c1e800a */ lui $s8,%hi(g_Vars) /* f15c680: 27de9fc0 */ addiu $s8,$s8,%lo(g_Vars) /* f15c684: 258c008c */ addiu $t4,$t4,140 @@ -5655,21 +5655,21 @@ bool func0f15cd90(u32 room, struct screenbox *screen) for (i = 0; i != 8; i++) { if (i & 1) { - corner.x = g_RoomPtrs[room].unk18.x; + corner.x = g_Rooms[room].unk18.x; } else { - corner.x = g_RoomPtrs[room].unk24.x; + corner.x = g_Rooms[room].unk24.x; } if (i & 2) { - corner.y = g_RoomPtrs[room].unk18.y; + corner.y = g_Rooms[room].unk18.y; } else { - corner.y = g_RoomPtrs[room].unk24.y; + corner.y = g_Rooms[room].unk24.y; } if (i & 4) { - corner.z = g_RoomPtrs[room].unk18.z; + corner.z = g_Rooms[room].unk18.z; } else { - corner.z = g_RoomPtrs[room].unk24.z; + corner.z = g_Rooms[room].unk24.z; } if (func0f15d08c(&corner, &roomscreenpos) == 0) { @@ -6095,7 +6095,7 @@ bool roomIsActive(s32 room_id) return (g_MpRoomVisibility[room_id] & 0xf) != 0; } - return g_RoomPtrs[room_id].flags & ROOMFLAG_ACTIVE; + return g_Rooms[room_id].flags & ROOMFLAG_ACTIVE; } GLOBAL_ASM( @@ -6105,7 +6105,7 @@ glabel func0f15d744 /* f15d74c: 000450c0 */ sll $t2,$a0,0x3 /* f15d750: 01445021 */ addu $t2,$t2,$a0 /* f15d754: 11c00008 */ beqz $t6,.L0f15d778 -/* f15d758: 3c09800a */ lui $t1,%hi(g_RoomPtrs) +/* f15d758: 3c09800a */ lui $t1,%hi(g_Rooms) /* f15d75c: 3c0f800a */ lui $t7,%hi(g_MpRoomVisibility) /* f15d760: 8def492c */ lw $t7,%lo(g_MpRoomVisibility)($t7) /* f15d764: 01e4c021 */ addu $t8,$t7,$a0 @@ -6114,7 +6114,7 @@ glabel func0f15d744 /* f15d770: 03e00008 */ jr $ra /* f15d774: 0019102b */ sltu $v0,$zero,$t9 .L0f15d778: -/* f15d778: 8d294928 */ lw $t1,%lo(g_RoomPtrs)($t1) +/* f15d778: 8d294928 */ lw $t1,%lo(g_Rooms)($t1) /* f15d77c: 000a5080 */ sll $t2,$t2,0x2 /* f15d780: 01445023 */ subu $t2,$t2,$a0 /* f15d784: 000a5080 */ sll $t2,$t2,0x2 @@ -6133,7 +6133,7 @@ glabel roomIsVisibleByPlayer /* f15d7a8: 000460c0 */ sll $t4,$a0,0x3 /* f15d7ac: 01846021 */ addu $t4,$t4,$a0 /* f15d7b0: 11c0000b */ beqz $t6,.L0f15d7e0 -/* f15d7b4: 3c0b800a */ lui $t3,%hi(g_RoomPtrs) +/* f15d7b4: 3c0b800a */ lui $t3,%hi(g_Rooms) /* f15d7b8: 3c0f800a */ lui $t7,%hi(g_MpRoomVisibility) /* f15d7bc: 8def492c */ lw $t7,%lo(g_MpRoomVisibility)($t7) /* f15d7c0: 24080001 */ addiu $t0,$zero,0x1 @@ -6145,7 +6145,7 @@ glabel roomIsVisibleByPlayer /* f15d7d8: 03e00008 */ jr $ra /* f15d7dc: 01401025 */ or $v0,$t2,$zero .L0f15d7e0: -/* f15d7e0: 8d6b4928 */ lw $t3,%lo(g_RoomPtrs)($t3) +/* f15d7e0: 8d6b4928 */ lw $t3,%lo(g_Rooms)($t3) /* f15d7e4: 000c6080 */ sll $t4,$t4,0x2 /* f15d7e8: 01846023 */ subu $t4,$t4,$a0 /* f15d7ec: 000c6080 */ sll $t4,$t4,0x2 @@ -6164,7 +6164,7 @@ glabel func0f15d808 /* f15d810: 000460c0 */ sll $t4,$a0,0x3 /* f15d814: 01846021 */ addu $t4,$t4,$a0 /* f15d818: 11c0000b */ beqz $t6,.L0f15d848 -/* f15d81c: 3c0b800a */ lui $t3,%hi(g_RoomPtrs) +/* f15d81c: 3c0b800a */ lui $t3,%hi(g_Rooms) /* f15d820: 3c0f800a */ lui $t7,%hi(g_MpRoomVisibility) /* f15d824: 8def492c */ lw $t7,%lo(g_MpRoomVisibility)($t7) /* f15d828: 24080010 */ addiu $t0,$zero,0x10 @@ -6176,7 +6176,7 @@ glabel func0f15d808 /* f15d840: 03e00008 */ jr $ra /* f15d844: 01401025 */ or $v0,$t2,$zero .L0f15d848: -/* f15d848: 8d6b4928 */ lw $t3,%lo(g_RoomPtrs)($t3) +/* f15d848: 8d6b4928 */ lw $t3,%lo(g_Rooms)($t3) /* f15d84c: 000c6080 */ sll $t4,$t4,0x2 /* f15d850: 01846023 */ subu $t4,$t4,$a0 /* f15d854: 000c6080 */ sll $t4,$t4,0x2 @@ -6227,8 +6227,8 @@ glabel func0f15d870 /* f15d8ec: 28c10002 */ slti $at,$a2,0x2 /* f15d8f0: 14200027 */ bnez $at,.L0f15d990 /* f15d8f4: 27a20030 */ addiu $v0,$sp,0x30 -/* f15d8f8: 3c05800a */ lui $a1,%hi(g_RoomPtrs) -/* f15d8fc: 8ca54928 */ lw $a1,%lo(g_RoomPtrs)($a1) +/* f15d8f8: 3c05800a */ lui $a1,%hi(g_Rooms) +/* f15d8fc: 8ca54928 */ lw $a1,%lo(g_Rooms)($a1) /* f15d900: 240b002e */ addiu $t3,$zero,0x2e /* f15d904: 240a004c */ addiu $t2,$zero,0x4c /* f15d908: 2409000a */ addiu $t1,$zero,0xa @@ -6368,8 +6368,8 @@ GLOBAL_ASM( glabel func0f15dab4 /* f15dab4: 000478c0 */ sll $t7,$a0,0x3 /* f15dab8: 01e47821 */ addu $t7,$t7,$a0 -/* f15dabc: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) -/* f15dac0: 8dce4928 */ lw $t6,%lo(g_RoomPtrs)($t6) +/* f15dabc: 3c0e800a */ lui $t6,%hi(g_Rooms) +/* f15dac0: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) /* f15dac4: 27bdffd8 */ addiu $sp,$sp,-40 /* f15dac8: 000f7880 */ sll $t7,$t7,0x2 /* f15dacc: 01e47823 */ subu $t7,$t7,$a0 @@ -6441,8 +6441,8 @@ GLOBAL_ASM( glabel func0f15dbb4 /* f15dbb4: 000478c0 */ sll $t7,$a0,0x3 /* f15dbb8: 01e47821 */ addu $t7,$t7,$a0 -/* f15dbbc: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) -/* f15dbc0: 8dce4928 */ lw $t6,%lo(g_RoomPtrs)($t6) +/* f15dbbc: 3c0e800a */ lui $t6,%hi(g_Rooms) +/* f15dbc0: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) /* f15dbc4: 000f7880 */ sll $t7,$t7,0x2 /* f15dbc8: 01e47823 */ subu $t7,$t7,$a0 /* f15dbcc: 000f7880 */ sll $t7,$t7,0x2 @@ -6504,8 +6504,8 @@ glabel func0f15dc58 /* f15dc88: 008e082a */ slt $at,$a0,$t6 /* f15dc8c: 102001f1 */ beqz $at,.L0f15e454 /* f15dc90: 000f7880 */ sll $t7,$t7,0x2 -/* f15dc94: 3c18800a */ lui $t8,%hi(g_RoomPtrs) -/* f15dc98: 8f184928 */ lw $t8,%lo(g_RoomPtrs)($t8) +/* f15dc94: 3c18800a */ lui $t8,%hi(g_Rooms) +/* f15dc98: 8f184928 */ lw $t8,%lo(g_Rooms)($t8) /* f15dc9c: 01e47823 */ subu $t7,$t7,$a0 /* f15dca0: 000f7880 */ sll $t7,$t7,0x2 /* f15dca4: afaf0054 */ sw $t7,0x54($sp) @@ -6597,8 +6597,8 @@ glabel func0f15dc58 /* f15dde8: 8c4b0000 */ lw $t3,0x0($v0) /* f15ddec: 0fc5766a */ jal func0f15d9a8 /* f15ddf0: 032b3023 */ subu $a2,$t9,$t3 -/* f15ddf4: 3c09800a */ lui $t1,%hi(g_RoomPtrs) -/* f15ddf8: 25294928 */ addiu $t1,$t1,%lo(g_RoomPtrs) +/* f15ddf4: 3c09800a */ lui $t1,%hi(g_Rooms) +/* f15ddf8: 25294928 */ addiu $t1,$t1,%lo(g_Rooms) /* f15ddfc: 8fa80054 */ lw $t0,0x54($sp) /* f15de00: 8d2c0000 */ lw $t4,0x0($t1) /* f15de04: afa202f0 */ sw $v0,0x2f0($sp) @@ -6783,8 +6783,8 @@ glabel func0f15dc58 /* f15e08c: a66b0014 */ sh $t3,0x14($s3) /* f15e090: 0fc576ad */ jal func0f15dab4 /* f15e094: 8fa402f8 */ lw $a0,0x2f8($sp) -/* f15e098: 3c0c800a */ lui $t4,%hi(g_RoomPtrs) -/* f15e09c: 8d8c4928 */ lw $t4,%lo(g_RoomPtrs)($t4) +/* f15e098: 3c0c800a */ lui $t4,%hi(g_Rooms) +/* f15e09c: 8d8c4928 */ lw $t4,%lo(g_Rooms)($t4) /* f15e0a0: 8fad0054 */ lw $t5,0x54($sp) /* f15e0a4: 00009025 */ or $s2,$zero,$zero /* f15e0a8: 00002825 */ or $a1,$zero,$zero @@ -6886,26 +6886,26 @@ glabel func0f15dc58 .L0f15e214: /* f15e214: 8fab004c */ lw $t3,0x4c($sp) /* f15e218: 27b00078 */ addiu $s0,$sp,0x78 -/* f15e21c: 3c0d800a */ lui $t5,%hi(g_RoomPtrs) +/* f15e21c: 3c0d800a */ lui $t5,%hi(g_Rooms) /* f15e220: 020b6021 */ addu $t4,$s0,$t3 /* f15e224: ad860000 */ sw $a2,0x0($t4) /* f15e228: 8fae0054 */ lw $t6,0x54($sp) -/* f15e22c: 8dad4928 */ lw $t5,%lo(g_RoomPtrs)($t5) +/* f15e22c: 8dad4928 */ lw $t5,%lo(g_Rooms)($t5) /* f15e230: 00d4c023 */ subu $t8,$a2,$s4 /* f15e234: 270f002f */ addiu $t7,$t8,0x2f /* f15e238: 35f9000f */ ori $t9,$t7,0xf /* f15e23c: 3b2b000f */ xori $t3,$t9,0xf /* f15e240: 01ae1821 */ addu $v1,$t5,$t6 /* f15e244: ac6b0080 */ sw $t3,0x80($v1) -/* f15e248: 3c0c800a */ lui $t4,%hi(g_RoomPtrs) -/* f15e24c: 8d8c4928 */ lw $t4,%lo(g_RoomPtrs)($t4) +/* f15e248: 3c0c800a */ lui $t4,%hi(g_Rooms) +/* f15e24c: 8d8c4928 */ lw $t4,%lo(g_Rooms)($t4) /* f15e250: 8fad0054 */ lw $t5,0x54($sp) /* f15e254: 240a0001 */ addiu $t2,$zero,0x1 -/* f15e258: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) +/* f15e258: 3c0e800a */ lui $t6,%hi(g_Rooms) /* f15e25c: 018d1821 */ addu $v1,$t4,$t5 /* f15e260: a46a0002 */ sh $t2,0x2($v1) /* f15e264: 8fb80054 */ lw $t8,0x54($sp) -/* f15e268: 8dce4928 */ lw $t6,%lo(g_RoomPtrs)($t6) +/* f15e268: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) /* f15e26c: 8faf02f4 */ lw $t7,0x2f4($sp) /* f15e270: 02802025 */ or $a0,$s4,$zero /* f15e274: 01d81821 */ addu $v1,$t6,$t8 @@ -6915,15 +6915,15 @@ glabel func0f15dc58 /* f15e284: 8c730014 */ lw $s3,0x14($v1) /* f15e288: 0c004b52 */ jal func00012d48 /* f15e28c: 00403025 */ or $a2,$v0,$zero -/* f15e290: 3c19800a */ lui $t9,%hi(g_RoomPtrs) -/* f15e294: 8f394928 */ lw $t9,%lo(g_RoomPtrs)($t9) +/* f15e290: 3c19800a */ lui $t9,%hi(g_Rooms) +/* f15e294: 8f394928 */ lw $t9,%lo(g_Rooms)($t9) /* f15e298: 8fab0054 */ lw $t3,0x54($sp) /* f15e29c: 240a0001 */ addiu $t2,$zero,0x1 /* f15e2a0: 032b1821 */ addu $v1,$t9,$t3 /* f15e2a4: 8c730014 */ lw $s3,0x14($v1) .L0f15e2a8: /* f15e2a8: 3c18800a */ lui $t8,%hi(var800a65e0) -/* f15e2ac: 3c0f800a */ lui $t7,%hi(g_RoomPtrs) +/* f15e2ac: 3c0f800a */ lui $t7,%hi(g_Rooms) /* f15e2b0: 8e670000 */ lw $a3,0x0($s3) /* f15e2b4: 26650018 */ addiu $a1,$s3,0x18 /* f15e2b8: 24a90014 */ addiu $t1,$a1,0x14 @@ -6978,15 +6978,15 @@ glabel func0f15dc58 /* f15e35c: 8f1865e0 */ lw $t8,%lo(var800a65e0)($t8) /* f15e360: 13000012 */ beqz $t8,.L0f15e3ac /* f15e364: 00000000 */ sll $zero,$zero,0x0 -/* f15e368: 8def4928 */ lw $t7,%lo(g_RoomPtrs)($t7) +/* f15e368: 8def4928 */ lw $t7,%lo(g_Rooms)($t7) /* f15e36c: 8fb90054 */ lw $t9,0x54($sp) /* f15e370: 24050001 */ addiu $a1,$zero,0x1 /* f15e374: 01f95821 */ addu $t3,$t7,$t9 /* f15e378: 8d6c0014 */ lw $t4,0x14($t3) /* f15e37c: 0fc595ca */ jal func0f165728 /* f15e380: 8d840008 */ lw $a0,0x8($t4) -/* f15e384: 3c0d800a */ lui $t5,%hi(g_RoomPtrs) -/* f15e388: 8dad4928 */ lw $t5,%lo(g_RoomPtrs)($t5) +/* f15e384: 3c0d800a */ lui $t5,%hi(g_Rooms) +/* f15e388: 8dad4928 */ lw $t5,%lo(g_Rooms)($t5) /* f15e38c: 8fae0054 */ lw $t6,0x54($sp) /* f15e390: 24050005 */ addiu $a1,$zero,0x5 /* f15e394: 01aec021 */ addu $t8,$t5,$t6 @@ -6997,18 +6997,18 @@ glabel func0f15dc58 /* f15e3a8: 00000000 */ sll $zero,$zero,0x0 .L0f15e3ac: /* f15e3ac: 8f3965e4 */ lw $t9,%lo(var800a65e4)($t9) -/* f15e3b0: 3c0b800a */ lui $t3,%hi(g_RoomPtrs) +/* f15e3b0: 3c0b800a */ lui $t3,%hi(g_Rooms) /* f15e3b4: 8fac0054 */ lw $t4,0x54($sp) /* f15e3b8: 1720000f */ bnez $t9,.L0f15e3f8 /* f15e3bc: 00000000 */ sll $zero,$zero,0x0 -/* f15e3c0: 8d6b4928 */ lw $t3,%lo(g_RoomPtrs)($t3) +/* f15e3c0: 8d6b4928 */ lw $t3,%lo(g_Rooms)($t3) /* f15e3c4: 24050006 */ addiu $a1,$zero,0x6 /* f15e3c8: 016c6821 */ addu $t5,$t3,$t4 /* f15e3cc: 8dae0014 */ lw $t6,0x14($t5) /* f15e3d0: 0fc595ca */ jal func0f165728 /* f15e3d4: 8dc40008 */ lw $a0,0x8($t6) -/* f15e3d8: 3c18800a */ lui $t8,%hi(g_RoomPtrs) -/* f15e3dc: 8f184928 */ lw $t8,%lo(g_RoomPtrs)($t8) +/* f15e3d8: 3c18800a */ lui $t8,%hi(g_Rooms) +/* f15e3dc: 8f184928 */ lw $t8,%lo(g_Rooms)($t8) /* f15e3e0: 8faf0054 */ lw $t7,0x54($sp) /* f15e3e4: 24050007 */ addiu $a1,$zero,0x7 /* f15e3e8: 030fc821 */ addu $t9,$t8,$t7 @@ -7018,24 +7018,24 @@ glabel func0f15dc58 .L0f15e3f8: /* f15e3f8: 0fc57be7 */ jal func0f15ef9c /* f15e3fc: 8fa402f8 */ lw $a0,0x2f8($sp) -/* f15e400: 3c0c800a */ lui $t4,%hi(g_RoomPtrs) -/* f15e404: 8d8c4928 */ lw $t4,%lo(g_RoomPtrs)($t4) +/* f15e400: 3c0c800a */ lui $t4,%hi(g_Rooms) +/* f15e404: 8d8c4928 */ lw $t4,%lo(g_Rooms)($t4) /* f15e408: 8fad0054 */ lw $t5,0x54($sp) -/* f15e40c: 3c0f800a */ lui $t7,%hi(g_RoomPtrs) +/* f15e40c: 3c0f800a */ lui $t7,%hi(g_Rooms) /* f15e410: 2404ffff */ addiu $a0,$zero,-1 /* f15e414: 018d1821 */ addu $v1,$t4,$t5 /* f15e418: 946e0000 */ lhu $t6,0x0($v1) -/* f15e41c: 3c0d800a */ lui $t5,%hi(g_RoomPtrs) +/* f15e41c: 3c0d800a */ lui $t5,%hi(g_Rooms) /* f15e420: 35d80100 */ ori $t8,$t6,0x100 /* f15e424: a4780000 */ sh $t8,0x0($v1) /* f15e428: 8fb90054 */ lw $t9,0x54($sp) -/* f15e42c: 8def4928 */ lw $t7,%lo(g_RoomPtrs)($t7) +/* f15e42c: 8def4928 */ lw $t7,%lo(g_Rooms)($t7) /* f15e430: 01f91821 */ addu $v1,$t7,$t9 /* f15e434: 946b0000 */ lhu $t3,0x0($v1) /* f15e438: 356c0200 */ ori $t4,$t3,0x200 /* f15e43c: a46c0000 */ sh $t4,0x0($v1) /* f15e440: 8fae0054 */ lw $t6,0x54($sp) -/* f15e444: 8dad4928 */ lw $t5,%lo(g_RoomPtrs)($t5) +/* f15e444: 8dad4928 */ lw $t5,%lo(g_Rooms)($t5) /* f15e448: 01aec021 */ addu $t8,$t5,$t6 /* f15e44c: 0fc4f0dc */ jal func0f13c370 /* f15e450: af000058 */ sw $zero,0x58($t8) @@ -7055,8 +7055,8 @@ GLOBAL_ASM( glabel func0f15e474 /* f15e474: 000418c0 */ sll $v1,$a0,0x3 /* f15e478: 00641821 */ addu $v1,$v1,$a0 -/* f15e47c: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) -/* f15e480: 8dce4928 */ lw $t6,%lo(g_RoomPtrs)($t6) +/* f15e47c: 3c0e800a */ lui $t6,%hi(g_Rooms) +/* f15e480: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) /* f15e484: 00031880 */ sll $v1,$v1,0x2 /* f15e488: 00641823 */ subu $v1,$v1,$a0 /* f15e48c: 27bdffe0 */ addiu $sp,$sp,-32 @@ -7075,13 +7075,13 @@ glabel func0f15e474 /* f15e4c0: 00a1c024 */ and $t8,$a1,$at /* f15e4c4: 0c004b2d */ jal func00012cb4 /* f15e4c8: 03002825 */ or $a1,$t8,$zero -/* f15e4cc: 3c19800a */ lui $t9,%hi(g_RoomPtrs) +/* f15e4cc: 3c19800a */ lui $t9,%hi(g_Rooms) /* f15e4d0: 8fa30018 */ lw $v1,0x18($sp) -/* f15e4d4: 8f394928 */ lw $t9,%lo(g_RoomPtrs)($t9) -/* f15e4d8: 3c09800a */ lui $t1,%hi(g_RoomPtrs) +/* f15e4d4: 8f394928 */ lw $t9,%lo(g_Rooms)($t9) +/* f15e4d8: 3c09800a */ lui $t1,%hi(g_Rooms) /* f15e4dc: 03234021 */ addu $t0,$t9,$v1 /* f15e4e0: ad000044 */ sw $zero,0x44($t0) -/* f15e4e4: 8d294928 */ lw $t1,%lo(g_RoomPtrs)($t1) +/* f15e4e4: 8d294928 */ lw $t1,%lo(g_Rooms)($t1) /* f15e4e8: 01231021 */ addu $v0,$t1,$v1 /* f15e4ec: 8c460080 */ lw $a2,0x80($v0) .L0f15e4f0: @@ -7090,13 +7090,13 @@ glabel func0f15e474 /* f15e4f8: 8c440014 */ lw $a0,0x14($v0) /* f15e4fc: 0c004b2d */ jal func00012cb4 /* f15e500: afa30018 */ sw $v1,0x18($sp) -/* f15e504: 3c0a800a */ lui $t2,%hi(g_RoomPtrs) +/* f15e504: 3c0a800a */ lui $t2,%hi(g_Rooms) /* f15e508: 8fa30018 */ lw $v1,0x18($sp) -/* f15e50c: 8d4a4928 */ lw $t2,%lo(g_RoomPtrs)($t2) -/* f15e510: 3c0c800a */ lui $t4,%hi(g_RoomPtrs) +/* f15e50c: 8d4a4928 */ lw $t2,%lo(g_Rooms)($t2) +/* f15e510: 3c0c800a */ lui $t4,%hi(g_Rooms) /* f15e514: 01435821 */ addu $t3,$t2,$v1 /* f15e518: ad600014 */ sw $zero,0x14($t3) -/* f15e51c: 8d8c4928 */ lw $t4,%lo(g_RoomPtrs)($t4) +/* f15e51c: 8d8c4928 */ lw $t4,%lo(g_Rooms)($t4) /* f15e520: 01831021 */ addu $v0,$t4,$v1 .L0f15e524: /* f15e524: a4400002 */ sh $zero,0x2($v0) @@ -7111,7 +7111,7 @@ void func0f15e538(void) s32 i; for (i = 1; i < g_Vars.roomcount; i++) { - if (g_RoomPtrs[i].unk02) { + if (g_Rooms[i].unk02) { func0f15e474(i); } } @@ -7143,8 +7143,8 @@ glabel func0f15e5b8 /* f15e608: 28a10002 */ slti $at,$a1,0x2 /* f15e60c: 1420000e */ bnez $at,.L0f15e648 /* f15e610: 24100001 */ addiu $s0,$zero,0x1 -/* f15e614: 3c02800a */ lui $v0,%hi(g_RoomPtrs) -/* f15e618: 8c424928 */ lw $v0,%lo(g_RoomPtrs)($v0) +/* f15e614: 3c02800a */ lui $v0,%hi(g_Rooms) +/* f15e618: 8c424928 */ lw $v0,%lo(g_Rooms)($v0) /* f15e61c: 2442008c */ addiu $v0,$v0,140 .L0f15e620: /* f15e620: 84430002 */ lh $v1,0x2($v0) @@ -7179,8 +7179,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(g_RoomPtrs) -/* f15e698: 26734928 */ addiu $s3,$s3,%lo(g_RoomPtrs) +/* f15e694: 3c13800a */ lui $s3,%hi(g_Rooms) +/* f15e698: 26734928 */ addiu $s3,$s3,%lo(g_Rooms) /* f15e69c: 8e6f0000 */ lw $t7,0x0($s3) .L0f15e6a0: /* f15e6a0: 01f1c021 */ addu $t8,$t7,$s1 @@ -7244,8 +7244,8 @@ glabel func0f15e728 /* f15e768: 24110001 */ addiu $s1,$zero,0x1 /* f15e76c: 3c17800a */ lui $s7,%hi(var800a4bf0+0x2) /* f15e770: 3c15800a */ lui $s5,%hi(var800a4bf0) -/* f15e774: 3c13800a */ lui $s3,%hi(g_RoomPtrs) -/* f15e778: 26734928 */ addiu $s3,$s3,%lo(g_RoomPtrs) +/* f15e774: 3c13800a */ lui $s3,%hi(g_Rooms) +/* f15e778: 26734928 */ addiu $s3,$s3,%lo(g_Rooms) /* f15e77c: 26b54bf0 */ addiu $s5,$s5,%lo(var800a4bf0) /* f15e780: 26f74bf2 */ addiu $s7,$s7,%lo(var800a4bf0+0x2) /* f15e784: 2410008c */ addiu $s0,$zero,0x8c @@ -7336,8 +7336,8 @@ glabel func0f15e85c /* f15e8ac: 10000098 */ beqz $zero,.L0f15eb10 /* f15e8b0: 02001025 */ or $v0,$s0,$zero .L0f15e8b4: -/* f15e8b4: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) -/* f15e8b8: 8dce4928 */ lw $t6,%lo(g_RoomPtrs)($t6) +/* f15e8b4: 3c0e800a */ lui $t6,%hi(g_Rooms) +/* f15e8b8: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) /* f15e8bc: 00721823 */ subu $v1,$v1,$s2 /* f15e8c0: 00031880 */ sll $v1,$v1,0x2 /* f15e8c4: 01c37821 */ addu $t7,$t6,$v1 @@ -7363,9 +7363,9 @@ glabel func0f15e85c /* f15e910: afa30028 */ sw $v1,0x28($sp) /* f15e914: 0fc01181 */ jal func0f004604 /* f15e918: 02402025 */ or $a0,$s2,$zero -/* f15e91c: 3c0b800a */ lui $t3,%hi(g_RoomPtrs) +/* f15e91c: 3c0b800a */ lui $t3,%hi(g_Rooms) /* f15e920: 8fa30028 */ lw $v1,0x28($sp) -/* f15e924: 8d6b4928 */ lw $t3,%lo(g_RoomPtrs)($t3) +/* f15e924: 8d6b4928 */ lw $t3,%lo(g_Rooms)($t3) /* f15e928: 3c068000 */ lui $a2,0x8000 /* f15e92c: 24070001 */ addiu $a3,$zero,0x1 /* f15e930: 01632821 */ addu $a1,$t3,$v1 @@ -7506,8 +7506,8 @@ GLOBAL_ASM( glabel func0f15eb28 /* f15eb28: 000510c0 */ sll $v0,$a1,0x3 /* f15eb2c: 00451021 */ addu $v0,$v0,$a1 -/* f15eb30: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) -/* f15eb34: 8dce4928 */ lw $t6,%lo(g_RoomPtrs)($t6) +/* f15eb30: 3c0e800a */ lui $t6,%hi(g_Rooms) +/* f15eb34: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) /* f15eb38: 00021080 */ sll $v0,$v0,0x2 /* f15eb3c: 00451023 */ subu $v0,$v0,$a1 /* f15eb40: 27bdffe0 */ addiu $sp,$sp,-32 @@ -7526,8 +7526,8 @@ glabel func0f15eb28 /* f15eb70: 00402025 */ or $a0,$v0,$zero /* f15eb74: 0fc0044e */ jal func0f001138 /* f15eb78: 87a50026 */ lh $a1,0x26($sp) -/* f15eb7c: 3c19800a */ lui $t9,%hi(g_RoomPtrs) -/* f15eb80: 8f394928 */ lw $t9,%lo(g_RoomPtrs)($t9) +/* f15eb7c: 3c19800a */ lui $t9,%hi(g_Rooms) +/* f15eb80: 8f394928 */ lw $t9,%lo(g_Rooms)($t9) /* f15eb84: 8fa8001c */ lw $t0,0x1c($sp) /* f15eb88: 00402025 */ or $a0,$v0,$zero /* f15eb8c: 8fa50024 */ lw $a1,0x24($sp) @@ -7538,8 +7538,8 @@ glabel func0f15eb28 /* f15eba0: 8d460008 */ lw $a2,0x8($t2) /* f15eba4: 0fc004c0 */ jal func0f001300 /* f15eba8: 00402025 */ or $a0,$v0,$zero -/* f15ebac: 3c0c800a */ lui $t4,%hi(g_RoomPtrs) -/* f15ebb0: 8d8c4928 */ lw $t4,%lo(g_RoomPtrs)($t4) +/* f15ebac: 3c0c800a */ lui $t4,%hi(g_Rooms) +/* f15ebb0: 8d8c4928 */ lw $t4,%lo(g_Rooms)($t4) /* f15ebb4: 8fad001c */ lw $t5,0x1c($sp) /* f15ebb8: 240b0001 */ addiu $t3,$zero,0x1 /* f15ebbc: 018d7021 */ addu $t6,$t4,$t5 @@ -7568,8 +7568,8 @@ glabel func0f15ebd4 /* f15ec00: 10000031 */ beqz $zero,.L0f15ecc8 /* f15ec04: 00c01025 */ or $v0,$a2,$zero .L0f15ec08: -/* f15ec08: 3c0f800a */ lui $t7,%hi(g_RoomPtrs) -/* f15ec0c: 8def4928 */ lw $t7,%lo(g_RoomPtrs)($t7) +/* f15ec08: 3c0f800a */ lui $t7,%hi(g_Rooms) +/* f15ec0c: 8def4928 */ lw $t7,%lo(g_Rooms)($t7) /* f15ec10: 00651823 */ subu $v1,$v1,$a1 /* f15ec14: 00031880 */ sll $v1,$v1,0x2 /* f15ec18: 01e31021 */ addu $v0,$t7,$v1 @@ -7595,9 +7595,9 @@ glabel func0f15ebd4 /* f15ec64: afa30018 */ sw $v1,0x18($sp) /* f15ec68: 0fc59b5f */ jal func0f166d7c /* f15ec6c: afa50024 */ sw $a1,0x24($sp) -/* f15ec70: 3c0b800a */ lui $t3,%hi(g_RoomPtrs) +/* f15ec70: 3c0b800a */ lui $t3,%hi(g_Rooms) /* f15ec74: 8fa30018 */ lw $v1,0x18($sp) -/* f15ec78: 8d6b4928 */ lw $t3,%lo(g_RoomPtrs)($t3) +/* f15ec78: 8d6b4928 */ lw $t3,%lo(g_Rooms)($t3) /* f15ec7c: 8fa50024 */ lw $a1,0x24($sp) /* f15ec80: 00402025 */ or $a0,$v0,$zero /* f15ec84: 01636021 */ addu $t4,$t3,$v1 @@ -7605,9 +7605,9 @@ glabel func0f15ebd4 /* f15ec8c: 24070001 */ addiu $a3,$zero,0x1 /* f15ec90: 0fc57a17 */ jal func0f15e85c /* f15ec94: 8da6000c */ lw $a2,0xc($t5) -/* f15ec98: 3c0f800a */ lui $t7,%hi(g_RoomPtrs) +/* f15ec98: 3c0f800a */ lui $t7,%hi(g_Rooms) /* f15ec9c: 8fa30018 */ lw $v1,0x18($sp) -/* f15eca0: 8def4928 */ lw $t7,%lo(g_RoomPtrs)($t7) +/* f15eca0: 8def4928 */ lw $t7,%lo(g_Rooms)($t7) /* f15eca4: 240e0001 */ addiu $t6,$zero,0x1 /* f15eca8: 00403025 */ or $a2,$v0,$zero /* f15ecac: 01e3c021 */ addu $t8,$t7,$v1 @@ -7831,8 +7831,8 @@ glabel func0f15ef9c /* f15ef9c: 27bdffa8 */ addiu $sp,$sp,-88 /* f15efa0: 000410c0 */ sll $v0,$a0,0x3 /* f15efa4: 00441021 */ addu $v0,$v0,$a0 -/* f15efa8: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) -/* f15efac: 8dce4928 */ lw $t6,%lo(g_RoomPtrs)($t6) +/* f15efa8: 3c0e800a */ lui $t6,%hi(g_Rooms) +/* f15efac: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) /* f15efb0: 00021080 */ sll $v0,$v0,0x2 /* f15efb4: 00441023 */ subu $v0,$v0,$a0 /* f15efb8: 00021080 */ sll $v0,$v0,0x2 @@ -7927,8 +7927,8 @@ glabel func0f15ef9c /* f15f0f4: 00002825 */ or $a1,$zero,$zero /* f15f0f8: 0fc576ad */ jal func0f15dab4 /* f15f0fc: 24060001 */ addiu $a2,$zero,0x1 -/* f15f100: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) -/* f15f104: 8dce4928 */ lw $t6,%lo(g_RoomPtrs)($t6) +/* f15f100: 3c0e800a */ lui $t6,%hi(g_Rooms) +/* f15f104: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) /* f15f108: 8faf0038 */ lw $t7,0x38($sp) /* f15f10c: 0040a025 */ or $s4,$v0,$zero /* f15f110: 00009825 */ or $s3,$zero,$zero @@ -7982,8 +7982,8 @@ glabel func0f15ef9c /* f15f1c4: 1440ffef */ bnez $v0,.L0f15f184 /* f15f1c8: 0040a025 */ or $s4,$v0,$zero .L0f15f1cc: -/* f15f1cc: 3c0b800a */ lui $t3,%hi(g_RoomPtrs) -/* f15f1d0: 8d6b4928 */ lw $t3,%lo(g_RoomPtrs)($t3) +/* f15f1cc: 3c0b800a */ lui $t3,%hi(g_Rooms) +/* f15f1d0: 8d6b4928 */ lw $t3,%lo(g_Rooms)($t3) /* f15f1d4: 8fac0038 */ lw $t4,0x38($sp) /* f15f1d8: 00134c00 */ sll $t1,$s3,0x10 /* f15f1dc: 00095403 */ sra $t2,$t1,0x10 @@ -10533,7 +10533,7 @@ glabel func0f161520 /* f1615e0: e7a6009c */ swc1 $f6,0x9c($sp) /* f1615e4: 8defa27c */ lw $t7,%lo(g_Vars+0x2bc)($t7) /* f1615e8: 8fb500f0 */ lw $s5,0xf0($sp) -/* f1615ec: 3c16800a */ lui $s6,%hi(g_RoomPtrs) +/* f1615ec: 3c16800a */ lui $s6,%hi(g_Rooms) /* f1615f0: 00cf082a */ slt $at,$a2,$t7 /* f1615f4: 14200003 */ bnez $at,.L0f161604 /* f1615f8: 0015c0c0 */ sll $t8,$s5,0x3 @@ -10541,7 +10541,7 @@ glabel func0f161520 /* f1615fc: 10000120 */ beqz $zero,.L0f161a80 /* f161600: 00001025 */ or $v0,$zero,$zero .L0f161604: -/* f161604: 26d64928 */ addiu $s6,$s6,%lo(g_RoomPtrs) +/* f161604: 26d64928 */ addiu $s6,$s6,%lo(g_Rooms) /* f161608: 0315c021 */ addu $t8,$t8,$s5 /* f16160c: 8ed90000 */ lw $t9,0x0($s6) /* f161610: 0018c080 */ sll $t8,$t8,0x2 @@ -10868,19 +10868,10 @@ glabel func0f161520 /* f161ab0: 27bd00e8 */ addiu $sp,$sp,0xe8 ); -GLOBAL_ASM( -glabel func0f161ab4 -/* f161ab4: 000478c0 */ sll $t7,$a0,0x3 -/* f161ab8: 01e47821 */ addu $t7,$t7,$a0 -/* f161abc: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) -/* f161ac0: 8dce4928 */ lw $t6,%lo(g_RoomPtrs)($t6) -/* f161ac4: 000f7880 */ sll $t7,$t7,0x2 -/* f161ac8: 01e47823 */ subu $t7,$t7,$a0 -/* f161acc: 000f7880 */ sll $t7,$t7,0x2 -/* f161ad0: 01cfc021 */ addu $t8,$t6,$t7 -/* f161ad4: 03e00008 */ jr $ra -/* f161ad8: 87020002 */ lh $v0,0x2($t8) -); +s32 func0f161ab4(s32 room) +{ + return g_Rooms[room].unk02; +} GLOBAL_ASM( glabel func0f161adc @@ -10893,10 +10884,10 @@ glabel func0f161adc /* f161af4: c4860004 */ lwc1 $f6,0x4($a0) /* f161af8: 000fc8c0 */ sll $t9,$t7,0x3 /* f161afc: 032fc821 */ addu $t9,$t9,$t7 -/* f161b00: 3c18800a */ lui $t8,%hi(g_RoomPtrs) +/* f161b00: 3c18800a */ lui $t8,%hi(g_Rooms) /* f161b04: e7a60008 */ swc1 $f6,0x8($sp) /* f161b08: c4880008 */ lwc1 $f8,0x8($a0) -/* f161b0c: 8f184928 */ lw $t8,%lo(g_RoomPtrs)($t8) +/* f161b0c: 8f184928 */ lw $t8,%lo(g_Rooms)($t8) /* f161b10: 0019c880 */ sll $t9,$t9,0x2 /* f161b14: 032fc823 */ subu $t9,$t9,$t7 /* f161b18: 0019c880 */ sll $t9,$t9,0x2 @@ -10974,8 +10965,8 @@ glabel func0f161c08 /* f161c10: 000e2c03 */ sra $a1,$t6,0x10 /* f161c14: 0005c8c0 */ sll $t9,$a1,0x3 /* f161c18: 0325c821 */ addu $t9,$t9,$a1 -/* f161c1c: 3c18800a */ lui $t8,%hi(g_RoomPtrs) -/* f161c20: 8f184928 */ lw $t8,%lo(g_RoomPtrs)($t8) +/* f161c1c: 3c18800a */ lui $t8,%hi(g_Rooms) +/* f161c20: 8f184928 */ lw $t8,%lo(g_Rooms)($t8) /* f161c24: 0019c880 */ sll $t9,$t9,0x2 /* f161c28: 0325c823 */ subu $t9,$t9,$a1 /* f161c2c: 0019c880 */ sll $t9,$t9,0x2 @@ -11056,8 +11047,8 @@ glabel func0f161d30 /* f161d38: 00077c03 */ sra $t7,$a3,0x10 /* f161d3c: 000fc8c0 */ sll $t9,$t7,0x3 /* f161d40: 032fc821 */ addu $t9,$t9,$t7 -/* f161d44: 3c18800a */ lui $t8,%hi(g_RoomPtrs) -/* f161d48: 8f184928 */ lw $t8,%lo(g_RoomPtrs)($t8) +/* f161d44: 3c18800a */ lui $t8,%hi(g_Rooms) +/* f161d48: 8f184928 */ lw $t8,%lo(g_Rooms)($t8) /* f161d4c: 0019c880 */ sll $t9,$t9,0x2 /* f161d50: 032fc823 */ subu $t9,$t9,$t7 /* f161d54: 0019c880 */ sll $t9,$t9,0x2 @@ -11329,8 +11320,8 @@ glabel func0f162128 /* f162134: 000e2c03 */ sra $a1,$t6,0x10 /* f162138: 0005c8c0 */ sll $t9,$a1,0x3 /* f16213c: 0325c821 */ addu $t9,$t9,$a1 -/* f162140: 3c18800a */ lui $t8,%hi(g_RoomPtrs) -/* f162144: 8f184928 */ lw $t8,%lo(g_RoomPtrs)($t8) +/* f162140: 3c18800a */ lui $t8,%hi(g_Rooms) +/* f162144: 8f184928 */ lw $t8,%lo(g_Rooms)($t8) /* f162148: 0019c880 */ sll $t9,$t9,0x2 /* f16214c: 0325c823 */ subu $t9,$t9,$a1 /* f162150: 0019c880 */ sll $t9,$t9,0x2 @@ -11377,8 +11368,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(g_RoomPtrs) -/* f1621ec: 26104928 */ addiu $s0,$s0,%lo(g_RoomPtrs) +/* f1621e8: 3c10800a */ lui $s0,%hi(g_Rooms) +/* f1621ec: 26104928 */ addiu $s0,$s0,%lo(g_Rooms) /* f1621f0: 2404008c */ addiu $a0,$zero,0x8c .L0f1621f4: /* f1621f4: 8e0e0000 */ lw $t6,0x0($s0) @@ -11448,10 +11439,10 @@ glabel func0f162194 .L0f1622e8: /* f1622e8: 8fae0064 */ lw $t6,0x64($sp) /* f1622ec: 8faf0068 */ lw $t7,0x68($sp) -/* f1622f0: 3c10800a */ lui $s0,%hi(g_RoomPtrs) +/* f1622f0: 3c10800a */ lui $s0,%hi(g_Rooms) /* f1622f4: 00093040 */ sll $a2,$t1,0x1 /* f1622f8: 000a6040 */ sll $t4,$t2,0x1 -/* f1622fc: 26104928 */ addiu $s0,$s0,%lo(g_RoomPtrs) +/* f1622fc: 26104928 */ addiu $s0,$s0,%lo(g_Rooms) /* f162300: 01c65821 */ addu $t3,$t6,$a2 /* f162304: 15200043 */ bnez $t1,.L0f162414 /* f162308: 01ec6821 */ addu $t5,$t7,$t4 @@ -11537,11 +11528,11 @@ glabel func0f162194 /* f162434: 3c03800a */ lui $v1,%hi(g_Vars+0x2bc) /* f162438: 8c63a27c */ lw $v1,%lo(g_Vars+0x2bc)($v1) /* f16243c: 24020001 */ addiu $v0,$zero,0x1 -/* f162440: 3c07800a */ lui $a3,%hi(g_RoomPtrs) +/* f162440: 3c07800a */ lui $a3,%hi(g_Rooms) /* f162444: 28610002 */ slti $at,$v1,0x2 /* f162448: 14200037 */ bnez $at,.L0f162528 /* f16244c: 00000000 */ sll $zero,$zero,0x0 -/* f162450: 8ce74928 */ lw $a3,%lo(g_RoomPtrs)($a3) +/* f162450: 8ce74928 */ lw $a3,%lo(g_Rooms)($a3) /* f162454: 27ab0054 */ addiu $t3,$sp,0x54 /* f162458: 24e7008c */ addiu $a3,$a3,140 .L0f16245c: @@ -11793,10 +11784,10 @@ glabel var7f1b76bc .L0f162630: /* f162630: 3c17800a */ lui $s7,%hi(g_Portals) /* f162634: 3c15800a */ lui $s5,%hi(var800a65c0) -/* f162638: 3c14800a */ lui $s4,%hi(g_RoomPtrs) +/* f162638: 3c14800a */ lui $s4,%hi(g_Rooms) /* f16263c: 3c138008 */ lui $s3,%hi(g_PortalMode) /* f162640: 2673fcac */ addiu $s3,$s3,%lo(g_PortalMode) -/* f162644: 26944928 */ addiu $s4,$s4,%lo(g_RoomPtrs) +/* f162644: 26944928 */ addiu $s4,$s4,%lo(g_Rooms) /* f162648: 26b565c0 */ addiu $s5,$s5,%lo(var800a65c0) /* f16264c: 26f74cc8 */ addiu $s7,$s7,%lo(g_Portals) /* f162650: 24160001 */ addiu $s6,$zero,0x1 @@ -12390,7 +12381,7 @@ glabel var7f1b76bc // break; // case PORTALCMD_DISABLEROOM: // 24 - f162a70 // if (execute) { -// g_RoomPtrs[cmd[1].param].flags |= ROOMFLAG_DISABLED; +// g_Rooms[cmd[1].param].flags |= ROOMFLAG_DISABLED; // } // cmd += cmd->len; // break; @@ -12399,7 +12390,7 @@ glabel var7f1b76bc // s32 i; // // for (i = cmd[1].param; i <= cmd[2].param; i++) { -// g_RoomPtrs[i].flags |= ROOMFLAG_DISABLED; +// g_Rooms[i].flags |= ROOMFLAG_DISABLED; // } // } // cmd += cmd->len; @@ -12425,7 +12416,7 @@ glabel var7f1b76bc // break; // case PORTALCMD_2A: // 2a - f162ba8 // if (execute) { -// g_RoomPtrs[cmd[1].param].unk07 = 0; +// g_Rooms[cmd[1].param].unk07 = 0; // } // cmd += cmd->len; // break; @@ -12637,7 +12628,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(g_RoomPtrs) +/* f162f54: 3c15800a */ lui $s5,%hi(g_Rooms) /* f162f58: 46809120 */ cvt.s.w $f4,$f18 /* f162f5c: 46082280 */ add.s $f10,$f4,$f8 /* f162f60: e6ca0028 */ swc1 $f10,0x28($s6) @@ -12684,7 +12675,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(g_RoomPtrs) +/* f163010: 26b54928 */ addiu $s5,$s5,%lo(g_Rooms) .L0f163014: /* f163014: 8eae0000 */ lw $t6,0x0($s5) /* f163018: c7aa00ac */ lwc1 $f10,0xac($sp) @@ -12879,9 +12870,9 @@ glabel func0f1632d4 /* f1632dc: 00058400 */ sll $s0,$a1,0x10 /* f1632e0: 00107403 */ sra $t6,$s0,0x10 /* f1632e4: afbf001c */ sw $ra,0x1c($sp) -/* f1632e8: 3c1f800a */ lui $ra,%hi(g_RoomPtrs) +/* f1632e8: 3c1f800a */ lui $ra,%hi(g_Rooms) /* f1632ec: 000e68c0 */ sll $t5,$t6,0x3 -/* f1632f0: 27ff4928 */ addiu $ra,$ra,%lo(g_RoomPtrs) +/* f1632f0: 27ff4928 */ addiu $ra,$ra,%lo(g_Rooms) /* f1632f4: 01ae6821 */ addu $t5,$t5,$t6 /* f1632f8: 8fef0000 */ lw $t7,0x0($ra) /* f1632fc: 000d6880 */ sll $t5,$t5,0x2 @@ -13051,8 +13042,8 @@ glabel func0f163528 /* f16354c: afb1001c */ sw $s1,0x1c($sp) /* f163550: afb00018 */ sw $s0,0x18($sp) /* f163554: 848f0000 */ lh $t7,0x0($a0) -/* f163558: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) -/* f16355c: 8dce4928 */ lw $t6,%lo(g_RoomPtrs)($t6) +/* f163558: 3c0e800a */ lui $t6,%hi(g_Rooms) +/* f16355c: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) /* f163560: 000fc0c0 */ sll $t8,$t7,0x3 /* f163564: 030fc021 */ addu $t8,$t8,$t7 /* f163568: 0018c080 */ sll $t8,$t8,0x2 @@ -13367,12 +13358,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(g_RoomPtrs) +/* f1639c4: 3c16800a */ lui $s6,%hi(g_Rooms) /* 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(g_RoomPtrs) +/* f1639d8: 26d64928 */ addiu $s6,$s6,%lo(g_Rooms) /* f1639dc: 2411008c */ addiu $s1,$zero,0x8c /* f1639e0: 906f0006 */ lbu $t7,0x6($v1) .L0f1639e4: @@ -13595,8 +13586,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(g_RoomPtrs) -/* f163d1c: 26d64928 */ addiu $s6,$s6,%lo(g_RoomPtrs) +/* f163d18: 3c16800a */ lui $s6,%hi(g_Rooms) +/* f163d1c: 26d64928 */ addiu $s6,$s6,%lo(g_Rooms) /* f163d20: 13000039 */ beqz $t8,.L0f163e08 /* f163d24: 240d0001 */ addiu $t5,$zero,0x1 /* f163d28: 8d02028c */ lw $v0,0x28c($t0) @@ -13713,9 +13704,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(g_RoomPtrs) +/* f163ec8: 3c02800a */ lui $v0,%hi(g_Rooms) /* f163ecc: 460a4403 */ div.s $f16,$f8,$f10 -/* f163ed0: 24424928 */ addiu $v0,$v0,%lo(g_RoomPtrs) +/* f163ed0: 24424928 */ addiu $v0,$v0,%lo(g_Rooms) /* f163ed4: 00002825 */ or $a1,$zero,$zero /* f163ed8: 00001825 */ or $v1,$zero,$zero /* f163edc: 24070001 */ addiu $a3,$zero,0x1 @@ -13955,12 +13946,12 @@ glabel var7f1b76c0 /* f16421c: 11e000b2 */ beqz $t7,.L0f1644e8 /* f164220: e7a400ac */ swc1 $f4,0xac($sp) /* f164224: 8c6602bc */ lw $a2,0x2bc($v1) -/* f164228: 3c03800a */ lui $v1,%hi(g_RoomPtrs) +/* f164228: 3c03800a */ lui $v1,%hi(g_Rooms) /* f16422c: 24040001 */ addiu $a0,$zero,0x1 /* f164230: 28c10002 */ slti $at,$a2,0x2 /* f164234: 142000ac */ bnez $at,.L0f1644e8 /* f164238: 00000000 */ sll $zero,$zero,0x0 -/* f16423c: 8c634928 */ lw $v1,%lo(g_RoomPtrs)($v1) +/* f16423c: 8c634928 */ lw $v1,%lo(g_Rooms)($v1) /* f164240: 3c08800a */ lui $t0,%hi(var8009dd6c) /* f164244: 2508dd6c */ addiu $t0,$t0,%lo(var8009dd6c) /* f164248: 2463008c */ addiu $v1,$v1,140 @@ -14202,8 +14193,8 @@ GLOBAL_ASM( glabel func0f1645a8 /* f1645a8: 000438c0 */ sll $a3,$a0,0x3 /* f1645ac: 00e43821 */ addu $a3,$a3,$a0 -/* f1645b0: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) -/* f1645b4: 8dce4928 */ lw $t6,%lo(g_RoomPtrs)($t6) +/* f1645b0: 3c0e800a */ lui $t6,%hi(g_Rooms) +/* f1645b4: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) /* f1645b8: 00073880 */ sll $a3,$a3,0x2 /* f1645bc: 27bdfff0 */ addiu $sp,$sp,-16 /* f1645c0: 00e43823 */ subu $a3,$a3,$a0 @@ -14241,7 +14232,7 @@ glabel func0f1645a8 /* f16463c: 85460004 */ lh $a2,0x4($t2) .L0f164640: /* f164640: 18600009 */ blez $v1,.L0f164668 -/* f164644: 3c19800a */ lui $t9,%hi(g_RoomPtrs) +/* f164644: 3c19800a */ lui $t9,%hi(g_Rooms) .L0f164648: /* f164648: 844e0000 */ lh $t6,0x0($v0) /* f16464c: 256b0001 */ addiu $t3,$t3,0x1 @@ -14257,7 +14248,7 @@ glabel func0f1645a8 /* f16466c: 0071082a */ slt $at,$v1,$s1 /* f164670: 10200008 */ beqz $at,.L0f164694 /* f164674: a5e60000 */ sh $a2,0x0($t7) -/* f164678: 8f394928 */ lw $t9,%lo(g_RoomPtrs)($t9) +/* f164678: 8f394928 */ lw $t9,%lo(g_Rooms)($t9) /* f16467c: 03274021 */ addu $t0,$t9,$a3 /* f164680: 81090005 */ lb $t1,0x5($t0) /* f164684: 00091040 */ sll $v0,$t1,0x1 @@ -14281,8 +14272,8 @@ GLOBAL_ASM( glabel func0f1646b8 /* f1646b8: 000478c0 */ sll $t7,$a0,0x3 /* f1646bc: 01e47821 */ addu $t7,$t7,$a0 -/* f1646c0: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) -/* f1646c4: 8dce4928 */ lw $t6,%lo(g_RoomPtrs)($t6) +/* f1646c0: 3c0e800a */ lui $t6,%hi(g_Rooms) +/* f1646c4: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) /* f1646c8: 000f7880 */ sll $t7,$t7,0x2 /* f1646cc: 01e47823 */ subu $t7,$t7,$a0 /* f1646d0: 000f7880 */ sll $t7,$t7,0x2 @@ -14434,8 +14425,8 @@ GLOBAL_ASM( glabel func0f1648cc /* f1648cc: 000430c0 */ sll $a2,$a0,0x3 /* f1648d0: 00c43021 */ addu $a2,$a2,$a0 -/* f1648d4: 3c02800a */ lui $v0,%hi(g_RoomPtrs) -/* f1648d8: 8c424928 */ lw $v0,%lo(g_RoomPtrs)($v0) +/* f1648d4: 3c02800a */ lui $v0,%hi(g_Rooms) +/* f1648d8: 8c424928 */ lw $v0,%lo(g_Rooms)($v0) /* f1648dc: 27bdfff0 */ addiu $sp,$sp,-16 /* f1648e0: 00063080 */ sll $a2,$a2,0x2 /* f1648e4: 00c43023 */ subu $a2,$a2,$a0 @@ -14493,8 +14484,8 @@ glabel func0f1648cc /* f1649a8: 45020009 */ bc1fl .L0f1649d0 /* f1649ac: c4e60024 */ lwc1 $f6,0x24($a3) /* f1649b0: e4e00018 */ swc1 $f0,0x18($a3) -/* f1649b4: 3c02800a */ lui $v0,%hi(g_RoomPtrs) -/* f1649b8: 8c424928 */ lw $v0,%lo(g_RoomPtrs)($v0) +/* f1649b4: 3c02800a */ lui $v0,%hi(g_Rooms) +/* f1649b8: 8c424928 */ lw $v0,%lo(g_Rooms)($v0) /* f1649bc: 0019c880 */ sll $t9,$t9,0x2 /* f1649c0: 24630001 */ addiu $v1,$v1,0x1 /* f1649c4: 00597821 */ addu $t7,$v0,$t9 @@ -14507,8 +14498,8 @@ glabel func0f1648cc /* f1649dc: 45000005 */ bc1f .L0f1649f4 /* f1649e0: 00000000 */ sll $zero,$zero,0x0 /* f1649e4: e4e00024 */ swc1 $f0,0x24($a3) -/* f1649e8: 3c02800a */ lui $v0,%hi(g_RoomPtrs) -/* f1649ec: 8c424928 */ lw $v0,%lo(g_RoomPtrs)($v0) +/* f1649e8: 3c02800a */ lui $v0,%hi(g_Rooms) +/* f1649ec: 8c424928 */ lw $v0,%lo(g_Rooms)($v0) /* f1649f0: 24630001 */ addiu $v1,$v1,0x1 .L0f1649f4: /* f1649f4: 1532ffde */ bne $t1,$s2,.L0f164970 @@ -14581,9 +14572,9 @@ glabel func0f164ab8 /* f164acc: 01cf3021 */ addu $a2,$t6,$t7 /* f164ad0: 84c80002 */ lh $t0,0x2($a2) /* f164ad4: 240a008c */ addiu $t2,$zero,0x8c -/* f164ad8: 3c07800a */ lui $a3,%hi(g_RoomPtrs) +/* f164ad8: 3c07800a */ lui $a3,%hi(g_Rooms) /* f164adc: 010a0019 */ multu $t0,$t2 -/* f164ae0: 8ce74928 */ lw $a3,%lo(g_RoomPtrs)($a3) +/* f164ae0: 8ce74928 */ lw $a3,%lo(g_Rooms)($a3) /* f164ae4: 84c90004 */ lh $t1,0x4($a2) /* f164ae8: 3c0c800a */ lui $t4,%hi(var800a4ccc) /* f164aec: 8d8c4ccc */ lw $t4,%lo(var800a4ccc)($t4) @@ -14689,8 +14680,8 @@ glabel func0f164c64 /* f164c64: 000478c0 */ sll $t7,$a0,0x3 /* f164c68: 27bdffc0 */ addiu $sp,$sp,-64 /* f164c6c: 01e47821 */ addu $t7,$t7,$a0 -/* f164c70: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) -/* f164c74: 8dce4928 */ lw $t6,%lo(g_RoomPtrs)($t6) +/* f164c70: 3c0e800a */ lui $t6,%hi(g_Rooms) +/* f164c74: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) /* f164c78: 000f7880 */ sll $t7,$t7,0x2 /* f164c7c: 01e47823 */ subu $t7,$t7,$a0 /* f164c80: 000f7880 */ sll $t7,$t7,0x2 @@ -15072,8 +15063,8 @@ glabel func0f1650d0 /* f165188: 10200061 */ beqz $at,.L0f165310 /* f16518c: 8faa00b8 */ lw $t2,0xb8($sp) /* f165190: 00085840 */ sll $t3,$t0,0x1 -/* f165194: 3c05800a */ lui $a1,%hi(g_RoomPtrs) -/* f165198: 8ca54928 */ lw $a1,%lo(g_RoomPtrs)($a1) +/* f165194: 3c05800a */ lui $a1,%hi(g_Rooms) +/* f165198: 8ca54928 */ lw $a1,%lo(g_Rooms)($a1) /* f16519c: 014b3821 */ addu $a3,$t2,$t3 /* f1651a0: 84fe0000 */ lh $s8,0x0($a3) .L0f1651a4: @@ -15159,8 +15150,8 @@ glabel func0f1650d0 .L0f1652c4: /* f1652c4: 10200017 */ beqz $at,.L0f165324 .L0f1652c8: -/* f1652c8: 3c05800a */ lui $a1,%hi(g_RoomPtrs) -/* f1652cc: 8ca54928 */ lw $a1,%lo(g_RoomPtrs)($a1) +/* f1652c8: 3c05800a */ lui $a1,%hi(g_Rooms) +/* f1652cc: 8ca54928 */ lw $a1,%lo(g_Rooms)($a1) /* f1652d0: 8fa90054 */ lw $t1,0x54($sp) /* f1652d4: 00a91821 */ addu $v1,$a1,$t1 /* f1652d8: 80640005 */ lb $a0,0x5($v1) diff --git a/src/game/game_1668e0.c b/src/game/game_1668e0.c index e991b53ce..15619ecb3 100644 --- a/src/game/game_1668e0.c +++ b/src/game/game_1668e0.c @@ -21,8 +21,8 @@ GLOBAL_ASM( glabel func0f1668f0 /* f1668f0: 000578c0 */ sll $t7,$a1,0x3 /* f1668f4: 01e57821 */ addu $t7,$t7,$a1 -/* f1668f8: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) -/* f1668fc: 8dce4928 */ lw $t6,%lo(g_RoomPtrs)($t6) +/* f1668f8: 3c0e800a */ lui $t6,%hi(g_Rooms) +/* f1668fc: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) /* f166900: 000f7880 */ sll $t7,$t7,0x2 /* f166904: 01e57823 */ subu $t7,$t7,$a1 /* f166908: 000f7880 */ sll $t7,$t7,0x2 @@ -40,8 +40,8 @@ GLOBAL_ASM( glabel func0f16692c /* f16692c: 000578c0 */ sll $t7,$a1,0x3 /* f166930: 01e57821 */ addu $t7,$t7,$a1 -/* f166934: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) -/* f166938: 8dce4928 */ lw $t6,%lo(g_RoomPtrs)($t6) +/* f166934: 3c0e800a */ lui $t6,%hi(g_Rooms) +/* f166938: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) /* f16693c: 000f7880 */ sll $t7,$t7,0x2 /* f166940: 01e57823 */ subu $t7,$t7,$a1 /* f166944: 000f7880 */ sll $t7,$t7,0x2 @@ -259,8 +259,8 @@ GLOBAL_ASM( glabel func0f166c20 /* f166c20: 0004c0c0 */ sll $t8,$a0,0x3 /* f166c24: 0304c021 */ addu $t8,$t8,$a0 -/* f166c28: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) -/* f166c2c: 8dce4928 */ lw $t6,%lo(g_RoomPtrs)($t6) +/* f166c28: 3c0e800a */ lui $t6,%hi(g_Rooms) +/* f166c2c: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) /* f166c30: 27bdff98 */ addiu $sp,$sp,-104 /* f166c34: 0018c080 */ sll $t8,$t8,0x2 /* f166c38: 0304c023 */ subu $t8,$t8,$a0 diff --git a/src/game/game_16cfa0.c b/src/game/game_16cfa0.c index 954f5b90b..4c25d5968 100644 --- a/src/game/game_16cfa0.c +++ b/src/game/game_16cfa0.c @@ -616,8 +616,8 @@ glabel func0f16d6c0 /* f16d774: 24040001 */ addiu $a0,$zero,0x1 .L0f16d778: /* f16d778: 8cac0064 */ lw $t4,0x64($a1) -/* f16d77c: 3c0a800a */ lui $t2,%hi(g_RoomPtrs) -/* f16d780: 254a4928 */ addiu $t2,$t2,%lo(g_RoomPtrs) +/* f16d77c: 3c0a800a */ lui $t2,%hi(g_Rooms) +/* f16d780: 254a4928 */ addiu $t2,$t2,%lo(g_Rooms) /* f16d784: 11800003 */ beqz $t4,.L0f16d794 /* f16d788: 240b008c */ addiu $t3,$zero,0x8c /* f16d78c: 10000001 */ beqz $zero,.L0f16d794 diff --git a/src/game/game_19aa80.c b/src/game/game_19aa80.c index eb1a53ffc..9d06f9a89 100644 --- a/src/game/game_19aa80.c +++ b/src/game/game_19aa80.c @@ -166,8 +166,8 @@ glabel func0f19ab70 /* f19aca0: 53000047 */ beqzl $t8,.L0f19adc0 /* f19aca4: 8fac0054 */ lw $t4,0x54($sp) /* f19aca8: 87b7021a */ lh $s7,0x21a($sp) -/* f19acac: 3c08800a */ lui $t0,%hi(g_RoomPtrs) -/* f19acb0: 8d084928 */ lw $t0,%lo(g_RoomPtrs)($t0) +/* f19acac: 3c08800a */ lui $t0,%hi(g_Rooms) +/* f19acb0: 8d084928 */ lw $t0,%lo(g_Rooms)($t0) /* f19acb4: 0017c8c0 */ sll $t9,$s7,0x3 /* f19acb8: 0337c821 */ addu $t9,$t9,$s7 /* f19acbc: 0019c880 */ sll $t9,$t9,0x2 @@ -180,8 +180,8 @@ glabel func0f19ab70 /* f19acd8: 8fac0054 */ lw $t4,0x54($sp) /* f19acdc: 00009825 */ or $s3,$zero,$zero .L0f19ace0: -/* f19ace0: 3c0b800a */ lui $t3,%hi(g_RoomPtrs) -/* f19ace4: 8d6b4928 */ lw $t3,%lo(g_RoomPtrs)($t3) +/* f19ace0: 3c0b800a */ lui $t3,%hi(g_Rooms) +/* f19ace4: 8d6b4928 */ lw $t3,%lo(g_Rooms)($t3) /* f19ace8: 3c0a800a */ lui $t2,%hi(g_Vars+0x60) /* f19acec: 8d4aa020 */ lw $t2,%lo(g_Vars+0x60)($t2) /* f19acf0: 01776021 */ addu $t4,$t3,$s7 diff --git a/src/game/padhalllv.c b/src/game/padhalllv.c index 9ca03167b..5072e2f4d 100644 --- a/src/game/padhalllv.c +++ b/src/game/padhalllv.c @@ -96,8 +96,8 @@ glabel waypointFindClosestToPos /* f114340: 10ec0068 */ beq $a3,$t4,.L0f1144e4 /* f114344: 0000a025 */ or $s4,$zero,$zero /* f114348: 27b50360 */ addiu $s5,$sp,0x360 -/* f11434c: 3c03800a */ lui $v1,%hi(g_RoomPtrs) -/* f114350: 8c634928 */ lw $v1,%lo(g_RoomPtrs)($v1) +/* f11434c: 3c03800a */ lui $v1,%hi(g_Rooms) +/* f114350: 8c634928 */ lw $v1,%lo(g_Rooms)($v1) /* f114354: 86a40000 */ lh $a0,0x0($s5) /* f114358: 2417008c */ addiu $s7,$zero,0x8c .L0f11435c: @@ -190,8 +190,8 @@ glabel waypointFindClosestToPos /* f114498: 26310001 */ addiu $s1,$s1,0x1 .L0f11449c: /* f11449c: 86a90000 */ lh $t1,0x0($s5) -/* f1144a0: 3c03800a */ lui $v1,%hi(g_RoomPtrs) -/* f1144a4: 8c634928 */ lw $v1,%lo(g_RoomPtrs)($v1) +/* f1144a0: 3c03800a */ lui $v1,%hi(g_Rooms) +/* f1144a4: 8c634928 */ lw $v1,%lo(g_Rooms)($v1) /* f1144a8: 01370019 */ multu $t1,$s7 /* f1144ac: 26730001 */ addiu $s3,$s3,0x1 /* f1144b0: 26940002 */ addiu $s4,$s4,0x2 diff --git a/src/game/propobj.c b/src/game/propobj.c index 97aa666a3..31204b3dd 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -3248,9 +3248,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(g_RoomPtrs) +/* f068c8c: 3c17800a */ lui $s7,%hi(g_Rooms) /* f068c90: 4480c000 */ mtc1 $zero,$f24 -/* f068c94: 26f74928 */ addiu $s7,$s7,%lo(g_RoomPtrs) +/* f068c94: 26f74928 */ addiu $s7,$s7,%lo(g_Rooms) /* f068c98: 241e008c */ addiu $s8,$zero,0x8c /* f068c9c: 2416ffff */ addiu $s6,$zero,-1 /* f068ca0: afa70128 */ sw $a3,0x128($sp) @@ -46216,8 +46216,8 @@ glabel var7f1ab16c /* f08e8d0: 00004025 */ or $t0,$zero,$zero /* f08e8d4: 1046003e */ beq $v0,$a2,.L0f08e9d0 /* f08e8d8: 01201825 */ or $v1,$t1,$zero -/* f08e8dc: 3c04800a */ lui $a0,%hi(g_RoomPtrs) -/* f08e8e0: 8c844928 */ lw $a0,%lo(g_RoomPtrs)($a0) +/* f08e8dc: 3c04800a */ lui $a0,%hi(g_Rooms) +/* f08e8e0: 8c844928 */ lw $a0,%lo(g_Rooms)($a0) /* f08e8e4: 2405008c */ addiu $a1,$zero,0x8c .L0f08e8e8: /* f08e8e8: 00450019 */ multu $v0,$a1 diff --git a/src/game/wallhit.c b/src/game/wallhit.c index febe0b8a1..34dc709fb 100644 --- a/src/game/wallhit.c +++ b/src/game/wallhit.c @@ -177,8 +177,8 @@ glabel func0f13e1b0 /* f13e240: 0563001d */ bgezl $t3,.L0f13e2b8 /* f13e244: 84880068 */ lh $t0,0x68($a0) /* f13e248: 848d0068 */ lh $t5,0x68($a0) -/* f13e24c: 3c0c800a */ lui $t4,%hi(g_RoomPtrs) -/* f13e250: 8d8c4928 */ lw $t4,%lo(g_RoomPtrs)($t4) +/* f13e24c: 3c0c800a */ lui $t4,%hi(g_Rooms) +/* f13e250: 8d8c4928 */ lw $t4,%lo(g_Rooms)($t4) /* f13e254: 000d70c0 */ sll $t6,$t5,0x3 /* f13e258: 01cd7021 */ addu $t6,$t6,$t5 /* f13e25c: 000e7080 */ sll $t6,$t6,0x2 @@ -209,8 +209,8 @@ glabel func0f13e1b0 /* f13e2b0: ac800078 */ sw $zero,0x78($a0) /* f13e2b4: 84880068 */ lh $t0,0x68($a0) .L0f13e2b8: -/* f13e2b8: 3c19800a */ lui $t9,%hi(g_RoomPtrs) -/* f13e2bc: 8f394928 */ lw $t9,%lo(g_RoomPtrs)($t9) +/* f13e2b8: 3c19800a */ lui $t9,%hi(g_Rooms) +/* f13e2bc: 8f394928 */ lw $t9,%lo(g_Rooms)($t9) /* f13e2c0: 000848c0 */ sll $t1,$t0,0x3 /* f13e2c4: 01284821 */ addu $t1,$t1,$t0 /* f13e2c8: 00094880 */ sll $t1,$t1,0x2 @@ -727,10 +727,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(g_RoomPtrs) +/* f13e9a0: 3c0a800a */ lui $t2,%hi(g_Rooms) /* f13e9a4: afb00018 */ sw $s0,0x18($sp) /* f13e9a8: 0000f825 */ or $ra,$zero,$zero -/* f13e9ac: 254a4928 */ addiu $t2,$t2,%lo(g_RoomPtrs) +/* f13e9ac: 254a4928 */ addiu $t2,$t2,%lo(g_Rooms) /* f13e9b0: 258ccc40 */ addiu $t4,$t4,%lo(var8009cc40) /* f13e9b4: 00004025 */ or $t0,$zero,$zero /* f13e9b8: 240d0001 */ addiu $t5,$zero,0x1 @@ -821,10 +821,10 @@ glabel func0f13e994 /* f13ead8: afbf0024 */ sw $ra,0x24($sp) /* f13eadc: 0fc4f9d1 */ jal func0f13e744 /* f13eae0: afa80028 */ sw $t0,0x28($sp) -/* f13eae4: 3c0a800a */ lui $t2,%hi(g_RoomPtrs) +/* f13eae4: 3c0a800a */ lui $t2,%hi(g_Rooms) /* f13eae8: 3c0c800a */ lui $t4,%hi(var8009cc40) /* f13eaec: 258ccc40 */ addiu $t4,$t4,%lo(var8009cc40) -/* f13eaf0: 254a4928 */ addiu $t2,$t2,%lo(g_RoomPtrs) +/* f13eaf0: 254a4928 */ addiu $t2,$t2,%lo(g_Rooms) /* f13eaf4: 8fa80028 */ lw $t0,0x28($sp) /* f13eaf8: 240b008c */ addiu $t3,$zero,0x8c /* f13eafc: 240d0001 */ addiu $t5,$zero,0x1 @@ -1794,12 +1794,12 @@ glabel var7f1b5d6c .L0f13f7fc: /* f13f7fc: 8faa024c */ lw $t2,0x24c($sp) /* f13f800: 87a2021a */ lh $v0,0x21a($sp) -/* f13f804: 3c03800a */ lui $v1,%hi(g_RoomPtrs) +/* f13f804: 3c03800a */ lui $v1,%hi(g_Rooms) /* f13f808: 11400011 */ beqz $t2,.L0f13f850 /* f13f80c: 0002c0c0 */ sll $t8,$v0,0x3 /* f13f810: 87a2021a */ lh $v0,0x21a($sp) -/* f13f814: 3c03800a */ lui $v1,%hi(g_RoomPtrs) -/* f13f818: 24634928 */ addiu $v1,$v1,%lo(g_RoomPtrs) +/* f13f814: 3c03800a */ lui $v1,%hi(g_Rooms) +/* f13f818: 24634928 */ addiu $v1,$v1,%lo(g_Rooms) /* f13f81c: 0002c8c0 */ sll $t9,$v0,0x3 /* f13f820: 0322c821 */ addu $t9,$t9,$v0 /* f13f824: 8c690000 */ lw $t1,0x0($v1) @@ -1814,7 +1814,7 @@ glabel var7f1b5d6c /* f13f848: 1000000d */ beqz $zero,.L0f13f880 /* f13f84c: ad730088 */ sw $s3,0x88($t3) .L0f13f850: -/* f13f850: 24634928 */ addiu $v1,$v1,%lo(g_RoomPtrs) +/* f13f850: 24634928 */ addiu $v1,$v1,%lo(g_Rooms) /* f13f854: 0302c021 */ addu $t8,$t8,$v0 /* f13f858: 8c6f0000 */ lw $t7,0x0($v1) /* f13f85c: 0018c080 */ sll $t8,$t8,0x2 @@ -3001,8 +3001,8 @@ glabel func0f1408a8 /* f140978: 02202825 */ or $a1,$s1,$zero /* f14097c: 001170c0 */ sll $t6,$s1,0x3 /* f140980: 01d17021 */ addu $t6,$t6,$s1 -/* f140984: 3c0d800a */ lui $t5,%hi(g_RoomPtrs) -/* f140988: 8dad4928 */ lw $t5,%lo(g_RoomPtrs)($t5) +/* f140984: 3c0d800a */ lui $t5,%hi(g_Rooms) +/* f140988: 8dad4928 */ lw $t5,%lo(g_Rooms)($t5) /* f14098c: 000e7080 */ sll $t6,$t6,0x2 /* f140990: 01d17023 */ subu $t6,$t6,$s1 /* f140994: 000e7080 */ sll $t6,$t6,0x2 @@ -3190,8 +3190,8 @@ glabel func0f140b7c /* f140c34: 02202825 */ or $a1,$s1,$zero /* f140c38: 001150c0 */ sll $t2,$s1,0x3 /* f140c3c: 01515021 */ addu $t2,$t2,$s1 -/* f140c40: 3c09800a */ lui $t1,%hi(g_RoomPtrs) -/* f140c44: 8d294928 */ lw $t1,%lo(g_RoomPtrs)($t1) +/* f140c40: 3c09800a */ lui $t1,%hi(g_Rooms) +/* f140c44: 8d294928 */ lw $t1,%lo(g_Rooms)($t1) /* f140c48: 000a5080 */ sll $t2,$t2,0x2 /* f140c4c: 01515023 */ subu $t2,$t2,$s1 /* f140c50: 000a5080 */ sll $t2,$t2,0x2 @@ -3571,8 +3571,8 @@ GLOBAL_ASM( glabel func0f1411b0 /* f1411b0: 000430c0 */ sll $a2,$a0,0x3 /* f1411b4: 00c43021 */ addu $a2,$a2,$a0 -/* f1411b8: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) -/* f1411bc: 8dce4928 */ lw $t6,%lo(g_RoomPtrs)($t6) +/* f1411b8: 3c0e800a */ lui $t6,%hi(g_Rooms) +/* f1411bc: 8dce4928 */ lw $t6,%lo(g_Rooms)($t6) /* f1411c0: 00063080 */ sll $a2,$a2,0x2 /* f1411c4: 00c43023 */ subu $a2,$a2,$a0 /* f1411c8: 27bdffe0 */ addiu $sp,$sp,-32 @@ -3585,8 +3585,8 @@ glabel func0f1411b0 /* f1411e4: afa40020 */ sw $a0,0x20($sp) /* f1411e8: 0fc5022a */ jal func0f1408a8 /* f1411ec: afa6001c */ sw $a2,0x1c($sp) -/* f1411f0: 3c18800a */ lui $t8,%hi(g_RoomPtrs) -/* f1411f4: 8f184928 */ lw $t8,%lo(g_RoomPtrs)($t8) +/* f1411f0: 3c18800a */ lui $t8,%hi(g_Rooms) +/* f1411f4: 8f184928 */ lw $t8,%lo(g_Rooms)($t8) /* f1411f8: 8fa6001c */ lw $a2,0x1c($sp) /* f1411fc: 8fa40020 */ lw $a0,0x20($sp) /* f141200: 00402825 */ or $a1,$v0,$zero @@ -3615,8 +3615,8 @@ glabel func0f141234 /* f141244: 8c6341b0 */ lw $v1,%lo(var800a41b0)($v1) /* f141248: 188000d2 */ blez $a0,.L0f141594 /* f14124c: 00001025 */ or $v0,$zero,$zero -/* f141250: 3c0d800a */ lui $t5,%hi(g_RoomPtrs) -/* f141254: 25ad4928 */ addiu $t5,$t5,%lo(g_RoomPtrs) +/* f141250: 3c0d800a */ lui $t5,%hi(g_Rooms) +/* f141254: 25ad4928 */ addiu $t5,$t5,%lo(g_Rooms) /* f141258: c7ac0004 */ lwc1 $f12,0x4($sp) /* f14125c: c7a20008 */ lwc1 $f2,0x8($sp) /* f141260: c7a0000c */ lwc1 $f0,0xc($sp) diff --git a/src/game/weather.c b/src/game/weather.c index fc7929221..d9fd94a33 100644 --- a/src/game/weather.c +++ b/src/game/weather.c @@ -2839,11 +2839,11 @@ glabel var7f1b5780 /* f133968: 00001025 */ or $v0,$zero,$zero /* f13396c: 1840004a */ blez $v0,.L0f133a98 /* f133970: 26520001 */ addiu $s2,$s2,0x1 -/* f133974: 3c08800a */ lui $t0,%hi(g_RoomPtrs) +/* f133974: 3c08800a */ lui $t0,%hi(g_Rooms) /* f133978: 27a70128 */ addiu $a3,$sp,0x128 /* f13397c: 00026040 */ sll $t4,$v0,0x1 /* f133980: 01875021 */ addu $t2,$t4,$a3 -/* f133984: 8d084928 */ lw $t0,%lo(g_RoomPtrs)($t0) +/* f133984: 8d084928 */ lw $t0,%lo(g_Rooms)($t0) /* f133988: 84e50000 */ lh $a1,0x0($a3) .L0f13398c: /* f13398c: 24e70002 */ addiu $a3,$a3,0x2 @@ -2931,8 +2931,8 @@ glabel var7f1b5780 .L0f133aa8: /* f133aa8: 1a800031 */ blez $s4,.L0f133b70 /* f133aac: 2415008c */ addiu $s5,$zero,0x8c -/* f133ab0: 3c16800a */ lui $s6,%hi(g_RoomPtrs) -/* f133ab4: 26d64928 */ addiu $s6,$s6,%lo(g_RoomPtrs) +/* f133ab0: 3c16800a */ lui $s6,%hi(g_Rooms) +/* f133ab4: 26d64928 */ addiu $s6,$s6,%lo(g_Rooms) /* f133ab8: 27b10cb8 */ addiu $s1,$sp,0xcb8 /* f133abc: 27be070c */ addiu $s8,$sp,0x70c /* f133ac0: 2413000c */ addiu $s3,$zero,0xc @@ -2983,8 +2983,8 @@ glabel var7f1b5780 /* f133b6c: 26310004 */ addiu $s1,$s1,0x4 .L0f133b70: /* f133b70: 8fac0708 */ lw $t4,0x708($sp) -/* f133b74: 3c16800a */ lui $s6,%hi(g_RoomPtrs) -/* f133b78: 26d64928 */ addiu $s6,$s6,%lo(g_RoomPtrs) +/* f133b74: 3c16800a */ lui $s6,%hi(g_Rooms) +/* f133b78: 26d64928 */ addiu $s6,$s6,%lo(g_Rooms) /* f133b7c: 00008025 */ or $s0,$zero,$zero /* f133b80: 1980002d */ blez $t4,.L0f133c38 /* f133b84: e7b40c84 */ swc1 $f20,0xc84($sp) @@ -3034,8 +3034,8 @@ glabel var7f1b5780 /* f133c30: 8e390000 */ lw $t9,0x0($s1) /* f133c34: e7b40c84 */ swc1 $f20,0xc84($sp) .L0f133c38: -/* f133c38: 3c16800a */ lui $s6,%hi(g_RoomPtrs) -/* f133c3c: 26d64928 */ addiu $s6,$s6,%lo(g_RoomPtrs) +/* f133c38: 3c16800a */ lui $s6,%hi(g_Rooms) +/* f133c3c: 26d64928 */ addiu $s6,$s6,%lo(g_Rooms) /* f133c40: 2415008c */ addiu $s5,$zero,0x8c /* f133c44: c7b40c84 */ lwc1 $f20,0xc84($sp) /* f133c48: 0fc59e73 */ jal func0f1679cc @@ -4139,11 +4139,11 @@ glabel var7f1b5790 /* f134c80: 8fac00ac */ lw $t4,0xac($sp) /* f134c84: 1840004a */ blez $v0,.L0f134db0 /* f134c88: 8fad0184 */ lw $t5,0x184($sp) -/* f134c8c: 3c0b800a */ lui $t3,%hi(g_RoomPtrs) +/* f134c8c: 3c0b800a */ lui $t3,%hi(g_Rooms) /* f134c90: 27a70144 */ addiu $a3,$sp,0x144 /* f134c94: 0002c040 */ sll $t8,$v0,0x1 /* f134c98: 03075021 */ addu $t2,$t8,$a3 -/* f134c9c: 8d6b4928 */ lw $t3,%lo(g_RoomPtrs)($t3) +/* f134c9c: 8d6b4928 */ lw $t3,%lo(g_Rooms)($t3) /* f134ca0: 84e50000 */ lh $a1,0x0($a3) .L0f134ca4: /* f134ca4: 24e70002 */ addiu $a3,$a3,0x2 @@ -4233,9 +4233,9 @@ glabel var7f1b5790 /* f134dc4: 19000037 */ blez $t0,.L0f134ea4 /* f134dc8: 2411008c */ addiu $s1,$zero,0x8c /* f134dcc: 3c013f80 */ lui $at,0x3f80 -/* f134dd0: 3c14800a */ lui $s4,%hi(g_RoomPtrs) +/* f134dd0: 3c14800a */ lui $s4,%hi(g_Rooms) /* f134dd4: 4481a000 */ mtc1 $at,$f20 -/* f134dd8: 26944928 */ addiu $s4,$s4,%lo(g_RoomPtrs) +/* f134dd8: 26944928 */ addiu $s4,$s4,%lo(g_Rooms) /* f134ddc: 27ac126c */ addiu $t4,$sp,0x126c /* f134de0: 27b61078 */ addiu $s6,$sp,0x1078 /* f134de4: 27b50bc8 */ addiu $s5,$sp,0xbc8 @@ -4296,9 +4296,9 @@ glabel var7f1b5790 /* f134eb4: 3c068008 */ lui $a2,%hi(var8007f104) /* f134eb8: 8cc6f104 */ lw $a2,%lo(var8007f104)($a2) /* f134ebc: 3c048008 */ lui $a0,%hi(var8007f100) -/* f134ec0: 3c0b800a */ lui $t3,%hi(g_RoomPtrs) +/* f134ec0: 3c0b800a */ lui $t3,%hi(g_Rooms) /* f134ec4: 44862000 */ mtc1 $a2,$f4 -/* f134ec8: 8d6b4928 */ lw $t3,%lo(g_RoomPtrs)($t3) +/* f134ec8: 8d6b4928 */ lw $t3,%lo(g_Rooms)($t3) /* f134ecc: 8c84f100 */ lw $a0,%lo(var8007f100)($a0) /* f134ed0: 27a51078 */ addiu $a1,$sp,0x1078 /* f134ed4: 04c10005 */ bgez $a2,.L0f134eec diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c index 1b48ec215..896952fa6 100644 --- a/src/gvars/gvars.c +++ b/src/gvars/gvars.c @@ -17830,7 +17830,7 @@ u32 var800a4918 = 0; u32 var800a491c = 0; u32 var800a4920 = 0; u32 var800a4924 = 0; -struct room *g_RoomPtrs = NULL; +struct room *g_Rooms = NULL; u8 *g_MpRoomVisibility = NULL; s16 var800a4930[1] = {0}; u32 var800a4934 = 0; diff --git a/src/include/game/game_157db0.h b/src/include/game/game_157db0.h index 718170b7f..bc82e8a4d 100644 --- a/src/include/game/game_157db0.h +++ b/src/include/game/game_157db0.h @@ -70,7 +70,7 @@ u32 func0f15ffdc(void); u32 func0f160a38(void); u32 func0f1612e4(void); u32 func0f161520(void); -u32 func0f161ab4(void); +s32 func0f161ab4(s32 room); u32 func0f161adc(void); u32 func0f161c08(void); u32 func0f161d30(void); diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index 053d505db..6ea040252 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -720,7 +720,7 @@ extern u32 var800a4640; extern u32 var800a491c; extern u32 var800a4920; extern u32 var800a4924; -extern struct room *g_RoomPtrs; +extern struct room *g_Rooms; extern u8 *g_MpRoomVisibility; extern s16 var800a4930[1]; extern u32 var800a4bec; diff --git a/src/lib/lib_16110.c b/src/lib/lib_16110.c index 9dd5807e0..f2050c261 100644 --- a/src/lib/lib_16110.c +++ b/src/lib/lib_16110.c @@ -2374,8 +2374,8 @@ glabel func00018148 /* 18254: 0015c8c0 */ sll $t9,$s5,0x3 .L00018258: /* 18258: 0335c821 */ addu $t9,$t9,$s5 -/* 1825c: 3c18800a */ lui $t8,%hi(g_RoomPtrs) -/* 18260: 8f184928 */ lw $t8,%lo(g_RoomPtrs)($t8) +/* 1825c: 3c18800a */ lui $t8,%hi(g_Rooms) +/* 18260: 8f184928 */ lw $t8,%lo(g_Rooms)($t8) /* 18264: 0019c880 */ sll $t9,$t9,0x2 /* 18268: 0335c823 */ subu $t9,$t9,$s5 /* 1826c: 0019c880 */ sll $t9,$t9,0x2