From 640c20964fd92e64fedf6a94b471eb0dd501e796 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 21 Mar 2020 09:55:41 +1000 Subject: [PATCH] Improve pointers to .data --- src/boot/boot.c | 34 ++-- src/game/bondeyespy.c | 20 +- src/game/bondgrab.c | 8 +- src/game/camdraw.c | 56 +++--- src/game/chr/chraction.c | 132 ++++++------- src/game/chr/chraicommands.c | 12 +- src/game/dlights.c | 40 ++-- src/game/game_000130.c | 4 +- src/game/game_006bd0.c | 28 +-- src/game/game_00b210.c | 4 +- src/game/game_00b320.c | 4 +- src/game/game_00b480.c | 72 +++---- src/game/game_00b820.c | 32 +-- src/game/game_00c490.c | 116 +++++------ src/game/game_0109d0.c | 8 +- src/game/game_010b20.c | 4 +- src/game/game_011110.c | 68 +++---- src/game/game_013010.c | 8 +- src/game/game_013260.c | 4 +- src/game/game_0132a0.c | 8 +- src/game/game_013550.c | 4 +- src/game/game_013cf0.c | 8 +- src/game/game_0147d0.c | 4 +- src/game/game_015280.c | 4 +- src/game/game_015470.c | 12 +- src/game/game_016100.c | 368 +++++++++++++++++------------------ src/game/game_01b0a0.c | 8 +- src/game/game_01bea0.c | 72 +++---- src/game/game_01e250.c | 60 +++--- src/game/game_02cde0.c | 16 +- src/game/game_092610.c | 8 +- src/game/game_095320.c | 4 +- src/game/game_097ba0.c | 54 ++--- src/game/game_0abe70.c | 4 +- src/game/game_0b0420.c | 12 +- src/game/game_0b63b0.c | 132 ++++++------- src/game/game_0d4690.c | 4 +- src/game/game_0d5a90.c | 16 +- src/game/game_0d7070.c | 12 +- src/game/game_0dcdb0.c | 56 +++--- src/game/game_0e0770.c | 16 +- src/game/game_0e5ce0.c | 96 ++++----- src/game/game_0f09f0.c | 60 +++--- src/game/game_0fd660.c | 12 +- src/game/game_102240.c | 84 ++++---- src/game/game_107fb0.c | 32 +-- src/game/game_10c9c0.c | 8 +- src/game/game_10ccd0.c | 52 ++--- src/game/game_11ecf0.c | 8 +- src/game/game_129900.c | 28 +-- src/game/game_12d3f0.c | 4 +- src/game/game_12f6c0.c | 4 +- src/game/game_131060.c | 4 +- src/game/game_1371b0.c | 32 +-- src/game/game_13b670.c | 48 ++--- src/game/game_141820.c | 16 +- src/game/game_1531a0.c | 160 +++++++-------- src/game/game_157db0.c | 48 ++--- src/game/game_1655c0.c | 8 +- src/game/game_165670.c | 4 +- src/game/game_166e40.c | 28 +-- src/game/game_167ae0.c | 46 ++--- src/game/game_16cfa0.c | 80 ++++---- src/game/game_16e810.c | 16 +- src/game/game_173a00.c | 32 +-- src/game/game_176080.c | 16 +- src/game/game_177e00.c | 4 +- src/game/game_179060.c | 72 +++---- src/game/game_17f930.c | 12 +- src/game/game_18e5a0.c | 16 +- src/game/game_197600.c | 6 +- src/game/game_19aa80.c | 16 +- src/game/game_19c990.c | 48 ++--- src/game/game_1a3340.c | 12 +- src/game/mplayer.c | 76 ++++---- src/game/pak/pak.c | 72 +++---- src/game/propobj.c | 134 ++++++------- src/game/utils.c | 20 +- src/game/wallhit.c | 12 +- src/lib/lib_03050.c | 4 +- src/lib/lib_034f0.c | 8 +- src/lib/lib_04a80.c | 12 +- src/lib/lib_08a20.c | 16 +- src/lib/lib_09660.c | 90 ++++----- src/lib/lib_0c000.c | 6 +- src/lib/lib_0d0a0.c | 4 +- src/lib/lib_0d520.c | 92 ++++----- src/lib/lib_0e9d0.c | 100 +++++----- src/lib/lib_11420.c | 20 +- src/lib/lib_12dc0.c | 8 +- src/lib/lib_13900.c | 114 +++++------ src/lib/lib_16110.c | 8 +- src/lib/lib_1a500.c | 12 +- src/lib/lib_233c0.c | 102 +++++----- src/lib/lib_2f490.c | 4 +- src/lib/lib_2fba0.c | 16 +- src/lib/lib_30ce0.c | 18 +- src/lib/lib_317f0.c | 190 +++++++++--------- src/lib/lib_37b00.c | 20 +- src/lib/lib_3c4d0.c | 12 +- src/lib/lib_3e730.c | 20 +- src/lib/lib_43dd0.c | 4 +- src/lib/lib_48520.c | 4 +- src/lib/lib_49640.c | 8 +- src/lib/lib_49a90.c | 4 +- src/lib/lib_49c20.c | 4 +- src/lib/lib_4a810.c | 4 +- src/lib/lib_4a980.c | 4 +- src/lib/lib_4ba90.c | 4 +- src/lib/lib_4c090.c | 8 +- src/lib/lib_4e3c0.c | 8 +- src/lib/lib_4f5e0.c | 4 +- src/lib/lib_51890.c | 4 +- src/lib/lib_51a60.c | 4 +- 114 files changed, 1951 insertions(+), 1951 deletions(-) diff --git a/src/boot/boot.c b/src/boot/boot.c index b894aabac..6147b6c26 100644 --- a/src/boot/boot.c +++ b/src/boot/boot.c @@ -701,18 +701,18 @@ glabel func000018ac /* 18b0: 2529ce48 */ addiu $t1,$t1,%lo(var8005ce48) /* 18b4: 8d230000 */ lw $v1,0x0($t1) /* 18b8: 00041080 */ sll $v0,$a0,0x2 -/* 18bc: 3c018006 */ lui $at,0x8006 +/* 18bc: 3c018006 */ lui $at,%hi(var8005ce2c) /* 18c0: 00220821 */ addu $at,$at,$v0 -/* 18c4: ac23ce2c */ sw $v1,-0x31d4($at) +/* 18c4: ac23ce2c */ sw $v1,%lo(var8005ce2c)($at) /* 18c8: 2401fff0 */ addiu $at,$zero,-16 /* 18cc: 24a5000f */ addiu $a1,$a1,0xf /* 18d0: 00a17024 */ and $t6,$a1,$at -/* 18d4: 3c018006 */ lui $at,0x8006 +/* 18d4: 3c018006 */ lui $at,%hi(var8005ce10) /* 18d8: 006e7823 */ subu $t7,$v1,$t6 /* 18dc: ad2f0000 */ sw $t7,0x0($t1) /* 18e0: 00220821 */ addu $at,$at,$v0 /* 18e4: 01c02825 */ or $a1,$t6,$zero -/* 18e8: ac2fce10 */ sw $t7,-0x31f0($at) +/* 18e8: ac2fce10 */ sw $t7,%lo(var8005ce10)($at) /* 18ec: 01e01825 */ or $v1,$t7,$zero /* 18f0: 19c0000d */ blez $t6,.L00001928 /* 18f4: 00004025 */ or $t0,$zero,$zero @@ -1683,14 +1683,14 @@ glabel func00002768 /* 27a4: 11000092 */ beqz $t0,.L000029f0 /* 27a8: 30490020 */ andi $t1,$v0,0x20 /* 27ac: 11200090 */ beqz $t1,.L000029f0 -/* 27b0: 3c0a8006 */ lui $t2,%hi(var8006000c) -/* 27b4: 8d4acec8 */ lw $t2,-0x3138($t2) +/* 27b0: 3c0a8006 */ lui $t2,%hi(var8005cec8) +/* 27b4: 8d4acec8 */ lw $t2,%lo(var8005cec8)($t2) /* 27b8: 11400005 */ beqz $t2,.L000027d0 /* 27bc: 00000000 */ sll $zero,$zero,0x0 /* 27c0: 0c012338 */ jal func00048ce0 /* 27c4: 00002025 */ or $a0,$zero,$zero -/* 27c8: 3c018006 */ lui $at,0x8006 -/* 27cc: ac20cec8 */ sw $zero,-0x3138($at) +/* 27c8: 3c018006 */ lui $at,%hi(var8005cec8) +/* 27cc: ac20cec8 */ sw $zero,%lo(var8005cec8)($at) .L000027d0: /* 27d0: 3c078006 */ lui $a3,%hi(var8005ce74) /* 27d4: 24e7ce74 */ addiu $a3,$a3,%lo(var8005ce74) @@ -1766,7 +1766,7 @@ glabel func00002768 /* 28e4: 8dcedd60 */ lw $t6,%lo(var8008dd60)($t6) .L000028e8: /* 28e8: 8d410000 */ lw $at,0x0($t2) -/* 28ec: 254a000c */ addiu $t2,$t2,%lo(var8006000c) +/* 28ec: 254a000c */ addiu $t2,$t2,12 /* 28f0: 25ce000c */ addiu $t6,$t6,12 /* 28f4: adc1fff4 */ sw $at,-0xc($t6) /* 28f8: 8d41fff8 */ lw $at,-0x8($t2) @@ -1788,9 +1788,9 @@ glabel func00002768 /* 2938: 008f2021 */ addu $a0,$a0,$t7 /* 293c: 0c012354 */ jal func00048d50 /* 2940: 8c84dd64 */ lw $a0,%lo(var8008dd64)($a0) -/* 2944: 3c048006 */ lui $a0,0x8006 +/* 2944: 3c048006 */ lui $a0,%hi(var8005ce90+0x3) /* 2948: 0c012338 */ jal func00048ce0 -/* 294c: 9084ce93 */ lbu $a0,-0x316d($a0) +/* 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 @@ -1825,8 +1825,8 @@ glabel func00002768 /* 29c4: 28410003 */ slti $at,$v0,0x3 /* 29c8: 10200003 */ beqz $at,.L000029d8 /* 29cc: 2459ffff */ addiu $t9,$v0,-1 -/* 29d0: 3c018006 */ lui $at,0x8006 -/* 29d4: ac39ce90 */ sw $t9,-0x3170($at) +/* 29d0: 3c018006 */ lui $at,%hi(var8005ce90) +/* 29d4: ac39ce90 */ sw $t9,%lo(var8005ce90)($at) .L000029d8: /* 29d8: 8fa8001c */ lw $t0,0x1c($sp) /* 29dc: 0c0006d0 */ jal func00001b40 @@ -2158,9 +2158,9 @@ glabel func00002e00 /* 2e1c: 0c0121bc */ jal osRecvMesg /* 2e20: 24060001 */ addiu $a2,$zero,0x1 /* 2e24: 240e0001 */ addiu $t6,$zero,0x1 -/* 2e28: 3c018006 */ lui $at,0x8006 +/* 2e28: 3c018006 */ lui $at,%hi(var8005ced0) /* 2e2c: 0c002449 */ jal func00009124 -/* 2e30: a02eced0 */ sb $t6,-0x3130($at) +/* 2e30: a02eced0 */ sb $t6,%lo(var8005ced0)($at) /* 2e34: 3c048009 */ lui $a0,%hi(var8008d6d0) /* 2e38: 0c0120dc */ jal osStopThread /* 2e3c: 2484d6d0 */ addiu $a0,$a0,%lo(var8008d6d0) @@ -2172,12 +2172,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,%hi(var8005f7b0) +/* 2e60: 3c048006 */ lui $a0,0x8006 /* 2e64: 3c048006 */ lui $a0,%hi(var80060070) /* 2e68: 10000002 */ beqz $zero,.L00002e74 /* 2e6c: 24840070 */ addiu $a0,$a0,%lo(var80060070) .L00002e70: -/* 2e70: 2484f7b0 */ addiu $a0,$a0,%lo(var8005f7b0) +/* 2e70: 2484f7b0 */ addiu $a0,$a0,-2128 .L00002e74: /* 2e74: ac82002c */ sw $v0,0x2c($a0) /* 2e78: 0c012354 */ jal func00048d50 diff --git a/src/game/bondeyespy.c b/src/game/bondeyespy.c index b61ff64d3..0dad674f7 100644 --- a/src/game/bondeyespy.c +++ b/src/game/bondeyespy.c @@ -393,10 +393,10 @@ glabel func0f0cf38c /* f0cf6b0: afad004c */ sw $t5,0x4c($sp) /* f0cf6b4: 8fae004c */ lw $t6,0x4c($sp) /* f0cf6b8: 240f0001 */ addiu $t7,$zero,0x1 -/* f0cf6bc: 3c018007 */ lui $at,0x8007 +/* f0cf6bc: 3c018007 */ lui $at,%hi(var80070ec0) /* f0cf6c0: 544e0003 */ bnel $v0,$t6,.L0f0cf6d0 /* f0cf6c4: 02002025 */ or $a0,$s0,$zero -/* f0cf6c8: a02f0ec0 */ sb $t7,0xec0($at) +/* f0cf6c8: a02f0ec0 */ sb $t7,%lo(var80070ec0)($at) .L0f0cf6cc: /* f0cf6cc: 02002025 */ or $a0,$s0,$zero .L0f0cf6d0: @@ -2179,8 +2179,8 @@ glabel var7f1adb00 .L0f0d0f70: /* f0d0f70: 3c013f80 */ lui $at,0x3f80 /* f0d0f74: 44816000 */ mtc1 $at,$f12 -/* f0d0f78: 3c018007 */ lui $at,0x8007 -/* f0d0f7c: a0200ec0 */ sb $zero,0xec0($at) +/* f0d0f78: 3c018007 */ lui $at,%hi(var80070ec0) +/* f0d0f7c: a0200ec0 */ sb $zero,%lo(var80070ec0)($at) /* f0d0f80: c522004c */ lwc1 $f2,0x4c($t1) /* f0d0f84: 46006006 */ mov.s $f0,$f12 /* f0d0f88: 4602603c */ c.lt.s $f12,$f2 @@ -2827,7 +2827,7 @@ glabel var7f1adb00 /* f0d1908: 3c028007 */ lui $v0,%hi(var80070ec4) /* f0d190c: 24420ec4 */ addiu $v0,$v0,%lo(var80070ec4) /* f0d1910: 46002282 */ mul.s $f10,$f4,$f0 -/* f0d1914: 3c018007 */ lui $at,0x8007 +/* f0d1914: 3c018007 */ lui $at,%hi(var80070ec8) /* f0d1918: e46a0044 */ swc1 $f10,0x44($v1) /* f0d191c: 8d2e0284 */ lw $t6,0x284($t1) /* f0d1920: 8dc30480 */ lw $v1,0x480($t6) @@ -2896,11 +2896,11 @@ glabel var7f1adb00 /* f0d1a1c: 46085182 */ mul.s $f6,$f10,$f8 /* f0d1a20: e4660018 */ swc1 $f6,0x18($v1) /* f0d1a24: 904e0000 */ lbu $t6,0x0($v0) -/* f0d1a28: a02e0ec8 */ sb $t6,0xec8($at) +/* f0d1a28: a02e0ec8 */ sb $t6,%lo(var80070ec8)($at) /* f0d1a2c: a0400000 */ sb $zero,0x0($v0) -/* f0d1a30: 3c018007 */ lui $at,0x8007 +/* f0d1a30: 3c018007 */ lui $at,%hi(var80070ecc) /* f0d1a34: 0fc33f89 */ jal func0f0cfe24 -/* f0d1a38: a0200ecc */ sb $zero,0xecc($at) +/* f0d1a38: a0200ecc */ sb $zero,%lo(var80070ecc)($at) /* f0d1a3c: 3c09800a */ lui $t1,%hi(g_Vars) /* f0d1a40: 25299fc0 */ addiu $t1,$t1,%lo(g_Vars) /* f0d1a44: 8d390284 */ lw $t9,0x284($t1) @@ -3210,8 +3210,8 @@ glabel var7f1adb00 /* f0d1ed0: 3c09800a */ lui $t1,%hi(g_Vars) /* f0d1ed4: 14400003 */ bnez $v0,.L0f0d1ee4 /* f0d1ed8: 25299fc0 */ addiu $t1,$t1,%lo(g_Vars) -/* f0d1edc: 3c018007 */ lui $at,0x8007 -/* f0d1ee0: a0200ec0 */ sb $zero,0xec0($at) +/* f0d1edc: 3c018007 */ lui $at,%hi(var80070ec0) +/* f0d1ee0: a0200ec0 */ sb $zero,%lo(var80070ec0)($at) .L0f0d1ee4: /* f0d1ee4: 8d2d0284 */ lw $t5,0x284($t1) .L0f0d1ee8: diff --git a/src/game/bondgrab.c b/src/game/bondgrab.c index afc055494..25d8d2795 100644 --- a/src/game/bondgrab.c +++ b/src/game/bondgrab.c @@ -539,9 +539,9 @@ glabel var7f1ad9c4 /* f0cd1a4: 27bdff10 */ addiu $sp,$sp,-240 /* f0cd1a8: afb00038 */ sw $s0,0x38($sp) /* f0cd1ac: 3c10800a */ lui $s0,%hi(g_Vars) -/* f0cd1b0: 3c018007 */ lui $at,0x8007 +/* f0cd1b0: 3c018007 */ lui $at,%hi(var80070e80) /* f0cd1b4: 26109fc0 */ addiu $s0,$s0,%lo(g_Vars) -/* f0cd1b8: ac200e80 */ sw $zero,0xe80($at) +/* f0cd1b8: ac200e80 */ sw $zero,%lo(var80070e80)($at) /* f0cd1bc: 8e0f0284 */ lw $t7,0x284($s0) /* f0cd1c0: 240e0001 */ addiu $t6,$zero,0x1 /* f0cd1c4: afbf003c */ sw $ra,0x3c($sp) @@ -923,8 +923,8 @@ glabel var7f1ad9c4 /* f0cd758: e7a40084 */ swc1 $f4,0x84($sp) /* f0cd75c: 240d0001 */ addiu $t5,$zero,0x1 .L0f0cd760: -/* f0cd760: 3c018007 */ lui $at,0x8007 -/* f0cd764: ac2d0e80 */ sw $t5,0xe80($at) +/* f0cd760: 3c018007 */ lui $at,%hi(var80070e80) +/* f0cd764: ac2d0e80 */ sw $t5,%lo(var80070e80)($at) /* f0cd768: 8d0e1b5c */ lw $t6,0x1b5c($t0) /* f0cd76c: c7a6007c */ lwc1 $f6,0x7c($sp) /* f0cd770: 3c02800a */ lui $v0,%hi(var8009de78) diff --git a/src/game/camdraw.c b/src/game/camdraw.c index 06ad34180..3afc06dec 100644 --- a/src/game/camdraw.c +++ b/src/game/camdraw.c @@ -450,10 +450,10 @@ glabel func0f149d58 /* f149d9c: 3c188008 */ lui $t8,%hi(var8007f9d4) /* f149da0: 8f18f9d4 */ lw $t8,%lo(var8007f9d4)($t8) /* f149da4: 3c07800a */ lui $a3,%hi(var800a45a0) -/* f149da8: 3c018008 */ lui $at,0x8008 +/* f149da8: 3c018008 */ lui $at,%hi(var8007f9d4) /* f149dac: 27190001 */ addiu $t9,$t8,0x1 /* f149db0: 24e745a0 */ addiu $a3,$a3,%lo(var800a45a0) -/* f149db4: ac39f9d4 */ sw $t9,-0x62c($at) +/* f149db4: ac39f9d4 */ sw $t9,%lo(var8007f9d4)($at) /* f149db8: 8ce40000 */ lw $a0,0x0($a3) /* f149dbc: 00403025 */ or $a2,$v0,$zero /* f149dc0: 00001825 */ or $v1,$zero,$zero @@ -880,8 +880,8 @@ glabel func0f14a328 /* f14a360: 02002025 */ or $a0,$s0,$zero /* f14a364: 0c0048f2 */ jal malloc /* f14a368: 24050006 */ addiu $a1,$zero,0x6 -/* f14a36c: 3c018008 */ lui $at,0x8008 -/* f14a370: ac22f8dc */ sw $v0,-0x724($at) +/* f14a36c: 3c018008 */ lui $at,%hi(var8007f8dc) +/* f14a370: ac22f8dc */ sw $v0,%lo(var8007f8dc)($at) /* f14a374: 02202025 */ or $a0,$s1,$zero /* f14a378: 0c0048f2 */ jal malloc /* f14a37c: 24050006 */ addiu $a1,$zero,0x6 @@ -2804,21 +2804,21 @@ glabel func0f14bdbc .L0f14be54: /* f14be54: accb00f4 */ sw $t3,0xf4($a2) /* f14be58: 8fac0020 */ lw $t4,0x20($sp) -/* f14be5c: 3c018007 */ lui $at,0x8007 +/* f14be5c: 3c018007 */ lui $at,%hi(g_MpPlayerNum) /* f14be60: 0fc3c328 */ jal func0f0f0ca0 -/* f14be64: ac2c1448 */ sw $t4,0x1448($at) +/* f14be64: ac2c1448 */ sw $t4,%lo(g_MpPlayerNum)($at) /* f14be68: 0fc5281b */ jal func0f14a06c /* f14be6c: 2404ffff */ addiu $a0,$zero,-1 /* f14be70: 904d03f4 */ lbu $t5,0x3f4($v0) -/* f14be74: 3c018007 */ lui $at,0x8007 +/* f14be74: 3c018007 */ lui $at,%hi(g_MpPlayerNum) /* f14be78: 31aeff7f */ andi $t6,$t5,0xff7f /* f14be7c: a04e03f4 */ sb $t6,0x3f4($v0) /* f14be80: 8faf0020 */ lw $t7,0x20($sp) /* f14be84: 0fc3cdb7 */ jal menuPopDialog -/* f14be88: ac2f1448 */ sw $t7,0x1448($at) -/* f14be8c: 3c018007 */ lui $at,0x8007 +/* f14be88: ac2f1448 */ sw $t7,%lo(g_MpPlayerNum)($at) +/* f14be8c: 3c018007 */ lui $at,%hi(g_MpPlayerNum) /* f14be90: 10000009 */ beqz $zero,.L0f14beb8 -/* f14be94: ac201448 */ sw $zero,0x1448($at) +/* f14be94: ac201448 */ sw $zero,%lo(g_MpPlayerNum)($at) .L0f14be98: /* f14be98: 0fc52969 */ jal func0f14a5a4 /* f14be9c: afa6001c */ sw $a2,0x1c($sp) @@ -3028,23 +3028,23 @@ glabel var7f1b7320 /* f14c160: 0fc4751e */ jal func0f11d478 /* f14c164: 01e02025 */ or $a0,$t7,$zero /* f14c168: 8fa80030 */ lw $t0,0x30($sp) -/* f14c16c: 3c018007 */ lui $at,0x8007 +/* f14c16c: 3c018007 */ lui $at,%hi(g_MpPlayerNum) /* f14c170: 2404ffff */ addiu $a0,$zero,-1 /* f14c174: 00002825 */ or $a1,$zero,$zero /* f14c178: 0fc3c328 */ jal func0f0f0ca0 -/* f14c17c: ac281448 */ sw $t0,0x1448($at) +/* f14c17c: ac281448 */ sw $t0,%lo(g_MpPlayerNum)($at) /* f14c180: 0fc5299e */ jal func0f14a678 /* f14c184: 00000000 */ sll $zero,$zero,0x0 /* f14c188: 8fa20028 */ lw $v0,0x28($sp) -/* f14c18c: 3c018007 */ lui $at,0x8007 +/* f14c18c: 3c018007 */ lui $at,%hi(g_MpPlayerNum) /* f14c190: 904903f4 */ lbu $t1,0x3f4($v0) /* f14c194: 35380080 */ ori $t8,$t1,0x80 /* f14c198: a05803f4 */ sb $t8,0x3f4($v0) /* f14c19c: 8faa0030 */ lw $t2,0x30($sp) /* f14c1a0: 0fc4088c */ jal func0f102230 -/* f14c1a4: ac2a1448 */ sw $t2,0x1448($at) -/* f14c1a8: 3c018007 */ lui $at,0x8007 -/* f14c1ac: ac201448 */ sw $zero,0x1448($at) +/* f14c1a4: ac2a1448 */ sw $t2,%lo(g_MpPlayerNum)($at) +/* f14c1a8: 3c018007 */ lui $at,%hi(g_MpPlayerNum) +/* f14c1ac: ac201448 */ sw $zero,%lo(g_MpPlayerNum)($at) /* f14c1b0: 240b0006 */ addiu $t3,$zero,0x6 /* f14c1b4: ae0b00f4 */ sw $t3,0xf4($s0) .L0f14c1b8: @@ -3288,8 +3288,8 @@ glabel var7f1b7338 /* f14c4dc: 240e0004 */ addiu $t6,$zero,0x4 /* f14c4e0: 01f8c821 */ addu $t9,$t7,$t8 /* f14c4e4: af2e00f4 */ sw $t6,0xf4($t9) -/* f14c4e8: 3c018007 */ lui $at,0x8007 -/* f14c4ec: ac241448 */ sw $a0,0x1448($at) +/* f14c4e8: 3c018007 */ lui $at,%hi(g_MpPlayerNum) +/* f14c4ec: ac241448 */ sw $a0,%lo(g_MpPlayerNum)($at) /* f14c4f0: 24040002 */ addiu $a0,$zero,0x2 /* f14c4f4: 0fc3c328 */ jal func0f0f0ca0 /* f14c4f8: 00002825 */ or $a1,$zero,$zero @@ -4042,8 +4042,8 @@ glabel var7f1b734c .text /* f14cf6c: 27bdffe8 */ addiu $sp,$sp,-24 /* f14cf70: afbf0014 */ sw $ra,0x14($sp) -/* f14cf74: 3c018007 */ lui $at,0x8007 -/* f14cf78: ac201448 */ sw $zero,0x1448($at) +/* f14cf74: 3c018007 */ lui $at,%hi(g_MpPlayerNum) +/* f14cf78: ac201448 */ sw $zero,%lo(g_MpPlayerNum)($at) /* f14cf7c: 2404ffff */ addiu $a0,$zero,-1 /* f14cf80: 0fc3c328 */ jal func0f0f0ca0 /* f14cf84: 00002825 */ or $a1,$zero,$zero @@ -4084,8 +4084,8 @@ glabel var7f1b734c /* f14d010: 24050003 */ addiu $a1,$zero,0x3 /* f14d014: 0fc45c6d */ jal func0f1171b4 /* f14d018: 00003025 */ or $a2,$zero,$zero -/* f14d01c: 3c018007 */ lui $at,0x8007 -/* f14d020: ac201448 */ sw $zero,0x1448($at) +/* f14d01c: 3c018007 */ lui $at,%hi(g_MpPlayerNum) +/* f14d020: ac201448 */ sw $zero,%lo(g_MpPlayerNum)($at) /* f14d024: 2404ffff */ addiu $a0,$zero,-1 /* f14d028: 0fc3c328 */ jal func0f0f0ca0 /* f14d02c: 00002825 */ or $a1,$zero,$zero @@ -4129,11 +4129,11 @@ glabel func0f14d064 /* f14d0ac: ae080064 */ sw $t0,0x64($s0) /* f14d0b0: ae090060 */ sw $t1,0x60($s0) /* f14d0b4: 8faa0020 */ lw $t2,0x20($sp) -/* f14d0b8: 3c018007 */ lui $at,0x8007 +/* f14d0b8: 3c018007 */ lui $at,%hi(g_MpPlayerNum) /* f14d0bc: 24040001 */ addiu $a0,$zero,0x1 /* f14d0c0: 00002825 */ or $a1,$zero,$zero /* f14d0c4: 0fc3c328 */ jal func0f0f0ca0 -/* f14d0c8: ac2a1448 */ sw $t2,0x1448($at) +/* f14d0c8: ac2a1448 */ sw $t2,%lo(g_MpPlayerNum)($at) /* f14d0cc: 0fc5285b */ jal func0f14a16c /* f14d0d0: 24040001 */ addiu $a0,$zero,0x1 /* f14d0d4: 0fc52969 */ jal func0f14a5a4 @@ -4236,11 +4236,11 @@ glabel func0f14d064 /* f14d22c: ae0c00f8 */ sw $t4,0xf8($s0) /* f14d230: ae0d0100 */ sw $t5,0x100($s0) /* f14d234: 8fae0020 */ lw $t6,0x20($sp) -/* f14d238: 3c018007 */ lui $at,0x8007 +/* f14d238: 3c018007 */ lui $at,%hi(g_MpPlayerNum) /* f14d23c: 2404ffff */ addiu $a0,$zero,-1 /* f14d240: 00002825 */ or $a1,$zero,$zero /* f14d244: 0fc3c328 */ jal func0f0f0ca0 -/* f14d248: ac2e1448 */ sw $t6,0x1448($at) +/* f14d248: ac2e1448 */ sw $t6,%lo(g_MpPlayerNum)($at) /* f14d24c: 0fc52969 */ jal func0f14a5a4 /* f14d250: 00000000 */ sll $zero,$zero,0x0 /* f14d254: 00022600 */ sll $a0,$v0,0x18 @@ -8033,10 +8033,10 @@ glabel func0f15015c /* f1506d4: a078009d */ sb $t8,0x9d($v1) /* f1506d8: 00102600 */ sll $a0,$s0,0x18 /* f1506dc: 24090001 */ addiu $t1,$zero,0x1 -/* f1506e0: 3c018007 */ lui $at,0x8007 +/* f1506e0: 3c018007 */ lui $at,%hi(var80075bdc) /* f1506e4: 00047603 */ sra $t6,$a0,0x18 /* f1506e8: 27aa1044 */ addiu $t2,$sp,0x1044 -/* f1506ec: ac295bdc */ sw $t1,0x5bdc($at) +/* f1506ec: ac295bdc */ sw $t1,%lo(var80075bdc)($at) /* f1506f0: afaa0010 */ sw $t2,0x10($sp) /* f1506f4: 01c02025 */ or $a0,$t6,$zero /* f1506f8: 02402825 */ or $a1,$s2,$zero diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c index 148549adf..f9c518cbf 100644 --- a/src/game/chr/chraction.c +++ b/src/game/chr/chraction.c @@ -3535,8 +3535,8 @@ glabel var7f1a8d18 /* f031470: 3c014180 */ lui $at,0x4180 /* f031474: 44812000 */ mtc1 $at,$f4 /* f031478: 3c058006 */ lui $a1,%hi(var80067d28) -/* f03147c: 3c078006 */ lui $a3,%hi(var80060004) -/* f031480: 8ce77d38 */ lw $a3,0x7d38($a3) +/* f03147c: 3c078006 */ lui $a3,%hi(var80067d38) +/* f031480: 8ce77d38 */ lw $a3,%lo(var80067d38)($a3) /* f031484: 84a57d28 */ lh $a1,%lo(var80067d28)($a1) /* f031488: 8fa4008c */ lw $a0,0x8c($sp) /* f03148c: 8fa60098 */ lw $a2,0x98($sp) @@ -3696,7 +3696,7 @@ glabel var7f1a8d18 /* f0316b0: 26100001 */ addiu $s0,$s0,0x1 .L0f0316b4: /* f0316b4: 24010002 */ addiu $at,$zero,0x2 -/* f0316b8: 24e70004 */ addiu $a3,$a3,%lo(var80060004) +/* f0316b8: 24e70004 */ addiu $a3,$a3,4 /* f0316bc: 1601ffb6 */ bne $s0,$at,.L0f031598 /* f0316c0: 25080004 */ addiu $t0,$t0,0x4 /* f0316c4: a2320030 */ sb $s2,0x30($s1) @@ -4302,12 +4302,12 @@ glabel var7f1a8d44 /* f031ed8: a20f0362 */ sb $t7,0x362($s0) .L0f031edc: /* f031edc: 8fa20040 */ lw $v0,0x40($sp) -/* f031ee0: 3c188006 */ lui $t8,0x8006 -/* f031ee4: 271852c8 */ addiu $t8,$t8,0x52c8 +/* f031ee0: 3c188006 */ lui $t8,%hi(var800652b8+0x10) +/* f031ee4: 271852c8 */ addiu $t8,$t8,%lo(var800652b8+0x10) /* f031ee8: 10580005 */ beq $v0,$t8,.L0f031f00 /* f031eec: a2000008 */ sb $zero,0x8($s0) -/* f031ef0: 3c0e8006 */ lui $t6,0x8006 -/* f031ef4: 25ce52c0 */ addiu $t6,$t6,0x52c0 +/* f031ef0: 3c0e8006 */ lui $t6,%hi(var800652b8+0x8) +/* f031ef4: 25ce52c0 */ addiu $t6,$t6,%lo(var800652b8+0x8) /* f031ef8: 144e0035 */ bne $v0,$t6,.L0f031fd0 /* f031efc: 3c188006 */ lui $t8,%hi(var800652b8) .L0f031f00: @@ -4349,11 +4349,11 @@ glabel var7f1a8d44 /* f031f88: e60402f8 */ swc1 $f4,0x2f8($s0) /* f031f8c: 8fb90040 */ lw $t9,0x40($sp) .L0f031f90: -/* f031f90: 3c0d8006 */ lui $t5,0x8006 -/* f031f94: 25ad52c0 */ addiu $t5,$t5,0x52c0 +/* f031f90: 3c0d8006 */ lui $t5,%hi(var800652b8+0x8) +/* f031f94: 25ad52c0 */ addiu $t5,$t5,%lo(var800652b8+0x8) /* f031f98: 172d02c5 */ bne $t9,$t5,.L0f032ab0 -/* f031f9c: 3c018007 */ lui $at,0x8007 -/* f031fa0: ac20807c */ sw $zero,-0x7f84($at) +/* f031f9c: 3c018007 */ lui $at,%hi(var8006807c) +/* f031fa0: ac20807c */ sw $zero,%lo(var8006807c)($at) /* f031fa4: 3c014180 */ lui $at,0x4180 /* f031fa8: 44815000 */ mtc1 $at,$f10 /* f031fac: ae000120 */ sw $zero,0x120($s0) @@ -4368,7 +4368,7 @@ glabel var7f1a8d44 .L0f031fd0: /* f031fd0: 271852b8 */ addiu $t8,$t8,%lo(var800652b8) /* f031fd4: 145801c9 */ bne $v0,$t8,.L0f0326fc -/* f031fd8: 3c198006 */ lui $t9,0x8006 +/* f031fd8: 3c198006 */ lui $t9,%hi(var80060000) /* f031fdc: 0c00744f */ jal animGetId /* f031fe0: 8e040020 */ lw $a0,0x20($s0) /* f031fe4: 24010269 */ addiu $at,$zero,0x269 @@ -4480,8 +4480,8 @@ glabel var7f1a8d44 /* f032178: 304f0003 */ andi $t7,$v0,0x3 /* f03217c: 000fc0c0 */ sll $t8,$t7,0x3 /* f032180: 030fc023 */ subu $t8,$t8,$t7 -/* f032184: 3c0e8006 */ lui $t6,0x8006 -/* f032188: 25ce3970 */ addiu $t6,$t6,0x3970 +/* f032184: 3c0e8006 */ lui $t6,%hi(var800637cc+0x1a4) +/* f032188: 25ce3970 */ addiu $t6,$t6,%lo(var800637cc+0x1a4) /* f03218c: 0018c080 */ sll $t8,$t8,0x2 /* f032190: 030e1821 */ addu $v1,$t8,$t6 /* f032194: c46a0014 */ lwc1 $f10,0x14($v1) @@ -4675,7 +4675,7 @@ glabel var7f1a8d44 /* f032458: 8fb90040 */ lw $t9,0x40($sp) /* f03245c: 8fa60034 */ lw $a2,0x34($sp) /* f032460: 8fa90038 */ lw $t1,0x38($sp) -/* f032464: 8f380000 */ lw $t8,0x0($t9) +/* f032464: 8f380000 */ lw $t8,%lo(var80060000)($t9) /* f032468: 9204032f */ lbu $a0,0x32f($s0) /* f03246c: 03061821 */ addu $v1,$t8,$a2 /* f032470: 8c6d000c */ lw $t5,0xc($v1) @@ -4706,8 +4706,8 @@ glabel var7f1a8d44 /* f0324cc: 01ed7823 */ subu $t7,$t7,$t5 /* f0324d0: 000f7880 */ sll $t7,$t7,0x2 /* f0324d4: 0018c080 */ sll $t8,$t8,0x2 -/* f0324d8: 3c198006 */ lui $t9,0x8006 -/* f0324dc: 27394e1c */ addiu $t9,$t9,0x4e1c +/* f0324d8: 3c198006 */ lui $t9,%hi(var80064de4+0x38) +/* f0324dc: 27394e1c */ addiu $t9,$t9,%lo(var80064de4+0x38) /* f0324e0: 030f7021 */ addu $t6,$t8,$t7 /* f0324e4: 01d94021 */ addu $t0,$t6,$t9 /* f0324e8: 04800022 */ bltz $a0,.L0f032574 @@ -4741,8 +4741,8 @@ glabel var7f1a8d44 /* f032550: 00000000 */ sll $zero,$zero,0x0 /* f032554: 920f032f */ lbu $t7,0x32f($s0) .L0f032558: -/* f032558: 3c0d8006 */ lui $t5,0x8006 -/* f03255c: 25ad4e1c */ addiu $t5,$t5,0x4e1c +/* f032558: 3c0d8006 */ lui $t5,%hi(var80064de4+0x38) +/* f03255c: 25ad4e1c */ addiu $t5,$t5,%lo(var80064de4+0x38) /* f032560: 000f70c0 */ sll $t6,$t7,0x3 /* f032564: 01cf7023 */ subu $t6,$t6,$t7 /* f032568: 000e7080 */ sll $t6,$t6,0x2 @@ -4754,8 +4754,8 @@ glabel var7f1a8d44 .L0f03257c: /* f03257c: 0304c023 */ subu $t8,$t8,$a0 /* f032580: 0018c080 */ sll $t8,$t8,0x2 -/* f032584: 3c0e8006 */ lui $t6,0x8006 -/* f032588: 25ce4e1c */ addiu $t6,$t6,0x4e1c +/* f032584: 3c0e8006 */ lui $t6,%hi(var80064de4+0x38) +/* f032588: 25ce4e1c */ addiu $t6,$t6,%lo(var80064de4+0x38) /* f03258c: 270fffe4 */ addiu $t7,$t8,-28 /* f032590: 01ee4021 */ addu $t0,$t7,$t6 .L0f032594: @@ -5073,8 +5073,8 @@ glabel var7f1a8d44 /* f032a24: 3c0f8006 */ lui $t7,%hi(var800652b8) /* f032a28: 25ef52b8 */ addiu $t7,$t7,%lo(var800652b8) /* f032a2c: 104f0004 */ beq $v0,$t7,.L0f032a40 -/* f032a30: 3c188006 */ lui $t8,0x8006 -/* f032a34: 271852bc */ addiu $t8,$t8,0x52bc +/* f032a30: 3c188006 */ lui $t8,%hi(var800652b8+0x4) +/* f032a34: 271852bc */ addiu $t8,$t8,%lo(var800652b8+0x4) /* f032a38: 5458001e */ bnel $v0,$t8,.L0f032ab4 /* f032a3c: 8fbf002c */ lw $ra,0x2c($sp) .L0f032a40: @@ -6202,18 +6202,18 @@ glabel func0f0338e0 /* f0339e8: 00000000 */ sll $zero,$zero,0x0 /* f0339ec: 8c42824c */ lw $v0,%lo(var8006824c)($v0) /* f0339f0: ac800000 */ sw $zero,0x0($a0) -/* f0339f4: 3c018007 */ lui $at,0x8007 +/* f0339f4: 3c018007 */ lui $at,%hi(var8006824c) /* f0339f8: 00025040 */ sll $t2,$v0,0x1 /* f0339fc: 006a5821 */ addu $t3,$v1,$t2 /* f033a00: 856c0000 */ lh $t4,0x0($t3) /* f033a04: 24420001 */ addiu $v0,$v0,0x1 -/* f033a08: ac22824c */ sw $v0,-0x7db4($at) +/* f033a08: ac22824c */ sw $v0,%lo(var8006824c)($at) /* f033a0c: 28410006 */ slti $at,$v0,0x6 /* f033a10: 142000dc */ bnez $at,.L0f033d84 /* f033a14: a7ac0112 */ sh $t4,0x112($sp) -/* f033a18: 3c018007 */ lui $at,0x8007 +/* f033a18: 3c018007 */ lui $at,%hi(var8006824c) /* f033a1c: 100000d9 */ beqz $zero,.L0f033d84 -/* f033a20: ac20824c */ sw $zero,-0x7db4($at) +/* f033a20: ac20824c */ sw $zero,%lo(var8006824c)($at) /* f033a24: 2401000f */ addiu $at,$zero,0xf .L0f033a28: /* f033a28: 10410007 */ beq $v0,$at,.L0f033a48 @@ -6241,16 +6241,16 @@ glabel func0f0338e0 /* f033a7c: 00184040 */ sll $t0,$t8,0x1 /* f033a80: 03a84821 */ addu $t1,$sp,$t0 /* f033a84: 852900f0 */ lh $t1,0xf0($t1) -/* f033a88: 3c018007 */ lui $at,0x8007 +/* f033a88: 3c018007 */ lui $at,%hi(var80068250) /* f033a8c: 24630001 */ addiu $v1,$v1,0x1 -/* f033a90: ac238250 */ sw $v1,-0x7db0($at) +/* f033a90: ac238250 */ sw $v1,%lo(var80068250)($at) /* f033a94: 28610003 */ slti $at,$v1,0x3 /* f033a98: 8fa50104 */ lw $a1,0x104($sp) /* f033a9c: 142000b9 */ bnez $at,.L0f033d84 /* f033aa0: a7a90112 */ sh $t1,0x112($sp) -/* f033aa4: 3c018007 */ lui $at,0x8007 +/* f033aa4: 3c018007 */ lui $at,%hi(var80068250) /* f033aa8: 100000b6 */ beqz $zero,.L0f033d84 -/* f033aac: ac208250 */ sw $zero,-0x7db0($at) +/* f033aac: ac208250 */ sw $zero,%lo(var80068250)($at) .L0f033ab0: /* f033ab0: 24010001 */ addiu $at,$zero,0x1 /* f033ab4: 1461003c */ bne $v1,$at,.L0f033ba8 @@ -6279,16 +6279,16 @@ glabel func0f0338e0 /* f033b10: 0019c040 */ sll $t8,$t9,0x1 /* f033b14: 03b84021 */ addu $t0,$sp,$t8 /* f033b18: 850800e4 */ lh $t0,0xe4($t0) -/* f033b1c: 3c018007 */ lui $at,0x8007 +/* f033b1c: 3c018007 */ lui $at,%hi(var80068254) /* f033b20: 24630001 */ addiu $v1,$v1,0x1 -/* f033b24: ac238254 */ sw $v1,-0x7dac($at) +/* f033b24: ac238254 */ sw $v1,%lo(var80068254)($at) /* f033b28: 28610005 */ slti $at,$v1,0x5 /* f033b2c: 8fa50104 */ lw $a1,0x104($sp) /* f033b30: 14200094 */ bnez $at,.L0f033d84 /* f033b34: a7a80112 */ sh $t0,0x112($sp) -/* f033b38: 3c018007 */ lui $at,0x8007 +/* f033b38: 3c018007 */ lui $at,%hi(var80068254) /* f033b3c: 10000091 */ beqz $zero,.L0f033d84 -/* f033b40: ac208254 */ sw $zero,-0x7dac($at) +/* f033b40: ac208254 */ sw $zero,%lo(var80068254)($at) .L0f033b44: /* f033b44: 8d410000 */ lw $at,0x0($t2) /* f033b48: 27a900dc */ addiu $t1,$sp,0xdc @@ -6305,16 +6305,16 @@ glabel func0f0338e0 /* f033b74: 000f7040 */ sll $t6,$t7,0x1 /* f033b78: 03aec821 */ addu $t9,$sp,$t6 /* f033b7c: 873900dc */ lh $t9,0xdc($t9) -/* f033b80: 3c018007 */ lui $at,0x8007 +/* f033b80: 3c018007 */ lui $at,%hi(var80068254) /* f033b84: 24630001 */ addiu $v1,$v1,0x1 -/* f033b88: ac238254 */ sw $v1,-0x7dac($at) +/* f033b88: ac238254 */ sw $v1,%lo(var80068254)($at) /* f033b8c: 28610003 */ slti $at,$v1,0x3 /* f033b90: 8fa50104 */ lw $a1,0x104($sp) /* f033b94: 1420007b */ bnez $at,.L0f033d84 /* f033b98: a7b90112 */ sh $t9,0x112($sp) -/* f033b9c: 3c018007 */ lui $at,0x8007 +/* f033b9c: 3c018007 */ lui $at,%hi(var80068254) /* f033ba0: 10000078 */ beqz $zero,.L0f033d84 -/* f033ba4: ac208254 */ sw $zero,-0x7dac($at) +/* f033ba4: ac208254 */ sw $zero,%lo(var80068254)($at) .L0f033ba8: /* f033ba8: 2401000a */ addiu $at,$zero,0xa /* f033bac: 14410021 */ bne $v0,$at,.L0f033c34 @@ -6342,13 +6342,13 @@ glabel func0f0338e0 /* f033c04: 8f010018 */ lw $at,0x18($t8) /* f033c08: ac610018 */ sw $at,0x18($v1) /* f033c0c: 852a0000 */ lh $t2,0x0($t1) -/* f033c10: 3c018007 */ lui $at,0x8007 -/* f033c14: ac228258 */ sw $v0,-0x7da8($at) +/* f033c10: 3c018007 */ lui $at,%hi(var80068258) +/* f033c14: ac228258 */ sw $v0,%lo(var80068258)($at) /* f033c18: 2841000e */ slti $at,$v0,0xe /* f033c1c: 14200003 */ bnez $at,.L0f033c2c /* f033c20: a7aa0112 */ sh $t2,0x112($sp) -/* f033c24: 3c018007 */ lui $at,0x8007 -/* f033c28: ac208258 */ sw $zero,-0x7da8($at) +/* f033c24: 3c018007 */ lui $at,%hi(var80068258) +/* f033c28: ac208258 */ sw $zero,%lo(var80068258)($at) .L0f033c2c: /* f033c2c: 10000055 */ beqz $zero,.L0f033d84 /* f033c30: 24050001 */ addiu $a1,$zero,0x1 @@ -6378,15 +6378,15 @@ glabel func0f0338e0 /* f033c88: a5010000 */ sh $at,0x0($t0) /* f033c8c: 85ab0000 */ lh $t3,0x0($t5) /* f033c90: 24420001 */ addiu $v0,$v0,0x1 -/* f033c94: 3c018007 */ lui $at,0x8007 -/* f033c98: ac22825c */ sw $v0,-0x7da4($at) +/* f033c94: 3c018007 */ lui $at,%hi(var8006825c) +/* f033c98: ac22825c */ sw $v0,%lo(var8006825c)($at) /* f033c9c: 28410019 */ slti $at,$v0,0x19 /* f033ca0: 24050001 */ addiu $a1,$zero,0x1 /* f033ca4: 14200037 */ bnez $at,.L0f033d84 /* f033ca8: a7ab0112 */ sh $t3,0x112($sp) -/* f033cac: 3c018007 */ lui $at,0x8007 +/* f033cac: 3c018007 */ lui $at,%hi(var8006825c) /* f033cb0: 10000034 */ beqz $zero,.L0f033d84 -/* f033cb4: ac20825c */ sw $zero,-0x7da4($at) +/* f033cb4: ac20825c */ sw $zero,%lo(var8006825c)($at) .L0f033cb8: /* f033cb8: 10410008 */ beq $v0,$at,.L0f033cdc /* f033cbc: 3c0a8007 */ lui $t2,%hi(var80068214) @@ -6432,14 +6432,14 @@ glabel func0f0338e0 /* f033d54: 00695021 */ addu $t2,$v1,$t1 /* f033d58: a4610004 */ sh $at,0x4($v1) /* f033d5c: 854e0000 */ lh $t6,0x0($t2) -/* f033d60: 3c018007 */ lui $at,0x8007 +/* f033d60: 3c018007 */ lui $at,%hi(var80068260) /* f033d64: 24420001 */ addiu $v0,$v0,0x1 -/* f033d68: ac228260 */ sw $v0,-0x7da0($at) +/* f033d68: ac228260 */ sw $v0,%lo(var80068260)($at) /* f033d6c: 28410003 */ slti $at,$v0,0x3 /* f033d70: 14200003 */ bnez $at,.L0f033d80 /* f033d74: a7ae0112 */ sh $t6,0x112($sp) -/* f033d78: 3c018007 */ lui $at,0x8007 -/* f033d7c: ac208260 */ sw $zero,-0x7da0($at) +/* f033d78: 3c018007 */ lui $at,%hi(var80068260) +/* f033d7c: ac208260 */ sw $zero,%lo(var80068260)($at) .L0f033d80: /* f033d80: 24050001 */ addiu $a1,$zero,0x1 .L0f033d84: @@ -27603,19 +27603,19 @@ glabel func0f048398 /* f0483c8: 3c1e8006 */ lui $s8,%hi(var80062cb0) /* f0483cc: 27de2cb0 */ addiu $s8,$s8,%lo(var80062cb0) /* f0483d0: afc00000 */ sw $zero,0x0($s8) -/* f0483d4: 3c018006 */ lui $at,0x8006 -/* f0483d8: ac202cb4 */ sw $zero,0x2cb4($at) +/* f0483d4: 3c018006 */ lui $at,%hi(var80062cb4) +/* f0483d8: ac202cb4 */ sw $zero,%lo(var80062cb4)($at) /* f0483dc: 3c0e800a */ lui $t6,%hi(g_Vars+0x318) /* f0483e0: 8dcea2d8 */ lw $t6,%lo(g_Vars+0x318)($t6) -/* f0483e4: 3c018006 */ lui $at,0x8006 -/* f0483e8: ac202cb8 */ sw $zero,0x2cb8($at) -/* f0483ec: 3c018006 */ lui $at,0x8006 +/* f0483e4: 3c018006 */ lui $at,%hi(var80062cb8) +/* f0483e8: ac202cb8 */ sw $zero,%lo(var80062cb8)($at) +/* f0483ec: 3c018006 */ lui $at,%hi(var80062cbc) /* f0483f0: afa200e0 */ sw $v0,0xe0($sp) /* f0483f4: afa000dc */ sw $zero,0xdc($sp) /* f0483f8: 00009025 */ or $s2,$zero,$zero /* f0483fc: 0000b025 */ or $s6,$zero,$zero /* f048400: 15c0005a */ bnez $t6,.L0f04856c -/* f048404: ac202cbc */ sw $zero,0x2cbc($at) +/* f048404: ac202cbc */ sw $zero,%lo(var80062cbc)($at) /* f048408: 18400058 */ blez $v0,.L0f04856c /* f04840c: 0000a825 */ or $s5,$zero,$zero /* f048410: 00009825 */ or $s3,$zero,$zero @@ -27718,14 +27718,14 @@ glabel func0f048398 .L0f04856c: /* f04856c: 3c028007 */ lui $v0,%hi(var80068454) /* f048570: 8c428454 */ lw $v0,%lo(var80068454)($v0) -/* f048574: 3c018007 */ lui $at,0x8007 +/* f048574: 3c018007 */ lui $at,%hi(var80068454) /* f048578: 0000a825 */ or $s5,$zero,$zero /* f04857c: 24420001 */ addiu $v0,$v0,0x1 -/* f048580: ac228454 */ sw $v0,-0x7bac($at) +/* f048580: ac228454 */ sw $v0,%lo(var80068454)($at) /* f048584: 2c41000b */ sltiu $at,$v0,0xb /* f048588: 14200002 */ bnez $at,.L0f048594 -/* f04858c: 3c018007 */ lui $at,0x8007 -/* f048590: ac208454 */ sw $zero,-0x7bac($at) +/* f04858c: 3c018007 */ lui $at,%hi(var80068454) +/* f048590: ac208454 */ sw $zero,%lo(var80068454)($at) .L0f048594: /* f048594: 0fc47bac */ jal func0f11eeb0 /* f048598: 00000000 */ sll $zero,$zero,0x0 @@ -27765,8 +27765,8 @@ glabel func0f048398 .L0f048614: /* f048614: 0fc11f20 */ jal chrTick /* f048618: 02622021 */ addu $a0,$s3,$v0 -/* f04861c: 3c038006 */ lui $v1,%hi(var80060004) -/* f048620: 8c637e60 */ lw $v1,0x7e60($v1) +/* f04861c: 3c038006 */ lui $v1,%hi(g_NumChrsB) +/* f048620: 8c637e60 */ lw $v1,%lo(g_NumChrsB)($v1) /* f048624: 26b50001 */ addiu $s5,$s5,0x1 .L0f048628: /* f048628: 02a3082a */ slt $at,$s5,$v1 @@ -27839,7 +27839,7 @@ glabel func0f048398 /* f04871c: 2a41000a */ slti $at,$s2,0xa /* f048720: ac640000 */ sw $a0,0x0($v1) /* f048724: 14200015 */ bnez $at,.L0f04877c -/* f048728: 24630004 */ addiu $v1,$v1,%lo(var80060004) +/* f048728: 24630004 */ addiu $v1,$v1,4 /* f04872c: 0c004b70 */ jal random /* f048730: afa30048 */ sw $v1,0x48($sp) /* f048734: 0052001b */ divu $zero,$v0,$s2 @@ -27876,8 +27876,8 @@ glabel func0f048398 /* f0487a0: 0334082a */ slt $at,$t9,$s4 /* f0487a4: 10200003 */ beqz $at,.L0f0487b4 /* f0487a8: 3c03800a */ lui $v1,%hi(g_Vars+0x38) -/* f0487ac: 3c018007 */ lui $at,0x8007 -/* f0487b0: ac348458 */ sw $s4,-0x7ba8($at) +/* f0487ac: 3c018007 */ lui $at,%hi(var80068458) +/* f0487b0: ac348458 */ sw $s4,%lo(var80068458)($at) .L0f0487b4: /* f0487b4: 8fa800dc */ lw $t0,0xdc($sp) /* f0487b8: 8c639ff8 */ lw $v1,%lo(g_Vars+0x38)($v1) diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 9b59f22e4..1bd6f3e2b 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -7923,14 +7923,14 @@ glabel aiSayQuip /* f05a868: 15600014 */ bnez $t3,.L0f05a8bc /* f05a86c: 28610003 */ slti $at,$v1,0x3 /* f05a870: 14200002 */ bnez $at,.L0f05a87c -/* f05a874: 3c048007 */ lui $a0,0x8007 +/* f05a874: 3c048007 */ lui $a0,%hi(g_SpecialQuipBank+0x16a) /* f05a878: 24030002 */ addiu $v1,$zero,0x2 .L0f05a87c: /* f05a87c: 00036840 */ sll $t5,$v1,0x1 /* f05a880: 018dc021 */ addu $t8,$t4,$t5 /* f05a884: 00982021 */ addu $a0,$a0,$t8 /* f05a888: 0fc5b9f1 */ jal langGet -/* f05a88c: 84849682 */ lh $a0,-0x697e($a0) +/* f05a88c: 84849682 */ lh $a0,%lo(g_SpecialQuipBank+0x16a)($a0) /* f05a890: afa20080 */ sw $v0,0x80($sp) /* f05a894: 0c004103 */ jal audioIsFiltered /* f05a898: 87a400a4 */ lh $a0,0xa4($sp) @@ -7947,13 +7947,13 @@ glabel aiSayQuip /* f05a8c0: 00000000 */ sll $zero,$zero,0x0 /* f05a8c4: 8e190424 */ lw $t9,0x424($s0) /* f05a8c8: 000278c0 */ sll $t7,$v0,0x3 -/* f05a8cc: 3c048007 */ lui $a0,0x8007 +/* f05a8cc: 3c048007 */ lui $a0,%hi(g_SpecialQuipBank+0x16a) /* f05a8d0: 932a02b0 */ lbu $t2,0x2b0($t9) /* f05a8d4: 000a4840 */ sll $t1,$t2,0x1 /* f05a8d8: 01e95821 */ addu $t3,$t7,$t1 /* f05a8dc: 008b2021 */ addu $a0,$a0,$t3 /* f05a8e0: 0fc5b9f1 */ jal langGet -/* f05a8e4: 84849682 */ lh $a0,-0x697e($a0) +/* f05a8e4: 84849682 */ lh $a0,%lo(g_SpecialQuipBank+0x16a)($a0) /* f05a8e8: afa20080 */ sw $v0,0x80($sp) /* f05a8ec: 0c004103 */ jal audioIsFiltered /* f05a8f0: 87a400a4 */ lh $a0,0xa4($sp) @@ -8114,14 +8114,14 @@ glabel aiSayQuip /* f05ab34: 8fb9009c */ lw $t9,0x9c($sp) .L0f05ab38: /* f05ab38: 00087840 */ sll $t7,$t0,0x1 -/* f05ab3c: 3c048007 */ lui $a0,0x8007 +/* f05ab3c: 3c048007 */ lui $a0,%hi(g_SpecialQuipBank+0x168) /* f05ab40: 93220008 */ lbu $v0,0x8($t9) /* f05ab44: 1040001a */ beqz $v0,.L0f05abb0 /* f05ab48: 000250c0 */ sll $t2,$v0,0x3 /* f05ab4c: 014f4821 */ addu $t1,$t2,$t7 /* f05ab50: 00892021 */ addu $a0,$a0,$t1 /* f05ab54: 0fc5b9f1 */ jal langGet -/* f05ab58: 84849680 */ lh $a0,-0x6980($a0) +/* f05ab58: 84849680 */ lh $a0,%lo(g_SpecialQuipBank+0x168)($a0) /* f05ab5c: afa20080 */ sw $v0,0x80($sp) /* f05ab60: 0c004103 */ jal audioIsFiltered /* f05ab64: 87a400a4 */ lh $a0,0xa4($sp) diff --git a/src/game/dlights.c b/src/game/dlights.c index d38ae844d..8dfe04691 100644 --- a/src/game/dlights.c +++ b/src/game/dlights.c @@ -1477,9 +1477,9 @@ glabel func0f001c0c /* f001c30: afb1001c */ sw $s1,0x1c($sp) /* f001c34: 0c012144 */ jal osGetCount /* f001c38: afb00018 */ sw $s0,0x18($sp) -/* f001c3c: 3c018006 */ lui $at,0x8006 +/* f001c3c: 3c018006 */ lui $at,%hi(var80061440) /* f001c40: 0fc008ee */ jal func0f0023b8 -/* f001c44: ac201440 */ sw $zero,0x1440($at) +/* f001c44: ac201440 */ sw $zero,%lo(var80061440)($at) /* f001c48: 3c17800a */ lui $s7,%hi(g_PortalSomethings) /* f001c4c: 26f74cc8 */ addiu $s7,$s7,%lo(g_PortalSomethings) /* f001c50: 8ee30000 */ lw $v1,0x0($s7) @@ -1539,10 +1539,10 @@ glabel func0f001c0c /* f001d20: 00000000 */ sll $zero,$zero,0x0 /* f001d24: 00531821 */ addu $v1,$v0,$s3 /* f001d28: 3c118006 */ lui $s1,%hi(var80061438) -/* f001d2c: 3c018006 */ lui $at,0x8006 +/* f001d2c: 3c018006 */ lui $at,%hi(var80061434) /* f001d30: 00743021 */ addu $a2,$v1,$s4 /* f001d34: 26311438 */ addiu $s1,$s1,%lo(var80061438) -/* f001d38: ac221434 */ sw $v0,0x1434($at) +/* f001d38: ac221434 */ sw $v0,%lo(var80061434)($at) /* f001d3c: 00de3821 */ addu $a3,$a2,$s8 /* f001d40: ae230000 */ sw $v1,0x0($s1) /* f001d44: afa60044 */ sw $a2,0x44($sp) @@ -1849,9 +1849,9 @@ glabel func0f00215c /* f002188: afb00014 */ sw $s0,0x14($sp) /* f00218c: ac2fcae4 */ sw $t7,%lo(var8009cae4)($at) /* f002190: 3c10800a */ lui $s0,%hi(g_Vars) -/* f002194: 3c018006 */ lui $at,0x8006 +/* f002194: 3c018006 */ lui $at,%hi(var80061440) /* f002198: 26109fc0 */ addiu $s0,$s0,%lo(g_Vars) -/* f00219c: ac201440 */ sw $zero,0x1440($at) +/* f00219c: ac201440 */ sw $zero,%lo(var80061440)($at) /* f0021a0: 8e1802bc */ lw $t8,0x2bc($s0) /* f0021a4: afb40024 */ sw $s4,0x24($sp) /* f0021a8: afb2001c */ sw $s2,0x1c($sp) @@ -2501,8 +2501,8 @@ glabel func0f002a98 /* f002abc: 8e6402bc */ lw $a0,0x2bc($s3) /* f002ac0: 3c01800a */ lui $at,%hi(var8009cae0) /* f002ac4: ac22cae0 */ sw $v0,%lo(var8009cae0)($at) -/* f002ac8: 3c018006 */ lui $at,0x8006 -/* f002acc: ac201458 */ sw $zero,0x1458($at) +/* f002ac8: 3c018006 */ lui $at,%hi(var80061458) +/* f002acc: ac201458 */ sw $zero,%lo(var80061458)($at) /* f002ad0: 8e6e02bc */ lw $t6,0x2bc($s3) /* f002ad4: a26004e1 */ sb $zero,0x4e1($s3) /* f002ad8: 24100001 */ addiu $s0,$zero,0x1 @@ -2526,12 +2526,12 @@ glabel func0f002a98 .L0f002b1c: /* f002b1c: 3c198009 */ lui $t9,%hi(g_Is4Mb) /* f002b20: 93390af0 */ lbu $t9,%lo(g_Is4Mb)($t9) -/* f002b24: 3c018006 */ lui $at,0x8006 -/* f002b28: ac201420 */ sw $zero,0x1420($at) +/* f002b24: 3c018006 */ lui $at,%hi(var80061420) +/* f002b28: ac201420 */ sw $zero,%lo(var80061420)($at) /* f002b2c: 24010001 */ addiu $at,$zero,0x1 /* f002b30: 17210002 */ bne $t9,$at,.L0f002b3c -/* f002b34: 3c018006 */ lui $at,0x8006 -/* f002b38: ac201444 */ sw $zero,0x1444($at) +/* f002b34: 3c018006 */ lui $at,%hi(var80061444) +/* f002b38: ac201444 */ sw $zero,%lo(var80061444)($at) .L0f002b3c: /* f002b3c: 8fbf0024 */ lw $ra,0x24($sp) /* f002b40: 8fb00014 */ lw $s0,0x14($sp) @@ -3417,8 +3417,8 @@ glabel func0f00372c /* f00378c: 3c02800a */ lui $v0,%hi(g_Vars+0x2ac) /* f003790: 8c42a26c */ lw $v0,%lo(g_Vars+0x2ac)($v0) .L0f003794: -/* f003794: 3c018006 */ lui $at,0x8006 -/* f003798: ac221458 */ sw $v0,0x1458($at) +/* f003794: 3c018006 */ lui $at,%hi(var80061458) +/* f003798: ac221458 */ sw $v0,%lo(var80061458)($at) .L0f00379c: /* f00379c: 8fbf0014 */ lw $ra,0x14($sp) /* f0037a0: 27bd0018 */ addiu $sp,$sp,0x18 @@ -4227,8 +4227,8 @@ glabel var7f1a7dd4 /* f0042cc: a02da4a1 */ sb $t5,%lo(g_Vars+0x4e1)($at) .L0f0042d0: /* f0042d0: 10600002 */ beqz $v1,.L0f0042dc -/* f0042d4: 3c018006 */ lui $at,0x8006 -/* f0042d8: ac20144c */ sw $zero,0x144c($at) +/* f0042d4: 3c018006 */ lui $at,%hi(var8006144c) +/* f0042d8: ac20144c */ sw $zero,%lo(var8006144c)($at) .L0f0042dc: /* f0042dc: 8fbf0054 */ lw $ra,0x54($sp) .L0f0042e0: @@ -5042,12 +5042,12 @@ glabel func0f004c6c /* f004e20: 2652142c */ addiu $s2,$s2,%lo(var8006142c) /* f004e24: 00944021 */ addu $t0,$a0,$s4 /* f004e28: ae440000 */ sw $a0,0x0($s2) -/* f004e2c: 3c018006 */ lui $at,0x8006 +/* f004e2c: 3c018006 */ lui $at,%hi(var80061428) /* f004e30: 34028009 */ dli $v0,0x8009 /* f004e34: 00008025 */ or $s0,$zero,$zero /* f004e38: 0000c012 */ mflo $t8 /* f004e3c: 01183021 */ addu $a2,$t0,$t8 -/* f004e40: ac261428 */ sw $a2,0x1428($at) +/* f004e40: ac261428 */ sw $a2,%lo(var80061428)($at) /* f004e44: 18a0001a */ blez $a1,.L0f004eb0 /* f004e48: 01003025 */ or $a2,$t0,$zero .L0f004e4c: @@ -6108,8 +6108,8 @@ glabel func0f005bb0 /* f005d3c: 11400004 */ beqz $t2,.L0f005d50 /* f005d40: 24090001 */ addiu $t1,$zero,0x1 .L0f005d44: -/* f005d44: 3c018006 */ lui $at,0x8006 -/* f005d48: ac29144c */ sw $t1,0x144c($at) +/* f005d44: 3c018006 */ lui $at,%hi(var8006144c) +/* f005d48: ac29144c */ sw $t1,%lo(var8006144c)($at) /* f005d4c: 8d0500d8 */ lw $a1,0xd8($t0) .L0f005d50: /* f005d50: 2ca40001 */ sltiu $a0,$a1,0x1 diff --git a/src/game/game_000130.c b/src/game/game_000130.c index a183d1861..e83ee298d 100644 --- a/src/game/game_000130.c +++ b/src/game/game_000130.c @@ -477,9 +477,9 @@ glabel func0f000648 /* f000760: 0275082b */ sltu $at,$s3,$s5 /* f000764: 1420ffc8 */ bnez $at,.L0f000688 /* f000768: 26520004 */ addiu $s2,$s2,0x4 -/* f00076c: 3c048006 */ lui $a0,0x8006 +/* f00076c: 3c048006 */ lui $a0,%hi(var800637cc+0x1a4) /* f000770: 0fc00164 */ jal func0f000590 -/* f000774: 24843970 */ addiu $a0,$a0,0x3970 +/* f000774: 24843970 */ addiu $a0,$a0,%lo(var800637cc+0x1a4) /* f000778: 3c118006 */ lui $s1,%hi(var80065ae0) /* f00077c: 3c128006 */ lui $s2,%hi(var800662d8) /* f000780: 3c138006 */ lui $s3,%hi(var800666c8) diff --git a/src/game/game_006bd0.c b/src/game/game_006bd0.c index 15c469ebc..b6ac073c9 100644 --- a/src/game/game_006bd0.c +++ b/src/game/game_006bd0.c @@ -3114,12 +3114,12 @@ glabel func0f009818 GLOBAL_ASM( glabel func0f0099a4 -/* f0099a4: 3c018006 */ lui $at,0x8006 -/* f0099a8: ac201640 */ sw $zero,0x1640($at) -/* f0099ac: 3c018006 */ lui $at,0x8006 +/* f0099a4: 3c018006 */ lui $at,%hi(var80061640) +/* f0099a8: ac201640 */ sw $zero,%lo(var80061640)($at) +/* f0099ac: 3c018006 */ lui $at,%hi(var800616e4) /* f0099b0: 3c03800a */ lui $v1,%hi(var8009cb08) /* f0099b4: 3c04800a */ lui $a0,%hi(var8009cbf8) -/* f0099b8: ac2016e4 */ sw $zero,0x16e4($at) +/* f0099b8: ac2016e4 */ sw $zero,%lo(var800616e4)($at) /* f0099bc: 2484cbf8 */ addiu $a0,$a0,%lo(var8009cbf8) /* f0099c0: 2463cb08 */ addiu $v1,$v1,%lo(var8009cb08) /* f0099c4: 2402ffff */ addiu $v0,$zero,-1 @@ -3473,8 +3473,8 @@ glabel func0f009eac /* f009ebc: afb00028 */ sw $s0,0x28($sp) /* f009ec0: 11c00003 */ beqz $t6,.L0f009ed0 /* f009ec4: 24084e20 */ addiu $t0,$zero,0x4e20 -/* f009ec8: 3c018006 */ lui $at,0x8006 -/* f009ecc: ac201640 */ sw $zero,0x1640($at) +/* f009ec8: 3c018006 */ lui $at,%hi(var80061640) +/* f009ecc: ac201640 */ sw $zero,%lo(var80061640)($at) .L0f009ed0: /* f009ed0: 00001825 */ or $v1,$zero,$zero .L0f009ed4: @@ -3503,8 +3503,8 @@ glabel func0f009eac /* f009f2c: 00000000 */ sll $zero,$zero,0x0 /* f009f30: 00404025 */ or $t0,$v0,$zero .L0f009f34: -/* f009f34: 3c018006 */ lui $at,0x8006 -/* f009f38: ac2a1640 */ sw $t2,0x1640($at) +/* f009f34: 3c018006 */ lui $at,%hi(var80061640) +/* f009f38: ac2a1640 */ sw $t2,%lo(var80061640)($at) .L0f009f3c: /* f009f3c: 24630001 */ addiu $v1,$v1,0x1 .L0f009f40: @@ -3513,10 +3513,10 @@ glabel func0f009eac /* f009f48: 00000000 */ sll $zero,$zero,0x0 /* f009f4c: 2901015e */ slti $at,$t0,0x15e /* f009f50: 10200057 */ beqz $at,.L0f00a0b0 -/* f009f54: 3c048006 */ lui $a0,%hi(var800616e4) +/* f009f54: 3c048006 */ lui $a0,0x8006 /* f009f58: 3c0b800a */ lui $t3,%hi(g_Vars+0x34) /* f009f5c: 8d6b9ff4 */ lw $t3,%lo(g_Vars+0x34)($t3) -/* f009f60: 3c048006 */ lui $a0,%hi(var800616e4) +/* f009f60: 3c048006 */ lui $a0,0x8006 /* f009f64: 11600047 */ beqz $t3,.L0f00a084 /* f009f68: 00000000 */ sll $zero,$zero,0x0 /* f009f6c: 3c048006 */ lui $a0,%hi(var800616e4) @@ -3593,7 +3593,7 @@ glabel func0f009eac /* f00a07c: 10000015 */ beqz $zero,.L0f00a0d4 /* f00a080: 00000000 */ sll $zero,$zero,0x0 .L0f00a084: -/* f00a084: 8c8416e4 */ lw $a0,%lo(var800616e4)($a0) +/* f00a084: 8c8416e4 */ lw $a0,5860($a0) /* f00a088: 10800012 */ beqz $a0,.L0f00a0d4 /* f00a08c: 00000000 */ sll $zero,$zero,0x0 /* f00a090: 0c00cdfc */ jal func000337f0 @@ -3605,7 +3605,7 @@ glabel func0f009eac /* f00a0a8: 1000000a */ beqz $zero,.L0f00a0d4 /* f00a0ac: 00000000 */ sll $zero,$zero,0x0 .L0f00a0b0: -/* f00a0b0: 8c8416e4 */ lw $a0,%lo(var800616e4)($a0) +/* f00a0b0: 8c8416e4 */ lw $a0,5860($a0) /* f00a0b4: 10800007 */ beqz $a0,.L0f00a0d4 /* f00a0b8: 00000000 */ sll $zero,$zero,0x0 /* f00a0bc: 0c00cdfc */ jal func000337f0 @@ -3707,13 +3707,13 @@ glabel func0f00a1f8 /* f00a1fc: afa40048 */ sw $a0,0x48($sp) /* f00a200: afa5004c */ sw $a1,0x4c($sp) /* f00a204: 240e0001 */ addiu $t6,$zero,0x1 -/* f00a208: 3c018006 */ lui $at,0x8006 +/* f00a208: 3c018006 */ lui $at,%hi(var80061640) /* f00a20c: 3c03800a */ lui $v1,%hi(var8009cb08) /* f00a210: afbf002c */ sw $ra,0x2c($sp) /* f00a214: afb00028 */ sw $s0,0x28($sp) /* f00a218: 2407ffff */ addiu $a3,$zero,-1 /* f00a21c: 00004025 */ or $t0,$zero,$zero -/* f00a220: ac2e1640 */ sw $t6,0x1640($at) +/* f00a220: ac2e1640 */ sw $t6,%lo(var80061640)($at) /* f00a224: 2463cb08 */ addiu $v1,$v1,%lo(var8009cb08) /* f00a228: 24050006 */ addiu $a1,$zero,0x6 /* f00a22c: 2404ffff */ addiu $a0,$zero,-1 diff --git a/src/game/game_00b210.c b/src/game/game_00b210.c index 43a468db5..e56a2df65 100644 --- a/src/game/game_00b210.c +++ b/src/game/game_00b210.c @@ -19,9 +19,9 @@ glabel func0f00b210 /* f00b21c: afb30020 */ sw $s3,0x20($sp) /* f00b220: afb10018 */ sw $s1,0x18($sp) /* f00b224: 3c108009 */ lui $s0,%hi(g_MpChallenges) -/* f00b228: 3c128009 */ lui $s2,0x8009 +/* f00b228: 3c128009 */ lui $s2,%hi(g_MpChallenges+0x9) /* f00b22c: afbf0024 */ sw $ra,0x24($sp) -/* f00b230: 265284c1 */ addiu $s2,$s2,-31551 +/* f00b230: 265284c1 */ addiu $s2,$s2,%lo(g_MpChallenges+0x9) /* f00b234: 261084b8 */ addiu $s0,$s0,%lo(g_MpChallenges) /* f00b238: 00008825 */ or $s1,$zero,$zero /* f00b23c: 27b30038 */ addiu $s3,$sp,0x38 diff --git a/src/game/game_00b320.c b/src/game/game_00b320.c index 844a8d122..ddeb66035 100644 --- a/src/game/game_00b320.c +++ b/src/game/game_00b320.c @@ -86,8 +86,8 @@ GLOBAL_ASM( glabel func0f00b420 /* f00b420: 27bdffe8 */ addiu $sp,$sp,-24 /* f00b424: afbf0014 */ sw $ra,0x14($sp) -/* f00b428: 3c018006 */ lui $at,0x8006 -/* f00b42c: ac202410 */ sw $zero,0x2410($at) +/* f00b428: 3c018006 */ lui $at,%hi(var80062410) +/* f00b42c: ac202410 */ sw $zero,%lo(var80062410)($at) /* f00b430: 24040080 */ addiu $a0,$zero,0x80 /* f00b434: 0c0048f2 */ jal malloc /* f00b438: 24050004 */ addiu $a1,$zero,0x4 diff --git a/src/game/game_00b480.c b/src/game/game_00b480.c index 13685f280..6eae922c8 100644 --- a/src/game/game_00b480.c +++ b/src/game/game_00b480.c @@ -15,30 +15,30 @@ GLOBAL_ASM( glabel func0f00b480 /* f00b480: 2402ffff */ addiu $v0,$zero,-1 -/* f00b484: 3c018006 */ lui $at,0x8006 -/* f00b488: ac2224b4 */ sw $v0,0x24b4($at) -/* f00b48c: 3c018006 */ lui $at,0x8006 -/* f00b490: ac2024d4 */ sw $zero,0x24d4($at) -/* f00b494: 3c018006 */ lui $at,0x8006 -/* f00b498: ac2024d8 */ sw $zero,0x24d8($at) -/* f00b49c: 3c018006 */ lui $at,0x8006 -/* f00b4a0: ac2024dc */ sw $zero,0x24dc($at) -/* f00b4a4: 3c018006 */ lui $at,0x8006 +/* f00b484: 3c018006 */ lui $at,%hi(var800624b4) +/* f00b488: ac2224b4 */ sw $v0,%lo(var800624b4)($at) +/* f00b48c: 3c018006 */ lui $at,%hi(var800624d4) +/* f00b490: ac2024d4 */ sw $zero,%lo(var800624d4)($at) +/* f00b494: 3c018006 */ lui $at,%hi(var800624d8) +/* f00b498: ac2024d8 */ sw $zero,%lo(var800624d8)($at) +/* f00b49c: 3c018006 */ lui $at,%hi(var800624dc) +/* f00b4a0: ac2024dc */ sw $zero,%lo(var800624dc)($at) +/* f00b4a4: 3c018006 */ lui $at,%hi(var800624bc) /* f00b4a8: 240e0002 */ addiu $t6,$zero,0x2 -/* f00b4ac: ac2e24bc */ sw $t6,0x24bc($at) +/* f00b4ac: ac2e24bc */ sw $t6,%lo(var800624bc)($at) /* f00b4b0: 3c188006 */ lui $t8,%hi(var800624f0) /* f00b4b4: 8f1824f0 */ lw $t8,%lo(var800624f0)($t8) -/* f00b4b8: 3c018006 */ lui $at,0x8006 -/* f00b4bc: ac2224c0 */ sw $v0,0x24c0($at) +/* f00b4b8: 3c018006 */ lui $at,%hi(var800624c0) +/* f00b4bc: ac2224c0 */ sw $v0,%lo(var800624c0)($at) /* f00b4c0: 27bdffe8 */ addiu $sp,$sp,-24 -/* f00b4c4: 3c018006 */ lui $at,0x8006 +/* f00b4c4: 3c018006 */ lui $at,%hi(var800624f4) /* f00b4c8: 240f0001 */ addiu $t7,$zero,0x1 /* f00b4cc: afbf0014 */ sw $ra,0x14($sp) /* f00b4d0: 13000004 */ beqz $t8,.L0f00b4e4 -/* f00b4d4: ac2f24f4 */ sw $t7,0x24f4($at) +/* f00b4d4: ac2f24f4 */ sw $t7,%lo(var800624f4)($at) /* f00b4d8: 24190005 */ addiu $t9,$zero,0x5 -/* f00b4dc: 3c018006 */ lui $at,0x8006 -/* f00b4e0: ac3924b8 */ sw $t9,0x24b8($at) +/* f00b4dc: 3c018006 */ lui $at,%hi(var800624b8) +/* f00b4e0: ac3924b8 */ sw $t9,%lo(var800624b8)($at) .L0f00b4e4: /* f00b4e4: 3c040004 */ lui $a0,0x4 /* f00b4e8: 34847800 */ ori $a0,$a0,0x7800 @@ -60,26 +60,26 @@ glabel func0f00b510 /* f00b518: 3c018006 */ lui $at,0x8006 /* f00b51c: 240e1388 */ addiu $t6,$zero,0x1388 /* f00b520: e4242968 */ swc1 $f4,0x2968($at) -/* f00b524: 3c018006 */ lui $at,0x8006 -/* f00b528: ac20296c */ sw $zero,0x296c($at) -/* f00b52c: 3c018006 */ lui $at,0x8006 -/* f00b530: ac202970 */ sw $zero,0x2970($at) -/* f00b534: 3c018006 */ lui $at,0x8006 -/* f00b538: ac202974 */ sw $zero,0x2974($at) -/* f00b53c: 3c018006 */ lui $at,0x8006 -/* f00b540: ac202978 */ sw $zero,0x2978($at) -/* f00b544: 3c018006 */ lui $at,0x8006 -/* f00b548: ac20297c */ sw $zero,0x297c($at) -/* f00b54c: 3c018006 */ lui $at,0x8006 -/* f00b550: ac2e2984 */ sw $t6,0x2984($at) -/* f00b554: 3c018006 */ lui $at,0x8006 +/* f00b524: 3c018006 */ lui $at,%hi(var8006296c) +/* f00b528: ac20296c */ sw $zero,%lo(var8006296c)($at) +/* f00b52c: 3c018006 */ lui $at,%hi(var80062970) +/* f00b530: ac202970 */ sw $zero,%lo(var80062970)($at) +/* f00b534: 3c018006 */ lui $at,%hi(var80062974) +/* f00b538: ac202974 */ sw $zero,%lo(var80062974)($at) +/* f00b53c: 3c018006 */ lui $at,%hi(var80062978) +/* f00b540: ac202978 */ sw $zero,%lo(var80062978)($at) +/* f00b544: 3c018006 */ lui $at,%hi(var8006297c) +/* f00b548: ac20297c */ sw $zero,%lo(var8006297c)($at) +/* f00b54c: 3c018006 */ lui $at,%hi(var80062984) +/* f00b550: ac2e2984 */ sw $t6,%lo(var80062984)($at) +/* f00b554: 3c018006 */ lui $at,%hi(g_ChrsA) /* f00b558: 27bdffe0 */ addiu $sp,$sp,-32 -/* f00b55c: ac202988 */ sw $zero,0x2988($at) +/* f00b55c: ac202988 */ sw $zero,%lo(g_ChrsA)($at) /* f00b560: afbf001c */ sw $ra,0x1c($sp) -/* f00b564: 3c018006 */ lui $at,0x8006 +/* f00b564: 3c018006 */ lui $at,%hi(g_NumChrsA) /* f00b568: afb10018 */ sw $s1,0x18($sp) /* f00b56c: afb00014 */ sw $s0,0x14($sp) -/* f00b570: ac20298c */ sw $zero,0x298c($at) +/* f00b570: ac20298c */ sw $zero,%lo(g_NumChrsA)($at) /* f00b574: 24040730 */ addiu $a0,$zero,0x730 /* f00b578: 0c0048f2 */ jal malloc /* f00b57c: 24050004 */ addiu $a1,$zero,0x4 @@ -94,8 +94,8 @@ glabel func0f00b510 /* f00b59c: 28610730 */ slti $at,$v1,0x730 /* f00b5a0: 1420fffb */ bnez $at,.L0f00b590 /* f00b5a4: af000000 */ sw $zero,0x0($t8) -/* f00b5a8: 3c018006 */ lui $at,0x8006 -/* f00b5ac: ac202a90 */ sw $zero,0x2a90($at) +/* f00b5a8: 3c018006 */ lui $at,%hi(var80062a90) +/* f00b5ac: ac202a90 */ sw $zero,%lo(var80062a90)($at) /* f00b5b0: 3c01800a */ lui $at,%hi(g_NumChrsC) /* f00b5b4: ac20cd10 */ sw $zero,%lo(g_NumChrsC)($at) /* f00b5b8: 3c01800a */ lui $at,%hi(g_ChrnumsC) @@ -105,10 +105,10 @@ glabel func0f00b510 /* f00b5c8: 24041470 */ addiu $a0,$zero,0x1470 /* f00b5cc: 0c0048f2 */ jal malloc /* f00b5d0: 24050004 */ addiu $a1,$zero,0x4 -/* f00b5d4: 3c018006 */ lui $at,0x8006 +/* f00b5d4: 3c018006 */ lui $at,%hi(var80062960) /* f00b5d8: 3c10800a */ lui $s0,%hi(var8009ccc0) /* f00b5dc: 3c11800a */ lui $s1,%hi(g_NumChrsC) -/* f00b5e0: ac222960 */ sw $v0,0x2960($at) +/* f00b5e0: ac222960 */ sw $v0,%lo(var80062960)($at) /* f00b5e4: 2631cd10 */ addiu $s1,$s1,%lo(g_NumChrsC) /* f00b5e8: 2610ccc0 */ addiu $s0,$s0,%lo(var8009ccc0) .L0f00b5ec: diff --git a/src/game/game_00b820.c b/src/game/game_00b820.c index 5dfcae3bc..b3a2fc14b 100644 --- a/src/game/game_00b820.c +++ b/src/game/game_00b820.c @@ -20,8 +20,8 @@ GLOBAL_ASM( glabel func0f00b820 /* f00b820: 27bdffd0 */ addiu $sp,$sp,-48 -/* f00b824: 3c0e8008 */ lui $t6,0x8008 -/* f00b828: 95cecf06 */ lhu $t6,-0x30fa($t6) +/* f00b824: 3c0e8008 */ lui $t6,%hi(g_Bodies+0x2) +/* f00b828: 95cecf06 */ lhu $t6,%lo(g_Bodies+0x2)($t6) /* f00b82c: afb10018 */ sw $s1,0x18($sp) /* f00b830: afb00014 */ sw $s0,0x14($sp) /* f00b834: 00808025 */ or $s0,$a0,$zero @@ -46,17 +46,17 @@ glabel func0f00b820 /* f00b878: 00000000 */ sll $zero,$zero,0x0 /* f00b87c: 3c188006 */ lui $t8,%hi(var80062b00) /* f00b880: 8f182b00 */ lw $t8,%lo(var80062b00)($t8) -/* f00b884: 3c018006 */ lui $at,0x8006 +/* f00b884: 3c018006 */ lui $at,%hi(var80062c80) /* f00b888: 3c128006 */ lui $s2,%hi(var80062b14) /* f00b88c: 0058001b */ divu $zero,$v0,$t8 /* f00b890: 0000c810 */ mfhi $t9 -/* f00b894: ac392c80 */ sw $t9,0x2c80($at) +/* f00b894: ac392c80 */ sw $t9,%lo(var80062c80)($at) /* f00b898: 26522b14 */ addiu $s2,$s2,%lo(var80062b14) /* f00b89c: 3c06800a */ lui $a2,%hi(g_Vars) /* f00b8a0: ae400000 */ sw $zero,0x0($s2) -/* f00b8a4: 3c018006 */ lui $at,0x8006 +/* f00b8a4: 3c018006 */ lui $at,%hi(var80062b18) /* f00b8a8: 24c69fc0 */ addiu $a2,$a2,%lo(g_Vars) -/* f00b8ac: ac202b18 */ sw $zero,0x2b18($at) +/* f00b8ac: ac202b18 */ sw $zero,%lo(var80062b18)($at) /* f00b8b0: 8cc8006c */ lw $t0,0x6c($a2) /* f00b8b4: 17000002 */ bnez $t8,.L0f00b8c0 /* f00b8b8: 00000000 */ sll $zero,$zero,0x0 @@ -179,7 +179,7 @@ glabel func0f00b820 /* f00ba48: 0fc41b99 */ jal cheatIsActive /* f00ba4c: 24040010 */ addiu $a0,$zero,0x10 /* f00ba50: 10400006 */ beqz $v0,.L0f00ba6c -/* f00ba54: 3c148006 */ lui $s4,%hi(var80062c58) +/* f00ba54: 3c148006 */ lui $s4,0x8006 /* f00ba58: 3c148006 */ lui $s4,%hi(var80062c6c) /* f00ba5c: 3c138006 */ lui $s3,%hi(var80062b10) /* f00ba60: 26942c6c */ addiu $s4,$s4,%lo(var80062c6c) @@ -187,7 +187,7 @@ glabel func0f00b820 /* f00ba68: 8e732b10 */ lw $s3,%lo(var80062b10)($s3) .L0f00ba6c: /* f00ba6c: 3c138006 */ lui $s3,%hi(var80062b08) -/* f00ba70: 26942c58 */ addiu $s4,$s4,%lo(var80062c58) +/* f00ba70: 26942c58 */ addiu $s4,$s4,11352 /* f00ba74: 8e732b08 */ lw $s3,%lo(var80062b08)($s3) .L0f00ba78: /* f00ba78: 8ea50000 */ lw $a1,0x0($s5) @@ -234,11 +234,11 @@ glabel func0f00b820 /* f00bb08: 26520004 */ addiu $s2,$s2,0x4 /* f00bb0c: 00008825 */ or $s1,$zero,$zero .L0f00bb10: -/* f00bb10: 3c018006 */ lui $at,0x8006 -/* f00bb14: ac202c84 */ sw $zero,0x2c84($at) -/* f00bb18: 3c018006 */ lui $at,0x8006 +/* f00bb10: 3c018006 */ lui $at,%hi(g_HeadsAIndex) +/* f00bb14: ac202c84 */ sw $zero,%lo(g_HeadsAIndex)($at) +/* f00bb18: 3c018006 */ lui $at,%hi(g_HeadsBIndex) /* f00bb1c: 18a00006 */ blez $a1,.L0f00bb38 -/* f00bb20: ac202c88 */ sw $zero,0x2c88($at) +/* f00bb20: ac202c88 */ sw $zero,%lo(g_HeadsBIndex)($at) /* f00bb24: 26310001 */ addiu $s1,$s1,0x1 .L0f00bb28: /* f00bb28: 0225082a */ slt $at,$s1,$a1 @@ -593,13 +593,13 @@ glabel func0f00bbc8 /* f00c040: 24040210 */ addiu $a0,$zero,0x210 /* f00c044: 0c0048f2 */ jal malloc /* f00c048: 24050004 */ addiu $a1,$zero,0x4 -/* f00c04c: 3c018006 */ lui $at,0x8006 -/* f00c050: ac227e64 */ sw $v0,0x7e64($at) +/* f00c04c: 3c018006 */ lui $at,%hi(g_TeamList) +/* f00c050: ac227e64 */ sw $v0,%lo(g_TeamList)($at) /* f00c054: 24040220 */ addiu $a0,$zero,0x220 /* f00c058: 0c0048f2 */ jal malloc /* f00c05c: 24050004 */ addiu $a1,$zero,0x4 -/* f00c060: 3c018006 */ lui $at,0x8006 -/* f00c064: ac227e68 */ sw $v0,0x7e68($at) +/* f00c060: 3c018006 */ lui $at,%hi(g_SquadronList) +/* f00c064: ac227e68 */ sw $v0,%lo(g_SquadronList)($at) .L0f00c068: /* f00c068: 8fbf001c */ lw $ra,0x1c($sp) /* f00c06c: 8fb00018 */ lw $s0,0x18($sp) diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c index 0e31a323e..d3d4ed77c 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -120,10 +120,10 @@ glabel func0f00c490 /* f00c580: 00000000 */ sll $zero,$zero,0x0 /* f00c584: 0fc0338f */ jal func0f00ce3c /* f00c588: 00000000 */ sll $zero,$zero,0x0 -/* f00c58c: 3c018007 */ lui $at,0x8007 -/* f00c590: ac2098d4 */ sw $zero,-0x672c($at) -/* f00c594: 3c018007 */ lui $at,0x8007 -/* f00c598: ac2098d8 */ sw $zero,-0x6728($at) +/* f00c58c: 3c018007 */ lui $at,%hi(g_AlarmActive) +/* f00c590: ac2098d4 */ sw $zero,%lo(g_AlarmActive)($at) +/* f00c594: 3c018007 */ lui $at,%hi(var800698d8) +/* f00c598: ac2098d8 */ sw $zero,%lo(var800698d8)($at) /* f00c59c: 3c014280 */ lui $at,0x4280 /* f00c5a0: 44812000 */ mtc1 $at,$f4 /* f00c5a4: 44800000 */ mtc1 $zero,$f0 @@ -131,32 +131,32 @@ glabel func0f00c490 /* f00c5ac: e42498dc */ swc1 $f4,-0x6724($at) /* f00c5b0: 3c018007 */ lui $at,0x8007 /* f00c5b4: e42098e4 */ swc1 $f0,-0x671c($at) -/* f00c5b8: 3c018007 */ lui $at,0x8007 +/* f00c5b8: 3c018007 */ lui $at,%hi(var800698e8) /* f00c5bc: 3c028007 */ lui $v0,%hi(var800698ec) -/* f00c5c0: ac2098e8 */ sw $zero,-0x6718($at) +/* f00c5c0: ac2098e8 */ sw $zero,%lo(var800698e8)($at) /* f00c5c4: 244298ec */ addiu $v0,$v0,%lo(var800698ec) -/* f00c5c8: 3c018007 */ lui $at,0x8007 +/* f00c5c8: 3c018007 */ lui $at,%hi(var800698f8) /* f00c5cc: e4400000 */ swc1 $f0,0x0($v0) /* f00c5d0: e4400004 */ swc1 $f0,0x4($v0) /* f00c5d4: e4400008 */ swc1 $f0,0x8($v0) -/* f00c5d8: ac2098f8 */ sw $zero,-0x6708($at) +/* f00c5d8: ac2098f8 */ sw $zero,%lo(var800698f8)($at) /* f00c5dc: 3c018007 */ lui $at,0x8007 /* f00c5e0: e42098fc */ swc1 $f0,-0x6704($at) -/* f00c5e4: 3c018007 */ lui $at,0x8007 -/* f00c5e8: ac209900 */ sw $zero,-0x6700($at) +/* f00c5e4: 3c018007 */ lui $at,%hi(var80069900) +/* f00c5e8: ac209900 */ sw $zero,%lo(var80069900)($at) /* f00c5ec: 240c0001 */ addiu $t4,$zero,0x1 -/* f00c5f0: 3c018007 */ lui $at,0x8007 -/* f00c5f4: ac2c9904 */ sw $t4,-0x66fc($at) -/* f00c5f8: 3c018007 */ lui $at,0x8007 -/* f00c5fc: ac209908 */ sw $zero,-0x66f8($at) +/* f00c5f0: 3c018007 */ lui $at,%hi(g_CountdownTimerVisible) +/* 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) -/* f00c608: 3c018007 */ lui $at,0x8007 -/* f00c60c: ac209910 */ sw $zero,-0x66f0($at) +/* f00c608: 3c018007 */ lui $at,%hi(var80069910) +/* f00c60c: ac209910 */ sw $zero,%lo(var80069910)($at) /* f00c610: 3c06800a */ lui $a2,%hi(var8009ce40) -/* f00c614: 3c018007 */ lui $at,0x8007 +/* f00c614: 3c018007 */ lui $at,%hi(g_TintedGlassEnabled) /* f00c618: 24c6ce40 */ addiu $a2,$a2,%lo(var8009ce40) -/* f00c61c: ac2098d0 */ sw $zero,-0x6730($at) +/* f00c61c: ac2098d0 */ sw $zero,%lo(g_TintedGlassEnabled)($at) /* f00c620: 8cc30000 */ lw $v1,0x0($a2) /* f00c624: 3c07800a */ lui $a3,%hi(var8009ce44) /* f00c628: 3c08800a */ lui $t0,%hi(var8009ce48) @@ -216,8 +216,8 @@ glabel func0f00c490 /* f00c6f8: 8c8e0000 */ lw $t6,0x0($a0) /* f00c6fc: 00001825 */ or $v1,$zero,$zero .L0f00c700: -/* f00c700: 3c018007 */ lui $at,0x8007 -/* f00c704: ac209914 */ sw $zero,-0x66ec($at) +/* f00c700: 3c018007 */ lui $at,%hi(var80069914) +/* f00c704: ac209914 */ sw $zero,%lo(var80069914)($at) .L0f00c708: /* f00c708: 8ce20000 */ lw $v0,0x0($a3) /* f00c70c: 3c04800a */ lui $a0,%hi(var8009ce5c) @@ -267,8 +267,8 @@ glabel func0f00c490 /* f00c7b4: 8c8f0000 */ lw $t7,0x0($a0) /* f00c7b8: 00001825 */ or $v1,$zero,$zero .L0f00c7bc: -/* f00c7bc: 3c018007 */ lui $at,0x8007 -/* f00c7c0: ac209918 */ sw $zero,-0x66e8($at) +/* f00c7bc: 3c018007 */ lui $at,%hi(var80069918) +/* f00c7c0: ac209918 */ sw $zero,%lo(var80069918)($at) .L0f00c7c4: /* f00c7c4: 8d020000 */ lw $v0,0x0($t0) /* f00c7c8: 3c04800a */ lui $a0,%hi(var8009ce60) @@ -439,21 +439,21 @@ glabel func0f00c490 .L0f00ca30: /* f00ca30: 3c013f80 */ lui $at,0x3f80 /* f00ca34: 44810000 */ mtc1 $at,$f0 -/* f00ca38: 3c018007 */ lui $at,0x8007 -/* f00ca3c: ac20991c */ sw $zero,-0x66e4($at) -/* f00ca40: 3c018007 */ lui $at,0x8007 -/* f00ca44: ac209920 */ sw $zero,-0x66e0($at) -/* f00ca48: 3c018007 */ lui $at,0x8007 -/* f00ca4c: ac209924 */ sw $zero,-0x66dc($at) -/* f00ca50: 3c018007 */ lui $at,0x8007 -/* f00ca54: ac209928 */ sw $zero,-0x66d8($at) -/* f00ca58: 3c018007 */ lui $at,0x8007 -/* f00ca5c: ac20992c */ sw $zero,-0x66d4($at) -/* f00ca60: 3c018007 */ lui $at,0x8007 -/* f00ca64: ac209930 */ sw $zero,-0x66d0($at) -/* f00ca68: 3c018007 */ lui $at,0x8007 +/* f00ca38: 3c018007 */ lui $at,%hi(var8006991c) +/* f00ca3c: ac20991c */ sw $zero,%lo(var8006991c)($at) +/* f00ca40: 3c018007 */ lui $at,%hi(var80069920) +/* f00ca44: ac209920 */ sw $zero,%lo(var80069920)($at) +/* f00ca48: 3c018007 */ lui $at,%hi(var80069924) +/* f00ca4c: ac209924 */ sw $zero,%lo(var80069924)($at) +/* f00ca50: 3c018007 */ lui $at,%hi(var80069928) +/* f00ca54: ac209928 */ sw $zero,%lo(var80069928)($at) +/* f00ca58: 3c018007 */ lui $at,%hi(var8006992c) +/* f00ca5c: ac20992c */ sw $zero,%lo(var8006992c)($at) +/* f00ca60: 3c018007 */ lui $at,%hi(var80069930) +/* f00ca64: ac209930 */ sw $zero,%lo(var80069930)($at) +/* f00ca68: 3c018007 */ lui $at,%hi(var80069934) /* f00ca6c: 2419ffff */ addiu $t9,$zero,-1 -/* f00ca70: ac399934 */ sw $t9,-0x66cc($at) +/* f00ca70: ac399934 */ sw $t9,%lo(var80069934)($at) /* f00ca74: 3c018007 */ lui $at,0x8007 /* f00ca78: e4209948 */ swc1 $f0,-0x66b8($at) /* f00ca7c: 3c018007 */ lui $at,0x8007 @@ -542,8 +542,8 @@ glabel func0f00c490 /* f00cbb0: 0c0048f2 */ jal malloc /* f00cbb4: 24050004 */ addiu $a1,$zero,0x4 /* f00cbb8: 3c078007 */ lui $a3,%hi(var80069970) -/* f00cbbc: 3c018007 */ lui $at,0x8007 -/* f00cbc0: ac22996c */ sw $v0,-0x6694($at) +/* f00cbbc: 3c018007 */ lui $at,%hi(var8006996c) +/* f00cbc0: ac22996c */ sw $v0,%lo(var8006996c)($at) /* f00cbc4: 24e79970 */ addiu $a3,$a3,%lo(var80069970) /* f00cbc8: 8ced0000 */ lw $t5,0x0($a3) /* f00cbcc: 3c068007 */ lui $a2,%hi(var80069968) @@ -2798,12 +2798,12 @@ glabel func0f00e980 /* f00e9d0: 000370c0 */ sll $t6,$v1,0x3 /* f00e9d4: 01c37023 */ subu $t6,$t6,$v1 /* f00e9d8: 000e70c0 */ sll $t6,$t6,0x3 -/* f00e9dc: 3c028008 */ lui $v0,0x8008 +/* f00e9dc: 3c028008 */ lui $v0,%hi(g_Stages+0xe) /* f00e9e0: 004e1021 */ addu $v0,$v0,$t6 -/* f00e9e4: 9444fcce */ lhu $a0,-0x332($v0) +/* f00e9e4: 9444fcce */ lhu $a0,%lo(g_Stages+0xe)($v0) /* f00e9e8: 240f0003 */ addiu $t7,$zero,0x3 -/* f00e9ec: 3c018006 */ lui $at,0x8006 -/* f00e9f0: a02fd9a0 */ sb $t7,-0x2660($at) +/* f00e9ec: 3c018006 */ lui $at,%hi(var8005d9a0) +/* f00e9f0: a02fd9a0 */ sb $t7,%lo(var8005d9a0)($at) /* f00e9f4: 24050022 */ addiu $a1,$zero,0x22 /* f00e9f8: 02403025 */ or $a2,$s2,$zero /* f00e9fc: 02a03825 */ or $a3,$s5,$zero @@ -2909,11 +2909,11 @@ glabel func0f00e980 GLOBAL_ASM( glabel func0f00eb64 -/* f00eb64: 3c018007 */ lui $at,0x8007 -/* f00eb68: ac209960 */ sw $zero,-0x66a0($at) -/* f00eb6c: 3c018007 */ lui $at,0x8007 +/* f00eb64: 3c018007 */ lui $at,%hi(var80069960) +/* f00eb68: ac209960 */ sw $zero,%lo(var80069960)($at) +/* f00eb6c: 3c018007 */ lui $at,%hi(var80069964) /* f00eb70: 240effff */ addiu $t6,$zero,-1 -/* f00eb74: ac2e9964 */ sw $t6,-0x669c($at) +/* f00eb74: ac2e9964 */ sw $t6,%lo(var80069964)($at) /* f00eb78: 3c013f80 */ lui $at,0x3f80 /* f00eb7c: 44812000 */ mtc1 $at,$f4 /* f00eb80: 27bdffa0 */ addiu $sp,$sp,-96 @@ -2939,29 +2939,29 @@ glabel func0f00eb64 /* f00ebcc: 3c0f800a */ lui $t7,%hi(g_Vars+0x318) /* f00ebd0: 8defa2d8 */ lw $t7,%lo(g_Vars+0x318)($t7) /* f00ebd4: 240c0004 */ addiu $t4,$zero,0x4 -/* f00ebd8: 3c018006 */ lui $at,0x8006 +/* f00ebd8: 3c018006 */ lui $at,%hi(var8005d9a0) /* f00ebdc: 11e0000a */ beqz $t7,.L0f00ec08 /* f00ebe0: 24050022 */ addiu $a1,$zero,0x22 /* f00ebe4: 3c188008 */ lui $t8,%hi(g_StageIndex) /* f00ebe8: 8f18fc00 */ lw $t8,%lo(g_StageIndex)($t8) -/* f00ebec: 3c028008 */ lui $v0,0x8008 +/* f00ebec: 3c028008 */ lui $v0,%hi(g_Stages+0x10) /* f00ebf0: 0018c8c0 */ sll $t9,$t8,0x3 /* f00ebf4: 0338c823 */ subu $t9,$t9,$t8 /* f00ebf8: 0019c8c0 */ sll $t9,$t9,0x3 /* f00ebfc: 00591021 */ addu $v0,$v0,$t9 /* f00ec00: 10000009 */ beqz $zero,.L0f00ec28 -/* f00ec04: 9442fcd0 */ lhu $v0,-0x330($v0) +/* f00ec04: 9442fcd0 */ lhu $v0,%lo(g_Stages+0x10)($v0) .L0f00ec08: /* f00ec08: 3c0a8008 */ lui $t2,%hi(g_StageIndex) /* f00ec0c: 8d4afc00 */ lw $t2,%lo(g_StageIndex)($t2) -/* f00ec10: 3c028008 */ lui $v0,0x8008 +/* f00ec10: 3c028008 */ lui $v0,%hi(g_Stages+0xe) /* f00ec14: 000a58c0 */ sll $t3,$t2,0x3 /* f00ec18: 016a5823 */ subu $t3,$t3,$t2 /* f00ec1c: 000b58c0 */ sll $t3,$t3,0x3 /* f00ec20: 004b1021 */ addu $v0,$v0,$t3 -/* f00ec24: 9442fcce */ lhu $v0,-0x332($v0) +/* f00ec24: 9442fcce */ lhu $v0,%lo(g_Stages+0xe)($v0) .L0f00ec28: -/* f00ec28: a02cd9a0 */ sb $t4,-0x2660($at) +/* f00ec28: a02cd9a0 */ sb $t4,%lo(var8005d9a0)($at) /* f00ec2c: 00402025 */ or $a0,$v0,$zero /* f00ec30: 0fc59c3f */ jal func0f1670fc /* f00ec34: afa60060 */ sw $a2,0x60($sp) @@ -2977,8 +2977,8 @@ glabel func0f00eb64 /* f00ec5c: 3c07800a */ lui $a3,%hi(g_StageSetup) /* f00ec60: 24e7d030 */ addiu $a3,$a3,%lo(g_StageSetup) /* f00ec64: 8d2d000c */ lw $t5,0xc($t1) -/* f00ec68: 3c048008 */ lui $a0,0x8008 -/* f00ec6c: 3c018006 */ lui $at,0x8006 +/* f00ec68: 3c048008 */ lui $a0,%hi(g_Stages+0xc) +/* f00ec6c: 3c018006 */ lui $at,%hi(var8005d9a0) /* f00ec70: 012d7021 */ addu $t6,$t1,$t5 /* f00ec74: acee000c */ sw $t6,0xc($a3) /* f00ec78: 8d2f0010 */ lw $t7,0x10($t1) @@ -2994,13 +2994,13 @@ glabel func0f00eb64 /* f00eca0: 012b6021 */ addu $t4,$t1,$t3 /* f00eca4: acec0018 */ sw $t4,0x18($a3) /* f00eca8: 8dcefc00 */ lw $t6,%lo(g_StageIndex)($t6) -/* f00ecac: a02dd9a0 */ sb $t5,-0x2660($at) +/* f00ecac: a02dd9a0 */ sb $t5,%lo(var8005d9a0)($at) /* f00ecb0: 000e78c0 */ sll $t7,$t6,0x3 /* f00ecb4: 01ee7823 */ subu $t7,$t7,$t6 /* f00ecb8: 000f78c0 */ sll $t7,$t7,0x3 /* f00ecbc: 008f2021 */ addu $a0,$a0,$t7 /* f00ecc0: 0fc59c3f */ jal func0f1670fc -/* f00ecc4: 9484fccc */ lhu $a0,-0x334($a0) +/* f00ecc4: 9484fccc */ lhu $a0,%lo(g_Stages+0xc)($a0) /* f00ecc8: 3c07800a */ lui $a3,%hi(g_StageSetup) /* f00eccc: 24e7d030 */ addiu $a3,$a3,%lo(g_StageSetup) /* f00ecd0: 8ce60018 */ lw $a2,0x18($a3) @@ -4696,8 +4696,8 @@ glabel var7f1a8224 /* f010250: 2401ffff */ addiu $at,$zero,-1 /* f010254: 14410003 */ bne $v0,$at,.L0f010264 /* f010258: 244f0001 */ addiu $t7,$v0,0x1 -/* f01025c: 3c018007 */ lui $at,0x8007 -/* f010260: ac329960 */ sw $s2,-0x66a0($at) +/* f01025c: 3c018007 */ lui $at,%hi(var80069960) +/* f010260: ac329960 */ sw $s2,%lo(var80069960)($at) .L0f010264: /* f010264: 1000000a */ beqz $zero,.L0f010290 /* f010268: ac6f0000 */ sw $t7,0x0($v1) diff --git a/src/game/game_0109d0.c b/src/game/game_0109d0.c index 2e36cd691..85348be47 100644 --- a/src/game/game_0109d0.c +++ b/src/game/game_0109d0.c @@ -20,10 +20,10 @@ glabel func0f0109d0 /* f0109e0: 2841005a */ slti $at,$v0,0x5a /* f0109e4: 1020000a */ beqz $at,.L0f010a10 /* f0109e8: 240effff */ addiu $t6,$zero,-1 -/* f0109ec: 3c018007 */ lui $at,0x8007 +/* f0109ec: 3c018007 */ lui $at,%hi(var8006ae70) /* f0109f0: 3c02800a */ lui $v0,%hi(var8009d088) /* f0109f4: 3c03800a */ lui $v1,%hi(var8009d0b0) -/* f0109f8: ac2eae70 */ sw $t6,-0x5190($at) +/* f0109f8: ac2eae70 */ sw $t6,%lo(var8006ae70)($at) /* f0109fc: 2463d0b0 */ addiu $v1,$v1,%lo(var8009d0b0) /* f010a00: 2442d088 */ addiu $v0,$v0,%lo(var8009d088) .L0f010a04: @@ -31,10 +31,10 @@ glabel func0f0109d0 /* f010a08: 1443fffe */ bne $v0,$v1,.L0f010a04 /* f010a0c: ac40fffc */ sw $zero,-0x4($v0) .L0f010a10: -/* f010a10: 3c018007 */ lui $at,0x8007 +/* f010a10: 3c018007 */ lui $at,%hi(var8006ae74) /* f010a14: 3c02800a */ lui $v0,%hi(g_Objectives) /* f010a18: 3c03800a */ lui $v1,%hi(var8009d088) -/* f010a1c: ac20ae74 */ sw $zero,-0x518c($at) +/* f010a1c: ac20ae74 */ sw $zero,%lo(var8006ae74)($at) /* f010a20: 2463d088 */ addiu $v1,$v1,%lo(var8009d088) /* f010a24: 2442d060 */ addiu $v0,$v0,%lo(g_Objectives) .L0f010a28: diff --git a/src/game/game_010b20.c b/src/game/game_010b20.c index 7c1e17811..cb8e99e69 100644 --- a/src/game/game_010b20.c +++ b/src/game/game_010b20.c @@ -42,10 +42,10 @@ glabel func0f010b20 /* f010b68: 0062082b */ sltu $at,$v1,$v0 /* f010b6c: 1420fffd */ bnez $at,.L0f010b64 /* f010b70: ac60fffc */ sw $zero,-0x4($v1) -/* f010b74: 3c018007 */ lui $at,0x8007 +/* f010b74: 3c018007 */ lui $at,%hi(var80070524) /* f010b78: 3c03800a */ lui $v1,%hi(g_Fireslots) /* f010b7c: 3c04800a */ lui $a0,%hi(var8009d510) -/* f010b80: ac200524 */ sw $zero,0x524($at) +/* f010b80: ac200524 */ sw $zero,%lo(var80070524)($at) /* f010b84: 2484d510 */ addiu $a0,$a0,%lo(var8009d510) /* f010b88: 2463d150 */ addiu $v1,$v1,%lo(g_Fireslots) /* f010b8c: 2402ffff */ addiu $v0,$zero,-1 diff --git a/src/game/game_011110.c b/src/game/game_011110.c index acea49d8a..5a0e4e28b 100644 --- a/src/game/game_011110.c +++ b/src/game/game_011110.c @@ -59,12 +59,12 @@ glabel func0f011130 /* f011168: 00827021 */ addu $t6,$a0,$v0 /* f01116c: 01c57821 */ addu $t7,$t6,$a1 /* f011170: 25f80014 */ addiu $t8,$t7,0x14 -/* f011174: 3c018007 */ lui $at,0x8007 -/* f011178: ac3805a0 */ sw $t8,0x5a0($at) -/* f01117c: 3c018007 */ lui $at,0x8007 +/* f011174: 3c018007 */ lui $at,%hi(var800705a0) +/* f011178: ac3805a0 */ sw $t8,%lo(var800705a0)($at) +/* f01117c: 3c018007 */ lui $at,%hi(var800705a4) /* f011180: 24b90014 */ addiu $t9,$a1,0x14 /* f011184: 15280003 */ bne $t1,$t0,.L0f011194 -/* f011188: ac3905a4 */ sw $t9,0x5a4($at) +/* f011188: ac3905a4 */ sw $t9,%lo(var800705a4)($at) /* f01118c: 10000002 */ beqz $zero,.L0f011198 /* f011190: 24030018 */ addiu $v1,$zero,0x18 .L0f011194: @@ -340,17 +340,17 @@ glabel func0f011130 /* f011524: 5420fff9 */ bnezl $at,.L0f01150c /* f011528: 8d6f0000 */ lw $t7,0x0($t3) .L0f01152c: -/* f01152c: 3c018007 */ lui $at,0x8007 -/* f011530: ac2005ac */ sw $zero,0x5ac($at) -/* f011534: 3c018007 */ lui $at,0x8007 -/* f011538: ac2005b0 */ sw $zero,0x5b0($at) -/* f01153c: 3c018007 */ lui $at,0x8007 -/* f011540: ac2005b4 */ sw $zero,0x5b4($at) +/* f01152c: 3c018007 */ lui $at,%hi(var800705ac) +/* f011530: ac2005ac */ sw $zero,%lo(var800705ac)($at) +/* f011534: 3c018007 */ lui $at,%hi(var800705b0) +/* f011538: ac2005b0 */ sw $zero,%lo(var800705b0)($at) +/* f01153c: 3c018007 */ lui $at,%hi(var800705b4) +/* f011540: ac2005b4 */ sw $zero,%lo(var800705b4)($at) /* f011544: 8fbf0014 */ lw $ra,0x14($sp) -/* f011548: 3c018007 */ lui $at,0x8007 -/* f01154c: ac2005b8 */ sw $zero,0x5b8($at) -/* f011550: 3c018007 */ lui $at,0x8007 -/* f011554: ac2005bc */ sw $zero,0x5bc($at) +/* f011548: 3c018007 */ lui $at,%hi(var800705b8) +/* f01154c: ac2005b8 */ sw $zero,%lo(var800705b8)($at) +/* f011550: 3c018007 */ lui $at,%hi(var800705bc) +/* f011554: ac2005bc */ sw $zero,%lo(var800705bc)($at) /* f011558: 03e00008 */ jr $ra /* f01155c: 27bd0040 */ addiu $sp,$sp,0x40 ); @@ -520,21 +520,21 @@ glabel var7f1a827c /* f011940: e7a40088 */ swc1 $f4,0x88($sp) /* f011944: 0fc63956 */ jal func0f18e558 /* f011948: 00000000 */ sll $zero,$zero,0x0 -/* f01194c: 3c018007 */ lui $at,0x8007 -/* f011950: ac200764 */ sw $zero,0x764($at) +/* f01194c: 3c018007 */ lui $at,%hi(var80070764) +/* f011950: ac200764 */ sw $zero,%lo(var80070764)($at) /* f011954: 3c01800a */ lui $at,%hi(var8009de20) /* f011958: ac20de20 */ sw $zero,%lo(var8009de20)($at) /* f01195c: 24030001 */ addiu $v1,$zero,0x1 -/* f011960: 3c018007 */ lui $at,0x8007 -/* f011964: ac23072c */ sw $v1,0x72c($at) -/* f011968: 3c018007 */ lui $at,0x8007 -/* f01196c: ac200738 */ sw $zero,0x738($at) -/* f011970: 3c018007 */ lui $at,0x8007 -/* f011974: ac20073c */ sw $zero,0x73c($at) +/* f011960: 3c018007 */ lui $at,%hi(var8007072c) +/* f011964: ac23072c */ sw $v1,%lo(var8007072c)($at) +/* f011968: 3c018007 */ lui $at,%hi(var80070738) +/* f01196c: ac200738 */ sw $zero,%lo(var80070738)($at) +/* f011970: 3c018007 */ lui $at,%hi(var8007073c) +/* f011974: ac20073c */ sw $zero,%lo(var8007073c)($at) /* f011978: 3c11800a */ lui $s1,%hi(g_Vars) -/* f01197c: 3c018007 */ lui $at,0x8007 +/* f01197c: 3c018007 */ lui $at,%hi(g_CurrentGeCreditsData) /* f011980: 26319fc0 */ addiu $s1,$s1,%lo(g_Vars) -/* f011984: ac200740 */ sw $zero,0x740($at) +/* f011984: ac200740 */ sw $zero,%lo(g_CurrentGeCreditsData)($at) /* f011988: 8e2a0284 */ lw $t2,0x284($s1) /* f01198c: 3c01800a */ lui $at,%hi(g_NumSpawnPoints) /* f011990: 3c028007 */ lui $v0,%hi(g_PlayersWithControl) @@ -542,7 +542,7 @@ glabel var7f1a827c /* f011998: ac20de68 */ sw $zero,%lo(g_NumSpawnPoints)($at) /* f01199c: 8e2b0284 */ lw $t3,0x284($s1) /* f0119a0: 24420750 */ addiu $v0,$v0,%lo(g_PlayersWithControl) -/* f0119a4: 3c018007 */ lui $at,0x8007 +/* f0119a4: 3c018007 */ lui $at,%hi(g_PlayerInvincible) /* f0119a8: ad601b78 */ sw $zero,0x1b78($t3) /* f0119ac: 8e2c0284 */ lw $t4,0x284($s1) /* f0119b0: 00002025 */ or $a0,$zero,$zero @@ -552,13 +552,13 @@ glabel var7f1a827c /* f0119c0: ac430008 */ sw $v1,0x8($v0) /* f0119c4: ac43000c */ sw $v1,0xc($v0) /* f0119c8: 0fc2e58f */ jal setTickMode -/* f0119cc: ac200760 */ sw $zero,0x760($at) -/* f0119d0: 3c018007 */ lui $at,0x8007 -/* f0119d4: ac200744 */ sw $zero,0x744($at) -/* f0119d8: 3c018007 */ lui $at,0x8007 -/* f0119dc: ac200748 */ sw $zero,0x748($at) -/* f0119e0: 3c018007 */ lui $at,0x8007 -/* f0119e4: ac20074c */ sw $zero,0x74c($at) +/* f0119cc: ac200760 */ sw $zero,%lo(g_PlayerInvincible)($at) +/* f0119d0: 3c018007 */ lui $at,%hi(var80070744) +/* f0119d4: ac200744 */ sw $zero,%lo(var80070744)($at) +/* f0119d8: 3c018007 */ lui $at,%hi(var80070748) +/* f0119dc: ac200748 */ sw $zero,%lo(var80070748)($at) +/* f0119e0: 3c018007 */ lui $at,%hi(var8007074c) +/* f0119e4: ac20074c */ sw $zero,%lo(var8007074c)($at) /* f0119e8: 8e2d0284 */ lw $t5,0x284($s1) /* f0119ec: 44803000 */ mtc1 $zero,$f6 /* f0119f0: 3c01800a */ lui $at,%hi(g_DefaultWeaponArgument) @@ -717,9 +717,9 @@ glabel var7f1a827c /* f011c30: 3c0c800a */ lui $t4,%hi(g_GeCreditsData) /* f011c34: 8d8cd050 */ lw $t4,%lo(g_GeCreditsData)($t4) /* f011c38: 8e0d0004 */ lw $t5,0x4($s0) -/* f011c3c: 3c018007 */ lui $at,0x8007 +/* f011c3c: 3c018007 */ lui $at,%hi(g_CurrentGeCreditsData) /* f011c40: 018d1021 */ addu $v0,$t4,$t5 -/* f011c44: ac220740 */ sw $v0,0x740($at) +/* f011c44: ac220740 */ sw $v0,%lo(g_CurrentGeCreditsData)($at) /* f011c48: 94590000 */ lhu $t9,0x0($v0) /* f011c4c: 57200005 */ bnezl $t9,.L0f011c64 /* f011c50: 944e000c */ lhu $t6,0xc($v0) diff --git a/src/game/game_013010.c b/src/game/game_013010.c index 542b70fc5..3f709e210 100644 --- a/src/game/game_013010.c +++ b/src/game/game_013010.c @@ -12,10 +12,10 @@ GLOBAL_ASM( glabel func0f013010 -/* f013010: 3c018008 */ lui $at,0x8008 -/* f013014: ac20e4a0 */ sw $zero,-0x1b60($at) -/* f013018: 3c018008 */ lui $at,0x8008 -/* f01301c: ac20e4a4 */ sw $zero,-0x1b5c($at) +/* f013010: 3c018008 */ lui $at,%hi(var8007e4a0) +/* f013014: ac20e4a0 */ sw $zero,%lo(var8007e4a0)($at) +/* f013018: 3c018008 */ lui $at,%hi(var8007e4a4) +/* f01301c: ac20e4a4 */ sw $zero,%lo(var8007e4a4)($at) /* f013020: 3c013f80 */ lui $at,0x3f80 /* f013024: 44812000 */ mtc1 $at,$f4 /* f013028: 3c08800a */ lui $t0,%hi(var800a3434) diff --git a/src/game/game_013260.c b/src/game/game_013260.c index 6929ded5d..f754e6360 100644 --- a/src/game/game_013260.c +++ b/src/game/game_013260.c @@ -23,9 +23,9 @@ glabel func0f013260 /* f013280: ac60ffe4 */ sw $zero,-0x1c($v1) /* f013284: 3c01800a */ lui $at,%hi(var800a4130) /* f013288: ac204130 */ sw $zero,%lo(var800a4130)($at) -/* f01328c: 3c018008 */ lui $at,0x8008 +/* f01328c: 3c018008 */ lui $at,%hi(var8007f0b8) /* f013290: 03e00008 */ jr $ra -/* f013294: ac20f0b8 */ sw $zero,-0xf48($at) +/* f013294: ac20f0b8 */ sw $zero,%lo(var8007f0b8)($at) /* f013298: 00000000 */ sll $zero,$zero,0x0 /* f01329c: 00000000 */ sll $zero,$zero,0x0 ); diff --git a/src/game/game_0132a0.c b/src/game/game_0132a0.c index 4a71c63e7..1497c10c7 100644 --- a/src/game/game_0132a0.c +++ b/src/game/game_0132a0.c @@ -32,9 +32,9 @@ GLOBAL_ASM( glabel func0f0132a0 /* f0132a0: 3c038008 */ lui $v1,%hi(var8007f0c0) -/* f0132a4: 3c018006 */ lui $at,0x8006 +/* f0132a4: 3c018006 */ lui $at,%hi(var800623f0) /* f0132a8: 2463f0c0 */ addiu $v1,$v1,%lo(var8007f0c0) -/* f0132ac: ac2023f0 */ sw $zero,0x23f0($at) +/* f0132ac: ac2023f0 */ sw $zero,%lo(var800623f0)($at) /* f0132b0: ac600000 */ sw $zero,0x0($v1) /* f0132b4: 3c048008 */ lui $a0,%hi(g_StageIndex) /* f0132b8: 8c84fc00 */ lw $a0,%lo(g_StageIndex)($a0) @@ -183,7 +183,7 @@ glabel func0f0132a0 /* f0134cc: 44818000 */ mtc1 $at,$f16 /* f0134d0: ad000078 */ sw $zero,0x78($t0) /* f0134d4: 8c690000 */ lw $t1,0x0($v1) -/* f0134d8: 3c018006 */ lui $at,0x8006 +/* f0134d8: 3c018006 */ lui $at,%hi(var800623f0) /* f0134dc: ad200084 */ sw $zero,0x84($t1) /* f0134e0: 8c6a0000 */ lw $t2,0x0($v1) /* f0134e4: e54a00b8 */ swc1 $f10,0xb8($t2) @@ -203,7 +203,7 @@ glabel func0f0132a0 /* f01351c: af2000d0 */ sw $zero,0xd0($t9) /* f013520: 8c680000 */ lw $t0,0x0($v1) /* f013524: ad0000d4 */ sw $zero,0xd4($t0) -/* f013528: ac2523f0 */ sw $a1,0x23f0($at) +/* f013528: ac2523f0 */ sw $a1,%lo(var800623f0)($at) .L0f01352c: /* f01352c: 8fbf0014 */ lw $ra,0x14($sp) /* f013530: 27bd0018 */ addiu $sp,$sp,0x18 diff --git a/src/game/game_013550.c b/src/game/game_013550.c index a6934d157..e536fe39f 100644 --- a/src/game/game_013550.c +++ b/src/game/game_013550.c @@ -451,8 +451,8 @@ glabel func0f0139f0 /* f013b68: 8c890000 */ lw $t1,0x0($a0) .L0f013b6c: /* f013b6c: 8fbf0014 */ lw $ra,0x14($sp) -/* f013b70: 3c018008 */ lui $at,0x8008 -/* f013b74: ac20fa80 */ sw $zero,-0x580($at) +/* f013b70: 3c018008 */ lui $at,%hi(var8007fa80) +/* f013b74: ac20fa80 */ sw $zero,%lo(var8007fa80)($at) /* f013b78: 03e00008 */ jr $ra /* f013b7c: 27bd0018 */ addiu $sp,$sp,0x18 ); diff --git a/src/game/game_013cf0.c b/src/game/game_013cf0.c index 47c311826..39d663794 100644 --- a/src/game/game_013cf0.c +++ b/src/game/game_013cf0.c @@ -26,12 +26,12 @@ glabel func0f013cf0 /* f013d10: 000378c0 */ sll $t7,$v1,0x3 /* f013d14: 01e37823 */ subu $t7,$t7,$v1 /* f013d18: 000f78c0 */ sll $t7,$t7,0x3 -/* f013d1c: 3c048008 */ lui $a0,0x8008 +/* f013d1c: 3c048008 */ lui $a0,%hi(g_Stages+0xa) /* f013d20: 240e0002 */ addiu $t6,$zero,0x2 -/* f013d24: 3c018006 */ lui $at,0x8006 +/* f013d24: 3c018006 */ lui $at,%hi(var8005d9a0) /* f013d28: 008f2021 */ addu $a0,$a0,$t7 -/* f013d2c: a02ed9a0 */ sb $t6,-0x2660($at) -/* f013d30: 9484fcca */ lhu $a0,-0x336($a0) +/* f013d2c: a02ed9a0 */ sb $t6,%lo(var8005d9a0)($at) +/* f013d30: 9484fcca */ lhu $a0,%lo(g_Stages+0xa)($a0) /* f013d34: 0fc59c3f */ jal func0f1670fc /* f013d38: 24050022 */ addiu $a1,$zero,0x22 /* f013d3c: 3c04800a */ lui $a0,%hi(var8009a8a0) diff --git a/src/game/game_0147d0.c b/src/game/game_0147d0.c index afaaea7f5..93fe2f860 100644 --- a/src/game/game_0147d0.c +++ b/src/game/game_0147d0.c @@ -59,9 +59,9 @@ glabel func0f014820 /* f014830: 24630004 */ addiu $v1,$v1,0x4 /* f014834: 1462fffe */ bne $v1,$v0,.L0f014830 /* f014838: ac60fffc */ sw $zero,-0x4($v1) -/* f01483c: 3c018008 */ lui $at,0x8008 +/* f01483c: 3c018008 */ lui $at,%hi(g_NumMpSimulantChrs) /* f014840: 03e00008 */ jr $ra -/* f014844: a0207d10 */ sb $zero,0x7d10($at) +/* f014844: a0207d10 */ sb $zero,%lo(g_NumMpSimulantChrs)($at) ); GLOBAL_ASM( diff --git a/src/game/game_015280.c b/src/game/game_015280.c index 269d9b44c..aa2709b85 100644 --- a/src/game/game_015280.c +++ b/src/game/game_015280.c @@ -15,13 +15,13 @@ GLOBAL_ASM( glabel func0f015280 /* f015280: 27bdffd8 */ addiu $sp,$sp,-40 /* f015284: afbf0024 */ sw $ra,0x24($sp) -/* f015288: 3c018008 */ lui $at,0x8008 +/* f015288: 3c018008 */ lui $at,%hi(var8007e4a0) /* f01528c: 44806000 */ mtc1 $zero,$f12 /* f015290: afb20020 */ sw $s2,0x20($sp) /* f015294: afb1001c */ sw $s1,0x1c($sp) /* f015298: afb00018 */ sw $s0,0x18($sp) /* f01529c: 0c002a94 */ jal func0000aa50 -/* f0152a0: ac20e4a0 */ sw $zero,-0x1b60($at) +/* f0152a0: ac20e4a0 */ sw $zero,%lo(var8007e4a0)($at) /* f0152a4: 3c11800a */ lui $s1,%hi(var800a3430) /* f0152a8: 26313430 */ addiu $s1,$s1,%lo(var800a3430) /* f0152ac: 8e2e0000 */ lw $t6,0x0($s1) diff --git a/src/game/game_015470.c b/src/game/game_015470.c index 73e145aec..1c28cb041 100644 --- a/src/game/game_015470.c +++ b/src/game/game_015470.c @@ -161,10 +161,10 @@ glabel func0f0155f0 /* f015638: 3c19ba00 */ lui $t9,0xba00 /* f01563c: 0fc06bf0 */ jal func0f01afc0 /* f015640: 02002025 */ or $a0,$s0,$zero -/* f015644: 3c018006 */ lui $at,0x8006 +/* f015644: 3c018006 */ lui $at,%hi(var80062494) /* f015648: 00408025 */ or $s0,$v0,$zero /* f01564c: 10000023 */ beqz $zero,.L0f0156dc -/* f015650: ac202494 */ sw $zero,0x2494($at) +/* f015650: ac202494 */ sw $zero,%lo(var80062494)($at) .L0f015654: /* f015654: 37391402 */ ori $t9,$t9,0x1402 /* f015658: 3c0e0030 */ lui $t6,0x30 @@ -668,8 +668,8 @@ glabel func0f0155f0 /* f015df8: 8fb00030 */ lw $s0,0x30($sp) /* f015dfc: 03e00008 */ jr $ra /* f015e00: 27bd0108 */ addiu $sp,$sp,0x108 -/* f015e04: 3c018006 */ lui $at,0x8006 -/* f015e08: a0202414 */ sb $zero,0x2414($at) +/* f015e04: 3c018006 */ lui $at,%hi(var80062414) +/* f015e08: a0202414 */ sb $zero,%lo(var80062414)($at) /* f015e0c: 3c01445c */ lui $at,0x445c /* f015e10: 44812000 */ mtc1 $at,$f4 /* f015e14: 3c01800a */ lui $at,0x800a @@ -686,11 +686,11 @@ glabel func0f0155f0 /* f015e40: e4262484 */ swc1 $f6,0x2484($at) /* f015e44: afa5001c */ sw $a1,0x1c($sp) /* f015e48: 3c02800a */ lui $v0,%hi(var8009cc90) -/* f015e4c: 3c018006 */ lui $at,0x8006 +/* f015e4c: 3c018006 */ lui $at,%hi(var80062498) /* f015e50: 24c6003f */ addiu $a2,$a2,0x3f /* f015e54: 2442cc90 */ addiu $v0,$v0,%lo(var8009cc90) /* f015e58: afbf0014 */ sw $ra,0x14($sp) -/* f015e5c: ac202498 */ sw $zero,0x2498($at) +/* f015e5c: ac202498 */ sw $zero,%lo(var80062498)($at) /* f015e60: 34d8003f */ ori $t8,$a2,0x3f /* f015e64: 3c05007f */ lui $a1,0x7f /* f015e68: ac440000 */ sw $a0,0x0($v0) diff --git a/src/game/game_016100.c b/src/game/game_016100.c index 8d5458360..4c8dcfa68 100644 --- a/src/game/game_016100.c +++ b/src/game/game_016100.c @@ -245,15 +245,15 @@ glabel func0f016404 /* f01640c: 0fc5b4f4 */ jal func0f16d3d0 /* f016410: 00000000 */ sll $zero,$zero,0x0 /* f016414: 240e0001 */ addiu $t6,$zero,0x1 -/* f016418: 3c018006 */ lui $at,0x8006 -/* f01641c: ac2e24f4 */ sw $t6,0x24f4($at) -/* f016420: 3c018006 */ lui $at,0x8006 -/* f016424: ac2024c4 */ sw $zero,0x24c4($at) +/* f016418: 3c018006 */ lui $at,%hi(var800624f4) +/* f01641c: ac2e24f4 */ sw $t6,%lo(var800624f4)($at) +/* f016420: 3c018006 */ lui $at,%hi(var800624c4) +/* f016424: ac2024c4 */ sw $zero,%lo(var800624c4)($at) /* f016428: 8fbf0014 */ lw $ra,0x14($sp) -/* f01642c: 3c018006 */ lui $at,0x8006 -/* f016430: ac2024a8 */ sw $zero,0x24a8($at) -/* f016434: 3c018006 */ lui $at,0x8006 -/* f016438: ac2024ac */ sw $zero,0x24ac($at) +/* f01642c: 3c018006 */ lui $at,%hi(var800624a8) +/* f016430: ac2024a8 */ sw $zero,%lo(var800624a8)($at) +/* f016434: 3c018006 */ lui $at,%hi(var800624ac) +/* f016438: ac2024ac */ sw $zero,%lo(var800624ac)($at) /* f01643c: 03e00008 */ jr $ra /* f016440: 27bd0018 */ addiu $sp,$sp,0x18 ); @@ -309,8 +309,8 @@ GLOBAL_ASM( glabel func0f0164c8 /* f0164c8: 27bdffe8 */ addiu $sp,$sp,-24 /* f0164cc: afbf0014 */ sw $ra,0x14($sp) -/* f0164d0: 3c018006 */ lui $at,0x8006 -/* f0164d4: ac2024c4 */ sw $zero,0x24c4($at) +/* f0164d0: 3c018006 */ lui $at,%hi(var800624c4) +/* f0164d4: ac2024c4 */ sw $zero,%lo(var800624c4)($at) /* f0164d8: 0c0027b1 */ jal func00009ec4 /* f0164dc: 24040001 */ addiu $a0,$zero,0x1 /* f0164e0: 8fbf0014 */ lw $ra,0x14($sp) @@ -323,9 +323,9 @@ GLOBAL_ASM( glabel func0f0164f0 /* f0164f0: 27bdffe8 */ addiu $sp,$sp,-24 /* f0164f4: afbf0014 */ sw $ra,0x14($sp) -/* f0164f8: 3c018006 */ lui $at,0x8006 +/* f0164f8: 3c018006 */ lui $at,%hi(var800624e8) /* f0164fc: 0c0026ac */ jal func00009ab0 -/* f016500: ac2024e8 */ sw $zero,0x24e8($at) +/* f016500: ac2024e8 */ sw $zero,%lo(var800624e8)($at) /* f016504: 0c002aac */ jal func0000aab0 /* f016508: 24040002 */ addiu $a0,$zero,0x2 /* f01650c: 0c0027b1 */ jal func00009ec4 @@ -904,13 +904,13 @@ glabel var7f1a83e4 GLOBAL_ASM( glabel func0f016d34 /* f016d34: 27bdff90 */ addiu $sp,$sp,-112 -/* f016d38: 3c018006 */ lui $at,0x8006 +/* f016d38: 3c018006 */ lui $at,%hi(var800624c4) /* f016d3c: 3c0f8006 */ lui $t7,%hi(var80062738) /* f016d40: afbf0024 */ sw $ra,0x24($sp) /* f016d44: afb20020 */ sw $s2,0x20($sp) /* f016d48: afb1001c */ sw $s1,0x1c($sp) /* f016d4c: afb00018 */ sw $s0,0x18($sp) -/* f016d50: ac2024c4 */ sw $zero,0x24c4($at) +/* f016d50: ac2024c4 */ sw $zero,%lo(var800624c4)($at) /* f016d54: 25ef2738 */ addiu $t7,$t7,%lo(var80062738) /* f016d58: 8de10000 */ lw $at,0x0($t7) /* f016d5c: 3c10800a */ lui $s0,%hi(var8009cca0) @@ -1090,17 +1090,17 @@ glabel func0f016d34 /* f017014: 3c01800a */ lui $at,%hi(var8009ccb8) /* f017018: ac20ccb8 */ sw $zero,%lo(var8009ccb8)($at) /* f01701c: 24100001 */ addiu $s0,$zero,0x1 -/* f017020: 3c018006 */ lui $at,0x8006 -/* f017024: ac3024f4 */ sw $s0,0x24f4($at) +/* f017020: 3c018006 */ lui $at,%hi(var800624f4) +/* f017024: ac3024f4 */ sw $s0,%lo(var800624f4)($at) /* f017028: 0c005204 */ jal func00014810 /* f01702c: 00002025 */ or $a0,$zero,$zero /* f017030: 3c188006 */ lui $t8,%hi(var800624a8) /* f017034: 8f1824a8 */ lw $t8,%lo(var800624a8)($t8) -/* f017038: 3c018006 */ lui $at,0x8006 -/* f01703c: ac302730 */ sw $s0,0x2730($at) -/* f017040: 3c018006 */ lui $at,0x8006 +/* f017038: 3c018006 */ lui $at,%hi(var80062730) +/* f01703c: ac302730 */ sw $s0,%lo(var80062730)($at) +/* f017040: 3c018006 */ lui $at,%hi(var80062734) /* f017044: 13000003 */ beqz $t8,.L0f017054 -/* f017048: ac202734 */ sw $zero,0x2734($at) +/* f017048: ac202734 */ sw $zero,%lo(var80062734)($at) /* f01704c: 0fc05e60 */ jal func0f017980 /* f017050: 00000000 */ sll $zero,$zero,0x0 .L0f017054: @@ -1165,10 +1165,10 @@ glabel var7f1a83ec /* f017104: 8def9ff8 */ lw $t7,%lo(g_Vars+0x38)($t7) /* f017108: 8dce24c4 */ lw $t6,%lo(var800624c4)($t6) /* f01710c: 3c02800a */ lui $v0,%hi(var8009ccb8) -/* f017110: 3c018006 */ lui $at,0x8006 +/* f017110: 3c018006 */ lui $at,%hi(var800624c4) /* f017114: 01cfc021 */ addu $t8,$t6,$t7 /* f017118: 2442ccb8 */ addiu $v0,$v0,%lo(var8009ccb8) -/* f01711c: ac3824c4 */ sw $t8,0x24c4($at) +/* f01711c: ac3824c4 */ sw $t8,%lo(var800624c4)($at) /* f017120: 8c590000 */ lw $t9,0x0($v0) /* f017124: 24080001 */ addiu $t0,$zero,0x1 /* f017128: 3c0a8006 */ lui $t2,%hi(var80062734) @@ -1186,12 +1186,12 @@ glabel var7f1a83ec /* f017158: 24010001 */ addiu $at,$zero,0x1 /* f01715c: 240d0005 */ addiu $t5,$zero,0x5 /* f017160: 11810017 */ beq $t4,$at,.L0f0171c0 -/* f017164: 3c018006 */ lui $at,0x8006 +/* f017164: 3c018006 */ lui $at,%hi(var800624b4) /* f017168: 0fc4ed98 */ jal func0f13b660 -/* f01716c: ac2d24b4 */ sw $t5,0x24b4($at) +/* f01716c: ac2d24b4 */ sw $t5,%lo(var800624b4)($at) /* f017170: 240e005c */ addiu $t6,$zero,0x5c -/* f017174: 3c018006 */ lui $at,0x8006 -/* f017178: ac2e24e4 */ sw $t6,0x24e4($at) +/* f017174: 3c018006 */ lui $at,%hi(var800624e4) +/* f017178: ac2e24e4 */ sw $t6,%lo(var800624e4)($at) /* f01717c: 0fc068d5 */ jal setNumPlayers /* f017180: 24040001 */ addiu $a0,$zero,0x1 /* f017184: 3c048006 */ lui $a0,%hi(var800624e4) @@ -1235,8 +1235,8 @@ glabel var7f1a83ec /* f017210: ac480000 */ sw $t0,0x0($v0) /* f017214: 3c098006 */ lui $t1,%hi(var800624c4) /* f017218: 8d2924c4 */ lw $t1,%lo(var800624c4)($t1) -/* f01721c: 3c018006 */ lui $at,0x8006 -/* f017220: ac2824a8 */ sw $t0,0x24a8($at) +/* f01721c: 3c018006 */ lui $at,%hi(var800624a8) +/* f017220: ac2824a8 */ sw $t0,%lo(var800624a8)($at) /* f017224: 29210225 */ slti $at,$t1,0x225 /* f017228: 50200004 */ beqzl $at,.L0f01723c /* f01722c: 8fbf0014 */ lw $ra,0x14($sp) @@ -1799,45 +1799,45 @@ glabel var7f1a83fc /* f017a08: e42027c4 */ swc1 $f0,0x27c4($at) /* f017a0c: 3c018006 */ lui $at,0x8006 /* f017a10: e42027c8 */ swc1 $f0,0x27c8($at) -/* f017a14: 3c018006 */ lui $at,0x8006 -/* f017a18: ac2427c0 */ sw $a0,0x27c0($at) -/* f017a1c: 3c018006 */ lui $at,0x8006 -/* f017a20: ac2027cc */ sw $zero,0x27cc($at) -/* f017a24: 3c018006 */ lui $at,0x8006 -/* f017a28: ac2027d0 */ sw $zero,0x27d0($at) -/* f017a2c: 3c018006 */ lui $at,0x8006 -/* f017a30: ac2027d4 */ sw $zero,0x27d4($at) -/* f017a34: 3c018006 */ lui $at,0x8006 -/* f017a38: ac2027d8 */ sw $zero,0x27d8($at) -/* f017a3c: 3c018006 */ lui $at,0x8006 -/* f017a40: ac2027dc */ sw $zero,0x27dc($at) -/* f017a44: 3c018006 */ lui $at,0x8006 -/* f017a48: ac2027e0 */ sw $zero,0x27e0($at) -/* f017a4c: 3c018006 */ lui $at,0x8006 -/* f017a50: ac2027e4 */ sw $zero,0x27e4($at) -/* f017a54: 3c018006 */ lui $at,0x8006 -/* f017a58: ac2027e8 */ sw $zero,0x27e8($at) -/* f017a5c: 3c018006 */ lui $at,0x8006 -/* f017a60: ac2027ec */ sw $zero,0x27ec($at) -/* f017a64: 3c018006 */ lui $at,0x8006 -/* f017a68: ac2027f0 */ sw $zero,0x27f0($at) -/* f017a6c: 3c018006 */ lui $at,0x8006 -/* f017a70: ac2427f8 */ sw $a0,0x27f8($at) -/* f017a74: 3c018006 */ lui $at,0x8006 -/* f017a78: ac2427fc */ sw $a0,0x27fc($at) -/* f017a7c: 3c018006 */ lui $at,0x8006 -/* f017a80: ac202800 */ sw $zero,0x2800($at) -/* f017a84: 3c018006 */ lui $at,0x8006 -/* f017a88: ac242804 */ sw $a0,0x2804($at) -/* f017a8c: 3c018006 */ lui $at,0x8006 -/* f017a90: ac24280c */ sw $a0,0x280c($at) -/* f017a94: 3c018006 */ lui $at,0x8006 -/* f017a98: ac242810 */ sw $a0,0x2810($at) -/* f017a9c: 3c018006 */ lui $at,0x8006 -/* f017aa0: ac2e24c4 */ sw $t6,0x24c4($at) -/* f017aa4: 3c018006 */ lui $at,0x8006 +/* f017a14: 3c018006 */ lui $at,%hi(var800627c0) +/* f017a18: ac2427c0 */ sw $a0,%lo(var800627c0)($at) +/* f017a1c: 3c018006 */ lui $at,%hi(var800627cc) +/* f017a20: ac2027cc */ sw $zero,%lo(var800627cc)($at) +/* f017a24: 3c018006 */ lui $at,%hi(var800627d0) +/* f017a28: ac2027d0 */ sw $zero,%lo(var800627d0)($at) +/* f017a2c: 3c018006 */ lui $at,%hi(var800627d4) +/* f017a30: ac2027d4 */ sw $zero,%lo(var800627d4)($at) +/* f017a34: 3c018006 */ lui $at,%hi(var800627d8) +/* f017a38: ac2027d8 */ sw $zero,%lo(var800627d8)($at) +/* f017a3c: 3c018006 */ lui $at,%hi(var800627dc) +/* f017a40: ac2027dc */ sw $zero,%lo(var800627dc)($at) +/* f017a44: 3c018006 */ lui $at,%hi(var800627e0) +/* f017a48: ac2027e0 */ sw $zero,%lo(var800627e0)($at) +/* f017a4c: 3c018006 */ lui $at,%hi(var800627e4) +/* f017a50: ac2027e4 */ sw $zero,%lo(var800627e4)($at) +/* f017a54: 3c018006 */ lui $at,%hi(var800627e8) +/* f017a58: ac2027e8 */ sw $zero,%lo(var800627e8)($at) +/* f017a5c: 3c018006 */ lui $at,%hi(var800627ec) +/* f017a60: ac2027ec */ sw $zero,%lo(var800627ec)($at) +/* f017a64: 3c018006 */ lui $at,%hi(var800627f0) +/* f017a68: ac2027f0 */ sw $zero,%lo(var800627f0)($at) +/* f017a6c: 3c018006 */ lui $at,%hi(var800627f8) +/* f017a70: ac2427f8 */ sw $a0,%lo(var800627f8)($at) +/* f017a74: 3c018006 */ lui $at,%hi(var800627fc) +/* f017a78: ac2427fc */ sw $a0,%lo(var800627fc)($at) +/* f017a7c: 3c018006 */ lui $at,%hi(var80062800) +/* f017a80: ac202800 */ sw $zero,%lo(var80062800)($at) +/* f017a84: 3c018006 */ lui $at,%hi(var80062804) +/* f017a88: ac242804 */ sw $a0,%lo(var80062804)($at) +/* f017a8c: 3c018006 */ lui $at,%hi(var8006280c) +/* f017a90: ac24280c */ sw $a0,%lo(var8006280c)($at) +/* f017a94: 3c018006 */ lui $at,%hi(var80062810) +/* f017a98: ac242810 */ sw $a0,%lo(var80062810)($at) +/* f017a9c: 3c018006 */ lui $at,%hi(var800624c4) +/* f017aa0: ac2e24c4 */ sw $t6,%lo(var800624c4)($at) +/* f017aa4: 3c018006 */ lui $at,%hi(var80062730) /* f017aa8: 0fc5b7ae */ jal func0f16deb8 -/* f017aac: ac202730 */ sw $zero,0x2730($at) +/* f017aac: ac202730 */ sw $zero,%lo(var80062730)($at) /* f017ab0: 8fbf0014 */ lw $ra,0x14($sp) /* f017ab4: 27bd0018 */ addiu $sp,$sp,0x18 /* f017ab8: 03e00008 */ jr $ra @@ -1975,43 +1975,43 @@ glabel var7f1a8468 /* f017bd4: e42627b8 */ swc1 $f6,0x27b8($at) /* f017bd8: 3c018006 */ lui $at,0x8006 /* f017bdc: e43227bc */ swc1 $f18,0x27bc($at) -/* f017be0: 3c018006 */ lui $at,0x8006 -/* f017be4: ac2027c0 */ sw $zero,0x27c0($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) /* f017bf0: ac400000 */ sw $zero,0x0($v0) /* f017bf4: ac830000 */ sw $v1,0x0($a0) -/* f017bf8: 3c018006 */ lui $at,0x8006 -/* f017bfc: ac2027d0 */ sw $zero,0x27d0($at) +/* f017bf8: 3c018006 */ lui $at,%hi(var800627d0) +/* f017bfc: ac2027d0 */ sw $zero,%lo(var800627d0)($at) /* f017c00: ad200000 */ sw $zero,0x0($t1) /* f017c04: afe00000 */ sw $zero,0x0($ra) -/* f017c08: 3c018006 */ lui $at,0x8006 -/* f017c0c: ac2027dc */ sw $zero,0x27dc($at) +/* f017c08: 3c018006 */ lui $at,%hi(var800627dc) +/* f017c0c: ac2027dc */ sw $zero,%lo(var800627dc)($at) /* f017c10: ad400000 */ sw $zero,0x0($t2) -/* f017c14: 3c018006 */ lui $at,0x8006 -/* f017c18: ac2027e4 */ sw $zero,0x27e4($at) -/* f017c1c: 3c018006 */ lui $at,0x8006 -/* f017c20: ac2027e8 */ sw $zero,0x27e8($at) -/* f017c24: 3c018006 */ lui $at,0x8006 -/* f017c28: ac232804 */ sw $v1,0x2804($at) -/* f017c2c: 3c018006 */ lui $at,0x8006 -/* f017c30: ac2027ec */ sw $zero,0x27ec($at) +/* f017c14: 3c018006 */ lui $at,%hi(var800627e4) +/* f017c18: ac2027e4 */ sw $zero,%lo(var800627e4)($at) +/* f017c1c: 3c018006 */ lui $at,%hi(var800627e8) +/* f017c20: ac2027e8 */ sw $zero,%lo(var800627e8)($at) +/* f017c24: 3c018006 */ lui $at,%hi(var80062804) +/* f017c28: ac232804 */ sw $v1,%lo(var80062804)($at) +/* 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) -/* f017c40: 3c018006 */ lui $at,0x8006 -/* f017c44: ac2027fc */ sw $zero,0x27fc($at) -/* f017c48: 3c018006 */ lui $at,0x8006 -/* f017c4c: ac2f27f8 */ sw $t7,0x27f8($at) +/* f017c40: 3c018006 */ lui $at,%hi(var800627fc) +/* f017c44: ac2027fc */ sw $zero,%lo(var800627fc)($at) +/* f017c48: 3c018006 */ lui $at,%hi(var800627f8) +/* f017c4c: ac2f27f8 */ sw $t7,%lo(var800627f8)($at) /* f017c50: ada00000 */ sw $zero,0x0($t5) -/* f017c54: 3c018006 */ lui $at,0x8006 -/* f017c58: ac20280c */ sw $zero,0x280c($at) +/* f017c54: 3c018006 */ lui $at,%hi(var8006280c) +/* 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) -/* f017c6c: 3c018006 */ lui $at,0x8006 -/* f017c70: ac202810 */ sw $zero,0x2810($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) .L0f017c7c: @@ -2038,8 +2038,8 @@ glabel var7f1a8468 /* f017ccc: 14200005 */ bnez $at,.L0f017ce4 /* f017cd0: ac8e0000 */ sw $t6,0x0($a0) /* f017cd4: ac800000 */ sw $zero,0x0($a0) -/* f017cd8: 3c018006 */ lui $at,0x8006 -/* f017cdc: ac2327d0 */ sw $v1,0x27d0($at) +/* f017cd8: 3c018006 */ lui $at,%hi(var800627d0) +/* f017cdc: ac2327d0 */ sw $v1,%lo(var800627d0)($at) /* f017ce0: ad230000 */ sw $v1,0x0($t1) .L0f017ce4: /* f017ce4: 3c198006 */ lui $t9,%hi(var800627e4) @@ -2120,9 +2120,9 @@ glabel var7f1a8468 /* f017e00: 44817000 */ mtc1 $at,$f14 /* f017e04: 24030001 */ addiu $v1,$zero,0x1 /* f017e08: 45000021 */ bc1f .L0f017e90 -/* f017e0c: 3c018006 */ lui $at,0x8006 +/* f017e0c: 3c018006 */ lui $at,%hi(var800627e4) /* f017e10: 1000001f */ beqz $zero,.L0f017e90 -/* f017e14: ac2027e4 */ sw $zero,0x27e4($at) +/* f017e14: ac2027e4 */ sw $zero,%lo(var800627e4)($at) .L0f017e18: /* f017e18: 3c0f8006 */ lui $t7,%hi(var800627d0) /* f017e1c: 8def27d0 */ lw $t7,%lo(var800627d0)($t7) @@ -2190,8 +2190,8 @@ glabel var7f1a8468 /* f017f00: afe30000 */ sw $v1,0x0($ra) /* f017f04: 3c018006 */ lui $at,0x8006 /* f017f08: e43227bc */ swc1 $f18,0x27bc($at) -/* f017f0c: 3c018006 */ lui $at,0x8006 -/* f017f10: ac2327c0 */ sw $v1,0x27c0($at) +/* f017f0c: 3c018006 */ lui $at,%hi(var800627c0) +/* f017f10: ac2327c0 */ sw $v1,%lo(var800627c0)($at) .L0f017f14: /* f017f14: 8fef0000 */ lw $t7,0x0($ra) .L0f017f18: @@ -2282,10 +2282,10 @@ glabel var7f1a8468 /* f018054: 006f7023 */ subu $t6,$v1,$t7 /* f018058: 29c1001f */ slti $at,$t6,0x1f /* f01805c: 10200016 */ beqz $at,.L0f0180b8 -/* f018060: 3c018006 */ lui $at,0x8006 -/* f018064: ac2027d0 */ sw $zero,0x27d0($at) -/* f018068: 3c018006 */ lui $at,0x8006 -/* f01806c: ac2427e4 */ sw $a0,0x27e4($at) +/* f018060: 3c018006 */ lui $at,%hi(var800627d0) +/* 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) /* f018078: 3c014080 */ lui $at,0x4080 @@ -2367,18 +2367,18 @@ glabel var7f1a8468 /* f018194: 14200004 */ bnez $at,.L0f0181a8 /* f018198: ad990000 */ sw $t9,0x0($t4) /* f01819c: ad800000 */ sw $zero,0x0($t4) -/* f0181a0: 3c018006 */ lui $at,0x8006 -/* f0181a4: ac2427ec */ sw $a0,0x27ec($at) +/* f0181a0: 3c018006 */ lui $at,%hi(var800627ec) +/* f0181a4: ac2427ec */ sw $a0,%lo(var800627ec)($at) .L0f0181a8: /* f0181a8: 8dce27ec */ lw $t6,%lo(var800627ec)($t6) -/* f0181ac: 3c018006 */ lui $at,0x8006 +/* f0181ac: 3c018006 */ lui $at,%hi(var800627ec) /* f0181b0: 51c00004 */ beqzl $t6,.L0f0181c4 /* f0181b4: 8da20000 */ lw $v0,0x0($t5) -/* f0181b8: ac2027ec */ sw $zero,0x27ec($at) +/* f0181b8: ac2027ec */ sw $zero,%lo(var800627ec)($at) /* f0181bc: ada40000 */ sw $a0,0x0($t5) /* f0181c0: 8da20000 */ lw $v0,0x0($t5) .L0f0181c4: -/* f0181c4: 3c018006 */ lui $at,0x8006 +/* f0181c4: 3c018006 */ lui $at,%hi(var8006280c) /* f0181c8: 1040000f */ beqz $v0,.L0f018208 /* f0181cc: 00000000 */ sll $zero,$zero,0x0 /* f0181d0: 8d180038 */ lw $t8,0x38($t0) @@ -2404,7 +2404,7 @@ glabel var7f1a8468 /* f01821c: 252927f8 */ addiu $t1,$t1,%lo(var800627f8) /* f018220: 11c0002c */ beqz $t6,.L0f0182d4 /* f018224: 24c62810 */ addiu $a2,$a2,%lo(var80062810) -/* f018228: ac24280c */ sw $a0,0x280c($at) +/* f018228: ac24280c */ sw $a0,%lo(var8006280c)($at) /* f01822c: 8d220000 */ lw $v0,0x0($t1) /* f018230: 3c018006 */ lui $at,0x8006 /* f018234: 14400008 */ bnez $v0,.L0f018258 @@ -2506,8 +2506,8 @@ glabel var7f1a8468 /* f018398: 14200004 */ bnez $at,.L0f0183ac /* f01839c: acb90000 */ sw $t9,0x0($a1) /* f0183a0: aca00000 */ sw $zero,0x0($a1) -/* f0183a4: 3c018006 */ lui $at,0x8006 -/* f0183a8: ac242734 */ sw $a0,0x2734($at) +/* f0183a4: 3c018006 */ lui $at,%hi(var80062734) +/* f0183a8: ac242734 */ sw $a0,%lo(var80062734)($at) .L0f0183ac: /* f0183ac: 8fa40330 */ lw $a0,0x330($sp) .L0f0183b0: @@ -2598,7 +2598,7 @@ glabel var7f1a8468 /* f0184fc: 3c0142fe */ lui $at,0x42fe /* f018500: 44815000 */ mtc1 $at,$f10 /* f018504: c7a40050 */ lwc1 $f4,0x50($sp) -/* f018508: 3c018006 */ lui $at,0x8006 +/* f018508: 3c018006 */ lui $at,%hi(var80062588) /* f01850c: c7ac00e0 */ lwc1 $f12,0xe0($sp) /* f018510: 46045182 */ mul.s $f6,$f10,$f4 /* f018514: 00000000 */ sll $zero,$zero,0x0 @@ -2606,16 +2606,16 @@ glabel var7f1a8468 /* f01851c: 4600428d */ trunc.w.s $f10,$f8 /* f018520: 44195000 */ mfc1 $t9,$f10 /* f018524: 0c0068f7 */ jal sinf -/* f018528: a0392588 */ sb $t9,0x2588($at) +/* f018528: a0392588 */ sb $t9,%lo(var80062588)($at) /* f01852c: 3c0142fe */ lui $at,0x42fe /* f018530: 44812000 */ mtc1 $at,$f4 -/* f018534: 3c018006 */ lui $at,0x8006 +/* f018534: 3c018006 */ lui $at,%hi(var80062588+0x1) /* f018538: c7ac00e4 */ lwc1 $f12,0xe4($sp) /* f01853c: 46040182 */ mul.s $f6,$f0,$f4 /* f018540: 4600320d */ trunc.w.s $f8,$f6 /* f018544: 440e4000 */ mfc1 $t6,$f8 /* f018548: 0c0068f4 */ jal cosf -/* f01854c: a02e2589 */ sb $t6,0x2589($at) +/* f01854c: a02e2589 */ sb $t6,%lo(var80062588+0x1)($at) /* f018550: e7a00050 */ swc1 $f0,0x50($sp) /* f018554: 0c0068f4 */ jal cosf /* f018558: c7ac00e0 */ lwc1 $f12,0xe0($sp) @@ -2623,7 +2623,7 @@ glabel var7f1a8468 /* f018560: 44815000 */ mtc1 $at,$f10 /* f018564: c7a40050 */ lwc1 $f4,0x50($sp) /* f018568: 44809000 */ mtc1 $zero,$f18 -/* f01856c: 3c018006 */ lui $at,0x8006 +/* f01856c: 3c018006 */ lui $at,%hi(var80062588+0x2) /* f018570: 46045182 */ mul.s $f6,$f10,$f4 /* f018574: 44059000 */ mfc1 $a1,$f18 /* f018578: 44069000 */ mfc1 $a2,$f18 @@ -2638,7 +2638,7 @@ glabel var7f1a8468 /* f01859c: 4600428d */ trunc.w.s $f10,$f8 /* f0185a0: 44195000 */ mfc1 $t9,$f10 /* f0185a4: 00000000 */ sll $zero,$zero,0x0 -/* f0185a8: a039258a */ sb $t9,0x258a($at) +/* f0185a8: a039258a */ sb $t9,%lo(var80062588+0x2)($at) /* f0185ac: 3c013f80 */ lui $at,0x3f80 /* f0185b0: 44812000 */ mtc1 $at,$f4 /* f0185b4: 0c005ab9 */ jal func00016ae4 @@ -3105,7 +3105,7 @@ glabel var7f1a8468 .L0f018cac: /* f018cac: 24010003 */ addiu $at,$zero,0x3 /* f018cb0: 14410022 */ bne $v0,$at,.L0f018d3c -/* f018cb4: 3c058006 */ lui $a1,%hi(var80062508) +/* f018cb4: 3c058006 */ lui $a1,0x8006 /* f018cb8: 3c018006 */ lui $at,0x8006 /* f018cbc: c42027f4 */ lwc1 $f0,0x27f4($at) /* f018cc0: 3c013f00 */ lui $at,0x3f00 @@ -3153,7 +3153,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,%lo(var80062508)($a1) +/* f018d6c: 8ca52508 */ lw $a1,9480($a1) /* f018d70: afae0010 */ sw $t6,0x10($sp) /* f018d74: 03201025 */ or $v0,$t9,$zero /* f018d78: 8fa40330 */ lw $a0,0x330($sp) @@ -3179,13 +3179,13 @@ GLOBAL_ASM( glabel func0f018db0 /* f018db0: 27bdffe8 */ addiu $sp,$sp,-24 /* f018db4: afbf0014 */ sw $ra,0x14($sp) -/* f018db8: 3c018006 */ lui $at,0x8006 -/* f018dbc: ac2024c4 */ sw $zero,0x24c4($at) +/* f018db8: 3c018006 */ lui $at,%hi(var800624c4) +/* f018dbc: ac2024c4 */ sw $zero,%lo(var800624c4)($at) /* f018dc0: 0c005204 */ jal func00014810 /* f018dc4: 00002025 */ or $a0,$zero,$zero /* f018dc8: 8fbf0014 */ lw $ra,0x14($sp) -/* f018dcc: 3c018006 */ lui $at,0x8006 -/* f018dd0: ac202864 */ sw $zero,0x2864($at) +/* f018dcc: 3c018006 */ lui $at,%hi(var80062864) +/* f018dd0: ac202864 */ sw $zero,%lo(var80062864)($at) /* f018dd4: 03e00008 */ jr $ra /* f018dd8: 27bd0018 */ addiu $sp,$sp,0x18 ); @@ -3201,8 +3201,8 @@ glabel func0f018ddc /* f018df4: 0c00cec9 */ jal func00033b24 /* f018df8: 00000000 */ sll $zero,$zero,0x0 .L0f018dfc: -/* f018dfc: 3c018006 */ lui $at,0x8006 -/* f018e00: ac202864 */ sw $zero,0x2864($at) +/* f018dfc: 3c018006 */ lui $at,%hi(var80062864) +/* f018e00: ac202864 */ sw $zero,%lo(var80062864)($at) /* f018e04: 0c005204 */ jal func00014810 /* f018e08: 24040001 */ addiu $a0,$zero,0x1 /* f018e0c: 8fbf0014 */ lw $ra,0x14($sp) @@ -3411,8 +3411,8 @@ glabel func0f019088 /* f0190c4: 87ae003e */ lh $t6,0x3e($sp) /* f0190c8: 3c198006 */ lui $t9,%hi(var800624b4) /* f0190cc: 8f3924b4 */ lw $t9,%lo(var800624b4)($t9) -/* f0190d0: 3c018006 */ lui $at,0x8006 -/* f0190d4: ac202868 */ sw $zero,0x2868($at) +/* f0190d0: 3c018006 */ lui $at,%hi(var80062868) +/* f0190d4: ac202868 */ sw $zero,%lo(var80062868)($at) /* f0190d8: 004e7821 */ addu $t7,$v0,$t6 /* f0190dc: 25f8ffb0 */ addiu $t8,$t7,-80 /* f0190e0: 24010007 */ addiu $at,$zero,0x7 @@ -3631,18 +3631,18 @@ glabel func0f0193fc /* f019400: 8dce24a8 */ lw $t6,%lo(var800624a8)($t6) /* f019404: 27bdffd8 */ addiu $sp,$sp,-40 /* f019408: 3c05800a */ lui $a1,%hi(var8009cca0) -/* f01940c: 3c018006 */ lui $at,0x8006 +/* f01940c: 3c018006 */ lui $at,%hi(var800624ac) /* f019410: afbf0014 */ sw $ra,0x14($sp) /* f019414: 8ca5cca0 */ lw $a1,%lo(var8009cca0)($a1) /* f019418: 11c00005 */ beqz $t6,.L0f019430 -/* f01941c: ac2024ac */ sw $zero,0x24ac($at) +/* f01941c: ac2024ac */ sw $zero,%lo(var800624ac)($at) /* f019420: 240f00b4 */ addiu $t7,$zero,0xb4 -/* f019424: 3c018006 */ lui $at,0x8006 +/* f019424: 3c018006 */ lui $at,%hi(var800624c4) /* f019428: 10000003 */ beqz $zero,.L0f019438 -/* f01942c: ac2f24c4 */ sw $t7,0x24c4($at) +/* f01942c: ac2f24c4 */ sw $t7,%lo(var800624c4)($at) .L0f019430: -/* f019430: 3c018006 */ lui $at,0x8006 -/* f019434: ac2024c4 */ sw $zero,0x24c4($at) +/* f019430: 3c018006 */ lui $at,%hi(var800624c4) +/* f019434: ac2024c4 */ sw $zero,%lo(var800624c4)($at) .L0f019438: /* f019438: 3c198006 */ lui $t9,%hi(var80062870) /* f01943c: 27392870 */ addiu $t9,$t9,%lo(var80062870) @@ -3651,11 +3651,11 @@ glabel func0f0193fc /* f019448: 8f2a0004 */ lw $t2,0x4($t9) /* f01944c: af010000 */ sw $at,0x0($t8) /* f019450: 8f210008 */ lw $at,0x8($t9) -/* f019454: 3c048008 */ lui $a0,0x8008 +/* f019454: 3c048008 */ lui $a0,%hi(g_Props+0xa4) /* f019458: 3c060004 */ lui $a2,0x4 /* f01945c: af0a0004 */ sw $t2,0x4($t8) /* f019460: af010008 */ sw $at,0x8($t8) -/* f019464: 9484b110 */ lhu $a0,-0x4ef0($a0) +/* f019464: 9484b110 */ lhu $a0,%lo(g_Props+0xa4)($a0) /* f019468: 34c67800 */ ori $a2,$a2,0x7800 /* f01946c: 0fc69de5 */ jal func0f1a7794 /* f019470: 00003825 */ or $a3,$zero,$zero @@ -3664,9 +3664,9 @@ glabel func0f0193fc /* f01947c: ac6200a0 */ sw $v0,0xa0($v1) /* f019480: 0c008b49 */ jal func00022d24 /* f019484: 00402025 */ or $a0,$v0,$zero -/* f019488: 3c048008 */ lui $a0,0x8008 +/* f019488: 3c048008 */ lui $a0,%hi(g_Props+0xa0) /* f01948c: 0fc2cc2b */ jal func0f0b30ac -/* f019490: 8c84b10c */ lw $a0,-0x4ef4($a0) +/* f019490: 8c84b10c */ lw $a0,%lo(g_Props+0xa0)($a0) /* f019494: 3c038006 */ lui $v1,%hi(var800624f8) /* f019498: 246324f8 */ addiu $v1,$v1,%lo(var800624f8) /* f01949c: ac620000 */ sw $v0,0x0($v1) @@ -3678,8 +3678,8 @@ glabel func0f0193fc /* f0194b4: 0c006b4d */ jal func0001ad34 /* f0194b8: 27a50018 */ addiu $a1,$sp,0x18 /* f0194bc: 240b0001 */ addiu $t3,$zero,0x1 -/* f0194c0: 3c018006 */ lui $at,0x8006 -/* f0194c4: ac2b24f4 */ sw $t3,0x24f4($at) +/* f0194c0: 3c018006 */ lui $at,%hi(var800624f4) +/* f0194c4: ac2b24f4 */ sw $t3,%lo(var800624f4)($at) /* f0194c8: 0c005204 */ jal func00014810 /* f0194cc: 00002025 */ or $a0,$zero,$zero /* f0194d0: 8fbf0014 */ lw $ra,0x14($sp) @@ -3752,10 +3752,10 @@ glabel var7f1a8478 /* f0195a0: 3c098000 */ lui $t1,0x8000 /* f0195a4: 8d29030c */ lw $t1,0x30c($t1) /* f0195a8: 24020001 */ addiu $v0,$zero,0x1 -/* f0195ac: 3c018006 */ lui $at,0x8006 +/* f0195ac: 3c018006 */ lui $at,%hi(var800624a8) /* f0195b0: 14490009 */ bne $v0,$t1,.L0f0195d8 /* f0195b4: 3c0a8006 */ lui $t2,%hi(var800624a8) -/* f0195b8: ac2224a8 */ sw $v0,0x24a8($at) +/* f0195b8: ac2224a8 */ sw $v0,%lo(var800624a8)($at) /* f0195bc: 0fc069f9 */ jal func0f01a7e4 /* f0195c0: 24040002 */ addiu $a0,$zero,0x2 /* f0195c4: 3c038006 */ lui $v1,%hi(var800624c4) @@ -3782,8 +3782,8 @@ glabel var7f1a8478 /* f01960c: 24040002 */ addiu $a0,$zero,0x2 /* f019610: 29a1008d */ slti $at,$t5,0x8d /* f019614: 14200006 */ bnez $at,.L0f019630 -/* f019618: 3c018006 */ lui $at,0x8006 -/* f01961c: ac2224a8 */ sw $v0,0x24a8($at) +/* f019618: 3c018006 */ lui $at,%hi(var800624a8) +/* f01961c: ac2224a8 */ sw $v0,%lo(var800624a8)($at) /* f019620: 0fc069f9 */ jal func0f01a7e4 /* f019624: acc00000 */ sw $zero,0x0($a2) /* f019628: 3c038006 */ lui $v1,%hi(var800624c4) @@ -4107,10 +4107,10 @@ GLOBAL_ASM( glabel func0f019a80 /* f019a80: 27bdffd8 */ addiu $sp,$sp,-40 /* f019a84: 240efffd */ addiu $t6,$zero,-3 -/* f019a88: 3c018006 */ lui $at,0x8006 +/* f019a88: 3c018006 */ lui $at,%hi(var800624c4) /* f019a8c: 3c188006 */ lui $t8,%hi(var800628c8) /* f019a90: afbf0014 */ sw $ra,0x14($sp) -/* f019a94: ac2e24c4 */ sw $t6,0x24c4($at) +/* f019a94: ac2e24c4 */ sw $t6,%lo(var800624c4)($at) /* f019a98: 271828c8 */ addiu $t8,$t8,%lo(var800628c8) /* f019a9c: 8f010000 */ lw $at,0x0($t8) /* f019aa0: 3c05800a */ lui $a1,%hi(var8009cca0) @@ -4119,11 +4119,11 @@ glabel func0f019a80 /* f019aac: ade10000 */ sw $at,0x0($t7) /* f019ab0: 8f010008 */ lw $at,0x8($t8) /* f019ab4: 8f090004 */ lw $t1,0x4($t8) -/* f019ab8: 3c048008 */ lui $a0,0x8008 +/* f019ab8: 3c048008 */ lui $a0,%hi(g_Props+0xc04) /* f019abc: 3c060004 */ lui $a2,0x4 /* f019ac0: ade10008 */ sw $at,0x8($t7) /* f019ac4: ade90004 */ sw $t1,0x4($t7) -/* f019ac8: 9484bc70 */ lhu $a0,-0x4390($a0) +/* f019ac8: 9484bc70 */ lhu $a0,%lo(g_Props+0xc04)($a0) /* f019acc: 34c67800 */ ori $a2,$a2,0x7800 /* f019ad0: 0fc69de5 */ jal func0f1a7794 /* f019ad4: 00003825 */ or $a3,$zero,$zero @@ -4132,9 +4132,9 @@ glabel func0f019a80 /* f019ae0: ac620c00 */ sw $v0,0xc00($v1) /* f019ae4: 0c008b49 */ jal func00022d24 /* f019ae8: 00402025 */ or $a0,$v0,$zero -/* f019aec: 3c048008 */ lui $a0,0x8008 +/* f019aec: 3c048008 */ lui $a0,%hi(g_Props+0xc00) /* f019af0: 0fc2cc2b */ jal func0f0b30ac -/* f019af4: 8c84bc6c */ lw $a0,-0x4394($a0) +/* f019af4: 8c84bc6c */ lw $a0,%lo(g_Props+0xc00)($a0) /* f019af8: 3c038006 */ lui $v1,%hi(var800624f8) /* f019afc: 246324f8 */ addiu $v1,$v1,%lo(var800624f8) /* f019b00: ac620000 */ sw $v0,0x0($v1) @@ -4146,9 +4146,9 @@ glabel func0f019a80 /* f019b18: 0c006b4d */ jal func0001ad34 /* f019b1c: 27a50018 */ addiu $a1,$sp,0x18 /* f019b20: 240a0001 */ addiu $t2,$zero,0x1 -/* f019b24: 3c018006 */ lui $at,0x8006 +/* f019b24: 3c018006 */ lui $at,%hi(var800624f4) /* f019b28: 0fc5b4f4 */ jal func0f16d3d0 -/* f019b2c: ac2a24f4 */ sw $t2,0x24f4($at) +/* f019b2c: ac2a24f4 */ sw $t2,%lo(var800624f4)($at) /* f019b30: 0c005204 */ jal func00014810 /* f019b34: 00002025 */ or $a0,$zero,$zero /* f019b38: 3c028006 */ lui $v0,%hi(var800624a4) @@ -4242,8 +4242,8 @@ glabel var7f1a84a8 /* f019c54: 3c048006 */ lui $a0,%hi(var800624a8) /* f019c58: 14790008 */ bne $v1,$t9,.L0f019c7c /* f019c5c: 248424a8 */ addiu $a0,$a0,%lo(var800624a8) -/* f019c60: 3c018006 */ lui $at,0x8006 -/* f019c64: ac2324a8 */ sw $v1,0x24a8($at) +/* f019c60: 3c018006 */ lui $at,%hi(var800624a8) +/* f019c64: ac2324a8 */ sw $v1,%lo(var800624a8)($at) /* f019c68: 0fc069f9 */ jal func0f01a7e4 /* f019c6c: 24040002 */ addiu $a0,$zero,0x2 /* f019c70: 3c088006 */ lui $t0,%hi(var800624c4) @@ -4263,8 +4263,8 @@ glabel var7f1a84a8 /* f019ca4: 10000004 */ beqz $zero,.L0f019cb8 /* f019ca8: ad0a0000 */ sw $t2,0x0($t0) .L0f019cac: -/* f019cac: 3c018006 */ lui $at,0x8006 -/* f019cb0: ac2324ac */ sw $v1,0x24ac($at) +/* f019cac: 3c018006 */ lui $at,%hi(var800624ac) +/* f019cb0: ac2324ac */ sw $v1,%lo(var800624ac)($at) /* f019cb4: ac830000 */ sw $v1,0x0($a0) .L0f019cb8: /* f019cb8: 8d020000 */ lw $v0,0x0($t0) @@ -4778,18 +4778,18 @@ glabel var7f1a84c0 /* f01a3b8: 27bdffe8 */ addiu $sp,$sp,-24 /* f01a3bc: afbf0014 */ sw $ra,0x14($sp) /* f01a3c0: 240e0026 */ addiu $t6,$zero,0x26 -/* f01a3c4: 3c018006 */ lui $at,0x8006 -/* f01a3c8: ac2e24e4 */ sw $t6,0x24e4($at) +/* f01a3c4: 3c018006 */ lui $at,%hi(var800624e4) +/* f01a3c8: ac2e24e4 */ sw $t6,%lo(var800624e4)($at) /* f01a3cc: 0fc068d5 */ jal setNumPlayers /* f01a3d0: 24040001 */ addiu $a0,$zero,0x1 /* f01a3d4: 3c038006 */ lui $v1,%hi(var800624a4) /* f01a3d8: 246324a4 */ addiu $v1,$v1,%lo(var800624a4) /* f01a3dc: 8c620000 */ lw $v0,0x0($v1) /* f01a3e0: 240f0030 */ addiu $t7,$zero,0x30 -/* f01a3e4: 3c018006 */ lui $at,0x8006 +/* f01a3e4: 3c018006 */ lui $at,%hi(var800624e4) /* f01a3e8: 10400004 */ beqz $v0,.L0f01a3fc /* f01a3ec: 3c198009 */ lui $t9,%hi(g_Is4Mb) -/* f01a3f0: ac2f24e4 */ sw $t7,0x24e4($at) +/* f01a3f0: ac2f24e4 */ sw $t7,%lo(var800624e4)($at) /* f01a3f4: 24580001 */ addiu $t8,$v0,0x1 /* f01a3f8: ac780000 */ sw $t8,0x0($v1) .L0f01a3fc: @@ -4797,8 +4797,8 @@ glabel var7f1a84c0 /* f01a400: 24010001 */ addiu $at,$zero,0x1 /* f01a404: 2408005d */ addiu $t0,$zero,0x5d /* f01a408: 17210011 */ bne $t9,$at,.L0f01a450 -/* f01a40c: 3c018006 */ lui $at,0x8006 -/* f01a410: ac2824e4 */ sw $t0,0x24e4($at) +/* f01a40c: 3c018006 */ lui $at,%hi(var800624e4) +/* f01a410: ac2824e4 */ sw $t0,%lo(var800624e4)($at) /* f01a414: 3c017f1b */ lui $at,%hi(var7f1a84c0) /* f01a418: 0c002f5f */ jal func0000bd7c /* f01a41c: c42c84c0 */ lwc1 $f12,%lo(var7f1a84c0)($at) @@ -4836,9 +4836,9 @@ glabel var7f1a84c0 GLOBAL_ASM( glabel func0f01a494 -/* f01a494: 3c018006 */ lui $at,0x8006 +/* f01a494: 3c018006 */ lui $at,%hi(var800624c4) /* f01a498: 03e00008 */ jr $ra -/* f01a49c: ac2024c4 */ sw $zero,0x24c4($at) +/* f01a49c: ac2024c4 */ sw $zero,%lo(var800624c4)($at) ); void func0f01a4a0(void) @@ -5077,10 +5077,10 @@ GLOBAL_ASM( glabel func0f01a7e4 /* f01a7e4: 3c0e8006 */ lui $t6,%hi(var800624c0) /* f01a7e8: 8dce24c0 */ lw $t6,%lo(var800624c0)($t6) -/* f01a7ec: 3c018006 */ lui $at,0x8006 +/* f01a7ec: 3c018006 */ lui $at,%hi(var800624b8) /* f01a7f0: 108e0002 */ beq $a0,$t6,.L0f01a7fc /* f01a7f4: 00000000 */ sll $zero,$zero,0x0 -/* f01a7f8: ac2424b8 */ sw $a0,0x24b8($at) +/* f01a7f8: ac2424b8 */ sw $a0,%lo(var800624b8)($at) .L0f01a7fc: /* f01a7fc: 03e00008 */ jr $ra /* f01a800: 00000000 */ sll $zero,$zero,0x0 @@ -5177,8 +5177,8 @@ glabel var7f1a851c /* f01a8ac: accf0000 */ sw $t7,0x0($a2) /* f01a8b0: 3c028006 */ lui $v0,%hi(var800624b4) /* f01a8b4: 8c4224b4 */ lw $v0,%lo(var800624b4)($v0) -/* f01a8b8: 3c018006 */ lui $at,0x8006 -/* f01a8bc: ac2324c0 */ sw $v1,0x24c0($at) +/* f01a8b8: 3c018006 */ lui $at,%hi(var800624c0) +/* f01a8bc: ac2324c0 */ sw $v1,%lo(var800624c0)($at) /* f01a8c0: 2c410007 */ sltiu $at,$v0,0x7 /* f01a8c4: 1020002f */ beqz $at,.L0f01a984 /* f01a8c8: 0002c080 */ sll $t8,$v0,0x2 @@ -5258,23 +5258,23 @@ glabel var7f1a851c /* f01a9e0: 8ca30000 */ lw $v1,0x0($a1) /* f01a9e4: 3c028006 */ lui $v0,%hi(var800624c0) /* f01a9e8: 8c4224c0 */ lw $v0,%lo(var800624c0)($v0) -/* f01a9ec: 3c018006 */ lui $at,0x8006 +/* f01a9ec: 3c018006 */ lui $at,%hi(var800624c0) /* f01a9f0: 50820004 */ beql $a0,$v0,.L0f01aa04 /* f01a9f4: 8ca30000 */ lw $v1,0x0($a1) /* f01a9f8: aca20000 */ sw $v0,0x0($a1) -/* f01a9fc: ac2424c0 */ sw $a0,0x24c0($at) +/* f01a9fc: ac2424c0 */ sw $a0,%lo(var800624c0)($at) .L0f01aa00: /* f01aa00: 8ca30000 */ lw $v1,0x0($a1) .L0f01aa04: -/* f01aa04: 3c018006 */ lui $at,0x8006 +/* f01aa04: 3c018006 */ lui $at,%hi(var800624b4) /* f01aa08: 04600038 */ bltz $v1,.L0f01aaec /* f01aa0c: 00000000 */ sll $zero,$zero,0x0 -/* f01aa10: ac2324b4 */ sw $v1,0x24b4($at) +/* f01aa10: ac2324b4 */ sw $v1,%lo(var800624b4)($at) /* f01aa14: aca40000 */ sw $a0,0x0($a1) /* f01aa18: 3c028006 */ lui $v0,%hi(var800624b4) /* f01aa1c: 8c4224b4 */ lw $v0,%lo(var800624b4)($v0) -/* f01aa20: 3c018006 */ lui $at,0x8006 -/* f01aa24: ac2024ac */ sw $zero,0x24ac($at) +/* f01aa20: 3c018006 */ lui $at,%hi(var800624ac) +/* f01aa24: ac2024ac */ sw $zero,%lo(var800624ac)($at) /* f01aa28: 2c410007 */ sltiu $at,$v0,0x7 /* f01aa2c: 10200028 */ beqz $at,.L0f01aad0 /* f01aa30: 00025080 */ sll $t2,$v0,0x2 @@ -5470,10 +5470,10 @@ glabel var7f1a8540 /* f01ac88: 8fbf0014 */ lw $ra,0x14($sp) .L0f01ac8c: /* f01ac8c: 2402ffff */ addiu $v0,$zero,-1 -/* f01ac90: 3c018006 */ lui $at,0x8006 -/* f01ac94: ac2224b8 */ sw $v0,0x24b8($at) -/* f01ac98: 3c018006 */ lui $at,0x8006 -/* f01ac9c: ac2224b4 */ sw $v0,0x24b4($at) +/* f01ac90: 3c018006 */ lui $at,%hi(var800624b8) +/* f01ac94: ac2224b8 */ sw $v0,%lo(var800624b8)($at) +/* f01ac98: 3c018006 */ lui $at,%hi(var800624b4) +/* f01ac9c: ac2224b4 */ sw $v0,%lo(var800624b4)($at) /* f01aca0: 03e00008 */ jr $ra /* f01aca4: 27bd0018 */ addiu $sp,$sp,0x18 ); @@ -5504,39 +5504,39 @@ glabel var7f1a8554 /* f01accc: 01c00008 */ jr $t6 /* f01acd0: 00000000 */ sll $zero,$zero,0x0 /* f01acd4: 240f0007 */ addiu $t7,$zero,0x7 -/* f01acd8: 3c018006 */ lui $at,0x8006 +/* f01acd8: 3c018006 */ lui $at,%hi(var800624b4) /* f01acdc: 0fc0636c */ jal func0f018db0 -/* f01ace0: ac2f24b4 */ sw $t7,0x24b4($at) +/* f01ace0: ac2f24b4 */ sw $t7,%lo(var800624b4)($at) /* f01ace4: 10000018 */ beqz $zero,.L0f01ad48 /* f01ace8: 8fbf0014 */ lw $ra,0x14($sp) /* f01acec: 24180004 */ addiu $t8,$zero,0x4 -/* f01acf0: 3c018006 */ lui $at,0x8006 +/* f01acf0: 3c018006 */ lui $at,%hi(var800624b4) /* f01acf4: 0fc066a0 */ jal func0f019a80 -/* f01acf8: ac3824b4 */ sw $t8,0x24b4($at) +/* f01acf8: ac3824b4 */ sw $t8,%lo(var800624b4)($at) /* f01acfc: 10000012 */ beqz $zero,.L0f01ad48 /* f01ad00: 8fbf0014 */ lw $ra,0x14($sp) /* f01ad04: 24190008 */ addiu $t9,$zero,0x8 -/* f01ad08: 3c018006 */ lui $at,0x8006 +/* f01ad08: 3c018006 */ lui $at,%hi(var800624b4) /* f01ad0c: 0fc0636c */ jal func0f018db0 -/* f01ad10: ac3924b4 */ sw $t9,0x24b4($at) +/* f01ad10: ac3924b4 */ sw $t9,%lo(var800624b4)($at) /* f01ad14: 1000000c */ beqz $zero,.L0f01ad48 /* f01ad18: 8fbf0014 */ lw $ra,0x14($sp) /* f01ad1c: 24080003 */ addiu $t0,$zero,0x3 -/* f01ad20: 3c018006 */ lui $at,0x8006 +/* f01ad20: 3c018006 */ lui $at,%hi(var800624b4) /* f01ad24: 0fc064ff */ jal func0f0193fc -/* f01ad28: ac2824b4 */ sw $t0,0x24b4($at) +/* f01ad28: ac2824b4 */ sw $t0,%lo(var800624b4)($at) /* f01ad2c: 10000006 */ beqz $zero,.L0f01ad48 /* f01ad30: 8fbf0014 */ lw $ra,0x14($sp) /* f01ad34: 24090002 */ addiu $t1,$zero,0x2 -/* f01ad38: 3c018006 */ lui $at,0x8006 +/* f01ad38: 3c018006 */ lui $at,%hi(var800624b4) /* f01ad3c: 0fc05b4d */ jal func0f016d34 -/* f01ad40: ac2924b4 */ sw $t1,0x24b4($at) +/* f01ad40: ac2924b4 */ sw $t1,%lo(var800624b4)($at) .L0f01ad44: /* f01ad44: 8fbf0014 */ lw $ra,0x14($sp) .L0f01ad48: /* f01ad48: 240affff */ addiu $t2,$zero,-1 -/* f01ad4c: 3c018006 */ lui $at,0x8006 -/* f01ad50: ac2a24b8 */ sw $t2,0x24b8($at) +/* f01ad4c: 3c018006 */ lui $at,%hi(var800624b8) +/* f01ad50: ac2a24b8 */ sw $t2,%lo(var800624b8)($at) /* f01ad54: 03e00008 */ jr $ra /* f01ad58: 27bd0018 */ addiu $sp,$sp,0x18 ); diff --git a/src/game/game_01b0a0.c b/src/game/game_01b0a0.c index bb5808917..be82e81ac 100644 --- a/src/game/game_01b0a0.c +++ b/src/game/game_01b0a0.c @@ -85,16 +85,16 @@ glabel func0f01b114 GLOBAL_ASM( glabel func0f01b148 -/* f01b148: 3c018006 */ lui $at,0x8006 +/* f01b148: 3c018006 */ lui $at,%hi(var800624e0) /* f01b14c: 03e00008 */ jr $ra -/* f01b150: ac2424e0 */ sw $a0,0x24e0($at) +/* f01b150: ac2424e0 */ sw $a0,%lo(var800624e0)($at) ); GLOBAL_ASM( glabel func0f01b154 -/* f01b154: 3c018006 */ lui $at,0x8006 +/* f01b154: 3c018006 */ lui $at,%hi(var800624e4) /* f01b158: 03e00008 */ jr $ra -/* f01b15c: ac2424e4 */ sw $a0,0x24e4($at) +/* f01b15c: ac2424e4 */ sw $a0,%lo(var800624e4)($at) ); GLOBAL_ASM( diff --git a/src/game/game_01bea0.c b/src/game/game_01bea0.c index 348a62f9f..7e66ceef0 100644 --- a/src/game/game_01bea0.c +++ b/src/game/game_01bea0.c @@ -48,10 +48,10 @@ glabel func0f01bea0 /* f01beac: 27bdffe8 */ addiu $sp,$sp,-24 /* f01beb0: afbf0014 */ sw $ra,0x14($sp) /* f01beb4: 11c00006 */ beqz $t6,.L0f01bed0 -/* f01beb8: 3c018006 */ lui $at,0x8006 +/* f01beb8: 3c018006 */ lui $at,%hi(var80062948) /* f01bebc: a0400000 */ sb $zero,0x0($v0) /* f01bec0: 0c004e72 */ jal func000139c8 -/* f01bec4: a0202948 */ sb $zero,0x2948($at) +/* f01bec4: a0202948 */ sb $zero,%lo(var80062948)($at) /* f01bec8: 0fc442fe */ jal func0f110bf8 /* f01becc: 00000000 */ sll $zero,$zero,0x0 .L0f01bed0: @@ -121,12 +121,12 @@ glabel var7f1a863c /* f01bf5c: 16ce0005 */ bne $s6,$t6,.L0f01bf74 /* f01bf60: 00008025 */ or $s0,$zero,$zero /* f01bf64: 240f0002 */ addiu $t7,$zero,0x2 -/* f01bf68: 3c018008 */ lui $at,0x8008 +/* f01bf68: 3c018008 */ lui $at,%hi(var8007fac0) /* f01bf6c: 10000003 */ beqz $zero,.L0f01bf7c -/* f01bf70: ac2ffac0 */ sw $t7,-0x540($at) +/* f01bf70: ac2ffac0 */ sw $t7,%lo(var8007fac0)($at) .L0f01bf74: -/* f01bf74: 3c018008 */ lui $at,0x8008 -/* f01bf78: ac36fac0 */ sw $s6,-0x540($at) +/* f01bf74: 3c018008 */ lui $at,%hi(var8007fac0) +/* f01bf78: ac36fac0 */ sw $s6,%lo(var8007fac0)($at) .L0f01bf7c: /* f01bf7c: 0fc01a77 */ jal func0f0069dc /* f01bf80: 00000000 */ sll $zero,$zero,0x0 @@ -403,8 +403,8 @@ glabel var7f1a863c /* f01c32c: 0078c824 */ and $t9,$v1,$t8 /* f01c330: 13200026 */ beqz $t9,.L0f01c3cc /* f01c334: a1000494 */ sb $zero,0x494($t0) -/* f01c338: 3c018007 */ lui $at,0x8007 -/* f01c33c: ac311448 */ sw $s1,0x1448($at) +/* f01c338: 3c018007 */ lui $at,%hi(g_MpPlayerNum) +/* f01c33c: ac311448 */ sw $s1,%lo(g_MpPlayerNum)($at) /* f01c340: 8e6d0490 */ lw $t5,0x490($s3) /* f01c344: 8e820000 */ lw $v0,0x0($s4) /* f01c348: 02c02025 */ or $a0,$s6,$zero @@ -449,10 +449,10 @@ glabel var7f1a863c /* f01c3d0: 24010004 */ addiu $at,$zero,0x4 /* f01c3d4: 1621ffd3 */ bne $s1,$at,.L0f01c324 /* f01c3d8: 25080001 */ addiu $t0,$t0,0x1 -/* f01c3dc: 3c018007 */ lui $at,0x8007 +/* f01c3dc: 3c018007 */ lui $at,%hi(g_MpPlayerNum) /* f01c3e0: 3079000f */ andi $t9,$v1,0xf /* f01c3e4: 13200019 */ beqz $t9,.L0f01c44c -/* f01c3e8: ac201448 */ sw $zero,0x1448($at) +/* f01c3e8: ac201448 */ sw $zero,%lo(g_MpPlayerNum)($at) /* f01c3ec: 3c01bf80 */ lui $at,0xbf80 /* f01c3f0: 44818000 */ mtc1 $at,$f16 /* f01c3f4: 3c048009 */ lui $a0,%hi(var80095200) @@ -479,14 +479,14 @@ glabel var7f1a863c /* f01c444: 0fc2ebc3 */ jal currentPlayerPause /* f01c448: 00000000 */ sll $zero,$zero,0x0 .L0f01c44c: -/* f01c44c: 3c018008 */ lui $at,0x8008 +/* f01c44c: 3c018008 */ lui $at,%hi(var80087260) /* f01c450: 10000005 */ beqz $zero,.L0f01c468 -/* f01c454: ac207260 */ sw $zero,0x7260($at) +/* f01c454: ac207260 */ sw $zero,%lo(var80087260)($at) .L0f01c458: /* f01c458: 0c0027b1 */ jal func00009ec4 /* f01c45c: 02c02025 */ or $a0,$s6,$zero -/* f01c460: 3c018007 */ lui $at,0x8007 -/* f01c464: ac200750 */ sw $zero,0x750($at) +/* f01c460: 3c018007 */ lui $at,%hi(g_PlayersWithControl) +/* f01c464: ac200750 */ sw $zero,%lo(g_PlayersWithControl)($at) .L0f01c468: /* f01c468: 3c198006 */ lui $t9,%hi(var80062940) /* f01c46c: 93392940 */ lbu $t9,%lo(var80062940)($t9) @@ -497,8 +497,8 @@ glabel var7f1a863c /* f01c480: 8e6d04b4 */ lw $t5,0x4b4($s3) /* f01c484: 24010026 */ addiu $at,$zero,0x26 /* f01c488: 15a10016 */ bne $t5,$at,.L0f01c4e4 -/* f01c48c: 3c018007 */ lui $at,0x8007 -/* f01c490: ac200750 */ sw $zero,0x750($at) +/* f01c48c: 3c018007 */ lui $at,%hi(g_PlayersWithControl) +/* f01c490: ac200750 */ sw $zero,%lo(g_PlayersWithControl)($at) /* f01c494: 8e6e000c */ lw $t6,0xc($s3) /* f01c498: 29c1001f */ slti $at,$t6,0x1f /* f01c49c: 54200012 */ bnezl $at,.L0f01c4e8 @@ -517,16 +517,16 @@ glabel var7f1a863c /* f01c4d0: 0fc2ebc3 */ jal currentPlayerPause /* f01c4d4: af001a24 */ sw $zero,0x1a24($t8) /* f01c4d8: 24190001 */ addiu $t9,$zero,0x1 -/* f01c4dc: 3c018006 */ lui $at,0x8006 -/* f01c4e0: a0392940 */ sb $t9,0x2940($at) +/* f01c4dc: 3c018006 */ lui $at,%hi(var80062940) +/* f01c4e0: a0392940 */ sb $t9,%lo(var80062940)($at) .L0f01c4e4: /* f01c4e4: 8ead0000 */ lw $t5,0x0($s5) .L0f01c4e8: /* f01c4e8: ae600498 */ sw $zero,0x498($s3) /* f01c4ec: 19a0018e */ blez $t5,.L0f01cb28 /* f01c4f0: 240e0001 */ addiu $t6,$zero,0x1 -/* f01c4f4: 3c018006 */ lui $at,0x8006 -/* f01c4f8: a02e294c */ sb $t6,0x294c($at) +/* f01c4f4: 3c018006 */ lui $at,%hi(var8006294c) +/* f01c4f8: a02e294c */ sb $t6,%lo(var8006294c)($at) /* f01c4fc: 8ea30004 */ lw $v1,0x4($s5) /* f01c500: 24010003 */ addiu $at,$zero,0x3 /* f01c504: 00008825 */ or $s1,$zero,$zero @@ -974,8 +974,8 @@ glabel var7f1a863c /* f01cb20: 10000003 */ beqz $zero,.L0f01cb30 /* f01cb24: 00000000 */ sll $zero,$zero,0x0 .L0f01cb28: -/* f01cb28: 3c018006 */ lui $at,0x8006 -/* f01cb2c: a020294c */ sb $zero,0x294c($at) +/* f01cb28: 3c018006 */ lui $at,%hi(var8006294c) +/* f01cb2c: a020294c */ sb $zero,%lo(var8006294c)($at) .L0f01cb30: /* f01cb30: 3c0d8006 */ lui $t5,%hi(var8006294c) /* f01cb34: 91ad294c */ lbu $t5,%lo(var8006294c)($t5) @@ -1001,8 +1001,8 @@ glabel var7f1a863c /* f01cb80: 0fc44317 */ jal func0f110c5c /* f01cb84: 24050001 */ addiu $a1,$zero,0x1 .L0f01cb88: -/* f01cb88: 3c188006 */ lui $t8,%hi(var8006000c) -/* f01cb8c: 93182944 */ lbu $t8,0x2944($t8) +/* f01cb88: 3c188006 */ lui $t8,%hi(var80062944) +/* f01cb8c: 93182944 */ lbu $t8,%lo(var80062944)($t8) /* f01cb90: 1300000b */ beqz $t8,.L0f01cbc0 /* f01cb94: 00000000 */ sll $zero,$zero,0x0 /* f01cb98: 0fc4436a */ jal func0f110da8 @@ -1010,17 +1010,17 @@ glabel var7f1a863c /* f01cba0: 10000007 */ beqz $zero,.L0f01cbc0 /* f01cba4: 00000000 */ sll $zero,$zero,0x0 .L0f01cba8: -/* f01cba8: 3c198006 */ lui $t9,%hi(var8006000c) -/* f01cbac: 93392944 */ lbu $t9,0x2944($t9) +/* f01cba8: 3c198006 */ lui $t9,%hi(var80062944) +/* f01cbac: 93392944 */ lbu $t9,%lo(var80062944)($t9) /* f01cbb0: 16d90003 */ bne $s6,$t9,.L0f01cbc0 /* f01cbb4: 00000000 */ sll $zero,$zero,0x0 /* f01cbb8: 0fc06fa8 */ jal func0f01bea0 /* f01cbbc: 00000000 */ sll $zero,$zero,0x0 .L0f01cbc0: -/* f01cbc0: 3c018007 */ lui $at,0x8007 +/* f01cbc0: 3c018007 */ lui $at,%hi(g_MpPlayerNum) /* f01cbc4: 3c03800a */ lui $v1,0x800a /* f01cbc8: 3c02800a */ lui $v0,%hi(g_MenuCount) -/* f01cbcc: ac201448 */ sw $zero,0x1448($at) +/* f01cbcc: ac201448 */ sw $zero,%lo(g_MpPlayerNum)($at) /* f01cbd0: 00002025 */ or $a0,$zero,$zero /* f01cbd4: 244219c0 */ addiu $v0,$v0,%lo(g_MenuCount) /* f01cbd8: 2463e000 */ addiu $v1,$v1,-8192 @@ -1232,8 +1232,8 @@ glabel var7f1a863c /* f01cec4: 3c10800a */ lui $s0,%hi(g_SoloSaveFile) /* f01cec8: 26102200 */ addiu $s0,$s0,%lo(g_SoloSaveFile) /* f01cecc: 24190002 */ addiu $t9,$zero,0x2 -/* f01ced0: 3c018006 */ lui $at,0x8006 -/* f01ced4: a0392940 */ sb $t9,0x2940($at) +/* f01ced0: 3c018006 */ lui $at,%hi(var80062940) +/* f01ced4: a0392940 */ sb $t9,%lo(var80062940)($at) /* f01ced8: 0fc43da6 */ jal func0f10f698 /* f01cedc: 02002025 */ or $a0,$s0,$zero /* f01cee0: 0fc43c81 */ jal func0f10f204 @@ -1360,10 +1360,10 @@ glabel var7f1a863c .L0f01d08c: /* f01d08c: 8e6e0318 */ lw $t6,0x318($s3) /* f01d090: 3c12800a */ lui $s2,%hi(g_MissionConfig) -/* f01d094: 3c018008 */ lui $at,0x8008 +/* f01d094: 3c018008 */ lui $at,%hi(var80087260) /* f01d098: 11c00004 */ beqz $t6,.L0f01d0ac /* f01d09c: 2652dfe8 */ addiu $s2,$s2,%lo(g_MissionConfig) -/* f01d0a0: ac227260 */ sw $v0,0x7260($at) +/* f01d0a0: ac227260 */ sw $v0,%lo(var80087260)($at) /* f01d0a4: 10000062 */ beqz $zero,.L0f01d230 /* f01d0a8: 8e630298 */ lw $v1,0x298($s3) .L0f01d0ac: @@ -1417,7 +1417,7 @@ glabel var7f1a863c .L0f01d15c: /* f01d15c: 8da10000 */ lw $at,0x0($t5) /* f01d160: 25ad000c */ addiu $t5,$t5,0xc -/* f01d164: 2739000c */ addiu $t9,$t9,%lo(var8006000c) +/* f01d164: 2739000c */ addiu $t9,$t9,12 /* f01d168: af21fff4 */ sw $at,-0xc($t9) /* f01d16c: 8da1fff8 */ lw $at,-0x8($t5) /* f01d170: af21fff8 */ sw $at,-0x8($t9) @@ -1431,7 +1431,7 @@ glabel var7f1a863c /* f01d190: af210000 */ sw $at,0x0($t9) .L0f01d194: /* f01d194: 8f010000 */ lw $at,0x0($t8) -/* f01d198: 2718000c */ addiu $t8,$t8,%lo(var8006000c) +/* f01d198: 2718000c */ addiu $t8,$t8,12 /* f01d19c: 25ad000c */ addiu $t5,$t5,0xc /* f01d1a0: ada1fff4 */ sw $at,-0xc($t5) /* f01d1a4: 8f01fff8 */ lw $at,-0x8($t8) @@ -1825,8 +1825,8 @@ glabel var7f1a863c /* f01d714: 8e780314 */ lw $t8,0x314($s3) .L0f01d718: /* f01d718: 8fae0158 */ lw $t6,0x158($sp) -/* f01d71c: 3c018008 */ lui $at,0x8008 -/* f01d720: ac36fac0 */ sw $s6,-0x540($at) +/* f01d71c: 3c018008 */ lui $at,%hi(var8007fac0) +/* f01d720: ac36fac0 */ sw $s6,%lo(var8007fac0)($at) /* f01d724: 51c00006 */ beqzl $t6,.L0f01d740 /* f01d728: 92af05d5 */ lbu $t7,0x5d5($s5) /* f01d72c: 92ad05d5 */ lbu $t5,0x5d5($s5) diff --git a/src/game/game_01e250.c b/src/game/game_01e250.c index 7e111c02d..efed847a7 100644 --- a/src/game/game_01e250.c +++ b/src/game/game_01e250.c @@ -2453,7 +2453,7 @@ glabel func0f020538 /* f020540: 00001825 */ or $v1,$zero,$zero /* f020544: 00001025 */ or $v0,$zero,$zero /* f020548: 18800011 */ blez $a0,.L0f020590 -/* f02054c: 3c058006 */ lui $a1,%hi(var80060368) +/* f02054c: 3c058006 */ lui $a1,%hi(g_ChrsA) /* f020550: 000430c0 */ sll $a2,$a0,0x3 /* f020554: 00c43023 */ subu $a2,$a2,$a0 /* f020558: 00063080 */ sll $a2,$a2,0x2 @@ -2461,7 +2461,7 @@ glabel func0f020538 /* f020560: 00063080 */ sll $a2,$a2,0x2 /* f020564: 00c43021 */ addu $a2,$a2,$a0 /* f020568: 000630c0 */ sll $a2,$a2,0x3 -/* f02056c: 8ca52988 */ lw $a1,0x2988($a1) +/* f02056c: 8ca52988 */ lw $a1,%lo(g_ChrsA)($a1) .L0f020570: /* f020570: 84ae0000 */ lh $t6,0x0($a1) /* f020574: 24420368 */ addiu $v0,$v0,0x368 @@ -2471,7 +2471,7 @@ glabel func0f020538 /* f020584: 24630001 */ addiu $v1,$v1,0x1 .L0f020588: /* f020588: 1420fff9 */ bnez $at,.L0f020570 -/* f02058c: 24a50368 */ addiu $a1,$a1,%lo(var80060368) +/* f02058c: 24a50368 */ addiu $a1,$a1,872 .L0f020590: /* f020590: 03e00008 */ jr $ra /* f020594: 00601025 */ or $v0,$v1,$zero @@ -5524,11 +5524,11 @@ glabel var7f1a87d8 /* f023328: 8e020014 */ lw $v0,0x14($s0) .L0f02332c: /* f02332c: 8f18296c */ lw $t8,%lo(var8006296c)($t8) -/* f023330: 3c048006 */ lui $a0,%hi(var80060008) +/* f023330: 3c048006 */ lui $a0,%hi(var80062970+0x2) /* f023334: 13000022 */ beqz $t8,.L0f0233c0 /* f023338: 00000000 */ sll $zero,$zero,0x0 /* f02333c: 0c008de5 */ jal func00023794 -/* f023340: 84842972 */ lh $a0,0x2972($a0) +/* f023340: 84842972 */ lh $a0,%lo(var80062970+0x2)($a0) /* f023344: 10400025 */ beqz $v0,.L0f0233dc /* f023348: 00000000 */ sll $zero,$zero,0x0 /* f02334c: 0c00744f */ jal animGetId @@ -5760,7 +5760,7 @@ glabel var7f1a87d8 /* f023690: 00003825 */ or $a3,$zero,$zero .L0f023694: /* f023694: 0fc23a79 */ jal func0f08e9e4 -/* f023698: 24840008 */ addiu $a0,$a0,%lo(var80060008) +/* f023698: 24840008 */ addiu $a0,$a0,8 /* f02369c: 10000151 */ beqz $zero,.L0f023be4 /* f0236a0: 00403825 */ or $a3,$v0,$zero /* f0236a4: 82030007 */ lb $v1,0x7($s0) @@ -6251,8 +6251,8 @@ glabel var7f1a87d8 .L0f023d98: /* f023d98: 3c0c7f02 */ lui $t4,%hi(func0f02152c) /* f023d9c: 258c152c */ addiu $t4,$t4,%lo(func0f02152c) -/* f023da0: 3c018006 */ lui $at,0x8006 -/* f023da4: ac2cefcc */ sw $t4,-0x1034($at) +/* f023da0: 3c018006 */ lui $at,%hi(var8005efcc) +/* f023da4: ac2cefcc */ sw $t4,%lo(var8005efcc)($at) /* f023da8: 3c01800a */ lui $at,%hi(var8009cd1c) /* f023dac: 12000003 */ beqz $s0,.L0f023dbc /* f023db0: ac30cd1c */ sw $s0,%lo(var8009cd1c)($at) @@ -6544,7 +6544,7 @@ glabel var7f1a87d8 /* f0241e4: 8fa20128 */ lw $v0,0x128($sp) /* f0241e8: c7a6010c */ lwc1 $f6,0x10c($sp) /* f0241ec: 10c00008 */ beqz $a2,.L0f024210 -/* f0241f0: 3c018006 */ lui $at,0x8006 +/* f0241f0: 3c018006 */ lui $at,%hi(var8005efcc) /* f0241f4: e4460010 */ swc1 $f6,0x10($v0) /* f0241f8: 8fa90108 */ lw $t1,0x108($sp) /* f0241fc: a4490014 */ sh $t1,0x14($v0) @@ -6553,7 +6553,7 @@ glabel var7f1a87d8 /* f024208: 8faa0100 */ lw $t2,0x100($sp) /* f02420c: a44a0038 */ sh $t2,0x38($v0) .L0f024210: -/* f024210: ac20efcc */ sw $zero,-0x1034($at) +/* f024210: ac20efcc */ sw $zero,%lo(var8005efcc)($at) /* f024214: 3c018006 */ lui $at,0x8006 /* f024218: 0c006943 */ jal func0001a50c /* f02421c: c42c29e8 */ lwc1 $f12,0x29e8($at) @@ -8315,8 +8315,8 @@ glabel var7f1a8900 /* f025b4c: 27a400a0 */ addiu $a0,$sp,0xa0 /* f025b50: 3c097f02 */ lui $t1,%hi(func0f024b18) /* f025b54: 25294b18 */ addiu $t1,$t1,%lo(func0f024b18) -/* f025b58: 3c018006 */ lui $at,0x8006 -/* f025b5c: ac29efc4 */ sw $t1,-0x103c($at) +/* f025b58: 3c018006 */ lui $at,%hi(var8005efc4) +/* f025b5c: ac29efc4 */ sw $t1,%lo(var8005efc4)($at) .L0f025b60: /* f025b60: 0c0087bd */ jal func00021ef4 /* f025b64: 8fa50118 */ lw $a1,0x118($sp) @@ -8336,8 +8336,8 @@ glabel var7f1a8900 .L0f025b98: /* f025b98: 8fb80128 */ lw $t8,0x128($sp) /* f025b9c: 8fae00ac */ lw $t6,0xac($sp) -/* f025ba0: 3c018006 */ lui $at,0x8006 -/* f025ba4: ac20efc4 */ sw $zero,-0x103c($at) +/* f025ba0: 3c018006 */ lui $at,%hi(var8005efc4) +/* f025ba4: ac20efc4 */ sw $zero,%lo(var8005efc4)($at) /* f025ba8: 130000b8 */ beqz $t8,.L0f025e8c /* f025bac: afae0124 */ sw $t6,0x124($sp) /* f025bb0: 8e0f031c */ lw $t7,0x31c($s0) @@ -11253,11 +11253,11 @@ void func0f028490(f32 arg1) GLOBAL_ASM( glabel func0f028498 -/* f028498: 3c018006 */ lui $at,0x8006 -/* f02849c: ac24296c */ sw $a0,0x296c($at) -/* f0284a0: 3c018006 */ lui $at,0x8006 +/* f028498: 3c018006 */ lui $at,%hi(var8006296c) +/* f02849c: ac24296c */ sw $a0,%lo(var8006296c)($at) +/* f0284a0: 3c018006 */ lui $at,%hi(var8005efbc) /* f0284a4: 03e00008 */ jr $ra -/* f0284a8: ac24efbc */ sw $a0,-0x1044($at) +/* f0284a8: ac24efbc */ sw $a0,%lo(var8005efbc)($at) /* f0284ac: 3c038006 */ lui $v1,%hi(var80062970) /* f0284b0: 24632970 */ addiu $v1,$v1,%lo(var80062970) /* f0284b4: 8c6e0000 */ lw $t6,0x0($v1) @@ -11304,9 +11304,9 @@ glabel func0f028498 /* f028550: 2c4e0001 */ sltiu $t6,$v0,0x1 /* f028554: 03e00008 */ jr $ra /* f028558: ac6e0000 */ sw $t6,0x0($v1) -/* f02855c: 3c018006 */ lui $at,0x8006 +/* f02855c: 3c018006 */ lui $at,%hi(var80062978) /* f028560: 27bdffe8 */ addiu $sp,$sp,-24 -/* f028564: ac242978 */ sw $a0,0x2978($at) +/* f028564: ac242978 */ sw $a0,%lo(var80062978)($at) /* f028568: afbf0014 */ sw $ra,0x14($sp) /* f02856c: 3c047f1b */ lui $a0,%hi(var7f1a869c) /* f028570: 3c058006 */ lui $a1,%hi(var80062970) @@ -11425,8 +11425,8 @@ glabel var7f1a8948 .L0f028704: /* f028704: 34210f90 */ ori $at,$at,0xf90 /* f028708: 12210002 */ beq $s1,$at,.L0f028714 -/* f02870c: 3c018008 */ lui $at,0x8008 -/* f028710: a420da82 */ sh $zero,-0x257e($at) +/* f02870c: 3c018008 */ lui $at,%hi(g_Bodies+0xb7e) +/* f028710: a420da82 */ sh $zero,%lo(g_Bodies+0xb7e)($at) .L0f028714: /* f028714: 8fcf0000 */ lw $t7,0x0($s8) .L0f028718: @@ -12093,8 +12093,8 @@ glabel func0f028f7c /* f0290c0: 240a0001 */ addiu $t2,$zero,0x1 /* f0290c4: 00004825 */ or $t1,$zero,$zero /* f0290c8: 11a00024 */ beqz $t5,.L0f02915c -/* f0290cc: 3c088006 */ lui $t0,%hi(var8006005c) -/* f0290d0: 8d082a8c */ lw $t0,0x2a8c($t0) +/* f0290cc: 3c088006 */ lui $t0,%hi(var80062a8c) +/* f0290d0: 8d082a8c */ lw $t0,%lo(var80062a8c)($t0) /* f0290d4: 24060020 */ addiu $a2,$zero,0x20 /* f0290d8: 2405fffe */ addiu $a1,$zero,-2 .L0f0290dc: @@ -12120,7 +12120,7 @@ glabel func0f028f7c .L0f02911c: /* f02911c: 29210730 */ slti $at,$t1,0x730 /* f029120: 1420ffee */ bnez $at,.L0f0290dc -/* f029124: 2508005c */ addiu $t0,$t0,%lo(var8006005c) +/* f029124: 2508005c */ addiu $t0,$t0,92 .L0f029128: /* f029128: 1140000c */ beqz $t2,.L0f02915c /* f02912c: 8fa40030 */ lw $a0,0x30($sp) @@ -12166,9 +12166,9 @@ glabel func0f028f7c /* f0291b8: 8fbf001c */ lw $ra,0x1c($sp) .L0f0291bc: /* f0291bc: 240d0001 */ addiu $t5,$zero,0x1 -/* f0291c0: 3c018006 */ lui $at,0x8006 +/* f0291c0: 3c018006 */ lui $at,%hi(var80062a90) /* f0291c4: 8fb00018 */ lw $s0,0x18($sp) -/* f0291c8: ac2d2a90 */ sw $t5,0x2a90($at) +/* f0291c8: ac2d2a90 */ sw $t5,%lo(var80062a90)($at) /* f0291cc: 03e00008 */ jr $ra /* f0291d0: 27bd0028 */ addiu $sp,$sp,0x28 ); @@ -14867,9 +14867,9 @@ glabel func0f02b7d4 /* f02b8a8: 02e03025 */ or $a2,$s7,$zero /* f02b8ac: 0fc0a386 */ jal func0f028e18 /* f02b8b0: 02a03825 */ or $a3,$s5,$zero -/* f02b8b4: 3c058006 */ lui $a1,%hi(var8006005c) +/* f02b8b4: 3c058006 */ lui $a1,%hi(var80062a8c) /* f02b8b8: 00404025 */ or $t0,$v0,$zero -/* f02b8bc: 8ca52a8c */ lw $a1,0x2a8c($a1) +/* f02b8bc: 8ca52a8c */ lw $a1,%lo(var80062a8c)($a1) /* f02b8c0: 00002025 */ or $a0,$zero,$zero .L0f02b8c4: /* f02b8c4: 8cb80000 */ lw $t8,0x0($a1) @@ -14921,7 +14921,7 @@ glabel func0f02b7d4 /* f02b96c: 00608825 */ or $s1,$v1,$zero .L0f02b970: /* f02b970: 1496ffd4 */ bne $a0,$s6,.L0f02b8c4 -/* f02b974: 24a5005c */ addiu $a1,$a1,%lo(var8006005c) +/* f02b974: 24a5005c */ addiu $a1,$a1,92 /* f02b978: 12000011 */ beqz $s0,.L0f02b9c0 /* f02b97c: 02802025 */ or $a0,$s4,$zero /* f02b980: 8e190004 */ lw $t9,0x4($s0) diff --git a/src/game/game_02cde0.c b/src/game/game_02cde0.c index 2e543109f..d48e62fea 100644 --- a/src/game/game_02cde0.c +++ b/src/game/game_02cde0.c @@ -161,10 +161,10 @@ glabel var7f1a8a84 /* f02cfdc: 11610019 */ beq $t3,$at,.L0f02d044 /* f02cfe0: 01a76821 */ addu $t5,$t5,$a3 /* f02cfe4: 000d6880 */ sll $t5,$t5,0x2 -/* f02cfe8: 3c048008 */ lui $a0,0x8008 +/* f02cfe8: 3c048008 */ lui $a0,%hi(g_Bodies+0x2) /* f02cfec: 008d2021 */ addu $a0,$a0,$t5 /* f02cff0: 0fc69e11 */ jal fileLoad -/* f02cff4: 9484cf06 */ lhu $a0,-0x30fa($a0) +/* f02cff4: 9484cf06 */ lhu $a0,%lo(g_Bodies+0x2)($a0) /* f02cff8: 8fa5004c */ lw $a1,0x4c($sp) /* f02cffc: 3c0e8008 */ lui $t6,%hi(g_Bodies) /* f02d000: 25cecf04 */ addiu $t6,$t6,%lo(g_Bodies) @@ -288,8 +288,8 @@ glabel var7f1a8a84 /* f02d1b8: 93ab0067 */ lbu $t3,0x67($sp) /* f02d1bc: 1160001c */ beqz $t3,.L0f02d230 /* f02d1c0: 8fb9001c */ lw $t9,0x1c($sp) -/* f02d1c4: 3c088008 */ lui $t0,0x8008 -/* f02d1c8: 2508d634 */ addiu $t0,$t0,-10700 +/* f02d1c4: 3c088008 */ lui $t0,%hi(g_Bodies+0x730) +/* f02d1c8: 2508d634 */ addiu $t0,$t0,%lo(g_Bodies+0x730) /* f02d1cc: 57280019 */ bnel $t9,$t0,.L0f02d234 /* f02d1d0: 8fa2005c */ lw $v0,0x5c($sp) /* f02d1d4: 0c004b70 */ jal random @@ -691,8 +691,8 @@ glabel func0f02d4fc /* f02d7e8: 0fc0b378 */ jal bodyGetRace /* f02d7ec: 84c40010 */ lh $a0,0x10($a2) /* f02d7f0: 8fa6005c */ lw $a2,0x5c($sp) -/* f02d7f4: 3c0e8008 */ lui $t6,0x8008 -/* f02d7f8: 25ced760 */ addiu $t6,$t6,-10400 +/* f02d7f4: 3c0e8008 */ lui $t6,%hi(g_Bodies+0x85c) +/* f02d7f8: 25ced760 */ addiu $t6,$t6,%lo(g_Bodies+0x85c) /* f02d7fc: 90cb032e */ lbu $t3,0x32e($a2) /* f02d800: a0c202fe */ sb $v0,0x2fe($a2) /* f02d804: 316dfff7 */ andi $t5,$t3,0xfff7 @@ -714,8 +714,8 @@ glabel func0f02d4fc /* f02d844: e4d20024 */ swc1 $f18,0x24($a2) /* f02d848: 8fa90038 */ lw $t1,0x38($sp) .L0f02d84c: -/* f02d84c: 3c0a8008 */ lui $t2,0x8008 -/* f02d850: 254ad83c */ addiu $t2,$t2,-10180 +/* f02d84c: 3c0a8008 */ lui $t2,%hi(g_Bodies+0x938) +/* f02d850: 254ad83c */ addiu $t2,$t2,%lo(g_Bodies+0x938) /* f02d854: 152a0025 */ bne $t1,$t2,.L0f02d8ec /* f02d858: 24040020 */ addiu $a0,$zero,0x20 /* f02d85c: 24050004 */ addiu $a1,$zero,0x4 diff --git a/src/game/game_092610.c b/src/game/game_092610.c index f8cd64ca6..1a5a0dac9 100644 --- a/src/game/game_092610.c +++ b/src/game/game_092610.c @@ -620,9 +620,9 @@ glabel func0f092c04 /* f092d50: 00001025 */ or $v0,$zero,$zero .L0f092d54: /* f092d54: 860e002c */ lh $t6,0x2c($s0) -/* f092d58: 3c018007 */ lui $at,0x8007 +/* f092d58: 3c018007 */ lui $at,%hi(var8006ae50) /* f092d5c: 2619004c */ addiu $t9,$s0,0x4c -/* f092d60: a42eae50 */ sh $t6,-0x51b0($at) +/* f092d60: a42eae50 */ sh $t6,%lo(var8006ae50)($at) /* f092d64: 8e07003c */ lw $a3,0x3c($s0) /* f092d68: 8e060038 */ lw $a2,0x38($s0) /* f092d6c: 8e050034 */ lw $a1,0x34($s0) @@ -1243,8 +1243,8 @@ glabel func0f093508 /* f0935f4: 8d4aae58 */ lw $t2,%lo(var8006ae58)($t2) /* f0935f8: 0153082a */ slt $at,$t2,$s3 /* f0935fc: 10200002 */ beqz $at,.L0f093608 -/* f093600: 3c018007 */ lui $at,0x8007 -/* f093604: ac33ae58 */ sw $s3,-0x51a8($at) +/* f093600: 3c018007 */ lui $at,%hi(var8006ae58) +/* f093604: ac33ae58 */ sw $s3,%lo(var8006ae58)($at) .L0f093608: /* f093608: 8fbf0034 */ lw $ra,0x34($sp) /* f09360c: 8fb00018 */ lw $s0,0x18($sp) diff --git a/src/game/game_095320.c b/src/game/game_095320.c index fc4879d3c..c20062819 100644 --- a/src/game/game_095320.c +++ b/src/game/game_095320.c @@ -675,9 +675,9 @@ bool objectiveIsAllComplete(void) GLOBAL_ASM( glabel func0f095bf4 /* f095bf4: 240e0001 */ addiu $t6,$zero,0x1 -/* f095bf8: 3c018007 */ lui $at,0x8007 +/* f095bf8: 3c018007 */ lui $at,%hi(var8006ae74) /* f095bfc: 03e00008 */ jr $ra -/* f095c00: ac2eae74 */ sw $t6,-0x518c($at) +/* f095c00: ac2eae74 */ sw $t6,%lo(var8006ae74)($at) ); GLOBAL_ASM( diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index c6e63f5e8..9c6beb371 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -8004,9 +8004,9 @@ glabel func0f09df9c /* f09dfec: 0062082b */ sltu $at,$v1,$v0 /* f09dff0: 1420fffd */ bnez $at,.L0f09dfe8 /* f09dff4: ac60fffc */ sw $zero,-0x4($v1) -/* f09dff8: 3c018007 */ lui $at,0x8007 +/* f09dff8: 3c018007 */ lui $at,%hi(var80070524) /* f09dffc: 03e00008 */ jr $ra -/* f09e000: ac200524 */ sw $zero,0x524($at) +/* f09e000: ac200524 */ sw $zero,%lo(var80070524)($at) ); GLOBAL_ASM( @@ -8167,8 +8167,8 @@ glabel func0f09e144 /* f09e1cc: 240b0007 */ addiu $t3,$zero,0x7 /* f09e1d0: 02003825 */ or $a3,$s0,$zero .L0f09e1d4: -/* f09e1d4: 3c018006 */ lui $at,0x8006 -/* f09e1d8: a02bd9a0 */ sb $t3,-0x2660($at) +/* f09e1d4: 3c018006 */ lui $at,%hi(var8005d9a0) +/* f09e1d8: a02bd9a0 */ sb $t3,%lo(var8005d9a0)($at) /* f09e1dc: 964415b2 */ lhu $a0,0x15b2($s2) /* f09e1e0: 24050011 */ addiu $a1,$zero,0x11 /* f09e1e4: 0fc59c80 */ jal func0f167200 @@ -8413,11 +8413,11 @@ glabel func0f09e4e0 /* f09e564: 000fc080 */ sll $t8,$t7,0x2 /* f09e568: 030fc021 */ addu $t8,$t8,$t7 /* f09e56c: 0018c080 */ sll $t8,$t8,0x2 -/* f09e570: 3c118008 */ lui $s1,0x8008 +/* f09e570: 3c118008 */ lui $s1,%hi(g_Bodies+0x10) /* f09e574: 24060001 */ addiu $a2,$zero,0x1 /* f09e578: 02388821 */ addu $s1,$s1,$t8 /* f09e57c: 14d90002 */ bne $a2,$t9,.L0f09e588 -/* f09e580: 9631cf14 */ lhu $s1,-0x30ec($s1) +/* f09e580: 9631cf14 */ lhu $s1,%lo(g_Bodies+0x10)($s1) /* f09e584: 241104e5 */ addiu $s1,$zero,0x4e5 .L0f09e588: /* f09e588: 0fc2c686 */ jal func0f0b1a18 @@ -8640,10 +8640,10 @@ glabel func0f09e4e0 /* f09e88c: 267307a4 */ addiu $s3,$s3,0x7a4 /* f09e890: 8e4f1598 */ lw $t7,0x1598($s2) /* f09e894: 0015c040 */ sll $t8,$s5,0x1 -/* f09e898: 3c138007 */ lui $s3,%hi(var800707a4) +/* f09e898: 3c138007 */ lui $s3,%hi(var800700b0) /* f09e89c: 15e0000d */ bnez $t7,.L0f09e8d4 /* f09e8a0: 02789821 */ addu $s3,$s3,$t8 -/* f09e8a4: 967300b0 */ lhu $s3,0xb0($s3) +/* f09e8a4: 967300b0 */ lhu $s3,%lo(var800700b0)($s3) /* f09e8a8: 24190001 */ addiu $t9,$zero,0x1 /* f09e8ac: 26481598 */ addiu $t0,$s2,0x1598 /* f09e8b0: 264915a8 */ addiu $t1,$s2,0x15a8 @@ -8659,7 +8659,7 @@ glabel func0f09e4e0 /* f09e8d4: 10000005 */ beqz $zero,.L0f09e8ec /* f09e8d8: 924315b1 */ lbu $v1,0x15b1($s2) .L0f09e8dc: -/* f09e8dc: 267307a4 */ addiu $s3,$s3,%lo(var800707a4) +/* f09e8dc: 267307a4 */ addiu $s3,$s3,1956 .L0f09e8e0: /* f09e8e0: 1676ffcd */ bne $s3,$s6,.L0f09e818 /* f09e8e4: 269407a4 */ addiu $s4,$s4,0x7a4 @@ -12546,8 +12546,8 @@ glabel func0f0a1df4 /* f0a1f34: 0200f025 */ or $s8,$s0,$zero /* f0a1f38: afb00050 */ sw $s0,0x50($sp) .L0f0a1f3c: -/* f0a1f3c: 3c0f8007 */ lui $t7,0x8007 -/* f0a1f40: 25ef01e3 */ addiu $t7,$t7,0x1e3 +/* f0a1f3c: 3c0f8007 */ lui $t7,%hi(var800701e0+0x3) +/* f0a1f40: 25ef01e3 */ addiu $t7,$t7,%lo(var800701e0+0x3) /* f0a1f44: 26730001 */ addiu $s3,$s3,0x1 /* f0a1f48: 026f082b */ sltu $at,$s3,$t7 /* f0a1f4c: 50200007 */ beqzl $at,.L0f0a1f6c @@ -12571,8 +12571,8 @@ glabel func0f0a1df4 .L0f0a1f8c: /* f0a1f8c: 17c10018 */ bne $s8,$at,.L0f0a1ff0 /* f0a1f90: 261001e4 */ addiu $s0,$s0,%lo(var800701e4) -/* f0a1f94: 3c138007 */ lui $s3,0x8007 -/* f0a1f98: 267301eb */ addiu $s3,$s3,0x1eb +/* f0a1f94: 3c138007 */ lui $s3,%hi(var800701e8+0x3) +/* f0a1f98: 267301eb */ addiu $s3,$s3,%lo(var800701e8+0x3) /* f0a1f9c: 92110000 */ lbu $s1,0x0($s0) .L0f0a1fa0: /* f0a1fa0: 0fc44727 */ jal currentPlayerCanHaveWeapon @@ -14895,9 +14895,9 @@ glabel var7f1ac8b8 /* f0a3e08: 3c0b7f0a */ lui $t3,%hi(func0f0a256c) /* f0a3e0c: 3c10800a */ lui $s0,%hi(var8009d0f0) /* f0a3e10: 256b256c */ addiu $t3,$t3,%lo(func0f0a256c) -/* f0a3e14: 3c018006 */ lui $at,0x8006 +/* f0a3e14: 3c018006 */ lui $at,%hi(var8005efcc) /* f0a3e18: 2610d0f0 */ addiu $s0,$s0,%lo(var8009d0f0) -/* f0a3e1c: ac2befcc */ sw $t3,-0x1034($at) +/* f0a3e1c: ac2befcc */ sw $t3,%lo(var8005efcc)($at) /* f0a3e20: 240cffff */ addiu $t4,$zero,-1 /* f0a3e24: ae0c0008 */ sw $t4,0x8($s0) /* f0a3e28: ae0c0004 */ sw $t4,0x4($s0) @@ -15506,9 +15506,9 @@ glabel func0f0a45d0 /* f0a4674: ac22d148 */ sw $v0,%lo(var8009d148)($at) /* f0a4678: 3c187f0a */ lui $t8,%hi(func0f0a256c) /* f0a467c: 2718256c */ addiu $t8,$t8,%lo(func0f0a256c) -/* f0a4680: 3c018006 */ lui $at,0x8006 +/* f0a4680: 3c018006 */ lui $at,%hi(var8005efcc) /* f0a4684: 10000003 */ beqz $zero,.L0f0a4694 -/* f0a4688: ac38efcc */ sw $t8,-0x1034($at) +/* f0a4688: ac38efcc */ sw $t8,%lo(var8005efcc)($at) .L0f0a468c: /* f0a468c: 3c01800a */ lui $at,%hi(var8009d148) /* f0a4690: ac39d148 */ sw $t9,%lo(var8009d148)($at) @@ -17706,8 +17706,8 @@ glabel var7f1aca70 /* f0a6368: 0c0073af */ jal func0001cebc /* f0a636c: 00c02025 */ or $a0,$a2,$zero .L0f0a6370: -/* f0a6370: 3c018006 */ lui $at,0x8006 -/* f0a6374: ac20efcc */ sw $zero,-0x1034($at) +/* f0a6370: 3c018006 */ lui $at,%hi(var8005efcc) +/* f0a6374: ac20efcc */ sw $zero,%lo(var8005efcc)($at) /* f0a6378: 8fa40280 */ lw $a0,0x280($sp) /* f0a637c: 0c006a47 */ jal func0001a91c /* f0a6380: 24050033 */ addiu $a1,$zero,0x33 @@ -22856,12 +22856,12 @@ glabel func0f0aa86c /* f0aa9a4: 24020001 */ addiu $v0,$zero,0x1 /* f0aa9a8: 144f0004 */ bne $v0,$t7,.L0f0aa9bc /* f0aa9ac: 24180002 */ addiu $t8,$zero,0x2 -/* f0aa9b0: 3c018008 */ lui $at,0x8008 +/* f0aa9b0: 3c018008 */ lui $at,%hi(var8007fac0) /* f0aa9b4: 10000003 */ beqz $zero,.L0f0aa9c4 -/* f0aa9b8: ac38fac0 */ sw $t8,-0x540($at) +/* f0aa9b8: ac38fac0 */ sw $t8,%lo(var8007fac0)($at) .L0f0aa9bc: -/* f0aa9bc: 3c018008 */ lui $at,0x8008 -/* f0aa9c0: ac22fac0 */ sw $v0,-0x540($at) +/* f0aa9bc: 3c018008 */ lui $at,%hi(var8007fac0) +/* f0aa9c0: ac22fac0 */ sw $v0,%lo(var8007fac0)($at) .L0f0aa9c4: /* f0aa9c4: 0fc54d8a */ jal func0f153628 /* f0aa9c8: 8fa40130 */ lw $a0,0x130($sp) @@ -23507,9 +23507,9 @@ glabel func0f0aa86c /* f0ab324: 0fc54de0 */ jal func0f153780 /* f0ab328: 8fa40130 */ lw $a0,0x130($sp) /* f0ab32c: 24180001 */ addiu $t8,$zero,0x1 -/* f0ab330: 3c018008 */ lui $at,0x8008 +/* f0ab330: 3c018008 */ lui $at,%hi(var8007fac0) /* f0ab334: 100001e2 */ beqz $zero,.L0f0abac0 -/* f0ab338: ac38fac0 */ sw $t8,-0x540($at) +/* f0ab338: ac38fac0 */ sw $t8,%lo(var8007fac0)($at) /* f0ab33c: 8fb90110 */ lw $t9,0x110($sp) .L0f0ab340: /* f0ab340: 814f0069 */ lb $t7,0x69($t2) @@ -24024,8 +24024,8 @@ glabel func0f0aa86c /* f0abaac: 0fc54de0 */ jal func0f153780 /* f0abab0: 8fa40130 */ lw $a0,0x130($sp) /* f0abab4: 240e0001 */ addiu $t6,$zero,0x1 -/* f0abab8: 3c018008 */ lui $at,0x8008 -/* f0ababc: ac2efac0 */ sw $t6,-0x540($at) +/* f0abab8: 3c018008 */ lui $at,%hi(var8007fac0) +/* f0ababc: ac2efac0 */ sw $t6,%lo(var8007fac0)($at) .L0f0abac0: /* f0abac0: 8fbf0034 */ lw $ra,0x34($sp) /* f0abac4: 27bd0130 */ addiu $sp,$sp,0x130 diff --git a/src/game/game_0abe70.c b/src/game/game_0abe70.c index 4e8bd51fb..3dd81839a 100644 --- a/src/game/game_0abe70.c +++ b/src/game/game_0abe70.c @@ -2243,8 +2243,8 @@ glabel func0f0adcc8 /* f0addd4: 14c9ffe5 */ bne $a2,$t1,.L0f0add6c /* f0addd8: 24e70006 */ addiu $a3,$a3,0x6 /* f0adddc: 240a0001 */ addiu $t2,$zero,0x1 -/* f0adde0: 3c018007 */ lui $at,0x8007 -/* f0adde4: ac2a0524 */ sw $t2,0x524($at) +/* f0adde0: 3c018007 */ lui $at,%hi(var80070524) +/* f0adde4: ac2a0524 */ sw $t2,%lo(var80070524)($at) /* f0adde8: 10000001 */ beqz $zero,.L0f0addf0 /* f0addec: 01001025 */ or $v0,$t0,$zero .L0f0addf0: diff --git a/src/game/game_0b0420.c b/src/game/game_0b0420.c index f608ee908..c694d33e9 100644 --- a/src/game/game_0b0420.c +++ b/src/game/game_0b0420.c @@ -71,9 +71,9 @@ glabel func0f0b046c /* f0b0498: 3c0f800a */ lui $t7,%hi(g_Vars+0x288) /* f0b049c: 8defa248 */ lw $t7,%lo(g_Vars+0x288)($t7) /* f0b04a0: 240e0001 */ addiu $t6,$zero,0x1 -/* f0b04a4: 3c018007 */ lui $at,0x8007 +/* f0b04a4: 3c018007 */ lui $at,%hi(var80070590) /* f0b04a8: 0006c080 */ sll $t8,$a2,0x2 -/* f0b04ac: ac2e0590 */ sw $t6,0x590($at) +/* f0b04ac: ac2e0590 */ sw $t6,%lo(var80070590)($at) /* f0b04b0: 01f81021 */ addu $v0,$t7,$t8 /* f0b04b4: 8c590000 */ lw $t9,0x0($v0) /* f0b04b8: 27280001 */ addiu $t0,$t9,0x1 @@ -98,8 +98,8 @@ glabel func0f0b046c /* f0b0500: 258d0001 */ addiu $t5,$t4,0x1 /* f0b0504: ac4d0000 */ sw $t5,0x0($v0) .L0f0b0508: -/* f0b0508: 3c018007 */ lui $at,0x8007 -/* f0b050c: ac200590 */ sw $zero,0x590($at) +/* f0b0508: 3c018007 */ lui $at,%hi(var80070590) +/* f0b050c: ac200590 */ sw $zero,%lo(var80070590)($at) .L0f0b0510: /* f0b0510: 8fbf0014 */ lw $ra,0x14($sp) .L0f0b0514: @@ -110,9 +110,9 @@ glabel func0f0b046c GLOBAL_ASM( glabel func0f0b0520 -/* f0b0520: 3c018007 */ lui $at,0x8007 +/* f0b0520: 3c018007 */ lui $at,%hi(var80070590) /* f0b0524: 03e00008 */ jr $ra -/* f0b0528: ac200590 */ sw $zero,0x590($at) +/* f0b0528: ac200590 */ sw $zero,%lo(var80070590)($at) ); s32 currentPlayerGetShotCount(u32 type) diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index 19013b5a8..8156cf4b1 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -3137,12 +3137,12 @@ glabel var7f1ad5b4 .L0f0b8dac: /* f0b8dac: 240b0008 */ addiu $t3,$zero,0x8 .L0f0b8db0: -/* f0b8db0: 3c018008 */ lui $at,0x8008 +/* f0b8db0: 3c018008 */ lui $at,%hi(var8007fc0c) /* f0b8db4: 0fc2777b */ jal func0f09ddec -/* f0b8db8: a42bfc0c */ sh $t3,-0x3f4($at) +/* f0b8db8: a42bfc0c */ sh $t3,%lo(var8007fc0c)($at) /* f0b8dbc: 8e0c0284 */ lw $t4,0x284($s0) /* f0b8dc0: 24030040 */ addiu $v1,$zero,0x40 -/* f0b8dc4: 3c048008 */ lui $a0,0x8008 +/* f0b8dc4: 3c048008 */ lui $a0,%hi(g_Bodies+0x2) /* f0b8dc8: 8d851bd4 */ lw $a1,0x1bd4($t4) /* f0b8dcc: 00a36821 */ addu $t5,$a1,$v1 /* f0b8dd0: 246300cb */ addiu $v1,$v1,0xcb @@ -3164,7 +3164,7 @@ glabel var7f1ad5b4 /* f0b8e10: 00b87821 */ addu $t7,$a1,$t8 /* f0b8e14: afb90058 */ sw $t9,0x58($sp) /* f0b8e18: afaf00dc */ sw $t7,0xdc($sp) -/* f0b8e1c: 9484cf06 */ lhu $a0,-0x30fa($a0) +/* f0b8e1c: 9484cf06 */ lhu $a0,%lo(g_Bodies+0x2)($a0) /* f0b8e20: afab00f0 */ sw $t3,0xf0($sp) /* f0b8e24: afa5005c */ sw $a1,0x5c($sp) /* f0b8e28: 0fc59c15 */ jal func0f167054 @@ -3180,10 +3180,10 @@ glabel var7f1ad5b4 /* f0b8e50: 000f5080 */ sll $t2,$t7,0x2 /* f0b8e54: 014f5021 */ addu $t2,$t2,$t7 /* f0b8e58: 000a5080 */ sll $t2,$t2,0x2 -/* f0b8e5c: 3c048008 */ lui $a0,0x8008 +/* f0b8e5c: 3c048008 */ lui $a0,%hi(g_Bodies+0x2) /* f0b8e60: 008a2021 */ addu $a0,$a0,$t2 /* f0b8e64: 0fc59c15 */ jal func0f167054 -/* f0b8e68: 9484cf06 */ lhu $a0,-0x30fa($a0) +/* f0b8e68: 9484cf06 */ lhu $a0,%lo(g_Bodies+0x2)($a0) /* f0b8e6c: 8fab00e4 */ lw $t3,0xe4($sp) /* f0b8e70: 244c003f */ addiu $t4,$v0,0x3f /* f0b8e74: 358d003f */ ori $t5,$t4,0x3f @@ -3194,10 +3194,10 @@ glabel var7f1ad5b4 /* f0b8e84: 8fb90070 */ lw $t9,0x70($sp) /* f0b8e88: 0720000b */ bltz $t9,.L0f0b8eb8 /* f0b8e8c: 001948c0 */ sll $t1,$t9,0x3 -/* f0b8e90: 3c048008 */ lui $a0,0x8008 +/* f0b8e90: 3c048008 */ lui $a0,%hi(g_Props+0x4) /* f0b8e94: 00892021 */ addu $a0,$a0,$t1 /* f0b8e98: 0fc59c15 */ jal func0f167054 -/* f0b8e9c: 9484b070 */ lhu $a0,-0x4f90($a0) +/* f0b8e9c: 9484b070 */ lhu $a0,%lo(g_Props+0x4)($a0) /* f0b8ea0: 8fb800e4 */ lw $t8,0xe4($sp) /* f0b8ea4: 244f003f */ addiu $t7,$v0,0x3f /* f0b8ea8: 35ea003f */ ori $t2,$t7,0x3f @@ -3227,25 +3227,25 @@ glabel var7f1ad5b4 /* f0b8f04: 01986021 */ addu $t4,$t4,$t8 /* f0b8f08: 8fab00e4 */ lw $t3,0xe4($sp) /* f0b8f0c: 000c6080 */ sll $t4,$t4,0x2 -/* f0b8f10: 3c048008 */ lui $a0,0x8008 +/* f0b8f10: 3c048008 */ lui $a0,%hi(g_Bodies+0x2) /* f0b8f14: 008c2021 */ addu $a0,$a0,$t4 -/* f0b8f18: 9484cf06 */ lhu $a0,-0x30fa($a0) +/* f0b8f18: 9484cf06 */ lhu $a0,%lo(g_Bodies+0x2)($a0) /* f0b8f1c: 27a70100 */ addiu $a3,$sp,0x100 /* f0b8f20: 01a22821 */ addu $a1,$t5,$v0 /* f0b8f24: 0fc69de5 */ jal func0f1a7794 /* f0b8f28: 01623023 */ subu $a2,$t3,$v0 /* f0b8f2c: 8fae0068 */ lw $t6,0x68($sp) -/* f0b8f30: 3c048008 */ lui $a0,0x8008 +/* f0b8f30: 3c048008 */ lui $a0,%hi(g_Bodies+0x2) /* f0b8f34: afa200fc */ sw $v0,0xfc($sp) /* f0b8f38: 000e4080 */ sll $t0,$t6,0x2 /* f0b8f3c: 010e4021 */ addu $t0,$t0,$t6 /* f0b8f40: 00084080 */ sll $t0,$t0,0x2 /* f0b8f44: 00882021 */ addu $a0,$a0,$t0 /* f0b8f48: 0fc59ca0 */ jal func0f167280 -/* f0b8f4c: 9484cf06 */ lhu $a0,-0x30fa($a0) +/* f0b8f4c: 9484cf06 */ lhu $a0,%lo(g_Bodies+0x2)($a0) /* f0b8f50: 8fb900f0 */ lw $t9,0xf0($sp) /* f0b8f54: 8fac0064 */ lw $t4,0x64($sp) -/* f0b8f58: 3c048008 */ lui $a0,0x8008 +/* f0b8f58: 3c048008 */ lui $a0,%hi(g_Bodies+0x2) /* f0b8f5c: 00594821 */ addu $t1,$v0,$t9 /* f0b8f60: 252f003f */ addiu $t7,$t1,0x3f /* f0b8f64: 35ea003f */ ori $t2,$t7,0x3f @@ -3258,20 +3258,20 @@ glabel var7f1ad5b4 /* f0b8f80: 8fa800e4 */ lw $t0,0xe4($sp) /* f0b8f84: 000d6880 */ sll $t5,$t5,0x2 /* f0b8f88: 008d2021 */ addu $a0,$a0,$t5 -/* f0b8f8c: 9484cf06 */ lhu $a0,-0x30fa($a0) +/* f0b8f8c: 9484cf06 */ lhu $a0,%lo(g_Bodies+0x2)($a0) /* f0b8f90: 27a70100 */ addiu $a3,$sp,0x100 /* f0b8f94: 01782821 */ addu $a1,$t3,$t8 /* f0b8f98: 0fc69de5 */ jal func0f1a7794 /* f0b8f9c: 01183023 */ subu $a2,$t0,$t8 /* f0b8fa0: 8fb90064 */ lw $t9,0x64($sp) -/* f0b8fa4: 3c048008 */ lui $a0,0x8008 +/* f0b8fa4: 3c048008 */ lui $a0,%hi(g_Bodies+0x2) /* f0b8fa8: afa200f8 */ sw $v0,0xf8($sp) /* f0b8fac: 00194880 */ sll $t1,$t9,0x2 /* f0b8fb0: 01394821 */ addu $t1,$t1,$t9 /* f0b8fb4: 00094880 */ sll $t1,$t1,0x2 /* f0b8fb8: 00892021 */ addu $a0,$a0,$t1 /* f0b8fbc: 0fc59ca0 */ jal func0f167280 -/* f0b8fc0: 9484cf06 */ lhu $a0,-0x30fa($a0) +/* f0b8fc0: 9484cf06 */ lhu $a0,%lo(g_Bodies+0x2)($a0) /* f0b8fc4: 8faf00f0 */ lw $t7,0xf0($sp) /* f0b8fc8: 004f5021 */ addu $t2,$v0,$t7 /* f0b8fcc: 254c003f */ addiu $t4,$t2,0x3f @@ -3355,14 +3355,14 @@ glabel var7f1ad5b4 /* f0b90e8: 00097880 */ sll $t7,$t1,0x2 /* f0b90ec: 914a0af0 */ lbu $t2,%lo(g_Is4Mb)($t2) /* f0b90f0: 8fac0064 */ lw $t4,0x64($sp) -/* f0b90f4: 3c048008 */ lui $a0,0x8008 +/* f0b90f4: 3c048008 */ lui $a0,%hi(g_Bodies+0x2) /* f0b90f8: 10ca001a */ beq $a2,$t2,.L0f0b9164 /* f0b90fc: 000c6880 */ sll $t5,$t4,0x2 /* f0b9100: 01ac6821 */ addu $t5,$t5,$t4 /* f0b9104: 000d6880 */ sll $t5,$t5,0x2 /* f0b9108: 008d2021 */ addu $a0,$a0,$t5 /* f0b910c: 0fc69e11 */ jal fileLoad -/* f0b9110: 9484cf06 */ lhu $a0,-0x30fa($a0) +/* f0b9110: 9484cf06 */ lhu $a0,%lo(g_Bodies+0x2)($a0) /* f0b9114: 8fab0064 */ lw $t3,0x64($sp) /* f0b9118: 3c088008 */ lui $t0,%hi(g_Bodies) /* f0b911c: 2508cf04 */ addiu $t0,$t0,%lo(g_Bodies) @@ -6702,7 +6702,7 @@ glabel func0f0bc554 /* f0bc5e4: 14200019 */ bnez $at,.L0f0bc64c /* f0bc5e8: 00000000 */ sll $zero,$zero,0x0 /* f0bc5ec: 8f3906c8 */ lw $t9,%lo(var800706c8)($t9) -/* f0bc5f0: 3c038007 */ lui $v1,0x8007 +/* f0bc5f0: 3c038007 */ lui $v1,%hi(var800705c0+0x8) /* f0bc5f4: 8cc2028c */ lw $v0,0x28c($a2) /* f0bc5f8: 00195880 */ sll $t3,$t9,0x2 /* f0bc5fc: 01795823 */ subu $t3,$t3,$t9 @@ -6710,7 +6710,7 @@ glabel func0f0bc554 /* f0bc604: 01795823 */ subu $t3,$t3,$t9 /* f0bc608: 000b5880 */ sll $t3,$t3,0x2 /* f0bc60c: 006b1821 */ addu $v1,$v1,$t3 -/* f0bc610: 8c6305c8 */ lw $v1,0x5c8($v1) +/* f0bc610: 8c6305c8 */ lw $v1,%lo(var800705c0+0x8)($v1) /* f0bc614: 04610003 */ bgez $v1,.L0f0bc624 /* f0bc618: 00036043 */ sra $t4,$v1,0x1 /* f0bc61c: 24610001 */ addiu $at,$v1,0x1 @@ -6767,7 +6767,7 @@ glabel func0f0bc554 .L0f0bc6c8: /* f0bc6c8: 3c0e8007 */ lui $t6,%hi(var800706c8) /* f0bc6cc: 8dce06c8 */ lw $t6,%lo(var800706c8)($t6) -/* f0bc6d0: 3c038007 */ lui $v1,0x8007 +/* f0bc6d0: 3c038007 */ lui $v1,%hi(var800705c0+0x8) /* f0bc6d4: 8ccc028c */ lw $t4,0x28c($a2) /* f0bc6d8: 000e7880 */ sll $t7,$t6,0x2 /* f0bc6dc: 01ee7823 */ subu $t7,$t7,$t6 @@ -6775,7 +6775,7 @@ glabel func0f0bc554 /* f0bc6e4: 01ee7823 */ subu $t7,$t7,$t6 /* f0bc6e8: 000f7880 */ sll $t7,$t7,0x2 /* f0bc6ec: 006f1821 */ addu $v1,$v1,$t7 -/* f0bc6f0: 8c6305c8 */ lw $v1,0x5c8($v1) +/* f0bc6f0: 8c6305c8 */ lw $v1,%lo(var800705c0+0x8)($v1) /* f0bc6f4: 04610003 */ bgez $v1,.L0f0bc704 /* f0bc6f8: 0003c043 */ sra $t8,$v1,0x1 /* f0bc6fc: 24610001 */ addiu $at,$v1,0x1 @@ -6791,7 +6791,7 @@ glabel func0f0bc554 /* f0bc720: 000d1c03 */ sra $v1,$t5,0x10 .L0f0bc724: /* f0bc724: 8def06c8 */ lw $t7,%lo(var800706c8)($t7) -/* f0bc728: 3c038007 */ lui $v1,0x8007 +/* f0bc728: 3c038007 */ lui $v1,%hi(var800705c0+0xa) /* f0bc72c: 000fc080 */ sll $t8,$t7,0x2 /* f0bc730: 030fc023 */ subu $t8,$t8,$t7 /* f0bc734: 0018c080 */ sll $t8,$t8,0x2 @@ -6799,10 +6799,10 @@ glabel func0f0bc554 /* f0bc73c: 0018c080 */ sll $t8,$t8,0x2 /* f0bc740: 00781821 */ addu $v1,$v1,$t8 /* f0bc744: 10000014 */ beqz $zero,.L0f0bc798 -/* f0bc748: 846305ca */ lh $v1,0x5ca($v1) +/* f0bc748: 846305ca */ lh $v1,%lo(var800705c0+0xa)($v1) .L0f0bc74c: /* f0bc74c: 8f3906c8 */ lw $t9,%lo(var800706c8)($t9) -/* f0bc750: 3c038007 */ lui $v1,0x8007 +/* f0bc750: 3c038007 */ lui $v1,%hi(var800705c0+0xa) /* f0bc754: 00195880 */ sll $t3,$t9,0x2 /* f0bc758: 01795823 */ subu $t3,$t3,$t9 /* f0bc75c: 000b5880 */ sll $t3,$t3,0x2 @@ -6810,17 +6810,17 @@ glabel func0f0bc554 /* f0bc764: 000b5880 */ sll $t3,$t3,0x2 /* f0bc768: 006b1821 */ addu $v1,$v1,$t3 /* f0bc76c: 1000000a */ beqz $zero,.L0f0bc798 -/* f0bc770: 846305ca */ lh $v1,0x5ca($v1) +/* f0bc770: 846305ca */ lh $v1,%lo(var800705c0+0xa)($v1) .L0f0bc774: /* f0bc774: 8d8c06c8 */ lw $t4,%lo(var800706c8)($t4) -/* f0bc778: 3c038007 */ lui $v1,0x8007 +/* f0bc778: 3c038007 */ lui $v1,%hi(var800705c0+0xa) /* f0bc77c: 000c6880 */ sll $t5,$t4,0x2 /* f0bc780: 01ac6823 */ subu $t5,$t5,$t4 /* f0bc784: 000d6880 */ sll $t5,$t5,0x2 /* f0bc788: 01ac6823 */ subu $t5,$t5,$t4 /* f0bc78c: 000d6880 */ sll $t5,$t5,0x2 /* f0bc790: 006d1821 */ addu $v1,$v1,$t5 -/* f0bc794: 846305ca */ lh $v1,0x5ca($v1) +/* f0bc794: 846305ca */ lh $v1,%lo(var800705c0+0xa)($v1) .L0f0bc798: /* f0bc798: 8fbf0014 */ lw $ra,0x14($sp) .L0f0bc79c: @@ -6880,7 +6880,7 @@ glabel func0f0bc7ac /* f0bc850: 10620003 */ beq $v1,$v0,.L0f0bc860 /* f0bc854: 3c0c8007 */ lui $t4,%hi(var800706c8) /* f0bc858: 14410015 */ bne $v0,$at,.L0f0bc8b0 -/* f0bc85c: 3c0e8007 */ lui $t6,%hi(var800706c8) +/* f0bc85c: 3c0e8007 */ lui $t6,0x8007 .L0f0bc860: /* f0bc860: 8d8c06c8 */ lw $t4,%lo(var800706c8)($t4) /* f0bc864: 3c0e8007 */ lui $t6,%hi(var800705c0) @@ -6904,7 +6904,7 @@ glabel func0f0bc7ac /* f0bc8a8: 10000078 */ beqz $zero,.L0f0bca8c /* f0bc8ac: 000c2403 */ sra $a0,$t4,0x10 .L0f0bc8b0: -/* f0bc8b0: 8dce06c8 */ lw $t6,%lo(var800706c8)($t6) +/* f0bc8b0: 8dce06c8 */ lw $t6,1736($t6) /* f0bc8b4: 3c188007 */ lui $t8,%hi(var800705c0) /* f0bc8b8: 271805c0 */ addiu $t8,$t8,%lo(var800705c0) /* f0bc8bc: 000e7880 */ sll $t7,$t6,0x2 @@ -6962,7 +6962,7 @@ glabel func0f0bc7ac .L0f0bc974: /* f0bc974: 8d6e028c */ lw $t6,0x28c($t3) /* f0bc978: 3c0f8007 */ lui $t7,%hi(var800706c8) -/* f0bc97c: 3c198007 */ lui $t9,%hi(var800706c8) +/* f0bc97c: 3c198007 */ lui $t9,0x8007 /* f0bc980: 146e0015 */ bne $v1,$t6,.L0f0bc9d8 /* f0bc984: 00000000 */ sll $zero,$zero,0x0 /* f0bc988: 8def06c8 */ lw $t7,%lo(var800706c8)($t7) @@ -6987,7 +6987,7 @@ glabel func0f0bc7ac /* f0bc9d0: 1000002e */ beqz $zero,.L0f0bca8c /* f0bc9d4: 000f2403 */ sra $a0,$t7,0x10 .L0f0bc9d8: -/* f0bc9d8: 8f3906c8 */ lw $t9,%lo(var800706c8)($t9) +/* f0bc9d8: 8f3906c8 */ lw $t9,1736($t9) /* f0bc9dc: 3c0d8007 */ lui $t5,%hi(var800705c0) /* f0bc9e0: 25ad05c0 */ addiu $t5,$t5,%lo(var800705c0) /* f0bc9e4: 00196080 */ sll $t4,$t9,0x2 @@ -7094,11 +7094,11 @@ glabel func0f0bcaa0 /* f0bcb4c: 000e7080 */ sll $t6,$t6,0x2 /* f0bcb50: 01cd7023 */ subu $t6,$t6,$t5 /* f0bcb54: 000e7080 */ sll $t6,$t6,0x2 -/* f0bcb58: 3c088007 */ lui $t0,0x8007 +/* f0bcb58: 3c088007 */ lui $t0,%hi(var800705c0+0x16) /* f0bcb5c: 24090001 */ addiu $t1,$zero,0x1 /* f0bcb60: 010e4021 */ addu $t0,$t0,$t6 /* f0bcb64: 152f0008 */ bne $t1,$t7,.L0f0bcb88 -/* f0bcb68: 850805d6 */ lh $t0,0x5d6($t0) +/* f0bcb68: 850805d6 */ lh $t0,%lo(var800705c0+0x16)($t0) /* f0bcb6c: 90d804e0 */ lbu $t8,0x4e0($a2) /* f0bcb70: 00082400 */ sll $a0,$t0,0x10 /* f0bcb74: 0004cc03 */ sra $t9,$a0,0x10 @@ -7191,7 +7191,7 @@ glabel func0f0bcaa0 /* f0bcca4: 1449000b */ bne $v0,$t1,.L0f0bccd4 /* f0bcca8: 3c0a8007 */ lui $t2,%hi(var800706c8) /* f0bccac: 8d4a06c8 */ lw $t2,%lo(var800706c8)($t2) -/* f0bccb0: 3c048007 */ lui $a0,0x8007 +/* f0bccb0: 3c048007 */ lui $a0,%hi(var800705c0+0x1e) /* f0bccb4: 000a5880 */ sll $t3,$t2,0x2 /* f0bccb8: 016a5823 */ subu $t3,$t3,$t2 /* f0bccbc: 000b5880 */ sll $t3,$t3,0x2 @@ -7199,7 +7199,7 @@ glabel func0f0bcaa0 /* f0bccc4: 000b5880 */ sll $t3,$t3,0x2 /* f0bccc8: 008b2021 */ addu $a0,$a0,$t3 /* f0bcccc: 10000050 */ beqz $zero,.L0f0bce10 -/* f0bccd0: 848405de */ lh $a0,0x5de($a0) +/* f0bccd0: 848405de */ lh $a0,%lo(var800705c0+0x1e)($a0) .L0f0bccd4: /* f0bccd4: 0fc54b60 */ jal optionsGetEffectiveScreenSize /* f0bccd8: 00000000 */ sll $zero,$zero,0x0 @@ -7208,7 +7208,7 @@ glabel func0f0bcaa0 /* f0bcce4: 3c0e8007 */ lui $t6,%hi(var80070764) /* f0bcce8: 3c0c8007 */ lui $t4,%hi(var800706c8) /* f0bccec: 8d8c06c8 */ lw $t4,%lo(var800706c8)($t4) -/* f0bccf0: 3c048007 */ lui $a0,0x8007 +/* f0bccf0: 3c048007 */ lui $a0,%hi(var800705c0+0x26) /* f0bccf4: 000c6880 */ sll $t5,$t4,0x2 /* f0bccf8: 01ac6823 */ subu $t5,$t5,$t4 /* f0bccfc: 000d6880 */ sll $t5,$t5,0x2 @@ -7216,11 +7216,11 @@ glabel func0f0bcaa0 /* f0bcd04: 000d6880 */ sll $t5,$t5,0x2 /* f0bcd08: 008d2021 */ addu $a0,$a0,$t5 /* f0bcd0c: 10000040 */ beqz $zero,.L0f0bce10 -/* f0bcd10: 848405e6 */ lh $a0,0x5e6($a0) +/* f0bcd10: 848405e6 */ lh $a0,%lo(var800705c0+0x26)($a0) .L0f0bcd14: /* f0bcd14: 8dce0764 */ lw $t6,%lo(var80070764)($t6) /* f0bcd18: 3c0f800a */ lui $t7,%hi(var8009dfc0) -/* f0bcd1c: 3c0b8007 */ lui $t3,%hi(var800706c8) +/* f0bcd1c: 3c0b8007 */ lui $t3,0x8007 /* f0bcd20: 11c00032 */ beqz $t6,.L0f0bcdec /* f0bcd24: 00000000 */ sll $zero,$zero,0x0 /* f0bcd28: 8defdfc0 */ lw $t7,%lo(var8009dfc0)($t7) @@ -7264,7 +7264,7 @@ glabel func0f0bcaa0 .L0f0bcdc0: /* f0bcdc0: 3c198007 */ lui $t9,%hi(var800706c8) /* f0bcdc4: 8f3906c8 */ lw $t9,%lo(var800706c8)($t9) -/* f0bcdc8: 3c048007 */ lui $a0,0x8007 +/* f0bcdc8: 3c048007 */ lui $a0,%hi(var800705c0+0x1e) /* f0bcdcc: 00195080 */ sll $t2,$t9,0x2 /* f0bcdd0: 01595023 */ subu $t2,$t2,$t9 /* f0bcdd4: 000a5080 */ sll $t2,$t2,0x2 @@ -7272,17 +7272,17 @@ glabel func0f0bcaa0 /* f0bcddc: 000a5080 */ sll $t2,$t2,0x2 /* f0bcde0: 008a2021 */ addu $a0,$a0,$t2 /* f0bcde4: 1000000a */ beqz $zero,.L0f0bce10 -/* f0bcde8: 848405de */ lh $a0,0x5de($a0) +/* f0bcde8: 848405de */ lh $a0,%lo(var800705c0+0x1e)($a0) .L0f0bcdec: -/* f0bcdec: 8d6b06c8 */ lw $t3,%lo(var800706c8)($t3) -/* f0bcdf0: 3c048007 */ lui $a0,0x8007 +/* f0bcdec: 8d6b06c8 */ lw $t3,1736($t3) +/* f0bcdf0: 3c048007 */ lui $a0,%hi(var800705c0+0x16) /* f0bcdf4: 000b6080 */ sll $t4,$t3,0x2 /* f0bcdf8: 018b6023 */ subu $t4,$t4,$t3 /* f0bcdfc: 000c6080 */ sll $t4,$t4,0x2 /* f0bce00: 018b6023 */ subu $t4,$t4,$t3 /* f0bce04: 000c6080 */ sll $t4,$t4,0x2 /* f0bce08: 008c2021 */ addu $a0,$a0,$t4 -/* f0bce0c: 848405d6 */ lh $a0,0x5d6($a0) +/* f0bce0c: 848405d6 */ lh $a0,%lo(var800705c0+0x16)($a0) .L0f0bce10: /* f0bce10: 8fbf0014 */ lw $ra,0x14($sp) .L0f0bce14: @@ -7335,14 +7335,14 @@ glabel func0f0bce24 /* f0bceac: 14400083 */ bnez $v0,.L0f0bd0bc /* f0bceb0: 3c0d8007 */ lui $t5,%hi(var800706c8) /* f0bceb4: 8dad06c8 */ lw $t5,%lo(var800706c8)($t5) -/* f0bceb8: 3c068007 */ lui $a2,0x8007 +/* f0bceb8: 3c068007 */ lui $a2,%hi(var800705c0+0x1a) /* f0bcebc: 000d7080 */ sll $t6,$t5,0x2 /* f0bcec0: 01cd7023 */ subu $t6,$t6,$t5 /* f0bcec4: 000e7080 */ sll $t6,$t6,0x2 /* f0bcec8: 01cd7023 */ subu $t6,$t6,$t5 /* f0bcecc: 000e7080 */ sll $t6,$t6,0x2 /* f0bced0: 00ce3021 */ addu $a2,$a2,$t6 -/* f0bced4: 84c605da */ lh $a2,0x5da($a2) +/* f0bced4: 84c605da */ lh $a2,%lo(var800705c0+0x1a)($a2) /* f0bced8: 0fc54bcd */ jal optionsGetScreenSplit /* f0bcedc: a7a6001e */ sh $a2,0x1e($sp) /* f0bcee0: 3c07800a */ lui $a3,%hi(g_Vars) @@ -7537,7 +7537,7 @@ glabel func0f0bce24 .L0f0bd18c: /* f0bd18c: 3c0f8007 */ lui $t7,%hi(var800706c8) /* f0bd190: 8def06c8 */ lw $t7,%lo(var800706c8)($t7) -/* f0bd194: 3c068007 */ lui $a2,0x8007 +/* f0bd194: 3c068007 */ lui $a2,%hi(var800705c0+0x1a) /* f0bd198: 000fc080 */ sll $t8,$t7,0x2 /* f0bd19c: 030fc023 */ subu $t8,$t8,$t7 /* f0bd1a0: 0018c080 */ sll $t8,$t8,0x2 @@ -7545,11 +7545,11 @@ glabel func0f0bce24 /* f0bd1a8: 0018c080 */ sll $t8,$t8,0x2 /* f0bd1ac: 00d83021 */ addu $a2,$a2,$t8 /* f0bd1b0: 10000064 */ beqz $zero,.L0f0bd344 -/* f0bd1b4: 84c605da */ lh $a2,0x5da($a2) +/* f0bd1b4: 84c605da */ lh $a2,%lo(var800705c0+0x1a)($a2) .L0f0bd1b8: /* f0bd1b8: 3c198007 */ lui $t9,%hi(var800706c8) /* f0bd1bc: 8f3906c8 */ lw $t9,%lo(var800706c8)($t9) -/* f0bd1c0: 3c068007 */ lui $a2,0x8007 +/* f0bd1c0: 3c068007 */ lui $a2,%hi(var800705c0+0x22) /* f0bd1c4: 00195080 */ sll $t2,$t9,0x2 /* f0bd1c8: 01595023 */ subu $t2,$t2,$t9 /* f0bd1cc: 000a5080 */ sll $t2,$t2,0x2 @@ -7557,7 +7557,7 @@ glabel func0f0bce24 /* f0bd1d4: 000a5080 */ sll $t2,$t2,0x2 /* f0bd1d8: 00ca3021 */ addu $a2,$a2,$t2 /* f0bd1dc: 10000059 */ beqz $zero,.L0f0bd344 -/* f0bd1e0: 84c605e2 */ lh $a2,0x5e2($a2) +/* f0bd1e0: 84c605e2 */ lh $a2,%lo(var800705c0+0x22)($a2) .L0f0bd1e4: /* f0bd1e4: 0fc54b60 */ jal optionsGetEffectiveScreenSize /* f0bd1e8: 00000000 */ sll $zero,$zero,0x0 @@ -7566,7 +7566,7 @@ glabel func0f0bce24 /* f0bd1f4: 3c0d8007 */ lui $t5,%hi(var80070764) /* f0bd1f8: 3c0b8007 */ lui $t3,%hi(var800706c8) /* f0bd1fc: 8d6b06c8 */ lw $t3,%lo(var800706c8)($t3) -/* f0bd200: 3c068007 */ lui $a2,0x8007 +/* f0bd200: 3c068007 */ lui $a2,%hi(var800705c0+0x2a) /* f0bd204: 000b6080 */ sll $t4,$t3,0x2 /* f0bd208: 018b6023 */ subu $t4,$t4,$t3 /* f0bd20c: 000c6080 */ sll $t4,$t4,0x2 @@ -7574,7 +7574,7 @@ glabel func0f0bce24 /* f0bd214: 000c6080 */ sll $t4,$t4,0x2 /* f0bd218: 00cc3021 */ addu $a2,$a2,$t4 /* f0bd21c: 10000049 */ beqz $zero,.L0f0bd344 -/* f0bd220: 84c605ea */ lh $a2,0x5ea($a2) +/* f0bd220: 84c605ea */ lh $a2,%lo(var800705c0+0x2a)($a2) .L0f0bd224: /* f0bd224: 8dad0764 */ lw $t5,%lo(var80070764)($t5) /* f0bd228: 3c0e800a */ lui $t6,%hi(var8009dfc0) @@ -7630,7 +7630,7 @@ glabel func0f0bce24 .L0f0bd2ec: /* f0bd2ec: 3c198007 */ lui $t9,%hi(var800706c8) /* f0bd2f0: 8f3906c8 */ lw $t9,%lo(var800706c8)($t9) -/* f0bd2f4: 3c068007 */ lui $a2,0x8007 +/* f0bd2f4: 3c068007 */ lui $a2,%hi(var800705c0+0x22) /* f0bd2f8: 00195080 */ sll $t2,$t9,0x2 /* f0bd2fc: 01595023 */ subu $t2,$t2,$t9 /* f0bd300: 000a5080 */ sll $t2,$t2,0x2 @@ -7638,11 +7638,11 @@ glabel func0f0bce24 /* f0bd308: 000a5080 */ sll $t2,$t2,0x2 /* f0bd30c: 00ca3021 */ addu $a2,$a2,$t2 /* f0bd310: 1000000c */ beqz $zero,.L0f0bd344 -/* f0bd314: 84c605e2 */ lh $a2,0x5e2($a2) +/* f0bd314: 84c605e2 */ lh $a2,%lo(var800705c0+0x22)($a2) .L0f0bd318: /* f0bd318: 3c0b8007 */ lui $t3,%hi(var800706c8) /* f0bd31c: 8d6b06c8 */ lw $t3,%lo(var800706c8)($t3) -/* f0bd320: 3c028007 */ lui $v0,0x8007 +/* f0bd320: 3c028007 */ lui $v0,%hi(var800705c0+0x1a) /* f0bd324: 000b6080 */ sll $t4,$t3,0x2 /* f0bd328: 018b6023 */ subu $t4,$t4,$t3 /* f0bd32c: 000c6080 */ sll $t4,$t4,0x2 @@ -7650,7 +7650,7 @@ glabel func0f0bce24 /* f0bd334: 000c6080 */ sll $t4,$t4,0x2 /* f0bd338: 004c1021 */ addu $v0,$v0,$t4 /* f0bd33c: 10000002 */ beqz $zero,.L0f0bd348 -/* f0bd340: 844205da */ lh $v0,0x5da($v0) +/* f0bd340: 844205da */ lh $v0,%lo(var800705c0+0x1a)($v0) .L0f0bd344: /* f0bd344: 00c01025 */ or $v0,$a2,$zero .L0f0bd348: @@ -7932,9 +7932,9 @@ glabel func0f0bd764 /* f0bd768: afbf001c */ sw $ra,0x1c($sp) /* f0bd76c: 0fc2f4d6 */ jal func0f0bd358 /* f0bd770: afb00018 */ sw $s0,0x18($sp) -/* f0bd774: 3c018007 */ lui $at,0x8007 +/* f0bd774: 3c018007 */ lui $at,%hi(var800706c8) /* f0bd778: e7a00024 */ swc1 $f0,0x24($sp) -/* f0bd77c: ac2006c8 */ sw $zero,0x6c8($at) +/* f0bd77c: ac2006c8 */ sw $zero,%lo(var800706c8)($at) /* f0bd780: 0fc54c77 */ jal func0f1531dc /* f0bd784: 00002025 */ or $a0,$zero,$zero /* f0bd788: 3c014270 */ lui $at,0x4270 @@ -7963,7 +7963,7 @@ glabel func0f0bd764 /* f0bd7e4: 00402825 */ or $a1,$v0,$zero /* f0bd7e8: 3c188007 */ lui $t8,%hi(var800706c8) /* f0bd7ec: 8f1806c8 */ lw $t8,%lo(var800706c8)($t8) -/* f0bd7f0: 3c048007 */ lui $a0,0x8007 +/* f0bd7f0: 3c048007 */ lui $a0,%hi(var800705c0+0x10) /* f0bd7f4: 0018c880 */ sll $t9,$t8,0x2 /* f0bd7f8: 0338c823 */ subu $t9,$t9,$t8 /* f0bd7fc: 0019c880 */ sll $t9,$t9,0x2 @@ -7971,7 +7971,7 @@ glabel func0f0bd764 /* f0bd804: 0019c880 */ sll $t9,$t9,0x2 /* f0bd808: 00992021 */ addu $a0,$a0,$t9 /* f0bd80c: 0c002aac */ jal func0000aab0 -/* f0bd810: 8c8405d0 */ lw $a0,0x5d0($a0) +/* f0bd810: 8c8405d0 */ lw $a0,%lo(var800705c0+0x10)($a0) /* f0bd814: 0fc2f155 */ jal func0f0bc554 /* f0bd818: 00000000 */ sll $zero,$zero,0x0 /* f0bd81c: 00028400 */ sll $s0,$v0,0x10 @@ -8212,7 +8212,7 @@ glabel var7f1ad6ac /* f0bdb1c: 0fc4a2ae */ jal func0f128ab8 /* f0bdb20: 00402825 */ or $a1,$v0,$zero /* f0bdb24: 8e2f0000 */ lw $t7,0x0($s1) -/* f0bdb28: 3c048007 */ lui $a0,0x8007 +/* f0bdb28: 3c048007 */ lui $a0,%hi(var800705c0+0x10) /* f0bdb2c: 000fc080 */ sll $t8,$t7,0x2 /* f0bdb30: 030fc023 */ subu $t8,$t8,$t7 /* f0bdb34: 0018c080 */ sll $t8,$t8,0x2 @@ -8220,7 +8220,7 @@ glabel var7f1ad6ac /* f0bdb3c: 0018c080 */ sll $t8,$t8,0x2 /* f0bdb40: 00982021 */ addu $a0,$a0,$t8 /* f0bdb44: 0c002aac */ jal func0000aab0 -/* f0bdb48: 8c8405d0 */ lw $a0,0x5d0($a0) +/* f0bdb48: 8c8405d0 */ lw $a0,%lo(var800705c0+0x10)($a0) /* f0bdb4c: 0fc2f155 */ jal func0f0bc554 /* f0bdb50: 00000000 */ sll $zero,$zero,0x0 /* f0bdb54: 00028400 */ sll $s0,$v0,0x10 @@ -8524,8 +8524,8 @@ glabel var7f1ad6ac .L0f0bdfb8: /* f0bdfb8: 24010006 */ addiu $at,$zero,0x6 /* f0bdfbc: 10610002 */ beq $v1,$at,.L0f0bdfc8 -/* f0bdfc0: 3c018007 */ lui $at,0x8007 -/* f0bdfc4: ac200764 */ sw $zero,0x764($at) +/* f0bdfc0: 3c018007 */ lui $at,%hi(var80070764) +/* f0bdfc4: ac200764 */ sw $zero,%lo(var80070764)($at) .L0f0bdfc8: /* f0bdfc8: 24010006 */ addiu $at,$zero,0x6 /* f0bdfcc: 54610054 */ bnel $v1,$at,.L0f0be120 @@ -10023,8 +10023,8 @@ glabel var7f1ad6ac /* f0bf5c0: 85a41ba4 */ lh $a0,0x1ba4($t5) /* f0bf5c4: 0c003a61 */ jal getCurrentStageId /* f0bf5c8: 00000000 */ sll $zero,$zero,0x0 -/* f0bf5cc: 3c0c8008 */ lui $t4,0x8008 -/* f0bf5d0: 858cffd0 */ lh $t4,-0x30($t4) +/* f0bf5cc: 3c0c8008 */ lui $t4,%hi(g_Stages+0x310) +/* f0bf5d0: 858cffd0 */ lh $t4,%lo(g_Stages+0x310)($t4) /* f0bf5d4: 544c000c */ bnel $v0,$t4,.L0f0bf608 /* f0bf5d8: 8e700284 */ lw $s0,0x284($s3) /* f0bf5dc: 8e6e0284 */ lw $t6,0x284($s3) diff --git a/src/game/game_0d4690.c b/src/game/game_0d4690.c index dd764644f..af4c4c8b7 100644 --- a/src/game/game_0d4690.c +++ b/src/game/game_0d4690.c @@ -1482,9 +1482,9 @@ glabel formatTime GLOBAL_ASM( glabel func0f0d5a7c -/* f0d5a7c: 3c018007 */ lui $at,0x8007 +/* f0d5a7c: 3c018007 */ lui $at,%hi(var80070f10) /* f0d5a80: 03e00008 */ jr $ra -/* f0d5a84: ac200f10 */ sw $zero,0xf10($at) +/* f0d5a84: ac200f10 */ sw $zero,%lo(var80070f10)($at) /* f0d5a88: 00000000 */ sll $zero,$zero,0x0 /* f0d5a8c: 00000000 */ sll $zero,$zero,0x0 ); diff --git a/src/game/game_0d5a90.c b/src/game/game_0d5a90.c index bc3ac088c..7c81e447b 100644 --- a/src/game/game_0d5a90.c +++ b/src/game/game_0d5a90.c @@ -494,8 +494,8 @@ glabel func0f0d5d8c /* f0d6068: 46006281 */ sub.s $f10,$f12,$f0 /* f0d606c: 46064103 */ div.s $f4,$f8,$f6 /* f0d6070: 44814000 */ mtc1 $at,$f8 -/* f0d6074: 3c018007 */ lui $at,0x8007 -/* f0d6078: ac2d0f4c */ sw $t5,0xf4c($at) +/* f0d6074: 3c018007 */ lui $at,%hi(var80070f4c) +/* f0d6078: ac2d0f4c */ sw $t5,%lo(var80070f4c)($at) /* f0d607c: 46085182 */ mul.s $f6,$f10,$f8 /* f0d6080: e7a60134 */ swc1 $f6,0x134($sp) /* f0d6084: e7a40138 */ swc1 $f4,0x138($sp) @@ -1085,11 +1085,11 @@ glabel func0f0d5d8c /* f0d6970: 27a801a8 */ addiu $t0,$sp,0x1a8 .L0f0d6974: /* f0d6974: 8d020000 */ lw $v0,0x0($t0) -/* f0d6978: 3c048007 */ lui $a0,%hi(var800700a0) +/* f0d6978: 3c048007 */ lui $a0,%hi(var80070f3c) /* f0d697c: 3c058007 */ lui $a1,%hi(var80070f44) /* f0d6980: 00540019 */ multu $v0,$s4 /* f0d6984: 8ca50f44 */ lw $a1,%lo(var80070f44)($a1) -/* f0d6988: 8c840f3c */ lw $a0,0xf3c($a0) +/* f0d6988: 8c840f3c */ lw $a0,%lo(var80070f3c)($a0) /* f0d698c: 8fa60158 */ lw $a2,0x158($sp) /* f0d6990: 8fa7015c */ lw $a3,0x15c($sp) /* f0d6994: 0000c812 */ mflo $t9 @@ -1179,11 +1179,11 @@ glabel func0f0d5d8c /* f0d6ae0: 27a90188 */ addiu $t1,$sp,0x188 .L0f0d6ae4: /* f0d6ae4: 8d220000 */ lw $v0,0x0($t1) -/* f0d6ae8: 3c048007 */ lui $a0,%hi(var80070090) +/* f0d6ae8: 3c048007 */ lui $a0,%hi(var80070f40) /* f0d6aec: 3c058007 */ lui $a1,%hi(var80070f44) /* f0d6af0: 00540019 */ multu $v0,$s4 /* f0d6af4: 8ca50f44 */ lw $a1,%lo(var80070f44)($a1) -/* f0d6af8: 8c840f40 */ lw $a0,0xf40($a0) +/* f0d6af8: 8c840f40 */ lw $a0,%lo(var80070f40)($a0) /* f0d6afc: 8fa60150 */ lw $a2,0x150($sp) /* f0d6b00: 8fa70154 */ lw $a3,0x154($sp) /* f0d6b04: 0000c812 */ mflo $t9 @@ -1336,7 +1336,7 @@ glabel func0f0d5d8c /* f0d6d4c: 26870008 */ addiu $a3,$s4,0x8 /* f0d6d50: afa70428 */ sw $a3,0x428($sp) /* f0d6d54: 0c012d20 */ jal osVirtualToPhysical -/* f0d6d58: 24840090 */ addiu $a0,$a0,%lo(var80070090) +/* f0d6d58: 24840090 */ addiu $a0,$a0,144 /* f0d6d5c: 8fa50428 */ lw $a1,0x428($sp) /* f0d6d60: ae820004 */ sw $v0,0x4($s4) /* f0d6d64: 2a21000a */ slti $at,$s1,0xa @@ -1465,7 +1465,7 @@ glabel func0f0d5d8c /* f0d6f40: 24a50008 */ addiu $a1,$a1,0x8 /* f0d6f44: afa50428 */ sw $a1,0x428($sp) /* f0d6f48: 0c012d20 */ jal osVirtualToPhysical -/* f0d6f4c: 248400a0 */ addiu $a0,$a0,%lo(var800700a0) +/* f0d6f4c: 248400a0 */ addiu $a0,$a0,160 /* f0d6f50: 00147900 */ sll $t7,$s4,0x4 /* f0d6f54: 00106080 */ sll $t4,$s0,0x2 /* f0d6f58: 8fb30428 */ lw $s3,0x428($sp) diff --git a/src/game/game_0d7070.c b/src/game/game_0d7070.c index c4f0b9fdd..146eb1315 100644 --- a/src/game/game_0d7070.c +++ b/src/game/game_0d7070.c @@ -2410,11 +2410,11 @@ glabel var7f1ade50 /* f0d91a0: 241800c8 */ addiu $t8,$zero,0xc8 /* f0d91a4: 00591021 */ addu $v0,$v0,$t9 /* f0d91a8: 304b0080 */ andi $t3,$v0,0x80 -/* f0d91ac: 3c018007 */ lui $at,0x8007 +/* f0d91ac: 3c018007 */ lui $at,%hi(var80070f98) /* f0d91b0: afaf0078 */ sw $t7,0x78($sp) /* f0d91b4: afb80074 */ sw $t8,0x74($sp) /* f0d91b8: 1160001f */ beqz $t3,.L0f0d9238 -/* f0d91bc: ac220f98 */ sw $v0,0xf98($at) +/* f0d91bc: ac220f98 */ sw $v0,%lo(var80070f98)($at) /* f0d91c0: 240459b7 */ addiu $a0,$zero,0x59b7 /* f0d91c4: 0fc5b9f1 */ jal langGet /* f0d91c8: afa30090 */ sw $v1,0x90($sp) @@ -6345,9 +6345,9 @@ glabel var7f1ade74 /* f0dcaa0: 24090002 */ addiu $t1,$zero,0x2 /* f0dcaa4: 15190004 */ bne $t0,$t9,.L0f0dcab8 /* f0dcaa8: 3c018008 */ lui $at,0x8008 -/* f0dcaac: 3c018008 */ lui $at,0x8008 +/* f0dcaac: 3c018008 */ lui $at,%hi(var8007fac0) /* f0dcab0: 10000002 */ beqz $zero,.L0f0dcabc -/* f0dcab4: ac29fac0 */ sw $t1,-0x540($at) +/* f0dcab4: ac29fac0 */ sw $t1,%lo(var8007fac0)($at) .L0f0dcab8: /* f0dcab8: ac28fac0 */ sw $t0,-0x540($at) .L0f0dcabc: @@ -6551,8 +6551,8 @@ glabel var7f1ade74 .L0f0dcd8c: /* f0dcd8c: 240d0001 */ addiu $t5,$zero,0x1 .L0f0dcd90: -/* f0dcd90: 3c018008 */ lui $at,0x8008 -/* f0dcd94: ac2dfac0 */ sw $t5,-0x540($at) +/* f0dcd90: 3c018008 */ lui $at,%hi(var8007fac0) +/* f0dcd94: ac2dfac0 */ sw $t5,%lo(var8007fac0)($at) /* f0dcd98: 8fa20030 */ lw $v0,0x30($sp) .L0f0dcd9c: /* f0dcd9c: 8fbf0014 */ lw $ra,0x14($sp) diff --git a/src/game/game_0dcdb0.c b/src/game/game_0dcdb0.c index 7cd994a7b..547eae486 100644 --- a/src/game/game_0dcdb0.c +++ b/src/game/game_0dcdb0.c @@ -710,8 +710,8 @@ glabel var7f1adeac .word 0x40490fdb .text /* f0dd848: 240e0001 */ addiu $t6,$zero,0x1 -/* f0dd84c: 3c018007 */ lui $at,0x8007 -/* f0dd850: a02e0fb0 */ sb $t6,0xfb0($at) +/* f0dd84c: 3c018007 */ lui $at,%hi(var80070fb0) +/* f0dd850: a02e0fb0 */ sb $t6,%lo(var80070fb0)($at) /* f0dd854: 27bdff90 */ addiu $sp,$sp,-112 /* f0dd858: 3c0142b4 */ lui $at,0x42b4 /* f0dd85c: 44812000 */ mtc1 $at,$f4 @@ -2216,8 +2216,8 @@ glabel hudmsgCreate /* f0def60: 2406ffff */ addiu $a2,$zero,-1 /* f0def64: 00008025 */ or $s0,$zero,$zero /* f0def68: 18800014 */ blez $a0,.L0f0defbc -/* f0def6c: 3c028007 */ lui $v0,%hi(var800701dc) -/* f0def70: 8c420fec */ lw $v0,0xfec($v0) +/* f0def6c: 3c028007 */ lui $v0,%hi(g_HudMessages) +/* f0def70: 8c420fec */ lw $v0,%lo(g_HudMessages)($v0) /* f0def74: 24050005 */ addiu $a1,$zero,0x5 .L0f0def78: /* f0def78: 90430000 */ lbu $v1,0x0($v0) @@ -2237,7 +2237,7 @@ glabel hudmsgCreate .L0f0defb0: /* f0defb0: 0204082a */ slt $at,$s0,$a0 /* f0defb4: 1420fff0 */ bnez $at,.L0f0def78 -/* f0defb8: 244201dc */ addiu $v0,$v0,%lo(var800701dc) +/* f0defb8: 244201dc */ addiu $v0,$v0,476 .L0f0defbc: /* f0defbc: 04c100e3 */ bgez $a2,.L0f0df34c .L0f0defc0: @@ -2249,16 +2249,16 @@ glabel hudmsgCreate /* f0defd4: 146a0005 */ bne $v1,$t2,.L0f0defec /* f0defd8: 00008025 */ or $s0,$zero,$zero /* f0defdc: 240b0002 */ addiu $t3,$zero,0x2 -/* f0defe0: 3c018008 */ lui $at,0x8008 +/* f0defe0: 3c018008 */ lui $at,%hi(var8007fac0) /* f0defe4: 10000003 */ beqz $zero,.L0f0deff4 -/* f0defe8: ac2bfac0 */ sw $t3,-0x540($at) +/* f0defe8: ac2bfac0 */ sw $t3,%lo(var8007fac0)($at) .L0f0defec: -/* f0defec: 3c018008 */ lui $at,0x8008 -/* f0deff0: ac23fac0 */ sw $v1,-0x540($at) +/* f0defec: 3c018008 */ lui $at,%hi(var8007fac0) +/* f0deff0: ac23fac0 */ sw $v1,%lo(var8007fac0)($at) .L0f0deff4: /* f0deff4: 18800009 */ blez $a0,.L0f0df01c -/* f0deff8: 3c028007 */ lui $v0,%hi(var800701dc) -/* f0deffc: 8c420fec */ lw $v0,0xfec($v0) +/* f0deff8: 3c028007 */ lui $v0,%hi(g_HudMessages) +/* f0deffc: 8c420fec */ lw $v0,%lo(g_HudMessages)($v0) .L0f0df000: /* f0df000: 904c0000 */ lbu $t4,0x0($v0) /* f0df004: 51800006 */ beqzl $t4,.L0f0df020 @@ -2266,7 +2266,7 @@ glabel hudmsgCreate /* f0df00c: 26100001 */ addiu $s0,$s0,0x1 /* f0df010: 0204082a */ slt $at,$s0,$a0 /* f0df014: 1420fffa */ bnez $at,.L0f0df000 -/* f0df018: 244201dc */ addiu $v0,$v0,%lo(var800701dc) +/* f0df018: 244201dc */ addiu $v0,$v0,476 .L0f0df01c: /* f0df01c: 0204082a */ slt $at,$s0,$a0 .L0f0df020: @@ -2484,8 +2484,8 @@ glabel hudmsgCreate /* f0df33c: 8fac022c */ lw $t4,0x22c($sp) /* f0df340: ae2c01b0 */ sw $t4,0x1b0($s1) .L0f0df344: -/* f0df344: 3c018008 */ lui $at,0x8008 -/* f0df348: ac23fac0 */ sw $v1,-0x540($at) +/* f0df344: 3c018008 */ lui $at,%hi(var8007fac0) +/* f0df348: ac23fac0 */ sw $v1,%lo(var8007fac0)($at) .L0f0df34c: /* f0df34c: 8fbf002c */ lw $ra,0x2c($sp) /* f0df350: 8fb00020 */ lw $s0,0x20($sp) @@ -2661,7 +2661,7 @@ glabel var7f1aded8 /* f0df36c: 8dce06c8 */ lw $t6,%lo(var800706c8)($t6) /* f0df370: afb20030 */ sw $s2,0x30($sp) /* f0df374: 24120001 */ addiu $s2,$zero,0x1 -/* f0df378: 3c018007 */ lui $at,0x8007 +/* f0df378: 3c018007 */ lui $at,%hi(var80070fb0) /* f0df37c: afbf0044 */ sw $ra,0x44($sp) /* f0df380: afb60040 */ sw $s6,0x40($sp) /* f0df384: afb5003c */ sw $s5,0x3c($sp) @@ -2670,14 +2670,14 @@ glabel var7f1aded8 /* f0df390: afb1002c */ sw $s1,0x2c($sp) /* f0df394: afb00028 */ sw $s0,0x28($sp) /* f0df398: 164e0005 */ bne $s2,$t6,.L0f0df3b0 -/* f0df39c: a0200fb0 */ sb $zero,0xfb0($at) +/* f0df39c: a0200fb0 */ sb $zero,%lo(var80070fb0)($at) /* f0df3a0: 240f0002 */ addiu $t7,$zero,0x2 -/* f0df3a4: 3c018008 */ lui $at,0x8008 +/* f0df3a4: 3c018008 */ lui $at,%hi(var8007fac0) /* f0df3a8: 10000003 */ beqz $zero,.L0f0df3b8 -/* f0df3ac: ac2ffac0 */ sw $t7,-0x540($at) +/* f0df3ac: ac2ffac0 */ sw $t7,%lo(var8007fac0)($at) .L0f0df3b0: -/* f0df3b0: 3c018008 */ lui $at,0x8008 -/* f0df3b4: ac32fac0 */ sw $s2,-0x540($at) +/* f0df3b0: 3c018008 */ lui $at,%hi(var8007fac0) +/* f0df3b4: ac32fac0 */ sw $s2,%lo(var8007fac0)($at) .L0f0df3b8: /* f0df3b8: 3c088007 */ lui $t0,%hi(g_NumHudMessages) /* f0df3bc: 8d080fe8 */ lw $t0,%lo(g_NumHudMessages)($t0) @@ -3110,8 +3110,8 @@ glabel var7f1aded8 /* f0df9e8: 8fa40068 */ lw $a0,0x68($sp) .L0f0df9ec: /* f0df9ec: 8fbf0044 */ lw $ra,0x44($sp) -/* f0df9f0: 3c018008 */ lui $at,0x8008 -/* f0df9f4: ac32fac0 */ sw $s2,-0x540($at) +/* f0df9f0: 3c018008 */ lui $at,%hi(var8007fac0) +/* f0df9f4: ac32fac0 */ sw $s2,%lo(var8007fac0)($at) /* f0df9f8: 8fb20030 */ lw $s2,0x30($sp) /* f0df9fc: 8fb00028 */ lw $s0,0x28($sp) /* f0dfa00: 8fb1002c */ lw $s1,0x2c($sp) @@ -3189,12 +3189,12 @@ glabel var7f1adef4 /* f0dfb24: 144f0005 */ bne $v0,$t7,.L0f0dfb3c /* f0dfb28: afa200dc */ sw $v0,0xdc($sp) /* f0dfb2c: 24180002 */ addiu $t8,$zero,0x2 -/* f0dfb30: 3c018008 */ lui $at,0x8008 +/* f0dfb30: 3c018008 */ lui $at,%hi(var8007fac0) /* f0dfb34: 10000003 */ beqz $zero,.L0f0dfb44 -/* f0dfb38: ac38fac0 */ sw $t8,-0x540($at) +/* f0dfb38: ac38fac0 */ sw $t8,%lo(var8007fac0)($at) .L0f0dfb3c: -/* f0dfb3c: 3c018008 */ lui $at,0x8008 -/* f0dfb40: ac22fac0 */ sw $v0,-0x540($at) +/* f0dfb3c: 3c018008 */ lui $at,%hi(var8007fac0) +/* f0dfb40: ac22fac0 */ sw $v0,%lo(var8007fac0)($at) .L0f0dfb44: /* f0dfb44: 0fc54d8a */ jal func0f153628 /* f0dfb48: 02402025 */ or $a0,$s2,$zero @@ -3986,7 +3986,7 @@ glabel var7f1adef4 /* f0e06d4: 02402025 */ or $a0,$s2,$zero /* f0e06d8: 8fbf007c */ lw $ra,0x7c($sp) /* f0e06dc: 240a0001 */ addiu $t2,$zero,0x1 -/* f0e06e0: 3c018008 */ lui $at,0x8008 +/* f0e06e0: 3c018008 */ lui $at,%hi(var8007fac0) /* f0e06e4: d7b40038 */ ldc1 $f20,0x38($sp) /* f0e06e8: d7b60040 */ ldc1 $f22,0x40($sp) /* f0e06ec: d7b80048 */ ldc1 $f24,0x48($sp) @@ -4000,7 +4000,7 @@ glabel var7f1adef4 /* f0e070c: 8fb60070 */ lw $s6,0x70($sp) /* f0e0710: 8fb70074 */ lw $s7,0x74($sp) /* f0e0714: 8fbe0078 */ lw $s8,0x78($sp) -/* f0e0718: ac2afac0 */ sw $t2,-0x540($at) +/* f0e0718: ac2afac0 */ sw $t2,%lo(var8007fac0)($at) /* f0e071c: 03e00008 */ jr $ra /* f0e0720: 27bd0100 */ addiu $sp,$sp,0x100 ); diff --git a/src/game/game_0e0770.c b/src/game/game_0e0770.c index c2dbce562..cf06f1261 100644 --- a/src/game/game_0e0770.c +++ b/src/game/game_0e0770.c @@ -88,12 +88,12 @@ glabel func0f0e0770 /* f0e07b8: 162e0005 */ bne $s1,$t6,.L0f0e07d0 /* f0e07bc: 3c188007 */ lui $t8,%hi(var80071180) /* f0e07c0: 240f0002 */ addiu $t7,$zero,0x2 -/* f0e07c4: 3c018008 */ lui $at,0x8008 +/* f0e07c4: 3c018008 */ lui $at,%hi(var8007fac0) /* f0e07c8: 10000003 */ beqz $zero,.L0f0e07d8 -/* f0e07cc: ac2ffac0 */ sw $t7,-0x540($at) +/* f0e07cc: ac2ffac0 */ sw $t7,%lo(var8007fac0)($at) .L0f0e07d0: -/* f0e07d0: 3c018008 */ lui $at,0x8008 -/* f0e07d4: ac31fac0 */ sw $s1,-0x540($at) +/* f0e07d0: 3c018008 */ lui $at,%hi(var8007fac0) +/* f0e07d4: ac31fac0 */ sw $s1,%lo(var8007fac0)($at) .L0f0e07d8: /* f0e07d8: 8f181180 */ lw $t8,%lo(var80071180)($t8) /* f0e07dc: 24010001 */ addiu $at,$zero,0x1 @@ -199,7 +199,7 @@ glabel func0f0e0770 /* f0e0958: 03d8f021 */ addu $s8,$s8,$t8 /* f0e095c: 8fbf003c */ lw $ra,0x3c($sp) /* f0e0960: 24190001 */ addiu $t9,$zero,0x1 -/* f0e0964: 3c018008 */ lui $at,0x8008 +/* f0e0964: 3c018008 */ lui $at,%hi(var8007fac0) /* f0e0968: 8fb00018 */ lw $s0,0x18($sp) /* f0e096c: 8fb1001c */ lw $s1,0x1c($sp) /* f0e0970: 8fb20020 */ lw $s2,0x20($sp) @@ -209,7 +209,7 @@ glabel func0f0e0770 /* f0e0980: 8fb60030 */ lw $s6,0x30($sp) /* f0e0984: 8fb70034 */ lw $s7,0x34($sp) /* f0e0988: 8fbe0038 */ lw $s8,0x38($sp) -/* f0e098c: ac39fac0 */ sw $t9,-0x540($at) +/* f0e098c: ac39fac0 */ sw $t9,%lo(var8007fac0)($at) /* f0e0990: 03e00008 */ jr $ra /* f0e0994: 27bd0080 */ addiu $sp,$sp,0x80 ); @@ -4908,9 +4908,9 @@ glabel func0f0e4190 GLOBAL_ASM( glabel func0f0e4fd4 -/* f0e4fd4: 3c018007 */ lui $at,0x8007 +/* f0e4fd4: 3c018007 */ lui $at,%hi(var80071184) /* f0e4fd8: 03e00008 */ jr $ra -/* f0e4fdc: ac201184 */ sw $zero,0x1184($at) +/* f0e4fdc: ac201184 */ sw $zero,%lo(var80071184)($at) ); GLOBAL_ASM( diff --git a/src/game/game_0e5ce0.c b/src/game/game_0e5ce0.c index 503c6c1bb..fa0784245 100644 --- a/src/game/game_0e5ce0.c +++ b/src/game/game_0e5ce0.c @@ -4531,13 +4531,13 @@ glabel func0f0e6328 /* f0e63b8: 0320f809 */ jalr $t9 /* f0e63bc: 27a600d4 */ addiu $a2,$sp,0xd4 /* f0e63c0: 8fae00d4 */ lw $t6,0xd4($sp) -/* f0e63c4: 3c018007 */ lui $at,0x8007 +/* f0e63c4: 3c018007 */ lui $at,%hi(var800711a8) /* f0e63c8: 10000004 */ beqz $zero,.L0f0e63dc -/* f0e63cc: ac2e11a8 */ sw $t6,0x11a8($at) +/* f0e63cc: ac2e11a8 */ sw $t6,%lo(var800711a8)($at) /* f0e63d0: 240f000b */ addiu $t7,$zero,0xb .L0f0e63d4: -/* f0e63d4: 3c018007 */ lui $at,0x8007 -/* f0e63d8: ac2f11a8 */ sw $t7,0x11a8($at) +/* f0e63d4: 3c018007 */ lui $at,%hi(var800711a8) +/* f0e63d8: ac2f11a8 */ sw $t7,%lo(var800711a8)($at) .L0f0e63dc: /* f0e63dc: 8e2a0008 */ lw $t2,0x8($s1) /* f0e63e0: 8e380010 */ lw $t8,0x10($s1) @@ -4600,8 +4600,8 @@ glabel func0f0e6328 /* f0e64b0: 00000000 */ sll $zero,$zero,0x0 /* f0e64b4: 0c002ef1 */ jal func0000bbc4 /* f0e64b8: 00000000 */ sll $zero,$zero,0x0 -/* f0e64bc: 3c018007 */ lui $at,0x8007 -/* f0e64c0: ac221190 */ sw $v0,0x1190($at) +/* f0e64bc: 3c018007 */ lui $at,%hi(var80071190) +/* f0e64c0: ac221190 */ sw $v0,%lo(var80071190)($at) .L0f0e64c4: /* f0e64c4: 0c002ef1 */ jal func0000bbc4 /* f0e64c8: 00000000 */ sll $zero,$zero,0x0 @@ -4622,8 +4622,8 @@ glabel func0f0e6328 /* f0e6500: 00000000 */ sll $zero,$zero,0x0 /* f0e6504: 0c002ef5 */ jal func0000bbd4 /* f0e6508: 00000000 */ sll $zero,$zero,0x0 -/* f0e650c: 3c018007 */ lui $at,0x8007 -/* f0e6510: ac221198 */ sw $v0,0x1198($at) +/* f0e650c: 3c018007 */ lui $at,%hi(var80071198) +/* f0e6510: ac221198 */ sw $v0,%lo(var80071198)($at) .L0f0e6514: /* f0e6514: 0c002ef5 */ jal func0000bbd4 /* f0e6518: 00000000 */ sll $zero,$zero,0x0 @@ -5389,7 +5389,7 @@ glabel func0f0e6328 /* f0e702c: 3c068007 */ lui $a2,%hi(var80071190) /* f0e7030: 24c61190 */ addiu $a2,$a2,%lo(var80071190) /* f0e7034: 00830019 */ multu $a0,$v1 -/* f0e7038: 3c018007 */ lui $at,0x8007 +/* f0e7038: 3c018007 */ lui $at,%hi(var80071198) /* f0e703c: 26520008 */ addiu $s2,$s2,0x8 /* f0e7040: 3c0b8007 */ lui $t3,%hi(var80071198) /* f0e7044: 0000c012 */ mflo $t8 @@ -5398,16 +5398,16 @@ glabel func0f0e6328 /* f0e7050: 00e30019 */ multu $a3,$v1 /* f0e7054: 00005012 */ mflo $t2 /* f0e7058: aeea0000 */ sw $t2,0x0($s7) -/* f0e705c: ac251198 */ sw $a1,0x1198($at) +/* f0e705c: ac251198 */ sw $a1,%lo(var80071198)($at) /* f0e7060: 8ccd0000 */ lw $t5,0x0($a2) /* f0e7064: afd00000 */ sw $s0,0x0($s8) -/* f0e7068: 3c018007 */ lui $at,0x8007 +/* f0e7068: 3c018007 */ lui $at,%hi(var80071190) /* f0e706c: 05a30003 */ bgezl $t5,.L0f0e707c /* f0e7070: 8ef90000 */ lw $t9,0x0($s7) -/* f0e7074: ac201190 */ sw $zero,0x1190($at) +/* f0e7074: ac201190 */ sw $zero,%lo(var80071190)($at) /* f0e7078: 8ef90000 */ lw $t9,0x0($s7) .L0f0e707c: -/* f0e707c: 3c018007 */ lui $at,0x8007 +/* f0e707c: 3c018007 */ lui $at,%hi(var80071198) /* f0e7080: 07210002 */ bgez $t9,.L0f0e708c /* f0e7084: 00000000 */ sll $zero,$zero,0x0 /* f0e7088: aee00000 */ sw $zero,0x0($s7) @@ -5415,7 +5415,7 @@ glabel func0f0e6328 /* f0e708c: 8d6b1198 */ lw $t3,%lo(var80071198)($t3) /* f0e7090: 05630003 */ bgezl $t3,.L0f0e70a0 /* f0e7094: 8fcc0000 */ lw $t4,0x0($s8) -/* f0e7098: ac201198 */ sw $zero,0x1198($at) +/* f0e7098: ac201198 */ sw $zero,%lo(var80071198)($at) /* f0e709c: 8fcc0000 */ lw $t4,0x0($s8) .L0f0e70a0: /* f0e70a0: 05810002 */ bgez $t4,.L0f0e70ac @@ -5431,8 +5431,8 @@ glabel func0f0e6328 /* f0e70c4: 00000000 */ sll $zero,$zero,0x0 /* f0e70c8: 0c002ef1 */ jal func0000bbc4 /* f0e70cc: 00000000 */ sll $zero,$zero,0x0 -/* f0e70d0: 3c018007 */ lui $at,0x8007 -/* f0e70d4: ac221190 */ sw $v0,0x1190($at) +/* f0e70d0: 3c018007 */ lui $at,%hi(var80071190) +/* f0e70d4: ac221190 */ sw $v0,%lo(var80071190)($at) .L0f0e70d8: /* f0e70d8: 0c002ef1 */ jal func0000bbc4 /* f0e70dc: 00000000 */ sll $zero,$zero,0x0 @@ -5453,8 +5453,8 @@ glabel func0f0e6328 /* f0e7114: 00000000 */ sll $zero,$zero,0x0 /* f0e7118: 0c002ef5 */ jal func0000bbd4 /* f0e711c: 00000000 */ sll $zero,$zero,0x0 -/* f0e7120: 3c018007 */ lui $at,0x8007 -/* f0e7124: ac221198 */ sw $v0,0x1198($at) +/* f0e7120: 3c018007 */ lui $at,%hi(var80071198) +/* f0e7124: ac221198 */ sw $v0,%lo(var80071198)($at) .L0f0e7128: /* f0e7128: 0c002ef5 */ jal func0000bbd4 /* f0e712c: 00000000 */ sll $zero,$zero,0x0 @@ -5797,9 +5797,9 @@ glabel var7f1b1e5c /* f0e75f4: 0040f809 */ jalr $v0 /* f0e75f8: 27a60044 */ addiu $a2,$sp,0x44 /* f0e75fc: 8fb80044 */ lw $t8,0x44($sp) -/* f0e7600: 3c018007 */ lui $at,0x8007 +/* f0e7600: 3c018007 */ lui $at,%hi(var800711a8) /* f0e7604: 10000002 */ beqz $zero,.L0f0e7610 -/* f0e7608: ac3811a8 */ sw $t8,0x11a8($at) +/* f0e7608: ac3811a8 */ sw $t8,%lo(var800711a8)($at) .L0f0e760c: /* f0e760c: ac3911a8 */ sw $t9,0x11a8($at) .L0f0e7610: @@ -6075,13 +6075,13 @@ glabel func0f0e7998 /* f0e79dc: 0040f809 */ jalr $v0 /* f0e79e0: 27a60024 */ addiu $a2,$sp,0x24 /* f0e79e4: 8fb80024 */ lw $t8,0x24($sp) -/* f0e79e8: 3c018007 */ lui $at,0x8007 +/* f0e79e8: 3c018007 */ lui $at,%hi(var800711a8) /* f0e79ec: 10000004 */ beqz $zero,.L0f0e7a00 -/* f0e79f0: ac3811a8 */ sw $t8,0x11a8($at) +/* f0e79f0: ac3811a8 */ sw $t8,%lo(var800711a8)($at) .L0f0e79f4: /* f0e79f4: 2419000b */ addiu $t9,$zero,0xb -/* f0e79f8: 3c018007 */ lui $at,0x8007 -/* f0e79fc: ac3911a8 */ sw $t9,0x11a8($at) +/* f0e79f8: 3c018007 */ lui $at,%hi(var800711a8) +/* f0e79fc: ac3911a8 */ sw $t9,%lo(var800711a8)($at) .L0f0e7a00: /* f0e7a00: 8e190010 */ lw $t9,0x10($s0) /* f0e7a04: 24040007 */ addiu $a0,$zero,0x7 @@ -6751,9 +6751,9 @@ glabel func0f0e8290 /* f0e83a0: 0040f809 */ jalr $v0 /* f0e83a4: a7b200a6 */ sh $s2,0xa6($sp) /* f0e83a8: 8faf004c */ lw $t7,0x4c($sp) -/* f0e83ac: 3c018007 */ lui $at,0x8007 +/* f0e83ac: 3c018007 */ lui $at,%hi(var800711a8) /* f0e83b0: 10000003 */ beqz $zero,.L0f0e83c0 -/* f0e83b4: ac2f11a8 */ sw $t7,0x11a8($at) +/* f0e83b4: ac2f11a8 */ sw $t7,%lo(var800711a8)($at) .L0f0e83b8: /* f0e83b8: ac3811a8 */ sw $t8,0x11a8($at) /* f0e83bc: a7b200a6 */ sh $s2,0xa6($sp) @@ -9357,8 +9357,8 @@ glabel func0f0ea52c /* f0ea974: 0fc54f08 */ jal func0f153c20 /* f0ea978: 00000000 */ sll $zero,$zero,0x0 /* f0ea97c: 240c0001 */ addiu $t4,$zero,0x1 -/* f0ea980: 3c018008 */ lui $at,0x8008 -/* f0ea984: ac2cfb9c */ sw $t4,-0x464($at) +/* f0ea980: 3c018008 */ lui $at,%hi(var8007fb9c) +/* f0ea984: ac2cfb9c */ sw $t4,%lo(var8007fb9c)($at) .L0f0ea988: /* f0ea988: afb100a8 */ sw $s1,0xa8($sp) /* f0ea98c: 8e180008 */ lw $t8,0x8($s0) @@ -9495,9 +9495,9 @@ glabel func0f0ea52c /* f0eab84: 8e040008 */ lw $a0,0x8($s0) /* f0eab88: 93ac0097 */ lbu $t4,0x97($sp) .L0f0eab8c: -/* f0eab8c: 3c018008 */ lui $at,0x8008 +/* f0eab8c: 3c018008 */ lui $at,%hi(var8007fb9c) /* f0eab90: 0fc54f22 */ jal func0f153c88 -/* f0eab94: ac2cfb9c */ sw $t4,-0x464($at) +/* f0eab94: ac2cfb9c */ sw $t4,%lo(var8007fb9c)($at) /* f0eab98: 8e180008 */ lw $t8,0x8($s0) .L0f0eab9c: /* f0eab9c: 8f0d0004 */ lw $t5,0x4($t8) @@ -12596,8 +12596,8 @@ glabel func0f0ed528 /* f0ed7d4: 00000000 */ sll $zero,$zero,0x0 /* f0ed7d8: 0c002ef1 */ jal func0000bbc4 /* f0ed7dc: 00000000 */ sll $zero,$zero,0x0 -/* f0ed7e0: 3c018007 */ lui $at,0x8007 -/* f0ed7e4: ac221190 */ sw $v0,0x1190($at) +/* f0ed7e0: 3c018007 */ lui $at,%hi(var80071190) +/* f0ed7e4: ac221190 */ sw $v0,%lo(var80071190)($at) .L0f0ed7e8: /* f0ed7e8: 0c002ef1 */ jal func0000bbc4 /* f0ed7ec: 00000000 */ sll $zero,$zero,0x0 @@ -12608,8 +12608,8 @@ glabel func0f0ed528 /* f0ed800: 00000000 */ sll $zero,$zero,0x0 /* f0ed804: 0c002ef1 */ jal func0000bbc4 /* f0ed808: 00000000 */ sll $zero,$zero,0x0 -/* f0ed80c: 3c018007 */ lui $at,0x8007 -/* f0ed810: ac221194 */ sw $v0,0x1194($at) +/* f0ed80c: 3c018007 */ lui $at,%hi(var80071194) +/* f0ed810: ac221194 */ sw $v0,%lo(var80071194)($at) .L0f0ed814: /* f0ed814: 0c002ef5 */ jal func0000bbd4 /* f0ed818: 00000000 */ sll $zero,$zero,0x0 @@ -12620,8 +12620,8 @@ glabel func0f0ed528 /* f0ed82c: 00000000 */ sll $zero,$zero,0x0 /* f0ed830: 0c002ef5 */ jal func0000bbd4 /* f0ed834: 00000000 */ sll $zero,$zero,0x0 -/* f0ed838: 3c018007 */ lui $at,0x8007 -/* f0ed83c: ac221198 */ sw $v0,0x1198($at) +/* f0ed838: 3c018007 */ lui $at,%hi(var80071198) +/* f0ed83c: ac221198 */ sw $v0,%lo(var80071198)($at) .L0f0ed840: /* f0ed840: 0c002ef5 */ jal func0000bbd4 /* f0ed844: 00000000 */ sll $zero,$zero,0x0 @@ -12633,8 +12633,8 @@ glabel func0f0ed528 /* f0ed85c: 00000000 */ sll $zero,$zero,0x0 /* f0ed860: 0c002ef5 */ jal func0000bbd4 /* f0ed864: 00000000 */ sll $zero,$zero,0x0 -/* f0ed868: 3c018007 */ lui $at,0x8007 -/* f0ed86c: ac22119c */ sw $v0,0x119c($at) +/* f0ed868: 3c018007 */ lui $at,%hi(var8007119c) +/* f0ed86c: ac22119c */ sw $v0,%lo(var8007119c)($at) /* f0ed870: 3c058007 */ lui $a1,%hi(var8007119c) /* f0ed874: 3c068007 */ lui $a2,%hi(var8007119c) /* f0ed878: 24c6119c */ addiu $a2,$a2,%lo(var8007119c) @@ -14071,7 +14071,7 @@ glabel func0f0ee648 /* f0eed58: 01c40019 */ multu $t6,$a0 /* f0eed5c: 3c058007 */ lui $a1,%hi(var80071194) /* f0eed60: 24a51194 */ addiu $a1,$a1,%lo(var80071194) -/* f0eed64: 3c018007 */ lui $at,0x8007 +/* f0eed64: 3c018007 */ lui $at,%hi(var80071198) /* f0eed68: 3c068007 */ lui $a2,%hi(var8007119c) /* f0eed6c: 24540008 */ addiu $s4,$v0,0x8 /* f0eed70: 24c6119c */ addiu $a2,$a2,%lo(var8007119c) @@ -14087,7 +14087,7 @@ glabel func0f0ee648 /* f0eed98: acab0000 */ sw $t3,0x0($a1) /* f0eed9c: 86390002 */ lh $t9,0x2($s1) /* f0eeda0: 03326021 */ addu $t4,$t9,$s2 -/* f0eeda4: ac2c1198 */ sw $t4,0x1198($at) +/* f0eeda4: ac2c1198 */ sw $t4,%lo(var80071198)($at) /* f0eeda8: 862d0006 */ lh $t5,0x6($s1) /* f0eedac: 86290002 */ lh $t1,0x2($s1) /* f0eedb0: 8e0f0000 */ lw $t7,0x0($s0) @@ -14130,8 +14130,8 @@ glabel func0f0ee648 /* f0eee30: 00000000 */ sll $zero,$zero,0x0 /* f0eee34: 0c002ef1 */ jal func0000bbc4 /* f0eee38: 00000000 */ sll $zero,$zero,0x0 -/* f0eee3c: 3c018007 */ lui $at,0x8007 -/* f0eee40: ac221194 */ sw $v0,0x1194($at) +/* f0eee3c: 3c018007 */ lui $at,%hi(var80071194) +/* f0eee40: ac221194 */ sw $v0,%lo(var80071194)($at) .L0f0eee44: /* f0eee44: 0c002ef5 */ jal func0000bbd4 /* f0eee48: 00000000 */ sll $zero,$zero,0x0 @@ -14142,8 +14142,8 @@ glabel func0f0ee648 /* f0eee5c: 00000000 */ sll $zero,$zero,0x0 /* f0eee60: 0c002ef5 */ jal func0000bbd4 /* f0eee64: 00000000 */ sll $zero,$zero,0x0 -/* f0eee68: 3c018007 */ lui $at,0x8007 -/* f0eee6c: ac221198 */ sw $v0,0x1198($at) +/* f0eee68: 3c018007 */ lui $at,%hi(var80071198) +/* f0eee6c: ac221198 */ sw $v0,%lo(var80071198)($at) .L0f0eee70: /* f0eee70: 0c002ef5 */ jal func0000bbd4 /* f0eee74: 00000000 */ sll $zero,$zero,0x0 @@ -14154,8 +14154,8 @@ glabel func0f0ee648 /* f0eee88: 00000000 */ sll $zero,$zero,0x0 /* f0eee8c: 0c002ef5 */ jal func0000bbd4 /* f0eee90: 00000000 */ sll $zero,$zero,0x0 -/* f0eee94: 3c018007 */ lui $at,0x8007 -/* f0eee98: ac22119c */ sw $v0,0x119c($at) +/* f0eee94: 3c018007 */ lui $at,%hi(var8007119c) +/* f0eee98: ac22119c */ sw $v0,%lo(var8007119c)($at) /* f0eee9c: 3c058007 */ lui $a1,%hi(var8007119c) /* f0eeea0: 8ca5119c */ lw $a1,%lo(var8007119c)($a1) .L0f0eeea4: @@ -14173,8 +14173,8 @@ glabel func0f0ee648 /* f0eeecc: 8c841198 */ lw $a0,%lo(var80071198)($a0) /* f0eeed0: 00a4082a */ slt $at,$a1,$a0 /* f0eeed4: 10200002 */ beqz $at,.L0f0eeee0 -/* f0eeed8: 3c018007 */ lui $at,0x8007 -/* f0eeedc: ac24119c */ sw $a0,0x119c($at) +/* f0eeed8: 3c018007 */ lui $at,%hi(var8007119c) +/* f0eeedc: ac24119c */ sw $a0,%lo(var8007119c)($at) .L0f0eeee0: /* f0eeee0: 44843000 */ mtc1 $a0,$f6 /* f0eeee4: 3c014080 */ lui $at,0x4080 diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index ab7d328da..250b13b59 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -3972,13 +3972,13 @@ glabel var7f1b2948 /* f0f3abc: 3411ffff */ dli $s1,0xffff .L0f0f3ac0: /* f0f3ac0: 8fb90400 */ lw $t9,0x400($sp) -/* f0f3ac4: 3c118008 */ lui $s1,0x8008 +/* f0f3ac4: 3c118008 */ lui $s1,%hi(g_Bodies+0x2) /* f0f3ac8: afa30420 */ sw $v1,0x420($sp) /* f0f3acc: 00195080 */ sll $t2,$t9,0x2 /* f0f3ad0: 01595021 */ addu $t2,$t2,$t9 /* f0f3ad4: 000a5080 */ sll $t2,$t2,0x2 /* f0f3ad8: 022a8821 */ addu $s1,$s1,$t2 -/* f0f3adc: 9631cf06 */ lhu $s1,-0x30fa($s1) +/* f0f3adc: 9631cf06 */ lhu $s1,%lo(g_Bodies+0x2)($s1) /* f0f3ae0: 0fc59c15 */ jal func0f167054 /* f0f3ae4: 02202025 */ or $a0,$s1,$zero /* f0f3ae8: 8fab0420 */ lw $t3,0x420($sp) @@ -5543,8 +5543,8 @@ glabel func0f0f50fc /* f0f51d0: 00000000 */ sll $zero,$zero,0x0 /* f0f51d4: 0c002ef1 */ jal func0000bbc4 /* f0f51d8: 00000000 */ sll $zero,$zero,0x0 -/* f0f51dc: 3c018007 */ lui $at,0x8007 -/* f0f51e0: ac221190 */ sw $v0,0x1190($at) +/* f0f51dc: 3c018007 */ lui $at,%hi(var80071190) +/* f0f51e0: ac221190 */ sw $v0,%lo(var80071190)($at) .L0f0f51e4: /* f0f51e4: 0c002ef1 */ jal func0000bbc4 /* f0f51e8: 00000000 */ sll $zero,$zero,0x0 @@ -5555,8 +5555,8 @@ glabel func0f0f50fc /* f0f51fc: 00000000 */ sll $zero,$zero,0x0 /* f0f5200: 0c002ef1 */ jal func0000bbc4 /* f0f5204: 00000000 */ sll $zero,$zero,0x0 -/* f0f5208: 3c018007 */ lui $at,0x8007 -/* f0f520c: ac221194 */ sw $v0,0x1194($at) +/* f0f5208: 3c018007 */ lui $at,%hi(var80071194) +/* f0f520c: ac221194 */ sw $v0,%lo(var80071194)($at) .L0f0f5210: /* f0f5210: 0c002ef5 */ jal func0000bbd4 /* f0f5214: 00000000 */ sll $zero,$zero,0x0 @@ -5567,8 +5567,8 @@ glabel func0f0f50fc /* f0f5228: 00000000 */ sll $zero,$zero,0x0 /* f0f522c: 0c002ef5 */ jal func0000bbd4 /* f0f5230: 00000000 */ sll $zero,$zero,0x0 -/* f0f5234: 3c018007 */ lui $at,0x8007 -/* f0f5238: ac221198 */ sw $v0,0x1198($at) +/* f0f5234: 3c018007 */ lui $at,%hi(var80071198) +/* f0f5238: ac221198 */ sw $v0,%lo(var80071198)($at) .L0f0f523c: /* f0f523c: 0c002ef5 */ jal func0000bbd4 /* f0f5240: 00000000 */ sll $zero,$zero,0x0 @@ -5580,8 +5580,8 @@ glabel func0f0f50fc /* f0f5258: 00000000 */ sll $zero,$zero,0x0 /* f0f525c: 0c002ef5 */ jal func0000bbd4 /* f0f5260: 00000000 */ sll $zero,$zero,0x0 -/* f0f5264: 3c018007 */ lui $at,0x8007 -/* f0f5268: ac22119c */ sw $v0,0x119c($at) +/* f0f5264: 3c018007 */ lui $at,%hi(var8007119c) +/* f0f5268: ac22119c */ sw $v0,%lo(var8007119c)($at) /* f0f526c: 3c038007 */ lui $v1,%hi(var8007119c) /* f0f5270: 3c078007 */ lui $a3,%hi(var8007119c) /* f0f5274: 24e7119c */ addiu $a3,$a3,%lo(var8007119c) @@ -5735,7 +5735,7 @@ glabel func0f0f5360 /* f0f5494: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f0f5498: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) /* f0f549c: 3c0b800a */ lui $t3,0x800a -/* f0f54a0: 3c018008 */ lui $at,0x8008 +/* f0f54a0: 3c018008 */ lui $at,%hi(var8007fb9c) /* f0f54a4: 000fc0c0 */ sll $t8,$t7,0x3 /* f0f54a8: 030fc023 */ subu $t8,$t8,$t7 /* f0f54ac: 0018c080 */ sll $t8,$t8,0x2 @@ -5744,7 +5744,7 @@ glabel func0f0f5360 /* f0f54b8: 030fc023 */ subu $t8,$t8,$t7 /* f0f54bc: 0018c100 */ sll $t8,$t8,0x4 /* f0f54c0: 256be000 */ addiu $t3,$t3,-8192 -/* f0f54c4: ac20fb9c */ sw $zero,-0x464($at) +/* f0f54c4: ac20fb9c */ sw $zero,%lo(var8007fb9c)($at) /* f0f54c8: 030b1821 */ addu $v1,$t8,$t3 /* f0f54cc: 8fa701ec */ lw $a3,0x1ec($sp) /* f0f54d0: 8c6c04f8 */ lw $t4,0x4f8($v1) @@ -6365,8 +6365,8 @@ glabel func0f0f5360 /* f0f5e00: 8c450018 */ lw $a1,0x18($v0) /* f0f5e04: 240e0001 */ addiu $t6,$zero,0x1 .L0f0f5e08: -/* f0f5e08: 3c018008 */ lui $at,0x8008 -/* f0f5e0c: ac2efb9c */ sw $t6,-0x464($at) +/* f0f5e08: 3c018008 */ lui $at,%hi(var8007fb9c) +/* f0f5e0c: ac2efb9c */ sw $t6,%lo(var8007fb9c)($at) /* f0f5e10: 10000008 */ beqz $zero,.L0f0f5e34 /* f0f5e14: 8fa201ec */ lw $v0,0x1ec($sp) /* f0f5e18: 904b0060 */ lbu $t3,0x60($v0) @@ -8812,11 +8812,11 @@ glabel func0f0f8040 /* f0f80a4: 14a30007 */ bne $a1,$v1,.L0f0f80c4 /* f0f80a8: a059083c */ sb $t9,0x83c($v0) /* f0f80ac: 9049083b */ lbu $t1,0x83b($v0) -/* f0f80b0: 3c018007 */ lui $at,0x8007 +/* f0f80b0: 3c018007 */ lui $at,%hi(g_PlayersWithControl) /* f0f80b4: 24080001 */ addiu $t0,$zero,0x1 /* f0f80b8: 00095080 */ sll $t2,$t1,0x2 /* f0f80bc: 002a0821 */ addu $at,$at,$t2 -/* f0f80c0: ac280750 */ sw $t0,0x750($at) +/* f0f80c0: ac280750 */ sw $t0,%lo(g_PlayersWithControl)($at) .L0f0f80c4: /* f0f80c4: 8c8b0000 */ lw $t3,0x0($a0) /* f0f80c8: 3c02800a */ lui $v0,%hi(g_Vars+0x284) @@ -9082,7 +9082,7 @@ glabel var7f1b29f8 /* f0f8374: 27bdffe0 */ addiu $sp,$sp,-32 /* f0f8378: a06905d5 */ sb $t1,0x5d5($v1) /* f0f837c: 312a00ef */ andi $t2,$t1,0xef -/* f0f8380: 3c018007 */ lui $at,0x8007 +/* f0f8380: 3c018007 */ lui $at,%hi(g_PlayersWithControl) /* f0f8384: 000b6080 */ sll $t4,$t3,0x2 /* f0f8388: afbf0014 */ sw $ra,0x14($sp) /* f0f838c: a4400460 */ sh $zero,0x460($v0) @@ -9090,7 +9090,7 @@ glabel var7f1b29f8 /* f0f8394: a06a05d5 */ sb $t2,0x5d5($v1) /* f0f8398: 002c0821 */ addu $at,$at,$t4 /* f0f839c: afa40020 */ sw $a0,0x20($sp) -/* f0f83a0: ac200750 */ sw $zero,0x750($at) +/* f0f83a0: ac200750 */ sw $zero,%lo(g_PlayersWithControl)($at) /* f0f83a4: 0fc3c525 */ jal func0f0f1494 /* f0f83a8: afa50024 */ sw $a1,0x24($sp) /* f0f83ac: 3c03800a */ lui $v1,%hi(g_MenuCount) @@ -13203,12 +13203,12 @@ glabel var7f1b2afc /* f0fbc70: 144e0005 */ bne $v0,$t6,.L0f0fbc88 /* f0fbc74: afb00034 */ sw $s0,0x34($sp) /* f0fbc78: 240f0002 */ addiu $t7,$zero,0x2 -/* f0fbc7c: 3c018008 */ lui $at,0x8008 +/* f0fbc7c: 3c018008 */ lui $at,%hi(var8007fac0) /* f0fbc80: 10000003 */ beqz $zero,.L0f0fbc90 -/* f0fbc84: ac2ffac0 */ sw $t7,-0x540($at) +/* f0fbc84: ac2ffac0 */ sw $t7,%lo(var8007fac0)($at) .L0f0fbc88: -/* f0fbc88: 3c018008 */ lui $at,0x8008 -/* f0fbc8c: ac22fac0 */ sw $v0,-0x540($at) +/* f0fbc88: 3c018008 */ lui $at,%hi(var8007fac0) +/* f0fbc8c: ac22fac0 */ sw $v0,%lo(var8007fac0)($at) .L0f0fbc90: /* f0fbc90: 0fc351e7 */ jal func0f0d479c /* f0fbc94: 02a02025 */ or $a0,$s5,$zero @@ -14142,7 +14142,7 @@ glabel var7f1b2afc /* f0fc9b8: 02a02025 */ or $a0,$s5,$zero /* f0fc9bc: 8fbf0054 */ lw $ra,0x54($sp) /* f0fc9c0: 240d0001 */ addiu $t5,$zero,0x1 -/* f0fc9c4: 3c018008 */ lui $at,0x8008 +/* f0fc9c4: 3c018008 */ lui $at,%hi(var8007fac0) /* f0fc9c8: 8fb00034 */ lw $s0,0x34($sp) /* f0fc9cc: 8fb10038 */ lw $s1,0x38($sp) /* f0fc9d0: 8fb2003c */ lw $s2,0x3c($sp) @@ -14151,7 +14151,7 @@ glabel var7f1b2afc /* f0fc9dc: 8fb50048 */ lw $s5,0x48($sp) /* f0fc9e0: 8fb6004c */ lw $s6,0x4c($sp) /* f0fc9e4: 8fb70050 */ lw $s7,0x50($sp) -/* f0fc9e8: ac2dfac0 */ sw $t5,-0x540($at) +/* f0fc9e8: ac2dfac0 */ sw $t5,%lo(var8007fac0)($at) /* f0fc9ec: 03e00008 */ jr $ra /* f0fc9f0: 27bd0118 */ addiu $sp,$sp,0x118 ); @@ -14555,10 +14555,10 @@ glabel func0f0fce8c /* f0fcfa0: 8fbf0014 */ lw $ra,0x14($sp) .L0f0fcfa4: /* f0fcfa4: 8faa001c */ lw $t2,0x1c($sp) -/* f0fcfa8: 3c018007 */ lui $at,0x8007 +/* f0fcfa8: 3c018007 */ lui $at,%hi(g_MpPlayerNum) /* f0fcfac: 27bd0020 */ addiu $sp,$sp,0x20 /* f0fcfb0: 03e00008 */ jr $ra -/* f0fcfb4: ac2a1448 */ sw $t2,0x1448($at) +/* f0fcfb4: ac2a1448 */ sw $t2,%lo(g_MpPlayerNum)($at) ); GLOBAL_ASM( @@ -14799,8 +14799,8 @@ glabel var7f1b2b10 /* f0fd338: 0fc3f446 */ jal func0f0fd118 /* f0fd33c: afae001c */ sw $t6,0x1c($sp) /* f0fd340: 8faf0024 */ lw $t7,0x24($sp) -/* f0fd344: 3c018007 */ lui $at,0x8007 -/* f0fd348: ac221448 */ sw $v0,0x1448($at) +/* f0fd344: 3c018007 */ lui $at,%hi(g_MpPlayerNum) +/* f0fd348: ac221448 */ sw $v0,%lo(g_MpPlayerNum)($at) /* f0fd34c: 2de10005 */ sltiu $at,$t7,0x5 /* f0fd350: 1020004a */ beqz $at,.L0f0fd47c /* f0fd354: afa20018 */ sw $v0,0x18($sp) @@ -14884,10 +14884,10 @@ glabel var7f1b2b10 /* f0fd47c: 8fbf0014 */ lw $ra,0x14($sp) .L0f0fd480: /* f0fd480: 8fab001c */ lw $t3,0x1c($sp) -/* f0fd484: 3c018007 */ lui $at,0x8007 +/* f0fd484: 3c018007 */ lui $at,%hi(g_MpPlayerNum) /* f0fd488: 27bd0020 */ addiu $sp,$sp,0x20 /* f0fd48c: 03e00008 */ jr $ra -/* f0fd490: ac2b1448 */ sw $t3,0x1448($at) +/* f0fd490: ac2b1448 */ sw $t3,%lo(g_MpPlayerNum)($at) ); GLOBAL_ASM( diff --git a/src/game/game_0fd660.c b/src/game/game_0fd660.c index b5b43db1c..10cdf23c2 100644 --- a/src/game/game_0fd660.c +++ b/src/game/game_0fd660.c @@ -3065,13 +3065,13 @@ glabel func0f100ad0 /* f100b08: 15c10005 */ bne $t6,$at,.L0f100b20 /* f100b0c: afa401d8 */ sw $a0,0x1d8($sp) /* f100b10: 240f0002 */ addiu $t7,$zero,0x2 -/* f100b14: 3c018008 */ lui $at,0x8008 +/* f100b14: 3c018008 */ lui $at,%hi(var8007fac0) /* f100b18: 10000004 */ beqz $zero,.L0f100b2c -/* f100b1c: ac2ffac0 */ sw $t7,-0x540($at) +/* f100b1c: ac2ffac0 */ sw $t7,%lo(var8007fac0)($at) .L0f100b20: /* f100b20: 24180001 */ addiu $t8,$zero,0x1 -/* f100b24: 3c018008 */ lui $at,0x8008 -/* f100b28: ac38fac0 */ sw $t8,-0x540($at) +/* f100b24: 3c018008 */ lui $at,%hi(var8007fac0) +/* f100b28: ac38fac0 */ sw $t8,%lo(var8007fac0)($at) .L0f100b2c: /* f100b2c: 3c0b800a */ lui $t3,%hi(g_Vars) /* f100b30: 256b9fc0 */ addiu $t3,$t3,%lo(g_Vars) @@ -4619,7 +4619,7 @@ glabel func0f100ad0 /* f1021ec: 8fbf004c */ lw $ra,0x4c($sp) .L0f1021f0: /* f1021f0: 240f0001 */ addiu $t7,$zero,0x1 -/* f1021f4: 3c018008 */ lui $at,0x8008 +/* f1021f4: 3c018008 */ lui $at,%hi(var8007fac0) /* f1021f8: 8fa201d8 */ lw $v0,0x1d8($sp) /* f1021fc: 8fb00028 */ lw $s0,0x28($sp) /* f102200: 8fb1002c */ lw $s1,0x2c($sp) @@ -4630,7 +4630,7 @@ glabel func0f100ad0 /* f102214: 8fb60040 */ lw $s6,0x40($sp) /* f102218: 8fb70044 */ lw $s7,0x44($sp) /* f10221c: 8fbe0048 */ lw $s8,0x48($sp) -/* f102220: ac2ffac0 */ sw $t7,-0x540($at) +/* f102220: ac2ffac0 */ sw $t7,%lo(var8007fac0)($at) /* f102224: 03e00008 */ jr $ra /* f102228: 27bd01d8 */ addiu $sp,$sp,0x1d8 /* f10222c: 00000000 */ sll $zero,$zero,0x0 diff --git a/src/game/game_102240.c b/src/game/game_102240.c index dd9f28f4e..42ea13fff 100644 --- a/src/game/game_102240.c +++ b/src/game/game_102240.c @@ -62,11 +62,11 @@ glabel func0f102240 /* f102250: 000e7880 */ sll $t7,$t6,0x2 /* f102254: 01ee7823 */ subu $t7,$t7,$t6 /* f102258: 000f7880 */ sll $t7,$t7,0x2 -/* f10225c: 3c048007 */ lui $a0,0x8007 +/* f10225c: 3c048007 */ lui $a0,%hi(g_StageNames+0xa) /* f102260: afbf0014 */ sw $ra,0x14($sp) /* f102264: 008f2021 */ addu $a0,$a0,$t7 /* f102268: 0fc5b9f1 */ jal langGet -/* f10226c: 94841e76 */ lhu $a0,0x1e76($a0) +/* f10226c: 94841e76 */ lhu $a0,%lo(g_StageNames+0xa)($a0) /* f102270: 3c048007 */ lui $a0,%hi(g_StringPointer) /* f102274: 3c057f1b */ lui $a1,%hi(var7f1b2cf0) /* f102278: 24a52cf0 */ addiu $a1,$a1,%lo(var7f1b2cf0) @@ -609,13 +609,13 @@ glabel menuhandlerScreenSplit /* f1029f4: 0fc3e048 */ jal func0f0f8120 /* f1029f8: afab0030 */ sw $t3,0x30($sp) /* f1029fc: 240c0001 */ addiu $t4,$zero,0x1 -/* f102a00: 3c018007 */ lui $at,0x8007 +/* f102a00: 3c018007 */ lui $at,%hi(g_MpPlayerNum) /* f102a04: 0fc3e048 */ jal func0f0f8120 -/* f102a08: ac2c1448 */ sw $t4,0x1448($at) +/* f102a08: ac2c1448 */ sw $t4,%lo(g_MpPlayerNum)($at) /* f102a0c: 8fad0030 */ lw $t5,0x30($sp) -/* f102a10: 3c018007 */ lui $at,0x8007 +/* f102a10: 3c018007 */ lui $at,%hi(g_MpPlayerNum) /* f102a14: 10000005 */ beqz $zero,.L0f102a2c -/* f102a18: ac2d1448 */ sw $t5,0x1448($at) +/* f102a18: ac2d1448 */ sw $t5,%lo(g_MpPlayerNum)($at) .L0f102a1c: /* f102a1c: 0fc54bcd */ jal optionsGetScreenSplit /* f102a20: afa60040 */ sw $a2,0x40($sp) @@ -1179,13 +1179,13 @@ glabel func0f103550 /* f1035a4: 8fbf0014 */ lw $ra,0x14($sp) .L0f1035a8: /* f1035a8: 9108dfea */ lbu $t0,%lo(g_MissionConfig+0x2)($t0) -/* f1035ac: 3c048007 */ lui $a0,0x8007 +/* f1035ac: 3c048007 */ lui $a0,%hi(g_StageNames+0xa) /* f1035b0: 00084880 */ sll $t1,$t0,0x2 /* f1035b4: 01284823 */ subu $t1,$t1,$t0 /* f1035b8: 00094880 */ sll $t1,$t1,0x2 /* f1035bc: 00892021 */ addu $a0,$a0,$t1 /* f1035c0: 0fc5b9f1 */ jal langGet -/* f1035c4: 94841e76 */ lhu $a0,0x1e76($a0) +/* f1035c4: 94841e76 */ lhu $a0,%lo(g_StageNames+0xa)($a0) /* f1035c8: afa20018 */ sw $v0,0x18($sp) /* f1035cc: 0fc5b9f1 */ jal langGet /* f1035d0: 24045711 */ addiu $a0,$zero,0x5711 @@ -2494,7 +2494,7 @@ glabel var7f1b2dfc /* f1048dc: ae050004 */ sw $a1,0x4($s0) /* f1048e0: 8e030000 */ lw $v1,0x0($s0) .L0f1048e4: -/* f1048e4: 3c048007 */ lui $a0,0x8007 +/* f1048e4: 3c048007 */ lui $a0,%hi(g_StageNames+0x6) /* f1048e8: 0065082b */ sltu $at,$v1,$a1 /* f1048ec: 10200008 */ beqz $at,.L0f104910 /* f1048f0: 00037080 */ sll $t6,$v1,0x2 @@ -2502,7 +2502,7 @@ glabel var7f1b2dfc /* f1048f8: 000e7080 */ sll $t6,$t6,0x2 /* f1048fc: 008e2021 */ addu $a0,$a0,$t6 /* f104900: 0fc5b9f1 */ jal langGet -/* f104904: 94841e72 */ lhu $a0,0x1e72($a0) +/* f104904: 94841e72 */ lhu $a0,%lo(g_StageNames+0x6)($a0) /* f104908: 10000320 */ beqz $zero,.L0f10558c /* f10490c: 8fbf003c */ lw $ra,0x3c($sp) .L0f104910: @@ -2511,10 +2511,10 @@ glabel var7f1b2dfc /* f104918: 0002c080 */ sll $t8,$v0,0x2 /* f10491c: 0302c023 */ subu $t8,$t8,$v0 /* f104920: 0018c080 */ sll $t8,$t8,0x2 -/* f104924: 3c048007 */ lui $a0,0x8007 +/* f104924: 3c048007 */ lui $a0,%hi(g_StageNames+0x6) /* f104928: 00982021 */ addu $a0,$a0,$t8 /* f10492c: 0fc5b9f1 */ jal langGet -/* f104930: 94841e72 */ lhu $a0,0x1e72($a0) +/* f104930: 94841e72 */ lhu $a0,%lo(g_StageNames+0x6)($a0) /* f104934: 10000315 */ beqz $zero,.L0f10558c /* f104938: 8fbf003c */ lw $ra,0x3c($sp) /* f10493c: 8e070000 */ lw $a3,0x0($s0) @@ -3775,8 +3775,8 @@ glabel var7f1b2e04 /* f105d10: 00000000 */ sll $zero,$zero,0x0 /* f105d14: 3c02800a */ lui $v0,%hi(g_InventoryWeapon) /* f105d18: 904421c0 */ lbu $a0,%lo(g_InventoryWeapon)($v0) -/* f105d1c: 3c018007 */ lui $at,0x8007 -/* f105d20: a0242d88 */ sb $a0,0x2d88($at) +/* f105d1c: 3c018007 */ lui $at,%hi(var80072d88) +/* f105d20: a0242d88 */ sb $a0,%lo(var80072d88)($at) /* f105d24: 24010040 */ addiu $at,$zero,0x40 .L0f105d28: /* f105d28: 10810004 */ beq $a0,$at,.L0f105d3c @@ -3959,18 +3959,18 @@ glabel var7f1b2e44 /* f10607c: 10000039 */ beqz $zero,.L0f106164 /* f106080: acc20000 */ sw $v0,0x0($a2) /* f106084: 8cc40000 */ lw $a0,0x0($a2) -/* f106088: 3c018007 */ lui $at,0x8007 +/* f106088: 3c018007 */ lui $at,%hi(var80073544) /* f10608c: 0fc6749a */ jal func0f19d268 -/* f106090: a0243544 */ sb $a0,0x3544($at) +/* f106090: a0243544 */ sb $a0,%lo(var80073544)($at) /* f106094: 0fc28857 */ jal weaponGetName /* f106098: 00402025 */ or $a0,$v0,$zero /* f10609c: 10000033 */ beqz $zero,.L0f10616c /* f1060a0: 8fbf0014 */ lw $ra,0x14($sp) /* f1060a4: 8ccf0000 */ lw $t7,0x0($a2) -/* f1060a8: 3c018007 */ lui $at,0x8007 +/* f1060a8: 3c018007 */ lui $at,%hi(var80073544) /* f1060ac: 00001025 */ or $v0,$zero,$zero /* f1060b0: 1000002d */ beqz $zero,.L0f106168 -/* f1060b4: a02f3544 */ sb $t7,0x3544($at) +/* f1060b4: a02f3544 */ sb $t7,%lo(var80073544)($at) /* f1060b8: 3c188007 */ lui $t8,%hi(var80073544) /* f1060bc: 93183544 */ lbu $t8,%lo(var80073544)($t8) /* f1060c0: 10000028 */ beqz $zero,.L0f106164 @@ -3996,22 +3996,22 @@ glabel var7f1b2e44 /* f106110: 305900ff */ andi $t9,$v0,0xff /* f106114: ac39ee28 */ sw $t9,%lo(g_MenuStack+0xe28)($at) /* f106118: 8cca0000 */ lw $t2,0x0($a2) -/* f10611c: 3c018007 */ lui $at,0x8007 -/* f106120: 3c048007 */ lui $a0,0x8007 -/* f106124: 248433e8 */ addiu $a0,$a0,0x33e8 +/* f10611c: 3c018007 */ lui $at,%hi(var80073544) +/* f106120: 3c048007 */ lui $a0,%hi(menuitems_inventory+0x14) +/* f106124: 248433e8 */ addiu $a0,$a0,%lo(menuitems_inventory+0x14) /* f106128: 3c05bf80 */ lui $a1,0xbf80 /* f10612c: 0fc3c4e7 */ jal func0f0f139c -/* f106130: a02a3544 */ sb $t2,0x3544($at) -/* f106134: 3c048007 */ lui $a0,0x8007 -/* f106138: 248433fc */ addiu $a0,$a0,0x33fc +/* f106130: a02a3544 */ sb $t2,%lo(var80073544)($at) +/* f106134: 3c048007 */ lui $a0,%hi(menuitems_inventory+0x28) +/* f106138: 248433fc */ addiu $a0,$a0,%lo(menuitems_inventory+0x28) /* f10613c: 0fc3c4e7 */ jal func0f0f139c /* f106140: 3c05bf80 */ lui $a1,0xbf80 -/* f106144: 3c048007 */ lui $a0,0x8007 -/* f106148: 24843424 */ addiu $a0,$a0,0x3424 +/* f106144: 3c048007 */ lui $a0,%hi(menuitems_inventory+0x50) +/* f106148: 24843424 */ addiu $a0,$a0,%lo(menuitems_inventory+0x50) /* f10614c: 0fc3c4e7 */ jal func0f0f139c /* f106150: 3c05bf80 */ lui $a1,0xbf80 -/* f106154: 3c048007 */ lui $a0,0x8007 -/* f106158: 24843438 */ addiu $a0,$a0,0x3438 +/* f106154: 3c048007 */ lui $a0,%hi(menuitems_inventory+0x64) +/* f106158: 24843438 */ addiu $a0,$a0,%lo(menuitems_inventory+0x64) /* f10615c: 0fc3c4e7 */ jal func0f0f139c /* f106160: 3c05bf80 */ lui $a1,0xbf80 .L0f106164: @@ -4139,10 +4139,10 @@ glabel var7f1b2e84 /* f106298: 00002825 */ or $a1,$zero,$zero /* f10629c: 8fad0028 */ lw $t5,0x28($sp) .L0f1062a0: -/* f1062a0: 3c018007 */ lui $at,0x8007 +/* f1062a0: 3c018007 */ lui $at,%hi(var800711f0) /* f1062a4: 8dae0000 */ lw $t6,0x0($t5) /* f1062a8: 10000035 */ beqz $zero,.L0f106380 -/* f1062ac: ac2e11f0 */ sw $t6,0x11f0($at) +/* f1062ac: ac2e11f0 */ sw $t6,%lo(var800711f0)($at) /* f1062b0: 0fc44bd4 */ jal currentPlayerGetEquipCurItem /* f1062b4: 00000000 */ sll $zero,$zero,0x0 /* f1062b8: 8faf0028 */ lw $t7,0x28($sp) @@ -4178,21 +4178,21 @@ glabel var7f1b2e84 /* f106330: 016a5823 */ subu $t3,$t3,$t2 /* f106334: 000b5900 */ sll $t3,$t3,0x4 /* f106338: 002b0821 */ addu $at,$at,$t3 -/* f10633c: 3c048007 */ lui $a0,0x8007 +/* f10633c: 3c048007 */ lui $a0,%hi(menuitems_inventory+0x14) /* f106340: ac29ee28 */ sw $t1,%lo(g_MenuStack+0xe28)($at) -/* f106344: 248433e8 */ addiu $a0,$a0,0x33e8 +/* f106344: 248433e8 */ addiu $a0,$a0,%lo(menuitems_inventory+0x14) /* f106348: 0fc3c4e7 */ jal func0f0f139c /* f10634c: 3c05bf80 */ lui $a1,0xbf80 -/* f106350: 3c048007 */ lui $a0,0x8007 -/* f106354: 248433fc */ addiu $a0,$a0,0x33fc +/* f106350: 3c048007 */ lui $a0,%hi(menuitems_inventory+0x28) +/* f106354: 248433fc */ addiu $a0,$a0,%lo(menuitems_inventory+0x28) /* f106358: 0fc3c4e7 */ jal func0f0f139c /* f10635c: 3c05bf80 */ lui $a1,0xbf80 -/* f106360: 3c048007 */ lui $a0,0x8007 -/* f106364: 24843424 */ addiu $a0,$a0,0x3424 +/* f106360: 3c048007 */ lui $a0,%hi(menuitems_inventory+0x50) +/* f106364: 24843424 */ addiu $a0,$a0,%lo(menuitems_inventory+0x50) /* f106368: 0fc3c4e7 */ jal func0f0f139c /* f10636c: 3c05bf80 */ lui $a1,0xbf80 -/* f106370: 3c048007 */ lui $a0,0x8007 -/* f106374: 24843438 */ addiu $a0,$a0,0x3438 +/* f106370: 3c048007 */ lui $a0,%hi(menuitems_inventory+0x64) +/* f106374: 24843438 */ addiu $a0,$a0,%lo(menuitems_inventory+0x64) /* f106378: 0fc3c4e7 */ jal func0f0f139c /* f10637c: 3c05bf80 */ lui $a1,0xbf80 .L0f106380: @@ -4334,13 +4334,13 @@ glabel func0f106508 /* f10655c: 8fbf0014 */ lw $ra,0x14($sp) .L0f106560: /* f106560: 9108dfea */ lbu $t0,%lo(g_MissionConfig+0x2)($t0) -/* f106564: 3c048007 */ lui $a0,0x8007 +/* f106564: 3c048007 */ lui $a0,%hi(g_StageNames+0xa) /* f106568: 00084880 */ sll $t1,$t0,0x2 /* f10656c: 01284823 */ subu $t1,$t1,$t0 /* f106570: 00094880 */ sll $t1,$t1,0x2 /* f106574: 00892021 */ addu $a0,$a0,$t1 /* f106578: 0fc5b9f1 */ jal langGet -/* f10657c: 94841e76 */ lhu $a0,0x1e76($a0) +/* f10657c: 94841e76 */ lhu $a0,%lo(g_StageNames+0xa)($a0) /* f106580: afa20018 */ sw $v0,0x18($sp) /* f106584: 0fc5b9f1 */ jal langGet /* f106588: 240456ac */ addiu $a0,$zero,0x56ac @@ -4461,7 +4461,7 @@ glabel var7f1b2ea0 /* f1066d4: 10000044 */ beqz $zero,.L0f1067e8 /* f1066d8: accc0000 */ sw $t4,0x0($a2) /* f1066dc: 8cc20000 */ lw $v0,0x0($a2) -/* f1066e0: 3c048007 */ lui $a0,0x8007 +/* f1066e0: 3c048007 */ lui $a0,%hi(menudialog_status+0x14) /* f1066e4: 1440000a */ bnez $v0,.L0f106710 /* f1066e8: 00026880 */ sll $t5,$v0,0x2 /* f1066ec: 0fc5b9f1 */ jal langGet @@ -4478,7 +4478,7 @@ glabel var7f1b2ea0 /* f106714: 000d6880 */ sll $t5,$t5,0x2 /* f106718: 008d2021 */ addu $a0,$a0,$t5 /* f10671c: 0fc5b9f1 */ jal langGet -/* f106720: 948436d4 */ lhu $a0,0x36d4($a0) +/* f106720: 948436d4 */ lhu $a0,%lo(menudialog_status+0x14)($a0) /* f106724: 10000032 */ beqz $zero,.L0f1067f0 /* f106728: 8fbf0014 */ lw $ra,0x14($sp) /* f10672c: 8cc20000 */ lw $v0,0x0($a2) diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c index d9336acb1..f7073fbf6 100644 --- a/src/game/game_107fb0.c +++ b/src/game/game_107fb0.c @@ -401,12 +401,12 @@ glabel func0f108424 /* f108450: 030fc021 */ addu $t8,$t8,$t7 /* f108454: 9718ee34 */ lhu $t8,%lo(g_MenuStack+0xe34)($t8) /* f108458: afa40018 */ sw $a0,0x18($sp) -/* f10845c: 3c048007 */ lui $a0,0x8007 +/* f10845c: 3c048007 */ lui $a0,%hi(iomessages+0xc) /* f108460: 0018c840 */ sll $t9,$t8,0x1 /* f108464: afbf0014 */ sw $ra,0x14($sp) /* f108468: 00992021 */ addu $a0,$a0,$t9 /* f10846c: 0fc5b9f1 */ jal langGet -/* f108470: 9484438c */ lhu $a0,0x438c($a0) +/* f108470: 9484438c */ lhu $a0,%lo(iomessages+0xc)($a0) /* f108474: 8fbf0014 */ lw $ra,0x14($sp) /* f108478: 27bd0018 */ addiu $sp,$sp,0x18 /* f10847c: 03e00008 */ jr $ra @@ -1617,7 +1617,7 @@ glabel var7f1b36c8 /* f109378: 3c188007 */ lui $t8,%hi(g_MpPlayerNum) /* f10937c: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) /* f109380: 3c08800a */ lui $t0,%hi(g_MenuStack+0xe42) -/* f109384: 3c018007 */ lui $at,0x8007 +/* f109384: 3c018007 */ lui $at,%hi(var80075bb8) /* f109388: 0018c8c0 */ sll $t9,$t8,0x3 /* f10938c: 0338c823 */ subu $t9,$t9,$t8 /* f109390: 0019c880 */ sll $t9,$t9,0x2 @@ -1632,7 +1632,7 @@ glabel var7f1b36c8 /* f1093b4: 00084880 */ sll $t1,$t0,0x2 /* f1093b8: 00290821 */ addu $at,$at,$t1 /* f1093bc: 10000018 */ beqz $zero,.L0f109420 -/* f1093c0: ac2f5bb8 */ sw $t7,0x5bb8($at) +/* f1093c0: ac2f5bb8 */ sw $t7,%lo(var80075bb8)($at) /* f1093c4: 0fc43eb2 */ jal func0f10fac8 /* f1093c8: 8fa40048 */ lw $a0,0x48($sp) /* f1093cc: 10000014 */ beqz $zero,.L0f109420 @@ -2001,7 +2001,7 @@ glabel func0f1097d0 /* f109900: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f109904: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) /* f109908: 3c0e800a */ lui $t6,%hi(g_MenuStack+0xe1c) -/* f10990c: 3c018007 */ lui $at,0x8007 +/* f10990c: 3c018007 */ lui $at,%hi(g_SaveLocations+0xc) /* f109910: 0019c0c0 */ sll $t8,$t9,0x3 /* f109914: 0319c023 */ subu $t8,$t8,$t9 /* f109918: 0018c080 */ sll $t8,$t8,0x2 @@ -2014,7 +2014,7 @@ glabel func0f1097d0 /* f109934: 240d0001 */ addiu $t5,$zero,0x1 /* f109938: 000e7880 */ sll $t7,$t6,0x2 /* f10993c: 002f0821 */ addu $at,$at,$t7 -/* f109940: ac2d5bcc */ sw $t5,0x5bcc($at) +/* f109940: ac2d5bcc */ sw $t5,%lo(g_SaveLocations+0xc)($at) .L0f109944: /* f109944: 8fbf0014 */ lw $ra,0x14($sp) /* f109948: 27bd0048 */ addiu $sp,$sp,0x48 @@ -4133,7 +4133,7 @@ glabel menudialog0010b674 /* f10b6ec: 3c088007 */ lui $t0,%hi(g_MpPlayerNum) /* f10b6f0: 8d081448 */ lw $t0,%lo(g_MpPlayerNum)($t0) /* f10b6f4: 3c0a800a */ lui $t2,0x800a -/* f10b6f8: 3c018007 */ lui $at,0x8007 +/* f10b6f8: 3c018007 */ lui $at,%hi(var80074a4c) /* f10b6fc: 000848c0 */ sll $t1,$t0,0x3 /* f10b700: 01284823 */ subu $t1,$t1,$t0 /* f10b704: 00094880 */ sll $t1,$t1,0x2 @@ -4143,7 +4143,7 @@ glabel menudialog0010b674 /* f10b714: 00094900 */ sll $t1,$t1,0x4 /* f10b718: 254ae000 */ addiu $t2,$t2,-8192 /* f10b71c: 8fa3001c */ lw $v1,0x1c($sp) -/* f10b720: ac204a4c */ sw $zero,0x4a4c($at) +/* f10b720: ac204a4c */ sw $zero,%lo(var80074a4c)($at) /* f10b724: 012a1021 */ addu $v0,$t1,$t2 /* f10b728: 8c4b0e20 */ lw $t3,0xe20($v0) /* f10b72c: 24010001 */ addiu $at,$zero,0x1 @@ -4374,9 +4374,9 @@ glabel menudialog0010ba10 /* f10ba7c: 10000029 */ beqz $zero,.L0f10bb24 /* f10ba80: ac20ee24 */ sw $zero,%lo(g_MenuStack+0xe24)($at) .L0f10ba84: -/* f10ba84: 3c018006 */ lui $at,0x8006 +/* f10ba84: 3c018006 */ lui $at,%hi(var80062944) /* f10ba88: 10000026 */ beqz $zero,.L0f10bb24 -/* f10ba8c: a0382944 */ sb $t8,0x2944($at) +/* f10ba8c: a0382944 */ sb $t8,%lo(var80062944)($at) .L0f10ba90: /* f10ba90: 24429fc0 */ addiu $v0,$v0,%lo(g_Vars) /* f10ba94: 8c5904b4 */ lw $t9,0x4b4($v0) @@ -4996,19 +4996,19 @@ glabel var7f1b385c /* f10c458: 00055880 */ sll $t3,$a1,0x2 /* f10c45c: 01655823 */ subu $t3,$t3,$a1 /* f10c460: 000b5880 */ sll $t3,$t3,0x2 -/* f10c464: 3c048007 */ lui $a0,0x8007 +/* f10c464: 3c048007 */ lui $a0,%hi(menudialog_selectdifficulty3+0x12) /* f10c468: 008b2021 */ addu $a0,$a0,$t3 /* f10c46c: 0fc5b9f1 */ jal langGet -/* f10c470: 94841e66 */ lhu $a0,0x1e66($a0) +/* f10c470: 94841e66 */ lhu $a0,%lo(menudialog_selectdifficulty3+0x12)($a0) /* f10c474: 93b80117 */ lbu $t8,0x117($sp) -/* f10c478: 3c048007 */ lui $a0,0x8007 +/* f10c478: 3c048007 */ lui $a0,%hi(menudialog_selectdifficulty3+0x14) /* f10c47c: 00408025 */ or $s0,$v0,$zero /* f10c480: 00186880 */ sll $t5,$t8,0x2 /* f10c484: 01b86823 */ subu $t5,$t5,$t8 /* f10c488: 000d6880 */ sll $t5,$t5,0x2 /* f10c48c: 008d2021 */ addu $a0,$a0,$t5 /* f10c490: 0fc5b9f1 */ jal langGet -/* f10c494: 94841e68 */ lhu $a0,0x1e68($a0) +/* f10c494: 94841e68 */ lhu $a0,%lo(menudialog_selectdifficulty3+0x14)($a0) /* f10c498: 3c057f1b */ lui $a1,%hi(var7f1b350c) /* f10c49c: 24a5350c */ addiu $a1,$a1,%lo(var7f1b350c) /* f10c4a0: 27a4009c */ addiu $a0,$sp,0x9c @@ -5362,10 +5362,10 @@ glabel func0f10c970 /* f10c998: afae001c */ sw $t6,0x1c($sp) /* f10c99c: 8fbf0014 */ lw $ra,0x14($sp) /* f10c9a0: 8faf001c */ lw $t7,0x1c($sp) -/* f10c9a4: 3c018007 */ lui $at,0x8007 +/* f10c9a4: 3c018007 */ lui $at,%hi(g_MpPlayerNum) /* f10c9a8: 27bd0020 */ addiu $sp,$sp,0x20 /* f10c9ac: 03e00008 */ jr $ra -/* f10c9b0: ac2f1448 */ sw $t7,0x1448($at) +/* f10c9b0: ac2f1448 */ sw $t7,%lo(g_MpPlayerNum)($at) /* f10c9b4: 00000000 */ sll $zero,$zero,0x0 /* f10c9b8: 00000000 */ sll $zero,$zero,0x0 /* f10c9bc: 00000000 */ sll $zero,$zero,0x0 diff --git a/src/game/game_10c9c0.c b/src/game/game_10c9c0.c index dc4699e2c..5fd8f8b7d 100644 --- a/src/game/game_10c9c0.c +++ b/src/game/game_10c9c0.c @@ -64,9 +64,9 @@ glabel func0f10cb2c /* f10cb2c: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10cb30: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) /* f10cb34: 3c028006 */ lui $v0,%hi(var80062940) -/* f10cb38: 3c018007 */ lui $at,0x8007 +/* f10cb38: 3c018007 */ lui $at,%hi(g_MpPlayerNum) /* f10cb3c: 24422940 */ addiu $v0,$v0,%lo(var80062940) -/* f10cb40: ac201448 */ sw $zero,0x1448($at) +/* f10cb40: ac201448 */ sw $zero,%lo(g_MpPlayerNum)($at) /* f10cb44: 904f0000 */ lbu $t7,0x0($v0) /* f10cb48: 27bdffd8 */ addiu $sp,$sp,-40 /* f10cb4c: afbf001c */ sw $ra,0x1c($sp) @@ -114,12 +114,12 @@ glabel func0f10cb2c /* f10cbe8: 8fbf001c */ lw $ra,0x1c($sp) .L0f10cbec: /* f10cbec: 8fa90020 */ lw $t1,0x20($sp) -/* f10cbf0: 3c018007 */ lui $at,0x8007 +/* f10cbf0: 3c018007 */ lui $at,%hi(g_MpPlayerNum) /* f10cbf4: 8fb00014 */ lw $s0,0x14($sp) /* f10cbf8: 8fb10018 */ lw $s1,0x18($sp) /* f10cbfc: 27bd0028 */ addiu $sp,$sp,0x28 /* f10cc00: 03e00008 */ jr $ra -/* f10cc04: ac291448 */ sw $t1,0x1448($at) +/* f10cc04: ac291448 */ sw $t1,%lo(g_MpPlayerNum)($at) ); bool menudialog4MbMainMenu(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem) diff --git a/src/game/game_10ccd0.c b/src/game/game_10ccd0.c index 57b2c129e..e9f431db3 100644 --- a/src/game/game_10ccd0.c +++ b/src/game/game_10ccd0.c @@ -183,14 +183,14 @@ glabel func0f10ce74 /* f10cecc: 24045728 */ addiu $a0,$zero,0x5728 /* f10ced0: 3c08800a */ lui $t0,%hi(g_MissionConfig+0x2) /* f10ced4: 9108dfea */ lbu $t0,%lo(g_MissionConfig+0x2)($t0) -/* f10ced8: 3c048007 */ lui $a0,0x8007 +/* f10ced8: 3c048007 */ lui $a0,%hi(g_StageNames+0xa) /* f10cedc: afa20018 */ sw $v0,0x18($sp) /* f10cee0: 00084880 */ sll $t1,$t0,0x2 /* f10cee4: 01284823 */ subu $t1,$t1,$t0 /* f10cee8: 00094880 */ sll $t1,$t1,0x2 /* f10ceec: 00892021 */ addu $a0,$a0,$t1 /* f10cef0: 0fc5b9f1 */ jal langGet -/* f10cef4: 94841e76 */ lhu $a0,0x1e76($a0) +/* f10cef4: 94841e76 */ lhu $a0,%lo(g_StageNames+0xa)($a0) /* f10cef8: 3c048007 */ lui $a0,%hi(g_StringPointer) /* f10cefc: 3c057f1b */ lui $a1,%hi(var7f1b3860) /* f10cf00: 24a53860 */ addiu $a1,$a1,%lo(var7f1b3860) @@ -235,14 +235,14 @@ glabel func0f10cf2c /* f10cf84: 24045729 */ addiu $a0,$zero,0x5729 /* f10cf88: 3c08800a */ lui $t0,%hi(g_MissionConfig+0x2) /* f10cf8c: 9108dfea */ lbu $t0,%lo(g_MissionConfig+0x2)($t0) -/* f10cf90: 3c048007 */ lui $a0,0x8007 +/* f10cf90: 3c048007 */ lui $a0,%hi(g_StageNames+0xa) /* f10cf94: afa20018 */ sw $v0,0x18($sp) /* f10cf98: 00084880 */ sll $t1,$t0,0x2 /* f10cf9c: 01284823 */ subu $t1,$t1,$t0 /* f10cfa0: 00094880 */ sll $t1,$t1,0x2 /* f10cfa4: 00892021 */ addu $a0,$a0,$t1 /* f10cfa8: 0fc5b9f1 */ jal langGet -/* f10cfac: 94841e76 */ lhu $a0,0x1e76($a0) +/* f10cfac: 94841e76 */ lhu $a0,%lo(g_StageNames+0xa)($a0) /* f10cfb0: 3c048007 */ lui $a0,%hi(g_StringPointer) /* f10cfb4: 3c057f1b */ lui $a1,%hi(var7f1b3868) /* f10cfb8: 24a53868 */ addiu $a1,$a1,%lo(var7f1b3868) @@ -426,14 +426,14 @@ glabel func0f10d588 /* f10d5b4: 030fc021 */ addu $t8,$t8,$t7 /* f10d5b8: 8f18ee2c */ lw $t8,%lo(g_MenuStack+0xe2c)($t8) /* f10d5bc: afa40020 */ sw $a0,0x20($sp) -/* f10d5c0: 3c048007 */ lui $a0,0x8007 +/* f10d5c0: 3c048007 */ lui $a0,%hi(g_StageNames+0xa) /* f10d5c4: 0018c880 */ sll $t9,$t8,0x2 /* f10d5c8: 0338c823 */ subu $t9,$t9,$t8 /* f10d5cc: 0019c880 */ sll $t9,$t9,0x2 /* f10d5d0: afbf0014 */ sw $ra,0x14($sp) /* f10d5d4: 00992021 */ addu $a0,$a0,$t9 /* f10d5d8: 0fc5b9f1 */ jal langGet -/* f10d5dc: 94841e76 */ lhu $a0,0x1e76($a0) +/* f10d5dc: 94841e76 */ lhu $a0,%lo(g_StageNames+0xa)($a0) /* f10d5e0: afa20018 */ sw $v0,0x18($sp) /* f10d5e4: 0fc5b9f1 */ jal langGet /* f10d5e8: 24045714 */ addiu $a0,$zero,0x5714 @@ -460,11 +460,11 @@ glabel func0f10d61c /* f10d62c: 000e7880 */ sll $t7,$t6,0x2 /* f10d630: 01ee7823 */ subu $t7,$t7,$t6 /* f10d634: 000f7880 */ sll $t7,$t7,0x2 -/* f10d638: 3c048007 */ lui $a0,0x8007 +/* f10d638: 3c048007 */ lui $a0,%hi(g_StageNames+0xa) /* f10d63c: afbf0014 */ sw $ra,0x14($sp) /* f10d640: 008f2021 */ addu $a0,$a0,$t7 /* f10d644: 0fc5b9f1 */ jal langGet -/* f10d648: 94841e76 */ lhu $a0,0x1e76($a0) +/* f10d648: 94841e76 */ lhu $a0,%lo(g_StageNames+0xa)($a0) /* f10d64c: 3c048007 */ lui $a0,%hi(g_StringPointer) /* f10d650: 3c057f1b */ lui $a1,%hi(var7f1b38a4) /* f10d654: 24a538a4 */ addiu $a1,$a1,%lo(var7f1b38a4) @@ -487,11 +487,11 @@ glabel func0f10d678 /* f10d688: 000e7880 */ sll $t7,$t6,0x2 /* f10d68c: 01ee7823 */ subu $t7,$t7,$t6 /* f10d690: 000f7880 */ sll $t7,$t7,0x2 -/* f10d694: 3c048007 */ lui $a0,0x8007 +/* f10d694: 3c048007 */ lui $a0,%hi(g_StageNames+0xa) /* f10d698: afbf0014 */ sw $ra,0x14($sp) /* f10d69c: 008f2021 */ addu $a0,$a0,$t7 /* f10d6a0: 0fc5b9f1 */ jal langGet -/* f10d6a4: 94841e76 */ lhu $a0,0x1e76($a0) +/* f10d6a4: 94841e76 */ lhu $a0,%lo(g_StageNames+0xa)($a0) /* f10d6a8: afa20018 */ sw $v0,0x18($sp) /* f10d6ac: 0fc5b9f1 */ jal langGet /* f10d6b0: 24045715 */ addiu $a0,$zero,0x5715 @@ -1960,12 +1960,12 @@ glabel func0f10ecb4 /* f10ecd0: 3c04800a */ lui $a0,%hi(g_Vars) /* f10ecd4: 24849fc0 */ addiu $a0,$a0,%lo(g_Vars) /* f10ecd8: 8c8f0288 */ lw $t7,0x288($a0) -/* f10ecdc: 3c018007 */ lui $at,0x8007 +/* f10ecdc: 3c018007 */ lui $at,%hi(g_MpPlayerNum) /* f10ece0: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f10ece4: 8df80070 */ lw $t8,0x70($t7) /* f10ece8: 3c09800a */ lui $t1,0x800a /* f10ecec: 2529e000 */ addiu $t1,$t1,-8192 -/* f10ecf0: ac381448 */ sw $t8,0x1448($at) +/* f10ecf0: ac381448 */ sw $t8,%lo(g_MpPlayerNum)($at) /* f10ecf4: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) /* f10ecf8: 3c0a800a */ lui $t2,%hi(g_MissionConfig+0x2) /* f10ecfc: 8c8b028c */ lw $t3,0x28c($a0) @@ -2053,10 +2053,10 @@ glabel func0f10ecb4 .L0f10ee28: /* f10ee28: 8fbf0014 */ lw $ra,0x14($sp) /* f10ee2c: 8faa001c */ lw $t2,0x1c($sp) -/* f10ee30: 3c018007 */ lui $at,0x8007 +/* f10ee30: 3c018007 */ lui $at,%hi(g_MpPlayerNum) /* f10ee34: 27bd0020 */ addiu $sp,$sp,0x20 /* f10ee38: 03e00008 */ jr $ra -/* f10ee3c: ac2a1448 */ sw $t2,0x1448($at) +/* f10ee3c: ac2a1448 */ sw $t2,%lo(g_MpPlayerNum)($at) ); GLOBAL_ASM( @@ -2113,10 +2113,10 @@ glabel func0f10ee40 /* f10eef8: 8fbf0014 */ lw $ra,0x14($sp) .L0f10eefc: /* f10eefc: 8fad001c */ lw $t5,0x1c($sp) -/* f10ef00: 3c018007 */ lui $at,0x8007 +/* f10ef00: 3c018007 */ lui $at,%hi(g_MpPlayerNum) /* f10ef04: 27bd0020 */ addiu $sp,$sp,0x20 /* f10ef08: 03e00008 */ jr $ra -/* f10ef0c: ac2d1448 */ sw $t5,0x1448($at) +/* f10ef0c: ac2d1448 */ sw $t5,%lo(g_MpPlayerNum)($at) ); GLOBAL_ASM( @@ -2131,12 +2131,12 @@ glabel func0f10ef10 /* f10ef2c: 3c03800a */ lui $v1,%hi(g_Vars) /* f10ef30: 24639fc0 */ addiu $v1,$v1,%lo(g_Vars) /* f10ef34: 8c6f0288 */ lw $t7,0x288($v1) -/* f10ef38: 3c018007 */ lui $at,0x8007 +/* f10ef38: 3c018007 */ lui $at,%hi(g_MpPlayerNum) /* f10ef3c: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f10ef40: 8df80070 */ lw $t8,0x70($t7) /* f10ef44: 3c09800a */ lui $t1,0x800a /* f10ef48: 2529e000 */ addiu $t1,$t1,-8192 -/* f10ef4c: ac381448 */ sw $t8,0x1448($at) +/* f10ef4c: ac381448 */ sw $t8,%lo(g_MpPlayerNum)($at) /* f10ef50: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) /* f10ef54: 8c6c0284 */ lw $t4,0x284($v1) /* f10ef58: 8c6402a0 */ lw $a0,0x2a0($v1) @@ -2264,10 +2264,10 @@ glabel func0f10ef10 /* f10f118: 8fbf0014 */ lw $ra,0x14($sp) .L0f10f11c: /* f10f11c: 8fab001c */ lw $t3,0x1c($sp) -/* f10f120: 3c018007 */ lui $at,0x8007 +/* f10f120: 3c018007 */ lui $at,%hi(g_MpPlayerNum) /* f10f124: 27bd0020 */ addiu $sp,$sp,0x20 /* f10f128: 03e00008 */ jr $ra -/* f10f12c: ac2b1448 */ sw $t3,0x1448($at) +/* f10f12c: ac2b1448 */ sw $t3,%lo(g_MpPlayerNum)($at) /* f10f130: 3c02800a */ lui $v0,%hi(g_SoloSaveFile+0x14) /* f10f134: 03e00008 */ jr $ra /* f10f138: 24422214 */ addiu $v0,$v0,%lo(g_SoloSaveFile+0x14) @@ -3223,8 +3223,8 @@ glabel func0f10feac /* f10ff18: 10000001 */ beqz $zero,.L0f10ff20 /* f10ff1c: 24110001 */ addiu $s1,$zero,0x1 .L0f10ff20: -/* f10ff20: 3c018007 */ lui $at,0x8007 -/* f10ff24: ac325bd0 */ sw $s2,0x5bd0($at) +/* f10ff20: 3c018007 */ lui $at,%hi(var80075bd0) +/* f10ff24: ac325bd0 */ sw $s2,%lo(var80075bd0)($at) /* f10ff28: 0fc549e0 */ jal optionsGetForwardPitch /* f10ff2c: 02602025 */ or $a0,$s3,$zero /* f10ff30: 3c10800a */ lui $s0,%hi(g_SoloSaveFile+0x14) @@ -4179,8 +4179,8 @@ glabel func0f110c5c /* f110ce0: 8fbf0014 */ lw $ra,0x14($sp) .L0f110ce4: /* f110ce4: 240a0001 */ addiu $t2,$zero,0x1 -/* f110ce8: 3c018006 */ lui $at,0x8006 -/* f110cec: a02a2944 */ sb $t2,0x2944($at) +/* f110ce8: 3c018006 */ lui $at,%hi(var80062944) +/* f110cec: a02a2944 */ sb $t2,%lo(var80062944)($at) /* f110cf0: 03e00008 */ jr $ra /* f110cf4: 27bd0020 */ addiu $sp,$sp,0x20 ); @@ -4263,8 +4263,8 @@ glabel func0f110da8 /* f110de8: 1603fffe */ bne $s0,$v1,.L0f110de4 /* f110dec: ae02fffc */ sw $v0,-0x4($s0) /* f110df0: 240f0001 */ addiu $t7,$zero,0x1 -/* f110df4: 3c018007 */ lui $at,0x8007 -/* f110df8: ac2f5bf4 */ sw $t7,0x5bf4($at) +/* f110df4: 3c018007 */ lui $at,%hi(var80075bf4) +/* f110df8: ac2f5bf4 */ sw $t7,%lo(var80075bf4)($at) .L0f110dfc: /* f110dfc: 00009025 */ or $s2,$zero,$zero /* f110e00: 00009825 */ or $s3,$zero,$zero diff --git a/src/game/game_11ecf0.c b/src/game/game_11ecf0.c index 8b33fed0b..387b96ae8 100644 --- a/src/game/game_11ecf0.c +++ b/src/game/game_11ecf0.c @@ -89,9 +89,9 @@ glabel func0f11edc0 /* f11edc8: 3c028007 */ lui $v0,%hi(var80075d70) /* f11edcc: 03e00008 */ jr $ra /* f11edd0: 8c425d70 */ lw $v0,%lo(var80075d70)($v0) -/* f11edd4: 3c018007 */ lui $at,0x8007 +/* f11edd4: 3c018007 */ lui $at,%hi(var80075d70) /* f11edd8: 03e00008 */ jr $ra -/* f11eddc: ac245d70 */ sw $a0,0x5d70($at) +/* f11eddc: ac245d70 */ sw $a0,%lo(var80075d70)($at) /* f11ede0: 03e00008 */ jr $ra /* f11ede4: 00001025 */ or $v0,$zero,$zero /* f11ede8: 03e00008 */ jr $ra @@ -109,9 +109,9 @@ glabel func0f11ee08 /* f11ee08: 3c028007 */ lui $v0,%hi(var80075d74) /* f11ee0c: 03e00008 */ jr $ra /* f11ee10: 8c425d74 */ lw $v0,%lo(var80075d74)($v0) -/* f11ee14: 3c018007 */ lui $at,0x8007 +/* f11ee14: 3c018007 */ lui $at,%hi(var80075d74) /* f11ee18: 03e00008 */ jr $ra -/* f11ee1c: ac245d74 */ sw $a0,0x5d74($at) +/* f11ee1c: ac245d74 */ sw $a0,%lo(var80075d74)($at) ); bool func0f11ee20(void) diff --git a/src/game/game_129900.c b/src/game/game_129900.c index 56a93edce..7abb0ee1a 100644 --- a/src/game/game_129900.c +++ b/src/game/game_129900.c @@ -481,9 +481,9 @@ glabel var7f1b5584 /* f12a070: 0019c880 */ sll $t9,$t9,0x2 /* f12a074: 0337c823 */ subu $t9,$t9,$s7 /* f12a078: 0019c880 */ sll $t9,$t9,0x2 -/* f12a07c: 3c068008 */ lui $a2,0x8008 +/* f12a07c: 3c068008 */ lui $a2,%hi(g_ExplosionTypes+0x24) /* f12a080: 00d93021 */ addu $a2,$a2,$t9 -/* f12a084: 90c6e4dc */ lbu $a2,-0x1b24($a2) +/* f12a084: 90c6e4dc */ lbu $a2,%lo(g_ExplosionTypes+0x24)($a2) /* f12a088: 27c40008 */ addiu $a0,$s8,0x8 /* f12a08c: 0fc4ba08 */ jal func0f12e820 /* f12a090: 27c50028 */ addiu $a1,$s8,0x28 @@ -495,9 +495,9 @@ glabel var7f1b5584 /* f12a0a4: 000c6080 */ sll $t4,$t4,0x2 /* f12a0a8: 01976023 */ subu $t4,$t4,$s7 /* f12a0ac: 000c6080 */ sll $t4,$t4,0x2 -/* f12a0b0: 3c068008 */ lui $a2,0x8008 +/* f12a0b0: 3c068008 */ lui $a2,%hi(g_ExplosionTypes+0x24) /* f12a0b4: 00cc3021 */ addu $a2,$a2,$t4 -/* f12a0b8: 90c6e4dc */ lbu $a2,-0x1b24($a2) +/* f12a0b8: 90c6e4dc */ lbu $a2,%lo(g_ExplosionTypes+0x24)($a2) /* f12a0bc: 0fc4ba08 */ jal func0f12e820 /* f12a0c0: 02802825 */ or $a1,$s4,$zero .L0f12a0c4: @@ -578,8 +578,8 @@ glabel var7f1b5584 /* f12a1cc: 24010001 */ addiu $at,$zero,0x1 /* f12a1d0: 12e10003 */ beq $s7,$at,.L0f12a1e0 /* f12a1d4: 240e0006 */ addiu $t6,$zero,0x6 -/* f12a1d8: 3c018008 */ lui $at,0x8008 -/* f12a1dc: ac2ee4a0 */ sw $t6,-0x1b60($at) +/* f12a1d8: 3c018008 */ lui $at,%hi(var8007e4a0) +/* f12a1dc: ac2ee4a0 */ sw $t6,%lo(var8007e4a0)($at) .L0f12a1e0: /* f12a1e0: 104002ac */ beqz $v0,.L0f12ac94 /* f12a1e4: 8fa70164 */ lw $a3,0x164($sp) @@ -647,15 +647,15 @@ glabel var7f1b5584 /* f12a2d4: 0fc180bc */ jal propHide /* f12a2d8: 02a02025 */ or $a0,$s5,$zero /* f12a2dc: 8faa0158 */ lw $t2,0x158($sp) -/* f12a2e0: 3c188008 */ lui $t8,0x8008 -/* f12a2e4: 2718e4e4 */ addiu $t8,$t8,-6940 +/* f12a2e0: 3c188008 */ lui $t8,%hi(g_ExplosionTypes+0x2c) +/* f12a2e4: 2718e4e4 */ addiu $t8,$t8,%lo(g_ExplosionTypes+0x2c) /* f12a2e8: a15703cc */ sb $s7,0x3cc($t2) /* f12a2ec: ad550000 */ sw $s5,0x0($t2) /* f12a2f0: ad5e0004 */ sw $s8,0x4($t2) /* f12a2f4: a54003c8 */ sh $zero,0x3c8($t2) /* f12a2f8: 8fad0174 */ lw $t5,0x174($sp) -/* f12a2fc: 3c198008 */ lui $t9,0x8008 -/* f12a300: 2739e880 */ addiu $t9,$t9,-6016 +/* f12a2fc: 3c198008 */ lui $t9,%hi(g_ExplosionTypes+0x3c8) +/* f12a300: 2739e880 */ addiu $t9,$t9,%lo(g_ExplosionTypes+0x3c8) /* f12a304: a14d03cd */ sb $t5,0x3cd($t2) /* f12a308: 8fae0170 */ lw $t6,0x170($sp) /* f12a30c: a14e03ce */ sb $t6,0x3ce($t2) @@ -1323,11 +1323,11 @@ glabel var7f1b5584 /* f12accc: 03e00008 */ jr $ra /* f12acd0: 27bd0160 */ addiu $sp,$sp,0x160 /* f12acd4: 24020006 */ addiu $v0,$zero,0x6 -/* f12acd8: 3c018008 */ lui $at,0x8008 -/* f12acdc: ac22e4a0 */ sw $v0,-0x1b60($at) -/* f12ace0: 3c018008 */ lui $at,0x8008 +/* f12acd8: 3c018008 */ lui $at,%hi(var8007e4a0) +/* f12acdc: ac22e4a0 */ sw $v0,%lo(var8007e4a0)($at) +/* f12ace0: 3c018008 */ lui $at,%hi(var8007e4a4) /* f12ace4: 03e00008 */ jr $ra -/* f12ace8: ac22e4a4 */ sw $v0,-0x1b5c($at) +/* f12ace8: ac22e4a4 */ sw $v0,%lo(var8007e4a4)($at) ); GLOBAL_ASM( diff --git a/src/game/game_12d3f0.c b/src/game/game_12d3f0.c index 9b60df407..db0a90c45 100644 --- a/src/game/game_12d3f0.c +++ b/src/game/game_12d3f0.c @@ -53,7 +53,7 @@ glabel func0f12d3f0 /* f12d428: 00408025 */ or $s0,$v0,$zero /* f12d42c: 8fae00b8 */ lw $t6,0xb8($sp) /* f12d430: 8fa700bc */ lw $a3,0xbc($sp) -/* f12d434: 3c048008 */ lui $a0,0x8008 +/* f12d434: 3c048008 */ lui $a0,%hi(g_SmokeTypes+0x2) /* f12d438: 95cf0006 */ lhu $t7,0x6($t6) /* f12d43c: 84e60024 */ lh $a2,0x24($a3) /* f12d440: 3c08800a */ lui $t0,%hi(g_Vars+0x284) @@ -62,7 +62,7 @@ glabel func0f12d3f0 /* f12d44c: 0338c821 */ addu $t9,$t9,$t8 /* f12d450: 0019c880 */ sll $t9,$t9,0x2 /* f12d454: 00992021 */ addu $a0,$a0,$t9 -/* f12d458: 8484e942 */ lh $a0,-0x16be($a0) +/* f12d458: 8484e942 */ lh $a0,%lo(g_SmokeTypes+0x2)($a0) /* f12d45c: 8d08a244 */ lw $t0,%lo(g_Vars+0x284)($t0) /* f12d460: 8fa500b4 */ lw $a1,0xb4($sp) /* f12d464: 0086082a */ slt $at,$a0,$a2 diff --git a/src/game/game_12f6c0.c b/src/game/game_12f6c0.c index 8a12830c8..c5a3a1aed 100644 --- a/src/game/game_12f6c0.c +++ b/src/game/game_12f6c0.c @@ -689,8 +689,8 @@ glabel func0f12f9f0 .L0f130024: /* f130024: 240e0001 */ addiu $t6,$zero,0x1 .L0f130028: -/* f130028: 3c018008 */ lui $at,0x8008 -/* f13002c: ac2ef0b8 */ sw $t6,-0xf48($at) +/* f130028: 3c018008 */ lui $at,%hi(var8007f0b8) +/* f13002c: ac2ef0b8 */ sw $t6,%lo(var8007f0b8)($at) .L0f130030: /* f130030: 8fbf001c */ lw $ra,0x1c($sp) /* f130034: 8fb00014 */ lw $s0,0x14($sp) diff --git a/src/game/game_131060.c b/src/game/game_131060.c index c90c79425..114e3fd88 100644 --- a/src/game/game_131060.c +++ b/src/game/game_131060.c @@ -5385,8 +5385,8 @@ glabel func0f135bd8 /* f135c50: 0c00cec9 */ jal func00033b24 /* f135c54: 00000000 */ sll $zero,$zero,0x0 .L0f135c58: -/* f135c58: 3c018008 */ lui $at,0x8008 -/* f135c5c: ac20f0c0 */ sw $zero,-0xf40($at) +/* f135c58: 3c018008 */ lui $at,%hi(var8007f0c0) +/* f135c5c: ac20f0c0 */ sw $zero,%lo(var8007f0c0)($at) /* f135c60: 8fbf0014 */ lw $ra,0x14($sp) .L0f135c64: /* f135c64: 27bd0018 */ addiu $sp,$sp,0x18 diff --git a/src/game/game_1371b0.c b/src/game/game_1371b0.c index 290058c06..b02fdd817 100644 --- a/src/game/game_1371b0.c +++ b/src/game/game_1371b0.c @@ -4432,8 +4432,8 @@ glabel var7f1b5930 /* f13aeb0: 00000000 */ sll $zero,$zero,0x0 /* f13aeb4: 0fc4e0e3 */ jal func0f13838c /* f13aeb8: 2404ffff */ addiu $a0,$zero,-1 -/* f13aebc: 3c018008 */ lui $at,0x8008 -/* f13aec0: ac20f6d4 */ sw $zero,-0x92c($at) +/* f13aebc: 3c018008 */ lui $at,%hi(var8007f6d4) +/* f13aec0: ac20f6d4 */ sw $zero,%lo(var8007f6d4)($at) .L0f13aec4: /* f13aec4: 3c06800a */ lui $a2,%hi(var800a416c) /* f13aec8: 24c6416c */ addiu $a2,$a2,%lo(var800a416c) @@ -4573,8 +4573,8 @@ glabel var7f1b5948 /* f13b07c: 0fc54c77 */ jal func0f1531dc /* f13b080: 00002025 */ or $a0,$zero,$zero /* f13b084: 240e0001 */ addiu $t6,$zero,0x1 -/* f13b088: 3c018008 */ lui $at,0x8008 -/* f13b08c: ac2efac0 */ sw $t6,-0x540($at) +/* f13b088: 3c018008 */ lui $at,%hi(var8007fac0) +/* f13b08c: ac2efac0 */ sw $t6,%lo(var8007fac0)($at) /* f13b090: 0c002ca0 */ jal func0000b280 /* f13b094: 02002025 */ or $a0,$s0,$zero /* f13b098: 0c002c74 */ jal func0000b1d0 @@ -4637,10 +4637,10 @@ glabel var7f1b5948 /* f13b178: 240a0001 */ addiu $t2,$zero,0x1 /* f13b17c: 24642ef0 */ addiu $a0,$v1,0x2ef0 /* f13b180: 15000007 */ bnez $t0,.L0f13b1a0 -/* f13b184: 3c018008 */ lui $at,0x8008 +/* f13b184: 3c018008 */ lui $at,%hi(var8007f6dc) /* f13b188: acaa0000 */ sw $t2,0x0($a1) /* f13b18c: 0fc3cde9 */ jal func0f0f37a4 -/* f13b190: ac20f6dc */ sw $zero,-0x924($at) +/* f13b190: ac20f6dc */ sw $zero,%lo(var8007f6dc)($at) /* f13b194: 3c07800a */ lui $a3,%hi(var800a4170) /* f13b198: 24e74170 */ addiu $a3,$a3,%lo(var800a4170) /* f13b19c: 8ce30000 */ lw $v1,0x0($a3) @@ -4704,7 +4704,7 @@ glabel var7f1b5948 /* f13b278: e70a3430 */ swc1 $f10,0x3430($t8) /* f13b27c: 8cf90000 */ lw $t9,0x0($a3) /* f13b280: c4305948 */ lwc1 $f16,%lo(var7f1b5948)($at) -/* f13b284: 3c018008 */ lui $at,0x8008 +/* f13b284: 3c018008 */ lui $at,%hi(var8007f6dc) /* f13b288: e7303434 */ swc1 $f16,0x3434($t9) /* f13b28c: 8cea0000 */ lw $t2,0x0($a3) /* f13b290: ad482efc */ sw $t0,0x2efc($t2) @@ -4715,7 +4715,7 @@ glabel var7f1b5948 /* f13b2a4: 8ce90000 */ lw $t1,0x0($a3) /* f13b2a8: ad2034a4 */ sw $zero,0x34a4($t1) /* f13b2ac: 8ce50000 */ lw $a1,0x0($a3) -/* f13b2b0: ac22f6dc */ sw $v0,-0x924($at) +/* f13b2b0: ac22f6dc */ sw $v0,%lo(var8007f6dc)($at) /* f13b2b4: 0fc3ce2c */ jal func0f0f38b0 /* f13b2b8: 24a52ef0 */ addiu $a1,$a1,0x2ef0 /* f13b2bc: 3c0e0102 */ lui $t6,0x102 @@ -4830,8 +4830,8 @@ glabel var7f1b5948 /* f13b45c: 3405ffcf */ dli $a1,0xffcf /* f13b460: 10400013 */ beqz $v0,.L0f13b4b0 /* f13b464: 240d0026 */ addiu $t5,$zero,0x26 -/* f13b468: 3c018006 */ lui $at,0x8006 -/* f13b46c: ac2d24e4 */ sw $t5,0x24e4($at) +/* f13b468: 3c018006 */ lui $at,%hi(var800624e4) +/* f13b46c: ac2d24e4 */ sw $t5,%lo(var800624e4)($at) /* f13b470: 0fc068d5 */ jal setNumPlayers /* f13b474: 24040001 */ addiu $a0,$zero,0x1 /* f13b478: 3c048006 */ lui $a0,%hi(var800624e4) @@ -4873,9 +4873,9 @@ glabel var7f1b5954 /* f13b4d0: 27bdffc8 */ addiu $sp,$sp,-56 /* f13b4d4: ac20416c */ sw $zero,%lo(var800a416c)($at) /* f13b4d8: afbf0034 */ sw $ra,0x34($sp) -/* f13b4dc: 3c018008 */ lui $at,0x8008 +/* f13b4dc: 3c018008 */ lui $at,%hi(var8007f130) /* f13b4e0: afb00030 */ sw $s0,0x30($sp) -/* f13b4e4: ac20f130 */ sw $zero,-0xed0($at) +/* f13b4e4: ac20f130 */ sw $zero,%lo(var8007f130)($at) /* f13b4e8: 24044240 */ addiu $a0,$zero,0x4240 /* f13b4ec: 0c0048f2 */ jal malloc /* f13b4f0: 24050004 */ addiu $a1,$zero,0x4 @@ -4945,7 +4945,7 @@ glabel var7f1b5954 /* f13b5f0: 8e0e0000 */ lw $t6,0x0($s0) /* f13b5f4: c4305954 */ lwc1 $f16,%lo(var7f1b5954)($at) /* f13b5f8: 2484f134 */ addiu $a0,$a0,%lo(var8007f134) -/* f13b5fc: 3c018008 */ lui $at,0x8008 +/* f13b5fc: 3c018008 */ lui $at,%hi(var8007f138) /* f13b600: e5d0340c */ swc1 $f16,0x340c($t6) /* f13b604: 8e0f0000 */ lw $t7,0x0($s0) /* f13b608: e5e0343c */ swc1 $f0,0x343c($t7) @@ -4956,7 +4956,7 @@ glabel var7f1b5954 /* f13b61c: af383468 */ sw $t8,0x3468($t9) /* f13b620: 8c830000 */ lw $v1,0x0($a0) /* f13b624: 10600007 */ beqz $v1,.L0f13b644 -/* f13b628: ac23f138 */ sw $v1,-0xec8($at) +/* f13b628: ac23f138 */ sw $v1,%lo(var8007f138)($at) /* f13b62c: 8e080000 */ lw $t0,0x0($s0) /* f13b630: ac800000 */ sw $zero,0x0($a0) /* f13b634: 24090474 */ addiu $t1,$zero,0x474 @@ -4976,7 +4976,7 @@ glabel var7f1b5954 GLOBAL_ASM( glabel func0f13b660 /* f13b660: 240e0001 */ addiu $t6,$zero,0x1 -/* f13b664: 3c018008 */ lui $at,0x8008 +/* f13b664: 3c018008 */ lui $at,%hi(var8007f134) /* f13b668: 03e00008 */ jr $ra -/* f13b66c: ac2ef134 */ sw $t6,-0xecc($at) +/* f13b66c: ac2ef134 */ sw $t6,%lo(var8007f134)($at) ); diff --git a/src/game/game_13b670.c b/src/game/game_13b670.c index 6ecfa2754..fc2b015b8 100644 --- a/src/game/game_13b670.c +++ b/src/game/game_13b670.c @@ -847,8 +847,8 @@ glabel func0f13c07c /* f13c1e8: 1020003d */ beqz $at,.L0f13c2e0 /* f13c1ec: 00056880 */ sll $t5,$a1,0x2 /* f13c1f0: 8d2e0000 */ lw $t6,0x0($t1) -/* f13c1f4: 3c198008 */ lui $t9,0x8008 -/* f13c1f8: 8f2ff6e4 */ lw $t7,-0x91c($t9) +/* f13c1f4: 3c198008 */ lui $t9,%hi(var8007f6e4) +/* f13c1f8: 8f2ff6e4 */ lw $t7,%lo(var8007f6e4)($t9) /* f13c1fc: 01cd3821 */ addu $a3,$t6,$t5 /* f13c200: 90ed0000 */ lbu $t5,0x0($a3) /* f13c204: 000f7040 */ sll $t6,$t7,0x1 @@ -945,10 +945,10 @@ glabel func0f13c2e8 /* f13c348: 3c028008 */ lui $v0,%hi(var8007f6e4) /* f13c34c: 2442f6e4 */ addiu $v0,$v0,%lo(var8007f6e4) /* f13c350: 8c580000 */ lw $t8,0x0($v0) -/* f13c354: 3c018008 */ lui $at,0x8008 +/* f13c354: 3c018008 */ lui $at,%hi(var8007f6ec) /* f13c358: 50980003 */ beql $a0,$t8,.L0f13c368 /* f13c35c: ac440000 */ sw $a0,0x0($v0) -/* f13c360: ac20f6ec */ sw $zero,-0x914($at) +/* f13c360: ac20f6ec */ sw $zero,%lo(var8007f6ec)($at) /* f13c364: ac440000 */ sw $a0,0x0($v0) .L0f13c368: /* f13c368: 03e00008 */ jr $ra @@ -979,17 +979,17 @@ glabel func0f13c370 .L0f13c3b8: /* f13c3b8: 3c19800a */ lui $t9,%hi(var800a4194) /* f13c3bc: 8f394194 */ lw $t9,%lo(var800a4194)($t9) -/* f13c3c0: 3c018008 */ lui $at,0x8008 +/* f13c3c0: 3c018008 */ lui $at,%hi(var8007f6e8) /* f13c3c4: 2408ffff */ addiu $t0,$zero,-1 /* f13c3c8: 13200008 */ beqz $t9,.L0f13c3ec /* f13c3cc: 00000000 */ sll $zero,$zero,0x0 -/* f13c3d0: ac20f6e8 */ sw $zero,-0x918($at) -/* f13c3d4: 3c018008 */ lui $at,0x8008 -/* f13c3d8: ac20f6ec */ sw $zero,-0x914($at) -/* f13c3dc: 3c018008 */ lui $at,0x8008 -/* f13c3e0: ac24f6e0 */ sw $a0,-0x920($at) -/* f13c3e4: 3c018008 */ lui $at,0x8008 -/* f13c3e8: ac28f6e4 */ sw $t0,-0x91c($at) +/* f13c3d0: ac20f6e8 */ sw $zero,%lo(var8007f6e8)($at) +/* f13c3d4: 3c018008 */ lui $at,%hi(var8007f6ec) +/* f13c3d8: ac20f6ec */ sw $zero,%lo(var8007f6ec)($at) +/* f13c3dc: 3c018008 */ lui $at,%hi(var8007f6e0) +/* f13c3e0: ac24f6e0 */ sw $a0,%lo(var8007f6e0)($at) +/* f13c3e4: 3c018008 */ lui $at,%hi(var8007f6e4) +/* f13c3e8: ac28f6e4 */ sw $t0,%lo(var8007f6e4)($at) .L0f13c3ec: /* f13c3ec: 03e00008 */ jr $ra /* f13c3f0: 00000000 */ sll $zero,$zero,0x0 @@ -998,18 +998,18 @@ glabel func0f13c370 GLOBAL_ASM( glabel func0f13c3f4 /* f13c3f4: 2402ffff */ addiu $v0,$zero,-1 -/* f13c3f8: 3c018008 */ lui $at,0x8008 -/* f13c3fc: ac22f6e0 */ sw $v0,-0x920($at) -/* f13c400: 3c018008 */ lui $at,0x8008 -/* f13c404: ac22f6e4 */ sw $v0,-0x91c($at) -/* f13c408: 3c018008 */ lui $at,0x8008 -/* f13c40c: ac20f6e8 */ sw $zero,-0x918($at) -/* f13c410: 3c018008 */ lui $at,0x8008 -/* f13c414: ac20f6f0 */ sw $zero,-0x910($at) -/* f13c418: 3c018008 */ lui $at,0x8008 -/* f13c41c: ac20f6f4 */ sw $zero,-0x90c($at) -/* f13c420: 3c018008 */ lui $at,0x8008 -/* f13c424: ac20f6f8 */ sw $zero,-0x908($at) +/* f13c3f8: 3c018008 */ lui $at,%hi(var8007f6e0) +/* f13c3fc: ac22f6e0 */ sw $v0,%lo(var8007f6e0)($at) +/* f13c400: 3c018008 */ lui $at,%hi(var8007f6e4) +/* f13c404: ac22f6e4 */ sw $v0,%lo(var8007f6e4)($at) +/* f13c408: 3c018008 */ lui $at,%hi(var8007f6e8) +/* f13c40c: ac20f6e8 */ sw $zero,%lo(var8007f6e8)($at) +/* f13c410: 3c018008 */ lui $at,%hi(var8007f6f0) +/* f13c414: ac20f6f0 */ sw $zero,%lo(var8007f6f0)($at) +/* f13c418: 3c018008 */ lui $at,%hi(var8007f6f4) +/* f13c41c: ac20f6f4 */ sw $zero,%lo(var8007f6f4)($at) +/* f13c420: 3c018008 */ lui $at,%hi(var8007f6f8) +/* f13c424: ac20f6f8 */ sw $zero,%lo(var8007f6f8)($at) /* f13c428: 3c01800a */ lui $at,%hi(var800a4180) /* f13c42c: 240e04b0 */ addiu $t6,$zero,0x4b0 /* f13c430: 3c06800a */ lui $a2,%hi(var800a4184) diff --git a/src/game/game_141820.c b/src/game/game_141820.c index 4bde33c15..afa949ea6 100644 --- a/src/game/game_141820.c +++ b/src/game/game_141820.c @@ -7899,24 +7899,24 @@ glabel func0f14886c GLOBAL_ASM( glabel func0f148b40 -/* f148b40: 3c018008 */ lui $at,0x8008 -/* f148b44: ac20f840 */ sw $zero,-0x7c0($at) -/* f148b48: 3c018008 */ lui $at,0x8008 -/* f148b4c: a020f848 */ sb $zero,-0x7b8($at) +/* f148b40: 3c018008 */ lui $at,%hi(var8007f840) +/* f148b44: ac20f840 */ sw $zero,%lo(var8007f840)($at) +/* f148b48: 3c018008 */ lui $at,%hi(var8007f848) +/* f148b4c: a020f848 */ sb $zero,%lo(var8007f848)($at) /* f148b50: 24010003 */ addiu $at,$zero,0x3 /* f148b54: 00047040 */ sll $t6,$a0,0x1 /* f148b58: 01c1001b */ divu $zero,$t6,$at /* f148b5c: 00007812 */ mflo $t7 -/* f148b60: 3c018008 */ lui $at,0x8008 +/* f148b60: 3c018008 */ lui $at,%hi(var8007f844) /* f148b64: 03e00008 */ jr $ra -/* f148b68: a02ff844 */ sb $t7,-0x7bc($at) +/* f148b68: a02ff844 */ sb $t7,%lo(var8007f844)($at) ); GLOBAL_ASM( glabel func0f148b6c -/* f148b6c: 3c018008 */ lui $at,0x8008 +/* f148b6c: 3c018008 */ lui $at,%hi(var8007f844) /* f148b70: 03e00008 */ jr $ra -/* f148b74: a020f844 */ sb $zero,-0x7bc($at) +/* f148b74: a020f844 */ sb $zero,%lo(var8007f844)($at) /* f148b78: 00000000 */ sll $zero,$zero,0x0 /* f148b7c: 00000000 */ sll $zero,$zero,0x0 ); diff --git a/src/game/game_1531a0.c b/src/game/game_1531a0.c index 019fba745..258f9ec90 100644 --- a/src/game/game_1531a0.c +++ b/src/game/game_1531a0.c @@ -44,22 +44,22 @@ glabel func0f1531a0 /* f1531a0: 03e00008 */ jr $ra /* f1531a4: 00000000 */ sll $zero,$zero,0x0 /* f1531a8: 00047023 */ negu $t6,$a0 -/* f1531ac: 3c018008 */ lui $at,0x8008 +/* f1531ac: 3c018008 */ lui $at,%hi(var8007fac4) /* f1531b0: 03e00008 */ jr $ra -/* f1531b4: ac2efac4 */ sw $t6,-0x53c($at) +/* f1531b4: ac2efac4 */ sw $t6,%lo(var8007fac4)($at) ); GLOBAL_ASM( glabel func0f1531b8 -/* f1531b8: 3c018008 */ lui $at,0x8008 +/* f1531b8: 3c018008 */ lui $at,%hi(var8007fac8) /* f1531bc: 03e00008 */ jr $ra -/* f1531c0: ac24fac8 */ sw $a0,-0x538($at) -/* f1531c4: 3c018008 */ lui $at,0x8008 +/* f1531c0: ac24fac8 */ sw $a0,%lo(var8007fac8)($at) +/* f1531c4: 3c018008 */ lui $at,%hi(var8007facc) /* f1531c8: 03e00008 */ jr $ra -/* f1531cc: ac24facc */ sw $a0,-0x534($at) -/* f1531d0: 3c018008 */ lui $at,0x8008 +/* f1531cc: ac24facc */ sw $a0,%lo(var8007facc)($at) +/* f1531d0: 3c018008 */ lui $at,%hi(var8007fad4) /* f1531d4: 03e00008 */ jr $ra -/* f1531d8: ac24fad4 */ sw $a0,-0x52c($at) +/* f1531d8: ac24fad4 */ sw $a0,%lo(var8007fad4)($at) ); GLOBAL_ASM( @@ -67,12 +67,12 @@ glabel func0f1531dc /* f1531dc: 10800005 */ beqz $a0,.L0f1531f4 /* f1531e0: 240f0001 */ addiu $t7,$zero,0x1 /* f1531e4: 240e0002 */ addiu $t6,$zero,0x2 -/* f1531e8: 3c018008 */ lui $at,0x8008 +/* f1531e8: 3c018008 */ lui $at,%hi(var8007fad0) /* f1531ec: 03e00008 */ jr $ra -/* f1531f0: ac2efad0 */ sw $t6,-0x530($at) +/* f1531f0: ac2efad0 */ sw $t6,%lo(var8007fad0)($at) .L0f1531f4: -/* f1531f4: 3c018008 */ lui $at,0x8008 -/* f1531f8: ac2ffad0 */ sw $t7,-0x530($at) +/* f1531f4: 3c018008 */ lui $at,%hi(var8007fad0) +/* f1531f8: ac2ffad0 */ sw $t7,%lo(var8007fad0)($at) /* f1531fc: 03e00008 */ jr $ra /* f153200: 00000000 */ sll $zero,$zero,0x0 ); @@ -146,69 +146,69 @@ glabel func0f153204 GLOBAL_ASM( glabel func0f1532ec -/* f1532ec: 3c018008 */ lui $at,0x8008 +/* f1532ec: 3c018008 */ lui $at,%hi(var8007faec) /* f1532f0: 3c068008 */ lui $a2,%hi(var8007faf4) -/* f1532f4: ac20faec */ sw $zero,-0x514($at) +/* f1532f4: ac20faec */ sw $zero,%lo(var8007faec)($at) /* f1532f8: 24c6faf4 */ addiu $a2,$a2,%lo(var8007faf4) /* f1532fc: acc00000 */ sw $zero,0x0($a2) -/* f153300: 3c018008 */ lui $at,0x8008 -/* f153304: ac20fafc */ sw $zero,-0x504($at) -/* f153308: 3c018008 */ lui $at,0x8008 -/* f15330c: ac20fb04 */ sw $zero,-0x4fc($at) -/* f153310: 3c018008 */ lui $at,0x8008 -/* f153314: ac20fb0c */ sw $zero,-0x4f4($at) -/* f153318: 3c018008 */ lui $at,0x8008 -/* f15331c: ac20fb14 */ sw $zero,-0x4ec($at) -/* f153320: 3c018008 */ lui $at,0x8008 -/* f153324: ac20fb1c */ sw $zero,-0x4e4($at) -/* f153328: 3c018008 */ lui $at,0x8008 -/* f15332c: ac20fb24 */ sw $zero,-0x4dc($at) -/* f153330: 3c018008 */ lui $at,0x8008 -/* f153334: ac20fb2c */ sw $zero,-0x4d4($at) -/* f153338: 3c018008 */ lui $at,0x8008 -/* f15333c: ac20fb34 */ sw $zero,-0x4cc($at) -/* f153340: 3c018008 */ lui $at,0x8008 +/* f153300: 3c018008 */ lui $at,%hi(var8007fafc) +/* f153304: ac20fafc */ sw $zero,%lo(var8007fafc)($at) +/* f153308: 3c018008 */ lui $at,%hi(var8007fb04) +/* f15330c: ac20fb04 */ sw $zero,%lo(var8007fb04)($at) +/* f153310: 3c018008 */ lui $at,%hi(var8007fb0c) +/* f153314: ac20fb0c */ sw $zero,%lo(var8007fb0c)($at) +/* f153318: 3c018008 */ lui $at,%hi(var8007fb14) +/* f15331c: ac20fb14 */ sw $zero,%lo(var8007fb14)($at) +/* f153320: 3c018008 */ lui $at,%hi(var8007fb1c) +/* f153324: ac20fb1c */ sw $zero,%lo(var8007fb1c)($at) +/* f153328: 3c018008 */ lui $at,%hi(var8007fb24) +/* f15332c: ac20fb24 */ sw $zero,%lo(var8007fb24)($at) +/* f153330: 3c018008 */ lui $at,%hi(var8007fb2c) +/* f153334: ac20fb2c */ sw $zero,%lo(var8007fb2c)($at) +/* f153338: 3c018008 */ lui $at,%hi(var8007fb34) +/* f15333c: ac20fb34 */ sw $zero,%lo(var8007fb34)($at) +/* f153340: 3c018008 */ lui $at,%hi(var8007faf0) /* f153344: 3c078008 */ lui $a3,%hi(var8007faf8) -/* f153348: ac20faf0 */ sw $zero,-0x510($at) +/* f153348: ac20faf0 */ sw $zero,%lo(var8007faf0)($at) /* f15334c: 24e7faf8 */ addiu $a3,$a3,%lo(var8007faf8) /* f153350: ace00000 */ sw $zero,0x0($a3) -/* f153354: 3c018008 */ lui $at,0x8008 -/* f153358: ac20fb00 */ sw $zero,-0x500($at) -/* f15335c: 3c018008 */ lui $at,0x8008 -/* f153360: ac20fb08 */ sw $zero,-0x4f8($at) -/* f153364: 3c018008 */ lui $at,0x8008 -/* f153368: ac20fb10 */ sw $zero,-0x4f0($at) -/* f15336c: 3c018008 */ lui $at,0x8008 -/* f153370: ac20fb18 */ sw $zero,-0x4e8($at) -/* f153374: 3c018008 */ lui $at,0x8008 -/* f153378: ac20fb20 */ sw $zero,-0x4e0($at) -/* f15337c: 3c018008 */ lui $at,0x8008 -/* f153380: ac20fb28 */ sw $zero,-0x4d8($at) -/* f153384: 3c018008 */ lui $at,0x8008 -/* f153388: ac20fb30 */ sw $zero,-0x4d0($at) -/* f15338c: 3c018008 */ lui $at,0x8008 -/* f153390: ac20fb38 */ sw $zero,-0x4c8($at) -/* f153394: 3c018008 */ lui $at,0x8008 -/* f153398: ac20fac4 */ sw $zero,-0x53c($at) -/* f15339c: 3c018008 */ lui $at,0x8008 -/* f1533a0: ac20fac8 */ sw $zero,-0x538($at) -/* f1533a4: 3c018008 */ lui $at,0x8008 -/* f1533a8: ac20facc */ sw $zero,-0x534($at) -/* f1533ac: 3c018008 */ lui $at,0x8008 +/* f153354: 3c018008 */ lui $at,%hi(var8007fb00) +/* f153358: ac20fb00 */ sw $zero,%lo(var8007fb00)($at) +/* f15335c: 3c018008 */ lui $at,%hi(var8007fb08) +/* f153360: ac20fb08 */ sw $zero,%lo(var8007fb08)($at) +/* f153364: 3c018008 */ lui $at,%hi(var8007fb10) +/* f153368: ac20fb10 */ sw $zero,%lo(var8007fb10)($at) +/* f15336c: 3c018008 */ lui $at,%hi(var8007fb18) +/* f153370: ac20fb18 */ sw $zero,%lo(var8007fb18)($at) +/* f153374: 3c018008 */ lui $at,%hi(var8007fb20) +/* f153378: ac20fb20 */ sw $zero,%lo(var8007fb20)($at) +/* f15337c: 3c018008 */ lui $at,%hi(var8007fb28) +/* f153380: ac20fb28 */ sw $zero,%lo(var8007fb28)($at) +/* f153384: 3c018008 */ lui $at,%hi(var8007fb30) +/* f153388: ac20fb30 */ sw $zero,%lo(var8007fb30)($at) +/* f15338c: 3c018008 */ lui $at,%hi(var8007fb38) +/* f153390: ac20fb38 */ sw $zero,%lo(var8007fb38)($at) +/* f153394: 3c018008 */ lui $at,%hi(var8007fac4) +/* f153398: ac20fac4 */ sw $zero,%lo(var8007fac4)($at) +/* f15339c: 3c018008 */ lui $at,%hi(var8007fac8) +/* f1533a0: ac20fac8 */ sw $zero,%lo(var8007fac8)($at) +/* f1533a4: 3c018008 */ lui $at,%hi(var8007facc) +/* f1533a8: ac20facc */ sw $zero,%lo(var8007facc)($at) +/* f1533ac: 3c018008 */ lui $at,%hi(var8007fad4) /* f1533b0: 240effff */ addiu $t6,$zero,-1 -/* f1533b4: ac2efad4 */ sw $t6,-0x52c($at) -/* f1533b8: 3c018008 */ lui $at,0x8008 -/* f1533bc: ac20fad8 */ sw $zero,-0x528($at) -/* f1533c0: 3c018008 */ lui $at,0x8008 -/* f1533c4: ac20fadc */ sw $zero,-0x524($at) -/* f1533c8: 3c018008 */ lui $at,0x8008 -/* f1533cc: ac20fae0 */ sw $zero,-0x520($at) -/* f1533d0: 3c018008 */ lui $at,0x8008 -/* f1533d4: ac20fae4 */ sw $zero,-0x51c($at) +/* f1533b4: ac2efad4 */ sw $t6,%lo(var8007fad4)($at) +/* f1533b8: 3c018008 */ lui $at,%hi(var8007fad8) +/* f1533bc: ac20fad8 */ sw $zero,%lo(var8007fad8)($at) +/* f1533c0: 3c018008 */ lui $at,%hi(var8007fadc) +/* f1533c4: ac20fadc */ sw $zero,%lo(var8007fadc)($at) +/* f1533c8: 3c018008 */ lui $at,%hi(var8007fae0) +/* f1533cc: ac20fae0 */ sw $zero,%lo(var8007fae0)($at) +/* f1533d0: 3c018008 */ lui $at,%hi(var8007fae4) +/* f1533d4: ac20fae4 */ sw $zero,%lo(var8007fae4)($at) /* f1533d8: 3c02800a */ lui $v0,%hi(g_Vars+0x4b4) /* f1533dc: 8c42a474 */ lw $v0,%lo(g_Vars+0x4b4)($v0) -/* f1533e0: 3c018008 */ lui $at,0x8008 -/* f1533e4: ac20fae8 */ sw $zero,-0x518($at) +/* f1533e0: 3c018008 */ lui $at,%hi(var8007fae8) +/* f1533e4: ac20fae8 */ sw $zero,%lo(var8007fae8)($at) /* f1533e8: 27bdffe0 */ addiu $sp,$sp,-32 /* f1533ec: 2401005a */ addiu $at,$zero,0x5a /* f1533f0: 14410021 */ bne $v0,$at,.L0f153478 @@ -655,8 +655,8 @@ glabel func0f153ab0 /* f153ab8: 00808025 */ or $s0,$a0,$zero /* f153abc: afbf001c */ sw $ra,0x1c($sp) /* f153ac0: 240e0001 */ addiu $t6,$zero,0x1 -/* f153ac4: 3c018008 */ lui $at,0x8008 -/* f153ac8: ac2efb9c */ sw $t6,-0x464($at) +/* f153ac4: 3c018008 */ lui $at,%hi(var8007fb9c) +/* f153ac8: ac2efb9c */ sw $t6,%lo(var8007fb9c)($at) /* f153acc: 0fc59e7d */ jal func0f1679f4 /* f153ad0: 24041090 */ addiu $a0,$zero,0x1090 /* f153ad4: 3c05800a */ lui $a1,%hi(var800a4634) @@ -680,10 +680,10 @@ glabel func0f153ab0 /* f153b1c: 8fbf001c */ lw $ra,0x1c($sp) /* f153b20: ac224634 */ sw $v0,%lo(var800a4634)($at) /* f153b24: 02001025 */ or $v0,$s0,$zero -/* f153b28: 3c018008 */ lui $at,0x8008 +/* f153b28: 3c018008 */ lui $at,%hi(var8007fba4) /* f153b2c: 2408ffff */ addiu $t0,$zero,-1 /* f153b30: 8fb00018 */ lw $s0,0x18($sp) -/* f153b34: ac28fba4 */ sw $t0,-0x45c($at) +/* f153b34: ac28fba4 */ sw $t0,%lo(var8007fba4)($at) /* f153b38: 03e00008 */ jr $ra /* f153b3c: 27bd0020 */ addiu $sp,$sp,0x20 ); @@ -691,9 +691,9 @@ glabel func0f153ab0 GLOBAL_ASM( glabel func0f153b40 /* f153b40: 3c04800a */ lui $a0,%hi(var800a4634) -/* f153b44: 3c018008 */ lui $at,0x8008 +/* f153b44: 3c018008 */ lui $at,%hi(var8007fb9c) /* f153b48: 24844634 */ addiu $a0,$a0,%lo(var800a4634) -/* f153b4c: ac20fb9c */ sw $zero,-0x464($at) +/* f153b4c: ac20fb9c */ sw $zero,%lo(var8007fb9c)($at) /* f153b50: 8c830000 */ lw $v1,0x0($a0) /* f153b54: 3c0fb800 */ lui $t7,0xb800 /* f153b58: 246e0008 */ addiu $t6,$v1,0x8 @@ -732,7 +732,7 @@ glabel func0f153b6c /* f153bcc: 3c03800a */ lui $v1,%hi(var800a45d0) /* f153bd0: 246345d0 */ addiu $v1,$v1,%lo(var800a45d0) /* f153bd4: 8c79000c */ lw $t9,0xc($v1) -/* f153bd8: 3c018008 */ lui $at,0x8008 +/* f153bd8: 3c018008 */ lui $at,%hi(var8007fba0) /* f153bdc: 8fa40018 */ lw $a0,0x18($sp) /* f153be0: 44998000 */ mtc1 $t9,$f16 /* f153be4: 00000000 */ sll $zero,$zero,0x0 @@ -741,13 +741,13 @@ glabel func0f153b6c /* f153bf0: 4600310d */ trunc.w.s $f4,$f6 /* f153bf4: 44092000 */ mfc1 $t1,$f4 /* f153bf8: 10000003 */ beqz $zero,.L0f153c08 -/* f153bfc: ac29fba0 */ sw $t1,-0x460($at) +/* f153bfc: ac29fba0 */ sw $t1,%lo(var8007fba0)($at) .L0f153c00: -/* f153c00: 3c018008 */ lui $at,0x8008 -/* f153c04: ac20fba0 */ sw $zero,-0x460($at) +/* f153c00: 3c018008 */ lui $at,%hi(var8007fba0) +/* f153c04: ac20fba0 */ sw $zero,%lo(var8007fba0)($at) .L0f153c08: -/* f153c08: 3c018008 */ lui $at,0x8008 -/* f153c0c: ac24fba4 */ sw $a0,-0x45c($at) +/* f153c08: 3c018008 */ lui $at,%hi(var8007fba4) +/* f153c0c: ac24fba4 */ sw $a0,%lo(var8007fba4)($at) .L0f153c10: /* f153c10: 8fbf0014 */ lw $ra,0x14($sp) /* f153c14: 27bd0018 */ addiu $sp,$sp,0x18 @@ -3260,9 +3260,9 @@ glabel func0f15568c GLOBAL_ASM( glabel func0f156024 -/* f156024: 3c018008 */ lui $at,0x8008 +/* f156024: 3c018008 */ lui $at,%hi(var8007fbd8) /* f156028: 03e00008 */ jr $ra -/* f15602c: ac24fbd8 */ sw $a0,-0x428($at) +/* f15602c: ac24fbd8 */ sw $a0,%lo(var8007fbd8)($at) ); GLOBAL_ASM( diff --git a/src/game/game_157db0.c b/src/game/game_157db0.c index 4772809a4..24a665a09 100644 --- a/src/game/game_157db0.c +++ b/src/game/game_157db0.c @@ -2924,7 +2924,7 @@ glabel func0f15a6f4 /* f15a6f4: 27bdfcc8 */ addiu $sp,$sp,-824 /* f15a6f8: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) /* f15a6fc: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) -/* f15a700: 3c018008 */ lui $at,0x8008 +/* f15a700: 3c018008 */ lui $at,%hi(var8007fc14) /* f15a704: afbf003c */ sw $ra,0x3c($sp) /* f15a708: afb60038 */ sw $s6,0x38($sp) /* f15a70c: afb50034 */ sw $s5,0x34($sp) @@ -2933,7 +2933,7 @@ glabel func0f15a6f4 /* f15a718: afb20028 */ sw $s2,0x28($sp) /* f15a71c: afb10024 */ sw $s1,0x24($sp) /* f15a720: afb00020 */ sw $s0,0x20($sp) -/* f15a724: ac20fc14 */ sw $zero,-0x3ec($at) +/* f15a724: ac20fc14 */ sw $zero,%lo(var8007fc14)($at) /* f15a728: 95cf0010 */ lhu $t7,0x10($t6) /* f15a72c: 3c13800a */ lui $s3,%hi(g_Vars+0x4b4) /* f15a730: 24010001 */ addiu $at,$zero,0x1 @@ -3604,9 +3604,9 @@ glabel func0f15a6f4 /* f15b0bc: 860d0000 */ lh $t5,0x0($s0) /* f15b0c0: 028e7821 */ addu $t7,$s4,$t6 /* f15b0c4: 24580001 */ addiu $t8,$v0,0x1 -/* f15b0c8: 3c018008 */ lui $at,0x8008 +/* f15b0c8: 3c018008 */ lui $at,%hi(var8007fc14) /* f15b0cc: a5ed0000 */ sh $t5,0x0($t7) -/* f15b0d0: ac38fc14 */ sw $t8,-0x3ec($at) +/* f15b0d0: ac38fc14 */ sw $t8,%lo(var8007fc14)($at) .L0f15b0d4: /* f15b0d4: 2673fffe */ addiu $s3,$s3,-2 .L0f15b0d8: @@ -3700,13 +3700,13 @@ glabel func0f15b1c4 .L0f15b200: /* f15b200: 3c198008 */ lui $t9,%hi(g_StageIndex) /* f15b204: 8f39fc00 */ lw $t9,%lo(g_StageIndex)($t9) -/* f15b208: 3c048008 */ lui $a0,0x8008 +/* f15b208: 3c048008 */ lui $a0,%hi(g_Stages+0x8) /* f15b20c: 8fa50018 */ lw $a1,0x18($sp) /* f15b210: 001940c0 */ sll $t0,$t9,0x3 /* f15b214: 01194023 */ subu $t0,$t0,$t9 /* f15b218: 000840c0 */ sll $t0,$t0,0x3 /* f15b21c: 00882021 */ addu $a0,$a0,$t0 -/* f15b220: 9484fcc8 */ lhu $a0,-0x338($a0) +/* f15b220: 9484fcc8 */ lhu $a0,%lo(g_Stages+0x8)($a0) /* f15b224: 0fc59bfc */ jal func0f166ff0 /* f15b228: 8fa6001c */ lw $a2,0x1c($sp) /* f15b22c: 8fbf0014 */ lw $ra,0x14($sp) @@ -3937,9 +3937,9 @@ glabel func0f15b534 /* f15b534: 3c0f8009 */ lui $t7,%hi(g_Is4Mb) /* f15b538: 91ef0af0 */ lbu $t7,%lo(g_Is4Mb)($t7) /* f15b53c: 240e0008 */ addiu $t6,$zero,0x8 -/* f15b540: 3c018008 */ lui $at,0x8008 +/* f15b540: 3c018008 */ lui $at,%hi(var8007fc0c) /* f15b544: 27bdff40 */ addiu $sp,$sp,-192 -/* f15b548: a42efc0c */ sh $t6,-0x3f4($at) +/* f15b548: a42efc0c */ sh $t6,%lo(var8007fc0c)($at) /* f15b54c: 24010001 */ addiu $at,$zero,0x1 /* f15b550: afbf001c */ sw $ra,0x1c($sp) /* f15b554: afb10018 */ sw $s1,0x18($sp) @@ -4006,11 +4006,11 @@ glabel func0f15b534 /* f15b63c: 24e6001e */ addiu $a2,$a3,0x1e /* f15b640: ac620000 */ sw $v0,0x0($v1) /* f15b644: 3964000f */ xori $a0,$t3,0xf -/* f15b648: 3c018006 */ lui $at,0x8006 +/* f15b648: 3c018006 */ lui $at,%hi(var8005d9a0) /* f15b64c: 240d0001 */ addiu $t5,$zero,0x1 /* f15b650: 34ce000f */ ori $t6,$a2,0xf /* f15b654: 00808025 */ or $s0,$a0,$zero -/* f15b658: a02dd9a0 */ sb $t5,-0x2660($at) +/* f15b658: a02dd9a0 */ sb $t5,%lo(var8005d9a0)($at) /* f15b65c: 39c6000f */ xori $a2,$t6,0xf /* f15b660: 0fc56c71 */ jal func0f15b1c4 /* f15b664: 00002825 */ or $a1,$zero,$zero @@ -5238,9 +5238,9 @@ glabel var7f1b75d0 /* f15c7f8: 0fc597b9 */ jal func0f165ee4 /* f15c7fc: 8fa40148 */ lw $a0,0x148($sp) /* f15c800: 241900c8 */ addiu $t9,$zero,0xc8 -/* f15c804: 3c018008 */ lui $at,0x8008 +/* f15c804: 3c018008 */ lui $at,%hi(var8007fc10) /* f15c808: 0fc04d54 */ jal func0f013550 -/* f15c80c: a439fc10 */ sh $t9,-0x3f0($at) +/* f15c80c: a439fc10 */ sh $t9,%lo(var8007fc10)($at) /* f15c810: 0fc00aa6 */ jal func0f002a98 /* f15c814: 00000000 */ sll $zero,$zero,0x0 /* f15c818: 0fc00703 */ jal func0f001c0c @@ -5466,9 +5466,9 @@ glabel func0f15ca00 /* f15cabc: a48c0000 */ sh $t4,0x0($a0) /* f15cac0: 8c4d1ba0 */ lw $t5,0x1ba0($v0) .L0f15cac4: -/* f15cac4: 3c018008 */ lui $at,0x8008 +/* f15cac4: 3c018008 */ lui $at,%hi(var8007fc20) /* f15cac8: 0fc58f8d */ jal func0f163e34 -/* f15cacc: ac2dfc20 */ sw $t5,-0x3e0($at) +/* f15cacc: ac2dfc20 */ sw $t5,%lo(var8007fc20)($at) /* f15cad0: 8fbf0014 */ lw $ra,0x14($sp) /* f15cad4: 27bd0018 */ addiu $sp,$sp,0x18 /* f15cad8: 03e00008 */ jr $ra @@ -11892,11 +11892,11 @@ glabel func0f16254c /* f16254c: 3c058008 */ lui $a1,%hi(var8007fca8) /* f162550: 24a5fca8 */ addiu $a1,$a1,%lo(var8007fca8) /* f162554: 8ca30000 */ lw $v1,0x0($a1) -/* f162558: 3c018008 */ lui $at,0x8008 +/* f162558: 3c018008 */ lui $at,%hi(var8007fc58) /* f16255c: 00801025 */ or $v0,$a0,$zero /* f162560: 00037080 */ sll $t6,$v1,0x2 /* f162564: 002e0821 */ addu $at,$at,$t6 -/* f162568: ac24fc58 */ sw $a0,-0x3a8($at) +/* f162568: ac24fc58 */ sw $a0,%lo(var8007fc58)($at) /* f16256c: 24010014 */ addiu $at,$zero,0x14 /* f162570: 246f0001 */ addiu $t7,$v1,0x1 /* f162574: 01e1001a */ div $zero,$t7,$at @@ -11912,7 +11912,7 @@ glabel func0f162588 /* f16258c: 2484fca8 */ addiu $a0,$a0,%lo(var8007fca8) /* f162590: 8c8e0000 */ lw $t6,0x0($a0) /* f162594: 24010014 */ addiu $at,$zero,0x14 -/* f162598: 3c038008 */ lui $v1,0x8008 +/* f162598: 3c038008 */ lui $v1,%hi(var8007fc58) /* f16259c: 25cf0013 */ addiu $t7,$t6,0x13 /* f1625a0: 01e1001a */ div $zero,$t7,$at /* f1625a4: 0000c010 */ mfhi $t8 @@ -11920,7 +11920,7 @@ glabel func0f162588 /* f1625ac: 00681821 */ addu $v1,$v1,$t0 /* f1625b0: ac980000 */ sw $t8,0x0($a0) /* f1625b4: 03e00008 */ jr $ra -/* f1625b8: 8c62fc58 */ lw $v0,-0x3a8($v1) +/* f1625b8: 8c62fc58 */ lw $v0,%lo(var8007fc58)($v1) ); GLOBAL_ASM( @@ -12549,12 +12549,12 @@ GLOBAL_ASM( glabel func0f162cf0 /* f162cf0: 27bdffe0 */ addiu $sp,$sp,-32 /* f162cf4: 3c06800a */ lui $a2,%hi(g_Vars+0x284) -/* f162cf8: 3c018008 */ lui $at,0x8008 +/* f162cf8: 3c018008 */ lui $at,%hi(var8007fcac) /* f162cfc: afbf0014 */ sw $ra,0x14($sp) /* f162d00: 00803825 */ or $a3,$a0,$zero /* f162d04: 8cc6a244 */ lw $a2,%lo(g_Vars+0x284)($a2) /* f162d08: 14800003 */ bnez $a0,.L0f162d18 -/* f162d0c: ac20fcac */ sw $zero,-0x354($at) +/* f162d0c: ac20fcac */ sw $zero,%lo(var8007fcac)($at) /* f162d10: 1000001e */ beqz $zero,.L0f162d8c /* f162d14: 00801025 */ or $v0,$a0,$zero .L0f162d18: @@ -12690,7 +12690,7 @@ glabel func0f162d9c /* f162efc: 3c148008 */ lui $s4,%hi(var8007fc2c) /* f162f00: 2694fc2c */ addiu $s4,$s4,%lo(var8007fc2c) /* f162f04: 448e5000 */ mtc1 $t6,$f10 -/* f162f08: 3c018008 */ lui $at,0x8008 +/* f162f08: 3c018008 */ lui $at,%hi(var8007fc30) /* f162f0c: 3c06800a */ lui $a2,%hi(var800a4640) /* f162f10: 46805420 */ cvt.s.w $f16,$f10 /* f162f14: 24c64640 */ addiu $a2,$a2,%lo(var800a4640) @@ -12737,7 +12737,7 @@ glabel func0f162d9c /* f162fb8: e7aa00a4 */ swc1 $f10,0xa4($sp) /* f162fbc: c6c60028 */ lwc1 $f6,0x28($s6) /* f162fc0: ae800000 */ sw $zero,0x0($s4) -/* f162fc4: ac20fc30 */ sw $zero,-0x3d0($at) +/* f162fc4: ac20fc30 */ sw $zero,%lo(var8007fc30)($at) /* f162fc8: 8e0402bc */ lw $a0,0x2bc($s0) /* f162fcc: 46069201 */ sub.s $f8,$f18,$f6 /* f162fd0: a4d902d0 */ sh $t9,0x2d0($a2) @@ -13837,8 +13837,8 @@ glabel func0f163e34 /* f163f80: 24097fff */ addiu $t1,$zero,0x7fff /* f163f84: ac620000 */ sw $v0,0x0($v1) .L0f163f88: -/* f163f88: 3c018008 */ lui $at,0x8008 -/* f163f8c: ac20fc2c */ sw $zero,-0x3d4($at) +/* f163f88: 3c018008 */ lui $at,%hi(var8007fc2c) +/* f163f8c: ac20fc2c */ sw $zero,%lo(var8007fc2c)($at) /* f163f90: aca00000 */ sw $zero,0x0($a1) /* f163f94: 3c01800a */ lui $at,%hi(var800a4ce4+0x2) /* f163f98: a4204ce6 */ sh $zero,%lo(var800a4ce4+0x2)($at) diff --git a/src/game/game_1655c0.c b/src/game/game_1655c0.c index 490a5cbc4..a6d4f3b89 100644 --- a/src/game/game_1655c0.c +++ b/src/game/game_1655c0.c @@ -13,9 +13,9 @@ GLOBAL_ASM( glabel stageGetCurrent /* f1655c0: 3c068008 */ lui $a2,%hi(g_Stages) /* f1655c4: 24c3fcc0 */ addiu $v1,$a2,%lo(g_Stages) -/* f1655c8: 3c0e8008 */ lui $t6,0x8008 +/* f1655c8: 3c0e8008 */ lui $t6,%hi(g_Stages+0x1) /* f1655cc: 24620d58 */ addiu $v0,$v1,0xd58 -/* f1655d0: 25cefcc1 */ addiu $t6,$t6,-831 +/* f1655d0: 25cefcc1 */ addiu $t6,$t6,%lo(g_Stages+0x1) /* f1655d4: 3c05800a */ lui $a1,%hi(g_Vars+0x4b4) /* f1655d8: 004e082b */ sltu $at,$v0,$t6 /* f1655dc: 1420000a */ bnez $at,.L0f165608 @@ -41,9 +41,9 @@ GLOBAL_ASM( glabel stageGetIndex /* f165614: 3c078008 */ lui $a3,%hi(g_Stages) /* f165618: 24e2fcc0 */ addiu $v0,$a3,%lo(g_Stages) -/* f16561c: 3c0e8008 */ lui $t6,0x8008 +/* f16561c: 3c0e8008 */ lui $t6,%hi(g_Stages+0x1) /* f165620: 24430d58 */ addiu $v1,$v0,0xd58 -/* f165624: 25cefcc1 */ addiu $t6,$t6,-831 +/* f165624: 25cefcc1 */ addiu $t6,$t6,%lo(g_Stages+0x1) /* f165628: 006e082b */ sltu $at,$v1,$t6 /* f16562c: 1420000a */ bnez $at,.L0f165658 /* f165630: 00003025 */ or $a2,$zero,$zero diff --git a/src/game/game_165670.c b/src/game/game_165670.c index 2d6f9555c..fde9d987b 100644 --- a/src/game/game_165670.c +++ b/src/game/game_165670.c @@ -1046,7 +1046,7 @@ glabel func0f1664a0 /* f1664b4: 00801025 */ or $v0,$a0,$zero .L0f1664b8: /* f1664b8: 10a0003d */ beqz $a1,.L0f1665b0 -/* f1664bc: 3c078008 */ lui $a3,%hi(var80081058) +/* f1664bc: 3c078008 */ lui $a3,0x8008 /* f1664c0: 3c078008 */ lui $a3,%hi(var80081058) /* f1664c4: 00801025 */ or $v0,$a0,$zero /* f1664c8: 3c0ff800 */ lui $t7,0xf800 @@ -1114,7 +1114,7 @@ glabel func0f1664a0 .L0f1665b0: /* f1665b0: 00801025 */ or $v0,$a0,$zero /* f1665b4: 3c08f800 */ lui $t0,0xf800 -/* f1665b8: 24e71058 */ addiu $a3,$a3,%lo(var80081058) +/* f1665b8: 24e71058 */ addiu $a3,$a3,4184 /* f1665bc: ac480000 */ sw $t0,0x0($v0) /* f1665c0: 90e9000a */ lbu $t1,0xa($a3) /* f1665c4: 90f80009 */ lbu $t8,0x9($a3) diff --git a/src/game/game_166e40.c b/src/game/game_166e40.c index 234f4aa12..99790336e 100644 --- a/src/game/game_166e40.c +++ b/src/game/game_166e40.c @@ -318,10 +318,10 @@ glabel func0f1670fc /* f1671e4: 03e00008 */ jr $ra /* f1671e8: 27bd0030 */ addiu $sp,$sp,0x30 /* f1671ec: 00047080 */ sll $t6,$a0,0x2 -/* f1671f0: 3c018008 */ lui $at,0x8008 +/* f1671f0: 3c018008 */ lui $at,%hi(filetable) /* f1671f4: 002e0821 */ addu $at,$at,$t6 /* f1671f8: 03e00008 */ jr $ra -/* f1671fc: ac202060 */ sw $zero,0x2060($at) +/* f1671fc: ac202060 */ sw $zero,%lo(filetable)($at) ); GLOBAL_ASM( @@ -555,9 +555,9 @@ glabel func0f167350 /* f1674d8: 03197021 */ addu $t6,$t8,$t9 /* f1674dc: 00087880 */ sll $t7,$t0,0x2 /* f1674e0: 01cfc021 */ addu $t8,$t6,$t7 -/* f1674e4: 3c018008 */ lui $at,0x8008 +/* f1674e4: 3c018008 */ lui $at,%hi(filetable+0x1f7c) /* f1674e8: 00380821 */ addu $at,$at,$t8 -/* f1674ec: ac2d3fdc */ sw $t5,0x3fdc($at) +/* f1674ec: ac2d3fdc */ sw $t5,%lo(filetable+0x1f7c)($at) .L0f1674f0: /* f1674f0: 3c057f1b */ lui $a1,%hi(var7f1b7718) /* f1674f4: 24a57718 */ addiu $a1,$a1,%lo(var7f1b7718) @@ -616,15 +616,15 @@ glabel func0f167350 /* f1675b4: 01edc821 */ addu $t9,$t7,$t5 /* f1675b8: 00097080 */ sll $t6,$t1,0x2 /* f1675bc: 032e7821 */ addu $t7,$t9,$t6 -/* f1675c0: 3c018008 */ lui $at,0x8008 +/* f1675c0: 3c018008 */ lui $at,%hi(var80083fec) /* f1675c4: 002f0821 */ addu $at,$at,$t7 /* f1675c8: 3c0a800a */ lui $t2,%hi(g_Vars) /* f1675cc: 0002c280 */ sll $t8,$v0,0xa -/* f1675d0: ac383fec */ sw $t8,0x3fec($at) +/* f1675d0: ac383fec */ sw $t8,%lo(var80083fec)($at) /* f1675d4: 254a9fc0 */ addiu $t2,$t2,%lo(g_Vars) .L0f1675d8: /* f1675d8: 8d4d006c */ lw $t5,0x6c($t2) -/* f1675dc: 3c048008 */ lui $a0,0x8008 +/* f1675dc: 3c048008 */ lui $a0,%hi(filetable+0x1f7c) /* f1675e0: 51a00004 */ beqzl $t5,.L0f1675f4 /* f1675e4: 00004025 */ or $t0,$zero,$zero /* f1675e8: 10000002 */ beqz $zero,.L0f1675f4 @@ -660,7 +660,7 @@ glabel func0f167350 /* f167650: 00087880 */ sll $t7,$t0,0x2 /* f167654: 030f6821 */ addu $t5,$t8,$t7 /* f167658: 008d2021 */ addu $a0,$a0,$t5 -/* f16765c: 8c843fdc */ lw $a0,0x3fdc($a0) +/* f16765c: 8c843fdc */ lw $a0,%lo(filetable+0x1f7c)($a0) /* f167660: 24050004 */ addiu $a1,$zero,0x4 /* f167664: 0004c840 */ sll $t9,$a0,0x1 /* f167668: 0c0048f2 */ jal malloc @@ -705,9 +705,9 @@ glabel func0f167350 /* f1676f0: 01edc821 */ addu $t9,$t7,$t5 /* f1676f4: 00087080 */ sll $t6,$t0,0x2 /* f1676f8: 032ec021 */ addu $t8,$t9,$t6 -/* f1676fc: 3c0f8008 */ lui $t7,0x8008 +/* f1676fc: 3c0f8008 */ lui $t7,%hi(filetable+0x1f7c) /* f167700: 01f87821 */ addu $t7,$t7,$t8 -/* f167704: 8def3fdc */ lw $t7,0x3fdc($t7) +/* f167704: 8def3fdc */ lw $t7,%lo(filetable+0x1f7c)($t7) /* f167708: 8ccd0000 */ lw $t5,0x0($a2) /* f16770c: 01edc821 */ addu $t9,$t7,$t5 /* f167710: 10800003 */ beqz $a0,.L0f167720 @@ -742,9 +742,9 @@ glabel func0f167350 /* f167768: 01edc821 */ addu $t9,$t7,$t5 /* f16776c: 00087080 */ sll $t6,$t0,0x2 /* f167770: 032ec021 */ addu $t8,$t9,$t6 -/* f167774: 3c0f8008 */ lui $t7,0x8008 +/* f167774: 3c0f8008 */ lui $t7,%hi(filetable+0x1f7c) /* f167778: 01f87821 */ addu $t7,$t7,$t8 -/* f16777c: 8def3fdc */ lw $t7,0x3fdc($t7) +/* f16777c: 8def3fdc */ lw $t7,%lo(filetable+0x1f7c)($t7) /* f167780: 8ccd0004 */ lw $t5,0x4($a2) /* f167784: 01edc821 */ addu $t9,$t7,$t5 /* f167788: 10800003 */ beqz $a0,.L0f167798 @@ -974,9 +974,9 @@ glabel func0f167a18 /* f167a54: 240a0002 */ addiu $t2,$zero,0x2 /* f167a58: ac39a59c */ sw $t9,%lo(var800aa59c)($at) /* f167a5c: 8ca30000 */ lw $v1,0x0($a1) -/* f167a60: 3c018008 */ lui $at,0x8008 +/* f167a60: 3c018008 */ lui $at,%hi(var80084000) /* f167a64: 00380821 */ addu $at,$at,$t8 -/* f167a68: ac234000 */ sw $v1,0x4000($at) +/* f167a68: ac234000 */ sw $v1,%lo(var80084000)($at) /* f167a6c: 2401ffff */ addiu $at,$zero,-1 /* f167a70: 24680001 */ addiu $t0,$v1,0x1 /* f167a74: 15010002 */ bne $t0,$at,.L0f167a80 diff --git a/src/game/game_167ae0.c b/src/game/game_167ae0.c index 365a9efe5..a26acea49 100644 --- a/src/game/game_167ae0.c +++ b/src/game/game_167ae0.c @@ -193,7 +193,7 @@ glabel func0f167b84 /* f167bd4: 00195080 */ sll $t2,$t9,0x2 /* f167bd8: 3c01bf80 */ lui $at,0xbf80 /* f167bdc: 44812000 */ mtc1 $at,$f4 -/* f167be0: 3c058008 */ lui $a1,0x8008 +/* f167be0: 3c058008 */ lui $a1,%hi(var80084044+0x2) /* f167be4: 00aa2821 */ addu $a1,$a1,$t2 /* f167be8: 00021880 */ sll $v1,$v0,0x2 /* f167bec: 240bffff */ addiu $t3,$zero,-1 @@ -204,7 +204,7 @@ glabel func0f167b84 /* f167c00: afab0010 */ sw $t3,0x10($sp) /* f167c04: 01233021 */ addu $a2,$t1,$v1 /* f167c08: afa30028 */ sw $v1,0x28($sp) -/* f167c0c: 84a54046 */ lh $a1,0x4046($a1) +/* f167c0c: 84a54046 */ lh $a1,%lo(var80084044+0x2)($a1) /* f167c10: 8c845200 */ lw $a0,%lo(var80095200)($a0) /* f167c14: 2407ffff */ addiu $a3,$zero,-1 /* f167c18: 0c004241 */ jal func00010904 @@ -2130,9 +2130,9 @@ glabel var7f1b7868 /* f169c0c: 244d0001 */ addiu $t5,$v0,0x1 /* f169c10: ae7e0320 */ sw $s8,0x320($s3) .L0f169c14: -/* f169c14: 3c018008 */ lui $at,0x8008 +/* f169c14: 3c018008 */ lui $at,%hi(var80084050) /* f169c18: 1000001d */ beqz $zero,.L0f169c90 -/* f169c1c: ac2d4050 */ sw $t5,0x4050($at) +/* f169c1c: ac2d4050 */ sw $t5,%lo(var80084050)($at) /* f169c20: 8e700284 */ lw $s0,0x284($s3) .L0f169c24: /* f169c24: 3c0a8007 */ lui $t2,%hi(var80075d60) @@ -2463,7 +2463,7 @@ glabel var7f1b7868 /* f16a0c8: 8e700284 */ lw $s0,0x284($s3) .L0f16a0cc: /* f16a0cc: 17c30032 */ bne $s8,$v1,.L0f16a198 -/* f16a0d0: 3c188008 */ lui $t8,%hi(var80084088) +/* f16a0d0: 3c188008 */ lui $t8,%hi(g_Stages+0x33f) /* f16a0d4: 8e0a0490 */ lw $t2,0x490($s0) /* f16a0d8: 3c048009 */ lui $a0,0x8009 /* f16a0dc: 24058052 */ addiu $a1,$zero,-32686 @@ -2484,7 +2484,7 @@ glabel var7f1b7868 /* f16a118: 00002825 */ or $a1,$zero,$zero /* f16a11c: 8e180490 */ lw $t8,0x490($s0) /* f16a120: 27a700e0 */ addiu $a3,$sp,0xe0 -/* f16a124: 2719ffff */ addiu $t9,$t8,-1 +/* f16a124: 2719ffff */ addiu $t9,$t8,%lo(g_Stages+0x33f) /* f16a128: ae190490 */ sw $t9,0x490($s0) /* f16a12c: 8e700284 */ lw $s0,0x284($s3) /* f16a130: 8e0b0480 */ lw $t3,0x480($s0) @@ -2516,7 +2516,7 @@ glabel var7f1b7868 /* f16a190: 10000020 */ beqz $zero,.L0f16a214 /* f16a194: 8e700284 */ lw $s0,0x284($s3) .L0f16a198: -/* f16a198: 27184088 */ addiu $t8,$t8,%lo(var80084088) +/* f16a198: 27184088 */ addiu $t8,$t8,16520 /* f16a19c: 8f010000 */ lw $at,0x0($t8) /* f16a1a0: 27aa00d4 */ addiu $t2,$sp,0xd4 /* f16a1a4: 8f0c0004 */ lw $t4,0x4($t8) @@ -2842,20 +2842,20 @@ glabel var7f1b7868 /* f16a660: 3c0a8008 */ lui $t2,%hi(var8008409c) /* f16a664: 8d4a409c */ lw $t2,%lo(var8008409c)($t2) /* f16a668: 8e780000 */ lw $t8,0x0($s3) -/* f16a66c: 3c018008 */ lui $at,0x8008 +/* f16a66c: 3c018008 */ lui $at,%hi(var8008409c) /* f16a670: 01587023 */ subu $t6,$t2,$t8 /* f16a674: 05c1000b */ bgez $t6,.L0f16a6a4 -/* f16a678: ac2e409c */ sw $t6,0x409c($at) +/* f16a678: ac2e409c */ sw $t6,%lo(var8008409c)($at) /* f16a67c: 0c004b70 */ jal random /* f16a680: 00000000 */ sll $zero,$zero,0x0 /* f16a684: 240100c8 */ addiu $at,$zero,0xc8 /* f16a688: 0041001b */ divu $zero,$v0,$at /* f16a68c: 00007810 */ mfhi $t7 /* f16a690: 25ed0028 */ addiu $t5,$t7,0x28 -/* f16a694: 3c018008 */ lui $at,0x8008 -/* f16a698: ac2d409c */ sw $t5,0x409c($at) -/* f16a69c: 3c018008 */ lui $at,0x8008 -/* f16a6a0: a02040a0 */ sb $zero,0x40a0($at) +/* f16a694: 3c018008 */ lui $at,%hi(var8008409c) +/* f16a698: ac2d409c */ sw $t5,%lo(var8008409c)($at) +/* f16a69c: 3c018008 */ lui $at,%hi(var800840a0) +/* f16a6a0: a02040a0 */ sb $zero,%lo(var800840a0)($at) .L0f16a6a4: /* f16a6a4: 02402025 */ or $a0,$s2,$zero /* f16a6a8: 2405ffff */ addiu $a1,$zero,-1 @@ -2870,10 +2870,10 @@ glabel var7f1b7868 /* f16a6cc: 00000000 */ sll $zero,$zero,0x0 /* f16a6d0: 916b40a0 */ lbu $t3,%lo(var800840a0)($t3) /* f16a6d4: 24190001 */ addiu $t9,$zero,0x1 -/* f16a6d8: 3c018008 */ lui $at,0x8008 +/* f16a6d8: 3c018008 */ lui $at,%hi(var800840a0) /* f16a6dc: 1560000b */ bnez $t3,.L0f16a70c /* f16a6e0: 3c048009 */ lui $a0,%hi(var80095200) -/* f16a6e4: a03940a0 */ sb $t9,0x40a0($at) +/* f16a6e4: a03940a0 */ sb $t9,%lo(var800840a0)($at) /* f16a6e8: 8c845200 */ lw $a0,%lo(var80095200)($a0) /* f16a6ec: 2405059e */ addiu $a1,$zero,0x59e /* f16a6f0: 00003025 */ or $a2,$zero,$zero @@ -4125,9 +4125,9 @@ glabel getEffectiveSlowMotion /* f16b894: 24a29fe0 */ addiu $v0,$a1,%lo(var80059fe0) /* f16b898: 11cf000d */ beq $t6,$t7,.L0f16b8d0 /* f16b89c: 3c09800a */ lui $t1,%hi(g_Vars+0x318) -/* f16b8a0: 3c188006 */ lui $t8,0x8006 +/* f16b8a0: 3c188006 */ lui $t8,%hi(var80059fe0+0x1) /* f16b8a4: 24431000 */ addiu $v1,$v0,0x1000 -/* f16b8a8: 27189fe1 */ addiu $t8,$t8,-24607 +/* f16b8a8: 27189fe1 */ addiu $t8,$t8,%lo(var80059fe0+0x1) /* f16b8ac: 0078082b */ sltu $at,$v1,$t8 /* f16b8b0: 14200007 */ bnez $at,.L0f16b8d0 /* f16b8b4: 00000000 */ sll $zero,$zero,0x0 @@ -4855,7 +4855,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,%hi(var800624b0) +/* f16c208: 3c028006 */ lui $v0,0x8006 /* f16c20c: 8e0e0000 */ lw $t6,0x0($s0) /* f16c210: 15c0006f */ bnez $t6,.L0f16c3d0 /* f16c214: 00000000 */ sll $zero,$zero,0x0 @@ -4971,7 +4971,7 @@ glabel func0f16b96c /* f16c3c8: 10000003 */ beqz $zero,.L0f16c3d8 /* f16c3cc: ac400000 */ sw $zero,0x0($v0) .L0f16c3d0: -/* f16c3d0: 244224b0 */ addiu $v0,$v0,%lo(var800624b0) +/* f16c3d0: 244224b0 */ addiu $v0,$v0,9392 /* f16c3d4: ac400000 */ sw $zero,0x0($v0) .L0f16c3d8: /* f16c3d8: 8e8d0318 */ lw $t5,0x318($s4) @@ -4985,10 +4985,10 @@ glabel func0f16b96c /* f16c3f8: 10200111 */ beqz $at,.L0f16c840 /* f16c3fc: 00000000 */ sll $zero,$zero,0x0 /* f16c400: 8cc64028 */ lw $a2,%lo(g_MpTimeLimit)($a2) -/* f16c404: 3c028008 */ lui $v0,0x8008 +/* f16c404: 3c028008 */ lui $v0,%hi(g_MpTimeElapsed) /* f16c408: 58c00077 */ blezl $a2,.L0f16c5e8 /* f16c40c: 8e8d0034 */ lw $t5,0x34($s4) -/* f16c410: 8c534024 */ lw $s3,0x4024($v0) +/* f16c410: 8c534024 */ lw $s3,%lo(g_MpTimeElapsed)($v0) /* f16c414: 8e8f0038 */ lw $t7,0x38($s4) /* f16c418: 24c3f1f0 */ addiu $v1,$a2,-3600 /* f16c41c: 0263082a */ slt $at,$s3,$v1 @@ -5297,11 +5297,11 @@ glabel func0f16b96c /* f16c840: 3c198008 */ lui $t9,%hi(g_MpTimeElapsed) /* f16c844: 8f394024 */ lw $t9,%lo(g_MpTimeElapsed)($t9) /* f16c848: 8e8d0038 */ lw $t5,0x38($s4) -/* f16c84c: 3c018008 */ lui $at,0x8008 +/* f16c84c: 3c018008 */ lui $at,%hi(g_MpTimeElapsed) /* f16c850: 24040001 */ addiu $a0,$zero,0x1 /* f16c854: 032d6021 */ addu $t4,$t9,$t5 /* f16c858: 448c4000 */ mtc1 $t4,$f8 -/* f16c85c: ac2c4024 */ sw $t4,0x4024($at) +/* f16c85c: ac2c4024 */ sw $t4,%lo(g_MpTimeElapsed)($at) /* f16c860: 3c014270 */ lui $at,0x4270 /* f16c864: 468042a0 */ cvt.s.w $f10,$f8 /* f16c868: 44818000 */ mtc1 $at,$f16 diff --git a/src/game/game_16cfa0.c b/src/game/game_16cfa0.c index 12a82eb0c..30310b8c9 100644 --- a/src/game/game_16cfa0.c +++ b/src/game/game_16cfa0.c @@ -81,8 +81,8 @@ glabel func0f16cfe8 /* f16d070: 1615fff3 */ bne $s0,$s5,.L0f16d040 /* f16d074: 26310010 */ addiu $s1,$s1,0x10 /* f16d078: 8fbf0034 */ lw $ra,0x34($sp) -/* f16d07c: 3c018008 */ lui $at,0x8008 -/* f16d080: a43640ec */ sh $s6,0x40ec($at) +/* f16d07c: 3c018008 */ lui $at,%hi(var800840ec) +/* f16d080: a43640ec */ sh $s6,%lo(var800840ec)($at) /* f16d084: 8fb60030 */ lw $s6,0x30($sp) /* f16d088: 8fb00018 */ lw $s0,0x18($sp) /* f16d08c: 8fb1001c */ lw $s1,0x1c($sp) @@ -315,19 +315,19 @@ glabel func0f16d324 /* f16d380: 00000000 */ sll $zero,$zero,0x0 /* f16d384: 0fc5b513 */ jal func0f16d44c /* f16d388: 00000000 */ sll $zero,$zero,0x0 -/* f16d38c: 3c018008 */ lui $at,0x8008 -/* f16d390: ac2040e8 */ sw $zero,0x40e8($at) -/* f16d394: 3c018008 */ lui $at,0x8008 -/* f16d398: ac2040f0 */ sw $zero,0x40f0($at) +/* f16d38c: 3c018008 */ lui $at,%hi(var800840e8) +/* f16d390: ac2040e8 */ sw $zero,%lo(var800840e8)($at) +/* f16d394: 3c018008 */ lui $at,%hi(var800840f0) +/* f16d398: ac2040f0 */ sw $zero,%lo(var800840f0)($at) /* f16d39c: 2402ffff */ addiu $v0,$zero,-1 -/* f16d3a0: 3c018008 */ lui $at,0x8008 -/* f16d3a4: ac2240c0 */ sw $v0,0x40c0($at) -/* f16d3a8: 3c018008 */ lui $at,0x8008 -/* f16d3ac: ac2240c8 */ sw $v0,0x40c8($at) -/* f16d3b0: 3c018008 */ lui $at,0x8008 -/* f16d3b4: ac2240cc */ sw $v0,0x40cc($at) -/* f16d3b8: 3c018008 */ lui $at,0x8008 -/* f16d3bc: ac2040d8 */ sw $zero,0x40d8($at) +/* f16d3a0: 3c018008 */ lui $at,%hi(var800840c0) +/* f16d3a4: ac2240c0 */ sw $v0,%lo(var800840c0)($at) +/* f16d3a8: 3c018008 */ lui $at,%hi(var800840c8) +/* f16d3ac: ac2240c8 */ sw $v0,%lo(var800840c8)($at) +/* f16d3b0: 3c018008 */ lui $at,%hi(var800840cc) +/* f16d3b4: ac2240cc */ sw $v0,%lo(var800840cc)($at) +/* f16d3b8: 3c018008 */ lui $at,%hi(var800840d8) +/* f16d3bc: ac2040d8 */ sw $zero,%lo(var800840d8)($at) .L0f16d3c0: /* f16d3c0: 8fbf0014 */ lw $ra,0x14($sp) /* f16d3c4: 27bd0018 */ addiu $sp,$sp,0x18 @@ -353,10 +353,10 @@ glabel func0f16d3d0 /* f16d404: a4400018 */ sh $zero,0x18($v0) /* f16d408: a4400016 */ sh $zero,0x16($v0) /* f16d40c: 24190001 */ addiu $t9,$zero,0x1 -/* f16d410: 3c018008 */ lui $at,0x8008 +/* f16d410: 3c018008 */ lui $at,%hi(var800840c4) /* f16d414: a4430014 */ sh $v1,0x14($v0) /* f16d418: 0c004643 */ jal func0001190c -/* f16d41c: ac3940c4 */ sw $t9,0x40c4($at) +/* f16d41c: ac3940c4 */ sw $t9,%lo(var800840c4)($at) /* f16d420: 8fbf0014 */ lw $ra,0x14($sp) /* f16d424: 27bd0018 */ addiu $sp,$sp,0x18 /* f16d428: 03e00008 */ jr $ra @@ -368,8 +368,8 @@ glabel func0f16d430 /* f16d430: 3c028008 */ lui $v0,%hi(var800840e0) /* f16d434: 244240e0 */ addiu $v0,$v0,%lo(var800840e0) /* f16d438: 8c4e0000 */ lw $t6,0x0($v0) -/* f16d43c: 3c018008 */ lui $at,0x8008 -/* f16d440: ac2e40d0 */ sw $t6,0x40d0($at) +/* f16d43c: 3c018008 */ lui $at,%hi(var800840d0) +/* f16d440: ac2e40d0 */ sw $t6,%lo(var800840d0)($at) /* f16d444: 03e00008 */ jr $ra /* f16d448: ac400000 */ sw $zero,0x0($v0) ); @@ -771,10 +771,10 @@ glabel func0f16d91c .L0f16d990: /* f16d990: 8fbf0014 */ lw $ra,0x14($sp) /* f16d994: 8fb80018 */ lw $t8,0x18($sp) -/* f16d998: 3c018008 */ lui $at,0x8008 +/* f16d998: 3c018008 */ lui $at,%hi(var800840c0) /* f16d99c: 27bd0018 */ addiu $sp,$sp,0x18 /* f16d9a0: 03e00008 */ jr $ra -/* f16d9a4: ac3840c0 */ sw $t8,0x40c0($at) +/* f16d9a4: ac3840c0 */ sw $t8,%lo(var800840c0)($at) ); GLOBAL_ASM( @@ -849,8 +849,8 @@ glabel func0f16da2c /* f16da80: 0fc5b627 */ jal func0f16d89c /* f16da84: 00000000 */ sll $zero,$zero,0x0 /* f16da88: 240f0001 */ addiu $t7,$zero,0x1 -/* f16da8c: 3c018008 */ lui $at,0x8008 -/* f16da90: ac2f40d8 */ sw $t7,0x40d8($at) +/* f16da8c: 3c018008 */ lui $at,%hi(var800840d8) +/* f16da90: ac2f40d8 */ sw $t7,%lo(var800840d8)($at) .L0f16da94: /* f16da94: 8fbf0014 */ lw $ra,0x14($sp) .L0f16da98: @@ -884,8 +884,8 @@ glabel func0f16daa4 /* f16daf4: 0fc5b52e */ jal func0f16d4b8 /* f16daf8: 00000000 */ sll $zero,$zero,0x0 .L0f16dafc: -/* f16dafc: 3c018008 */ lui $at,0x8008 -/* f16db00: ac2040d8 */ sw $zero,0x40d8($at) +/* f16dafc: 3c018008 */ lui $at,%hi(var800840d8) +/* f16db00: ac2040d8 */ sw $zero,%lo(var800840d8)($at) /* f16db04: 8fbf0014 */ lw $ra,0x14($sp) .L0f16db08: /* f16db08: 27bd0018 */ addiu $sp,$sp,0x18 @@ -933,8 +933,8 @@ glabel func0f16db3c /* f16db8c: 8fbf0014 */ lw $ra,0x14($sp) .L0f16db90: /* f16db90: 240effff */ addiu $t6,$zero,-1 -/* f16db94: 3c018008 */ lui $at,0x8008 -/* f16db98: ac2e40c0 */ sw $t6,0x40c0($at) +/* f16db94: 3c018008 */ lui $at,%hi(var800840c0) +/* f16db98: ac2e40c0 */ sw $t6,%lo(var800840c0)($at) /* f16db9c: 03e00008 */ jr $ra /* f16dba0: 27bd0018 */ addiu $sp,$sp,0x18 ); @@ -944,9 +944,9 @@ glabel func0f16dba4 /* f16dba4: 27bdffe0 */ addiu $sp,$sp,-32 /* f16dba8: afbf0014 */ sw $ra,0x14($sp) /* f16dbac: 240e0001 */ addiu $t6,$zero,0x1 -/* f16dbb0: 3c018008 */ lui $at,0x8008 +/* f16dbb0: 3c018008 */ lui $at,%hi(var800840e8) /* f16dbb4: 0fc5b50c */ jal func0f16d430 -/* f16dbb8: ac2e40e8 */ sw $t6,0x40e8($at) +/* f16dbb8: ac2e40e8 */ sw $t6,%lo(var800840e8)($at) /* f16dbbc: 0fc5b490 */ jal func0f16d240 /* f16dbc0: 24040003 */ addiu $a0,$zero,0x3 /* f16dbc4: 0fc5b490 */ jal func0f16d240 @@ -1080,12 +1080,12 @@ glabel func0f16dd14 /* f16dd7c: 0fc5b71e */ jal func0f16dc78 /* f16dd80: 00000000 */ sll $zero,$zero,0x0 /* f16dd84: 240f04b0 */ addiu $t7,$zero,0x4b0 -/* f16dd88: 3c018008 */ lui $at,0x8008 -/* f16dd8c: ac2f40f0 */ sw $t7,0x40f0($at) -/* f16dd90: 3c018008 */ lui $at,0x8008 +/* f16dd88: 3c018008 */ lui $at,%hi(var800840f0) +/* f16dd8c: ac2f40f0 */ sw $t7,%lo(var800840f0)($at) +/* f16dd90: 3c018008 */ lui $at,%hi(var800840dc) /* f16dd94: 24180001 */ addiu $t8,$zero,0x1 /* f16dd98: 0fc5b513 */ jal func0f16d44c -/* f16dd9c: ac3840dc */ sw $t8,0x40dc($at) +/* f16dd9c: ac3840dc */ sw $t8,%lo(var800840dc)($at) /* f16dda0: 8fbf0014 */ lw $ra,0x14($sp) /* f16dda4: 27bd0018 */ addiu $sp,$sp,0x18 /* f16dda8: 03e00008 */ jr $ra @@ -1115,8 +1115,8 @@ glabel func0f16ddb0 /* f16ddf4: 00000000 */ sll $zero,$zero,0x0 /* f16ddf8: 8fbf0014 */ lw $ra,0x14($sp) .L0f16ddfc: -/* f16ddfc: 3c018008 */ lui $at,0x8008 -/* f16de00: ac2040dc */ sw $zero,0x40dc($at) +/* f16ddfc: 3c018008 */ lui $at,%hi(var800840dc) +/* f16de00: ac2040dc */ sw $zero,%lo(var800840dc)($at) /* f16de04: 03e00008 */ jr $ra /* f16de08: 27bd0018 */ addiu $sp,$sp,0x18 ); @@ -1180,8 +1180,8 @@ glabel func0f16deb8 /* f16dec4: 0fc5b490 */ jal func0f16d240 /* f16dec8: 24040001 */ addiu $a0,$zero,0x1 /* f16decc: 8fae0018 */ lw $t6,0x18($sp) -/* f16ded0: 3c018008 */ lui $at,0x8008 -/* f16ded4: ac2e40c8 */ sw $t6,0x40c8($at) +/* f16ded0: 3c018008 */ lui $at,%hi(var800840c8) +/* f16ded4: ac2e40c8 */ sw $t6,%lo(var800840c8)($at) /* f16ded8: 3c013f00 */ lui $at,0x3f00 /* f16dedc: 44816000 */ mtc1 $at,$f12 /* f16dee0: 0fc5b52e */ jal func0f16d4b8 @@ -1259,10 +1259,10 @@ glabel audioRestartDefaultTrack GLOBAL_ASM( glabel audioSetAuxTrack /* f16dfd0: 27bdffe8 */ addiu $sp,$sp,-24 -/* f16dfd4: 3c018008 */ lui $at,0x8008 +/* f16dfd4: 3c018008 */ lui $at,%hi(var800840cc) /* f16dfd8: afbf0014 */ sw $ra,0x14($sp) /* f16dfdc: afa40018 */ sw $a0,0x18($sp) -/* f16dfe0: ac2440cc */ sw $a0,0x40cc($at) +/* f16dfe0: ac2440cc */ sw $a0,%lo(var800840cc)($at) /* f16dfe4: 0fc5b490 */ jal func0f16d240 /* f16dfe8: 24040005 */ addiu $a0,$zero,0x5 /* f16dfec: 3c028006 */ lui $v0,%hi(g_SfxVolume) @@ -1290,8 +1290,8 @@ glabel audioRestartAuxTrack /* f16e02c: 27bdffe8 */ addiu $sp,$sp,-24 /* f16e030: afbf0014 */ sw $ra,0x14($sp) /* f16e034: 240effff */ addiu $t6,$zero,-1 -/* f16e038: 3c018008 */ lui $at,0x8008 -/* f16e03c: ac2e40cc */ sw $t6,0x40cc($at) +/* f16e038: 3c018008 */ lui $at,%hi(var800840cc) +/* f16e03c: ac2e40cc */ sw $t6,%lo(var800840cc)($at) /* f16e040: 0fc5b490 */ jal func0f16d240 /* f16e044: 24040005 */ addiu $a0,$zero,0x5 /* f16e048: 8fbf0014 */ lw $ra,0x14($sp) diff --git a/src/game/game_16e810.c b/src/game/game_16e810.c index 7a97da556..e3a287881 100644 --- a/src/game/game_16e810.c +++ b/src/game/game_16e810.c @@ -139,7 +139,7 @@ glabel func0f16e818 /* f16e9a8: 1640002a */ bnez $s2,.L0f16ea54 /* f16e9ac: afa21e7c */ sw $v0,0x1e7c($sp) /* f16e9b0: 8fd8000c */ lw $t8,0xc($s8) -/* f16e9b4: 3c0e8008 */ lui $t6,0x8008 +/* f16e9b4: 3c0e8008 */ lui $t6,%hi(var80084288) /* f16e9b8: a3170008 */ sb $s7,0x8($t8) /* f16e9bc: 8fc8000c */ lw $t0,0xc($s8) /* f16e9c0: a1020009 */ sb $v0,0x9($t0) @@ -149,10 +149,10 @@ glabel func0f16e818 /* f16e9d0: a12a000a */ sb $t2,0xa($t1) /* f16e9d4: 8fa41e8c */ lw $a0,0x1e8c($sp) /* f16e9d8: 8fc3000c */ lw $v1,0xc($s8) -/* f16e9dc: 3c0a8008 */ lui $t2,0x8008 +/* f16e9dc: 3c0a8008 */ lui $t2,%hi(var800842bc) /* f16e9e0: 00045880 */ sll $t3,$a0,0x2 /* f16e9e4: 01cb7021 */ addu $t6,$t6,$t3 -/* f16e9e8: 8dcc4288 */ lw $t4,0x4288($t6) +/* f16e9e8: 8dcc4288 */ lw $t4,%lo(var80084288)($t6) /* f16e9ec: 9078000b */ lbu $t8,0xb($v1) /* f16e9f0: 014b5021 */ addu $t2,$t2,$t3 /* f16e9f4: 000c6880 */ sll $t5,$t4,0x2 @@ -161,7 +161,7 @@ glabel func0f16e818 /* f16ea00: 01e8c825 */ or $t9,$t7,$t0 /* f16ea04: a079000b */ sb $t9,0xb($v1) /* f16ea08: 8fc3000c */ lw $v1,0xc($s8) -/* f16ea0c: 8d4942bc */ lw $t1,0x42bc($t2) +/* f16ea0c: 8d4942bc */ lw $t1,%lo(var800842bc)($t2) /* f16ea10: 01602025 */ or $a0,$t3,$zero /* f16ea14: 906e000b */ lbu $t6,0xb($v1) /* f16ea18: 312b0003 */ andi $t3,$t1,0x3 @@ -1699,7 +1699,7 @@ glabel var7f1b7a74 /* f16ff48: 15800026 */ bnez $t4,.L0f16ffe4 /* f16ff4c: 00000000 */ sll $zero,$zero,0x0 /* f16ff50: 8c8d000c */ lw $t5,0xc($a0) -/* f16ff54: 3c0f8008 */ lui $t7,0x8008 +/* f16ff54: 3c0f8008 */ lui $t7,%hi(var80084288) /* f16ff58: a1b60008 */ sb $s6,0x8($t5) /* f16ff5c: 8c8e000c */ lw $t6,0xc($a0) /* f16ff60: a1d70009 */ sb $s7,0x9($t6) @@ -1707,7 +1707,7 @@ glabel var7f1b7a74 /* f16ff68: 8c83000c */ lw $v1,0xc($a0) /* f16ff6c: 00145880 */ sll $t3,$s4,0x2 /* f16ff70: 01eb7821 */ addu $t7,$t7,$t3 -/* f16ff74: 8df84288 */ lw $t8,0x4288($t7) +/* f16ff74: 8df84288 */ lw $t8,%lo(var80084288)($t7) /* f16ff78: 906d000b */ lbu $t5,0xb($v1) /* f16ff7c: 0160a025 */ or $s4,$t3,$zero /* f16ff80: 0018c880 */ sll $t9,$t8,0x2 @@ -1716,9 +1716,9 @@ glabel var7f1b7a74 /* f16ff8c: 018e5825 */ or $t3,$t4,$t6 /* f16ff90: a06b000b */ sb $t3,0xb($v1) /* f16ff94: 8c83000c */ lw $v1,0xc($a0) -/* f16ff98: 3c0f8008 */ lui $t7,0x8008 +/* f16ff98: 3c0f8008 */ lui $t7,%hi(var800842bc) /* f16ff9c: 01f47821 */ addu $t7,$t7,$s4 -/* f16ffa0: 8df842bc */ lw $t8,0x42bc($t7) +/* f16ffa0: 8df842bc */ lw $t8,%lo(var800842bc)($t7) /* f16ffa4: 906d000b */ lbu $t5,0xb($v1) /* f16ffa8: 3c0b8008 */ lui $t3,%hi(var800842f0) /* f16ffac: 33190003 */ andi $t9,$t8,0x3 diff --git a/src/game/game_173a00.c b/src/game/game_173a00.c index c3a7dda77..52aa56b40 100644 --- a/src/game/game_173a00.c +++ b/src/game/game_173a00.c @@ -1811,10 +1811,10 @@ glabel func0f1751e4 /* f1752e4: 8fbf002c */ lw $ra,0x2c($sp) /* f1752e8: 26020008 */ addiu $v0,$s0,0x8 /* f1752ec: 240e0001 */ addiu $t6,$zero,0x1 -/* f1752f0: 3c018008 */ lui $at,0x8008 +/* f1752f0: 3c018008 */ lui $at,%hi(var800844d0) /* f1752f4: 8fb00024 */ lw $s0,0x24($sp) /* f1752f8: 8fb10028 */ lw $s1,0x28($sp) -/* f1752fc: ac2e44d0 */ sw $t6,0x44d0($at) +/* f1752fc: ac2e44d0 */ sw $t6,%lo(var800844d0)($at) /* f175300: 03e00008 */ jr $ra /* f175304: 27bd0038 */ addiu $sp,$sp,0x38 ); @@ -1914,11 +1914,11 @@ glabel func0f175308 /* f175468: 8fbf0034 */ lw $ra,0x34($sp) /* f17546c: 26020008 */ addiu $v0,$s0,0x8 /* f175470: 24190001 */ addiu $t9,$zero,0x1 -/* f175474: 3c018008 */ lui $at,0x8008 +/* f175474: 3c018008 */ lui $at,%hi(var800844d0) /* f175478: 8fb00028 */ lw $s0,0x28($sp) /* f17547c: 8fb20030 */ lw $s2,0x30($sp) /* f175480: 8fb1002c */ lw $s1,0x2c($sp) -/* f175484: ac3944d0 */ sw $t9,0x44d0($at) +/* f175484: ac3944d0 */ sw $t9,%lo(var800844d0)($at) /* f175488: 03e00008 */ jr $ra /* f17548c: 27bd0040 */ addiu $sp,$sp,0x40 ); @@ -2004,10 +2004,10 @@ glabel func0f175490 /* f1755b8: 8fbf002c */ lw $ra,0x2c($sp) /* f1755bc: 26020008 */ addiu $v0,$s0,0x8 /* f1755c0: 24180001 */ addiu $t8,$zero,0x1 -/* f1755c4: 3c018008 */ lui $at,0x8008 +/* f1755c4: 3c018008 */ lui $at,%hi(var800844d0) /* f1755c8: 8fb00024 */ lw $s0,0x24($sp) /* f1755cc: 8fb10028 */ lw $s1,0x28($sp) -/* f1755d0: ac3844d0 */ sw $t8,0x44d0($at) +/* f1755d0: ac3844d0 */ sw $t8,%lo(var800844d0)($at) /* f1755d4: 03e00008 */ jr $ra /* f1755d8: 27bd0038 */ addiu $sp,$sp,0x38 ); @@ -2033,8 +2033,8 @@ glabel func0f1755dc /* f17561c: ac400004 */ sw $zero,0x4($v0) /* f175620: 8fbf001c */ lw $ra,0x1c($sp) /* f175624: 24180001 */ addiu $t8,$zero,0x1 -/* f175628: 3c018008 */ lui $at,0x8008 -/* f17562c: ac3844d0 */ sw $t8,0x44d0($at) +/* f175628: 3c018008 */ lui $at,%hi(var800844d0) +/* f17562c: ac3844d0 */ sw $t8,%lo(var800844d0)($at) /* f175630: 27bd0020 */ addiu $sp,$sp,0x20 /* f175634: 03e00008 */ jr $ra /* f175638: 24420008 */ addiu $v0,$v0,0x8 @@ -2070,8 +2070,8 @@ glabel func0f17563c /* f1756a0: ac400004 */ sw $zero,0x4($v0) /* f1756a4: 8fbf001c */ lw $ra,0x1c($sp) /* f1756a8: 24080001 */ addiu $t0,$zero,0x1 -/* f1756ac: 3c018008 */ lui $at,0x8008 -/* f1756b0: ac2844d0 */ sw $t0,0x44d0($at) +/* f1756ac: 3c018008 */ lui $at,%hi(var800844d0) +/* f1756b0: ac2844d0 */ sw $t0,%lo(var800844d0)($at) /* f1756b4: 27bd0020 */ addiu $sp,$sp,0x20 /* f1756b8: 03e00008 */ jr $ra /* f1756bc: 24420008 */ addiu $v0,$v0,0x8 @@ -2130,7 +2130,7 @@ glabel var7f1b7c80 /* f1756d0: afb60048 */ sw $s6,0x48($sp) /* f1756d4: afb50044 */ sw $s5,0x44($sp) /* f1756d8: 240e0001 */ addiu $t6,$zero,0x1 -/* f1756dc: 3c018008 */ lui $at,0x8008 +/* f1756dc: 3c018008 */ lui $at,%hi(var800844d0) /* f1756e0: 000580c3 */ sra $s0,$a1,0x3 /* f1756e4: afb7004c */ sw $s7,0x4c($sp) /* f1756e8: afb40040 */ sw $s4,0x40($sp) @@ -2144,7 +2144,7 @@ glabel var7f1b7c80 /* f175708: 0000f025 */ or $s8,$zero,$zero /* f17570c: afa000e8 */ sw $zero,0xe8($sp) /* f175710: afa000e4 */ sw $zero,0xe4($sp) -/* f175714: ac2044d0 */ sw $zero,0x44d0($at) +/* f175714: ac2044d0 */ sw $zero,%lo(var800844d0)($at) /* f175718: afa000f4 */ sw $zero,0xf4($sp) /* f17571c: 0080a825 */ or $s5,$a0,$zero /* f175720: 00c0b025 */ or $s6,$a2,$zero @@ -2479,8 +2479,8 @@ glabel var7f1b7c80 /* f175bd8: 10000099 */ beqz $zero,.L0f175e40 /* f175bdc: aed8fffc */ sw $t8,-0x4($s6) .L0f175be0: -/* f175be0: 3c018008 */ lui $at,0x8008 -/* f175be4: ac2d44d0 */ sw $t5,0x44d0($at) +/* f175be0: 3c018008 */ lui $at,%hi(var800844d0) +/* f175be4: ac2d44d0 */ sw $t5,%lo(var800844d0)($at) /* f175be8: 8ea10000 */ lw $at,0x0($s5) /* f175bec: 26d60008 */ addiu $s6,$s6,0x8 /* f175bf0: 26b50008 */ addiu $s5,$s5,0x8 @@ -2602,8 +2602,8 @@ glabel var7f1b7c80 /* f175da0: 02f97821 */ addu $t7,$s7,$t9 /* f175da4: a1e40000 */ sb $a0,0x0($t7) .L0f175da8: -/* f175da8: 3c018008 */ lui $at,0x8008 -/* f175dac: ac2044d0 */ sw $zero,0x44d0($at) +/* f175da8: 3c018008 */ lui $at,%hi(var800844d0) +/* f175dac: ac2044d0 */ sw $zero,%lo(var800844d0)($at) /* f175db0: 8ea10000 */ lw $at,0x0($s5) /* f175db4: 26d60008 */ addiu $s6,$s6,0x8 /* f175db8: 26b50008 */ addiu $s5,$s5,0x8 diff --git a/src/game/game_176080.c b/src/game/game_176080.c index 5eba461d0..7c3a6ac6e 100644 --- a/src/game/game_176080.c +++ b/src/game/game_176080.c @@ -24,10 +24,10 @@ glabel func0f176080 GLOBAL_ASM( glabel func0f17608c -/* f17608c: 3c018008 */ lui $at,0x8008 -/* f176090: ac2044f0 */ sw $zero,0x44f0($at) -/* f176094: 3c018008 */ lui $at,0x8008 -/* f176098: ac2044f4 */ sw $zero,0x44f4($at) +/* f17608c: 3c018008 */ lui $at,%hi(var800844f0) +/* f176090: ac2044f0 */ sw $zero,%lo(var800844f0)($at) +/* f176094: 3c018008 */ lui $at,%hi(var800844f4) +/* f176098: ac2044f4 */ sw $zero,%lo(var800844f4)($at) /* f17609c: 27bdffe8 */ addiu $sp,$sp,-24 /* f1760a0: 2401005a */ addiu $at,$zero,0x5a /* f1760a4: 10810003 */ beq $a0,$at,.L0f1760b4 @@ -168,8 +168,8 @@ glabel func0f1760c4 /* f17627c: 01616024 */ and $t4,$t3,$at /* f176280: ac620000 */ sw $v0,0x0($v1) /* f176284: ac6c0000 */ sw $t4,0x0($v1) -/* f176288: 3c018008 */ lui $at,0x8008 -/* f17628c: ac2c44f4 */ sw $t4,0x44f4($at) +/* f176288: 3c018008 */ lui $at,%hi(var800844f4) +/* f17628c: ac2c44f4 */ sw $t4,%lo(var800844f4)($at) /* f176290: 03e00008 */ jr $ra /* f176294: 27bd0018 */ addiu $sp,$sp,0x18 ); @@ -178,9 +178,9 @@ GLOBAL_ASM( glabel func0f176298 /* f176298: 3c0e8008 */ lui $t6,%hi(var800844f0) /* f17629c: 8dce44f0 */ lw $t6,%lo(var800844f0)($t6) -/* f1762a0: 3c018008 */ lui $at,0x8008 +/* f1762a0: 3c018008 */ lui $at,%hi(var800844f4) /* f1762a4: 03e00008 */ jr $ra -/* f1762a8: ac2e44f4 */ sw $t6,0x44f4($at) +/* f1762a8: ac2e44f4 */ sw $t6,%lo(var800844f4)($at) ); GLOBAL_ASM( diff --git a/src/game/game_177e00.c b/src/game/game_177e00.c index b10ced7d8..b5878e694 100644 --- a/src/game/game_177e00.c +++ b/src/game/game_177e00.c @@ -1076,9 +1076,9 @@ glabel func0f178ef0 /* f179044: 8fbf0014 */ lw $ra,0x14($sp) .L0f179048: /* f179048: 8fa9001c */ lw $t1,0x1c($sp) -/* f17904c: 3c018007 */ lui $at,0x8007 +/* f17904c: 3c018007 */ lui $at,%hi(g_MpPlayerNum) /* f179050: 27bd0020 */ addiu $sp,$sp,0x20 /* f179054: 03e00008 */ jr $ra -/* f179058: ac291448 */ sw $t1,0x1448($at) +/* f179058: ac291448 */ sw $t1,%lo(g_MpPlayerNum)($at) /* f17905c: 00000000 */ sll $zero,$zero,0x0 ); diff --git a/src/game/game_179060.c b/src/game/game_179060.c index f3fc52e54..0e1a9bc9c 100644 --- a/src/game/game_179060.c +++ b/src/game/game_179060.c @@ -130,10 +130,10 @@ glabel func0f179104 /* f17910c: afb00018 */ sw $s0,0x18($sp) /* f179110: afb20020 */ sw $s2,0x20($sp) /* f179114: 3c108008 */ lui $s0,%hi(g_MpArenas) -/* f179118: 3c118008 */ lui $s1,0x8008 +/* f179118: 3c118008 */ lui $s1,%hi(g_MpArenas+0x60) /* f17911c: afbf0024 */ sw $ra,0x24($sp) /* f179120: 00009025 */ or $s2,$zero,$zero -/* f179124: 26314bf8 */ addiu $s1,$s1,19448 +/* f179124: 26314bf8 */ addiu $s1,$s1,%lo(g_MpArenas+0x60) /* f179128: 26104b98 */ addiu $s0,$s0,%lo(g_MpArenas) .L0f17912c: /* f17912c: 0fc67244 */ jal mpIsChallengeComplete @@ -153,10 +153,10 @@ glabel func0f179104 /* f179160: 0007000d */ break 0x7 .L0f179164: /* f179164: 00008810 */ mfhi $s1 -/* f179168: 3c128008 */ lui $s2,0x8008 +/* f179168: 3c128008 */ lui $s2,%hi(g_MpArenas+0x60) /* f17916c: 3c108008 */ lui $s0,%hi(g_MpArenas) /* f179170: 26104b98 */ addiu $s0,$s0,%lo(g_MpArenas) -/* f179174: 26524bf8 */ addiu $s2,$s2,19448 +/* f179174: 26524bf8 */ addiu $s2,$s2,%lo(g_MpArenas+0x60) /* f179178: 00001825 */ or $v1,$zero,$zero .L0f17917c: /* f17917c: 0fc67244 */ jal mpIsChallengeComplete @@ -242,8 +242,8 @@ glabel var7f1b8074 /* f17925c: 26100006 */ addiu $s0,$s0,0x6 /* f179260: 26310001 */ addiu $s1,$s1,0x1 .L0f179264: -/* f179264: 3c0a8008 */ lui $t2,0x8008 -/* f179268: 254a4bfe */ addiu $t2,$t2,0x4bfe +/* f179264: 3c0a8008 */ lui $t2,%hi(g_MpArenas+0x66) +/* f179268: 254a4bfe */ addiu $t2,$t2,%lo(g_MpArenas+0x66) /* f17926c: 160afff8 */ bne $s0,$t2,.L0f179250 /* f179270: 00000000 */ sll $zero,$zero,0x0 /* f179274: 10000088 */ beqz $zero,.L0f179498 @@ -254,7 +254,7 @@ glabel var7f1b8074 /* f179284: 0fc67244 */ jal mpIsChallengeComplete /* f179288: 92040002 */ lbu $a0,0x2($s0) /* f17928c: 10400009 */ beqz $v0,.L0f1792b4 -/* f179290: 3c0c8008 */ lui $t4,0x8008 +/* f179290: 3c0c8008 */ lui $t4,%hi(g_MpArenas+0x66) /* f179294: 8e4b0000 */ lw $t3,0x0($s2) /* f179298: 562b0006 */ bnel $s1,$t3,.L0f1792b4 /* f17929c: 26310001 */ addiu $s1,$s1,0x1 @@ -265,7 +265,7 @@ glabel var7f1b8074 /* f1792b0: 26310001 */ addiu $s1,$s1,0x1 .L0f1792b4: /* f1792b4: 26100006 */ addiu $s0,$s0,0x6 -/* f1792b8: 258c4bfe */ addiu $t4,$t4,0x4bfe +/* f1792b8: 258c4bfe */ addiu $t4,$t4,%lo(g_MpArenas+0x66) /* f1792bc: 160cfff1 */ bne $s0,$t4,.L0f179284 /* f1792c0: 00000000 */ sll $zero,$zero,0x0 /* f1792c4: 10000075 */ beqz $zero,.L0f17949c @@ -276,13 +276,13 @@ glabel var7f1b8074 /* f1792d4: 0fc67244 */ jal mpIsChallengeComplete /* f1792d8: 92040002 */ lbu $a0,0x2($s0) /* f1792dc: 10400004 */ beqz $v0,.L0f1792f0 -/* f1792e0: 3c198008 */ lui $t9,0x8008 +/* f1792e0: 3c198008 */ lui $t9,%hi(g_MpArenas+0x66) /* f1792e4: 8e4d0000 */ lw $t5,0x0($s2) /* f1792e8: 122d0005 */ beq $s1,$t5,.L0f179300 /* f1792ec: 26310001 */ addiu $s1,$s1,0x1 .L0f1792f0: /* f1792f0: 26100006 */ addiu $s0,$s0,0x6 -/* f1792f4: 27394bfe */ addiu $t9,$t9,0x4bfe +/* f1792f4: 27394bfe */ addiu $t9,$t9,%lo(g_MpArenas+0x66) /* f1792f8: 1619fff6 */ bne $s0,$t9,.L0f1792d4 /* f1792fc: 00000000 */ sll $zero,$zero,0x0 .L0f179300: @@ -306,8 +306,8 @@ glabel var7f1b8074 /* f17933c: 26100006 */ addiu $s0,$s0,0x6 /* f179340: 26310001 */ addiu $s1,$s1,0x1 .L0f179344: -/* f179344: 3c088008 */ lui $t0,0x8008 -/* f179348: 25084bfe */ addiu $t0,$t0,0x4bfe +/* f179344: 3c088008 */ lui $t0,%hi(g_MpArenas+0x66) +/* f179348: 25084bfe */ addiu $t0,$t0,%lo(g_MpArenas+0x66) /* f17934c: 1608fff2 */ bne $s0,$t0,.L0f179318 /* f179350: 00000000 */ sll $zero,$zero,0x0 /* f179354: 10000051 */ beqz $zero,.L0f17949c @@ -2559,9 +2559,9 @@ glabel var7f1b814c /* f17b5e4: 012a1821 */ addu $v1,$t1,$t2 /* f17b5e8: 906d0df1 */ lbu $t5,0xdf1($v1) /* f17b5ec: 000b5880 */ sll $t3,$t3,0x2 -/* f17b5f0: 3c0c8008 */ lui $t4,0x8008 +/* f17b5f0: 3c0c8008 */ lui $t4,%hi(g_Bodies+0x2) /* f17b5f4: 018b6021 */ addu $t4,$t4,$t3 -/* f17b5f8: 958ccf06 */ lhu $t4,-0x30fa($t4) +/* f17b5f8: 958ccf06 */ lhu $t4,%lo(g_Bodies+0x2)($t4) /* f17b5fc: 31aeff7f */ andi $t6,$t5,0xff7f /* f17b600: a06e0df1 */ sb $t6,0xdf1($v1) /* f17b604: 1000002e */ beqz $zero,.L0f17b6c0 @@ -2590,9 +2590,9 @@ glabel var7f1b814c /* f17b65c: 03281821 */ addu $v1,$t9,$t0 /* f17b660: 906c0df1 */ lbu $t4,0xdf1($v1) /* f17b664: 00094880 */ sll $t1,$t1,0x2 -/* f17b668: 3c0a8008 */ lui $t2,0x8008 +/* f17b668: 3c0a8008 */ lui $t2,%hi(g_Bodies+0x2) /* f17b66c: 01495021 */ addu $t2,$t2,$t1 -/* f17b670: 954acf06 */ lhu $t2,-0x30fa($t2) +/* f17b670: 954acf06 */ lhu $t2,%lo(g_Bodies+0x2)($t2) /* f17b674: 358d0080 */ ori $t5,$t4,0x80 /* f17b678: a06d0df1 */ sb $t5,0xdf1($v1) /* f17b67c: 0fc62ec7 */ jal func0f18bb1c @@ -2911,9 +2911,9 @@ glabel var7f1b818c /* f17baec: 0fc63703 */ jal mpGetNumUnlockedPresets /* f17baf0: afa70038 */ sw $a3,0x38($sp) /* f17baf4: 8fa70038 */ lw $a3,0x38($sp) -/* f17baf8: 3c038007 */ lui $v1,0x8007 +/* f17baf8: 3c038007 */ lui $v1,%hi(g_SaveLocations+0x4) /* f17bafc: ace20000 */ sw $v0,0x0($a3) -/* f17bb00: 8c635bc4 */ lw $v1,0x5bc4($v1) +/* f17bb00: 8c635bc4 */ lw $v1,%lo(g_SaveLocations+0x4)($v1) /* f17bb04: 506000c5 */ beqzl $v1,.L0f17be1c /* f17bb08: 00001025 */ or $v0,$zero,$zero /* f17bb0c: 847902d0 */ lh $t9,0x2d0($v1) @@ -2923,7 +2923,7 @@ glabel var7f1b818c /* f17bb1c: 0fc63703 */ jal mpGetNumUnlockedPresets /* f17bb20: afa70038 */ sw $a3,0x38($sp) /* f17bb24: 8fa70038 */ lw $a3,0x38($sp) -/* f17bb28: 3c098007 */ lui $t1,0x8007 +/* f17bb28: 3c098007 */ lui $t1,%hi(g_SaveLocations+0x4) /* f17bb2c: 8ce30000 */ lw $v1,0x0($a3) /* f17bb30: 0062082b */ sltu $at,$v1,$v0 /* f17bb34: 10200005 */ beqz $at,.L0f17bb4c @@ -2933,14 +2933,14 @@ glabel var7f1b818c /* f17bb44: 100000b6 */ beqz $zero,.L0f17be20 /* f17bb48: 8fbf0014 */ lw $ra,0x14($sp) .L0f17bb4c: -/* f17bb4c: 8d295bc4 */ lw $t1,0x5bc4($t1) +/* f17bb4c: 8d295bc4 */ lw $t1,%lo(g_SaveLocations+0x4)($t1) /* f17bb50: 512000b2 */ beqzl $t1,.L0f17be1c /* f17bb54: 00001025 */ or $v0,$zero,$zero /* f17bb58: 0fc63703 */ jal mpGetNumUnlockedPresets /* f17bb5c: afa70038 */ sw $a3,0x38($sp) /* f17bb60: 8fa70038 */ lw $a3,0x38($sp) -/* f17bb64: 3c0a8007 */ lui $t2,0x8007 -/* f17bb68: 8d4a5bc4 */ lw $t2,0x5bc4($t2) +/* f17bb64: 3c0a8007 */ lui $t2,%hi(g_SaveLocations+0x4) +/* f17bb68: 8d4a5bc4 */ lw $t2,%lo(g_SaveLocations+0x4)($t2) /* f17bb6c: 8ceb0000 */ lw $t3,0x0($a3) /* f17bb70: 00027080 */ sll $t6,$v0,0x2 /* f17bb74: 01c27023 */ subu $t6,$t6,$v0 @@ -2964,7 +2964,7 @@ glabel var7f1b818c /* f17bbbc: 0fc63703 */ jal mpGetNumUnlockedPresets /* f17bbc0: 00000000 */ sll $zero,$zero,0x0 /* f17bbc4: 8fa70038 */ lw $a3,0x38($sp) -/* f17bbc8: 3c188007 */ lui $t8,0x8007 +/* f17bbc8: 3c188007 */ lui $t8,%hi(g_SaveLocations+0x4) /* f17bbcc: 8ce30000 */ lw $v1,0x0($a3) /* f17bbd0: 0062082b */ sltu $at,$v1,$v0 /* f17bbd4: 10200005 */ beqz $at,.L0f17bbec @@ -2974,14 +2974,14 @@ glabel var7f1b818c /* f17bbe4: 1000001c */ beqz $zero,.L0f17bc58 /* f17bbe8: 8faf0034 */ lw $t7,0x34($sp) .L0f17bbec: -/* f17bbec: 8f185bc4 */ lw $t8,0x5bc4($t8) +/* f17bbec: 8f185bc4 */ lw $t8,%lo(g_SaveLocations+0x4)($t8) /* f17bbf0: 53000019 */ beqzl $t8,.L0f17bc58 /* f17bbf4: 8faf0034 */ lw $t7,0x34($sp) /* f17bbf8: 0fc63703 */ jal mpGetNumUnlockedPresets /* f17bbfc: afa70038 */ sw $a3,0x38($sp) /* f17bc00: 8fa70038 */ lw $a3,0x38($sp) -/* f17bc04: 3c198007 */ lui $t9,0x8007 -/* f17bc08: 8f395bc4 */ lw $t9,0x5bc4($t9) +/* f17bc04: 3c198007 */ lui $t9,%hi(g_SaveLocations+0x4) +/* f17bc08: 8f395bc4 */ lw $t9,%lo(g_SaveLocations+0x4)($t9) /* f17bc0c: 8ce80000 */ lw $t0,0x0($a3) /* f17bc10: 00025080 */ sll $t2,$v0,0x2 /* f17bc14: 01425023 */ subu $t2,$t2,$v0 @@ -3028,8 +3028,8 @@ glabel var7f1b818c /* f17bcb0: acf90000 */ sw $t9,0x0($a3) /* f17bcb4: 24090001 */ addiu $t1,$zero,0x1 /* f17bcb8: ace90000 */ sw $t1,0x0($a3) -/* f17bcbc: 3c038007 */ lui $v1,0x8007 -/* f17bcc0: 8c635bc4 */ lw $v1,0x5bc4($v1) +/* f17bcbc: 3c038007 */ lui $v1,%hi(g_SaveLocations+0x4) +/* f17bcc0: 8c635bc4 */ lw $v1,%lo(g_SaveLocations+0x4)($v1) /* f17bcc4: 50600055 */ beqzl $v1,.L0f17be1c /* f17bcc8: 00001025 */ or $v0,$zero,$zero /* f17bccc: 906b030a */ lbu $t3,0x30a($v1) @@ -3037,7 +3037,7 @@ glabel var7f1b818c /* f17bcd4: 10000050 */ beqz $zero,.L0f17be18 /* f17bcd8: acec0000 */ sw $t4,0x0($a3) /* f17bcdc: 8ce30000 */ lw $v1,0x0($a3) -/* f17bce0: 3c0e8007 */ lui $t6,0x8007 +/* f17bce0: 3c0e8007 */ lui $t6,%hi(g_SaveLocations+0x4) /* f17bce4: 14600005 */ bnez $v1,.L0f17bcfc /* f17bce8: 00000000 */ sll $zero,$zero,0x0 /* f17bcec: 0fc5b9f1 */ jal langGet @@ -3045,7 +3045,7 @@ glabel var7f1b818c /* f17bcf4: 1000004a */ beqz $zero,.L0f17be20 /* f17bcf8: 8fbf0014 */ lw $ra,0x14($sp) .L0f17bcfc: -/* f17bcfc: 8dce5bc4 */ lw $t6,0x5bc4($t6) +/* f17bcfc: 8dce5bc4 */ lw $t6,%lo(g_SaveLocations+0x4)($t6) /* f17bd00: 24040001 */ addiu $a0,$zero,0x1 /* f17bd04: 8fa50030 */ lw $a1,0x30($sp) /* f17bd08: 51c00044 */ beqzl $t6,.L0f17be1c @@ -3063,10 +3063,10 @@ glabel var7f1b818c /* f17bd34: 0fc63703 */ jal mpGetNumUnlockedPresets /* f17bd38: afa70038 */ sw $a3,0x38($sp) /* f17bd3c: 8fa70038 */ lw $a3,0x38($sp) -/* f17bd40: 3c0f8007 */ lui $t7,0x8007 +/* f17bd40: 3c0f8007 */ lui $t7,%hi(g_SaveLocations+0x4) /* f17bd44: 24040001 */ addiu $a0,$zero,0x1 /* f17bd48: ace20008 */ sw $v0,0x8($a3) -/* f17bd4c: 8def5bc4 */ lw $t7,0x5bc4($t7) +/* f17bd4c: 8def5bc4 */ lw $t7,%lo(g_SaveLocations+0x4)($t7) /* f17bd50: 8fa50030 */ lw $a1,0x30($sp) /* f17bd54: 51e00031 */ beqzl $t7,.L0f17be1c /* f17bd58: 00001025 */ or $v0,$zero,$zero @@ -3148,8 +3148,8 @@ glabel func0f17be2c /* f17be68: 0041082b */ sltu $at,$v0,$at /* f17be6c: 1020004e */ beqz $at,.L0f17bfa8 /* f17be70: afa40058 */ sw $a0,0x58($sp) -/* f17be74: 3c038007 */ lui $v1,0x8007 -/* f17be78: 8c635bc4 */ lw $v1,0x5bc4($v1) +/* f17be74: 3c038007 */ lui $v1,%hi(g_SaveLocations+0x4) +/* f17be78: 8c635bc4 */ lw $v1,%lo(g_SaveLocations+0x4)($v1) /* f17be7c: 0002c080 */ sll $t8,$v0,0x2 /* f17be80: 2408ffff */ addiu $t0,$zero,-1 /* f17be84: 10600048 */ beqz $v1,.L0f17bfa8 @@ -3203,14 +3203,14 @@ glabel func0f17be2c /* f17bf3c: 0fc5b9f1 */ jal langGet /* f17bf40: 94847148 */ lhu $a0,%lo(g_MpScenarioOverviews)($a0) /* f17bf44: 8fa80038 */ lw $t0,0x38($sp) -/* f17bf48: 3c048008 */ lui $a0,0x8008 +/* f17bf48: 3c048008 */ lui $a0,%hi(g_MpArenas+0x4) /* f17bf4c: afa2002c */ sw $v0,0x2c($sp) /* f17bf50: 00087080 */ sll $t6,$t0,0x2 /* f17bf54: 01c87023 */ subu $t6,$t6,$t0 /* f17bf58: 000e7040 */ sll $t6,$t6,0x1 /* f17bf5c: 008e2021 */ addu $a0,$a0,$t6 /* f17bf60: 0fc5b9f1 */ jal langGet -/* f17bf64: 94844b9c */ lhu $a0,0x4b9c($a0) +/* f17bf64: 94844b9c */ lhu $a0,%lo(g_MpArenas+0x4)($a0) /* f17bf68: 97af0042 */ lhu $t7,0x42($sp) /* f17bf6c: 3c048007 */ lui $a0,%hi(g_StringPointer) /* f17bf70: 8c841440 */ lw $a0,%lo(g_StringPointer)($a0) diff --git a/src/game/game_17f930.c b/src/game/game_17f930.c index ed5de1962..68bc835dc 100644 --- a/src/game/game_17f930.c +++ b/src/game/game_17f930.c @@ -3236,9 +3236,9 @@ glabel var7f1b8954 /* f183060: 2610000c */ addiu $s0,$s0,0xc /* f183064: 5614fff5 */ bnel $s0,$s4,.L0f18303c /* f183068: 4406a000 */ mfc1 $a2,$f20 -/* f18306c: 3c018008 */ lui $at,0x8008 +/* f18306c: 3c018008 */ lui $at,%hi(var800869ec) /* f183070: 0fc60b26 */ jal func0f182c98 -/* f183074: ac2069ec */ sw $zero,0x69ec($at) +/* f183074: ac2069ec */ sw $zero,%lo(var800869ec)($at) /* f183078: 8fbf0044 */ lw $ra,0x44($sp) /* f18307c: d7b40020 */ ldc1 $f20,0x20($sp) /* f183080: 8fb00028 */ lw $s0,0x28($sp) @@ -5961,13 +5961,13 @@ glabel func0f185c14 /* f185c14: 3c0b800b */ lui $t3,%hi(g_MpSetup) /* f185c18: 256bcb88 */ addiu $t3,$t3,%lo(g_MpSetup) /* f185c1c: 916e0010 */ lbu $t6,0x10($t3) -/* f185c20: 3c028008 */ lui $v0,0x8008 +/* f185c20: 3c028008 */ lui $v0,%hi(g_MpScenarios+0x1c) /* f185c24: 27bdffe0 */ addiu $sp,$sp,-32 /* f185c28: 000e78c0 */ sll $t7,$t6,0x3 /* f185c2c: 01ee7821 */ addu $t7,$t7,$t6 /* f185c30: 000f78c0 */ sll $t7,$t7,0x3 /* f185c34: 004f1021 */ addu $v0,$v0,$t7 -/* f185c38: 8c426fb4 */ lw $v0,0x6fb4($v0) +/* f185c38: 8c426fb4 */ lw $v0,%lo(g_MpScenarios+0x1c)($v0) /* f185c3c: afb10018 */ sw $s1,0x18($sp) /* f185c40: afb00014 */ sw $s0,0x14($sp) /* f185c44: 00808025 */ or $s0,$a0,$zero @@ -6107,13 +6107,13 @@ glabel var7f1b89b8 /* f185e20: 3c07800b */ lui $a3,%hi(g_MpSetup) /* f185e24: 24e7cb88 */ addiu $a3,$a3,%lo(g_MpSetup) /* f185e28: 90ee0010 */ lbu $t6,0x10($a3) -/* f185e2c: 3c028008 */ lui $v0,0x8008 +/* f185e2c: 3c028008 */ lui $v0,%hi(g_MpScenarios+0x28) /* f185e30: 27bdffd0 */ addiu $sp,$sp,-48 /* f185e34: 000e78c0 */ sll $t7,$t6,0x3 /* f185e38: 01ee7821 */ addu $t7,$t7,$t6 /* f185e3c: 000f78c0 */ sll $t7,$t7,0x3 /* f185e40: 004f1021 */ addu $v0,$v0,$t7 -/* f185e44: 8c426fc0 */ lw $v0,0x6fc0($v0) +/* f185e44: 8c426fc0 */ lw $v0,%lo(g_MpScenarios+0x28)($v0) /* f185e48: afbf0014 */ sw $ra,0x14($sp) /* f185e4c: afa40030 */ sw $a0,0x30($sp) /* f185e50: 5040000a */ beqzl $v0,.L0f185e7c diff --git a/src/game/game_18e5a0.c b/src/game/game_18e5a0.c index 5d3881dd4..fe788725a 100644 --- a/src/game/game_18e5a0.c +++ b/src/game/game_18e5a0.c @@ -33,9 +33,9 @@ const u32 var7f1b8dec[] = {0x00000000}; GLOBAL_ASM( glabel func0f18e5a0 -/* f18e5a0: 3c018008 */ lui $at,0x8008 +/* f18e5a0: 3c018008 */ lui $at,%hi(var80087cc0) /* f18e5a4: 03e00008 */ jr $ra -/* f18e5a8: ac247cc0 */ sw $a0,0x7cc0($at) +/* f18e5a8: ac247cc0 */ sw $a0,%lo(var80087cc0)($at) ); GLOBAL_ASM( @@ -1360,12 +1360,12 @@ glabel func0f18f874 /* f18f9e8: 24020001 */ addiu $v0,$zero,0x1 /* f18f9ec: 14590004 */ bne $v0,$t9,.L0f18fa00 /* f18f9f0: 240a0002 */ addiu $t2,$zero,0x2 -/* f18f9f4: 3c018008 */ lui $at,0x8008 +/* f18f9f4: 3c018008 */ lui $at,%hi(var8007fac0) /* f18f9f8: 10000003 */ beqz $zero,.L0f18fa08 -/* f18f9fc: ac2afac0 */ sw $t2,-0x540($at) +/* f18f9fc: ac2afac0 */ sw $t2,%lo(var8007fac0)($at) .L0f18fa00: -/* f18fa00: 3c018008 */ lui $at,0x8008 -/* f18fa04: ac22fac0 */ sw $v0,-0x540($at) +/* f18fa00: 3c018008 */ lui $at,%hi(var8007fac0) +/* f18fa04: ac22fac0 */ sw $v0,%lo(var8007fac0)($at) .L0f18fa08: /* f18fa08: 0c002f40 */ jal func0000bd00 /* f18fa0c: afa6003c */ sw $a2,0x3c($sp) @@ -1795,8 +1795,8 @@ glabel func0f18f874 /* f190034: afa20088 */ sw $v0,0x88($sp) /* f190038: 240c0001 */ addiu $t4,$zero,0x1 .L0f19003c: -/* f19003c: 3c018008 */ lui $at,0x8008 -/* f190040: ac2cfac0 */ sw $t4,-0x540($at) +/* f19003c: 3c018008 */ lui $at,%hi(var8007fac0) +/* f190040: ac2cfac0 */ sw $t4,%lo(var8007fac0)($at) /* f190044: 8fa20088 */ lw $v0,0x88($sp) .L0f190048: /* f190048: 8fbf002c */ lw $ra,0x2c($sp) diff --git a/src/game/game_197600.c b/src/game/game_197600.c index 90a82951d..e31f2b7fb 100644 --- a/src/game/game_197600.c +++ b/src/game/game_197600.c @@ -64,7 +64,7 @@ glabel func0f197600 /* f19767c: 01c37023 */ subu $t6,$t6,$v1 /* f197680: 000e7080 */ sll $t6,$t6,0x2 /* f197684: 1481003c */ bne $a0,$at,.L0f197778 -/* f197688: 3c0f8008 */ lui $t7,%hi(var80087e50) +/* f197688: 3c0f8008 */ lui $t7,%hi(g_Stages+0x35c) /* f19768c: 8502000a */ lh $v0,0xa($t0) /* f197690: 3c068008 */ lui $a2,%hi(var80087e98) /* f197694: 24c67e98 */ addiu $a2,$a2,%lo(var80087e98) @@ -78,7 +78,7 @@ glabel func0f197600 /* f1976b4: 2401ffff */ addiu $at,$zero,-1 /* f1976b8: 9309016c */ lbu $t1,0x16c($t8) /* f1976bc: 13210049 */ beq $t9,$at,.L0f1977e4 -/* f1976c0: 8de7001c */ lw $a3,0x1c($t7) +/* f1976c0: 8de7001c */ lw $a3,%lo(g_Stages+0x35c)($t7) /* f1976c4: 10600003 */ beqz $v1,.L0f1976d4 /* f1976c8: 24010004 */ addiu $at,$zero,0x4 /* f1976cc: 14610045 */ bne $v1,$at,.L0f1977e4 @@ -126,7 +126,7 @@ glabel func0f197600 /* f197770: 1000001c */ beqz $zero,.L0f1977e4 /* f197774: 8d090128 */ lw $t1,0x128($t0) .L0f197778: -/* f197778: 25ef7e50 */ addiu $t7,$t7,%lo(var80087e50) +/* f197778: 25ef7e50 */ addiu $t7,$t7,32336 /* f19777c: 2401002f */ addiu $at,$zero,0x2f /* f197780: 1481000b */ bne $a0,$at,.L0f1977b0 /* f197784: 01cf3021 */ addu $a2,$t6,$t7 diff --git a/src/game/game_19aa80.c b/src/game/game_19aa80.c index ae44ab59b..dec241c1b 100644 --- a/src/game/game_19aa80.c +++ b/src/game/game_19aa80.c @@ -335,9 +335,9 @@ glabel func0f19ab70 /* f19af18: 000e7080 */ sll $t6,$t6,0x2 /* f19af1c: 01c47021 */ addu $t6,$t6,$a0 /* f19af20: 000e7040 */ sll $t6,$t6,0x1 -/* f19af24: 3c028009 */ lui $v0,0x8009 +/* f19af24: 3c028009 */ lui $v0,%hi(g_MpChallenges+0x4) /* f19af28: 004e1021 */ addu $v0,$v0,$t6 -/* f19af2c: 904284bc */ lbu $v0,-0x7b44($v0) +/* f19af2c: 904284bc */ lbu $v0,%lo(g_MpChallenges+0x4)($v0) /* f19af30: 304f0001 */ andi $t7,$v0,0x1 /* f19af34: 03e00008 */ jr $ra /* f19af38: 000f102b */ sltu $v0,$zero,$t7 @@ -1246,14 +1246,14 @@ glabel func0f19bb98 /* f19bc90: 92ea0011 */ lbu $t2,0x11($s7) .L0f19bc94: /* f19bc94: 92e20010 */ lbu $v0,0x10($s7) -/* f19bc98: 3c048008 */ lui $a0,0x8008 +/* f19bc98: 3c048008 */ lui $a0,%hi(g_MpScenarioOverviews+0x4) /* f19bc9c: 28410006 */ slti $at,$v0,0x6 /* f19bca0: 1020000c */ beqz $at,.L0f19bcd4 /* f19bca4: 00026080 */ sll $t4,$v0,0x2 /* f19bca8: 01826023 */ subu $t4,$t4,$v0 /* f19bcac: 000c6040 */ sll $t4,$t4,0x1 /* f19bcb0: 008c2021 */ addu $a0,$a0,$t4 -/* f19bcb4: 9084714c */ lbu $a0,0x714c($a0) +/* f19bcb4: 9084714c */ lbu $a0,%lo(g_MpScenarioOverviews+0x4)($a0) /* f19bcb8: 02a02825 */ or $a1,$s5,$zero /* f19bcbc: 02403025 */ or $a2,$s2,$zero /* f19bcc0: 50800005 */ beqzl $a0,.L0f19bcd8 @@ -1362,12 +1362,12 @@ glabel func0f19bd4c /* f19be24: 1616fff0 */ bne $s0,$s6,.L0f19bde8 /* f19be28: 26310001 */ addiu $s1,$s1,0x1 /* f19be2c: 92e2002a */ lbu $v0,0x2a($s7) -/* f19be30: 3c048008 */ lui $a0,0x8008 +/* f19be30: 3c048008 */ lui $a0,%hi(g_MpBodies+0x6) /* f19be34: 2841003d */ slti $at,$v0,0x3d /* f19be38: 1020000a */ beqz $at,.L0f19be64 /* f19be3c: 000240c0 */ sll $t0,$v0,0x3 /* f19be40: 00882021 */ addu $a0,$a0,$t0 -/* f19be44: 908477c2 */ lbu $a0,0x77c2($a0) +/* f19be44: 908477c2 */ lbu $a0,%lo(g_MpBodies+0x6)($a0) /* f19be48: 02802825 */ or $a1,$s4,$zero /* f19be4c: 02403025 */ or $a2,$s2,$zero /* f19be50: 50800005 */ beqzl $a0,.L0f19be68 @@ -1378,12 +1378,12 @@ glabel func0f19bd4c .L0f19be64: /* f19be64: 92e20029 */ lbu $v0,0x29($s7) .L0f19be68: -/* f19be68: 3c048008 */ lui $a0,0x8008 +/* f19be68: 3c048008 */ lui $a0,%hi(g_MpHeads+0x2) /* f19be6c: 2841004b */ slti $at,$v0,0x4b /* f19be70: 1020000a */ beqz $at,.L0f19be9c /* f19be74: 00024880 */ sll $t1,$v0,0x2 /* f19be78: 00892021 */ addu $a0,$a0,$t1 -/* f19be7c: 9084752e */ lbu $a0,0x752e($a0) +/* f19be7c: 9084752e */ lbu $a0,%lo(g_MpHeads+0x2)($a0) /* f19be80: 02802825 */ or $a1,$s4,$zero /* f19be84: 02403025 */ or $a2,$s2,$zero /* f19be88: 50800005 */ beqzl $a0,.L0f19bea0 diff --git a/src/game/game_19c990.c b/src/game/game_19c990.c index dea5782ff..cbbae948e 100644 --- a/src/game/game_19c990.c +++ b/src/game/game_19c990.c @@ -841,16 +841,16 @@ glabel func0f19d414 GLOBAL_ASM( glabel func0f19d4ec -/* f19d4ec: 3c018009 */ lui $at,0x8009 -/* f19d4f0: ac208800 */ sw $zero,-0x7800($at) -/* f19d4f4: 3c018009 */ lui $at,0x8009 -/* f19d4f8: a0208808 */ sb $zero,-0x77f8($at) -/* f19d4fc: 3c018009 */ lui $at,0x8009 -/* f19d500: a0208804 */ sb $zero,-0x77fc($at) +/* f19d4ec: 3c018009 */ lui $at,%hi(var80088800) +/* f19d4f0: ac208800 */ sw $zero,%lo(var80088800)($at) +/* f19d4f4: 3c018009 */ lui $at,%hi(var80088808) +/* f19d4f8: a0208808 */ sb $zero,%lo(var80088808)($at) +/* f19d4fc: 3c018009 */ lui $at,%hi(var80088804) +/* f19d500: a0208804 */ sb $zero,%lo(var80088804)($at) /* f19d504: 3c04800b */ lui $a0,%hi(g_FiringRangeData) -/* f19d508: 3c018009 */ lui $at,0x8009 +/* f19d508: 3c018009 */ lui $at,%hi(var80088810) /* f19d50c: 2484cd20 */ addiu $a0,$a0,%lo(g_FiringRangeData) -/* f19d510: ac208810 */ sw $zero,-0x77f0($at) +/* f19d510: ac208810 */ sw $zero,%lo(var80088810)($at) /* f19d514: 3c03800b */ lui $v1,%hi(g_FiringRangeData) /* f19d518: 3c02800b */ lui $v0,0x800b /* f19d51c: a0800466 */ sb $zero,0x466($a0) @@ -868,9 +868,9 @@ glabel func0f19d4ec /* f19d548: 31cfff7f */ andi $t7,$t6,0xff7f /* f19d54c: 1462fffb */ bne $v1,$v0,.L0f19d53c /* f19d550: a06fffd4 */ sb $t7,-0x2c($v1) -/* f19d554: 3c018009 */ lui $at,0x8009 +/* f19d554: 3c018009 */ lui $at,%hi(var8008880c) /* f19d558: 03e00008 */ jr $ra -/* f19d55c: a020880c */ sb $zero,-0x77f4($at) +/* f19d55c: a020880c */ sb $zero,%lo(var8008880c)($at) ); GLOBAL_ASM( @@ -930,7 +930,7 @@ GLOBAL_ASM( glabel func0f19d5f4 /* f19d5f4: 27bdff60 */ addiu $sp,$sp,-160 /* f19d5f8: afbf003c */ sw $ra,0x3c($sp) -/* f19d5fc: 3c018009 */ lui $at,0x8009 +/* f19d5fc: 3c018009 */ lui $at,%hi(var8008880c) /* f19d600: 3c048009 */ lui $a0,%hi(var80088814) /* f19d604: afb50038 */ sw $s5,0x38($sp) /* f19d608: afb40034 */ sw $s4,0x34($sp) @@ -940,7 +940,7 @@ glabel func0f19d5f4 /* f19d618: afb00024 */ sw $s0,0x24($sp) /* f19d61c: f7b60018 */ sdc1 $f22,0x18($sp) /* f19d620: f7b40010 */ sdc1 $f20,0x10($sp) -/* f19d624: a020880c */ sb $zero,-0x77f4($at) +/* f19d624: a020880c */ sb $zero,%lo(var8008880c)($at) /* f19d628: 94848814 */ lhu $a0,%lo(var80088814)($a0) /* f19d62c: 27a60048 */ addiu $a2,$sp,0x48 /* f19d630: 0fc456ac */ jal padUnpack @@ -2432,12 +2432,12 @@ glabel func0f19e9c0 /* f19ea40: 8fa40018 */ lw $a0,0x18($sp) /* f19ea44: 14400004 */ bnez $v0,.L0f19ea58 /* f19ea48: 240b0001 */ addiu $t3,$zero,0x1 -/* f19ea4c: 3c018009 */ lui $at,0x8009 +/* f19ea4c: 3c018009 */ lui $at,%hi(var80088804) /* f19ea50: 10000003 */ beqz $zero,.L0f19ea60 -/* f19ea54: a0208804 */ sb $zero,-0x77fc($at) +/* f19ea54: a0208804 */ sb $zero,%lo(var80088804)($at) .L0f19ea58: -/* f19ea58: 3c018009 */ lui $at,0x8009 -/* f19ea5c: a02b8804 */ sb $t3,-0x77fc($at) +/* f19ea58: 3c018009 */ lui $at,%hi(var80088804) +/* f19ea5c: a02b8804 */ sb $t3,%lo(var80088804)($at) .L0f19ea60: /* f19ea60: 0fc67913 */ jal func0f19e44c /* f19ea64: 00000000 */ sll $zero,$zero,0x0 @@ -2710,9 +2710,9 @@ glabel func0f19ecdc .L0f19ed54: /* f19ed54: 0fc2a4ab */ jal func0f0a92ac /* f19ed58: 24040001 */ addiu $a0,$zero,0x1 -/* f19ed5c: 3c018009 */ lui $at,0x8009 +/* f19ed5c: 3c018009 */ lui $at,%hi(var80088804) /* f19ed60: 0fc67505 */ jal func0f19d414 -/* f19ed64: a0208804 */ sb $zero,-0x77fc($at) +/* f19ed64: a0208804 */ sb $zero,%lo(var80088804)($at) /* f19ed68: 12000003 */ beqz $s0,.L0f19ed78 /* f19ed6c: 00000000 */ sll $zero,$zero,0x0 /* f19ed70: 0fc678f8 */ jal func0f19e3e0 @@ -3795,10 +3795,10 @@ glabel var7f1b94e4 /* f19fbe4: 8fbf007c */ lw $ra,0x7c($sp) /* f19fbe8: 8ec20284 */ lw $v0,0x284($s6) .L0f19fbec: -/* f19fbec: 3c038009 */ lui $v1,0x8009 +/* f19fbec: 3c038009 */ lui $v1,%hi(var80088804) /* f19fbf0: 2401000a */ addiu $at,$zero,0xa /* f19fbf4: 8c4d00bc */ lw $t5,0xbc($v0) -/* f19fbf8: 90638804 */ lbu $v1,-0x77fc($v1) +/* f19fbf8: 90638804 */ lbu $v1,%lo(var80088804)($v1) /* f19fbfc: 85ae0028 */ lh $t6,0x28($t5) /* f19fc00: 11c10024 */ beq $t6,$at,.L0f19fc94 /* f19fc04: 00000000 */ sll $zero,$zero,0x0 @@ -4178,17 +4178,17 @@ glabel var7f1b94e4 .L0f1a0150: /* f1a0150: 0fc1a2bd */ jal func0f068af4 /* f1a0154: 00001025 */ or $v0,$zero,$zero -/* f1a0158: 3c038009 */ lui $v1,0x8009 -/* f1a015c: 9063880c */ lbu $v1,-0x77f4($v1) +/* f1a0158: 3c038009 */ lui $v1,%hi(var8008880c) +/* f1a015c: 9063880c */ lbu $v1,%lo(var8008880c)($v1) /* f1a0160: 00404025 */ or $t0,$v0,$zero /* f1a0164: 5060000d */ beqzl $v1,.L0f1a019c /* f1a0168: c5100004 */ lwc1 $f16,0x4($t0) /* f1a016c: 920c0043 */ lbu $t4,0x43($s0) /* f1a0170: 246dffff */ addiu $t5,$v1,-1 -/* f1a0174: 3c018009 */ lui $at,0x8009 +/* f1a0174: 3c018009 */ lui $at,%hi(var8008880c) /* f1a0178: 11800007 */ beqz $t4,.L0f1a0198 /* f1a017c: 02202025 */ or $a0,$s1,$zero -/* f1a0180: a02d880c */ sb $t5,-0x77f4($at) +/* f1a0180: a02d880c */ sb $t5,%lo(var8008880c)($at) /* f1a0184: 24050001 */ addiu $a1,$zero,0x1 /* f1a0188: 3406ffff */ dli $a2,0xffff /* f1a018c: 0fc249af */ jal func0f0926bc diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c index b117110bd..a05f5b0c1 100644 --- a/src/game/game_1a3340.c +++ b/src/game/game_1a3340.c @@ -83,9 +83,9 @@ glabel menuhandler001a3340 /* f1a33e4: 00002025 */ or $a0,$zero,$zero /* f1a33e8: 8fa50018 */ lw $a1,0x18($sp) .L0f1a33ec: -/* f1a33ec: 3c018009 */ lui $at,0x8009 +/* f1a33ec: 3c018009 */ lui $at,%hi(var8008889c) /* f1a33f0: 3c03800a */ lui $v1,%hi(g_Vars) -/* f1a33f4: ac25889c */ sw $a1,-0x7764($at) +/* f1a33f4: ac25889c */ sw $a1,%lo(var8008889c)($at) /* f1a33f8: 24639fc0 */ addiu $v1,$v1,%lo(g_Vars) /* f1a33fc: 00001025 */ or $v0,$zero,$zero /* f1a3400: 24040008 */ addiu $a0,$zero,0x8 @@ -3123,11 +3123,11 @@ glabel var7f1b9994 /* f1a6440: 10000014 */ beqz $zero,.L0f1a6494 /* f1a6444: 8fbf0014 */ lw $ra,0x14($sp) /* f1a6448: 8ccf0000 */ lw $t7,0x0($a2) -/* f1a644c: 3c018009 */ lui $at,0x8009 +/* f1a644c: 3c018009 */ lui $at,%hi(var80088ad8) /* f1a6450: 3c048009 */ lui $a0,%hi(menudialog_2f49c) /* f1a6454: 2484947c */ addiu $a0,$a0,%lo(menudialog_2f49c) /* f1a6458: 0fc3cbd3 */ jal menuPushDialog -/* f1a645c: a02f8ad8 */ sb $t7,-0x7528($at) +/* f1a645c: a02f8ad8 */ sb $t7,%lo(var80088ad8)($at) /* f1a6460: 1000000b */ beqz $zero,.L0f1a6490 /* f1a6464: 00001025 */ or $v0,$zero,$zero /* f1a6468: 3c188009 */ lui $t8,%hi(var80088ad8) @@ -3452,11 +3452,11 @@ glabel var7f1b99b4 /* f1a69a4: 10000014 */ beqz $zero,.L0f1a69f8 /* f1a69a8: 8fbf0014 */ lw $ra,0x14($sp) /* f1a69ac: 8ccf0000 */ lw $t7,0x0($a2) -/* f1a69b0: 3c018009 */ lui $at,0x8009 +/* f1a69b0: 3c018009 */ lui $at,%hi(var80088bb4) /* f1a69b4: 3c048009 */ lui $a0,%hi(menudialog_2f68c) /* f1a69b8: 2484966c */ addiu $a0,$a0,%lo(menudialog_2f68c) /* f1a69bc: 0fc3cbd3 */ jal menuPushDialog -/* f1a69c0: a02f8bb4 */ sb $t7,-0x744c($at) +/* f1a69c0: a02f8bb4 */ sb $t7,%lo(var80088bb4)($at) /* f1a69c4: 1000000b */ beqz $zero,.L0f1a69f4 /* f1a69c8: 00001025 */ or $v0,$zero,$zero /* f1a69cc: 3c188009 */ lui $t8,%hi(var80088bb4) diff --git a/src/game/mplayer.c b/src/game/mplayer.c index d056c03e0..dc1779e90 100644 --- a/src/game/mplayer.c +++ b/src/game/mplayer.c @@ -1598,10 +1598,10 @@ glabel mpGetNumWeaponOptions /* f188bdc: afb00018 */ sw $s0,0x18($sp) /* f188be0: afb1001c */ sw $s1,0x1c($sp) /* f188be4: 3c108008 */ lui $s0,%hi(mpweaponstable) -/* f188be8: 3c128008 */ lui $s2,0x8008 +/* f188be8: 3c128008 */ lui $s2,%hi(mpweaponstable+0x186) /* f188bec: afbf0024 */ sw $ra,0x24($sp) /* f188bf0: 00008825 */ or $s1,$zero,$zero -/* f188bf4: 265273ee */ addiu $s2,$s2,0x73ee +/* f188bf4: 265273ee */ addiu $s2,$s2,%lo(mpweaponstable+0x186) /* f188bf8: 26107268 */ addiu $s0,$s0,%lo(mpweaponstable) /* f188bfc: 96040004 */ lhu $a0,0x4($s0) .L0f188c00: @@ -1630,10 +1630,10 @@ glabel mpGetWeaponLabel /* f188c44: afb00018 */ sw $s0,0x18($sp) /* f188c48: afb1001c */ sw $s1,0x1c($sp) /* f188c4c: 3c108008 */ lui $s0,%hi(mpweaponstable) -/* f188c50: 3c128008 */ lui $s2,0x8008 +/* f188c50: 3c128008 */ lui $s2,%hi(mpweaponstable+0x186) /* f188c54: 00808825 */ or $s1,$a0,$zero /* f188c58: afbf0024 */ sw $ra,0x24($sp) -/* f188c5c: 265273ee */ addiu $s2,$s2,0x73ee +/* f188c5c: 265273ee */ addiu $s2,$s2,%lo(mpweaponstable+0x186) /* f188c60: 26107268 */ addiu $s0,$s0,%lo(mpweaponstable) /* f188c64: 96040004 */ lhu $a0,0x4($s0) .L0f188c68: @@ -2080,9 +2080,9 @@ glabel func0f18913c /* f18925c: 12600005 */ beqz $s3,.L0f189274 /* f189260: 8fa20044 */ lw $v0,0x44($sp) /* f189264: 240b0001 */ addiu $t3,$zero,0x1 -/* f189268: 3c018008 */ lui $at,0x8008 +/* f189268: 3c018008 */ lui $at,%hi(var800874c8) /* f18926c: afab0040 */ sw $t3,0x40($sp) -/* f189270: ac2274c8 */ sw $v0,0x74c8($at) +/* f189270: ac2274c8 */ sw $v0,%lo(var800874c8)($at) .L0f189274: /* f189274: 8fac0040 */ lw $t4,0x40($sp) /* f189278: 8fa20044 */ lw $v0,0x44($sp) @@ -2095,10 +2095,10 @@ glabel func0f18913c .L0f189294: /* f189294: 8fad0040 */ lw $t5,0x40($sp) /* f189298: 240e000e */ addiu $t6,$zero,0xe -/* f18929c: 3c018008 */ lui $at,0x8008 +/* f18929c: 3c018008 */ lui $at,%hi(var800874c8) /* f1892a0: 55a00003 */ bnezl $t5,.L0f1892b0 /* f1892a4: 8fbf003c */ lw $ra,0x3c($sp) -/* f1892a8: ac2e74c8 */ sw $t6,0x74c8($at) +/* f1892a8: ac2e74c8 */ sw $t6,%lo(var800874c8)($at) /* f1892ac: 8fbf003c */ lw $ra,0x3c($sp) .L0f1892b0: /* f1892b0: 8fb00018 */ lw $s0,0x18($sp) @@ -2128,40 +2128,40 @@ glabel func0f1892dc /* f189300: 000270c0 */ sll $t6,$v0,0x3 /* f189304: 01c27021 */ addu $t6,$t6,$v0 /* f189308: 000e7040 */ sll $t6,$t6,0x1 -/* f18930c: 3c048008 */ lui $a0,0x8008 +/* f18930c: 3c048008 */ lui $a0,%hi(g_MpWeaponSets+0x8) /* f189310: 008e2021 */ addu $a0,$a0,$t6 /* f189314: 0fc67244 */ jal mpIsChallengeComplete -/* f189318: 908473f8 */ lbu $a0,0x73f8($a0) +/* f189318: 908473f8 */ lbu $a0,%lo(g_MpWeaponSets+0x8)($a0) /* f18931c: 50400029 */ beqzl $v0,.L0f1893c4 /* f189320: 8e0d0000 */ lw $t5,0x0($s0) /* f189324: 8e0f0000 */ lw $t7,0x0($s0) -/* f189328: 3c048008 */ lui $a0,0x8008 +/* f189328: 3c048008 */ lui $a0,%hi(g_MpWeaponSets+0x9) /* f18932c: 000fc0c0 */ sll $t8,$t7,0x3 /* f189330: 030fc021 */ addu $t8,$t8,$t7 /* f189334: 0018c040 */ sll $t8,$t8,0x1 /* f189338: 00982021 */ addu $a0,$a0,$t8 /* f18933c: 0fc67244 */ jal mpIsChallengeComplete -/* f189340: 908473f9 */ lbu $a0,0x73f9($a0) +/* f189340: 908473f9 */ lbu $a0,%lo(g_MpWeaponSets+0x9)($a0) /* f189344: 5040001f */ beqzl $v0,.L0f1893c4 /* f189348: 8e0d0000 */ lw $t5,0x0($s0) /* f18934c: 8e190000 */ lw $t9,0x0($s0) -/* f189350: 3c048008 */ lui $a0,0x8008 +/* f189350: 3c048008 */ lui $a0,%hi(g_MpWeaponSets+0xa) /* f189354: 001960c0 */ sll $t4,$t9,0x3 /* f189358: 01996021 */ addu $t4,$t4,$t9 /* f18935c: 000c6040 */ sll $t4,$t4,0x1 /* f189360: 008c2021 */ addu $a0,$a0,$t4 /* f189364: 0fc67244 */ jal mpIsChallengeComplete -/* f189368: 908473fa */ lbu $a0,0x73fa($a0) +/* f189368: 908473fa */ lbu $a0,%lo(g_MpWeaponSets+0xa)($a0) /* f18936c: 50400015 */ beqzl $v0,.L0f1893c4 /* f189370: 8e0d0000 */ lw $t5,0x0($s0) /* f189374: 8e0d0000 */ lw $t5,0x0($s0) -/* f189378: 3c048008 */ lui $a0,0x8008 +/* f189378: 3c048008 */ lui $a0,%hi(g_MpWeaponSets+0xb) /* f18937c: 000d70c0 */ sll $t6,$t5,0x3 /* f189380: 01cd7021 */ addu $t6,$t6,$t5 /* f189384: 000e7040 */ sll $t6,$t6,0x1 /* f189388: 008e2021 */ addu $a0,$a0,$t6 /* f18938c: 0fc67244 */ jal mpIsChallengeComplete -/* f189390: 908473fb */ lbu $a0,0x73fb($a0) +/* f189390: 908473fb */ lbu $a0,%lo(g_MpWeaponSets+0xb)($a0) /* f189394: 5040000b */ beqzl $v0,.L0f1893c4 /* f189398: 8e0d0000 */ lw $t5,0x0($s0) /* f18939c: 8e0f0000 */ lw $t7,0x0($s0) @@ -2322,9 +2322,9 @@ glabel func0f1895bc /* f1895c0: afbf0014 */ sw $ra,0x14($sp) /* f1895c4: 0fc623e7 */ jal func0f188f9c /* f1895c8: 00000000 */ sll $zero,$zero,0x0 -/* f1895cc: 3c018008 */ lui $at,0x8008 +/* f1895cc: 3c018008 */ lui $at,%hi(var800874c8) /* f1895d0: 0fc624b7 */ jal func0f1892dc -/* f1895d4: ac2274c8 */ sw $v0,0x74c8($at) +/* f1895d4: ac2274c8 */ sw $v0,%lo(var800874c8)($at) /* f1895d8: 8fbf0014 */ lw $ra,0x14($sp) /* f1895dc: 27bd0018 */ addiu $sp,$sp,0x18 /* f1895e0: 03e00008 */ jr $ra @@ -5321,9 +5321,9 @@ glabel mpIsTrackUnlocked /* f18c0c0: 00047080 */ sll $t6,$a0,0x2 /* f18c0c4: 01c47023 */ subu $t6,$t6,$a0 /* f18c0c8: 000e7040 */ sll $t6,$t6,0x1 -/* f18c0cc: 3c028008 */ lui $v0,0x8008 +/* f18c0cc: 3c028008 */ lui $v0,%hi(g_MpTracks+0x4) /* f18c0d0: 004e1021 */ addu $v0,$v0,$t6 -/* f18c0d4: 84427a74 */ lh $v0,0x7a74($v0) +/* f18c0d4: 84427a74 */ lh $v0,%lo(g_MpTracks+0x4)($v0) /* f18c0d8: 00001825 */ or $v1,$zero,$zero /* f18c0dc: 04400003 */ bltz $v0,.L0f18c0ec /* f18c0e0: 28410011 */ slti $at,$v0,0x11 @@ -5666,12 +5666,12 @@ glabel func0f18c4c0 /* f18c578: aec20004 */ sw $v0,0x4($s6) /* f18c57c: 006f1821 */ addu $v1,$v1,$t7 /* f18c580: 94637a70 */ lhu $v1,%lo(g_MpTracks)($v1) -/* f18c584: 3c018008 */ lui $at,0x8008 +/* f18c584: 3c018008 */ lui $at,%hi(var800840f8) /* f18c588: 307801ff */ andi $t8,$v1,0x1ff /* f18c58c: 0018c900 */ sll $t9,$t8,0x4 /* f18c590: 0338c823 */ subu $t9,$t9,$t8 /* f18c594: 0019c880 */ sll $t9,$t9,0x2 -/* f18c598: ac3940f8 */ sw $t9,0x40f8($at) +/* f18c598: ac3940f8 */ sw $t9,%lo(var800840f8)($at) /* f18c59c: 10000073 */ beqz $zero,.L0f18c76c /* f18c5a0: 00031242 */ srl $v0,$v1,0x9 .L0f18c5a4: @@ -5709,12 +5709,12 @@ glabel func0f18c4c0 /* f18c608: 1661000a */ bne $s3,$at,.L0f18c634 /* f18c60c: 3c038008 */ lui $v1,%hi(g_MpTracks) /* f18c610: 94637a70 */ lhu $v1,%lo(g_MpTracks)($v1) -/* f18c614: 3c018008 */ lui $at,0x8008 +/* f18c614: 3c018008 */ lui $at,%hi(var800840f8) /* f18c618: 306801ff */ andi $t0,$v1,0x1ff /* f18c61c: 00084900 */ sll $t1,$t0,0x4 /* f18c620: 01284823 */ subu $t1,$t1,$t0 /* f18c624: 00094880 */ sll $t1,$t1,0x2 -/* f18c628: ac2940f8 */ sw $t1,0x40f8($at) +/* f18c628: ac2940f8 */ sw $t1,%lo(var800840f8)($at) /* f18c62c: 1000004f */ beqz $zero,.L0f18c76c /* f18c630: 00031242 */ srl $v0,$v1,0x9 .L0f18c634: @@ -5734,12 +5734,12 @@ glabel func0f18c4c0 /* f18c664: aed30004 */ sw $s3,0x4($s6) /* f18c668: 006b1821 */ addu $v1,$v1,$t3 /* f18c66c: 94637a70 */ lhu $v1,%lo(g_MpTracks)($v1) -/* f18c670: 3c018008 */ lui $at,0x8008 +/* f18c670: 3c018008 */ lui $at,%hi(var800840f8) /* f18c674: 306c01ff */ andi $t4,$v1,0x1ff /* f18c678: 000c6900 */ sll $t5,$t4,0x4 /* f18c67c: 01ac6823 */ subu $t5,$t5,$t4 /* f18c680: 000d6880 */ sll $t5,$t5,0x2 -/* f18c684: ac2d40f8 */ sw $t5,0x40f8($at) +/* f18c684: ac2d40f8 */ sw $t5,%lo(var800840f8)($at) /* f18c688: 10000038 */ beqz $zero,.L0f18c76c /* f18c68c: 00031242 */ srl $v0,$v1,0x9 .L0f18c690: @@ -5774,12 +5774,12 @@ glabel func0f18c4c0 /* f18c6f8: aec20004 */ sw $v0,0x4($s6) /* f18c6fc: 006f1821 */ addu $v1,$v1,$t7 /* f18c700: 94637a70 */ lhu $v1,%lo(g_MpTracks)($v1) -/* f18c704: 3c018008 */ lui $at,0x8008 +/* f18c704: 3c018008 */ lui $at,%hi(var800840f8) /* f18c708: 307801ff */ andi $t8,$v1,0x1ff /* f18c70c: 0018c900 */ sll $t9,$t8,0x4 /* f18c710: 0338c823 */ subu $t9,$t9,$t8 /* f18c714: 0019c880 */ sll $t9,$t9,0x2 -/* f18c718: ac3940f8 */ sw $t9,0x40f8($at) +/* f18c718: ac3940f8 */ sw $t9,%lo(var800840f8)($at) /* f18c71c: 10000013 */ beqz $zero,.L0f18c76c /* f18c720: 00031242 */ srl $v0,$v1,0x9 .L0f18c724: @@ -5794,12 +5794,12 @@ glabel func0f18c4c0 /* f18c744: aec20004 */ sw $v0,0x4($s6) /* f18c748: 00681821 */ addu $v1,$v1,$t0 /* f18c74c: 94637a70 */ lhu $v1,%lo(g_MpTracks)($v1) -/* f18c750: 3c018008 */ lui $at,0x8008 +/* f18c750: 3c018008 */ lui $at,%hi(var800840f8) /* f18c754: 306901ff */ andi $t1,$v1,0x1ff /* f18c758: 00095100 */ sll $t2,$t1,0x4 /* f18c75c: 01495023 */ subu $t2,$t2,$t1 /* f18c760: 000a5080 */ sll $t2,$t2,0x2 -/* f18c764: ac2a40f8 */ sw $t2,0x40f8($at) +/* f18c764: ac2a40f8 */ sw $t2,%lo(var800840f8)($at) /* f18c768: 00031242 */ srl $v0,$v1,0x9 .L0f18c76c: /* f18c76c: 8fbf0034 */ lw $ra,0x34($sp) @@ -7158,9 +7158,9 @@ glabel func0f18d9fc /* f18da2c: 0fc35531 */ jal func0f0d54c4 /* f18da30: 27a40020 */ addiu $a0,$sp,0x20 /* f18da34: 240f0001 */ addiu $t7,$zero,0x1 -/* f18da38: 3c018007 */ lui $at,0x8007 +/* f18da38: 3c018007 */ lui $at,%hi(var80075bd8) /* f18da3c: 27b80100 */ addiu $t8,$sp,0x100 -/* f18da40: ac2f5bd8 */ sw $t7,0x5bd8($at) +/* f18da40: ac2f5bd8 */ sw $t7,%lo(var80075bd8)($at) /* f18da44: afb80010 */ sw $t8,0x10($sp) /* f18da48: 83a4010f */ lb $a0,0x10f($sp) /* f18da4c: 8fa50110 */ lw $a1,0x110($sp) @@ -7476,9 +7476,9 @@ glabel func0f18dec4 /* f18defc: 00107080 */ sll $t6,$s0,0x2 /* f18df00: 01d07023 */ subu $t6,$t6,$s0 /* f18df04: 000e70c0 */ sll $t6,$t6,0x3 -/* f18df08: 3c0f8008 */ lui $t7,0x8008 +/* f18df08: 3c0f8008 */ lui $t7,%hi(g_MpPresets+0x4) /* f18df0c: 01ee7821 */ addu $t7,$t7,$t6 -/* f18df10: 8def7b70 */ lw $t7,0x7b70($t7) +/* f18df10: 8def7b70 */ lw $t7,%lo(g_MpPresets+0x4)($t7) /* f18df14: 10000005 */ beqz $zero,.L0f18df2c /* f18df18: afaf002c */ sw $t7,0x2c($sp) .L0f18df1c: @@ -7735,10 +7735,10 @@ glabel func0f18e16c /* f18e2b0: 00001825 */ or $v1,$zero,$zero /* f18e2b4: 000368c0 */ sll $t5,$v1,0x3 .L0f18e2b8: -/* f18e2b8: 3c058008 */ lui $a1,0x8008 +/* f18e2b8: 3c058008 */ lui $a1,%hi(g_MpGeneralSimulants+0x4) /* f18e2bc: 00ad2821 */ addu $a1,$a1,$t5 /* f18e2c0: 10000001 */ beqz $zero,.L0f18e2c8 -/* f18e2c4: 84a57730 */ lh $a1,0x7730($a1) +/* f18e2c4: 84a57730 */ lh $a1,%lo(g_MpGeneralSimulants+0x4)($a1) .L0f18e2c8: /* f18e2c8: 02402025 */ or $a0,$s2,$zero /* f18e2cc: 0fc354be */ jal scenarioDefaultCallback44 @@ -7857,10 +7857,10 @@ glabel func0f18e420 /* f18e468: 0fc45a0a */ jal func0f116828 /* f18e46c: afa00014 */ sw $zero,0x14($sp) /* f18e470: 24180001 */ addiu $t8,$zero,0x1 -/* f18e474: 3c018007 */ lui $at,0x8007 +/* f18e474: 3c018007 */ lui $at,%hi(var80075bd4) /* f18e478: 00401825 */ or $v1,$v0,$zero /* f18e47c: 14400009 */ bnez $v0,.L0f18e4a4 -/* f18e480: ac385bd4 */ sw $t8,0x5bd4($at) +/* f18e480: ac385bd4 */ sw $t8,%lo(var80075bd4)($at) /* f18e484: 8fb90100 */ lw $t9,0x100($sp) /* f18e488: 97a80112 */ lhu $t0,0x112($sp) /* f18e48c: 3c03800b */ lui $v1,%hi(g_MpSetup) diff --git a/src/game/pak/pak.c b/src/game/pak/pak.c index 7f2d7840f..9629021d1 100644 --- a/src/game/pak/pak.c +++ b/src/game/pak/pak.c @@ -640,10 +640,10 @@ glabel func0f1169c8 /* f116a3c: 00000000 */ sll $zero,$zero,0x0 /* f116a40: 8faf002c */ lw $t7,0x2c($sp) /* f116a44: 00102600 */ sll $a0,$s0,0x18 -/* f116a48: 3c018006 */ lui $at,0x8006 +/* f116a48: 3c018006 */ lui $at,%hi(var8005eedc) /* f116a4c: 11e0001f */ beqz $t7,.L0f116acc /* f116a50: 0004c603 */ sra $t8,$a0,0x18 -/* f116a54: ac20eedc */ sw $zero,-0x1124($at) +/* f116a54: ac20eedc */ sw $zero,%lo(var8005eedc)($at) /* f116a58: 0fc477e5 */ jal func0f11df94 /* f116a5c: 03002025 */ or $a0,$t8,$zero /* f116a60: 00102600 */ sll $a0,$s0,0x18 @@ -671,8 +671,8 @@ glabel func0f1169c8 /* f116ab8: 0fc477e5 */ jal func0f11df94 /* f116abc: 01802025 */ or $a0,$t4,$zero /* f116ac0: 240d0001 */ addiu $t5,$zero,0x1 -/* f116ac4: 3c018006 */ lui $at,0x8006 -/* f116ac8: ac2deedc */ sw $t5,-0x1124($at) +/* f116ac4: 3c018006 */ lui $at,%hi(var8005eedc) +/* f116ac8: ac2deedc */ sw $t5,%lo(var8005eedc)($at) .L0f116acc: /* f116acc: 8fbf001c */ lw $ra,0x1c($sp) /* f116ad0: 93ae0027 */ lbu $t6,0x27($sp) @@ -7231,13 +7231,13 @@ glabel func0f11c54c /* f11c568: afb10018 */ sw $s1,0x18($sp) /* f11c56c: 11c00051 */ beqz $t6,.L0f11c6b4 /* f11c570: afb00014 */ sw $s0,0x14($sp) -/* f11c574: 3c018007 */ lui $at,0x8007 -/* f11c578: ac201448 */ sw $zero,0x1448($at) +/* f11c574: 3c018007 */ lui $at,%hi(g_MpPlayerNum) +/* f11c578: ac201448 */ sw $zero,%lo(g_MpPlayerNum)($at) /* f11c57c: 24040007 */ addiu $a0,$zero,0x7 /* f11c580: 0fc3c328 */ jal func0f0f0ca0 /* f11c584: 24050001 */ addiu $a1,$zero,0x1 -/* f11c588: 3c018007 */ lui $at,0x8007 -/* f11c58c: ac205d14 */ sw $zero,0x5d14($at) +/* f11c588: 3c018007 */ lui $at,%hi(var80075d14) +/* f11c58c: ac205d14 */ sw $zero,%lo(var80075d14)($at) /* f11c590: 964f04e4 */ lhu $t7,0x4e4($s2) /* f11c594: 31f8000f */ andi $t8,$t7,0xf /* f11c598: 13000013 */ beqz $t8,.L0f11c5e8 @@ -7315,8 +7315,8 @@ glabel func0f11c54c /* f11c6a0: 0fc3c328 */ jal func0f0f0ca0 /* f11c6a4: 24050001 */ addiu $a1,$zero,0x1 /* f11c6a8: 24180001 */ addiu $t8,$zero,0x1 -/* f11c6ac: 3c018007 */ lui $at,0x8007 -/* f11c6b0: ac385d14 */ sw $t8,0x5d14($at) +/* f11c6ac: 3c018007 */ lui $at,%hi(var80075d14) +/* f11c6b0: ac385d14 */ sw $t8,%lo(var80075d14)($at) .L0f11c6b4: /* f11c6b4: 8fbf0024 */ lw $ra,0x24($sp) .L0f11c6b8: @@ -7386,8 +7386,8 @@ glabel var7f1b4f20 /* f11c76c: 1614ffe9 */ bne $s0,$s4,.L0f11c714 /* f11c770: 263102cc */ addiu $s1,$s1,0x2cc /* f11c774: 8fbf002c */ lw $ra,0x2c($sp) -/* f11c778: 3c018006 */ lui $at,0x8006 -/* f11c77c: ac35eedc */ sw $s5,-0x1124($at) +/* f11c778: 3c018006 */ lui $at,%hi(var8005eedc) +/* f11c77c: ac35eedc */ sw $s5,%lo(var8005eedc)($at) /* f11c780: 8fb50028 */ lw $s5,0x28($sp) /* f11c784: 8fb00014 */ lw $s0,0x14($sp) /* f11c788: 8fb10018 */ lw $s1,0x18($sp) @@ -7464,16 +7464,16 @@ glabel var7f1b4f34 /* f11c860: 00000000 */ sll $zero,$zero,0x0 /* f11c864: 0fc477e3 */ jal func0f11df8c /* f11c868: 00000000 */ sll $zero,$zero,0x0 -/* f11c86c: 3c018007 */ lui $at,0x8007 -/* f11c870: ac205ce4 */ sw $zero,0x5ce4($at) +/* f11c86c: 3c018007 */ lui $at,%hi(var80075ce4) +/* f11c870: ac205ce4 */ sw $zero,%lo(var80075ce4)($at) .L0f11c874: /* f11c874: 3c188007 */ lui $t8,%hi(var80075d54) /* f11c878: 8f185d54 */ lw $t8,%lo(var80075d54)($t8) -/* f11c87c: 3c018007 */ lui $at,0x8007 +/* f11c87c: 3c018007 */ lui $at,%hi(var80075d54) /* f11c880: 13000003 */ beqz $t8,.L0f11c890 /* f11c884: 00000000 */ sll $zero,$zero,0x0 /* f11c888: 0fc45e12 */ jal func0f117848 -/* f11c88c: ac205d54 */ sw $zero,0x5d54($at) +/* f11c88c: ac205d54 */ sw $zero,%lo(var80075d54)($at) .L0f11c890: /* f11c890: 3c198007 */ lui $t9,%hi(var80075cf0) /* f11c894: 8f395cf0 */ lw $t9,%lo(var80075cf0)($t9) @@ -7483,8 +7483,8 @@ glabel var7f1b4f34 /* f11c8a4: 00000000 */ sll $zero,$zero,0x0 /* f11c8a8: 0fc46bec */ jal func0f11afb0 /* f11c8ac: 24060080 */ addiu $a2,$zero,0x80 -/* f11c8b0: 3c018007 */ lui $at,0x8007 -/* f11c8b4: ac205cf0 */ sw $zero,0x5cf0($at) +/* f11c8b0: 3c018007 */ lui $at,%hi(var80075cf0) +/* f11c8b4: ac205cf0 */ sw $zero,%lo(var80075cf0)($at) .L0f11c8b8: /* f11c8b8: 3c028007 */ lui $v0,%hi(var80075cec) /* f11c8bc: 8c425cec */ lw $v0,%lo(var80075cec)($v0) @@ -7513,8 +7513,8 @@ glabel var7f1b4f34 /* f11c910: 00003825 */ or $a3,$zero,$zero /* f11c914: 0c005451 */ jal func00015144 /* f11c918: 00000000 */ sll $zero,$zero,0x0 -/* f11c91c: 3c018007 */ lui $at,0x8007 -/* f11c920: ac205cec */ sw $zero,0x5cec($at) +/* f11c91c: 3c018007 */ lui $at,%hi(var80075cec) +/* f11c920: ac205cec */ sw $zero,%lo(var80075cec)($at) .L0f11c924: /* f11c924: 3c0a8007 */ lui $t2,%hi(var80075ce0) /* f11c928: 8d4a5ce0 */ lw $t2,%lo(var80075ce0)($t2) @@ -7522,8 +7522,8 @@ glabel var7f1b4f34 /* f11c930: 00000000 */ sll $zero,$zero,0x0 /* f11c934: 0fc46d52 */ jal func0f11b548 /* f11c938: 24040004 */ addiu $a0,$zero,0x4 -/* f11c93c: 3c018007 */ lui $at,0x8007 -/* f11c940: ac205ce0 */ sw $zero,0x5ce0($at) +/* f11c93c: 3c018007 */ lui $at,%hi(var80075ce0) +/* f11c940: ac205ce0 */ sw $zero,%lo(var80075ce0)($at) .L0f11c944: /* f11c944: 0fc4728c */ jal func0f11ca30 /* f11c948: 00000000 */ sll $zero,$zero,0x0 @@ -7578,12 +7578,12 @@ glabel var7f1b4f34 /* f11c9fc: 00000000 */ sll $zero,$zero,0x0 /* f11ca00: 10800004 */ beqz $a0,.L0f11ca14 /* f11ca04: 240d0001 */ addiu $t5,$zero,0x1 -/* f11ca08: 3c018006 */ lui $at,0x8006 +/* f11ca08: 3c018006 */ lui $at,%hi(var8005eedc) /* f11ca0c: 10000003 */ beqz $zero,.L0f11ca1c -/* f11ca10: ac20eedc */ sw $zero,-0x1124($at) +/* f11ca10: ac20eedc */ sw $zero,%lo(var8005eedc)($at) .L0f11ca14: -/* f11ca14: 3c018006 */ lui $at,0x8006 -/* f11ca18: ac2deedc */ sw $t5,-0x1124($at) +/* f11ca14: 3c018006 */ lui $at,%hi(var8005eedc) +/* f11ca18: ac2deedc */ sw $t5,%lo(var8005eedc)($at) .L0f11ca1c: /* f11ca1c: 8fbf001c */ lw $ra,0x1c($sp) /* f11ca20: 8fb00018 */ lw $s0,0x18($sp) @@ -7616,8 +7616,8 @@ glabel func0f11ca30 /* f11ca7c: 8fbf003c */ lw $ra,0x3c($sp) .L0f11ca80: /* f11ca80: 96b804e4 */ lhu $t8,0x4e4($s5) -/* f11ca84: 3c028007 */ lui $v0,0x8007 -/* f11ca88: 90565d10 */ lbu $s6,0x5d10($v0) +/* f11ca84: 3c028007 */ lui $v0,%hi(var80075d10) +/* f11ca88: 90565d10 */ lbu $s6,%lo(var80075d10)($v0) /* f11ca8c: 3319000f */ andi $t9,$t8,0xf /* f11ca90: 241400ff */ addiu $s4,$zero,0xff /* f11ca94: 17200035 */ bnez $t9,.L0f11cb6c @@ -7676,8 +7676,8 @@ glabel func0f11ca30 /* f11cb58: 24010005 */ addiu $at,$zero,0x5 /* f11cb5c: 5621ffd3 */ bnel $s1,$at,.L0f11caac /* f11cb60: 92a904d1 */ lbu $t1,0x4d1($s5) -/* f11cb64: 3c018007 */ lui $at,0x8007 -/* f11cb68: a0335d10 */ sb $s3,0x5d10($at) +/* f11cb64: 3c018007 */ lui $at,%hi(var80075d10) +/* f11cb68: a0335d10 */ sb $s3,%lo(var80075d10)($at) .L0f11cb6c: /* f11cb6c: 8fbf003c */ lw $ra,0x3c($sp) .L0f11cb70: @@ -9281,9 +9281,9 @@ glabel var7f1b4fd8 /* f11e0e8: 3c0f8007 */ lui $t7,%hi(var80075d14) /* f11e0ec: 8def5d14 */ lw $t7,%lo(var80075d14)($t7) /* f11e0f0: 83a80023 */ lb $t0,0x23($sp) -/* f11e0f4: 3c018007 */ lui $at,0x8007 +/* f11e0f4: 3c018007 */ lui $at,%hi(g_MpPlayerNum) /* f11e0f8: 11e00004 */ beqz $t7,.L0f11e10c -/* f11e0fc: ac281448 */ sw $t0,0x1448($at) +/* f11e0fc: ac281448 */ sw $t0,%lo(g_MpPlayerNum)($at) /* f11e100: 24040007 */ addiu $a0,$zero,0x7 /* f11e104: 0fc3c328 */ jal func0f0f0ca0 /* f11e108: 24050001 */ addiu $a1,$zero,0x1 @@ -9507,9 +9507,9 @@ glabel func0f11e3fc /* f11e428: 240f0001 */ addiu $t7,$zero,0x1 /* f11e42c: 15c1000c */ bne $t6,$at,.L0f11e460 /* f11e430: 24040001 */ addiu $a0,$zero,0x1 -/* f11e434: 3c018007 */ lui $at,0x8007 +/* f11e434: 3c018007 */ lui $at,%hi(var80075cd0) /* f11e438: 3c057f1b */ lui $a1,%hi(var7f1b4d1c) -/* f11e43c: ac2f5cd0 */ sw $t7,0x5cd0($at) +/* f11e43c: ac2f5cd0 */ sw $t7,%lo(var80075cd0)($at) /* f11e440: 0c004c04 */ jal func00013010 /* f11e444: 24a54d1c */ addiu $a1,$a1,%lo(var7f1b4d1c) /* f11e448: 50400008 */ beqzl $v0,.L0f11e46c @@ -9519,8 +9519,8 @@ glabel func0f11e3fc /* f11e458: 10000004 */ beqz $zero,.L0f11e46c /* f11e45c: 8fbf0014 */ lw $ra,0x14($sp) .L0f11e460: -/* f11e460: 3c018007 */ lui $at,0x8007 -/* f11e464: ac205cd0 */ sw $zero,0x5cd0($at) +/* f11e460: 3c018007 */ lui $at,%hi(var80075cd0) +/* f11e464: ac205cd0 */ sw $zero,%lo(var80075cd0)($at) /* f11e468: 8fbf0014 */ lw $ra,0x14($sp) .L0f11e46c: /* f11e46c: 27bd0020 */ addiu $sp,$sp,0x20 diff --git a/src/game/propobj.c b/src/game/propobj.c index 978f9d046..2ccbbdc94 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -316,8 +316,8 @@ glabel func0f066310 /* f066510: 00000000 */ sll $zero,$zero,0x0 /* f066514: 1840000f */ blez $v0,.L0f066554 /* f066518: 00008025 */ or $s0,$zero,$zero -/* f06651c: 3c028006 */ lui $v0,%hi(var80060368) -/* f066520: 8c422988 */ lw $v0,0x2988($v0) +/* f06651c: 3c028006 */ lui $v0,%hi(g_ChrsA) +/* f066520: 8c422988 */ lw $v0,%lo(g_ChrsA)($v0) .L0f066524: /* f066524: 8c4f001c */ lw $t7,0x1c($v0) /* f066528: 26100001 */ addiu $s0,$s0,0x1 @@ -331,7 +331,7 @@ glabel func0f066310 /* f066548: 00009025 */ or $s2,$zero,$zero .L0f06654c: /* f06654c: 160cfff5 */ bne $s0,$t4,.L0f066524 -/* f066550: 24420368 */ addiu $v0,$v0,%lo(var80060368) +/* f066550: 24420368 */ addiu $v0,$v0,872 .L0f066554: /* f066554: 52400006 */ beqzl $s2,.L0f066570 /* f066558: 8e73000c */ lw $s3,0xc($s3) @@ -3963,12 +3963,12 @@ glabel var7f1aa1d8 /* f0695e0: 3c0e8007 */ lui $t6,%hi(var8006997c) /* f0695e4: 3c0f8007 */ lui $t7,%hi(var80069978) /* f0695e8: 17200004 */ bnez $t9,.L0f0695fc -/* f0695ec: 3c028007 */ lui $v0,0x8007 +/* f0695ec: 3c028007 */ lui $v0,%hi(var80069978+0x3) /* f0695f0: 8dce997c */ lw $t6,%lo(var8006997c)($t6) /* f0695f4: 51c0000a */ beqzl $t6,.L0f069620 /* f0695f8: 8fbf001c */ lw $ra,0x1c($sp) .L0f0695fc: -/* f0695fc: 9042997b */ lbu $v0,-0x6685($v0) +/* f0695fc: 9042997b */ lbu $v0,%lo(var80069978+0x3)($v0) /* f069600: 8def9978 */ lw $t7,%lo(var80069978)($t7) /* f069604: 3c188007 */ lui $t8,%hi(var8006997c) /* f069608: a2020000 */ sb $v0,0x0($s0) @@ -4937,14 +4937,14 @@ glabel func0f06a1ec /* f06a33c: a60a0058 */ sh $t2,0x58($s0) /* f06a340: ad700004 */ sw $s0,0x4($t3) /* f06a344: 8e0c0018 */ lw $t4,0x18($s0) -/* f06a348: 3c0f8008 */ lui $t7,0x8008 +/* f06a348: 3c0f8008 */ lui $t7,%hi(g_Props+0x6) /* f06a34c: 3c014f80 */ lui $at,0x4f80 /* f06a350: a1800001 */ sb $zero,0x1($t4) /* f06a354: 860d0004 */ lh $t5,0x4($s0) /* f06a358: 8e040018 */ lw $a0,0x18($s0) /* f06a35c: 000d70c0 */ sll $t6,$t5,0x3 /* f06a360: 01ee7821 */ addu $t7,$t7,$t6 -/* f06a364: 95efb072 */ lhu $t7,-0x4f8e($t7) +/* f06a364: 95efb072 */ lhu $t7,%lo(g_Props+0x6)($t7) /* f06a368: 448f2000 */ mtc1 $t7,$f4 /* f06a36c: 05e10004 */ bgez $t7,.L0f06a380 /* f06a370: 468021a0 */ cvt.s.w $f6,$f4 @@ -6262,11 +6262,11 @@ glabel func0f06b488 /* f06b5c8: e48a0008 */ swc1 $f10,0x8($a0) /* f06b5cc: 8fae0048 */ lw $t6,0x48($sp) .L0f06b5d0: -/* f06b5d0: 3c018007 */ lui $at,0x8007 +/* f06b5d0: 3c018007 */ lui $at,%hi(var80069930) /* f06b5d4: 24020001 */ addiu $v0,$zero,0x1 -/* f06b5d8: ac2e9930 */ sw $t6,-0x66d0($at) -/* f06b5dc: 3c018007 */ lui $at,0x8007 -/* f06b5e0: ac209934 */ sw $zero,-0x66cc($at) +/* f06b5d8: ac2e9930 */ sw $t6,%lo(var80069930)($at) +/* f06b5dc: 3c018007 */ lui $at,%hi(var80069934) +/* f06b5e0: ac209934 */ sw $zero,%lo(var80069934)($at) /* f06b5e4: 3c01800a */ lui $at,%hi(var8009ce70) /* f06b5e8: ac20ce70 */ sw $zero,%lo(var8009ce70)($at) /* f06b5ec: 3c01800a */ lui $at,%hi(var8009ce74) @@ -6460,17 +6460,17 @@ glabel func0f06b610 /* f06b8b4: e6080008 */ swc1 $f8,0x8($s0) /* f06b8b8: 8fb90114 */ lw $t9,0x114($sp) .L0f06b8bc: -/* f06b8bc: 3c018007 */ lui $at,0x8007 +/* f06b8bc: 3c018007 */ lui $at,%hi(var80069930) /* f06b8c0: c7a600b4 */ lwc1 $f6,0xb4($sp) -/* f06b8c4: ac399930 */ sw $t9,-0x66d0($at) +/* f06b8c4: ac399930 */ sw $t9,%lo(var80069930)($at) /* f06b8c8: 3c01800a */ lui $at,%hi(var8009ce70) /* f06b8cc: ac34ce70 */ sw $s4,%lo(var8009ce70)($at) /* f06b8d0: 8fa800e4 */ lw $t0,0xe4($sp) /* f06b8d4: c7aa00b8 */ lwc1 $f10,0xb8($sp) /* f06b8d8: c7a800bc */ lwc1 $f8,0xbc($sp) -/* f06b8dc: 3c018007 */ lui $at,0x8007 +/* f06b8dc: 3c018007 */ lui $at,%hi(var80069934) /* f06b8e0: 87a900dc */ lh $t1,0xdc($sp) -/* f06b8e4: ac359934 */ sw $s5,-0x66cc($at) +/* f06b8e4: ac359934 */ sw $s5,%lo(var80069934)($at) /* f06b8e8: 4600310d */ trunc.w.s $f4,$f6 /* f06b8ec: 3c01800a */ lui $at,%hi(var8009ce74) /* f06b8f0: ac28ce74 */ sw $t0,%lo(var8009ce74)($at) @@ -6481,11 +6481,11 @@ glabel func0f06b610 /* f06b904: 00015043 */ sra $t2,$at,0x1 .L0f06b908: /* f06b908: 4600418d */ trunc.w.s $f6,$f8 -/* f06b90c: 3c018007 */ lui $at,0x8007 +/* f06b90c: 3c018007 */ lui $at,%hi(var80069938) /* f06b910: 440b2000 */ mfc1 $t3,$f4 /* f06b914: 440f9000 */ mfc1 $t7,$f18 /* f06b918: 44183000 */ mfc1 $t8,$f6 -/* f06b91c: ac2a9938 */ sw $t2,-0x66c8($at) +/* f06b91c: ac2a9938 */ sw $t2,%lo(var80069938)($at) /* f06b920: a62b0000 */ sh $t3,0x0($s1) /* f06b924: a62f0002 */ sh $t7,0x2($s1) /* f06b928: a6380004 */ sh $t8,0x4($s1) @@ -6714,18 +6714,18 @@ glabel func0f06b610 /* f06bc70: e6060008 */ swc1 $f6,0x8($s0) /* f06bc74: 8faa0114 */ lw $t2,0x114($sp) .L0f06bc78: -/* f06bc78: 3c018007 */ lui $at,0x8007 +/* f06bc78: 3c018007 */ lui $at,%hi(var80069930) /* f06bc7c: 8fac00ec */ lw $t4,0xec($sp) -/* f06bc80: ac2a9930 */ sw $t2,-0x66d0($at) -/* f06bc84: 3c018007 */ lui $at,0x8007 -/* f06bc88: ac359934 */ sw $s5,-0x66cc($at) +/* f06bc80: ac2a9930 */ sw $t2,%lo(var80069930)($at) +/* f06bc84: 3c018007 */ lui $at,%hi(var80069934) +/* f06bc88: ac359934 */ sw $s5,%lo(var80069934)($at) /* f06bc8c: 3c01800a */ lui $at,%hi(var8009ce70) /* f06bc90: ac34ce70 */ sw $s4,%lo(var8009ce70)($at) /* f06bc94: 87a200de */ lh $v0,0xde($sp) /* f06bc98: 3c01800a */ lui $at,%hi(var8009ce74) /* f06bc9c: ac2cce74 */ sw $t4,%lo(var8009ce74)($at) -/* f06bca0: 3c018007 */ lui $at,0x8007 -/* f06bca4: ac229944 */ sw $v0,-0x66bc($at) +/* f06bca0: 3c018007 */ lui $at,%hi(var80069944) +/* f06bca4: ac229944 */ sw $v0,%lo(var80069944)($at) /* f06bca8: 24012710 */ addiu $at,$zero,0x2710 /* f06bcac: 14410016 */ bne $v0,$at,.L0f06bd08 /* f06bcb0: 241e0001 */ addiu $s8,$zero,0x1 @@ -6743,11 +6743,11 @@ glabel func0f06b610 /* f06bce0: 00016843 */ sra $t5,$at,0x1 .L0f06bce4: /* f06bce4: 4600320d */ trunc.w.s $f8,$f6 -/* f06bce8: 3c018007 */ lui $at,0x8007 +/* f06bce8: 3c018007 */ lui $at,%hi(var80069938) /* f06bcec: 440f9000 */ mfc1 $t7,$f18 /* f06bcf0: 44085000 */ mfc1 $t0,$f10 /* f06bcf4: 44094000 */ mfc1 $t1,$f8 -/* f06bcf8: ac2d9938 */ sw $t5,-0x66c8($at) +/* f06bcf8: ac2d9938 */ sw $t5,%lo(var80069938)($at) /* f06bcfc: a62f0000 */ sh $t7,0x0($s1) /* f06bd00: a6280002 */ sh $t0,0x2($s1) /* f06bd04: a6290004 */ sh $t1,0x4($s1) @@ -7396,8 +7396,8 @@ glabel func0f06c28c /* f06c5a8: 8fb900e8 */ lw $t9,0xe8($sp) .L0f06c5ac: /* f06c5ac: c7aa007c */ lwc1 $f10,0x7c($sp) -/* f06c5b0: 3c018007 */ lui $at,0x8007 -/* f06c5b4: ac399930 */ sw $t9,-0x66d0($at) +/* f06c5b0: 3c018007 */ lui $at,%hi(var80069930) +/* f06c5b4: ac399930 */ sw $t9,%lo(var80069930)($at) /* f06c5b8: 4600518d */ trunc.w.s $f6,$f10 /* f06c5bc: 8fa800d0 */ lw $t0,0xd0($sp) /* f06c5c0: 3c01800a */ lui $at,%hi(var8009ce70) @@ -7405,9 +7405,9 @@ glabel func0f06c28c /* f06c5c8: 8fa900cc */ lw $t1,0xcc($sp) /* f06c5cc: c7a40080 */ lwc1 $f4,0x80($sp) /* f06c5d0: c7aa0084 */ lwc1 $f10,0x84($sp) -/* f06c5d4: 3c018007 */ lui $at,0x8007 +/* f06c5d4: 3c018007 */ lui $at,%hi(var80069934) /* f06c5d8: 87ab00a4 */ lh $t3,0xa4($sp) -/* f06c5dc: ac289934 */ sw $t0,-0x66cc($at) +/* f06c5dc: ac289934 */ sw $t0,%lo(var80069934)($at) /* f06c5e0: 440e3000 */ mfc1 $t6,$f6 /* f06c5e4: 3c01800a */ lui $at,%hi(var8009ce74) /* f06c5e8: 4600220d */ trunc.w.s $f8,$f4 @@ -7418,9 +7418,9 @@ glabel func0f06c28c /* f06c5fc: 00015043 */ sra $t2,$at,0x1 .L0f06c600: /* f06c600: 4600518d */ trunc.w.s $f6,$f10 -/* f06c604: 3c018007 */ lui $at,0x8007 +/* f06c604: 3c018007 */ lui $at,%hi(var80069938) /* f06c608: 440f4000 */ mfc1 $t7,$f8 -/* f06c60c: ac2a9938 */ sw $t2,-0x66c8($at) +/* f06c60c: ac2a9938 */ sw $t2,%lo(var80069938)($at) /* f06c610: 44193000 */ mfc1 $t9,$f6 /* f06c614: a60e0000 */ sh $t6,0x0($s0) /* f06c618: a60f0002 */ sh $t7,0x2($s0) @@ -7511,14 +7511,14 @@ glabel func0f06c28c /* f06c754: e6240008 */ swc1 $f4,0x8($s1) /* f06c758: 8fad00e8 */ lw $t5,0xe8($sp) .L0f06c75c: -/* f06c75c: 3c018007 */ lui $at,0x8007 +/* f06c75c: 3c018007 */ lui $at,%hi(var80069930) /* f06c760: 8faf00d0 */ lw $t7,0xd0($sp) -/* f06c764: ac2d9930 */ sw $t5,-0x66d0($at) +/* f06c764: ac2d9930 */ sw $t5,%lo(var80069930)($at) /* f06c768: 3c01800a */ lui $at,%hi(var8009ce70) /* f06c76c: ac32ce70 */ sw $s2,%lo(var8009ce70)($at) /* f06c770: 8fb800cc */ lw $t8,0xcc($sp) -/* f06c774: 3c018007 */ lui $at,0x8007 -/* f06c778: ac2f9934 */ sw $t7,-0x66cc($at) +/* f06c774: 3c018007 */ lui $at,%hi(var80069934) +/* f06c778: ac2f9934 */ sw $t7,%lo(var80069934)($at) /* f06c77c: 3c01800a */ lui $at,%hi(var8009ce74) /* f06c780: 24190001 */ addiu $t9,$zero,0x1 /* f06c784: afb900c8 */ sw $t9,0xc8($sp) @@ -7537,9 +7537,9 @@ glabel func0f06c28c /* f06c7b0: afa80010 */ sw $t0,0x10($sp) /* f06c7b4: 10400005 */ beqz $v0,.L0f06c7cc /* f06c7b8: 2409000f */ addiu $t1,$zero,0xf -/* f06c7bc: 3c018007 */ lui $at,0x8007 +/* f06c7bc: 3c018007 */ lui $at,%hi(var80069934) /* f06c7c0: 240b0001 */ addiu $t3,$zero,0x1 -/* f06c7c4: ac299934 */ sw $t1,-0x66cc($at) +/* f06c7c4: ac299934 */ sw $t1,%lo(var80069934)($at) /* f06c7c8: afab00c8 */ sw $t3,0xc8($sp) .L0f06c7cc: /* f06c7cc: 8faa00e8 */ lw $t2,0xe8($sp) @@ -7933,10 +7933,10 @@ glabel var7f1aa268 /* f06cd5c: 24180001 */ addiu $t8,$zero,0x1 /* f06cd60: ac58048c */ sw $t8,0x48c($v0) .L0f06cd64: -/* f06cd64: 3c018007 */ lui $at,0x8007 -/* f06cd68: ac209930 */ sw $zero,-0x66d0($at) -/* f06cd6c: 3c018007 */ lui $at,0x8007 -/* f06cd70: ac209944 */ sw $zero,-0x66bc($at) +/* f06cd64: 3c018007 */ lui $at,%hi(var80069930) +/* f06cd68: ac209930 */ sw $zero,%lo(var80069930)($at) +/* f06cd6c: 3c018007 */ lui $at,%hi(var80069944) +/* f06cd70: ac209944 */ sw $zero,%lo(var80069944)($at) /* f06cd74: c6040000 */ lwc1 $f4,0x0($s0) /* f06cd78: e7a401c4 */ swc1 $f4,0x1c4($sp) /* f06cd7c: c6060004 */ lwc1 $f6,0x4($s0) @@ -8023,11 +8023,11 @@ glabel var7f1aa268 /* f06ceb0: 3c09800b */ lui $t1,%hi(var800aabc0) /* f06ceb4: 8d29abc0 */ lw $t1,%lo(var800aabc0)($t1) /* f06ceb8: 46163202 */ mul.s $f8,$f6,$f22 -/* f06cebc: 3c018007 */ lui $at,0x8007 +/* f06cebc: 3c018007 */ lui $at,%hi(var80069944) /* f06cec0: 000850c0 */ sll $t2,$t0,0x3 /* f06cec4: e7b001d0 */ swc1 $f16,0x1d0($sp) /* f06cec8: e7a401d4 */ swc1 $f4,0x1d4($sp) -/* f06cecc: ac289944 */ sw $t0,-0x66bc($at) +/* f06cecc: ac289944 */ sw $t0,%lo(var80069944)($at) /* f06ced0: 012a5821 */ addu $t3,$t1,$t2 /* f06ced4: e7a801d8 */ swc1 $f8,0x1d8($sp) /* f06ced8: 916c0000 */ lbu $t4,0x0($t3) @@ -8364,14 +8364,14 @@ glabel var7f1aa26c /* f06d398: afa500ac */ sw $a1,0xac($sp) /* f06d39c: 0fc1acdb */ jal func0f06b36c /* f06d3a0: afa400a8 */ sw $a0,0xa8($sp) -/* f06d3a4: 3c018007 */ lui $at,0x8007 +/* f06d3a4: 3c018007 */ lui $at,%hi(var80069930) /* f06d3a8: 8fa500ac */ lw $a1,0xac($sp) -/* f06d3ac: ac209930 */ sw $zero,-0x66d0($at) +/* f06d3ac: ac209930 */ sw $zero,%lo(var80069930)($at) /* f06d3b0: 240e0001 */ addiu $t6,$zero,0x1 -/* f06d3b4: 3c018007 */ lui $at,0x8007 +/* f06d3b4: 3c018007 */ lui $at,%hi(var80069944) /* f06d3b8: afae009c */ sw $t6,0x9c($sp) /* f06d3bc: afa00098 */ sw $zero,0x98($sp) -/* f06d3c0: ac209944 */ sw $zero,-0x66bc($at) +/* f06d3c0: ac209944 */ sw $zero,%lo(var80069944)($at) /* f06d3c4: c4a40000 */ lwc1 $f4,0x0($a1) /* f06d3c8: 46000086 */ mov.s $f2,$f0 /* f06d3cc: 8faf00a8 */ lw $t7,0xa8($sp) @@ -33189,12 +33189,12 @@ glabel func0f082d74 /* f082e54: 55e0fffa */ bnezl $t7,.L0f082e40 /* f082e58: 24630001 */ addiu $v1,$v1,0x1 .L0f082e5c: -/* f082e5c: 3c018007 */ lui $at,0x8007 -/* f082e60: a038abbc */ sb $t8,-0x5444($at) +/* f082e5c: 3c018007 */ lui $at,%hi(var8006abbc) +/* f082e60: a038abbc */ sb $t8,%lo(var8006abbc)($at) /* f082e64: 0303082a */ slt $at,$t8,$v1 /* f082e68: 14200002 */ bnez $at,.L0f082e74 -/* f082e6c: 3c018007 */ lui $at,0x8007 -/* f082e70: a020abbc */ sb $zero,-0x5444($at) +/* f082e6c: 3c018007 */ lui $at,%hi(var8006abbc) +/* f082e70: a020abbc */ sb $zero,%lo(var8006abbc)($at) .L0f082e74: /* f082e74: 8fbf0014 */ lw $ra,0x14($sp) /* f082e78: 27bd0088 */ addiu $sp,$sp,0x88 @@ -34660,10 +34660,10 @@ glabel func0f0841dc /* f08421c: 3c19800a */ lui $t9,%hi(g_Vars+0x2ac) /* f084220: 8f39a26c */ lw $t9,%lo(g_Vars+0x2ac)($t9) /* f084224: 8e050014 */ lw $a1,0x14($s0) -/* f084228: 3c068008 */ lui $a2,0x8008 +/* f084228: 3c068008 */ lui $a2,%hi(propexplosiontypes+0x8) /* f08422c: 24010006 */ addiu $at,$zero,0x6 /* f084230: 00d83021 */ addu $a2,$a2,$t8 -/* f084234: 80c6be3c */ lb $a2,-0x41c4($a2) +/* f084234: 80c6be3c */ lb $a2,%lo(propexplosiontypes+0x8)($a2) /* f084238: 17210007 */ bne $t9,$at,.L0f084258 /* f08423c: 00a01825 */ or $v1,$a1,$zero /* f084240: 3c08800a */ lui $t0,%hi(var8009de18) @@ -41556,8 +41556,8 @@ glabel func0f089f8c /* f08a178: 01ec0019 */ multu $t7,$t4 /* f08a17c: 3c18800a */ lui $t8,%hi(var8009ce58) /* f08a180: 8f18ce58 */ lw $t8,%lo(var8009ce58)($t8) -/* f08a184: 3c018007 */ lui $at,0x8007 -/* f08a188: ac2d9914 */ sw $t5,-0x66ec($at) +/* f08a184: 3c018007 */ lui $at,%hi(var80069914) +/* f08a188: ac2d9914 */ sw $t5,%lo(var80069914)($at) /* f08a18c: 00007012 */ mflo $t6 /* f08a190: 01d81021 */ addu $v0,$t6,$t8 /* f08a194: 1000006f */ beqz $zero,.L0f08a354 @@ -41615,9 +41615,9 @@ glabel func0f089f8c /* f08a254: 00000000 */ sll $zero,$zero,0x0 /* f08a258: 0006000d */ break 0x6 .L0f08a25c: -/* f08a25c: 3c018007 */ lui $at,0x8007 +/* f08a25c: 3c018007 */ lui $at,%hi(var80069914) /* f08a260: 0000c810 */ mfhi $t9 -/* f08a264: ac399914 */ sw $t9,-0x66ec($at) +/* f08a264: ac399914 */ sw $t9,%lo(var80069914)($at) /* f08a268: 1000003a */ beqz $zero,.L0f08a354 /* f08a26c: 8fbf0024 */ lw $ra,0x24($sp) .L0f08a270: @@ -41667,9 +41667,9 @@ glabel func0f089f8c /* f08a30c: 00000000 */ sll $zero,$zero,0x0 /* f08a310: 0006000d */ break 0x6 .L0f08a314: -/* f08a314: 3c018007 */ lui $at,0x8007 +/* f08a314: 3c018007 */ lui $at,%hi(var80069914) /* f08a318: 00006810 */ mfhi $t5 -/* f08a31c: ac2d9914 */ sw $t5,-0x66ec($at) +/* f08a31c: ac2d9914 */ sw $t5,%lo(var80069914)($at) /* f08a320: 1000000c */ beqz $zero,.L0f08a354 /* f08a324: 8fbf0024 */ lw $ra,0x24($sp) .L0f08a328: @@ -45452,10 +45452,10 @@ glabel var7f1aaf78 /* f08d5a8: 0c005746 */ jal func00015d18 /* f08d5ac: 27a50038 */ addiu $a1,$sp,0x38 /* f08d5b0: 86090004 */ lh $t1,0x4($s0) -/* f08d5b4: 3c0b8008 */ lui $t3,0x8008 +/* f08d5b4: 3c0b8008 */ lui $t3,%hi(g_Props+0x6) /* f08d5b8: 000950c0 */ sll $t2,$t1,0x3 /* f08d5bc: 016a5821 */ addu $t3,$t3,$t2 -/* f08d5c0: 956bb072 */ lhu $t3,-0x4f8e($t3) +/* f08d5c0: 956bb072 */ lhu $t3,%lo(g_Props+0x6)($t3) /* f08d5c4: 448b2000 */ mtc1 $t3,$f4 /* f08d5c8: 05610005 */ bgez $t3,.L0f08d5e0 /* f08d5cc: 468021a0 */ cvt.s.w $f6,$f4 @@ -48765,8 +48765,8 @@ GLOBAL_ASM( glabel func0f09044c /* f09044c: 44802000 */ mtc1 $zero,$f4 /* f090450: 240e0001 */ addiu $t6,$zero,0x1 -/* f090454: 3c018007 */ lui $at,0x8007 -/* f090458: ac2e98e8 */ sw $t6,-0x6718($at) +/* f090454: 3c018007 */ lui $at,%hi(var800698e8) +/* f090458: ac2e98e8 */ sw $t6,%lo(var800698e8)($at) /* f09045c: 27bdffe8 */ addiu $sp,$sp,-24 /* f090460: 3c018007 */ lui $at,0x8007 /* f090464: afbf0014 */ sw $ra,0x14($sp) @@ -48954,7 +48954,7 @@ glabel var7f1ab19c /* f0906dc: c42ace38 */ lwc1 $f10,-0x31c8($at) /* f0906e0: c4400000 */ lwc1 $f0,0x0($v0) /* f0906e4: 3c01800a */ lui $at,0x800a -/* f0906e8: 3c048007 */ lui $a0,%hi(var80069900) +/* f0906e8: 3c048007 */ lui $a0,0x8007 /* f0906ec: 460a003c */ c.lt.s $f0,$f10 /* f0906f0: 00000000 */ sll $zero,$zero,0x0 /* f0906f4: 45000037 */ bc1f .L0f0907d4 @@ -49015,7 +49015,7 @@ glabel var7f1ab19c /* f0907cc: 1000000b */ beqz $zero,.L0f0907fc /* f0907d0: 8fbf002c */ lw $ra,0x2c($sp) .L0f0907d4: -/* f0907d4: 8c849900 */ lw $a0,%lo(var80069900)($a0) +/* f0907d4: 8c849900 */ lw $a0,-26368($a0) /* f0907d8: 50800008 */ beqzl $a0,.L0f0907fc /* f0907dc: 8fbf002c */ lw $ra,0x2c($sp) /* f0907e0: 0c00cdfc */ jal func000337f0 @@ -49646,8 +49646,8 @@ glabel var7f1ab208 /* f091014: 0fc22b2c */ jal func0f08acb0 /* f091018: 00000000 */ sll $zero,$zero,0x0 /* f09101c: 8fbf002c */ lw $ra,0x2c($sp) -/* f091020: 3c018007 */ lui $at,0x8007 -/* f091024: ac209910 */ sw $zero,-0x66f0($at) +/* f091020: 3c018007 */ lui $at,%hi(var80069910) +/* f091024: ac209910 */ sw $zero,%lo(var80069910)($at) /* f091028: 03e00008 */ jr $ra /* f09102c: 27bd0038 */ addiu $sp,$sp,0x38 ); diff --git a/src/game/utils.c b/src/game/utils.c index 8a8f7316a..8152ae5ef 100644 --- a/src/game/utils.c +++ b/src/game/utils.c @@ -113,20 +113,20 @@ glabel func0f176ddc /* f176e70: 8ca20000 */ lw $v0,0x0($a1) .L0f176e74: /* f176e74: 8fa90018 */ lw $t1,0x18($sp) -/* f176e78: 3c018008 */ lui $at,0x8008 +/* f176e78: 3c018008 */ lui $at,%hi(var80084610) /* f176e7c: 24481900 */ addiu $t0,$v0,0x1900 -/* f176e80: ac284610 */ sw $t0,0x4610($at) +/* f176e80: ac284610 */ sw $t0,%lo(var80084610)($at) /* f176e84: 00495021 */ addu $t2,$v0,$t1 /* f176e88: 8fbf0014 */ lw $ra,0x14($sp) /* f176e8c: 254bffff */ addiu $t3,$t2,-1 -/* f176e90: 3c018008 */ lui $at,0x8008 +/* f176e90: 3c018008 */ lui $at,%hi(var80084618) /* f176e94: 3c0c8008 */ lui $t4,%hi(var80084610) /* f176e98: 8d8c4610 */ lw $t4,%lo(var80084610)($t4) -/* f176e9c: ac2b4618 */ sw $t3,0x4618($at) -/* f176ea0: 3c018008 */ lui $at,0x8008 +/* f176e9c: ac2b4618 */ sw $t3,%lo(var80084618)($at) +/* f176ea0: 3c018008 */ lui $at,%hi(var80084614) /* f176ea4: 27bd0028 */ addiu $sp,$sp,0x28 /* f176ea8: 03e00008 */ jr $ra -/* f176eac: ac2c4614 */ sw $t4,0x4614($at) +/* f176eac: ac2c4614 */ sw $t4,%lo(var80084614)($at) /* f176eb0: 0085001a */ div $zero,$a0,$a1 /* f176eb4: 00007010 */ mfhi $t6 /* f176eb8: 14a00002 */ bnez $a1,.L0f176ec4 @@ -1046,10 +1046,10 @@ glabel func0f177bb4 /* f177bd8: accf0000 */ sw $t7,0x0($a2) .L0f177bdc: /* f177bdc: 8ce74624 */ lw $a3,%lo(var80084624)($a3) -/* f177be0: 3c018008 */ lui $at,0x8008 +/* f177be0: 3c018008 */ lui $at,%hi(var80084624) /* f177be4: 24e7ffff */ addiu $a3,$a3,-1 /* f177be8: 1ce00022 */ bgtz $a3,.L0f177c74 -/* f177bec: ac274624 */ sw $a3,0x4624($at) +/* f177bec: ac274624 */ sw $a3,%lo(var80084624)($at) /* f177bf0: 8ca20000 */ lw $v0,0x0($a1) /* f177bf4: 0044c021 */ addu $t8,$v0,$a0 /* f177bf8: 93080000 */ lbu $t0,0x0($t8) @@ -1079,9 +1079,9 @@ glabel func0f177bb4 /* f177c50: 244c0001 */ addiu $t4,$v0,0x1 .L0f177c54: /* f177c54: 00e93821 */ addu $a3,$a3,$t1 -/* f177c58: 3c018008 */ lui $at,0x8008 +/* f177c58: 3c018008 */ lui $at,%hi(var80084624) /* f177c5c: 10000003 */ beqz $zero,.L0f177c6c -/* f177c60: ac274624 */ sw $a3,0x4624($at) +/* f177c60: ac274624 */ sw $a3,%lo(var80084624)($at) .L0f177c64: /* f177c64: 03e00008 */ jr $ra /* f177c68: 2402ffff */ addiu $v0,$zero,-1 diff --git a/src/game/wallhit.c b/src/game/wallhit.c index b73ac7c8c..182f67143 100644 --- a/src/game/wallhit.c +++ b/src/game/wallhit.c @@ -899,8 +899,8 @@ glabel var7f1b5d18 /* f13ebc8: 0c0036cc */ jal func0000db30 /* f13ebcc: 24845a54 */ addiu $a0,$a0,%lo(var7f1b5a54) /* f13ebd0: 44803000 */ mtc1 $zero,$f6 -/* f13ebd4: 3c018008 */ lui $at,0x8008 -/* f13ebd8: ac20f740 */ sw $zero,-0x8c0($at) +/* f13ebd4: 3c018008 */ lui $at,%hi(var8007f740) +/* f13ebd8: ac20f740 */ sw $zero,%lo(var8007f740)($at) /* f13ebdc: 4606a032 */ c.eq.s $f20,$f6 /* f13ebe0: 3c014270 */ lui $at,0x4270 /* f13ebe4: 3c038008 */ lui $v1,%hi(var8007f748) @@ -959,14 +959,14 @@ glabel var7f1b5d18 /* f13eca8: 1020000a */ beqz $at,.L0f13ecd4 /* f13ecac: 3c028008 */ lui $v0,%hi(var8007f834) /* f13ecb0: 8c42f834 */ lw $v0,%lo(var8007f834)($v0) -/* f13ecb4: 3c018008 */ lui $at,0x8008 +/* f13ecb4: 3c018008 */ lui $at,%hi(var8007f834) /* f13ecb8: 24420001 */ addiu $v0,$v0,0x1 -/* f13ecbc: ac22f834 */ sw $v0,-0x7cc($at) +/* f13ecbc: ac22f834 */ sw $v0,%lo(var8007f834)($at) /* f13ecc0: 24010008 */ addiu $at,$zero,0x8 /* f13ecc4: 14410003 */ bne $v0,$at,.L0f13ecd4 -/* f13ecc8: 3c018008 */ lui $at,0x8008 +/* f13ecc8: 3c018008 */ lui $at,%hi(var8007f834) /* f13eccc: 0fc4fa65 */ jal func0f13e994 -/* f13ecd0: ac20f834 */ sw $zero,-0x7cc($at) +/* f13ecd0: ac20f834 */ sw $zero,%lo(var8007f834)($at) .L0f13ecd4: /* f13ecd4: 3c02800a */ lui $v0,%hi(var8009cc44) /* f13ecd8: 8c42cc44 */ lw $v0,%lo(var8009cc44)($v0) diff --git a/src/lib/lib_03050.c b/src/lib/lib_03050.c index 931f0071c..7e083f609 100644 --- a/src/lib/lib_03050.c +++ b/src/lib/lib_03050.c @@ -42,10 +42,10 @@ glabel osCreateViManager /* 3070: 8fbf0024 */ lw $ra,0x24($sp) /* 3074: 0c01246c */ jal __osTimerServicesInit /* 3078: 00000000 */ sll $zero,$zero,0x0 -/* 307c: 3c018006 */ lui $at,0x8006 +/* 307c: 3c018006 */ lui $at,%hi(var8005cefc) /* 3080: 3c048009 */ lui $a0,%hi(var80090230) /* 3084: 3c058009 */ lui $a1,%hi(var80090248) -/* 3088: ac20cefc */ sw $zero,-0x3104($at) +/* 3088: ac20cefc */ sw $zero,%lo(var8005cefc)($at) /* 308c: 24a50248 */ addiu $a1,$a1,%lo(var80090248) /* 3090: 24840230 */ addiu $a0,$a0,%lo(var80090230) /* 3094: 0c0120d0 */ jal osCreateMesgQueue diff --git a/src/lib/lib_034f0.c b/src/lib/lib_034f0.c index f612a64b3..85e5f7e80 100644 --- a/src/lib/lib_034f0.c +++ b/src/lib/lib_034f0.c @@ -422,8 +422,8 @@ glabel __osException /* 3a80: 08000f44 */ j 0x3d10 /* 3a84: ad3a0000 */ sw $k0,0x0($t1) .L00003a88: -/* 3a88: 3c018006 */ lui $at,0x8006 -/* 3a8c: ac3a0944 */ sw $k0,0x944($at) +/* 3a88: 3c018006 */ lui $at,%hi(var80060944) +/* 3a8c: ac3a0944 */ sw $k0,%lo(var80060944)($at) /* 3a90: 24090001 */ addiu $t1,$zero,0x1 /* 3a94: a7490010 */ sh $t1,0x10($k0) /* 3a98: 24090002 */ addiu $t1,$zero,0x2 @@ -617,8 +617,8 @@ glabel __osDispatchThread /* 3d10: 3c048006 */ lui $a0,%hi(var80060938) /* 3d14: 0c000f40 */ jal __osPopThread /* 3d18: 24840938 */ addiu $a0,$a0,%lo(var80060938) -/* 3d1c: 3c018006 */ lui $at,0x8006 -/* 3d20: ac220940 */ sw $v0,0x940($at) +/* 3d1c: 3c018006 */ lui $at,%hi(var80060940) +/* 3d20: ac220940 */ sw $v0,%lo(var80060940)($at) /* 3d24: 24080004 */ addiu $t0,$zero,0x4 /* 3d28: a4480010 */ sh $t0,0x10($v0) /* 3d2c: 0040d025 */ or $k0,$v0,$zero diff --git a/src/lib/lib_04a80.c b/src/lib/lib_04a80.c index 00c332749..fad455588 100644 --- a/src/lib/lib_04a80.c +++ b/src/lib/lib_04a80.c @@ -1415,21 +1415,21 @@ glabel osInitialize /* 5d30: 354ab2d2 */ ori $t2,$t2,0xb2d2 /* 5d34: 14400004 */ bnez $v0,.L00005d48 /* 5d38: 24010002 */ addiu $at,$zero,0x2 -/* 5d3c: 3c018006 */ lui $at,0x8006 +/* 5d3c: 3c018006 */ lui $at,%hi(var8005cf68) /* 5d40: 1000000b */ beqz $zero,.L00005d70 -/* 5d44: ac2acf68 */ sw $t2,-0x3098($at) +/* 5d44: ac2acf68 */ sw $t2,%lo(var8005cf68)($at) .L00005d48: /* 5d48: 14410006 */ bne $v0,$at,.L00005d64 /* 5d4c: 3c0b02e6 */ lui $t3,0x2e6 /* 5d50: 3c0902e6 */ lui $t1,0x2e6 /* 5d54: 3529d354 */ ori $t1,$t1,0xd354 -/* 5d58: 3c018006 */ lui $at,0x8006 +/* 5d58: 3c018006 */ lui $at,%hi(var8005cf68) /* 5d5c: 10000004 */ beqz $zero,.L00005d70 -/* 5d60: ac29cf68 */ sw $t1,-0x3098($at) +/* 5d60: ac29cf68 */ sw $t1,%lo(var8005cf68)($at) .L00005d64: /* 5d64: 356bd354 */ ori $t3,$t3,0xd354 -/* 5d68: 3c018006 */ lui $at,0x8006 -/* 5d6c: ac2bcf68 */ sw $t3,-0x3098($at) +/* 5d68: 3c018006 */ lui $at,%hi(var8005cf68) +/* 5d6c: ac2bcf68 */ sw $t3,%lo(var8005cf68)($at) .L00005d70: /* 5d70: 0c012c58 */ jal __osGetCause /* 5d74: 00000000 */ sll $zero,$zero,0x0 diff --git a/src/lib/lib_08a20.c b/src/lib/lib_08a20.c index 46184c9e0..b5532ef71 100644 --- a/src/lib/lib_08a20.c +++ b/src/lib/lib_08a20.c @@ -114,9 +114,9 @@ glabel func00008a48 /* 8b50: 3c018009 */ lui $at,%hi(var800918e4) /* 8b54: 256d0050 */ addiu $t5,$t3,0x50 /* 8b58: ac2d18e4 */ sw $t5,%lo(var800918e4)($at) -/* 8b5c: 3c018006 */ lui $at,0x8006 +/* 8b5c: 3c018006 */ lui $at,%hi(var8005cf94) /* 8b60: 0c002598 */ jal func00009660 -/* 8b64: a020cf94 */ sb $zero,-0x306c($at) +/* 8b64: a020cf94 */ sb $zero,%lo(var8005cf94)($at) /* 8b68: 3c048009 */ lui $a0,%hi(var80091848) /* 8b6c: 3c058009 */ lui $a1,%hi(var80091860) /* 8b70: 24a51860 */ addiu $a1,$a1,%lo(var80091860) @@ -504,8 +504,8 @@ glabel func000090ec /* 90fc: 248415e0 */ addiu $a0,$a0,%lo(var800915e0) /* 9100: 8fbf0014 */ lw $ra,0x14($sp) /* 9104: 240e0001 */ addiu $t6,$zero,0x1 -/* 9108: 3c018006 */ lui $at,0x8006 -/* 910c: a02ed510 */ sb $t6,-0x2af0($at) +/* 9108: 3c018006 */ lui $at,%hi(var8005d510) +/* 910c: a02ed510 */ sb $t6,%lo(var8005d510)($at) /* 9110: 03e00008 */ jr $ra /* 9114: 27bd0018 */ addiu $sp,$sp,0x18 ); @@ -706,8 +706,8 @@ glabel func00009154 /* 93d8: 0c0121bc */ jal osRecvMesg /* 93dc: 24060001 */ addiu $a2,$zero,0x1 .L000093e0: -/* 93e0: 3c018006 */ lui $at,0x8006 -/* 93e4: ac20d514 */ sw $zero,-0x2aec($at) +/* 93e0: 3c018006 */ lui $at,%hi(var8005d514) +/* 93e4: ac20d514 */ sw $zero,%lo(var8005d514)($at) /* 93e8: 0c002585 */ jal func00009614 /* 93ec: 8fa40060 */ lw $a0,0x60($sp) /* 93f0: 10000004 */ beqz $zero,.L00009404 @@ -869,10 +869,10 @@ glabel func00009614 /* 9628: 15c00006 */ bnez $t6,.L00009644 /* 962c: 3c0f8006 */ lui $t7,%hi(var8005d518) /* 9630: 8defd518 */ lw $t7,%lo(var8005d518)($t7) -/* 9634: 3c018006 */ lui $at,0x8006 +/* 9634: 3c018006 */ lui $at,%hi(var8005d518) /* 9638: 55e00003 */ bnezl $t7,.L00009648 /* 963c: 8fbf0014 */ lw $ra,0x14($sp) -/* 9640: ac20d518 */ sw $zero,-0x2ae8($at) +/* 9640: ac20d518 */ sw $zero,%lo(var8005d518)($at) .L00009644: /* 9644: 8fbf0014 */ lw $ra,0x14($sp) .L00009648: diff --git a/src/lib/lib_09660.c b/src/lib/lib_09660.c index 99614f575..7ef64de19 100644 --- a/src/lib/lib_09660.c +++ b/src/lib/lib_09660.c @@ -292,14 +292,14 @@ glabel func0000993c /* 99d4: 26732828 */ addiu $s3,$s3,%lo(var80092828) /* 99d8: 8e680000 */ lw $t0,0x0($s3) /* 99dc: 8fbf0024 */ lw $ra,0x24($sp) -/* 99e0: 3c018006 */ lui $at,0x8006 +/* 99e0: 3c018006 */ lui $at,%hi(var8005d520) /* 99e4: 25090001 */ addiu $t1,$t0,0x1 /* 99e8: ae690000 */ sw $t1,0x0($s3) /* 99ec: 8fb30020 */ lw $s3,0x20($sp) /* 99f0: 8fb00014 */ lw $s0,0x14($sp) /* 99f4: 8fb10018 */ lw $s1,0x18($sp) /* 99f8: 8fb2001c */ lw $s2,0x1c($sp) -/* 99fc: ac20d520 */ sw $zero,-0x2ae0($at) +/* 99fc: ac20d520 */ sw $zero,%lo(var8005d520)($at) /* 9a00: 03e00008 */ jr $ra /* 9a04: 27bd0028 */ addiu $sp,$sp,0x28 ); @@ -387,21 +387,21 @@ glabel func00009ab0 /* 9adc: a06e0000 */ sb $t6,0x0($v1) /* 9ae0: 0000c012 */ mflo $t8 /* 9ae4: 0098c821 */ addu $t9,$a0,$t8 -/* 9ae8: 3c018006 */ lui $at,0x8006 -/* 9aec: ac39d590 */ sw $t9,-0x2a70($at) +/* 9ae8: 3c018006 */ lui $at,%hi(var8005d590) +/* 9aec: ac39d590 */ sw $t9,%lo(var8005d590)($at) /* 9af0: 90680000 */ lbu $t0,0x0($v1) -/* 9af4: 3c018006 */ lui $at,0x8006 +/* 9af4: 3c018006 */ lui $at,%hi(var8005d594) /* 9af8: 3c0b8009 */ lui $t3,%hi(g_Is4Mb) /* 9afc: 01050019 */ multu $t0,$a1 /* 9b00: 916b0af0 */ lbu $t3,%lo(g_Is4Mb)($t3) /* 9b04: 240200dc */ addiu $v0,$zero,0xdc /* 9b08: 00004812 */ mflo $t1 /* 9b0c: 00895021 */ addu $t2,$a0,$t1 -/* 9b10: ac2ad594 */ sw $t2,-0x2a6c($at) -/* 9b14: 3c018006 */ lui $at,0x8006 -/* 9b18: ac20d588 */ sw $zero,-0x2a78($at) -/* 9b1c: 3c018006 */ lui $at,0x8006 -/* 9b20: ac20d58c */ sw $zero,-0x2a74($at) +/* 9b10: ac2ad594 */ sw $t2,%lo(var8005d594)($at) +/* 9b14: 3c018006 */ lui $at,%hi(var8005d588) +/* 9b18: ac20d588 */ sw $zero,%lo(var8005d588)($at) +/* 9b1c: 3c018006 */ lui $at,%hi(var8005d58c) +/* 9b20: ac20d58c */ sw $zero,%lo(var8005d58c)($at) /* 9b24: 24010001 */ addiu $at,$zero,0x1 /* 9b28: 15610007 */ bne $t3,$at,.L00009b48 /* 9b2c: 00000000 */ sll $zero,$zero,0x0 @@ -455,9 +455,9 @@ glabel func00009b50 /* 9bd4: 00095080 */ sll $t2,$t1,0x2 /* 9bd8: 004a5821 */ addu $t3,$v0,$t2 /* 9bdc: 8d6c0000 */ lw $t4,0x0($t3) -/* 9be0: 3c018006 */ lui $at,0x8006 +/* 9be0: 3c018006 */ lui $at,%hi(var8005d59c) /* 9be4: adac0028 */ sw $t4,0x28($t5) -/* 9be8: ac2ed59c */ sw $t6,-0x2a64($at) +/* 9be8: ac2ed59c */ sw $t6,%lo(var8005d59c)($at) /* 9bec: 3c01800a */ lui $at,%hi(g_Vars+0x4e0) /* 9bf0: 03e00008 */ jr $ra /* 9bf4: a020a4a0 */ sb $zero,%lo(g_Vars+0x4e0)($at) @@ -666,8 +666,8 @@ glabel func00009c3c /* 9eac: a080ffff */ sb $zero,-0x1($a0) .L00009eb0: /* 9eb0: 8fbf0014 */ lw $ra,0x14($sp) -/* 9eb4: 3c018006 */ lui $at,0x8006 -/* 9eb8: ac39d59c */ sw $t9,-0x2a64($at) +/* 9eb4: 3c018006 */ lui $at,%hi(var8005d59c) +/* 9eb8: ac39d59c */ sw $t9,%lo(var8005d59c)($at) /* 9ebc: 03e00008 */ jr $ra /* 9ec0: 27bd0020 */ addiu $sp,$sp,0x20 ); @@ -675,9 +675,9 @@ glabel func00009c3c GLOBAL_ASM( glabel func00009ec4 /* 9ec4: 24840002 */ addiu $a0,$a0,0x2 -/* 9ec8: 3c018006 */ lui $at,0x8006 +/* 9ec8: 3c018006 */ lui $at,%hi(var8005ce90) /* 9ecc: 03e00008 */ jr $ra -/* 9ed0: ac24ce90 */ sw $a0,-0x3170($at) +/* 9ed0: ac24ce90 */ sw $a0,%lo(var8005ce90)($at) ); GLOBAL_ASM( @@ -692,8 +692,8 @@ glabel func00009ed4 /* 9ef0: 244effff */ addiu $t6,$v0,-1 /* 9ef4: 15c00003 */ bnez $t6,.L00009f04 /* 9ef8: ac6e0000 */ sw $t6,0x0($v1) -/* 9efc: 3c018006 */ lui $at,0x8006 -/* 9f00: ac20ce98 */ sw $zero,-0x3168($at) +/* 9efc: 3c018006 */ lui $at,%hi(var8005ce98) +/* 9f00: ac20ce98 */ sw $zero,%lo(var8005ce98)($at) .L00009f04: /* 9f04: 3c038006 */ lui $v1,%hi(var8005ce94) /* 9f08: 2463ce94 */ addiu $v1,$v1,%lo(var8005ce94) @@ -750,9 +750,9 @@ glabel func00009ed4 /* 9fd4: 00992021 */ addu $a0,$a0,$t9 /* 9fd8: 0c012354 */ jal func00048d50 /* 9fdc: 8c84dd64 */ lw $a0,%lo(var8008dd64)($a0) -/* 9fe0: 3c048006 */ lui $a0,0x8006 +/* 9fe0: 3c048006 */ lui $a0,%hi(var8005ce90+0x3) /* 9fe4: 0c012338 */ jal func00048ce0 -/* 9fe8: 9084ce93 */ lbu $a0,-0x316d($a0) +/* 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 @@ -780,8 +780,8 @@ glabel func00009ed4 GLOBAL_ASM( glabel func0000a044 /* a044: 3c098006 */ lui $t1,%hi(var8005d594) -/* a048: 3c0e8006 */ lui $t6,%hi(var8006000c) -/* a04c: 8dced590 */ lw $t6,-0x2a70($t6) +/* a048: 3c0e8006 */ lui $t6,%hi(var8005d590) +/* a04c: 8dced590 */ lw $t6,%lo(var8005d590)($t6) /* a050: 8d29d594 */ lw $t1,%lo(var8005d594)($t1) /* a054: 27bdffe8 */ addiu $sp,$sp,-24 /* a058: afbf0014 */ sw $ra,0x14($sp) @@ -852,7 +852,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,%hi(var8006000c) +/* a158: 3c0f8006 */ lui $t7,0x8006 /* a15c: 000bc880 */ sll $t9,$t3,0x2 /* a160: 032bc821 */ addu $t9,$t9,$t3 /* a164: 3c0e8009 */ lui $t6,%hi(var8008dcc0) @@ -865,8 +865,8 @@ glabel func0000a044 /* a180: 00807025 */ or $t6,$a0,$zero .L0000a184: /* a184: 8de10000 */ lw $at,0x0($t7) -/* a188: 25ef000c */ addiu $t7,$t7,%lo(var8006000c) -/* a18c: 25ce000c */ addiu $t6,$t6,%lo(var8006000c) +/* a188: 25ef000c */ addiu $t7,$t7,12 +/* a18c: 25ce000c */ addiu $t6,$t6,12 /* a190: adc1fff4 */ sw $at,-0xc($t6) /* a194: 8de1fff8 */ lw $at,-0x8($t7) /* a198: adc1fff8 */ sw $at,-0x8($t6) @@ -1114,14 +1114,14 @@ glabel func0000a044 .L0000a50c: /* a50c: 0000c010 */ mfhi $t8 /* a510: 03381025 */ or $v0,$t9,$t8 -/* a514: 3c018006 */ lui $at,0x8006 +/* a514: 3c018006 */ lui $at,%hi(var8005ce88) /* a518: ac820030 */ sw $v0,0x30($a0) /* a51c: ada20000 */ sw $v0,0x0($t5) /* a520: ac820044 */ sw $v0,0x44($a0) /* a524: afe20000 */ sw $v0,0x0($ra) /* a528: 002c0821 */ addu $at,$at,$t4 /* a52c: 100000f6 */ beqz $zero,.L0000a908 -/* a530: ac2fce88 */ sw $t7,-0x3178($at) +/* a530: ac2fce88 */ sw $t7,%lo(var8005ce88)($at) .L0000a534: /* a534: 148300ef */ bne $a0,$v1,.L0000a8f4 /* a538: 3c0e8000 */ lui $t6,0x8000 @@ -1381,18 +1381,18 @@ glabel func0000a044 /* a8d4: 00000000 */ sll $zero,$zero,0x0 /* a8d8: 0006000d */ break 0x6 .L0000a8dc: -/* a8dc: 3c018006 */ lui $at,0x8006 +/* a8dc: 3c018006 */ lui $at,%hi(var8005ce88) /* a8e0: 002c0821 */ addu $at,$at,$t4 /* a8e4: 24180001 */ addiu $t8,$zero,0x1 -/* a8e8: ac38ce88 */ sw $t8,-0x3178($at) +/* a8e8: ac38ce88 */ sw $t8,%lo(var8005ce88)($at) /* a8ec: 10000006 */ beqz $zero,.L0000a908 /* a8f0: 8d4ad598 */ lw $t2,%lo(var8005d598)($t2) .L0000a8f4: -/* a8f4: 3c018006 */ lui $at,0x8006 +/* a8f4: 3c018006 */ lui $at,%hi(var8005ce88) /* a8f8: 002c0821 */ addu $at,$at,$t4 /* a8fc: 3c0a8006 */ lui $t2,%hi(var8005d598) /* a900: 8d4ad598 */ lw $t2,%lo(var8005d598)($t2) -/* a904: ac20ce88 */ sw $zero,-0x3178($at) +/* a904: ac20ce88 */ sw $zero,%lo(var8005ce88)($at) .L0000a908: /* a908: 256b0001 */ addiu $t3,$t3,0x1 /* a90c: 05610004 */ bgez $t3,.L0000a920 @@ -1401,9 +1401,9 @@ glabel func0000a044 /* a918: 00000000 */ sll $zero,$zero,0x0 /* a91c: 25cefffe */ addiu $t6,$t6,-2 .L0000a920: -/* a920: 3c018006 */ lui $at,0x8006 +/* a920: 3c018006 */ lui $at,%hi(var8005d5a0) /* a924: 11400006 */ beqz $t2,.L0000a940 -/* a928: ac2ed5a0 */ sw $t6,-0x2a60($at) +/* a928: ac2ed5a0 */ sw $t6,%lo(var8005d5a0)($at) /* a92c: 3c0f8006 */ lui $t7,%hi(var8005f108) /* a930: 8deff108 */ lw $t7,%lo(var8005f108)($t7) /* a934: 8d390028 */ lw $t9,0x28($t1) @@ -1445,18 +1445,18 @@ glabel func0000a044 .L0000a9b8: /* a9b8: 03080019 */ multu $t8,$t0 /* a9bc: a06f0000 */ sb $t7,0x0($v1) -/* a9c0: 3c018006 */ lui $at,0x8006 +/* a9c0: 3c018006 */ lui $at,%hi(var8005d590) /* a9c4: 3c058006 */ lui $a1,%hi(var8005d594) /* a9c8: 2406002c */ addiu $a2,$zero,0x2c /* a9cc: 00007012 */ mflo $t6 /* a9d0: 00eec821 */ addu $t9,$a3,$t6 -/* a9d4: ac39d590 */ sw $t9,-0x2a70($at) +/* a9d4: ac39d590 */ sw $t9,%lo(var8005d590)($at) /* a9d8: 906f0000 */ lbu $t7,0x0($v1) -/* a9dc: 3c018006 */ lui $at,0x8006 +/* a9dc: 3c018006 */ lui $at,%hi(var8005d594) /* a9e0: 01e80019 */ multu $t7,$t0 /* a9e4: 0000c012 */ mflo $t8 /* a9e8: 00f87021 */ addu $t6,$a3,$t8 -/* a9ec: ac2ed594 */ sw $t6,-0x2a6c($at) +/* a9ec: ac2ed594 */ sw $t6,%lo(var8005d594)($at) /* a9f0: 0c012c5c */ jal func0004b170 /* a9f4: 8ca5d594 */ lw $a1,%lo(var8005d594)($a1) /* a9f8: 3c038009 */ lui $v1,%hi(var80092874+0x3) @@ -1504,14 +1504,14 @@ glabel func0000aa50 /* aa88: 46000306 */ mov.s $f12,$f0 /* aa8c: 4600610d */ trunc.w.s $f4,$f12 .L0000aa90: -/* aa90: 3c018006 */ lui $at,0x8006 +/* aa90: 3c018006 */ lui $at,%hi(var8005ce98) /* aa94: 2418000a */ addiu $t8,$zero,0xa /* aa98: 440f2000 */ mfc1 $t7,$f4 /* aa9c: 00000000 */ sll $zero,$zero,0x0 -/* aaa0: ac2fce98 */ sw $t7,-0x3168($at) -/* aaa4: 3c018006 */ lui $at,0x8006 +/* aaa0: ac2fce98 */ sw $t7,%lo(var8005ce98)($at) +/* aaa4: 3c018006 */ lui $at,%hi(var8005ce9c) /* aaa8: 03e00008 */ jr $ra -/* aaac: ac38ce9c */ sw $t8,-0x3164($at) +/* aaac: ac38ce9c */ sw $t8,%lo(var8005ce9c)($at) ); GLOBAL_ASM( @@ -1537,12 +1537,12 @@ glabel func0000aab0 /* aaf8: 03e00008 */ jr $ra /* aafc: a5020006 */ sh $v0,0x6($t0) /* ab00: 240e0001 */ addiu $t6,$zero,0x1 -/* ab04: 3c018006 */ lui $at,0x8006 +/* ab04: 3c018006 */ lui $at,%hi(var8005d598) /* ab08: 03e00008 */ jr $ra -/* ab0c: ac2ed598 */ sw $t6,-0x2a68($at) -/* ab10: 3c018006 */ lui $at,0x8006 +/* ab0c: ac2ed598 */ sw $t6,%lo(var8005d598)($at) +/* ab10: 3c018006 */ lui $at,%hi(var8005d598) /* ab14: 03e00008 */ jr $ra -/* ab18: ac20d598 */ sw $zero,-0x2a68($at) +/* ab18: ac20d598 */ sw $zero,%lo(var8005d598)($at) ); GLOBAL_ASM( diff --git a/src/lib/lib_0c000.c b/src/lib/lib_0c000.c index 3c60ec274..b60bedec5 100644 --- a/src/lib/lib_0c000.c +++ b/src/lib/lib_0c000.c @@ -237,7 +237,7 @@ glabel func0000c240 /* c250: 008f082b */ sltu $at,$a0,$t7 /* c254: 14200015 */ bnez $at,.L0000c2ac /* c258: 3c187006 */ lui $t8,0x7006 -/* c25c: 27189fe0 */ addiu $t8,$t8,-24608 +/* c25c: 27189fe0 */ addiu $t8,$t8,-0x6020 /* c260: 0304082b */ sltu $at,$t8,$a0 /* c264: 54200012 */ bnezl $at,.L0000c2b0 /* c268: 00001025 */ or $v0,$zero,$zero @@ -1181,7 +1181,7 @@ glabel func0000cf54 /* cf58: 3c01a000 */ lui $at,0xa000 /* cf5c: 00817025 */ or $t6,$a0,$at /* cf60: afbf003c */ sw $ra,0x3c($sp) -/* cf64: 3c018006 */ lui $at,0x8006 +/* cf64: 3c018006 */ lui $at,%hi(var8005d998) /* cf68: afbe0038 */ sw $s8,0x38($sp) /* cf6c: afb70034 */ sw $s7,0x34($sp) /* cf70: afb60030 */ sw $s6,0x30($sp) @@ -1192,7 +1192,7 @@ glabel func0000cf54 /* cf84: afb1001c */ sw $s1,0x1c($sp) /* cf88: afb00018 */ sw $s0,0x18($sp) /* cf8c: 0c002f02 */ jal func0000bc08 -/* cf90: ac2ed998 */ sw $t6,-0x2668($at) +/* cf90: ac2ed998 */ sw $t6,%lo(var8005d998)($at) /* cf94: 2450fff3 */ addiu $s0,$v0,-13 /* cf98: 06010003 */ bgez $s0,.L0000cfa8 /* cf9c: 00107883 */ sra $t7,$s0,0x2 diff --git a/src/lib/lib_0d0a0.c b/src/lib/lib_0d0a0.c index 787a68a8d..883441446 100644 --- a/src/lib/lib_0d0a0.c +++ b/src/lib/lib_0d0a0.c @@ -201,8 +201,8 @@ glabel func0000d29c /* d32c: 03284826 */ xor $t1,$t9,$t0 /* d330: 1482fffa */ bne $a0,$v0,.L0000d31c /* d334: ac69fffc */ sw $t1,-0x4($v1) -/* d338: 3c018006 */ lui $at,0x8006 -/* d33c: a020d9a0 */ sb $zero,-0x2660($at) +/* d338: 3c018006 */ lui $at,%hi(var8005d9a0) +/* d33c: a020d9a0 */ sb $zero,%lo(var8005d9a0)($at) .L0000d340: /* d340: 8fbf0014 */ lw $ra,0x14($sp) /* d344: 27bd0030 */ addiu $sp,$sp,0x30 diff --git a/src/lib/lib_0d520.c b/src/lib/lib_0d520.c index 1965eef26..0db98efce 100644 --- a/src/lib/lib_0d520.c +++ b/src/lib/lib_0d520.c @@ -203,9 +203,9 @@ glabel func0000d520 /* d564: 00000000 */ sll $zero,$zero,0x0 /* d568: 0c00be82 */ jal func0002fa08 /* d56c: 00000000 */ sll $zero,$zero,0x0 -/* d570: 3c018006 */ lui $at,0x8006 +/* d570: 3c018006 */ lui $at,%hi(var8005d9b0) /* d574: 0c004f25 */ jal func00013c94 -/* d578: ac22d9b0 */ sw $v0,-0x2650($at) +/* d578: ac22d9b0 */ sw $v0,%lo(var8005d9b0)($at) /* d57c: 27a41490 */ addiu $a0,$sp,0x1490 /* d580: 27a514cc */ addiu $a1,$sp,0x14cc /* d584: 0c0120d0 */ jal osCreateMesgQueue @@ -254,8 +254,8 @@ glabel func0000d520 /* d624: 14400004 */ bnez $v0,.L0000d638 /* d628: 00002025 */ or $a0,$zero,$zero /* d62c: 240b0001 */ addiu $t3,$zero,0x1 -/* d630: 3c018006 */ lui $at,0x8006 -/* d634: ac2bd9b0 */ sw $t3,-0x2650($at) +/* d630: 3c018006 */ lui $at,%hi(var8005d9b0) +/* d634: ac2bd9b0 */ sw $t3,%lo(var8005d9b0)($at) .L0000d638: /* d638: 0c0053d8 */ jal func00014f60 /* d63c: 24051000 */ addiu $a1,$zero,0x1000 @@ -410,12 +410,12 @@ glabel func0000d520 /* d868: 0c0026d4 */ jal func00009b50 /* d86c: 02002025 */ or $a0,$s0,$zero /* d870: 8faa0048 */ lw $t2,0x48($sp) -/* d874: 3c018006 */ lui $at,0x8006 +/* d874: 3c018006 */ lui $at,%hi(var8005f044) /* d878: 3c048009 */ lui $a0,%hi(var8008db30) -/* d87c: ac2af044 */ sw $t2,-0xfbc($at) -/* d880: 3c018006 */ lui $at,0x8006 +/* d87c: ac2af044 */ sw $t2,%lo(var8005f044)($at) +/* d880: 3c018006 */ lui $at,%hi(var8005f040) /* d884: 254e0800 */ addiu $t6,$t2,0x800 -/* d888: ac2ef040 */ sw $t6,-0xfc0($at) +/* d888: ac2ef040 */ sw $t6,%lo(var8005f040)($at) /* d88c: 2484db30 */ addiu $a0,$a0,%lo(var8008db30) /* d890: 27a51470 */ addiu $a1,$sp,0x1470 /* d894: 0c0121bc */ jal osRecvMesg @@ -569,9 +569,9 @@ glabel func0000d520 /* dac8: 0c0027b1 */ jal func00009ec4 /* dacc: 24040001 */ addiu $a0,$zero,0x1 /* dad0: 8fbf002c */ lw $ra,0x2c($sp) -/* dad4: 3c018006 */ lui $at,0x8006 +/* dad4: 3c018006 */ lui $at,%hi(var8005dd18) /* dad8: 8fb00028 */ lw $s0,0x28($sp) -/* dadc: ac20dd18 */ sw $zero,-0x22e8($at) +/* dadc: ac20dd18 */ sw $zero,%lo(var8005dd18)($at) /* dae0: 03e00008 */ jr $ra /* dae4: 27bd14d8 */ addiu $sp,$sp,0x14d8 ); @@ -640,9 +640,9 @@ glabel func0000db3c /* dbb0: adc8001c */ sw $t0,0x1c($t6) /* dbb4: 0fc5d7e6 */ jal func0f175f98 /* dbb8: adc10018 */ sw $at,0x18($t6) -/* dbbc: 3c018006 */ lui $at,0x8006 +/* dbbc: 3c018006 */ lui $at,%hi(var8005d9c4) /* dbc0: 3c048006 */ lui $a0,%hi(g_StageNum) -/* dbc4: ac20d9c4 */ sw $zero,-0x263c($at) +/* dbc4: ac20d9c4 */ sw $zero,%lo(var8005d9c4)($at) /* dbc8: 0c004c35 */ jal func000130d4 /* dbcc: 2484d9b4 */ addiu $a0,$a0,%lo(g_StageNum) /* dbd0: 3c098006 */ lui $t1,%hi(var8005d9d4) @@ -717,12 +717,12 @@ glabel func0000db3c /* dcd4: ae000000 */ sw $zero,0x0($s0) /* dcd8: 3c0e8006 */ lui $t6,%hi(var8005d9b0) /* dcdc: 8dced9b0 */ lw $t6,%lo(var8005d9b0)($t6) -/* dce0: 3c018006 */ lui $at,0x8006 -/* dce4: ac36d9c8 */ sw $s6,-0x2638($at) -/* dce8: 3c018006 */ lui $at,0x8006 +/* dce0: 3c018006 */ lui $at,%hi(var8005d9c8) +/* dce4: ac36d9c8 */ sw $s6,%lo(var8005d9c8)($at) +/* dce8: 3c018006 */ lui $at,%hi(var8005d9d0) /* dcec: afa00060 */ sw $zero,0x60($sp) /* dcf0: 11c0007b */ beqz $t6,.L0000dee0 -/* dcf4: ac20d9d0 */ sw $zero,-0x2630($at) +/* dcf4: ac20d9d0 */ sw $zero,%lo(var8005d9d0)($at) /* dcf8: 3c0f8006 */ lui $t7,%hi(var8005d9c4) /* dcfc: 8defd9c4 */ lw $t7,%lo(var8005d9c4)($t7) /* dd00: 3c088009 */ lui $t0,%hi(g_Is4Mb) @@ -742,17 +742,17 @@ glabel func0000db3c /* dd38: 28410002 */ slti $at,$v0,0x2 /* dd3c: 14200019 */ bnez $at,.L0000dda4 /* dd40: 8fa5005c */ lw $a1,0x5c($sp) -/* dd44: 3c0a8006 */ lui $t2,0x8006 -/* dd48: 8d4adbd0 */ lw $t2,-0x2430($t2) +/* dd44: 3c0a8006 */ lui $t2,%hi(var8005d9d8+0x1f8) +/* dd48: 8d4adbd0 */ lw $t2,%lo(var8005d9d8+0x1f8)($t2) /* dd4c: 00002825 */ or $a1,$zero,$zero -/* dd50: 3c048006 */ lui $a0,%hi(var80060190) +/* dd50: 3c048006 */ lui $a0,%hi(g_StageNum) /* dd54: 1140000d */ beqz $t2,.L0000dd8c -/* dd58: 3c0d8006 */ lui $t5,0x8006 -/* dd5c: 8c84d9b4 */ lw $a0,-0x264c($a0) -/* dd60: 3c0b8006 */ lui $t3,0x8006 -/* dd64: 2562dbd0 */ addiu $v0,$t3,-9264 +/* dd58: 3c0d8006 */ lui $t5,%hi(var8005d9d8+0x1f8) +/* dd5c: 8c84d9b4 */ lw $a0,%lo(g_StageNum)($a0) +/* dd60: 3c0b8006 */ lui $t3,%hi(var8005d9d8+0x1f8) +/* dd64: 2562dbd0 */ addiu $v0,$t3,%lo(var8005d9d8+0x1f8) /* dd68: 8c430000 */ lw $v1,0x0($v0) -/* dd6c: 24840190 */ addiu $a0,$a0,%lo(var80060190) +/* dd6c: 24840190 */ addiu $a0,$a0,400 .L0000dd70: /* dd70: 50830007 */ beql $a0,$v1,.L0000dd90 /* dd74: 000560c0 */ sll $t4,$a1,0x3 @@ -765,19 +765,19 @@ glabel func0000db3c /* dd8c: 000560c0 */ sll $t4,$a1,0x3 .L0000dd90: /* dd90: 01ac6821 */ addu $t5,$t5,$t4 -/* dd94: 8daddbd0 */ lw $t5,-0x2430($t5) +/* dd94: 8daddbd0 */ lw $t5,%lo(var8005d9d8+0x1f8)($t5) /* dd98: 15a00002 */ bnez $t5,.L0000dda4 /* dd9c: 00000000 */ sll $zero,$zero,0x0 /* dda0: 02a02825 */ or $a1,$s5,$zero .L0000dda4: /* dda4: 04a10010 */ bgez $a1,.L0000dde8 -/* dda8: 3c198006 */ lui $t9,0x8006 -/* ddac: 8f39dbd0 */ lw $t9,-0x2430($t9) +/* dda8: 3c198006 */ lui $t9,%hi(var8005d9d8+0x1f8) +/* ddac: 8f39dbd0 */ lw $t9,%lo(var8005d9d8+0x1f8)($t9) /* ddb0: 00002825 */ or $a1,$zero,$zero /* ddb4: 3c048006 */ lui $a0,%hi(g_StageNum) /* ddb8: 1320000b */ beqz $t9,.L0000dde8 -/* ddbc: 3c188006 */ lui $t8,0x8006 -/* ddc0: 2702dbd0 */ addiu $v0,$t8,-9264 +/* ddbc: 3c188006 */ lui $t8,%hi(var8005d9d8+0x1f8) +/* ddc0: 2702dbd0 */ addiu $v0,$t8,%lo(var8005d9d8+0x1f8) /* ddc4: 8c430000 */ lw $v1,0x0($v0) /* ddc8: 8c84d9b4 */ lw $a0,%lo(g_StageNum)($a0) .L0000ddcc: @@ -791,10 +791,10 @@ glabel func0000db3c .L0000dde8: /* dde8: 000570c0 */ sll $t6,$a1,0x3 .L0000ddec: -/* ddec: 3c048006 */ lui $a0,0x8006 +/* ddec: 3c048006 */ lui $a0,%hi(var8005d9d8+0x1fc) /* ddf0: 008e2021 */ addu $a0,$a0,$t6 /* ddf4: 0c004bbf */ jal func00012efc -/* ddf8: 8c84dbd4 */ lw $a0,-0x242c($a0) +/* ddf8: 8c84dbd4 */ lw $a0,%lo(var8005d9d8+0x1fc)($a0) /* ddfc: 10000038 */ beqz $zero,.L0000dee0 /* de00: 00000000 */ sll $zero,$zero,0x0 .L0000de04: @@ -810,14 +810,14 @@ glabel func0000db3c /* de28: 3c088006 */ lui $t0,%hi(var8005d9d8) /* de2c: 8d08d9d8 */ lw $t0,%lo(var8005d9d8)($t0) /* de30: 00002825 */ or $a1,$zero,$zero -/* de34: 3c048006 */ lui $a0,%hi(var80060190) +/* de34: 3c048006 */ lui $a0,%hi(g_StageNum) /* de38: 1100000d */ beqz $t0,.L0000de70 /* de3c: 3c0b8006 */ lui $t3,%hi(var8005d9d8) -/* de40: 8c84d9b4 */ lw $a0,-0x264c($a0) +/* de40: 8c84d9b4 */ lw $a0,%lo(g_StageNum)($a0) /* de44: 3c098006 */ lui $t1,%hi(var8005d9d8) /* de48: 2522d9d8 */ addiu $v0,$t1,%lo(var8005d9d8) /* de4c: 8c430000 */ lw $v1,0x0($v0) -/* de50: 24840190 */ addiu $a0,$a0,%lo(var80060190) +/* de50: 24840190 */ addiu $a0,$a0,400 .L0000de54: /* de54: 50830007 */ beql $a0,$v1,.L0000de74 /* de58: 000550c0 */ sll $t2,$a1,0x3 @@ -856,13 +856,13 @@ glabel func0000db3c .L0000decc: /* decc: 0005c8c0 */ sll $t9,$a1,0x3 .L0000ded0: -/* ded0: 3c048006 */ lui $a0,0x8006 +/* ded0: 3c048006 */ lui $a0,%hi(var8005d9d8+0x4) /* ded4: 00992021 */ addu $a0,$a0,$t9 /* ded8: 0c004bbf */ jal func00012efc -/* dedc: 8c84d9dc */ lw $a0,-0x2624($a0) +/* dedc: 8c84d9dc */ lw $a0,%lo(var8005d9d8+0x4)($a0) .L0000dee0: -/* dee0: 3c018006 */ lui $at,0x8006 -/* dee4: ac20d9c4 */ sw $zero,-0x263c($at) +/* dee0: 3c018006 */ lui $at,%hi(var8005d9c4) +/* dee4: ac20d9c4 */ sw $zero,%lo(var8005d9c4)($at) /* dee8: 0c00494a */ jal func00012528 /* deec: 24040007 */ addiu $a0,$zero,0x7 /* def0: 0c00494a */ jal func00012528 @@ -883,8 +883,8 @@ glabel func0000db3c /* df2c: 0c004d02 */ jal func00013408 /* df30: 00003025 */ or $a2,$zero,$zero /* df34: 0002c280 */ sll $t8,$v0,0xa -/* df38: 3c018006 */ lui $at,0x8006 -/* df3c: ac38d9b8 */ sw $t8,-0x2648($at) +/* df38: 3c018006 */ lui $at,%hi(var8005d9b8) +/* df3c: ac38d9b8 */ sw $t8,%lo(var8005d9b8)($at) .L0000df40: /* df40: 3c048006 */ lui $a0,%hi(var8005d9b8) /* df44: 8c84d9b8 */ lw $a0,%lo(var8005d9b8)($a0) @@ -1142,8 +1142,8 @@ glabel func0000db3c /* e2d0: 00000000 */ sll $zero,$zero,0x0 /* e2d4: 8eed0000 */ lw $t5,0x0($s7) /* e2d8: 8fb90084 */ lw $t9,0x84($sp) -/* e2dc: 3c018006 */ lui $at,0x8006 -/* e2e0: ac2dd9b4 */ sw $t5,-0x264c($at) +/* e2dc: 3c018006 */ lui $at,%hi(g_StageNum) +/* e2e0: ac2dd9b4 */ sw $t5,%lo(g_StageNum)($at) /* e2e4: 1320fe7b */ beqz $t9,.L0000dcd4 /* e2e8: aef50000 */ sw $s5,0x0($s7) /* e2ec: 0fc5d7f2 */ jal func0f175fc8 @@ -1602,10 +1602,10 @@ glabel func0000e684 /* e93c: 8fbf001c */ lw $ra,0x1c($sp) .L0000e940: /* e940: 24080001 */ addiu $t0,$zero,0x1 -/* e944: 3c018006 */ lui $at,0x8006 +/* e944: 3c018006 */ lui $at,%hi(var8005d9d0) /* e948: 8fb00014 */ lw $s0,0x14($sp) /* e94c: 8fb10018 */ lw $s1,0x18($sp) -/* e950: ac28d9d0 */ sw $t0,-0x2630($at) +/* e950: ac28d9d0 */ sw $t0,%lo(var8005d9d0)($at) /* e954: 03e00008 */ jr $ra /* e958: 27bd0030 */ addiu $sp,$sp,0x30 ); @@ -1618,10 +1618,10 @@ glabel func0000e95c /* e968: afa40018 */ sw $a0,0x18($sp) /* e96c: 8fbf0014 */ lw $ra,0x14($sp) /* e970: 8fae0018 */ lw $t6,0x18($sp) -/* e974: 3c018006 */ lui $at,0x8006 +/* e974: 3c018006 */ lui $at,%hi(var8005dd54) /* e978: 27bd0018 */ addiu $sp,$sp,0x18 /* e97c: 03e00008 */ jr $ra -/* e980: ac2edd54 */ sw $t6,-0x22ac($at) +/* e980: ac2edd54 */ sw $t6,%lo(var8005dd54)($at) ); // func0000e984 diff --git a/src/lib/lib_0e9d0.c b/src/lib/lib_0e9d0.c index aea075682..f1b6b5c86 100644 --- a/src/lib/lib_0e9d0.c +++ b/src/lib/lib_0e9d0.c @@ -99,8 +99,8 @@ glabel audioSetSfxVolume /* ea5c: 1420fff9 */ bnez $at,.L0000ea44 /* ea60: 01c08025 */ or $s0,$t6,$zero /* ea64: 8fbf001c */ lw $ra,0x1c($sp) -/* ea68: 3c018006 */ lui $at,0x8006 -/* ea6c: a431ddc8 */ sh $s1,-0x2238($at) +/* ea68: 3c018006 */ lui $at,%hi(g_SfxVolume) +/* ea6c: a431ddc8 */ sh $s1,%lo(g_SfxVolume)($at) /* ea70: 8fb10018 */ lw $s1,0x18($sp) /* ea74: 8fb00014 */ lw $s0,0x14($sp) /* ea78: 03e00008 */ jr $ra @@ -756,7 +756,7 @@ GLOBAL_ASM( glabel audioSetSoundMode /* f38c: 27bdffd0 */ addiu $sp,$sp,-48 /* f390: afb1001c */ sw $s1,0x1c($sp) -/* f394: 3c018006 */ lui $at,0x8006 +/* f394: 3c018006 */ lui $at,%hi(g_SoundMode) /* f398: 00808825 */ or $s1,$a0,$zero /* f39c: afbf002c */ sw $ra,0x2c($sp) /* f3a0: afb40028 */ sw $s4,0x28($sp) @@ -764,7 +764,7 @@ glabel audioSetSoundMode /* f3a8: afb20020 */ sw $s2,0x20($sp) /* f3ac: afb00018 */ sw $s0,0x18($sp) /* f3b0: 1080000a */ beqz $a0,.L0000f3dc -/* f3b4: ac24ddcc */ sw $a0,-0x2234($at) +/* f3b4: ac24ddcc */ sw $a0,%lo(g_SoundMode)($at) /* f3b8: 24140001 */ addiu $s4,$zero,0x1 /* f3bc: 1094000d */ beq $a0,$s4,.L0000f3f4 /* f3c0: 24130002 */ addiu $s3,$zero,0x2 @@ -1102,13 +1102,13 @@ glabel func0000f804 /* f848: 3421dc00 */ ori $at,$at,0xdc00 /* f84c: 02018021 */ addu $s0,$s0,$at /* f850: 2610d000 */ addiu $s0,$s0,-12288 -/* f854: 3c018006 */ lui $at,0x8006 +/* f854: 3c018006 */ lui $at,%hi(var8005ddd0) /* f858: 2610a400 */ addiu $s0,$s0,-23552 /* f85c: 1000000d */ beqz $zero,.L0000f894 -/* f860: ac20ddd0 */ sw $zero,-0x2230($at) +/* f860: ac20ddd0 */ sw $zero,%lo(var8005ddd0)($at) .L0000f864: -/* f864: 3c018006 */ lui $at,0x8006 -/* f868: ac22ddd0 */ sw $v0,-0x2230($at) +/* f864: 3c018006 */ lui $at,%hi(var8005ddd0) +/* f868: ac22ddd0 */ sw $v0,%lo(var8005ddd0)($at) /* f86c: 3c018009 */ lui $at,%hi(var80094ea8) /* f870: 240f0002 */ addiu $t7,$zero,0x2 /* f874: 3c057005 */ lui $a1,%hi(var70053b58) @@ -1117,8 +1117,8 @@ glabel func0000f804 /* f880: 0c004c04 */ jal func00013010 /* f884: 00402025 */ or $a0,$v0,$zero /* f888: 10400002 */ beqz $v0,.L0000f894 -/* f88c: 3c018006 */ lui $at,0x8006 -/* f890: ac20ddd0 */ sw $zero,-0x2230($at) +/* f88c: 3c018006 */ lui $at,%hi(var8005ddd0) +/* f890: ac20ddd0 */ sw $zero,%lo(var8005ddd0)($at) .L0000f894: /* f894: 3c188006 */ lui $t8,%hi(var8005dda0) /* f898: 8f18dda0 */ lw $t8,%lo(var8005dda0)($t8) @@ -1648,10 +1648,10 @@ glabel func0000fe88 /* ffcc: 00601025 */ or $v0,$v1,$zero .L0000ffd0: /* ffd0: 8defedec */ lw $t7,%lo(var8005edec)($t7) -/* ffd4: 3c018006 */ lui $at,0x8006 +/* ffd4: 3c018006 */ lui $at,%hi(var8005edec) /* ffd8: 11e20002 */ beq $t7,$v0,.L0000ffe4 /* ffdc: 00000000 */ sll $zero,$zero,0x0 -/* ffe0: ac22edec */ sw $v0,-0x1214($at) +/* ffe0: ac22edec */ sw $v0,%lo(var8005edec)($at) .L0000ffe4: /* ffe4: 8f18dda0 */ lw $t8,%lo(var8005dda0)($t8) /* ffe8: 570000d4 */ bnezl $t8,.L0001033c @@ -1977,13 +1977,13 @@ glabel audioIsFiltered /* 10438: 304e07ff */ andi $t6,$v0,0x7ff /* 1043c: 30887fff */ andi $t0,$a0,0x7fff /* 10440: 00084880 */ sll $t1,$t0,0x2 -/* 10444: 3c0a8006 */ lui $t2,0x8006 +/* 10444: 3c0a8006 */ lui $t2,%hi(audiodefinitions+0x2) /* 10448: 01495021 */ addu $t2,$t2,$t1 -/* 1044c: 954adde6 */ lhu $t2,-0x221a($t2) -/* 10450: 3c0c8006 */ lui $t4,0x8006 +/* 1044c: 954adde6 */ lhu $t2,%lo(audiodefinitions+0x2)($t2) +/* 10450: 3c0c8006 */ lui $t4,%hi(audioconfigs+0x1c) /* 10454: 000a5940 */ sll $t3,$t2,0x5 /* 10458: 018b6021 */ addu $t4,$t4,$t3 -/* 1045c: 8d8ce4f4 */ lw $t4,-0x1b0c($t4) +/* 1045c: 8d8ce4f4 */ lw $t4,%lo(audioconfigs+0x1c)($t4) /* 10460: 318d0010 */ andi $t5,$t4,0x10 /* 10464: 51a0000c */ beqzl $t5,.L00010498 /* 10468: 00001025 */ or $v0,$zero,$zero @@ -2649,13 +2649,13 @@ glabel func00010ae4 /* 10d58: 8fae0024 */ lw $t6,0x24($sp) .L00010d5c: /* 10d5c: 97ab0024 */ lhu $t3,0x24($sp) -/* 10d60: 3c0f8006 */ lui $t7,0x8006 +/* 10d60: 3c0f8006 */ lui $t7,%hi(audioconfigs+0x1c) /* 10d64: 000e4fc2 */ srl $t1,$t6,0x1f /* 10d68: 11200007 */ beqz $t1,.L00010d88 /* 10d6c: 316d7fff */ andi $t5,$t3,0x7fff /* 10d70: 000d5140 */ sll $t2,$t5,0x5 /* 10d74: 01ea7821 */ addu $t7,$t7,$t2 -/* 10d78: 8defe4f4 */ lw $t7,-0x1b0c($t7) +/* 10d78: 8defe4f4 */ lw $t7,%lo(audioconfigs+0x1c)($t7) /* 10d7c: 31ec0004 */ andi $t4,$t7,0x4 /* 10d80: 55800005 */ bnezl $t4,.L00010d98 /* 10d84: 24080003 */ addiu $t0,$zero,0x3 @@ -2680,15 +2680,15 @@ glabel func00010db0 /* 10db0: 00047100 */ sll $t6,$a0,0x4 /* 10db4: 01c47023 */ subu $t6,$t6,$a0 /* 10db8: 000e7100 */ sll $t6,$t6,0x4 -/* 10dbc: 3c018006 */ lui $at,0x8006 -/* 10dc0: ac2eddb0 */ sw $t6,-0x2250($at) -/* 10dc4: 3c018006 */ lui $at,0x8006 -/* 10dc8: ac20ddac */ sw $zero,-0x2254($at) -/* 10dcc: 3c018006 */ lui $at,0x8006 -/* 10dd0: ac20dda8 */ sw $zero,-0x2258($at) -/* 10dd4: 3c018006 */ lui $at,0x8006 +/* 10dbc: 3c018006 */ lui $at,%hi(var8005ddb0) +/* 10dc0: ac2eddb0 */ sw $t6,%lo(var8005ddb0)($at) +/* 10dc4: 3c018006 */ lui $at,%hi(var8005ddac) +/* 10dc8: ac20ddac */ sw $zero,%lo(var8005ddac)($at) +/* 10dcc: 3c018006 */ lui $at,%hi(var8005dda8) +/* 10dd0: ac20dda8 */ sw $zero,%lo(var8005dda8)($at) +/* 10dd4: 3c018006 */ lui $at,%hi(var8005ddc0) /* 10dd8: 03e00008 */ jr $ra -/* 10ddc: ac20ddc0 */ sw $zero,-0x2240($at) +/* 10ddc: ac20ddc0 */ sw $zero,%lo(var8005ddc0)($at) ); GLOBAL_ASM( @@ -2752,7 +2752,7 @@ glabel func00010e10 /* 10eac: 00002825 */ or $a1,$zero,$zero /* 10eb0: 24070040 */ addiu $a3,$zero,0x40 /* 10eb4: 18c0000b */ blez $a2,.L00010ee4 -/* 10eb8: 3c048006 */ lui $a0,%hi(var8005ddc0) +/* 10eb8: 3c048006 */ lui $a0,0x8006 /* 10ebc: 8d090040 */ lw $t1,0x40($t0) /* 10ec0: 00095080 */ sll $t2,$t1,0x2 /* 10ec4: 01495021 */ addu $t2,$t2,$t1 @@ -2779,14 +2779,14 @@ glabel func00010e10 /* 10f14: 10000066 */ beqz $zero,.L000110b0 /* 10f18: 8fbf002c */ lw $ra,0x2c($sp) .L00010f1c: -/* 10f1c: 8c84ddc0 */ lw $a0,%lo(var8005ddc0)($a0) +/* 10f1c: 8c84ddc0 */ lw $a0,-8768($a0) /* 10f20: 50800063 */ beqzl $a0,.L000110b0 /* 10f24: 8fbf002c */ lw $ra,0x2c($sp) /* 10f28: 0c00cec9 */ jal func00033b24 /* 10f2c: 00000000 */ sll $zero,$zero,0x0 -/* 10f30: 3c018006 */ lui $at,0x8006 +/* 10f30: 3c018006 */ lui $at,%hi(var8005ddc0) /* 10f34: 1000005d */ beqz $zero,.L000110ac -/* 10f38: ac20ddc0 */ sw $zero,-0x2240($at) +/* 10f38: ac20ddc0 */ sw $zero,%lo(var8005ddc0)($at) .L00010f3c: /* 10f3c: 3c0f8006 */ lui $t7,%hi(var8005ddc0) /* 10f40: 8defddc0 */ lw $t7,%lo(var8005ddc0)($t7) @@ -2849,7 +2849,7 @@ glabel func00010e10 /* 11018: 00002825 */ or $a1,$zero,$zero /* 1101c: 24070040 */ addiu $a3,$zero,0x40 /* 11020: 18c0000b */ blez $a2,.L00011050 -/* 11024: 3c048006 */ lui $a0,%hi(var8005ddc0) +/* 11024: 3c048006 */ lui $a0,0x8006 /* 11028: 8d190040 */ lw $t9,0x40($t0) /* 1102c: 00194880 */ sll $t1,$t9,0x2 /* 11030: 01394821 */ addu $t1,$t1,$t9 @@ -2878,13 +2878,13 @@ glabel func00010e10 /* 11088: 10000009 */ beqz $zero,.L000110b0 /* 1108c: 8fbf002c */ lw $ra,0x2c($sp) .L00011090: -/* 11090: 8c84ddc0 */ lw $a0,%lo(var8005ddc0)($a0) +/* 11090: 8c84ddc0 */ lw $a0,-8768($a0) /* 11094: 50800006 */ beqzl $a0,.L000110b0 /* 11098: 8fbf002c */ lw $ra,0x2c($sp) /* 1109c: 0c00cec9 */ jal func00033b24 /* 110a0: 00000000 */ sll $zero,$zero,0x0 -/* 110a4: 3c018006 */ lui $at,0x8006 -/* 110a8: ac20ddc0 */ sw $zero,-0x2240($at) +/* 110a4: 3c018006 */ lui $at,%hi(var8005ddc0) +/* 110a8: ac20ddc0 */ sw $zero,%lo(var8005ddc0)($at) .L000110ac: /* 110ac: 8fbf002c */ lw $ra,0x2c($sp) .L000110b0: @@ -2898,15 +2898,15 @@ glabel func000110bc /* 110bc: 00047100 */ sll $t6,$a0,0x4 /* 110c0: 01c47023 */ subu $t6,$t6,$a0 /* 110c4: 000e7100 */ sll $t6,$t6,0x4 -/* 110c8: 3c018006 */ lui $at,0x8006 -/* 110cc: ac2eddbc */ sw $t6,-0x2244($at) -/* 110d0: 3c018006 */ lui $at,0x8006 -/* 110d4: ac20ddb8 */ sw $zero,-0x2248($at) -/* 110d8: 3c018006 */ lui $at,0x8006 -/* 110dc: ac20ddb4 */ sw $zero,-0x224c($at) -/* 110e0: 3c018006 */ lui $at,0x8006 +/* 110c8: 3c018006 */ lui $at,%hi(var8005ddbc) +/* 110cc: ac2eddbc */ sw $t6,%lo(var8005ddbc)($at) +/* 110d0: 3c018006 */ lui $at,%hi(var8005ddb8) +/* 110d4: ac20ddb8 */ sw $zero,%lo(var8005ddb8)($at) +/* 110d8: 3c018006 */ lui $at,%hi(var8005ddb4) +/* 110dc: ac20ddb4 */ sw $zero,%lo(var8005ddb4)($at) +/* 110e0: 3c018006 */ lui $at,%hi(var8005ddc4) /* 110e4: 03e00008 */ jr $ra -/* 110e8: ac20ddc4 */ sw $zero,-0x223c($at) +/* 110e8: ac20ddc4 */ sw $zero,%lo(var8005ddc4)($at) ); GLOBAL_ASM( @@ -2991,7 +2991,7 @@ glabel func0001111c /* 11204: 00002825 */ or $a1,$zero,$zero /* 11208: 24070040 */ addiu $a3,$zero,0x40 /* 1120c: 18c0000b */ blez $a2,.L0001123c -/* 11210: 3c048006 */ lui $a0,%hi(var8005ddc4) +/* 11210: 3c048006 */ lui $a0,0x8006 /* 11214: 8d090040 */ lw $t1,0x40($t0) /* 11218: 00095100 */ sll $t2,$t1,0x4 /* 1121c: 01495023 */ subu $t2,$t2,$t1 @@ -3018,14 +3018,14 @@ glabel func0001111c /* 1126c: 10000067 */ beqz $zero,.L0001140c /* 11270: 8fbf002c */ lw $ra,0x2c($sp) .L00011274: -/* 11274: 8c84ddc4 */ lw $a0,%lo(var8005ddc4)($a0) +/* 11274: 8c84ddc4 */ lw $a0,-8764($a0) /* 11278: 50800064 */ beqzl $a0,.L0001140c /* 1127c: 8fbf002c */ lw $ra,0x2c($sp) /* 11280: 0c00cec9 */ jal func00033b24 /* 11284: 00000000 */ sll $zero,$zero,0x0 -/* 11288: 3c018006 */ lui $at,0x8006 +/* 11288: 3c018006 */ lui $at,%hi(var8005ddc4) /* 1128c: 1000005e */ beqz $zero,.L00011408 -/* 11290: ac20ddc4 */ sw $zero,-0x223c($at) +/* 11290: ac20ddc4 */ sw $zero,%lo(var8005ddc4)($at) .L00011294: /* 11294: 3c0f8006 */ lui $t7,%hi(var8005ddc4) /* 11298: 8defddc4 */ lw $t7,%lo(var8005ddc4)($t7) @@ -3089,7 +3089,7 @@ glabel func0001111c /* 11374: 00002825 */ or $a1,$zero,$zero /* 11378: 24070040 */ addiu $a3,$zero,0x40 /* 1137c: 18c0000b */ blez $a2,.L000113ac -/* 11380: 3c048006 */ lui $a0,%hi(var8005ddc4) +/* 11380: 3c048006 */ lui $a0,0x8006 /* 11384: 8d190040 */ lw $t9,0x40($t0) /* 11388: 00194900 */ sll $t1,$t9,0x4 /* 1138c: 01394823 */ subu $t1,$t1,$t9 @@ -3118,13 +3118,13 @@ glabel func0001111c /* 113e4: 10000009 */ beqz $zero,.L0001140c /* 113e8: 8fbf002c */ lw $ra,0x2c($sp) .L000113ec: -/* 113ec: 8c84ddc4 */ lw $a0,%lo(var8005ddc4)($a0) +/* 113ec: 8c84ddc4 */ lw $a0,-8764($a0) /* 113f0: 50800006 */ beqzl $a0,.L0001140c /* 113f4: 8fbf002c */ lw $ra,0x2c($sp) /* 113f8: 0c00cec9 */ jal func00033b24 /* 113fc: 00000000 */ sll $zero,$zero,0x0 -/* 11400: 3c018006 */ lui $at,0x8006 -/* 11404: ac20ddc4 */ sw $zero,-0x223c($at) +/* 11400: 3c018006 */ lui $at,%hi(var8005ddc4) +/* 11404: ac20ddc4 */ sw $zero,%lo(var8005ddc4)($at) .L00011408: /* 11408: 8fbf002c */ lw $ra,0x2c($sp) .L0001140c: diff --git a/src/lib/lib_11420.c b/src/lib/lib_11420.c index abf7bd2ba..86437139e 100644 --- a/src/lib/lib_11420.c +++ b/src/lib/lib_11420.c @@ -410,10 +410,10 @@ GLOBAL_ASM( glabel func000118f4 /* 118f4: afa50004 */ sw $a1,0x4($sp) /* 118f8: 8c8e0004 */ lw $t6,0x4($a0) -/* 118fc: 3c018008 */ lui $at,0x8008 +/* 118fc: 3c018008 */ lui $at,%hi(var800840e0) /* 11900: 24020001 */ addiu $v0,$zero,0x1 /* 11904: 03e00008 */ jr $ra -/* 11908: ac2e40e0 */ sw $t6,0x40e0($at) +/* 11908: ac2e40e0 */ sw $t6,%lo(var800840e0)($at) ); GLOBAL_ASM( @@ -619,8 +619,8 @@ glabel func0001190c /* 11bd4: 0319082a */ slt $at,$t8,$t9 /* 11bd8: 10200058 */ beqz $at,.L00011d3c .L00011bdc: -/* 11bdc: 3c018008 */ lui $at,0x8008 -/* 11be0: ac2340e4 */ sw $v1,0x40e4($at) +/* 11bdc: 3c018008 */ lui $at,%hi(var800840e4) +/* 11be0: ac2340e4 */ sw $v1,%lo(var800840e4)($at) /* 11be4: 8e6c0000 */ lw $t4,0x0($s3) /* 11be8: 11800054 */ beqz $t4,.L00011d3c .L00011bec: @@ -720,10 +720,10 @@ glabel func0001190c /* 11d48: 3c0c800a */ lui $t4,%hi(g_Vars+0x40) /* 11d4c: 8d8ca000 */ lw $t4,%lo(g_Vars+0x40)($t4) /* 11d50: 8f3940e4 */ lw $t9,%lo(var800840e4)($t9) -/* 11d54: 3c018008 */ lui $at,0x8008 +/* 11d54: 3c018008 */ lui $at,%hi(var800840e4) /* 11d58: 032c6823 */ subu $t5,$t9,$t4 /* 11d5c: 10000002 */ beqz $zero,.L00011d68 -/* 11d60: ac2d40e4 */ sw $t5,0x40e4($at) +/* 11d60: ac2d40e4 */ sw $t5,%lo(var800840e4)($at) .L00011d64: /* 11d64: ac2040e4 */ sw $zero,0x40e4($at) .L00011d68: @@ -840,16 +840,16 @@ glabel func00011d84 /* 11f00: 016c082a */ slt $at,$t3,$t4 /* 11f04: 1020000b */ beqz $at,.L00011f34 /* 11f08: 24060001 */ addiu $a2,$zero,0x1 -/* 11f0c: 3c018008 */ lui $at,0x8008 +/* 11f0c: 3c018008 */ lui $at,%hi(var800840f4) /* 11f10: 0fc5b4ab */ jal func0f16d2ac -/* 11f14: ac2040f4 */ sw $zero,0x40f4($at) +/* 11f14: ac2040f4 */ sw $zero,%lo(var800840f4)($at) /* 11f18: 240d0078 */ addiu $t5,$zero,0x78 -/* 11f1c: 3c018008 */ lui $at,0x8008 +/* 11f1c: 3c018008 */ lui $at,%hi(var800840fc) /* 11f20: 3c028008 */ lui $v0,%hi(var80087264) /* 11f24: 3c0a800a */ lui $t2,%hi(g_Vars) /* 11f28: 254a9fc0 */ addiu $t2,$t2,%lo(g_Vars) /* 11f2c: 8c427264 */ lw $v0,%lo(var80087264)($v0) -/* 11f30: ac2d40fc */ sw $t5,0x40fc($at) +/* 11f30: ac2d40fc */ sw $t5,%lo(var800840fc)($at) .L00011f34: /* 11f34: 3c048008 */ lui $a0,%hi(var800840fc) /* 11f38: 3c058008 */ lui $a1,%hi(var800840f4) diff --git a/src/lib/lib_12dc0.c b/src/lib/lib_12dc0.c index 5ae2ecac4..5d2d6360f 100644 --- a/src/lib/lib_12dc0.c +++ b/src/lib/lib_12dc0.c @@ -195,16 +195,16 @@ glabel func00012f30 /* 12fc4: 10400004 */ beqz $v0,.L00012fd8 /* 12fc8: 24040001 */ addiu $a0,$zero,0x1 /* 12fcc: 240f0001 */ addiu $t7,$zero,0x1 -/* 12fd0: 3c018006 */ lui $at,0x8006 -/* 12fd4: ac2fdda0 */ sw $t7,-0x2260($at) +/* 12fd0: 3c018006 */ lui $at,%hi(var8005dda0) +/* 12fd4: ac2fdda0 */ sw $t7,%lo(var8005dda0)($at) .L00012fd8: /* 12fd8: 3c057005 */ lui $a1,%hi(var70053ffc) /* 12fdc: 0c004c04 */ jal func00013010 /* 12fe0: 24a53ffc */ addiu $a1,$a1,%lo(var70053ffc) /* 12fe4: 10400003 */ beqz $v0,.L00012ff4 /* 12fe8: 24180001 */ addiu $t8,$zero,0x1 -/* 12fec: 3c018008 */ lui $at,0x8008 -/* 12ff0: ac384120 */ sw $t8,0x4120($at) +/* 12fec: 3c018008 */ lui $at,%hi(g_LanguageId) +/* 12ff0: ac384120 */ sw $t8,%lo(g_LanguageId)($at) .L00012ff4: /* 12ff4: 8fbf0024 */ lw $ra,0x24($sp) /* 12ff8: 8fa20028 */ lw $v0,0x28($sp) diff --git a/src/lib/lib_13900.c b/src/lib/lib_13900.c index 1c05360d2..eff910521 100644 --- a/src/lib/lib_13900.c +++ b/src/lib/lib_13900.c @@ -50,8 +50,8 @@ glabel func00013900 /* 13914: 8fbf0014 */ lw $ra,0x14($sp) /* 13918: 0c00543a */ jal func000150e8 /* 1391c: 00000000 */ sll $zero,$zero,0x0 -/* 13920: 3c018006 */ lui $at,0x8006 -/* 13924: ac20eef0 */ sw $zero,-0x1110($at) +/* 13920: 3c018006 */ lui $at,%hi(var8005eef0) +/* 13924: ac20eef0 */ sw $zero,%lo(var8005eef0)($at) /* 13928: 8fbf0014 */ lw $ra,0x14($sp) .L0001392c: /* 1392c: 27bd0018 */ addiu $sp,$sp,0x18 @@ -70,8 +70,8 @@ glabel func00013938 /* 13950: 0c005451 */ jal func00015144 /* 13954: 00000000 */ sll $zero,$zero,0x0 /* 13958: 240f0001 */ addiu $t7,$zero,0x1 -/* 1395c: 3c018006 */ lui $at,0x8006 -/* 13960: ac2feef0 */ sw $t7,-0x1110($at) +/* 1395c: 3c018006 */ lui $at,%hi(var8005eef0) +/* 13960: ac2feef0 */ sw $t7,%lo(var8005eef0)($at) /* 13964: 8fbf0014 */ lw $ra,0x14($sp) .L00013968: /* 13968: 27bd0018 */ addiu $sp,$sp,0x18 @@ -81,9 +81,9 @@ glabel func00013938 GLOBAL_ASM( glabel func00013974 -/* 13974: 3c018006 */ lui $at,0x8006 +/* 13974: 3c018006 */ lui $at,%hi(var8005eeec) /* 13978: 03e00008 */ jr $ra -/* 1397c: ac24eeec */ sw $a0,-0x1114($at) +/* 1397c: ac24eeec */ sw $a0,%lo(var8005eeec)($at) ); GLOBAL_ASM( @@ -107,9 +107,9 @@ glabel func0001398c /* 139b0: 2442eee0 */ addiu $v0,$v0,%lo(var8005eee0) /* 139b4: 000e70c0 */ sll $t6,$t6,0x3 /* 139b8: ac4e0000 */ sw $t6,0x0($v0) -/* 139bc: 3c018006 */ lui $at,0x8006 +/* 139bc: 3c018006 */ lui $at,%hi(var8005eee4) /* 139c0: 03e00008 */ jr $ra -/* 139c4: ac2eeee4 */ sw $t6,-0x111c($at) +/* 139c4: ac2eeee4 */ sw $t6,%lo(var8005eee4)($at) ); GLOBAL_ASM( @@ -180,9 +180,9 @@ glabel func00013a40 /* 13a90: 3c01800a */ lui $at,%hi(var80099f48) /* 13a94: 00220821 */ addu $at,$at,$v0 /* 13a98: a0249f48 */ sb $a0,%lo(var80099f48)($at) -/* 13a9c: 3c018006 */ lui $at,0x8006 +/* 13a9c: 3c018006 */ lui $at,%hi(var8005eecc) /* 13aa0: 24590001 */ addiu $t9,$v0,0x1 -/* 13aa4: ac39eecc */ sw $t9,-0x1134($at) +/* 13aa4: ac39eecc */ sw $t9,%lo(var8005eecc)($at) .L00013aa8: /* 13aa8: 8fbf0014 */ lw $ra,0x14($sp) /* 13aac: 27bd0018 */ addiu $sp,$sp,0x18 @@ -221,22 +221,22 @@ glabel func00013ab8 /* 13b18: 3c098006 */ lui $t1,%hi(var8005eefc) /* 13b1c: 8d29eefc */ lw $t1,%lo(var8005eefc)($t1) /* 13b20: 240a0001 */ addiu $t2,$zero,0x1 -/* 13b24: 3c018006 */ lui $at,0x8006 +/* 13b24: 3c018006 */ lui $at,%hi(var8005eefc) /* 13b28: 15200044 */ bnez $t1,.L00013c3c /* 13b2c: 3c0b8006 */ lui $t3,%hi(var8005eef4) /* 13b30: 8d6beef4 */ lw $t3,%lo(var8005eef4)($t3) -/* 13b34: ac2aeefc */ sw $t2,-0x1104($at) -/* 13b38: 3c018006 */ lui $at,0x8006 +/* 13b34: ac2aeefc */ sw $t2,%lo(var8005eefc)($at) +/* 13b38: 3c018006 */ lui $at,%hi(var8005eef8) /* 13b3c: afa70030 */ sw $a3,0x30($sp) /* 13b40: 0c012144 */ jal osGetCount -/* 13b44: ac2beef8 */ sw $t3,-0x1108($at) +/* 13b44: ac2beef8 */ sw $t3,%lo(var8005eef8)($at) /* 13b48: 3c0c8006 */ lui $t4,%hi(var8005eef8) /* 13b4c: 8d8ceef8 */ lw $t4,%lo(var8005eef8)($t4) /* 13b50: 3c068006 */ lui $a2,%hi(var8005eee0) /* 13b54: 8cc6eee0 */ lw $a2,%lo(var8005eee0)($a2) -/* 13b58: 3c018006 */ lui $at,0x8006 +/* 13b58: 3c018006 */ lui $at,%hi(var8005eef4) /* 13b5c: 004c1823 */ subu $v1,$v0,$t4 -/* 13b60: ac22eef4 */ sw $v0,-0x110c($at) +/* 13b60: ac22eef4 */ sw $v0,%lo(var8005eef4)($at) /* 13b64: 00032202 */ srl $a0,$v1,0x8 /* 13b68: 00062840 */ sll $a1,$a2,0x1 /* 13b6c: 00a4082b */ sltu $at,$a1,$a0 @@ -291,11 +291,11 @@ glabel func00013ab8 /* 13c20: a3a40027 */ sb $a0,0x27($sp) /* 13c24: 3c0b8006 */ lui $t3,%hi(var8005eee0) /* 13c28: 8d6beee0 */ lw $t3,%lo(var8005eee0)($t3) -/* 13c2c: 3c018006 */ lui $at,0x8006 -/* 13c30: ac2beee4 */ sw $t3,-0x111c($at) +/* 13c2c: 3c018006 */ lui $at,%hi(var8005eee4) +/* 13c30: ac2beee4 */ sw $t3,%lo(var8005eee4)($at) .L00013c34: -/* 13c34: 3c018006 */ lui $at,0x8006 -/* 13c38: ac20eefc */ sw $zero,-0x1104($at) +/* 13c34: 3c018006 */ lui $at,%hi(var8005eefc) +/* 13c38: ac20eefc */ sw $zero,%lo(var8005eefc)($at) .L00013c3c: /* 13c3c: 8fbf0014 */ lw $ra,0x14($sp) .L00013c40: @@ -366,15 +366,15 @@ glabel func00013c94 /* 13d20: 0c012148 */ jal osSetEventMesg /* 13d24: 00003025 */ or $a2,$zero,$zero /* 13d28: 240e0001 */ addiu $t6,$zero,0x1 -/* 13d2c: 3c018006 */ lui $at,0x8006 -/* 13d30: ac2eeeb0 */ sw $t6,-0x1150($at) -/* 13d34: 3c018006 */ lui $at,0x8006 -/* 13d38: ac20eec4 */ sw $zero,-0x113c($at) +/* 13d2c: 3c018006 */ lui $at,%hi(var8005eeb0) +/* 13d30: ac2eeeb0 */ sw $t6,%lo(var8005eeb0)($at) +/* 13d34: 3c018006 */ lui $at,%hi(var8005eec4) +/* 13d38: ac20eec4 */ sw $zero,%lo(var8005eec4)($at) /* 13d3c: 3c0f800a */ lui $t7,%hi(var80099a60) -/* 13d40: 3c018006 */ lui $at,0x8006 +/* 13d40: 3c018006 */ lui $at,%hi(var8005eec8) /* 13d44: 25e69a60 */ addiu $a2,$t7,%lo(var80099a60) /* 13d48: 3c08800a */ lui $t0,%hi(var80099e68) -/* 13d4c: ac20eec8 */ sw $zero,-0x1138($at) +/* 13d4c: ac20eec8 */ sw $zero,%lo(var8005eec8)($at) /* 13d50: 25089e68 */ addiu $t0,$t0,%lo(var80099e68) /* 13d54: 00c02825 */ or $a1,$a2,$zero /* 13d58: 2407ffff */ addiu $a3,$zero,-1 @@ -458,8 +458,8 @@ glabel func00013dfc /* 13e60: 0c0121bc */ jal osRecvMesg /* 13e64: 24060001 */ addiu $a2,$zero,0x1 /* 13e68: 240f0001 */ addiu $t7,$zero,0x1 -/* 13e6c: 3c018006 */ lui $at,0x8006 -/* 13e70: ac2feec0 */ sw $t7,-0x1140($at) +/* 13e6c: 3c018006 */ lui $at,%hi(var8005eec0) +/* 13e70: ac2feec0 */ sw $t7,%lo(var8005eec0)($at) .L00013e74: /* 13e74: 8fbf0014 */ lw $ra,0x14($sp) /* 13e78: 27bd0020 */ addiu $sp,$sp,0x20 @@ -486,8 +486,8 @@ glabel func00013e84 /* 13ebc: 0c012a60 */ jal func0004a980 /* 13ec0: 24a5eeac */ addiu $a1,$a1,%lo(var8005eeac) /* 13ec4: 240f0001 */ addiu $t7,$zero,0x1 -/* 13ec8: 3c018006 */ lui $at,0x8006 -/* 13ecc: ac2feeb4 */ sw $t7,-0x114c($at) +/* 13ec8: 3c018006 */ lui $at,%hi(var8005eeb4) +/* 13ecc: ac2feeb4 */ sw $t7,%lo(var8005eeb4)($at) /* 13ed0: 00008025 */ or $s0,$zero,$zero /* 13ed4: 24110004 */ addiu $s1,$zero,0x4 /* 13ed8: 00102600 */ sll $a0,$s0,0x18 @@ -530,8 +530,8 @@ glabel func00013e84 .L00013f60: /* 13f60: 1451fff7 */ bne $v0,$s1,.L00013f40 /* 13f64: 24630004 */ addiu $v1,$v1,0x4 -/* 13f68: 3c018006 */ lui $at,0x8006 -/* 13f6c: a030eeac */ sb $s0,-0x1154($at) +/* 13f68: 3c018006 */ lui $at,%hi(var8005eeac) +/* 13f6c: a030eeac */ sb $s0,%lo(var8005eeac)($at) .L00013f70: /* 13f70: 3c068006 */ lui $a2,%hi(var8005eeac) /* 13f74: 3c0b8006 */ lui $t3,%hi(var8005ef00) @@ -555,8 +555,8 @@ glabel func00013e84 /* 13fb4: 24420001 */ addiu $v0,$v0,0x1 /* 13fb8: 5451fff8 */ bnel $v0,$s1,.L00013f9c /* 13fbc: 240c0001 */ addiu $t4,$zero,0x1 -/* 13fc0: 3c018006 */ lui $at,0x8006 -/* 13fc4: a026ef00 */ sb $a2,-0x1100($at) +/* 13fc0: 3c018006 */ lui $at,%hi(var8005ef00) +/* 13fc4: a026ef00 */ sb $a2,%lo(var8005ef00)($at) .L00013fc8: /* 13fc8: 8fbf001c */ lw $ra,0x1c($sp) /* 13fcc: 8fb00014 */ lw $s0,0x14($sp) @@ -752,8 +752,8 @@ glabel func00014238 /* 14254: 15c0001f */ bnez $t6,.L000142d4 /* 14258: afb00014 */ sw $s0,0x14($sp) /* 1425c: 240f0001 */ addiu $t7,$zero,0x1 -/* 14260: 3c018006 */ lui $at,0x8006 -/* 14264: ac2fef04 */ sw $t7,-0x10fc($at) +/* 14260: 3c018006 */ lui $at,%hi(var8005ef04) +/* 14264: ac2fef04 */ sw $t7,%lo(var8005ef04)($at) /* 14268: 00008825 */ or $s1,$zero,$zero /* 1426c: 24130004 */ addiu $s3,$zero,0x4 /* 14270: 2412000d */ addiu $s2,$zero,0xd @@ -782,8 +782,8 @@ glabel func00014238 /* 142c4: 0c005587 */ jal func0001561c /* 142c8: 00000000 */ sll $zero,$zero,0x0 .L000142cc: -/* 142cc: 3c018006 */ lui $at,0x8006 -/* 142d0: ac20ef04 */ sw $zero,-0x10fc($at) +/* 142cc: 3c018006 */ lui $at,%hi(var8005ef04) +/* 142d0: ac20ef04 */ sw $zero,%lo(var8005ef04)($at) .L000142d4: /* 142d4: 8fbf0024 */ lw $ra,0x24($sp) /* 142d8: 8fb00014 */ lw $s0,0x14($sp) @@ -932,9 +932,9 @@ glabel func00014484 /* 144bc: 27a50034 */ addiu $a1,$sp,0x34 /* 144c0: 0c0121bc */ jal osRecvMesg /* 144c4: 24060001 */ addiu $a2,$zero,0x1 -/* 144c8: 3c018006 */ lui $at,0x8006 +/* 144c8: 3c018006 */ lui $at,%hi(var8005ee64) /* 144cc: 0c005102 */ jal func00014408 -/* 144d0: ac20ee64 */ sw $zero,-0x119c($at) +/* 144d0: ac20ee64 */ sw $zero,%lo(var8005ee64)($at) /* 144d4: 3c0f800a */ lui $t7,%hi(var80099c48) /* 144d8: 8def9c48 */ lw $t7,%lo(var80099c48)($t7) /* 144dc: 3c19800a */ lui $t9,%hi(var80099a60) @@ -1019,8 +1019,8 @@ glabel func00014484 /* 145fc: 0c0050fa */ jal func000143e8 /* 14600: 24849e78 */ addiu $a0,$a0,%lo(var80099e78) /* 14604: 24180001 */ addiu $t8,$zero,0x1 -/* 14608: 3c018006 */ lui $at,0x8006 -/* 1460c: ac38ee64 */ sw $t8,-0x119c($at) +/* 14608: 3c018006 */ lui $at,%hi(var8005ee64) +/* 1460c: ac38ee64 */ sw $t8,%lo(var8005ee64)($at) .L00014610: /* 14610: 3c04800a */ lui $a0,%hi(var80099f20) /* 14614: 24849f20 */ addiu $a0,$a0,%lo(var80099f20) @@ -1048,9 +1048,9 @@ glabel func00014484 /* 14664: 0c0121bc */ jal osRecvMesg /* 14668: 00003025 */ or $a2,$zero,$zero /* 1466c: 14400064 */ bnez $v0,.L00014800 -/* 14670: 3c018006 */ lui $at,0x8006 +/* 14670: 3c018006 */ lui $at,%hi(var8005ee64) /* 14674: 0c005102 */ jal func00014408 -/* 14678: ac20ee64 */ sw $zero,-0x119c($at) +/* 14678: ac20ee64 */ sw $zero,%lo(var8005ee64)($at) /* 1467c: 3c09800a */ lui $t1,%hi(var80099c48) /* 14680: 8d299c48 */ lw $t1,%lo(var80099c48)($t1) /* 14684: 3c0b800a */ lui $t3,%hi(var80099a60) @@ -1111,14 +1111,14 @@ glabel func00014484 /* 14748: 3c04800a */ lui $a0,%hi(var80099e78) /* 1474c: 0c0050fa */ jal func000143e8 /* 14750: 24849e78 */ addiu $a0,$a0,%lo(var80099e78) -/* 14754: 3c038006 */ lui $v1,%hi(var80060004) -/* 14758: 8c63ef0c */ lw $v1,-0x10f4($v1) +/* 14754: 3c038006 */ lui $v1,%hi(var8005ef0c) +/* 14758: 8c63ef0c */ lw $v1,%lo(var8005ef0c)($v1) /* 1475c: 240f0001 */ addiu $t7,$zero,0x1 -/* 14760: 3c018006 */ lui $at,0x8006 -/* 14764: ac2fee64 */ sw $t7,-0x119c($at) -/* 14768: 3c018006 */ lui $at,0x8006 +/* 14760: 3c018006 */ lui $at,%hi(var8005ee64) +/* 14764: ac2fee64 */ sw $t7,%lo(var8005ee64)($at) +/* 14768: 3c018006 */ lui $at,%hi(var8005ef0c) /* 1476c: 24630001 */ addiu $v1,$v1,0x1 -/* 14770: ac23ef0c */ sw $v1,-0x10f4($at) +/* 14770: ac23ef0c */ sw $v1,%lo(var8005ef0c)($at) /* 14774: 2861003c */ slti $at,$v1,0x3c /* 14778: 14200021 */ bnez $at,.L00014800 /* 1477c: 3c038006 */ lui $v1,%hi(var8005ee6c) @@ -1151,12 +1151,12 @@ glabel func00014484 /* 147e0: ac400000 */ sw $zero,0x0($v0) /* 147e4: 24420004 */ addiu $v0,$v0,0x4 .L000147e8: -/* 147e8: 24630004 */ addiu $v1,$v1,%lo(var80060004) +/* 147e8: 24630004 */ addiu $v1,$v1,4 /* 147ec: 24840004 */ addiu $a0,$a0,0x4 /* 147f0: 1446ffec */ bne $v0,$a2,.L000147a4 /* 147f4: 24a50004 */ addiu $a1,$a1,0x4 -/* 147f8: 3c018006 */ lui $at,0x8006 -/* 147fc: ac20ef0c */ sw $zero,-0x10f4($at) +/* 147f8: 3c018006 */ lui $at,%hi(var8005ef0c) +/* 147fc: ac20ef0c */ sw $zero,%lo(var8005ef0c)($at) .L00014800: /* 14800: 8fbf0014 */ lw $ra,0x14($sp) .L00014804: @@ -1167,9 +1167,9 @@ glabel func00014484 GLOBAL_ASM( glabel func00014810 -/* 14810: 3c018006 */ lui $at,0x8006 +/* 14810: 3c018006 */ lui $at,%hi(var8005eec0) /* 14814: 03e00008 */ jr $ra -/* 14818: ac24eec0 */ sw $a0,-0x1140($at) +/* 14818: ac24eec0 */ sw $a0,%lo(var8005eec0)($at) ); GLOBAL_ASM( @@ -1840,8 +1840,8 @@ glabel func000150e8 .L0001512c: /* 1512c: 8fbf0014 */ lw $ra,0x14($sp) /* 15130: 244e0001 */ addiu $t6,$v0,0x1 -/* 15134: 3c018006 */ lui $at,0x8006 -/* 15138: ac2eeebc */ sw $t6,-0x1144($at) +/* 15134: 3c018006 */ lui $at,%hi(var8005eebc) +/* 15138: ac2eeebc */ sw $t6,%lo(var8005eebc)($at) /* 1513c: 03e00008 */ jr $ra /* 15140: 27bd0020 */ addiu $sp,$sp,0x20 ); diff --git a/src/lib/lib_16110.c b/src/lib/lib_16110.c index 40ac94879..177dcd9f5 100644 --- a/src/lib/lib_16110.c +++ b/src/lib/lib_16110.c @@ -2335,10 +2335,10 @@ glabel func00018148 .L000181d0: /* 181d0: 3c198006 */ lui $t9,%hi(var8005ef20) /* 181d4: 9339ef20 */ lbu $t9,%lo(var8005ef20)($t9) -/* 181d8: 3c018006 */ lui $at,0x8006 +/* 181d8: 3c018006 */ lui $at,%hi(var8005ef20) /* 181dc: 27be007c */ addiu $s8,$sp,0x7c /* 181e0: 27290001 */ addiu $t1,$t9,0x1 -/* 181e4: a029ef20 */ sb $t1,-0x10e0($at) +/* 181e4: a029ef20 */ sb $t1,%lo(var8005ef20)($at) /* 181e8: 240100ff */ addiu $at,$zero,0xff /* 181ec: 312a00ff */ andi $t2,$t1,0xff /* 181f0: 15410010 */ bne $t2,$at,.L00018234 @@ -2358,8 +2358,8 @@ glabel func00018148 /* 18224: a043fffe */ sb $v1,-0x2($v0) /* 18228: 0000b825 */ or $s7,$zero,$zero .L0001822c: -/* 1822c: 3c018006 */ lui $at,0x8006 -/* 18230: a020ef20 */ sb $zero,-0x10e0($at) +/* 1822c: 3c018006 */ lui $at,%hi(var8005ef20) +/* 18230: a020ef20 */ sb $zero,%lo(var8005ef20)($at) .L00018234: /* 18234: 26944cc8 */ addiu $s4,$s4,%lo(g_PortalSomethings) /* 18238: 87b5009c */ lh $s5,0x9c($sp) diff --git a/src/lib/lib_1a500.c b/src/lib/lib_1a500.c index d94b2f4db..9bf3022c7 100644 --- a/src/lib/lib_1a500.c +++ b/src/lib/lib_1a500.c @@ -288,9 +288,9 @@ const u32 var7005468c[] = {0x00000000}; GLOBAL_ASM( glabel func0001a500 -/* 1a500: 3c018006 */ lui $at,0x8006 +/* 1a500: 3c018006 */ lui $at,%hi(var8005efb4) /* 1a504: 03e00008 */ jr $ra -/* 1a508: ac24efb4 */ sw $a0,-0x104c($at) +/* 1a508: ac24efb4 */ sw $a0,%lo(var8005efb4)($at) ); GLOBAL_ASM( @@ -302,9 +302,9 @@ glabel func0001a50c GLOBAL_ASM( glabel func0001a518 -/* 1a518: 3c018006 */ lui $at,0x8006 +/* 1a518: 3c018006 */ lui $at,%hi(var8005efc8) /* 1a51c: 03e00008 */ jr $ra -/* 1a520: ac24efc8 */ sw $a0,-0x1038($at) +/* 1a520: ac24efc8 */ sw $a0,%lo(var8005efc8)($at) ); GLOBAL_ASM( @@ -4817,9 +4817,9 @@ glabel func0001e14c GLOBAL_ASM( glabel func0001e29c -/* 1e29c: 3c018006 */ lui $at,0x8006 +/* 1e29c: 3c018006 */ lui $at,%hi(var8005efdc) /* 1e2a0: 03e00008 */ jr $ra -/* 1e2a4: ac24efdc */ sw $a0,-0x1024($at) +/* 1e2a4: ac24efdc */ sw $a0,%lo(var8005efdc)($at) ); GLOBAL_ASM( diff --git a/src/lib/lib_233c0.c b/src/lib/lib_233c0.c index 4cab9a1e7..0aa077ac0 100644 --- a/src/lib/lib_233c0.c +++ b/src/lib/lib_233c0.c @@ -65,9 +65,9 @@ glabel func000233c0 /* 23434: 24a5a898 */ addiu $a1,$a1,%lo(var8009a898) /* 23438: 246c0004 */ addiu $t4,$v1,0x4 /* 2343c: acac0000 */ sw $t4,0x0($a1) -/* 23440: 3c018006 */ lui $at,0x8006 +/* 23440: 3c018006 */ lui $at,%hi(var8005f00c) /* 23444: a52b0000 */ sh $t3,0x0($t1) -/* 23448: ac2cf00c */ sw $t4,-0xff4($at) +/* 23448: ac2cf00c */ sw $t4,%lo(var8005f00c)($at) /* 2344c: 85280000 */ lh $t0,0x0($t1) /* 23450: 3c078006 */ lui $a3,%hi(var8005f018) /* 23454: 3c108006 */ lui $s0,%hi(var8005f01c) @@ -79,8 +79,8 @@ glabel func000233c0 /* 2346c: ace60000 */ sw $a2,0x0($a3) /* 23470: 00083080 */ sll $a2,$t0,0x2 /* 23474: 00c83023 */ subu $a2,$a2,$t0 -/* 23478: 3c038006 */ lui $v1,%hi(var8006000c) -/* 2347c: 8c63f00c */ lw $v1,-0xff4($v1) +/* 23478: 3c038006 */ lui $v1,%hi(var8005f00c) +/* 2347c: 8c63f00c */ lw $v1,%lo(var8005f00c)($v1) /* 23480: 00063080 */ sll $a2,$a2,0x2 /* 23484: 00002025 */ or $a0,$zero,$zero .L00023488: @@ -101,7 +101,7 @@ glabel func000233c0 /* 234bc: 0086082a */ slt $at,$a0,$a2 .L000234c0: /* 234c0: 1420fff1 */ bnez $at,.L00023488 -/* 234c4: 2463000c */ addiu $v1,$v1,%lo(var8006000c) +/* 234c4: 2463000c */ addiu $v1,$v1,12 .L000234c8: /* 234c8: 8e0f0000 */ lw $t7,0x0($s0) /* 234cc: 8ceb0000 */ lw $t3,0x0($a3) @@ -119,8 +119,8 @@ glabel func000233c0 /* 234fc: 0c0048f2 */ jal malloc /* 23500: 24050006 */ addiu $a1,$zero,0x6 /* 23504: 3c098006 */ lui $t1,%hi(var8005f008) -/* 23508: 3c018006 */ lui $at,0x8006 -/* 2350c: ac22f010 */ sw $v0,-0xff0($at) +/* 23508: 3c018006 */ lui $at,%hi(var8005f010) +/* 2350c: ac22f010 */ sw $v0,%lo(var8005f010)($at) /* 23510: 2529f008 */ addiu $t1,$t1,%lo(var8005f008) /* 23514: 85240000 */ lh $a0,0x0($t1) /* 23518: 24050006 */ addiu $a1,$zero,0x6 @@ -130,8 +130,8 @@ glabel func000233c0 /* 23528: 0c0048f2 */ jal malloc /* 2352c: 3944003f */ xori $a0,$t2,0x3f /* 23530: 3c078006 */ lui $a3,%hi(var8005f018) -/* 23534: 3c018006 */ lui $at,0x8006 -/* 23538: ac22f014 */ sw $v0,-0xfec($at) +/* 23534: 3c018006 */ lui $at,%hi(var8005f014) +/* 23538: ac22f014 */ sw $v0,%lo(var8005f014)($at) /* 2353c: 24e7f018 */ addiu $a3,$a3,%lo(var8005f018) /* 23540: 8ce40000 */ lw $a0,0x0($a3) /* 23544: 24050006 */ addiu $a1,$zero,0x6 @@ -190,11 +190,11 @@ glabel func000233c0 /* 23618: 0c008d90 */ jal func00023640 /* 2361c: ac22a890 */ sw $v0,%lo(var8009a890)($at) /* 23620: 8fbf001c */ lw $ra,0x1c($sp) -/* 23624: 3c018006 */ lui $at,0x8006 -/* 23628: ac20f024 */ sw $zero,-0xfdc($at) -/* 2362c: 3c018006 */ lui $at,0x8006 +/* 23624: 3c018006 */ lui $at,%hi(var8005f024) +/* 23628: ac20f024 */ sw $zero,%lo(var8005f024)($at) +/* 2362c: 3c018006 */ lui $at,%hi(var8005f020) /* 23630: 8fb00018 */ lw $s0,0x18($sp) -/* 23634: ac20f020 */ sw $zero,-0xfe0($at) +/* 23634: ac20f020 */ sw $zero,%lo(var8005f020)($at) /* 23638: 03e00008 */ jr $ra /* 2363c: 27bd0028 */ addiu $sp,$sp,0x28 ); @@ -276,13 +276,13 @@ glabel func0002373c /* 23740: 85cea894 */ lh $t6,%lo(var8009a894)($t6) /* 23744: 3c0f800a */ lui $t7,%hi(var8009a898) /* 23748: 8defa898 */ lw $t7,%lo(var8009a898)($t7) -/* 2374c: 3c018006 */ lui $at,0x8006 -/* 23750: a42ef008 */ sh $t6,-0xff8($at) -/* 23754: 3c018006 */ lui $at,0x8006 -/* 23758: ac2ff00c */ sw $t7,-0xff4($at) -/* 2375c: 3c018006 */ lui $at,0x8006 +/* 2374c: 3c018006 */ lui $at,%hi(var8005f008) +/* 23750: a42ef008 */ sh $t6,%lo(var8005f008)($at) +/* 23754: 3c018006 */ lui $at,%hi(var8005f00c) +/* 23758: ac2ff00c */ sw $t7,%lo(var8005f00c)($at) +/* 2375c: 3c018006 */ lui $at,%hi(var8005f020) /* 23760: 03e00008 */ jr $ra -/* 23764: ac20f020 */ sw $zero,-0xfe0($at) +/* 23764: ac20f020 */ sw $zero,%lo(var8005f020)($at) ); GLOBAL_ASM( @@ -684,7 +684,7 @@ glabel func00023ab0 /* 23cc4: 01626821 */ addu $t5,$t3,$v0 /* 23cc8: a5b00000 */ sh $s0,0x0($t5) /* 23ccc: 8f18a880 */ lw $t8,%lo(var8009a880)($t8) -/* 23cd0: 3c018006 */ lui $at,0x8006 +/* 23cd0: 3c018006 */ lui $at,%hi(var8005f000) /* 23cd4: 03077021 */ addu $t6,$t8,$a3 /* 23cd8: a1cf0000 */ sb $t7,0x0($t6) /* 23cdc: 07210004 */ bgez $t9,.L00023cf0 @@ -693,7 +693,7 @@ glabel func00023ab0 /* 23ce8: 00000000 */ sll $zero,$zero,0x0 /* 23cec: 258cffe0 */ addiu $t4,$t4,-32 .L00023cf0: -/* 23cf0: ac2cf000 */ sw $t4,-0x1000($at) +/* 23cf0: ac2cf000 */ sw $t4,%lo(var8005f000)($at) .L00023cf4: /* 23cf4: 8fbf001c */ lw $ra,0x1c($sp) /* 23cf8: 8fb00014 */ lw $s0,0x14($sp) @@ -760,9 +760,9 @@ glabel func00023d38 /* 23dc4: 00000000 */ sll $zero,$zero,0x0 /* 23dc8: 0006000d */ break 0x6 .L00023dcc: -/* 23dcc: 3c018006 */ lui $at,0x8006 +/* 23dcc: 3c018006 */ lui $at,%hi(var8005f004) /* 23dd0: 0000c010 */ mfhi $t8 -/* 23dd4: ac38f004 */ sw $t8,-0xffc($at) +/* 23dd4: ac38f004 */ sw $t8,%lo(var8005f004)($at) /* 23dd8: 10000059 */ beqz $zero,.L00023f40 /* 23ddc: 8fbf001c */ lw $ra,0x1c($sp) .L00023de0: @@ -856,8 +856,8 @@ glabel func00023d38 /* 23f2c: 00000000 */ sll $zero,$zero,0x0 /* 23f30: 0006000d */ break 0x6 .L00023f34: -/* 23f34: 3c018006 */ lui $at,0x8006 -/* 23f38: ac2cf004 */ sw $t4,-0xffc($at) +/* 23f34: 3c018006 */ lui $at,%hi(var8005f004) +/* 23f38: ac2cf004 */ sw $t4,%lo(var8005f004)($at) /* 23f3c: 8fbf001c */ lw $ra,0x1c($sp) .L00023f40: /* 23f40: 8fb00018 */ lw $s0,0x18($sp) @@ -2021,11 +2021,11 @@ glabel func00024f6c /* 24f90: ac20a8ec */ sw $zero,%lo(var8009a8ec)($at) /* 24f94: 3c01800a */ lui $at,%hi(var8009a8f4) /* 24f98: ac20a8f4 */ sw $zero,%lo(var8009a8f4)($at) -/* 24f9c: 3c018006 */ lui $at,0x8006 -/* 24fa0: ac20f034 */ sw $zero,-0xfcc($at) -/* 24fa4: 3c018006 */ lui $at,0x8006 +/* 24f9c: 3c018006 */ lui $at,%hi(var8005f034) +/* 24fa0: ac20f034 */ sw $zero,%lo(var8005f034)($at) +/* 24fa4: 3c018006 */ lui $at,%hi(var8005f038) /* 24fa8: 03e00008 */ jr $ra -/* 24fac: ac20f038 */ sw $zero,-0xfc8($at) +/* 24fac: ac20f038 */ sw $zero,%lo(var8005f038)($at) ); GLOBAL_ASM( @@ -2059,11 +2059,11 @@ glabel func00024fb0 /* 25018: ac20a8ec */ sw $zero,%lo(var8009a8ec)($at) /* 2501c: 3c01800a */ lui $at,%hi(var8009a8f4) /* 25020: ac20a8f4 */ sw $zero,%lo(var8009a8f4)($at) -/* 25024: 3c018006 */ lui $at,0x8006 -/* 25028: ac20f034 */ sw $zero,-0xfcc($at) -/* 2502c: 3c018006 */ lui $at,0x8006 +/* 25024: 3c018006 */ lui $at,%hi(var8005f034) +/* 25028: ac20f034 */ sw $zero,%lo(var8005f034)($at) +/* 2502c: 3c018006 */ lui $at,%hi(var8005f038) /* 25030: 03e00008 */ jr $ra -/* 25034: ac20f038 */ sw $zero,-0xfc8($at) +/* 25034: ac20f038 */ sw $zero,%lo(var8005f038)($at) ); GLOBAL_ASM( @@ -2100,11 +2100,11 @@ glabel func00025038 /* 250ac: ac20a8ec */ sw $zero,%lo(var8009a8ec)($at) /* 250b0: 3c01800a */ lui $at,%hi(var8009a8f4) /* 250b4: ac20a8f4 */ sw $zero,%lo(var8009a8f4)($at) -/* 250b8: 3c018006 */ lui $at,0x8006 -/* 250bc: ac20f034 */ sw $zero,-0xfcc($at) -/* 250c0: 3c018006 */ lui $at,0x8006 +/* 250b8: 3c018006 */ lui $at,%hi(var8005f034) +/* 250bc: ac20f034 */ sw $zero,%lo(var8005f034)($at) +/* 250c0: 3c018006 */ lui $at,%hi(var8005f038) /* 250c4: 03e00008 */ jr $ra -/* 250c8: ac20f038 */ sw $zero,-0xfc8($at) +/* 250c8: ac20f038 */ sw $zero,%lo(var8005f038)($at) ); GLOBAL_ASM( @@ -2164,11 +2164,11 @@ glabel func00025168 /* 2518c: ac20a8ec */ sw $zero,%lo(var8009a8ec)($at) /* 25190: 3c01800a */ lui $at,%hi(var8009a8f4) /* 25194: ac20a8f4 */ sw $zero,%lo(var8009a8f4)($at) -/* 25198: 3c018006 */ lui $at,0x8006 -/* 2519c: ac20f034 */ sw $zero,-0xfcc($at) -/* 251a0: 3c018006 */ lui $at,0x8006 +/* 25198: 3c018006 */ lui $at,%hi(var8005f034) +/* 2519c: ac20f034 */ sw $zero,%lo(var8005f034)($at) +/* 251a0: 3c018006 */ lui $at,%hi(var8005f038) /* 251a4: 03e00008 */ jr $ra -/* 251a8: ac20f038 */ sw $zero,-0xfc8($at) +/* 251a8: ac20f038 */ sw $zero,%lo(var8005f038)($at) ); GLOBAL_ASM( @@ -2210,11 +2210,11 @@ glabel func000251ac /* 25234: ac20a8ec */ sw $zero,%lo(var8009a8ec)($at) /* 25238: 3c01800a */ lui $at,%hi(var8009a8f4) /* 2523c: ac20a8f4 */ sw $zero,%lo(var8009a8f4)($at) -/* 25240: 3c018006 */ lui $at,0x8006 -/* 25244: ac20f034 */ sw $zero,-0xfcc($at) -/* 25248: 3c018006 */ lui $at,0x8006 +/* 25240: 3c018006 */ lui $at,%hi(var8005f034) +/* 25244: ac20f034 */ sw $zero,%lo(var8005f034)($at) +/* 25248: 3c018006 */ lui $at,%hi(var8005f038) /* 2524c: 03e00008 */ jr $ra -/* 25250: ac20f038 */ sw $zero,-0xfc8($at) +/* 25250: ac20f038 */ sw $zero,%lo(var8005f038)($at) ); GLOBAL_ASM( @@ -2260,13 +2260,13 @@ glabel func00025254 /* 252ec: ac29a8ec */ sw $t1,%lo(var8009a8ec)($at) /* 252f0: 3c01800a */ lui $at,%hi(var8009a8f4) /* 252f4: ac20a8f4 */ sw $zero,%lo(var8009a8f4)($at) -/* 252f8: 3c018006 */ lui $at,0x8006 -/* 252fc: ac20f034 */ sw $zero,-0xfcc($at) +/* 252f8: 3c018006 */ lui $at,%hi(var8005f034) +/* 252fc: ac20f034 */ sw $zero,%lo(var8005f034)($at) /* 25300: 3c01800a */ lui $at,%hi(var8009a964) /* 25304: ac2ea964 */ sw $t6,%lo(var8009a964)($at) -/* 25308: 3c018006 */ lui $at,0x8006 +/* 25308: 3c018006 */ lui $at,%hi(var8005f038) /* 2530c: 03e00008 */ jr $ra -/* 25310: ac29f038 */ sw $t1,-0xfc8($at) +/* 25310: ac29f038 */ sw $t1,%lo(var8005f038)($at) ); GLOBAL_ASM( @@ -2341,9 +2341,9 @@ glabel func000253c4 /* 253f8: 8d010000 */ lw $at,0x0($t0) /* 253fc: 24090001 */ addiu $t1,$zero,0x1 /* 25400: adc10000 */ sw $at,0x0($t6) -/* 25404: 3c018006 */ lui $at,0x8006 +/* 25404: 3c018006 */ lui $at,%hi(var8005f034) /* 25408: 03e00008 */ jr $ra -/* 2540c: ac29f034 */ sw $t1,-0xfcc($at) +/* 2540c: ac29f034 */ sw $t1,%lo(var8005f034)($at) ); GLOBAL_ASM( diff --git a/src/lib/lib_2f490.c b/src/lib/lib_2f490.c index 3430ff2ca..e362fb7e5 100644 --- a/src/lib/lib_2f490.c +++ b/src/lib/lib_2f490.c @@ -315,9 +315,9 @@ glabel func0002f8a0 /* 2f8d4: 3c038006 */ lui $v1,%hi(var8005f044) /* 2f8d8: 2463f044 */ addiu $v1,$v1,%lo(var8005f044) /* 2f8dc: ac620000 */ sw $v0,0x0($v1) -/* 2f8e0: 3c018006 */ lui $at,0x8006 +/* 2f8e0: 3c018006 */ lui $at,%hi(var8005f040) /* 2f8e4: 0044c021 */ addu $t8,$v0,$a0 -/* 2f8e8: ac38f040 */ sw $t8,-0xfc0($at) +/* 2f8e8: ac38f040 */ sw $t8,%lo(var8005f040)($at) /* 2f8ec: 03e00008 */ jr $ra /* 2f8f0: 27bd0020 */ addiu $sp,$sp,0x20 ); diff --git a/src/lib/lib_2fba0.c b/src/lib/lib_2fba0.c index 7655e1b17..dcfd8a337 100644 --- a/src/lib/lib_2fba0.c +++ b/src/lib/lib_2fba0.c @@ -22,16 +22,16 @@ glabel func0002fba0 /* 2fbb8: 15c0000e */ bnez $t6,.L0002fbf4 /* 2fbbc: 00000000 */ sll $zero,$zero,0x0 /* 2fbc0: 8faf0018 */ lw $t7,0x18($sp) -/* 2fbc4: 3c018006 */ lui $at,0x8006 -/* 2fbc8: ac2ff110 */ sw $t7,-0xef0($at) +/* 2fbc4: 3c018006 */ lui $at,%hi(var8005f110) +/* 2fbc8: ac2ff110 */ sw $t7,%lo(var8005f110)($at) /* 2fbcc: 3c188006 */ lui $t8,%hi(var8005f114) /* 2fbd0: 8f18f114 */ lw $t8,%lo(var8005f114)($t8) /* 2fbd4: 17000007 */ bnez $t8,.L0002fbf4 /* 2fbd8: 00000000 */ sll $zero,$zero,0x0 /* 2fbdc: 3c198006 */ lui $t9,%hi(var8005f110) /* 2fbe0: 8f39f110 */ lw $t9,%lo(var8005f110)($t9) -/* 2fbe4: 3c018006 */ lui $at,0x8006 -/* 2fbe8: ac39f114 */ sw $t9,-0xeec($at) +/* 2fbe4: 3c018006 */ lui $at,%hi(var8005f114) +/* 2fbe8: ac39f114 */ sw $t9,%lo(var8005f114)($at) /* 2fbec: 0c00c338 */ jal func00030ce0 /* 2fbf0: 8fa4001c */ lw $a0,0x1c($sp) .L0002fbf4: @@ -55,10 +55,10 @@ glabel func0002fc0c /* 2fc24: 00000000 */ sll $zero,$zero,0x0 /* 2fc28: 0c00e7f0 */ jal func00039fc0 /* 2fc2c: 00000000 */ sll $zero,$zero,0x0 -/* 2fc30: 3c018006 */ lui $at,0x8006 -/* 2fc34: ac20f110 */ sw $zero,-0xef0($at) -/* 2fc38: 3c018006 */ lui $at,0x8006 -/* 2fc3c: ac20f114 */ sw $zero,-0xeec($at) +/* 2fc30: 3c018006 */ lui $at,%hi(var8005f110) +/* 2fc34: ac20f110 */ sw $zero,%lo(var8005f110)($at) +/* 2fc38: 3c018006 */ lui $at,%hi(var8005f114) +/* 2fc3c: ac20f114 */ sw $zero,%lo(var8005f114)($at) .L0002fc40: /* 2fc40: 10000001 */ beqz $zero,.L0002fc48 /* 2fc44: 00000000 */ sll $zero,$zero,0x0 diff --git a/src/lib/lib_30ce0.c b/src/lib/lib_30ce0.c index 5572912f5..857de7310 100644 --- a/src/lib/lib_30ce0.c +++ b/src/lib/lib_30ce0.c @@ -302,11 +302,11 @@ glabel func00030ce0 /* 31118: 000f7980 */ sll $t7,$t7,0x6 /* 3111c: 01e95821 */ addu $t3,$t7,$t1 /* 31120: afab0034 */ sw $t3,0x34($sp) -/* 31124: 3c058006 */ lui $a1,%hi(var80060004) -/* 31128: 8ca5f114 */ lw $a1,-0xeec($a1) +/* 31124: 3c058006 */ lui $a1,%hi(var8005f114) +/* 31128: 8ca5f114 */ lw $a1,%lo(var8005f114)($a1) /* 3112c: 8fa40034 */ lw $a0,0x34($sp) /* 31130: 0c00c5dc */ jal func00031770 -/* 31134: 24a50004 */ addiu $a1,$a1,%lo(var80060004) +/* 31134: 24a50004 */ addiu $a1,$a1,4 /* 31138: 8faa0034 */ lw $t2,0x34($sp) /* 3113c: ad400008 */ sw $zero,0x8($t2) /* 31140: 3c0c8006 */ lui $t4,%hi(var8005f114) @@ -627,11 +627,11 @@ glabel func00031590 .L000315ac: /* 315ac: 0c00c5e9 */ jal func000317a4 /* 315b0: 8fa4001c */ lw $a0,0x1c($sp) -/* 315b4: 3c058006 */ lui $a1,%hi(var80060004) -/* 315b8: 8ca5f114 */ lw $a1,-0xeec($a1) +/* 315b4: 3c058006 */ lui $a1,%hi(var8005f114) +/* 315b8: 8ca5f114 */ lw $a1,%lo(var8005f114)($a1) /* 315bc: 8fa4001c */ lw $a0,0x1c($sp) /* 315c0: 0c00c5dc */ jal func00031770 -/* 315c4: 24a50004 */ addiu $a1,$a1,%lo(var80060004) +/* 315c4: 24a50004 */ addiu $a1,$a1,4 /* 315c8: 3c188006 */ lui $t8,%hi(var8005f114) /* 315cc: 8f18f114 */ lw $t8,%lo(var8005f114)($t8) /* 315d0: 8f190014 */ lw $t9,0x14($t8) @@ -654,11 +654,11 @@ glabel func000315f4 /* 315fc: afa40018 */ sw $a0,0x18($sp) /* 31600: 0c00c5e9 */ jal func000317a4 /* 31604: 8fa40018 */ lw $a0,0x18($sp) -/* 31608: 3c058006 */ lui $a1,%hi(var80060014) -/* 3160c: 8ca5f114 */ lw $a1,-0xeec($a1) +/* 31608: 3c058006 */ lui $a1,%hi(var8005f114) +/* 3160c: 8ca5f114 */ lw $a1,%lo(var8005f114)($a1) /* 31610: 8fa40018 */ lw $a0,0x18($sp) /* 31614: 0c00c5dc */ jal func00031770 -/* 31618: 24a50014 */ addiu $a1,$a1,%lo(var80060014) +/* 31618: 24a50014 */ addiu $a1,$a1,20 /* 3161c: 10000001 */ beqz $zero,.L00031624 /* 31620: 00000000 */ sll $zero,$zero,0x0 .L00031624: diff --git a/src/lib/lib_317f0.c b/src/lib/lib_317f0.c index 676a9a751..af7229ebd 100644 --- a/src/lib/lib_317f0.c +++ b/src/lib/lib_317f0.c @@ -283,18 +283,18 @@ glabel func000317f0 /* 31898: 0c00bec5 */ jal func0002fb14 /* 3189c: afb90010 */ sw $t9,0x10($sp) /* 318a0: afa20038 */ sw $v0,0x38($sp) -/* 318a4: 3c048006 */ lui $a0,%hi(var80060014) -/* 318a8: 8c84f12c */ lw $a0,-0xed4($a0) +/* 318a4: 3c048006 */ lui $a0,%hi(var8005f12c) +/* 318a8: 8c84f12c */ lw $a0,%lo(var8005f12c)($a0) /* 318ac: 8fa80040 */ lw $t0,0x40($sp) /* 318b0: 8fa50038 */ lw $a1,0x38($sp) -/* 318b4: 24840014 */ addiu $a0,$a0,%lo(var80060014) +/* 318b4: 24840014 */ addiu $a0,$a0,20 /* 318b8: 0c00f134 */ jal func0003c4d0 /* 318bc: 8d060004 */ lw $a2,0x4($t0) /* 318c0: 3c098006 */ lui $t1,%hi(var8005f12c) /* 318c4: 8d29f12c */ lw $t1,%lo(var8005f12c)($t1) -/* 318c8: 3c018006 */ lui $at,0x8006 +/* 318c8: 3c018006 */ lui $at,%hi(var8005f128) /* 318cc: 8d2a0040 */ lw $t2,0x40($t1) -/* 318d0: ac2af128 */ sw $t2,-0xed8($at) +/* 318d0: ac2af128 */ sw $t2,%lo(var8005f128)($at) /* 318d4: 8fac0040 */ lw $t4,0x40($sp) /* 318d8: 240b0001 */ addiu $t3,$zero,0x1 /* 318dc: afab003c */ sw $t3,0x3c($sp) @@ -374,9 +374,9 @@ glabel func000317f0 /* 319f4: 3c0c8006 */ lui $t4,%hi(var8005f12c) /* 319f8: 8d8cf12c */ lw $t4,%lo(var8005f12c)($t4) /* 319fc: ad8c0004 */ sw $t4,0x4($t4) -/* 31a00: 3c048006 */ lui $a0,%hi(var80060028) +/* 31a00: 3c048006 */ lui $a0,%hi(var8005f12c) /* 31a04: 0c00f240 */ jal func0003c900 -/* 31a08: 8c84f12c */ lw $a0,-0xed4($a0) +/* 31a08: 8c84f12c */ lw $a0,%lo(var8005f12c)($a0) /* 31a0c: 24080020 */ addiu $t0,$zero,0x20 /* 31a10: a7a80028 */ sh $t0,0x28($sp) /* 31a14: 3c0b8006 */ lui $t3,%hi(var8005f12c) @@ -432,7 +432,7 @@ glabel func00031a68 .L00031ac0: /* 31ac0: 8fa4002c */ lw $a0,0x2c($sp) /* 31ac4: 0c00c6cd */ jal func00031b34 -/* 31ac8: 24840028 */ addiu $a0,$a0,%lo(var80060028) +/* 31ac8: 24840028 */ addiu $a0,$a0,40 /* 31acc: 10000001 */ beqz $zero,.L00031ad4 /* 31ad0: 00000000 */ sll $zero,$zero,0x0 .L00031ad4: @@ -640,13 +640,13 @@ glabel func00031b34 /* 31db4: 8f190034 */ lw $t9,0x34($t8) /* 31db8: 2728ffff */ addiu $t0,$t9,-1 /* 31dbc: af080034 */ sw $t0,0x34($t8) -/* 31dc0: 3c048006 */ lui $a0,%hi(var80060014) -/* 31dc4: 8c84f12c */ lw $a0,-0xed4($a0) +/* 31dc0: 3c048006 */ lui $a0,%hi(var8005f12c) +/* 31dc4: 8c84f12c */ lw $a0,%lo(var8005f12c)($a0) /* 31dc8: 8fa500b8 */ lw $a1,0xb8($sp) /* 31dcc: 34068235 */ dli $a2,0x8235 /* 31dd0: 00003825 */ or $a3,$zero,$zero /* 31dd4: 0c00f184 */ jal func0003c610 -/* 31dd8: 24840014 */ addiu $a0,$a0,%lo(var80060014) +/* 31dd8: 24840014 */ addiu $a0,$a0,20 /* 31ddc: 10000045 */ beqz $zero,.L00031ef4 /* 31de0: 00000000 */ sll $zero,$zero,0x0 .L00031de4: @@ -677,13 +677,13 @@ glabel func00031b34 /* 31e40: 8fa90054 */ lw $t1,0x54($sp) /* 31e44: 24180003 */ addiu $t8,$zero,0x3 /* 31e48: a1380045 */ sb $t8,0x45($t1) -/* 31e4c: 3c048006 */ lui $a0,%hi(var80060014) -/* 31e50: 8c84f12c */ lw $a0,-0xed4($a0) +/* 31e4c: 3c048006 */ lui $a0,%hi(var8005f12c) +/* 31e50: 8c84f12c */ lw $a0,%lo(var8005f12c)($a0) /* 31e54: 27a50044 */ addiu $a1,$sp,0x44 /* 31e58: 240603e8 */ addiu $a2,$zero,0x3e8 /* 31e5c: 00003825 */ or $a3,$zero,$zero /* 31e60: 0c00f184 */ jal func0003c610 -/* 31e64: 24840014 */ addiu $a0,$a0,%lo(var80060014) +/* 31e64: 24840014 */ addiu $a0,$a0,20 /* 31e68: 8fa40054 */ lw $a0,0x54($sp) /* 31e6c: 00002825 */ or $a1,$zero,$zero /* 31e70: 240603e8 */ addiu $a2,$zero,0x3e8 @@ -706,13 +706,13 @@ glabel func00031b34 /* 31eac: 8fb90060 */ lw $t9,0x60($sp) /* 31eb0: 240f0002 */ addiu $t7,$zero,0x2 /* 31eb4: af2f0034 */ sw $t7,0x34($t9) -/* 31eb8: 3c048006 */ lui $a0,%hi(var80060014) -/* 31ebc: 8c84f12c */ lw $a0,-0xed4($a0) +/* 31eb8: 3c048006 */ lui $a0,%hi(var8005f12c) +/* 31ebc: 8c84f12c */ lw $a0,%lo(var8005f12c)($a0) /* 31ec0: 8fa500b8 */ lw $a1,0xb8($sp) /* 31ec4: 240603e9 */ addiu $a2,$zero,0x3e9 /* 31ec8: 00003825 */ or $a3,$zero,$zero /* 31ecc: 0c00f184 */ jal func0003c610 -/* 31ed0: 24840014 */ addiu $a0,$a0,%lo(var80060014) +/* 31ed0: 24840014 */ addiu $a0,$a0,20 /* 31ed4: 10000003 */ beqz $zero,.L00031ee4 /* 31ed8: 00000000 */ sll $zero,$zero,0x0 .L00031edc: @@ -993,9 +993,9 @@ glabel func00031b34 /* 322cc: a18d0045 */ sb $t5,0x45($t4) /* 322d0: 3c088006 */ lui $t0,%hi(var8005f130) /* 322d4: 8508f130 */ lh $t0,%lo(var8005f130)($t0) -/* 322d8: 3c018006 */ lui $at,0x8006 +/* 322d8: 3c018006 */ lui $at,%hi(var8005f130) /* 322dc: 25190001 */ addiu $t9,$t0,0x1 -/* 322e0: a439f130 */ sh $t9,-0xed0($at) +/* 322e0: a439f130 */ sh $t9,%lo(var8005f130)($at) /* 322e4: 8fb80060 */ lw $t8,0x60($sp) /* 322e8: 930a0044 */ lbu $t2,0x44($t8) /* 322ec: 314f0002 */ andi $t7,$t2,0x2 @@ -1123,13 +1123,13 @@ glabel func00031b34 /* 324c8: a7ac0094 */ sh $t4,0x94($sp) /* 324cc: 8fb90060 */ lw $t9,0x60($sp) /* 324d0: afb90098 */ sw $t9,0x98($sp) -/* 324d4: 3c048006 */ lui $a0,%hi(var80060014) -/* 324d8: 8c84f12c */ lw $a0,-0xed4($a0) +/* 324d4: 3c048006 */ lui $a0,%hi(var8005f12c) +/* 324d8: 8c84f12c */ lw $a0,%lo(var8005f12c)($a0) /* 324dc: 27a50094 */ addiu $a1,$sp,0x94 /* 324e0: 8fa60080 */ lw $a2,0x80($sp) /* 324e4: 00003825 */ or $a3,$zero,$zero /* 324e8: 0c00f184 */ jal func0003c610 -/* 324ec: 24840014 */ addiu $a0,$a0,%lo(var80060014) +/* 324ec: 24840014 */ addiu $a0,$a0,20 /* 324f0: 8fad0060 */ lw $t5,0x60($sp) /* 324f4: 91ae0044 */ lbu $t6,0x44($t5) /* 324f8: 31ca0020 */ andi $t2,$t6,0x20 @@ -1171,13 +1171,13 @@ glabel func00031b34 /* 32580: 100002be */ beqz $zero,.L0003307c /* 32584: 00000000 */ sll $zero,$zero,0x0 .L00032588: -/* 32588: 3c048006 */ lui $a0,%hi(var80060014) -/* 3258c: 8c84f12c */ lw $a0,-0xed4($a0) +/* 32588: 3c048006 */ lui $a0,%hi(var8005f12c) +/* 3258c: 8c84f12c */ lw $a0,%lo(var8005f12c)($a0) /* 32590: 27a50094 */ addiu $a1,$sp,0x94 /* 32594: 8fa60080 */ lw $a2,0x80($sp) /* 32598: 00003825 */ or $a3,$zero,$zero /* 3259c: 0c00f184 */ jal func0003c610 -/* 325a0: 24840014 */ addiu $a0,$a0,%lo(var80060014) +/* 325a0: 24840014 */ addiu $a0,$a0,20 .L000325a4: /* 325a4: 1000029c */ beqz $zero,.L00033018 /* 325a8: 00000000 */ sll $zero,$zero,0x0 @@ -1207,12 +1207,12 @@ glabel func00031b34 /* 32600: 1000003f */ beqz $zero,.L00032700 /* 32604: 00000000 */ sll $zero,$zero,0x0 .L00032608: -/* 32608: 3c048006 */ lui $a0,%hi(var80060014) -/* 3260c: 8c84f12c */ lw $a0,-0xed4($a0) +/* 32608: 3c048006 */ lui $a0,%hi(var8005f12c) +/* 3260c: 8c84f12c */ lw $a0,%lo(var8005f12c)($a0) /* 32610: 8fa50060 */ lw $a1,0x60($sp) /* 32614: 24060040 */ addiu $a2,$zero,0x40 /* 32618: 0c00cc60 */ jal func00033180 -/* 3261c: 24840014 */ addiu $a0,$a0,%lo(var80060014) +/* 3261c: 24840014 */ addiu $a0,$a0,20 /* 32620: 8fac00ac */ lw $t4,0xac($sp) /* 32624: 8fae0060 */ lw $t6,0x60($sp) /* 32628: 8d990000 */ lw $t9,0x0($t4) @@ -1251,13 +1251,13 @@ glabel func00031b34 /* 326a8: a7ab0094 */ sh $t3,0x94($sp) /* 326ac: 8fb80060 */ lw $t8,0x60($sp) /* 326b0: afb80098 */ sw $t8,0x98($sp) -/* 326b4: 3c048006 */ lui $a0,%hi(var80060014) -/* 326b8: 8c84f12c */ lw $a0,-0xed4($a0) +/* 326b4: 3c048006 */ lui $a0,%hi(var8005f12c) +/* 326b8: 8c84f12c */ lw $a0,%lo(var8005f12c)($a0) /* 326bc: 27a50094 */ addiu $a1,$sp,0x94 /* 326c0: 8fa60080 */ lw $a2,0x80($sp) /* 326c4: 00003825 */ or $a3,$zero,$zero /* 326c8: 0c00f184 */ jal func0003c610 -/* 326cc: 24840014 */ addiu $a0,$a0,%lo(var80060014) +/* 326cc: 24840014 */ addiu $a0,$a0,20 /* 326d0: 8fb90060 */ lw $t9,0x60($sp) /* 326d4: 240c0002 */ addiu $t4,$zero,0x2 /* 326d8: 10000003 */ beqz $zero,.L000326e8 @@ -1855,13 +1855,13 @@ glabel func00031b34 /* 32f5c: a7ae0094 */ sh $t6,0x94($sp) /* 32f60: 8faf0060 */ lw $t7,0x60($sp) /* 32f64: afaf0098 */ sw $t7,0x98($sp) -/* 32f68: 3c048006 */ lui $a0,%hi(var80060014) -/* 32f6c: 8c84f12c */ lw $a0,-0xed4($a0) +/* 32f68: 3c048006 */ lui $a0,%hi(var8005f12c) +/* 32f6c: 8c84f12c */ lw $a0,%lo(var8005f12c)($a0) /* 32f70: 27a50094 */ addiu $a1,$sp,0x94 /* 32f74: 8fa60080 */ lw $a2,0x80($sp) /* 32f78: 00003825 */ or $a3,$zero,$zero /* 32f7c: 0c00f184 */ jal func0003c610 -/* 32f80: 24840014 */ addiu $a0,$a0,%lo(var80060014) +/* 32f80: 24840014 */ addiu $a0,$a0,20 /* 32f84: 8fb90060 */ lw $t9,0x60($sp) /* 32f88: 93280044 */ lbu $t0,0x44($t9) /* 32f8c: 310c0020 */ andi $t4,$t0,0x20 @@ -1959,12 +1959,12 @@ glabel func00033090 .L000330c8: /* 330c8: 0c00cd93 */ jal func0003364c /* 330cc: 8fa40018 */ lw $a0,0x18($sp) -/* 330d0: 3c048006 */ lui $a0,%hi(var80060014) -/* 330d4: 8c84f12c */ lw $a0,-0xed4($a0) +/* 330d0: 3c048006 */ lui $a0,%hi(var8005f12c) +/* 330d4: 8c84f12c */ lw $a0,%lo(var8005f12c)($a0) /* 330d8: 8fa50018 */ lw $a1,0x18($sp) /* 330dc: 3406ffff */ dli $a2,0xffff /* 330e0: 0c00cc60 */ jal func00033180 -/* 330e4: 24840014 */ addiu $a0,$a0,%lo(var80060014) +/* 330e4: 24840014 */ addiu $a0,$a0,20 /* 330e8: 10000001 */ beqz $zero,.L000330f0 /* 330ec: 00000000 */ sll $zero,$zero,0x0 .L000330f0: @@ -1995,13 +1995,13 @@ glabel func00033100 /* 33140: 27aa001c */ addiu $t2,$sp,0x1c /* 33144: 8d4b0000 */ lw $t3,0x0($t2) /* 33148: afab0028 */ sw $t3,0x28($sp) -/* 3314c: 3c048006 */ lui $a0,%hi(var80060014) -/* 33150: 8c84f12c */ lw $a0,-0xed4($a0) +/* 3314c: 3c048006 */ lui $a0,%hi(var8005f12c) +/* 33150: 8c84f12c */ lw $a0,%lo(var8005f12c)($a0) /* 33154: 27a50020 */ addiu $a1,$sp,0x20 /* 33158: 34068235 */ dli $a2,0x8235 /* 3315c: 00003825 */ or $a3,$zero,$zero /* 33160: 0c00f184 */ jal func0003c610 -/* 33164: 24840014 */ addiu $a0,$a0,%lo(var80060014) +/* 33164: 24840014 */ addiu $a0,$a0,20 /* 33168: 10000001 */ beqz $zero,.L00033170 /* 3316c: 00000000 */ sll $zero,$zero,0x0 .L00033170: @@ -2159,8 +2159,8 @@ glabel func00033274 GLOBAL_ASM( glabel func00033378 -/* 33378: 3c018006 */ lui $at,0x8006 -/* 3337c: ac24f13c */ sw $a0,-0xec4($at) +/* 33378: 3c018006 */ lui $at,%hi(var8005f13c) +/* 3337c: ac24f13c */ sw $a0,%lo(var8005f13c)($at) /* 33380: 03e00008 */ jr $ra /* 33384: 00000000 */ sll $zero,$zero,0x0 /* 33388: 03e00008 */ jr $ra @@ -2180,16 +2180,16 @@ glabel func00033390 /* 333b0: 8f18f134 */ lw $t8,%lo(var8005f134)($t8) /* 333b4: 3c088006 */ lui $t0,%hi(var8005f138) /* 333b8: 8d08f138 */ lw $t0,%lo(var8005f138)($t0) -/* 333bc: 3c018006 */ lui $at,0x8006 +/* 333bc: 3c018006 */ lui $at,%hi(var8005f134) /* 333c0: 27190001 */ addiu $t9,$t8,0x1 -/* 333c4: ac39f134 */ sw $t9,-0xecc($at) +/* 333c4: ac39f134 */ sw $t9,%lo(var8005f134)($at) /* 333c8: 0119082a */ slt $at,$t0,$t9 /* 333cc: 1020000a */ beqz $at,.L000333f8 /* 333d0: 00000000 */ sll $zero,$zero,0x0 /* 333d4: 3c098006 */ lui $t1,%hi(var8005f134) /* 333d8: 8d29f134 */ lw $t1,%lo(var8005f134)($t1) -/* 333dc: 3c018006 */ lui $at,0x8006 -/* 333e0: ac29f138 */ sw $t1,-0xec8($at) +/* 333dc: 3c018006 */ lui $at,%hi(var8005f138) +/* 333e0: ac29f138 */ sw $t1,%lo(var8005f138)($at) /* 333e4: 3c0a8006 */ lui $t2,%hi(var8005f134) /* 333e8: 8d4af134 */ lw $t2,%lo(var8005f134)($t2) /* 333ec: 29410011 */ slti $at,$t2,0x11 @@ -2206,9 +2206,9 @@ glabel func00033390 /* 33414: 1180007d */ beqz $t4,.L0003360c /* 33418: 00000000 */ sll $zero,$zero,0x0 /* 3341c: 8fad0024 */ lw $t5,0x24($sp) -/* 33420: 3c018006 */ lui $at,0x8006 +/* 33420: 3c018006 */ lui $at,%hi(var8005f128) /* 33424: 8dae0000 */ lw $t6,0x0($t5) -/* 33428: ac2ef128 */ sw $t6,-0xed8($at) +/* 33428: ac2ef128 */ sw $t6,%lo(var8005f128)($at) /* 3342c: 0c00c5e9 */ jal func000317a4 /* 33430: 8fa40024 */ lw $a0,0x24($sp) /* 33434: 3c0f8006 */ lui $t7,%hi(var8005f120) @@ -2226,9 +2226,9 @@ glabel func00033390 /* 33464: 8fa90024 */ lw $t1,0x24($sp) /* 33468: ad490004 */ sw $t1,0x4($t2) /* 3346c: 8fab0024 */ lw $t3,0x24($sp) -/* 33470: 3c018006 */ lui $at,0x8006 +/* 33470: 3c018006 */ lui $at,%hi(var8005f120) /* 33474: 1000000c */ beqz $zero,.L000334a8 -/* 33478: ac2bf120 */ sw $t3,-0xee0($at) +/* 33478: ac2bf120 */ sw $t3,%lo(var8005f120)($at) .L0003347c: /* 3347c: 8fac0024 */ lw $t4,0x24($sp) /* 33480: ad800004 */ sw $zero,0x4($t4) @@ -2236,11 +2236,11 @@ glabel func00033390 /* 33488: 8dae0004 */ lw $t6,0x4($t5) /* 3348c: adae0000 */ sw $t6,0x0($t5) /* 33490: 8faf0024 */ lw $t7,0x24($sp) -/* 33494: 3c018006 */ lui $at,0x8006 -/* 33498: ac2ff120 */ sw $t7,-0xee0($at) +/* 33494: 3c018006 */ lui $at,%hi(var8005f120) +/* 33498: ac2ff120 */ sw $t7,%lo(var8005f120)($at) /* 3349c: 8fb80024 */ lw $t8,0x24($sp) -/* 334a0: 3c018006 */ lui $at,0x8006 -/* 334a4: ac38f124 */ sw $t8,-0xedc($at) +/* 334a0: 3c018006 */ lui $at,%hi(var8005f124) +/* 334a4: ac38f124 */ sw $t8,%lo(var8005f124)($at) .L000334a8: /* 334a8: 0c012194 */ jal func00048650 /* 334ac: 8fa4001c */ lw $a0,0x1c($sp) @@ -2352,8 +2352,8 @@ glabel func00033390 GLOBAL_ASM( glabel func00033634 -/* 33634: 3c018006 */ lui $at,0x8006 -/* 33638: ac24f140 */ sw $a0,-0xec0($at) +/* 33634: 3c018006 */ lui $at,%hi(var8005f140) +/* 33638: ac24f140 */ sw $a0,%lo(var8005f140)($at) /* 3363c: 03e00008 */ jr $ra /* 33640: 00000000 */ sll $zero,$zero,0x0 /* 33644: 03e00008 */ jr $ra @@ -2367,18 +2367,18 @@ glabel func0003364c /* 33654: afa40018 */ sw $a0,0x18($sp) /* 33658: 3c0e8006 */ lui $t6,%hi(var8005f134) /* 3365c: 8dcef134 */ lw $t6,%lo(var8005f134)($t6) -/* 33660: 3c018006 */ lui $at,0x8006 +/* 33660: 3c018006 */ lui $at,%hi(var8005f134) /* 33664: 25cfffff */ addiu $t7,$t6,-1 -/* 33668: ac2ff134 */ sw $t7,-0xecc($at) +/* 33668: ac2ff134 */ sw $t7,%lo(var8005f134)($at) /* 3366c: 3c188006 */ lui $t8,%hi(var8005f120) /* 33670: 8f18f120 */ lw $t8,%lo(var8005f120)($t8) /* 33674: 8fb90018 */ lw $t9,0x18($sp) /* 33678: 17190005 */ bne $t8,$t9,.L00033690 /* 3367c: 00000000 */ sll $zero,$zero,0x0 /* 33680: 8fa80018 */ lw $t0,0x18($sp) -/* 33684: 3c018006 */ lui $at,0x8006 +/* 33684: 3c018006 */ lui $at,%hi(var8005f120) /* 33688: 8d090000 */ lw $t1,0x0($t0) -/* 3368c: ac29f120 */ sw $t1,-0xee0($at) +/* 3368c: ac29f120 */ sw $t1,%lo(var8005f120)($at) .L00033690: /* 33690: 3c0a8006 */ lui $t2,%hi(var8005f124) /* 33694: 8d4af124 */ lw $t2,%lo(var8005f124)($t2) @@ -2386,9 +2386,9 @@ glabel func0003364c /* 3369c: 154b0005 */ bne $t2,$t3,.L000336b4 /* 336a0: 00000000 */ sll $zero,$zero,0x0 /* 336a4: 8fac0018 */ lw $t4,0x18($sp) -/* 336a8: 3c018006 */ lui $at,0x8006 +/* 336a8: 3c018006 */ lui $at,%hi(var8005f124) /* 336ac: 8d8d0004 */ lw $t5,0x4($t4) -/* 336b0: ac2df124 */ sw $t5,-0xedc($at) +/* 336b0: ac2df124 */ sw $t5,%lo(var8005f124)($at) .L000336b4: /* 336b4: 0c00c5e9 */ jal func000317a4 /* 336b8: 8fa40018 */ lw $a0,0x18($sp) @@ -2407,9 +2407,9 @@ glabel func0003364c /* 336ec: 8fa80018 */ lw $t0,0x18($sp) /* 336f0: ad280004 */ sw $t0,0x4($t1) /* 336f4: 8faa0018 */ lw $t2,0x18($sp) -/* 336f8: 3c018006 */ lui $at,0x8006 +/* 336f8: 3c018006 */ lui $at,%hi(var8005f128) /* 336fc: 10000009 */ beqz $zero,.L00033724 -/* 33700: ac2af128 */ sw $t2,-0xed8($at) +/* 33700: ac2af128 */ sw $t2,%lo(var8005f128)($at) .L00033704: /* 33704: 8fab0018 */ lw $t3,0x18($sp) /* 33708: ad600004 */ sw $zero,0x4($t3) @@ -2417,8 +2417,8 @@ glabel func0003364c /* 33710: 8d8d0004 */ lw $t5,0x4($t4) /* 33714: ad8d0000 */ sw $t5,0x0($t4) /* 33718: 8fae0018 */ lw $t6,0x18($sp) -/* 3371c: 3c018006 */ lui $at,0x8006 -/* 33720: ac2ef128 */ sw $t6,-0xed8($at) +/* 3371c: 3c018006 */ lui $at,%hi(var8005f128) +/* 33720: ac2ef128 */ sw $t6,%lo(var8005f128)($at) .L00033724: /* 33724: 8faf0018 */ lw $t7,0x18($sp) /* 33728: 91f80044 */ lbu $t8,0x44($t7) @@ -2427,9 +2427,9 @@ glabel func0003364c /* 33734: 00000000 */ sll $zero,$zero,0x0 /* 33738: 3c088006 */ lui $t0,%hi(var8005f130) /* 3373c: 8508f130 */ lh $t0,%lo(var8005f130)($t0) -/* 33740: 3c018006 */ lui $at,0x8006 +/* 33740: 3c018006 */ lui $at,%hi(var8005f130) /* 33744: 2509ffff */ addiu $t1,$t0,-1 -/* 33748: a429f130 */ sh $t1,-0xed0($at) +/* 33748: a429f130 */ sh $t1,%lo(var8005f130)($at) .L0003374c: /* 3374c: 8faa0018 */ lw $t2,0x18($sp) /* 33750: a1400045 */ sb $zero,0x45($t2) @@ -2606,12 +2606,12 @@ glabel func00033820 /* 339b0: 916c0044 */ lbu $t4,0x44($t3) /* 339b4: 01816824 */ and $t5,$t4,$at /* 339b8: a16d0044 */ sb $t5,0x44($t3) -/* 339bc: 3c048006 */ lui $a0,%hi(var80060014) -/* 339c0: 8c84f12c */ lw $a0,-0xed4($a0) +/* 339bc: 3c048006 */ lui $a0,%hi(var8005f12c) +/* 339c0: 8c84f12c */ lw $a0,%lo(var8005f12c)($a0) /* 339c4: 8fa60040 */ lw $a2,0x40($sp) /* 339c8: 27a5002c */ addiu $a1,$sp,0x2c /* 339cc: 00003825 */ or $a3,$zero,$zero -/* 339d0: 24840014 */ addiu $a0,$a0,%lo(var80060014) +/* 339d0: 24840014 */ addiu $a0,$a0,20 /* 339d4: 0c00f184 */ jal func0003c610 /* 339d8: 24c60001 */ addiu $a2,$a2,0x1 /* 339dc: 8fae0044 */ lw $t6,0x44($sp) @@ -2621,12 +2621,12 @@ glabel func00033820 /* 339ec: 10000009 */ beqz $zero,.L00033a14 /* 339f0: a7af004e */ sh $t7,0x4e($sp) .L000339f4: -/* 339f4: 3c048006 */ lui $a0,%hi(var80060014) -/* 339f8: 8c84f12c */ lw $a0,-0xed4($a0) +/* 339f4: 3c048006 */ lui $a0,%hi(var8005f12c) +/* 339f8: 8c84f12c */ lw $a0,%lo(var8005f12c)($a0) /* 339fc: 8fa60044 */ lw $a2,0x44($sp) /* 33a00: 27a5002c */ addiu $a1,$sp,0x2c /* 33a04: 00003825 */ or $a3,$zero,$zero -/* 33a08: 24840014 */ addiu $a0,$a0,%lo(var80060014) +/* 33a08: 24840014 */ addiu $a0,$a0,20 /* 33a0c: 0c00f184 */ jal func0003c610 /* 33a10: 24c60001 */ addiu $a2,$a2,0x1 .L00033a14: @@ -2679,13 +2679,13 @@ glabel func00033820 /* 33ac4: afaa0024 */ sw $t2,0x24($sp) /* 33ac8: 8fad0060 */ lw $t5,0x60($sp) /* 33acc: afad0028 */ sw $t5,0x28($sp) -/* 33ad0: 3c048006 */ lui $a0,%hi(var80060014) -/* 33ad4: 8c84f12c */ lw $a0,-0xed4($a0) +/* 33ad0: 3c048006 */ lui $a0,%hi(var8005f12c) +/* 33ad4: 8c84f12c */ lw $a0,%lo(var8005f12c)($a0) /* 33ad8: 27a5001c */ addiu $a1,$sp,0x1c /* 33adc: 8fa60048 */ lw $a2,0x48($sp) /* 33ae0: 00003825 */ or $a3,$zero,$zero /* 33ae4: 0c00f184 */ jal func0003c610 -/* 33ae8: 24840014 */ addiu $a0,$a0,%lo(var80060014) +/* 33ae8: 24840014 */ addiu $a0,$a0,20 .L00033aec: /* 33aec: 8faf007c */ lw $t7,0x7c($sp) /* 33af0: 11e00004 */ beqz $t7,.L00033b04 @@ -2734,13 +2734,13 @@ glabel func00033b24 /* 33b80: 914b0044 */ lbu $t3,0x44($t2) /* 33b84: 01616024 */ and $t4,$t3,$at /* 33b88: a14c0044 */ sb $t4,0x44($t2) -/* 33b8c: 3c048006 */ lui $a0,%hi(var80060014) -/* 33b90: 8c84f12c */ lw $a0,-0xed4($a0) +/* 33b8c: 3c048006 */ lui $a0,%hi(var8005f12c) +/* 33b90: 8c84f12c */ lw $a0,%lo(var8005f12c)($a0) /* 33b94: 27a50018 */ addiu $a1,$sp,0x18 /* 33b98: 00003025 */ or $a2,$zero,$zero /* 33b9c: 00003825 */ or $a3,$zero,$zero /* 33ba0: 0c00f184 */ jal func0003c610 -/* 33ba4: 24840014 */ addiu $a0,$a0,%lo(var80060014) +/* 33ba4: 24840014 */ addiu $a0,$a0,20 .L00033ba8: /* 33ba8: 10000001 */ beqz $zero,.L00033bb0 /* 33bac: 00000000 */ sll $zero,$zero,0x0 @@ -2768,13 +2768,13 @@ glabel func00033bc0 /* 33bf0: 93280044 */ lbu $t0,0x44($t9) /* 33bf4: 01014824 */ and $t1,$t0,$at /* 33bf8: a3290044 */ sb $t1,0x44($t9) -/* 33bfc: 3c048006 */ lui $a0,%hi(var80060014) -/* 33c00: 8c84f12c */ lw $a0,-0xed4($a0) +/* 33bfc: 3c048006 */ lui $a0,%hi(var8005f12c) +/* 33c00: 8c84f12c */ lw $a0,%lo(var8005f12c)($a0) /* 33c04: 27a50018 */ addiu $a1,$sp,0x18 /* 33c08: 00003025 */ or $a2,$zero,$zero /* 33c0c: 00003825 */ or $a3,$zero,$zero /* 33c10: 0c00f184 */ jal func0003c610 -/* 33c14: 24840014 */ addiu $a0,$a0,%lo(var80060014) +/* 33c14: 24840014 */ addiu $a0,$a0,20 .L00033c18: /* 33c18: 10000001 */ beqz $zero,.L00033c20 /* 33c1c: 00000000 */ sll $zero,$zero,0x0 @@ -2815,13 +2815,13 @@ glabel func00033c30 /* 33c90: 918d0044 */ lbu $t5,0x44($t4) /* 33c94: 01a17024 */ and $t6,$t5,$at /* 33c98: a18e0044 */ sb $t6,0x44($t4) -/* 33c9c: 3c048006 */ lui $a0,%hi(var80060014) -/* 33ca0: 8c84f12c */ lw $a0,-0xed4($a0) +/* 33c9c: 3c048006 */ lui $a0,%hi(var8005f12c) +/* 33ca0: 8c84f12c */ lw $a0,%lo(var8005f12c)($a0) /* 33ca4: 27a5001c */ addiu $a1,$sp,0x1c /* 33ca8: 00003025 */ or $a2,$zero,$zero /* 33cac: 00003825 */ or $a3,$zero,$zero /* 33cb0: 0c00f184 */ jal func0003c610 -/* 33cb4: 24840014 */ addiu $a0,$a0,%lo(var80060014) +/* 33cb4: 24840014 */ addiu $a0,$a0,20 .L00033cb8: /* 33cb8: 8faf0018 */ lw $t7,0x18($sp) /* 33cbc: 8df80000 */ lw $t8,0x0($t7) @@ -2871,13 +2871,13 @@ glabel func00033cf0 /* 33d50: 918d0044 */ lbu $t5,0x44($t4) /* 33d54: 01a17024 */ and $t6,$t5,$at /* 33d58: a18e0044 */ sb $t6,0x44($t4) -/* 33d5c: 3c048006 */ lui $a0,%hi(var80060014) -/* 33d60: 8c84f12c */ lw $a0,-0xed4($a0) +/* 33d5c: 3c048006 */ lui $a0,%hi(var8005f12c) +/* 33d60: 8c84f12c */ lw $a0,%lo(var8005f12c)($a0) /* 33d64: 27a5001c */ addiu $a1,$sp,0x1c /* 33d68: 00003025 */ or $a2,$zero,$zero /* 33d6c: 00003825 */ or $a3,$zero,$zero /* 33d70: 0c00f184 */ jal func0003c610 -/* 33d74: 24840014 */ addiu $a0,$a0,%lo(var80060014) +/* 33d74: 24840014 */ addiu $a0,$a0,20 .L00033d78: /* 33d78: 8faf0018 */ lw $t7,0x18($sp) /* 33d7c: 8df80000 */ lw $t8,0x0($t7) @@ -2965,13 +2965,13 @@ glabel func00033e50 /* 33e7c: 8fb90028 */ lw $t9,0x28($sp) /* 33e80: 1320000a */ beqz $t9,.L00033eac /* 33e84: 00000000 */ sll $zero,$zero,0x0 -/* 33e88: 3c048006 */ lui $a0,%hi(var80060014) -/* 33e8c: 8c84f12c */ lw $a0,-0xed4($a0) +/* 33e88: 3c048006 */ lui $a0,%hi(var8005f12c) +/* 33e8c: 8c84f12c */ lw $a0,%lo(var8005f12c)($a0) /* 33e90: 27a50018 */ addiu $a1,$sp,0x18 /* 33e94: 00003025 */ or $a2,$zero,$zero /* 33e98: 00003825 */ or $a3,$zero,$zero /* 33e9c: 0c00f184 */ jal func0003c610 -/* 33ea0: 24840014 */ addiu $a0,$a0,%lo(var80060014) +/* 33ea0: 24840014 */ addiu $a0,$a0,20 /* 33ea4: 10000001 */ beqz $zero,.L00033eac /* 33ea8: 00000000 */ sll $zero,$zero,0x0 .L00033eac: @@ -3071,13 +3071,13 @@ glabel func00033f44 /* 33fcc: a7a9001c */ sh $t1,0x1c($sp) /* 33fd0: 8fb80030 */ lw $t8,0x30($sp) /* 33fd4: afb80020 */ sw $t8,0x20($sp) -/* 33fd8: 3c048006 */ lui $a0,%hi(var80060014) -/* 33fdc: 8c84f12c */ lw $a0,-0xed4($a0) +/* 33fd8: 3c048006 */ lui $a0,%hi(var8005f12c) +/* 33fdc: 8c84f12c */ lw $a0,%lo(var8005f12c)($a0) /* 33fe0: 27a5001c */ addiu $a1,$sp,0x1c /* 33fe4: 00003025 */ or $a2,$zero,$zero /* 33fe8: 00003825 */ or $a3,$zero,$zero /* 33fec: 0c00f184 */ jal func0003c610 -/* 33ff0: 24840014 */ addiu $a0,$a0,%lo(var80060014) +/* 33ff0: 24840014 */ addiu $a0,$a0,20 .L00033ff4: /* 33ff4: 8faa002c */ lw $t2,0x2c($sp) /* 33ff8: 8fac0030 */ lw $t4,0x30($sp) diff --git a/src/lib/lib_37b00.c b/src/lib/lib_37b00.c index 2e9845a2c..072506a76 100644 --- a/src/lib/lib_37b00.c +++ b/src/lib/lib_37b00.c @@ -41,8 +41,8 @@ glabel func00037b00 /* 37b50: 8fa60020 */ lw $a2,0x20($sp) /* 37b54: 0c00bec5 */ jal func0002fb14 /* 37b58: 24070001 */ addiu $a3,$zero,0x1 -/* 37b5c: 3c018006 */ lui $at,0x8006 -/* 37b60: ac22f6f8 */ sw $v0,-0x908($at) +/* 37b5c: 3c018006 */ lui $at,%hi(var8005f6f8) +/* 37b60: ac22f6f8 */ sw $v0,%lo(var8005f6f8)($at) /* 37b64: 24182200 */ addiu $t8,$zero,0x2200 /* 37b68: afb80010 */ sw $t8,0x10($sp) /* 37b6c: 00002025 */ or $a0,$zero,$zero @@ -50,8 +50,8 @@ glabel func00037b00 /* 37b74: 8fa60020 */ lw $a2,0x20($sp) /* 37b78: 0c00bec5 */ jal func0002fb14 /* 37b7c: 24070001 */ addiu $a3,$zero,0x1 -/* 37b80: 3c018006 */ lui $at,0x8006 -/* 37b84: ac22f6fc */ sw $v0,-0x904($at) +/* 37b80: 3c018006 */ lui $at,%hi(var8005f6fc) +/* 37b84: ac22f6fc */ sw $v0,%lo(var8005f6fc)($at) /* 37b88: 24190001 */ addiu $t9,$zero,0x1 /* 37b8c: afb90010 */ sw $t9,0x10($sp) /* 37b90: 00002025 */ or $a0,$zero,$zero @@ -141,13 +141,13 @@ glabel func00037b00 /* 37ce0: a42fc3a0 */ sh $t7,%lo(var8009c3a0)($at) /* 37ce4: 3c18800a */ lui $t8,%hi(var8009c39c) /* 37ce8: 8718c39c */ lh $t8,%lo(var8009c39c)($t8) -/* 37cec: 3c0a8006 */ lui $t2,0x8006 +/* 37cec: 3c0a8006 */ lui $t2,%hi(var8005f66c+0x2) /* 37cf0: 3c0b800a */ lui $t3,%hi(var8009c39c+0x2) /* 37cf4: 3319007f */ andi $t9,$t8,0x7f /* 37cf8: 00194023 */ negu $t0,$t9 /* 37cfc: 00084840 */ sll $t1,$t0,0x1 /* 37d00: 01495021 */ addu $t2,$t2,$t1 -/* 37d04: 854af66e */ lh $t2,-0x992($t2) +/* 37d04: 854af66e */ lh $t2,%lo(var8005f66c+0x2)($t2) /* 37d08: 856bc39e */ lh $t3,%lo(var8009c39c+0x2)($t3) /* 37d0c: 3c01800a */ lui $at,%hi(var8009c3a0+0x2) /* 37d10: 014b0019 */ multu $t2,$t3 @@ -830,13 +830,13 @@ glabel func00037fc0 /* 38698: a422c3aa */ sh $v0,%lo(var8009c3a8+0x2)($at) /* 3869c: 3c0b800a */ lui $t3,%hi(var8009c39c) /* 386a0: 856bc39c */ lh $t3,%lo(var8009c39c)($t3) -/* 386a4: 3c0c8006 */ lui $t4,0x8006 +/* 386a4: 3c0c8006 */ lui $t4,%hi(var8005f66c+0x2) /* 386a8: 3c0f800a */ lui $t7,%hi(var8009c39c+0x2) /* 386ac: 316d007f */ andi $t5,$t3,0x7f /* 386b0: 000d7023 */ negu $t6,$t5 /* 386b4: 000ec040 */ sll $t8,$t6,0x1 /* 386b8: 01986021 */ addu $t4,$t4,$t8 -/* 386bc: 858cf66e */ lh $t4,-0x992($t4) +/* 386bc: 858cf66e */ lh $t4,%lo(var8005f66c+0x2)($t4) /* 386c0: 85efc39e */ lh $t7,%lo(var8009c39c+0x2)($t7) /* 386c4: 3c01800a */ lui $at,%hi(var8009c3b0+0x2) /* 386c8: 018f0019 */ multu $t4,$t7 @@ -1032,14 +1032,14 @@ glabel func00038924 /* 38994: 00084bc3 */ sra $t1,$t0,0xf /* 38998: a589001c */ sh $t1,0x1c($t4) /* 3899c: 8faa0018 */ lw $t2,0x18($sp) -/* 389a0: 3c0e8006 */ lui $t6,0x8006 +/* 389a0: 3c0e8006 */ lui $t6,%hi(var8005f66c+0x2) /* 389a4: 854b000c */ lh $t3,0xc($t2) /* 389a8: 8559000e */ lh $t9,0xe($t2) /* 389ac: 316d007f */ andi $t5,$t3,0x7f /* 389b0: 000d7823 */ negu $t7,$t5 /* 389b4: 000fc040 */ sll $t8,$t7,0x1 /* 389b8: 01d87021 */ addu $t6,$t6,$t8 -/* 389bc: 85cef66e */ lh $t6,-0x992($t6) +/* 389bc: 85cef66e */ lh $t6,%lo(var8005f66c+0x2)($t6) /* 389c0: 01d90019 */ multu $t6,$t9 /* 389c4: 00004012 */ mflo $t0 /* 389c8: 00084bc3 */ sra $t1,$t0,0xf diff --git a/src/lib/lib_3c4d0.c b/src/lib/lib_3c4d0.c index a6e6e2587..5bd32a973 100644 --- a/src/lib/lib_3c4d0.c +++ b/src/lib/lib_3c4d0.c @@ -530,11 +530,11 @@ glabel func0003cbb4 /* 3cbe4: af380000 */ sw $t8,0x0($t9) /* 3cbe8: 0c00c5e9 */ jal func000317a4 /* 3cbec: 8fa40024 */ lw $a0,0x24($sp) -/* 3cbf0: 3c058006 */ lui $a1,%hi(var8006000c) -/* 3cbf4: 8ca5f114 */ lw $a1,-0xeec($a1) +/* 3cbf0: 3c058006 */ lui $a1,%hi(var8005f114) +/* 3cbf4: 8ca5f114 */ lw $a1,%lo(var8005f114)($a1) /* 3cbf8: 8fa40024 */ lw $a0,0x24($sp) /* 3cbfc: 0c00c5dc */ jal func00031770 -/* 3cc00: 24a5000c */ addiu $a1,$a1,%lo(var8006000c) +/* 3cc00: 24a5000c */ addiu $a1,$a1,12 /* 3cc04: 10000030 */ beqz $zero,.L0003ccc8 /* 3cc08: 00000000 */ sll $zero,$zero,0x0 .L0003cc0c: @@ -548,11 +548,11 @@ glabel func0003cbb4 /* 3cc28: ad6a0000 */ sw $t2,0x0($t3) /* 3cc2c: 0c00c5e9 */ jal func000317a4 /* 3cc30: 8fa40024 */ lw $a0,0x24($sp) -/* 3cc34: 3c058006 */ lui $a1,%hi(var8006000c) -/* 3cc38: 8ca5f114 */ lw $a1,-0xeec($a1) +/* 3cc34: 3c058006 */ lui $a1,%hi(var8005f114) +/* 3cc38: 8ca5f114 */ lw $a1,%lo(var8005f114)($a1) /* 3cc3c: 8fa40024 */ lw $a0,0x24($sp) /* 3cc40: 0c00c5dc */ jal func00031770 -/* 3cc44: 24a5000c */ addiu $a1,$a1,%lo(var8006000c) +/* 3cc44: 24a5000c */ addiu $a1,$a1,12 /* 3cc48: 1000001f */ beqz $zero,.L0003ccc8 /* 3cc4c: 00000000 */ sll $zero,$zero,0x0 .L0003cc50: diff --git a/src/lib/lib_3e730.c b/src/lib/lib_3e730.c index bc327b639..c15de85b4 100644 --- a/src/lib/lib_3e730.c +++ b/src/lib/lib_3e730.c @@ -5716,14 +5716,14 @@ glabel func0003e8c0 /* 3ead0: a5d90060 */ sh $t9,0x60($t6) .L0003ead4: /* 3ead4: 8fa8002c */ lw $t0,0x2c($sp) -/* 3ead8: 3c0c8006 */ lui $t4,0x8006 +/* 3ead8: 3c0c8006 */ lui $t4,%hi(var8005f66c+0x2) /* 3eadc: 8fb80050 */ lw $t8,0x50($sp) /* 3eae0: 910f0013 */ lbu $t7,0x13($t0) /* 3eae4: 31e9007f */ andi $t1,$t7,0x7f /* 3eae8: 00095023 */ negu $t2,$t1 /* 3eaec: 000a5840 */ sll $t3,$t2,0x1 /* 3eaf0: 018b6021 */ addu $t4,$t4,$t3 -/* 3eaf4: 858cf66e */ lh $t4,-0x992($t4) +/* 3eaf4: 858cf66e */ lh $t4,%lo(var8005f66c+0x2)($t4) /* 3eaf8: 318dfffe */ andi $t5,$t4,0xfffe /* 3eafc: a70d0062 */ sh $t5,0x62($t8) /* 3eb00: 3c19800a */ lui $t9,%hi(var8009c340+0x2) @@ -5769,13 +5769,13 @@ glabel func0003e8c0 /* 3eb94: 0018cbc3 */ sra $t9,$t8,0xf /* 3eb98: a5d9005c */ sh $t9,0x5c($t6) /* 3eb9c: 8fa80050 */ lw $t0,0x50($sp) -/* 3eba0: 3c0b8006 */ lui $t3,0x8006 +/* 3eba0: 3c0b8006 */ lui $t3,%hi(var8005f66c+0x2) /* 3eba4: 850f0058 */ lh $t7,0x58($t0) /* 3eba8: 850c005a */ lh $t4,0x5a($t0) /* 3ebac: 000f4823 */ negu $t1,$t7 /* 3ebb0: 00095040 */ sll $t2,$t1,0x1 /* 3ebb4: 016a5821 */ addu $t3,$t3,$t2 -/* 3ebb8: 856bf66e */ lh $t3,-0x992($t3) +/* 3ebb8: 856bf66e */ lh $t3,%lo(var8005f66c+0x2)($t3) /* 3ebbc: 016c0019 */ multu $t3,$t4 /* 3ebc0: 00006812 */ mflo $t5 /* 3ebc4: 000dc3c3 */ sra $t8,$t5,0xf @@ -5831,13 +5831,13 @@ glabel func0003e8c0 /* 3ec88: 000953c3 */ sra $t2,$t1,0xf /* 3ec8c: a70a0068 */ sh $t2,0x68($t8) /* 3ec90: 8fab0050 */ lw $t3,0x50($sp) -/* 3ec94: 3c198006 */ lui $t9,0x8006 +/* 3ec94: 3c198006 */ lui $t9,%hi(var8005f66c+0x2) /* 3ec98: 856c0058 */ lh $t4,0x58($t3) /* 3ec9c: 856e005a */ lh $t6,0x5a($t3) /* 3eca0: 000c6823 */ negu $t5,$t4 /* 3eca4: 000d4040 */ sll $t0,$t5,0x1 /* 3eca8: 0328c821 */ addu $t9,$t9,$t0 -/* 3ecac: 8739f66e */ lh $t9,-0x992($t9) +/* 3ecac: 8739f66e */ lh $t9,%lo(var8005f66c+0x2)($t9) /* 3ecb0: 032e0019 */ multu $t9,$t6 /* 3ecb4: 00007812 */ mflo $t7 /* 3ecb8: 000f4bc3 */ sra $t1,$t7,0xf @@ -6007,7 +6007,7 @@ glabel func0003e8c0 /* 3ef1c: 01186025 */ or $t4,$t0,$t8 /* 3ef20: a72c0060 */ sh $t4,0x60($t9) /* 3ef24: 8fad0050 */ lw $t5,0x50($sp) -/* 3ef28: 3c088006 */ lui $t0,0x8006 +/* 3ef28: 3c088006 */ lui $t0,%hi(var8005f66c+0x2) /* 3ef2c: 8daf007c */ lw $t7,0x7c($t5) /* 3ef30: 85ac0062 */ lh $t4,0x62($t5) /* 3ef34: 8de9000c */ lw $t1,0xc($t7) @@ -6016,7 +6016,7 @@ glabel func0003e8c0 /* 3ef40: 000a7023 */ negu $t6,$t2 /* 3ef44: 000e5840 */ sll $t3,$t6,0x1 /* 3ef48: 010b4021 */ addu $t0,$t0,$t3 -/* 3ef4c: 8508f66e */ lh $t0,-0x992($t0) +/* 3ef4c: 8508f66e */ lh $t0,%lo(var8005f66c+0x2)($t0) /* 3ef50: 3118fffe */ andi $t8,$t0,0xfffe /* 3ef54: 03197825 */ or $t7,$t8,$t9 /* 3ef58: a5af0062 */ sh $t7,0x62($t5) @@ -6345,13 +6345,13 @@ glabel func0003f328 /* 3f3fc: 8fad0030 */ lw $t5,0x30($sp) /* 3f400: a5a20066 */ sh $v0,0x66($t5) /* 3f404: 8fae0030 */ lw $t6,0x30($sp) -/* 3f408: 3c088006 */ lui $t0,0x8006 +/* 3f408: 3c088006 */ lui $t0,%hi(var8005f66c+0x2) /* 3f40c: 85cf0058 */ lh $t7,0x58($t6) /* 3f410: 85cc005a */ lh $t4,0x5a($t6) /* 3f414: 000fc023 */ negu $t8,$t7 /* 3f418: 0018c840 */ sll $t9,$t8,0x1 /* 3f41c: 01194021 */ addu $t0,$t0,$t9 -/* 3f420: 8508f66e */ lh $t0,-0x992($t0) +/* 3f420: 8508f66e */ lh $t0,%lo(var8005f66c+0x2)($t0) /* 3f424: 010c0019 */ multu $t0,$t4 /* 3f428: 00005012 */ mflo $t2 /* 3f42c: 000a5bc3 */ sra $t3,$t2,0xf diff --git a/src/lib/lib_43dd0.c b/src/lib/lib_43dd0.c index 131aeb3e6..5760983ce 100644 --- a/src/lib/lib_43dd0.c +++ b/src/lib/lib_43dd0.c @@ -450,11 +450,11 @@ glabel func00044404 /* 4440c: afb00018 */ sw $s0,0x18($sp) /* 44410: 3c0e8006 */ lui $t6,%hi(var8005f704) /* 44414: 8dcef704 */ lw $t6,%lo(var8005f704)($t6) -/* 44418: 3c018006 */ lui $at,0x8006 +/* 44418: 3c018006 */ lui $at,%hi(var8005f704) /* 4441c: 01c08025 */ or $s0,$t6,$zero /* 44420: 25cf0001 */ addiu $t7,$t6,0x1 /* 44424: 12000003 */ beqz $s0,.L00044434 -/* 44428: ac2ff704 */ sw $t7,-0x8fc($at) +/* 44428: ac2ff704 */ sw $t7,%lo(var8005f704)($at) /* 4442c: 10000007 */ beqz $zero,.L0004444c /* 44430: 24020002 */ addiu $v0,$zero,0x2 .L00044434: diff --git a/src/lib/lib_48520.c b/src/lib/lib_48520.c index d3973c8db..d004f7402 100644 --- a/src/lib/lib_48520.c +++ b/src/lib/lib_48520.c @@ -50,8 +50,8 @@ glabel osSetEventMesg /* 485a8: 00003025 */ or $a2,$zero,$zero .L000485ac: /* 485ac: 240e0001 */ addiu $t6,$zero,0x1 -/* 485b0: 3c018006 */ lui $at,0x8006 -/* 485b4: ac2e0890 */ sw $t6,0x890($at) +/* 485b0: 3c018006 */ lui $at,%hi(var80060890) +/* 485b4: ac2e0890 */ sw $t6,%lo(var80060890)($at) .L000485b8: /* 485b8: 0c012588 */ jal __osRestoreInt /* 485bc: 02002025 */ or $a0,$s0,$zero diff --git a/src/lib/lib_49640.c b/src/lib/lib_49640.c index ab6f23841..572b71263 100644 --- a/src/lib/lib_49640.c +++ b/src/lib/lib_49640.c @@ -21,11 +21,11 @@ glabel __osViInit /* 49654: 24050060 */ addiu $a1,$zero,0x60 /* 49658: 3c0e8006 */ lui $t6,%hi(var800608b0) /* 4965c: 25ce08b0 */ addiu $t6,$t6,%lo(var800608b0) -/* 49660: 3c018006 */ lui $at,0x8006 -/* 49664: ac2e0910 */ sw $t6,0x910($at) -/* 49668: 3c018006 */ lui $at,0x8006 +/* 49660: 3c018006 */ lui $at,%hi(var80060910) +/* 49664: ac2e0910 */ sw $t6,%lo(var80060910)($at) +/* 49668: 3c018006 */ lui $at,%hi(var80060914) /* 4966c: 25cf0030 */ addiu $t7,$t6,0x30 -/* 49670: ac2f0914 */ sw $t7,0x914($at) +/* 49670: ac2f0914 */ sw $t7,%lo(var80060914)($at) /* 49674: 24180001 */ addiu $t8,$zero,0x1 /* 49678: a5d80032 */ sh $t8,0x32($t6) /* 4967c: 3c088006 */ lui $t0,%hi(var80060910) diff --git a/src/lib/lib_49a90.c b/src/lib/lib_49a90.c index c4e7afcd4..772492fc6 100644 --- a/src/lib/lib_49a90.c +++ b/src/lib/lib_49a90.c @@ -19,10 +19,10 @@ glabel __osPiCreateAccessQueue /* 49a90: 27bdffe8 */ addiu $sp,$sp,-24 /* 49a94: afbf0014 */ sw $ra,0x14($sp) /* 49a98: 240e0001 */ addiu $t6,$zero,0x1 -/* 49a9c: 3c018006 */ lui $at,0x8006 +/* 49a9c: 3c018006 */ lui $at,%hi(var80060920) /* 49aa0: 3c04800a */ lui $a0,%hi(var8009c7a8) /* 49aa4: 3c05800a */ lui $a1,%hi(var8009c7a0) -/* 49aa8: ac2e0920 */ sw $t6,0x920($at) +/* 49aa8: ac2e0920 */ sw $t6,%lo(var80060920)($at) /* 49aac: 24a5c7a0 */ addiu $a1,$a1,%lo(var8009c7a0) /* 49ab0: 2484c7a8 */ addiu $a0,$a0,%lo(var8009c7a8) /* 49ab4: 0c0120d0 */ jal osCreateMesgQueue diff --git a/src/lib/lib_49c20.c b/src/lib/lib_49c20.c index b996a7ab8..fcc84db08 100644 --- a/src/lib/lib_49c20.c +++ b/src/lib/lib_49c20.c @@ -492,9 +492,9 @@ glabel __osDestroyThread /* 4a2b8: 15090005 */ bne $t0,$t1,.L0004a2d0 /* 4a2bc: 00000000 */ sll $zero,$zero,0x0 /* 4a2c0: 8d0a000c */ lw $t2,0xc($t0) -/* 4a2c4: 3c018006 */ lui $at,0x8006 +/* 4a2c4: 3c018006 */ lui $at,%hi(var8006093c) /* 4a2c8: 10000013 */ beqz $zero,.L0004a318 -/* 4a2cc: ac2a093c */ sw $t2,0x93c($at) +/* 4a2cc: ac2a093c */ sw $t2,%lo(var8006093c)($at) .L0004a2d0: /* 4a2d0: 3c118006 */ lui $s1,%hi(var8006093c) /* 4a2d4: 8e31093c */ lw $s1,%lo(var8006093c)($s1) diff --git a/src/lib/lib_4a810.c b/src/lib/lib_4a810.c index bebbfab07..b833676b4 100644 --- a/src/lib/lib_4a810.c +++ b/src/lib/lib_4a810.c @@ -21,10 +21,10 @@ glabel __osSiCreateAccessQueue /* 4a810: 27bdffe8 */ addiu $sp,$sp,-24 /* 4a814: afbf0014 */ sw $ra,0x14($sp) /* 4a818: 240e0001 */ addiu $t6,$zero,0x1 -/* 4a81c: 3c018006 */ lui $at,0x8006 +/* 4a81c: 3c018006 */ lui $at,%hi(var80060950) /* 4a820: 3c04800a */ lui $a0,%hi(var8009c7c8) /* 4a824: 3c05800a */ lui $a1,%hi(var8009c7c0) -/* 4a828: ac2e0950 */ sw $t6,0x950($at) +/* 4a828: ac2e0950 */ sw $t6,%lo(var80060950)($at) /* 4a82c: 24a5c7c0 */ addiu $a1,$a1,%lo(var8009c7c0) /* 4a830: 2484c7c8 */ addiu $a0,$a0,%lo(var8009c7c8) /* 4a834: 0c0120d0 */ jal osCreateMesgQueue diff --git a/src/lib/lib_4a980.c b/src/lib/lib_4a980.c index 9d391d009..2d2e2d00e 100644 --- a/src/lib/lib_4a980.c +++ b/src/lib/lib_4a980.c @@ -30,9 +30,9 @@ glabel func0004a980 /* 4a9a8: 00001025 */ or $v0,$zero,$zero .L0004a9ac: /* 4a9ac: 240f0001 */ addiu $t7,$zero,0x1 -/* 4a9b0: 3c018006 */ lui $at,0x8006 +/* 4a9b0: 3c018006 */ lui $at,%hi(var80060960) /* 4a9b4: 0c012448 */ jal func00049120 -/* 4a9b8: ac2f0960 */ sw $t7,0x960($at) +/* 4a9b8: ac2f0960 */ sw $t7,%lo(var80060960)($at) /* 4a9bc: afa20060 */ sw $v0,0x60($sp) /* 4a9c0: 8fb80060 */ lw $t8,0x60($sp) /* 4a9c4: afa30064 */ sw $v1,0x64($sp) diff --git a/src/lib/lib_4ba90.c b/src/lib/lib_4ba90.c index a5ca31518..b01764d8e 100644 --- a/src/lib/lib_4ba90.c +++ b/src/lib/lib_4ba90.c @@ -19,9 +19,9 @@ glabel __osPfsGetStatus /* 4ba98: afbf0014 */ sw $ra,0x14($sp) /* 4ba9c: afa50034 */ sw $a1,0x34($sp) /* 4baa0: 240e00fa */ addiu $t6,$zero,0xfa -/* 4baa4: 3c018006 */ lui $at,0x8006 +/* 4baa4: 3c018006 */ lui $at,%hi(var80060984) /* 4baa8: 00a02025 */ or $a0,$a1,$zero -/* 4baac: a02e0984 */ sb $t6,0x984($at) +/* 4baac: a02e0984 */ sb $t6,%lo(var80060984)($at) /* 4bab0: 0c012ed8 */ jal __osPfsRequestOneChannel /* 4bab4: 00002825 */ or $a1,$zero,$zero /* 4bab8: 3c058009 */ lui $a1,%hi(var80090a20) diff --git a/src/lib/lib_4c090.c b/src/lib/lib_4c090.c index 39de144a0..336af1087 100644 --- a/src/lib/lib_4c090.c +++ b/src/lib/lib_4c090.c @@ -832,17 +832,17 @@ glabel func0004c934 .L0004cbb8: /* 4cbb8: 93ab0067 */ lbu $t3,0x67($sp) .L0004cbbc: -/* 4cbbc: 3c018006 */ lui $at,0x8006 +/* 4cbbc: 3c018006 */ lui $at,%hi(var80060984) /* 4cbc0: 3c05800a */ lui $a1,%hi(var8009c870) /* 4cbc4: 24a5c870 */ addiu $a1,$a1,%lo(var8009c870) /* 4cbc8: 8fa4005c */ lw $a0,0x5c($sp) /* 4cbcc: 24060100 */ addiu $a2,$zero,0x100 /* 4cbd0: 0c012c5c */ jal func0004b170 -/* 4cbd4: a02b0984 */ sb $t3,0x984($at) +/* 4cbd4: a02b0984 */ sb $t3,%lo(var80060984)($at) /* 4cbd8: 8e4e0008 */ lw $t6,0x8($s2) -/* 4cbdc: 3c018006 */ lui $at,0x8006 +/* 4cbdc: 3c018006 */ lui $at,%hi(var80060980) /* 4cbe0: 00001025 */ or $v0,$zero,$zero -/* 4cbe4: ac2e0980 */ sw $t6,0x980($at) +/* 4cbe4: ac2e0980 */ sw $t6,%lo(var80060980)($at) .L0004cbe8: /* 4cbe8: 8fbf0034 */ lw $ra,0x34($sp) .L0004cbec: diff --git a/src/lib/lib_4e3c0.c b/src/lib/lib_4e3c0.c index bbba1e1cb..baf4b1b62 100644 --- a/src/lib/lib_4e3c0.c +++ b/src/lib/lib_4e3c0.c @@ -32,12 +32,12 @@ glabel func0004e3c0 /* 4e3fc: 15400005 */ bnez $t2,.L0004e414 /* 4e400: 00000000 */ sll $zero,$zero,0x0 /* 4e404: 240b0001 */ addiu $t3,$zero,0x1 -/* 4e408: 3c018006 */ lui $at,0x8006 +/* 4e408: 3c018006 */ lui $at,%hi(var80060990) /* 4e40c: 10000003 */ beqz $zero,.L0004e41c -/* 4e410: a02b0990 */ sb $t3,0x990($at) +/* 4e410: a02b0990 */ sb $t3,%lo(var80060990)($at) .L0004e414: -/* 4e414: 3c018006 */ lui $at,0x8006 -/* 4e418: a0200990 */ sb $zero,0x990($at) +/* 4e414: 3c018006 */ lui $at,%hi(var80060990) +/* 4e418: a0200990 */ sb $zero,%lo(var80060990)($at) .L0004e41c: /* 4e41c: 0c0147b0 */ jal func00051ec0 /* 4e420: 00000000 */ sll $zero,$zero,0x0 diff --git a/src/lib/lib_4f5e0.c b/src/lib/lib_4f5e0.c index 5aed9b06e..c01c3547b 100644 --- a/src/lib/lib_4f5e0.c +++ b/src/lib/lib_4f5e0.c @@ -460,10 +460,10 @@ glabel func0004fbf0 /* 4fc0c: 330803ff */ andi $t0,$t8,0x3ff /* 4fc10: 00084840 */ sll $t1,$t0,0x1 /* 4fc14: 00095023 */ negu $t2,$t1 -/* 4fc18: 3c038006 */ lui $v1,0x8006 +/* 4fc18: 3c038006 */ lui $v1,%hi(var800611ec+0x2) /* 4fc1c: 006a1821 */ addu $v1,$v1,$t2 /* 4fc20: 10000006 */ beqz $zero,.L0004fc3c -/* 4fc24: 846311ee */ lh $v1,0x11ee($v1) +/* 4fc24: 846311ee */ lh $v1,%lo(var800611ec+0x2)($v1) .L0004fc28: /* 4fc28: 304b03ff */ andi $t3,$v0,0x3ff /* 4fc2c: 000b6040 */ sll $t4,$t3,0x1 diff --git a/src/lib/lib_51890.c b/src/lib/lib_51890.c index a3c7dbc9b..30ef9b857 100644 --- a/src/lib/lib_51890.c +++ b/src/lib/lib_51890.c @@ -32,9 +32,9 @@ glabel func000518a0 /* 518c4: 01e1c024 */ and $t8,$t7,$at /* 518c8: 0300c827 */ nor $t9,$t8,$zero /* 518cc: 00408025 */ or $s0,$v0,$zero -/* 518d0: 3c018006 */ lui $at,0x8006 +/* 518d0: 3c018006 */ lui $at,%hi(var8005cf70) /* 518d4: 01d94024 */ and $t0,$t6,$t9 -/* 518d8: ac28cf70 */ sw $t0,-0x3090($at) +/* 518d8: ac28cf70 */ sw $t0,%lo(var8005cf70)($at) /* 518dc: 0c012588 */ jal __osRestoreInt /* 518e0: 02002025 */ or $a0,$s0,$zero /* 518e4: 8fbf001c */ lw $ra,0x1c($sp) diff --git a/src/lib/lib_51a60.c b/src/lib/lib_51a60.c index 7664a63cf..fde9636ab 100644 --- a/src/lib/lib_51a60.c +++ b/src/lib/lib_51a60.c @@ -125,9 +125,9 @@ glabel func00051bc0 /* 51bd8: 8dcecf70 */ lw $t6,%lo(var8005cf70)($t6) /* 51bdc: 8faf0028 */ lw $t7,0x28($sp) /* 51be0: 00408025 */ or $s0,$v0,$zero -/* 51be4: 3c018006 */ lui $at,0x8006 +/* 51be4: 3c018006 */ lui $at,%hi(var8005cf70) /* 51be8: 01cfc025 */ or $t8,$t6,$t7 -/* 51bec: ac38cf70 */ sw $t8,-0x3090($at) +/* 51bec: ac38cf70 */ sw $t8,%lo(var8005cf70)($at) /* 51bf0: 0c012588 */ jal __osRestoreInt /* 51bf4: 02002025 */ or $a0,$s0,$zero /* 51bf8: 8fbf001c */ lw $ra,0x1c($sp)