From 4fd334f73a2357824d16b33ea99aa4e35540947d Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 24 Aug 2020 08:06:44 +1000 Subject: [PATCH] Replace .data and .bss addresses with symbols --- src/boot/boot.c | 16 +- src/game/bondbike.c | 36 +- src/game/bondeyespy.c | 12 +- src/game/bondgrab.c | 16 +- src/game/bondwalk.c | 4 +- src/game/chr/chr.c | 20 +- src/game/chr/chraction.c | 68 ++-- src/game/data/data_000000.c | 451 +++++++++++++------------ src/game/data/data_020df0.c | 3 +- src/game/dlights.c | 8 +- src/game/endscreen.c | 32 +- src/game/game_005fd0.c | 12 +- src/game/game_006bd0.c | 28 +- src/game/game_00b480.c | 4 +- src/game/game_00b820.c | 4 +- src/game/game_00c240.c | 4 +- src/game/game_00c490.c | 52 +-- src/game/game_013010.c | 4 +- src/game/game_013550.c | 12 +- src/game/game_015470.c | 16 +- src/game/game_01b0a0.c | 8 +- src/game/game_01bea0.c | 28 +- src/game/game_0601b0.c | 12 +- src/game/game_097ba0.c | 76 ++--- src/game/game_0b0420.c | 4 +- src/game/game_0b3350.c | 48 +-- src/game/game_0b63b0.c | 72 ++-- src/game/game_0d4690.c | 8 +- src/game/game_0d7070.c | 44 +-- src/game/game_0dcdb0.c | 96 +++--- src/game/game_0e0770.c | 28 +- src/game/game_0e5ce0.c | 40 +-- src/game/game_0f09f0.c | 194 +++++------ src/game/game_102240.c | 16 +- src/game/game_107fb0.c | 104 +++--- src/game/game_11f000.c | 116 +++---- src/game/game_128f30.c | 12 +- src/game/game_1371b0.c | 32 +- src/game/game_13b670.c | 16 +- src/game/game_141820.c | 12 +- src/game/game_157db0.c | 304 ++++++++--------- src/game/game_165670.c | 32 +- src/game/game_1668e0.c | 8 +- src/game/game_167ae0.c | 504 ++++++++++++++-------------- src/game/game_179060.c | 56 ++-- src/game/game_17f930.c | 4 +- src/game/game_190260.c | 4 +- src/game/game_19aa80.c | 16 +- src/game/game_1a3340.c | 68 ++-- src/game/gamefile.c | 12 +- src/game/lang.c | 4 +- src/game/mplayer.c | 4 +- src/game/pak/pak.c | 108 +++--- src/game/propobj.c | 232 ++++++------- src/game/smoke.c | 8 +- src/game/splat.c | 28 +- src/game/title.c | 196 +++++------ src/game/training.c | 4 +- src/game/utils.c | 16 +- src/game/wallhit.c | 16 +- src/include/game/data/data_00e460.h | 2 + src/include/gvars/gvars.h | 3 + src/include/lib/lib_0bfb0.h | 83 +++++ src/include/lib/lib_0d520.h | 95 ++++++ src/include/lib/lib_3e730.h | 34 ++ src/lib/lib_03050.c | 4 +- src/lib/lib_03fb0.c | 14 +- src/lib/lib_04a80.c | 4 +- src/lib/lib_074f0.c | 42 +-- src/lib/lib_09660.c | 20 +- src/lib/lib_0e9d0.c | 16 +- src/lib/lib_11420.c | 4 +- src/lib/lib_12dc0.c | 12 +- src/lib/lib_16110.c | 20 +- src/lib/lib_1a500.c | 20 +- src/lib/lib_233c0.c | 20 +- src/lib/lib_2fc60.c | 8 +- src/lib/lib_317f0.c | 4 +- src/lib/lib_3e730.c | 80 ++--- src/lib/lib_4f5e0.c | 8 +- 80 files changed, 2054 insertions(+), 1831 deletions(-) diff --git a/src/boot/boot.c b/src/boot/boot.c index 7df043a70..f17019eda 100644 --- a/src/boot/boot.c +++ b/src/boot/boot.c @@ -1794,20 +1794,20 @@ glabel func00002768 /* 294c: 9084ce93 */ lbu $a0,%lo(var8005ce90+0x3)($a0) /* 2950: 3c198006 */ lui $t9,%hi(var8005ce74) /* 2954: 8f39ce74 */ lw $t9,%lo(var8005ce74)($t9) -/* 2958: 3c018006 */ lui $at,0x8006 +/* 2958: 3c018006 */ lui $at,%hi(var8005ce7c) /* 295c: 00194080 */ sll $t0,$t9,0x2 /* 2960: 00084823 */ negu $t1,$t0 /* 2964: 00290821 */ addu $at,$at,$t1 /* 2968: 0c012370 */ jal func00048dc0 -/* 296c: c42cce7c */ lwc1 $f12,-0x3184($at) +/* 296c: c42cce7c */ lwc1 $f12,%lo(var8005ce7c)($at) /* 2970: 3c0b8006 */ lui $t3,%hi(var8005ce74) /* 2974: 8d6bce74 */ lw $t3,%lo(var8005ce74)($t3) -/* 2978: 3c018006 */ lui $at,0x8006 +/* 2978: 3c018006 */ lui $at,%hi(var8005ce84) /* 297c: 000b6080 */ sll $t4,$t3,0x2 /* 2980: 000c5023 */ negu $t2,$t4 /* 2984: 002a0821 */ addu $at,$at,$t2 /* 2988: 0c0123bc */ jal func00048ef0 -/* 298c: c42cce84 */ lwc1 $f12,-0x317c($at) +/* 298c: c42cce84 */ lwc1 $f12,%lo(var8005ce84)($at) /* 2990: 0c0123d4 */ jal func00048f50 /* 2994: 24040042 */ addiu $a0,$zero,0x42 /* 2998: 3c0e8006 */ lui $t6,%hi(var8005ce74) @@ -2031,9 +2031,9 @@ glabel func00002bac /* 2c6c: 2de10007 */ sltiu $at,$t7,0x7 /* 2c70: 1020003d */ beqz $at,.L00002d68 /* 2c74: 000f7880 */ sll $t7,$t7,0x2 -/* 2c78: 3c017005 */ lui $at,0x7005 +/* 2c78: 3c017005 */ lui $at,%hi(var70052430) /* 2c7c: 002f0821 */ addu $at,$at,$t7 -/* 2c80: 8c2f2430 */ lw $t7,0x2430($at) +/* 2c80: 8c2f2430 */ lw $t7,%lo(var70052430)($at) /* 2c84: 01e00008 */ jr $t7 /* 2c88: 00000000 */ nop ); @@ -2173,12 +2173,12 @@ glabel func00002e00 /* 2e54: 24010002 */ addiu $at,$zero,0x2 /* 2e58: 24020400 */ addiu $v0,$zero,0x400 /* 2e5c: 15e10004 */ bne $t7,$at,.L00002e70 -/* 2e60: 3c048006 */ lui $a0,0x8006 +/* 2e60: 3c048006 */ lui $a0,%hi(var8005f7b0) /* 2e64: 3c048006 */ lui $a0,%hi(var80060070) /* 2e68: 10000002 */ b .L00002e74 /* 2e6c: 24840070 */ addiu $a0,$a0,%lo(var80060070) .L00002e70: -/* 2e70: 2484f7b0 */ addiu $a0,$a0,-2128 +/* 2e70: 2484f7b0 */ addiu $a0,$a0,%lo(var8005f7b0) .L00002e74: /* 2e74: ac82002c */ sw $v0,0x2c($a0) /* 2e78: 0c012354 */ jal func00048d50 diff --git a/src/game/bondbike.c b/src/game/bondbike.c index 06ea00b12..f124bce52 100644 --- a/src/game/bondbike.c +++ b/src/game/bondbike.c @@ -547,9 +547,9 @@ glabel var7f1adb74 /* f0d27f4: 3c017f1b */ lui $at,%hi(var7f1adb58) /* f0d27f8: c42adb58 */ lwc1 $f10,%lo(var7f1adb58)($at) /* f0d27fc: 3c02800a */ lui $v0,%hi(g_Vars+0x284) -/* f0d2800: 3c01800a */ lui $at,0x800a +/* f0d2800: 3c01800a */ lui $at,%hi(g_Vars+0x4c) /* f0d2804: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) -/* f0d2808: c424a00c */ lwc1 $f4,-0x5ff4($at) +/* f0d2808: c424a00c */ lwc1 $f4,%lo(g_Vars+0x4c)($at) /* f0d280c: 3c013f80 */ lui $at,0x3f80 /* f0d2810: c4400170 */ lwc1 $f0,0x170($v0) /* f0d2814: 46045302 */ mul.s $f12,$f10,$f4 @@ -983,7 +983,7 @@ glabel var7f1adb78 /* f0d2c8c: e7a40098 */ swc1 $f4,0x98($sp) .L0f0d2c90: /* f0d2c90: c4400000 */ lwc1 $f0,0x0($v0) -/* f0d2c94: 3c01800a */ lui $at,0x800a +/* f0d2c94: 3c01800a */ lui $at,%hi(g_Vars+0x4c) /* f0d2c98: 02202025 */ or $a0,$s1,$zero /* f0d2c9c: 46009032 */ c.eq.s $f18,$f0 /* f0d2ca0: 27a5009c */ addiu $a1,$sp,0x9c @@ -991,19 +991,19 @@ glabel var7f1adb78 /* f0d2ca8: 27a70084 */ addiu $a3,$sp,0x84 /* f0d2cac: 45030007 */ bc1tl .L0f0d2ccc /* f0d2cb0: c4400008 */ lwc1 $f0,0x8($v0) -/* f0d2cb4: c428a00c */ lwc1 $f8,-0x5ff4($at) +/* f0d2cb4: c428a00c */ lwc1 $f8,%lo(g_Vars+0x4c)($at) /* f0d2cb8: c7a60084 */ lwc1 $f6,0x84($sp) /* f0d2cbc: 46080283 */ div.s $f10,$f0,$f8 /* f0d2cc0: 460a3100 */ add.s $f4,$f6,$f10 /* f0d2cc4: e7a40084 */ swc1 $f4,0x84($sp) /* f0d2cc8: c4400008 */ lwc1 $f0,0x8($v0) .L0f0d2ccc: -/* f0d2ccc: 3c01800a */ lui $at,0x800a +/* f0d2ccc: 3c01800a */ lui $at,%hi(g_Vars+0x4c) /* f0d2cd0: 46009032 */ c.eq.s $f18,$f0 /* f0d2cd4: 00000000 */ nop /* f0d2cd8: 45010006 */ bc1t .L0f0d2cf4 /* f0d2cdc: 00000000 */ nop -/* f0d2ce0: c426a00c */ lwc1 $f6,-0x5ff4($at) +/* f0d2ce0: c426a00c */ lwc1 $f6,%lo(g_Vars+0x4c)($at) /* f0d2ce4: c7a8008c */ lwc1 $f8,0x8c($sp) /* f0d2ce8: 46060283 */ div.s $f10,$f0,$f6 /* f0d2cec: 460a4100 */ add.s $f4,$f8,$f10 @@ -1040,8 +1040,8 @@ glabel var7f1adb78 /* f0d2d64: 46083300 */ add.s $f12,$f6,$f8 /* f0d2d68: 3c013f80 */ lui $at,0x3f80 /* f0d2d6c: 44815000 */ mtc1 $at,$f10 -/* f0d2d70: 3c01800a */ lui $at,0x800a -/* f0d2d74: c424a00c */ lwc1 $f4,-0x5ff4($at) +/* f0d2d70: 3c01800a */ lui $at,%hi(g_Vars+0x4c) +/* f0d2d74: c424a00c */ lwc1 $f4,%lo(g_Vars+0x4c)($at) /* f0d2d78: 46005303 */ div.s $f12,$f10,$f0 /* f0d2d7c: c7a20050 */ lwc1 $f2,0x50($sp) /* f0d2d80: c7ae004c */ lwc1 $f14,0x4c($sp) @@ -2239,7 +2239,7 @@ glabel var7f1adb9c /* f0d3e68: 3c013f80 */ lui $at,0x3f80 /* f0d3e6c: 46000102 */ mul.s $f4,$f0,$f0 /* f0d3e70: 44817000 */ mtc1 $at,$f14 -/* f0d3e74: 3c018007 */ lui $at,0x8007 +/* f0d3e74: 3c018007 */ lui $at,%hi(var80070ef4+0x10) /* f0d3e78: 46021282 */ mul.s $f10,$f2,$f2 /* f0d3e7c: 460a2300 */ add.s $f12,$f4,$f10 /* f0d3e80: 460c703c */ c.lt.s $f14,$f12 @@ -2252,7 +2252,7 @@ glabel var7f1adb9c /* f0d3e98: 00001025 */ or $v0,$zero,$zero /* f0d3e9c: 1860000c */ blez $v1,.L0f0d3ed0 /* f0d3ea0: 00000000 */ nop -/* f0d3ea4: c4220f04 */ lwc1 $f2,0xf04($at) +/* f0d3ea4: c4220f04 */ lwc1 $f2,%lo(var80070ef4+0x10)($at) /* f0d3ea8: 3c017f1b */ lui $at,%hi(var7f1adb8c) /* f0d3eac: c420db8c */ lwc1 $f0,%lo(var7f1adb8c)($at) .L0f0d3eb0: @@ -2262,11 +2262,11 @@ glabel var7f1adb9c /* f0d3ebc: 46003202 */ mul.s $f8,$f6,$f0 /* f0d3ec0: 1420fffb */ bnez $at,.L0f0d3eb0 /* f0d3ec4: 46081080 */ add.s $f2,$f2,$f8 -/* f0d3ec8: 3c018007 */ lui $at,0x8007 -/* f0d3ecc: e4220f04 */ swc1 $f2,0xf04($at) +/* f0d3ec8: 3c018007 */ lui $at,%hi(var80070ef4+0x10) +/* f0d3ecc: e4220f04 */ swc1 $f2,%lo(var80070ef4+0x10)($at) .L0f0d3ed0: -/* f0d3ed0: 3c018007 */ lui $at,0x8007 -/* f0d3ed4: c4220f04 */ lwc1 $f2,0xf04($at) +/* f0d3ed0: 3c018007 */ lui $at,%hi(var80070ef4+0x10) +/* f0d3ed4: c4220f04 */ lwc1 $f2,%lo(var80070ef4+0x10)($at) /* f0d3ed8: 3c014396 */ lui $at,0x4396 /* f0d3edc: 44812000 */ mtc1 $at,$f4 /* f0d3ee0: 46021000 */ add.s $f0,$f2,$f2 @@ -2280,13 +2280,13 @@ glabel var7f1adb9c /* f0d3efc: 46046302 */ mul.s $f12,$f12,$f4 /* f0d3f00: 8d041a6c */ lw $a0,0x1a6c($t0) /* f0d3f04: 44051000 */ mfc1 $a1,$f2 -/* f0d3f08: 3c018007 */ lui $at,0x8007 -/* f0d3f0c: e4220f04 */ swc1 $f2,0xf04($at) +/* f0d3f08: 3c018007 */ lui $at,%hi(var80070ef4+0x10) +/* f0d3f0c: e4220f04 */ swc1 $f2,%lo(var80070ef4+0x10)($at) /* f0d3f10: 2406ffff */ addiu $a2,$zero,-1 /* f0d3f14: 0fc24d8c */ jal func0f093630 /* f0d3f18: e7ac0200 */ swc1 $f12,0x200($sp) -/* f0d3f1c: 3c018007 */ lui $at,0x8007 -/* f0d3f20: c4220f04 */ lwc1 $f2,0xf04($at) +/* f0d3f1c: 3c018007 */ lui $at,%hi(var80070ef4+0x10) +/* f0d3f20: c4220f04 */ lwc1 $f2,%lo(var80070ef4+0x10)($at) /* f0d3f24: 3c014396 */ lui $at,0x4396 /* f0d3f28: 44815000 */ mtc1 $at,$f10 /* f0d3f2c: 8e0c0284 */ lw $t4,0x284($s0) diff --git a/src/game/bondeyespy.c b/src/game/bondeyespy.c index 61d0e1a12..c436ea849 100644 --- a/src/game/bondeyespy.c +++ b/src/game/bondeyespy.c @@ -1111,8 +1111,8 @@ glabel var7f1ada94 /* f0d00fc: e4460064 */ swc1 $f6,0x64($v0) .L0f0d0100: /* f0d0100: 8f39a244 */ lw $t9,%lo(g_Vars+0x284)($t9) -/* f0d0104: 3c018007 */ lui $at,0x8007 -/* f0d0108: c42a0ed4 */ lwc1 $f10,0xed4($at) +/* f0d0104: 3c018007 */ lui $at,%hi(var80070ed4) +/* f0d0108: c42a0ed4 */ lwc1 $f10,%lo(var80070ed4)($at) /* f0d010c: 8f280480 */ lw $t0,0x480($t9) /* f0d0110: c46200b4 */ lwc1 $f2,0xb4($v1) /* f0d0114: 460a0300 */ add.s $f12,$f0,$f10 @@ -1162,11 +1162,11 @@ glabel var7f1ada94 /* f0d01b8: 4501002e */ bc1t .L0f0d0274 /* f0d01bc: 00000000 */ nop /* f0d01c0: c4500060 */ lwc1 $f16,0x60($v0) -/* f0d01c4: 3c018007 */ lui $at,0x8007 -/* f0d01c8: c4220ed4 */ lwc1 $f2,0xed4($at) +/* f0d01c4: 3c018007 */ lui $at,%hi(var80070ed4) +/* f0d01c8: c4220ed4 */ lwc1 $f2,%lo(var80070ed4)($at) /* f0d01cc: 46106000 */ add.s $f0,$f12,$f16 /* f0d01d0: 00001825 */ or $v1,$zero,$zero -/* f0d01d4: 3c018007 */ lui $at,0x8007 +/* f0d01d4: 3c018007 */ lui $at,%hi(g_EyespyMaxHeight) /* f0d01d8: 4602003c */ c.lt.s $f0,$f2 /* f0d01dc: 00000000 */ nop /* f0d01e0: 45000004 */ bc1f .L0f0d01f4 @@ -1175,7 +1175,7 @@ glabel var7f1ada94 /* f0d01ec: 10000008 */ b .L0f0d0210 /* f0d01f0: 24030001 */ addiu $v1,$zero,0x1 .L0f0d01f4: -/* f0d01f4: c4220ed0 */ lwc1 $f2,0xed0($at) +/* f0d01f4: c4220ed0 */ lwc1 $f2,%lo(g_EyespyMaxHeight)($at) /* f0d01f8: 4600103c */ c.lt.s $f2,$f0 /* f0d01fc: 00000000 */ nop /* f0d0200: 45020004 */ bc1fl .L0f0d0214 diff --git a/src/game/bondgrab.c b/src/game/bondgrab.c index 95006b2cb..57eb1151d 100644 --- a/src/game/bondgrab.c +++ b/src/game/bondgrab.c @@ -384,26 +384,26 @@ glabel var7f1ad990 /* f0ccec0: e7a80088 */ swc1 $f8,0x88($sp) .L0f0ccec4: /* f0ccec4: c4400000 */ lwc1 $f0,0x0($v0) -/* f0ccec8: 3c01800a */ lui $at,0x800a +/* f0ccec8: 3c01800a */ lui $at,%hi(g_Vars+0x4c) /* f0ccecc: 27a5008c */ addiu $a1,$sp,0x8c /* f0cced0: 46009032 */ c.eq.s $f18,$f0 /* f0cced4: 27a60080 */ addiu $a2,$sp,0x80 /* f0cced8: 27a70074 */ addiu $a3,$sp,0x74 /* f0ccedc: 45030007 */ bc1tl .L0f0ccefc /* f0ccee0: c4400008 */ lwc1 $f0,0x8($v0) -/* f0ccee4: c424a00c */ lwc1 $f4,-0x5ff4($at) +/* f0ccee4: c424a00c */ lwc1 $f4,%lo(g_Vars+0x4c)($at) /* f0ccee8: c7aa0074 */ lwc1 $f10,0x74($sp) /* f0cceec: 46040183 */ div.s $f6,$f0,$f4 /* f0ccef0: 46065200 */ add.s $f8,$f10,$f6 /* f0ccef4: e7a80074 */ swc1 $f8,0x74($sp) /* f0ccef8: c4400008 */ lwc1 $f0,0x8($v0) .L0f0ccefc: -/* f0ccefc: 3c01800a */ lui $at,0x800a +/* f0ccefc: 3c01800a */ lui $at,%hi(g_Vars+0x4c) /* f0ccf00: 46009032 */ c.eq.s $f18,$f0 /* f0ccf04: 00000000 */ nop /* f0ccf08: 45030007 */ bc1tl .L0f0ccf28 /* f0ccf0c: 8fa400e8 */ lw $a0,0xe8($sp) -/* f0ccf10: c42aa00c */ lwc1 $f10,-0x5ff4($at) +/* f0ccf10: c42aa00c */ lwc1 $f10,%lo(g_Vars+0x4c)($at) /* f0ccf14: c7a4007c */ lwc1 $f4,0x7c($sp) /* f0ccf18: 460a0183 */ div.s $f6,$f0,$f10 /* f0ccf1c: 46062200 */ add.s $f8,$f4,$f6 @@ -444,8 +444,8 @@ glabel var7f1ad990 /* f0ccfa4: 46062300 */ add.s $f12,$f4,$f6 /* f0ccfa8: 3c013f80 */ lui $at,0x3f80 /* f0ccfac: 44814000 */ mtc1 $at,$f8 -/* f0ccfb0: 3c01800a */ lui $at,0x800a -/* f0ccfb4: c424a00c */ lwc1 $f4,-0x5ff4($at) +/* f0ccfb0: 3c01800a */ lui $at,%hi(g_Vars+0x4c) +/* f0ccfb4: c424a00c */ lwc1 $f4,%lo(g_Vars+0x4c)($at) /* f0ccfb8: 46004303 */ div.s $f12,$f8,$f0 /* f0ccfbc: c7aa00e4 */ lwc1 $f10,0xe4($sp) /* f0ccfc0: c7a20040 */ lwc1 $f2,0x40($sp) @@ -1880,7 +1880,7 @@ glabel var7f1ada2c /* f0ce998: 3c017f1b */ lui $at,%hi(var7f1ada18) /* f0ce99c: c4460170 */ lwc1 $f6,0x170($v0) /* f0ce9a0: c42cda18 */ lwc1 $f12,%lo(var7f1ada18)($at) -/* f0ce9a4: 3c018007 */ lui $at,0x8007 +/* f0ce9a4: 3c018007 */ lui $at,%hi(var80075c00+0x24) /* f0ce9a8: 46083280 */ add.s $f10,$f6,$f8 /* f0ce9ac: 4480a000 */ mtc1 $zero,$f20 /* f0ce9b0: e44a0170 */ swc1 $f10,0x170($v0) @@ -1889,7 +1889,7 @@ glabel var7f1ada2c /* f0ce9bc: c4440168 */ lwc1 $f4,0x168($v0) /* f0ce9c0: 46062200 */ add.s $f8,$f4,$f6 /* f0ce9c4: e4480168 */ swc1 $f8,0x168($v0) -/* f0ce9c8: c42a5c24 */ lwc1 $f10,0x5c24($at) +/* f0ce9c8: c42a5c24 */ lwc1 $f10,%lo(var80075c00+0x24)($at) /* f0ce9cc: 3c013f00 */ lui $at,0x3f00 /* f0ce9d0: 44812000 */ mtc1 $at,$f4 /* f0ce9d4: c50e004c */ lwc1 $f14,0x4c($t0) diff --git a/src/game/bondwalk.c b/src/game/bondwalk.c index cf1bcee45..3b375f348 100644 --- a/src/game/bondwalk.c +++ b/src/game/bondwalk.c @@ -2417,8 +2417,8 @@ glabel var7f1ad854 /* f0c6f28: e4640198 */ swc1 $f4,0x198($v1) /* f0c6f2c: 8d030284 */ lw $v1,0x284($t0) .L0f0c6f30: -/* f0c6f30: 3c018007 */ lui $at,0x8007 -/* f0c6f34: c4265c24 */ lwc1 $f6,0x5c24($at) +/* f0c6f30: 3c018007 */ lui $at,%hi(var80075c00+0x24) +/* f0c6f34: c4265c24 */ lwc1 $f6,%lo(var80075c00+0x24)($at) /* f0c6f38: 3c013f00 */ lui $at,0x3f00 /* f0c6f3c: 44815000 */ mtc1 $at,$f10 /* f0c6f40: c504004c */ lwc1 $f4,0x4c($t0) diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index adcde0dc4..b841f5f94 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -5655,9 +5655,9 @@ glabel var7f1a87d8 /* f02420c: a44a0038 */ sh $t2,0x38($v0) .L0f024210: /* f024210: ac20efcc */ sw $zero,%lo(var8005efcc)($at) -/* f024214: 3c018006 */ lui $at,0x8006 +/* f024214: 3c018006 */ lui $at,%hi(var800629e8) /* f024218: 0c006943 */ jal func0001a50c -/* f02421c: c42c29e8 */ lwc1 $f12,0x29e8($at) +/* f02421c: c42c29e8 */ lwc1 $f12,%lo(var800629e8)($at) /* f024220: 8fad01f0 */ lw $t5,0x1f0($sp) /* f024224: 260400f8 */ addiu $a0,$s0,0xf8 /* f024228: 11a00003 */ beqz $t5,.L0f024238 @@ -9448,9 +9448,9 @@ glabel func0f027994 /* f027a98: 8fad00e8 */ lw $t5,0xe8($sp) /* f027a9c: 44818000 */ mtc1 $at,$f16 /* f027aa0: c6920014 */ lwc1 $f18,0x14($s4) -/* f027aa4: 3c018006 */ lui $at,0x8006 +/* f027aa4: 3c018006 */ lui $at,%hi(var8005efc0) /* f027aa8: 46128103 */ div.s $f4,$f16,$f18 -/* f027aac: e424efc0 */ swc1 $f4,-0x1040($at) +/* f027aac: e424efc0 */ swc1 $f4,%lo(var8005efc0)($at) /* f027ab0: 8fad00e8 */ lw $t5,0xe8($sp) .L0f027ab4: /* f027ab4: 8db0001c */ lw $s0,0x1c($t5) @@ -9465,12 +9465,12 @@ glabel func0f027994 /* f027ad4: 02208025 */ or $s0,$s1,$zero /* f027ad8: 8fae00f4 */ lw $t6,0xf4($sp) .L0f027adc: -/* f027adc: 3c018006 */ lui $at,0x8006 +/* f027adc: 3c018006 */ lui $at,%hi(var8005efc0) /* f027ae0: 02802025 */ or $a0,$s4,$zero /* f027ae4: 15c00009 */ bnez $t6,.L0f027b0c /* f027ae8: 02602825 */ or $a1,$s3,$zero /* f027aec: 44803000 */ mtc1 $zero,$f6 -/* f027af0: c428efc0 */ lwc1 $f8,-0x1040($at) +/* f027af0: c428efc0 */ lwc1 $f8,%lo(var8005efc0)($at) /* f027af4: 02403025 */ or $a2,$s2,$zero /* f027af8: 27a700bc */ addiu $a3,$sp,0xbc /* f027afc: 4608303c */ c.lt.s $f6,$f8 @@ -9575,8 +9575,8 @@ glabel func0f027994 /* f027c78: 00000000 */ nop /* f027c7c: afa000c0 */ sw $zero,0xc0($sp) .L0f027c80: -/* f027c80: 3c018006 */ lui $at,0x8006 -/* f027c84: c430efc0 */ lwc1 $f16,-0x1040($at) +/* f027c80: 3c018006 */ lui $at,%hi(var8005efc0) +/* f027c84: c430efc0 */ lwc1 $f16,%lo(var8005efc0)($at) /* f027c88: 44805000 */ mtc1 $zero,$f10 /* f027c8c: 00000000 */ nop /* f027c90: 4610503c */ c.lt.s $f10,$f16 @@ -9584,8 +9584,8 @@ glabel func0f027994 /* f027c98: 45020005 */ bc1fl .L0f027cb0 /* f027c9c: 8fb800c0 */ lw $t8,0xc0($sp) /* f027ca0: 44809000 */ mtc1 $zero,$f18 -/* f027ca4: 3c018006 */ lui $at,0x8006 -/* f027ca8: e432efc0 */ swc1 $f18,-0x1040($at) +/* f027ca4: 3c018006 */ lui $at,%hi(var8005efc0) +/* f027ca8: e432efc0 */ swc1 $f18,%lo(var8005efc0)($at) /* f027cac: 8fb800c0 */ lw $t8,0xc0($sp) .L0f027cb0: /* f027cb0: 5b000035 */ blezl $t8,.L0f027d88 diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c index f5eea8419..40a549eca 100644 --- a/src/game/chr/chraction.c +++ b/src/game/chr/chraction.c @@ -1646,8 +1646,8 @@ glabel chrAttackWalk /* f030938: ae200030 */ sw $zero,0x30($s1) /* f03093c: 3c0143c8 */ lui $at,0x43c8 /* f030940: 44812000 */ mtc1 $at,$f4 -/* f030944: 3c018006 */ lui $at,0x8006 -/* f030948: c4262cac */ lwc1 $f6,0x2cac($at) +/* f030944: 3c018006 */ lui $at,%hi(var80062cac) +/* f030948: c4262cac */ lwc1 $f6,%lo(var80062cac)($at) /* f03094c: ae200038 */ sw $zero,0x38($s1) /* f030950: 46062202 */ mul.s $f8,$f4,$f6 /* f030954: 4600428d */ trunc.w.s $f10,$f8 @@ -2315,8 +2315,8 @@ glabel var7f1a8d18 /* f031470: 3c014180 */ lui $at,0x4180 /* f031474: 44812000 */ mtc1 $at,$f4 /* f031478: 3c058006 */ lui $a1,%hi(var80067d28) -/* f03147c: 3c078006 */ lui $a3,0x8006 -/* f031480: 8ce77d38 */ lw $a3,32056($a3) +/* f03147c: 3c078006 */ lui $a3,%hi(var80067d28+0x10) +/* f031480: 8ce77d38 */ lw $a3,%lo(var80067d28+0x10)($a3) /* f031484: 84a57d28 */ lh $a1,%lo(var80067d28)($a1) /* f031488: 8fa4008c */ lw $a0,0x8c($sp) /* f03148c: 8fa60098 */ lw $a2,0x98($sp) @@ -5967,8 +5967,8 @@ glabel var7f1a8d98 /* f0348fc: 11200007 */ beqz $t1,.L0f03491c /* f034900: 00000000 */ nop /* f034904: 14610022 */ bne $v1,$at,.L0f034990 -/* f034908: 3c018008 */ lui $at,0x8008 -/* f03490c: c424e4a8 */ lwc1 $f4,-0x1b58($at) +/* f034908: 3c018008 */ lui $at,%hi(var8007e4a8) +/* f03490c: c424e4a8 */ lwc1 $f4,%lo(var8007e4a8)($at) /* f034910: 4604a502 */ mul.s $f20,$f20,$f4 /* f034914: 1000001f */ b .L0f034994 /* f034918: 24010006 */ addiu $at,$zero,0x6 @@ -5978,8 +5978,8 @@ glabel var7f1a8d98 /* f034924: 922a0000 */ lbu $t2,0x0($s1) /* f034928: 24010006 */ addiu $at,$zero,0x6 /* f03492c: 15410007 */ bne $t2,$at,.L0f03494c -/* f034930: 3c018006 */ lui $at,0x8006 -/* f034934: c4262ca8 */ lwc1 $f6,0x2ca8($at) +/* f034930: 3c018006 */ lui $at,%hi(var80062ca8) +/* f034934: c4262ca8 */ lwc1 $f6,%lo(var80062ca8)($at) /* f034938: 3c0141c8 */ lui $at,0x41c8 /* f03493c: 44814000 */ mtc1 $at,$f8 /* f034940: 4606a502 */ mul.s $f20,$f20,$f6 @@ -5996,8 +5996,8 @@ glabel var7f1a8d98 /* f034968: 24010006 */ addiu $at,$zero,0x6 /* f03496c: 0fc06c38 */ jal pdmodeGetDamage /* f034970: 00000000 */ nop -/* f034974: 3c018006 */ lui $at,0x8006 -/* f034978: c42a2ca4 */ lwc1 $f10,0x2ca4($at) +/* f034974: 3c018006 */ lui $at,%hi(var80062ca4) +/* f034978: c42a2ca4 */ lwc1 $f10,%lo(var80062ca4)($at) /* f03497c: 8fa50128 */ lw $a1,0x128($sp) /* f034980: 46005402 */ mul.s $f16,$f10,$f0 /* f034984: 90a30000 */ lbu $v1,0x0($a1) @@ -6047,8 +6047,8 @@ glabel var7f1a8d98 /* f034a24: 11400007 */ beqz $t2,.L0f034a44 /* f034a28: 00000000 */ nop /* f034a2c: 14610024 */ bne $v1,$at,.L0f034ac0 -/* f034a30: 3c018008 */ lui $at,0x8008 -/* f034a34: c426e4a8 */ lwc1 $f6,-0x1b58($at) +/* f034a30: 3c018008 */ lui $at,%hi(var8007e4a8) +/* f034a34: c426e4a8 */ lwc1 $f6,%lo(var8007e4a8)($at) /* f034a38: 4606a502 */ mul.s $f20,$f20,$f6 /* f034a3c: 10000021 */ b .L0f034ac4 /* f034a40: 24010006 */ addiu $at,$zero,0x6 @@ -6060,8 +6060,8 @@ glabel var7f1a8d98 /* f034a54: 15610009 */ bne $t3,$at,.L0f034a7c /* f034a58: 24010006 */ addiu $at,$zero,0x6 /* f034a5c: 10610007 */ beq $v1,$at,.L0f034a7c -/* f034a60: 3c018006 */ lui $at,0x8006 -/* f034a64: c4282ca8 */ lwc1 $f8,0x2ca8($at) +/* f034a60: 3c018006 */ lui $at,%hi(var80062ca8) +/* f034a64: c4282ca8 */ lwc1 $f8,%lo(var80062ca8)($at) /* f034a68: 3c0141c8 */ lui $at,0x41c8 /* f034a6c: 44815000 */ mtc1 $at,$f10 /* f034a70: 4608a502 */ mul.s $f20,$f20,$f8 @@ -6078,8 +6078,8 @@ glabel var7f1a8d98 /* f034a98: 24010006 */ addiu $at,$zero,0x6 /* f034a9c: 0fc06c38 */ jal pdmodeGetDamage /* f034aa0: 00000000 */ nop -/* f034aa4: 3c018006 */ lui $at,0x8006 -/* f034aa8: c4302ca4 */ lwc1 $f16,0x2ca4($at) +/* f034aa4: 3c018006 */ lui $at,%hi(var80062ca4) +/* f034aa8: c4302ca4 */ lwc1 $f16,%lo(var80062ca4)($at) /* f034aac: 8fa50128 */ lw $a1,0x128($sp) /* f034ab0: 46008482 */ mul.s $f18,$f16,$f0 /* f034ab4: 90a30000 */ lbu $v1,0x0($a1) @@ -6126,11 +6126,11 @@ glabel var7f1a8d98 /* f034b48: 1160000a */ beqz $t3,.L0f034b74 /* f034b4c: 3c0c800a */ lui $t4,%hi(g_Vars+0x2a0) /* f034b50: 8d8ca260 */ lw $t4,%lo(g_Vars+0x2a0)($t4) -/* f034b54: 3c018008 */ lui $at,0x8008 +/* f034b54: 3c018008 */ lui $at,%hi(var8007e4a8) /* f034b58: 8d8200bc */ lw $v0,0xbc($t4) /* f034b5c: 14a20025 */ bne $a1,$v0,.L0f034bf4 /* f034b60: 00000000 */ nop -/* f034b64: c428e4a8 */ lwc1 $f8,-0x1b58($at) +/* f034b64: c428e4a8 */ lwc1 $f8,%lo(var8007e4a8)($at) /* f034b68: 4608a502 */ mul.s $f20,$f20,$f8 /* f034b6c: 10000021 */ b .L0f034bf4 /* f034b70: 00000000 */ nop @@ -6138,11 +6138,11 @@ glabel var7f1a8d98 /* f034b74: 1220000c */ beqz $s1,.L0f034ba8 /* f034b78: 3c0d800a */ lui $t5,%hi(g_Vars+0x2a0) /* f034b7c: 8dada260 */ lw $t5,%lo(g_Vars+0x2a0)($t5) -/* f034b80: 3c018006 */ lui $at,0x8006 +/* f034b80: 3c018006 */ lui $at,%hi(var80062ca8) /* f034b84: 8da200bc */ lw $v0,0xbc($t5) /* f034b88: 16220007 */ bne $s1,$v0,.L0f034ba8 /* f034b8c: 00000000 */ nop -/* f034b90: c42a2ca8 */ lwc1 $f10,0x2ca8($at) +/* f034b90: c42a2ca8 */ lwc1 $f10,%lo(var80062ca8)($at) /* f034b94: 3c0141c8 */ lui $at,0x41c8 /* f034b98: 44818000 */ mtc1 $at,$f16 /* f034b9c: 460aa502 */ mul.s $f20,$f20,$f10 @@ -6159,8 +6159,8 @@ glabel var7f1a8d98 /* f034bc4: 00000000 */ nop /* f034bc8: 0fc06c38 */ jal pdmodeGetDamage /* f034bcc: 00000000 */ nop -/* f034bd0: 3c018006 */ lui $at,0x8006 -/* f034bd4: c4322ca4 */ lwc1 $f18,0x2ca4($at) +/* f034bd0: 3c018006 */ lui $at,%hi(var80062ca4) +/* f034bd4: c4322ca4 */ lwc1 $f18,%lo(var80062ca4)($at) /* f034bd8: 3c18800a */ lui $t8,%hi(g_Vars+0x2a0) /* f034bdc: 8f18a260 */ lw $t8,%lo(g_Vars+0x2a0)($t8) /* f034be0: 46009102 */ mul.s $f4,$f18,$f0 @@ -8788,8 +8788,8 @@ glabel var7f1a8dac /* f03761c: 0c0074a2 */ jal modelGetAbsAnimSpeed /* f037620: 8c840020 */ lw $a0,0x20($a0) /* f037624: c7a40130 */ lwc1 $f4,0x130($sp) -/* f037628: 3c01800a */ lui $at,0x800a -/* f03762c: c428a00c */ lwc1 $f8,-0x5ff4($at) +/* f037628: 3c01800a */ lui $at,%hi(g_Vars+0x4c) +/* f03762c: c428a00c */ lwc1 $f8,%lo(g_Vars+0x4c)($at) /* f037630: 46002182 */ mul.s $f6,$f4,$f0 /* f037634: 8fa2012c */ lw $v0,0x12c($sp) /* f037638: 02002025 */ or $a0,$s0,$zero @@ -13994,8 +13994,8 @@ glabel var7f1a8f40 /* f03e7c4: 3c017f1b */ lui $at,%hi(var7f1a8f34) /* f03e7c8: c4248f34 */ lwc1 $f4,%lo(var7f1a8f34)($at) /* f03e7cc: c7a60044 */ lwc1 $f6,0x44($sp) -/* f03e7d0: 3c01800a */ lui $at,0x800a -/* f03e7d4: c42aa004 */ lwc1 $f10,-0x5ffc($at) +/* f03e7d0: 3c01800a */ lui $at,%hi(g_Vars+0x44) +/* f03e7d4: c42aa004 */ lwc1 $f10,%lo(g_Vars+0x44)($at) /* f03e7d8: 46062202 */ mul.s $f8,$f4,$f6 /* f03e7dc: 8faf0034 */ lw $t7,0x34($sp) /* f03e7e0: 46000306 */ mov.s $f12,$f0 @@ -15604,8 +15604,8 @@ glabel var7f1a90b4 /* f03fd28: 460a1082 */ mul.s $f2,$f2,$f10 /* f03fd2c: 00000000 */ nop .L0f03fd30: -/* f03fd30: 3c018006 */ lui $at,0x8006 -/* f03fd34: c4242ca0 */ lwc1 $f4,0x2ca0($at) +/* f03fd30: 3c018006 */ lui $at,%hi(var80062ca0) +/* f03fd34: c4242ca0 */ lwc1 $f4,%lo(var80062ca0)($at) /* f03fd38: 8fa2006c */ lw $v0,0x6c($sp) /* f03fd3c: 46041082 */ mul.s $f2,$f2,$f4 /* f03fd40: 90440000 */ lbu $a0,0x0($v0) @@ -17028,9 +17028,9 @@ glabel var7f1a9184 /* f041010: c7a801e8 */ lwc1 $f8,0x1e8($sp) /* f041014: 460c2182 */ mul.s $f6,$f4,$f12 /* f041018: c7a200cc */ lwc1 $f2,0xcc($sp) -/* f04101c: 3c01800a */ lui $at,0x800a +/* f04101c: 3c01800a */ lui $at,%hi(g_Vars+0x4c) /* f041020: 460c8282 */ mul.s $f10,$f16,$f12 -/* f041024: c420a00c */ lwc1 $f0,-0x5ff4($at) +/* f041024: c420a00c */ lwc1 $f0,%lo(g_Vars+0x4c)($at) /* f041028: 8fac00d4 */ lw $t4,0xd4($sp) /* f04102c: 460c4482 */ mul.s $f18,$f8,$f12 /* f041030: e7a6015c */ swc1 $f6,0x15c($sp) @@ -17911,16 +17911,16 @@ glabel func0f041c44 /* f041cc4: 3c0141b0 */ lui $at,0x41b0 /* f041cc8: 44812000 */ mtc1 $at,$f4 /* f041ccc: 3c058006 */ lui $a1,%hi(var80067470) -/* f041cd0: 3c078006 */ lui $a3,0x8006 -/* f041cd4: 8ce7748c */ lw $a3,29836($a3) +/* f041cd0: 3c078006 */ lui $a3,%hi(var80067470+0x1c) +/* f041cd4: 8ce7748c */ lw $a3,%lo(var80067470+0x1c)($a3) /* f041cd8: 84a57470 */ lh $a1,%lo(var80067470)($a1) /* f041cdc: 8fa4002c */ lw $a0,0x2c($sp) /* f041ce0: 8fa60024 */ lw $a2,0x24($sp) /* f041ce4: e7a00010 */ swc1 $f0,0x10($sp) /* f041ce8: 0c007733 */ jal modelSetAnimation /* f041cec: e7a40014 */ swc1 $f4,0x14($sp) -/* f041cf0: 3c018006 */ lui $at,0x8006 -/* f041cf4: c4207484 */ lwc1 $f0,0x7484($at) +/* f041cf0: 3c018006 */ lui $at,%hi(var80067470+0x14) +/* f041cf4: c4207484 */ lwc1 $f0,%lo(var80067470+0x14)($at) /* f041cf8: 44803000 */ mtc1 $zero,$f6 /* f041cfc: 00000000 */ nop /* f041d00: 4600303e */ c.le.s $f6,$f0 diff --git a/src/game/data/data_000000.c b/src/game/data/data_000000.c index fa0322f84..ff9c42a80 100644 --- a/src/game/data/data_000000.c +++ b/src/game/data/data_000000.c @@ -5,6 +5,11 @@ #include "game/game_015470.h" #include "game/game_0dcdb0.h" #include "game/data/data_000000.h" +#include "game/data/data_00e460.h" +#include "lib/lib_0bfb0.h" +#include "lib/lib_0d520.h" +#include "lib/lib_3e730.h" +#include "gvars/gvars.h" #include "stagesetup.h" #include "types.h" @@ -3035,8 +3040,8 @@ u32 var8005cf10 = 0x00000000; u32 var8005cf14 = 0x00000000; u32 var8005cf18 = 0x00000000; u32 var8005cf1c = 0x00000000; -u32 var8005cf20 = 0x800902a0; -u32 var8005cf24 = 0x80090318; +u32 var8005cf20 = (u32) &var800902a0; +u32 var8005cf24 = (u32) &var80090318; u32 var8005cf28 = 0x00000000; u32 var8005cf2c = 0x00000000; u32 var8005cf30 = 0x00000000; @@ -3467,250 +3472,250 @@ u32 var8005d5b4 = 0x00000000; u32 var8005d5b8 = 0x00000000; u32 var8005d5bc = 0x80000000; u32 var8005d5c0 = 0x80000000; -u32 var8005d5c4 = 0x70052700; +u32 var8005d5c4 = (u32) &var70052700; u32 var8005d5c8 = 0x00008000; u32 var8005d5cc = 0x00008000; -u32 var8005d5d0 = 0x70052704; +u32 var8005d5d0 = (u32) &var70052704; u32 var8005d5d4 = 0x00004000; u32 var8005d5d8 = 0x00004000; -u32 var8005d5dc = 0x70052708; +u32 var8005d5dc = (u32) &var70052708; u32 var8005d5e0 = 0x00002000; u32 var8005d5e4 = 0x00002000; -u32 var8005d5e8 = 0x7005270c; +u32 var8005d5e8 = (u32) &var7005270c; u32 var8005d5ec = 0x00001000; u32 var8005d5f0 = 0x00001000; -u32 var8005d5f4 = 0x70052710; +u32 var8005d5f4 = (u32) &var70052710; u32 var8005d5f8 = 0x00000800; u32 var8005d5fc = 0x00000800; -u32 var8005d600 = 0x70052714; +u32 var8005d600 = (u32) &var70052714; u32 var8005d604 = 0x00000400; u32 var8005d608 = 0x00000400; -u32 var8005d60c = 0x70052718; +u32 var8005d60c = (u32) &var70052718; u32 var8005d610 = 0x00000200; u32 var8005d614 = 0x00000200; -u32 var8005d618 = 0x7005271c; +u32 var8005d618 = (u32) &var7005271c; u32 var8005d61c = 0x00000100; u32 var8005d620 = 0x00000100; -u32 var8005d624 = 0x70052720; +u32 var8005d624 = (u32) &var70052720; u32 var8005d628 = 0x0000007c; u32 var8005d62c = 0x00000000; -u32 var8005d630 = 0x70052724; +u32 var8005d630 = (u32) &var70052724; u32 var8005d634 = 0x0000007c; u32 var8005d638 = 0x00000004; -u32 var8005d63c = 0x70052728; +u32 var8005d63c = (u32) &var70052728; u32 var8005d640 = 0x0000007c; u32 var8005d644 = 0x00000008; -u32 var8005d648 = 0x70052730; +u32 var8005d648 = (u32) &var70052730; u32 var8005d64c = 0x0000007c; u32 var8005d650 = 0x0000000c; -u32 var8005d654 = 0x70052738; +u32 var8005d654 = (u32) &var70052738; u32 var8005d658 = 0x0000007c; u32 var8005d65c = 0x00000010; -u32 var8005d660 = 0x70052744; +u32 var8005d660 = (u32) &var70052744; u32 var8005d664 = 0x0000007c; u32 var8005d668 = 0x00000014; -u32 var8005d66c = 0x70052770; +u32 var8005d66c = (u32) &var70052770; u32 var8005d670 = 0x0000007c; u32 var8005d674 = 0x00000018; -u32 var8005d678 = 0x70052788; +u32 var8005d678 = (u32) &var70052788; u32 var8005d67c = 0x0000007c; u32 var8005d680 = 0x0000001c; -u32 var8005d684 = 0x700527b4; +u32 var8005d684 = (u32) &var700527b4; u32 var8005d688 = 0x0000007c; u32 var8005d68c = 0x00000020; -u32 var8005d690 = 0x700527dc; +u32 var8005d690 = (u32) &var700527dc; u32 var8005d694 = 0x0000007c; u32 var8005d698 = 0x00000024; -u32 var8005d69c = 0x700527e4; +u32 var8005d69c = (u32) &var700527e4; u32 var8005d6a0 = 0x0000007c; u32 var8005d6a4 = 0x00000028; -u32 var8005d6a8 = 0x700527e8; +u32 var8005d6a8 = (u32) &var700527e8; u32 var8005d6ac = 0x0000007c; u32 var8005d6b0 = 0x0000002c; -u32 var8005d6b4 = 0x70052800; +u32 var8005d6b4 = (u32) &var70052800; u32 var8005d6b8 = 0x0000007c; u32 var8005d6bc = 0x00000030; -u32 var8005d6c0 = 0x70052810; +u32 var8005d6c0 = (u32) &var70052810; u32 var8005d6c4 = 0x0000007c; u32 var8005d6c8 = 0x00000034; -u32 var8005d6cc = 0x7005281c; +u32 var8005d6cc = (u32) &var7005281c; u32 var8005d6d0 = 0x0000007c; u32 var8005d6d4 = 0x00000038; -u32 var8005d6d8 = 0x70052824; +u32 var8005d6d8 = (u32) &var70052824; u32 var8005d6dc = 0x0000007c; u32 var8005d6e0 = 0x0000003c; -u32 var8005d6e4 = 0x70052854; +u32 var8005d6e4 = (u32) &var70052854; u32 var8005d6e8 = 0x0000007c; u32 var8005d6ec = 0x0000005c; -u32 var8005d6f0 = 0x70052864; +u32 var8005d6f0 = (u32) &var70052864; u32 var8005d6f4 = 0x0000007c; u32 var8005d6f8 = 0x0000007c; -u32 var8005d6fc = 0x70052870; +u32 var8005d6fc = (u32) &var70052870; u32 var8005d700 = 0x00000000; u32 var8005d704 = 0x00000000; -u32 var8005d708 = 0x700528a0; +u32 var8005d708 = (u32) &var700528a0; u32 var8005d70c = 0x80000000; u32 var8005d710 = 0x80000000; -u32 var8005d714 = 0x700528a4; +u32 var8005d714 = (u32) &var700528a4; u32 var8005d718 = 0x40000000; u32 var8005d71c = 0x40000000; -u32 var8005d720 = 0x700528a8; +u32 var8005d720 = (u32) &var700528a8; u32 var8005d724 = 0x20000000; u32 var8005d728 = 0x20000000; -u32 var8005d72c = 0x700528ac; +u32 var8005d72c = (u32) &var700528ac; u32 var8005d730 = 0x10000000; u32 var8005d734 = 0x10000000; -u32 var8005d738 = 0x700528b0; +u32 var8005d738 = (u32) &var700528b0; u32 var8005d73c = 0x08000000; u32 var8005d740 = 0x08000000; -u32 var8005d744 = 0x700528b4; +u32 var8005d744 = (u32) &var700528b4; u32 var8005d748 = 0x04000000; u32 var8005d74c = 0x04000000; -u32 var8005d750 = 0x700528b8; +u32 var8005d750 = (u32) &var700528b8; u32 var8005d754 = 0x02000000; u32 var8005d758 = 0x02000000; -u32 var8005d75c = 0x700528bc; +u32 var8005d75c = (u32) &var700528bc; u32 var8005d760 = 0x00400000; u32 var8005d764 = 0x00400000; -u32 var8005d768 = 0x700528c0; +u32 var8005d768 = (u32) &var700528c0; u32 var8005d76c = 0x00200000; u32 var8005d770 = 0x00200000; -u32 var8005d774 = 0x700528c4; +u32 var8005d774 = (u32) &var700528c4; u32 var8005d778 = 0x00100000; u32 var8005d77c = 0x00100000; -u32 var8005d780 = 0x700528c8; +u32 var8005d780 = (u32) &var700528c8; u32 var8005d784 = 0x00040000; u32 var8005d788 = 0x00040000; -u32 var8005d78c = 0x700528cc; +u32 var8005d78c = (u32) &var700528cc; u32 var8005d790 = 0x00020000; u32 var8005d794 = 0x00020000; -u32 var8005d798 = 0x700528d0; +u32 var8005d798 = (u32) &var700528d0; u32 var8005d79c = 0x00010000; u32 var8005d7a0 = 0x00010000; -u32 var8005d7a4 = 0x700528d4; +u32 var8005d7a4 = (u32) &var700528d4; u32 var8005d7a8 = 0x00008000; u32 var8005d7ac = 0x00008000; -u32 var8005d7b0 = 0x700528d8; +u32 var8005d7b0 = (u32) &var700528d8; u32 var8005d7b4 = 0x00004000; u32 var8005d7b8 = 0x00004000; -u32 var8005d7bc = 0x700528dc; +u32 var8005d7bc = (u32) &var700528dc; u32 var8005d7c0 = 0x00002000; u32 var8005d7c4 = 0x00002000; -u32 var8005d7c8 = 0x700528e0; +u32 var8005d7c8 = (u32) &var700528e0; u32 var8005d7cc = 0x00001000; u32 var8005d7d0 = 0x00001000; -u32 var8005d7d4 = 0x700528e4; +u32 var8005d7d4 = (u32) &var700528e4; u32 var8005d7d8 = 0x00000800; u32 var8005d7dc = 0x00000800; -u32 var8005d7e0 = 0x700528e8; +u32 var8005d7e0 = (u32) &var700528e8; u32 var8005d7e4 = 0x00000400; u32 var8005d7e8 = 0x00000400; -u32 var8005d7ec = 0x700528ec; +u32 var8005d7ec = (u32) &var700528ec; u32 var8005d7f0 = 0x00000200; u32 var8005d7f4 = 0x00000200; -u32 var8005d7f8 = 0x700528f0; +u32 var8005d7f8 = (u32) &var700528f0; u32 var8005d7fc = 0x00000100; u32 var8005d800 = 0x00000100; -u32 var8005d804 = 0x700528f4; +u32 var8005d804 = (u32) &var700528f4; u32 var8005d808 = 0x00000080; u32 var8005d80c = 0x00000080; -u32 var8005d810 = 0x700528f8; +u32 var8005d810 = (u32) &var700528f8; u32 var8005d814 = 0x00000040; u32 var8005d818 = 0x00000040; -u32 var8005d81c = 0x700528fc; +u32 var8005d81c = (u32) &var700528fc; u32 var8005d820 = 0x00000020; u32 var8005d824 = 0x00000020; -u32 var8005d828 = 0x70052900; +u32 var8005d828 = (u32) &var70052900; u32 var8005d82c = 0x00000018; u32 var8005d830 = 0x00000010; -u32 var8005d834 = 0x70052904; +u32 var8005d834 = (u32) &var70052904; u32 var8005d838 = 0x00000018; u32 var8005d83c = 0x00000008; -u32 var8005d840 = 0x70052908; +u32 var8005d840 = (u32) &var70052908; u32 var8005d844 = 0x00000018; u32 var8005d848 = 0x00000000; -u32 var8005d84c = 0x7005290c; +u32 var8005d84c = (u32) &var7005290c; u32 var8005d850 = 0x00000004; u32 var8005d854 = 0x00000004; -u32 var8005d858 = 0x70052910; +u32 var8005d858 = (u32) &var70052910; u32 var8005d85c = 0x00000002; u32 var8005d860 = 0x00000002; -u32 var8005d864 = 0x70052914; +u32 var8005d864 = (u32) &var70052914; u32 var8005d868 = 0x00000001; u32 var8005d86c = 0x00000001; -u32 var8005d870 = 0x70052918; +u32 var8005d870 = (u32) &var70052918; u32 var8005d874 = 0x00000000; u32 var8005d878 = 0x00000000; -u32 var8005d87c = 0x7005291c; +u32 var8005d87c = (u32) &var7005291c; u32 var8005d880 = 0x01000000; u32 var8005d884 = 0x01000000; -u32 var8005d888 = 0x70052920; +u32 var8005d888 = (u32) &var70052920; u32 var8005d88c = 0x00800000; u32 var8005d890 = 0x00800000; -u32 var8005d894 = 0x70052924; +u32 var8005d894 = (u32) &var70052924; u32 var8005d898 = 0x00020000; u32 var8005d89c = 0x00020000; -u32 var8005d8a0 = 0x70052928; +u32 var8005d8a0 = (u32) &var70052928; u32 var8005d8a4 = 0x00010000; u32 var8005d8a8 = 0x00010000; -u32 var8005d8ac = 0x70052938; +u32 var8005d8ac = (u32) &var70052938; u32 var8005d8b0 = 0x00008000; u32 var8005d8b4 = 0x00008000; -u32 var8005d8b8 = 0x70052944; +u32 var8005d8b8 = (u32) &var70052944; u32 var8005d8bc = 0x00004000; u32 var8005d8c0 = 0x00004000; -u32 var8005d8c4 = 0x70052950; +u32 var8005d8c4 = (u32) &var70052950; u32 var8005d8c8 = 0x00002000; u32 var8005d8cc = 0x00002000; -u32 var8005d8d0 = 0x7005295c; +u32 var8005d8d0 = (u32) &var7005295c; u32 var8005d8d4 = 0x00001000; u32 var8005d8d8 = 0x00001000; -u32 var8005d8dc = 0x70052968; +u32 var8005d8dc = (u32) &var70052968; u32 var8005d8e0 = 0x00000800; u32 var8005d8e4 = 0x00000800; -u32 var8005d8e8 = 0x70052974; +u32 var8005d8e8 = (u32) &var70052974; u32 var8005d8ec = 0x00000400; u32 var8005d8f0 = 0x00000400; -u32 var8005d8f4 = 0x70052978; +u32 var8005d8f4 = (u32) &var70052978; u32 var8005d8f8 = 0x00000200; u32 var8005d8fc = 0x00000200; -u32 var8005d900 = 0x7005297c; +u32 var8005d900 = (u32) &var7005297c; u32 var8005d904 = 0x00000100; u32 var8005d908 = 0x00000100; -u32 var8005d90c = 0x70052980; +u32 var8005d90c = (u32) &var70052980; u32 var8005d910 = 0x00000080; u32 var8005d914 = 0x00000080; -u32 var8005d918 = 0x70052984; +u32 var8005d918 = (u32) &var70052984; u32 var8005d91c = 0x00000040; u32 var8005d920 = 0x00000040; -u32 var8005d924 = 0x70052988; +u32 var8005d924 = (u32) &var70052988; u32 var8005d928 = 0x00000020; u32 var8005d92c = 0x00000020; -u32 var8005d930 = 0x7005298c; +u32 var8005d930 = (u32) &var7005298c; u32 var8005d934 = 0x00000010; u32 var8005d938 = 0x00000010; -u32 var8005d93c = 0x70052990; +u32 var8005d93c = (u32) &var70052990; u32 var8005d940 = 0x00000008; u32 var8005d944 = 0x00000008; -u32 var8005d948 = 0x70052994; +u32 var8005d948 = (u32) &var70052994; u32 var8005d94c = 0x00000004; u32 var8005d950 = 0x00000004; -u32 var8005d954 = 0x70052998; +u32 var8005d954 = (u32) &var70052998; u32 var8005d958 = 0x00000003; u32 var8005d95c = 0x00000000; -u32 var8005d960 = 0x7005299c; +u32 var8005d960 = (u32) &var7005299c; u32 var8005d964 = 0x00000003; u32 var8005d968 = 0x00000001; -u32 var8005d96c = 0x700529a0; +u32 var8005d96c = (u32) &var700529a0; u32 var8005d970 = 0x00000003; u32 var8005d974 = 0x00000002; -u32 var8005d978 = 0x700529a4; +u32 var8005d978 = (u32) &var700529a4; u32 var8005d97c = 0x00000003; u32 var8005d980 = 0x00000003; -u32 var8005d984 = 0x700529a8; +u32 var8005d984 = (u32) &var700529a8; u32 var8005d988 = 0x00000000; u32 var8005d98c = 0x00000000; -u32 var8005d990 = 0x700529ac; +u32 var8005d990 = (u32) &var700529ac; u32 var8005d994 = 0x00000000; u32 var8005d998 = 0x00000000; u32 var8005d99c = 0x00000000; @@ -3733,108 +3738,108 @@ s32 var8005d9d0 = 0x00000000; u32 var8005d9d4 = 0x00000000; u32 var8005d9d8[] = { - /*0x00*/ 0x00000026, 0x70052ca0, - /*0x01*/ 0x00000030, 0x70052cc4, - /*0x02*/ 0x00000033, 0x70052cf4, - /*0x03*/ 0x00000022, 0x70052d24, - /*0x04*/ 0x0000001d, 0x70052d54, - /*0x05*/ 0x0000001e, 0x70052d84, - /*0x06*/ 0x0000002c, 0x70052db4, - /*0x07*/ 0x0000002f, 0x70052de4, - /*0x08*/ 0x00000035, 0x70052e14, - /*0x09*/ 0x00000019, 0x70052e44, - /*0x0a*/ 0x00000027, 0x70052e74, - /*0x0b*/ 0x00000031, 0x70052ea4, - /*0x0c*/ 0x0000001c, 0x70052ed4, - /*0x0d*/ 0x00000021, 0x70052f04, - /*0x0e*/ 0x00000038, 0x70052f34, - /*0x0f*/ 0x0000002d, 0x70052f64, - /*0x10*/ 0x00000034, 0x70052f94, - /*0x11*/ 0x0000002a, 0x70052fc4, - /*0x12*/ 0x00000032, 0x70052ff4, - /*0x13*/ 0x00000017, 0x70053018, - /*0x14*/ 0x00000029, 0x7005303c, - /*0x15*/ 0x00000020, 0x70053060, - /*0x16*/ 0x00000042, 0x70053084, - /*0x17*/ 0x0000003c, 0x700530a8, - /*0x18*/ 0x00000039, 0x700530cc, - /*0x19*/ 0x0000001f, 0x700530f0, - /*0x1a*/ 0x00000025, 0x70053114, - /*0x1b*/ 0x00000043, 0x70053138, - /*0x1c*/ 0x0000003b, 0x7005315c, - /*0x1d*/ 0x00000047, 0x70053180, - /*0x1e*/ 0x0000003d, 0x700531a4, - /*0x1f*/ 0x00000041, 0x700531c8, - /*0x20*/ 0x00000044, 0x700531ec, - /*0x21*/ 0x00000045, 0x70053210, - /*0x22*/ 0x00000023, 0x70053234, - /*0x23*/ 0x0000003a, 0x70053258, - /*0x24*/ 0x0000003e, 0x7005327c, - /*0x25*/ 0x0000003f, 0x700532a0, - /*0x26*/ 0x00000040, 0x700532c4, - /*0x27*/ 0x00000046, 0x700532e8, - /*0x28*/ 0x00000048, 0x7005330c, - /*0x29*/ 0x00000049, 0x70053330, - /*0x2a*/ 0x0000004a, 0x70053354, - /*0x2b*/ 0x0000004b, 0x70053378, - /*0x2c*/ 0x0000004c, 0x7005339c, - /*0x2d*/ 0x0000002e, 0x700533c0, - /*0x2e*/ 0x00000028, 0x700533e4, - /*0x2f*/ 0x00000037, 0x70053408, - /*0x30*/ 0x00000014, 0x7005342c, - /*0x31*/ 0x00000024, 0x70053450, - /*0x32*/ 0x00000009, 0x70053474, - /*0x33*/ 0x0000001b, 0x70053498, - /*0x34*/ 0x0000001a, 0x700534bc, - /*0x35*/ 0x0000002b, 0x700534e0, - /*0x36*/ 0x00000016, 0x70053504, - /*0x37*/ 0x0000004d, 0x70053528, - /*0x38*/ 0x0000004e, 0x7005354c, - /*0x39*/ 0x0000004f, 0x70053570, - /*0x3a*/ 0x00000050, 0x70053594, - /*0x3b*/ 0x00000018, 0x700535b8, - /*0x3c*/ 0x00000036, 0x700535dc, - /*0x3d*/ 0x0000005a, 0x70053600, - /*0x3e*/ 0x00000000, 0x70053624, - /*0x3f*/ 0x00000032, 0x70053648, - /*0x40*/ 0x00000029, 0x7005366c, - /*0x41*/ 0x0000003b, 0x70053690, - /*0x42*/ 0x00000017, 0x700536b4, - /*0x43*/ 0x00000020, 0x700536d8, - /*0x44*/ 0x00000042, 0x700536fc, - /*0x45*/ 0x0000003c, 0x70053720, - /*0x46*/ 0x00000039, 0x70053744, - /*0x47*/ 0x0000001f, 0x70053768, - /*0x48*/ 0x00000025, 0x7005378c, - /*0x49*/ 0x00000043, 0x700537b0, - /*0x4a*/ 0x00000047, 0x700537d4, - /*0x4b*/ 0x00000023, 0x700537f8, - /*0x4c*/ 0x0000003d, 0x7005381c, - /*0x4d*/ 0x00000041, 0x70053840, - /*0x4e*/ 0x00000044, 0x70053864, - /*0x4f*/ 0x00000045, 0x70053888, - /*0x50*/ 0x0000003a, 0x700538ac, - /*0x51*/ 0x0000003e, 0x700538d0, - /*0x52*/ 0x0000003f, 0x700538f4, - /*0x53*/ 0x00000040, 0x70053918, - /*0x54*/ 0x00000046, 0x7005393c, - /*0x55*/ 0x00000048, 0x70053960, - /*0x56*/ 0x00000049, 0x70053984, - /*0x57*/ 0x0000004a, 0x700539a8, - /*0x58*/ 0x0000004b, 0x700539cc, - /*0x59*/ 0x0000004c, 0x700539f0, - /*0x5a*/ 0x00000036, 0x70053a14, - /*0x5b*/ 0x0000005d, 0x70053a38, - /*0x5c*/ 0x0000005a, 0x70053a50, - /*0x5d*/ 0x00000000, 0x70053a74, + /*0x00*/ 0x00000026, (u32) &var70052ca0, + /*0x01*/ 0x00000030, (u32) &var70052cc4, + /*0x02*/ 0x00000033, (u32) &var70052cf4, + /*0x03*/ 0x00000022, (u32) &var70052d24, + /*0x04*/ 0x0000001d, (u32) &var70052d54, + /*0x05*/ 0x0000001e, (u32) &var70052d84, + /*0x06*/ 0x0000002c, (u32) &var70052db4, + /*0x07*/ 0x0000002f, (u32) &var70052de4, + /*0x08*/ 0x00000035, (u32) &var70052e14, + /*0x09*/ 0x00000019, (u32) &var70052e44, + /*0x0a*/ 0x00000027, (u32) &var70052e74, + /*0x0b*/ 0x00000031, (u32) &var70052ea4, + /*0x0c*/ 0x0000001c, (u32) &var70052ed4, + /*0x0d*/ 0x00000021, (u32) &var70052f04, + /*0x0e*/ 0x00000038, (u32) &var70052f34, + /*0x0f*/ 0x0000002d, (u32) &var70052f64, + /*0x10*/ 0x00000034, (u32) &var70052f94, + /*0x11*/ 0x0000002a, (u32) &var70052fc4, + /*0x12*/ 0x00000032, (u32) &var70052ff4, + /*0x13*/ 0x00000017, (u32) &var70053018, + /*0x14*/ 0x00000029, (u32) &var7005303c, + /*0x15*/ 0x00000020, (u32) &var70053060, + /*0x16*/ 0x00000042, (u32) &var70053084, + /*0x17*/ 0x0000003c, (u32) &var700530a8, + /*0x18*/ 0x00000039, (u32) &var700530cc, + /*0x19*/ 0x0000001f, (u32) &var700530f0, + /*0x1a*/ 0x00000025, (u32) &var70053114, + /*0x1b*/ 0x00000043, (u32) &var70053138, + /*0x1c*/ 0x0000003b, (u32) &var7005315c, + /*0x1d*/ 0x00000047, (u32) &var70053180, + /*0x1e*/ 0x0000003d, (u32) &var700531a4, + /*0x1f*/ 0x00000041, (u32) &var700531c8, + /*0x20*/ 0x00000044, (u32) &var700531ec, + /*0x21*/ 0x00000045, (u32) &var70053210, + /*0x22*/ 0x00000023, (u32) &var70053234, + /*0x23*/ 0x0000003a, (u32) &var70053258, + /*0x24*/ 0x0000003e, (u32) &var7005327c, + /*0x25*/ 0x0000003f, (u32) &var700532a0, + /*0x26*/ 0x00000040, (u32) &var700532c4, + /*0x27*/ 0x00000046, (u32) &var700532e8, + /*0x28*/ 0x00000048, (u32) &var7005330c, + /*0x29*/ 0x00000049, (u32) &var70053330, + /*0x2a*/ 0x0000004a, (u32) &var70053354, + /*0x2b*/ 0x0000004b, (u32) &var70053378, + /*0x2c*/ 0x0000004c, (u32) &var7005339c, + /*0x2d*/ 0x0000002e, (u32) &var700533c0, + /*0x2e*/ 0x00000028, (u32) &var700533e4, + /*0x2f*/ 0x00000037, (u32) &var70053408, + /*0x30*/ 0x00000014, (u32) &var7005342c, + /*0x31*/ 0x00000024, (u32) &var70053450, + /*0x32*/ 0x00000009, (u32) &var70053474, + /*0x33*/ 0x0000001b, (u32) &var70053498, + /*0x34*/ 0x0000001a, (u32) &var700534bc, + /*0x35*/ 0x0000002b, (u32) &var700534e0, + /*0x36*/ 0x00000016, (u32) &var70053504, + /*0x37*/ 0x0000004d, (u32) &var70053528, + /*0x38*/ 0x0000004e, (u32) &var7005354c, + /*0x39*/ 0x0000004f, (u32) &var70053570, + /*0x3a*/ 0x00000050, (u32) &var70053594, + /*0x3b*/ 0x00000018, (u32) &var700535b8, + /*0x3c*/ 0x00000036, (u32) &var700535dc, + /*0x3d*/ 0x0000005a, (u32) &var70053600, + /*0x3e*/ 0x00000000, (u32) &var70053624, + /*0x3f*/ 0x00000032, (u32) &var70053648, + /*0x40*/ 0x00000029, (u32) &var7005366c, + /*0x41*/ 0x0000003b, (u32) &var70053690, + /*0x42*/ 0x00000017, (u32) &var700536b4, + /*0x43*/ 0x00000020, (u32) &var700536d8, + /*0x44*/ 0x00000042, (u32) &var700536fc, + /*0x45*/ 0x0000003c, (u32) &var70053720, + /*0x46*/ 0x00000039, (u32) &var70053744, + /*0x47*/ 0x0000001f, (u32) &var70053768, + /*0x48*/ 0x00000025, (u32) &var7005378c, + /*0x49*/ 0x00000043, (u32) &var700537b0, + /*0x4a*/ 0x00000047, (u32) &var700537d4, + /*0x4b*/ 0x00000023, (u32) &var700537f8, + /*0x4c*/ 0x0000003d, (u32) &var7005381c, + /*0x4d*/ 0x00000041, (u32) &var70053840, + /*0x4e*/ 0x00000044, (u32) &var70053864, + /*0x4f*/ 0x00000045, (u32) &var70053888, + /*0x50*/ 0x0000003a, (u32) &var700538ac, + /*0x51*/ 0x0000003e, (u32) &var700538d0, + /*0x52*/ 0x0000003f, (u32) &var700538f4, + /*0x53*/ 0x00000040, (u32) &var70053918, + /*0x54*/ 0x00000046, (u32) &var7005393c, + /*0x55*/ 0x00000048, (u32) &var70053960, + /*0x56*/ 0x00000049, (u32) &var70053984, + /*0x57*/ 0x0000004a, (u32) &var700539a8, + /*0x58*/ 0x0000004b, (u32) &var700539cc, + /*0x59*/ 0x0000004c, (u32) &var700539f0, + /*0x5a*/ 0x00000036, (u32) &var70053a14, + /*0x5b*/ 0x0000005d, (u32) &var70053a38, + /*0x5c*/ 0x0000005a, (u32) &var70053a50, + /*0x5d*/ 0x00000000, (u32) &var70053a74, }; u32 var8005dcc8 = 0xbc000006; u32 var8005dccc = 0x00000000; u32 var8005dcd0 = 0x06000000; -u32 var8005dcd4 = 0x800613a0; +u32 var8005dcd4 = (u32) &var800613a0; u32 var8005dcd8 = 0x06000000; -u32 var8005dcdc = 0x80061380; +u32 var8005dcdc = (u32) &var80061380; u32 var8005dce0 = 0xe9000000; u32 var8005dce4 = 0x00000000; u32 var8005dce8 = 0xb8000000; @@ -3842,9 +3847,9 @@ u32 var8005dcec = 0x00000000; u32 var8005dcf0 = 0xbc000006; u32 var8005dcf4 = 0x00000000; u32 var8005dcf8 = 0x06000000; -u32 var8005dcfc = 0x800613a0; +u32 var8005dcfc = (u32) &var800613a0; u32 var8005dd00 = 0x06000000; -u32 var8005dd04 = 0x80061380; +u32 var8005dd04 = (u32) &var80061380; u32 var8005dd08 = 0xe9000000; u32 var8005dd0c = 0x00000000; u32 var8005dd10 = 0xb8000000; @@ -4518,7 +4523,7 @@ u32 var8005ee50 = 0x00000000; u32 var8005ee54 = 0x00000000; u32 var8005ee58 = 0x00000000; u32 var8005ee5c = 0x00000000; -u32 var8005ee60 = 0x80099a60; +u32 var8005ee60 = (u32) &var80099a60; u32 var8005ee64 = 0x00000000; u32 var8005ee68 = 0x00000000; u32 var8005ee6c = 0x00000000; @@ -4652,7 +4657,7 @@ u32 var8005f068 = 0x00000000; u32 var8005f06c = 0x00001000; u32 var8005f070 = 0x00000000; u32 var8005f074 = 0x00000800; -u32 var8005f078 = 0x8009a970; +u32 var8005f078 = (u32) &var8009a970; u32 var8005f07c = 0x00000400; u32 var8005f080 = 0x00000000; u32 var8005f084 = 0x00000000; @@ -4676,7 +4681,7 @@ u32 var8005f0c8 = 0x00000000; u32 var8005f0cc = 0x00001000; u32 var8005f0d0 = 0x00000000; u32 var8005f0d4 = 0x00000800; -u32 var8005f0d8 = 0x8009a970; +u32 var8005f0d8 = (u32) &var8009a970; u32 var8005f0dc = 0x00000400; u32 var8005f0e0 = 0x00000000; u32 var8005f0e4 = 0x00000000; @@ -4697,7 +4702,7 @@ u32 var8005f11c = 0x00000000; u32 var8005f120 = 0x00000000; u32 var8005f124 = 0x00000000; u32 var8005f128 = 0x00000000; -u32 var8005f12c = 0x8009c2d0; +u32 var8005f12c = (u32) &var8009c2d0; u32 var8005f130 = 0x00000000; u32 var8005f134 = 0x00000000; u32 var8005f138 = 0x00000000; @@ -5035,39 +5040,39 @@ u32 var8005f664 = 0x07e90654; u32 var8005f668 = 0x04c0032a; u32 var8005f66c = 0x01950000; u32 var8005f670 = 0x00000000; -u32 var8005f674 = 0x70054b40; -u32 var8005f678 = 0x70054b68; -u32 var8005f67c = 0x70054bb8; -u32 var8005f680 = 0x70054c08; -u32 var8005f684 = 0x70054c08; -u32 var8005f688 = 0x70054c90; -u32 var8005f68c = 0x70054d18; -u32 var8005f690 = 0x70054e40; -u32 var8005f694 = 0x70054f68; -u32 var8005f698 = 0x70055090; -u32 var8005f69c = 0x70055298; -u32 var8005f6a0 = 0x700554a0; -u32 var8005f6a4 = 0x700556a8; -u32 var8005f6a8 = 0x70055eb0; -u32 var8005f6ac = 0x70055eb0; -u32 var8005f6b0 = 0x700566b8; -u32 var8005f6b4 = 0x700566b8; -u32 var8005f6b8 = 0x700566b8; -u32 var8005f6bc = 0x700566b8; -u32 var8005f6c0 = 0x700566b8; -u32 var8005f6c4 = 0x700566b8; -u32 var8005f6c8 = 0x700566b8; -u32 var8005f6cc = 0x700566b8; -u32 var8005f6d0 = 0x70056ec0; -u32 var8005f6d4 = 0x70056ec0; -u32 var8005f6d8 = 0x70056ec0; -u32 var8005f6dc = 0x70056ec0; -u32 var8005f6e0 = 0x70056ec0; -u32 var8005f6e4 = 0x70056ec0; -u32 var8005f6e8 = 0x70056ec0; -u32 var8005f6ec = 0x70056ec0; -u32 var8005f6f0 = 0x700576c8; -u32 var8005f6f4 = 0x70057750; +u32 var8005f674 = (u32) &var70054b40; +u32 var8005f678 = (u32) &var70054b68; +u32 var8005f67c = (u32) &var70054bb8; +u32 var8005f680 = (u32) &var70054c08; +u32 var8005f684 = (u32) &var70054c08; +u32 var8005f688 = (u32) &var70054c90; +u32 var8005f68c = (u32) &var70054d18; +u32 var8005f690 = (u32) &var70054e40; +u32 var8005f694 = (u32) &var70054f68; +u32 var8005f698 = (u32) &var70055090; +u32 var8005f69c = (u32) &var70055298; +u32 var8005f6a0 = (u32) &var700554a0; +u32 var8005f6a4 = (u32) &var700556a8; +u32 var8005f6a8 = (u32) &var70055eb0; +u32 var8005f6ac = (u32) &var70055eb0; +u32 var8005f6b0 = (u32) &var700566b8; +u32 var8005f6b4 = (u32) &var700566b8; +u32 var8005f6b8 = (u32) &var700566b8; +u32 var8005f6bc = (u32) &var700566b8; +u32 var8005f6c0 = (u32) &var700566b8; +u32 var8005f6c4 = (u32) &var700566b8; +u32 var8005f6c8 = (u32) &var700566b8; +u32 var8005f6cc = (u32) &var700566b8; +u32 var8005f6d0 = (u32) &var70056ec0; +u32 var8005f6d4 = (u32) &var70056ec0; +u32 var8005f6d8 = (u32) &var70056ec0; +u32 var8005f6dc = (u32) &var70056ec0; +u32 var8005f6e0 = (u32) &var70056ec0; +u32 var8005f6e4 = (u32) &var70056ec0; +u32 var8005f6e8 = (u32) &var70056ec0; +u32 var8005f6ec = (u32) &var70056ec0; +u32 var8005f6f0 = (u32) &var700576c8; +u32 var8005f6f4 = (u32) &var70057750; u32 var8005f6f8 = 0x00000000; u32 var8005f6fc = 0x00000000; u32 var8005f700 = 0x00000000; @@ -6198,7 +6203,7 @@ u32 var80060890 = 0x00000000; u32 var80060894 = 0x00000000; u32 var80060898 = 0x00000000; u32 var8006089c = 0x00000000; -u32 var800608a0 = 0x8009c760; +u32 var800608a0 = (u32) &var8009c760; u32 var800608a4 = 0x00000000; u32 var800608a8 = 0x00000000; u32 var800608ac = 0x00000000; @@ -7260,7 +7265,7 @@ u32 var80061a70 = 0x00000000; u32 var80061a74 = 0x00000000; u32 var80061a78 = 0x00000000; u32 var80061a7c = 0x00000000; -u32 var80061a80 = 0x80069d90; +u32 var80061a80 = (u32) &var80069d90; u32 var80061a84 = 0x0000ffff; u32 var80061a88 = 0x00000000; u32 var80061a8c = 0x00000000; @@ -7289,7 +7294,7 @@ u32 var80061ae4 = 0xffffffff; u32 var80061ae8 = 0xffffffff; u32 var80061aec = 0x3f800000; u32 var80061af0 = 0x00000000; -u32 var80061af4 = 0x8006aaa0; +u32 var80061af4 = (u32) &var8006aaa0; u32 var80061af8 = 0x0000ffff; u32 var80061afc = 0x00000000; u32 var80061b00 = 0x00000000; @@ -7318,7 +7323,7 @@ u32 var80061b58 = 0xffffffff; u32 var80061b5c = 0xffffffff; u32 var80061b60 = 0x3f800000; u32 var80061b64 = 0x00000000; -u32 var80061b68 = 0x8006aae4; +u32 var80061b68 = (u32) &var8006aae4; u32 var80061b6c = 0x0000ffff; u32 var80061b70 = 0x00000000; u32 var80061b74 = 0x00000000; diff --git a/src/game/data/data_020df0.c b/src/game/data/data_020df0.c index 9d9965dfe..c45c0a8f0 100644 --- a/src/game/data/data_020df0.c +++ b/src/game/data/data_020df0.c @@ -15,6 +15,7 @@ #include "game/game_1a3340.h" #include "game/data/data_0160b0.h" #include "game/data/data_020df0.h" +#include "gvars/gvars.h" #include "stagesetup.h" #include "types.h" @@ -7073,7 +7074,7 @@ u32 var8007fc14 = 0x00000000; u32 var8007fc18 = 0x01000100; u32 var8007fc1c = 0x00000000; s32 var8007fc20 = 0x00000001; -u32 var8007fc24 = 0x800a4910; +u32 var8007fc24 = (u32) &var800a4640 + 0x2d0; u32 var8007fc28 = 0x00000000; u32 var8007fc2c = 0x00000000; s32 var8007fc30 = 0x00000000; diff --git a/src/game/dlights.c b/src/game/dlights.c index 9e105ea1a..8886c38fe 100644 --- a/src/game/dlights.c +++ b/src/game/dlights.c @@ -1832,9 +1832,9 @@ glabel func0f00215c /* f002168: ac2ecae8 */ sw $t6,%lo(var8009cae8)($at) /* f00216c: 3c014248 */ lui $at,0x4248 /* f002170: 44812000 */ mtc1 $at,$f4 -/* f002174: 3c018006 */ lui $at,0x8006 +/* f002174: 3c018006 */ lui $at,%hi(var8006143c) /* f002178: 27bdffd0 */ addiu $sp,$sp,-48 -/* f00217c: e424143c */ swc1 $f4,0x143c($at) +/* f00217c: e424143c */ swc1 $f4,%lo(var8006143c)($at) /* f002180: 3c01800a */ lui $at,%hi(var8009cae4) /* f002184: 240f0014 */ addiu $t7,$zero,0x14 /* f002188: afb00014 */ sw $s0,0x14($sp) @@ -2412,8 +2412,8 @@ glabel func0f002844 /* f002998: 8fa60074 */ lw $a2,0x74($sp) /* f00299c: 0320f809 */ jalr $t9 /* f0029a0: 02203825 */ or $a3,$s1,$zero -/* f0029a4: 3c018006 */ lui $at,0x8006 -/* f0029a8: c424143c */ lwc1 $f4,0x143c($at) +/* f0029a4: 3c018006 */ lui $at,%hi(var8006143c) +/* f0029a8: c424143c */ lwc1 $f4,%lo(var8006143c)($at) /* f0029ac: 46000086 */ mov.s $f2,$f0 /* f0029b0: 3c08800a */ lui $t0,%hi(var8009cae4) /* f0029b4: 4600203c */ c.lt.s $f4,$f0 diff --git a/src/game/endscreen.c b/src/game/endscreen.c index a33af45f3..3b9b42515 100644 --- a/src/game/endscreen.c +++ b/src/game/endscreen.c @@ -587,8 +587,8 @@ glabel menudialogSolo2PEndscreenCompleted /* f10dd6c: 14810035 */ bne $a0,$at,.L0f10de44 /* f10dd70: 3c188007 */ lui $t8,%hi(g_MpPlayerNum) /* f10dd74: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f10dd78: 3c08800a */ lui $t0,0x800a -/* f10dd7c: 2508e000 */ addiu $t0,$t0,-8192 +/* f10dd78: 3c08800a */ lui $t0,%hi(g_Menus) +/* f10dd7c: 2508e000 */ addiu $t0,$t0,%lo(g_Menus) /* f10dd80: 0018c8c0 */ sll $t9,$t8,0x3 /* f10dd84: 0338c823 */ subu $t9,$t9,$t8 /* f10dd88: 0019c880 */ sll $t9,$t9,0x2 @@ -677,8 +677,8 @@ glabel menudialogSolo2PEndscreenFailed /* f10dea0: 1481006b */ bne $a0,$at,.L0f10e050 /* f10dea4: 3c188007 */ lui $t8,%hi(g_MpPlayerNum) /* f10dea8: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f10deac: 3c08800a */ lui $t0,0x800a -/* f10deb0: 2508e000 */ addiu $t0,$t0,-8192 +/* f10deac: 3c08800a */ lui $t0,%hi(g_Menus) +/* f10deb0: 2508e000 */ addiu $t0,$t0,%lo(g_Menus) /* f10deb4: 0018c8c0 */ sll $t9,$t8,0x3 /* f10deb8: 0338c823 */ subu $t9,$t9,$t8 /* f10debc: 0019c880 */ sll $t9,$t9,0x2 @@ -1063,10 +1063,10 @@ glabel endscreenPrepare /* f10e63c: 01ee7821 */ addu $t7,$t7,$t6 /* f10e640: 000f78c0 */ sll $t7,$t7,0x3 /* f10e644: 90e60002 */ lbu $a2,0x2($a3) -/* f10e648: 3c18800a */ lui $t8,0x800a +/* f10e648: 3c18800a */ lui $t8,%hi(g_Menus) /* f10e64c: 01ee7823 */ subu $t7,$t7,$t6 /* f10e650: 000f7900 */ sll $t7,$t7,0x4 -/* f10e654: 2718e000 */ addiu $t8,$t8,-8192 +/* f10e654: 2718e000 */ addiu $t8,$t8,%lo(g_Menus) /* f10e658: 01f84021 */ addu $t0,$t7,$t8 /* f10e65c: 3c03800a */ lui $v1,%hi(g_MenuData+0x4) /* f10e660: ad060e2c */ sw $a2,0xe2c($t0) @@ -1120,8 +1120,8 @@ glabel endscreenPrepare /* f10e71c: 04400011 */ bltz $v0,.L0f10e764 /* f10e720: 00000000 */ nop /* f10e724: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) -/* f10e728: 3c0b800a */ lui $t3,0x800a -/* f10e72c: 256be000 */ addiu $t3,$t3,-8192 +/* f10e728: 3c0b800a */ lui $t3,%hi(g_Menus) +/* f10e72c: 256be000 */ addiu $t3,$t3,%lo(g_Menus) /* f10e730: 000950c0 */ sll $t2,$t1,0x3 /* f10e734: 01495023 */ subu $t2,$t2,$t1 /* f10e738: 000a5080 */ sll $t2,$t2,0x2 @@ -1203,8 +1203,8 @@ glabel endscreenPrepare /* f10e858: afa20020 */ sw $v0,0x20($sp) /* f10e85c: 3c098007 */ lui $t1,%hi(g_MpPlayerNum) /* f10e860: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) -/* f10e864: 3c0b800a */ lui $t3,0x800a -/* f10e868: 256be000 */ addiu $t3,$t3,-8192 +/* f10e864: 3c0b800a */ lui $t3,%hi(g_Menus) +/* f10e868: 256be000 */ addiu $t3,$t3,%lo(g_Menus) /* f10e86c: 000950c0 */ sll $t2,$t1,0x3 /* f10e870: 01495023 */ subu $t2,$t2,$t1 /* f10e874: 000a5080 */ sll $t2,$t2,0x2 @@ -1327,7 +1327,7 @@ glabel endscreenPrepare /* f10ea2c: 032b3821 */ addu $a3,$t9,$t3 /* f10ea30: 94e30020 */ lhu $v1,0x20($a3) /* f10ea34: 3c0c8007 */ lui $t4,%hi(g_MpPlayerNum) -/* f10ea38: 3c09800a */ lui $t1,0x800a +/* f10ea38: 3c09800a */ lui $t1,%hi(g_Menus) /* f10ea3c: 1460000d */ bnez $v1,.L0f10ea74 /* f10ea40: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f10ea44: 8d8c1448 */ lw $t4,%lo(g_MpPlayerNum)($t4) @@ -1344,7 +1344,7 @@ glabel endscreenPrepare /* f10ea70: ac2dee24 */ sw $t5,%lo(g_Menus+0xe24)($at) .L0f10ea74: /* f10ea74: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f10ea78: 2529e000 */ addiu $t1,$t1,-8192 +/* f10ea78: 2529e000 */ addiu $t1,$t1,%lo(g_Menus) /* f10ea7c: 0083082b */ sltu $at,$a0,$v1 /* f10ea80: 000fc0c0 */ sll $t8,$t7,0x3 /* f10ea84: 030fc023 */ subu $t8,$t8,$t7 @@ -1408,8 +1408,8 @@ glabel endscreenPrepare /* f10eb50: 1040000f */ beqz $v0,.L0f10eb90 /* f10eb54: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10eb58: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10eb5c: 3c18800a */ lui $t8,0x800a -/* f10eb60: 2718e000 */ addiu $t8,$t8,-8192 +/* f10eb5c: 3c18800a */ lui $t8,%hi(g_Menus) +/* f10eb60: 2718e000 */ addiu $t8,$t8,%lo(g_Menus) /* f10eb64: 000e78c0 */ sll $t7,$t6,0x3 /* f10eb68: 01ee7823 */ subu $t7,$t7,$t6 /* f10eb6c: 000f7880 */ sll $t7,$t7,0x2 @@ -1446,8 +1446,8 @@ glabel endscreenPrepare /* f10ebe4: 1040000f */ beqz $v0,.L0f10ec24 /* f10ebe8: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f10ebec: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f10ebf0: 3c0a800a */ lui $t2,0x800a -/* f10ebf4: 254ae000 */ addiu $t2,$t2,-8192 +/* f10ebf0: 3c0a800a */ lui $t2,%hi(g_Menus) +/* f10ebf4: 254ae000 */ addiu $t2,$t2,%lo(g_Menus) /* f10ebf8: 000fc0c0 */ sll $t8,$t7,0x3 /* f10ebfc: 030fc023 */ subu $t8,$t8,$t7 /* f10ec00: 0018c080 */ sll $t8,$t8,0x2 diff --git a/src/game/game_005fd0.c b/src/game/game_005fd0.c index 5f0b54b9e..433d21188 100644 --- a/src/game/game_005fd0.c +++ b/src/game/game_005fd0.c @@ -717,8 +717,8 @@ glabel func0f006b08 glabel var7f1a7e70 .word 0x40490fdb .text -/* f006b08: 3c018006 */ lui $at,0x8006 -/* f006b0c: c4241630 */ lwc1 $f4,0x1630($at) +/* f006b08: 3c018006 */ lui $at,%hi(var80061630) +/* f006b0c: c4241630 */ lwc1 $f4,%lo(var80061630)($at) /* f006b10: 3c017f1a */ lui $at,%hi(var7f1a7e70) /* f006b14: c4287e70 */ lwc1 $f8,%lo(var7f1a7e70)($at) /* f006b18: 46046002 */ mul.s $f0,$f12,$f4 @@ -744,8 +744,8 @@ glabel func0f006b54 glabel var7f1a7e74 .word 0x40490fdb .text -/* f006b54: 3c018006 */ lui $at,0x8006 -/* f006b58: c4241630 */ lwc1 $f4,0x1630($at) +/* f006b54: 3c018006 */ lui $at,%hi(var80061630) +/* f006b58: c4241630 */ lwc1 $f4,%lo(var80061630)($at) /* f006b5c: 3c017f1a */ lui $at,%hi(var7f1a7e74) /* f006b60: c4287e74 */ lwc1 $f8,%lo(var7f1a7e74)($at) /* f006b64: 46046002 */ mul.s $f0,$f12,$f4 @@ -767,8 +767,8 @@ glabel var7f1a7e74 GLOBAL_ASM( glabel func0f006ba0 -/* f006ba0: 3c018006 */ lui $at,0x8006 -/* f006ba4: c4241630 */ lwc1 $f4,0x1630($at) +/* f006ba0: 3c018006 */ lui $at,%hi(var80061630) +/* f006ba4: c4241630 */ lwc1 $f4,%lo(var80061630)($at) /* f006ba8: 460c2082 */ mul.s $f2,$f4,$f12 /* f006bac: 4600118d */ trunc.w.s $f6,$f2 /* f006bb0: 440f3000 */ mfc1 $t7,$f6 diff --git a/src/game/game_006bd0.c b/src/game/game_006bd0.c index 6d5d759d6..0f9912080 100644 --- a/src/game/game_006bd0.c +++ b/src/game/game_006bd0.c @@ -816,10 +816,10 @@ glabel func0f006c80 /* f0076d4: 44813000 */ mtc1 $at,$f6 /* f0076d8: 272f0008 */ addiu $t7,$t9,0x8 /* f0076dc: afaf0150 */ sw $t7,0x150($sp) -/* f0076e0: 3c018006 */ lui $at,0x8006 +/* f0076e0: 3c018006 */ lui $at,%hi(var80061630) /* f0076e4: af310004 */ sw $s1,0x4($t9) /* f0076e8: af300000 */ sw $s0,0x0($t9) -/* f0076ec: c4281630 */ lwc1 $f8,0x1630($at) +/* f0076ec: c4281630 */ lwc1 $f8,%lo(var80061630)($at) /* f0076f0: 3c01800a */ lui $at,%hi(var8009cb00) /* f0076f4: 24040006 */ addiu $a0,$zero,0x6 /* f0076f8: 46083282 */ mul.s $f10,$f6,$f8 @@ -2850,8 +2850,8 @@ glabel func0f009504 /* f0095a4: 00000000 */ nop /* f0095a8: 24060001 */ addiu $a2,$zero,0x1 .L0f0095ac: -/* f0095ac: 3c018006 */ lui $at,0x8006 -/* f0095b0: c4241630 */ lwc1 $f4,0x1630($at) +/* f0095ac: 3c018006 */ lui $at,%hi(var80061630) +/* f0095b0: c4241630 */ lwc1 $f4,%lo(var80061630)($at) /* f0095b4: 3c014280 */ lui $at,0x4280 /* f0095b8: 44813000 */ mtc1 $at,$f6 /* f0095bc: 3c014200 */ lui $at,0x4200 @@ -3021,11 +3021,11 @@ glabel func0f009818 /* f009830: afa60118 */ sw $a2,0x118($sp) /* f009834: 3c0144fa */ lui $at,0x44fa /* f009838: 44812000 */ mtc1 $at,$f4 -/* f00983c: 3c018006 */ lui $at,0x8006 +/* f00983c: 3c018006 */ lui $at,%hi(var80061644) /* f009840: afa20108 */ sw $v0,0x108($sp) /* f009844: 8fa40114 */ lw $a0,0x114($sp) /* f009848: 0fc0252f */ jal func0f0094bc -/* f00984c: e4241644 */ swc1 $f4,0x1644($at) +/* f00984c: e4241644 */ swc1 $f4,%lo(var80061644)($at) /* f009850: afa20038 */ sw $v0,0x38($sp) /* f009854: 0fc59e73 */ jal func0f1679cc /* f009858: 24040002 */ addiu $a0,$zero,0x2 @@ -3514,10 +3514,10 @@ glabel func0f009eac /* f009f48: 00000000 */ nop /* f009f4c: 2901015e */ slti $at,$t0,0x15e /* f009f50: 10200057 */ beqz $at,.L0f00a0b0 -/* f009f54: 3c048006 */ lui $a0,0x8006 +/* f009f54: 3c048006 */ lui $a0,%hi(var800616e4) /* f009f58: 3c0b800a */ lui $t3,%hi(g_Vars+0x34) /* f009f5c: 8d6b9ff4 */ lw $t3,%lo(g_Vars+0x34)($t3) -/* f009f60: 3c048006 */ lui $a0,0x8006 +/* f009f60: 3c048006 */ lui $a0,%hi(var800616e4) /* f009f64: 11600047 */ beqz $t3,.L0f00a084 /* f009f68: 00000000 */ nop /* f009f6c: 3c048006 */ lui $a0,%hi(var800616e4) @@ -3594,7 +3594,7 @@ glabel func0f009eac /* f00a07c: 10000015 */ b .L0f00a0d4 /* f00a080: 00000000 */ nop .L0f00a084: -/* f00a084: 8c8416e4 */ lw $a0,5860($a0) +/* f00a084: 8c8416e4 */ lw $a0,%lo(var800616e4)($a0) /* f00a088: 10800012 */ beqz $a0,.L0f00a0d4 /* f00a08c: 00000000 */ nop /* f00a090: 0c00cdfc */ jal func000337f0 @@ -3606,7 +3606,7 @@ glabel func0f009eac /* f00a0a8: 1000000a */ b .L0f00a0d4 /* f00a0ac: 00000000 */ nop .L0f00a0b0: -/* f00a0b0: 8c8416e4 */ lw $a0,5860($a0) +/* f00a0b0: 8c8416e4 */ lw $a0,%lo(var800616e4)($a0) /* f00a0b4: 10800007 */ beqz $a0,.L0f00a0d4 /* f00a0b8: 00000000 */ nop /* f00a0bc: 0c00cdfc */ jal func000337f0 @@ -3993,8 +3993,8 @@ glabel func0f00a490 /* f00a600: 44816000 */ mtc1 $at,$f12 /* f00a604: 3c014200 */ lui $at,0x4200 /* f00a608: 44817000 */ mtc1 $at,$f14 -/* f00a60c: 3c018006 */ lui $at,0x8006 -/* f00a610: c4201630 */ lwc1 $f0,0x1630($at) +/* f00a60c: 3c018006 */ lui $at,%hi(var80061630) +/* f00a610: c4201630 */ lwc1 $f0,%lo(var80061630)($at) /* f00a614: c7a40074 */ lwc1 $f4,0x74($sp) /* f00a618: 00514821 */ addu $t1,$v0,$s1 /* f00a61c: 46001202 */ mul.s $f8,$f2,$f0 @@ -4474,8 +4474,8 @@ glabel hudRenderGasIfEnabled /* f00ad3c: c7a80100 */ lwc1 $f8,0x100($sp) /* f00ad40: 46125102 */ mul.s $f4,$f10,$f18 /* f00ad44: 44815000 */ mtc1 $at,$f10 -/* f00ad48: 3c018006 */ lui $at,0x8006 -/* f00ad4c: c4221630 */ lwc1 $f2,0x1630($at) +/* f00ad48: 3c018006 */ lui $at,%hi(var80061630) +/* f00ad4c: c4221630 */ lwc1 $f2,%lo(var80061630)($at) /* f00ad50: 3c014300 */ lui $at,0x4300 /* f00ad54: 46021300 */ add.s $f12,$f2,$f2 /* f00ad58: 4600218d */ trunc.w.s $f6,$f4 diff --git a/src/game/game_00b480.c b/src/game/game_00b480.c index 7883ea597..4387e0885 100644 --- a/src/game/game_00b480.c +++ b/src/game/game_00b480.c @@ -58,9 +58,9 @@ GLOBAL_ASM( glabel func0f00b510 /* f00b510: 3c013f80 */ lui $at,0x3f80 /* f00b514: 44812000 */ mtc1 $at,$f4 -/* f00b518: 3c018006 */ lui $at,0x8006 +/* f00b518: 3c018006 */ lui $at,%hi(var80062968) /* f00b51c: 240e1388 */ addiu $t6,$zero,0x1388 -/* f00b520: e4242968 */ swc1 $f4,0x2968($at) +/* f00b520: e4242968 */ swc1 $f4,%lo(var80062968)($at) /* f00b524: 3c018006 */ lui $at,%hi(var8006296c) /* f00b528: ac20296c */ sw $zero,%lo(var8006296c)($at) /* f00b52c: 3c018006 */ lui $at,%hi(var80062970) diff --git a/src/game/game_00b820.c b/src/game/game_00b820.c index c2981ac3b..5fe9e5cc7 100644 --- a/src/game/game_00b820.c +++ b/src/game/game_00b820.c @@ -180,7 +180,7 @@ glabel func0f00b820 /* f00ba48: 0fc41b99 */ jal cheatIsActive /* f00ba4c: 24040010 */ addiu $a0,$zero,0x10 /* f00ba50: 10400006 */ beqz $v0,.L0f00ba6c -/* f00ba54: 3c148006 */ lui $s4,0x8006 +/* f00ba54: 3c148006 */ lui $s4,%hi(var80062c58) /* f00ba58: 3c148006 */ lui $s4,%hi(var80062c6c) /* f00ba5c: 3c138006 */ lui $s3,%hi(var80062b10) /* f00ba60: 26942c6c */ addiu $s4,$s4,%lo(var80062c6c) @@ -188,7 +188,7 @@ glabel func0f00b820 /* f00ba68: 8e732b10 */ lw $s3,%lo(var80062b10)($s3) .L0f00ba6c: /* f00ba6c: 3c138006 */ lui $s3,%hi(var80062b08) -/* f00ba70: 26942c58 */ addiu $s4,$s4,11352 +/* f00ba70: 26942c58 */ addiu $s4,$s4,%lo(var80062c58) /* f00ba74: 8e732b08 */ lw $s3,%lo(var80062b08)($s3) .L0f00ba78: /* f00ba78: 8ea50000 */ lw $a1,0x0($s5) diff --git a/src/game/game_00c240.c b/src/game/game_00c240.c index 8fb57a582..523128bb1 100644 --- a/src/game/game_00c240.c +++ b/src/game/game_00c240.c @@ -35,8 +35,8 @@ glabel func0f00c240 /* f00c288: 3c013f80 */ lui $at,0x3f80 /* f00c28c: 44812000 */ mtc1 $at,$f4 /* f00c290: ae020348 */ sw $v0,0x348($s0) -/* f00c294: 3c018007 */ lui $at,0x8007 -/* f00c298: e4249880 */ swc1 $f4,-0x6780($at) +/* f00c294: 3c018007 */ lui $at,%hi(var80069880) +/* f00c298: e4249880 */ swc1 $f4,%lo(var80069880)($at) /* f00c29c: 8e080348 */ lw $t0,0x348($s0) /* f00c2a0: ae00033c */ sw $zero,0x33c($s0) /* f00c2a4: ae000340 */ sw $zero,0x340($s0) diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c index 6a32ea4b6..88bfef56a 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -128,10 +128,10 @@ glabel func0f00c490 /* f00c59c: 3c014280 */ lui $at,0x4280 /* f00c5a0: 44812000 */ mtc1 $at,$f4 /* f00c5a4: 44800000 */ mtc1 $zero,$f0 -/* f00c5a8: 3c018007 */ lui $at,0x8007 -/* f00c5ac: e42498dc */ swc1 $f4,-0x6724($at) -/* f00c5b0: 3c018007 */ lui $at,0x8007 -/* f00c5b4: e42098e4 */ swc1 $f0,-0x671c($at) +/* f00c5a8: 3c018007 */ lui $at,%hi(g_AlarmSpeakerWeight) +/* f00c5ac: e42498dc */ swc1 $f4,%lo(g_AlarmSpeakerWeight)($at) +/* f00c5b0: 3c018007 */ lui $at,%hi(var800698e4) +/* f00c5b4: e42098e4 */ swc1 $f0,%lo(var800698e4)($at) /* f00c5b8: 3c018007 */ lui $at,%hi(var800698e8) /* f00c5bc: 3c028007 */ lui $v0,%hi(var800698ec) /* f00c5c0: ac2098e8 */ sw $zero,%lo(var800698e8)($at) @@ -141,8 +141,8 @@ glabel func0f00c490 /* f00c5d0: e4400004 */ swc1 $f0,0x4($v0) /* f00c5d4: e4400008 */ swc1 $f0,0x8($v0) /* f00c5d8: ac2098f8 */ sw $zero,%lo(var800698f8)($at) -/* f00c5dc: 3c018007 */ lui $at,0x8007 -/* f00c5e0: e42098fc */ swc1 $f0,-0x6704($at) +/* f00c5dc: 3c018007 */ lui $at,%hi(var800698fc) +/* f00c5e0: e42098fc */ swc1 $f0,%lo(var800698fc)($at) /* f00c5e4: 3c018007 */ lui $at,%hi(var80069900) /* f00c5e8: ac209900 */ sw $zero,%lo(var80069900)($at) /* f00c5ec: 240c0001 */ addiu $t4,$zero,0x1 @@ -150,8 +150,8 @@ glabel func0f00c490 /* f00c5f4: ac2c9904 */ sw $t4,%lo(g_CountdownTimerVisible)($at) /* f00c5f8: 3c018007 */ lui $at,%hi(g_CountdownTimerRunning) /* f00c5fc: ac209908 */ sw $zero,%lo(g_CountdownTimerRunning)($at) -/* f00c600: 3c018007 */ lui $at,0x8007 -/* f00c604: e420990c */ swc1 $f0,-0x66f4($at) +/* f00c600: 3c018007 */ lui $at,%hi(g_CountdownTimerValue) +/* f00c604: e420990c */ swc1 $f0,%lo(g_CountdownTimerValue)($at) /* f00c608: 3c018007 */ lui $at,%hi(var80069910) /* f00c60c: ac209910 */ sw $zero,%lo(var80069910)($at) /* f00c610: 3c06800a */ lui $a2,%hi(var8009ce40) @@ -455,20 +455,20 @@ glabel func0f00c490 /* f00ca68: 3c018007 */ lui $at,%hi(var80069934) /* f00ca6c: 2419ffff */ addiu $t9,$zero,-1 /* f00ca70: ac399934 */ sw $t9,%lo(var80069934)($at) -/* f00ca74: 3c018007 */ lui $at,0x8007 -/* f00ca78: e4209948 */ swc1 $f0,-0x66b8($at) -/* f00ca7c: 3c018007 */ lui $at,0x8007 -/* f00ca80: e420994c */ swc1 $f0,-0x66b4($at) -/* f00ca84: 3c018007 */ lui $at,0x8007 -/* f00ca88: e4209950 */ swc1 $f0,-0x66b0($at) -/* f00ca8c: 3c018007 */ lui $at,0x8007 -/* f00ca90: e4209954 */ swc1 $f0,-0x66ac($at) -/* f00ca94: 3c018007 */ lui $at,0x8007 -/* f00ca98: e4209958 */ swc1 $f0,-0x66a8($at) +/* f00ca74: 3c018007 */ lui $at,%hi(var80069948) +/* f00ca78: e4209948 */ swc1 $f0,%lo(var80069948)($at) +/* f00ca7c: 3c018007 */ lui $at,%hi(var8006994c) +/* f00ca80: e420994c */ swc1 $f0,%lo(var8006994c)($at) +/* f00ca84: 3c018007 */ lui $at,%hi(var80069950) +/* f00ca88: e4209950 */ swc1 $f0,%lo(var80069950)($at) +/* f00ca8c: 3c018007 */ lui $at,%hi(var80069954) +/* f00ca90: e4209954 */ swc1 $f0,%lo(var80069954)($at) +/* f00ca94: 3c018007 */ lui $at,%hi(var80069958) +/* f00ca98: e4209958 */ swc1 $f0,%lo(var80069958)($at) /* f00ca9c: 3c02800a */ lui $v0,%hi(g_Vars) -/* f00caa0: 3c018007 */ lui $at,0x8007 +/* f00caa0: 3c018007 */ lui $at,%hi(g_AmmoMultiplier) /* f00caa4: 24429fc0 */ addiu $v0,$v0,%lo(g_Vars) -/* f00caa8: e420995c */ swc1 $f0,-0x66a4($at) +/* f00caa8: e420995c */ swc1 $f0,%lo(g_AmmoMultiplier)($at) /* f00caac: 8c4d0318 */ lw $t5,0x318($v0) /* f00cab0: 11a00005 */ beqz $t5,.L0f00cac8 /* f00cab4: 3c078007 */ lui $a3,%hi(var80069970) @@ -2389,8 +2389,8 @@ glabel var7f1a8064 /* f00e3c8: 2405007e */ addiu $a1,$zero,0x7e /* f00e3cc: 0fc456ac */ jal padUnpack /* f00e3d0: 27a60168 */ addiu $a2,$sp,0x168 -/* f00e3d4: 3c018006 */ lui $at,0x8006 -/* f00e3d8: c42c1be0 */ lwc1 $f12,0x1be0($at) +/* f00e3d4: 3c018006 */ lui $at,%hi(var80061be0) +/* f00e3d8: c42c1be0 */ lwc1 $f12,%lo(var80061be0)($at) /* f00e3dc: 3c013f80 */ lui $at,0x3f80 /* f00e3e0: 44812000 */ mtc1 $at,$f4 /* f00e3e4: c7a60198 */ lwc1 $f6,0x198($sp) @@ -2919,7 +2919,7 @@ glabel func0f00eb64 /* f00eb7c: 44812000 */ mtc1 $at,$f4 /* f00eb80: 27bdffa0 */ addiu $sp,$sp,-96 /* f00eb84: afb00018 */ sw $s0,0x18($sp) -/* f00eb88: 3c018006 */ lui $at,0x8006 +/* f00eb88: 3c018006 */ lui $at,%hi(var80061be0) /* f00eb8c: 3c028008 */ lui $v0,%hi(g_Props) /* f00eb90: 3c038008 */ lui $v1,%hi(propexplosiontypes) /* f00eb94: afbf001c */ sw $ra,0x1c($sp) @@ -2928,7 +2928,7 @@ glabel func0f00eb64 /* f00eba0: 00008025 */ or $s0,$zero,$zero /* f00eba4: 2463be34 */ addiu $v1,$v1,%lo(propexplosiontypes) /* f00eba8: 2442b06c */ addiu $v0,$v0,%lo(g_Props) -/* f00ebac: e4241be0 */ swc1 $f4,0x1be0($at) +/* f00ebac: e4241be0 */ swc1 $f4,%lo(var80061be0)($at) .L0f00ebb0: /* f00ebb0: 24420008 */ addiu $v0,$v0,0x8 /* f00ebb4: 0043082b */ sltu $at,$v0,$v1 @@ -3921,13 +3921,13 @@ glabel var7f1a8224 /* f00f68c: 10000300 */ b .L0f010290 /* f00f690: 00000000 */ nop /* f00f694: 8e590004 */ lw $t9,0x4($s2) -/* f00f698: 3c018006 */ lui $at,0x8006 +/* f00f698: 3c018006 */ lui $at,%hi(var80061be0) /* f00f69c: 44992000 */ mtc1 $t9,$f4 /* f00f6a0: 00000000 */ nop /* f00f6a4: 468021a0 */ cvt.s.w $f6,$f4 /* f00f6a8: 46163203 */ div.s $f8,$f6,$f22 /* f00f6ac: 100002f8 */ b .L0f010290 -/* f00f6b0: e4281be0 */ swc1 $f8,0x1be0($at) +/* f00f6b0: e4281be0 */ swc1 $f8,%lo(var80061be0)($at) /* f00f6b4: 8fb80244 */ lw $t8,0x244($sp) /* f00f6b8: 130002f5 */ beqz $t8,.L0f010290 /* f00f6bc: 00000000 */ nop diff --git a/src/game/game_013010.c b/src/game/game_013010.c index 97018f754..1608d727c 100644 --- a/src/game/game_013010.c +++ b/src/game/game_013010.c @@ -20,10 +20,10 @@ glabel func0f013010 /* f013020: 3c013f80 */ lui $at,0x3f80 /* f013024: 44812000 */ mtc1 $at,$f4 /* f013028: 3c08800a */ lui $t0,%hi(g_NumExplosions) -/* f01302c: 3c018008 */ lui $at,0x8008 +/* f01302c: 3c018008 */ lui $at,%hi(var8007e4a8) /* f013030: 25083434 */ addiu $t0,$t0,%lo(g_NumExplosions) /* f013034: 240e0006 */ addiu $t6,$zero,0x6 -/* f013038: e424e4a8 */ swc1 $f4,-0x1b58($at) +/* f013038: e424e4a8 */ swc1 $f4,%lo(var8007e4a8)($at) /* f01303c: ad0e0000 */ sw $t6,0x0($t0) /* f013040: 3c0f800a */ lui $t7,%hi(g_Vars+0x4b4) /* f013044: 8defa474 */ lw $t7,%lo(g_Vars+0x4b4)($t7) diff --git a/src/game/game_013550.c b/src/game/game_013550.c index 233c3a4d2..0be1465d2 100644 --- a/src/game/game_013550.c +++ b/src/game/game_013550.c @@ -145,9 +145,9 @@ glabel func0f013550 /* f013704: ac2ecc74 */ sw $t6,%lo(var8009cc74)($at) /* f013708: 3c017f1b */ lui $at,%hi(var7f1a8290) /* f01370c: c4248290 */ lwc1 $f4,%lo(var7f1a8290)($at) -/* f013710: 3c01800a */ lui $at,0x800a +/* f013710: 3c01800a */ lui $at,%hi(var8009cc78) /* f013714: 1000003b */ b .L0f013804 -/* f013718: e424cc78 */ swc1 $f4,-0x3388($at) +/* f013718: e424cc78 */ swc1 $f4,%lo(var8009cc78)($at) .L0f01371c: /* f01371c: 256bcc44 */ addiu $t3,$t3,-13244 /* f013720: 240f00c8 */ addiu $t7,$zero,0xc8 @@ -175,9 +175,9 @@ glabel func0f013550 /* f013778: ac2ecc74 */ sw $t6,%lo(var8009cc74)($at) /* f01377c: 3c017f1b */ lui $at,%hi(var7f1a8294) /* f013780: c4268294 */ lwc1 $f6,%lo(var7f1a8294)($at) -/* f013784: 3c01800a */ lui $at,0x800a +/* f013784: 3c01800a */ lui $at,%hi(var8009cc78) /* f013788: 1000001e */ b .L0f013804 -/* f01378c: e426cc78 */ swc1 $f6,-0x3388($at) +/* f01378c: e426cc78 */ swc1 $f6,%lo(var8009cc78)($at) .L0f013790: /* f013790: 3c0b800a */ lui $t3,%hi(var8009cc44) /* f013794: 256bcc44 */ addiu $t3,$t3,%lo(var8009cc44) @@ -206,8 +206,8 @@ glabel func0f013550 /* f0137f0: ac2ecc74 */ sw $t6,%lo(var8009cc74)($at) /* f0137f4: 3c013f00 */ lui $at,0x3f00 /* f0137f8: 44814000 */ mtc1 $at,$f8 -/* f0137fc: 3c01800a */ lui $at,0x800a -/* f013800: e428cc78 */ swc1 $f8,-0x3388($at) +/* f0137fc: 3c01800a */ lui $at,%hi(var8009cc78) +/* f013800: e428cc78 */ swc1 $f8,%lo(var8009cc78)($at) .L0f013804: /* f013804: 3c0c800a */ lui $t4,%hi(var8009cc40) /* f013808: 258ccc40 */ addiu $t4,$t4,%lo(var8009cc40) diff --git a/src/game/game_015470.c b/src/game/game_015470.c index 02ccfbfcb..637e5801a 100644 --- a/src/game/game_015470.c +++ b/src/game/game_015470.c @@ -143,14 +143,14 @@ GLOBAL_ASM( glabel func0f0155f0 /* f0155f0: 44852000 */ mtc1 $a1,$f4 /* f0155f4: 27bdfef8 */ addiu $sp,$sp,-264 -/* f0155f8: 3c018006 */ lui $at,0x8006 +/* f0155f8: 3c018006 */ lui $at,%hi(var80062468) /* f0155fc: 468021a0 */ cvt.s.w $f6,$f4 /* f015600: afbf0034 */ sw $ra,0x34($sp) /* f015604: afb00030 */ sw $s0,0x30($sp) /* f015608: afa60110 */ sw $a2,0x110($sp) /* f01560c: 3c0f8006 */ lui $t7,%hi(var80061360) /* f015610: 25ef1360 */ addiu $t7,$t7,%lo(var80061360) -/* f015614: e4262468 */ swc1 $f6,0x2468($at) +/* f015614: e4262468 */ swc1 $f6,%lo(var80062468)($at) /* f015618: 3c0e0600 */ lui $t6,0x600 /* f01561c: ac8e0000 */ sw $t6,0x0($a0) /* f015620: ac8f0004 */ sw $t7,0x4($a0) @@ -673,18 +673,18 @@ glabel func0f0155f0 /* f015e08: a0202414 */ sb $zero,%lo(var80062414)($at) /* f015e0c: 3c01445c */ lui $at,0x445c /* f015e10: 44812000 */ mtc1 $at,$f4 -/* f015e14: 3c01800a */ lui $at,0x800a +/* f015e14: 3c01800a */ lui $at,%hi(var8009cc8c) /* f015e18: 3c0e0200 */ lui $t6,0x200 -/* f015e1c: e424cc8c */ swc1 $f4,-0x3374($at) +/* f015e1c: e424cc8c */ swc1 $f4,%lo(var8009cc8c)($at) /* f015e20: 3c01c220 */ lui $at,0xc220 /* f015e24: 44813000 */ mtc1 $at,$f6 /* f015e28: 3c0f0200 */ lui $t7,0x200 -/* f015e2c: 3c018006 */ lui $at,0x8006 +/* f015e2c: 3c018006 */ lui $at,%hi(var80062484) /* f015e30: 25ef0000 */ addiu $t7,$t7,0x0 /* f015e34: 25ce65d0 */ addiu $t6,$t6,0x65d0 /* f015e38: 27bdffe8 */ addiu $sp,$sp,-24 /* f015e3c: 01cf3023 */ subu $a2,$t6,$t7 -/* f015e40: e4262484 */ swc1 $f6,0x2484($at) +/* f015e40: e4262484 */ swc1 $f6,%lo(var80062484)($at) /* f015e44: afa5001c */ sw $a1,0x1c($sp) /* f015e48: 3c02800a */ lui $v0,%hi(var8009cc90) /* f015e4c: 3c018006 */ lui $at,%hi(var80062498) @@ -815,9 +815,9 @@ glabel func0f0155f0 /* f01601c: 8fa2002c */ lw $v0,0x2c($sp) /* f016020: 8fa80030 */ lw $t0,0x30($sp) /* f016024: 240b00ff */ addiu $t3,$zero,0xff -/* f016028: 3c01800a */ lui $at,0x800a +/* f016028: 3c01800a */ lui $at,%hi(var8009cc8c) /* f01602c: 01020019 */ multu $t0,$v0 -/* f016030: c42acc8c */ lwc1 $f10,-0x3374($at) +/* f016030: c42acc8c */ lwc1 $f10,%lo(var8009cc8c)($at) /* f016034: 3c098006 */ lui $t1,%hi(var80062498) /* f016038: 3c0a8006 */ lui $t2,%hi(var80062414) /* f01603c: 4600540d */ trunc.w.s $f16,$f10 diff --git a/src/game/game_01b0a0.c b/src/game/game_01b0a0.c index 25993baff..59c0fa03d 100644 --- a/src/game/game_01b0a0.c +++ b/src/game/game_01b0a0.c @@ -932,12 +932,12 @@ glabel activemenuTick .L0f01bd4c: /* f01bd4c: 44816000 */ mtc1 $at,$f12 /* f01bd50: c6000018 */ lwc1 $f0,0x18($s0) -/* f01bd54: 3c01800a */ lui $at,0x800a +/* f01bd54: 3c01800a */ lui $at,%hi(g_Vars+0x44) /* f01bd58: 460c003c */ c.lt.s $f0,$f12 /* f01bd5c: 00000000 */ nop /* f01bd60: 45000009 */ bc1f .L0f01bd88 /* f01bd64: 00000000 */ nop -/* f01bd68: c428a004 */ lwc1 $f8,-0x5ffc($at) +/* f01bd68: c428a004 */ lwc1 $f8,%lo(g_Vars+0x44)($at) /* f01bd6c: 3c0141f0 */ lui $at,0x41f0 /* f01bd70: 44815000 */ mtc1 $at,$f10 /* f01bd74: 00000000 */ nop @@ -946,9 +946,9 @@ glabel activemenuTick /* f01bd80: e6120018 */ swc1 $f18,0x18($s0) /* f01bd84: c6000018 */ lwc1 $f0,0x18($s0) .L0f01bd88: -/* f01bd88: 3c01800a */ lui $at,0x800a +/* f01bd88: 3c01800a */ lui $at,%hi(g_Vars+0x44) /* f01bd8c: 4600603c */ c.lt.s $f12,$f0 -/* f01bd90: c422a004 */ lwc1 $f2,-0x5ffc($at) +/* f01bd90: c422a004 */ lwc1 $f2,%lo(g_Vars+0x44)($at) /* f01bd94: 3c0140a0 */ lui $at,0x40a0 /* f01bd98: 44813000 */ mtc1 $at,$f6 /* f01bd9c: 45000002 */ bc1f .L0f01bda8 diff --git a/src/game/game_01bea0.c b/src/game/game_01bea0.c index 861d8c7c7..296088af4 100644 --- a/src/game/game_01bea0.c +++ b/src/game/game_01bea0.c @@ -125,10 +125,10 @@ glabel var7f1a863c /* f01bf84: 3c15800a */ lui $s5,%hi(g_MenuData) /* f01bf88: 0fc06fb8 */ jal menuCountDialogs /* f01bf8c: 26b519c0 */ addiu $s5,$s5,%lo(g_MenuData) -/* f01bf90: 3c03800a */ lui $v1,0x800a +/* f01bf90: 3c03800a */ lui $v1,%hi(g_Menus) /* f01bf94: 3c05800a */ lui $a1,%hi(g_MenuData) /* f01bf98: 24a519c0 */ addiu $a1,$a1,%lo(g_MenuData) -/* f01bf9c: 2463e000 */ addiu $v1,$v1,-8192 +/* f01bf9c: 2463e000 */ addiu $v1,$v1,%lo(g_Menus) /* f01bfa0: 9062083c */ lbu $v0,0x83c($v1) .L0f01bfa4: /* f01bfa4: 18400002 */ blez $v0,.L0f01bfb0 @@ -165,10 +165,10 @@ glabel var7f1a863c /* f01c014: 24070032 */ addiu $a3,$zero,0x32 /* f01c018: 00003025 */ or $a2,$zero,$zero /* f01c01c: 11e00024 */ beqz $t7,.L0f01c0b0 -/* f01c020: 3c04800a */ lui $a0,0x800a +/* f01c020: 3c04800a */ lui $a0,%hi(g_Menus) /* f01c024: 3c05800a */ lui $a1,%hi(g_MenuData) /* f01c028: 24a519c0 */ addiu $a1,$a1,%lo(g_MenuData) -/* f01c02c: 2484e000 */ addiu $a0,$a0,-8192 +/* f01c02c: 2484e000 */ addiu $a0,$a0,%lo(g_Menus) /* f01c030: 24090002 */ addiu $t1,$zero,0x2 /* f01c034: 8c8304f8 */ lw $v1,0x4f8($a0) .L0f01c038: @@ -497,9 +497,9 @@ glabel var7f1a863c /* f01c4a0: 8ead0000 */ lw $t5,0x0($s5) /* f01c4a4: 8e6f02ac */ lw $t7,0x2ac($s3) /* f01c4a8: 24010006 */ addiu $at,$zero,0x6 -/* f01c4ac: 3c02800a */ lui $v0,0x800a +/* f01c4ac: 3c02800a */ lui $v0,%hi(g_Menus) /* f01c4b0: 11e1000c */ beq $t7,$at,.L0f01c4e4 -/* f01c4b4: 2442e000 */ addiu $v0,$v0,-8192 +/* f01c4b4: 2442e000 */ addiu $v0,$v0,%lo(g_Menus) /* f01c4b8: 8e780284 */ lw $t8,0x284($s3) /* f01c4bc: a040083c */ sb $zero,0x83c($v0) /* f01c4c0: a04016ac */ sb $zero,0x16ac($v0) @@ -531,7 +531,7 @@ glabel var7f1a863c /* f01c51c: 2406ffff */ addiu $a2,$zero,-1 /* f01c520: ae800000 */ sw $zero,0x0($s4) /* f01c524: 14c50006 */ bne $a2,$a1,.L0f01c540 -/* f01c528: 3c03800a */ lui $v1,0x800a +/* f01c528: 3c03800a */ lui $v1,%hi(g_Menus) /* f01c52c: 3c04800b */ lui $a0,%hi(g_MpSetup) /* f01c530: 2484cb88 */ addiu $a0,$a0,%lo(g_MpSetup) /* f01c534: 948f0016 */ lhu $t7,0x16($a0) @@ -540,7 +540,7 @@ glabel var7f1a863c .L0f01c540: /* f01c540: 3c04800b */ lui $a0,%hi(g_MpSetup) /* f01c544: 2484cb88 */ addiu $a0,$a0,%lo(g_MpSetup) -/* f01c548: 2463e000 */ addiu $v1,$v1,-8192 +/* f01c548: 2463e000 */ addiu $v1,$v1,%lo(g_Menus) .L0f01c54c: /* f01c54c: 8c7904f8 */ lw $t9,0x4f8($v1) /* f01c550: 24010004 */ addiu $at,$zero,0x4 @@ -567,10 +567,10 @@ glabel var7f1a863c /* f01c59c: 00000000 */ nop .L0f01c5a0: /* f01c5a0: 3c068007 */ lui $a2,%hi(g_MpPlayerNum) -/* f01c5a4: 3c05800a */ lui $a1,0x800a +/* f01c5a4: 3c05800a */ lui $a1,%hi(g_Menus) /* f01c5a8: 3c038008 */ lui $v1,%hi(g_MpReadyMenuDialog) /* f01c5ac: 246357b8 */ addiu $v1,$v1,%lo(g_MpReadyMenuDialog) -/* f01c5b0: 24a5e000 */ addiu $a1,$a1,-8192 +/* f01c5b0: 24a5e000 */ addiu $a1,$a1,%lo(g_Menus) /* f01c5b4: 24c61448 */ addiu $a2,$a2,%lo(g_MpPlayerNum) /* f01c5b8: 00008825 */ or $s1,$zero,$zero /* f01c5bc: 24040e70 */ addiu $a0,$zero,0xe70 @@ -603,8 +603,8 @@ glabel var7f1a863c /* f01c61c: 01b16821 */ addu $t5,$t5,$s1 /* f01c620: 000d68c0 */ sll $t5,$t5,0x3 /* f01c624: 01b16823 */ subu $t5,$t5,$s1 -/* f01c628: 3c0f800a */ lui $t7,0x800a -/* f01c62c: 25efe000 */ addiu $t7,$t7,-8192 +/* f01c628: 3c0f800a */ lui $t7,%hi(g_Menus) +/* f01c62c: 25efe000 */ addiu $t7,$t7,%lo(g_Menus) /* f01c630: 000d6900 */ sll $t5,$t5,0x4 /* f01c634: 01af1821 */ addu $v1,$t5,$t7 /* f01c638: 8c6e04f8 */ lw $t6,0x4f8($v1) @@ -1010,12 +1010,12 @@ glabel var7f1a863c /* f01cbbc: 00000000 */ nop .L0f01cbc0: /* f01cbc0: 3c018007 */ lui $at,%hi(g_MpPlayerNum) -/* f01cbc4: 3c03800a */ lui $v1,0x800a +/* f01cbc4: 3c03800a */ lui $v1,%hi(g_Menus) /* f01cbc8: 3c02800a */ lui $v0,%hi(g_MenuData) /* f01cbcc: ac201448 */ sw $zero,%lo(g_MpPlayerNum)($at) /* f01cbd0: 00002025 */ or $a0,$zero,$zero /* f01cbd4: 244219c0 */ addiu $v0,$v0,%lo(g_MenuData) -/* f01cbd8: 2463e000 */ addiu $v1,$v1,-8192 +/* f01cbd8: 2463e000 */ addiu $v1,$v1,%lo(g_Menus) /* f01cbdc: 8c6d04f8 */ lw $t5,0x4f8($v1) .L0f01cbe0: /* f01cbe0: 24630e70 */ addiu $v1,$v1,0x0e70 diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c index 5eb3dfc89..4bd7fe378 100644 --- a/src/game/game_0601b0.c +++ b/src/game/game_0601b0.c @@ -3878,7 +3878,7 @@ glabel func0f06302c /* f063674: 8fad008c */ lw $t5,0x8c($sp) /* f063678: 96180038 */ lhu $t8,0x38($s0) /* f06367c: 972d0378 */ lhu $t5,0x378($t9) -/* f063680: 3c01800a */ lui $at,0x800a +/* f063680: 3c01800a */ lui $at,%hi(g_Vars+0x4c) /* f063684: 530d0017 */ beql $t8,$t5,.L0f0636e4 /* f063688: 8fad007c */ lw $t5,0x7c($sp) /* f06368c: 960e003a */ lhu $t6,0x3a($s0) @@ -3910,7 +3910,7 @@ glabel func0f06302c /* f0636f0: ae2d0034 */ sw $t5,0x34($s1) /* f0636f4: ae2e0038 */ sw $t6,0x38($s1) /* f0636f8: e6280044 */ swc1 $f8,0x44($s1) -/* f0636fc: e42aa00c */ swc1 $f10,-0x5ff4($at) +/* f0636fc: e42aa00c */ swc1 $f10,%lo(g_Vars+0x4c)($at) .L0f063700: /* f063700: 92030000 */ lbu $v1,0x0($s0) /* f063704: 16830013 */ bne $s4,$v1,.L0f063754 @@ -4001,7 +4001,7 @@ glabel func0f06302c /* f063834: 960e0038 */ lhu $t6,0x38($s0) /* f063838: 8fb9007c */ lw $t9,0x7c($sp) /* f06383c: 95f80378 */ lhu $t8,0x378($t7) -/* f063840: 3c01800a */ lui $at,0x800a +/* f063840: 3c01800a */ lui $at,%hi(g_Vars+0x4c) /* f063844: 51d80009 */ beql $t6,$t8,.L0f06386c /* f063848: 9218003f */ lbu $t8,0x3f($s0) /* f06384c: 8fad0078 */ lw $t5,0x78($sp) @@ -4010,7 +4010,7 @@ glabel func0f06302c /* f063858: ae390034 */ sw $t9,0x34($s1) /* f06385c: ae2d0038 */ sw $t5,0x38($s1) /* f063860: e6300044 */ swc1 $f16,0x44($s1) -/* f063864: e432a00c */ swc1 $f18,-0x5ff4($at) +/* f063864: e432a00c */ swc1 $f18,%lo(g_Vars+0x4c)($at) /* f063868: 9218003f */ lbu $t8,0x3f($s0) .L0f06386c: /* f06386c: 962f035c */ lhu $t7,0x35c($s1) @@ -4992,11 +4992,11 @@ glabel var7f1a9f54 /* f06463c: 46109181 */ sub.s $f6,$f18,$f16 /* f064640: 44814000 */ mtc1 $at,$f8 /* f064644: 8d4aa2d8 */ lw $t2,%lo(g_Vars+0x318)($t2) -/* f064648: 3c018007 */ lui $at,0x8007 +/* f064648: 3c018007 */ lui $at,%hi(var80069880) /* f06464c: 46083002 */ mul.s $f0,$f6,$f8 /* f064650: 15400004 */ bnez $t2,.L0f064664 /* f064654: 00000000 */ nop -/* f064658: c42a9880 */ lwc1 $f10,-0x6780($at) +/* f064658: c42a9880 */ lwc1 $f10,%lo(var80069880)($at) /* f06465c: 460a0002 */ mul.s $f0,$f0,$f10 /* f064660: 00000000 */ nop .L0f064664: diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index 7100e1f31..3c865bbb9 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -3648,8 +3648,8 @@ glabel var7f1ac320 /* f09a770: 3c014270 */ lui $at,0x4270 /* f09a774: 46002181 */ sub.s $f6,$f4,$f0 /* f09a778: 44817000 */ mtc1 $at,$f14 -/* f09a77c: 3c01800a */ lui $at,0x800a -/* f09a780: c432a004 */ lwc1 $f18,-0x5ffc($at) +/* f09a77c: 3c01800a */ lui $at,%hi(g_Vars+0x44) +/* f09a780: c432a004 */ lwc1 $f18,%lo(g_Vars+0x44)($at) /* f09a784: 46083282 */ mul.s $f10,$f6,$f8 /* f09a788: c60805fc */ lwc1 $f8,0x5fc($s0) /* f09a78c: 460e9103 */ div.s $f4,$f18,$f14 @@ -4664,8 +4664,8 @@ glabel var7f1ac33c /* f09b57c: 44810000 */ mtc1 $at,$f0 /* f09b580: 3c017f1b */ lui $at,%hi(var7f1ac33c) /* f09b584: c426c33c */ lwc1 $f6,%lo(var7f1ac33c)($at) -/* f09b588: 3c01800a */ lui $at,0x800a -/* f09b58c: c428a004 */ lwc1 $f8,-0x5ffc($at) +/* f09b588: 3c01800a */ lui $at,%hi(g_Vars+0x44) +/* f09b58c: c428a004 */ lwc1 $f8,%lo(g_Vars+0x44)($at) /* f09b590: c6100240 */ lwc1 $f16,0x240($s0) /* f09b594: 00001025 */ or $v0,$zero,$zero /* f09b598: 46083282 */ mul.s $f10,$f6,$f8 @@ -6924,8 +6924,8 @@ glabel func0f09cf88 .L0f09d008: /* f09d008: 44818000 */ mtc1 $at,$f16 .L0f09d00c: -/* f09d00c: 3c01800a */ lui $at,0x800a -/* f09d010: c420a00c */ lwc1 $f0,-0x5ff4($at) +/* f09d00c: 3c01800a */ lui $at,%hi(g_Vars+0x4c) +/* f09d010: c420a00c */ lwc1 $f0,%lo(g_Vars+0x4c)($at) /* f09d014: c7a40030 */ lwc1 $f4,0x30($sp) /* f09d018: c7a80034 */ lwc1 $f8,0x34($sp) /* f09d01c: c60e0840 */ lwc1 $f14,0x840($s0) @@ -6959,7 +6959,7 @@ glabel func0f09cf88 /* f09d084: 3c014270 */ lui $at,0x4270 /* f09d088: 44818000 */ mtc1 $at,$f16 /* f09d08c: 1040000c */ beqz $v0,.L0f09d0c0 -/* f09d090: 3c01800a */ lui $at,0x800a +/* f09d090: 3c01800a */ lui $at,%hi(g_Vars+0x4c) /* f09d094: c6080fe4 */ lwc1 $f8,0xfe4($s0) /* f09d098: c7b20044 */ lwc1 $f18,0x44($sp) /* f09d09c: 46124280 */ add.s $f10,$f8,$f18 @@ -6972,7 +6972,7 @@ glabel func0f09cf88 /* f09d0b8: 00000000 */ nop /* f09d0bc: e6040fe4 */ swc1 $f4,0xfe4($s0) .L0f09d0c0: -/* f09d0c0: c420a00c */ lwc1 $f0,-0x5ff4($at) +/* f09d0c0: c420a00c */ lwc1 $f0,%lo(g_Vars+0x4c)($at) /* f09d0c4: c7a80044 */ lwc1 $f8,0x44($sp) /* f09d0c8: c7aa0048 */ lwc1 $f10,0x48($sp) /* f09d0cc: c60e0fe4 */ lwc1 $f14,0xfe4($s0) @@ -7742,8 +7742,8 @@ glabel var7f1ac66c /* f09db38: 00000000 */ nop /* f09db3c: 4501fff4 */ bc1t .L0f09db10 /* f09db40: 00000000 */ nop -/* f09db44: 3c01800a */ lui $at,0x800a -/* f09db48: c420a00c */ lwc1 $f0,-0x5ff4($at) +/* f09db44: 3c01800a */ lui $at,%hi(g_Vars+0x4c) +/* f09db48: c420a00c */ lwc1 $f0,%lo(g_Vars+0x4c)($at) .L0f09db4c: /* f09db4c: c60616e4 */ lwc1 $f6,0x16e4($s0) /* f09db50: 3c014270 */ lui $at,0x4270 @@ -13210,12 +13210,12 @@ glabel func0f0a256c .L0f0a26d4: /* f0a26d4: 3c08800a */ lui $t0,%hi(var8009d0dc) /* f0a26d8: 8d08d0dc */ lw $t0,%lo(var8009d0dc)($t0) -/* f0a26dc: 3c01800a */ lui $at,0x800a +/* f0a26dc: 3c01800a */ lui $at,%hi(var8009d140) /* f0a26e0: 27a40078 */ addiu $a0,$sp,0x78 /* f0a26e4: 14e80013 */ bne $a3,$t0,.L0f0a2734 /* f0a26e8: 00000000 */ nop /* f0a26ec: 44800000 */ mtc1 $zero,$f0 -/* f0a26f0: c424d140 */ lwc1 $f4,-0x2ec0($at) +/* f0a26f0: c424d140 */ lwc1 $f4,%lo(var8009d140)($at) /* f0a26f4: afa700b8 */ sw $a3,0xb8($sp) /* f0a26f8: e7a0002c */ swc1 $f0,0x2c($sp) /* f0a26fc: e7a00030 */ swc1 $f0,0x30($sp) @@ -13236,7 +13236,7 @@ glabel func0f0a256c /* f0a2734: 3c02800a */ lui $v0,%hi(var8009d0f0) /* f0a2738: 2442d0f0 */ addiu $v0,$v0,%lo(var8009d0f0) /* f0a273c: 8c490000 */ lw $t1,0x0($v0) -/* f0a2740: 3c01800a */ lui $at,0x800a +/* f0a2740: 3c01800a */ lui $at,%hi(var8009d140) /* f0a2744: 10e90007 */ beq $a3,$t1,.L0f0a2764 /* f0a2748: 00000000 */ nop /* f0a274c: 8c4a0004 */ lw $t2,0x4($v0) @@ -13246,7 +13246,7 @@ glabel func0f0a256c /* f0a275c: 54eb0016 */ bnel $a3,$t3,.L0f0a27b8 /* f0a2760: 8fbf001c */ lw $ra,0x1c($sp) .L0f0a2764: -/* f0a2764: c420d140 */ lwc1 $f0,-0x2ec0($at) +/* f0a2764: c420d140 */ lwc1 $f0,%lo(var8009d140)($at) /* f0a2768: 44803000 */ mtc1 $zero,$f6 /* f0a276c: 44804000 */ mtc1 $zero,$f8 /* f0a2770: 46000007 */ neg.s $f0,$f0 @@ -14799,8 +14799,8 @@ glabel var7f1ac8b8 /* f0a3af8: 4500000e */ bc1f .L0f0a3b34 /* f0a3afc: 00000000 */ nop /* f0a3b00: c424c87c */ lwc1 $f4,%lo(var7f1ac87c)($at) -/* f0a3b04: 3c01800a */ lui $at,0x800a -/* f0a3b08: c426a004 */ lwc1 $f6,-0x5ffc($at) +/* f0a3b04: 3c01800a */ lui $at,%hi(g_Vars+0x44) +/* f0a3b08: c426a004 */ lwc1 $f6,%lo(g_Vars+0x44)($at) /* f0a3b0c: 46062202 */ mul.s $f8,$f4,$f6 /* f0a3b10: 46081280 */ add.s $f10,$f2,$f8 /* f0a3b14: e60a0240 */ swc1 $f10,0x240($s0) @@ -14908,7 +14908,7 @@ glabel var7f1ac8b8 /* f0a3c8c: 3c017f1b */ lui $at,%hi(var7f1ac8a4) /* f0a3c90: c422c8a4 */ lwc1 $f2,%lo(var7f1ac8a4)($at) /* f0a3c94: c600023c */ lwc1 $f0,0x23c($s0) -/* f0a3c98: 3c01800a */ lui $at,0x800a +/* f0a3c98: 3c01800a */ lui $at,%hi(var8009d140) /* f0a3c9c: 46020103 */ div.s $f4,$f0,$f2 /* f0a3ca0: 4600218d */ trunc.w.s $f6,$f4 /* f0a3ca4: 44023000 */ mfc1 $v0,$f6 @@ -14920,7 +14920,7 @@ glabel var7f1ac8b8 /* f0a3cbc: 46120401 */ sub.s $f16,$f0,$f18 /* f0a3cc0: e610023c */ swc1 $f16,0x23c($s0) /* f0a3cc4: c604023c */ lwc1 $f4,0x23c($s0) -/* f0a3cc8: e424d140 */ swc1 $f4,-0x2ec0($at) +/* f0a3cc8: e424d140 */ swc1 $f4,%lo(var8009d140)($at) /* f0a3ccc: 8e03074c */ lw $v1,0x74c($s0) /* f0a3cd0: 3c017f1b */ lui $at,%hi(var7f1ac8a8) /* f0a3cd4: 14600019 */ bnez $v1,.L0f0a3d3c @@ -15207,8 +15207,8 @@ glabel var7f1ac8c0 /* f0a40d0: 44811000 */ mtc1 $at,$f2 /* f0a40d4: 3c017f1b */ lui $at,%hi(var7f1ac8bc) /* f0a40d8: c424c8bc */ lwc1 $f4,%lo(var7f1ac8bc)($at) -/* f0a40dc: 3c01800a */ lui $at,0x800a -/* f0a40e0: c426a004 */ lwc1 $f6,-0x5ffc($at) +/* f0a40dc: 3c01800a */ lui $at,%hi(g_Vars+0x44) +/* f0a40e0: c426a004 */ lwc1 $f6,%lo(g_Vars+0x44)($at) /* f0a40e4: 8fa70038 */ lw $a3,0x38($sp) /* f0a40e8: 3c01c120 */ lui $at,0xc120 /* f0a40ec: 46062202 */ mul.s $f8,$f4,$f6 @@ -15281,14 +15281,14 @@ glabel var7f1ac8c4 .L0f0a41d0: /* f0a41d0: c600023c */ lwc1 $f0,0x23c($s0) /* f0a41d4: 3c188007 */ lui $t8,%hi(var8007022c) -/* f0a41d8: 3c01800a */ lui $at,0x800a +/* f0a41d8: 3c01800a */ lui $at,%hi(g_Vars+0x44) /* f0a41dc: 4600103c */ c.lt.s $f2,$f0 /* f0a41e0: 2718022c */ addiu $t8,$t8,%lo(var8007022c) /* f0a41e4: 27af0028 */ addiu $t7,$sp,0x28 /* f0a41e8: 00e02025 */ or $a0,$a3,$zero /* f0a41ec: 45020011 */ bc1fl .L0f0a4234 /* f0a41f0: 4600103c */ c.lt.s $f2,$f0 -/* f0a41f4: c426a004 */ lwc1 $f6,-0x5ffc($at) +/* f0a41f4: c426a004 */ lwc1 $f6,%lo(g_Vars+0x44)($at) /* f0a41f8: 3c0140c0 */ lui $at,0x40c0 /* f0a41fc: 44814000 */ mtc1 $at,$f8 /* f0a4200: 3c017f1b */ lui $at,%hi(var7f1ac8c4) @@ -15416,12 +15416,12 @@ glabel func0f0a4334 /* f0a43c4: c600023c */ lwc1 $f0,0x23c($s0) .L0f0a43c8: /* f0a43c8: 44804000 */ mtc1 $zero,$f8 -/* f0a43cc: 3c01800a */ lui $at,0x800a +/* f0a43cc: 3c01800a */ lui $at,%hi(g_Vars+0x44) /* f0a43d0: 4600403c */ c.lt.s $f8,$f0 /* f0a43d4: 00000000 */ nop /* f0a43d8: 4502000a */ bc1fl .L0f0a4404 /* f0a43dc: 8e04074c */ lw $a0,0x74c($s0) -/* f0a43e0: c42aa004 */ lwc1 $f10,-0x5ffc($at) +/* f0a43e0: c42aa004 */ lwc1 $f10,%lo(g_Vars+0x44)($at) /* f0a43e4: 3c014120 */ lui $at,0x4120 /* f0a43e8: 44818000 */ mtc1 $at,$f16 /* f0a43ec: 00000000 */ nop @@ -16941,11 +16941,11 @@ glabel var7f1aca70 /* f0a5678: 0fc2c5f0 */ jal weaponHasFlag /* f0a567c: 24050040 */ addiu $a1,$zero,0x40 /* f0a5680: 10400013 */ beqz $v0,.L0f0a56d0 -/* f0a5684: 3c01800a */ lui $at,0x800a +/* f0a5684: 3c01800a */ lui $at,%hi(g_Vars+0x4c) /* f0a5688: 3c014000 */ lui $at,0x4000 /* f0a568c: 44811000 */ mtc1 $at,$f2 -/* f0a5690: 3c01800a */ lui $at,0x800a -/* f0a5694: c420a00c */ lwc1 $f0,-0x5ff4($at) +/* f0a5690: 3c01800a */ lui $at,%hi(g_Vars+0x4c) +/* f0a5694: c420a00c */ lwc1 $f0,%lo(g_Vars+0x4c)($at) /* f0a5698: 3c014370 */ lui $at,0x4370 /* f0a569c: 44813000 */ mtc1 $at,$f6 /* f0a56a0: 46000100 */ add.s $f4,$f0,$f0 @@ -16961,7 +16961,7 @@ glabel var7f1aca70 /* f0a56c8: 1000003c */ b .L0f0a57bc /* f0a56cc: e60201bc */ swc1 $f2,0x1bc($s0) .L0f0a56d0: -/* f0a56d0: c420a00c */ lwc1 $f0,-0x5ff4($at) +/* f0a56d0: c420a00c */ lwc1 $f0,%lo(g_Vars+0x4c)($at) /* f0a56d4: 3c014370 */ lui $at,0x4370 /* f0a56d8: 44813000 */ mtc1 $at,$f6 /* f0a56dc: 46000100 */ add.s $f4,$f0,$f0 @@ -16985,11 +16985,11 @@ glabel var7f1aca70 /* f0a5720: 0fc2c5f0 */ jal weaponHasFlag /* f0a5724: 24050040 */ addiu $a1,$zero,0x40 /* f0a5728: 10400013 */ beqz $v0,.L0f0a5778 -/* f0a572c: 3c01800a */ lui $at,0x800a +/* f0a572c: 3c01800a */ lui $at,%hi(g_Vars+0x4c) /* f0a5730: 3c01c000 */ lui $at,0xc000 /* f0a5734: 44811000 */ mtc1 $at,$f2 -/* f0a5738: 3c01800a */ lui $at,0x800a -/* f0a573c: c420a00c */ lwc1 $f0,-0x5ff4($at) +/* f0a5738: 3c01800a */ lui $at,%hi(g_Vars+0x4c) +/* f0a573c: c420a00c */ lwc1 $f0,%lo(g_Vars+0x4c)($at) /* f0a5740: 3c014370 */ lui $at,0x4370 /* f0a5744: 44815000 */ mtc1 $at,$f10 /* f0a5748: 46000200 */ add.s $f8,$f0,$f0 @@ -17005,7 +17005,7 @@ glabel var7f1aca70 /* f0a5770: 10000012 */ b .L0f0a57bc /* f0a5774: e60201bc */ swc1 $f2,0x1bc($s0) .L0f0a5778: -/* f0a5778: c420a00c */ lwc1 $f0,-0x5ff4($at) +/* f0a5778: c420a00c */ lwc1 $f0,%lo(g_Vars+0x4c)($at) /* f0a577c: 3c014370 */ lui $at,0x4370 /* f0a5780: 44815000 */ mtc1 $at,$f10 /* f0a5784: 46000200 */ add.s $f8,$f0,$f0 @@ -18635,8 +18635,8 @@ glabel var7f1aca88 /* f0a6eb4: 17210066 */ bne $t9,$at,.L0f0a7050 /* f0a6eb8: 3c013f80 */ lui $at,0x3f80 /* f0a6ebc: 44811000 */ mtc1 $at,$f2 -/* f0a6ec0: 3c01800a */ lui $at,0x800a -/* f0a6ec4: c424a004 */ lwc1 $f4,-0x5ffc($at) +/* f0a6ec0: 3c01800a */ lui $at,%hi(g_Vars+0x44) +/* f0a6ec4: c424a004 */ lwc1 $f4,%lo(g_Vars+0x44)($at) /* f0a6ec8: 3c017f1b */ lui $at,%hi(var7f1aca88) /* f0a6ecc: c426ca88 */ lwc1 $f6,%lo(var7f1aca88)($at) /* f0a6ed0: c46a0874 */ lwc1 $f10,0x874($v1) @@ -22905,8 +22905,8 @@ glabel hudRenderAmmo /* f0aaf18: 01f8c825 */ or $t9,$t7,$t8 /* f0aaf1c: 0fc54e0e */ jal func0f153838 /* f0aaf20: ac590004 */ sw $t9,0x4($v0) -/* f0aaf24: 3c018006 */ lui $at,0x8006 -/* f0aaf28: c4241630 */ lwc1 $f4,0x1630($at) +/* f0aaf24: 3c018006 */ lui $at,%hi(var80061630) +/* f0aaf28: c4241630 */ lwc1 $f4,%lo(var80061630)($at) /* f0aaf2c: 3c014248 */ lui $at,0x4248 /* f0aaf30: 44813000 */ mtc1 $at,$f6 /* f0aaf34: afa20130 */ sw $v0,0x130($sp) @@ -23105,8 +23105,8 @@ glabel hudRenderAmmo /* f0ab210: 01eec025 */ or $t8,$t7,$t6 /* f0ab214: 0fc54e0e */ jal func0f153838 /* f0ab218: ac580004 */ sw $t8,0x4($v0) -/* f0ab21c: 3c018006 */ lui $at,0x8006 -/* f0ab220: c4301630 */ lwc1 $f16,0x1630($at) +/* f0ab21c: 3c018006 */ lui $at,%hi(var80061630) +/* f0ab220: c4301630 */ lwc1 $f16,%lo(var80061630)($at) /* f0ab224: 3c014248 */ lui $at,0x4248 /* f0ab228: 44819000 */ mtc1 $at,$f18 /* f0ab22c: afa20130 */ sw $v0,0x130($sp) diff --git a/src/game/game_0b0420.c b/src/game/game_0b0420.c index e18c63308..c658a9bc4 100644 --- a/src/game/game_0b0420.c +++ b/src/game/game_0b0420.c @@ -1510,8 +1510,8 @@ glabel func0f0b1d28 /* f0b1d6c: 24010014 */ addiu $at,$zero,0x14 /* f0b1d70: c4420014 */ lwc1 $f2,0x14($v0) /* f0b1d74: 15e10004 */ bne $t7,$at,.L0f0b1d88 -/* f0b1d78: 3c01800a */ lui $at,0x800a -/* f0b1d7c: c424a004 */ lwc1 $f4,-0x5ffc($at) +/* f0b1d78: 3c01800a */ lui $at,%hi(g_Vars+0x44) +/* f0b1d7c: c424a004 */ lwc1 $f4,%lo(g_Vars+0x44)($at) /* f0b1d80: 46041082 */ mul.s $f2,$f2,$f4 /* f0b1d84: 00000000 */ nop .L0f0b1d88: diff --git a/src/game/game_0b3350.c b/src/game/game_0b3350.c index a9107ee90..0b1a700ea 100644 --- a/src/game/game_0b3350.c +++ b/src/game/game_0b3350.c @@ -2485,7 +2485,7 @@ glabel func0f0b5838 /* f0b5888: 46002483 */ div.s $f18,$f4,$f0 /* f0b588c: 3c03800a */ lui $v1,%hi(var8009dd20) /* f0b5890: 2463dd20 */ addiu $v1,$v1,%lo(var8009dd20) -/* f0b5894: 3c01800a */ lui $at,0x800a +/* f0b5894: 3c01800a */ lui $at,%hi(var8009dd2c) /* f0b5898: 3c05800a */ lui $a1,%hi(var8009dd30) /* f0b589c: 24a5dd30 */ addiu $a1,$a1,%lo(var8009dd30) /* f0b58a0: 8fa4001c */ lw $a0,0x1c($sp) @@ -2525,10 +2525,10 @@ glabel func0f0b5838 /* f0b5928: c46a0008 */ lwc1 $f10,0x8($v1) /* f0b592c: 460a3202 */ mul.s $f8,$f6,$f10 /* f0b5930: 46044180 */ add.s $f6,$f8,$f4 -/* f0b5934: e426dd2c */ swc1 $f6,-0x22d4($at) +/* f0b5934: e426dd2c */ swc1 $f6,%lo(var8009dd2c)($at) /* f0b5938: c44a0020 */ lwc1 $f10,0x20($v0) /* f0b593c: c4440010 */ lwc1 $f4,0x10($v0) -/* f0b5940: 3c01800a */ lui $at,0x800a +/* f0b5940: 3c01800a */ lui $at,%hi(var8009dd3c) /* f0b5944: 46025202 */ mul.s $f8,$f10,$f2 /* f0b5948: 00000000 */ nop /* f0b594c: 46046182 */ mul.s $f6,$f12,$f4 @@ -2560,7 +2560,7 @@ glabel func0f0b5838 /* f0b59b4: c4aa0008 */ lwc1 $f10,0x8($a1) /* f0b59b8: 460a2182 */ mul.s $f6,$f4,$f10 /* f0b59bc: 46083100 */ add.s $f4,$f6,$f8 -/* f0b59c0: e424dd3c */ swc1 $f4,-0x22c4($at) +/* f0b59c0: e424dd3c */ swc1 $f4,%lo(var8009dd3c)($at) /* f0b59c4: c48a1720 */ lwc1 $f10,0x1720($a0) /* f0b59c8: c4881728 */ lwc1 $f8,0x1728($a0) /* f0b59cc: 3c013f80 */ lui $at,0x3f80 @@ -2581,7 +2581,7 @@ glabel func0f0b5838 /* f0b5a08: c4480000 */ lwc1 $f8,0x0($v0) /* f0b5a0c: c44a0020 */ lwc1 $f10,0x20($v0) /* f0b5a10: 2463dd40 */ addiu $v1,$v1,%lo(var8009dd40) -/* f0b5a14: 3c01800a */ lui $at,0x800a +/* f0b5a14: 3c01800a */ lui $at,%hi(var8009dd4c) /* f0b5a18: 3c04800a */ lui $a0,%hi(var8009dd50) /* f0b5a1c: 2484dd50 */ addiu $a0,$a0,%lo(var8009dd50) /* f0b5a20: 46127382 */ mul.s $f14,$f14,$f18 @@ -2619,10 +2619,10 @@ glabel func0f0b5838 /* f0b5aa0: 2463dd60 */ addiu $v1,$v1,%lo(var8009dd60) /* f0b5aa4: 460a4102 */ mul.s $f4,$f8,$f10 /* f0b5aa8: 46062200 */ add.s $f8,$f4,$f6 -/* f0b5aac: e428dd4c */ swc1 $f8,-0x22b4($at) +/* f0b5aac: e428dd4c */ swc1 $f8,%lo(var8009dd4c)($at) /* f0b5ab0: c44a0000 */ lwc1 $f10,0x0($v0) /* f0b5ab4: c4460020 */ lwc1 $f6,0x20($v0) -/* f0b5ab8: 3c01800a */ lui $at,0x800a +/* f0b5ab8: 3c01800a */ lui $at,%hi(var8009dd58) /* f0b5abc: 460a8102 */ mul.s $f4,$f16,$f10 /* f0b5ac0: 00000000 */ nop /* f0b5ac4: 460e3202 */ mul.s $f8,$f6,$f14 @@ -2641,11 +2641,11 @@ glabel func0f0b5838 /* f0b5af8: 00000000 */ nop /* f0b5afc: 460e5182 */ mul.s $f6,$f10,$f14 /* f0b5b00: 46062201 */ sub.s $f8,$f4,$f6 -/* f0b5b04: e428dd58 */ swc1 $f8,-0x22a8($at) +/* f0b5b04: e428dd58 */ swc1 $f8,%lo(var8009dd58)($at) /* f0b5b08: c48a0000 */ lwc1 $f10,0x0($a0) /* f0b5b0c: c4440030 */ lwc1 $f4,0x30($v0) /* f0b5b10: c4880004 */ lwc1 $f8,0x4($a0) -/* f0b5b14: 3c01800a */ lui $at,0x800a +/* f0b5b14: 3c01800a */ lui $at,%hi(var8009dd5c) /* f0b5b18: 46045182 */ mul.s $f6,$f10,$f4 /* f0b5b1c: c44a0034 */ lwc1 $f10,0x34($v0) /* f0b5b20: 460a4102 */ mul.s $f4,$f8,$f10 @@ -2654,9 +2654,9 @@ glabel func0f0b5838 /* f0b5b2c: c4860008 */ lwc1 $f6,0x8($a0) /* f0b5b30: 46065102 */ mul.s $f4,$f10,$f6 /* f0b5b34: 46082280 */ add.s $f10,$f4,$f8 -/* f0b5b38: e42add5c */ swc1 $f10,-0x22a4($at) +/* f0b5b38: e42add5c */ swc1 $f10,%lo(var8009dd5c)($at) /* f0b5b3c: c4460030 */ lwc1 $f6,0x30($v0) -/* f0b5b40: 3c01800a */ lui $at,0x800a +/* f0b5b40: 3c01800a */ lui $at,%hi(var8009dd6c) /* f0b5b44: 46003107 */ neg.s $f4,$f6 /* f0b5b48: e4640000 */ swc1 $f4,0x0($v1) /* f0b5b4c: c4480034 */ lwc1 $f8,0x34($v0) @@ -2678,7 +2678,7 @@ glabel func0f0b5838 /* f0b5b8c: 46064282 */ mul.s $f10,$f8,$f6 /* f0b5b90: 46045200 */ add.s $f8,$f10,$f4 /* f0b5b94: 03e00008 */ jr $ra -/* f0b5b98: e428dd6c */ swc1 $f8,-0x2294($at) +/* f0b5b98: e428dd6c */ swc1 $f8,%lo(var8009dd6c)($at) ); GLOBAL_ASM( @@ -2689,13 +2689,13 @@ glabel func0f0b5b9c /* f0b5ba8: c48e0004 */ lwc1 $f14,0x4($a0) /* f0b5bac: 8dc2174c */ lw $v0,0x174c($t6) /* f0b5bb0: c4800008 */ lwc1 $f0,0x8($a0) -/* f0b5bb4: 3c01800a */ lui $at,0x800a +/* f0b5bb4: 3c01800a */ lui $at,%hi(var8009dd6c) /* f0b5bb8: c4480020 */ lwc1 $f8,0x20($v0) /* f0b5bbc: c4500024 */ lwc1 $f16,0x24($v0) /* f0b5bc0: 44856000 */ mtc1 $a1,$f12 /* f0b5bc4: 46024282 */ mul.s $f10,$f8,$f2 /* f0b5bc8: c4480028 */ lwc1 $f8,0x28($v0) -/* f0b5bcc: c424dd6c */ lwc1 $f4,-0x2294($at) +/* f0b5bcc: c424dd6c */ lwc1 $f4,%lo(var8009dd6c)($at) /* f0b5bd0: 460e8482 */ mul.s $f18,$f16,$f14 /* f0b5bd4: 3c02800a */ lui $v0,%hi(var8009dd40) /* f0b5bd8: 460c2180 */ add.s $f6,$f4,$f12 @@ -2712,10 +2712,10 @@ glabel func0f0b5b9c /* f0b5c04: c4500000 */ lwc1 $f16,0x0($v0) .L0f0b5c08: /* f0b5c08: c4460004 */ lwc1 $f6,0x4($v0) -/* f0b5c0c: 3c01800a */ lui $at,0x800a +/* f0b5c0c: 3c01800a */ lui $at,%hi(var8009dd4c) /* f0b5c10: 46028102 */ mul.s $f4,$f16,$f2 /* f0b5c14: c4500008 */ lwc1 $f16,0x8($v0) -/* f0b5c18: c432dd4c */ lwc1 $f18,-0x22b4($at) +/* f0b5c18: c432dd4c */ lwc1 $f18,%lo(var8009dd4c)($at) /* f0b5c1c: 460e3282 */ mul.s $f10,$f6,$f14 /* f0b5c20: 3c02800a */ lui $v0,%hi(var8009dd50) /* f0b5c24: 460c9200 */ add.s $f8,$f18,$f12 @@ -2732,10 +2732,10 @@ glabel func0f0b5b9c /* f0b5c50: c4460000 */ lwc1 $f6,0x0($v0) .L0f0b5c54: /* f0b5c54: c4480004 */ lwc1 $f8,0x4($v0) -/* f0b5c58: 3c01800a */ lui $at,0x800a +/* f0b5c58: 3c01800a */ lui $at,%hi(var8009dd5c) /* f0b5c5c: 46023482 */ mul.s $f18,$f6,$f2 /* f0b5c60: c4460008 */ lwc1 $f6,0x8($v0) -/* f0b5c64: c42add5c */ lwc1 $f10,-0x22a4($at) +/* f0b5c64: c42add5c */ lwc1 $f10,%lo(var8009dd5c)($at) /* f0b5c68: 460e4102 */ mul.s $f4,$f8,$f14 /* f0b5c6c: 3c02800a */ lui $v0,%hi(var8009dd20) /* f0b5c70: 460c5400 */ add.s $f16,$f10,$f12 @@ -2752,10 +2752,10 @@ glabel func0f0b5b9c /* f0b5c9c: c4480000 */ lwc1 $f8,0x0($v0) .L0f0b5ca0: /* f0b5ca0: c4500004 */ lwc1 $f16,0x4($v0) -/* f0b5ca4: 3c01800a */ lui $at,0x800a +/* f0b5ca4: 3c01800a */ lui $at,%hi(var8009dd2c) /* f0b5ca8: 46024282 */ mul.s $f10,$f8,$f2 /* f0b5cac: c4480008 */ lwc1 $f8,0x8($v0) -/* f0b5cb0: c424dd2c */ lwc1 $f4,-0x22d4($at) +/* f0b5cb0: c424dd2c */ lwc1 $f4,%lo(var8009dd2c)($at) /* f0b5cb4: 460e8482 */ mul.s $f18,$f16,$f14 /* f0b5cb8: 3c02800a */ lui $v0,%hi(var8009dd30) /* f0b5cbc: 460c2180 */ add.s $f6,$f4,$f12 @@ -2772,10 +2772,10 @@ glabel func0f0b5b9c /* f0b5ce8: c4500000 */ lwc1 $f16,0x0($v0) .L0f0b5cec: /* f0b5cec: c4460004 */ lwc1 $f6,0x4($v0) -/* f0b5cf0: 3c01800a */ lui $at,0x800a +/* f0b5cf0: 3c01800a */ lui $at,%hi(var8009dd3c) /* f0b5cf4: 46028102 */ mul.s $f4,$f16,$f2 /* f0b5cf8: c4500008 */ lwc1 $f16,0x8($v0) -/* f0b5cfc: c432dd3c */ lwc1 $f18,-0x22c4($at) +/* f0b5cfc: c432dd3c */ lwc1 $f18,%lo(var8009dd3c)($at) /* f0b5d00: 460e3282 */ mul.s $f10,$f6,$f14 /* f0b5d04: 24020001 */ addiu $v0,$zero,0x1 /* f0b5d08: 460c9200 */ add.s $f8,$f18,$f12 @@ -2804,9 +2804,9 @@ glabel func0f0b5d38 /* f0b5d50: f7b40018 */ sdc1 $f20,0x18($sp) /* f0b5d54: afa60088 */ sw $a2,0x88($sp) /* f0b5d58: 8e02174c */ lw $v0,0x174c($s0) -/* f0b5d5c: 3c01800a */ lui $at,0x800a +/* f0b5d5c: 3c01800a */ lui $at,%hi(var8009dd6c) /* f0b5d60: 4485b000 */ mtc1 $a1,$f22 -/* f0b5d64: c424dd6c */ lwc1 $f4,-0x2294($at) +/* f0b5d64: c424dd6c */ lwc1 $f4,%lo(var8009dd6c)($at) /* f0b5d68: c48a0000 */ lwc1 $f10,0x0($a0) /* f0b5d6c: c4480020 */ lwc1 $f8,0x20($v0) /* f0b5d70: 46162180 */ add.s $f6,$f4,$f22 diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index 8872c59e7..addbbea5d 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -3843,10 +3843,10 @@ glabel var7f1ad5c8 /* f0b978c: 8d0a0284 */ lw $t2,0x284($t0) /* f0b9790: 8d070038 */ lw $a3,0x38($t0) /* f0b9794: 00001825 */ or $v1,$zero,$zero -/* f0b9798: 3c01800a */ lui $at,0x800a +/* f0b9798: 3c01800a */ lui $at,%hi(var8009dddc) /* f0b979c: 18e00051 */ blez $a3,.L0f0b98e4 /* f0b97a0: 3c06800a */ lui $a2,%hi(var8009dddc) -/* f0b97a4: c42cdddc */ lwc1 $f12,-0x2224($at) +/* f0b97a4: c42cdddc */ lwc1 $f12,%lo(var8009dddc)($at) /* f0b97a8: 3c017f1b */ lui $at,%hi(var7f1ad5b8) /* f0b97ac: c43ed5b8 */ lwc1 $f30,%lo(var7f1ad5b8)($at) /* f0b97b0: 3c014270 */ lui $at,0x4270 @@ -4217,16 +4217,16 @@ glabel var7f1ad5cc /* f0b9e94: e7a0002c */ swc1 $f0,0x2c($sp) /* f0b9e98: 0c0068f4 */ jal cosf /* f0b9e9c: c60c0000 */ lwc1 $f12,0x0($s0) -/* f0b9ea0: 3c01800a */ lui $at,0x800a -/* f0b9ea4: c42addf8 */ lwc1 $f10,-0x2208($at) +/* f0b9ea0: 3c01800a */ lui $at,%hi(var8009ddf8) +/* f0b9ea4: c42addf8 */ lwc1 $f10,%lo(var8009ddf8)($at) /* f0b9ea8: c7a8002c */ lwc1 $f8,0x2c($sp) -/* f0b9eac: 3c01800a */ lui $at,0x800a +/* f0b9eac: 3c01800a */ lui $at,%hi(var8009de00) /* f0b9eb0: c7ae0034 */ lwc1 $f14,0x34($sp) /* f0b9eb4: 460a4482 */ mul.s $f18,$f8,$f10 -/* f0b9eb8: c426de00 */ lwc1 $f6,-0x2200($at) +/* f0b9eb8: c426de00 */ lwc1 $f6,%lo(var8009de00)($at) /* f0b9ebc: c7a20030 */ lwc1 $f2,0x30($sp) -/* f0b9ec0: 3c01800a */ lui $at,0x800a -/* f0b9ec4: c42addfc */ lwc1 $f10,-0x2204($at) +/* f0b9ec0: 3c01800a */ lui $at,%hi(var8009ddfc) +/* f0b9ec4: c42addfc */ lwc1 $f10,%lo(var8009ddfc)($at) /* f0b9ec8: 46067200 */ add.s $f8,$f14,$f6 /* f0b9ecc: c60c0000 */ lwc1 $f12,0x0($s0) /* f0b9ed0: 46121100 */ add.s $f4,$f2,$f18 @@ -4237,8 +4237,8 @@ glabel var7f1ad5cc /* f0b9ee4: e7a0002c */ swc1 $f0,0x2c($sp) /* f0b9ee8: 0c0068f7 */ jal sinf /* f0b9eec: c60c0000 */ lwc1 $f12,0x0($s0) -/* f0b9ef0: 3c01800a */ lui $at,0x800a -/* f0b9ef4: c426ddf8 */ lwc1 $f6,-0x2208($at) +/* f0b9ef0: 3c01800a */ lui $at,%hi(var8009ddf8) +/* f0b9ef4: c426ddf8 */ lwc1 $f6,%lo(var8009ddf8)($at) /* f0b9ef8: c7a4002c */ lwc1 $f4,0x2c($sp) /* f0b9efc: c7b00038 */ lwc1 $f16,0x38($sp) /* f0b9f00: c60c0000 */ lwc1 $f12,0x0($s0) @@ -4246,9 +4246,9 @@ glabel var7f1ad5cc /* f0b9f08: 46088280 */ add.s $f10,$f16,$f8 /* f0b9f0c: 0c0068f4 */ jal cosf /* f0b9f10: e7aa0060 */ swc1 $f10,0x60($sp) -/* f0b9f14: 3c01800a */ lui $at,0x800a +/* f0b9f14: 3c01800a */ lui $at,%hi(var8009de00) /* f0b9f18: c7ae0034 */ lwc1 $f14,0x34($sp) -/* f0b9f1c: c426de00 */ lwc1 $f6,-0x2200($at) +/* f0b9f1c: c426de00 */ lwc1 $f6,%lo(var8009de00)($at) /* f0b9f20: c7a20030 */ lwc1 $f2,0x30($sp) /* f0b9f24: c7b20058 */ lwc1 $f18,0x58($sp) /* f0b9f28: 46067200 */ add.s $f8,$f14,$f6 @@ -4261,10 +4261,10 @@ glabel var7f1ad5cc /* f0b9f44: e7b20050 */ swc1 $f18,0x50($sp) /* f0b9f48: 3c017f1b */ lui $at,%hi(var7f1ad5cc) /* f0b9f4c: c42cd5cc */ lwc1 $f12,%lo(var7f1ad5cc)($at) -/* f0b9f50: 3c01800a */ lui $at,0x800a -/* f0b9f54: c428ddf4 */ lwc1 $f8,-0x220c($at) -/* f0b9f58: 3c01800a */ lui $at,0x800a -/* f0b9f5c: c42aa00c */ lwc1 $f10,-0x5ff4($at) +/* f0b9f50: 3c01800a */ lui $at,%hi(var8009ddf4) +/* f0b9f54: c428ddf4 */ lwc1 $f8,%lo(var8009ddf4)($at) +/* f0b9f58: 3c01800a */ lui $at,%hi(g_Vars+0x4c) +/* f0b9f5c: c42aa00c */ lwc1 $f10,%lo(g_Vars+0x4c)($at) /* f0b9f60: c7b00038 */ lwc1 $f16,0x38($sp) /* f0b9f64: c7a40060 */ lwc1 $f4,0x60($sp) /* f0b9f68: 460a4482 */ mul.s $f18,$f8,$f10 @@ -4363,8 +4363,8 @@ glabel cameraDoAnimation /* f0ba134: 00000000 */ nop /* f0ba138: 44802000 */ mtc1 $zero,$f4 /* f0ba13c: ac20de24 */ sw $zero,%lo(var8009de24)($at) -/* f0ba140: 3c01800a */ lui $at,0x800a -/* f0ba144: e424de28 */ swc1 $f4,-0x21d8($at) +/* f0ba140: 3c01800a */ lui $at,%hi(var8009de28) +/* f0ba144: e424de28 */ swc1 $f4,%lo(var8009de28)($at) .L0f0ba148: /* f0ba148: 50620004 */ beql $v1,$v0,.L0f0ba15c /* f0ba14c: 87a8001a */ lh $t0,0x1a($sp) @@ -6192,14 +6192,14 @@ GLOBAL_ASM( glabel func0f0bbf14 /* f0bbf14: 3c02800a */ lui $v0,%hi(g_Vars+0x284) /* f0bbf18: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) -/* f0bbf1c: 3c018007 */ lui $at,0x8007 +/* f0bbf1c: 3c018007 */ lui $at,%hi(var80070848) /* f0bbf20: 8c4e1924 */ lw $t6,0x1924($v0) /* f0bbf24: c44000f4 */ lwc1 $f0,0xf4($v0) /* f0bbf28: 000e78c0 */ sll $t7,$t6,0x3 /* f0bbf2c: 01ee7823 */ subu $t7,$t7,$t6 /* f0bbf30: 000f7880 */ sll $t7,$t7,0x2 /* f0bbf34: 002f0821 */ addu $at,$at,$t7 -/* f0bbf38: c4220848 */ lwc1 $f2,0x848($at) +/* f0bbf38: c4220848 */ lwc1 $f2,%lo(var80070848)($at) /* f0bbf3c: 4600103e */ c.le.s $f2,$f0 /* f0bbf40: 00000000 */ nop /* f0bbf44: 45020004 */ bc1fl .L0f0bbf58 @@ -6835,7 +6835,7 @@ glabel func0f0bc7ac /* f0bc850: 10620003 */ beq $v1,$v0,.L0f0bc860 /* f0bc854: 3c0c8007 */ lui $t4,%hi(g_HiResActive) /* f0bc858: 14410015 */ bne $v0,$at,.L0f0bc8b0 -/* f0bc85c: 3c0e8007 */ lui $t6,0x8007 +/* f0bc85c: 3c0e8007 */ lui $t6,%hi(g_HiResActive) .L0f0bc860: /* f0bc860: 8d8c06c8 */ lw $t4,%lo(g_HiResActive)($t4) /* f0bc864: 3c0e8007 */ lui $t6,%hi(var800705c0) @@ -6859,7 +6859,7 @@ glabel func0f0bc7ac /* f0bc8a8: 10000078 */ b .L0f0bca8c /* f0bc8ac: 000c2403 */ sra $a0,$t4,0x10 .L0f0bc8b0: -/* f0bc8b0: 8dce06c8 */ lw $t6,1736($t6) +/* f0bc8b0: 8dce06c8 */ lw $t6,%lo(g_HiResActive)($t6) /* f0bc8b4: 3c188007 */ lui $t8,%hi(var800705c0) /* f0bc8b8: 271805c0 */ addiu $t8,$t8,%lo(var800705c0) /* f0bc8bc: 000e7880 */ sll $t7,$t6,0x2 @@ -6917,7 +6917,7 @@ glabel func0f0bc7ac .L0f0bc974: /* f0bc974: 8d6e028c */ lw $t6,0x28c($t3) /* f0bc978: 3c0f8007 */ lui $t7,%hi(g_HiResActive) -/* f0bc97c: 3c198007 */ lui $t9,0x8007 +/* f0bc97c: 3c198007 */ lui $t9,%hi(g_HiResActive) /* f0bc980: 146e0015 */ bne $v1,$t6,.L0f0bc9d8 /* f0bc984: 00000000 */ nop /* f0bc988: 8def06c8 */ lw $t7,%lo(g_HiResActive)($t7) @@ -6942,7 +6942,7 @@ glabel func0f0bc7ac /* f0bc9d0: 1000002e */ b .L0f0bca8c /* f0bc9d4: 000f2403 */ sra $a0,$t7,0x10 .L0f0bc9d8: -/* f0bc9d8: 8f3906c8 */ lw $t9,1736($t9) +/* f0bc9d8: 8f3906c8 */ lw $t9,%lo(g_HiResActive)($t9) /* f0bc9dc: 3c0d8007 */ lui $t5,%hi(var800705c0) /* f0bc9e0: 25ad05c0 */ addiu $t5,$t5,%lo(var800705c0) /* f0bc9e4: 00196080 */ sll $t4,$t9,0x2 @@ -7175,7 +7175,7 @@ glabel func0f0bcaa0 .L0f0bcd14: /* f0bcd14: 8dce0764 */ lw $t6,%lo(var80070764)($t6) /* f0bcd18: 3c0f800a */ lui $t7,%hi(var8009dfc0) -/* f0bcd1c: 3c0b8007 */ lui $t3,0x8007 +/* f0bcd1c: 3c0b8007 */ lui $t3,%hi(g_HiResActive) /* f0bcd20: 11c00032 */ beqz $t6,.L0f0bcdec /* f0bcd24: 00000000 */ nop /* f0bcd28: 8defdfc0 */ lw $t7,%lo(var8009dfc0)($t7) @@ -7189,7 +7189,7 @@ glabel func0f0bcaa0 /* f0bcd48: 00000000 */ nop /* f0bcd4c: 8f3906c8 */ lw $t9,%lo(g_HiResActive)($t9) /* f0bcd50: 256b05c0 */ addiu $t3,$t3,%lo(var800705c0) -/* f0bcd54: 3c01800a */ lui $at,0x800a +/* f0bcd54: 3c01800a */ lui $at,%hi(var8009de30) /* f0bcd58: 00195080 */ sll $t2,$t9,0x2 /* f0bcd5c: 01595023 */ subu $t2,$t2,$t9 /* f0bcd60: 000a5080 */ sll $t2,$t2,0x2 @@ -7198,7 +7198,7 @@ glabel func0f0bcaa0 /* f0bcd6c: 014b1021 */ addu $v0,$t2,$t3 /* f0bcd70: 8c4c001c */ lw $t4,0x1c($v0) /* f0bcd74: 8c4d0014 */ lw $t5,0x14($v0) -/* f0bcd78: c42cde30 */ lwc1 $f12,-0x21d0($at) +/* f0bcd78: c42cde30 */ lwc1 $f12,%lo(var8009de30)($at) /* f0bcd7c: 448c2000 */ mtc1 $t4,$f4 /* f0bcd80: 3c013f80 */ lui $at,0x3f80 /* f0bcd84: 44814000 */ mtc1 $at,$f8 @@ -7229,7 +7229,7 @@ glabel func0f0bcaa0 /* f0bcde4: 1000000a */ b .L0f0bce10 /* f0bcde8: 848405de */ lh $a0,%lo(var800705c0+0x1e)($a0) .L0f0bcdec: -/* f0bcdec: 8d6b06c8 */ lw $t3,1736($t3) +/* f0bcdec: 8d6b06c8 */ lw $t3,%lo(g_HiResActive)($t3) /* f0bcdf0: 3c048007 */ lui $a0,%hi(var800705c0+0x16) /* f0bcdf4: 000b6080 */ sll $t4,$t3,0x2 /* f0bcdf8: 018b6023 */ subu $t4,$t4,$t3 @@ -7462,7 +7462,7 @@ glabel func0f0bce24 /* f0bd114: 00000000 */ nop /* f0bd118: 8def06c8 */ lw $t7,%lo(g_HiResActive)($t7) /* f0bd11c: 273905c0 */ addiu $t9,$t9,%lo(var800705c0) -/* f0bd120: 3c01800a */ lui $at,0x800a +/* f0bd120: 3c01800a */ lui $at,%hi(var8009de30) /* f0bd124: 000fc080 */ sll $t8,$t7,0x2 /* f0bd128: 030fc023 */ subu $t8,$t8,$t7 /* f0bd12c: 0018c080 */ sll $t8,$t8,0x2 @@ -7471,7 +7471,7 @@ glabel func0f0bce24 /* f0bd138: 03191021 */ addu $v0,$t8,$t9 /* f0bd13c: 8c4a0018 */ lw $t2,0x18($v0) /* f0bd140: 8c4b0020 */ lw $t3,0x20($v0) -/* f0bd144: c42cde30 */ lwc1 $f12,-0x21d0($at) +/* f0bd144: c42cde30 */ lwc1 $f12,%lo(var8009de30)($at) /* f0bd148: 448a2000 */ mtc1 $t2,$f4 /* f0bd14c: 3c013f80 */ lui $at,0x3f80 /* f0bd150: 44814000 */ mtc1 $at,$f8 @@ -7555,7 +7555,7 @@ glabel func0f0bce24 /* f0bd274: 00000000 */ nop /* f0bd278: 8f3906c8 */ lw $t9,%lo(g_HiResActive)($t9) /* f0bd27c: 256b05c0 */ addiu $t3,$t3,%lo(var800705c0) -/* f0bd280: 3c01800a */ lui $at,0x800a +/* f0bd280: 3c01800a */ lui $at,%hi(var8009de30) /* f0bd284: 00195080 */ sll $t2,$t9,0x2 /* f0bd288: 01595023 */ subu $t2,$t2,$t9 /* f0bd28c: 000a5080 */ sll $t2,$t2,0x2 @@ -7564,7 +7564,7 @@ glabel func0f0bce24 /* f0bd298: 014b1021 */ addu $v0,$t2,$t3 /* f0bd29c: 8c4c0020 */ lw $t4,0x20($v0) /* f0bd2a0: 8c4d0018 */ lw $t5,0x18($v0) -/* f0bd2a4: c42cde30 */ lwc1 $f12,-0x21d0($at) +/* f0bd2a4: c42cde30 */ lwc1 $f12,%lo(var8009de30)($at) /* f0bd2a8: 448c2000 */ mtc1 $t4,$f4 /* f0bd2ac: 3c013f80 */ lui $at,0x3f80 /* f0bd2b0: 44814000 */ mtc1 $at,$f8 @@ -7629,7 +7629,7 @@ glabel func0f0bd358 /* f0bd37c: 448e4000 */ mtc1 $t6,$f8 /* f0bd380: 468021a0 */ cvt.s.w $f6,$f4 /* f0bd384: 8def06c8 */ lw $t7,%lo(g_HiResActive)($t7) -/* f0bd388: 3c018007 */ lui $at,0x8007 +/* f0bd388: 3c018007 */ lui $at,%hi(var800705c0+0xc) /* f0bd38c: 8fbf0014 */ lw $ra,0x14($sp) /* f0bd390: 000fc080 */ sll $t8,$t7,0x2 /* f0bd394: 468042a0 */ cvt.s.w $f10,$f8 @@ -7639,7 +7639,7 @@ glabel func0f0bd358 /* f0bd3a4: 0018c080 */ sll $t8,$t8,0x2 /* f0bd3a8: 00380821 */ addu $at,$at,$t8 /* f0bd3ac: 460a3403 */ div.s $f16,$f6,$f10 -/* f0bd3b0: c43205cc */ lwc1 $f18,0x5cc($at) +/* f0bd3b0: c43205cc */ lwc1 $f18,%lo(var800705c0+0xc)($at) /* f0bd3b4: 27bd0020 */ addiu $sp,$sp,0x20 /* f0bd3b8: 46109082 */ mul.s $f2,$f18,$f16 /* f0bd3bc: 03e00008 */ jr $ra @@ -14737,8 +14737,8 @@ glabel var7f1ad744 /* f0c3070: 00000000 */ nop /* f0c3074: 46000306 */ mov.s $f12,$f0 .L0f0c3078: -/* f0c3078: 3c01800a */ lui $at,0x800a -/* f0c307c: c428a00c */ lwc1 $f8,-0x5ff4($at) +/* f0c3078: 3c01800a */ lui $at,%hi(g_Vars+0x4c) +/* f0c307c: c428a00c */ lwc1 $f8,%lo(g_Vars+0x4c)($at) /* f0c3080: 3c017f1b */ lui $at,%hi(var7f1ad744) /* f0c3084: 8fa30074 */ lw $v1,0x74($sp) /* f0c3088: c42ad744 */ lwc1 $f10,%lo(var7f1ad744)($at) diff --git a/src/game/game_0d4690.c b/src/game/game_0d4690.c index e3d778e17..60c797514 100644 --- a/src/game/game_0d4690.c +++ b/src/game/game_0d4690.c @@ -768,8 +768,8 @@ glabel func0f0d4d0c /* f0d5100: 44811000 */ mtc1 $at,$f2 /* f0d5104: 3c014200 */ lui $at,0x4200 /* f0d5108: 44816000 */ mtc1 $at,$f12 -/* f0d510c: 3c018006 */ lui $at,0x8006 -/* f0d5110: c4201630 */ lwc1 $f0,0x1630($at) +/* f0d510c: 3c018006 */ lui $at,%hi(var80061630) +/* f0d5110: c4201630 */ lwc1 $f0,%lo(var80061630)($at) /* f0d5114: 46120202 */ mul.s $f8,$f0,$f18 /* f0d5118: 00000000 */ nop /* f0d511c: 46024282 */ mul.s $f10,$f8,$f2 @@ -785,8 +785,8 @@ glabel func0f0d4d0c /* f0d5140: 44811000 */ mtc1 $at,$f2 /* f0d5144: 3c014200 */ lui $at,0x4200 /* f0d5148: 44816000 */ mtc1 $at,$f12 -/* f0d514c: 3c018006 */ lui $at,0x8006 -/* f0d5150: c4201630 */ lwc1 $f0,0x1630($at) +/* f0d514c: 3c018006 */ lui $at,%hi(var80061630) +/* f0d5150: c4201630 */ lwc1 $f0,%lo(var80061630)($at) /* f0d5154: 3c013f00 */ lui $at,0x3f00 /* f0d5158: 44814000 */ mtc1 $at,$f8 /* f0d515c: 00000000 */ nop diff --git a/src/game/game_0d7070.c b/src/game/game_0d7070.c index 19a758e89..d91dfdc2c 100644 --- a/src/game/game_0d7070.c +++ b/src/game/game_0d7070.c @@ -1709,10 +1709,10 @@ glabel var7f1adde8 /* f0d87e8: 00001025 */ or $v0,$zero,$zero /* f0d87ec: 3c013f00 */ lui $at,0x3f00 /* f0d87f0: 4481f000 */ mtc1 $at,$f30 -/* f0d87f4: 3c018007 */ lui $at,0x8007 -/* f0d87f8: c43c0f88 */ lwc1 $f28,0xf88($at) -/* f0d87fc: 3c018007 */ lui $at,0x8007 -/* f0d8800: c43a0f84 */ lwc1 $f26,0xf84($at) +/* f0d87f4: 3c018007 */ lui $at,%hi(var80070f88) +/* f0d87f8: c43c0f88 */ lwc1 $f28,%lo(var80070f88)($at) +/* f0d87fc: 3c018007 */ lui $at,%hi(var80070f84) +/* f0d8800: c43a0f84 */ lwc1 $f26,%lo(var80070f84)($at) /* f0d8804: 44852000 */ mtc1 $a1,$f4 /* f0d8808: 44864000 */ mtc1 $a2,$f8 /* f0d880c: 3c017f1b */ lui $at,%hi(var7f1adde0) @@ -1722,12 +1722,12 @@ glabel var7f1adde8 /* f0d881c: 4481a000 */ mtc1 $at,$f20 /* f0d8820: 3c014000 */ lui $at,0x4000 /* f0d8824: 44819000 */ mtc1 $at,$f18 -/* f0d8828: 3c018007 */ lui $at,0x8007 +/* f0d8828: 3c018007 */ lui $at,%hi(var80070f90) /* f0d882c: 468042a0 */ cvt.s.w $f10,$f8 -/* f0d8830: c4300f90 */ lwc1 $f16,0xf90($at) -/* f0d8834: 3c018007 */ lui $at,0x8007 +/* f0d8830: c4300f90 */ lwc1 $f16,%lo(var80070f90)($at) +/* f0d8834: 3c018007 */ lui $at,%hi(var80070f8c) /* f0d8838: 4480c000 */ mtc1 $zero,$f24 -/* f0d883c: c42e0f8c */ lwc1 $f14,0xf8c($at) +/* f0d883c: c42e0f8c */ lwc1 $f14,%lo(var80070f8c)($at) /* f0d8840: e7a60074 */ swc1 $f6,0x74($sp) /* f0d8844: e7aa006c */ swc1 $f10,0x6c($sp) /* f0d8848: c7a40074 */ lwc1 $f4,0x74($sp) @@ -1857,19 +1857,19 @@ glabel var7f1adde8 /* f0d89ec: 0043082a */ slt $at,$v0,$v1 /* f0d89f0: 5420ff96 */ bnezl $at,.L0f0d884c /* f0d89f4: c7a40074 */ lwc1 $f4,0x74($sp) -/* f0d89f8: 3c018007 */ lui $at,0x8007 -/* f0d89fc: e4300f90 */ swc1 $f16,0xf90($at) -/* f0d8a00: 3c018007 */ lui $at,0x8007 -/* f0d8a04: e42e0f8c */ swc1 $f14,0xf8c($at) -/* f0d8a08: 3c018007 */ lui $at,0x8007 -/* f0d8a0c: e43a0f84 */ swc1 $f26,0xf84($at) -/* f0d8a10: 3c018007 */ lui $at,0x8007 -/* f0d8a14: e43c0f88 */ swc1 $f28,0xf88($at) +/* f0d89f8: 3c018007 */ lui $at,%hi(var80070f90) +/* f0d89fc: e4300f90 */ swc1 $f16,%lo(var80070f90)($at) +/* f0d8a00: 3c018007 */ lui $at,%hi(var80070f8c) +/* f0d8a04: e42e0f8c */ swc1 $f14,%lo(var80070f8c)($at) +/* f0d8a08: 3c018007 */ lui $at,%hi(var80070f84) +/* f0d8a0c: e43a0f84 */ swc1 $f26,%lo(var80070f84)($at) +/* f0d8a10: 3c018007 */ lui $at,%hi(var80070f88) +/* f0d8a14: e43c0f88 */ swc1 $f28,%lo(var80070f88)($at) .L0f0d8a18: -/* f0d8a18: 3c018007 */ lui $at,0x8007 -/* f0d8a1c: c43a0f84 */ lwc1 $f26,0xf84($at) -/* f0d8a20: 3c018007 */ lui $at,0x8007 -/* f0d8a24: c43c0f88 */ lwc1 $f28,0xf88($at) +/* f0d8a18: 3c018007 */ lui $at,%hi(var80070f84) +/* f0d8a1c: c43a0f84 */ lwc1 $f26,%lo(var80070f84)($at) +/* f0d8a20: 3c018007 */ lui $at,%hi(var80070f88) +/* f0d8a24: c43c0f88 */ lwc1 $f28,%lo(var80070f88)($at) /* f0d8a28: 4600d10d */ trunc.w.s $f4,$f26 /* f0d8a2c: 3c0500ff */ lui $a1,0xff /* f0d8a30: 34a50028 */ ori $a1,$a1,0x28 @@ -6355,12 +6355,12 @@ glabel var7f1ade74 /* f0dca9c: 24080001 */ addiu $t0,$zero,0x1 /* f0dcaa0: 24090002 */ addiu $t1,$zero,0x2 /* f0dcaa4: 15190004 */ bne $t0,$t9,.L0f0dcab8 -/* f0dcaa8: 3c018008 */ lui $at,0x8008 +/* f0dcaa8: 3c018008 */ lui $at,%hi(g_ScreenWidthMultiplier) /* f0dcaac: 3c018008 */ lui $at,%hi(g_ScreenWidthMultiplier) /* f0dcab0: 10000002 */ b .L0f0dcabc /* f0dcab4: ac29fac0 */ sw $t1,%lo(g_ScreenWidthMultiplier)($at) .L0f0dcab8: -/* f0dcab8: ac28fac0 */ sw $t0,-0x540($at) +/* f0dcab8: ac28fac0 */ sw $t0,%lo(g_ScreenWidthMultiplier)($at) .L0f0dcabc: /* f0dcabc: 8cca006c */ lw $t2,0x6c($a2) /* f0dcac0: 00002025 */ or $a0,$zero,$zero diff --git a/src/game/game_0dcdb0.c b/src/game/game_0dcdb0.c index 9b350b051..998c6456e 100644 --- a/src/game/game_0dcdb0.c +++ b/src/game/game_0dcdb0.c @@ -60,18 +60,18 @@ s32 g_NumHudMessages = 0; struct hudmessage *g_HudMessages = NULL; struct hudmessageconfig g_HudMessageConfigs[] = { - /* 0*/ { 1, 1, 0, (void*)0x8007fb10, (void*)0x8007fb0c, 0x00ff0000, 0x000000a0, 1, 6, 0, 0, 80 }, // bottom left - /* 1*/ { 0, 1, 0, (void*)0x8007fb18, (void*)0x8007fb14, 0x00ff0000, 0x000000a0, 3, 7, 0, 0, 120 }, // middle of screen, larger font, like objectives - /* 2*/ { 0, 0, 1, (void*)0x8007fb18, (void*)0x8007fb14, 0xff000000, 0xffffffa0, 3, 7, 0, 0, 120 }, // middle of screen, larger font, like objectives - /* 3*/ { 0, 1, 0, (void*)0x8007fb18, (void*)0x8007fb14, 0x00ff0000, 0x000000a0, 1, 6, 0, 0, 120 }, // bottom left, large font - /* 4*/ { 1, 1, 0, (void*)0x8007fb10, (void*)0x8007fb0c, 0x00ffc000, 0x000000a0, 1, 6, 0, 0, 40 }, // bottom left - /* 5*/ { 0, 0, 0, (void*)0x8007fb18, (void*)0x8007fb14, 0x00ff0000, 0x000000a0, 1, 5, 0, 0, 120 }, // top left, large font - /* 6*/ { 1, 0, 0, (void*)0x8007fb10, (void*)0x8007fb0c, 0x00ff0000, 0x000000a0, 3, 5, 0, 0, 120 }, // top middle - /* 7*/ { 1, 1, 0, (void*)0x8007fb10, (void*)0x8007fb0c, 0x00ff0000, 0x000000a0, 3, 5, 0, 0, -1 }, // top middle - /* 8*/ { 1, 1, 0, (void*)0x8007fb10, (void*)0x8007fb0c, 0x00ffc000, 0x000000a0, 3, 6, 0, 0, 500 }, // bottom middle - /* 9*/ { 1, 1, 0, (void*)0x8007fb08, (void*)0x8007fb04, 0x00ff0000, 0x000000a0, 1, 6, 0, 0, 120 }, // bottom left, smaller font - /*10*/ { 1, 1, 0, (void*)0x8007fb10, (void*)0x8007fb0c, 0x00ff0000, 0x000000a0, 1, 6, 0, 0, 240 }, // bottom left but longer duration - /*11*/ { 0, 0, 0, (void*)0x8007fb10, (void*)0x8007fb0c, 0x00ff0000, 0x000000a0, 3, 8, 0, 0, 120 }, // none + /* 0*/ { 1, 1, 0, (void *) &var8007fb10, (void *) &var8007fb0c, 0x00ff0000, 0x000000a0, 1, 6, 0, 0, 80 }, // bottom left + /* 1*/ { 0, 1, 0, (void *) &var8007fb18, (void *) &var8007fb14, 0x00ff0000, 0x000000a0, 3, 7, 0, 0, 120 }, // middle of screen, larger font, like objectives + /* 2*/ { 0, 0, 1, (void *) &var8007fb18, (void *) &var8007fb14, 0xff000000, 0xffffffa0, 3, 7, 0, 0, 120 }, // middle of screen, larger font, like objectives + /* 3*/ { 0, 1, 0, (void *) &var8007fb18, (void *) &var8007fb14, 0x00ff0000, 0x000000a0, 1, 6, 0, 0, 120 }, // bottom left, large font + /* 4*/ { 1, 1, 0, (void *) &var8007fb10, (void *) &var8007fb0c, 0x00ffc000, 0x000000a0, 1, 6, 0, 0, 40 }, // bottom left + /* 5*/ { 0, 0, 0, (void *) &var8007fb18, (void *) &var8007fb14, 0x00ff0000, 0x000000a0, 1, 5, 0, 0, 120 }, // top left, large font + /* 6*/ { 1, 0, 0, (void *) &var8007fb10, (void *) &var8007fb0c, 0x00ff0000, 0x000000a0, 3, 5, 0, 0, 120 }, // top middle + /* 7*/ { 1, 1, 0, (void *) &var8007fb10, (void *) &var8007fb0c, 0x00ff0000, 0x000000a0, 3, 5, 0, 0, -1 }, // top middle + /* 8*/ { 1, 1, 0, (void *) &var8007fb10, (void *) &var8007fb0c, 0x00ffc000, 0x000000a0, 3, 6, 0, 0, 500 }, // bottom middle + /* 9*/ { 1, 1, 0, (void *) &var8007fb08, (void *) &var8007fb04, 0x00ff0000, 0x000000a0, 1, 6, 0, 0, 120 }, // bottom left, smaller font + /*10*/ { 1, 1, 0, (void *) &var8007fb10, (void *) &var8007fb0c, 0x00ff0000, 0x000000a0, 1, 6, 0, 0, 240 }, // bottom left but longer duration + /*11*/ { 0, 0, 0, (void *) &var8007fb10, (void *) &var8007fb0c, 0x00ff0000, 0x000000a0, 3, 8, 0, 0, 120 }, // none }; u32 var80071170 = 0x2e3b213f; @@ -839,8 +839,8 @@ glabel hudRenderZoomRange /* f0dd2a0: afa500c4 */ sw $a1,0xc4($sp) /* f0dd2a4: 0c002f40 */ jal 0xbd00 /* f0dd2a8: afa200bc */ sw $v0,0xbc($sp) -/* f0dd2ac: 3c108008 */ lui $s0,0x8008 -/* f0dd2b0: 2610fac0 */ addiu $s0,$s0,-1344 +/* f0dd2ac: 3c108008 */ lui $s0,%hi(g_ScreenWidthMultiplier) +/* f0dd2b0: 2610fac0 */ addiu $s0,$s0,%lo(g_ScreenWidthMultiplier) /* f0dd2b4: 8e0e0000 */ lw $t6,0x0($s0) /* f0dd2b8: 004e001a */ div $zero,$v0,$t6 /* f0dd2bc: 00007812 */ mflo $t7 @@ -876,10 +876,10 @@ glabel hudRenderZoomRange /* f0dd324: afa900b4 */ sw $t1,0xb4($sp) /* f0dd328: 0c002f26 */ jal 0xbc98 /* f0dd32c: 00000000 */ nop -/* f0dd330: 3c06800a */ lui $a2,0x800a +/* f0dd330: 3c06800a */ lui $a2,%hi(g_Vars) /* f0dd334: 3c013f80 */ lui $at,0x3f80 /* f0dd338: 44812000 */ mtc1 $at,$f4 -/* f0dd33c: 24c69fc0 */ addiu $a2,$a2,-24640 +/* f0dd33c: 24c69fc0 */ addiu $a2,$a2,%lo(g_Vars) /* f0dd340: 8ccb0284 */ lw $t3,0x284($a2) /* f0dd344: 8faa00bc */ lw $t2,0xbc($sp) /* f0dd348: 8ccd006c */ lw $t5,0x6c($a2) @@ -920,8 +920,8 @@ glabel hudRenderZoomRange /* f0dd3c0: afa50054 */ sw $a1,0x54($sp) /* f0dd3c4: 0fc24211 */ jal 0xf090844 /* f0dd3c8: afa70050 */ sw $a3,0x50($sp) -/* f0dd3cc: 3c06800a */ lui $a2,0x800a -/* f0dd3d0: 24c69fc0 */ addiu $a2,$a2,-24640 +/* f0dd3cc: 3c06800a */ lui $a2,%hi(g_Vars) +/* f0dd3d0: 24c69fc0 */ addiu $a2,$a2,%lo(g_Vars) /* f0dd3d4: 8fa30058 */ lw $v1,0x58($sp) /* f0dd3d8: 8fa4005c */ lw $a0,0x5c($sp) /* f0dd3dc: 8fa50054 */ lw $a1,0x54($sp) @@ -934,17 +934,17 @@ glabel hudRenderZoomRange /* f0dd3f4: 01271021 */ addu $v0,$t1,$a3 /* f0dd3f8: 24010002 */ addiu $at,$zero,0x2 /* f0dd3fc: 14410012 */ bne $v0,$at,.L0f0dd448_2 -/* f0dd400: 3c0a8009 */ lui $t2,0x8009 -/* f0dd404: 914a0af0 */ lbu $t2,0xaf0($t2) +/* f0dd400: 3c0a8009 */ lui $t2,%hi(g_Is4Mb) +/* f0dd404: 914a0af0 */ lbu $t2,%lo(g_Is4Mb)($t2) /* f0dd408: 24010001 */ addiu $at,$zero,0x1 /* f0dd40c: 1141000a */ beq $t2,$at,.L0f0dd438_2 /* f0dd410: 00000000 */ nop /* f0dd414: 0fc54b41 */ jal 0xf152d04 /* f0dd418: 00000000 */ nop -/* f0dd41c: 3c06800a */ lui $a2,0x800a +/* f0dd41c: 3c06800a */ lui $a2,%hi(g_Vars) /* f0dd420: 24010001 */ addiu $at,$zero,0x1 /* f0dd424: 10410006 */ beq $v0,$at,.L0f0dd440_2 -/* f0dd428: 24c69fc0 */ addiu $a2,$a2,-24640 +/* f0dd428: 24c69fc0 */ addiu $a2,$a2,%lo(g_Vars) /* f0dd42c: 8ccb028c */ lw $t3,0x28c($a2) /* f0dd430: 15600003 */ bnez $t3,.L0f0dd440_2 /* f0dd434: 00000000 */ nop @@ -977,8 +977,8 @@ glabel hudRenderZoomRange /* f0dd488: 0fc2c536 */ jal 0xf0b14d8 /* f0dd48c: 00000000 */ nop /* f0dd490: 44803000 */ mtc1 $zero,$f6 -/* f0dd494: 3c06800a */ lui $a2,0x800a -/* f0dd498: 24c69fc0 */ addiu $a2,$a2,-24640 +/* f0dd494: 3c06800a */ lui $a2,%hi(g_Vars) +/* f0dd498: 24c69fc0 */ addiu $a2,$a2,%lo(g_Vars) /* f0dd49c: 46060032 */ c.eq.s $f0,$f6 /* f0dd4a0: 8ccd0284 */ lw $t5,0x284($a2) /* f0dd4a4: 3c014270 */ lui $at,0x4270 @@ -1021,10 +1021,10 @@ glabel hudRenderZoomRange /* f0dd528: f7a80010 */ sdc1 $f8,0x10($sp) /* f0dd52c: 0c004dad */ jal 0x136b4 /* f0dd530: 27a40084 */ addiu $a0,$sp,0x84 -/* f0dd534: 3c0f8008 */ lui $t7,0x8008 -/* f0dd538: 8deffafc */ lw $t7,-0x504($t7) -/* f0dd53c: 3c078008 */ lui $a3,0x8008 -/* f0dd540: 8ce7fb00 */ lw $a3,-0x500($a3) +/* f0dd534: 3c0f8008 */ lui $t7,%hi(var8007fafc) +/* f0dd538: 8deffafc */ lw $t7,%lo(var8007fafc)($t7) +/* f0dd53c: 3c078008 */ lui $a3,%hi(var8007fb00) +/* f0dd540: 8ce7fb00 */ lw $a3,%lo(var8007fb00)($a3) /* f0dd544: 27a4006c */ addiu $a0,$sp,0x6c /* f0dd548: 27a50070 */ addiu $a1,$sp,0x70 /* f0dd54c: 27a60084 */ addiu $a2,$sp,0x84 @@ -1058,14 +1058,14 @@ glabel hudRenderZoomRange /* f0dd5bc: a7a2004c */ sh $v0,0x4c($sp) /* f0dd5c0: 8fa300c4 */ lw $v1,0xc4($sp) /* f0dd5c4: 240100ff */ addiu $at,$zero,0xff -/* f0dd5c8: 3c0d8008 */ lui $t5,0x8008 +/* f0dd5c8: 3c0d8008 */ lui $t5,%hi(var8007fb00) /* f0dd5cc: 00037880 */ sll $t7,$v1,0x2 /* f0dd5d0: 01e37821 */ addu $t7,$t7,$v1 /* f0dd5d4: 000f7940 */ sll $t7,$t7,0x5 /* f0dd5d8: 01e1001b */ divu $zero,$t7,$at -/* f0dd5dc: 3c0e8008 */ lui $t6,0x8008 -/* f0dd5e0: 8dcefafc */ lw $t6,-0x504($t6) -/* f0dd5e4: 8dadfb00 */ lw $t5,-0x500($t5) +/* f0dd5dc: 3c0e8008 */ lui $t6,%hi(var8007fafc) +/* f0dd5e0: 8dcefafc */ lw $t6,%lo(var8007fafc)($t6) +/* f0dd5e4: 8dadfb00 */ lw $t5,%lo(var8007fb00)($t5) /* f0dd5e8: 87aa004c */ lh $t2,0x4c($sp) /* f0dd5ec: 0000c012 */ mflo $t8 /* f0dd5f0: 3c0100ff */ lui $at,0xff @@ -1090,10 +1090,10 @@ glabel hudRenderZoomRange /* f0dd63c: 24a5dc54 */ addiu $a1,$a1,-9132 /* f0dd640: 0c004dad */ jal 0x136b4 /* f0dd644: 27a40084 */ addiu $a0,$sp,0x84 -/* f0dd648: 3c0b8008 */ lui $t3,0x8008 -/* f0dd64c: 8d6bfafc */ lw $t3,-0x504($t3) -/* f0dd650: 3c078008 */ lui $a3,0x8008 -/* f0dd654: 8ce7fb00 */ lw $a3,-0x500($a3) +/* f0dd648: 3c0b8008 */ lui $t3,%hi(var8007fafc) +/* f0dd64c: 8d6bfafc */ lw $t3,%lo(var8007fafc)($t3) +/* f0dd650: 3c078008 */ lui $a3,%hi(var8007fb00) +/* f0dd654: 8ce7fb00 */ lw $a3,%lo(var8007fb00)($a3) /* f0dd658: 27a4006c */ addiu $a0,$sp,0x6c /* f0dd65c: 27a50070 */ addiu $a1,$sp,0x70 /* f0dd660: 27a60084 */ addiu $a2,$sp,0x84 @@ -1122,10 +1122,10 @@ glabel hudRenderZoomRange /* f0dd6bc: afa200c0 */ sw $v0,0xc0($sp) /* f0dd6c0: 0c002f06 */ jal 0xbc18 /* f0dd6c4: a7a2004c */ sh $v0,0x4c($sp) -/* f0dd6c8: 3c098008 */ lui $t1,0x8008 -/* f0dd6cc: 3c0a8008 */ lui $t2,0x8008 -/* f0dd6d0: 8d4afafc */ lw $t2,-0x504($t2) -/* f0dd6d4: 8d29fb00 */ lw $t1,-0x500($t1) +/* f0dd6c8: 3c098008 */ lui $t1,%hi(var8007fb00) +/* f0dd6cc: 3c0a8008 */ lui $t2,%hi(var8007fafc) +/* f0dd6d0: 8d4afafc */ lw $t2,%lo(var8007fafc)($t2) +/* f0dd6d4: 8d29fb00 */ lw $t1,%lo(var8007fb00)($t1) /* f0dd6d8: 8fab0048 */ lw $t3,0x48($sp) /* f0dd6dc: 87ad004c */ lh $t5,0x4c($sp) /* f0dd6e0: 240c00a0 */ addiu $t4,$zero,0xa0 @@ -1154,10 +1154,10 @@ glabel hudRenderZoomRange /* f0dd73c: 24a5dc58 */ addiu $a1,$a1,-9128 /* f0dd740: 0c004dad */ jal 0x136b4 /* f0dd744: 27a40084 */ addiu $a0,$sp,0x84 -/* f0dd748: 3c0e8008 */ lui $t6,0x8008 -/* f0dd74c: 8dcefafc */ lw $t6,-0x504($t6) -/* f0dd750: 3c078008 */ lui $a3,0x8008 -/* f0dd754: 8ce7fb00 */ lw $a3,-0x500($a3) +/* f0dd748: 3c0e8008 */ lui $t6,%hi(var8007fafc) +/* f0dd74c: 8dcefafc */ lw $t6,%lo(var8007fafc)($t6) +/* f0dd750: 3c078008 */ lui $a3,%hi(var8007fb00) +/* f0dd754: 8ce7fb00 */ lw $a3,%lo(var8007fb00)($a3) /* f0dd758: 27a4006c */ addiu $a0,$sp,0x6c /* f0dd75c: 27a50070 */ addiu $a1,$sp,0x70 /* f0dd760: 27a60084 */ addiu $a2,$sp,0x84 @@ -1185,10 +1185,10 @@ glabel hudRenderZoomRange /* f0dd7b8: afa200c0 */ sw $v0,0xc0($sp) /* f0dd7bc: 0c002f06 */ jal 0xbc18 /* f0dd7c0: a7a2004c */ sh $v0,0x4c($sp) -/* f0dd7c4: 3c0a8008 */ lui $t2,0x8008 -/* f0dd7c8: 3c0b8008 */ lui $t3,0x8008 -/* f0dd7cc: 8d6bfafc */ lw $t3,-0x504($t3) -/* f0dd7d0: 8d4afb00 */ lw $t2,-0x500($t2) +/* f0dd7c4: 3c0a8008 */ lui $t2,%hi(var8007fb00) +/* f0dd7c8: 3c0b8008 */ lui $t3,%hi(var8007fafc) +/* f0dd7cc: 8d6bfafc */ lw $t3,%lo(var8007fafc)($t3) +/* f0dd7d0: 8d4afb00 */ lw $t2,%lo(var8007fb00)($t2) /* f0dd7d4: 8fac0048 */ lw $t4,0x48($sp) /* f0dd7d8: 87ae004c */ lh $t6,0x4c($sp) /* f0dd7dc: 240d00a0 */ addiu $t5,$zero,0xa0 diff --git a/src/game/game_0e0770.c b/src/game/game_0e0770.c index c2990548c..1112da216 100644 --- a/src/game/game_0e0770.c +++ b/src/game/game_0e0770.c @@ -779,8 +779,8 @@ glabel func0f0e0dac /* f0e1224: 468042a0 */ cvt.s.w $f10,$f8 /* f0e1228: e7aa0098 */ swc1 $f10,0x98($sp) .L0f0e122c: -/* f0e122c: 3c018006 */ lui $at,0x8006 -/* f0e1230: c4201630 */ lwc1 $f0,0x1630($at) +/* f0e122c: 3c018006 */ lui $at,%hi(var80061630) +/* f0e1230: c4201630 */ lwc1 $f0,%lo(var80061630)($at) /* f0e1234: 3c017f1b */ lui $at,%hi(var7f1adf08) /* f0e1238: c430df08 */ lwc1 $f16,%lo(var7f1adf08)($at) /* f0e123c: 24010030 */ addiu $at,$zero,0x30 @@ -1020,8 +1020,8 @@ glabel func0f0e0dac /* f0e15b4: 3c013f00 */ lui $at,0x3f00 /* f0e15b8: 44812000 */ mtc1 $at,$f4 /* f0e15bc: ae220004 */ sw $v0,0x4($s1) -/* f0e15c0: 3c018006 */ lui $at,0x8006 -/* f0e15c4: c4261630 */ lwc1 $f6,0x1630($at) +/* f0e15c0: 3c018006 */ lui $at,%hi(var80061630) +/* f0e15c4: c4261630 */ lwc1 $f6,%lo(var80061630)($at) /* f0e15c8: 8fac0118 */ lw $t4,0x118($sp) /* f0e15cc: 3c0eb100 */ lui $t6,0xb100 /* f0e15d0: 4606203c */ c.lt.s $f4,$f6 @@ -2432,8 +2432,8 @@ glabel func0f0e2aa4 /* f0e2ac4: 00004825 */ or $t1,$zero,$zero /* f0e2ac8: 3c0140c0 */ lui $at,0x40c0 /* f0e2acc: 44812000 */ mtc1 $at,$f4 -/* f0e2ad0: 3c018006 */ lui $at,0x8006 -/* f0e2ad4: c4261630 */ lwc1 $f6,0x1630($at) +/* f0e2ad0: 3c018006 */ lui $at,%hi(var80061630) +/* f0e2ad4: c4261630 */ lwc1 $f6,%lo(var80061630)($at) /* f0e2ad8: 3c014416 */ lui $at,0x4416 /* f0e2adc: 44815000 */ mtc1 $at,$f10 /* f0e2ae0: 46062202 */ mul.s $f8,$f4,$f6 @@ -2446,8 +2446,8 @@ glabel func0f0e2aa4 .L0f0e2afc: /* f0e2afc: 3c013f80 */ lui $at,0x3f80 /* f0e2b00: 44812000 */ mtc1 $at,$f4 -/* f0e2b04: 3c018006 */ lui $at,0x8006 -/* f0e2b08: c4261630 */ lwc1 $f6,0x1630($at) +/* f0e2b04: 3c018006 */ lui $at,%hi(var80061630) +/* f0e2b08: c4261630 */ lwc1 $f6,%lo(var80061630)($at) /* f0e2b0c: 3c0140c0 */ lui $at,0x40c0 /* f0e2b10: 44815000 */ mtc1 $at,$f10 /* f0e2b14: 46062201 */ sub.s $f8,$f4,$f6 @@ -3460,8 +3460,8 @@ glabel func0f0e39d0 /* f0e39d0: 27bdff48 */ addiu $sp,$sp,-184 /* f0e39d4: 3c017f1b */ lui $at,%hi(var7f1adf1c) /* f0e39d8: c424df1c */ lwc1 $f4,%lo(var7f1adf1c)($at) -/* f0e39dc: 3c018006 */ lui $at,0x8006 -/* f0e39e0: c4261630 */ lwc1 $f6,0x1630($at) +/* f0e39dc: 3c018006 */ lui $at,%hi(var80061630) +/* f0e39e0: c4261630 */ lwc1 $f6,%lo(var80061630)($at) /* f0e39e4: 3c02800a */ lui $v0,%hi(var8009de9c) /* f0e39e8: 2442de9c */ addiu $v0,$v0,%lo(var8009de9c) /* f0e39ec: 46062202 */ mul.s $f8,$f4,$f6 @@ -4399,8 +4399,8 @@ glabel func0f0e4190 /* f0e4814: 27bdff48 */ addiu $sp,$sp,-184 /* f0e4818: 3c017f1b */ lui $at,%hi(var7f1adf50) /* f0e481c: c424df50 */ lwc1 $f4,%lo(var7f1adf50)($at) -/* f0e4820: 3c018006 */ lui $at,0x8006 -/* f0e4824: c4261630 */ lwc1 $f6,0x1630($at) +/* f0e4820: 3c018006 */ lui $at,%hi(var80061630) +/* f0e4824: c4261630 */ lwc1 $f6,%lo(var80061630)($at) /* f0e4828: 3c02800a */ lui $v0,%hi(var8009de9c) /* f0e482c: 2442de9c */ addiu $v0,$v0,%lo(var8009de9c) /* f0e4830: 46062202 */ mul.s $f8,$f4,$f6 @@ -5093,8 +5093,8 @@ glabel func0f0e5000 /* f0e5260: 00000000 */ nop /* f0e5264: 0006000d */ break 0x6 .L0f0e5268: -/* f0e5268: 3c01800a */ lui $at,0x800a -/* f0e526c: c424a008 */ lwc1 $f4,-0x5ff8($at) +/* f0e5268: 3c01800a */ lui $at,%hi(g_Vars+0x48) +/* f0e526c: c424a008 */ lwc1 $f4,%lo(g_Vars+0x48)($at) /* f0e5270: c4720008 */ lwc1 $f18,0x8($v1) /* f0e5274: 46048182 */ mul.s $f6,$f16,$f4 /* f0e5278: 44802000 */ mtc1 $zero,$f4 diff --git a/src/game/game_0e5ce0.c b/src/game/game_0e5ce0.c index 9162f941f..d0dbeecd8 100644 --- a/src/game/game_0e5ce0.c +++ b/src/game/game_0e5ce0.c @@ -5906,7 +5906,7 @@ glabel var7f1b1e5c /* f0e75dc: 2419000b */ addiu $t9,$zero,0xb /* f0e75e0: 01c17824 */ and $t7,$t6,$at /* f0e75e4: 11e00009 */ beqz $t7,.L0f0e760c -/* f0e75e8: 3c018007 */ lui $at,0x8007 +/* f0e75e8: 3c018007 */ lui $at,%hi(var800711a8) /* f0e75ec: 24040014 */ addiu $a0,$zero,0x14 /* f0e75f0: 02202825 */ or $a1,$s1,$zero /* f0e75f4: 0040f809 */ jalr $v0 @@ -5916,7 +5916,7 @@ glabel var7f1b1e5c /* f0e7604: 10000002 */ b .L0f0e7610 /* f0e7608: ac3811a8 */ sw $t8,%lo(var800711a8)($at) .L0f0e760c: -/* f0e760c: ac3911a8 */ sw $t9,0x11a8($at) +/* f0e760c: ac3911a8 */ sw $t9,%lo(var800711a8)($at) .L0f0e7610: /* f0e7610: 92220000 */ lbu $v0,0x0($s1) /* f0e7614: 2401000c */ addiu $at,$zero,0xc @@ -6857,7 +6857,7 @@ glabel func0f0e8290 /* f0e837c: 8fbf003c */ lw $ra,0x3c($sp) /* f0e8380: 8e2d0004 */ lw $t5,0x4($s1) /* f0e8384: 2418000b */ addiu $t8,$zero,0xb -/* f0e8388: 3c018007 */ lui $at,0x8007 +/* f0e8388: 3c018007 */ lui $at,%hi(var800711a8) /* f0e838c: 000d7280 */ sll $t6,$t5,0xa /* f0e8390: 05c10009 */ bgez $t6,.L0f0e83b8 /* f0e8394: 24040014 */ addiu $a0,$zero,0x14 @@ -6870,7 +6870,7 @@ glabel func0f0e8290 /* f0e83b0: 10000003 */ b .L0f0e83c0 /* f0e83b4: ac2f11a8 */ sw $t7,%lo(var800711a8)($at) .L0f0e83b8: -/* f0e83b8: ac3811a8 */ sw $t8,0x11a8($at) +/* f0e83b8: ac3811a8 */ sw $t8,%lo(var800711a8)($at) /* f0e83bc: a7b200a6 */ sh $s2,0xa6($sp) .L0f0e83c0: /* f0e83c0: 8e390010 */ lw $t9,0x10($s1) @@ -8539,7 +8539,7 @@ glabel func0f0e98ac /* f0e9ba0: 27a400c0 */ addiu $a0,$sp,0xc0 /* f0e9ba4: 27a500c4 */ addiu $a1,$sp,0xc4 /* f0e9ba8: 11a00141 */ beqz $t5,.L0f0ea0b0 -/* f0e9bac: 3c078008 */ lui $a3,0x8008 +/* f0e9bac: 3c078008 */ lui $a3,%hi(g_Stages+0x33f) /* f0e9bb0: 0fc255a1 */ jal objectiveGetStatus /* f0e9bb4: 8fa40138 */ lw $a0,0x138($sp) /* f0e9bb8: 10400007 */ beqz $v0,.L0f0e9bd8 @@ -8744,7 +8744,7 @@ glabel func0f0e98ac /* f0e9eb8: 8fa7005c */ lw $a3,0x5c($sp) /* f0e9ebc: 8fa30054 */ lw $v1,0x54($sp) /* f0e9ec0: 24c80001 */ addiu $t0,$a2,0x1 -/* f0e9ec4: 24e7ffff */ addiu $a3,$a3,-1 +/* f0e9ec4: 24e7ffff */ addiu $a3,$a3,%lo(g_Stages+0x33f) /* f0e9ec8: afa70058 */ sw $a3,0x58($sp) /* f0e9ecc: afa80010 */ sw $t0,0x10($sp) /* f0e9ed0: afa80048 */ sw $t0,0x48($sp) @@ -11094,8 +11094,8 @@ glabel func0f0ebec8 /* f0ec124: 00000000 */ nop /* f0ec128: 460e1281 */ sub.s $f10,$f2,$f14 /* f0ec12c: 44812000 */ mtc1 $at,$f4 -/* f0ec130: 3c01800a */ lui $at,0x800a -/* f0ec134: c4269fc4 */ lwc1 $f6,-0x603c($at) +/* f0ec130: 3c01800a */ lui $at,%hi(g_Vars+0x4) +/* f0ec134: c4269fc4 */ lwc1 $f6,%lo(g_Vars+0x4)($at) /* f0ec138: 46045082 */ mul.s $f2,$f10,$f4 /* f0ec13c: 00000000 */ nop /* f0ec140: 46061082 */ mul.s $f2,$f2,$f6 @@ -12261,10 +12261,10 @@ glabel func0f0ed264 /* f0ed300: 000c6080 */ sll $t4,$t4,0x2 /* f0ed304: 018b6021 */ addu $t4,$t4,$t3 /* f0ed308: 000c60c0 */ sll $t4,$t4,0x3 -/* f0ed30c: 3c0d800a */ lui $t5,0x800a +/* f0ed30c: 3c0d800a */ lui $t5,%hi(g_Menus) /* f0ed310: 018b6023 */ subu $t4,$t4,$t3 /* f0ed314: 000c6100 */ sll $t4,$t4,0x4 -/* f0ed318: 25ade000 */ addiu $t5,$t5,-8192 +/* f0ed318: 25ade000 */ addiu $t5,$t5,%lo(g_Menus) /* f0ed31c: 000f7080 */ sll $t6,$t7,0x2 /* f0ed320: 018d1821 */ addu $v1,$t4,$t5 /* f0ed324: 01cf7021 */ addu $t6,$t6,$t7 @@ -12360,8 +12360,8 @@ glabel func0f0ed264 /* f0ed46c: 2418fff6 */ addiu $t8,$zero,-10 /* f0ed470: 46020201 */ sub.s $f8,$f0,$f2 /* f0ed474: 44815000 */ mtc1 $at,$f10 -/* f0ed478: 3c01800a */ lui $at,0x800a -/* f0ed47c: c4309fc4 */ lwc1 $f16,-0x603c($at) +/* f0ed478: 3c01800a */ lui $at,%hi(g_Vars+0x4) +/* f0ed47c: c4309fc4 */ lwc1 $f16,%lo(g_Vars+0x4)($at) /* f0ed480: 460a4003 */ div.s $f0,$f8,$f10 /* f0ed484: 46100002 */ mul.s $f0,$f0,$f16 /* f0ed488: 04430006 */ bgezl $v0,.L0f0ed4a4 @@ -13568,8 +13568,8 @@ glabel func0f0ee574 /* f0ee5c0: 80990009 */ lb $t9,0x9($a0) /* f0ee5c4: 46020201 */ sub.s $f8,$f0,$f2 /* f0ee5c8: 44815000 */ mtc1 $at,$f10 -/* f0ee5cc: 3c01800a */ lui $at,0x800a -/* f0ee5d0: c4309fc4 */ lwc1 $f16,-0x603c($at) +/* f0ee5cc: 3c01800a */ lui $at,%hi(g_Vars+0x4) +/* f0ee5d0: c4309fc4 */ lwc1 $f16,%lo(g_Vars+0x4)($at) /* f0ee5d4: 460a4003 */ div.s $f0,$f8,$f10 /* f0ee5d8: 46100002 */ mul.s $f0,$f0,$f16 /* f0ee5dc: 04630006 */ bgezl $v1,.L0f0ee5f8 @@ -14423,8 +14423,8 @@ glabel func0f0ef200 /* f0ef264: 80c80009 */ lb $t0,0x9($a2) /* f0ef268: 46020201 */ sub.s $f8,$f0,$f2 /* f0ef26c: 44815000 */ mtc1 $at,$f10 -/* f0ef270: 3c01800a */ lui $at,0x800a -/* f0ef274: c4309fc4 */ lwc1 $f16,-0x603c($at) +/* f0ef270: 3c01800a */ lui $at,%hi(g_Vars+0x4) +/* f0ef274: c4309fc4 */ lwc1 $f16,%lo(g_Vars+0x4)($at) /* f0ef278: 460a4003 */ div.s $f0,$f8,$f10 /* f0ef27c: 46100002 */ mul.s $f0,$f0,$f16 /* f0ef280: 04430006 */ bgezl $v0,.L0f0ef29c @@ -14767,8 +14767,8 @@ glabel func0f0ef4bc GLOBAL_ASM( glabel func0f0ef758 -/* f0ef758: 3c018006 */ lui $at,0x8006 -/* f0ef75c: c4241630 */ lwc1 $f4,0x1630($at) +/* f0ef758: 3c018006 */ lui $at,%hi(var80061630) +/* f0ef75c: c4241630 */ lwc1 $f4,%lo(var80061630)($at) /* f0ef760: 3c014080 */ lui $at,0x4080 /* f0ef764: 44814000 */ mtc1 $at,$f8 /* f0ef768: 46002187 */ neg.s $f6,$f4 @@ -15311,9 +15311,9 @@ glabel menuRenderItemController /* f0effa0: 24c61448 */ addiu $a2,$a2,%lo(g_MpPlayerNum) /* f0effa4: 8cce0000 */ lw $t6,0x0($a2) /* f0effa8: 24080e70 */ addiu $t0,$zero,0xe70 -/* f0effac: 3c05800a */ lui $a1,0x800a +/* f0effac: 3c05800a */ lui $a1,%hi(g_Menus) /* f0effb0: 01c80019 */ multu $t6,$t0 -/* f0effb4: 24a5e000 */ addiu $a1,$a1,-8192 +/* f0effb4: 24a5e000 */ addiu $a1,$a1,%lo(g_Menus) /* f0effb8: 92020002 */ lbu $v0,0x2($s0) /* f0effbc: 8fa70068 */ lw $a3,0x68($sp) /* f0effc0: 00007812 */ mflo $t7 diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index 7f3d4ee2d..82eae5da9 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -327,7 +327,7 @@ const u32 var7f1b23e0[] = {0xffffff7f}; const u32 var7f1b23e4[] = {0xffffffff}; const u32 var7f1b23e8[] = {0x544d0000}; char *g_StringPointer = g_CheatMarqueeString; -char *g_StringPointer2 = (char *)0x8009df3d; +char *g_StringPointer2 = &g_CheatMarqueeString[125]; s32 g_MpPlayerNum = 0; GLOBAL_ASM( @@ -1830,9 +1830,9 @@ glabel func0f0f1ef4 /* f0f1f60: 00006025 */ or $t4,$zero,$zero /* f0f1f64: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f0f1f68: 1a200068 */ blez $s1,.L0f0f210c -/* f0f1f6c: 3c19800a */ lui $t9,0x800a +/* f0f1f6c: 3c19800a */ lui $t9,%hi(g_Menus) /* f0f1f70: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f0f1f74: 2739e000 */ addiu $t9,$t9,-8192 +/* f0f1f74: 2739e000 */ addiu $t9,$t9,%lo(g_Menus) /* f0f1f78: 2410000a */ addiu $s0,$zero,0xa /* f0f1f7c: 000fc0c0 */ sll $t8,$t7,0x3 /* f0f1f80: 030fc023 */ subu $t8,$t8,$t7 @@ -2126,8 +2126,8 @@ glabel func0f0f2354 /* f0f2384: 0058082a */ slt $at,$v0,$t8 /* f0f2388: 10200051 */ beqz $at,.L0f0f24d0 /* f0f238c: 240d000a */ addiu $t5,$zero,0xa -/* f0f2390: 3c0b800a */ lui $t3,0x800a -/* f0f2394: 256be000 */ addiu $t3,$t3,-8192 +/* f0f2390: 3c0b800a */ lui $t3,%hi(g_Menus) +/* f0f2394: 256be000 */ addiu $t3,$t3,%lo(g_Menus) .L0f0f2398: /* f0f2398: 004d0019 */ multu $v0,$t5 /* f0f239c: 8d990000 */ lw $t9,0x0($t4) @@ -2217,8 +2217,8 @@ glabel func0f0f2354 /* f0f24dc: ace30000 */ sw $v1,0x0($a3) /* f0f24e0: 006d0019 */ multu $v1,$t5 /* f0f24e4: 8d990000 */ lw $t9,0x0($t4) -/* f0f24e8: 3c0b800a */ lui $t3,0x800a -/* f0f24ec: 256be000 */ addiu $t3,$t3,-8192 +/* f0f24e8: 3c0b800a */ lui $t3,%hi(g_Menus) +/* f0f24ec: 256be000 */ addiu $t3,$t3,%lo(g_Menus) /* f0f24f0: 001970c0 */ sll $t6,$t9,0x3 /* f0f24f4: 01d97023 */ subu $t6,$t6,$t9 /* f0f24f8: 000e7080 */ sll $t6,$t6,0x2 @@ -2369,7 +2369,7 @@ glabel func0f0f26fc /* f0f26fc: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f0f2700: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) /* f0f2704: 27bdffa0 */ addiu $sp,$sp,-96 -/* f0f2708: 3c18800a */ lui $t8,0x800a +/* f0f2708: 3c18800a */ lui $t8,%hi(g_Menus) /* f0f270c: 000e78c0 */ sll $t7,$t6,0x3 /* f0f2710: 01ee7823 */ subu $t7,$t7,$t6 /* f0f2714: 000f7880 */ sll $t7,$t7,0x2 @@ -2379,7 +2379,7 @@ glabel func0f0f26fc /* f0f2724: 01ee7823 */ subu $t7,$t7,$t6 /* f0f2728: 000f7900 */ sll $t7,$t7,0x4 /* f0f272c: 01054021 */ addu $t0,$t0,$a1 -/* f0f2730: 2718e000 */ addiu $t8,$t8,-8192 +/* f0f2730: 2718e000 */ addiu $t8,$t8,%lo(g_Menus) /* f0f2734: 01f81821 */ addu $v1,$t7,$t8 /* f0f2738: 00084040 */ sll $t0,$t0,0x1 /* f0f273c: 00681021 */ addu $v0,$v1,$t0 @@ -2432,8 +2432,8 @@ glabel func0f0f26fc .L0f0f27f4: /* f0f27f4: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f0f27f8: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f0f27fc: 3c19800a */ lui $t9,0x800a -/* f0f2800: 2739e000 */ addiu $t9,$t9,-8192 +/* f0f27fc: 3c19800a */ lui $t9,%hi(g_Menus) +/* f0f2800: 2739e000 */ addiu $t9,$t9,%lo(g_Menus) /* f0f2804: 000fc0c0 */ sll $t8,$t7,0x3 /* f0f2808: 030fc023 */ subu $t8,$t8,$t7 /* f0f280c: 0018c080 */ sll $t8,$t8,0x2 @@ -2589,8 +2589,8 @@ glabel func0f0f29cc /* f0f2a10: 27a70058 */ addiu $a3,$sp,0x58 /* f0f2a14: 8fa5005c */ lw $a1,0x5c($sp) /* f0f2a18: 3c168007 */ lui $s6,%hi(g_MpPlayerNum) -/* f0f2a1c: 3c15800a */ lui $s5,0x800a -/* f0f2a20: 26b5e000 */ addiu $s5,$s5,-8192 +/* f0f2a1c: 3c15800a */ lui $s5,%hi(g_Menus) +/* f0f2a20: 26b5e000 */ addiu $s5,$s5,%lo(g_Menus) /* f0f2a24: 26d61448 */ addiu $s6,$s6,%lo(g_MpPlayerNum) /* f0f2a28: 241e0014 */ addiu $s8,$zero,0x14 /* f0f2a2c: 2417000a */ addiu $s7,$zero,0xa @@ -2847,10 +2847,10 @@ glabel var7f1b2928 /* f0f2d90: 0c004b70 */ jal random /* f0f2d94: a238003c */ sb $t8,0x3c($s1) /* f0f2d98: 44824000 */ mtc1 $v0,$f8 -/* f0f2d9c: 3c03800a */ lui $v1,0x800a +/* f0f2d9c: 3c03800a */ lui $v1,%hi(g_Menus) /* f0f2da0: 3c058007 */ lui $a1,%hi(g_MpPlayerNum) /* f0f2da4: 24a51448 */ addiu $a1,$a1,%lo(g_MpPlayerNum) -/* f0f2da8: 2463e000 */ addiu $v1,$v1,-8192 +/* f0f2da8: 2463e000 */ addiu $v1,$v1,%lo(g_Menus) /* f0f2dac: 24060e70 */ addiu $a2,$zero,0xe70 /* f0f2db0: 04410005 */ bgez $v0,.L0f0f2dc8 /* f0f2db4: 468042a0 */ cvt.s.w $f10,$f8 @@ -2982,9 +2982,9 @@ glabel menuPushDialog /* f0f2f84: 26b51448 */ addiu $s5,$s5,%lo(g_MpPlayerNum) /* f0f2f88: 8eaf0000 */ lw $t7,0x0($s5) /* f0f2f8c: 24160e70 */ addiu $s6,$zero,0xe70 -/* f0f2f90: 3c14800a */ lui $s4,0x800a +/* f0f2f90: 3c14800a */ lui $s4,%hi(g_Menus) /* f0f2f94: 01f60019 */ multu $t7,$s6 -/* f0f2f98: 2694e000 */ addiu $s4,$s4,-8192 +/* f0f2f98: 2694e000 */ addiu $s4,$s4,%lo(g_Menus) /* f0f2f9c: 0000c012 */ mflo $t8 /* f0f2fa0: 02982021 */ addu $a0,$s4,$t8 /* f0f2fa4: 0fc3cde9 */ jal func0f0f37a4 @@ -3250,8 +3250,8 @@ glabel func0f0f3220 /* f0f326c: 0441fffa */ bgez $v0,.L0f0f3258 /* f0f3270: 2463f190 */ addiu $v1,$v1,-3696 /* f0f3274: 8ce20000 */ lw $v0,0x0($a3) -/* f0f3278: 3c18800a */ lui $t8,0x800a -/* f0f327c: 2718e000 */ addiu $t8,$t8,-8192 +/* f0f3278: 3c18800a */ lui $t8,%hi(g_Menus) +/* f0f327c: 2718e000 */ addiu $t8,$t8,%lo(g_Menus) /* f0f3280: 000278c0 */ sll $t7,$v0,0x3 /* f0f3284: 01e27823 */ subu $t7,$t7,$v0 /* f0f3288: 000f7880 */ sll $t7,$t7,0x2 @@ -3345,7 +3345,7 @@ glabel func0f0f33bc /* f0f33bc: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f0f33c0: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) /* f0f33c4: 27bdffa0 */ addiu $sp,$sp,-96 -/* f0f33c8: 3c18800a */ lui $t8,0x800a +/* f0f33c8: 3c18800a */ lui $t8,%hi(g_Menus) /* f0f33cc: 000e78c0 */ sll $t7,$t6,0x3 /* f0f33d0: 01ee7823 */ subu $t7,$t7,$t6 /* f0f33d4: 000f7880 */ sll $t7,$t7,0x2 @@ -3354,7 +3354,7 @@ glabel func0f0f33bc /* f0f33e0: 01ee7823 */ subu $t7,$t7,$t6 /* f0f33e4: afb1001c */ sw $s1,0x1c($sp) /* f0f33e8: 000f7900 */ sll $t7,$t7,0x4 -/* f0f33ec: 2718e000 */ addiu $t8,$t8,-8192 +/* f0f33ec: 2718e000 */ addiu $t8,$t8,%lo(g_Menus) /* f0f33f0: 01f88821 */ addu $s1,$t7,$t8 /* f0f33f4: 862304f4 */ lh $v1,0x4f4($s1) /* f0f33f8: afbf002c */ sw $ra,0x2c($sp) @@ -3396,8 +3396,8 @@ glabel func0f0f33bc /* f0f3480: afa00050 */ sw $zero,0x50($sp) /* f0f3484: 3c0a8007 */ lui $t2,%hi(g_MpPlayerNum) /* f0f3488: 8d4a1448 */ lw $t2,%lo(g_MpPlayerNum)($t2) -/* f0f348c: 3c0c800a */ lui $t4,0x800a -/* f0f3490: 258ce000 */ addiu $t4,$t4,-8192 +/* f0f348c: 3c0c800a */ lui $t4,%hi(g_Menus) +/* f0f3490: 258ce000 */ addiu $t4,$t4,%lo(g_Menus) /* f0f3494: 000a58c0 */ sll $t3,$t2,0x3 /* f0f3498: 016a5823 */ subu $t3,$t3,$t2 /* f0f349c: 000b5880 */ sll $t3,$t3,0x2 @@ -3441,8 +3441,8 @@ glabel func0f0f33bc /* f0f3528: ae2e081c */ sw $t6,0x81c($s1) /* f0f352c: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f0f3530: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) -/* f0f3534: 3c09800a */ lui $t1,0x800a -/* f0f3538: 2529e000 */ addiu $t1,$t1,-8192 +/* f0f3534: 3c09800a */ lui $t1,%hi(g_Menus) +/* f0f3538: 2529e000 */ addiu $t1,$t1,%lo(g_Menus) /* f0f353c: 001940c0 */ sll $t0,$t9,0x3 /* f0f3540: 01194023 */ subu $t0,$t0,$t9 /* f0f3544: 00084080 */ sll $t0,$t0,0x2 @@ -3469,8 +3469,8 @@ glabel func0f0f33bc /* f0f3590: 00000000 */ nop /* f0f3594: 3c0a8007 */ lui $t2,%hi(g_MpPlayerNum) /* f0f3598: 8d4a1448 */ lw $t2,%lo(g_MpPlayerNum)($t2) -/* f0f359c: 3c0c800a */ lui $t4,0x800a -/* f0f35a0: 258ce000 */ addiu $t4,$t4,-8192 +/* f0f359c: 3c0c800a */ lui $t4,%hi(g_Menus) +/* f0f35a0: 258ce000 */ addiu $t4,$t4,%lo(g_Menus) /* f0f35a4: 000a58c0 */ sll $t3,$t2,0x3 /* f0f35a8: 016a5823 */ subu $t3,$t3,$t2 /* f0f35ac: 000b5880 */ sll $t3,$t3,0x2 @@ -4298,12 +4298,12 @@ glabel var7f1b2948 /* f0f4184: 3c01c2c8 */ lui $at,0xc2c8 .L0f0f4188: /* f0f4188: 8e0205b0 */ lw $v0,0x5b0($s0) -/* f0f418c: 3c01800a */ lui $at,0x800a +/* f0f418c: 3c01800a */ lui $at,%hi(g_Vars+0x4) /* f0f4190: 00027300 */ sll $t6,$v0,0xc /* f0f4194: 000e17c2 */ srl $v0,$t6,0x1f /* f0f4198: 10400093 */ beqz $v0,.L0f0f43e8 /* f0f419c: 00000000 */ nop -/* f0f41a0: c4289fc4 */ lwc1 $f8,-0x603c($at) +/* f0f41a0: c4289fc4 */ lwc1 $f8,%lo(g_Vars+0x4)($at) /* f0f41a4: 3c014220 */ lui $at,0x4220 /* f0f41a8: 44815000 */ mtc1 $at,$f10 /* f0f41ac: c6040564 */ lwc1 $f4,0x564($s0) @@ -5625,7 +5625,7 @@ glabel func0f0f5360 /* f0f5490: 8fa401bc */ lw $a0,0x1bc($sp) /* f0f5494: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f0f5498: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f0f549c: 3c0b800a */ lui $t3,0x800a +/* f0f549c: 3c0b800a */ lui $t3,%hi(g_Menus) /* f0f54a0: 3c018008 */ lui $at,%hi(var8007fb9c) /* f0f54a4: 000fc0c0 */ sll $t8,$t7,0x3 /* f0f54a8: 030fc023 */ subu $t8,$t8,$t7 @@ -5634,7 +5634,7 @@ glabel func0f0f5360 /* f0f54b4: 0018c0c0 */ sll $t8,$t8,0x3 /* f0f54b8: 030fc023 */ subu $t8,$t8,$t7 /* f0f54bc: 0018c100 */ sll $t8,$t8,0x4 -/* f0f54c0: 256be000 */ addiu $t3,$t3,-8192 +/* f0f54c0: 256be000 */ addiu $t3,$t3,%lo(g_Menus) /* f0f54c4: ac20fb9c */ sw $zero,%lo(var8007fb9c)($at) /* f0f54c8: 030b1821 */ addu $v1,$t8,$t3 /* f0f54cc: 8fa701ec */ lw $a3,0x1ec($sp) @@ -5663,8 +5663,8 @@ glabel func0f0f5360 /* f0f5528: adae0000 */ sw $t6,0x0($t5) /* f0f552c: 3c188007 */ lui $t8,%hi(g_MpPlayerNum) /* f0f5530: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f0f5534: 3c0d800a */ lui $t5,0x800a -/* f0f5538: 25ade000 */ addiu $t5,$t5,-8192 +/* f0f5534: 3c0d800a */ lui $t5,%hi(g_Menus) +/* f0f5538: 25ade000 */ addiu $t5,$t5,%lo(g_Menus) /* f0f553c: 001858c0 */ sll $t3,$t8,0x3 /* f0f5540: 01785823 */ subu $t3,$t3,$t8 /* f0f5544: 000b5880 */ sll $t3,$t3,0x2 @@ -5702,8 +5702,8 @@ glabel func0f0f5360 .L0f0f55bc: /* f0f55bc: 44813000 */ mtc1 $at,$f6 /* f0f55c0: 8fcd0298 */ lw $t5,0x298($s8) -/* f0f55c4: 3c01800a */ lui $at,0x800a -/* f0f55c8: c42819d0 */ lwc1 $f8,0x19d0($at) +/* f0f55c4: 3c01800a */ lui $at,%hi(g_MenuData+0x10) +/* f0f55c8: c42819d0 */ lwc1 $f8,%lo(g_MenuData+0x10)($at) /* f0f55cc: 05a10004 */ bgez $t5,.L0f0f55e0 /* f0f55d0: 46083001 */ sub.s $f0,$f6,$f8 /* f0f55d4: 8fd9029c */ lw $t9,0x29c($s8) @@ -6639,8 +6639,8 @@ glabel func0f0f5360 /* f0f6380: 8fa401e8 */ lw $a0,0x1e8($sp) /* f0f6384: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f0f6388: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) -/* f0f638c: 3c0d800a */ lui $t5,0x800a -/* f0f6390: 25ade000 */ addiu $t5,$t5,-8192 +/* f0f638c: 3c0d800a */ lui $t5,%hi(g_Menus) +/* f0f6390: 25ade000 */ addiu $t5,$t5,%lo(g_Menus) /* f0f6394: 001978c0 */ sll $t7,$t9,0x3 /* f0f6398: 01f97823 */ subu $t7,$t7,$t9 /* f0f639c: 000f7880 */ sll $t7,$t7,0x2 @@ -6671,8 +6671,8 @@ glabel func0f0f5360 /* f0f6400: ac4b0000 */ sw $t3,0x0($v0) /* f0f6404: ac4e0004 */ sw $t6,0x4($v0) /* f0f6408: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f0f640c: 3c0d800a */ lui $t5,0x800a -/* f0f6410: 25ade000 */ addiu $t5,$t5,-8192 +/* f0f640c: 3c0d800a */ lui $t5,%hi(g_Menus) +/* f0f6410: 25ade000 */ addiu $t5,$t5,%lo(g_Menus) /* f0f6414: 0018c8c0 */ sll $t9,$t8,0x3 /* f0f6418: 0338c823 */ subu $t9,$t9,$t8 /* f0f641c: 0019c880 */ sll $t9,$t9,0x2 @@ -7470,8 +7470,8 @@ glabel func0f0f5360 .L0f0f6fe4: /* f0f6fe4: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f0f6fe8: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f0f6fec: 3c18800a */ lui $t8,0x800a -/* f0f6ff0: 2718e000 */ addiu $t8,$t8,-8192 +/* f0f6fec: 3c18800a */ lui $t8,%hi(g_Menus) +/* f0f6ff0: 2718e000 */ addiu $t8,$t8,%lo(g_Menus) /* f0f6ff4: 000f58c0 */ sll $t3,$t7,0x3 /* f0f6ff8: 016f5823 */ subu $t3,$t3,$t7 /* f0f6ffc: 000b5880 */ sll $t3,$t3,0x2 @@ -8130,14 +8130,14 @@ glabel var7f1b2990 /* f0f78ac: 27ff1448 */ addiu $ra,$ra,%lo(g_MpPlayerNum) /* f0f78b0: 8ff90000 */ lw $t9,0x0($ra) /* f0f78b4: 90580017 */ lbu $t8,0x17($v0) -/* f0f78b8: 3c0d800a */ lui $t5,0x800a +/* f0f78b8: 3c0d800a */ lui $t5,%hi(g_Menus) /* f0f78bc: 001970c0 */ sll $t6,$t9,0x3 /* f0f78c0: 01d97023 */ subu $t6,$t6,$t9 /* f0f78c4: 000e7080 */ sll $t6,$t6,0x2 /* f0f78c8: 01d97021 */ addu $t6,$t6,$t9 /* f0f78cc: 000e70c0 */ sll $t6,$t6,0x3 /* f0f78d0: 01d97023 */ subu $t6,$t6,$t9 -/* f0f78d4: 25ade000 */ addiu $t5,$t5,-8192 +/* f0f78d4: 25ade000 */ addiu $t5,$t5,%lo(g_Menus) /* f0f78d8: 000e7100 */ sll $t6,$t6,0x4 /* f0f78dc: 01ae7821 */ addu $t7,$t5,$t6 /* f0f78e0: 1f000004 */ bgtz $t8,.L0f0f78f4 @@ -8305,8 +8305,8 @@ glabel var7f1b2990 /* f0f7b00: 3c1f8007 */ lui $ra,%hi(g_MpPlayerNum) /* f0f7b04: 27ff1448 */ addiu $ra,$ra,%lo(g_MpPlayerNum) /* f0f7b08: 8ff80000 */ lw $t8,0x0($ra) -/* f0f7b0c: 3c0d800a */ lui $t5,0x800a -/* f0f7b10: 25ade000 */ addiu $t5,$t5,-8192 +/* f0f7b0c: 3c0d800a */ lui $t5,%hi(g_Menus) +/* f0f7b10: 25ade000 */ addiu $t5,$t5,%lo(g_Menus) /* f0f7b14: 0018c8c0 */ sll $t9,$t8,0x3 /* f0f7b18: 0338c823 */ subu $t9,$t9,$t8 /* f0f7b1c: 0019c880 */ sll $t9,$t9,0x2 @@ -8506,10 +8506,10 @@ glabel var7f1b2990 /* f0f7de8: 0fc54bcd */ jal optionsGetScreenSplit /* f0f7dec: 00000000 */ nop /* f0f7df0: 24080001 */ addiu $t0,$zero,0x1 -/* f0f7df4: 3c0d800a */ lui $t5,0x800a +/* f0f7df4: 3c0d800a */ lui $t5,%hi(g_Menus) /* f0f7df8: 3c1f8007 */ lui $ra,%hi(g_MpPlayerNum) /* f0f7dfc: 27ff1448 */ addiu $ra,$ra,%lo(g_MpPlayerNum) -/* f0f7e00: 25ade000 */ addiu $t5,$t5,-8192 +/* f0f7e00: 25ade000 */ addiu $t5,$t5,%lo(g_Menus) /* f0f7e04: 8fab0038 */ lw $t3,0x38($sp) /* f0f7e08: 11020005 */ beq $t0,$v0,.L0f0f7e20 /* f0f7e0c: 8fac0040 */ lw $t4,0x40($sp) @@ -8679,8 +8679,8 @@ GLOBAL_ASM( glabel func0f0f8040 /* f0f8040: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f0f8044: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f0f8048: 3c18800a */ lui $t8,0x800a -/* f0f804c: 2718e000 */ addiu $t8,$t8,-8192 +/* f0f8048: 3c18800a */ lui $t8,%hi(g_Menus) +/* f0f804c: 2718e000 */ addiu $t8,$t8,%lo(g_Menus) /* f0f8050: 000e78c0 */ sll $t7,$t6,0x3 /* f0f8054: 01ee7823 */ subu $t7,$t7,$t6 /* f0f8058: 000f7880 */ sll $t7,$t7,0x2 @@ -8868,11 +8868,11 @@ glabel var7f1b29f8 /* f0f8348: 000f7880 */ sll $t7,$t7,0x2 /* f0f834c: 01ee7821 */ addu $t7,$t7,$t6 /* f0f8350: 000f78c0 */ sll $t7,$t7,0x3 -/* f0f8354: 3c18800a */ lui $t8,0x800a +/* f0f8354: 3c18800a */ lui $t8,%hi(g_Menus) /* f0f8358: 01ee7823 */ subu $t7,$t7,$t6 /* f0f835c: 907905d5 */ lbu $t9,0x5d5($v1) /* f0f8360: 000f7900 */ sll $t7,$t7,0x4 -/* f0f8364: 2718e000 */ addiu $t8,$t8,-8192 +/* f0f8364: 2718e000 */ addiu $t8,$t8,%lo(g_Menus) /* f0f8368: 01f81021 */ addu $v0,$t7,$t8 /* f0f836c: 904b083b */ lbu $t3,0x83b($v0) /* f0f8370: 3329ff7f */ andi $t1,$t9,0xff7f @@ -8900,8 +8900,8 @@ glabel var7f1b29f8 /* f0f83c8: ac6e0000 */ sw $t6,0x0($v1) /* f0f83cc: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f0f83d0: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f0f83d4: 3c19800a */ lui $t9,0x800a -/* f0f83d8: 2739e000 */ addiu $t9,$t9,-8192 +/* f0f83d4: 3c19800a */ lui $t9,%hi(g_Menus) +/* f0f83d8: 2739e000 */ addiu $t9,$t9,%lo(g_Menus) /* f0f83dc: 000fc0c0 */ sll $t8,$t7,0x3 /* f0f83e0: 030fc023 */ subu $t8,$t8,$t7 /* f0f83e4: 0018c080 */ sll $t8,$t8,0x2 @@ -8917,7 +8917,7 @@ glabel var7f1b29f8 .L0f0f840c: /* f0f840c: 3c0b8007 */ lui $t3,%hi(g_MpPlayerNum) /* f0f8410: 8d6b1448 */ lw $t3,%lo(g_MpPlayerNum)($t3) -/* f0f8414: 3c0d800a */ lui $t5,0x800a +/* f0f8414: 3c0d800a */ lui $t5,%hi(g_Menus) /* f0f8418: 24aeffff */ addiu $t6,$a1,-1 /* f0f841c: 000b60c0 */ sll $t4,$t3,0x3 /* f0f8420: 018b6023 */ subu $t4,$t4,$t3 @@ -8927,7 +8927,7 @@ glabel var7f1b29f8 /* f0f8430: 018b6023 */ subu $t4,$t4,$t3 /* f0f8434: 000c6100 */ sll $t4,$t4,0x4 /* f0f8438: 2dc1000d */ sltiu $at,$t6,0xd -/* f0f843c: 25ade000 */ addiu $t5,$t5,-8192 +/* f0f843c: 25ade000 */ addiu $t5,$t5,%lo(g_Menus) /* f0f8440: 018d1021 */ addu $v0,$t4,$t5 /* f0f8444: 10200009 */ beqz $at,.L0f0f846c /* f0f8448: 00a03025 */ or $a2,$a1,$zero @@ -9097,7 +9097,7 @@ glabel func0f0f86a8 /* f0f86a8: 3c038007 */ lui $v1,%hi(g_MpPlayerNum) /* f0f86ac: 8c631448 */ lw $v1,%lo(g_MpPlayerNum)($v1) /* f0f86b0: 27bdff68 */ addiu $sp,$sp,-152 -/* f0f86b4: 3c0f800a */ lui $t7,0x800a +/* f0f86b4: 3c0f800a */ lui $t7,%hi(g_Menus) /* f0f86b8: 000370c0 */ sll $t6,$v1,0x3 /* f0f86bc: 01c37023 */ subu $t6,$t6,$v1 /* f0f86c0: 000e7080 */ sll $t6,$t6,0x2 @@ -9106,7 +9106,7 @@ glabel func0f0f86a8 /* f0f86cc: 01c37023 */ subu $t6,$t6,$v1 /* f0f86d0: afb10030 */ sw $s1,0x30($sp) /* f0f86d4: 000e7100 */ sll $t6,$t6,0x4 -/* f0f86d8: 25efe000 */ addiu $t7,$t7,-8192 +/* f0f86d8: 25efe000 */ addiu $t7,$t7,%lo(g_Menus) /* f0f86dc: afb0002c */ sw $s0,0x2c($sp) /* f0f86e0: 01cf8821 */ addu $s1,$t6,$t7 /* f0f86e4: 8e3004f8 */ lw $s0,0x4f8($s1) @@ -9167,8 +9167,8 @@ glabel func0f0f86a8 /* f0f87b0: ac39de98 */ sw $t9,%lo(var8009de98)($at) /* f0f87b4: 3c0b8007 */ lui $t3,%hi(g_MpPlayerNum) /* f0f87b8: 8d6b1448 */ lw $t3,%lo(g_MpPlayerNum)($t3) -/* f0f87bc: 3c0c800a */ lui $t4,0x800a -/* f0f87c0: 258ce000 */ addiu $t4,$t4,-8192 +/* f0f87bc: 3c0c800a */ lui $t4,%hi(g_Menus) +/* f0f87c0: 258ce000 */ addiu $t4,$t4,%lo(g_Menus) /* f0f87c4: 000b50c0 */ sll $t2,$t3,0x3 /* f0f87c8: 014b5023 */ subu $t2,$t2,$t3 /* f0f87cc: 000a5080 */ sll $t2,$t2,0x2 @@ -9201,8 +9201,8 @@ glabel func0f0f86a8 /* f0f8830: 02002825 */ or $a1,$s0,$zero /* f0f8834: 3c0a8007 */ lui $t2,%hi(g_MpPlayerNum) /* f0f8838: 8d4a1448 */ lw $t2,%lo(g_MpPlayerNum)($t2) -/* f0f883c: 3c0f800a */ lui $t7,0x800a -/* f0f8840: 25efe000 */ addiu $t7,$t7,-8192 +/* f0f883c: 3c0f800a */ lui $t7,%hi(g_Menus) +/* f0f8840: 25efe000 */ addiu $t7,$t7,%lo(g_Menus) /* f0f8844: 000a60c0 */ sll $t4,$t2,0x3 /* f0f8848: 018a6023 */ subu $t4,$t4,$t2 /* f0f884c: 000c6080 */ sll $t4,$t4,0x2 @@ -9230,10 +9230,10 @@ glabel func0f0f86a8 /* f0f88a0: 000a50c0 */ sll $t2,$t2,0x3 /* f0f88a4: 01435023 */ subu $t2,$t2,$v1 /* f0f88a8: 000a5100 */ sll $t2,$t2,0x4 -/* f0f88ac: 3c0f800a */ lui $t7,0x800a +/* f0f88ac: 3c0f800a */ lui $t7,%hi(g_Menus) /* f0f88b0: 00024880 */ sll $t1,$v0,0x2 /* f0f88b4: 01224823 */ subu $t1,$t1,$v0 -/* f0f88b8: 25efe000 */ addiu $t7,$t7,-8192 +/* f0f88b8: 25efe000 */ addiu $t7,$t7,%lo(g_Menus) /* f0f88bc: 254c0464 */ addiu $t4,$t2,0x464 /* f0f88c0: 44800000 */ mtc1 $zero,$f0 /* f0f88c4: 018f4021 */ addu $t0,$t4,$t7 @@ -9279,8 +9279,8 @@ glabel func0f0f86a8 /* f0f894c: 00003825 */ or $a3,$zero,$zero /* f0f8950: 3c188007 */ lui $t8,%hi(g_MpPlayerNum) /* f0f8954: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f0f8958: 3c0d800a */ lui $t5,0x800a -/* f0f895c: 25ade000 */ addiu $t5,$t5,-8192 +/* f0f8958: 3c0d800a */ lui $t5,%hi(g_Menus) +/* f0f895c: 25ade000 */ addiu $t5,$t5,%lo(g_Menus) /* f0f8960: 001870c0 */ sll $t6,$t8,0x3 /* f0f8964: 01d87023 */ subu $t6,$t6,$t8 /* f0f8968: 000e7080 */ sll $t6,$t6,0x2 @@ -9300,8 +9300,8 @@ glabel func0f0f86a8 /* f0f899c: 00003825 */ or $a3,$zero,$zero /* f0f89a0: 3c0b8007 */ lui $t3,%hi(g_MpPlayerNum) /* f0f89a4: 8d6b1448 */ lw $t3,%lo(g_MpPlayerNum)($t3) -/* f0f89a8: 3c0c800a */ lui $t4,0x800a -/* f0f89ac: 258ce000 */ addiu $t4,$t4,-8192 +/* f0f89a8: 3c0c800a */ lui $t4,%hi(g_Menus) +/* f0f89ac: 258ce000 */ addiu $t4,$t4,%lo(g_Menus) /* f0f89b0: 000b50c0 */ sll $t2,$t3,0x3 /* f0f89b4: 014b5023 */ subu $t2,$t2,$t3 /* f0f89b8: 000a5080 */ sll $t2,$t2,0x2 @@ -9599,10 +9599,10 @@ glabel var7f1b2a0c /* f0f8dc4: 8ca5a2d4 */ lw $a1,%lo(g_Vars+0x314)($a1) .L0f0f8dc8: /* f0f8dc8: 3c04800a */ lui $a0,%hi(g_Vars+0x4b4) -/* f0f8dcc: 3c02800a */ lui $v0,0x800a +/* f0f8dcc: 3c02800a */ lui $v0,%hi(g_Menus) /* f0f8dd0: 3c03800a */ lui $v1,%hi(g_MenuData) /* f0f8dd4: 246319c0 */ addiu $v1,$v1,%lo(g_MenuData) -/* f0f8dd8: 2442e000 */ addiu $v0,$v0,-8192 +/* f0f8dd8: 2442e000 */ addiu $v0,$v0,%lo(g_Menus) /* f0f8ddc: 8c84a474 */ lw $a0,%lo(g_Vars+0x4b4)($a0) .L0f0f8de0: /* f0f8de0: 24420e70 */ addiu $v0,$v0,0xe70 @@ -9711,14 +9711,14 @@ glabel var7f1b2a0c /* f0f8f5c: e6320538 */ swc1 $f18,0x538($s1) .L0f0f8f60: /* f0f8f60: 922a05d5 */ lbu $t2,0x5d5($s1) -/* f0f8f64: 3c02800a */ lui $v0,0x800a +/* f0f8f64: 3c02800a */ lui $v0,%hi(g_Menus) /* f0f8f68: 3c03800a */ lui $v1,%hi(g_MenuData) /* f0f8f6c: 314bfff7 */ andi $t3,$t2,0xfff7 /* f0f8f70: 44800000 */ mtc1 $zero,$f0 /* f0f8f74: a22005d4 */ sb $zero,0x5d4($s1) /* f0f8f78: a22b05d5 */ sb $t3,0x5d5($s1) /* f0f8f7c: 246319c0 */ addiu $v1,$v1,%lo(g_MenuData) -/* f0f8f80: 2442e000 */ addiu $v0,$v0,-8192 +/* f0f8f80: 2442e000 */ addiu $v0,$v0,%lo(g_Menus) /* f0f8f84: 2404ffff */ addiu $a0,$zero,-1 .L0f0f8f88: /* f0f8f88: 24420e70 */ addiu $v0,$v0,0xe70 @@ -9777,8 +9777,8 @@ glabel func0f0f9030 /* f0f9048: 24150e70 */ addiu $s5,$zero,0xe70 /* f0f904c: 01d50019 */ multu $t6,$s5 /* f0f9050: afb30020 */ sw $s3,0x20($sp) -/* f0f9054: 3c13800a */ lui $s3,0x800a -/* f0f9058: 2673e000 */ addiu $s3,$s3,-8192 +/* f0f9054: 3c13800a */ lui $s3,%hi(g_Menus) +/* f0f9058: 2673e000 */ addiu $s3,$s3,%lo(g_Menus) /* f0f905c: afbf002c */ sw $ra,0x2c($sp) /* f0f9060: afb2001c */ sw $s2,0x1c($sp) /* f0f9064: afb10018 */ sw $s1,0x18($sp) @@ -10033,7 +10033,7 @@ glabel var7f1b2a64 /* f0f935c: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f0f9360: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) /* f0f9364: 27bdfee0 */ addiu $sp,$sp,-288 -/* f0f9368: 3c18800a */ lui $t8,0x800a +/* f0f9368: 3c18800a */ lui $t8,%hi(g_Menus) /* f0f936c: 000e78c0 */ sll $t7,$t6,0x3 /* f0f9370: 01ee7823 */ subu $t7,$t7,$t6 /* f0f9374: 000f7880 */ sll $t7,$t7,0x2 @@ -10041,7 +10041,7 @@ glabel var7f1b2a64 /* f0f937c: 000f78c0 */ sll $t7,$t7,0x3 /* f0f9380: 01ee7823 */ subu $t7,$t7,$t6 /* f0f9384: 000f7900 */ sll $t7,$t7,0x4 -/* f0f9388: 2718e000 */ addiu $t8,$t8,-8192 +/* f0f9388: 2718e000 */ addiu $t8,$t8,%lo(g_Menus) /* f0f938c: 01f81021 */ addu $v0,$t7,$t8 /* f0f9390: 8c590e40 */ lw $t9,0xe40($v0) /* f0f9394: afbf0044 */ sw $ra,0x44($sp) @@ -10081,8 +10081,8 @@ glabel var7f1b2a64 /* f0f9418: a2200004 */ sb $zero,0x4($s1) /* f0f941c: 3c0b8007 */ lui $t3,%hi(g_MpPlayerNum) /* f0f9420: 8d6b1448 */ lw $t3,%lo(g_MpPlayerNum)($t3) -/* f0f9424: 3c0d800a */ lui $t5,0x800a -/* f0f9428: 25ade000 */ addiu $t5,$t5,-8192 +/* f0f9424: 3c0d800a */ lui $t5,%hi(g_Menus) +/* f0f9428: 25ade000 */ addiu $t5,$t5,%lo(g_Menus) /* f0f942c: 000b60c0 */ sll $t4,$t3,0x3 /* f0f9430: 018b6023 */ subu $t4,$t4,$t3 /* f0f9434: 000c6080 */ sll $t4,$t4,0x2 @@ -10992,8 +10992,8 @@ glabel var7f1b2a64 /* f0fa118: 5500006a */ bnezl $t0,.L0f0fa2c4 /* f0fa11c: 8fd00008 */ lw $s0,0x8($s8) /* f0fa120: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) -/* f0fa124: 3c0c800a */ lui $t4,0x800a -/* f0fa128: 258ce000 */ addiu $t4,$t4,-8192 +/* f0fa124: 3c0c800a */ lui $t4,%hi(g_Menus) +/* f0fa128: 258ce000 */ addiu $t4,$t4,%lo(g_Menus) /* f0fa12c: 000950c0 */ sll $t2,$t1,0x3 /* f0fa130: 01495023 */ subu $t2,$t2,$t1 /* f0fa134: 000a5080 */ sll $t2,$t2,0x2 @@ -11265,8 +11265,8 @@ glabel var7f1b2a64 /* f0fa504: a3000001 */ sb $zero,0x1($t8) /* f0fa508: a3000000 */ sb $zero,0x0($t8) /* f0fa50c: 8d081448 */ lw $t0,%lo(g_MpPlayerNum)($t0) -/* f0fa510: 3c09800a */ lui $t1,0x800a -/* f0fa514: 2529e000 */ addiu $t1,$t1,-8192 +/* f0fa510: 3c09800a */ lui $t1,%hi(g_Menus) +/* f0fa514: 2529e000 */ addiu $t1,$t1,%lo(g_Menus) /* f0fa518: 000850c0 */ sll $t2,$t0,0x3 /* f0fa51c: 01485023 */ subu $t2,$t2,$t0 /* f0fa520: 000a5080 */ sll $t2,$t2,0x2 @@ -11313,10 +11313,10 @@ glabel func0f0fa574 /* f0fa5b0: 01ee7821 */ addu $t7,$t7,$t6 /* f0fa5b4: 90830005 */ lbu $v1,0x5($a0) /* f0fa5b8: 000f78c0 */ sll $t7,$t7,0x3 -/* f0fa5bc: 3c18800a */ lui $t8,0x800a +/* f0fa5bc: 3c18800a */ lui $t8,%hi(g_Menus) /* f0fa5c0: 01ee7823 */ subu $t7,$t7,$t6 /* f0fa5c4: 000f7900 */ sll $t7,$t7,0x4 -/* f0fa5c8: 2718e000 */ addiu $t8,$t8,-8192 +/* f0fa5c8: 2718e000 */ addiu $t8,$t8,%lo(g_Menus) /* f0fa5cc: 0080a825 */ or $s5,$a0,$zero /* f0fa5d0: 01f89021 */ addu $s2,$t7,$t8 /* f0fa5d4: 1860002a */ blez $v1,.L0f0fa680 @@ -11432,8 +11432,8 @@ glabel var7f1b2ac8 /* f0fa71c: 241e0e70 */ addiu $s8,$zero,0xe70 /* f0fa720: 01de0019 */ multu $t6,$s8 /* f0fa724: afb60030 */ sw $s6,0x30($sp) -/* f0fa728: 3c16800a */ lui $s6,0x800a -/* f0fa72c: 26d6e000 */ addiu $s6,$s6,-8192 +/* f0fa728: 3c16800a */ lui $s6,%hi(g_Menus) +/* f0fa72c: 26d6e000 */ addiu $s6,$s6,%lo(g_Menus) /* f0fa730: 3c19800a */ lui $t9,%hi(g_MenuData+0x4) /* f0fa734: 8f3919c4 */ lw $t9,%lo(g_MenuData+0x4)($t9) /* f0fa738: afb5002c */ sw $s5,0x2c($sp) @@ -12374,8 +12374,8 @@ glabel var7f1b2ac8 /* f0fb3d8: 00000000 */ nop /* f0fb3dc: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f0fb3e0: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) -/* f0fb3e4: 3c0e800a */ lui $t6,0x800a -/* f0fb3e8: 25cee000 */ addiu $t6,$t6,-8192 +/* f0fb3e4: 3c0e800a */ lui $t6,%hi(g_Menus) +/* f0fb3e8: 25cee000 */ addiu $t6,$t6,%lo(g_Menus) /* f0fb3ec: 0019c0c0 */ sll $t8,$t9,0x3 /* f0fb3f0: 0319c023 */ subu $t8,$t8,$t9 /* f0fb3f4: 0018c080 */ sll $t8,$t8,0x2 @@ -14034,8 +14034,8 @@ glabel menuhandler000fcc34 /* f0fcc7c: 3c158007 */ lui $s5,%hi(menudialog_pakremoved) /* f0fcc80: 3c148007 */ lui $s4,%hi(g_PakRepairSuccessMenuDialog) /* f0fcc84: 3c128007 */ lui $s2,%hi(g_MpPlayerNum) -/* f0fcc88: 3c11800a */ lui $s1,0x800a -/* f0fcc8c: 2631e000 */ addiu $s1,$s1,-8192 +/* f0fcc88: 3c11800a */ lui $s1,%hi(g_Menus) +/* f0fcc8c: 2631e000 */ addiu $s1,$s1,%lo(g_Menus) /* f0fcc90: 26521448 */ addiu $s2,$s2,%lo(g_MpPlayerNum) /* f0fcc94: 269415b0 */ addiu $s4,$s4,%lo(g_PakRepairSuccessMenuDialog) /* f0fcc98: 26b51548 */ addiu $s5,$s5,%lo(menudialog_pakremoved) @@ -14097,8 +14097,8 @@ glabel menudialog000fcd48 /* f0fcd58: afa60020 */ sw $a2,0x20($sp) /* f0fcd5c: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f0fcd60: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f0fcd64: 3c18800a */ lui $t8,0x800a -/* f0fcd68: 2718e000 */ addiu $t8,$t8,-8192 +/* f0fcd64: 3c18800a */ lui $t8,%hi(g_Menus) +/* f0fcd68: 2718e000 */ addiu $t8,$t8,%lo(g_Menus) /* f0fcd6c: 000e78c0 */ sll $t7,$t6,0x3 /* f0fcd70: 01ee7823 */ subu $t7,$t7,$t6 /* f0fcd74: 000f7880 */ sll $t7,$t7,0x2 @@ -14164,8 +14164,8 @@ glabel func0f0fce8c /* f0fce98: 0305c021 */ addu $t8,$t8,$a1 /* f0fce9c: 0018c0c0 */ sll $t8,$t8,0x3 /* f0fcea0: 0305c023 */ subu $t8,$t8,$a1 -/* f0fcea4: 3c19800a */ lui $t9,0x800a -/* f0fcea8: 2739e000 */ addiu $t9,$t9,-8192 +/* f0fcea4: 3c19800a */ lui $t9,%hi(g_Menus) +/* f0fcea8: 2739e000 */ addiu $t9,$t9,%lo(g_Menus) /* f0fceac: 0018c100 */ sll $t8,$t8,0x4 /* f0fceb0: 3c088007 */ lui $t0,%hi(g_MpPlayerNum) /* f0fceb4: 03191021 */ addu $v0,$t8,$t9 @@ -14491,8 +14491,8 @@ glabel var7f1b2b10 /* f0fd388: 8fbf0014 */ lw $ra,0x14($sp) /* f0fd38c: 3c048007 */ lui $a0,%hi(g_MpPlayerNum) /* f0fd390: 8c841448 */ lw $a0,%lo(g_MpPlayerNum)($a0) -/* f0fd394: 3c19800a */ lui $t9,0x800a -/* f0fd398: 2739e000 */ addiu $t9,$t9,-8192 +/* f0fd394: 3c19800a */ lui $t9,%hi(g_Menus) +/* f0fd398: 2739e000 */ addiu $t9,$t9,%lo(g_Menus) /* f0fd39c: 0004c0c0 */ sll $t8,$a0,0x3 /* f0fd3a0: 0304c023 */ subu $t8,$t8,$a0 /* f0fd3a4: 0018c080 */ sll $t8,$t8,0x2 @@ -14623,8 +14623,8 @@ GLOBAL_ASM( glabel func0f0fd570 /* f0fd570: 3c028007 */ lui $v0,%hi(g_MpPlayerNum) /* f0fd574: 8c421448 */ lw $v0,%lo(g_MpPlayerNum)($v0) -/* f0fd578: 3c0f800a */ lui $t7,0x800a -/* f0fd57c: 25efe000 */ addiu $t7,$t7,-8192 +/* f0fd578: 3c0f800a */ lui $t7,%hi(g_Menus) +/* f0fd57c: 25efe000 */ addiu $t7,$t7,%lo(g_Menus) /* f0fd580: 000270c0 */ sll $t6,$v0,0x3 /* f0fd584: 01c27023 */ subu $t6,$t6,$v0 /* f0fd588: 000e7080 */ sll $t6,$t6,0x2 diff --git a/src/game/game_102240.c b/src/game/game_102240.c index aa1cb8cad..9f1b27a6e 100644 --- a/src/game/game_102240.c +++ b/src/game/game_102240.c @@ -3551,8 +3551,8 @@ glabel var7f1b2e04 /* f105c64: afa60020 */ sw $a2,0x20($sp) /* f105c68: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f105c6c: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f105c70: 3c18800a */ lui $t8,0x800a -/* f105c74: 2718e000 */ addiu $t8,$t8,-8192 +/* f105c70: 3c18800a */ lui $t8,%hi(g_Menus) +/* f105c74: 2718e000 */ addiu $t8,$t8,%lo(g_Menus) /* f105c78: 000e78c0 */ sll $t7,$t6,0x3 /* f105c7c: 01ee7823 */ subu $t7,$t7,$t6 /* f105c80: 000f7880 */ sll $t7,$t7,0x2 @@ -3563,7 +3563,7 @@ glabel var7f1b2e04 /* f105c94: 01f81021 */ addu $v0,$t7,$t8 /* f105c98: 8c4304f8 */ lw $v1,0x4f8($v0) /* f105c9c: 240800ff */ addiu $t0,$zero,0xff -/* f105ca0: 3c018007 */ lui $at,0x8007 +/* f105ca0: 3c018007 */ lui $at,%hi(var80072d88) /* f105ca4: 10600037 */ beqz $v1,.L0f105d84 /* f105ca8: 00000000 */ nop /* f105cac: 8c790000 */ lw $t9,0x0($v1) @@ -3577,8 +3577,8 @@ glabel var7f1b2e04 /* f105ccc: 01095023 */ subu $t2,$t0,$t1 /* f105cd0: ac4a0db4 */ sw $t2,0xdb4($v0) /* f105cd4: c4242e04 */ lwc1 $f4,%lo(var7f1b2e04)($at) -/* f105cd8: 3c018006 */ lui $at,0x8006 -/* f105cdc: c4261630 */ lwc1 $f6,0x1630($at) +/* f105cd8: 3c018006 */ lui $at,%hi(var80061630) +/* f105cdc: c4261630 */ lwc1 $f6,%lo(var80061630)($at) /* f105ce0: e4420d68 */ swc1 $f2,0xd68($v0) /* f105ce4: e4420d90 */ swc1 $f2,0xd90($v0) /* f105ce8: 46062002 */ mul.s $f0,$f4,$f6 @@ -3605,8 +3605,8 @@ glabel var7f1b2e04 /* f105d38: 8fbf0014 */ lw $ra,0x14($sp) .L0f105d3c: /* f105d3c: 8d8c1448 */ lw $t4,%lo(g_MpPlayerNum)($t4) -/* f105d40: 3c0e800a */ lui $t6,0x800a -/* f105d44: 25cee000 */ addiu $t6,$t6,-8192 +/* f105d40: 3c0e800a */ lui $t6,%hi(g_Menus) +/* f105d44: 25cee000 */ addiu $t6,$t6,%lo(g_Menus) /* f105d48: 000c68c0 */ sll $t5,$t4,0x3 /* f105d4c: 01ac6823 */ subu $t5,$t5,$t4 /* f105d50: 000d6880 */ sll $t5,$t5,0x2 @@ -3623,7 +3623,7 @@ glabel var7f1b2e04 /* f105d7c: 10000002 */ b .L0f105d88 /* f105d80: ac590db4 */ sw $t9,0xdb4($v0) .L0f105d84: -/* f105d84: a0282d88 */ sb $t0,0x2d88($at) +/* f105d84: a0282d88 */ sb $t0,%lo(var80072d88)($at) .L0f105d88: /* f105d88: 8fbf0014 */ lw $ra,0x14($sp) .L0f105d8c: diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c index 621fa4f11..3824baa6c 100644 --- a/src/game/game_107fb0.c +++ b/src/game/game_107fb0.c @@ -341,8 +341,8 @@ glabel var7f1b3564 /* f1084c4: afa60008 */ sw $a2,0x8($sp) /* f1084c8: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f1084cc: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f1084d0: 3c18800a */ lui $t8,0x800a -/* f1084d4: 2718e000 */ addiu $t8,$t8,-8192 +/* f1084d0: 3c18800a */ lui $t8,%hi(g_Menus) +/* f1084d4: 2718e000 */ addiu $t8,$t8,%lo(g_Menus) /* f1084d8: 000e78c0 */ sll $t7,$t6,0x3 /* f1084dc: 01ee7823 */ subu $t7,$t7,$t6 /* f1084e0: 000f7880 */ sll $t7,$t7,0x2 @@ -795,8 +795,8 @@ glabel var7f1b3624 /* f10899c: 00002825 */ or $a1,$zero,$zero /* f1089a0: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f1089a4: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f1089a8: 3c18800a */ lui $t8,0x800a -/* f1089ac: 2718e000 */ addiu $t8,$t8,-8192 +/* f1089a8: 3c18800a */ lui $t8,%hi(g_Menus) +/* f1089ac: 2718e000 */ addiu $t8,$t8,%lo(g_Menus) /* f1089b0: 000e78c0 */ sll $t7,$t6,0x3 /* f1089b4: 01ee7823 */ subu $t7,$t7,$t6 /* f1089b8: 000f7880 */ sll $t7,$t7,0x2 @@ -896,8 +896,8 @@ glabel var7f1b3664 /* f108a90: 00002825 */ or $a1,$zero,$zero /* f108a94: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f108a98: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f108a9c: 3c18800a */ lui $t8,0x800a -/* f108aa0: 2718e000 */ addiu $t8,$t8,-8192 +/* f108a9c: 3c18800a */ lui $t8,%hi(g_Menus) +/* f108aa0: 2718e000 */ addiu $t8,$t8,%lo(g_Menus) /* f108aa4: 000e78c0 */ sll $t7,$t6,0x3 /* f108aa8: 01ee7823 */ subu $t7,$t7,$t6 /* f108aac: 000f7880 */ sll $t7,$t7,0x2 @@ -1296,8 +1296,8 @@ glabel func0f109038 /* f1090e0: 15010019 */ bne $t0,$at,.L0f109148 /* f1090e4: 3c0d8007 */ lui $t5,%hi(g_MpPlayerNum) /* f1090e8: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) -/* f1090ec: 3c0b800a */ lui $t3,0x800a -/* f1090f0: 256be000 */ addiu $t3,$t3,-8192 +/* f1090ec: 3c0b800a */ lui $t3,%hi(g_Menus) +/* f1090f0: 256be000 */ addiu $t3,$t3,%lo(g_Menus) /* f1090f4: 000950c0 */ sll $t2,$t1,0x3 /* f1090f8: 01495023 */ subu $t2,$t2,$t1 /* f1090fc: 000a5080 */ sll $t2,$t2,0x2 @@ -1402,8 +1402,8 @@ glabel var7f1b36c8 .text /* f1091e0: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f1091e4: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f1091e8: 3c18800a */ lui $t8,0x800a -/* f1091ec: 2718e000 */ addiu $t8,$t8,-8192 +/* f1091e8: 3c18800a */ lui $t8,%hi(g_Menus) +/* f1091ec: 2718e000 */ addiu $t8,$t8,%lo(g_Menus) /* f1091f0: 000e78c0 */ sll $t7,$t6,0x3 /* f1091f4: 01ee7823 */ subu $t7,$t7,$t6 /* f1091f8: 000f7880 */ sll $t7,$t7,0x2 @@ -1482,8 +1482,8 @@ glabel var7f1b36c8 /* f109318: 24450e53 */ addiu $a1,$v0,0xe53 /* f10931c: 3c098007 */ lui $t1,%hi(g_MpPlayerNum) /* f109320: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) -/* f109324: 3c0c800a */ lui $t4,0x800a -/* f109328: 258ce000 */ addiu $t4,$t4,-8192 +/* f109324: 3c0c800a */ lui $t4,%hi(g_Menus) +/* f109328: 258ce000 */ addiu $t4,$t4,%lo(g_Menus) /* f10932c: 000968c0 */ sll $t5,$t1,0x3 /* f109330: 01a96823 */ subu $t5,$t5,$t1 /* f109334: 000d6880 */ sll $t5,$t5,0x2 @@ -1609,8 +1609,8 @@ glabel func0f1094e4 /* f1094f0: afbf0014 */ sw $ra,0x14($sp) /* f1094f4: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f1094f8: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f1094fc: 3c18800a */ lui $t8,0x800a -/* f109500: 2718e000 */ addiu $t8,$t8,-8192 +/* f1094fc: 3c18800a */ lui $t8,%hi(g_Menus) +/* f109500: 2718e000 */ addiu $t8,$t8,%lo(g_Menus) /* f109504: 000e78c0 */ sll $t7,$t6,0x3 /* f109508: 01ee7823 */ subu $t7,$t7,$t6 /* f10950c: 000f7880 */ sll $t7,$t7,0x2 @@ -1628,7 +1628,7 @@ glabel func0f1094e4 /* f109538: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f10953c: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) /* f109540: 8c8a0000 */ lw $t2,0x0($a0) -/* f109544: 3c09800a */ lui $t1,0x800a +/* f109544: 3c09800a */ lui $t1,%hi(g_Menus) /* f109548: 001940c0 */ sll $t0,$t9,0x3 /* f10954c: 01194023 */ subu $t0,$t0,$t9 /* f109550: 00084080 */ sll $t0,$t0,0x2 @@ -1636,7 +1636,7 @@ glabel func0f1094e4 /* f109558: 000840c0 */ sll $t0,$t0,0x3 /* f10955c: 01194023 */ subu $t0,$t0,$t9 /* f109560: 00084100 */ sll $t0,$t0,0x4 -/* f109564: 2529e000 */ addiu $t1,$t1,-8192 +/* f109564: 2529e000 */ addiu $t1,$t1,%lo(g_Menus) /* f109568: 01091021 */ addu $v0,$t0,$t1 /* f10956c: ac4a0e48 */ sw $t2,0xe48($v0) /* f109570: 948b0004 */ lhu $t3,0x4($a0) @@ -1648,8 +1648,8 @@ glabel func0f1094e4 /* f109588: 00402025 */ or $a0,$v0,$zero /* f10958c: 3c0c8007 */ lui $t4,%hi(g_MpPlayerNum) /* f109590: 8d8c1448 */ lw $t4,%lo(g_MpPlayerNum)($t4) -/* f109594: 3c0e800a */ lui $t6,0x800a -/* f109598: 25cee000 */ addiu $t6,$t6,-8192 +/* f109594: 3c0e800a */ lui $t6,%hi(g_Menus) +/* f109598: 25cee000 */ addiu $t6,$t6,%lo(g_Menus) /* f10959c: 000c68c0 */ sll $t5,$t4,0x3 /* f1095a0: 01ac6823 */ subu $t5,$t5,$t4 /* f1095a4: 000d6880 */ sll $t5,$t5,0x2 @@ -1672,8 +1672,8 @@ glabel func0f1094e4 /* f1095e4: 10400029 */ beqz $v0,.L0f10968c /* f1095e8: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f1095ec: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) -/* f1095f0: 3c09800a */ lui $t1,0x800a -/* f1095f4: 2529e000 */ addiu $t1,$t1,-8192 +/* f1095f0: 3c09800a */ lui $t1,%hi(g_Menus) +/* f1095f4: 2529e000 */ addiu $t1,$t1,%lo(g_Menus) /* f1095f8: 001940c0 */ sll $t0,$t9,0x3 /* f1095fc: 01194023 */ subu $t0,$t0,$t9 /* f109600: 00084080 */ sll $t0,$t0,0x2 @@ -1754,9 +1754,9 @@ glabel pakDeleteFile /* f109708: 24631448 */ addiu $v1,$v1,%lo(g_MpPlayerNum) /* f10970c: 8c790000 */ lw $t9,0x0($v1) /* f109710: 24050e70 */ addiu $a1,$zero,0xe70 -/* f109714: 3c02800a */ lui $v0,0x800a +/* f109714: 3c02800a */ lui $v0,%hi(g_Menus) /* f109718: 03250019 */ multu $t9,$a1 -/* f10971c: 2442e000 */ addiu $v0,$v0,-8192 +/* f10971c: 2442e000 */ addiu $v0,$v0,%lo(g_Menus) /* f109720: 3c0c8007 */ lui $t4,%hi(g_SaveLocations) /* f109724: 24180001 */ addiu $t8,$zero,0x1 /* f109728: 24120004 */ addiu $s2,$zero,0x4 @@ -2034,8 +2034,8 @@ glabel var7f1b3710 .text /* f109a68: 3c078007 */ lui $a3,%hi(g_MpPlayerNum) /* f109a6c: 8ce71448 */ lw $a3,%lo(g_MpPlayerNum)($a3) -/* f109a70: 3c0f800a */ lui $t7,0x800a -/* f109a74: 25efe000 */ addiu $t7,$t7,-8192 +/* f109a70: 3c0f800a */ lui $t7,%hi(g_Menus) +/* f109a74: 25efe000 */ addiu $t7,$t7,%lo(g_Menus) /* f109a78: 000770c0 */ sll $t6,$a3,0x3 /* f109a7c: 01c77023 */ subu $t6,$t6,$a3 /* f109a80: 000e7080 */ sll $t6,$t6,0x2 @@ -2352,8 +2352,8 @@ GLOBAL_ASM( glabel func0f109ec4 /* f109ec4: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f109ec8: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f109ecc: 3c18800a */ lui $t8,0x800a -/* f109ed0: 2718e000 */ addiu $t8,$t8,-8192 +/* f109ecc: 3c18800a */ lui $t8,%hi(g_Menus) +/* f109ed0: 2718e000 */ addiu $t8,$t8,%lo(g_Menus) /* f109ed4: 000e78c0 */ sll $t7,$t6,0x3 /* f109ed8: 01ee7823 */ subu $t7,$t7,$t6 /* f109edc: 000f7880 */ sll $t7,$t7,0x2 @@ -2388,8 +2388,8 @@ glabel func0f109ec4 /* f109f4c: 00000000 */ nop /* f109f50: 3c078007 */ lui $a3,%hi(g_MpPlayerNum) /* f109f54: 8ce71448 */ lw $a3,%lo(g_MpPlayerNum)($a3) -/* f109f58: 3c0f800a */ lui $t7,0x800a -/* f109f5c: 25efe000 */ addiu $t7,$t7,-8192 +/* f109f58: 3c0f800a */ lui $t7,%hi(g_Menus) +/* f109f5c: 25efe000 */ addiu $t7,$t7,%lo(g_Menus) /* f109f60: 000770c0 */ sll $t6,$a3,0x3 /* f109f64: 01c77023 */ subu $t6,$t6,$a3 /* f109f68: 000e7080 */ sll $t6,$t6,0x2 @@ -3342,9 +3342,9 @@ glabel menucustomFileToDelete /* f10ad9c: 25081448 */ addiu $t0,$t0,%lo(g_MpPlayerNum) /* f10ada0: 8d0e0000 */ lw $t6,0x0($t0) /* f10ada4: 24090e70 */ addiu $t1,$zero,0xe70 -/* f10ada8: 3c07800a */ lui $a3,0x800a +/* f10ada8: 3c07800a */ lui $a3,%hi(g_Menus) /* f10adac: 01c90019 */ multu $t6,$t1 -/* f10adb0: 24e7e000 */ addiu $a3,$a3,-8192 +/* f10adb0: 24e7e000 */ addiu $a3,$a3,%lo(g_Menus) /* f10adb4: 3c038007 */ lui $v1,%hi(g_SaveLocations) /* f10adb8: 24635bc0 */ addiu $v1,$v1,%lo(g_SaveLocations) /* f10adbc: 27bdffe0 */ addiu $sp,$sp,-32 @@ -3377,10 +3377,10 @@ glabel menucustomFileToDelete /* f10ae24: 0fc42a5f */ jal func0f10a97c /* f10ae28: afa6001c */ sw $a2,0x1c($sp) /* f10ae2c: 3c038007 */ lui $v1,%hi(g_SaveLocations) -/* f10ae30: 3c07800a */ lui $a3,0x800a +/* f10ae30: 3c07800a */ lui $a3,%hi(g_Menus) /* f10ae34: 3c088007 */ lui $t0,%hi(g_MpPlayerNum) /* f10ae38: 25081448 */ addiu $t0,$t0,%lo(g_MpPlayerNum) -/* f10ae3c: 24e7e000 */ addiu $a3,$a3,-8192 +/* f10ae3c: 24e7e000 */ addiu $a3,$a3,%lo(g_Menus) /* f10ae40: 24635bc0 */ addiu $v1,$v1,%lo(g_SaveLocations) /* f10ae44: 8fa6001c */ lw $a2,0x1c($sp) /* f10ae48: 10400011 */ beqz $v0,.L0f10ae90 @@ -3469,10 +3469,10 @@ glabel menucustomFileToCopy /* f10af70: ac480000 */ sw $t0,0x0($v0) /* f10af74: 94a90004 */ lhu $t1,0x4($a1) /* f10af78: 3c0a8007 */ lui $t2,%hi(g_MpPlayerNum) -/* f10af7c: 3c0d800a */ lui $t5,0x800a +/* f10af7c: 3c0d800a */ lui $t5,%hi(g_Menus) /* f10af80: a4490004 */ sh $t1,0x4($v0) /* f10af84: 8d4a1448 */ lw $t2,%lo(g_MpPlayerNum)($t2) -/* f10af88: 25ade000 */ addiu $t5,$t5,-8192 +/* f10af88: 25ade000 */ addiu $t5,$t5,%lo(g_Menus) /* f10af8c: 000a58c0 */ sll $t3,$t2,0x3 /* f10af90: 016a5823 */ subu $t3,$t3,$t2 /* f10af94: 000b5880 */ sll $t3,$t3,0x2 @@ -3521,8 +3521,8 @@ glabel menudialog0010b014 /* f10b028: afa60020 */ sw $a2,0x20($sp) /* f10b02c: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10b030: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10b034: 3c18800a */ lui $t8,0x800a -/* f10b038: 2718e000 */ addiu $t8,$t8,-8192 +/* f10b034: 3c18800a */ lui $t8,%hi(g_Menus) +/* f10b038: 2718e000 */ addiu $t8,$t8,%lo(g_Menus) /* f10b03c: 000e78c0 */ sll $t7,$t6,0x3 /* f10b040: 01ee7823 */ subu $t7,$t7,$t6 /* f10b044: 000f7880 */ sll $t7,$t7,0x2 @@ -3565,8 +3565,8 @@ GLOBAL_ASM( glabel func0f10b0c4 /* f10b0c4: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10b0c8: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10b0cc: 3c18800a */ lui $t8,0x800a -/* f10b0d0: 2718e000 */ addiu $t8,$t8,-8192 +/* f10b0cc: 3c18800a */ lui $t8,%hi(g_Menus) +/* f10b0d0: 2718e000 */ addiu $t8,$t8,%lo(g_Menus) /* f10b0d4: 000e78c0 */ sll $t7,$t6,0x3 /* f10b0d8: 01ee7823 */ subu $t7,$t7,$t6 /* f10b0dc: 000f7880 */ sll $t7,$t7,0x2 @@ -3610,8 +3610,8 @@ glabel menuhandler0010b14c /* f10b160: afa60030 */ sw $a2,0x30($sp) /* f10b164: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10b168: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10b16c: 3c18800a */ lui $t8,0x800a -/* f10b170: 2718e000 */ addiu $t8,$t8,-8192 +/* f10b16c: 3c18800a */ lui $t8,%hi(g_Menus) +/* f10b170: 2718e000 */ addiu $t8,$t8,%lo(g_Menus) /* f10b174: 000e78c0 */ sll $t7,$t6,0x3 /* f10b178: 01ee7823 */ subu $t7,$t7,$t6 /* f10b17c: 000f7880 */ sll $t7,$t7,0x2 @@ -3654,8 +3654,8 @@ glabel menuhandler0010b14c /* f10b210: 2447000e */ addiu $a3,$v0,0xe /* f10b214: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f10b218: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) -/* f10b21c: 3c0b800a */ lui $t3,0x800a -/* f10b220: 256be000 */ addiu $t3,$t3,-8192 +/* f10b21c: 3c0b800a */ lui $t3,%hi(g_Menus) +/* f10b220: 256be000 */ addiu $t3,$t3,%lo(g_Menus) /* f10b224: 001948c0 */ sll $t1,$t9,0x3 /* f10b228: 01394823 */ subu $t1,$t1,$t9 /* f10b22c: 00094880 */ sll $t1,$t1,0x2 @@ -3996,8 +3996,8 @@ glabel menudialog0010b674 /* f10b684: afa60028 */ sw $a2,0x28($sp) /* f10b688: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10b68c: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10b690: 3c18800a */ lui $t8,0x800a -/* f10b694: 2718e000 */ addiu $t8,$t8,-8192 +/* f10b690: 3c18800a */ lui $t8,%hi(g_Menus) +/* f10b694: 2718e000 */ addiu $t8,$t8,%lo(g_Menus) /* f10b698: 000e78c0 */ sll $t7,$t6,0x3 /* f10b69c: 01ee7823 */ subu $t7,$t7,$t6 /* f10b6a0: 000f7880 */ sll $t7,$t7,0x2 @@ -4021,7 +4021,7 @@ glabel menudialog0010b674 /* f10b6e8: afa2001c */ sw $v0,0x1c($sp) /* f10b6ec: 3c088007 */ lui $t0,%hi(g_MpPlayerNum) /* f10b6f0: 8d081448 */ lw $t0,%lo(g_MpPlayerNum)($t0) -/* f10b6f4: 3c0a800a */ lui $t2,0x800a +/* f10b6f4: 3c0a800a */ lui $t2,%hi(g_Menus) /* f10b6f8: 3c018007 */ lui $at,%hi(var80074a4c) /* f10b6fc: 000848c0 */ sll $t1,$t0,0x3 /* f10b700: 01284823 */ subu $t1,$t1,$t0 @@ -4030,7 +4030,7 @@ glabel menudialog0010b674 /* f10b70c: 000948c0 */ sll $t1,$t1,0x3 /* f10b710: 01284823 */ subu $t1,$t1,$t0 /* f10b714: 00094900 */ sll $t1,$t1,0x4 -/* f10b718: 254ae000 */ addiu $t2,$t2,-8192 +/* f10b718: 254ae000 */ addiu $t2,$t2,%lo(g_Menus) /* f10b71c: 8fa3001c */ lw $v1,0x1c($sp) /* f10b720: ac204a4c */ sw $zero,%lo(var80074a4c)($at) /* f10b724: 012a1021 */ addu $v0,$t1,$t2 @@ -4455,8 +4455,8 @@ glabel var7f1b385c /* f10bde0: 54790034 */ bnel $v1,$t9,.L0f10beb4 /* f10bde4: 910f030e */ lbu $t7,0x30e($t0) /* f10bde8: 8d6b1448 */ lw $t3,%lo(g_MpPlayerNum)($t3) -/* f10bdec: 3c0d800a */ lui $t5,0x800a -/* f10bdf0: 25ade000 */ addiu $t5,$t5,-8192 +/* f10bdec: 3c0d800a */ lui $t5,%hi(g_Menus) +/* f10bdf0: 25ade000 */ addiu $t5,$t5,%lo(g_Menus) /* f10bdf4: 000b60c0 */ sll $t4,$t3,0x3 /* f10bdf8: 018b6023 */ subu $t4,$t4,$t3 /* f10bdfc: 000c6080 */ sll $t4,$t4,0x2 @@ -4495,8 +4495,8 @@ glabel var7f1b385c /* f10be78: 24420018 */ addiu $v0,$v0,0x18 /* f10be7c: 3c0c8007 */ lui $t4,%hi(g_MpPlayerNum) /* f10be80: 8d8c1448 */ lw $t4,%lo(g_MpPlayerNum)($t4) -/* f10be84: 3c0e800a */ lui $t6,0x800a -/* f10be88: 25cee000 */ addiu $t6,$t6,-8192 +/* f10be84: 3c0e800a */ lui $t6,%hi(g_Menus) +/* f10be88: 25cee000 */ addiu $t6,$t6,%lo(g_Menus) /* f10be8c: 000c68c0 */ sll $t5,$t4,0x3 /* f10be90: 01ac6823 */ subu $t5,$t5,$t4 /* f10be94: 000d6880 */ sll $t5,$t5,0x2 @@ -5206,8 +5206,8 @@ GLOBAL_ASM( glabel func0f10c900 /* f10c900: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10c904: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10c908: 3c18800a */ lui $t8,0x800a -/* f10c90c: 2718e000 */ addiu $t8,$t8,-8192 +/* f10c908: 3c18800a */ lui $t8,%hi(g_Menus) +/* f10c90c: 2718e000 */ addiu $t8,$t8,%lo(g_Menus) /* f10c910: 000e78c0 */ sll $t7,$t6,0x3 /* f10c914: 01ee7823 */ subu $t7,$t7,$t6 /* f10c918: 000f7880 */ sll $t7,$t7,0x2 diff --git a/src/game/game_11f000.c b/src/game/game_11f000.c index 345984744..600accc7b 100644 --- a/src/game/game_11f000.c +++ b/src/game/game_11f000.c @@ -1294,13 +1294,13 @@ glabel var7f1b50c8 /* f12007c: c7ba05c8 */ lwc1 $f26,0x5c8($sp) /* f120080: 46189182 */ mul.s $f6,$f18,$f24 /* f120084: e7aa0458 */ swc1 $f10,0x458($sp) -/* f120088: 3c018008 */ lui $at,0x8008 +/* f120088: 3c018008 */ lui $at,%hi(var8007db80) /* f12008c: 46184282 */ mul.s $f10,$f8,$f24 /* f120090: e7a4045c */ swc1 $f4,0x45c($sp) /* f120094: c7a805c4 */ lwc1 $f8,0x5c4($sp) /* f120098: 4618a102 */ mul.s $f4,$f20,$f24 /* f12009c: e7a6046c */ swc1 $f6,0x46c($sp) -/* f1200a0: c420db80 */ lwc1 $f0,-0x2480($at) +/* f1200a0: c420db80 */ lwc1 $f0,%lo(var8007db80)($at) /* f1200a4: 4618b182 */ mul.s $f6,$f22,$f24 /* f1200a8: e7aa0470 */ swc1 $f10,0x470($sp) /* f1200ac: 24110004 */ addiu $s1,$zero,0x4 @@ -1361,13 +1361,13 @@ glabel var7f1b50c8 /* f120188: c7ba0598 */ lwc1 $f26,0x598($sp) /* f12018c: 46189182 */ mul.s $f6,$f18,$f24 /* f120190: e7aa0458 */ swc1 $f10,0x458($sp) -/* f120194: 3c018008 */ lui $at,0x8008 +/* f120194: 3c018008 */ lui $at,%hi(var8007db80) /* f120198: 46184282 */ mul.s $f10,$f8,$f24 /* f12019c: e7a4045c */ swc1 $f4,0x45c($sp) /* f1201a0: c7a80594 */ lwc1 $f8,0x594($sp) /* f1201a4: 4618a102 */ mul.s $f4,$f20,$f24 /* f1201a8: e7a6046c */ swc1 $f6,0x46c($sp) -/* f1201ac: c420db80 */ lwc1 $f0,-0x2480($at) +/* f1201ac: c420db80 */ lwc1 $f0,%lo(var8007db80)($at) /* f1201b0: 4618b182 */ mul.s $f6,$f22,$f24 /* f1201b4: e7aa0470 */ swc1 $f10,0x470($sp) /* f1201b8: 24110004 */ addiu $s1,$zero,0x4 @@ -1428,13 +1428,13 @@ glabel var7f1b50c8 /* f120294: c7ac05a4 */ lwc1 $f12,0x5a4($sp) /* f120298: 46187182 */ mul.s $f6,$f14,$f24 /* f12029c: e7aa0458 */ swc1 $f10,0x458($sp) -/* f1202a0: 3c018008 */ lui $at,0x8008 +/* f1202a0: 3c018008 */ lui $at,%hi(var8007db80) /* f1202a4: 46184282 */ mul.s $f10,$f8,$f24 /* f1202a8: e7a4045c */ swc1 $f4,0x45c($sp) /* f1202ac: c7a805a0 */ lwc1 $f8,0x5a0($sp) /* f1202b0: 46188102 */ mul.s $f4,$f16,$f24 /* f1202b4: e7a6046c */ swc1 $f6,0x46c($sp) -/* f1202b8: c420db80 */ lwc1 $f0,-0x2480($at) +/* f1202b8: c420db80 */ lwc1 $f0,%lo(var8007db80)($at) /* f1202bc: 46181182 */ mul.s $f6,$f2,$f24 /* f1202c0: e7aa0470 */ swc1 $f10,0x470($sp) /* f1202c4: 240a0001 */ addiu $t2,$zero,0x1 @@ -1497,13 +1497,13 @@ glabel var7f1b50c8 /* f1203a8: c7b405b0 */ lwc1 $f20,0x5b0($sp) /* f1203ac: 46181182 */ mul.s $f6,$f2,$f24 /* f1203b0: e7aa0458 */ swc1 $f10,0x458($sp) -/* f1203b4: 3c018008 */ lui $at,0x8008 +/* f1203b4: 3c018008 */ lui $at,%hi(var8007db80) /* f1203b8: 46184282 */ mul.s $f10,$f8,$f24 /* f1203bc: e7a4045c */ swc1 $f4,0x45c($sp) /* f1203c0: c7a805ac */ lwc1 $f8,0x5ac($sp) /* f1203c4: 46186102 */ mul.s $f4,$f12,$f24 /* f1203c8: e7a6046c */ swc1 $f6,0x46c($sp) -/* f1203cc: c420db80 */ lwc1 $f0,-0x2480($at) +/* f1203cc: c420db80 */ lwc1 $f0,%lo(var8007db80)($at) /* f1203d0: 46189182 */ mul.s $f6,$f18,$f24 /* f1203d4: e7aa0470 */ swc1 $f10,0x470($sp) /* f1203d8: 24110004 */ addiu $s1,$zero,0x4 @@ -1564,13 +1564,13 @@ glabel var7f1b50c8 /* f1204b4: c7b005bc */ lwc1 $f16,0x5bc($sp) /* f1204b8: 4618b182 */ mul.s $f6,$f22,$f24 /* f1204bc: e7aa0458 */ swc1 $f10,0x458($sp) -/* f1204c0: 3c018008 */ lui $at,0x8008 +/* f1204c0: 3c018008 */ lui $at,%hi(var8007db80) /* f1204c4: 46184282 */ mul.s $f10,$f8,$f24 /* f1204c8: e7a4045c */ swc1 $f4,0x45c($sp) /* f1204cc: c7a805b8 */ lwc1 $f8,0x5b8($sp) /* f1204d0: 4618d102 */ mul.s $f4,$f26,$f24 /* f1204d4: e7a6046c */ swc1 $f6,0x46c($sp) -/* f1204d8: c420db80 */ lwc1 $f0,-0x2480($at) +/* f1204d8: c420db80 */ lwc1 $f0,%lo(var8007db80)($at) /* f1204dc: 46187182 */ mul.s $f6,$f14,$f24 /* f1204e0: e7aa0470 */ swc1 $f10,0x470($sp) /* f1204e4: 24110004 */ addiu $s1,$zero,0x4 @@ -1622,13 +1622,13 @@ glabel var7f1b50c8 /* f12059c: c7ac0598 */ lwc1 $f12,0x598($sp) /* f1205a0: 46187182 */ mul.s $f6,$f14,$f24 /* f1205a4: e7aa0440 */ swc1 $f10,0x440($sp) -/* f1205a8: 3c018008 */ lui $at,0x8008 +/* f1205a8: 3c018008 */ lui $at,%hi(var8007db80) /* f1205ac: 46184282 */ mul.s $f10,$f8,$f24 /* f1205b0: e7a40444 */ swc1 $f4,0x444($sp) /* f1205b4: c7a80594 */ lwc1 $f8,0x594($sp) /* f1205b8: 46188102 */ mul.s $f4,$f16,$f24 /* f1205bc: e7a60454 */ swc1 $f6,0x454($sp) -/* f1205c0: c420db80 */ lwc1 $f0,-0x2480($at) +/* f1205c0: c420db80 */ lwc1 $f0,%lo(var8007db80)($at) /* f1205c4: 46181182 */ mul.s $f6,$f2,$f24 /* f1205c8: e7aa0458 */ swc1 $f10,0x458($sp) /* f1205cc: 24110003 */ addiu $s1,$zero,0x3 @@ -1674,13 +1674,13 @@ glabel var7f1b50c8 /* f12066c: c7b005b0 */ lwc1 $f16,0x5b0($sp) /* f120670: 46181102 */ mul.s $f4,$f2,$f24 /* f120674: e7a80440 */ swc1 $f8,0x440($sp) -/* f120678: 3c018008 */ lui $at,0x8008 +/* f120678: 3c018008 */ lui $at,%hi(var8007db80) /* f12067c: 46183202 */ mul.s $f8,$f6,$f24 /* f120680: e7aa0444 */ swc1 $f10,0x444($sp) /* f120684: c7a605ac */ lwc1 $f6,0x5ac($sp) /* f120688: 46186282 */ mul.s $f10,$f12,$f24 /* f12068c: e7a40454 */ swc1 $f4,0x454($sp) -/* f120690: c420db80 */ lwc1 $f0,-0x2480($at) +/* f120690: c420db80 */ lwc1 $f0,%lo(var8007db80)($at) /* f120694: 46187102 */ mul.s $f4,$f14,$f24 /* f120698: e7a80458 */ swc1 $f8,0x458($sp) /* f12069c: 24110003 */ addiu $s1,$zero,0x3 @@ -1726,13 +1726,13 @@ glabel var7f1b50c8 /* f12073c: c7ac05bc */ lwc1 $f12,0x5bc($sp) /* f120740: 46189282 */ mul.s $f10,$f18,$f24 /* f120744: e7a60440 */ swc1 $f6,0x440($sp) -/* f120748: 3c018008 */ lui $at,0x8008 +/* f120748: 3c018008 */ lui $at,%hi(var8007db80) /* f12074c: 46182182 */ mul.s $f6,$f4,$f24 /* f120750: e7a80444 */ swc1 $f8,0x444($sp) /* f120754: c7a405b8 */ lwc1 $f4,0x5b8($sp) /* f120758: 4618a202 */ mul.s $f8,$f20,$f24 /* f12075c: e7aa0454 */ swc1 $f10,0x454($sp) -/* f120760: c420db80 */ lwc1 $f0,-0x2480($at) +/* f120760: c420db80 */ lwc1 $f0,%lo(var8007db80)($at) /* f120764: 46181282 */ mul.s $f10,$f2,$f24 /* f120768: e7a60458 */ swc1 $f6,0x458($sp) /* f12076c: 24110003 */ addiu $s1,$zero,0x3 @@ -1778,13 +1778,13 @@ glabel var7f1b50c8 /* f12080c: c7b405a4 */ lwc1 $f20,0x5a4($sp) /* f120810: 46187202 */ mul.s $f8,$f14,$f24 /* f120814: e7a40440 */ swc1 $f4,0x440($sp) -/* f120818: 3c018008 */ lui $at,0x8008 +/* f120818: 3c018008 */ lui $at,%hi(var8007db80) /* f12081c: 46185102 */ mul.s $f4,$f10,$f24 /* f120820: e7a60444 */ swc1 $f6,0x444($sp) /* f120824: c7aa05a0 */ lwc1 $f10,0x5a0($sp) /* f120828: 46188182 */ mul.s $f6,$f16,$f24 /* f12082c: e7a80454 */ swc1 $f8,0x454($sp) -/* f120830: c420db80 */ lwc1 $f0,-0x2480($at) +/* f120830: c420db80 */ lwc1 $f0,%lo(var8007db80)($at) /* f120834: 46189202 */ mul.s $f8,$f18,$f24 /* f120838: e7a40458 */ swc1 $f4,0x458($sp) /* f12083c: 24110003 */ addiu $s1,$zero,0x3 @@ -1839,13 +1839,13 @@ glabel var7f1b50c8 /* f120900: c7ba0598 */ lwc1 $f26,0x598($sp) /* f120904: 46187182 */ mul.s $f6,$f14,$f24 /* f120908: e7aa0458 */ swc1 $f10,0x458($sp) -/* f12090c: 3c018008 */ lui $at,0x8008 +/* f12090c: 3c018008 */ lui $at,%hi(var8007db80) /* f120910: 46184282 */ mul.s $f10,$f8,$f24 /* f120914: e7a4045c */ swc1 $f4,0x45c($sp) /* f120918: c7a80594 */ lwc1 $f8,0x594($sp) /* f12091c: 46188102 */ mul.s $f4,$f16,$f24 /* f120920: e7a6046c */ swc1 $f6,0x46c($sp) -/* f120924: c420db80 */ lwc1 $f0,-0x2480($at) +/* f120924: c420db80 */ lwc1 $f0,%lo(var8007db80)($at) /* f120928: 4618b182 */ mul.s $f6,$f22,$f24 /* f12092c: e7aa0470 */ swc1 $f10,0x470($sp) /* f120930: 24110005 */ addiu $s1,$zero,0x5 @@ -1914,7 +1914,7 @@ glabel var7f1b50c8 /* f120a2c: c7a205a8 */ lwc1 $f2,0x5a8($sp) /* f120a30: 46185282 */ mul.s $f10,$f10,$f24 /* f120a34: c7a005ac */ lwc1 $f0,0x5ac($sp) -/* f120a38: 3c018008 */ lui $at,0x8008 +/* f120a38: 3c018008 */ lui $at,%hi(var8007db80) /* f120a3c: 46183182 */ mul.s $f6,$f6,$f24 /* f120a40: 24110005 */ addiu $s1,$zero,0x5 /* f120a44: e7ba0448 */ swc1 $f26,0x448($sp) @@ -1926,7 +1926,7 @@ glabel var7f1b50c8 /* f120a5c: c7a605a0 */ lwc1 $f6,0x5a0($sp) /* f120a60: 46181082 */ mul.s $f2,$f2,$f24 /* f120a64: e7ba043c */ swc1 $f26,0x43c($sp) -/* f120a68: c43adb80 */ lwc1 $f26,-0x2480($at) +/* f120a68: c43adb80 */ lwc1 $f26,%lo(var8007db80)($at) /* f120a6c: 46185282 */ mul.s $f10,$f10,$f24 /* f120a70: e7a40470 */ swc1 $f4,0x470($sp) /* f120a74: c7a405b0 */ lwc1 $f4,0x5b0($sp) @@ -2007,13 +2007,13 @@ glabel var7f1b50c8 /* f120ba0: c7b005bc */ lwc1 $f16,0x5bc($sp) /* f120ba4: 46181282 */ mul.s $f10,$f2,$f24 /* f120ba8: e7a60458 */ swc1 $f6,0x458($sp) -/* f120bac: 3c018008 */ lui $at,0x8008 +/* f120bac: 3c018008 */ lui $at,%hi(var8007db80) /* f120bb0: 46182182 */ mul.s $f6,$f4,$f24 /* f120bb4: e7a8045c */ swc1 $f8,0x45c($sp) /* f120bb8: c7a405b8 */ lwc1 $f4,0x5b8($sp) /* f120bbc: 46186202 */ mul.s $f8,$f12,$f24 /* f120bc0: e7aa046c */ swc1 $f10,0x46c($sp) -/* f120bc4: c420db80 */ lwc1 $f0,-0x2480($at) +/* f120bc4: c420db80 */ lwc1 $f0,%lo(var8007db80)($at) /* f120bc8: 46187282 */ mul.s $f10,$f14,$f24 /* f120bcc: e7a60470 */ swc1 $f6,0x470($sp) /* f120bd0: 24110005 */ addiu $s1,$zero,0x5 @@ -2091,13 +2091,13 @@ glabel var7f1b50c8 /* f120cf0: c7ac05a4 */ lwc1 $f12,0x5a4($sp) /* f120cf4: 46189102 */ mul.s $f4,$f18,$f24 /* f120cf8: e7a80458 */ swc1 $f8,0x458($sp) -/* f120cfc: 3c018008 */ lui $at,0x8008 +/* f120cfc: 3c018008 */ lui $at,%hi(var8007db80) /* f120d00: 46183202 */ mul.s $f8,$f6,$f24 /* f120d04: e7aa045c */ swc1 $f10,0x45c($sp) /* f120d08: c7a605a0 */ lwc1 $f6,0x5a0($sp) /* f120d0c: 4618a282 */ mul.s $f10,$f20,$f24 /* f120d10: e7a4046c */ swc1 $f4,0x46c($sp) -/* f120d14: c420db80 */ lwc1 $f0,-0x2480($at) +/* f120d14: c420db80 */ lwc1 $f0,%lo(var8007db80)($at) /* f120d18: 46181102 */ mul.s $f4,$f2,$f24 /* f120d1c: e7a80470 */ swc1 $f8,0x470($sp) /* f120d20: 24110005 */ addiu $s1,$zero,0x5 @@ -2266,7 +2266,7 @@ glabel var7f1b50c8 /* f120f98: 3c0ee700 */ lui $t6,0xe700 /* f120f9c: 918b0028 */ lbu $t3,0x28($t4) /* f120fa0: 27a406b0 */ addiu $a0,$sp,0x6b0 -/* f120fa4: 3c19800b */ lui $t9,0x800b +/* f120fa4: 3c19800b */ lui $t9,%hi(var800ab598) /* f120fa8: 1560006b */ bnez $t3,.L0f121158 /* f120fac: 270a0008 */ addiu $t2,$t8,0x8 /* f120fb0: 3c017f1b */ lui $at,%hi(var7f1b5080) @@ -2386,7 +2386,7 @@ glabel var7f1b50c8 /* f12115c: af000004 */ sw $zero,0x4($t8) /* f121160: af0e0000 */ sw $t6,0x0($t8) /* f121164: 8fa9042c */ lw $t1,0x42c($sp) -/* f121168: 8f39b598 */ lw $t9,-0x4a68($t9) +/* f121168: 8f39b598 */ lw $t9,%lo(var800ab598)($t9) /* f12116c: 240d0002 */ addiu $t5,$zero,0x2 /* f121170: 852c0030 */ lh $t4,0x30($t1) /* f121174: 240f0001 */ addiu $t7,$zero,0x1 @@ -2542,10 +2542,10 @@ glabel var7f1b50c8 /* f1213b8: c7a40630 */ lwc1 $f4,0x630($sp) /* f1213bc: 46188202 */ mul.s $f8,$f16,$f24 /* f1213c0: e7aa04cc */ swc1 $f10,0x4cc($sp) -/* f1213c4: 3c018008 */ lui $at,0x8008 +/* f1213c4: 3c018008 */ lui $at,%hi(var8007db80) /* f1213c8: 46189282 */ mul.s $f10,$f18,$f24 /* f1213cc: e7a604d0 */ swc1 $f6,0x4d0($sp) -/* f1213d0: c420db80 */ lwc1 $f0,-0x2480($at) +/* f1213d0: c420db80 */ lwc1 $f0,%lo(var8007db80)($at) /* f1213d4: 46182182 */ mul.s $f6,$f4,$f24 /* f1213d8: e7a804d4 */ swc1 $f8,0x4d4($sp) /* f1213dc: c7a40624 */ lwc1 $f4,0x624($sp) @@ -2621,10 +2621,10 @@ glabel var7f1b50c8 /* f1214f4: c7a40600 */ lwc1 $f4,0x600($sp) /* f1214f8: 46188202 */ mul.s $f8,$f16,$f24 /* f1214fc: e7aa04cc */ swc1 $f10,0x4cc($sp) -/* f121500: 3c018008 */ lui $at,0x8008 +/* f121500: 3c018008 */ lui $at,%hi(var8007db80) /* f121504: 46189282 */ mul.s $f10,$f18,$f24 /* f121508: e7a604d0 */ swc1 $f6,0x4d0($sp) -/* f12150c: c420db80 */ lwc1 $f0,-0x2480($at) +/* f12150c: c420db80 */ lwc1 $f0,%lo(var8007db80)($at) /* f121510: 46182182 */ mul.s $f6,$f4,$f24 /* f121514: e7a804d4 */ swc1 $f8,0x4d4($sp) /* f121518: c7a405f4 */ lwc1 $f4,0x5f4($sp) @@ -2700,10 +2700,10 @@ glabel var7f1b50c8 /* f121630: c7a405f4 */ lwc1 $f4,0x5f4($sp) /* f121634: 4618a202 */ mul.s $f8,$f20,$f24 /* f121638: e7aa04cc */ swc1 $f10,0x4cc($sp) -/* f12163c: 3c018008 */ lui $at,0x8008 +/* f12163c: 3c018008 */ lui $at,%hi(var8007db80) /* f121640: 46188282 */ mul.s $f10,$f16,$f24 /* f121644: e7a604d0 */ swc1 $f6,0x4d0($sp) -/* f121648: c420db80 */ lwc1 $f0,-0x2480($at) +/* f121648: c420db80 */ lwc1 $f0,%lo(var8007db80)($at) /* f12164c: 46182182 */ mul.s $f6,$f4,$f24 /* f121650: e7a804d4 */ swc1 $f8,0x4d4($sp) /* f121654: c7a805f8 */ lwc1 $f8,0x5f8($sp) @@ -2778,10 +2778,10 @@ glabel var7f1b50c8 /* f121768: c7a40618 */ lwc1 $f4,0x618($sp) /* f12176c: 46181202 */ mul.s $f8,$f2,$f24 /* f121770: e7aa04cc */ swc1 $f10,0x4cc($sp) -/* f121774: 3c018008 */ lui $at,0x8008 +/* f121774: 3c018008 */ lui $at,%hi(var8007db80) /* f121778: 4618a282 */ mul.s $f10,$f20,$f24 /* f12177c: e7a604d0 */ swc1 $f6,0x4d0($sp) -/* f121780: c420db80 */ lwc1 $f0,-0x2480($at) +/* f121780: c420db80 */ lwc1 $f0,%lo(var8007db80)($at) /* f121784: 46182182 */ mul.s $f6,$f4,$f24 /* f121788: e7a804d4 */ swc1 $f8,0x4d4($sp) /* f12178c: c7a8061c */ lwc1 $f8,0x61c($sp) @@ -2856,10 +2856,10 @@ glabel var7f1b50c8 /* f1218a0: c7a4060c */ lwc1 $f4,0x60c($sp) /* f1218a4: 46186202 */ mul.s $f8,$f12,$f24 /* f1218a8: e7aa04cc */ swc1 $f10,0x4cc($sp) -/* f1218ac: 3c018008 */ lui $at,0x8008 +/* f1218ac: 3c018008 */ lui $at,%hi(var8007db80) /* f1218b0: 4618b282 */ mul.s $f10,$f22,$f24 /* f1218b4: e7a604d0 */ swc1 $f6,0x4d0($sp) -/* f1218b8: c420db80 */ lwc1 $f0,-0x2480($at) +/* f1218b8: c420db80 */ lwc1 $f0,%lo(var8007db80)($at) /* f1218bc: 46182182 */ mul.s $f6,$f4,$f24 /* f1218c0: e7a804d4 */ swc1 $f8,0x4d4($sp) /* f1218c4: c7a80610 */ lwc1 $f8,0x610($sp) @@ -2928,13 +2928,13 @@ glabel var7f1b50c8 /* f1219c0: c7ac05f8 */ lwc1 $f12,0x5f8($sp) /* f1219c4: 46187282 */ mul.s $f10,$f14,$f24 /* f1219c8: e7a604b8 */ swc1 $f6,0x4b8($sp) -/* f1219cc: 3c018008 */ lui $at,0x8008 +/* f1219cc: 3c018008 */ lui $at,%hi(var8007db80) /* f1219d0: 46182182 */ mul.s $f6,$f4,$f24 /* f1219d4: e7a804bc */ swc1 $f8,0x4bc($sp) /* f1219d8: c7a405f4 */ lwc1 $f4,0x5f4($sp) /* f1219dc: 46189202 */ mul.s $f8,$f18,$f24 /* f1219e0: e7aa04cc */ swc1 $f10,0x4cc($sp) -/* f1219e4: c420db80 */ lwc1 $f0,-0x2480($at) +/* f1219e4: c420db80 */ lwc1 $f0,%lo(var8007db80)($at) /* f1219e8: 46188282 */ mul.s $f10,$f16,$f24 /* f1219ec: e7a604d0 */ swc1 $f6,0x4d0($sp) /* f1219f0: 3c013f80 */ lui $at,0x3f80 @@ -2988,13 +2988,13 @@ glabel var7f1b50c8 /* f121ab0: c7b00610 */ lwc1 $f16,0x610($sp) /* f121ab4: 46186202 */ mul.s $f8,$f12,$f24 /* f121ab8: e7a404b8 */ swc1 $f4,0x4b8($sp) -/* f121abc: 3c018008 */ lui $at,0x8008 +/* f121abc: 3c018008 */ lui $at,%hi(var8007db80) /* f121ac0: 46185102 */ mul.s $f4,$f10,$f24 /* f121ac4: e7a604bc */ swc1 $f6,0x4bc($sp) /* f121ac8: c7aa060c */ lwc1 $f10,0x60c($sp) /* f121acc: 46187182 */ mul.s $f6,$f14,$f24 /* f121ad0: e7a804cc */ swc1 $f8,0x4cc($sp) -/* f121ad4: c420db80 */ lwc1 $f0,-0x2480($at) +/* f121ad4: c420db80 */ lwc1 $f0,%lo(var8007db80)($at) /* f121ad8: 46181202 */ mul.s $f8,$f2,$f24 /* f121adc: e7a404d0 */ swc1 $f4,0x4d0($sp) /* f121ae0: 3c013f80 */ lui $at,0x3f80 @@ -3048,13 +3048,13 @@ glabel var7f1b50c8 /* f121ba0: c7b2061c */ lwc1 $f18,0x61c($sp) /* f121ba4: 46181182 */ mul.s $f6,$f2,$f24 /* f121ba8: e7aa04b8 */ swc1 $f10,0x4b8($sp) -/* f121bac: 3c018008 */ lui $at,0x8008 +/* f121bac: 3c018008 */ lui $at,%hi(var8007db80) /* f121bb0: 46184282 */ mul.s $f10,$f8,$f24 /* f121bb4: e7a404bc */ swc1 $f4,0x4bc($sp) /* f121bb8: c7a80618 */ lwc1 $f8,0x618($sp) /* f121bbc: 46186102 */ mul.s $f4,$f12,$f24 /* f121bc0: e7a604cc */ swc1 $f6,0x4cc($sp) -/* f121bc4: c420db80 */ lwc1 $f0,-0x2480($at) +/* f121bc4: c420db80 */ lwc1 $f0,%lo(var8007db80)($at) /* f121bc8: 4618a182 */ mul.s $f6,$f20,$f24 /* f121bcc: e7aa04d0 */ swc1 $f10,0x4d0($sp) /* f121bd0: 3c013f80 */ lui $at,0x3f80 @@ -3108,13 +3108,13 @@ glabel var7f1b50c8 /* f121c90: c7b00604 */ lwc1 $f16,0x604($sp) /* f121c94: 46189102 */ mul.s $f4,$f18,$f24 /* f121c98: e7a804b8 */ swc1 $f8,0x4b8($sp) -/* f121c9c: 3c018008 */ lui $at,0x8008 +/* f121c9c: 3c018008 */ lui $at,%hi(var8007db80) /* f121ca0: 46183202 */ mul.s $f8,$f6,$f24 /* f121ca4: e7aa04bc */ swc1 $f10,0x4bc($sp) /* f121ca8: c7a60600 */ lwc1 $f6,0x600($sp) /* f121cac: 4618a282 */ mul.s $f10,$f20,$f24 /* f121cb0: e7a404cc */ swc1 $f4,0x4cc($sp) -/* f121cb4: c420db80 */ lwc1 $f0,-0x2480($at) +/* f121cb4: c420db80 */ lwc1 $f0,%lo(var8007db80)($at) /* f121cb8: 46187102 */ mul.s $f4,$f14,$f24 /* f121cbc: e7a804d0 */ swc1 $f8,0x4d0($sp) /* f121cc0: 3c013f80 */ lui $at,0x3f80 @@ -3174,10 +3174,10 @@ glabel var7f1b50c8 /* f121d98: c7a4063c */ lwc1 $f4,0x63c($sp) /* f121d9c: 46186202 */ mul.s $f8,$f12,$f24 /* f121da0: e7aa04cc */ swc1 $f10,0x4cc($sp) -/* f121da4: 3c018008 */ lui $at,0x8008 +/* f121da4: 3c018008 */ lui $at,%hi(var8007db80) /* f121da8: 46187282 */ mul.s $f10,$f14,$f24 /* f121dac: e7a604d0 */ swc1 $f6,0x4d0($sp) -/* f121db0: c420db80 */ lwc1 $f0,-0x2480($at) +/* f121db0: c420db80 */ lwc1 $f0,%lo(var8007db80)($at) /* f121db4: 46182182 */ mul.s $f6,$f4,$f24 /* f121db8: e7a804d4 */ swc1 $f8,0x4d4($sp) /* f121dbc: c7a405f4 */ lwc1 $f4,0x5f4($sp) @@ -3272,10 +3272,10 @@ glabel var7f1b50c8 /* f121f20: c7aa0624 */ lwc1 $f10,0x624($sp) /* f121f24: 46188182 */ mul.s $f6,$f16,$f24 /* f121f28: e7a804cc */ swc1 $f8,0x4cc($sp) -/* f121f2c: 3c018008 */ lui $at,0x8008 +/* f121f2c: 3c018008 */ lui $at,%hi(var8007db80) /* f121f30: 4618b202 */ mul.s $f8,$f22,$f24 /* f121f34: e7a404d0 */ swc1 $f4,0x4d0($sp) -/* f121f38: c420db80 */ lwc1 $f0,-0x2480($at) +/* f121f38: c420db80 */ lwc1 $f0,%lo(var8007db80)($at) /* f121f3c: 46185102 */ mul.s $f4,$f10,$f24 /* f121f40: e7a604d4 */ swc1 $f6,0x4d4($sp) /* f121f44: c7a60628 */ lwc1 $f6,0x628($sp) @@ -3367,8 +3367,8 @@ glabel var7f1b50c8 /* f12209c: e7aa04b8 */ swc1 $f10,0x4b8($sp) /* f1220a0: 46189202 */ mul.s $f8,$f18,$f24 /* f1220a4: c7aa0630 */ lwc1 $f10,0x630($sp) -/* f1220a8: 3c018008 */ lui $at,0x8008 -/* f1220ac: c420db80 */ lwc1 $f0,-0x2480($at) +/* f1220a8: 3c018008 */ lui $at,%hi(var8007db80) +/* f1220ac: c420db80 */ lwc1 $f0,%lo(var8007db80)($at) /* f1220b0: e7a604bc */ swc1 $f6,0x4bc($sp) /* f1220b4: 46185182 */ mul.s $f6,$f10,$f24 /* f1220b8: 3c013f80 */ lui $at,0x3f80 @@ -3469,10 +3469,10 @@ glabel var7f1b50c8 /* f122234: c7a40630 */ lwc1 $f4,0x630($sp) /* f122238: 46181182 */ mul.s $f6,$f2,$f24 /* f12223c: e7a804cc */ swc1 $f8,0x4cc($sp) -/* f122240: 3c018008 */ lui $at,0x8008 +/* f122240: 3c018008 */ lui $at,%hi(var8007db80) /* f122244: 46189202 */ mul.s $f8,$f18,$f24 /* f122248: e7aa04d0 */ swc1 $f10,0x4d0($sp) -/* f12224c: c420db80 */ lwc1 $f0,-0x2480($at) +/* f12224c: c420db80 */ lwc1 $f0,%lo(var8007db80)($at) /* f122250: 46182282 */ mul.s $f10,$f4,$f24 /* f122254: e7a604d4 */ swc1 $f6,0x4d4($sp) /* f122258: c7a40600 */ lwc1 $f4,0x600($sp) @@ -8590,8 +8590,8 @@ glabel var7f1b513c .word 0x3fa0d2ee .text /* f126de8: 27bdfea8 */ addiu $sp,$sp,-344 -/* f126dec: 3c018006 */ lui $at,0x8006 -/* f126df0: c4241630 */ lwc1 $f4,0x1630($at) +/* f126dec: 3c018006 */ lui $at,%hi(var80061630) +/* f126df0: c4241630 */ lwc1 $f4,%lo(var80061630)($at) /* f126df4: 3c017f1b */ lui $at,%hi(var7f1b5120) /* f126df8: c4265120 */ lwc1 $f6,%lo(var7f1b5120)($at) /* f126dfc: 3c03800a */ lui $v1,%hi(g_Vars+0x284) @@ -8908,13 +8908,13 @@ glabel func0f12715c /* f127294: 45000011 */ bc1f .L0f1272dc /* f127298: 02602025 */ or $a0,$s3,$zero /* f12729c: 862e0012 */ lh $t6,0x12($s1) -/* f1272a0: 3c018008 */ lui $at,0x8008 +/* f1272a0: 3c018008 */ lui $at,%hi(var8007db88) /* f1272a4: 00220821 */ addu $at,$at,$v0 /* f1272a8: 448e3000 */ mtc1 $t6,$f6 /* f1272ac: 03c27821 */ addu $t7,$s8,$v0 /* f1272b0: 8df80000 */ lw $t8,0x0($t7) /* f1272b4: 46803220 */ cvt.s.w $f8,$f6 -/* f1272b8: c42adb88 */ lwc1 $f10,-0x2478($at) +/* f1272b8: c42adb88 */ lwc1 $f10,%lo(var8007db88)($at) /* f1272bc: 8d850000 */ lw $a1,0x0($t4) /* f1272c0: 8da60000 */ lw $a2,0x0($t5) /* f1272c4: 44070000 */ mfc1 $a3,$f0 diff --git a/src/game/game_128f30.c b/src/game/game_128f30.c index cfe0e51a7..68079bb2e 100644 --- a/src/game/game_128f30.c +++ b/src/game/game_128f30.c @@ -189,9 +189,9 @@ glabel func0f12906c GLOBAL_ASM( glabel func0f1291b0 -/* f1291b0: 3c048008 */ lui $a0,0x8008 -/* f1291b4: dc84e3c0 */ ld $a0,-0x1c40($a0) -/* f1291b8: 3c018008 */ lui $at,0x8008 +/* f1291b0: 3c048008 */ lui $a0,%hi(var8007e3c0) +/* f1291b4: dc84e3c0 */ ld $a0,%lo(var8007e3c0)($a0) +/* f1291b8: 3c018008 */ lui $at,%hi(var8007e3c0) /* f1291bc: 000437fc */ dsll32 $a2,$a0,0x1f /* f1291c0: 00042ff8 */ dsll $a1,$a0,0x1f /* f1291c4: 000637fa */ dsrl $a2,$a2,0x1f @@ -204,7 +204,7 @@ glabel func0f1291b0 /* f1291e0: 30840fff */ andi $a0,$a0,0xfff /* f1291e4: 00862026 */ xor $a0,$a0,$a2 /* f1291e8: 0004103c */ dsll32 $v0,$a0,0x0 -/* f1291ec: fc24e3c0 */ sd $a0,-0x1c40($at) +/* f1291ec: fc24e3c0 */ sd $a0,%lo(var8007e3c0)($at) /* f1291f0: 03e00008 */ jr $ra /* f1291f4: 0002103f */ dsra32 $v0,$v0,0x0 ); @@ -212,8 +212,8 @@ glabel func0f1291b0 GLOBAL_ASM( glabel func0f1291f8 /* f1291f8: 64840001 */ daddiu $a0,$a0,0x1 -/* f1291fc: 3c018008 */ lui $at,0x8008 -/* f129200: fc24e3c0 */ sd $a0,-0x1c40($at) +/* f1291fc: 3c018008 */ lui $at,%hi(var8007e3c0) +/* f129200: fc24e3c0 */ sd $a0,%lo(var8007e3c0)($at) /* f129204: 03e00008 */ jr $ra /* f129208: 24040000 */ addiu $a0,$zero,0x0 /* f12920c: 00000000 */ nop diff --git a/src/game/game_1371b0.c b/src/game/game_1371b0.c index 555eed339..35d18b9f0 100644 --- a/src/game/game_1371b0.c +++ b/src/game/game_1371b0.c @@ -525,14 +525,14 @@ glabel func0f137874 /* f13788c: 01c67021 */ addu $t6,$t6,$a2 /* f137890: 448f3000 */ mtc1 $t7,$f6 /* f137894: 000e7080 */ sll $t6,$t6,0x2 -/* f137898: 3c018008 */ lui $at,0x8008 +/* f137898: 3c018008 */ lui $at,%hi(var8007f13c) /* f13789c: 002e0821 */ addu $at,$at,$t6 /* f1378a0: afbf0014 */ sw $ra,0x14($sp) /* f1378a4: afa40040 */ sw $a0,0x40($sp) /* f1378a8: afa50044 */ sw $a1,0x44($sp) /* f1378ac: afa7004c */ sw $a3,0x4c($sp) /* f1378b0: 240c003c */ addiu $t4,$zero,0x3c -/* f1378b4: c424f13c */ lwc1 $f4,-0xec4($at) +/* f1378b4: c424f13c */ lwc1 $f4,%lo(var8007f13c)($at) /* f1378b8: 05e10005 */ bgez $t7,.L0f1378d0 /* f1378bc: 46803220 */ cvt.s.w $f8,$f6 /* f1378c0: 3c014f80 */ lui $at,0x4f80 @@ -1742,8 +1742,8 @@ glabel var7f1b5824 /* f1389c8: f7b40018 */ sdc1 $f20,0x18($sp) /* f1389cc: 806e41f5 */ lb $t6,0x41f5($v1) /* f1389d0: 05c00019 */ bltz $t6,.L0f138a38 -/* f1389d4: 3c01800a */ lui $at,0x800a -/* f1389d8: c424a008 */ lwc1 $f4,-0x5ff8($at) +/* f1389d4: 3c01800a */ lui $at,%hi(g_Vars+0x48) +/* f1389d8: c424a008 */ lwc1 $f4,%lo(g_Vars+0x48)($at) /* f1389dc: 3c014434 */ lui $at,0x4434 /* f1389e0: 44813000 */ mtc1 $at,$f6 /* f1389e4: c46a41f8 */ lwc1 $f10,0x41f8($v1) @@ -1907,10 +1907,10 @@ glabel var7f1b5824 /* f138c34: 46001007 */ neg.s $f0,$f2 .L0f138c38: /* f138c38: c44a0018 */ lwc1 $f10,0x18($v0) -/* f138c3c: 3c01800a */ lui $at,0x800a +/* f138c3c: 3c01800a */ lui $at,%hi(g_Vars+0x48) /* f138c40: 46005400 */ add.s $f16,$f10,$f0 /* f138c44: e4500018 */ swc1 $f16,0x18($v0) -/* f138c48: c432a008 */ lwc1 $f18,-0x5ff8($at) +/* f138c48: c432a008 */ lwc1 $f18,%lo(g_Vars+0x48)($at) /* f138c4c: 3c013e80 */ lui $at,0x3e80 /* f138c50: 44813000 */ mtc1 $at,$f6 /* f138c54: 46189102 */ mul.s $f4,$f18,$f24 @@ -2105,8 +2105,8 @@ glabel var7f1b5844 /* f138ec8: 00000000 */ nop /* f138ecc: 3c017f1b */ lui $at,%hi(var7f1b583c) /* f138ed0: c430583c */ lwc1 $f16,%lo(var7f1b583c)($at) -/* f138ed4: 3c01800a */ lui $at,0x800a -/* f138ed8: c4244160 */ lwc1 $f4,0x4160($at) +/* f138ed4: 3c01800a */ lui $at,%hi(var800a4160) +/* f138ed8: c4244160 */ lwc1 $f4,%lo(var800a4160)($at) /* f138edc: 3c014396 */ lui $at,0x4396 /* f138ee0: 44814000 */ mtc1 $at,$f8 /* f138ee4: 46102182 */ mul.s $f6,$f4,$f16 @@ -2292,8 +2292,8 @@ glabel var7f1b5844 /* f1391a0: 460c6182 */ mul.s $f6,$f12,$f12 /* f1391a4: 3c017f1b */ lui $at,%hi(var7f1b5844) /* f1391a8: c4305844 */ lwc1 $f16,%lo(var7f1b5844)($at) -/* f1391ac: 3c01800a */ lui $at,0x800a -/* f1391b0: c4244160 */ lwc1 $f4,0x4160($at) +/* f1391ac: 3c01800a */ lui $at,%hi(var800a4160) +/* f1391b0: c4244160 */ lwc1 $f4,%lo(var800a4160)($at) /* f1391b4: e7a00030 */ swc1 $f0,0x30($sp) /* f1391b8: 46103202 */ mul.s $f8,$f6,$f16 /* f1391bc: 00000000 */ nop @@ -2957,8 +2957,8 @@ glabel var7f1b5868 /* f139b2c: 46062203 */ div.s $f8,$f4,$f6 /* f139b30: e7a80098 */ swc1 $f8,0x98($sp) .L0f139b34: -/* f139b34: 3c01800a */ lui $at,0x800a -/* f139b38: c4244160 */ lwc1 $f4,0x4160($at) +/* f139b34: 3c01800a */ lui $at,%hi(var800a4160) +/* f139b38: c4244160 */ lwc1 $f4,%lo(var800a4160)($at) /* f139b3c: 3c014120 */ lui $at,0x4120 /* f139b40: 44813000 */ mtc1 $at,$f6 /* f139b44: 44909000 */ mtc1 $s0,$f18 @@ -3445,11 +3445,11 @@ glabel var7f1b5874 /* f13a204: c5800000 */ lwc1 $f0,0x0($t4) /* f13a208: 44813000 */ mtc1 $at,$f6 /* f13a20c: 46082282 */ mul.s $f10,$f4,$f8 -/* f13a210: 3c01800a */ lui $at,0x800a +/* f13a210: 3c01800a */ lui $at,%hi(g_Vars+0x48) /* f13a214: 46060100 */ add.s $f4,$f0,$f6 /* f13a218: 46100480 */ add.s $f18,$f0,$f16 /* f13a21c: e46441a4 */ swc1 $f4,0x41a4($v1) -/* f13a220: c428a008 */ lwc1 $f8,-0x5ff8($at) +/* f13a220: c428a008 */ lwc1 $f8,%lo(g_Vars+0x48)($at) /* f13a224: 3c014370 */ lui $at,0x4370 /* f13a228: 44818000 */ mtc1 $at,$f16 /* f13a22c: 8e230000 */ lw $v1,0x0($s1) @@ -4489,10 +4489,10 @@ glabel var7f1b5930 .L0f13af84: /* f13af84: 3c014596 */ lui $at,0x4596 /* f13af88: 44815000 */ mtc1 $at,$f10 -/* f13af8c: 3c01800a */ lui $at,0x800a +/* f13af8c: 3c01800a */ lui $at,%hi(var800a4160) /* f13af90: 460a3403 */ div.s $f16,$f6,$f10 /* f13af94: 0fc4e267 */ jal func0f13899c -/* f13af98: e4304160 */ swc1 $f16,0x4160($at) +/* f13af98: e4304160 */ swc1 $f16,%lo(var800a4160)($at) /* f13af9c: 8e0e0000 */ lw $t6,0x0($s0) /* f13afa0: 91d841f4 */ lbu $t8,0x41f4($t6) /* f13afa4: 13000005 */ beqz $t8,.L0f13afbc diff --git a/src/game/game_13b670.c b/src/game/game_13b670.c index 2dd071c73..aee370598 100644 --- a/src/game/game_13b670.c +++ b/src/game/game_13b670.c @@ -20,8 +20,8 @@ const char var7f1b5968[] = "ripsize"; GLOBAL_ASM( glabel func0f13b670 -/* f13b670: 3c018006 */ lui $at,0x8006 -/* f13b674: c4241634 */ lwc1 $f4,0x1634($at) +/* f13b670: 3c018006 */ lui $at,%hi(var80061634) +/* f13b674: c4241634 */ lwc1 $f4,%lo(var80061634)($at) /* f13b678: 3c014120 */ lui $at,0x4120 /* f13b67c: 44813000 */ mtc1 $at,$f6 /* f13b680: 3c014580 */ lui $at,0x4580 @@ -116,8 +116,8 @@ glabel func0f13b754 GLOBAL_ASM( glabel func0f13b7bc -/* f13b7bc: 3c018006 */ lui $at,0x8006 -/* f13b7c0: c4241634 */ lwc1 $f4,0x1634($at) +/* f13b7bc: 3c018006 */ lui $at,%hi(var80061634) +/* f13b7c0: c4241634 */ lwc1 $f4,%lo(var80061634)($at) /* f13b7c4: 3c014080 */ lui $at,0x4080 /* f13b7c8: 44813000 */ mtc1 $at,$f6 /* f13b7cc: 3c014580 */ lui $at,0x4580 @@ -185,8 +185,8 @@ glabel var7f1b5970 .word 0x40c907a9 .text /* f13b8a0: 27bdffb8 */ addiu $sp,$sp,-72 -/* f13b8a4: 3c018006 */ lui $at,0x8006 -/* f13b8a8: c4241634 */ lwc1 $f4,0x1634($at) +/* f13b8a4: 3c018006 */ lui $at,%hi(var80061634) +/* f13b8a8: c4241634 */ lwc1 $f4,%lo(var80061634)($at) /* f13b8ac: 3c0140a0 */ lui $at,0x40a0 /* f13b8b0: 44813000 */ mtc1 $at,$f6 /* f13b8b4: afb50040 */ sw $s5,0x40($sp) @@ -375,8 +375,8 @@ GLOBAL_ASM( glabel func0f13bb5c /* f13bb5c: 3c013f80 */ lui $at,0x3f80 /* f13bb60: 44812000 */ mtc1 $at,$f4 -/* f13bb64: 3c018006 */ lui $at,0x8006 -/* f13bb68: c4261634 */ lwc1 $f6,0x1634($at) +/* f13bb64: 3c018006 */ lui $at,%hi(var80061634) +/* f13bb68: c4261634 */ lwc1 $f6,%lo(var80061634)($at) /* f13bb6c: 3c014270 */ lui $at,0x4270 /* f13bb70: 44815000 */ mtc1 $at,$f10 /* f13bb74: 46062201 */ sub.s $f8,$f4,$f6 diff --git a/src/game/game_141820.c b/src/game/game_141820.c index 9817c3200..8eda10672 100644 --- a/src/game/game_141820.c +++ b/src/game/game_141820.c @@ -1153,8 +1153,8 @@ glabel func0f142774 /* f1427d8: 0040f025 */ or $s8,$v0,$zero /* f1427dc: 3c017f1b */ lui $at,%hi(var7f1b5f2c) /* f1427e0: c4365f2c */ lwc1 $f22,%lo(var7f1b5f2c)($at) -/* f1427e4: 3c018006 */ lui $at,0x8006 -/* f1427e8: c4241630 */ lwc1 $f4,0x1630($at) +/* f1427e4: 3c018006 */ lui $at,%hi(var80061630) +/* f1427e8: c4241630 */ lwc1 $f4,%lo(var80061630)($at) /* f1427ec: 3c014416 */ lui $at,0x4416 /* f1427f0: 44813000 */ mtc1 $at,$f6 /* f1427f4: 2401000c */ addiu $at,$zero,0xc @@ -1295,8 +1295,8 @@ glabel func0f14298c /* f1429e0: 00408825 */ or $s1,$v0,$zero /* f1429e4: 0c002f40 */ jal viGetViewLeft /* f1429e8: afa2007c */ sw $v0,0x7c($sp) -/* f1429ec: 3c018006 */ lui $at,0x8006 -/* f1429f0: c4241630 */ lwc1 $f4,0x1630($at) +/* f1429ec: 3c018006 */ lui $at,%hi(var80061630) +/* f1429f0: c4241630 */ lwc1 $f4,%lo(var80061630)($at) /* f1429f4: 3c014416 */ lui $at,0x4416 /* f1429f8: 44813000 */ mtc1 $at,$f6 /* f1429fc: 2401000c */ addiu $at,$zero,0xc @@ -7124,8 +7124,8 @@ glabel hudRenderHorizonScanner /* f147fec: 00000000 */ nop /* f147ff0: 00408825 */ or $s1,$v0,$zero .L0f147ff4: -/* f147ff4: 3c018006 */ lui $at,0x8006 -/* f147ff8: c4321630 */ lwc1 $f18,0x1630($at) +/* f147ff4: 3c018006 */ lui $at,%hi(var80061630) +/* f147ff8: c4321630 */ lwc1 $f18,%lo(var80061630)($at) /* f147ffc: 3c0141f0 */ lui $at,0x41f0 /* f148000: 44812000 */ mtc1 $at,$f4 /* f148004: 00000000 */ nop diff --git a/src/game/game_157db0.c b/src/game/game_157db0.c index f36a0c4cd..8f09ff9e4 100644 --- a/src/game/game_157db0.c +++ b/src/game/game_157db0.c @@ -4176,34 +4176,34 @@ glabel func0f15b534 #else GLOBAL_ASM( glabel func0f15b534 -/* f15b304: 3c0f8009 */ lui $t7,0x8009 -/* f15b308: 91ef0af0 */ lbu $t7,0xaf0($t7) +/* f15b304: 3c0f8009 */ lui $t7,%hi(g_Is4Mb) +/* f15b308: 91ef0af0 */ lbu $t7,%lo(g_Is4Mb)($t7) /* f15b30c: 240e0008 */ addiu $t6,$zero,0x8 -/* f15b310: 3c018008 */ lui $at,0x8008 +/* f15b310: 3c018008 */ lui $at,%hi(var8007fc0c) /* f15b314: 27bdff40 */ addiu $sp,$sp,-192 -/* f15b318: a42efc0c */ sh $t6,-0x3f4($at) +/* f15b318: a42efc0c */ sh $t6,%lo(var8007fc0c)($at) /* f15b31c: 24010001 */ addiu $at,$zero,0x1 /* f15b320: afbf001c */ sw $ra,0x1c($sp) /* f15b324: afb10018 */ sw $s1,0x18($sp) /* f15b328: 15e10007 */ bne $t7,$at,.L0f15b348 /* f15b32c: afb00014 */ sw $s0,0x14($sp) /* f15b330: 24020006 */ addiu $v0,$zero,0x6 -/* f15b334: 3c01800a */ lui $at,0x800a -/* f15b338: a4224bf0 */ sh $v0,0x4bf0($at) -/* f15b33c: 3c01800a */ lui $at,0x800a +/* f15b334: 3c01800a */ lui $at,%hi(var800a4bf0) +/* f15b338: a4224bf0 */ sh $v0,%lo(var800a4bf0)($at) +/* f15b33c: 3c01800a */ lui $at,%hi(var800a4bf0+0x2) /* f15b340: 10000006 */ b .L0f15b35c -/* f15b344: a4224bf2 */ sh $v0,0x4bf2($at) +/* f15b344: a4224bf2 */ sh $v0,%lo(var800a4bf0+0x2)($at) .L0f15b348: /* f15b348: 24020078 */ addiu $v0,$zero,0x78 -/* f15b34c: 3c01800a */ lui $at,0x800a -/* f15b350: a4224bf0 */ sh $v0,0x4bf0($at) -/* f15b354: 3c01800a */ lui $at,0x800a -/* f15b358: a4224bf2 */ sh $v0,0x4bf2($at) +/* f15b34c: 3c01800a */ lui $at,%hi(var800a4bf0) +/* f15b350: a4224bf0 */ sh $v0,%lo(var800a4bf0)($at) +/* f15b354: 3c01800a */ lui $at,%hi(var800a4bf0+0x2) +/* f15b358: a4224bf2 */ sh $v0,%lo(var800a4bf0+0x2)($at) .L0f15b35c: /* f15b35c: 0fc56c03 */ jal 0xf15b00c /* f15b360: 00000000 */ nop -/* f15b364: 3c038008 */ lui $v1,0x8008 -/* f15b368: 2463fc00 */ addiu $v1,$v1,-1024 +/* f15b364: 3c038008 */ lui $v1,%hi(g_StageIndex) +/* f15b368: 2463fc00 */ addiu $v1,$v1,%lo(g_StageIndex) /* f15b36c: 04410002 */ bgez $v0,.L0f15b378 /* f15b370: ac620000 */ sw $v0,0x0($v1) /* f15b374: ac600000 */ sw $zero,0x0($v1) @@ -4217,11 +4217,11 @@ glabel func0f15b534 /* f15b390: 0fc56be5 */ jal 0xf15af94 /* f15b394: 24060040 */ addiu $a2,$zero,0x40 /* f15b398: 8fa3002c */ lw $v1,0x2c($sp) -/* f15b39c: 3c028008 */ lui $v0,0x8008 +/* f15b39c: 3c028008 */ lui $v0,%hi(var8007fc54) /* f15b3a0: 3401801f */ dli $at,0x801f /* f15b3a4: 8c6a0004 */ lw $t2,0x4($v1) /* f15b3a8: 8c710000 */ lw $s1,0x0($v1) -/* f15b3ac: 2442fc54 */ addiu $v0,$v0,-940 +/* f15b3ac: 2442fc54 */ addiu $v0,$v0,%lo(var8007fc54) /* f15b3b0: afaa0048 */ sw $t2,0x48($sp) /* f15b3b4: 8c670008 */ lw $a3,0x8($v1) /* f15b3b8: 24050004 */ addiu $a1,$zero,0x4 @@ -4241,28 +4241,28 @@ glabel func0f15b534 /* f15b3f0: 00515021 */ addu $t2,$v0,$s1 /* f15b3f4: 3401800f */ dli $at,0x800f /* f15b3f8: 01478023 */ subu $s0,$t2,$a3 -/* f15b3fc: 3c03800a */ lui $v1,0x800a +/* f15b3fc: 3c03800a */ lui $v1,%hi(var800a491c) /* f15b400: 02018021 */ addu $s0,$s0,$at -/* f15b404: 2463491c */ addiu $v1,$v1,0x491c +/* f15b404: 2463491c */ addiu $v1,$v1,%lo(var800a491c) /* f15b408: 360b000f */ ori $t3,$s0,0xf /* f15b40c: 24e6001e */ addiu $a2,$a3,0x1e /* f15b410: ac620000 */ sw $v0,0x0($v1) /* f15b414: 3964000f */ xori $a0,$t3,0xf -/* f15b418: 3c018006 */ lui $at,0x8006 +/* f15b418: 3c018006 */ lui $at,%hi(var8005d9a0) /* f15b41c: 240d0001 */ addiu $t5,$zero,0x1 /* f15b420: 34ce000f */ ori $t6,$a2,0xf /* f15b424: 00808025 */ or $s0,$a0,$zero -/* f15b428: a02dd9a0 */ sb $t5,-0x2660($at) +/* f15b428: a02dd9a0 */ sb $t5,%lo(var8005d9a0)($at) /* f15b42c: 39c6000f */ xori $a2,$t6,0xf /* f15b430: 0fc56be5 */ jal 0xf15af94 /* f15b434: 00002825 */ or $a1,$zero,$zero -/* f15b438: 3c05800a */ lui $a1,0x800a +/* f15b438: 3c05800a */ lui $a1,%hi(var800a491c) /* f15b43c: 8fa60058 */ lw $a2,0x58($sp) /* f15b440: 2604000c */ addiu $a0,$s0,0xc /* f15b444: 0fc575d9 */ jal 0xf15d764 -/* f15b448: 8ca5491c */ lw $a1,0x491c($a1) -/* f15b44c: 3c04800a */ lui $a0,0x800a -/* f15b450: 8c84491c */ lw $a0,0x491c($a0) +/* f15b448: 8ca5491c */ lw $a1,%lo(var800a491c)($a1) +/* f15b44c: 3c04800a */ lui $a0,%hi(var800a491c) +/* f15b450: 8c84491c */ lw $a0,%lo(var800a491c)($a0) /* f15b454: 02202825 */ or $a1,$s1,$zero /* f15b458: 0c00490c */ jal 0x12430 /* f15b45c: 24060004 */ addiu $a2,$zero,0x4 @@ -4321,11 +4321,11 @@ glabel func0f15b534 /* f15b528: 24060004 */ addiu $a2,$zero,0x4 /* f15b52c: 8fae0028 */ lw $t6,0x28($sp) /* f15b530: 8faf0050 */ lw $t7,0x50($sp) -/* f15b534: 3c01800a */ lui $at,0x800a +/* f15b534: 3c01800a */ lui $at,%hi(var800a4924) /* f15b538: 3c044fff */ lui $a0,0x4fff /* f15b53c: 01cfc021 */ addu $t8,$t6,$t7 /* f15b540: 27190004 */ addiu $t9,$t8,0x4 -/* f15b544: ac394924 */ sw $t9,0x4924($at) +/* f15b544: ac394924 */ sw $t9,%lo(var800a4924)($at) /* f15b548: 0fc56cbb */ jal 0xf15b2ec /* f15b54c: 3484fbab */ ori $a0,$a0,0xfbab /* f15b550: 3c04bbb7 */ lui $a0,0xbbb7 @@ -4355,24 +4355,24 @@ glabel func0f15b534 /* f15b5b0: 0c003504 */ jal 0xd410 /* f15b5b4: 24060040 */ addiu $a2,$zero,0x40 .L0f15b5b8: -/* f15b5b8: 3c04800a */ lui $a0,0x800a -/* f15b5bc: 8c84491c */ lw $a0,0x491c($a0) -/* f15b5c0: 3c02800a */ lui $v0,0x800a -/* f15b5c4: 24424920 */ addiu $v0,$v0,0x4920 +/* f15b5b8: 3c04800a */ lui $a0,%hi(var800a491c) +/* f15b5bc: 8c84491c */ lw $a0,%lo(var800a491c)($a0) +/* f15b5c0: 3c02800a */ lui $v0,%hi(var800a4920) +/* f15b5c4: 24424920 */ addiu $v0,$v0,%lo(var800a4920) /* f15b5c8: 8c8a0000 */ lw $t2,0x0($a0) /* f15b5cc: 3c07f100 */ lui $a3,0xf100 -/* f15b5d0: 3c08800a */ lui $t0,0x800a +/* f15b5d0: 3c08800a */ lui $t0,%hi(var800a4cc4) /* f15b5d4: 15400038 */ bnez $t2,.L0f15b6b8 /* f15b5d8: ac4a0000 */ sw $t2,0x0($v0) -/* f15b5dc: 3c02800a */ lui $v0,0x800a -/* f15b5e0: 24424cc0 */ addiu $v0,$v0,0x4cc0 +/* f15b5dc: 3c02800a */ lui $v0,%hi(var800a4cc0) +/* f15b5e0: 24424cc0 */ addiu $v0,$v0,%lo(var800a4cc0) /* f15b5e4: ac440000 */ sw $a0,0x0($v0) /* f15b5e8: 8c8c0004 */ lw $t4,0x4($a0) -/* f15b5ec: 3c03800a */ lui $v1,0x800a -/* f15b5f0: 25084cc4 */ addiu $t0,$t0,0x4cc4 +/* f15b5ec: 3c03800a */ lui $v1,%hi(g_Vars) +/* f15b5f0: 25084cc4 */ addiu $t0,$t0,%lo(var800a4cc4) /* f15b5f4: 01846821 */ addu $t5,$t4,$a0 /* f15b5f8: 01a77021 */ addu $t6,$t5,$a3 -/* f15b5fc: 24639fc0 */ addiu $v1,$v1,-24640 +/* f15b5fc: 24639fc0 */ addiu $v1,$v1,%lo(g_Vars) /* f15b600: ad0e0000 */ sw $t6,0x0($t0) /* f15b604: ac6002bc */ sw $zero,0x2bc($v1) /* f15b608: 8dcf0014 */ lw $t7,0x14($t6) @@ -4390,42 +4390,42 @@ glabel func0f15b534 /* f15b634: 8c7802bc */ lw $t8,0x2bc($v1) /* f15b638: 8caa0008 */ lw $t2,0x8($a1) .L0f15b63c: -/* f15b63c: 3c01800a */ lui $at,0x800a +/* f15b63c: 3c01800a */ lui $at,%hi(g_Portals) /* f15b640: 01445821 */ addu $t3,$t2,$a0 /* f15b644: 01676021 */ addu $t4,$t3,$a3 -/* f15b648: ac2c4cc8 */ sw $t4,0x4cc8($at) +/* f15b648: ac2c4cc8 */ sw $t4,%lo(g_Portals)($at) /* f15b64c: 8ca2000c */ lw $v0,0xc($a1) -/* f15b650: 3c01800a */ lui $at,0x800a +/* f15b650: 3c01800a */ lui $at,%hi(g_PortalCommands) /* f15b654: 14400004 */ bnez $v0,.L0f15b668 /* f15b658: 00446821 */ addu $t5,$v0,$a0 -/* f15b65c: 3c01800a */ lui $at,0x800a +/* f15b65c: 3c01800a */ lui $at,%hi(g_PortalCommands) /* f15b660: 10000003 */ b .L0f15b670 -/* f15b664: ac204cd4 */ sw $zero,0x4cd4($at) +/* f15b664: ac204cd4 */ sw $zero,%lo(g_PortalCommands)($at) .L0f15b668: /* f15b668: 01a77021 */ addu $t6,$t5,$a3 -/* f15b66c: ac2e4cd4 */ sw $t6,0x4cd4($at) +/* f15b66c: ac2e4cd4 */ sw $t6,%lo(g_PortalCommands)($at) .L0f15b670: /* f15b670: 8ca20010 */ lw $v0,0x10($a1) -/* f15b674: 3c01800a */ lui $at,0x800a +/* f15b674: 3c01800a */ lui $at,%hi(var800a4cd8) /* f15b678: 14400004 */ bnez $v0,.L0f15b68c /* f15b67c: 00447821 */ addu $t7,$v0,$a0 -/* f15b680: 3c01800a */ lui $at,0x800a +/* f15b680: 3c01800a */ lui $at,%hi(var800a4cd8) /* f15b684: 10000003 */ b .L0f15b694 -/* f15b688: ac204cd8 */ sw $zero,0x4cd8($at) +/* f15b688: ac204cd8 */ sw $zero,%lo(var800a4cd8)($at) .L0f15b68c: /* f15b68c: 01e7c021 */ addu $t8,$t7,$a3 -/* f15b690: ac384cd8 */ sw $t8,0x4cd8($at) +/* f15b690: ac384cd8 */ sw $t8,%lo(var800a4cd8)($at) .L0f15b694: /* f15b694: 8ca20014 */ lw $v0,0x14($a1) -/* f15b698: 3c01800a */ lui $at,0x800a +/* f15b698: 3c01800a */ lui $at,%hi(var800a4cdc) /* f15b69c: 14400004 */ bnez $v0,.L0f15b6b0 /* f15b6a0: 0044c821 */ addu $t9,$v0,$a0 -/* f15b6a4: 3c01800a */ lui $at,0x800a +/* f15b6a4: 3c01800a */ lui $at,%hi(var800a4cdc) /* f15b6a8: 10000003 */ b .L0f15b6b8 -/* f15b6ac: ac204cdc */ sw $zero,0x4cdc($at) +/* f15b6ac: ac204cdc */ sw $zero,%lo(var800a4cdc)($at) .L0f15b6b0: /* f15b6b0: 03274821 */ addu $t1,$t9,$a3 -/* f15b6b4: ac294cdc */ sw $t1,0x4cdc($at) +/* f15b6b4: ac294cdc */ sw $t1,%lo(var800a4cdc)($at) .L0f15b6b8: /* f15b6b8: 8fbf001c */ lw $ra,0x1c($sp) /* f15b6bc: 8fb00014 */ lw $s0,0x14($sp) @@ -4579,7 +4579,7 @@ glabel var7f1b75d0 /* f15bb00: c5ec0014 */ lwc1 $f12,0x14($t7) /* f15bb04: 3c188008 */ lui $t8,%hi(g_StageIndex) /* f15bb08: 8f18fc00 */ lw $t8,%lo(g_StageIndex)($t8) -/* f15bb0c: 3c018008 */ lui $at,0x8008 +/* f15bb0c: 3c018008 */ lui $at,%hi(g_Stages+0x18) /* f15bb10: 3c02800a */ lui $v0,%hi(g_Vars) /* f15bb14: 0018c8c0 */ sll $t9,$t8,0x3 /* f15bb18: 0338c823 */ subu $t9,$t9,$t8 @@ -4587,7 +4587,7 @@ glabel var7f1b75d0 /* f15bb20: 00390821 */ addu $at,$at,$t9 /* f15bb24: 3c03800a */ lui $v1,%hi(g_Vars+0x200) /* f15bb28: 2463a1c0 */ addiu $v1,$v1,%lo(g_Vars+0x200) -/* f15bb2c: c420fcd8 */ lwc1 $f0,-0x328($at) +/* f15bb2c: c420fcd8 */ lwc1 $f0,%lo(g_Stages+0x18)($at) /* f15bb30: 24429fc0 */ addiu $v0,$v0,%lo(g_Vars) .L0f15bb34: /* f15bb34: 24420080 */ addiu $v0,$v0,0x80 @@ -5510,8 +5510,8 @@ glabel var7f1b75d0 .text /* f15b6cc: 27bdfeb8 */ addiu $sp,$sp,-328 /* f15b6d0: afb30024 */ sw $s3,0x24($sp) -/* f15b6d4: 3c13800a */ lui $s3,0x800a -/* f15b6d8: 26739fc0 */ addiu $s3,$s3,-24640 +/* f15b6d4: 3c13800a */ lui $s3,%hi(g_Vars) +/* f15b6d8: 26739fc0 */ addiu $s3,$s3,%lo(g_Vars) /* f15b6dc: afa40148 */ sw $a0,0x148($sp) /* f15b6e0: 8e6402bc */ lw $a0,0x2bc($s3) /* f15b6e4: afbf003c */ sw $ra,0x3c($sp) @@ -5534,8 +5534,8 @@ glabel var7f1b75d0 /* f15b728: 0c0048f2 */ jal 0x123c8 /* f15b72c: 24050004 */ addiu $a1,$zero,0x4 /* f15b730: 8e6402bc */ lw $a0,0x2bc($s3) -/* f15b734: 3c15800a */ lui $s5,0x800a -/* f15b738: 26b54928 */ addiu $s5,$s5,0x4928 +/* f15b734: 3c15800a */ lui $s5,%hi(g_Rooms) +/* f15b738: 26b54928 */ addiu $s5,$s5,%lo(g_Rooms) /* f15b73c: 0004c880 */ sll $t9,$a0,0x2 /* f15b740: 2724000f */ addiu $a0,$t9,0xf /* f15b744: 348e000f */ ori $t6,$a0,0xf @@ -5544,8 +5544,8 @@ glabel var7f1b75d0 /* f15b750: 0c0048f2 */ jal 0x123c8 /* f15b754: 24050004 */ addiu $a1,$zero,0x4 /* f15b758: 8e7102bc */ lw $s1,0x2bc($s3) -/* f15b75c: 3c03800a */ lui $v1,0x800a -/* f15b760: 24634ce8 */ addiu $v1,$v1,0x4ce8 +/* f15b75c: 3c03800a */ lui $v1,%hi(var800a4ce8) +/* f15b760: 24634ce8 */ addiu $v1,$v1,%lo(var800a4ce8) /* f15b764: ac620000 */ sw $v0,0x0($v1) /* f15b768: 1a200010 */ blez $s1,.L0f15b7ac /* f15b76c: 0000a025 */ or $s4,$zero,$zero @@ -5574,8 +5574,8 @@ glabel var7f1b75d0 /* f15b7c0: 0c0048f2 */ jal 0x123c8 /* f15b7c4: 24050004 */ addiu $a1,$zero,0x4 /* f15b7c8: 8e7102bc */ lw $s1,0x2bc($s3) -/* f15b7cc: 3c03800a */ lui $v1,0x800a -/* f15b7d0: 2463492c */ addiu $v1,$v1,0x492c +/* f15b7cc: 3c03800a */ lui $v1,%hi(g_MpRoomVisibility) +/* f15b7d0: 2463492c */ addiu $v1,$v1,%lo(g_MpRoomVisibility) /* f15b7d4: 1a20000a */ blez $s1,.L0f15b800 /* f15b7d8: ac620000 */ sw $v0,0x0($v1) /* f15b7dc: 8c6f0000 */ lw $t7,0x0($v1) @@ -5624,13 +5624,13 @@ glabel var7f1b75d0 /* f15b87c: 5420ffe3 */ bnezl $at,.L0f15b80c /* f15b880: 8eb90000 */ lw $t9,0x0($s5) .L0f15b884: -/* f15b884: 3c118008 */ lui $s1,0x8008 -/* f15b888: 2631fc00 */ addiu $s1,$s1,-1024 +/* f15b884: 3c118008 */ lui $s1,%hi(g_StageIndex) +/* f15b888: 2631fc00 */ addiu $s1,$s1,%lo(g_StageIndex) /* f15b88c: 8e2e0000 */ lw $t6,0x0($s1) /* f15b890: 24120038 */ addiu $s2,$zero,0x38 -/* f15b894: 3c108008 */ lui $s0,0x8008 +/* f15b894: 3c108008 */ lui $s0,%hi(g_Stages) /* f15b898: 01d20019 */ multu $t6,$s2 -/* f15b89c: 2610fcc0 */ addiu $s0,$s0,-832 +/* f15b89c: 2610fcc0 */ addiu $s0,$s0,%lo(g_Stages) /* f15b8a0: 00007812 */ mflo $t7 /* f15b8a4: 020fc021 */ addu $t8,$s0,$t7 /* f15b8a8: 0fc5718f */ jal 0xf15c63c @@ -5641,18 +5641,18 @@ glabel var7f1b75d0 /* f15b8bc: 020e7821 */ addu $t7,$s0,$t6 /* f15b8c0: 0fc0a124 */ jal 0xf028490 /* f15b8c4: c5ec0014 */ lwc1 $f12,0x14($t7) -/* f15b8c8: 3c188008 */ lui $t8,0x8008 -/* f15b8cc: 8f18fc00 */ lw $t8,-0x400($t8) -/* f15b8d0: 3c018008 */ lui $at,0x8008 -/* f15b8d4: 3c02800a */ lui $v0,0x800a +/* f15b8c8: 3c188008 */ lui $t8,%hi(g_StageIndex) +/* f15b8cc: 8f18fc00 */ lw $t8,%lo(g_StageIndex)($t8) +/* f15b8d0: 3c018008 */ lui $at,%hi(g_Stages+0x18) +/* f15b8d4: 3c02800a */ lui $v0,%hi(g_Vars) /* f15b8d8: 0018c8c0 */ sll $t9,$t8,0x3 /* f15b8dc: 0338c823 */ subu $t9,$t9,$t8 /* f15b8e0: 0019c8c0 */ sll $t9,$t9,0x3 /* f15b8e4: 00390821 */ addu $at,$at,$t9 -/* f15b8e8: 3c03800a */ lui $v1,0x800a -/* f15b8ec: 2463a1c0 */ addiu $v1,$v1,-24128 -/* f15b8f0: c420fcd8 */ lwc1 $f0,-0x328($at) -/* f15b8f4: 24429fc0 */ addiu $v0,$v0,-24640 +/* f15b8e8: 3c03800a */ lui $v1,%hi(g_Vars+0x200) +/* f15b8ec: 2463a1c0 */ addiu $v1,$v1,%lo(g_Vars+0x200) +/* f15b8f0: c420fcd8 */ lwc1 $f0,%lo(g_Stages+0x18)($at) +/* f15b8f4: 24429fc0 */ addiu $v0,$v0,%lo(g_Vars) .L0f15b8f8: /* f15b8f8: 24420080 */ addiu $v0,$v0,0x80 /* f15b8fc: 0043082b */ sltu $at,$v0,$v1 @@ -5662,10 +5662,10 @@ glabel var7f1b75d0 /* f15b90c: 44816000 */ mtc1 $at,$f12 /* f15b910: 0c0059d2 */ jal 0x16748 /* f15b914: 00000000 */ nop -/* f15b918: 3c0e800a */ lui $t6,0x800a -/* f15b91c: 8dce4920 */ lw $t6,0x4920($t6) -/* f15b920: 3c17800a */ lui $s7,0x800a -/* f15b924: 26f74cc8 */ addiu $s7,$s7,0x4cc8 +/* f15b918: 3c0e800a */ lui $t6,%hi(var800a4920) +/* f15b91c: 8dce4920 */ lw $t6,%lo(var800a4920)($t6) +/* f15b920: 3c17800a */ lui $s7,%hi(g_Portals) +/* f15b924: 26f74cc8 */ addiu $s7,$s7,%lo(g_Portals) /* f15b928: 15c00322 */ bnez $t6,.L0f15c5b4 /* f15b92c: 24050004 */ addiu $a1,$zero,0x4 /* f15b930: 8ef00000 */ lw $s0,0x0($s7) @@ -5681,15 +5681,15 @@ glabel var7f1b75d0 /* f15b954: 94580008 */ lhu $t8,0x8($v0) .L0f15b958: /* f15b958: 001ec900 */ sll $t9,$s8,0x4 -/* f15b95c: 3c028008 */ lui $v0,0x8008 +/* f15b95c: 3c028008 */ lui $v0,%hi(g_NumPortalThings) /* f15b960: 2724000f */ addiu $a0,$t9,0xf -/* f15b964: 2442fc40 */ addiu $v0,$v0,-960 +/* f15b964: 2442fc40 */ addiu $v0,$v0,%lo(g_NumPortalThings) /* f15b968: 348e000f */ ori $t6,$a0,0xf /* f15b96c: ac5e0000 */ sw $s8,0x0($v0) /* f15b970: 0c0048f2 */ jal 0x123c8 /* f15b974: 39c4000f */ xori $a0,$t6,0xf -/* f15b978: 3c01800a */ lui $at,0x800a -/* f15b97c: ac224cec */ sw $v0,0x4cec($at) +/* f15b978: 3c01800a */ lui $at,%hi(g_PortalThings) +/* f15b97c: ac224cec */ sw $v0,%lo(g_PortalThings)($at) /* f15b980: 001e20c0 */ sll $a0,$s8,0x3 /* f15b984: 24840008 */ addiu $a0,$a0,0x8 /* f15b988: 8ef00000 */ lw $s0,0x0($s7) @@ -5736,11 +5736,11 @@ glabel var7f1b75d0 /* f15ba10: 39c4000f */ xori $a0,$t6,0xf /* f15ba14: 0c0048f2 */ jal 0x123c8 /* f15ba18: 24050004 */ addiu $a1,$zero,0x4 -/* f15ba1c: 3c05800a */ lui $a1,0x800a -/* f15ba20: 24a59fc0 */ addiu $a1,$a1,-24640 +/* f15ba1c: 3c05800a */ lui $a1,%hi(g_Vars) +/* f15ba20: 24a59fc0 */ addiu $a1,$a1,%lo(g_Vars) /* f15ba24: 8cb102bc */ lw $s1,0x2bc($a1) -/* f15ba28: 3c13800a */ lui $s3,0x800a -/* f15ba2c: 26734ce0 */ addiu $s3,$s3,0x4ce0 +/* f15ba28: 3c13800a */ lui $s3,%hi(var800a4ce0) +/* f15ba2c: 26734ce0 */ addiu $s3,$s3,%lo(var800a4ce0) /* f15ba30: ae620000 */ sw $v0,0x0($s3) /* f15ba34: aca0002c */ sw $zero,0x2c($a1) /* f15ba38: 1a200033 */ blez $s1,.L0f15bb08 @@ -5781,8 +5781,8 @@ glabel var7f1b75d0 .L0f15bab8: /* f15bab8: 16deffe8 */ bne $s6,$s8,.L0f15ba5c /* f15babc: 24630008 */ addiu $v1,$v1,0x8 -/* f15bac0: 3c05800a */ lui $a1,0x800a -/* f15bac4: 24a59fc0 */ addiu $a1,$a1,-24640 +/* f15bac0: 3c05800a */ lui $a1,%hi(g_Vars) +/* f15bac4: 24a59fc0 */ addiu $a1,$a1,%lo(g_Vars) /* f15bac8: 0000b025 */ or $s6,$zero,$zero .L0f15bacc: /* f15bacc: 8eb80000 */ lw $t8,0x0($s5) @@ -5892,8 +5892,8 @@ glabel var7f1b75d0 /* f15bc3c: 26310002 */ addiu $s1,$s1,0x2 /* f15bc40: 1420ffbe */ bnez $at,.L0f15bb3c /* f15bc44: 27ff0002 */ addiu $ra,$ra,0x2 -/* f15bc48: 3c11800a */ lui $s1,0x800a -/* f15bc4c: 8e31a27c */ lw $s1,-0x5d84($s1) +/* f15bc48: 3c11800a */ lui $s1,%hi(g_Vars+0x2bc) +/* f15bc4c: 8e31a27c */ lw $s1,%lo(g_Vars+0x2bc)($s1) /* f15bc50: 0000b025 */ or $s6,$zero,$zero /* f15bc54: 26940001 */ addiu $s4,$s4,0x1 .L0f15bc58: @@ -5914,8 +5914,8 @@ glabel var7f1b75d0 /* f15bc84: 3498000f */ ori $t8,$a0,0xf /* f15bc88: 0c0048f2 */ jal 0x123c8 /* f15bc8c: 3b04000f */ xori $a0,$t8,0xf -/* f15bc90: 3c10800a */ lui $s0,0x800a -/* f15bc94: 26104cd0 */ addiu $s0,$s0,0x4cd0 +/* f15bc90: 3c10800a */ lui $s0,%hi(var800a4cd0) +/* f15bc94: 26104cd0 */ addiu $s0,$s0,%lo(var800a4cd0) /* f15bc98: 1bc00009 */ blez $s8,.L0f15bcc0 /* f15bc9c: ae020000 */ sw $v0,0x0($s0) .L0f15bca0: @@ -5936,9 +5936,9 @@ glabel var7f1b75d0 /* f15bcd4: 3b04000f */ xori $a0,$t8,0xf /* f15bcd8: 0c0048f2 */ jal 0x123c8 /* f15bcdc: 24050004 */ addiu $a1,$zero,0x4 -/* f15bce0: 3c01800a */ lui $at,0x800a +/* f15bce0: 3c01800a */ lui $at,%hi(var800a4ccc) /* f15bce4: 1bc00095 */ blez $s8,.L0f15bf3c -/* f15bce8: ac224ccc */ sw $v0,0x4ccc($at) +/* f15bce8: ac224ccc */ sw $v0,%lo(var800a4ccc)($at) /* f15bcec: 44808000 */ mtc1 $zero,$f16 /* f15bcf0: 00009025 */ or $s2,$zero,$zero /* f15bcf4: 00003025 */ or $a2,$zero,$zero @@ -6030,7 +6030,7 @@ glabel var7f1b75d0 /* f15be38: 44808000 */ mtc1 $zero,$f16 /* f15be3c: 8fa60064 */ lw $a2,0x64($sp) /* f15be40: 02201825 */ or $v1,$s1,$zero -/* f15be44: 3c18800a */ lui $t8,0x800a +/* f15be44: 3c18800a */ lui $t8,%hi(var800a4ccc) /* f15be48: 46025203 */ div.s $f8,$f10,$f2 /* f15be4c: e7a600f8 */ swc1 $f6,0xf8($sp) /* f15be50: c426745c */ lwc1 $f6,0x745c($at) @@ -6079,7 +6079,7 @@ glabel var7f1b75d0 /* f15bef0: c4680004 */ lwc1 $f8,0x4($v1) /* f15bef4: 0000b025 */ or $s6,$zero,$zero .L0f15bef8: -/* f15bef8: 8f184ccc */ lw $t8,0x4ccc($t8) +/* f15bef8: 8f184ccc */ lw $t8,%lo(var800a4ccc)($t8) /* f15befc: c7aa00f8 */ lwc1 $f10,0xf8($sp) /* f15bf00: 26940001 */ addiu $s4,$s4,0x1 /* f15bf04: 00d81021 */ addu $v0,$a2,$t8 @@ -6099,8 +6099,8 @@ glabel var7f1b75d0 .L0f15bf3c: /* f15bf3c: 0fc2d96a */ jal 0xf0b65a8 /* f15bf40: 03c02025 */ or $a0,$s8,$zero -/* f15bf44: 3c1e800a */ lui $s8,0x800a -/* f15bf48: 27de4cd4 */ addiu $s8,$s8,0x4cd4 +/* f15bf44: 3c1e800a */ lui $s8,%hi(g_PortalCommands) +/* f15bf48: 27de4cd4 */ addiu $s8,$s8,%lo(g_PortalCommands) /* f15bf4c: 8fc30000 */ lw $v1,0x0($s8) /* f15bf50: 1060001c */ beqz $v1,.L0f15bfc4 /* f15bf54: 00000000 */ nop @@ -6109,8 +6109,8 @@ glabel var7f1b75d0 /* f15bf60: 00608025 */ or $s0,$v1,$zero /* f15bf64: 11c00017 */ beqz $t6,.L0f15bfc4 /* f15bf68: 31c200ff */ andi $v0,$t6,0xff -/* f15bf6c: 3c13800a */ lui $s3,0x800a -/* f15bf70: 2673491c */ addiu $s3,$s3,0x491c +/* f15bf6c: 3c13800a */ lui $s3,%hi(var800a491c) +/* f15bf70: 2673491c */ addiu $s3,$s3,%lo(var800a491c) /* f15bf74: 3c14f100 */ lui $s4,0xf100 /* f15bf78: 24110064 */ addiu $s1,$zero,0x64 .L0f15bf7c: @@ -6134,8 +6134,8 @@ glabel var7f1b75d0 /* f15bfbc: 00000000 */ nop /* f15bfc0: 0000a025 */ or $s4,$zero,$zero .L0f15bfc4: -/* f15bfc4: 3c13800a */ lui $s3,0x800a -/* f15bfc8: 26739fc0 */ addiu $s3,$s3,-24640 +/* f15bfc4: 3c13800a */ lui $s3,%hi(g_Vars) +/* f15bfc8: 26739fc0 */ addiu $s3,$s3,%lo(g_Vars) /* f15bfcc: 8e7802bc */ lw $t8,0x2bc($s3) /* f15bfd0: 1b000021 */ blez $t8,.L0f15c058 /* f15bfd4: 00009025 */ or $s2,$zero,$zero @@ -6191,9 +6191,9 @@ glabel var7f1b75d0 /* f15c094: e730002c */ swc1 $f16,0x2c($t9) /* f15c098: 03a08025 */ or $s0,$sp,$zero /* f15c09c: 261000b3 */ addiu $s0,$s0,0xb3 -/* f15c0a0: 3c12800a */ lui $s2,0x800a +/* f15c0a0: 3c12800a */ lui $s2,%hi(var800a4924) /* f15c0a4: 3618000f */ ori $t8,$s0,0xf -/* f15c0a8: 26524924 */ addiu $s2,$s2,0x4924 +/* f15c0a8: 26524924 */ addiu $s2,$s2,%lo(var800a4924) /* f15c0ac: 3b04000f */ xori $a0,$t8,0xf /* f15c0b0: 00808025 */ or $s0,$a0,$zero /* f15c0b4: 8e450000 */ lw $a1,0x0($s2) @@ -6227,11 +6227,11 @@ glabel var7f1b75d0 /* f15c124: 2c610002 */ sltiu $at,$v1,0x2 /* f15c128: 1420007a */ bnez $at,.L0f15c314 /* f15c12c: 3c013f00 */ lui $at,0x3f00 -/* f15c130: 3c1e800a */ lui $s8,0x800a -/* f15c134: 3c13800a */ lui $s3,0x800a +/* f15c130: 3c1e800a */ lui $s8,%hi(g_Vars) +/* f15c134: 3c13800a */ lui $s3,%hi(var800a4cc4) /* f15c138: 44818000 */ mtc1 $at,$f16 -/* f15c13c: 26734cc4 */ addiu $s3,$s3,0x4cc4 -/* f15c140: 27de9fc0 */ addiu $s8,$s8,-24640 +/* f15c13c: 26734cc4 */ addiu $s3,$s3,%lo(var800a4cc4) +/* f15c140: 27de9fc0 */ addiu $s8,$s8,%lo(g_Vars) /* f15c144: 2411008c */ addiu $s1,$zero,0x8c /* f15c148: 24120014 */ addiu $s2,$zero,0x14 /* f15c14c: 86190000 */ lh $t9,0x0($s0) @@ -6350,9 +6350,9 @@ glabel var7f1b75d0 /* f15c30c: 86190000 */ lh $t9,0x0($s0) /* f15c310: 24140001 */ addiu $s4,$zero,0x1 .L0f15c314: -/* f15c314: 3c1e800a */ lui $s8,0x800a +/* f15c314: 3c1e800a */ lui $s8,%hi(g_Vars) /* f15c318: 2c610002 */ sltiu $at,$v1,0x2 -/* f15c31c: 27de9fc0 */ addiu $s8,$s8,-24640 +/* f15c31c: 27de9fc0 */ addiu $s8,$s8,%lo(g_Vars) /* f15c320: 14200012 */ bnez $at,.L0f15c36c /* f15c324: 02001025 */ or $v0,$s0,$zero /* f15c328: 2411008c */ addiu $s1,$zero,0x8c @@ -6428,10 +6428,10 @@ glabel var7f1b75d0 /* f15c428: 2a210002 */ slti $at,$s1,0x2 .L0f15c42c: /* f15c42c: 1420000b */ bnez $at,.L0f15c45c -/* f15c430: 3c0c800a */ lui $t4,0x800a -/* f15c434: 8d8c4928 */ lw $t4,0x4928($t4) -/* f15c438: 3c1e800a */ lui $s8,0x800a -/* f15c43c: 27de9fc0 */ addiu $s8,$s8,-24640 +/* f15c430: 3c0c800a */ lui $t4,%hi(g_Rooms) +/* f15c434: 8d8c4928 */ lw $t4,%lo(g_Rooms)($t4) +/* f15c438: 3c1e800a */ lui $s8,%hi(g_Vars) +/* f15c43c: 27de9fc0 */ addiu $s8,$s8,%lo(g_Vars) /* f15c440: 258c008c */ addiu $t4,$t4,0x8c .L0f15c444: /* f15c444: 81990008 */ lb $t9,0x8($t4) @@ -6442,7 +6442,7 @@ glabel var7f1b75d0 /* f15c458: 02d9b021 */ addu $s6,$s6,$t9 .L0f15c45c: /* f15c45c: 12c0001c */ beqz $s6,.L0f15c4d0 -/* f15c460: 3c03800a */ lui $v1,0x800a +/* f15c460: 3c03800a */ lui $v1,%hi(g_Menus+0x2000) /* f15c464: 00162080 */ sll $a0,$s6,0x2 /* f15c468: 00962023 */ subu $a0,$a0,$s6 /* f15c46c: 2484000f */ addiu $a0,$a0,0xf @@ -6450,9 +6450,9 @@ glabel var7f1b75d0 /* f15c474: 39e4000f */ xori $a0,$t7,0xf /* f15c478: 0c0048f2 */ jal 0x123c8 /* f15c47c: 24050004 */ addiu $a1,$zero,0x4 -/* f15c480: 3c03800a */ lui $v1,0x800a -/* f15c484: 246341a0 */ addiu $v1,$v1,0x41a0 -/* f15c488: ac620000 */ sw $v0,0x0($v1) +/* f15c480: 3c03800a */ lui $v1,%hi(var800a41a0) +/* f15c484: 246341a0 */ addiu $v1,$v1,%lo(var800a41a0) +/* f15c488: ac620000 */ sw $v0,%lo(g_Menus+0x2000)($v1) /* f15c48c: 1ac00013 */ blez $s6,.L0f15c4dc /* f15c490: 0000a025 */ or $s4,$zero,$zero /* f15c494: 00001025 */ or $v0,$zero,$zero @@ -6492,8 +6492,8 @@ glabel var7f1b75d0 /* f15c50c: 15e0fff8 */ bnez $t7,.L0f15c4f0 /* f15c510: 00000000 */ nop .L0f15c514: -/* f15c514: 3c10800a */ lui $s0,0x800a -/* f15c518: 26109fc0 */ addiu $s0,$s0,-24640 +/* f15c514: 3c10800a */ lui $s0,%hi(g_Vars) +/* f15c518: 26109fc0 */ addiu $s0,$s0,%lo(g_Vars) /* f15c51c: 8e1102bc */ lw $s1,0x2bc($s0) /* f15c520: 24140001 */ addiu $s4,$zero,0x1 /* f15c524: 2a210002 */ slti $at,$s1,0x2 @@ -6541,9 +6541,9 @@ glabel var7f1b75d0 /* f15c5b4: 0fc59729 */ jal 0xf165ca4 /* f15c5b8: 8fa40148 */ lw $a0,0x148($sp) /* f15c5bc: 241900c8 */ addiu $t9,$zero,0xc8 -/* f15c5c0: 3c018008 */ lui $at,0x8008 +/* f15c5c0: 3c018008 */ lui $at,%hi(var8007fc10) /* f15c5c4: 0fc04d54 */ jal 0xf013550 -/* f15c5c8: a439fc10 */ sh $t9,-0x3f0($at) +/* f15c5c8: a439fc10 */ sh $t9,%lo(var8007fc10)($at) /* f15c5cc: 0fc00aa6 */ jal 0xf002a98 /* f15c5d0: 00000000 */ nop /* f15c5d4: 0fc00703 */ jal 0xf001c0c @@ -15225,31 +15225,31 @@ glabel var7f1b76c0 /* f164264: 24840001 */ addiu $a0,$a0,0x1 /* f164268: 8cad00bc */ lw $t5,0xbc($a1) /* f16426c: c4680030 */ lwc1 $f8,0x30($v1) -/* f164270: 3c01800a */ lui $at,0x800a +/* f164270: 3c01800a */ lui $at,%hi(var8009dd4c) /* f164274: c5a60008 */ lwc1 $f6,0x8($t5) -/* f164278: c434dd4c */ lwc1 $f20,-0x22b4($at) -/* f16427c: 3c01800a */ lui $at,0x800a +/* f164278: c434dd4c */ lwc1 $f20,%lo(var8009dd4c)($at) +/* f16427c: 3c01800a */ lui $at,%hi(var8009dd48) /* f164280: 46083281 */ sub.s $f10,$f6,$f8 -/* f164284: c436dd48 */ lwc1 $f22,-0x22b8($at) -/* f164288: 3c01800a */ lui $at,0x800a -/* f16428c: c438dd40 */ lwc1 $f24,-0x22c0($at) +/* f164284: c436dd48 */ lwc1 $f22,%lo(var8009dd48)($at) +/* f164288: 3c01800a */ lui $at,%hi(var8009dd40) +/* f16428c: c438dd40 */ lwc1 $f24,%lo(var8009dd40)($at) /* f164290: e7aa00b0 */ swc1 $f10,0xb0($sp) /* f164294: 8cae00bc */ lw $t6,0xbc($a1) /* f164298: c4660034 */ lwc1 $f6,0x34($v1) -/* f16429c: 3c01800a */ lui $at,0x800a +/* f16429c: 3c01800a */ lui $at,%hi(var8009dd44) /* f1642a0: c5c4000c */ lwc1 $f4,0xc($t6) -/* f1642a4: c43add44 */ lwc1 $f26,-0x22bc($at) -/* f1642a8: 3c01800a */ lui $at,0x800a +/* f1642a4: c43add44 */ lwc1 $f26,%lo(var8009dd44)($at) +/* f1642a8: 3c01800a */ lui $at,%hi(var8009dd5c) /* f1642ac: 46062201 */ sub.s $f8,$f4,$f6 -/* f1642b0: c43cdd5c */ lwc1 $f28,-0x22a4($at) -/* f1642b4: 3c01800a */ lui $at,0x800a -/* f1642b8: c43edd58 */ lwc1 $f30,-0x22a8($at) +/* f1642b0: c43cdd5c */ lwc1 $f28,%lo(var8009dd5c)($at) +/* f1642b4: 3c01800a */ lui $at,%hi(var8009dd58) +/* f1642b8: c43edd58 */ lwc1 $f30,%lo(var8009dd58)($at) /* f1642bc: e7a800b4 */ swc1 $f8,0xb4($sp) /* f1642c0: 8caf00bc */ lw $t7,0xbc($a1) /* f1642c4: c4640038 */ lwc1 $f4,0x38($v1) /* f1642c8: c7a800b0 */ lwc1 $f8,0xb0($sp) /* f1642cc: c5ea0010 */ lwc1 $f10,0x10($t7) -/* f1642d0: 3c01800a */ lui $at,0x800a +/* f1642d0: 3c01800a */ lui $at,%hi(var8009dd50) /* f1642d4: 46045181 */ sub.s $f6,$f10,$f4 /* f1642d8: 46084282 */ mul.s $f10,$f8,$f8 /* f1642dc: c7a400b4 */ lwc1 $f4,0xb4($sp) @@ -15263,32 +15263,32 @@ glabel var7f1b76c0 /* f1642fc: c46e0038 */ lwc1 $f14,0x38($v1) /* f164300: 46065200 */ add.s $f8,$f10,$f6 /* f164304: 46042282 */ mul.s $f10,$f4,$f4 -/* f164308: c426dd50 */ lwc1 $f6,-0x22b0($at) -/* f16430c: 3c01800a */ lui $at,0x800a -/* f164310: c424dd54 */ lwc1 $f4,-0x22ac($at) -/* f164314: 3c01800a */ lui $at,0x800a +/* f164308: c426dd50 */ lwc1 $f6,%lo(var8009dd50)($at) +/* f16430c: 3c01800a */ lui $at,%hi(var8009dd54) +/* f164310: c424dd54 */ lwc1 $f4,%lo(var8009dd54)($at) +/* f164314: 3c01800a */ lui $at,%hi(var8009dd2c) /* f164318: e7a6006c */ swc1 $f6,0x6c($sp) /* f16431c: e7a40068 */ swc1 $f4,0x68($sp) /* f164320: 46085480 */ add.s $f18,$f10,$f8 -/* f164324: c42add2c */ lwc1 $f10,-0x22d4($at) -/* f164328: 3c01800a */ lui $at,0x800a -/* f16432c: c428dd28 */ lwc1 $f8,-0x22d8($at) -/* f164330: 3c01800a */ lui $at,0x800a -/* f164334: c426dd20 */ lwc1 $f6,-0x22e0($at) -/* f164338: 3c01800a */ lui $at,0x800a -/* f16433c: c424dd24 */ lwc1 $f4,-0x22dc($at) -/* f164340: 3c01800a */ lui $at,0x800a +/* f164324: c42add2c */ lwc1 $f10,%lo(var8009dd2c)($at) +/* f164328: 3c01800a */ lui $at,%hi(var8009dd28) +/* f16432c: c428dd28 */ lwc1 $f8,%lo(var8009dd28)($at) +/* f164330: 3c01800a */ lui $at,%hi(var8009dd20) +/* f164334: c426dd20 */ lwc1 $f6,%lo(var8009dd20)($at) +/* f164338: 3c01800a */ lui $at,%hi(var8009dd24) +/* f16433c: c424dd24 */ lwc1 $f4,%lo(var8009dd24)($at) +/* f164340: 3c01800a */ lui $at,%hi(var8009dd3c) /* f164344: e7aa0064 */ swc1 $f10,0x64($sp) -/* f164348: c42add3c */ lwc1 $f10,-0x22c4($at) -/* f16434c: 3c01800a */ lui $at,0x800a +/* f164348: c42add3c */ lwc1 $f10,%lo(var8009dd3c)($at) +/* f16434c: 3c01800a */ lui $at,%hi(var8009dd38) /* f164350: e7a80060 */ swc1 $f8,0x60($sp) -/* f164354: c428dd38 */ lwc1 $f8,-0x22c8($at) -/* f164358: 3c01800a */ lui $at,0x800a +/* f164354: c428dd38 */ lwc1 $f8,%lo(var8009dd38)($at) +/* f164358: 3c01800a */ lui $at,%hi(var8009dd30) /* f16435c: e7a6005c */ swc1 $f6,0x5c($sp) -/* f164360: c426dd30 */ lwc1 $f6,-0x22d0($at) -/* f164364: 3c01800a */ lui $at,0x800a +/* f164360: c426dd30 */ lwc1 $f6,%lo(var8009dd30)($at) +/* f164364: 3c01800a */ lui $at,%hi(var8009dd34) /* f164368: e7a40058 */ swc1 $f4,0x58($sp) -/* f16436c: c424dd34 */ lwc1 $f4,-0x22cc($at) +/* f16436c: c424dd34 */ lwc1 $f4,%lo(var8009dd34)($at) /* f164370: e7aa0054 */ swc1 $f10,0x54($sp) /* f164374: c50a0000 */ lwc1 $f10,0x0($t0) /* f164378: e7a80050 */ swc1 $f8,0x50($sp) diff --git a/src/game/game_165670.c b/src/game/game_165670.c index ba41b1873..85a54c7af 100644 --- a/src/game/game_165670.c +++ b/src/game/game_165670.c @@ -131,15 +131,15 @@ glabel func0f1657cc /* f1657cc: 3c028008 */ lui $v0,%hi(var80081058) /* f1657d0: 03e00008 */ jr $ra /* f1657d4: 24421058 */ addiu $v0,$v0,%lo(var80081058) -/* f1657d8: 3c018008 */ lui $at,0x8008 +/* f1657d8: 3c018008 */ lui $at,%hi(var80081050) /* f1657dc: 03e00008 */ jr $ra -/* f1657e0: c4201050 */ lwc1 $f0,0x1050($at) +/* f1657e0: c4201050 */ lwc1 $f0,%lo(var80081050)($at) ); GLOBAL_ASM( glabel func0f1657e4 -/* f1657e4: 3c018008 */ lui $at,0x8008 -/* f1657e8: c4221050 */ lwc1 $f2,0x1050($at) +/* f1657e4: 3c018008 */ lui $at,%hi(var80081050) +/* f1657e8: c4221050 */ lwc1 $f2,%lo(var80081050)($at) /* f1657ec: 46021002 */ mul.s $f0,$f2,$f2 /* f1657f0: 03e00008 */ jr $ra /* f1657f4: 00000000 */ nop @@ -180,7 +180,7 @@ glabel func0f1657f8 /* f165870: 468021a0 */ cvt.s.w $f6,$f4 /* f165874: e46a0000 */ swc1 $f10,0x0($v1) /* f165878: c42876e4 */ lwc1 $f8,%lo(var7f1b76e4)($at) -/* f16587c: 3c018008 */ lui $at,0x8008 +/* f16587c: 3c018008 */ lui $at,%hi(var80081050) /* f165880: 46008403 */ div.s $f16,$f16,$f0 /* f165884: 46083282 */ mul.s $f10,$f6,$f8 /* f165888: e4aa0000 */ swc1 $f10,0x0($a1) @@ -190,14 +190,14 @@ glabel func0f1657f8 /* f165898: 46028481 */ sub.s $f18,$f16,$f2 /* f16589c: 46069202 */ mul.s $f8,$f18,$f6 /* f1658a0: 46081280 */ add.s $f10,$f2,$f8 -/* f1658a4: e42a1050 */ swc1 $f10,0x1050($at) +/* f1658a4: e42a1050 */ swc1 $f10,%lo(var80081050)($at) /* f1658a8: c46c0000 */ lwc1 $f12,0x0($v1) -/* f1658ac: 3c018008 */ lui $at,0x8008 +/* f1658ac: 3c018008 */ lui $at,%hi(var80081054) /* f1658b0: c7aa001c */ lwc1 $f10,0x1c($sp) /* f1658b4: 460c9102 */ mul.s $f4,$f18,$f12 /* f1658b8: 46041180 */ add.s $f6,$f2,$f4 /* f1658bc: 460c5101 */ sub.s $f4,$f10,$f12 -/* f1658c0: e4261054 */ swc1 $f6,0x1054($at) +/* f1658c0: e4261054 */ swc1 $f6,%lo(var80081054)($at) /* f1658c4: e4420000 */ swc1 $f2,0x0($v0) /* f1658c8: 3c014300 */ lui $at,0x4300 /* f1658cc: c4480000 */ lwc1 $f8,0x0($v0) @@ -670,11 +670,11 @@ glabel func0f165eec .L0f165f60: /* f165f60: c42476e8 */ lwc1 $f4,%lo(var7f1b76e8)($at) /* f165f64: 8fa8001c */ lw $t0,0x1c($sp) -/* f165f68: 3c018008 */ lui $at,0x8008 -/* f165f6c: e4241050 */ swc1 $f4,0x1050($at) -/* f165f70: 3c018008 */ lui $at,0x8008 +/* f165f68: 3c018008 */ lui $at,%hi(var80081050) +/* f165f6c: e4241050 */ swc1 $f4,%lo(var80081050)($at) +/* f165f70: 3c018008 */ lui $at,%hi(var80081054) /* f165f74: 11000018 */ beqz $t0,.L0f165fd8 -/* f165f78: e4261054 */ swc1 $f6,0x1054($at) +/* f165f78: e4261054 */ swc1 $f6,%lo(var80081054)($at) /* f165f7c: 84690000 */ lh $t1,0x0($v1) /* f165f80: 3c0a8008 */ lui $t2,%hi(smallskies) /* f165f84: 254a1164 */ addiu $t2,$t2,%lo(smallskies) @@ -1047,13 +1047,13 @@ glabel func0f1664a0 /* f1664b4: 00801025 */ or $v0,$a0,$zero .L0f1664b8: /* f1664b8: 10a0003d */ beqz $a1,.L0f1665b0 -/* f1664bc: 3c078008 */ lui $a3,0x8008 +/* f1664bc: 3c078008 */ lui $a3,%hi(g_Stages+0x34a) /* f1664c0: 3c078008 */ lui $a3,%hi(var80081058) /* f1664c4: 00801025 */ or $v0,$a0,$zero /* f1664c8: 3c0ff800 */ lui $t7,0xf800 /* f1664cc: 24e71058 */ addiu $a3,$a3,%lo(var80081058) /* f1664d0: ac4f0000 */ sw $t7,0x0($v0) -/* f1664d4: 90ed000a */ lbu $t5,0xa($a3) +/* f1664d4: 90ed000a */ lbu $t5,%lo(g_Stages+0x34a)($a3) /* f1664d8: 90ea0009 */ lbu $t2,0x9($a3) /* f1664dc: 90f90008 */ lbu $t9,0x8($a3) /* f1664e0: 01a07025 */ or $t6,$t5,$zero @@ -1233,7 +1233,7 @@ glabel func0f1666f8 /* f166744: afa40030 */ sw $a0,0x30($sp) /* f166748: 8fa3001c */ lw $v1,0x1c($sp) /* f16674c: 8fa40030 */ lw $a0,0x30($sp) -/* f166750: 3c018008 */ lui $at,0x8008 +/* f166750: 3c018008 */ lui $at,%hi(var80081050) /* f166754: c4660000 */ lwc1 $f6,0x0($v1) /* f166758: c4840000 */ lwc1 $f4,0x0($a0) /* f16675c: 46062201 */ sub.s $f8,$f4,$f6 @@ -1258,7 +1258,7 @@ glabel func0f1666f8 /* f1667a8: 46048182 */ mul.s $f6,$f16,$f4 /* f1667ac: 46089280 */ add.s $f10,$f18,$f8 /* f1667b0: c7a80034 */ lwc1 $f8,0x34($sp) -/* f1667b4: c4321050 */ lwc1 $f18,0x1050($at) +/* f1667b4: c4321050 */ lwc1 $f18,%lo(var80081050)($at) /* f1667b8: 460a3000 */ add.s $f0,$f6,$f10 /* f1667bc: 46089400 */ add.s $f16,$f18,$f8 /* f1667c0: 4600803c */ c.lt.s $f16,$f0 diff --git a/src/game/game_1668e0.c b/src/game/game_1668e0.c index beb60c0c2..dc3cc78ff 100644 --- a/src/game/game_1668e0.c +++ b/src/game/game_1668e0.c @@ -285,8 +285,8 @@ glabel func0f166c20 /* f166c84: 152d000b */ bne $t1,$t5,.L0f166cb4 /* f166c88: 00000000 */ nop /* f166c8c: 8def666c */ lw $t7,%lo(var800a666c)($t7) -/* f166c90: 3c018006 */ lui $at,0x8006 -/* f166c94: c426ef10 */ lwc1 $f6,-0x10f0($at) +/* f166c90: 3c018006 */ lui $at,%hi(var8005ef10) +/* f166c94: c426ef10 */ lwc1 $f6,%lo(var8005ef10)($at) /* f166c98: 01eec021 */ addu $t8,$t7,$t6 /* f166c9c: c7040000 */ lwc1 $f4,0x0($t8) /* f166ca0: 3c0a800a */ lui $t2,%hi(var800a6660) @@ -328,8 +328,8 @@ glabel func0f166c20 /* f166d20: 3c18800a */ lui $t8,%hi(var800a666c) /* f166d24: a5c90000 */ sh $t1,0x0($t6) /* f166d28: 8f18666c */ lw $t8,%lo(var800a666c)($t8) -/* f166d2c: 3c018006 */ lui $at,0x8006 -/* f166d30: c428ef10 */ lwc1 $f8,-0x10f0($at) +/* f166d2c: 3c018006 */ lui $at,%hi(var8005ef10) +/* f166d30: c428ef10 */ lwc1 $f8,%lo(var8005ef10)($at) /* f166d34: 0010c880 */ sll $t9,$s0,0x2 /* f166d38: 03194021 */ addu $t0,$t8,$t9 /* f166d3c: e5080000 */ swc1 $f8,0x0($t0) diff --git a/src/game/game_167ae0.c b/src/game/game_167ae0.c index f60301f02..4748f9d64 100644 --- a/src/game/game_167ae0.c +++ b/src/game/game_167ae0.c @@ -3473,41 +3473,41 @@ glabel var7f1b78b8 /* f16b104: 44816000 */ mtc1 $at,$f12 /* f16b108: 3c013fc0 */ lui $at,0x3fc0 /* f16b10c: 44818000 */ mtc1 $at,$f16 -/* f16b110: 3c018007 */ lui $at,0x8007 -/* f16b114: e4229948 */ swc1 $f2,-0x66b8($at) -/* f16b118: 3c018007 */ lui $at,0x8007 -/* f16b11c: e422994c */ swc1 $f2,-0x66b4($at) -/* f16b120: 3c018007 */ lui $at,0x8007 -/* f16b124: e42c9950 */ swc1 $f12,-0x66b0($at) -/* f16b128: 3c018007 */ lui $at,0x8007 -/* f16b12c: e42c9954 */ swc1 $f12,-0x66ac($at) -/* f16b130: 3c018007 */ lui $at,0x8007 -/* f16b134: e4229958 */ swc1 $f2,-0x66a8($at) -/* f16b138: 3c018006 */ lui $at,0x8006 -/* f16b13c: e42c2ca0 */ swc1 $f12,0x2ca0($at) +/* f16b110: 3c018007 */ lui $at,%hi(var80069948) +/* f16b114: e4229948 */ swc1 $f2,%lo(var80069948)($at) +/* f16b118: 3c018007 */ lui $at,%hi(var8006994c) +/* f16b11c: e422994c */ swc1 $f2,%lo(var8006994c)($at) +/* f16b120: 3c018007 */ lui $at,%hi(var80069950) +/* f16b124: e42c9950 */ swc1 $f12,%lo(var80069950)($at) +/* f16b128: 3c018007 */ lui $at,%hi(var80069954) +/* f16b12c: e42c9954 */ swc1 $f12,%lo(var80069954)($at) +/* f16b130: 3c018007 */ lui $at,%hi(var80069958) +/* f16b134: e4229958 */ swc1 $f2,%lo(var80069958)($at) +/* f16b138: 3c018006 */ lui $at,%hi(var80062ca0) +/* f16b13c: e42c2ca0 */ swc1 $f12,%lo(var80062ca0)($at) /* f16b140: 3c017f1b */ lui $at,%hi(var7f1b786c) /* f16b144: c424786c */ lwc1 $f4,%lo(var7f1b786c)($at) -/* f16b148: 3c018006 */ lui $at,0x8006 -/* f16b14c: e4242ca4 */ swc1 $f4,0x2ca4($at) +/* f16b148: 3c018006 */ lui $at,%hi(var80062ca4) +/* f16b14c: e4242ca4 */ swc1 $f4,%lo(var80062ca4)($at) /* f16b150: 3c014080 */ lui $at,0x4080 /* f16b154: 44813000 */ mtc1 $at,$f6 -/* f16b158: 3c018006 */ lui $at,0x8006 -/* f16b15c: e4262ca8 */ swc1 $f6,0x2ca8($at) +/* f16b158: 3c018006 */ lui $at,%hi(var80062ca8) +/* f16b15c: e4262ca8 */ swc1 $f6,%lo(var80062ca8)($at) /* f16b160: 3c013e80 */ lui $at,0x3e80 /* f16b164: 44814000 */ mtc1 $at,$f8 -/* f16b168: 3c018008 */ lui $at,0x8008 -/* f16b16c: e428e4a8 */ swc1 $f8,-0x1b58($at) -/* f16b170: 3c018007 */ lui $at,0x8007 -/* f16b174: e4309880 */ swc1 $f16,-0x6780($at) +/* f16b168: 3c018008 */ lui $at,%hi(var8007e4a8) +/* f16b16c: e428e4a8 */ swc1 $f8,%lo(var8007e4a8)($at) +/* f16b170: 3c018007 */ lui $at,%hi(var80069880) +/* f16b174: e4309880 */ swc1 $f16,%lo(var80069880)($at) /* f16b178: 3c014040 */ lui $at,0x4040 /* f16b17c: 44815000 */ mtc1 $at,$f10 -/* f16b180: 3c018007 */ lui $at,0x8007 -/* f16b184: e42a995c */ swc1 $f10,-0x66a4($at) +/* f16b180: 3c018007 */ lui $at,%hi(g_AmmoMultiplier) +/* f16b184: e42a995c */ swc1 $f10,%lo(g_AmmoMultiplier)($at) /* f16b188: 3c017f1b */ lui $at,%hi(var7f1b7870) /* f16b18c: c4327870 */ lwc1 $f18,%lo(var7f1b7870)($at) -/* f16b190: 3c018006 */ lui $at,0x8006 +/* f16b190: 3c018006 */ lui $at,%hi(var80062cac) /* f16b194: 10000196 */ b .L0f16b7f0 -/* f16b198: e4322cac */ swc1 $f18,0x2cac($at) +/* f16b198: e4322cac */ swc1 $f18,%lo(var80062cac)($at) .L0f16b19c: /* f16b19c: 14410029 */ bne $v0,$at,.L0f16b244 /* f16b1a0: 3c014000 */ lui $at,0x4000 @@ -3516,41 +3516,41 @@ glabel var7f1b78b8 /* f16b1ac: 44816000 */ mtc1 $at,$f12 /* f16b1b0: 3c013fc0 */ lui $at,0x3fc0 /* f16b1b4: 44818000 */ mtc1 $at,$f16 -/* f16b1b8: 3c018007 */ lui $at,0x8007 -/* f16b1bc: e4229948 */ swc1 $f2,-0x66b8($at) -/* f16b1c0: 3c018007 */ lui $at,0x8007 -/* f16b1c4: e430994c */ swc1 $f16,-0x66b4($at) -/* f16b1c8: 3c018007 */ lui $at,0x8007 -/* f16b1cc: e42c9950 */ swc1 $f12,-0x66b0($at) -/* f16b1d0: 3c018007 */ lui $at,0x8007 -/* f16b1d4: e42c9954 */ swc1 $f12,-0x66ac($at) -/* f16b1d8: 3c018007 */ lui $at,0x8007 -/* f16b1dc: e4309958 */ swc1 $f16,-0x66a8($at) +/* f16b1b8: 3c018007 */ lui $at,%hi(var80069948) +/* f16b1bc: e4229948 */ swc1 $f2,%lo(var80069948)($at) +/* f16b1c0: 3c018007 */ lui $at,%hi(var8006994c) +/* f16b1c4: e430994c */ swc1 $f16,%lo(var8006994c)($at) +/* f16b1c8: 3c018007 */ lui $at,%hi(var80069950) +/* f16b1cc: e42c9950 */ swc1 $f12,%lo(var80069950)($at) +/* f16b1d0: 3c018007 */ lui $at,%hi(var80069954) +/* f16b1d4: e42c9954 */ swc1 $f12,%lo(var80069954)($at) +/* f16b1d8: 3c018007 */ lui $at,%hi(var80069958) +/* f16b1dc: e4309958 */ swc1 $f16,%lo(var80069958)($at) /* f16b1e0: 3c017f1b */ lui $at,%hi(var7f1b7874) /* f16b1e4: c4247874 */ lwc1 $f4,%lo(var7f1b7874)($at) -/* f16b1e8: 3c018006 */ lui $at,0x8006 -/* f16b1ec: e4242ca0 */ swc1 $f4,0x2ca0($at) -/* f16b1f0: 3c018006 */ lui $at,0x8006 -/* f16b1f4: e42c2ca4 */ swc1 $f12,0x2ca4($at) +/* f16b1e8: 3c018006 */ lui $at,%hi(var80062ca0) +/* f16b1ec: e4242ca0 */ swc1 $f4,%lo(var80062ca0)($at) +/* f16b1f0: 3c018006 */ lui $at,%hi(var80062ca4) +/* f16b1f4: e42c2ca4 */ swc1 $f12,%lo(var80062ca4)($at) /* f16b1f8: 3c014040 */ lui $at,0x4040 /* f16b1fc: 44813000 */ mtc1 $at,$f6 -/* f16b200: 3c018006 */ lui $at,0x8006 -/* f16b204: e4262ca8 */ swc1 $f6,0x2ca8($at) +/* f16b200: 3c018006 */ lui $at,%hi(var80062ca8) +/* f16b204: e4262ca8 */ swc1 $f6,%lo(var80062ca8)($at) /* f16b208: 3c013e80 */ lui $at,0x3e80 /* f16b20c: 44814000 */ mtc1 $at,$f8 -/* f16b210: 3c018008 */ lui $at,0x8008 -/* f16b214: e428e4a8 */ swc1 $f8,-0x1b58($at) +/* f16b210: 3c018008 */ lui $at,%hi(var8007e4a8) +/* f16b214: e428e4a8 */ swc1 $f8,%lo(var8007e4a8)($at) /* f16b218: 3c017f1b */ lui $at,%hi(var7f1b7878) /* f16b21c: c42a7878 */ lwc1 $f10,%lo(var7f1b7878)($at) -/* f16b220: 3c018007 */ lui $at,0x8007 -/* f16b224: e42a9880 */ swc1 $f10,-0x6780($at) +/* f16b220: 3c018007 */ lui $at,%hi(var80069880) +/* f16b224: e42a9880 */ swc1 $f10,%lo(var80069880)($at) /* f16b228: 3c014020 */ lui $at,0x4020 /* f16b22c: 44819000 */ mtc1 $at,$f18 -/* f16b230: 3c018007 */ lui $at,0x8007 -/* f16b234: e432995c */ swc1 $f18,-0x66a4($at) -/* f16b238: 3c018006 */ lui $at,0x8006 +/* f16b230: 3c018007 */ lui $at,%hi(g_AmmoMultiplier) +/* f16b234: e432995c */ swc1 $f18,%lo(g_AmmoMultiplier)($at) +/* f16b238: 3c018006 */ lui $at,%hi(var80062cac) /* f16b23c: 1000016c */ b .L0f16b7f0 -/* f16b240: e42c2cac */ swc1 $f12,0x2cac($at) +/* f16b240: e42c2cac */ swc1 $f12,%lo(var80062cac)($at) .L0f16b244: /* f16b244: 3c013f80 */ lui $at,0x3f80 /* f16b248: 44810000 */ mtc1 $at,$f0 @@ -3560,37 +3560,37 @@ glabel var7f1b78b8 /* f16b258: 44816000 */ mtc1 $at,$f12 /* f16b25c: 3c013f40 */ lui $at,0x3f40 /* f16b260: 44817000 */ mtc1 $at,$f14 -/* f16b264: 3c018007 */ lui $at,0x8007 -/* f16b268: e4229948 */ swc1 $f2,-0x66b8($at) -/* f16b26c: 3c018007 */ lui $at,0x8007 -/* f16b270: e420994c */ swc1 $f0,-0x66b4($at) -/* f16b274: 3c018007 */ lui $at,0x8007 -/* f16b278: e42c9950 */ swc1 $f12,-0x66b0($at) -/* f16b27c: 3c018007 */ lui $at,0x8007 -/* f16b280: e42c9954 */ swc1 $f12,-0x66ac($at) -/* f16b284: 3c018007 */ lui $at,0x8007 -/* f16b288: e4209958 */ swc1 $f0,-0x66a8($at) +/* f16b264: 3c018007 */ lui $at,%hi(var80069948) +/* f16b268: e4229948 */ swc1 $f2,%lo(var80069948)($at) +/* f16b26c: 3c018007 */ lui $at,%hi(var8006994c) +/* f16b270: e420994c */ swc1 $f0,%lo(var8006994c)($at) +/* f16b274: 3c018007 */ lui $at,%hi(var80069950) +/* f16b278: e42c9950 */ swc1 $f12,%lo(var80069950)($at) +/* f16b27c: 3c018007 */ lui $at,%hi(var80069954) +/* f16b280: e42c9954 */ swc1 $f12,%lo(var80069954)($at) +/* f16b284: 3c018007 */ lui $at,%hi(var80069958) +/* f16b288: e4209958 */ swc1 $f0,%lo(var80069958)($at) /* f16b28c: 3c017f1b */ lui $at,%hi(var7f1b787c) /* f16b290: c424787c */ lwc1 $f4,%lo(var7f1b787c)($at) -/* f16b294: 3c018006 */ lui $at,0x8006 -/* f16b298: e4242ca0 */ swc1 $f4,0x2ca0($at) +/* f16b294: 3c018006 */ lui $at,%hi(var80062ca0) +/* f16b298: e4242ca0 */ swc1 $f4,%lo(var80062ca0)($at) /* f16b29c: 3c017f1b */ lui $at,%hi(var7f1b7880) /* f16b2a0: c4267880 */ lwc1 $f6,%lo(var7f1b7880)($at) -/* f16b2a4: 3c018006 */ lui $at,0x8006 -/* f16b2a8: e4262ca4 */ swc1 $f6,0x2ca4($at) -/* f16b2ac: 3c018006 */ lui $at,0x8006 -/* f16b2b0: e4222ca8 */ swc1 $f2,0x2ca8($at) +/* f16b2a4: 3c018006 */ lui $at,%hi(var80062ca4) +/* f16b2a8: e4262ca4 */ swc1 $f6,%lo(var80062ca4)($at) +/* f16b2ac: 3c018006 */ lui $at,%hi(var80062ca8) +/* f16b2b0: e4222ca8 */ swc1 $f2,%lo(var80062ca8)($at) /* f16b2b4: 3c013e80 */ lui $at,0x3e80 /* f16b2b8: 44814000 */ mtc1 $at,$f8 -/* f16b2bc: 3c018008 */ lui $at,0x8008 -/* f16b2c0: e428e4a8 */ swc1 $f8,-0x1b58($at) -/* f16b2c4: 3c018007 */ lui $at,0x8007 -/* f16b2c8: e42e9880 */ swc1 $f14,-0x6780($at) -/* f16b2cc: 3c018007 */ lui $at,0x8007 -/* f16b2d0: e422995c */ swc1 $f2,-0x66a4($at) -/* f16b2d4: 3c018006 */ lui $at,0x8006 +/* f16b2bc: 3c018008 */ lui $at,%hi(var8007e4a8) +/* f16b2c0: e428e4a8 */ swc1 $f8,%lo(var8007e4a8)($at) +/* f16b2c4: 3c018007 */ lui $at,%hi(var80069880) +/* f16b2c8: e42e9880 */ swc1 $f14,%lo(var80069880)($at) +/* f16b2cc: 3c018007 */ lui $at,%hi(g_AmmoMultiplier) +/* f16b2d0: e422995c */ swc1 $f2,%lo(g_AmmoMultiplier)($at) +/* f16b2d4: 3c018006 */ lui $at,%hi(var80062cac) /* f16b2d8: 10000145 */ b .L0f16b7f0 -/* f16b2dc: e4202cac */ swc1 $f0,0x2cac($at) +/* f16b2dc: e4202cac */ swc1 $f0,%lo(var80062cac)($at) /* f16b2e0: 8c440298 */ lw $a0,0x298($v0) .L0f16b2e4: /* f16b2e4: 3c028008 */ lui $v0,%hi(g_Difficulty) @@ -3607,37 +3607,37 @@ glabel var7f1b78b8 /* f16b310: 44816000 */ mtc1 $at,$f12 /* f16b314: 3c013fc0 */ lui $at,0x3fc0 /* f16b318: 44818000 */ mtc1 $at,$f16 -/* f16b31c: 3c018007 */ lui $at,0x8007 -/* f16b320: e4229948 */ swc1 $f2,-0x66b8($at) -/* f16b324: 3c018007 */ lui $at,0x8007 -/* f16b328: e422994c */ swc1 $f2,-0x66b4($at) -/* f16b32c: 3c018007 */ lui $at,0x8007 -/* f16b330: e42c9950 */ swc1 $f12,-0x66b0($at) -/* f16b334: 3c018007 */ lui $at,0x8007 -/* f16b338: e42c9954 */ swc1 $f12,-0x66ac($at) -/* f16b33c: 3c018007 */ lui $at,0x8007 -/* f16b340: e4229958 */ swc1 $f2,-0x66a8($at) +/* f16b31c: 3c018007 */ lui $at,%hi(var80069948) +/* f16b320: e4229948 */ swc1 $f2,%lo(var80069948)($at) +/* f16b324: 3c018007 */ lui $at,%hi(var8006994c) +/* f16b328: e422994c */ swc1 $f2,%lo(var8006994c)($at) +/* f16b32c: 3c018007 */ lui $at,%hi(var80069950) +/* f16b330: e42c9950 */ swc1 $f12,%lo(var80069950)($at) +/* f16b334: 3c018007 */ lui $at,%hi(var80069954) +/* f16b338: e42c9954 */ swc1 $f12,%lo(var80069954)($at) +/* f16b33c: 3c018007 */ lui $at,%hi(var80069958) +/* f16b340: e4229958 */ swc1 $f2,%lo(var80069958)($at) /* f16b344: 3c017f1b */ lui $at,%hi(var7f1b7884) /* f16b348: c42a7884 */ lwc1 $f10,%lo(var7f1b7884)($at) -/* f16b34c: 3c018006 */ lui $at,0x8006 -/* f16b350: e42a2ca0 */ swc1 $f10,0x2ca0($at) -/* f16b354: 3c018006 */ lui $at,0x8006 -/* f16b358: e42c2ca4 */ swc1 $f12,0x2ca4($at) -/* f16b35c: 3c018006 */ lui $at,0x8006 -/* f16b360: e4222ca8 */ swc1 $f2,0x2ca8($at) +/* f16b34c: 3c018006 */ lui $at,%hi(var80062ca0) +/* f16b350: e42a2ca0 */ swc1 $f10,%lo(var80062ca0)($at) +/* f16b354: 3c018006 */ lui $at,%hi(var80062ca4) +/* f16b358: e42c2ca4 */ swc1 $f12,%lo(var80062ca4)($at) +/* f16b35c: 3c018006 */ lui $at,%hi(var80062ca8) +/* f16b360: e4222ca8 */ swc1 $f2,%lo(var80062ca8)($at) /* f16b364: 3c013e80 */ lui $at,0x3e80 /* f16b368: 44819000 */ mtc1 $at,$f18 -/* f16b36c: 3c018008 */ lui $at,0x8008 -/* f16b370: e432e4a8 */ swc1 $f18,-0x1b58($at) -/* f16b374: 3c018007 */ lui $at,0x8007 -/* f16b378: e4309880 */ swc1 $f16,-0x6780($at) -/* f16b37c: 3c018007 */ lui $at,0x8007 -/* f16b380: e422995c */ swc1 $f2,-0x66a4($at) +/* f16b36c: 3c018008 */ lui $at,%hi(var8007e4a8) +/* f16b370: e432e4a8 */ swc1 $f18,%lo(var8007e4a8)($at) +/* f16b374: 3c018007 */ lui $at,%hi(var80069880) +/* f16b378: e4309880 */ swc1 $f16,%lo(var80069880)($at) +/* f16b37c: 3c018007 */ lui $at,%hi(g_AmmoMultiplier) +/* f16b380: e422995c */ swc1 $f2,%lo(g_AmmoMultiplier)($at) /* f16b384: 3c017f1b */ lui $at,%hi(var7f1b7888) /* f16b388: c4247888 */ lwc1 $f4,%lo(var7f1b7888)($at) -/* f16b38c: 3c018006 */ lui $at,0x8006 +/* f16b38c: 3c018006 */ lui $at,%hi(var80062cac) /* f16b390: 10000117 */ b .L0f16b7f0 -/* f16b394: e4242cac */ swc1 $f4,0x2cac($at) +/* f16b394: e4242cac */ swc1 $f4,%lo(var80062cac)($at) .L0f16b398: /* f16b398: 1441002a */ bne $v0,$at,.L0f16b444 /* f16b39c: 3c0f8008 */ lui $t7,%hi(g_LanguageId) @@ -3645,86 +3645,86 @@ glabel var7f1b78b8 /* f16b3a4: 44810000 */ mtc1 $at,$f0 /* f16b3a8: 3c013f40 */ lui $at,0x3f40 /* f16b3ac: 44817000 */ mtc1 $at,$f14 -/* f16b3b0: 3c018007 */ lui $at,0x8007 -/* f16b3b4: e4209948 */ swc1 $f0,-0x66b8($at) -/* f16b3b8: 3c018007 */ lui $at,0x8007 -/* f16b3bc: e420994c */ swc1 $f0,-0x66b4($at) -/* f16b3c0: 3c018007 */ lui $at,0x8007 -/* f16b3c4: e42e9950 */ swc1 $f14,-0x66b0($at) -/* f16b3c8: 3c018007 */ lui $at,0x8007 -/* f16b3cc: e4209954 */ swc1 $f0,-0x66ac($at) -/* f16b3d0: 3c018007 */ lui $at,0x8007 -/* f16b3d4: e4209958 */ swc1 $f0,-0x66a8($at) -/* f16b3d8: 3c018006 */ lui $at,0x8006 -/* f16b3dc: e42e2ca0 */ swc1 $f14,0x2ca0($at) -/* f16b3e0: 3c018006 */ lui $at,0x8006 +/* f16b3b0: 3c018007 */ lui $at,%hi(var80069948) +/* f16b3b4: e4209948 */ swc1 $f0,%lo(var80069948)($at) +/* f16b3b8: 3c018007 */ lui $at,%hi(var8006994c) +/* f16b3bc: e420994c */ swc1 $f0,%lo(var8006994c)($at) +/* f16b3c0: 3c018007 */ lui $at,%hi(var80069950) +/* f16b3c4: e42e9950 */ swc1 $f14,%lo(var80069950)($at) +/* f16b3c8: 3c018007 */ lui $at,%hi(var80069954) +/* f16b3cc: e4209954 */ swc1 $f0,%lo(var80069954)($at) +/* f16b3d0: 3c018007 */ lui $at,%hi(var80069958) +/* f16b3d4: e4209958 */ swc1 $f0,%lo(var80069958)($at) +/* f16b3d8: 3c018006 */ lui $at,%hi(var80062ca0) +/* f16b3dc: e42e2ca0 */ swc1 $f14,%lo(var80062ca0)($at) +/* f16b3e0: 3c018006 */ lui $at,%hi(var80062ca4) /* f16b3e4: 3c0e8008 */ lui $t6,%hi(g_LanguageId) -/* f16b3e8: e4202ca4 */ swc1 $f0,0x2ca4($at) +/* f16b3e8: e4202ca4 */ swc1 $f0,%lo(var80062ca4)($at) /* f16b3ec: 8dce4120 */ lw $t6,%lo(g_LanguageId)($t6) -/* f16b3f0: 3c018006 */ lui $at,0x8006 -/* f16b3f4: e4202ca8 */ swc1 $f0,0x2ca8($at) -/* f16b3f8: 3c018008 */ lui $at,0x8008 +/* f16b3f0: 3c018006 */ lui $at,%hi(var80062ca8) +/* f16b3f4: e4202ca8 */ swc1 $f0,%lo(var80062ca8)($at) +/* f16b3f8: 3c018008 */ lui $at,%hi(var8007e4a8) /* f16b3fc: 11c00006 */ beqz $t6,.L0f16b418 -/* f16b400: e420e4a8 */ swc1 $f0,-0x1b58($at) +/* f16b400: e420e4a8 */ swc1 $f0,%lo(var8007e4a8)($at) /* f16b404: 3c017f1b */ lui $at,%hi(var7f1b788c) /* f16b408: c426788c */ lwc1 $f6,%lo(var7f1b788c)($at) -/* f16b40c: 3c018007 */ lui $at,0x8007 +/* f16b40c: 3c018007 */ lui $at,%hi(var80069880) /* f16b410: 10000003 */ b .L0f16b420 -/* f16b414: e4269880 */ swc1 $f6,-0x6780($at) +/* f16b414: e4269880 */ swc1 $f6,%lo(var80069880)($at) .L0f16b418: -/* f16b418: 3c018007 */ lui $at,0x8007 -/* f16b41c: e42e9880 */ swc1 $f14,-0x6780($at) +/* f16b418: 3c018007 */ lui $at,%hi(var80069880) +/* f16b41c: e42e9880 */ swc1 $f14,%lo(var80069880)($at) .L0f16b420: /* f16b420: 3c013f00 */ lui $at,0x3f00 /* f16b424: 44816000 */ mtc1 $at,$f12 /* f16b428: 3c013fc0 */ lui $at,0x3fc0 /* f16b42c: 44818000 */ mtc1 $at,$f16 -/* f16b430: 3c018007 */ lui $at,0x8007 -/* f16b434: e430995c */ swc1 $f16,-0x66a4($at) -/* f16b438: 3c018006 */ lui $at,0x8006 +/* f16b430: 3c018007 */ lui $at,%hi(g_AmmoMultiplier) +/* f16b434: e430995c */ swc1 $f16,%lo(g_AmmoMultiplier)($at) +/* f16b438: 3c018006 */ lui $at,%hi(var80062cac) /* f16b43c: 100000ec */ b .L0f16b7f0 -/* f16b440: e42c2cac */ swc1 $f12,0x2cac($at) +/* f16b440: e42c2cac */ swc1 $f12,%lo(var80062cac)($at) .L0f16b444: /* f16b444: 3c013f80 */ lui $at,0x3f80 /* f16b448: 44810000 */ mtc1 $at,$f0 /* f16b44c: 3c013fc0 */ lui $at,0x3fc0 /* f16b450: 44818000 */ mtc1 $at,$f16 -/* f16b454: 3c018007 */ lui $at,0x8007 -/* f16b458: e4209948 */ swc1 $f0,-0x66b8($at) -/* f16b45c: 3c018007 */ lui $at,0x8007 -/* f16b460: e420994c */ swc1 $f0,-0x66b4($at) -/* f16b464: 3c018007 */ lui $at,0x8007 -/* f16b468: e4209950 */ swc1 $f0,-0x66b0($at) -/* f16b46c: 3c018007 */ lui $at,0x8007 -/* f16b470: e4309954 */ swc1 $f16,-0x66ac($at) -/* f16b474: 3c018007 */ lui $at,0x8007 -/* f16b478: e4209958 */ swc1 $f0,-0x66a8($at) -/* f16b47c: 3c018006 */ lui $at,0x8006 -/* f16b480: e4302ca0 */ swc1 $f16,0x2ca0($at) -/* f16b484: 3c018006 */ lui $at,0x8006 -/* f16b488: e4302ca4 */ swc1 $f16,0x2ca4($at) +/* f16b454: 3c018007 */ lui $at,%hi(var80069948) +/* f16b458: e4209948 */ swc1 $f0,%lo(var80069948)($at) +/* f16b45c: 3c018007 */ lui $at,%hi(var8006994c) +/* f16b460: e420994c */ swc1 $f0,%lo(var8006994c)($at) +/* f16b464: 3c018007 */ lui $at,%hi(var80069950) +/* f16b468: e4209950 */ swc1 $f0,%lo(var80069950)($at) +/* f16b46c: 3c018007 */ lui $at,%hi(var80069954) +/* f16b470: e4309954 */ swc1 $f16,%lo(var80069954)($at) +/* f16b474: 3c018007 */ lui $at,%hi(var80069958) +/* f16b478: e4209958 */ swc1 $f0,%lo(var80069958)($at) +/* f16b47c: 3c018006 */ lui $at,%hi(var80062ca0) +/* f16b480: e4302ca0 */ swc1 $f16,%lo(var80062ca0)($at) +/* f16b484: 3c018006 */ lui $at,%hi(var80062ca4) +/* f16b488: e4302ca4 */ swc1 $f16,%lo(var80062ca4)($at) /* f16b48c: 8def4120 */ lw $t7,%lo(g_LanguageId)($t7) -/* f16b490: 3c018006 */ lui $at,0x8006 -/* f16b494: e4202ca8 */ swc1 $f0,0x2ca8($at) -/* f16b498: 3c018008 */ lui $at,0x8008 +/* f16b490: 3c018006 */ lui $at,%hi(var80062ca8) +/* f16b494: e4202ca8 */ swc1 $f0,%lo(var80062ca8)($at) +/* f16b498: 3c018008 */ lui $at,%hi(var8007e4a8) /* f16b49c: 11e00006 */ beqz $t7,.L0f16b4b8 -/* f16b4a0: e430e4a8 */ swc1 $f16,-0x1b58($at) +/* f16b4a0: e430e4a8 */ swc1 $f16,%lo(var8007e4a8)($at) /* f16b4a4: 3c013f40 */ lui $at,0x3f40 /* f16b4a8: 44817000 */ mtc1 $at,$f14 -/* f16b4ac: 3c018007 */ lui $at,0x8007 +/* f16b4ac: 3c018007 */ lui $at,%hi(var80069880) /* f16b4b0: 10000005 */ b .L0f16b4c8 -/* f16b4b4: e42e9880 */ swc1 $f14,-0x6780($at) +/* f16b4b4: e42e9880 */ swc1 $f14,%lo(var80069880)($at) .L0f16b4b8: /* f16b4b8: 3c017f1b */ lui $at,%hi(var7f1b7890) /* f16b4bc: c4287890 */ lwc1 $f8,%lo(var7f1b7890)($at) -/* f16b4c0: 3c018007 */ lui $at,0x8007 -/* f16b4c4: e4289880 */ swc1 $f8,-0x6780($at) +/* f16b4c0: 3c018007 */ lui $at,%hi(var80069880) +/* f16b4c4: e4289880 */ swc1 $f8,%lo(var80069880)($at) .L0f16b4c8: -/* f16b4c8: 3c018007 */ lui $at,0x8007 -/* f16b4cc: e420995c */ swc1 $f0,-0x66a4($at) -/* f16b4d0: 3c018006 */ lui $at,0x8006 +/* f16b4c8: 3c018007 */ lui $at,%hi(g_AmmoMultiplier) +/* f16b4cc: e420995c */ swc1 $f0,%lo(g_AmmoMultiplier)($at) +/* f16b4d0: 3c018006 */ lui $at,%hi(var80062cac) /* f16b4d4: 100000c6 */ b .L0f16b7f0 -/* f16b4d8: e4202cac */ swc1 $f0,0x2cac($at) +/* f16b4d8: e4202cac */ swc1 $f0,%lo(var80062cac)($at) .L0f16b4dc: /* f16b4dc: 8c424020 */ lw $v0,%lo(g_Difficulty)($v0) /* f16b4e0: 24010001 */ addiu $at,$zero,0x1 @@ -3776,162 +3776,162 @@ glabel var7f1b78b8 /* f16b590: 3c013fc0 */ lui $at,0x3fc0 /* f16b594: 44818000 */ mtc1 $at,$f16 /* f16b598: 460e6002 */ mul.s $f0,$f12,$f14 -/* f16b59c: 3c018007 */ lui $at,0x8007 -/* f16b5a0: e4229948 */ swc1 $f2,-0x66b8($at) -/* f16b5a4: 3c018007 */ lui $at,0x8007 -/* f16b5a8: e422994c */ swc1 $f2,-0x66b4($at) -/* f16b5ac: 3c018007 */ lui $at,0x8007 -/* f16b5b0: e4209950 */ swc1 $f0,-0x66b0($at) -/* f16b5b4: 3c018007 */ lui $at,0x8007 -/* f16b5b8: e4209954 */ swc1 $f0,-0x66ac($at) -/* f16b5bc: 3c018007 */ lui $at,0x8007 -/* f16b5c0: e4229958 */ swc1 $f2,-0x66a8($at) +/* f16b59c: 3c018007 */ lui $at,%hi(var80069948) +/* f16b5a0: e4229948 */ swc1 $f2,%lo(var80069948)($at) +/* f16b5a4: 3c018007 */ lui $at,%hi(var8006994c) +/* f16b5a8: e422994c */ swc1 $f2,%lo(var8006994c)($at) +/* f16b5ac: 3c018007 */ lui $at,%hi(var80069950) +/* f16b5b0: e4209950 */ swc1 $f0,%lo(var80069950)($at) +/* f16b5b4: 3c018007 */ lui $at,%hi(var80069954) +/* f16b5b8: e4209954 */ swc1 $f0,%lo(var80069954)($at) +/* f16b5bc: 3c018007 */ lui $at,%hi(var80069958) +/* f16b5c0: e4229958 */ swc1 $f2,%lo(var80069958)($at) /* f16b5c4: 3c017f1b */ lui $at,%hi(var7f1b789c) /* f16b5c8: c432789c */ lwc1 $f18,%lo(var7f1b789c)($at) -/* f16b5cc: 3c018006 */ lui $at,0x8006 -/* f16b5d0: e4322ca0 */ swc1 $f18,0x2ca0($at) -/* f16b5d4: 3c018006 */ lui $at,0x8006 -/* f16b5d8: e4202ca4 */ swc1 $f0,0x2ca4($at) -/* f16b5dc: 3c018006 */ lui $at,0x8006 -/* f16b5e0: e4222ca8 */ swc1 $f2,0x2ca8($at) +/* f16b5cc: 3c018006 */ lui $at,%hi(var80062ca0) +/* f16b5d0: e4322ca0 */ swc1 $f18,%lo(var80062ca0)($at) +/* f16b5d4: 3c018006 */ lui $at,%hi(var80062ca4) +/* f16b5d8: e4202ca4 */ swc1 $f0,%lo(var80062ca4)($at) +/* f16b5dc: 3c018006 */ lui $at,%hi(var80062ca8) +/* f16b5e0: e4222ca8 */ swc1 $f2,%lo(var80062ca8)($at) /* f16b5e4: 3c013e80 */ lui $at,0x3e80 /* f16b5e8: 44812000 */ mtc1 $at,$f4 -/* f16b5ec: 3c018008 */ lui $at,0x8008 +/* f16b5ec: 3c018008 */ lui $at,%hi(var8007e4a8) /* f16b5f0: 460e2182 */ mul.s $f6,$f4,$f14 -/* f16b5f4: e426e4a8 */ swc1 $f6,-0x1b58($at) -/* f16b5f8: 3c018007 */ lui $at,0x8007 -/* f16b5fc: e4309880 */ swc1 $f16,-0x6780($at) -/* f16b600: 3c018007 */ lui $at,0x8007 -/* f16b604: e422995c */ swc1 $f2,-0x66a4($at) +/* f16b5f4: e426e4a8 */ swc1 $f6,%lo(var8007e4a8)($at) +/* f16b5f8: 3c018007 */ lui $at,%hi(var80069880) +/* f16b5fc: e4309880 */ swc1 $f16,%lo(var80069880)($at) +/* f16b600: 3c018007 */ lui $at,%hi(g_AmmoMultiplier) +/* f16b604: e422995c */ swc1 $f2,%lo(g_AmmoMultiplier)($at) /* f16b608: 3c017f1b */ lui $at,%hi(var7f1b78a0) /* f16b60c: c42878a0 */ lwc1 $f8,%lo(var7f1b78a0)($at) -/* f16b610: 3c018006 */ lui $at,0x8006 +/* f16b610: 3c018006 */ lui $at,%hi(var80062cac) /* f16b614: 10000076 */ b .L0f16b7f0 -/* f16b618: e4282cac */ swc1 $f8,0x2cac($at) +/* f16b618: e4282cac */ swc1 $f8,%lo(var80062cac)($at) .L0f16b61c: /* f16b61c: 1441002d */ bne $v0,$at,.L0f16b6d4 /* f16b620: 3c013f80 */ lui $at,0x3f80 /* f16b624: 44810000 */ mtc1 $at,$f0 /* f16b628: 3c013f40 */ lui $at,0x3f40 /* f16b62c: 44817000 */ mtc1 $at,$f14 -/* f16b630: 3c018007 */ lui $at,0x8007 -/* f16b634: e4209948 */ swc1 $f0,-0x66b8($at) -/* f16b638: 3c018007 */ lui $at,0x8007 -/* f16b63c: e420994c */ swc1 $f0,-0x66b4($at) -/* f16b640: 3c018007 */ lui $at,0x8007 -/* f16b644: e42e9950 */ swc1 $f14,-0x66b0($at) -/* f16b648: 3c018007 */ lui $at,0x8007 -/* f16b64c: e42e9954 */ swc1 $f14,-0x66ac($at) -/* f16b650: 3c018007 */ lui $at,0x8007 -/* f16b654: e4209958 */ swc1 $f0,-0x66a8($at) +/* f16b630: 3c018007 */ lui $at,%hi(var80069948) +/* f16b634: e4209948 */ swc1 $f0,%lo(var80069948)($at) +/* f16b638: 3c018007 */ lui $at,%hi(var8006994c) +/* f16b63c: e420994c */ swc1 $f0,%lo(var8006994c)($at) +/* f16b640: 3c018007 */ lui $at,%hi(var80069950) +/* f16b644: e42e9950 */ swc1 $f14,%lo(var80069950)($at) +/* f16b648: 3c018007 */ lui $at,%hi(var80069954) +/* f16b64c: e42e9954 */ swc1 $f14,%lo(var80069954)($at) +/* f16b650: 3c018007 */ lui $at,%hi(var80069958) +/* f16b654: e4209958 */ swc1 $f0,%lo(var80069958)($at) /* f16b658: 3c017f1b */ lui $at,%hi(var7f1b78a4) /* f16b65c: c42a78a4 */ lwc1 $f10,%lo(var7f1b78a4)($at) -/* f16b660: 3c018006 */ lui $at,0x8006 +/* f16b660: 3c018006 */ lui $at,%hi(var80062ca0) /* f16b664: 3c188008 */ lui $t8,%hi(g_LanguageId) -/* f16b668: e42a2ca0 */ swc1 $f10,0x2ca0($at) +/* f16b668: e42a2ca0 */ swc1 $f10,%lo(var80062ca0)($at) /* f16b66c: 3c017f1b */ lui $at,%hi(var7f1b78a8) /* f16b670: c43278a8 */ lwc1 $f18,%lo(var7f1b78a8)($at) -/* f16b674: 3c018006 */ lui $at,0x8006 +/* f16b674: 3c018006 */ lui $at,%hi(var80062ca4) /* f16b678: 8f184120 */ lw $t8,%lo(g_LanguageId)($t8) -/* f16b67c: e4322ca4 */ swc1 $f18,0x2ca4($at) -/* f16b680: 3c018006 */ lui $at,0x8006 -/* f16b684: e4202ca8 */ swc1 $f0,0x2ca8($at) -/* f16b688: 3c018008 */ lui $at,0x8008 +/* f16b67c: e4322ca4 */ swc1 $f18,%lo(var80062ca4)($at) +/* f16b680: 3c018006 */ lui $at,%hi(var80062ca8) +/* f16b684: e4202ca8 */ swc1 $f0,%lo(var80062ca8)($at) +/* f16b688: 3c018008 */ lui $at,%hi(var8007e4a8) /* f16b68c: 13000006 */ beqz $t8,.L0f16b6a8 -/* f16b690: e42ee4a8 */ swc1 $f14,-0x1b58($at) +/* f16b690: e42ee4a8 */ swc1 $f14,%lo(var8007e4a8)($at) /* f16b694: 3c017f1b */ lui $at,%hi(var7f1b78ac) /* f16b698: c42478ac */ lwc1 $f4,%lo(var7f1b78ac)($at) -/* f16b69c: 3c018007 */ lui $at,0x8007 +/* f16b69c: 3c018007 */ lui $at,%hi(var80069880) /* f16b6a0: 10000003 */ b .L0f16b6b0 -/* f16b6a4: e4249880 */ swc1 $f4,-0x6780($at) +/* f16b6a4: e4249880 */ swc1 $f4,%lo(var80069880)($at) .L0f16b6a8: -/* f16b6a8: 3c018007 */ lui $at,0x8007 -/* f16b6ac: e42e9880 */ swc1 $f14,-0x6780($at) +/* f16b6a8: 3c018007 */ lui $at,%hi(var80069880) +/* f16b6ac: e42e9880 */ swc1 $f14,%lo(var80069880)($at) .L0f16b6b0: /* f16b6b0: 3c013f00 */ lui $at,0x3f00 /* f16b6b4: 44816000 */ mtc1 $at,$f12 /* f16b6b8: 3c013fc0 */ lui $at,0x3fc0 /* f16b6bc: 44818000 */ mtc1 $at,$f16 -/* f16b6c0: 3c018007 */ lui $at,0x8007 -/* f16b6c4: e430995c */ swc1 $f16,-0x66a4($at) -/* f16b6c8: 3c018006 */ lui $at,0x8006 +/* f16b6c0: 3c018007 */ lui $at,%hi(g_AmmoMultiplier) +/* f16b6c4: e430995c */ swc1 $f16,%lo(g_AmmoMultiplier)($at) +/* f16b6c8: 3c018006 */ lui $at,%hi(var80062cac) /* f16b6cc: 10000048 */ b .L0f16b7f0 -/* f16b6d0: e42c2cac */ swc1 $f12,0x2cac($at) +/* f16b6d0: e42c2cac */ swc1 $f12,%lo(var80062cac)($at) .L0f16b6d4: /* f16b6d4: 24010002 */ addiu $at,$zero,0x2 /* f16b6d8: 14410027 */ bne $v0,$at,.L0f16b778 /* f16b6dc: 3c013f80 */ lui $at,0x3f80 /* f16b6e0: 44810000 */ mtc1 $at,$f0 -/* f16b6e4: 3c018007 */ lui $at,0x8007 +/* f16b6e4: 3c018007 */ lui $at,%hi(var80069948) /* f16b6e8: 3c198008 */ lui $t9,%hi(g_LanguageId) -/* f16b6ec: e4209948 */ swc1 $f0,-0x66b8($at) -/* f16b6f0: 3c018007 */ lui $at,0x8007 -/* f16b6f4: e420994c */ swc1 $f0,-0x66b4($at) -/* f16b6f8: 3c018007 */ lui $at,0x8007 -/* f16b6fc: e4209950 */ swc1 $f0,-0x66b0($at) -/* f16b700: 3c018007 */ lui $at,0x8007 -/* f16b704: e4209954 */ swc1 $f0,-0x66ac($at) -/* f16b708: 3c018007 */ lui $at,0x8007 -/* f16b70c: e4209958 */ swc1 $f0,-0x66a8($at) +/* f16b6ec: e4209948 */ swc1 $f0,%lo(var80069948)($at) +/* f16b6f0: 3c018007 */ lui $at,%hi(var8006994c) +/* f16b6f4: e420994c */ swc1 $f0,%lo(var8006994c)($at) +/* f16b6f8: 3c018007 */ lui $at,%hi(var80069950) +/* f16b6fc: e4209950 */ swc1 $f0,%lo(var80069950)($at) +/* f16b700: 3c018007 */ lui $at,%hi(var80069954) +/* f16b704: e4209954 */ swc1 $f0,%lo(var80069954)($at) +/* f16b708: 3c018007 */ lui $at,%hi(var80069958) +/* f16b70c: e4209958 */ swc1 $f0,%lo(var80069958)($at) /* f16b710: 3c017f1b */ lui $at,%hi(var7f1b78b0) /* f16b714: c42678b0 */ lwc1 $f6,%lo(var7f1b78b0)($at) -/* f16b718: 3c018006 */ lui $at,0x8006 +/* f16b718: 3c018006 */ lui $at,%hi(var80062ca0) /* f16b71c: 8f394120 */ lw $t9,%lo(g_LanguageId)($t9) -/* f16b720: e4262ca0 */ swc1 $f6,0x2ca0($at) -/* f16b724: 3c018006 */ lui $at,0x8006 -/* f16b728: e4202ca4 */ swc1 $f0,0x2ca4($at) -/* f16b72c: 3c018006 */ lui $at,0x8006 -/* f16b730: e4202ca8 */ swc1 $f0,0x2ca8($at) -/* f16b734: 3c018008 */ lui $at,0x8008 +/* f16b720: e4262ca0 */ swc1 $f6,%lo(var80062ca0)($at) +/* f16b724: 3c018006 */ lui $at,%hi(var80062ca4) +/* f16b728: e4202ca4 */ swc1 $f0,%lo(var80062ca4)($at) +/* f16b72c: 3c018006 */ lui $at,%hi(var80062ca8) +/* f16b730: e4202ca8 */ swc1 $f0,%lo(var80062ca8)($at) +/* f16b734: 3c018008 */ lui $at,%hi(var8007e4a8) /* f16b738: 13200006 */ beqz $t9,.L0f16b754 -/* f16b73c: e420e4a8 */ swc1 $f0,-0x1b58($at) +/* f16b73c: e420e4a8 */ swc1 $f0,%lo(var8007e4a8)($at) /* f16b740: 3c013f40 */ lui $at,0x3f40 /* f16b744: 44817000 */ mtc1 $at,$f14 -/* f16b748: 3c018007 */ lui $at,0x8007 +/* f16b748: 3c018007 */ lui $at,%hi(var80069880) /* f16b74c: 10000005 */ b .L0f16b764 -/* f16b750: e42e9880 */ swc1 $f14,-0x6780($at) +/* f16b750: e42e9880 */ swc1 $f14,%lo(var80069880)($at) .L0f16b754: /* f16b754: 3c017f1b */ lui $at,%hi(var7f1b78b4) /* f16b758: c42878b4 */ lwc1 $f8,%lo(var7f1b78b4)($at) -/* f16b75c: 3c018007 */ lui $at,0x8007 -/* f16b760: e4289880 */ swc1 $f8,-0x6780($at) +/* f16b75c: 3c018007 */ lui $at,%hi(var80069880) +/* f16b760: e4289880 */ swc1 $f8,%lo(var80069880)($at) .L0f16b764: -/* f16b764: 3c018007 */ lui $at,0x8007 -/* f16b768: e420995c */ swc1 $f0,-0x66a4($at) -/* f16b76c: 3c018006 */ lui $at,0x8006 +/* f16b764: 3c018007 */ lui $at,%hi(g_AmmoMultiplier) +/* f16b768: e420995c */ swc1 $f0,%lo(g_AmmoMultiplier)($at) +/* f16b76c: 3c018006 */ lui $at,%hi(var80062cac) /* f16b770: 1000001f */ b .L0f16b7f0 -/* f16b774: e4202cac */ swc1 $f0,0x2cac($at) +/* f16b774: e4202cac */ swc1 $f0,%lo(var80062cac)($at) .L0f16b778: /* f16b778: 24010003 */ addiu $at,$zero,0x3 /* f16b77c: 1441001c */ bne $v0,$at,.L0f16b7f0 /* f16b780: 3c013f80 */ lui $at,0x3f80 /* f16b784: 44810000 */ mtc1 $at,$f0 -/* f16b788: 3c018007 */ lui $at,0x8007 -/* f16b78c: e4209948 */ swc1 $f0,-0x66b8($at) -/* f16b790: 3c018007 */ lui $at,0x8007 -/* f16b794: e420994c */ swc1 $f0,-0x66b4($at) -/* f16b798: 3c018007 */ lui $at,0x8007 -/* f16b79c: e4209950 */ swc1 $f0,-0x66b0($at) -/* f16b7a0: 3c018007 */ lui $at,0x8007 -/* f16b7a4: e4209954 */ swc1 $f0,-0x66ac($at) -/* f16b7a8: 3c018007 */ lui $at,0x8007 -/* f16b7ac: e4209958 */ swc1 $f0,-0x66a8($at) +/* f16b788: 3c018007 */ lui $at,%hi(var80069948) +/* f16b78c: e4209948 */ swc1 $f0,%lo(var80069948)($at) +/* f16b790: 3c018007 */ lui $at,%hi(var8006994c) +/* f16b794: e420994c */ swc1 $f0,%lo(var8006994c)($at) +/* f16b798: 3c018007 */ lui $at,%hi(var80069950) +/* f16b79c: e4209950 */ swc1 $f0,%lo(var80069950)($at) +/* f16b7a0: 3c018007 */ lui $at,%hi(var80069954) +/* f16b7a4: e4209954 */ swc1 $f0,%lo(var80069954)($at) +/* f16b7a8: 3c018007 */ lui $at,%hi(var80069958) +/* f16b7ac: e4209958 */ swc1 $f0,%lo(var80069958)($at) /* f16b7b0: 3c017f1b */ lui $at,%hi(var7f1b78b8) /* f16b7b4: c42a78b8 */ lwc1 $f10,%lo(var7f1b78b8)($at) -/* f16b7b8: 3c018006 */ lui $at,0x8006 -/* f16b7bc: e42a2ca0 */ swc1 $f10,0x2ca0($at) -/* f16b7c0: 3c018006 */ lui $at,0x8006 -/* f16b7c4: e4202ca4 */ swc1 $f0,0x2ca4($at) -/* f16b7c8: 3c018006 */ lui $at,0x8006 -/* f16b7cc: e4202ca8 */ swc1 $f0,0x2ca8($at) -/* f16b7d0: 3c018008 */ lui $at,0x8008 -/* f16b7d4: e420e4a8 */ swc1 $f0,-0x1b58($at) -/* f16b7d8: 3c018007 */ lui $at,0x8007 -/* f16b7dc: e4209880 */ swc1 $f0,-0x6780($at) -/* f16b7e0: 3c018007 */ lui $at,0x8007 -/* f16b7e4: e420995c */ swc1 $f0,-0x66a4($at) -/* f16b7e8: 3c018006 */ lui $at,0x8006 -/* f16b7ec: e4202cac */ swc1 $f0,0x2cac($at) +/* f16b7b8: 3c018006 */ lui $at,%hi(var80062ca0) +/* f16b7bc: e42a2ca0 */ swc1 $f10,%lo(var80062ca0)($at) +/* f16b7c0: 3c018006 */ lui $at,%hi(var80062ca4) +/* f16b7c4: e4202ca4 */ swc1 $f0,%lo(var80062ca4)($at) +/* f16b7c8: 3c018006 */ lui $at,%hi(var80062ca8) +/* f16b7cc: e4202ca8 */ swc1 $f0,%lo(var80062ca8)($at) +/* f16b7d0: 3c018008 */ lui $at,%hi(var8007e4a8) +/* f16b7d4: e420e4a8 */ swc1 $f0,%lo(var8007e4a8)($at) +/* f16b7d8: 3c018007 */ lui $at,%hi(var80069880) +/* f16b7dc: e4209880 */ swc1 $f0,%lo(var80069880)($at) +/* f16b7e0: 3c018007 */ lui $at,%hi(g_AmmoMultiplier) +/* f16b7e4: e420995c */ swc1 $f0,%lo(g_AmmoMultiplier)($at) +/* f16b7e8: 3c018006 */ lui $at,%hi(var80062cac) +/* f16b7ec: e4202cac */ swc1 $f0,%lo(var80062cac)($at) .L0f16b7f0: /* f16b7f0: 8fbf0014 */ lw $ra,0x14($sp) /* f16b7f4: 27bd0028 */ addiu $sp,$sp,0x28 @@ -4705,7 +4705,7 @@ glabel func0f16b96c /* f16c1fc: 261024a4 */ addiu $s0,$s0,%lo(var800624a4) /* f16c200: 29a1005a */ slti $at,$t5,0x5a /* f16c204: 10200072 */ beqz $at,.L0f16c3d0 -/* f16c208: 3c028006 */ lui $v0,0x8006 +/* f16c208: 3c028006 */ lui $v0,%hi(var80060000) /* f16c20c: 8e0e0000 */ lw $t6,0x0($s0) /* f16c210: 15c0006f */ bnez $t6,.L0f16c3d0 /* f16c214: 00000000 */ nop @@ -4810,7 +4810,7 @@ glabel func0f16b96c /* f16c3a0: 14200007 */ bnez $at,.L0f16c3c0 /* f16c3a4: 3c028006 */ lui $v0,%hi(var800624b0) /* f16c3a8: 244224b0 */ addiu $v0,$v0,%lo(var800624b0) -/* f16c3ac: 8c580000 */ lw $t8,0x0($v0) +/* f16c3ac: 8c580000 */ lw $t8,%lo(var80060000)($v0) /* f16c3b0: 8e990000 */ lw $t9,0x0($s4) /* f16c3b4: 03196021 */ addu $t4,$t8,$t9 /* f16c3b8: 10000007 */ b .L0f16c3d8 @@ -5155,10 +5155,10 @@ glabel func0f16b96c /* f16c860: 3c014270 */ lui $at,0x4270 /* f16c864: 468042a0 */ cvt.s.w $f10,$f8 /* f16c868: 44818000 */ mtc1 $at,$f16 -/* f16c86c: 3c018008 */ lui $at,0x8008 +/* f16c86c: 3c018008 */ lui $at,%hi(g_Uptime) /* f16c870: 46105483 */ div.s $f18,$f10,$f16 /* f16c874: 0c002f48 */ jal viSetUseZBuf -/* f16c878: e432403c */ swc1 $f18,0x403c($at) +/* f16c878: e432403c */ swc1 $f18,%lo(g_Uptime)($at) /* f16c87c: 8e8204b4 */ lw $v0,0x4b4($s4) /* f16c880: 2401004e */ addiu $at,$zero,0x4e /* f16c884: 54410007 */ bnel $v0,$at,.L0f16c8a4 diff --git a/src/game/game_179060.c b/src/game/game_179060.c index 6e6f3fad4..95cc14b7b 100644 --- a/src/game/game_179060.c +++ b/src/game/game_179060.c @@ -844,7 +844,7 @@ glabel var7f1b80dc /* f179de8: acc20000 */ sw $v0,0x0($a2) /* f179dec: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f179df0: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f179df4: 3c19800a */ lui $t9,0x800a +/* f179df4: 3c19800a */ lui $t9,%hi(g_Menus) /* f179df8: 3c05800a */ lui $a1,%hi(g_Vars) /* f179dfc: 000fc0c0 */ sll $t8,$t7,0x3 /* f179e00: 030fc023 */ subu $t8,$t8,$t7 @@ -853,7 +853,7 @@ glabel var7f1b80dc /* f179e0c: 0018c0c0 */ sll $t8,$t8,0x3 /* f179e10: 030fc023 */ subu $t8,$t8,$t7 /* f179e14: 0018c100 */ sll $t8,$t8,0x4 -/* f179e18: 2739e000 */ addiu $t9,$t9,-8192 +/* f179e18: 2739e000 */ addiu $t9,$t9,%lo(g_Menus) /* f179e1c: 8fa90050 */ lw $t1,0x50($sp) /* f179e20: 24a59fc0 */ addiu $a1,$a1,%lo(g_Vars) /* f179e24: 03191021 */ addu $v0,$t8,$t9 @@ -920,7 +920,7 @@ glabel var7f1b80dc /* f179f0c: 3c0b8007 */ lui $t3,%hi(g_MpPlayerNum) /* f179f10: 8d6b1448 */ lw $t3,%lo(g_MpPlayerNum)($t3) /* f179f14: 44800000 */ mtc1 $zero,$f0 -/* f179f18: 3c0d800a */ lui $t5,0x800a +/* f179f18: 3c0d800a */ lui $t5,%hi(g_Menus) /* f179f1c: 000b60c0 */ sll $t4,$t3,0x3 /* f179f20: 018b6023 */ subu $t4,$t4,$t3 /* f179f24: 000c6080 */ sll $t4,$t4,0x2 @@ -930,7 +930,7 @@ glabel var7f1b80dc /* f179f34: 018b6023 */ subu $t4,$t4,$t3 /* f179f38: 44819000 */ mtc1 $at,$f18 /* f179f3c: 000c6100 */ sll $t4,$t4,0x4 -/* f179f40: 25ade000 */ addiu $t5,$t5,-8192 +/* f179f40: 25ade000 */ addiu $t5,$t5,%lo(g_Menus) /* f179f44: 018d1021 */ addu $v0,$t4,$t5 /* f179f48: 240e0001 */ addiu $t6,$zero,0x1 /* f179f4c: 44050000 */ mfc1 $a1,$f0 @@ -957,11 +957,11 @@ glabel var7f1b80dc /* f179fa0: c42280d4 */ lwc1 $f2,%lo(var7f1b80d4)($at) /* f179fa4: 0018c0c0 */ sll $t8,$t8,0x3 /* f179fa8: 3c017f1c */ lui $at,%hi(var7f1b80d8) -/* f179fac: 3c19800a */ lui $t9,0x800a +/* f179fac: 3c19800a */ lui $t9,%hi(g_Menus) /* f179fb0: 030fc023 */ subu $t8,$t8,$t7 /* f179fb4: c42c80d8 */ lwc1 $f12,%lo(var7f1b80d8)($at) /* f179fb8: 0018c100 */ sll $t8,$t8,0x4 -/* f179fbc: 2739e000 */ addiu $t9,$t9,-8192 +/* f179fbc: 2739e000 */ addiu $t9,$t9,%lo(g_Menus) /* f179fc0: 03191021 */ addu $v0,$t8,$t9 /* f179fc4: 3c017f1c */ lui $at,%hi(var7f1b80dc) /* f179fc8: e4400d50 */ swc1 $f0,0xd50($v0) @@ -2488,18 +2488,18 @@ glabel var7f1b814c /* f17b544: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) /* f17b548: 3c017f1c */ lui $at,%hi(var7f1b8144) /* f17b54c: c4248144 */ lwc1 $f4,%lo(var7f1b8144)($at) -/* f17b550: 3c01800a */ lui $at,0x800a +/* f17b550: 3c01800a */ lui $at,%hi(g_Vars+0x4) /* f17b554: 000fc0c0 */ sll $t8,$t7,0x3 -/* f17b558: c4269fc4 */ lwc1 $f6,-0x603c($at) +/* f17b558: c4269fc4 */ lwc1 $f6,%lo(g_Vars+0x4)($at) /* f17b55c: 030fc023 */ subu $t8,$t8,$t7 /* f17b560: 0018c080 */ sll $t8,$t8,0x2 /* f17b564: 030fc021 */ addu $t8,$t8,$t7 /* f17b568: 46062202 */ mul.s $f8,$f4,$f6 /* f17b56c: 0018c0c0 */ sll $t8,$t8,0x3 -/* f17b570: 3c19800a */ lui $t9,0x800a +/* f17b570: 3c19800a */ lui $t9,%hi(g_Menus) /* f17b574: 030fc023 */ subu $t8,$t8,$t7 /* f17b578: 0018c100 */ sll $t8,$t8,0x4 -/* f17b57c: 2739e000 */ addiu $t9,$t9,-8192 +/* f17b57c: 2739e000 */ addiu $t9,$t9,%lo(g_Menus) /* f17b580: 03191821 */ addu $v1,$t8,$t9 /* f17b584: c46a0d64 */ lwc1 $f10,0xd64($v1) /* f17b588: 46085000 */ add.s $f0,$f10,$f8 @@ -2514,8 +2514,8 @@ glabel var7f1b814c /* f17b5ac: 306400ff */ andi $a0,$v1,0xff /* f17b5b0: 3c088007 */ lui $t0,%hi(g_MpPlayerNum) /* f17b5b4: 8d081448 */ lw $t0,%lo(g_MpPlayerNum)($t0) -/* f17b5b8: 3c0a800a */ lui $t2,0x800a -/* f17b5bc: 254ae000 */ addiu $t2,$t2,-8192 +/* f17b5b8: 3c0a800a */ lui $t2,%hi(g_Menus) +/* f17b5bc: 254ae000 */ addiu $t2,$t2,%lo(g_Menus) /* f17b5c0: 000848c0 */ sll $t1,$t0,0x3 /* f17b5c4: 01284823 */ subu $t1,$t1,$t0 /* f17b5c8: 00094880 */ sll $t1,$t1,0x2 @@ -2545,8 +2545,8 @@ glabel var7f1b814c /* f17b624: 304400ff */ andi $a0,$v0,0xff /* f17b628: 3c188007 */ lui $t8,%hi(g_MpPlayerNum) /* f17b62c: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f17b630: 3c08800a */ lui $t0,0x800a -/* f17b634: 2508e000 */ addiu $t0,$t0,-8192 +/* f17b630: 3c08800a */ lui $t0,%hi(g_Menus) +/* f17b634: 2508e000 */ addiu $t0,$t0,%lo(g_Menus) /* f17b638: 0018c8c0 */ sll $t9,$t8,0x3 /* f17b63c: 0338c823 */ subu $t9,$t9,$t8 /* f17b640: 0019c880 */ sll $t9,$t9,0x2 @@ -2569,7 +2569,7 @@ glabel var7f1b814c /* f17b684: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f17b688: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) /* f17b68c: 8fb9003c */ lw $t9,0x3c($sp) -/* f17b690: 3c18800a */ lui $t8,0x800a +/* f17b690: 3c18800a */ lui $t8,%hi(g_Menus) /* f17b694: 000e78c0 */ sll $t7,$t6,0x3 /* f17b698: 01ee7823 */ subu $t7,$t7,$t6 /* f17b69c: 000f7880 */ sll $t7,$t7,0x2 @@ -2577,7 +2577,7 @@ glabel var7f1b814c /* f17b6a4: 000f78c0 */ sll $t7,$t7,0x3 /* f17b6a8: 01ee7823 */ subu $t7,$t7,$t6 /* f17b6ac: 000f7900 */ sll $t7,$t7,0x4 -/* f17b6b0: 2718e000 */ addiu $t8,$t8,-8192 +/* f17b6b0: 2718e000 */ addiu $t8,$t8,%lo(g_Menus) /* f17b6b4: 01f81821 */ addu $v1,$t7,$t8 /* f17b6b8: 03224023 */ subu $t0,$t9,$v0 /* f17b6bc: a0680df0 */ sb $t0,0xdf0($v1) @@ -2627,8 +2627,8 @@ glabel var7f1b814c /* f17b768: 01ee7823 */ subu $t7,$t7,$t6 /* f17b76c: 44819000 */ mtc1 $at,$f18 /* f17b770: 000f7900 */ sll $t7,$t7,0x4 -/* f17b774: 3c19800a */ lui $t9,0x800a -/* f17b778: 2739e000 */ addiu $t9,$t9,-8192 +/* f17b774: 3c19800a */ lui $t9,%hi(g_Menus) +/* f17b778: 2739e000 */ addiu $t9,$t9,%lo(g_Menus) /* f17b77c: 25f80840 */ addiu $t8,$t7,0x840 /* f17b780: 24080001 */ addiu $t0,$zero,0x1 /* f17b784: 44050000 */ mfc1 $a1,$f0 @@ -2644,7 +2644,7 @@ glabel var7f1b814c /* f17b7ac: 3c098007 */ lui $t1,%hi(g_MpPlayerNum) /* f17b7b0: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) /* f17b7b4: 3c017f1c */ lui $at,%hi(var7f1b8148) -/* f17b7b8: 3c0c800a */ lui $t4,0x800a +/* f17b7b8: 3c0c800a */ lui $t4,%hi(g_Menus) /* f17b7bc: 000950c0 */ sll $t2,$t1,0x3 /* f17b7c0: 01495023 */ subu $t2,$t2,$t1 /* f17b7c4: 000a5080 */ sll $t2,$t2,0x2 @@ -2654,7 +2654,7 @@ glabel var7f1b814c /* f17b7d4: c4228148 */ lwc1 $f2,%lo(var7f1b8148)($at) /* f17b7d8: 44800000 */ mtc1 $zero,$f0 /* f17b7dc: 000a5100 */ sll $t2,$t2,0x4 -/* f17b7e0: 258ce000 */ addiu $t4,$t4,-8192 +/* f17b7e0: 258ce000 */ addiu $t4,$t4,%lo(g_Menus) /* f17b7e4: 014c1821 */ addu $v1,$t2,$t4 /* f17b7e8: 3c01c040 */ lui $at,0xc040 /* f17b7ec: 44812000 */ mtc1 $at,$f4 @@ -4974,9 +4974,9 @@ glabel menuhandler0017e06c /* f17e094: 25291448 */ addiu $t1,$t1,%lo(g_MpPlayerNum) /* f17e098: 8d2e0000 */ lw $t6,0x0($t1) /* f17e09c: 240a0e70 */ addiu $t2,$zero,0xe70 -/* f17e0a0: 3c08800a */ lui $t0,0x800a +/* f17e0a0: 3c08800a */ lui $t0,%hi(g_Menus) /* f17e0a4: 01ca0019 */ multu $t6,$t2 -/* f17e0a8: 2508e000 */ addiu $t0,$t0,-8192 +/* f17e0a8: 2508e000 */ addiu $t0,$t0,%lo(g_Menus) /* f17e0ac: 3c07800b */ lui $a3,%hi(g_MpSetup+0x28) /* f17e0b0: 24e7cbb0 */ addiu $a3,$a3,%lo(g_MpSetup+0x28) /* f17e0b4: 240b000a */ addiu $t3,$zero,0xa @@ -5072,9 +5072,9 @@ glabel menuhandler0017e06c .L0f17e204: /* f17e204: 8d390000 */ lw $t9,0x0($t1) /* f17e208: 240a0e70 */ addiu $t2,$zero,0xe70 -/* f17e20c: 3c08800a */ lui $t0,0x800a +/* f17e20c: 3c08800a */ lui $t0,%hi(g_Menus) /* f17e210: 032a0019 */ multu $t9,$t2 -/* f17e214: 2508e000 */ addiu $t0,$t0,-8192 +/* f17e214: 2508e000 */ addiu $t0,$t0,%lo(g_Menus) /* f17e218: 3c07800b */ lui $a3,%hi(g_MpSetup+0x28) /* f17e21c: 24e7cbb0 */ addiu $a3,$a3,%lo(g_MpSetup+0x28) /* f17e220: 3c02800a */ lui $v0,%hi(g_Vars) @@ -5196,8 +5196,8 @@ glabel menudialog0017e3fc .L0f17e430: /* f17e430: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f17e434: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f17e438: 3c18800a */ lui $t8,0x800a -/* f17e43c: 2718e000 */ addiu $t8,$t8,-8192 +/* f17e438: 3c18800a */ lui $t8,%hi(g_Menus) +/* f17e43c: 2718e000 */ addiu $t8,$t8,%lo(g_Menus) /* f17e440: 000e78c0 */ sll $t7,$t6,0x3 /* f17e444: 01ee7823 */ subu $t7,$t7,$t6 /* f17e448: 000f7880 */ sll $t7,$t7,0x2 @@ -5716,8 +5716,8 @@ glabel menudialog0017eb34 /* f17ebac: 14400012 */ bnez $v0,.L0f17ebf8 /* f17ebb0: 3c098007 */ lui $t1,%hi(g_MpPlayerNum) /* f17ebb4: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) -/* f17ebb8: 3c0b800a */ lui $t3,0x800a -/* f17ebbc: 256be000 */ addiu $t3,$t3,-8192 +/* f17ebb8: 3c0b800a */ lui $t3,%hi(g_Menus) +/* f17ebbc: 256be000 */ addiu $t3,$t3,%lo(g_Menus) /* f17ebc0: 000950c0 */ sll $t2,$t1,0x3 /* f17ebc4: 01495023 */ subu $t2,$t2,$t1 /* f17ebc8: 000a5080 */ sll $t2,$t2,0x2 diff --git a/src/game/game_17f930.c b/src/game/game_17f930.c index 238768b3b..dcbfa899f 100644 --- a/src/game/game_17f930.c +++ b/src/game/game_17f930.c @@ -161,8 +161,8 @@ glabel func0f17fa28 /* f17faf4: afa20044 */ sw $v0,0x44($sp) /* f17faf8: 8fe20000 */ lw $v0,0x0($ra) .L0f17fafc: -/* f17fafc: 3c0f800a */ lui $t7,0x800a -/* f17fb00: 25efe000 */ addiu $t7,$t7,-8192 +/* f17fafc: 3c0f800a */ lui $t7,%hi(g_Menus) +/* f17fb00: 25efe000 */ addiu $t7,$t7,%lo(g_Menus) /* f17fb04: 000270c0 */ sll $t6,$v0,0x3 /* f17fb08: 01c27023 */ subu $t6,$t6,$v0 /* f17fb0c: 000e7080 */ sll $t6,$t6,0x2 diff --git a/src/game/game_190260.c b/src/game/game_190260.c index bd01aa877..aef2e2156 100644 --- a/src/game/game_190260.c +++ b/src/game/game_190260.c @@ -2842,10 +2842,10 @@ glabel var7f1b8f44 /* f192b3c: c46400ac */ lwc1 $f4,0xac($v1) /* f192b40: c4a60044 */ lwc1 $f6,0x44($a1) /* f192b44: 00077940 */ sll $t7,$a3,0x5 -/* f192b48: 3c018008 */ lui $at,0x8008 +/* f192b48: 3c018008 */ lui $at,%hi(var80087d14+0x10) /* f192b4c: 46062202 */ mul.s $f8,$f4,$f6 /* f192b50: 002f0821 */ addu $at,$at,$t7 -/* f192b54: c42a7d24 */ lwc1 $f10,0x7d24($at) +/* f192b54: c42a7d24 */ lwc1 $f10,%lo(var80087d14+0x10)($at) /* f192b58: 44809000 */ mtc1 $zero,$f18 /* f192b5c: 46085002 */ mul.s $f0,$f10,$f8 /* f192b60: 4612003c */ c.lt.s $f0,$f18 diff --git a/src/game/game_19aa80.c b/src/game/game_19aa80.c index 295583adc..3a1f59920 100644 --- a/src/game/game_19aa80.c +++ b/src/game/game_19aa80.c @@ -395,7 +395,7 @@ glabel func0f19afdc /* f19afdc: 27bdffc8 */ addiu $sp,$sp,-56 /* f19afe0: afb1001c */ sw $s1,0x1c($sp) /* f19afe4: 3c118009 */ lui $s1,%hi(g_MpChallenges) -/* f19afe8: 3c028009 */ lui $v0,0x8009 +/* f19afe8: 3c028009 */ lui $v0,%hi(var800887c4) /* f19afec: afbf0034 */ sw $ra,0x34($sp) /* f19aff0: afb60030 */ sw $s6,0x30($sp) /* f19aff4: afb5002c */ sw $s5,0x2c($sp) @@ -403,7 +403,7 @@ glabel func0f19afdc /* f19affc: afb30024 */ sw $s3,0x24($sp) /* f19b000: afb20020 */ sw $s2,0x20($sp) /* f19b004: afb00018 */ sw $s0,0x18($sp) -/* f19b008: 244287c4 */ addiu $v0,$v0,-30780 +/* f19b008: 244287c4 */ addiu $v0,$v0,%lo(var800887c4) /* f19b00c: 263184b8 */ addiu $s1,$s1,%lo(g_MpChallenges) .L0f19b010: /* f19b010: 2631001a */ addiu $s1,$s1,0x1a @@ -482,8 +482,8 @@ glabel func0f19afdc /* f19b118: 3c198009 */ lui $t9,%hi(g_MpChallenges) /* f19b11c: 273984b8 */ addiu $t9,$t9,%lo(g_MpChallenges) /* f19b120: 0018c0c0 */ sll $t8,$t8,0x3 -/* f19b124: 3c038009 */ lui $v1,0x8009 -/* f19b128: 246387c4 */ addiu $v1,$v1,-30780 +/* f19b124: 3c038009 */ lui $v1,%hi(var800887c4) +/* f19b128: 246387c4 */ addiu $v1,$v1,%lo(var800887c4) /* f19b12c: 03198821 */ addu $s1,$t8,$t9 /* f19b130: 92220004 */ lbu $v0,0x4($s1) .L0f19b134: @@ -499,8 +499,8 @@ glabel func0f19afdc /* f19b154: 5623fff7 */ bnel $s1,$v1,.L0f19b134 /* f19b158: 92220004 */ lbu $v0,0x4($s1) .L0f19b15c: -/* f19b15c: 3c168009 */ lui $s6,0x8009 -/* f19b160: 26d687c4 */ addiu $s6,$s6,-30780 +/* f19b15c: 3c168009 */ lui $s6,%hi(var800887c4) +/* f19b160: 26d687c4 */ addiu $s6,$s6,%lo(var800887c4) .L0f19b164: /* f19b164: 3c118009 */ lui $s1,%hi(g_MpChallenges) /* f19b168: 0000a025 */ or $s4,$zero,$zero @@ -1082,8 +1082,8 @@ glabel mpLoadConfig /* f19b920: afa501cc */ sw $a1,0x1cc($sp) /* f19b924: 0fc5b9b5 */ jal langGetLanguageId /* f19b928: afa601d0 */ sw $a2,0x1d0($sp) -/* f19b92c: 3c0f8009 */ lui $t7,0x8009 -/* f19b930: 25ef87c4 */ addiu $t7,$t7,-30780 +/* f19b92c: 3c0f8009 */ lui $t7,%hi(var800887c4) +/* f19b930: 25ef87c4 */ addiu $t7,$t7,%lo(var800887c4) /* f19b934: afa20050 */ sw $v0,0x50($sp) /* f19b938: 25e80030 */ addiu $t0,$t7,0x30 /* f19b93c: 27ae0018 */ addiu $t6,$sp,0x18 diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c index b57f6b0d7..df2108416 100644 --- a/src/game/game_1a3340.c +++ b/src/game/game_1a3340.c @@ -519,8 +519,8 @@ glabel var7f1b9944 /* f1a3a40: 8fbf0014 */ lw $ra,0x14($sp) .L0f1a3a44: /* f1a3a44: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f1a3a48: 3c08800a */ lui $t0,0x800a -/* f1a3a4c: 2508e000 */ addiu $t0,$t0,-8192 +/* f1a3a48: 3c08800a */ lui $t0,%hi(g_Menus) +/* f1a3a4c: 2508e000 */ addiu $t0,$t0,%lo(g_Menus) /* f1a3a50: 0018c8c0 */ sll $t9,$t8,0x3 /* f1a3a54: 0338c823 */ subu $t9,$t9,$t8 /* f1a3a58: 0019c880 */ sll $t9,$t9,0x2 @@ -543,8 +543,8 @@ glabel var7f1b9944 /* f1a3a9c: 014b6023 */ subu $t4,$t2,$t3 /* f1a3aa0: ac4c0db4 */ sw $t4,0xdb4($v0) /* f1a3aa4: c4249944 */ lwc1 $f4,%lo(var7f1b9944)($at) -/* f1a3aa8: 3c018006 */ lui $at,0x8006 -/* f1a3aac: c4261630 */ lwc1 $f6,0x1630($at) +/* f1a3aa8: 3c018006 */ lui $at,%hi(var80061630) +/* f1a3aac: c4261630 */ lwc1 $f6,%lo(var80061630)($at) /* f1a3ab0: e4420d68 */ swc1 $f2,0xd68($v0) /* f1a3ab4: e4420d90 */ swc1 $f2,0xd90($v0) /* f1a3ab8: 46062002 */ mul.s $f0,$f4,$f6 @@ -2749,11 +2749,11 @@ glabel var7f1b9978 /* f1a5fd8: 01ee7821 */ addu $t7,$t7,$t6 /* f1a5fdc: 000f78c0 */ sll $t7,$t7,0x3 /* f1a5fe0: 3c01bf80 */ lui $at,0xbf80 -/* f1a5fe4: 3c18800a */ lui $t8,0x800a +/* f1a5fe4: 3c18800a */ lui $t8,%hi(g_Menus) /* f1a5fe8: 01ee7823 */ subu $t7,$t7,$t6 /* f1a5fec: 44812000 */ mtc1 $at,$f4 /* f1a5ff0: 000f7900 */ sll $t7,$t7,0x4 -/* f1a5ff4: 2718e000 */ addiu $t8,$t8,-8192 +/* f1a5ff4: 2718e000 */ addiu $t8,$t8,%lo(g_Menus) /* f1a5ff8: 01f81821 */ addu $v1,$t7,$t8 /* f1a5ffc: 10000011 */ b .L0f1a6044 /* f1a6000: e4640d94 */ swc1 $f4,0xd94($v1) @@ -2766,10 +2766,10 @@ glabel var7f1b9978 /* f1a6018: 00084080 */ sll $t0,$t0,0x2 /* f1a601c: 01194021 */ addu $t0,$t0,$t9 /* f1a6020: 000840c0 */ sll $t0,$t0,0x3 -/* f1a6024: 3c09800a */ lui $t1,0x800a +/* f1a6024: 3c09800a */ lui $t1,%hi(g_Menus) /* f1a6028: 01194023 */ subu $t0,$t0,$t9 /* f1a602c: 00084100 */ sll $t0,$t0,0x4 -/* f1a6030: 2529e000 */ addiu $t1,$t1,-8192 +/* f1a6030: 2529e000 */ addiu $t1,$t1,%lo(g_Menus) /* f1a6034: 3c013f80 */ lui $at,0x3f80 /* f1a6038: 01091821 */ addu $v1,$t0,$t1 /* f1a603c: 44816000 */ mtc1 $at,$f12 @@ -2810,7 +2810,7 @@ glabel var7f1b9978 .L0f1a60bc: /* f1a60bc: 8d6b1448 */ lw $t3,%lo(g_MpPlayerNum)($t3) /* f1a60c0: 44800000 */ mtc1 $zero,$f0 -/* f1a60c4: 3c0e800a */ lui $t6,0x800a +/* f1a60c4: 3c0e800a */ lui $t6,%hi(g_Menus) /* f1a60c8: 000b60c0 */ sll $t4,$t3,0x3 /* f1a60cc: 018b6023 */ subu $t4,$t4,$t3 /* f1a60d0: 000c6080 */ sll $t4,$t4,0x2 @@ -2819,7 +2819,7 @@ glabel var7f1b9978 /* f1a60dc: 018b6023 */ subu $t4,$t4,$t3 /* f1a60e0: 000c6100 */ sll $t4,$t4,0x4 /* f1a60e4: 258d0840 */ addiu $t5,$t4,0x840 -/* f1a60e8: 25cee000 */ addiu $t6,$t6,-8192 +/* f1a60e8: 25cee000 */ addiu $t6,$t6,%lo(g_Menus) /* f1a60ec: 44057000 */ mfc1 $a1,$f14 /* f1a60f0: 44061000 */ mfc1 $a2,$f2 /* f1a60f4: 240f0007 */ addiu $t7,$zero,0x7 @@ -2840,10 +2840,10 @@ glabel var7f1b9978 /* f1a6130: 0019c880 */ sll $t9,$t9,0x2 /* f1a6134: 0338c821 */ addu $t9,$t9,$t8 /* f1a6138: 0019c8c0 */ sll $t9,$t9,0x3 -/* f1a613c: 3c08800a */ lui $t0,0x800a +/* f1a613c: 3c08800a */ lui $t0,%hi(g_Menus) /* f1a6140: 0338c823 */ subu $t9,$t9,$t8 /* f1a6144: 0019c900 */ sll $t9,$t9,0x4 -/* f1a6148: 2508e000 */ addiu $t0,$t0,-8192 +/* f1a6148: 2508e000 */ addiu $t0,$t0,%lo(g_Menus) /* f1a614c: 03281821 */ addu $v1,$t9,$t0 /* f1a6150: 3c017f1c */ lui $at,%hi(var7f1b9970) /* f1a6154: e46a0d50 */ swc1 $f10,0xd50($v1) @@ -2863,8 +2863,8 @@ glabel var7f1b9978 /* f1a6188: 14a10012 */ bne $a1,$at,.L0f1a61d4 /* f1a618c: 3c0a8007 */ lui $t2,%hi(g_MpPlayerNum) /* f1a6190: 8d4a1448 */ lw $t2,%lo(g_MpPlayerNum)($t2) -/* f1a6194: 3c0c800a */ lui $t4,0x800a -/* f1a6198: 258ce000 */ addiu $t4,$t4,-8192 +/* f1a6194: 3c0c800a */ lui $t4,%hi(g_Menus) +/* f1a6198: 258ce000 */ addiu $t4,$t4,%lo(g_Menus) /* f1a619c: 000a58c0 */ sll $t3,$t2,0x3 /* f1a61a0: 016a5823 */ subu $t3,$t3,$t2 /* f1a61a4: 000b5880 */ sll $t3,$t3,0x2 @@ -2882,8 +2882,8 @@ glabel var7f1b9978 .L0f1a61d4: /* f1a61d4: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f1a61d8: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f1a61dc: 3c19800a */ lui $t9,0x800a -/* f1a61e0: 2739e000 */ addiu $t9,$t9,-8192 +/* f1a61dc: 3c19800a */ lui $t9,%hi(g_Menus) +/* f1a61e0: 2739e000 */ addiu $t9,$t9,%lo(g_Menus) /* f1a61e4: 000fc0c0 */ sll $t8,$t7,0x3 /* f1a61e8: 030fc023 */ subu $t8,$t8,$t7 /* f1a61ec: 0018c080 */ sll $t8,$t8,0x2 @@ -2917,8 +2917,8 @@ glabel var7f1b9978 .L0f1a6254: /* f1a6254: 3c017f1c */ lui $at,%hi(var7f1b9978) /* f1a6258: c4249978 */ lwc1 $f4,%lo(var7f1b9978)($at) -/* f1a625c: 3c01800a */ lui $at,0x800a -/* f1a6260: c4269fc4 */ lwc1 $f6,-0x603c($at) +/* f1a625c: 3c01800a */ lui $at,%hi(g_Vars+0x4) +/* f1a6260: c4269fc4 */ lwc1 $f6,%lo(g_Vars+0x4)($at) /* f1a6264: c46a0d64 */ lwc1 $f10,0xd64($v1) /* f1a6268: 46062202 */ mul.s $f8,$f4,$f6 /* f1a626c: 46085000 */ add.s $f0,$f10,$f8 @@ -3103,10 +3103,10 @@ glabel var7f1b9998 /* f1a661c: 000b5880 */ sll $t3,$t3,0x2 /* f1a6620: 016a5821 */ addu $t3,$t3,$t2 /* f1a6624: 000b58c0 */ sll $t3,$t3,0x3 -/* f1a6628: 3c0c800a */ lui $t4,0x800a +/* f1a6628: 3c0c800a */ lui $t4,%hi(g_Menus) /* f1a662c: 016a5823 */ subu $t3,$t3,$t2 /* f1a6630: 000b5900 */ sll $t3,$t3,0x4 -/* f1a6634: 258ce000 */ addiu $t4,$t4,-8192 +/* f1a6634: 258ce000 */ addiu $t4,$t4,%lo(g_Menus) /* f1a6638: 016c1021 */ addu $v0,$t3,$t4 /* f1a663c: e4400d78 */ swc1 $f0,0xd78($v0) /* f1a6640: 10000010 */ b .L0f1a6684 @@ -3120,10 +3120,10 @@ glabel var7f1b9998 /* f1a665c: 0018c080 */ sll $t8,$t8,0x2 /* f1a6660: 030dc021 */ addu $t8,$t8,$t5 /* f1a6664: 0018c0c0 */ sll $t8,$t8,0x3 -/* f1a6668: 3c0e800a */ lui $t6,0x800a +/* f1a6668: 3c0e800a */ lui $t6,%hi(g_Menus) /* f1a666c: 030dc023 */ subu $t8,$t8,$t5 /* f1a6670: 0018c100 */ sll $t8,$t8,0x4 -/* f1a6674: 25cee000 */ addiu $t6,$t6,-8192 +/* f1a6674: 25cee000 */ addiu $t6,$t6,%lo(g_Menus) /* f1a6678: 030e1021 */ addu $v0,$t8,$t6 /* f1a667c: e4400d78 */ swc1 $f0,0xd78($v0) /* f1a6680: e4400d50 */ swc1 $f0,0xd50($v0) @@ -3162,8 +3162,8 @@ glabel var7f1b9998 /* f1a66fc: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f1a6700: 3c098007 */ lui $t1,%hi(g_MpPlayerNum) /* f1a6704: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) -/* f1a6708: 3c0b800a */ lui $t3,0x800a -/* f1a670c: 256be000 */ addiu $t3,$t3,-8192 +/* f1a6708: 3c0b800a */ lui $t3,%hi(g_Menus) +/* f1a670c: 256be000 */ addiu $t3,$t3,%lo(g_Menus) /* f1a6710: 000950c0 */ sll $t2,$t1,0x3 /* f1a6714: 01495023 */ subu $t2,$t2,$t1 /* f1a6718: 000a5080 */ sll $t2,$t2,0x2 @@ -3182,18 +3182,18 @@ glabel var7f1b9998 /* f1a6748: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) /* f1a674c: 3c017f1c */ lui $at,%hi(var7f1b9998) /* f1a6750: c42a9998 */ lwc1 $f10,%lo(var7f1b9998)($at) -/* f1a6754: 3c018006 */ lui $at,0x8006 -/* f1a6758: c4301630 */ lwc1 $f16,0x1630($at) +/* f1a6754: 3c018006 */ lui $at,%hi(var80061630) +/* f1a6758: c4301630 */ lwc1 $f16,%lo(var80061630)($at) /* f1a675c: 000e78c0 */ sll $t7,$t6,0x3 /* f1a6760: 01ee7823 */ subu $t7,$t7,$t6 /* f1a6764: 000f7880 */ sll $t7,$t7,0x2 /* f1a6768: 46105002 */ mul.s $f0,$f10,$f16 /* f1a676c: 01ee7821 */ addu $t7,$t7,$t6 /* f1a6770: 000f78c0 */ sll $t7,$t7,0x3 -/* f1a6774: 3c19800a */ lui $t9,0x800a +/* f1a6774: 3c19800a */ lui $t9,%hi(g_Menus) /* f1a6778: 01ee7823 */ subu $t7,$t7,$t6 /* f1a677c: 000f7900 */ sll $t7,$t7,0x4 -/* f1a6780: 2739e000 */ addiu $t9,$t9,-8192 +/* f1a6780: 2739e000 */ addiu $t9,$t9,%lo(g_Menus) /* f1a6784: 44801000 */ mtc1 $zero,$f2 /* f1a6788: 01f91021 */ addu $v0,$t7,$t9 /* f1a678c: e4400d8c */ swc1 $f0,0xd8c($v0) @@ -4044,7 +4044,7 @@ glabel var7f1b99d8 .L0f1a7410: /* f1a7410: 8d081448 */ lw $t0,%lo(g_MpPlayerNum)($t0) /* f1a7414: 44800000 */ mtc1 $zero,$f0 -/* f1a7418: 3c0a800a */ lui $t2,0x800a +/* f1a7418: 3c0a800a */ lui $t2,%hi(g_Menus) /* f1a741c: 000848c0 */ sll $t1,$t0,0x3 /* f1a7420: 01284823 */ subu $t1,$t1,$t0 /* f1a7424: 00094880 */ sll $t1,$t1,0x2 @@ -4052,7 +4052,7 @@ glabel var7f1b99d8 /* f1a742c: 000948c0 */ sll $t1,$t1,0x3 /* f1a7430: 01284823 */ subu $t1,$t1,$t0 /* f1a7434: 00094900 */ sll $t1,$t1,0x4 -/* f1a7438: 254ae000 */ addiu $t2,$t2,-8192 +/* f1a7438: 254ae000 */ addiu $t2,$t2,%lo(g_Menus) /* f1a743c: 012a1821 */ addu $v1,$t1,$t2 /* f1a7440: e4600d88 */ swc1 $f0,0xd88($v1) /* f1a7444: e4600d60 */ swc1 $f0,0xd60($v1) @@ -4067,8 +4067,8 @@ glabel var7f1b99d8 .L0f1a7468: /* f1a7468: 3c0b8007 */ lui $t3,%hi(g_MpPlayerNum) /* f1a746c: 8d6b1448 */ lw $t3,%lo(g_MpPlayerNum)($t3) -/* f1a7470: 3c0d800a */ lui $t5,0x800a -/* f1a7474: 25ade000 */ addiu $t5,$t5,-8192 +/* f1a7470: 3c0d800a */ lui $t5,%hi(g_Menus) +/* f1a7474: 25ade000 */ addiu $t5,$t5,%lo(g_Menus) /* f1a7478: 000b60c0 */ sll $t4,$t3,0x3 /* f1a747c: 018b6023 */ subu $t4,$t4,$t3 /* f1a7480: 000c6080 */ sll $t4,$t4,0x2 @@ -4113,8 +4113,8 @@ glabel var7f1b99d8 /* f1a7518: 254a97c4 */ addiu $t2,$t2,%lo(var800897c4) /* f1a751c: e46c0d84 */ swc1 $f12,0xd84($v1) /* f1a7520: c43299d8 */ lwc1 $f18,%lo(var7f1b99d8)($at) -/* f1a7524: 3c01800a */ lui $at,0x800a -/* f1a7528: c4249fc4 */ lwc1 $f4,-0x603c($at) +/* f1a7524: 3c01800a */ lui $at,%hi(g_Vars+0x4) +/* f1a7528: c4249fc4 */ lwc1 $f4,%lo(g_Vars+0x4)($at) /* f1a752c: ac6a0df4 */ sw $t2,0xdf4($v1) /* f1a7530: 46049182 */ mul.s $f6,$f18,$f4 /* f1a7534: 46065080 */ add.s $f2,$f10,$f6 diff --git a/src/game/gamefile.c b/src/game/gamefile.c index ef82ff793..5e7f9689a 100644 --- a/src/game/gamefile.c +++ b/src/game/gamefile.c @@ -1877,9 +1877,9 @@ glabel func0f110f4c /* f111270: 000e70c0 */ sll $t6,$t6,0x3 /* f111274: 27bdffe0 */ addiu $sp,$sp,-32 /* f111278: 01c47023 */ subu $t6,$t6,$a0 -/* f11127c: 3c0f800a */ lui $t7,0x800a +/* f11127c: 3c0f800a */ lui $t7,%hi(g_Menus) /* f111280: afb00018 */ sw $s0,0x18($sp) -/* f111284: 25efe000 */ addiu $t7,$t7,-8192 +/* f111284: 25efe000 */ addiu $t7,$t7,%lo(g_Menus) /* f111288: 000e7100 */ sll $t6,$t6,0x4 /* f11128c: 01cf8021 */ addu $s0,$t6,$t7 /* f111290: 8e030e68 */ lw $v1,0xe68($s0) @@ -1977,8 +1977,8 @@ glabel func0f110f4c /* f1113ec: 01c47021 */ addu $t6,$t6,$a0 /* f1113f0: 000e70c0 */ sll $t6,$t6,0x3 /* f1113f4: 01c47023 */ subu $t6,$t6,$a0 -/* f1113f8: 3c0f800a */ lui $t7,0x800a -/* f1113fc: 25efe000 */ addiu $t7,$t7,-8192 +/* f1113f8: 3c0f800a */ lui $t7,%hi(g_Menus) +/* f1113fc: 25efe000 */ addiu $t7,$t7,%lo(g_Menus) /* f111400: 000e7100 */ sll $t6,$t6,0x4 /* f111404: 01cf1821 */ addu $v1,$t6,$t7 /* f111408: 8c780e68 */ lw $t8,0xe68($v1) @@ -2016,8 +2016,8 @@ glabel func0f111460 /* f111470: 000e70c0 */ sll $t6,$t6,0x3 /* f111474: 27bdffc8 */ addiu $sp,$sp,-56 /* f111478: 01c47023 */ subu $t6,$t6,$a0 -/* f11147c: 3c0f800a */ lui $t7,0x800a -/* f111480: 25efe000 */ addiu $t7,$t7,-8192 +/* f11147c: 3c0f800a */ lui $t7,%hi(g_Menus) +/* f111480: 25efe000 */ addiu $t7,$t7,%lo(g_Menus) /* f111484: 000e7100 */ sll $t6,$t6,0x4 /* f111488: afb00018 */ sw $s0,0x18($sp) /* f11148c: 01cf5021 */ addu $t2,$t6,$t7 diff --git a/src/game/lang.c b/src/game/lang.c index d4adea55c..c48266c13 100644 --- a/src/game/lang.c +++ b/src/game/lang.c @@ -230,7 +230,7 @@ glabel func0f16e3fc /* f16e5ec: 010e1021 */ addu $v0,$t0,$t6 .L0f16e5f0: /* f16e5f0: 11000032 */ beqz $t0,.L0f16e6bc -/* f16e5f4: 3c02800b */ lui $v0,0x800b +/* f16e5f4: 3c02800b */ lui $v0,%hi(var800aabb4) /* f16e5f8: 05600030 */ bltz $t3,.L0f16e6bc /* f16e5fc: 000b1840 */ sll $v1,$t3,0x1 /* f16e600: 01831021 */ addu $v0,$t4,$v1 @@ -281,7 +281,7 @@ glabel func0f16e3fc /* f16e6b4: 10000002 */ b .L0f16e6c0 /* f16e6b8: 01191021 */ addu $v0,$t0,$t9 .L0f16e6bc: -/* f16e6bc: 8c42abb4 */ lw $v0,-21580($v0) +/* f16e6bc: 8c42abb4 */ lw $v0,%lo(var800aabb4)($v0) .L0f16e6c0: /* f16e6c0: 8fbf001c */ lw $ra,0x1c($sp) .L0f16e6c4: diff --git a/src/game/mplayer.c b/src/game/mplayer.c index 90d1de59b..aaf3587da 100644 --- a/src/game/mplayer.c +++ b/src/game/mplayer.c @@ -2247,8 +2247,8 @@ glabel func0f18973c /* f189754: afa400a0 */ sw $a0,0xa0($sp) /* f189758: 3c013f80 */ lui $at,0x3f80 /* f18975c: 44812000 */ mtc1 $at,$f4 -/* f189760: 3c018006 */ lui $at,0x8006 -/* f189764: c4261630 */ lwc1 $f6,0x1630($at) +/* f189760: 3c018006 */ lui $at,%hi(var80061630) +/* f189764: c4261630 */ lwc1 $f6,%lo(var80061630)($at) /* f189768: 3c0141a0 */ lui $at,0x41a0 /* f18976c: 44815000 */ mtc1 $at,$f10 /* f189770: 46062201 */ sub.s $f8,$f4,$f6 diff --git a/src/game/pak/pak.c b/src/game/pak/pak.c index 5c38c1215..2950cc93a 100644 --- a/src/game/pak/pak.c +++ b/src/game/pak/pak.c @@ -2976,8 +2976,8 @@ glabel func0f118674 /* f11871c: 01515021 */ addu $t2,$t2,$s1 /* f118720: 000a5080 */ sll $t2,$t2,0x2 /* f118724: 01515023 */ subu $t2,$t2,$s1 -/* f118728: 3c0b800a */ lui $t3,0x800a -/* f11872c: 256b2380 */ addiu $t3,$t3,0x2380 +/* f118728: 3c0b800a */ lui $t3,%hi(var800a2380) +/* f11872c: 256b2380 */ addiu $t3,$t3,%lo(var800a2380) /* f118730: 000a5080 */ sll $t2,$t2,0x2 /* f118734: 014b9021 */ addu $s2,$t2,$t3 /* f118738: 8e4c02a0 */ lw $t4,0x2a0($s2) @@ -3124,8 +3124,8 @@ glabel func0f118674 /* f118930: 01314821 */ addu $t1,$t1,$s1 /* f118934: 00094880 */ sll $t1,$t1,0x2 /* f118938: 01314823 */ subu $t1,$t1,$s1 -/* f11893c: 3c0a800a */ lui $t2,0x800a -/* f118940: 254a2380 */ addiu $t2,$t2,0x2380 +/* f11893c: 3c0a800a */ lui $t2,%hi(var800a2380) +/* f118940: 254a2380 */ addiu $t2,$t2,%lo(var800a2380) /* f118944: 00094880 */ sll $t1,$t1,0x2 /* f118948: 012a9021 */ addu $s2,$t1,$t2 /* f11894c: 240b0010 */ addiu $t3,$zero,0x10 @@ -4214,8 +4214,8 @@ glabel func0f1194e0 /* f1194a8: 01314821 */ addu $t1,$t1,$s1 /* f1194ac: 00094880 */ sll $t1,$t1,0x2 /* f1194b0: 01314823 */ subu $t1,$t1,$s1 -/* f1194b4: 3c0a800a */ lui $t2,0x800a -/* f1194b8: 254a2380 */ addiu $t2,$t2,0x2380 +/* f1194b4: 3c0a800a */ lui $t2,%hi(var800a2380) +/* f1194b8: 254a2380 */ addiu $t2,$t2,%lo(var800a2380) /* f1194bc: 00094880 */ sll $t1,$t1,0x2 /* f1194c0: 012aa021 */ addu $s4,$t1,$t2 /* f1194c4: 8e8b02a0 */ lw $t3,0x2a0($s4) @@ -4784,9 +4784,9 @@ glabel func0f11970c /* f11960c: 000f7880 */ sll $t7,$t7,0x2 /* f119610: afa40488 */ sw $a0,0x488($sp) /* f119614: 01ee7823 */ subu $t7,$t7,$t6 -/* f119618: 3c18800a */ lui $t8,0x800a +/* f119618: 3c18800a */ lui $t8,%hi(var800a2380) /* f11961c: afbe0050 */ sw $s8,0x50($sp) -/* f119620: 27182380 */ addiu $t8,$t8,0x2380 +/* f119620: 27182380 */ addiu $t8,$t8,%lo(var800a2380) /* f119624: 000f7880 */ sll $t7,$t7,0x2 /* f119628: 000e2600 */ sll $a0,$t6,0x18 /* f11962c: afbf0054 */ sw $ra,0x54($sp) @@ -6219,9 +6219,9 @@ glabel func0f11a8f4 /* f11a698: 01ee7821 */ addu $t7,$t7,$t6 /* f11a69c: 000f7880 */ sll $t7,$t7,0x2 /* f11a6a0: 01ee7823 */ subu $t7,$t7,$t6 -/* f11a6a4: 3c18800a */ lui $t8,0x800a +/* f11a6a4: 3c18800a */ lui $t8,%hi(var800a2380) /* f11a6a8: afb00024 */ sw $s0,0x24($sp) -/* f11a6ac: 27182380 */ addiu $t8,$t8,0x2380 +/* f11a6ac: 27182380 */ addiu $t8,$t8,%lo(var800a2380) /* f11a6b0: 000f7880 */ sll $t7,$t7,0x2 /* f11a6b4: 01f88021 */ addu $s0,$t7,$t8 /* f11a6b8: 920902b8 */ lbu $t1,0x2b8($s0) @@ -6257,19 +6257,19 @@ glabel func0f11a8f4 /* f11a728: 01b16823 */ subu $t5,$t5,$s1 /* f11a72c: 000d6880 */ sll $t5,$t5,0x2 /* f11a730: 01b16821 */ addu $t5,$t5,$s1 -/* f11a734: 3c0e800a */ lui $t6,0x800a -/* f11a738: 25ce3180 */ addiu $t6,$t6,0x3180 +/* f11a734: 3c0e800a */ lui $t6,%hi(var800a3180) +/* f11a738: 25ce3180 */ addiu $t6,$t6,%lo(var800a3180) /* f11a73c: 000d68c0 */ sll $t5,$t5,0x3 /* f11a740: 01ae2021 */ addu $a0,$t5,$t6 .L0f11a744_2: -/* f11a744: 3c0f8007 */ lui $t7,0x8007 -/* f11a748: 25ef5d08 */ addiu $t7,$t7,0x5d08 +/* f11a744: 3c0f8007 */ lui $t7,%hi(var80075d08) +/* f11a748: 25ef5d08 */ addiu $t7,$t7,%lo(var80075d08) /* f11a74c: 3c064e50 */ lui $a2,0x4e50 -/* f11a750: 3c078007 */ lui $a3,0x8007 +/* f11a750: 3c078007 */ lui $a3,%hi(var80075cf8) /* f11a754: 2602029c */ addiu $v0,$s0,0x29c /* f11a758: afa20014 */ sw $v0,0x14($sp) /* f11a75c: afa20034 */ sw $v0,0x34($sp) -/* f11a760: 24e75cf8 */ addiu $a3,$a3,0x5cf8 +/* f11a760: 24e75cf8 */ addiu $a3,$a3,%lo(var80075cf8) /* f11a764: 34c64445 */ ori $a2,$a2,0x4445 /* f11a768: 0fc45f76 */ jal 0xf117dd8 /* f11a76c: afaf0010 */ sw $t7,0x10($sp) @@ -6309,18 +6309,18 @@ glabel func0f11a8f4 /* f11a7ec: 01916023 */ subu $t4,$t4,$s1 /* f11a7f0: 000c6080 */ sll $t4,$t4,0x2 /* f11a7f4: 01916021 */ addu $t4,$t4,$s1 -/* f11a7f8: 3c0d800a */ lui $t5,0x800a -/* f11a7fc: 25ad3180 */ addiu $t5,$t5,0x3180 +/* f11a7f8: 3c0d800a */ lui $t5,%hi(var800a3180) +/* f11a7fc: 25ad3180 */ addiu $t5,$t5,%lo(var800a3180) /* f11a800: 000c60c0 */ sll $t4,$t4,0x3 /* f11a804: 018d2021 */ addu $a0,$t4,$t5 .L0f11a808_2: /* f11a808: 8faf0048 */ lw $t7,0x48($sp) /* f11a80c: 8fb80034 */ lw $t8,0x34($sp) -/* f11a810: 3c0e8007 */ lui $t6,0x8007 -/* f11a814: 25ce5d08 */ addiu $t6,$t6,0x5d08 +/* f11a810: 3c0e8007 */ lui $t6,%hi(var80075d08) +/* f11a814: 25ce5d08 */ addiu $t6,$t6,%lo(var80075d08) /* f11a818: 3c064e50 */ lui $a2,0x4e50 -/* f11a81c: 3c078007 */ lui $a3,0x8007 -/* f11a820: 24e75cf8 */ addiu $a3,$a3,0x5cf8 +/* f11a81c: 3c078007 */ lui $a3,%hi(var80075cf8) +/* f11a820: 24e75cf8 */ addiu $a3,$a3,%lo(var80075cf8) /* f11a824: 34c64445 */ ori $a2,$a2,0x4445 /* f11a828: afae0010 */ sw $t6,0x10($sp) /* f11a82c: afaf0014 */ sw $t7,0x14($sp) @@ -10622,8 +10622,8 @@ glabel var7f1b4fd8 /* f11dd10: 27bdffe0 */ addiu $sp,$sp,-32 /* f11dd14: afa40020 */ sw $a0,0x20($sp) /* f11dd18: 83ae0023 */ lb $t6,0x23($sp) -/* f11dd1c: 3c18800a */ lui $t8,0x800a -/* f11dd20: 27182380 */ addiu $t8,$t8,0x2380 +/* f11dd1c: 3c18800a */ lui $t8,%hi(var800a2380) +/* f11dd20: 27182380 */ addiu $t8,$t8,%lo(var800a2380) /* f11dd24: 000e7880 */ sll $t7,$t6,0x2 /* f11dd28: 01ee7823 */ subu $t7,$t7,$t6 /* f11dd2c: 000f7880 */ sll $t7,$t7,0x2 @@ -10635,11 +10635,11 @@ glabel var7f1b4fd8 /* f11dd44: 000f7880 */ sll $t7,$t7,0x2 /* f11dd48: 01f81821 */ addu $v1,$t7,$t8 /* f11dd4c: 8c7902b8 */ lw $t9,0x2b8($v1) -/* f11dd50: 3c068007 */ lui $a2,0x8007 +/* f11dd50: 3c068007 */ lui $a2,%hi(var80075d14) /* f11dd54: afbf0014 */ sw $ra,0x14($sp) /* f11dd58: 00194980 */ sll $t1,$t9,0x6 /* f11dd5c: 05210017 */ bgez $t1,.L0f11ddbc -/* f11dd60: 24c65d14 */ addiu $a2,$a2,0x5d14 +/* f11dd60: 24c65d14 */ addiu $a2,$a2,%lo(var80075d14) /* f11dd64: 8cca0000 */ lw $t2,0x0($a2) /* f11dd68: 2404ffff */ addiu $a0,$zero,-1 /* f11dd6c: 24050001 */ addiu $a1,$zero,0x1 @@ -10665,8 +10665,8 @@ glabel var7f1b4fd8 /* f11ddb8: a06c02b8 */ sb $t4,0x2b8($v1) .L0f11ddbc: /* f11ddbc: 8c6d0010 */ lw $t5,0x10($v1) -/* f11ddc0: 3c068007 */ lui $a2,0x8007 -/* f11ddc4: 24c65d14 */ addiu $a2,$a2,0x5d14 +/* f11ddc0: 3c068007 */ lui $a2,%hi(var80075d14) +/* f11ddc4: 24c65d14 */ addiu $a2,$a2,%lo(var80075d14) /* f11ddc8: 2da1001c */ sltiu $at,$t5,0x1c /* f11ddcc: 102000e9 */ beqz $at,.L0f11e174 /* f11ddd0: 000d6880 */ sll $t5,$t5,0x2 @@ -10704,15 +10704,15 @@ glabel var7f1b4fd8 /* f11de48: 100000cb */ beqz $zero,.L0f11e178 /* f11de4c: 8fbf0014 */ lw $ra,0x14($sp) /* f11de50: 83a90023 */ lb $t1,0x23($sp) -/* f11de54: 3c08800a */ lui $t0,0x800a -/* f11de58: 9108a490 */ lbu $t0,-0x5b70($t0) +/* f11de54: 3c08800a */ lui $t0,%hi(g_Vars+0x4d0) +/* f11de58: 9108a490 */ lbu $t0,%lo(g_Vars+0x4d0)($t0) /* f11de5c: 240a0001 */ addiu $t2,$zero,0x1 /* f11de60: 012a5804 */ sllv $t3,$t2,$t1 /* f11de64: 010b6024 */ and $t4,$t0,$t3 /* f11de68: 1180000a */ beqz $t4,.L0f11de94 /* f11de6c: 24180007 */ addiu $t8,$zero,0x7 -/* f11de70: 3c0d800a */ lui $t5,0x800a -/* f11de74: 25ad2eb0 */ addiu $t5,$t5,0x2eb0 +/* f11de70: 3c0d800a */ lui $t5,%hi(var800a2eb0) +/* f11de74: 25ad2eb0 */ addiu $t5,$t5,%lo(var800a2eb0) /* f11de78: 146d0004 */ bne $v1,$t5,.L0f11de8c /* f11de7c: 240f0004 */ addiu $t7,$zero,0x4 /* f11de80: 240e0005 */ addiu $t6,$zero,0x5 @@ -10725,8 +10725,8 @@ glabel var7f1b4fd8 /* f11de94: 100000b7 */ beqz $zero,.L0f11e174 /* f11de98: ac780010 */ sw $t8,0x10($v1) /* f11de9c: 83aa0023 */ lb $t2,0x23($sp) -/* f11dea0: 3c19800a */ lui $t9,0x800a -/* f11dea4: 9339a490 */ lbu $t9,-0x5b70($t9) +/* f11dea0: 3c19800a */ lui $t9,%hi(g_Vars+0x4d0) +/* f11dea4: 9339a490 */ lbu $t9,%lo(g_Vars+0x4d0)($t9) /* f11dea8: 24090001 */ addiu $t1,$zero,0x1 /* f11deac: 01494004 */ sllv $t0,$t1,$t2 /* f11deb0: 03285824 */ and $t3,$t9,$t0 @@ -10735,9 +10735,9 @@ glabel var7f1b4fd8 /* f11debc: 100000ad */ beqz $zero,.L0f11e174 /* f11dec0: ac6c0010 */ sw $t4,0x10($v1) /* f11dec4: 83ad0023 */ lb $t5,0x23($sp) -/* f11dec8: 3c018007 */ lui $at,0x8007 +/* f11dec8: 3c018007 */ lui $at,%hi(g_MpPlayerNum) /* f11decc: 24040007 */ addiu $a0,$zero,0x7 -/* f11ded0: ac2d1448 */ sw $t5,0x1448($at) +/* f11ded0: ac2d1448 */ sw $t5,%lo(g_MpPlayerNum)($at) /* f11ded4: 8cce0000 */ lw $t6,0x0($a2) /* f11ded8: 24050001 */ addiu $a1,$zero,0x1 /* f11dedc: 51c00005 */ beqzl $t6,.L0f11def4 @@ -10802,8 +10802,8 @@ glabel var7f1b4fd8 /* f11dfc0: 8fa3001c */ lw $v1,0x1c($sp) .L0f11dfc4: /* f11dfc4: 83b80023 */ lb $t8,0x23($sp) -/* f11dfc8: 3c0f800a */ lui $t7,0x800a -/* f11dfcc: 91efa490 */ lbu $t7,-0x5b70($t7) +/* f11dfc8: 3c0f800a */ lui $t7,%hi(g_Vars+0x4d0) +/* f11dfcc: 91efa490 */ lbu $t7,%lo(g_Vars+0x4d0)($t7) /* f11dfd0: 24090001 */ addiu $t1,$zero,0x1 /* f11dfd4: 03095004 */ sllv $t2,$t1,$t8 /* f11dfd8: 01eac824 */ and $t9,$t7,$t2 @@ -10849,8 +10849,8 @@ glabel var7f1b4fd8 /* f11e078: 8fa3001c */ lw $v1,0x1c($sp) /* f11e07c: 83a90023 */ lb $t1,0x23($sp) .L0f11e080: -/* f11e080: 3c0e800a */ lui $t6,0x800a -/* f11e084: 91cea490 */ lbu $t6,-0x5b70($t6) +/* f11e080: 3c0e800a */ lui $t6,%hi(g_Vars+0x4d0) +/* f11e084: 91cea490 */ lbu $t6,%lo(g_Vars+0x4d0)($t6) /* f11e088: 240f0001 */ addiu $t7,$zero,0x1 /* f11e08c: 012f5004 */ sllv $t2,$t7,$t1 /* f11e090: 01cac824 */ and $t9,$t6,$t2 @@ -10878,8 +10878,8 @@ glabel var7f1b4fd8 /* f11e0e8: 8fa3001c */ lw $v1,0x1c($sp) .L0f11e0ec: /* f11e0ec: 83ac0023 */ lb $t4,0x23($sp) -/* f11e0f0: 3c0b800a */ lui $t3,0x800a -/* f11e0f4: 916ba490 */ lbu $t3,-0x5b70($t3) +/* f11e0f0: 3c0b800a */ lui $t3,%hi(g_Vars+0x4d0) +/* f11e0f4: 916ba490 */ lbu $t3,%lo(g_Vars+0x4d0)($t3) /* f11e0f8: 240d0001 */ addiu $t5,$zero,0x1 /* f11e0fc: 018d7804 */ sllv $t7,$t5,$t4 /* f11e100: 016f7024 */ and $t6,$t3,$t7 @@ -11433,8 +11433,8 @@ glabel func0f11e844 /* f11e630: 030ec021 */ addu $t8,$t8,$t6 /* f11e634: 0018c080 */ sll $t8,$t8,0x2 /* f11e638: 030ec023 */ subu $t8,$t8,$t6 -/* f11e63c: 3c19800a */ lui $t9,0x800a -/* f11e640: 27392380 */ addiu $t9,$t9,0x2380 +/* f11e63c: 3c19800a */ lui $t9,%hi(var800a2380) +/* f11e640: 27392380 */ addiu $t9,$t9,%lo(var800a2380) /* f11e644: 0018c080 */ sll $t8,$t8,0x2 /* f11e648: 27bdff78 */ addiu $sp,$sp,-136 /* f11e64c: 03191821 */ addu $v1,$t8,$t9 @@ -11466,8 +11466,8 @@ glabel func0f11e844 /* f11e6ac: 01274823 */ subu $t1,$t1,$a3 /* f11e6b0: 00094880 */ sll $t1,$t1,0x2 /* f11e6b4: 01274821 */ addu $t1,$t1,$a3 -/* f11e6b8: 3c0a800a */ lui $t2,0x800a -/* f11e6bc: 254a3180 */ addiu $t2,$t2,0x3180 +/* f11e6b8: 3c0a800a */ lui $t2,%hi(var800a3180) +/* f11e6bc: 254a3180 */ addiu $t2,$t2,%lo(var800a3180) /* f11e6c0: 000948c0 */ sll $t1,$t1,0x3 /* f11e6c4: 012a2021 */ addu $a0,$t1,$t2 .L0f11e6c8: @@ -11484,11 +11484,11 @@ glabel func0f11e844 /* f11e6ec: 240b0001 */ addiu $t3,$zero,0x1 /* f11e6f0: afab0028 */ sw $t3,0x28($sp) .L0f11e6f4: -/* f11e6f4: 3c0d8007 */ lui $t5,0x8007 -/* f11e6f8: 95ad5cb0 */ lhu $t5,0x5cb0($t5) +/* f11e6f4: 3c0d8007 */ lui $t5,%hi(var80075cb0) +/* f11e6f8: 95ad5cb0 */ lhu $t5,%lo(var80075cb0)($t5) /* f11e6fc: 97ac007c */ lhu $t4,0x7c($sp) -/* f11e700: 3c048007 */ lui $a0,0x8007 -/* f11e704: 24845cb4 */ addiu $a0,$a0,0x5cb4 +/* f11e700: 3c048007 */ lui $a0,%hi(var80075cb4) +/* f11e704: 24845cb4 */ addiu $a0,$a0,%lo(var80075cb4) /* f11e708: 158d0017 */ bne $t4,$t5,.L0f11e768 /* f11e70c: 27a5006c */ addiu $a1,$sp,0x6c /* f11e710: afa3001c */ sw $v1,0x1c($sp) @@ -11497,8 +11497,8 @@ glabel func0f11e844 /* f11e71c: 8fa3001c */ lw $v1,0x1c($sp) /* f11e720: 1440000a */ bnez $v0,.L0f11e74c /* f11e724: 83a7008b */ lb $a3,0x8b($sp) -/* f11e728: 3c048007 */ lui $a0,0x8007 -/* f11e72c: 24845cc0 */ addiu $a0,$a0,0x5cc0 +/* f11e728: 3c048007 */ lui $a0,%hi(var80075cc0) +/* f11e72c: 24845cc0 */ addiu $a0,$a0,%lo(var80075cc0) /* f11e730: 27a5006c */ addiu $a1,$sp,0x6c /* f11e734: afa3001c */ sw $v1,0x1c($sp) /* f11e738: 0fc47970 */ jal 0xf11e5c0 @@ -11534,8 +11534,8 @@ glabel func0f11e844 /* f11e7a0: 01876023 */ subu $t4,$t4,$a3 /* f11e7a4: 000c6080 */ sll $t4,$t4,0x2 /* f11e7a8: 01876021 */ addu $t4,$t4,$a3 -/* f11e7ac: 3c0d800a */ lui $t5,0x800a -/* f11e7b0: 25ad3180 */ addiu $t5,$t5,0x3180 +/* f11e7ac: 3c0d800a */ lui $t5,%hi(var800a3180) +/* f11e7b0: 25ad3180 */ addiu $t5,$t5,%lo(var800a3180) /* f11e7b4: 000c60c0 */ sll $t4,$t4,0x3 /* f11e7b8: 018d2021 */ addu $a0,$t4,$t5 .L0f11e7bc: diff --git a/src/game/propobj.c b/src/game/propobj.c index 0895ebbc4..53190bb17 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -4335,7 +4335,7 @@ glabel func0f069850 /* f069918: 8fa40034 */ lw $a0,0x34($sp) /* f06991c: 920d005c */ lbu $t5,0x5c($s0) /* f069920: 8e0f0018 */ lw $t7,0x18($s0) -/* f069924: 3c018007 */ lui $at,0x8007 +/* f069924: 3c018007 */ lui $at,%hi(var80069a70) /* f069928: 000d7080 */ sll $t6,$t5,0x2 /* f06992c: 01cd7023 */ subu $t6,$t6,$t5 /* f069930: 000e7080 */ sll $t6,$t6,0x2 @@ -4344,7 +4344,7 @@ glabel func0f069850 /* f06993c: 000e7080 */ sll $t6,$t6,0x2 /* f069940: 002e0821 */ addu $at,$at,$t6 /* f069944: 460a0402 */ mul.s $f16,$f0,$f10 -/* f069948: c4269a70 */ lwc1 $f6,-0x6590($at) +/* f069948: c4269a70 */ lwc1 $f6,%lo(var80069a70)($at) /* f06994c: c6040090 */ lwc1 $f4,0x90($s0) /* f069950: 3c0141a0 */ lui $at,0x41a0 /* f069954: 46062200 */ add.s $f8,$f4,$f6 @@ -4363,7 +4363,7 @@ glabel func0f069850 /* f069984: 8fa40034 */ lw $a0,0x34($sp) /* f069988: 9218005c */ lbu $t8,0x5c($s0) /* f06998c: 8e080018 */ lw $t0,0x18($s0) -/* f069990: 3c018007 */ lui $at,0x8007 +/* f069990: 3c018007 */ lui $at,%hi(var80069a70) /* f069994: 0018c880 */ sll $t9,$t8,0x2 /* f069998: 0338c823 */ subu $t9,$t9,$t8 /* f06999c: 0019c880 */ sll $t9,$t9,0x2 @@ -4372,7 +4372,7 @@ glabel func0f069850 /* f0699a8: 0019c880 */ sll $t9,$t9,0x2 /* f0699ac: 00390821 */ addu $at,$at,$t9 /* f0699b0: 46040182 */ mul.s $f6,$f0,$f4 -/* f0699b4: c4289a70 */ lwc1 $f8,-0x6590($at) +/* f0699b4: c4289a70 */ lwc1 $f8,%lo(var80069a70)($at) /* f0699b8: c6100090 */ lwc1 $f16,0x90($s0) /* f0699bc: 3c0141a0 */ lui $at,0x41a0 /* f0699c0: 46088480 */ add.s $f18,$f16,$f8 @@ -4428,7 +4428,7 @@ glabel func0f069850 /* f069a74: 8fa40034 */ lw $a0,0x34($sp) /* f069a78: 920b005c */ lbu $t3,0x5c($s0) /* f069a7c: 8e0d0018 */ lw $t5,0x18($s0) -/* f069a80: 3c018007 */ lui $at,0x8007 +/* f069a80: 3c018007 */ lui $at,%hi(var80069a70) /* f069a84: 000b6080 */ sll $t4,$t3,0x2 /* f069a88: 018b6023 */ subu $t4,$t4,$t3 /* f069a8c: 000c6080 */ sll $t4,$t4,0x2 @@ -4437,7 +4437,7 @@ glabel func0f069850 /* f069a98: 000c6080 */ sll $t4,$t4,0x2 /* f069a9c: 002c0821 */ addu $at,$at,$t4 /* f069aa0: 46080102 */ mul.s $f4,$f0,$f8 -/* f069aa4: c42a9a70 */ lwc1 $f10,-0x6590($at) +/* f069aa4: c42a9a70 */ lwc1 $f10,%lo(var80069a70)($at) /* f069aa8: c6120090 */ lwc1 $f18,0x90($s0) /* f069aac: 3c0141a0 */ lui $at,0x41a0 /* f069ab0: 460a9400 */ add.s $f16,$f18,$f10 @@ -4456,7 +4456,7 @@ glabel func0f069850 /* f069ae0: 8fa40034 */ lw $a0,0x34($sp) /* f069ae4: 920e005c */ lbu $t6,0x5c($s0) /* f069ae8: 8e180018 */ lw $t8,0x18($s0) -/* f069aec: 3c018007 */ lui $at,0x8007 +/* f069aec: 3c018007 */ lui $at,%hi(var80069a70) /* f069af0: 000e7880 */ sll $t7,$t6,0x2 /* f069af4: 01ee7823 */ subu $t7,$t7,$t6 /* f069af8: 000f7880 */ sll $t7,$t7,0x2 @@ -4465,7 +4465,7 @@ glabel func0f069850 /* f069b04: 000f7880 */ sll $t7,$t7,0x2 /* f069b08: 002f0821 */ addu $at,$at,$t7 /* f069b0c: 46120282 */ mul.s $f10,$f0,$f18 -/* f069b10: c4309a70 */ lwc1 $f16,-0x6590($at) +/* f069b10: c4309a70 */ lwc1 $f16,%lo(var80069a70)($at) /* f069b14: c6040090 */ lwc1 $f4,0x90($s0) /* f069b18: 3c0141a0 */ lui $at,0x41a0 /* f069b1c: 46102180 */ add.s $f6,$f4,$f16 @@ -6443,12 +6443,12 @@ glabel func0f06b610 /* f06b6f0: 450201a4 */ bc1fl .L0f06bd84 /* f06b6f4: 8fa20114 */ lw $v0,0x114($sp) /* f06b6f8: 90590001 */ lbu $t9,0x1($v0) -/* f06b6fc: 3c018006 */ lui $at,0x8006 +/* f06b6fc: 3c018006 */ lui $at,%hi(var8005efc0) /* f06b700: 02802025 */ or $a0,$s4,$zero /* f06b704: 33280002 */ andi $t0,$t9,0x2 /* f06b708: 11000181 */ beqz $t0,.L0f06bd10 /* f06b70c: 00000000 */ nop -/* f06b710: c42aefc0 */ lwc1 $f10,-0x1040($at) +/* f06b710: c42aefc0 */ lwc1 $f10,%lo(var8005efc0)($at) /* f06b714: 8fb20148 */ lw $s2,0x148($sp) /* f06b718: 8fb30144 */ lw $s3,0x144($sp) /* f06b71c: 460aa03c */ c.lt.s $f20,$f10 @@ -7042,7 +7042,7 @@ glabel var7f1aa264 /* f06bef4: c4880014 */ lwc1 $f8,0x14($a0) /* f06bef8: 44813000 */ mtc1 $at,$f6 /* f06befc: 8fae00b8 */ lw $t6,0xb8($sp) -/* f06bf00: 3c018006 */ lui $at,0x8006 +/* f06bf00: 3c018006 */ lui $at,%hi(var8005efc0) /* f06bf04: 46083283 */ div.s $f10,$f6,$f8 /* f06bf08: 3c15800a */ lui $s5,%hi(g_Vars) /* f06bf0c: 26b59fc0 */ addiu $s5,$s5,%lo(g_Vars) @@ -7050,7 +7050,7 @@ glabel var7f1aa264 /* f06bf14: 00a09025 */ or $s2,$a1,$zero /* f06bf18: 00809825 */ or $s3,$a0,$zero /* f06bf1c: 0000b825 */ or $s7,$zero,$zero -/* f06bf20: e42aefc0 */ swc1 $f10,-0x1040($at) +/* f06bf20: e42aefc0 */ swc1 $f10,%lo(var8005efc0)($at) /* f06bf24: c5d00000 */ lwc1 $f16,0x0($t6) /* f06bf28: c4e40000 */ lwc1 $f4,0x0($a3) /* f06bf2c: 46008482 */ mul.s $f18,$f16,$f0 @@ -7111,14 +7111,14 @@ glabel var7f1aa264 .L0f06c004: /* f06c004: 44818000 */ mtc1 $at,$f16 /* f06c008: c6720014 */ lwc1 $f18,0x14($s3) -/* f06c00c: 3c018006 */ lui $at,0x8006 +/* f06c00c: 3c018006 */ lui $at,%hi(var8005efc0) /* f06c010: 0000b825 */ or $s7,$zero,$zero /* f06c014: 46128103 */ div.s $f4,$f16,$f18 /* f06c018: 02602025 */ or $a0,$s3,$zero /* f06c01c: 02002825 */ or $a1,$s0,$zero /* f06c020: 00003025 */ or $a2,$zero,$zero /* f06c024: 0c006973 */ jal func0001a5cc -/* f06c028: e424efc0 */ swc1 $f4,-0x1040($at) +/* f06c028: e424efc0 */ swc1 $f4,%lo(var8005efc0)($at) /* f06c02c: 02202025 */ or $a0,$s1,$zero /* f06c030: 00402825 */ or $a1,$v0,$zero /* f06c034: 8fa600b4 */ lw $a2,0xb4($sp) @@ -7140,10 +7140,10 @@ glabel var7f1aa264 .L0f06c070: /* f06c070: 44813000 */ mtc1 $at,$f6 /* f06c074: c6680014 */ lwc1 $f8,0x14($s3) -/* f06c078: 3c018006 */ lui $at,0x8006 +/* f06c078: 3c018006 */ lui $at,%hi(var8005efc0) /* f06c07c: 46083283 */ div.s $f10,$f6,$f8 /* f06c080: 10000036 */ b .L0f06c15c -/* f06c084: e42aefc0 */ swc1 $f10,-0x1040($at) +/* f06c084: e42aefc0 */ swc1 $f10,%lo(var8005efc0)($at) /* f06c088: 12e00034 */ beqz $s7,.L0f06c15c /* f06c08c: 02602025 */ or $a0,$s3,$zero /* f06c090: 8e110004 */ lw $s1,0x4($s0) @@ -7271,7 +7271,7 @@ glabel var7f1aa264 /* f06c24c: 8fbf0054 */ lw $ra,0x54($sp) .L0f06c250: /* f06c250: 44808000 */ mtc1 $zero,$f16 -/* f06c254: 3c018006 */ lui $at,0x8006 +/* f06c254: 3c018006 */ lui $at,%hi(var8005efc0) /* f06c258: 8fa2009c */ lw $v0,0x9c($sp) /* f06c25c: 8fb00030 */ lw $s0,0x30($sp) /* f06c260: 8fb10034 */ lw $s1,0x34($sp) @@ -7284,7 +7284,7 @@ glabel var7f1aa264 /* f06c27c: 8fbe0050 */ lw $s8,0x50($sp) /* f06c280: 27bd00a8 */ addiu $sp,$sp,0xa8 /* f06c284: 03e00008 */ jr $ra -/* f06c288: e430efc0 */ swc1 $f16,-0x1040($at) +/* f06c288: e430efc0 */ swc1 $f16,%lo(var8005efc0)($at) ); GLOBAL_ASM( @@ -7349,9 +7349,9 @@ glabel func0f06c28c /* f06c370: 3c014120 */ lui $at,0x4120 /* f06c374: 44813000 */ mtc1 $at,$f6 /* f06c378: c5e40014 */ lwc1 $f4,0x14($t7) -/* f06c37c: 3c018006 */ lui $at,0x8006 +/* f06c37c: 3c018006 */ lui $at,%hi(var8005efc0) /* f06c380: 46043283 */ div.s $f10,$f6,$f4 -/* f06c384: e42aefc0 */ swc1 $f10,-0x1040($at) +/* f06c384: e42aefc0 */ swc1 $f10,%lo(var8005efc0)($at) /* f06c388: 4610403e */ c.le.s $f8,$f16 .L0f06c38c: /* f06c38c: c7a60100 */ lwc1 $f6,0x100($sp) @@ -7376,8 +7376,8 @@ glabel func0f06c28c /* f06c3d8: 33190002 */ andi $t9,$t8,0x2 /* f06c3dc: 132000ed */ beqz $t9,.L0f06c794 /* f06c3e0: 8fa500f4 */ lw $a1,0xf4($sp) -/* f06c3e4: 3c018006 */ lui $at,0x8006 -/* f06c3e8: c42aefc0 */ lwc1 $f10,-0x1040($at) +/* f06c3e4: 3c018006 */ lui $at,%hi(var8005efc0) +/* f06c3e8: c42aefc0 */ lwc1 $f10,%lo(var8005efc0)($at) /* f06c3ec: 8fb30104 */ lw $s3,0x104($sp) /* f06c3f0: 8fb40108 */ lw $s4,0x108($sp) /* f06c3f4: 460aa03c */ c.lt.s $f20,$f10 @@ -7679,14 +7679,14 @@ glabel func0f06c28c /* f06c84c: 5600ffec */ bnezl $s0,.L0f06c800 /* f06c850: 920d0001 */ lbu $t5,0x1($s0) .L0f06c854: -/* f06c854: 3c018006 */ lui $at,0x8006 -/* f06c858: c426efc0 */ lwc1 $f6,-0x1040($at) -/* f06c85c: 3c018006 */ lui $at,0x8006 +/* f06c854: 3c018006 */ lui $at,%hi(var8005efc0) +/* f06c858: c426efc0 */ lwc1 $f6,%lo(var8005efc0)($at) +/* f06c85c: 3c018006 */ lui $at,%hi(var8005efc0) /* f06c860: 4606a03c */ c.lt.s $f20,$f6 /* f06c864: 00000000 */ nop /* f06c868: 45020003 */ bc1fl .L0f06c878 /* f06c86c: 8fbf0064 */ lw $ra,0x64($sp) -/* f06c870: e434efc0 */ swc1 $f20,-0x1040($at) +/* f06c870: e434efc0 */ swc1 $f20,%lo(var8005efc0)($at) /* f06c874: 8fbf0064 */ lw $ra,0x64($sp) .L0f06c878: /* f06c878: 8fa200c8 */ lw $v0,0xc8($sp) @@ -9913,8 +9913,8 @@ glabel var7f1aa298 /* f06e7bc: 460a4303 */ div.s $f12,$f8,$f10 /* f06e7c0: c7b0006c */ lwc1 $f16,0x6c($sp) /* f06e7c4: 44809000 */ mtc1 $zero,$f18 -/* f06e7c8: 3c01800a */ lui $at,0x800a -/* f06e7cc: c426a00c */ lwc1 $f6,-0x5ff4($at) +/* f06e7c8: 3c01800a */ lui $at,%hi(g_Vars+0x4c) +/* f06e7cc: c426a00c */ lwc1 $f6,%lo(g_Vars+0x4c)($at) /* f06e7d0: 46128032 */ c.eq.s $f16,$f18 /* f06e7d4: 3c013f80 */ lui $at,0x3f80 /* f06e7d8: 8fb80068 */ lw $t8,0x68($sp) @@ -14443,8 +14443,8 @@ glabel var7f1aa320 /* f072a2c: 44819000 */ mtc1 $at,$f18 /* f072a30: 3c013f80 */ lui $at,0x3f80 /* f072a34: 44812000 */ mtc1 $at,$f4 -/* f072a38: 3c01800a */ lui $at,0x800a -/* f072a3c: c428a00c */ lwc1 $f8,-0x5ff4($at) +/* f072a38: 3c01800a */ lui $at,%hi(g_Vars+0x4c) +/* f072a3c: c428a00c */ lwc1 $f8,%lo(g_Vars+0x4c)($at) /* f072a40: 46002303 */ div.s $f12,$f4,$f0 /* f072a44: c7a600a8 */ lwc1 $f6,0xa8($sp) /* f072a48: c7a20048 */ lwc1 $f2,0x48($sp) @@ -15923,13 +15923,13 @@ glabel var7f1aa438 /* f073d98: 27a50504 */ addiu $a1,$sp,0x504 /* f073d9c: 4480a000 */ mtc1 $zero,$f20 /* f073da0: c60000dc */ lwc1 $f0,0xdc($s0) -/* f073da4: 3c01800a */ lui $at,0x800a +/* f073da4: 3c01800a */ lui $at,%hi(g_Vars+0x4c) /* f073da8: 4600a03c */ c.lt.s $f20,$f0 /* f073dac: 00000000 */ nop /* f073db0: 4502002c */ bc1fl .L0f073e64 /* f073db4: 4614003c */ c.lt.s $f0,$f20 /* f073db8: c60a00e0 */ lwc1 $f10,0xe0($s0) -/* f073dbc: c424a00c */ lwc1 $f4,-0x5ff4($at) +/* f073dbc: c424a00c */ lwc1 $f4,%lo(g_Vars+0x4c)($at) /* f073dc0: 3c013f80 */ lui $at,0x3f80 /* f073dc4: 46045182 */ mul.s $f6,$f10,$f4 /* f073dc8: 46060201 */ sub.s $f8,$f0,$f6 @@ -16221,8 +16221,8 @@ glabel var7f1aa438 /* f0741d8: 46064282 */ mul.s $f10,$f8,$f6 /* f0741dc: e60a00dc */ swc1 $f10,0xdc($s0) .L0f0741e0: -/* f0741e0: 3c01800a */ lui $at,0x800a -/* f0741e4: c428a00c */ lwc1 $f8,-0x5ff4($at) +/* f0741e0: 3c01800a */ lui $at,%hi(g_Vars+0x4c) +/* f0741e4: c428a00c */ lwc1 $f8,%lo(g_Vars+0x4c)($at) /* f0741e8: c60400dc */ lwc1 $f4,0xdc($s0) /* f0741ec: 46082002 */ mul.s $f0,$f4,$f8 /* f0741f0: 46140032 */ c.eq.s $f0,$f20 @@ -16257,8 +16257,8 @@ glabel var7f1aa438 /* f074264: 0fc1c9f5 */ jal func0f0727d4 /* f074268: e60800dc */ swc1 $f8,0xdc($s0) .L0f07426c: -/* f07426c: 3c01800a */ lui $at,0x800a -/* f074270: c422a00c */ lwc1 $f2,-0x5ff4($at) +/* f07426c: 3c01800a */ lui $at,%hi(g_Vars+0x4c) +/* f074270: c422a00c */ lwc1 $f2,%lo(g_Vars+0x4c)($at) /* f074274: c6060004 */ lwc1 $f6,0x4($s0) /* f074278: e7b405a0 */ swc1 $f20,0x5a0($sp) /* f07427c: 8faf0088 */ lw $t7,0x88($sp) @@ -16487,8 +16487,8 @@ glabel var7f1aa438 /* f0745cc: 8fb80088 */ lw $t8,0x88($sp) /* f0745d0: 460a2000 */ add.s $f0,$f4,$f10 /* f0745d4: 44812000 */ mtc1 $at,$f4 -/* f0745d8: 3c01800a */ lui $at,0x800a -/* f0745dc: c422a00c */ lwc1 $f2,-0x5ff4($at) +/* f0745d8: 3c01800a */ lui $at,%hi(g_Vars+0x4c) +/* f0745dc: c422a00c */ lwc1 $f2,%lo(g_Vars+0x4c)($at) /* f0745e0: 46048280 */ add.s $f10,$f16,$f4 /* f0745e4: 46005107 */ neg.s $f4,$f10 /* f0745e8: 46040002 */ mul.s $f0,$f0,$f4 @@ -16572,8 +16572,8 @@ glabel var7f1aa438 /* f074714: e7b40594 */ swc1 $f20,0x594($sp) /* f074718: 460a0402 */ mul.s $f16,$f0,$f10 /* f07471c: 46003107 */ neg.s $f4,$f6 -/* f074720: 3c01800a */ lui $at,0x800a -/* f074724: c422a00c */ lwc1 $f2,-0x5ff4($at) +/* f074720: 3c01800a */ lui $at,%hi(g_Vars+0x4c) +/* f074724: c422a00c */ lwc1 $f2,%lo(g_Vars+0x4c)($at) /* f074728: 8fb90088 */ lw $t9,0x88($sp) /* f07472c: 46102202 */ mul.s $f8,$f4,$f16 /* f074730: e7a80590 */ swc1 $f8,0x590($sp) @@ -16676,8 +16676,8 @@ glabel var7f1aa438 /* f0748a4: c7aa0398 */ lwc1 $f10,0x398($sp) /* f0748a8: c7a403a0 */ lwc1 $f4,0x3a0($sp) /* f0748ac: 46004303 */ div.s $f12,$f8,$f0 -/* f0748b0: 3c01800a */ lui $at,0x800a -/* f0748b4: c422a00c */ lwc1 $f2,-0x5ff4($at) +/* f0748b0: 3c01800a */ lui $at,%hi(g_Vars+0x4c) +/* f0748b4: c422a00c */ lwc1 $f2,%lo(g_Vars+0x4c)($at) /* f0748b8: 8fa90088 */ lw $t1,0x88($sp) /* f0748bc: 460c5182 */ mul.s $f6,$f10,$f12 /* f0748c0: 00000000 */ nop @@ -16964,8 +16964,8 @@ glabel var7f1aa438 /* f074cdc: 4600503c */ c.lt.s $f10,$f0 /* f074ce0: 00000000 */ nop /* f074ce4: 45000018 */ bc1f .L0f074d48 -/* f074ce8: 3c01800a */ lui $at,0x800a -/* f074cec: c424a00c */ lwc1 $f4,-0x5ff4($at) +/* f074ce8: 3c01800a */ lui $at,%hi(g_Vars+0x4c) +/* f074cec: c424a00c */ lwc1 $f4,%lo(g_Vars+0x4c)($at) /* f074cf0: c6060014 */ lwc1 $f6,0x14($s0) /* f074cf4: c60a00ac */ lwc1 $f10,0xac($s0) /* f074cf8: 46043202 */ mul.s $f8,$f6,$f4 @@ -16980,10 +16980,10 @@ glabel var7f1aa438 /* f074d1c: c7aa05e0 */ lwc1 $f10,0x5e0($sp) /* f074d20: c60400a8 */ lwc1 $f4,0xa8($s0) /* f074d24: c426a3fc */ lwc1 $f6,%lo(var7f1aa3fc)($at) -/* f074d28: 3c01800a */ lui $at,0x800a +/* f074d28: 3c01800a */ lui $at,%hi(g_Vars+0x4c) /* f074d2c: 460a2201 */ sub.s $f8,$f4,$f10 /* f074d30: 46083102 */ mul.s $f4,$f6,$f8 -/* f074d34: c426a00c */ lwc1 $f6,-0x5ff4($at) +/* f074d34: c426a00c */ lwc1 $f6,%lo(g_Vars+0x4c)($at) /* f074d38: 46062202 */ mul.s $f8,$f4,$f6 /* f074d3c: 46085100 */ add.s $f4,$f10,$f8 /* f074d40: 1000000c */ b .L0f074d74 @@ -17171,11 +17171,11 @@ glabel var7f1aa438 /* f075004: 24849fd8 */ addiu $a0,$a0,%lo(var7f1a9fd8) /* f075008: 3c188007 */ lui $t8,%hi(var80069bcc) /* f07500c: 8f189bcc */ lw $t8,%lo(var80069bcc)($t8) -/* f075010: 3c01800a */ lui $at,0x800a +/* f075010: 3c01800a */ lui $at,%hi(g_Vars+0x44) /* f075014: c7b00290 */ lwc1 $f16,0x290($sp) /* f075018: 44982000 */ mtc1 $t8,$f4 /* f07501c: c7b20294 */ lwc1 $f18,0x294($sp) -/* f075020: c420a004 */ lwc1 $f0,-0x5ffc($at) +/* f075020: c420a004 */ lwc1 $f0,%lo(g_Vars+0x44)($at) /* f075024: 07010005 */ bgez $t8,.L0f07503c /* f075028: 468021a0 */ cvt.s.w $f6,$f4 /* f07502c: 3c014f80 */ lui $at,0x4f80 @@ -17185,8 +17185,8 @@ glabel var7f1aa438 .L0f07503c: /* f07503c: 3c0142c8 */ lui $at,0x42c8 /* f075040: 44815000 */ mtc1 $at,$f10 -/* f075044: 3c018007 */ lui $at,0x8007 -/* f075048: c4289bc4 */ lwc1 $f8,-0x643c($at) +/* f075044: 3c018007 */ lui $at,%hi(var80069bc4) +/* f075048: c4289bc4 */ lwc1 $f8,%lo(var80069bc4)($at) /* f07504c: 460a3103 */ div.s $f4,$f6,$f10 /* f075050: 3c098007 */ lui $t1,%hi(var80069bd0) /* f075054: 8d299bd0 */ lw $t1,%lo(var80069bd0)($t1) @@ -17221,8 +17221,8 @@ glabel var7f1aa438 .L0f0750c4: /* f0750c4: 3c0142c8 */ lui $at,0x42c8 /* f0750c8: 44815000 */ mtc1 $at,$f10 -/* f0750cc: 3c018007 */ lui $at,0x8007 -/* f0750d0: e4289bc4 */ swc1 $f8,-0x643c($at) +/* f0750cc: 3c018007 */ lui $at,%hi(var80069bc4) +/* f0750d0: e4289bc4 */ swc1 $f8,%lo(var80069bc4)($at) /* f0750d4: 460a3183 */ div.s $f6,$f6,$f10 /* f0750d8: c7aa02f0 */ lwc1 $f10,0x2f0($sp) /* f0750dc: c7a802f4 */ lwc1 $f8,0x2f4($sp) @@ -19109,8 +19109,8 @@ glabel var7f1aa438 /* f076c2c: 8fa2009c */ lw $v0,0x9c($sp) /* f076c30: 45000019 */ bc1f .L0f076c98 /* f076c34: 3c03800a */ lui $v1,%hi(g_Vars+0x38) -/* f076c38: 3c01800a */ lui $at,0x800a -/* f076c3c: c42aa00c */ lwc1 $f10,-0x5ff4($at) +/* f076c38: 3c01800a */ lui $at,%hi(g_Vars+0x4c) +/* f076c3c: c42aa00c */ lwc1 $f10,%lo(g_Vars+0x4c)($at) /* f076c40: c6080098 */ lwc1 $f8,0x98($s0) /* f076c44: 3c013f80 */ lui $at,0x3f80 /* f076c48: 44812000 */ mtc1 $at,$f4 @@ -21266,14 +21266,14 @@ glabel var7f1aa4a4 /* f078680: 032a5821 */ addu $t3,$t9,$t2 /* f078684: ac6b00b8 */ sw $t3,0xb8($v1) /* f078688: 8d2c0298 */ lw $t4,0x298($t1) -/* f07868c: 3c018007 */ lui $at,0x8007 +/* f07868c: 3c018007 */ lui $at,%hi(var80069948) /* f078690: 05800004 */ bltz $t4,.L0f0786a4 /* f078694: 00000000 */ nop /* f078698: 8d2e0038 */ lw $t6,0x38($t1) /* f07869c: 016ec021 */ addu $t8,$t3,$t6 /* f0786a0: ac7800b8 */ sw $t8,0xb8($v1) .L0f0786a4: -/* f0786a4: c4269948 */ lwc1 $f6,-0x66b8($at) +/* f0786a4: c4269948 */ lwc1 $f6,%lo(var80069948)($at) /* f0786a8: 8c6f00b8 */ lw $t7,0xb8($v1) /* f0786ac: 46065202 */ mul.s $f8,$f10,$f6 /* f0786b0: 4600410d */ trunc.w.s $f4,$f8 @@ -21590,8 +21590,8 @@ glabel var7f1aa4bc /* f078be8: 8c820004 */ lw $v0,0x4($a0) /* f078bec: 3c017f1b */ lui $at,%hi(var7f1aa4bc) /* f078bf0: c420a4bc */ lwc1 $f0,%lo(var7f1aa4bc)($at) -/* f078bf4: 3c01800a */ lui $at,0x800a -/* f078bf8: c426a00c */ lwc1 $f6,-0x5ff4($at) +/* f078bf4: 3c01800a */ lui $at,%hi(g_Vars+0x4c) +/* f078bf8: c426a00c */ lwc1 $f6,%lo(g_Vars+0x4c)($at) /* f078bfc: c4440068 */ lwc1 $f4,0x68($v0) /* f078c00: 27a5006c */ addiu $a1,$sp,0x6c /* f078c04: 46062302 */ mul.s $f12,$f4,$f6 @@ -23574,12 +23574,12 @@ glabel var7f1aa5a8 /* f07a6e0: 44816000 */ mtc1 $at,$f12 /* f07a6e4: 3c017f1b */ lui $at,%hi(var7f1aa58c) /* f07a6e8: c430a58c */ lwc1 $f16,%lo(var7f1aa58c)($at) -/* f07a6ec: 3c01800a */ lui $at,0x800a -/* f07a6f0: c426a00c */ lwc1 $f6,-0x5ff4($at) -/* f07a6f4: 3c018007 */ lui $at,0x8007 +/* f07a6ec: 3c01800a */ lui $at,%hi(g_Vars+0x4c) +/* f07a6f0: c426a00c */ lwc1 $f6,%lo(g_Vars+0x4c)($at) +/* f07a6f4: 3c018007 */ lui $at,%hi(var80069950) /* f07a6f8: 4600603c */ c.lt.s $f12,$f0 /* f07a6fc: 46068102 */ mul.s $f4,$f16,$f6 -/* f07a700: c42a9950 */ lwc1 $f10,-0x66b0($at) +/* f07a700: c42a9950 */ lwc1 $f10,%lo(var80069950)($at) /* f07a704: 8fae0194 */ lw $t6,0x194($sp) /* f07a708: 460a2082 */ mul.s $f2,$f4,$f10 /* f07a70c: 45020005 */ bc1fl .L0f07a724 @@ -23651,8 +23651,8 @@ glabel var7f1aa5a8 /* f07a800: 2406ffff */ addiu $a2,$zero,-1 /* f07a804: 3c013f00 */ lui $at,0x3f00 /* f07a808: 44815000 */ mtc1 $at,$f10 -/* f07a80c: 3c018007 */ lui $at,0x8007 -/* f07a810: c4309954 */ lwc1 $f16,-0x66ac($at) +/* f07a80c: 3c018007 */ lui $at,%hi(var80069954) +/* f07a810: c4309954 */ lwc1 $f16,%lo(var80069954)($at) /* f07a814: 8fa90124 */ lw $t1,0x124($sp) /* f07a818: 240c00c8 */ addiu $t4,$zero,0xc8 /* f07a81c: 46105002 */ mul.s $f0,$f10,$f16 @@ -24631,8 +24631,8 @@ glabel var7f1aa610 /* f07b72c: 45000008 */ bc1f .L0f07b750 /* f07b730: 00000000 */ nop /* f07b734: c428a5f8 */ lwc1 $f8,%lo(var7f1aa5f8)($at) -/* f07b738: 3c01800a */ lui $at,0x800a -/* f07b73c: c424a004 */ lwc1 $f4,-0x5ffc($at) +/* f07b738: 3c01800a */ lui $at,%hi(g_Vars+0x44) +/* f07b73c: c424a004 */ lwc1 $f4,%lo(g_Vars+0x44)($at) /* f07b740: 46044182 */ mul.s $f6,$f8,$f4 /* f07b744: 46060280 */ add.s $f10,$f0,$f6 /* f07b748: 10000014 */ b .L0f07b79c @@ -24660,8 +24660,8 @@ glabel var7f1aa610 /* f07b794: e60a00d8 */ swc1 $f10,0xd8($s0) /* f07b798: e7b20108 */ swc1 $f18,0x108($sp) .L0f07b79c: -/* f07b79c: 3c01800a */ lui $at,0x800a -/* f07b7a0: c424a004 */ lwc1 $f4,-0x5ffc($at) +/* f07b79c: 3c01800a */ lui $at,%hi(g_Vars+0x44) +/* f07b7a0: c424a004 */ lwc1 $f4,%lo(g_Vars+0x44)($at) /* f07b7a4: c60800d8 */ lwc1 $f8,0xd8($s0) /* f07b7a8: c60a00dc */ lwc1 $f10,0xdc($s0) /* f07b7ac: c7b20108 */ lwc1 $f18,0x108($sp) @@ -24929,8 +24929,8 @@ glabel var7f1aa668 /* f07bad8: 45000007 */ bc1f .L0f07baf8 /* f07badc: 3c017f1b */ lui $at,%hi(var7f1aa618) /* f07bae0: c42aa618 */ lwc1 $f10,%lo(var7f1aa618)($at) -/* f07bae4: 3c01800a */ lui $at,0x800a -/* f07bae8: c432a00c */ lwc1 $f18,-0x5ff4($at) +/* f07bae4: 3c01800a */ lui $at,%hi(g_Vars+0x4c) +/* f07bae8: c432a00c */ lwc1 $f18,%lo(g_Vars+0x4c)($at) /* f07baec: 46125102 */ mul.s $f4,$f10,$f18 /* f07baf0: 46040180 */ add.s $f6,$f0,$f4 /* f07baf4: e60600a4 */ swc1 $f6,0xa4($s0) @@ -25278,13 +25278,13 @@ glabel var7f1aa668 /* f07bff0: 8fa20178 */ lw $v0,0x178($sp) /* f07bff4: 0000c025 */ or $t8,$zero,$zero /* f07bff8: 4608103c */ c.lt.s $f2,$f8 -/* f07bffc: 3c01800a */ lui $at,0x800a +/* f07bffc: 3c01800a */ lui $at,%hi(g_Vars+0x4c) /* f07c000: 45020003 */ bc1fl .L0f07c010 /* f07c004: a6180092 */ sh $t8,0x92($s0) /* f07c008: 24180001 */ addiu $t8,$zero,0x1 /* f07c00c: a6180092 */ sh $t8,0x92($s0) .L0f07c010: -/* f07c010: c420a00c */ lwc1 $f0,-0x5ff4($at) +/* f07c010: c420a00c */ lwc1 $f0,%lo(g_Vars+0x4c)($at) /* f07c014: c6060098 */ lwc1 $f6,0x98($s0) /* f07c018: c44a0008 */ lwc1 $f10,0x8($v0) /* f07c01c: 24450028 */ addiu $a1,$v0,0x28 @@ -25553,8 +25553,8 @@ glabel var7f1aa698 /* f07c370: 45020008 */ bc1fl .L0f07c394 /* f07c374: 26030064 */ addiu $v1,$s0,0x64 /* f07c378: c430a670 */ lwc1 $f16,%lo(var7f1aa670)($at) -/* f07c37c: 3c01800a */ lui $at,0x800a -/* f07c380: c432a004 */ lwc1 $f18,-0x5ffc($at) +/* f07c37c: 3c01800a */ lui $at,%hi(g_Vars+0x44) +/* f07c380: c432a004 */ lwc1 $f18,%lo(g_Vars+0x44)($at) /* f07c384: 46128102 */ mul.s $f4,$f16,$f18 /* f07c388: 46040181 */ sub.s $f6,$f0,$f4 /* f07c38c: e4460000 */ swc1 $f6,0x0($v0) @@ -25677,8 +25677,8 @@ glabel var7f1aa698 /* f07c538: c7b2015c */ lwc1 $f18,0x15c($sp) /* f07c53c: 46003282 */ mul.s $f10,$f6,$f0 /* f07c540: c7a20088 */ lwc1 $f2,0x88($sp) -/* f07c544: 3c01800a */ lui $at,0x800a -/* f07c548: c42ca00c */ lwc1 $f12,-0x5ff4($at) +/* f07c544: 3c01800a */ lui $at,%hi(g_Vars+0x4c) +/* f07c548: c42ca00c */ lwc1 $f12,%lo(g_Vars+0x4c)($at) /* f07c54c: 26240008 */ addiu $a0,$s1,0x8 /* f07c550: 26250028 */ addiu $a1,$s1,0x28 /* f07c554: 27a60098 */ addiu $a2,$sp,0x98 @@ -27370,8 +27370,8 @@ glabel var7f1aa6e4 /* f07dd74: 0c0068f4 */ jal cosf /* f07dd78: c7ac0190 */ lwc1 $f12,0x190($sp) /* f07dd7c: c7aa0138 */ lwc1 $f10,0x138($sp) -/* f07dd80: 3c01800a */ lui $at,0x800a -/* f07dd84: c422a00c */ lwc1 $f2,-0x5ff4($at) +/* f07dd80: 3c01800a */ lui $at,%hi(g_Vars+0x4c) +/* f07dd84: c422a00c */ lwc1 $f2,%lo(g_Vars+0x4c)($at) /* f07dd88: 460a0102 */ mul.s $f4,$f0,$f10 /* f07dd8c: c7a60194 */ lwc1 $f6,0x194($sp) /* f07dd90: 8faf0278 */ lw $t7,0x278($sp) @@ -27414,13 +27414,13 @@ glabel var7f1aa6e4 /* f07de24: 3c017f1b */ lui $at,%hi(var7f1aa6e4) /* f07de28: c42aa6e4 */ lwc1 $f10,%lo(var7f1aa6e4)($at) /* f07de2c: 46040080 */ add.s $f2,$f0,$f4 -/* f07de30: 3c01800a */ lui $at,0x800a +/* f07de30: 3c01800a */ lui $at,%hi(g_Vars+0x4c) /* f07de34: 460a103c */ c.lt.s $f2,$f10 /* f07de38: e7a20154 */ swc1 $f2,0x154($sp) /* f07de3c: 4502000b */ bc1fl .L0f07de6c /* f07de40: c7a40150 */ lwc1 $f4,0x150($sp) /* f07de44: c6060064 */ lwc1 $f6,0x64($s0) -/* f07de48: c428a00c */ lwc1 $f8,-0x5ff4($at) +/* f07de48: c428a00c */ lwc1 $f8,%lo(g_Vars+0x4c)($at) /* f07de4c: c7aa0198 */ lwc1 $f10,0x198($sp) /* f07de50: 8fb90278 */ lw $t9,0x278($sp) /* f07de54: 46083102 */ mul.s $f4,$f6,$f8 @@ -34150,9 +34150,9 @@ glabel func0f084594 /* f084628: c4520008 */ lwc1 $f18,0x8($v0) /* f08462c: 0c0056c4 */ jal func00015b10 /* f084630: e7b200b4 */ swc1 $f18,0xb4($sp) -/* f084634: 3c018006 */ lui $at,0x8006 +/* f084634: 3c018006 */ lui $at,%hi(var8005efc0) /* f084638: 44806000 */ mtc1 $zero,$f12 -/* f08463c: c420efc0 */ lwc1 $f0,-0x1040($at) +/* f08463c: c420efc0 */ lwc1 $f0,%lo(var8005efc0)($at) /* f084640: 8fa300c8 */ lw $v1,0xc8($sp) /* f084644: 240d0001 */ addiu $t5,$zero,0x1 /* f084648: 46006032 */ c.eq.s $f12,$f0 @@ -35625,8 +35625,8 @@ glabel func0f0859a0 /* f085a1c: 1620fffb */ bnez $s1,.L0f085a0c /* f085a20: 02208025 */ or $s0,$s1,$zero .L0f085a24: -/* f085a24: 3c018006 */ lui $at,0x8006 -/* f085a28: c426efc0 */ lwc1 $f6,-0x1040($at) +/* f085a24: 3c018006 */ lui $at,%hi(var8005efc0) +/* f085a28: c426efc0 */ lwc1 $f6,%lo(var8005efc0)($at) /* f085a2c: 44802000 */ mtc1 $zero,$f4 /* f085a30: 02a02025 */ or $a0,$s5,$zero /* f085a34: 2692000c */ addiu $s2,$s4,0xc @@ -36466,8 +36466,8 @@ glabel func0f085eac /* f086620: 46000086 */ mov.s $f2,$f0 /* f086624: 91820003 */ lbu $v0,0x3($t4) /* f086628: 14410005 */ bne $v0,$at,.L0f086640 -/* f08662c: 3c018007 */ lui $at,0x8007 -/* f086630: c4289958 */ lwc1 $f8,-0x66a8($at) +/* f08662c: 3c018007 */ lui $at,%hi(var80069958) +/* f086630: c4289958 */ lwc1 $f8,%lo(var80069958)($at) /* f086634: 46080082 */ mul.s $f2,$f0,$f8 /* f086638: 10000031 */ b .L0f086700 /* f08663c: 8fae0120 */ lw $t6,0x120($sp) @@ -36499,8 +36499,8 @@ glabel func0f085eac /* f0866a0: e7a200c0 */ swc1 $f2,0xc0($sp) /* f0866a4: c7a200c0 */ lwc1 $f2,0xc0($sp) .L0f0866a8: -/* f0866a8: 3c018007 */ lui $at,0x8007 -/* f0866ac: c432994c */ lwc1 $f18,-0x66b4($at) +/* f0866a8: 3c018007 */ lui $at,%hi(var8006994c) +/* f0866ac: c432994c */ lwc1 $f18,%lo(var8006994c)($at) /* f0866b0: 46121082 */ mul.s $f2,$f2,$f18 /* f0866b4: 10000012 */ b .L0f086700 /* f0866b8: 8fae0120 */ lw $t6,0x120($sp) @@ -38214,8 +38214,8 @@ glabel var7f1aae70 /* f088990: 15400009 */ bnez $t2,.L0f0889b8 /* f088994: 00003025 */ or $a2,$zero,$zero /* f088998: 44853000 */ mtc1 $a1,$f6 -/* f08899c: 3c018007 */ lui $at,0x8007 -/* f0889a0: c42a995c */ lwc1 $f10,-0x66a4($at) +/* f08899c: 3c018007 */ lui $at,%hi(g_AmmoMultiplier) +/* f0889a0: c42a995c */ lwc1 $f10,%lo(g_AmmoMultiplier)($at) /* f0889a4: 46803220 */ cvt.s.w $f8,$f6 /* f0889a8: 460a4402 */ mul.s $f16,$f8,$f10 /* f0889ac: 4600848d */ trunc.w.s $f18,$f16 @@ -46730,9 +46730,9 @@ glabel func0f09044c /* f090454: 3c018007 */ lui $at,%hi(var800698e8) /* f090458: ac2e98e8 */ sw $t6,%lo(var800698e8)($at) /* f09045c: 27bdffe8 */ addiu $sp,$sp,-24 -/* f090460: 3c018007 */ lui $at,0x8007 +/* f090460: 3c018007 */ lui $at,%hi(var800698fc) /* f090464: afbf0014 */ sw $ra,0x14($sp) -/* f090468: e42498fc */ swc1 $f4,-0x6704($at) +/* f090468: e42498fc */ swc1 $f4,%lo(var800698fc)($at) /* f09046c: c4860000 */ lwc1 $f6,0x0($a0) /* f090470: 3c028007 */ lui $v0,%hi(var800698ec) /* f090474: 244298ec */ addiu $v0,$v0,%lo(var800698ec) @@ -46746,17 +46746,17 @@ glabel func0f09044c /* f090494: 14410007 */ bne $v0,$at,.L0f0904b4 /* f090498: 3c0142f0 */ lui $at,0x42f0 /* f09049c: 44818000 */ mtc1 $at,$f16 -/* f0904a0: 3c01800a */ lui $at,0x800a -/* f0904a4: e430ce38 */ swc1 $f16,-0x31c8($at) +/* f0904a0: 3c01800a */ lui $at,%hi(var8009ce38) +/* f0904a4: e430ce38 */ swc1 $f16,%lo(var8009ce38)($at) /* f0904a8: 3c01800a */ lui $at,%hi(var8009ce3c) /* f0904ac: 10000008 */ b .L0f0904d0 /* f0904b0: ac20ce3c */ sw $zero,%lo(var8009ce3c)($at) .L0f0904b4: /* f0904b4: 3c014561 */ lui $at,0x4561 /* f0904b8: 44819000 */ mtc1 $at,$f18 -/* f0904bc: 3c01800a */ lui $at,0x800a +/* f0904bc: 3c01800a */ lui $at,%hi(var8009ce38) /* f0904c0: 240f0001 */ addiu $t7,$zero,0x1 -/* f0904c4: e432ce38 */ swc1 $f18,-0x31c8($at) +/* f0904c4: e432ce38 */ swc1 $f18,%lo(var8009ce38)($at) /* f0904c8: 3c01800a */ lui $at,%hi(var8009ce3c) /* f0904cc: ac2fce3c */ sw $t7,%lo(var8009ce3c)($at) .L0f0904d0: @@ -46808,14 +46808,14 @@ glabel var7f1ab19c /* f090564: afbf002c */ sw $ra,0x2c($sp) /* f090568: 3c038007 */ lui $v1,%hi(var800698e4) /* f09056c: 246398e4 */ addiu $v1,$v1,%lo(var800698e4) -/* f090570: 3c01800a */ lui $at,0x800a -/* f090574: c426a00c */ lwc1 $f6,-0x5ff4($at) +/* f090570: 3c01800a */ lui $at,%hi(g_Vars+0x4c) +/* f090574: c426a00c */ lwc1 $f6,%lo(g_Vars+0x4c)($at) /* f090578: c4640000 */ lwc1 $f4,0x0($v1) -/* f09057c: 3c01800a */ lui $at,0x800a +/* f09057c: 3c01800a */ lui $at,%hi(var8009ce38) /* f090580: 46062200 */ add.s $f8,$f4,$f6 /* f090584: e4680000 */ swc1 $f8,0x0($v1) /* f090588: c46a0000 */ lwc1 $f10,0x0($v1) -/* f09058c: c420ce38 */ lwc1 $f0,-0x31c8($at) +/* f09058c: c420ce38 */ lwc1 $f0,%lo(var8009ce38)($at) /* f090590: 460a003e */ c.le.s $f0,$f10 /* f090594: 00000000 */ nop /* f090598: 45000003 */ bc1f .L0f0905a8 @@ -46832,10 +46832,10 @@ glabel var7f1ab19c /* f0905c0: 4502008e */ bc1fl .L0f0907fc /* f0905c4: 8fbf002c */ lw $ra,0x2c($sp) /* f0905c8: 8def0760 */ lw $t7,%lo(g_PlayerInvincible)($t7) -/* f0905cc: 3c01800a */ lui $at,0x800a +/* f0905cc: 3c01800a */ lui $at,%hi(var8009ce38) /* f0905d0: 55e0008a */ bnezl $t7,.L0f0907fc /* f0905d4: 8fbf002c */ lw $ra,0x2c($sp) -/* f0905d8: c432ce38 */ lwc1 $f18,-0x31c8($at) +/* f0905d8: c432ce38 */ lwc1 $f18,%lo(var8009ce38)($at) /* f0905dc: 0fc59829 */ jal func0f1660a4 /* f0905e0: 46120303 */ div.s $f12,$f0,$f18 /* f0905e4: 3c18800a */ lui $t8,%hi(var8009ce3c) @@ -46872,8 +46872,8 @@ glabel var7f1ab19c /* f090660: afa90010 */ sw $t1,0x10($sp) /* f090664: 0c004241 */ jal audioStart /* f090668: e7a60014 */ swc1 $f6,0x14($sp) -/* f09066c: 3c018007 */ lui $at,0x8007 -/* f090670: c42098e4 */ lwc1 $f0,-0x671c($at) +/* f09066c: 3c018007 */ lui $at,%hi(var800698e4) +/* f090670: c42098e4 */ lwc1 $f0,%lo(var800698e4)($at) .L0f090674: /* f090674: 3c0144e1 */ lui $at,0x44e1 /* f090678: 44814000 */ mtc1 $at,$f8 @@ -46901,16 +46901,16 @@ glabel var7f1ab19c .L0f0906d0: /* f0906d0: 3c028007 */ lui $v0,%hi(var800698fc) /* f0906d4: 244298fc */ addiu $v0,$v0,%lo(var800698fc) -/* f0906d8: 3c01800a */ lui $at,0x800a -/* f0906dc: c42ace38 */ lwc1 $f10,-0x31c8($at) +/* f0906d8: 3c01800a */ lui $at,%hi(var8009ce38) +/* f0906dc: c42ace38 */ lwc1 $f10,%lo(var8009ce38)($at) /* f0906e0: c4400000 */ lwc1 $f0,0x0($v0) -/* f0906e4: 3c01800a */ lui $at,0x800a -/* f0906e8: 3c048007 */ lui $a0,0x8007 +/* f0906e4: 3c01800a */ lui $at,%hi(g_Vars+0x4c) +/* f0906e8: 3c048007 */ lui $a0,%hi(var80069900) /* f0906ec: 460a003c */ c.lt.s $f0,$f10 /* f0906f0: 00000000 */ nop /* f0906f4: 45000037 */ bc1f .L0f0907d4 /* f0906f8: 00000000 */ nop -/* f0906fc: c430a00c */ lwc1 $f16,-0x5ff4($at) +/* f0906fc: c430a00c */ lwc1 $f16,%lo(g_Vars+0x4c)($at) /* f090700: 3c088007 */ lui $t0,%hi(var80069900) /* f090704: 2419ffff */ addiu $t9,$zero,-1 /* f090708: 46100480 */ add.s $f18,$f0,$f16 @@ -46966,7 +46966,7 @@ glabel var7f1ab19c /* f0907cc: 1000000b */ b .L0f0907fc /* f0907d0: 8fbf002c */ lw $ra,0x2c($sp) .L0f0907d4: -/* f0907d4: 8c849900 */ lw $a0,-26368($a0) +/* f0907d4: 8c849900 */ lw $a0,%lo(var80069900)($a0) /* f0907d8: 50800008 */ beqzl $a0,.L0f0907fc /* f0907dc: 8fbf002c */ lw $ra,0x2c($sp) /* f0907e0: 0c00cdfc */ jal func000337f0 @@ -47041,8 +47041,8 @@ glabel var7f1ab1a8 /* f0908c8: afb00028 */ sw $s0,0x28($sp) /* f0908cc: 15c00114 */ bnez $t6,.L0f090d20 /* f0908d0: afa40060 */ sw $a0,0x60($sp) -/* f0908d4: 3c018007 */ lui $at,0x8007 -/* f0908d8: c424990c */ lwc1 $f4,-0x66f4($at) +/* f0908d4: 3c018007 */ lui $at,%hi(g_CountdownTimerValue) +/* f0908d8: c424990c */ lwc1 $f4,%lo(g_CountdownTimerValue)($at) /* f0908dc: 0c002f40 */ jal viGetViewLeft /* f0908e0: e7a4004c */ swc1 $f4,0x4c($sp) /* f0908e4: 0c002f22 */ jal viGetViewX @@ -47911,8 +47911,8 @@ glabel var7f1ab214 /* f0916c4: 3c017f1b */ lui $at,%hi(var7f1ab210) /* f0916c8: c422b210 */ lwc1 $f2,%lo(var7f1ab210)($at) /* f0916cc: c4700000 */ lwc1 $f16,0x0($v1) -/* f0916d0: 3c01800a */ lui $at,0x800a -/* f0916d4: c420a00c */ lwc1 $f0,-0x5ff4($at) +/* f0916d0: 3c01800a */ lui $at,%hi(g_Vars+0x4c) +/* f0916d4: c420a00c */ lwc1 $f0,%lo(g_Vars+0x4c)($at) /* f0916d8: 46028482 */ mul.s $f18,$f16,$f2 /* f0916dc: 8fa20200 */ lw $v0,0x200($sp) /* f0916e0: 8fa50208 */ lw $a1,0x208($sp) @@ -48079,8 +48079,8 @@ glabel var7f1ab214 /* f09195c: 44816000 */ mtc1 $at,$f12 /* f091960: 3c017f1b */ lui $at,%hi(var7f1ab214) /* f091964: c424b214 */ lwc1 $f4,%lo(var7f1ab214)($at) -/* f091968: 3c01800a */ lui $at,0x800a -/* f09196c: c428a00c */ lwc1 $f8,-0x5ff4($at) +/* f091968: 3c01800a */ lui $at,%hi(g_Vars+0x4c) +/* f09196c: c428a00c */ lwc1 $f8,%lo(g_Vars+0x4c)($at) /* f091970: 8fad0204 */ lw $t5,0x204($sp) /* f091974: 4602603c */ c.lt.s $f12,$f2 /* f091978: 46082282 */ mul.s $f10,$f4,$f8 diff --git a/src/game/smoke.c b/src/game/smoke.c index 01e1634fe..e0929259a 100644 --- a/src/game/smoke.c +++ b/src/game/smoke.c @@ -173,7 +173,7 @@ glabel func0f12d3f0 /* f12d5e4: 0c0068f7 */ jal sinf /* f12d5e8: e7b00074 */ swc1 $f16,0x74($sp) /* f12d5ec: 8fae00b8 */ lw $t6,0xb8($sp) -/* f12d5f0: 3c018008 */ lui $at,0x8008 +/* f12d5f0: 3c018008 */ lui $at,%hi(g_SmokeTypes+0x20) /* f12d5f4: 8fa200bc */ lw $v0,0xbc($sp) /* f12d5f8: 95cf0006 */ lhu $t7,0x6($t6) /* f12d5fc: 000fc242 */ srl $t8,$t7,0x9 @@ -181,7 +181,7 @@ glabel func0f12d3f0 /* f12d604: 0338c821 */ addu $t9,$t9,$t8 /* f12d608: 0019c880 */ sll $t9,$t9,0x2 /* f12d60c: 00390821 */ addu $at,$at,$t9 -/* f12d610: c42ae960 */ lwc1 $f10,-0x16a0($at) +/* f12d610: c42ae960 */ lwc1 $f10,%lo(g_SmokeTypes+0x20)($at) /* f12d614: 3c0140e0 */ lui $at,0x40e0 /* f12d618: 44812000 */ mtc1 $at,$f4 /* f12d61c: 00000000 */ nop @@ -195,7 +195,7 @@ glabel func0f12d3f0 /* f12d63c: 0c0068f7 */ jal sinf /* f12d640: c44c001c */ lwc1 $f12,0x1c($v0) /* f12d644: 8faa00b8 */ lw $t2,0xb8($sp) -/* f12d648: 3c018008 */ lui $at,0x8008 +/* f12d648: 3c018008 */ lui $at,%hi(g_SmokeTypes+0x20) /* f12d64c: 8fae00bc */ lw $t6,0xbc($sp) /* f12d650: 954b0006 */ lhu $t3,0x6($t2) /* f12d654: 8fa80060 */ lw $t0,0x60($sp) @@ -204,7 +204,7 @@ glabel func0f12d3f0 /* f12d660: 01ac6821 */ addu $t5,$t5,$t4 /* f12d664: 000d6880 */ sll $t5,$t5,0x2 /* f12d668: 002d0821 */ addu $at,$at,$t5 -/* f12d66c: c426e960 */ lwc1 $f6,-0x16a0($at) +/* f12d66c: c426e960 */ lwc1 $f6,%lo(g_SmokeTypes+0x20)($at) /* f12d670: 3c0140e0 */ lui $at,0x40e0 /* f12d674: 44812000 */ mtc1 $at,$f4 /* f12d678: 00000000 */ nop diff --git a/src/game/splat.c b/src/game/splat.c index 35700333b..2efd23847 100644 --- a/src/game/splat.c +++ b/src/game/splat.c @@ -552,9 +552,9 @@ glabel func0f149274 /* f1492c4: 1420fff5 */ bnez $at,.L0f14929c /* f1492c8: e44a0024 */ swc1 $f10,0x24($v0) /* f1492cc: 240e0001 */ addiu $t6,$zero,0x1 -/* f1492d0: 3c018008 */ lui $at,0x8008 +/* f1492d0: 3c018008 */ lui $at,%hi(var8007f8b0) /* f1492d4: afae00d8 */ sw $t6,0xd8($sp) -/* f1492d8: c420f8b0 */ lwc1 $f0,-0x750($at) +/* f1492d8: c420f8b0 */ lwc1 $f0,%lo(var8007f8b0)($at) /* f1492dc: 27a200a0 */ addiu $v0,$sp,0xa0 /* f1492e0: 27a30514 */ addiu $v1,$sp,0x514 /* f1492e4: 27a40520 */ addiu $a0,$sp,0x520 @@ -753,8 +753,8 @@ glabel func0f149274 /* f1495ac: 00000000 */ nop /* f1495b0: 0fc5dd18 */ jal func0f177460 /* f1495b4: 27a50580 */ addiu $a1,$sp,0x580 -/* f1495b8: 3c018008 */ lui $at,0x8008 -/* f1495bc: c428f8b0 */ lwc1 $f8,-0x750($at) +/* f1495b8: 3c018008 */ lui $at,%hi(var8007f8b0) +/* f1495bc: c428f8b0 */ lwc1 $f8,%lo(var8007f8b0)($at) /* f1495c0: 46000306 */ mov.s $f12,$f0 /* f1495c4: 27a805b0 */ addiu $t0,$sp,0x5b0 /* f1495c8: 4608003c */ c.lt.s $f0,$f8 @@ -780,11 +780,11 @@ glabel func0f149274 /* f149610: c42c6030 */ lwc1 $f12,%lo(var7f1b6030)($at) .L0f149614: /* f149614: 8faf05fc */ lw $t7,0x5fc($sp) -/* f149618: 3c018008 */ lui $at,0x8008 +/* f149618: 3c018008 */ lui $at,%hi(var8007f8b0) /* f14961c: c7aa05f4 */ lwc1 $f10,0x5f4($sp) /* f149620: 55e0005c */ bnezl $t7,.L0f149794 /* f149624: 8fae04ec */ lw $t6,0x4ec($sp) -/* f149628: c420f8b0 */ lwc1 $f0,-0x750($at) +/* f149628: c420f8b0 */ lwc1 $f0,%lo(var8007f8b0)($at) /* f14962c: 4600603c */ c.lt.s $f12,$f0 /* f149630: 00000000 */ nop /* f149634: 45020004 */ bc1fl .L0f149648 @@ -1057,13 +1057,13 @@ glabel var7f1b6048 /* f1499bc: afa5006c */ sw $a1,0x6c($sp) /* f1499c0: 0fc5dd18 */ jal func0f177460 /* f1499c4: 26040024 */ addiu $a0,$s0,0x24 -/* f1499c8: 3c018008 */ lui $at,0x8008 -/* f1499cc: c42af8a0 */ lwc1 $f10,-0x760($at) +/* f1499c8: 3c018008 */ lui $at,%hi(var8007f8a0) +/* f1499cc: c42af8a0 */ lwc1 $f10,%lo(var8007f8a0)($at) /* f1499d0: c7a6009c */ lwc1 $f6,0x9c($sp) -/* f1499d4: 3c018008 */ lui $at,0x8008 +/* f1499d4: 3c018008 */ lui $at,%hi(var8007f8b8) /* f1499d8: 46005102 */ mul.s $f4,$f10,$f0 -/* f1499dc: c422f8b8 */ lwc1 $f2,-0x748($at) -/* f1499e0: 3c018008 */ lui $at,0x8008 +/* f1499dc: c422f8b8 */ lwc1 $f2,%lo(var8007f8b8)($at) +/* f1499e0: 3c018008 */ lui $at,%hi(var8007f8b4) /* f1499e4: 46062302 */ mul.s $f12,$f4,$f6 /* f1499e8: 460c103c */ c.lt.s $f2,$f12 /* f1499ec: 00000000 */ nop @@ -1071,7 +1071,7 @@ glabel var7f1b6048 /* f1499f4: 00000000 */ nop /* f1499f8: 46001306 */ mov.s $f12,$f2 .L0f1499fc: -/* f1499fc: c420f8b4 */ lwc1 $f0,-0x74c($at) +/* f1499fc: c420f8b4 */ lwc1 $f0,%lo(var8007f8b4)($at) /* f149a00: 3c013f80 */ lui $at,0x3f80 /* f149a04: 44811000 */ mtc1 $at,$f2 /* f149a08: 4600603c */ c.lt.s $f12,$f0 @@ -1133,8 +1133,8 @@ glabel var7f1b6048 .L0f149ad8: /* f149ad8: 3c012f80 */ lui $at,0x2f80 /* f149adc: 44812000 */ mtc1 $at,$f4 -/* f149ae0: 3c018008 */ lui $at,0x8008 -/* f149ae4: c422f8b8 */ lwc1 $f2,-0x748($at) +/* f149ae0: 3c018008 */ lui $at,%hi(var8007f8b8) +/* f149ae4: c422f8b8 */ lwc1 $f2,%lo(var8007f8b8)($at) /* f149ae8: 46045202 */ mul.s $f8,$f10,$f4 /* f149aec: 460e103c */ c.lt.s $f2,$f14 /* f149af0: 46124002 */ mul.s $f0,$f8,$f18 diff --git a/src/game/title.c b/src/game/title.c index 3f4e6804e..59c4d144c 100644 --- a/src/game/title.c +++ b/src/game/title.c @@ -2060,32 +2060,32 @@ glabel var7f1a8468 /* f017b7c: 44817000 */ mtc1 $at,$f14 /* f017b80: 3c017f1b */ lui $at,%hi(var7f1a8408) /* f017b84: c4288408 */ lwc1 $f8,%lo(var7f1a8408)($at) -/* f017b88: 3c018006 */ lui $at,0x8006 +/* f017b88: 3c018006 */ lui $at,%hi(var800627a8) /* f017b8c: 44809000 */ mtc1 $zero,$f18 -/* f017b90: e42827a8 */ swc1 $f8,0x27a8($at) +/* f017b90: e42827a8 */ swc1 $f8,%lo(var800627a8)($at) /* f017b94: 3c017f1b */ lui $at,%hi(var7f1a840c) /* f017b98: c42a840c */ lwc1 $f10,%lo(var7f1a840c)($at) -/* f017b9c: 3c018006 */ lui $at,0x8006 +/* f017b9c: 3c018006 */ lui $at,%hi(var800627ac) /* f017ba0: 3c1f8006 */ lui $ra,%hi(var800627d8) -/* f017ba4: e42a27ac */ swc1 $f10,0x27ac($at) +/* f017ba4: e42a27ac */ swc1 $f10,%lo(var800627ac)($at) /* f017ba8: 3c017f1b */ lui $at,%hi(var7f1a8410) /* f017bac: c4248410 */ lwc1 $f4,%lo(var7f1a8410)($at) -/* f017bb0: 3c018006 */ lui $at,0x8006 +/* f017bb0: 3c018006 */ lui $at,%hi(var800627b0) /* f017bb4: 27ff27d8 */ addiu $ra,$ra,%lo(var800627d8) -/* f017bb8: e42427b0 */ swc1 $f4,0x27b0($at) -/* f017bbc: 3c018006 */ lui $at,0x8006 -/* f017bc0: e43227b4 */ swc1 $f18,0x27b4($at) +/* f017bb8: e42427b0 */ swc1 $f4,%lo(var800627b0)($at) +/* f017bbc: 3c018006 */ lui $at,%hi(var800627b4) +/* f017bc0: e43227b4 */ swc1 $f18,%lo(var800627b4)($at) /* f017bc4: 3c017f1b */ lui $at,%hi(var7f1a8414) /* f017bc8: c4268414 */ lwc1 $f6,%lo(var7f1a8414)($at) -/* f017bcc: 3c018006 */ lui $at,0x8006 +/* f017bcc: 3c018006 */ lui $at,%hi(var800627b8) /* f017bd0: 240fffff */ addiu $t7,$zero,-1 -/* f017bd4: e42627b8 */ swc1 $f6,0x27b8($at) -/* f017bd8: 3c018006 */ lui $at,0x8006 -/* f017bdc: e43227bc */ swc1 $f18,0x27bc($at) +/* f017bd4: e42627b8 */ swc1 $f6,%lo(var800627b8)($at) +/* f017bd8: 3c018006 */ lui $at,%hi(var800627bc) +/* f017bdc: e43227bc */ swc1 $f18,%lo(var800627bc)($at) /* f017be0: 3c018006 */ lui $at,%hi(var800627c0) /* f017be4: ac2027c0 */ sw $zero,%lo(var800627c0)($at) -/* f017be8: 3c018006 */ lui $at,0x8006 -/* f017bec: e42e27c8 */ swc1 $f14,0x27c8($at) +/* f017be8: 3c018006 */ lui $at,%hi(var800627c8) +/* f017bec: e42e27c8 */ swc1 $f14,%lo(var800627c8)($at) /* f017bf0: ac400000 */ sw $zero,0x0($v0) /* f017bf4: ac830000 */ sw $v1,0x0($a0) /* f017bf8: 3c018006 */ lui $at,%hi(var800627d0) @@ -2104,8 +2104,8 @@ glabel var7f1a8468 /* f017c2c: 3c018006 */ lui $at,%hi(var800627ec) /* f017c30: ac2027ec */ sw $zero,%lo(var800627ec)($at) /* f017c34: ad800000 */ sw $zero,0x0($t4) -/* f017c38: 3c018006 */ lui $at,0x8006 -/* f017c3c: e43227f4 */ swc1 $f18,0x27f4($at) +/* f017c38: 3c018006 */ lui $at,%hi(var800627f4) +/* f017c3c: e43227f4 */ swc1 $f18,%lo(var800627f4)($at) /* f017c40: 3c018006 */ lui $at,%hi(var800627fc) /* f017c44: ac2027fc */ sw $zero,%lo(var800627fc)($at) /* f017c48: 3c018006 */ lui $at,%hi(var800627f8) @@ -2115,12 +2115,12 @@ glabel var7f1a8468 /* f017c58: ac20280c */ sw $zero,%lo(var8006280c)($at) /* f017c5c: 3c017f1b */ lui $at,%hi(var7f1a8418) /* f017c60: c4288418 */ lwc1 $f8,%lo(var7f1a8418)($at) -/* f017c64: 3c018006 */ lui $at,0x8006 -/* f017c68: e4282808 */ swc1 $f8,0x2808($at) +/* f017c64: 3c018006 */ lui $at,%hi(var80062808) +/* f017c68: e4282808 */ swc1 $f8,%lo(var80062808)($at) /* f017c6c: 3c018006 */ lui $at,%hi(var80062810) /* f017c70: ac202810 */ sw $zero,%lo(var80062810)($at) -/* f017c74: 3c018006 */ lui $at,0x8006 -/* f017c78: e4322814 */ swc1 $f18,0x2814($at) +/* f017c74: 3c018006 */ lui $at,%hi(var80062814) +/* f017c78: e4322814 */ swc1 $f18,%lo(var80062814)($at) .L0f017c7c: /* f017c7c: 3c048006 */ lui $a0,%hi(var800627cc) /* f017c80: 248427cc */ addiu $a0,$a0,%lo(var800627cc) @@ -2151,10 +2151,10 @@ glabel var7f1a8468 .L0f017ce4: /* f017ce4: 3c198006 */ lui $t9,%hi(var800627e4) /* f017ce8: 8f3927e4 */ lw $t9,%lo(var800627e4)($t9) -/* f017cec: 3c018006 */ lui $at,0x8006 +/* f017cec: 3c018006 */ lui $at,%hi(var800627a8) /* f017cf0: 13200049 */ beqz $t9,.L0f017e18 /* f017cf4: 00000000 */ nop -/* f017cf8: c42027a8 */ lwc1 $f0,0x27a8($at) +/* f017cf8: c42027a8 */ lwc1 $f0,%lo(var800627a8)($at) /* f017cfc: c5620000 */ lwc1 $f2,0x0($t3) /* f017d00: 3c048006 */ lui $a0,%hi(var800627a8) /* f017d04: 3c068006 */ lui $a2,%hi(var800627ac) @@ -2192,8 +2192,8 @@ glabel var7f1a8468 /* f017d84: 45000005 */ bc1f .L0f017d9c /* f017d88: 252927d4 */ addiu $t1,$t1,%lo(var800627d4) /* f017d8c: e4420000 */ swc1 $f2,0x0($v0) -/* f017d90: 3c018006 */ lui $at,0x8006 -/* f017d94: e43227ac */ swc1 $f18,0x27ac($at) +/* f017d90: 3c018006 */ lui $at,%hi(var800627ac) +/* f017d94: e43227ac */ swc1 $f18,%lo(var800627ac)($at) /* f017d98: c4400000 */ lwc1 $f0,0x0($v0) .L0f017d9c: /* f017d9c: 3c017f1b */ lui $at,%hi(var7f1a8424) @@ -2238,8 +2238,8 @@ glabel var7f1a8468 /* f017e28: c42c842c */ lwc1 $f12,%lo(var7f1a842c)($at) /* f017e2c: 3c08800a */ lui $t0,%hi(g_Vars) /* f017e30: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) -/* f017e34: 3c018006 */ lui $at,0x8006 -/* f017e38: c42427ac */ lwc1 $f4,0x27ac($at) +/* f017e34: 3c018006 */ lui $at,%hi(var800627ac) +/* f017e38: c42427ac */ lwc1 $f4,%lo(var800627ac)($at) /* f017e3c: c506004c */ lwc1 $f6,0x4c($t0) /* f017e40: 3c028006 */ lui $v0,%hi(var800627a8) /* f017e44: 244227a8 */ addiu $v0,$v0,%lo(var800627a8) @@ -2274,29 +2274,29 @@ glabel var7f1a8468 /* f017eac: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) /* f017eb0: 8d0e0038 */ lw $t6,0x38($t0) /* f017eb4: 24190050 */ addiu $t9,$zero,0x50 -/* f017eb8: 3c018006 */ lui $at,0x8006 +/* f017eb8: 3c018006 */ lui $at,%hi(var800627bc) /* f017ebc: 004ec021 */ addu $t8,$v0,$t6 /* f017ec0: ad380000 */ sw $t8,0x0($t1) /* f017ec4: 1b000009 */ blez $t8,.L0f017eec /* f017ec8: 03001025 */ or $v0,$t8,$zero /* f017ecc: 44824000 */ mtc1 $v0,$f8 /* f017ed0: 44993000 */ mtc1 $t9,$f6 -/* f017ed4: 3c018006 */ lui $at,0x8006 +/* f017ed4: 3c018006 */ lui $at,%hi(var800627bc) /* f017ed8: 46804120 */ cvt.s.w $f4,$f8 /* f017edc: 468032a0 */ cvt.s.w $f10,$f6 /* f017ee0: 460a2203 */ div.s $f8,$f4,$f10 /* f017ee4: 10000002 */ b .L0f017ef0 -/* f017ee8: e42827bc */ swc1 $f8,0x27bc($at) +/* f017ee8: e42827bc */ swc1 $f8,%lo(var800627bc)($at) .L0f017eec: -/* f017eec: e43227bc */ swc1 $f18,0x27bc($at) +/* f017eec: e43227bc */ swc1 $f18,%lo(var800627bc)($at) .L0f017ef0: /* f017ef0: 28410051 */ slti $at,$v0,0x51 /* f017ef4: 54200008 */ bnezl $at,.L0f017f18 /* f017ef8: 8fef0000 */ lw $t7,0x0($ra) /* f017efc: ad200000 */ sw $zero,0x0($t1) /* f017f00: afe30000 */ sw $v1,0x0($ra) -/* f017f04: 3c018006 */ lui $at,0x8006 -/* f017f08: e43227bc */ swc1 $f18,0x27bc($at) +/* f017f04: 3c018006 */ lui $at,%hi(var800627bc) +/* f017f08: e43227bc */ swc1 $f18,%lo(var800627bc)($at) /* f017f0c: 3c018006 */ lui $at,%hi(var800627c0) /* f017f10: ac2327c0 */ sw $v1,%lo(var800627c0)($at) .L0f017f14: @@ -2306,14 +2306,14 @@ glabel var7f1a8468 /* f017f1c: 3c017f1b */ lui $at,%hi(var7f1a8434) /* f017f20: c4268434 */ lwc1 $f6,%lo(var7f1a8434)($at) /* f017f24: c504004c */ lwc1 $f4,0x4c($t0) -/* f017f28: 3c018006 */ lui $at,0x8006 -/* f017f2c: c42827bc */ lwc1 $f8,0x27bc($at) +/* f017f28: 3c018006 */ lui $at,%hi(var800627bc) +/* f017f2c: c42827bc */ lwc1 $f8,%lo(var800627bc)($at) /* f017f30: 46043282 */ mul.s $f10,$f6,$f4 /* f017f34: 460a4000 */ add.s $f0,$f8,$f10 /* f017f38: e42027bc */ swc1 $f0,0x27bc($at) /* f017f3c: 3c017f1b */ lui $at,%hi(var7f1a8438) /* f017f40: c4248438 */ lwc1 $f4,%lo(var7f1a8438)($at) -/* f017f44: 3c018006 */ lui $at,0x8006 +/* f017f44: 3c018006 */ lui $at,%hi(var800627bc) /* f017f48: 4600203e */ c.le.s $f4,$f0 /* f017f4c: 00000000 */ nop /* f017f50: 45020006 */ bc1fl .L0f017f6c @@ -2327,7 +2327,7 @@ glabel var7f1a8468 /* f017f6c: 00000000 */ nop /* f017f70: 45020004 */ bc1fl .L0f017f84 /* f017f74: 8d430000 */ lw $v1,0x0($t2) -/* f017f78: e42e27bc */ swc1 $f14,0x27bc($at) +/* f017f78: e42e27bc */ swc1 $f14,%lo(var800627bc)($at) /* f017f7c: afe00000 */ sw $zero,0x0($ra) .L0f017f80: /* f017f80: 8d430000 */ lw $v1,0x0($t2) @@ -2335,11 +2335,11 @@ glabel var7f1a8468 /* f017f84: 10600064 */ beqz $v1,.L0f018118 /* f017f88: 00000000 */ nop /* f017f8c: 8d180038 */ lw $t8,0x38($t0) -/* f017f90: 3c018006 */ lui $at,0x8006 +/* f017f90: 3c018006 */ lui $at,%hi(var800627b0) /* f017f94: 3c048006 */ lui $a0,%hi(var800627b0) /* f017f98: 0078c821 */ addu $t9,$v1,$t8 /* f017f9c: ad590000 */ sw $t9,0x0($t2) -/* f017fa0: c42827b0 */ lwc1 $f8,0x27b0($at) +/* f017fa0: c42827b0 */ lwc1 $f8,%lo(var800627b0)($at) /* f017fa4: 3c068006 */ lui $a2,%hi(var800627b4) /* f017fa8: 3c017f1b */ lui $at,%hi(var7f1a843c) /* f017fac: 4608903c */ c.lt.s $f18,$f8 @@ -2357,9 +2357,9 @@ glabel var7f1a8468 /* f017fdc: e7aa0014 */ swc1 $f10,0x14($sp) /* f017fe0: 3c017f1b */ lui $at,%hi(var7f1a8444) /* f017fe4: c42c8444 */ lwc1 $f12,%lo(var7f1a8444)($at) -/* f017fe8: 3c018006 */ lui $at,0x8006 +/* f017fe8: 3c018006 */ lui $at,%hi(var800627b0) /* f017fec: 44809000 */ mtc1 $zero,$f18 -/* f017ff0: c42627b0 */ lwc1 $f6,0x27b0($at) +/* f017ff0: c42627b0 */ lwc1 $f6,%lo(var800627b0)($at) /* f017ff4: 3c08800a */ lui $t0,%hi(g_Vars) /* f017ff8: 3c0a8006 */ lui $t2,%hi(var800627e0) /* f017ffc: 4612303e */ c.le.s $f6,$f18 @@ -2372,10 +2372,10 @@ glabel var7f1a8468 /* f018018: 254a27e0 */ addiu $t2,$t2,%lo(var800627e0) /* f01801c: 45000005 */ bc1f .L0f018034 /* f018020: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) -/* f018024: 3c018006 */ lui $at,0x8006 -/* f018028: e43227b0 */ swc1 $f18,0x27b0($at) -/* f01802c: 3c018006 */ lui $at,0x8006 -/* f018030: e43227b4 */ swc1 $f18,0x27b4($at) +/* f018024: 3c018006 */ lui $at,%hi(var800627b0) +/* f018028: e43227b0 */ swc1 $f18,%lo(var800627b0)($at) +/* f01802c: 3c018006 */ lui $at,%hi(var800627b4) +/* f018030: e43227b4 */ swc1 $f18,%lo(var800627b4)($at) .L0f018034: /* f018034: 8d430000 */ lw $v1,0x0($t2) .L0f018038: @@ -2393,8 +2393,8 @@ glabel var7f1a8468 /* f018064: ac2027d0 */ sw $zero,%lo(var800627d0)($at) /* f018068: 3c018006 */ lui $at,%hi(var800627e4) /* f01806c: ac2427e4 */ sw $a0,%lo(var800627e4)($at) -/* f018070: 3c018006 */ lui $at,0x8006 -/* f018074: c42427a8 */ lwc1 $f4,0x27a8($at) +/* f018070: 3c018006 */ lui $at,%hi(var800627a8) +/* f018074: c42427a8 */ lwc1 $f4,%lo(var800627a8)($at) /* f018078: 3c014080 */ lui $at,0x4080 /* f01807c: 44814000 */ mtc1 $at,$f8 /* f018080: 3c013e80 */ lui $at,0x3e80 @@ -2429,8 +2429,8 @@ glabel var7f1a8468 /* f0180ec: 3c058006 */ lui $a1,%hi(var800627e8) /* f0180f0: 14400009 */ bnez $v0,.L0f018118 /* f0180f4: 24a527e8 */ addiu $a1,$a1,%lo(var800627e8) -/* f0180f8: 3c018006 */ lui $at,0x8006 -/* f0180fc: c42a27b0 */ lwc1 $f10,0x27b0($at) +/* f0180f8: 3c018006 */ lui $at,%hi(var800627b0) +/* f0180fc: c42a27b0 */ lwc1 $f10,%lo(var800627b0)($at) /* f018100: 4612503e */ c.le.s $f10,$f18 /* f018104: 00000000 */ nop /* f018108: 45000003 */ bc1f .L0f018118 @@ -2451,9 +2451,9 @@ glabel var7f1a8468 /* f018140: 246327c8 */ addiu $v1,$v1,%lo(var800627c8) /* f018144: 46043202 */ mul.s $f8,$f6,$f4 /* f018148: c46a0000 */ lwc1 $f10,0x0($v1) -/* f01814c: 3c018006 */ lui $at,0x8006 +/* f01814c: 3c018006 */ lui $at,%hi(var800627c8) /* f018150: 46085181 */ sub.s $f6,$f10,$f8 -/* f018154: e42627c8 */ swc1 $f6,0x27c8($at) +/* f018154: e42627c8 */ swc1 $f6,%lo(var800627c8)($at) /* f018158: c4640000 */ lwc1 $f4,0x0($v1) /* f01815c: 4612203e */ c.le.s $f4,$f18 /* f018160: 00000000 */ nop @@ -2513,43 +2513,43 @@ glabel var7f1a8468 /* f018224: 24c62810 */ addiu $a2,$a2,%lo(var80062810) /* f018228: ac24280c */ sw $a0,%lo(var8006280c)($at) /* f01822c: 8d220000 */ lw $v0,0x0($t1) -/* f018230: 3c018006 */ lui $at,0x8006 +/* f018230: 3c018006 */ lui $at,%hi(var800627f4) /* f018234: 14400008 */ bnez $v0,.L0f018258 /* f018238: 24580001 */ addiu $t8,$v0,0x1 -/* f01823c: c42a27f4 */ lwc1 $f10,0x27f4($at) +/* f01823c: c42a27f4 */ lwc1 $f10,%lo(var800627f4)($at) /* f018240: 3c017f1b */ lui $at,%hi(var7f1a844c) /* f018244: c428844c */ lwc1 $f8,%lo(var7f1a844c)($at) -/* f018248: 3c018006 */ lui $at,0x8006 +/* f018248: 3c018006 */ lui $at,%hi(var800627f4) /* f01824c: 46085180 */ add.s $f6,$f10,$f8 /* f018250: 10000011 */ b .L0f018298 -/* f018254: e42627f4 */ swc1 $f6,0x27f4($at) +/* f018254: e42627f4 */ swc1 $f6,%lo(var800627f4)($at) .L0f018258: /* f018258: 14820009 */ bne $a0,$v0,.L0f018280 -/* f01825c: 3c018006 */ lui $at,0x8006 -/* f018260: 3c018006 */ lui $at,0x8006 -/* f018264: c42427f4 */ lwc1 $f4,0x27f4($at) +/* f01825c: 3c018006 */ lui $at,%hi(var800627f4) +/* f018260: 3c018006 */ lui $at,%hi(var800627f4) +/* f018264: c42427f4 */ lwc1 $f4,%lo(var800627f4)($at) /* f018268: 3c017f1b */ lui $at,%hi(var7f1a8450) /* f01826c: c42a8450 */ lwc1 $f10,%lo(var7f1a8450)($at) -/* f018270: 3c018006 */ lui $at,0x8006 +/* f018270: 3c018006 */ lui $at,%hi(var800627f4) /* f018274: 460a2200 */ add.s $f8,$f4,$f10 /* f018278: 10000007 */ b .L0f018298 -/* f01827c: e42827f4 */ swc1 $f8,0x27f4($at) +/* f01827c: e42827f4 */ swc1 $f8,%lo(var800627f4)($at) .L0f018280: -/* f018280: c42627f4 */ lwc1 $f6,0x27f4($at) +/* f018280: c42627f4 */ lwc1 $f6,%lo(var800627f4)($at) /* f018284: 3c017f1b */ lui $at,%hi(var7f1a8454) /* f018288: c4248454 */ lwc1 $f4,%lo(var7f1a8454)($at) -/* f01828c: 3c018006 */ lui $at,0x8006 +/* f01828c: 3c018006 */ lui $at,%hi(var800627f4) /* f018290: 46043280 */ add.s $f10,$f6,$f4 -/* f018294: e42a27f4 */ swc1 $f10,0x27f4($at) +/* f018294: e42a27f4 */ swc1 $f10,%lo(var800627f4)($at) .L0f018298: -/* f018298: 3c018006 */ lui $at,0x8006 -/* f01829c: c42827f4 */ lwc1 $f8,0x27f4($at) -/* f0182a0: 3c018006 */ lui $at,0x8006 +/* f018298: 3c018006 */ lui $at,%hi(var800627f4) +/* f01829c: c42827f4 */ lwc1 $f8,%lo(var800627f4)($at) +/* f0182a0: 3c018006 */ lui $at,%hi(var800627f4) /* f0182a4: 4608703e */ c.le.s $f14,$f8 /* f0182a8: 00000000 */ nop /* f0182ac: 45000009 */ bc1f .L0f0182d4 /* f0182b0: 00000000 */ nop -/* f0182b4: e43227f4 */ swc1 $f18,0x27f4($at) +/* f0182b4: e43227f4 */ swc1 $f18,%lo(var800627f4)($at) /* f0182b8: 2401000a */ addiu $at,$zero,0xa /* f0182bc: 17010005 */ bne $t8,$at,.L0f0182d4 /* f0182c0: ad380000 */ sw $t8,0x0($t1) @@ -2570,9 +2570,9 @@ glabel var7f1a8468 /* f0182f8: 24422808 */ addiu $v0,$v0,%lo(var80062808) /* f0182fc: 46043282 */ mul.s $f10,$f6,$f4 /* f018300: c4480000 */ lwc1 $f8,0x0($v0) -/* f018304: 3c018006 */ lui $at,0x8006 +/* f018304: 3c018006 */ lui $at,%hi(var80062808) /* f018308: 460a4180 */ add.s $f6,$f8,$f10 -/* f01830c: e4262808 */ swc1 $f6,0x2808($at) +/* f01830c: e4262808 */ swc1 $f6,%lo(var80062808)($at) /* f018310: c4400000 */ lwc1 $f0,0x0($v0) /* f018314: 4600603e */ c.le.s $f12,$f0 /* f018318: 00000000 */ nop @@ -2592,9 +2592,9 @@ glabel var7f1a8468 /* f018348: 254a2814 */ addiu $t2,$t2,%lo(var80062814) /* f01834c: 460a4182 */ mul.s $f6,$f8,$f10 /* f018350: c5440000 */ lwc1 $f4,0x0($t2) -/* f018354: 3c018006 */ lui $at,0x8006 +/* f018354: 3c018006 */ lui $at,%hi(var80062814) /* f018358: 46062200 */ add.s $f8,$f4,$f6 -/* f01835c: e4282814 */ swc1 $f8,0x2814($at) +/* f01835c: e4282814 */ swc1 $f8,%lo(var80062814)($at) /* f018360: c54a0000 */ lwc1 $f10,0x0($t2) /* f018364: 460a703e */ c.le.s $f14,$f10 /* f018368: 00000000 */ nop @@ -2665,8 +2665,8 @@ glabel var7f1a8468 /* f01845c: 250f0010 */ addiu $t7,$t0,0x10 /* f018460: ac8f0004 */ sw $t7,0x4($a0) /* f018464: ac990000 */ sw $t9,0x0($a0) -/* f018468: 3c018006 */ lui $at,0x8006 -/* f01846c: c4202814 */ lwc1 $f0,0x2814($at) +/* f018468: 3c018006 */ lui $at,%hi(var80062814) +/* f01846c: c4202814 */ lwc1 $f0,%lo(var80062814)($at) /* f018470: 3c01bf80 */ lui $at,0xbf80 /* f018474: 44814000 */ mtc1 $at,$f8 /* f018478: 3c017f1b */ lui $at,%hi(var7f1a8464) @@ -2764,11 +2764,11 @@ glabel var7f1a8468 /* f0185e4: 8f1824fc */ lw $t8,%lo(g_TitleModel2)($t8) /* f0185e8: afb8022c */ sw $t8,0x22c($sp) .L0f0185ec: -/* f0185ec: 3c018006 */ lui $at,0x8006 +/* f0185ec: 3c018006 */ lui $at,%hi(var800627a8) /* f0185f0: 0c0058dd */ jal func00016374 -/* f0185f4: c42c27a8 */ lwc1 $f12,0x27a8($at) -/* f0185f8: 3c018006 */ lui $at,0x8006 -/* f0185fc: c42c27b0 */ lwc1 $f12,0x27b0($at) +/* f0185f4: c42c27a8 */ lwc1 $f12,%lo(var800627a8)($at) +/* f0185f8: 3c018006 */ lui $at,%hi(var800627b0) +/* f0185fc: c42c27b0 */ lwc1 $f12,%lo(var800627b0)($at) /* f018600: 0c0058ba */ jal func000162e8 /* f018604: 27a501a8 */ addiu $a1,$sp,0x1a8 /* f018608: 27a401a8 */ addiu $a0,$sp,0x1a8 @@ -2778,14 +2778,14 @@ glabel var7f1a8468 /* f018618: 27a501e8 */ addiu $a1,$sp,0x1e8 /* f01861c: 0c005680 */ jal func00015a00 /* f018620: 27a60270 */ addiu $a2,$sp,0x270 -/* f018624: 3c018006 */ lui $at,0x8006 -/* f018628: c42c27b8 */ lwc1 $f12,0x27b8($at) +/* f018624: 3c018006 */ lui $at,%hi(var800627b8) +/* f018628: c42c27b8 */ lwc1 $f12,%lo(var800627b8)($at) /* f01862c: 0c0057c1 */ jal func00015f04 /* f018630: 27a50270 */ addiu $a1,$sp,0x270 /* f018634: 3c01437f */ lui $at,0x437f /* f018638: 44813000 */ mtc1 $at,$f6 -/* f01863c: 3c018006 */ lui $at,0x8006 -/* f018640: c42827c8 */ lwc1 $f8,0x27c8($at) +/* f01863c: 3c018006 */ lui $at,%hi(var800627c8) +/* f018640: c42827c8 */ lwc1 $f8,%lo(var800627c8)($at) /* f018644: 24020001 */ addiu $v0,$zero,0x1 /* f018648: 3c038006 */ lui $v1,%hi(var80062560) /* f01864c: 46083282 */ mul.s $f10,$f6,$f8 @@ -2902,10 +2902,10 @@ glabel var7f1a8468 /* f0187f8: 24040028 */ addiu $a0,$zero,0x28 /* f0187fc: 8faf0160 */ lw $t7,0x160($sp) /* f018800: 8fa60164 */ lw $a2,0x164($sp) -/* f018804: 3c018006 */ lui $at,0x8006 +/* f018804: 3c018006 */ lui $at,%hi(var800627c8) /* f018808: ade20004 */ sw $v0,0x4($t7) /* f01880c: 44809000 */ mtc1 $zero,$f18 -/* f018810: c42627c8 */ lwc1 $f6,0x27c8($at) +/* f018810: c42627c8 */ lwc1 $f6,%lo(var800627c8)($at) /* f018814: 24450008 */ addiu $a1,$v0,0x8 /* f018818: 3c188000 */ lui $t8,0x8000 /* f01881c: 4606903c */ c.lt.s $f18,$f6 @@ -2964,10 +2964,10 @@ glabel var7f1a8468 /* f0188e8: 24040028 */ addiu $a0,$zero,0x28 /* f0188ec: 8fb90160 */ lw $t9,0x160($sp) /* f0188f0: 8fa60164 */ lw $a2,0x164($sp) -/* f0188f4: 3c018006 */ lui $at,0x8006 +/* f0188f4: 3c018006 */ lui $at,%hi(var800627c8) /* f0188f8: af220004 */ sw $v0,0x4($t9) /* f0188fc: 44809000 */ mtc1 $zero,$f18 -/* f018900: c42827c8 */ lwc1 $f8,0x27c8($at) +/* f018900: c42827c8 */ lwc1 $f8,%lo(var800627c8)($at) /* f018904: 24450008 */ addiu $a1,$v0,0x8 /* f018908: 3c0e8000 */ lui $t6,0x8000 /* f01890c: 4608903c */ c.lt.s $f18,$f8 @@ -3026,10 +3026,10 @@ glabel var7f1a8468 /* f0189d8: 24040028 */ addiu $a0,$zero,0x28 /* f0189dc: 8fb80160 */ lw $t8,0x160($sp) /* f0189e0: 8fa60164 */ lw $a2,0x164($sp) -/* f0189e4: 3c018006 */ lui $at,0x8006 +/* f0189e4: 3c018006 */ lui $at,%hi(var800627c8) /* f0189e8: af020004 */ sw $v0,0x4($t8) /* f0189ec: 44809000 */ mtc1 $zero,$f18 -/* f0189f0: c42a27c8 */ lwc1 $f10,0x27c8($at) +/* f0189f0: c42a27c8 */ lwc1 $f10,%lo(var800627c8)($at) /* f0189f4: 24450008 */ addiu $a1,$v0,0x8 /* f0189f8: 3c0f8000 */ lui $t7,0x8000 /* f0189fc: 460a903c */ c.lt.s $f18,$f10 @@ -3139,8 +3139,8 @@ glabel var7f1a8468 /* f018b94: 24010001 */ addiu $at,$zero,0x1 /* f018b98: 1441001f */ bne $v0,$at,.L0f018c18 /* f018b9c: 3c058006 */ lui $a1,%hi(var8006250c) -/* f018ba0: 3c018006 */ lui $at,0x8006 -/* f018ba4: c42027f4 */ lwc1 $f0,0x27f4($at) +/* f018ba0: 3c018006 */ lui $at,%hi(var800627f4) +/* f018ba4: c42027f4 */ lwc1 $f0,%lo(var800627f4)($at) /* f018ba8: 3c013f00 */ lui $at,0x3f00 /* f018bac: 44815000 */ mtc1 $at,$f10 /* f018bb0: 44070000 */ mfc1 $a3,$f0 @@ -3174,8 +3174,8 @@ glabel var7f1a8468 /* f018c18: 24010002 */ addiu $at,$zero,0x2 /* f018c1c: 14410023 */ bne $v0,$at,.L0f018cac /* f018c20: 3c058006 */ lui $a1,%hi(var80062508) -/* f018c24: 3c018006 */ lui $at,0x8006 -/* f018c28: c42027f4 */ lwc1 $f0,0x27f4($at) +/* f018c24: 3c018006 */ lui $at,%hi(var800627f4) +/* f018c28: c42027f4 */ lwc1 $f0,%lo(var800627f4)($at) /* f018c2c: 3c013f00 */ lui $at,0x3f00 /* f018c30: 44812000 */ mtc1 $at,$f4 /* f018c34: 3c013f80 */ lui $at,0x3f80 @@ -3212,9 +3212,9 @@ glabel var7f1a8468 .L0f018cac: /* f018cac: 24010003 */ addiu $at,$zero,0x3 /* f018cb0: 14410022 */ bne $v0,$at,.L0f018d3c -/* f018cb4: 3c058006 */ lui $a1,0x8006 -/* f018cb8: 3c018006 */ lui $at,0x8006 -/* f018cbc: c42027f4 */ lwc1 $f0,0x27f4($at) +/* f018cb4: 3c058006 */ lui $a1,%hi(var80062508) +/* f018cb8: 3c018006 */ lui $at,%hi(var800627f4) +/* f018cbc: c42027f4 */ lwc1 $f0,%lo(var800627f4)($at) /* f018cc0: 3c013f00 */ lui $at,0x3f00 /* f018cc4: 44812000 */ mtc1 $at,$f4 /* f018cc8: 44070000 */ mfc1 $a3,$f0 @@ -3260,7 +3260,7 @@ glabel var7f1a8468 /* f018d60: 8defccb0 */ lw $t7,%lo(var8009ccb0)($t7) /* f018d64: 8f18cca8 */ lw $t8,%lo(var8009cca8)($t8) /* f018d68: 240e00ff */ addiu $t6,$zero,0xff -/* f018d6c: 8ca52508 */ lw $a1,9480($a1) +/* f018d6c: 8ca52508 */ lw $a1,%lo(var80062508)($a1) /* f018d70: afae0010 */ sw $t6,0x10($sp) /* f018d74: 03201025 */ or $v0,$t9,$zero /* f018d78: 8fa40330 */ lw $a0,0x330($sp) @@ -4182,12 +4182,12 @@ glabel var7f1a84bc /* f019fd4: 3c013f80 */ lui $at,0x3f80 .L0f019fd8: /* f019fd8: 44810000 */ mtc1 $at,$f0 -/* f019fdc: 3c01800a */ lui $at,0x800a -/* f019fe0: c432a004 */ lwc1 $f18,-0x5ffc($at) +/* f019fdc: 3c01800a */ lui $at,%hi(g_Vars+0x44) +/* f019fe0: c432a004 */ lwc1 $f18,%lo(g_Vars+0x44)($at) /* f019fe4: 3c0142b4 */ lui $at,0x42b4 /* f019fe8: 44812000 */ mtc1 $at,$f4 -/* f019fec: 3c018006 */ lui $at,0x8006 -/* f019ff0: c4282920 */ lwc1 $f8,0x2920($at) +/* f019fec: 3c018006 */ lui $at,%hi(var80062920) +/* f019ff0: c4282920 */ lwc1 $f8,%lo(var80062920)($at) /* f019ff4: 46049183 */ div.s $f6,$f18,$f4 /* f019ff8: c7b20158 */ lwc1 $f18,0x158($sp) /* f019ffc: 44801000 */ mtc1 $zero,$f2 diff --git a/src/game/training.c b/src/game/training.c index bfd6bb27c..0774ffcbf 100644 --- a/src/game/training.c +++ b/src/game/training.c @@ -1342,8 +1342,8 @@ glabel var7f1b941c .L0f19e294: /* f19e294: 3c014270 */ lui $at,0x4270 /* f19e298: 44812000 */ mtc1 $at,$f4 -/* f19e29c: 3c01800b */ lui $at,0x800b -/* f19e2a0: c426cd2c */ lwc1 $f6,-0x32d4($at) +/* f19e29c: 3c01800b */ lui $at,%hi(g_FrData+0xc) +/* f19e2a0: c426cd2c */ lwc1 $f6,%lo(g_FrData+0xc)($at) /* f19e2a4: 46044483 */ div.s $f18,$f8,$f4 /* f19e2a8: 240e0001 */ addiu $t6,$zero,0x1 /* f19e2ac: a06e0043 */ sb $t6,0x43($v1) diff --git a/src/game/utils.c b/src/game/utils.c index b1c6b94c0..a09b7980c 100644 --- a/src/game/utils.c +++ b/src/game/utils.c @@ -323,8 +323,8 @@ glabel func0f177164 /* f177178: c4820004 */ lwc1 $f2,0x4($a0) /* f17717c: c48c0008 */ lwc1 $f12,0x8($a0) /* f177180: 46000102 */ mul.s $f4,$f0,$f0 -/* f177184: 3c018008 */ lui $at,0x8008 -/* f177188: c43045d4 */ lwc1 $f16,0x45d4($at) +/* f177184: 3c018008 */ lui $at,%hi(var800845d4) +/* f177188: c43045d4 */ lwc1 $f16,%lo(var800845d4)($at) /* f17718c: 46021182 */ mul.s $f6,$f2,$f2 /* f177190: 3c038008 */ lui $v1,%hi(var800845f4) /* f177194: 246345f4 */ addiu $v1,$v1,%lo(var800845f4) @@ -425,7 +425,7 @@ glabel func0f177164 /* f177300: c4840000 */ lwc1 $f4,0x0($a0) /* f177304: c4a60000 */ lwc1 $f6,0x0($a1) /* f177308: 44807000 */ mtc1 $zero,$f14 -/* f17730c: 3c018008 */ lui $at,0x8008 +/* f17730c: 3c018008 */ lui $at,%hi(var800845d4) /* f177310: 46062001 */ sub.s $f0,$f4,$f6 /* f177314: 00001025 */ or $v0,$zero,$zero /* f177318: 4600703c */ c.lt.s $f14,$f0 @@ -436,7 +436,7 @@ glabel func0f177164 /* f17732c: 46000086 */ mov.s $f2,$f0 /* f177330: 46000087 */ neg.s $f2,$f0 .L0f177334: -/* f177334: c42c45d4 */ lwc1 $f12,0x45d4($at) +/* f177334: c42c45d4 */ lwc1 $f12,%lo(var800845d4)($at) /* f177338: 460c103c */ c.lt.s $f2,$f12 /* f17733c: 00000000 */ nop /* f177340: 4500001f */ bc1f .L0f1773c0 @@ -699,8 +699,8 @@ glabel func0f1776cc /* f1776f8: 46049381 */ sub.s $f14,$f18,$f4 /* f1776fc: c4a60008 */ lwc1 $f6,0x8($a1) /* f177700: 460a6482 */ mul.s $f18,$f12,$f10 -/* f177704: 3c018008 */ lui $at,0x8008 -/* f177708: c42045d4 */ lwc1 $f0,0x45d4($at) +/* f177704: 3c018008 */ lui $at,%hi(var800845d4) +/* f177708: c42045d4 */ lwc1 $f0,%lo(var800845d4)($at) /* f17770c: 46067282 */ mul.s $f10,$f14,$f6 /* f177710: 46124100 */ add.s $f4,$f8,$f18 /* f177714: 460a2400 */ add.s $f16,$f4,$f10 @@ -709,13 +709,13 @@ glabel func0f1776cc /* f177720: 45000009 */ bc1f .L0f177748 /* f177724: 00000000 */ nop /* f177728: 46000207 */ neg.s $f8,$f0 -/* f17772c: 3c018008 */ lui $at,0x8008 +/* f17772c: 3c018008 */ lui $at,%hi(var800845d0) /* f177730: 4610403c */ c.lt.s $f8,$f16 /* f177734: 00000000 */ nop /* f177738: 45000003 */ bc1f .L0f177748 /* f17773c: 00000000 */ nop /* f177740: 03e00008 */ jr $ra -/* f177744: c42045d0 */ lwc1 $f0,0x45d0($at) +/* f177744: c42045d0 */ lwc1 $f0,%lo(var800845d0)($at) .L0f177748: /* f177748: 46021482 */ mul.s $f18,$f2,$f2 /* f17774c: 00000000 */ nop diff --git a/src/game/wallhit.c b/src/game/wallhit.c index f7c8390b7..b0ed8204b 100644 --- a/src/game/wallhit.c +++ b/src/game/wallhit.c @@ -662,14 +662,14 @@ glabel func0f13e744 .L0f13e8bc: /* f13e8bc: 01671021 */ addu $v0,$t3,$a3 /* f13e8c0: 18400006 */ blez $v0,.L0f13e8dc -/* f13e8c4: 3c01800a */ lui $at,0x800a +/* f13e8c4: 3c01800a */ lui $at,%hi(var8009cc78) /* f13e8c8: 448b2000 */ mtc1 $t3,$f4 /* f13e8cc: 44824000 */ mtc1 $v0,$f8 /* f13e8d0: 468021a0 */ cvt.s.w $f6,$f4 /* f13e8d4: 468042a0 */ cvt.s.w $f10,$f8 /* f13e8d8: 460a3003 */ div.s $f0,$f6,$f10 .L0f13e8dc: -/* f13e8dc: c430cc78 */ lwc1 $f16,-0x3388($at) +/* f13e8dc: c430cc78 */ lwc1 $f16,%lo(var8009cc78)($at) /* f13e8e0: 4600803c */ c.lt.s $f16,$f0 /* f13e8e4: 00000000 */ nop /* f13e8e8: 45000017 */ bc1f .L0f13e948 @@ -944,9 +944,9 @@ glabel var7f1b5d18 /* f13ec6c: 8f18cc4c */ lw $t8,%lo(var8009cc4c)($t8) /* f13ec70: 3c08800a */ lui $t0,%hi(var8009cc70) /* f13ec74: 8d08cc70 */ lw $t0,%lo(var8009cc70)($t0) -/* f13ec78: 3c018008 */ lui $at,0x8008 +/* f13ec78: 3c018008 */ lui $at,%hi(var8007f74c) /* f13ec7c: 03191021 */ addu $v0,$t8,$t9 -/* f13ec80: e42af74c */ swc1 $f10,-0x8b4($at) +/* f13ec80: e42af74c */ swc1 $f10,%lo(var8007f74c)($at) /* f13ec84: 0048082a */ slt $at,$v0,$t0 /* f13ec88: 10200005 */ beqz $at,.L0f13eca0 /* f13ec8c: 00000000 */ nop @@ -1764,7 +1764,7 @@ glabel var7f1b5d6c /* f13f78c: 244241b8 */ addiu $v0,$v0,%lo(var800a41b8) /* f13f790: 8e6f0074 */ lw $t7,0x74($s3) /* f13f794: 8c480000 */ lw $t0,0x0($v0) -/* f13f798: 3c018008 */ lui $at,0x8008 +/* f13f798: 3c018008 */ lui $at,%hi(var800845d4) /* f13f79c: acaf0000 */ sw $t7,0x0($a1) /* f13f7a0: ae680074 */ sw $t0,0x74($s3) /* f13f7a4: 8fb9024c */ lw $t9,0x24c($sp) @@ -1846,7 +1846,7 @@ glabel var7f1b5d6c /* f13f8bc: 46008006 */ mov.s $f0,$f16 /* f13f8c0: 46008007 */ neg.s $f0,$f16 .L0f13f8c4: -/* f13f8c4: c42e45d4 */ lwc1 $f14,0x45d4($at) +/* f13f8c4: c42e45d4 */ lwc1 $f14,%lo(var800845d4)($at) /* f13f8c8: 460e003c */ c.lt.s $f0,$f14 /* f13f8cc: 00000000 */ nop /* f13f8d0: 45020004 */ bc1fl .L0f13f8e4 @@ -2869,7 +2869,7 @@ glabel func0f140750 /* f1407a0: 46000007 */ neg.s $f0,$f0 .L0f1407a4: /* f1407a4: 460e103c */ c.lt.s $f2,$f14 -/* f1407a8: 3c018008 */ lui $at,0x8008 +/* f1407a8: 3c018008 */ lui $at,%hi(var8007f74c) /* f1407ac: 45020003 */ bc1fl .L0f1407bc /* f1407b0: 460e603c */ c.lt.s $f12,$f14 /* f1407b4: 46001087 */ neg.s $f2,$f2 @@ -2892,7 +2892,7 @@ glabel func0f140750 /* f1407ec: 00000000 */ nop /* f1407f0: 46006006 */ mov.s $f0,$f12 .L0f1407f4: -/* f1407f4: c424f74c */ lwc1 $f4,-0x8b4($at) +/* f1407f4: c424f74c */ lwc1 $f4,%lo(var8007f74c)($at) /* f1407f8: 3c0144c8 */ lui $at,0x44c8 /* f1407fc: 44813000 */ mtc1 $at,$f6 /* f140800: 46040082 */ mul.s $f2,$f0,$f4 diff --git a/src/include/game/data/data_00e460.h b/src/include/game/data/data_00e460.h index a6878350f..f80d596ac 100644 --- a/src/include/game/data/data_00e460.h +++ b/src/include/game/data/data_00e460.h @@ -118,6 +118,8 @@ extern u32 var8006aa28; extern u32 var8006aa48; extern u32 var8006aa68; extern u32 var8006aa88; +extern u32 var8006aaa0; +extern u32 var8006aae4; extern u32 var8006ab70; extern u32 var8006abb0; extern u32 var8006abc0; diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index 0a3c8eeb1..4db3b17e0 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -491,12 +491,15 @@ extern u32 var8009a8e0; extern u32 var8009a8f8; extern u32 var8009a908; extern u32 var8009a918; +extern u32 var8009a970; extern u32 var8009ad70; extern u32 var8009b878; +extern u32 var8009c2d0; extern u32 var8009c390; extern u32 var8009c400; extern u32 var8009c650; extern u32 var8009c6e0; +extern u32 var8009c760; extern u32 var8009c780; extern u32 var8009c788; extern u32 var8009c78c; diff --git a/src/include/lib/lib_0bfb0.h b/src/include/lib/lib_0bfb0.h index 20e198832..5b5bbd35b 100644 --- a/src/include/lib/lib_0bfb0.h +++ b/src/include/lib/lib_0bfb0.h @@ -3,6 +3,89 @@ #include #include "types.h" +extern const char var70052700[]; +extern const char var70052704[]; +extern const char var70052708[]; +extern const char var7005270c[]; +extern const char var70052710[]; +extern const char var70052714[]; +extern const char var70052718[]; +extern const char var7005271c[]; +extern const char var70052720[]; +extern const char var70052724[]; +extern const char var70052728[]; +extern const char var70052730[]; +extern const char var70052738[]; +extern const char var70052744[]; +extern const char var70052770[]; +extern const char var70052788[]; +extern const char var700527b4[]; +extern const char var700527dc[]; +extern const char var700527e4[]; +extern const char var700527e8[]; +extern const char var70052800[]; +extern const char var70052810[]; +extern const char var7005281c[]; +extern const char var70052824[]; +extern const char var70052854[]; +extern const char var70052864[]; +extern const char var70052870[]; +extern const char var700528a0[]; +extern const char var700528a4[]; +extern const char var700528a8[]; +extern const char var700528ac[]; +extern const char var700528b0[]; +extern const char var700528b4[]; +extern const char var700528b8[]; +extern const char var700528bc[]; +extern const char var700528c0[]; +extern const char var700528c4[]; +extern const char var700528c8[]; +extern const char var700528cc[]; +extern const char var700528d0[]; +extern const char var700528d4[]; +extern const char var700528d8[]; +extern const char var700528dc[]; +extern const char var700528e0[]; +extern const char var700528e4[]; +extern const char var700528e8[]; +extern const char var700528ec[]; +extern const char var700528f0[]; +extern const char var700528f4[]; +extern const char var700528f8[]; +extern const char var700528fc[]; +extern const char var70052900[]; +extern const char var70052904[]; +extern const char var70052908[]; +extern const char var7005290c[]; +extern const char var70052910[]; +extern const char var70052914[]; +extern const char var70052918[]; +extern const char var7005291c[]; +extern const char var70052920[]; +extern const char var70052924[]; +extern const char var70052928[]; +extern const char var70052938[]; +extern const char var70052944[]; +extern const char var70052950[]; +extern const char var7005295c[]; +extern const char var70052968[]; +extern const char var70052974[]; +extern const char var70052978[]; +extern const char var7005297c[]; +extern const char var70052980[]; +extern const char var70052984[]; +extern const char var70052988[]; +extern const char var7005298c[]; +extern const char var70052990[]; +extern const char var70052994[]; +extern const char var70052998[]; +extern const char var7005299c[]; +extern const char var700529a0[]; +extern const char var700529a4[]; +extern const char var700529a8[]; +extern const char var700529ac[]; + u32 func0000bfb0(void); u32 func0000bfd0(void); diff --git a/src/include/lib/lib_0d520.h b/src/include/lib/lib_0d520.h index 402ba3633..c876009cb 100644 --- a/src/include/lib/lib_0d520.h +++ b/src/include/lib/lib_0d520.h @@ -3,6 +3,101 @@ #include #include "types.h" +extern const char var70052ca0[]; +extern const char var70052cc4[]; +extern const char var70052cf4[]; +extern const char var70052d24[]; +extern const char var70052d54[]; +extern const char var70052d84[]; +extern const char var70052db4[]; +extern const char var70052de4[]; +extern const char var70052e14[]; +extern const char var70052e44[]; +extern const char var70052e74[]; +extern const char var70052ea4[]; +extern const char var70052ed4[]; +extern const char var70052f04[]; +extern const char var70052f34[]; +extern const char var70052f64[]; +extern const char var70052f94[]; +extern const char var70052fc4[]; +extern const char var70052ff4[]; +extern const char var70053018[]; +extern const char var7005303c[]; +extern const char var70053060[]; +extern const char var70053084[]; +extern const char var700530a8[]; +extern const char var700530cc[]; +extern const char var700530f0[]; +extern const char var70053114[]; +extern const char var70053138[]; +extern const char var7005315c[]; +extern const char var70053180[]; +extern const char var700531a4[]; +extern const char var700531c8[]; +extern const char var700531ec[]; +extern const char var70053210[]; +extern const char var70053234[]; +extern const char var70053258[]; +extern const char var7005327c[]; +extern const char var700532a0[]; +extern const char var700532c4[]; +extern const char var700532e8[]; +extern const char var7005330c[]; +extern const char var70053330[]; +extern const char var70053354[]; +extern const char var70053378[]; +extern const char var7005339c[]; +extern const char var700533c0[]; +extern const char var700533e4[]; +extern const char var70053408[]; +extern const char var7005342c[]; +extern const char var70053450[]; +extern const char var70053474[]; +extern const char var70053498[]; +extern const char var700534bc[]; +extern const char var700534e0[]; +extern const char var70053504[]; +extern const char var70053528[]; +extern const char var7005354c[]; +extern const char var70053570[]; +extern const char var70053594[]; +extern const char var700535b8[]; +extern const char var700535dc[]; +extern const char var70053600[]; +extern const char var70053624[]; +extern const char var70053648[]; +extern const char var7005366c[]; +extern const char var70053690[]; +extern const char var700536b4[]; +extern const char var700536d8[]; +extern const char var700536fc[]; +extern const char var70053720[]; +extern const char var70053744[]; +extern const char var70053768[]; +extern const char var7005378c[]; +extern const char var700537b0[]; +extern const char var700537d4[]; +extern const char var700537f8[]; +extern const char var7005381c[]; +extern const char var70053840[]; +extern const char var70053864[]; +extern const char var70053888[]; +extern const char var700538ac[]; +extern const char var700538d0[]; +extern const char var700538f4[]; +extern const char var70053918[]; +extern const char var7005393c[]; +extern const char var70053960[]; +extern const char var70053984[]; +extern const char var700539a8[]; +extern const char var700539cc[]; +extern const char var700539f0[]; +extern const char var70053a14[]; +extern const char var70053a38[]; +extern const char var70053a50[]; +extern const char var70053a74[]; + u32 mainInit(void); void mainLoop(void); void func0000db30(char *string, u32 *ptr); diff --git a/src/include/lib/lib_3e730.h b/src/include/lib/lib_3e730.h index a8e206d84..993b7fdce 100644 --- a/src/include/lib/lib_3e730.h +++ b/src/include/lib/lib_3e730.h @@ -3,6 +3,40 @@ #include #include "types.h" +extern const u32 var70054b40[]; +extern const u32 var70054b68[]; +extern const u32 var70054bb8[]; +extern const u32 var70054c08[]; +extern const u32 var70054c08[]; +extern const u32 var70054c90[]; +extern const u32 var70054d18[]; +extern const u32 var70054e40[]; +extern const u32 var70054f68[]; +extern const u32 var70055090[]; +extern const u32 var70055298[]; +extern const u32 var700554a0[]; +extern const u32 var700556a8[]; +extern const u32 var70055eb0[]; +extern const u32 var70055eb0[]; +extern const u32 var700566b8[]; +extern const u32 var700566b8[]; +extern const u32 var700566b8[]; +extern const u32 var700566b8[]; +extern const u32 var700566b8[]; +extern const u32 var700566b8[]; +extern const u32 var700566b8[]; +extern const u32 var700566b8[]; +extern const u32 var70056ec0[]; +extern const u32 var70056ec0[]; +extern const u32 var70056ec0[]; +extern const u32 var70056ec0[]; +extern const u32 var70056ec0[]; +extern const u32 var70056ec0[]; +extern const u32 var70056ec0[]; +extern const u32 var70056ec0[]; +extern const u32 var700576c8[]; +extern const u32 var70057750[]; + u32 func0003e730(void); u32 func0003e7e0(void); u32 func0003e8c0(void); diff --git a/src/lib/lib_03050.c b/src/lib/lib_03050.c index 0a0715167..29becb046 100644 --- a/src/lib/lib_03050.c +++ b/src/lib/lib_03050.c @@ -297,14 +297,14 @@ glabel osCreatePiPanager /* 341c: 3c048009 */ lui $a0,%hi(var80090390) /* 3420: 3c0a8009 */ lui $t2,%hi(var800907c0) /* 3424: 3c0b800a */ lui $t3,%hi(var8009c7a8) -/* 3428: 3c0c7005 */ lui $t4,0x7005 +/* 3428: 3c0c7005 */ lui $t4,%hi(osPiRawStartDma) /* 342c: 3c0d7005 */ lui $t5,%hi(osEPiRawStartDma) /* 3430: 3c0e8009 */ lui $t6,%hi(var800907c0) /* 3434: 24840390 */ addiu $a0,$a0,%lo(var80090390) /* 3438: 24080001 */ addiu $t0,$zero,0x1 /* 343c: 254a07c0 */ addiu $t2,$t2,%lo(var800907c0) /* 3440: 256bc7a8 */ addiu $t3,$t3,%lo(var8009c7a8) -/* 3444: 258c9b50 */ addiu $t4,$t4,-25776 +/* 3444: 258c9b50 */ addiu $t4,$t4,%lo(osPiRawStartDma) /* 3448: 25ad9c20 */ addiu $t5,$t5,%lo(osEPiRawStartDma) /* 344c: 25ce07c0 */ addiu $t6,$t6,%lo(var800907c0) /* 3450: 3c067005 */ lui $a2,%hi(func00049e00) diff --git a/src/lib/lib_03fb0.c b/src/lib/lib_03fb0.c index 88829fd5d..1976b87e7 100644 --- a/src/lib/lib_03fb0.c +++ b/src/lib/lib_03fb0.c @@ -46,12 +46,12 @@ glabel func00003fb0 /* 4024: 46062300 */ add.s $f12,$f4,$f6 /* 4028: 44804000 */ mtc1 $zero,$f8 /* 402c: 46000486 */ mov.s $f18,$f0 -/* 4030: 3c017005 */ lui $at,0x7005 +/* 4030: 3c017005 */ lui $at,%hi(var700524a0) /* 4034: 46080032 */ c.eq.s $f0,$f8 /* 4038: 00000000 */ nop /* 403c: 45020003 */ bc1fl .L0000404c /* 4040: 3c01bf80 */ lui $at,0xbf80 -/* 4044: c43224a0 */ lwc1 $f18,0x24a0($at) +/* 4044: c43224a0 */ lwc1 $f18,%lo(var700524a0)($at) /* 4048: 3c01bf80 */ lui $at,0xbf80 .L0000404c: /* 404c: 44815000 */ mtc1 $at,$f10 @@ -85,12 +85,12 @@ glabel func00003fb0 /* 40bc: 46083300 */ add.s $f12,$f6,$f8 /* 40c0: 44805000 */ mtc1 $zero,$f10 /* 40c4: 46000486 */ mov.s $f18,$f0 -/* 40c8: 3c017005 */ lui $at,0x7005 +/* 40c8: 3c017005 */ lui $at,%hi(var700524a4) /* 40cc: 460a0032 */ c.eq.s $f0,$f10 /* 40d0: 00000000 */ nop /* 40d4: 45020003 */ bc1fl .L000040e4 /* 40d8: 3c013f80 */ lui $at,0x3f80 -/* 40dc: c43224a4 */ lwc1 $f18,0x24a4($at) +/* 40dc: c43224a4 */ lwc1 $f18,%lo(var700524a4)($at) /* 40e0: 3c013f80 */ lui $at,0x3f80 .L000040e4: /* 40e4: 44812000 */ mtc1 $at,$f4 @@ -127,12 +127,12 @@ glabel func00003fb0 /* 4160: 46083300 */ add.s $f12,$f6,$f8 /* 4164: 44805000 */ mtc1 $zero,$f10 /* 4168: 46000486 */ mov.s $f18,$f0 -/* 416c: 3c017005 */ lui $at,0x7005 +/* 416c: 3c017005 */ lui $at,%hi(var700524a8) /* 4170: 460a0032 */ c.eq.s $f0,$f10 /* 4174: 00000000 */ nop /* 4178: 45020003 */ bc1fl .L00004188 /* 417c: 3c013f80 */ lui $at,0x3f80 -/* 4180: c43224a8 */ lwc1 $f18,0x24a8($at) +/* 4180: c43224a8 */ lwc1 $f18,%lo(var700524a8)($at) /* 4184: 3c013f80 */ lui $at,0x3f80 .L00004188: /* 4188: 44812000 */ mtc1 $at,$f4 @@ -241,4 +241,4 @@ glabel func000042a4 /* 4314: 00000000 */ nop /* 4318: 00000000 */ nop /* 431c: 00000000 */ nop -); \ No newline at end of file +); diff --git a/src/lib/lib_04a80.c b/src/lib/lib_04a80.c index 23b390c52..9f89f3a3b 100644 --- a/src/lib/lib_04a80.c +++ b/src/lib/lib_04a80.c @@ -361,8 +361,8 @@ glabel func00004c50 /* 4ec4: 1aa00008 */ blez $s5,.L00004ee8 /* 4ec8: 00000000 */ nop /* 4ecc: 44919000 */ mtc1 $s1,$f18 -/* 4ed0: 3c017005 */ lui $at,0x7005 -/* 4ed4: d4282528 */ ldc1 $f8,0x2528($at) +/* 4ed0: 3c017005 */ lui $at,%hi(var70052528) +/* 4ed4: d4282528 */ ldc1 $f8,%lo(var70052528)($at) /* 4ed8: 46809121 */ cvt.d.w $f4,$f18 /* 4edc: 4624a181 */ sub.d $f6,$f20,$f4 /* 4ee0: 46283502 */ mul.d $f20,$f6,$f8 diff --git a/src/lib/lib_074f0.c b/src/lib/lib_074f0.c index 89da596e4..461476751 100644 --- a/src/lib/lib_074f0.c +++ b/src/lib/lib_074f0.c @@ -98,7 +98,7 @@ glabel func000074f0 /* 752c: 24080072 */ addiu $t0,$zero,0x72 /* 7530: 27bdff80 */ addiu $sp,$sp,-128 /* 7534: afa40010 */ sw $a0,0x10($sp) -/* 7538: 3c047005 */ lui $a0,0x7005 +/* 7538: 3c047005 */ lui $a0,%hi(var7005261c+0x73) /* 753c: afbf0000 */ sw $ra,0x0($sp) /* 7540: afa10004 */ sw $at,0x4($sp) /* 7544: afa20008 */ sw $v0,0x8($sp) @@ -129,7 +129,7 @@ glabel func000074f0 /* 75a8: afbe0078 */ sw $s8,0x78($sp) /* 75ac: 27bdffe8 */ addiu $sp,$sp,-24 /* 75b0: 0c00bea9 */ jal func0002faa4 -/* 75b4: 2484268f */ addiu $a0,$a0,0x268f +/* 75b4: 2484268f */ addiu $a0,$a0,%lo(var7005261c+0x73) /* 75b8: 27bd0018 */ addiu $sp,$sp,0x18 /* 75bc: 8fbf0000 */ lw $ra,0x0($sp) /* 75c0: 8fa10004 */ lw $at,0x4($sp) @@ -171,7 +171,7 @@ glabel func000074f0 /* 764c: 00000000 */ nop /* 7650: 27bdff80 */ addiu $sp,$sp,-128 /* 7654: afa40010 */ sw $a0,0x10($sp) -/* 7658: 3c047005 */ lui $a0,0x7005 +/* 7658: 3c047005 */ lui $a0,%hi(var7005261c+0x73) /* 765c: afbf0000 */ sw $ra,0x0($sp) /* 7660: afa10004 */ sw $at,0x4($sp) /* 7664: afa20008 */ sw $v0,0x8($sp) @@ -202,7 +202,7 @@ glabel func000074f0 /* 76c8: afbe0078 */ sw $s8,0x78($sp) /* 76cc: 27bdffe8 */ addiu $sp,$sp,-24 /* 76d0: 0c00bea9 */ jal func0002faa4 -/* 76d4: 2484268f */ addiu $a0,$a0,0x268f +/* 76d4: 2484268f */ addiu $a0,$a0,%lo(var7005261c+0x73) /* 76d8: 27bd0018 */ addiu $sp,$sp,0x18 /* 76dc: 8fbf0000 */ lw $ra,0x0($sp) /* 76e0: 8fa10004 */ lw $at,0x4($sp) @@ -675,10 +675,10 @@ glabel func00007a10 /* 7d68: 27a40548 */ addiu $a0,$sp,0x548 /* 7d6c: 01402825 */ or $a1,$t2,$zero /* 7d70: 24060101 */ addiu $a2,$zero,0x101 -/* 7d74: 3c077005 */ lui $a3,0x7005 -/* 7d78: 24e72552 */ addiu $a3,$a3,0x2552 -/* 7d7c: 3c0f7005 */ lui $t7,0x7005 -/* 7d80: 25ef25df */ addiu $t7,$t7,0x25df +/* 7d74: 3c077005 */ lui $a3,%hi(var70052550+0x2) +/* 7d78: 24e72552 */ addiu $a3,$a3,%lo(var70052550+0x2) +/* 7d7c: 3c0f7005 */ lui $t7,%hi(var700525dc+0x3) +/* 7d80: 25ef25df */ addiu $t7,$t7,%lo(var700525dc+0x3) /* 7d84: 27b80a38 */ addiu $t8,$sp,0xa38 /* 7d88: 0c002019 */ jal func00008064 /* 7d8c: 27b90a3c */ addiu $t9,$sp,0xa3c @@ -694,8 +694,8 @@ glabel func00007a10 /* 7db4: 24060000 */ addiu $a2,$zero,0x0 /* 7db8: 3c077005 */ lui $a3,%hi(var70052590) /* 7dbc: 24e72590 */ addiu $a3,$a3,%lo(var70052590) -/* 7dc0: 3c0f7005 */ lui $t7,0x7005 -/* 7dc4: 25ef25fe */ addiu $t7,$t7,0x25fe +/* 7dc0: 3c0f7005 */ lui $t7,%hi(var700525fc+0x2) +/* 7dc4: 25ef25fe */ addiu $t7,$t7,%lo(var700525fc+0x2) /* 7dc8: 27b80a3a */ addiu $t8,$sp,0xa3a /* 7dcc: 0c002019 */ jal func00008064 /* 7dd0: 27b90a40 */ addiu $t9,$sp,0xa40 @@ -716,7 +716,7 @@ glabel func00007a10 .L00007e0c: /* 7e0c: 27bdff80 */ addiu $sp,$sp,-128 /* 7e10: afa40010 */ sw $a0,0x10($sp) -/* 7e14: 3c047005 */ lui $a0,0x7005 +/* 7e14: 3c047005 */ lui $a0,%hi(var7005261c+0x54) /* 7e18: afbf0000 */ sw $ra,0x0($sp) /* 7e1c: afa10004 */ sw $at,0x4($sp) /* 7e20: afa20008 */ sw $v0,0x8($sp) @@ -747,7 +747,7 @@ glabel func00007a10 /* 7e84: afbe0078 */ sw $s8,0x78($sp) /* 7e88: 27bdffe8 */ addiu $sp,$sp,-24 /* 7e8c: 0c00bea9 */ jal func0002faa4 -/* 7e90: 24842670 */ addiu $a0,$a0,0x2670 +/* 7e90: 24842670 */ addiu $a0,$a0,%lo(var7005261c+0x54) /* 7e94: 27bd0018 */ addiu $sp,$sp,0x18 /* 7e98: 8fbf0000 */ lw $ra,0x0($sp) /* 7e9c: 8fa10004 */ lw $at,0x4($sp) @@ -1247,8 +1247,8 @@ glabel func00008064 /* 8574: afbe0078 */ sw $s8,0x78($sp) /* 8578: 27bdffe8 */ addiu $sp,$sp,-24 /* 857c: afb30004 */ sw $s3,0x4($sp) -/* 8580: 3c047005 */ lui $a0,0x7005 -/* 8584: 24842647 */ addiu $a0,$a0,0x2647 +/* 8580: 3c047005 */ lui $a0,%hi(var7005261c+0x2b) +/* 8584: 24842647 */ addiu $a0,$a0,%lo(var7005261c+0x2b) /* 8588: 0c00bea9 */ jal func0002faa4 /* 858c: 8fa50004 */ lw $a1,0x4($sp) /* 8590: 27bd0018 */ addiu $sp,$sp,0x18 @@ -1523,10 +1523,10 @@ glabel func000088b0 /* 8940: 27a40548 */ addiu $a0,$sp,0x548 /* 8944: 24050120 */ addiu $a1,$zero,0x120 /* 8948: 24060101 */ addiu $a2,$zero,0x101 -/* 894c: 3c077005 */ lui $a3,0x7005 -/* 8950: 24e72552 */ addiu $a3,$a3,0x2552 -/* 8954: 3c0f7005 */ lui $t7,0x7005 -/* 8958: 25ef25df */ addiu $t7,$t7,0x25df +/* 894c: 3c077005 */ lui $a3,%hi(var70052550+0x2) +/* 8950: 24e72552 */ addiu $a3,$a3,%lo(var70052550+0x2) +/* 8954: 3c0f7005 */ lui $t7,%hi(var700525dc+0x3) +/* 8958: 25ef25df */ addiu $t7,$t7,%lo(var700525dc+0x3) /* 895c: 27b809c8 */ addiu $t8,$sp,0x9c8 /* 8960: 0c002019 */ jal func00008064 /* 8964: 27b909cc */ addiu $t9,$sp,0x9cc @@ -1544,8 +1544,8 @@ glabel func000088b0 /* 8990: 24060000 */ addiu $a2,$zero,0x0 /* 8994: 3c077005 */ lui $a3,%hi(var70052590) /* 8998: 24e72590 */ addiu $a3,$a3,%lo(var70052590) -/* 899c: 3c0f7005 */ lui $t7,0x7005 -/* 89a0: 25ef25fe */ addiu $t7,$t7,0x25fe +/* 899c: 3c0f7005 */ lui $t7,%hi(var700525fc+0x2) +/* 89a0: 25ef25fe */ addiu $t7,$t7,%lo(var700525fc+0x2) /* 89a4: 27b809d0 */ addiu $t8,$sp,0x9d0 /* 89a8: 0c002019 */ jal func00008064 /* 89ac: 27b909d4 */ addiu $t9,$sp,0x9d4 @@ -1586,4 +1586,4 @@ glabel func00008a08 /* 8a14: 8c420000 */ lw $v0,0x0($v0) /* 8a18: 00000000 */ nop /* 8a1c: 00000000 */ nop -); \ No newline at end of file +); diff --git a/src/lib/lib_09660.c b/src/lib/lib_09660.c index 903624d88..cd6758111 100644 --- a/src/lib/lib_09660.c +++ b/src/lib/lib_09660.c @@ -754,20 +754,20 @@ glabel func00009ed4 /* 9fe8: 9084ce93 */ lbu $a0,%lo(var8005ce90+0x3)($a0) /* 9fec: 3c0a8006 */ lui $t2,%hi(var8005ce74) /* 9ff0: 8d4ace74 */ lw $t2,%lo(var8005ce74)($t2) -/* 9ff4: 3c018006 */ lui $at,0x8006 +/* 9ff4: 3c018006 */ lui $at,%hi(var8005ce7c) /* 9ff8: 000a5880 */ sll $t3,$t2,0x2 /* 9ffc: 000b6823 */ negu $t5,$t3 /* a000: 002d0821 */ addu $at,$at,$t5 /* a004: 0c012370 */ jal func00048dc0 -/* a008: c42cce7c */ lwc1 $f12,-0x3184($at) +/* a008: c42cce7c */ lwc1 $f12,%lo(var8005ce7c)($at) /* a00c: 3c0e8006 */ lui $t6,%hi(var8005ce74) /* a010: 8dcece74 */ lw $t6,%lo(var8005ce74)($t6) -/* a014: 3c018006 */ lui $at,0x8006 +/* a014: 3c018006 */ lui $at,%hi(var8005ce84) /* a018: 000e6080 */ sll $t4,$t6,0x2 /* a01c: 000cc023 */ negu $t8,$t4 /* a020: 00380821 */ addu $at,$at,$t8 /* a024: 0c0123bc */ jal func00048ef0 -/* a028: c42cce84 */ lwc1 $f12,-0x317c($at) +/* a028: c42cce84 */ lwc1 $f12,%lo(var8005ce84)($at) /* a02c: 0c0123d4 */ jal func00048f50 /* a030: 24040042 */ addiu $a0,$zero,0x42 /* a034: 8fbf0014 */ lw $ra,0x14($sp) @@ -832,13 +832,13 @@ glabel func0000a044 /* a104: 00000000 */ nop .L0000a108: /* a108: 8d6bd5a0 */ lw $t3,%lo(var8005d5a0)($t3) -/* a10c: 3c018006 */ lui $at,0x8006 +/* a10c: 3c018006 */ lui $at,%hi(var8005ce78) /* a110: 000b6080 */ sll $t4,$t3,0x2 /* a114: 002c0821 */ addu $at,$at,$t4 -/* a118: e422ce78 */ swc1 $f2,-0x3188($at) -/* a11c: 3c018006 */ lui $at,0x8006 +/* a118: e422ce78 */ swc1 $f2,%lo(var8005ce78)($at) +/* a11c: 3c018006 */ lui $at,%hi(var8005ce80) /* a120: 002c0821 */ addu $at,$at,$t4 -/* a124: e420ce80 */ swc1 $f0,-0x3180($at) +/* a124: e420ce80 */ swc1 $f0,%lo(var8005ce80)($at) /* a128: 91230000 */ lbu $v1,0x0($t1) /* a12c: 17e30101 */ bne $ra,$v1,.L0000a534 /* a130: 00000000 */ nop @@ -851,7 +851,7 @@ glabel func0000a044 /* a14c: 3c198009 */ lui $t9,%hi(var8008dcc0) /* a150: 2739dcc0 */ addiu $t9,$t9,%lo(var8008dcc0) /* a154: 14980019 */ bne $a0,$t8,.L0000a1bc -/* a158: 3c0f8006 */ lui $t7,0x8006 +/* a158: 3c0f8006 */ lui $t7,%hi(var80060048) /* a15c: 000bc880 */ sll $t9,$t3,0x2 /* a160: 032bc821 */ addu $t9,$t9,$t3 /* a164: 3c0e8009 */ lui $t6,%hi(var8008dcc0) @@ -860,7 +860,7 @@ glabel func0000a044 /* a170: 032e2021 */ addu $a0,$t9,$t6 /* a174: 3c0f8006 */ lui $t7,%hi(var80060070) /* a178: 25ef0070 */ addiu $t7,$t7,%lo(var80060070) -/* a17c: 25f90048 */ addiu $t9,$t7,0x48 +/* a17c: 25f90048 */ addiu $t9,$t7,%lo(var80060048) /* a180: 00807025 */ or $t6,$a0,$zero .L0000a184: /* a184: 8de10000 */ lw $at,0x0($t7) diff --git a/src/lib/lib_0e9d0.c b/src/lib/lib_0e9d0.c index 7cd1d474b..1c1c52b82 100644 --- a/src/lib/lib_0e9d0.c +++ b/src/lib/lib_0e9d0.c @@ -2767,7 +2767,7 @@ glabel func00010e10 /* 10eac: 00002825 */ or $a1,$zero,$zero /* 10eb0: 24070040 */ addiu $a3,$zero,0x40 /* 10eb4: 18c0000b */ blez $a2,.L00010ee4 -/* 10eb8: 3c048006 */ lui $a0,0x8006 +/* 10eb8: 3c048006 */ lui $a0,%hi(var8005ddc0) /* 10ebc: 8d090040 */ lw $t1,0x40($t0) /* 10ec0: 00095080 */ sll $t2,$t1,0x2 /* 10ec4: 01495021 */ addu $t2,$t2,$t1 @@ -2794,7 +2794,7 @@ glabel func00010e10 /* 10f14: 10000066 */ b .L000110b0 /* 10f18: 8fbf002c */ lw $ra,0x2c($sp) .L00010f1c: -/* 10f1c: 8c84ddc0 */ lw $a0,-8768($a0) +/* 10f1c: 8c84ddc0 */ lw $a0,%lo(var8005ddc0)($a0) /* 10f20: 50800063 */ beqzl $a0,.L000110b0 /* 10f24: 8fbf002c */ lw $ra,0x2c($sp) /* 10f28: 0c00cec9 */ jal audioStop @@ -2864,7 +2864,7 @@ glabel func00010e10 /* 11018: 00002825 */ or $a1,$zero,$zero /* 1101c: 24070040 */ addiu $a3,$zero,0x40 /* 11020: 18c0000b */ blez $a2,.L00011050 -/* 11024: 3c048006 */ lui $a0,0x8006 +/* 11024: 3c048006 */ lui $a0,%hi(var8005ddc0) /* 11028: 8d190040 */ lw $t9,0x40($t0) /* 1102c: 00194880 */ sll $t1,$t9,0x2 /* 11030: 01394821 */ addu $t1,$t1,$t9 @@ -2893,7 +2893,7 @@ glabel func00010e10 /* 11088: 10000009 */ b .L000110b0 /* 1108c: 8fbf002c */ lw $ra,0x2c($sp) .L00011090: -/* 11090: 8c84ddc0 */ lw $a0,-8768($a0) +/* 11090: 8c84ddc0 */ lw $a0,%lo(var8005ddc0)($a0) /* 11094: 50800006 */ beqzl $a0,.L000110b0 /* 11098: 8fbf002c */ lw $ra,0x2c($sp) /* 1109c: 0c00cec9 */ jal audioStop @@ -3006,7 +3006,7 @@ glabel func0001111c /* 11204: 00002825 */ or $a1,$zero,$zero /* 11208: 24070040 */ addiu $a3,$zero,0x40 /* 1120c: 18c0000b */ blez $a2,.L0001123c -/* 11210: 3c048006 */ lui $a0,0x8006 +/* 11210: 3c048006 */ lui $a0,%hi(var8005ddc4) /* 11214: 8d090040 */ lw $t1,0x40($t0) /* 11218: 00095100 */ sll $t2,$t1,0x4 /* 1121c: 01495023 */ subu $t2,$t2,$t1 @@ -3033,7 +3033,7 @@ glabel func0001111c /* 1126c: 10000067 */ b .L0001140c /* 11270: 8fbf002c */ lw $ra,0x2c($sp) .L00011274: -/* 11274: 8c84ddc4 */ lw $a0,-8764($a0) +/* 11274: 8c84ddc4 */ lw $a0,%lo(var8005ddc4)($a0) /* 11278: 50800064 */ beqzl $a0,.L0001140c /* 1127c: 8fbf002c */ lw $ra,0x2c($sp) /* 11280: 0c00cec9 */ jal audioStop @@ -3104,7 +3104,7 @@ glabel func0001111c /* 11374: 00002825 */ or $a1,$zero,$zero /* 11378: 24070040 */ addiu $a3,$zero,0x40 /* 1137c: 18c0000b */ blez $a2,.L000113ac -/* 11380: 3c048006 */ lui $a0,0x8006 +/* 11380: 3c048006 */ lui $a0,%hi(var8005ddc4) /* 11384: 8d190040 */ lw $t9,0x40($t0) /* 11388: 00194900 */ sll $t1,$t9,0x4 /* 1138c: 01394823 */ subu $t1,$t1,$t9 @@ -3133,7 +3133,7 @@ glabel func0001111c /* 113e4: 10000009 */ b .L0001140c /* 113e8: 8fbf002c */ lw $ra,0x2c($sp) .L000113ec: -/* 113ec: 8c84ddc4 */ lw $a0,-8764($a0) +/* 113ec: 8c84ddc4 */ lw $a0,%lo(var8005ddc4)($a0) /* 113f0: 50800006 */ beqzl $a0,.L0001140c /* 113f4: 8fbf002c */ lw $ra,0x2c($sp) /* 113f8: 0c00cec9 */ jal audioStop diff --git a/src/lib/lib_11420.c b/src/lib/lib_11420.c index 89b825588..0b14fa06e 100644 --- a/src/lib/lib_11420.c +++ b/src/lib/lib_11420.c @@ -716,7 +716,7 @@ glabel func0001190c /* 11d38: 8c6340e0 */ lw $v1,%lo(var800840e0)($v1) .L00011d3c: /* 11d3c: 10600009 */ beqz $v1,.L00011d64 -/* 11d40: 3c018008 */ lui $at,0x8008 +/* 11d40: 3c018008 */ lui $at,%hi(var800840e4) /* 11d44: 3c198008 */ lui $t9,%hi(var800840e4) /* 11d48: 3c0c800a */ lui $t4,%hi(g_Vars+0x40) /* 11d4c: 8d8ca000 */ lw $t4,%lo(g_Vars+0x40)($t4) @@ -726,7 +726,7 @@ glabel func0001190c /* 11d5c: 10000002 */ b .L00011d68 /* 11d60: ac2d40e4 */ sw $t5,%lo(var800840e4)($at) .L00011d64: -/* 11d64: ac2040e4 */ sw $zero,0x40e4($at) +/* 11d64: ac2040e4 */ sw $zero,%lo(var800840e4)($at) .L00011d68: /* 11d68: 8fbf0024 */ lw $ra,0x24($sp) /* 11d6c: 8fb00014 */ lw $s0,0x14($sp) diff --git a/src/lib/lib_12dc0.c b/src/lib/lib_12dc0.c index 0a2e107e3..a8f4f94df 100644 --- a/src/lib/lib_12dc0.c +++ b/src/lib/lib_12dc0.c @@ -25,9 +25,9 @@ const char var7005400c[] = ""; GLOBAL_ASM( glabel random -/* 12dc0: 3c048006 */ lui $a0,0x8006 -/* 12dc4: dc84ee00 */ ld $a0,-0x1200($a0) -/* 12dc8: 3c018006 */ lui $at,0x8006 +/* 12dc0: 3c048006 */ lui $a0,%hi(rand_seed) +/* 12dc4: dc84ee00 */ ld $a0,%lo(rand_seed)($a0) +/* 12dc8: 3c018006 */ lui $at,%hi(rand_seed) /* 12dcc: 000437fc */ dsll32 $a2,$a0,0x1f /* 12dd0: 00042ff8 */ dsll $a1,$a0,0x1f /* 12dd4: 000637fa */ dsrl $a2,$a2,0x1f @@ -40,7 +40,7 @@ glabel random /* 12df0: 30840fff */ andi $a0,$a0,0xfff /* 12df4: 00862026 */ xor $a0,$a0,$a2 /* 12df8: 0004103c */ dsll32 $v0,$a0,0x0 -/* 12dfc: fc24ee00 */ sd $a0,-0x1200($at) +/* 12dfc: fc24ee00 */ sd $a0,%lo(rand_seed)($at) /* 12e00: 03e00008 */ jr $ra /* 12e04: 0002103f */ dsra32 $v0,$v0,0x0 ); @@ -57,8 +57,8 @@ glabel random GLOBAL_ASM( glabel func00012e08 /* 12e08: 64840001 */ daddiu $a0,$a0,0x1 -/* 12e0c: 3c018006 */ lui $at,0x8006 -/* 12e10: fc24ee00 */ sd $a0,-0x1200($at) +/* 12e0c: 3c018006 */ lui $at,%hi(rand_seed) +/* 12e10: fc24ee00 */ sd $a0,%lo(rand_seed)($at) /* 12e14: 03e00008 */ jr $ra /* 12e18: 24040000 */ addiu $a0,$zero,0x0 ); diff --git a/src/lib/lib_16110.c b/src/lib/lib_16110.c index 6048fc2c4..ad5be72e0 100644 --- a/src/lib/lib_16110.c +++ b/src/lib/lib_16110.c @@ -510,10 +510,10 @@ GLOBAL_ASM( glabel func00016748 /* 16748: 3c014780 */ lui $at,0x4780 /* 1674c: 44812000 */ mtc1 $at,$f4 -/* 16750: 3c018006 */ lui $at,0x8006 +/* 16750: 3c018006 */ lui $at,%hi(var8005ef10) /* 16754: 460c2182 */ mul.s $f6,$f4,$f12 /* 16758: 03e00008 */ jr $ra -/* 1675c: e426ef10 */ swc1 $f6,-0x10f0($at) +/* 1675c: e426ef10 */ swc1 $f6,%lo(var8005ef10)($at) ); GLOBAL_ASM( @@ -521,8 +521,8 @@ glabel func00016760 /* 16760: 3c028006 */ lui $v0,%hi(var8005ef10) /* 16764: 2442ef10 */ addiu $v0,$v0,%lo(var8005ef10) /* 16768: c4440000 */ lwc1 $f4,0x0($v0) -/* 1676c: 3c01800a */ lui $at,0x800a -/* 16770: e424a4d0 */ swc1 $f4,-0x5b30($at) +/* 1676c: 3c01800a */ lui $at,%hi(g_Vars+0x510) +/* 16770: e424a4d0 */ swc1 $f4,%lo(g_Vars+0x510)($at) /* 16774: 3c014780 */ lui $at,0x4780 /* 16778: 44813000 */ mtc1 $at,$f6 /* 1677c: 03e00008 */ jr $ra @@ -531,11 +531,11 @@ glabel func00016760 GLOBAL_ASM( glabel func00016784 -/* 16784: 3c01800a */ lui $at,0x800a -/* 16788: c424a4d0 */ lwc1 $f4,-0x5b30($at) -/* 1678c: 3c018006 */ lui $at,0x8006 +/* 16784: 3c01800a */ lui $at,%hi(g_Vars+0x510) +/* 16788: c424a4d0 */ lwc1 $f4,%lo(g_Vars+0x510)($at) +/* 1678c: 3c018006 */ lui $at,%hi(var8005ef10) /* 16790: 03e00008 */ jr $ra -/* 16794: e424ef10 */ swc1 $f4,-0x10f0($at) +/* 16794: e424ef10 */ swc1 $f4,%lo(var8005ef10)($at) ); GLOBAL_ASM( @@ -2162,12 +2162,12 @@ glabel func00017e30 /* 17f54: 46120280 */ add.s $f10,$f0,$f18 /* 17f58: 46062201 */ sub.s $f8,$f4,$f6 /* 17f5c: 44812000 */ mtc1 $at,$f4 -/* 17f60: 3c018008 */ lui $at,0x8008 +/* 17f60: 3c018008 */ lui $at,%hi(var8007fcb4) /* 17f64: 46045182 */ mul.s $f6,$f10,$f4 /* 17f68: e7a80068 */ swc1 $f8,0x68($sp) /* 17f6c: c508000c */ lwc1 $f8,0xc($t0) /* 17f70: 46083281 */ sub.s $f10,$f6,$f8 -/* 17f74: e42afcb4 */ swc1 $f10,-0x34c($at) +/* 17f74: e42afcb4 */ swc1 $f10,%lo(var8007fcb4)($at) /* 17f78: 906b0000 */ lbu $t3,0x0($v1) /* 17f7c: 59600068 */ blezl $t3,.L00018120 /* 17f80: c506000c */ lwc1 $f6,0xc($t0) diff --git a/src/lib/lib_1a500.c b/src/lib/lib_1a500.c index 96cd07cfe..f824ba98d 100644 --- a/src/lib/lib_1a500.c +++ b/src/lib/lib_1a500.c @@ -35,9 +35,9 @@ glabel func0001a500 GLOBAL_ASM( glabel func0001a50c -/* 1a50c: 3c018006 */ lui $at,0x8006 +/* 1a50c: 3c018006 */ lui $at,%hi(var8005efb8) /* 1a510: 03e00008 */ jr $ra -/* 1a514: e42cefb8 */ swc1 $f12,-0x1048($at) +/* 1a514: e42cefb8 */ swc1 $f12,%lo(var8005efb8)($at) ); void func0001a518(void *callback) @@ -1475,7 +1475,7 @@ glabel var70054308 /* 1bb0c: 3c017005 */ lui $at,%hi(var700542f4) /* 1bb10: c42842f4 */ lwc1 $f8,%lo(var700542f4)($at) /* 1bb14: c72c0004 */ lwc1 $f12,0x4($t9) -/* 1bb18: 3c017005 */ lui $at,0x7005 +/* 1bb18: 3c017005 */ lui $at,%hi(var700542f8) /* 1bb1c: 8fa50028 */ lw $a1,0x28($sp) /* 1bb20: 4608603c */ c.lt.s $f12,$f8 /* 1bb24: 00000000 */ nop @@ -1488,7 +1488,7 @@ glabel var70054308 /* 1bb40: 10000009 */ b .L0001bb68 /* 1bb44: 00000000 */ nop .L0001bb48: -/* 1bb48: c43042f8 */ lwc1 $f16,0x42f8($at) +/* 1bb48: c43042f8 */ lwc1 $f16,%lo(var700542f8)($at) /* 1bb4c: 3c013f00 */ lui $at,0x3f00 /* 1bb50: 44812000 */ mtc1 $at,$f4 /* 1bb54: 460c8481 */ sub.s $f18,$f16,$f12 @@ -1742,7 +1742,7 @@ glabel var70054320 /* 1bea0: 46000080 */ add.s $f2,$f0,$f0 /* 1bea4: 3c017005 */ lui $at,%hi(var7005430c) /* 1bea8: c424430c */ lwc1 $f4,%lo(var7005430c)($at) -/* 1beac: 3c017005 */ lui $at,0x7005 +/* 1beac: 3c017005 */ lui $at,%hi(var70054310) /* 1beb0: 8fa50028 */ lw $a1,0x28($sp) /* 1beb4: 4604103c */ c.lt.s $f2,$f4 /* 1beb8: 00000000 */ nop @@ -1755,7 +1755,7 @@ glabel var70054320 /* 1bed4: 10000009 */ b .L0001befc /* 1bed8: 00000000 */ nop .L0001bedc: -/* 1bedc: c4284310 */ lwc1 $f8,0x4310($at) +/* 1bedc: c4284310 */ lwc1 $f8,%lo(var70054310)($at) /* 1bee0: 3c013f00 */ lui $at,0x3f00 /* 1bee4: 44818000 */ mtc1 $at,$f16 /* 1bee8: 46024281 */ sub.s $f10,$f8,$f2 @@ -2309,9 +2309,9 @@ glabel func0001c664 .L0001c6c0: /* 1c6c0: 0fc2d5ee */ jal currentPlayerGetLodScaleZ /* 1c6c4: afa30024 */ sw $v1,0x24($sp) -/* 1c6c8: 3c018006 */ lui $at,0x8006 +/* 1c6c8: 3c018006 */ lui $at,%hi(var8005efb8) /* 1c6cc: 8fa30024 */ lw $v1,0x24($sp) -/* 1c6d0: c42cefb8 */ lwc1 $f12,-0x1048($at) +/* 1c6d0: c42cefb8 */ lwc1 $f12,%lo(var8005efb8)($at) /* 1c6d4: 3c013f80 */ lui $at,0x3f80 /* 1c6d8: 44814000 */ mtc1 $at,$f8 /* 1c6dc: c4640038 */ lwc1 $f4,0x38($v1) @@ -8552,8 +8552,8 @@ glabel var700544b4 GLOBAL_ASM( glabel func000220fc -/* 220fc: 3c018006 */ lui $at,0x8006 -/* 22100: c424efc0 */ lwc1 $f4,-0x1040($at) +/* 220fc: 3c018006 */ lui $at,%hi(var8005efc0) +/* 22100: c424efc0 */ lwc1 $f4,%lo(var8005efc0)($at) /* 22104: 44803000 */ mtc1 $zero,$f6 /* 22108: c480000c */ lwc1 $f0,0xc($a0) /* 2210c: c4820010 */ lwc1 $f2,0x10($a0) diff --git a/src/lib/lib_233c0.c b/src/lib/lib_233c0.c index a5fb34792..e2b2cc162 100644 --- a/src/lib/lib_233c0.c +++ b/src/lib/lib_233c0.c @@ -1911,9 +1911,9 @@ glabel func00024c14 GLOBAL_ASM( glabel func00024e40 -/* 24e40: 3c01800a */ lui $at,0x800a +/* 24e40: 3c01800a */ lui $at,%hi(var8009a8f0) /* 24e44: 03e00008 */ jr $ra -/* 24e48: c420a8f0 */ lwc1 $f0,-0x5710($at) +/* 24e48: c420a8f0 */ lwc1 $f0,%lo(var8009a8f0)($at) ); void func00024e4c(struct coord *a, struct coord *b, u32 line, char *file) @@ -1929,9 +1929,9 @@ void func00024e4c(struct coord *a, struct coord *b, u32 line, char *file) GLOBAL_ASM( glabel func00024e98 -/* 24e98: 3c01800a */ lui $at,0x800a +/* 24e98: 3c01800a */ lui $at,%hi(var8009a8b0) /* 24e9c: 03e00008 */ jr $ra -/* 24ea0: c420a8b0 */ lwc1 $f0,-0x5750($at) +/* 24ea0: c420a8b0 */ lwc1 $f0,%lo(var8009a8b0)($at) ); GLOBAL_ASM( @@ -2070,9 +2070,9 @@ glabel func00024fb0 GLOBAL_ASM( glabel func00025038 /* 25038: 44876000 */ mtc1 $a3,$f12 -/* 2503c: 3c01800a */ lui $at,0x800a +/* 2503c: 3c01800a */ lui $at,%hi(var8009a8b0) /* 25040: 3c02800a */ lui $v0,%hi(var8009a8b8) -/* 25044: e42ca8b0 */ swc1 $f12,-0x5750($at) +/* 25044: e42ca8b0 */ swc1 $f12,%lo(var8009a8b0)($at) /* 25048: c4840000 */ lwc1 $f4,0x0($a0) /* 2504c: 2442a8b8 */ addiu $v0,$v0,%lo(var8009a8b8) /* 25050: 3c03800a */ lui $v1,%hi(var8009a8c8) @@ -2142,8 +2142,8 @@ glabel func000250cc /* 25140: 0fc55e73 */ jal func0f1579cc /* 25144: e7a60028 */ swc1 $f6,0x28($sp) /* 25148: 8fbf0014 */ lw $ra,0x14($sp) -/* 2514c: 3c01800a */ lui $at,0x800a -/* 25150: e420a8b0 */ swc1 $f0,-0x5750($at) +/* 2514c: 3c01800a */ lui $at,%hi(var8009a8b0) +/* 25150: e420a8b0 */ swc1 $f0,%lo(var8009a8b0)($at) /* 25154: 3c01800a */ lui $at,%hi(var8009a8ac) /* 25158: 24180001 */ addiu $t8,$zero,0x1 /* 2515c: ac38a8ac */ sw $t8,%lo(var8009a8ac)($at) @@ -2255,8 +2255,8 @@ glabel func00025254 /* 252d4: ac27a8d4 */ sw $a3,%lo(var8009a8d4)($at) /* 252d8: 3c01800a */ lui $at,%hi(var8009a8d8) /* 252dc: ac29a8d8 */ sw $t1,%lo(var8009a8d8)($at) -/* 252e0: 3c01800a */ lui $at,0x800a -/* 252e4: e42aa8f0 */ swc1 $f10,-0x5710($at) +/* 252e0: 3c01800a */ lui $at,%hi(var8009a8f0) +/* 252e4: e42aa8f0 */ swc1 $f10,%lo(var8009a8f0)($at) /* 252e8: 3c01800a */ lui $at,%hi(var8009a8ec) /* 252ec: ac29a8ec */ sw $t1,%lo(var8009a8ec)($at) /* 252f0: 3c01800a */ lui $at,%hi(var8009a8f4) diff --git a/src/lib/lib_2fc60.c b/src/lib/lib_2fc60.c index e5249466f..fb28e50dc 100644 --- a/src/lib/lib_2fc60.c +++ b/src/lib/lib_2fc60.c @@ -526,10 +526,10 @@ glabel func000301e4 /* 302f0: 93ad002f */ lbu $t5,0x2f($sp) /* 302f4: 3c017005 */ lui $at,%hi(var700546c0) /* 302f8: c42a46c0 */ lwc1 $f10,%lo(var700546c0)($at) -/* 302fc: 3c018006 */ lui $at,0x8006 +/* 302fc: 3c018006 */ lui $at,%hi(var8005f34c) /* 30300: 000d7080 */ sll $t6,$t5,0x2 /* 30304: 002e0821 */ addu $at,$at,$t6 -/* 30308: c430f34c */ lwc1 $f16,-0xcb4($at) +/* 30308: c430f34c */ lwc1 $f16,%lo(var8005f34c)($at) /* 3030c: 3c01467a */ lui $at,0x467a /* 30310: 44813000 */ mtc1 $at,$f6 /* 30314: 46105483 */ div.s $f18,$f10,$f16 @@ -671,10 +671,10 @@ glabel func000301e4 /* 3050c: 93ad002f */ lbu $t5,0x2f($sp) /* 30510: 3c017005 */ lui $at,%hi(var700546f4) /* 30514: c42646f4 */ lwc1 $f6,%lo(var700546f4)($at) -/* 30518: 3c018006 */ lui $at,0x8006 +/* 30518: 3c018006 */ lui $at,%hi(var8005f34c) /* 3051c: 000d7080 */ sll $t6,$t5,0x2 /* 30520: 002e0821 */ addu $at,$at,$t6 -/* 30524: c424f34c */ lwc1 $f4,-0xcb4($at) +/* 30524: c424f34c */ lwc1 $f4,%lo(var8005f34c)($at) /* 30528: 8fb9001c */ lw $t9,0x1c($sp) /* 3052c: 46043203 */ div.s $f8,$f6,$f4 /* 30530: 4600428d */ trunc.w.s $f10,$f8 diff --git a/src/lib/lib_317f0.c b/src/lib/lib_317f0.c index afbd8c210..d781df96a 100644 --- a/src/lib/lib_317f0.c +++ b/src/lib/lib_317f0.c @@ -2588,8 +2588,8 @@ glabel audioStop /* 33b78: 914b0044 */ lbu $t3,0x44($t2) /* 33b7c: 01616024 */ and $t4,$t3,$at /* 33b80: a14c0044 */ sb $t4,0x44($t2) -/* 33b84: 3c048006 */ lui $a0,0x8006 -/* 33b88: 8c84f12c */ lw $a0,-0xed4($a0) +/* 33b84: 3c048006 */ lui $a0,%hi(var8005f12c) +/* 33b88: 8c84f12c */ lw $a0,%lo(var8005f12c)($a0) /* 33b8c: 27a50018 */ addiu $a1,$sp,0x18 /* 33b90: 00003025 */ or $a2,$zero,$zero /* 33b94: 00003825 */ or $a3,$zero,$zero diff --git a/src/lib/lib_3e730.c b/src/lib/lib_3e730.c index 2626e09e0..a8bb78773 100644 --- a/src/lib/lib_3e730.c +++ b/src/lib/lib_3e730.c @@ -6692,10 +6692,10 @@ glabel func0003f8a0 /* 3f8fc: 0c0068f7 */ jal sinf /* 3f900: 00000000 */ nop /* 3f904: 8faa026c */ lw $t2,0x26c($sp) -/* 3f908: 3c01800a */ lui $at,0x800a +/* 3f908: 3c01800a */ lui $at,%hi(var8009c400) /* 3f90c: 000a5880 */ sll $t3,$t2,0x2 /* 3f910: 002b0821 */ addu $at,$at,$t3 -/* 3f914: e420c400 */ swc1 $f0,-0x3c00($at) +/* 3f914: e420c400 */ swc1 $f0,%lo(var8009c400)($at) /* 3f918: 8fac026c */ lw $t4,0x26c($sp) /* 3f91c: 258d0001 */ addiu $t5,$t4,0x1 /* 3f920: 29a10024 */ slti $at,$t5,0x24 @@ -6715,10 +6715,10 @@ glabel func0003f8a0 /* 3f954: 0c0068f7 */ jal sinf /* 3f958: 00000000 */ nop /* 3f95c: 8faf026c */ lw $t7,0x26c($sp) -/* 3f960: 3c01800a */ lui $at,0x800a +/* 3f960: 3c01800a */ lui $at,%hi(var8009c490) /* 3f964: 000fc080 */ sll $t8,$t7,0x2 /* 3f968: 00380821 */ addu $at,$at,$t8 -/* 3f96c: e420c490 */ swc1 $f0,-0x3b70($at) +/* 3f96c: e420c490 */ swc1 $f0,%lo(var8009c490)($at) /* 3f970: 8fb9026c */ lw $t9,0x26c($sp) /* 3f974: 27280001 */ addiu $t0,$t9,0x1 /* 3f978: 29010012 */ slti $at,$t0,0x12 @@ -6730,10 +6730,10 @@ glabel func0003f8a0 /* 3f98c: 8faa026c */ lw $t2,0x26c($sp) /* 3f990: 3c013f80 */ lui $at,0x3f80 /* 3f994: 44818000 */ mtc1 $at,$f16 -/* 3f998: 3c01800a */ lui $at,0x800a +/* 3f998: 3c01800a */ lui $at,%hi(var8009c490) /* 3f99c: 000a5880 */ sll $t3,$t2,0x2 /* 3f9a0: 002b0821 */ addu $at,$at,$t3 -/* 3f9a4: e430c490 */ swc1 $f16,-0x3b70($at) +/* 3f9a4: e430c490 */ swc1 $f16,%lo(var8009c490)($at) /* 3f9a8: 8fac026c */ lw $t4,0x26c($sp) /* 3f9ac: 258d0001 */ addiu $t5,$t4,0x1 /* 3f9b0: 29a10018 */ slti $at,$t5,0x18 @@ -6757,10 +6757,10 @@ glabel func0003f8a0 /* 3f9f4: 0c0068f7 */ jal sinf /* 3f9f8: 00000000 */ nop /* 3f9fc: 8fb8026c */ lw $t8,0x26c($sp) -/* 3fa00: 3c01800a */ lui $at,0x800a +/* 3fa00: 3c01800a */ lui $at,%hi(var8009c490) /* 3fa04: 0018c880 */ sll $t9,$t8,0x2 /* 3fa08: 00390821 */ addu $at,$at,$t9 -/* 3fa0c: e420c490 */ swc1 $f0,-0x3b70($at) +/* 3fa0c: e420c490 */ swc1 $f0,%lo(var8009c490)($at) /* 3fa10: 8fa8026c */ lw $t0,0x26c($sp) /* 3fa14: 25090001 */ addiu $t1,$t0,0x1 /* 3fa18: 2921001e */ slti $at,$t1,0x1e @@ -6771,10 +6771,10 @@ glabel func0003f8a0 .L0003fa2c: /* 3fa2c: 8fab026c */ lw $t3,0x26c($sp) /* 3fa30: 44802000 */ mtc1 $zero,$f4 -/* 3fa34: 3c01800a */ lui $at,0x800a +/* 3fa34: 3c01800a */ lui $at,%hi(var8009c490) /* 3fa38: 000b6080 */ sll $t4,$t3,0x2 /* 3fa3c: 002c0821 */ addu $at,$at,$t4 -/* 3fa40: e424c490 */ swc1 $f4,-0x3b70($at) +/* 3fa40: e424c490 */ swc1 $f4,%lo(var8009c490)($at) /* 3fa44: 8fad026c */ lw $t5,0x26c($sp) /* 3fa48: 25ae0001 */ addiu $t6,$t5,0x1 /* 3fa4c: 29c10024 */ slti $at,$t6,0x24 @@ -6784,10 +6784,10 @@ glabel func0003f8a0 .L0003fa5c: /* 3fa5c: 8faf026c */ lw $t7,0x26c($sp) /* 3fa60: 44803000 */ mtc1 $zero,$f6 -/* 3fa64: 3c01800a */ lui $at,0x800a +/* 3fa64: 3c01800a */ lui $at,%hi(var8009c5b0) /* 3fa68: 000fc080 */ sll $t8,$t7,0x2 /* 3fa6c: 00380821 */ addu $at,$at,$t8 -/* 3fa70: e426c5b0 */ swc1 $f6,-0x3a50($at) +/* 3fa70: e426c5b0 */ swc1 $f6,%lo(var8009c5b0)($at) /* 3fa74: 8fb9026c */ lw $t9,0x26c($sp) /* 3fa78: 27280001 */ addiu $t0,$t9,0x1 /* 3fa7c: 29010006 */ slti $at,$t0,0x6 @@ -6811,10 +6811,10 @@ glabel func0003f8a0 /* 3fac0: 0c0068f7 */ jal sinf /* 3fac4: 00000000 */ nop /* 3fac8: 8fab026c */ lw $t3,0x26c($sp) -/* 3facc: 3c01800a */ lui $at,0x800a +/* 3facc: 3c01800a */ lui $at,%hi(var8009c5b0) /* 3fad0: 000b6080 */ sll $t4,$t3,0x2 /* 3fad4: 002c0821 */ addu $at,$at,$t4 -/* 3fad8: e420c5b0 */ swc1 $f0,-0x3a50($at) +/* 3fad8: e420c5b0 */ swc1 $f0,%lo(var8009c5b0)($at) /* 3fadc: 8fad026c */ lw $t5,0x26c($sp) /* 3fae0: 25ae0001 */ addiu $t6,$t5,0x1 /* 3fae4: 29c1000c */ slti $at,$t6,0xc @@ -6826,10 +6826,10 @@ glabel func0003f8a0 /* 3faf8: 8fb8026c */ lw $t8,0x26c($sp) /* 3fafc: 3c013f80 */ lui $at,0x3f80 /* 3fb00: 44815000 */ mtc1 $at,$f10 -/* 3fb04: 3c01800a */ lui $at,0x800a +/* 3fb04: 3c01800a */ lui $at,%hi(var8009c5b0) /* 3fb08: 0018c880 */ sll $t9,$t8,0x2 /* 3fb0c: 00390821 */ addu $at,$at,$t9 -/* 3fb10: e42ac5b0 */ swc1 $f10,-0x3a50($at) +/* 3fb10: e42ac5b0 */ swc1 $f10,%lo(var8009c5b0)($at) /* 3fb14: 8fa8026c */ lw $t0,0x26c($sp) /* 3fb18: 25090001 */ addiu $t1,$t0,0x1 /* 3fb1c: 29210012 */ slti $at,$t1,0x12 @@ -6850,10 +6850,10 @@ glabel func0003f8a0 /* 3fb54: 0c0068f7 */ jal sinf /* 3fb58: 00000000 */ nop /* 3fb5c: 8fac026c */ lw $t4,0x26c($sp) -/* 3fb60: 3c01800a */ lui $at,0x800a +/* 3fb60: 3c01800a */ lui $at,%hi(var8009c5b0) /* 3fb64: 000c6880 */ sll $t5,$t4,0x2 /* 3fb68: 002d0821 */ addu $at,$at,$t5 -/* 3fb6c: e420c5b0 */ swc1 $f0,-0x3a50($at) +/* 3fb6c: e420c5b0 */ swc1 $f0,%lo(var8009c5b0)($at) /* 3fb70: 8fae026c */ lw $t6,0x26c($sp) /* 3fb74: 25cf0001 */ addiu $t7,$t6,0x1 /* 3fb78: 29e10024 */ slti $at,$t7,0x24 @@ -7322,14 +7322,14 @@ glabel func00040164 /* 4022c: 1140000c */ beqz $t2,.L00040260 /* 40230: 00000000 */ nop /* 40234: 8fab01bc */ lw $t3,0x1bc($sp) -/* 40238: 3c0f7005 */ lui $t7,0x7005 +/* 40238: 3c0f7005 */ lui $t7,%hi(var700579b8+0x2) /* 4023c: 000b60c0 */ sll $t4,$t3,0x3 /* 40240: 018b6021 */ addu $t4,$t4,$t3 /* 40244: 000c6080 */ sll $t4,$t4,0x2 /* 40248: 018b6021 */ addu $t4,$t4,$t3 /* 4024c: 000c6040 */ sll $t4,$t4,0x1 /* 40250: 01ec7821 */ addu $t7,$t7,$t4 -/* 40254: 85ef79ba */ lh $t7,0x79ba($t7) +/* 40254: 85ef79ba */ lh $t7,%lo(var700579b8+0x2)($t7) /* 40258: 10000018 */ b .L000402bc /* 4025c: afaf01b8 */ sw $t7,0x1b8($sp) .L00040260: @@ -7361,14 +7361,14 @@ glabel func00040164 /* 402c0: 00000000 */ nop .L000402c4: /* 402c4: 8fab01bc */ lw $t3,0x1bc($sp) -/* 402c8: 3c0f7005 */ lui $t7,0x7005 +/* 402c8: 3c0f7005 */ lui $t7,%hi(var700579b8+0x2) /* 402cc: 000b60c0 */ sll $t4,$t3,0x3 /* 402d0: 018b6021 */ addu $t4,$t4,$t3 /* 402d4: 000c6080 */ sll $t4,$t4,0x2 /* 402d8: 018b6021 */ addu $t4,$t4,$t3 /* 402dc: 000c6040 */ sll $t4,$t4,0x1 /* 402e0: 01ec7821 */ addu $t7,$t7,$t4 -/* 402e4: 85ef79ba */ lh $t7,0x79ba($t7) +/* 402e4: 85ef79ba */ lh $t7,%lo(var700579b8+0x2)($t7) /* 402e8: afaf01b8 */ sw $t7,0x1b8($sp) .L000402ec: /* 402ec: 8fa801c4 */ lw $t0,0x1c4($sp) @@ -7856,14 +7856,14 @@ glabel func00040164 /* 40a24: 172c0031 */ bne $t9,$t4,.L00040aec /* 40a28: 00000000 */ nop /* 40a2c: 8fa901bc */ lw $t1,0x1bc($sp) -/* 40a30: 3c187005 */ lui $t8,0x7005 +/* 40a30: 3c187005 */ lui $t8,%hi(var700579ec+0x2) /* 40a34: 000970c0 */ sll $t6,$t1,0x3 /* 40a38: 01c97021 */ addu $t6,$t6,$t1 /* 40a3c: 000e7080 */ sll $t6,$t6,0x2 /* 40a40: 01c97021 */ addu $t6,$t6,$t1 /* 40a44: 000e7040 */ sll $t6,$t6,0x1 /* 40a48: 030ec021 */ addu $t8,$t8,$t6 -/* 40a4c: 871879ee */ lh $t8,0x79ee($t8) +/* 40a4c: 871879ee */ lh $t8,%lo(var700579ec+0x2)($t8) /* 40a50: 00187880 */ sll $t7,$t8,0x2 /* 40a54: 01f87823 */ subu $t7,$t7,$t8 /* 40a58: afaf01b8 */ sw $t7,0x1b8($sp) @@ -7889,7 +7889,7 @@ glabel func00040164 /* 40aa8: afad01b0 */ sw $t5,0x1b0($sp) /* 40aac: 8fac01bc */ lw $t4,0x1bc($sp) /* 40ab0: 8faa005c */ lw $t2,0x5c($sp) -/* 40ab4: 3c097005 */ lui $t1,0x7005 +/* 40ab4: 3c097005 */ lui $t1,%hi(var700579e4+0x2) /* 40ab8: 000c70c0 */ sll $t6,$t4,0x3 /* 40abc: 01cc7021 */ addu $t6,$t6,$t4 /* 40ac0: 000e7080 */ sll $t6,$t6,0x2 @@ -7898,7 +7898,7 @@ glabel func00040164 /* 40acc: 000ac840 */ sll $t9,$t2,0x1 /* 40ad0: 01d97821 */ addu $t7,$t6,$t9 /* 40ad4: 012f4821 */ addu $t1,$t1,$t7 -/* 40ad8: 852979e6 */ lh $t1,0x79e6($t1) +/* 40ad8: 852979e6 */ lh $t1,%lo(var700579e4+0x2)($t1) /* 40adc: 00094080 */ sll $t0,$t1,0x2 /* 40ae0: 01094023 */ subu $t0,$t0,$t1 /* 40ae4: 10000050 */ b .L00040c28 @@ -7919,7 +7919,7 @@ glabel func00040164 /* 40b1c: 00000000 */ nop /* 40b20: 8faa01bc */ lw $t2,0x1bc($sp) /* 40b24: 8fb0005c */ lw $s0,0x5c($sp) -/* 40b28: 3c097005 */ lui $t1,0x7005 +/* 40b28: 3c097005 */ lui $t1,%hi(var700579b8+0x2) /* 40b2c: 000a70c0 */ sll $t6,$t2,0x3 /* 40b30: 01ca7021 */ addu $t6,$t6,$t2 /* 40b34: 000e7080 */ sll $t6,$t6,0x2 @@ -7929,7 +7929,7 @@ glabel func00040164 /* 40b44: 000e7040 */ sll $t6,$t6,0x1 /* 40b48: 01d97821 */ addu $t7,$t6,$t9 /* 40b4c: 012f4821 */ addu $t1,$t1,$t7 -/* 40b50: 852979ba */ lh $t1,0x79ba($t1) +/* 40b50: 852979ba */ lh $t1,%lo(var700579b8+0x2)($t1) /* 40b54: afb0005c */ sw $s0,0x5c($sp) /* 40b58: 10000033 */ b .L00040c28 /* 40b5c: afa901b8 */ sw $t1,0x1b8($sp) @@ -7971,7 +7971,7 @@ glabel func00040164 /* 40be8: afaf01b0 */ sw $t7,0x1b0($sp) /* 40bec: 8fa801bc */ lw $t0,0x1bc($sp) /* 40bf0: 8fb9005c */ lw $t9,0x5c($sp) -/* 40bf4: 3c0b7005 */ lui $t3,0x7005 +/* 40bf4: 3c0b7005 */ lui $t3,%hi(var700579e4+0x2) /* 40bf8: 000868c0 */ sll $t5,$t0,0x3 /* 40bfc: 01a86821 */ addu $t5,$t5,$t0 /* 40c00: 000d6880 */ sll $t5,$t5,0x2 @@ -7980,7 +7980,7 @@ glabel func00040164 /* 40c0c: 00194840 */ sll $t1,$t9,0x1 /* 40c10: 01a96021 */ addu $t4,$t5,$t1 /* 40c14: 016c5821 */ addu $t3,$t3,$t4 -/* 40c18: 856b79e6 */ lh $t3,0x79e6($t3) +/* 40c18: 856b79e6 */ lh $t3,%lo(var700579e4+0x2)($t3) /* 40c1c: 000b5080 */ sll $t2,$t3,0x2 /* 40c20: 014b5023 */ subu $t2,$t2,$t3 /* 40c24: afaa01b4 */ sw $t2,0x1b4($sp) @@ -8025,7 +8025,7 @@ glabel func00040164 /* 40cb8: afab01b0 */ sw $t3,0x1b0($sp) /* 40cbc: 8fb801bc */ lw $t8,0x1bc($sp) /* 40cc0: 8fac005c */ lw $t4,0x5c($sp) -/* 40cc4: 3c0e7005 */ lui $t6,0x7005 +/* 40cc4: 3c0e7005 */ lui $t6,%hi(var700579e4+0x2) /* 40cc8: 001878c0 */ sll $t7,$t8,0x3 /* 40ccc: 01f87821 */ addu $t7,$t7,$t8 /* 40cd0: 000f7880 */ sll $t7,$t7,0x2 @@ -8034,7 +8034,7 @@ glabel func00040164 /* 40cdc: 000c5040 */ sll $t2,$t4,0x1 /* 40ce0: 01eac821 */ addu $t9,$t7,$t2 /* 40ce4: 01d97021 */ addu $t6,$t6,$t9 -/* 40ce8: 85ce79e6 */ lh $t6,0x79e6($t6) +/* 40ce8: 85ce79e6 */ lh $t6,%lo(var700579e4+0x2)($t6) /* 40cec: 000e6880 */ sll $t5,$t6,0x2 /* 40cf0: 01ae6823 */ subu $t5,$t5,$t6 /* 40cf4: afad01b4 */ sw $t5,0x1b4($sp) @@ -8044,7 +8044,7 @@ glabel func00040164 .L00040d00: /* 40d00: 8fa801bc */ lw $t0,0x1bc($sp) /* 40d04: 8fb0005c */ lw $s0,0x5c($sp) -/* 40d08: 3c0c7005 */ lui $t4,0x7005 +/* 40d08: 3c0c7005 */ lui $t4,%hi(var700579b8+0x2) /* 40d0c: 000848c0 */ sll $t1,$t0,0x3 /* 40d10: 01284821 */ addu $t1,$t1,$t0 /* 40d14: 00094880 */ sll $t1,$t1,0x2 @@ -8054,7 +8054,7 @@ glabel func00040164 /* 40d24: 00094840 */ sll $t1,$t1,0x1 /* 40d28: 012bc021 */ addu $t8,$t1,$t3 /* 40d2c: 01986021 */ addu $t4,$t4,$t8 -/* 40d30: 858c79ba */ lh $t4,0x79ba($t4) +/* 40d30: 858c79ba */ lh $t4,%lo(var700579b8+0x2)($t4) /* 40d34: afb0005c */ sw $s0,0x5c($sp) /* 40d38: afac01b8 */ sw $t4,0x1b8($sp) .L00040d3c: @@ -8433,10 +8433,10 @@ glabel func00040dac /* 412ac: 1420ffb8 */ bnez $at,.L00041190 /* 412b0: afb9002c */ sw $t9,0x2c($sp) /* 412b4: 8fab0034 */ lw $t3,0x34($sp) -/* 412b8: 3c087005 */ lui $t0,0x7005 +/* 412b8: 3c087005 */ lui $t0,%hi(var70057b78+0x2) /* 412bc: 8fae0030 */ lw $t6,0x30($sp) /* 412c0: 010b4021 */ addu $t0,$t0,$t3 -/* 412c4: 91087b7a */ lbu $t0,0x7b7a($t0) +/* 412c4: 91087b7a */ lbu $t0,%lo(var70057b78+0x2)($t0) /* 412c8: 25cd0001 */ addiu $t5,$t6,0x1 /* 412cc: afad0030 */ sw $t5,0x30($sp) /* 412d0: 01a8082a */ slt $at,$t5,$t0 @@ -8588,10 +8588,10 @@ glabel func00040dac /* 414e8: ada03d08 */ sw $zero,0x3d08($t5) .L000414ec: /* 414ec: 8fb80034 */ lw $t8,0x34($sp) -/* 414f0: 3c0a7005 */ lui $t2,0x7005 +/* 414f0: 3c0a7005 */ lui $t2,%hi(var70057b74+0x1) /* 414f4: 8fa90030 */ lw $t1,0x30($sp) /* 414f8: 01585021 */ addu $t2,$t2,$t8 -/* 414fc: 914a7b75 */ lbu $t2,0x7b75($t2) +/* 414fc: 914a7b75 */ lbu $t2,%lo(var70057b74+0x1)($t2) /* 41500: 252c0001 */ addiu $t4,$t1,0x1 /* 41504: afac0030 */ sw $t4,0x30($sp) /* 41508: 018a082a */ slt $at,$t4,$t2 @@ -8624,10 +8624,10 @@ glabel func00040dac /* 41568: 8d193d08 */ lw $t9,0x3d08($t0) /* 4156c: ad193e00 */ sw $t9,0x3e00($t0) /* 41570: 8fa90034 */ lw $t1,0x34($sp) -/* 41574: 3c0d7005 */ lui $t5,0x7005 +/* 41574: 3c0d7005 */ lui $t5,%hi(var70057b74+0x1) /* 41578: 8faf0030 */ lw $t7,0x30($sp) /* 4157c: 01a96821 */ addu $t5,$t5,$t1 -/* 41580: 91ad7b75 */ lbu $t5,0x7b75($t5) +/* 41580: 91ad7b75 */ lbu $t5,%lo(var70057b74+0x1)($t5) /* 41584: 25eb0001 */ addiu $t3,$t7,0x1 /* 41588: afab0030 */ sw $t3,0x30($sp) /* 4158c: 016d082a */ slt $at,$t3,$t5 diff --git a/src/lib/lib_4f5e0.c b/src/lib/lib_4f5e0.c index 7d44b5a9c..05378df1c 100644 --- a/src/lib/lib_4f5e0.c +++ b/src/lib/lib_4f5e0.c @@ -303,7 +303,7 @@ glabel func0004f9b0 /* 4f9b8: c4249fd0 */ lwc1 $f4,-0x6030($at) /* 4f9bc: afb00018 */ sw $s0,0x18($sp) /* 4f9c0: 00808025 */ or $s0,$a0,$zero -/* 4f9c4: 3c01800a */ lui $at,0x800a +/* 4f9c4: 3c01800a */ lui $at,%hi(var8009ca70) /* 4f9c8: afbf001c */ sw $ra,0x1c($sp) /* 4f9cc: afa50034 */ sw $a1,0x34($sp) /* 4f9d0: afa60038 */ sw $a2,0x38($sp) @@ -312,10 +312,10 @@ glabel func0004f9b0 /* 4f9dc: 27a5003c */ addiu $a1,$sp,0x3c /* 4f9e0: 27a40038 */ addiu $a0,$sp,0x38 /* 4f9e4: 0c0011e4 */ jal scaleTo1 -/* 4f9e8: e424ca70 */ swc1 $f4,-0x3590($at) -/* 4f9ec: 3c01800a */ lui $at,0x800a +/* 4f9e8: e424ca70 */ swc1 $f4,%lo(var8009ca70)($at) +/* 4f9ec: 3c01800a */ lui $at,%hi(var8009ca70) /* 4f9f0: c7ac0034 */ lwc1 $f12,0x34($sp) -/* 4f9f4: c426ca70 */ lwc1 $f6,-0x3590($at) +/* 4f9f4: c426ca70 */ lwc1 $f6,%lo(var8009ca70)($at) /* 4f9f8: 46066302 */ mul.s $f12,$f12,$f6 /* 4f9fc: 0c0068f7 */ jal sinf /* 4fa00: e7ac0034 */ swc1 $f12,0x34($sp)