diff --git a/src/boot/boot.c b/src/boot/boot.c index fa06b5978..ce9e26e72 100644 --- a/src/boot/boot.c +++ b/src/boot/boot.c @@ -99,13 +99,13 @@ glabel func000010a4 /* 10b0: 24080002 */ addiu $t0,$zero,0x2 /* 10b4: 40883000 */ mtc0 $t0,$6 /* 10b8: 240901ff */ addiu $t1,$zero,0x1ff -/* 10bc: 3c018009 */ lui $at,0x8009 -/* 10c0: a429d266 */ sh $t1,-0x2d9a($at) +/* 10bc: 3c018009 */ lui $at,%hi(var8008d264+0x2) +/* 10c0: a429d266 */ sh $t1,%lo(var8008d264+0x2)($at) /* 10c4: 2404010c */ addiu $a0,$zero,0x10c -/* 10c8: 3c018009 */ lui $at,0x8009 -/* 10cc: a424ae2a */ sh $a0,-0x51d6($at) -/* 10d0: 3c018009 */ lui $at,0x8009 -/* 10d4: a424d25a */ sh $a0,-0x2da6($at) +/* 10c8: 3c018009 */ lui $at,%hi(var8008ae28+0x2) +/* 10cc: a424ae2a */ sh $a0,%lo(var8008ae28+0x2)($at) +/* 10d0: 3c018009 */ lui $at,%hi(var8008d258+0x2) +/* 10d4: a424d25a */ sh $a0,%lo(var8008d258+0x2)($at) /* 10d8: 00042300 */ sll $a0,$a0,0xc /* 10dc: 3c028009 */ lui $v0,%hi(var8008ae20) /* 10e0: 8c42ae20 */ lw $v0,%lo(var8008ae20)($v0) @@ -117,16 +117,16 @@ glabel func000010a4 /* 10f8: 3c080fff */ lui $t0,0xfff /* 10fc: 3508ffff */ ori $t0,$t0,0xffff /* 1100: 00481024 */ and $v0,$v0,$t0 -/* 1104: 3c018009 */ lui $at,0x8009 -/* 1108: ac22d268 */ sw $v0,-0x2d98($at) +/* 1104: 3c018009 */ lui $at,%hi(var8008d268) +/* 1108: ac22d268 */ sw $v0,%lo(var8008d268)($at) /* 110c: 3c028009 */ lui $v0,%hi(var8008d238) /* 1110: 2442d238 */ addiu $v0,$v0,%lo(var8008d238) /* 1114: 24040021 */ addiu $a0,$zero,0x21 -/* 1118: 3c018009 */ lui $at,0x8009 -/* 111c: ac22d25c */ sw $v0,-0x2da4($at) +/* 1118: 3c018009 */ lui $at,%hi(var8008d25c) +/* 111c: ac22d25c */ sw $v0,%lo(var8008d25c)($at) /* 1120: 00441821 */ addu $v1,$v0,$a0 -/* 1124: 3c018009 */ lui $at,0x8009 -/* 1128: ac23d260 */ sw $v1,-0x2da0($at) +/* 1124: 3c018009 */ lui $at,%hi(var8008d260) +/* 1128: ac23d260 */ sw $v1,%lo(var8008d260)($at) /* 112c: 8fbf0000 */ lw $ra,0x0($sp) /* 1130: 27bd0008 */ addiu $sp,$sp,0x8 /* 1134: 03e00008 */ jr $ra @@ -279,14 +279,14 @@ glabel func00001180 /* 1334: 31290003 */ andi $t1,$t1,0x3 /* 1338: 1520fffd */ bnez $t1,.L00001330 /* 133c: 00000000 */ sll $zero,$zero,0x0 -/* 1340: 3c088009 */ lui $t0,%hi(var80090010) -/* 1344: 8d08ae2c */ lw $t0,-0x51d4($t0) +/* 1340: 3c088009 */ lui $t0,%hi(var8008ae2c) +/* 1344: 8d08ae2c */ lw $t0,%lo(var8008ae2c)($t0) /* 1348: 25091000 */ addiu $t1,$t0,0x1000 .L0000134c: /* 134c: bd150000 */ cache 0x15,0x0($t0) /* 1350: 0109082b */ sltu $at,$t0,$t1 /* 1354: 1420fffd */ bnez $at,.L0000134c -/* 1358: 25080010 */ addiu $t0,$t0,%lo(var80090010) +/* 1358: 25080010 */ addiu $t0,$t0,16 /* 135c: 16c00004 */ bnez $s6,.L00001370 /* 1360: 00000000 */ sll $zero,$zero,0x0 /* 1364: 24080002 */ addiu $t0,$zero,0x2 @@ -298,8 +298,8 @@ glabel func00001180 /* 1378: 24840ff8 */ addiu $a0,$a0,0xff8 /* 137c: ac9d0000 */ sw $sp,0x0($a0) /* 1380: 249d0000 */ addiu $sp,$a0,0x0 -/* 1384: 3c048009 */ lui $a0,%hi(var80090ff8) -/* 1388: 8c84ae2c */ lw $a0,-0x51d4($a0) +/* 1384: 3c048009 */ lui $a0,%hi(var8008ae2c) +/* 1388: 8c84ae2c */ lw $a0,%lo(var8008ae2c)($a0) /* 138c: 24840002 */ addiu $a0,$a0,0x2 /* 1390: 3c088000 */ lui $t0,0x8000 /* 1394: 02282825 */ or $a1,$s1,$t0 @@ -369,7 +369,7 @@ glabel func00001180 /* 1494: 27bd0080 */ addiu $sp,$sp,0x80 /* 1498: 3c048009 */ lui $a0,%hi(var8008ae38) /* 149c: 2484ae38 */ addiu $a0,$a0,%lo(var8008ae38) -/* 14a0: 24840ff8 */ addiu $a0,$a0,%lo(var80090ff8) +/* 14a0: 24840ff8 */ addiu $a0,$a0,4088 /* 14a4: 8c9d0000 */ lw $sp,0x0($a0) /* 14a8: 3c088000 */ lui $t0,0x8000 /* 14ac: 02284025 */ or $t0,$s1,$t0 @@ -439,8 +439,8 @@ glabel func00001570 /* 1578: 3c1c8009 */ lui $gp,%hi(var80090b08) /* 157c: 8f9c0b08 */ lw $gp,%lo(var80090b08)($gp) /* 1580: 40084800 */ mfc0 $t0,$9 -/* 1584: 3c098009 */ lui $t1,%hi(var80090008) -/* 1588: 9529d266 */ lhu $t1,-0x2d9a($t1) +/* 1584: 3c098009 */ lui $t1,%hi(var8008d264+0x2) +/* 1588: 9529d266 */ lhu $t1,%lo(var8008d264+0x2)($t1) /* 158c: 3c0a8006 */ lui $t2,%hi(var8005cf84) /* 1590: 8d4acf84 */ lw $t2,%lo(var8005cf84)($t2) /* 1594: 01094024 */ and $t0,$t0,$t1 @@ -454,7 +454,7 @@ glabel func00001570 /* 15ac: 8d310000 */ lw $s1,0x0($t1) /* 15b0: 16200006 */ bnez $s1,.L000015cc /* 15b4: 00000000 */ sll $zero,$zero,0x0 -/* 15b8: 25290008 */ addiu $t1,$t1,%lo(var80090008) +/* 15b8: 25290008 */ addiu $t1,$t1,8 /* 15bc: 153cfffb */ bne $t1,$gp,.L000015ac /* 15c0: 00000000 */ sll $zero,$zero,0x0 /* 15c4: 0800056b */ j 0x15ac @@ -835,8 +835,8 @@ glabel func000019f4 /* 1a88: 0c0007a3 */ jal func00001e8c /* 1a8c: 2484dbd0 */ addiu $a0,$a0,%lo(var8008dbd0) /* 1a90: 8fbf0014 */ lw $ra,0x14($sp) -/* 1a94: 3c018009 */ lui $at,0x8009 -/* 1a98: ac22dbc8 */ sw $v0,-0x2438($at) +/* 1a94: 3c018009 */ lui $at,%hi(var8008dbc8) +/* 1a98: ac22dbc8 */ sw $v0,%lo(var8008dbc8)($at) /* 1a9c: 03e00008 */ jr $ra /* 1aa0: 27bd0018 */ addiu $sp,$sp,0x18 ); @@ -942,19 +942,19 @@ glabel func00001c4c /* 1ce0: 0019c900 */ sll $t9,$t9,0x4 /* 1ce4: 03291021 */ addu $v0,$t9,$t1 /* 1ce8: 8c4a001c */ lw $t2,0x1c($v0) -/* 1cec: 3c018009 */ lui $at,0x8009 +/* 1cec: 3c018009 */ lui $at,%hi(var8008de08) /* 1cf0: 3c038009 */ lui $v1,%hi(var8008dd60) -/* 1cf4: ac2ade08 */ sw $t2,-0x21f8($at) +/* 1cf4: ac2ade08 */ sw $t2,%lo(var8008de08)($at) /* 1cf8: 8c4b0030 */ lw $t3,0x30($v0) -/* 1cfc: 3c018009 */ lui $at,0x8009 +/* 1cfc: 3c018009 */ lui $at,%hi(var8008de0c) /* 1d00: 3c078009 */ lui $a3,%hi(var8008dd68) -/* 1d04: ac2bde0c */ sw $t3,-0x21f4($at) +/* 1d04: ac2bde0c */ sw $t3,%lo(var8008de0c)($at) /* 1d08: 8c4c0044 */ lw $t4,0x44($v0) -/* 1d0c: 3c018009 */ lui $at,0x8009 +/* 1d0c: 3c018009 */ lui $at,%hi(var8008de10) /* 1d10: 24e7dd68 */ addiu $a3,$a3,%lo(var8008dd68) /* 1d14: 2463dd60 */ addiu $v1,$v1,%lo(var8008dd60) /* 1d18: 3c088009 */ lui $t0,%hi(var8008ddb8) -/* 1d1c: ac2cde10 */ sw $t4,-0x21f0($at) +/* 1d1c: ac2cde10 */ sw $t4,%lo(var8008de10)($at) /* 1d20: 2508ddb8 */ addiu $t0,$t0,%lo(var8008ddb8) /* 1d24: ac670000 */ sw $a3,0x0($v1) /* 1d28: ac680004 */ sw $t0,0x4($v1) @@ -1463,8 +1463,8 @@ GLOBAL_ASM( glabel func00002400 /* 2400: 3c038009 */ lui $v1,%hi(var8008de48) /* 2404: 3c058009 */ lui $a1,%hi(var8008fa68) -/* 2408: 3c078009 */ lui $a3,0x8009 -/* 240c: 24e7fa6b */ addiu $a3,$a3,-1429 +/* 2408: 3c078009 */ lui $a3,%hi(var8008fa68+0x3) +/* 240c: 24e7fa6b */ addiu $a3,$a3,%lo(var8008fa68+0x3) /* 2410: 24a5fa68 */ addiu $a1,$a1,%lo(var8008fa68) /* 2414: 2463de48 */ addiu $v1,$v1,%lo(var8008de48) /* 2418: 24060078 */ addiu $a2,$zero,0x78 @@ -1759,15 +1759,15 @@ glabel func00002768 /* 28c8: 00084100 */ sll $t0,$t0,0x4 /* 28cc: 0003c880 */ sll $t9,$v1,0x2 /* 28d0: 2529dcc0 */ addiu $t1,$t1,%lo(var8008dcc0) -/* 28d4: 3c0e8009 */ lui $t6,%hi(var8009000c) +/* 28d4: 3c0e8009 */ lui $t6,%hi(var8008dd60) /* 28d8: 01d97021 */ addu $t6,$t6,$t9 /* 28dc: 01095021 */ addu $t2,$t0,$t1 /* 28e0: 254c0048 */ addiu $t4,$t2,0x48 -/* 28e4: 8dcedd60 */ lw $t6,-0x22a0($t6) +/* 28e4: 8dcedd60 */ lw $t6,%lo(var8008dd60)($t6) .L000028e8: /* 28e8: 8d410000 */ lw $at,0x0($t2) /* 28ec: 254a000c */ addiu $t2,$t2,%lo(var8006000c) -/* 28f0: 25ce000c */ addiu $t6,$t6,%lo(var8009000c) +/* 28f0: 25ce000c */ addiu $t6,$t6,12 /* 28f4: adc1fff4 */ sw $at,-0xc($t6) /* 28f8: 8d41fff8 */ lw $at,-0x8($t2) /* 28fc: adc1fff8 */ sw $at,-0x8($t6) @@ -2186,8 +2186,8 @@ glabel func00002e00 /* 2e84: 24040001 */ addiu $a0,$zero,0x1 /* 2e88: 0c012448 */ jal func00049120 /* 2e8c: 00000000 */ sll $zero,$zero,0x0 -/* 2e90: 3c018009 */ lui $at,0x8009 -/* 2e94: ac22fdf0 */ sw $v0,-0x210($at) +/* 2e90: 3c018009 */ lui $at,%hi(var8008fdf0) +/* 2e94: ac22fdf0 */ sw $v0,%lo(var8008fdf0)($at) /* 2e98: 0c012448 */ jal func00049120 /* 2e9c: ac23fdf4 */ sw $v1,-0x20c($at) /* 2ea0: 3c198009 */ lui $t9,%hi(var8008fdf4) diff --git a/src/game/bondbike.c b/src/game/bondbike.c index 73cc5bdb0..1cb25283f 100644 --- a/src/game/bondbike.c +++ b/src/game/bondbike.c @@ -108,8 +108,8 @@ void currentPlayerBikeInit(void) GLOBAL_ASM( glabel func0f0d2184 -/* f0d2184: 3c0e800a */ lui $t6,0x800a -/* f0d2188: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0d2184: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0d2188: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0d218c: 27bdff98 */ addiu $sp,$sp,-104 /* f0d2190: afbf0044 */ sw $ra,0x44($sp) /* f0d2194: 8dcf1a6c */ lw $t7,0x1a6c($t6) @@ -133,20 +133,20 @@ glabel func0f0d2184 /* f0d21dc: 44060000 */ mfc1 $a2,$f0 /* f0d21e0: 0fc20a87 */ jal func0f082a1c /* f0d21e4: 00000000 */ sll $zero,$zero,0x0 -/* f0d21e8: 3c08800a */ lui $t0,0x800a -/* f0d21ec: 8d08a244 */ lw $t0,-0x5dbc($t0) +/* f0d21e8: 3c08800a */ lui $t0,%hi(g_Vars+0x284) +/* f0d21ec: 8d08a244 */ lw $t0,%lo(g_Vars+0x284)($t0) /* f0d21f0: 24050001 */ addiu $a1,$zero,0x1 /* f0d21f4: 3406ffff */ dli $a2,0xffff /* f0d21f8: 0fc249af */ jal func0f0926bc /* f0d21fc: 8d041a6c */ lw $a0,0x1a6c($t0) -/* f0d2200: 3c09800a */ lui $t1,0x800a -/* f0d2204: 8d29a244 */ lw $t1,-0x5dbc($t1) +/* f0d2200: 3c09800a */ lui $t1,%hi(g_Vars+0x284) +/* f0d2204: 8d29a244 */ lw $t1,%lo(g_Vars+0x284)($t1) /* f0d2208: 24050001 */ addiu $a1,$zero,0x1 /* f0d220c: 3406ffff */ dli $a2,0xffff /* f0d2210: 0fc249af */ jal func0f0926bc /* f0d2214: 8d2400bc */ lw $a0,0xbc($t1) -/* f0d2218: 3c0a800a */ lui $t2,0x800a -/* f0d221c: 8d4aa244 */ lw $t2,-0x5dbc($t2) +/* f0d2218: 3c0a800a */ lui $t2,%hi(g_Vars+0x284) +/* f0d221c: 8d4aa244 */ lw $t2,%lo(g_Vars+0x284)($t2) /* f0d2220: 3c01bf80 */ lui $at,0xbf80 /* f0d2224: 44810000 */ mtc1 $at,$f0 /* f0d2228: 8d451a6c */ lw $a1,0x1a6c($t2) @@ -384,8 +384,8 @@ glabel func0f0d2558 /* f0d25d8: 4614a282 */ mul.s $f10,$f20,$f20 /* f0d25dc: 0c012974 */ jal sqrtf /* f0d25e0: 460a4300 */ add.s $f12,$f8,$f10 -/* f0d25e4: 3c0a800a */ lui $t2,0x800a -/* f0d25e8: 8d4aa244 */ lw $t2,-0x5dbc($t2) +/* f0d25e4: 3c0a800a */ lui $t2,%hi(g_Vars+0x284) +/* f0d25e8: 8d4aa244 */ lw $t2,%lo(g_Vars+0x284)($t2) /* f0d25ec: c7ae002c */ lwc1 $f14,0x2c($sp) /* f0d25f0: 3c017f1b */ lui $at,%hi(var7f1adb38) /* f0d25f4: ad401af8 */ sw $zero,0x1af8($t2) @@ -419,15 +419,15 @@ glabel func0f0d2558 /* f0d2664: c42cdb50 */ lwc1 $f12,%lo(var7f1adb50)($at) /* f0d2668: 0fc348be */ jal func0f0d22f8 /* f0d266c: 4600a386 */ mov.s $f14,$f20 -/* f0d2670: 3c02800a */ lui $v0,0x800a -/* f0d2674: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0d2670: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0d2674: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0d2678: 8c4b1af8 */ lw $t3,0x1af8($v0) /* f0d267c: 51600006 */ beqzl $t3,.L0f0d2698 /* f0d2680: ac4000d0 */ sw $zero,0xd0($v0) /* f0d2684: 0fc31f4c */ jal currentPlayerSetMoveMode /* f0d2688: 00002025 */ or $a0,$zero,$zero -/* f0d268c: 3c02800a */ lui $v0,0x800a -/* f0d2690: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0d268c: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0d2690: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0d2694: ac4000d0 */ sw $zero,0xd0($v0) .L0f0d2698: /* f0d2698: 8fbf0024 */ lw $ra,0x24($sp) @@ -452,27 +452,27 @@ glabel func0f0d26ac /* f0d26d0: afb8005c */ sw $t8,0x5c($sp) /* f0d26d4: 0fc549d2 */ jal optionsGetUnk45 /* f0d26d8: 8f240070 */ lw $a0,0x70($t9) -/* f0d26dc: 3c08800a */ lui $t0,0x800a -/* f0d26e0: 8d08a248 */ lw $t0,-0x5db8($t0) +/* f0d26dc: 3c08800a */ lui $t0,%hi(g_Vars+0x288) +/* f0d26e0: 8d08a248 */ lw $t0,%lo(g_Vars+0x288)($t0) /* f0d26e4: a3a2005b */ sb $v0,0x5b($sp) /* f0d26e8: 0fc549c4 */ jal optionsGetControlMode /* f0d26ec: 8d040070 */ lw $a0,0x70($t0) /* f0d26f0: 24010001 */ addiu $at,$zero,0x1 /* f0d26f4: 10410012 */ beq $v0,$at,.L0f0d2740 -/* f0d26f8: 3c09800a */ lui $t1,0x800a -/* f0d26fc: 8d29a248 */ lw $t1,-0x5db8($t1) +/* f0d26f8: 3c09800a */ lui $t1,%hi(g_Vars+0x288) +/* f0d26fc: 8d29a248 */ lw $t1,%lo(g_Vars+0x288)($t1) /* f0d2700: 0fc549c4 */ jal optionsGetControlMode /* f0d2704: 8d240070 */ lw $a0,0x70($t1) /* f0d2708: 24010003 */ addiu $at,$zero,0x3 /* f0d270c: 1041000c */ beq $v0,$at,.L0f0d2740 -/* f0d2710: 3c0a800a */ lui $t2,0x800a -/* f0d2714: 8d4aa248 */ lw $t2,-0x5db8($t2) +/* f0d2710: 3c0a800a */ lui $t2,%hi(g_Vars+0x288) +/* f0d2714: 8d4aa248 */ lw $t2,%lo(g_Vars+0x288)($t2) /* f0d2718: 0fc549c4 */ jal optionsGetControlMode /* f0d271c: 8d440070 */ lw $a0,0x70($t2) /* f0d2720: 24010002 */ addiu $at,$zero,0x2 /* f0d2724: 10410006 */ beq $v0,$at,.L0f0d2740 -/* f0d2728: 3c0b800a */ lui $t3,0x800a -/* f0d272c: 8d6ba248 */ lw $t3,-0x5db8($t3) +/* f0d2728: 3c0b800a */ lui $t3,%hi(g_Vars+0x288) +/* f0d272c: 8d6ba248 */ lw $t3,%lo(g_Vars+0x288)($t3) /* f0d2730: 0fc549c4 */ jal optionsGetControlMode /* f0d2734: 8d640070 */ lw $a0,0x70($t3) /* f0d2738: 14400011 */ bnez $v0,.L0f0d2780 @@ -528,9 +528,9 @@ glabel func0f0d26ac /* f0d27f0: 44817000 */ mtc1 $at,$f14 /* f0d27f4: 3c017f1b */ lui $at,%hi(var7f1adb58) /* f0d27f8: c42adb58 */ lwc1 $f10,%lo(var7f1adb58)($at) -/* f0d27fc: 3c02800a */ lui $v0,0x800a +/* f0d27fc: 3c02800a */ lui $v0,%hi(g_Vars+0x284) /* f0d2800: 3c01800a */ lui $at,0x800a -/* f0d2804: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0d2804: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0d2808: c424a00c */ lwc1 $f4,-0x5ff4($at) /* f0d280c: 3c013f80 */ lui $at,0x3f80 /* f0d2810: c4400170 */ lwc1 $f0,0x170($v0) @@ -548,12 +548,12 @@ glabel func0f0d26ac /* f0d283c: 3c04800a */ lui $a0,%hi(g_Vars) /* f0d2840: 24849fc0 */ addiu $a0,$a0,%lo(g_Vars) /* f0d2844: e4460170 */ swc1 $f6,0x170($v0) -/* f0d2848: 3c02800a */ lui $v0,0x800a +/* f0d2848: 3c02800a */ lui $v0,%hi(g_Vars+0x284) /* f0d284c: 10000039 */ beqz $zero,.L0f0d2934 -/* f0d2850: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0d2850: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) .L0f0d2854: /* f0d2854: 8cef0010 */ lw $t7,0x10($a3) -/* f0d2858: 3c08800a */ lui $t0,0x800a +/* f0d2858: 3c08800a */ lui $t0,%hi(g_Vars+0x284) /* f0d285c: 3c02800a */ lui $v0,0x800a /* f0d2860: 11e0002b */ beqz $t7,.L0f0d2910 /* f0d2864: 3c013f80 */ lui $at,0x3f80 @@ -561,10 +561,10 @@ glabel func0f0d26ac /* f0d286c: 3c01428c */ lui $at,0x428c /* f0d2870: 44812000 */ mtc1 $at,$f4 /* f0d2874: 44984000 */ mtc1 $t8,$f8 -/* f0d2878: 3c19800a */ lui $t9,0x800a -/* f0d287c: 8f39a244 */ lw $t9,-0x5dbc($t9) +/* f0d2878: 3c19800a */ lui $t9,%hi(g_Vars+0x284) +/* f0d287c: 8f39a244 */ lw $t9,%lo(g_Vars+0x284)($t9) /* f0d2880: 468042a0 */ cvt.s.w $f10,$f8 -/* f0d2884: 3c02800a */ lui $v0,0x800a +/* f0d2884: 3c02800a */ lui $v0,%hi(g_Vars+0x284) /* f0d2888: 3c013f80 */ lui $at,0x3f80 /* f0d288c: 44814000 */ mtc1 $at,$f8 /* f0d2890: 44808000 */ mtc1 $zero,$f16 @@ -572,7 +572,7 @@ glabel func0f0d26ac /* f0d2898: 46045183 */ div.s $f6,$f10,$f4 /* f0d289c: 3c04800a */ lui $a0,%hi(g_Vars) /* f0d28a0: e7260170 */ swc1 $f6,0x170($t9) -/* f0d28a4: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0d28a4: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0d28a8: c4400170 */ lwc1 $f0,0x170($v0) /* f0d28ac: 4600403c */ c.lt.s $f8,$f0 /* f0d28b0: 00000000 */ sll $zero,$zero,0x0 @@ -583,9 +583,9 @@ glabel func0f0d26ac /* f0d28c4: 3c01bf80 */ lui $at,0xbf80 /* f0d28c8: 44817000 */ mtc1 $at,$f14 /* f0d28cc: e44a0170 */ swc1 $f10,0x170($v0) -/* f0d28d0: 3c02800a */ lui $v0,0x800a +/* f0d28d0: 3c02800a */ lui $v0,%hi(g_Vars+0x284) /* f0d28d4: 1000000a */ beqz $zero,.L0f0d2900 -/* f0d28d8: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0d28d8: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0d28dc: 44817000 */ mtc1 $at,$f14 .L0f0d28e0: /* f0d28e0: 00000000 */ sll $zero,$zero,0x0 @@ -594,8 +594,8 @@ glabel func0f0d26ac /* f0d28ec: 45020005 */ bc1fl .L0f0d2904 /* f0d28f0: 3c013f80 */ lui $at,0x3f80 /* f0d28f4: e44e0170 */ swc1 $f14,0x170($v0) -/* f0d28f8: 3c02800a */ lui $v0,0x800a -/* f0d28fc: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0d28f8: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0d28fc: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) .L0f0d2900: /* f0d2900: 3c013f80 */ lui $at,0x3f80 .L0f0d2904: @@ -604,7 +604,7 @@ glabel func0f0d26ac /* f0d290c: 24849fc0 */ addiu $a0,$a0,%lo(g_Vars) .L0f0d2910: /* f0d2910: 44808000 */ mtc1 $zero,$f16 -/* f0d2914: 8d08a244 */ lw $t0,-0x5dbc($t0) +/* f0d2914: 8d08a244 */ lw $t0,%lo(g_Vars+0x284)($t0) /* f0d2918: 44819000 */ mtc1 $at,$f18 /* f0d291c: 3c01bf80 */ lui $at,0xbf80 /* f0d2920: 3c04800a */ lui $a0,%hi(g_Vars) @@ -740,11 +740,11 @@ glabel func0f0d26ac /* f0d2af4: c7a4002c */ lwc1 $f4,0x2c($sp) /* f0d2af8: c7a60024 */ lwc1 $f6,0x24($sp) /* f0d2afc: 3c013f80 */ lui $at,0x3f80 -/* f0d2b00: 3c0b800a */ lui $t3,0x800a +/* f0d2b00: 3c0b800a */ lui $t3,%hi(g_Vars+0x284) /* f0d2b04: 46062081 */ sub.s $f2,$f4,$f6 /* f0d2b08: 44812000 */ mtc1 $at,$f4 /* f0d2b0c: 3c013f40 */ lui $at,0x3f40 -/* f0d2b10: 8d6ba244 */ lw $t3,-0x5dbc($t3) +/* f0d2b10: 8d6ba244 */ lw $t3,%lo(g_Vars+0x284)($t3) /* f0d2b14: 46021200 */ add.s $f8,$f2,$f2 /* f0d2b18: 46004283 */ div.s $f10,$f8,$f0 /* f0d2b1c: 46045181 */ sub.s $f6,$f10,$f4 @@ -1723,8 +1723,8 @@ glabel func0f0d3840 GLOBAL_ASM( glabel func0f0d3940 /* f0d3940: 27bdffa8 */ addiu $sp,$sp,-88 -/* f0d3944: 3c0e800a */ lui $t6,0x800a -/* f0d3948: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0d3944: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0d3948: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0d394c: afb20020 */ sw $s2,0x20($sp) /* f0d3950: afb1001c */ sw $s1,0x1c($sp) /* f0d3954: afb00018 */ sw $s0,0x18($sp) @@ -1737,8 +1737,8 @@ glabel func0f0d3940 /* f0d3970: 27a70038 */ addiu $a3,$sp,0x38 /* f0d3974: 0fc21d5b */ jal propObjGetBbox /* f0d3978: 8dc41a6c */ lw $a0,0x1a6c($t6) -/* f0d397c: 3c03800a */ lui $v1,0x800a -/* f0d3980: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f0d397c: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f0d3980: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f0d3984: c6240000 */ lwc1 $f4,0x0($s1) /* f0d3988: c60a0000 */ lwc1 $f10,0x0($s0) /* f0d398c: 8c6f1a6c */ lw $t7,0x1a6c($v1) diff --git a/src/game/bondeyespy.c b/src/game/bondeyespy.c index 9279db950..ce5402a54 100644 --- a/src/game/bondeyespy.c +++ b/src/game/bondeyespy.c @@ -44,8 +44,8 @@ glabel func0f0cf150 glabel var7f1ada80 .word 0xc6ea6000 .text -/* f0cf150: 3c0e800a */ lui $t6,0x800a -/* f0cf154: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0cf150: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0cf154: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0cf158: 27bdffa8 */ addiu $sp,$sp,-88 /* f0cf15c: afbf002c */ sw $ra,0x2c($sp) /* f0cf160: afa40058 */ sw $a0,0x58($sp) @@ -212,8 +212,8 @@ glabel var7f1ada8c GLOBAL_ASM( glabel func0f0cf38c /* f0cf38c: 27bdff30 */ addiu $sp,$sp,-208 -/* f0cf390: 3c0f800a */ lui $t7,0x800a -/* f0cf394: 8defa244 */ lw $t7,-0x5dbc($t7) +/* f0cf390: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) +/* f0cf394: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) /* f0cf398: 240e0001 */ addiu $t6,$zero,0x1 /* f0cf39c: afbf0034 */ sw $ra,0x34($sp) /* f0cf3a0: afb00030 */ sw $s0,0x30($sp) @@ -417,10 +417,10 @@ glabel func0f0cf38c /* f0cf690: 00402025 */ or $a0,$v0,$zero /* f0cf694: 904c0000 */ lbu $t4,0x0($v0) /* f0cf698: 24010006 */ addiu $at,$zero,0x6 -/* f0cf69c: 3c0d800a */ lui $t5,0x800a +/* f0cf69c: 3c0d800a */ lui $t5,%hi(g_Vars+0x28c) /* f0cf6a0: 5581000b */ bnel $t4,$at,.L0f0cf6d0 /* f0cf6a4: 02002025 */ or $a0,$s0,$zero -/* f0cf6a8: 8dada24c */ lw $t5,-0x5db4($t5) +/* f0cf6a8: 8dada24c */ lw $t5,%lo(g_Vars+0x28c)($t5) /* f0cf6ac: 0fc4a25f */ jal propGetPlayerNum /* f0cf6b0: afad004c */ sw $t5,0x4c($sp) /* f0cf6b4: 8fae004c */ lw $t6,0x4c($sp) @@ -475,8 +475,8 @@ glabel func0f0cf728 /* f0cf75c: 25080ec4 */ addiu $t0,$t0,%lo(var80070ec4) /* f0cf760: 10400046 */ beqz $v0,.L0f0cf87c /* f0cf764: 00404825 */ or $t1,$v0,$zero -/* f0cf768: 3c0f800a */ lui $t7,0x800a -/* f0cf76c: 8def9ff4 */ lw $t7,-0x600c($t7) +/* f0cf768: 3c0f800a */ lui $t7,%hi(g_Vars+0x34) +/* f0cf76c: 8def9ff4 */ lw $t7,%lo(g_Vars+0x34)($t7) /* f0cf770: 59e00043 */ blezl $t7,.L0f0cf880 /* f0cf774: 8fbf0014 */ lw $ra,0x14($sp) /* f0cf778: 90580000 */ lbu $t8,0x0($v0) @@ -732,8 +732,8 @@ glabel func0f0cf9f8 GLOBAL_ASM( glabel func0f0cfafc -/* f0cfafc: 3c0e800a */ lui $t6,0x800a -/* f0cfb00: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0cfafc: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0cfb00: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0cfb04: 27bdffc0 */ addiu $sp,$sp,-64 /* f0cfb08: afbf0014 */ sw $ra,0x14($sp) /* f0cfb0c: 8dcf0480 */ lw $t7,0x480($t6) @@ -954,8 +954,8 @@ glabel var7f1ada90 glabel var7f1ada94 .word 0x411ffffe .text -/* f0cfe24: 3c02800a */ lui $v0,0x800a -/* f0cfe28: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0cfe24: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0cfe28: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0cfe2c: 27bdff48 */ addiu $sp,$sp,-184 /* f0cfe30: afbf001c */ sw $ra,0x1c($sp) /* f0cfe34: 8c4e0480 */ lw $t6,0x480($v0) @@ -1083,15 +1083,15 @@ glabel var7f1ada94 /* f0d000c: c7b00078 */ lwc1 $f16,0x78($sp) /* f0d0010: 46000486 */ mov.s $f18,$f0 /* f0d0014: 46020032 */ c.eq.s $f0,$f2 -/* f0d0018: 3c19800a */ lui $t9,0x800a +/* f0d0018: 3c19800a */ lui $t9,%hi(g_Vars+0x284) /* f0d001c: 45030046 */ bc1tl .L0f0d0138 /* f0d0020: 46027301 */ sub.s $f12,$f14,$f2 /* f0d0024: 4602003c */ c.lt.s $f0,$f2 -/* f0d0028: 3c0d800a */ lui $t5,0x800a -/* f0d002c: 3c0e800a */ lui $t6,0x800a +/* f0d0028: 3c0d800a */ lui $t5,%hi(g_Vars+0x284) +/* f0d002c: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) /* f0d0030: 45020019 */ bc1fl .L0f0d0098 /* f0d0034: 4600103c */ c.lt.s $f2,$f0 -/* f0d0038: 8dada244 */ lw $t5,-0x5dbc($t5) +/* f0d0038: 8dada244 */ lw $t5,%lo(g_Vars+0x284)($t5) /* f0d003c: 8da20480 */ lw $v0,0x480($t5) /* f0d0040: c4420064 */ lwc1 $f2,0x64($v0) /* f0d0044: 4602603e */ c.le.s $f12,$f2 @@ -1104,7 +1104,7 @@ glabel var7f1ada94 .L0f0d0060: /* f0d0060: e4440064 */ swc1 $f4,0x64($v0) .L0f0d0064: -/* f0d0064: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0d0064: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0d0068: 8dc20480 */ lw $v0,0x480($t6) /* f0d006c: c4460064 */ lwc1 $f6,0x64($v0) /* f0d0070: 46067381 */ sub.s $f14,$f14,$f6 @@ -1118,11 +1118,11 @@ glabel var7f1ada94 /* f0d0090: e44a0064 */ swc1 $f10,0x64($v0) /* f0d0094: 4600103c */ c.lt.s $f2,$f0 .L0f0d0098: -/* f0d0098: 3c0f800a */ lui $t7,0x800a -/* f0d009c: 3c18800a */ lui $t8,0x800a +/* f0d0098: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) +/* f0d009c: 3c18800a */ lui $t8,%hi(g_Vars+0x284) /* f0d00a0: 45000017 */ bc1f .L0f0d0100 /* f0d00a4: 00000000 */ sll $zero,$zero,0x0 -/* f0d00a8: 8defa244 */ lw $t7,-0x5dbc($t7) +/* f0d00a8: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) /* f0d00ac: 8de20480 */ lw $v0,0x480($t7) /* f0d00b0: c4420064 */ lwc1 $f2,0x64($v0) /* f0d00b4: 4602603e */ c.le.s $f12,$f2 @@ -1135,7 +1135,7 @@ glabel var7f1ada94 .L0f0d00d0: /* f0d00d0: e4480064 */ swc1 $f8,0x64($v0) .L0f0d00d4: -/* f0d00d4: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f0d00d4: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f0d00d8: 8f020480 */ lw $v0,0x480($t8) /* f0d00dc: c4440064 */ lwc1 $f4,0x64($v0) /* f0d00e0: 46047380 */ add.s $f14,$f14,$f4 @@ -1147,7 +1147,7 @@ glabel var7f1ada94 /* f0d00f8: 46000386 */ mov.s $f14,$f0 /* f0d00fc: e4460064 */ swc1 $f6,0x64($v0) .L0f0d0100: -/* f0d0100: 8f39a244 */ lw $t9,-0x5dbc($t9) +/* f0d0100: 8f39a244 */ lw $t9,%lo(g_Vars+0x284)($t9) /* f0d0104: 3c018007 */ lui $at,0x8007 /* f0d0108: c42a0ed4 */ lwc1 $f10,0xed4($at) /* f0d010c: 8f280480 */ lw $t0,0x480($t9) @@ -1172,17 +1172,17 @@ glabel var7f1ada94 /* f0d0154: 10000007 */ beqz $zero,.L0f0d0174 /* f0d0158: e48e00b4 */ swc1 $f14,0xb4($a0) .L0f0d015c: -/* f0d015c: 3c09800a */ lui $t1,0x800a -/* f0d0160: 8d29a244 */ lw $t1,-0x5dbc($t1) +/* f0d015c: 3c09800a */ lui $t1,%hi(g_Vars+0x284) +/* f0d0160: 8d29a244 */ lw $t1,%lo(g_Vars+0x284)($t1) /* f0d0164: 44802000 */ mtc1 $zero,$f4 /* f0d0168: 8d2a0480 */ lw $t2,0x480($t1) /* f0d016c: e5440064 */ swc1 $f4,0x64($t2) /* f0d0170: 8fa40088 */ lw $a0,0x88($sp) .L0f0d0174: -/* f0d0174: 3c0b800a */ lui $t3,0x800a -/* f0d0178: 8d6ba244 */ lw $t3,-0x5dbc($t3) +/* f0d0174: 3c0b800a */ lui $t3,%hi(g_Vars+0x284) +/* f0d0178: 8d6ba244 */ lw $t3,%lo(g_Vars+0x284)($t3) /* f0d017c: 3c017f1b */ lui $at,%hi(var7f1ada94) -/* f0d0180: 3c0d800a */ lui $t5,0x800a +/* f0d0180: 3c0d800a */ lui $t5,%hi(g_Vars+0x284) /* f0d0184: 8d6c0480 */ lw $t4,0x480($t3) /* f0d0188: 44804000 */ mtc1 $zero,$f8 /* f0d018c: e592005c */ swc1 $f18,0x5c($t4) @@ -1191,7 +1191,7 @@ glabel var7f1ada94 /* f0d0198: c426da94 */ lwc1 $f6,%lo(var7f1ada94)($at) /* f0d019c: 46061282 */ mul.s $f10,$f2,$f6 /* f0d01a0: e48a00b0 */ swc1 $f10,0xb0($a0) -/* f0d01a4: 8dada244 */ lw $t5,-0x5dbc($t5) +/* f0d01a4: 8dada244 */ lw $t5,%lo(g_Vars+0x284)($t5) /* f0d01a8: 8da20480 */ lw $v0,0x480($t5) /* f0d01ac: c44c0044 */ lwc1 $f12,0x44($v0) /* f0d01b0: 460c4032 */ c.eq.s $f8,$f12 @@ -1228,8 +1228,8 @@ glabel var7f1ada94 /* f0d0220: 8fa30030 */ lw $v1,0x30($sp) /* f0d0224: 10400006 */ beqz $v0,.L0f0d0240 /* f0d0228: c7a00034 */ lwc1 $f0,0x34($sp) -/* f0d022c: 3c0e800a */ lui $t6,0x800a -/* f0d0230: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0d022c: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0d0230: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0d0234: 8dcf0480 */ lw $t7,0x480($t6) /* f0d0238: 10000004 */ beqz $zero,.L0f0d024c /* f0d023c: e5e00060 */ swc1 $f0,0x60($t7) @@ -1239,8 +1239,8 @@ glabel var7f1ada94 /* f0d0248: a3b80073 */ sb $t8,0x73($sp) .L0f0d024c: /* f0d024c: 10600009 */ beqz $v1,.L0f0d0274 -/* f0d0250: 3c19800a */ lui $t9,0x800a -/* f0d0254: 8f39a244 */ lw $t9,-0x5dbc($t9) +/* f0d0250: 3c19800a */ lui $t9,%hi(g_Vars+0x284) +/* f0d0254: 8f39a244 */ lw $t9,%lo(g_Vars+0x284)($t9) /* f0d0258: 3c013e80 */ lui $at,0x3e80 /* f0d025c: 44815000 */ mtc1 $at,$f10 /* f0d0260: 8f220480 */ lw $v0,0x480($t9) @@ -1262,9 +1262,9 @@ glabel var7f1ada94 /* f0d0298: 00000000 */ sll $zero,$zero,0x0 /* f0d029c: 8fa2009c */ lw $v0,0x9c($sp) /* f0d02a0: c7a6007c */ lwc1 $f6,0x7c($sp) -/* f0d02a4: 3c0a800a */ lui $t2,0x800a +/* f0d02a4: 3c0a800a */ lui $t2,%hi(g_Vars+0x284) /* f0d02a8: c4440008 */ lwc1 $f4,0x8($v0) -/* f0d02ac: 8d4aa244 */ lw $t2,-0x5dbc($t2) +/* f0d02ac: 8d4aa244 */ lw $t2,%lo(g_Vars+0x284)($t2) /* f0d02b0: 46062281 */ sub.s $f10,$f4,$f6 /* f0d02b4: c7a40080 */ lwc1 $f4,0x80($sp) /* f0d02b8: e7aa0090 */ swc1 $f10,0x90($sp) @@ -3047,14 +3047,14 @@ glabel var7f1adb00 /* f0d1bf8: 8dc30480 */ lw $v1,0x480($t6) /* f0d1bfc: 3c01bf80 */ lui $at,0xbf80 /* f0d1c00: 44812000 */ mtc1 $at,$f4 -/* f0d1c04: 3c048009 */ lui $a0,%hi(var80090008) +/* f0d1c04: 3c048009 */ lui $a0,%hi(var80095200) /* f0d1c08: 240fffff */ addiu $t7,$zero,-1 /* f0d1c0c: 2419ffff */ addiu $t9,$zero,-1 /* f0d1c10: 2418ffff */ addiu $t8,$zero,-1 /* f0d1c14: afb8001c */ sw $t8,0x1c($sp) /* f0d1c18: afb90018 */ sw $t9,0x18($sp) /* f0d1c1c: afaf0010 */ sw $t7,0x10($sp) -/* f0d1c20: 8c845200 */ lw $a0,0x5200($a0) +/* f0d1c20: 8c845200 */ lw $a0,%lo(var80095200)($a0) /* f0d1c24: 240500f2 */ addiu $a1,$zero,0xf2 /* f0d1c28: 00003025 */ or $a2,$zero,$zero /* f0d1c2c: 2407ffff */ addiu $a3,$zero,-1 @@ -3303,7 +3303,7 @@ glabel var7f1adb00 /* f0d1fb4: 24050001 */ addiu $a1,$zero,0x1 /* f0d1fb8: 8f04001c */ lw $a0,0x1c($t8) /* f0d1fbc: 0fc22af5 */ jal func0f08abd4 -/* f0d1fc0: 24840008 */ addiu $a0,$a0,%lo(var80090008) +/* f0d1fc0: 24840008 */ addiu $a0,$a0,8 /* f0d1fc4: 8fbf002c */ lw $ra,0x2c($sp) .L0f0d1fc8: /* f0d1fc8: 27bd00e8 */ addiu $sp,$sp,0xe8 diff --git a/src/game/bondgrab.c b/src/game/bondgrab.c index 52e34b8f5..45f716d34 100644 --- a/src/game/bondgrab.c +++ b/src/game/bondgrab.c @@ -396,12 +396,12 @@ glabel var7f1ad990 /* f0ccf2c: afa00010 */ sw $zero,0x10($sp) /* f0ccf30: 44809000 */ mtc1 $zero,$f18 /* f0ccf34: c7aa00e4 */ lwc1 $f10,0xe4($sp) -/* f0ccf38: 3c08800a */ lui $t0,0x800a +/* f0ccf38: 3c08800a */ lui $t0,%hi(g_Vars+0x284) /* f0ccf3c: 46125032 */ c.eq.s $f10,$f18 /* f0ccf40: 00000000 */ sll $zero,$zero,0x0 /* f0ccf44: 45030042 */ bc1tl .L0f0cd050 /* f0ccf48: 8fbf001c */ lw $ra,0x1c($sp) -/* f0ccf4c: 8d08a244 */ lw $t0,-0x5dbc($t0) +/* f0ccf4c: 8d08a244 */ lw $t0,%lo(g_Vars+0x284)($t0) /* f0ccf50: c7a4008c */ lwc1 $f4,0x8c($sp) /* f0ccf54: c7a80094 */ lwc1 $f8,0x94($sp) /* f0ccf58: 8d0200bc */ lw $v0,0xbc($t0) @@ -661,9 +661,9 @@ glabel var7f1ad9c4 /* f0cd384: 50410006 */ beql $v0,$at,.L0f0cd3a0 /* f0cd388: 8e0c0284 */ lw $t4,0x284($s0) /* f0cd38c: 8e0a0284 */ lw $t2,0x284($s0) -/* f0cd390: 3c01800a */ lui $at,0x800a +/* f0cd390: 3c01800a */ lui $at,%hi(var8009de70) /* f0cd394: 8d4b00bc */ lw $t3,0xbc($t2) -/* f0cd398: ac2bde70 */ sw $t3,-0x2190($at) +/* f0cd398: ac2bde70 */ sw $t3,%lo(var8009de70)($at) /* f0cd39c: 8e0c0284 */ lw $t4,0x284($s0) .L0f0cd3a0: /* f0cd3a0: 24050001 */ addiu $a1,$zero,0x1 @@ -953,10 +953,10 @@ glabel var7f1ad9c4 /* f0cd7cc: 10410006 */ beq $v0,$at,.L0f0cd7e8 /* f0cd7d0: e7b600b8 */ swc1 $f22,0xb8($sp) /* f0cd7d4: 8e090284 */ lw $t1,0x284($s0) -/* f0cd7d8: 3c01800a */ lui $at,0x800a +/* f0cd7d8: 3c01800a */ lui $at,%hi(var8009de70) /* f0cd7dc: 8d2a1b5c */ lw $t2,0x1b5c($t1) /* f0cd7e0: e7b600b8 */ swc1 $f22,0xb8($sp) -/* f0cd7e4: ac2ade70 */ sw $t2,-0x2190($at) +/* f0cd7e4: ac2ade70 */ sw $t2,%lo(var8009de70)($at) .L0f0cd7e8: /* f0cd7e8: 8e0b0284 */ lw $t3,0x284($s0) .L0f0cd7ec: @@ -973,8 +973,8 @@ glabel var7f1ad9c4 /* f0cd814: 55810050 */ bnel $t4,$at,.L0f0cd958 /* f0cd818: 8fbf003c */ lw $ra,0x3c($sp) /* f0cd81c: 8fad00f8 */ lw $t5,0xf8($sp) -/* f0cd820: 3c01800a */ lui $at,0x800a -/* f0cd824: ac20de70 */ sw $zero,-0x2190($at) +/* f0cd820: 3c01800a */ lui $at,%hi(var8009de70) +/* f0cd824: ac20de70 */ sw $zero,%lo(var8009de70)($at) /* f0cd828: 11a0004a */ beqz $t5,.L0f0cd954 /* f0cd82c: c7a800f4 */ lwc1 $f8,0xf4($sp) /* f0cd830: 46104102 */ mul.s $f4,$f8,$f16 @@ -1184,7 +1184,7 @@ glabel func0f0cdb04 /* f0cdb10: 25ce0e9c */ addiu $t6,$t6,%lo(var80070e9c) /* f0cdb14: 8dc10000 */ lw $at,0x0($t6) /* f0cdb18: 27a4001c */ addiu $a0,$sp,0x1c -/* f0cdb1c: 3c09800a */ lui $t1,0x800a +/* f0cdb1c: 3c09800a */ lui $t1,%hi(g_Vars+0x284) /* f0cdb20: ac810000 */ sw $at,0x0($a0) /* f0cdb24: 8dd90004 */ lw $t9,0x4($t6) /* f0cdb28: 00a03025 */ or $a2,$a1,$zero @@ -1193,11 +1193,11 @@ glabel func0f0cdb04 /* f0cdb34: 8dc10008 */ lw $at,0x8($t6) /* f0cdb38: 44056000 */ mfc1 $a1,$f12 /* f0cdb3c: ac810008 */ sw $at,0x8($a0) -/* f0cdb40: 8d29a244 */ lw $t1,-0x5dbc($t1) +/* f0cdb40: 8d29a244 */ lw $t1,%lo(g_Vars+0x284)($t1) /* f0cdb44: 0fc3365c */ jal func0f0cd970 /* f0cdb48: ad281a1c */ sw $t0,0x1a1c($t1) -/* f0cdb4c: 3c0a800a */ lui $t2,0x800a -/* f0cdb50: 8d4aa244 */ lw $t2,-0x5dbc($t2) +/* f0cdb4c: 3c0a800a */ lui $t2,%hi(g_Vars+0x284) +/* f0cdb50: 8d4aa244 */ lw $t2,%lo(g_Vars+0x284)($t2) /* f0cdb54: ad401a1c */ sw $zero,0x1a1c($t2) /* f0cdb58: 8fbf0014 */ lw $ra,0x14($sp) /* f0cdb5c: 27bd0028 */ addiu $sp,$sp,0x28 @@ -1263,8 +1263,8 @@ glabel var7f1ad9c8 /* f0cdc28: 460c1082 */ mul.s $f2,$f2,$f12 /* f0cdc2c: 00000000 */ sll $zero,$zero,0x0 .L0f0cdc30: -/* f0cdc30: 3c0e800a */ lui $t6,0x800a -/* f0cdc34: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0cdc30: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0cdc34: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0cdc38: c7a800ac */ lwc1 $f8,0xac($sp) /* f0cdc3c: 46008007 */ neg.s $f0,$f16 /* f0cdc40: 8dc200bc */ lw $v0,0xbc($t6) @@ -1293,8 +1293,8 @@ glabel var7f1ad9c8 /* f0cdc98: c7b200ac */ lwc1 $f18,0xac($sp) /* f0cdc9c: 11e00020 */ beqz $t7,.L0f0cdd20 /* f0cdca0: 00000000 */ sll $zero,$zero,0x0 -/* f0cdca4: 3c04800a */ lui $a0,0x800a -/* f0cdca8: 9084a919 */ lbu $a0,-0x56e7($a0) +/* f0cdca4: 3c04800a */ lui $a0,%hi(var8009a918+0x1) +/* f0cdca8: 9084a919 */ lbu $a0,%lo(var8009a918+0x1)($a0) /* f0cdcac: 3c18800a */ lui $t8,%hi(var8009a918) /* f0cdcb0: 2702a918 */ addiu $v0,$t8,%lo(var8009a918) /* f0cdcb4: 18800061 */ blez $a0,.L0f0cde3c @@ -1362,10 +1362,10 @@ glabel var7f1ad9c8 .L0f0cdd9c: /* f0cdd9c: 3c088007 */ lui $t0,%hi(var80070e80) /* f0cdda0: 8d080e80 */ lw $t0,%lo(var80070e80)($t0) -/* f0cdda4: 3c09800a */ lui $t1,0x800a +/* f0cdda4: 3c09800a */ lui $t1,%hi(g_Vars+0x284) /* f0cdda8: 51000025 */ beqzl $t0,.L0f0cde40 /* f0cddac: c7ac00b0 */ lwc1 $f12,0xb0($sp) -/* f0cddb0: 8d29a244 */ lw $t1,-0x5dbc($t1) +/* f0cddb0: 8d29a244 */ lw $t1,%lo(g_Vars+0x284)($t1) /* f0cddb4: 24010001 */ addiu $at,$zero,0x1 /* f0cddb8: 8d241b5c */ lw $a0,0x1b5c($t1) /* f0cddbc: 908a0000 */ lbu $t2,0x0($a0) @@ -1727,8 +1727,8 @@ glabel func0f0ce4a0 /* f0ce4e8: 4500001a */ bc1f .L0f0ce554 /* f0ce4ec: 00000000 */ sll $zero,$zero,0x0 /* f0ce4f0: e44c016c */ swc1 $f12,0x16c($v0) -/* f0ce4f4: 3c02800a */ lui $v0,0x800a -/* f0ce4f8: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0ce4f4: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0ce4f8: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0ce4fc: 10000015 */ beqz $zero,.L0f0ce554 /* f0ce500: c440016c */ lwc1 $f0,0x16c($v0) /* f0ce504: 460c003c */ c.lt.s $f0,$f12 @@ -1749,8 +1749,8 @@ glabel func0f0ce4a0 /* f0ce53c: 45000005 */ bc1f .L0f0ce554 /* f0ce540: 00000000 */ sll $zero,$zero,0x0 /* f0ce544: e44c016c */ swc1 $f12,0x16c($v0) -/* f0ce548: 3c02800a */ lui $v0,0x800a -/* f0ce54c: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0ce548: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0ce54c: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0ce550: c440016c */ lwc1 $f0,0x16c($v0) .L0f0ce554: /* f0ce554: 03e00008 */ jr $ra @@ -1830,13 +1830,13 @@ glabel var7f1ada0c /* f0ce668: 8e020014 */ lw $v0,0x14($s0) .L0f0ce66c: /* f0ce66c: 3c017f1b */ lui $at,%hi(var7f1ad9ec) -/* f0ce670: 3c06800a */ lui $a2,0x800a +/* f0ce670: 3c06800a */ lui $a2,%hi(g_Vars+0x38) /* f0ce674: 14400006 */ bnez $v0,.L0f0ce690 /* f0ce678: 00000000 */ sll $zero,$zero,0x0 /* f0ce67c: 44806000 */ mtc1 $zero,$f12 /* f0ce680: c42ed9ec */ lwc1 $f14,%lo(var7f1ad9ec)($at) /* f0ce684: 0fc33928 */ jal func0f0ce4a0 -/* f0ce688: 8cc69ff8 */ lw $a2,-0x6008($a2) +/* f0ce688: 8cc69ff8 */ lw $a2,%lo(g_Vars+0x38)($a2) /* f0ce68c: 8e020014 */ lw $v0,0x14($s0) .L0f0ce690: /* f0ce690: 5040000e */ beqzl $v0,.L0f0ce6cc @@ -1846,9 +1846,9 @@ glabel var7f1ada0c /* f0ce6a0: c428d9f0 */ lwc1 $f8,%lo(var7f1ad9f0)($at) /* f0ce6a4: 448e2000 */ mtc1 $t6,$f4 /* f0ce6a8: 3c017f1b */ lui $at,%hi(var7f1ad9f4) -/* f0ce6ac: 3c06800a */ lui $a2,0x800a +/* f0ce6ac: 3c06800a */ lui $a2,%hi(g_Vars+0x38) /* f0ce6b0: 468021a0 */ cvt.s.w $f6,$f4 -/* f0ce6b4: 8cc69ff8 */ lw $a2,-0x6008($a2) +/* f0ce6b4: 8cc69ff8 */ lw $a2,%lo(g_Vars+0x38)($a2) /* f0ce6b8: c42ed9f4 */ lwc1 $f14,%lo(var7f1ad9f4)($at) /* f0ce6bc: 46083302 */ mul.s $f12,$f6,$f8 /* f0ce6c0: 0fc33928 */ jal func0f0ce4a0 @@ -1905,14 +1905,14 @@ glabel var7f1ada0c /* f0ce77c: 0fc33957 */ jal currentPlayerUpdateSpeedForwardsGrab /* f0ce780: 00000000 */ sll $zero,$zero,0x0 /* f0ce784: 8e0b00a8 */ lw $t3,0xa8($s0) -/* f0ce788: 3c02800a */ lui $v0,0x800a -/* f0ce78c: 3c0f800a */ lui $t7,0x800a +/* f0ce788: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0ce78c: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) /* f0ce790: 2961003d */ slti $at,$t3,0x3d /* f0ce794: 1420000a */ bnez $at,.L0f0ce7c0 /* f0ce798: 00000000 */ sll $zero,$zero,0x0 -/* f0ce79c: 8c42a244 */ lw $v0,-0x5dbc($v0) -/* f0ce7a0: 3c0d800a */ lui $t5,0x800a -/* f0ce7a4: 8dad9ff8 */ lw $t5,-0x6008($t5) +/* f0ce79c: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) +/* f0ce7a0: 3c0d800a */ lui $t5,%hi(g_Vars+0x38) +/* f0ce7a4: 8dad9ff8 */ lw $t5,%lo(g_Vars+0x38)($t5) /* f0ce7a8: 8c4c0178 */ lw $t4,0x178($v0) /* f0ce7ac: 3c04800a */ lui $a0,%hi(g_Vars) /* f0ce7b0: 24849fc0 */ addiu $a0,$a0,%lo(g_Vars) @@ -1920,7 +1920,7 @@ glabel var7f1ada0c /* f0ce7b8: 10000005 */ beqz $zero,.L0f0ce7d0 /* f0ce7bc: ac4e0178 */ sw $t6,0x178($v0) .L0f0ce7c0: -/* f0ce7c0: 8defa244 */ lw $t7,-0x5dbc($t7) +/* f0ce7c0: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) /* f0ce7c4: 3c04800a */ lui $a0,%hi(g_Vars) /* f0ce7c8: 24849fc0 */ addiu $a0,$a0,%lo(g_Vars) /* f0ce7cc: ade00178 */ sw $zero,0x178($t7) @@ -2421,8 +2421,8 @@ glabel var7f1ada30 /* f0ceef0: 00000000 */ sll $zero,$zero,0x0 /* f0ceef4: 0fc3386b */ jal func0f0ce1ac /* f0ceef8: 00000000 */ sll $zero,$zero,0x0 -/* f0ceefc: 3c10800a */ lui $s0,0x800a -/* f0cef00: 8e10a244 */ lw $s0,-0x5dbc($s0) +/* f0ceefc: 3c10800a */ lui $s0,%hi(g_Vars+0x284) +/* f0cef00: 8e10a244 */ lw $s0,%lo(g_Vars+0x284)($s0) /* f0cef04: 2405ffff */ addiu $a1,$zero,-1 /* f0cef08: 8e0600bc */ lw $a2,0xbc($s0) /* f0cef0c: 84ce0028 */ lh $t6,0x28($a2) @@ -2475,18 +2475,18 @@ glabel var7f1ada30 /* f0cefb0: 00000000 */ sll $zero,$zero,0x0 /* f0cefb4: 0fc1c52e */ jal func0f0714b8 /* f0cefb8: 00000000 */ sll $zero,$zero,0x0 -/* f0cefbc: 3c10800a */ lui $s0,0x800a -/* f0cefc0: 8e10a244 */ lw $s0,-0x5dbc($s0) +/* f0cefbc: 3c10800a */ lui $s0,%hi(g_Vars+0x284) +/* f0cefc0: 8e10a244 */ lw $s0,%lo(g_Vars+0x284)($s0) .L0f0cefc4: /* f0cefc4: 0fc32e31 */ jal func0f0cb8c4 /* f0cefc8: 02002025 */ or $a0,$s0,$zero -/* f0cefcc: 3c0a800a */ lui $t2,0x800a -/* f0cefd0: 8d4aa244 */ lw $t2,-0x5dbc($t2) +/* f0cefcc: 3c0a800a */ lui $t2,%hi(g_Vars+0x284) +/* f0cefd0: 8d4aa244 */ lw $t2,%lo(g_Vars+0x284)($t2) /* f0cefd4: 8d4b00bc */ lw $t3,0xbc($t2) /* f0cefd8: 0fc257d8 */ jal objectiveCheckRoomEntered /* f0cefdc: 85640028 */ lh $a0,0x28($t3) -/* f0cefe0: 3c0c800a */ lui $t4,0x800a -/* f0cefe4: 8d8ca244 */ lw $t4,-0x5dbc($t4) +/* f0cefe0: 3c0c800a */ lui $t4,%hi(g_Vars+0x284) +/* f0cefe4: 8d8ca244 */ lw $t4,%lo(g_Vars+0x284)($t4) /* f0cefe8: 8d8400bc */ lw $a0,0xbc($t4) /* f0cefec: 0fc33067 */ jal func0f0cc19c /* f0ceff0: 24840008 */ addiu $a0,$a0,0x8 @@ -2494,15 +2494,15 @@ glabel var7f1ada30 /* f0ceff8: 00000000 */ sll $zero,$zero,0x0 /* f0ceffc: 0fc23064 */ jal func0f08c190 /* f0cf000: 00000000 */ sll $zero,$zero,0x0 -/* f0cf004: 3c0d800a */ lui $t5,0x800a -/* f0cf008: 8dada244 */ lw $t5,-0x5dbc($t5) +/* f0cf004: 3c0d800a */ lui $t5,%hi(g_Vars+0x284) +/* f0cf008: 8dada244 */ lw $t5,%lo(g_Vars+0x284)($t5) /* f0cf00c: 8da21b5c */ lw $v0,0x1b5c($t5) /* f0cf010: 50400048 */ beqzl $v0,.L0f0cf134 /* f0cf014: 8fbf0024 */ lw $ra,0x24($sp) /* f0cf018: 0fc1c4d8 */ jal func0f071360 /* f0cf01c: 8c440004 */ lw $a0,0x4($v0) -/* f0cf020: 3c10800a */ lui $s0,0x800a -/* f0cf024: 8e10a244 */ lw $s0,-0x5dbc($s0) +/* f0cf020: 3c10800a */ lui $s0,%hi(g_Vars+0x284) +/* f0cf024: 8e10a244 */ lw $s0,%lo(g_Vars+0x284)($s0) /* f0cf028: 00002825 */ or $a1,$zero,$zero /* f0cf02c: 8e021b5c */ lw $v0,0x1b5c($s0) /* f0cf030: c6080074 */ lwc1 $f8,0x74($s0) @@ -2516,8 +2516,8 @@ glabel var7f1ada30 /* f0cf050: 8fa4002c */ lw $a0,0x2c($sp) /* f0cf054: 0fc1905e */ jal func0f064178 /* f0cf058: 00002825 */ or $a1,$zero,$zero -/* f0cf05c: 3c10800a */ lui $s0,0x800a -/* f0cf060: 8e10a244 */ lw $s0,-0x5dbc($s0) +/* f0cf05c: 3c10800a */ lui $s0,%hi(g_Vars+0x284) +/* f0cf060: 8e10a244 */ lw $s0,%lo(g_Vars+0x284)($s0) /* f0cf064: 3c017f1b */ lui $at,%hi(var7f1ada30) /* f0cf068: c430da30 */ lwc1 $f16,%lo(var7f1ada30)($at) /* f0cf06c: c6000078 */ lwc1 $f0,0x78($s0) @@ -2563,8 +2563,8 @@ glabel var7f1ada30 /* f0cf108: 0fc31f4c */ jal currentPlayerSetMoveMode /* f0cf10c: 00002025 */ or $a0,$zero,$zero .L0f0cf110: -/* f0cf110: 3c18800a */ lui $t8,0x800a -/* f0cf114: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f0cf110: 3c18800a */ lui $t8,%hi(g_Vars+0x284) +/* f0cf114: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f0cf118: 24050001 */ addiu $a1,$zero,0x1 /* f0cf11c: 0fc1905e */ jal func0f064178 /* f0cf120: 8f0400bc */ lw $a0,0xbc($t8) diff --git a/src/game/bondmove.c b/src/game/bondmove.c index 6b9ed2338..36af47f27 100644 --- a/src/game/bondmove.c +++ b/src/game/bondmove.c @@ -46,20 +46,20 @@ const char var7f1ad860[] = "bondmove.c"; GLOBAL_ASM( glabel func0f0c79f0 -/* f0c79f0: 3c0e800a */ lui $t6,0x800a -/* f0c79f4: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0c79f0: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0c79f4: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0c79f8: 03e00008 */ jr $ra /* f0c79fc: adc40334 */ sw $a0,0x334($t6) ); GLOBAL_ASM( glabel func0f0c7a00 -/* f0c7a00: 3c0e800a */ lui $t6,0x800a -/* f0c7a04: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0c7a00: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0c7a04: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0c7a08: 03e00008 */ jr $ra /* f0c7a0c: adc40114 */ sw $a0,0x114($t6) -/* f0c7a10: 3c0e800a */ lui $t6,0x800a -/* f0c7a14: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0c7a10: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0c7a14: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0c7a18: 03e00008 */ jr $ra /* f0c7a1c: 8dc20114 */ lw $v0,0x114($t6) ); @@ -424,8 +424,8 @@ glabel var7f1ad8b4 /* f0c85a4: afb00038 */ sw $s0,0x38($sp) /* f0c85a8: 3c0143c8 */ lui $at,0x43c8 /* f0c85ac: 44812000 */ mtc1 $at,$f4 -/* f0c85b0: 3c10800a */ lui $s0,%hi(var800a0004) -/* f0c85b4: 8e10a244 */ lw $s0,-0x5dbc($s0) +/* f0c85b0: 3c10800a */ lui $s0,%hi(g_Vars+0x284) +/* f0c85b4: 8e10a244 */ lw $s0,%lo(g_Vars+0x284)($s0) /* f0c85b8: afbf0054 */ sw $ra,0x54($sp) /* f0c85bc: afb60050 */ sw $s6,0x50($sp) /* f0c85c0: afb5004c */ sw $s5,0x4c($sp) @@ -451,8 +451,8 @@ glabel var7f1ad8b4 /* f0c860c: 27a6014c */ addiu $a2,$sp,0x14c /* f0c8610: 0fc3082e */ jal propPlayerGetBbox /* f0c8614: 27a70148 */ addiu $a3,$sp,0x148 -/* f0c8618: 3c10800a */ lui $s0,%hi(var800a0004) -/* f0c861c: 8e10a244 */ lw $s0,-0x5dbc($s0) +/* f0c8618: 3c10800a */ lui $s0,%hi(g_Vars+0x284) +/* f0c861c: 8e10a244 */ lw $s0,%lo(g_Vars+0x284)($s0) /* f0c8620: 3c0141f0 */ lui $at,0x41f0 /* f0c8624: 44812000 */ mtc1 $at,$f4 /* f0c8628: c606036c */ lwc1 $f6,0x36c($s0) @@ -614,12 +614,12 @@ glabel var7f1ad8b4 /* f0c888c: 4502002d */ bc1fl .L0f0c8944 /* f0c8890: 2a410005 */ slti $at,$s2,0x5 /* f0c8894: 44813000 */ mtc1 $at,$f6 -/* f0c8898: 3c0e800a */ lui $t6,0x800a +/* f0c8898: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) /* f0c889c: 4600303c */ c.lt.s $f6,$f0 /* f0c88a0: 00000000 */ sll $zero,$zero,0x0 /* f0c88a4: 45020027 */ bc1fl .L0f0c8944 /* f0c88a8: 2a410005 */ slti $at,$s2,0x5 -/* f0c88ac: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0c88ac: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0c88b0: 4600a386 */ mov.s $f14,$f20 /* f0c88b4: c5c80078 */ lwc1 $f8,0x78($t6) /* f0c88b8: 0fc259d4 */ jal func0f096750 @@ -663,7 +663,7 @@ glabel var7f1ad8b4 /* f0c8944: 02404025 */ or $t0,$s2,$zero /* f0c8948: 26310004 */ addiu $s1,$s1,0x4 /* f0c894c: 1420ff91 */ bnez $at,.L0f0c8794 -/* f0c8950: 26100004 */ addiu $s0,$s0,%lo(var800a0004) +/* f0c8950: 26100004 */ addiu $s0,$s0,4 /* f0c8954: 26c9ffff */ addiu $t1,$s6,-1 /* f0c8958: 1920002f */ blez $t1,.L0f0c8a18 /* f0c895c: 00004025 */ or $t0,$zero,$zero @@ -726,7 +726,7 @@ glabel var7f1ad8b4 /* f0c8a20: 27a2012c */ addiu $v0,$sp,0x12c .L0f0c8a24: /* f0c8a24: 8e0f0000 */ lw $t7,0x0($s0) -/* f0c8a28: 26100004 */ addiu $s0,$s0,%lo(var800a0004) +/* f0c8a28: 26100004 */ addiu $s0,$s0,4 /* f0c8a2c: 11e00004 */ beqz $t7,.L0f0c8a40 /* f0c8a30: 03b1c021 */ addu $t8,$sp,$s1 /* f0c8a34: c702012c */ lwc1 $f2,0x12c($t8) @@ -794,7 +794,7 @@ glabel func0f0c8aa8 /* f0c8b0c: ac800078 */ sw $zero,0x78($a0) /* f0c8b10: ac80007c */ sw $zero,0x7c($a0) /* f0c8b14: ac800080 */ sw $zero,0x80($a0) -/* f0c8b18: 3c0e800a */ lui $t6,0x800a +/* f0c8b18: 3c0e800a */ lui $t6,%hi(g_Vars+0x288) /* f0c8b1c: e4800030 */ swc1 $f0,0x30($a0) /* f0c8b20: e4800034 */ swc1 $f0,0x34($a0) /* f0c8b24: e4800038 */ swc1 $f0,0x38($a0) @@ -803,7 +803,7 @@ glabel func0f0c8aa8 /* f0c8b30: e4800044 */ swc1 $f0,0x44($a0) /* f0c8b34: e480005c */ swc1 $f0,0x5c($a0) /* f0c8b38: e4800060 */ swc1 $f0,0x60($a0) -/* f0c8b3c: 8dcea248 */ lw $t6,-0x5db8($t6) +/* f0c8b3c: 8dcea248 */ lw $t6,%lo(g_Vars+0x288)($t6) /* f0c8b40: 00802825 */ or $a1,$a0,$zero /* f0c8b44: 8dc40070 */ lw $a0,0x70($t6) /* f0c8b48: 0fc549e0 */ jal optionsGetForwardPitch @@ -1074,8 +1074,8 @@ glabel var7f1ad8e4 /* f0c8ea0: 97b801a0 */ lhu $t8,0x1a0($sp) /* f0c8ea4: 33191000 */ andi $t9,$t8,0x1000 /* f0c8ea8: 13200012 */ beqz $t9,.L0f0c8ef4 -/* f0c8eac: 3c08800b */ lui $t0,0x800b -/* f0c8eb0: 9108cba6 */ lbu $t0,-0x345a($t0) +/* f0c8eac: 3c08800b */ lui $t0,%hi(g_MpSetup+0x1e) +/* f0c8eb0: 9108cba6 */ lbu $t0,%lo(g_MpSetup+0x1e)($t0) /* f0c8eb4: 24010002 */ addiu $at,$zero,0x2 /* f0c8eb8: 5101000f */ beql $t0,$at,.L0f0c8ef8 /* f0c8ebc: 8e450284 */ lw $a1,0x284($s2) @@ -3878,8 +3878,8 @@ glabel var7f1ad8e4 /* f0cb630: 45020005 */ bc1fl .L0f0cb648 /* f0cb634: c4ac0138 */ lwc1 $f12,0x138($a1) /* f0cb638: e4a21b68 */ swc1 $f2,0x1b68($a1) -/* f0cb63c: 3c05800a */ lui $a1,0x800a -/* f0cb640: 8ca5a244 */ lw $a1,-0x5dbc($a1) +/* f0cb63c: 3c05800a */ lui $a1,%hi(g_Vars+0x284) +/* f0cb640: 8ca5a244 */ lw $a1,%lo(g_Vars+0x284)($a1) /* f0cb644: c4ac0138 */ lwc1 $f12,0x138($a1) .L0f0cb648: /* f0cb648: 12000008 */ beqz $s0,.L0f0cb66c @@ -3920,8 +3920,8 @@ glabel var7f1ad8e4 /* f0cb6c4: 45000004 */ bc1f .L0f0cb6d8 /* f0cb6c8: 00000000 */ sll $zero,$zero,0x0 /* f0cb6cc: e4a21b68 */ swc1 $f2,0x1b68($a1) -/* f0cb6d0: 3c05800a */ lui $a1,0x800a -/* f0cb6d4: 8ca5a244 */ lw $a1,-0x5dbc($a1) +/* f0cb6d0: 3c05800a */ lui $a1,%hi(g_Vars+0x284) +/* f0cb6d4: 8ca5a244 */ lw $a1,%lo(g_Vars+0x284)($a1) .L0f0cb6d8: /* f0cb6d8: c422d8d8 */ lwc1 $f2,%lo(var7f1ad8d8)($at) /* f0cb6dc: 3c017f1b */ lui $at,%hi(var7f1ad8dc) diff --git a/src/game/bondwalk.c b/src/game/bondwalk.c index ec5c39de2..74703e9f5 100644 --- a/src/game/bondwalk.c +++ b/src/game/bondwalk.c @@ -139,8 +139,8 @@ const char var7f1ad750[] = "bondwalk.c"; GLOBAL_ASM( glabel func0f0c3b38 /* f0c3b38: 27bdff90 */ addiu $sp,$sp,-112 -/* f0c3b3c: 3c02800a */ lui $v0,0x800a -/* f0c3b40: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0c3b3c: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0c3b40: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0c3b44: afbf001c */ sw $ra,0x1c($sp) /* f0c3b48: afa40070 */ sw $a0,0x70($sp) /* f0c3b4c: afa50074 */ sw $a1,0x74($sp) @@ -1073,8 +1073,8 @@ glabel func0f0c494c GLOBAL_ASM( glabel func0f0c4a5c /* f0c4a5c: 27bdffa0 */ addiu $sp,$sp,-96 -/* f0c4a60: 3c0e800a */ lui $t6,0x800a -/* f0c4a64: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0c4a60: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0c4a64: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0c4a68: afb20028 */ sw $s2,0x28($sp) /* f0c4a6c: afb10024 */ sw $s1,0x24($sp) /* f0c4a70: afb00020 */ sw $s0,0x20($sp) @@ -1088,8 +1088,8 @@ glabel func0f0c4a5c /* f0c4a90: 27a50038 */ addiu $a1,$sp,0x38 /* f0c4a94: 0fc3082e */ jal propPlayerGetBbox /* f0c4a98: 8dc400bc */ lw $a0,0xbc($t6) -/* f0c4a9c: 3c03800a */ lui $v1,0x800a -/* f0c4aa0: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f0c4a9c: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f0c4aa0: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f0c4aa4: c6240000 */ lwc1 $f4,0x0($s1) /* f0c4aa8: c60a0000 */ lwc1 $f10,0x0($s0) /* f0c4aac: 8c6f00bc */ lw $t7,0xbc($v1) @@ -2725,8 +2725,8 @@ glabel var7f1ad7f4 glabel var7f1ad7f8 .word 0x3f8a3d71 .text -/* f0c65c8: 3c0e800a */ lui $t6,0x800a -/* f0c65cc: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0c65c8: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0c65cc: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0c65d0: 27bdffe0 */ addiu $sp,$sp,-32 /* f0c65d4: afbf001c */ sw $ra,0x1c($sp) /* f0c65d8: afb00018 */ sw $s0,0x18($sp) @@ -2757,13 +2757,13 @@ glabel var7f1ad7f8 /* f0c6638: 8e020014 */ lw $v0,0x14($s0) .L0f0c663c: /* f0c663c: 3c017f1b */ lui $at,%hi(var7f1ad7e8) -/* f0c6640: 3c06800a */ lui $a2,0x800a +/* f0c6640: 3c06800a */ lui $a2,%hi(g_Vars+0x38) /* f0c6644: 14400006 */ bnez $v0,.L0f0c6660 /* f0c6648: 00000000 */ sll $zero,$zero,0x0 /* f0c664c: 44806000 */ mtc1 $zero,$f12 /* f0c6650: c42ed7e8 */ lwc1 $f14,%lo(var7f1ad7e8)($at) /* f0c6654: 0fc31368 */ jal currentPlayerUpdateSpeedSidewaysWalk -/* f0c6658: 8cc69ff8 */ lw $a2,-0x6008($a2) +/* f0c6658: 8cc69ff8 */ lw $a2,%lo(g_Vars+0x38)($a2) /* f0c665c: 8e020014 */ lw $v0,0x14($s0) .L0f0c6660: /* f0c6660: 5040000e */ beqzl $v0,.L0f0c669c @@ -2773,9 +2773,9 @@ glabel var7f1ad7f8 /* f0c6670: c428d7ec */ lwc1 $f8,%lo(var7f1ad7ec)($at) /* f0c6674: 44982000 */ mtc1 $t8,$f4 /* f0c6678: 3c017f1b */ lui $at,%hi(var7f1ad7f0) -/* f0c667c: 3c06800a */ lui $a2,0x800a +/* f0c667c: 3c06800a */ lui $a2,%hi(g_Vars+0x38) /* f0c6680: 468021a0 */ cvt.s.w $f6,$f4 -/* f0c6684: 8cc69ff8 */ lw $a2,-0x6008($a2) +/* f0c6684: 8cc69ff8 */ lw $a2,%lo(g_Vars+0x38)($a2) /* f0c6688: c42ed7f0 */ lwc1 $f14,%lo(var7f1ad7f0)($at) /* f0c668c: 46083302 */ mul.s $f12,$f6,$f8 /* f0c6690: 0fc31368 */ jal currentPlayerUpdateSpeedSidewaysWalk @@ -2787,10 +2787,10 @@ glabel var7f1ad7f8 /* f0c66a4: 44816000 */ mtc1 $at,$f12 /* f0c66a8: 0fc313b1 */ jal currentPlayerUpdateSpeedForwardsWalk /* f0c66ac: 46006386 */ mov.s $f14,$f12 -/* f0c66b0: 3c02800a */ lui $v0,0x800a -/* f0c66b4: 8c42a244 */ lw $v0,-0x5dbc($v0) -/* f0c66b8: 3c09800a */ lui $t1,0x800a -/* f0c66bc: 8d299ff8 */ lw $t1,-0x6008($t1) +/* f0c66b0: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0c66b4: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) +/* f0c66b8: 3c09800a */ lui $t1,%hi(g_Vars+0x38) +/* f0c66bc: 8d299ff8 */ lw $t1,%lo(g_Vars+0x38)($t1) /* f0c66c0: 8c480178 */ lw $t0,0x178($v0) /* f0c66c4: 01095021 */ addu $t2,$t0,$t1 /* f0c66c8: ac4a0178 */ sw $t2,0x178($v0) @@ -2832,24 +2832,24 @@ glabel var7f1ad7f8 /* f0c674c: 0fc313b1 */ jal currentPlayerUpdateSpeedForwardsWalk /* f0c6750: 00000000 */ sll $zero,$zero,0x0 /* f0c6754: 8e0d00a8 */ lw $t5,0xa8($s0) -/* f0c6758: 3c02800a */ lui $v0,0x800a -/* f0c675c: 3c19800a */ lui $t9,0x800a +/* f0c6758: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0c675c: 3c19800a */ lui $t9,%hi(g_Vars+0x284) /* f0c6760: 29a1003d */ slti $at,$t5,0x3d /* f0c6764: 14200008 */ bnez $at,.L0f0c6788 /* f0c6768: 00000000 */ sll $zero,$zero,0x0 -/* f0c676c: 8c42a244 */ lw $v0,-0x5dbc($v0) -/* f0c6770: 3c0f800a */ lui $t7,0x800a -/* f0c6774: 8def9ff8 */ lw $t7,-0x6008($t7) +/* f0c676c: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) +/* f0c6770: 3c0f800a */ lui $t7,%hi(g_Vars+0x38) +/* f0c6774: 8def9ff8 */ lw $t7,%lo(g_Vars+0x38)($t7) /* f0c6778: 8c4e0178 */ lw $t6,0x178($v0) /* f0c677c: 01cfc021 */ addu $t8,$t6,$t7 /* f0c6780: 10000003 */ beqz $zero,.L0f0c6790 /* f0c6784: ac580178 */ sw $t8,0x178($v0) .L0f0c6788: -/* f0c6788: 8f39a244 */ lw $t9,-0x5dbc($t9) +/* f0c6788: 8f39a244 */ lw $t9,%lo(g_Vars+0x284)($t9) /* f0c678c: af200178 */ sw $zero,0x178($t9) .L0f0c6790: -/* f0c6790: 3c02800a */ lui $v0,0x800a -/* f0c6794: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0c6790: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0c6794: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0c6798: 3c013f80 */ lui $at,0x3f80 /* f0c679c: 44811000 */ mtc1 $at,$f2 /* f0c67a0: c4400170 */ lwc1 $f0,0x170($v0) @@ -2860,8 +2860,8 @@ glabel var7f1ad7f8 /* f0c67b4: 45020006 */ bc1fl .L0f0c67d0 /* f0c67b8: 460c003c */ c.lt.s $f0,$f12 /* f0c67bc: e4420170 */ swc1 $f2,0x170($v0) -/* f0c67c0: 3c02800a */ lui $v0,0x800a -/* f0c67c4: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0c67c0: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0c67c4: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0c67c8: c4400170 */ lwc1 $f0,0x170($v0) /* f0c67cc: 460c003c */ c.lt.s $f0,$f12 .L0f0c67d0: @@ -2869,8 +2869,8 @@ glabel var7f1ad7f8 /* f0c67d4: 45020005 */ bc1fl .L0f0c67ec /* f0c67d8: c4400168 */ lwc1 $f0,0x168($v0) /* f0c67dc: e44c0170 */ swc1 $f12,0x170($v0) -/* f0c67e0: 3c02800a */ lui $v0,0x800a -/* f0c67e4: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0c67e0: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0c67e4: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0c67e8: c4400168 */ lwc1 $f0,0x168($v0) .L0f0c67ec: /* f0c67ec: 4600103c */ c.lt.s $f2,$f0 @@ -2878,8 +2878,8 @@ glabel var7f1ad7f8 /* f0c67f4: 45020006 */ bc1fl .L0f0c6810 /* f0c67f8: 460c003c */ c.lt.s $f0,$f12 /* f0c67fc: e4420168 */ swc1 $f2,0x168($v0) -/* f0c6800: 3c02800a */ lui $v0,0x800a -/* f0c6804: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0c6800: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0c6804: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0c6808: c4400168 */ lwc1 $f0,0x168($v0) /* f0c680c: 460c003c */ c.lt.s $f0,$f12 .L0f0c6810: @@ -2887,15 +2887,15 @@ glabel var7f1ad7f8 /* f0c6814: 45020005 */ bc1fl .L0f0c682c /* f0c6818: c4440170 */ lwc1 $f4,0x170($v0) /* f0c681c: e44c0168 */ swc1 $f12,0x168($v0) -/* f0c6820: 3c02800a */ lui $v0,0x800a -/* f0c6824: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0c6820: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0c6824: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0c6828: c4440170 */ lwc1 $f4,0x170($v0) .L0f0c682c: /* f0c682c: c426d7f8 */ lwc1 $f6,%lo(var7f1ad7f8)($at) /* f0c6830: 46062202 */ mul.s $f8,$f4,$f6 /* f0c6834: e4480170 */ swc1 $f8,0x170($v0) -/* f0c6838: 3c02800a */ lui $v0,0x800a -/* f0c683c: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0c6838: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0c683c: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0c6840: c44a0170 */ lwc1 $f10,0x170($v0) /* f0c6844: c4500174 */ lwc1 $f16,0x174($v0) /* f0c6848: 46105482 */ mul.s $f18,$f10,$f16 @@ -2912,8 +2912,8 @@ glabel var7f1ad7f8 /* f0c6870: 24010002 */ addiu $at,$zero,0x2 /* f0c6874: 10410003 */ beq $v0,$at,.L0f0c6884 .L0f0c6878: -/* f0c6878: 3c0a800a */ lui $t2,0x800a -/* f0c687c: 8d4aa244 */ lw $t2,-0x5dbc($t2) +/* f0c6878: 3c0a800a */ lui $t2,%hi(g_Vars+0x284) +/* f0c687c: 8d4aa244 */ lw $t2,%lo(g_Vars+0x284)($t2) /* f0c6880: ad400178 */ sw $zero,0x178($t2) .L0f0c6884: /* f0c6884: 8e0b006c */ lw $t3,0x6c($s0) @@ -2963,8 +2963,8 @@ glabel var7f1ad7f8 /* f0c691c: 1440fffa */ bnez $v0,.L0f0c6908 /* f0c6920: ae180068 */ sw $t8,0x68($s0) .L0f0c6924: -/* f0c6924: 3c08800a */ lui $t0,0x800a -/* f0c6928: 8d08a244 */ lw $t0,-0x5dbc($t0) +/* f0c6924: 3c08800a */ lui $t0,%hi(g_Vars+0x284) +/* f0c6928: 8d08a244 */ lw $t0,%lo(g_Vars+0x284)($t0) /* f0c692c: 8e190080 */ lw $t9,0x80($s0) /* f0c6930: ad190268 */ sw $t9,0x268($t0) /* f0c6934: 8fbf001c */ lw $ra,0x1c($sp) @@ -3058,8 +3058,8 @@ glabel var7f1ad854 /* f0c6a0c: 3c08800a */ lui $t0,%hi(g_Vars) /* f0c6a10: 1040000a */ beqz $v0,.L0f0c6a3c /* f0c6a14: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) -/* f0c6a18: 3c02800b */ lui $v0,0x800b -/* f0c6a1c: 9042cb98 */ lbu $v0,-0x3468($v0) +/* f0c6a18: 3c02800b */ lui $v0,%hi(g_MpSetup+0x10) +/* f0c6a1c: 9042cb98 */ lbu $v0,%lo(g_MpSetup+0x10)($v0) /* f0c6a20: 24010001 */ addiu $at,$zero,0x1 /* f0c6a24: 10410002 */ beq $v0,$at,.L0f0c6a30 /* f0c6a28: 24010005 */ addiu $at,$zero,0x5 @@ -3076,11 +3076,11 @@ glabel var7f1ad854 /* f0c6a4c: 3c013f80 */ lui $at,0x3f80 /* f0c6a50: 460a0103 */ div.s $f4,$f0,$f10 /* f0c6a54: 44813000 */ mtc1 $at,$f6 -/* f0c6a58: 3c0c800b */ lui $t4,0x800b +/* f0c6a58: 3c0c800b */ lui $t4,%hi(g_MpSetup+0xc) /* f0c6a5c: 2404000a */ addiu $a0,$zero,0xa /* f0c6a60: 1160000a */ beqz $t3,.L0f0c6a8c /* f0c6a64: 46062000 */ add.s $f0,$f4,$f6 -/* f0c6a68: 8d8ccb94 */ lw $t4,-0x346c($t4) +/* f0c6a68: 8d8ccb94 */ lw $t4,%lo(g_MpSetup+0xc)($t4) /* f0c6a6c: 3c013fa0 */ lui $at,0x3fa0 /* f0c6a70: 318d0100 */ andi $t5,$t4,0x100 /* f0c6a74: 11a00005 */ beqz $t5,.L0f0c6a8c diff --git a/src/game/camdraw.c b/src/game/camdraw.c index 91caff3f2..1b4e5c3b2 100644 --- a/src/game/camdraw.c +++ b/src/game/camdraw.c @@ -885,9 +885,9 @@ glabel func0f14a328 /* f14a374: 02202025 */ or $a0,$s1,$zero /* f14a378: 0c0048f2 */ jal malloc /* f14a37c: 24050006 */ addiu $a1,$zero,0x6 -/* f14a380: 3c01800a */ lui $at,0x800a +/* f14a380: 3c01800a */ lui $at,%hi(var800a45a0) /* f14a384: 0fc52890 */ jal func0f14a240 -/* f14a388: ac2245a0 */ sw $v0,0x45a0($at) +/* f14a388: ac2245a0 */ sw $v0,%lo(var800a45a0)($at) /* f14a38c: 00008025 */ or $s0,$zero,$zero /* f14a390: 24110004 */ addiu $s1,$zero,0x4 .L0f14a394: @@ -7389,10 +7389,10 @@ glabel func0f14fbfc GLOBAL_ASM( glabel func0f14fdb0 /* f14fdb0: 27bdfed0 */ addiu $sp,$sp,-304 -/* f14fdb4: 3c08800a */ lui $t0,%hi(var800a0004) +/* f14fdb4: 3c08800a */ lui $t0,%hi(var800a45a0) /* f14fdb8: 44801000 */ mtc1 $zero,$f2 /* f14fdbc: afa50134 */ sw $a1,0x134($sp) -/* f14fdc0: 8d0845a0 */ lw $t0,0x45a0($t0) +/* f14fdc0: 8d0845a0 */ lw $t0,%lo(var800a45a0)($t0) /* f14fdc4: 27a60030 */ addiu $a2,$sp,0x30 /* f14fdc8: 27ac0130 */ addiu $t4,$sp,0x130 /* f14fdcc: 00803825 */ or $a3,$a0,$zero @@ -7518,7 +7518,7 @@ glabel func0f14fdb0 /* f14ff7c: 24840004 */ addiu $a0,$a0,0x4 /* f14ff80: 24420001 */ addiu $v0,$v0,0x1 /* f14ff84: 144affc4 */ bne $v0,$t2,.L0f14fe98 -/* f14ff88: 25080004 */ addiu $t0,$t0,%lo(var800a0004) +/* f14ff88: 25080004 */ addiu $t0,$t0,4 /* f14ff8c: 03e00008 */ jr $ra /* f14ff90: 27bd0130 */ addiu $sp,$sp,0x130 ); @@ -7855,8 +7855,8 @@ glabel func0f15015c /* f150440: 10000004 */ beqz $zero,.L0f150454 /* f150444: 24020001 */ addiu $v0,$zero,0x1 .L0f150448: -/* f150448: 3c01800a */ lui $at,0x800a -/* f15044c: ac2321f8 */ sw $v1,0x21f8($at) +/* f150448: 3c01800a */ lui $at,%hi(var800a21f8) +/* f15044c: ac2321f8 */ sw $v1,%lo(var800a21f8)($at) /* f150450: 00001025 */ or $v0,$zero,$zero .L0f150454: /* f150454: 8fbf001c */ lw $ra,0x1c($sp) @@ -8080,8 +8080,8 @@ glabel func0f15015c /* f150784: 10000004 */ beqz $zero,.L0f150798 /* f150788: ae2903f8 */ sw $t1,0x3f8($s1) .L0f15078c: -/* f15078c: 3c01800a */ lui $at,0x800a -/* f150790: ac2321f8 */ sw $v1,0x21f8($at) +/* f15078c: 3c01800a */ lui $at,%hi(var800a21f8) +/* f150790: ac2321f8 */ sw $v1,%lo(var800a21f8)($at) /* f150794: 2402ffff */ addiu $v0,$zero,-1 .L0f150798: /* f150798: 8fbf002c */ lw $ra,0x2c($sp) diff --git a/src/game/cheats.c b/src/game/cheats.c index 844d58d91..58b8b9ec1 100644 --- a/src/game/cheats.c +++ b/src/game/cheats.c @@ -536,10 +536,10 @@ char *cheatGetMarquee(struct menu_item *arg0) char difficultyname[256]; char cheatname[256]; - if (g_MenuStack[g_MpPlayerNum].unk00 && g_MenuStack[g_MpPlayerNum].unk00->item && g_MenuStack[g_MpPlayerNum].unk00->item->type == MENUITEMTYPE_CHECKBOX) { - cheat_id = g_MenuStack[g_MpPlayerNum].unk00->item->param; + if (g_MenuStack[g_MpPlayerNum].unk4f8 && g_MenuStack[g_MpPlayerNum].unk4f8->item && g_MenuStack[g_MpPlayerNum].unk4f8->item->type == MENUITEMTYPE_CHECKBOX) { + cheat_id = g_MenuStack[g_MpPlayerNum].unk4f8->item->param; - if (g_MenuStack[g_MpPlayerNum].unk00->dialog == &g_CheatsBuddiesMenuDialog && g_MenuStack[g_MpPlayerNum].unk00->item == &g_CheatsBuddiesMenuItems[0]) { + if (g_MenuStack[g_MpPlayerNum].unk4f8->dialog == &g_CheatsBuddiesMenuDialog && g_MenuStack[g_MpPlayerNum].unk4f8->item == &g_CheatsBuddiesMenuItems[0]) { // Velvet sprintf(g_CheatMarqueeString, "%s: %s", langGet(L_MPWEAPONS(143)), langGet(L_MPWEAPONS(117))); // "Buddy Available", "Velvet Dark" return g_CheatMarqueeString; @@ -548,7 +548,7 @@ char *cheatGetMarquee(struct menu_item *arg0) if (cheatIsUnlocked(cheat_id)) { // Show cheat name sprintf(g_CheatMarqueeString, "%s: %s\n", - g_MenuStack[g_MpPlayerNum].unk00->dialog == &g_CheatsBuddiesMenuDialog ? langGet(L_MPWEAPONS(143)) : langGet(L_MPWEAPONS(136)), // "Buddy Available", "Cheat available" + g_MenuStack[g_MpPlayerNum].unk4f8->dialog == &g_CheatsBuddiesMenuDialog ? langGet(L_MPWEAPONS(143)) : langGet(L_MPWEAPONS(136)), // "Buddy Available", "Cheat available" langGet(g_Cheats[cheat_id].nametextid) ); return g_CheatMarqueeString; diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c index 27ab63550..b7f56a56f 100644 --- a/src/game/chr/chraction.c +++ b/src/game/chr/chraction.c @@ -2717,8 +2717,8 @@ glabel chrAttackWalk /* f0308b4: 10410017 */ beq $v0,$at,.L0f030914 /* f0308b8: 24010017 */ addiu $at,$zero,0x17 /* f0308bc: 10410015 */ beq $v0,$at,.L0f030914 -/* f0308c0: 3c04800a */ lui $a0,0x800a -/* f0308c4: 8c84a2d8 */ lw $a0,-0x5d28($a0) +/* f0308c0: 3c04800a */ lui $a0,%hi(g_Vars+0x318) +/* f0308c4: 8c84a2d8 */ lw $a0,%lo(g_Vars+0x318)($a0) /* f0308c8: 24010008 */ addiu $at,$zero,0x8 /* f0308cc: 14800009 */ bnez $a0,.L0f0308f4 /* f0308d0: 00000000 */ sll $zero,$zero,0x0 @@ -3096,8 +3096,8 @@ glabel chrAttackRoll /* f030e08: 10410017 */ beq $v0,$at,.L0f030e68 /* f030e0c: 24010017 */ addiu $at,$zero,0x17 /* f030e10: 10410015 */ beq $v0,$at,.L0f030e68 -/* f030e14: 3c04800a */ lui $a0,0x800a -/* f030e18: 8c84a2d8 */ lw $a0,-0x5d28($a0) +/* f030e14: 3c04800a */ lui $a0,%hi(g_Vars+0x318) +/* f030e18: 8c84a2d8 */ lw $a0,%lo(g_Vars+0x318)($a0) /* f030e1c: 24010008 */ addiu $at,$zero,0x8 /* f030e20: 14800009 */ bnez $a0,.L0f030e48 /* f030e24: 00000000 */ sll $zero,$zero,0x0 @@ -3667,8 +3667,8 @@ glabel var7f1a8d18 /* f03164c: 10410017 */ beq $v0,$at,.L0f0316ac /* f031650: 24010017 */ addiu $at,$zero,0x17 /* f031654: 10410015 */ beq $v0,$at,.L0f0316ac -/* f031658: 3c04800a */ lui $a0,0x800a -/* f03165c: 8c84a2d8 */ lw $a0,-0x5d28($a0) +/* f031658: 3c04800a */ lui $a0,%hi(g_Vars+0x318) +/* f03165c: 8c84a2d8 */ lw $a0,%lo(g_Vars+0x318)($a0) /* f031660: 24010008 */ addiu $at,$zero,0x8 /* f031664: 14800009 */ bnez $a0,.L0f03168c /* f031668: 00000000 */ sll $zero,$zero,0x0 @@ -3971,15 +3971,15 @@ glabel var7f1a8d44 /* f031a2c: 24010003 */ addiu $at,$zero,0x3 /* f031a30: 14e100bd */ bne $a3,$at,.L0f031d28 /* f031a34: 0007c080 */ sll $t8,$a3,0x2 -/* f031a38: 3c0d800a */ lui $t5,%hi(var800a000c) -/* f031a3c: 8dada24c */ lw $t5,-0x5db4($t5) +/* f031a38: 3c0d800a */ lui $t5,%hi(g_Vars+0x28c) +/* f031a3c: 8dada24c */ lw $t5,%lo(g_Vars+0x28c)($t5) /* f031a40: 240effff */ addiu $t6,$zero,-1 /* f031a44: afae00dc */ sw $t6,0xdc($sp) /* f031a48: 02002025 */ or $a0,$s0,$zero /* f031a4c: 0fc0f011 */ jal func0f03c044 /* f031a50: afad00e4 */ sw $t5,0xe4($sp) -/* f031a54: 3c0b800a */ lui $t3,0x800a -/* f031a58: 8d6ba02c */ lw $t3,-0x5fd4($t3) +/* f031a54: 3c0b800a */ lui $t3,%hi(g_Vars+0x6c) +/* f031a58: 8d6ba02c */ lw $t3,%lo(g_Vars+0x6c)($t3) /* f031a5c: 240fffff */ addiu $t7,$zero,-1 /* f031a60: 00406025 */ or $t4,$v0,$zero /* f031a64: afaf00d4 */ sw $t7,0xd4($sp) @@ -3990,16 +3990,16 @@ glabel var7f1a8d44 .L0f031a78: /* f031a78: 00003825 */ or $a3,$zero,$zero .L0f031a7c: -/* f031a7c: 3c0a800a */ lui $t2,0x800a -/* f031a80: 8d4aa028 */ lw $t2,-0x5fd8($t2) -/* f031a84: 3c09800a */ lui $t1,0x800a -/* f031a88: 3c08800a */ lui $t0,0x800a +/* f031a7c: 3c0a800a */ lui $t2,%hi(g_Vars+0x68) +/* f031a80: 8d4aa028 */ lw $t2,%lo(g_Vars+0x68)($t2) +/* f031a84: 3c09800a */ lui $t1,%hi(g_Vars+0x64) +/* f031a88: 3c08800a */ lui $t0,%hi(g_Vars+0x70) /* f031a8c: 11400003 */ beqz $t2,.L0f031a9c /* f031a90: 00002825 */ or $a1,$zero,$zero /* f031a94: 10000001 */ beqz $zero,.L0f031a9c /* f031a98: 24050001 */ addiu $a1,$zero,0x1 .L0f031a9c: -/* f031a9c: 8d29a024 */ lw $t1,-0x5fdc($t1) +/* f031a9c: 8d29a024 */ lw $t1,%lo(g_Vars+0x64)($t1) /* f031aa0: 00001025 */ or $v0,$zero,$zero /* f031aa4: 00001825 */ or $v1,$zero,$zero /* f031aa8: 11200003 */ beqz $t1,.L0f031ab8 @@ -4007,7 +4007,7 @@ glabel var7f1a8d44 /* f031ab0: 10000001 */ beqz $zero,.L0f031ab8 /* f031ab4: 24020001 */ addiu $v0,$zero,0x1 .L0f031ab8: -/* f031ab8: 8d08a030 */ lw $t0,-0x5fd0($t0) +/* f031ab8: 8d08a030 */ lw $t0,%lo(g_Vars+0x70)($t0) /* f031abc: 3c0f800a */ lui $t7,%hi(g_Vars) /* f031ac0: 25ef9fc0 */ addiu $t7,$t7,%lo(g_Vars) /* f031ac4: 11000003 */ beqz $t0,.L0f031ad4 @@ -4029,14 +4029,14 @@ glabel var7f1a8d44 /* f031afc: afa60030 */ sw $a2,0x30($sp) /* f031b00: 0fc4a24b */ jal setCurrentPlayerNum /* f031b04: afac00d8 */ sw $t4,0xd8($sp) -/* f031b08: 3c0b800a */ lui $t3,0x800a -/* f031b0c: 3c0a800a */ lui $t2,0x800a -/* f031b10: 3c09800a */ lui $t1,0x800a -/* f031b14: 3c08800a */ lui $t0,0x800a -/* f031b18: 8d08a030 */ lw $t0,-0x5fd0($t0) -/* f031b1c: 8d29a024 */ lw $t1,-0x5fdc($t1) -/* f031b20: 8d4aa028 */ lw $t2,-0x5fd8($t2) -/* f031b24: 8d6ba02c */ lw $t3,-0x5fd4($t3) +/* f031b08: 3c0b800a */ lui $t3,%hi(g_Vars+0x6c) +/* f031b0c: 3c0a800a */ lui $t2,%hi(g_Vars+0x68) +/* f031b10: 3c09800a */ lui $t1,%hi(g_Vars+0x64) +/* f031b14: 3c08800a */ lui $t0,%hi(g_Vars+0x70) +/* f031b18: 8d08a030 */ lw $t0,%lo(g_Vars+0x70)($t0) +/* f031b1c: 8d29a024 */ lw $t1,%lo(g_Vars+0x64)($t1) +/* f031b20: 8d4aa028 */ lw $t2,%lo(g_Vars+0x68)($t2) +/* f031b24: 8d6ba02c */ lw $t3,%lo(g_Vars+0x6c)($t3) /* f031b28: 8fa400e0 */ lw $a0,0xe0($sp) /* f031b2c: 8fa60030 */ lw $a2,0x30($sp) /* f031b30: 10000002 */ beqz $zero,.L0f031b3c @@ -4073,28 +4073,28 @@ glabel var7f1a8d44 /* f031b94: 5420ffd5 */ bnezl $at,.L0f031aec /* f031b98: 8cd80064 */ lw $t8,0x64($a2) .L0f031b9c: -/* f031b9c: 3c18800a */ lui $t8,0x800a -/* f031ba0: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f031b9c: 3c18800a */ lui $t8,%hi(g_Vars+0x284) +/* f031ba0: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f031ba4: 8f030480 */ lw $v1,0x480($t8) /* f031ba8: 1060005b */ beqz $v1,.L0f031d18 /* f031bac: 00000000 */ sll $zero,$zero,0x0 /* f031bb0: 80790037 */ lb $t9,0x37($v1) -/* f031bb4: 3c02800a */ lui $v0,%hi(var800a0014) +/* f031bb4: 3c02800a */ lui $v0,%hi(g_Vars+0x284) /* f031bb8: 53200008 */ beqzl $t9,.L0f031bdc /* f031bbc: 8e0f0014 */ lw $t7,0x14($s0) /* f031bc0: a0600037 */ sb $zero,0x37($v1) -/* f031bc4: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f031bc4: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f031bc8: 2401fffb */ addiu $at,$zero,-5 /* f031bcc: 8c4d00c4 */ lw $t5,0xc4($v0) /* f031bd0: 01a17024 */ and $t6,$t5,$at /* f031bd4: ac4e00c4 */ sw $t6,0xc4($v0) /* f031bd8: 8e0f0014 */ lw $t7,0x14($s0) .L0f031bdc: -/* f031bdc: 3c19800a */ lui $t9,0x800a +/* f031bdc: 3c19800a */ lui $t9,%hi(g_Vars+0x284) /* f031be0: 24070002 */ addiu $a3,$zero,0x2 /* f031be4: 35f80020 */ ori $t8,$t7,0x20 /* f031be8: ae180014 */ sw $t8,0x14($s0) -/* f031bec: 8f39a244 */ lw $t9,-0x5dbc($t9) +/* f031bec: 8f39a244 */ lw $t9,%lo(g_Vars+0x284)($t9) /* f031bf0: 8f2d0480 */ lw $t5,0x480($t9) /* f031bf4: 8da40000 */ lw $a0,0x0($t5) /* f031bf8: afa00010 */ sw $zero,0x10($sp) @@ -4103,21 +4103,21 @@ glabel var7f1a8d44 /* f031c04: 24860028 */ addiu $a2,$a0,0x28 /* f031c08: 0fc447a9 */ jal currentPlayerRemoveWeapon /* f031c0c: 2404002e */ addiu $a0,$zero,0x2e -/* f031c10: 3c0e800a */ lui $t6,0x800a -/* f031c14: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f031c10: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f031c14: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f031c18: 24050001 */ addiu $a1,$zero,0x1 /* f031c1c: 3406ffff */ dli $a2,0xffff /* f031c20: 8dcf0480 */ lw $t7,0x480($t6) /* f031c24: 0fc249af */ jal func0f0926bc /* f031c28: 8de40000 */ lw $a0,0x0($t7) -/* f031c2c: 3c18800a */ lui $t8,%hi(var800a000c) -/* f031c30: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f031c2c: 3c18800a */ lui $t8,%hi(g_Vars+0x284) +/* f031c30: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f031c34: af000480 */ sw $zero,0x480($t8) /* f031c38: 0fc4a24b */ jal setCurrentPlayerNum /* f031c3c: 8fa400e4 */ lw $a0,0xe4($sp) -/* f031c40: 3c04800a */ lui $a0,0x800a +/* f031c40: 3c04800a */ lui $a0,%hi(g_Vars+0x4b4) /* f031c44: 0fc59585 */ jal stageGetIndex -/* f031c48: 8c84a474 */ lw $a0,-0x5b8c($a0) +/* f031c48: 8c84a474 */ lw $a0,%lo(g_Vars+0x4b4)($a0) /* f031c4c: 2401000a */ addiu $at,$zero,0xa /* f031c50: 10410005 */ beq $v0,$at,.L0f031c68 /* f031c54: 2401001f */ addiu $at,$zero,0x1f @@ -4153,8 +4153,8 @@ glabel var7f1a8d44 /* f031cb8: 8faf00d4 */ lw $t7,0xd4($sp) /* f031cbc: 0fc4a24b */ jal setCurrentPlayerNum /* f031cc0: 03002025 */ or $a0,$t8,$zero -/* f031cc4: 3c19800a */ lui $t9,0x800a -/* f031cc8: 8f39a244 */ lw $t9,-0x5dbc($t9) +/* f031cc4: 3c19800a */ lui $t9,%hi(g_Vars+0x284) +/* f031cc8: 8f39a244 */ lw $t9,%lo(g_Vars+0x284)($t9) /* f031ccc: 240effff */ addiu $t6,$zero,-1 /* f031cd0: 8f2d0480 */ lw $t5,0x480($t9) /* f031cd4: 11a00002 */ beqz $t5,.L0f031ce0 @@ -4189,8 +4189,8 @@ glabel var7f1a8d44 /* f031d38: 2da30001 */ sltiu $v1,$t5,0x1 /* f031d3c: 10600006 */ beqz $v1,.L0f031d58 /* f031d40: 03194021 */ addu $t0,$t8,$t9 -/* f031d44: 3c0e800a */ lui $t6,0x800a -/* f031d48: 8dce9fc8 */ lw $t6,-0x6038($t6) +/* f031d44: 3c0e800a */ lui $t6,%hi(g_Vars+0x8) +/* f031d48: 8dce9fc8 */ lw $t6,%lo(g_Vars+0x8)($t6) /* f031d4c: 8e0f0030 */ lw $t7,0x30($s0) /* f031d50: 01cf1826 */ xor $v1,$t6,$t7 /* f031d54: 2c630001 */ sltiu $v1,$v1,0x1 @@ -4213,7 +4213,7 @@ glabel var7f1a8d44 /* f031d90: 8c430014 */ lw $v1,0x14($v0) .L0f031d94: /* f031d94: 24840001 */ addiu $a0,$a0,0x1 -/* f031d98: 24420014 */ addiu $v0,$v0,%lo(var800a0014) +/* f031d98: 24420014 */ addiu $v0,$v0,20 /* f031d9c: 54a3fff8 */ bnel $a1,$v1,.L0f031d80 /* f031da0: 8fae011c */ lw $t6,0x11c($sp) .L0f031da4: @@ -4555,8 +4555,8 @@ glabel var7f1a8d44 /* f03229c: 00406825 */ or $t5,$v0,$zero .L0f0322a0: /* f0322a0: 8f010000 */ lw $at,0x0($t8) -/* f0322a4: 2718000c */ addiu $t8,$t8,%lo(var800a000c) -/* f0322a8: 25ad000c */ addiu $t5,$t5,%lo(var800a000c) +/* f0322a4: 2718000c */ addiu $t8,$t8,12 +/* f0322a8: 25ad000c */ addiu $t5,$t5,12 /* f0322ac: ada1fff4 */ sw $at,-0xc($t5) /* f0322b0: 8f01fff8 */ lw $at,-0x8($t8) /* f0322b4: ada1fff8 */ sw $at,-0x8($t5) @@ -5038,8 +5038,8 @@ glabel var7f1a8d44 /* f0329a8: e6040048 */ swc1 $f4,0x48($s0) /* f0329ac: 8fa20040 */ lw $v0,0x40($sp) .L0f0329b0: -/* f0329b0: 3c18800a */ lui $t8,0x800a -/* f0329b4: 8f18a2d4 */ lw $t8,-0x5d2c($t8) +/* f0329b0: 3c18800a */ lui $t8,%hi(g_Vars+0x314) +/* f0329b4: 8f18a2d4 */ lw $t8,%lo(g_Vars+0x314)($t8) /* f0329b8: 8fa40128 */ lw $a0,0x128($sp) /* f0329bc: 13000008 */ beqz $t8,.L0f0329e0 /* f0329c0: 00000000 */ sll $zero,$zero,0x0 @@ -5052,8 +5052,8 @@ glabel var7f1a8d44 /* f0329dc: 8fa20040 */ lw $v0,0x40($sp) .L0f0329e0: /* f0329e0: 04800009 */ bltz $a0,.L0f032a08 -/* f0329e4: 3c0d800a */ lui $t5,0x800a -/* f0329e8: 8dada24c */ lw $t5,-0x5db4($t5) +/* f0329e4: 3c0d800a */ lui $t5,%hi(g_Vars+0x28c) +/* f0329e8: 8dada24c */ lw $t5,%lo(g_Vars+0x28c)($t5) /* f0329ec: 0fc4a24b */ jal setCurrentPlayerNum /* f0329f0: afad0058 */ sw $t5,0x58($sp) /* f0329f4: 0fc2c169 */ jal func0f0b05a4 @@ -5176,9 +5176,9 @@ glabel var7f1a8d4c /* f032b74: 24180006 */ addiu $t8,$zero,0x6 /* f032b78: a2180007 */ sb $t8,0x7($s0) /* f032b7c: ae00002c */ sw $zero,0x2c($s0) -/* f032b80: 3c19800a */ lui $t9,%hi(var800a000c) +/* f032b80: 3c19800a */ lui $t9,%hi(g_Vars+0x8) /* f032b84: 3c013f00 */ lui $at,0x3f00 -/* f032b88: 8f399fc8 */ lw $t9,-0x6038($t9) +/* f032b88: 8f399fc8 */ lw $t9,%lo(g_Vars+0x8)($t9) /* f032b8c: 44812000 */ mtc1 $at,$f4 /* f032b90: 3c014180 */ lui $at,0x4180 /* f032b94: 44813000 */ mtc1 $at,$f6 @@ -5207,8 +5207,8 @@ glabel var7f1a8d4c /* f032bec: 2de20001 */ sltiu $v0,$t7,0x1 /* f032bf0: 10400006 */ beqz $v0,.L0f032c0c /* f032bf4: 012a5821 */ addu $t3,$t1,$t2 -/* f032bf8: 3c18800a */ lui $t8,0x800a -/* f032bfc: 8f189fc8 */ lw $t8,-0x6038($t8) +/* f032bf8: 3c18800a */ lui $t8,%hi(g_Vars+0x8) +/* f032bfc: 8f189fc8 */ lw $t8,%lo(g_Vars+0x8)($t8) /* f032c00: 8e190030 */ lw $t9,0x30($s0) /* f032c04: 03191026 */ xor $v0,$t8,$t9 /* f032c08: 2c420001 */ sltiu $v0,$v0,0x1 @@ -5274,7 +5274,7 @@ glabel var7f1a8d4c .L0f032ce4: /* f032ce4: 8d210000 */ lw $at,0x0($t1) /* f032ce8: 2529000c */ addiu $t1,$t1,0xc -/* f032cec: 2739000c */ addiu $t9,$t9,%lo(var800a000c) +/* f032cec: 2739000c */ addiu $t9,$t9,12 /* f032cf0: af21fff4 */ sw $at,-0xc($t9) /* f032cf4: 8d21fff8 */ lw $at,-0x8($t1) /* f032cf8: af21fff8 */ sw $at,-0x8($t9) @@ -5290,8 +5290,8 @@ glabel var7f1a8d4c /* f032d20: 240c0006 */ addiu $t4,$zero,0x6 /* f032d24: a20c0007 */ sb $t4,0x7($s0) /* f032d28: ae00002c */ sw $zero,0x2c($s0) -/* f032d2c: 3c0d800a */ lui $t5,0x800a -/* f032d30: 8dad9fc8 */ lw $t5,-0x6038($t5) +/* f032d2c: 3c0d800a */ lui $t5,%hi(g_Vars+0x8) +/* f032d30: 8dad9fc8 */ lw $t5,%lo(g_Vars+0x8)($t5) /* f032d34: a2000008 */ sb $zero,0x8($s0) /* f032d38: 0c004b70 */ jal random /* f032d3c: ae0d0030 */ sw $t5,0x30($s0) @@ -5419,8 +5419,8 @@ glabel var7f1a8d4c /* f032f10: 24090006 */ addiu $t1,$zero,0x6 /* f032f14: a2090007 */ sb $t1,0x7($s0) /* f032f18: ae00002c */ sw $zero,0x2c($s0) -/* f032f1c: 3c19800a */ lui $t9,0x800a -/* f032f20: 8f399fc8 */ lw $t9,-0x6038($t9) +/* f032f1c: 3c19800a */ lui $t9,%hi(g_Vars+0x8) +/* f032f20: 8f399fc8 */ lw $t9,%lo(g_Vars+0x8)($t9) /* f032f24: a2000008 */ sb $zero,0x8($s0) /* f032f28: 3c014180 */ lui $at,0x4180 /* f032f2c: ae190030 */ sw $t9,0x30($s0) @@ -5935,8 +5935,8 @@ glabel var7f1a8d5c GLOBAL_ASM( glabel func0f033654 -/* f033654: 3c0e800a */ lui $t6,0x800a -/* f033658: 8dcea2d8 */ lw $t6,-0x5d28($t6) +/* f033654: 3c0e800a */ lui $t6,%hi(g_Vars+0x318) +/* f033658: 8dcea2d8 */ lw $t6,%lo(g_Vars+0x318)($t6) /* f03365c: 240303e8 */ addiu $v1,$zero,0x3e8 /* f033660: 55c00003 */ bnezl $t6,.L0f033670 /* f033664: 90820000 */ lbu $v0,0x0($a0) @@ -6157,9 +6157,9 @@ glabel func0f0338e0 /* f03393c: 0fc4a25f */ jal propGetPlayerNum /* f033940: afa00104 */ sw $zero,0x104($sp) /* f033944: 00024080 */ sll $t0,$v0,0x2 -/* f033948: 3c09800a */ lui $t1,0x800a +/* f033948: 3c09800a */ lui $t1,%hi(g_Vars+0x64) /* f03394c: 01284821 */ addu $t1,$t1,$t0 -/* f033950: 8d29a024 */ lw $t1,-0x5fdc($t1) +/* f033950: 8d29a024 */ lw $t1,%lo(g_Vars+0x64)($t1) /* f033954: afa20108 */ sw $v0,0x108($sp) /* f033958: 8fa3010c */ lw $v1,0x10c($sp) /* f03395c: 8d2a00d8 */ lw $t2,0xd8($t1) @@ -6526,12 +6526,12 @@ glabel func0f0338e0 /* f033eac: 8fae0108 */ lw $t6,0x108($sp) /* f033eb0: 24010006 */ addiu $at,$zero,0x6 /* f033eb4: 908c0000 */ lbu $t4,0x0($a0) -/* f033eb8: 3c02800a */ lui $v0,0x800a +/* f033eb8: 3c02800a */ lui $v0,%hi(g_Vars+0x64) /* f033ebc: 24050009 */ addiu $a1,$zero,0x9 /* f033ec0: 15810016 */ bne $t4,$at,.L0f033f1c /* f033ec4: 000ec880 */ sll $t9,$t6,0x2 /* f033ec8: 00591021 */ addu $v0,$v0,$t9 -/* f033ecc: 8c42a024 */ lw $v0,-0x5fdc($v0) +/* f033ecc: 8c42a024 */ lw $v0,%lo(g_Vars+0x64)($v0) /* f033ed0: 3c01bf80 */ lui $at,0xbf80 /* f033ed4: 3c048009 */ lui $a0,%hi(var80095200) /* f033ed8: 8c4b00e0 */ lw $t3,0xe0($v0) @@ -6630,8 +6630,8 @@ glabel chrSetShield /* f03401c: c7ac0024 */ lwc1 $f12,0x24($sp) /* f034020: 04400013 */ bltz $v0,.L0f034070 /* f034024: 00402025 */ or $a0,$v0,$zero -/* f034028: 3c19800a */ lui $t9,0x800a -/* f03402c: 8f39a24c */ lw $t9,-0x5db4($t9) +/* f034028: 3c19800a */ lui $t9,%hi(g_Vars+0x28c) +/* f03402c: 8f39a24c */ lw $t9,%lo(g_Vars+0x28c)($t9) /* f034030: e7ac0024 */ swc1 $f12,0x24($sp) /* f034034: 0fc4a24b */ jal setCurrentPlayerNum /* f034038: afb90018 */ sw $t9,0x18($sp) @@ -6640,8 +6640,8 @@ glabel chrSetShield /* f034044: 3c013e00 */ lui $at,0x3e00 /* f034048: c7ac0024 */ lwc1 $f12,0x24($sp) /* f03404c: 44814000 */ mtc1 $at,$f8 -/* f034050: 3c02800a */ lui $v0,0x800a -/* f034054: 8c42a248 */ lw $v0,-0x5db8($v0) +/* f034050: 3c02800a */ lui $v0,%hi(g_Vars+0x288) +/* f034054: 8c42a248 */ lw $v0,%lo(g_Vars+0x288)($v0) /* f034058: 46086282 */ mul.s $f10,$f12,$f8 /* f03405c: c4460040 */ lwc1 $f6,0x40($v0) /* f034060: 460a3400 */ add.s $f16,$f6,$f10 @@ -7133,7 +7133,7 @@ glabel var7f1a8d98 /* f0346b0: 8cad0298 */ lw $t5,0x298($a1) .L0f0346b4: /* f0346b4: 8fb10150 */ lw $s1,0x150($sp) -/* f0346b8: 3c03800a */ lui $v1,0x800a +/* f0346b8: 3c03800a */ lui $v1,%hi(g_MissionConfig+0x3) /* f0346bc: 05a0000f */ bltz $t5,.L0f0346fc /* f0346c0: 00000000 */ sll $zero,$zero,0x0 /* f0346c4: 8cae0454 */ lw $t6,0x454($a1) @@ -7151,7 +7151,7 @@ glabel var7f1a8d98 /* f0346f4: 50d90713 */ beql $a2,$t9,.L0f036344 /* f0346f8: 8fbf0054 */ lw $ra,0x54($sp) .L0f0346fc: -/* f0346fc: 9063dfeb */ lbu $v1,-0x2015($v1) +/* f0346fc: 9063dfeb */ lbu $v1,%lo(g_MissionConfig+0x3)($v1) /* f034700: 24060006 */ addiu $a2,$zero,0x6 /* f034704: 000341c2 */ srl $t0,$v1,0x7 /* f034708: 11000016 */ beqz $t0,.L0f034764 @@ -7223,8 +7223,8 @@ glabel var7f1a8d98 /* f0347fc: 8fa4014c */ lw $a0,0x14c($sp) /* f034800: 0002182b */ sltu $v1,$zero,$v0 .L0f034804: -/* f034804: 3c02800a */ lui $v0,0x800a -/* f034808: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f034804: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f034808: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f03480c: afa30130 */ sw $v1,0x130($sp) /* f034810: 8e18001c */ lw $t8,0x1c($s0) /* f034814: 8c4e00bc */ lw $t6,0xbc($v0) @@ -7264,7 +7264,7 @@ glabel var7f1a8d98 /* f03488c: 0fc2c7aa */ jal func0f0b1ea8 /* f034890: 24050400 */ addiu $a1,$zero,0x400 /* f034894: 10400011 */ beqz $v0,.L0f0348dc -/* f034898: 3c08800a */ lui $t0,0x800a +/* f034898: 3c08800a */ lui $t0,%hi(g_Vars+0x314) /* f03489c: 8fae014c */ lw $t6,0x14c($sp) /* f0348a0: 24010001 */ addiu $at,$zero,0x1 /* f0348a4: 8fa50128 */ lw $a1,0x128($sp) @@ -7273,19 +7273,19 @@ glabel var7f1a8d98 /* f0348b0: 00000000 */ sll $zero,$zero,0x0 /* f0348b4: 90af0000 */ lbu $t7,0x0($a1) /* f0348b8: 24010006 */ addiu $at,$zero,0x6 -/* f0348bc: 3c19800a */ lui $t9,0x800a +/* f0348bc: 3c19800a */ lui $t9,%hi(g_Vars+0x318) /* f0348c0: 51e10005 */ beql $t7,$at,.L0f0348d8 /* f0348c4: 4480a000 */ mtc1 $zero,$f20 -/* f0348c8: 8f39a2d8 */ lw $t9,-0x5d28($t9) +/* f0348c8: 8f39a2d8 */ lw $t9,%lo(g_Vars+0x318)($t9) /* f0348cc: 13200003 */ beqz $t9,.L0f0348dc /* f0348d0: 00000000 */ sll $zero,$zero,0x0 /* f0348d4: 4480a000 */ mtc1 $zero,$f20 .L0f0348d8: /* f0348d8: 00000000 */ sll $zero,$zero,0x0 .L0f0348dc: -/* f0348dc: 8d08a2d4 */ lw $t0,-0x5d2c($t0) +/* f0348dc: 8d08a2d4 */ lw $t0,%lo(g_Vars+0x314)($t0) /* f0348e0: 8fa50128 */ lw $a1,0x128($sp) -/* f0348e4: 3c09800a */ lui $t1,0x800a +/* f0348e4: 3c09800a */ lui $t1,%hi(g_Vars+0x298) /* f0348e8: 15000047 */ bnez $t0,.L0f034a08 /* f0348ec: 00000000 */ sll $zero,$zero,0x0 /* f0348f0: 8fa90170 */ lw $t1,0x170($sp) @@ -7347,25 +7347,25 @@ glabel var7f1a8d98 /* f0349bc: 0fc4a25f */ jal propGetPlayerNum /* f0349c0: 00a02025 */ or $a0,$a1,$zero /* f0349c4: 00027080 */ sll $t6,$v0,0x2 -/* f0349c8: 3c18800a */ lui $t8,0x800a +/* f0349c8: 3c18800a */ lui $t8,%hi(g_Vars+0x64) /* f0349cc: 030ec021 */ addu $t8,$t8,$t6 -/* f0349d0: 8f18a024 */ lw $t8,-0x5fdc($t8) +/* f0349d0: 8f18a024 */ lw $t8,%lo(g_Vars+0x64)($t8) /* f0349d4: 8fa40128 */ lw $a0,0x128($sp) /* f0349d8: c712199c */ lwc1 $f18,0x199c($t8) /* f0349dc: 0fc4a25f */ jal propGetPlayerNum /* f0349e0: e7b2010c */ swc1 $f18,0x10c($sp) /* f0349e4: 00027880 */ sll $t7,$v0,0x2 -/* f0349e8: 3c19800a */ lui $t9,0x800a +/* f0349e8: 3c19800a */ lui $t9,%hi(g_Vars+0x64) /* f0349ec: 032fc821 */ addu $t9,$t9,$t7 -/* f0349f0: 8f39a024 */ lw $t9,-0x5fdc($t9) +/* f0349f0: 8f39a024 */ lw $t9,%lo(g_Vars+0x64)($t9) /* f0349f4: 8fa50128 */ lw $a1,0x128($sp) /* f0349f8: c72419a0 */ lwc1 $f4,0x19a0($t9) /* f0349fc: e7a40108 */ swc1 $f4,0x108($sp) /* f034a00: 100000be */ beqz $zero,.L0f034cfc /* f034a04: 90a30000 */ lbu $v1,0x0($a1) .L0f034a08: -/* f034a08: 8d29a258 */ lw $t1,-0x5da8($t1) -/* f034a0c: 3c0a800a */ lui $t2,0x800a +/* f034a08: 8d29a258 */ lw $t1,%lo(g_Vars+0x298)($t1) +/* f034a0c: 3c0a800a */ lui $t2,%hi(g_Vars+0x29c) /* f034a10: 05200049 */ bltz $t1,.L0f034b38 /* f034a14: 00000000 */ sll $zero,$zero,0x0 /* f034a18: 8faa0170 */ lw $t2,0x170($sp) @@ -7429,30 +7429,30 @@ glabel var7f1a8d98 /* f034aec: 0fc4a25f */ jal propGetPlayerNum /* f034af0: 00a02025 */ or $a0,$a1,$zero /* f034af4: 0002c080 */ sll $t8,$v0,0x2 -/* f034af8: 3c0f800a */ lui $t7,0x800a +/* f034af8: 3c0f800a */ lui $t7,%hi(g_Vars+0x64) /* f034afc: 01f87821 */ addu $t7,$t7,$t8 -/* f034b00: 8defa024 */ lw $t7,-0x5fdc($t7) +/* f034b00: 8defa024 */ lw $t7,%lo(g_Vars+0x64)($t7) /* f034b04: 8fa40128 */ lw $a0,0x128($sp) /* f034b08: c5e4199c */ lwc1 $f4,0x199c($t7) /* f034b0c: 0fc4a25f */ jal propGetPlayerNum /* f034b10: e7a4010c */ swc1 $f4,0x10c($sp) /* f034b14: 0002c880 */ sll $t9,$v0,0x2 -/* f034b18: 3c08800a */ lui $t0,0x800a +/* f034b18: 3c08800a */ lui $t0,%hi(g_Vars+0x64) /* f034b1c: 01194021 */ addu $t0,$t0,$t9 -/* f034b20: 8d08a024 */ lw $t0,-0x5fdc($t0) +/* f034b20: 8d08a024 */ lw $t0,%lo(g_Vars+0x64)($t0) /* f034b24: 8fa50128 */ lw $a1,0x128($sp) /* f034b28: c50619a0 */ lwc1 $f6,0x19a0($t0) /* f034b2c: e7a60108 */ swc1 $f6,0x108($sp) /* f034b30: 10000072 */ beqz $zero,.L0f034cfc /* f034b34: 90a30000 */ lbu $v1,0x0($a1) .L0f034b38: -/* f034b38: 8d4aa25c */ lw $t2,-0x5da4($t2) +/* f034b38: 8d4aa25c */ lw $t2,%lo(g_Vars+0x29c)($t2) /* f034b3c: 8fab0170 */ lw $t3,0x170($sp) /* f034b40: 0542005b */ bltzl $t2,.L0f034cb0 /* f034b44: 90a30000 */ lbu $v1,0x0($a1) /* f034b48: 1160000a */ beqz $t3,.L0f034b74 -/* f034b4c: 3c0c800a */ lui $t4,0x800a -/* f034b50: 8d8ca260 */ lw $t4,-0x5da0($t4) +/* f034b4c: 3c0c800a */ lui $t4,%hi(g_Vars+0x2a0) +/* f034b50: 8d8ca260 */ lw $t4,%lo(g_Vars+0x2a0)($t4) /* f034b54: 3c018008 */ lui $at,0x8008 /* f034b58: 8d8200bc */ lw $v0,0xbc($t4) /* f034b5c: 14a20025 */ bne $a1,$v0,.L0f034bf4 @@ -7463,8 +7463,8 @@ glabel var7f1a8d98 /* f034b70: 00000000 */ sll $zero,$zero,0x0 .L0f034b74: /* f034b74: 1220000c */ beqz $s1,.L0f034ba8 -/* f034b78: 3c0d800a */ lui $t5,0x800a -/* f034b7c: 8dada260 */ lw $t5,-0x5da0($t5) +/* f034b78: 3c0d800a */ lui $t5,%hi(g_Vars+0x2a0) +/* f034b7c: 8dada260 */ lw $t5,%lo(g_Vars+0x2a0)($t5) /* f034b80: 3c018006 */ lui $at,0x8006 /* f034b84: 8da200bc */ lw $v0,0xbc($t5) /* f034b88: 16220007 */ bne $s1,$v0,.L0f034ba8 @@ -7476,8 +7476,8 @@ glabel var7f1a8d98 /* f034ba0: 10000014 */ beqz $zero,.L0f034bf4 /* f034ba4: e7b00124 */ swc1 $f16,0x124($sp) .L0f034ba8: -/* f034ba8: 3c0e800a */ lui $t6,0x800a -/* f034bac: 8dcea260 */ lw $t6,-0x5da0($t6) +/* f034ba8: 3c0e800a */ lui $t6,%hi(g_Vars+0x2a0) +/* f034bac: 8dcea260 */ lw $t6,%lo(g_Vars+0x2a0)($t6) /* f034bb0: 12200010 */ beqz $s1,.L0f034bf4 /* f034bb4: 8dc200bc */ lw $v0,0xbc($t6) /* f034bb8: 1222000e */ beq $s1,$v0,.L0f034bf4 @@ -7488,8 +7488,8 @@ glabel var7f1a8d98 /* f034bcc: 00000000 */ sll $zero,$zero,0x0 /* f034bd0: 3c018006 */ lui $at,0x8006 /* f034bd4: c4322ca4 */ lwc1 $f18,0x2ca4($at) -/* f034bd8: 3c18800a */ lui $t8,0x800a -/* f034bdc: 8f18a260 */ lw $t8,-0x5da0($t8) +/* f034bd8: 3c18800a */ lui $t8,%hi(g_Vars+0x2a0) +/* f034bdc: 8f18a260 */ lw $t8,%lo(g_Vars+0x2a0)($t8) /* f034be0: 46009102 */ mul.s $f4,$f18,$f0 /* f034be4: 8fa50128 */ lw $a1,0x128($sp) /* f034be8: 8f0200bc */ lw $v0,0xbc($t8) @@ -7500,8 +7500,8 @@ glabel var7f1a8d98 /* f034bf8: 00000000 */ sll $zero,$zero,0x0 /* f034bfc: 0fc06c2b */ jal func0f01b0ac /* f034c00: 00000000 */ sll $zero,$zero,0x0 -/* f034c04: 3c0f800a */ lui $t7,0x800a -/* f034c08: 8defa260 */ lw $t7,-0x5da0($t7) +/* f034c04: 3c0f800a */ lui $t7,%hi(g_Vars+0x2a0) +/* f034c08: 8defa260 */ lw $t7,%lo(g_Vars+0x2a0)($t7) /* f034c0c: 4600a503 */ div.s $f20,$f20,$f0 /* f034c10: 8fa50128 */ lw $a1,0x128($sp) /* f034c14: 8de200bc */ lw $v0,0xbc($t7) @@ -7511,30 +7511,30 @@ glabel var7f1a8d98 /* f034c20: 0fc4a25f */ jal propGetPlayerNum /* f034c24: 00a02025 */ or $a0,$a1,$zero /* f034c28: 0002c880 */ sll $t9,$v0,0x2 -/* f034c2c: 3c08800a */ lui $t0,0x800a +/* f034c2c: 3c08800a */ lui $t0,%hi(g_Vars+0x64) /* f034c30: 01194021 */ addu $t0,$t0,$t9 -/* f034c34: 8d08a024 */ lw $t0,-0x5fdc($t0) +/* f034c34: 8d08a024 */ lw $t0,%lo(g_Vars+0x64)($t0) /* f034c38: 8fa40128 */ lw $a0,0x128($sp) /* f034c3c: c506199c */ lwc1 $f6,0x199c($t0) /* f034c40: 0fc4a25f */ jal propGetPlayerNum /* f034c44: e7a6010c */ swc1 $f6,0x10c($sp) /* f034c48: 00024880 */ sll $t1,$v0,0x2 -/* f034c4c: 3c0a800a */ lui $t2,0x800a +/* f034c4c: 3c0a800a */ lui $t2,%hi(g_Vars+0x64) /* f034c50: 01495021 */ addu $t2,$t2,$t1 -/* f034c54: 8d4aa024 */ lw $t2,-0x5fdc($t2) +/* f034c54: 8d4aa024 */ lw $t2,%lo(g_Vars+0x64)($t2) /* f034c58: 8fa50128 */ lw $a1,0x128($sp) /* f034c5c: c54819a0 */ lwc1 $f8,0x19a0($t2) /* f034c60: e7a80108 */ swc1 $f8,0x108($sp) .L0f034c64: /* f034c64: 12200025 */ beqz $s1,.L0f034cfc /* f034c68: 90a30000 */ lbu $v1,0x0($a1) -/* f034c6c: 3c0b800a */ lui $t3,0x800a -/* f034c70: 8d6ba268 */ lw $t3,-0x5d98($t3) -/* f034c74: 3c0d800a */ lui $t5,0x800a +/* f034c6c: 3c0b800a */ lui $t3,%hi(g_Vars+0x2a8) +/* f034c70: 8d6ba268 */ lw $t3,%lo(g_Vars+0x2a8)($t3) +/* f034c74: 3c0d800a */ lui $t5,%hi(g_Vars+0x2a0) /* f034c78: 8d6c00bc */ lw $t4,0xbc($t3) /* f034c7c: 562c0020 */ bnel $s1,$t4,.L0f034d00 /* f034c80: 24010006 */ addiu $at,$zero,0x6 -/* f034c84: 8dada260 */ lw $t5,-0x5da0($t5) +/* f034c84: 8dada260 */ lw $t5,%lo(g_Vars+0x2a0)($t5) /* f034c88: 3c0142c8 */ lui $at,0x42c8 /* f034c8c: 8dae00bc */ lw $t6,0xbc($t5) /* f034c90: 50ae001b */ beql $a1,$t6,.L0f034d00 @@ -7547,17 +7547,17 @@ glabel var7f1a8d98 /* f034cac: 90a30000 */ lbu $v1,0x0($a1) .L0f034cb0: /* f034cb0: 24010006 */ addiu $at,$zero,0x6 -/* f034cb4: 3c18800a */ lui $t8,0x800a +/* f034cb4: 3c18800a */ lui $t8,%hi(g_Vars+0x28c) /* f034cb8: 54610011 */ bnel $v1,$at,.L0f034d00 /* f034cbc: 24010006 */ addiu $at,$zero,0x6 -/* f034cc0: 8f18a24c */ lw $t8,-0x5db4($t8) +/* f034cc0: 8f18a24c */ lw $t8,%lo(g_Vars+0x28c)($t8) /* f034cc4: 00a02025 */ or $a0,$a1,$zero /* f034cc8: 0fc4a25f */ jal propGetPlayerNum /* f034ccc: afb800e8 */ sw $t8,0xe8($sp) /* f034cd0: 0fc4a24b */ jal setCurrentPlayerNum /* f034cd4: 00402025 */ or $a0,$v0,$zero -/* f034cd8: 3c0f800a */ lui $t7,0x800a -/* f034cdc: 8defa248 */ lw $t7,-0x5db8($t7) +/* f034cd8: 3c0f800a */ lui $t7,%hi(g_Vars+0x288) +/* f034cdc: 8defa248 */ lw $t7,%lo(g_Vars+0x288)($t7) /* f034ce0: 8fa400e8 */ lw $a0,0xe8($sp) /* f034ce4: c5f0005c */ lwc1 $f16,0x5c($t7) /* f034ce8: 4610a502 */ mul.s $f20,$f20,$f16 @@ -7569,15 +7569,15 @@ glabel var7f1a8d98 /* f034cfc: 24010006 */ addiu $at,$zero,0x6 .L0f034d00: /* f034d00: 1461001d */ bne $v1,$at,.L0f034d78 -/* f034d04: 3c08800a */ lui $t0,0x800a -/* f034d08: 8d08a24c */ lw $t0,-0x5db4($t0) +/* f034d04: 3c08800a */ lui $t0,%hi(g_Vars+0x28c) +/* f034d08: 8d08a24c */ lw $t0,%lo(g_Vars+0x28c)($t0) /* f034d0c: 00a02025 */ or $a0,$a1,$zero /* f034d10: 0fc4a25f */ jal propGetPlayerNum /* f034d14: afa800e4 */ sw $t0,0xe4($sp) /* f034d18: 0fc4a24b */ jal setCurrentPlayerNum /* f034d1c: 00402025 */ or $a0,$v0,$zero -/* f034d20: 3c04800a */ lui $a0,0x800a -/* f034d24: 8084a24f */ lb $a0,-0x5db1($a0) +/* f034d20: 3c04800a */ lui $a0,%hi(g_Vars+0x28f) +/* f034d24: 8084a24f */ lb $a0,%lo(g_Vars+0x28f)($a0) /* f034d28: 27a500e0 */ addiu $a1,$sp,0xe0 /* f034d2c: 0c0054b4 */ jal func000152d0 /* f034d30: 27a600dc */ addiu $a2,$sp,0xdc @@ -7601,8 +7601,8 @@ glabel var7f1a8d98 /* f034d70: 8fa400e4 */ lw $a0,0xe4($sp) /* f034d74: 8fa50128 */ lw $a1,0x128($sp) .L0f034d78: -/* f034d78: 3c09800a */ lui $t1,0x800a -/* f034d7c: 8d29a2d4 */ lw $t1,-0x5d2c($t1) +/* f034d78: 3c09800a */ lui $t1,%hi(g_Vars+0x314) +/* f034d7c: 8d29a2d4 */ lw $t1,%lo(g_Vars+0x314)($t1) /* f034d80: 1120000e */ beqz $t1,.L0f034dbc /* f034d84: 00000000 */ sll $zero,$zero,0x0 /* f034d88: 12200016 */ beqz $s1,.L0f034de4 @@ -7753,7 +7753,7 @@ glabel var7f1a8d98 /* f034fa8: 44809000 */ mtc1 $zero,$f18 /* f034fac: 46000086 */ mov.s $f2,$f0 /* f034fb0: 10400009 */ beqz $v0,.L0f034fd8 -/* f034fb4: 3c0e800a */ lui $t6,0x800a +/* f034fb4: 3c0e800a */ lui $t6,%hi(g_Vars+0x318) /* f034fb8: 8c4c0004 */ lw $t4,0x4($v0) /* f034fbc: 2401000b */ addiu $at,$zero,0xb /* f034fc0: 918d0047 */ lbu $t5,0x47($t4) @@ -7767,12 +7767,12 @@ glabel var7f1a8d98 /* f034fdc: 00000000 */ sll $zero,$zero,0x0 /* f034fe0: 45020058 */ bc1fl .L0f035144 /* f034fe4: 44804000 */ mtc1 $zero,$f8 -/* f034fe8: 8dcea2d8 */ lw $t6,-0x5d28($t6) -/* f034fec: 3c18800a */ lui $t8,0x800a +/* f034fe8: 8dcea2d8 */ lw $t6,%lo(g_Vars+0x318)($t6) +/* f034fec: 3c18800a */ lui $t8,%hi(g_Vars+0x288) /* f034ff0: 51c0000e */ beqzl $t6,.L0f03502c /* f034ff4: 8e080018 */ lw $t0,0x18($s0) -/* f034ff8: 8f18a248 */ lw $t8,-0x5db8($t8) -/* f034ffc: 3c04800b */ lui $a0,0x800b +/* f034ff8: 8f18a248 */ lw $t8,%lo(g_Vars+0x288)($t8) +/* f034ffc: 3c04800b */ lui $a0,%hi(g_MpPlayers+0x9d) /* f035000: 8f0f0070 */ lw $t7,0x70($t8) /* f035004: e7a20134 */ swc1 $f2,0x134($sp) /* f035008: 000fc880 */ sll $t9,$t7,0x2 @@ -7780,7 +7780,7 @@ glabel var7f1a8d98 /* f035010: 0019c940 */ sll $t9,$t9,0x5 /* f035014: 00992021 */ addu $a0,$a0,$t9 /* f035018: 0fc61ddc */ jal func0f187770 -/* f03501c: 9084c855 */ lbu $a0,-0x37ab($a0) +/* f03501c: 9084c855 */ lbu $a0,%lo(g_MpPlayers+0x9d)($a0) /* f035020: c7a20134 */ lwc1 $f2,0x134($sp) /* f035024: 4600a503 */ div.s $f20,$f20,$f0 /* f035028: 8e080018 */ lw $t0,0x18($s0) @@ -7820,13 +7820,13 @@ glabel var7f1a8d98 /* f0350a4: 00003825 */ or $a3,$zero,$zero /* f0350a8: c7a20134 */ lwc1 $f2,0x134($sp) .L0f0350ac: -/* f0350ac: 3c0d800a */ lui $t5,0x800a -/* f0350b0: 8dada2d8 */ lw $t5,-0x5d28($t5) -/* f0350b4: 3c0e800b */ lui $t6,0x800b +/* f0350ac: 3c0d800a */ lui $t5,%hi(g_Vars+0x318) +/* f0350b0: 8dada2d8 */ lw $t5,%lo(g_Vars+0x318)($t5) +/* f0350b4: 3c0e800b */ lui $t6,%hi(g_MpSetup+0xc) /* f0350b8: c7a60108 */ lwc1 $f6,0x108($sp) /* f0350bc: 51a0000c */ beqzl $t5,.L0f0350f0 /* f0350c0: 4606a003 */ div.s $f0,$f20,$f6 -/* f0350c4: 8dcecb94 */ lw $t6,-0x346c($t6) +/* f0350c4: 8dcecb94 */ lw $t6,%lo(g_MpSetup+0xc)($t6) /* f0350c8: 02002025 */ or $a0,$s0,$zero /* f0350cc: 31d80001 */ andi $t8,$t6,0x1 /* f0350d0: 53000007 */ beqzl $t8,.L0f0350f0 @@ -7934,8 +7934,8 @@ glabel var7f1a8d98 /* f03524c: 5541004c */ bnel $t2,$at,.L0f035380 /* f035250: 8e0e0018 */ lw $t6,0x18($s0) /* f035254: 15600049 */ bnez $t3,.L0f03537c -/* f035258: 3c0e800a */ lui $t6,0x800a -/* f03525c: 8dcea24c */ lw $t6,-0x5db4($t6) +/* f035258: 3c0e800a */ lui $t6,%hi(g_Vars+0x28c) +/* f03525c: 8dcea24c */ lw $t6,%lo(g_Vars+0x28c)($t6) /* f035260: afa000bc */ sw $zero,0xbc($sp) /* f035264: 02202025 */ or $a0,$s1,$zero /* f035268: 0fc4a25f */ jal propGetPlayerNum @@ -7959,9 +7959,9 @@ glabel var7f1a8d98 /* f0352ac: 0fc4a25f */ jal propGetPlayerNum /* f0352b0: 03002025 */ or $a0,$t8,$zero /* f0352b4: 0002c880 */ sll $t9,$v0,0x2 -/* f0352b8: 3c08800a */ lui $t0,0x800a +/* f0352b8: 3c08800a */ lui $t0,%hi(g_Vars+0x64) /* f0352bc: 01194021 */ addu $t0,$t0,$t9 -/* f0352c0: 8d08a024 */ lw $t0,-0x5fdc($t0) +/* f0352c0: 8d08a024 */ lw $t0,%lo(g_Vars+0x64)($t0) /* f0352c4: 240a0001 */ addiu $t2,$zero,0x1 /* f0352c8: 8d0900d8 */ lw $t1,0xd8($t0) /* f0352cc: 51200003 */ beqzl $t1,.L0f0352dc @@ -8285,34 +8285,34 @@ glabel var7f1a8d98 /* f035744: 8fad0128 */ lw $t5,0x128($sp) .L0f035748: /* f035748: 24010006 */ addiu $at,$zero,0x6 -/* f03574c: 3c18800a */ lui $t8,0x800a +/* f03574c: 3c18800a */ lui $t8,%hi(g_Vars+0x28c) /* f035750: 91af0000 */ lbu $t7,0x0($t5) /* f035754: 55e100f7 */ bnel $t7,$at,.L0f035b34 /* f035758: 82020007 */ lb $v0,0x7($s0) -/* f03575c: 8f18a24c */ lw $t8,-0x5db4($t8) +/* f03575c: 8f18a24c */ lw $t8,%lo(g_Vars+0x28c)($t8) /* f035760: 01a02025 */ or $a0,$t5,$zero /* f035764: 0fc4a25f */ jal propGetPlayerNum /* f035768: afb80094 */ sw $t8,0x94($sp) /* f03576c: 0fc4a24b */ jal setCurrentPlayerNum /* f035770: 00402025 */ or $a0,$v0,$zero -/* f035774: 3c19800a */ lui $t9,0x800a -/* f035778: 8f39a2d8 */ lw $t9,-0x5d28($t9) -/* f03577c: 3c09800a */ lui $t1,0x800a +/* f035774: 3c19800a */ lui $t9,%hi(g_Vars+0x318) +/* f035778: 8f39a2d8 */ lw $t9,%lo(g_Vars+0x318)($t9) +/* f03577c: 3c09800a */ lui $t1,%hi(g_Vars+0x288) /* f035780: 1320000b */ beqz $t9,.L0f0357b0 /* f035784: 00000000 */ sll $zero,$zero,0x0 -/* f035788: 8d29a248 */ lw $t1,-0x5db8($t1) -/* f03578c: 3c04800b */ lui $a0,0x800b +/* f035788: 8d29a248 */ lw $t1,%lo(g_Vars+0x288)($t1) +/* f03578c: 3c04800b */ lui $a0,%hi(g_MpPlayers+0x9d) /* f035790: 8d280070 */ lw $t0,0x70($t1) /* f035794: 00085080 */ sll $t2,$t0,0x2 /* f035798: 01485021 */ addu $t2,$t2,$t0 /* f03579c: 000a5140 */ sll $t2,$t2,0x5 /* f0357a0: 008a2021 */ addu $a0,$a0,$t2 /* f0357a4: 0fc61ddc */ jal func0f187770 -/* f0357a8: 9084c855 */ lbu $a0,-0x37ab($a0) +/* f0357a8: 9084c855 */ lbu $a0,%lo(g_MpPlayers+0x9d)($a0) /* f0357ac: 4600a503 */ div.s $f20,$f20,$f0 .L0f0357b0: -/* f0357b0: 3c0b800a */ lui $t3,0x800a -/* f0357b4: 8d6ba244 */ lw $t3,-0x5dbc($t3) +/* f0357b0: 3c0b800a */ lui $t3,%hi(g_Vars+0x284) +/* f0357b4: 8d6ba244 */ lw $t3,%lo(g_Vars+0x284)($t3) /* f0357b8: 3c0c8007 */ lui $t4,%hi(g_PlayerInvincible) /* f0357bc: 8d6e00d8 */ lw $t6,0xd8($t3) /* f0357c0: 15c000d7 */ bnez $t6,.L0f035b20 @@ -8329,10 +8329,10 @@ glabel var7f1a8d98 /* f0357ec: 02202025 */ or $a0,$s1,$zero /* f0357f0: 8faf0130 */ lw $t7,0x130($sp) .L0f0357f4: -/* f0357f4: 3c18800a */ lui $t8,0x800a +/* f0357f4: 3c18800a */ lui $t8,%hi(g_Vars+0x284) /* f0357f8: 11e00032 */ beqz $t7,.L0f0358c4 /* f0357fc: 00000000 */ sll $zero,$zero,0x0 -/* f035800: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f035800: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f035804: 3c013f80 */ lui $at,0x3f80 /* f035808: 930d1922 */ lbu $t5,0x1922($t8) /* f03580c: 15a0002d */ bnez $t5,.L0f0358c4 @@ -8385,14 +8385,14 @@ glabel var7f1a8d98 /* f0358bc: a60e02d8 */ sh $t6,0x2d8($s0) /* f0358c0: a20002ff */ sb $zero,0x2ff($s0) .L0f0358c4: -/* f0358c4: 3c02800a */ lui $v0,0x800a -/* f0358c8: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0358c4: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0358c8: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0358cc: 904c1922 */ lbu $t4,0x1922($v0) /* f0358d0: 55800059 */ bnezl $t4,.L0f035a38 /* f0358d4: 8fb9012c */ lw $t9,0x12c($sp) /* f0358d8: 44803000 */ mtc1 $zero,$f6 /* f0358dc: 3c013e00 */ lui $at,0x3e00 -/* f0358e0: 3c0f800a */ lui $t7,0x800a +/* f0358e0: 3c0f800a */ lui $t7,%hi(g_Vars+0x318) /* f0358e4: 4614303c */ c.lt.s $f6,$f20 /* f0358e8: 02202025 */ or $a0,$s1,$zero /* f0358ec: 8fa50128 */ lw $a1,0x128($sp) @@ -8407,11 +8407,11 @@ glabel var7f1a8d98 /* f035910: 00000000 */ sll $zero,$zero,0x0 /* f035914: 46000086 */ mov.s $f2,$f0 .L0f035918: -/* f035918: 8defa2d8 */ lw $t7,-0x5d28($t7) -/* f03591c: 3c18800b */ lui $t8,0x800b +/* f035918: 8defa2d8 */ lw $t7,%lo(g_Vars+0x318)($t7) +/* f03591c: 3c18800b */ lui $t8,%hi(g_MpSetup+0xc) /* f035920: 51e00007 */ beqzl $t7,.L0f035940 /* f035924: 44061000 */ mfc1 $a2,$f2 -/* f035928: 8f18cb94 */ lw $t8,-0x346c($t8) +/* f035928: 8f18cb94 */ lw $t8,%lo(g_MpSetup+0xc)($t8) /* f03592c: 330d0001 */ andi $t5,$t8,0x1 /* f035930: 51a00003 */ beqzl $t5,.L0f035940 /* f035934: 44061000 */ mfc1 $a2,$f2 @@ -8422,24 +8422,24 @@ glabel var7f1a8d98 /* f035944: e7ac005c */ swc1 $f12,0x5c($sp) /* f035948: 0fc2eda7 */ jal func0f0bb69c /* f03594c: 00000000 */ sll $zero,$zero,0x0 -/* f035950: 3c19800a */ lui $t9,0x800a -/* f035954: 8f39a2d8 */ lw $t9,-0x5d28($t9) +/* f035950: 3c19800a */ lui $t9,%hi(g_Vars+0x318) +/* f035954: 8f39a2d8 */ lw $t9,%lo(g_Vars+0x318)($t9) /* f035958: c7ac005c */ lwc1 $f12,0x5c($sp) -/* f03595c: 3c09800b */ lui $t1,0x800b +/* f03595c: 3c09800b */ lui $t1,%hi(g_MpSetup+0xc) /* f035960: 5320000a */ beqzl $t9,.L0f03598c /* f035964: c7b0010c */ lwc1 $f16,0x10c($sp) -/* f035968: 8d29cb94 */ lw $t1,-0x346c($t1) -/* f03596c: 3c0a800a */ lui $t2,0x800a +/* f035968: 8d29cb94 */ lw $t1,%lo(g_MpSetup+0xc)($t1) +/* f03596c: 3c0a800a */ lui $t2,%hi(g_Vars+0x284) /* f035970: 31280001 */ andi $t0,$t1,0x1 /* f035974: 51000005 */ beqzl $t0,.L0f03598c /* f035978: c7b0010c */ lwc1 $f16,0x10c($sp) /* f03597c: 44809000 */ mtc1 $zero,$f18 -/* f035980: 8d4aa244 */ lw $t2,-0x5dbc($t2) +/* f035980: 8d4aa244 */ lw $t2,%lo(g_Vars+0x284)($t2) /* f035984: e55200dc */ swc1 $f18,0xdc($t2) /* f035988: c7b0010c */ lwc1 $f16,0x10c($sp) .L0f03598c: -/* f03598c: 3c02800a */ lui $v0,0x800a -/* f035990: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f03598c: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f035990: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f035994: 46106103 */ div.s $f4,$f12,$f16 /* f035998: c44a00dc */ lwc1 $f10,0xdc($v0) /* f03599c: 46045181 */ sub.s $f6,$f10,$f4 @@ -8451,8 +8451,8 @@ glabel var7f1a8d98 .L0f0359b4: /* f0359b4: ae000350 */ sw $zero,0x350($s0) .L0f0359b8: -/* f0359b8: 3c02800a */ lui $v0,0x800a -/* f0359bc: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0359b8: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0359bc: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0359c0: 240e0001 */ addiu $t6,$zero,0x1 /* f0359c4: afae0118 */ sw $t6,0x118($sp) /* f0359c8: 8c4c1c08 */ lw $t4,0x1c08($v0) @@ -8482,12 +8482,12 @@ glabel var7f1a8d98 .L0f035a24: /* f035a24: 0fc084cf */ jal func0f02133c /* f035a28: 02002025 */ or $a0,$s0,$zero -/* f035a2c: 3c02800a */ lui $v0,0x800a -/* f035a30: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f035a2c: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f035a30: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f035a34: 8fb9012c */ lw $t9,0x12c($sp) .L0f035a38: /* f035a38: 8fa9014c */ lw $t1,0x14c($sp) -/* f035a3c: 3c0a800a */ lui $t2,0x800a +/* f035a3c: 3c0a800a */ lui $t2,%hi(g_Vars+0x318) /* f035a40: 13200007 */ beqz $t9,.L0f035a60 /* f035a44: 8fa30148 */ lw $v1,0x148($sp) /* f035a48: 91280000 */ lbu $t0,0x0($t1) @@ -8497,7 +8497,7 @@ glabel var7f1a8d98 /* f035a58: 1000000b */ beqz $zero,.L0f035a88 /* f035a5c: c4208d90 */ lwc1 $f0,%lo(var7f1a8d90)($at) .L0f035a60: -/* f035a60: 8d4aa2d8 */ lw $t2,-0x5d28($t2) +/* f035a60: 8d4aa2d8 */ lw $t2,%lo(g_Vars+0x318)($t2) /* f035a64: 3c013f80 */ lui $at,0x3f80 /* f035a68: 51400006 */ beqzl $t2,.L0f035a84 /* f035a6c: 44810000 */ mtc1 $at,$f0 @@ -8516,8 +8516,8 @@ glabel var7f1a8d98 /* f035a94: 46048180 */ add.s $f6,$f16,$f4 /* f035a98: e446017c */ swc1 $f6,0x17c($v0) /* f035a9c: c4720008 */ lwc1 $f18,0x8($v1) -/* f035aa0: 3c02800a */ lui $v0,0x800a -/* f035aa4: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f035aa0: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f035aa4: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f035aa8: 46009282 */ mul.s $f10,$f18,$f0 /* f035aac: c4480184 */ lwc1 $f8,0x184($v0) /* f035ab0: 460a4400 */ add.s $f16,$f8,$f10 @@ -8536,8 +8536,8 @@ glabel var7f1a8d98 /* f035ae0: 00000000 */ sll $zero,$zero,0x0 /* f035ae4: 8fa30148 */ lw $v1,0x148($sp) .L0f035ae8: -/* f035ae8: 3c0c800a */ lui $t4,0x800a -/* f035aec: 8d8ca2d8 */ lw $t4,-0x5d28($t4) +/* f035ae8: 3c0c800a */ lui $t4,%hi(g_Vars+0x318) +/* f035aec: 8d8ca2d8 */ lw $t4,%lo(g_Vars+0x318)($t4) /* f035af0: 1180000b */ beqz $t4,.L0f035b20 /* f035af4: 00000000 */ sll $zero,$zero,0x0 /* f035af8: 12200009 */ beqz $s1,.L0f035b20 @@ -8610,12 +8610,12 @@ glabel var7f1a8d98 /* f035bec: c6040100 */ lwc1 $f4,0x100($s0) .L0f035bf0: /* f035bf0: c6060104 */ lwc1 $f6,0x104($s0) -/* f035bf4: 3c0c800a */ lui $t4,0x800a +/* f035bf4: 3c0c800a */ lui $t4,%hi(g_Vars+0x318) /* f035bf8: 4606203c */ c.lt.s $f4,$f6 /* f035bfc: 00000000 */ sll $zero,$zero,0x0 /* f035c00: 45030009 */ bc1tl .L0f035c28 /* f035c04: 44809000 */ mtc1 $zero,$f18 -/* f035c08: 8d8ca2d8 */ lw $t4,-0x5d28($t4) +/* f035c08: 8d8ca2d8 */ lw $t4,%lo(g_Vars+0x318)($t4) /* f035c0c: 558001cd */ bnezl $t4,.L0f036344 /* f035c10: 8fbf0054 */ lw $ra,0x54($sp) /* f035c14: 820f0007 */ lb $t7,0x7($s0) @@ -8750,12 +8750,12 @@ glabel var7f1a8d98 .L0f035dec: /* f035dec: 44802000 */ mtc1 $zero,$f4 .L0f035df0: -/* f035df0: 3c0b800a */ lui $t3,0x800a +/* f035df0: 3c0b800a */ lui $t3,%hi(g_Vars+0x318) /* f035df4: 4614203c */ c.lt.s $f4,$f20 /* f035df8: 00000000 */ sll $zero,$zero,0x0 /* f035dfc: 45020151 */ bc1fl .L0f036344 /* f035e00: 8fbf0054 */ lw $ra,0x54($sp) -/* f035e04: 8d6ba2d8 */ lw $t3,-0x5d28($t3) +/* f035e04: 8d6ba2d8 */ lw $t3,%lo(g_Vars+0x318)($t3) /* f035e08: 8fae0130 */ lw $t6,0x130($sp) /* f035e0c: 3c013e00 */ lui $at,0x3e00 /* f035e10: 55600006 */ bnezl $t3,.L0f035e2c @@ -8784,7 +8784,7 @@ glabel var7f1a8d98 /* f035e60: 0fc0d120 */ jal func0f034480 /* f035e64: 00000000 */ sll $zero,$zero,0x0 /* f035e68: c60a0100 */ lwc1 $f10,0x100($s0) -/* f035e6c: 3c09800a */ lui $t1,0x800a +/* f035e6c: 3c09800a */ lui $t1,%hi(g_Vars+0x318) /* f035e70: 46145200 */ add.s $f8,$f10,$f20 /* f035e74: 12200004 */ beqz $s1,.L0f035e88 /* f035e78: e6080100 */ swc1 $f8,0x100($s0) @@ -8799,12 +8799,12 @@ glabel var7f1a8d98 /* f035e94: 370d0100 */ ori $t5,$t8,0x100 /* f035e98: 1320001e */ beqz $t9,.L0f035f14 /* f035e9c: ae0d0018 */ sw $t5,0x18($s0) -/* f035ea0: 8d29a2d8 */ lw $t1,-0x5d28($t1) -/* f035ea4: 3c08800b */ lui $t0,0x800b +/* f035ea0: 8d29a2d8 */ lw $t1,%lo(g_Vars+0x318)($t1) +/* f035ea4: 3c08800b */ lui $t0,%hi(g_MpSetup+0xc) /* f035ea8: 02002025 */ or $a0,$s0,$zero /* f035eac: 51200008 */ beqzl $t1,.L0f035ed0 /* f035eb0: 8fab00f4 */ lw $t3,0xf4($sp) -/* f035eb4: 8d08cb94 */ lw $t0,-0x346c($t0) +/* f035eb4: 8d08cb94 */ lw $t0,%lo(g_MpSetup+0xc)($t0) /* f035eb8: 310a0001 */ andi $t2,$t0,0x1 /* f035ebc: 51400004 */ beqzl $t2,.L0f035ed0 /* f035ec0: 8fab00f4 */ lw $t3,0xf4($sp) @@ -8876,8 +8876,8 @@ glabel var7f1a8d98 /* f035fb0: 0fc0ce38 */ jal func0f0338e0 /* f035fb4: 8fa500ec */ lw $a1,0xec($sp) .L0f035fb8: -/* f035fb8: 3c19800a */ lui $t9,0x800a -/* f035fbc: 8f39a2d4 */ lw $t9,-0x5d2c($t9) +/* f035fb8: 3c19800a */ lui $t9,%hi(g_Vars+0x314) +/* f035fbc: 8f39a2d4 */ lw $t9,%lo(g_Vars+0x314)($t9) /* f035fc0: 13200008 */ beqz $t9,.L0f035fe4 /* f035fc4: 00000000 */ sll $zero,$zero,0x0 /* f035fc8: 0fc633fe */ jal mpPlayerGetIndex @@ -8892,10 +8892,10 @@ glabel var7f1a8d98 /* f035fe8: 8e0a0018 */ lw $t2,0x18($s0) /* f035fec: 92290000 */ lbu $t1,0x0($s1) /* f035ff0: 24010006 */ addiu $at,$zero,0x6 -/* f035ff4: 3c08800a */ lui $t0,0x800a +/* f035ff4: 3c08800a */ lui $t0,%hi(g_Vars+0x28c) /* f035ff8: 5521000c */ bnel $t1,$at,.L0f03602c /* f035ffc: 8e0a0018 */ lw $t2,0x18($s0) -/* f036000: 8d08a24c */ lw $t0,-0x5db4($t0) +/* f036000: 8d08a24c */ lw $t0,%lo(g_Vars+0x28c)($t0) /* f036004: 02202025 */ or $a0,$s1,$zero /* f036008: 0fc4a25f */ jal propGetPlayerNum /* f03600c: afa80074 */ sw $t0,0x74($sp) @@ -9787,8 +9787,8 @@ glabel func0f036c08 /* f036d2c: 2404ffff */ addiu $a0,$zero,-1 /* f036d30: 108f0012 */ beq $a0,$t7,.L0f036d7c /* f036d34: 27a2007c */ addiu $v0,$sp,0x7c -/* f036d38: 3c05800a */ lui $a1,%hi(var800a0008) -/* f036d3c: 8ca54928 */ lw $a1,0x4928($a1) +/* f036d38: 3c05800a */ lui $a1,%hi(g_RoomPtrs) +/* f036d3c: 8ca54928 */ lw $a1,%lo(g_RoomPtrs)($a1) /* f036d40: 84430000 */ lh $v1,0x0($v0) /* f036d44: 2406008c */ addiu $a2,$zero,0x8c .L0f036d48: @@ -9855,7 +9855,7 @@ glabel func0f036c08 /* f036e18: afa00010 */ sw $zero,0x10($sp) /* f036e1c: 02203825 */ or $a3,$s1,$zero /* f036e20: 0c006052 */ jal func00018148 -/* f036e24: 24a50008 */ addiu $a1,$a1,%lo(var800a0008) +/* f036e24: 24a50008 */ addiu $a1,$a1,8 /* f036e28: 8e0d0064 */ lw $t5,0x64($s0) /* f036e2c: 02202825 */ or $a1,$s1,$zero /* f036e30: 8da400bc */ lw $a0,0xbc($t5) @@ -10167,13 +10167,13 @@ glabel func0f037224 /* f03724c: 50410023 */ beql $v0,$at,.L0f0372dc /* f037250: 8fbf0014 */ lw $ra,0x14($sp) /* f037254: 94820066 */ lhu $v0,0x66($a0) -/* f037258: 3c03800a */ lui $v1,%hi(var800a012c) +/* f037258: 3c03800a */ lui $v1,%hi(g_MenuStack+0x212c) /* f03725c: 1440000c */ bnez $v0,.L0f037290 /* f037260: 00000000 */ sll $zero,$zero,0x0 /* f037264: 0fc0dc49 */ jal func0f037124 /* f037268: afa40018 */ sw $a0,0x18($sp) /* f03726c: 00021840 */ sll $v1,$v0,0x1 -/* f037270: 2465012c */ addiu $a1,$v1,%lo(var800a012c) +/* f037270: 2465012c */ addiu $a1,$v1,%lo(g_MenuStack+0x212c) /* f037274: 3c010001 */ lui $at,0x1 /* f037278: 00a1082a */ slt $at,$a1,$at /* f03727c: 14200002 */ bnez $at,.L0f037288 @@ -10253,10 +10253,10 @@ glabel func0f03733c /* f037368: 020fc021 */ addu $t8,$s0,$t7 /* f03736c: 8f19004c */ lw $t9,0x4c($t8) /* f037370: 24080001 */ addiu $t0,$zero,0x1 -/* f037374: 3c09800a */ lui $t1,0x800a +/* f037374: 3c09800a */ lui $t1,%hi(g_Vars+0x8) /* f037378: afb90024 */ sw $t9,0x24($sp) /* f03737c: a2080064 */ sb $t0,0x64($s0) -/* f037380: 8d299fc8 */ lw $t1,-0x6038($t1) +/* f037380: 8d299fc8 */ lw $t1,%lo(g_Vars+0x8)($t1) /* f037384: 860c0000 */ lh $t4,0x0($s0) /* f037388: 00095243 */ sra $t2,$t1,0x9 /* f03738c: 000a59c0 */ sll $t3,$t2,0x7 @@ -10451,11 +10451,11 @@ glabel var7f1a8dac /* f0375f8: afa60130 */ sw $a2,0x130($sp) /* f0375fc: afa70134 */ sw $a3,0x134($sp) /* f037600: 8c8e001c */ lw $t6,0x1c($a0) -/* f037604: 3c0f800a */ lui $t7,0x800a +/* f037604: 3c0f800a */ lui $t7,%hi(g_Vars+0x8) /* f037608: 00808025 */ or $s0,$a0,$zero /* f03760c: afae00f0 */ sw $t6,0xf0($sp) /* f037610: a0800009 */ sb $zero,0x9($a0) -/* f037614: 8def9fc8 */ lw $t7,-0x6038($t7) +/* f037614: 8def9fc8 */ lw $t7,%lo(g_Vars+0x8)($t7) /* f037618: ac8f00d8 */ sw $t7,0xd8($a0) /* f03761c: 0c0074a2 */ jal func0001d288 /* f037620: 8c840020 */ lw $a0,0x20($a0) @@ -10669,21 +10669,21 @@ glabel var7f1a8dac .L0f037944: /* f037944: 8fa2012c */ lw $v0,0x12c($sp) /* f037948: 2401000e */ addiu $at,$zero,0xe -/* f03794c: 3c19800a */ lui $t9,0x800a +/* f03794c: 3c19800a */ lui $t9,%hi(g_Vars+0x8) /* f037950: c44a003c */ lwc1 $f10,0x3c($v0) -/* f037954: 3c09800a */ lui $t1,0x800a +/* f037954: 3c09800a */ lui $t1,%hi(g_Vars+0x8) /* f037958: e44a0038 */ swc1 $f10,0x38($v0) /* f03795c: 82180007 */ lb $t8,0x7($s0) /* f037960: 17010007 */ bne $t8,$at,.L0f037980 /* f037964: 00000000 */ sll $zero,$zero,0x0 -/* f037968: 8f399fc8 */ lw $t9,-0x6038($t9) +/* f037968: 8f399fc8 */ lw $t9,%lo(g_Vars+0x8)($t9) /* f03796c: 02002025 */ or $a0,$s0,$zero /* f037970: 0fc0dd60 */ jal func0f037580 /* f037974: ae190078 */ sw $t9,0x78($s0) /* f037978: 10000006 */ beqz $zero,.L0f037994 /* f03797c: 02002025 */ or $a0,$s0,$zero .L0f037980: -/* f037980: 8d299fc8 */ lw $t1,-0x6038($t1) +/* f037980: 8d299fc8 */ lw $t1,%lo(g_Vars+0x8)($t1) /* f037984: 02002025 */ or $a0,$s0,$zero /* f037988: 0fc0dcba */ jal func0f0372e8 /* f03798c: ae0900a8 */ sw $t1,0xa8($s0) @@ -11291,12 +11291,12 @@ glabel var7f1a8dcc /* f0381a4: 10410003 */ beq $v0,$at,.L0f0381b4 /* f0381a8: 2401000e */ addiu $at,$zero,0xe /* f0381ac: 14410003 */ bne $v0,$at,.L0f0381bc -/* f0381b0: 3c04800a */ lui $a0,0x800a +/* f0381b0: 3c04800a */ lui $a0,%hi(g_Vars+0x4b4) .L0f0381b4: /* f0381b4: 10000076 */ beqz $zero,.L0f038390 /* f0381b8: 24090001 */ addiu $t1,$zero,0x1 .L0f0381bc: -/* f0381bc: 8c84a474 */ lw $a0,-0x5b8c($a0) +/* f0381bc: 8c84a474 */ lw $a0,%lo(g_Vars+0x4b4)($a0) /* f0381c0: afa90054 */ sw $t1,0x54($sp) /* f0381c4: 0fc59585 */ jal stageGetIndex /* f0381c8: e7a20040 */ swc1 $f2,0x40($sp) @@ -11574,8 +11574,8 @@ glabel chrGoToPos /* f03857c: 51600017 */ beqzl $t3,.L0f0385dc /* f038580: 8fb80034 */ lw $t8,0x34($sp) /* f038584: 10400014 */ beqz $v0,.L0f0385d8 -/* f038588: 3c19800a */ lui $t9,0x800a -/* f03858c: 8f399fc8 */ lw $t9,-0x6038($t9) +/* f038588: 3c19800a */ lui $t9,%hi(g_Vars+0x8) +/* f03858c: 8f399fc8 */ lw $t9,%lo(g_Vars+0x8)($t9) /* f038590: 860e0000 */ lh $t6,0x0($s0) /* f038594: afaa0030 */ sw $t2,0x30($sp) /* f038598: 00196243 */ sra $t4,$t9,0x9 @@ -11684,13 +11684,13 @@ glabel chrGoToPos /* f03871c: 27a6004c */ addiu $a2,$sp,0x4c /* f038720: 8fac0048 */ lw $t4,0x48($sp) /* f038724: 8faa0030 */ lw $t2,0x30($sp) -/* f038728: 3c0e800a */ lui $t6,0x800a +/* f038728: 3c0e800a */ lui $t6,%hi(g_Vars+0x318) /* f03872c: 11800003 */ beqz $t4,.L0f03873c /* f038730: 00000000 */ sll $zero,$zero,0x0 /* f038734: 51400017 */ beqzl $t2,.L0f038794 /* f038738: 820c0068 */ lb $t4,0x68($s0) .L0f03873c: -/* f03873c: 8dcea2d8 */ lw $t6,-0x5d28($t6) +/* f03873c: 8dcea2d8 */ lw $t6,%lo(g_Vars+0x318)($t6) /* f038740: 8fad008c */ lw $t5,0x8c($sp) /* f038744: 55c00013 */ bnezl $t6,.L0f038794 /* f038748: 820c0068 */ lb $t4,0x68($s0) @@ -12304,8 +12304,8 @@ glabel var7f1a8dd0 /* f038e34: 02602025 */ or $a0,$s3,$zero /* f038e38: 0fc0dd58 */ jal func0f037560 /* f038e3c: a2790333 */ sb $t9,0x333($s3) -/* f038e40: 3c08800a */ lui $t0,0x800a -/* f038e44: 8d08a2d8 */ lw $t0,-0x5d28($t0) +/* f038e40: 3c08800a */ lui $t0,%hi(g_Vars+0x318) +/* f038e44: 8d08a2d8 */ lw $t0,%lo(g_Vars+0x318)($t0) /* f038e48: 55000014 */ bnezl $t0,.L0f038e9c /* f038e4c: 826e0068 */ lb $t6,0x68($s3) /* f038e50: 8e69001c */ lw $t1,0x1c($s3) @@ -12440,8 +12440,8 @@ glabel func0f038f40 /* f039014: 24010006 */ addiu $at,$zero,0x6 /* f039018: 00402025 */ or $a0,$v0,$zero /* f03901c: 15810003 */ bne $t4,$at,.L0f03902c -/* f039020: 3c0d800a */ lui $t5,0x800a -/* f039024: 8dada2e4 */ lw $t5,-0x5d1c($t5) +/* f039020: 3c0d800a */ lui $t5,%hi(g_Vars+0x324) +/* f039024: 8dada2e4 */ lw $t5,%lo(g_Vars+0x324)($t5) /* f039028: 11a00068 */ beqz $t5,.L0f0391cc .L0f03902c: /* f03902c: 00002825 */ or $a1,$zero,$zero @@ -13520,8 +13520,8 @@ glabel func0f039e28 /* f039e5c: 0fc0e686 */ jal func0f039a18 /* f039e60: 02202025 */ or $a0,$s1,$zero /* f039e64: 10400053 */ beqz $v0,.L0f039fb4 -/* f039e68: 3c0e800a */ lui $t6,0x800a -/* f039e6c: 8dce9fc8 */ lw $t6,-0x6038($t6) +/* f039e68: 3c0e800a */ lui $t6,%hi(g_Vars+0x8) +/* f039e6c: 8dce9fc8 */ lw $t6,%lo(g_Vars+0x8)($t6) /* f039e70: 8e2f00d4 */ lw $t7,0xd4($s1) /* f039e74: 01cfc023 */ subu $t8,$t6,$t7 /* f039e78: 2b0100b5 */ slti $at,$t8,0xb5 @@ -13668,8 +13668,8 @@ glabel var7f1a8eb8 /* f03a06c: 10400027 */ beqz $v0,.L0f03a10c /* f03a070: 8fa30020 */ lw $v1,0x20($sp) .L0f03a074: -/* f03a074: 3c18800a */ lui $t8,0x800a -/* f03a078: 8f189fc8 */ lw $t8,-0x6038($t8) +/* f03a074: 3c18800a */ lui $t8,%hi(g_Vars+0x8) +/* f03a078: 8f189fc8 */ lw $t8,%lo(g_Vars+0x8)($t8) /* f03a07c: 8e1900d4 */ lw $t9,0xd4($s0) /* f03a080: 02002025 */ or $a0,$s0,$zero /* f03a084: 03194023 */ subu $t0,$t8,$t9 @@ -13769,8 +13769,8 @@ glabel var7f1a8ebc /* f03a1c4: 10400027 */ beqz $v0,.L0f03a264 /* f03a1c8: 8fa30020 */ lw $v1,0x20($sp) .L0f03a1cc: -/* f03a1cc: 3c18800a */ lui $t8,0x800a -/* f03a1d0: 8f189fc8 */ lw $t8,-0x6038($t8) +/* f03a1cc: 3c18800a */ lui $t8,%hi(g_Vars+0x8) +/* f03a1d0: 8f189fc8 */ lw $t8,%lo(g_Vars+0x8)($t8) /* f03a1d4: 8e1900d4 */ lw $t9,0xd4($s0) /* f03a1d8: 02002025 */ or $a0,$s0,$zero /* f03a1dc: 03194023 */ subu $t0,$t8,$t9 @@ -14361,7 +14361,7 @@ glabel var7f1a8ec8 /* f03acd0: 46006301 */ sub.s $f12,$f12,$f0 .L0f03acd4: /* f03acd4: 44802000 */ mtc1 $zero,$f4 -/* f03acd8: 3c04800a */ lui $a0,0x800a +/* f03acd8: 3c04800a */ lui $a0,%hi(g_Vars+0x424) /* f03acdc: 2405090a */ addiu $a1,$zero,0x90a /* f03ace0: 4604603c */ c.lt.s $f12,$f4 /* f03ace4: 00003025 */ or $a2,$zero,$zero @@ -14369,7 +14369,7 @@ glabel var7f1a8ec8 /* f03acec: 45020009 */ bc1fl .L0f03ad14 /* f03acf0: 44817000 */ mtc1 $at,$f14 /* f03acf4: 0fc12e8d */ jal func0f04ba34 -/* f03acf8: 8c84a3e4 */ lw $a0,-0x5c1c($a0) +/* f03acf8: 8c84a3e4 */ lw $a0,%lo(g_Vars+0x424)($a0) /* f03acfc: 02002025 */ or $a0,$s0,$zero /* f03ad00: 0fc1309a */ jal chrGoToCover /* f03ad04: 24050002 */ addiu $a1,$zero,0x2 @@ -14395,8 +14395,8 @@ glabel var7f1a8ec8 /* f03ad4c: 0fc12fff */ jal func0f04bffc /* f03ad50: 00000000 */ sll $zero,$zero,0x0 /* f03ad54: 14400005 */ bnez $v0,.L0f03ad6c -/* f03ad58: 3c04800a */ lui $a0,0x800a -/* f03ad5c: 8c84a3e4 */ lw $a0,-0x5c1c($a0) +/* f03ad58: 3c04800a */ lui $a0,%hi(g_Vars+0x424) +/* f03ad5c: 8c84a3e4 */ lw $a0,%lo(g_Vars+0x424)($a0) /* f03ad60: 2405090a */ addiu $a1,$zero,0x90a /* f03ad64: 0fc12e8d */ jal func0f04ba34 /* f03ad68: 00003025 */ or $a2,$zero,$zero @@ -14699,8 +14699,8 @@ glabel var7f1a8ed4 /* f03b2b0: 00009025 */ or $s2,$zero,$zero /* f03b2b4: 87ab00a0 */ lh $t3,0xa0($sp) .L0f03b2b8: -/* f03b2b8: 3c08800a */ lui $t0,0x800a -/* f03b2bc: 8d08a2f8 */ lw $t0,-0x5d08($t0) +/* f03b2b8: 3c08800a */ lui $t0,%hi(g_Vars+0x338) +/* f03b2bc: 8d08a2f8 */ lw $t0,%lo(g_Vars+0x338)($t0) /* f03b2c0: 024b6021 */ addu $t4,$s2,$t3 /* f03b2c4: 0191001a */ div $zero,$t4,$s1 /* f03b2c8: 00006810 */ mfhi $t5 @@ -14876,8 +14876,8 @@ glabel var7f1a8ed4 /* f03b554: 02403025 */ or $a2,$s2,$zero /* f03b558: 0fc0e10f */ jal chrGoToPos /* f03b55c: 02203825 */ or $a3,$s1,$zero -/* f03b560: 3c0e800a */ lui $t6,0x800a -/* f03b564: 8dcea2f8 */ lw $t6,-0x5d08($t6) +/* f03b560: 3c0e800a */ lui $t6,%hi(g_Vars+0x338) +/* f03b564: 8dcea2f8 */ lw $t6,%lo(g_Vars+0x338)($t6) /* f03b568: 24010048 */ addiu $at,$zero,0x48 /* f03b56c: 8fb902b8 */ lw $t9,0x2b8($sp) /* f03b570: 020e7823 */ subu $t7,$s0,$t6 @@ -15403,10 +15403,10 @@ glabel var7f1a8ed8 .L0f03be94: /* f03be94: a2020040 */ sb $v0,0x40($s0) /* f03be98: 846f0008 */ lh $t7,0x8($v1) -/* f03be9c: 3c19800a */ lui $t9,0x800a +/* f03be9c: 3c19800a */ lui $t9,%hi(g_Vars+0x318) /* f03bea0: 02002025 */ or $a0,$s0,$zero /* f03bea4: a60f0042 */ sh $t7,0x42($s0) -/* f03bea8: 8f39a2d8 */ lw $t9,-0x5d28($t9) +/* f03bea8: 8f39a2d8 */ lw $t9,%lo(g_Vars+0x318)($t9) /* f03beac: 24050080 */ addiu $a1,$zero,0x80 /* f03beb0: 24060001 */ addiu $a2,$zero,0x1 /* f03beb4: 13200003 */ beqz $t9,.L0f03bec4 @@ -16596,14 +16596,14 @@ glabel chrTickDruggedComingUp /* f03d844: adc10008 */ sw $at,0x8($t6) /* f03d848: 8de10010 */ lw $at,0x10($t7) /* f03d84c: adc9000c */ sw $t1,0xc($t6) -/* f03d850: 3c0b800a */ lui $t3,0x800a +/* f03d850: 3c0b800a */ lui $t3,%hi(g_Vars+0x38) /* f03d854: adc10010 */ sw $at,0x10($t6) /* f03d858: 95e10014 */ lhu $at,0x14($t7) /* f03d85c: 0080f025 */ or $s8,$a0,$zero /* f03d860: 00009825 */ or $s3,$zero,$zero /* f03d864: a5c10014 */ sh $at,0x14($t6) /* f03d868: 848a002c */ lh $t2,0x2c($a0) -/* f03d86c: 8d6b9ff8 */ lw $t3,-0x6008($t3) +/* f03d86c: 8d6b9ff8 */ lw $t3,%lo(g_Vars+0x38)($t3) /* f03d870: 0000a025 */ or $s4,$zero,$zero /* f03d874: 24050001 */ addiu $a1,$zero,0x1 /* f03d878: 014b6021 */ addu $t4,$t2,$t3 @@ -17033,12 +17033,12 @@ glabel func0f03e29c /* f03e350: 5980000f */ blezl $t4,.L0f03e390 /* f03e354: afab0058 */ sw $t3,0x58($sp) /* f03e358: 954d0192 */ lhu $t5,0x192($t2) -/* f03e35c: 3c18800a */ lui $t8,0x800a +/* f03e35c: 3c18800a */ lui $t8,%hi(g_Vars+0x8) /* f03e360: 31ae0020 */ andi $t6,$t5,0x20 /* f03e364: 55c0000b */ bnezl $t6,.L0f03e394 /* f03e368: 8fac0058 */ lw $t4,0x58($sp) /* f03e36c: 8d0f0000 */ lw $t7,0x0($t0) -/* f03e370: 8f189fc8 */ lw $t8,-0x6038($t8) +/* f03e370: 8f189fc8 */ lw $t8,%lo(g_Vars+0x8)($t8) /* f03e374: 24190001 */ addiu $t9,$zero,0x1 /* f03e378: 01f8082a */ slt $at,$t7,$t8 /* f03e37c: 50200005 */ beqzl $at,.L0f03e394 @@ -17078,8 +17078,8 @@ glabel func0f03e29c /* f03e3fc: e7a00034 */ swc1 $f0,0x34($sp) /* f03e400: 0fc24e7e */ jal func0f0939f8 /* f03e404: e7a00038 */ swc1 $f0,0x38($sp) -/* f03e408: 3c0d800a */ lui $t5,0x800a -/* f03e40c: 8dad9fc8 */ lw $t5,-0x6038($t5) +/* f03e408: 3c0d800a */ lui $t5,%hi(g_Vars+0x8) +/* f03e40c: 8dad9fc8 */ lw $t5,%lo(g_Vars+0x8)($t5) /* f03e410: 8fae004c */ lw $t6,0x4c($sp) /* f03e414: 8fa80050 */ lw $t0,0x50($sp) /* f03e418: 01ae7821 */ addu $t7,$t5,$t6 @@ -17134,9 +17134,9 @@ glabel var7f1a8f24 /* f03e4a4: 0fc4a25f */ jal propGetPlayerNum /* f03e4a8: 00000000 */ sll $zero,$zero,0x0 /* f03e4ac: 00027880 */ sll $t7,$v0,0x2 -/* f03e4b0: 3c03800a */ lui $v1,0x800a +/* f03e4b0: 3c03800a */ lui $v1,%hi(g_Vars+0x64) /* f03e4b4: 006f1821 */ addu $v1,$v1,$t7 -/* f03e4b8: 8c63a024 */ lw $v1,-0x5fdc($v1) +/* f03e4b8: 8c63a024 */ lw $v1,%lo(g_Vars+0x64)($v1) /* f03e4bc: 3c017f1b */ lui $at,%hi(var7f1a8f20) /* f03e4c0: c4208f20 */ lwc1 $f0,%lo(var7f1a8f20)($at) /* f03e4c4: 3c0143b4 */ lui $at,0x43b4 @@ -17269,9 +17269,9 @@ glabel var7f1a8f2c /* f03e6bc: 0fc4a25f */ jal propGetPlayerNum /* f03e6c0: e7a2001c */ swc1 $f2,0x1c($sp) /* f03e6c4: 0002c880 */ sll $t9,$v0,0x2 -/* f03e6c8: 3c08800a */ lui $t0,0x800a +/* f03e6c8: 3c08800a */ lui $t0,%hi(g_Vars+0x64) /* f03e6cc: 01194021 */ addu $t0,$t0,$t9 -/* f03e6d0: 8d08a024 */ lw $t0,-0x5fdc($t0) +/* f03e6d0: 8d08a024 */ lw $t0,%lo(g_Vars+0x64)($t0) /* f03e6d4: 44808000 */ mtc1 $zero,$f16 /* f03e6d8: 3c017f1b */ lui $at,%hi(var7f1a8f2c) /* f03e6dc: c50618f4 */ lwc1 $f6,0x18f4($t0) @@ -17709,9 +17709,9 @@ glabel var7f1a8fc8 /* f03eba0: e7b00188 */ swc1 $f16,0x188($sp) /* f03eba4: 8fa40168 */ lw $a0,0x168($sp) /* f03eba8: 00025880 */ sll $t3,$v0,0x2 -/* f03ebac: 3c0d800a */ lui $t5,0x800a +/* f03ebac: 3c0d800a */ lui $t5,%hi(g_Vars+0x64) /* f03ebb0: 01ab6821 */ addu $t5,$t5,$t3 -/* f03ebb4: 8dada024 */ lw $t5,-0x5fdc($t5) +/* f03ebb4: 8dada024 */ lw $t5,%lo(g_Vars+0x64)($t5) /* f03ebb8: c4840008 */ lwc1 $f4,0x8($a0) /* f03ebbc: 8fa30190 */ lw $v1,0x190($sp) /* f03ebc0: c5a219c4 */ lwc1 $f2,0x19c4($t5) @@ -18153,18 +18153,18 @@ glabel var7f1a8fc8 /* f03f234: 24050001 */ addiu $a1,$zero,0x1 /* f03f238: 00404025 */ or $t0,$v0,$zero .L0f03f23c: -/* f03f23c: 3c18800a */ lui $t8,0x800a -/* f03f240: 8f18a02c */ lw $t8,-0x5fd4($t8) -/* f03f244: 3c19800a */ lui $t9,0x800a -/* f03f248: 3c0a800a */ lui $t2,0x800a +/* f03f23c: 3c18800a */ lui $t8,%hi(g_Vars+0x6c) +/* f03f240: 8f18a02c */ lw $t8,%lo(g_Vars+0x6c)($t8) +/* f03f244: 3c19800a */ lui $t9,%hi(g_Vars+0x68) +/* f03f248: 3c0a800a */ lui $t2,%hi(g_Vars+0x64) /* f03f24c: 13000003 */ beqz $t8,.L0f03f25c -/* f03f250: 3c09800a */ lui $t1,0x800a +/* f03f250: 3c09800a */ lui $t1,%hi(g_Vars+0x70) /* f03f254: 10000002 */ beqz $zero,.L0f03f260 /* f03f258: 24060001 */ addiu $a2,$zero,0x1 .L0f03f25c: /* f03f25c: 00003025 */ or $a2,$zero,$zero .L0f03f260: -/* f03f260: 8f39a028 */ lw $t9,-0x5fd8($t9) +/* f03f260: 8f39a028 */ lw $t9,%lo(g_Vars+0x68)($t9) /* f03f264: 24010001 */ addiu $at,$zero,0x1 /* f03f268: 00002025 */ or $a0,$zero,$zero /* f03f26c: 13200003 */ beqz $t9,.L0f03f27c @@ -18172,14 +18172,14 @@ glabel var7f1a8fc8 /* f03f274: 10000001 */ beqz $zero,.L0f03f27c /* f03f278: 24040001 */ addiu $a0,$zero,0x1 .L0f03f27c: -/* f03f27c: 8d4aa024 */ lw $t2,-0x5fdc($t2) +/* f03f27c: 8d4aa024 */ lw $t2,%lo(g_Vars+0x64)($t2) /* f03f280: 00001825 */ or $v1,$zero,$zero /* f03f284: 11400003 */ beqz $t2,.L0f03f294 /* f03f288: 00000000 */ sll $zero,$zero,0x0 /* f03f28c: 10000001 */ beqz $zero,.L0f03f294 /* f03f290: 24050001 */ addiu $a1,$zero,0x1 .L0f03f294: -/* f03f294: 8d29a030 */ lw $t1,-0x5fd0($t1) +/* f03f294: 8d29a030 */ lw $t1,%lo(g_Vars+0x70)($t1) /* f03f298: 11200003 */ beqz $t1,.L0f03f2a8 /* f03f29c: 00000000 */ sll $zero,$zero,0x0 /* f03f2a0: 10000001 */ beqz $zero,.L0f03f2a8 @@ -18376,10 +18376,10 @@ glabel var7f1a8fc8 /* f03f580: 8fa90168 */ lw $t1,0x168($sp) /* f03f584: 912b0000 */ lbu $t3,0x0($t1) /* f03f588: 24010006 */ addiu $at,$zero,0x6 -/* f03f58c: 3c0d800a */ lui $t5,0x800a +/* f03f58c: 3c0d800a */ lui $t5,%hi(g_Vars+0x8) /* f03f590: 15610033 */ bne $t3,$at,.L0f03f660 /* f03f594: 8fac0190 */ lw $t4,0x190($sp) -/* f03f598: 8dad9fc8 */ lw $t5,-0x6038($t5) +/* f03f598: 8dad9fc8 */ lw $t5,%lo(g_Vars+0x8)($t5) /* f03f59c: 8d8e0020 */ lw $t6,0x20($t4) /* f03f5a0: 858a0000 */ lh $t2,0x0($t4) /* f03f5a4: 448d5000 */ mtc1 $t5,$f10 @@ -19136,8 +19136,8 @@ glabel var7f1a90b8 /* f03ff64: 00c09825 */ or $s3,$a2,$zero /* f03ff68: 15c1000d */ bne $t6,$at,.L0f03ffa0 /* f03ff6c: 0080a025 */ or $s4,$a0,$zero -/* f03ff70: 3c0f800a */ lui $t7,0x800a -/* f03ff74: 8defa2d8 */ lw $t7,-0x5d28($t7) +/* f03ff70: 3c0f800a */ lui $t7,%hi(g_Vars+0x318) +/* f03ff74: 8defa2d8 */ lw $t7,%lo(g_Vars+0x318)($t7) /* f03ff78: 55e0000a */ bnezl $t7,.L0f03ffa4 /* f03ff7c: 92180001 */ lbu $t8,0x1($s0) /* f03ff80: 0fc0cfe8 */ jal chrGetShield @@ -19717,8 +19717,8 @@ glabel var7f1a9184 /* f040634: 8faa0278 */ lw $t2,0x278($sp) .L0f040638: /* f040638: 8fab027c */ lw $t3,0x27c($sp) -/* f04063c: 3c0f800a */ lui $t7,0x800a -/* f040640: 8def9ff8 */ lw $t7,-0x6008($t7) +/* f04063c: 3c0f800a */ lui $t7,%hi(g_Vars+0x38) +/* f040640: 8def9ff8 */ lw $t7,%lo(g_Vars+0x38)($t7) /* f040644: 014b1821 */ addu $v1,$t2,$t3 /* f040648: 906e0004 */ lbu $t6,0x4($v1) /* f04064c: 01cfc821 */ addu $t9,$t6,$t7 @@ -20040,8 +20040,8 @@ glabel var7f1a9184 /* f040aec: 13000004 */ beqz $t8,.L0f040b00 /* f040af0: 27a60228 */ addiu $a2,$sp,0x228 /* f040af4: 240c0001 */ addiu $t4,$zero,0x1 -/* f040af8: 3c01800a */ lui $at,0x800a -/* f040afc: ac2ca44c */ sw $t4,-0x5bb4($at) +/* f040af8: 3c01800a */ lui $at,%hi(g_Vars+0x48c) +/* f040afc: ac2ca44c */ sw $t4,%lo(g_Vars+0x48c)($at) .L0f040b00: /* f040b00: 24190010 */ addiu $t9,$zero,0x10 /* f040b04: afb90010 */ sw $t9,0x10($sp) @@ -20063,10 +20063,10 @@ glabel var7f1a9184 /* f040b40: 0fc079ef */ jal chrSetOrUnsetHiddenFlag00000100 /* f040b44: 24050001 */ addiu $a1,$zero,0x1 /* f040b48: 93ae026f */ lbu $t6,0x26f($sp) -/* f040b4c: 3c01800a */ lui $at,0x800a +/* f040b4c: 3c01800a */ lui $at,%hi(g_Vars+0x48c) /* f040b50: 51c00003 */ beqzl $t6,.L0f040b60 /* f040b54: 8fab01cc */ lw $t3,0x1cc($sp) -/* f040b58: ac20a44c */ sw $zero,-0x5bb4($at) +/* f040b58: ac20a44c */ sw $zero,%lo(g_Vars+0x48c)($at) /* f040b5c: 8fab01cc */ lw $t3,0x1cc($sp) .L0f040b60: /* f040b60: 8faa01c0 */ lw $t2,0x1c0($sp) @@ -20195,7 +20195,7 @@ glabel var7f1a9184 .L0f040d28: /* f040d28: 24010012 */ addiu $at,$zero,0x12 /* f040d2c: 1481000b */ bne $a0,$at,.L0f040d5c -/* f040d30: 3c0d800a */ lui $t5,0x800a +/* f040d30: 3c0d800a */ lui $t5,%hi(g_Vars+0x284) /* f040d34: 8c640040 */ lw $a0,0x40($v1) /* f040d38: afa300d4 */ sw $v1,0xd4($sp) /* f040d3c: 24050055 */ addiu $a1,$zero,0x55 @@ -20207,7 +20207,7 @@ glabel var7f1a9184 /* f040d54: 10000009 */ beqz $zero,.L0f040d7c /* f040d58: a059005f */ sb $t9,0x5f($v0) .L0f040d5c: -/* f040d5c: 8dada244 */ lw $t5,-0x5dbc($t5) +/* f040d5c: 8dada244 */ lw $t5,%lo(g_Vars+0x284)($t5) /* f040d60: 8c640040 */ lw $a0,0x40($v1) /* f040d64: 27a50260 */ addiu $a1,$sp,0x260 /* f040d68: 8dae00bc */ lw $t6,0xbc($t5) @@ -20615,7 +20615,7 @@ glabel var7f1a9184 /* f04135c: afb901f0 */ sw $t9,0x1f0($sp) /* f041360: 81c30007 */ lb $v1,0x7($t6) /* f041364: 24010008 */ addiu $at,$zero,0x8 -/* f041368: 3c0b800a */ lui $t3,0x800a +/* f041368: 3c0b800a */ lui $t3,%hi(g_Vars+0x8) /* f04136c: 1061000a */ beq $v1,$at,.L0f041398 /* f041370: 8fad0278 */ lw $t5,0x278($sp) /* f041374: 2401000a */ addiu $at,$zero,0xa @@ -20628,13 +20628,13 @@ glabel var7f1a9184 /* f041390: 54610016 */ bnel $v1,$at,.L0f0413ec /* f041394: 8fb901f4 */ lw $t9,0x1f4($sp) .L0f041398: -/* f041398: 8d6b9fc8 */ lw $t3,-0x6038($t3) +/* f041398: 8d6b9fc8 */ lw $t3,%lo(g_Vars+0x8)($t3) /* f04139c: 10000012 */ beqz $zero,.L0f0413e8 /* f0413a0: adab0048 */ sw $t3,0x48($t5) .L0f0413a4: /* f0413a4: 8faa0278 */ lw $t2,0x278($sp) /* f0413a8: 24010008 */ addiu $at,$zero,0x8 -/* f0413ac: 3c0f800a */ lui $t7,0x800a +/* f0413ac: 3c0f800a */ lui $t7,%hi(g_Vars+0x8) /* f0413b0: 81430007 */ lb $v1,0x7($t2) /* f0413b4: 8fb80278 */ lw $t8,0x278($sp) /* f0413b8: 10610009 */ beq $v1,$at,.L0f0413e0 @@ -20648,7 +20648,7 @@ glabel var7f1a9184 /* f0413d8: 54610004 */ bnel $v1,$at,.L0f0413ec /* f0413dc: 8fb901f4 */ lw $t9,0x1f4($sp) .L0f0413e0: -/* f0413e0: 8def9fc8 */ lw $t7,-0x6038($t7) +/* f0413e0: 8def9fc8 */ lw $t7,%lo(g_Vars+0x8)($t7) /* f0413e4: af0f0048 */ sw $t7,0x48($t8) .L0f0413e8: /* f0413e8: 8fb901f4 */ lw $t9,0x1f4($sp) @@ -20888,8 +20888,8 @@ glabel var7f1a9184 /* f04174c: 24010002 */ addiu $at,$zero,0x2 /* f041750: 14410063 */ bne $v0,$at,.L0f0418e0 .L0f041754: -/* f041754: 3c0d800a */ lui $t5,0x800a -/* f041758: 8dada2d4 */ lw $t5,-0x5d2c($t5) +/* f041754: 3c0d800a */ lui $t5,%hi(g_Vars+0x314) +/* f041758: 8dada2d4 */ lw $t5,%lo(g_Vars+0x314)($t5) /* f04175c: 8f0c0004 */ lw $t4,0x4($t8) /* f041760: 2419ffff */ addiu $t9,$zero,-1 /* f041764: afb90068 */ sw $t9,0x68($sp) @@ -20932,8 +20932,8 @@ glabel var7f1a9184 /* f0417f0: 0fc4be7c */ jal func0f12f9f0 /* f0417f4: afa00014 */ sw $zero,0x14($sp) .L0f0417f8: -/* f0417f8: 3c0e800a */ lui $t6,0x800a -/* f0417fc: 81cfdfeb */ lb $t7,-0x2015($t6) +/* f0417f8: 3c0e800a */ lui $t6,%hi(g_MissionConfig+0x3) +/* f0417fc: 81cfdfeb */ lb $t7,%lo(g_MissionConfig+0x3)($t6) /* f041800: 8fb80278 */ lw $t8,0x278($sp) /* f041804: 05e1000a */ bgez $t7,.L0f041830 /* f041808: 00000000 */ sll $zero,$zero,0x0 @@ -21003,7 +21003,7 @@ glabel var7f1a9184 /* f0418f4: 17210019 */ bne $t9,$at,.L0f04195c /* f0418f8: 8fad0278 */ lw $t5,0x278($sp) /* f0418fc: 8dab02d4 */ lw $t3,0x2d4($t5) -/* f041900: 3c03800a */ lui $v1,0x800a +/* f041900: 3c03800a */ lui $v1,%hi(g_Vars+0x28c) /* f041904: 11600005 */ beqz $t3,.L0f04191c /* f041908: 00000000 */ sll $zero,$zero,0x0 /* f04190c: 0fc633fe */ jal mpPlayerGetIndex @@ -21011,7 +21011,7 @@ glabel var7f1a9184 /* f041914: 10000002 */ beqz $zero,.L0f041920 /* f041918: 00401825 */ or $v1,$v0,$zero .L0f04191c: -/* f04191c: 8c63a24c */ lw $v1,-0x5db4($v1) +/* f04191c: 8c63a24c */ lw $v1,%lo(g_Vars+0x28c)($v1) .L0f041920: /* f041920: 8faa0210 */ lw $t2,0x210($sp) /* f041924: 27a40244 */ addiu $a0,$sp,0x244 @@ -21139,8 +21139,8 @@ glabel func0f041a74 /* f041ad0: 26070044 */ addiu $a3,$s0,0x44 /* f041ad4: 0fc244b7 */ jal func0f0912dc /* f041ad8: afaa0010 */ sw $t2,0x10($sp) -/* f041adc: 3c0b800a */ lui $t3,0x800a -/* f041ae0: 8d6b9fc8 */ lw $t3,-0x6038($t3) +/* f041adc: 3c0b800a */ lui $t3,%hi(g_Vars+0x8) +/* f041ae0: 8d6b9fc8 */ lw $t3,%lo(g_Vars+0x8)($t3) /* f041ae4: 8e0d034c */ lw $t5,0x34c($s0) /* f041ae8: 256c0002 */ addiu $t4,$t3,0x2 /* f041aec: adac0008 */ sw $t4,0x8($t5) @@ -21770,8 +21770,8 @@ glabel var7f1a918c /* f0423b0: 0fc0fe62 */ jal func0f03f988 /* f0423b4: 24060001 */ addiu $a2,$zero,0x1 /* f0423b8: 82190007 */ lb $t9,0x7($s0) -/* f0423bc: 3c18800a */ lui $t8,0x800a -/* f0423c0: 8f189fc8 */ lw $t8,-0x6038($t8) +/* f0423bc: 3c18800a */ lui $t8,%hi(g_Vars+0x8) +/* f0423c0: 8f189fc8 */ lw $t8,%lo(g_Vars+0x8)($t8) /* f0423c4: 2401000a */ addiu $at,$zero,0xa /* f0423c8: 1721002b */ bne $t9,$at,.L0f042478 /* f0423cc: ae180044 */ sw $t8,0x44($s0) @@ -21806,8 +21806,8 @@ glabel var7f1a918c .L0f042440: /* f042440: 0c0077ac */ jal func0001deb0 /* f042444: 34a5cccd */ ori $a1,$a1,0xcccd -/* f042448: 3c0e800a */ lui $t6,0x800a -/* f04244c: 8dce9ff8 */ lw $t6,-0x6008($t6) +/* f042448: 3c0e800a */ lui $t6,%hi(g_Vars+0x38) +/* f04244c: 8dce9ff8 */ lw $t6,%lo(g_Vars+0x38)($t6) /* f042450: 8e0f0040 */ lw $t7,0x40($s0) /* f042454: 01eec021 */ addu $t8,$t7,$t6 /* f042458: 10000066 */ beqz $zero,.L0f0425f4 @@ -21908,8 +21908,8 @@ glabel var7f1a918c /* f0425ac: 25af0001 */ addiu $t7,$t5,0x1 /* f0425b0: a2080032 */ sb $t0,0x32($s0) /* f0425b4: a20f0033 */ sb $t7,0x33($s0) -/* f0425b8: 3c0e800a */ lui $t6,0x800a -/* f0425bc: 8dce9fc8 */ lw $t6,-0x6038($t6) +/* f0425b8: 3c0e800a */ lui $t6,%hi(g_Vars+0x8) +/* f0425bc: 8dce9fc8 */ lw $t6,%lo(g_Vars+0x8)($t6) /* f0425c0: 02002025 */ or $a0,$s0,$zero /* f0425c4: 02202825 */ or $a1,$s1,$zero /* f0425c8: 0fc0fe62 */ jal func0f03f988 @@ -23535,10 +23535,10 @@ glabel var7f1a9234 /* f043fb4: 1300002b */ beqz $t8,.L0f044064 /* f043fb8: 3c017f1b */ lui $at,%hi(var7f1a91ec) /* f043fbc: 85f902d8 */ lh $t9,0x2d8($t7) -/* f043fc0: 3c08800a */ lui $t0,0x800a +/* f043fc0: 3c08800a */ lui $t0,%hi(g_Vars+0x8) /* f043fc4: 5b200021 */ blezl $t9,.L0f04404c /* f043fc8: 44804000 */ mtc1 $zero,$f8 -/* f043fcc: 8d089fc8 */ lw $t0,-0x6038($t0) +/* f043fcc: 8d089fc8 */ lw $t0,%lo(g_Vars+0x8)($t0) /* f043fd0: 240104b0 */ addiu $at,$zero,0x4b0 /* f043fd4: e7ae0044 */ swc1 $f14,0x44($sp) /* f043fd8: 0101001a */ div $zero,$t0,$at @@ -25975,8 +25975,8 @@ glabel var7f1a927c /* f0463ec: 02402025 */ or $a0,$s2,$zero /* f0463f0: 0fc0b9b7 */ jal func0f02e6dc /* f0463f4: 3c054180 */ lui $a1,0x4180 -/* f0463f8: 3c0a800a */ lui $t2,0x800a -/* f0463fc: 8d4a9fc8 */ lw $t2,-0x6038($t2) +/* f0463f8: 3c0a800a */ lui $t2,%hi(g_Vars+0x8) +/* f0463fc: 8d4a9fc8 */ lw $t2,%lo(g_Vars+0x8)($t2) /* f046400: ae4a00d8 */ sw $t2,0xd8($s2) .L0f046404: /* f046404: 52200006 */ beqzl $s1,.L0f046420 @@ -26187,7 +26187,7 @@ glabel func0f046648 /* f0466f4: 1300005a */ beqz $t8,.L0f046860 /* f0466f8: 8faa00ac */ lw $t2,0xac($sp) /* f0466fc: 8fa400ac */ lw $a0,0xac($sp) -/* f046700: 3c0a800a */ lui $t2,0x800a +/* f046700: 3c0a800a */ lui $t2,%hi(g_Vars+0x318) /* f046704: 54800005 */ bnezl $a0,.L0f04671c /* f046708: 3c014220 */ lui $at,0x4220 /* f04670c: 9219032c */ lbu $t9,0x32c($s0) @@ -26205,7 +26205,7 @@ glabel func0f046648 /* f046738: 00000000 */ sll $zero,$zero,0x0 /* f04673c: 24080001 */ addiu $t0,$zero,0x1 .L0f046740: -/* f046740: 8d4aa2d8 */ lw $t2,-0x5d28($t2) +/* f046740: 8d4aa2d8 */ lw $t2,%lo(g_Vars+0x318)($t2) /* f046744: 1540000b */ bnez $t2,.L0f046774 /* f046748: 00000000 */ sll $zero,$zero,0x0 /* f04674c: 11000009 */ beqz $t0,.L0f046774 @@ -26315,14 +26315,14 @@ glabel func0f046648 /* f0468d0: 8fa90038 */ lw $t1,0x38($sp) /* f0468d4: 46040181 */ sub.s $f6,$f0,$f4 /* f0468d8: 00001025 */ or $v0,$zero,$zero -/* f0468dc: 3c0b800a */ lui $t3,0x800a +/* f0468dc: 3c0b800a */ lui $t3,%hi(g_Vars+0x318) /* f0468e0: 4602303e */ c.le.s $f6,$f2 /* f0468e4: 00000000 */ sll $zero,$zero,0x0 /* f0468e8: 45000002 */ bc1f .L0f0468f4 /* f0468ec: 00000000 */ sll $zero,$zero,0x0 /* f0468f0: 24020001 */ addiu $v0,$zero,0x1 .L0f0468f4: -/* f0468f4: 8d6ba2d8 */ lw $t3,-0x5d28($t3) +/* f0468f4: 8d6ba2d8 */ lw $t3,%lo(g_Vars+0x318)($t3) /* f0468f8: 00404025 */ or $t0,$v0,$zero /* f0468fc: 1560000b */ bnez $t3,.L0f04692c /* f046900: 00000000 */ sll $zero,$zero,0x0 @@ -26477,11 +26477,11 @@ glabel var7f1a9290 /* f046af0: ae0b0014 */ sw $t3,0x14($s0) .L0f046af4: /* f046af4: 8e0c0090 */ lw $t4,0x90($s0) -/* f046af8: 3c0f800a */ lui $t7,0x800a +/* f046af8: 3c0f800a */ lui $t7,%hi(g_Vars+0x8) /* f046afc: 8e0e00d8 */ lw $t6,0xd8($s0) /* f046b00: 258d0001 */ addiu $t5,$t4,0x1 /* f046b04: ae0d0090 */ sw $t5,0x90($s0) -/* f046b08: 8def9fc8 */ lw $t7,-0x6038($t7) +/* f046b08: 8def9fc8 */ lw $t7,%lo(g_Vars+0x8)($t7) /* f046b0c: 25f8ffc4 */ addiu $t8,$t7,-60 /* f046b10: 01d8082a */ slt $at,$t6,$t8 /* f046b14: 1020001a */ beqz $at,.L0f046b80 @@ -26505,8 +26505,8 @@ glabel var7f1a9290 /* f046b5c: acc10008 */ sw $at,0x8($a2) /* f046b60: 0fc0d049 */ jal func0f034124 /* f046b64: afa00010 */ sw $zero,0x10($sp) -/* f046b68: 3c0b800a */ lui $t3,0x800a -/* f046b6c: 8d6b9fc8 */ lw $t3,-0x6038($t3) +/* f046b68: 3c0b800a */ lui $t3,%hi(g_Vars+0x8) +/* f046b6c: 8d6b9fc8 */ lw $t3,%lo(g_Vars+0x8)($t3) /* f046b70: 10000211 */ beqz $zero,.L0f0473b8 /* f046b74: ae0b00d8 */ sw $t3,0xd8($s0) .L0f046b78: @@ -26522,17 +26522,17 @@ glabel var7f1a9290 /* f046b98: 27a700d0 */ addiu $a3,$sp,0xd0 /* f046b9c: 820c0068 */ lb $t4,0x68($s0) /* f046ba0: 24010006 */ addiu $at,$zero,0x6 -/* f046ba4: 3c0d800a */ lui $t5,0x800a +/* f046ba4: 3c0d800a */ lui $t5,%hi(g_Vars+0x8) /* f046ba8: 1181001e */ beq $t4,$at,.L0f046c24 /* f046bac: 00000000 */ sll $zero,$zero,0x0 /* f046bb0: 8e0f00a8 */ lw $t7,0xa8($s0) -/* f046bb4: 8dad9fc8 */ lw $t5,-0x6038($t5) -/* f046bb8: 3c18800a */ lui $t8,0x800a +/* f046bb4: 8dad9fc8 */ lw $t5,%lo(g_Vars+0x8)($t5) +/* f046bb8: 3c18800a */ lui $t8,%hi(g_Vars+0x318) /* f046bbc: 25ee00b4 */ addiu $t6,$t7,0xb4 /* f046bc0: 01cd082a */ slt $at,$t6,$t5 /* f046bc4: 10200017 */ beqz $at,.L0f046c24 /* f046bc8: 00000000 */ sll $zero,$zero,0x0 -/* f046bcc: 8f18a2d8 */ lw $t8,-0x5d28($t8) +/* f046bcc: 8f18a2d8 */ lw $t8,%lo(g_Vars+0x318)($t8) /* f046bd0: 02002025 */ or $a0,$s0,$zero /* f046bd4: 27a500e4 */ addiu $a1,$sp,0xe4 /* f046bd8: 17000012 */ bnez $t8,.L0f046c24 @@ -26574,10 +26574,10 @@ glabel var7f1a9290 /* f046c64: 8fbf002c */ lw $ra,0x2c($sp) /* f046c68: 8602019e */ lh $v0,0x19e($s0) .L0f046c6c: -/* f046c6c: 3c19800a */ lui $t9,0x800a +/* f046c6c: 3c19800a */ lui $t9,%hi(g_Vars+0x38) /* f046c70: 0442000c */ bltzl $v0,.L0f046ca4 /* f046c74: 820a0068 */ lb $t2,0x68($s0) -/* f046c78: 8f399ff8 */ lw $t9,-0x6008($t9) +/* f046c78: 8f399ff8 */ lw $t9,%lo(g_Vars+0x38)($t9) /* f046c7c: 00594823 */ subu $t1,$v0,$t9 /* f046c80: a609019e */ sh $t1,0x19e($s0) /* f046c84: 8608019e */ lh $t0,0x19e($s0) @@ -26618,8 +26618,8 @@ glabel var7f1a9290 .L0f046d08: /* f046d08: 0fc0dcba */ jal func0f0372e8 /* f046d0c: 02002025 */ or $a0,$s0,$zero -/* f046d10: 3c08800a */ lui $t0,0x800a -/* f046d14: 8d089fc8 */ lw $t0,-0x6038($t0) +/* f046d10: 3c08800a */ lui $t0,%hi(g_Vars+0x8) +/* f046d14: 8d089fc8 */ lw $t0,%lo(g_Vars+0x8)($t0) /* f046d18: 100001a7 */ beqz $zero,.L0f0473b8 /* f046d1c: ae0800a8 */ sw $t0,0xa8($s0) .L0f046d20: @@ -27122,14 +27122,14 @@ glabel chrTickPatrol /* f04744c: 1161001f */ beq $t3,$at,.L0f0474cc /* f047450: ae0a0060 */ sw $t2,0x60($s0) /* f047454: 8e0d0078 */ lw $t5,0x78($s0) -/* f047458: 3c0c800a */ lui $t4,0x800a -/* f04745c: 8d8c9fc8 */ lw $t4,-0x6038($t4) +/* f047458: 3c0c800a */ lui $t4,%hi(g_Vars+0x8) +/* f04745c: 8d8c9fc8 */ lw $t4,%lo(g_Vars+0x8)($t4) /* f047460: 25ae00b4 */ addiu $t6,$t5,0xb4 -/* f047464: 3c0f800a */ lui $t7,0x800a +/* f047464: 3c0f800a */ lui $t7,%hi(g_Vars+0x318) /* f047468: 01cc082a */ slt $at,$t6,$t4 /* f04746c: 50200018 */ beqzl $at,.L0f0474d0 /* f047470: 820b0038 */ lb $t3,0x38($s0) -/* f047474: 8defa2d8 */ lw $t7,-0x5d28($t7) +/* f047474: 8defa2d8 */ lw $t7,%lo(g_Vars+0x318)($t7) /* f047478: 02002025 */ or $a0,$s0,$zero /* f04747c: 27a50058 */ addiu $a1,$sp,0x58 /* f047480: 55e00013 */ bnezl $t7,.L0f0474d0 @@ -27182,8 +27182,8 @@ glabel chrTickPatrol /* f047530: 260b0038 */ addiu $t3,$s0,0x38 /* f047534: 05210007 */ bgez $t1,.L0f047554 .L0f047538: -/* f047538: 3c0a800a */ lui $t2,0x800a -/* f04753c: 8d4a9fc8 */ lw $t2,-0x6038($t2) +/* f047538: 3c0a800a */ lui $t2,%hi(g_Vars+0x8) +/* f04753c: 8d4a9fc8 */ lw $t2,%lo(g_Vars+0x8)($t2) /* f047540: 02002025 */ or $a0,$s0,$zero /* f047544: 0fc0dd60 */ jal func0f037580 /* f047548: ae0a0078 */ sw $t2,0x78($s0) @@ -27605,8 +27605,8 @@ glabel func0f048398 /* f0483d0: afc00000 */ sw $zero,0x0($s8) /* f0483d4: 3c018006 */ lui $at,0x8006 /* f0483d8: ac202cb4 */ sw $zero,0x2cb4($at) -/* f0483dc: 3c0e800a */ lui $t6,0x800a -/* f0483e0: 8dcea2d8 */ lw $t6,-0x5d28($t6) +/* 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 @@ -27691,11 +27691,11 @@ glabel func0f048398 /* f048508: 3c038006 */ lui $v1,%hi(var80062cb4) /* f04850c: 24632cb4 */ addiu $v1,$v1,%lo(var80062cb4) /* f048510: 8c6c0000 */ lw $t4,0x0($v1) -/* f048514: 3c0e800a */ lui $t6,0x800a +/* f048514: 3c0e800a */ lui $t6,%hi(g_Vars+0x8) /* f048518: 3c048006 */ lui $a0,%hi(var80062cbc) /* f04851c: 258d0001 */ addiu $t5,$t4,0x1 /* f048520: ac6d0000 */ sw $t5,0x0($v1) -/* f048524: 8dce9fc8 */ lw $t6,-0x6038($t6) +/* f048524: 8dce9fc8 */ lw $t6,%lo(g_Vars+0x8)($t6) /* f048528: 24842cbc */ addiu $a0,$a0,%lo(var80062cbc) /* f04852c: 01c27823 */ subu $t7,$t6,$v0 /* f048530: 29e100f0 */ slti $at,$t7,0xf0 @@ -27734,26 +27734,26 @@ glabel func0f048398 /* f0485a4: 0fc10e51 */ jal func0f043944 /* f0485a8: 00000000 */ sll $zero,$zero,0x0 .L0f0485ac: -/* f0485ac: 3c02800a */ lui $v0,0x800a -/* f0485b0: 8042a492 */ lb $v0,-0x5b6e($v0) +/* f0485ac: 3c02800a */ lui $v0,%hi(g_Vars+0x4d2) +/* f0485b0: 8042a492 */ lb $v0,%lo(g_Vars+0x4d2)($v0) /* f0485b4: 04400009 */ bltz $v0,.L0f0485dc /* f0485b8: 00000000 */ sll $zero,$zero,0x0 /* f0485bc: 0fc120b3 */ jal func0f0482cc /* f0485c0: 24440c00 */ addiu $a0,$v0,0xc00 /* f0485c4: 240bffff */ addiu $t3,$zero,-1 -/* f0485c8: 3c01800a */ lui $at,0x800a -/* f0485cc: a02ba492 */ sb $t3,-0x5b6e($at) -/* f0485d0: 3c01800a */ lui $at,0x800a +/* f0485c8: 3c01800a */ lui $at,%hi(g_Vars+0x4d2) +/* f0485cc: a02ba492 */ sb $t3,%lo(g_Vars+0x4d2)($at) +/* f0485d0: 3c01800a */ lui $at,%hi(g_Vars+0x4d3) /* f0485d4: 240c0001 */ addiu $t4,$zero,0x1 -/* f0485d8: a02ca493 */ sb $t4,-0x5b6d($at) +/* f0485d8: a02ca493 */ sb $t4,%lo(g_Vars+0x4d3)($at) .L0f0485dc: /* f0485dc: 3c038006 */ lui $v1,%hi(g_NumChrsB) /* f0485e0: 8c637e60 */ lw $v1,%lo(g_NumChrsB)($v1) /* f0485e4: 00009825 */ or $s3,$zero,$zero /* f0485e8: 18600013 */ blez $v1,.L0f048638 .L0f0485ec: -/* f0485ec: 3c0d800a */ lui $t5,0x800a -/* f0485f0: 81ada493 */ lb $t5,-0x5b6d($t5) +/* f0485ec: 3c0d800a */ lui $t5,%hi(g_Vars+0x4d3) +/* f0485f0: 81ada493 */ lb $t5,%lo(g_Vars+0x4d3)($t5) /* f0485f4: 3c028006 */ lui $v0,%hi(g_ChrsB) /* f0485f8: 8c427e58 */ lw $v0,%lo(g_ChrsB)($v0) /* f0485fc: 11a00005 */ beqz $t5,.L0f048614 @@ -27875,12 +27875,12 @@ glabel func0f048398 /* f04879c: 241e001f */ addiu $s8,$zero,0x1f /* f0487a0: 0334082a */ slt $at,$t9,$s4 /* f0487a4: 10200003 */ beqz $at,.L0f0487b4 -/* f0487a8: 3c03800a */ lui $v1,%hi(var800a0004) +/* f0487a8: 3c03800a */ lui $v1,%hi(g_Vars+0x38) /* f0487ac: 3c018007 */ lui $at,0x8007 /* f0487b0: ac348458 */ sw $s4,-0x7ba8($at) .L0f0487b4: /* f0487b4: 8fa800dc */ lw $t0,0xdc($sp) -/* f0487b8: 8c639ff8 */ lw $v1,-0x6008($v1) +/* f0487b8: 8c639ff8 */ lw $v1,%lo(g_Vars+0x38)($v1) /* f0487bc: 00008825 */ or $s1,$zero,$zero /* f0487c0: 02e81023 */ subu $v0,$s7,$t0 /* f0487c4: 28610007 */ slti $at,$v1,0x7 @@ -27957,7 +27957,7 @@ glabel func0f048398 /* f0488c8: 2a210002 */ slti $at,$s1,0x2 /* f0488cc: ac640000 */ sw $a0,0x0($v1) /* f0488d0: 1420003f */ bnez $at,.L0f0489d0 -/* f0488d4: 24630004 */ addiu $v1,$v1,%lo(var800a0004) +/* f0488d4: 24630004 */ addiu $v1,$v1,4 /* f0488d8: 0c004b70 */ jal random /* f0488dc: afa30048 */ sw $v1,0x48($sp) /* f0488e0: 0051001b */ divu $zero,$v0,$s1 @@ -28231,9 +28231,9 @@ glabel var7f1a9334 /* f048d38: 0fc4a25f */ jal propGetPlayerNum /* f048d3c: e7ac0020 */ swc1 $f12,0x20($sp) /* f048d40: 00027080 */ sll $t6,$v0,0x2 -/* f048d44: 3c0f800a */ lui $t7,0x800a +/* f048d44: 3c0f800a */ lui $t7,%hi(g_Vars+0x64) /* f048d48: 01ee7821 */ addu $t7,$t7,$t6 -/* f048d4c: 8defa024 */ lw $t7,-0x5fdc($t7) +/* f048d4c: 8defa024 */ lw $t7,%lo(g_Vars+0x64)($t7) /* f048d50: 3c0143b4 */ lui $at,0x43b4 /* f048d54: 44810000 */ mtc1 $at,$f0 /* f048d58: c5f00144 */ lwc1 $f16,0x144($t7) @@ -29167,8 +29167,8 @@ glabel var7f1a93e0 /* f04a01c: 24010006 */ addiu $at,$zero,0x6 .L0f04a020: /* f04a020: 1481002b */ bne $a0,$at,.L0f04a0d0 -/* f04a024: 3c0e800a */ lui $t6,0x800a -/* f04a028: 8dcea2e4 */ lw $t6,-0x5d1c($t6) +/* f04a024: 3c0e800a */ lui $t6,%hi(g_Vars+0x324) +/* f04a028: 8dcea2e4 */ lw $t6,%lo(g_Vars+0x324)($t6) /* f04a02c: 24640008 */ addiu $a0,$v1,0x8 /* f04a030: 24650028 */ addiu $a1,$v1,0x28 /* f04a034: 11c00026 */ beqz $t6,.L0f04a0d0 @@ -29513,9 +29513,9 @@ glabel func0f04a4ec /* f04a560: 1040003e */ beqz $v0,.L0f04a65c /* f04a564: 24010010 */ addiu $at,$zero,0x10 /* f04a568: 14c1001a */ bne $a2,$at,.L0f04a5d4 -/* f04a56c: 3c0b800a */ lui $t3,0x800a -/* f04a570: 3c0e800a */ lui $t6,0x800a -/* f04a574: 8dce9fc8 */ lw $t6,-0x6038($t6) +/* f04a56c: 3c0b800a */ lui $t3,%hi(g_Vars+0x8) +/* f04a570: 3c0e800a */ lui $t6,%hi(g_Vars+0x8) +/* f04a574: 8dce9fc8 */ lw $t6,%lo(g_Vars+0x8)($t6) /* f04a578: 86390000 */ lh $t9,0x0($s1) /* f04a57c: 000e7a43 */ sra $t7,$t6,0x9 /* f04a580: 000fc1c0 */ sll $t8,$t7,0x7 @@ -29540,7 +29540,7 @@ glabel func0f04a4ec /* f04a5cc: 10000024 */ beqz $zero,.L0f04a660 /* f04a5d0: a62a0128 */ sh $t2,0x128($s1) .L0f04a5d4: -/* f04a5d4: 8d6b9fc8 */ lw $t3,-0x6038($t3) +/* f04a5d4: 8d6b9fc8 */ lw $t3,%lo(g_Vars+0x8)($t3) /* f04a5d8: 862e0000 */ lh $t6,0x0($s1) /* f04a5dc: 000b6243 */ sra $t4,$t3,0x9 /* f04a5e0: 000c69c0 */ sll $t5,$t4,0x7 @@ -29621,9 +29621,9 @@ glabel var7f1a9400 /* f04a6d8: 0fc4a25f */ jal propGetPlayerNum /* f04a6dc: 00402025 */ or $a0,$v0,$zero /* f04a6e0: 00027880 */ sll $t7,$v0,0x2 -/* f04a6e4: 3c18800a */ lui $t8,0x800a +/* f04a6e4: 3c18800a */ lui $t8,%hi(g_Vars+0x64) /* f04a6e8: 030fc021 */ addu $t8,$t8,$t7 -/* f04a6ec: 8f18a024 */ lw $t8,-0x5fdc($t8) +/* f04a6ec: 8f18a024 */ lw $t8,%lo(g_Vars+0x64)($t8) /* f04a6f0: 3c0143b4 */ lui $at,0x43b4 /* f04a6f4: 44810000 */ mtc1 $at,$f0 /* f04a6f8: c7040144 */ lwc1 $f4,0x144($t8) @@ -29962,8 +29962,8 @@ glabel chrIsInLoadedRoom /* f04ad40: 00408825 */ or $s1,$v0,$zero /* f04ad44: 15e10004 */ bne $t7,$at,.L0f04ad58 /* f04ad48: 8dc3001c */ lw $v1,0x1c($t6) -/* f04ad4c: 3c18800a */ lui $t8,0x800a -/* f04ad50: 8f18a2e4 */ lw $t8,-0x5d1c($t8) +/* f04ad4c: 3c18800a */ lui $t8,%hi(g_Vars+0x324) +/* f04ad50: 8f18a2e4 */ lw $t8,%lo(g_Vars+0x324)($t8) /* f04ad54: 1300004b */ beqz $t8,.L0f04ae84 .L0f04ad58: /* f04ad58: 24740008 */ addiu $s4,$v1,0x8 @@ -29989,9 +29989,9 @@ glabel chrIsInLoadedRoom /* f04ada4: 12000037 */ beqz $s0,.L0f04ae84 /* f04ada8: 00408825 */ or $s1,$v0,$zero /* f04adac: 10400035 */ beqz $v0,.L0f04ae84 -/* f04adb0: 3c19800a */ lui $t9,0x800a +/* f04adb0: 3c19800a */ lui $t9,%hi(g_Vars+0x8) /* f04adb4: 8faa00d8 */ lw $t2,0xd8($sp) -/* f04adb8: 8f399fc8 */ lw $t9,-0x6038($t9) +/* f04adb8: 8f399fc8 */ lw $t9,%lo(g_Vars+0x8)($t9) /* f04adbc: 854b0000 */ lh $t3,0x0($t2) /* f04adc0: 00194243 */ sra $t0,$t9,0x9 /* f04adc4: 000849c0 */ sll $t1,$t0,0x7 @@ -30618,10 +30618,10 @@ glabel func0f04b658 /* f04b6d0: 02002025 */ or $a0,$s0,$zero /* f04b6d4: 90580000 */ lbu $t8,0x0($v0) /* f04b6d8: 24010001 */ addiu $at,$zero,0x1 -/* f04b6dc: 3c19800a */ lui $t9,0x800a +/* f04b6dc: 3c19800a */ lui $t9,%hi(g_Vars+0x338) /* f04b6e0: 5701000d */ bnel $t8,$at,.L0f04b718 /* f04b6e4: 02002025 */ or $a0,$s0,$zero -/* f04b6e8: 8f39a2f8 */ lw $t9,-0x5d08($t9) +/* f04b6e8: 8f39a2f8 */ lw $t9,%lo(g_Vars+0x338)($t9) /* f04b6ec: 24010048 */ addiu $at,$zero,0x48 /* f04b6f0: 860c012c */ lh $t4,0x12c($s0) /* f04b6f4: 00594023 */ subu $t0,$v0,$t9 @@ -30759,9 +30759,9 @@ glabel var7f1a9424 /* f04b8cc: 0fc4a25f */ jal propGetPlayerNum /* f04b8d0: 00000000 */ sll $zero,$zero,0x0 /* f04b8d4: 00024880 */ sll $t1,$v0,0x2 -/* f04b8d8: 3c03800a */ lui $v1,0x800a +/* f04b8d8: 3c03800a */ lui $v1,%hi(g_Vars+0x64) /* f04b8dc: 00691821 */ addu $v1,$v1,$t1 -/* f04b8e0: 8c63a024 */ lw $v1,-0x5fdc($v1) +/* f04b8e0: 8c63a024 */ lw $v1,%lo(g_Vars+0x64)($v1) /* f04b8e4: c7aa0048 */ lwc1 $f10,0x48($sp) /* f04b8e8: 3c017f1b */ lui $at,%hi(var7f1a9424) /* f04b8ec: c4209424 */ lwc1 $f0,%lo(var7f1a9424)($at) @@ -31639,9 +31639,9 @@ glabel var7f1a9428 /* f04c7d4: 0fc4a25f */ jal propGetPlayerNum /* f04c7d8: afa5001c */ sw $a1,0x1c($sp) /* f04c7dc: 00027080 */ sll $t6,$v0,0x2 -/* f04c7e0: 3c0f800a */ lui $t7,0x800a +/* f04c7e0: 3c0f800a */ lui $t7,%hi(g_Vars+0x64) /* f04c7e4: 01ee7821 */ addu $t7,$t7,$t6 -/* f04c7e8: 8defa024 */ lw $t7,-0x5fdc($t7) +/* f04c7e8: 8defa024 */ lw $t7,%lo(g_Vars+0x64)($t7) /* f04c7ec: 8fa5001c */ lw $a1,0x1c($sp) /* f04c7f0: c5f00144 */ lwc1 $f16,0x144($t7) .L0f04c7f4: diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 9575ce2b6..baf36de19 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -4561,9 +4561,9 @@ glabel aiDuplicateChr /* f055b80: 3044ffff */ andi $a0,$v0,0xffff /* f055b84: 8fab0064 */ lw $t3,0x64($sp) /* f055b88: afa00054 */ sw $zero,0x54($sp) -/* f055b8c: 3c04800a */ lui $a0,0x800a +/* f055b8c: 3c04800a */ lui $a0,%hi(g_Vars+0x424) /* f055b90: 00408025 */ or $s0,$v0,$zero -/* f055b94: 8c84a3e4 */ lw $a0,-0x5c1c($a0) +/* f055b94: 8c84a3e4 */ lw $a0,%lo(g_Vars+0x424)($a0) /* f055b98: 0fc126d1 */ jal chrFindById /* f055b9c: 91650002 */ lbu $a1,0x2($t3) /* f055ba0: 00408825 */ or $s1,$v0,$zero @@ -4573,7 +4573,7 @@ glabel aiDuplicateChr /* f055bb0: 1040007b */ beqz $v0,.L0f055da0 /* f055bb4: afa0002c */ sw $zero,0x2c($sp) /* f055bb8: 8c4a0018 */ lw $t2,0x18($v0) -/* f055bbc: 3c04800a */ lui $a0,0x800a +/* f055bbc: 3c04800a */ lui $a0,%hi(g_Vars+0x424) /* f055bc0: 2406ffff */ addiu $a2,$zero,-1 /* f055bc4: 314c0002 */ andi $t4,$t2,0x2 /* f055bc8: 51800076 */ beqzl $t4,.L0f055da4 @@ -4582,7 +4582,7 @@ glabel aiDuplicateChr /* f055bd4: 84450010 */ lh $a1,0x10($v0) /* f055bd8: 84470000 */ lh $a3,0x0($v0) /* f055bdc: afb00010 */ sw $s0,0x10($sp) -/* f055be0: 8c84a3e4 */ lw $a0,-0x5c1c($a0) +/* f055be0: 8c84a3e4 */ lw $a0,%lo(g_Vars+0x424)($a0) /* f055be4: 0fc12d7d */ jal chrSpawnAtChr /* f055be8: afad0014 */ sw $t5,0x14($sp) /* f055bec: 5040006d */ beqzl $v0,.L0f055da4 @@ -4665,14 +4665,14 @@ glabel aiDuplicateChr /* f055d0c: 24429fc0 */ addiu $v0,$v0,%lo(g_Vars) /* f055d10: ae0b0114 */ sw $t3,0x114($s0) /* f055d14: 8e2a0118 */ lw $t2,0x118($s1) -/* f055d18: 3c0e800a */ lui $t6,0x800a +/* f055d18: 3c0e800a */ lui $t6,%hi(g_MissionConfig+0x3) /* f055d1c: ae0a0118 */ sw $t2,0x118($s0) /* f055d20: 862c0128 */ lh $t4,0x128($s1) /* f055d24: a60c0128 */ sh $t4,0x128($s0) /* f055d28: 8c4d0318 */ lw $t5,0x318($v0) /* f055d2c: 55a0000b */ bnezl $t5,.L0f055d5c /* f055d30: 8fa80060 */ lw $t0,0x60($sp) -/* f055d34: 81cfdfeb */ lb $t7,-0x2015($t6) +/* f055d34: 81cfdfeb */ lb $t7,%lo(g_MissionConfig+0x3)($t6) /* f055d38: 05e30008 */ bgezl $t7,.L0f055d5c /* f055d3c: 8fa80060 */ lw $t0,0x60($sp) /* f055d40: 8c580474 */ lw $t8,0x474($v0) @@ -4707,20 +4707,20 @@ glabel aiDuplicateChr /* f055da4: 3c02800a */ lui $v0,%hi(g_Vars) /* f055da8: 24429fc0 */ addiu $v0,$v0,%lo(g_Vars) /* f055dac: 13200009 */ beqz $t9,.L0f055dd4 -/* f055db0: 3c08800a */ lui $t0,0x800a +/* f055db0: 3c08800a */ lui $t0,%hi(g_Vars+0x438) /* f055db4: 8fa90064 */ lw $t1,0x64($sp) /* f055db8: 8c440434 */ lw $a0,0x434($v0) /* f055dbc: 8c450438 */ lw $a1,0x438($v0) /* f055dc0: 0fc13583 */ jal chraiGoToLabel /* f055dc4: 91260009 */ lbu $a2,0x9($t1) -/* f055dc8: 3c01800a */ lui $at,0x800a +/* f055dc8: 3c01800a */ lui $at,%hi(g_Vars+0x438) /* f055dcc: 10000005 */ beqz $zero,.L0f055de4 -/* f055dd0: ac22a3f8 */ sw $v0,-0x5c08($at) +/* f055dd0: ac22a3f8 */ sw $v0,%lo(g_Vars+0x438)($at) .L0f055dd4: -/* f055dd4: 8d08a3f8 */ lw $t0,-0x5c08($t0) -/* f055dd8: 3c01800a */ lui $at,0x800a +/* f055dd4: 8d08a3f8 */ lw $t0,%lo(g_Vars+0x438)($t0) +/* f055dd8: 3c01800a */ lui $at,%hi(g_Vars+0x438) /* f055ddc: 250b000a */ addiu $t3,$t0,0xa -/* f055de0: ac2ba3f8 */ sw $t3,-0x5c08($at) +/* f055de0: ac2ba3f8 */ sw $t3,%lo(g_Vars+0x438)($at) .L0f055de4: /* f055de4: 8fbf0024 */ lw $ra,0x24($sp) /* f055de8: 8fb0001c */ lw $s0,0x1c($sp) diff --git a/src/game/dlights.c b/src/game/dlights.c index 88f8f2a3a..a41136438 100644 --- a/src/game/dlights.c +++ b/src/game/dlights.c @@ -154,8 +154,8 @@ glabel func0f0009c0 GLOBAL_ASM( glabel func0f000a10 -/* f000a10: 3c05800a */ lui $a1,0x800a -/* f000a14: 8ca5a244 */ lw $a1,-0x5dbc($a1) +/* f000a10: 3c05800a */ lui $a1,%hi(g_Vars+0x284) +/* f000a14: 8ca5a244 */ lw $a1,%lo(g_Vars+0x284)($a1) /* f000a18: 000478c0 */ sll $t7,$a0,0x3 /* f000a1c: 01e47821 */ addu $t7,$t7,$a0 /* f000a20: 3c0e800a */ lui $t6,%hi(g_RoomPtrs) @@ -236,8 +236,8 @@ glabel func0f000a10 GLOBAL_ASM( glabel func0f000b24 -/* f000b24: 3c02800a */ lui $v0,0x800a -/* f000b28: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f000b24: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f000b28: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f000b2c: 00802825 */ or $a1,$a0,$zero /* f000b30: 3c0e8007 */ lui $t6,%hi(var80070764) /* f000b34: 8c4300d8 */ lw $v1,0xd8($v0) @@ -1490,7 +1490,7 @@ glabel func0f001c0c /* f001c64: 006e7821 */ addu $t7,$v1,$t6 /* f001c68: 95f80000 */ lhu $t8,0x0($t7) /* f001c6c: 00001025 */ or $v0,$zero,$zero -/* f001c70: 3c04800a */ lui $a0,0x800a +/* f001c70: 3c04800a */ lui $a0,%hi(g_Vars+0x2bc) /* f001c74: 13000008 */ beqz $t8,.L0f001c98 /* f001c78: 24590001 */ addiu $t9,$v0,0x1 .L0f001c7c: @@ -1504,7 +1504,7 @@ glabel func0f001c0c .L0f001c98: /* f001c98: 50400125 */ beqzl $v0,.L0f002130 /* f001c9c: 8fbf003c */ lw $ra,0x3c($sp) -/* f001ca0: 8c84a27c */ lw $a0,-0x5d84($a0) +/* f001ca0: 8c84a27c */ lw $a0,%lo(g_Vars+0x2bc)($a0) /* f001ca4: 00045880 */ sll $t3,$a0,0x2 /* f001ca8: 0fc5db69 */ jal func0f176da4 /* f001cac: 01602025 */ or $a0,$t3,$zero @@ -1513,8 +1513,8 @@ glabel func0f001c0c /* f001cb8: 00046080 */ sll $t4,$a0,0x2 /* f001cbc: 0fc5db69 */ jal func0f176da4 /* f001cc0: 01802025 */ or $a0,$t4,$zero -/* f001cc4: 3c04800a */ lui $a0,0x800a -/* f001cc8: 8c84a27c */ lw $a0,-0x5d84($a0) +/* f001cc4: 3c04800a */ lui $a0,%hi(g_Vars+0x2bc) +/* f001cc8: 8c84a27c */ lw $a0,%lo(g_Vars+0x2bc)($a0) /* f001ccc: 0040a025 */ or $s4,$v0,$zero /* f001cd0: 00046880 */ sll $t5,$a0,0x2 /* f001cd4: 0fc5db69 */ jal func0f176da4 @@ -1527,8 +1527,8 @@ glabel func0f001c0c /* f001cf0: 00002012 */ mflo $a0 /* f001cf4: 0fc5db69 */ jal func0f176da4 /* f001cf8: 00000000 */ sll $zero,$zero,0x0 -/* f001cfc: 3c04800a */ lui $a0,0x800a -/* f001d00: 8c84a27c */ lw $a0,-0x5d84($a0) +/* f001cfc: 3c04800a */ lui $a0,%hi(g_Vars+0x2bc) +/* f001d00: 8c84a27c */ lw $a0,%lo(g_Vars+0x2bc)($a0) /* f001d04: 00409025 */ or $s2,$v0,$zero /* f001d08: 000470c0 */ sll $t6,$a0,0x3 /* f001d0c: 0fc5db69 */ jal func0f176da4 @@ -1586,8 +1586,8 @@ glabel func0f001c0c /* f001dcc: 1420ffec */ bnez $at,.L0f001d80 /* f001dd0: 24630004 */ addiu $v1,$v1,0x4 .L0f001dd4: -/* f001dd4: 3c02800a */ lui $v0,%hi(var800a008c) -/* f001dd8: 8c42a474 */ lw $v0,-0x5b8c($v0) +/* f001dd4: 3c02800a */ lui $v0,%hi(g_Vars+0x4b4) +/* f001dd8: 8c42a474 */ lw $v0,%lo(g_Vars+0x4b4)($v0) /* f001ddc: 24010022 */ addiu $at,$zero,0x22 /* f001de0: 10410003 */ beq $v0,$at,.L0f001df0 /* f001de4: 24010030 */ addiu $at,$zero,0x30 @@ -1601,8 +1601,8 @@ glabel func0f001c0c .L0f001e00: /* f001e00: 0fc00857 */ jal func0f00215c /* f001e04: 8fa40048 */ lw $a0,0x48($sp) -/* f001e08: 3c05800a */ lui $a1,0x800a -/* f001e0c: 8ca5a27c */ lw $a1,-0x5d84($a1) +/* f001e08: 3c05800a */ lui $a1,%hi(g_Vars+0x2bc) +/* f001e0c: 8ca5a27c */ lw $a1,%lo(g_Vars+0x2bc)($a1) /* f001e10: 24130001 */ addiu $s3,$zero,0x1 /* f001e14: 0000f025 */ or $s8,$zero,$zero /* f001e18: 28a10002 */ slti $at,$a1,0x2 @@ -1622,8 +1622,8 @@ glabel func0f001c0c /* f001e4c: ae220000 */ sw $v0,0x0($s1) /* f001e50: 0fc5db62 */ jal func0f176d88 /* f001e54: 00402025 */ or $a0,$v0,$zero -/* f001e58: 3c05800a */ lui $a1,0x800a -/* f001e5c: 8ca5a27c */ lw $a1,-0x5d84($a1) +/* f001e58: 3c05800a */ lui $a1,%hi(g_Vars+0x2bc) +/* f001e5c: 8ca5a27c */ lw $a1,%lo(g_Vars+0x2bc)($a1) /* f001e60: 26730001 */ addiu $s3,$s3,0x1 /* f001e64: 26310004 */ addiu $s1,$s1,0x4 /* f001e68: 0265082a */ slt $at,$s3,$a1 @@ -1640,9 +1640,9 @@ glabel func0f001c0c /* f001e90: 0040b825 */ or $s7,$v0,$zero /* f001e94: 0fc5db69 */ jal func0f176da4 /* f001e98: 0000f025 */ or $s8,$zero,$zero -/* f001e9c: 3c05800a */ lui $a1,0x800a +/* f001e9c: 3c05800a */ lui $a1,%hi(g_Vars+0x2bc) /* f001ea0: 8fa90068 */ lw $t1,0x68($sp) -/* f001ea4: 8ca5a27c */ lw $a1,-0x5d84($a1) +/* f001ea4: 8ca5a27c */ lw $a1,%lo(g_Vars+0x2bc)($a1) /* f001ea8: 00001825 */ or $v1,$zero,$zero /* f001eac: 01225021 */ addu $t2,$t1,$v0 /* f001eb0: 28a10002 */ slti $at,$a1,0x2 @@ -1658,7 +1658,7 @@ glabel func0f001c0c /* f001ed4: 00008025 */ or $s0,$zero,$zero /* f001ed8: 8e8b0000 */ lw $t3,0x0($s4) /* f001edc: 8fa30054 */ lw $v1,0x54($sp) -/* f001ee0: 3c05800a */ lui $a1,0x800a +/* f001ee0: 3c05800a */ lui $a1,%hi(g_Vars+0x2bc) /* f001ee4: 01726021 */ addu $t4,$t3,$s2 /* f001ee8: ad970000 */ sw $s7,0x0($t4) /* f001eec: 8e2d0000 */ lw $t5,0x0($s1) @@ -1684,7 +1684,7 @@ glabel func0f001c0c /* f001f38: 5420fff2 */ bnezl $at,.L0f001f04 /* f001f3c: 8ece0000 */ lw $t6,0x0($s6) .L0f001f40: -/* f001f40: 8ca5a27c */ lw $a1,-0x5d84($a1) +/* f001f40: 8ca5a27c */ lw $a1,%lo(g_Vars+0x2bc)($a1) /* f001f44: 26730001 */ addiu $s3,$s3,0x1 /* f001f48: 26520008 */ addiu $s2,$s2,0x8 /* f001f4c: 0265082a */ slt $at,$s3,$a1 @@ -1709,8 +1709,8 @@ glabel func0f001c0c /* f001f90: ae220000 */ sw $v0,0x0($s1) /* f001f94: 0fc5db62 */ jal func0f176d88 /* f001f98: 00402025 */ or $a0,$v0,$zero -/* f001f9c: 3c05800a */ lui $a1,0x800a -/* f001fa0: 8ca5a27c */ lw $a1,-0x5d84($a1) +/* f001f9c: 3c05800a */ lui $a1,%hi(g_Vars+0x2bc) +/* f001fa0: 8ca5a27c */ lw $a1,%lo(g_Vars+0x2bc)($a1) /* f001fa4: 26730001 */ addiu $s3,$s3,0x1 /* f001fa8: 26310004 */ addiu $s1,$s1,0x4 /* f001fac: 0265082a */ slt $at,$s3,$a1 @@ -1727,8 +1727,8 @@ glabel func0f001c0c /* f001fd4: 0040b825 */ or $s7,$v0,$zero /* f001fd8: 0fc5db69 */ jal func0f176da4 /* f001fdc: 03c02025 */ or $a0,$s8,$zero -/* f001fe0: 3c05800a */ lui $a1,0x800a -/* f001fe4: 8ca5a27c */ lw $a1,-0x5d84($a1) +/* f001fe0: 3c05800a */ lui $a1,%hi(g_Vars+0x2bc) +/* f001fe4: 8ca5a27c */ lw $a1,%lo(g_Vars+0x2bc)($a1) /* f001fe8: 8fb10044 */ lw $s1,0x44($sp) /* f001fec: 28a10002 */ slti $at,$a1,0x2 /* f001ff0: 14200024 */ bnez $at,.L0f002084 @@ -1742,7 +1742,7 @@ glabel func0f001c0c /* f00200c: 0fc5db62 */ jal func0f176d88 /* f002010: 8e240000 */ lw $a0,0x0($s1) /* f002014: 8e390000 */ lw $t9,0x0($s1) -/* f002018: 3c05800a */ lui $a1,0x800a +/* f002018: 3c05800a */ lui $a1,%hi(g_Vars+0x2bc) /* f00201c: 02e2b821 */ addu $s7,$s7,$v0 /* f002020: 1b200011 */ blez $t9,.L0f002068 /* f002024: 00000000 */ sll $zero,$zero,0x0 @@ -1764,7 +1764,7 @@ glabel func0f001c0c /* f002060: 5420fff2 */ bnezl $at,.L0f00202c /* f002064: 8ec90000 */ lw $t1,0x0($s6) .L0f002068: -/* f002068: 8ca5a27c */ lw $a1,-0x5d84($a1) +/* f002068: 8ca5a27c */ lw $a1,%lo(g_Vars+0x2bc)($a1) /* f00206c: 26730001 */ addiu $s3,$s3,0x1 /* f002070: 26520008 */ addiu $s2,$s2,0x8 /* f002074: 0265082a */ slt $at,$s3,$a1 @@ -1779,14 +1779,14 @@ glabel func0f001c0c /* f002094: 26104928 */ addiu $s0,$s0,%lo(g_RoomPtrs) /* f002098: 8e090000 */ lw $t1,0x0($s0) .L0f00209c: -/* f00209c: 3c08800a */ lui $t0,0x800a +/* f00209c: 3c08800a */ lui $t0,%hi(g_Vars+0x2bc) /* f0020a0: 26730001 */ addiu $s3,$s3,0x1 /* f0020a4: 01221821 */ addu $v1,$t1,$v0 /* f0020a8: 946a0000 */ lhu $t2,0x0($v1) -/* f0020ac: 2442008c */ addiu $v0,$v0,%lo(var800a008c) +/* f0020ac: 2442008c */ addiu $v0,$v0,140 /* f0020b0: 354b0004 */ ori $t3,$t2,0x4 /* f0020b4: a46b0000 */ sh $t3,0x0($v1) -/* f0020b8: 8d08a27c */ lw $t0,-0x5d84($t0) +/* f0020b8: 8d08a27c */ lw $t0,%lo(g_Vars+0x2bc)($t0) /* f0020bc: 0268082a */ slt $at,$s3,$t0 /* f0020c0: 5420fff6 */ bnezl $at,.L0f00209c /* f0020c4: 8e090000 */ lw $t1,0x0($s0) @@ -1795,8 +1795,8 @@ glabel func0f001c0c /* f0020cc: 3c10800a */ lui $s0,%hi(g_RoomPtrs) /* f0020d0: 0fc00cec */ jal func0f0033b0 /* f0020d4: 26104928 */ addiu $s0,$s0,%lo(g_RoomPtrs) -/* f0020d8: 3c0d800a */ lui $t5,0x800a -/* f0020dc: 8dada27c */ lw $t5,-0x5d84($t5) +/* f0020d8: 3c0d800a */ lui $t5,%hi(g_Vars+0x2bc) +/* f0020dc: 8dada27c */ lw $t5,%lo(g_Vars+0x2bc)($t5) /* f0020e0: 2402008c */ addiu $v0,$zero,0x8c /* f0020e4: 2404fffb */ addiu $a0,$zero,-5 /* f0020e8: 29a10002 */ slti $at,$t5,0x2 @@ -1804,14 +1804,14 @@ glabel func0f001c0c /* f0020f0: 00000000 */ sll $zero,$zero,0x0 /* f0020f4: 8e0e0000 */ lw $t6,0x0($s0) .L0f0020f8: -/* f0020f8: 3c18800a */ lui $t8,0x800a +/* f0020f8: 3c18800a */ lui $t8,%hi(g_Vars+0x2bc) /* f0020fc: 26730001 */ addiu $s3,$s3,0x1 /* f002100: 01c21821 */ addu $v1,$t6,$v0 /* f002104: 946f0000 */ lhu $t7,0x0($v1) /* f002108: 2442008c */ addiu $v0,$v0,0x8c /* f00210c: 01e46024 */ and $t4,$t7,$a0 /* f002110: a46c0000 */ sh $t4,0x0($v1) -/* f002114: 8f18a27c */ lw $t8,-0x5d84($t8) +/* f002114: 8f18a27c */ lw $t8,%lo(g_Vars+0x2bc)($t8) /* f002118: 0278082a */ slt $at,$s3,$t8 /* f00211c: 5420fff6 */ bnezl $at,.L0f0020f8 /* f002120: 8e0e0000 */ lw $t6,0x0($s0) @@ -1837,17 +1837,17 @@ GLOBAL_ASM( glabel func0f00215c /* f00215c: 3c0e7f00 */ lui $t6,%hi(func0f002334) /* f002160: 25ce2334 */ addiu $t6,$t6,%lo(func0f002334) -/* f002164: 3c01800a */ lui $at,0x800a -/* f002168: ac2ecae8 */ sw $t6,-0x3518($at) +/* f002164: 3c01800a */ lui $at,%hi(var8009cae8) +/* f002168: ac2ecae8 */ sw $t6,%lo(var8009cae8)($at) /* f00216c: 3c014248 */ lui $at,0x4248 /* f002170: 44812000 */ mtc1 $at,$f4 /* f002174: 3c018006 */ lui $at,0x8006 /* f002178: 27bdffd0 */ addiu $sp,$sp,-48 /* f00217c: e424143c */ swc1 $f4,0x143c($at) -/* f002180: 3c01800a */ lui $at,0x800a +/* f002180: 3c01800a */ lui $at,%hi(var8009cae4) /* f002184: 240f0014 */ addiu $t7,$zero,0x14 /* f002188: afb00014 */ sw $s0,0x14($sp) -/* f00218c: ac2fcae4 */ sw $t7,-0x351c($at) +/* f00218c: ac2fcae4 */ sw $t7,%lo(var8009cae4)($at) /* f002190: 3c10800a */ lui $s0,%hi(g_Vars) /* f002194: 3c018006 */ lui $at,0x8006 /* f002198: 26109fc0 */ addiu $s0,$s0,%lo(g_Vars) @@ -2499,8 +2499,8 @@ glabel func0f002a98 /* f002ab4: afb00014 */ sw $s0,0x14($sp) /* f002ab8: 0fc5db62 */ jal func0f176d88 /* f002abc: 8e6402bc */ lw $a0,0x2bc($s3) -/* f002ac0: 3c01800a */ lui $at,0x800a -/* f002ac4: ac22cae0 */ sw $v0,-0x3520($at) +/* f002ac0: 3c01800a */ lui $at,%hi(var8009cae0) +/* f002ac4: ac22cae0 */ sw $v0,%lo(var8009cae0)($at) /* f002ac8: 3c018006 */ lui $at,0x8006 /* f002acc: ac201458 */ sw $zero,0x1458($at) /* f002ad0: 8e6e02bc */ lw $t6,0x2bc($s3) @@ -3200,13 +3200,13 @@ glabel func0f003444 /* f00347c: 19c00044 */ blez $t6,.L0f003590 /* f003480: 0000a025 */ or $s4,$zero,$zero /* f003484: 3c013f00 */ lui $at,0x3f00 -/* f003488: 3c02800a */ lui $v0,%hi(var800a008c) +/* f003488: 3c02800a */ lui $v0,%hi(g_RoomPtrs) /* f00348c: 3c16800a */ lui $s6,%hi(var800a4cd8) /* f003490: 3c12800a */ lui $s2,%hi(g_RoomPtrs) /* f003494: 4481a000 */ mtc1 $at,$f20 /* f003498: 26524928 */ addiu $s2,$s2,%lo(g_RoomPtrs) /* f00349c: 26d64cd8 */ addiu $s6,$s6,%lo(var800a4cd8) -/* f0034a0: 8c424928 */ lw $v0,0x4928($v0) +/* f0034a0: 8c424928 */ lw $v0,%lo(g_RoomPtrs)($v0) /* f0034a4: 00009825 */ or $s3,$zero,$zero /* f0034a8: 24150022 */ addiu $s5,$zero,0x22 .L0f0034ac: @@ -3270,7 +3270,7 @@ glabel func0f003444 /* f003580: 2673008c */ addiu $s3,$s3,0x8c /* f003584: 0299082a */ slt $at,$s4,$t9 /* f003588: 1420ffc8 */ bnez $at,.L0f0034ac -/* f00358c: 2442008c */ addiu $v0,$v0,%lo(var800a008c) +/* f00358c: 2442008c */ addiu $v0,$v0,140 .L0f003590: /* f003590: 8fbf003c */ lw $ra,0x3c($sp) /* f003594: d7b40010 */ ldc1 $f20,0x10($sp) @@ -3304,13 +3304,13 @@ glabel func0f0035c0 /* f0035f4: f7b40010 */ sdc1 $f20,0x10($sp) /* f0035f8: 19c00040 */ blez $t6,.L0f0036fc /* f0035fc: 0000a025 */ or $s4,$zero,$zero -/* f003600: 3c02800a */ lui $v0,%hi(var800a008c) +/* f003600: 3c02800a */ lui $v0,%hi(g_RoomPtrs) /* f003604: 3c16800a */ lui $s6,%hi(var800a4cd8) /* f003608: 3c12800a */ lui $s2,%hi(g_RoomPtrs) /* f00360c: 4480a000 */ mtc1 $zero,$f20 /* f003610: 26524928 */ addiu $s2,$s2,%lo(g_RoomPtrs) /* f003614: 26d64cd8 */ addiu $s6,$s6,%lo(var800a4cd8) -/* f003618: 8c424928 */ lw $v0,0x4928($v0) +/* f003618: 8c424928 */ lw $v0,%lo(g_RoomPtrs)($v0) /* f00361c: 00009825 */ or $s3,$zero,$zero /* f003620: 24150022 */ addiu $s5,$zero,0x22 .L0f003624: @@ -3371,7 +3371,7 @@ glabel func0f0035c0 /* f0036ec: 2673008c */ addiu $s3,$s3,0x8c /* f0036f0: 028b082a */ slt $at,$s4,$t3 /* f0036f4: 1420ffcb */ bnez $at,.L0f003624 -/* f0036f8: 2442008c */ addiu $v0,$v0,%lo(var800a008c) +/* f0036f8: 2442008c */ addiu $v0,$v0,140 .L0f0036fc: /* f0036fc: 8fbf003c */ lw $ra,0x3c($sp) /* f003700: d7b40010 */ ldc1 $f20,0x10($sp) @@ -3390,8 +3390,8 @@ glabel func0f0035c0 GLOBAL_ASM( glabel func0f00372c /* f00372c: 3c038006 */ lui $v1,%hi(var80061458) -/* f003730: 3c02800a */ lui $v0,0x800a -/* f003734: 8c42a26c */ lw $v0,-0x5d94($v0) +/* f003730: 3c02800a */ lui $v0,%hi(g_Vars+0x2ac) +/* f003734: 8c42a26c */ lw $v0,%lo(g_Vars+0x2ac)($v0) /* f003738: 8c631458 */ lw $v1,%lo(var80061458)($v1) /* f00373c: 27bdffe8 */ addiu $sp,$sp,-24 /* f003740: afbf0014 */ sw $ra,0x14($sp) @@ -3403,9 +3403,9 @@ glabel func0f00372c /* f003758: 24040001 */ addiu $a0,$zero,0x1 /* f00375c: 0fc00d11 */ jal func0f003444 /* f003760: 00000000 */ sll $zero,$zero,0x0 -/* f003764: 3c02800a */ lui $v0,0x800a +/* f003764: 3c02800a */ lui $v0,%hi(g_Vars+0x2ac) /* f003768: 1000000a */ beqz $zero,.L0f003794 -/* f00376c: 8c42a26c */ lw $v0,-0x5d94($v0) +/* f00376c: 8c42a26c */ lw $v0,%lo(g_Vars+0x2ac)($v0) /* f003770: 24040001 */ addiu $a0,$zero,0x1 .L0f003774: /* f003774: 14440007 */ bne $v0,$a0,.L0f003794 @@ -3414,8 +3414,8 @@ glabel func0f00372c /* f003780: 00000000 */ sll $zero,$zero,0x0 /* f003784: 0fc00d70 */ jal func0f0035c0 /* f003788: 00000000 */ sll $zero,$zero,0x0 -/* f00378c: 3c02800a */ lui $v0,0x800a -/* f003790: 8c42a26c */ lw $v0,-0x5d94($v0) +/* 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) @@ -3468,10 +3468,10 @@ glabel var7f1a7dd4 .L0f003800: /* f003800: 3c0e8006 */ lui $t6,%hi(var80061420) /* f003804: 8dce1420 */ lw $t6,%lo(var80061420)($t6) -/* f003808: 3c02800a */ lui $v0,0x800a +/* f003808: 3c02800a */ lui $v0,%hi(g_Vars+0x2bc) /* f00380c: 51c002b4 */ beqzl $t6,.L0f0042e0 /* f003810: 8fbf0054 */ lw $ra,0x54($sp) -/* f003814: 8c42a27c */ lw $v0,-0x5d84($v0) +/* f003814: 8c42a27c */ lw $v0,%lo(g_Vars+0x2bc)($v0) /* f003818: 241e0001 */ addiu $s8,$zero,0x1 /* f00381c: 2412008c */ addiu $s2,$zero,0x8c /* f003820: 28410002 */ slti $at,$v0,0x2 @@ -3481,14 +3481,14 @@ glabel var7f1a7dd4 /* f003830: 2403fbff */ addiu $v1,$zero,-1025 /* f003834: 8e6f0000 */ lw $t7,0x0($s3) .L0f003838: -/* f003838: 3c02800a */ lui $v0,0x800a +/* f003838: 3c02800a */ lui $v0,%hi(g_Vars+0x2bc) /* f00383c: 27de0001 */ addiu $s8,$s8,0x1 /* f003840: 01f28021 */ addu $s0,$t7,$s2 /* f003844: 96180000 */ lhu $t8,0x0($s0) /* f003848: 2652008c */ addiu $s2,$s2,0x8c /* f00384c: 0303c824 */ and $t9,$t8,$v1 /* f003850: a6190000 */ sh $t9,0x0($s0) -/* f003854: 8c42a27c */ lw $v0,-0x5d84($v0) +/* f003854: 8c42a27c */ lw $v0,%lo(g_Vars+0x2bc)($v0) /* f003858: 03c2082a */ slt $at,$s8,$v0 /* f00385c: 5420fff6 */ bnezl $at,.L0f003838 /* f003860: 8e6f0000 */ lw $t7,0x0($s3) @@ -3506,8 +3506,8 @@ glabel var7f1a7dd4 /* f00388c: 27b400a0 */ addiu $s4,$sp,0xa0 /* f003890: 8e680000 */ lw $t0,0x0($s3) .L0f003894: -/* f003894: 3c0a800a */ lui $t2,0x800a -/* f003898: 8d4a9ff4 */ lw $t2,-0x600c($t2) +/* f003894: 3c0a800a */ lui $t2,%hi(g_Vars+0x34) +/* f003898: 8d4a9ff4 */ lw $t2,%lo(g_Vars+0x34)($t2) /* f00389c: 01128021 */ addu $s0,$t0,$s2 /* f0038a0: 86090054 */ lh $t1,0x54($s0) /* f0038a4: 012a5823 */ subu $t3,$t1,$t2 @@ -3885,8 +3885,8 @@ glabel var7f1a7dd4 /* f003dfc: 3c028006 */ lui $v0,%hi(var80061420) /* f003e00: 5140003c */ beqzl $t2,.L0f003ef4 /* f003e04: 96080000 */ lhu $t0,0x0($s0) -/* f003e08: 3c11800a */ lui $s1,0x800a -/* f003e0c: 8e319ff4 */ lw $s1,-0x600c($s1) +/* f003e08: 3c11800a */ lui $s1,%hi(g_Vars+0x34) +/* f003e0c: 8e319ff4 */ lw $s1,%lo(g_Vars+0x34)($s1) /* f003e10: 8c421420 */ lw $v0,%lo(var80061420)($v0) /* f003e14: 001e80c0 */ sll $s0,$s8,0x3 /* f003e18: 00116040 */ sll $t4,$s1,0x1 @@ -3953,11 +3953,11 @@ glabel var7f1a7dd4 /* f003eec: 03328021 */ addu $s0,$t9,$s2 /* f003ef0: 96080000 */ lhu $t0,0x0($s0) .L0f003ef4: -/* f003ef4: 3c02800a */ lui $v0,0x800a +/* f003ef4: 3c02800a */ lui $v0,%hi(g_Vars+0x2bc) /* f003ef8: 27de0001 */ addiu $s8,$s8,0x1 /* f003efc: 3109feff */ andi $t1,$t0,0xfeff /* f003f00: a6090000 */ sh $t1,0x0($s0) -/* f003f04: 8c42a27c */ lw $v0,-0x5d84($v0) +/* f003f04: 8c42a27c */ lw $v0,%lo(g_Vars+0x2bc)($v0) /* f003f08: 2652008c */ addiu $s2,$s2,0x8c /* f003f0c: 03c2082a */ slt $at,$s8,$v0 /* f003f10: 5420fe60 */ bnezl $at,.L0f003894 @@ -3977,14 +3977,14 @@ glabel var7f1a7dd4 /* f003f40: 2412008c */ addiu $s2,$zero,0x8c /* f003f44: 8e6c0000 */ lw $t4,0x0($s3) .L0f003f48: -/* f003f48: 3c02800a */ lui $v0,0x800a +/* f003f48: 3c02800a */ lui $v0,%hi(g_Vars+0x2bc) /* f003f4c: 27de0001 */ addiu $s8,$s8,0x1 /* f003f50: 01928021 */ addu $s0,$t4,$s2 /* f003f54: 960d0000 */ lhu $t5,0x0($s0) /* f003f58: 2652008c */ addiu $s2,$s2,0x8c /* f003f5c: 35af0200 */ ori $t7,$t5,0x200 /* f003f60: a60f0000 */ sh $t7,0x0($s0) -/* f003f64: 8c42a27c */ lw $v0,-0x5d84($v0) +/* f003f64: 8c42a27c */ lw $v0,%lo(g_Vars+0x2bc)($v0) /* f003f68: 03c2082a */ slt $at,$s8,$v0 /* f003f6c: 5420fff6 */ bnezl $at,.L0f003f48 /* f003f70: 8e6c0000 */ lw $t4,0x0($s3) @@ -4148,8 +4148,8 @@ glabel var7f1a7dd4 /* f0041c0: e612007c */ swc1 $f18,0x7c($s0) .L0f0041c4: /* f0041c4: 8fa900d0 */ lw $t1,0xd0($sp) -/* f0041c8: 3c02800a */ lui $v0,0x800a -/* f0041cc: 8c42a27c */ lw $v0,-0x5d84($v0) +/* f0041c8: 3c02800a */ lui $v0,%hi(g_Vars+0x2bc) +/* f0041cc: 8c42a27c */ lw $v0,%lo(g_Vars+0x2bc)($v0) /* f0041d0: 252b0001 */ addiu $t3,$t1,0x1 /* f0041d4: afab00d0 */ sw $t3,0xd0($sp) .L0f0041d8: @@ -4159,18 +4159,18 @@ glabel var7f1a7dd4 /* f0041e0: 1420ff6b */ bnez $at,.L0f003f90 /* f0041e4: 00000000 */ sll $zero,$zero,0x0 .L0f0041e8: -/* f0041e8: 3c0a800a */ lui $t2,0x800a -/* f0041ec: 8d4aa498 */ lw $t2,-0x5b68($t2) +/* f0041e8: 3c0a800a */ lui $t2,%hi(g_Vars+0x4d8) +/* f0041ec: 8d4aa498 */ lw $t2,%lo(g_Vars+0x4d8)($t2) /* f0041f0: 3c038006 */ lui $v1,%hi(var8006144c) /* f0041f4: 8c63144c */ lw $v1,%lo(var8006144c)($v1) /* f0041f8: 1d400035 */ bgtz $t2,.L0f0042d0 /* f0041fc: 8fac00d0 */ lw $t4,0xd0($sp) /* f004200: 15800003 */ bnez $t4,.L0f004210 -/* f004204: 3c11800a */ lui $s1,0x800a +/* f004204: 3c11800a */ lui $s1,%hi(g_Vars+0x33c) /* f004208: 10600031 */ beqz $v1,.L0f0042d0 /* f00420c: 00000000 */ sll $zero,$zero,0x0 .L0f004210: -/* f004210: 8e31a2fc */ lw $s1,-0x5d04($s1) +/* f004210: 8e31a2fc */ lw $s1,%lo(g_Vars+0x33c)($s1) /* f004214: 24140003 */ addiu $s4,$zero,0x3 /* f004218: 24120002 */ addiu $s2,$zero,0x2 /* f00421c: 5220002a */ beqzl $s1,.L0f0042c8 @@ -4223,8 +4223,8 @@ glabel var7f1a7dd4 /* f0042c0: 922d0000 */ lbu $t5,0x0($s1) /* f0042c4: 240d000f */ addiu $t5,$zero,0xf .L0f0042c8: -/* f0042c8: 3c01800a */ lui $at,0x800a -/* f0042cc: a02da4a1 */ sb $t5,-0x5b5f($at) +/* f0042c8: 3c01800a */ lui $at,%hi(g_Vars+0x4e1) +/* f0042cc: a02da4a1 */ sb $t5,%lo(g_Vars+0x4e1)($at) .L0f0042d0: /* f0042d0: 10600002 */ beqz $v1,.L0f0042dc /* f0042d4: 3c018006 */ lui $at,0x8006 @@ -4249,8 +4249,8 @@ glabel var7f1a7dd4 GLOBAL_ASM( glabel func0f004314 -/* f004314: 3c02800a */ lui $v0,0x800a -/* f004318: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f004314: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f004318: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f00431c: 27bdffe0 */ addiu $sp,$sp,-32 /* f004320: afbf0014 */ sw $ra,0x14($sp) /* f004324: 244e0638 */ addiu $t6,$v0,0x638 @@ -4260,7 +4260,7 @@ glabel func0f004314 /* f004334: afaf0018 */ sw $t7,0x18($sp) /* f004338: 8fb8001c */ lw $t8,0x1c($sp) /* f00433c: 8fa80018 */ lw $t0,0x18($sp) -/* f004340: 3c0a800a */ lui $t2,0x800a +/* f004340: 3c0a800a */ lui $t2,%hi(g_Vars+0x284) /* f004344: 83190005 */ lb $t9,0x5($t8) /* f004348: 17200004 */ bnez $t9,.L0f00435c /* f00434c: 00000000 */ sll $zero,$zero,0x0 @@ -4268,7 +4268,7 @@ glabel func0f004314 /* f004354: 51200008 */ beqzl $t1,.L0f004378 /* f004358: 8fbf0014 */ lw $ra,0x14($sp) .L0f00435c: -/* f00435c: 8d4aa244 */ lw $t2,-0x5dbc($t2) +/* f00435c: 8d4aa244 */ lw $t2,%lo(g_Vars+0x284)($t2) /* f004360: 24050040 */ addiu $a1,$zero,0x40 /* f004364: 24060050 */ addiu $a2,$zero,0x50 /* f004368: 8d4b00bc */ lw $t3,0xbc($t2) @@ -4623,8 +4623,8 @@ glabel var7f1a7ddc /* f004840: 100000fe */ beqz $zero,.L0f004c3c /* f004844: a14e0003 */ sb $t6,0x3($t2) .L0f004848: -/* f004848: 3c07800a */ lui $a3,0x800a -/* f00484c: 8ce7a244 */ lw $a3,-0x5dbc($a3) +/* f004848: 3c07800a */ lui $a3,%hi(g_Vars+0x284) +/* f00484c: 8ce7a244 */ lw $a3,%lo(g_Vars+0x284)($a3) /* f004850: 02406825 */ or $t5,$s2,$zero /* f004854: 8ce800d8 */ lw $t0,0xd8($a3) /* f004858: 15000013 */ bnez $t0,.L0f0048a8 @@ -5027,11 +5027,11 @@ glabel func0f004c6c /* f004de4: 0c0048c9 */ jal func00012324 /* f004de8: 00000000 */ sll $zero,$zero,0x0 /* f004dec: 8fad0044 */ lw $t5,0x44($sp) -/* f004df0: 3c01800a */ lui $at,0x800a -/* f004df4: ac22cad0 */ sw $v0,-0x3530($at) -/* f004df8: 3c01800a */ lui $at,0x800a +/* f004df0: 3c01800a */ lui $at,%hi(var8009cad0) +/* f004df4: ac22cad0 */ sw $v0,%lo(var8009cad0)($at) +/* f004df8: 3c01800a */ lui $at,%hi(var8009cad8) /* f004dfc: 004d1821 */ addu $v1,$v0,$t5 -/* f004e00: ac23cad8 */ sw $v1,-0x3528($at) +/* f004e00: ac23cad8 */ sw $v1,%lo(var8009cad8)($at) /* f004e04: 8fa70034 */ lw $a3,0x34($sp) /* f004e08: 8ea50000 */ lw $a1,0x0($s5) /* f004e0c: 8fae0040 */ lw $t6,0x40($sp) @@ -5111,8 +5111,8 @@ glabel func0f004c6c /* f004f1c: 2694000c */ addiu $s4,$s4,0xc /* f004f20: 00008825 */ or $s1,$zero,$zero .L0f004f24: -/* f004f24: 3c0d800a */ lui $t5,0x800a -/* f004f28: 8dada474 */ lw $t5,-0x5b8c($t5) +/* f004f24: 3c0d800a */ lui $t5,%hi(g_Vars+0x4b4) +/* f004f28: 8dada474 */ lw $t5,%lo(g_Vars+0x4b4)($t5) /* f004f2c: 24010033 */ addiu $at,$zero,0x33 /* f004f30: 3c18800a */ lui $t8,%hi(var8009cad8) /* f004f34: 15a10005 */ bne $t5,$at,.L0f004f4c @@ -5997,8 +5997,8 @@ glabel var7f1a7de4 GLOBAL_ASM( glabel func0f005bb0 -/* f005bb0: 3c0e800a */ lui $t6,0x800a -/* f005bb4: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f005bb0: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f005bb4: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f005bb8: 27bdffd0 */ addiu $sp,$sp,-48 /* f005bbc: afbf0024 */ sw $ra,0x24($sp) /* f005bc0: 8dcf00bc */ lw $t7,0xbc($t6) @@ -6192,8 +6192,8 @@ glabel func0f005bb0 /* f005e68: 0fc5b364 */ jal getVar80084014 /* f005e6c: 00000000 */ sll $zero,$zero,0x0 /* f005e70: 14400038 */ bnez $v0,.L0f005f54 -/* f005e74: 3c08800a */ lui $t0,0x800a -/* f005e78: 8d08a244 */ lw $t0,-0x5dbc($t0) +/* f005e74: 3c08800a */ lui $t0,%hi(g_Vars+0x284) +/* f005e78: 8d08a244 */ lw $t0,%lo(g_Vars+0x284)($t0) /* f005e7c: 3c048009 */ lui $a0,%hi(var80095200) /* f005e80: 24050505 */ addiu $a1,$zero,0x505 /* f005e84: 8d191c20 */ lw $t9,0x1c20($t0) @@ -6211,8 +6211,8 @@ glabel func0f005bb0 /* f005eb4: afaf0010 */ sw $t7,0x10($sp) /* f005eb8: 0c004241 */ jal func00010904 /* f005ebc: e7a40014 */ swc1 $f4,0x14($sp) -/* f005ec0: 3c08800a */ lui $t0,0x800a -/* f005ec4: 8d08a244 */ lw $t0,-0x5dbc($t0) +/* f005ec0: 3c08800a */ lui $t0,%hi(g_Vars+0x284) +/* f005ec4: 8d08a244 */ lw $t0,%lo(g_Vars+0x284)($t0) .L0f005ec8: /* f005ec8: 8fac002c */ lw $t4,0x2c($sp) /* f005ecc: 29810081 */ slti $at,$t4,0x81 @@ -6244,8 +6244,8 @@ glabel func0f005bb0 /* f005f30: 0c00cdfc */ jal func000337f0 /* f005f34: 00000000 */ sll $zero,$zero,0x0 /* f005f38: 10400020 */ beqz $v0,.L0f005fbc -/* f005f3c: 3c19800a */ lui $t9,0x800a -/* f005f40: 8f39a244 */ lw $t9,-0x5dbc($t9) +/* f005f3c: 3c19800a */ lui $t9,%hi(g_Vars+0x284) +/* f005f40: 8f39a244 */ lw $t9,%lo(g_Vars+0x284)($t9) /* f005f44: 0c00cec9 */ jal func00033b24 /* f005f48: 8f241c24 */ lw $a0,0x1c24($t9) /* f005f4c: 1000001c */ beqz $zero,.L0f005fc0 @@ -6260,8 +6260,8 @@ glabel func0f005bb0 /* f005f6c: 0c00cdfc */ jal func000337f0 /* f005f70: 00000000 */ sll $zero,$zero,0x0 /* f005f74: 10400004 */ beqz $v0,.L0f005f88 -/* f005f78: 3c18800a */ lui $t8,0x800a -/* f005f7c: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f005f78: 3c18800a */ lui $t8,%hi(g_Vars+0x284) +/* f005f7c: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f005f80: 0c00cec9 */ jal func00033b24 /* f005f84: 8f041c20 */ lw $a0,0x1c20($t8) .L0f005f88: @@ -6274,8 +6274,8 @@ glabel func0f005bb0 /* f005fa0: 0c00cdfc */ jal func000337f0 /* f005fa4: 00000000 */ sll $zero,$zero,0x0 /* f005fa8: 10400004 */ beqz $v0,.L0f005fbc -/* f005fac: 3c0c800a */ lui $t4,0x800a -/* f005fb0: 8d8ca244 */ lw $t4,-0x5dbc($t4) +/* f005fac: 3c0c800a */ lui $t4,%hi(g_Vars+0x284) +/* f005fb0: 8d8ca244 */ lw $t4,%lo(g_Vars+0x284)($t4) /* f005fb4: 0c00cec9 */ jal func00033b24 /* f005fb8: 8d841c24 */ lw $a0,0x1c24($t4) .L0f005fbc: diff --git a/src/game/game_000000.c b/src/game/game_000000.c index dfd68fc10..8d2b08265 100644 --- a/src/game/game_000000.c +++ b/src/game/game_000000.c @@ -20,8 +20,8 @@ glabel func0f000000 /* f000014: 24042e80 */ addiu $a0,$zero,0x2e80 /* f000018: 0c0048f2 */ jal malloc /* f00001c: 24050006 */ addiu $a1,$zero,0x6 -/* f000020: 3c01800b */ lui $at,0x800b -/* f000024: ac22abb4 */ sw $v0,-0x544c($at) +/* f000020: 3c01800b */ lui $at,%hi(var800aabb4) +/* f000024: ac22abb4 */ sw $v0,%lo(var800aabb4)($at) /* f000028: 24040100 */ addiu $a0,$zero,0x100 /* f00002c: 0c0048f2 */ jal malloc /* f000030: 24050006 */ addiu $a1,$zero,0x6 diff --git a/src/game/game_006bd0.c b/src/game/game_006bd0.c index 23206b7b8..8656e960e 100644 --- a/src/game/game_006bd0.c +++ b/src/game/game_006bd0.c @@ -441,7 +441,7 @@ glabel func0f006c80 /* f007110: 24421648 */ addiu $v0,$v0,%lo(var80061648) /* f007114: a080001f */ sb $zero,0x1f($a0) /* f007118: 240e0001 */ addiu $t6,$zero,0x1 -/* f00711c: 3c0f800a */ lui $t7,%hi(var800a000c) +/* f00711c: 3c0f800a */ lui $t7,%hi(var8009cb04) /* f007120: 46044282 */ mul.s $f10,$f8,$f4 /* f007124: 00000000 */ sll $zero,$zero,0x0 /* f007128: 46065482 */ mul.s $f18,$f10,$f6 @@ -452,8 +452,8 @@ glabel func0f006c80 /* f00713c: 8c4d0000 */ lw $t5,0x0($v0) /* f007140: 01cdc023 */ subu $t8,$t6,$t5 /* f007144: ac580000 */ sw $t8,0x0($v0) -/* f007148: 8defcb04 */ lw $t7,-0x34fc($t7) -/* f00714c: 3c0e800a */ lui $t6,%hi(var800a000c) +/* f007148: 8defcb04 */ lw $t7,%lo(var8009cb04)($t7) +/* f00714c: 3c0e800a */ lui $t6,%hi(var8009cb00) /* f007150: 11e00006 */ beqz $t7,.L0f00716c /* f007154: 00000000 */ sll $zero,$zero,0x0 /* f007158: 848b0022 */ lh $t3,0x22($a0) @@ -464,7 +464,7 @@ glabel func0f006c80 .L0f00716c: /* f00716c: 848c0022 */ lh $t4,0x22($a0) .L0f007170: -/* f007170: 85cecb00 */ lh $t6,-0x3500($t6) +/* f007170: 85cecb00 */ lh $t6,%lo(var8009cb00)($t6) /* f007174: 3c010400 */ lui $at,0x400 /* f007178: 02001825 */ or $v1,$s0,$zero /* f00717c: 018e6821 */ addu $t5,$t4,$t6 @@ -631,8 +631,8 @@ glabel func0f006c80 /* f0073f8: 27ae00b0 */ addiu $t6,$sp,0xb0 .L0f0073fc: /* f0073fc: 8de10000 */ lw $at,0x0($t7) -/* f007400: 25ef000c */ addiu $t7,$t7,%lo(var800a000c) -/* f007404: 25ce000c */ addiu $t6,$t6,%lo(var800a000c) +/* f007400: 25ef000c */ addiu $t7,$t7,12 +/* f007404: 25ce000c */ addiu $t6,$t6,12 /* f007408: adc1fff4 */ sw $at,-0xc($t6) /* f00740c: 8de1fff8 */ lw $at,-0x8($t7) /* f007410: adc1fff8 */ sw $at,-0x8($t6) @@ -819,16 +819,16 @@ glabel func0f006c80 /* f0076e4: af310004 */ sw $s1,0x4($t9) /* f0076e8: af300000 */ sw $s0,0x0($t9) /* f0076ec: c4281630 */ lwc1 $f8,0x1630($at) -/* f0076f0: 3c01800a */ lui $at,0x800a +/* f0076f0: 3c01800a */ lui $at,%hi(var8009cb00) /* f0076f4: 24040006 */ addiu $a0,$zero,0x6 /* f0076f8: 46083282 */ mul.s $f10,$f6,$f8 /* f0076fc: 4600540d */ trunc.w.s $f16,$f10 /* f007700: 44188000 */ mfc1 $t8,$f16 /* f007704: 00000000 */ sll $zero,$zero,0x0 -/* f007708: a438cb00 */ sh $t8,-0x3500($at) -/* f00770c: 3c01800a */ lui $at,0x800a +/* f007708: a438cb00 */ sh $t8,%lo(var8009cb00)($at) +/* f00770c: 3c01800a */ lui $at,%hi(var8009cb04) /* f007710: 0fc59e59 */ jal func0f167964 -/* f007714: ac20cb04 */ sw $zero,-0x34fc($at) +/* f007714: ac20cb04 */ sw $zero,%lo(var8009cb04)($at) /* f007718: c7b200b0 */ lwc1 $f18,0xb0($sp) /* f00771c: c6440000 */ lwc1 $f4,0x0($s2) /* f007720: 3c014380 */ lui $at,0x4380 @@ -1297,9 +1297,9 @@ glabel func0f006c80 /* f007e44: 0fc01b20 */ jal func0f006c80 /* f007e48: 02003825 */ or $a3,$s0,$zero /* f007e4c: 240f0001 */ addiu $t7,$zero,0x1 -/* f007e50: 3c01800a */ lui $at,0x800a +/* f007e50: 3c01800a */ lui $at,%hi(var8009cb04) /* f007e54: afa20150 */ sw $v0,0x150($sp) -/* f007e58: ac2fcb04 */ sw $t7,-0x34fc($at) +/* f007e58: ac2fcb04 */ sw $t7,%lo(var8009cb04)($at) /* f007e5c: 0fc59e59 */ jal func0f167964 /* f007e60: 24040006 */ addiu $a0,$zero,0x6 /* f007e64: c7b200b0 */ lwc1 $f18,0xb0($sp) @@ -1783,8 +1783,8 @@ glabel func0f008558 /* f0085b0: 15e9fff8 */ bne $t7,$t1,.L0f008594 /* f0085b4: adc1fffc */ sw $at,-0x4($t6) /* f0085b8: ae200000 */ sw $zero,0x0($s1) -/* f0085bc: 3c01800a */ lui $at,0x800a -/* f0085c0: ac20cb04 */ sw $zero,-0x34fc($at) +/* f0085bc: 3c01800a */ lui $at,%hi(var8009cb04) +/* f0085c0: ac20cb04 */ sw $zero,%lo(var8009cb04)($at) /* f0085c4: 0fc59e59 */ jal func0f167964 /* f0085c8: 24040006 */ addiu $a0,$zero,0x6 /* f0085cc: 3c128006 */ lui $s2,%hi(var80061644) @@ -2245,9 +2245,9 @@ glabel func0f008558 /* f008cb8: 0fc01b20 */ jal func0f006c80 /* f008cbc: afa90020 */ sw $t1,0x20($sp) /* f008cc0: 240f0001 */ addiu $t7,$zero,0x1 -/* f008cc4: 3c01800a */ lui $at,0x800a +/* f008cc4: 3c01800a */ lui $at,%hi(var8009cb04) /* f008cc8: afa200a8 */ sw $v0,0xa8($sp) -/* f008ccc: ac2fcb04 */ sw $t7,-0x34fc($at) +/* f008ccc: ac2fcb04 */ sw $t7,%lo(var8009cb04)($at) /* f008cd0: 0fc59e59 */ jal func0f167964 /* f008cd4: 24040006 */ addiu $a0,$zero,0x6 /* f008cd8: c7a4005c */ lwc1 $f4,0x5c($sp) @@ -2858,7 +2858,7 @@ glabel func0f009504 /* f0095c4: 46062202 */ mul.s $f8,$f4,$f6 /* f0095c8: 3c014180 */ lui $at,0x4180 /* f0095cc: 44819000 */ mtc1 $at,$f18 -/* f0095d0: 3c01800a */ lui $at,0x800a +/* f0095d0: 3c01800a */ lui $at,%hi(var8009cb00) /* f0095d4: 00064080 */ sll $t0,$a2,0x2 /* f0095d8: 00e81021 */ addu $v0,$a3,$t0 /* f0095dc: 460a4402 */ mul.s $f16,$f8,$f10 @@ -2873,7 +2873,7 @@ glabel func0f009504 /* f009600: 00000000 */ sll $zero,$zero,0x0 /* f009604: 2739f800 */ addiu $t9,$t9,-2048 .L0f009608: -/* f009608: a439cb00 */ sh $t9,-0x3500($at) +/* f009608: a439cb00 */ sh $t9,%lo(var8009cb00)($at) /* f00960c: 8c440000 */ lw $a0,0x0($v0) /* f009610: 0fc59e7d */ jal func0f1679f4 /* f009614: afa2002c */ sw $v0,0x2c($sp) @@ -3357,10 +3357,10 @@ glabel func0f009d10 /* f009d18: afb00018 */ sw $s0,0x18($sp) /* f009d1c: 8c82000c */ lw $v0,0xc($a0) /* f009d20: 00808025 */ or $s0,$a0,$zero -/* f009d24: 3c0e800a */ lui $t6,0x800a +/* f009d24: 3c0e800a */ lui $t6,%hi(g_Vars+0x34) /* f009d28: 0442005c */ bltzl $v0,.L0f009e9c /* f009d2c: 8fbf001c */ lw $ra,0x1c($sp) -/* f009d30: 8dce9ff4 */ lw $t6,-0x600c($t6) +/* f009d30: 8dce9ff4 */ lw $t6,%lo(g_Vars+0x34)($t6) /* f009d34: 25cf0002 */ addiu $t7,$t6,0x2 /* f009d38: 000fc083 */ sra $t8,$t7,0x2 /* f009d3c: 0058c821 */ addu $t9,$v0,$t8 @@ -3466,8 +3466,8 @@ glabel func0f009d10 GLOBAL_ASM( glabel func0f009eac -/* f009eac: 3c0e800a */ lui $t6,0x800a -/* f009eb0: 8dce9ff4 */ lw $t6,-0x600c($t6) +/* f009eac: 3c0e800a */ lui $t6,%hi(g_Vars+0x34) +/* f009eb0: 8dce9ff4 */ lw $t6,%lo(g_Vars+0x34)($t6) /* f009eb4: 27bdffc0 */ addiu $sp,$sp,-64 /* f009eb8: afbf002c */ sw $ra,0x2c($sp) /* f009ebc: afb00028 */ sw $s0,0x28($sp) @@ -3478,8 +3478,8 @@ glabel func0f009eac .L0f009ed0: /* f009ed0: 00001825 */ or $v1,$zero,$zero .L0f009ed4: -/* f009ed4: 3c0f800a */ lui $t7,0x800a -/* f009ed8: 8def9ff4 */ lw $t7,-0x600c($t7) +/* f009ed4: 3c0f800a */ lui $t7,%hi(g_Vars+0x34) +/* f009ed8: 8def9ff4 */ lw $t7,%lo(g_Vars+0x34)($t7) /* f009edc: 0003c080 */ sll $t8,$v1,0x2 /* f009ee0: 0303c021 */ addu $t8,$t8,$v1 /* f009ee4: 11e00015 */ beqz $t7,.L0f009f3c @@ -3514,8 +3514,8 @@ glabel func0f009eac /* f009f4c: 2901015e */ slti $at,$t0,0x15e /* f009f50: 10200057 */ beqz $at,.L0f00a0b0 /* f009f54: 3c048006 */ lui $a0,%hi(var800616e4) -/* f009f58: 3c0b800a */ lui $t3,0x800a -/* f009f5c: 8d6b9ff4 */ lw $t3,-0x600c($t3) +/* f009f58: 3c0b800a */ lui $t3,%hi(g_Vars+0x34) +/* f009f5c: 8d6b9ff4 */ lw $t3,%lo(g_Vars+0x34)($t3) /* f009f60: 3c048006 */ lui $a0,%hi(var800616e4) /* f009f64: 11600047 */ beqz $t3,.L0f00a084 /* f009f68: 00000000 */ sll $zero,$zero,0x0 @@ -3615,8 +3615,8 @@ glabel func0f009eac /* f00a0cc: 0c00cec9 */ jal func00033b24 /* f00a0d0: 8c8416e4 */ lw $a0,%lo(var800616e4)($a0) .L0f00a0d4: -/* f00a0d4: 3c19800a */ lui $t9,0x800a -/* f00a0d8: 8f399ff4 */ lw $t9,-0x600c($t9) +/* f00a0d4: 3c19800a */ lui $t9,%hi(g_Vars+0x34) +/* f00a0d8: 8f399ff4 */ lw $t9,%lo(g_Vars+0x34)($t9) /* f00a0dc: 3c10800a */ lui $s0,%hi(var8009cb08) /* f00a0e0: 2610cb08 */ addiu $s0,$s0,%lo(var8009cb08) /* f00a0e4: 5720001c */ bnezl $t9,.L0f00a158 @@ -3895,8 +3895,8 @@ glabel func0f00a444 GLOBAL_ASM( glabel func0f00a490 /* f00a490: 27bdff80 */ addiu $sp,$sp,-128 -/* f00a494: 3c02800a */ lui $v0,0x800a -/* f00a498: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f00a494: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f00a498: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f00a49c: afbf0034 */ sw $ra,0x34($sp) /* f00a4a0: afb30030 */ sw $s3,0x30($sp) /* f00a4a4: afb2002c */ sw $s2,0x2c($sp) @@ -4321,11 +4321,11 @@ glabel func0f00a940 /* f00aaec: c7a40108 */ lwc1 $f4,0x108($sp) .L0f00aaf0: /* f00aaf0: c7aa00b8 */ lwc1 $f10,0xb8($sp) -/* f00aaf4: 3c0d800a */ lui $t5,%hi(var8009f800) +/* f00aaf4: 3c0d800a */ lui $t5,%hi(g_Vars+0x2ac) /* f00aaf8: 460a2182 */ mul.s $f6,$f4,$f10 /* f00aafc: 12200017 */ beqz $s1,.L0f00ab5c /* f00ab00: e7a60108 */ swc1 $f6,0x108($sp) -/* f00ab04: 8dada26c */ lw $t5,-0x5d94($t5) +/* f00ab04: 8dada26c */ lw $t5,%lo(g_Vars+0x2ac)($t5) /* f00ab08: 24010006 */ addiu $at,$zero,0x6 /* f00ab0c: 3c02800a */ lui $v0,%hi(var8009de10) /* f00ab10: 15a10012 */ bne $t5,$at,.L0f00ab5c @@ -4384,8 +4384,8 @@ glabel func0f00a940 /* f00abdc: 03208825 */ or $s1,$t9,$zero /* f00abe0: 00517821 */ addu $t7,$v0,$s1 /* f00abe4: 000f7080 */ sll $t6,$t7,0x2 -/* f00abe8: 3c03800a */ lui $v1,0x800a -/* f00abec: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f00abe8: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f00abec: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f00abf0: 01cf7021 */ addu $t6,$t6,$t7 /* f00abf4: 000e7040 */ sll $t6,$t6,0x1 /* f00abf8: a7ae0098 */ sh $t6,0x98($sp) @@ -4501,7 +4501,7 @@ glabel func0f00a940 /* f00ada8: 304d07ff */ andi $t5,$v0,0x7ff /* f00adac: 11a00002 */ beqz $t5,.L0f00adb8 /* f00adb0: 00000000 */ sll $zero,$zero,0x0 -/* f00adb4: 25adf800 */ addiu $t5,$t5,%lo(var8009f800) +/* f00adb4: 25adf800 */ addiu $t5,$t5,-2048 .L0f00adb8: /* f00adb8: 4600218d */ trunc.w.s $f6,$f4 /* f00adbc: 46125102 */ mul.s $f4,$f10,$f18 diff --git a/src/game/game_00b210.c b/src/game/game_00b210.c index f7a93bbb2..43a468db5 100644 --- a/src/game/game_00b210.c +++ b/src/game/game_00b210.c @@ -19,7 +19,7 @@ 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,%hi(var80090018) +/* f00b228: 3c128009 */ lui $s2,0x8009 /* f00b22c: afbf0024 */ sw $ra,0x24($sp) /* f00b230: 265284c1 */ addiu $s2,$s2,-31551 /* f00b234: 261084b8 */ addiu $s0,$s0,%lo(g_MpChallenges) @@ -68,7 +68,7 @@ glabel func0f00b210 /* f00b2d8: 26310001 */ addiu $s1,$s1,0x1 /* f00b2dc: 26100018 */ addiu $s0,$s0,0x18 /* f00b2e0: 0fc636df */ jal mpGetNumPresets -/* f00b2e4: 26520018 */ addiu $s2,$s2,%lo(var80090018) +/* f00b2e4: 26520018 */ addiu $s2,$s2,24 /* f00b2e8: 0222082a */ slt $at,$s1,$v0 /* f00b2ec: 5420fff2 */ bnezl $at,.L0f00b2b8 /* f00b2f0: 8e040004 */ lw $a0,0x4($s0) diff --git a/src/game/game_00b320.c b/src/game/game_00b320.c index c7715bb63..844a8d122 100644 --- a/src/game/game_00b320.c +++ b/src/game/game_00b320.c @@ -91,19 +91,19 @@ glabel func0f00b420 /* f00b430: 24040080 */ addiu $a0,$zero,0x80 /* f00b434: 0c0048f2 */ jal malloc /* f00b438: 24050004 */ addiu $a1,$zero,0x4 -/* f00b43c: 3c01800a */ lui $at,0x800a -/* f00b440: ac22cc80 */ sw $v0,-0x3380($at) +/* f00b43c: 3c01800a */ lui $at,%hi(var8009cc80) +/* f00b440: ac22cc80 */ sw $v0,%lo(var8009cc80)($at) /* f00b444: 24040080 */ addiu $a0,$zero,0x80 /* f00b448: 0c0048f2 */ jal malloc /* f00b44c: 24050004 */ addiu $a1,$zero,0x4 -/* f00b450: 3c01800a */ lui $at,0x800a -/* f00b454: ac22cc84 */ sw $v0,-0x337c($at) +/* f00b450: 3c01800a */ lui $at,%hi(var8009cc84) +/* f00b454: ac22cc84 */ sw $v0,%lo(var8009cc84)($at) /* f00b458: 24040080 */ addiu $a0,$zero,0x80 /* f00b45c: 0c0048f2 */ jal malloc /* f00b460: 24050004 */ addiu $a1,$zero,0x4 /* f00b464: 8fbf0014 */ lw $ra,0x14($sp) -/* f00b468: 3c01800a */ lui $at,0x800a -/* f00b46c: ac22cc88 */ sw $v0,-0x3378($at) +/* f00b468: 3c01800a */ lui $at,%hi(var8009cc88) +/* f00b46c: ac22cc88 */ sw $v0,%lo(var8009cc88)($at) /* f00b470: 03e00008 */ jr $ra /* f00b474: 27bd0018 */ addiu $sp,$sp,0x18 /* f00b478: 00000000 */ sll $zero,$zero,0x0 diff --git a/src/game/game_00b480.c b/src/game/game_00b480.c index b0dc5bdbb..13685f280 100644 --- a/src/game/game_00b480.c +++ b/src/game/game_00b480.c @@ -44,9 +44,9 @@ glabel func0f00b480 /* f00b4e8: 34847800 */ ori $a0,$a0,0x7800 /* f00b4ec: 0c0048f2 */ jal malloc /* f00b4f0: 24050004 */ addiu $a1,$zero,0x4 -/* f00b4f4: 3c01800a */ lui $at,0x800a +/* f00b4f4: 3c01800a */ lui $at,%hi(var8009cca0) /* f00b4f8: 0fc02d08 */ jal func0f00b420 -/* f00b4fc: ac22cca0 */ sw $v0,-0x3360($at) +/* f00b4fc: ac22cca0 */ sw $v0,%lo(var8009cca0)($at) /* f00b500: 8fbf0014 */ lw $ra,0x14($sp) /* f00b504: 27bd0018 */ addiu $sp,$sp,0x18 /* f00b508: 03e00008 */ jr $ra @@ -96,12 +96,12 @@ glabel func0f00b510 /* f00b5a4: af000000 */ sw $zero,0x0($t8) /* f00b5a8: 3c018006 */ lui $at,0x8006 /* f00b5ac: ac202a90 */ sw $zero,0x2a90($at) -/* f00b5b0: 3c01800a */ lui $at,0x800a -/* f00b5b4: ac20cd10 */ sw $zero,-0x32f0($at) -/* f00b5b8: 3c01800a */ lui $at,0x800a -/* f00b5bc: ac20cd14 */ sw $zero,-0x32ec($at) -/* f00b5c0: 3c01800a */ lui $at,0x800a -/* f00b5c4: ac20cd18 */ sw $zero,-0x32e8($at) +/* f00b5b0: 3c01800a */ lui $at,%hi(g_NumChrsC) +/* f00b5b4: ac20cd10 */ sw $zero,%lo(g_NumChrsC)($at) +/* f00b5b8: 3c01800a */ lui $at,%hi(g_ChrnumsC) +/* f00b5bc: ac20cd14 */ sw $zero,%lo(g_ChrnumsC)($at) +/* f00b5c0: 3c01800a */ lui $at,%hi(g_ChrIndexesC) +/* f00b5c4: ac20cd18 */ sw $zero,%lo(g_ChrIndexesC)($at) /* f00b5c8: 24041470 */ addiu $a0,$zero,0x1470 /* f00b5cc: 0c0048f2 */ jal malloc /* f00b5d0: 24050004 */ addiu $a1,$zero,0x4 @@ -216,9 +216,9 @@ glabel func0f00b62c .L0f00b754: /* f00b754: 00062040 */ sll $a0,$a2,0x1 /* f00b758: 2484000f */ addiu $a0,$a0,0xf -/* f00b75c: 3c01800a */ lui $at,0x800a +/* f00b75c: 3c01800a */ lui $at,%hi(g_NumChrsC) /* f00b760: 348f000f */ ori $t7,$a0,0xf -/* f00b764: ac20cd10 */ sw $zero,-0x32f0($at) +/* f00b764: ac20cd10 */ sw $zero,%lo(g_NumChrsC)($at) /* f00b768: 39e4000f */ xori $a0,$t7,0xf /* f00b76c: 24050004 */ addiu $a1,$zero,0x4 /* f00b770: 0c0048f2 */ jal malloc diff --git a/src/game/game_00b820.c b/src/game/game_00b820.c index 4d2710954..5dfcae3bc 100644 --- a/src/game/game_00b820.c +++ b/src/game/game_00b820.c @@ -607,8 +607,8 @@ glabel func0f00bbc8 /* f00c074: 03e00008 */ jr $ra /* f00c078: 00000000 */ sll $zero,$zero,0x0 /* f00c07c: 27bdffc8 */ addiu $sp,$sp,-56 -/* f00c080: 3c0e800a */ lui $t6,0x800a -/* f00c084: 8dced048 */ lw $t6,-0x2fb8($t6) +/* f00c080: 3c0e800a */ lui $t6,%hi(g_StageSetup+0x18) +/* f00c084: 8dced048 */ lw $t6,%lo(g_StageSetup+0x18)($t6) /* f00c088: afbf0034 */ sw $ra,0x34($sp) /* f00c08c: afb70030 */ sw $s7,0x30($sp) /* f00c090: afb6002c */ sw $s6,0x2c($sp) @@ -630,10 +630,10 @@ glabel func0f00bbc8 .L0f00c0d0: /* f00c0d0: 92030000 */ lbu $v1,0x0($s0) .L0f00c0d4: -/* f00c0d4: 3c0f800a */ lui $t7,0x800a +/* f00c0d4: 3c0f800a */ lui $t7,%hi(g_StageSetup+0x18) /* f00c0d8: 16230004 */ bne $s1,$v1,.L0f00c0ec /* f00c0dc: 00000000 */ sll $zero,$zero,0x0 -/* f00c0e0: 8defd048 */ lw $t7,-0x2fb8($t7) +/* f00c0e0: 8defd048 */ lw $t7,%lo(g_StageSetup+0x18)($t7) /* f00c0e4: 10000042 */ beqz $zero,.L0f00c1f0 /* f00c0e8: 01f71021 */ addu $v0,$t7,$s7 .L0f00c0ec: diff --git a/src/game/game_00c240.c b/src/game/game_00c240.c index c0465f788..e2ad6f190 100644 --- a/src/game/game_00c240.c +++ b/src/game/game_00c240.c @@ -79,13 +79,13 @@ glabel func0f00c240 /* f00c330: 240a0007 */ addiu $t2,$zero,0x7 /* f00c334: a20a0358 */ sb $t2,0x358($s0) .L0f00c338: -/* f00c338: 3c04800a */ lui $a0,0x800a +/* f00c338: 3c04800a */ lui $a0,%hi(g_Vars+0xc4) /* f00c33c: a2000359 */ sb $zero,0x359($s0) /* f00c340: a200035a */ sb $zero,0x35a($s0) /* f00c344: a200035b */ sb $zero,0x35b($s0) /* f00c348: a60b035c */ sh $t3,0x35c($s0) /* f00c34c: a60c035e */ sh $t4,0x35e($s0) -/* f00c350: 2484a084 */ addiu $a0,$a0,-24444 +/* f00c350: 2484a084 */ addiu $a0,$a0,%lo(g_Vars+0xc4) /* f00c354: 24429fc0 */ addiu $v0,$v0,%lo(g_Vars) /* f00c358: 24030002 */ addiu $v1,$zero,0x2 .L0f00c35c: diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c index 1b6d7d520..23897ccb9 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -78,34 +78,34 @@ glabel func0f00c490 /* f00c4ec: acef0000 */ sw $t7,0x0($a3) /* f00c4f0: ad030000 */ sw $v1,0x0($t0) /* f00c4f4: ad380000 */ sw $t8,0x0($t1) -/* f00c4f8: 3c028009 */ lui $v0,%hi(var80090068) -/* f00c4fc: 90420af0 */ lbu $v0,0xaf0($v0) +/* f00c4f8: 3c028009 */ lui $v0,%hi(g_Is4Mb) +/* f00c4fc: 90420af0 */ lbu $v0,%lo(g_Is4Mb)($v0) /* f00c500: 24040001 */ addiu $a0,$zero,0x1 -/* f00c504: 3c0a800a */ lui $t2,%hi(var8009ce50) +/* f00c504: 3c0a800a */ lui $t2,0x800a /* f00c508: 14820005 */ bne $a0,$v0,.L0f00c520 -/* f00c50c: 3c0f800a */ lui $t7,0x800a +/* f00c50c: 3c0f800a */ lui $t7,%hi(g_Vars+0x4b4) /* f00c510: 3c0a800a */ lui $t2,%hi(var8009ce50) /* f00c514: 254ace50 */ addiu $t2,$t2,%lo(var8009ce50) /* f00c518: 10000004 */ beqz $zero,.L0f00c52c /* f00c51c: ad430000 */ sw $v1,0x0($t2) .L0f00c520: -/* f00c520: 254ace50 */ addiu $t2,$t2,%lo(var8009ce50) +/* f00c520: 254ace50 */ addiu $t2,$t2,-12720 /* f00c524: 24190064 */ addiu $t9,$zero,0x64 /* f00c528: ad590000 */ sw $t9,0x0($t2) .L0f00c52c: /* f00c52c: 14820006 */ bne $a0,$v0,.L0f00c548 -/* f00c530: 3c0b800a */ lui $t3,%hi(var8009ce54) +/* f00c530: 3c0b800a */ lui $t3,0x800a /* f00c534: 3c0b800a */ lui $t3,%hi(var8009ce54) /* f00c538: 256bce54 */ addiu $t3,$t3,%lo(var8009ce54) /* f00c53c: 240d0028 */ addiu $t5,$zero,0x28 /* f00c540: 10000004 */ beqz $zero,.L0f00c554 /* f00c544: ad6d0000 */ sw $t5,0x0($t3) .L0f00c548: -/* f00c548: 256bce54 */ addiu $t3,$t3,%lo(var8009ce54) +/* f00c548: 256bce54 */ addiu $t3,$t3,-12716 /* f00c54c: 240e0050 */ addiu $t6,$zero,0x50 /* f00c550: ad6e0000 */ sw $t6,0x0($t3) .L0f00c554: -/* f00c554: 8defa474 */ lw $t7,-0x5b8c($t7) +/* f00c554: 8defa474 */ lw $t7,%lo(g_Vars+0x4b4)($t7) /* f00c558: 29e1005a */ slti $at,$t7,0x5a /* f00c55c: 14200007 */ bnez $at,.L0f00c57c /* f00c560: 00000000 */ sll $zero,$zero,0x0 @@ -210,7 +210,7 @@ glabel func0f00c490 /* f00c6e0: 01c27821 */ addu $t7,$t6,$v0 /* f00c6e4: ade00014 */ sw $zero,0x14($t7) /* f00c6e8: 8cd80000 */ lw $t8,0x0($a2) -/* f00c6ec: 24420068 */ addiu $v0,$v0,%lo(var80090068) +/* f00c6ec: 24420068 */ addiu $v0,$v0,104 /* f00c6f0: 0078082a */ slt $at,$v1,$t8 /* f00c6f4: 5420fff9 */ bnezl $at,.L0f00c6dc /* f00c6f8: 8c8e0000 */ lw $t6,0x0($a0) @@ -754,8 +754,8 @@ GLOBAL_ASM( glabel setupCountCommandType /* f00ce60: 27bdffd8 */ addiu $sp,$sp,-40 /* f00ce64: afb00014 */ sw $s0,0x14($sp) -/* f00ce68: 3c10800a */ lui $s0,0x800a -/* f00ce6c: 8e10d040 */ lw $s0,-0x2fc0($s0) +/* f00ce68: 3c10800a */ lui $s0,%hi(g_StageSetup+0x10) +/* f00ce6c: 8e10d040 */ lw $s0,%lo(g_StageSetup+0x10)($s0) /* f00ce70: afb10018 */ sw $s1,0x18($sp) /* f00ce74: afbf0024 */ sw $ra,0x24($sp) /* f00ce78: afb30020 */ sw $s3,0x20($sp) @@ -1526,12 +1526,12 @@ glabel var7f1a8044 /* f00d7d8: 24030001 */ addiu $v1,$zero,0x1 /* f00d7dc: 240dffff */ addiu $t5,$zero,-1 /* f00d7e0: 15600004 */ bnez $t3,.L0f00d7f4 -/* f00d7e4: 3c01800a */ lui $at,0x800a +/* f00d7e4: 3c01800a */ lui $at,%hi(var8009cc30) /* f00d7e8: 8c4c031c */ lw $t4,0x31c($v0) /* f00d7ec: 51800038 */ beqzl $t4,.L0f00d8d0 /* f00d7f0: 90c5005c */ lbu $a1,0x5c($a2) .L0f00d7f4: -/* f00d7f4: ac2dcc30 */ sw $t5,-0x33d0($at) +/* f00d7f4: ac2dcc30 */ sw $t5,%lo(var8009cc30)($at) /* f00d7f8: 90c5005c */ lbu $a1,0x5c($a2) /* f00d7fc: 24aeff10 */ addiu $t6,$a1,-240 /* f00d800: 2dc10010 */ sltiu $at,$t6,0x10 @@ -1547,9 +1547,9 @@ glabel var7f1a8044 /* f00d828: 0fc62389 */ jal func0f188e24 /* f00d82c: afa60030 */ sw $a2,0x30($sp) /* f00d830: 8fa40018 */ lw $a0,0x18($sp) -/* f00d834: 3c01800a */ lui $at,0x800a +/* f00d834: 3c01800a */ lui $at,%hi(var8009cc30) /* f00d838: 8fa60030 */ lw $a2,0x30($sp) -/* f00d83c: ac24cc30 */ sw $a0,-0x33d0($at) +/* f00d83c: ac24cc30 */ sw $a0,%lo(var8009cc30)($at) /* f00d840: 904f0000 */ lbu $t7,0x0($v0) /* f00d844: 2401005b */ addiu $at,$zero,0x5b /* f00d848: 240a00f4 */ addiu $t2,$zero,0xf4 @@ -2936,8 +2936,8 @@ glabel func0f00eb64 /* f00ebc0: 28c1005a */ slti $at,$a2,0x5a /* f00ebc4: 1020014f */ beqz $at,.L0f00f104 /* f00ebc8: 3c07800a */ lui $a3,%hi(g_StageSetup) -/* f00ebcc: 3c0f800a */ lui $t7,0x800a -/* f00ebd0: 8defa2d8 */ lw $t7,-0x5d28($t7) +/* 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 /* f00ebdc: 11e0000a */ beqz $t7,.L0f00ec08 @@ -3179,8 +3179,8 @@ glabel func0f00eb64 /* f00ef3c: 00401825 */ or $v1,$v0,$zero /* f00ef40: 24040008 */ addiu $a0,$zero,0x8 /* f00ef44: 15a00009 */ bnez $t5,.L0f00ef6c -/* f00ef48: 3c0c800a */ lui $t4,0x800a -/* f00ef4c: 818edfeb */ lb $t6,-0x2015($t4) +/* f00ef48: 3c0c800a */ lui $t4,%hi(g_MissionConfig+0x3) +/* f00ef4c: 818edfeb */ lb $t6,%lo(g_MissionConfig+0x3)($t4) /* f00ef50: 05c10006 */ bgez $t6,.L0f00ef6c /* f00ef54: 00000000 */ sll $zero,$zero,0x0 /* f00ef58: 8ca20474 */ lw $v0,0x474($a1) @@ -3278,8 +3278,8 @@ glabel func0f00eb64 /* f00f0c4: 02028021 */ addu $s0,$s0,$v0 /* f00f0c8: 0fc03398 */ jal setupCountCommandType /* f00f0cc: 2404003b */ addiu $a0,$zero,0x3b -/* f00f0d0: 3c0f800a */ lui $t7,0x800a -/* f00f0d4: 8defa2d8 */ lw $t7,-0x5d28($t7) +/* f00f0d0: 3c0f800a */ lui $t7,%hi(g_Vars+0x318) +/* f00f0d4: 8defa2d8 */ lw $t7,%lo(g_Vars+0x318)($t7) /* f00f0d8: 02028021 */ addu $s0,$s0,$v0 /* f00f0dc: 51e00005 */ beqzl $t7,.L0f00f0f4 /* f00f0e0: 02002025 */ or $a0,$s0,$zero @@ -3319,9 +3319,9 @@ glabel func0f00eb64 /* f00f154: 8fbf001c */ lw $ra,0x1c($sp) /* f00f158: 03235021 */ addu $t2,$t9,$v1 /* f00f15c: 254b0028 */ addiu $t3,$t2,0x28 -/* f00f160: 3c01800a */ lui $at,0x800a +/* f00f160: 3c01800a */ lui $at,%hi(g_Vars+0x334) /* f00f164: 8fb00018 */ lw $s0,0x18($sp) -/* f00f168: ac2ba2f4 */ sw $t3,-0x5d0c($at) +/* f00f168: ac2ba2f4 */ sw $t3,%lo(g_Vars+0x334)($at) /* f00f16c: 03e00008 */ jr $ra /* f00f170: 27bd0060 */ addiu $sp,$sp,0x60 ); @@ -3604,26 +3604,26 @@ glabel var7f1a8224 /* f00f228: 5460000e */ bnezl $v1,.L0f00f264 /* f00f22c: afa3023c */ sw $v1,0x23c($sp) .L0f00f230: -/* f00f230: 3c03800a */ lui $v1,0x800a -/* f00f234: 8c63a258 */ lw $v1,-0x5da8($v1) +/* f00f230: 3c03800a */ lui $v1,%hi(g_Vars+0x298) +/* f00f234: 8c63a258 */ lw $v1,%lo(g_Vars+0x298)($v1) /* f00f238: 286e0000 */ slti $t6,$v1,0x0 /* f00f23c: 39ce0001 */ xori $t6,$t6,0x1 /* f00f240: 2dc30001 */ sltiu $v1,$t6,0x1 /* f00f244: 50600007 */ beqzl $v1,.L0f00f264 /* f00f248: afa3023c */ sw $v1,0x23c($sp) -/* f00f24c: 3c03800a */ lui $v1,0x800a -/* f00f250: 8c63a25c */ lw $v1,-0x5da4($v1) +/* f00f24c: 3c03800a */ lui $v1,%hi(g_Vars+0x29c) +/* f00f250: 8c63a25c */ lw $v1,%lo(g_Vars+0x29c)($v1) /* f00f254: 286f0000 */ slti $t7,$v1,0x0 /* f00f258: 39ef0001 */ xori $t7,$t7,0x1 /* f00f25c: 2de30001 */ sltiu $v1,$t7,0x1 /* f00f260: afa3023c */ sw $v1,0x23c($sp) .L0f00f264: -/* f00f264: 3c01800a */ lui $at,0x800a +/* f00f264: 3c01800a */ lui $at,%hi(g_Vars+0x2b8) /* f00f268: 3c03800a */ lui $v1,%hi(var8009dfd4) /* f00f26c: 3c02800a */ lui $v0,%hi(var8009dfc8) /* f00f270: afa00238 */ sw $zero,0x238($sp) /* f00f274: afa00234 */ sw $zero,0x234($sp) -/* f00f278: ac20a278 */ sw $zero,-0x5d88($at) +/* f00f278: ac20a278 */ sw $zero,%lo(g_Vars+0x2b8)($at) /* f00f27c: 2442dfc8 */ addiu $v0,$v0,%lo(var8009dfc8) /* f00f280: 2463dfd4 */ addiu $v1,$v1,%lo(var8009dfd4) .L0f00f284: @@ -3631,12 +3631,12 @@ glabel var7f1a8224 /* f00f288: a4400000 */ sh $zero,0x0($v0) /* f00f28c: 1443fffd */ bne $v0,$v1,.L0f00f284 /* f00f290: a440000c */ sh $zero,0xc($v0) -/* f00f294: 3c01800a */ lui $at,0x800a -/* f00f298: a438dfc8 */ sh $t8,-0x2038($at) +/* f00f294: 3c01800a */ lui $at,%hi(var8009dfc8) +/* f00f298: a438dfc8 */ sh $t8,%lo(var8009dfc8)($at) /* f00f29c: 28a1005a */ slti $at,$a1,0x5a /* f00f2a0: 10200576 */ beqz $at,.L0f01087c -/* f00f2a4: 3c19800a */ lui $t9,0x800a -/* f00f2a8: 8f39d04c */ lw $t9,-0x2fb4($t9) +/* f00f2a4: 3c19800a */ lui $t9,%hi(g_StageSetup+0x1c) +/* f00f2a8: 8f39d04c */ lw $t9,%lo(g_StageSetup+0x1c)($t9) /* f00f2ac: 13200003 */ beqz $t9,.L0f00f2bc /* f00f2b0: 00000000 */ sll $zero,$zero,0x0 /* f00f2b4: 0fc04aa8 */ jal func0f012aa0 @@ -3653,10 +3653,10 @@ glabel var7f1a8224 /* f00f2dc: 24639fc0 */ addiu $v1,$v1,%lo(g_Vars) /* f00f2e0: 8c6c0318 */ lw $t4,0x318($v1) /* f00f2e4: 00402025 */ or $a0,$v0,$zero -/* f00f2e8: 3c0d800a */ lui $t5,0x800a +/* f00f2e8: 3c0d800a */ lui $t5,%hi(g_MissionConfig+0x3) /* f00f2ec: 15800008 */ bnez $t4,.L0f00f310 /* f00f2f0: 00000000 */ sll $zero,$zero,0x0 -/* f00f2f4: 81aedfeb */ lb $t6,-0x2015($t5) +/* f00f2f4: 81aedfeb */ lb $t6,%lo(g_MissionConfig+0x3)($t5) /* f00f2f8: 05c10005 */ bgez $t6,.L0f00f310 /* f00f2fc: 00000000 */ sll $zero,$zero,0x0 /* f00f300: 8c620474 */ lw $v0,0x474($v1) @@ -3751,8 +3751,8 @@ glabel var7f1a8224 /* f00f434: 1420ffdb */ bnez $at,.L0f00f3a4 /* f00f438: 00000000 */ sll $zero,$zero,0x0 .L0f00f43c: -/* f00f43c: 3c0f800a */ lui $t7,0x800a -/* f00f440: 8defd040 */ lw $t7,-0x2fc0($t7) +/* f00f43c: 3c0f800a */ lui $t7,%hi(g_StageSetup+0x10) +/* f00f440: 8defd040 */ lw $t7,%lo(g_StageSetup+0x10)($t7) /* f00f444: 11e0050f */ beqz $t7,.L0f010884 /* f00f448: 00000000 */ sll $zero,$zero,0x0 /* f00f44c: 0fc5b367 */ jal getDifficulty @@ -3864,8 +3864,8 @@ glabel var7f1a8224 .L0f00f5b4: /* f00f5b4: 0fc05208 */ jal func0f014820 /* f00f5b8: 00000000 */ sll $zero,$zero,0x0 -/* f00f5bc: 3c12800a */ lui $s2,0x800a -/* f00f5c0: 8e52d040 */ lw $s2,-0x2fc0($s2) +/* f00f5bc: 3c12800a */ lui $s2,%hi(g_StageSetup+0x10) +/* f00f5c0: 8e52d040 */ lw $s2,%lo(g_StageSetup+0x10)($s2) /* f00f5c4: 24010034 */ addiu $at,$zero,0x34 /* f00f5c8: 00009825 */ or $s3,$zero,$zero /* f00f5cc: 92430003 */ lbu $v1,0x3($s2) @@ -4325,8 +4325,8 @@ glabel var7f1a8224 /* f00fcb0: 02602825 */ or $a1,$s3,$zero /* f00fcb4: 10000176 */ beqz $zero,.L0f010290 /* f00fcb8: 00000000 */ sll $zero,$zero,0x0 -/* f00fcbc: 3c19800a */ lui $t9,0x800a -/* f00fcc0: 8f39a2d8 */ lw $t9,-0x5d28($t9) +/* f00fcbc: 3c19800a */ lui $t9,%hi(g_Vars+0x318) +/* f00fcc0: 8f39a2d8 */ lw $t9,%lo(g_Vars+0x318)($t9) /* f00fcc4: 24050001 */ addiu $a1,$zero,0x1 /* f00fcc8: 3c04800a */ lui $a0,%hi(var8009cc30) /* f00fccc: 13200017 */ beqz $t9,.L0f00fd2c @@ -4630,9 +4630,9 @@ glabel var7f1a8224 /* f010148: 16180051 */ bne $s0,$t8,.L0f010290 /* f01014c: 00000000 */ sll $zero,$zero,0x0 /* f010150: 8e4b0008 */ lw $t3,0x8($s2) -/* f010154: 3c01800a */ lui $at,0x800a +/* f010154: 3c01800a */ lui $at,%hi(var8009dfc8) /* f010158: 1000004d */ beqz $zero,.L0f010290 -/* f01015c: a42bdfc8 */ sh $t3,-0x2038($at) +/* f01015c: a42bdfc8 */ sh $t3,%lo(var8009dfc8)($at) /* f010160: 8e4d0004 */ lw $t5,0x4($s2) /* f010164: 3c0142c8 */ lui $at,0x42c8 /* f010168: 44810000 */ mtc1 $at,$f0 @@ -4668,16 +4668,16 @@ glabel var7f1a8224 /* f0101e0: 1020002b */ beqz $at,.L0f010290 /* f0101e4: 00025840 */ sll $t3,$v0,0x1 /* f0101e8: 8e580008 */ lw $t8,0x8($s2) -/* f0101ec: 3c01800a */ lui $at,0x800a +/* f0101ec: 3c01800a */ lui $at,%hi(var8009dfc8+0x2) /* f0101f0: 002b0821 */ addu $at,$at,$t3 -/* f0101f4: a438dfca */ sh $t8,-0x2036($at) +/* f0101f4: a438dfca */ sh $t8,%lo(var8009dfc8+0x2)($at) /* f0101f8: 8e4c0004 */ lw $t4,0x4($s2) /* f0101fc: 824d000f */ lb $t5,0xf($s2) -/* f010200: 3c01800a */ lui $at,0x800a +/* f010200: 3c01800a */ lui $at,%hi(var8009dfd4+0x2) /* f010204: 000c7040 */ sll $t6,$t4,0x1 /* f010208: 002e0821 */ addu $at,$at,$t6 /* f01020c: 10000020 */ beqz $zero,.L0f010290 -/* f010210: a42ddfd6 */ sh $t5,-0x202a($at) +/* f010210: a42ddfd6 */ sh $t5,%lo(var8009dfd4+0x2)($at) /* f010214: 0fc042b5 */ jal func0f010ad4 /* f010218: 02402025 */ or $a0,$s2,$zero /* f01021c: 1000001c */ beqz $zero,.L0f010290 @@ -4722,8 +4722,8 @@ glabel var7f1a8224 /* f0102b0: 2478ffff */ addiu $t8,$v1,-1 /* f0102b4: 00009825 */ or $s3,$zero,$zero .L0f0102b8: -/* f0102b8: 3c0c800a */ lui $t4,0x800a -/* f0102bc: 8d8ca2d8 */ lw $t4,-0x5d28($t4) +/* f0102b8: 3c0c800a */ lui $t4,%hi(g_Vars+0x318) +/* f0102bc: 8d8ca2d8 */ lw $t4,%lo(g_Vars+0x318)($t4) /* f0102c0: 1180004f */ beqz $t4,.L0f010400 /* f0102c4: 00000000 */ sll $zero,$zero,0x0 /* f0102c8: 0fc63319 */ jal func0f18cc64 @@ -4815,15 +4815,15 @@ glabel var7f1a8224 /* f0103f8: 14d2ffc8 */ bne $a2,$s2,.L0f01031c /* f0103fc: af380000 */ sw $t8,0x0($t9) .L0f010400: -/* f010400: 3c0f800a */ lui $t7,0x800a -/* f010404: 8defa2d8 */ lw $t7,-0x5d28($t7) +/* f010400: 3c0f800a */ lui $t7,%hi(g_Vars+0x318) +/* f010404: 8defa2d8 */ lw $t7,%lo(g_Vars+0x318)($t7) /* f010408: 11e00003 */ beqz $t7,.L0f010418 /* f01040c: 00000000 */ sll $zero,$zero,0x0 /* f010410: 0fc61548 */ jal scenarioReset /* f010414: 00000000 */ sll $zero,$zero,0x0 .L0f010418: -/* f010418: 3c12800a */ lui $s2,0x800a -/* f01041c: 8e52d040 */ lw $s2,-0x2fc0($s2) +/* f010418: 3c12800a */ lui $s2,%hi(g_StageSetup+0x10) +/* f01041c: 8e52d040 */ lw $s2,%lo(g_StageSetup+0x10)($s2) /* f010420: 24010034 */ addiu $at,$zero,0x34 /* f010424: 2417002b */ addiu $s7,$zero,0x2b /* f010428: 92430003 */ lbu $v1,0x3($s2) diff --git a/src/game/game_0109d0.c b/src/game/game_0109d0.c index 96e370610..2e36cd691 100644 --- a/src/game/game_0109d0.c +++ b/src/game/game_0109d0.c @@ -41,17 +41,17 @@ glabel func0f0109d0 /* f010a28: 24420004 */ addiu $v0,$v0,0x4 /* f010a2c: 1443fffe */ bne $v0,$v1,.L0f010a28 /* f010a30: ac40fffc */ sw $zero,-0x4($v0) -/* f010a34: 3c01800a */ lui $at,0x800a -/* f010a38: ac20d0b0 */ sw $zero,-0x2f50($at) -/* f010a3c: 3c01800a */ lui $at,0x800a -/* f010a40: ac20d0b4 */ sw $zero,-0x2f4c($at) -/* f010a44: 3c01800a */ lui $at,0x800a -/* f010a48: ac20d0b8 */ sw $zero,-0x2f48($at) +/* f010a34: 3c01800a */ lui $at,%hi(var8009d0b0) +/* f010a38: ac20d0b0 */ sw $zero,%lo(var8009d0b0)($at) +/* f010a3c: 3c01800a */ lui $at,%hi(var8009d0b4) +/* f010a40: ac20d0b4 */ sw $zero,%lo(var8009d0b4)($at) +/* f010a44: 3c01800a */ lui $at,%hi(g_RoomEnteredCriterias) +/* f010a48: ac20d0b8 */ sw $zero,%lo(g_RoomEnteredCriterias)($at) /* f010a4c: 8fbf0014 */ lw $ra,0x14($sp) -/* f010a50: 3c01800a */ lui $at,0x800a -/* f010a54: ac20d0bc */ sw $zero,-0x2f44($at) -/* f010a58: 3c01800a */ lui $at,0x800a -/* f010a5c: ac20d0c0 */ sw $zero,-0x2f40($at) +/* f010a50: 3c01800a */ lui $at,%hi(g_MultiroomEnteredCriterias) +/* f010a54: ac20d0bc */ sw $zero,%lo(g_MultiroomEnteredCriterias)($at) +/* f010a58: 3c01800a */ lui $at,%hi(g_HolographCriterias) +/* f010a5c: ac20d0c0 */ sw $zero,%lo(g_HolographCriterias)($at) /* f010a60: 03e00008 */ jr $ra /* f010a64: 27bd0018 */ addiu $sp,$sp,0x18 ); @@ -79,11 +79,11 @@ glabel func0f010a80 GLOBAL_ASM( glabel func0f010a98 /* f010a98: 8c8e0004 */ lw $t6,0x4($a0) -/* f010a9c: 3c01800a */ lui $at,0x800a +/* f010a9c: 3c01800a */ lui $at,%hi(g_Objectives) /* f010aa0: 3c038007 */ lui $v1,%hi(var8006ae70) /* f010aa4: 000e7880 */ sll $t7,$t6,0x2 /* f010aa8: 002f0821 */ addu $at,$at,$t7 -/* f010aac: ac24d060 */ sw $a0,-0x2fa0($at) +/* f010aac: ac24d060 */ sw $a0,%lo(g_Objectives)($at) /* f010ab0: 2463ae70 */ addiu $v1,$v1,%lo(var8006ae70) /* f010ab4: 8c780000 */ lw $t8,0x0($v1) /* f010ab8: 8c820004 */ lw $v0,0x4($a0) diff --git a/src/game/game_010b20.c b/src/game/game_010b20.c index 217cc2135..7c1e17811 100644 --- a/src/game/game_010b20.c +++ b/src/game/game_010b20.c @@ -23,10 +23,10 @@ glabel func0f010b20 /* f010b24: 2484d0d0 */ addiu $a0,$a0,%lo(var8009d0d0) /* f010b28: ac800000 */ sw $zero,0x0($a0) /* f010b2c: ac800004 */ sw $zero,0x4($a0) -/* f010b30: 3c01800a */ lui $at,0x800a +/* f010b30: 3c01800a */ lui $at,%hi(var8009d0d8) /* f010b34: 3c03800a */ lui $v1,%hi(var8009d0e0) /* f010b38: 3c02800a */ lui $v0,%hi(var8009d0f0) -/* f010b3c: ac20d0d8 */ sw $zero,-0x2f28($at) +/* f010b3c: ac20d0d8 */ sw $zero,%lo(var8009d0d8)($at) /* f010b40: 2442d0f0 */ addiu $v0,$v0,%lo(var8009d0f0) /* f010b44: 2463d0e0 */ addiu $v1,$v1,%lo(var8009d0e0) .L0f010b48: diff --git a/src/game/game_011110.c b/src/game/game_011110.c index a459543cb..48e33f3f9 100644 --- a/src/game/game_011110.c +++ b/src/game/game_011110.c @@ -40,12 +40,12 @@ void func0f011124(bool value) GLOBAL_ASM( glabel func0f011130 -/* f011130: 3c01800a */ lui $at,0x800a -/* f011134: ac24dd08 */ sw $a0,-0x22f8($at) +/* f011130: 3c01800a */ lui $at,%hi(var8009dd08) +/* f011134: ac24dd08 */ sw $a0,%lo(var8009dd08)($at) /* f011138: 3c0a8009 */ lui $t2,%hi(g_Is4Mb) -/* f01113c: 3c01800a */ lui $at,0x800a +/* f01113c: 3c01800a */ lui $at,%hi(var8009dd0c) /* f011140: 254a0af0 */ addiu $t2,$t2,%lo(g_Is4Mb) -/* f011144: ac25dd0c */ sw $a1,-0x22f4($at) +/* f011144: ac25dd0c */ sw $a1,%lo(var8009dd0c)($at) /* f011148: 91480000 */ lbu $t0,0x0($t2) /* f01114c: 27bdffc0 */ addiu $sp,$sp,-64 /* f011150: 24090001 */ addiu $t1,$zero,0x1 @@ -164,9 +164,9 @@ glabel func0f011130 .L0f0112dc: /* f0112dc: 10c00009 */ beqz $a2,.L0f011304 /* f0112e0: 3c05800a */ lui $a1,%hi(var8009dd00) -/* f0112e4: 3c01800a */ lui $at,0x800a +/* f0112e4: 3c01800a */ lui $at,%hi(var8009dd10) /* f0112e8: 15280003 */ bne $t1,$t0,.L0f0112f8 -/* f0112ec: ac22dd10 */ sw $v0,-0x22f0($at) +/* f0112ec: ac22dd10 */ sw $v0,%lo(var8009dd10)($at) /* f0112f0: 10000002 */ beqz $zero,.L0f0112fc /* f0112f4: 00003025 */ or $a2,$zero,$zero .L0f0112f8: @@ -512,9 +512,9 @@ glabel var7f1a827c /* f011920: adc90004 */ sw $t1,0x4($t6) /* f011924: 44802000 */ mtc1 $zero,$f4 /* f011928: adc10008 */ sw $at,0x8($t6) -/* f01192c: 3c10800a */ lui $s0,%hi(var800a000c) +/* f01192c: 3c10800a */ lui $s0,%hi(g_StageSetup+0xc) /* f011930: afa00080 */ sw $zero,0x80($sp) -/* f011934: 8e10d03c */ lw $s0,-0x2fc4($s0) +/* f011934: 8e10d03c */ lw $s0,%lo(g_StageSetup+0xc)($s0) /* f011938: a3a0007b */ sb $zero,0x7b($sp) /* f01193c: 0fc2f0fc */ jal func0f0bc3f0 /* f011940: e7a40088 */ swc1 $f4,0x88($sp) @@ -522,8 +522,8 @@ glabel var7f1a827c /* f011948: 00000000 */ sll $zero,$zero,0x0 /* f01194c: 3c018007 */ lui $at,0x8007 /* f011950: ac200764 */ sw $zero,0x764($at) -/* f011954: 3c01800a */ lui $at,0x800a -/* f011958: ac20de20 */ sw $zero,-0x21e0($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) @@ -536,10 +536,10 @@ glabel var7f1a827c /* f011980: 26319fc0 */ addiu $s1,$s1,%lo(g_Vars) /* f011984: ac200740 */ sw $zero,0x740($at) /* f011988: 8e2a0284 */ lw $t2,0x284($s1) -/* f01198c: 3c01800a */ lui $at,0x800a +/* f01198c: 3c01800a */ lui $at,%hi(g_NumSpawnPoints) /* f011990: 3c028007 */ lui $v0,%hi(g_PlayersWithControl) /* f011994: ad401bf0 */ sw $zero,0x1bf0($t2) -/* f011998: ac20de68 */ sw $zero,-0x2198($at) +/* 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 @@ -561,16 +561,16 @@ glabel var7f1a827c /* f0119e4: ac20074c */ sw $zero,0x74c($at) /* f0119e8: 8e2d0284 */ lw $t5,0x284($s1) /* f0119ec: 44803000 */ mtc1 $zero,$f6 -/* f0119f0: 3c01800a */ lui $at,0x800a +/* f0119f0: 3c01800a */ lui $at,%hi(g_DefaultWeaponArgument) /* f0119f4: ada01b7c */ sw $zero,0x1b7c($t5) /* f0119f8: 8e390284 */ lw $t9,0x284($s1) /* f0119fc: e7261b80 */ swc1 $f6,0x1b80($t9) /* f011a00: 8e380284 */ lw $t8,0x284($s1) /* f011a04: af001b88 */ sw $zero,0x1b88($t8) -/* f011a08: ac20ddd4 */ sw $zero,-0x222c($at) -/* f011a0c: 3c01800a */ lui $at,0x800a +/* f011a08: ac20ddd4 */ sw $zero,%lo(g_DefaultWeaponArgument)($at) +/* f011a0c: 3c01800a */ lui $at,%hi(g_DefaultWeapon) /* f011a10: 120000a1 */ beqz $s0,.L0f011c98 -/* f011a14: ac20ddd0 */ sw $zero,-0x2230($at) +/* f011a14: ac20ddd0 */ sw $zero,%lo(g_DefaultWeapon)($at) /* f011a18: 8e020000 */ lw $v0,0x0($s0) /* f011a1c: 2401000c */ addiu $at,$zero,0xc /* f011a20: 1041009d */ beq $v0,$at,.L0f011c98 @@ -584,21 +584,21 @@ glabel var7f1a827c /* f011a3c: 01c00008 */ jr $t6 /* f011a40: 00000000 */ sll $zero,$zero,0x0 /* f011a44: 8e0f0008 */ lw $t7,0x8($s0) -/* f011a48: 3c02800a */ lui $v0,%hi(var800a000c) +/* f011a48: 3c02800a */ lui $v0,%hi(g_NumSpawnPoints) /* f011a4c: 15e0000a */ bnez $t7,.L0f011a78 /* f011a50: 00000000 */ sll $zero,$zero,0x0 -/* f011a54: 8c42de68 */ lw $v0,-0x2198($v0) +/* f011a54: 8c42de68 */ lw $v0,%lo(g_NumSpawnPoints)($v0) /* f011a58: 8e090004 */ lw $t1,0x4($s0) -/* f011a5c: 3c01800a */ lui $at,0x800a +/* f011a5c: 3c01800a */ lui $at,%hi(g_SpawnPoints) /* f011a60: 00025040 */ sll $t2,$v0,0x1 /* f011a64: 002a0821 */ addu $at,$at,$t2 -/* f011a68: a429de38 */ sh $t1,-0x21c8($at) -/* f011a6c: 3c01800a */ lui $at,0x800a +/* f011a68: a429de38 */ sh $t1,%lo(g_SpawnPoints)($at) +/* f011a6c: 3c01800a */ lui $at,%hi(g_NumSpawnPoints) /* f011a70: 244b0001 */ addiu $t3,$v0,0x1 -/* f011a74: ac2bde68 */ sw $t3,-0x2198($at) +/* f011a74: ac2bde68 */ sw $t3,%lo(g_NumSpawnPoints)($at) .L0f011a78: /* f011a78: 10000083 */ beqz $zero,.L0f011c88 -/* f011a7c: 2610000c */ addiu $s0,$s0,%lo(var800a000c) +/* f011a7c: 2610000c */ addiu $s0,$s0,12 /* f011a80: 10000081 */ beqz $zero,.L0f011c88 /* f011a84: 2610000c */ addiu $s0,$s0,0xc /* f011a88: 1000007f */ beqz $zero,.L0f011c88 @@ -631,15 +631,15 @@ glabel var7f1a827c /* f011aec: 5700000c */ bnezl $t8,.L0f011b20 /* f011af0: 8e090004 */ lw $t1,0x4($s0) /* f011af4: 8e0e0004 */ lw $t6,0x4($s0) -/* f011af8: 3c01800a */ lui $at,0x800a +/* f011af8: 3c01800a */ lui $at,%hi(g_DefaultWeapon) /* f011afc: 240f0001 */ addiu $t7,$zero,0x1 -/* f011b00: ac2eddd0 */ sw $t6,-0x2230($at) +/* f011b00: ac2eddd0 */ sw $t6,%lo(g_DefaultWeapon)($at) /* f011b04: 8e040008 */ lw $a0,0x8($s0) /* f011b08: afaf0080 */ sw $t7,0x80($sp) -/* f011b0c: 3c01800a */ lui $at,0x800a +/* f011b0c: 3c01800a */ lui $at,%hi(g_DefaultWeaponArgument) /* f011b10: 04820003 */ bltzl $a0,.L0f011b20 /* f011b14: 8e090004 */ lw $t1,0x4($s0) -/* f011b18: ac24ddd4 */ sw $a0,-0x222c($at) +/* f011b18: ac24ddd4 */ sw $a0,%lo(g_DefaultWeaponArgument)($at) /* f011b1c: 8e090004 */ lw $t1,0x4($s0) .L0f011b20: /* f011b20: 2401002e */ addiu $at,$zero,0x2e @@ -952,8 +952,8 @@ glabel var7f1a827c .L0f011f78: /* f011f78: 15200003 */ bnez $t1,.L0f011f88 /* f011f7c: 240a0001 */ addiu $t2,$zero,0x1 -/* f011f80: 3c01800a */ lui $at,0x800a -/* f011f84: ac2addd0 */ sw $t2,-0x2230($at) +/* f011f80: 3c01800a */ lui $at,%hi(g_DefaultWeapon) +/* f011f84: ac2addd0 */ sw $t2,%lo(g_DefaultWeapon)($at) .L0f011f88: /* f011f88: 0fc180d6 */ jal propAllocate /* f011f8c: 00000000 */ sll $zero,$zero,0x0 @@ -1010,7 +1010,7 @@ glabel var7f1a827c /* f01204c: 8e2f0284 */ lw $t7,0x284($s1) /* f012050: 8e2e0288 */ lw $t6,0x288($s1) /* f012054: 8e2d0284 */ lw $t5,0x284($s1) -/* f012058: 3c09800b */ lui $t1,0x800b +/* f012058: 3c09800b */ lui $t1,%hi(g_MpPlayers+0x11) /* f01205c: 8dcf0070 */ lw $t7,0x70($t6) /* f012060: 8dac00bc */ lw $t4,0xbc($t5) /* f012064: 240b0001 */ addiu $t3,$zero,0x1 @@ -1018,7 +1018,7 @@ glabel var7f1a827c /* f01206c: 014f5021 */ addu $t2,$t2,$t7 /* f012070: 000a5140 */ sll $t2,$t2,0x5 /* f012074: 012a4821 */ addu $t1,$t1,$t2 -/* f012078: 9129c7c9 */ lbu $t1,-0x3837($t1) +/* f012078: 9129c7c9 */ lbu $t1,%lo(g_MpPlayers+0x11)($t1) /* f01207c: 8d990004 */ lw $t9,0x4($t4) /* f012080: 012bc004 */ sllv $t8,$t3,$t1 /* f012084: 10000006 */ beqz $zero,.L0f0120a0 @@ -1074,10 +1074,10 @@ glabel var7f1a827c .L0f01213c: /* f01213c: 8e2a0314 */ lw $t2,0x314($s1) /* f012140: 240e0001 */ addiu $t6,$zero,0x1 -/* f012144: 3c01800a */ lui $at,0x800a +/* f012144: 3c01800a */ lui $at,%hi(g_NumSpawnPoints) /* f012148: 55400003 */ bnezl $t2,.L0f012158 /* f01214c: 8e2b0284 */ lw $t3,0x284($s1) -/* f012150: ac2ede68 */ sw $t6,-0x2198($at) +/* f012150: ac2ede68 */ sw $t6,%lo(g_NumSpawnPoints)($at) /* f012154: 8e2b0284 */ lw $t3,0x284($s1) .L0f012158: /* f012158: 3c0141f0 */ lui $at,0x41f0 @@ -1252,10 +1252,10 @@ glabel var7f1a827c .L0f0123d4: /* f0123d4: 8e390284 */ lw $t9,0x284($s1) /* f0123d8: 3c02800a */ lui $v0,%hi(g_Vars) -/* f0123dc: 3c03800a */ lui $v1,0x800a +/* f0123dc: 3c03800a */ lui $v1,%hi(g_Vars+0x10) /* f0123e0: af201b84 */ sw $zero,0x1b84($t9) /* f0123e4: 8e380284 */ lw $t8,0x284($s1) -/* f0123e8: 24639fd0 */ addiu $v1,$v1,-24624 +/* f0123e8: 24639fd0 */ addiu $v1,$v1,%lo(g_Vars+0x10) /* f0123ec: 24429fc0 */ addiu $v0,$v0,%lo(g_Vars) /* f0123f0: af0000e0 */ sw $zero,0xe0($t8) .L0f0123f4: diff --git a/src/game/game_013010.c b/src/game/game_013010.c index 5d2e5a763..542b70fc5 100644 --- a/src/game/game_013010.c +++ b/src/game/game_013010.c @@ -24,8 +24,8 @@ glabel func0f013010 /* f013034: 240e0006 */ addiu $t6,$zero,0x6 /* f013038: e424e4a8 */ swc1 $f4,-0x1b58($at) /* f01303c: ad0e0000 */ sw $t6,0x0($t0) -/* f013040: 3c0f800a */ lui $t7,0x800a -/* f013044: 8defa474 */ lw $t7,-0x5b8c($t7) +/* f013040: 3c0f800a */ lui $t7,%hi(g_Vars+0x4b4) +/* f013044: 8defa474 */ lw $t7,%lo(g_Vars+0x4b4)($t7) /* f013048: 27bdffe8 */ addiu $sp,$sp,-24 /* f01304c: afbf0014 */ sw $ra,0x14($sp) /* f013050: 29e1005a */ slti $at,$t7,0x5a @@ -110,8 +110,8 @@ glabel func0f013130 /* f013164: 24180014 */ addiu $t8,$zero,0x14 /* f013168: ad180000 */ sw $t8,0x0($t0) .L0f01316c: -/* f01316c: 3c19800a */ lui $t9,0x800a -/* f013170: 8f39a474 */ lw $t9,-0x5b8c($t9) +/* f01316c: 3c19800a */ lui $t9,%hi(g_Vars+0x4b4) +/* f013170: 8f39a474 */ lw $t9,%lo(g_Vars+0x4b4)($t9) /* f013174: 3c05800a */ lui $a1,%hi(var800a3440) /* f013178: 24a53440 */ addiu $a1,$a1,%lo(var800a3440) /* f01317c: 2b21005a */ slti $at,$t9,0x5a diff --git a/src/game/game_013260.c b/src/game/game_013260.c index 20b97973c..6929ded5d 100644 --- a/src/game/game_013260.c +++ b/src/game/game_013260.c @@ -11,18 +11,18 @@ GLOBAL_ASM( glabel func0f013260 -/* f013260: 3c01800a */ lui $at,0x800a +/* f013260: 3c01800a */ lui $at,%hi(var800a3fc0) /* f013264: 3c03800a */ lui $v1,%hi(var800a3fc8) /* f013268: 3c02800a */ lui $v0,%hi(var800a4130) -/* f01326c: ac203fc0 */ sw $zero,0x3fc0($at) +/* f01326c: ac203fc0 */ sw $zero,%lo(var800a3fc0)($at) /* f013270: 24424130 */ addiu $v0,$v0,%lo(var800a4130) /* f013274: 24633fc8 */ addiu $v1,$v1,%lo(var800a3fc8) .L0f013278: /* f013278: 24630024 */ addiu $v1,$v1,0x24 /* f01327c: 1462fffe */ bne $v1,$v0,.L0f013278 /* f013280: ac60ffe4 */ sw $zero,-0x1c($v1) -/* f013284: 3c01800a */ lui $at,0x800a -/* f013288: ac204130 */ sw $zero,0x4130($at) +/* f013284: 3c01800a */ lui $at,%hi(var800a4130) +/* f013288: ac204130 */ sw $zero,%lo(var800a4130)($at) /* f01328c: 3c018008 */ lui $at,0x8008 /* f013290: 03e00008 */ jr $ra /* f013294: ac20f0b8 */ sw $zero,-0xf48($at) diff --git a/src/game/game_013550.c b/src/game/game_013550.c index 9e9d8ba96..a6934d157 100644 --- a/src/game/game_013550.c +++ b/src/game/game_013550.c @@ -110,7 +110,7 @@ glabel func0f013550 /* f013684: 00003025 */ or $a2,$zero,$zero .L0f013688: /* f013688: 10c00008 */ beqz $a2,.L0f0136ac -/* f01368c: 3c0b800a */ lui $t3,%hi(var8009cc44) +/* f01368c: 3c0b800a */ lui $t3,0x800a /* f013690: 10c80022 */ beq $a2,$t0,.L0f01371c /* f013694: 3c0b800a */ lui $t3,%hi(var8009cc44) /* f013698: 24010002 */ addiu $at,$zero,0x2 @@ -123,55 +123,55 @@ glabel func0f013550 /* f0136b0: 24180050 */ addiu $t8,$zero,0x50 /* f0136b4: ad780000 */ sw $t8,0x0($t3) /* f0136b8: 2419000a */ addiu $t9,$zero,0xa -/* f0136bc: 3c01800a */ lui $at,0x800a -/* f0136c0: ac39cc5c */ sw $t9,-0x33a4($at) -/* f0136c4: 3c01800a */ lui $at,0x800a +/* f0136bc: 3c01800a */ lui $at,%hi(var8009cc5c) +/* f0136c0: ac39cc5c */ sw $t9,%lo(var8009cc5c)($at) +/* f0136c4: 3c01800a */ lui $at,%hi(var8009cc60) /* f0136c8: 240e0028 */ addiu $t6,$zero,0x28 -/* f0136cc: ac2ecc60 */ sw $t6,-0x33a0($at) -/* f0136d0: 3c01800a */ lui $at,0x800a -/* f0136d4: ac28cc64 */ sw $t0,-0x339c($at) -/* f0136d8: 3c01800a */ lui $at,0x800a +/* f0136cc: ac2ecc60 */ sw $t6,%lo(var8009cc60)($at) +/* f0136d0: 3c01800a */ lui $at,%hi(var8009cc64) +/* f0136d4: ac28cc64 */ sw $t0,%lo(var8009cc64)($at) +/* f0136d8: 3c01800a */ lui $at,%hi(var8009cc68) /* f0136dc: 240f0019 */ addiu $t7,$zero,0x19 -/* f0136e0: ac2fcc68 */ sw $t7,-0x3398($at) -/* f0136e4: 3c01800a */ lui $at,0x800a +/* f0136e0: ac2fcc68 */ sw $t7,%lo(var8009cc68)($at) +/* f0136e4: 3c01800a */ lui $at,%hi(var8009cc6c) /* f0136e8: 24180014 */ addiu $t8,$zero,0x14 -/* f0136ec: ac38cc6c */ sw $t8,-0x3394($at) -/* f0136f0: 3c01800a */ lui $at,0x800a +/* f0136ec: ac38cc6c */ sw $t8,%lo(var8009cc6c)($at) +/* f0136f0: 3c01800a */ lui $at,%hi(var8009cc70) /* f0136f4: 24190005 */ addiu $t9,$zero,0x5 -/* f0136f8: ac39cc70 */ sw $t9,-0x3390($at) -/* f0136fc: 3c01800a */ lui $at,0x800a +/* f0136f8: ac39cc70 */ sw $t9,%lo(var8009cc70)($at) +/* f0136fc: 3c01800a */ lui $at,%hi(var8009cc74) /* f013700: 240e000f */ addiu $t6,$zero,0xf -/* f013704: ac2ecc74 */ sw $t6,-0x338c($at) +/* f013704: ac2ecc74 */ sw $t6,%lo(var8009cc74)($at) /* f013708: 3c017f1b */ lui $at,%hi(var7f1a8290) /* f01370c: c4248290 */ lwc1 $f4,%lo(var7f1a8290)($at) /* f013710: 3c01800a */ lui $at,0x800a /* f013714: 1000003b */ beqz $zero,.L0f013804 /* f013718: e424cc78 */ swc1 $f4,-0x3388($at) .L0f01371c: -/* f01371c: 256bcc44 */ addiu $t3,$t3,%lo(var8009cc44) +/* f01371c: 256bcc44 */ addiu $t3,$t3,-13244 /* f013720: 240f00c8 */ addiu $t7,$zero,0xc8 /* f013724: ad6f0000 */ sw $t7,0x0($t3) /* f013728: 24180019 */ addiu $t8,$zero,0x19 -/* f01372c: 3c01800a */ lui $at,0x800a -/* f013730: ac38cc5c */ sw $t8,-0x33a4($at) -/* f013734: 3c01800a */ lui $at,0x800a +/* f01372c: 3c01800a */ lui $at,%hi(var8009cc5c) +/* f013730: ac38cc5c */ sw $t8,%lo(var8009cc5c)($at) +/* f013734: 3c01800a */ lui $at,%hi(var8009cc60) /* f013738: 24190064 */ addiu $t9,$zero,0x64 -/* f01373c: ac39cc60 */ sw $t9,-0x33a0($at) -/* f013740: 3c01800a */ lui $at,0x800a +/* f01373c: ac39cc60 */ sw $t9,%lo(var8009cc60)($at) +/* f013740: 3c01800a */ lui $at,%hi(var8009cc64) /* f013744: 240e0004 */ addiu $t6,$zero,0x4 -/* f013748: ac2ecc64 */ sw $t6,-0x339c($at) -/* f01374c: 3c01800a */ lui $at,0x800a +/* f013748: ac2ecc64 */ sw $t6,%lo(var8009cc64)($at) +/* f01374c: 3c01800a */ lui $at,%hi(var8009cc68) /* f013750: 240f0028 */ addiu $t7,$zero,0x28 -/* f013754: ac2fcc68 */ sw $t7,-0x3398($at) -/* f013758: 3c01800a */ lui $at,0x800a +/* f013754: ac2fcc68 */ sw $t7,%lo(var8009cc68)($at) +/* f013758: 3c01800a */ lui $at,%hi(var8009cc6c) /* f01375c: 24180050 */ addiu $t8,$zero,0x50 -/* f013760: ac38cc6c */ sw $t8,-0x3394($at) -/* f013764: 3c01800a */ lui $at,0x800a +/* f013760: ac38cc6c */ sw $t8,%lo(var8009cc6c)($at) +/* f013764: 3c01800a */ lui $at,%hi(var8009cc70) /* f013768: 24190014 */ addiu $t9,$zero,0x14 -/* f01376c: ac39cc70 */ sw $t9,-0x3390($at) -/* f013770: 3c01800a */ lui $at,0x800a +/* f01376c: ac39cc70 */ sw $t9,%lo(var8009cc70)($at) +/* f013770: 3c01800a */ lui $at,%hi(var8009cc74) /* f013774: 240e001e */ addiu $t6,$zero,0x1e -/* f013778: ac2ecc74 */ sw $t6,-0x338c($at) +/* f013778: ac2ecc74 */ sw $t6,%lo(var8009cc74)($at) /* f01377c: 3c017f1b */ lui $at,%hi(var7f1a8294) /* f013780: c4268294 */ lwc1 $f6,%lo(var7f1a8294)($at) /* f013784: 3c01800a */ lui $at,0x800a @@ -183,26 +183,26 @@ glabel func0f013550 /* f013798: 240f0168 */ addiu $t7,$zero,0x168 /* f01379c: ad6f0000 */ sw $t7,0x0($t3) /* f0137a0: 24180032 */ addiu $t8,$zero,0x32 -/* f0137a4: 3c01800a */ lui $at,0x800a -/* f0137a8: ac38cc5c */ sw $t8,-0x33a4($at) -/* f0137ac: 3c01800a */ lui $at,0x800a +/* f0137a4: 3c01800a */ lui $at,%hi(var8009cc5c) +/* f0137a8: ac38cc5c */ sw $t8,%lo(var8009cc5c)($at) +/* f0137ac: 3c01800a */ lui $at,%hi(var8009cc60) /* f0137b0: 24190078 */ addiu $t9,$zero,0x78 -/* f0137b4: ac39cc60 */ sw $t9,-0x33a0($at) -/* f0137b8: 3c01800a */ lui $at,0x800a +/* f0137b4: ac39cc60 */ sw $t9,%lo(var8009cc60)($at) +/* f0137b8: 3c01800a */ lui $at,%hi(var8009cc64) /* f0137bc: 240e000a */ addiu $t6,$zero,0xa -/* f0137c0: ac2ecc64 */ sw $t6,-0x339c($at) -/* f0137c4: 3c01800a */ lui $at,0x800a +/* f0137c0: ac2ecc64 */ sw $t6,%lo(var8009cc64)($at) +/* f0137c4: 3c01800a */ lui $at,%hi(var8009cc68) /* f0137c8: 240f003c */ addiu $t7,$zero,0x3c -/* f0137cc: ac2fcc68 */ sw $t7,-0x3398($at) -/* f0137d0: 3c01800a */ lui $at,0x800a +/* f0137cc: ac2fcc68 */ sw $t7,%lo(var8009cc68)($at) +/* f0137d0: 3c01800a */ lui $at,%hi(var8009cc6c) /* f0137d4: 241800b4 */ addiu $t8,$zero,0xb4 -/* f0137d8: ac38cc6c */ sw $t8,-0x3394($at) -/* f0137dc: 3c01800a */ lui $at,0x800a +/* f0137d8: ac38cc6c */ sw $t8,%lo(var8009cc6c)($at) +/* f0137dc: 3c01800a */ lui $at,%hi(var8009cc70) /* f0137e0: 24190019 */ addiu $t9,$zero,0x19 -/* f0137e4: ac39cc70 */ sw $t9,-0x3390($at) -/* f0137e8: 3c01800a */ lui $at,0x800a +/* f0137e4: ac39cc70 */ sw $t9,%lo(var8009cc70)($at) +/* f0137e8: 3c01800a */ lui $at,%hi(var8009cc74) /* f0137ec: 240e0028 */ addiu $t6,$zero,0x28 -/* f0137f0: ac2ecc74 */ sw $t6,-0x338c($at) +/* f0137f0: ac2ecc74 */ sw $t6,%lo(var8009cc74)($at) /* f0137f4: 3c013f00 */ lui $at,0x3f00 /* f0137f8: 44814000 */ mtc1 $at,$f8 /* f0137fc: 3c01800a */ lui $at,0x800a @@ -211,17 +211,17 @@ glabel func0f013550 /* f013804: 3c0c800a */ lui $t4,%hi(var8009cc40) /* f013808: 258ccc40 */ addiu $t4,$t4,%lo(var8009cc40) /* f01380c: ad800000 */ sw $zero,0x0($t4) -/* f013810: 3c01800a */ lui $at,0x800a +/* f013810: 3c01800a */ lui $at,%hi(var8009cc48) /* f013814: 3c0a800a */ lui $t2,%hi(var8009cc4c) -/* f013818: ac20cc48 */ sw $zero,-0x33b8($at) +/* f013818: ac20cc48 */ sw $zero,%lo(var8009cc48)($at) /* f01381c: 254acc4c */ addiu $t2,$t2,%lo(var8009cc4c) /* f013820: ad400000 */ sw $zero,0x0($t2) -/* f013824: 3c01800a */ lui $at,0x800a -/* f013828: ac20cc50 */ sw $zero,-0x33b0($at) -/* f01382c: 3c01800a */ lui $at,0x800a -/* f013830: ac20cc54 */ sw $zero,-0x33ac($at) -/* f013834: 3c01800a */ lui $at,0x800a -/* f013838: ac20cc58 */ sw $zero,-0x33a8($at) +/* f013824: 3c01800a */ lui $at,%hi(var8009cc50) +/* f013828: ac20cc50 */ sw $zero,%lo(var8009cc50)($at) +/* f01382c: 3c01800a */ lui $at,%hi(var8009cc54) +/* f013830: ac20cc54 */ sw $zero,%lo(var8009cc54)($at) +/* f013834: 3c01800a */ lui $at,%hi(var8009cc58) +/* f013838: ac20cc58 */ sw $zero,%lo(var8009cc58)($at) /* f01383c: 8daf04b4 */ lw $t7,0x4b4($t5) /* f013840: 3c04800a */ lui $a0,%hi(var800a41b0) /* f013844: 248441b0 */ addiu $a0,$a0,%lo(var800a41b0) @@ -262,9 +262,9 @@ glabel func0f013550 /* f0138c8: ad820000 */ sw $v0,0x0($t4) /* f0138cc: ac990000 */ sw $t9,0x0($a0) /* f0138d0: ad000000 */ sw $zero,0x0($t0) -/* f0138d4: 3c01800a */ lui $at,0x800a +/* f0138d4: 3c01800a */ lui $at,%hi(var800a41b8) /* f0138d8: 256bcc44 */ addiu $t3,$t3,%lo(var8009cc44) -/* f0138dc: ac2041b8 */ sw $zero,0x41b8($at) +/* f0138dc: ac2041b8 */ sw $zero,%lo(var800a41b8)($at) /* f0138e0: 8d6e0000 */ lw $t6,0x0($t3) /* f0138e4: 3c0a800a */ lui $t2,%hi(var8009cc4c) /* f0138e8: 3c0d800a */ lui $t5,%hi(g_Vars) @@ -460,9 +460,9 @@ glabel func0f0139f0 GLOBAL_ASM( glabel func0f013b80 /* f013b80: 3c02800b */ lui $v0,%hi(var800aabc8) -/* f013b84: 3c01800b */ lui $at,0x800b +/* f013b84: 3c01800b */ lui $at,%hi(var800ab538) /* f013b88: 2442abc8 */ addiu $v0,$v0,%lo(var800aabc8) -/* f013b8c: ac20b538 */ sw $zero,-0x4ac8($at) +/* f013b8c: ac20b538 */ sw $zero,%lo(var800ab538)($at) /* f013b90: ac400000 */ sw $zero,0x0($v0) /* f013b94: ac400004 */ sw $zero,0x4($v0) /* f013b98: 03e00008 */ jr $ra diff --git a/src/game/game_013cf0.c b/src/game/game_013cf0.c index 3402322df..47c311826 100644 --- a/src/game/game_013cf0.c +++ b/src/game/game_013cf0.c @@ -16,9 +16,9 @@ GLOBAL_ASM( glabel func0f013cf0 /* f013cf0: 27bdffe8 */ addiu $sp,$sp,-24 /* f013cf4: afbf0014 */ sw $ra,0x14($sp) -/* f013cf8: 3c04800a */ lui $a0,0x800a +/* f013cf8: 3c04800a */ lui $a0,%hi(g_Vars+0x4b4) /* f013cfc: 0fc56c8f */ jal func0f15b23c -/* f013d00: 8c84a474 */ lw $a0,-0x5b8c($a0) +/* f013d00: 8c84a474 */ lw $a0,%lo(g_Vars+0x4b4)($a0) /* f013d04: 04410002 */ bgez $v0,.L0f013d10 /* f013d08: 00401825 */ or $v1,$v0,$zero /* f013d0c: 00001825 */ or $v1,$zero,$zero @@ -38,12 +38,12 @@ glabel func0f013cf0 /* f013d40: 2484a8a0 */ addiu $a0,$a0,%lo(var8009a8a0) /* f013d44: ac820000 */ sw $v0,0x0($a0) /* f013d48: 8c580000 */ lw $t8,0x0($v0) -/* f013d4c: 3c01800a */ lui $at,0x800a +/* f013d4c: 3c01800a */ lui $at,%hi(var8009a8a4) /* f013d50: 24590004 */ addiu $t9,$v0,0x4 -/* f013d54: ac38a8a4 */ sw $t8,-0x575c($at) -/* f013d58: 3c01800a */ lui $at,0x800a +/* f013d54: ac38a8a4 */ sw $t8,%lo(var8009a8a4)($at) +/* f013d58: 3c01800a */ lui $at,%hi(var8009a8a8) /* f013d5c: 0fc04f5d */ jal func0f013d74 -/* f013d60: ac39a8a8 */ sw $t9,-0x5758($at) +/* f013d60: ac39a8a8 */ sw $t9,%lo(var8009a8a8)($at) /* f013d64: 8fbf0014 */ lw $ra,0x14($sp) /* f013d68: 27bd0018 */ addiu $sp,$sp,0x18 /* f013d6c: 03e00008 */ jr $ra diff --git a/src/game/game_013ee0.c b/src/game/game_013ee0.c index 6c631cba6..cfe521340 100644 --- a/src/game/game_013ee0.c +++ b/src/game/game_013ee0.c @@ -120,8 +120,8 @@ glabel func0f013ee0 /* f014058: 0c0048f2 */ jal malloc /* f01405c: 24050004 */ addiu $a1,$zero,0x4 /* f014060: 3c08800a */ lui $t0,%hi(g_Vars) -/* f014064: 3c01800a */ lui $at,0x800a -/* f014068: ac226670 */ sw $v0,0x6670($at) +/* f014064: 3c01800a */ lui $at,%hi(var800a6670) +/* f014068: ac226670 */ sw $v0,%lo(var800a6670)($at) /* f01406c: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) /* f014070: 8d19006c */ lw $t9,0x6c($t0) /* f014074: 3c0a8008 */ lui $t2,%hi(var80082050) @@ -354,10 +354,10 @@ glabel func0f0142e8 /* f01439c: 3c03800a */ lui $v1,%hi(var800a2368) /* f0143a0: 24632368 */ addiu $v1,$v1,%lo(var800a2368) /* f0143a4: ac620000 */ sw $v0,0x0($v1) -/* f0143a8: 3c01800a */ lui $at,0x800a -/* f0143ac: a420236c */ sh $zero,0x236c($at) -/* f0143b0: 3c01800a */ lui $at,0x800a -/* f0143b4: ac202370 */ sw $zero,0x2370($at) +/* f0143a8: 3c01800a */ lui $at,%hi(var800a236c) +/* f0143ac: a420236c */ sh $zero,%lo(var800a236c)($at) +/* f0143b0: 3c01800a */ lui $at,%hi(g_CoverNums) +/* f0143b4: ac202370 */ sw $zero,%lo(g_CoverNums)($at) /* f0143b8: 8e6d0000 */ lw $t5,0x0($s3) /* f0143bc: 51a000e6 */ beqzl $t5,.L0f014758 /* f0143c0: 8fbf0064 */ lw $ra,0x64($sp) @@ -412,12 +412,12 @@ glabel func0f0142e8 /* f01447c: 10400008 */ beqz $v0,.L0f0144a0 /* f014480: 3c02800a */ lui $v0,%hi(var800a236c) /* f014484: 9442236c */ lhu $v0,%lo(var800a236c)($v0) -/* f014488: 3c01800a */ lui $at,0x800a +/* f014488: 3c01800a */ lui $at,%hi(var800a236c) /* f01448c: 00025040 */ sll $t2,$v0,0x1 /* f014490: 03aa5821 */ addu $t3,$sp,$t2 /* f014494: a57400dc */ sh $s4,0xdc($t3) /* f014498: 244c0001 */ addiu $t4,$v0,0x1 -/* f01449c: a42c236c */ sh $t4,0x236c($at) +/* f01449c: a42c236c */ sh $t4,%lo(var800a236c)($at) .L0f0144a0: /* f0144a0: 8fad08dc */ lw $t5,0x8dc($sp) /* f0144a4: c5aa0000 */ lwc1 $f10,0x0($t5) diff --git a/src/game/game_0147a0.c b/src/game/game_0147a0.c index 1935638b2..f85e78750 100644 --- a/src/game/game_0147a0.c +++ b/src/game/game_0147a0.c @@ -11,10 +11,10 @@ GLOBAL_ASM( glabel func0f0147a0 -/* f0147a0: 3c01800a */ lui $at,0x800a -/* f0147a4: ac2433a0 */ sw $a0,0x33a0($at) -/* f0147a8: 3c01800a */ lui $at,0x800a -/* f0147ac: ac2033a4 */ sw $zero,0x33a4($at) +/* f0147a0: 3c01800a */ lui $at,%hi(var800a33a0) +/* f0147a4: ac2433a0 */ sw $a0,%lo(var800a33a0)($at) +/* f0147a8: 3c01800a */ lui $at,%hi(var800a33a4) +/* f0147ac: ac2033a4 */ sw $zero,%lo(var800a33a4)($at) /* f0147b0: 3c013f80 */ lui $at,0x3f80 /* f0147b4: 44812000 */ mtc1 $at,$f4 /* f0147b8: 3c018008 */ lui $at,0x8008 diff --git a/src/game/game_0147d0.c b/src/game/game_0147d0.c index 2791f73f0..afaaea7f5 100644 --- a/src/game/game_0147d0.c +++ b/src/game/game_0147d0.c @@ -182,9 +182,9 @@ glabel var7f1a82b4 /* f0149d0: 28610008 */ slti $at,$v1,0x8 /* f0149d4: 10200129 */ beqz $at,.L0f014e7c /* f0149d8: 0003c080 */ sll $t8,$v1,0x2 -/* f0149dc: 3c01800b */ lui $at,0x800b +/* f0149dc: 3c01800b */ lui $at,%hi(g_MpSimulantChrs) /* f0149e0: 00380821 */ addu $at,$at,$t8 -/* f0149e4: ac30cc80 */ sw $s0,-0x3380($at) +/* f0149e4: ac30cc80 */ sw $s0,%lo(g_MpSimulantChrs)($at) /* f0149e8: 24790001 */ addiu $t9,$v1,0x1 /* f0149ec: 0c0048f2 */ jal malloc /* f0149f0: a1190000 */ sb $t9,0x0($t0) @@ -229,20 +229,20 @@ glabel var7f1a82b4 /* f014a84: 2508c530 */ addiu $t0,$t0,%lo(g_MpNumPlayers) /* f014a88: 8d020000 */ lw $v0,0x0($t0) /* f014a8c: 000fc080 */ sll $t8,$t7,0x2 -/* f014a90: 3c01800b */ lui $at,0x800b +/* f014a90: 3c01800b */ lui $at,%hi(g_MpPlayerChrs) /* f014a94: 030fc021 */ addu $t8,$t8,$t7 /* f014a98: 00021880 */ sll $v1,$v0,0x2 /* f014a9c: 00230821 */ addu $at,$at,$v1 /* f014aa0: 0018c080 */ sll $t8,$t8,0x2 -/* f014aa4: ac30c4d0 */ sw $s0,-0x3b30($at) +/* f014aa4: ac30c4d0 */ sw $s0,%lo(g_MpPlayerChrs)($at) /* f014aa8: 3c19800b */ lui $t9,%hi(g_MpSimulants) /* f014aac: 030fc023 */ subu $t8,$t8,$t7 /* f014ab0: 0018c080 */ sll $t8,$t8,0x2 /* f014ab4: 2739c538 */ addiu $t9,$t9,%lo(g_MpSimulants) -/* f014ab8: 3c01800b */ lui $at,0x800b +/* f014ab8: 3c01800b */ lui $at,%hi(var800ac500) /* f014abc: 00230821 */ addu $at,$at,$v1 /* f014ac0: 03194821 */ addu $t1,$t8,$t9 -/* f014ac4: ac29c500 */ sw $t1,-0x3b00($at) +/* f014ac4: ac29c500 */ sw $t1,%lo(var800ac500)($at) /* f014ac8: 244a0001 */ addiu $t2,$v0,0x1 /* f014acc: ad0a0000 */ sw $t2,0x0($t0) /* f014ad0: afa60068 */ sw $a2,0x68($sp) @@ -476,14 +476,14 @@ glabel var7f1a82b4 /* f014e48: e4ca02d4 */ swc1 $f10,0x2d4($a2) .L0f014e4c: /* f014e4c: 91020000 */ lbu $v0,0x0($t0) -/* f014e50: 3c01800b */ lui $at,0x800b +/* f014e50: 3c01800b */ lui $at,%hi(g_MpSimulantChrs) /* f014e54: 2442ffff */ addiu $v0,$v0,-1 /* f014e58: 304f00ff */ andi $t7,$v0,0xff /* f014e5c: 000fc080 */ sll $t8,$t7,0x2 /* f014e60: 00380821 */ addu $at,$at,$t8 /* f014e64: a10f0000 */ sb $t7,0x0($t0) /* f014e68: 10000004 */ beqz $zero,.L0f014e7c -/* f014e6c: ac20cc80 */ sw $zero,-0x3380($at) +/* f014e6c: ac20cc80 */ sw $zero,%lo(g_MpSimulantChrs)($at) .L0f014e70: /* f014e70: 02002025 */ or $a0,$s0,$zero /* f014e74: 0fc053a4 */ jal func0f014e90 diff --git a/src/game/game_015470.c b/src/game/game_015470.c index 45b285028..73e145aec 100644 --- a/src/game/game_015470.c +++ b/src/game/game_015470.c @@ -90,17 +90,17 @@ glabel func0f015470 .L0f015548: /* f015548: 5633fff3 */ bnel $s1,$s3,.L0f015518 /* f01554c: 8e4d0064 */ lw $t5,0x64($s2) -/* f015550: 3c02800a */ lui $v0,0x800a -/* f015554: 8c42a02c */ lw $v0,-0x5fd4($v0) -/* f015558: 3c03800a */ lui $v1,0x800a -/* f01555c: 3c04800a */ lui $a0,0x800a -/* f015560: 3c06800a */ lui $a2,0x800a +/* f015550: 3c02800a */ lui $v0,%hi(g_Vars+0x6c) +/* f015554: 8c42a02c */ lw $v0,%lo(g_Vars+0x6c)($v0) +/* f015558: 3c03800a */ lui $v1,%hi(g_Vars+0x68) +/* f01555c: 3c04800a */ lui $a0,%hi(g_Vars+0x64) +/* f015560: 3c06800a */ lui $a2,%hi(g_Vars+0x70) /* f015564: 26940001 */ addiu $s4,$s4,0x1 /* f015568: 26520004 */ addiu $s2,$s2,0x4 -/* f01556c: 8cc6a030 */ lw $a2,-0x5fd0($a2) -/* f015570: 8c84a024 */ lw $a0,-0x5fdc($a0) +/* f01556c: 8cc6a030 */ lw $a2,%lo(g_Vars+0x70)($a2) +/* f015570: 8c84a024 */ lw $a0,%lo(g_Vars+0x64)($a0) /* f015574: 10400003 */ beqz $v0,.L0f015584 -/* f015578: 8c63a028 */ lw $v1,-0x5fd8($v1) +/* f015578: 8c63a028 */ lw $v1,%lo(g_Vars+0x68)($v1) /* f01557c: 10000002 */ beqz $zero,.L0f015588 /* f015580: 24070001 */ addiu $a3,$zero,0x1 .L0f015584: diff --git a/src/game/game_016100.c b/src/game/game_016100.c index c4a530127..222325350 100644 --- a/src/game/game_016100.c +++ b/src/game/game_016100.c @@ -38,8 +38,8 @@ GLOBAL_ASM( glabel func0f016100 -/* f016100: 3c0e800a */ lui $t6,0x800a -/* f016104: 8dcea24c */ lw $t6,-0x5db4($t6) +/* f016100: 3c0e800a */ lui $t6,%hi(g_Vars+0x28c) +/* f016104: 8dcea24c */ lw $t6,%lo(g_Vars+0x28c)($t6) /* f016108: 27bdffd0 */ addiu $sp,$sp,-48 /* f01610c: afbf0014 */ sw $ra,0x14($sp) /* f016110: afa50034 */ sw $a1,0x34($sp) @@ -301,8 +301,8 @@ glabel var7f1a83c4 /* f016488: 00002025 */ or $a0,$zero,$zero /* f01648c: 3c028006 */ lui $v0,%hi(var800624c4) /* f016490: 244224c4 */ addiu $v0,$v0,%lo(var800624c4) -/* f016494: 3c0f800a */ lui $t7,0x800a -/* f016498: 8def9ff8 */ lw $t7,-0x6008($t7) +/* f016494: 3c0f800a */ lui $t7,%hi(g_Vars+0x38) +/* f016498: 8def9ff8 */ lw $t7,%lo(g_Vars+0x38)($t7) /* f01649c: 8c4e0000 */ lw $t6,0x0($v0) /* f0164a0: 01cfc021 */ addu $t8,$t6,$t7 /* f0164a4: 2b0100b5 */ slti $at,$t8,0xb5 @@ -1099,8 +1099,8 @@ glabel func0f016d34 /* f017008: acb00000 */ sw $s0,0x0($a1) /* f01700c: 020d8021 */ addu $s0,$s0,$t5 /* f017010: acb00004 */ sw $s0,0x4($a1) -/* f017014: 3c01800a */ lui $at,0x800a -/* f017018: ac20ccb8 */ sw $zero,-0x3348($at) +/* 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) @@ -1173,8 +1173,8 @@ glabel var7f1a83ec /* f0170f4: 0c002f48 */ jal func0000bd20 /* f0170f8: 00002025 */ or $a0,$zero,$zero /* f0170fc: 3c0e8006 */ lui $t6,%hi(var800624c4) -/* f017100: 3c0f800a */ lui $t7,0x800a -/* f017104: 8def9ff8 */ lw $t7,-0x6008($t7) +/* f017100: 3c0f800a */ lui $t7,%hi(g_Vars+0x38) +/* 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 @@ -3249,8 +3249,8 @@ glabel var7f1a8470 /* f018e58: 00002025 */ or $a0,$zero,$zero /* f018e5c: 3c028006 */ lui $v0,%hi(var800624c4) /* f018e60: 244224c4 */ addiu $v0,$v0,%lo(var800624c4) -/* f018e64: 3c0f800a */ lui $t7,0x800a -/* f018e68: 8def9ff8 */ lw $t7,-0x6008($t7) +/* f018e64: 3c0f800a */ lui $t7,%hi(g_Vars+0x38) +/* f018e68: 8def9ff8 */ lw $t7,%lo(g_Vars+0x38)($t7) /* f018e6c: 8c4e0000 */ lw $t6,0x0($v0) /* f018e70: 00002025 */ or $a0,$zero,$zero /* f018e74: 01cfc021 */ addu $t8,$t6,$t7 @@ -3742,8 +3742,8 @@ glabel var7f1a8478 /* f01954c: 3c038006 */ lui $v1,%hi(var800624c4) /* f019550: 246324c4 */ addiu $v1,$v1,%lo(var800624c4) /* f019554: 3c068006 */ lui $a2,%hi(var800624ac) -/* f019558: 3c02800a */ lui $v0,0x800a -/* f01955c: 8c429ff8 */ lw $v0,-0x6008($v0) +/* f019558: 3c02800a */ lui $v0,%hi(g_Vars+0x38) +/* f01955c: 8c429ff8 */ lw $v0,%lo(g_Vars+0x38)($v0) /* f019560: 8c6e0000 */ lw $t6,0x0($v1) /* f019564: 24c624ac */ addiu $a2,$a2,%lo(var800624ac) /* f019568: 8cd80000 */ lw $t8,0x0($a2) @@ -4238,8 +4238,8 @@ glabel var7f1a84a8 /* f019c18: 250824c4 */ addiu $t0,$t0,%lo(var800624c4) /* f019c1c: 8d020000 */ lw $v0,0x0($t0) .L0f019c20: -/* f019c20: 3c0f800a */ lui $t7,0x800a -/* f019c24: 8def9ff8 */ lw $t7,-0x6008($t7) +/* f019c20: 3c0f800a */ lui $t7,%hi(g_Vars+0x38) +/* f019c24: 8def9ff8 */ lw $t7,%lo(g_Vars+0x38)($t7) /* f019c28: 00002025 */ or $a0,$zero,$zero /* f019c2c: 3405ffff */ dli $a1,0xffff /* f019c30: 004fc021 */ addu $t8,$v0,$t7 @@ -4758,27 +4758,27 @@ void setNumPlayers(s32 numplayers) GLOBAL_ASM( glabel func0f01a360 /* f01a360: 000471c0 */ sll $t6,$a0,0x7 -/* f01a364: 3c0f800a */ lui $t7,0x800a +/* f01a364: 3c0f800a */ lui $t7,%hi(g_Vars+0xe4) /* f01a368: 01ee7821 */ addu $t7,$t7,$t6 -/* f01a36c: 8defa0a4 */ lw $t7,-0x5f5c($t7) -/* f01a370: 3c02800b */ lui $v0,0x800b +/* f01a36c: 8defa0a4 */ lw $t7,%lo(g_Vars+0xe4)($t7) +/* f01a370: 3c02800b */ lui $v0,%hi(g_MpPlayers+0x11) /* f01a374: 000fc080 */ sll $t8,$t7,0x2 /* f01a378: 030fc021 */ addu $t8,$t8,$t7 /* f01a37c: 0018c140 */ sll $t8,$t8,0x5 /* f01a380: 00581021 */ addu $v0,$v0,$t8 /* f01a384: 03e00008 */ jr $ra -/* f01a388: 9042c7c9 */ lbu $v0,-0x3837($v0) +/* f01a388: 9042c7c9 */ lbu $v0,%lo(g_MpPlayers+0x11)($v0) /* f01a38c: 000471c0 */ sll $t6,$a0,0x7 -/* f01a390: 3c0f800a */ lui $t7,0x800a +/* f01a390: 3c0f800a */ lui $t7,%hi(g_Vars+0xe4) /* f01a394: 01ee7821 */ addu $t7,$t7,$t6 -/* f01a398: 8defa0a4 */ lw $t7,-0x5f5c($t7) -/* f01a39c: 3c01800b */ lui $at,0x800b +/* f01a398: 8defa0a4 */ lw $t7,%lo(g_Vars+0xe4)($t7) +/* f01a39c: 3c01800b */ lui $at,%hi(g_MpPlayers+0x11) /* f01a3a0: 000fc080 */ sll $t8,$t7,0x2 /* f01a3a4: 030fc021 */ addu $t8,$t8,$t7 /* f01a3a8: 0018c140 */ sll $t8,$t8,0x5 /* f01a3ac: 00380821 */ addu $at,$at,$t8 /* f01a3b0: 03e00008 */ jr $ra -/* f01a3b4: a025c7c9 */ sb $a1,-0x3837($at) +/* f01a3b4: a025c7c9 */ sb $a1,%lo(g_MpPlayers+0x11)($at) ); GLOBAL_ASM( @@ -4884,8 +4884,8 @@ glabel var7f1a84c8 /* f01a4e4: 00002025 */ or $a0,$zero,$zero /* f01a4e8: 3c028006 */ lui $v0,%hi(var800624c4) /* f01a4ec: 244224c4 */ addiu $v0,$v0,%lo(var800624c4) -/* f01a4f0: 3c0f800a */ lui $t7,0x800a -/* f01a4f4: 8def9ff8 */ lw $t7,-0x6008($t7) +/* f01a4f0: 3c0f800a */ lui $t7,%hi(g_Vars+0x38) +/* f01a4f4: 8def9ff8 */ lw $t7,%lo(g_Vars+0x38)($t7) /* f01a4f8: 8c4e0000 */ lw $t6,0x0($v0) /* f01a4fc: 8fbf0014 */ lw $ra,0x14($sp) /* f01a500: 27bd0018 */ addiu $sp,$sp,0x18 diff --git a/src/game/game_01b0a0.c b/src/game/game_01b0a0.c index 1cb3cc23b..de791ebff 100644 --- a/src/game/game_01b0a0.c +++ b/src/game/game_01b0a0.c @@ -157,17 +157,17 @@ glabel func0f01b160 /* f01b224: 3c07800a */ lui $a3,%hi(g_Vars) /* f01b228: 24e79fc0 */ addiu $a3,$a3,%lo(g_Vars) /* f01b22c: 8cec028c */ lw $t4,0x28c($a3) -/* f01b230: 3c01800a */ lui $at,0x800a +/* f01b230: 3c01800a */ lui $at,%hi(g_ActiveMenuIndex) /* f01b234: 3c0d800a */ lui $t5,%hi(g_ActiveMenuIndex) -/* f01b238: ac2c21b8 */ sw $t4,0x21b8($at) +/* f01b238: ac2c21b8 */ sw $t4,%lo(g_ActiveMenuIndex)($at) /* f01b23c: 8dad21b8 */ lw $t5,%lo(g_ActiveMenuIndex)($t5) -/* f01b240: 3c0f800a */ lui $t7,0x800a +/* f01b240: 3c0f800a */ lui $t7,%hi(g_ActiveMenuThings+0x30) /* f01b244: 2404003c */ addiu $a0,$zero,0x3c /* f01b248: 000d70c0 */ sll $t6,$t5,0x3 /* f01b24c: 01cd7023 */ subu $t6,$t6,$t5 /* f01b250: 000e70c0 */ sll $t6,$t6,0x3 /* f01b254: 01ee7821 */ addu $t7,$t7,$t6 -/* f01b258: 91ef2100 */ lbu $t7,0x2100($t7) +/* f01b258: 91ef2100 */ lbu $t7,%lo(g_ActiveMenuThings+0x30)($t7) /* f01b25c: 00002825 */ or $a1,$zero,$zero /* f01b260: 51e0000f */ beqzl $t7,.L0f01b2a0 /* f01b264: 8ce80318 */ lw $t0,0x318($a3) @@ -177,12 +177,12 @@ glabel func0f01b160 /* f01b274: 3c07800a */ lui $a3,%hi(g_Vars) /* f01b278: 3c18800a */ lui $t8,%hi(g_ActiveMenuIndex) /* f01b27c: 8f1821b8 */ lw $t8,%lo(g_ActiveMenuIndex)($t8) -/* f01b280: 3c01800a */ lui $at,0x800a +/* f01b280: 3c01800a */ lui $at,%hi(g_ActiveMenuThings+0x30) /* f01b284: 0018c8c0 */ sll $t9,$t8,0x3 /* f01b288: 0338c823 */ subu $t9,$t9,$t8 /* f01b28c: 0019c8c0 */ sll $t9,$t9,0x3 /* f01b290: 00390821 */ addu $at,$at,$t9 -/* f01b294: a0202100 */ sb $zero,0x2100($at) +/* f01b294: a0202100 */ sb $zero,%lo(g_ActiveMenuThings+0x30)($at) .L0f01b298: /* f01b298: 24e79fc0 */ addiu $a3,$a3,%lo(g_Vars) /* f01b29c: 8ce80318 */ lw $t0,0x318($a3) @@ -193,12 +193,12 @@ glabel func0f01b160 /* f01b2ac: 00000000 */ sll $zero,$zero,0x0 /* f01b2b0: 3c09800a */ lui $t1,%hi(g_ActiveMenuIndex) /* f01b2b4: 8d2921b8 */ lw $t1,%lo(g_ActiveMenuIndex)($t1) -/* f01b2b8: 3c0b800a */ lui $t3,0x800a +/* f01b2b8: 3c0b800a */ lui $t3,%hi(g_ActiveMenuThings+0x31) /* f01b2bc: 000950c0 */ sll $t2,$t1,0x3 /* f01b2c0: 01495023 */ subu $t2,$t2,$t1 /* f01b2c4: 000a50c0 */ sll $t2,$t2,0x3 /* f01b2c8: 016a5821 */ addu $t3,$t3,$t2 -/* f01b2cc: 916b2101 */ lbu $t3,0x2101($t3) +/* f01b2cc: 916b2101 */ lbu $t3,%lo(g_ActiveMenuThings+0x31)($t3) /* f01b2d0: 104b0003 */ beq $v0,$t3,.L0f01b2e0 /* f01b2d4: 00000000 */ sll $zero,$zero,0x0 /* f01b2d8: 0fc3fb35 */ jal func0f0fecd4 @@ -214,8 +214,8 @@ glabel func0f01b160 /* f01b2fc: 0000f025 */ or $s8,$zero,$zero /* f01b300: 0fc549c4 */ jal optionsGetControlMode /* f01b304: 8dc40070 */ lw $a0,0x70($t6) -/* f01b308: 3c0f800a */ lui $t7,0x800a -/* f01b30c: 8defa248 */ lw $t7,-0x5db8($t7) +/* f01b308: 3c0f800a */ lui $t7,%hi(g_Vars+0x288) +/* f01b30c: 8defa248 */ lw $t7,%lo(g_Vars+0x288)($t7) /* f01b310: afa200d4 */ sw $v0,0xd4($sp) /* f01b314: 0fc549d2 */ jal optionsGetUnk45 /* f01b318: 8de40070 */ lw $a0,0x70($t7) @@ -260,8 +260,8 @@ glabel func0f01b160 /* f01b3b0: 000948c0 */ sll $t1,$t1,0x3 /* f01b3b4: 012a8021 */ addu $s0,$t1,$t2 /* f01b3b8: a2000032 */ sb $zero,0x32($s0) -/* f01b3bc: 3c0b800a */ lui $t3,0x800a -/* f01b3c0: 8d6ba244 */ lw $t3,-0x5dbc($t3) +/* f01b3bc: 3c0b800a */ lui $t3,%hi(g_Vars+0x284) +/* f01b3c0: 8d6ba244 */ lw $t3,%lo(g_Vars+0x284)($t3) /* f01b3c4: a7a200be */ sh $v0,0xbe($sp) /* f01b3c8: 24010002 */ addiu $at,$zero,0x2 /* f01b3cc: 916c0250 */ lbu $t4,0x250($t3) @@ -378,7 +378,7 @@ glabel func0f01b160 .L0f01b544: /* f01b544: 24010006 */ addiu $at,$zero,0x6 /* f01b548: 11210008 */ beq $t1,$at,.L0f01b56c -/* f01b54c: 3c0a800a */ lui $t2,0x800a +/* f01b54c: 3c0a800a */ lui $t2,%hi(g_Vars+0x288) /* f01b550: 24010007 */ addiu $at,$zero,0x7 /* f01b554: 11210005 */ beq $t1,$at,.L0f01b56c /* f01b558: 24010005 */ addiu $at,$zero,0x5 @@ -387,7 +387,7 @@ glabel func0f01b160 /* f01b564: 15210089 */ bne $t1,$at,.L0f01b78c /* f01b568: 00000000 */ sll $zero,$zero,0x0 .L0f01b56c: -/* f01b56c: 8d4aa248 */ lw $t2,-0x5db8($t2) +/* f01b56c: 8d4aa248 */ lw $t2,%lo(g_Vars+0x288)($t2) /* f01b570: 0fc549d9 */ jal optionsGetUnk46 /* f01b574: 8d440070 */ lw $a0,0x70($t2) /* f01b578: 00028600 */ sll $s0,$v0,0x18 @@ -422,8 +422,8 @@ glabel func0f01b160 /* f01b5ec: 03c02025 */ or $a0,$s8,$zero /* f01b5f0: 0c0052d4 */ jal func00014b50 /* f01b5f4: 3406ffff */ dli $a2,0xffff -/* f01b5f8: 3c08800a */ lui $t0,0x800a -/* f01b5fc: 8d08a244 */ lw $t0,-0x5dbc($t0) +/* f01b5f8: 3c08800a */ lui $t0,%hi(g_Vars+0x284) +/* f01b5fc: 8d08a244 */ lw $t0,%lo(g_Vars+0x284)($t0) /* f01b600: 24010002 */ addiu $at,$zero,0x2 /* f01b604: 3043ffff */ andi $v1,$v0,0xffff /* f01b608: 91090250 */ lbu $t1,0x250($t0) @@ -546,9 +546,9 @@ glabel func0f01b160 .L0f01b788: /* f01b788: afaa00b8 */ sw $t2,0xb8($sp) .L0f01b78c: -/* f01b78c: 3c04800a */ lui $a0,0x800a +/* f01b78c: 3c04800a */ lui $a0,%hi(g_Vars+0x284) /* f01b790: 06c10005 */ bgez $s6,.L0f01b7a8 -/* f01b794: 8c84a244 */ lw $a0,-0x5dbc($a0) +/* f01b794: 8c84a244 */ lw $a0,%lo(g_Vars+0x284)($a0) /* f01b798: 00161823 */ negu $v1,$s6 /* f01b79c: 00035e00 */ sll $t3,$v1,0x18 /* f01b7a0: 10000004 */ beqz $zero,.L0f01b7b4 @@ -570,7 +570,7 @@ glabel func0f01b160 /* f01b7d4: 03001025 */ or $v0,$t8,$zero .L0f01b7d8: /* f01b7d8: 10200004 */ beqz $at,.L0f01b7ec -/* f01b7dc: 3c09800a */ lui $t1,0x800a +/* f01b7dc: 3c09800a */ lui $t1,%hi(g_Vars+0x34) /* f01b7e0: 28410015 */ slti $at,$v0,0x15 /* f01b7e4: 54200026 */ bnezl $at,.L0f01b880 /* f01b7e8: 8c8800d8 */ lw $t0,0xd8($a0) @@ -624,7 +624,7 @@ glabel func0f01b160 /* f01b888: 00000000 */ sll $zero,$zero,0x0 /* f01b88c: afa000b0 */ sw $zero,0xb0($sp) .L0f01b890: -/* f01b890: 8d299ff4 */ lw $t1,-0x600c($t1) +/* f01b890: 8d299ff4 */ lw $t1,%lo(g_Vars+0x34)($t1) /* f01b894: 55200003 */ bnezl $t1,.L0f01b8a4 /* f01b898: 8faa00b0 */ lw $t2,0xb0($sp) /* f01b89c: afa000b0 */ sw $zero,0xb0($sp) @@ -638,7 +638,7 @@ glabel func0f01b160 /* f01b8b8: 1561000e */ bne $t3,$at,.L0f01b8f4 /* f01b8bc: 00000000 */ sll $zero,$zero,0x0 /* f01b8c0: 8d8c1448 */ lw $t4,%lo(g_MpPlayerNum)($t4) -/* f01b8c4: 3c0e800a */ lui $t6,%hi(g_MenuStack) +/* f01b8c4: 3c0e800a */ lui $t6,%hi(g_MenuStack+0x4f8) /* f01b8c8: 000c68c0 */ sll $t5,$t4,0x3 /* f01b8cc: 01ac6823 */ subu $t5,$t5,$t4 /* f01b8d0: 000d6880 */ sll $t5,$t5,0x2 @@ -647,7 +647,7 @@ glabel func0f01b160 /* f01b8dc: 01ac6823 */ subu $t5,$t5,$t4 /* f01b8e0: 000d6900 */ sll $t5,$t5,0x4 /* f01b8e4: 01cd7021 */ addu $t6,$t6,$t5 -/* f01b8e8: 8dcee4f8 */ lw $t6,%lo(g_MenuStack)($t6) +/* f01b8e8: 8dcee4f8 */ lw $t6,%lo(g_MenuStack+0x4f8)($t6) /* f01b8ec: 15c00005 */ bnez $t6,.L0f01b904 /* f01b8f0: 00000000 */ sll $zero,$zero,0x0 .L0f01b8f4: @@ -672,15 +672,15 @@ glabel func0f01b160 /* f01b934: 000a50c0 */ sll $t2,$t2,0x3 /* f01b938: 014b8021 */ addu $s0,$t2,$t3 /* f01b93c: 820c0000 */ lb $t4,0x0($s0) -/* f01b940: 3c0d800a */ lui $t5,0x800a +/* f01b940: 3c0d800a */ lui $t5,%hi(g_Vars+0x474) /* f01b944: 29810002 */ slti $at,$t4,0x2 /* f01b948: 54200032 */ bnezl $at,.L0f01ba14 /* f01b94c: 9204000e */ lbu $a0,0xe($s0) -/* f01b950: 8dada434 */ lw $t5,-0x5bcc($t5) -/* f01b954: 3c0e800a */ lui $t6,0x800a +/* f01b950: 8dada434 */ lw $t5,%lo(g_Vars+0x474)($t5) +/* f01b954: 3c0e800a */ lui $t6,%hi(g_MissionConfig+0x3) /* f01b958: 51a00010 */ beqzl $t5,.L0f01b99c /* f01b95c: 9202000e */ lbu $v0,0xe($s0) -/* f01b960: 81cfdfeb */ lb $t7,-0x2015($t6) +/* f01b960: 81cfdfeb */ lb $t7,%lo(g_MissionConfig+0x3)($t6) /* f01b964: 05e3000d */ bgezl $t7,.L0f01b99c /* f01b968: 9202000e */ lbu $v0,0xe($s0) /* f01b96c: 9204000e */ lbu $a0,0xe($s0) @@ -707,13 +707,13 @@ glabel func0f01b160 /* f01b9b8: 00000000 */ sll $zero,$zero,0x0 /* f01b9bc: 3c08800a */ lui $t0,%hi(g_ActiveMenuIndex) /* f01b9c0: 8d0821b8 */ lw $t0,%lo(g_ActiveMenuIndex)($t0) -/* f01b9c4: 3c02800a */ lui $v0,0x800a +/* f01b9c4: 3c02800a */ lui $v0,%hi(g_ActiveMenuThings+0xe) /* f01b9c8: 000848c0 */ sll $t1,$t0,0x3 /* f01b9cc: 01284823 */ subu $t1,$t1,$t0 /* f01b9d0: 000948c0 */ sll $t1,$t1,0x3 /* f01b9d4: 00491021 */ addu $v0,$v0,$t1 /* f01b9d8: 10000006 */ beqz $zero,.L0f01b9f4 -/* f01b9dc: 904220de */ lbu $v0,0x20de($v0) +/* f01b9dc: 904220de */ lbu $v0,%lo(g_ActiveMenuThings+0xe)($v0) /* f01b9e0: 920a0032 */ lbu $t2,0x32($s0) .L0f01b9e4: /* f01b9e4: 240b0001 */ addiu $t3,$zero,0x1 @@ -756,19 +756,19 @@ glabel func0f01b160 /* f01ba60: 000f78c0 */ sll $t7,$t7,0x3 /* f01ba64: 030fc021 */ addu $t8,$t8,$t7 /* f01ba68: 831820d0 */ lb $t8,%lo(g_ActiveMenuThings)($t8) -/* f01ba6c: 3c04800a */ lui $a0,%hi(var800a0638) +/* f01ba6c: 3c04800a */ lui $a0,%hi(g_Vars+0x284) /* f01ba70: 17010011 */ bne $t8,$at,.L0f01bab8 /* f01ba74: 00000000 */ sll $zero,$zero,0x0 -/* f01ba78: 8c84a244 */ lw $a0,-0x5dbc($a0) +/* f01ba78: 8c84a244 */ lw $a0,%lo(g_Vars+0x284)($a0) /* f01ba7c: 00002825 */ or $a1,$zero,$zero /* f01ba80: 0fc2c42e */ jal weaponGetFunction -/* f01ba84: 24840638 */ addiu $a0,$a0,%lo(var800a0638) -/* f01ba88: 3c04800a */ lui $a0,%hi(var800a0638) -/* f01ba8c: 8c84a244 */ lw $a0,-0x5dbc($a0) +/* f01ba84: 24840638 */ addiu $a0,$a0,1592 +/* f01ba88: 3c04800a */ lui $a0,%hi(g_Vars+0x284) +/* f01ba8c: 8c84a244 */ lw $a0,%lo(g_Vars+0x284)($a0) /* f01ba90: 00408025 */ or $s0,$v0,$zero /* f01ba94: 24050001 */ addiu $a1,$zero,0x1 /* f01ba98: 0fc2c42e */ jal weaponGetFunction -/* f01ba9c: 24840638 */ addiu $a0,$a0,%lo(var800a0638) +/* f01ba9c: 24840638 */ addiu $a0,$a0,1592 /* f01baa0: 16000005 */ bnez $s0,.L0f01bab8 /* f01baa4: 00000000 */ sll $zero,$zero,0x0 /* f01baa8: 14400003 */ bnez $v0,.L0f01bab8 @@ -776,8 +776,8 @@ glabel func0f01b160 /* f01bab0: 0fc3fade */ jal activemenuChangeScreen /* f01bab4: 83a400c7 */ lb $a0,0xc7($sp) .L0f01bab8: -/* f01bab8: 3c19800a */ lui $t9,0x800a -/* f01babc: 8f39a244 */ lw $t9,-0x5dbc($t9) +/* f01bab8: 3c19800a */ lui $t9,%hi(g_Vars+0x284) +/* f01babc: 8f39a244 */ lw $t9,%lo(g_Vars+0x284)($t9) /* f01bac0: 00144880 */ sll $t1,$s4,0x2 /* f01bac4: 24010002 */ addiu $at,$zero,0x2 /* f01bac8: 93280250 */ lbu $t0,0x250($t9) @@ -1002,28 +1002,28 @@ glabel func0f01b160 /* f01bde0: 8ce9006c */ lw $t1,0x6c($a3) .L0f01bde4: /* f01bde4: 8fa600d8 */ lw $a2,0xd8($sp) -/* f01bde8: 3c0b800a */ lui $t3,0x800a +/* f01bde8: 3c0b800a */ lui $t3,%hi(g_Vars+0x64) /* f01bdec: 11200003 */ beqz $t1,.L0f01bdfc /* f01bdf0: 24c60001 */ addiu $a2,$a2,0x1 /* f01bdf4: 10000001 */ beqz $zero,.L0f01bdfc /* f01bdf8: 24050001 */ addiu $a1,$zero,0x1 .L0f01bdfc: /* f01bdfc: 8cea0068 */ lw $t2,0x68($a3) -/* f01be00: 3c0c800a */ lui $t4,0x800a +/* f01be00: 3c0c800a */ lui $t4,%hi(g_Vars+0x70) /* f01be04: 00002025 */ or $a0,$zero,$zero /* f01be08: 11400003 */ beqz $t2,.L0f01be18 /* f01be0c: 00001825 */ or $v1,$zero,$zero /* f01be10: 10000001 */ beqz $zero,.L0f01be18 /* f01be14: 24040001 */ addiu $a0,$zero,0x1 .L0f01be18: -/* f01be18: 8d6ba024 */ lw $t3,-0x5fdc($t3) +/* f01be18: 8d6ba024 */ lw $t3,%lo(g_Vars+0x64)($t3) /* f01be1c: 00001025 */ or $v0,$zero,$zero /* f01be20: 11600003 */ beqz $t3,.L0f01be30 /* f01be24: 00000000 */ sll $zero,$zero,0x0 /* f01be28: 10000001 */ beqz $zero,.L0f01be30 /* f01be2c: 24030001 */ addiu $v1,$zero,0x1 .L0f01be30: -/* f01be30: 8d8ca030 */ lw $t4,-0x5fd0($t4) +/* f01be30: 8d8ca030 */ lw $t4,%lo(g_Vars+0x70)($t4) /* f01be34: 11800003 */ beqz $t4,.L0f01be44 /* f01be38: 00000000 */ sll $zero,$zero,0x0 /* f01be3c: 10000001 */ beqz $zero,.L0f01be44 diff --git a/src/game/game_01bea0.c b/src/game/game_01bea0.c index f909364dc..30061e7aa 100644 --- a/src/game/game_01bea0.c +++ b/src/game/game_01bea0.c @@ -65,11 +65,11 @@ GLOBAL_ASM( glabel func0f01bee0 /* f01bee0: 3c04800a */ lui $a0,%hi(var800a19c0) /* f01bee4: 248419c0 */ addiu $a0,$a0,%lo(var800a19c0) -/* f01bee8: 3c03800a */ lui $v1,%hi(var8009e000) +/* f01bee8: 3c03800a */ lui $v1,0x800a /* f01beec: 3c02800a */ lui $v0,%hi(var800a19c0) /* f01bef0: ac800000 */ sw $zero,0x0($a0) /* f01bef4: 244219c0 */ addiu $v0,$v0,%lo(var800a19c0) -/* f01bef8: 2463e000 */ addiu $v1,$v1,%lo(var8009e000) +/* f01bef8: 2463e000 */ addiu $v1,$v1,-8192 /* f01befc: 8c6e04f8 */ lw $t6,0x4f8($v1) .L0f01bf00: /* f01bf00: 24630e70 */ addiu $v1,$v1,0xe70 @@ -145,10 +145,10 @@ glabel var7f1a863c /* f01bf84: 3c15800a */ lui $s5,%hi(var800a19c0) /* f01bf88: 0fc06fb8 */ jal func0f01bee0 /* f01bf8c: 26b519c0 */ addiu $s5,$s5,%lo(var800a19c0) -/* f01bf90: 3c03800a */ lui $v1,%hi(var8009e000) +/* f01bf90: 3c03800a */ lui $v1,0x800a /* f01bf94: 3c05800a */ lui $a1,%hi(var800a19c0) /* f01bf98: 24a519c0 */ addiu $a1,$a1,%lo(var800a19c0) -/* f01bf9c: 2463e000 */ addiu $v1,$v1,%lo(var8009e000) +/* f01bf9c: 2463e000 */ addiu $v1,$v1,-8192 /* f01bfa0: 9062083c */ lbu $v0,0x83c($v1) .L0f01bfa4: /* f01bfa4: 18400002 */ blez $v0,.L0f01bfb0 @@ -185,10 +185,10 @@ glabel var7f1a863c /* f01c014: 24070032 */ addiu $a3,$zero,0x32 /* f01c018: 00003025 */ or $a2,$zero,$zero /* f01c01c: 11e00024 */ beqz $t7,.L0f01c0b0 -/* f01c020: 3c04800a */ lui $a0,%hi(var8009e000) +/* f01c020: 3c04800a */ lui $a0,0x800a /* f01c024: 3c05800a */ lui $a1,%hi(var800a19c0) /* f01c028: 24a519c0 */ addiu $a1,$a1,%lo(var800a19c0) -/* f01c02c: 2484e000 */ addiu $a0,$a0,%lo(var8009e000) +/* f01c02c: 2484e000 */ addiu $a0,$a0,-8192 /* f01c030: 24090002 */ addiu $t1,$zero,0x2 /* f01c034: 8c8304f8 */ lw $v1,0x4f8($a0) .L0f01c038: @@ -405,8 +405,8 @@ glabel var7f1a863c /* f01c30c: ae6e0490 */ sw $t6,0x490($s3) .L0f01c310: /* f01c310: 3c08800a */ lui $t0,%hi(g_Vars) -/* f01c314: 3c03800b */ lui $v1,0x800b -/* f01c318: 9463cb9e */ lhu $v1,-0x3462($v1) +/* f01c314: 3c03800b */ lui $v1,%hi(g_MpSetup+0x16) +/* f01c318: 9463cb9e */ lhu $v1,%lo(g_MpSetup+0x16)($v1) /* f01c31c: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) /* f01c320: 00008825 */ or $s1,$zero,$zero .L0f01c324: @@ -425,8 +425,8 @@ glabel var7f1a863c /* f01c354: ae8e0000 */ sw $t6,0x0($s4) /* f01c358: 0fc5ff2c */ jal func0f17fcb0 /* f01c35c: afa80058 */ sw $t0,0x58($sp) -/* f01c360: 3c03800b */ lui $v1,0x800b -/* f01c364: 9463cb9e */ lhu $v1,-0x3462($v1) +/* f01c360: 3c03800b */ lui $v1,%hi(g_MpSetup+0x16) +/* f01c364: 9463cb9e */ lhu $v1,%lo(g_MpSetup+0x16)($v1) /* f01c368: 10000018 */ beqz $zero,.L0f01c3cc /* f01c36c: 8fa80058 */ lw $t0,0x58($sp) .L0f01c370: @@ -451,9 +451,9 @@ glabel var7f1a863c /* f01c3b4: afa80058 */ sw $t0,0x58($sp) /* f01c3b8: 8fa80058 */ lw $t0,0x58($sp) .L0f01c3bc: -/* f01c3bc: 3c03800b */ lui $v1,0x800b +/* f01c3bc: 3c03800b */ lui $v1,%hi(g_MpSetup+0x16) /* f01c3c0: 10000002 */ beqz $zero,.L0f01c3cc -/* f01c3c4: 9463cb9e */ lhu $v1,-0x3462($v1) +/* f01c3c4: 9463cb9e */ lhu $v1,%lo(g_MpSetup+0x16)($v1) .L0f01c3c8: /* f01c3c8: a1160494 */ sb $s6,0x494($t0) .L0f01c3cc: @@ -480,8 +480,8 @@ glabel var7f1a863c /* f01c41c: 2407ffff */ addiu $a3,$zero,-1 /* f01c420: 0c004241 */ jal func00010904 /* f01c424: e7b00014 */ swc1 $f16,0x14($sp) -/* f01c428: 3c188009 */ lui $t8,%hi(var8009000c) -/* f01c42c: 93180af0 */ lbu $t8,0xaf0($t8) +/* f01c428: 3c188009 */ lui $t8,%hi(g_Is4Mb) +/* f01c42c: 93180af0 */ lbu $t8,%lo(g_Is4Mb)($t8) /* f01c430: 24040003 */ addiu $a0,$zero,0x3 /* f01c434: 16d80003 */ bne $s6,$t8,.L0f01c444 /* f01c438: 00000000 */ sll $zero,$zero,0x0 @@ -517,9 +517,9 @@ glabel var7f1a863c /* f01c4a0: 8ead0000 */ lw $t5,0x0($s5) /* f01c4a4: 8e6f02ac */ lw $t7,0x2ac($s3) /* f01c4a8: 24010006 */ addiu $at,$zero,0x6 -/* f01c4ac: 3c02800a */ lui $v0,%hi(var8009e000) +/* f01c4ac: 3c02800a */ lui $v0,0x800a /* f01c4b0: 11e1000c */ beq $t7,$at,.L0f01c4e4 -/* f01c4b4: 2442e000 */ addiu $v0,$v0,%lo(var8009e000) +/* f01c4b4: 2442e000 */ addiu $v0,$v0,-8192 /* f01c4b8: 8e780284 */ lw $t8,0x284($s3) /* f01c4bc: a040083c */ sb $zero,0x83c($v0) /* f01c4c0: a04016ac */ sb $zero,0x16ac($v0) @@ -551,7 +551,7 @@ glabel var7f1a863c /* f01c51c: 2406ffff */ addiu $a2,$zero,-1 /* f01c520: ae800000 */ sw $zero,0x0($s4) /* f01c524: 14c50006 */ bne $a2,$a1,.L0f01c540 -/* f01c528: 3c03800a */ lui $v1,%hi(var8009e000) +/* f01c528: 3c03800a */ lui $v1,0x800a /* f01c52c: 3c04800b */ lui $a0,%hi(g_MpSetup) /* f01c530: 2484cb88 */ addiu $a0,$a0,%lo(g_MpSetup) /* f01c534: 948f0016 */ lhu $t7,0x16($a0) @@ -560,7 +560,7 @@ glabel var7f1a863c .L0f01c540: /* f01c540: 3c04800b */ lui $a0,%hi(g_MpSetup) /* f01c544: 2484cb88 */ addiu $a0,$a0,%lo(g_MpSetup) -/* f01c548: 2463e000 */ addiu $v1,$v1,%lo(var8009e000) +/* f01c548: 2463e000 */ addiu $v1,$v1,-8192 .L0f01c54c: /* f01c54c: 8c7904f8 */ lw $t9,0x4f8($v1) /* f01c550: 24010004 */ addiu $at,$zero,0x4 @@ -587,10 +587,10 @@ glabel var7f1a863c /* f01c59c: 00000000 */ sll $zero,$zero,0x0 .L0f01c5a0: /* f01c5a0: 3c068007 */ lui $a2,%hi(g_MpPlayerNum) -/* f01c5a4: 3c05800a */ lui $a1,%hi(var8009e000) +/* f01c5a4: 3c05800a */ lui $a1,0x800a /* f01c5a8: 3c038008 */ lui $v1,%hi(g_MpReadyMenuDialog) /* f01c5ac: 246357b8 */ addiu $v1,$v1,%lo(g_MpReadyMenuDialog) -/* f01c5b0: 24a5e000 */ addiu $a1,$a1,%lo(var8009e000) +/* f01c5b0: 24a5e000 */ addiu $a1,$a1,-8192 /* f01c5b4: 24c61448 */ addiu $a2,$a2,%lo(g_MpPlayerNum) /* f01c5b8: 00008825 */ or $s1,$zero,$zero /* f01c5bc: 24040e70 */ addiu $a0,$zero,0xe70 @@ -613,8 +613,8 @@ glabel var7f1a863c .L0f01c5fc: /* f01c5fc: 1420fff0 */ bnez $at,.L0f01c5c0 /* f01c600: 00000000 */ sll $zero,$zero,0x0 -/* f01c604: 3c12800a */ lui $s2,0x800a -/* f01c608: 26529fc4 */ addiu $s2,$s2,-24636 +/* f01c604: 3c12800a */ lui $s2,%hi(g_Vars+0x4) +/* f01c608: 26529fc4 */ addiu $s2,$s2,%lo(g_Vars+0x4) /* f01c60c: 00008825 */ or $s1,$zero,$zero .L0f01c610: /* f01c610: 001168c0 */ sll $t5,$s1,0x3 @@ -623,8 +623,8 @@ glabel var7f1a863c /* f01c61c: 01b16821 */ addu $t5,$t5,$s1 /* f01c620: 000d68c0 */ sll $t5,$t5,0x3 /* f01c624: 01b16823 */ subu $t5,$t5,$s1 -/* f01c628: 3c0f800a */ lui $t7,%hi(var8009e000) -/* f01c62c: 25efe000 */ addiu $t7,$t7,%lo(var8009e000) +/* f01c628: 3c0f800a */ lui $t7,0x800a +/* f01c62c: 25efe000 */ addiu $t7,$t7,-8192 /* f01c630: 000d6900 */ sll $t5,$t5,0x4 /* f01c634: 01af1821 */ addu $v1,$t5,$t7 /* f01c638: 8c6e04f8 */ lw $t6,0x4f8($v1) @@ -691,7 +691,7 @@ glabel var7f1a863c /* f01c70c: 2401000b */ addiu $at,$zero,0xb /* f01c710: 3050ffff */ andi $s0,$v0,0xffff /* f01c714: 17010014 */ bne $t8,$at,.L0f01c768 -/* f01c718: 3c0e800b */ lui $t6,0x800b +/* f01c718: 3c0e800b */ lui $t6,%hi(g_MpSetup+0x88) /* f01c71c: 8e790490 */ lw $t9,0x490($s3) /* f01c720: 24010002 */ addiu $at,$zero,0x2 /* f01c724: 02c02025 */ or $a0,$s6,$zero @@ -717,15 +717,15 @@ glabel var7f1a863c .L0f01c768: /* f01c768: 02c02025 */ or $a0,$s6,$zero .L0f01c76c: -/* f01c76c: 91cecc10 */ lbu $t6,-0x33f0($t6) +/* f01c76c: 91cecc10 */ lbu $t6,%lo(g_MpSetup+0x88)($t6) /* f01c770: 24010005 */ addiu $at,$zero,0x5 /* f01c774: 0011c080 */ sll $t8,$s1,0x2 /* f01c778: 15c10005 */ bne $t6,$at,.L0f01c790 /* f01c77c: 0311c021 */ addu $t8,$t8,$s1 /* f01c780: 0018c140 */ sll $t8,$t8,0x5 -/* f01c784: 3c01800b */ lui $at,0x800b +/* f01c784: 3c01800b */ lui $at,%hi(g_MpPlayers+0x11) /* f01c788: 00380821 */ addu $at,$at,$t8 -/* f01c78c: a020c7c9 */ sb $zero,-0x3837($at) +/* f01c78c: a020c7c9 */ sb $zero,%lo(g_MpPlayers+0x11)($at) .L0f01c790: /* f01c790: 1080003b */ beqz $a0,.L0f01c880 /* f01c794: 30591000 */ andi $t9,$v0,0x1000 @@ -734,9 +734,9 @@ glabel var7f1a863c /* f01c7a0: 00117880 */ sll $t7,$s1,0x2 /* f01c7a4: 01f17821 */ addu $t7,$t7,$s1 /* f01c7a8: 000f7940 */ sll $t7,$t7,0x5 -/* f01c7ac: 3c01800b */ lui $at,0x800b +/* f01c7ac: 3c01800b */ lui $at,%hi(g_MpPlayers+0x9d) /* f01c7b0: 002f0821 */ addu $at,$at,$t7 -/* f01c7b4: a02dc855 */ sb $t5,-0x37ab($at) +/* f01c7b4: a02dc855 */ sb $t5,%lo(g_MpPlayers+0x9d)($at) /* f01c7b8: 8e630490 */ lw $v1,0x490($s3) /* f01c7bc: 24010002 */ addiu $at,$zero,0x2 /* f01c7c0: 02714021 */ addu $t0,$s3,$s1 @@ -770,8 +770,8 @@ glabel var7f1a863c /* f01c828: 8e820000 */ lw $v0,0x0($s4) /* f01c82c: 244f0001 */ addiu $t7,$v0,0x1 /* f01c830: ae8f0000 */ sw $t7,0x0($s4) -/* f01c834: 3c0e8009 */ lui $t6,%hi(var8009000c) -/* f01c838: 91ce0af0 */ lbu $t6,0xaf0($t6) +/* f01c834: 3c0e8009 */ lui $t6,%hi(g_Is4Mb) +/* f01c838: 91ce0af0 */ lbu $t6,%lo(g_Is4Mb)($t6) /* f01c83c: 3c048008 */ lui $a0,%hi(g_MpQuickGoMenuDialog) /* f01c840: 2405000b */ addiu $a1,$zero,0xb /* f01c844: 16ce0006 */ bne $s6,$t6,.L0f01c860 @@ -815,10 +815,10 @@ glabel var7f1a863c /* f01c8c8: 00000000 */ sll $zero,$zero,0x0 /* f01c8cc: 8e990000 */ lw $t9,0x0($s4) /* f01c8d0: a1000494 */ sb $zero,0x494($t0) -/* f01c8d4: 3c0f8009 */ lui $t7,%hi(var8009000c) +/* f01c8d4: 3c0f8009 */ lui $t7,%hi(g_Is4Mb) /* f01c8d8: 272d0001 */ addiu $t5,$t9,0x1 /* f01c8dc: ae8d0000 */ sw $t5,0x0($s4) -/* f01c8e0: 91ef0af0 */ lbu $t7,0xaf0($t7) +/* f01c8e0: 91ef0af0 */ lbu $t7,%lo(g_Is4Mb)($t7) /* f01c8e4: 3c048008 */ lui $a0,%hi(g_MpQuickGoMenuDialog) /* f01c8e8: 2405000b */ addiu $a1,$zero,0xb /* f01c8ec: 16cf0006 */ bne $s6,$t7,.L0f01c908 @@ -854,9 +854,9 @@ glabel var7f1a863c /* f01c950: 00116880 */ sll $t5,$s1,0x2 /* f01c954: 01b16821 */ addu $t5,$t5,$s1 /* f01c958: 000d6940 */ sll $t5,$t5,0x5 -/* f01c95c: 3c04800b */ lui $a0,0x800b +/* f01c95c: 3c04800b */ lui $a0,%hi(g_MpPlayers+0x45) /* f01c960: 008d2021 */ addu $a0,$a0,$t5 -/* f01c964: 8084c7fd */ lb $a0,-0x3803($a0) +/* f01c964: 8084c7fd */ lb $a0,%lo(g_MpPlayers+0x45)($a0) /* f01c968: 0c005408 */ jal func00015020 /* f01c96c: 3405ffff */ dli $a1,0xffff /* f01c970: 304f4000 */ andi $t7,$v0,0x4000 @@ -1030,12 +1030,12 @@ glabel var7f1a863c /* f01cbbc: 00000000 */ sll $zero,$zero,0x0 .L0f01cbc0: /* f01cbc0: 3c018007 */ lui $at,0x8007 -/* f01cbc4: 3c03800a */ lui $v1,%hi(var8009e000) +/* f01cbc4: 3c03800a */ lui $v1,0x800a /* f01cbc8: 3c02800a */ lui $v0,%hi(var800a19c0) /* f01cbcc: ac201448 */ sw $zero,0x1448($at) /* f01cbd0: 00002025 */ or $a0,$zero,$zero /* f01cbd4: 244219c0 */ addiu $v0,$v0,%lo(var800a19c0) -/* f01cbd8: 2463e000 */ addiu $v1,$v1,%lo(var8009e000) +/* f01cbd8: 2463e000 */ addiu $v1,$v1,-8192 /* f01cbdc: 8c6d04f8 */ lw $t5,0x4f8($v1) .L0f01cbe0: /* f01cbe0: 24630e70 */ addiu $v1,$v1,0x0e70 @@ -1072,9 +1072,9 @@ glabel var7f1a863c /* f01cc50: 24010002 */ addiu $at,$zero,0x2 /* f01cc54: 240f0002 */ addiu $t7,$zero,0x2 /* f01cc58: 15a1000d */ bne $t5,$at,.L0f01cc90 -/* f01cc5c: 3c0e8009 */ lui $t6,%hi(var8009000c) +/* f01cc5c: 3c0e8009 */ lui $t6,%hi(g_Is4Mb) /* f01cc60: aeaf0008 */ sw $t7,0x8($s5) -/* f01cc64: 91ce0af0 */ lbu $t6,0xaf0($t6) +/* f01cc64: 91ce0af0 */ lbu $t6,%lo(g_Is4Mb)($t6) /* f01cc68: 3c198007 */ lui $t9,%hi(g_MainMenuMenuDialog) /* f01cc6c: 27393a5c */ addiu $t9,$t9,%lo(g_MainMenuMenuDialog) /* f01cc70: 16ce0004 */ bne $s6,$t6,.L0f01cc84 @@ -1142,8 +1142,8 @@ glabel var7f1a863c /* f01cd48: 00008825 */ or $s1,$zero,$zero /* f01cd4c: 24140038 */ addiu $s4,$zero,0x38 .L0f01cd50: -/* f01cd50: 3c19800b */ lui $t9,0x800b -/* f01cd54: 9739cb9e */ lhu $t9,-0x3462($t9) +/* f01cd50: 3c19800b */ lui $t9,%hi(g_MpSetup+0x16) +/* f01cd54: 9739cb9e */ lhu $t9,%lo(g_MpSetup+0x16)($t9) /* f01cd58: 240d0001 */ addiu $t5,$zero,0x1 /* f01cd5c: 022d7804 */ sllv $t7,$t5,$s1 /* f01cd60: 032f7024 */ and $t6,$t9,$t7 @@ -1250,8 +1250,8 @@ glabel var7f1a863c /* f01cedc: 02002025 */ or $a0,$s0,$zero /* f01cee0: 0fc43c81 */ jal func0f10f204 /* f01cee4: 02002025 */ or $a0,$s0,$zero -/* f01cee8: 3c0f8009 */ lui $t7,%hi(var8009000c) -/* f01ceec: 91ef0af0 */ lbu $t7,0xaf0($t7) +/* f01cee8: 3c0f8009 */ lui $t7,%hi(g_Is4Mb) +/* f01ceec: 91ef0af0 */ lbu $t7,%lo(g_Is4Mb)($t7) /* f01cef0: 24040026 */ addiu $a0,$zero,0x26 /* f01cef4: 16cf0003 */ bne $s6,$t7,.L0f01cf04 /* f01cef8: 00000000 */ sll $zero,$zero,0x0 @@ -1380,26 +1380,26 @@ glabel var7f1a863c /* f01d0a8: 8e630298 */ lw $v1,0x298($s3) .L0f01d0ac: /* f01d0ac: 8e630298 */ lw $v1,0x298($s3) -/* f01d0b0: 3c04800b */ lui $a0,0x800b -/* f01d0b4: 2484ca38 */ addiu $a0,$a0,-13768 +/* f01d0b0: 3c04800b */ lui $a0,%hi(g_MpPlayers+0x280) +/* f01d0b4: 2484ca38 */ addiu $a0,$a0,%lo(g_MpPlayers+0x280) /* f01d0b8: 04610003 */ bgez $v1,.L0f01d0c8 /* f01d0bc: 27a20070 */ addiu $v0,$sp,0x70 /* f01d0c0: 8e78029c */ lw $t8,0x29c($s3) /* f01d0c4: 0700005a */ bltz $t8,.L0f01d230 .L0f01d0c8: -/* f01d0c8: 3c05800b */ lui $a1,0x800b -/* f01d0cc: 3c06800b */ lui $a2,0x800b +/* f01d0c8: 3c05800b */ lui $a1,%hi(g_MpPlayers+0x320) +/* f01d0cc: 3c06800b */ lui $a2,%hi(g_MpPlayers+0xa0) /* f01d0d0: 3c07800b */ lui $a3,%hi(g_MpPlayers) /* f01d0d4: 24e7c7b8 */ addiu $a3,$a3,%lo(g_MpPlayers) -/* f01d0d8: 24c6c858 */ addiu $a2,$a2,-14248 -/* f01d0dc: 24a5cad8 */ addiu $a1,$a1,-13608 +/* f01d0d8: 24c6c858 */ addiu $a2,$a2,%lo(g_MpPlayers+0xa0) +/* f01d0dc: 24a5cad8 */ addiu $a1,$a1,%lo(g_MpPlayers+0x320) /* f01d0e0: 00807825 */ or $t7,$a0,$zero /* f01d0e4: 00407025 */ or $t6,$v0,$zero /* f01d0e8: 2499009c */ addiu $t9,$a0,0x9c .L0f01d0ec: /* f01d0ec: 8de10000 */ lw $at,0x0($t7) -/* f01d0f0: 25ef000c */ addiu $t7,$t7,%lo(var8009000c) -/* f01d0f4: 25ce000c */ addiu $t6,$t6,%lo(var8009000c) +/* f01d0f0: 25ef000c */ addiu $t7,$t7,12 +/* f01d0f4: 25ce000c */ addiu $t6,$t6,12 /* f01d0f8: adc1fff4 */ sw $at,-0xc($t6) /* f01d0fc: 8de1fff8 */ lw $at,-0x8($t7) /* f01d100: adc1fff8 */ sw $at,-0x8($t6) @@ -1414,7 +1414,7 @@ glabel var7f1a863c .L0f01d124: /* f01d124: 8f210000 */ lw $at,0x0($t9) /* f01d128: 2739000c */ addiu $t9,$t9,0x000c -/* f01d12c: 25ef000c */ addiu $t7,$t7,%lo(var8009000c) +/* f01d12c: 25ef000c */ addiu $t7,$t7,12 /* f01d130: ade1fff4 */ sw $at,-0xc($t7) /* f01d134: 8f21fff8 */ lw $at,-0x8($t9) /* f01d138: ade1fff8 */ sw $at,-0x8($t7) @@ -1458,8 +1458,8 @@ glabel var7f1a863c /* f01d1c8: ada10000 */ sw $at,0x0($t5) .L0f01d1cc: /* f01d1cc: 8dc10000 */ lw $at,0x0($t6) -/* f01d1d0: 25ce000c */ addiu $t6,$t6,%lo(var8009000c) -/* f01d1d4: 2718000c */ addiu $t8,$t8,%lo(var8009000c) +/* f01d1d0: 25ce000c */ addiu $t6,$t6,12 +/* f01d1d4: 2718000c */ addiu $t8,$t8,12 /* f01d1d8: af01fff4 */ sw $at,-0xc($t8) /* f01d1dc: 8dc1fff8 */ lw $at,-0x8($t6) /* f01d1e0: af01fff8 */ sw $at,-0x8($t8) @@ -1524,8 +1524,8 @@ glabel var7f1a863c .L0f01d2b8: /* f01d2b8: 0fc625cb */ jal mpSetPaused /* f01d2bc: 00002025 */ or $a0,$zero,$zero -/* f01d2c0: 3c02800b */ lui $v0,0x800b -/* f01d2c4: 2442cbb0 */ addiu $v0,$v0,-13392 +/* f01d2c0: 3c02800b */ lui $v0,%hi(g_MpSetup+0x28) +/* f01d2c4: 2442cbb0 */ addiu $v0,$v0,%lo(g_MpSetup+0x28) /* f01d2c8: 904e0060 */ lbu $t6,0x60($v0) /* f01d2cc: 24010005 */ addiu $at,$zero,0x5 /* f01d2d0: ae600314 */ sw $zero,0x314($s3) @@ -1616,16 +1616,16 @@ glabel var7f1a863c /* f01d408: 51e1000d */ beql $t7,$at,.L0f01d440 /* f01d40c: 8e6f006c */ lw $t7,0x6c($s3) /* f01d410: 92b805d5 */ lbu $t8,0x5d5($s5) -/* f01d414: 3c19800a */ lui $t9,0x800a +/* f01d414: 3c19800a */ lui $t9,%hi(g_MenuStack+0x844) /* f01d418: 370d0080 */ ori $t5,$t8,0x80 /* f01d41c: a2ad05d5 */ sb $t5,0x5d5($s5) -/* f01d420: 8f39e844 */ lw $t9,-0x17bc($t9) +/* f01d420: 8f39e844 */ lw $t9,%lo(g_MenuStack+0x844)($t9) /* f01d424: 53200006 */ beqzl $t9,.L0f01d440 /* f01d428: 8e6f006c */ lw $t7,0x6c($s3) /* f01d42c: 0fc277d4 */ jal func0f09df50 /* f01d430: 00000000 */ sll $zero,$zero,0x0 -/* f01d434: 3c01800a */ lui $at,0x800a -/* f01d438: ac20e844 */ sw $zero,-0x17bc($at) +/* f01d434: 3c01800a */ lui $at,%hi(g_MenuStack+0x844) +/* f01d438: ac20e844 */ sw $zero,%lo(g_MenuStack+0x844)($at) /* f01d43c: 8e6f006c */ lw $t7,0x6c($s3) .L0f01d440: /* f01d440: a26004d0 */ sb $zero,0x4d0($s3) @@ -1702,9 +1702,9 @@ glabel var7f1a863c /* f01d540: 0018c0c0 */ sll $t8,$t8,0x3 /* f01d544: 0303c023 */ subu $t8,$t8,$v1 /* f01d548: 0018c100 */ sll $t8,$t8,0x4 -/* f01d54c: 3c0d800a */ lui $t5,%hi(g_MenuStack) +/* f01d54c: 3c0d800a */ lui $t5,%hi(g_MenuStack+0x4f8) /* f01d550: 01b86821 */ addu $t5,$t5,$t8 -/* f01d554: 8dade4f8 */ lw $t5,%lo(g_MenuStack)($t5) +/* f01d554: 8dade4f8 */ lw $t5,%lo(g_MenuStack+0x4f8)($t5) /* f01d558: 55a00006 */ bnezl $t5,.L0f01d574 /* f01d55c: 904e1c50 */ lbu $t6,0x1c50($v0) /* f01d560: 82b9001b */ lb $t9,0x1b($s5) @@ -1739,9 +1739,9 @@ glabel var7f1a863c /* f01d5c4: 0018c0c0 */ sll $t8,$t8,0x3 /* f01d5c8: 0303c023 */ subu $t8,$t8,$v1 /* f01d5cc: 0018c100 */ sll $t8,$t8,0x4 -/* f01d5d0: 3c0d800a */ lui $t5,%hi(g_MenuStack) +/* f01d5d0: 3c0d800a */ lui $t5,%hi(g_MenuStack+0x4f8) /* f01d5d4: 01b86821 */ addu $t5,$t5,$t8 -/* f01d5d8: 8dade4f8 */ lw $t5,%lo(g_MenuStack)($t5) +/* f01d5d8: 8dade4f8 */ lw $t5,%lo(g_MenuStack+0x4f8)($t5) /* f01d5dc: 51a00003 */ beqzl $t5,.L0f01d5ec /* f01d5e0: 8d190064 */ lw $t9,0x64($t0) /* f01d5e4: a26a04d0 */ sb $t2,0x4d0($s3) @@ -1794,9 +1794,9 @@ glabel var7f1a863c /* f01d684: 0019c8c0 */ sll $t9,$t9,0x3 /* f01d688: 0323c823 */ subu $t9,$t9,$v1 /* f01d68c: 0019c900 */ sll $t9,$t9,0x4 -/* f01d690: 3c0f800a */ lui $t7,%hi(g_MenuStack) +/* f01d690: 3c0f800a */ lui $t7,%hi(g_MenuStack+0x4f8) /* f01d694: 01f97821 */ addu $t7,$t7,$t9 -/* f01d698: 8defe4f8 */ lw $t7,%lo(g_MenuStack)($t7) +/* f01d698: 8defe4f8 */ lw $t7,%lo(g_MenuStack+0x4f8)($t7) /* f01d69c: 51e00004 */ beqzl $t7,.L0f01d6b0 /* f01d6a0: 8e78006c */ lw $t8,0x6c($s3) /* f01d6a4: 8d0e0064 */ lw $t6,0x64($t0) diff --git a/src/game/game_01d770.c b/src/game/game_01d770.c index f59c9501f..37b832ebf 100644 --- a/src/game/game_01d770.c +++ b/src/game/game_01d770.c @@ -28,10 +28,10 @@ glabel func0f01d770 /* f01d784: 3c028008 */ lui $v0,%hi(var8007fc00) /* f01d788: 8c42fc00 */ lw $v0,%lo(var8007fc00)($v0) /* f01d78c: 24010013 */ addiu $at,$zero,0x13 -/* f01d790: 3c0f800a */ lui $t7,0x800a +/* f01d790: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) /* f01d794: 54410009 */ bnel $v0,$at,.L0f01d7bc /* f01d798: 2401000a */ addiu $at,$zero,0xa -/* f01d79c: 8defa244 */ lw $t7,-0x5dbc($t7) +/* f01d79c: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) /* f01d7a0: 3c01c4fa */ lui $at,0xc4fa /* f01d7a4: 44813000 */ mtc1 $at,$f6 /* f01d7a8: c5e41bb8 */ lwc1 $f4,0x1bb8($t7) @@ -41,8 +41,8 @@ glabel func0f01d770 /* f01d7b8: 2401000a */ addiu $at,$zero,0xa .L0f01d7bc: /* f01d7bc: 14410004 */ bne $v0,$at,.L0f01d7d0 -/* f01d7c0: 3c18800a */ lui $t8,0x800a -/* f01d7c4: 8f18a26c */ lw $t8,-0x5d94($t8) +/* f01d7c0: 3c18800a */ lui $t8,%hi(g_Vars+0x2ac) +/* f01d7c4: 8f18a26c */ lw $t8,%lo(g_Vars+0x2ac)($t8) /* f01d7c8: 24010006 */ addiu $at,$zero,0x6 /* f01d7cc: 1701001e */ bne $t8,$at,.L0f01d848 .L0f01d7d0: diff --git a/src/game/game_01d9f0.c b/src/game/game_01d9f0.c index b3853dc52..8b85ede54 100644 --- a/src/game/game_01d9f0.c +++ b/src/game/game_01d9f0.c @@ -109,7 +109,7 @@ glabel func0f01d9f0 /* f01db34: ae4c0000 */ sw $t4,0x0($s2) /* f01db38: 460a4402 */ mul.s $f16,$f8,$f10 /* f01db3c: 026d8021 */ addu $s0,$s3,$t5 -/* f01db40: 3c048009 */ lui $a0,%hi(var80090004) +/* f01db40: 3c048009 */ lui $a0,%hi(var80095200) /* f01db44: 240effff */ addiu $t6,$zero,-1 /* f01db48: 240fffff */ addiu $t7,$zero,-1 /* f01db4c: 2418ffff */ addiu $t8,$zero,-1 @@ -117,7 +117,7 @@ glabel func0f01d9f0 /* f01db54: 46128100 */ add.s $f4,$f16,$f18 /* f01db58: afaf0018 */ sw $t7,0x18($sp) /* f01db5c: afae0010 */ sw $t6,0x10($sp) -/* f01db60: 8c845200 */ lw $a0,0x5200($a0) +/* f01db60: 8c845200 */ lw $a0,%lo(var80095200)($a0) /* f01db64: e7a40058 */ swc1 $f4,0x58($sp) /* f01db68: 02003025 */ or $a2,$s0,$zero /* f01db6c: 24058051 */ addiu $a1,$zero,-32687 @@ -172,7 +172,7 @@ glabel func0f01d9f0 /* f01dc20: 24a50004 */ addiu $a1,$a1,0x4 /* f01dc24: 448a8000 */ mtc1 $t2,$f16 /* f01dc28: 24420002 */ addiu $v0,$v0,0x2 -/* f01dc2c: 24840004 */ addiu $a0,$a0,%lo(var80090004) +/* f01dc2c: 24840004 */ addiu $a0,$a0,4 /* f01dc30: 46808420 */ cvt.s.w $f16,$f16 /* f01dc34: 46008402 */ mul.s $f16,$f16,$f0 /* f01dc38: e490fffc */ swc1 $f16,-0x4($a0) @@ -273,8 +273,8 @@ glabel func0f01dd6c /* f01dd88: afb10018 */ sw $s1,0x18($sp) /* f01dd8c: 18400006 */ blez $v0,.L0f01dda8 /* f01dd90: afb00014 */ sw $s0,0x14($sp) -/* f01dd94: 3c0e800a */ lui $t6,0x800a -/* f01dd98: 8dce9ff4 */ lw $t6,-0x600c($t6) +/* f01dd94: 3c0e800a */ lui $t6,%hi(g_Vars+0x34) +/* f01dd98: 8dce9ff4 */ lw $t6,%lo(g_Vars+0x34)($t6) /* f01dd9c: 004e7823 */ subu $t7,$v0,$t6 /* f01dda0: ac6f0000 */ sw $t7,0x0($v1) /* f01dda4: 01e01025 */ or $v0,$t7,$zero diff --git a/src/game/game_01de30.c b/src/game/game_01de30.c index 2d6890ae9..4e809fbec 100644 --- a/src/game/game_01de30.c +++ b/src/game/game_01de30.c @@ -22,8 +22,8 @@ glabel func0f01de30 /* f01de3c: 3c09800a */ lui $t1,%hi(var800a45c0) /* f01de40: 252945c0 */ addiu $t1,$t1,%lo(var800a45c0) /* f01de44: 11c0007d */ beqz $t6,.L0f01e03c -/* f01de48: 3c02800a */ lui $v0,0x800a -/* f01de4c: 8c429ff8 */ lw $v0,-0x6008($v0) +/* f01de48: 3c02800a */ lui $v0,%hi(g_Vars+0x38) +/* f01de4c: 8c429ff8 */ lw $v0,%lo(g_Vars+0x38)($v0) /* f01de50: 00001825 */ or $v1,$zero,$zero /* f01de54: 240b0001 */ addiu $t3,$zero,0x1 /* f01de58: 2841000f */ slti $at,$v0,0xf diff --git a/src/game/game_01e250.c b/src/game/game_01e250.c index f7b9587c7..85075389f 100644 --- a/src/game/game_01e250.c +++ b/src/game/game_01e250.c @@ -594,11 +594,11 @@ glabel func0f01e7f4 /* f01ea40: 27a40078 */ addiu $a0,$sp,0x78 /* f01ea44: 8fb900e4 */ lw $t9,0xe4($sp) /* f01ea48: 8fa800d8 */ lw $t0,0xd8($sp) -/* f01ea4c: 3c09800a */ lui $t1,0x800a +/* f01ea4c: 3c09800a */ lui $t1,%hi(g_Vars+0x8) /* f01ea50: 13200004 */ beqz $t9,.L0f01ea64 /* f01ea54: 240a0001 */ addiu $t2,$zero,0x1 /* f01ea58: a1000009 */ sb $zero,0x9($t0) -/* f01ea5c: 8d299fc8 */ lw $t1,-0x6038($t1) +/* f01ea5c: 8d299fc8 */ lw $t1,%lo(g_Vars+0x8)($t1) /* f01ea60: ad0900d8 */ sw $t1,0xd8($t0) .L0f01ea64: /* f01ea64: 100001e1 */ beqz $zero,.L0f01f1ec @@ -2925,11 +2925,11 @@ glabel func0f020d44 /* f020d80: 0fc29c2a */ jal freeFireslotWrapper /* f020d84: 81e4017d */ lb $a0,0x17d($t7) /* f020d88: 8fb8004c */ lw $t8,0x4c($sp) -/* f020d8c: 3c08800a */ lui $t0,0x800a +/* f020d8c: 3c08800a */ lui $t0,%hi(g_Vars+0x338) /* f020d90: 8704012c */ lh $a0,0x12c($t8) /* f020d94: 0480000b */ bltz $a0,.L0f020dc4 /* f020d98: 0004c8c0 */ sll $t9,$a0,0x3 -/* f020d9c: 8d08a2f8 */ lw $t0,-0x5d08($t0) +/* f020d9c: 8d08a2f8 */ lw $t0,%lo(g_Vars+0x338)($t0) /* f020da0: 0324c821 */ addu $t9,$t9,$a0 /* f020da4: 0019c8c0 */ sll $t9,$t9,0x3 /* f020da8: 03281821 */ addu $v1,$t9,$t0 @@ -2953,8 +2953,8 @@ glabel func0f020d44 /* f020dec: 8fa50048 */ lw $a1,0x48($sp) /* f020df0: 0fc19711 */ jal func0f065c44 /* f020df4: 02202025 */ or $a0,$s1,$zero -/* f020df8: 3c0b800a */ lui $t3,0x800a -/* f020dfc: 8d6ba474 */ lw $t3,-0x5b8c($t3) +/* f020df8: 3c0b800a */ lui $t3,%hi(g_Vars+0x4b4) +/* f020dfc: 8d6ba474 */ lw $t3,%lo(g_Vars+0x4b4)($t3) /* f020e00: 24010026 */ addiu $at,$zero,0x26 /* f020e04: 55610005 */ bnel $t3,$at,.L0f020e1c /* f020e08: 8e24001c */ lw $a0,0x1c($s1) @@ -3011,8 +3011,8 @@ glabel func0f020d44 /* f020ec0: 8fa9004c */ lw $t1,0x4c($sp) /* f020ec4: a5300292 */ sh $s0,0x292($t1) .L0f020ec8: -/* f020ec8: 3c0a800a */ lui $t2,0x800a -/* f020ecc: 8d4aa2f8 */ lw $t2,-0x5d08($t2) +/* f020ec8: 3c0a800a */ lui $t2,%hi(g_Vars+0x338) +/* f020ecc: 8d4aa2f8 */ lw $t2,%lo(g_Vars+0x338)($t2) /* f020ed0: 24010048 */ addiu $at,$zero,0x48 /* f020ed4: 022a2023 */ subu $a0,$s1,$t2 /* f020ed8: 0081001a */ div $zero,$a0,$at @@ -3021,16 +3021,16 @@ glabel func0f020d44 /* f020ee4: 00000000 */ sll $zero,$zero,0x0 /* f020ee8: 0fc1a0bf */ jal func0f0682fc /* f020eec: 02202025 */ or $a0,$s1,$zero -/* f020ef0: 3c0c800a */ lui $t4,0x800a -/* f020ef4: 8d8ca2d8 */ lw $t4,-0x5d28($t4) -/* f020ef8: 3c0d800a */ lui $t5,0x800a +/* f020ef0: 3c0c800a */ lui $t4,%hi(g_Vars+0x318) +/* f020ef4: 8d8ca2d8 */ lw $t4,%lo(g_Vars+0x318)($t4) +/* f020ef8: 3c0d800a */ lui $t5,%hi(g_MissionConfig+0x3) /* f020efc: 5580001a */ bnezl $t4,.L0f020f68 /* f020f00: 8fa8004c */ lw $t0,0x4c($sp) -/* f020f04: 81aedfeb */ lb $t6,-0x2015($t5) -/* f020f08: 3c04800a */ lui $a0,0x800a +/* f020f04: 81aedfeb */ lb $t6,%lo(g_MissionConfig+0x3)($t5) +/* f020f08: 3c04800a */ lui $a0,%hi(g_Vars+0x474) /* f020f0c: 05c30016 */ bgezl $t6,.L0f020f68 /* f020f10: 8fa8004c */ lw $t0,0x4c($sp) -/* f020f14: 8c84a434 */ lw $a0,-0x5bcc($a0) +/* f020f14: 8c84a434 */ lw $a0,%lo(g_Vars+0x474)($a0) /* f020f18: 00001825 */ or $v1,$zero,$zero /* f020f1c: 00007880 */ sll $t7,$zero,0x2 /* f020f20: 18800010 */ blez $a0,.L0f020f64 @@ -3044,8 +3044,8 @@ glabel func0f020d44 /* f020f3c: 56390005 */ bnel $s1,$t9,.L0f020f54 /* f020f40: 0064082a */ slt $at,$v1,$a0 /* f020f44: ac4004b8 */ sw $zero,0x4b8($v0) -/* f020f48: 3c04800a */ lui $a0,0x800a -/* f020f4c: 8c84a434 */ lw $a0,-0x5bcc($a0) +/* f020f48: 3c04800a */ lui $a0,%hi(g_Vars+0x474) +/* f020f4c: 8c84a434 */ lw $a0,%lo(g_Vars+0x474)($a0) /* f020f50: 0064082a */ slt $at,$v1,$a0 .L0f020f54: /* f020f54: 10200003 */ beqz $at,.L0f020f64 @@ -3696,9 +3696,9 @@ glabel var7f1a879c /* f0218f8: 0fc4a25f */ jal propGetPlayerNum /* f0218fc: e7ae00a4 */ swc1 $f14,0xa4($sp) /* f021900: 00027880 */ sll $t7,$v0,0x2 -/* f021904: 3c18800a */ lui $t8,0x800a +/* f021904: 3c18800a */ lui $t8,%hi(g_Vars+0x64) /* f021908: 030fc021 */ addu $t8,$t8,$t7 -/* f02190c: 8f18a024 */ lw $t8,-0x5fdc($t8) +/* f02190c: 8f18a024 */ lw $t8,%lo(g_Vars+0x64)($t8) /* f021910: c7ac00a0 */ lwc1 $f12,0xa0($sp) /* f021914: 44808000 */ mtc1 $zero,$f16 /* f021918: c70818f4 */ lwc1 $f8,0x18f4($t8) @@ -3717,7 +3717,7 @@ glabel var7f1a879c /* f021948: 80d90012 */ lb $t9,0x12($a2) /* f02194c: 94d90192 */ lhu $t9,0x192($a2) /* f021950: 3c017f1b */ lui $at,%hi(var7f1a8768) -/* f021954: 3c18800a */ lui $t8,0x800a +/* f021954: 3c18800a */ lui $t8,%hi(g_Vars+0x2ac) /* f021958: 332b0004 */ andi $t3,$t9,0x4 /* f02195c: 51600012 */ beqzl $t3,.L0f0219a8 /* f021960: 8ccc0020 */ lw $t4,0x20($a2) @@ -3753,7 +3753,7 @@ glabel var7f1a879c /* f0219c8: 29e103e9 */ slti $at,$t7,0x3e9 /* f0219cc: 54200022 */ bnezl $at,.L0f021a58 /* f0219d0: 80d90012 */ lb $t9,0x12($a2) -/* f0219d4: 8f18a26c */ lw $t8,-0x5d94($t8) +/* f0219d4: 8f18a26c */ lw $t8,%lo(g_Vars+0x2ac)($t8) /* f0219d8: 24010006 */ addiu $at,$zero,0x6 /* f0219dc: 5301001e */ beql $t8,$at,.L0f021a58 /* f0219e0: 80d90012 */ lb $t9,0x12($a2) @@ -4570,10 +4570,10 @@ glabel var7f1a87b0 /* f02262c: afb00018 */ sw $s0,0x18($sp) /* f022630: 848202da */ lh $v0,0x2da($a0) /* f022634: 00808025 */ or $s0,$a0,$zero -/* f022638: 3c0e800a */ lui $t6,0x800a +/* f022638: 3c0e800a */ lui $t6,%hi(g_Vars+0x38) /* f02263c: 58400009 */ blezl $v0,.L0f022664 /* f022640: 8e0202d4 */ lw $v0,0x2d4($s0) -/* f022644: 8dce9ff8 */ lw $t6,-0x6008($t6) +/* f022644: 8dce9ff8 */ lw $t6,%lo(g_Vars+0x38)($t6) /* f022648: 004e7823 */ subu $t7,$v0,$t6 /* f02264c: a48f02da */ sh $t7,0x2da($a0) /* f022650: 849802da */ lh $t8,0x2da($a0) @@ -4599,11 +4599,11 @@ glabel var7f1a87b0 /* f02269c: 1440000f */ bnez $v0,.L0f0226dc /* f0226a0: 8fa6002c */ lw $a2,0x2c($sp) /* f0226a4: 8e0a0014 */ lw $t2,0x14($s0) -/* f0226a8: 3c0c800a */ lui $t4,0x800a +/* f0226a8: 3c0c800a */ lui $t4,%hi(g_Vars+0x38) /* f0226ac: 000a5880 */ sll $t3,$t2,0x2 /* f0226b0: 0563000f */ bgezl $t3,.L0f0226f0 /* f0226b4: 8e0202d4 */ lw $v0,0x2d4($s0) -/* f0226b8: 8d8c9ff8 */ lw $t4,-0x6008($t4) +/* f0226b8: 8d8c9ff8 */ lw $t4,%lo(g_Vars+0x38)($t4) /* f0226bc: 00cc3023 */ subu $a2,$a2,$t4 /* f0226c0: 5cc00003 */ bgtzl $a2,.L0f0226d0 /* f0226c4: 8e0d02d4 */ lw $t5,0x2d4($s0) @@ -4755,17 +4755,17 @@ glabel var7f1a87b0 /* f0228d0: 8e04001c */ lw $a0,0x1c($s0) .L0f0228d4: /* f0228d4: 24010006 */ addiu $at,$zero,0x6 -/* f0228d8: 3c18800a */ lui $t8,0x800a +/* f0228d8: 3c18800a */ lui $t8,%hi(g_Vars+0x28c) /* f0228dc: 908f0000 */ lbu $t7,0x0($a0) /* f0228e0: 55e1004c */ bnel $t7,$at,.L0f022a14 /* f0228e4: 8e090014 */ lw $t1,0x14($s0) -/* f0228e8: 8f18a24c */ lw $t8,-0x5db4($t8) +/* f0228e8: 8f18a24c */ lw $t8,%lo(g_Vars+0x28c)($t8) /* f0228ec: 0fc4a25f */ jal propGetPlayerNum /* f0228f0: afb80024 */ sw $t8,0x24($sp) /* f0228f4: 0fc4a24b */ jal setCurrentPlayerNum /* f0228f8: 00402025 */ or $a0,$v0,$zero -/* f0228fc: 3c02800a */ lui $v0,0x800a -/* f022900: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0228fc: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f022900: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f022904: 8c4300c4 */ lw $v1,0xc4($v0) /* f022908: 30640040 */ andi $a0,$v1,0x40 /* f02290c: 10800020 */ beqz $a0,.L0f022990 @@ -4775,11 +4775,11 @@ glabel var7f1a87b0 /* f02291c: 18400012 */ blez $v0,.L0f022968 /* f022920: 00000000 */ sll $zero,$zero,0x0 /* f022924: 8e190014 */ lw $t9,0x14($s0) -/* f022928: 3c09800a */ lui $t1,0x800a +/* f022928: 3c09800a */ lui $t1,%hi(g_Vars+0x38) /* f02292c: 00194080 */ sll $t0,$t9,0x2 /* f022930: 05010008 */ bgez $t0,.L0f022954 /* f022934: 00000000 */ sll $zero,$zero,0x0 -/* f022938: 8d299ff8 */ lw $t1,-0x6008($t1) +/* f022938: 8d299ff8 */ lw $t1,%lo(g_Vars+0x38)($t1) /* f02293c: 00492823 */ subu $a1,$v0,$t1 /* f022940: 1ca00002 */ bgtz $a1,.L0f02294c /* f022944: 00000000 */ sll $zero,$zero,0x0 @@ -4788,20 +4788,20 @@ glabel var7f1a87b0 /* f02294c: 0fc2a58a */ jal currentPlayerGiveAmmo /* f022950: 24040014 */ addiu $a0,$zero,0x14 .L0f022954: -/* f022954: 3c02800a */ lui $v0,0x800a -/* f022958: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f022954: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f022958: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f02295c: 8c4300c4 */ lw $v1,0xc4($v0) /* f022960: 1000000b */ beqz $zero,.L0f022990 /* f022964: 30640040 */ andi $a0,$v1,0x40 .L0f022968: -/* f022968: 3c02800a */ lui $v0,0x800a -/* f02296c: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f022968: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f02296c: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f022970: 2401ffbf */ addiu $at,$zero,-65 /* f022974: 8c4a00c4 */ lw $t2,0xc4($v0) /* f022978: 01415824 */ and $t3,$t2,$at /* f02297c: ac4b00c4 */ sw $t3,0xc4($v0) -/* f022980: 3c02800a */ lui $v0,0x800a -/* f022984: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f022980: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f022984: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f022988: 8c4300c4 */ lw $v1,0xc4($v0) /* f02298c: 30640040 */ andi $a0,$v1,0x40 .L0f022990: @@ -4847,12 +4847,12 @@ glabel var7f1a87b0 /* f022a18: 0543002a */ bgezl $t2,.L0f022ac4 /* f022a1c: 960f02e0 */ lhu $t7,0x2e0($s0) /* f022a20: 960b02e0 */ lhu $t3,0x2e0($s0) -/* f022a24: 3c0e800a */ lui $t6,0x800a -/* f022a28: 3c19800a */ lui $t9,0x800a +/* f022a24: 3c0e800a */ lui $t6,%hi(g_Vars+0x34) +/* f022a28: 3c19800a */ lui $t9,%hi(g_Vars+0x38) /* f022a2c: 316c0001 */ andi $t4,$t3,0x1 /* f022a30: 55800018 */ bnezl $t4,.L0f022a94 /* f022a34: 920302e1 */ lbu $v1,0x2e1($s0) -/* f022a38: 8dce9ff4 */ lw $t6,-0x600c($t6) +/* f022a38: 8dce9ff4 */ lw $t6,%lo(g_Vars+0x34)($t6) /* f022a3c: 920302e1 */ lbu $v1,0x2e1($s0) /* f022a40: 000e7880 */ sll $t7,$t6,0x2 /* f022a44: 01ee7821 */ addu $t7,$t7,$t6 @@ -4878,7 +4878,7 @@ glabel var7f1a87b0 /* f022a8c: a20d02e1 */ sb $t5,0x2e1($s0) /* f022a90: 920302e1 */ lbu $v1,0x2e1($s0) .L0f022a94: -/* f022a94: 8f399ff8 */ lw $t9,-0x6008($t9) +/* f022a94: 8f399ff8 */ lw $t9,%lo(g_Vars+0x38)($t9) /* f022a98: 2401007f */ addiu $at,$zero,0x7f /* f022a9c: 0003c042 */ srl $t8,$v1,0x1 /* f022aa0: 03191021 */ addu $v0,$t8,$t9 @@ -4943,11 +4943,11 @@ glabel var7f1a87b0 /* f022b80: a20a02e1 */ sb $t2,0x2e1($s0) /* f022b84: 920302e1 */ lbu $v1,0x2e1($s0) .L0f022b88: -/* f022b88: 3c0c800a */ lui $t4,0x800a +/* f022b88: 3c0c800a */ lui $t4,%hi(g_Vars+0x34) /* f022b8c: 00032042 */ srl $a0,$v1,0x1 /* f022b90: 1880000f */ blez $a0,.L0f022bd0 /* f022b94: 3068ff01 */ andi $t0,$v1,0xff01 -/* f022b98: 8d8c9ff4 */ lw $t4,-0x600c($t4) +/* f022b98: 8d8c9ff4 */ lw $t4,%lo(g_Vars+0x34)($t4) /* f022b9c: 000c5880 */ sll $t3,$t4,0x2 /* f022ba0: 016c5821 */ addu $t3,$t3,$t4 /* f022ba4: 05610003 */ bgez $t3,.L0f022bb4 @@ -5063,8 +5063,8 @@ glabel func0f022cc8 /* f022d0c: 8fa5001c */ lw $a1,0x1c($sp) /* f022d10: 8fa60018 */ lw $a2,0x18($sp) .L0f022d14: -/* f022d14: 3c0f800a */ lui $t7,0x800a -/* f022d18: 8defa2d8 */ lw $t7,-0x5d28($t7) +/* f022d14: 3c0f800a */ lui $t7,%hi(g_Vars+0x318) +/* f022d18: 8defa2d8 */ lw $t7,%lo(g_Vars+0x318)($t7) /* f022d1c: 51e00007 */ beqzl $t7,.L0f022d3c /* f022d20: 84c80358 */ lh $t0,0x358($a2) /* f022d24: 84d80358 */ lh $t8,0x358($a2) @@ -5121,7 +5121,7 @@ glabel var7f1a87b8 /* f022dc4: 8e04001c */ lw $a0,0x1c($s0) .L0f022dc8: /* f022dc8: 8c6a0318 */ lw $t2,0x318($v1) -/* f022dcc: 3c0d800b */ lui $t5,0x800b +/* f022dcc: 3c0d800b */ lui $t5,%hi(g_MpSetup+0xc) /* f022dd0: 55400004 */ bnezl $t2,.L0f022de4 /* f022dd4: 860b0358 */ lh $t3,0x358($s0) /* f022dd8: 1000007c */ beqz $zero,.L0f022fcc @@ -5134,7 +5134,7 @@ glabel var7f1a87b8 /* f022df0: 00000000 */ sll $zero,$zero,0x0 /* f022df4: a60c0358 */ sh $t4,0x358($s0) .L0f022df8: -/* f022df8: 8dadcb94 */ lw $t5,-0x346c($t5) +/* f022df8: 8dadcb94 */ lw $t5,%lo(g_MpSetup+0xc)($t5) /* f022dfc: 31ae0001 */ andi $t6,$t5,0x1 /* f022e00: 51c00073 */ beqzl $t6,.L0f022fd0 /* f022e04: 8fbf0024 */ lw $ra,0x24($sp) @@ -5161,7 +5161,7 @@ glabel var7f1a87b8 /* f022e54: 45000011 */ bc1f .L0f022e9c /* f022e58: 00000000 */ sll $zero,$zero,0x0 /* f022e5c: 8c690318 */ lw $t1,0x318($v1) -/* f022e60: 3c0c800b */ lui $t4,0x800b +/* f022e60: 3c0c800b */ lui $t4,%hi(g_MpSetup+0xc) /* f022e64: 5120005a */ beqzl $t1,.L0f022fd0 /* f022e68: 8fbf0024 */ lw $ra,0x24($sp) /* f022e6c: 860a0358 */ lh $t2,0x358($s0) @@ -5171,7 +5171,7 @@ glabel var7f1a87b8 /* f022e7c: 00000000 */ sll $zero,$zero,0x0 /* f022e80: a60b0358 */ sh $t3,0x358($s0) .L0f022e84: -/* f022e84: 8d8ccb94 */ lw $t4,-0x346c($t4) +/* f022e84: 8d8ccb94 */ lw $t4,%lo(g_MpSetup+0xc)($t4) /* f022e88: 318d0001 */ andi $t5,$t4,0x1 /* f022e8c: 51a00050 */ beqzl $t5,.L0f022fd0 /* f022e90: 8fbf0024 */ lw $ra,0x24($sp) @@ -5306,10 +5306,10 @@ glabel func0f022fe0 /* f023050: 5040000d */ beqzl $v0,.L0f023088 /* f023054: 8fbf0014 */ lw $ra,0x14($sp) /* f023058: 90430058 */ lbu $v1,0x58($v0) -/* f02305c: 3c04800a */ lui $a0,0x800a +/* f02305c: 3c04800a */ lui $a0,%hi(g_Vars+0x38) /* f023060: 58600009 */ blezl $v1,.L0f023088 /* f023064: 8fbf0014 */ lw $ra,0x14($sp) -/* f023068: 8c849ff8 */ lw $a0,-0x6008($a0) +/* f023068: 8c849ff8 */ lw $a0,%lo(g_Vars+0x38)($a0) /* f02306c: 0083082a */ slt $at,$a0,$v1 /* f023070: 10200003 */ beqz $at,.L0f023080 /* f023074: 00645023 */ subu $t2,$v1,$a0 @@ -5365,11 +5365,11 @@ glabel var7f1a87d8 /* f0230d4: 15e8fff8 */ bne $t7,$t0,.L0f0230b8 /* f0230d8: adc1fffc */ sw $at,-0x4($t6) /* f0230dc: 8de10000 */ lw $at,0x0($t7) -/* f0230e0: 3c0c800a */ lui $t4,0x800a +/* f0230e0: 3c0c800a */ lui $t4,%hi(g_Vars+0x34) /* f0230e4: 240b0001 */ addiu $t3,$zero,0x1 /* f0230e8: adc10000 */ sw $at,0x0($t6) /* f0230ec: 8fa90250 */ lw $t1,0x250($sp) -/* f0230f0: 8d8c9ff4 */ lw $t4,-0x600c($t4) +/* f0230f0: 8d8c9ff4 */ lw $t4,%lo(g_Vars+0x34)($t4) /* f0230f4: 24080001 */ addiu $t0,$zero,0x1 /* f0230f8: 8d300004 */ lw $s0,0x4($t1) /* f0230fc: 8e0a0020 */ lw $t2,0x20($s0) @@ -5385,7 +5385,7 @@ glabel var7f1a87d8 /* f023120: afa001ec */ sw $zero,0x1ec($sp) .L0f023124: /* f023124: 8fb90250 */ lw $t9,0x250($sp) -/* f023128: 3c0c800a */ lui $t4,0x800a +/* f023128: 3c0c800a */ lui $t4,%hi(g_Vars+0x4cc) /* f02312c: 93220001 */ lbu $v0,0x1($t9) /* f023130: 30580008 */ andi $t8,$v0,0x8 /* f023134: 13000003 */ beqz $t8,.L0f023144 @@ -5406,7 +5406,7 @@ glabel var7f1a87d8 /* f02316c: 00000000 */ sll $zero,$zero,0x0 /* f023170: a20b0291 */ sb $t3,0x291($s0) .L0f023174: -/* f023174: 8d8ca48c */ lw $t4,-0x5b74($t4) +/* f023174: 8d8ca48c */ lw $t4,%lo(g_Vars+0x4cc)($t4) /* f023178: 51800006 */ beqzl $t4,.L0f023194 /* f02317c: 860d02d8 */ lh $t5,0x2d8($s0) /* f023180: 44802000 */ mtc1 $zero,$f4 @@ -5420,10 +5420,10 @@ glabel var7f1a87d8 /* f02319c: c60002dc */ lwc1 $f0,0x2dc($s0) /* f0231a0: 82180007 */ lb $t8,0x7($s0) /* f0231a4: 2401001f */ addiu $at,$zero,0x1f -/* f0231a8: 3c0f800a */ lui $t7,0x800a +/* f0231a8: 3c0f800a */ lui $t7,%hi(g_Vars+0x34) /* f0231ac: 5301001d */ beql $t8,$at,.L0f023224 /* f0231b0: c60002dc */ lwc1 $f0,0x2dc($s0) -/* f0231b4: 8def9ff4 */ lw $t7,-0x600c($t7) +/* f0231b4: 8def9ff4 */ lw $t7,%lo(g_Vars+0x34)($t7) /* f0231b8: 920802e0 */ lbu $t0,0x2e0($s0) /* f0231bc: 3c014f80 */ lui $at,0x4f80 /* f0231c0: 000fc843 */ sra $t9,$t7,0x1 @@ -5461,12 +5461,12 @@ glabel var7f1a87d8 /* f023238: 00000000 */ sll $zero,$zero,0x0 /* f02323c: 44802000 */ mtc1 $zero,$f4 /* f023240: a20002e0 */ sb $zero,0x2e0($s0) -/* f023244: 3c0a800a */ lui $t2,0x800a +/* f023244: 3c0a800a */ lui $t2,%hi(g_Vars+0x34) /* f023248: 4600203c */ c.lt.s $f4,$f0 /* f02324c: 00000000 */ sll $zero,$zero,0x0 /* f023250: 45020014 */ bc1fl .L0f0232a4 /* f023254: 44809000 */ mtc1 $zero,$f18 -/* f023258: 8d4a9ff4 */ lw $t2,-0x600c($t2) +/* f023258: 8d4a9ff4 */ lw $t2,%lo(g_Vars+0x34)($t2) /* f02325c: 3c017f1b */ lui $at,%hi(var7f1a87c0) /* f023260: c42687c0 */ lwc1 $f6,%lo(var7f1a87c0)($at) /* f023264: 448a5000 */ mtc1 $t2,$f10 @@ -5486,12 +5486,12 @@ glabel var7f1a87d8 /* f02329c: e60802dc */ swc1 $f8,0x2dc($s0) /* f0232a0: 44809000 */ mtc1 $zero,$f18 .L0f0232a4: -/* f0232a4: 3c0b800a */ lui $t3,0x800a +/* f0232a4: 3c0b800a */ lui $t3,%hi(g_Vars+0x34) /* f0232a8: 4612003c */ c.lt.s $f0,$f18 /* f0232ac: 00000000 */ sll $zero,$zero,0x0 /* f0232b0: 45000013 */ bc1f .L0f023300 /* f0232b4: 00000000 */ sll $zero,$zero,0x0 -/* f0232b8: 8d6b9ff4 */ lw $t3,-0x600c($t3) +/* f0232b8: 8d6b9ff4 */ lw $t3,%lo(g_Vars+0x34)($t3) /* f0232bc: 3c017f1b */ lui $at,%hi(var7f1a87c4) /* f0232c0: c42487c4 */ lwc1 $f4,%lo(var7f1a87c4)($at) /* f0232c4: 448b5000 */ mtc1 $t3,$f10 @@ -5606,10 +5606,10 @@ glabel var7f1a87d8 /* f023454: 1040001f */ beqz $v0,.L0f0234d4 /* f023458: 00000000 */ sll $zero,$zero,0x0 /* f02345c: 90580035 */ lbu $t8,0x35($v0) -/* f023460: 3c0f800a */ lui $t7,0x800a +/* f023460: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) /* f023464: 1300001b */ beqz $t8,.L0f0234d4 /* f023468: 00000000 */ sll $zero,$zero,0x0 -/* f02346c: 8defa244 */ lw $t7,-0x5dbc($t7) +/* f02346c: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) /* f023470: 8de80480 */ lw $t0,0x480($t7) /* f023474: 14480006 */ bne $v0,$t0,.L0f023490 /* f023478: 00000000 */ sll $zero,$zero,0x0 @@ -5657,11 +5657,11 @@ glabel var7f1a87d8 /* f02350c: 0fc4a25f */ jal propGetPlayerNum /* f023510: 01802025 */ or $a0,$t4,$zero /* f023514: 0002c080 */ sll $t8,$v0,0x2 -/* f023518: 3c03800a */ lui $v1,0x800a +/* f023518: 3c03800a */ lui $v1,%hi(g_Vars+0x64) /* f02351c: 00781821 */ addu $v1,$v1,$t8 -/* f023520: 3c0f800a */ lui $t7,0x800a -/* f023524: 8defa244 */ lw $t7,-0x5dbc($t7) -/* f023528: 8c63a024 */ lw $v1,-0x5fdc($v1) +/* f023520: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) +/* f023524: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) +/* f023528: 8c63a024 */ lw $v1,%lo(g_Vars+0x64)($v1) /* f02352c: 546f005e */ bnel $v1,$t7,.L0f0236a8 /* f023530: 82030007 */ lb $v1,0x7($s0) /* f023534: 8c680000 */ lw $t0,0x0($v1) @@ -5821,17 +5821,17 @@ glabel var7f1a87d8 /* f02376c: 00403825 */ or $a3,$v0,$zero /* f023770: 82030007 */ lb $v1,0x7($s0) /* f023774: 2401000e */ addiu $at,$zero,0xe -/* f023778: 3c0a800a */ lui $t2,0x800a +/* f023778: 3c0a800a */ lui $t2,%hi(g_Vars+0x8) /* f02377c: 54610005 */ bnel $v1,$at,.L0f023794 /* f023780: 2401000f */ addiu $at,$zero,0xf -/* f023784: 8d4a9fc8 */ lw $t2,-0x6038($t2) +/* f023784: 8d4a9fc8 */ lw $t2,%lo(g_Vars+0x8)($t2) /* f023788: 10000006 */ beqz $zero,.L0f0237a4 /* f02378c: ae0a0078 */ sw $t2,0x78($s0) /* f023790: 2401000f */ addiu $at,$zero,0xf .L0f023794: /* f023794: 14610003 */ bne $v1,$at,.L0f0237a4 -/* f023798: 3c0b800a */ lui $t3,0x800a -/* f02379c: 8d6b9fc8 */ lw $t3,-0x6038($t3) +/* f023798: 3c0b800a */ lui $t3,%hi(g_Vars+0x8) +/* f02379c: 8d6b9fc8 */ lw $t3,%lo(g_Vars+0x8)($t3) /* f0237a0: ae0b00a8 */ sw $t3,0xa8($s0) .L0f0237a4: /* f0237a4: 2c440001 */ sltiu $a0,$v0,0x1 @@ -5918,19 +5918,19 @@ glabel var7f1a87d8 /* f0238d0: 24070001 */ addiu $a3,$zero,0x1 /* f0238d4: 0fc23a2b */ jal func0f08e8ac /* f0238d8: 24850008 */ addiu $a1,$a0,0x8 -/* f0238dc: 3c09800a */ lui $t1,0x800a -/* f0238e0: 8d29a2d4 */ lw $t1,-0x5d2c($t1) +/* f0238dc: 3c09800a */ lui $t1,%hi(g_Vars+0x314) +/* f0238e0: 8d29a2d4 */ lw $t1,%lo(g_Vars+0x314)($t1) /* f0238e4: 00403825 */ or $a3,$v0,$zero /* f0238e8: 8faa01f0 */ lw $t2,0x1f0($sp) /* f0238ec: 11200024 */ beqz $t1,.L0f023980 /* f0238f0: 00000000 */ sll $zero,$zero,0x0 /* f0238f4: 114000bb */ beqz $t2,.L0f023be4 -/* f0238f8: 3c0b800a */ lui $t3,0x800a -/* f0238fc: 8d6ba258 */ lw $t3,-0x5da8($t3) -/* f023900: 3c0d800a */ lui $t5,0x800a +/* f0238f8: 3c0b800a */ lui $t3,%hi(g_Vars+0x298) +/* f0238fc: 8d6ba258 */ lw $t3,%lo(g_Vars+0x298)($t3) +/* f023900: 3c0d800a */ lui $t5,%hi(g_Vars+0x29c) /* f023904: 05610006 */ bgez $t3,.L0f023920 /* f023908: 00000000 */ sll $zero,$zero,0x0 -/* f02390c: 8dada25c */ lw $t5,-0x5da4($t5) +/* f02390c: 8dada25c */ lw $t5,%lo(g_Vars+0x29c)($t5) /* f023910: 02002025 */ or $a0,$s0,$zero /* f023914: 8fa501fc */ lw $a1,0x1fc($sp) /* f023918: 05a00015 */ bltz $t5,.L0f023970 @@ -6011,18 +6011,18 @@ glabel var7f1a87d8 .L0f023a28: /* f023a28: 916d0000 */ lbu $t5,0x0($t3) /* f023a2c: 24010006 */ addiu $at,$zero,0x6 -/* f023a30: 3c0c800a */ lui $t4,0x800a +/* f023a30: 3c0c800a */ lui $t4,%hi(g_Vars+0x314) /* f023a34: 55a10025 */ bnel $t5,$at,.L0f023acc /* f023a38: 8fa901f0 */ lw $t1,0x1f0($sp) -/* f023a3c: 8d8ca2d4 */ lw $t4,-0x5d2c($t4) +/* f023a3c: 8d8ca2d4 */ lw $t4,%lo(g_Vars+0x314)($t4) /* f023a40: 55800012 */ bnezl $t4,.L0f023a8c /* f023a44: 8fb90208 */ lw $t9,0x208($sp) /* f023a48: 0fc4a25f */ jal propGetPlayerNum /* f023a4c: 01602025 */ or $a0,$t3,$zero /* f023a50: 0002c080 */ sll $t8,$v0,0x2 -/* f023a54: 3c03800a */ lui $v1,0x800a +/* f023a54: 3c03800a */ lui $v1,%hi(g_Vars+0x64) /* f023a58: 00781821 */ addu $v1,$v1,$t8 -/* f023a5c: 8c63a024 */ lw $v1,-0x5fdc($v1) +/* f023a5c: 8c63a024 */ lw $v1,%lo(g_Vars+0x64)($v1) /* f023a60: 24010002 */ addiu $at,$zero,0x2 /* f023a64: 8c640000 */ lw $a0,0x0($v1) /* f023a68: 10810007 */ beq $a0,$at,.L0f023a88 @@ -6159,14 +6159,14 @@ glabel var7f1a87d8 /* f023c48: 3c01c780 */ lui $at,0xc780 /* f023c4c: 44819000 */ mtc1 $at,$f18 /* f023c50: c5a8000c */ lwc1 $f8,0xc($t5) -/* f023c54: 3c0c800a */ lui $t4,0x800a +/* f023c54: 3c0c800a */ lui $t4,%hi(g_Vars+0x318) /* f023c58: 4612403c */ c.lt.s $f8,$f18 /* f023c5c: 00000000 */ sll $zero,$zero,0x0 /* f023c60: 45000002 */ bc1f .L0f023c6c /* f023c64: 00000000 */ sll $zero,$zero,0x0 /* f023c68: 00003825 */ or $a3,$zero,$zero .L0f023c6c: -/* f023c6c: 8d8ca2d8 */ lw $t4,-0x5d28($t4) +/* f023c6c: 8d8ca2d8 */ lw $t4,%lo(g_Vars+0x318)($t4) /* f023c70: 5580002d */ bnezl $t4,.L0f023d28 /* f023c74: 8fab0250 */ lw $t3,0x250($sp) /* f023c78: 50e0002b */ beqzl $a3,.L0f023d28 @@ -6224,15 +6224,15 @@ glabel var7f1a87d8 /* f023d34: 34580042 */ ori $t8,$v0,0x42 /* f023d38: a1780001 */ sb $t8,0x1($t3) /* f023d3c: 8e0f0018 */ lw $t7,0x18($s0) -/* f023d40: 3c08800a */ lui $t0,0x800a +/* f023d40: 3c08800a */ lui $t0,%hi(g_Vars+0x29c) /* f023d44: 35f90008 */ ori $t9,$t7,0x8 /* f023d48: ae190018 */ sw $t9,0x18($s0) -/* f023d4c: 8d08a25c */ lw $t0,-0x5da4($t0) +/* f023d4c: 8d08a25c */ lw $t0,%lo(g_Vars+0x29c)($t0) /* f023d50: 0500000a */ bltz $t0,.L0f023d7c -/* f023d54: 3c0e800a */ lui $t6,0x800a -/* f023d58: 3c09800a */ lui $t1,0x800a -/* f023d5c: 8d29a244 */ lw $t1,-0x5dbc($t1) -/* f023d60: 8dcea260 */ lw $t6,-0x5da0($t6) +/* f023d54: 3c0e800a */ lui $t6,%hi(g_Vars+0x2a0) +/* f023d58: 3c09800a */ lui $t1,%hi(g_Vars+0x284) +/* f023d5c: 8d29a244 */ lw $t1,%lo(g_Vars+0x284)($t1) +/* f023d60: 8dcea260 */ lw $t6,%lo(g_Vars+0x2a0)($t6) /* f023d64: 15c90005 */ bne $t6,$t1,.L0f023d7c /* f023d68: 00000000 */ sll $zero,$zero,0x0 /* f023d6c: 8e0a0014 */ lw $t2,0x14($s0) @@ -6252,9 +6252,9 @@ glabel var7f1a87d8 /* f023d9c: 258c152c */ addiu $t4,$t4,%lo(func0f02152c) /* f023da0: 3c018006 */ lui $at,0x8006 /* f023da4: ac2cefcc */ sw $t4,-0x1034($at) -/* f023da8: 3c01800a */ lui $at,0x800a +/* f023da8: 3c01800a */ lui $at,%hi(var8009cd1c) /* f023dac: 12000003 */ beqz $s0,.L0f023dbc -/* f023db0: ac30cd1c */ sw $s0,-0x32e4($at) +/* f023db0: ac30cd1c */ sw $s0,%lo(var8009cd1c)($at) /* f023db4: 10000002 */ beqz $zero,.L0f023dc0 /* f023db8: 920402fe */ lbu $a0,0x2fe($s0) .L0f023dbc: @@ -6262,8 +6262,8 @@ glabel var7f1a87d8 .L0f023dc0: /* f023dc0: 24010002 */ addiu $at,$zero,0x2 /* f023dc4: 14810021 */ bne $a0,$at,.L0f023e4c -/* f023dc8: 3c18800a */ lui $t8,0x800a -/* f023dcc: 8f18a26c */ lw $t8,-0x5d94($t8) +/* f023dc8: 3c18800a */ lui $t8,%hi(g_Vars+0x2ac) +/* f023dcc: 8f18a26c */ lw $t8,%lo(g_Vars+0x2ac)($t8) /* f023dd0: 24010006 */ addiu $at,$zero,0x6 /* f023dd4: 5301001e */ beql $t8,$at,.L0f023e50 /* f023dd8: 8faf0250 */ lw $t7,0x250($sp) @@ -6305,9 +6305,9 @@ glabel var7f1a87d8 /* f023e60: 0fc4a25f */ jal propGetPlayerNum /* f023e64: 01e02025 */ or $a0,$t7,$zero /* f023e68: 00024080 */ sll $t0,$v0,0x2 -/* f023e6c: 3c03800a */ lui $v1,0x800a +/* f023e6c: 3c03800a */ lui $v1,%hi(g_Vars+0x64) /* f023e70: 00681821 */ addu $v1,$v1,$t0 -/* f023e74: 8c63a024 */ lw $v1,-0x5fdc($v1) +/* f023e74: 8c63a024 */ lw $v1,%lo(g_Vars+0x64)($v1) /* f023e78: 24010003 */ addiu $at,$zero,0x3 /* f023e7c: 02002025 */ or $a0,$s0,$zero /* f023e80: 8c6e01b0 */ lw $t6,0x1b0($v1) @@ -6386,11 +6386,11 @@ glabel var7f1a87d8 /* f023f94: 11600011 */ beqz $t3,.L0f023fdc /* f023f98: 3c02800a */ lui $v0,%hi(var8009cd1c) /* f023f9c: 8c42cd1c */ lw $v0,%lo(var8009cd1c)($v0) -/* f023fa0: 3c19800a */ lui $t9,0x800a +/* f023fa0: 3c19800a */ lui $t9,%hi(g_Vars+0x38) /* f023fa4: 80430012 */ lb $v1,0x12($v0) /* f023fa8: 0460000c */ bltz $v1,.L0f023fdc /* f023fac: 00000000 */ sll $zero,$zero,0x0 -/* f023fb0: 8f399ff8 */ lw $t9,-0x6008($t9) +/* f023fb0: 8f399ff8 */ lw $t9,%lo(g_Vars+0x38)($t9) /* f023fb4: 240effff */ addiu $t6,$zero,-1 /* f023fb8: 00797821 */ addu $t7,$v1,$t9 /* f023fbc: a04f0012 */ sb $t7,0x12($v0) @@ -6402,19 +6402,19 @@ glabel var7f1a87d8 /* f023fd4: 00000000 */ sll $zero,$zero,0x0 /* f023fd8: a04e0012 */ sb $t6,0x12($v0) .L0f023fdc: -/* f023fdc: 3c03800a */ lui $v1,%hi(var800a1bb0) -/* f023fe0: 8c63a244 */ lw $v1,-0x5dbc($v1) -/* f023fe4: 24631bb0 */ addiu $v1,$v1,%lo(var800a1bb0) +/* f023fdc: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f023fe0: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) +/* f023fe4: 24631bb0 */ addiu $v1,$v1,7088 /* f023fe8: 0fc2d5ee */ jal func0f0b57b8 /* f023fec: afa30124 */ sw $v1,0x124($sp) -/* f023ff0: 3c09800a */ lui $t1,0x800a -/* f023ff4: 8d29a2d8 */ lw $t1,-0x5d28($t1) +/* f023ff0: 3c09800a */ lui $t1,%hi(g_Vars+0x318) +/* f023ff4: 8d29a2d8 */ lw $t1,%lo(g_Vars+0x318)($t1) /* f023ff8: 8fa30124 */ lw $v1,0x124($sp) /* f023ffc: 46000406 */ mov.s $f16,$f0 /* f024000: 1120000c */ beqz $t1,.L0f024034 /* f024004: 00003025 */ or $a2,$zero,$zero -/* f024008: 3c0a800b */ lui $t2,0x800b -/* f02400c: 8d4acb94 */ lw $t2,-0x346c($t2) +/* f024008: 3c0a800b */ lui $t2,%hi(g_MpSetup+0xc) +/* f02400c: 8d4acb94 */ lw $t2,%lo(g_MpSetup+0xc)($t2) /* f024010: 3c017f1b */ lui $at,%hi(var7f1a87c8) /* f024014: 314d00c0 */ andi $t5,$t2,0xc0 /* f024018: 11a00004 */ beqz $t5,.L0f02402c @@ -6694,14 +6694,14 @@ glabel var7f1a87d8 .L0f024428: /* f024428: 304dfffd */ andi $t5,$v0,0xfffd /* f02442c: a18d0001 */ sb $t5,0x1($t4) -/* f024430: 3c18800a */ lui $t8,0x800a -/* f024434: 8f18a25c */ lw $t8,-0x5da4($t8) -/* f024438: 3c0f800a */ lui $t7,0x800a -/* f02443c: 3c0b800a */ lui $t3,0x800a +/* f024430: 3c18800a */ lui $t8,%hi(g_Vars+0x29c) +/* f024434: 8f18a25c */ lw $t8,%lo(g_Vars+0x29c)($t8) +/* f024438: 3c0f800a */ lui $t7,%hi(g_Vars+0x2a0) +/* f02443c: 3c0b800a */ lui $t3,%hi(g_Vars+0x284) /* f024440: 0702000b */ bltzl $t8,.L0f024470 /* f024444: 8fae0250 */ lw $t6,0x250($sp) -/* f024448: 8defa260 */ lw $t7,-0x5da0($t7) -/* f02444c: 8d6ba244 */ lw $t3,-0x5dbc($t3) +/* f024448: 8defa260 */ lw $t7,%lo(g_Vars+0x2a0)($t7) +/* f02444c: 8d6ba244 */ lw $t3,%lo(g_Vars+0x284)($t3) /* f024450: 55eb0007 */ bnel $t7,$t3,.L0f024470 /* f024454: 8fae0250 */ lw $t6,0x250($sp) /* f024458: 8e190014 */ lw $t9,0x14($s0) @@ -7731,13 +7731,13 @@ glabel var7f1a8900 /* f0252d4: 50400011 */ beqzl $v0,.L0f02531c /* f0252d8: 8e0a0018 */ lw $t2,0x18($s0) /* f0252dc: 90580035 */ lbu $t8,0x35($v0) -/* f0252e0: 3c19800a */ lui $t9,0x800a +/* f0252e0: 3c19800a */ lui $t9,%hi(g_Vars+0x284) /* f0252e4: 17000003 */ bnez $t8,.L0f0252f4 /* f0252e8: 00000000 */ sll $zero,$zero,0x0 /* f0252ec: 100002e8 */ beqz $zero,.L0f025e90 /* f0252f0: 8fa20124 */ lw $v0,0x124($sp) .L0f0252f4: -/* f0252f4: 8f39a244 */ lw $t9,-0x5dbc($t9) +/* f0252f4: 8f39a244 */ lw $t9,%lo(g_Vars+0x284)($t9) /* f0252f8: 8f280480 */ lw $t0,0x480($t9) /* f0252fc: 54480007 */ bnel $v0,$t0,.L0f02531c /* f025300: 8e0a0018 */ lw $t2,0x18($s0) @@ -7791,8 +7791,8 @@ glabel var7f1a8900 /* f0253b0: 0fc239af */ jal func0f08e6bc /* f0253b4: 8fa40120 */ lw $a0,0x120($sp) /* f0253b8: 8fa900fc */ lw $t1,0xfc($sp) -/* f0253bc: 3c03800a */ lui $v1,0x800a -/* f0253c0: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f0253bc: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f0253c0: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f0253c4: 44893000 */ mtc1 $t1,$f6 /* f0253c8: 24010001 */ addiu $at,$zero,0x1 /* f0253cc: 8fa20120 */ lw $v0,0x120($sp) @@ -7820,8 +7820,8 @@ glabel var7f1a8900 /* f025424: 46000282 */ mul.s $f10,$f0,$f0 /* f025428: 0c012974 */ jal sqrtf /* f02542c: 46065300 */ add.s $f12,$f10,$f6 -/* f025430: 3c03800a */ lui $v1,0x800a -/* f025434: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f025430: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f025434: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f025438: 3c014316 */ lui $at,0x4316 /* f02543c: c4620024 */ lwc1 $f2,0x24($v1) /* f025440: 4600103c */ c.lt.s $f2,$f0 @@ -8006,8 +8006,8 @@ glabel var7f1a8900 /* f0256d4: 8fa40124 */ lw $a0,0x124($sp) /* f0256d8: 8fac0100 */ lw $t4,0x100($sp) .L0f0256dc: -/* f0256dc: 3c03800a */ lui $v1,0x800a -/* f0256e0: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f0256dc: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f0256e0: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f0256e4: 240b0001 */ addiu $t3,$zero,0x1 /* f0256e8: afab00a4 */ sw $t3,0xa4($sp) /* f0256ec: afa200ac */ sw $v0,0xac($sp) @@ -8051,8 +8051,8 @@ glabel var7f1a8900 /* f025778: 921900fb */ lbu $t9,0xfb($s0) /* f02577c: afb90094 */ sw $t9,0x94($sp) .L0f025780: -/* f025780: 3c0a800a */ lui $t2,0x800a -/* f025784: 8d4aa2d8 */ lw $t2,-0x5d28($t2) +/* f025780: 3c0a800a */ lui $t2,%hi(g_Vars+0x318) +/* f025784: 8d4aa2d8 */ lw $t2,%lo(g_Vars+0x318)($t2) /* f025788: 51400006 */ beqzl $t2,.L0f0257a4 /* f02578c: 93a800eb */ lbu $t0,0xeb($sp) /* f025790: 8fa40120 */ lw $a0,0x120($sp) @@ -8082,8 +8082,8 @@ glabel var7f1a8900 /* f0257e0: 8fa50104 */ lw $a1,0x104($sp) /* f0257e4: 0fc1a5d4 */ jal func0f069750 /* f0257e8: 27a60108 */ addiu $a2,$sp,0x108 -/* f0257ec: 3c03800a */ lui $v1,0x800a -/* f0257f0: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f0257ec: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f0257f0: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f0257f4: 3c0d8007 */ lui $t5,%hi(var80070764) /* f0257f8: 8c6900d8 */ lw $t1,0xd8($v1) /* f0257fc: 5520001c */ bnezl $t1,.L0f025870 @@ -8102,13 +8102,13 @@ glabel var7f1a8900 /* f025830: 8c6b1c54 */ lw $t3,0x1c54($v1) .L0f025834: /* f025834: 8c6c00c4 */ lw $t4,0xc4($v1) -/* f025838: 3c02800a */ lui $v0,0x800a +/* f025838: 3c02800a */ lui $v0,%hi(var8009caec+0x3) /* f02583c: 01607827 */ nor $t7,$t3,$zero /* f025840: 018fc024 */ and $t8,$t4,$t7 /* f025844: 33190001 */ andi $t9,$t8,0x1 /* f025848: 53200009 */ beqzl $t9,.L0f025870 /* f02584c: 946a0010 */ lhu $t2,0x10($v1) -/* f025850: 9042caef */ lbu $v0,-0x3511($v0) +/* f025850: 9042caef */ lbu $v0,%lo(var8009caec+0x3)($v0) /* f025854: 3c04800a */ lui $a0,%hi(var8009caf0) /* f025858: 9084caf0 */ lbu $a0,%lo(var8009caf0)($a0) /* f02585c: afa20088 */ sw $v0,0x88($sp) @@ -8303,8 +8303,8 @@ glabel var7f1a8900 /* f025b24: 0fc0b32d */ jal func0f02ccb4 /* f025b28: 01402825 */ or $a1,$t2,$zero .L0f025b2c: -/* f025b2c: 3c02800a */ lui $v0,0x800a -/* f025b30: 8c42a248 */ lw $v0,-0x5db8($v0) +/* f025b2c: 3c02800a */ lui $v0,%hi(g_Vars+0x288) +/* f025b30: 8c42a248 */ lw $v0,%lo(g_Vars+0x288)($v0) /* f025b34: 02002025 */ or $a0,$s0,$zero /* f025b38: 8c480034 */ lw $t0,0x34($v0) /* f025b3c: 250d0001 */ addiu $t5,$t0,0x1 @@ -8374,12 +8374,12 @@ glabel var7f1a8900 /* f025c2c: 3c0143c8 */ lui $at,0x43c8 /* f025c30: 44817000 */ mtc1 $at,$f14 /* f025c34: 46009301 */ sub.s $f12,$f18,$f0 -/* f025c38: 3c19800a */ lui $t9,0x800a +/* f025c38: 3c19800a */ lui $t9,%hi(g_Vars+0x284) /* f025c3c: 460e603e */ c.le.s $f12,$f14 /* f025c40: 00000000 */ sll $zero,$zero,0x0 /* f025c44: 4502006a */ bc1fl .L0f025df0 /* f025c48: 8fab0118 */ lw $t3,0x118($sp) -/* f025c4c: 8f39a244 */ lw $t9,-0x5dbc($t9) +/* f025c4c: 8f39a244 */ lw $t9,%lo(g_Vars+0x284)($t9) /* f025c50: 24010001 */ addiu $at,$zero,0x1 /* f025c54: 2404000b */ addiu $a0,$zero,0xb /* f025c58: 97280010 */ lhu $t0,0x10($t9) @@ -8499,8 +8499,8 @@ glabel var7f1a8900 /* f025df4: 8d64000c */ lw $a0,0xc($t3) /* f025df8: 0fc30cfc */ jal func0f0c33f0 /* f025dfc: 85c5000e */ lh $a1,0xe($t6) -/* f025e00: 3c03800a */ lui $v1,0x800a -/* f025e04: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f025e00: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f025e04: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f025e08: 3c0f8007 */ lui $t7,%hi(var80070764) /* f025e0c: 8fa40124 */ lw $a0,0x124($sp) /* f025e10: 8c7800d8 */ lw $t8,0xd8($v1) @@ -9586,8 +9586,8 @@ glabel var7f1a8944 /* f026cd4: 8c2e8904 */ lw $t6,%lo(var7f1a8904)($at) /* f026cd8: 01c00008 */ jr $t6 /* f026cdc: 00000000 */ sll $zero,$zero,0x0 -/* f026ce0: 3c04800a */ lui $a0,%hi(var800a0004) -/* f026ce4: 8c84a280 */ lw $a0,-0x5d80($a0) +/* f026ce0: 3c04800a */ lui $a0,%hi(g_Vars+0x2c0) +/* f026ce4: 8c84a280 */ lw $a0,%lo(g_Vars+0x2c0)($a0) /* f026ce8: 240a0001 */ addiu $t2,$zero,0x1 /* f026cec: 50800012 */ beqzl $a0,.L0f026d38 /* f026cf0: afaa0118 */ sw $t2,0x118($sp) @@ -9740,7 +9740,7 @@ glabel var7f1a8944 /* f026f10: 24a50004 */ addiu $a1,$a1,0x4 /* f026f14: 01446021 */ addu $t4,$t2,$a0 /* f026f18: 8d810000 */ lw $at,0x0($t4) -/* f026f1c: 24840004 */ addiu $a0,$a0,%lo(var800a0004) +/* f026f1c: 24840004 */ addiu $a0,$a0,4 /* f026f20: aca1fffc */ sw $at,-0x4($a1) /* f026f24: 96580016 */ lhu $t8,0x16($s2) /* f026f28: 0078082a */ slt $at,$v1,$t8 @@ -9896,8 +9896,8 @@ glabel func0f0270f4 /* f027130: afa00080 */ sw $zero,0x80($sp) /* f027134: 0c004b70 */ jal random /* f027138: afae0094 */ sw $t6,0x94($sp) -/* f02713c: 3c0f800a */ lui $t7,0x800a -/* f027140: 8defa2d4 */ lw $t7,-0x5d2c($t7) +/* f02713c: 3c0f800a */ lui $t7,%hi(g_Vars+0x314) +/* f027140: 8defa2d4 */ lw $t7,%lo(g_Vars+0x314)($t7) /* f027144: 0040f025 */ or $s8,$v0,$zero /* f027148: 55e001cb */ bnezl $t7,.L0f027878 /* f02714c: 8fbf003c */ lw $ra,0x3c($sp) @@ -10776,8 +10776,8 @@ glabel func0f027994 /* f027dbc: 8fbf0054 */ lw $ra,0x54($sp) /* f027dc0: 0fc0a221 */ jal chrGetTargetProp /* f027dc4: 8fa400cc */ lw $a0,0xcc($sp) -/* f027dc8: 3c09800a */ lui $t1,0x800a -/* f027dcc: 8d29a244 */ lw $t1,-0x5dbc($t1) +/* f027dc8: 3c09800a */ lui $t1,%hi(g_Vars+0x284) +/* f027dcc: 8d29a244 */ lw $t1,%lo(g_Vars+0x284)($t1) /* f027dd0: 8fac00cc */ lw $t4,0xcc($sp) /* f027dd4: 8d2b00bc */ lw $t3,0xbc($t1) /* f027dd8: 544b0005 */ bnel $v0,$t3,.L0f027df0 @@ -10873,8 +10873,8 @@ glabel func0f027e1c /* f027f18: 0fc29f66 */ jal func0f0a7d98 /* f027f1c: 2406ffff */ addiu $a2,$zero,-1 /* f027f20: 8fa200f8 */ lw $v0,0xf8($sp) -/* f027f24: 3c0b800a */ lui $t3,0x800a -/* f027f28: 8d6ba244 */ lw $t3,-0x5dbc($t3) +/* f027f24: 3c0b800a */ lui $t3,%hi(g_Vars+0x284) +/* f027f28: 8d6ba244 */ lw $t3,%lo(g_Vars+0x284)($t3) /* f027f2c: 8e250004 */ lw $a1,0x4($s1) /* f027f30: 8e260008 */ lw $a2,0x8($s1) /* f027f34: 24420028 */ addiu $v0,$v0,0x28 @@ -10905,8 +10905,8 @@ glabel func0f027e1c /* f027f98: e7a00084 */ swc1 $f0,0x84($sp) /* f027f9c: 0fc2c74a */ jal func0f0b1d28 /* f027fa0: 8fa40048 */ lw $a0,0x48($sp) -/* f027fa4: 3c0c800a */ lui $t4,0x800a -/* f027fa8: 8d8ca244 */ lw $t4,-0x5dbc($t4) +/* f027fa4: 3c0c800a */ lui $t4,%hi(g_Vars+0x284) +/* f027fa8: 8d8ca244 */ lw $t4,%lo(g_Vars+0x284)($t4) /* f027fac: 44050000 */ mfc1 $a1,$f0 /* f027fb0: 8fa400f0 */ lw $a0,0xf0($sp) /* f027fb4: 8d8d00bc */ lw $t5,0xbc($t4) @@ -10948,7 +10948,7 @@ glabel func0f027e1c /* f028040: 8cea0298 */ lw $t2,0x298($a3) .L0f028044: /* f028044: 8fa900f0 */ lw $t1,0xf0($sp) -/* f028048: 3c0d800a */ lui $t5,0x800a +/* f028048: 3c0d800a */ lui $t5,%hi(g_MissionConfig+0x3) /* f02804c: 05400008 */ bltz $t2,.L0f028070 /* f028050: 00000000 */ sll $zero,$zero,0x0 /* f028054: 8ceb0454 */ lw $t3,0x454($a3) @@ -10959,7 +10959,7 @@ glabel func0f027e1c /* f028068: 51810105 */ beql $t4,$at,.L0f028480 /* f02806c: 8fbf003c */ lw $ra,0x3c($sp) .L0f028070: -/* f028070: 81aedfeb */ lb $t6,-0x2015($t5) +/* f028070: 81aedfeb */ lb $t6,%lo(g_MissionConfig+0x3)($t5) /* f028074: c7b00084 */ lwc1 $f16,0x84($sp) /* f028078: 05c30009 */ bgezl $t6,.L0f0280a0 /* f02807c: 44802000 */ mtc1 $zero,$f4 @@ -11009,8 +11009,8 @@ glabel func0f027e1c /* f028124: 0fc2c74a */ jal func0f0b1d28 /* f028128: 8fa40048 */ lw $a0,0x48($sp) /* f02812c: 8fad00f8 */ lw $t5,0xf8($sp) -/* f028130: 3c0e800a */ lui $t6,0x800a -/* f028134: 8dcea24c */ lw $t6,-0x5db4($t6) +/* f028130: 3c0e800a */ lui $t6,%hi(g_Vars+0x28c) +/* f028134: 8dcea24c */ lw $t6,%lo(g_Vars+0x28c)($t6) /* f028138: 44050000 */ mfc1 $a1,$f0 /* f02813c: 91a70018 */ lbu $a3,0x18($t5) /* f028140: 02002025 */ or $a0,$s0,$zero @@ -11050,7 +11050,7 @@ glabel func0f027e1c /* f0281b8: afa8007c */ sw $t0,0x7c($sp) /* f0281bc: 8fa8007c */ lw $t0,0x7c($sp) /* f0281c0: 24190001 */ addiu $t9,$zero,0x1 -/* f0281c4: 3c0a800a */ lui $t2,0x800a +/* f0281c4: 3c0a800a */ lui $t2,%hi(g_Vars+0x284) /* f0281c8: 850d000a */ lh $t5,0xa($t0) /* f0281cc: afa00010 */ sw $zero,0x10($sp) /* f0281d0: 8d0e0004 */ lw $t6,0x4($t0) @@ -11059,7 +11059,7 @@ glabel func0f027e1c /* f0281dc: 01c37821 */ addu $t7,$t6,$v1 /* f0281e0: 91f80000 */ lbu $t8,0x0($t7) /* f0281e4: afb90018 */ sw $t9,0x18($sp) -/* f0281e8: 8d4aa244 */ lw $t2,-0x5dbc($t2) +/* f0281e8: 8d4aa244 */ lw $t2,%lo(g_Vars+0x284)($t2) /* f0281ec: afb80014 */ sw $t8,0x14($sp) /* f0281f0: 8e2b0004 */ lw $t3,0x4($s1) /* f0281f4: 15a00002 */ bnez $t5,.L0f028200 @@ -11143,8 +11143,8 @@ glabel func0f027e1c .L0f028314: /* f028314: afb80014 */ sw $t8,0x14($sp) /* f028318: 8d6a0178 */ lw $t2,0x178($t3) -/* f02831c: 3c0c800a */ lui $t4,0x800a -/* f028320: 8d8ca244 */ lw $t4,-0x5dbc($t4) +/* f02831c: 3c0c800a */ lui $t4,%hi(g_Vars+0x284) +/* f028320: 8d8ca244 */ lw $t4,%lo(g_Vars+0x284)($t4) /* f028324: afaa001c */ sw $t2,0x1c($sp) /* f028328: 8e2d0040 */ lw $t5,0x40($s1) /* f02832c: afa00024 */ sw $zero,0x24($sp) @@ -11195,7 +11195,7 @@ glabel func0f027e1c /* f0283d8: 8fac00f8 */ lw $t4,0xf8($sp) /* f0283dc: 918e0018 */ lbu $t6,0x18($t4) /* f0283e0: 2401001c */ addiu $at,$zero,0x1c -/* f0283e4: 3c19800a */ lui $t9,0x800a +/* f0283e4: 3c19800a */ lui $t9,%hi(g_Vars+0x284) /* f0283e8: 51c10025 */ beql $t6,$at,.L0f028480 /* f0283ec: 8fbf003c */ lw $ra,0x3c($sp) /* f0283f0: 870f0010 */ lh $t7,0x10($t8) @@ -11209,7 +11209,7 @@ glabel func0f027e1c /* f02840c: 24030001 */ addiu $v1,$zero,0x1 /* f028410: 00001825 */ or $v1,$zero,$zero .L0f028414: -/* f028414: 8f39a244 */ lw $t9,-0x5dbc($t9) +/* f028414: 8f39a244 */ lw $t9,%lo(g_Vars+0x284)($t9) /* f028418: 8f2b00bc */ lw $t3,0xbc($t9) /* f02841c: 8d640004 */ lw $a0,0x4($t3) /* f028420: 0fc4f92a */ jal func0f13e4a8 @@ -11224,8 +11224,8 @@ glabel func0f027e1c /* f028444: 27a7005c */ addiu $a3,$sp,0x5c /* f028448: 93a30057 */ lbu $v1,0x57($sp) .L0f02844c: -/* f02844c: 3c0a800a */ lui $t2,0x800a -/* f028450: 8d4aa244 */ lw $t2,-0x5dbc($t2) +/* f02844c: 3c0a800a */ lui $t2,%hi(g_Vars+0x284) +/* f028450: 8d4aa244 */ lw $t2,%lo(g_Vars+0x284)($t2) /* f028454: afa30010 */ sw $v1,0x10($sp) /* f028458: afa00014 */ sw $zero,0x14($sp) /* f02845c: 8d4d00bc */ lw $t5,0xbc($t2) @@ -11374,8 +11374,8 @@ glabel var7f1a8948 /* f028648: 8fcf0000 */ lw $t7,0x0($s8) /* f02864c: 0fc0a221 */ jal chrGetTargetProp /* f028650: 02a22021 */ addu $a0,$s5,$v0 -/* f028654: 3c19800a */ lui $t9,0x800a -/* f028658: 8f39a244 */ lw $t9,-0x5dbc($t9) +/* f028654: 3c19800a */ lui $t9,%hi(g_Vars+0x284) +/* f028658: 8f39a244 */ lw $t9,%lo(g_Vars+0x284)($t9) /* f02865c: 8f2800bc */ lw $t0,0xbc($t9) /* f028660: 5448002d */ bnel $v0,$t0,.L0f028718 /* f028664: 8fcf0000 */ lw $t7,0x0($s8) @@ -11979,8 +11979,8 @@ glabel func0f028f7c .L0f028fd0: /* f028fd0: 15600010 */ bnez $t3,.L0f029014 /* f028fd4: 00002825 */ or $a1,$zero,$zero -/* f028fd8: 3c03800a */ lui $v1,0x800a -/* f028fdc: 8c639fc8 */ lw $v1,-0x6038($v1) +/* f028fd8: 3c03800a */ lui $v1,%hi(g_Vars+0x8) +/* f028fdc: 8c639fc8 */ lw $v1,%lo(g_Vars+0x8)($v1) /* f028fe0: 00004825 */ or $t1,$zero,$zero /* f028fe4: 01404025 */ or $t0,$t2,$zero /* f028fe8: 24040730 */ addiu $a0,$zero,0x730 @@ -12001,7 +12001,7 @@ glabel func0f028f7c /* f029018: 8fbf001c */ lw $ra,0x1c($sp) /* f02901c: ad700000 */ sw $s0,0x0($t3) /* f029020: 8faf0034 */ lw $t7,0x34($sp) -/* f029024: 3c0c800a */ lui $t4,0x800a +/* f029024: 3c0c800a */ lui $t4,%hi(g_Vars+0x8) /* f029028: 00001025 */ or $v0,$zero,$zero /* f02902c: ad6f0004 */ sw $t7,0x4($t3) /* f029030: 8fb80038 */ lw $t8,0x38($sp) @@ -12010,7 +12010,7 @@ glabel func0f028f7c /* f02903c: ad780008 */ sw $t8,0x8($t3) /* f029040: 8fb9003c */ lw $t9,0x3c($sp) /* f029044: a1790010 */ sb $t9,0x10($t3) -/* f029048: 8d8c9fc8 */ lw $t4,-0x6038($t4) +/* f029048: 8d8c9fc8 */ lw $t4,%lo(g_Vars+0x8)($t4) /* f02904c: ad6c000c */ sw $t4,0xc($t3) .L0f029050: /* f029050: 24420001 */ addiu $v0,$v0,0x1 @@ -13010,14 +13010,14 @@ glabel var7f1a8980 /* f029dd0: afa000e8 */ sw $zero,0xe8($sp) .L0f029dd4: /* f029dd4: 04610002 */ bgez $v1,.L0f029de0 -/* f029dd8: 3c19800a */ lui $t9,0x800a +/* f029dd8: 3c19800a */ lui $t9,%hi(g_Vars+0x58) /* f029ddc: afa000e4 */ sw $zero,0xe4($sp) .L0f029de0: /* f029de0: 04810002 */ bgez $a0,.L0f029dec /* f029de4: 00000000 */ sll $zero,$zero,0x0 /* f029de8: afa000e0 */ sw $zero,0xe0($sp) .L0f029dec: -/* f029dec: 8f39a018 */ lw $t9,-0x5fe8($t9) +/* f029dec: 8f39a018 */ lw $t9,%lo(g_Vars+0x58)($t9) /* f029df0: 241004b0 */ addiu $s0,$zero,0x4b0 /* f029df4: afa700f4 */ sw $a3,0xf4($sp) /* f029df8: 0330001a */ div $zero,$t9,$s0 @@ -13042,8 +13042,8 @@ glabel var7f1a8980 /* f029e3c: 46045302 */ mul.s $f12,$f10,$f4 /* f029e40: 0c0068f7 */ jal fsin /* f029e44: 00000000 */ sll $zero,$zero,0x0 -/* f029e48: 3c0f800a */ lui $t7,0x800a -/* f029e4c: 8defa018 */ lw $t7,-0x5fe8($t7) +/* f029e48: 3c0f800a */ lui $t7,%hi(g_Vars+0x58) +/* f029e4c: 8defa018 */ lw $t7,%lo(g_Vars+0x58)($t7) /* f029e50: 3c014200 */ lui $at,0x4200 /* f029e54: 44811000 */ mtc1 $at,$f2 /* f029e58: 01f0001a */ div $zero,$t7,$s0 @@ -13238,12 +13238,12 @@ glabel var7f1a8980 .L0f02a128: /* f02a128: 8cb80004 */ lw $t8,0x4($a1) /* f02a12c: 24090004 */ addiu $t1,$zero,0x4 -/* f02a130: 3c0f800a */ lui $t7,0x800a +/* f02a130: 3c0f800a */ lui $t7,%hi(g_Vars+0x58) /* f02a134: 8f0e0010 */ lw $t6,0x10($t8) /* f02a138: 31d91000 */ andi $t9,$t6,0x1000 /* f02a13c: 532000a9 */ beqzl $t9,.L0f02a3e4 /* f02a140: 24080200 */ addiu $t0,$zero,0x200 -/* f02a144: 8defa018 */ lw $t7,-0x5fe8($t7) +/* f02a144: 8defa018 */ lw $t7,%lo(g_Vars+0x58)($t7) /* f02a148: 2401015e */ addiu $at,$zero,0x15e /* f02a14c: afa301d8 */ sw $v1,0x1d8($sp) /* f02a150: 01e1001a */ div $zero,$t7,$at @@ -13739,8 +13739,8 @@ glabel var7f1a8980 /* f02a898: 00408025 */ or $s0,$v0,$zero /* f02a89c: 15010035 */ bne $t0,$at,.L0f02a974 /* f02a8a0: 8fb801f4 */ lw $t8,0x1f4($sp) -/* f02a8a4: 3c02800a */ lui $v0,%hi(var8009fffc) -/* f02a8a8: 8c429fc8 */ lw $v0,-0x6038($v0) +/* f02a8a4: 3c02800a */ lui $v0,%hi(g_Vars+0x8) +/* f02a8a8: 8c429fc8 */ lw $v0,%lo(g_Vars+0x8)($v0) /* f02a8ac: 8f03000c */ lw $v1,0xc($t8) /* f02a8b0: 00002825 */ or $a1,$zero,$zero /* f02a8b4: 24040001 */ addiu $a0,$zero,0x1 @@ -14065,8 +14065,8 @@ glabel var7f1a8980 /* f02ad84: 240600ff */ addiu $a2,$zero,0xff /* f02ad88: 8fb901f4 */ lw $t9,0x1f4($sp) .L0f02ad8c: -/* f02ad8c: 3c02800a */ lui $v0,%hi(var800a000c) -/* f02ad90: 8c429fc8 */ lw $v0,-0x6038($v0) +/* f02ad8c: 3c02800a */ lui $v0,%hi(g_Vars+0x8) +/* f02ad90: 8c429fc8 */ lw $v0,%lo(g_Vars+0x8)($v0) /* f02ad94: 8f23000c */ lw $v1,0xc($t9) /* f02ad98: 00002825 */ or $a1,$zero,$zero /* f02ad9c: 00003025 */ or $a2,$zero,$zero @@ -14610,11 +14610,11 @@ glabel var7f1a8980 /* f02b5a4: 02001825 */ or $v1,$s0,$zero /* f02b5a8: 00003025 */ or $a2,$zero,$zero /* f02b5ac: 24040010 */ addiu $a0,$zero,0x10 -/* f02b5b0: 2442000c */ addiu $v0,$v0,%lo(var800a000c) +/* f02b5b0: 2442000c */ addiu $v0,$v0,12 .L0f02b5b4: /* f02b5b4: 8e410000 */ lw $at,0x0($s2) /* f02b5b8: 24c60004 */ addiu $a2,$a2,0x4 -/* f02b5bc: 2442fffc */ addiu $v0,$v0,%lo(var8009fffc) +/* f02b5bc: 2442fffc */ addiu $v0,$v0,-4 /* f02b5c0: a8610000 */ swl $at,0x0($v1) /* f02b5c4: b8610003 */ swr $at,0x3($v1) /* f02b5c8: 8e4f0004 */ lw $t7,0x4($s2) @@ -15801,12 +15801,12 @@ glabel func0f02c6e0 /* f02c70c: 0fc0cfe8 */ jal chrGetShield /* f02c710: 00a02025 */ or $a0,$a1,$zero /* f02c714: 44802000 */ mtc1 $zero,$f4 -/* f02c718: 3c0e800a */ lui $t6,0x800a +/* f02c718: 3c0e800a */ lui $t6,%hi(g_Vars+0x34) /* f02c71c: 4600203c */ c.lt.s $f4,$f0 /* f02c720: 00000000 */ sll $zero,$zero,0x0 /* f02c724: 4502000c */ bc1fl .L0f02c758 /* f02c728: 96480192 */ lhu $t0,0x192($s2) -/* f02c72c: 8dce9ff4 */ lw $t6,-0x600c($t6) +/* f02c72c: 8dce9ff4 */ lw $t6,%lo(g_Vars+0x34)($t6) /* f02c730: 59c00009 */ blezl $t6,.L0f02c758 /* f02c734: 96480192 */ lhu $t0,0x192($s2) /* f02c738: 964f0188 */ lhu $t7,0x188($s2) @@ -15847,12 +15847,12 @@ glabel func0f02c6e0 /* f02c7b4: 0fc0cfe8 */ jal chrGetShield /* f02c7b8: 02402025 */ or $a0,$s2,$zero /* f02c7bc: 44804000 */ mtc1 $zero,$f8 -/* f02c7c0: 3c0f800a */ lui $t7,0x800a +/* f02c7c0: 3c0f800a */ lui $t7,%hi(g_Vars+0x34) /* f02c7c4: 4600403c */ c.lt.s $f8,$f0 /* f02c7c8: 00000000 */ sll $zero,$zero,0x0 /* f02c7cc: 4502004f */ bc1fl .L0f02c90c /* f02c7d0: 8fa40058 */ lw $a0,0x58($sp) -/* f02c7d4: 8def9ff4 */ lw $t7,-0x600c($t7) +/* f02c7d4: 8def9ff4 */ lw $t7,%lo(g_Vars+0x34)($t7) /* f02c7d8: 59e0004c */ blezl $t7,.L0f02c90c /* f02c7dc: 8fa40058 */ lw $a0,0x58($sp) /* f02c7e0: 0c004b70 */ jal random diff --git a/src/game/game_02cde0.c b/src/game/game_02cde0.c index 8193b3aea..d11d4a5ef 100644 --- a/src/game/game_02cde0.c +++ b/src/game/game_02cde0.c @@ -148,8 +148,8 @@ glabel var7f1a8a84 /* f02cfac: 18e0005f */ blez $a3,.L0f02d12c /* f02cfb0: 8fa90054 */ lw $t1,0x54($sp) /* f02cfb4: 15200036 */ bnez $t1,.L0f02d090 -/* f02cfb8: 3c0a800a */ lui $t2,0x800a -/* f02cfbc: 8d4aa2d8 */ lw $t2,-0x5d28($t2) +/* f02cfb8: 3c0a800a */ lui $t2,%hi(g_Vars+0x318) +/* f02cfbc: 8d4aa2d8 */ lw $t2,%lo(g_Vars+0x318)($t2) /* f02cfc0: 00074080 */ sll $t0,$a3,0x2 /* f02cfc4: 3c0b8009 */ lui $t3,%hi(g_Is4Mb) /* f02cfc8: 1140001e */ beqz $t2,.L0f02d044 @@ -172,12 +172,12 @@ glabel var7f1a8a84 /* f02d00c: 000c6080 */ sll $t4,$t4,0x2 /* f02d010: 018e1821 */ addu $v1,$t4,$t6 /* f02d014: 94780002 */ lhu $t8,0x2($v1) -/* f02d018: 3c01800a */ lui $at,0x800a +/* f02d018: 3c01800a */ lui $at,%hi(var800a6680) /* f02d01c: ac62000c */ sw $v0,0xc($v1) /* f02d020: 0018c8c0 */ sll $t9,$t8,0x3 /* f02d024: 00390821 */ addu $at,$at,$t9 /* f02d028: afa20054 */ sw $v0,0x54($sp) -/* f02d02c: ac206680 */ sw $zero,0x6680($at) +/* f02d02c: ac206680 */ sw $zero,%lo(var800a6680)($at) /* f02d030: 00402025 */ or $a0,$v0,$zero /* f02d034: 0fc0b76f */ jal func0f02ddbc /* f02d038: 8fa60048 */ lw $a2,0x48($sp) @@ -905,10 +905,10 @@ glabel func0f02d4fc /* f02db08: acca0018 */ sw $t2,0x18($a2) .L0f02db0c: /* f02db0c: 8c4b0318 */ lw $t3,0x318($v0) -/* f02db10: 3c0d800a */ lui $t5,0x800a +/* f02db10: 3c0d800a */ lui $t5,%hi(g_MissionConfig+0x3) /* f02db14: 1560000b */ bnez $t3,.L0f02db44 /* f02db18: 00000000 */ sll $zero,$zero,0x0 -/* f02db1c: 81aedfeb */ lb $t6,-0x2015($t5) +/* f02db1c: 81aedfeb */ lb $t6,%lo(g_MissionConfig+0x3)($t5) /* f02db20: 05c10008 */ bgez $t6,.L0f02db44 /* f02db24: 00000000 */ sll $zero,$zero,0x0 /* f02db28: 8c4c0474 */ lw $t4,0x474($v0) diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c index f13229638..ec0429fcc 100644 --- a/src/game/game_0601b0.c +++ b/src/game/game_0601b0.c @@ -159,8 +159,8 @@ glabel func0f060300 /* f06032c: 54980005 */ bnel $a0,$t8,.L0f060344 /* f060330: 24420004 */ addiu $v0,$v0,0x4 /* f060334: ac400000 */ sw $zero,0x0($v0) -/* f060338: 3c03800a */ lui $v1,0x800a -/* f06033c: 8c63a30c */ lw $v1,-0x5cf4($v1) +/* f060338: 3c03800a */ lui $v1,%hi(g_Vars+0x34c) +/* f06033c: 8c63a30c */ lw $v1,%lo(g_Vars+0x34c)($v1) /* f060340: 24420004 */ addiu $v0,$v0,0x4 .L0f060344: /* f060344: 0043082b */ sltu $at,$v0,$v1 @@ -484,8 +484,8 @@ glabel func0f0607c8 /* f06089c: 02002825 */ or $a1,$s0,$zero /* f0608a0: 0fc181c7 */ jal func0f06071c /* f0608a4: 00003025 */ or $a2,$zero,$zero -/* f0608a8: 3c04800a */ lui $a0,0x800a -/* f0608ac: 8c84a308 */ lw $a0,-0x5cf8($a0) +/* f0608a8: 3c04800a */ lui $a0,%hi(g_Vars+0x348) +/* f0608ac: 8c84a308 */ lw $a0,%lo(g_Vars+0x348)($a0) /* f0608b0: 00409825 */ or $s3,$v0,$zero /* f0608b4: 2631fffc */ addiu $s1,$s1,-4 .L0f0608b8: @@ -523,8 +523,8 @@ glabel func0f0607c8 /* f060928: 02002825 */ or $a1,$s0,$zero /* f06092c: 0fc181c7 */ jal func0f06071c /* f060930: 24060001 */ addiu $a2,$zero,0x1 -/* f060934: 3c03800a */ lui $v1,0x800a -/* f060938: 8c63a30c */ lw $v1,-0x5cf4($v1) +/* f060934: 3c03800a */ lui $v1,%hi(g_Vars+0x34c) +/* f060938: 8c63a30c */ lw $v1,%lo(g_Vars+0x34c)($v1) /* f06093c: 00409825 */ or $s3,$v0,$zero /* f060940: 26310004 */ addiu $s1,$s1,0x4 .L0f060944: @@ -633,8 +633,8 @@ glabel var7f1a9e50 /* f060a88: 2401ffff */ addiu $at,$zero,-1 /* f060a8c: 10610043 */ beq $v1,$at,.L0f060b9c /* f060a90: e7a20058 */ swc1 $f2,0x58($sp) -/* f060a94: 3c18800a */ lui $t8,0x800a -/* f060a98: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f060a94: 3c18800a */ lui $t8,%hi(g_Vars+0x284) +/* f060a98: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f060a9c: 8faf0064 */ lw $t7,0x64($sp) /* f060aa0: 3c01bf80 */ lui $at,0xbf80 /* f060aa4: 8f1900bc */ lw $t9,0xbc($t8) @@ -787,8 +787,8 @@ glabel var7f1a9e5c /* f060c98: 2401ffff */ addiu $at,$zero,-1 /* f060c9c: 12010041 */ beq $s0,$at,.L0f060da4 /* f060ca0: e7a20058 */ swc1 $f2,0x58($sp) -/* f060ca4: 3c18800a */ lui $t8,0x800a -/* f060ca8: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f060ca4: 3c18800a */ lui $t8,%hi(g_Vars+0x284) +/* f060ca8: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f060cac: 8faf0064 */ lw $t7,0x64($sp) /* f060cb0: 3c01bf80 */ lui $at,0xbf80 /* f060cb4: 8f1900bc */ lw $t9,0xbc($t8) @@ -913,8 +913,8 @@ glabel var7f1a9eb8 .word func0f060db8+0xd34 # f061aec .text /* f060db8: 27bdf920 */ addiu $sp,$sp,-1760 -/* f060dbc: 3c0e800a */ lui $t6,0x800a -/* f060dc0: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f060dbc: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f060dc0: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f060dc4: afbf003c */ sw $ra,0x3c($sp) /* f060dc8: afb10038 */ sw $s1,0x38($sp) /* f060dcc: afb00034 */ sw $s0,0x34($sp) @@ -1112,10 +1112,10 @@ glabel var7f1a9eb8 /* f0610a0: 27a700b8 */ addiu $a3,$sp,0xb8 /* f0610a4: 93b80214 */ lbu $t8,0x214($sp) /* f0610a8: 24010016 */ addiu $at,$zero,0x16 -/* f0610ac: 3c19800a */ lui $t9,%hi(var800a000c) +/* f0610ac: 3c19800a */ lui $t9,%hi(g_Vars+0x284) /* f0610b0: 17010005 */ bne $t8,$at,.L0f0610c8 /* f0610b4: 87aa00d8 */ lh $t2,0xd8($sp) -/* f0610b8: 8f39a244 */ lw $t9,-0x5dbc($t9) +/* f0610b8: 8f39a244 */ lw $t9,%lo(g_Vars+0x284)($t9) /* f0610bc: 24010001 */ addiu $at,$zero,0x1 /* f0610c0: 97290010 */ lhu $t1,0x10($t9) /* f0610c4: 11210098 */ beq $t1,$at,.L0f061328 @@ -1265,7 +1265,7 @@ glabel var7f1a9eb8 /* f0612d4: afaf06c4 */ sw $t7,0x6c4($sp) .L0f0612d8: /* f0612d8: 8f210000 */ lw $at,0x0($t9) -/* f0612dc: 2739000c */ addiu $t9,$t9,%lo(var800a000c) +/* f0612dc: 2739000c */ addiu $t9,$t9,12 /* f0612e0: 2718000c */ addiu $t8,$t8,0xc /* f0612e4: af01fff4 */ sw $at,-0xc($t8) /* f0612e8: 8f21fff8 */ lw $at,-0x8($t9) @@ -1310,11 +1310,11 @@ glabel var7f1a9eb8 /* f061374: 00000000 */ sll $zero,$zero,0x0 /* f061378: e7a00230 */ swc1 $f0,0x230($sp) .L0f06137c: -/* f06137c: 3c03800a */ lui $v1,%hi(var8009fffc) -/* f061380: 8c63a30c */ lw $v1,-0x5cf4($v1) -/* f061384: 3c0e800a */ lui $t6,0x800a -/* f061388: 8dcea308 */ lw $t6,-0x5cf8($t6) -/* f06138c: 2463fffc */ addiu $v1,$v1,%lo(var8009fffc) +/* f06137c: 3c03800a */ lui $v1,%hi(g_Vars+0x34c) +/* f061380: 8c63a30c */ lw $v1,%lo(g_Vars+0x34c)($v1) +/* f061384: 3c0e800a */ lui $t6,%hi(g_Vars+0x348) +/* f061388: 8dcea308 */ lw $t6,%lo(g_Vars+0x348)($t6) +/* f06138c: 2463fffc */ addiu $v1,$v1,-4 /* f061390: 006e082b */ sltu $at,$v1,$t6 /* f061394: 54200033 */ bnezl $at,.L0f061464 /* f061398: 8fb9023c */ lw $t9,0x23c($sp) @@ -1334,8 +1334,8 @@ glabel var7f1a9eb8 /* f0613cc: 92020000 */ lbu $v0,0x0($s0) /* f0613d0: 0fc4a25f */ jal propGetPlayerNum /* f0613d4: afa306d8 */ sw $v1,0x6d8($sp) -/* f0613d8: 3c0a800a */ lui $t2,0x800a -/* f0613dc: 8d4aa24c */ lw $t2,-0x5db4($t2) +/* f0613d8: 3c0a800a */ lui $t2,%hi(g_Vars+0x28c) +/* f0613dc: 8d4aa24c */ lw $t2,%lo(g_Vars+0x28c)($t2) /* f0613e0: 8fa306d8 */ lw $v1,0x6d8($sp) /* f0613e4: 504a000c */ beql $v0,$t2,.L0f061418 /* f0613e8: 92020000 */ lbu $v0,0x0($s0) @@ -1366,8 +1366,8 @@ glabel var7f1a9eb8 /* f061440: afa306d8 */ sw $v1,0x6d8($sp) /* f061444: 8fa306d8 */ lw $v1,0x6d8($sp) .L0f061448: -/* f061448: 3c0c800a */ lui $t4,0x800a -/* f06144c: 8d8ca308 */ lw $t4,-0x5cf8($t4) +/* f061448: 3c0c800a */ lui $t4,%hi(g_Vars+0x348) +/* f06144c: 8d8ca308 */ lw $t4,%lo(g_Vars+0x348)($t4) /* f061450: 2463fffc */ addiu $v1,$v1,-4 /* f061454: 006c082b */ sltu $at,$v1,$t4 /* f061458: 5020ffd1 */ beqzl $at,.L0f0613a0 @@ -1531,8 +1531,8 @@ glabel var7f1a9eb8 /* f061688: c6120094 */ lwc1 $f18,0x94($s0) /* f06168c: 0fc1979d */ jal func0f065e74 /* f061690: e7b20094 */ swc1 $f18,0x94($sp) -/* f061694: 3c0f800a */ lui $t7,0x800a -/* f061698: 8defa24c */ lw $t7,-0x5db4($t7) +/* f061694: 3c0f800a */ lui $t7,%hi(g_Vars+0x28c) +/* f061698: 8defa24c */ lw $t7,%lo(g_Vars+0x28c)($t7) /* f06169c: 00002025 */ or $a0,$zero,$zero /* f0616a0: 27a5008c */ addiu $a1,$sp,0x8c /* f0616a4: 27a6007c */ addiu $a2,$sp,0x7c @@ -1631,8 +1631,8 @@ glabel var7f1a9eb8 /* f0617f8: 12200014 */ beqz $s1,.L0f06184c /* f0617fc: 27a60218 */ addiu $a2,$sp,0x218 /* f061800: 8faa06c4 */ lw $t2,0x6c4($sp) -/* f061804: 3c0c800a */ lui $t4,0x800a -/* f061808: 8d8ca244 */ lw $t4,-0x5dbc($t4) +/* f061804: 3c0c800a */ lui $t4,%hi(g_Vars+0x284) +/* f061808: 8d8ca244 */ lw $t4,%lo(g_Vars+0x284)($t4) /* f06180c: 2409ffff */ addiu $t1,$zero,-1 /* f061810: afa90020 */ sw $t1,0x20($sp) /* f061814: afa00010 */ sw $zero,0x10($sp) @@ -1661,9 +1661,9 @@ glabel var7f1a9eb8 /* f061868: 00002025 */ or $a0,$zero,$zero /* f06186c: 27a50694 */ addiu $a1,$sp,0x694 /* f061870: 11c00009 */ beqz $t6,.L0f061898 -/* f061874: 3c0a800a */ lui $t2,0x800a -/* f061878: 3c0f800a */ lui $t7,0x800a -/* f06187c: 8defa24c */ lw $t7,-0x5db4($t7) +/* f061874: 3c0a800a */ lui $t2,%hi(g_Vars+0x284) +/* f061878: 3c0f800a */ lui $t7,%hi(g_Vars+0x28c) +/* f06187c: 8defa24c */ lw $t7,%lo(g_Vars+0x28c)($t7) /* f061880: 02003025 */ or $a2,$s0,$zero /* f061884: 24070016 */ addiu $a3,$zero,0x16 /* f061888: 0fc4a640 */ jal func0f129900 @@ -1671,23 +1671,23 @@ glabel var7f1a9eb8 /* f061890: 100000b0 */ beqz $zero,.L0f061b54 /* f061894: 00000000 */ sll $zero,$zero,0x0 .L0f061898: -/* f061898: 8d4aa244 */ lw $t2,-0x5dbc($t2) +/* f061898: 8d4aa244 */ lw $t2,%lo(g_Vars+0x284)($t2) /* f06189c: 8d4900bc */ lw $t1,0xbc($t2) /* f0618a0: 0fc4f92a */ jal func0f13e4a8 /* f0618a4: 8d240004 */ lw $a0,0x4($t1) /* f0618a8: 14400033 */ bnez $v0,.L0f061978 -/* f0618ac: 3c0c800a */ lui $t4,0x800a -/* f0618b0: 8d8ca02c */ lw $t4,-0x5fd4($t4) -/* f0618b4: 3c18800a */ lui $t8,0x800a -/* f0618b8: 3c19800a */ lui $t9,0x800a +/* f0618ac: 3c0c800a */ lui $t4,%hi(g_Vars+0x6c) +/* f0618b0: 8d8ca02c */ lw $t4,%lo(g_Vars+0x6c)($t4) +/* f0618b4: 3c18800a */ lui $t8,%hi(g_Vars+0x68) +/* f0618b8: 3c19800a */ lui $t9,%hi(g_Vars+0x64) /* f0618bc: 11800003 */ beqz $t4,.L0f0618cc -/* f0618c0: 3c0b800a */ lui $t3,0x800a +/* f0618c0: 3c0b800a */ lui $t3,%hi(g_Vars+0x70) /* f0618c4: 10000002 */ beqz $zero,.L0f0618d0 /* f0618c8: 24050001 */ addiu $a1,$zero,0x1 .L0f0618cc: /* f0618cc: 00002825 */ or $a1,$zero,$zero .L0f0618d0: -/* f0618d0: 8f18a028 */ lw $t8,-0x5fd8($t8) +/* f0618d0: 8f18a028 */ lw $t8,%lo(g_Vars+0x68)($t8) /* f0618d4: 00002025 */ or $a0,$zero,$zero /* f0618d8: 00001825 */ or $v1,$zero,$zero /* f0618dc: 13000003 */ beqz $t8,.L0f0618ec @@ -1695,13 +1695,13 @@ glabel var7f1a9eb8 /* f0618e4: 10000001 */ beqz $zero,.L0f0618ec /* f0618e8: 24040001 */ addiu $a0,$zero,0x1 .L0f0618ec: -/* f0618ec: 8f39a024 */ lw $t9,-0x5fdc($t9) +/* f0618ec: 8f39a024 */ lw $t9,%lo(g_Vars+0x64)($t9) /* f0618f0: 13200003 */ beqz $t9,.L0f061900 /* f0618f4: 00000000 */ sll $zero,$zero,0x0 /* f0618f8: 10000001 */ beqz $zero,.L0f061900 /* f0618fc: 24030001 */ addiu $v1,$zero,0x1 .L0f061900: -/* f061900: 8d6ba030 */ lw $t3,-0x5fd0($t3) +/* f061900: 8d6ba030 */ lw $t3,%lo(g_Vars+0x70)($t3) /* f061904: 11600003 */ beqz $t3,.L0f061914 /* f061908: 00000000 */ sll $zero,$zero,0x0 /* f06190c: 10000001 */ beqz $zero,.L0f061914 @@ -1726,23 +1726,23 @@ glabel var7f1a9eb8 .L0f061954: /* f061954: 12200008 */ beqz $s1,.L0f061978 /* f061958: 00002025 */ or $a0,$zero,$zero -/* f06195c: 3c09800a */ lui $t1,0x800a -/* f061960: 8d29a24c */ lw $t1,-0x5db4($t1) +/* f06195c: 3c09800a */ lui $t1,%hi(g_Vars+0x28c) +/* f061960: 8d29a24c */ lw $t1,%lo(g_Vars+0x28c)($t1) /* f061964: 27a50694 */ addiu $a1,$sp,0x694 /* f061968: 02003025 */ or $a2,$s0,$zero /* f06196c: 24070001 */ addiu $a3,$zero,0x1 /* f061970: 0fc4a640 */ jal func0f129900 /* f061974: afa90010 */ sw $t1,0x10($sp) .L0f061978: -/* f061978: 3c0c800a */ lui $t4,0x800a -/* f06197c: 8d8ca02c */ lw $t4,-0x5fd4($t4) -/* f061980: 3c02800a */ lui $v0,0x800a -/* f061984: 3c03800a */ lui $v1,0x800a -/* f061988: 3c06800a */ lui $a2,0x800a -/* f06198c: 8cc6a030 */ lw $a2,-0x5fd0($a2) -/* f061990: 8c63a024 */ lw $v1,-0x5fdc($v1) +/* f061978: 3c0c800a */ lui $t4,%hi(g_Vars+0x6c) +/* f06197c: 8d8ca02c */ lw $t4,%lo(g_Vars+0x6c)($t4) +/* f061980: 3c02800a */ lui $v0,%hi(g_Vars+0x68) +/* f061984: 3c03800a */ lui $v1,%hi(g_Vars+0x64) +/* f061988: 3c06800a */ lui $a2,%hi(g_Vars+0x70) +/* f06198c: 8cc6a030 */ lw $a2,%lo(g_Vars+0x70)($a2) +/* f061990: 8c63a024 */ lw $v1,%lo(g_Vars+0x64)($v1) /* f061994: 11800003 */ beqz $t4,.L0f0619a4 -/* f061998: 8c42a028 */ lw $v0,-0x5fd8($v0) +/* f061998: 8c42a028 */ lw $v0,%lo(g_Vars+0x68)($v0) /* f06199c: 10000002 */ beqz $zero,.L0f0619a8 /* f0619a0: 24050001 */ addiu $a1,$zero,0x1 .L0f0619a4: @@ -1761,7 +1761,7 @@ glabel var7f1a9eb8 /* f0619c8: 00001825 */ or $v1,$zero,$zero .L0f0619cc: /* f0619cc: 10c00003 */ beqz $a2,.L0f0619dc -/* f0619d0: 3c0d800a */ lui $t5,0x800a +/* f0619d0: 3c0d800a */ lui $t5,%hi(g_Vars+0x34) /* f0619d4: 10000001 */ beqz $zero,.L0f0619dc /* f0619d8: 24020001 */ addiu $v0,$zero,0x1 .L0f0619dc: @@ -1771,7 +1771,7 @@ glabel var7f1a9eb8 /* f0619e8: 29610003 */ slti $at,$t3,0x3 /* f0619ec: 5420000a */ bnezl $at,.L0f061a18 /* f0619f0: 3c01c6fa */ lui $at,0xc6fa -/* f0619f4: 8dad9ff4 */ lw $t5,-0x600c($t5) +/* f0619f4: 8dad9ff4 */ lw $t5,%lo(g_Vars+0x34)($t5) /* f0619f8: 29a10009 */ slti $at,$t5,0x9 /* f0619fc: 54200006 */ bnezl $at,.L0f061a18 /* f061a00: 3c01c6fa */ lui $at,0xc6fa @@ -1807,10 +1807,10 @@ glabel var7f1a9eb8 /* f061a74: 45000037 */ bc1f .L0f061b54 /* f061a78: 00000000 */ sll $zero,$zero,0x0 /* f061a7c: 4602603c */ c.lt.s $f12,$f2 -/* f061a80: 3c0f800a */ lui $t7,0x800a +/* f061a80: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) /* f061a84: 45000033 */ bc1f .L0f061b54 /* f061a88: 00000000 */ sll $zero,$zero,0x0 -/* f061a8c: 8defa244 */ lw $t7,-0x5dbc($t7) +/* f061a8c: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) /* f061a90: 00008025 */ or $s0,$zero,$zero /* f061a94: 8dea00bc */ lw $t2,0xbc($t7) /* f061a98: 0fc4f92a */ jal func0f13e4a8 @@ -1872,10 +1872,10 @@ glabel var7f1a9eb8 .L0f061b5c: /* f061b5c: 11400047 */ beqz $t2,.L0f061c7c /* f061b60: 00001825 */ or $v1,$zero,$zero -/* f061b64: 3c03800a */ lui $v1,0x800a +/* f061b64: 3c03800a */ lui $v1,%hi(g_Vars+0x284) /* f061b68: 00008825 */ or $s1,$zero,$zero /* f061b6c: 00004025 */ or $t0,$zero,$zero -/* f061b70: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f061b70: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f061b74: 93a40214 */ lbu $a0,0x214($sp) /* f061b78: 27b001fc */ addiu $s0,$sp,0x1fc /* f061b7c: c7a001e4 */ lwc1 $f0,0x1e4($sp) @@ -2477,8 +2477,8 @@ glabel var7f1a9ec4 /* f06239c: 00000000 */ sll $zero,$zero,0x0 /* f0623a0: 0fc4a25f */ jal propGetPlayerNum /* f0623a4: 02602025 */ or $a0,$s3,$zero -/* f0623a8: 3c0a800a */ lui $t2,0x800a -/* f0623ac: 8d4aa24c */ lw $t2,-0x5db4($t2) +/* f0623a8: 3c0a800a */ lui $t2,%hi(g_Vars+0x28c) +/* f0623ac: 8d4aa24c */ lw $t2,%lo(g_Vars+0x28c)($t2) /* f0623b0: 544a0003 */ bnel $v0,$t2,.L0f0623c0 /* f0623b4: 3c014270 */ lui $at,0x4270 .L0f0623b8: @@ -2591,8 +2591,8 @@ glabel var7f1a9ec4 /* f062548: 46060502 */ mul.s $f20,$f0,$f6 /* f06254c: 0fc2a101 */ jal func0f0a8404 /* f062550: 2406ffff */ addiu $a2,$zero,-1 -/* f062554: 3c18800a */ lui $t8,0x800a -/* f062558: 8f18a24c */ lw $t8,-0x5db4($t8) +/* f062554: 3c18800a */ lui $t8,%hi(g_Vars+0x28c) +/* f062558: 8f18a24c */ lw $t8,%lo(g_Vars+0x28c)($t8) /* f06255c: 4405a000 */ mfc1 $a1,$f20 /* f062560: 92e70000 */ lbu $a3,0x0($s7) /* f062564: 02c02025 */ or $a0,$s6,$zero @@ -2676,8 +2676,8 @@ glabel var7f1a9ec4 .L0f062688: /* f062688: 0fc2c74a */ jal func0f0b1d28 /* f06268c: 02e02025 */ or $a0,$s7,$zero -/* f062690: 3c0a800a */ lui $t2,0x800a -/* f062694: 8d4aa244 */ lw $t2,-0x5dbc($t2) +/* f062690: 3c0a800a */ lui $t2,%hi(g_Vars+0x284) +/* f062694: 8d4aa244 */ lw $t2,%lo(g_Vars+0x284)($t2) /* f062698: 8fac009c */ lw $t4,0x9c($sp) /* f06269c: 8fae00a8 */ lw $t6,0xa8($sp) /* f0626a0: 8d4b00bc */ lw $t3,0xbc($t2) @@ -2699,8 +2699,8 @@ glabel var7f1a9ec4 .L0f0626e0: /* f0626e0: 8fb90130 */ lw $t9,0x130($sp) .L0f0626e4: -/* f0626e4: 3c09800a */ lui $t1,0x800a -/* f0626e8: 8d29a308 */ lw $t1,-0x5cf8($t1) +/* f0626e4: 3c09800a */ lui $t1,%hi(g_Vars+0x348) +/* f0626e8: 8d29a308 */ lw $t1,%lo(g_Vars+0x348)($t1) /* f0626ec: 2728fffc */ addiu $t0,$t9,-4 /* f0626f0: afa80130 */ sw $t0,0x130($sp) /* f0626f4: 0109082b */ sltu $at,$t0,$t1 @@ -2781,8 +2781,8 @@ glabel var7f1a9ef4 /* f06279c: 000e7080 */ sll $t6,$t6,0x2 /* f0627a0: 01c47021 */ addu $t6,$t6,$a0 /* f0627a4: 000e70c0 */ sll $t6,$t6,0x3 -/* f0627a8: 3c0f800a */ lui $t7,0x800a -/* f0627ac: 8defa244 */ lw $t7,-0x5dbc($t7) +/* f0627a8: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) +/* f0627ac: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) /* f0627b0: 27bdffb8 */ addiu $sp,$sp,-72 /* f0627b4: 01c47021 */ addu $t6,$t6,$a0 /* f0627b8: 000e7080 */ sll $t6,$t6,0x2 @@ -2801,8 +2801,8 @@ glabel var7f1a9ef4 /* f0627ec: 24010014 */ addiu $at,$zero,0x14 /* f0627f0: 1441000d */ bne $v0,$at,.L0f062828 /* f0627f4: 8fa30044 */ lw $v1,0x44($sp) -/* f0627f8: 3c0b800a */ lui $t3,0x800a -/* f0627fc: 8d6ba244 */ lw $t3,-0x5dbc($t3) +/* f0627f8: 3c0b800a */ lui $t3,%hi(g_Vars+0x284) +/* f0627fc: 8d6ba244 */ lw $t3,%lo(g_Vars+0x284)($t3) /* f062800: 8fac002c */ lw $t4,0x2c($sp) /* f062804: 24010003 */ addiu $at,$zero,0x3 /* f062808: 016c6821 */ addu $t5,$t3,$t4 @@ -2820,8 +2820,8 @@ glabel var7f1a9ef4 /* f062834: 0fc18755 */ jal func0f061d54 /* f062838: 24060002 */ addiu $a2,$zero,0x2 .L0f06283c: -/* f06283c: 3c18800a */ lui $t8,0x800a -/* f062840: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f06283c: 3c18800a */ lui $t8,%hi(g_Vars+0x284) +/* f062840: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f062844: 8fb9002c */ lw $t9,0x2c($sp) /* f062848: 03191821 */ addu $v1,$t8,$t9 /* f06284c: 90680d0f */ lbu $t0,0xd0f($v1) @@ -2837,8 +2837,8 @@ glabel var7f1a9ef4 /* f062870: afa20040 */ sw $v0,0x40($sp) /* f062874: 0fc2866a */ jal getCurrentPlayerWeaponId /* f062878: 02002025 */ or $a0,$s0,$zero -/* f06287c: 3c0a800a */ lui $t2,0x800a -/* f062880: 8d4aa244 */ lw $t2,-0x5dbc($t2) +/* f06287c: 3c0a800a */ lui $t2,%hi(g_Vars+0x284) +/* f062880: 8d4aa244 */ lw $t2,%lo(g_Vars+0x284)($t2) /* f062884: 8fab002c */ lw $t3,0x2c($sp) /* f062888: afa2003c */ sw $v0,0x3c($sp) /* f06288c: 02002025 */ or $a0,$s0,$zero @@ -2866,8 +2866,8 @@ glabel var7f1a9ef4 /* f0628e4: 00002025 */ or $a0,$zero,$zero /* f0628e8: 1440008b */ bnez $v0,.L0f062b18 .L0f0628ec: -/* f0628ec: 3c18800a */ lui $t8,0x800a -/* f0628f0: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f0628ec: 3c18800a */ lui $t8,%hi(g_Vars+0x284) +/* f0628f0: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f0628f4: 8f1900bc */ lw $t9,0xbc($t8) /* f0628f8: 0fc0897d */ jal chrUncloakTemporarily /* f0628fc: 8f240004 */ lw $a0,0x4($t9) @@ -2924,8 +2924,8 @@ glabel var7f1a9ef4 .L0f0629c8: /* f0629c8: 0fc284c6 */ jal func0f0a1318 /* f0629cc: 02002025 */ or $a0,$s0,$zero -/* f0629d0: 3c0f800a */ lui $t7,0x800a -/* f0629d4: 8defa2d4 */ lw $t7,-0x5d2c($t7) +/* f0629d0: 3c0f800a */ lui $t7,%hi(g_Vars+0x314) +/* f0629d4: 8defa2d4 */ lw $t7,%lo(g_Vars+0x314)($t7) /* f0629d8: 02002025 */ or $a0,$s0,$zero /* f0629dc: 24050001 */ addiu $a1,$zero,0x1 /* f0629e0: 24060001 */ addiu $a2,$zero,0x1 @@ -2937,8 +2937,8 @@ glabel var7f1a9ef4 /* f0629f4: 00000000 */ sll $zero,$zero,0x0 /* f0629f8: 10000048 */ beqz $zero,.L0f062b1c /* f0629fc: 8fbf0024 */ lw $ra,0x24($sp) -/* f062a00: 3c18800a */ lui $t8,0x800a -/* f062a04: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f062a00: 3c18800a */ lui $t8,%hi(g_Vars+0x284) +/* f062a04: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f062a08: 8f1900bc */ lw $t9,0xbc($t8) /* f062a0c: 0fc0897d */ jal chrUncloakTemporarily /* f062a10: 8f240004 */ lw $a0,0x4($t9) @@ -2954,9 +2954,9 @@ glabel var7f1a9ef4 /* f062a38: 24060001 */ addiu $a2,$zero,0x1 /* f062a3c: 10000037 */ beqz $zero,.L0f062b1c /* f062a40: 8fbf0024 */ lw $ra,0x24($sp) -/* f062a44: 3c04800a */ lui $a0,0x800a +/* f062a44: 3c04800a */ lui $a0,%hi(g_Vars+0x28c) /* f062a48: 0fc22a7d */ jal func0f08a9f4 -/* f062a4c: 8c84a24c */ lw $a0,-0x5db4($a0) +/* f062a4c: 8c84a24c */ lw $a0,%lo(g_Vars+0x28c)($a0) /* f062a50: 10000032 */ beqz $zero,.L0f062b1c /* f062a54: 8fbf0024 */ lw $ra,0x24($sp) /* f062a58: 0fc18b74 */ jal func0f062dd0 @@ -2975,8 +2975,8 @@ glabel var7f1a9ef4 /* f062a8c: 02002025 */ or $a0,$s0,$zero /* f062a90: 10000022 */ beqz $zero,.L0f062b1c /* f062a94: 8fbf0024 */ lw $ra,0x24($sp) -/* f062a98: 3c08800a */ lui $t0,0x800a -/* f062a9c: 8d08a244 */ lw $t0,-0x5dbc($t0) +/* f062a98: 3c08800a */ lui $t0,%hi(g_Vars+0x284) +/* f062a9c: 8d08a244 */ lw $t0,%lo(g_Vars+0x284)($t0) /* f062aa0: 8d0900ac */ lw $t1,0xac($t0) /* f062aa4: 15200005 */ bnez $t1,.L0f062abc /* f062aa8: 00000000 */ sll $zero,$zero,0x0 @@ -2994,8 +2994,8 @@ glabel var7f1a9ef4 /* f062ad4: 27a50038 */ addiu $a1,$sp,0x38 /* f062ad8: 10000010 */ beqz $zero,.L0f062b1c /* f062adc: 8fbf0024 */ lw $ra,0x24($sp) -/* f062ae0: 3c02800a */ lui $v0,0x800a -/* f062ae4: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f062ae0: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f062ae4: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f062ae8: 2401ffbf */ addiu $at,$zero,-65 /* f062aec: 8c4400c4 */ lw $a0,0xc4($v0) /* f062af0: 30830080 */ andi $v1,$a0,0x80 @@ -3020,8 +3020,8 @@ glabel var7f1a9ef4 GLOBAL_ASM( glabel func0f062b2c -/* f062b2c: 3c0e800a */ lui $t6,0x800a -/* f062b30: 8dce9ff4 */ lw $t6,-0x600c($t6) +/* f062b2c: 3c0e800a */ lui $t6,%hi(g_Vars+0x34) +/* f062b30: 8dce9ff4 */ lw $t6,%lo(g_Vars+0x34)($t6) /* f062b34: 27bdffe8 */ addiu $sp,$sp,-24 /* f062b38: afbf0014 */ sw $ra,0x14($sp) /* f062b3c: 59c00006 */ blezl $t6,.L0f062b58 @@ -3119,8 +3119,8 @@ glabel func0f062b64 /* f062c88: 02002025 */ or $a0,$s0,$zero /* f062c8c: 0fc1ab24 */ jal func0f06ac90 /* f062c90: 02002025 */ or $a0,$s0,$zero -/* f062c94: 3c18800a */ lui $t8,0x800a -/* f062c98: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f062c94: 3c18800a */ lui $t8,%hi(g_Vars+0x284) +/* f062c98: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f062c9c: 02002025 */ or $a0,$s0,$zero /* f062ca0: 0fc181a6 */ jal propReparent /* f062ca4: 8f0500bc */ lw $a1,0xbc($t8) @@ -3137,10 +3137,10 @@ glabel func0f062cbc /* f062cbc: 27bdffc0 */ addiu $sp,$sp,-64 /* f062cc0: afb1001c */ sw $s1,0x1c($sp) /* f062cc4: 3c11800a */ lui $s1,%hi(g_Vars) -/* f062cc8: 3c01800a */ lui $at,0x800a +/* f062cc8: 3c01800a */ lui $at,%hi(var8009cda8) /* f062ccc: 26319fc0 */ addiu $s1,$s1,%lo(g_Vars) /* f062cd0: afb00018 */ sw $s0,0x18($sp) -/* f062cd4: ac20cda8 */ sw $zero,-0x3258($at) +/* f062cd4: ac20cda8 */ sw $zero,%lo(var8009cda8)($at) /* f062cd8: 8e30034c */ lw $s0,0x34c($s1) /* f062cdc: 8e2e0348 */ lw $t6,0x348($s1) /* f062ce0: afb20020 */ sw $s2,0x20($sp) @@ -3424,9 +3424,9 @@ glabel func0f06302c /* f063034: 3c11800a */ lui $s1,%hi(g_Vars) /* f063038: 26319fc0 */ addiu $s1,$s1,%lo(g_Vars) /* f06303c: ae20043c */ sw $zero,0x43c($s1) -/* f063040: 3c01800a */ lui $at,0x800a -/* f063044: ac20cdac */ sw $zero,-0x3254($at) -/* f063048: 3c01800a */ lui $at,0x800a +/* f063040: 3c01800a */ lui $at,%hi(var8009cdac) +/* f063044: ac20cdac */ sw $zero,%lo(var8009cdac)($at) +/* f063048: 3c01800a */ lui $at,%hi(var8009cdb0) /* f06304c: afbf002c */ sw $ra,0x2c($sp) /* f063050: afb50028 */ sw $s5,0x28($sp) /* f063054: afb40024 */ sw $s4,0x24($sp) @@ -3435,7 +3435,7 @@ glabel func0f06302c /* f063060: afb00014 */ sw $s0,0x14($sp) /* f063064: afa40098 */ sw $a0,0x98($sp) /* f063068: 10800009 */ beqz $a0,.L0f063090 -/* f06306c: ac20cdb0 */ sw $zero,-0x3250($at) +/* f06306c: ac20cdb0 */ sw $zero,%lo(var8009cdb0)($at) /* f063070: 9622035c */ lhu $v0,0x35c($s1) /* f063074: 2401ffff */ addiu $at,$zero,-1 /* f063078: 244f0001 */ addiu $t7,$v0,0x1 @@ -4594,8 +4594,8 @@ glabel var7f1a9f2c /* f064094: e7b40038 */ swc1 $f20,0x38($sp) /* f064098: 10000025 */ beqz $zero,.L0f064130 /* f06409c: 00000000 */ sll $zero,$zero,0x0 -/* f0640a0: 3c19800a */ lui $t9,0x800a -/* f0640a4: 8f39a26c */ lw $t9,-0x5d94($t9) +/* f0640a0: 3c19800a */ lui $t9,%hi(g_Vars+0x2ac) +/* f0640a4: 8f39a26c */ lw $t9,%lo(g_Vars+0x2ac)($t9) /* f0640a8: 24010006 */ addiu $at,$zero,0x6 /* f0640ac: 57210028 */ bnel $t9,$at,.L0f064150 /* f0640b0: 8fbf006c */ lw $ra,0x6c($sp) @@ -4979,12 +4979,12 @@ glabel var7f1a9f54 /* f064624: 8fab004c */ lw $t3,0x4c($sp) /* f064628: 4612203e */ c.le.s $f4,$f18 /* f06462c: 3c013fc0 */ lui $at,0x3fc0 -/* f064630: 3c0a800a */ lui $t2,0x800a +/* f064630: 3c0a800a */ lui $t2,%hi(g_Vars+0x318) /* f064634: 4502005e */ bc1fl .L0f0647b0 /* f064638: 8fab004c */ lw $t3,0x4c($sp) /* f06463c: 46109181 */ sub.s $f6,$f18,$f16 /* f064640: 44814000 */ mtc1 $at,$f8 -/* f064644: 8d4aa2d8 */ lw $t2,-0x5d28($t2) +/* f064644: 8d4aa2d8 */ lw $t2,%lo(g_Vars+0x318)($t2) /* f064648: 3c018007 */ lui $at,0x8007 /* f06464c: 46083002 */ mul.s $f0,$f6,$f8 /* f064650: 15400004 */ bnez $t2,.L0f064664 @@ -5084,10 +5084,10 @@ glabel var7f1a9f54 .L0f0647ac: /* f0647ac: 8fab004c */ lw $t3,0x4c($sp) .L0f0647b0: -/* f0647b0: 3c0c800a */ lui $t4,0x800a +/* f0647b0: 3c0c800a */ lui $t4,%hi(g_Vars+0x284) /* f0647b4: 51600097 */ beqzl $t3,.L0f064a14 /* f0647b8: c7a00058 */ lwc1 $f0,0x58($sp) -/* f0647bc: 8d8ca244 */ lw $t4,-0x5dbc($t4) +/* f0647bc: 8d8ca244 */ lw $t4,%lo(g_Vars+0x284)($t4) /* f0647c0: 00002825 */ or $a1,$zero,$zero /* f0647c4: 8d8400bc */ lw $a0,0xbc($t4) /* f0647c8: 0fc30795 */ jal func0f0c1e54 @@ -6344,8 +6344,8 @@ glabel func0f0658e8 GLOBAL_ASM( glabel func0f06593c /* f06593c: 00803025 */ or $a2,$a0,$zero -/* f065940: 3c02800a */ lui $v0,%hi(var800a0010) -/* f065944: 8c42cda4 */ lw $v0,-0x325c($v0) +/* f065940: 3c02800a */ lui $v0,%hi(var8009cda4) +/* f065944: 8c42cda4 */ lw $v0,%lo(var8009cda4)($v0) /* f065948: 2404fffe */ addiu $a0,$zero,-2 /* f06594c: 00001825 */ or $v1,$zero,$zero /* f065950: 24070100 */ addiu $a3,$zero,0x100 @@ -6385,7 +6385,7 @@ glabel func0f06593c /* f0659cc: 24630001 */ addiu $v1,$v1,0x1 .L0f0659d0: /* f0659d0: 1467ffe0 */ bne $v1,$a3,.L0f065954 -/* f0659d4: 24420010 */ addiu $v0,$v0,%lo(var800a0010) +/* f0659d4: 24420010 */ addiu $v0,$v0,16 /* f0659d8: 2402ffff */ addiu $v0,$zero,-1 /* f0659dc: 03e00008 */ jr $ra /* f0659e0: 00000000 */ sll $zero,$zero,0x0 @@ -6880,8 +6880,8 @@ glabel roomGetProps GLOBAL_ASM( glabel func0f066054 -/* f066054: 3c03800a */ lui $v1,0x800a -/* f066058: 8c63a27c */ lw $v1,-0x5d84($v1) +/* f066054: 3c03800a */ lui $v1,%hi(g_Vars+0x2bc) +/* f066058: 8c63a27c */ lw $v1,%lo(g_Vars+0x2bc)($v1) /* f06605c: 27bdffe8 */ addiu $sp,$sp,-24 /* f066060: afb30014 */ sw $s3,0x14($sp) /* f066064: afb20010 */ sw $s2,0x10($sp) @@ -6987,8 +6987,8 @@ glabel func0f066054 .L0f0661c8: /* f0661c8: 04c3ffc0 */ bgezl $a2,.L0f0660cc /* f0661cc: 00004025 */ or $t0,$zero,$zero -/* f0661d0: 3c03800a */ lui $v1,0x800a -/* f0661d4: 8c63a27c */ lw $v1,-0x5d84($v1) +/* f0661d0: 3c03800a */ lui $v1,%hi(g_Vars+0x2bc) +/* f0661d4: 8c63a27c */ lw $v1,%lo(g_Vars+0x2bc)($v1) .L0f0661d8: /* f0661d8: 0043082a */ slt $at,$v0,$v1 .L0f0661dc: diff --git a/src/game/game_091e10.c b/src/game/game_091e10.c index 494743508..13efa771f 100644 --- a/src/game/game_091e10.c +++ b/src/game/game_091e10.c @@ -85,13 +85,13 @@ glabel setupGetPtrToCommandByIndex /* f092004: 27bdffd8 */ addiu $sp,$sp,-40 /* f092008: afb10018 */ sw $s1,0x18($sp) /* f09200c: afb30020 */ sw $s3,0x20($sp) -/* f092010: 3c11800a */ lui $s1,0x800a +/* f092010: 3c11800a */ lui $s1,%hi(g_StageSetup+0x10) /* f092014: 00809825 */ or $s3,$a0,$zero /* f092018: afbf0024 */ sw $ra,0x24($sp) /* f09201c: afb2001c */ sw $s2,0x1c($sp) /* f092020: afb00014 */ sw $s0,0x14($sp) /* f092024: 04800014 */ bltz $a0,.L0f092078 -/* f092028: 8e31d040 */ lw $s1,-0x2fc0($s1) +/* f092028: 8e31d040 */ lw $s1,%lo(g_StageSetup+0x10)($s1) /* f09202c: 52200013 */ beqzl $s1,.L0f09207c /* f092030: 00001025 */ or $v0,$zero,$zero /* f092034: 922e0003 */ lbu $t6,0x3($s1) @@ -129,8 +129,8 @@ GLOBAL_ASM( glabel func0f092098 /* f092098: 27bdffd8 */ addiu $sp,$sp,-40 /* f09209c: afb00014 */ sw $s0,0x14($sp) -/* f0920a0: 3c10800a */ lui $s0,0x800a -/* f0920a4: 8e10d040 */ lw $s0,-0x2fc0($s0) +/* f0920a0: 3c10800a */ lui $s0,%hi(g_StageSetup+0x10) +/* f0920a4: 8e10d040 */ lw $s0,%lo(g_StageSetup+0x10)($s0) /* f0920a8: afb30020 */ sw $s3,0x20($sp) /* f0920ac: 00809825 */ or $s3,$a0,$zero /* f0920b0: afbf0024 */ sw $ra,0x24($sp) @@ -172,8 +172,8 @@ GLOBAL_ASM( glabel func0f092124 /* f092124: 27bdffd8 */ addiu $sp,$sp,-40 /* f092128: afb00014 */ sw $s0,0x14($sp) -/* f09212c: 3c10800a */ lui $s0,0x800a -/* f092130: 8e10d040 */ lw $s0,-0x2fc0($s0) +/* f09212c: 3c10800a */ lui $s0,%hi(g_StageSetup+0x10) +/* f092130: 8e10d040 */ lw $s0,%lo(g_StageSetup+0x10)($s0) /* f092134: afb30020 */ sw $s3,0x20($sp) /* f092138: 00809825 */ or $s3,$a0,$zero /* f09213c: afbf0024 */ sw $ra,0x24($sp) @@ -420,8 +420,8 @@ GLOBAL_ASM( glabel func0f092484 /* f092484: 27bdffc0 */ addiu $sp,$sp,-64 /* f092488: afb00018 */ sw $s0,0x18($sp) -/* f09248c: 3c10800a */ lui $s0,0x800a -/* f092490: 8e10d040 */ lw $s0,-0x2fc0($s0) +/* f09248c: 3c10800a */ lui $s0,%hi(g_StageSetup+0x10) +/* f092490: 8e10d040 */ lw $s0,%lo(g_StageSetup+0x10)($s0) /* f092494: afb70034 */ sw $s7,0x34($sp) /* f092498: afb30024 */ sw $s3,0x24($sp) /* f09249c: afb20020 */ sw $s2,0x20($sp) diff --git a/src/game/game_095320.c b/src/game/game_095320.c index 88d24e2be..bd45bf84d 100644 --- a/src/game/game_095320.c +++ b/src/game/game_095320.c @@ -103,8 +103,8 @@ glabel func0f095340 GLOBAL_ASM( glabel func0f0953cc -/* f0953cc: 3c02800a */ lui $v0,%hi(var800a0004) -/* f0953d0: 8c42d0b0 */ lw $v0,-0x2f50($v0) +/* f0953cc: 3c02800a */ lui $v0,%hi(var8009d0b0) +/* f0953d0: 8c42d0b0 */ lw $v0,%lo(var8009d0b0)($v0) /* f0953d4: 27bdffc8 */ addiu $sp,$sp,-56 /* f0953d8: afbf0014 */ sw $ra,0x14($sp) /* f0953dc: 10400009 */ beqz $v0,.L0f095404 @@ -147,7 +147,7 @@ glabel func0f0953cc /* f095460: 01024821 */ addu $t1,$t0,$v0 /* f095464: ad200000 */ sw $zero,0x0($t1) /* f095468: 8cea0000 */ lw $t2,0x0($a3) -/* f09546c: 24420004 */ addiu $v0,$v0,%lo(var800a0004) +/* f09546c: 24420004 */ addiu $v0,$v0,4 /* f095470: 00ca082a */ slt $at,$a2,$t2 /* f095474: 5420fff9 */ bnezl $at,.L0f09545c /* f095478: 8c680000 */ lw $t0,0x0($v1) diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index 23be44cb1..618156eae 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -128,14 +128,14 @@ glabel func0f097ba0 /* f097ba4: afa40040 */ sw $a0,0x40($sp) /* f097ba8: afbf0014 */ sw $ra,0x14($sp) /* f097bac: afa50044 */ sw $a1,0x44($sp) -/* f097bb0: 3c04800a */ lui $a0,0x800a +/* f097bb0: 3c04800a */ lui $a0,%hi(g_Vars+0x28f) /* f097bb4: afa00030 */ sw $zero,0x30($sp) -/* f097bb8: 8084a24f */ lb $a0,-0x5db1($a0) +/* f097bb8: 8084a24f */ lb $a0,%lo(g_Vars+0x28f)($a0) /* f097bbc: 27a5002c */ addiu $a1,$sp,0x2c /* f097bc0: 0c0054b4 */ jal func000152d0 /* f097bc4: 27a60028 */ addiu $a2,$sp,0x28 -/* f097bc8: 3c0e800a */ lui $t6,0x800a -/* f097bcc: 8dcea248 */ lw $t6,-0x5db8($t6) +/* f097bc8: 3c0e800a */ lui $t6,%hi(g_Vars+0x288) +/* f097bcc: 8dcea248 */ lw $t6,%lo(g_Vars+0x288)($t6) /* f097bd0: 0fc549c4 */ jal optionsGetControlMode /* f097bd4: 8dc40070 */ lw $a0,0x70($t6) /* f097bd8: 28410004 */ slti $at,$v0,0x4 @@ -307,10 +307,10 @@ glabel func0f097df0 /* f097dfc: 10410008 */ beq $v0,$at,.L0f097e20 /* f097e00: 24010005 */ addiu $at,$zero,0x5 /* f097e04: 1041000e */ beq $v0,$at,.L0f097e40 -/* f097e08: 3c08800a */ lui $t0,0x800a +/* f097e08: 3c08800a */ lui $t0,%hi(g_Vars+0x284) /* f097e0c: 24010006 */ addiu $at,$zero,0x6 /* f097e10: 10410011 */ beq $v0,$at,.L0f097e58 -/* f097e14: 3c0a800a */ lui $t2,0x800a +/* f097e14: 3c0a800a */ lui $t2,%hi(g_Vars+0x284) /* f097e18: 03e00008 */ jr $ra /* f097e1c: 00601025 */ or $v0,$v1,$zero .L0f097e20: @@ -323,14 +323,14 @@ glabel func0f097df0 /* f097e38: 03e00008 */ jr $ra /* f097e3c: 00001025 */ or $v0,$zero,$zero .L0f097e40: -/* f097e40: 8d08a244 */ lw $t0,-0x5dbc($t0) +/* f097e40: 8d08a244 */ lw $t0,%lo(g_Vars+0x284)($t0) /* f097e44: 25090ddc */ addiu $t1,$t0,0xddc /* f097e48: 10a90008 */ beq $a1,$t1,.L0f097e6c /* f097e4c: 00000000 */ sll $zero,$zero,0x0 /* f097e50: 03e00008 */ jr $ra /* f097e54: 00001025 */ or $v0,$zero,$zero .L0f097e58: -/* f097e58: 8d4aa244 */ lw $t2,-0x5dbc($t2) +/* f097e58: 8d4aa244 */ lw $t2,%lo(g_Vars+0x284)($t2) /* f097e5c: 254b0638 */ addiu $t3,$t2,0x638 /* f097e60: 10ab0002 */ beq $a1,$t3,.L0f097e6c /* f097e64: 00000000 */ sll $zero,$zero,0x0 @@ -354,8 +354,8 @@ glabel func0f097e74 /* f097e98: 15c10013 */ bne $t6,$at,.L0f097ee8 /* f097e9c: 00e02025 */ or $a0,$a3,$zero .L0f097ea0: -/* f097ea0: 3c0f800a */ lui $t7,0x800a -/* f097ea4: 8defa244 */ lw $t7,-0x5dbc($t7) +/* f097ea0: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) +/* f097ea4: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) /* f097ea8: 8de41594 */ lw $a0,0x1594($t7) /* f097eac: 5080001b */ beqzl $a0,.L0f097f1c /* f097eb0: 8fbf0014 */ lw $ra,0x14($sp) @@ -673,10 +673,10 @@ glabel var7f1ac1b0 /* f0982d4: c426c1a8 */ lwc1 $f6,%lo(var7f1ac1a8)($at) /* f0982d8: 31f80001 */ andi $t8,$t7,0x1 /* f0982dc: 468084a0 */ cvt.s.w $f18,$f16 -/* f0982e0: 3c19800a */ lui $t9,0x800a +/* f0982e0: 3c19800a */ lui $t9,%hi(g_Vars+0x284) /* f0982e4: 1300001b */ beqz $t8,.L0f098354 /* f0982e8: 46069083 */ div.s $f2,$f18,$f6 -/* f0982ec: 8f39a244 */ lw $t9,-0x5dbc($t9) +/* f0982ec: 8f39a244 */ lw $t9,%lo(g_Vars+0x284)($t9) /* f0982f0: 832a0de4 */ lb $t2,0xde4($t9) /* f0982f4: 11400017 */ beqz $t2,.L0f098354 /* f0982f8: 00000000 */ sll $zero,$zero,0x0 @@ -1083,8 +1083,8 @@ glabel func0f098884 /* f09889c: 24020001 */ addiu $v0,$zero,0x1 .L0f0988a0: /* f0988a0: 14820006 */ bne $a0,$v0,.L0f0988bc -/* f0988a4: 3c0e800a */ lui $t6,0x800a -/* f0988a8: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0988a4: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0988a8: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0988ac: 81cf0de4 */ lb $t7,0xde4($t6) /* f0988b0: 148f0002 */ bne $a0,$t7,.L0f0988bc /* f0988b4: 00000000 */ sll $zero,$zero,0x0 @@ -1370,9 +1370,9 @@ glabel func0f098c4c /* f098c70: 01ee7821 */ addu $t7,$t7,$t6 /* f098c74: acc20000 */ sw $v0,0x0($a2) /* f098c78: 8defff18 */ lw $t7,%lo(g_Weapons)($t7) -/* f098c7c: 3c18800a */ lui $t8,0x800a +/* f098c7c: 3c18800a */ lui $t8,%hi(g_Vars+0x284) /* f098c80: accf0004 */ sw $t7,0x4($a2) -/* f098c84: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f098c84: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f098c88: 27191580 */ addiu $t9,$t8,0x1580 /* f098c8c: acd90008 */ sw $t9,0x8($a2) /* f098c90: 8fbf0014 */ lw $ra,0x14($sp) @@ -1451,8 +1451,8 @@ glabel func0f098ca0 .L0f098d94: /* f098d94: 1020000b */ beqz $at,.L0f098dc4 /* f098d98: 24030001 */ addiu $v1,$zero,0x1 -/* f098d9c: 3c0e800a */ lui $t6,0x800a -/* f098da0: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f098d9c: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f098da0: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f098da4: 00087880 */ sll $t7,$t0,0x2 /* f098da8: 00001825 */ or $v1,$zero,$zero /* f098dac: 01cfc021 */ addu $t8,$t6,$t7 @@ -1462,8 +1462,8 @@ glabel func0f098ca0 /* f098dbc: 10000009 */ beqz $zero,.L0f098de4 /* f098dc0: 2403ffff */ addiu $v1,$zero,-1 .L0f098dc4: -/* f098dc4: 3c0b800a */ lui $t3,0x800a -/* f098dc8: 8d6ba244 */ lw $t3,-0x5dbc($t3) +/* f098dc4: 3c0b800a */ lui $t3,%hi(g_Vars+0x284) +/* f098dc8: 8d6ba244 */ lw $t3,%lo(g_Vars+0x284)($t3) /* f098dcc: 00086080 */ sll $t4,$t0,0x2 /* f098dd0: 016c6821 */ addu $t5,$t3,$t4 /* f098dd4: 8dae17a8 */ lw $t6,0x17a8($t5) @@ -1636,8 +1636,8 @@ glabel func0f099008 /* f099018: 0fc26313 */ jal func0f098c4c /* f09901c: 27a4001c */ addiu $a0,$sp,0x1c /* f099020: 8fa30028 */ lw $v1,0x28($sp) -/* f099024: 3c0f800a */ lui $t7,0x800a -/* f099028: 8defa244 */ lw $t7,-0x5dbc($t7) +/* f099024: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) +/* f099028: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) /* f09902c: 00037100 */ sll $t6,$v1,0x4 /* f099030: 01c37023 */ subu $t6,$t6,$v1 /* f099034: 000e7080 */ sll $t6,$t6,0x2 @@ -1656,8 +1656,8 @@ glabel func0f099008 /* f099068: 1000000d */ beqz $zero,.L0f0990a0 /* f09906c: 24020001 */ addiu $v0,$zero,0x1 .L0f099070: -/* f099070: 3c18800a */ lui $t8,0x800a -/* f099074: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f099070: 3c18800a */ lui $t8,%hi(g_Vars+0x284) +/* f099074: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f099078: 24040001 */ addiu $a0,$zero,0x1 /* f09907c: 27a5001c */ addiu $a1,$sp,0x1c /* f099080: 03033021 */ addu $a2,$t8,$v1 @@ -1905,8 +1905,8 @@ glabel func0f0991e4 /* f0993cc: 100000e7 */ beqz $zero,.L0f09976c /* f0993d0: 8fa2004c */ lw $v0,0x4c($sp) .L0f0993d4: -/* f0993d4: 3c0a800a */ lui $t2,0x800a -/* f0993d8: 8d4aa244 */ lw $t2,-0x5dbc($t2) +/* f0993d4: 3c0a800a */ lui $t2,%hi(g_Vars+0x284) +/* f0993d8: 8d4aa244 */ lw $t2,%lo(g_Vars+0x284)($t2) /* f0993dc: 8fa50040 */ lw $a1,0x40($sp) /* f0993e0: 02003025 */ or $a2,$s0,$zero /* f0993e4: 81441580 */ lb $a0,0x1580($t2) @@ -1915,19 +1915,19 @@ glabel func0f0991e4 /* f0993f0: 8fac0038 */ lw $t4,0x38($sp) /* f0993f4: 28820024 */ slti $v0,$a0,0x24 /* f0993f8: 10400012 */ beqz $v0,.L0f099444 -/* f0993fc: 3c0b800a */ lui $t3,0x800a -/* f099400: 8d6ba248 */ lw $t3,-0x5db8($t3) +/* f0993fc: 3c0b800a */ lui $t3,%hi(g_Vars+0x288) +/* f099400: 8d6ba248 */ lw $t3,%lo(g_Vars+0x288)($t3) /* f099404: 2483ffff */ addiu $v1,$a0,-1 /* f099408: 000370c3 */ sra $t6,$v1,0x3 /* f09940c: 8d6c0070 */ lw $t4,0x70($t3) -/* f099410: 3c18800b */ lui $t8,0x800b +/* f099410: 3c18800b */ lui $t8,%hi(g_MpPlayers+0x97) /* f099414: 30790007 */ andi $t9,$v1,0x7 /* f099418: 000c6880 */ sll $t5,$t4,0x2 /* f09941c: 01ac6821 */ addu $t5,$t5,$t4 /* f099420: 000d6940 */ sll $t5,$t5,0x5 /* f099424: 01ae7821 */ addu $t7,$t5,$t6 /* f099428: 030fc021 */ addu $t8,$t8,$t7 -/* f09942c: 9318c84f */ lbu $t8,-0x37b1($t8) +/* f09942c: 9318c84f */ lbu $t8,%lo(g_MpPlayers+0x97)($t8) /* f099430: 24090001 */ addiu $t1,$zero,0x1 /* f099434: 03295004 */ sllv $t2,$t1,$t9 /* f099438: 030a1024 */ and $v0,$t8,$t2 @@ -2048,10 +2048,10 @@ glabel func0f0991e4 /* f0995e4: 8e020024 */ lw $v0,0x24($s0) /* f0995e8: 8f2a0000 */ lw $t2,0x0($t9) .L0f0995ec: -/* f0995ec: 3c0b800a */ lui $t3,0x800a +/* f0995ec: 3c0b800a */ lui $t3,%hi(g_Vars+0x284) /* f0995f0: 51400014 */ beqzl $t2,.L0f099644 /* f0995f4: 8e020024 */ lw $v0,0x24($s0) -/* f0995f8: 8d6ba244 */ lw $t3,-0x5dbc($t3) +/* f0995f8: 8d6ba244 */ lw $t3,%lo(g_Vars+0x284)($t3) /* f0995fc: 240c0001 */ addiu $t4,$zero,0x1 /* f099600: 24050004 */ addiu $a1,$zero,0x4 /* f099604: ad601600 */ sw $zero,0x1600($t3) @@ -2099,7 +2099,7 @@ glabel func0f0991e4 /* f09969c: 00001025 */ or $v0,$zero,$zero /* f0996a0: 8f190008 */ lw $t9,0x8($t8) /* f0996a4: 8fa90044 */ lw $t1,0x44($sp) -/* f0996a8: 3c0e800a */ lui $t6,0x800a +/* f0996a8: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) /* f0996ac: 8f2a0000 */ lw $t2,0x0($t9) /* f0996b0: 00096900 */ sll $t5,$t1,0x4 /* f0996b4: 01a96823 */ subu $t5,$t5,$t1 @@ -2112,7 +2112,7 @@ glabel func0f0991e4 /* f0996d0: 00001025 */ or $v0,$zero,$zero .L0f0996d4: /* f0996d4: 01a96821 */ addu $t5,$t5,$t1 -/* f0996d8: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0996d8: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0996dc: 920f0690 */ lbu $t7,0x690($s0) /* f0996e0: 000d68c0 */ sll $t5,$t5,0x3 /* f0996e4: 01a96821 */ addu $t5,$t5,$t1 @@ -2226,10 +2226,10 @@ glabel var7f1ac1b4 /* f099850: 8fa2006c */ lw $v0,0x6c($sp) /* f099854: 8e020608 */ lw $v0,0x608($s0) .L0f099858: -/* f099858: 3c0f800a */ lui $t7,0x800a +/* f099858: 3c0f800a */ lui $t7,%hi(g_Vars+0x318) /* f09985c: 5440001b */ bnezl $v0,.L0f0998cc /* f099860: 24010001 */ addiu $at,$zero,0x1 -/* f099864: 8defa2d8 */ lw $t7,-0x5d28($t7) +/* f099864: 8defa2d8 */ lw $t7,%lo(g_Vars+0x318)($t7) /* f099868: 24580001 */ addiu $t8,$v0,0x1 /* f09986c: 24030010 */ addiu $v1,$zero,0x10 /* f099870: 11e00002 */ beqz $t7,.L0f09987c @@ -2364,8 +2364,8 @@ glabel var7f1ac1b4 /* f099a40: 10000073 */ beqz $zero,.L0f099c10 /* f099a44: 8fa2006c */ lw $v0,0x6c($sp) .L0f099a48: -/* f099a48: 3c02800a */ lui $v0,0x800a -/* f099a4c: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f099a48: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f099a4c: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f099a50: 8fb80064 */ lw $t8,0x64($sp) /* f099a54: 24190001 */ addiu $t9,$zero,0x1 /* f099a58: 8c4f1600 */ lw $t7,0x1600($v0) @@ -2442,8 +2442,8 @@ glabel var7f1ac1b4 /* f099b58: 0019c880 */ sll $t9,$t9,0x2 /* f099b5c: 032fc821 */ addu $t9,$t9,$t7 /* f099b60: 0019c8c0 */ sll $t9,$t9,0x3 -/* f099b64: 3c0e800a */ lui $t6,0x800a -/* f099b68: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f099b64: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f099b68: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f099b6c: 032fc821 */ addu $t9,$t9,$t7 /* f099b70: 0019c880 */ sll $t9,$t9,0x2 /* f099b74: 0019c023 */ negu $t8,$t9 @@ -2704,8 +2704,8 @@ glabel var7f1ac31c /* f099c60: afa70044 */ sw $a3,0x44($sp) /* f099c64: 0fc2c41f */ jal func0f0b107c /* f099c68: 00c02025 */ or $a0,$a2,$zero -/* f099c6c: 3c0e800a */ lui $t6,0x800a -/* f099c70: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f099c6c: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f099c70: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f099c74: afa20030 */ sw $v0,0x30($sp) /* f099c78: 2418ffff */ addiu $t8,$zero,-1 /* f099c7c: 8dcf00d8 */ lw $t7,0xd8($t6) @@ -2723,14 +2723,14 @@ glabel var7f1ac31c /* f099cac: 8e190618 */ lw $t9,0x618($s0) .L0f099cb0: /* f099cb0: 8fa9003c */ lw $t1,0x3c($sp) -/* f099cb4: 3c08800a */ lui $t0,0x800a +/* f099cb4: 3c08800a */ lui $t0,%hi(g_Vars+0x284) /* f099cb8: 17200018 */ bnez $t9,.L0f099d1c /* f099cbc: 00095100 */ sll $t2,$t1,0x4 /* f099cc0: 01495023 */ subu $t2,$t2,$t1 /* f099cc4: 000a5080 */ sll $t2,$t2,0x2 /* f099cc8: 01495021 */ addu $t2,$t2,$t1 /* f099ccc: 000a50c0 */ sll $t2,$t2,0x3 -/* f099cd0: 8d08a244 */ lw $t0,-0x5dbc($t0) +/* f099cd0: 8d08a244 */ lw $t0,%lo(g_Vars+0x284)($t0) /* f099cd4: 01495021 */ addu $t2,$t2,$t1 /* f099cd8: 000a5080 */ sll $t2,$t2,0x2 /* f099cdc: 000a5823 */ negu $t3,$t2 @@ -2760,8 +2760,8 @@ glabel var7f1ac31c /* f099d34: 00094880 */ sll $t1,$t1,0x2 /* f099d38: 01394821 */ addu $t1,$t1,$t9 /* f099d3c: 000948c0 */ sll $t1,$t1,0x3 -/* f099d40: 3c18800a */ lui $t8,0x800a -/* f099d44: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f099d40: 3c18800a */ lui $t8,%hi(g_Vars+0x284) +/* f099d44: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f099d48: 01394821 */ addu $t1,$t1,$t9 /* f099d4c: 00094880 */ sll $t1,$t1,0x2 /* f099d50: 00095023 */ negu $t2,$t1 @@ -3023,12 +3023,12 @@ glabel var7f1ac31c /* f09a0f4: 0fc2637e */ jal func0f098df8 /* f09a0f8: afa00010 */ sw $zero,0x10($sp) .L0f09a0fc: -/* f09a0fc: 3c18800a */ lui $t8,0x800a -/* f09a100: 8f189ff4 */ lw $t8,-0x600c($t8) -/* f09a104: 3c0e800a */ lui $t6,0x800a +/* f09a0fc: 3c18800a */ lui $t8,%hi(g_Vars+0x34) +/* f09a100: 8f189ff4 */ lw $t8,%lo(g_Vars+0x34)($t8) +/* f09a104: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) /* f09a108: 5b00002c */ blezl $t8,.L0f09a1bc /* f09a10c: 8e0e001c */ lw $t6,0x1c($s0) -/* f09a110: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f09a110: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f09a114: 24010001 */ addiu $at,$zero,0x1 /* f09a118: 8dcb0000 */ lw $t3,0x0($t6) /* f09a11c: 51610027 */ beql $t3,$at,.L0f09a1bc @@ -3038,10 +3038,10 @@ glabel var7f1ac31c /* f09a12c: 10400022 */ beqz $v0,.L0f09a1b8 /* f09a130: 3c0c8007 */ lui $t4,%hi(g_PlayerInvincible) /* f09a134: 8d8c0760 */ lw $t4,%lo(g_PlayerInvincible)($t4) -/* f09a138: 3c0f800a */ lui $t7,0x800a +/* f09a138: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) /* f09a13c: 5580001f */ bnezl $t4,.L0f09a1bc /* f09a140: 8e0e001c */ lw $t6,0x1c($s0) -/* f09a144: 8defa244 */ lw $t7,-0x5dbc($t7) +/* f09a144: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) /* f09a148: 8fad0038 */ lw $t5,0x38($sp) /* f09a14c: 8df900d8 */ lw $t9,0xd8($t7) /* f09a150: 5720001a */ bnezl $t9,.L0f09a1bc @@ -3103,7 +3103,7 @@ glabel var7f1ac31c /* f09a218: 8fa90038 */ lw $t1,0x38($sp) /* f09a21c: 8d2a0000 */ lw $t2,0x0($t1) /* f09a220: 2401001a */ addiu $at,$zero,0x1a -/* f09a224: 3c18800a */ lui $t8,0x800a +/* f09a224: 3c18800a */ lui $t8,%hi(g_Vars+0x284) /* f09a228: 55410003 */ bnel $t2,$at,.L0f09a238 /* f09a22c: 8e080018 */ lw $t0,0x18($s0) /* f09a230: ae00068c */ sw $zero,0x68c($s0) @@ -3111,7 +3111,7 @@ glabel var7f1ac31c .L0f09a238: /* f09a238: 55000004 */ bnezl $t0,.L0f09a24c /* f09a23c: 8e0e001c */ lw $t6,0x1c($s0) -/* f09a240: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f09a240: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f09a244: af001600 */ sw $zero,0x1600($t8) /* f09a248: 8e0e001c */ lw $t6,0x1c($s0) .L0f09a24c: @@ -3209,8 +3209,8 @@ glabel func0f09a310 /* f09a38c: 00000000 */ sll $zero,$zero,0x0 /* f09a390: 0fc26238 */ jal func0f0988e0 /* f09a394: 8fa50024 */ lw $a1,0x24($sp) -/* f09a398: 3c08800a */ lui $t0,0x800a -/* f09a39c: 8d08a244 */ lw $t0,-0x5dbc($t0) +/* f09a398: 3c08800a */ lui $t0,%hi(g_Vars+0x284) +/* f09a39c: 8d08a244 */ lw $t0,%lo(g_Vars+0x284)($t0) /* f09a3a0: 2419ffff */ addiu $t9,$zero,-1 /* f09a3a4: 24030001 */ addiu $v1,$zero,0x1 /* f09a3a8: 10000006 */ beqz $zero,.L0f09a3c4 @@ -3621,8 +3621,8 @@ glabel var7f1ac320 /* f09a930: 1840001e */ blez $v0,.L0f09a9ac /* f09a934: 8fa30044 */ lw $v1,0x44($sp) /* f09a938: 8faa005c */ lw $t2,0x5c($sp) -/* f09a93c: 3c09800a */ lui $t1,0x800a -/* f09a940: 8d29a244 */ lw $t1,-0x5dbc($t1) +/* f09a93c: 3c09800a */ lui $t1,%hi(g_Vars+0x284) +/* f09a940: 8d29a244 */ lw $t1,%lo(g_Vars+0x284)($t1) /* f09a944: 000a5900 */ sll $t3,$t2,0x4 /* f09a948: 016a5823 */ subu $t3,$t3,$t2 /* f09a94c: 000b5880 */ sll $t3,$t3,0x2 @@ -3631,10 +3631,10 @@ glabel var7f1ac320 /* f09a958: 016a5821 */ addu $t3,$t3,$t2 /* f09a95c: 000b5880 */ sll $t3,$t3,0x2 /* f09a960: 000b6023 */ negu $t4,$t3 -/* f09a964: 3c02800a */ lui $v0,0x800a +/* f09a964: 3c02800a */ lui $v0,%hi(g_Vars+0x8) /* f09a968: 012c6821 */ addu $t5,$t1,$t4 /* f09a96c: 8dae0fb4 */ lw $t6,0xfb4($t5) -/* f09a970: 8c429fc8 */ lw $v0,-0x6038($v0) +/* f09a970: 8c429fc8 */ lw $v0,%lo(g_Vars+0x8)($v0) /* f09a974: 104e0011 */ beq $v0,$t6,.L0f09a9bc /* f09a978: 00000000 */ sll $zero,$zero,0x0 /* f09a97c: 8e0f01d4 */ lw $t7,0x1d4($s0) @@ -3643,8 +3643,8 @@ glabel var7f1ac320 /* f09a988: 00000000 */ sll $zero,$zero,0x0 /* f09a98c: 0fc2c78a */ jal func0f0b1e28 /* f09a990: 02002025 */ or $a0,$s0,$zero -/* f09a994: 3c18800a */ lui $t8,0x800a -/* f09a998: 8f189fc8 */ lw $t8,-0x6038($t8) +/* f09a994: 3c18800a */ lui $t8,%hi(g_Vars+0x8) +/* f09a998: 8f189fc8 */ lw $t8,%lo(g_Vars+0x8)($t8) /* f09a99c: 24030001 */ addiu $v1,$zero,0x1 /* f09a9a0: 0058c821 */ addu $t9,$v0,$t8 /* f09a9a4: 10000005 */ beqz $zero,.L0f09a9bc @@ -3742,8 +3742,8 @@ glabel var7f1ac320 .L0f09ab00: /* f09ab00: 920b0000 */ lbu $t3,0x0($s0) .L0f09ab04: -/* f09ab04: 3c0a800a */ lui $t2,0x800a -/* f09ab08: 8d4a9fc8 */ lw $t2,-0x6038($t2) +/* f09ab04: 3c0a800a */ lui $t2,%hi(g_Vars+0x8) +/* f09ab08: 8d4a9fc8 */ lw $t2,%lo(g_Vars+0x8)($t2) /* f09ab0c: 24010006 */ addiu $at,$zero,0x6 /* f09ab10: 1561001c */ bne $t3,$at,.L0f09ab84 /* f09ab14: ae0a01d8 */ sw $t2,0x1d8($s0) @@ -4303,8 +4303,8 @@ glabel func0f09b260 /* f09b2b0: 8c4a000c */ lw $t2,0xc($v0) /* f09b2b4: 0fc447a9 */ jal currentPlayerRemoveWeapon /* f09b2b8: 92040000 */ lbu $a0,0x0($s0) -/* f09b2bc: 3c02800a */ lui $v0,0x800a -/* f09b2c0: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f09b2bc: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f09b2c0: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f09b2c4: 90481583 */ lbu $t0,0x1583($v0) /* f09b2c8: 35090008 */ ori $t1,$t0,0x8 /* f09b2cc: 0fc286ac */ jal func0f0a1ab0 @@ -5250,11 +5250,11 @@ glabel func0f09bd58 /* f09bd58: 3c0e8009 */ lui $t6,%hi(var80088804) /* f09bd5c: 91ce8804 */ lbu $t6,%lo(var80088804)($t6) /* f09bd60: 27bdffe0 */ addiu $sp,$sp,-32 -/* f09bd64: 3c03800a */ lui $v1,0x800a +/* f09bd64: 3c03800a */ lui $v1,%hi(g_Vars+0x284) /* f09bd68: afbf0014 */ sw $ra,0x14($sp) /* f09bd6c: 00802825 */ or $a1,$a0,$zero /* f09bd70: 11c00013 */ beqz $t6,.L0f09bdc0 -/* f09bd74: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f09bd74: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f09bd78: afa3001c */ sw $v1,0x1c($sp) /* f09bd7c: 0fc67494 */ jal func0f19d250 /* f09bd80: afa40020 */ sw $a0,0x20($sp) @@ -5262,11 +5262,11 @@ glabel func0f09bd58 /* f09bd88: 00402025 */ or $a0,$v0,$zero /* f09bd8c: 8fa3001c */ lw $v1,0x1c($sp) /* f09bd90: 8fa50020 */ lw $a1,0x20($sp) -/* f09bd94: 3c18800a */ lui $t8,0x800a +/* f09bd94: 3c18800a */ lui $t8,%hi(g_Vars+0x284) /* f09bd98: 906f0638 */ lbu $t7,0x638($v1) /* f09bd9c: 144f0008 */ bne $v0,$t7,.L0f09bdc0 /* f09bda0: 00000000 */ sll $zero,$zero,0x0 -/* f09bda4: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f09bda4: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f09bda8: 8f191580 */ lw $t9,0x1580($t8) /* f09bdac: 00194f00 */ sll $t1,$t9,0x1c /* f09bdb0: 05200003 */ bltz $t1,.L0f09bdc0 @@ -5355,9 +5355,9 @@ glabel func0f09bec8 /* f09bec8: 00047100 */ sll $t6,$a0,0x4 /* f09becc: 01c47023 */ subu $t6,$t6,$a0 /* f09bed0: 000e7080 */ sll $t6,$t6,0x2 -/* f09bed4: 3c02800a */ lui $v0,0x800a +/* f09bed4: 3c02800a */ lui $v0,%hi(g_Vars+0x284) /* f09bed8: 01c47021 */ addu $t6,$t6,$a0 -/* f09bedc: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f09bedc: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f09bee0: 000e70c0 */ sll $t6,$t6,0x3 /* f09bee4: 01c47021 */ addu $t6,$t6,$a0 /* f09bee8: 000e7080 */ sll $t6,$t6,0x2 @@ -5389,8 +5389,8 @@ glabel func0f09bec8 GLOBAL_ASM( glabel func0f09bf44 /* f09bf44: 27bdffe0 */ addiu $sp,$sp,-32 -/* f09bf48: 3c05800a */ lui $a1,0x800a -/* f09bf4c: 8ca5a244 */ lw $a1,-0x5dbc($a1) +/* f09bf48: 3c05800a */ lui $a1,%hi(g_Vars+0x284) +/* f09bf4c: 8ca5a244 */ lw $a1,%lo(g_Vars+0x284)($a1) /* f09bf50: afbf0014 */ sw $ra,0x14($sp) /* f09bf54: 24030001 */ addiu $v1,$zero,0x1 /* f09bf58: afa3001c */ sw $v1,0x1c($sp) @@ -5864,8 +5864,8 @@ glabel var7f1ac5ec /* f09c338: 02002025 */ or $a0,$s0,$zero /* f09c33c: 0fc265e0 */ jal func0f099780 /* f09c340: 34a55dd8 */ ori $a1,$a1,0x5dd8 -/* f09c344: 3c09800a */ lui $t1,0x800a -/* f09c348: 8d29a244 */ lw $t1,-0x5dbc($t1) +/* f09c344: 3c09800a */ lui $t1,%hi(g_Vars+0x284) +/* f09c348: 8d29a244 */ lw $t1,%lo(g_Vars+0x284)($t1) /* f09c34c: 24010001 */ addiu $at,$zero,0x1 /* f09c350: 8d2a1580 */ lw $t2,0x1580($t1) /* f09c354: 000a5f00 */ sll $t3,$t2,0x1c @@ -6082,15 +6082,15 @@ glabel var7f1ac5ec /* f09c648: 10000139 */ beqz $zero,.L0f09cb30 /* f09c64c: 8fa2007c */ lw $v0,0x7c($sp) .L0f09c650: -/* f09c650: 3c0a800a */ lui $t2,0x800a -/* f09c654: 8d4aa244 */ lw $t2,-0x5dbc($t2) -/* f09c658: 3c0b800a */ lui $t3,0x800a -/* f09c65c: 3c0c800a */ lui $t4,0x800a +/* f09c650: 3c0a800a */ lui $t2,%hi(g_Vars+0x284) +/* f09c654: 8d4aa244 */ lw $t2,%lo(g_Vars+0x284)($t2) +/* f09c658: 3c0b800a */ lui $t3,%hi(g_Vars+0x34) +/* f09c65c: 3c0c800a */ lui $t4,%hi(g_Vars+0x284) /* f09c660: ad401600 */ sw $zero,0x1600($t2) -/* f09c664: 8d6b9ff4 */ lw $t3,-0x600c($t3) +/* f09c664: 8d6b9ff4 */ lw $t3,%lo(g_Vars+0x34)($t3) /* f09c668: 596000e1 */ blezl $t3,.L0f09c9f0 /* f09c66c: 8e0e001c */ lw $t6,0x1c($s0) -/* f09c670: 8d8ca244 */ lw $t4,-0x5dbc($t4) +/* f09c670: 8d8ca244 */ lw $t4,%lo(g_Vars+0x284)($t4) /* f09c674: 24010001 */ addiu $at,$zero,0x1 /* f09c678: 8d8d0000 */ lw $t5,0x0($t4) /* f09c67c: 51a100dc */ beql $t5,$at,.L0f09c9f0 @@ -6100,10 +6100,10 @@ glabel var7f1ac5ec /* f09c68c: 104000d7 */ beqz $v0,.L0f09c9ec /* f09c690: 3c0e8007 */ lui $t6,%hi(g_PlayerInvincible) /* f09c694: 8dce0760 */ lw $t6,%lo(g_PlayerInvincible)($t6) -/* f09c698: 3c0f800a */ lui $t7,0x800a +/* f09c698: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) /* f09c69c: 55c000d4 */ bnezl $t6,.L0f09c9f0 /* f09c6a0: 8e0e001c */ lw $t6,0x1c($s0) -/* f09c6a4: 8defa244 */ lw $t7,-0x5dbc($t7) +/* f09c6a4: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) /* f09c6a8: 8fb90070 */ lw $t9,0x70($sp) /* f09c6ac: 8df800d8 */ lw $t8,0xd8($t7) /* f09c6b0: 570000cf */ bnezl $t8,.L0f09c9f0 @@ -6571,8 +6571,8 @@ glabel func0f09cd18 /* f09cd1c: 01e47823 */ subu $t7,$t7,$a0 /* f09cd20: 000f7880 */ sll $t7,$t7,0x2 /* f09cd24: 01e47821 */ addu $t7,$t7,$a0 -/* f09cd28: 3c0e800a */ lui $t6,0x800a -/* f09cd2c: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f09cd28: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f09cd2c: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f09cd30: 000f78c0 */ sll $t7,$t7,0x3 /* f09cd34: 01e47821 */ addu $t7,$t7,$a0 /* f09cd38: 000f7880 */ sll $t7,$t7,0x2 @@ -6738,8 +6738,8 @@ glabel func0f09cf58 /* f09cf5c: 01e47823 */ subu $t7,$t7,$a0 /* f09cf60: 000f7880 */ sll $t7,$t7,0x2 /* f09cf64: 01e47821 */ addu $t7,$t7,$a0 -/* f09cf68: 3c0e800a */ lui $t6,0x800a -/* f09cf6c: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f09cf68: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f09cf6c: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f09cf70: 000f78c0 */ sll $t7,$t7,0x3 /* f09cf74: 01e47821 */ addu $t7,$t7,$a0 /* f09cf78: 000f7880 */ sll $t7,$t7,0x2 @@ -6753,8 +6753,8 @@ glabel func0f09cf88 /* f09cf88: 27bdffa0 */ addiu $sp,$sp,-96 /* f09cf8c: afb00018 */ sw $s0,0x18($sp) /* f09cf90: afbf001c */ sw $ra,0x1c($sp) -/* f09cf94: 3c10800a */ lui $s0,0x800a -/* f09cf98: 8e10a244 */ lw $s0,-0x5dbc($s0) +/* f09cf94: 3c10800a */ lui $s0,%hi(g_Vars+0x284) +/* f09cf98: 8e10a244 */ lw $s0,%lo(g_Vars+0x284)($s0) /* f09cf9c: 27a50054 */ addiu $a1,$sp,0x54 /* f09cfa0: 0fc2c6bc */ jal func0f0b1af0 /* f09cfa4: 24040001 */ addiu $a0,$zero,0x1 @@ -6894,8 +6894,8 @@ glabel var7f1ac620 /* f09d168: 0fc2c3f4 */ jal weaponFindById /* f09d16c: 00402025 */ or $a0,$v0,$zero /* f09d170: 8fa60068 */ lw $a2,0x68($sp) -/* f09d174: 3c05800a */ lui $a1,0x800a -/* f09d178: 8ca5a244 */ lw $a1,-0x5dbc($a1) +/* f09d174: 3c05800a */ lui $a1,%hi(g_Vars+0x284) +/* f09d178: 8ca5a244 */ lw $a1,%lo(g_Vars+0x284)($a1) /* f09d17c: 00067900 */ sll $t7,$a2,0x4 /* f09d180: 01e67823 */ subu $t7,$t7,$a2 /* f09d184: 000f7880 */ sll $t7,$t7,0x2 @@ -7761,8 +7761,8 @@ glabel var7f1ac66c GLOBAL_ASM( glabel func0f09dd7c -/* f09dd7c: 3c03800a */ lui $v1,0x800a -/* f09dd80: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f09dd7c: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f09dd80: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f09dd84: 906e15ea */ lbu $t6,0x15ea($v1) /* f09dd88: 51c00004 */ beqzl $t6,.L0f09dd9c /* f09dd8c: 8c621588 */ lw $v0,0x1588($v1) @@ -7787,20 +7787,20 @@ glabel func0f09dd7c GLOBAL_ASM( glabel func0f09ddcc -/* f09ddcc: 3c0e800a */ lui $t6,0x800a -/* f09ddd0: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f09ddcc: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f09ddd0: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f09ddd4: 03e00008 */ jr $ra /* f09ddd8: 8dc21588 */ lw $v0,0x1588($t6) -/* f09dddc: 3c0e800a */ lui $t6,0x800a -/* f09dde0: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f09dddc: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f09dde0: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f09dde4: 03e00008 */ jr $ra /* f09dde8: 8dc21590 */ lw $v0,0x1590($t6) ); GLOBAL_ASM( glabel func0f09ddec -/* f09ddec: 3c0e800a */ lui $t6,0x800a -/* f09ddf0: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f09ddec: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f09ddf0: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f09ddf4: 03e00008 */ jr $ra /* f09ddf8: 8dc2158c */ lw $v0,0x158c($t6) ); @@ -7957,8 +7957,8 @@ glabel var7f1ac6cc GLOBAL_ASM( glabel func0f09df50 -/* f09df50: 3c0f800a */ lui $t7,0x800a -/* f09df54: 8defa244 */ lw $t7,-0x5dbc($t7) +/* f09df50: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) +/* f09df54: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) /* f09df58: 240e000b */ addiu $t6,$zero,0xb /* f09df5c: 03e00008 */ jr $ra /* f09df60: a1ee15ea */ sb $t6,0x15ea($t7) @@ -7966,8 +7966,8 @@ glabel func0f09df50 GLOBAL_ASM( glabel func0f09df64 -/* f09df64: 3c02800a */ lui $v0,0x800a -/* f09df68: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f09df64: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f09df68: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f09df6c: 240fffff */ addiu $t7,$zero,-1 /* f09df70: 904e15ea */ lbu $t6,0x15ea($v0) /* f09df74: 55c00007 */ bnezl $t6,.L0f09df94 @@ -8136,8 +8136,8 @@ GLOBAL_ASM( glabel func0f09e144 /* f09e144: 27bdff80 */ addiu $sp,$sp,-128 /* f09e148: afb20028 */ sw $s2,0x28($sp) -/* f09e14c: 3c12800a */ lui $s2,0x800a -/* f09e150: 8e52a244 */ lw $s2,-0x5dbc($s2) +/* f09e14c: 3c12800a */ lui $s2,%hi(g_Vars+0x284) +/* f09e150: 8e52a244 */ lw $s2,%lo(g_Vars+0x284)($s2) /* f09e154: afbf002c */ sw $ra,0x2c($sp) /* f09e158: afb10024 */ sw $s1,0x24($sp) /* f09e15c: afb00020 */ sw $s0,0x20($sp) @@ -8819,8 +8819,8 @@ glabel func0f09eae4 /* f09eae8: afbf0014 */ sw $ra,0x14($sp) /* f09eaec: 0fc277e7 */ jal func0f09df9c /* f09eaf0: 00000000 */ sll $zero,$zero,0x0 -/* f09eaf4: 3c03800a */ lui $v1,0x800a -/* f09eaf8: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f09eaf4: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f09eaf8: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f09eafc: 80621580 */ lb $v0,0x1580($v1) /* f09eb00: 10400003 */ beqz $v0,.L0f09eb10 /* f09eb04: 00000000 */ sll $zero,$zero,0x0 @@ -8830,8 +8830,8 @@ glabel func0f09eae4 /* f09eb10: 10000026 */ beqz $zero,.L0f09ebac /* f09eb14: 00001025 */ or $v0,$zero,$zero .L0f09eb18: -/* f09eb18: 3c03800a */ lui $v1,0x800a -/* f09eb1c: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f09eb18: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f09eb1c: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f09eb20: 2401ffff */ addiu $at,$zero,-1 /* f09eb24: 8c6e1588 */ lw $t6,0x1588($v1) /* f09eb28: 51c10004 */ beql $t6,$at,.L0f09eb3c @@ -8864,8 +8864,8 @@ glabel func0f09eae4 /* f09eb88: 00000000 */ sll $zero,$zero,0x0 /* f09eb8c: 1040fffb */ beqz $v0,.L0f09eb7c /* f09eb90: 00000000 */ sll $zero,$zero,0x0 -/* f09eb94: 3c03800a */ lui $v1,0x800a -/* f09eb98: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f09eb94: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f09eb98: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f09eb9c: 00001025 */ or $v0,$zero,$zero /* f09eba0: 90691583 */ lbu $t1,0x1583($v1) /* f09eba4: 312afffd */ andi $t2,$t1,0xfffd @@ -8879,8 +8879,8 @@ glabel func0f09eae4 GLOBAL_ASM( glabel func0f09ebbc -/* f09ebbc: 3c0e800a */ lui $t6,0x800a -/* f09ebc0: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f09ebbc: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f09ebc0: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f09ebc4: 03e00008 */ jr $ra /* f09ebc8: 8dc21598 */ lw $v0,0x1598($t6) ); @@ -8958,7 +8958,7 @@ glabel func0f09ebcc /* f09ecd4: 24a50020 */ addiu $a1,$a1,0x20 /* f09ecd8: 8fa20038 */ lw $v0,0x38($sp) /* f09ecdc: 8e0d0048 */ lw $t5,0x48($s0) -/* f09ece0: 3c19800a */ lui $t9,0x800a +/* f09ece0: 3c19800a */ lui $t9,%hi(g_Vars+0xc) /* f09ece4: c4440000 */ lwc1 $f4,0x0($v0) /* f09ece8: e5a40004 */ swc1 $f4,0x4($t5) /* f09ecec: 8e0e0048 */ lw $t6,0x48($s0) @@ -8970,7 +8970,7 @@ glabel func0f09ebcc /* f09ed04: 8e180048 */ lw $t8,0x48($s0) /* f09ed08: af1000d4 */ sw $s0,0xd4($t8) /* f09ed0c: 8e080048 */ lw $t0,0x48($s0) -/* f09ed10: 8f399fcc */ lw $t9,-0x6034($t9) +/* f09ed10: 8f399fcc */ lw $t9,%lo(g_Vars+0xc)($t9) /* f09ed14: ad1900d8 */ sw $t9,0xd8($t0) /* f09ed18: 8fbf001c */ lw $ra,0x1c($sp) .L0f09ed1c: @@ -8990,10 +8990,10 @@ glabel func0f09ed2c /* f09ed40: afa70064 */ sw $a3,0x64($sp) /* f09ed44: 8c820014 */ lw $v0,0x14($a0) /* f09ed48: 00808025 */ or $s0,$a0,$zero -/* f09ed4c: 3c0e800a */ lui $t6,0x800a +/* f09ed4c: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) /* f09ed50: 5040002d */ beqzl $v0,.L0f09ee08 /* f09ed54: 8fbf002c */ lw $ra,0x2c($sp) -/* f09ed58: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f09ed58: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f09ed5c: 27a50038 */ addiu $a1,$sp,0x38 /* f09ed60: 8dc200bc */ lw $v0,0xbc($t6) /* f09ed64: c4440008 */ lwc1 $f4,0x8($v0) @@ -9195,8 +9195,8 @@ glabel var7f1ac704 /* f09f01c: 3421ffff */ ori $at,$at,0xffff /* f09f020: 01416024 */ and $t4,$t2,$at /* f09f024: ae0c0040 */ sw $t4,0x40($s0) -/* f09f028: 3c0d800a */ lui $t5,0x800a -/* f09f02c: 8dada2d8 */ lw $t5,-0x5d28($t5) +/* f09f028: 3c0d800a */ lui $t5,%hi(g_Vars+0x318) +/* f09f02c: 8dada2d8 */ lw $t5,%lo(g_Vars+0x318)($t5) /* f09f030: 8fae00b8 */ lw $t6,0xb8($sp) /* f09f034: 11a00005 */ beqz $t5,.L0f09f04c /* f09f038: 00000000 */ sll $zero,$zero,0x0 @@ -9289,10 +9289,10 @@ glabel var7f1ac72c /* f09f11c: 8de90004 */ lw $t1,0x4($t7) /* f09f120: adc10000 */ sw $at,0x0($t6) /* f09f124: 8de10008 */ lw $at,0x8($t7) -/* f09f128: 3c03800a */ lui $v1,0x800a +/* f09f128: 3c03800a */ lui $v1,%hi(g_Vars+0x284) /* f09f12c: adc90004 */ sw $t1,0x4($t6) /* f09f130: adc10008 */ sw $at,0x8($t6) -/* f09f134: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f09f134: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f09f138: 28810002 */ slti $at,$a0,0x2 /* f09f13c: 00803825 */ or $a3,$a0,$zero /* f09f140: 8c6a00bc */ lw $t2,0xbc($v1) @@ -9344,8 +9344,8 @@ glabel var7f1ac72c /* f09f1f4: 0c00567f */ jal func000159fc /* f09f1f8: 27a501f4 */ addiu $a1,$sp,0x1f4 .L0f09f1fc: -/* f09f1fc: 3c0f800a */ lui $t7,0x800a -/* f09f200: 8defa244 */ lw $t7,-0x5dbc($t7) +/* f09f1fc: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) +/* f09f200: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) /* f09f204: 8fa90034 */ lw $t1,0x34($sp) /* f09f208: 27a50190 */ addiu $a1,$sp,0x190 /* f09f20c: 01e92021 */ addu $a0,$t7,$t1 @@ -9698,8 +9698,8 @@ glabel var7f1ac72c /* f09f73c: 24010035 */ addiu $at,$zero,0x35 .L0f09f740: /* f09f740: 1461000d */ bne $v1,$at,.L0f09f778 -/* f09f744: 3c0b800a */ lui $t3,0x800a -/* f09f748: 8d6ba474 */ lw $t3,-0x5b8c($t3) +/* f09f744: 3c0b800a */ lui $t3,%hi(g_Vars+0x4b4) +/* f09f748: 8d6ba474 */ lw $t3,%lo(g_Vars+0x4b4)($t3) /* f09f74c: 24010026 */ addiu $at,$zero,0x26 /* f09f750: 5561000a */ bnel $t3,$at,.L0f09f77c /* f09f754: 8c8d0040 */ lw $t5,0x40($a0) @@ -9778,8 +9778,8 @@ glabel func0f09f848 /* f09f850: 27bdff80 */ addiu $sp,$sp,-128 /* f09f854: 000e7080 */ sll $t6,$t6,0x2 /* f09f858: 01c47021 */ addu $t6,$t6,$a0 -/* f09f85c: 3c02800a */ lui $v0,0x800a -/* f09f860: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f09f85c: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f09f860: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f09f864: 000e70c0 */ sll $t6,$t6,0x3 /* f09f868: 01c47021 */ addu $t6,$t6,$a0 /* f09f86c: afb10018 */ sw $s1,0x18($sp) @@ -9907,8 +9907,8 @@ glabel func0f09fa20 /* f09fa24: 01e47823 */ subu $t7,$t7,$a0 /* f09fa28: 000f7880 */ sll $t7,$t7,0x2 /* f09fa2c: 01e47821 */ addu $t7,$t7,$a0 -/* f09fa30: 3c0e800a */ lui $t6,0x800a -/* f09fa34: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f09fa30: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f09fa34: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f09fa38: 000f78c0 */ sll $t7,$t7,0x3 /* f09fa3c: 01e47821 */ addu $t7,$t7,$a0 /* f09fa40: 27bdffe0 */ addiu $sp,$sp,-32 @@ -9945,9 +9945,9 @@ glabel var7f1ac73c glabel var7f1ac740 .word 0x3fd55555 .text -/* f09fa84: 3c02800a */ lui $v0,0x800a +/* f09fa84: 3c02800a */ lui $v0,%hi(g_Vars+0x284) /* f09fa88: 00042900 */ sll $a1,$a0,0x4 -/* f09fa8c: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f09fa8c: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f09fa90: 00a42823 */ subu $a1,$a1,$a0 /* f09fa94: 27bdfd48 */ addiu $sp,$sp,-696 /* f09fa98: 00052880 */ sll $a1,$a1,0x2 @@ -10282,7 +10282,7 @@ glabel var7f1ac740 /* f09ff94: 24010018 */ addiu $at,$zero,0x18 /* f09ff98: 8fac01d8 */ lw $t4,0x1d8($sp) /* f09ff9c: 10410004 */ beq $v0,$at,.L0f09ffb0 -/* f09ffa0: 3c18800a */ lui $t8,0x800a +/* f09ffa0: 3c18800a */ lui $t8,%hi(g_Vars+0x284) /* f09ffa4: 24010019 */ addiu $at,$zero,0x19 /* f09ffa8: 54410010 */ bnel $v0,$at,.L0f09ffec /* f09ffac: 2401001b */ addiu $at,$zero,0x1b @@ -10294,7 +10294,7 @@ glabel var7f1ac740 /* f09ffc0: 00000000 */ sll $zero,$zero,0x0 /* f09ffc4: 24050054 */ addiu $a1,$zero,0x54 .L0f09ffc8: -/* f09ffc8: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f09ffc8: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f09ffcc: 8faf01d8 */ lw $t7,0x1d8($sp) /* f09ffd0: 8f1900bc */ lw $t9,0xbc($t8) /* f09ffd4: 8de40040 */ lw $a0,0x40($t7) @@ -10305,8 +10305,8 @@ glabel var7f1ac740 /* f09ffe8: 2401001b */ addiu $at,$zero,0x1b .L0f09ffec: /* f09ffec: 1441000e */ bne $v0,$at,.L0f0a0028 -/* f09fff0: 3c09800a */ lui $t1,0x800a -/* f09fff4: 8d29a244 */ lw $t1,-0x5dbc($t1) +/* f09fff0: 3c09800a */ lui $t1,%hi(g_Vars+0x284) +/* f09fff4: 8d29a244 */ lw $t1,%lo(g_Vars+0x284)($t1) /* f09fff8: 8fa801d8 */ lw $t0,0x1d8($sp) /* f09fffc: 24050056 */ addiu $a1,$zero,0x56 /* f0a0000: 8d2a00bc */ lw $t2,0xbc($t1) @@ -10322,8 +10322,8 @@ glabel var7f1ac740 .L0f0a0028: /* f0a0028: 24010017 */ addiu $at,$zero,0x17 /* f0a002c: 1441000e */ bne $v0,$at,.L0f0a0068 -/* f0a0030: 3c0e800a */ lui $t6,0x800a -/* f0a0034: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0a0030: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0a0034: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0a0038: 8fad01d8 */ lw $t5,0x1d8($sp) /* f0a003c: 24050055 */ addiu $a1,$zero,0x55 /* f0a0040: 8dcf00bc */ lw $t7,0xbc($t6) @@ -10339,9 +10339,9 @@ glabel var7f1ac740 .L0f0a0068: /* f0a0068: 24010012 */ addiu $at,$zero,0x12 /* f0a006c: 1441000e */ bne $v0,$at,.L0f0a00a8 -/* f0a0070: 3c0d800a */ lui $t5,0x800a -/* f0a0074: 3c09800a */ lui $t1,0x800a -/* f0a0078: 8d29a244 */ lw $t1,-0x5dbc($t1) +/* f0a0070: 3c0d800a */ lui $t5,%hi(g_Vars+0x284) +/* f0a0074: 3c09800a */ lui $t1,%hi(g_Vars+0x284) +/* f0a0078: 8d29a244 */ lw $t1,%lo(g_Vars+0x284)($t1) /* f0a007c: 8fa801d8 */ lw $t0,0x1d8($sp) /* f0a0080: 24050055 */ addiu $a1,$zero,0x55 /* f0a0084: 8d2a00bc */ lw $t2,0xbc($t1) @@ -10354,7 +10354,7 @@ glabel var7f1ac740 /* f0a00a0: 10000009 */ beqz $zero,.L0f0a00c8 /* f0a00a4: a04b005f */ sb $t3,0x5f($v0) .L0f0a00a8: -/* f0a00a8: 8dada244 */ lw $t5,-0x5dbc($t5) +/* f0a00a8: 8dada244 */ lw $t5,%lo(g_Vars+0x284)($t5) /* f0a00ac: 8fac01d8 */ lw $t4,0x1d8($sp) /* f0a00b0: 00e02825 */ or $a1,$a3,$zero /* f0a00b4: 8dae00bc */ lw $t6,0xbc($t5) @@ -10371,7 +10371,7 @@ glabel var7f1ac740 /* f0a00dc: 50c00097 */ beqzl $a2,.L0f0a033c /* f0a00e0: afb800b8 */ sw $t8,0xb8($sp) /* f0a00e4: 8ccf0008 */ lw $t7,0x8($a2) -/* f0a00e8: 3c0c800a */ lui $t4,0x800a +/* f0a00e8: 3c0c800a */ lui $t4,%hi(g_Vars+0x28c) /* f0a00ec: 02002025 */ or $a0,$s0,$zero /* f0a00f0: 11e00091 */ beqz $t7,.L0f0a0338 /* f0a00f4: 27a501e0 */ addiu $a1,$sp,0x1e0 @@ -10390,7 +10390,7 @@ glabel var7f1ac740 /* f0a0124: 3421ffff */ ori $at,$at,0xffff /* f0a0128: 01215024 */ and $t2,$t1,$at /* f0a012c: ae0a0040 */ sw $t2,0x40($s0) -/* f0a0130: 8d8ca24c */ lw $t4,-0x5db4($t4) +/* f0a0130: 8d8ca24c */ lw $t4,%lo(g_Vars+0x28c)($t4) /* f0a0134: 27af0270 */ addiu $t7,$sp,0x270 /* f0a0138: 27a70264 */ addiu $a3,$sp,0x264 /* f0a013c: 000c6f00 */ sll $t5,$t4,0x1c @@ -10400,7 +10400,7 @@ glabel var7f1ac740 /* f0a014c: afaf0010 */ sw $t7,0x10($sp) /* f0a0150: 8e180040 */ lw $t8,0x40($s0) /* f0a0154: 8fa301d8 */ lw $v1,0x1d8($sp) -/* f0a0158: 3c0e800a */ lui $t6,0x800a +/* f0a0158: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) /* f0a015c: 33190080 */ andi $t9,$t8,0x80 /* f0a0160: 13200073 */ beqz $t9,.L0f0a0330 /* f0a0164: 240f0001 */ addiu $t7,$zero,0x1 @@ -10422,7 +10422,7 @@ glabel var7f1ac740 /* f0a01a0: 356d0010 */ ori $t5,$t3,0x10 /* f0a01a4: acad0000 */ sw $t5,0x0($a1) .L0f0a01a8: -/* f0a01a8: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0a01a8: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0a01ac: 8e180048 */ lw $t8,0x48($s0) /* f0a01b0: 3c013f80 */ lui $at,0x3f80 /* f0a01b4: 8dcf1630 */ lw $t7,0x1630($t6) @@ -11156,8 +11156,8 @@ glabel func0f0a0b98 GLOBAL_ASM( glabel func0f0a0bec -/* f0a0bec: 3c02800a */ lui $v0,0x800a -/* f0a0bf0: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0a0bec: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0a0bf0: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0a0bf4: c4441660 */ lwc1 $f4,0x1660($v0) /* f0a0bf8: e4840000 */ swc1 $f4,0x0($a0) /* f0a0bfc: c4461664 */ lwc1 $f6,0x1664($v0) @@ -11173,11 +11173,11 @@ glabel func0f0a0c08 /* f0a0c14: e4800000 */ swc1 $f0,0x0($a0) /* f0a0c18: e4800004 */ swc1 $f0,0x4($a0) /* f0a0c1c: e4800008 */ swc1 $f0,0x8($a0) -/* f0a0c20: 3c04800a */ lui $a0,%hi(var800a1660) -/* f0a0c24: 8c84a244 */ lw $a0,-0x5dbc($a0) +/* f0a0c20: 3c04800a */ lui $a0,%hi(g_Vars+0x284) +/* f0a0c24: 8c84a244 */ lw $a0,%lo(g_Vars+0x284)($a0) /* f0a0c28: 3c063f80 */ lui $a2,0x3f80 /* f0a0c2c: 0fc2d30f */ jal func0f0b4c3c -/* f0a0c30: 24841660 */ addiu $a0,$a0,%lo(var800a1660) +/* f0a0c30: 24841660 */ addiu $a0,$a0,5728 /* f0a0c34: 8fbf0014 */ lw $ra,0x14($sp) /* f0a0c38: 27bd0018 */ addiu $sp,$sp,0x18 /* f0a0c3c: 03e00008 */ jr $ra @@ -11195,8 +11195,8 @@ glabel func0f0a0c44 /* f0a0c5c: e4a00004 */ swc1 $f0,0x4($a1) /* f0a0c60: e4a00008 */ swc1 $f0,0x8($a1) /* f0a0c64: 8faf0018 */ lw $t7,0x18($sp) -/* f0a0c68: 3c0e800a */ lui $t6,0x800a -/* f0a0c6c: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0a0c68: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0a0c6c: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0a0c70: 000fc100 */ sll $t8,$t7,0x4 /* f0a0c74: 030fc023 */ subu $t8,$t8,$t7 /* f0a0c78: 0018c080 */ sll $t8,$t8,0x2 @@ -11227,8 +11227,8 @@ glabel func0f0a0cb0 /* f0a0ccc: 00c02025 */ or $a0,$a2,$zero /* f0a0cd0: 0fc2c43b */ jal func0f0b10ec /* f0a0cd4: e7a2003c */ swc1 $f2,0x3c($sp) -/* f0a0cd8: 3c0e800a */ lui $t6,0x800a -/* f0a0cdc: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0a0cd8: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0a0cdc: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0a0ce0: c7a2003c */ lwc1 $f2,0x3c($sp) /* f0a0ce4: 10400007 */ beqz $v0,.L0f0a0d04 /* f0a0ce8: afae002c */ sw $t6,0x2c($sp) @@ -11526,8 +11526,8 @@ glabel func0f0a0fac /* f0a1114: e7a60098 */ swc1 $f6,0x98($sp) /* f0a1118: 0c004b70 */ jal random /* f0a111c: afa20038 */ sw $v0,0x38($sp) -/* f0a1120: 3c03800a */ lui $v1,%hi(var800a0638) -/* f0a1124: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f0a1120: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f0a1124: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f0a1128: c7aa0098 */ lwc1 $f10,0x98($sp) /* f0a112c: 8fad0038 */ lw $t5,0x38($sp) /* f0a1130: c4681728 */ lwc1 $f8,0x1728($v1) @@ -11601,14 +11601,14 @@ glabel func0f0a0fac /* f0a1238: 01e67823 */ subu $t7,$t7,$a2 /* f0a123c: 000f7880 */ sll $t7,$t7,0x2 /* f0a1240: 01e67821 */ addu $t7,$t7,$a2 -/* f0a1244: 3c0e800a */ lui $t6,0x800a -/* f0a1248: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0a1244: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0a1248: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0a124c: 000f78c0 */ sll $t7,$t7,0x3 /* f0a1250: 01e67821 */ addu $t7,$t7,$a2 /* f0a1254: 000f7880 */ sll $t7,$t7,0x2 /* f0a1258: 01cf1821 */ addu $v1,$t6,$t7 /* f0a125c: 80780c14 */ lb $t8,0xc14($v1) -/* f0a1260: 24630638 */ addiu $v1,$v1,%lo(var800a0638) +/* f0a1260: 24630638 */ addiu $v1,$v1,1592 /* f0a1264: 57000004 */ bnezl $t8,.L0f0a1278 /* f0a1268: c46405ec */ lwc1 $f4,0x5ec($v1) /* f0a126c: 03e00008 */ jr $ra @@ -11637,8 +11637,8 @@ glabel func0f0a12b0 /* f0a12b4: 01e67823 */ subu $t7,$t7,$a2 /* f0a12b8: 000f7880 */ sll $t7,$t7,0x2 /* f0a12bc: 01e67821 */ addu $t7,$t7,$a2 -/* f0a12c0: 3c0e800a */ lui $t6,0x800a -/* f0a12c4: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0a12c0: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0a12c4: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0a12c8: 000f78c0 */ sll $t7,$t7,0x3 /* f0a12cc: 01e67821 */ addu $t7,$t7,$a2 /* f0a12d0: 000f7880 */ sll $t7,$t7,0x2 @@ -11667,8 +11667,8 @@ glabel func0f0a1318 /* f0a131c: 01e47823 */ subu $t7,$t7,$a0 /* f0a1320: 000f7880 */ sll $t7,$t7,0x2 /* f0a1324: 01e47821 */ addu $t7,$t7,$a0 -/* f0a1328: 3c0e800a */ lui $t6,0x800a -/* f0a132c: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0a1328: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0a132c: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0a1330: 000f78c0 */ sll $t7,$t7,0x3 /* f0a1334: 01e47821 */ addu $t7,$t7,$a0 /* f0a1338: 000f7880 */ sll $t7,$t7,0x2 @@ -11685,9 +11685,9 @@ glabel func0f0a134c /* f0a1354: 01c47023 */ subu $t6,$t6,$a0 /* f0a1358: afb5002c */ sw $s5,0x2c($sp) /* f0a135c: 000e7080 */ sll $t6,$t6,0x2 -/* f0a1360: 3c15800a */ lui $s5,0x800a +/* f0a1360: 3c15800a */ lui $s5,%hi(g_Vars+0x284) /* f0a1364: 01c47021 */ addu $t6,$t6,$a0 -/* f0a1368: 8eb5a244 */ lw $s5,-0x5dbc($s5) +/* f0a1368: 8eb5a244 */ lw $s5,%lo(g_Vars+0x284)($s5) /* f0a136c: 000e70c0 */ sll $t6,$t6,0x3 /* f0a1370: 01c47021 */ addu $t6,$t6,$a0 /* f0a1374: 000e7080 */ sll $t6,$t6,0x2 @@ -11748,25 +11748,25 @@ glabel func0f0a134c /* f0a1444: 1657ffdd */ bne $s2,$s7,.L0f0a13bc /* f0a1448: 26730001 */ addiu $s3,$s3,0x1 .L0f0a144c: -/* f0a144c: 3c0a800a */ lui $t2,0x800a -/* f0a1450: 8d4aa2d4 */ lw $t2,-0x5d2c($t2) +/* f0a144c: 3c0a800a */ lui $t2,%hi(g_Vars+0x314) +/* f0a1450: 8d4aa2d4 */ lw $t2,%lo(g_Vars+0x314)($t2) /* f0a1454: 3c0b8009 */ lui $t3,%hi(g_Is4Mb) /* f0a1458: 11400025 */ beqz $t2,.L0f0a14f0 /* f0a145c: 00000000 */ sll $zero,$zero,0x0 /* f0a1460: 916b0af0 */ lbu $t3,%lo(g_Is4Mb)($t3) /* f0a1464: 24060001 */ addiu $a2,$zero,0x1 -/* f0a1468: 3c0c800a */ lui $t4,0x800a +/* f0a1468: 3c0c800a */ lui $t4,%hi(g_Vars+0x6c) /* f0a146c: 14cb001e */ bne $a2,$t3,.L0f0a14e8 -/* f0a1470: 3c0e800a */ lui $t6,0x800a -/* f0a1474: 8d8ca02c */ lw $t4,-0x5fd4($t4) -/* f0a1478: 3c0d800a */ lui $t5,0x800a -/* f0a147c: 3c0f800a */ lui $t7,0x800a +/* f0a1470: 3c0e800a */ lui $t6,%hi(g_Vars+0x68) +/* f0a1474: 8d8ca02c */ lw $t4,%lo(g_Vars+0x6c)($t4) +/* f0a1478: 3c0d800a */ lui $t5,%hi(g_Vars+0x64) +/* f0a147c: 3c0f800a */ lui $t7,%hi(g_Vars+0x70) /* f0a1480: 11800003 */ beqz $t4,.L0f0a1490 /* f0a1484: 00002825 */ or $a1,$zero,$zero /* f0a1488: 10000001 */ beqz $zero,.L0f0a1490 /* f0a148c: 00c02825 */ or $a1,$a2,$zero .L0f0a1490: -/* f0a1490: 8dcea028 */ lw $t6,-0x5fd8($t6) +/* f0a1490: 8dcea028 */ lw $t6,%lo(g_Vars+0x68)($t6) /* f0a1494: 00001825 */ or $v1,$zero,$zero /* f0a1498: 00002025 */ or $a0,$zero,$zero /* f0a149c: 11c00003 */ beqz $t6,.L0f0a14ac @@ -11774,13 +11774,13 @@ glabel func0f0a134c /* f0a14a4: 10000001 */ beqz $zero,.L0f0a14ac /* f0a14a8: 00c01825 */ or $v1,$a2,$zero .L0f0a14ac: -/* f0a14ac: 8dada024 */ lw $t5,-0x5fdc($t5) +/* f0a14ac: 8dada024 */ lw $t5,%lo(g_Vars+0x64)($t5) /* f0a14b0: 11a00003 */ beqz $t5,.L0f0a14c0 /* f0a14b4: 00000000 */ sll $zero,$zero,0x0 /* f0a14b8: 10000001 */ beqz $zero,.L0f0a14c0 /* f0a14bc: 00c02025 */ or $a0,$a2,$zero .L0f0a14c0: -/* f0a14c0: 8defa030 */ lw $t7,-0x5fd0($t7) +/* f0a14c0: 8defa030 */ lw $t7,%lo(g_Vars+0x70)($t7) /* f0a14c4: 11e00003 */ beqz $t7,.L0f0a14d4 /* f0a14c8: 00000000 */ sll $zero,$zero,0x0 /* f0a14cc: 10000001 */ beqz $zero,.L0f0a14d4 @@ -11815,8 +11815,8 @@ GLOBAL_ASM( glabel func0f0a1528 /* f0a1528: 27bdffb8 */ addiu $sp,$sp,-72 /* f0a152c: afb50040 */ sw $s5,0x40($sp) -/* f0a1530: 3c03800a */ lui $v1,0x800a -/* f0a1534: 8c75a244 */ lw $s5,-0x5dbc($v1) +/* f0a1530: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f0a1534: 8c75a244 */ lw $s5,%lo(g_Vars+0x284)($v1) /* f0a1538: afb4003c */ sw $s4,0x3c($sp) /* f0a153c: afbf0044 */ sw $ra,0x44($sp) /* f0a1540: afb30038 */ sw $s3,0x38($sp) @@ -12046,17 +12046,17 @@ glabel func0f0a1528 /* f0a1880: 2407ffff */ addiu $a3,$zero,-1 /* f0a1884: 0c004241 */ jal func00010904 /* f0a1888: e7a40014 */ swc1 $f4,0x14($sp) -/* f0a188c: 3c03800a */ lui $v1,0x800a -/* f0a1890: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f0a188c: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f0a1890: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f0a1894: 3c010008 */ lui $at,0x8 -/* f0a1898: 3c0e800a */ lui $t6,0x800a +/* f0a1898: 3c0e800a */ lui $t6,%hi(g_Vars+0x4b4) /* f0a189c: 906a1c50 */ lbu $t2,0x1c50($v1) /* f0a18a0: 354b0040 */ ori $t3,$t2,0x40 /* f0a18a4: a06b1c50 */ sb $t3,0x1c50($v1) /* f0a18a8: 8e0c0014 */ lw $t4,0x14($s0) /* f0a18ac: 01816825 */ or $t5,$t4,$at /* f0a18b0: ae0d0014 */ sw $t5,0x14($s0) -/* f0a18b4: 8dcea474 */ lw $t6,-0x5b8c($t6) +/* f0a18b4: 8dcea474 */ lw $t6,%lo(g_Vars+0x4b4)($t6) /* f0a18b8: 24010035 */ addiu $at,$zero,0x35 /* f0a18bc: 35b81000 */ ori $t8,$t5,0x1000 /* f0a18c0: 15c10002 */ bne $t6,$at,.L0f0a18cc @@ -12113,8 +12113,8 @@ glabel func0f0a1528 GLOBAL_ASM( glabel currentPlayerEquipWeaponInCutscene -/* f0a196c: 3c02800a */ lui $v0,0x800a -/* f0a1970: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0a196c: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0a1970: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0a1974: 804e1580 */ lb $t6,0x1580($v0) /* f0a1978: 548e0006 */ bnel $a0,$t6,.L0f0a1994 /* f0a197c: 90581583 */ lbu $t8,0x1583($v0) @@ -12138,8 +12138,8 @@ glabel getCurrentPlayerWeaponId /* f0a19ac: 01c47023 */ subu $t6,$t6,$a0 /* f0a19b0: 000e7080 */ sll $t6,$t6,0x2 /* f0a19b4: 01c47021 */ addu $t6,$t6,$a0 -/* f0a19b8: 3c03800a */ lui $v1,0x800a -/* f0a19bc: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f0a19b8: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f0a19bc: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f0a19c0: 000e70c0 */ sll $t6,$t6,0x3 /* f0a19c4: 01c47021 */ addu $t6,$t6,$a0 /* f0a19c8: 000e7080 */ sll $t6,$t6,0x2 @@ -12191,8 +12191,8 @@ glabel func0f0a1a10 GLOBAL_ASM( glabel func0f0a1a68 -/* f0a1a68: 3c02800a */ lui $v0,0x800a -/* f0a1a6c: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0a1a68: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0a1a6c: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0a1a70: 00802825 */ or $a1,$a0,$zero /* f0a1a74: 24010001 */ addiu $at,$zero,0x1 /* f0a1a78: 80431582 */ lb $v1,0x1582($v0) @@ -12612,15 +12612,15 @@ glabel func0f0a1df4 /* f0a2000: 0fc4473e */ jal func0f111cf8 /* f0a2004: 03c02825 */ or $a1,$s8,$zero /* f0a2008: 10400006 */ beqz $v0,.L0f0a2024 -/* f0a200c: 3c02800a */ lui $v0,0x800a -/* f0a2010: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0a200c: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0a2010: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0a2014: 904c1583 */ lbu $t4,0x1583($v0) /* f0a2018: 358d0080 */ ori $t5,$t4,0x80 /* f0a201c: 10000006 */ beqz $zero,.L0f0a2038 /* f0a2020: a04d1583 */ sb $t5,0x1583($v0) .L0f0a2024: -/* f0a2024: 3c02800a */ lui $v0,0x800a -/* f0a2028: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0a2024: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0a2028: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0a202c: 904e1583 */ lbu $t6,0x1583($v0) /* f0a2030: 31cfff7f */ andi $t7,$t6,0xff7f /* f0a2034: a04f1583 */ sb $t7,0x1583($v0) @@ -12628,10 +12628,10 @@ glabel func0f0a1df4 /* f0a2038: 0fc2865b */ jal currentPlayerEquipWeaponInCutscene /* f0a203c: 03c02025 */ or $a0,$s8,$zero /* f0a2040: 8fb80040 */ lw $t8,0x40($sp) -/* f0a2044: 3c02800a */ lui $v0,0x800a +/* f0a2044: 3c02800a */ lui $v0,%hi(g_Vars+0x284) /* f0a2048: 53000006 */ beqzl $t8,.L0f0a2064 /* f0a204c: 8fbf003c */ lw $ra,0x3c($sp) -/* f0a2050: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0a2050: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0a2054: 90481583 */ lbu $t0,0x1583($v0) /* f0a2058: 35090004 */ ori $t1,$t0,0x4 /* f0a205c: a0491583 */ sb $t1,0x1583($v0) @@ -12659,8 +12659,8 @@ glabel currentPlayerEquipWeapon /* f0a209c: afbf0014 */ sw $ra,0x14($sp) /* f0a20a0: 14a00007 */ bnez $a1,.L0f0a20c0 /* f0a20a4: 3c02800a */ lui $v0,0x800a -/* f0a20a8: 3c02800a */ lui $v0,0x800a -/* f0a20ac: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0a20a8: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0a20ac: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0a20b0: 904e1583 */ lbu $t6,0x1583($v0) /* f0a20b4: 31cfff7f */ andi $t7,$t6,0xff7f /* f0a20b8: 1000000c */ beqz $zero,.L0f0a20ec @@ -12692,8 +12692,8 @@ glabel func0f0a20fc /* f0a2100: 01e47823 */ subu $t7,$t7,$a0 /* f0a2104: 000f7880 */ sll $t7,$t7,0x2 /* f0a2108: 01e47821 */ addu $t7,$t7,$a0 -/* f0a210c: 3c0e800a */ lui $t6,0x800a -/* f0a2110: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0a210c: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0a2110: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0a2114: 000f78c0 */ sll $t7,$t7,0x3 /* f0a2118: 01e47821 */ addu $t7,$t7,$a0 /* f0a211c: 000f7880 */ sll $t7,$t7,0x2 @@ -12708,8 +12708,8 @@ glabel func0f0a212c /* f0a2130: 01e47823 */ subu $t7,$t7,$a0 /* f0a2134: 000f7880 */ sll $t7,$t7,0x2 /* f0a2138: 01e47821 */ addu $t7,$t7,$a0 -/* f0a213c: 3c0e800a */ lui $t6,0x800a -/* f0a2140: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0a213c: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0a2140: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0a2144: 000f78c0 */ sll $t7,$t7,0x3 /* f0a2148: 01e47821 */ addu $t7,$t7,$a0 /* f0a214c: 000f7880 */ sll $t7,$t7,0x2 @@ -12784,8 +12784,8 @@ glabel func0f0a21d0 GLOBAL_ASM( glabel func0f0a2218 -/* f0a2218: 3c0e800a */ lui $t6,0x800a -/* f0a221c: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0a2218: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0a221c: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0a2220: 27bdffe0 */ addiu $sp,$sp,-32 /* f0a2224: afbf0014 */ sw $ra,0x14($sp) /* f0a2228: afa40020 */ sw $a0,0x20($sp) @@ -12821,8 +12821,8 @@ glabel func0f0a2218 GLOBAL_ASM( glabel func0f0a2290 /* f0a2290: 27bdffe0 */ addiu $sp,$sp,-32 -/* f0a2294: 3c0e800a */ lui $t6,0x800a -/* f0a2298: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0a2294: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0a2298: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0a229c: afbf0014 */ sw $ra,0x14($sp) /* f0a22a0: e7ac0020 */ swc1 $f12,0x20($sp) /* f0a22a4: c7ac0020 */ lwc1 $f12,0x20($sp) @@ -12858,8 +12858,8 @@ glabel func0f0a2308 /* f0a230c: 0304c023 */ subu $t8,$t8,$a0 /* f0a2310: 0018c080 */ sll $t8,$t8,0x2 /* f0a2314: 0304c021 */ addu $t8,$t8,$a0 -/* f0a2318: 3c0f800a */ lui $t7,0x800a -/* f0a231c: 8defa244 */ lw $t7,-0x5dbc($t7) +/* f0a2318: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) +/* f0a231c: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) /* f0a2320: 0018c0c0 */ sll $t8,$t8,0x3 /* f0a2324: 0304c021 */ addu $t8,$t8,$a0 /* f0a2328: 0018c080 */ sll $t8,$t8,0x2 @@ -13194,11 +13194,11 @@ glabel func0f0a256c GLOBAL_ASM( glabel func0f0a27c8 -/* f0a27c8: 3c04800a */ lui $a0,%hi(var800a0638) -/* f0a27cc: 8c84a244 */ lw $a0,-0x5dbc($a0) +/* f0a27c8: 3c04800a */ lui $a0,%hi(g_Vars+0x284) +/* f0a27cc: 8c84a244 */ lw $a0,%lo(g_Vars+0x284)($a0) /* f0a27d0: 27bdffe0 */ addiu $sp,$sp,-32 /* f0a27d4: afbf0014 */ sw $ra,0x14($sp) -/* f0a27d8: 24840638 */ addiu $a0,$a0,%lo(var800a0638) +/* f0a27d8: 24840638 */ addiu $a0,$a0,1592 /* f0a27dc: 0fc2c40f */ jal func0f0b103c /* f0a27e0: afa4001c */ sw $a0,0x1c($sp) /* f0a27e4: 10400017 */ beqz $v0,.L0f0a2844 @@ -13226,10 +13226,10 @@ glabel func0f0a27c8 /* f0a283c: 10000022 */ beqz $zero,.L0f0a28c8 /* f0a2840: 24020001 */ addiu $v0,$zero,0x1 .L0f0a2844: -/* f0a2844: 3c04800a */ lui $a0,%hi(var800a0ddc) -/* f0a2848: 8c84a244 */ lw $a0,-0x5dbc($a0) +/* f0a2844: 3c04800a */ lui $a0,%hi(g_Vars+0x284) +/* f0a2848: 8c84a244 */ lw $a0,%lo(g_Vars+0x284)($a0) /* f0a284c: 80890de4 */ lb $t1,0xde4($a0) -/* f0a2850: 24840ddc */ addiu $a0,$a0,%lo(var800a0ddc) +/* f0a2850: 24840ddc */ addiu $a0,$a0,3548 /* f0a2854: 5120001c */ beqzl $t1,.L0f0a28c8 /* f0a2858: 00001025 */ or $v0,$zero,$zero /* f0a285c: 0fc2c40f */ jal func0f0b103c @@ -13265,11 +13265,11 @@ glabel func0f0a27c8 /* f0a28cc: 27bd0020 */ addiu $sp,$sp,0x20 /* f0a28d0: 03e00008 */ jr $ra /* f0a28d4: 00000000 */ sll $zero,$zero,0x0 -/* f0a28d8: 3c04800a */ lui $a0,%hi(var800a0638) -/* f0a28dc: 8c84a244 */ lw $a0,-0x5dbc($a0) +/* f0a28d8: 3c04800a */ lui $a0,%hi(g_Vars+0x284) +/* f0a28dc: 8c84a244 */ lw $a0,%lo(g_Vars+0x284)($a0) /* f0a28e0: 27bdffe0 */ addiu $sp,$sp,-32 /* f0a28e4: afbf0014 */ sw $ra,0x14($sp) -/* f0a28e8: 24840638 */ addiu $a0,$a0,%lo(var800a0638) +/* f0a28e8: 24840638 */ addiu $a0,$a0,1592 /* f0a28ec: 0fc2c40f */ jal func0f0b103c /* f0a28f0: afa4001c */ sw $a0,0x1c($sp) /* f0a28f4: 10400013 */ beqz $v0,.L0f0a2944 @@ -13293,10 +13293,10 @@ glabel func0f0a27c8 /* f0a293c: 1000001e */ beqz $zero,.L0f0a29b8 /* f0a2940: 24020001 */ addiu $v0,$zero,0x1 .L0f0a2944: -/* f0a2944: 3c04800a */ lui $a0,%hi(var800a0ddc) -/* f0a2948: 8c84a244 */ lw $a0,-0x5dbc($a0) +/* f0a2944: 3c04800a */ lui $a0,%hi(g_Vars+0x284) +/* f0a2948: 8c84a244 */ lw $a0,%lo(g_Vars+0x284)($a0) /* f0a294c: 80890de4 */ lb $t1,0xde4($a0) -/* f0a2950: 24840ddc */ addiu $a0,$a0,%lo(var800a0ddc) +/* f0a2950: 24840ddc */ addiu $a0,$a0,3548 /* f0a2954: 51200018 */ beqzl $t1,.L0f0a29b8 /* f0a2958: 00001025 */ or $v0,$zero,$zero /* f0a295c: 0fc2c40f */ jal func0f0b103c @@ -13333,8 +13333,8 @@ glabel func0f0a27c8 GLOBAL_ASM( glabel func0f0a29c8 /* f0a29c8: 27bdffd0 */ addiu $sp,$sp,-48 -/* f0a29cc: 3c02800a */ lui $v0,0x800a -/* f0a29d0: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0a29cc: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0a29d0: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0a29d4: afbf002c */ sw $ra,0x2c($sp) /* f0a29d8: afb20028 */ sw $s2,0x28($sp) /* f0a29dc: afb10024 */ sw $s1,0x24($sp) @@ -13418,8 +13418,8 @@ GLOBAL_ASM( glabel func0f0a2ae4 /* f0a2ae4: 27bdffb0 */ addiu $sp,$sp,-80 /* f0a2ae8: afb40030 */ sw $s4,0x30($sp) -/* f0a2aec: 3c14800a */ lui $s4,0x800a -/* f0a2af0: 8e94a244 */ lw $s4,-0x5dbc($s4) +/* f0a2aec: 3c14800a */ lui $s4,%hi(g_Vars+0x284) +/* f0a2af0: 8e94a244 */ lw $s4,%lo(g_Vars+0x284)($s4) /* f0a2af4: afbf0034 */ sw $ra,0x34($sp) /* f0a2af8: afb3002c */ sw $s3,0x2c($sp) /* f0a2afc: afb20028 */ sw $s2,0x28($sp) @@ -13579,8 +13579,8 @@ glabel func0f0a2ae4 /* f0a2d3c: a2890d0e */ sb $t1,0xd0e($s4) /* f0a2d40: 166a000b */ bne $s3,$t2,.L0f0a2d70 /* f0a2d44: ae800c3c */ sw $zero,0xc3c($s4) -/* f0a2d48: 3c0b800a */ lui $t3,0x800a -/* f0a2d4c: 8d6ba244 */ lw $t3,-0x5dbc($t3) +/* f0a2d48: 3c0b800a */ lui $t3,%hi(g_Vars+0x284) +/* f0a2d4c: 8d6ba244 */ lw $t3,%lo(g_Vars+0x284)($t3) /* f0a2d50: 8d620264 */ lw $v0,0x264($t3) /* f0a2d54: 50400006 */ beqzl $v0,.L0f0a2d70 /* f0a2d58: a6800010 */ sh $zero,0x10($s4) @@ -13894,14 +13894,14 @@ glabel var7f1ac7c4 GLOBAL_ASM( glabel func0f0a3104 -/* f0a3104: 3c0e800a */ lui $t6,0x800a -/* f0a3108: 8dcea24c */ lw $t6,-0x5db4($t6) +/* f0a3104: 3c0e800a */ lui $t6,%hi(g_Vars+0x28c) +/* f0a3108: 8dcea24c */ lw $t6,%lo(g_Vars+0x28c)($t6) /* f0a310c: 27bdffe0 */ addiu $sp,$sp,-32 /* f0a3110: afbf0014 */ sw $ra,0x14($sp) /* f0a3114: 0fc4a24b */ jal setCurrentPlayerNum /* f0a3118: afae001c */ sw $t6,0x1c($sp) -/* f0a311c: 3c02800a */ lui $v0,0x800a -/* f0a3120: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0a311c: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0a3120: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0a3124: 24010022 */ addiu $at,$zero,0x22 /* f0a3128: 3c048007 */ lui $a0,%hi(var80070200) /* f0a312c: 904f0ddc */ lbu $t7,0xddc($v0) @@ -14489,11 +14489,11 @@ glabel func0f0a37b4 /* f0a381c: 0c0056d9 */ jal func00015b64 /* f0a3820: 27a50064 */ addiu $a1,$sp,0x64 /* f0a3824: 8e1800b4 */ lw $t8,0xb4($s0) -/* f0a3828: 3c02800a */ lui $v0,0x800a +/* f0a3828: 3c02800a */ lui $v0,%hi(g_Vars+0x284) /* f0a382c: 3c013f80 */ lui $at,0x3f80 /* f0a3830: 17000009 */ bnez $t8,.L0f0a3858 /* f0a3834: 260402b4 */ addiu $a0,$s0,0x2b4 -/* f0a3838: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0a3838: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0a383c: 8c481c54 */ lw $t0,0x1c54($v0) /* f0a3840: 8c5900c4 */ lw $t9,0xc4($v0) /* f0a3844: 01004827 */ nor $t1,$t0,$zero @@ -14921,8 +14921,8 @@ glabel var7f1ac8b8 /* f0a3df4: 01402025 */ or $a0,$t2,$zero /* f0a3df8: 0c006949 */ jal func0001a524 /* f0a3dfc: 00002825 */ or $a1,$zero,$zero -/* f0a3e00: 3c01800a */ lui $at,0x800a -/* f0a3e04: ac22d0dc */ sw $v0,-0x2f24($at) +/* f0a3e00: 3c01800a */ lui $at,%hi(var8009d0dc) +/* f0a3e04: ac22d0dc */ sw $v0,%lo(var8009d0dc)($at) /* f0a3e08: 3c0b7f0a */ lui $t3,%hi(func0f0a256c) /* f0a3e0c: 3c10800a */ lui $s0,%hi(var8009d0f0) /* f0a3e10: 256b256c */ addiu $t3,$t3,%lo(func0f0a256c) @@ -15305,10 +15305,10 @@ glabel func0f0a4334 /* f0a4358: 55e1001b */ bnel $t7,$at,.L0f0a43c8 /* f0a435c: c600023c */ lwc1 $f0,0x23c($s0) /* f0a4360: 8c98074c */ lw $t8,0x74c($a0) -/* f0a4364: 3c19800a */ lui $t9,0x800a +/* f0a4364: 3c19800a */ lui $t9,%hi(g_Vars+0x34) /* f0a4368: 57000013 */ bnezl $t8,.L0f0a43b8 /* f0a436c: 3c013f80 */ lui $at,0x3f80 -/* f0a4370: 8f399ff4 */ lw $t9,-0x600c($t9) +/* f0a4370: 8f399ff4 */ lw $t9,%lo(g_Vars+0x34)($t9) /* f0a4374: 3c048009 */ lui $a0,%hi(var80095200) /* f0a4378: 24050065 */ addiu $a1,$zero,0x65 /* f0a437c: 1320000d */ beqz $t9,.L0f0a43b4 @@ -15373,8 +15373,8 @@ glabel var7f1ac8c8 .word 0x411fffff .text /* f0a4438: 27bdff60 */ addiu $sp,$sp,-160 -/* f0a443c: 3c0e800a */ lui $t6,0x800a -/* f0a4440: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0a443c: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0a4440: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0a4444: afbf0044 */ sw $ra,0x44($sp) /* f0a4448: afb60040 */ sw $s6,0x40($sp) /* f0a444c: afb5003c */ sw $s5,0x3c($sp) @@ -15533,16 +15533,16 @@ glabel func0f0a45d0 /* f0a4664: 00e02025 */ or $a0,$a3,$zero /* f0a4668: 0c006949 */ jal func0001a524 /* f0a466c: 00002825 */ or $a1,$zero,$zero -/* f0a4670: 3c01800a */ lui $at,0x800a -/* f0a4674: ac22d148 */ sw $v0,-0x2eb8($at) +/* f0a4670: 3c01800a */ lui $at,%hi(var8009d148) +/* 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 /* f0a4684: 10000003 */ beqz $zero,.L0f0a4694 /* f0a4688: ac38efcc */ sw $t8,-0x1034($at) .L0f0a468c: -/* f0a468c: 3c01800a */ lui $at,0x800a -/* f0a4690: ac39d148 */ sw $t9,-0x2eb8($at) +/* f0a468c: 3c01800a */ lui $at,%hi(var8009d148) +/* f0a4690: ac39d148 */ sw $t9,%lo(var8009d148)($at) .L0f0a4694: /* f0a4694: 8fbf0014 */ lw $ra,0x14($sp) /* f0a4698: 27bd0018 */ addiu $sp,$sp,0x18 @@ -16802,11 +16802,11 @@ glabel var7f1aca70 /* f0a55a0: 00041900 */ sll $v1,$a0,0x4 /* f0a55a4: 00641823 */ subu $v1,$v1,$a0 /* f0a55a8: 00031880 */ sll $v1,$v1,0x2 -/* f0a55ac: 3c02800a */ lui $v0,0x800a +/* f0a55ac: 3c02800a */ lui $v0,%hi(g_Vars+0x284) /* f0a55b0: 00641821 */ addu $v1,$v1,$a0 /* f0a55b4: ad590004 */ sw $t9,0x4($t2) /* f0a55b8: ad410008 */ sw $at,0x8($t2) -/* f0a55bc: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0a55bc: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0a55c0: 000318c0 */ sll $v1,$v1,0x3 /* f0a55c4: 00641821 */ addu $v1,$v1,$a0 /* f0a55c8: 00031880 */ sll $v1,$v1,0x2 @@ -17041,10 +17041,10 @@ glabel var7f1aca70 /* f0a5930: 11e00054 */ beqz $t7,.L0f0a5a84 /* f0a5934: 00000000 */ sll $zero,$zero,0x0 /* f0a5938: 8fa201cc */ lw $v0,0x1cc($sp) -/* f0a593c: 3c09800a */ lui $t1,0x800a +/* f0a593c: 3c09800a */ lui $t1,%hi(g_Vars+0x34) /* f0a5940: 10400050 */ beqz $v0,.L0f0a5a84 /* f0a5944: 00000000 */ sll $zero,$zero,0x0 -/* f0a5948: 8d299ff4 */ lw $t1,-0x600c($t1) +/* f0a5948: 8d299ff4 */ lw $t1,%lo(g_Vars+0x34)($t1) /* f0a594c: 1120004d */ beqz $t1,.L0f0a5a84 /* f0a5950: 00000000 */ sll $zero,$zero,0x0 /* f0a5954: 8c4d0014 */ lw $t5,0x14($v0) @@ -17560,8 +17560,8 @@ glabel var7f1aca70 /* f0a60e4: 35890004 */ ori $t1,$t4,0x4 /* f0a60e8: a20906d6 */ sb $t1,0x6d6($s0) .L0f0a60ec: -/* f0a60ec: 3c01800a */ lui $at,0x800a -/* f0a60f0: ac30d144 */ sw $s0,-0x2ebc($at) +/* f0a60ec: 3c01800a */ lui $at,%hi(var8009d144) +/* f0a60f0: ac30d144 */ sw $s0,%lo(var8009d144)($at) /* f0a60f4: 960a06d6 */ lhu $t2,0x6d6($s0) /* f0a60f8: 000a5b02 */ srl $t3,$t2,0xc /* f0a60fc: 19600004 */ blez $t3,.L0f0a6110 @@ -17571,10 +17571,10 @@ glabel var7f1aca70 /* f0a610c: 8fa601b8 */ lw $a2,0x1b8($sp) .L0f0a6110: /* f0a6110: 2408ffff */ addiu $t0,$zero,-1 -/* f0a6114: 3c01800a */ lui $at,0x800a +/* f0a6114: 3c01800a */ lui $at,%hi(var8009d0dc) /* f0a6118: 8fb901c4 */ lw $t9,0x1c4($sp) /* f0a611c: 3c03800a */ lui $v1,%hi(var8009d0f0) -/* f0a6120: ac28d0dc */ sw $t0,-0x2f24($at) +/* f0a6120: ac28d0dc */ sw $t0,%lo(var8009d0dc)($at) /* f0a6124: 2463d0f0 */ addiu $v1,$v1,%lo(var8009d0f0) /* f0a6128: 24010014 */ addiu $at,$zero,0x14 /* f0a612c: ac680008 */ sw $t0,0x8($v1) @@ -17832,7 +17832,7 @@ glabel var7f1aca70 /* f0a64c0: 55600006 */ bnezl $t3,.L0f0a64dc /* f0a64c4: 8e050558 */ lw $a1,0x558($s0) /* f0a64c8: 820e0004 */ lb $t6,0x4($s0) -/* f0a64cc: 3c05800a */ lui $a1,0x800a +/* f0a64cc: 3c05800a */ lui $a1,%hi(g_Vars+0xc) /* f0a64d0: 11c0000b */ beqz $t6,.L0f0a6500 /* f0a64d4: 00000000 */ sll $zero,$zero,0x0 /* f0a64d8: 8e050558 */ lw $a1,0x558($s0) @@ -17847,7 +17847,7 @@ glabel var7f1aca70 /* f0a64f8: 1000000a */ beqz $zero,.L0f0a6524 /* f0a64fc: 00402025 */ or $a0,$v0,$zero .L0f0a6500: -/* f0a6500: 8ca59fcc */ lw $a1,-0x6034($a1) +/* f0a6500: 8ca59fcc */ lw $a1,%lo(g_Vars+0xc)($a1) /* f0a6504: 24010003 */ addiu $at,$zero,0x3 /* f0a6508: 8fa40280 */ lw $a0,0x280($sp) /* f0a650c: 00a1001a */ div $zero,$a1,$at @@ -17893,8 +17893,8 @@ glabel var7f1aca70 /* f0a65a8: 59c0005a */ blezl $t6,.L0f0a6714 /* f0a65ac: 8fac01c4 */ lw $t4,0x1c4($sp) /* f0a65b0: 13210057 */ beq $t9,$at,.L0f0a6710 -/* f0a65b4: 3c0f800a */ lui $t7,0x800a -/* f0a65b8: 8def9ff4 */ lw $t7,-0x600c($t7) +/* f0a65b4: 3c0f800a */ lui $t7,%hi(g_Vars+0x34) +/* f0a65b8: 8def9ff4 */ lw $t7,%lo(g_Vars+0x34)($t7) /* f0a65bc: 02002025 */ or $a0,$s0,$zero /* f0a65c0: 8fa501c0 */ lw $a1,0x1c0($sp) /* f0a65c4: 11e00052 */ beqz $t7,.L0f0a6710 @@ -18013,8 +18013,8 @@ glabel var7f1aca70 /* f0a6768: 820f0004 */ lb $t7,0x4($s0) .L0f0a676c: /* f0a676c: 11e0000c */ beqz $t7,.L0f0a67a0 -/* f0a6770: 3c18800a */ lui $t8,0x800a -/* f0a6774: 8f189ff4 */ lw $t8,-0x600c($t8) +/* f0a6770: 3c18800a */ lui $t8,%hi(g_Vars+0x34) +/* f0a6774: 8f189ff4 */ lw $t8,%lo(g_Vars+0x34)($t8) /* f0a6778: 02002025 */ or $a0,$s0,$zero /* f0a677c: 8fa50308 */ lw $a1,0x308($sp) /* f0a6780: 13000007 */ beqz $t8,.L0f0a67a0 @@ -18026,18 +18026,18 @@ glabel var7f1aca70 /* f0a6798: 0fc294c0 */ jal func0f0a5300 /* f0a679c: afb90014 */ sw $t9,0x14($sp) .L0f0a67a0: -/* f0a67a0: 3c0d800a */ lui $t5,0x800a -/* f0a67a4: 8dada02c */ lw $t5,-0x5fd4($t5) -/* f0a67a8: 3c0c800a */ lui $t4,0x800a -/* f0a67ac: 3c09800a */ lui $t1,0x800a +/* f0a67a0: 3c0d800a */ lui $t5,%hi(g_Vars+0x6c) +/* f0a67a4: 8dada02c */ lw $t5,%lo(g_Vars+0x6c)($t5) +/* f0a67a8: 3c0c800a */ lui $t4,%hi(g_Vars+0x68) +/* f0a67ac: 3c09800a */ lui $t1,%hi(g_Vars+0x64) /* f0a67b0: 11a00003 */ beqz $t5,.L0f0a67c0 -/* f0a67b4: 3c0a800a */ lui $t2,0x800a +/* f0a67b4: 3c0a800a */ lui $t2,%hi(g_Vars+0x70) /* f0a67b8: 10000002 */ beqz $zero,.L0f0a67c4 /* f0a67bc: 24050001 */ addiu $a1,$zero,0x1 .L0f0a67c0: /* f0a67c0: 00002825 */ or $a1,$zero,$zero .L0f0a67c4: -/* f0a67c4: 8d8ca028 */ lw $t4,-0x5fd8($t4) +/* f0a67c4: 8d8ca028 */ lw $t4,%lo(g_Vars+0x68)($t4) /* f0a67c8: 24010001 */ addiu $at,$zero,0x1 /* f0a67cc: 00002025 */ or $a0,$zero,$zero /* f0a67d0: 11800003 */ beqz $t4,.L0f0a67e0 @@ -18045,14 +18045,14 @@ glabel var7f1aca70 /* f0a67d8: 10000001 */ beqz $zero,.L0f0a67e0 /* f0a67dc: 24040001 */ addiu $a0,$zero,0x1 .L0f0a67e0: -/* f0a67e0: 8d29a024 */ lw $t1,-0x5fdc($t1) +/* f0a67e0: 8d29a024 */ lw $t1,%lo(g_Vars+0x64)($t1) /* f0a67e4: 00001825 */ or $v1,$zero,$zero /* f0a67e8: 11200003 */ beqz $t1,.L0f0a67f8 /* f0a67ec: 00000000 */ sll $zero,$zero,0x0 /* f0a67f0: 10000001 */ beqz $zero,.L0f0a67f8 /* f0a67f4: 24030001 */ addiu $v1,$zero,0x1 .L0f0a67f8: -/* f0a67f8: 8d4aa030 */ lw $t2,-0x5fd0($t2) +/* f0a67f8: 8d4aa030 */ lw $t2,%lo(g_Vars+0x70)($t2) /* f0a67fc: 00001025 */ or $v0,$zero,$zero /* f0a6800: 3c0e8009 */ lui $t6,%hi(g_Is4Mb) /* f0a6804: 11400003 */ beqz $t2,.L0f0a6814 @@ -18067,10 +18067,10 @@ glabel var7f1aca70 /* f0a6824: 960d06d6 */ lhu $t5,0x6d6($s0) /* f0a6828: 91ce0af0 */ lbu $t6,%lo(g_Is4Mb)($t6) /* f0a682c: 24010001 */ addiu $at,$zero,0x1 -/* f0a6830: 3c19800a */ lui $t9,0x800a +/* f0a6830: 3c19800a */ lui $t9,%hi(g_Vars+0x34) /* f0a6834: 51c10009 */ beql $t6,$at,.L0f0a685c /* f0a6838: 960d06d6 */ lhu $t5,0x6d6($s0) -/* f0a683c: 8f399ff4 */ lw $t9,-0x600c($t9) +/* f0a683c: 8f399ff4 */ lw $t9,%lo(g_Vars+0x34)($t9) /* f0a6840: 02002025 */ or $a0,$s0,$zero /* f0a6844: 8fa50308 */ lw $a1,0x308($sp) /* f0a6848: 13200003 */ beqz $t9,.L0f0a6858 @@ -18088,15 +18088,15 @@ glabel var7f1aca70 /* f0a6870: 0fc291a9 */ jal func0f0a46a4 /* f0a6874: 8fa601b8 */ lw $a2,0x1b8($sp) .L0f0a6878: -/* f0a6878: 3c09800a */ lui $t1,0x800a -/* f0a687c: 8d29a02c */ lw $t1,-0x5fd4($t1) -/* f0a6880: 3c02800a */ lui $v0,0x800a -/* f0a6884: 3c03800a */ lui $v1,0x800a -/* f0a6888: 3c06800a */ lui $a2,0x800a -/* f0a688c: 8cc6a030 */ lw $a2,-0x5fd0($a2) -/* f0a6890: 8c63a024 */ lw $v1,-0x5fdc($v1) +/* f0a6878: 3c09800a */ lui $t1,%hi(g_Vars+0x6c) +/* f0a687c: 8d29a02c */ lw $t1,%lo(g_Vars+0x6c)($t1) +/* f0a6880: 3c02800a */ lui $v0,%hi(g_Vars+0x68) +/* f0a6884: 3c03800a */ lui $v1,%hi(g_Vars+0x64) +/* f0a6888: 3c06800a */ lui $a2,%hi(g_Vars+0x70) +/* f0a688c: 8cc6a030 */ lw $a2,%lo(g_Vars+0x70)($a2) +/* f0a6890: 8c63a024 */ lw $v1,%lo(g_Vars+0x64)($v1) /* f0a6894: 11200003 */ beqz $t1,.L0f0a68a4 -/* f0a6898: 8c42a028 */ lw $v0,-0x5fd8($v0) +/* f0a6898: 8c42a028 */ lw $v0,%lo(g_Vars+0x68)($v0) /* f0a689c: 10000002 */ beqz $zero,.L0f0a68a8 /* f0a68a0: 24050001 */ addiu $a1,$zero,0x1 .L0f0a68a4: @@ -18370,14 +18370,14 @@ glabel func0f0a6c30 glabel var7f1aca88 .word 0x3ecccccd .text -/* f0a6c30: 3c0e800a */ lui $t6,0x800a -/* f0a6c34: 8dcea24c */ lw $t6,-0x5db4($t6) +/* f0a6c30: 3c0e800a */ lui $t6,%hi(g_Vars+0x28c) +/* f0a6c34: 8dcea24c */ lw $t6,%lo(g_Vars+0x28c)($t6) /* f0a6c38: 27bdffb0 */ addiu $sp,$sp,-80 -/* f0a6c3c: 3c03800a */ lui $v1,0x800a +/* f0a6c3c: 3c03800a */ lui $v1,%hi(g_Vars+0x284) /* f0a6c40: afbf001c */ sw $ra,0x1c($sp) /* f0a6c44: afb00018 */ sw $s0,0x18($sp) /* f0a6c48: 15c00004 */ bnez $t6,.L0f0a6c5c -/* f0a6c4c: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f0a6c4c: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f0a6c50: 0fc2434d */ jal func0f090d34 /* f0a6c54: afa3004c */ sw $v1,0x4c($sp) /* f0a6c58: 8fa3004c */ lw $v1,0x4c($sp) @@ -18385,14 +18385,14 @@ glabel var7f1aca88 /* f0a6c5c: 8c6f1580 */ lw $t7,0x1580($v1) /* f0a6c60: 000fcf80 */ sll $t9,$t7,0x1e /* f0a6c64: 07210003 */ bgez $t9,.L0f0a6c74 -/* f0a6c68: 3c02800a */ lui $v0,%hi(var800a07a4) +/* f0a6c68: 3c02800a */ lui $v0,%hi(g_Vars+0x284) /* f0a6c6c: 10000006 */ beqz $zero,.L0f0a6c88 -/* f0a6c70: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0a6c70: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) .L0f0a6c74: /* f0a6c74: 0fc27aa4 */ jal func0f09ea90 /* f0a6c78: afa3004c */ sw $v1,0x4c($sp) -/* f0a6c7c: 3c02800a */ lui $v0,%hi(var800a07a4) -/* f0a6c80: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0a6c7c: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0a6c80: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0a6c84: 8fa3004c */ lw $v1,0x4c($sp) .L0f0a6c88: /* f0a6c88: 8c491c54 */ lw $t1,0x1c54($v0) @@ -18403,11 +18403,11 @@ glabel var7f1aca88 /* f0a6c9c: 5560000c */ bnezl $t3,.L0f0a6cd0 /* f0a6ca0: 30980002 */ andi $t8,$a0,0x2 /* f0a6ca4: 8c620480 */ lw $v0,0x480($v1) -/* f0a6ca8: 3c0c800a */ lui $t4,0x800a +/* f0a6ca8: 3c0c800a */ lui $t4,%hi(g_Vars+0x284) /* f0a6cac: 50400008 */ beqzl $v0,.L0f0a6cd0 /* f0a6cb0: 30980002 */ andi $t8,$a0,0x2 /* f0a6cb4: a0400037 */ sb $zero,0x37($v0) -/* f0a6cb8: 8d8ca244 */ lw $t4,-0x5dbc($t4) +/* f0a6cb8: 8d8ca244 */ lw $t4,%lo(g_Vars+0x284)($t4) /* f0a6cbc: 8d8e1c54 */ lw $t6,0x1c54($t4) /* f0a6cc0: 8d8d00c4 */ lw $t5,0xc4($t4) /* f0a6cc4: 01c07827 */ nor $t7,$t6,$zero @@ -18433,8 +18433,8 @@ glabel var7f1aca88 /* f0a6d0c: 10000006 */ beqz $zero,.L0f0a6d28 /* f0a6d10: ac600254 */ sw $zero,0x254($v1) .L0f0a6d14: -/* f0a6d14: 3c0a800a */ lui $t2,0x800a -/* f0a6d18: 8d4a9ff4 */ lw $t2,-0x600c($t2) +/* f0a6d14: 3c0a800a */ lui $t2,%hi(g_Vars+0x34) +/* f0a6d18: 8d4a9ff4 */ lw $t2,%lo(g_Vars+0x34)($t2) /* f0a6d1c: 8c680254 */ lw $t0,0x254($v1) /* f0a6d20: 010a5821 */ addu $t3,$t0,$t2 /* f0a6d24: ac6b0254 */ sw $t3,0x254($v1) @@ -18467,8 +18467,8 @@ glabel var7f1aca88 /* f0a6d84: 10000006 */ beqz $zero,.L0f0a6da0 /* f0a6d88: ac600254 */ sw $zero,0x254($v1) .L0f0a6d8c: -/* f0a6d8c: 3c09800a */ lui $t1,0x800a -/* f0a6d90: 8d299ff4 */ lw $t1,-0x600c($t1) +/* f0a6d8c: 3c09800a */ lui $t1,%hi(g_Vars+0x34) +/* f0a6d90: 8d299ff4 */ lw $t1,%lo(g_Vars+0x34)($t1) /* f0a6d94: 8c790254 */ lw $t9,0x254($v1) /* f0a6d98: 03294021 */ addu $t0,$t9,$t1 /* f0a6d9c: ac680254 */ sw $t0,0x254($v1) @@ -18505,8 +18505,8 @@ glabel var7f1aca88 /* f0a6e04: afa3004c */ sw $v1,0x4c($sp) /* f0a6e08: 8fa3004c */ lw $v1,0x4c($sp) .L0f0a6e0c: -/* f0a6e0c: 3c18800a */ lui $t8,0x800a -/* f0a6e10: 8f189ff4 */ lw $t8,-0x600c($t8) +/* f0a6e0c: 3c18800a */ lui $t8,%hi(g_Vars+0x34) +/* f0a6e10: 8f189ff4 */ lw $t8,%lo(g_Vars+0x34)($t8) /* f0a6e14: 00001025 */ or $v0,$zero,$zero /* f0a6e18: 00608025 */ or $s0,$v1,$zero /* f0a6e1c: 1700000e */ bnez $t8,.L0f0a6e58 @@ -18514,21 +18514,21 @@ glabel var7f1aca88 .L0f0a6e24: /* f0a6e24: 8e190d84 */ lw $t9,0xd84($s0) /* f0a6e28: 53200008 */ beqzl $t9,.L0f0a6e4c -/* f0a6e2c: 244207a4 */ addiu $v0,$v0,%lo(var800a07a4) +/* f0a6e2c: 244207a4 */ addiu $v0,$v0,1956 /* f0a6e30: 8e040d84 */ lw $a0,0xd84($s0) /* f0a6e34: afa3004c */ sw $v1,0x4c($sp) /* f0a6e38: 0c00cec9 */ jal func00033b24 /* f0a6e3c: afa20020 */ sw $v0,0x20($sp) /* f0a6e40: 8fa20020 */ lw $v0,0x20($sp) /* f0a6e44: 8fa3004c */ lw $v1,0x4c($sp) -/* f0a6e48: 244207a4 */ addiu $v0,$v0,%lo(var800a07a4) +/* f0a6e48: 244207a4 */ addiu $v0,$v0,1956 .L0f0a6e4c: /* f0a6e4c: 24010f48 */ addiu $at,$zero,0xf48 /* f0a6e50: 1441fff4 */ bne $v0,$at,.L0f0a6e24 /* f0a6e54: 261007a4 */ addiu $s0,$s0,0x7a4 .L0f0a6e58: -/* f0a6e58: 3c02800a */ lui $v0,0x800a -/* f0a6e5c: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0a6e58: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0a6e5c: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0a6e60: 80641580 */ lb $a0,0x1580($v1) /* f0a6e64: 2401000d */ addiu $at,$zero,0xd /* f0a6e68: 8c481c54 */ lw $t0,0x1c54($v0) @@ -18590,7 +18590,7 @@ glabel var7f1aca88 /* f0a6f44: 00000000 */ sll $zero,$zero,0x0 /* f0a6f48: c450023c */ lwc1 $f16,0x23c($v0) /* f0a6f4c: 806e15e4 */ lb $t6,0x15e4($v1) -/* f0a6f50: 3c02800a */ lui $v0,0x800a +/* f0a6f50: 3c02800a */ lui $v0,%hi(g_Vars+0x284) /* f0a6f54: 4600848d */ trunc.w.s $f18,$f16 /* f0a6f58: 000e6880 */ sll $t5,$t6,0x2 /* f0a6f5c: 006d7821 */ addu $t7,$v1,$t5 @@ -18600,7 +18600,7 @@ glabel var7f1aca88 /* f0a6f6c: 0304082a */ slt $at,$t8,$a0 /* f0a6f70: 10200037 */ beqz $at,.L0f0a7050 /* f0a6f74: 00000000 */ sll $zero,$zero,0x0 -/* f0a6f78: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0a6f78: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0a6f7c: 2401ff7f */ addiu $at,$zero,-129 /* f0a6f80: 8c5900c4 */ lw $t9,0xc4($v0) /* f0a6f84: 03214024 */ and $t0,$t9,$at @@ -19132,13 +19132,13 @@ glabel var7f1aca90 /* f0a7718: 8cab1c54 */ lw $t3,0x1c54($a1) .L0f0a771c: /* f0a771c: 8cb800c4 */ lw $t8,0xc4($a1) -/* f0a7720: 3c02800a */ lui $v0,0x800a +/* f0a7720: 3c02800a */ lui $v0,%hi(var8009caec+0x3) /* f0a7724: 0160c827 */ nor $t9,$t3,$zero /* f0a7728: 03196824 */ and $t5,$t8,$t9 /* f0a772c: 31af0001 */ andi $t7,$t5,0x1 /* f0a7730: 11e0000f */ beqz $t7,.L0f0a7770 /* f0a7734: 00000000 */ sll $zero,$zero,0x0 -/* f0a7738: 9042caef */ lbu $v0,-0x3511($v0) +/* f0a7738: 9042caef */ lbu $v0,%lo(var8009caec+0x3)($v0) /* f0a773c: 3c06800a */ lui $a2,%hi(var8009caf0) /* f0a7740: 90c6caf0 */ lbu $a2,%lo(var8009caf0)($a2) /* f0a7744: 00027600 */ sll $t6,$v0,0x18 @@ -19597,8 +19597,8 @@ glabel var7f1aca94 /* f0a7dac: afa400c8 */ sw $a0,0xc8($sp) /* f0a7db0: 0c004b70 */ jal random /* f0a7db4: afa200c4 */ sw $v0,0xc4($sp) -/* f0a7db8: 3c0e800a */ lui $t6,0x800a -/* f0a7dbc: 8dce9ff4 */ lw $t6,-0x600c($t6) +/* f0a7db8: 3c0e800a */ lui $t6,%hi(g_Vars+0x34) +/* f0a7dbc: 8dce9ff4 */ lw $t6,%lo(g_Vars+0x34)($t6) /* f0a7dc0: 8fa700c8 */ lw $a3,0xc8($sp) /* f0a7dc4: afa200c0 */ sw $v0,0xc0($sp) /* f0a7dc8: 19c0018a */ blez $t6,.L0f0a83f4 @@ -20037,8 +20037,8 @@ glabel func0f0a8404 glabel var7f1aca98 .word 0x453b8000 .text -/* f0a8404: 3c0e800a */ lui $t6,0x800a -/* f0a8408: 8dce9ff4 */ lw $t6,-0x600c($t6) +/* f0a8404: 3c0e800a */ lui $t6,%hi(g_Vars+0x34) +/* f0a8408: 8dce9ff4 */ lw $t6,%lo(g_Vars+0x34)($t6) /* f0a840c: 27bdffc8 */ addiu $sp,$sp,-56 /* f0a8410: afbf002c */ sw $ra,0x2c($sp) /* f0a8414: afa40038 */ sw $a0,0x38($sp) @@ -20106,8 +20106,8 @@ glabel var7f1acaa0 /* f0a84e0: afa700b4 */ sw $a3,0xb4($sp) /* f0a84e4: 0c004b70 */ jal random /* f0a84e8: afa200a0 */ sw $v0,0xa0($sp) -/* f0a84ec: 3c0e800a */ lui $t6,0x800a -/* f0a84f0: 8dce9ff4 */ lw $t6,-0x600c($t6) +/* f0a84ec: 3c0e800a */ lui $t6,%hi(g_Vars+0x34) +/* f0a84f0: 8dce9ff4 */ lw $t6,%lo(g_Vars+0x34)($t6) /* f0a84f4: afa2009c */ sw $v0,0x9c($sp) /* f0a84f8: 8fa200b0 */ lw $v0,0xb0($sp) /* f0a84fc: 59c00101 */ blezl $t6,.L0f0a8904 @@ -20395,8 +20395,8 @@ glabel func0f0a8910 /* f0a8914: 01e47823 */ subu $t7,$t7,$a0 /* f0a8918: 000f7880 */ sll $t7,$t7,0x2 /* f0a891c: 01e47821 */ addu $t7,$t7,$a0 -/* f0a8920: 3c0e800a */ lui $t6,0x800a -/* f0a8924: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0a8920: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0a8924: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0a8928: 000f78c0 */ sll $t7,$t7,0x3 /* f0a892c: 01e47821 */ addu $t7,$t7,$a0 /* f0a8930: 000f7880 */ sll $t7,$t7,0x2 @@ -20562,22 +20562,22 @@ glabel var7f1acb14 /* f0a8a9c: 24e2ffff */ addiu $v0,$a3,-1 /* f0a8aa0: 0002c0c3 */ sra $t8,$v0,0x3 /* f0a8aa4: 8dae0070 */ lw $t6,0x70($t5) -/* f0a8aa8: 3c09800b */ lui $t1,0x800b +/* f0a8aa8: 3c09800b */ lui $t1,%hi(g_MpPlayers+0x97) /* f0a8aac: 304a0007 */ andi $t2,$v0,0x7 /* f0a8ab0: 000e7880 */ sll $t7,$t6,0x2 /* f0a8ab4: 01ee7821 */ addu $t7,$t7,$t6 /* f0a8ab8: 000f7940 */ sll $t7,$t7,0x5 /* f0a8abc: 01f8c821 */ addu $t9,$t7,$t8 /* f0a8ac0: 01394821 */ addu $t1,$t1,$t9 -/* f0a8ac4: 9129c84f */ lbu $t1,-0x37b1($t1) +/* f0a8ac4: 9129c84f */ lbu $t1,%lo(g_MpPlayers+0x97)($t1) /* f0a8ac8: 240b0001 */ addiu $t3,$zero,0x1 /* f0a8acc: 014b6004 */ sllv $t4,$t3,$t2 /* f0a8ad0: 012c2024 */ and $a0,$t1,$t4 /* f0a8ad4: 0004682b */ sltu $t5,$zero,$a0 /* f0a8ad8: 01a02025 */ or $a0,$t5,$zero .L0f0a8adc: -/* f0a8adc: 3c0e800a */ lui $t6,0x800a -/* f0a8ae0: 8dcea248 */ lw $t6,-0x5db8($t6) +/* f0a8adc: 3c0e800a */ lui $t6,%hi(g_Vars+0x288) +/* f0a8ae0: 8dcea248 */ lw $t6,%lo(g_Vars+0x288)($t6) /* f0a8ae4: 24e2ffff */ addiu $v0,$a3,-1 /* f0a8ae8: 0002c8c3 */ sra $t9,$v0,0x3 /* f0a8aec: 8dcf0070 */ lw $t7,0x70($t6) @@ -20683,8 +20683,8 @@ glabel var7f1acb14 GLOBAL_ASM( glabel func0f0a8c50 -/* f0a8c50: 3c02800a */ lui $v0,0x800a -/* f0a8c54: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0a8c50: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0a8c54: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0a8c58: 8c4e0d0c */ lw $t6,0xd0c($v0) /* f0a8c5c: 000ec6c0 */ sll $t8,$t6,0x1b /* f0a8c60: 07000004 */ bltz $t8,.L0f0a8c74 @@ -20711,14 +20711,14 @@ glabel func0f0a8c7c /* f0a8ca0: 2464ffff */ addiu $a0,$v1,-1 /* f0a8ca4: 0004c8c3 */ sra $t9,$a0,0x3 /* f0a8ca8: 8dcf0070 */ lw $t7,0x70($t6) -/* f0a8cac: 3c09800b */ lui $t1,0x800b +/* f0a8cac: 3c09800b */ lui $t1,%hi(g_MpPlayers+0x97) /* f0a8cb0: 308a0007 */ andi $t2,$a0,0x7 /* f0a8cb4: 000fc080 */ sll $t8,$t7,0x2 /* f0a8cb8: 030fc021 */ addu $t8,$t8,$t7 /* f0a8cbc: 0018c140 */ sll $t8,$t8,0x5 /* f0a8cc0: 03194021 */ addu $t0,$t8,$t9 /* f0a8cc4: 01284821 */ addu $t1,$t1,$t0 -/* f0a8cc8: 9129c84f */ lbu $t1,-0x37b1($t1) +/* f0a8cc8: 9129c84f */ lbu $t1,%lo(g_MpPlayers+0x97)($t1) /* f0a8ccc: 240b0001 */ addiu $t3,$zero,0x1 /* f0a8cd0: 014b6004 */ sllv $t4,$t3,$t2 /* f0a8cd4: 012c6824 */ and $t5,$t1,$t4 @@ -20842,10 +20842,10 @@ glabel var7f1acbac /* f0a8d54: 8de10000 */ lw $at,0x0($t7) /* f0a8d58: 8de80004 */ lw $t0,0x4($t7) /* f0a8d5c: 27ae0068 */ addiu $t6,$sp,0x68 -/* f0a8d60: 3c02800a */ lui $v0,0x800a +/* f0a8d60: 3c02800a */ lui $v0,%hi(g_Vars+0x284) /* f0a8d64: adc10000 */ sw $at,0x0($t6) /* f0a8d68: adc80004 */ sw $t0,0x4($t6) -/* f0a8d6c: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0a8d6c: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0a8d70: 8c491580 */ lw $t1,0x1580($v0) /* f0a8d74: 00409025 */ or $s2,$v0,$zero /* f0a8d78: 312a0001 */ andi $t2,$t1,0x1 @@ -20863,8 +20863,8 @@ glabel var7f1acbac /* f0a8da8: 0fc44762 */ jal currentPlayerGiveWeapon /* f0a8dac: 24040001 */ addiu $a0,$zero,0x1 .L0f0a8db0: -/* f0a8db0: 3c02800a */ lui $v0,0x800a -/* f0a8db4: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0a8db0: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0a8db4: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0a8db8: 24010001 */ addiu $at,$zero,0x1 /* f0a8dbc: 804c1580 */ lb $t4,0x1580($v0) /* f0a8dc0: 5181000a */ beql $t4,$at,.L0f0a8dec @@ -20875,15 +20875,15 @@ glabel var7f1acbac /* f0a8dd4: 90591583 */ lbu $t9,0x1583($v0) /* f0a8dd8: 0fc2865b */ jal currentPlayerEquipWeaponInCutscene /* f0a8ddc: 24040001 */ addiu $a0,$zero,0x1 -/* f0a8de0: 3c02800a */ lui $v0,0x800a -/* f0a8de4: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0a8de0: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0a8de4: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0a8de8: 90591583 */ lbu $t9,0x1583($v0) .L0f0a8dec: -/* f0a8dec: 3c0e800a */ lui $t6,0x800a +/* f0a8dec: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) /* f0a8df0: 3c01dfff */ lui $at,0xdfff /* f0a8df4: 3338ff7f */ andi $t8,$t9,0xff7f /* f0a8df8: a0581583 */ sb $t8,0x1583($v0) -/* f0a8dfc: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0a8dfc: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0a8e00: 3421ffff */ ori $at,$at,0xffff /* f0a8e04: adc000c4 */ sw $zero,0xc4($t6) /* f0a8e08: 920f02e1 */ lbu $t7,0x2e1($s0) @@ -20938,8 +20938,8 @@ glabel var7f1acbac /* f0a8ec4: 00000000 */ sll $zero,$zero,0x0 /* f0a8ec8: 0fc44bdc */ jal currentPlayerCalculateEquipCurItem /* f0a8ecc: 00000000 */ sll $zero,$zero,0x0 -/* f0a8ed0: 3c0f800a */ lui $t7,0x800a -/* f0a8ed4: 8defa244 */ lw $t7,-0x5dbc($t7) +/* f0a8ed0: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) +/* f0a8ed4: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) /* f0a8ed8: 0fc44b11 */ jal currentPlayerGetWeaponNumByInvIndex /* f0a8edc: 8de41874 */ lw $a0,0x1874($t7) /* f0a8ee0: 0fc2865b */ jal currentPlayerEquipWeaponInCutscene @@ -20951,16 +20951,16 @@ glabel var7f1acbac /* f0a8ef4: 1420ffd1 */ bnez $at,.L0f0a8e3c /* f0a8ef8: 00000000 */ sll $zero,$zero,0x0 .L0f0a8efc: -/* f0a8efc: 3c08800a */ lui $t0,0x800a -/* f0a8f00: 8d08a26c */ lw $t0,-0x5d94($t0) +/* f0a8efc: 3c08800a */ lui $t0,%hi(g_Vars+0x2ac) +/* f0a8f00: 8d08a26c */ lw $t0,%lo(g_Vars+0x2ac)($t0) /* f0a8f04: 24010006 */ addiu $at,$zero,0x6 /* f0a8f08: 15010007 */ bne $t0,$at,.L0f0a8f28 -/* f0a8f0c: 3c09800a */ lui $t1,0x800a -/* f0a8f10: 8d29a244 */ lw $t1,-0x5dbc($t1) +/* f0a8f0c: 3c09800a */ lui $t1,%hi(g_Vars+0x284) +/* f0a8f10: 8d29a244 */ lw $t1,%lo(g_Vars+0x284)($t1) /* f0a8f14: afa00070 */ sw $zero,0x70($sp) -/* f0a8f18: 3c0a800a */ lui $t2,0x800a +/* f0a8f18: 3c0a800a */ lui $t2,%hi(g_Vars+0x284) /* f0a8f1c: a1200de0 */ sb $zero,0xde0($t1) -/* f0a8f20: 8d4aa244 */ lw $t2,-0x5dbc($t2) +/* f0a8f20: 8d4aa244 */ lw $t2,%lo(g_Vars+0x284)($t2) /* f0a8f24: a140063c */ sb $zero,0x63c($t2) .L0f0a8f28: /* f0a8f28: 8e4b1604 */ lw $t3,0x1604($s2) @@ -20977,11 +20977,11 @@ glabel var7f1acbac /* f0a8f50: 8e581604 */ lw $t8,0x1604($s2) .L0f0a8f54: /* f0a8f54: 24060001 */ addiu $a2,$zero,0x1 -/* f0a8f58: 3c0f800a */ lui $t7,0x800a +/* f0a8f58: 3c0f800a */ lui $t7,%hi(g_Vars+0x34) /* f0a8f5c: 5300006c */ beqzl $t8,.L0f0a9110 /* f0a8f60: ae40160c */ sw $zero,0x160c($s2) /* f0a8f64: 8e4e160c */ lw $t6,0x160c($s2) -/* f0a8f68: 8def9ff4 */ lw $t7,-0x600c($t7) +/* f0a8f68: 8def9ff4 */ lw $t7,%lo(g_Vars+0x34)($t7) /* f0a8f6c: 82490de4 */ lb $t1,0xde4($s2) /* f0a8f70: 01cf4021 */ addu $t0,$t6,$t7 /* f0a8f74: 11200043 */ beqz $t1,.L0f0a9084 @@ -21104,13 +21104,13 @@ glabel var7f1acbac /* f0a911c: 24040001 */ addiu $a0,$zero,0x1 /* f0a9120: 0fc2a244 */ jal func0f0a8910 /* f0a9124: 8fa5006c */ lw $a1,0x6c($sp) -/* f0a9128: 3c19800a */ lui $t9,0x800a -/* f0a912c: 8f39a26c */ lw $t9,-0x5d94($t9) +/* f0a9128: 3c19800a */ lui $t9,%hi(g_Vars+0x2ac) +/* f0a912c: 8f39a26c */ lw $t9,%lo(g_Vars+0x2ac)($t9) /* f0a9130: 24010001 */ addiu $at,$zero,0x1 -/* f0a9134: 3c0c800a */ lui $t4,0x800a +/* f0a9134: 3c0c800a */ lui $t4,%hi(g_Vars+0x34) /* f0a9138: 17210038 */ bne $t9,$at,.L0f0a921c /* f0a913c: 00000000 */ sll $zero,$zero,0x0 -/* f0a9140: 8d8c9ff4 */ lw $t4,-0x600c($t4) +/* f0a9140: 8d8c9ff4 */ lw $t4,%lo(g_Vars+0x34)($t4) /* f0a9144: 19800035 */ blez $t4,.L0f0a921c /* f0a9148: 00000000 */ sll $zero,$zero,0x0 /* f0a914c: 0fc27371 */ jal func0f09cdc4 @@ -21122,8 +21122,8 @@ glabel var7f1acbac /* f0a9164: 0fc41b99 */ jal cheatIsActive /* f0a9168: 24040005 */ addiu $a0,$zero,0x5 /* f0a916c: 10400025 */ beqz $v0,.L0f0a9204 -/* f0a9170: 3c02800a */ lui $v0,0x800a -/* f0a9174: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0a9170: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0a9174: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0a9178: 24580ddc */ addiu $t8,$v0,0xddc /* f0a917c: afb80044 */ sw $t8,0x44($sp) /* f0a9180: 24510638 */ addiu $s1,$v0,0x638 @@ -21176,9 +21176,9 @@ glabel var7f1acbac /* f0a9228: 27b0003c */ addiu $s0,$sp,0x3c /* f0a922c: 02002825 */ or $a1,$s0,$zero /* f0a9230: 11200009 */ beqz $t1,.L0f0a9258 -/* f0a9234: 3c0d800a */ lui $t5,0x800a -/* f0a9238: 3c0b800a */ lui $t3,0x800a -/* f0a923c: 8d6ba244 */ lw $t3,-0x5dbc($t3) +/* f0a9234: 3c0d800a */ lui $t5,%hi(g_Vars+0x284) +/* f0a9238: 3c0b800a */ lui $t3,%hi(g_Vars+0x284) +/* f0a923c: 8d6ba244 */ lw $t3,%lo(g_Vars+0x284)($t3) /* f0a9240: 26451614 */ addiu $a1,$s2,0x1614 /* f0a9244: 9646161a */ lhu $a2,0x161a($s2) /* f0a9248: 0fc1a451 */ jal func0f069144 @@ -21186,7 +21186,7 @@ glabel var7f1acbac /* f0a9250: 10000008 */ beqz $zero,.L0f0a9274 /* f0a9254: a6401618 */ sh $zero,0x1618($s2) .L0f0a9258: -/* f0a9258: 8dada244 */ lw $t5,-0x5dbc($t5) +/* f0a9258: 8dada244 */ lw $t5,%lo(g_Vars+0x284)($t5) /* f0a925c: 9646161a */ lhu $a2,0x161a($s2) /* f0a9260: 0fc1a451 */ jal func0f069144 /* f0a9264: 8da400bc */ lw $a0,0xbc($t5) @@ -21299,16 +21299,16 @@ glabel func0f0a92ac GLOBAL_ASM( glabel func0f0a93d0 -/* f0a93d0: 3c0e800a */ lui $t6,0x800a -/* f0a93d4: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0a93d0: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0a93d4: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0a93d8: 03e00008 */ jr $ra /* f0a93dc: adc41620 */ sw $a0,0x1620($t6) ); GLOBAL_ASM( glabel func0f0a93e0 -/* f0a93e0: 3c02800a */ lui $v0,0x800a -/* f0a93e4: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0a93e0: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0a93e4: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0a93e8: 27bdffe0 */ addiu $sp,$sp,-32 /* f0a93ec: afbf0014 */ sw $ra,0x14($sp) /* f0a93f0: 00802825 */ or $a1,$a0,$zero @@ -21344,8 +21344,8 @@ glabel func0f0a93e0 GLOBAL_ASM( glabel func0f0a9464 -/* f0a9464: 3c02800a */ lui $v0,0x800a -/* f0a9468: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0a9464: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0a9468: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0a946c: c4800000 */ lwc1 $f0,0x0($a0) /* f0a9470: e4400b94 */ swc1 $f0,0xb94($v0) /* f0a9474: e4401338 */ swc1 $f0,0x1338($v0) @@ -21388,11 +21388,11 @@ glabel var7f1acbb4 .word 0x47c35000 .text /* f0a94d0: 27bdffe8 */ addiu $sp,$sp,-24 -/* f0a94d4: 3c02800a */ lui $v0,0x800a +/* f0a94d4: 3c02800a */ lui $v0,%hi(g_Vars+0x284) /* f0a94d8: afbf0014 */ sw $ra,0x14($sp) /* f0a94dc: 00803825 */ or $a3,$a0,$zero /* f0a94e0: 10800008 */ beqz $a0,.L0f0a9504 -/* f0a94e4: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0a94e4: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0a94e8: 24030001 */ addiu $v1,$zero,0x1 /* f0a94ec: 10830039 */ beq $a0,$v1,.L0f0a95d4 /* f0a94f0: 24010002 */ addiu $at,$zero,0x2 @@ -21468,8 +21468,8 @@ GLOBAL_ASM( glabel func0f0a95ec /* f0a95ec: 10a00008 */ beqz $a1,.L0f0a9610 /* f0a95f0: 3c02800a */ lui $v0,0x800a -/* f0a95f4: 3c02800a */ lui $v0,0x800a -/* f0a95f8: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0a95f4: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0a95f8: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0a95fc: 00807827 */ nor $t7,$a0,$zero /* f0a9600: 8c4e16d8 */ lw $t6,0x16d8($v0) /* f0a9604: 01cfc024 */ and $t8,$t6,$t7 @@ -21491,10 +21491,10 @@ glabel currentPlayerGiveAmmo /* f0a9630: afb1001c */ sw $s1,0x1c($sp) /* f0a9634: 00809025 */ or $s2,$a0,$zero /* f0a9638: afbf0024 */ sw $ra,0x24($sp) -/* f0a963c: 3c11800a */ lui $s1,0x800a +/* f0a963c: 3c11800a */ lui $s1,%hi(g_Vars+0x284) /* f0a9640: afb00018 */ sw $s0,0x18($sp) /* f0a9644: afa5003c */ sw $a1,0x3c($sp) -/* f0a9648: 8e31a244 */ lw $s1,-0x5dbc($s1) +/* f0a9648: 8e31a244 */ lw $s1,%lo(g_Vars+0x284)($s1) /* f0a964c: 0fc2866a */ jal getCurrentPlayerWeaponId /* f0a9650: 00002025 */ or $a0,$zero,$zero /* f0a9654: afa20030 */ sw $v0,0x30($sp) @@ -21581,8 +21581,8 @@ GLOBAL_ASM( glabel ammoGetQuantity /* f0a9770: 27bdffc8 */ addiu $sp,$sp,-56 /* f0a9774: afb50028 */ sw $s5,0x28($sp) -/* f0a9778: 3c02800a */ lui $v0,0x800a -/* f0a977c: 8c55a244 */ lw $s5,-0x5dbc($v0) +/* f0a9778: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0a977c: 8c55a244 */ lw $s5,%lo(g_Vars+0x284)($v0) /* f0a9780: afb70030 */ sw $s7,0x30($sp) /* f0a9784: afb6002c */ sw $s6,0x2c($sp) /* f0a9788: afb40024 */ sw $s4,0x24($sp) @@ -21650,8 +21650,8 @@ glabel ammoGetQuantity GLOBAL_ASM( glabel currentPlayerGetAmmoCount -/* f0a9868: 3c02800a */ lui $v0,0x800a -/* f0a986c: 8c47a244 */ lw $a3,-0x5dbc($v0) +/* f0a9868: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0a986c: 8c47a244 */ lw $a3,%lo(g_Vars+0x284)($v0) /* f0a9870: 00047080 */ sll $t6,$a0,0x2 /* f0a9874: 00003025 */ or $a2,$zero,$zero /* f0a9878: 00ee7821 */ addu $t7,$a3,$t6 @@ -22095,7 +22095,7 @@ glabel func0f0a9da8 /* f0a9e38: 80880005 */ lb $t0,0x5($a0) .L0f0a9e3c: /* f0a9e3c: 80830004 */ lb $v1,0x4($a0) -/* f0a9e40: 3c0e800a */ lui $t6,0x800a +/* f0a9e40: 3c0e800a */ lui $t6,%hi(g_Vars+0x3a) /* f0a9e44: 05010003 */ bgez $t0,.L0f0a9e54 /* f0a9e48: 00a31023 */ subu $v0,$a1,$v1 /* f0a9e4c: 5c400005 */ bgtzl $v0,.L0f0a9e64 @@ -22144,7 +22144,7 @@ glabel func0f0a9da8 .L0f0a9ee0: /* f0a9ee0: 51000035 */ beqzl $t0,.L0f0a9fb8 /* f0a9ee4: a4800002 */ sh $zero,0x2($a0) -/* f0a9ee8: 85ce9ffa */ lh $t6,-0x6006($t6) +/* f0a9ee8: 85ce9ffa */ lh $t6,%lo(g_Vars+0x3a)($t6) /* f0a9eec: 848d0002 */ lh $t5,0x2($a0) /* f0a9ef0: 01c70019 */ multu $t6,$a3 /* f0a9ef4: 00007812 */ mflo $t7 @@ -22801,8 +22801,8 @@ glabel func0f0a9fc0 GLOBAL_ASM( glabel func0f0aa86c -/* f0aa86c: 3c0e800a */ lui $t6,0x800a -/* f0aa870: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0aa86c: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0aa870: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0aa874: 27bdfed0 */ addiu $sp,$sp,-304 /* f0aa878: afbf0034 */ sw $ra,0x34($sp) /* f0aa87c: afa40130 */ sw $a0,0x130($sp) @@ -22960,8 +22960,8 @@ glabel func0f0aa86c .L0f0aaa9c: /* f0aaa9c: 8fa2012c */ lw $v0,0x12c($sp) /* f0aaaa0: 3c18ff00 */ lui $t8,0xff00 -/* f0aaaa4: 3c0e800a */ lui $t6,0x800a -/* f0aaaa8: 8dce9ff4 */ lw $t6,-0x600c($t6) +/* f0aaaa4: 3c0e800a */ lui $t6,%hi(g_Vars+0x34) +/* f0aaaa8: 8dce9ff4 */ lw $t6,%lo(g_Vars+0x34)($t6) /* f0aaaac: 37180040 */ ori $t8,$t8,0x40 /* f0aaab0: afb800f4 */ sw $t8,0xf4($sp) /* f0aaab4: 9059063b */ lbu $t9,0x63b($v0) @@ -23127,8 +23127,8 @@ glabel func0f0aa86c /* f0aad00: ac590004 */ sw $t9,0x4($v0) /* f0aad04: 0fc54e0e */ jal func0f153838 /* f0aad08: afa30060 */ sw $v1,0x60($sp) -/* f0aad0c: 3c0e800a */ lui $t6,0x800a -/* f0aad10: 8dcea248 */ lw $t6,-0x5db8($t6) +/* f0aad0c: 3c0e800a */ lui $t6,%hi(g_Vars+0x288) +/* f0aad10: 8dcea248 */ lw $t6,%lo(g_Vars+0x288)($t6) /* f0aad14: afa20130 */ sw $v0,0x130($sp) /* f0aad18: 0fc54a16 */ jal optionsGetShowGunFunction /* f0aad1c: 8dc40070 */ lw $a0,0x70($t6) @@ -23150,7 +23150,7 @@ glabel func0f0aa86c /* f0aad5c: 97a300ba */ lhu $v1,0xba($sp) /* f0aad60: 00403025 */ or $a2,$v0,$zero /* f0aad64: 954f0072 */ lhu $t7,0x72($t2) -/* f0aad68: 3c02800a */ lui $v0,0x800a +/* f0aad68: 3c02800a */ lui $v0,%hi(g_Vars+0x38) /* f0aad6c: 27a400c4 */ addiu $a0,$sp,0xc4 /* f0aad70: 106f0003 */ beq $v1,$t7,.L0f0aad80 /* f0aad74: 27a500c0 */ addiu $a1,$sp,0xc0 @@ -23162,7 +23162,7 @@ glabel func0f0aa86c /* f0aad88: 286100ff */ slti $at,$v1,0xff /* f0aad8c: 5020008b */ beqzl $at,.L0f0aafbc /* f0aad90: 8fa200bc */ lw $v0,0xbc($sp) -/* f0aad94: 8c429ff8 */ lw $v0,-0x6008($v0) +/* f0aad94: 8c429ff8 */ lw $v0,%lo(g_Vars+0x38)($v0) /* f0aad98: 3c1955ff */ lui $t9,0x55ff /* f0aad9c: 3739ffff */ ori $t9,$t9,0xffff /* f0aada0: 00627021 */ addu $t6,$v1,$v0 @@ -23338,14 +23338,14 @@ glabel func0f0aa86c /* f0ab020: afaa0058 */ sw $t2,0x58($sp) /* f0ab024: 8faa0058 */ lw $t2,0x58($sp) /* f0ab028: 00403025 */ or $a2,$v0,$zero -/* f0ab02c: 3c02800a */ lui $v0,0x800a +/* f0ab02c: 3c02800a */ lui $v0,%hi(g_Vars+0x38) /* f0ab030: 9143006e */ lbu $v1,0x6e($t2) /* f0ab034: 8fb80100 */ lw $t8,0x100($sp) /* f0ab038: 27a400c4 */ addiu $a0,$sp,0xc4 /* f0ab03c: 286100ff */ slti $at,$v1,0xff /* f0ab040: 1020009b */ beqz $at,.L0f0ab2b0 /* f0ab044: 27a500c0 */ addiu $a1,$sp,0xc0 -/* f0ab048: 8c429ff8 */ lw $v0,-0x6008($v0) +/* f0ab048: 8c429ff8 */ lw $v0,%lo(g_Vars+0x38)($v0) /* f0ab04c: 2719fff5 */ addiu $t9,$t8,-11 /* f0ab050: afb90060 */ sw $t9,0x60($sp) /* f0ab054: 00627021 */ addu $t6,$v1,$v0 @@ -23916,10 +23916,10 @@ glabel func0f0aa86c /* f0ab8a8: 24010023 */ addiu $at,$zero,0x23 /* f0ab8ac: 24090e10 */ addiu $t1,$zero,0xe10 /* f0ab8b0: 91f80000 */ lbu $t8,0x0($t7) -/* f0ab8b4: 3c03800a */ lui $v1,0x800a +/* f0ab8b4: 3c03800a */ lui $v1,%hi(g_Vars+0x45c) /* f0ab8b8: 1701007c */ bne $t8,$at,.L0f0abaac /* f0ab8bc: 00000000 */ sll $zero,$zero,0x0 -/* f0ab8c0: 8c63a41c */ lw $v1,-0x5be4($v1) +/* f0ab8c0: 8c63a41c */ lw $v1,%lo(g_Vars+0x45c)($v1) /* f0ab8c4: 8fae0100 */ lw $t6,0x100($sp) /* f0ab8c8: 8faf010c */ lw $t7,0x10c($sp) /* f0ab8cc: 0069001a */ div $zero,$v1,$t1 @@ -24206,8 +24206,8 @@ GLOBAL_ASM( glabel func0f0abc74 /* f0abc74: 10a00008 */ beqz $a1,.L0f0abc98 /* f0abc78: 3c02800a */ lui $v0,0x800a -/* f0abc7c: 3c02800a */ lui $v0,0x800a -/* f0abc80: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0abc7c: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0abc80: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0abc84: 00807827 */ nor $t7,$a0,$zero /* f0abc88: 8c4e17a4 */ lw $t6,0x17a4($v0) /* f0abc8c: 01cfc024 */ and $t8,$t6,$t7 @@ -24224,8 +24224,8 @@ glabel func0f0abc74 GLOBAL_ASM( glabel func0f0abcb0 -/* f0abcb0: 3c02800a */ lui $v0,0x800a -/* f0abcb4: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0abcb0: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0abcb4: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0abcb8: 27bdffe0 */ addiu $sp,$sp,-32 /* f0abcbc: afbf001c */ sw $ra,0x1c($sp) /* f0abcc0: afb00018 */ sw $s0,0x18($sp) @@ -24265,9 +24265,9 @@ glabel func0f0abd30 /* f0abd30: 00041100 */ sll $v0,$a0,0x4 /* f0abd34: 00441023 */ subu $v0,$v0,$a0 /* f0abd38: 00021080 */ sll $v0,$v0,0x2 -/* f0abd3c: 3c03800a */ lui $v1,0x800a +/* f0abd3c: 3c03800a */ lui $v1,%hi(g_Vars+0x284) /* f0abd40: 00441021 */ addu $v0,$v0,$a0 -/* f0abd44: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f0abd44: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f0abd48: 000210c0 */ sll $v0,$v0,0x3 /* f0abd4c: 27bdffb8 */ addiu $sp,$sp,-72 /* f0abd50: 00441021 */ addu $v0,$v0,$a0 diff --git a/src/game/game_0abe70.c b/src/game/game_0abe70.c index 39e09de64..d87bd0cb0 100644 --- a/src/game/game_0abe70.c +++ b/src/game/game_0abe70.c @@ -248,8 +248,8 @@ glabel func0f0abe70 GLOBAL_ASM( glabel func0f0ac138 -/* f0ac138: 3c0e800a */ lui $t6,0x800a -/* f0ac13c: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0ac138: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0ac13c: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0ac140: 27bdff88 */ addiu $sp,$sp,-120 /* f0ac144: afbf0014 */ sw $ra,0x14($sp) /* f0ac148: afa40078 */ sw $a0,0x78($sp) @@ -489,8 +489,8 @@ GLOBAL_ASM( glabel func0f0ac4b8 /* f0ac4b8: 27bdff10 */ addiu $sp,$sp,-240 /* f0ac4bc: afb00028 */ sw $s0,0x28($sp) -/* f0ac4c0: 3c10800a */ lui $s0,%hi(var800a1bb0) -/* f0ac4c4: 8e10a244 */ lw $s0,-0x5dbc($s0) +/* f0ac4c0: 3c10800a */ lui $s0,%hi(g_Vars+0x284) +/* f0ac4c4: 8e10a244 */ lw $s0,%lo(g_Vars+0x284)($s0) /* f0ac4c8: afbf002c */ sw $ra,0x2c($sp) /* f0ac4cc: afa400f0 */ sw $a0,0xf0($sp) /* f0ac4d0: afa500f4 */ sw $a1,0xf4($sp) @@ -498,7 +498,7 @@ glabel func0f0ac4b8 /* f0ac4d8: afa700fc */ sw $a3,0xfc($sp) /* f0ac4dc: 24040002 */ addiu $a0,$zero,0x2 /* f0ac4e0: 0fc59e73 */ jal func0f1679cc -/* f0ac4e4: 26101bb0 */ addiu $s0,$s0,%lo(var800a1bb0) +/* f0ac4e4: 26101bb0 */ addiu $s0,$s0,7088 /* f0ac4e8: 0fc2d5be */ jal func0f0b56f8 /* f0ac4ec: afa200c4 */ sw $v0,0xc4($sp) /* f0ac4f0: 3c0c8007 */ lui $t4,%hi(var80070500) @@ -1033,8 +1033,8 @@ glabel var7f1accf4 /* f0acbc4: 8fbf002c */ lw $ra,0x2c($sp) /* f0acbc8: 0fc59e73 */ jal func0f1679cc /* f0acbcc: 24040001 */ addiu $a0,$zero,0x1 -/* f0acbd0: 3c09800a */ lui $t1,0x800a -/* f0acbd4: 8d29a244 */ lw $t1,-0x5dbc($t1) +/* f0acbd0: 3c09800a */ lui $t1,%hi(g_Vars+0x284) +/* f0acbd4: 8d29a244 */ lw $t1,%lo(g_Vars+0x284)($t1) /* f0acbd8: afa20144 */ sw $v0,0x144($sp) /* f0acbdc: 3c0d8007 */ lui $t5,%hi(var8007050c) /* f0acbe0: 25381bb0 */ addiu $t8,$t1,0x1bb0 @@ -2313,8 +2313,8 @@ glabel var7f1acd60 .word 0x3e8e38e4 .text /* f0ade00: 27bdfec0 */ addiu $sp,$sp,-320 -/* f0ade04: 3c0e800a */ lui $t6,0x800a -/* f0ade08: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0ade04: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0ade08: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0ade0c: afbf001c */ sw $ra,0x1c($sp) /* f0ade10: afb00018 */ sw $s0,0x18($sp) /* f0ade14: afa40140 */ sw $a0,0x140($sp) @@ -3227,8 +3227,8 @@ glabel var7f1acd6c /* f0aeb4c: 240f0001 */ addiu $t7,$zero,0x1 /* f0aeb50: 8fb800f4 */ lw $t8,0xf4($sp) /* f0aeb54: 8fab00ec */ lw $t3,0xec($sp) -/* f0aeb58: 3c02800a */ lui $v0,0x800a -/* f0aeb5c: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0aeb58: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0aeb5c: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0aeb60: 240a0004 */ addiu $t2,$zero,0x4 /* f0aeb64: afaf008c */ sw $t7,0x8c($sp) /* f0aeb68: afaa00b8 */ sw $t2,0xb8($sp) @@ -3361,9 +3361,9 @@ glabel func0f0aeca8 /* f0aed14: 00027080 */ sll $t6,$v0,0x2 /* f0aed18: 01c27023 */ subu $t6,$t6,$v0 /* f0aed1c: 000e7100 */ sll $t6,$t6,0x4 -/* f0aed20: 3c01800a */ lui $at,0x800a +/* f0aed20: 3c01800a */ lui $at,%hi(var8009da60) /* f0aed24: 002e0821 */ addu $at,$at,$t6 -/* f0aed28: ac23da60 */ sw $v1,-0x25a0($at) +/* f0aed28: ac23da60 */ sw $v1,%lo(var8009da60)($at) .L0f0aed2c: /* f0aed2c: 8fbf0014 */ lw $ra,0x14($sp) /* f0aed30: 27bd0018 */ addiu $sp,$sp,0x18 @@ -3698,7 +3698,7 @@ glabel var7f1acd8c /* f0af15c: afb00058 */ sw $s0,0x58($sp) /* f0af160: afa40200 */ sw $a0,0x200($sp) /* f0af164: afbf0064 */ sw $ra,0x64($sp) -/* f0af168: 3c10800a */ lui $s0,%hi(var800a0048) +/* f0af168: 3c10800a */ lui $s0,%hi(g_Vars+0x284) /* f0af16c: 3c047f1b */ lui $a0,%hi(var7f1acc10) /* f0af170: 3c058007 */ lui $a1,%hi(var80070574) /* f0af174: afb20060 */ sw $s2,0x60($sp) @@ -3709,7 +3709,7 @@ glabel var7f1acd8c /* f0af188: f7b80038 */ sdc1 $f24,0x38($sp) /* f0af18c: f7b60030 */ sdc1 $f22,0x30($sp) /* f0af190: f7b40028 */ sdc1 $f20,0x28($sp) -/* f0af194: 8e10a244 */ lw $s0,-0x5dbc($s0) +/* f0af194: 8e10a244 */ lw $s0,%lo(g_Vars+0x284)($s0) /* f0af198: 24a50574 */ addiu $a1,$a1,%lo(var80070574) /* f0af19c: 0c0036cc */ jal func0000db30 /* f0af1a0: 2484cc10 */ addiu $a0,$a0,%lo(var7f1acc10) @@ -4266,7 +4266,7 @@ glabel var7f1acd8c .L0f0afa04: /* f0afa04: 3c08800a */ lui $t0,%hi(var8009dd00) /* f0afa08: 2508dd00 */ addiu $t0,$t0,%lo(var8009dd00) -/* f0afa0c: 26100048 */ addiu $s0,$s0,%lo(var800a0048) +/* f0afa0c: 26100048 */ addiu $s0,$s0,72 /* f0afa10: 5608fe89 */ bnel $s0,$t0,.L0f0af438 /* f0afa14: 8e0d0000 */ lw $t5,0x0($s0) /* f0afa18: 8fbf0064 */ lw $ra,0x64($sp) @@ -4293,7 +4293,7 @@ glabel var7f1acd90 /* f0afa4c: 27bdfe18 */ addiu $sp,$sp,-488 /* f0afa50: afb00058 */ sw $s0,0x58($sp) /* f0afa54: afa401e8 */ sw $a0,0x1e8($sp) -/* f0afa58: 3c10800a */ lui $s0,%hi(var800a0048) +/* f0afa58: 3c10800a */ lui $s0,%hi(g_Vars+0x284) /* f0afa5c: 248f0008 */ addiu $t7,$a0,0x8 /* f0afa60: afbf007c */ sw $ra,0x7c($sp) /* f0afa64: afbe0078 */ sw $s8,0x78($sp) @@ -4310,7 +4310,7 @@ glabel var7f1acd90 /* f0afa90: f7b80038 */ sdc1 $f24,0x38($sp) /* f0afa94: f7b60030 */ sdc1 $f22,0x30($sp) /* f0afa98: f7b40028 */ sdc1 $f20,0x28($sp) -/* f0afa9c: 8e10a244 */ lw $s0,-0x5dbc($s0) +/* f0afa9c: 8e10a244 */ lw $s0,%lo(g_Vars+0x284)($s0) /* f0afaa0: afaf01e8 */ sw $t7,0x1e8($sp) /* f0afaa4: 3c18ba00 */ lui $t8,0xba00 /* f0afaa8: 37181402 */ ori $t8,$t8,0x1402 @@ -4791,7 +4791,7 @@ glabel var7f1acd90 .L0f0b0208: /* f0b0208: 3c08800a */ lui $t0,%hi(var8009dd00) /* f0b020c: 2508dd00 */ addiu $t0,$t0,%lo(var8009dd00) -/* f0b0210: 26100048 */ addiu $s0,$s0,%lo(var800a0048) +/* f0b0210: 26100048 */ addiu $s0,$s0,72 /* f0b0214: 5608fec9 */ bnel $s0,$t0,.L0f0afd3c /* f0b0218: 8e090000 */ lw $t1,0x0($s0) /* f0b021c: 8fbf007c */ lw $ra,0x7c($sp) @@ -4835,9 +4835,9 @@ glabel func0f0b0268 /* f0b02a4: 000278c0 */ sll $t7,$v0,0x3 /* f0b02a8: 01e27821 */ addu $t7,$t7,$v0 /* f0b02ac: 000f78c0 */ sll $t7,$t7,0x3 -/* f0b02b0: 3c01800a */ lui $at,0x800a +/* f0b02b0: 3c01800a */ lui $at,%hi(var8009dbe0) /* f0b02b4: 002f0821 */ addu $at,$at,$t7 -/* f0b02b8: ac2edbe0 */ sw $t6,-0x2420($at) +/* f0b02b8: ac2edbe0 */ sw $t6,%lo(var8009dbe0)($at) .L0f0b02bc: /* f0b02bc: 8fb8001c */ lw $t8,0x1c($sp) /* f0b02c0: c4c40000 */ lwc1 $f4,0x0($a2) @@ -4929,10 +4929,10 @@ glabel func0f0b03d8 /* f0b03f0: 000fc0c0 */ sll $t8,$t7,0x3 /* f0b03f4: 030fc021 */ addu $t8,$t8,$t7 /* f0b03f8: 0018c0c0 */ sll $t8,$t8,0x3 -/* f0b03fc: 3c01800a */ lui $at,0x800a +/* f0b03fc: 3c01800a */ lui $at,%hi(var8009dbe0) /* f0b0400: 00380821 */ addu $at,$at,$t8 /* f0b0404: 240effff */ addiu $t6,$zero,-1 -/* f0b0408: ac2edbe0 */ sw $t6,-0x2420($at) +/* f0b0408: ac2edbe0 */ sw $t6,%lo(var8009dbe0)($at) .L0f0b040c: /* f0b040c: 8fbf0014 */ lw $ra,0x14($sp) /* f0b0410: 27bd0020 */ addiu $sp,$sp,0x20 diff --git a/src/game/game_0b0420.c b/src/game/game_0b0420.c index 7dc5560bc..e25218d02 100644 --- a/src/game/game_0b0420.c +++ b/src/game/game_0b0420.c @@ -41,9 +41,9 @@ glabel func0f0b0420 /* f0b0430: 0fc2c5f0 */ jal weaponHasFlag /* f0b0434: 3c050010 */ lui $a1,0x10 /* f0b0438: 14400008 */ bnez $v0,.L0f0b045c -/* f0b043c: 3c0e800a */ lui $t6,0x800a +/* f0b043c: 3c0e800a */ lui $t6,%hi(g_Vars+0x288) /* f0b0440: 8faf001c */ lw $t7,0x1c($sp) -/* f0b0444: 8dcea248 */ lw $t6,-0x5db8($t6) +/* f0b0444: 8dcea248 */ lw $t6,%lo(g_Vars+0x288)($t6) /* f0b0448: 000fc080 */ sll $t8,$t7,0x2 /* f0b044c: 01d81021 */ addu $v0,$t6,$t8 /* f0b0450: 8c590000 */ lw $t9,0x0($v0) @@ -69,8 +69,8 @@ glabel func0f0b046c /* f0b048c: 3c050010 */ lui $a1,0x10 /* f0b0490: 1440001f */ bnez $v0,.L0f0b0510 /* f0b0494: 8fa6001c */ lw $a2,0x1c($sp) -/* f0b0498: 3c0f800a */ lui $t7,0x800a -/* f0b049c: 8defa248 */ lw $t7,-0x5db8($t7) +/* 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 /* f0b04a8: 0006c080 */ sll $t8,$a2,0x2 @@ -91,8 +91,8 @@ glabel func0f0b046c /* f0b04e0: afa6001c */ sw $a2,0x1c($sp) /* f0b04e4: 14400008 */ bnez $v0,.L0f0b0508 /* f0b04e8: 8fa6001c */ lw $a2,0x1c($sp) -/* f0b04ec: 3c0a800a */ lui $t2,0x800a -/* f0b04f0: 8d4aa248 */ lw $t2,-0x5db8($t2) +/* f0b04ec: 3c0a800a */ lui $t2,%hi(g_Vars+0x288) +/* f0b04f0: 8d4aa248 */ lw $t2,%lo(g_Vars+0x288)($t2) /* f0b04f4: 00065880 */ sll $t3,$a2,0x2 /* f0b04f8: 014b1021 */ addu $v0,$t2,$t3 /* f0b04fc: 8c4c0000 */ lw $t4,0x0($v0) @@ -118,8 +118,8 @@ glabel func0f0b0520 GLOBAL_ASM( glabel func0f0b052c -/* f0b052c: 3c0e800a */ lui $t6,0x800a -/* f0b0530: 8dcea248 */ lw $t6,-0x5db8($t6) +/* f0b052c: 3c0e800a */ lui $t6,%hi(g_Vars+0x288) +/* f0b0530: 8dcea248 */ lw $t6,%lo(g_Vars+0x288)($t6) /* f0b0534: 00047880 */ sll $t7,$a0,0x2 /* f0b0538: 01cfc021 */ addu $t8,$t6,$t7 /* f0b053c: 03e00008 */ jr $ra @@ -264,12 +264,12 @@ glabel func0f0b05a4 GLOBAL_ASM( glabel func0f0b073c -/* f0b073c: 3c0e800a */ lui $t6,0x800a -/* f0b0740: 8dcea248 */ lw $t6,-0x5db8($t6) +/* f0b073c: 3c0e800a */ lui $t6,%hi(g_Vars+0x288) +/* f0b0740: 8dcea248 */ lw $t6,%lo(g_Vars+0x288)($t6) /* f0b0744: 03e00008 */ jr $ra /* f0b0748: 8dc2001c */ lw $v0,0x1c($t6) -/* f0b074c: 3c02800a */ lui $v0,0x800a -/* f0b0750: 8c42a248 */ lw $v0,-0x5db8($v0) +/* f0b074c: 3c02800a */ lui $v0,%hi(g_Vars+0x288) +/* f0b0750: 8c42a248 */ lw $v0,%lo(g_Vars+0x288)($v0) /* f0b0754: 8c4e0020 */ lw $t6,0x20($v0) /* f0b0758: 25cf0001 */ addiu $t7,$t6,0x1 /* f0b075c: 03e00008 */ jr $ra @@ -472,8 +472,8 @@ glabel func0f0b09f4 /* f0b0a18: 00001825 */ or $v1,$zero,$zero /* f0b0a1c: 11e00009 */ beqz $t7,.L0f0b0a44 /* f0b0a20: afa00140 */ sw $zero,0x140($sp) -/* f0b0a24: 3c18800b */ lui $t8,0x800b -/* f0b0a28: 9318cb98 */ lbu $t8,-0x3468($t8) +/* f0b0a24: 3c18800b */ lui $t8,%hi(g_MpSetup+0x10) +/* f0b0a28: 9318cb98 */ lbu $t8,%lo(g_MpSetup+0x10)($t8) /* f0b0a2c: 24010003 */ addiu $at,$zero,0x3 /* f0b0a30: 57010005 */ bnel $t8,$at,.L0f0b0a48 /* f0b0a34: 8fb90150 */ lw $t9,0x150($sp) @@ -656,8 +656,8 @@ glabel func0f0b09f4 /* f0b0ca8: 01802025 */ or $a0,$t4,$zero /* f0b0cac: 0fc4a24b */ jal setCurrentPlayerNum /* f0b0cb0: afaf013c */ sw $t7,0x13c($sp) -/* f0b0cb4: 3c18800a */ lui $t8,0x800a -/* f0b0cb8: 8f18a2d8 */ lw $t8,-0x5d28($t8) +/* f0b0cb4: 3c18800a */ lui $t8,%hi(g_Vars+0x318) +/* f0b0cb8: 8f18a2d8 */ lw $t8,%lo(g_Vars+0x318)($t8) /* f0b0cbc: 8fa90150 */ lw $t1,0x150($sp) /* f0b0cc0: 13000012 */ beqz $t8,.L0f0b0d0c /* f0b0cc4: 00000000 */ sll $zero,$zero,0x0 @@ -739,8 +739,8 @@ glabel func0f0b09f4 /* f0b0dcc: 01402025 */ or $a0,$t2,$zero /* f0b0dd0: 0fc4a24b */ jal setCurrentPlayerNum /* f0b0dd4: afad013c */ sw $t5,0x13c($sp) -/* f0b0dd8: 3c0f800a */ lui $t7,0x800a -/* f0b0ddc: 8defa2d8 */ lw $t7,-0x5d28($t7) +/* f0b0dd8: 3c0f800a */ lui $t7,%hi(g_Vars+0x318) +/* f0b0ddc: 8defa2d8 */ lw $t7,%lo(g_Vars+0x318)($t7) /* f0b0de0: 8fac0154 */ lw $t4,0x154($sp) /* f0b0de4: 11e00012 */ beqz $t7,.L0f0b0e30 /* f0b0de8: 00000000 */ sll $zero,$zero,0x0 @@ -977,8 +977,8 @@ glabel func0f0b10ec /* f0b10f0: 00641823 */ subu $v1,$v1,$a0 /* f0b10f4: 00031880 */ sll $v1,$v1,0x2 /* f0b10f8: 00641821 */ addu $v1,$v1,$a0 -/* f0b10fc: 3c0e800a */ lui $t6,0x800a -/* f0b1100: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b10fc: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b1100: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b1104: 000318c0 */ sll $v1,$v1,0x3 /* f0b1108: 00641821 */ addu $v1,$v1,$a0 /* f0b110c: 27bdffe0 */ addiu $sp,$sp,-32 @@ -990,8 +990,8 @@ glabel func0f0b10ec /* f0b1124: afa30018 */ sw $v1,0x18($sp) /* f0b1128: 10400009 */ beqz $v0,.L0f0b1150 /* f0b112c: 8fa30018 */ lw $v1,0x18($sp) -/* f0b1130: 3c18800a */ lui $t8,0x800a -/* f0b1134: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f0b1130: 3c18800a */ lui $t8,%hi(g_Vars+0x284) +/* f0b1134: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f0b1138: 0303c821 */ addu $t9,$t8,$v1 /* f0b113c: 9328063b */ lbu $t0,0x63b($t9) /* f0b1140: 00084880 */ sll $t1,$t0,0x2 @@ -1129,8 +1129,8 @@ glabel func0f0b12ec /* f0b12f0: 01e47823 */ subu $t7,$t7,$a0 /* f0b12f4: 000f7880 */ sll $t7,$t7,0x2 /* f0b12f8: 01e47821 */ addu $t7,$t7,$a0 -/* f0b12fc: 3c0e800a */ lui $t6,0x800a -/* f0b1300: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b12fc: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b1300: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b1304: 000f78c0 */ sll $t7,$t7,0x3 /* f0b1308: 01e47821 */ addu $t7,$t7,$a0 /* f0b130c: 000f7880 */ sll $t7,$t7,0x2 @@ -1293,8 +1293,8 @@ glabel func0f0b14d8 /* f0b1528: 24030002 */ addiu $v1,$zero,0x2 .L0f0b152c: /* f0b152c: 04600006 */ bltz $v1,.L0f0b1548 -/* f0b1530: 3c0e800a */ lui $t6,0x800a -/* f0b1534: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b1530: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b1534: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b1538: 00037880 */ sll $t7,$v1,0x2 /* f0b153c: 01cfc021 */ addu $t8,$t6,$t7 /* f0b1540: 1000000d */ beqz $zero,.L0f0b1578 @@ -1574,8 +1574,8 @@ glabel currentPlayerHasWeaponEquipped /* f0b18fc: 8cae0000 */ lw $t6,0x0($a1) /* f0b1900: 31cf00ff */ andi $t7,$t6,0xff /* f0b1904: 14ef000b */ bne $a3,$t7,.L0f0b1934 -/* f0b1908: 3c18800a */ lui $t8,0x800a -/* f0b190c: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f0b1908: 3c18800a */ lui $t8,%hi(g_Vars+0x284) +/* f0b190c: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f0b1910: 8ca90014 */ lw $t1,0x14($a1) /* f0b1914: 8f1900c4 */ lw $t9,0xc4($t8) /* f0b1918: 03295024 */ and $t2,$t9,$t1 @@ -1621,19 +1621,19 @@ glabel func0f0b1948 /* f0b1998: 13000012 */ beqz $t8,.L0f0b19e4 /* f0b199c: 00000000 */ sll $zero,$zero,0x0 /* f0b19a0: 8ca30014 */ lw $v1,0x14($a1) -/* f0b19a4: 3c02800a */ lui $v0,0x800a +/* f0b19a4: 3c02800a */ lui $v0,%hi(g_Vars+0x284) /* f0b19a8: 3079000f */ andi $t9,$v1,0xf /* f0b19ac: 13200007 */ beqz $t9,.L0f0b19cc /* f0b19b0: 00000000 */ sll $zero,$zero,0x0 -/* f0b19b4: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0b19b4: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0b19b8: 2401fff0 */ addiu $at,$zero,-16 /* f0b19bc: 8c4900c4 */ lw $t1,0xc4($v0) /* f0b19c0: 01215024 */ and $t2,$t1,$at /* f0b19c4: ac4a00c4 */ sw $t2,0xc4($v0) /* f0b19c8: 8ca30014 */ lw $v1,0x14($a1) .L0f0b19cc: -/* f0b19cc: 3c02800a */ lui $v0,0x800a -/* f0b19d0: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0b19cc: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0b19d0: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0b19d4: 8c4b00c4 */ lw $t3,0xc4($v0) /* f0b19d8: 01636025 */ or $t4,$t3,$v1 /* f0b19dc: 1000000a */ beqz $zero,.L0f0b1a08 diff --git a/src/game/game_0b28d0.c b/src/game/game_0b28d0.c index b415abfe8..6e8c07530 100644 --- a/src/game/game_0b28d0.c +++ b/src/game/game_0b28d0.c @@ -129,12 +129,12 @@ glabel func0f0b2904 /* f0b2a3c: 3c098007 */ lui $t1,%hi(var800705a0) /* f0b2a40: 8d2905a0 */ lw $t1,%lo(var800705a0)($t1) /* f0b2a44: 00005025 */ or $t2,$zero,$zero -/* f0b2a48: 3c0b800a */ lui $t3,%hi(var800a0024) +/* f0b2a48: 3c0b800a */ lui $t3,%hi(var8009dd00) /* f0b2a4c: 1920000c */ blez $t1,.L0f0b2a80 /* f0b2a50: 000960c0 */ sll $t4,$t1,0x3 /* f0b2a54: 01896021 */ addu $t4,$t4,$t1 /* f0b2a58: 000c6080 */ sll $t4,$t4,0x2 -/* f0b2a5c: 8d6bdd00 */ lw $t3,-0x2300($t3) +/* f0b2a5c: 8d6bdd00 */ lw $t3,%lo(var8009dd00)($t3) .L0f0b2a60: /* f0b2a60: 8d6d0008 */ lw $t5,0x8($t3) /* f0b2a64: 254a0024 */ addiu $t2,$t2,0x24 @@ -144,12 +144,12 @@ glabel func0f0b2904 /* f0b2a74: 24e70001 */ addiu $a3,$a3,0x1 .L0f0b2a78: /* f0b2a78: 1420fff9 */ bnez $at,.L0f0b2a60 -/* f0b2a7c: 256b0024 */ addiu $t3,$t3,%lo(var800a0024) +/* f0b2a7c: 256b0024 */ addiu $t3,$t3,36 .L0f0b2a80: /* f0b2a80: 3c098007 */ lui $t1,%hi(var800705a4) /* f0b2a84: 8d2905a4 */ lw $t1,%lo(var800705a4)($t1) /* f0b2a88: 00005025 */ or $t2,$zero,$zero -/* f0b2a8c: 3c0b800a */ lui $t3,%hi(var800a008c) +/* f0b2a8c: 3c0b800a */ lui $t3,%hi(var8009dd04) /* f0b2a90: 1920000f */ blez $t1,.L0f0b2ad0 /* f0b2a94: 000960c0 */ sll $t4,$t1,0x3 /* f0b2a98: 01896021 */ addu $t4,$t4,$t1 @@ -157,7 +157,7 @@ glabel func0f0b2904 /* f0b2aa0: 01896023 */ subu $t4,$t4,$t1 /* f0b2aa4: 000c6080 */ sll $t4,$t4,0x2 /* f0b2aa8: 2409ffff */ addiu $t1,$zero,-1 -/* f0b2aac: 8d6bdd04 */ lw $t3,-0x22fc($t3) +/* f0b2aac: 8d6bdd04 */ lw $t3,%lo(var8009dd04)($t3) .L0f0b2ab0: /* f0b2ab0: 856e0000 */ lh $t6,0x0($t3) /* f0b2ab4: 254a008c */ addiu $t2,$t2,0x8c @@ -167,7 +167,7 @@ glabel func0f0b2904 /* f0b2ac4: 25080001 */ addiu $t0,$t0,0x1 .L0f0b2ac8: /* f0b2ac8: 1420fff9 */ bnez $at,.L0f0b2ab0 -/* f0b2acc: 256b008c */ addiu $t3,$t3,%lo(var800a008c) +/* f0b2acc: 256b008c */ addiu $t3,$t3,140 .L0f0b2ad0: /* f0b2ad0: 3c098007 */ lui $t1,%hi(var800705ac) /* f0b2ad4: 252905ac */ addiu $t1,$t1,%lo(var800705ac) @@ -273,10 +273,10 @@ glabel func0f0b2b64 /* f0b2c34: 8fad003c */ lw $t5,0x3c($sp) /* f0b2c38: 8c8405a0 */ lw $a0,%lo(var800705a0)($a0) /* f0b2c3c: 00003025 */ or $a2,$zero,$zero -/* f0b2c40: 3c07800a */ lui $a3,%hi(var800a0008) +/* f0b2c40: 3c07800a */ lui $a3,%hi(var8009dd00) /* f0b2c44: 1880000e */ blez $a0,.L0f0b2c80 /* f0b2c48: 24050004 */ addiu $a1,$zero,0x4 -/* f0b2c4c: 8ce7dd00 */ lw $a3,-0x2300($a3) +/* f0b2c4c: 8ce7dd00 */ lw $a3,%lo(var8009dd00)($a3) /* f0b2c50: 00001825 */ or $v1,$zero,$zero /* f0b2c54: 00e01025 */ or $v0,$a3,$zero .L0f0b2c58: @@ -500,7 +500,7 @@ glabel func0f0b2b64 /* f0b2f64: 87090014 */ lh $t1,0x14($t8) /* f0b2f68: 24c60001 */ addiu $a2,$a2,0x1 .L0f0b2f6c: -/* f0b2f6c: 24e70008 */ addiu $a3,$a3,%lo(var800a0008) +/* f0b2f6c: 24e70008 */ addiu $a3,$a3,8 /* f0b2f70: 15040003 */ bne $t0,$a0,.L0f0b2f80 /* f0b2f74: 24630008 */ addiu $v1,$v1,0x8 /* f0b2f78: 10000002 */ beqz $zero,.L0f0b2f84 diff --git a/src/game/game_0b3350.c b/src/game/game_0b3350.c index 3aa48d376..6a4da7abb 100644 --- a/src/game/game_0b3350.c +++ b/src/game/game_0b3350.c @@ -1618,8 +1618,8 @@ GLOBAL_ASM( glabel func0f0b4958 /* f0b4958: 3c013f00 */ lui $at,0x3f00 /* f0b495c: 44810000 */ mtc1 $at,$f0 -/* f0b4960: 3c02800a */ lui $v0,0x800a -/* f0b4964: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0b4960: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0b4964: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0b4968: 46006102 */ mul.s $f4,$f12,$f0 /* f0b496c: e44c1704 */ swc1 $f12,0x1704($v0) /* f0b4970: 46007182 */ mul.s $f6,$f14,$f0 @@ -1631,8 +1631,8 @@ glabel func0f0b4958 GLOBAL_ASM( glabel func0f0b4984 -/* f0b4984: 3c02800a */ lui $v0,0x800a -/* f0b4988: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0b4984: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0b4988: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0b498c: e44c170c */ swc1 $f12,0x170c($v0) /* f0b4990: 03e00008 */ jr $ra /* f0b4994: e44e1710 */ swc1 $f14,0x1710($v0) @@ -1640,8 +1640,8 @@ glabel func0f0b4984 GLOBAL_ASM( glabel func0f0b4998 -/* f0b4998: 3c02800a */ lui $v0,0x800a -/* f0b499c: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0b4998: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0b499c: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0b49a0: afa60008 */ sw $a2,0x8($sp) /* f0b49a4: e44c1714 */ swc1 $f12,0x1714($v0) /* f0b49a8: e44e1718 */ swc1 $f14,0x1718($v0) @@ -1652,8 +1652,8 @@ glabel func0f0b4998 GLOBAL_ASM( glabel func0f0b49b8 -/* f0b49b8: 3c02800a */ lui $v0,0x800a -/* f0b49bc: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0b49b8: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0b49bc: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0b49c0: 27bdffe8 */ addiu $sp,$sp,-24 /* f0b49c4: e7ac0018 */ swc1 $f12,0x18($sp) /* f0b49c8: afbf0014 */ sw $ra,0x14($sp) @@ -1686,8 +1686,8 @@ GLOBAL_ASM( glabel func0f0b4a24 /* f0b4a24: 27bdffc0 */ addiu $sp,$sp,-64 /* f0b4a28: afb00020 */ sw $s0,0x20($sp) -/* f0b4a2c: 3c10800a */ lui $s0,0x800a -/* f0b4a30: 8e10a244 */ lw $s0,-0x5dbc($s0) +/* f0b4a2c: 3c10800a */ lui $s0,%hi(g_Vars+0x284) +/* f0b4a30: 8e10a244 */ lw $s0,%lo(g_Vars+0x284)($s0) /* f0b4a34: f7b40018 */ sdc1 $f20,0x18($sp) /* f0b4a38: afbf0024 */ sw $ra,0x24($sp) /* f0b4a3c: 3c017f1b */ lui $at,%hi(var7f1ad144) @@ -1828,8 +1828,8 @@ glabel func0f0b4a24 GLOBAL_ASM( glabel func0f0b4c3c /* f0b4c3c: 27bdffd8 */ addiu $sp,$sp,-40 -/* f0b4c40: 3c02800a */ lui $v0,0x800a -/* f0b4c44: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0b4c40: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0b4c44: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0b4c48: afbf0014 */ sw $ra,0x14($sp) /* f0b4c4c: afa60030 */ sw $a2,0x30($sp) /* f0b4c50: c4840004 */ lwc1 $f4,0x4($a0) @@ -1885,9 +1885,9 @@ glabel func0f0b4d04 /* f0b4d08: 44812000 */ mtc1 $at,$f4 /* f0b4d0c: c4860008 */ lwc1 $f6,0x8($a0) /* f0b4d10: c4880004 */ lwc1 $f8,0x4($a0) -/* f0b4d14: 3c02800a */ lui $v0,0x800a +/* f0b4d14: 3c02800a */ lui $v0,%hi(g_Vars+0x284) /* f0b4d18: 46062003 */ div.s $f0,$f4,$f6 -/* f0b4d1c: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0b4d1c: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0b4d20: c4501734 */ lwc1 $f16,0x1734($v0) /* f0b4d24: c4441710 */ lwc1 $f4,0x1710($v0) /* f0b4d28: c4461724 */ lwc1 $f6,0x1724($v0) @@ -1912,8 +1912,8 @@ GLOBAL_ASM( glabel func0f0b4d68 /* f0b4d68: c4800008 */ lwc1 $f0,0x8($a0) /* f0b4d6c: 44802000 */ mtc1 $zero,$f4 -/* f0b4d70: 3c02800a */ lui $v0,0x800a -/* f0b4d74: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0b4d70: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0b4d74: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0b4d78: 46002032 */ c.eq.s $f4,$f0 /* f0b4d7c: 3c013f80 */ lui $at,0x3f80 /* f0b4d80: 45020005 */ bc1fl .L0f0b4d98 @@ -1953,9 +1953,9 @@ glabel func0f0b4dec /* f0b4df0: 44812000 */ mtc1 $at,$f4 /* f0b4df4: c4860008 */ lwc1 $f6,0x8($a0) /* f0b4df8: 44804000 */ mtc1 $zero,$f8 -/* f0b4dfc: 3c02800a */ lui $v0,0x800a +/* f0b4dfc: 3c02800a */ lui $v0,%hi(g_Vars+0x284) /* f0b4e00: 46062003 */ div.s $f0,$f4,$f6 -/* f0b4e04: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0b4e04: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0b4e08: 4608003c */ c.lt.s $f0,$f8 /* f0b4e0c: 00000000 */ sll $zero,$zero,0x0 /* f0b4e10: 45020003 */ bc1fl .L0f0b4e20 @@ -2013,9 +2013,9 @@ glabel func0f0b4eb8 /* f0b4ebc: 44867000 */ mtc1 $a2,$f14 /* f0b4ec0: c424d154 */ lwc1 $f4,%lo(var7f1ad154)($at) /* f0b4ec4: 27bdffd0 */ addiu $sp,$sp,-48 -/* f0b4ec8: 3c02800a */ lui $v0,0x800a +/* f0b4ec8: 3c02800a */ lui $v0,%hi(g_Vars+0x284) /* f0b4ecc: 46047302 */ mul.s $f12,$f14,$f4 -/* f0b4ed0: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0b4ed0: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0b4ed4: afbf0014 */ sw $ra,0x14($sp) /* f0b4ed8: afa40030 */ sw $a0,0x30($sp) /* f0b4edc: afa50034 */ sw $a1,0x34($sp) @@ -2061,84 +2061,84 @@ glabel func0f0b4eb8 GLOBAL_ASM( glabel func0f0b4f78 -/* f0b4f78: 3c0e800a */ lui $t6,0x800a -/* f0b4f7c: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b4f78: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b4f7c: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b4f80: 03e00008 */ jr $ra /* f0b4f84: adc41738 */ sw $a0,0x1738($t6) -/* f0b4f88: 3c0e800a */ lui $t6,0x800a -/* f0b4f8c: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b4f88: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b4f8c: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b4f90: 03e00008 */ jr $ra /* f0b4f94: 8dc21738 */ lw $v0,0x1738($t6) ); GLOBAL_ASM( glabel func0f0b4f98 -/* f0b4f98: 3c0e800a */ lui $t6,0x800a -/* f0b4f9c: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b4f98: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b4f9c: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b4fa0: 03e00008 */ jr $ra /* f0b4fa4: adc4173c */ sw $a0,0x173c($t6) ); GLOBAL_ASM( glabel func0f0b4fa8 -/* f0b4fa8: 3c0e800a */ lui $t6,0x800a -/* f0b4fac: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b4fa8: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b4fac: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b4fb0: 03e00008 */ jr $ra /* f0b4fb4: 8dc2173c */ lw $v0,0x173c($t6) ); GLOBAL_ASM( glabel func0f0b4fb8 -/* f0b4fb8: 3c0e800a */ lui $t6,0x800a -/* f0b4fbc: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b4fb8: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b4fbc: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b4fc0: 03e00008 */ jr $ra /* f0b4fc4: adc4006c */ sw $a0,0x6c($t6) ); GLOBAL_ASM( glabel func0f0b4fc8 -/* f0b4fc8: 3c0e800a */ lui $t6,0x800a -/* f0b4fcc: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b4fc8: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b4fcc: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b4fd0: 03e00008 */ jr $ra /* f0b4fd4: 8dc2006c */ lw $v0,0x6c($t6) ); GLOBAL_ASM( glabel func0f0b4fd8 -/* f0b4fd8: 3c0e800a */ lui $t6,0x800a -/* f0b4fdc: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b4fd8: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b4fdc: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b4fe0: 03e00008 */ jr $ra /* f0b4fe4: adc41750 */ sw $a0,0x1750($t6) ); GLOBAL_ASM( glabel func0f0b4fe8 -/* f0b4fe8: 3c0e800a */ lui $t6,0x800a -/* f0b4fec: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b4fe8: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b4fec: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b4ff0: 03e00008 */ jr $ra /* f0b4ff4: 8dc21750 */ lw $v0,0x1750($t6) ); GLOBAL_ASM( glabel func0f0b4ff8 -/* f0b4ff8: 3c0e800a */ lui $t6,0x800a -/* f0b4ffc: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b4ff8: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b4ffc: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b5000: 03e00008 */ jr $ra /* f0b5004: adc41758 */ sw $a0,0x1758($t6) ); GLOBAL_ASM( glabel func0f0b5008 -/* f0b5008: 3c0e800a */ lui $t6,0x800a -/* f0b500c: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b5008: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b500c: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b5010: 03e00008 */ jr $ra /* f0b5014: 8dc21758 */ lw $v0,0x1758($t6) ); GLOBAL_ASM( glabel func0f0b5018 -/* f0b5018: 3c02800a */ lui $v0,0x800a -/* f0b501c: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0b5018: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0b501c: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0b5020: 3c0f8008 */ lui $t7,%hi(var80084008) /* f0b5024: 3c19800b */ lui $t9,%hi(var800aa59c) /* f0b5028: 8c4e1740 */ lw $t6,0x1740($v0) @@ -2641,44 +2641,44 @@ glabel func0f0b53a4 GLOBAL_ASM( glabel func0f0b56f8 -/* f0b56f8: 3c0e800a */ lui $t6,0x800a -/* f0b56fc: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b56f8: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b56fc: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b5700: 03e00008 */ jr $ra /* f0b5704: 8dc21740 */ lw $v0,0x1740($t6) ); GLOBAL_ASM( glabel func0f0b5708 -/* f0b5708: 3c0e800a */ lui $t6,0x800a -/* f0b570c: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b5708: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b570c: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b5710: 03e00008 */ jr $ra /* f0b5714: adc41754 */ sw $a0,0x1754($t6) ); GLOBAL_ASM( glabel func0f0b5718 -/* f0b5718: 3c0e800a */ lui $t6,0x800a -/* f0b571c: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b5718: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b571c: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b5720: 03e00008 */ jr $ra /* f0b5724: 8dc21754 */ lw $v0,0x1754($t6) -/* f0b5728: 3c0e800a */ lui $t6,0x800a -/* f0b572c: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b5728: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b572c: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b5730: 03e00008 */ jr $ra /* f0b5734: 8dc21760 */ lw $v0,0x1760($t6) -/* f0b5738: 3c0e800a */ lui $t6,0x800a -/* f0b573c: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b5738: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b573c: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b5740: 03e00008 */ jr $ra /* f0b5744: adc41748 */ sw $a0,0x1748($t6) -/* f0b5748: 3c0e800a */ lui $t6,0x800a -/* f0b574c: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b5748: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b574c: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b5750: 03e00008 */ jr $ra /* f0b5754: 8dc21748 */ lw $v0,0x1748($t6) ); GLOBAL_ASM( glabel func0f0b5758 -/* f0b5758: 3c02800a */ lui $v0,0x800a -/* f0b575c: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0b5758: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0b575c: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0b5760: 8c4e1744 */ lw $t6,0x1744($v0) /* f0b5764: 8c4f174c */ lw $t7,0x174c($v0) /* f0b5768: ac44174c */ sw $a0,0x174c($v0) @@ -2689,92 +2689,92 @@ glabel func0f0b5758 GLOBAL_ASM( glabel func0f0b5778 -/* f0b5778: 3c0e800a */ lui $t6,0x800a -/* f0b577c: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b5778: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b577c: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b5780: 03e00008 */ jr $ra /* f0b5784: 8dc2174c */ lw $v0,0x174c($t6) -/* f0b5788: 3c0e800a */ lui $t6,0x800a -/* f0b578c: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b5788: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b578c: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b5790: 03e00008 */ jr $ra /* f0b5794: 8dc21768 */ lw $v0,0x1768($t6) ); GLOBAL_ASM( glabel func0f0b5798 -/* f0b5798: 3c0e800a */ lui $t6,0x800a -/* f0b579c: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b5798: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b579c: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b57a0: 03e00008 */ jr $ra /* f0b57a4: adc4175c */ sw $a0,0x175c($t6) ); GLOBAL_ASM( glabel func0f0b57a8 -/* f0b57a8: 3c0e800a */ lui $t6,0x800a -/* f0b57ac: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b57a8: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b57ac: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b57b0: 03e00008 */ jr $ra /* f0b57b4: 8dc2175c */ lw $v0,0x175c($t6) ); GLOBAL_ASM( glabel func0f0b57b8 -/* f0b57b8: 3c0e800a */ lui $t6,0x800a -/* f0b57bc: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b57b8: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b57bc: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b57c0: 03e00008 */ jr $ra /* f0b57c4: c5c01774 */ lwc1 $f0,0x1774($t6) -/* f0b57c8: 3c0e800a */ lui $t6,0x800a -/* f0b57cc: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b57c8: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b57cc: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b57d0: 03e00008 */ jr $ra /* f0b57d4: 8dc21778 */ lw $v0,0x1778($t6) ); GLOBAL_ASM( glabel func0f0b57d8 -/* f0b57d8: 3c0e800a */ lui $t6,0x800a -/* f0b57dc: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b57d8: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b57dc: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b57e0: 03e00008 */ jr $ra /* f0b57e4: c5c01704 */ lwc1 $f0,0x1704($t6) ); GLOBAL_ASM( glabel func0f0b57e8 -/* f0b57e8: 3c0e800a */ lui $t6,0x800a -/* f0b57ec: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b57e8: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b57ec: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b57f0: 03e00008 */ jr $ra /* f0b57f4: c5c01708 */ lwc1 $f0,0x1708($t6) ); GLOBAL_ASM( glabel func0f0b57f8 -/* f0b57f8: 3c0e800a */ lui $t6,0x800a -/* f0b57fc: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b57f8: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b57fc: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b5800: 03e00008 */ jr $ra /* f0b5804: c5c0170c */ lwc1 $f0,0x170c($t6) ); GLOBAL_ASM( glabel func0f0b5808 -/* f0b5808: 3c0e800a */ lui $t6,0x800a -/* f0b580c: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b5808: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b580c: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b5810: 03e00008 */ jr $ra /* f0b5814: c5c01710 */ lwc1 $f0,0x1710($t6) -/* f0b5818: 3c0e800a */ lui $t6,0x800a -/* f0b581c: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b5818: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b581c: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b5820: 03e00008 */ jr $ra /* f0b5824: c5c01718 */ lwc1 $f0,0x1718($t6) ); GLOBAL_ASM( glabel func0f0b5828 -/* f0b5828: 3c0e800a */ lui $t6,0x800a -/* f0b582c: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b5828: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b582c: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b5830: 03e00008 */ jr $ra /* f0b5834: c5c0171c */ lwc1 $f0,0x171c($t6) ); GLOBAL_ASM( glabel func0f0b5838 -/* f0b5838: 3c04800a */ lui $a0,0x800a -/* f0b583c: 8c84a244 */ lw $a0,-0x5dbc($a0) +/* f0b5838: 3c04800a */ lui $a0,%hi(g_Vars+0x284) +/* f0b583c: 8c84a244 */ lw $a0,%lo(g_Vars+0x284)($a0) /* f0b5840: 27bdffd0 */ addiu $sp,$sp,-48 /* f0b5844: afbf0014 */ sw $ra,0x14($sp) /* f0b5848: c486172c */ lwc1 $f6,0x172c($a0) @@ -2994,8 +2994,8 @@ glabel func0f0b5838 GLOBAL_ASM( glabel func0f0b5b9c -/* f0b5b9c: 3c0e800a */ lui $t6,0x800a -/* f0b5ba0: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b5b9c: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b5ba0: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b5ba4: c4820000 */ lwc1 $f2,0x0($a0) /* f0b5ba8: c48e0004 */ lwc1 $f14,0x4($a0) /* f0b5bac: 8dc2174c */ lw $v0,0x174c($t6) @@ -3108,8 +3108,8 @@ GLOBAL_ASM( glabel func0f0b5d38 /* f0b5d38: 27bdff80 */ addiu $sp,$sp,-128 /* f0b5d3c: afb00028 */ sw $s0,0x28($sp) -/* f0b5d40: 3c10800a */ lui $s0,0x800a -/* f0b5d44: 8e10a244 */ lw $s0,-0x5dbc($s0) +/* f0b5d40: 3c10800a */ lui $s0,%hi(g_Vars+0x284) +/* f0b5d44: 8e10a244 */ lw $s0,%lo(g_Vars+0x284)($s0) /* f0b5d48: afbf002c */ sw $ra,0x2c($sp) /* f0b5d4c: f7b60020 */ sdc1 $f22,0x20($sp) /* f0b5d50: f7b40018 */ sdc1 $f20,0x18($sp) @@ -3156,8 +3156,8 @@ glabel func0f0b5d38 /* f0b5df0: 0c012974 */ jal sqrtf /* f0b5df4: 46142300 */ add.s $f12,$f4,$f20 /* f0b5df8: 4600a303 */ div.s $f12,$f20,$f0 -/* f0b5dfc: 3c10800a */ lui $s0,0x800a -/* f0b5e00: 8e10a244 */ lw $s0,-0x5dbc($s0) +/* f0b5dfc: 3c10800a */ lui $s0,%hi(g_Vars+0x284) +/* f0b5e00: 8e10a244 */ lw $s0,%lo(g_Vars+0x284)($s0) /* f0b5e04: c7a20038 */ lwc1 $f2,0x38($sp) /* f0b5e08: 8fa40080 */ lw $a0,0x80($sp) /* f0b5e0c: 8e02174c */ lw $v0,0x174c($s0) @@ -3230,8 +3230,8 @@ glabel func0f0b5d38 /* f0b5f14: 0c012974 */ jal sqrtf /* f0b5f18: 46149300 */ add.s $f12,$f18,$f20 /* f0b5f1c: 4600a303 */ div.s $f12,$f20,$f0 -/* f0b5f20: 3c10800a */ lui $s0,0x800a -/* f0b5f24: 8e10a244 */ lw $s0,-0x5dbc($s0) +/* f0b5f20: 3c10800a */ lui $s0,%hi(g_Vars+0x284) +/* f0b5f24: 8e10a244 */ lw $s0,%lo(g_Vars+0x284)($s0) /* f0b5f28: c7a20038 */ lwc1 $f2,0x38($sp) /* f0b5f2c: 8fa40080 */ lw $a0,0x80($sp) /* f0b5f30: 8e02174c */ lw $v0,0x174c($s0) @@ -3305,8 +3305,8 @@ glabel func0f0b5d38 /* f0b603c: 46145300 */ add.s $f12,$f10,$f20 /* f0b6040: 4600a303 */ div.s $f12,$f20,$f0 /* f0b6044: c7a20034 */ lwc1 $f2,0x34($sp) -/* f0b6048: 3c10800a */ lui $s0,0x800a -/* f0b604c: 8e10a244 */ lw $s0,-0x5dbc($s0) +/* f0b6048: 3c10800a */ lui $s0,%hi(g_Vars+0x284) +/* f0b604c: 8e10a244 */ lw $s0,%lo(g_Vars+0x284)($s0) /* f0b6050: 8fa40080 */ lw $a0,0x80($sp) /* f0b6054: 8faa0088 */ lw $t2,0x88($sp) /* f0b6058: 8e02174c */ lw $v0,0x174c($s0) @@ -3380,8 +3380,8 @@ glabel func0f0b5d38 /* f0b6164: 46145300 */ add.s $f12,$f10,$f20 /* f0b6168: 4600a303 */ div.s $f12,$f20,$f0 /* f0b616c: c7a20034 */ lwc1 $f2,0x34($sp) -/* f0b6170: 3c10800a */ lui $s0,0x800a -/* f0b6174: 8e10a244 */ lw $s0,-0x5dbc($s0) +/* f0b6170: 3c10800a */ lui $s0,%hi(g_Vars+0x284) +/* f0b6174: 8e10a244 */ lw $s0,%lo(g_Vars+0x284)($s0) /* f0b6178: 8fa40080 */ lw $a0,0x80($sp) /* f0b617c: 8e02174c */ lw $v0,0x174c($s0) /* f0b6180: c4480020 */ lwc1 $f8,0x20($v0) diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index b71271218..3ef101166 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -249,20 +249,20 @@ glabel func0f0b65a8 /* f0b65a8: 27bdffe8 */ addiu $sp,$sp,-24 /* f0b65ac: 1880000c */ blez $a0,.L0f0b65e0 /* f0b65b0: afbf0014 */ sw $ra,0x14($sp) -/* f0b65b4: 3c01800a */ lui $at,0x800a -/* f0b65b8: ac24ddcc */ sw $a0,-0x2234($at) +/* f0b65b4: 3c01800a */ lui $at,%hi(var8009ddcc) +/* f0b65b8: ac24ddcc */ sw $a0,%lo(var8009ddcc)($at) /* f0b65bc: 00042040 */ sll $a0,$a0,0x1 /* f0b65c0: 2484000f */ addiu $a0,$a0,0xf /* f0b65c4: 348e000f */ ori $t6,$a0,0xf /* f0b65c8: 39c4000f */ xori $a0,$t6,0xf /* f0b65cc: 0c0048f2 */ jal malloc /* f0b65d0: 24050004 */ addiu $a1,$zero,0x4 -/* f0b65d4: 3c01800a */ lui $at,0x800a +/* f0b65d4: 3c01800a */ lui $at,%hi(var8009ddc8) /* f0b65d8: 10000003 */ beqz $zero,.L0f0b65e8 -/* f0b65dc: ac22ddc8 */ sw $v0,-0x2238($at) +/* f0b65dc: ac22ddc8 */ sw $v0,%lo(var8009ddc8)($at) .L0f0b65e0: -/* f0b65e0: 3c01800a */ lui $at,0x800a -/* f0b65e4: ac20ddc8 */ sw $zero,-0x2238($at) +/* f0b65e0: 3c01800a */ lui $at,%hi(var8009ddc8) +/* f0b65e4: ac20ddc8 */ sw $zero,%lo(var8009ddc8)($at) .L0f0b65e8: /* f0b65e8: 8fbf0014 */ lw $ra,0x14($sp) /* f0b65ec: 27bd0018 */ addiu $sp,$sp,0x18 @@ -307,8 +307,8 @@ glabel func0f0b65f8 /* f0b6674: 4405a000 */ mfc1 $a1,$f20 /* f0b6678: 00008025 */ or $s0,$zero,$zero .L0f0b667c: -/* f0b667c: 3c11800a */ lui $s1,0x800a -/* f0b6680: 8e31a2fc */ lw $s1,-0x5d04($s1) +/* f0b667c: 3c11800a */ lui $s1,%hi(g_Vars+0x33c) +/* f0b6680: 8e31a2fc */ lw $s1,%lo(g_Vars+0x33c)($s1) /* f0b6684: 2415002a */ addiu $s5,$zero,0x2a /* f0b6688: 2414002f */ addiu $s4,$zero,0x2f /* f0b668c: 12200020 */ beqz $s1,.L0f0b6710 @@ -1224,10 +1224,10 @@ glabel var7f1ad568 /* f0b7308: 8de10008 */ lw $at,0x8($t7) /* f0b730c: 3c12800a */ lui $s2,%hi(g_Vars) /* f0b7310: 26529fc0 */ addiu $s2,$s2,%lo(g_Vars) -/* f0b7314: 3c11800a */ lui $s1,%hi(var800a000c) +/* f0b7314: 3c11800a */ lui $s1,%hi(g_StageSetup+0xc) /* f0b7318: adc80004 */ sw $t0,0x4($t6) /* f0b731c: adc10008 */ sw $at,0x8($t6) -/* f0b7320: 8e31d03c */ lw $s1,-0x2fc4($s1) +/* f0b7320: 8e31d03c */ lw $s1,%lo(g_StageSetup+0xc)($s1) /* f0b7324: 0fc47788 */ jal func0f11de20 /* f0b7328: 8244028f */ lb $a0,0x28f($s2) /* f0b732c: 8e490284 */ lw $t1,0x284($s2) @@ -1445,7 +1445,7 @@ glabel var7f1ad568 /* f0b7648: 01400008 */ jr $t2 /* f0b764c: 00000000 */ sll $zero,$zero,0x0 /* f0b7650: 10000024 */ beqz $zero,.L0f0b76e4 -/* f0b7654: 2631000c */ addiu $s1,$s1,%lo(var800a000c) +/* f0b7654: 2631000c */ addiu $s1,$s1,12 /* f0b7658: 10000022 */ beqz $zero,.L0f0b76e4 /* f0b765c: 2631000c */ addiu $s1,$s1,0xc /* f0b7660: 10000020 */ beqz $zero,.L0f0b76e4 @@ -1864,8 +1864,8 @@ glabel var7f1ad570 GLOBAL_ASM( glabel func0f0b7c60 /* f0b7c60: 27bdffb8 */ addiu $sp,$sp,-72 -/* f0b7c64: 3c0e800a */ lui $t6,0x800a -/* f0b7c68: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0b7c64: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0b7c68: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b7c6c: afbf0024 */ sw $ra,0x24($sp) /* f0b7c70: afb00020 */ sw $s0,0x20($sp) /* f0b7c74: afa5004c */ sw $a1,0x4c($sp) @@ -2027,19 +2027,19 @@ glabel func0f0b7c60 /* f0b7ec4: 2401005c */ addiu $at,$zero,0x5c /* f0b7ec8: 15810007 */ bne $t4,$at,.L0f0b7ee8 /* f0b7ecc: 240d0008 */ addiu $t5,$zero,0x8 -/* f0b7ed0: 3c01800a */ lui $at,0x800a -/* f0b7ed4: ac2da400 */ sw $t5,-0x5c00($at) -/* f0b7ed8: 3c01800a */ lui $at,0x800a +/* f0b7ed0: 3c01800a */ lui $at,%hi(g_Vars+0x440) +/* f0b7ed4: ac2da400 */ sw $t5,%lo(g_Vars+0x440)($at) +/* f0b7ed8: 3c01800a */ lui $at,%hi(g_Vars+0x444) /* f0b7edc: 240e005b */ addiu $t6,$zero,0x5b /* f0b7ee0: 10000007 */ beqz $zero,.L0f0b7f00 -/* f0b7ee4: ac2ea404 */ sw $t6,-0x5bfc($at) +/* f0b7ee4: ac2ea404 */ sw $t6,%lo(g_Vars+0x444)($at) .L0f0b7ee8: /* f0b7ee8: 820f0006 */ lb $t7,0x6($s0) -/* f0b7eec: 3c01800a */ lui $at,0x800a -/* f0b7ef0: ac2fa400 */ sw $t7,-0x5c00($at) +/* f0b7eec: 3c01800a */ lui $at,%hi(g_Vars+0x440) +/* f0b7ef0: ac2fa400 */ sw $t7,%lo(g_Vars+0x440)($at) /* f0b7ef4: 86180010 */ lh $t8,0x10($s0) -/* f0b7ef8: 3c01800a */ lui $at,0x800a -/* f0b7efc: ac38a404 */ sw $t8,-0x5bfc($at) +/* f0b7ef8: 3c01800a */ lui $at,%hi(g_Vars+0x444) +/* f0b7efc: ac38a404 */ sw $t8,%lo(g_Vars+0x444)($at) .L0f0b7f00: /* f0b7f00: 0fc2e2e8 */ jal func0f0b8ba0 /* f0b7f04: 00000000 */ sll $zero,$zero,0x0 @@ -2091,10 +2091,10 @@ glabel func0f0b7c60 /* f0b7fb4: c6080024 */ lwc1 $f8,0x24($s0) .L0f0b7fb8: /* f0b7fb8: 8fb8003c */ lw $t8,0x3c($sp) -/* f0b7fbc: 3c19800a */ lui $t9,0x800a +/* f0b7fbc: 3c19800a */ lui $t9,%hi(g_Vars+0x284) /* f0b7fc0: 24050001 */ addiu $a1,$zero,0x1 /* f0b7fc4: e7080024 */ swc1 $f8,0x24($t8) -/* f0b7fc8: 8f39a244 */ lw $t9,-0x5dbc($t9) +/* f0b7fc8: 8f39a244 */ lw $t9,%lo(g_Vars+0x284)($t9) /* f0b7fcc: c60a0024 */ lwc1 $f10,0x24($s0) /* f0b7fd0: e72a0378 */ swc1 $f10,0x378($t9) /* f0b7fd4: 0fc08351 */ jal func0f020d44 @@ -2691,14 +2691,14 @@ glabel var7f1ad5b0 /* f0b87a0: 3c03800a */ lui $v1,%hi(g_Vars) /* f0b87a4: 24639fc0 */ addiu $v1,$v1,%lo(g_Vars) /* f0b87a8: 8c6c0288 */ lw $t4,0x288($v1) -/* f0b87ac: 3c04800b */ lui $a0,0x800b +/* f0b87ac: 3c04800b */ lui $a0,%hi(g_MpPlayers+0xf) /* f0b87b0: 8fa70024 */ lw $a3,0x24($sp) /* f0b87b4: 8d8d0070 */ lw $t5,0x70($t4) /* f0b87b8: 000d7080 */ sll $t6,$t5,0x2 /* f0b87bc: 01cd7021 */ addu $t6,$t6,$t5 /* f0b87c0: 000e7140 */ sll $t6,$t6,0x5 /* f0b87c4: 008e2021 */ addu $a0,$a0,$t6 -/* f0b87c8: 9084c7c7 */ lbu $a0,-0x3839($a0) +/* f0b87c8: 9084c7c7 */ lbu $a0,%lo(g_MpPlayers+0xf)($a0) /* f0b87cc: 0082082a */ slt $at,$a0,$v0 /* f0b87d0: 10200008 */ beqz $at,.L0f0b87f4 /* f0b87d4: 00000000 */ sll $zero,$zero,0x0 @@ -2715,7 +2715,7 @@ glabel var7f1ad5b0 /* f0b87fc: 3c03800a */ lui $v1,%hi(g_Vars) /* f0b8800: 24639fc0 */ addiu $v1,$v1,%lo(g_Vars) /* f0b8804: 8c6f0288 */ lw $t7,0x288($v1) -/* f0b8808: 3c09800b */ lui $t1,0x800b +/* f0b8808: 3c09800b */ lui $t1,%hi(g_MpPlayers+0xf) /* f0b880c: 8fa40028 */ lw $a0,0x28($sp) /* f0b8810: 8df80070 */ lw $t8,0x70($t7) /* f0b8814: 8fa70024 */ lw $a3,0x24($sp) @@ -2724,21 +2724,21 @@ glabel var7f1ad5b0 /* f0b8820: 0338c821 */ addu $t9,$t9,$t8 /* f0b8824: 0019c940 */ sll $t9,$t9,0x5 /* f0b8828: 01394821 */ addu $t1,$t1,$t9 -/* f0b882c: 9129c7c7 */ lbu $t1,-0x3839($t1) +/* f0b882c: 9129c7c7 */ lbu $t1,%lo(g_MpPlayers+0xf)($t1) /* f0b8830: 01225023 */ subu $t2,$t1,$v0 /* f0b8834: 10800002 */ beqz $a0,.L0f0b8840 /* f0b8838: acea0000 */ sw $t2,0x0($a3) /* f0b883c: ac8b0000 */ sw $t3,0x0($a0) .L0f0b8840: /* f0b8840: 8c6c0288 */ lw $t4,0x288($v1) -/* f0b8844: 3c04800b */ lui $a0,0x800b +/* f0b8844: 3c04800b */ lui $a0,%hi(g_MpPlayers+0x10) /* f0b8848: 8d8d0070 */ lw $t5,0x70($t4) /* f0b884c: 000d7080 */ sll $t6,$t5,0x2 /* f0b8850: 01cd7021 */ addu $t6,$t6,$t5 /* f0b8854: 000e7140 */ sll $t6,$t6,0x5 /* f0b8858: 008e2021 */ addu $a0,$a0,$t6 /* f0b885c: 0fc62ee4 */ jal mpGetBodyId -/* f0b8860: 9084c7c8 */ lbu $a0,-0x3838($a0) +/* f0b8860: 9084c7c8 */ lbu $a0,%lo(g_MpPlayers+0x10)($a0) /* f0b8864: 8fa60020 */ lw $a2,0x20($sp) /* f0b8868: 100000c9 */ beqz $zero,.L0f0b8b90 /* f0b886c: acc20000 */ sw $v0,0x0($a2) @@ -3357,12 +3357,12 @@ glabel var7f1ad5b4 /* f0b9128: 000e7080 */ sll $t6,$t6,0x2 /* f0b912c: 01c81821 */ addu $v1,$t6,$t0 /* f0b9130: 94780002 */ lhu $t8,0x2($v1) -/* f0b9134: 3c01800a */ lui $at,0x800a +/* f0b9134: 3c01800a */ lui $at,%hi(var800a6680) /* f0b9138: ac62000c */ sw $v0,0xc($v1) /* f0b913c: 0018c8c0 */ sll $t9,$t8,0x3 /* f0b9140: 00390821 */ addu $at,$at,$t9 /* f0b9144: afa200f8 */ sw $v0,0xf8($sp) -/* f0b9148: ac206680 */ sw $zero,0x6680($at) +/* f0b9148: ac206680 */ sw $zero,%lo(var800a6680)($at) /* f0b914c: 00402025 */ or $a0,$v0,$zero /* f0b9150: 8fa50064 */ lw $a1,0x64($sp) /* f0b9154: 0fc0b76f */ jal func0f02ddbc @@ -3427,13 +3427,13 @@ glabel var7f1ad5b4 /* f0b9230: 11600011 */ beqz $t3,.L0f0b9278 /* f0b9234: 8da60004 */ lw $a2,0x4($t5) /* f0b9238: 8e02028c */ lw $v0,0x28c($s0) -/* f0b923c: 3c01800b */ lui $at,0x800b +/* f0b923c: 3c01800b */ lui $at,%hi(g_MpPlayerChrs) /* f0b9240: 3c0f800b */ lui $t7,%hi(g_MpPlayers) /* f0b9244: 00027080 */ sll $t6,$v0,0x2 /* f0b9248: 002e0821 */ addu $at,$at,$t6 -/* f0b924c: ac26c4d0 */ sw $a2,-0x3b30($at) +/* f0b924c: ac26c4d0 */ sw $a2,%lo(g_MpPlayerChrs)($at) /* f0b9250: 8e080288 */ lw $t0,0x288($s0) -/* f0b9254: 3c01800b */ lui $at,0x800b +/* f0b9254: 3c01800b */ lui $at,%hi(var800ac500) /* f0b9258: 25efc7b8 */ addiu $t7,$t7,%lo(g_MpPlayers) /* f0b925c: 8d180070 */ lw $t8,0x70($t0) /* f0b9260: 002e0821 */ addu $at,$at,$t6 @@ -3441,7 +3441,7 @@ glabel var7f1ad5b4 /* f0b9268: 0338c821 */ addu $t9,$t9,$t8 /* f0b926c: 0019c940 */ sll $t9,$t9,0x5 /* f0b9270: 032f4821 */ addu $t1,$t9,$t7 -/* f0b9274: ac29c500 */ sw $t1,-0x3b00($at) +/* f0b9274: ac29c500 */ sw $t1,%lo(var800ac500)($at) .L0f0b9278: /* f0b9278: 8cca0018 */ lw $t2,0x18($a2) /* f0b927c: 354c0001 */ ori $t4,$t2,0x1 @@ -3899,8 +3899,8 @@ glabel var7f1ad5c8 /* f0b991c: 3c02800a */ lui $v0,%hi(var8009dde4) /* f0b9920: 2442dde4 */ addiu $v0,$v0,%lo(var8009dde4) /* f0b9924: c4420000 */ lwc1 $f2,0x0($v0) -/* f0b9928: 3c03800a */ lui $v1,0x800a -/* f0b992c: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f0b9928: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f0b992c: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f0b9930: 46020182 */ mul.s $f6,$f0,$f2 /* f0b9934: 3c017f1b */ lui $at,%hi(var7f1ad5c8) /* f0b9938: c468037c */ lwc1 $f8,0x37c($v1) @@ -3916,8 +3916,8 @@ glabel var7f1ad5c8 /* f0b9960: 3c02800a */ lui $v0,%hi(var8009dde4) /* f0b9964: 2442dde4 */ addiu $v0,$v0,%lo(var8009dde4) /* f0b9968: c4460000 */ lwc1 $f6,0x0($v0) -/* f0b996c: 3c03800a */ lui $v1,0x800a -/* f0b9970: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f0b996c: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f0b9970: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f0b9974: 46060102 */ mul.s $f4,$f0,$f6 /* f0b9978: 27a40080 */ addiu $a0,$sp,0x80 /* f0b997c: c4680384 */ lwc1 $f8,0x384($v1) @@ -4286,12 +4286,12 @@ glabel cameraDoAnimation /* f0ba0e0: afbf0014 */ sw $ra,0x14($sp) /* f0ba0e4: 15c00004 */ bnez $t6,.L0f0ba0f8 /* f0ba0e8: afa40018 */ sw $a0,0x18($sp) -/* f0ba0ec: 3c0f800a */ lui $t7,0x800a -/* f0ba0f0: 81efa493 */ lb $t7,-0x5b6d($t7) +/* f0ba0ec: 3c0f800a */ lui $t7,%hi(g_Vars+0x4d3) +/* f0ba0f0: 81efa493 */ lb $t7,%lo(g_Vars+0x4d3)($t7) /* f0ba0f4: 11e00008 */ beqz $t7,.L0f0ba118 .L0f0ba0f8: -/* f0ba0f8: 3c18800a */ lui $t8,0x800a -/* f0ba0fc: 8f18a48c */ lw $t8,-0x5b74($t8) +/* f0ba0f8: 3c18800a */ lui $t8,%hi(g_Vars+0x4cc) +/* f0ba0fc: 8f18a48c */ lw $t8,%lo(g_Vars+0x4cc)($t8) /* f0ba100: 3c19800a */ lui $t9,%hi(var8009de24) /* f0ba104: 13000004 */ beqz $t8,.L0f0ba118 /* f0ba108: 00000000 */ sll $zero,$zero,0x0 @@ -4301,14 +4301,14 @@ glabel cameraDoAnimation .L0f0ba118: /* f0ba118: 0c004f75 */ jal func00013dd4 /* f0ba11c: 00000000 */ sll $zero,$zero,0x0 -/* f0ba120: 3c02800a */ lui $v0,0x800a -/* f0ba124: 8c42a26c */ lw $v0,-0x5d94($v0) +/* f0ba120: 3c02800a */ lui $v0,%hi(g_Vars+0x2ac) +/* f0ba124: 8c42a26c */ lw $v0,%lo(g_Vars+0x2ac)($v0) /* f0ba128: 24030006 */ addiu $v1,$zero,0x6 -/* f0ba12c: 3c01800a */ lui $at,0x800a +/* f0ba12c: 3c01800a */ lui $at,%hi(var8009de24) /* f0ba130: 10620005 */ beq $v1,$v0,.L0f0ba148 /* f0ba134: 00000000 */ sll $zero,$zero,0x0 /* f0ba138: 44802000 */ mtc1 $zero,$f4 -/* f0ba13c: ac20de24 */ sw $zero,-0x21dc($at) +/* f0ba13c: ac20de24 */ sw $zero,%lo(var8009de24)($at) /* f0ba140: 3c01800a */ lui $at,0x800a /* f0ba144: e424de28 */ swc1 $f4,-0x21d8($at) .L0f0ba148: @@ -4318,10 +4318,10 @@ glabel cameraDoAnimation /* f0ba154: 00000000 */ sll $zero,$zero,0x0 /* f0ba158: 87a8001a */ lh $t0,0x1a($sp) .L0f0ba15c: -/* f0ba15c: 3c09800a */ lui $t1,0x800a -/* f0ba160: 8d29a244 */ lw $t1,-0x5dbc($t1) -/* f0ba164: 3c01800a */ lui $at,0x800a -/* f0ba168: a428de18 */ sh $t0,-0x21e8($at) +/* f0ba15c: 3c09800a */ lui $t1,%hi(g_Vars+0x284) +/* f0ba160: 8d29a244 */ lw $t1,%lo(g_Vars+0x284)($t1) +/* f0ba164: 3c01800a */ lui $at,%hi(var8009de18) +/* f0ba168: a428de18 */ sh $t0,%lo(var8009de18)($at) /* f0ba16c: 8d2a19c8 */ lw $t2,0x19c8($t1) /* f0ba170: 51400004 */ beqzl $t2,.L0f0ba184 /* f0ba174: 8fbf0014 */ lw $ra,0x14($sp) @@ -4344,9 +4344,9 @@ glabel var7f1ad5d4 glabel var7f1ad5d8 .word 0x3c8ef461 .text -/* f0ba190: 3c01800a */ lui $at,0x800a +/* f0ba190: 3c01800a */ lui $at,%hi(var8009de2c) /* f0ba194: 27bdff60 */ addiu $sp,$sp,-160 -/* f0ba198: ac24de2c */ sw $a0,-0x21d4($at) +/* f0ba198: ac24de2c */ sw $a0,%lo(var8009de2c)($at) /* f0ba19c: afbf0024 */ sw $ra,0x24($sp) /* f0ba1a0: 3c04800a */ lui $a0,%hi(var8009de18) /* f0ba1a4: 0c008dda */ jal animGetNumFrames @@ -4514,9 +4514,9 @@ glabel var7f1ad5dc /* f0ba3f8: 0225082a */ slt $at,$s1,$a1 /* f0ba3fc: 8c6f0000 */ lw $t7,0x0($v1) /* f0ba400: 0011c080 */ sll $t8,$s1,0x2 -/* f0ba404: 3c01800a */ lui $at,0x800a +/* f0ba404: 3c01800a */ lui $at,%hi(var8009de20) /* f0ba408: 01f8c823 */ subu $t9,$t7,$t8 -/* f0ba40c: ac39de20 */ sw $t9,-0x21e0($at) +/* f0ba40c: ac39de20 */ sw $t9,%lo(var8009de20)($at) /* f0ba410: 0225082a */ slt $at,$s1,$a1 .L0f0ba414: /* f0ba414: 50200003 */ beqzl $at,.L0f0ba424 @@ -4771,8 +4771,8 @@ glabel var7f1ad5dc /* f0ba7e4: 8fbf003c */ lw $ra,0x3c($sp) /* f0ba7e8: 1040000c */ beqz $v0,.L0f0ba81c /* f0ba7ec: 24030001 */ addiu $v1,$zero,0x1 -/* f0ba7f0: 3c01800a */ lui $at,0x800a -/* f0ba7f4: ac23de24 */ sw $v1,-0x21dc($at) +/* f0ba7f0: 3c01800a */ lui $at,%hi(var8009de24) +/* f0ba7f4: ac23de24 */ sw $v1,%lo(var8009de24)($at) /* f0ba7f8: 827904d3 */ lb $t9,0x4d3($s3) /* f0ba7fc: 30485000 */ andi $t0,$v0,0x5000 /* f0ba800: 53200007 */ beqzl $t9,.L0f0ba820 @@ -4820,8 +4820,8 @@ glabel func0f0ba844 GLOBAL_ASM( glabel func0f0ba87c -/* f0ba87c: 3c02800a */ lui $v0,0x800a -/* f0ba880: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0ba87c: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0ba880: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0ba884: c4441840 */ lwc1 $f4,0x1840($v0) /* f0ba888: c4461844 */ lwc1 $f6,0x1844($v0) /* f0ba88c: 4606203c */ c.lt.s $f4,$f6 @@ -4843,12 +4843,12 @@ glabel func0f0ba8b0 /* f0ba8b8: 0fc2ea1f */ jal func0f0ba87c /* f0ba8bc: e7ac0018 */ swc1 $f12,0x18($sp) /* f0ba8c0: c7ac0018 */ lwc1 $f12,0x18($sp) -/* f0ba8c4: 3c0e800a */ lui $t6,0x800a +/* f0ba8c4: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) /* f0ba8c8: 460c0032 */ c.eq.s $f0,$f12 /* f0ba8cc: 00000000 */ sll $zero,$zero,0x0 /* f0ba8d0: 4503001a */ bc1tl .L0f0ba93c /* f0ba8d4: 8fbf0014 */ lw $ra,0x14($sp) -/* f0ba8d8: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0ba8d8: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0ba8dc: 3c014170 */ lui $at,0x4170 /* f0ba8e0: c5c01848 */ lwc1 $f0,0x1848($t6) /* f0ba8e4: 4600603c */ c.lt.s $f12,$f0 @@ -4886,8 +4886,8 @@ glabel func0f0ba948 glabel var7f1ad5e0 .word 0x40490fdb .text -/* f0ba948: 3c02800a */ lui $v0,0x800a -/* f0ba94c: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0ba948: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0ba94c: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0ba950: 27bdffe8 */ addiu $sp,$sp,-24 /* f0ba954: afbf0014 */ sw $ra,0x14($sp) /* f0ba958: 90431bfc */ lbu $v1,0x1bfc($v0) @@ -5071,8 +5071,8 @@ glabel var7f1ad600 /* f0bab9c: 46000306 */ mov.s $f12,$f0 /* f0baba0: 0c002f4c */ jal func0000bd30 /* f0baba4: c7ac0018 */ lwc1 $f12,0x18($sp) -/* f0baba8: 3c02800a */ lui $v0,0x800a -/* f0babac: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0baba8: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0babac: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0babb0: 3c014170 */ lui $at,0x4170 .L0f0babb4: /* f0babb4: 44814000 */ mtc1 $at,$f8 @@ -5360,8 +5360,8 @@ void func0f0baf38(void) GLOBAL_ASM( glabel func0f0baf84 -/* f0baf84: 3c0e800a */ lui $t6,0x800a -/* f0baf88: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0baf84: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0baf88: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0baf8c: 27bdffc0 */ addiu $sp,$sp,-64 /* f0baf90: afbf002c */ sw $ra,0x2c($sp) /* f0baf94: afb00028 */ sw $s0,0x28($sp) @@ -5373,8 +5373,8 @@ glabel func0f0baf84 /* f0bafac: 00000000 */ sll $zero,$zero,0x0 /* f0bafb0: 3c014120 */ lui $at,0x4120 /* f0bafb4: 44812000 */ mtc1 $at,$f4 -/* f0bafb8: 3c18800a */ lui $t8,0x800a -/* f0bafbc: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f0bafb8: 3c18800a */ lui $t8,%hi(g_Vars+0x284) +/* f0bafbc: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f0bafc0: 3c014396 */ lui $at,0x4396 /* f0bafc4: 44813000 */ mtc1 $at,$f6 /* f0bafc8: afa2003c */ sw $v0,0x3c($sp) @@ -6378,8 +6378,8 @@ glabel var7f1ad674 /* f0bbed8: 27bd0048 */ addiu $sp,$sp,0x48 /* f0bbedc: 03e00008 */ jr $ra /* f0bbee0: 00000000 */ sll $zero,$zero,0x0 -/* f0bbee4: 3c0e800a */ lui $t6,0x800a -/* f0bbee8: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0bbee4: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0bbee8: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0bbeec: 44803000 */ mtc1 $zero,$f6 /* f0bbef0: 00001025 */ or $v0,$zero,$zero /* f0bbef4: c5c400f4 */ lwc1 $f4,0xf4($t6) @@ -6395,8 +6395,8 @@ glabel var7f1ad674 GLOBAL_ASM( glabel func0f0bbf14 -/* f0bbf14: 3c02800a */ lui $v0,0x800a -/* f0bbf18: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0bbf14: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0bbf18: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0bbf1c: 3c018007 */ lui $at,0x8007 /* f0bbf20: 8c4e1924 */ lw $t6,0x1924($v0) /* f0bbf24: c44000f4 */ lwc1 $f0,0xf4($v0) @@ -7859,13 +7859,13 @@ glabel func0f0bd3c4 /* f0bd3d0: 25ce09c4 */ addiu $t6,$t6,%lo(var800709c4) /* f0bd3d4: 8dc10000 */ lw $at,0x0($t6) /* f0bd3d8: 27a6001c */ addiu $a2,$sp,0x1c -/* f0bd3dc: 3c02800a */ lui $v0,0x800a +/* f0bd3dc: 3c02800a */ lui $v0,%hi(g_Vars+0x284) /* f0bd3e0: acc10000 */ sw $at,0x0($a2) /* f0bd3e4: 8dd90004 */ lw $t9,0x4($t6) /* f0bd3e8: acd90004 */ sw $t9,0x4($a2) /* f0bd3ec: 8dc10008 */ lw $at,0x8($t6) /* f0bd3f0: acc10008 */ sw $at,0x8($a2) -/* f0bd3f4: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0bd3f4: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0bd3f8: 8c4800d8 */ lw $t0,0xd8($v0) /* f0bd3fc: 2444037c */ addiu $a0,$v0,0x37c /* f0bd400: 55000006 */ bnezl $t0,.L0f0bd41c @@ -8841,14 +8841,14 @@ glabel var7f1ad6ac /* f0be1f0: 0fc2e2e8 */ jal func0f0b8ba0 /* f0be1f4: 00000000 */ sll $zero,$zero,0x0 /* f0be1f8: 8e6d0284 */ lw $t5,0x284($s3) -/* f0be1fc: 3c01800a */ lui $at,0x800a +/* f0be1fc: 3c01800a */ lui $at,%hi(g_WarpPadId) /* f0be200: 00002025 */ or $a0,$zero,$zero /* f0be204: 95b91c00 */ lhu $t9,0x1c00($t5) /* f0be208: 00002825 */ or $a1,$zero,$zero /* f0be20c: 00003025 */ or $a2,$zero,$zero /* f0be210: 24070001 */ addiu $a3,$zero,0x1 /* f0be214: 0fc32f16 */ jal currentPlayerUpdateFootsteps -/* f0be218: a439dde8 */ sh $t9,-0x2218($at) +/* f0be218: a439dde8 */ sh $t9,%lo(g_WarpPadId)($at) /* f0be21c: 0fc2e72f */ jal func0f0b9cbc /* f0be220: 00000000 */ sll $zero,$zero,0x0 /* f0be224: 100005c3 */ beqz $zero,.L0f0bf934 @@ -9529,10 +9529,10 @@ glabel var7f1ad6ac /* f0bec10: 0fc30610 */ jal func0f0c1840 /* f0bec14: 24670008 */ addiu $a3,$v1,0x8 /* f0bec18: 8e6d0318 */ lw $t5,0x318($s3) -/* f0bec1c: 3c0c800a */ lui $t4,0x800a +/* f0bec1c: 3c0c800a */ lui $t4,%hi(g_MissionConfig+0x3) /* f0bec20: 15a00228 */ bnez $t5,.L0f0bf4c4 /* f0bec24: 00000000 */ sll $zero,$zero,0x0 -/* f0bec28: 818edfeb */ lb $t6,-0x2015($t4) +/* f0bec28: 818edfeb */ lb $t6,%lo(g_MissionConfig+0x3)($t4) /* f0bec2c: 05c10225 */ bgez $t6,.L0f0bf4c4 /* f0bec30: 00000000 */ sll $zero,$zero,0x0 /* f0bec34: 8e620474 */ lw $v0,0x474($s3) @@ -10847,8 +10847,8 @@ glabel var7f1ad6b8 glabel var7f1ad6bc .word 0x40490fdb .text -/* f0bffcc: 3c02800a */ lui $v0,0x800a -/* f0bffd0: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0bffcc: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0bffd0: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0bffd4: 27bdffb8 */ addiu $sp,$sp,-72 /* f0bffd8: afbf0014 */ sw $ra,0x14($sp) /* f0bffdc: afa40048 */ sw $a0,0x48($sp) @@ -10870,8 +10870,8 @@ glabel var7f1ad6bc /* f0c001c: c7ac002c */ lwc1 $f12,0x2c($sp) /* f0c0020: 0fc259d4 */ jal func0f096750 /* f0c0024: 46000386 */ mov.s $f14,$f0 -/* f0c0028: 3c02800a */ lui $v0,0x800a -/* f0c002c: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0c0028: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0c002c: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0c0030: 3c017f1b */ lui $at,%hi(var7f1ad6b0) /* f0c0034: c430d6b0 */ lwc1 $f16,%lo(var7f1ad6b0)($at) /* f0c0038: c44a0154 */ lwc1 $f10,0x154($v0) @@ -10899,14 +10899,14 @@ glabel var7f1ad6bc /* f0c008c: 3c017f1b */ lui $at,%hi(var7f1ad6bc) /* f0c0090: c42ad6bc */ lwc1 $f10,%lo(var7f1ad6bc)($at) /* f0c0094: 46000086 */ mov.s $f2,$f0 -/* f0c0098: 3c0e800a */ lui $t6,0x800a +/* f0c0098: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) /* f0c009c: 4600503e */ c.le.s $f10,$f0 /* f0c00a0: 00000000 */ sll $zero,$zero,0x0 /* f0c00a4: 45000002 */ bc1f .L0f0c00b0 /* f0c00a8: 00000000 */ sll $zero,$zero,0x0 /* f0c00ac: 46100081 */ sub.s $f2,$f0,$f16 .L0f0c00b0: -/* f0c00b0: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0c00b0: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0c00b4: e5c21970 */ swc1 $f2,0x1970($t6) /* f0c00b8: 8fbf0014 */ lw $ra,0x14($sp) /* f0c00bc: 8fa20048 */ lw $v0,0x48($sp) @@ -12021,7 +12021,7 @@ glabel var7f1ad6f8 /* f0c1058: 00002025 */ or $a0,$zero,$zero /* f0c105c: 000bc880 */ sll $t9,$t3,0x2 /* f0c1060: 10400004 */ beqz $v0,.L0f0c1074 -/* f0c1064: 3c0f800b */ lui $t7,0x800b +/* f0c1064: 3c0f800b */ lui $t7,%hi(g_MpSetup+0x88) /* f0c1068: 8c4d0018 */ lw $t5,0x18($v0) /* f0c106c: 35b80400 */ ori $t8,$t5,0x400 /* f0c1070: ac580018 */ sw $t8,0x18($v0) @@ -12038,7 +12038,7 @@ glabel var7f1ad6f8 /* f0c1094: 1445fffc */ bne $v0,$a1,.L0f0c1088 /* f0c1098: 008e2021 */ addu $a0,$a0,$t6 .L0f0c109c: -/* f0c109c: 91efcc10 */ lbu $t7,-0x33f0($t7) +/* f0c109c: 91efcc10 */ lbu $t7,%lo(g_MpSetup+0x88)($t7) /* f0c10a0: 24010005 */ addiu $at,$zero,0x5 /* f0c10a4: 55e10014 */ bnel $t7,$at,.L0f0c10f8 /* f0c10a8: 8e0f0288 */ lw $t7,0x288($s0) @@ -12196,8 +12196,8 @@ glabel var7f1ad6f8 .L0f0c12d8: /* f0c12d8: 0fc50e22 */ jal func0f143888 /* f0c12dc: 8fa400a0 */ lw $a0,0xa0($sp) -/* f0c12e0: 3c03800a */ lui $v1,0x800a -/* f0c12e4: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f0c12e0: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f0c12e4: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f0c12e8: afa200a0 */ sw $v0,0xa0($sp) /* f0c12ec: 8c78192c */ lw $t8,0x192c($v1) .L0f0c12f0: @@ -12389,8 +12389,8 @@ glabel var7f1ad6fc GLOBAL_ASM( glabel func0f0c16f4 -/* f0c16f4: 3c03800a */ lui $v1,0x800a -/* f0c16f8: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f0c16f4: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f0c16f8: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f0c16fc: 24010001 */ addiu $at,$zero,0x1 /* f0c1700: 8c6200fc */ lw $v0,0xfc($v1) /* f0c1704: 50400008 */ beqzl $v0,.L0f0c1728 @@ -12741,8 +12741,8 @@ glabel func0f0c1ba4 GLOBAL_ASM( glabel func0f0c1bd8 -/* f0c1bd8: 3c02800a */ lui $v0,0x800a -/* f0c1bdc: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0c1bd8: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0c1bdc: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0c1be0: 27bdffe0 */ addiu $sp,$sp,-32 /* f0c1be4: afbf001c */ sw $ra,0x1c($sp) /* f0c1be8: 8c430014 */ lw $v1,0x14($v0) @@ -13054,16 +13054,16 @@ void propPlayerGetBbox(struct prop *prop, f32 *width, f32 *ymax, f32 *ymin) GLOBAL_ASM( glabel func0f0c2194 -/* f0c2194: 3c0e800a */ lui $t6,0x800a -/* f0c2198: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0c2194: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0c2198: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0c219c: 03e00008 */ jr $ra /* f0c21a0: c5c000dc */ lwc1 $f0,0xdc($t6) ); GLOBAL_ASM( glabel func0f0c21a4 -/* f0c21a4: 3c0e800a */ lui $t6,0x800a -/* f0c21a8: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0c21a4: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0c21a8: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0c21ac: 27bdffe8 */ addiu $sp,$sp,-24 /* f0c21b0: afbf0014 */ sw $ra,0x14($sp) /* f0c21b4: 8dcf00bc */ lw $t7,0xbc($t6) @@ -13114,8 +13114,8 @@ glabel func0f0c2210 /* f0c224c: 46000306 */ mov.s $f12,$f0 .L0f0c2250: /* f0c2250: 46046182 */ mul.s $f6,$f12,$f4 -/* f0c2254: 3c0e800a */ lui $t6,0x800a -/* f0c2258: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0c2254: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0c2258: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0c225c: 8dcf00bc */ lw $t7,0xbc($t6) /* f0c2260: 44053000 */ mfc1 $a1,$f6 /* f0c2264: 0fc0cfea */ jal chrSetShield @@ -13138,25 +13138,25 @@ glabel func0f0c228c /* f0c2294: 0fc4a25f */ jal propGetPlayerNum /* f0c2298: afa40020 */ sw $a0,0x20($sp) /* f0c229c: 00027080 */ sll $t6,$v0,0x2 -/* f0c22a0: 3c04800a */ lui $a0,%hi(var800a0814) +/* f0c22a0: 3c04800a */ lui $a0,%hi(g_Vars+0x64) /* f0c22a4: 008e2021 */ addu $a0,$a0,$t6 -/* f0c22a8: 8c84a024 */ lw $a0,-0x5fdc($a0) +/* f0c22a8: 8c84a024 */ lw $a0,%lo(g_Vars+0x64)($a0) /* f0c22ac: 0fc2b6ef */ jal func0f0adbbc -/* f0c22b0: 24840814 */ addiu $a0,$a0,%lo(var800a0814) +/* f0c22b0: 24840814 */ addiu $a0,$a0,2068 /* f0c22b4: 0fc4a25f */ jal propGetPlayerNum /* f0c22b8: 8fa40020 */ lw $a0,0x20($sp) /* f0c22bc: 00027880 */ sll $t7,$v0,0x2 -/* f0c22c0: 3c04800a */ lui $a0,%hi(var800a0fb8) +/* f0c22c0: 3c04800a */ lui $a0,%hi(g_Vars+0x64) /* f0c22c4: 008f2021 */ addu $a0,$a0,$t7 -/* f0c22c8: 8c84a024 */ lw $a0,-0x5fdc($a0) +/* f0c22c8: 8c84a024 */ lw $a0,%lo(g_Vars+0x64)($a0) /* f0c22cc: 0fc2b6ef */ jal func0f0adbbc -/* f0c22d0: 24840fb8 */ addiu $a0,$a0,%lo(var800a0fb8) +/* f0c22d0: 24840fb8 */ addiu $a0,$a0,4024 /* f0c22d4: 8fb80020 */ lw $t8,0x20($sp) -/* f0c22d8: 3c19800a */ lui $t9,0x800a +/* f0c22d8: 3c19800a */ lui $t9,%hi(g_Vars+0x314) /* f0c22dc: 8f020004 */ lw $v0,0x4($t8) /* f0c22e0: 5040001c */ beqzl $v0,.L0f0c2354 /* f0c22e4: 8fbf0014 */ lw $ra,0x14($sp) -/* f0c22e8: 8f39a2d4 */ lw $t9,-0x5d2c($t9) +/* f0c22e8: 8f39a2d4 */ lw $t9,%lo(g_Vars+0x314)($t9) /* f0c22ec: 53200019 */ beqzl $t9,.L0f0c2354 /* f0c22f0: 8fbf0014 */ lw $ra,0x14($sp) /* f0c22f4: 8045017c */ lb $a1,0x17c($v0) @@ -13822,9 +13822,9 @@ glabel var7f1ad744 /* f0c2bd0: 0fc4a25f */ jal propGetPlayerNum /* f0c2bd4: e7a20030 */ swc1 $f2,0x30($sp) /* f0c2bd8: 00027080 */ sll $t6,$v0,0x2 -/* f0c2bdc: 3c0f800a */ lui $t7,0x800a +/* f0c2bdc: 3c0f800a */ lui $t7,%hi(g_Vars+0x64) /* f0c2be0: 01ee7821 */ addu $t7,$t7,$t6 -/* f0c2be4: 8defa024 */ lw $t7,-0x5fdc($t7) +/* f0c2be4: 8defa024 */ lw $t7,%lo(g_Vars+0x64)($t7) /* f0c2be8: 24010003 */ addiu $at,$zero,0x3 /* f0c2bec: 8fa3005c */ lw $v1,0x5c($sp) /* f0c2bf0: 8df801b0 */ lw $t8,0x1b0($t7) @@ -14073,9 +14073,9 @@ glabel var7f1ad744 /* f0c2f58: 0fc4a25f */ jal propGetPlayerNum /* f0c2f5c: e7b00020 */ swc1 $f16,0x20($sp) /* f0c2f60: 00024880 */ sll $t1,$v0,0x2 -/* f0c2f64: 3c0a800a */ lui $t2,0x800a +/* f0c2f64: 3c0a800a */ lui $t2,%hi(g_Vars+0x64) /* f0c2f68: 01495021 */ addu $t2,$t2,$t1 -/* f0c2f6c: 8d4aa024 */ lw $t2,-0x5fdc($t2) +/* f0c2f6c: 8d4aa024 */ lw $t2,%lo(g_Vars+0x64)($t2) /* f0c2f70: 3c017f1b */ lui $at,%hi(var7f1ad730) /* f0c2f74: c42ed730 */ lwc1 $f14,%lo(var7f1ad730)($at) /* f0c2f78: 8d4b03ac */ lw $t3,0x3ac($t2) @@ -14313,9 +14313,9 @@ glabel func0f0c32a0 /* f0c32b0: 0fc4a25f */ jal propGetPlayerNum /* f0c32b4: afa60020 */ sw $a2,0x20($sp) /* f0c32b8: 00027080 */ sll $t6,$v0,0x2 -/* f0c32bc: 3c0f800a */ lui $t7,0x800a +/* f0c32bc: 3c0f800a */ lui $t7,%hi(g_Vars+0x64) /* f0c32c0: 01ee7821 */ addu $t7,$t7,$t6 -/* f0c32c4: 8defa024 */ lw $t7,-0x5fdc($t7) +/* f0c32c4: 8defa024 */ lw $t7,%lo(g_Vars+0x64)($t7) /* f0c32c8: 8fa40018 */ lw $a0,0x18($sp) /* f0c32cc: 8fa5001c */ lw $a1,0x1c($sp) /* f0c32d0: 8df819c8 */ lw $t8,0x19c8($t7) @@ -14337,8 +14337,8 @@ glabel func0f0c32fc /* f0c32fc: 3c0e0102 */ lui $t6,0x102 /* f0c3300: 35ce0040 */ ori $t6,$t6,0x40 /* f0c3304: ac8e0000 */ sw $t6,0x0($a0) -/* f0c3308: 3c0f800a */ lui $t7,0x800a -/* f0c330c: 8defa244 */ lw $t7,-0x5dbc($t7) +/* f0c3308: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) +/* f0c330c: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) /* f0c3310: 24820008 */ addiu $v0,$a0,0x8 /* f0c3314: 8df8005c */ lw $t8,0x5c($t7) /* f0c3318: 03e00008 */ jr $ra diff --git a/src/game/game_0d5a90.c b/src/game/game_0d5a90.c index 990f59c38..bc3ac088c 100644 --- a/src/game/game_0d5a90.c +++ b/src/game/game_0d5a90.c @@ -450,8 +450,8 @@ glabel func0f0d5d8c /* f0d5fc0: 00000000 */ sll $zero,$zero,0x0 /* f0d5fc4: 45000015 */ bc1f .L0f0d601c .L0f0d5fc8: -/* f0d5fc8: 3c02800a */ lui $v0,%hi(var800a0004) -/* f0d5fcc: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0d5fc8: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0d5fcc: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0d5fd0: 3c013e80 */ lui $at,0x3e80 /* f0d5fd4: 44816000 */ mtc1 $at,$f12 /* f0d5fd8: c44800f0 */ lwc1 $f8,0xf0($v0) @@ -550,7 +550,7 @@ glabel func0f0d5d8c /* f0d6128: 26310001 */ addiu $s1,$s1,0x1 /* f0d612c: 2a21000c */ slti $at,$s1,0xc /* f0d6130: 1420ffe6 */ bnez $at,.L0f0d60cc -/* f0d6134: 24420004 */ addiu $v0,$v0,%lo(var800a0004) +/* f0d6134: 24420004 */ addiu $v0,$v0,4 /* f0d6138: 8f180f20 */ lw $t8,%lo(var80070f20)($t8) /* f0d613c: 3c017f1b */ lui $at,%hi(var7f1adcc8) /* f0d6140: c424dcc8 */ lwc1 $f4,%lo(var7f1adcc8)($at) diff --git a/src/game/game_0d7070.c b/src/game/game_0d7070.c index f9aa5cf29..c4f0b9fdd 100644 --- a/src/game/game_0d7070.c +++ b/src/game/game_0d7070.c @@ -108,8 +108,8 @@ glabel func0f0d716c /* f0d7170: afbf0014 */ sw $ra,0x14($sp) /* f0d7174: 18a0000b */ blez $a1,.L0f0d71a4 /* f0d7178: 00001025 */ or $v0,$zero,$zero -/* f0d717c: 3c03800a */ lui $v1,%hi(var800a000c) -/* f0d7180: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f0d717c: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f0d7180: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) .L0f0d7184: /* f0d7184: 8c6e1630 */ lw $t6,0x1630($v1) /* f0d7188: 24420001 */ addiu $v0,$v0,0x1 @@ -119,7 +119,7 @@ glabel func0f0d716c /* f0d7198: 00001025 */ or $v0,$zero,$zero .L0f0d719c: /* f0d719c: 1445fff9 */ bne $v0,$a1,.L0f0d7184 -/* f0d71a0: 2463000c */ addiu $v1,$v1,%lo(var800a000c) +/* f0d71a0: 2463000c */ addiu $v1,$v1,12 .L0f0d71a4: /* f0d71a4: 90820000 */ lbu $v0,0x0($a0) /* f0d71a8: 24010003 */ addiu $at,$zero,0x3 @@ -179,7 +179,7 @@ glabel func0f0d7240 /* f0d725c: 90820000 */ lbu $v0,0x0($a0) .L0f0d7260: /* f0d7260: 24010001 */ addiu $at,$zero,0x1 -/* f0d7264: 3c0e800a */ lui $t6,0x800a +/* f0d7264: 3c0e800a */ lui $t6,%hi(g_Vars+0x4b4) /* f0d7268: 10410005 */ beq $v0,$at,.L0f0d7280 /* f0d726c: 24010004 */ addiu $at,$zero,0x4 /* f0d7270: 10410003 */ beq $v0,$at,.L0f0d7280 @@ -187,7 +187,7 @@ glabel func0f0d7240 /* f0d7278: 14410016 */ bne $v0,$at,.L0f0d72d4 /* f0d727c: 24050003 */ addiu $a1,$zero,0x3 .L0f0d7280: -/* f0d7280: 8dcea474 */ lw $t6,-0x5b8c($t6) +/* f0d7280: 8dcea474 */ lw $t6,%lo(g_Vars+0x4b4)($t6) /* f0d7284: 24010026 */ addiu $at,$zero,0x26 /* f0d7288: 00602025 */ or $a0,$v1,$zero /* f0d728c: 15c1000b */ bne $t6,$at,.L0f0d72bc @@ -241,8 +241,8 @@ GLOBAL_ASM( glabel func0f0d7328 /* f0d7328: 1880000b */ blez $a0,.L0f0d7358 /* f0d732c: 00001825 */ or $v1,$zero,$zero -/* f0d7330: 3c02800a */ lui $v0,%hi(var800a000c) -/* f0d7334: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0d7330: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0d7334: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) .L0f0d7338: /* f0d7338: 8c4e1630 */ lw $t6,0x1630($v0) /* f0d733c: 55c00004 */ bnezl $t6,.L0f0d7350 @@ -252,7 +252,7 @@ glabel func0f0d7328 /* f0d734c: 24630001 */ addiu $v1,$v1,0x1 .L0f0d7350: /* f0d7350: 1464fff9 */ bne $v1,$a0,.L0f0d7338 -/* f0d7354: 2442000c */ addiu $v0,$v0,%lo(var800a000c) +/* f0d7354: 2442000c */ addiu $v0,$v0,12 .L0f0d7358: /* f0d7358: 2402ffff */ addiu $v0,$zero,-1 /* f0d735c: 03e00008 */ jr $ra @@ -516,9 +516,9 @@ glabel var7f1adddc /* f0d7698: 8e060284 */ lw $a2,0x284($s0) /* f0d769c: acc01630 */ sw $zero,0x1630($a2) .L0f0d76a0: -/* f0d76a0: 3c06800a */ lui $a2,0x800a +/* f0d76a0: 3c06800a */ lui $a2,%hi(g_Vars+0x284) /* f0d76a4: 10000076 */ beqz $zero,.L0f0d7880 -/* f0d76a8: 8cc6a244 */ lw $a2,-0x5dbc($a2) +/* f0d76a8: 8cc6a244 */ lw $a2,%lo(g_Vars+0x284)($a2) /* f0d76ac: 8fb90070 */ lw $t9,0x70($sp) /* f0d76b0: 13200036 */ beqz $t9,.L0f0d778c /* f0d76b4: 00000000 */ sll $zero,$zero,0x0 @@ -576,9 +576,9 @@ glabel var7f1adddc /* f0d7784: 016c6821 */ addu $t5,$t3,$t4 /* f0d7788: a5a01b90 */ sh $zero,0x1b90($t5) .L0f0d778c: -/* f0d778c: 3c06800a */ lui $a2,0x800a +/* f0d778c: 3c06800a */ lui $a2,%hi(g_Vars+0x284) /* f0d7790: 1000003b */ beqz $zero,.L0f0d7880 -/* f0d7794: 8cc6a244 */ lw $a2,-0x5dbc($a2) +/* f0d7794: 8cc6a244 */ lw $a2,%lo(g_Vars+0x284)($a2) /* f0d7798: 8fae0070 */ lw $t6,0x70($sp) /* f0d779c: 11c00036 */ beqz $t6,.L0f0d7878 /* f0d77a0: 00000000 */ sll $zero,$zero,0x0 @@ -636,8 +636,8 @@ glabel var7f1adddc /* f0d7870: 01f8c821 */ addu $t9,$t7,$t8 /* f0d7874: a7201b90 */ sh $zero,0x1b90($t9) .L0f0d7878: -/* f0d7878: 3c06800a */ lui $a2,0x800a -/* f0d787c: 8cc6a244 */ lw $a2,-0x5dbc($a2) +/* f0d7878: 3c06800a */ lui $a2,%hi(g_Vars+0x284) +/* f0d787c: 8cc6a244 */ lw $a2,%lo(g_Vars+0x284)($a2) .L0f0d7880: /* f0d7880: 8fab0070 */ lw $t3,0x70($sp) .L0f0d7884: @@ -1680,8 +1680,8 @@ glabel var7f1adde8 .word 0xbd4ccccd .text /* f0d87a8: 27bdff30 */ addiu $sp,$sp,-208 -/* f0d87ac: 3c03800a */ lui $v1,0x800a -/* f0d87b0: 8c639ff8 */ lw $v1,-0x6008($v1) +/* f0d87ac: 3c03800a */ lui $v1,%hi(g_Vars+0x38) +/* f0d87b0: 8c639ff8 */ lw $v1,%lo(g_Vars+0x38)($v1) /* f0d87b4: afb00048 */ sw $s0,0x48($sp) /* f0d87b8: 00808025 */ or $s0,$a0,$zero /* f0d87bc: afbf004c */ sw $ra,0x4c($sp) @@ -2258,8 +2258,8 @@ glabel var7f1ade50 .word func0f0d8f78+0x4d0 # f0d9448 .text /* f0d8f78: 27bdff68 */ addiu $sp,$sp,-152 -/* f0d8f7c: 3c08800a */ lui $t0,0x800a -/* f0d8f80: 8d08a244 */ lw $t0,-0x5dbc($t0) +/* f0d8f7c: 3c08800a */ lui $t0,%hi(g_Vars+0x284) +/* f0d8f80: 8d08a244 */ lw $t0,%lo(g_Vars+0x284)($t0) /* f0d8f84: afbf0044 */ sw $ra,0x44($sp) /* f0d8f88: afb30040 */ sw $s3,0x40($sp) /* f0d8f8c: afb2003c */ sw $s2,0x3c($sp) @@ -2453,8 +2453,8 @@ glabel var7f1ade50 /* f0d9248: afa30010 */ sw $v1,0x10($sp) /* f0d924c: 0fc35fd5 */ jal func0f0d7f54 /* f0d9250: afb00014 */ sw $s0,0x14($sp) -/* f0d9254: 3c08800a */ lui $t0,0x800a -/* f0d9258: 8d08a244 */ lw $t0,-0x5dbc($t0) +/* f0d9254: 3c08800a */ lui $t0,%hi(g_Vars+0x284) +/* f0d9258: 8d08a244 */ lw $t0,%lo(g_Vars+0x284)($t0) /* f0d925c: 00409825 */ or $s3,$v0,$zero /* f0d9260: 00402025 */ or $a0,$v0,$zero /* f0d9264: 8d191624 */ lw $t9,0x1624($t0) @@ -2666,8 +2666,8 @@ glabel var7f1ade50 GLOBAL_ASM( glabel func0f0d9544 /* f0d9544: 27bdff30 */ addiu $sp,$sp,-208 -/* f0d9548: 3c02800a */ lui $v0,0x800a -/* f0d954c: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0d9548: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0d954c: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0d9550: afbf0044 */ sw $ra,0x44($sp) /* f0d9554: afb00040 */ sw $s0,0x40($sp) /* f0d9558: afa400d0 */ sw $a0,0xd0($sp) @@ -3141,8 +3141,8 @@ glabel func0f0d9ba0 /* f0d9c40: 00000000 */ sll $zero,$zero,0x0 /* f0d9c44: 3c0e8008 */ lui $t6,%hi(var8007fac0) /* f0d9c48: 8dcefac0 */ lw $t6,%lo(var8007fac0)($t6) -/* f0d9c4c: 3c03800a */ lui $v1,0x800a -/* f0d9c50: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f0d9c4c: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f0d9c50: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f0d9c54: 448e3000 */ mtc1 $t6,$f6 /* f0d9c58: 8fb90088 */ lw $t9,0x88($sp) /* f0d9c5c: c4641660 */ lwc1 $f4,0x1660($v1) @@ -3222,8 +3222,8 @@ glabel func0f0d9ba0 /* f0d9d78: 00e02825 */ or $a1,$a3,$zero /* f0d9d7c: 1180000d */ beqz $t4,.L0f0d9db4 /* f0d9d80: afb8005c */ sw $t8,0x5c($sp) -/* f0d9d84: 3c19800a */ lui $t9,0x800a -/* f0d9d88: 8f39a244 */ lw $t9,-0x5dbc($t9) +/* f0d9d84: 3c19800a */ lui $t9,%hi(g_Vars+0x284) +/* f0d9d88: 8f39a244 */ lw $t9,%lo(g_Vars+0x284)($t9) /* f0d9d8c: 8f2219a8 */ lw $v0,0x19a8($t9) /* f0d9d90: 28410030 */ slti $at,$v0,0x30 /* f0d9d94: 10200007 */ beqz $at,.L0f0d9db4 @@ -3236,7 +3236,7 @@ glabel func0f0d9ba0 /* f0d9db0: e7b00048 */ swc1 $f16,0x48($sp) .L0f0d9db4: /* f0d9db4: 1580001f */ bnez $t4,.L0f0d9e34 -/* f0d9db8: 3c0e800a */ lui $t6,0x800a +/* f0d9db8: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) /* f0d9dbc: 8fae008c */ lw $t6,0x8c($sp) /* f0d9dc0: 3c1fff55 */ lui $ra,0xff55 /* f0d9dc4: 37ff5564 */ ori $ra,$ra,0x5564 @@ -3272,7 +3272,7 @@ glabel func0f0d9ba0 /* f0d9e2c: 10000021 */ beqz $zero,.L0f0d9eb4 /* f0d9e30: 032a3021 */ addu $a2,$t9,$t2 .L0f0d9e34: -/* f0d9e34: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0d9e34: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0d9e38: 8fa60060 */ lw $a2,0x60($sp) /* f0d9e3c: 8fb80060 */ lw $t8,0x60($sp) /* f0d9e40: 8dcf19a8 */ lw $t7,0x19a8($t6) @@ -3336,8 +3336,8 @@ glabel func0f0d9ba0 /* f0d9f18: 10000020 */ beqz $zero,.L0f0d9f9c /* f0d9f1c: 01aa3023 */ subu $a2,$t5,$t2 .L0f0d9f20: -/* f0d9f20: 3c0f800a */ lui $t7,0x800a -/* f0d9f24: 8defa244 */ lw $t7,-0x5dbc($t7) +/* f0d9f20: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) +/* f0d9f24: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) /* f0d9f28: 8fa60060 */ lw $a2,0x60($sp) /* f0d9f2c: 8fb90060 */ lw $t9,0x60($sp) /* f0d9f30: 8df819a8 */ lw $t8,0x19a8($t7) @@ -3419,8 +3419,8 @@ glabel func0f0d9ba0 /* f0da048: 10000026 */ beqz $zero,.L0f0da0e4 /* f0da04c: 00602825 */ or $a1,$v1,$zero .L0f0da050: -/* f0da050: 3c18800a */ lui $t8,0x800a -/* f0da054: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f0da050: 3c18800a */ lui $t8,%hi(g_Vars+0x284) +/* f0da054: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f0da058: 8fa5006c */ lw $a1,0x6c($sp) /* f0da05c: 24080002 */ addiu $t0,$zero,0x2 /* f0da060: 8f1919a8 */ lw $t9,0x19a8($t8) @@ -3491,8 +3491,8 @@ glabel func0f0d9ba0 /* f0da14c: 10000026 */ beqz $zero,.L0f0da1e8 /* f0da150: 00602825 */ or $a1,$v1,$zero .L0f0da154: -/* f0da154: 3c0e800a */ lui $t6,0x800a -/* f0da158: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f0da154: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f0da158: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0da15c: 8fa5006c */ lw $a1,0x6c($sp) /* f0da160: 24080003 */ addiu $t0,$zero,0x3 /* f0da164: 8dcf19a8 */ lw $t7,0x19a8($t6) @@ -3541,8 +3541,8 @@ glabel func0f0d9ba0 /* f0da200: 37ff5564 */ ori $ra,$ra,0x5564 /* f0da204: 11800007 */ beqz $t4,.L0f0da224 /* f0da208: 00402025 */ or $a0,$v0,$zero -/* f0da20c: 3c0f800a */ lui $t7,0x800a -/* f0da210: 8defa244 */ lw $t7,-0x5dbc($t7) +/* f0da20c: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) +/* f0da210: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) /* f0da214: 8df819a8 */ lw $t8,0x19a8($t7) /* f0da218: 2b010030 */ slti $at,$t8,0x30 /* f0da21c: 10200029 */ beqz $at,.L0f0da2c4 @@ -3682,8 +3682,8 @@ glabel var7f1ade54 /* f0da3f0: 8fa60100 */ lw $a2,0x100($sp) /* f0da3f4: 1080000a */ beqz $a0,.L0f0da420 /* f0da3f8: 8fad00b4 */ lw $t5,0xb4($sp) -/* f0da3fc: 3c0e800a */ lui $t6,0x800a -/* f0da400: 8dcea248 */ lw $t6,-0x5db8($t6) +/* f0da3fc: 3c0e800a */ lui $t6,%hi(g_Vars+0x288) +/* f0da400: 8dcea248 */ lw $t6,%lo(g_Vars+0x288)($t6) /* f0da404: 8dc40070 */ lw $a0,0x70($t6) /* f0da408: afad00b4 */ sw $t5,0xb4($sp) /* f0da40c: 0fc54a04 */ jal optionsGetSightOnScreen @@ -3697,8 +3697,8 @@ glabel var7f1ade54 /* f0da428: 0fc2c536 */ jal func0f0b14d8 /* f0da42c: afad00b4 */ sw $t5,0xb4($sp) /* f0da430: 44803000 */ mtc1 $zero,$f6 -/* f0da434: 3c0f800a */ lui $t7,0x800a -/* f0da438: 8defa244 */ lw $t7,-0x5dbc($t7) +/* f0da434: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) +/* f0da438: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) /* f0da43c: 46060032 */ c.eq.s $f0,$f6 /* f0da440: 93a200af */ lbu $v0,0xaf($sp) /* f0da444: 8fa60100 */ lw $a2,0x100($sp) @@ -5753,8 +5753,8 @@ glabel func0f0dc170 /* f0dc20c: 0c002f26 */ jal func0000bc98 /* f0dc210: 00000000 */ sll $zero,$zero,0x0 /* f0dc214: 8fae00a8 */ lw $t6,0xa8($sp) -/* f0dc218: 3c03800a */ lui $v1,0x800a -/* f0dc21c: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f0dc218: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f0dc21c: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f0dc220: 01c27821 */ addu $t7,$t6,$v0 /* f0dc224: 25f8ffff */ addiu $t8,$t7,-1 /* f0dc228: afa200a0 */ sw $v0,0xa0($sp) @@ -6071,8 +6071,8 @@ glabel func0f0dc170 GLOBAL_ASM( glabel func0f0dc6e4 -/* f0dc6e4: 3c02800a */ lui $v0,0x800a -/* f0dc6e8: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0dc6e4: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f0dc6e8: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0dc6ec: 27bdffd8 */ addiu $sp,$sp,-40 /* f0dc6f0: afbf001c */ sw $ra,0x1c($sp) /* f0dc6f4: afb00018 */ sw $s0,0x18($sp) @@ -6407,11 +6407,11 @@ glabel var7f1ade74 /* f0dcb7c: 01400008 */ jr $t2 /* f0dcb80: 00000000 */ sll $zero,$zero,0x0 /* f0dcb84: 8fa30034 */ lw $v1,0x34($sp) -/* f0dcb88: 3c0c800a */ lui $t4,0x800a +/* f0dcb88: 3c0c800a */ lui $t4,%hi(g_Vars+0x288) /* f0dcb8c: 0003282b */ sltu $a1,$zero,$v1 /* f0dcb90: 10a00005 */ beqz $a1,.L0f0dcba8 /* f0dcb94: 00000000 */ sll $zero,$zero,0x0 -/* f0dcb98: 8d8ca248 */ lw $t4,-0x5db8($t4) +/* f0dcb98: 8d8ca248 */ lw $t4,%lo(g_Vars+0x288)($t4) /* f0dcb9c: 0fc54a04 */ jal optionsGetSightOnScreen /* f0dcba0: 8d840070 */ lw $a0,0x70($t4) /* f0dcba4: 0002282b */ sltu $a1,$zero,$v0 @@ -6421,11 +6421,11 @@ glabel var7f1ade74 /* f0dcbb0: 10000058 */ beqz $zero,.L0f0dcd14 /* f0dcbb4: afa20030 */ sw $v0,0x30($sp) /* f0dcbb8: 8fa30034 */ lw $v1,0x34($sp) -/* f0dcbbc: 3c0e800a */ lui $t6,0x800a +/* f0dcbbc: 3c0e800a */ lui $t6,%hi(g_Vars+0x288) /* f0dcbc0: 0003282b */ sltu $a1,$zero,$v1 /* f0dcbc4: 10a00005 */ beqz $a1,.L0f0dcbdc /* f0dcbc8: 00000000 */ sll $zero,$zero,0x0 -/* f0dcbcc: 8dcea248 */ lw $t6,-0x5db8($t6) +/* f0dcbcc: 8dcea248 */ lw $t6,%lo(g_Vars+0x288)($t6) /* f0dcbd0: 0fc54a04 */ jal optionsGetSightOnScreen /* f0dcbd4: 8dc40070 */ lw $a0,0x70($t6) /* f0dcbd8: 0002282b */ sltu $a1,$zero,$v0 @@ -6435,11 +6435,11 @@ glabel var7f1ade74 /* f0dcbe4: 1000004b */ beqz $zero,.L0f0dcd14 /* f0dcbe8: afa20030 */ sw $v0,0x30($sp) /* f0dcbec: 8fa30034 */ lw $v1,0x34($sp) -/* f0dcbf0: 3c18800a */ lui $t8,0x800a +/* f0dcbf0: 3c18800a */ lui $t8,%hi(g_Vars+0x288) /* f0dcbf4: 0003282b */ sltu $a1,$zero,$v1 /* f0dcbf8: 10a00005 */ beqz $a1,.L0f0dcc10 /* f0dcbfc: 00000000 */ sll $zero,$zero,0x0 -/* f0dcc00: 8f18a248 */ lw $t8,-0x5db8($t8) +/* f0dcc00: 8f18a248 */ lw $t8,%lo(g_Vars+0x288)($t8) /* f0dcc04: 0fc54a04 */ jal optionsGetSightOnScreen /* f0dcc08: 8f040070 */ lw $a0,0x70($t8) /* f0dcc0c: 0002282b */ sltu $a1,$zero,$v0 @@ -6449,11 +6449,11 @@ glabel var7f1ade74 /* f0dcc18: 1000003e */ beqz $zero,.L0f0dcd14 /* f0dcc1c: afa20030 */ sw $v0,0x30($sp) /* f0dcc20: 8fa30034 */ lw $v1,0x34($sp) -/* f0dcc24: 3c09800a */ lui $t1,0x800a +/* f0dcc24: 3c09800a */ lui $t1,%hi(g_Vars+0x288) /* f0dcc28: 0003282b */ sltu $a1,$zero,$v1 /* f0dcc2c: 10a00005 */ beqz $a1,.L0f0dcc44 /* f0dcc30: 00000000 */ sll $zero,$zero,0x0 -/* f0dcc34: 8d29a248 */ lw $t1,-0x5db8($t1) +/* f0dcc34: 8d29a248 */ lw $t1,%lo(g_Vars+0x288)($t1) /* f0dcc38: 0fc54a04 */ jal optionsGetSightOnScreen /* f0dcc3c: 8d240070 */ lw $a0,0x70($t1) /* f0dcc40: 0002282b */ sltu $a1,$zero,$v0 @@ -6463,11 +6463,11 @@ glabel var7f1ade74 /* f0dcc4c: 10000031 */ beqz $zero,.L0f0dcd14 /* f0dcc50: afa20030 */ sw $v0,0x30($sp) /* f0dcc54: 8fa30034 */ lw $v1,0x34($sp) -/* f0dcc58: 3c0b800a */ lui $t3,0x800a +/* f0dcc58: 3c0b800a */ lui $t3,%hi(g_Vars+0x288) /* f0dcc5c: 0003282b */ sltu $a1,$zero,$v1 /* f0dcc60: 10a00005 */ beqz $a1,.L0f0dcc78 /* f0dcc64: 00000000 */ sll $zero,$zero,0x0 -/* f0dcc68: 8d6ba248 */ lw $t3,-0x5db8($t3) +/* f0dcc68: 8d6ba248 */ lw $t3,%lo(g_Vars+0x288)($t3) /* f0dcc6c: 0fc54a04 */ jal optionsGetSightOnScreen /* f0dcc70: 8d640070 */ lw $a0,0x70($t3) /* f0dcc74: 0002282b */ sltu $a1,$zero,$v0 @@ -6477,11 +6477,11 @@ glabel var7f1ade74 /* f0dcc80: 10000024 */ beqz $zero,.L0f0dcd14 /* f0dcc84: afa20030 */ sw $v0,0x30($sp) /* f0dcc88: 8fa30034 */ lw $v1,0x34($sp) -/* f0dcc8c: 3c0d800a */ lui $t5,0x800a +/* f0dcc8c: 3c0d800a */ lui $t5,%hi(g_Vars+0x288) /* f0dcc90: 0003282b */ sltu $a1,$zero,$v1 /* f0dcc94: 10a00005 */ beqz $a1,.L0f0dccac /* f0dcc98: 00000000 */ sll $zero,$zero,0x0 -/* f0dcc9c: 8dada248 */ lw $t5,-0x5db8($t5) +/* f0dcc9c: 8dada248 */ lw $t5,%lo(g_Vars+0x288)($t5) /* f0dcca0: 0fc54a04 */ jal optionsGetSightOnScreen /* f0dcca4: 8da40070 */ lw $a0,0x70($t5) /* f0dcca8: 0002282b */ sltu $a1,$zero,$v0 @@ -6491,11 +6491,11 @@ glabel var7f1ade74 /* f0dccb4: 10000017 */ beqz $zero,.L0f0dcd14 /* f0dccb8: afa20030 */ sw $v0,0x30($sp) /* f0dccbc: 8fa30034 */ lw $v1,0x34($sp) -/* f0dccc0: 3c0f800a */ lui $t7,0x800a +/* f0dccc0: 3c0f800a */ lui $t7,%hi(g_Vars+0x288) /* f0dccc4: 0003282b */ sltu $a1,$zero,$v1 /* f0dccc8: 10a00005 */ beqz $a1,.L0f0dcce0 /* f0dcccc: 00000000 */ sll $zero,$zero,0x0 -/* f0dccd0: 8defa248 */ lw $t7,-0x5db8($t7) +/* f0dccd0: 8defa248 */ lw $t7,%lo(g_Vars+0x288)($t7) /* f0dccd4: 0fc54a04 */ jal optionsGetSightOnScreen /* f0dccd8: 8de40070 */ lw $a0,0x70($t7) /* f0dccdc: 0002282b */ sltu $a1,$zero,$v0 @@ -6506,8 +6506,8 @@ glabel var7f1ade74 /* f0dccec: afa20030 */ sw $v0,0x30($sp) .L0f0dccf0: /* f0dccf0: 10a00005 */ beqz $a1,.L0f0dcd08 -/* f0dccf4: 3c19800a */ lui $t9,0x800a -/* f0dccf8: 8f39a248 */ lw $t9,-0x5db8($t9) +/* f0dccf4: 3c19800a */ lui $t9,%hi(g_Vars+0x288) +/* f0dccf8: 8f39a248 */ lw $t9,%lo(g_Vars+0x288)($t9) /* f0dccfc: 0fc54a04 */ jal optionsGetSightOnScreen /* f0dcd00: 8f240070 */ lw $a0,0x70($t9) /* f0dcd04: 0002282b */ sltu $a1,$zero,$v0 @@ -6518,15 +6518,15 @@ glabel var7f1ade74 .L0f0dcd14: /* f0dcd14: 8fa90038 */ lw $t1,0x38($sp) /* f0dcd18: 24010007 */ addiu $at,$zero,0x7 -/* f0dcd1c: 3c0a800a */ lui $t2,0x800a +/* f0dcd1c: 3c0a800a */ lui $t2,%hi(g_Vars+0x288) /* f0dcd20: 5121001b */ beql $t1,$at,.L0f0dcd90 /* f0dcd24: 240d0001 */ addiu $t5,$zero,0x1 -/* f0dcd28: 8d4aa248 */ lw $t2,-0x5db8($t2) +/* f0dcd28: 8d4aa248 */ lw $t2,%lo(g_Vars+0x288)($t2) /* f0dcd2c: 0fc54a04 */ jal optionsGetSightOnScreen /* f0dcd30: 8d440070 */ lw $a0,0x70($t2) /* f0dcd34: 10400015 */ beqz $v0,.L0f0dcd8c -/* f0dcd38: 3c0b800a */ lui $t3,0x800a -/* f0dcd3c: 8d6ba248 */ lw $t3,-0x5db8($t3) +/* f0dcd38: 3c0b800a */ lui $t3,%hi(g_Vars+0x288) +/* f0dcd3c: 8d6ba248 */ lw $t3,%lo(g_Vars+0x288)($t3) /* f0dcd40: 8fa30034 */ lw $v1,0x34($sp) /* f0dcd44: 8d640070 */ lw $a0,0x70($t3) /* f0dcd48: 0003602b */ sltu $t4,$zero,$v1 diff --git a/src/game/game_0dcdb0.c b/src/game/game_0dcdb0.c index d172a4634..ccdc30821 100644 --- a/src/game/game_0dcdb0.c +++ b/src/game/game_0dcdb0.c @@ -1171,8 +1171,8 @@ glabel func0f0ddd44 GLOBAL_ASM( glabel func0f0ddda0 -/* f0ddda0: 3c0e800a */ lui $t6,0x800a -/* f0ddda4: 8dcea2d4 */ lw $t6,-0x5d2c($t6) +/* f0ddda0: 3c0e800a */ lui $t6,%hi(g_Vars+0x314) +/* f0ddda4: 8dcea2d4 */ lw $t6,%lo(g_Vars+0x314)($t6) /* f0ddda8: 27bdffe8 */ addiu $sp,$sp,-24 /* f0dddac: afbf0014 */ sw $ra,0x14($sp) /* f0dddb0: 11c00006 */ beqz $t6,.L0f0dddcc @@ -1219,8 +1219,8 @@ glabel func0f0ddda0 /* f0dde48: 8c8b0000 */ lw $t3,0x0($a0) .L0f0dde4c: /* f0dde4c: 8fbf0014 */ lw $ra,0x14($sp) -/* f0dde50: 3c01800a */ lui $at,0x800a -/* f0dde54: ac20dea0 */ sw $zero,-0x2160($at) +/* f0dde50: 3c01800a */ lui $at,%hi(var8009dea0) +/* f0dde54: ac20dea0 */ sw $zero,%lo(var8009dea0)($at) /* f0dde58: 03e00008 */ jr $ra /* f0dde5c: 27bd0018 */ addiu $sp,$sp,0x18 ); @@ -1471,8 +1471,8 @@ glabel func0f0de160 /* f0de1ac: 24130006 */ addiu $s3,$zero,0x6 /* f0de1b0: 00409025 */ or $s2,$v0,$zero /* f0de1b4: 15d3000e */ bne $t6,$s3,.L0f0de1f0 -/* f0de1b8: 3c0f800a */ lui $t7,0x800a -/* f0de1bc: 8defa26c */ lw $t7,-0x5d94($t7) +/* f0de1b8: 3c0f800a */ lui $t7,%hi(g_Vars+0x2ac) +/* f0de1bc: 8defa26c */ lw $t7,%lo(g_Vars+0x2ac)($t7) /* f0de1c0: 166f0007 */ bne $s3,$t7,.L0f0de1e0 /* f0de1c4: 00000000 */ sll $zero,$zero,0x0 /* f0de1c8: 0fc54a46 */ jal optionsGetCutsceneSubtitles @@ -1496,9 +1496,9 @@ glabel func0f0de160 /* f0de208: 8f390fb4 */ lw $t9,%lo(var80070fb4)($t9) /* f0de20c: 25ef0ff0 */ addiu $t7,$t7,%lo(var80070ff0) /* f0de210: 01cf8021 */ addu $s0,$t6,$t7 -/* f0de214: 3c0e800a */ lui $t6,0x800a +/* f0de214: 3c0e800a */ lui $t6,%hi(g_Vars+0x2ac) /* f0de218: ae19000c */ sw $t9,0xc($s0) -/* f0de21c: 8dcea26c */ lw $t6,-0x5d94($t6) +/* f0de21c: 8dcea26c */ lw $t6,%lo(g_Vars+0x2ac)($t6) /* f0de220: 566e0136 */ bnel $s3,$t6,.L0f0de6fc /* f0de224: 920f0002 */ lbu $t7,0x2($s0) /* f0de228: 06400133 */ bltz $s2,.L0f0de6f8 @@ -2062,8 +2062,8 @@ glabel var7f1adec0 /* f0de9cc: 91ce0af0 */ lbu $t6,%lo(g_Is4Mb)($t6) /* f0de9d0: 17ee0006 */ bne $ra,$t6,.L0f0de9ec .L0f0de9d4: -/* f0de9d4: 3c18800a */ lui $t8,0x800a -/* f0de9d8: 8f18a24c */ lw $t8,-0x5db4($t8) +/* f0de9d4: 3c18800a */ lui $t8,%hi(g_Vars+0x28c) +/* f0de9d8: 8f18a24c */ lw $t8,%lo(g_Vars+0x28c)($t8) /* f0de9dc: 01645823 */ subu $t3,$t3,$a0 /* f0de9e0: 57000003 */ bnezl $t8,.L0f0de9f0 /* f0de9e4: 8fa30038 */ lw $v1,0x38($sp) @@ -2076,7 +2076,7 @@ glabel var7f1adec0 /* f0de9f8: 1040000a */ beqz $v0,.L0f0dea24 /* f0de9fc: 00000000 */ sll $zero,$zero,0x0 /* f0dea00: 105f000a */ beq $v0,$ra,.L0f0dea2c -/* f0dea04: 3c08800a */ lui $t0,0x800a +/* f0dea04: 3c08800a */ lui $t0,%hi(g_Vars+0x6c) /* f0dea08: 24010002 */ addiu $at,$zero,0x2 /* f0dea0c: 10410085 */ beq $v0,$at,.L0f0dec24 /* f0dea10: 24010003 */ addiu $at,$zero,0x3 @@ -2090,14 +2090,14 @@ glabel var7f1adec0 .L0f0dea2c: /* f0dea2c: 3c198007 */ lui $t9,%hi(var80070764) /* f0dea30: 8f390764 */ lw $t9,%lo(var80070764)($t9) -/* f0dea34: 3c07800a */ lui $a3,0x800a -/* f0dea38: 3c0a800a */ lui $t2,0x800a -/* f0dea3c: 3c0d800a */ lui $t5,0x800a -/* f0dea40: 8dada030 */ lw $t5,-0x5fd0($t5) -/* f0dea44: 8d4aa024 */ lw $t2,-0x5fdc($t2) -/* f0dea48: 8ce7a028 */ lw $a3,-0x5fd8($a3) +/* f0dea34: 3c07800a */ lui $a3,%hi(g_Vars+0x68) +/* f0dea38: 3c0a800a */ lui $t2,%hi(g_Vars+0x64) +/* f0dea3c: 3c0d800a */ lui $t5,%hi(g_Vars+0x70) +/* f0dea40: 8dada030 */ lw $t5,%lo(g_Vars+0x70)($t5) +/* f0dea44: 8d4aa024 */ lw $t2,%lo(g_Vars+0x64)($t2) +/* f0dea48: 8ce7a028 */ lw $a3,%lo(g_Vars+0x68)($a3) /* f0dea4c: 13200007 */ beqz $t9,.L0f0dea6c -/* f0dea50: 8d08a02c */ lw $t0,-0x5fd4($t0) +/* f0dea50: 8d08a02c */ lw $t0,%lo(g_Vars+0x6c)($t0) /* f0dea54: 3c0f8006 */ lui $t7,%hi(var8005d9d0) /* f0dea58: 8defd9d0 */ lw $t7,%lo(var8005d9d0)($t7) /* f0dea5c: 55e00004 */ bnezl $t7,.L0f0dea70 @@ -2184,15 +2184,15 @@ glabel var7f1adec0 /* f0deb70: 1000002a */ beqz $zero,.L0f0dec1c /* f0deb74: 25290004 */ addiu $t1,$t1,0x4 .L0f0deb78: -/* f0deb78: 3c0f800a */ lui $t7,0x800a -/* f0deb7c: 8defa02c */ lw $t7,-0x5fd4($t7) -/* f0deb80: 3c07800a */ lui $a3,0x800a -/* f0deb84: 3c0a800a */ lui $t2,0x800a -/* f0deb88: 3c0d800a */ lui $t5,0x800a -/* f0deb8c: 8dada030 */ lw $t5,-0x5fd0($t5) -/* f0deb90: 8d4aa024 */ lw $t2,-0x5fdc($t2) +/* f0deb78: 3c0f800a */ lui $t7,%hi(g_Vars+0x6c) +/* f0deb7c: 8defa02c */ lw $t7,%lo(g_Vars+0x6c)($t7) +/* f0deb80: 3c07800a */ lui $a3,%hi(g_Vars+0x68) +/* f0deb84: 3c0a800a */ lui $t2,%hi(g_Vars+0x64) +/* f0deb88: 3c0d800a */ lui $t5,%hi(g_Vars+0x70) +/* f0deb8c: 8dada030 */ lw $t5,%lo(g_Vars+0x70)($t5) +/* f0deb90: 8d4aa024 */ lw $t2,%lo(g_Vars+0x64)($t2) /* f0deb94: 11e00003 */ beqz $t7,.L0f0deba4 -/* f0deb98: 8ce7a028 */ lw $a3,-0x5fd8($a3) +/* f0deb98: 8ce7a028 */ lw $a3,%lo(g_Vars+0x68)($a3) /* f0deb9c: 10000002 */ beqz $zero,.L0f0deba8 /* f0deba0: 03e03025 */ or $a2,$ra,$zero .L0f0deba4: @@ -2273,20 +2273,20 @@ glabel var7f1adec0 /* f0deca8: 8faf0028 */ lw $t7,0x28($sp) /* f0decac: 8fae0020 */ lw $t6,0x20($sp) /* f0decb0: 9479001e */ lhu $t9,0x1e($v1) -/* f0decb4: 3c08800a */ lui $t0,0x800a +/* f0decb4: 3c08800a */ lui $t0,%hi(g_Vars+0x6c) /* f0decb8: 01eec021 */ addu $t8,$t7,$t6 /* f0decbc: 8c6e01d4 */ lw $t6,0x1d4($v1) -/* f0decc0: 8d08a02c */ lw $t0,-0x5fd4($t0) +/* f0decc0: 8d08a02c */ lw $t0,%lo(g_Vars+0x6c)($t0) /* f0decc4: 03197823 */ subu $t7,$t8,$t9 -/* f0decc8: 3c07800a */ lui $a3,0x800a -/* f0deccc: 3c0a800a */ lui $t2,0x800a -/* f0decd0: 3c0d800a */ lui $t5,0x800a +/* f0decc8: 3c07800a */ lui $a3,%hi(g_Vars+0x68) +/* f0deccc: 3c0a800a */ lui $t2,%hi(g_Vars+0x64) +/* f0decd0: 3c0d800a */ lui $t5,%hi(g_Vars+0x70) /* f0decd4: 01ee2023 */ subu $a0,$t7,$t6 /* f0decd8: 2484fff2 */ addiu $a0,$a0,-14 -/* f0decdc: 8dada030 */ lw $t5,-0x5fd0($t5) -/* f0dece0: 8d4aa024 */ lw $t2,-0x5fdc($t2) +/* f0decdc: 8dada030 */ lw $t5,%lo(g_Vars+0x70)($t5) +/* f0dece0: 8d4aa024 */ lw $t2,%lo(g_Vars+0x64)($t2) /* f0dece4: 11000003 */ beqz $t0,.L0f0decf4 -/* f0dece8: 8ce7a028 */ lw $a3,-0x5fd8($a3) +/* f0dece8: 8ce7a028 */ lw $a3,%lo(g_Vars+0x68)($a3) /* f0decec: 10000002 */ beqz $zero,.L0f0decf8 /* f0decf0: 03e03025 */ or $a2,$ra,$zero .L0f0decf4: @@ -2675,10 +2675,10 @@ glabel func0f0deebc /* f0df230: a22001af */ sb $zero,0x1af($s1) .L0f0df234: /* f0df234: 8fae0230 */ lw $t6,0x230($sp) -/* f0df238: 3c18800a */ lui $t8,0x800a +/* f0df238: 3c18800a */ lui $t8,%hi(g_Vars+0x28c) /* f0df23c: 3c02800a */ lui $v0,%hi(var8009dea0) /* f0df240: ae2e01c4 */ sw $t6,0x1c4($s1) -/* f0df244: 8f18a24c */ lw $t8,-0x5db4($t8) +/* f0df244: 8f18a24c */ lw $t8,%lo(g_Vars+0x28c)($t8) /* f0df248: 2442dea0 */ addiu $v0,$v0,%lo(var8009dea0) /* f0df24c: 240c0001 */ addiu $t4,$zero,0x1 /* f0df250: ae3801c0 */ sw $t8,0x1c0($s1) @@ -3338,14 +3338,14 @@ glabel var7f1adef4 .L0f0dfb44: /* f0dfb44: 0fc54d8a */ jal func0f153628 /* f0dfb48: 02402025 */ or $a0,$s2,$zero -/* f0dfb4c: 3c19800a */ lui $t9,0x800a -/* f0dfb50: 8f39a258 */ lw $t9,-0x5da8($t9) +/* f0dfb4c: 3c19800a */ lui $t9,%hi(g_Vars+0x298) +/* f0dfb50: 8f39a258 */ lw $t9,%lo(g_Vars+0x298)($t9) /* f0dfb54: 00409025 */ or $s2,$v0,$zero /* f0dfb58: 3c048007 */ lui $a0,%hi(var80070fe8) /* f0dfb5c: 07210005 */ bgez $t9,.L0f0dfb74 /* f0dfb60: 3c0141f0 */ lui $at,0x41f0 -/* f0dfb64: 3c08800a */ lui $t0,0x800a -/* f0dfb68: 8d08a25c */ lw $t0,-0x5da4($t0) +/* f0dfb64: 3c08800a */ lui $t0,%hi(g_Vars+0x29c) +/* f0dfb68: 8d08a25c */ lw $t0,%lo(g_Vars+0x29c)($t0) /* f0dfb6c: 0500000e */ bltz $t0,.L0f0dfba8 /* f0dfb70: 00000000 */ sll $zero,$zero,0x0 .L0f0dfb74: @@ -3357,8 +3357,8 @@ glabel var7f1adef4 /* f0dfb88: 8d4ad9d0 */ lw $t2,%lo(var8005d9d0)($t2) /* f0dfb8c: 15400006 */ bnez $t2,.L0f0dfba8 /* f0dfb90: 00000000 */ sll $zero,$zero,0x0 -/* f0dfb94: 3c0b800a */ lui $t3,0x800a -/* f0dfb98: 8d6ba24c */ lw $t3,-0x5db4($t3) +/* f0dfb94: 3c0b800a */ lui $t3,%hi(g_Vars+0x28c) +/* f0dfb98: 8d6ba24c */ lw $t3,%lo(g_Vars+0x28c)($t3) /* f0dfb9c: 15600002 */ bnez $t3,.L0f0dfba8 /* f0dfba0: 00000000 */ sll $zero,$zero,0x0 /* f0dfba4: afa000dc */ sw $zero,0xdc($sp) @@ -3400,8 +3400,8 @@ glabel var7f1adef4 /* f0dfc28: 8fae00dc */ lw $t6,0xdc($sp) /* f0dfc2c: 51c0000c */ beqzl $t6,.L0f0dfc60 /* f0dfc30: 92190003 */ lbu $t9,0x3($s0) -/* f0dfc34: 3c0f800a */ lui $t7,0x800a -/* f0dfc38: 8defa24c */ lw $t7,-0x5db4($t7) +/* f0dfc34: 3c0f800a */ lui $t7,%hi(g_Vars+0x28c) +/* f0dfc38: 8defa24c */ lw $t7,%lo(g_Vars+0x28c)($t7) /* f0dfc3c: 8e1801c0 */ lw $t8,0x1c0($s0) /* f0dfc40: 11f80006 */ beq $t7,$t8,.L0f0dfc5c .L0f0dfc44: @@ -4077,29 +4077,29 @@ glabel var7f1adef4 /* f0e0620: afb90088 */ sw $t9,0x88($sp) .L0f0e0624: /* f0e0624: 8fa900e0 */ lw $t1,0xe0($sp) -/* f0e0628: 3c0c800a */ lui $t4,0x800a +/* f0e0628: 3c0c800a */ lui $t4,%hi(g_Vars+0x288) /* f0e062c: 11200028 */ beqz $t1,.L0f0e06d0 /* f0e0630: 00000000 */ sll $zero,$zero,0x0 -/* f0e0634: 8d8ca248 */ lw $t4,-0x5db8($t4) +/* f0e0634: 8d8ca248 */ lw $t4,%lo(g_Vars+0x288)($t4) /* f0e0638: 0fc54a3a */ jal optionsGetShowMissionTime /* f0e063c: 8d840070 */ lw $a0,0x70($t4) /* f0e0640: 10400019 */ beqz $v0,.L0f0e06a8 /* f0e0644: 3c188007 */ lui $t8,%hi(var80075d60) /* f0e0648: 8f185d60 */ lw $t8,%lo(var80075d60)($t8) /* f0e064c: 24030002 */ addiu $v1,$zero,0x2 -/* f0e0650: 3c08800a */ lui $t0,0x800a +/* f0e0650: 3c08800a */ lui $t0,%hi(g_Vars+0x318) /* f0e0654: 14780014 */ bne $v1,$t8,.L0f0e06a8 /* f0e0658: 00000000 */ sll $zero,$zero,0x0 -/* f0e065c: 8d08a2d8 */ lw $t0,-0x5d28($t0) -/* f0e0660: 3c0b800a */ lui $t3,0x800a +/* f0e065c: 8d08a2d8 */ lw $t0,%lo(g_Vars+0x318)($t0) +/* f0e0660: 3c0b800a */ lui $t3,%hi(g_Vars+0x4b4) /* f0e0664: 15000010 */ bnez $t0,.L0f0e06a8 /* f0e0668: 00000000 */ sll $zero,$zero,0x0 -/* f0e066c: 8d6ba474 */ lw $t3,-0x5b8c($t3) +/* f0e066c: 8d6ba474 */ lw $t3,%lo(g_Vars+0x4b4)($t3) /* f0e0670: 24010026 */ addiu $at,$zero,0x26 -/* f0e0674: 3c0f800a */ lui $t7,0x800a +/* f0e0674: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) /* f0e0678: 1161000b */ beq $t3,$at,.L0f0e06a8 /* f0e067c: 00000000 */ sll $zero,$zero,0x0 -/* f0e0680: 8defa244 */ lw $t7,-0x5dbc($t7) +/* f0e0680: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) /* f0e0684: 24010001 */ addiu $at,$zero,0x1 /* f0e0688: 8de20000 */ lw $v0,0x0($t7) /* f0e068c: 10620006 */ beq $v1,$v0,.L0f0e06a8 diff --git a/src/game/game_0e0770.c b/src/game/game_0e0770.c index f3bf064d3..cded762c8 100644 --- a/src/game/game_0e0770.c +++ b/src/game/game_0e0770.c @@ -3466,7 +3466,7 @@ glabel func0f0e39d0 /* f0e39ec: 46062202 */ mul.s $f8,$f4,$f6 /* f0e39f0: afbf007c */ sw $ra,0x7c($sp) /* f0e39f4: ac400000 */ sw $zero,0x0($v0) -/* f0e39f8: 3c01800a */ lui $at,0x800a +/* f0e39f8: 3c01800a */ lui $at,%hi(var8009de98) /* f0e39fc: afbe0078 */ sw $s8,0x78($sp) /* f0e3a00: afb70074 */ sw $s7,0x74($sp) /* f0e3a04: afb60070 */ sw $s6,0x70($sp) @@ -3483,20 +3483,20 @@ glabel func0f0e39d0 /* f0e3a30: f7b60030 */ sdc1 $f22,0x30($sp) /* f0e3a34: f7b40028 */ sdc1 $f20,0x28($sp) /* f0e3a38: e7a800b4 */ swc1 $f8,0xb4($sp) -/* f0e3a3c: ac20de98 */ sw $zero,-0x2168($at) +/* f0e3a3c: ac20de98 */ sw $zero,%lo(var8009de98)($at) /* f0e3a40: 0fc3528f */ jal func0f0d4a3c /* f0e3a44: 00002825 */ or $a1,$zero,$zero /* f0e3a48: 3c0ffffe */ lui $t7,0xfffe /* f0e3a4c: 35ef7960 */ ori $t7,$t7,0x7960 -/* f0e3a50: 3c01800a */ lui $at,0x800a -/* f0e3a54: ac2fde90 */ sw $t7,-0x2170($at) +/* f0e3a50: 3c01800a */ lui $at,%hi(var8009de90) +/* f0e3a54: ac2fde90 */ sw $t7,%lo(var8009de90)($at) /* f0e3a58: 3c180001 */ lui $t8,0x1 /* f0e3a5c: 371886a0 */ ori $t8,$t8,0x86a0 -/* f0e3a60: 3c01800a */ lui $at,0x800a +/* f0e3a60: 3c01800a */ lui $at,%hi(var8009de94) /* f0e3a64: 24197f7f */ addiu $t9,$zero,0x7f7f /* f0e3a68: 24087f7f */ addiu $t0,$zero,0x7f7f /* f0e3a6c: 24090004 */ addiu $t1,$zero,0x4 -/* f0e3a70: ac38de94 */ sw $t8,-0x216c($at) +/* f0e3a70: ac38de94 */ sw $t8,%lo(var8009de94)($at) /* f0e3a74: afa9001c */ sw $t1,0x1c($sp) /* f0e3a78: afa80018 */ sw $t0,0x18($sp) /* f0e3a7c: afb90014 */ sw $t9,0x14($sp) @@ -4042,12 +4042,12 @@ glabel func0f0e4190 /* f0e429c: 01e08025 */ or $s0,$t7,$zero /* f0e42a0: 3c18fffe */ lui $t8,0xfffe /* f0e42a4: 37187960 */ ori $t8,$t8,0x7960 -/* f0e42a8: 3c01800a */ lui $at,0x800a -/* f0e42ac: ac38de90 */ sw $t8,-0x2170($at) +/* f0e42a8: 3c01800a */ lui $at,%hi(var8009de90) +/* f0e42ac: ac38de90 */ sw $t8,%lo(var8009de90)($at) /* f0e42b0: 3c190001 */ lui $t9,0x1 /* f0e42b4: 373986a0 */ ori $t9,$t9,0x86a0 -/* f0e42b8: 3c01800a */ lui $at,0x800a -/* f0e42bc: ac39de94 */ sw $t9,-0x216c($at) +/* f0e42b8: 3c01800a */ lui $at,%hi(var8009de94) +/* f0e42bc: ac39de94 */ sw $t9,%lo(var8009de94)($at) /* f0e42c0: 3c01ff00 */ lui $at,0xff00 /* f0e42c4: 3421007f */ ori $at,$at,0x7f /* f0e42c8: 0201a025 */ or $s4,$s0,$at @@ -4235,10 +4235,10 @@ glabel func0f0e4190 /* f0e458c: 27bdffc8 */ addiu $sp,$sp,-56 /* f0e4590: afbf002c */ sw $ra,0x2c($sp) /* f0e4594: afb00028 */ sw $s0,0x28($sp) -/* f0e4598: 3c01800a */ lui $at,0x800a +/* f0e4598: 3c01800a */ lui $at,%hi(var8009de98) /* f0e459c: 00808025 */ or $s0,$a0,$zero /* f0e45a0: 0c002f06 */ jal func0000bc18 -/* f0e45a4: ac20de98 */ sw $zero,-0x2168($at) +/* f0e45a4: ac20de98 */ sw $zero,%lo(var8009de98)($at) /* f0e45a8: 04410003 */ bgez $v0,.L0f0e45b8 /* f0e45ac: 00027043 */ sra $t6,$v0,0x1 /* f0e45b0: 24410001 */ addiu $at,$v0,0x1 @@ -4246,21 +4246,21 @@ glabel func0f0e4190 .L0f0e45b8: /* f0e45b8: 240fffec */ addiu $t7,$zero,-20 /* f0e45bc: 01eec023 */ subu $t8,$t7,$t6 -/* f0e45c0: 3c01800a */ lui $at,0x800a -/* f0e45c4: ac38de9c */ sw $t8,-0x2164($at) +/* f0e45c0: 3c01800a */ lui $at,%hi(var8009de9c) +/* f0e45c4: ac38de9c */ sw $t8,%lo(var8009de9c)($at) /* f0e45c8: 02002025 */ or $a0,$s0,$zero /* f0e45cc: 0fc3528f */ jal func0f0d4a3c /* f0e45d0: 00002825 */ or $a1,$zero,$zero /* f0e45d4: 3c19fffe */ lui $t9,0xfffe /* f0e45d8: 37397960 */ ori $t9,$t9,0x7960 -/* f0e45dc: 3c01800a */ lui $at,0x800a -/* f0e45e0: ac39de90 */ sw $t9,-0x2170($at) +/* f0e45dc: 3c01800a */ lui $at,%hi(var8009de90) +/* f0e45e0: ac39de90 */ sw $t9,%lo(var8009de90)($at) /* f0e45e4: 3c080001 */ lui $t0,0x1 /* f0e45e8: 350886a0 */ ori $t0,$t0,0x86a0 -/* f0e45ec: 3c01800a */ lui $at,0x800a +/* f0e45ec: 3c01800a */ lui $at,%hi(var8009de94) /* f0e45f0: 00408025 */ or $s0,$v0,$zero /* f0e45f4: 0c002f06 */ jal func0000bc18 -/* f0e45f8: ac28de94 */ sw $t0,-0x216c($at) +/* f0e45f8: ac28de94 */ sw $t0,%lo(var8009de94)($at) /* f0e45fc: 0c002f06 */ jal func0000bc18 /* f0e4600: a7a20034 */ sh $v0,0x34($sp) /* f0e4604: 87a60034 */ lh $a2,0x34($sp) @@ -4301,9 +4301,9 @@ glabel func0f0e4190 /* f0e4690: 3c03800a */ lui $v1,%hi(var8009de9c) /* f0e4694: 2463de9c */ addiu $v1,$v1,%lo(var8009de9c) /* f0e4698: ac600000 */ sw $zero,0x0($v1) -/* f0e469c: 3c01800a */ lui $at,0x800a +/* f0e469c: 3c01800a */ lui $at,%hi(var8009de98) /* f0e46a0: 8fb00028 */ lw $s0,0x28($sp) -/* f0e46a4: ac20de98 */ sw $zero,-0x2168($at) +/* f0e46a4: ac20de98 */ sw $zero,%lo(var8009de98)($at) /* f0e46a8: 03e00008 */ jr $ra /* f0e46ac: 27bd0038 */ addiu $sp,$sp,0x38 /* f0e46b0: 3c0e800a */ lui $t6,%hi(var8009de9c) @@ -4334,16 +4334,16 @@ glabel func0f0e4190 /* f0e4714: afa60034 */ sw $a2,0x34($sp) /* f0e4718: 3c08fffe */ lui $t0,0xfffe /* f0e471c: 35087960 */ ori $t0,$t0,0x7960 -/* f0e4720: 3c01800a */ lui $at,0x800a +/* f0e4720: 3c01800a */ lui $at,%hi(var8009de90) /* f0e4724: 8fa60034 */ lw $a2,0x34($sp) /* f0e4728: 3c03ffff */ lui $v1,0xffff -/* f0e472c: ac28de90 */ sw $t0,-0x2170($at) +/* f0e472c: ac28de90 */ sw $t0,%lo(var8009de90)($at) /* f0e4730: 3c090001 */ lui $t1,0x1 /* f0e4734: 3463007f */ ori $v1,$v1,0x7f /* f0e4738: 352986a0 */ ori $t1,$t1,0x86a0 -/* f0e473c: 3c01800a */ lui $at,0x800a +/* f0e473c: 3c01800a */ lui $at,%hi(var8009de94) /* f0e4740: 240a0005 */ addiu $t2,$zero,0x5 -/* f0e4744: ac29de94 */ sw $t1,-0x216c($at) +/* f0e4744: ac29de94 */ sw $t1,%lo(var8009de94)($at) /* f0e4748: afaa001c */ sw $t2,0x1c($sp) /* f0e474c: afa30014 */ sw $v1,0x14($sp) /* f0e4750: afa30018 */ sw $v1,0x18($sp) @@ -4405,7 +4405,7 @@ glabel func0f0e4190 /* f0e4830: 46062202 */ mul.s $f8,$f4,$f6 /* f0e4834: afbf007c */ sw $ra,0x7c($sp) /* f0e4838: ac400000 */ sw $zero,0x0($v0) -/* f0e483c: 3c01800a */ lui $at,0x800a +/* f0e483c: 3c01800a */ lui $at,%hi(var8009de98) /* f0e4840: afbe0078 */ sw $s8,0x78($sp) /* f0e4844: afb70074 */ sw $s7,0x74($sp) /* f0e4848: afb60070 */ sw $s6,0x70($sp) @@ -4422,20 +4422,20 @@ glabel func0f0e4190 /* f0e4874: f7b60030 */ sdc1 $f22,0x30($sp) /* f0e4878: f7b40028 */ sdc1 $f20,0x28($sp) /* f0e487c: e7a800b4 */ swc1 $f8,0xb4($sp) -/* f0e4880: ac20de98 */ sw $zero,-0x2168($at) +/* f0e4880: ac20de98 */ sw $zero,%lo(var8009de98)($at) /* f0e4884: 0fc3528f */ jal func0f0d4a3c /* f0e4888: 00002825 */ or $a1,$zero,$zero /* f0e488c: 3c0ffffe */ lui $t7,0xfffe /* f0e4890: 35ef7960 */ ori $t7,$t7,0x7960 -/* f0e4894: 3c01800a */ lui $at,0x800a -/* f0e4898: ac2fde90 */ sw $t7,-0x2170($at) +/* f0e4894: 3c01800a */ lui $at,%hi(var8009de90) +/* f0e4898: ac2fde90 */ sw $t7,%lo(var8009de90)($at) /* f0e489c: 3c180001 */ lui $t8,0x1 /* f0e48a0: 371886a0 */ ori $t8,$t8,0x86a0 -/* f0e48a4: 3c01800a */ lui $at,0x800a +/* f0e48a4: 3c01800a */ lui $at,%hi(var8009de94) /* f0e48a8: 24197f7f */ addiu $t9,$zero,0x7f7f /* f0e48ac: 24087f7f */ addiu $t0,$zero,0x7f7f /* f0e48b0: 24090004 */ addiu $t1,$zero,0x4 -/* f0e48b4: ac38de94 */ sw $t8,-0x216c($at) +/* f0e48b4: ac38de94 */ sw $t8,%lo(var8009de94)($at) /* f0e48b8: afa9001c */ sw $t1,0x1c($sp) /* f0e48bc: afa80018 */ sw $t0,0x18($sp) /* f0e48c0: afb90014 */ sw $t9,0x14($sp) @@ -5192,25 +5192,25 @@ glabel func0f0e5000 /* f0e53d4: 44816000 */ mtc1 $at,$f12 /* f0e53d8: 0fc01ae8 */ jal func0f006ba0 /* f0e53dc: 00000000 */ sll $zero,$zero,0x0 -/* f0e53e0: 3c01800a */ lui $at,0x800a -/* f0e53e4: ac20de98 */ sw $zero,-0x2168($at) -/* f0e53e8: 3c01800a */ lui $at,0x800a +/* f0e53e0: 3c01800a */ lui $at,%hi(var8009de98) +/* f0e53e4: ac20de98 */ sw $zero,%lo(var8009de98)($at) +/* f0e53e8: 3c01800a */ lui $at,%hi(var8009de9c) /* f0e53ec: 8fa40150 */ lw $a0,0x150($sp) /* f0e53f0: 46000506 */ mov.s $f20,$f0 -/* f0e53f4: ac20de9c */ sw $zero,-0x2164($at) +/* f0e53f4: ac20de9c */ sw $zero,%lo(var8009de9c)($at) /* f0e53f8: 0fc3528f */ jal func0f0d4a3c /* f0e53fc: 00002825 */ or $a1,$zero,$zero /* f0e5400: 3c0afffe */ lui $t2,0xfffe /* f0e5404: 8fac00f0 */ lw $t4,0xf0($sp) /* f0e5408: 354a7960 */ ori $t2,$t2,0x7960 -/* f0e540c: 3c01800a */ lui $at,0x800a -/* f0e5410: ac2ade90 */ sw $t2,-0x2170($at) +/* f0e540c: 3c01800a */ lui $at,%hi(var8009de90) +/* f0e5410: ac2ade90 */ sw $t2,%lo(var8009de90)($at) /* f0e5414: 3c0b0001 */ lui $t3,0x1 /* f0e5418: 356b86a0 */ ori $t3,$t3,0x86a0 -/* f0e541c: 3c01800a */ lui $at,0x800a +/* f0e541c: 3c01800a */ lui $at,%hi(var8009de94) /* f0e5420: 00409025 */ or $s2,$v0,$zero /* f0e5424: 11800022 */ beqz $t4,.L0f0e54b0 -/* f0e5428: ac2bde94 */ sw $t3,-0x216c($at) +/* f0e5428: ac2bde94 */ sw $t3,%lo(var8009de94)($at) /* f0e542c: 3c026060 */ lui $v0,0x6060 /* f0e5430: 3442607f */ ori $v0,$v0,0x607f /* f0e5434: 240dfff6 */ addiu $t5,$zero,-10 diff --git a/src/game/game_0e5ce0.c b/src/game/game_0e5ce0.c index 59c202ef4..503c6c1bb 100644 --- a/src/game/game_0e5ce0.c +++ b/src/game/game_0e5ce0.c @@ -8245,11 +8245,11 @@ glabel func0f0e98ac /* f0e98e8: 0c0036cc */ jal func0000db30 /* f0e98ec: afa200bc */ sw $v0,0xbc($sp) /* f0e98f0: 8faf0138 */ lw $t7,0x138($sp) -/* f0e98f4: 3c04800a */ lui $a0,0x800a +/* f0e98f4: 3c04800a */ lui $a0,%hi(var8009dfc8+0x2) /* f0e98f8: 000fc040 */ sll $t8,$t7,0x1 /* f0e98fc: 00982021 */ addu $a0,$a0,$t8 /* f0e9900: 0fc5b9f1 */ jal langGet -/* f0e9904: 9484dfca */ lhu $a0,-0x2036($a0) +/* f0e9904: 9484dfca */ lhu $a0,%lo(var8009dfc8+0x2)($a0) /* f0e9908: 87b90146 */ lh $t9,0x146($sp) /* f0e990c: 8fa30134 */ lw $v1,0x134($sp) /* f0e9910: afa20120 */ sw $v0,0x120($sp) @@ -8461,7 +8461,7 @@ glabel func0f0e98ac .L0f0e9c28: /* f0e9c28: 3c098007 */ lui $t1,%hi(g_MpPlayerNum) /* f0e9c2c: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) -/* f0e9c30: 3c0c800a */ lui $t4,%hi(g_MenuStack) +/* f0e9c30: 3c0c800a */ lui $t4,%hi(g_MenuStack+0x4f8) /* f0e9c34: 8fae0134 */ lw $t6,0x134($sp) /* f0e9c38: 000950c0 */ sll $t2,$t1,0x3 /* f0e9c3c: 01495023 */ subu $t2,$t2,$t1 @@ -8471,7 +8471,7 @@ glabel func0f0e98ac /* f0e9c4c: 01495023 */ subu $t2,$t2,$t1 /* f0e9c50: 000a5100 */ sll $t2,$t2,0x4 /* f0e9c54: 018a6021 */ addu $t4,$t4,$t2 -/* f0e9c58: 8d8ce4f8 */ lw $t4,%lo(g_MenuStack)($t4) +/* f0e9c58: 8d8ce4f8 */ lw $t4,%lo(g_MenuStack+0x4f8)($t4) /* f0e9c5c: 27a400c0 */ addiu $a0,$sp,0xc0 /* f0e9c60: 27a500c4 */ addiu $a1,$sp,0xc4 /* f0e9c64: 11cc0004 */ beq $t6,$t4,.L0f0e9c78 @@ -10845,7 +10845,7 @@ glabel func0f0ebec8 /* f0ebf2c: 15000017 */ bnez $t0,.L0f0ebf8c /* f0ebf30: 01002825 */ or $a1,$t0,$zero /* f0ebf34: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) -/* f0ebf38: 3c0b800a */ lui $t3,0x800a +/* f0ebf38: 3c0b800a */ lui $t3,%hi(g_MenuStack+0x82c) /* f0ebf3c: 8fac0050 */ lw $t4,0x50($sp) /* f0ebf40: 000950c0 */ sll $t2,$t1,0x3 /* f0ebf44: 01495023 */ subu $t2,$t2,$t1 @@ -10855,7 +10855,7 @@ glabel func0f0ebec8 /* f0ebf54: 01495023 */ subu $t2,$t2,$t1 /* f0ebf58: 000a5100 */ sll $t2,$t2,0x4 /* f0ebf5c: 016a5821 */ addu $t3,$t3,$t2 -/* f0ebf60: 856be82c */ lh $t3,-0x17d4($t3) +/* f0ebf60: 856be82c */ lh $t3,%lo(g_MenuStack+0x82c)($t3) /* f0ebf64: 3c0142c8 */ lui $at,0x42c8 /* f0ebf68: 55600009 */ bnezl $t3,.L0f0ebf90 /* f0ebf6c: 84ce0000 */ lh $t6,0x0($a2) @@ -10936,7 +10936,7 @@ glabel func0f0ebec8 /* f0ec084: 45020013 */ bc1fl .L0f0ec0d4 /* f0ec088: 84cc0000 */ lh $t4,0x0($a2) /* f0ec08c: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) -/* f0ec090: 3c09800a */ lui $t1,0x800a +/* f0ec090: 3c09800a */ lui $t1,%hi(g_MenuStack+0x82c) /* f0ec094: 8faa0050 */ lw $t2,0x50($sp) /* f0ec098: 001940c0 */ sll $t0,$t9,0x3 /* f0ec09c: 01194023 */ subu $t0,$t0,$t9 @@ -10946,7 +10946,7 @@ glabel func0f0ebec8 /* f0ec0ac: 01194023 */ subu $t0,$t0,$t9 /* f0ec0b0: 00084100 */ sll $t0,$t0,0x4 /* f0ec0b4: 01284821 */ addu $t1,$t1,$t0 -/* f0ec0b8: 8529e82c */ lh $t1,-0x17d4($t1) +/* f0ec0b8: 8529e82c */ lh $t1,%lo(g_MenuStack+0x82c)($t1) /* f0ec0bc: 11200034 */ beqz $t1,.L0f0ec190 /* f0ec0c0: 00000000 */ sll $zero,$zero,0x0 /* f0ec0c4: 814b0000 */ lb $t3,0x0($t2) @@ -11827,7 +11827,7 @@ glabel var7f1b1e8c /* f0eccc0: 00000000 */ sll $zero,$zero,0x0 /* f0eccc4: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f0eccc8: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f0ecccc: 3c04800a */ lui $a0,0x800a +/* f0ecccc: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe20) /* f0eccd0: 000fc0c0 */ sll $t8,$t7,0x3 /* f0eccd4: 030fc023 */ subu $t8,$t8,$t7 /* f0eccd8: 0018c080 */ sll $t8,$t8,0x2 @@ -11837,7 +11837,7 @@ glabel var7f1b1e8c /* f0ecce8: 0018c100 */ sll $t8,$t8,0x4 /* f0eccec: 00982021 */ addu $a0,$a0,$t8 /* f0eccf0: 0fc670ac */ jal func0f19c2b0 -/* f0eccf4: 8c84ee20 */ lw $a0,-0x11e0($a0) +/* f0eccf4: 8c84ee20 */ lw $a0,%lo(g_MenuStack+0xe20)($a0) /* f0eccf8: 10000046 */ beqz $zero,.L0f0ece14 /* f0eccfc: 8fbf0014 */ lw $ra,0x14($sp) /* f0ecd00: 0fc6709d */ jal mpIsVar800884b4NonZero @@ -11845,8 +11845,8 @@ glabel var7f1b1e8c /* f0ecd08: 14400012 */ bnez $v0,.L0f0ecd54 /* f0ecd0c: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f0ecd10: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) -/* f0ecd14: 3c09800a */ lui $t1,%hi(var8009e000) -/* f0ecd18: 2529e000 */ addiu $t1,$t1,%lo(var8009e000) +/* f0ecd14: 3c09800a */ lui $t1,0x800a +/* f0ecd18: 2529e000 */ addiu $t1,$t1,-8192 /* f0ecd1c: 001940c0 */ sll $t0,$t9,0x3 /* f0ecd20: 01194023 */ subu $t0,$t0,$t9 /* f0ecd24: 00084080 */ sll $t0,$t0,0x2 @@ -12252,10 +12252,10 @@ glabel func0f0ed264 /* f0ed300: 000c6080 */ sll $t4,$t4,0x2 /* f0ed304: 018b6021 */ addu $t4,$t4,$t3 /* f0ed308: 000c60c0 */ sll $t4,$t4,0x3 -/* f0ed30c: 3c0d800a */ lui $t5,%hi(var8009e000) +/* f0ed30c: 3c0d800a */ lui $t5,0x800a /* f0ed310: 018b6023 */ subu $t4,$t4,$t3 /* f0ed314: 000c6100 */ sll $t4,$t4,0x4 -/* f0ed318: 25ade000 */ addiu $t5,$t5,%lo(var8009e000) +/* f0ed318: 25ade000 */ addiu $t5,$t5,-8192 /* f0ed31c: 000f7080 */ sll $t6,$t7,0x2 /* f0ed320: 018d1821 */ addu $v1,$t4,$t5 /* f0ed324: 01cf7021 */ addu $t6,$t6,$t7 @@ -13374,12 +13374,12 @@ glabel func0f0edb6c /* f0ee304: afac0014 */ sw $t4,0x14($sp) /* f0ee308: 87cd0004 */ lh $t5,0x4($s8) /* f0ee30c: 00194080 */ sll $t0,$t9,0x2 -/* f0ee310: 3c09800b */ lui $t1,0x800b +/* f0ee310: 3c09800b */ lui $t1,%hi(g_MpSetup+0x28) /* f0ee314: afad001c */ sw $t5,0x1c($sp) /* f0ee318: 87ca0006 */ lh $t2,0x6($s8) /* f0ee31c: 01194023 */ subu $t0,$t0,$t9 /* f0ee320: 00084080 */ sll $t0,$t0,0x2 -/* f0ee324: 2529cbb0 */ addiu $t1,$t1,-13392 +/* f0ee324: 2529cbb0 */ addiu $t1,$t1,%lo(g_MpSetup+0x28) /* f0ee328: 01093821 */ addu $a3,$t0,$t1 /* f0ee32c: afa00028 */ sw $zero,0x28($sp) /* f0ee330: afa00024 */ sw $zero,0x24($sp) @@ -14219,8 +14219,8 @@ glabel func0f0ee648 /* f0eef80: 852d000c */ lh $t5,0xc($t1) /* f0eef84: 024d9023 */ subu $s2,$s2,$t5 .L0f0eef88: -/* f0eef88: 3c0e800b */ lui $t6,0x800b -/* f0eef8c: 95cecb9e */ lhu $t6,-0x3462($t6) +/* f0eef88: 3c0e800b */ lui $t6,%hi(g_MpSetup+0x16) +/* f0eef8c: 95cecb9e */ lhu $t6,%lo(g_MpSetup+0x16)($t6) /* f0eef90: 240f0001 */ addiu $t7,$zero,0x1 /* f0eef94: 020f5004 */ sllv $t2,$t7,$s0 /* f0eef98: 01ca5824 */ and $t3,$t6,$t2 @@ -14492,10 +14492,10 @@ glabel func0f0ef360 /* f0ef368: a4a0000c */ sh $zero,0xc($a1) /* f0ef36c: 3c028007 */ lui $v0,%hi(g_MpPlayerNum) /* f0ef370: 8c421448 */ lw $v0,%lo(g_MpPlayerNum)($v0) -/* f0ef374: 3c01800a */ lui $at,0x800a +/* f0ef374: 3c01800a */ lui $at,%hi(var8009deb0) /* f0ef378: 00220821 */ addu $at,$at,$v0 /* f0ef37c: 0fc39e66 */ jal func0f0e7998 -/* f0ef380: a022deb0 */ sb $v0,-0x2150($at) +/* f0ef380: a022deb0 */ sb $v0,%lo(var8009deb0)($at) /* f0ef384: 8fbf0014 */ lw $ra,0x14($sp) /* f0ef388: 27bd0018 */ addiu $sp,$sp,0x18 /* f0ef38c: 03e00008 */ jr $ra @@ -14994,7 +14994,7 @@ glabel func0f0efa90 /* f0efabc: afbf0014 */ sw $ra,0x14($sp) /* f0efac0: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f0efac4: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) -/* f0efac8: 3c04800a */ lui $a0,0x800a +/* f0efac8: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe24) /* f0efacc: afa3001c */ sw $v1,0x1c($sp) /* f0efad0: 001940c0 */ sll $t0,$t9,0x3 /* f0efad4: 01194023 */ subu $t0,$t0,$t9 @@ -15005,7 +15005,7 @@ glabel func0f0efa90 /* f0efae8: 00084100 */ sll $t0,$t0,0x4 /* f0efaec: 00882021 */ addu $a0,$a0,$t0 /* f0efaf0: 0fc549fb */ jal optionsGetAimControl -/* f0efaf4: 8c84ee24 */ lw $a0,-0x11dc($a0) +/* f0efaf4: 8c84ee24 */ lw $a0,%lo(g_MenuStack+0xe24)($a0) /* f0efaf8: 24010001 */ addiu $at,$zero,0x1 /* f0efafc: 14410002 */ bne $v0,$at,.L0f0efb08 /* f0efb00: 8fa3001c */ lw $v1,0x1c($sp) @@ -15015,7 +15015,7 @@ glabel func0f0efa90 /* f0efb0c: 14610011 */ bne $v1,$at,.L0f0efb54 /* f0efb10: 3c098007 */ lui $t1,%hi(g_MpPlayerNum) /* f0efb14: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) -/* f0efb18: 3c04800a */ lui $a0,0x800a +/* f0efb18: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe24) /* f0efb1c: afa3001c */ sw $v1,0x1c($sp) /* f0efb20: 000950c0 */ sll $t2,$t1,0x3 /* f0efb24: 01495023 */ subu $t2,$t2,$t1 @@ -15026,7 +15026,7 @@ glabel func0f0efa90 /* f0efb38: 000a5100 */ sll $t2,$t2,0x4 /* f0efb3c: 008a2021 */ addu $a0,$a0,$t2 /* f0efb40: 0fc549e0 */ jal optionsGetForwardPitch -/* f0efb44: 8c84ee24 */ lw $a0,-0x11dc($a0) +/* f0efb44: 8c84ee24 */ lw $a0,%lo(g_MenuStack+0xe24)($a0) /* f0efb48: 14400002 */ bnez $v0,.L0f0efb54 /* f0efb4c: 8fa3001c */ lw $v1,0x1c($sp) /* f0efb50: 240354c6 */ addiu $v1,$zero,0x54c6 @@ -15035,7 +15035,7 @@ glabel func0f0efa90 /* f0efb58: 14610011 */ bne $v1,$at,.L0f0efba0 /* f0efb5c: 3c0b8007 */ lui $t3,%hi(g_MpPlayerNum) /* f0efb60: 8d6b1448 */ lw $t3,%lo(g_MpPlayerNum)($t3) -/* f0efb64: 3c04800a */ lui $a0,0x800a +/* f0efb64: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe24) /* f0efb68: afa3001c */ sw $v1,0x1c($sp) /* f0efb6c: 000b60c0 */ sll $t4,$t3,0x3 /* f0efb70: 018b6023 */ subu $t4,$t4,$t3 @@ -15046,7 +15046,7 @@ glabel func0f0efa90 /* f0efb84: 000c6100 */ sll $t4,$t4,0x4 /* f0efb88: 008c2021 */ addu $a0,$a0,$t4 /* f0efb8c: 0fc549e0 */ jal optionsGetForwardPitch -/* f0efb90: 8c84ee24 */ lw $a0,-0x11dc($a0) +/* f0efb90: 8c84ee24 */ lw $a0,%lo(g_MenuStack+0xe24)($a0) /* f0efb94: 14400002 */ bnez $v0,.L0f0efba0 /* f0efb98: 8fa3001c */ lw $v1,0x1c($sp) /* f0efb9c: 240354c7 */ addiu $v1,$zero,0x54c7 @@ -15333,9 +15333,9 @@ glabel func0f0eff78 /* f0effa0: 24c61448 */ addiu $a2,$a2,%lo(g_MpPlayerNum) /* f0effa4: 8cce0000 */ lw $t6,0x0($a2) /* f0effa8: 24080e70 */ addiu $t0,$zero,0xe70 -/* f0effac: 3c05800a */ lui $a1,%hi(var8009e000) +/* f0effac: 3c05800a */ lui $a1,0x800a /* f0effb0: 01c80019 */ multu $t6,$t0 -/* f0effb4: 24a5e000 */ addiu $a1,$a1,%lo(var8009e000) +/* f0effb4: 24a5e000 */ addiu $a1,$a1,-8192 /* f0effb8: 92020002 */ lbu $v0,0x2($s0) /* f0effbc: 8fa70068 */ lw $a3,0x68($sp) /* f0effc0: 00007812 */ mflo $t7 @@ -15386,8 +15386,8 @@ glabel func0f0eff78 /* f0f0068: 92030000 */ lbu $v1,0x0($s0) /* f0f006c: 286100ff */ slti $at,$v1,0xff /* f0f0070: 10200009 */ beqz $at,.L0f0f0098 -/* f0f0074: 3c0c800a */ lui $t4,0x800a -/* f0f0078: 8d8ca000 */ lw $t4,-0x6000($t4) +/* f0f0074: 3c0c800a */ lui $t4,%hi(g_Vars+0x40) +/* f0f0078: 8d8ca000 */ lw $t4,%lo(g_Vars+0x40)($t4) /* f0f007c: 000c6840 */ sll $t5,$t4,0x1 /* f0f0080: 006d1021 */ addu $v0,$v1,$t5 /* f0f0084: 28410100 */ slti $at,$v0,0x100 @@ -15400,8 +15400,8 @@ glabel func0f0eff78 /* f0f009c: 284100ff */ slti $at,$v0,0xff /* f0f00a0: 1020000b */ beqz $at,.L0f0f00d0 /* f0f00a4: 00402025 */ or $a0,$v0,$zero -/* f0f00a8: 3c0e800a */ lui $t6,0x800a -/* f0f00ac: 8dcea000 */ lw $t6,-0x6000($t6) +/* f0f00a8: 3c0e800a */ lui $t6,%hi(g_Vars+0x40) +/* f0f00ac: 8dcea000 */ lw $t6,%lo(g_Vars+0x40)($t6) /* f0f00b0: 000e7840 */ sll $t7,$t6,0x1 /* f0f00b4: 008f1821 */ addu $v1,$a0,$t7 /* f0f00b8: 28610100 */ slti $at,$v1,0x100 @@ -15486,7 +15486,7 @@ glabel func0f0eff78 /* f0f01e0: 8c842298 */ lw $a0,%lo(var7f1b2298)($a0) /* f0f01e4: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f0f01e8: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f0f01ec: 3c19800a */ lui $t9,0x800a +/* f0f01ec: 3c19800a */ lui $t9,%hi(g_MenuStack+0xe20) /* f0f01f0: 000fc0c0 */ sll $t8,$t7,0x3 /* f0f01f4: 030fc023 */ subu $t8,$t8,$t7 /* f0f01f8: 0018c080 */ sll $t8,$t8,0x2 @@ -15495,7 +15495,7 @@ glabel func0f0eff78 /* f0f0204: 030fc023 */ subu $t8,$t8,$t7 /* f0f0208: 0018c100 */ sll $t8,$t8,0x4 /* f0f020c: 0338c821 */ addu $t9,$t9,$t8 -/* f0f0210: 8f39ee20 */ lw $t9,-0x11e0($t9) +/* f0f0210: 8f39ee20 */ lw $t9,%lo(g_MenuStack+0xe20)($t9) /* f0f0214: 2f210004 */ sltiu $at,$t9,0x4 /* f0f0218: 1420001f */ bnez $at,.L0f0f0298 /* f0f021c: 00000000 */ sll $zero,$zero,0x0 @@ -15503,7 +15503,7 @@ glabel func0f0eff78 /* f0f0224: 240454d5 */ addiu $a0,$zero,0x54d5 /* f0f0228: 3c098007 */ lui $t1,%hi(g_MpPlayerNum) /* f0f022c: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) -/* f0f0230: 3c0a800a */ lui $t2,0x800a +/* f0f0230: 3c0a800a */ lui $t2,%hi(g_MenuStack+0xe20) /* f0f0234: 3c048007 */ lui $a0,%hi(options_controlstyle) /* f0f0238: 000958c0 */ sll $t3,$t1,0x3 /* f0f023c: 01695823 */ subu $t3,$t3,$t1 @@ -15513,7 +15513,7 @@ glabel func0f0eff78 /* f0f024c: 01695823 */ subu $t3,$t3,$t1 /* f0f0250: 000b5900 */ sll $t3,$t3,0x4 /* f0f0254: 014b5021 */ addu $t2,$t2,$t3 -/* f0f0258: 8d4aee20 */ lw $t2,-0x11e0($t2) +/* f0f0258: 8d4aee20 */ lw $t2,%lo(g_MenuStack+0xe20)($t2) /* f0f025c: afa2004c */ sw $v0,0x4c($sp) /* f0f0260: 000a6040 */ sll $t4,$t2,0x1 /* f0f0264: 008c2021 */ addu $a0,$a0,$t4 @@ -15534,7 +15534,7 @@ glabel func0f0eff78 /* f0f029c: 240454d5 */ addiu $a0,$zero,0x54d5 /* f0f02a0: 3c0d8007 */ lui $t5,%hi(g_MpPlayerNum) /* f0f02a4: 8dad1448 */ lw $t5,%lo(g_MpPlayerNum)($t5) -/* f0f02a8: 3c0f800a */ lui $t7,0x800a +/* f0f02a8: 3c0f800a */ lui $t7,%hi(g_MenuStack+0xe20) /* f0f02ac: 3c048007 */ lui $a0,%hi(options_controlstyle) /* f0f02b0: 000d70c0 */ sll $t6,$t5,0x3 /* f0f02b4: 01cd7023 */ subu $t6,$t6,$t5 @@ -15544,7 +15544,7 @@ glabel func0f0eff78 /* f0f02c4: 01cd7023 */ subu $t6,$t6,$t5 /* f0f02c8: 000e7100 */ sll $t6,$t6,0x4 /* f0f02cc: 01ee7821 */ addu $t7,$t7,$t6 -/* f0f02d0: 8defee20 */ lw $t7,-0x11e0($t7) +/* f0f02d0: 8defee20 */ lw $t7,%lo(g_MenuStack+0xe20)($t7) /* f0f02d4: afa2004c */ sw $v0,0x4c($sp) /* f0f02d8: 000fc040 */ sll $t8,$t7,0x1 /* f0f02dc: 00982021 */ addu $a0,$a0,$t8 @@ -15603,7 +15603,7 @@ glabel func0f0eff78 /* f0f03ac: 8fa60064 */ lw $a2,0x64($sp) /* f0f03b0: 3c188007 */ lui $t8,%hi(g_MpPlayerNum) /* f0f03b4: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f0f03b8: 3c03800a */ lui $v1,0x800a +/* f0f03b8: 3c03800a */ lui $v1,%hi(g_MenuStack+0xe20) /* f0f03bc: 00404025 */ or $t0,$v0,$zero /* f0f03c0: 0018c8c0 */ sll $t9,$t8,0x3 /* f0f03c4: 0338c823 */ subu $t9,$t9,$t8 @@ -15613,7 +15613,7 @@ glabel func0f0eff78 /* f0f03d4: 0338c823 */ subu $t9,$t9,$t8 /* f0f03d8: 0019c900 */ sll $t9,$t9,0x4 /* f0f03dc: 00791821 */ addu $v1,$v1,$t9 -/* f0f03e0: 8c63ee20 */ lw $v1,-0x11e0($v1) +/* f0f03e0: 8c63ee20 */ lw $v1,%lo(g_MenuStack+0xe20)($v1) /* f0f03e4: 8fa400a0 */ lw $a0,0xa0($sp) /* f0f03e8: 8fa500a4 */ lw $a1,0xa4($sp) /* f0f03ec: 2c610004 */ sltiu $at,$v1,0x4 @@ -15635,7 +15635,7 @@ glabel func0f0eff78 /* f0f042c: afaa0020 */ sw $t2,0x20($sp) /* f0f0430: 3c0c8007 */ lui $t4,%hi(g_MpPlayerNum) /* f0f0434: 8d8c1448 */ lw $t4,%lo(g_MpPlayerNum)($t4) -/* f0f0438: 3c0e800a */ lui $t6,0x800a +/* f0f0438: 3c0e800a */ lui $t6,%hi(g_MenuStack+0xe20) /* f0f043c: 8fb80064 */ lw $t8,0x64($sp) /* f0f0440: 000c68c0 */ sll $t5,$t4,0x3 /* f0f0444: 01ac6823 */ subu $t5,$t5,$t4 @@ -15645,7 +15645,7 @@ glabel func0f0eff78 /* f0f0454: 01ac6823 */ subu $t5,$t5,$t4 /* f0f0458: 000d6900 */ sll $t5,$t5,0x4 /* f0f045c: 01cd7021 */ addu $t6,$t6,$t5 -/* f0f0460: 8dceee20 */ lw $t6,-0x11e0($t6) +/* f0f0460: 8dceee20 */ lw $t6,%lo(g_MenuStack+0xe20)($t6) /* f0f0464: 8fb90094 */ lw $t9,0x94($sp) /* f0f0468: 8fa90098 */ lw $t1,0x98($sp) /* f0f046c: 25cf0004 */ addiu $t7,$t6,0x4 diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index a1142f792..d5bb39a19 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -544,7 +544,7 @@ glabel func0f0f0b90 /* f0f0b90: 3c02800a */ lui $v0,%hi(var800a19c4) /* f0f0b94: 8c4219c4 */ lw $v0,%lo(var800a19c4)($v0) /* f0f0b98: 24010002 */ addiu $at,$zero,0x2 -/* f0f0b9c: 3c0e800a */ lui $t6,0x800a +/* f0f0b9c: 3c0e800a */ lui $t6,%hi(g_Vars+0x4b4) /* f0f0ba0: 10410005 */ beq $v0,$at,.L0f0f0bb8 /* f0f0ba4: 24010004 */ addiu $at,$zero,0x4 /* f0f0ba8: 1041000b */ beq $v0,$at,.L0f0f0bd8 @@ -552,7 +552,7 @@ glabel func0f0f0b90 /* f0f0bb0: 5441000c */ bnel $v0,$at,.L0f0f0be4 /* f0f0bb4: 00001025 */ or $v0,$zero,$zero .L0f0f0bb8: -/* f0f0bb8: 8dcea474 */ lw $t6,-0x5b8c($t6) +/* f0f0bb8: 8dcea474 */ lw $t6,%lo(g_Vars+0x4b4)($t6) /* f0f0bbc: 24010026 */ addiu $at,$zero,0x26 /* f0f0bc0: 15c10003 */ bne $t6,$at,.L0f0f0bd0 /* f0f0bc4: 00000000 */ sll $zero,$zero,0x0 @@ -572,8 +572,8 @@ glabel func0f0f0b90 GLOBAL_ASM( glabel func0f0f0bec -/* f0f0bec: 3c0e800a */ lui $t6,0x800a -/* f0f0bf0: 8dcea248 */ lw $t6,-0x5db8($t6) +/* f0f0bec: 3c0e800a */ lui $t6,%hi(g_Vars+0x288) +/* f0f0bf0: 8dcea248 */ lw $t6,%lo(g_Vars+0x288)($t6) /* f0f0bf4: 27bdffe0 */ addiu $sp,$sp,-32 /* f0f0bf8: afbf0014 */ sw $ra,0x14($sp) /* f0f0bfc: 8dc30070 */ lw $v1,0x70($t6) @@ -583,7 +583,7 @@ glabel func0f0f0bec /* f0f0c0c: 8fa3001c */ lw $v1,0x1c($sp) /* f0f0c10: 28610004 */ slti $at,$v1,0x4 /* f0f0c14: 14200002 */ bnez $at,.L0f0f0c20 -/* f0f0c18: 3c18800a */ lui $t8,%hi(g_MenuStack) +/* f0f0c18: 3c18800a */ lui $t8,%hi(g_MenuStack+0x4f8) /* f0f0c1c: 2463fffc */ addiu $v1,$v1,-4 .L0f0f0c20: /* f0f0c20: 000378c0 */ sll $t7,$v1,0x3 @@ -594,7 +594,7 @@ glabel func0f0f0bec /* f0f0c34: 01e37823 */ subu $t7,$t7,$v1 /* f0f0c38: 000f7900 */ sll $t7,$t7,0x4 /* f0f0c3c: 030fc021 */ addu $t8,$t8,$t7 -/* f0f0c40: 8f18e4f8 */ lw $t8,%lo(g_MenuStack)($t8) +/* f0f0c40: 8f18e4f8 */ lw $t8,%lo(g_MenuStack+0x4f8)($t8) /* f0f0c44: 53000004 */ beqzl $t8,.L0f0f0c58 /* f0f0c48: 00001025 */ or $v0,$zero,$zero /* f0f0c4c: 10000002 */ beqz $zero,.L0f0f0c58 @@ -632,12 +632,12 @@ GLOBAL_ASM( glabel func0f0f0ca0 /* f0f0ca0: 10a00004 */ beqz $a1,.L0f0f0cb4 /* f0f0ca4: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) -/* f0f0ca8: 3c01800a */ lui $at,0x800a +/* f0f0ca8: 3c01800a */ lui $at,%hi(var800a19d8+0x3) /* f0f0cac: 03e00008 */ jr $ra -/* f0f0cb0: a02419db */ sb $a0,0x19db($at) +/* f0f0cb0: a02419db */ sb $a0,%lo(var800a19d8+0x3)($at) .L0f0f0cb4: /* f0f0cb4: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f0f0cb8: 3c01800a */ lui $at,0x800a +/* f0f0cb8: 3c01800a */ lui $at,%hi(g_MenuStack+0xdf8) /* f0f0cbc: 000e78c0 */ sll $t7,$t6,0x3 /* f0f0cc0: 01ee7823 */ subu $t7,$t7,$t6 /* f0f0cc4: 000f7880 */ sll $t7,$t7,0x2 @@ -646,7 +646,7 @@ glabel func0f0f0ca0 /* f0f0cd0: 01ee7823 */ subu $t7,$t7,$t6 /* f0f0cd4: 000f7900 */ sll $t7,$t7,0x4 /* f0f0cd8: 002f0821 */ addu $at,$at,$t7 -/* f0f0cdc: a024edf8 */ sb $a0,-0x1208($at) +/* f0f0cdc: a024edf8 */ sb $a0,%lo(g_MenuStack+0xdf8)($at) /* f0f0ce0: 03e00008 */ jr $ra /* f0f0ce4: 00000000 */ sll $zero,$zero,0x0 ); @@ -1074,8 +1074,8 @@ GLOBAL_ASM( glabel func0f0f1338 /* f0f1338: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f0f133c: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f0f1340: 3c18800a */ lui $t8,%hi(var8009e000) -/* f0f1344: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f0f1340: 3c18800a */ lui $t8,0x800a +/* f0f1344: 2718e000 */ addiu $t8,$t8,-8192 /* f0f1348: 000e78c0 */ sll $t7,$t6,0x3 /* f0f134c: 01ee7823 */ subu $t7,$t7,$t6 /* f0f1350: 000f7880 */ sll $t7,$t7,0x2 @@ -1147,7 +1147,7 @@ GLOBAL_ASM( glabel func0f0f1418 /* f0f1418: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f0f141c: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f0f1420: 3c18800a */ lui $t8,%hi(var8009e000) +/* f0f1420: 3c18800a */ lui $t8,0x800a /* f0f1424: 3c014270 */ lui $at,0x4270 /* f0f1428: 000e78c0 */ sll $t7,$t6,0x3 /* f0f142c: 01ee7823 */ subu $t7,$t7,$t6 @@ -1156,7 +1156,7 @@ glabel func0f0f1418 /* f0f1438: 000f78c0 */ sll $t7,$t7,0x3 /* f0f143c: 01ee7823 */ subu $t7,$t7,$t6 /* f0f1440: 000f7900 */ sll $t7,$t7,0x4 -/* f0f1444: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f0f1444: 2718e000 */ addiu $t8,$t8,-8192 /* f0f1448: 3c02800a */ lui $v0,%hi(g_Vars) /* f0f144c: 44810000 */ mtc1 $at,$f0 /* f0f1450: 24429fc0 */ addiu $v0,$v0,%lo(g_Vars) @@ -1184,8 +1184,8 @@ GLOBAL_ASM( glabel func0f0f1494 /* f0f1494: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f0f1498: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f0f149c: 3c18800a */ lui $t8,%hi(var8009e000) -/* f0f14a0: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f0f149c: 3c18800a */ lui $t8,0x800a +/* f0f14a0: 2718e000 */ addiu $t8,$t8,-8192 /* f0f14a4: 000e78c0 */ sll $t7,$t6,0x3 /* f0f14a8: 01ee7823 */ subu $t7,$t7,$t6 /* f0f14ac: 000f7880 */ sll $t7,$t7,0x2 @@ -2004,9 +2004,9 @@ glabel func0f0f1ef4 /* f0f1f60: 00006025 */ or $t4,$zero,$zero /* f0f1f64: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f0f1f68: 1a200068 */ blez $s1,.L0f0f210c -/* f0f1f6c: 3c19800a */ lui $t9,%hi(var8009e000) +/* f0f1f6c: 3c19800a */ lui $t9,0x800a /* f0f1f70: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f0f1f74: 2739e000 */ addiu $t9,$t9,%lo(var8009e000) +/* f0f1f74: 2739e000 */ addiu $t9,$t9,-8192 /* f0f1f78: 2410000a */ addiu $s0,$zero,0xa /* f0f1f7c: 000fc0c0 */ sll $t8,$t7,0x3 /* f0f1f80: 030fc023 */ subu $t8,$t8,$t7 @@ -2300,8 +2300,8 @@ glabel func0f0f2354 /* f0f2384: 0058082a */ slt $at,$v0,$t8 /* f0f2388: 10200051 */ beqz $at,.L0f0f24d0 /* f0f238c: 240d000a */ addiu $t5,$zero,0xa -/* f0f2390: 3c0b800a */ lui $t3,%hi(var8009e000) -/* f0f2394: 256be000 */ addiu $t3,$t3,%lo(var8009e000) +/* f0f2390: 3c0b800a */ lui $t3,0x800a +/* f0f2394: 256be000 */ addiu $t3,$t3,-8192 .L0f0f2398: /* f0f2398: 004d0019 */ multu $v0,$t5 /* f0f239c: 8d990000 */ lw $t9,0x0($t4) @@ -2391,8 +2391,8 @@ glabel func0f0f2354 /* f0f24dc: ace30000 */ sw $v1,0x0($a3) /* f0f24e0: 006d0019 */ multu $v1,$t5 /* f0f24e4: 8d990000 */ lw $t9,0x0($t4) -/* f0f24e8: 3c0b800a */ lui $t3,%hi(var8009e000) -/* f0f24ec: 256be000 */ addiu $t3,$t3,%lo(var8009e000) +/* f0f24e8: 3c0b800a */ lui $t3,0x800a +/* f0f24ec: 256be000 */ addiu $t3,$t3,-8192 /* f0f24f0: 001970c0 */ sll $t6,$t9,0x3 /* f0f24f4: 01d97023 */ subu $t6,$t6,$t9 /* f0f24f8: 000e7080 */ sll $t6,$t6,0x2 @@ -2543,7 +2543,7 @@ glabel func0f0f26fc /* f0f26fc: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f0f2700: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) /* f0f2704: 27bdffa0 */ addiu $sp,$sp,-96 -/* f0f2708: 3c18800a */ lui $t8,%hi(var8009e000) +/* f0f2708: 3c18800a */ lui $t8,0x800a /* f0f270c: 000e78c0 */ sll $t7,$t6,0x3 /* f0f2710: 01ee7823 */ subu $t7,$t7,$t6 /* f0f2714: 000f7880 */ sll $t7,$t7,0x2 @@ -2553,7 +2553,7 @@ glabel func0f0f26fc /* f0f2724: 01ee7823 */ subu $t7,$t7,$t6 /* f0f2728: 000f7900 */ sll $t7,$t7,0x4 /* f0f272c: 01054021 */ addu $t0,$t0,$a1 -/* f0f2730: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f0f2730: 2718e000 */ addiu $t8,$t8,-8192 /* f0f2734: 01f81821 */ addu $v1,$t7,$t8 /* f0f2738: 00084040 */ sll $t0,$t0,0x1 /* f0f273c: 00681021 */ addu $v0,$v1,$t0 @@ -2606,8 +2606,8 @@ glabel func0f0f26fc .L0f0f27f4: /* f0f27f4: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f0f27f8: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f0f27fc: 3c19800a */ lui $t9,%hi(var8009e000) -/* f0f2800: 2739e000 */ addiu $t9,$t9,%lo(var8009e000) +/* f0f27fc: 3c19800a */ lui $t9,0x800a +/* f0f2800: 2739e000 */ addiu $t9,$t9,-8192 /* f0f2804: 000fc0c0 */ sll $t8,$t7,0x3 /* f0f2808: 030fc023 */ subu $t8,$t8,$t7 /* f0f280c: 0018c080 */ sll $t8,$t8,0x2 @@ -2763,8 +2763,8 @@ glabel func0f0f29cc /* f0f2a10: 27a70058 */ addiu $a3,$sp,0x58 /* f0f2a14: 8fa5005c */ lw $a1,0x5c($sp) /* f0f2a18: 3c168007 */ lui $s6,%hi(g_MpPlayerNum) -/* f0f2a1c: 3c15800a */ lui $s5,%hi(var8009e000) -/* f0f2a20: 26b5e000 */ addiu $s5,$s5,%lo(var8009e000) +/* f0f2a1c: 3c15800a */ lui $s5,0x800a +/* f0f2a20: 26b5e000 */ addiu $s5,$s5,-8192 /* f0f2a24: 26d61448 */ addiu $s6,$s6,%lo(g_MpPlayerNum) /* f0f2a28: 241e0014 */ addiu $s8,$zero,0x14 /* f0f2a2c: 2417000a */ addiu $s7,$zero,0xa @@ -3021,10 +3021,10 @@ glabel var7f1b2928 /* f0f2d90: 0c004b70 */ jal random /* f0f2d94: a238003c */ sb $t8,0x3c($s1) /* f0f2d98: 44824000 */ mtc1 $v0,$f8 -/* f0f2d9c: 3c03800a */ lui $v1,%hi(var8009e000) +/* f0f2d9c: 3c03800a */ lui $v1,0x800a /* f0f2da0: 3c058007 */ lui $a1,%hi(g_MpPlayerNum) /* f0f2da4: 24a51448 */ addiu $a1,$a1,%lo(g_MpPlayerNum) -/* f0f2da8: 2463e000 */ addiu $v1,$v1,%lo(var8009e000) +/* f0f2da8: 2463e000 */ addiu $v1,$v1,-8192 /* f0f2dac: 24060e70 */ addiu $a2,$zero,0xe70 /* f0f2db0: 04410005 */ bgez $v0,.L0f0f2dc8 /* f0f2db4: 468042a0 */ cvt.s.w $f10,$f8 @@ -3156,9 +3156,9 @@ glabel menuPushDialog /* f0f2f84: 26b51448 */ addiu $s5,$s5,%lo(g_MpPlayerNum) /* f0f2f88: 8eaf0000 */ lw $t7,0x0($s5) /* f0f2f8c: 24160e70 */ addiu $s6,$zero,0xe70 -/* f0f2f90: 3c14800a */ lui $s4,%hi(var8009e000) +/* f0f2f90: 3c14800a */ lui $s4,0x800a /* f0f2f94: 01f60019 */ multu $t7,$s6 -/* f0f2f98: 2694e000 */ addiu $s4,$s4,%lo(var8009e000) +/* f0f2f98: 2694e000 */ addiu $s4,$s4,-8192 /* f0f2f9c: 0000c012 */ mflo $t8 /* f0f2fa0: 02982021 */ addu $a0,$s4,$t8 /* f0f2fa4: 0fc3cde9 */ jal func0f0f37a4 @@ -3333,9 +3333,9 @@ glabel menuPushDialog GLOBAL_ASM( glabel func0f0f3220 -/* f0f3220: 3c03800a */ lui $v1,0x800a +/* f0f3220: 3c03800a */ lui $v1,%hi(var800a2028+0x1) /* f0f3224: 00641821 */ addu $v1,$v1,$a0 -/* f0f3228: 90632029 */ lbu $v1,0x2029($v1) +/* f0f3228: 90632029 */ lbu $v1,%lo(var800a2028+0x1)($v1) /* f0f322c: 27bdffd8 */ addiu $sp,$sp,-40 /* f0f3230: 24010004 */ addiu $at,$zero,0x4 /* f0f3234: afbf0014 */ sw $ra,0x14($sp) @@ -3343,9 +3343,9 @@ glabel func0f0f3220 /* f0f323c: 24080001 */ addiu $t0,$zero,0x1 /* f0f3240: 3c078007 */ lui $a3,%hi(g_MpPlayerNum) /* f0f3244: 24e71448 */ addiu $a3,$a3,%lo(g_MpPlayerNum) -/* f0f3248: 3c03800a */ lui $v1,%hi(var800a0b50) +/* f0f3248: 3c03800a */ lui $v1,%hi(g_MenuStack+0x2b50) /* f0f324c: 8ce90000 */ lw $t1,0x0($a3) -/* f0f3250: 24630b50 */ addiu $v1,$v1,%lo(var800a0b50) +/* f0f3250: 24630b50 */ addiu $v1,$v1,%lo(g_MenuStack+0x2b50) /* f0f3254: 24020003 */ addiu $v0,$zero,0x3 .L0f0f3258: /* f0f3258: 8c6e04f8 */ lw $t6,0x4f8($v1) @@ -3357,8 +3357,8 @@ glabel func0f0f3220 /* f0f326c: 0441fffa */ bgez $v0,.L0f0f3258 /* f0f3270: 2463f190 */ addiu $v1,$v1,-3696 /* f0f3274: 8ce20000 */ lw $v0,0x0($a3) -/* f0f3278: 3c18800a */ lui $t8,%hi(var8009e000) -/* f0f327c: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f0f3278: 3c18800a */ lui $t8,0x800a +/* f0f327c: 2718e000 */ addiu $t8,$t8,-8192 /* f0f3280: 000278c0 */ sll $t7,$v0,0x3 /* f0f3284: 01e27823 */ subu $t7,$t7,$v0 /* f0f3288: 000f7880 */ sll $t7,$t7,0x2 @@ -3434,11 +3434,11 @@ glabel func0f0f3220 /* f0f338c: acf90000 */ sw $t9,0x0($a3) .L0f0f3390: /* f0f3390: 11000005 */ beqz $t0,.L0f0f33a8 -/* f0f3394: 3c0a800a */ lui $t2,0x800a -/* f0f3398: 814a202e */ lb $t2,0x202e($t2) -/* f0f339c: 3c01800a */ lui $at,0x800a +/* f0f3394: 3c0a800a */ lui $t2,%hi(var800a202c+0x2) +/* f0f3398: 814a202e */ lb $t2,%lo(var800a202c+0x2)($t2) +/* f0f339c: 3c01800a */ lui $at,%hi(var800a202c+0x2) /* f0f33a0: 254bffff */ addiu $t3,$t2,-1 -/* f0f33a4: a02b202e */ sb $t3,0x202e($at) +/* f0f33a4: a02b202e */ sb $t3,%lo(var800a202c+0x2)($at) .L0f0f33a8: /* f0f33a8: 8fbf0014 */ lw $ra,0x14($sp) /* f0f33ac: 27bd0028 */ addiu $sp,$sp,0x28 @@ -3452,7 +3452,7 @@ glabel func0f0f33bc /* f0f33bc: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f0f33c0: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) /* f0f33c4: 27bdffa0 */ addiu $sp,$sp,-96 -/* f0f33c8: 3c18800a */ lui $t8,%hi(var8009e000) +/* f0f33c8: 3c18800a */ lui $t8,0x800a /* f0f33cc: 000e78c0 */ sll $t7,$t6,0x3 /* f0f33d0: 01ee7823 */ subu $t7,$t7,$t6 /* f0f33d4: 000f7880 */ sll $t7,$t7,0x2 @@ -3461,7 +3461,7 @@ glabel func0f0f33bc /* f0f33e0: 01ee7823 */ subu $t7,$t7,$t6 /* f0f33e4: afb1001c */ sw $s1,0x1c($sp) /* f0f33e8: 000f7900 */ sll $t7,$t7,0x4 -/* f0f33ec: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f0f33ec: 2718e000 */ addiu $t8,$t8,-8192 /* f0f33f0: 01f88821 */ addu $s1,$t7,$t8 /* f0f33f4: 862304f4 */ lh $v1,0x4f4($s1) /* f0f33f8: afbf002c */ sw $ra,0x2c($sp) @@ -3503,8 +3503,8 @@ glabel func0f0f33bc /* f0f3480: afa00050 */ sw $zero,0x50($sp) /* f0f3484: 3c0a8007 */ lui $t2,%hi(g_MpPlayerNum) /* f0f3488: 8d4a1448 */ lw $t2,%lo(g_MpPlayerNum)($t2) -/* f0f348c: 3c0c800a */ lui $t4,%hi(var8009e000) -/* f0f3490: 258ce000 */ addiu $t4,$t4,%lo(var8009e000) +/* f0f348c: 3c0c800a */ lui $t4,0x800a +/* f0f3490: 258ce000 */ addiu $t4,$t4,-8192 /* f0f3494: 000a58c0 */ sll $t3,$t2,0x3 /* f0f3498: 016a5823 */ subu $t3,$t3,$t2 /* f0f349c: 000b5880 */ sll $t3,$t3,0x2 @@ -3548,8 +3548,8 @@ glabel func0f0f33bc /* f0f3528: ae2e081c */ sw $t6,0x81c($s1) /* f0f352c: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f0f3530: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) -/* f0f3534: 3c09800a */ lui $t1,%hi(var8009e000) -/* f0f3538: 2529e000 */ addiu $t1,$t1,%lo(var8009e000) +/* f0f3534: 3c09800a */ lui $t1,0x800a +/* f0f3538: 2529e000 */ addiu $t1,$t1,-8192 /* f0f353c: 001940c0 */ sll $t0,$t9,0x3 /* f0f3540: 01194023 */ subu $t0,$t0,$t9 /* f0f3544: 00084080 */ sll $t0,$t0,0x2 @@ -3560,8 +3560,8 @@ glabel func0f0f33bc /* f0f3558: 01098821 */ addu $s1,$t0,$t1 /* f0f355c: 862304f4 */ lh $v1,0x4f4($s1) .L0f0f3560: -/* f0f3560: 3c02800a */ lui $v0,%hi(var800a044c) -/* f0f3564: 8042202e */ lb $v0,0x202e($v0) +/* f0f3560: 3c02800a */ lui $v0,%hi(var800a202c+0x2) +/* f0f3564: 8042202e */ lb $v0,%lo(var800a202c+0x2)($v0) /* f0f3568: 18400017 */ blez $v0,.L0f0f35c8 /* f0f356c: 00000000 */ sll $zero,$zero,0x0 /* f0f3570: 14600015 */ bnez $v1,.L0f0f35c8 @@ -3576,8 +3576,8 @@ glabel func0f0f33bc /* f0f3590: 00000000 */ sll $zero,$zero,0x0 /* f0f3594: 3c0a8007 */ lui $t2,%hi(g_MpPlayerNum) /* f0f3598: 8d4a1448 */ lw $t2,%lo(g_MpPlayerNum)($t2) -/* f0f359c: 3c0c800a */ lui $t4,%hi(var8009e000) -/* f0f35a0: 258ce000 */ addiu $t4,$t4,%lo(var8009e000) +/* f0f359c: 3c0c800a */ lui $t4,0x800a +/* f0f35a0: 258ce000 */ addiu $t4,$t4,-8192 /* f0f35a4: 000a58c0 */ sll $t3,$t2,0x3 /* f0f35a8: 016a5823 */ subu $t3,$t3,$t2 /* f0f35ac: 000b5880 */ sll $t3,$t3,0x2 @@ -3597,7 +3597,7 @@ glabel func0f0f33bc /* f0f35dc: 000d68c0 */ sll $t5,$t5,0x3 /* f0f35e0: 022d1021 */ addu $v0,$s1,$t5 /* f0f35e4: 804e0461 */ lb $t6,0x461($v0) -/* f0f35e8: 2442044c */ addiu $v0,$v0,%lo(var800a044c) +/* f0f35e8: 2442044c */ addiu $v0,$v0,1100 /* f0f35ec: 000e7880 */ sll $t7,$t6,0x2 /* f0f35f0: 004fc021 */ addu $t8,$v0,$t7 /* f0f35f4: 8f190000 */ lw $t9,0x0($t8) @@ -3618,8 +3618,8 @@ GLOBAL_ASM( glabel func0f0f361c /* f0f361c: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f0f3620: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f0f3624: 3c18800a */ lui $t8,%hi(var8009e000) -/* f0f3628: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f0f3624: 3c18800a */ lui $t8,0x800a +/* f0f3628: 2718e000 */ addiu $t8,$t8,-8192 /* f0f362c: 000e78c0 */ sll $t7,$t6,0x3 /* f0f3630: 01ee7823 */ subu $t7,$t7,$t6 /* f0f3634: 000f7880 */ sll $t7,$t7,0x2 @@ -3633,14 +3633,14 @@ glabel func0f0f361c /* f0f3654: afbf0014 */ sw $ra,0x14($sp) /* f0f3658: 14800013 */ bnez $a0,.L0f0f36a8 /* f0f365c: 00045880 */ sll $t3,$a0,0x2 -/* f0f3660: 3c08800a */ lui $t0,0x800a -/* f0f3664: 8d08a244 */ lw $t0,-0x5dbc($t0) +/* f0f3660: 3c08800a */ lui $t0,%hi(g_Vars+0x284) +/* f0f3664: 8d08a244 */ lw $t0,%lo(g_Vars+0x284)($t0) /* f0f3668: 2419ffff */ addiu $t9,$zero,-1 /* f0f366c: 0fc3e010 */ jal func0f0f8040 /* f0f3670: ad191c40 */ sw $t9,0x1c40($t0) /* f0f3674: 3c098007 */ lui $t1,%hi(g_MpPlayerNum) /* f0f3678: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) -/* f0f367c: 3c01800a */ lui $at,0x800a +/* f0f367c: 3c01800a */ lui $at,%hi(g_MenuStack+0x4f8) /* f0f3680: 000950c0 */ sll $t2,$t1,0x3 /* f0f3684: 01495023 */ subu $t2,$t2,$t1 /* f0f3688: 000a5080 */ sll $t2,$t2,0x2 @@ -3650,7 +3650,7 @@ glabel func0f0f361c /* f0f3698: 000a5100 */ sll $t2,$t2,0x4 /* f0f369c: 002a0821 */ addu $at,$at,$t2 /* f0f36a0: 1000000a */ beqz $zero,.L0f0f36cc -/* f0f36a4: ac20e4f8 */ sw $zero,-0x1b08($at) +/* f0f36a4: ac20e4f8 */ sw $zero,%lo(g_MenuStack+0x4f8)($at) .L0f0f36a8: /* f0f36a8: 01645823 */ subu $t3,$t3,$a0 /* f0f36ac: 000b58c0 */ sll $t3,$t3,0x3 @@ -3826,8 +3826,8 @@ glabel var7f1b2948 .word 0x40490fdb .text /* f0f38b0: 27bdfbc0 */ addiu $sp,$sp,-1088 -/* f0f38b4: 3c02800a */ lui $v0,0x800a -/* f0f38b8: 8c42a474 */ lw $v0,-0x5b8c($v0) +/* f0f38b4: 3c02800a */ lui $v0,%hi(g_Vars+0x4b4) +/* f0f38b8: 8c42a474 */ lw $v0,%lo(g_Vars+0x4b4)($v0) /* f0f38bc: afb00024 */ sw $s0,0x24($sp) /* f0f38c0: 24010026 */ addiu $at,$zero,0x26 /* f0f38c4: 00a08025 */ or $s0,$a1,$zero @@ -3838,8 +3838,8 @@ glabel var7f1b2948 /* f0f38d8: afa60448 */ sw $a2,0x448($sp) /* f0f38dc: 2401005c */ addiu $at,$zero,0x5c /* f0f38e0: 1041001a */ beq $v0,$at,.L0f0f394c -/* f0f38e4: 3c0e800a */ lui $t6,0x800a -/* f0f38e8: 81cf1f95 */ lb $t7,0x1f95($t6) +/* f0f38e4: 3c0e800a */ lui $t6,%hi(var800a1f94+0x1) +/* f0f38e8: 81cf1f95 */ lb $t7,%lo(var800a1f94+0x1)($t6) /* f0f38ec: 24010001 */ addiu $at,$zero,0x1 /* f0f38f0: 05e30008 */ bgezl $t7,.L0f0f3914 /* f0f38f4: 8e190004 */ lw $t9,0x4($s0) @@ -4145,12 +4145,12 @@ glabel var7f1b2948 /* f0f3d48: afa20440 */ sw $v0,0x440($sp) /* f0f3d4c: 0c002c74 */ jal func0000b1d0 /* f0f3d50: 00402025 */ or $a0,$v0,$zero -/* f0f3d54: 3c0e800a */ lui $t6,0x800a -/* f0f3d58: 91ce1f95 */ lbu $t6,0x1f95($t6) +/* f0f3d54: 3c0e800a */ lui $t6,%hi(var800a1f94+0x1) +/* f0f3d58: 91ce1f95 */ lbu $t6,%lo(var800a1f94+0x1)($t6) /* f0f3d5c: 8fac0448 */ lw $t4,0x448($sp) -/* f0f3d60: 3c01800a */ lui $at,0x800a +/* f0f3d60: 3c01800a */ lui $at,%hi(var800a1f94+0x1) /* f0f3d64: 31cdffdf */ andi $t5,$t6,0xffdf -/* f0f3d68: a02d1f95 */ sb $t5,0x1f95($at) +/* f0f3d68: a02d1f95 */ sb $t5,%lo(var800a1f94+0x1)($at) /* f0f3d6c: 24010002 */ addiu $at,$zero,0x2 /* f0f3d70: 11810003 */ beq $t4,$at,.L0f0f3d80 /* f0f3d74: afa20440 */ sw $v0,0x440($sp) @@ -4823,7 +4823,7 @@ glabel var7f1b2948 /* f0f4748: 5020006f */ beqzl $at,.L0f0f4908 /* f0f474c: 8e0a0054 */ lw $t2,0x54($s0) /* f0f4750: 11a0000e */ beqz $t5,.L0f0f478c -/* f0f4754: 3c11800a */ lui $s1,%hi(var800a2038) +/* f0f4754: 3c11800a */ lui $s1,%hi(g_MenuStack+0x2004) /* f0f4758: 0fc35272 */ jal func0f0d49c8 /* f0f475c: 00402025 */ or $a0,$v0,$zero /* f0f4760: 244c0008 */ addiu $t4,$v0,0x8 @@ -4836,9 +4836,9 @@ glabel var7f1b2948 /* f0f477c: 0c012d20 */ jal osVirtualToPhysical /* f0f4780: 00402025 */ or $a0,$v0,$zero /* f0f4784: 1000005f */ beqz $zero,.L0f0f4904 -/* f0f4788: ae220004 */ sw $v0,0x4($s1) +/* f0f4788: ae220004 */ sw $v0,%lo(g_MenuStack+0x2004)($s1) .L0f0f478c: -/* f0f478c: 26312038 */ addiu $s1,$s1,%lo(var800a2038) +/* f0f478c: 26312038 */ addiu $s1,$s1,8248 /* f0f4790: 3c18800a */ lui $t8,%hi(var800a203c) /* f0f4794: 3c0b800a */ lui $t3,%hi(var800a2044) /* f0f4798: 3c0e800a */ lui $t6,%hi(var800a2040) @@ -4869,10 +4869,10 @@ glabel var7f1b2948 /* f0f47fc: 3c0f8008 */ lui $t7,%hi(var8007fac0) /* f0f4800: 8deffac0 */ lw $t7,%lo(var8007fac0)($t7) /* f0f4804: 8e2c0000 */ lw $t4,0x0($s1) -/* f0f4808: 3c05800a */ lui $a1,0x800a +/* f0f4808: 3c05800a */ lui $a1,%hi(var800a2040+0x2) /* f0f480c: afa20440 */ sw $v0,0x440($sp) /* f0f4810: 018f0019 */ multu $t4,$t7 -/* f0f4814: 84a52042 */ lh $a1,0x2042($a1) +/* f0f4814: 84a52042 */ lh $a1,%lo(var800a2040+0x2)($a1) /* f0f4818: 00002012 */ mflo $a0 /* f0f481c: 0004c400 */ sll $t8,$a0,0x10 /* f0f4820: 0c002f2a */ jal func0000bca8 @@ -4883,9 +4883,9 @@ glabel var7f1b2948 /* f0f4834: 3c0c8008 */ lui $t4,%hi(var8007fac0) /* f0f4838: 8d8cfac0 */ lw $t4,%lo(var8007fac0)($t4) /* f0f483c: 016e6823 */ subu $t5,$t3,$t6 -/* f0f4840: 3c0a800a */ lui $t2,0x800a +/* f0f4840: 3c0a800a */ lui $t2,%hi(g_Vars+0x284) /* f0f4844: 01ac0019 */ multu $t5,$t4 -/* f0f4848: 8d4aa244 */ lw $t2,-0x5dbc($t2) +/* f0f4848: 8d4aa244 */ lw $t2,%lo(g_Vars+0x284)($t2) /* f0f484c: 3c19800a */ lui $t9,%hi(var800a2044) /* f0f4850: 8f392044 */ lw $t9,%lo(var800a2044)($t9) /* f0f4854: c54c1854 */ lwc1 $f12,0x1854($t2) @@ -5007,8 +5007,8 @@ glabel var7f1b2948 .L0f0f4a00: /* f0f4a00: a600005c */ sh $zero,0x5c($s0) /* f0f4a04: 13000023 */ beqz $t8,.L0f0f4a94 -/* f0f4a08: 3c05800a */ lui $a1,0x800a -/* f0f4a0c: 8ca5a000 */ lw $a1,-0x6000($a1) +/* f0f4a08: 3c05800a */ lui $a1,%hi(g_Vars+0x40) +/* f0f4a0c: 8ca5a000 */ lw $a1,%lo(g_Vars+0x40)($a1) /* f0f4a10: 8fa4003c */ lw $a0,0x3c($sp) /* f0f4a14: 0c007b86 */ jal func0001ee18 /* f0f4a18: 24060001 */ addiu $a2,$zero,0x1 @@ -5150,8 +5150,8 @@ glabel var7f1b2948 /* f0f4c10: 24050001 */ addiu $a1,$zero,0x1 /* f0f4c14: 1040003f */ beqz $v0,.L0f0f4d14 /* f0f4c18: 00402025 */ or $a0,$v0,$zero -/* f0f4c1c: 3c02800a */ lui $v0,%hi(var800a0040) -/* f0f4c20: 8c4219c4 */ lw $v0,0x19c4($v0) +/* f0f4c1c: 3c02800a */ lui $v0,%hi(var800a19c4) +/* f0f4c20: 8c4219c4 */ lw $v0,%lo(var800a19c4)($v0) /* f0f4c24: 24010002 */ addiu $at,$zero,0x2 /* f0f4c28: 10410007 */ beq $v0,$at,.L0f0f4c48 /* f0f4c2c: 24010006 */ addiu $at,$zero,0x6 @@ -5201,9 +5201,9 @@ glabel var7f1b2948 /* f0f4cd0: 00000000 */ sll $zero,$zero,0x0 /* f0f4cd4: 0006000d */ break 0x6 .L0f0f4cd8: -/* f0f4cd8: 3c01800a */ lui $at,0x800a +/* f0f4cd8: 3c01800a */ lui $at,%hi(var8009de98) /* f0f4cdc: 00005812 */ mflo $t3 -/* f0f4ce0: ac2bde98 */ sw $t3,-0x2168($at) +/* f0f4ce0: ac2bde98 */ sw $t3,%lo(var8009de98)($at) /* f0f4ce4: 0c002f06 */ jal func0000bc18 /* f0f4ce8: 00000000 */ sll $zero,$zero,0x0 /* f0f4cec: c7aa00cc */ lwc1 $f10,0xcc($sp) @@ -5214,9 +5214,9 @@ glabel var7f1b2948 /* f0f4d00: 24410001 */ addiu $at,$v0,0x1 /* f0f4d04: 00016043 */ sra $t4,$at,0x1 .L0f0f4d08: -/* f0f4d08: 3c01800a */ lui $at,0x800a +/* f0f4d08: 3c01800a */ lui $at,%hi(var8009de9c) /* f0f4d0c: 01cc7823 */ subu $t7,$t6,$t4 -/* f0f4d10: ac2fde9c */ sw $t7,-0x2164($at) +/* f0f4d10: ac2fde9c */ sw $t7,%lo(var8009de9c)($at) .L0f0f4d14: /* f0f4d14: 8fb80440 */ lw $t8,0x440($sp) .L0f0f4d18: @@ -5309,7 +5309,7 @@ glabel var7f1b2948 /* f0f4e6c: 8fa20040 */ lw $v0,0x40($sp) /* f0f4e70: 26310001 */ addiu $s1,$s1,0x1 /* f0f4e74: 872b000e */ lh $t3,0xe($t9) -/* f0f4e78: 24420040 */ addiu $v0,$v0,%lo(var800a0040) +/* f0f4e78: 24420040 */ addiu $v0,$v0,64 /* f0f4e7c: 022b082a */ slt $at,$s1,$t3 /* f0f4e80: 5420fff0 */ bnezl $at,.L0f0f4e44 /* f0f4e84: 8e0f006c */ lw $t7,0x6c($s0) @@ -5734,7 +5734,7 @@ glabel func0f0f5360 /* f0f5490: 8fa401bc */ lw $a0,0x1bc($sp) /* f0f5494: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f0f5498: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f0f549c: 3c0b800a */ lui $t3,%hi(var8009e000) +/* f0f549c: 3c0b800a */ lui $t3,0x800a /* f0f54a0: 3c018008 */ lui $at,0x8008 /* f0f54a4: 000fc0c0 */ sll $t8,$t7,0x3 /* f0f54a8: 030fc023 */ subu $t8,$t8,$t7 @@ -5743,7 +5743,7 @@ glabel func0f0f5360 /* f0f54b4: 0018c0c0 */ sll $t8,$t8,0x3 /* f0f54b8: 030fc023 */ subu $t8,$t8,$t7 /* f0f54bc: 0018c100 */ sll $t8,$t8,0x4 -/* f0f54c0: 256be000 */ addiu $t3,$t3,%lo(var8009e000) +/* f0f54c0: 256be000 */ addiu $t3,$t3,-8192 /* f0f54c4: ac20fb9c */ sw $zero,-0x464($at) /* f0f54c8: 030b1821 */ addu $v1,$t8,$t3 /* f0f54cc: 8fa701ec */ lw $a3,0x1ec($sp) @@ -5772,8 +5772,8 @@ glabel func0f0f5360 /* f0f5528: adae0000 */ sw $t6,0x0($t5) /* f0f552c: 3c188007 */ lui $t8,%hi(g_MpPlayerNum) /* f0f5530: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f0f5534: 3c0d800a */ lui $t5,%hi(var8009e000) -/* f0f5538: 25ade000 */ addiu $t5,$t5,%lo(var8009e000) +/* f0f5534: 3c0d800a */ lui $t5,0x800a +/* f0f5538: 25ade000 */ addiu $t5,$t5,-8192 /* f0f553c: 001858c0 */ sll $t3,$t8,0x3 /* f0f5540: 01785823 */ subu $t3,$t3,$t8 /* f0f5544: 000b5880 */ sll $t3,$t3,0x2 @@ -5982,11 +5982,11 @@ glabel func0f0f5360 /* f0f583c: 364c003f */ ori $t4,$s2,0x3f /* f0f5840: 01809025 */ or $s2,$t4,$zero .L0f0f5844: -/* f0f5844: 3c01800a */ lui $at,0x800a -/* f0f5848: ac39de90 */ sw $t9,-0x2170($at) -/* f0f584c: 3c01800a */ lui $at,0x800a +/* f0f5844: 3c01800a */ lui $at,%hi(var8009de90) +/* f0f5848: ac39de90 */ sw $t9,%lo(var8009de90)($at) +/* f0f584c: 3c01800a */ lui $at,%hi(var8009de94) /* f0f5850: 240f03e8 */ addiu $t7,$zero,0x3e8 -/* f0f5854: ac2fde94 */ sw $t7,-0x216c($at) +/* f0f5854: ac2fde94 */ sw $t7,%lo(var8009de94)($at) /* f0f5858: 8cee0000 */ lw $t6,0x0($a3) /* f0f585c: 3c03800a */ lui $v1,%hi(var800a19c4) /* f0f5860: 8dc40010 */ lw $a0,0x10($t6) @@ -6104,8 +6104,8 @@ glabel func0f0f5360 /* f0f5a14: 2401000b */ addiu $at,$zero,0xb /* f0f5a18: 1461000c */ bne $v1,$at,.L0f0f5a4c .L0f0f5a1c: -/* f0f5a1c: 3c18800b */ lui $t8,0x800b -/* f0f5a20: 8f18cb94 */ lw $t8,-0x346c($t8) +/* f0f5a1c: 3c18800b */ lui $t8,%hi(g_MpSetup+0xc) +/* f0f5a20: 8f18cb94 */ lw $t8,%lo(g_MpSetup+0xc)($t8) /* f0f5a24: 330c0002 */ andi $t4,$t8,0x2 /* f0f5a28: 51800009 */ beqzl $t4,.L0f0f5a50 /* f0f5a2c: 8fa301e0 */ lw $v1,0x1e0($sp) @@ -6677,10 +6677,10 @@ glabel func0f0f5360 /* f0f6284: 25082038 */ addiu $t0,$t0,%lo(var800a2038) /* f0f6288: 3c0a800a */ lui $t2,%hi(var800a203c) /* f0f628c: ad120000 */ sw $s2,0x0($t0) -/* f0f6290: 3c01800a */ lui $at,0x800a +/* f0f6290: 3c01800a */ lui $at,%hi(var800a203c) /* f0f6294: 258bfffe */ addiu $t3,$t4,-2 /* f0f6298: 254a203c */ addiu $t2,$t2,%lo(var800a203c) -/* f0f629c: ac2b203c */ sw $t3,0x203c($at) +/* f0f629c: ac2b203c */ sw $t3,%lo(var800a203c)($at) /* f0f62a0: 8fae01d4 */ lw $t6,0x1d4($sp) /* f0f62a4: 8d440000 */ lw $a0,0x0($t2) /* f0f62a8: 3c03800a */ lui $v1,%hi(var800a2044) @@ -6725,8 +6725,8 @@ glabel func0f0f5360 /* f0f6334: 0065082a */ slt $at,$v1,$a1 .L0f0f6338: /* f0f6338: 10200004 */ beqz $at,.L0f0f634c -/* f0f633c: 3c01800a */ lui $at,0x800a -/* f0f6340: ac232044 */ sw $v1,0x2044($at) +/* f0f633c: 3c01800a */ lui $at,%hi(var800a2044) +/* f0f6340: ac232044 */ sw $v1,%lo(var800a2044)($at) /* f0f6344: 3c05800a */ lui $a1,%hi(var800a2044) /* f0f6348: 8ca52044 */ lw $a1,%lo(var800a2044)($a1) .L0f0f634c: @@ -6740,16 +6740,16 @@ glabel func0f0f5360 /* f0f6364: 00000000 */ sll $zero,$zero,0x0 /* f0f6368: ad540000 */ sw $s4,0x0($t2) .L0f0f636c: -/* f0f636c: 3c01800a */ lui $at,0x800a -/* f0f6370: ac27de90 */ sw $a3,-0x2170($at) -/* f0f6374: 3c01800a */ lui $at,0x800a -/* f0f6378: ac25de94 */ sw $a1,-0x216c($at) +/* f0f636c: 3c01800a */ lui $at,%hi(var8009de90) +/* f0f6370: ac27de90 */ sw $a3,%lo(var8009de90)($at) +/* f0f6374: 3c01800a */ lui $at,%hi(var8009de94) +/* f0f6378: ac25de94 */ sw $a1,%lo(var8009de94)($at) /* f0f637c: 0fc3d43f */ jal func0f0f50fc /* f0f6380: 8fa401e8 */ lw $a0,0x1e8($sp) /* f0f6384: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f0f6388: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) -/* f0f638c: 3c0d800a */ lui $t5,%hi(var8009e000) -/* f0f6390: 25ade000 */ addiu $t5,$t5,%lo(var8009e000) +/* f0f638c: 3c0d800a */ lui $t5,0x800a +/* f0f6390: 25ade000 */ addiu $t5,$t5,-8192 /* f0f6394: 001978c0 */ sll $t7,$t9,0x3 /* f0f6398: 01f97823 */ subu $t7,$t7,$t9 /* f0f639c: 000f7880 */ sll $t7,$t7,0x2 @@ -6780,8 +6780,8 @@ glabel func0f0f5360 /* f0f6400: ac4b0000 */ sw $t3,0x0($v0) /* f0f6404: ac4e0004 */ sw $t6,0x4($v0) /* f0f6408: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f0f640c: 3c0d800a */ lui $t5,%hi(var8009e000) -/* f0f6410: 25ade000 */ addiu $t5,$t5,%lo(var8009e000) +/* f0f640c: 3c0d800a */ lui $t5,0x800a +/* f0f6410: 25ade000 */ addiu $t5,$t5,-8192 /* f0f6414: 0018c8c0 */ sll $t9,$t8,0x3 /* f0f6418: 0338c823 */ subu $t9,$t9,$t8 /* f0f641c: 0019c880 */ sll $t9,$t9,0x2 @@ -7579,8 +7579,8 @@ glabel func0f0f5360 .L0f0f6fe4: /* f0f6fe4: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f0f6fe8: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f0f6fec: 3c18800a */ lui $t8,%hi(var8009e000) -/* f0f6ff0: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f0f6fec: 3c18800a */ lui $t8,0x800a +/* f0f6ff0: 2718e000 */ addiu $t8,$t8,-8192 /* f0f6ff4: 000f58c0 */ sll $t3,$t7,0x3 /* f0f6ff8: 016f5823 */ subu $t3,$t3,$t7 /* f0f6ffc: 000b5880 */ sll $t3,$t3,0x2 @@ -7945,8 +7945,8 @@ glabel var7f1b296c /* f0f74f8: 10000022 */ beqz $zero,.L0f0f7584 /* f0f74fc: a1190000 */ sb $t9,0x0($t0) .L0f0f7500: -/* f0f7500: 3c09800a */ lui $t1,0x800a -/* f0f7504: 8d29a248 */ lw $t1,-0x5db8($t1) +/* f0f7500: 3c09800a */ lui $t1,%hi(g_Vars+0x288) +/* f0f7504: 8d29a248 */ lw $t1,%lo(g_Vars+0x288)($t1) /* f0f7508: 8d240070 */ lw $a0,0x70($t1) /* f0f750c: 0fc549d2 */ jal optionsGetUnk45 /* f0f7510: afa60018 */ sw $a2,0x18($sp) @@ -7965,7 +7965,7 @@ glabel var7f1b296c /* f0f7544: 8da40070 */ lw $a0,0x70($t5) /* f0f7548: 24010006 */ addiu $at,$zero,0x6 /* f0f754c: 10410008 */ beq $v0,$at,.L0f0f7570 -/* f0f7550: 3c0e800a */ lui $t6,0x800a +/* f0f7550: 3c0e800a */ lui $t6,%hi(g_Vars+0x288) /* f0f7554: 24010007 */ addiu $at,$zero,0x7 /* f0f7558: 10410005 */ beq $v0,$at,.L0f0f7570 /* f0f755c: 24010005 */ addiu $at,$zero,0x5 @@ -7974,7 +7974,7 @@ glabel var7f1b296c /* f0f7568: 54410007 */ bnel $v0,$at,.L0f0f7588 /* f0f756c: 8fbf0014 */ lw $ra,0x14($sp) .L0f0f7570: -/* f0f7570: 8dcea248 */ lw $t6,-0x5db8($t6) +/* f0f7570: 8dcea248 */ lw $t6,%lo(g_Vars+0x288)($t6) /* f0f7574: 0fc549d9 */ jal optionsGetUnk46 /* f0f7578: 8dc40070 */ lw $a0,0x70($t6) /* f0f757c: 8faf001c */ lw $t7,0x1c($sp) @@ -7996,7 +7996,7 @@ glabel func0f0f7594 /* f0f75a4: 55c1005d */ bnel $t6,$at,.L0f0f771c /* f0f75a8: aca00000 */ sw $zero,0x0($a1) /* f0f75ac: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f0f75b0: 3c02800a */ lui $v0,0x800a +/* f0f75b0: 3c02800a */ lui $v0,%hi(g_MenuStack+0x83b) /* f0f75b4: 3c038007 */ lui $v1,%hi(var800714d8) /* f0f75b8: 000fc0c0 */ sll $t8,$t7,0x3 /* f0f75bc: 030fc023 */ subu $t8,$t8,$t7 @@ -8006,7 +8006,7 @@ glabel func0f0f7594 /* f0f75cc: 030fc023 */ subu $t8,$t8,$t7 /* f0f75d0: 0018c100 */ sll $t8,$t8,0x4 /* f0f75d4: 00581021 */ addu $v0,$v0,$t8 -/* f0f75d8: 9042e83b */ lbu $v0,-0x17c5($v0) +/* f0f75d8: 9042e83b */ lbu $v0,%lo(g_MenuStack+0x83b)($v0) /* f0f75dc: aca00000 */ sw $zero,0x0($a1) /* f0f75e0: acc00000 */ sw $zero,0x0($a2) /* f0f75e4: 8c6314d8 */ lw $v1,%lo(var800714d8)($v1) @@ -8237,14 +8237,14 @@ glabel var7f1b2990 /* f0f78ac: 27ff1448 */ addiu $ra,$ra,%lo(g_MpPlayerNum) /* f0f78b0: 8ff90000 */ lw $t9,0x0($ra) /* f0f78b4: 90580017 */ lbu $t8,0x17($v0) -/* f0f78b8: 3c0d800a */ lui $t5,%hi(var8009e000) +/* f0f78b8: 3c0d800a */ lui $t5,0x800a /* f0f78bc: 001970c0 */ sll $t6,$t9,0x3 /* f0f78c0: 01d97023 */ subu $t6,$t6,$t9 /* f0f78c4: 000e7080 */ sll $t6,$t6,0x2 /* f0f78c8: 01d97021 */ addu $t6,$t6,$t9 /* f0f78cc: 000e70c0 */ sll $t6,$t6,0x3 /* f0f78d0: 01d97023 */ subu $t6,$t6,$t9 -/* f0f78d4: 25ade000 */ addiu $t5,$t5,%lo(var8009e000) +/* f0f78d4: 25ade000 */ addiu $t5,$t5,-8192 /* f0f78d8: 000e7100 */ sll $t6,$t6,0x4 /* f0f78dc: 01ae7821 */ addu $t7,$t5,$t6 /* f0f78e0: 1f000004 */ bgtz $t8,.L0f0f78f4 @@ -8412,8 +8412,8 @@ glabel var7f1b2990 /* f0f7b00: 3c1f8007 */ lui $ra,%hi(g_MpPlayerNum) /* f0f7b04: 27ff1448 */ addiu $ra,$ra,%lo(g_MpPlayerNum) /* f0f7b08: 8ff80000 */ lw $t8,0x0($ra) -/* f0f7b0c: 3c0d800a */ lui $t5,%hi(var8009e000) -/* f0f7b10: 25ade000 */ addiu $t5,$t5,%lo(var8009e000) +/* f0f7b0c: 3c0d800a */ lui $t5,0x800a +/* f0f7b10: 25ade000 */ addiu $t5,$t5,-8192 /* f0f7b14: 0018c8c0 */ sll $t9,$t8,0x3 /* f0f7b18: 0338c823 */ subu $t9,$t9,$t8 /* f0f7b1c: 0019c880 */ sll $t9,$t9,0x2 @@ -8547,7 +8547,7 @@ glabel var7f1b2990 /* f0f7cfc: 00005025 */ or $t2,$zero,$zero /* f0f7d00: 8fef0000 */ lw $t7,0x0($ra) /* f0f7d04: 24010002 */ addiu $at,$zero,0x2 -/* f0f7d08: 3c05800a */ lui $a1,0x800a +/* f0f7d08: 3c05800a */ lui $a1,%hi(g_Vars+0x6c) /* f0f7d0c: 000fc0c0 */ sll $t8,$t7,0x3 /* f0f7d10: 030fc023 */ subu $t8,$t8,$t7 /* f0f7d14: 0018c080 */ sll $t8,$t8,0x2 @@ -8557,33 +8557,33 @@ glabel var7f1b2990 /* f0f7d24: 0018c100 */ sll $t8,$t8,0x4 /* f0f7d28: 01b8c821 */ addu $t9,$t5,$t8 /* f0f7d2c: 9322083b */ lbu $v0,0x83b($t9) -/* f0f7d30: 3c06800a */ lui $a2,0x800a +/* f0f7d30: 3c06800a */ lui $a2,%hi(g_Vars+0x68) /* f0f7d34: 50400004 */ beqzl $v0,.L0f0f7d48 /* f0f7d38: 8d6e0000 */ lw $t6,0x0($t3) /* f0f7d3c: 1441000b */ bne $v0,$at,.L0f0f7d6c /* f0f7d40: 3c08800a */ lui $t0,0x800a /* f0f7d44: 8d6e0000 */ lw $t6,0x0($t3) .L0f0f7d48: -/* f0f7d48: 3c08800a */ lui $t0,0x800a -/* f0f7d4c: 3c09800a */ lui $t1,0x800a +/* f0f7d48: 3c08800a */ lui $t0,%hi(g_Vars+0x64) +/* f0f7d4c: 3c09800a */ lui $t1,%hi(g_Vars+0x70) /* f0f7d50: 25cf0016 */ addiu $t7,$t6,0x16 /* f0f7d54: ad6f0000 */ sw $t7,0x0($t3) -/* f0f7d58: 8d29a030 */ lw $t1,-0x5fd0($t1) -/* f0f7d5c: 8d08a024 */ lw $t0,-0x5fdc($t0) -/* f0f7d60: 8cc6a028 */ lw $a2,-0x5fd8($a2) +/* f0f7d58: 8d29a030 */ lw $t1,%lo(g_Vars+0x70)($t1) +/* f0f7d5c: 8d08a024 */ lw $t0,%lo(g_Vars+0x64)($t0) +/* f0f7d60: 8cc6a028 */ lw $a2,%lo(g_Vars+0x68)($a2) /* f0f7d64: 1000000b */ beqz $zero,.L0f0f7d94 -/* f0f7d68: 8ca5a02c */ lw $a1,-0x5fd4($a1) +/* f0f7d68: 8ca5a02c */ lw $a1,%lo(g_Vars+0x6c)($a1) .L0f0f7d6c: /* f0f7d6c: 8d980000 */ lw $t8,0x0($t4) -/* f0f7d70: 3c05800a */ lui $a1,0x800a -/* f0f7d74: 3c06800a */ lui $a2,0x800a +/* f0f7d70: 3c05800a */ lui $a1,%hi(g_Vars+0x6c) +/* f0f7d74: 3c06800a */ lui $a2,%hi(g_Vars+0x68) /* f0f7d78: 2719ffea */ addiu $t9,$t8,-22 /* f0f7d7c: ad990000 */ sw $t9,0x0($t4) -/* f0f7d80: 3c09800a */ lui $t1,0x800a -/* f0f7d84: 8d29a030 */ lw $t1,-0x5fd0($t1) +/* f0f7d80: 3c09800a */ lui $t1,%hi(g_Vars+0x70) +/* f0f7d84: 8d29a030 */ lw $t1,%lo(g_Vars+0x70)($t1) /* f0f7d88: 8d08a024 */ lw $t0,-0x5fdc($t0) -/* f0f7d8c: 8cc6a028 */ lw $a2,-0x5fd8($a2) -/* f0f7d90: 8ca5a02c */ lw $a1,-0x5fd4($a1) +/* f0f7d8c: 8cc6a028 */ lw $a2,%lo(g_Vars+0x68)($a2) +/* f0f7d90: 8ca5a02c */ lw $a1,%lo(g_Vars+0x6c)($a1) .L0f0f7d94: /* f0f7d94: 10a00003 */ beqz $a1,.L0f0f7da4 /* f0f7d98: 24010002 */ addiu $at,$zero,0x2 @@ -8613,10 +8613,10 @@ glabel var7f1b2990 /* f0f7de8: 0fc54bcd */ jal optionsGetScreenSplit /* f0f7dec: 00000000 */ sll $zero,$zero,0x0 /* f0f7df0: 24080001 */ addiu $t0,$zero,0x1 -/* f0f7df4: 3c0d800a */ lui $t5,%hi(var8009e000) +/* f0f7df4: 3c0d800a */ lui $t5,0x800a /* f0f7df8: 3c1f8007 */ lui $ra,%hi(g_MpPlayerNum) /* f0f7dfc: 27ff1448 */ addiu $ra,$ra,%lo(g_MpPlayerNum) -/* f0f7e00: 25ade000 */ addiu $t5,$t5,%lo(var8009e000) +/* f0f7e00: 25ade000 */ addiu $t5,$t5,-8192 /* f0f7e04: 8fab0038 */ lw $t3,0x38($sp) /* f0f7e08: 11020005 */ beq $t0,$v0,.L0f0f7e20 /* f0f7e0c: 8fac0040 */ lw $t4,0x40($sp) @@ -8786,8 +8786,8 @@ GLOBAL_ASM( glabel func0f0f8040 /* f0f8040: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f0f8044: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f0f8048: 3c18800a */ lui $t8,%hi(var8009e000) -/* f0f804c: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f0f8048: 3c18800a */ lui $t8,0x800a +/* f0f804c: 2718e000 */ addiu $t8,$t8,-8192 /* f0f8050: 000e78c0 */ sll $t7,$t6,0x3 /* f0f8054: 01ee7823 */ subu $t7,$t7,$t6 /* f0f8058: 000f7880 */ sll $t7,$t7,0x2 @@ -8819,11 +8819,11 @@ glabel func0f0f8040 /* f0f80c0: ac280750 */ sw $t0,0x750($at) .L0f0f80c4: /* f0f80c4: 8c8b0000 */ lw $t3,0x0($a0) -/* f0f80c8: 3c02800a */ lui $v0,0x800a +/* f0f80c8: 3c02800a */ lui $v0,%hi(g_Vars+0x284) /* f0f80cc: 256cffff */ addiu $t4,$t3,-1 /* f0f80d0: 14a3000a */ bne $a1,$v1,.L0f0f80fc /* f0f80d4: ac8c0000 */ sw $t4,0x0($a0) -/* f0f80d8: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f0f80d8: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f0f80dc: 24010002 */ addiu $at,$zero,0x2 /* f0f80e0: 240e0001 */ addiu $t6,$zero,0x1 /* f0f80e4: 904d0250 */ lbu $t5,0x250($v0) @@ -8857,10 +8857,10 @@ glabel func0f0f8120 /* f0f8138: 24130e70 */ addiu $s3,$zero,0xe70 /* f0f813c: 01d30019 */ multu $t6,$s3 /* f0f8140: afb10018 */ sw $s1,0x18($sp) -/* f0f8144: 3c11800a */ lui $s1,%hi(var8009e000) -/* f0f8148: 2631e000 */ addiu $s1,$s1,%lo(var8009e000) -/* f0f814c: 3c04800a */ lui $a0,0x800a -/* f0f8150: 8084202e */ lb $a0,0x202e($a0) +/* f0f8144: 3c11800a */ lui $s1,0x800a +/* f0f8148: 2631e000 */ addiu $s1,$s1,-8192 +/* f0f814c: 3c04800a */ lui $a0,%hi(var800a202c+0x2) +/* f0f8150: 8084202e */ lb $a0,%lo(var800a202c+0x2)($a0) /* f0f8154: afbf0024 */ sw $ra,0x24($sp) /* f0f8158: afb00014 */ sw $s0,0x14($sp) /* f0f815c: 00007812 */ mflo $t7 @@ -8923,11 +8923,11 @@ glabel func0f0f820c /* f0f8220: afb10018 */ sw $s1,0x18($sp) /* f0f8224: afb2001c */ sw $s2,0x1c($sp) /* f0f8228: afb00014 */ sw $s0,0x14($sp) -/* f0f822c: 3c11800a */ lui $s1,%hi(var8009e000) +/* f0f822c: 3c11800a */ lui $s1,0x800a /* f0f8230: afbf0024 */ sw $ra,0x24($sp) /* f0f8234: afa40030 */ sw $a0,0x30($sp) /* f0f8238: afa50034 */ sw $a1,0x34($sp) -/* f0f823c: 2631e000 */ addiu $s1,$s1,%lo(var8009e000) +/* f0f823c: 2631e000 */ addiu $s1,$s1,-8192 /* f0f8240: 00008025 */ or $s0,$zero,$zero /* f0f8244: 24120004 */ addiu $s2,$zero,0x4 /* f0f8248: afae0028 */ sw $t6,0x28($sp) @@ -9071,11 +9071,11 @@ glabel var7f1b29f8 /* f0f8348: 000f7880 */ sll $t7,$t7,0x2 /* f0f834c: 01ee7821 */ addu $t7,$t7,$t6 /* f0f8350: 000f78c0 */ sll $t7,$t7,0x3 -/* f0f8354: 3c18800a */ lui $t8,%hi(var8009e000) +/* f0f8354: 3c18800a */ lui $t8,0x800a /* f0f8358: 01ee7823 */ subu $t7,$t7,$t6 /* f0f835c: 907905d5 */ lbu $t9,0x5d5($v1) /* f0f8360: 000f7900 */ sll $t7,$t7,0x4 -/* f0f8364: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f0f8364: 2718e000 */ addiu $t8,$t8,-8192 /* f0f8368: 01f81021 */ addu $v0,$t7,$t8 /* f0f836c: 904b083b */ lbu $t3,0x83b($v0) /* f0f8370: 3329ff7f */ andi $t1,$t9,0xff7f @@ -9103,8 +9103,8 @@ glabel var7f1b29f8 /* f0f83c8: ac6e0000 */ sw $t6,0x0($v1) /* f0f83cc: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f0f83d0: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f0f83d4: 3c19800a */ lui $t9,%hi(var8009e000) -/* f0f83d8: 2739e000 */ addiu $t9,$t9,%lo(var8009e000) +/* f0f83d4: 3c19800a */ lui $t9,0x800a +/* f0f83d8: 2739e000 */ addiu $t9,$t9,-8192 /* f0f83dc: 000fc0c0 */ sll $t8,$t7,0x3 /* f0f83e0: 030fc023 */ subu $t8,$t8,$t7 /* f0f83e4: 0018c080 */ sll $t8,$t8,0x2 @@ -9120,7 +9120,7 @@ glabel var7f1b29f8 .L0f0f840c: /* f0f840c: 3c0b8007 */ lui $t3,%hi(g_MpPlayerNum) /* f0f8410: 8d6b1448 */ lw $t3,%lo(g_MpPlayerNum)($t3) -/* f0f8414: 3c0d800a */ lui $t5,%hi(var8009e000) +/* f0f8414: 3c0d800a */ lui $t5,0x800a /* f0f8418: 24aeffff */ addiu $t6,$a1,-1 /* f0f841c: 000b60c0 */ sll $t4,$t3,0x3 /* f0f8420: 018b6023 */ subu $t4,$t4,$t3 @@ -9130,7 +9130,7 @@ glabel var7f1b29f8 /* f0f8430: 018b6023 */ subu $t4,$t4,$t3 /* f0f8434: 000c6100 */ sll $t4,$t4,0x4 /* f0f8438: 2dc1000d */ sltiu $at,$t6,0xd -/* f0f843c: 25ade000 */ addiu $t5,$t5,%lo(var8009e000) +/* f0f843c: 25ade000 */ addiu $t5,$t5,-8192 /* f0f8440: 018d1021 */ addu $v0,$t4,$t5 /* f0f8444: 10200009 */ beqz $at,.L0f0f846c /* f0f8448: 00a03025 */ or $a2,$a1,$zero @@ -9261,8 +9261,8 @@ glabel func0f0f85e0 /* f0f8608: 8fa5001c */ lw $a1,0x1c($sp) /* f0f860c: 0fc5b350 */ jal func0f16cd40 /* f0f8610: 24040001 */ addiu $a0,$zero,0x1 -/* f0f8614: 3c18800a */ lui $t8,0x800a -/* f0f8618: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f0f8614: 3c18800a */ lui $t8,%hi(g_Vars+0x284) +/* f0f8618: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f0f861c: 240f0003 */ addiu $t7,$zero,0x3 /* f0f8620: af0f1a24 */ sw $t7,0x1a24($t8) /* f0f8624: 8fbf0014 */ lw $ra,0x14($sp) @@ -9309,7 +9309,7 @@ glabel func0f0f86a8 /* f0f86a8: 3c038007 */ lui $v1,%hi(g_MpPlayerNum) /* f0f86ac: 8c631448 */ lw $v1,%lo(g_MpPlayerNum)($v1) /* f0f86b0: 27bdff68 */ addiu $sp,$sp,-152 -/* f0f86b4: 3c0f800a */ lui $t7,%hi(var8009e000) +/* f0f86b4: 3c0f800a */ lui $t7,0x800a /* f0f86b8: 000370c0 */ sll $t6,$v1,0x3 /* f0f86bc: 01c37023 */ subu $t6,$t6,$v1 /* f0f86c0: 000e7080 */ sll $t6,$t6,0x2 @@ -9318,7 +9318,7 @@ glabel func0f0f86a8 /* f0f86cc: 01c37023 */ subu $t6,$t6,$v1 /* f0f86d0: afb10030 */ sw $s1,0x30($sp) /* f0f86d4: 000e7100 */ sll $t6,$t6,0x4 -/* f0f86d8: 25efe000 */ addiu $t7,$t7,%lo(var8009e000) +/* f0f86d8: 25efe000 */ addiu $t7,$t7,-8192 /* f0f86dc: afb0002c */ sw $s0,0x2c($sp) /* f0f86e0: 01cf8821 */ addu $s1,$t6,$t7 /* f0f86e4: 8e3004f8 */ lw $s0,0x4f8($s1) @@ -9350,9 +9350,9 @@ glabel func0f0f86a8 /* f0f8748: 0019c8c0 */ sll $t9,$t9,0x3 /* f0f874c: 0338c823 */ subu $t9,$t9,$t8 /* f0f8750: 0019c900 */ sll $t9,$t9,0x4 -/* f0f8754: 3c10800a */ lui $s0,%hi(g_MenuStack) +/* f0f8754: 3c10800a */ lui $s0,%hi(g_MenuStack+0x4f8) /* f0f8758: 02198021 */ addu $s0,$s0,$t9 -/* f0f875c: 8e10e4f8 */ lw $s0,%lo(g_MenuStack)($s0) +/* f0f875c: 8e10e4f8 */ lw $s0,%lo(g_MenuStack+0x4f8)($s0) /* f0f8760: 0000c012 */ mflo $t8 /* f0f8764: 8e0b001c */ lw $t3,0x1c($s0) /* f0f8768: 8e0a0014 */ lw $t2,0x14($s0) @@ -9373,14 +9373,14 @@ glabel func0f0f86a8 /* f0f879c: 00000000 */ sll $zero,$zero,0x0 /* f0f87a0: 0006000d */ break 0x6 .L0f0f87a4: -/* f0f87a4: 3c01800a */ lui $at,0x800a +/* f0f87a4: 3c01800a */ lui $at,%hi(var8009de98) /* f0f87a8: 01b8c823 */ subu $t9,$t5,$t8 /* f0f87ac: 0c002f06 */ jal func0000bc18 -/* f0f87b0: ac39de98 */ sw $t9,-0x2168($at) +/* f0f87b0: ac39de98 */ sw $t9,%lo(var8009de98)($at) /* f0f87b4: 3c0b8007 */ lui $t3,%hi(g_MpPlayerNum) /* f0f87b8: 8d6b1448 */ lw $t3,%lo(g_MpPlayerNum)($t3) -/* f0f87bc: 3c0c800a */ lui $t4,%hi(var8009e000) -/* f0f87c0: 258ce000 */ addiu $t4,$t4,%lo(var8009e000) +/* f0f87bc: 3c0c800a */ lui $t4,0x800a +/* f0f87c0: 258ce000 */ addiu $t4,$t4,-8192 /* f0f87c4: 000b50c0 */ sll $t2,$t3,0x3 /* f0f87c8: 014b5023 */ subu $t2,$t2,$t3 /* f0f87cc: 000a5080 */ sll $t2,$t2,0x2 @@ -9406,15 +9406,15 @@ glabel func0f0f86a8 /* f0f8818: 24410001 */ addiu $at,$v0,0x1 /* f0f881c: 0001c843 */ sra $t9,$at,0x1 .L0f0f8820: -/* f0f8820: 3c01800a */ lui $at,0x800a +/* f0f8820: 3c01800a */ lui $at,%hi(var8009de9c) /* f0f8824: 03195823 */ subu $t3,$t8,$t9 -/* f0f8828: ac2bde9c */ sw $t3,-0x2164($at) +/* f0f8828: ac2bde9c */ sw $t3,%lo(var8009de9c)($at) /* f0f882c: 0fc3e18d */ jal func0f0f8634 /* f0f8830: 02002825 */ or $a1,$s0,$zero /* f0f8834: 3c0a8007 */ lui $t2,%hi(g_MpPlayerNum) /* f0f8838: 8d4a1448 */ lw $t2,%lo(g_MpPlayerNum)($t2) -/* f0f883c: 3c0f800a */ lui $t7,%hi(var8009e000) -/* f0f8840: 25efe000 */ addiu $t7,$t7,%lo(var8009e000) +/* f0f883c: 3c0f800a */ lui $t7,0x800a +/* f0f8840: 25efe000 */ addiu $t7,$t7,-8192 /* f0f8844: 000a60c0 */ sll $t4,$t2,0x3 /* f0f8848: 018a6023 */ subu $t4,$t4,$t2 /* f0f884c: 000c6080 */ sll $t4,$t4,0x2 @@ -9442,10 +9442,10 @@ glabel func0f0f86a8 /* f0f88a0: 000a50c0 */ sll $t2,$t2,0x3 /* f0f88a4: 01435023 */ subu $t2,$t2,$v1 /* f0f88a8: 000a5100 */ sll $t2,$t2,0x4 -/* f0f88ac: 3c0f800a */ lui $t7,%hi(var8009e000) +/* f0f88ac: 3c0f800a */ lui $t7,0x800a /* f0f88b0: 00024880 */ sll $t1,$v0,0x2 /* f0f88b4: 01224823 */ subu $t1,$t1,$v0 -/* f0f88b8: 25efe000 */ addiu $t7,$t7,%lo(var8009e000) +/* f0f88b8: 25efe000 */ addiu $t7,$t7,-8192 /* f0f88bc: 254c0464 */ addiu $t4,$t2,0x464 /* f0f88c0: 44800000 */ mtc1 $zero,$f0 /* f0f88c4: 018f4021 */ addu $t0,$t4,$t7 @@ -9491,8 +9491,8 @@ glabel func0f0f86a8 /* f0f894c: 00003825 */ or $a3,$zero,$zero /* f0f8950: 3c188007 */ lui $t8,%hi(g_MpPlayerNum) /* f0f8954: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f0f8958: 3c0d800a */ lui $t5,%hi(var8009e000) -/* f0f895c: 25ade000 */ addiu $t5,$t5,%lo(var8009e000) +/* f0f8958: 3c0d800a */ lui $t5,0x800a +/* f0f895c: 25ade000 */ addiu $t5,$t5,-8192 /* f0f8960: 001870c0 */ sll $t6,$t8,0x3 /* f0f8964: 01d87023 */ subu $t6,$t6,$t8 /* f0f8968: 000e7080 */ sll $t6,$t6,0x2 @@ -9512,8 +9512,8 @@ glabel func0f0f86a8 /* f0f899c: 00003825 */ or $a3,$zero,$zero /* f0f89a0: 3c0b8007 */ lui $t3,%hi(g_MpPlayerNum) /* f0f89a4: 8d6b1448 */ lw $t3,%lo(g_MpPlayerNum)($t3) -/* f0f89a8: 3c0c800a */ lui $t4,%hi(var8009e000) -/* f0f89ac: 258ce000 */ addiu $t4,$t4,%lo(var8009e000) +/* f0f89a8: 3c0c800a */ lui $t4,0x800a +/* f0f89ac: 258ce000 */ addiu $t4,$t4,-8192 /* f0f89b0: 000b50c0 */ sll $t2,$t3,0x3 /* f0f89b4: 014b5023 */ subu $t2,$t2,$t3 /* f0f89b8: 000a5080 */ sll $t2,$t2,0x2 @@ -9545,7 +9545,7 @@ glabel func0f0f86a8 /* f0f8a1c: 27a70074 */ addiu $a3,$sp,0x74 /* f0f8a20: 3c0c8007 */ lui $t4,%hi(g_MpPlayerNum) /* f0f8a24: 8d8c1448 */ lw $t4,%lo(g_MpPlayerNum)($t4) -/* f0f8a28: 3c19800a */ lui $t9,0x800a +/* f0f8a28: 3c19800a */ lui $t9,%hi(g_MenuStack+0xdf8) /* f0f8a2c: 8faa0074 */ lw $t2,0x74($sp) /* f0f8a30: 000c78c0 */ sll $t7,$t4,0x3 /* f0f8a34: 01ec7823 */ subu $t7,$t7,$t4 @@ -9555,7 +9555,7 @@ glabel func0f0f86a8 /* f0f8a44: 01ec7823 */ subu $t7,$t7,$t4 /* f0f8a48: 000f7900 */ sll $t7,$t7,0x4 /* f0f8a4c: 032fc821 */ addu $t9,$t9,$t7 -/* f0f8a50: 8339edf8 */ lb $t9,-0x1208($t9) +/* f0f8a50: 8339edf8 */ lb $t9,%lo(g_MenuStack+0xdf8)($t9) /* f0f8a54: 8fa40098 */ lw $a0,0x98($sp) /* f0f8a58: 8fa50080 */ lw $a1,0x80($sp) /* f0f8a5c: 8fa6007c */ lw $a2,0x7c($sp) @@ -9620,7 +9620,7 @@ glabel func0f0f86a8 /* f0f8b34: 01e08025 */ or $s0,$t7,$zero /* f0f8b38: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f0f8b3c: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f0f8b40: 3c0b800a */ lui $t3,0x800a +/* f0f8b40: 3c0b800a */ lui $t3,%hi(g_MenuStack+0xdf8) /* f0f8b44: 0050c821 */ addu $t9,$v0,$s0 /* f0f8b48: 000e68c0 */ sll $t5,$t6,0x3 /* f0f8b4c: 01ae6823 */ subu $t5,$t5,$t6 @@ -9630,7 +9630,7 @@ glabel func0f0f86a8 /* f0f8b5c: 01ae6823 */ subu $t5,$t5,$t6 /* f0f8b60: 000d6900 */ sll $t5,$t5,0x4 /* f0f8b64: 016d5821 */ addu $t3,$t3,$t5 -/* f0f8b68: 816bedf8 */ lb $t3,-0x1208($t3) +/* f0f8b68: 816bedf8 */ lb $t3,%lo(g_MenuStack+0xdf8)($t3) /* f0f8b6c: 24180001 */ addiu $t8,$zero,0x1 /* f0f8b70: afb80014 */ sw $t8,0x14($sp) /* f0f8b74: afb90010 */ sw $t9,0x10($sp) @@ -9738,15 +9738,15 @@ glabel var7f1b2a0c /* f0f8cac: afb00018 */ sw $s0,0x18($sp) /* f0f8cb0: 3c0e8009 */ lui $t6,%hi(g_Is4Mb) /* f0f8cb4: 91ce0af0 */ lbu $t6,%lo(g_Is4Mb)($t6) -/* f0f8cb8: 3c01800a */ lui $at,0x800a -/* f0f8cbc: ac20dfc0 */ sw $zero,-0x2040($at) +/* f0f8cb8: 3c01800a */ lui $at,%hi(var8009dfc0) +/* f0f8cbc: ac20dfc0 */ sw $zero,%lo(var8009dfc0)($at) /* f0f8cc0: 24010001 */ addiu $at,$zero,0x1 /* f0f8cc4: 11c10005 */ beq $t6,$at,.L0f0f8cdc /* f0f8cc8: 24044b00 */ addiu $a0,$zero,0x4b00 /* f0f8ccc: 0c0048f2 */ jal malloc /* f0f8cd0: 24050004 */ addiu $a1,$zero,0x4 -/* f0f8cd4: 3c01800a */ lui $at,0x800a -/* f0f8cd8: ac22dfbc */ sw $v0,-0x2044($at) +/* f0f8cd4: 3c01800a */ lui $at,%hi(var8009dfbc) +/* f0f8cd8: ac22dfbc */ sw $v0,%lo(var8009dfbc)($at) .L0f0f8cdc: /* f0f8cdc: 3c11800a */ lui $s1,%hi(var800a19c0) /* f0f8ce0: 263119c0 */ addiu $s1,$s1,%lo(var800a19c0) @@ -9776,8 +9776,8 @@ glabel var7f1b2a0c /* f0f8d40: 8e440000 */ lw $a0,0x0($s2) /* f0f8d44: 0fc2ce62 */ jal func0f0b3988 /* f0f8d48: 24840294 */ addiu $a0,$a0,0x294 -/* f0f8d4c: 3c19800a */ lui $t9,0x800a -/* f0f8d50: 8f39a474 */ lw $t9,-0x5b8c($t9) +/* f0f8d4c: 3c19800a */ lui $t9,%hi(g_Vars+0x4b4) +/* f0f8d50: 8f39a474 */ lw $t9,%lo(g_Vars+0x4b4)($t9) /* f0f8d54: 24010026 */ addiu $at,$zero,0x26 /* f0f8d58: 24100090 */ addiu $s0,$zero,0x90 /* f0f8d5c: 17210011 */ bne $t9,$at,.L0f0f8da4 @@ -9800,22 +9800,22 @@ glabel var7f1b2a0c /* f0f8d9c: 0fc2ce62 */ jal func0f0b3988 /* f0f8da0: 248401a4 */ addiu $a0,$a0,0x1a4 .L0f0f8da4: -/* f0f8da4: 3c05800a */ lui $a1,0x800a -/* f0f8da8: 8ca5a2d4 */ lw $a1,-0x5d2c($a1) +/* f0f8da4: 3c05800a */ lui $a1,%hi(g_Vars+0x314) +/* f0f8da8: 8ca5a2d4 */ lw $a1,%lo(g_Vars+0x314)($a1) /* f0f8dac: 10a00006 */ beqz $a1,.L0f0f8dc8 /* f0f8db0: 00000000 */ sll $zero,$zero,0x0 /* f0f8db4: 8e440000 */ lw $a0,0x0($s2) /* f0f8db8: 0fc2ce62 */ jal func0f0b3988 /* f0f8dbc: 248401a4 */ addiu $a0,$a0,0x1a4 -/* f0f8dc0: 3c05800a */ lui $a1,0x800a -/* f0f8dc4: 8ca5a2d4 */ lw $a1,-0x5d2c($a1) +/* f0f8dc0: 3c05800a */ lui $a1,%hi(g_Vars+0x314) +/* f0f8dc4: 8ca5a2d4 */ lw $a1,%lo(g_Vars+0x314)($a1) .L0f0f8dc8: -/* f0f8dc8: 3c04800a */ lui $a0,0x800a -/* f0f8dcc: 3c02800a */ lui $v0,%hi(var8009e000) +/* f0f8dc8: 3c04800a */ lui $a0,%hi(g_Vars+0x4b4) +/* f0f8dcc: 3c02800a */ lui $v0,0x800a /* f0f8dd0: 3c03800a */ lui $v1,%hi(var800a19c0) /* f0f8dd4: 246319c0 */ addiu $v1,$v1,%lo(var800a19c0) -/* f0f8dd8: 2442e000 */ addiu $v0,$v0,%lo(var8009e000) -/* f0f8ddc: 8c84a474 */ lw $a0,-0x5b8c($a0) +/* f0f8dd8: 2442e000 */ addiu $v0,$v0,-8192 +/* f0f8ddc: 8c84a474 */ lw $a0,%lo(g_Vars+0x4b4)($a0) .L0f0f8de0: /* f0f8de0: 24420e70 */ addiu $v0,$v0,0xe70 /* f0f8de4: 0043082b */ sltu $at,$v0,$v1 @@ -9843,12 +9843,12 @@ glabel var7f1b2a0c .L0f0f8e38: /* f0f8e38: 2401005d */ addiu $at,$zero,0x5d /* f0f8e3c: 14810002 */ bne $a0,$at,.L0f0f8e48 -/* f0f8e40: 3c10800a */ lui $s0,0x800a +/* f0f8e40: 3c10800a */ lui $s0,%hi(g_MenuStack+0x840) /* f0f8e44: 24020004 */ addiu $v0,$zero,0x4 .L0f0f8e48: /* f0f8e48: 18400015 */ blez $v0,.L0f0f8ea0 /* f0f8e4c: 00001825 */ or $v1,$zero,$zero -/* f0f8e50: 2610e840 */ addiu $s0,$s0,-6080 +/* f0f8e50: 2610e840 */ addiu $s0,$s0,%lo(g_MenuStack+0x840) .L0f0f8e54: /* f0f8e54: 3c0f8009 */ lui $t7,%hi(g_Is4Mb) /* f0f8e58: 91ef0af0 */ lbu $t7,%lo(g_Is4Mb)($t7) @@ -9923,14 +9923,14 @@ glabel var7f1b2a0c /* f0f8f5c: e6320538 */ swc1 $f18,0x538($s1) .L0f0f8f60: /* f0f8f60: 922a05d5 */ lbu $t2,0x5d5($s1) -/* f0f8f64: 3c02800a */ lui $v0,%hi(var8009e000) +/* f0f8f64: 3c02800a */ lui $v0,0x800a /* f0f8f68: 3c03800a */ lui $v1,%hi(var800a19c0) /* f0f8f6c: 314bfff7 */ andi $t3,$t2,0xfff7 /* f0f8f70: 44800000 */ mtc1 $zero,$f0 /* f0f8f74: a22005d4 */ sb $zero,0x5d4($s1) /* f0f8f78: a22b05d5 */ sb $t3,0x5d5($s1) /* f0f8f7c: 246319c0 */ addiu $v1,$v1,%lo(var800a19c0) -/* f0f8f80: 2442e000 */ addiu $v0,$v0,%lo(var8009e000) +/* f0f8f80: 2442e000 */ addiu $v0,$v0,-8192 /* f0f8f84: 2404ffff */ addiu $a0,$zero,-1 .L0f0f8f88: /* f0f8f88: 24420e70 */ addiu $v0,$v0,0xe70 @@ -9950,7 +9950,7 @@ glabel var7f1b2a0c /* f0f8fc0: 922c05d5 */ lbu $t4,0x5d5($s1) /* f0f8fc4: 240500ff */ addiu $a1,$zero,0xff /* f0f8fc8: 3c02800a */ lui $v0,%hi(var800a19c0) -/* f0f8fcc: 3c03800a */ lui $v1,0x800a +/* f0f8fcc: 3c03800a */ lui $v1,%hi(var800a19c4+0x1) /* f0f8fd0: 318dfffb */ andi $t5,$t4,0xfffb /* f0f8fd4: a2240668 */ sb $a0,0x668($s1) /* f0f8fd8: ae20000c */ sw $zero,0xc($s1) @@ -9962,7 +9962,7 @@ glabel var7f1b2a0c /* f0f8ff0: a22d05d5 */ sb $t5,0x5d5($s1) /* f0f8ff4: a2250015 */ sb $a1,0x15($s1) /* f0f8ff8: a224001b */ sb $a0,0x1b($s1) -/* f0f8ffc: 246319c5 */ addiu $v1,$v1,0x19c5 +/* f0f8ffc: 246319c5 */ addiu $v1,$v1,%lo(var800a19c4+0x1) /* f0f9000: 244219c0 */ addiu $v0,$v0,%lo(var800a19c0) .L0f0f9004: /* f0f9004: 24420001 */ addiu $v0,$v0,0x1 @@ -9989,8 +9989,8 @@ glabel func0f0f9030 /* f0f9048: 24150e70 */ addiu $s5,$zero,0xe70 /* f0f904c: 01d50019 */ multu $t6,$s5 /* f0f9050: afb30020 */ sw $s3,0x20($sp) -/* f0f9054: 3c13800a */ lui $s3,%hi(var8009e000) -/* f0f9058: 2673e000 */ addiu $s3,$s3,%lo(var8009e000) +/* f0f9054: 3c13800a */ lui $s3,0x800a +/* f0f9058: 2673e000 */ addiu $s3,$s3,-8192 /* f0f905c: afbf002c */ sw $ra,0x2c($sp) /* f0f9060: afb2001c */ sw $s2,0x1c($sp) /* f0f9064: afb10018 */ sw $s1,0x18($sp) @@ -10245,7 +10245,7 @@ glabel var7f1b2a64 /* f0f935c: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f0f9360: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) /* f0f9364: 27bdfee0 */ addiu $sp,$sp,-288 -/* f0f9368: 3c18800a */ lui $t8,%hi(var8009e000) +/* f0f9368: 3c18800a */ lui $t8,0x800a /* f0f936c: 000e78c0 */ sll $t7,$t6,0x3 /* f0f9370: 01ee7823 */ subu $t7,$t7,$t6 /* f0f9374: 000f7880 */ sll $t7,$t7,0x2 @@ -10253,7 +10253,7 @@ glabel var7f1b2a64 /* f0f937c: 000f78c0 */ sll $t7,$t7,0x3 /* f0f9380: 01ee7823 */ subu $t7,$t7,$t6 /* f0f9384: 000f7900 */ sll $t7,$t7,0x4 -/* f0f9388: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f0f9388: 2718e000 */ addiu $t8,$t8,-8192 /* f0f938c: 01f81021 */ addu $v0,$t7,$t8 /* f0f9390: 8c590e40 */ lw $t9,0xe40($v0) /* f0f9394: afbf0044 */ sw $ra,0x44($sp) @@ -10293,8 +10293,8 @@ glabel var7f1b2a64 /* f0f9418: a2200004 */ sb $zero,0x4($s1) /* f0f941c: 3c0b8007 */ lui $t3,%hi(g_MpPlayerNum) /* f0f9420: 8d6b1448 */ lw $t3,%lo(g_MpPlayerNum)($t3) -/* f0f9424: 3c0d800a */ lui $t5,%hi(var8009e000) -/* f0f9428: 25ade000 */ addiu $t5,$t5,%lo(var8009e000) +/* f0f9424: 3c0d800a */ lui $t5,0x800a +/* f0f9428: 25ade000 */ addiu $t5,$t5,-8192 /* f0f942c: 000b60c0 */ sll $t4,$t3,0x3 /* f0f9430: 018b6023 */ subu $t4,$t4,$t3 /* f0f9434: 000c6080 */ sll $t4,$t4,0x2 @@ -10376,7 +10376,7 @@ glabel var7f1b2a64 /* f0f9554: 4500004b */ bc1f .L0f0f9684 /* f0f9558: 3c048007 */ lui $a0,%hi(g_MpPlayerNum) /* f0f955c: 8c841448 */ lw $a0,%lo(g_MpPlayerNum)($a0) -/* f0f9560: 3c0a800a */ lui $t2,%hi(g_MenuStack) +/* f0f9560: 3c0a800a */ lui $t2,%hi(g_MenuStack+0x4f8) /* f0f9564: 3c013f80 */ lui $at,0x3f80 /* f0f9568: 000448c0 */ sll $t1,$a0,0x3 /* f0f956c: 01244823 */ subu $t1,$t1,$a0 @@ -10386,7 +10386,7 @@ glabel var7f1b2a64 /* f0f957c: 01244823 */ subu $t1,$t1,$a0 /* f0f9580: 00094900 */ sll $t1,$t1,0x4 /* f0f9584: 01495021 */ addu $t2,$t2,$t1 -/* f0f9588: 8d4ae4f8 */ lw $t2,%lo(g_MenuStack)($t2) +/* f0f9588: 8d4ae4f8 */ lw $t2,%lo(g_MenuStack+0x4f8)($t2) /* f0f958c: 57ca0034 */ bnel $s8,$t2,.L0f0f9660 /* f0f9590: 93c9003c */ lbu $t1,0x3c($s8) /* f0f9594: 92700000 */ lbu $s0,0x0($s3) @@ -10424,8 +10424,8 @@ glabel var7f1b2a64 /* f0f9608: 55e1000a */ bnel $t7,$at,.L0f0f9634 /* f0f960c: 93c8003c */ lbu $t0,0x3c($s8) /* f0f9610: 12420007 */ beq $s2,$v0,.L0f0f9630 -/* f0f9614: 3c18800a */ lui $t8,0x800a -/* f0f9618: 931819d5 */ lbu $t8,0x19d5($t8) +/* f0f9614: 3c18800a */ lui $t8,%hi(var800a19d4+0x1) +/* f0f9618: 931819d5 */ lbu $t8,%lo(var800a19d4+0x1)($t8) /* f0f961c: 24190005 */ addiu $t9,$zero,0x5 /* f0f9620: 52580004 */ beql $s2,$t8,.L0f0f9634 /* f0f9624: 93c8003c */ lbu $t0,0x3c($s8) @@ -10471,10 +10471,10 @@ glabel var7f1b2a64 /* f0f96ac: 24010001 */ addiu $at,$zero,0x1 /* f0f96b0: 916b19d4 */ lbu $t3,%lo(var800a19d4)($t3) /* f0f96b4: 24120003 */ addiu $s2,$zero,0x3 -/* f0f96b8: 3c0c800a */ lui $t4,0x800a +/* f0f96b8: 3c0c800a */ lui $t4,%hi(var800a19d4+0x1) /* f0f96bc: 524b000d */ beql $s2,$t3,.L0f0f96f4 /* f0f96c0: 24010001 */ addiu $at,$zero,0x1 -/* f0f96c4: 918c19d5 */ lbu $t4,0x19d5($t4) +/* f0f96c4: 918c19d5 */ lbu $t4,%lo(var800a19d4+0x1)($t4) /* f0f96c8: 524c000a */ beql $s2,$t4,.L0f0f96f4 /* f0f96cc: 24010001 */ addiu $at,$zero,0x1 /* f0f96d0: 93cd003d */ lbu $t5,0x3d($s8) @@ -10572,8 +10572,8 @@ glabel var7f1b2a64 .L0f0f9820: /* f0f9820: 93c20060 */ lbu $v0,0x60($s8) /* f0f9824: 1642001b */ bne $s2,$v0,.L0f0f9894 -/* f0f9828: 3c09800a */ lui $t1,0x800a -/* f0f982c: 912919d5 */ lbu $t1,0x19d5($t1) +/* f0f9828: 3c09800a */ lui $t1,%hi(var800a19d4+0x1) +/* f0f982c: 912919d5 */ lbu $t1,%lo(var800a19d4+0x1)($t1) /* f0f9830: 24010004 */ addiu $at,$zero,0x4 /* f0f9834: 51210018 */ beql $t1,$at,.L0f0f9898 /* f0f9838: 24010002 */ addiu $at,$zero,0x2 @@ -10740,10 +10740,10 @@ glabel var7f1b2a64 /* f0f9a88: 3c0f800a */ lui $t7,%hi(var8009dfc0) /* f0f9a8c: 8defdfc0 */ lw $t7,%lo(var8009dfc0)($t7) /* f0f9a90: 3c07800a */ lui $a3,%hi(g_Vars) -/* f0f9a94: 3c18800a */ lui $t8,0x800a +/* f0f9a94: 3c18800a */ lui $t8,%hi(g_Vars+0x40) /* f0f9a98: 11e00015 */ beqz $t7,.L0f0f9af0 /* f0f9a9c: 24e79fc0 */ addiu $a3,$a3,%lo(g_Vars) -/* f0f9aa0: 8f18a000 */ lw $t8,-0x6000($t8) +/* f0f9aa0: 8f18a000 */ lw $t8,%lo(g_Vars+0x40)($t8) /* f0f9aa4: 3c014270 */ lui $at,0x4270 /* f0f9aa8: 44815000 */ mtc1 $at,$f10 /* f0f9aac: 44982000 */ mtc1 $t8,$f4 @@ -10767,8 +10767,8 @@ glabel var7f1b2a64 /* f0f9af0: 10000011 */ beqz $zero,.L0f0f9b38 /* f0f9af4: 8fb10124 */ lw $s1,0x124($sp) .L0f0f9af8: -/* f0f9af8: 3c08800a */ lui $t0,0x800a -/* f0f9afc: 910819d5 */ lbu $t0,0x19d5($t0) +/* f0f9af8: 3c08800a */ lui $t0,%hi(var800a19d4+0x1) +/* f0f9afc: 910819d5 */ lbu $t0,%lo(var800a19d4+0x1)($t0) /* f0f9b00: 3c07800a */ lui $a3,%hi(g_Vars) /* f0f9b04: 240100ff */ addiu $at,$zero,0xff /* f0f9b08: 24e79fc0 */ addiu $a3,$a3,%lo(g_Vars) @@ -10977,10 +10977,10 @@ glabel var7f1b2a64 .L0f0f9de4: /* f0f9de4: 8fc50038 */ lw $a1,0x38($s8) /* f0f9de8: 8fc40020 */ lw $a0,0x20($s8) -/* f0f9dec: 3c03800a */ lui $v1,%hi(var800a044c) +/* f0f9dec: 3c03800a */ lui $v1,%hi(g_Vars) /* f0f9df0: 10a4001f */ beq $a1,$a0,.L0f0f9e70 /* f0f9df4: 00803025 */ or $a2,$a0,$zero -/* f0f9df8: 8c639fc0 */ lw $v1,-0x6040($v1) +/* f0f9df8: 8c639fc0 */ lw $v1,%lo(g_Vars)($v1) /* f0f9dfc: 44843000 */ mtc1 $a0,$f6 /* f0f9e00: 00001025 */ or $v0,$zero,$zero /* f0f9e04: 1860000c */ blez $v1,.L0f0f9e38 @@ -11111,7 +11111,7 @@ glabel var7f1b2a64 /* f0f9fc8: 267306dc */ addiu $s3,$s3,0x6dc .L0f0f9fcc: /* f0f9fcc: 8d8c1448 */ lw $t4,%lo(g_MpPlayerNum)($t4) -/* f0f9fd0: 3c0d800a */ lui $t5,0x800a +/* f0f9fd0: 3c0d800a */ lui $t5,%hi(g_MenuStack+0xe40) /* f0f9fd4: 3c0f8006 */ lui $t7,%hi(var8005dd58) /* f0f9fd8: 000c58c0 */ sll $t3,$t4,0x3 /* f0f9fdc: 016c5823 */ subu $t3,$t3,$t4 @@ -11121,7 +11121,7 @@ glabel var7f1b2a64 /* f0f9fec: 016c5823 */ subu $t3,$t3,$t4 /* f0f9ff0: 000b5900 */ sll $t3,$t3,0x4 /* f0f9ff4: 01ab6821 */ addu $t5,$t5,$t3 -/* f0f9ff8: 8dadee40 */ lw $t5,-0x11c0($t5) +/* f0f9ff8: 8dadee40 */ lw $t5,%lo(g_MenuStack+0xe40)($t5) /* f0f9ffc: 000d77c2 */ srl $t6,$t5,0x1f /* f0fa000: 55c00023 */ bnezl $t6,.L0f0fa090 /* f0fa004: 92e90668 */ lbu $t1,0x668($s7) @@ -11204,8 +11204,8 @@ glabel var7f1b2a64 /* f0fa118: 5500006a */ bnezl $t0,.L0f0fa2c4 /* f0fa11c: 8fd00008 */ lw $s0,0x8($s8) /* f0fa120: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) -/* f0fa124: 3c0c800a */ lui $t4,%hi(var8009e000) -/* f0fa128: 258ce000 */ addiu $t4,$t4,%lo(var8009e000) +/* f0fa124: 3c0c800a */ lui $t4,0x800a +/* f0fa128: 258ce000 */ addiu $t4,$t4,-8192 /* f0fa12c: 000950c0 */ sll $t2,$t1,0x3 /* f0fa130: 01495023 */ subu $t2,$t2,$t1 /* f0fa134: 000a5080 */ sll $t2,$t2,0x2 @@ -11222,7 +11222,7 @@ glabel var7f1b2a64 /* f0fa160: 000d68c0 */ sll $t5,$t5,0x3 /* f0fa164: 004d1821 */ addu $v1,$v0,$t5 /* f0fa168: 806e0460 */ lb $t6,0x460($v1) -/* f0fa16c: 2463044c */ addiu $v1,$v1,%lo(var800a044c) +/* f0fa16c: 2463044c */ addiu $v1,$v1,1100 /* f0fa170: 8fb90124 */ lw $t9,0x124($sp) /* f0fa174: 29c10002 */ slti $at,$t6,0x2 /* f0fa178: 1020000c */ beqz $at,.L0f0fa1ac @@ -11262,12 +11262,12 @@ glabel var7f1b2a64 /* f0fa1f4: 50400020 */ beqzl $v0,.L0f0fa278 /* f0fa1f8: 8fcf0000 */ lw $t7,0x0($s8) /* f0fa1fc: 8fca0000 */ lw $t2,0x0($s8) -/* f0fa200: 3c0b800a */ lui $t3,0x800a +/* f0fa200: 3c0b800a */ lui $t3,%hi(g_Vars+0x498) /* f0fa204: 8d420010 */ lw $v0,0x10($t2) /* f0fa208: 304c0800 */ andi $t4,$v0,0x800 /* f0fa20c: 11800013 */ beqz $t4,.L0f0fa25c /* f0fa210: 304e0020 */ andi $t6,$v0,0x20 -/* f0fa214: 8d6ba458 */ lw $t3,-0x5ba8($t3) +/* f0fa214: 8d6ba458 */ lw $t3,%lo(g_Vars+0x498)($t3) /* f0fa218: 3c0d8009 */ lui $t5,%hi(g_Is4Mb) /* f0fa21c: 1160000f */ beqz $t3,.L0f0fa25c /* f0fa220: 00000000 */ sll $zero,$zero,0x0 @@ -11447,7 +11447,7 @@ glabel var7f1b2a64 /* f0fa494: afc90064 */ sw $t1,0x64($s8) .L0f0fa498: /* f0fa498: 8d6b1448 */ lw $t3,%lo(g_MpPlayerNum)($t3) -/* f0fa49c: 3c0d800a */ lui $t5,0x800a +/* f0fa49c: 3c0d800a */ lui $t5,%hi(g_MenuStack+0xe40) /* f0fa4a0: 3c0f8006 */ lui $t7,%hi(var8005dd58) /* f0fa4a4: 000b60c0 */ sll $t4,$t3,0x3 /* f0fa4a8: 018b6023 */ subu $t4,$t4,$t3 @@ -11457,7 +11457,7 @@ glabel var7f1b2a64 /* f0fa4b8: 018b6023 */ subu $t4,$t4,$t3 /* f0fa4bc: 000c6100 */ sll $t4,$t4,0x4 /* f0fa4c0: 01ac6821 */ addu $t5,$t5,$t4 -/* f0fa4c4: 8dadee40 */ lw $t5,-0x11c0($t5) +/* f0fa4c4: 8dadee40 */ lw $t5,%lo(g_MenuStack+0xe40)($t5) /* f0fa4c8: 8fb80124 */ lw $t8,0x124($sp) /* f0fa4cc: 3c088007 */ lui $t0,%hi(g_MpPlayerNum) /* f0fa4d0: 000d77c2 */ srl $t6,$t5,0x1f @@ -11477,8 +11477,8 @@ glabel var7f1b2a64 /* f0fa504: a3000001 */ sb $zero,0x1($t8) /* f0fa508: a3000000 */ sb $zero,0x0($t8) /* f0fa50c: 8d081448 */ lw $t0,%lo(g_MpPlayerNum)($t0) -/* f0fa510: 3c09800a */ lui $t1,%hi(var8009e000) -/* f0fa514: 2529e000 */ addiu $t1,$t1,%lo(var8009e000) +/* f0fa510: 3c09800a */ lui $t1,0x800a +/* f0fa514: 2529e000 */ addiu $t1,$t1,-8192 /* f0fa518: 000850c0 */ sll $t2,$t0,0x3 /* f0fa51c: 01485023 */ subu $t2,$t2,$t0 /* f0fa520: 000a5080 */ sll $t2,$t2,0x2 @@ -11525,10 +11525,10 @@ glabel func0f0fa574 /* f0fa5b0: 01ee7821 */ addu $t7,$t7,$t6 /* f0fa5b4: 90830005 */ lbu $v1,0x5($a0) /* f0fa5b8: 000f78c0 */ sll $t7,$t7,0x3 -/* f0fa5bc: 3c18800a */ lui $t8,%hi(var8009e000) +/* f0fa5bc: 3c18800a */ lui $t8,0x800a /* f0fa5c0: 01ee7823 */ subu $t7,$t7,$t6 /* f0fa5c4: 000f7900 */ sll $t7,$t7,0x4 -/* f0fa5c8: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f0fa5c8: 2718e000 */ addiu $t8,$t8,-8192 /* f0fa5cc: 0080a825 */ or $s5,$a0,$zero /* f0fa5d0: 01f89021 */ addu $s2,$t7,$t8 /* f0fa5d4: 1860002a */ blez $v1,.L0f0fa680 @@ -11644,8 +11644,8 @@ glabel var7f1b2ac8 /* f0fa71c: 241e0e70 */ addiu $s8,$zero,0xe70 /* f0fa720: 01de0019 */ multu $t6,$s8 /* f0fa724: afb60030 */ sw $s6,0x30($sp) -/* f0fa728: 3c16800a */ lui $s6,%hi(var8009e000) -/* f0fa72c: 26d6e000 */ addiu $s6,$s6,%lo(var8009e000) +/* f0fa728: 3c16800a */ lui $s6,0x800a +/* f0fa72c: 26d6e000 */ addiu $s6,$s6,-8192 /* f0fa730: 3c19800a */ lui $t9,%hi(var800a19c4) /* f0fa734: 8f3919c4 */ lw $t9,%lo(var800a19c4)($t9) /* f0fa738: afb5002c */ sw $s5,0x2c($sp) @@ -11667,10 +11667,10 @@ glabel var7f1b2ac8 /* f0fa778: afa700fc */ sw $a3,0xfc($sp) /* f0fa77c: 17210005 */ bne $t9,$at,.L0f0fa794 /* f0fa780: afb80100 */ sw $t8,0x100($sp) -/* f0fa784: 3c0e800a */ lui $t6,0x800a -/* f0fa788: 8dcea24c */ lw $t6,-0x5db4($t6) -/* f0fa78c: 3c01800a */ lui $at,0x800a -/* f0fa790: ac2e21b8 */ sw $t6,0x21b8($at) +/* f0fa784: 3c0e800a */ lui $t6,%hi(g_Vars+0x28c) +/* f0fa788: 8dcea24c */ lw $t6,%lo(g_Vars+0x28c)($t6) +/* f0fa78c: 3c01800a */ lui $at,%hi(g_ActiveMenuIndex) +/* f0fa790: ac2e21b8 */ sw $t6,%lo(g_ActiveMenuIndex)($at) .L0f0fa794: /* f0fa794: afa80124 */ sw $t0,0x124($sp) /* f0fa798: afa90128 */ sw $t1,0x128($sp) @@ -12554,10 +12554,10 @@ glabel var7f1b2ac8 /* f0fb35c: 5080003f */ beqzl $a0,.L0f0fb45c /* f0fb360: 8fbf003c */ lw $ra,0x3c($sp) /* f0fb364: 8df9000c */ lw $t9,0xc($t7) -/* f0fb368: 3c18800a */ lui $t8,0x800a +/* f0fb368: 3c18800a */ lui $t8,%hi(g_Vars+0x490) /* f0fb36c: 5720003b */ bnezl $t9,.L0f0fb45c /* f0fb370: 8fbf003c */ lw $ra,0x3c($sp) -/* f0fb374: 8f18a450 */ lw $t8,-0x5bb0($t8) +/* f0fb374: 8f18a450 */ lw $t8,%lo(g_Vars+0x490)($t8) /* f0fb378: 8c820000 */ lw $v0,0x0($a0) /* f0fb37c: 24010002 */ addiu $at,$zero,0x2 /* f0fb380: 13010008 */ beq $t8,$at,.L0f0fb3a4 @@ -12586,8 +12586,8 @@ glabel var7f1b2ac8 /* f0fb3d8: 00000000 */ sll $zero,$zero,0x0 /* f0fb3dc: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f0fb3e0: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) -/* f0fb3e4: 3c0e800a */ lui $t6,%hi(var8009e000) -/* f0fb3e8: 25cee000 */ addiu $t6,$t6,%lo(var8009e000) +/* f0fb3e4: 3c0e800a */ lui $t6,0x800a +/* f0fb3e8: 25cee000 */ addiu $t6,$t6,-8192 /* f0fb3ec: 0019c0c0 */ sll $t8,$t9,0x3 /* f0fb3f0: 0319c023 */ subu $t8,$t8,$t9 /* f0fb3f4: 0018c080 */ sll $t8,$t8,0x2 @@ -12992,8 +12992,8 @@ glabel var7f1b2af4 /* f0fb984: 24842778 */ addiu $a0,$a0,%lo(var7f1b2778) /* f0fb988: 0c0036cc */ jal func0000db30 /* f0fb98c: e7ac0088 */ swc1 $f12,0x88($sp) -/* f0fb990: 3c0e800a */ lui $t6,0x800a -/* f0fb994: 91ce19d6 */ lbu $t6,0x19d6($t6) +/* f0fb990: 3c0e800a */ lui $t6,%hi(var800a19d4+0x2) +/* f0fb994: 91ce19d6 */ lbu $t6,%lo(var800a19d4+0x2)($t6) /* f0fb998: 3c0b8007 */ lui $t3,%hi(var800714ec) /* f0fb99c: 11c00003 */ beqz $t6,.L0f0fb9ac /* f0fb9a0: 00000000 */ sll $zero,$zero,0x0 @@ -13152,10 +13152,10 @@ glabel func0f0fbba0 /* f0fbbd8: 24842780 */ addiu $a0,$a0,%lo(var7f1b2780) /* f0fbbdc: 3c0f8007 */ lui $t7,%hi(var800714f0) /* f0fbbe0: 8def14f0 */ lw $t7,%lo(var800714f0)($t7) -/* f0fbbe4: 3c02800a */ lui $v0,0x800a +/* f0fbbe4: 3c02800a */ lui $v0,%hi(var800a19d4+0x1) /* f0fbbe8: 51e0000d */ beqzl $t7,.L0f0fbc20 /* f0fbbec: 8fbf0014 */ lw $ra,0x14($sp) -/* f0fbbf0: 904219d5 */ lbu $v0,0x19d5($v0) +/* f0fbbf0: 904219d5 */ lbu $v0,%lo(var800a19d4+0x1)($v0) /* f0fbbf4: 24010004 */ addiu $at,$zero,0x4 /* f0fbbf8: 10410005 */ beq $v0,$at,.L0f0fbc10 /* f0fbbfc: 00000000 */ sll $zero,$zero,0x0 @@ -13376,7 +13376,7 @@ glabel var7f1b2afc .L0f0fbef4: /* f0fbef4: 8e380000 */ lw $t8,0x0($s1) .L0f0fbef8: -/* f0fbef8: 3c0a800a */ lui $t2,%hi(g_MenuStack) +/* f0fbef8: 3c0a800a */ lui $t2,%hi(g_MenuStack+0x4f8) /* f0fbefc: 3c047f1b */ lui $a0,%hi(var7f1b2788) /* f0fbf00: 0018c8c0 */ sll $t9,$t8,0x3 /* f0fbf04: 0338c823 */ subu $t9,$t9,$t8 @@ -13386,7 +13386,7 @@ glabel var7f1b2afc /* f0fbf14: 0338c823 */ subu $t9,$t9,$t8 /* f0fbf18: 0019c900 */ sll $t9,$t9,0x4 /* f0fbf1c: 01595021 */ addu $t2,$t2,$t9 -/* f0fbf20: 8d4ae4f8 */ lw $t2,%lo(g_MenuStack)($t2) +/* f0fbf20: 8d4ae4f8 */ lw $t2,%lo(g_MenuStack+0x4f8)($t2) /* f0fbf24: 26d69fc0 */ addiu $s6,$s6,%lo(g_Vars) /* f0fbf28: 24842788 */ addiu $a0,$a0,%lo(var7f1b2788) /* f0fbf2c: 15400004 */ bnez $t2,.L0f0fbf40 @@ -13643,9 +13643,9 @@ glabel var7f1b2afc /* f0fc2bc: afb900e4 */ sw $t9,0xe4($sp) /* f0fc2c0: 0fc54d8a */ jal func0f153628 /* f0fc2c4: 02a02025 */ or $a0,$s5,$zero -/* f0fc2c8: 3c13800a */ lui $s3,0x800a +/* f0fc2c8: 3c13800a */ lui $s3,%hi(g_Vars+0x4) /* f0fc2cc: 0040a825 */ or $s5,$v0,$zero -/* f0fc2d0: 26739fc4 */ addiu $s3,$s3,-24636 +/* f0fc2d0: 26739fc4 */ addiu $s3,$s3,%lo(g_Vars+0x4) /* f0fc2d4: 00009025 */ or $s2,$zero,$zero /* f0fc2d8: 27b400b8 */ addiu $s4,$sp,0xb8 /* f0fc2dc: 8ec20490 */ lw $v0,0x490($s6) @@ -13725,8 +13725,8 @@ glabel var7f1b2afc /* f0fc3e8: afaf0010 */ sw $t7,0x10($sp) /* f0fc3ec: 0c005013 */ jal func0001404c /* f0fc3f0: 00000000 */ sll $zero,$zero,0x0 -/* f0fc3f4: 3c19800b */ lui $t9,0x800b -/* f0fc3f8: 9739cb9e */ lhu $t9,-0x3462($t9) +/* f0fc3f4: 3c19800b */ lui $t9,%hi(g_MpSetup+0x16) +/* f0fc3f8: 9739cb9e */ lhu $t9,%lo(g_MpSetup+0x16)($t9) /* f0fc3fc: 0040c027 */ nor $t8,$v0,$zero /* f0fc400: 240c0001 */ addiu $t4,$zero,0x1 /* f0fc404: 024c5804 */ sllv $t3,$t4,$s2 @@ -14297,11 +14297,11 @@ glabel func0f0fc9f4 /* f0fcbc8: 00000000 */ sll $zero,$zero,0x0 /* f0fcbcc: 3c0e8006 */ lui $t6,%hi(var80062940) /* f0fcbd0: 91ce2940 */ lbu $t6,%lo(var80062940)($t6) -/* f0fcbd4: 3c0f800a */ lui $t7,0x800a +/* f0fcbd4: 3c0f800a */ lui $t7,%hi(g_Vars+0x4b4) /* f0fcbd8: 00001025 */ or $v0,$zero,$zero /* f0fcbdc: 15c00007 */ bnez $t6,.L0f0fcbfc /* f0fcbe0: 00000000 */ sll $zero,$zero,0x0 -/* f0fcbe4: 8defa474 */ lw $t7,-0x5b8c($t7) +/* f0fcbe4: 8defa474 */ lw $t7,%lo(g_Vars+0x4b4)($t7) /* f0fcbe8: 24010026 */ addiu $at,$zero,0x26 /* f0fcbec: 15e10003 */ bne $t7,$at,.L0f0fcbfc /* f0fcbf0: 00000000 */ sll $zero,$zero,0x0 @@ -14352,8 +14352,8 @@ glabel menuhandler000fcc34 /* f0fcc7c: 3c158007 */ lui $s5,%hi(menudialog_pakremoved) /* f0fcc80: 3c148007 */ lui $s4,%hi(g_PakRepairSuccessMenuDialog) /* f0fcc84: 3c128007 */ lui $s2,%hi(g_MpPlayerNum) -/* f0fcc88: 3c11800a */ lui $s1,%hi(var8009e000) -/* f0fcc8c: 2631e000 */ addiu $s1,$s1,%lo(var8009e000) +/* f0fcc88: 3c11800a */ lui $s1,0x800a +/* f0fcc8c: 2631e000 */ addiu $s1,$s1,-8192 /* f0fcc90: 26521448 */ addiu $s2,$s2,%lo(g_MpPlayerNum) /* f0fcc94: 269415b0 */ addiu $s4,$s4,%lo(g_PakRepairSuccessMenuDialog) /* f0fcc98: 26b51548 */ addiu $s5,$s5,%lo(menudialog_pakremoved) @@ -14415,8 +14415,8 @@ glabel menudialog000fcd48 /* f0fcd58: afa60020 */ sw $a2,0x20($sp) /* f0fcd5c: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f0fcd60: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f0fcd64: 3c18800a */ lui $t8,%hi(var8009e000) -/* f0fcd68: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f0fcd64: 3c18800a */ lui $t8,0x800a +/* f0fcd68: 2718e000 */ addiu $t8,$t8,-8192 /* f0fcd6c: 000e78c0 */ sll $t7,$t6,0x3 /* f0fcd70: 01ee7823 */ subu $t7,$t7,$t6 /* f0fcd74: 000f7880 */ sll $t7,$t7,0x2 @@ -14464,7 +14464,7 @@ glabel menudialog000fcd48 s32 menuhandlerRepairPak(u32 operation, struct menu_item *item, s32 *value) { if (operation == MENUOP_SET) { - if (pakRepair(g_MenuStack[g_MpPlayerNum].unk974)) { + if (pakRepair(g_MenuStack[g_MpPlayerNum].unke6c)) { func0f0f3704(&g_PakRepairSuccessMenuDialog); } else { func0f0f3704(&g_PakRepairFailedMenuDialog); @@ -14482,8 +14482,8 @@ glabel func0f0fce8c /* f0fce98: 0305c021 */ addu $t8,$t8,$a1 /* f0fce9c: 0018c0c0 */ sll $t8,$t8,0x3 /* f0fcea0: 0305c023 */ subu $t8,$t8,$a1 -/* f0fcea4: 3c19800a */ lui $t9,%hi(var8009e000) -/* f0fcea8: 2739e000 */ addiu $t9,$t9,%lo(var8009e000) +/* f0fcea4: 3c19800a */ lui $t9,0x800a +/* f0fcea8: 2739e000 */ addiu $t9,$t9,-8192 /* f0fceac: 0018c100 */ sll $t8,$t8,0x4 /* f0fceb0: 3c088007 */ lui $t0,%hi(g_MpPlayerNum) /* f0fceb4: 03191021 */ addu $v0,$t8,$t9 @@ -14573,7 +14573,7 @@ glabel func0f0fcfb8 /* f0fcfd4: 3c088007 */ lui $t0,%hi(g_MpPlayerNum) /* f0fcfd8: ac610000 */ sw $at,0x0($v1) /* f0fcfdc: 8dd90004 */ lw $t9,0x4($t6) -/* f0fcfe0: 3c02800a */ lui $v0,0x800a +/* f0fcfe0: 3c02800a */ lui $v0,%hi(g_MenuStack+0xe6c) /* f0fcfe4: ac790004 */ sw $t9,0x4($v1) /* f0fcfe8: 95c10008 */ lhu $at,0x8($t6) /* f0fcfec: a4610008 */ sh $at,0x8($v1) @@ -14586,7 +14586,7 @@ glabel func0f0fcfb8 /* f0fd008: 01284823 */ subu $t1,$t1,$t0 /* f0fd00c: 00094900 */ sll $t1,$t1,0x4 /* f0fd010: 00491021 */ addu $v0,$v0,$t1 -/* f0fd014: 9042ee6c */ lbu $v0,-0x1194($v0) +/* f0fd014: 9042ee6c */ lbu $v0,%lo(g_MenuStack+0xe6c)($v0) /* f0fd018: 28410005 */ slti $at,$v0,0x5 /* f0fd01c: 10200006 */ beqz $at,.L0f0fd038 /* f0fd020: 00025040 */ sll $t2,$v0,0x1 @@ -14610,7 +14610,7 @@ s32 menuhandlerRetrySavePak(u32 operation, struct menu_item *item, s32 *value) menuPopDialog(); g_Vars.unk0004e4 &= 0xfff0; g_Vars.unk0004e4 |= 8; - g_Vars.unk0004e4 |= 1 << ((u8)g_MenuStack[g_MpPlayerNum].unk974 + 8); + g_Vars.unk0004e4 |= 1 << ((u8)g_MenuStack[g_MpPlayerNum].unke6c + 8); } return 0; @@ -14631,10 +14631,10 @@ glabel func0f0fd118 /* f0fd11c: 24e79fc0 */ addiu $a3,$a3,%lo(g_Vars) /* f0fd120: 8cee0318 */ lw $t6,0x318($a3) /* f0fd124: 00001825 */ or $v1,$zero,$zero -/* f0fd128: 3c0f800b */ lui $t7,0x800b +/* f0fd128: 3c0f800b */ lui $t7,%hi(g_MpSetup+0x16) /* f0fd12c: 51c0000a */ beqzl $t6,.L0f0fd158 /* f0fd130: 8ce90298 */ lw $t1,0x298($a3) -/* f0fd134: 95efcb9e */ lhu $t7,-0x3462($t7) +/* f0fd134: 95efcb9e */ lhu $t7,%lo(g_MpSetup+0x16)($t7) /* f0fd138: 24180001 */ addiu $t8,$zero,0x1 /* f0fd13c: 0098c804 */ sllv $t9,$t8,$a0 /* f0fd140: 01f94024 */ and $t0,$t7,$t9 @@ -14722,9 +14722,9 @@ glabel func0f0fd1f4 /* f0fd254: 24050001 */ addiu $a1,$zero,0x1 .L0f0fd258: /* f0fd258: 0019c900 */ sll $t9,$t9,0x4 -/* f0fd25c: 3c04800a */ lui $a0,%hi(g_MenuStack) +/* f0fd25c: 3c04800a */ lui $a0,%hi(g_MenuStack+0x4f8) /* f0fd260: 00992021 */ addu $a0,$a0,$t9 -/* f0fd264: 8c84e4f8 */ lw $a0,%lo(g_MenuStack)($a0) +/* f0fd264: 8c84e4f8 */ lw $a0,%lo(g_MenuStack+0x4f8)($a0) /* f0fd268: 8fbf0014 */ lw $ra,0x14($sp) /* f0fd26c: 3c02800a */ lui $v0,%hi(var800a19c0) /* f0fd270: 1080001d */ beqz $a0,.L0f0fd2e8 @@ -14819,8 +14819,8 @@ glabel var7f1b2b10 /* f0fd388: 8fbf0014 */ lw $ra,0x14($sp) /* f0fd38c: 3c048007 */ lui $a0,%hi(g_MpPlayerNum) /* f0fd390: 8c841448 */ lw $a0,%lo(g_MpPlayerNum)($a0) -/* f0fd394: 3c19800a */ lui $t9,%hi(var8009e000) -/* f0fd398: 2739e000 */ addiu $t9,$t9,%lo(var8009e000) +/* f0fd394: 3c19800a */ lui $t9,0x800a +/* f0fd398: 2739e000 */ addiu $t9,$t9,-8192 /* f0fd39c: 0004c0c0 */ sll $t8,$a0,0x3 /* f0fd3a0: 0304c023 */ subu $t8,$t8,$a0 /* f0fd3a4: 0018c080 */ sll $t8,$t8,0x2 @@ -14959,8 +14959,8 @@ GLOBAL_ASM( glabel func0f0fd570 /* f0fd570: 3c028007 */ lui $v0,%hi(g_MpPlayerNum) /* f0fd574: 8c421448 */ lw $v0,%lo(g_MpPlayerNum)($v0) -/* f0fd578: 3c0f800a */ lui $t7,%hi(var8009e000) -/* f0fd57c: 25efe000 */ addiu $t7,$t7,%lo(var8009e000) +/* f0fd578: 3c0f800a */ lui $t7,0x800a +/* f0fd57c: 25efe000 */ addiu $t7,$t7,-8192 /* f0fd580: 000270c0 */ sll $t6,$v0,0x3 /* f0fd584: 01c27023 */ subu $t6,$t6,$v0 /* f0fd588: 000e7080 */ sll $t6,$t6,0x2 diff --git a/src/game/game_0fd660.c b/src/game/game_0fd660.c index 1a3e88177..e456eefa5 100644 --- a/src/game/game_0fd660.c +++ b/src/game/game_0fd660.c @@ -106,13 +106,13 @@ glabel var7f1b2cd8 /* f0fd720: 00000000 */ sll $zero,$zero,0x0 /* f0fd724: 3c0f800a */ lui $t7,%hi(g_ActiveMenuIndex) /* f0fd728: 8def21b8 */ lw $t7,%lo(g_ActiveMenuIndex)($t7) -/* f0fd72c: 3c19800a */ lui $t9,0x800a +/* f0fd72c: 3c19800a */ lui $t9,%hi(g_ActiveMenuThings+0x33) /* f0fd730: 3c0b800a */ lui $t3,%hi(g_Vars) /* f0fd734: 000fc0c0 */ sll $t8,$t7,0x3 /* f0fd738: 030fc023 */ subu $t8,$t8,$t7 /* f0fd73c: 0018c0c0 */ sll $t8,$t8,0x3 /* f0fd740: 0338c821 */ addu $t9,$t9,$t8 -/* f0fd744: 93392103 */ lbu $t9,0x2103($t9) +/* f0fd744: 93392103 */ lbu $t9,%lo(g_ActiveMenuThings+0x33)($t9) /* f0fd748: 256b9fc0 */ addiu $t3,$t3,%lo(g_Vars) /* f0fd74c: 3c06800b */ lui $a2,%hi(g_MpNumPlayers) /* f0fd750: 1320004b */ beqz $t9,.L0f0fd880 @@ -783,7 +783,7 @@ glabel func0f0fe848 /* f0fe864: afb00008 */ sw $s0,0x8($sp) /* f0fe868: 3c0f800a */ lui $t7,%hi(g_ActiveMenuThings) /* f0fe86c: 25e420d0 */ addiu $a0,$t7,%lo(g_ActiveMenuThings) -/* f0fe870: 3c12800b */ lui $s2,0x800b +/* f0fe870: 3c12800b */ lui $s2,%hi(g_MpSetup+0x6) /* f0fe874: 3c13800a */ lui $s3,%hi(var800a21b0) /* f0fe878: 3c0c8008 */ lui $t4,%hi(mpweaponstable) /* f0fe87c: 3c0a7f1b */ lui $t2,%hi(var7f1b2b20) @@ -792,7 +792,7 @@ glabel func0f0fe848 /* f0fe888: 254a2b20 */ addiu $t2,$t2,%lo(var7f1b2b20) /* f0fe88c: 258c7268 */ addiu $t4,$t4,%lo(mpweaponstable) /* f0fe890: 267321b0 */ addiu $s3,$s3,%lo(var800a21b0) -/* f0fe894: 2652cb8e */ addiu $s2,$s2,-13426 +/* f0fe894: 2652cb8e */ addiu $s2,$s2,%lo(g_MpSetup+0x6) /* f0fe898: 00801825 */ or $v1,$a0,$zero /* f0fe89c: 2410005b */ addiu $s0,$zero,0x5b /* f0fe8a0: 2411005c */ addiu $s1,$zero,0x5c @@ -875,28 +875,28 @@ glabel func0f0fe848 /* f0fe9b0: 3c198008 */ lui $t9,%hi(var8007fb10) /* f0fe9b4: 3c0f8008 */ lui $t7,%hi(var8007fb08) /* f0fe9b8: 8deffb08 */ lw $t7,%lo(var8007fb08)($t7) -/* f0fe9bc: 3c01800a */ lui $at,0x800a +/* f0fe9bc: 3c01800a */ lui $at,%hi(var800a21b0) /* f0fe9c0: 3c188008 */ lui $t8,%hi(var8007fb04) /* f0fe9c4: 8f18fb04 */ lw $t8,%lo(var8007fb04)($t8) -/* f0fe9c8: ac2f21b0 */ sw $t7,0x21b0($at) -/* f0fe9cc: 3c01800a */ lui $at,0x800a +/* f0fe9c8: ac2f21b0 */ sw $t7,%lo(var800a21b0)($at) +/* f0fe9cc: 3c01800a */ lui $at,%hi(var800a21b4) /* f0fe9d0: 10000008 */ beqz $zero,.L0f0fe9f4 -/* f0fe9d4: ac3821b4 */ sw $t8,0x21b4($at) +/* f0fe9d4: ac3821b4 */ sw $t8,%lo(var800a21b4)($at) .L0f0fe9d8: /* f0fe9d8: 8f39fb10 */ lw $t9,%lo(var8007fb10)($t9) /* f0fe9dc: 3c0e8008 */ lui $t6,%hi(var8007fb0c) /* f0fe9e0: 8dcefb0c */ lw $t6,%lo(var8007fb0c)($t6) -/* f0fe9e4: 3c01800a */ lui $at,0x800a -/* f0fe9e8: ac3921b0 */ sw $t9,0x21b0($at) -/* f0fe9ec: 3c01800a */ lui $at,0x800a -/* f0fe9f0: ac2e21b4 */ sw $t6,0x21b4($at) +/* f0fe9e4: 3c01800a */ lui $at,%hi(var800a21b0) +/* f0fe9e8: ac3921b0 */ sw $t9,%lo(var800a21b0)($at) +/* f0fe9ec: 3c01800a */ lui $at,%hi(var800a21b4) +/* f0fe9f0: ac2e21b4 */ sw $t6,%lo(var800a21b4)($at) .L0f0fe9f4: -/* f0fe9f4: 3c01800a */ lui $at,0x800a +/* f0fe9f4: 3c01800a */ lui $at,%hi(g_ActiveMenuIndex) /* f0fe9f8: 8fb00008 */ lw $s0,0x8($sp) /* f0fe9fc: 8fb1000c */ lw $s1,0xc($sp) /* f0fea00: 8fb20010 */ lw $s2,0x10($sp) /* f0fea04: 8fb30014 */ lw $s3,0x14($sp) -/* f0fea08: ac2021b8 */ sw $zero,0x21b8($at) +/* f0fea08: ac2021b8 */ sw $zero,%lo(g_ActiveMenuIndex)($at) /* f0fea0c: 03e00008 */ jr $ra /* f0fea10: 27bd0018 */ addiu $sp,$sp,0x18 ); @@ -992,7 +992,7 @@ glabel func0f0fecd4 /* f0fecf4: afb00014 */ sw $s0,0x14($sp) /* f0fecf8: 3c04800a */ lui $a0,%hi(g_ActiveMenuIndex) /* f0fecfc: 8c8421b8 */ lw $a0,%lo(g_ActiveMenuIndex)($a0) -/* f0fed00: 3c01800a */ lui $at,0x800a +/* f0fed00: 3c01800a */ lui $at,%hi(g_ActiveMenuThings+0x31) /* f0fed04: 3c18800a */ lui $t8,%hi(g_ActiveMenuThings) /* f0fed08: 000470c0 */ sll $t6,$a0,0x3 /* f0fed0c: 01c47023 */ subu $t6,$t6,$a0 @@ -1003,7 +1003,7 @@ glabel func0f0fecd4 /* f0fed20: 000f78c0 */ sll $t7,$t7,0x3 /* f0fed24: 271820d0 */ addiu $t8,$t8,%lo(g_ActiveMenuThings) /* f0fed28: 00409825 */ or $s3,$v0,$zero -/* f0fed2c: a0222101 */ sb $v0,0x2101($at) +/* f0fed2c: a0222101 */ sb $v0,%lo(g_ActiveMenuThings+0x31)($at) /* f0fed30: 01f81821 */ addu $v1,$t7,$t8 /* f0fed34: 240400ff */ addiu $a0,$zero,0xff /* f0fed38: 00008825 */ or $s1,$zero,$zero @@ -1212,7 +1212,7 @@ glabel func0f0ff0bc /* f0ff0d8: 004f1021 */ addu $v0,$v0,$t7 /* f0ff0dc: 804220d0 */ lb $v0,%lo(g_ActiveMenuThings)($v0) /* f0ff0e0: afbf0014 */ sw $ra,0x14($sp) -/* f0ff0e4: 3c07800a */ lui $a3,0x800a +/* f0ff0e4: 3c07800a */ lui $a3,%hi(g_Vars+0x6c) /* f0ff0e8: 2c580001 */ sltiu $t8,$v0,0x1 /* f0ff0ec: 13000020 */ beqz $t8,.L0f0ff170 /* f0ff0f0: 3c02800a */ lui $v0,%hi(g_Vars) @@ -1254,15 +1254,15 @@ glabel func0f0ff0bc .L0f0ff170: /* f0ff170: 3c028009 */ lui $v0,%hi(g_Is4Mb) /* f0ff174: 90420af0 */ lbu $v0,%lo(g_Is4Mb)($v0) -/* f0ff178: 3c08800a */ lui $t0,0x800a -/* f0ff17c: 3c09800a */ lui $t1,0x800a -/* f0ff180: 3c0a800a */ lui $t2,0x800a +/* f0ff178: 3c08800a */ lui $t0,%hi(g_Vars+0x68) +/* f0ff17c: 3c09800a */ lui $t1,%hi(g_Vars+0x64) +/* f0ff180: 3c0a800a */ lui $t2,%hi(g_Vars+0x70) /* f0ff184: 38590001 */ xori $t9,$v0,0x1 -/* f0ff188: 8d4aa030 */ lw $t2,-0x5fd0($t2) -/* f0ff18c: 8d29a024 */ lw $t1,-0x5fdc($t1) -/* f0ff190: 8d08a028 */ lw $t0,-0x5fd8($t0) +/* f0ff188: 8d4aa030 */ lw $t2,%lo(g_Vars+0x70)($t2) +/* f0ff18c: 8d29a024 */ lw $t1,%lo(g_Vars+0x64)($t1) +/* f0ff190: 8d08a028 */ lw $t0,%lo(g_Vars+0x68)($t0) /* f0ff194: 17200018 */ bnez $t9,.L0f0ff1f8 -/* f0ff198: 8ce7a02c */ lw $a3,-0x5fd4($a3) +/* f0ff198: 8ce7a02c */ lw $a3,%lo(g_Vars+0x6c)($a3) /* f0ff19c: 10e00003 */ beqz $a3,.L0f0ff1ac /* f0ff1a0: 00003025 */ or $a2,$zero,$zero /* f0ff1a4: 10000001 */ beqz $zero,.L0f0ff1ac @@ -1629,8 +1629,8 @@ glabel func0f0ff274 /* f0ff6ac: 28810003 */ slti $at,$a0,0x3 /* f0ff6b0: 1420000c */ bnez $at,.L0f0ff6e4 .L0f0ff6b4: -/* f0ff6b4: 3c18800a */ lui $t8,0x800a -/* f0ff6b8: 8f18a24c */ lw $t8,-0x5db4($t8) +/* f0ff6b4: 3c18800a */ lui $t8,%hi(g_Vars+0x28c) +/* f0ff6b8: 8f18a24c */ lw $t8,%lo(g_Vars+0x28c)($t8) /* f0ff6bc: 33190001 */ andi $t9,$t8,0x1 /* f0ff6c0: 57200006 */ bnezl $t9,.L0f0ff6dc /* f0ff6c4: 84d80000 */ lh $t8,0x0($a2) @@ -1799,17 +1799,17 @@ glabel var7f1b2ce0 /* f0ff8e4: 3c0b8009 */ lui $t3,%hi(g_Is4Mb) /* f0ff8e8: 916b0af0 */ lbu $t3,%lo(g_Is4Mb)($t3) /* f0ff8ec: 24010001 */ addiu $at,$zero,0x1 -/* f0ff8f0: 3c06800a */ lui $a2,0x800a +/* f0ff8f0: 3c06800a */ lui $a2,%hi(g_Vars+0x6c) /* f0ff8f4: 1161001f */ beq $t3,$at,.L0f0ff974 -/* f0ff8f8: 3c07800a */ lui $a3,0x800a -/* f0ff8fc: 3c08800a */ lui $t0,0x800a -/* f0ff900: 3c09800a */ lui $t1,0x800a +/* f0ff8f8: 3c07800a */ lui $a3,%hi(g_Vars+0x68) +/* f0ff8fc: 3c08800a */ lui $t0,%hi(g_Vars+0x64) +/* f0ff900: 3c09800a */ lui $t1,%hi(g_Vars+0x70) /* f0ff904: 3c0a800a */ lui $t2,%hi(g_Vars) /* f0ff908: 254a9fc0 */ addiu $t2,$t2,%lo(g_Vars) -/* f0ff90c: 8d29a030 */ lw $t1,-0x5fd0($t1) -/* f0ff910: 8d08a024 */ lw $t0,-0x5fdc($t0) -/* f0ff914: 8cc6a02c */ lw $a2,-0x5fd4($a2) -/* f0ff918: 8ce7a028 */ lw $a3,-0x5fd8($a3) +/* f0ff90c: 8d29a030 */ lw $t1,%lo(g_Vars+0x70)($t1) +/* f0ff910: 8d08a024 */ lw $t0,%lo(g_Vars+0x64)($t0) +/* f0ff914: 8cc6a02c */ lw $a2,%lo(g_Vars+0x6c)($a2) +/* f0ff918: 8ce7a028 */ lw $a3,%lo(g_Vars+0x68)($a3) .L0f0ff91c: /* f0ff91c: 10c00003 */ beqz $a2,.L0f0ff92c /* f0ff920: 00002825 */ or $a1,$zero,$zero @@ -1852,12 +1852,12 @@ glabel var7f1b2ce0 .L0f0ff9a0: /* f0ff9a0: 3c0c800a */ lui $t4,%hi(g_ActiveMenuIndex) /* f0ff9a4: 8d8c21b8 */ lw $t4,%lo(g_ActiveMenuIndex)($t4) -/* f0ff9a8: 3c0e800a */ lui $t6,0x800a +/* f0ff9a8: 3c0e800a */ lui $t6,%hi(g_ActiveMenuThings+0x32) /* f0ff9ac: 000c68c0 */ sll $t5,$t4,0x3 /* f0ff9b0: 01ac6823 */ subu $t5,$t5,$t4 /* f0ff9b4: 000d68c0 */ sll $t5,$t5,0x3 /* f0ff9b8: 01cd7021 */ addu $t6,$t6,$t5 -/* f0ff9bc: 91ce2102 */ lbu $t6,0x2102($t6) +/* f0ff9bc: 91ce2102 */ lbu $t6,%lo(g_ActiveMenuThings+0x32)($t6) /* f0ff9c0: 15c00142 */ bnez $t6,.L0f0ffecc /* f0ff9c4: 00000000 */ sll $zero,$zero,0x0 /* f0ff9c8: 8d4f0284 */ lw $t7,0x284($t2) @@ -2205,8 +2205,8 @@ glabel var7f1b2ce0 /* f0ffeac: afaf0010 */ sw $t7,0x10($sp) /* f0ffeb0: 8fae0048 */ lw $t6,0x48($sp) /* f0ffeb4: afa20098 */ sw $v0,0x98($sp) -/* f0ffeb8: 3c0d800a */ lui $t5,0x800a -/* f0ffebc: 8dada244 */ lw $t5,-0x5dbc($t5) +/* f0ffeb8: 3c0d800a */ lui $t5,%hi(g_Vars+0x284) +/* f0ffebc: 8dada244 */ lw $t5,%lo(g_Vars+0x284)($t5) /* f0ffec0: 8dcf0000 */ lw $t7,0x0($t6) /* f0ffec4: 10000093 */ beqz $zero,.L0f100114 /* f0ffec8: adaf1c04 */ sw $t7,0x1c04($t5) @@ -2252,10 +2252,10 @@ glabel var7f1b2ce0 /* f0fff5c: 44819000 */ mtc1 $at,$f18 /* f0fff60: 44994000 */ mtc1 $t9,$f8 /* f0fff64: 00007812 */ mflo $t7 -/* f0fff68: 3c19800a */ lui $t9,0x800a +/* f0fff68: 3c19800a */ lui $t9,%hi(g_Vars+0x6c) /* f0fff6c: 46128102 */ mul.s $f4,$f16,$f18 -/* f0fff70: 8f39a02c */ lw $t9,-0x5fd4($t9) -/* f0fff74: 3c18800a */ lui $t8,0x800a +/* f0fff70: 8f39a02c */ lw $t9,%lo(g_Vars+0x6c)($t9) +/* f0fff74: 3c18800a */ lui $t8,%hi(g_Vars+0x68) /* f0fff78: 00002825 */ or $a1,$zero,$zero /* f0fff7c: 00002025 */ or $a0,$zero,$zero /* f0fff80: 468042a0 */ cvt.s.w $f10,$f8 @@ -2287,22 +2287,22 @@ glabel var7f1b2ce0 /* f0fffe0: 10000001 */ beqz $zero,.L0f0fffe8 /* f0fffe4: 24050001 */ addiu $a1,$zero,0x1 .L0f0fffe8: -/* f0fffe8: 8f18a028 */ lw $t8,-0x5fd8($t8) -/* f0fffec: 3c0d800a */ lui $t5,0x800a -/* f0ffff0: 3c0c800a */ lui $t4,0x800a +/* f0fffe8: 8f18a028 */ lw $t8,%lo(g_Vars+0x68)($t8) +/* f0fffec: 3c0d800a */ lui $t5,%hi(g_Vars+0x64) +/* f0ffff0: 3c0c800a */ lui $t4,%hi(g_Vars+0x70) /* f0ffff4: 13000003 */ beqz $t8,.L0f100004 /* f0ffff8: 00001825 */ or $v1,$zero,$zero /* f0ffffc: 10000001 */ beqz $zero,.L0f100004 /* f100000: 24040001 */ addiu $a0,$zero,0x1 .L0f100004: -/* f100004: 8dada024 */ lw $t5,-0x5fdc($t5) +/* f100004: 8dada024 */ lw $t5,%lo(g_Vars+0x64)($t5) /* f100008: 00001025 */ or $v0,$zero,$zero /* f10000c: 11a00003 */ beqz $t5,.L0f10001c /* f100010: 00000000 */ sll $zero,$zero,0x0 /* f100014: 10000001 */ beqz $zero,.L0f10001c /* f100018: 24030001 */ addiu $v1,$zero,0x1 .L0f10001c: -/* f10001c: 8d8ca030 */ lw $t4,-0x5fd0($t4) +/* f10001c: 8d8ca030 */ lw $t4,%lo(g_Vars+0x70)($t4) /* f100020: 11800003 */ beqz $t4,.L0f100030 /* f100024: 00000000 */ sll $zero,$zero,0x0 /* f100028: 10000001 */ beqz $zero,.L0f100030 @@ -2551,8 +2551,8 @@ glabel func0f100128 /* f100390: 321900ff */ andi $t9,$s0,0xff /* f100394: 03208025 */ or $s0,$t9,$zero .L0f100398: -/* f100398: 3c0e800a */ lui $t6,0x800a -/* f10039c: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f100398: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f10039c: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f1003a0: 91cf0250 */ lbu $t7,0x250($t6) /* f1003a4: 544f0003 */ bnel $v0,$t7,.L0f1003b4 /* f1003a8: 02002825 */ or $a1,$s0,$zero @@ -2670,7 +2670,7 @@ glabel func0f100128 /* f10054c: 46043402 */ mul.s $f16,$f6,$f4 /* f100550: 24190001 */ addiu $t9,$zero,0x1 /* f100554: 3c014f00 */ lui $at,0x4f00 -/* f100558: 3c0f800a */ lui $t7,0x800a +/* f100558: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) /* f10055c: 4458f800 */ cfc1 $t8,$31 /* f100560: 44d9f800 */ ctc1 $t9,$31 /* f100564: 00000000 */ sll $zero,$zero,0x0 @@ -2704,7 +2704,7 @@ glabel func0f100128 /* f1005cc: 0720fffb */ bltz $t9,.L0f1005bc /* f1005d0: 00000000 */ sll $zero,$zero,0x0 .L0f1005d4: -/* f1005d4: 8defa244 */ lw $t7,-0x5dbc($t7) +/* f1005d4: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) /* f1005d8: 44d8f800 */ ctc1 $t8,$31 /* f1005dc: 2401ff00 */ addiu $at,$zero,-256 /* f1005e0: 91f80250 */ lbu $t8,0x250($t7) @@ -2988,7 +2988,7 @@ glabel func0f100128 /* f1009f8: 46122202 */ mul.s $f8,$f4,$f18 /* f1009fc: 24190001 */ addiu $t9,$zero,0x1 /* f100a00: 3c014f00 */ lui $at,0x4f00 -/* f100a04: 3c0e800a */ lui $t6,0x800a +/* f100a04: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) /* f100a08: 87a7007a */ lh $a3,0x7a($sp) /* f100a0c: 4458f800 */ cfc1 $t8,$31 /* f100a10: 44d9f800 */ ctc1 $t9,$31 @@ -3023,7 +3023,7 @@ glabel func0f100128 /* f100a7c: 0720fffb */ bltz $t9,.L0f100a6c /* f100a80: 00000000 */ sll $zero,$zero,0x0 .L0f100a84: -/* f100a84: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f100a84: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f100a88: 44d8f800 */ ctc1 $t8,$31 /* f100a8c: 2401ff00 */ addiu $at,$zero,-256 /* f100a90: 91d80250 */ lbu $t8,0x250($t6) @@ -3076,8 +3076,8 @@ glabel func0f100ad0 /* f100b2c: 3c0b800a */ lui $t3,%hi(g_Vars) /* f100b30: 256b9fc0 */ addiu $t3,$t3,%lo(g_Vars) /* f100b34: 8d79028c */ lw $t9,0x28c($t3) -/* f100b38: 3c01800a */ lui $at,0x800a -/* f100b3c: ac3921b8 */ sw $t9,0x21b8($at) +/* f100b38: 3c01800a */ lui $at,%hi(g_ActiveMenuIndex) +/* f100b3c: ac3921b8 */ sw $t9,%lo(g_ActiveMenuIndex)($at) /* f100b40: 8d6e0284 */ lw $t6,0x284($t3) /* f100b44: adc01c04 */ sw $zero,0x1c04($t6) /* f100b48: 8d630284 */ lw $v1,0x284($t3) @@ -3427,7 +3427,7 @@ glabel func0f100ad0 /* f101084: 01de0019 */ multu $t6,$s8 /* f101088: 02799021 */ addu $s2,$s3,$t9 /* f10108c: afa001d0 */ sw $zero,0x1d0($sp) -/* f101090: 3c0e800a */ lui $t6,0x800a +/* f101090: 3c0e800a */ lui $t6,%hi(g_MissionConfig+0x3) /* f101094: 00007812 */ mflo $t7 /* f101098: 02efc021 */ addu $t8,$s7,$t7 /* f10109c: 9319000e */ lbu $t9,0xe($t8) @@ -3435,7 +3435,7 @@ glabel func0f100ad0 /* f1010a4: 00000000 */ sll $zero,$zero,0x0 /* f1010a8: 24100001 */ addiu $s0,$zero,0x1 .L0f1010ac: -/* f1010ac: 81cfdfeb */ lb $t7,-0x2015($t6) +/* f1010ac: 81cfdfeb */ lb $t7,%lo(g_MissionConfig+0x3)($t6) /* f1010b0: 05e10029 */ bgez $t7,.L0f101158 /* f1010b4: 00000000 */ sll $zero,$zero,0x0 /* f1010b8: 0fc3f7a3 */ jal activemenuGetFirstBuddyIndex @@ -3450,7 +3450,7 @@ glabel func0f100ad0 /* f1010dc: 0000c812 */ mflo $t9 /* f1010e0: 02f97021 */ addu $t6,$s7,$t9 /* f1010e4: 81cf0000 */ lb $t7,0x0($t6) -/* f1010e8: 3c19800a */ lui $t9,0x800a +/* f1010e8: 3c19800a */ lui $t9,%hi(g_Vars+0x4b8) /* f1010ec: 0338c821 */ addu $t9,$t9,$t8 /* f1010f0: 29e10002 */ slti $at,$t7,0x2 /* f1010f4: 14200037 */ bnez $at,.L0f1011d4 @@ -3459,7 +3459,7 @@ glabel func0f100ad0 /* f101100: 02ce7821 */ addu $t7,$s6,$t6 /* f101104: 01f3c021 */ addu $t8,$t7,$s3 /* f101108: 93040000 */ lbu $a0,0x0($t8) -/* f10110c: 8f39a478 */ lw $t9,-0x5b88($t9) +/* f10110c: 8f39a478 */ lw $t9,%lo(g_Vars+0x4b8)($t9) /* f101110: 24010007 */ addiu $at,$zero,0x7 /* f101114: 14810007 */ bne $a0,$at,.L0f101134 /* f101118: 8f230004 */ lw $v1,0x4($t9) @@ -3480,8 +3480,8 @@ glabel func0f100ad0 /* f101150: 10000020 */ beqz $zero,.L0f1011d4 /* f101154: 24100002 */ addiu $s0,$zero,0x2 .L0f101158: -/* f101158: 3c19800a */ lui $t9,0x800a -/* f10115c: 8f39a2d8 */ lw $t9,-0x5d28($t9) +/* f101158: 3c19800a */ lui $t9,%hi(g_Vars+0x318) +/* f10115c: 8f39a2d8 */ lw $t9,%lo(g_Vars+0x318)($t9) /* f101160: 1320001c */ beqz $t9,.L0f1011d4 /* f101164: 00000000 */ sll $zero,$zero,0x0 /* f101168: 1600001a */ bnez $s0,.L0f1011d4 @@ -3512,8 +3512,8 @@ glabel func0f100ad0 /* f1011cc: 00000000 */ sll $zero,$zero,0x0 /* f1011d0: 24100002 */ addiu $s0,$zero,0x2 .L0f1011d4: -/* f1011d4: 3c0e800a */ lui $t6,0x800a -/* f1011d8: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f1011d4: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f1011d8: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f1011dc: 24010002 */ addiu $at,$zero,0x2 /* f1011e0: 02402025 */ or $a0,$s2,$zero /* f1011e4: 91cf0250 */ lbu $t7,0x250($t6) @@ -3565,16 +3565,16 @@ glabel func0f100ad0 /* f10128c: 2a610003 */ slti $at,$s3,0x3 /* f101290: 5420ff6d */ bnezl $at,.L0f101048 /* f101294: 00008825 */ or $s1,$zero,$zero -/* f101298: 3c0e800a */ lui $t6,0x800a -/* f10129c: 81cfdfeb */ lb $t7,-0x2015($t6) +/* f101298: 3c0e800a */ lui $t6,%hi(g_MissionConfig+0x3) +/* f10129c: 81cfdfeb */ lb $t7,%lo(g_MissionConfig+0x3)($t6) /* f1012a0: 05e10004 */ bgez $t7,.L0f1012b4 /* f1012a4: 00000000 */ sll $zero,$zero,0x0 /* f1012a8: 0fc3f7a3 */ jal activemenuGetFirstBuddyIndex /* f1012ac: 00000000 */ sll $zero,$zero,0x0 /* f1012b0: 04410011 */ bgez $v0,.L0f1012f8 .L0f1012b4: -/* f1012b4: 3c18800a */ lui $t8,0x800a -/* f1012b8: 8f18a2d8 */ lw $t8,-0x5d28($t8) +/* f1012b4: 3c18800a */ lui $t8,%hi(g_Vars+0x318) +/* f1012b8: 8f18a2d8 */ lw $t8,%lo(g_Vars+0x318)($t8) /* f1012bc: 3c19800a */ lui $t9,%hi(g_ActiveMenuIndex) /* f1012c0: 1300000d */ beqz $t8,.L0f1012f8 /* f1012c4: 00000000 */ sll $zero,$zero,0x0 @@ -3691,8 +3691,8 @@ glabel func0f100ad0 /* f10145c: 00000000 */ sll $zero,$zero,0x0 .L0f101460: /* f101460: 44cef800 */ ctc1 $t6,$31 -/* f101464: 3c0e800a */ lui $t6,0x800a -/* f101468: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f101464: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f101468: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f10146c: 3c01ff00 */ lui $at,0xff00 /* f101470: 342100ff */ ori $at,$at,0xff /* f101474: 00027a00 */ sll $t7,$v0,0x8 @@ -3726,23 +3726,23 @@ glabel func0f100ad0 /* f1014dc: 0fc3fc2f */ jal func0f0ff0bc /* f1014e0: 00000000 */ sll $zero,$zero,0x0 /* f1014e4: 10400005 */ beqz $v0,.L0f1014fc -/* f1014e8: 3c18800a */ lui $t8,0x800a +/* f1014e8: 3c18800a */ lui $t8,%hi(g_Vars+0x6c) /* f1014ec: 24110001 */ addiu $s1,$zero,0x1 /* f1014f0: 24120002 */ addiu $s2,$zero,0x2 /* f1014f4: 10000034 */ beqz $zero,.L0f1015c8 /* f1014f8: 00009825 */ or $s3,$zero,$zero .L0f1014fc: -/* f1014fc: 8f18a02c */ lw $t8,-0x5fd4($t8) -/* f101500: 3c19800a */ lui $t9,0x800a -/* f101504: 3c0e800a */ lui $t6,0x800a +/* f1014fc: 8f18a02c */ lw $t8,%lo(g_Vars+0x6c)($t8) +/* f101500: 3c19800a */ lui $t9,%hi(g_Vars+0x68) +/* f101504: 3c0e800a */ lui $t6,%hi(g_Vars+0x64) /* f101508: 13000003 */ beqz $t8,.L0f101518 -/* f10150c: 3c0f800a */ lui $t7,0x800a +/* f10150c: 3c0f800a */ lui $t7,%hi(g_Vars+0x70) /* f101510: 10000002 */ beqz $zero,.L0f10151c /* f101514: 24060001 */ addiu $a2,$zero,0x1 .L0f101518: /* f101518: 00003025 */ or $a2,$zero,$zero .L0f10151c: -/* f10151c: 8f39a028 */ lw $t9,-0x5fd8($t9) +/* f10151c: 8f39a028 */ lw $t9,%lo(g_Vars+0x68)($t9) /* f101520: 00002825 */ or $a1,$zero,$zero /* f101524: 00002025 */ or $a0,$zero,$zero /* f101528: 13200003 */ beqz $t9,.L0f101538 @@ -3750,14 +3750,14 @@ glabel func0f100ad0 /* f101530: 10000001 */ beqz $zero,.L0f101538 /* f101534: 24050001 */ addiu $a1,$zero,0x1 .L0f101538: -/* f101538: 8dcea024 */ lw $t6,-0x5fdc($t6) +/* f101538: 8dcea024 */ lw $t6,%lo(g_Vars+0x64)($t6) /* f10153c: 27b00118 */ addiu $s0,$sp,0x118 /* f101540: 11c00003 */ beqz $t6,.L0f101550 /* f101544: 00000000 */ sll $zero,$zero,0x0 /* f101548: 10000001 */ beqz $zero,.L0f101550 /* f10154c: 24040001 */ addiu $a0,$zero,0x1 .L0f101550: -/* f101550: 8defa030 */ lw $t7,-0x5fd0($t7) +/* f101550: 8defa030 */ lw $t7,%lo(g_Vars+0x70)($t7) /* f101554: 11e00003 */ beqz $t7,.L0f101564 /* f101558: 00000000 */ sll $zero,$zero,0x0 /* f10155c: 10000001 */ beqz $zero,.L0f101564 @@ -3967,10 +3967,10 @@ glabel func0f100ad0 .L0f101880: /* f101880: 0fc54de0 */ jal func0f153780 /* f101884: 8fa401d8 */ lw $a0,0x1d8($sp) -/* f101888: 3c03800a */ lui $v1,0x800a +/* f101888: 3c03800a */ lui $v1,%hi(g_Vars+0x284) /* f10188c: 3c0b800a */ lui $t3,%hi(g_Vars) /* f101890: 256b9fc0 */ addiu $t3,$t3,%lo(g_Vars) -/* f101894: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f101894: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f101898: afa201d8 */ sw $v0,0x1d8($sp) /* f10189c: 8c621c04 */ lw $v0,0x1c04($v1) .L0f1018a0: @@ -4104,15 +4104,15 @@ glabel func0f100ad0 /* f101a58: 3c198009 */ lui $t9,%hi(g_Is4Mb) /* f101a5c: 93390af0 */ lbu $t9,%lo(g_Is4Mb)($t9) /* f101a60: 24010001 */ addiu $at,$zero,0x1 -/* f101a64: 3c07800a */ lui $a3,0x800a +/* f101a64: 3c07800a */ lui $a3,%hi(g_Vars+0x6c) /* f101a68: 1321001c */ beq $t9,$at,.L0f101adc -/* f101a6c: 3c08800a */ lui $t0,0x800a -/* f101a70: 3c09800a */ lui $t1,0x800a -/* f101a74: 3c0a800a */ lui $t2,0x800a -/* f101a78: 8d4aa030 */ lw $t2,-0x5fd0($t2) -/* f101a7c: 8d29a024 */ lw $t1,-0x5fdc($t1) -/* f101a80: 8ce7a02c */ lw $a3,-0x5fd4($a3) -/* f101a84: 8d08a028 */ lw $t0,-0x5fd8($t0) +/* f101a6c: 3c08800a */ lui $t0,%hi(g_Vars+0x68) +/* f101a70: 3c09800a */ lui $t1,%hi(g_Vars+0x64) +/* f101a74: 3c0a800a */ lui $t2,%hi(g_Vars+0x70) +/* f101a78: 8d4aa030 */ lw $t2,%lo(g_Vars+0x70)($t2) +/* f101a7c: 8d29a024 */ lw $t1,%lo(g_Vars+0x64)($t1) +/* f101a80: 8ce7a02c */ lw $a3,%lo(g_Vars+0x6c)($a3) +/* f101a84: 8d08a028 */ lw $t0,%lo(g_Vars+0x68)($t0) .L0f101a88: /* f101a88: 10e00003 */ beqz $a3,.L0f101a98 /* f101a8c: 00002825 */ or $a1,$zero,$zero diff --git a/src/game/game_102240.c b/src/game/game_102240.c index 75b0d1078..f4438f898 100644 --- a/src/game/game_102240.c +++ b/src/game/game_102240.c @@ -55,8 +55,8 @@ const char var7f1b2d54[] = "%s: %s\n"; GLOBAL_ASM( glabel func0f102240 -/* f102240: 3c0e800a */ lui $t6,0x800a -/* f102244: 91cedfea */ lbu $t6,-0x2016($t6) +/* f102240: 3c0e800a */ lui $t6,%hi(g_MissionConfig+0x2) +/* f102244: 91cedfea */ lbu $t6,%lo(g_MissionConfig+0x2)($t6) /* f102248: 27bdffe8 */ addiu $sp,$sp,-24 /* f10224c: afa40018 */ sw $a0,0x18($sp) /* f102250: 000e7880 */ sll $t7,$t6,0x2 @@ -209,7 +209,7 @@ glabel var7f1b2d98 /* f102448: 3c0d8007 */ lui $t5,%hi(g_MpPlayerNum) /* f10244c: acc20000 */ sw $v0,0x0($a2) /* f102450: 8dad1448 */ lw $t5,%lo(g_MpPlayerNum)($t5) -/* f102454: 3c01800a */ lui $at,0x800a +/* f102454: 3c01800a */ lui $at,%hi(g_MenuStack+0xe24) /* f102458: 000dc0c0 */ sll $t8,$t5,0x3 /* f10245c: 030dc023 */ subu $t8,$t8,$t5 /* f102460: 0018c080 */ sll $t8,$t8,0x2 @@ -219,7 +219,7 @@ glabel var7f1b2d98 /* f102470: 0018c100 */ sll $t8,$t8,0x4 /* f102474: 00380821 */ addu $at,$at,$t8 /* f102478: 10000013 */ beqz $zero,.L0f1024c8 -/* f10247c: ac27ee24 */ sw $a3,-0x11dc($at) +/* f10247c: ac27ee24 */ sw $a3,%lo(g_MenuStack+0xe24)($at) /* f102480: 3c0f800a */ lui $t7,%hi(var800a19c4) /* f102484: 8def19c4 */ lw $t7,%lo(var800a19c4)($t7) /* f102488: 24010002 */ addiu $at,$zero,0x2 @@ -228,7 +228,7 @@ glabel var7f1b2d98 /* f102494: 00001025 */ or $v0,$zero,$zero /* f102498: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) /* f10249c: 8cce0000 */ lw $t6,0x0($a2) -/* f1024a0: 3c01800a */ lui $at,0x800a +/* f1024a0: 3c01800a */ lui $at,%hi(g_MenuStack+0xe20) /* f1024a4: 001940c0 */ sll $t0,$t9,0x3 /* f1024a8: 01194023 */ subu $t0,$t0,$t9 /* f1024ac: 00084080 */ sll $t0,$t0,0x2 @@ -237,7 +237,7 @@ glabel var7f1b2d98 /* f1024b8: 01194023 */ subu $t0,$t0,$t9 /* f1024bc: 00084100 */ sll $t0,$t0,0x4 /* f1024c0: 00280821 */ addu $at,$at,$t0 -/* f1024c4: ac2eee20 */ sw $t6,-0x11e0($at) +/* f1024c4: ac2eee20 */ sw $t6,%lo(g_MenuStack+0xe20)($at) .L0f1024c8: /* f1024c8: 00001025 */ or $v0,$zero,$zero .L0f1024cc: @@ -963,7 +963,7 @@ glabel menudialog00103368 /* f103374: afbf0014 */ sw $ra,0x14($sp) /* f103378: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10337c: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f103380: 3c02800a */ lui $v0,%hi(g_MenuStack) +/* f103380: 3c02800a */ lui $v0,%hi(g_MenuStack+0x4f8) /* f103384: 000e78c0 */ sll $t7,$t6,0x3 /* f103388: 01ee7823 */ subu $t7,$t7,$t6 /* f10338c: 000f7880 */ sll $t7,$t7,0x2 @@ -972,7 +972,7 @@ glabel menudialog00103368 /* f103398: 01ee7823 */ subu $t7,$t7,$t6 /* f10339c: 000f7900 */ sll $t7,$t7,0x4 /* f1033a0: 004f1021 */ addu $v0,$v0,$t7 -/* f1033a4: 8c42e4f8 */ lw $v0,%lo(g_MenuStack)($v0) +/* f1033a4: 8c42e4f8 */ lw $v0,%lo(g_MenuStack+0x4f8)($v0) /* f1033a8: 5040000f */ beqzl $v0,.L0f1033e8 /* f1033ac: 8fbf0014 */ lw $ra,0x14($sp) /* f1033b0: 8c580000 */ lw $t8,0x0($v0) @@ -1009,8 +1009,8 @@ glabel menuhandlerAcceptMission /* f103414: 00000000 */ sll $zero,$zero,0x0 /* f103418: 3c02800a */ lui $v0,%hi(g_Vars) /* f10341c: 24429fc0 */ addiu $v0,$v0,%lo(g_Vars) -/* f103420: 3c04800a */ lui $a0,0x800a -/* f103424: 9084dfe9 */ lbu $a0,-0x2017($a0) +/* f103420: 3c04800a */ lui $a0,%hi(g_MissionConfig+0x1) +/* f103424: 9084dfe9 */ lbu $a0,%lo(g_MissionConfig+0x1)($a0) /* f103428: 8c4e04b4 */ lw $t6,0x4b4($v0) /* f10342c: 24030001 */ addiu $v1,$zero,0x1 /* f103430: 15c40002 */ bne $t6,$a0,.START @@ -1086,9 +1086,9 @@ glabel menuhandlerAcceptMission /* f10351c: 01802025 */ or $a0,$t4,$zero /* f103520: 0fc069f9 */ jal func0f01a7e4 /* f103524: 24040005 */ addiu $a0,$zero,0x5 -/* f103528: 3c04800a */ lui $a0,0x800a +/* f103528: 3c04800a */ lui $a0,%hi(g_MissionConfig+0x1) /* f10352c: 0c003a57 */ jal func0000e95c -/* f103530: 9084dfe9 */ lbu $a0,-0x2017($a0) +/* f103530: 9084dfe9 */ lbu $a0,%lo(g_MissionConfig+0x1)($a0) /* f103534: 0c0027b1 */ jal func00009ec4 /* f103538: 24040001 */ addiu $a0,$zero,0x1 .END: @@ -1157,7 +1157,7 @@ GLOBAL_ASM( glabel func0f103550 /* f103550: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f103554: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f103558: 3c18800a */ lui $t8,%hi(g_MenuStack) +/* f103558: 3c18800a */ lui $t8,%hi(g_MenuStack+0x4f8) /* f10355c: 27bdffe0 */ addiu $sp,$sp,-32 /* f103560: 000e78c0 */ sll $t7,$t6,0x3 /* f103564: 01ee7823 */ subu $t7,$t7,$t6 @@ -1167,9 +1167,9 @@ glabel func0f103550 /* f103574: 01ee7823 */ subu $t7,$t7,$t6 /* f103578: 000f7900 */ sll $t7,$t7,0x4 /* f10357c: 030fc021 */ addu $t8,$t8,$t7 -/* f103580: 8f18e4f8 */ lw $t8,%lo(g_MenuStack)($t8) +/* f103580: 8f18e4f8 */ lw $t8,%lo(g_MenuStack+0x4f8)($t8) /* f103584: afbf0014 */ sw $ra,0x14($sp) -/* f103588: 3c08800a */ lui $t0,0x800a +/* f103588: 3c08800a */ lui $t0,%hi(g_MissionConfig+0x2) /* f10358c: 8f190000 */ lw $t9,0x0($t8) /* f103590: 10990005 */ beq $a0,$t9,.L0f1035a8 /* f103594: 00000000 */ sll $zero,$zero,0x0 @@ -1178,7 +1178,7 @@ glabel func0f103550 /* f1035a0: 10000016 */ beqz $zero,.L0f1035fc /* f1035a4: 8fbf0014 */ lw $ra,0x14($sp) .L0f1035a8: -/* f1035a8: 9108dfea */ lbu $t0,-0x2016($t0) +/* f1035a8: 9108dfea */ lbu $t0,%lo(g_MissionConfig+0x2)($t0) /* f1035ac: 3c048007 */ lui $a0,0x8007 /* f1035b0: 00084880 */ sll $t1,$t0,0x2 /* f1035b4: 01284823 */ subu $t1,$t1,$t0 @@ -1221,8 +1221,8 @@ glabel menudialog00103608 .L0f103634: /* f103634: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f103638: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10363c: 3c18800a */ lui $t8,%hi(var8009e000) -/* f103640: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f10363c: 3c18800a */ lui $t8,0x800a +/* f103640: 2718e000 */ addiu $t8,$t8,-8192 /* f103644: 000e78c0 */ sll $t7,$t6,0x3 /* f103648: 01ee7823 */ subu $t7,$t7,$t6 /* f10364c: 000f7880 */ sll $t7,$t7,0x2 @@ -1232,19 +1232,19 @@ glabel menudialog00103608 /* f10365c: 000f7900 */ sll $t7,$t7,0x4 /* f103660: 01f81021 */ addu $v0,$t7,$t8 /* f103664: ac400850 */ sw $zero,0x850($v0) -/* f103668: 3c04800a */ lui $a0,0x800a +/* f103668: 3c04800a */ lui $a0,%hi(g_MissionConfig+0x1) /* f10366c: 3c07800a */ lui $a3,%hi(var8009dfc8) /* f103670: 24e7dfc8 */ addiu $a3,$a3,%lo(var8009dfc8) -/* f103674: 9084dfe9 */ lbu $a0,-0x2017($a0) +/* f103674: 9084dfe9 */ lbu $a0,%lo(g_MissionConfig+0x1)($a0) /* f103678: 8c450844 */ lw $a1,0x844($v0) /* f10367c: 0fc03a60 */ jal func0f00e980 /* f103680: 8c460848 */ lw $a2,0x848($v0) /* f103684: 10000005 */ beqz $zero,.L0f10369c /* f103688: 8fbf0014 */ lw $ra,0x14($sp) .L0f10368c: -/* f10368c: 3c04800a */ lui $a0,0x800a +/* f10368c: 3c04800a */ lui $a0,%hi(var8009dfe0+0x2) /* f103690: 0fc5b9ec */ jal langClearBank -/* f103694: 9484dfe2 */ lhu $a0,-0x201e($a0) +/* f103694: 9484dfe2 */ lhu $a0,%lo(var8009dfe0+0x2)($a0) /* f103698: 8fbf0014 */ lw $ra,0x14($sp) .L0f10369c: /* f10369c: 27bd0018 */ addiu $sp,$sp,0x18 @@ -1301,21 +1301,21 @@ glabel menuhandlerPdModeSetting /* f10373c: 1000003b */ beqz $zero,.L0f10382c /* f103740: 00001025 */ or $v0,$zero,$zero .L0f103744: -/* f103744: 3c02800a */ lui $v0,0x800a +/* f103744: 3c02800a */ lui $v0,%hi(g_MissionConfig+0x4) /* f103748: 1000000c */ beqz $zero,.L0f10377c -/* f10374c: 2442dfec */ addiu $v0,$v0,-8212 +/* f10374c: 2442dfec */ addiu $v0,$v0,%lo(g_MissionConfig+0x4) .L0f103750: -/* f103750: 3c02800a */ lui $v0,0x800a +/* f103750: 3c02800a */ lui $v0,%hi(g_MissionConfig+0x5) /* f103754: 10000009 */ beqz $zero,.L0f10377c -/* f103758: 2442dfed */ addiu $v0,$v0,-8211 +/* f103758: 2442dfed */ addiu $v0,$v0,%lo(g_MissionConfig+0x5) .L0f10375c: -/* f10375c: 3c02800a */ lui $v0,0x800a +/* f10375c: 3c02800a */ lui $v0,%hi(g_MissionConfig+0x6) /* f103760: 10000006 */ beqz $zero,.L0f10377c -/* f103764: 2442dfee */ addiu $v0,$v0,-8210 +/* f103764: 2442dfee */ addiu $v0,$v0,%lo(g_MissionConfig+0x6) .L0f103768: -/* f103768: 3c02800a */ lui $v0,0x800a +/* f103768: 3c02800a */ lui $v0,%hi(g_MissionConfig+0x7) /* f10376c: 10000003 */ beqz $zero,.L0f10377c -/* f103770: 2442dfef */ addiu $v0,$v0,-8209 +/* f103770: 2442dfef */ addiu $v0,$v0,%lo(g_MissionConfig+0x7) /* f103774: 1000002d */ beqz $zero,.L0f10382c /* f103778: 00001025 */ or $v0,$zero,$zero .L0f10377c: @@ -1644,8 +1644,8 @@ glabel isStageDifficultyUnlocked /* f103c44: 1420ffe3 */ bnez $at,.L0f103bd4 /* f103c48: 24a50006 */ addiu $a1,$a1,0x6 .L0f103c4c: -/* f103c4c: 3c18800a */ lui $t8,0x800a -/* f103c50: 27182266 */ addiu $t8,$t8,0x2266 +/* f103c4c: 3c18800a */ lui $t8,%hi(g_SoloSaveFile+0x66) +/* f103c50: 27182266 */ addiu $t8,$t8,%lo(g_SoloSaveFile+0x66) /* f103c54: 00b8082b */ sltu $at,$a1,$t8 /* f103c58: 14200022 */ bnez $at,.L0f103ce4 /* f103c5c: 24c2ffff */ addiu $v0,$a2,-1 @@ -1738,8 +1738,8 @@ s32 menuhandlerPdMode(u32 operation, struct menu_item *item, s32 *value) GLOBAL_ASM( glabel func0f103e68 -/* f103e68: 3c0e800a */ lui $t6,0x800a -/* f103e6c: 91cedfea */ lbu $t6,-0x2016($t6) +/* f103e68: 3c0e800a */ lui $t6,%hi(g_MissionConfig+0x2) +/* f103e6c: 91cedfea */ lbu $t6,%lo(g_MissionConfig+0x2)($t6) /* f103e70: 27bdffe0 */ addiu $sp,$sp,-32 /* f103e74: afbf001c */ sw $ra,0x1c($sp) /* f103e78: 90980001 */ lbu $t8,0x1($a0) @@ -1748,9 +1748,9 @@ glabel func0f103e68 /* f103e84: 000f7840 */ sll $t7,$t7,0x1 /* f103e88: 0018c840 */ sll $t9,$t8,0x1 /* f103e8c: 01f94021 */ addu $t0,$t7,$t9 -/* f103e90: 3c03800a */ lui $v1,0x800a +/* f103e90: 3c03800a */ lui $v1,%hi(g_SoloSaveFile+0x20) /* f103e94: 00681821 */ addu $v1,$v1,$t0 -/* f103e98: 94622220 */ lhu $v0,0x2220($v1) +/* f103e98: 94622220 */ lhu $v0,%lo(g_SoloSaveFile+0x20)($v1) /* f103e9c: 14400004 */ bnez $v0,.L0f103eb0 /* f103ea0: 28410fff */ slti $at,$v0,0xfff /* f103ea4: 3c027f1b */ lui $v0,%hi(var7f1b2d14) @@ -1935,19 +1935,19 @@ glabel menudialogCoopAntiOptions /* f104118: afa60028 */ sw $a2,0x28($sp) /* f10411c: 0fc41023 */ jal getMaxAiBuddies /* f104120: afa40020 */ sw $a0,0x20($sp) -/* f104124: 3c0e800a */ lui $t6,0x800a -/* f104128: 8dcea434 */ lw $t6,-0x5bcc($t6) +/* f104124: 3c0e800a */ lui $t6,%hi(g_Vars+0x474) +/* f104128: 8dcea434 */ lw $t6,%lo(g_Vars+0x474)($t6) /* f10412c: 8fa40020 */ lw $a0,0x20($sp) /* f104130: 004e082a */ slt $at,$v0,$t6 /* f104134: 10200002 */ beqz $at,.L0f104140 -/* f104138: 3c01800a */ lui $at,0x800a -/* f10413c: ac22a434 */ sw $v0,-0x5bcc($at) +/* f104138: 3c01800a */ lui $at,%hi(g_Vars+0x474) +/* f10413c: ac22a434 */ sw $v0,%lo(g_Vars+0x474)($at) .L0f104140: /* f104140: 24010066 */ addiu $at,$zero,0x66 /* f104144: 1481001e */ bne $a0,$at,.L0f1041c0 /* f104148: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f10414c: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f104150: 3c02800a */ lui $v0,%hi(g_MenuStack) +/* f104150: 3c02800a */ lui $v0,%hi(g_MenuStack+0x4f8) /* f104154: 8fb90024 */ lw $t9,0x24($sp) /* f104158: 000fc0c0 */ sll $t8,$t7,0x3 /* f10415c: 030fc023 */ subu $t8,$t8,$t7 @@ -1957,7 +1957,7 @@ glabel menudialogCoopAntiOptions /* f10416c: 030fc023 */ subu $t8,$t8,$t7 /* f104170: 0018c100 */ sll $t8,$t8,0x4 /* f104174: 00581021 */ addu $v0,$v0,$t8 -/* f104178: 8c42e4f8 */ lw $v0,%lo(g_MenuStack)($v0) +/* f104178: 8c42e4f8 */ lw $v0,%lo(g_MenuStack+0x4f8)($v0) /* f10417c: 50400011 */ beqzl $v0,.L0f1041c4 /* f104180: 8fbf0014 */ lw $ra,0x14($sp) /* f104184: 8c480000 */ lw $t0,0x0($v0) @@ -1998,15 +1998,15 @@ glabel menudialogCoopAntiOptions // } // // if (operation == MENUOP_102) { -// if (g_MenuStack[g_MpPlayerNum].unk00 && -// g_MenuStack[g_MpPlayerNum].unk00->dialog == dialog) { -// struct menustackitem00 *unk00 = stackitem->unk00; +// if (g_MenuStack[g_MpPlayerNum].unk4f8 && +// g_MenuStack[g_MpPlayerNum].unk4f8->dialog == dialog) { +// struct menustackitem4f8 *unk4f8 = stackitem->unk4f8; // -// if (unk00->unk0a) { +// if (unk4f8->unk0a) { // menuhandlerBuddyOptionsContinue(MENUOP_SET, NULL, NULL); // } // -// unk00->unk0a = 0; +// unk4f8->unk0a = 0; // } // } // @@ -2933,13 +2933,13 @@ glabel var7f1b2dfc /* f104f7c: 3c098008 */ lui $t1,%hi(var8007fac0) /* f104f80: 240e0001 */ addiu $t6,$zero,0x1 /* f104f84: 3c06800a */ lui $a2,%hi(g_SoloSaveFile) -/* f104f88: 3c10800a */ lui $s0,0x800a +/* f104f88: 3c10800a */ lui $s0,%hi(g_SoloSaveFile+0xc) /* f104f8c: 3c0b0010 */ lui $t3,0x10 /* f104f90: 2529fac0 */ addiu $t1,$t1,%lo(var8007fac0) /* f104f94: 3c0dfb00 */ lui $t5,0xfb00 /* f104f98: 241fff00 */ addiu $ra,$zero,-256 /* f104f9c: 356b01c0 */ ori $t3,$t3,0x1c0 -/* f104fa0: 2610220c */ addiu $s0,$s0,0x220c +/* f104fa0: 2610220c */ addiu $s0,$s0,%lo(g_SoloSaveFile+0xc) /* f104fa4: 24c62200 */ addiu $a2,$a2,%lo(g_SoloSaveFile) /* f104fa8: 2405003f */ addiu $a1,$zero,0x3f /* f104fac: 2408003f */ addiu $t0,$zero,0x3f @@ -3557,8 +3557,8 @@ glabel var7f1b2e00 /* f1059dc: afa90048 */ sw $t1,0x48($sp) /* f1059e0: 3c0b8007 */ lui $t3,%hi(g_MpPlayerNum) /* f1059e4: 8d6b1448 */ lw $t3,%lo(g_MpPlayerNum)($t3) -/* f1059e8: 3c0d800a */ lui $t5,%hi(var8009e000) -/* f1059ec: 25ade000 */ addiu $t5,$t5,%lo(var8009e000) +/* f1059e8: 3c0d800a */ lui $t5,0x800a +/* f1059ec: 25ade000 */ addiu $t5,$t5,-8192 /* f1059f0: 000b60c0 */ sll $t4,$t3,0x3 /* f1059f4: 018b6023 */ subu $t4,$t4,$t3 /* f1059f8: 000c6080 */ sll $t4,$t4,0x2 @@ -3576,7 +3576,7 @@ glabel var7f1b2e00 /* f105a28: 3c188007 */ lui $t8,%hi(g_MpPlayerNum) /* f105a2c: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) /* f105a30: 8fa90048 */ lw $t1,0x48($sp) -/* f105a34: 3c0f800a */ lui $t7,%hi(var8009e000) +/* f105a34: 3c0f800a */ lui $t7,0x800a /* f105a38: 001850c0 */ sll $t2,$t8,0x3 /* f105a3c: 01585023 */ subu $t2,$t2,$t8 /* f105a40: 000a5080 */ sll $t2,$t2,0x2 @@ -3585,7 +3585,7 @@ glabel var7f1b2e00 /* f105a4c: 01585023 */ subu $t2,$t2,$t8 /* f105a50: 44800000 */ mtc1 $zero,$f0 /* f105a54: 000a5100 */ sll $t2,$t2,0x4 -/* f105a58: 25efe000 */ addiu $t7,$t7,%lo(var8009e000) +/* f105a58: 25efe000 */ addiu $t7,$t7,-8192 /* f105a5c: 014f8021 */ addu $s0,$t2,$t7 /* f105a60: 00097080 */ sll $t6,$t1,0x2 /* f105a64: 01c97021 */ addu $t6,$t6,$t1 @@ -3625,7 +3625,7 @@ glabel var7f1b2e00 /* f105aec: 3c0d8007 */ lui $t5,%hi(g_MpPlayerNum) /* f105af0: 8dad1448 */ lw $t5,%lo(g_MpPlayerNum)($t5) /* f105af4: 44800000 */ mtc1 $zero,$f0 -/* f105af8: 3c18800a */ lui $t8,%hi(var8009e000) +/* f105af8: 3c18800a */ lui $t8,0x800a /* f105afc: 000dc8c0 */ sll $t9,$t5,0x3 /* f105b00: 032dc823 */ subu $t9,$t9,$t5 /* f105b04: 0019c880 */ sll $t9,$t9,0x2 @@ -3634,7 +3634,7 @@ glabel var7f1b2e00 /* f105b10: 032dc823 */ subu $t9,$t9,$t5 /* f105b14: 8faa0044 */ lw $t2,0x44($sp) /* f105b18: 0019c900 */ sll $t9,$t9,0x4 -/* f105b1c: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f105b1c: 2718e000 */ addiu $t8,$t8,-8192 /* f105b20: 03388021 */ addu $s0,$t9,$t8 /* f105b24: 3c01bf80 */ lui $at,0xbf80 /* f105b28: 8fa8003c */ lw $t0,0x3c($sp) @@ -3676,7 +3676,7 @@ glabel var7f1b2e00 /* f105bac: e7b2001c */ swc1 $f18,0x1c($sp) /* f105bb0: 3c0d8007 */ lui $t5,%hi(g_MpPlayerNum) /* f105bb4: 8dad1448 */ lw $t5,%lo(g_MpPlayerNum)($t5) -/* f105bb8: 3c18800a */ lui $t8,%hi(var8009e000) +/* f105bb8: 3c18800a */ lui $t8,0x800a /* f105bbc: 3c017f1b */ lui $at,%hi(var7f1b2e00) /* f105bc0: 000dc8c0 */ sll $t9,$t5,0x3 /* f105bc4: 032dc823 */ subu $t9,$t9,$t5 @@ -3685,7 +3685,7 @@ glabel var7f1b2e00 /* f105bd0: 0019c8c0 */ sll $t9,$t9,0x3 /* f105bd4: 032dc823 */ subu $t9,$t9,$t5 /* f105bd8: 0019c900 */ sll $t9,$t9,0x4 -/* f105bdc: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f105bdc: 2718e000 */ addiu $t8,$t8,-8192 /* f105be0: c4202e00 */ lwc1 $f0,%lo(var7f1b2e00)($at) /* f105be4: 03388021 */ addu $s0,$t9,$t8 /* f105be8: 240a003c */ addiu $t2,$zero,0x3c @@ -3698,8 +3698,8 @@ glabel var7f1b2e00 .L0f105c04: /* f105c04: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f105c08: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f105c0c: 3c0c800a */ lui $t4,%hi(var8009e000) -/* f105c10: 258ce000 */ addiu $t4,$t4,%lo(var8009e000) +/* f105c0c: 3c0c800a */ lui $t4,0x800a +/* f105c10: 258ce000 */ addiu $t4,$t4,-8192 /* f105c14: 000e58c0 */ sll $t3,$t6,0x3 /* f105c18: 016e5823 */ subu $t3,$t3,$t6 /* f105c1c: 000b5880 */ sll $t3,$t3,0x2 @@ -3732,8 +3732,8 @@ glabel var7f1b2e04 /* f105c64: afa60020 */ sw $a2,0x20($sp) /* f105c68: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f105c6c: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f105c70: 3c18800a */ lui $t8,%hi(var8009e000) -/* f105c74: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f105c70: 3c18800a */ lui $t8,0x800a +/* f105c74: 2718e000 */ addiu $t8,$t8,-8192 /* f105c78: 000e78c0 */ sll $t7,$t6,0x3 /* f105c7c: 01ee7823 */ subu $t7,$t7,$t6 /* f105c80: 000f7880 */ sll $t7,$t7,0x2 @@ -3773,8 +3773,8 @@ glabel var7f1b2e04 /* f105d08: 24010040 */ addiu $at,$zero,0x40 /* f105d0c: 0fc41652 */ jal func0f105948 /* f105d10: 00000000 */ sll $zero,$zero,0x0 -/* f105d14: 3c02800a */ lui $v0,0x800a -/* f105d18: 904421c0 */ lbu $a0,0x21c0($v0) +/* f105d14: 3c02800a */ lui $v0,%hi(var800a21c0) +/* f105d18: 904421c0 */ lbu $a0,%lo(var800a21c0)($v0) /* f105d1c: 3c018007 */ lui $at,0x8007 /* f105d20: a0242d88 */ sb $a0,0x2d88($at) /* f105d24: 24010040 */ addiu $at,$zero,0x40 @@ -3786,8 +3786,8 @@ glabel var7f1b2e04 /* f105d38: 8fbf0014 */ lw $ra,0x14($sp) .L0f105d3c: /* f105d3c: 8d8c1448 */ lw $t4,%lo(g_MpPlayerNum)($t4) -/* f105d40: 3c0e800a */ lui $t6,%hi(var8009e000) -/* f105d44: 25cee000 */ addiu $t6,$t6,%lo(var8009e000) +/* f105d40: 3c0e800a */ lui $t6,0x800a +/* f105d44: 25cee000 */ addiu $t6,$t6,-8192 /* f105d48: 000c68c0 */ sll $t5,$t4,0x3 /* f105d4c: 01ac6823 */ subu $t5,$t5,$t4 /* f105d50: 000d6880 */ sll $t5,$t5,0x2 @@ -3867,10 +3867,10 @@ glabel func0f105e80 /* f105ea0: 3c02800a */ lui $v0,%hi(var800a21c0) /* f105ea4: 904221c0 */ lbu $v0,%lo(var800a21c0)($v0) /* f105ea8: 2401002e */ addiu $at,$zero,0x2e -/* f105eac: 3c0e800a */ lui $t6,0x800a +/* f105eac: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) /* f105eb0: 54410015 */ bnel $v0,$at,.L0f105f08 /* f105eb4: 24010050 */ addiu $at,$zero,0x50 -/* f105eb8: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f105eb8: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f105ebc: 8dc30480 */ lw $v1,0x480($t6) /* f105ec0: 50600011 */ beqzl $v1,.L0f105f08 /* f105ec4: 24010050 */ addiu $at,$zero,0x50 @@ -3893,8 +3893,8 @@ glabel func0f105e80 /* f105f04: 24010050 */ addiu $at,$zero,0x50 .L0f105f08: /* f105f08: 1441003d */ bne $v0,$at,.L0f106000 -/* f105f0c: 3c0f800a */ lui $t7,0x800a -/* f105f10: 8defa474 */ lw $t7,-0x5b8c($t7) +/* f105f0c: 3c0f800a */ lui $t7,%hi(g_Vars+0x4b4) +/* f105f10: 8defa474 */ lw $t7,%lo(g_Vars+0x4b4)($t7) /* f105f14: 24010034 */ addiu $at,$zero,0x34 /* f105f18: 15e10039 */ bne $t7,$at,.L0f106000 /* f105f1c: 00000000 */ sll $zero,$zero,0x0 @@ -4057,7 +4057,7 @@ glabel var7f1b2e44 /* f1060e0: 3c088007 */ lui $t0,%hi(g_MpPlayerNum) /* f1060e4: 8d081448 */ lw $t0,%lo(g_MpPlayerNum)($t0) /* f1060e8: 8fa60020 */ lw $a2,0x20($sp) -/* f1060ec: 3c01800a */ lui $at,0x800a +/* f1060ec: 3c01800a */ lui $at,%hi(g_MenuStack+0xe28) /* f1060f0: 000848c0 */ sll $t1,$t0,0x3 /* f1060f4: 01284823 */ subu $t1,$t1,$t0 /* f1060f8: 00094880 */ sll $t1,$t1,0x2 @@ -4067,7 +4067,7 @@ glabel var7f1b2e44 /* f106108: 00094900 */ sll $t1,$t1,0x4 /* f10610c: 00290821 */ addu $at,$at,$t1 /* f106110: 305900ff */ andi $t9,$v0,0xff -/* f106114: ac39ee28 */ sw $t9,-0x11d8($at) +/* 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 @@ -4241,7 +4241,7 @@ glabel var7f1b2e84 /* f106308: a0620000 */ sb $v0,0x0($v1) /* f10630c: 3c0a8007 */ lui $t2,%hi(g_MpPlayerNum) /* f106310: 8d4a1448 */ lw $t2,%lo(g_MpPlayerNum)($t2) -/* f106314: 3c01800a */ lui $at,0x800a +/* f106314: 3c01800a */ lui $at,%hi(g_MenuStack+0xe28) /* f106318: 304900ff */ andi $t1,$v0,0xff /* f10631c: 000a58c0 */ sll $t3,$t2,0x3 /* f106320: 016a5823 */ subu $t3,$t3,$t2 @@ -4252,7 +4252,7 @@ glabel var7f1b2e84 /* f106334: 000b5900 */ sll $t3,$t3,0x4 /* f106338: 002b0821 */ addu $at,$at,$t3 /* f10633c: 3c048007 */ lui $a0,0x8007 -/* f106340: ac29ee28 */ sw $t1,-0x11d8($at) +/* f106340: ac29ee28 */ sw $t1,%lo(g_MenuStack+0xe28)($at) /* f106344: 248433e8 */ addiu $a0,$a0,0x33e8 /* f106348: 0fc3c4e7 */ jal func0f0f139c /* f10634c: 3c05bf80 */ lui $a1,0xbf80 @@ -4385,7 +4385,7 @@ GLOBAL_ASM( glabel func0f106508 /* f106508: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10650c: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f106510: 3c18800a */ lui $t8,%hi(g_MenuStack) +/* f106510: 3c18800a */ lui $t8,%hi(g_MenuStack+0x4f8) /* f106514: 27bdffe0 */ addiu $sp,$sp,-32 /* f106518: 000e78c0 */ sll $t7,$t6,0x3 /* f10651c: 01ee7823 */ subu $t7,$t7,$t6 @@ -4395,9 +4395,9 @@ glabel func0f106508 /* f10652c: 01ee7823 */ subu $t7,$t7,$t6 /* f106530: 000f7900 */ sll $t7,$t7,0x4 /* f106534: 030fc021 */ addu $t8,$t8,$t7 -/* f106538: 8f18e4f8 */ lw $t8,%lo(g_MenuStack)($t8) +/* f106538: 8f18e4f8 */ lw $t8,%lo(g_MenuStack+0x4f8)($t8) /* f10653c: afbf0014 */ sw $ra,0x14($sp) -/* f106540: 3c08800a */ lui $t0,0x800a +/* f106540: 3c08800a */ lui $t0,%hi(g_MissionConfig+0x2) /* f106544: 8f190000 */ lw $t9,0x0($t8) /* f106548: 10990005 */ beq $a0,$t9,.L0f106560 /* f10654c: 00000000 */ sll $zero,$zero,0x0 @@ -4406,7 +4406,7 @@ glabel func0f106508 /* f106558: 10000016 */ beqz $zero,.L0f1065b4 /* f10655c: 8fbf0014 */ lw $ra,0x14($sp) .L0f106560: -/* f106560: 9108dfea */ lbu $t0,-0x2016($t0) +/* f106560: 9108dfea */ lbu $t0,%lo(g_MissionConfig+0x2)($t0) /* f106564: 3c048007 */ lui $a0,0x8007 /* f106568: 00084880 */ sll $t1,$t0,0x2 /* f10656c: 01284823 */ subu $t1,$t1,$t0 @@ -4676,11 +4676,11 @@ bool menudialogMainMenu(u32 operation, struct menu_dialog *dialog, struct menust { switch (operation) { case MENUOP_100: - g_MenuStack[g_MpPlayerNum].unk934 = 0; + g_MenuStack[g_MpPlayerNum].unke2c = 0; break; case MENUOP_102: - if (g_MenuStack[g_MpPlayerNum].unk00 && - g_MenuStack[g_MpPlayerNum].unk00->dialog == dialog) { + if (g_MenuStack[g_MpPlayerNum].unk4f8 && + g_MenuStack[g_MpPlayerNum].unk4f8->dialog == dialog) { g_MissionConfig.iscoop = false; g_MissionConfig.isanti = false; } @@ -4742,8 +4742,8 @@ GLOBAL_ASM( glabel func0f106b20 /* f106b20: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f106b24: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f106b28: 3c18800a */ lui $t8,%hi(var8009e000) -/* f106b2c: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f106b28: 3c18800a */ lui $t8,0x800a +/* f106b2c: 2718e000 */ addiu $t8,$t8,-8192 /* f106b30: 000e78c0 */ sll $t7,$t6,0x3 /* f106b34: 01ee7823 */ subu $t7,$t7,$t6 /* f106b38: 000f7880 */ sll $t7,$t7,0x2 @@ -4756,9 +4756,9 @@ glabel func0f106b20 /* f106b54: 27bdffe0 */ addiu $sp,$sp,-32 /* f106b58: afbf0014 */ sw $ra,0x14($sp) /* f106b5c: 17200071 */ bnez $t9,.L0f106d24 -/* f106b60: 3c08800a */ lui $t0,0x800a +/* f106b60: 3c08800a */ lui $t0,%hi(g_Vars+0x4b4) /* f106b64: a040083b */ sb $zero,0x83b($v0) -/* f106b68: 8d08a474 */ lw $t0,-0x5b8c($t0) +/* f106b68: 8d08a474 */ lw $t0,%lo(g_Vars+0x4b4)($t0) /* f106b6c: 24010026 */ addiu $at,$zero,0x26 /* f106b70: 3c048007 */ lui $a0,%hi(menudialog_196b0) /* f106b74: 15010067 */ bne $t0,$at,.L0f106d14 @@ -4769,8 +4769,8 @@ glabel func0f106b20 /* f106b88: 8fa5001c */ lw $a1,0x1c($sp) /* f106b8c: 0fc68606 */ jal ciGetTrainingData /* f106b90: afa5001c */ sw $a1,0x1c($sp) -/* f106b94: 3c09800a */ lui $t1,0x800a -/* f106b98: 8d29a244 */ lw $t1,-0x5dbc($t1) +/* f106b94: 3c09800a */ lui $t1,%hi(g_Vars+0x284) +/* f106b98: 8d29a244 */ lw $t1,%lo(g_Vars+0x284)($t1) /* f106b9c: 8fa5001c */ lw $a1,0x1c($sp) /* f106ba0: 8d2a00bc */ lw $t2,0xbc($t1) /* f106ba4: 85440028 */ lh $a0,0x28($t2) diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c index be3f2c2f8..45e9df79b 100644 --- a/src/game/game_107fb0.c +++ b/src/game/game_107fb0.c @@ -151,7 +151,7 @@ glabel func0f107fb0 s32 menuhandler00108014(u32 operation, struct menu_item *item, s32 *value) { if (operation == MENUOP_CHECKHIDDEN) { - if (g_MenuStack[g_MpPlayerNum].unk944_01 > 4) { + if (g_MenuStack[g_MpPlayerNum].unke3c_01 > 4) { return true; } } @@ -172,9 +172,9 @@ glabel func0f108078 /* f108098: 000f78c0 */ sll $t7,$t7,0x3 /* f10809c: 01ee7823 */ subu $t7,$t7,$t6 /* f1080a0: 000f7900 */ sll $t7,$t7,0x4 -/* f1080a4: 3c04800a */ lui $a0,0x800a +/* f1080a4: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe3c) /* f1080a8: 008f2021 */ addu $a0,$a0,$t7 -/* f1080ac: 9084ee3c */ lbu $a0,-0x11c4($a0) +/* f1080ac: 9084ee3c */ lbu $a0,%lo(g_MenuStack+0xe3c)($a0) /* f1080b0: afbf0014 */ sw $ra,0x14($sp) /* f1080b4: 3098007f */ andi $t8,$a0,0x7f /* f1080b8: 0fc41fec */ jal func0f107fb0 @@ -298,7 +298,7 @@ glabel func0f1080d0 s32 menuhandler00108254(u32 operation, struct menu_item *item, s32 *value) { if (operation == MENUOP_CHECKHIDDEN) { - if (g_MenuStack[g_MpPlayerNum].unk940 == 0) { + if (g_MenuStack[g_MpPlayerNum].unke38 == 0) { return true; } } @@ -310,8 +310,8 @@ GLOBAL_ASM( glabel func0f1082b0 /* f1082b0: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f1082b4: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f1082b8: 3c18800a */ lui $t8,%hi(var8009e000) -/* f1082bc: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f1082b8: 3c18800a */ lui $t8,0x800a +/* f1082bc: 2718e000 */ addiu $t8,$t8,-8192 /* f1082c0: 000e78c0 */ sll $t7,$t6,0x3 /* f1082c4: 01ee7823 */ subu $t7,$t7,$t6 /* f1082c8: 000f7880 */ sll $t7,$t7,0x2 @@ -351,7 +351,7 @@ glabel func0f108324 /* f108338: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f10833c: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f108340: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f108344: 3c01800a */ lui $at,0x800a +/* f108344: 3c01800a */ lui $at,%hi(g_MenuStack+0xe3c) /* f108348: 000e78c0 */ sll $t7,$t6,0x3 /* f10834c: 01ee7823 */ subu $t7,$t7,$t6 /* f108350: 000f7880 */ sll $t7,$t7,0x2 @@ -361,10 +361,10 @@ glabel func0f108324 /* f108360: 000f7900 */ sll $t7,$t7,0x4 /* f108364: 002f0821 */ addu $at,$at,$t7 /* f108368: 1000000d */ beqz $zero,.L0f1083a0 -/* f10836c: a022ee3c */ sb $v0,-0x11c4($at) +/* f10836c: a022ee3c */ sb $v0,%lo(g_MenuStack+0xe3c)($at) .L0f108370: /* f108370: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) -/* f108374: 3c01800a */ lui $at,0x800a +/* f108374: 3c01800a */ lui $at,%hi(g_MenuStack+0xe3c) /* f108378: 24180005 */ addiu $t8,$zero,0x5 /* f10837c: 001940c0 */ sll $t0,$t9,0x3 /* f108380: 01194023 */ subu $t0,$t0,$t9 @@ -374,7 +374,7 @@ glabel func0f108324 /* f108390: 01194023 */ subu $t0,$t0,$t9 /* f108394: 00084100 */ sll $t0,$t0,0x4 /* f108398: 00280821 */ addu $at,$at,$t0 -/* f10839c: a038ee3c */ sb $t8,-0x11c4($at) +/* f10839c: a038ee3c */ sb $t8,%lo(g_MenuStack+0xe3c)($at) .L0f1083a0: /* f1083a0: 8fbf0014 */ lw $ra,0x14($sp) /* f1083a4: 27bd0018 */ addiu $sp,$sp,0x18 @@ -398,7 +398,7 @@ GLOBAL_ASM( glabel func0f1083d0 /* f1083d0: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f1083d4: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f1083d8: 3c18800a */ lui $t8,%hi(var8009e000) +/* f1083d8: 3c18800a */ lui $t8,0x800a /* f1083dc: 27bdffe8 */ addiu $sp,$sp,-24 /* f1083e0: 000e78c0 */ sll $t7,$t6,0x3 /* f1083e4: 01ee7823 */ subu $t7,$t7,$t6 @@ -407,7 +407,7 @@ glabel func0f1083d0 /* f1083f0: 000f78c0 */ sll $t7,$t7,0x3 /* f1083f4: 01ee7823 */ subu $t7,$t7,$t6 /* f1083f8: 000f7900 */ sll $t7,$t7,0x4 -/* f1083fc: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f1083fc: 2718e000 */ addiu $t8,$t8,-8192 /* f108400: afbf0014 */ sw $ra,0x14($sp) /* f108404: 01f81021 */ addu $v0,$t7,$t8 /* f108408: a0450e3d */ sb $a1,0xe3d($v0) @@ -423,7 +423,7 @@ GLOBAL_ASM( glabel func0f108424 /* f108424: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f108428: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10842c: 3c18800a */ lui $t8,0x800a +/* f10842c: 3c18800a */ lui $t8,%hi(g_MenuStack+0xe34) /* f108430: 27bdffe8 */ addiu $sp,$sp,-24 /* f108434: 000e78c0 */ sll $t7,$t6,0x3 /* f108438: 01ee7823 */ subu $t7,$t7,$t6 @@ -433,7 +433,7 @@ glabel func0f108424 /* f108448: 01ee7823 */ subu $t7,$t7,$t6 /* f10844c: 000f7900 */ sll $t7,$t7,0x4 /* f108450: 030fc021 */ addu $t8,$t8,$t7 -/* f108454: 9718ee34 */ lhu $t8,-0x11cc($t8) +/* f108454: 9718ee34 */ lhu $t8,%lo(g_MenuStack+0xe34)($t8) /* f108458: afa40018 */ sw $a0,0x18($sp) /* f10845c: 3c048007 */ lui $a0,0x8007 /* f108460: 0018c840 */ sll $t9,$t8,0x1 @@ -486,8 +486,8 @@ glabel var7f1b3564 /* f1084c4: afa60008 */ sw $a2,0x8($sp) /* f1084c8: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f1084cc: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f1084d0: 3c18800a */ lui $t8,%hi(var8009e000) -/* f1084d4: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f1084d0: 3c18800a */ lui $t8,0x800a +/* f1084d4: 2718e000 */ addiu $t8,$t8,-8192 /* f1084d8: 000e78c0 */ sll $t7,$t6,0x3 /* f1084dc: 01ee7823 */ subu $t7,$t7,$t6 /* f1084e0: 000f7880 */ sll $t7,$t7,0x2 @@ -536,9 +536,9 @@ glabel func0f108550 /* f108570: 000f78c0 */ sll $t7,$t7,0x3 /* f108574: 01ee7823 */ subu $t7,$t7,$t6 /* f108578: 000f7900 */ sll $t7,$t7,0x4 -/* f10857c: 3c04800a */ lui $a0,0x800a +/* f10857c: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe3c) /* f108580: 008f2021 */ addu $a0,$a0,$t7 -/* f108584: 9084ee3c */ lbu $a0,-0x11c4($a0) +/* f108584: 9084ee3c */ lbu $a0,%lo(g_MenuStack+0xe3c)($a0) /* f108588: afbf0014 */ sw $ra,0x14($sp) /* f10858c: 3098007f */ andi $t8,$a0,0x7f /* f108590: 0fc41fec */ jal func0f107fb0 @@ -552,7 +552,7 @@ glabel func0f108550 /* f1085b0: 00403025 */ or $a2,$v0,$zero /* f1085b4: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f1085b8: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) -/* f1085bc: 3c09800a */ lui $t1,0x800a +/* f1085bc: 3c09800a */ lui $t1,%hi(g_MenuStack+0xe34) /* f1085c0: 3c078007 */ lui $a3,%hi(g_StringPointer) /* f1085c4: 001940c0 */ sll $t0,$t9,0x3 /* f1085c8: 01194023 */ subu $t0,$t0,$t9 @@ -562,7 +562,7 @@ glabel func0f108550 /* f1085d8: 01194023 */ subu $t0,$t0,$t9 /* f1085dc: 00084100 */ sll $t0,$t0,0x4 /* f1085e0: 01284821 */ addu $t1,$t1,$t0 -/* f1085e4: 9529ee34 */ lhu $t1,-0x11cc($t1) +/* f1085e4: 9529ee34 */ lhu $t1,%lo(g_MenuStack+0xe34)($t1) /* f1085e8: 24010006 */ addiu $at,$zero,0x6 /* f1085ec: 24e71440 */ addiu $a3,$a3,%lo(g_StringPointer) /* f1085f0: 11210015 */ beq $t1,$at,.L0f108648 @@ -611,11 +611,11 @@ glabel func0f10865c /* f108680: 01ee7823 */ subu $t7,$t7,$t6 /* f108684: 00802825 */ or $a1,$a0,$zero /* f108688: 000f7900 */ sll $t7,$t7,0x4 -/* f10868c: 3c01800a */ lui $at,0x800a +/* f10868c: 3c01800a */ lui $at,%hi(g_MenuStack+0xe34) /* f108690: afbf0014 */ sw $ra,0x14($sp) /* f108694: 002f0821 */ addu $at,$at,$t7 /* f108698: 3c048007 */ lui $a0,%hi(menudialog_1a410) -/* f10869c: a425ee34 */ sh $a1,-0x11cc($at) +/* f10869c: a425ee34 */ sh $a1,%lo(g_MenuStack+0xe34)($at) /* f1086a0: 0fc3cbd3 */ jal menuPushDialog /* f1086a4: 248443f0 */ addiu $a0,$a0,%lo(menudialog_1a410) /* f1086a8: 8fbf0014 */ lw $ra,0x14($sp) @@ -733,7 +733,7 @@ glabel var7f1b35a4 /* f1087a8: adc8000c */ sw $t0,0xc($t6) /* f1087ac: a5c10010 */ sh $at,0x10($t6) /* f1087b0: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) -/* f1087b4: 3c02800a */ lui $v0,0x800a +/* f1087b4: 3c02800a */ lui $v0,%hi(g_MenuStack+0xe42) /* f1087b8: 000950c0 */ sll $t2,$t1,0x3 /* f1087bc: 01495023 */ subu $t2,$t2,$t1 /* f1087c0: 000a5080 */ sll $t2,$t2,0x2 @@ -742,7 +742,7 @@ glabel var7f1b35a4 /* f1087cc: 01495023 */ subu $t2,$t2,$t1 /* f1087d0: 000a5100 */ sll $t2,$t2,0x4 /* f1087d4: 004a1021 */ addu $v0,$v0,$t2 -/* f1087d8: 9042ee42 */ lbu $v0,-0x11be($v0) +/* f1087d8: 9042ee42 */ lbu $v0,%lo(g_MenuStack+0xe42)($v0) /* f1087dc: 28410009 */ slti $at,$v0,0x9 /* f1087e0: 14200009 */ bnez $at,.L0f108808 /* f1087e4: 244bff9c */ addiu $t3,$v0,-100 @@ -845,7 +845,7 @@ glabel var7f1b35e4 /* f1088c4: adc10000 */ sw $at,0x0($t6) /* f1088c8: adc80004 */ sw $t0,0x4($t6) /* f1088cc: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) -/* f1088d0: 3c02800a */ lui $v0,0x800a +/* f1088d0: 3c02800a */ lui $v0,%hi(g_MenuStack+0xe42) /* f1088d4: 000950c0 */ sll $t2,$t1,0x3 /* f1088d8: 01495023 */ subu $t2,$t2,$t1 /* f1088dc: 000a5080 */ sll $t2,$t2,0x2 @@ -854,7 +854,7 @@ glabel var7f1b35e4 /* f1088e8: 01495023 */ subu $t2,$t2,$t1 /* f1088ec: 000a5100 */ sll $t2,$t2,0x4 /* f1088f0: 004a1021 */ addu $v0,$v0,$t2 -/* f1088f4: 9042ee42 */ lbu $v0,-0x11be($v0) +/* f1088f4: 9042ee42 */ lbu $v0,%lo(g_MenuStack+0xe42)($v0) /* f1088f8: 28410009 */ slti $at,$v0,0x9 /* f1088fc: 14200009 */ bnez $at,.L0f108924 /* f108900: 244bff9c */ addiu $t3,$v0,-100 @@ -940,8 +940,8 @@ glabel var7f1b3624 /* f10899c: 00002825 */ or $a1,$zero,$zero /* f1089a0: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f1089a4: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f1089a8: 3c18800a */ lui $t8,%hi(var8009e000) -/* f1089ac: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f1089a8: 3c18800a */ lui $t8,0x800a +/* f1089ac: 2718e000 */ addiu $t8,$t8,-8192 /* f1089b0: 000e78c0 */ sll $t7,$t6,0x3 /* f1089b4: 01ee7823 */ subu $t7,$t7,$t6 /* f1089b8: 000f7880 */ sll $t7,$t7,0x2 @@ -979,7 +979,7 @@ glabel var7f1b3624 /* f108a34: 8c842f38 */ lw $a0,%lo(var7f1b2f3c-0x4)($a0) /* f108a38: 3c0b8007 */ lui $t3,%hi(g_MpPlayerNum) /* f108a3c: 8d6b1448 */ lw $t3,%lo(g_MpPlayerNum)($t3) -/* f108a40: 3c04800a */ lui $a0,0x800a +/* f108a40: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe44) /* f108a44: 00402825 */ or $a1,$v0,$zero /* f108a48: 000b60c0 */ sll $t4,$t3,0x3 /* f108a4c: 018b6023 */ subu $t4,$t4,$t3 @@ -990,7 +990,7 @@ glabel var7f1b3624 /* f108a60: 000c6100 */ sll $t4,$t4,0x4 /* f108a64: 008c2021 */ addu $a0,$a0,$t4 /* f108a68: 0c004b2d */ jal func00012cb4 -/* f108a6c: 8c84ee44 */ lw $a0,-0x11bc($a0) +/* f108a6c: 8c84ee44 */ lw $a0,%lo(g_MenuStack+0xe44)($a0) .L0f108a70: /* f108a70: 8fbf0014 */ lw $ra,0x14($sp) /* f108a74: 27bd0018 */ addiu $sp,$sp,0x18 @@ -1041,8 +1041,8 @@ glabel var7f1b3664 /* f108a90: 00002825 */ or $a1,$zero,$zero /* f108a94: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f108a98: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f108a9c: 3c18800a */ lui $t8,%hi(var8009e000) -/* f108aa0: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f108a9c: 3c18800a */ lui $t8,0x800a +/* f108aa0: 2718e000 */ addiu $t8,$t8,-8192 /* f108aa4: 000e78c0 */ sll $t7,$t6,0x3 /* f108aa8: 01ee7823 */ subu $t7,$t7,$t6 /* f108aac: 000f7880 */ sll $t7,$t7,0x2 @@ -1081,7 +1081,7 @@ glabel var7f1b3664 /* f108b2c: 8c842f38 */ lw $a0,%lo(var7f1b2f3c-0x4)($a0) /* f108b30: 3c0b8007 */ lui $t3,%hi(g_MpPlayerNum) /* f108b34: 8d6b1448 */ lw $t3,%lo(g_MpPlayerNum)($t3) -/* f108b38: 3c04800a */ lui $a0,0x800a +/* f108b38: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe44) /* f108b3c: 00402825 */ or $a1,$v0,$zero /* f108b40: 000b60c0 */ sll $t4,$t3,0x3 /* f108b44: 018b6023 */ subu $t4,$t4,$t3 @@ -1092,7 +1092,7 @@ glabel var7f1b3664 /* f108b58: 000c6100 */ sll $t4,$t4,0x4 /* f108b5c: 008c2021 */ addu $a0,$a0,$t4 /* f108b60: 0c004b2d */ jal func00012cb4 -/* f108b64: 8c84ee44 */ lw $a0,-0x11bc($a0) +/* f108b64: 8c84ee44 */ lw $a0,%lo(g_MenuStack+0xe44)($a0) /* f108b68: 1000001e */ beqz $zero,.L0f108be4 /* f108b6c: 8fbf0014 */ lw $ra,0x14($sp) /* f108b70: 8c6d0e48 */ lw $t5,0xe48($v1) @@ -1173,7 +1173,7 @@ glabel var7f1b3688 /* f108c40: 00000000 */ sll $zero,$zero,0x0 /* f108c44: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f108c48: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f108c4c: 3c02800a */ lui $v0,0x800a +/* f108c4c: 3c02800a */ lui $v0,%hi(g_MenuStack+0xe42) /* f108c50: 000e78c0 */ sll $t7,$t6,0x3 /* f108c54: 01ee7823 */ subu $t7,$t7,$t6 /* f108c58: 000f7880 */ sll $t7,$t7,0x2 @@ -1182,7 +1182,7 @@ glabel var7f1b3688 /* f108c64: 01ee7823 */ subu $t7,$t7,$t6 /* f108c68: 000f7900 */ sll $t7,$t7,0x4 /* f108c6c: 004f1021 */ addu $v0,$v0,$t7 -/* f108c70: 9042ee42 */ lbu $v0,-0x11be($v0) +/* f108c70: 9042ee42 */ lbu $v0,%lo(g_MenuStack+0xe42)($v0) /* f108c74: 2c410009 */ sltiu $at,$v0,0x9 /* f108c78: 1020000d */ beqz $at,.L0f108cb0 /* f108c7c: 0002c080 */ sll $t8,$v0,0x2 @@ -1255,7 +1255,7 @@ glabel func0f108d8c /* f108d8c: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f108d90: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) /* f108d94: 27bdffe8 */ addiu $sp,$sp,-24 -/* f108d98: 3c04800a */ lui $a0,0x800a +/* f108d98: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe4c) /* f108d9c: 000e78c0 */ sll $t7,$t6,0x3 /* f108da0: 01ee7823 */ subu $t7,$t7,$t6 /* f108da4: 000f7880 */ sll $t7,$t7,0x2 @@ -1266,12 +1266,12 @@ glabel func0f108d8c /* f108db8: afbf0014 */ sw $ra,0x14($sp) /* f108dbc: 008f2021 */ addu $a0,$a0,$t7 /* f108dc0: 0fc479ac */ jal func0f11e6b0 -/* f108dc4: 8c84ee4c */ lw $a0,-0x11b4($a0) +/* f108dc4: 8c84ee4c */ lw $a0,%lo(g_MenuStack+0xe4c)($a0) /* f108dc8: 04400010 */ bltz $v0,.L0f108e0c /* f108dcc: 00022600 */ sll $a0,$v0,0x18 /* f108dd0: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f108dd4: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) -/* f108dd8: 3c05800a */ lui $a1,0x800a +/* f108dd8: 3c05800a */ lui $a1,%hi(g_MenuStack+0xe48) /* f108ddc: 0004c603 */ sra $t8,$a0,0x18 /* f108de0: 001940c0 */ sll $t0,$t9,0x3 /* f108de4: 01194023 */ subu $t0,$t0,$t9 @@ -1281,7 +1281,7 @@ glabel func0f108d8c /* f108df4: 01194023 */ subu $t0,$t0,$t9 /* f108df8: 00084100 */ sll $t0,$t0,0x4 /* f108dfc: 00a82821 */ addu $a1,$a1,$t0 -/* f108e00: 8ca5ee48 */ lw $a1,-0x11b8($a1) +/* f108e00: 8ca5ee48 */ lw $a1,%lo(g_MenuStack+0xe48)($a1) /* f108e04: 0fc45a18 */ jal func0f116860 /* f108e08: 03002025 */ or $a0,$t8,$zero .L0f108e0c: @@ -1311,8 +1311,8 @@ glabel func0f108d8c bool menudialog00108e58(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem) { if (operation == MENUOP_102) { - if (g_MenuStack[g_MpPlayerNum].unk00 && - g_MenuStack[g_MpPlayerNum].unk00->dialog == dialog) { + if (g_MenuStack[g_MpPlayerNum].unk4f8 && + g_MenuStack[g_MpPlayerNum].unk4f8->dialog == dialog) { func0f109038(0); } } @@ -1333,7 +1333,7 @@ s32 menuhandler00108ecc(u32 operation, struct menu_item *item, s32 *value) s32 menuhandler00108f08(u32 operation, struct menu_item *item, s32 *value) { if (operation == MENUOP_SET) { - if (g_MenuStack[g_MpPlayerNum].unk94a < 100 && g_MenuStack[g_MpPlayerNum].unk94a != 1) { + if (g_MenuStack[g_MpPlayerNum].unke42 < 100 && g_MenuStack[g_MpPlayerNum].unke42 != 1) { func0f0f3704(&g_SaveElsewhereMenuDialog); } else { menuPopDialog(); @@ -1405,11 +1405,11 @@ glabel func0f109038 /* f109058: 000f78c0 */ sll $t7,$t7,0x3 /* f10905c: 01ee7823 */ subu $t7,$t7,$t6 /* f109060: 000f7900 */ sll $t7,$t7,0x4 -/* f109064: 3c04800a */ lui $a0,0x800a +/* f109064: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe4c) /* f109068: afbf0014 */ sw $ra,0x14($sp) /* f10906c: 008f2021 */ addu $a0,$a0,$t7 /* f109070: 0fc479ac */ jal func0f11e6b0 -/* f109074: 8c84ee4c */ lw $a0,-0x11b4($a0) +/* f109074: 8c84ee4c */ lw $a0,%lo(g_MenuStack+0xe4c)($a0) /* f109078: 2401ffff */ addiu $at,$zero,-1 /* f10907c: 14410010 */ bne $v0,$at,.L0f1090c0 /* f109080: 00402025 */ or $a0,$v0,$zero @@ -1441,8 +1441,8 @@ glabel func0f109038 /* f1090e0: 15010019 */ bne $t0,$at,.L0f109148 /* f1090e4: 3c0d8007 */ lui $t5,%hi(g_MpPlayerNum) /* f1090e8: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) -/* f1090ec: 3c0b800a */ lui $t3,%hi(var8009e000) -/* f1090f0: 256be000 */ addiu $t3,$t3,%lo(var8009e000) +/* f1090ec: 3c0b800a */ lui $t3,0x800a +/* f1090f0: 256be000 */ addiu $t3,$t3,-8192 /* f1090f4: 000950c0 */ sll $t2,$t1,0x3 /* f1090f8: 01495023 */ subu $t2,$t2,$t1 /* f1090fc: 000a5080 */ sll $t2,$t2,0x2 @@ -1467,7 +1467,7 @@ glabel func0f109038 /* f109144: 8fbf0014 */ lw $ra,0x14($sp) .L0f109148: /* f109148: 8dad1448 */ lw $t5,%lo(g_MpPlayerNum)($t5) -/* f10914c: 3c04800a */ lui $a0,0x800a +/* f10914c: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe4c) /* f109150: 000d70c0 */ sll $t6,$t5,0x3 /* f109154: 01cd7023 */ subu $t6,$t6,$t5 /* f109158: 000e7080 */ sll $t6,$t6,0x2 @@ -1477,10 +1477,10 @@ glabel func0f109038 /* f109168: 000e7100 */ sll $t6,$t6,0x4 /* f10916c: 008e2021 */ addu $a0,$a0,$t6 /* f109170: 0fc420c9 */ jal func0f108324 -/* f109174: 8c84ee4c */ lw $a0,-0x11b4($a0) +/* f109174: 8c84ee4c */ lw $a0,%lo(g_MenuStack+0xe4c)($a0) /* f109178: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f10917c: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f109180: 3c19800a */ lui $t9,0x800a +/* f109180: 3c19800a */ lui $t9,%hi(g_MenuStack+0xe42) /* f109184: 3c048007 */ lui $a0,%hi(menudialog_saveerror) /* f109188: 000fc0c0 */ sll $t8,$t7,0x3 /* f10918c: 030fc023 */ subu $t8,$t8,$t7 @@ -1490,7 +1490,7 @@ glabel func0f109038 /* f10919c: 030fc023 */ subu $t8,$t8,$t7 /* f1091a0: 0018c100 */ sll $t8,$t8,0x4 /* f1091a4: 0338c821 */ addu $t9,$t9,$t8 -/* f1091a8: 9339ee42 */ lbu $t9,-0x11be($t9) +/* f1091a8: 9339ee42 */ lbu $t9,%lo(g_MenuStack+0xe42)($t9) /* f1091ac: 2b210064 */ slti $at,$t9,0x64 /* f1091b0: 10200005 */ beqz $at,.L0f1091c8 /* f1091b4: 00000000 */ sll $zero,$zero,0x0 @@ -1547,8 +1547,8 @@ glabel var7f1b36c8 .text /* f1091e0: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f1091e4: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f1091e8: 3c18800a */ lui $t8,%hi(var8009e000) -/* f1091ec: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f1091e8: 3c18800a */ lui $t8,0x800a +/* f1091ec: 2718e000 */ addiu $t8,$t8,-8192 /* f1091f0: 000e78c0 */ sll $t7,$t6,0x3 /* f1091f4: 01ee7823 */ subu $t7,$t7,$t6 /* f1091f8: 000f7880 */ sll $t7,$t7,0x2 @@ -1627,8 +1627,8 @@ glabel var7f1b36c8 /* f109318: 24450e53 */ addiu $a1,$v0,0xe53 /* f10931c: 3c098007 */ lui $t1,%hi(g_MpPlayerNum) /* f109320: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) -/* f109324: 3c0c800a */ lui $t4,%hi(var8009e000) -/* f109328: 258ce000 */ addiu $t4,$t4,%lo(var8009e000) +/* f109324: 3c0c800a */ lui $t4,0x800a +/* f109328: 258ce000 */ addiu $t4,$t4,-8192 /* f10932c: 000968c0 */ sll $t5,$t1,0x3 /* f109330: 01a96823 */ subu $t5,$t5,$t1 /* f109334: 000d6880 */ sll $t5,$t5,0x2 @@ -1650,7 +1650,7 @@ glabel var7f1b36c8 /* f109374: 83a4004b */ lb $a0,0x4b($sp) /* f109378: 3c188007 */ lui $t8,%hi(g_MpPlayerNum) /* f10937c: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f109380: 3c08800a */ lui $t0,0x800a +/* f109380: 3c08800a */ lui $t0,%hi(g_MenuStack+0xe42) /* f109384: 3c018007 */ lui $at,0x8007 /* f109388: 0018c8c0 */ sll $t9,$t8,0x3 /* f10938c: 0338c823 */ subu $t9,$t9,$t8 @@ -1660,7 +1660,7 @@ glabel var7f1b36c8 /* f10939c: 0338c823 */ subu $t9,$t9,$t8 /* f1093a0: 0019c900 */ sll $t9,$t9,0x4 /* f1093a4: 01194021 */ addu $t0,$t0,$t9 -/* f1093a8: 9108ee42 */ lbu $t0,-0x11be($t0) +/* f1093a8: 9108ee42 */ lbu $t0,%lo(g_MenuStack+0xe42)($t0) /* f1093ac: 240f0001 */ addiu $t7,$zero,0x1 /* f1093b0: 00403025 */ or $a2,$v0,$zero /* f1093b4: 00084880 */ sll $t1,$t0,0x2 @@ -1701,7 +1701,7 @@ glabel var7f1b36c8 .L0f10943c: /* f10943c: 3c0c8007 */ lui $t4,%hi(g_MpPlayerNum) /* f109440: 8d8c1448 */ lw $t4,%lo(g_MpPlayerNum)($t4) -/* f109444: 3c0b800a */ lui $t3,0x800a +/* f109444: 3c0b800a */ lui $t3,%hi(g_MenuStack+0xe42) /* f109448: 000c50c0 */ sll $t2,$t4,0x3 /* f10944c: 014c5023 */ subu $t2,$t2,$t4 /* f109450: 000a5080 */ sll $t2,$t2,0x2 @@ -1710,7 +1710,7 @@ glabel var7f1b36c8 /* f10945c: 014c5023 */ subu $t2,$t2,$t4 /* f109460: 000a5100 */ sll $t2,$t2,0x4 /* f109464: 016a5821 */ addu $t3,$t3,$t2 -/* f109468: 916bee42 */ lbu $t3,-0x11be($t3) +/* f109468: 916bee42 */ lbu $t3,%lo(g_MenuStack+0xe42)($t3) /* f10946c: 29610064 */ slti $at,$t3,0x64 /* f109470: 10200010 */ beqz $at,.L0f1094b4 /* f109474: 00000000 */ sll $zero,$zero,0x0 @@ -1754,8 +1754,8 @@ glabel func0f1094e4 /* f1094f0: afbf0014 */ sw $ra,0x14($sp) /* f1094f4: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f1094f8: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f1094fc: 3c18800a */ lui $t8,%hi(var8009e000) -/* f109500: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f1094fc: 3c18800a */ lui $t8,0x800a +/* f109500: 2718e000 */ addiu $t8,$t8,-8192 /* f109504: 000e78c0 */ sll $t7,$t6,0x3 /* f109508: 01ee7823 */ subu $t7,$t7,$t6 /* f10950c: 000f7880 */ sll $t7,$t7,0x2 @@ -1767,13 +1767,13 @@ glabel func0f1094e4 /* f109524: a0450e42 */ sb $a1,0xe42($v0) /* f109528: ac460e44 */ sw $a2,0xe44($v0) /* f10952c: a4400e50 */ sh $zero,0xe50($v0) -/* f109530: 3c01800a */ lui $at,0x800a -/* f109534: ac2021f8 */ sw $zero,0x21f8($at) +/* f109530: 3c01800a */ lui $at,%hi(var800a21f8) +/* f109534: ac2021f8 */ sw $zero,%lo(var800a21f8)($at) .L0f109538: /* f109538: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f10953c: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) /* f109540: 8c8a0000 */ lw $t2,0x0($a0) -/* f109544: 3c09800a */ lui $t1,%hi(var8009e000) +/* f109544: 3c09800a */ lui $t1,0x800a /* f109548: 001940c0 */ sll $t0,$t9,0x3 /* f10954c: 01194023 */ subu $t0,$t0,$t9 /* f109550: 00084080 */ sll $t0,$t0,0x2 @@ -1781,7 +1781,7 @@ glabel func0f1094e4 /* f109558: 000840c0 */ sll $t0,$t0,0x3 /* f10955c: 01194023 */ subu $t0,$t0,$t9 /* f109560: 00084100 */ sll $t0,$t0,0x4 -/* f109564: 2529e000 */ addiu $t1,$t1,%lo(var8009e000) +/* f109564: 2529e000 */ addiu $t1,$t1,-8192 /* f109568: 01091021 */ addu $v0,$t0,$t1 /* f10956c: ac4a0e48 */ sw $t2,0xe48($v0) /* f109570: 948b0004 */ lhu $t3,0x4($a0) @@ -1793,8 +1793,8 @@ glabel func0f1094e4 /* f109588: 00402025 */ or $a0,$v0,$zero /* f10958c: 3c0c8007 */ lui $t4,%hi(g_MpPlayerNum) /* f109590: 8d8c1448 */ lw $t4,%lo(g_MpPlayerNum)($t4) -/* f109594: 3c0e800a */ lui $t6,%hi(var8009e000) -/* f109598: 25cee000 */ addiu $t6,$t6,%lo(var8009e000) +/* f109594: 3c0e800a */ lui $t6,0x800a +/* f109598: 25cee000 */ addiu $t6,$t6,-8192 /* f10959c: 000c68c0 */ sll $t5,$t4,0x3 /* f1095a0: 01ac6823 */ subu $t5,$t5,$t4 /* f1095a4: 000d6880 */ sll $t5,$t5,0x2 @@ -1817,8 +1817,8 @@ glabel func0f1094e4 /* f1095e4: 10400029 */ beqz $v0,.L0f10968c /* f1095e8: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f1095ec: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) -/* f1095f0: 3c09800a */ lui $t1,%hi(var8009e000) -/* f1095f4: 2529e000 */ addiu $t1,$t1,%lo(var8009e000) +/* f1095f0: 3c09800a */ lui $t1,0x800a +/* f1095f4: 2529e000 */ addiu $t1,$t1,-8192 /* f1095f8: 001940c0 */ sll $t0,$t9,0x3 /* f1095fc: 01194023 */ subu $t0,$t0,$t9 /* f109600: 00084080 */ sll $t0,$t0,0x2 @@ -1834,7 +1834,7 @@ glabel func0f1094e4 /* f109628: a44b0e50 */ sh $t3,0xe50($v0) /* f10962c: 3c0c8007 */ lui $t4,%hi(g_MpPlayerNum) /* f109630: 8d8c1448 */ lw $t4,%lo(g_MpPlayerNum)($t4) -/* f109634: 3c0e800a */ lui $t6,0x800a +/* f109634: 3c0e800a */ lui $t6,%hi(g_MenuStack+0xe42) /* f109638: 3c048007 */ lui $a0,%hi(menudialog_saveerror) /* f10963c: 000c68c0 */ sll $t5,$t4,0x3 /* f109640: 01ac6823 */ subu $t5,$t5,$t4 @@ -1844,7 +1844,7 @@ glabel func0f1094e4 /* f109650: 01ac6823 */ subu $t5,$t5,$t4 /* f109654: 000d6900 */ sll $t5,$t5,0x4 /* f109658: 01cd7021 */ addu $t6,$t6,$t5 -/* f10965c: 91ceee42 */ lbu $t6,-0x11be($t6) +/* f10965c: 91ceee42 */ lbu $t6,%lo(g_MenuStack+0xe42)($t6) /* f109660: 29c10064 */ slti $at,$t6,0x64 /* f109664: 10200005 */ beqz $at,.L0f10967c /* f109668: 00000000 */ sll $zero,$zero,0x0 @@ -1899,9 +1899,9 @@ glabel pakDeleteFile /* f109708: 24631448 */ addiu $v1,$v1,%lo(g_MpPlayerNum) /* f10970c: 8c790000 */ lw $t9,0x0($v1) /* f109710: 24050e70 */ addiu $a1,$zero,0xe70 -/* f109714: 3c02800a */ lui $v0,%hi(var8009e000) +/* f109714: 3c02800a */ lui $v0,0x800a /* f109718: 03250019 */ multu $t9,$a1 -/* f10971c: 2442e000 */ addiu $v0,$v0,%lo(var8009e000) +/* f10971c: 2442e000 */ addiu $v0,$v0,-8192 /* f109720: 3c0c8007 */ lui $t4,%hi(g_SaveLocations) /* f109724: 24180001 */ addiu $t8,$zero,0x1 /* f109728: 24120004 */ addiu $s2,$zero,0x4 @@ -1989,7 +1989,7 @@ glabel func0f1097d0 /* f109850: acb80000 */ sw $t8,0x0($a1) /* f109854: 944e02dc */ lhu $t6,0x2dc($v0) /* f109858: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) -/* f10985c: 3c0c800a */ lui $t4,0x800a +/* f10985c: 3c0c800a */ lui $t4,%hi(g_MenuStack+0xe1c) /* f109860: a4ae0004 */ sh $t6,0x4($a1) /* f109864: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) /* f109868: 3c047f1b */ lui $a0,%hi(var7f1b2f3c-0x4) @@ -2001,7 +2001,7 @@ glabel func0f1097d0 /* f109880: 010f4023 */ subu $t0,$t0,$t7 /* f109884: 00084100 */ sll $t0,$t0,0x4 /* f109888: 01886021 */ addu $t4,$t4,$t0 -/* f10988c: 8d8cee1c */ lw $t4,-0x11e4($t4) +/* f10988c: 8d8cee1c */ lw $t4,%lo(g_MenuStack+0xe1c)($t4) /* f109890: 000c5880 */ sll $t3,$t4,0x2 /* f109894: 008b2021 */ addu $a0,$a0,$t3 /* f109898: 0fc5db69 */ jal func0f176da4 @@ -2012,7 +2012,7 @@ glabel func0f1097d0 /* f1098ac: 00403025 */ or $a2,$v0,$zero /* f1098b0: 3c098007 */ lui $t1,%hi(g_MpPlayerNum) /* f1098b4: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) -/* f1098b8: 3c05800a */ lui $a1,0x800a +/* f1098b8: 3c05800a */ lui $a1,%hi(g_MenuStack+0xe1c) /* f1098bc: 3c04800a */ lui $a0,%hi(var800a21e0) /* f1098c0: 000950c0 */ sll $t2,$t1,0x3 /* f1098c4: 01495023 */ subu $t2,$t2,$t1 @@ -2022,7 +2022,7 @@ glabel func0f1097d0 /* f1098d4: 01495023 */ subu $t2,$t2,$t1 /* f1098d8: 000a5100 */ sll $t2,$t2,0x4 /* f1098dc: 00aa2821 */ addu $a1,$a1,$t2 -/* f1098e0: 8ca5ee1c */ lw $a1,-0x11e4($a1) +/* f1098e0: 8ca5ee1c */ lw $a1,%lo(g_MenuStack+0xe1c)($a1) /* f1098e4: 248421e0 */ addiu $a0,$a0,%lo(var800a21e0) /* f1098e8: 0fc42539 */ jal func0f1094e4 /* f1098ec: 24a50067 */ addiu $a1,$a1,0x67 @@ -2034,7 +2034,7 @@ glabel func0f1097d0 .L0f109900: /* f109900: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f109904: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) -/* f109908: 3c0e800a */ lui $t6,0x800a +/* f109908: 3c0e800a */ lui $t6,%hi(g_MenuStack+0xe1c) /* f10990c: 3c018007 */ lui $at,0x8007 /* f109910: 0019c0c0 */ sll $t8,$t9,0x3 /* f109914: 0319c023 */ subu $t8,$t8,$t9 @@ -2044,7 +2044,7 @@ glabel func0f1097d0 /* f109924: 0319c023 */ subu $t8,$t8,$t9 /* f109928: 0018c100 */ sll $t8,$t8,0x4 /* f10992c: 01d87021 */ addu $t6,$t6,$t8 -/* f109930: 8dceee1c */ lw $t6,-0x11e4($t6) +/* f109930: 8dceee1c */ lw $t6,%lo(g_MenuStack+0xe1c)($t6) /* f109934: 240d0001 */ addiu $t5,$zero,0x1 /* f109938: 000e7880 */ sll $t7,$t6,0x2 /* f10993c: 002f0821 */ addu $at,$at,$t7 @@ -2086,7 +2086,7 @@ GLOBAL_ASM( glabel func0f1099a8 /* f1099a8: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f1099ac: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f1099b0: 3c18800a */ lui $t8,0x800a +/* f1099b0: 3c18800a */ lui $t8,%hi(g_MenuStack+0xe3f) /* f1099b4: 3c088007 */ lui $t0,%hi(g_SaveLocations) /* f1099b8: 000e78c0 */ sll $t7,$t6,0x3 /* f1099bc: 01ee7823 */ subu $t7,$t7,$t6 @@ -2096,7 +2096,7 @@ glabel func0f1099a8 /* f1099cc: 01ee7823 */ subu $t7,$t7,$t6 /* f1099d0: 000f7900 */ sll $t7,$t7,0x4 /* f1099d4: 030fc021 */ addu $t8,$t8,$t7 -/* f1099d8: 9318ee3f */ lbu $t8,-0x11c1($t8) +/* f1099d8: 9318ee3f */ lbu $t8,%lo(g_MenuStack+0xe3f)($t8) /* f1099dc: 27bdffc8 */ addiu $sp,$sp,-56 /* f1099e0: afbf0014 */ sw $ra,0x14($sp) /* f1099e4: 0018c880 */ sll $t9,$t8,0x2 @@ -2179,8 +2179,8 @@ glabel var7f1b3710 .text /* f109a68: 3c078007 */ lui $a3,%hi(g_MpPlayerNum) /* f109a6c: 8ce71448 */ lw $a3,%lo(g_MpPlayerNum)($a3) -/* f109a70: 3c0f800a */ lui $t7,%hi(var8009e000) -/* f109a74: 25efe000 */ addiu $t7,$t7,%lo(var8009e000) +/* f109a70: 3c0f800a */ lui $t7,0x800a +/* f109a74: 25efe000 */ addiu $t7,$t7,-8192 /* f109a78: 000770c0 */ sll $t6,$a3,0x3 /* f109a7c: 01c77023 */ subu $t6,$t6,$a3 /* f109a80: 000e7080 */ sll $t6,$t6,0x2 @@ -2308,8 +2308,8 @@ glabel var7f1b3754 .text /* f109bb4: 3c028007 */ lui $v0,%hi(g_MpPlayerNum) /* f109bb8: 8c421448 */ lw $v0,%lo(g_MpPlayerNum)($v0) -/* f109bbc: 3c0f800a */ lui $t7,%hi(var8009e000) -/* f109bc0: 25efe000 */ addiu $t7,$t7,%lo(var8009e000) +/* f109bbc: 3c0f800a */ lui $t7,0x800a +/* f109bc0: 25efe000 */ addiu $t7,$t7,-8192 /* f109bc4: 000270c0 */ sll $t6,$v0,0x3 /* f109bc8: 01c27023 */ subu $t6,$t6,$v0 /* f109bcc: 000e7080 */ sll $t6,$t6,0x2 @@ -2367,7 +2367,7 @@ glabel var7f1b3754 // Mismatch because game calculates address of g_MenuStack differently //void func0f109bb4(char *name) //{ -// switch (g_MenuStack[g_MpPlayerNum].unk946) { +// switch (g_MenuStack[g_MpPlayerNum].unke3e) { // case 0: // case 9: // case 10: @@ -2403,7 +2403,7 @@ glabel var7f1b3758 .text /* f109c8c: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f109c90: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f109c94: 3c18800a */ lui $t8,0x800a +/* f109c94: 3c18800a */ lui $t8,%hi(g_MenuStack+0xe3f) /* f109c98: 27bdff88 */ addiu $sp,$sp,-120 /* f109c9c: 000e78c0 */ sll $t7,$t6,0x3 /* f109ca0: 01ee7823 */ subu $t7,$t7,$t6 @@ -2413,7 +2413,7 @@ glabel var7f1b3758 /* f109cb0: 01ee7823 */ subu $t7,$t7,$t6 /* f109cb4: 000f7900 */ sll $t7,$t7,0x4 /* f109cb8: 030fc021 */ addu $t8,$t8,$t7 -/* f109cbc: 9318ee3f */ lbu $t8,-0x11c1($t8) +/* f109cbc: 9318ee3f */ lbu $t8,%lo(g_MenuStack+0xe3f)($t8) /* f109cc0: 3c038007 */ lui $v1,%hi(g_SaveLocations) /* f109cc4: 3c058007 */ lui $a1,%hi(var8007465c) /* f109cc8: 0018c880 */ sll $t9,$t8,0x2 @@ -2493,7 +2493,7 @@ glabel var7f1b3758 .L0f109dcc: /* f109dcc: 3c0c8007 */ lui $t4,%hi(g_MpPlayerNum) /* f109dd0: 8d8c1448 */ lw $t4,%lo(g_MpPlayerNum)($t4) -/* f109dd4: 3c0e800a */ lui $t6,0x800a +/* f109dd4: 3c0e800a */ lui $t6,%hi(g_MenuStack+0xe3f) /* f109dd8: 3c188007 */ lui $t8,%hi(g_SaveLocations) /* f109ddc: 000c68c0 */ sll $t5,$t4,0x3 /* f109de0: 01ac6823 */ subu $t5,$t5,$t4 @@ -2503,7 +2503,7 @@ glabel var7f1b3758 /* f109df0: 01ac6823 */ subu $t5,$t5,$t4 /* f109df4: 000d6900 */ sll $t5,$t5,0x4 /* f109df8: 01cd7021 */ addu $t6,$t6,$t5 -/* f109dfc: 91ceee3f */ lbu $t6,-0x11c1($t6) +/* f109dfc: 91ceee3f */ lbu $t6,%lo(g_MenuStack+0xe3f)($t6) /* f109e00: 02602025 */ or $a0,$s3,$zero /* f109e04: 00001025 */ or $v0,$zero,$zero /* f109e08: 000e7880 */ sll $t7,$t6,0x2 @@ -2566,8 +2566,8 @@ GLOBAL_ASM( glabel func0f109ec4 /* f109ec4: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f109ec8: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f109ecc: 3c18800a */ lui $t8,%hi(var8009e000) -/* f109ed0: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f109ecc: 3c18800a */ lui $t8,0x800a +/* f109ed0: 2718e000 */ addiu $t8,$t8,-8192 /* f109ed4: 000e78c0 */ sll $t7,$t6,0x3 /* f109ed8: 01ee7823 */ subu $t7,$t7,$t6 /* f109edc: 000f7880 */ sll $t7,$t7,0x2 @@ -2602,8 +2602,8 @@ glabel func0f109ec4 /* f109f4c: 00000000 */ sll $zero,$zero,0x0 /* f109f50: 3c078007 */ lui $a3,%hi(g_MpPlayerNum) /* f109f54: 8ce71448 */ lw $a3,%lo(g_MpPlayerNum)($a3) -/* f109f58: 3c0f800a */ lui $t7,%hi(var8009e000) -/* f109f5c: 25efe000 */ addiu $t7,$t7,%lo(var8009e000) +/* f109f58: 3c0f800a */ lui $t7,0x800a +/* f109f5c: 25efe000 */ addiu $t7,$t7,-8192 /* f109f60: 000770c0 */ sll $t6,$a3,0x3 /* f109f64: 01c77023 */ subu $t6,$t6,$a3 /* f109f68: 000e7080 */ sll $t6,$t6,0x2 @@ -2748,11 +2748,11 @@ glabel func0f10a19c /* f10a1bc: 000f78c0 */ sll $t7,$t7,0x3 /* f10a1c0: 01ee7823 */ subu $t7,$t7,$t6 /* f10a1c4: 000f7900 */ sll $t7,$t7,0x4 -/* f10a1c8: 3c04800a */ lui $a0,0x800a +/* f10a1c8: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe52) /* f10a1cc: afbf0014 */ sw $ra,0x14($sp) /* f10a1d0: 008f2021 */ addu $a0,$a0,$t7 /* f10a1d4: 0fc41fec */ jal func0f107fb0 -/* f10a1d8: 9084ee52 */ lbu $a0,-0x11ae($a0) +/* f10a1d8: 9084ee52 */ lbu $a0,%lo(g_MenuStack+0xe52)($a0) /* f10a1dc: 8fbf0014 */ lw $ra,0x14($sp) /* f10a1e0: 27bd0018 */ addiu $sp,$sp,0x18 /* f10a1e4: 03e00008 */ jr $ra @@ -2790,7 +2790,7 @@ glabel func0f10a22c /* f10a244: 3c088007 */ lui $t0,%hi(g_MpPlayerNum) /* f10a248: aca10000 */ sw $at,0x0($a1) /* f10a24c: 8dd90004 */ lw $t9,0x4($t6) -/* f10a250: 3c0a800a */ lui $t2,0x800a +/* f10a250: 3c0a800a */ lui $t2,%hi(g_MenuStack+0xe3f) /* f10a254: 3c028007 */ lui $v0,%hi(g_SaveLocations) /* f10a258: acb90004 */ sw $t9,0x4($a1) /* f10a25c: 8dc10008 */ lw $at,0x8($t6) @@ -2804,7 +2804,7 @@ glabel func0f10a22c /* f10a27c: 01284823 */ subu $t1,$t1,$t0 /* f10a280: 00094900 */ sll $t1,$t1,0x4 /* f10a284: 01495021 */ addu $t2,$t2,$t1 -/* f10a288: 914aee3f */ lbu $t2,-0x11c1($t2) +/* f10a288: 914aee3f */ lbu $t2,%lo(g_MenuStack+0xe3f)($t2) /* f10a28c: 000a5880 */ sll $t3,$t2,0x2 /* f10a290: 004b1021 */ addu $v0,$v0,$t3 /* f10a294: 8c425bc0 */ lw $v0,%lo(g_SaveLocations)($v0) @@ -2839,7 +2839,7 @@ GLOBAL_ASM( glabel func0f10a2ec /* f10a2ec: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10a2f0: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10a2f4: 3c18800a */ lui $t8,0x800a +/* f10a2f4: 3c18800a */ lui $t8,%hi(g_MenuStack+0xe3f) /* f10a2f8: 3c028007 */ lui $v0,%hi(g_SaveLocations) /* f10a2fc: 000e78c0 */ sll $t7,$t6,0x3 /* f10a300: 01ee7823 */ subu $t7,$t7,$t6 @@ -2849,7 +2849,7 @@ glabel func0f10a2ec /* f10a310: 01ee7823 */ subu $t7,$t7,$t6 /* f10a314: 000f7900 */ sll $t7,$t7,0x4 /* f10a318: 030fc021 */ addu $t8,$t8,$t7 -/* f10a31c: 9318ee3f */ lbu $t8,-0x11c1($t8) +/* f10a31c: 9318ee3f */ lbu $t8,%lo(g_MenuStack+0xe3f)($t8) /* f10a320: 27bdffe8 */ addiu $sp,$sp,-24 /* f10a324: afbf0014 */ sw $ra,0x14($sp) /* f10a328: 0018c880 */ sll $t9,$t8,0x2 @@ -2894,8 +2894,8 @@ GLOBAL_ASM( glabel menuhandlerSaveLocation /* f10a3a4: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10a3a8: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10a3ac: 3c18800a */ lui $t8,%hi(var8009e000) -/* f10a3b0: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f10a3ac: 3c18800a */ lui $t8,0x800a +/* f10a3b0: 2718e000 */ addiu $t8,$t8,-8192 /* f10a3b4: 000e78c0 */ sll $t7,$t6,0x3 /* f10a3b8: 01ee7823 */ subu $t7,$t7,$t6 /* f10a3bc: 000f7880 */ sll $t7,$t7,0x2 @@ -2945,12 +2945,12 @@ glabel menuhandlerSaveLocation // number into %hi then compensating with a larger number in %lo. //s32 menuhandlerSaveLocation(u32 operation, struct menu_item *item, s32 *value) //{ -// if (g_SaveLocations[g_MenuStack[g_MpPlayerNum].unk947] == NULL) { +// if (g_SaveLocations[g_MenuStack[g_MpPlayerNum].unke3f] == NULL) { // return 0; // } // // if (operation == MENUOP_CHECKDISABLED) { -// if (g_SaveLocations[g_MenuStack[g_MpPlayerNum].unk947]->unk2d2[item->param] < 1) { +// if (g_SaveLocations[g_MenuStack[g_MpPlayerNum].unke3f]->unk2d2[item->param] < 1) { // return true; // } // } @@ -2975,8 +2975,8 @@ s32 menuhandlerPakCancelSave(u32 operation, struct menu_item *item, s32 *value) s32 menuhandlerDeleteFiles(u32 operation, struct menu_item *item, s32 *value) { if (operation == MENUOP_SET) { - func0f10b0c4(g_MenuStack[g_MpPlayerNum].unk947); - g_MenuStack[g_MpPlayerNum].unk930 = 1; + func0f10b0c4(g_MenuStack[g_MpPlayerNum].unke3f); + g_MenuStack[g_MpPlayerNum].unke28 = 1; } return 0; @@ -2986,7 +2986,7 @@ GLOBAL_ASM( glabel func0f10a51c /* f10a51c: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10a520: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10a524: 3c01800a */ lui $at,0x800a +/* f10a524: 3c01800a */ lui $at,%hi(g_MenuStack+0xe3e) /* f10a528: 27bdffe8 */ addiu $sp,$sp,-24 /* f10a52c: 000e78c0 */ sll $t7,$t6,0x3 /* f10a530: 01ee7823 */ subu $t7,$t7,$t6 @@ -2997,12 +2997,12 @@ glabel func0f10a51c /* f10a544: 000f7900 */ sll $t7,$t7,0x4 /* f10a548: 002f0821 */ addu $at,$at,$t7 /* f10a54c: afbf0014 */ sw $ra,0x14($sp) -/* f10a550: a024ee3e */ sb $a0,-0x11c2($at) +/* f10a550: a024ee3e */ sb $a0,%lo(g_MenuStack+0xe3e)($at) /* f10a554: 0fc4433e */ jal func0f110cf8 /* f10a558: 30a400ff */ andi $a0,$a1,0xff /* f10a55c: 3c188007 */ lui $t8,%hi(g_MpPlayerNum) /* f10a560: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f10a564: 3c01800a */ lui $at,0x800a +/* f10a564: 3c01800a */ lui $at,%hi(g_MenuStack+0xe3f) /* f10a568: 0018c8c0 */ sll $t9,$t8,0x3 /* f10a56c: 0338c823 */ subu $t9,$t9,$t8 /* f10a570: 0019c880 */ sll $t9,$t9,0x2 @@ -3012,7 +3012,7 @@ glabel func0f10a51c /* f10a580: 0019c900 */ sll $t9,$t9,0x4 /* f10a584: 00390821 */ addu $at,$at,$t9 /* f10a588: 0fc4436a */ jal func0f110da8 -/* f10a58c: a022ee3f */ sb $v0,-0x11c1($at) +/* f10a58c: a022ee3f */ sb $v0,%lo(g_MenuStack+0xe3f)($at) /* f10a590: 3c048007 */ lui $a0,%hi(menudialog_selectlocation) /* f10a594: 0fc3cbd3 */ jal menuPushDialog /* f10a598: 24844858 */ addiu $a0,$a0,%lo(menudialog_selectlocation) @@ -3327,7 +3327,7 @@ glabel func0f10a97c /* f10aa2c: 3c02800b */ lui $v0,%hi(g_MpSetup) /* f10aa30: 2442cb88 */ addiu $v0,$v0,%lo(g_MpSetup) /* f10aa34: 8c4d0020 */ lw $t5,0x20($v0) -/* f10aa38: 3c04800b */ lui $a0,0x800b +/* f10aa38: 3c04800b */ lui $a0,%hi(g_MpSetup+0x16) /* f10aa3c: 24070004 */ addiu $a3,$zero,0x4 /* f10aa40: 15a80007 */ bne $t5,$t0,.L0f10aa60 /* f10aa44: 240600a0 */ addiu $a2,$zero,0xa0 @@ -3341,7 +3341,7 @@ glabel func0f10a97c /* f10aa60: 3c05800b */ lui $a1,%hi(g_MpPlayers) /* f10aa64: 24a5c7b8 */ addiu $a1,$a1,%lo(g_MpPlayers) /* f10aa68: 00001025 */ or $v0,$zero,$zero -/* f10aa6c: 9484cb9e */ lhu $a0,-0x3462($a0) +/* f10aa6c: 9484cb9e */ lhu $a0,%lo(g_MpSetup+0x16)($a0) /* f10aa70: 24180001 */ addiu $t8,$zero,0x1 .L0f10aa74: /* f10aa74: 0058c804 */ sllv $t9,$t8,$v0 @@ -3432,7 +3432,7 @@ glabel var7f1b37a8 /* f10ab08: 00008825 */ or $s1,$zero,$zero /* f10ab0c: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f10ab10: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f10ab14: 3c02800a */ lui $v0,0x800a +/* f10ab14: 3c02800a */ lui $v0,%hi(g_MenuStack+0xe3f) /* f10ab18: 000fc0c0 */ sll $t8,$t7,0x3 /* f10ab1c: 030fc023 */ subu $t8,$t8,$t7 /* f10ab20: 0018c080 */ sll $t8,$t8,0x2 @@ -3441,7 +3441,7 @@ glabel var7f1b37a8 /* f10ab2c: 030fc023 */ subu $t8,$t8,$t7 /* f10ab30: 0018c100 */ sll $t8,$t8,0x4 /* f10ab34: 00581021 */ addu $v0,$v0,$t8 -/* f10ab38: 9051ee3f */ lbu $s1,-0x11c1($v0) +/* f10ab38: 9051ee3f */ lbu $s1,%lo(g_MenuStack+0xe3f)($v0) /* f10ab3c: 0011c880 */ sll $t9,$s1,0x2 /* f10ab40: 01194821 */ addu $t1,$t0,$t9 /* f10ab44: 8d230000 */ lw $v1,0x0($t1) @@ -3470,7 +3470,7 @@ glabel var7f1b37a8 /* f10ab98: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f10ab9c: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) /* f10aba0: 8e0e0004 */ lw $t6,0x4($s0) -/* f10aba4: 3c0a800a */ lui $t2,0x800a +/* f10aba4: 3c0a800a */ lui $t2,%hi(g_MenuStack+0xe1c) /* f10aba8: 001948c0 */ sll $t1,$t9,0x3 /* f10abac: 01394823 */ subu $t1,$t1,$t9 /* f10abb0: 00094880 */ sll $t1,$t1,0x2 @@ -3480,7 +3480,7 @@ glabel var7f1b37a8 /* f10abc0: 00094900 */ sll $t1,$t1,0x4 /* f10abc4: 01495021 */ addu $t2,$t2,$t1 /* f10abc8: 000e7880 */ sll $t7,$t6,0x2 -/* f10abcc: 8d4aee1c */ lw $t2,-0x11e4($t2) +/* f10abcc: 8d4aee1c */ lw $t2,%lo(g_MenuStack+0xe1c)($t2) /* f10abd0: 01ee7823 */ subu $t7,$t7,$t6 /* f10abd4: 000f78c0 */ sll $t7,$t7,0x3 /* f10abd8: 8e110000 */ lw $s1,0x0($s0) @@ -3523,7 +3523,7 @@ glabel var7f1b37a8 /* f10ac64: 1120002e */ beqz $t1,.L0f10ad20 /* f10ac68: 00000000 */ sll $zero,$zero,0x0 /* f10ac6c: 8d4a1448 */ lw $t2,%lo(g_MpPlayerNum)($t2) -/* f10ac70: 3c06800a */ lui $a2,0x800a +/* f10ac70: 3c06800a */ lui $a2,%hi(g_MenuStack+0xe1c) /* f10ac74: 27a40048 */ addiu $a0,$sp,0x48 /* f10ac78: 000a58c0 */ sll $t3,$t2,0x3 /* f10ac7c: 016a5823 */ subu $t3,$t3,$t2 @@ -3533,7 +3533,7 @@ glabel var7f1b37a8 /* f10ac8c: 016a5823 */ subu $t3,$t3,$t2 /* f10ac90: 000b5900 */ sll $t3,$t3,0x4 /* f10ac94: 00cb3021 */ addu $a2,$a2,$t3 -/* f10ac98: 8cc6ee1c */ lw $a2,-0x11e4($a2) +/* f10ac98: 8cc6ee1c */ lw $a2,%lo(g_MenuStack+0xe1c)($a2) /* f10ac9c: 01202825 */ or $a1,$t1,$zero /* f10aca0: 0fc42034 */ jal func0f1080d0 /* f10aca4: 24c6ffff */ addiu $a2,$a2,-1 @@ -3609,9 +3609,9 @@ glabel menucustomFileToDelete /* f10ad9c: 25081448 */ addiu $t0,$t0,%lo(g_MpPlayerNum) /* f10ada0: 8d0e0000 */ lw $t6,0x0($t0) /* f10ada4: 24090e70 */ addiu $t1,$zero,0xe70 -/* f10ada8: 3c07800a */ lui $a3,%hi(var8009e000) +/* f10ada8: 3c07800a */ lui $a3,0x800a /* f10adac: 01c90019 */ multu $t6,$t1 -/* f10adb0: 24e7e000 */ addiu $a3,$a3,%lo(var8009e000) +/* f10adb0: 24e7e000 */ addiu $a3,$a3,-8192 /* f10adb4: 3c038007 */ lui $v1,%hi(g_SaveLocations) /* f10adb8: 24635bc0 */ addiu $v1,$v1,%lo(g_SaveLocations) /* f10adbc: 27bdffe0 */ addiu $sp,$sp,-32 @@ -3644,10 +3644,10 @@ glabel menucustomFileToDelete /* f10ae24: 0fc42a5f */ jal func0f10a97c /* f10ae28: afa6001c */ sw $a2,0x1c($sp) /* f10ae2c: 3c038007 */ lui $v1,%hi(g_SaveLocations) -/* f10ae30: 3c07800a */ lui $a3,%hi(var8009e000) +/* f10ae30: 3c07800a */ lui $a3,0x800a /* f10ae34: 3c088007 */ lui $t0,%hi(g_MpPlayerNum) /* f10ae38: 25081448 */ addiu $t0,$t0,%lo(g_MpPlayerNum) -/* f10ae3c: 24e7e000 */ addiu $a3,$a3,%lo(var8009e000) +/* f10ae3c: 24e7e000 */ addiu $a3,$a3,-8192 /* f10ae40: 24635bc0 */ addiu $v1,$v1,%lo(g_SaveLocations) /* f10ae44: 8fa6001c */ lw $a2,0x1c($sp) /* f10ae48: 10400011 */ beqz $v0,.L0f10ae90 @@ -3736,10 +3736,10 @@ glabel menucustomFileToCopy /* f10af70: ac480000 */ sw $t0,0x0($v0) /* f10af74: 94a90004 */ lhu $t1,0x4($a1) /* f10af78: 3c0a8007 */ lui $t2,%hi(g_MpPlayerNum) -/* f10af7c: 3c0d800a */ lui $t5,%hi(var8009e000) +/* f10af7c: 3c0d800a */ lui $t5,0x800a /* f10af80: a4490004 */ sh $t1,0x4($v0) /* f10af84: 8d4a1448 */ lw $t2,%lo(g_MpPlayerNum)($t2) -/* f10af88: 25ade000 */ addiu $t5,$t5,%lo(var8009e000) +/* f10af88: 25ade000 */ addiu $t5,$t5,-8192 /* f10af8c: 000a58c0 */ sll $t3,$t2,0x3 /* f10af90: 016a5823 */ subu $t3,$t3,$t2 /* f10af94: 000b5880 */ sll $t3,$t3,0x2 @@ -3752,7 +3752,7 @@ glabel menucustomFileToCopy /* f10afb0: 018d2021 */ addu $a0,$t4,$t5 /* f10afb4: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10afb8: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10afbc: 3c02800a */ lui $v0,0x800a +/* f10afbc: 3c02800a */ lui $v0,%hi(g_MenuStack+0xe1c) /* f10afc0: 000e78c0 */ sll $t7,$t6,0x3 /* f10afc4: 01ee7823 */ subu $t7,$t7,$t6 /* f10afc8: 000f7880 */ sll $t7,$t7,0x2 @@ -3761,7 +3761,7 @@ glabel menucustomFileToCopy /* f10afd4: 01ee7823 */ subu $t7,$t7,$t6 /* f10afd8: 000f7900 */ sll $t7,$t7,0x4 /* f10afdc: 004f1021 */ addu $v0,$v0,$t7 -/* f10afe0: 8c42ee1c */ lw $v0,-0x11e4($v0) +/* f10afe0: 8c42ee1c */ lw $v0,%lo(g_MenuStack+0xe1c)($v0) /* f10afe4: 00402025 */ or $a0,$v0,$zero /* f10afe8: 0fc42947 */ jal func0f10a51c /* f10afec: 2445ffff */ addiu $a1,$v0,-1 @@ -3788,8 +3788,8 @@ glabel menudialog0010b014 /* f10b028: afa60020 */ sw $a2,0x20($sp) /* f10b02c: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10b030: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10b034: 3c18800a */ lui $t8,%hi(var8009e000) -/* f10b038: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f10b034: 3c18800a */ lui $t8,0x800a +/* f10b038: 2718e000 */ addiu $t8,$t8,-8192 /* f10b03c: 000e78c0 */ sll $t7,$t6,0x3 /* f10b040: 01ee7823 */ subu $t7,$t7,$t6 /* f10b044: 000f7880 */ sll $t7,$t7,0x2 @@ -3810,7 +3810,7 @@ glabel menudialog0010b014 /* f10b07c: 00002825 */ or $a1,$zero,$zero /* f10b080: 3c088007 */ lui $t0,%hi(g_MpPlayerNum) /* f10b084: 8d081448 */ lw $t0,%lo(g_MpPlayerNum)($t0) -/* f10b088: 3c01800a */ lui $at,0x800a +/* f10b088: 3c01800a */ lui $at,%hi(g_MenuStack+0xe1c) /* f10b08c: 000848c0 */ sll $t1,$t0,0x3 /* f10b090: 01284823 */ subu $t1,$t1,$t0 /* f10b094: 00094880 */ sll $t1,$t1,0x2 @@ -3819,7 +3819,7 @@ glabel menudialog0010b014 /* f10b0a0: 01284823 */ subu $t1,$t1,$t0 /* f10b0a4: 00094900 */ sll $t1,$t1,0x4 /* f10b0a8: 00290821 */ addu $at,$at,$t1 -/* f10b0ac: ac20ee1c */ sw $zero,-0x11e4($at) +/* f10b0ac: ac20ee1c */ sw $zero,%lo(g_MenuStack+0xe1c)($at) .L0f10b0b0: /* f10b0b0: 8fbf0014 */ lw $ra,0x14($sp) /* f10b0b4: 27bd0018 */ addiu $sp,$sp,0x18 @@ -3832,8 +3832,8 @@ GLOBAL_ASM( glabel func0f10b0c4 /* f10b0c4: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10b0c8: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10b0cc: 3c18800a */ lui $t8,%hi(var8009e000) -/* f10b0d0: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f10b0cc: 3c18800a */ lui $t8,0x800a +/* f10b0d0: 2718e000 */ addiu $t8,$t8,-8192 /* f10b0d4: 000e78c0 */ sll $t7,$t6,0x3 /* f10b0d8: 01ee7823 */ subu $t7,$t7,$t6 /* f10b0dc: 000f7880 */ sll $t7,$t7,0x2 @@ -3877,8 +3877,8 @@ glabel menuhandler0010b14c /* f10b160: afa60030 */ sw $a2,0x30($sp) /* f10b164: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10b168: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10b16c: 3c18800a */ lui $t8,%hi(var8009e000) -/* f10b170: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f10b16c: 3c18800a */ lui $t8,0x800a +/* f10b170: 2718e000 */ addiu $t8,$t8,-8192 /* f10b174: 000e78c0 */ sll $t7,$t6,0x3 /* f10b178: 01ee7823 */ subu $t7,$t7,$t6 /* f10b17c: 000f7880 */ sll $t7,$t7,0x2 @@ -3903,7 +3903,7 @@ glabel menuhandler0010b14c /* f10b1c8: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f10b1cc: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) /* f10b1d0: 8fa20024 */ lw $v0,0x24($sp) -/* f10b1d4: 3c04800a */ lui $a0,0x800a +/* f10b1d4: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe23) /* f10b1d8: 000fc0c0 */ sll $t8,$t7,0x3 /* f10b1dc: 030fc023 */ subu $t8,$t8,$t7 /* f10b1e0: 0018c080 */ sll $t8,$t8,0x2 @@ -3916,13 +3916,13 @@ glabel menuhandler0010b14c /* f10b1fc: 8c460004 */ lw $a2,0x4($v0) /* f10b200: 2448000a */ addiu $t0,$v0,0xa /* f10b204: afa80010 */ sw $t0,0x10($sp) -/* f10b208: 8084ee23 */ lb $a0,-0x11dd($a0) +/* f10b208: 8084ee23 */ lb $a0,%lo(g_MenuStack+0xe23)($a0) /* f10b20c: 0fc45a22 */ jal func0f116888 /* f10b210: 2447000e */ addiu $a3,$v0,0xe /* f10b214: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f10b218: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) -/* f10b21c: 3c0b800a */ lui $t3,%hi(var8009e000) -/* f10b220: 256be000 */ addiu $t3,$t3,%lo(var8009e000) +/* f10b21c: 3c0b800a */ lui $t3,0x800a +/* f10b220: 256be000 */ addiu $t3,$t3,-8192 /* f10b224: 001948c0 */ sll $t1,$t9,0x3 /* f10b228: 01394823 */ subu $t1,$t1,$t9 /* f10b22c: 00094880 */ sll $t1,$t1,0x2 @@ -4231,7 +4231,7 @@ glabel var7f1b37f8 /* f10b620: 5581000f */ bnel $t4,$at,.L0f10b660 /* f10b624: 00001025 */ or $v0,$zero,$zero /* f10b628: 8dad1448 */ lw $t5,%lo(g_MpPlayerNum)($t5) -/* f10b62c: 3c01800a */ lui $at,0x800a +/* f10b62c: 3c01800a */ lui $at,%hi(g_MenuStack+0xe28) /* f10b630: 24844aa0 */ addiu $a0,$a0,%lo(menudialog_deletegamenote) /* f10b634: 000d70c0 */ sll $t6,$t5,0x3 /* f10b638: 01cd7023 */ subu $t6,$t6,$t5 @@ -4242,7 +4242,7 @@ glabel var7f1b37f8 /* f10b64c: 000e7100 */ sll $t6,$t6,0x4 /* f10b650: 002e0821 */ addu $at,$at,$t6 /* f10b654: 0fc3cbd3 */ jal menuPushDialog -/* f10b658: ac22ee28 */ sw $v0,-0x11d8($at) +/* f10b658: ac22ee28 */ sw $v0,%lo(g_MenuStack+0xe28)($at) .L0f10b65c: /* f10b65c: 00001025 */ or $v0,$zero,$zero .L0f10b660: @@ -4263,8 +4263,8 @@ glabel menudialog0010b674 /* f10b684: afa60028 */ sw $a2,0x28($sp) /* f10b688: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10b68c: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10b690: 3c18800a */ lui $t8,%hi(var8009e000) -/* f10b694: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f10b690: 3c18800a */ lui $t8,0x800a +/* f10b694: 2718e000 */ addiu $t8,$t8,-8192 /* f10b698: 000e78c0 */ sll $t7,$t6,0x3 /* f10b69c: 01ee7823 */ subu $t7,$t7,$t6 /* f10b6a0: 000f7880 */ sll $t7,$t7,0x2 @@ -4288,7 +4288,7 @@ glabel menudialog0010b674 /* f10b6e8: afa2001c */ sw $v0,0x1c($sp) /* f10b6ec: 3c088007 */ lui $t0,%hi(g_MpPlayerNum) /* f10b6f0: 8d081448 */ lw $t0,%lo(g_MpPlayerNum)($t0) -/* f10b6f4: 3c0a800a */ lui $t2,%hi(var8009e000) +/* f10b6f4: 3c0a800a */ lui $t2,0x800a /* f10b6f8: 3c018007 */ lui $at,0x8007 /* f10b6fc: 000848c0 */ sll $t1,$t0,0x3 /* f10b700: 01284823 */ subu $t1,$t1,$t0 @@ -4297,7 +4297,7 @@ glabel menudialog0010b674 /* f10b70c: 000948c0 */ sll $t1,$t1,0x3 /* f10b710: 01284823 */ subu $t1,$t1,$t0 /* f10b714: 00094900 */ sll $t1,$t1,0x4 -/* f10b718: 254ae000 */ addiu $t2,$t2,%lo(var8009e000) +/* f10b718: 254ae000 */ addiu $t2,$t2,-8192 /* f10b71c: 8fa3001c */ lw $v1,0x1c($sp) /* f10b720: ac204a4c */ sw $zero,0x4a4c($at) /* f10b724: 012a1021 */ addu $v0,$t1,$t2 @@ -4470,11 +4470,11 @@ glabel func0f10b924 /* f10b944: 000f78c0 */ sll $t7,$t7,0x3 /* f10b948: 01ee7823 */ subu $t7,$t7,$t6 /* f10b94c: 000f7900 */ sll $t7,$t7,0x4 -/* f10b950: 3c04800a */ lui $a0,0x800a +/* f10b950: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe20) /* f10b954: afbf0014 */ sw $ra,0x14($sp) /* f10b958: 008f2021 */ addu $a0,$a0,$t7 /* f10b95c: 0fc41fec */ jal func0f107fb0 -/* f10b960: 8c84ee20 */ lw $a0,-0x11e0($a0) +/* f10b960: 8c84ee20 */ lw $a0,%lo(g_MenuStack+0xe20)($a0) /* f10b964: 8fbf0014 */ lw $ra,0x14($sp) /* f10b968: 27bd0018 */ addiu $sp,$sp,0x18 /* f10b96c: 03e00008 */ jr $ra @@ -4518,7 +4518,7 @@ glabel menudialog0010ba10 /* f10ba4c: 24040003 */ addiu $a0,$zero,0x3 /* f10ba50: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10ba54: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10ba58: 3c01800a */ lui $at,0x800a +/* f10ba58: 3c01800a */ lui $at,%hi(g_MenuStack+0xe24) /* f10ba5c: 000e78c0 */ sll $t7,$t6,0x3 /* f10ba60: 01ee7823 */ subu $t7,$t7,$t6 /* f10ba64: 000f7880 */ sll $t7,$t7,0x2 @@ -4528,7 +4528,7 @@ glabel menudialog0010ba10 /* f10ba74: 000f7900 */ sll $t7,$t7,0x4 /* f10ba78: 002f0821 */ addu $at,$at,$t7 /* f10ba7c: 10000029 */ beqz $zero,.L0f10bb24 -/* f10ba80: ac20ee24 */ sw $zero,-0x11dc($at) +/* f10ba80: ac20ee24 */ sw $zero,%lo(g_MenuStack+0xe24)($at) .L0f10ba84: /* f10ba84: 3c018006 */ lui $at,0x8006 /* f10ba88: 10000026 */ beqz $zero,.L0f10bb24 @@ -4541,7 +4541,7 @@ glabel menudialog0010ba10 /* f10baa0: 1321001e */ beq $t9,$at,.L0f10bb1c /* f10baa4: 3c088007 */ lui $t0,%hi(g_MpPlayerNum) /* f10baa8: 8d081448 */ lw $t0,%lo(g_MpPlayerNum)($t0) -/* f10baac: 3c04800a */ lui $a0,0x800a +/* f10baac: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe24) /* f10bab0: 24050004 */ addiu $a1,$zero,0x4 /* f10bab4: 000848c0 */ sll $t1,$t0,0x3 /* f10bab8: 01284823 */ subu $t1,$t1,$t0 @@ -4551,7 +4551,7 @@ glabel menudialog0010ba10 /* f10bac8: 01284823 */ subu $t1,$t1,$t0 /* f10bacc: 00094900 */ sll $t1,$t1,0x4 /* f10bad0: 00892021 */ addu $a0,$a0,$t1 -/* f10bad4: 8c84ee24 */ lw $a0,-0x11dc($a0) +/* f10bad4: 8c84ee24 */ lw $a0,%lo(g_MenuStack+0xe24)($a0) /* f10bad8: 240a0001 */ addiu $t2,$zero,0x1 .L0f10badc: /* f10badc: 006a5804 */ sllv $t3,$t2,$v1 @@ -4594,7 +4594,7 @@ glabel menuhandlerOpenCopyFile /* f10bb50: 3c188007 */ lui $t8,%hi(g_MpPlayerNum) /* f10bb54: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) /* f10bb58: 90ae0001 */ lbu $t6,0x1($a1) -/* f10bb5c: 3c01800a */ lui $at,0x800a +/* f10bb5c: 3c01800a */ lui $at,%hi(g_MenuStack+0xe1c) /* f10bb60: 0018c8c0 */ sll $t9,$t8,0x3 /* f10bb64: 0338c823 */ subu $t9,$t9,$t8 /* f10bb68: 0019c880 */ sll $t9,$t9,0x2 @@ -4604,14 +4604,14 @@ glabel menuhandlerOpenCopyFile /* f10bb78: 0019c900 */ sll $t9,$t9,0x4 /* f10bb7c: 00390821 */ addu $at,$at,$t9 /* f10bb80: 25cf0001 */ addiu $t7,$t6,0x1 -/* f10bb84: ac2fee1c */ sw $t7,-0x11e4($at) +/* f10bb84: ac2fee1c */ sw $t7,%lo(g_MenuStack+0xe1c)($at) /* f10bb88: 90a50001 */ lbu $a1,0x1($a1) /* f10bb8c: 0fc44317 */ jal func0f110c5c /* f10bb90: 00002025 */ or $a0,$zero,$zero /* f10bb94: 3c088007 */ lui $t0,%hi(g_MpPlayerNum) /* f10bb98: 8d081448 */ lw $t0,%lo(g_MpPlayerNum)($t0) -/* f10bb9c: 3c0a800a */ lui $t2,%hi(var8009e000) -/* f10bba0: 254ae000 */ addiu $t2,$t2,%lo(var8009e000) +/* f10bb9c: 3c0a800a */ lui $t2,0x800a +/* f10bba0: 254ae000 */ addiu $t2,$t2,-8192 /* f10bba4: 000848c0 */ sll $t1,$t0,0x3 /* f10bba8: 01284823 */ subu $t1,$t1,$t0 /* f10bbac: 00094880 */ sll $t1,$t1,0x2 @@ -4640,8 +4640,8 @@ glabel menuhandlerOpenCopyFile // if (operation == MENUOP_SET) { // g_MenuStack[g_MpPlayerNum].slotindex = item->param + 1; // func0f110c5c(0, item->param); -// g_MenuStack[g_MpPlayerNum].unk947 = 0; -// g_MenuStack[g_MpPlayerNum].unk930 = 0; +// g_MenuStack[g_MpPlayerNum].unke3f = 0; +// g_MenuStack[g_MpPlayerNum].unke28 = 0; // menuPushDialog(&menudialog_copyfile); // } // @@ -4653,7 +4653,7 @@ s32 menuhandlerOpenDeleteFile(u32 operation, struct menu_item *item, s32 *value) if (operation == MENUOP_SET) { g_MenuStack[g_MpPlayerNum].slotindex = item->param + 1; func0f110c5c(0, item->param); - g_MenuStack[g_MpPlayerNum].unk946 = -1; + g_MenuStack[g_MpPlayerNum].unke3e = -1; func0f10b0c4(0); } @@ -4677,7 +4677,7 @@ s32 menuhandlerAgentName(u32 operation, struct menu_item *item, char **value) break; case MENUOP_SET: func0f10a51c(0, 0); - g_MenuStack[g_MpPlayerNum].unk934 = 1; + g_MenuStack[g_MpPlayerNum].unke2c = 1; break; } @@ -4774,8 +4774,8 @@ glabel var7f1b385c /* f10bde0: 54790034 */ bnel $v1,$t9,.L0f10beb4 /* f10bde4: 910f030e */ lbu $t7,0x30e($t0) /* f10bde8: 8d6b1448 */ lw $t3,%lo(g_MpPlayerNum)($t3) -/* f10bdec: 3c0d800a */ lui $t5,%hi(var8009e000) -/* f10bdf0: 25ade000 */ addiu $t5,$t5,%lo(var8009e000) +/* f10bdec: 3c0d800a */ lui $t5,0x800a +/* f10bdf0: 25ade000 */ addiu $t5,$t5,-8192 /* f10bdf4: 000b60c0 */ sll $t4,$t3,0x3 /* f10bdf8: 018b6023 */ subu $t4,$t4,$t3 /* f10bdfc: 000c6080 */ sll $t4,$t4,0x2 @@ -4814,8 +4814,8 @@ glabel var7f1b385c /* f10be78: 24420018 */ addiu $v0,$v0,0x18 /* f10be7c: 3c0c8007 */ lui $t4,%hi(g_MpPlayerNum) /* f10be80: 8d8c1448 */ lw $t4,%lo(g_MpPlayerNum)($t4) -/* f10be84: 3c0e800a */ lui $t6,%hi(var8009e000) -/* f10be88: 25cee000 */ addiu $t6,$t6,%lo(var8009e000) +/* f10be84: 3c0e800a */ lui $t6,0x800a +/* f10be88: 25cee000 */ addiu $t6,$t6,-8192 /* f10be8c: 000c68c0 */ sll $t5,$t4,0x3 /* f10be90: 01ac6823 */ subu $t5,$t5,$t4 /* f10be94: 000d6880 */ sll $t5,$t5,0x2 @@ -4835,7 +4835,7 @@ glabel var7f1b385c .L0f10bec4: /* f10bec4: 3c188007 */ lui $t8,%hi(g_MpPlayerNum) /* f10bec8: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f10becc: 3c01800a */ lui $at,0x800a +/* f10becc: 3c01800a */ lui $at,%hi(g_MenuStack+0xe2c) /* f10bed0: 24060001 */ addiu $a2,$zero,0x1 /* f10bed4: 0018c8c0 */ sll $t9,$t8,0x3 /* f10bed8: 0338c823 */ subu $t9,$t9,$t8 @@ -4845,7 +4845,7 @@ glabel var7f1b385c /* f10bee8: 0338c823 */ subu $t9,$t9,$t8 /* f10beec: 0019c900 */ sll $t9,$t9,0x4 /* f10bef0: 00390821 */ addu $at,$at,$t9 -/* f10bef4: ac20ee2c */ sw $zero,-0x11d4($at) +/* f10bef4: ac20ee2c */ sw $zero,%lo(g_MenuStack+0xe2c)($at) .L0f10bef8: /* f10bef8: 10c0023c */ beqz $a2,.L0f10c7ec /* f10befc: 3c06800a */ lui $a2,%hi(g_Vars) @@ -5469,7 +5469,7 @@ glabel menudialog0010c804 .L0f10c840: /* f10c840: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10c844: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10c848: 3c01800a */ lui $at,0x800a +/* f10c848: 3c01800a */ lui $at,%hi(g_MenuStack+0xe1c) /* f10c84c: 00002025 */ or $a0,$zero,$zero /* f10c850: 000e78c0 */ sll $t7,$t6,0x3 /* f10c854: 01ee7823 */ subu $t7,$t7,$t6 @@ -5479,7 +5479,7 @@ glabel menudialog0010c804 /* f10c864: 01ee7823 */ subu $t7,$t7,$t6 /* f10c868: 000f7900 */ sll $t7,$t7,0x4 /* f10c86c: 002f0821 */ addu $at,$at,$t7 -/* f10c870: ac20ee1c */ sw $zero,-0x11e4($at) +/* f10c870: ac20ee1c */ sw $zero,%lo(g_MenuStack+0xe1c)($at) /* f10c874: 0fc44317 */ jal func0f110c5c /* f10c878: 00002825 */ or $a1,$zero,$zero /* f10c87c: 0fc62084 */ jal func0f188210 @@ -5525,8 +5525,8 @@ GLOBAL_ASM( glabel func0f10c900 /* f10c900: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10c904: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10c908: 3c18800a */ lui $t8,%hi(var8009e000) -/* f10c90c: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f10c908: 3c18800a */ lui $t8,0x800a +/* f10c90c: 2718e000 */ addiu $t8,$t8,-8192 /* f10c910: 000e78c0 */ sll $t7,$t6,0x3 /* f10c914: 01ee7823 */ subu $t7,$t7,$t6 /* f10c918: 000f7880 */ sll $t7,$t7,0x2 diff --git a/src/game/game_10c9c0.c b/src/game/game_10c9c0.c index f2011be20..dc4699e2c 100644 --- a/src/game/game_10c9c0.c +++ b/src/game/game_10c9c0.c @@ -131,8 +131,8 @@ bool menudialog4MbMainMenu(u32 operation, struct menu_dialog *dialog, struct men g_Vars.unk000497 = 0; } - if (g_MenuStack[g_MpPlayerNum].unk00 && - g_MenuStack[g_MpPlayerNum].unk00->dialog == &g_4MbMainMenu && + if (g_MenuStack[g_MpPlayerNum].unk4f8 && + g_MenuStack[g_MpPlayerNum].unk4f8->dialog == &g_4MbMainMenu && operation == MENUOP_102) { g_Vars.unk000490 = 2; g_Vars.mpquickteam = MPQUICKTEAM_5; diff --git a/src/game/game_10ccd0.c b/src/game/game_10ccd0.c index 76e83f7ee..1997f4e20 100644 --- a/src/game/game_10ccd0.c +++ b/src/game/game_10ccd0.c @@ -79,7 +79,7 @@ glabel menudialog0010cd0c /* f10cd24: 00a03825 */ or $a3,$a1,$zero /* f10cd28: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f10cd2c: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f10cd30: 3c02800a */ lui $v0,%hi(g_MenuStack) +/* f10cd30: 3c02800a */ lui $v0,%hi(g_MenuStack+0x4f8) /* f10cd34: 000fc0c0 */ sll $t8,$t7,0x3 /* f10cd38: 030fc023 */ subu $t8,$t8,$t7 /* f10cd3c: 0018c080 */ sll $t8,$t8,0x2 @@ -88,7 +88,7 @@ glabel menudialog0010cd0c /* f10cd48: 030fc023 */ subu $t8,$t8,$t7 /* f10cd4c: 0018c100 */ sll $t8,$t8,0x4 /* f10cd50: 00581021 */ addu $v0,$v0,$t8 -/* f10cd54: 8c42e4f8 */ lw $v0,%lo(g_MenuStack)($v0) +/* f10cd54: 8c42e4f8 */ lw $v0,%lo(g_MenuStack+0x4f8)($v0) /* f10cd58: 5040003f */ beqzl $v0,.L0f10ce58 /* f10cd5c: 8fa40040 */ lw $a0,0x40($sp) /* f10cd60: 8c440000 */ lw $a0,0x0($v0) @@ -128,7 +128,7 @@ glabel menudialog0010cd0c /* f10cddc: 11400016 */ beqz $t2,.L0f10ce38 /* f10cde0: 00000000 */ sll $zero,$zero,0x0 /* f10cde4: 8d6b1448 */ lw $t3,%lo(g_MpPlayerNum)($t3) -/* f10cde8: 3c02800a */ lui $v0,%hi(g_MenuStack) +/* f10cde8: 3c02800a */ lui $v0,%hi(g_MenuStack+0x4f8) /* f10cdec: 000b60c0 */ sll $t4,$t3,0x3 /* f10cdf0: 018b6023 */ subu $t4,$t4,$t3 /* f10cdf4: 000c6080 */ sll $t4,$t4,0x2 @@ -137,7 +137,7 @@ glabel menudialog0010cd0c /* f10ce00: 018b6023 */ subu $t4,$t4,$t3 /* f10ce04: 000c6100 */ sll $t4,$t4,0x4 /* f10ce08: 004c1021 */ addu $v0,$v0,$t4 -/* f10ce0c: 8c42e4f8 */ lw $v0,%lo(g_MenuStack)($v0) +/* f10ce0c: 8c42e4f8 */ lw $v0,%lo(g_MenuStack+0x4f8)($v0) /* f10ce10: 10400009 */ beqz $v0,.L0f10ce38 /* f10ce14: 00000000 */ sll $zero,$zero,0x0 /* f10ce18: 8ce30014 */ lw $v1,0x14($a3) @@ -172,7 +172,7 @@ GLOBAL_ASM( glabel func0f10ce74 /* f10ce74: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10ce78: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10ce7c: 3c18800a */ lui $t8,%hi(g_MenuStack) +/* f10ce7c: 3c18800a */ lui $t8,%hi(g_MenuStack+0x4f8) /* f10ce80: 27bdffe0 */ addiu $sp,$sp,-32 /* f10ce84: 000e78c0 */ sll $t7,$t6,0x3 /* f10ce88: 01ee7823 */ subu $t7,$t7,$t6 @@ -182,7 +182,7 @@ glabel func0f10ce74 /* f10ce98: 01ee7823 */ subu $t7,$t7,$t6 /* f10ce9c: 000f7900 */ sll $t7,$t7,0x4 /* f10cea0: 030fc021 */ addu $t8,$t8,$t7 -/* f10cea4: 8f18e4f8 */ lw $t8,%lo(g_MenuStack)($t8) +/* f10cea4: 8f18e4f8 */ lw $t8,%lo(g_MenuStack+0x4f8)($t8) /* f10cea8: afbf0014 */ sw $ra,0x14($sp) /* f10ceac: 8f190000 */ lw $t9,0x0($t8) /* f10ceb0: 10990005 */ beq $a0,$t9,.L0f10cec8 @@ -194,8 +194,8 @@ glabel func0f10ce74 .L0f10cec8: /* f10cec8: 0fc5b9f1 */ jal langGet /* f10cecc: 24045728 */ addiu $a0,$zero,0x5728 -/* f10ced0: 3c08800a */ lui $t0,0x800a -/* f10ced4: 9108dfea */ lbu $t0,-0x2016($t0) +/* f10ced0: 3c08800a */ lui $t0,%hi(g_MissionConfig+0x2) +/* f10ced4: 9108dfea */ lbu $t0,%lo(g_MissionConfig+0x2)($t0) /* f10ced8: 3c048007 */ lui $a0,0x8007 /* f10cedc: afa20018 */ sw $v0,0x18($sp) /* f10cee0: 00084880 */ sll $t1,$t0,0x2 @@ -224,7 +224,7 @@ GLOBAL_ASM( glabel func0f10cf2c /* f10cf2c: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10cf30: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10cf34: 3c18800a */ lui $t8,%hi(g_MenuStack) +/* f10cf34: 3c18800a */ lui $t8,%hi(g_MenuStack+0x4f8) /* f10cf38: 27bdffe0 */ addiu $sp,$sp,-32 /* f10cf3c: 000e78c0 */ sll $t7,$t6,0x3 /* f10cf40: 01ee7823 */ subu $t7,$t7,$t6 @@ -234,7 +234,7 @@ glabel func0f10cf2c /* f10cf50: 01ee7823 */ subu $t7,$t7,$t6 /* f10cf54: 000f7900 */ sll $t7,$t7,0x4 /* f10cf58: 030fc021 */ addu $t8,$t8,$t7 -/* f10cf5c: 8f18e4f8 */ lw $t8,%lo(g_MenuStack)($t8) +/* f10cf5c: 8f18e4f8 */ lw $t8,%lo(g_MenuStack+0x4f8)($t8) /* f10cf60: afbf0014 */ sw $ra,0x14($sp) /* f10cf64: 8f190000 */ lw $t9,0x0($t8) /* f10cf68: 10990005 */ beq $a0,$t9,.L0f10cf80 @@ -246,8 +246,8 @@ glabel func0f10cf2c .L0f10cf80: /* f10cf80: 0fc5b9f1 */ jal langGet /* f10cf84: 24045729 */ addiu $a0,$zero,0x5729 -/* f10cf88: 3c08800a */ lui $t0,0x800a -/* f10cf8c: 9108dfea */ lbu $t0,-0x2016($t0) +/* f10cf88: 3c08800a */ lui $t0,%hi(g_MissionConfig+0x2) +/* f10cf8c: 9108dfea */ lbu $t0,%lo(g_MissionConfig+0x2)($t0) /* f10cf90: 3c048007 */ lui $a0,0x8007 /* f10cf94: afa20018 */ sw $v0,0x18($sp) /* f10cf98: 00084880 */ sll $t1,$t0,0x2 @@ -634,7 +634,7 @@ glabel func0f10d4d4 /* f10d4e8: afa40018 */ sw $a0,0x18($sp) /* f10d4ec: 3c0f800a */ lui $t7,%hi(g_CheatsActiveBank1) /* f10d4f0: 8def21d4 */ lw $t7,%lo(g_CheatsActiveBank1)($t7) -/* f10d4f4: 3c02800a */ lui $v0,0x800a +/* f10d4f4: 3c02800a */ lui $v0,%hi(g_Vars+0x284) /* f10d4f8: 11e00005 */ beqz $t7,.L0f10d510 /* f10d4fc: 00000000 */ sll $zero,$zero,0x0 .L0f10d500: @@ -643,7 +643,7 @@ glabel func0f10d4d4 /* f10d508: 1000001c */ beqz $zero,.L0f10d57c /* f10d50c: 8fbf0014 */ lw $ra,0x14($sp) .L0f10d510: -/* f10d510: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f10d510: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f10d514: 8c58048c */ lw $t8,0x48c($v0) /* f10d518: 53000006 */ beqzl $t8,.L0f10d534 /* f10d51c: 8c5900d8 */ lw $t9,0xd8($v0) @@ -683,7 +683,7 @@ GLOBAL_ASM( glabel func0f10d588 /* f10d588: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10d58c: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10d590: 3c18800a */ lui $t8,0x800a +/* f10d590: 3c18800a */ lui $t8,%hi(g_MenuStack+0xe2c) /* f10d594: 27bdffe0 */ addiu $sp,$sp,-32 /* f10d598: 000e78c0 */ sll $t7,$t6,0x3 /* f10d59c: 01ee7823 */ subu $t7,$t7,$t6 @@ -693,7 +693,7 @@ glabel func0f10d588 /* f10d5ac: 01ee7823 */ subu $t7,$t7,$t6 /* f10d5b0: 000f7900 */ sll $t7,$t7,0x4 /* f10d5b4: 030fc021 */ addu $t8,$t8,$t7 -/* f10d5b8: 8f18ee2c */ lw $t8,-0x11d4($t8) +/* f10d5b8: 8f18ee2c */ lw $t8,%lo(g_MenuStack+0xe2c)($t8) /* f10d5bc: afa40020 */ sw $a0,0x20($sp) /* f10d5c0: 3c048007 */ lui $a0,0x8007 /* f10d5c4: 0018c880 */ sll $t9,$t8,0x2 @@ -722,8 +722,8 @@ glabel func0f10d588 GLOBAL_ASM( glabel func0f10d61c -/* f10d61c: 3c0e800a */ lui $t6,0x800a -/* f10d620: 91cedfea */ lbu $t6,-0x2016($t6) +/* f10d61c: 3c0e800a */ lui $t6,%hi(g_MissionConfig+0x2) +/* f10d620: 91cedfea */ lbu $t6,%lo(g_MissionConfig+0x2)($t6) /* f10d624: 27bdffe8 */ addiu $sp,$sp,-24 /* f10d628: afa40018 */ sw $a0,0x18($sp) /* f10d62c: 000e7880 */ sll $t7,$t6,0x2 @@ -749,8 +749,8 @@ glabel func0f10d61c GLOBAL_ASM( glabel func0f10d678 -/* f10d678: 3c0e800a */ lui $t6,0x800a -/* f10d67c: 91cedfea */ lbu $t6,-0x2016($t6) +/* f10d678: 3c0e800a */ lui $t6,%hi(g_MissionConfig+0x2) +/* f10d67c: 91cedfea */ lbu $t6,%lo(g_MissionConfig+0x2)($t6) /* f10d680: 27bdffe0 */ addiu $sp,$sp,-32 /* f10d684: afa40020 */ sw $a0,0x20($sp) /* f10d688: 000e7880 */ sll $t7,$t6,0x2 @@ -814,8 +814,8 @@ glabel func0f10d770 /* f10d77c: afb00018 */ sw $s0,0x18($sp) /* f10d780: 0fc393f8 */ jal func0f0e4fe0 /* f10d784: 00408025 */ or $s0,$v0,$zero -/* f10d788: 3c04800a */ lui $a0,0x800a -/* f10d78c: 2484e840 */ addiu $a0,$a0,-6080 +/* f10d788: 3c04800a */ lui $a0,%hi(g_MenuStack+0x840) +/* f10d78c: 2484e840 */ addiu $a0,$a0,%lo(g_MenuStack+0x840) /* f10d790: 02022823 */ subu $a1,$s0,$v0 /* f10d794: 0fc3e2ed */ jal func0f0f8bb4 /* f10d798: 00003025 */ or $a2,$zero,$zero @@ -824,13 +824,13 @@ glabel func0f10d770 /* f10d7a4: 0fc393f8 */ jal func0f0e4fe0 /* f10d7a8: 00408025 */ or $s0,$v0,$zero /* f10d7ac: 00507021 */ addu $t6,$v0,$s0 -/* f10d7b0: 3c01800a */ lui $at,0x800a +/* f10d7b0: 3c01800a */ lui $at,%hi(g_MenuStack+0x844) /* f10d7b4: 0fc2777f */ jal func0f09ddfc -/* f10d7b8: ac2ee844 */ sw $t6,-0x17bc($at) +/* f10d7b8: ac2ee844 */ sw $t6,%lo(g_MenuStack+0x844)($at) /* f10d7bc: 0fc393f8 */ jal func0f0e4fe0 /* f10d7c0: 00408025 */ or $s0,$v0,$zero -/* f10d7c4: 3c04800a */ lui $a0,%hi(var8009f6b0) -/* f10d7c8: 2484f6b0 */ addiu $a0,$a0,%lo(var8009f6b0) +/* f10d7c4: 3c04800a */ lui $a0,%hi(g_MenuStack+0x16b0) +/* f10d7c8: 2484f6b0 */ addiu $a0,$a0,%lo(g_MenuStack+0x16b0) /* f10d7cc: 02022823 */ subu $a1,$s0,$v0 /* f10d7d0: 0fc3e2ed */ jal func0f0f8bb4 /* f10d7d4: 00003025 */ or $a2,$zero,$zero @@ -839,13 +839,13 @@ glabel func0f10d770 /* f10d7e0: 0fc393f8 */ jal func0f0e4fe0 /* f10d7e4: 00408025 */ or $s0,$v0,$zero /* f10d7e8: 00507821 */ addu $t7,$v0,$s0 -/* f10d7ec: 3c01800a */ lui $at,0x800a +/* f10d7ec: 3c01800a */ lui $at,%hi(g_MenuStack+0x16b4) /* f10d7f0: 0fc2777f */ jal func0f09ddfc -/* f10d7f4: ac2ff6b4 */ sw $t7,-0x94c($at) +/* f10d7f4: ac2ff6b4 */ sw $t7,%lo(g_MenuStack+0x16b4)($at) /* f10d7f8: 0fc393f8 */ jal func0f0e4fe0 /* f10d7fc: 00408025 */ or $s0,$v0,$zero -/* f10d800: 3c04800a */ lui $a0,%hi(var800a0520) -/* f10d804: 24840520 */ addiu $a0,$a0,%lo(var800a0520) +/* f10d800: 3c04800a */ lui $a0,%hi(g_MenuStack+0x2520) +/* f10d804: 24840520 */ addiu $a0,$a0,%lo(g_MenuStack+0x2520) /* f10d808: 02022823 */ subu $a1,$s0,$v0 /* f10d80c: 0fc3e2ed */ jal func0f0f8bb4 /* f10d810: 00003025 */ or $a2,$zero,$zero @@ -854,13 +854,13 @@ glabel func0f10d770 /* f10d81c: 0fc393f8 */ jal func0f0e4fe0 /* f10d820: 00408025 */ or $s0,$v0,$zero /* f10d824: 0050c021 */ addu $t8,$v0,$s0 -/* f10d828: 3c01800a */ lui $at,0x800a +/* f10d828: 3c01800a */ lui $at,%hi(g_MenuStack+0x2524) /* f10d82c: 0fc2777f */ jal func0f09ddfc -/* f10d830: ac380524 */ sw $t8,0x524($at) +/* f10d830: ac380524 */ sw $t8,%lo(g_MenuStack+0x2524)($at) /* f10d834: 0fc393f8 */ jal func0f0e4fe0 /* f10d838: 00408025 */ or $s0,$v0,$zero -/* f10d83c: 3c04800a */ lui $a0,%hi(var800a1390) -/* f10d840: 24841390 */ addiu $a0,$a0,%lo(var800a1390) +/* f10d83c: 3c04800a */ lui $a0,%hi(g_MenuStack+0x3390) +/* f10d840: 24841390 */ addiu $a0,$a0,%lo(g_MenuStack+0x3390) /* f10d844: 02022823 */ subu $a1,$s0,$v0 /* f10d848: 0fc3e2ed */ jal func0f0f8bb4 /* f10d84c: 00003025 */ or $a2,$zero,$zero @@ -870,9 +870,9 @@ glabel func0f10d770 /* f10d85c: 00408025 */ or $s0,$v0,$zero /* f10d860: 8fbf001c */ lw $ra,0x1c($sp) /* f10d864: 0050c821 */ addu $t9,$v0,$s0 -/* f10d868: 3c01800a */ lui $at,0x800a +/* f10d868: 3c01800a */ lui $at,%hi(g_MenuStack+0x3394) /* f10d86c: 8fb00018 */ lw $s0,0x18($sp) -/* f10d870: ac391394 */ sw $t9,0x1394($at) +/* f10d870: ac391394 */ sw $t9,%lo(g_MenuStack+0x3394)($at) /* f10d874: 03e00008 */ jr $ra /* f10d878: 27bd0020 */ addiu $sp,$sp,0x20 ); @@ -967,7 +967,7 @@ glabel func0f10d910 /* f10d9f0: 10e1000f */ beq $a3,$at,.L0f10da30 /* f10d9f4: 3c0d8007 */ lui $t5,%hi(g_MpPlayerNum) /* f10d9f8: 8dad1448 */ lw $t5,%lo(g_MpPlayerNum)($t5) -/* f10d9fc: 3c0f800a */ lui $t7,0x800a +/* f10d9fc: 3c0f800a */ lui $t7,%hi(g_MenuStack+0xe24) /* f10da00: 24010001 */ addiu $at,$zero,0x1 /* f10da04: 000d70c0 */ sll $t6,$t5,0x3 /* f10da08: 01cd7023 */ subu $t6,$t6,$t5 @@ -977,7 +977,7 @@ glabel func0f10d910 /* f10da18: 01cd7023 */ subu $t6,$t6,$t5 /* f10da1c: 000e7100 */ sll $t6,$t6,0x4 /* f10da20: 01ee7821 */ addu $t7,$t7,$t6 -/* f10da24: 8defee24 */ lw $t7,-0x11dc($t7) +/* f10da24: 8defee24 */ lw $t7,%lo(g_MenuStack+0xe24)($t7) /* f10da28: 11e00063 */ beqz $t7,.L0f10dbb8 /* f10da2c: 00000000 */ sll $zero,$zero,0x0 .L0f10da30: @@ -1015,8 +1015,8 @@ glabel func0f10d910 /* f10daa8: a04b0001 */ sb $t3,0x1($v0) /* f10daac: 0fc06c55 */ jal func0f01b154 /* f10dab0: 316400ff */ andi $a0,$t3,0xff -/* f10dab4: 3c0c800a */ lui $t4,0x800a -/* f10dab8: 818ddfeb */ lb $t5,-0x2015($t4) +/* f10dab4: 3c0c800a */ lui $t4,%hi(g_MissionConfig+0x3) +/* f10dab8: 818ddfeb */ lb $t5,%lo(g_MissionConfig+0x3)($t4) /* f10dabc: 3c03800a */ lui $v1,%hi(g_Vars) /* f10dac0: 24639fc0 */ addiu $v1,$v1,%lo(g_Vars) /* f10dac4: 05a10014 */ bgez $t5,.L0f10db18 @@ -1055,9 +1055,9 @@ glabel func0f10d910 /* f10db3c: 03002025 */ or $a0,$t8,$zero /* f10db40: 0fc069f9 */ jal func0f01a7e4 /* f10db44: 24040005 */ addiu $a0,$zero,0x5 -/* f10db48: 3c04800a */ lui $a0,0x800a +/* f10db48: 3c04800a */ lui $a0,%hi(g_MissionConfig+0x1) /* f10db4c: 0c003a57 */ jal func0000e95c -/* f10db50: 9084dfe9 */ lbu $a0,-0x2017($a0) +/* f10db50: 9084dfe9 */ lbu $a0,%lo(g_MissionConfig+0x1)($a0) /* f10db54: 0c0027b1 */ jal func00009ec4 /* f10db58: 24040001 */ addiu $a0,$zero,0x1 /* f10db5c: 1000006f */ beqz $zero,.L0f10dd1c @@ -1077,9 +1077,9 @@ glabel func0f10d910 /* f10db90: 01002025 */ or $a0,$t0,$zero /* f10db94: 0fc069f9 */ jal func0f01a7e4 /* f10db98: 24040005 */ addiu $a0,$zero,0x5 -/* f10db9c: 3c04800a */ lui $a0,0x800a +/* f10db9c: 3c04800a */ lui $a0,%hi(g_MissionConfig+0x1) /* f10dba0: 0c003a57 */ jal func0000e95c -/* f10dba4: 9084dfe9 */ lbu $a0,-0x2017($a0) +/* f10dba4: 9084dfe9 */ lbu $a0,%lo(g_MissionConfig+0x1)($a0) /* f10dba8: 0c0027b1 */ jal func00009ec4 /* f10dbac: 24040001 */ addiu $a0,$zero,0x1 /* f10dbb0: 1000005a */ beqz $zero,.L0f10dd1c @@ -1108,8 +1108,8 @@ glabel func0f10d910 .L0f10dc00: /* f10dc00: 3c05800a */ lui $a1,%hi(g_MissionConfig) /* f10dc04: 8ca5dfe8 */ lw $a1,%lo(g_MissionConfig)($a1) -/* f10dc08: 3c04800a */ lui $a0,0x800a -/* f10dc0c: 9084dfea */ lbu $a0,-0x2016($a0) +/* f10dc08: 3c04800a */ lui $a0,%hi(g_MissionConfig+0x2) +/* f10dc0c: 9084dfea */ lbu $a0,%lo(g_MissionConfig+0x2)($a0) /* f10dc10: 00054e42 */ srl $t1,$a1,0x19 /* f10dc14: 01202825 */ or $a1,$t1,$zero /* f10dc18: afa70018 */ sw $a3,0x18($sp) @@ -1132,8 +1132,8 @@ glabel func0f10d910 /* f10dc58: 10000030 */ beqz $zero,.L0f10dd1c /* f10dc5c: 8fbf0014 */ lw $ra,0x14($sp) .L0f10dc60: -/* f10dc60: 3c04800a */ lui $a0,0x800a -/* f10dc64: 9084dfe9 */ lbu $a0,-0x2017($a0) +/* f10dc60: 3c04800a */ lui $a0,%hi(g_MissionConfig+0x1) +/* f10dc64: 9084dfe9 */ lbu $a0,%lo(g_MissionConfig+0x1)($a0) /* f10dc68: 0fc59585 */ jal stageGetIndex /* f10dc6c: afa70018 */ sw $a3,0x18($sp) /* f10dc70: 3c03800a */ lui $v1,%hi(g_Vars) @@ -1142,10 +1142,10 @@ glabel func0f10d910 /* f10dc7c: 8fa70018 */ lw $a3,0x18($sp) /* f10dc80: 8c6a04b4 */ lw $t2,0x4b4($v1) /* f10dc84: 24010026 */ addiu $at,$zero,0x26 -/* f10dc88: 3c0b800a */ lui $t3,0x800a +/* f10dc88: 3c0b800a */ lui $t3,%hi(g_MissionConfig+0x2) /* f10dc8c: 51410005 */ beql $t2,$at,.L0f10dca4 /* f10dc90: 24010002 */ addiu $at,$zero,0x2 -/* f10dc94: 916bdfea */ lbu $t3,-0x2016($t3) +/* f10dc94: 916bdfea */ lbu $t3,%lo(g_MissionConfig+0x2)($t3) /* f10dc98: 29610011 */ slti $at,$t3,0x11 /* f10dc9c: 1420000d */ bnez $at,.L0f10dcd4 .L0f10dca0: @@ -1199,7 +1199,7 @@ glabel menudialog0010dd28 /* f10dd34: afbf0014 */ sw $ra,0x14($sp) /* f10dd38: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10dd3c: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10dd40: 3c01800a */ lui $at,0x800a +/* f10dd40: 3c01800a */ lui $at,%hi(g_MenuStack+0xe1c) /* f10dd44: 000e78c0 */ sll $t7,$t6,0x3 /* f10dd48: 01ee7823 */ subu $t7,$t7,$t6 /* f10dd4c: 000f7880 */ sll $t7,$t7,0x2 @@ -1208,14 +1208,14 @@ glabel menudialog0010dd28 /* f10dd58: 01ee7823 */ subu $t7,$t7,$t6 /* f10dd5c: 000f7900 */ sll $t7,$t7,0x4 /* f10dd60: 002f0821 */ addu $at,$at,$t7 -/* f10dd64: ac20ee1c */ sw $zero,-0x11e4($at) +/* f10dd64: ac20ee1c */ sw $zero,%lo(g_MenuStack+0xe1c)($at) .L0f10dd68: /* f10dd68: 24010066 */ addiu $at,$zero,0x66 /* f10dd6c: 14810035 */ bne $a0,$at,.L0f10de44 /* f10dd70: 3c188007 */ lui $t8,%hi(g_MpPlayerNum) /* f10dd74: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f10dd78: 3c08800a */ lui $t0,%hi(var8009e000) -/* f10dd7c: 2508e000 */ addiu $t0,$t0,%lo(var8009e000) +/* f10dd78: 3c08800a */ lui $t0,0x800a +/* f10dd7c: 2508e000 */ addiu $t0,$t0,-8192 /* f10dd80: 0018c8c0 */ sll $t9,$t8,0x3 /* f10dd84: 0338c823 */ subu $t9,$t9,$t8 /* f10dd88: 0019c880 */ sll $t9,$t9,0x2 @@ -1289,7 +1289,7 @@ glabel menudialog0010de58 /* f10de68: 00c03825 */ or $a3,$a2,$zero /* f10de6c: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10de70: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10de74: 3c01800a */ lui $at,0x800a +/* f10de74: 3c01800a */ lui $at,%hi(g_MenuStack+0xe1c) /* f10de78: 000e78c0 */ sll $t7,$t6,0x3 /* f10de7c: 01ee7823 */ subu $t7,$t7,$t6 /* f10de80: 000f7880 */ sll $t7,$t7,0x2 @@ -1298,14 +1298,14 @@ glabel menudialog0010de58 /* f10de8c: 01ee7823 */ subu $t7,$t7,$t6 /* f10de90: 000f7900 */ sll $t7,$t7,0x4 /* f10de94: 002f0821 */ addu $at,$at,$t7 -/* f10de98: ac20ee1c */ sw $zero,-0x11e4($at) +/* f10de98: ac20ee1c */ sw $zero,%lo(g_MenuStack+0xe1c)($at) .L0f10de9c: /* f10de9c: 24010066 */ addiu $at,$zero,0x66 /* f10dea0: 1481006b */ bne $a0,$at,.L0f10e050 /* f10dea4: 3c188007 */ lui $t8,%hi(g_MpPlayerNum) /* f10dea8: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f10deac: 3c08800a */ lui $t0,%hi(var8009e000) -/* f10deb0: 2508e000 */ addiu $t0,$t0,%lo(var8009e000) +/* f10deac: 3c08800a */ lui $t0,0x800a +/* f10deb0: 2508e000 */ addiu $t0,$t0,-8192 /* f10deb4: 0018c8c0 */ sll $t9,$t8,0x3 /* f10deb8: 0338c823 */ subu $t9,$t9,$t8 /* f10debc: 0019c880 */ sll $t9,$t9,0x2 @@ -1393,8 +1393,8 @@ glabel menudialog0010de58 /* f10dfe4: 29a10002 */ slti $at,$t5,0x2 /* f10dfe8: 1020000c */ beqz $at,.L0f10e01c .L0f10dfec: -/* f10dfec: 3c04800a */ lui $a0,0x800a -/* f10dff0: 9084dfe9 */ lbu $a0,-0x2017($a0) +/* f10dfec: 3c04800a */ lui $a0,%hi(g_MissionConfig+0x1) +/* f10dff0: 9084dfe9 */ lbu $a0,%lo(g_MissionConfig+0x1)($a0) /* f10dff4: 0fc59585 */ jal stageGetIndex /* f10dff8: afa6001c */ sw $a2,0x1c($sp) /* f10dffc: 3c05800a */ lui $a1,%hi(g_Vars) @@ -1444,9 +1444,9 @@ glabel menuhandler0010e064 /* f10e084: 24a51448 */ addiu $a1,$a1,%lo(g_MpPlayerNum) /* f10e088: 8caf0000 */ lw $t7,0x0($a1) /* f10e08c: 24060e70 */ addiu $a2,$zero,0xe70 -/* f10e090: 3c04800a */ lui $a0,%hi(var8009e000) +/* f10e090: 3c04800a */ lui $a0,0x800a /* f10e094: 01e60019 */ multu $t7,$a2 -/* f10e098: 2484e000 */ addiu $a0,$a0,%lo(var8009e000) +/* f10e098: 2484e000 */ addiu $a0,$a0,-8192 /* f10e09c: 8faa0024 */ lw $t2,0x24($sp) /* f10e0a0: 0000c012 */ mflo $t8 /* f10e0a4: 0098c821 */ addu $t9,$a0,$t8 @@ -1513,7 +1513,7 @@ glabel menuhandler0010e064 /* f10e188: 55e00014 */ bnezl $t7,.L0f10e1dc /* f10e18c: 8fa90028 */ lw $t1,0x28($sp) /* f10e190: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f10e194: 3c04800a */ lui $a0,0x800a +/* f10e194: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe20) /* f10e198: 0018c8c0 */ sll $t9,$t8,0x3 /* f10e19c: 0338c823 */ subu $t9,$t9,$t8 /* f10e1a0: 0019c880 */ sll $t9,$t9,0x2 @@ -1522,7 +1522,7 @@ glabel menuhandler0010e064 /* f10e1ac: 0338c823 */ subu $t9,$t9,$t8 /* f10e1b0: 0019c900 */ sll $t9,$t9,0x4 /* f10e1b4: 00992021 */ addu $a0,$a0,$t9 -/* f10e1b8: 8c84ee20 */ lw $a0,-0x11e0($a0) +/* f10e1b8: 8c84ee20 */ lw $a0,%lo(g_MenuStack+0xe20)($a0) /* f10e1bc: 308800ff */ andi $t0,$a0,0xff /* f10e1c0: 0fc41fd9 */ jal cheatGetTime /* f10e1c4: 01002025 */ or $a0,$t0,$zero @@ -1565,11 +1565,11 @@ glabel menuhandler0010e064 /* f10e250: ada20000 */ sw $v0,0x0($t5) .L0f10e254: /* f10e254: 8fae0020 */ lw $t6,0x20($sp) -/* f10e258: 3c04800a */ lui $a0,%hi(var8009e000) +/* f10e258: 3c04800a */ lui $a0,0x800a /* f10e25c: 3c058007 */ lui $a1,%hi(g_MpPlayerNum) /* f10e260: 24010018 */ addiu $at,$zero,0x18 /* f10e264: 24a51448 */ addiu $a1,$a1,%lo(g_MpPlayerNum) -/* f10e268: 2484e000 */ addiu $a0,$a0,%lo(var8009e000) +/* f10e268: 2484e000 */ addiu $a0,$a0,-8192 /* f10e26c: 15c1005e */ bne $t6,$at,.L0f10e3e8 /* f10e270: 24060e70 */ addiu $a2,$zero,0xe70 /* f10e274: 8faf0024 */ lw $t7,0x24($sp) @@ -1685,7 +1685,7 @@ GLOBAL_ASM( glabel func0f10e3fc /* f10e3fc: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10e400: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10e404: 3c02800a */ lui $v0,0x800a +/* f10e404: 3c02800a */ lui $v0,%hi(g_MenuStack+0xe20) /* f10e408: 27bdffe8 */ addiu $sp,$sp,-24 /* f10e40c: 000e78c0 */ sll $t7,$t6,0x3 /* f10e410: 01ee7823 */ subu $t7,$t7,$t6 @@ -1695,7 +1695,7 @@ glabel func0f10e3fc /* f10e420: 01ee7823 */ subu $t7,$t7,$t6 /* f10e424: 000f7900 */ sll $t7,$t7,0x4 /* f10e428: 004f1021 */ addu $v0,$v0,$t7 -/* f10e42c: 8c42ee20 */ lw $v0,-0x11e0($v0) +/* f10e42c: 8c42ee20 */ lw $v0,%lo(g_MenuStack+0xe20)($v0) /* f10e430: afbf0014 */ sw $ra,0x14($sp) /* f10e434: afa40018 */ sw $a0,0x18($sp) /* f10e438: 30580300 */ andi $t8,$v0,0x300 @@ -1718,7 +1718,7 @@ GLOBAL_ASM( glabel func0f10e468 /* f10e468: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10e46c: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10e470: 3c02800a */ lui $v0,0x800a +/* f10e470: 3c02800a */ lui $v0,%hi(g_MenuStack+0xe20) /* f10e474: 27bdffe8 */ addiu $sp,$sp,-24 /* f10e478: 000e78c0 */ sll $t7,$t6,0x3 /* f10e47c: 01ee7823 */ subu $t7,$t7,$t6 @@ -1728,7 +1728,7 @@ glabel func0f10e468 /* f10e48c: 01ee7823 */ subu $t7,$t7,$t6 /* f10e490: 000f7900 */ sll $t7,$t7,0x4 /* f10e494: 004f1021 */ addu $v0,$v0,$t7 -/* f10e498: 8c42ee20 */ lw $v0,-0x11e0($v0) +/* f10e498: 8c42ee20 */ lw $v0,%lo(g_MenuStack+0xe20)($v0) /* f10e49c: afa40018 */ sw $a0,0x18($sp) /* f10e4a0: afbf0014 */ sw $ra,0x14($sp) /* f10e4a4: 30580800 */ andi $t8,$v0,0x800 @@ -1752,7 +1752,7 @@ GLOBAL_ASM( glabel func0f10e4d8 /* f10e4d8: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10e4dc: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10e4e0: 3c02800a */ lui $v0,0x800a +/* f10e4e0: 3c02800a */ lui $v0,%hi(g_MenuStack+0xe20) /* f10e4e4: 27bdffe8 */ addiu $sp,$sp,-24 /* f10e4e8: 000e78c0 */ sll $t7,$t6,0x3 /* f10e4ec: 01ee7823 */ subu $t7,$t7,$t6 @@ -1762,7 +1762,7 @@ glabel func0f10e4d8 /* f10e4fc: 01ee7823 */ subu $t7,$t7,$t6 /* f10e500: 000f7900 */ sll $t7,$t7,0x4 /* f10e504: 004f1021 */ addu $v0,$v0,$t7 -/* f10e508: 8c42ee20 */ lw $v0,-0x11e0($v0) +/* f10e508: 8c42ee20 */ lw $v0,%lo(g_MenuStack+0xe20)($v0) /* f10e50c: afbf0014 */ sw $ra,0x14($sp) /* f10e510: afa40018 */ sw $a0,0x18($sp) /* f10e514: 30580100 */ andi $t8,$v0,0x100 @@ -1825,7 +1825,7 @@ glabel func0f10e588 /* f10e5dc: 0064c025 */ or $t8,$v1,$a0 /* f10e5e0: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10e5e4: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10e5e8: 3c01800a */ lui $at,0x800a +/* f10e5e8: 3c01800a */ lui $at,%hi(g_MenuStack+0xe24) /* f10e5ec: 240d0001 */ addiu $t5,$zero,0x1 /* f10e5f0: 000e78c0 */ sll $t7,$t6,0x3 /* f10e5f4: 01ee7823 */ subu $t7,$t7,$t6 @@ -1835,7 +1835,7 @@ glabel func0f10e588 /* f10e604: 01ee7823 */ subu $t7,$t7,$t6 /* f10e608: 000f7900 */ sll $t7,$t7,0x4 /* f10e60c: 002f0821 */ addu $at,$at,$t7 -/* f10e610: ac2dee24 */ sw $t5,-0x11dc($at) +/* f10e610: ac2dee24 */ sw $t5,%lo(g_MenuStack+0xe24)($at) .L0f10e614: /* f10e614: ac5800a0 */ sw $t8,0xa0($v0) .L0f10e618: @@ -1855,10 +1855,10 @@ glabel func0f10e620 /* f10e63c: 01ee7821 */ addu $t7,$t7,$t6 /* f10e640: 000f78c0 */ sll $t7,$t7,0x3 /* f10e644: 90e60002 */ lbu $a2,0x2($a3) -/* f10e648: 3c18800a */ lui $t8,%hi(var8009e000) +/* f10e648: 3c18800a */ lui $t8,0x800a /* f10e64c: 01ee7823 */ subu $t7,$t7,$t6 /* f10e650: 000f7900 */ sll $t7,$t7,0x4 -/* f10e654: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f10e654: 2718e000 */ addiu $t8,$t8,-8192 /* f10e658: 01f84021 */ addu $t0,$t7,$t8 /* f10e65c: 3c03800a */ lui $v1,%hi(var800a19c4) /* f10e660: ad060e2c */ sw $a2,0xe2c($t0) @@ -1867,8 +1867,8 @@ glabel func0f10e620 /* f10e66c: 24010001 */ addiu $at,$zero,0x1 /* f10e670: 10610183 */ beq $v1,$at,.L0f10ec80 /* f10e674: afbf0014 */ sw $ra,0x14($sp) -/* f10e678: 3c19800a */ lui $t9,0x800a -/* f10e67c: 8f39a2d4 */ lw $t9,-0x5d2c($t9) +/* f10e678: 3c19800a */ lui $t9,%hi(g_Vars+0x314) +/* f10e67c: 8f39a2d4 */ lw $t9,%lo(g_Vars+0x314)($t9) /* f10e680: 57200180 */ bnezl $t9,.L0f10ec84 /* f10e684: 24010001 */ addiu $at,$zero,0x1 /* f10e688: 80ea0003 */ lb $t2,0x3($a3) @@ -1887,8 +1887,8 @@ glabel func0f10e620 /* f10e6bc: 00000000 */ sll $zero,$zero,0x0 /* f10e6c0: 0fc41fae */ jal cheatGetByTimedStageIndex /* f10e6c4: 00022e42 */ srl $a1,$v0,0x19 -/* f10e6c8: 3c04800a */ lui $a0,0x800a -/* f10e6cc: 9084dfea */ lbu $a0,-0x2016($a0) +/* f10e6c8: 3c04800a */ lui $a0,%hi(g_MissionConfig+0x2) +/* f10e6cc: 9084dfea */ lbu $a0,%lo(g_MissionConfig+0x2)($a0) /* f10e6d0: 0fc41fc6 */ jal cheatGetByCompletedStageIndex /* f10e6d4: afa20034 */ sw $v0,0x34($sp) /* f10e6d8: 8fa30034 */ lw $v1,0x34($sp) @@ -1897,7 +1897,7 @@ glabel func0f10e620 /* f10e6e4: 0460000d */ bltz $v1,.L0f10e71c /* f10e6e8: 00000000 */ sll $zero,$zero,0x0 /* f10e6ec: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f10e6f0: 3c01800a */ lui $at,0x800a +/* f10e6f0: 3c01800a */ lui $at,%hi(g_MenuStack+0xe20) /* f10e6f4: 346f0100 */ ori $t7,$v1,0x100 /* f10e6f8: 0018c8c0 */ sll $t9,$t8,0x3 /* f10e6fc: 0338c823 */ subu $t9,$t9,$t8 @@ -1907,13 +1907,13 @@ glabel func0f10e620 /* f10e70c: 0338c823 */ subu $t9,$t9,$t8 /* f10e710: 0019c900 */ sll $t9,$t9,0x4 /* f10e714: 00390821 */ addu $at,$at,$t9 -/* f10e718: ac2fee20 */ sw $t7,-0x11e0($at) +/* f10e718: ac2fee20 */ sw $t7,%lo(g_MenuStack+0xe20)($at) .L0f10e71c: /* f10e71c: 04400011 */ bltz $v0,.L0f10e764 /* f10e720: 00000000 */ sll $zero,$zero,0x0 /* f10e724: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) -/* f10e728: 3c0b800a */ lui $t3,%hi(var8009e000) -/* f10e72c: 256be000 */ addiu $t3,$t3,%lo(var8009e000) +/* f10e728: 3c0b800a */ lui $t3,0x800a +/* f10e72c: 256be000 */ addiu $t3,$t3,-8192 /* f10e730: 000950c0 */ sll $t2,$t1,0x3 /* f10e734: 01495023 */ subu $t2,$t2,$t1 /* f10e738: 000a5080 */ sll $t2,$t2,0x2 @@ -1928,8 +1928,8 @@ glabel func0f10e620 /* f10e75c: 018ec025 */ or $t8,$t4,$t6 /* f10e760: ad180e20 */ sw $t8,0xe20($t0) .L0f10e764: -/* f10e764: 3c02800a */ lui $v0,0x800a -/* f10e768: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f10e764: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f10e768: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f10e76c: 8c4f00d8 */ lw $t7,0xd8($v0) /* f10e770: 15e00008 */ bnez $t7,.L0f10e794 /* f10e774: 00000000 */ sll $zero,$zero,0x0 @@ -1945,8 +1945,8 @@ glabel func0f10e620 /* f10e798: 24845b3c */ addiu $a0,$a0,%lo(menudialog_1bb5c) /* f10e79c: 0fc3e0cc */ jal func0f0f8330 /* f10e7a0: 24050001 */ addiu $a1,$zero,0x1 -/* f10e7a4: 3c02800a */ lui $v0,0x800a -/* f10e7a8: 9042dfeb */ lbu $v0,-0x2015($v0) +/* f10e7a4: 3c02800a */ lui $v0,%hi(g_MissionConfig+0x3) +/* f10e7a8: 9042dfeb */ lbu $v0,%lo(g_MissionConfig+0x3)($v0) /* f10e7ac: 000249c2 */ srl $t1,$v0,0x7 /* f10e7b0: 1000000f */ beqz $zero,.L0f10e7f0 /* f10e7b4: 01201025 */ or $v0,$t1,$zero @@ -1954,15 +1954,15 @@ glabel func0f10e620 /* f10e7b8: 24845b24 */ addiu $a0,$a0,%lo(menudialog_1bb44) /* f10e7bc: 0fc3e0cc */ jal func0f0f8330 /* f10e7c0: 24050001 */ addiu $a1,$zero,0x1 -/* f10e7c4: 3c02800a */ lui $v0,0x800a -/* f10e7c8: 9042dfeb */ lbu $v0,-0x2015($v0) +/* f10e7c4: 3c02800a */ lui $v0,%hi(g_MissionConfig+0x3) +/* f10e7c8: 9042dfeb */ lbu $v0,%lo(g_MissionConfig+0x3)($v0) /* f10e7cc: 000251c2 */ srl $t2,$v0,0x7 /* f10e7d0: 11400007 */ beqz $t2,.L0f10e7f0 /* f10e7d4: 01401025 */ or $v0,$t2,$zero /* f10e7d8: 0fc43962 */ jal func0f10e588 /* f10e7dc: 00000000 */ sll $zero,$zero,0x0 -/* f10e7e0: 3c02800a */ lui $v0,0x800a -/* f10e7e4: 9042dfeb */ lbu $v0,-0x2015($v0) +/* f10e7e0: 3c02800a */ lui $v0,%hi(g_MissionConfig+0x3) +/* f10e7e4: 9042dfeb */ lbu $v0,%lo(g_MissionConfig+0x3)($v0) /* f10e7e8: 000259c2 */ srl $t3,$v0,0x7 /* f10e7ec: 01601025 */ or $v0,$t3,$zero .L0f10e7f0: @@ -1974,7 +1974,7 @@ glabel func0f10e620 /* f10e804: 05c00117 */ bltz $t6,.L0f10ec64 /* f10e808: 00000000 */ sll $zero,$zero,0x0 /* f10e80c: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f10e810: 3c02800a */ lui $v0,0x800a +/* f10e810: 3c02800a */ lui $v0,%hi(g_MenuStack+0xe20) /* f10e814: afa00020 */ sw $zero,0x20($sp) /* f10e818: 001878c0 */ sll $t7,$t8,0x3 /* f10e81c: 01f87823 */ subu $t7,$t7,$t8 @@ -1984,7 +1984,7 @@ glabel func0f10e620 /* f10e82c: 01f87823 */ subu $t7,$t7,$t8 /* f10e830: 000f7900 */ sll $t7,$t7,0x4 /* f10e834: 004f1021 */ addu $v0,$v0,$t7 -/* f10e838: 8c42ee20 */ lw $v0,-0x11e0($v0) +/* f10e838: 8c42ee20 */ lw $v0,%lo(g_MenuStack+0xe20)($v0) /* f10e83c: afa0001c */ sw $zero,0x1c($sp) /* f10e840: 30590100 */ andi $t9,$v0,0x100 /* f10e844: 13200014 */ beqz $t9,.L0f10e898 @@ -1995,8 +1995,8 @@ glabel func0f10e620 /* f10e858: afa20020 */ sw $v0,0x20($sp) /* f10e85c: 3c098007 */ lui $t1,%hi(g_MpPlayerNum) /* f10e860: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) -/* f10e864: 3c0b800a */ lui $t3,%hi(var8009e000) -/* f10e868: 256be000 */ addiu $t3,$t3,%lo(var8009e000) +/* f10e864: 3c0b800a */ lui $t3,0x800a +/* f10e868: 256be000 */ addiu $t3,$t3,-8192 /* f10e86c: 000950c0 */ sll $t2,$t1,0x3 /* f10e870: 01495023 */ subu $t2,$t2,$t1 /* f10e874: 000a5080 */ sll $t2,$t2,0x2 @@ -2011,7 +2011,7 @@ glabel func0f10e620 .L0f10e898: /* f10e898: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10e89c: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10e8a0: 3c02800a */ lui $v0,0x800a +/* f10e8a0: 3c02800a */ lui $v0,%hi(g_MenuStack+0xe20) /* f10e8a4: 000ec0c0 */ sll $t8,$t6,0x3 /* f10e8a8: 030ec023 */ subu $t8,$t8,$t6 /* f10e8ac: 0018c080 */ sll $t8,$t8,0x2 @@ -2020,7 +2020,7 @@ glabel func0f10e620 /* f10e8b8: 030ec023 */ subu $t8,$t8,$t6 /* f10e8bc: 0018c100 */ sll $t8,$t8,0x4 /* f10e8c0: 00581021 */ addu $v0,$v0,$t8 -/* f10e8c4: 8c42ee20 */ lw $v0,-0x11e0($v0) +/* f10e8c4: 8c42ee20 */ lw $v0,%lo(g_MenuStack+0xe20)($v0) /* f10e8c8: 304f1000 */ andi $t7,$v0,0x1000 /* f10e8cc: 11e00005 */ beqz $t7,.L0f10e8e4 /* f10e8d0: 00022402 */ srl $a0,$v0,0x10 @@ -2052,8 +2052,8 @@ glabel func0f10e620 /* f10e930: 10000003 */ beqz $zero,.L0f10e940 /* f10e934: aca40010 */ sw $a0,0x10($a1) .L0f10e938: -/* f10e938: 3c01800a */ lui $at,0x800a -/* f10e93c: ac2a2210 */ sw $t2,0x2210($at) +/* f10e938: 3c01800a */ lui $at,%hi(g_SoloSaveFile+0x10) +/* f10e93c: ac2a2210 */ sw $t2,%lo(g_SoloSaveFile+0x10)($at) .L0f10e940: /* f10e940: 3c03800a */ lui $v1,%hi(g_MissionConfig) /* f10e944: 2463dfe8 */ addiu $v1,$v1,%lo(g_MissionConfig) @@ -2077,11 +2077,11 @@ glabel func0f10e620 /* f10e98c: 156000b5 */ bnez $t3,.L0f10ec64 /* f10e990: 00000000 */ sll $zero,$zero,0x0 /* f10e994: 906d0000 */ lbu $t5,0x0($v1) -/* f10e998: 3c02800a */ lui $v0,0x800a +/* f10e998: 3c02800a */ lui $v0,%hi(g_Vars+0x284) /* f10e99c: 31ac0001 */ andi $t4,$t5,0x1 /* f10e9a0: 158000b0 */ bnez $t4,.L0f10ec64 /* f10e9a4: 00000000 */ sll $zero,$zero,0x0 -/* f10e9a8: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f10e9a8: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f10e9ac: 8c4e00d8 */ lw $t6,0xd8($v0) /* f10e9b0: 15c000ac */ bnez $t6,.L0f10ec64 /* f10e9b4: 00000000 */ sll $zero,$zero,0x0 @@ -2104,10 +2104,10 @@ glabel func0f10e620 /* f10e9f8: 24040fff */ addiu $a0,$zero,0xfff .L0f10e9fc: /* f10e9fc: 14800002 */ bnez $a0,.L0f10ea08 -/* f10ea00: 3c06800a */ lui $a2,0x800a +/* f10ea00: 3c06800a */ lui $a2,%hi(g_MissionConfig+0x2) /* f10ea04: 24040001 */ addiu $a0,$zero,0x1 .L0f10ea08: -/* f10ea08: 90c6dfea */ lbu $a2,-0x2016($a2) +/* f10ea08: 90c6dfea */ lbu $a2,%lo(g_MissionConfig+0x2)($a2) /* f10ea0c: 3c09800a */ lui $t1,%hi(g_MissionConfig) /* f10ea10: 8d29dfe8 */ lw $t1,%lo(g_MissionConfig)($t1) /* f10ea14: 0006c080 */ sll $t8,$a2,0x2 @@ -2119,11 +2119,11 @@ glabel func0f10e620 /* f10ea2c: 032b3821 */ addu $a3,$t9,$t3 /* f10ea30: 94e30020 */ lhu $v1,0x20($a3) /* f10ea34: 3c0c8007 */ lui $t4,%hi(g_MpPlayerNum) -/* f10ea38: 3c09800a */ lui $t1,%hi(var8009e000) +/* f10ea38: 3c09800a */ lui $t1,0x800a /* f10ea3c: 1460000d */ bnez $v1,.L0f10ea74 /* f10ea40: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f10ea44: 8d8c1448 */ lw $t4,%lo(g_MpPlayerNum)($t4) -/* f10ea48: 3c01800a */ lui $at,0x800a +/* f10ea48: 3c01800a */ lui $at,%hi(g_MenuStack+0xe24) /* f10ea4c: 240d0001 */ addiu $t5,$zero,0x1 /* f10ea50: 000c70c0 */ sll $t6,$t4,0x3 /* f10ea54: 01cc7023 */ subu $t6,$t6,$t4 @@ -2133,10 +2133,10 @@ glabel func0f10e620 /* f10ea64: 01cc7023 */ subu $t6,$t6,$t4 /* f10ea68: 000e7100 */ sll $t6,$t6,0x4 /* f10ea6c: 002e0821 */ addu $at,$at,$t6 -/* f10ea70: ac2dee24 */ sw $t5,-0x11dc($at) +/* f10ea70: ac2dee24 */ sw $t5,%lo(g_MenuStack+0xe24)($at) .L0f10ea74: /* f10ea74: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f10ea78: 2529e000 */ addiu $t1,$t1,%lo(var8009e000) +/* f10ea78: 2529e000 */ addiu $t1,$t1,-8192 /* f10ea7c: 0083082b */ sltu $at,$a0,$v1 /* f10ea80: 000fc0c0 */ sll $t8,$t7,0x3 /* f10ea84: 030fc023 */ subu $t8,$t8,$t7 @@ -2200,8 +2200,8 @@ glabel func0f10e620 /* f10eb50: 1040000f */ beqz $v0,.L0f10eb90 /* f10eb54: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10eb58: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f10eb5c: 3c18800a */ lui $t8,%hi(var8009e000) -/* f10eb60: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f10eb5c: 3c18800a */ lui $t8,0x800a +/* f10eb60: 2718e000 */ addiu $t8,$t8,-8192 /* f10eb64: 000e78c0 */ sll $t7,$t6,0x3 /* f10eb68: 01ee7823 */ subu $t7,$t7,$t6 /* f10eb6c: 000f7880 */ sll $t7,$t7,0x2 @@ -2216,7 +2216,7 @@ glabel func0f10e620 .L0f10eb90: /* f10eb90: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f10eb94: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) -/* f10eb98: 3c02800a */ lui $v0,0x800a +/* f10eb98: 3c02800a */ lui $v0,%hi(g_MenuStack+0xe20) /* f10eb9c: 001958c0 */ sll $t3,$t9,0x3 /* f10eba0: 01795823 */ subu $t3,$t3,$t9 /* f10eba4: 000b5880 */ sll $t3,$t3,0x2 @@ -2225,7 +2225,7 @@ glabel func0f10e620 /* f10ebb0: 01795823 */ subu $t3,$t3,$t9 /* f10ebb4: 000b5900 */ sll $t3,$t3,0x4 /* f10ebb8: 004b1021 */ addu $v0,$v0,$t3 -/* f10ebbc: 8c42ee20 */ lw $v0,-0x11e0($v0) +/* f10ebbc: 8c42ee20 */ lw $v0,%lo(g_MenuStack+0xe20)($v0) /* f10ebc0: 304c1000 */ andi $t4,$v0,0x1000 /* f10ebc4: 11800017 */ beqz $t4,.L0f10ec24 /* f10ebc8: 00022402 */ srl $a0,$v0,0x10 @@ -2238,8 +2238,8 @@ glabel func0f10e620 /* f10ebe4: 1040000f */ beqz $v0,.L0f10ec24 /* f10ebe8: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f10ebec: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f10ebf0: 3c0a800a */ lui $t2,%hi(var8009e000) -/* f10ebf4: 254ae000 */ addiu $t2,$t2,%lo(var8009e000) +/* f10ebf0: 3c0a800a */ lui $t2,0x800a +/* f10ebf4: 254ae000 */ addiu $t2,$t2,-8192 /* f10ebf8: 000fc0c0 */ sll $t8,$t7,0x3 /* f10ebfc: 030fc023 */ subu $t8,$t8,$t7 /* f10ec00: 0018c080 */ sll $t8,$t8,0x2 @@ -2254,20 +2254,20 @@ glabel func0f10e620 .L0f10ec24: /* f10ec24: 0fc66bf7 */ jal func0f19afdc /* f10ec28: 00000000 */ sll $zero,$zero,0x0 -/* f10ec2c: 3c0b800a */ lui $t3,0x800a -/* f10ec30: 916bdfe9 */ lbu $t3,-0x2017($t3) +/* f10ec2c: 3c0b800a */ lui $t3,%hi(g_MissionConfig+0x1) +/* f10ec30: 916bdfe9 */ lbu $t3,%lo(g_MissionConfig+0x1)($t3) /* f10ec34: 2401002a */ addiu $at,$zero,0x2a -/* f10ec38: 3c02800a */ lui $v0,0x800a +/* f10ec38: 3c02800a */ lui $v0,%hi(var800a2328+0x3) /* f10ec3c: 15610009 */ bne $t3,$at,.L0f10ec64 -/* f10ec40: 2442232b */ addiu $v0,$v0,0x232b +/* f10ec40: 2442232b */ addiu $v0,$v0,%lo(var800a2328+0x3) /* f10ec44: 904c0000 */ lbu $t4,0x0($v0) /* f10ec48: 240d0001 */ addiu $t5,$zero,0x1 /* f10ec4c: 240e0001 */ addiu $t6,$zero,0x1 /* f10ec50: 15800004 */ bnez $t4,.L0f10ec64 -/* f10ec54: 3c01800a */ lui $at,0x800a +/* f10ec54: 3c01800a */ lui $at,%hi(g_AltTitle) /* f10ec58: a04d0000 */ sb $t5,0x0($v0) /* f10ec5c: 0fc44270 */ jal func0f1109c0 -/* f10ec60: a02e232c */ sb $t6,0x232c($at) +/* f10ec60: a02e232c */ sb $t6,%lo(g_AltTitle)($at) .L0f10ec64: /* f10ec64: 3c04800a */ lui $a0,%hi(var800a22c0) /* f10ec68: 248422c0 */ addiu $a0,$a0,%lo(var800a22c0) @@ -2283,8 +2283,8 @@ glabel func0f10e620 /* f10ec88: 8fbf0014 */ lw $ra,0x14($sp) /* f10ec8c: 0fc5b350 */ jal func0f16cd40 /* f10ec90: 24040001 */ addiu $a0,$zero,0x1 -/* f10ec94: 3c18800a */ lui $t8,0x800a -/* f10ec98: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f10ec94: 3c18800a */ lui $t8,%hi(g_Vars+0x284) +/* f10ec98: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f10ec9c: 240f0003 */ addiu $t7,$zero,0x3 /* f10eca0: af0f1a24 */ sw $t7,0x1a24($t8) /* f10eca4: 8fbf0014 */ lw $ra,0x14($sp) @@ -2309,11 +2309,11 @@ glabel func0f10ecb4 /* f10ecdc: 3c018007 */ lui $at,0x8007 /* f10ece0: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f10ece4: 8df80070 */ lw $t8,0x70($t7) -/* f10ece8: 3c09800a */ lui $t1,%hi(var8009e000) -/* f10ecec: 2529e000 */ addiu $t1,$t1,%lo(var8009e000) +/* f10ece8: 3c09800a */ lui $t1,0x800a +/* f10ecec: 2529e000 */ addiu $t1,$t1,-8192 /* f10ecf0: ac381448 */ sw $t8,0x1448($at) /* f10ecf4: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) -/* f10ecf8: 3c0a800a */ lui $t2,0x800a +/* f10ecf8: 3c0a800a */ lui $t2,%hi(g_MissionConfig+0x2) /* f10ecfc: 8c8b028c */ lw $t3,0x28c($a0) /* f10ed00: 001940c0 */ sll $t0,$t9,0x3 /* f10ed04: 01194023 */ subu $t0,$t0,$t9 @@ -2325,7 +2325,7 @@ glabel func0f10ecb4 /* f10ed1c: 01091021 */ addu $v0,$t0,$t1 /* f10ed20: ac400e20 */ sw $zero,0xe20($v0) /* f10ed24: ac400e24 */ sw $zero,0xe24($v0) -/* f10ed28: 914adfea */ lbu $t2,-0x2016($t2) +/* f10ed28: 914adfea */ lbu $t2,%lo(g_MissionConfig+0x2)($t2) /* f10ed2c: 8c8302a0 */ lw $v1,0x2a0($a0) /* f10ed30: a04b083b */ sb $t3,0x83b($v0) /* f10ed34: ac4a0e2c */ sw $t2,0xe2c($v0) @@ -2386,10 +2386,10 @@ glabel func0f10ecb4 /* f10edf8: 0fc43962 */ jal func0f10e588 /* f10edfc: 00000000 */ sll $zero,$zero,0x0 .L0f10ee00: -/* f10ee00: 3c08800a */ lui $t0,0x800a -/* f10ee04: 3c09800a */ lui $t1,0x800a -/* f10ee08: 8d29a244 */ lw $t1,-0x5dbc($t1) -/* f10ee0c: 8d08a260 */ lw $t0,-0x5da0($t0) +/* f10ee00: 3c08800a */ lui $t0,%hi(g_Vars+0x2a0) +/* f10ee04: 3c09800a */ lui $t1,%hi(g_Vars+0x284) +/* f10ee08: 8d29a244 */ lw $t1,%lo(g_Vars+0x284)($t1) +/* f10ee0c: 8d08a260 */ lw $t0,%lo(g_Vars+0x2a0)($t0) /* f10ee10: 3c04800a */ lui $a0,%hi(var800a22c0) /* f10ee14: 248422c0 */ addiu $a0,$a0,%lo(var800a22c0) /* f10ee18: 15090003 */ bne $t0,$t1,.L0f10ee28 @@ -2415,12 +2415,12 @@ glabel func0f10ee40 /* f10ee54: 0300c023 */ subu $t8,$t8,$zero /* f10ee58: 8c8e0000 */ lw $t6,0x0($a0) /* f10ee5c: 0018c100 */ sll $t8,$t8,0x4 -/* f10ee60: 3c01800a */ lui $at,0x800a +/* f10ee60: 3c01800a */ lui $at,%hi(g_MenuStack+0x83b) /* f10ee64: 3c03800a */ lui $v1,%hi(g_Vars) /* f10ee68: ac800000 */ sw $zero,0x0($a0) /* f10ee6c: 00380821 */ addu $at,$at,$t8 /* f10ee70: 24639fc0 */ addiu $v1,$v1,%lo(g_Vars) -/* f10ee74: a020e83b */ sb $zero,-0x17c5($at) +/* f10ee74: a020e83b */ sb $zero,%lo(g_MenuStack+0x83b)($at) /* f10ee78: 8c6202a0 */ lw $v0,0x2a0($v1) /* f10ee7c: 27bdffe0 */ addiu $sp,$sp,-32 /* f10ee80: afbf0014 */ sw $ra,0x14($sp) @@ -2480,8 +2480,8 @@ glabel func0f10ef10 /* f10ef38: 3c018007 */ lui $at,0x8007 /* f10ef3c: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f10ef40: 8df80070 */ lw $t8,0x70($t7) -/* f10ef44: 3c09800a */ lui $t1,%hi(var8009e000) -/* f10ef48: 2529e000 */ addiu $t1,$t1,%lo(var8009e000) +/* f10ef44: 3c09800a */ lui $t1,0x800a +/* f10ef48: 2529e000 */ addiu $t1,$t1,-8192 /* f10ef4c: ac381448 */ sw $t8,0x1448($at) /* f10ef50: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) /* f10ef54: 8c6c0284 */ lw $t4,0x284($v1) @@ -2496,8 +2496,8 @@ glabel func0f10ef10 /* f10ef78: 01091021 */ addu $v0,$t0,$t1 /* f10ef7c: ac400e20 */ sw $zero,0xe20($v0) /* f10ef80: ac400e24 */ sw $zero,0xe24($v0) -/* f10ef84: 3c0a800a */ lui $t2,0x800a -/* f10ef88: 914adfea */ lbu $t2,-0x2016($t2) +/* f10ef84: 3c0a800a */ lui $t2,%hi(g_MissionConfig+0x2) +/* f10ef88: 914adfea */ lbu $t2,%lo(g_MissionConfig+0x2)($t2) /* f10ef8c: 8c6b028c */ lw $t3,0x28c($v1) /* f10ef90: ac4a0e2c */ sw $t2,0xe2c($v0) /* f10ef94: 148c0034 */ bne $a0,$t4,.L0f10f068 @@ -2614,9 +2614,9 @@ glabel func0f10ef10 /* f10f124: 27bd0020 */ addiu $sp,$sp,0x20 /* f10f128: 03e00008 */ jr $ra /* f10f12c: ac2b1448 */ sw $t3,0x1448($at) -/* f10f130: 3c02800a */ lui $v0,0x800a +/* f10f130: 3c02800a */ lui $v0,%hi(g_SoloSaveFile+0x14) /* f10f134: 03e00008 */ jr $ra -/* f10f138: 24422214 */ addiu $v0,$v0,0x2214 +/* f10f138: 24422214 */ addiu $v0,$v0,%lo(g_SoloSaveFile+0x14) ); void savefileSetFlag(u32 value) @@ -2640,9 +2640,9 @@ glabel func0f10f1b0 /* f10f1b4: afb1001c */ sw $s1,0x1c($sp) /* f10f1b8: afb20020 */ sw $s2,0x20($sp) /* f10f1bc: afb00018 */ sw $s0,0x18($sp) -/* f10f1c0: 3c11800a */ lui $s1,0x800a +/* f10f1c0: 3c11800a */ lui $s1,%hi(g_SoloSaveFile+0x14) /* f10f1c4: afbf0024 */ sw $ra,0x24($sp) -/* f10f1c8: 26312214 */ addiu $s1,$s1,0x2214 +/* f10f1c8: 26312214 */ addiu $s1,$s1,%lo(g_SoloSaveFile+0x14) /* f10f1cc: 24100023 */ addiu $s0,$zero,0x23 /* f10f1d0: 2412004f */ addiu $s2,$zero,0x4f /* f10f1d4: 02002025 */ or $a0,$s0,$zero @@ -2854,8 +2854,8 @@ glabel func0f10f204 /* f10f4e4: 24040040 */ addiu $a0,$zero,0x40 /* f10f4e8: 0fc47961 */ jal func0f11e584 /* f10f4ec: 02002825 */ or $a1,$s0,$zero -/* f10f4f0: 3c01800a */ lui $at,0x800a -/* f10f4f4: a022a4a3 */ sb $v0,-0x5b5d($at) +/* f10f4f0: 3c01800a */ lui $at,%hi(g_Vars+0x4e3) +/* f10f4f4: a022a4a3 */ sb $v0,%lo(g_Vars+0x4e3)($at) /* f10f4f8: 24040022 */ addiu $a0,$zero,0x22 /* f10f4fc: 0fc47961 */ jal func0f11e584 /* f10f500: 02002825 */ or $a1,$s0,$zero @@ -2929,45 +2929,45 @@ glabel func0f10f204 /* f10f5f0: 10400005 */ beqz $v0,.L0f10f608 /* f10f5f4: 2404001c */ addiu $a0,$zero,0x1c /* f10f5f8: 240b0001 */ addiu $t3,$zero,0x1 -/* f10f5fc: 3c01800a */ lui $at,0x800a +/* f10f5fc: 3c01800a */ lui $at,%hi(g_Vars+0x450) /* f10f600: 10000003 */ beqz $zero,.L0f10f610 -/* f10f604: ac2ba410 */ sw $t3,-0x5bf0($at) +/* f10f604: ac2ba410 */ sw $t3,%lo(g_Vars+0x450)($at) .L0f10f608: -/* f10f608: 3c01800a */ lui $at,0x800a -/* f10f60c: ac20a410 */ sw $zero,-0x5bf0($at) +/* f10f608: 3c01800a */ lui $at,%hi(g_Vars+0x450) +/* f10f60c: ac20a410 */ sw $zero,%lo(g_Vars+0x450)($at) .L0f10f610: /* f10f610: 0fc47961 */ jal func0f11e584 /* f10f614: 02002825 */ or $a1,$s0,$zero /* f10f618: 10400005 */ beqz $v0,.L0f10f630 /* f10f61c: 2404001d */ addiu $a0,$zero,0x1d /* f10f620: 240c0001 */ addiu $t4,$zero,0x1 -/* f10f624: 3c01800a */ lui $at,0x800a +/* f10f624: 3c01800a */ lui $at,%hi(g_Vars+0x448) /* f10f628: 10000003 */ beqz $zero,.L0f10f638 -/* f10f62c: ac2ca408 */ sw $t4,-0x5bf8($at) +/* f10f62c: ac2ca408 */ sw $t4,%lo(g_Vars+0x448)($at) .L0f10f630: -/* f10f630: 3c01800a */ lui $at,0x800a -/* f10f634: ac20a408 */ sw $zero,-0x5bf8($at) +/* f10f630: 3c01800a */ lui $at,%hi(g_Vars+0x448) +/* f10f634: ac20a408 */ sw $zero,%lo(g_Vars+0x448)($at) .L0f10f638: /* f10f638: 0fc47961 */ jal func0f11e584 /* f10f63c: 02002825 */ or $a1,$s0,$zero /* f10f640: 10400005 */ beqz $v0,.L0f10f658 /* f10f644: 2404001e */ addiu $a0,$zero,0x1e /* f10f648: 240d0001 */ addiu $t5,$zero,0x1 -/* f10f64c: 3c01800a */ lui $at,0x800a +/* f10f64c: 3c01800a */ lui $at,%hi(g_Vars+0x454) /* f10f650: 10000003 */ beqz $zero,.L0f10f660 -/* f10f654: ac2da414 */ sw $t5,-0x5bec($at) +/* f10f654: ac2da414 */ sw $t5,%lo(g_Vars+0x454)($at) .L0f10f658: -/* f10f658: 3c01800a */ lui $at,0x800a -/* f10f65c: ac20a414 */ sw $zero,-0x5bec($at) +/* f10f658: 3c01800a */ lui $at,%hi(g_Vars+0x454) +/* f10f65c: ac20a414 */ sw $zero,%lo(g_Vars+0x454)($at) .L0f10f660: /* f10f660: 0fc47961 */ jal func0f11e584 /* f10f664: 02002825 */ or $a1,$s0,$zero /* f10f668: 10400005 */ beqz $v0,.L0f10f680 /* f10f66c: 3c01800a */ lui $at,0x800a /* f10f670: 240e0001 */ addiu $t6,$zero,0x1 -/* f10f674: 3c01800a */ lui $at,0x800a +/* f10f674: 3c01800a */ lui $at,%hi(g_Vars+0x44c) /* f10f678: 10000002 */ beqz $zero,.L0f10f684 -/* f10f67c: ac2ea40c */ sw $t6,-0x5bf4($at) +/* f10f67c: ac2ea40c */ sw $t6,%lo(g_Vars+0x44c)($at) .L0f10f680: /* f10f680: ac20a40c */ sw $zero,-0x5bf4($at) .L0f10f684: @@ -3226,8 +3226,8 @@ glabel func0f10f698 /* f10fa44: 0fc66bf7 */ jal func0f19afdc /* f10fa48: 00000000 */ sll $zero,$zero,0x0 /* f10fa4c: 3c02800a */ lui $v0,%hi(g_SoloSaveFile) -/* f10fa50: 3c03800a */ lui $v1,0x800a -/* f10fa54: 2463220c */ addiu $v1,$v1,0x220c +/* f10fa50: 3c03800a */ lui $v1,%hi(g_SoloSaveFile+0xc) +/* f10fa54: 2463220c */ addiu $v1,$v1,%lo(g_SoloSaveFile+0xc) /* f10fa58: 24422200 */ addiu $v0,$v0,%lo(g_SoloSaveFile) .L0f10fa5c: /* f10fa5c: 24420004 */ addiu $v0,$v0,0x4 @@ -3235,8 +3235,8 @@ glabel func0f10f698 /* f10fa64: 1420fffd */ bnez $at,.L0f10fa5c /* f10fa68: ac40009c */ sw $zero,0x9c($v0) /* f10fa6c: 3c02800a */ lui $v0,%hi(g_SoloSaveFile) -/* f10fa70: 3c03800a */ lui $v1,0x800a -/* f10fa74: 24632209 */ addiu $v1,$v1,0x2209 +/* f10fa70: 3c03800a */ lui $v1,%hi(g_SoloSaveFile+0x9) +/* f10fa74: 24632209 */ addiu $v1,$v1,%lo(g_SoloSaveFile+0x9) /* f10fa78: 24422200 */ addiu $v0,$v0,%lo(g_SoloSaveFile) .L0f10fa7c: /* f10fa7c: 24420001 */ addiu $v0,$v0,0x1 @@ -3244,8 +3244,8 @@ glabel func0f10f698 /* f10fa84: 1420fffd */ bnez $at,.L0f10fa7c /* f10fa88: a04000ab */ sb $zero,0xab($v0) /* f10fa8c: 3c02800a */ lui $v0,%hi(g_SoloSaveFile) -/* f10fa90: 3c03800a */ lui $v1,0x800a -/* f10fa94: 24632206 */ addiu $v1,$v1,0x2206 +/* f10fa90: 3c03800a */ lui $v1,%hi(g_SoloSaveFile+0x6) +/* f10fa94: 24632206 */ addiu $v1,$v1,%lo(g_SoloSaveFile+0x6) /* f10fa98: 24422200 */ addiu $v0,$v0,%lo(g_SoloSaveFile) .L0f10fa9c: /* f10fa9c: 24420001 */ addiu $v0,$v0,0x1 @@ -3305,9 +3305,9 @@ glabel func0f10fac8 /* f10fb54: 27a60050 */ addiu $a2,$sp,0x50 /* f10fb58: 0fc45a00 */ jal func0f116800 /* f10fb5c: 00003825 */ or $a3,$zero,$zero -/* f10fb60: 3c01800a */ lui $at,0x800a +/* f10fb60: 3c01800a */ lui $at,%hi(var800a21f8) /* f10fb64: 144000c7 */ bnez $v0,.L0f10fe84 -/* f10fb68: ac2221f8 */ sw $v0,0x21f8($at) +/* f10fb68: ac2221f8 */ sw $v0,%lo(var800a21f8)($at) /* f10fb6c: 0fc41d3b */ jal cheatsDisableAll /* f10fb70: 00000000 */ sll $zero,$zero,0x0 /* f10fb74: 3c05800a */ lui $a1,%hi(g_SoloSaveFile) @@ -3328,8 +3328,8 @@ glabel func0f10fac8 /* f10fbb0: a06c000b */ sb $t4,0xb($v1) /* f10fbb4: 0fc354fe */ jal scenarioDefaultCallback40 /* f10fbb8: 24050020 */ addiu $a1,$zero,0x20 -/* f10fbbc: 3c01800a */ lui $at,0x800a -/* f10fbc0: ac222210 */ sw $v0,0x2210($at) +/* f10fbbc: 3c01800a */ lui $at,%hi(g_SoloSaveFile+0x10) +/* f10fbc0: ac222210 */ sw $v0,%lo(g_SoloSaveFile+0x10)($at) /* f10fbc4: 02802025 */ or $a0,$s4,$zero /* f10fbc8: 0fc354fe */ jal scenarioDefaultCallback40 /* f10fbcc: 24050002 */ addiu $a1,$zero,0x2 @@ -3343,8 +3343,8 @@ glabel func0f10fac8 /* f10fbec: a079000b */ sb $t9,0xb($v1) /* f10fbf0: 0fc354fe */ jal scenarioDefaultCallback40 /* f10fbf4: 24050005 */ addiu $a1,$zero,0x5 -/* f10fbf8: 3c01800a */ lui $at,0x800a -/* f10fbfc: a022220c */ sb $v0,0x220c($at) +/* f10fbf8: 3c01800a */ lui $at,%hi(g_SoloSaveFile+0xc) +/* f10fbfc: a022220c */ sb $v0,%lo(g_SoloSaveFile+0xc)($at) /* f10fc00: 02802025 */ or $a0,$s4,$zero /* f10fc04: 0fc354fe */ jal scenarioDefaultCallback40 /* f10fc08: 24050006 */ addiu $a1,$zero,0x6 @@ -3389,8 +3389,8 @@ glabel func0f10fac8 /* f10fc9c: 0fc549cb */ jal optionsSetControlMode /* f10fca0: 00402825 */ or $a1,$v0,$zero /* f10fca4: 3c10800a */ lui $s0,%hi(g_SoloSaveFile) -/* f10fca8: 3c11800a */ lui $s1,0x800a -/* f10fcac: 2631220a */ addiu $s1,$s1,0x220a +/* f10fca8: 3c11800a */ lui $s1,%hi(g_SoloSaveFile+0xa) +/* f10fcac: 2631220a */ addiu $s1,$s1,%lo(g_SoloSaveFile+0xa) /* f10fcb0: 26102200 */ addiu $s0,$s0,%lo(g_SoloSaveFile) .L0f10fcb4: /* f10fcb4: 02802025 */ or $a0,$s4,$zero @@ -3403,9 +3403,9 @@ glabel func0f10fac8 /* f10fcd0: 02802025 */ or $a0,$s4,$zero /* f10fcd4: 0fc354fe */ jal scenarioDefaultCallback40 /* f10fcd8: 24050010 */ addiu $a1,$zero,0x10 -/* f10fcdc: 3c01800a */ lui $at,0x800a +/* f10fcdc: 3c01800a */ lui $at,%hi(g_SoloSaveFile+0x1e) /* f10fce0: 3c13800a */ lui $s3,%hi(g_SoloSaveFile) -/* f10fce4: a422221e */ sh $v0,0x221e($at) +/* f10fce4: a422221e */ sh $v0,%lo(g_SoloSaveFile+0x1e)($at) /* f10fce8: 26732200 */ addiu $s3,$s3,%lo(g_SoloSaveFile) /* f10fcec: 24120003 */ addiu $s2,$zero,0x3 /* f10fcf0: 00008025 */ or $s0,$zero,$zero @@ -3419,8 +3419,8 @@ glabel func0f10fac8 /* f10fd08: 26310002 */ addiu $s1,$s1,0x2 /* f10fd0c: 1612fffa */ bne $s0,$s2,.L0f10fcf8 /* f10fd10: a622001e */ sh $v0,0x1e($s1) -/* f10fd14: 3c0c800a */ lui $t4,0x800a -/* f10fd18: 258c227e */ addiu $t4,$t4,0x227e +/* f10fd14: 3c0c800a */ lui $t4,%hi(g_SoloSaveFile+0x7e) +/* f10fd18: 258c227e */ addiu $t4,$t4,%lo(g_SoloSaveFile+0x7e) /* f10fd1c: 26730006 */ addiu $s3,$s3,0x6 /* f10fd20: 026c082b */ sltu $at,$s3,$t4 /* f10fd24: 5420fff3 */ bnezl $at,.L0f10fcf4 @@ -3447,8 +3447,8 @@ glabel func0f10fac8 /* f10fd70: 0fc66bf7 */ jal func0f19afdc /* f10fd74: 00000000 */ sll $zero,$zero,0x0 /* f10fd78: 3c10800a */ lui $s0,%hi(g_SoloSaveFile) -/* f10fd7c: 3c11800a */ lui $s1,0x800a -/* f10fd80: 2631220c */ addiu $s1,$s1,0x220c +/* f10fd7c: 3c11800a */ lui $s1,%hi(g_SoloSaveFile+0xc) +/* f10fd80: 2631220c */ addiu $s1,$s1,%lo(g_SoloSaveFile+0xc) /* f10fd84: 26102200 */ addiu $s0,$s0,%lo(g_SoloSaveFile) .L0f10fd88: /* f10fd88: 02802025 */ or $a0,$s4,$zero @@ -3459,10 +3459,10 @@ glabel func0f10fac8 /* f10fd9c: 1420fffa */ bnez $at,.L0f10fd88 /* f10fda0: ae02009c */ sw $v0,0x9c($s0) /* f10fda4: 3c10800a */ lui $s0,%hi(g_SoloSaveFile) -/* f10fda8: 3c12800a */ lui $s2,0x800a -/* f10fdac: 3c11800a */ lui $s1,0x800a -/* f10fdb0: 26312208 */ addiu $s1,$s1,0x2208 -/* f10fdb4: 26522209 */ addiu $s2,$s2,0x2209 +/* f10fda8: 3c12800a */ lui $s2,%hi(g_SoloSaveFile+0x9) +/* f10fdac: 3c11800a */ lui $s1,%hi(g_SoloSaveFile+0x8) +/* f10fdb0: 26312208 */ addiu $s1,$s1,%lo(g_SoloSaveFile+0x8) +/* f10fdb4: 26522209 */ addiu $s2,$s2,%lo(g_SoloSaveFile+0x9) /* f10fdb8: 26102200 */ addiu $s0,$s0,%lo(g_SoloSaveFile) .L0f10fdbc: /* f10fdbc: 16110003 */ bne $s0,$s1,.L0f10fdcc @@ -3477,8 +3477,8 @@ glabel func0f10fac8 /* f10fddc: 1420fff7 */ bnez $at,.L0f10fdbc /* f10fde0: a20200ab */ sb $v0,0xab($s0) /* f10fde4: 3c10800a */ lui $s0,%hi(g_SoloSaveFile) -/* f10fde8: 3c11800a */ lui $s1,0x800a -/* f10fdec: 26312204 */ addiu $s1,$s1,0x2204 +/* f10fde8: 3c11800a */ lui $s1,%hi(g_SoloSaveFile+0x4) +/* f10fdec: 26312204 */ addiu $s1,$s1,%lo(g_SoloSaveFile+0x4) /* f10fdf0: 26102200 */ addiu $s0,$s0,%lo(g_SoloSaveFile) .L0f10fdf4: /* f10fdf4: 02802025 */ or $a0,$s4,$zero @@ -3487,8 +3487,8 @@ glabel func0f10fac8 /* f10fe00: 26100001 */ addiu $s0,$s0,0x1 /* f10fe04: 1611fffb */ bne $s0,$s1,.L0f10fdf4 /* f10fe08: a20200b4 */ sb $v0,0xb4($s0) -/* f10fe0c: 3c10800a */ lui $s0,0x800a -/* f10fe10: 26102214 */ addiu $s0,$s0,0x2214 +/* f10fe0c: 3c10800a */ lui $s0,%hi(g_SoloSaveFile+0x14) +/* f10fe10: 26102214 */ addiu $s0,$s0,%lo(g_SoloSaveFile+0x14) /* f10fe14: 02002825 */ or $a1,$s0,$zero /* f10fe18: 0fc47961 */ jal func0f11e584 /* f10fe1c: 24040041 */ addiu $a0,$zero,0x41 @@ -3573,8 +3573,8 @@ glabel func0f10feac /* f10ff24: ac325bd0 */ sw $s2,0x5bd0($at) /* f10ff28: 0fc549e0 */ jal optionsGetForwardPitch /* f10ff2c: 02602025 */ or $a0,$s3,$zero -/* f10ff30: 3c10800a */ lui $s0,0x800a -/* f10ff34: 26102214 */ addiu $s0,$s0,0x2214 +/* f10ff30: 3c10800a */ lui $s0,%hi(g_SoloSaveFile+0x14) +/* f10ff34: 26102214 */ addiu $s0,$s0,%lo(g_SoloSaveFile+0x14) /* f10ff38: 02002825 */ or $a1,$s0,$zero /* f10ff3c: 00002025 */ or $a0,$zero,$zero /* f10ff40: 0fc4794c */ jal func0f11e530 @@ -3887,8 +3887,8 @@ glabel func0f10feac /* f110404: 0fc354be */ jal scenarioDefaultCallback44 /* f110408: 24060003 */ addiu $a2,$zero,0x3 /* f11040c: 3c10800a */ lui $s0,%hi(g_SoloSaveFile) -/* f110410: 3c11800a */ lui $s1,0x800a -/* f110414: 2631220a */ addiu $s1,$s1,0x220a +/* f110410: 3c11800a */ lui $s1,%hi(g_SoloSaveFile+0xa) +/* f110414: 2631220a */ addiu $s1,$s1,%lo(g_SoloSaveFile+0xa) /* f110418: 26102200 */ addiu $s0,$s0,%lo(g_SoloSaveFile) /* f11041c: 02802025 */ or $a0,$s4,$zero .L0f110420: @@ -3917,8 +3917,8 @@ glabel func0f10feac /* f110470: 26310002 */ addiu $s1,$s1,0x2 /* f110474: 1633fffa */ bne $s1,$s3,.L0f110460 /* f110478: 26520002 */ addiu $s2,$s2,0x2 -/* f11047c: 3c18800a */ lui $t8,0x800a -/* f110480: 2718227e */ addiu $t8,$t8,0x227e +/* f11047c: 3c18800a */ lui $t8,%hi(g_SoloSaveFile+0x7e) +/* f110480: 2718227e */ addiu $t8,$t8,%lo(g_SoloSaveFile+0x7e) /* f110484: 26b50006 */ addiu $s5,$s5,0x6 /* f110488: 02b8082b */ sltu $at,$s5,$t8 /* f11048c: 5420fff3 */ bnezl $at,.L0f11045c @@ -3943,8 +3943,8 @@ glabel func0f10feac /* f1104d0: 5420fff3 */ bnezl $at,.L0f1104a0 /* f1104d4: 24100001 */ addiu $s0,$zero,0x1 /* f1104d8: 3c10800a */ lui $s0,%hi(g_SoloSaveFile) -/* f1104dc: 3c11800a */ lui $s1,0x800a -/* f1104e0: 2631220c */ addiu $s1,$s1,0x220c +/* f1104dc: 3c11800a */ lui $s1,%hi(g_SoloSaveFile+0xc) +/* f1104e0: 2631220c */ addiu $s1,$s1,%lo(g_SoloSaveFile+0xc) /* f1104e4: 26102200 */ addiu $s0,$s0,%lo(g_SoloSaveFile) /* f1104e8: 02802025 */ or $a0,$s4,$zero .L0f1104ec: @@ -3956,10 +3956,10 @@ glabel func0f10feac /* f110500: 5420fffa */ bnezl $at,.L0f1104ec /* f110504: 02802025 */ or $a0,$s4,$zero /* f110508: 3c10800a */ lui $s0,%hi(g_SoloSaveFile) -/* f11050c: 3c12800a */ lui $s2,0x800a -/* f110510: 3c11800a */ lui $s1,0x800a -/* f110514: 26312208 */ addiu $s1,$s1,0x2208 -/* f110518: 26522209 */ addiu $s2,$s2,0x2209 +/* f11050c: 3c12800a */ lui $s2,%hi(g_SoloSaveFile+0x9) +/* f110510: 3c11800a */ lui $s1,%hi(g_SoloSaveFile+0x8) +/* f110514: 26312208 */ addiu $s1,$s1,%lo(g_SoloSaveFile+0x8) +/* f110518: 26522209 */ addiu $s2,$s2,%lo(g_SoloSaveFile+0x9) /* f11051c: 26102200 */ addiu $s0,$s0,%lo(g_SoloSaveFile) .L0f110520: /* f110520: 16110003 */ bne $s0,$s1,.L0f110530 @@ -3977,8 +3977,8 @@ glabel func0f10feac /* f110548: 1420fff5 */ bnez $at,.L0f110520 /* f11054c: 00000000 */ sll $zero,$zero,0x0 /* f110550: 3c10800a */ lui $s0,%hi(g_SoloSaveFile) -/* f110554: 3c11800a */ lui $s1,0x800a -/* f110558: 26312204 */ addiu $s1,$s1,0x2204 +/* f110554: 3c11800a */ lui $s1,%hi(g_SoloSaveFile+0x4) +/* f110558: 26312204 */ addiu $s1,$s1,%lo(g_SoloSaveFile+0x4) /* f11055c: 26102200 */ addiu $s0,$s0,%lo(g_SoloSaveFile) /* f110560: 02802025 */ or $a0,$s4,$zero .L0f110564: @@ -3998,9 +3998,9 @@ glabel func0f10feac /* f110598: 27a70050 */ addiu $a3,$sp,0x50 /* f11059c: 0fc45a0a */ jal func0f116828 /* f1105a0: afa00014 */ sw $zero,0x14($sp) -/* f1105a4: 3c01800a */ lui $at,0x800a +/* f1105a4: 3c01800a */ lui $at,%hi(var800a21f8) /* f1105a8: 14400009 */ bnez $v0,.L0f1105d0 -/* f1105ac: ac2221f8 */ sw $v0,0x21f8($at) +/* f1105ac: ac2221f8 */ sw $v0,%lo(var800a21f8)($at) /* f1105b0: 8fa80140 */ lw $t0,0x140($sp) /* f1105b4: 97a90152 */ lhu $t1,0x152($sp) /* f1105b8: 3c03800a */ lui $v1,%hi(var800a22c0) @@ -4218,16 +4218,16 @@ glabel func0f11080c /* f11089c: ae39047c */ sw $t9,0x47c($s1) /* f1108a0: 0fc354fe */ jal scenarioDefaultCallback40 /* f1108a4: a6280480 */ sh $t0,0x480($s1) -/* f1108a8: 3c01800b */ lui $at,0x800b -/* f1108ac: a022cc11 */ sb $v0,-0x33ef($at) +/* f1108a8: 3c01800b */ lui $at,%hi(g_MpSetup+0x89) +/* f1108ac: a022cc11 */ sb $v0,%lo(g_MpSetup+0x89)($at) /* f1108b0: 02402025 */ or $a0,$s2,$zero /* f1108b4: 0fc354fe */ jal scenarioDefaultCallback40 /* f1108b8: 24050004 */ addiu $a1,$zero,0x4 /* f1108bc: a6220482 */ sh $v0,0x482($s1) -/* f1108c0: 3c11800b */ lui $s1,0x800b -/* f1108c4: 3c10800b */ lui $s0,0x800b -/* f1108c8: 2610cbb0 */ addiu $s0,$s0,-13392 -/* f1108cc: 2631cc10 */ addiu $s1,$s1,-13296 +/* f1108c0: 3c11800b */ lui $s1,%hi(g_MpSetup+0x88) +/* f1108c4: 3c10800b */ lui $s0,%hi(g_MpSetup+0x28) +/* f1108c8: 2610cbb0 */ addiu $s0,$s0,%lo(g_MpSetup+0x28) +/* f1108cc: 2631cc10 */ addiu $s1,$s1,%lo(g_MpSetup+0x88) /* f1108d0: 02402025 */ or $a0,$s2,$zero .L0f1108d4: /* f1108d4: 02002825 */ or $a1,$s0,$zero @@ -4243,18 +4243,18 @@ glabel func0f11080c /* f1108fc: 304300ff */ andi $v1,$v0,0xff /* f110900: 240100ff */ addiu $at,$zero,0xff /* f110904: 14610005 */ bne $v1,$at,.L0f11091c -/* f110908: 3c10800b */ lui $s0,0x800b +/* f110908: 3c10800b */ lui $s0,%hi(g_MpSetup+0x28) /* f11090c: 2409ffff */ addiu $t1,$zero,-1 -/* f110910: 3c01800b */ lui $at,0x800b +/* f110910: 3c01800b */ lui $at,%hi(var800acc14) /* f110914: 10000003 */ beqz $zero,.L0f110924 -/* f110918: a029cc14 */ sb $t1,-0x33ec($at) +/* f110918: a029cc14 */ sb $t1,%lo(var800acc14)($at) .L0f11091c: -/* f11091c: 3c01800b */ lui $at,0x800b -/* f110920: a023cc14 */ sb $v1,-0x33ec($at) +/* f11091c: 3c01800b */ lui $at,%hi(var800acc14) +/* f110920: a023cc14 */ sb $v1,%lo(var800acc14)($at) .L0f110924: -/* f110924: 3c11800b */ lui $s1,0x800b -/* f110928: 2631cbb6 */ addiu $s1,$s1,-13386 -/* f11092c: 2610cbb0 */ addiu $s0,$s0,-13392 +/* f110924: 3c11800b */ lui $s1,%hi(g_MpSetup+0x2e) +/* f110928: 2631cbb6 */ addiu $s1,$s1,%lo(g_MpSetup+0x2e) +/* f11092c: 2610cbb0 */ addiu $s0,$s0,%lo(g_MpSetup+0x28) .L0f110930: /* f110930: 02402025 */ or $a0,$s2,$zero /* f110934: 0fc354fe */ jal scenarioDefaultCallback40 @@ -4265,18 +4265,18 @@ glabel func0f11080c /* f110948: 02402025 */ or $a0,$s2,$zero /* f11094c: 0fc354fe */ jal scenarioDefaultCallback40 /* f110950: 24050001 */ addiu $a1,$zero,0x1 -/* f110954: 3c01800b */ lui $at,0x800b -/* f110958: a022cc12 */ sb $v0,-0x33ee($at) +/* f110954: 3c01800b */ lui $at,%hi(g_MpSetup+0x8a) +/* f110958: a022cc12 */ sb $v0,%lo(g_MpSetup+0x8a)($at) /* f11095c: 02402025 */ or $a0,$s2,$zero /* f110960: 0fc354fe */ jal scenarioDefaultCallback40 /* f110964: 24050001 */ addiu $a1,$zero,0x1 -/* f110968: 3c01800a */ lui $at,0x800a -/* f11096c: a022232b */ sb $v0,0x232b($at) +/* f110968: 3c01800a */ lui $at,%hi(var800a2328+0x3) +/* f11096c: a022232b */ sb $v0,%lo(var800a2328+0x3)($at) /* f110970: 02402025 */ or $a0,$s2,$zero /* f110974: 0fc354fe */ jal scenarioDefaultCallback40 /* f110978: 24050001 */ addiu $a1,$zero,0x1 -/* f11097c: 3c01800a */ lui $at,0x800a -/* f110980: a022232c */ sb $v0,0x232c($at) +/* f11097c: 3c01800a */ lui $at,%hi(g_AltTitle) +/* f110980: a022232c */ sb $v0,%lo(g_AltTitle)($at) /* f110984: 0fc35531 */ jal func0f0d54c4 /* f110988: 02402025 */ or $a0,$s2,$zero /* f11098c: 8faa0124 */ lw $t2,0x124($sp) @@ -4316,8 +4316,8 @@ glabel func0f1109c0 /* f1109fc: afae0044 */ sw $t6,0x44($sp) /* f110a00: 0fc355d7 */ jal func0f0d575c /* f110a04: a7af0048 */ sh $t7,0x48($sp) -/* f110a08: 3c05800b */ lui $a1,0x800b -/* f110a0c: 90a5cc11 */ lbu $a1,-0x33ef($a1) +/* f110a08: 3c05800b */ lui $a1,%hi(g_MpSetup+0x89) +/* f110a0c: 90a5cc11 */ lbu $a1,%lo(g_MpSetup+0x89)($a1) /* f110a10: 02402025 */ or $a0,$s2,$zero /* f110a14: 0fc354be */ jal scenarioDefaultCallback44 /* f110a18: 24060001 */ addiu $a2,$zero,0x1 @@ -4325,10 +4325,10 @@ glabel func0f1109c0 /* f110a20: 96050482 */ lhu $a1,0x482($s0) /* f110a24: 0fc354be */ jal scenarioDefaultCallback44 /* f110a28: 24060004 */ addiu $a2,$zero,0x4 -/* f110a2c: 3c10800b */ lui $s0,0x800b -/* f110a30: 3c11800b */ lui $s1,0x800b -/* f110a34: 2631cc10 */ addiu $s1,$s1,-13296 -/* f110a38: 2610cbb0 */ addiu $s0,$s0,-13392 +/* f110a2c: 3c10800b */ lui $s0,%hi(g_MpSetup+0x28) +/* f110a30: 3c11800b */ lui $s1,%hi(g_MpSetup+0x88) +/* f110a34: 2631cc10 */ addiu $s1,$s1,%lo(g_MpSetup+0x88) +/* f110a38: 2610cbb0 */ addiu $s0,$s0,%lo(g_MpSetup+0x28) /* f110a3c: 02402025 */ or $a0,$s2,$zero .L0f110a40: /* f110a40: 0fc35569 */ jal func0f0d55a4 @@ -4353,10 +4353,10 @@ glabel func0f1109c0 /* f110a88: 0fc354be */ jal scenarioDefaultCallback44 /* f110a8c: 24060008 */ addiu $a2,$zero,0x8 .L0f110a90: -/* f110a90: 3c10800b */ lui $s0,0x800b -/* f110a94: 3c11800b */ lui $s1,0x800b -/* f110a98: 2631cbb6 */ addiu $s1,$s1,-13386 -/* f110a9c: 2610cbb0 */ addiu $s0,$s0,-13392 +/* f110a90: 3c10800b */ lui $s0,%hi(g_MpSetup+0x28) +/* f110a94: 3c11800b */ lui $s1,%hi(g_MpSetup+0x2e) +/* f110a98: 2631cbb6 */ addiu $s1,$s1,%lo(g_MpSetup+0x2e) +/* f110a9c: 2610cbb0 */ addiu $s0,$s0,%lo(g_MpSetup+0x28) /* f110aa0: 02402025 */ or $a0,$s2,$zero .L0f110aa4: /* f110aa4: 92050065 */ lbu $a1,0x65($s0) @@ -4365,13 +4365,13 @@ glabel func0f1109c0 /* f110ab0: 26100001 */ addiu $s0,$s0,0x1 /* f110ab4: 5611fffb */ bnel $s0,$s1,.L0f110aa4 /* f110ab8: 02402025 */ or $a0,$s2,$zero -/* f110abc: 3c05800b */ lui $a1,0x800b -/* f110ac0: 90a5cc12 */ lbu $a1,-0x33ee($a1) +/* f110abc: 3c05800b */ lui $a1,%hi(g_MpSetup+0x8a) +/* f110ac0: 90a5cc12 */ lbu $a1,%lo(g_MpSetup+0x8a)($a1) /* f110ac4: 02402025 */ or $a0,$s2,$zero /* f110ac8: 0fc354be */ jal scenarioDefaultCallback44 /* f110acc: 24060001 */ addiu $a2,$zero,0x1 -/* f110ad0: 3c05800a */ lui $a1,0x800a -/* f110ad4: 90a5232b */ lbu $a1,0x232b($a1) +/* f110ad0: 3c05800a */ lui $a1,%hi(var800a2328+0x3) +/* f110ad4: 90a5232b */ lbu $a1,%lo(var800a2328+0x3)($a1) /* f110ad8: 02402025 */ or $a0,$s2,$zero /* f110adc: 0fc354be */ jal scenarioDefaultCallback44 /* f110ae0: 24060001 */ addiu $a2,$zero,0x1 @@ -4414,8 +4414,8 @@ glabel func0f1109c0 GLOBAL_ASM( glabel func0f110b68 -/* f110b68: 3c02800b */ lui $v0,0x800b -/* f110b6c: 2442cbb0 */ addiu $v0,$v0,-13392 +/* f110b68: 3c02800b */ lui $v0,%hi(g_MpSetup+0x28) +/* f110b6c: 2442cbb0 */ addiu $v0,$v0,%lo(g_MpSetup+0x28) /* f110b70: 27bdffe8 */ addiu $sp,$sp,-24 /* f110b74: afbf0014 */ sw $ra,0x14($sp) /* f110b78: 240effff */ addiu $t6,$zero,-1 @@ -4429,21 +4429,21 @@ glabel func0f110b68 /* f110b98: a0400054 */ sb $zero,0x54($v0) /* f110b9c: 0fc630f9 */ jal func0f18c3e4 /* f110ba0: a04e0064 */ sb $t6,0x64($v0) -/* f110ba4: 3c02800b */ lui $v0,0x800b +/* f110ba4: 3c02800b */ lui $v0,%hi(g_MpSetup+0x28) /* f110ba8: 3c03800a */ lui $v1,%hi(g_Vars) /* f110bac: 24639fc0 */ addiu $v1,$v1,%lo(g_Vars) -/* f110bb0: 2442cbb0 */ addiu $v0,$v0,-13392 +/* f110bb0: 2442cbb0 */ addiu $v0,$v0,%lo(g_MpSetup+0x28) /* f110bb4: a0400062 */ sb $zero,0x62($v0) /* f110bb8: a0400061 */ sb $zero,0x61($v0) /* f110bbc: a0400060 */ sb $zero,0x60($v0) /* f110bc0: ac60047c */ sw $zero,0x47c($v1) /* f110bc4: a4600480 */ sh $zero,0x480($v1) /* f110bc8: a4600482 */ sh $zero,0x482($v1) -/* f110bcc: 3c01800a */ lui $at,0x800a -/* f110bd0: a020232b */ sb $zero,0x232b($at) -/* f110bd4: 3c01800a */ lui $at,0x800a +/* f110bcc: 3c01800a */ lui $at,%hi(var800a2328+0x3) +/* f110bd0: a020232b */ sb $zero,%lo(var800a2328+0x3)($at) +/* f110bd4: 3c01800a */ lui $at,%hi(g_AltTitle) /* f110bd8: 0fc44270 */ jal func0f1109c0 -/* f110bdc: a020232c */ sb $zero,0x232c($at) +/* f110bdc: a020232c */ sb $zero,%lo(g_AltTitle)($at) /* f110be0: 8fbf0014 */ lw $ra,0x14($sp) /* f110be4: 27bd0018 */ addiu $sp,$sp,0x18 /* f110be8: 03e00008 */ jr $ra @@ -4580,11 +4580,11 @@ glabel func0f110cf8 GLOBAL_ASM( glabel func0f110d90 /* f110d90: 00047880 */ sll $t7,$a0,0x2 -/* f110d94: 3c01800a */ lui $at,0x800a +/* f110d94: 3c01800a */ lui $at,%hi(var800a2330) /* f110d98: 002f0821 */ addu $at,$at,$t7 /* f110d9c: 240effff */ addiu $t6,$zero,-1 /* f110da0: 03e00008 */ jr $ra -/* f110da4: ac2e2330 */ sw $t6,0x2330($at) +/* f110da4: ac2e2330 */ sw $t6,%lo(var800a2330)($at) ); GLOBAL_ASM( @@ -4924,9 +4924,9 @@ glabel func0f110f4c /* f111270: 000e70c0 */ sll $t6,$t6,0x3 /* f111274: 27bdffe0 */ addiu $sp,$sp,-32 /* f111278: 01c47023 */ subu $t6,$t6,$a0 -/* f11127c: 3c0f800a */ lui $t7,%hi(var8009e000) +/* f11127c: 3c0f800a */ lui $t7,0x800a /* f111280: afb00018 */ sw $s0,0x18($sp) -/* f111284: 25efe000 */ addiu $t7,$t7,%lo(var8009e000) +/* f111284: 25efe000 */ addiu $t7,$t7,-8192 /* f111288: 000e7100 */ sll $t6,$t6,0x4 /* f11128c: 01cf8021 */ addu $s0,$t6,$t7 /* f111290: 8e030e68 */ lw $v1,0xe68($s0) @@ -5024,8 +5024,8 @@ glabel func0f110f4c /* f1113ec: 01c47021 */ addu $t6,$t6,$a0 /* f1113f0: 000e70c0 */ sll $t6,$t6,0x3 /* f1113f4: 01c47023 */ subu $t6,$t6,$a0 -/* f1113f8: 3c0f800a */ lui $t7,%hi(var8009e000) -/* f1113fc: 25efe000 */ addiu $t7,$t7,%lo(var8009e000) +/* f1113f8: 3c0f800a */ lui $t7,0x800a +/* f1113fc: 25efe000 */ addiu $t7,$t7,-8192 /* f111400: 000e7100 */ sll $t6,$t6,0x4 /* f111404: 01cf1821 */ addu $v1,$t6,$t7 /* f111408: 8c780e68 */ lw $t8,0xe68($v1) @@ -5063,8 +5063,8 @@ glabel func0f111460 /* f111470: 000e70c0 */ sll $t6,$t6,0x3 /* f111474: 27bdffc8 */ addiu $sp,$sp,-56 /* f111478: 01c47023 */ subu $t6,$t6,$a0 -/* f11147c: 3c0f800a */ lui $t7,%hi(var8009e000) -/* f111480: 25efe000 */ addiu $t7,$t7,%lo(var8009e000) +/* f11147c: 3c0f800a */ lui $t7,0x800a +/* f111480: 25efe000 */ addiu $t7,$t7,-8192 /* f111484: 000e7100 */ sll $t6,$t6,0x4 /* f111488: afb00018 */ sw $s0,0x18($sp) /* f11148c: 01cf5021 */ addu $t2,$t6,$t7 @@ -5121,8 +5121,8 @@ glabel func0f111460 /* f111544: 00001025 */ or $v0,$zero,$zero /* f111548: 8d430e68 */ lw $v1,0xe68($t2) .L0f11154c: -/* f11154c: 3c02800a */ lui $v0,%hi(var800a0884) -/* f111550: 8c42a018 */ lw $v0,-0x5fe8($v0) +/* f11154c: 3c02800a */ lui $v0,%hi(g_Vars+0x58) +/* f111550: 8c42a018 */ lw $v0,%lo(g_Vars+0x58)($v0) /* f111554: 8c6c0880 */ lw $t4,0x880($v1) /* f111558: 000879c0 */ sll $t7,$t0,0x7 /* f11155c: 004c6823 */ subu $t5,$v0,$t4 @@ -5161,7 +5161,7 @@ glabel func0f111460 /* f1115d4: 006d7021 */ addu $t6,$v1,$t5 /* f1115d8: ac6e0884 */ sw $t6,0x884($v1) /* f1115dc: 8d420e68 */ lw $v0,0xe68($t2) -/* f1115e0: 24420884 */ addiu $v0,$v0,%lo(var800a0884) +/* f1115e0: 24420884 */ addiu $v0,$v0,2180 .L0f1115e4: /* f1115e4: 8fbf001c */ lw $ra,0x1c($sp) /* f1115e8: 8fb00018 */ lw $s0,0x18($sp) diff --git a/src/game/game_111600.c b/src/game/game_111600.c index 2397a6321..3546fa832 100644 --- a/src/game/game_111600.c +++ b/src/game/game_111600.c @@ -248,8 +248,8 @@ bool func0f111ab0(s32 weapon1, s32 weapon2) GLOBAL_ASM( glabel func0f111ad4 -/* f111ad4: 3c0e800a */ lui $t6,0x800a -/* f111ad8: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f111ad4: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f111ad8: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f111adc: 00802825 */ or $a1,$a0,$zero /* f111ae0: 240b0008 */ addiu $t3,$zero,0x8 /* f111ae4: 8dc31864 */ lw $v1,0x1864($t6) @@ -597,8 +597,8 @@ glabel func0f1120f0 /* f112168: 8fa7002c */ lw $a3,0x2c($sp) /* f11216c: 24070001 */ addiu $a3,$zero,0x1 .L0f112170: -/* f112170: 3c18800a */ lui $t8,0x800a -/* f112174: 8f18a2d8 */ lw $t8,-0x5d28($t8) +/* f112170: 3c18800a */ lui $t8,%hi(g_Vars+0x318) +/* f112174: 8f18a2d8 */ lw $t8,%lo(g_Vars+0x318)($t8) /* f112178: 02002025 */ or $a0,$s0,$zero /* f11217c: 24051000 */ addiu $a1,$zero,0x1000 /* f112180: 53000026 */ beqzl $t8,.L0f11221c @@ -707,8 +707,8 @@ glabel func0f1120f0 GLOBAL_ASM( glabel func0f1122ec /* f1122ec: 27bdffd0 */ addiu $sp,$sp,-48 -/* f1122f0: 3c02800a */ lui $v0,0x800a -/* f1122f4: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f1122f0: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f1122f4: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f1122f8: afbf002c */ sw $ra,0x2c($sp) /* f1122fc: afb40028 */ sw $s4,0x28($sp) /* f112300: afb30024 */ sw $s3,0x24($sp) @@ -845,8 +845,8 @@ glabel func0f1122ec /* f1124d4: 1000000d */ beqz $zero,.L0f11250c /* f1124d8: 8e140008 */ lw $s4,0x8($s0) .L0f1124dc: -/* f1124dc: 3c0d800a */ lui $t5,0x800a -/* f1124e0: 8dada244 */ lw $t5,-0x5dbc($t5) +/* f1124dc: 3c0d800a */ lui $t5,%hi(g_Vars+0x284) +/* f1124e0: 8dada244 */ lw $t5,%lo(g_Vars+0x284)($t5) /* f1124e4: 8e10000c */ lw $s0,0xc($s0) /* f1124e8: 8dae1864 */ lw $t6,0x1864($t5) /* f1124ec: 160e0005 */ bne $s0,$t6,.L0f112504 @@ -877,8 +877,8 @@ glabel func0f1122ec GLOBAL_ASM( glabel func0f11253c /* f11253c: 27bdffd8 */ addiu $sp,$sp,-40 -/* f112540: 3c03800a */ lui $v1,0x800a -/* f112544: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f112540: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f112544: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f112548: afbf0024 */ sw $ra,0x24($sp) /* f11254c: afb30020 */ sw $s3,0x20($sp) /* f112550: afb2001c */ sw $s2,0x1c($sp) @@ -1020,8 +1020,8 @@ glabel func0f11253c /* f112730: 1000000c */ beqz $zero,.L0f112764 /* f112734: 8e130008 */ lw $s3,0x8($s0) .L0f112738: -/* f112738: 3c0a800a */ lui $t2,0x800a -/* f11273c: 8d4aa244 */ lw $t2,-0x5dbc($t2) +/* f112738: 3c0a800a */ lui $t2,%hi(g_Vars+0x284) +/* f11273c: 8d4aa244 */ lw $t2,%lo(g_Vars+0x284)($t2) /* f112740: 8d4b1864 */ lw $t3,0x1864($t2) /* f112744: 160b0005 */ bne $s0,$t3,.L0f11275c /* f112748: 00000000 */ sll $zero,$zero,0x0 @@ -1049,8 +1049,8 @@ glabel func0f11253c GLOBAL_ASM( glabel currentPlayerHasKeyFlags -/* f112790: 3c0e800a */ lui $t6,0x800a -/* f112794: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f112790: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f112794: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f112798: 27bdfff8 */ addiu $sp,$sp,-8 /* f11279c: afb00004 */ sw $s0,0x4($sp) /* f1127a0: 8dc51864 */ lw $a1,0x1864($t6) diff --git a/src/game/game_113220.c b/src/game/game_113220.c index 826e77ad7..30a86baea 100644 --- a/src/game/game_113220.c +++ b/src/game/game_113220.c @@ -18,8 +18,8 @@ GLOBAL_ASM( glabel func0f113220 -/* f113220: 3c0e800a */ lui $t6,0x800a -/* f113224: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f113220: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f113224: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f113228: 8dc3047c */ lw $v1,0x47c($t6) /* f11322c: 80620008 */ lb $v0,0x8($v1) /* f113230: 2c4f0001 */ sltiu $t7,$v0,0x1 @@ -574,8 +574,8 @@ glabel var7f1b3a74 GLOBAL_ASM( glabel func0f113f10 -/* f113f10: 3c08800a */ lui $t0,0x800a -/* f113f14: 8d08a244 */ lw $t0,-0x5dbc($t0) +/* f113f10: 3c08800a */ lui $t0,%hi(g_Vars+0x284) +/* f113f14: 8d08a244 */ lw $t0,%lo(g_Vars+0x284)($t0) /* f113f18: 27bdffd0 */ addiu $sp,$sp,-48 /* f113f1c: afbf0024 */ sw $ra,0x24($sp) /* f113f20: afb00020 */ sw $s0,0x20($sp) @@ -634,31 +634,31 @@ glabel func0f113f10 /* f113fec: e7b20010 */ swc1 $f18,0x10($sp) /* f113ff0: 0c007733 */ jal func0001dccc /* f113ff4: e7b00014 */ swc1 $f16,0x14($sp) -/* f113ff8: 3c04800a */ lui $a0,%hi(var800a045c) -/* f113ffc: 8c84a244 */ lw $a0,-0x5dbc($a0) +/* f113ff8: 3c04800a */ lui $a0,%hi(g_Vars+0x284) +/* f113ffc: 8c84a244 */ lw $a0,%lo(g_Vars+0x284)($a0) /* f114000: 8e050004 */ lw $a1,0x4($s0) /* f114004: 24060000 */ addiu $a2,$zero,0x0 /* f114008: 0c00777b */ jal func0001ddec -/* f11400c: 2484045c */ addiu $a0,$a0,%lo(var800a045c) -/* f114010: 3c04800a */ lui $a0,%hi(var800a045c) -/* f114014: 8c84a244 */ lw $a0,-0x5dbc($a0) +/* f11400c: 2484045c */ addiu $a0,$a0,1116 +/* f114010: 3c04800a */ lui $a0,%hi(g_Vars+0x284) +/* f114014: 8c84a244 */ lw $a0,%lo(g_Vars+0x284)($a0) /* f114018: 8e050008 */ lw $a1,0x8($s0) /* f11401c: 0c007787 */ jal func0001de1c -/* f114020: 2484045c */ addiu $a0,$a0,%lo(var800a045c) -/* f114024: 3c04800a */ lui $a0,%hi(var800a045c) -/* f114028: 8c84a244 */ lw $a0,-0x5dbc($a0) +/* f114020: 2484045c */ addiu $a0,$a0,1116 +/* f114024: 3c04800a */ lui $a0,%hi(g_Vars+0x284) +/* f114028: 8c84a244 */ lw $a0,%lo(g_Vars+0x284)($a0) /* f11402c: 3c057f11 */ lui $a1,%hi(func0f113220) /* f114030: 24a53220 */ addiu $a1,$a1,%lo(func0f113220) /* f114034: 0c0077a6 */ jal func0001de98 -/* f114038: 2484045c */ addiu $a0,$a0,%lo(var800a045c) -/* f11403c: 3c0a800a */ lui $t2,0x800a +/* f114038: 2484045c */ addiu $a0,$a0,1116 +/* f11403c: 3c0a800a */ lui $t2,%hi(g_Vars+0x284) /* f114040: 8fa20028 */ lw $v0,0x28($sp) -/* f114044: 8d4aa244 */ lw $t2,-0x5dbc($t2) +/* f114044: 8d4aa244 */ lw $t2,%lo(g_Vars+0x284)($t2) /* f114048: c7ac0030 */ lwc1 $f12,0x30($sp) -/* f11404c: 3c08800a */ lui $t0,0x800a +/* f11404c: 3c08800a */ lui $t0,%hi(g_Vars+0x284) /* f114050: ad4203ac */ sw $v0,0x3ac($t2) /* f114054: c600000c */ lwc1 $f0,0xc($s0) -/* f114058: 8d08a244 */ lw $t0,-0x5dbc($t0) +/* f114058: 8d08a244 */ lw $t0,%lo(g_Vars+0x284)($t0) /* f11405c: 46006303 */ div.s $f12,$f12,$f0 .L0f114060: /* f114060: 3c013f00 */ lui $at,0x3f00 @@ -669,9 +669,9 @@ glabel func0f113f10 /* f114074: 44053000 */ mfc1 $a1,$f6 /* f114078: 0c0077ac */ jal func0001deb0 /* f11407c: 00000000 */ sll $zero,$zero,0x0 -/* f114080: 3c08800a */ lui $t0,0x800a +/* f114080: 3c08800a */ lui $t0,%hi(g_Vars+0x284) /* f114084: 10000004 */ beqz $zero,.L0f114098 -/* f114088: 8d08a244 */ lw $t0,-0x5dbc($t0) +/* f114088: 8d08a244 */ lw $t0,%lo(g_Vars+0x284)($t0) /* f11408c: 24420001 */ addiu $v0,$v0,0x1 .L0f114090: /* f114090: 1443ffaf */ bne $v0,$v1,.L0f113f50 @@ -697,21 +697,21 @@ glabel func0f1140bc /* f1140cc: 44866000 */ mtc1 $a2,$f12 /* f1140d0: 46047182 */ mul.s $f6,$f14,$f4 /* f1140d4: afa40020 */ sw $a0,0x20($sp) -/* f1140d8: 3c04800a */ lui $a0,%hi(var800a045c) +/* f1140d8: 3c04800a */ lui $a0,%hi(g_Vars+0x284) /* f1140dc: 3c014140 */ lui $at,0x4140 /* f1140e0: 44814000 */ mtc1 $at,$f8 -/* f1140e4: 8c84a244 */ lw $a0,-0x5dbc($a0) +/* f1140e4: 8c84a244 */ lw $a0,%lo(g_Vars+0x284)($a0) /* f1140e8: afbf001c */ sw $ra,0x1c($sp) /* f1140ec: afa50024 */ sw $a1,0x24($sp) /* f1140f0: 44076000 */ mfc1 $a3,$f12 /* f1140f4: 8fa60024 */ lw $a2,0x24($sp) /* f1140f8: 87a50022 */ lh $a1,0x22($sp) /* f1140fc: e7a60010 */ swc1 $f6,0x10($sp) -/* f114100: 2484045c */ addiu $a0,$a0,%lo(var800a045c) +/* f114100: 2484045c */ addiu $a0,$a0,1116 /* f114104: 0c007733 */ jal func0001dccc /* f114108: e7a80014 */ swc1 $f8,0x14($sp) -/* f11410c: 3c0f800a */ lui $t7,0x800a -/* f114110: 8defa244 */ lw $t7,-0x5dbc($t7) +/* f11410c: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) +/* f114110: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) /* f114114: 240effff */ addiu $t6,$zero,-1 /* f114118: adee03ac */ sw $t6,0x3ac($t7) /* f11411c: 8fbf001c */ lw $ra,0x1c($sp) diff --git a/src/game/game_11f000.c b/src/game/game_11f000.c index 34c9b6543..eb33d2017 100644 --- a/src/game/game_11f000.c +++ b/src/game/game_11f000.c @@ -74,14 +74,14 @@ glabel var7f1b4fe8 /* f11f090: afa60040 */ sw $a2,0x40($sp) /* f11f094: c4800008 */ lwc1 $f0,0x8($a0) /* f11f098: c48e0000 */ lwc1 $f14,0x0($a0) -/* f11f09c: 3c11800a */ lui $s1,%hi(var800a1bb0) +/* f11f09c: 3c11800a */ lui $s1,%hi(g_Vars+0x284) /* f11f0a0: 46000102 */ mul.s $f4,$f0,$f0 /* f11f0a4: 3c017f1b */ lui $at,%hi(var7f1b4fe0) -/* f11f0a8: 8e31a244 */ lw $s1,-0x5dbc($s1) +/* f11f0a8: 8e31a244 */ lw $s1,%lo(g_Vars+0x284)($s1) /* f11f0ac: 460e7182 */ mul.s $f6,$f14,$f14 /* f11f0b0: c42a4fe0 */ lwc1 $f10,%lo(var7f1b4fe0)($at) /* f11f0b4: 00808025 */ or $s0,$a0,$zero -/* f11f0b8: 26311bb0 */ addiu $s1,$s1,%lo(var800a1bb0) +/* f11f0b8: 26311bb0 */ addiu $s1,$s1,7088 /* f11f0bc: 46062200 */ add.s $f8,$f4,$f6 /* f11f0c0: 0c012974 */ jal sqrtf /* f11f0c4: 460a4300 */ add.s $f12,$f8,$f10 @@ -186,14 +186,14 @@ glabel var7f1b4ff4 /* f11f210: afa60040 */ sw $a2,0x40($sp) /* f11f214: c4800008 */ lwc1 $f0,0x8($a0) /* f11f218: c48e0000 */ lwc1 $f14,0x0($a0) -/* f11f21c: 3c11800a */ lui $s1,%hi(var800a1bb0) +/* f11f21c: 3c11800a */ lui $s1,%hi(g_Vars+0x284) /* f11f220: 46000102 */ mul.s $f4,$f0,$f0 /* f11f224: 3c017f1b */ lui $at,%hi(var7f1b4fec) -/* f11f228: 8e31a244 */ lw $s1,-0x5dbc($s1) +/* f11f228: 8e31a244 */ lw $s1,%lo(g_Vars+0x284)($s1) /* f11f22c: 460e7182 */ mul.s $f6,$f14,$f14 /* f11f230: c42a4fec */ lwc1 $f10,%lo(var7f1b4fec)($at) /* f11f234: 00808025 */ or $s0,$a0,$zero -/* f11f238: 26311bb0 */ addiu $s1,$s1,%lo(var800a1bb0) +/* f11f238: 26311bb0 */ addiu $s1,$s1,7088 /* f11f23c: 46062200 */ add.s $f8,$f4,$f6 /* f11f240: 0c012974 */ jal sqrtf /* f11f244: 460a4300 */ add.s $f12,$f8,$f10 @@ -7297,10 +7297,10 @@ glabel var7f1b5108 /* f125adc: 19c00009 */ blez $t6,.L0f125b04 /* f125ae0: 00000000 */ sll $zero,$zero,0x0 /* f125ae4: 8def44f0 */ lw $t7,%lo(var800844f0)($t7) -/* f125ae8: 3c18800a */ lui $t8,0x800a +/* f125ae8: 3c18800a */ lui $t8,%hi(g_Vars+0x314) /* f125aec: 11e00005 */ beqz $t7,.L0f125b04 /* f125af0: 00000000 */ sll $zero,$zero,0x0 -/* f125af4: 8f18a2d4 */ lw $t8,-0x5d2c($t8) +/* f125af4: 8f18a2d4 */ lw $t8,%lo(g_Vars+0x314)($t8) /* f125af8: 3c198007 */ lui $t9,%hi(var800706c8) /* f125afc: 13000003 */ beqz $t8,.L0f125b0c /* f125b00: 00000000 */ sll $zero,$zero,0x0 @@ -7637,8 +7637,8 @@ glabel var7f1b5108 .L0f125ff8: /* f125ff8: 8fa20094 */ lw $v0,0x94($sp) .L0f125ffc: -/* f125ffc: 3c0e800a */ lui $t6,0x800a -/* f126000: 8dce9ff4 */ lw $t6,-0x600c($t6) +/* f125ffc: 3c0e800a */ lui $t6,%hi(g_Vars+0x34) +/* f126000: 8dce9ff4 */ lw $t6,%lo(g_Vars+0x34)($t6) /* f126004: 8c4d0000 */ lw $t5,0x0($v0) /* f126008: 3c05800b */ lui $a1,%hi(var800ab5a0) /* f12600c: 24180002 */ addiu $t8,$zero,0x2 @@ -7825,11 +7825,11 @@ glabel var7f1b5108 /* f1262dc: 8fa80094 */ lw $t0,0x94($sp) /* f1262e0: 4608e03c */ c.lt.s $f28,$f8 /* f1262e4: 8fa20094 */ lw $v0,0x94($sp) -/* f1262e8: 3c0d800a */ lui $t5,0x800a +/* f1262e8: 3c0d800a */ lui $t5,%hi(g_Vars+0x34) /* f1262ec: 45020007 */ bc1fl .L0f12630c /* f1262f0: 8fa80094 */ lw $t0,0x94($sp) /* f1262f4: 8c4f0000 */ lw $t7,0x0($v0) -/* f1262f8: 8dad9ff4 */ lw $t5,-0x600c($t5) +/* f1262f8: 8dad9ff4 */ lw $t5,%lo(g_Vars+0x34)($t5) /* f1262fc: 01edc021 */ addu $t8,$t7,$t5 /* f126300: 10000003 */ beqz $zero,.L0f126310 /* f126304: ac580000 */ sw $t8,0x0($v0) @@ -8370,7 +8370,7 @@ glabel var7f1b511c /* f126af0: 3c017f1b */ lui $at,%hi(var7f1b5118) /* f126af4: c4245118 */ lwc1 $f4,%lo(var7f1b5118)($at) /* f126af8: 46003281 */ sub.s $f10,$f6,$f0 -/* f126afc: 3c08800a */ lui $t0,0x800a +/* f126afc: 3c08800a */ lui $t0,%hi(g_Vars+0x34) /* f126b00: c7a601a8 */ lwc1 $f6,0x1a8($sp) /* f126b04: 46045302 */ mul.s $f12,$f10,$f4 /* f126b08: 4616603c */ c.lt.s $f12,$f22 @@ -8379,7 +8379,7 @@ glabel var7f1b511c /* f126b14: 00000000 */ sll $zero,$zero,0x0 /* f126b18: 4600b306 */ mov.s $f12,$f22 .L0f126b1c: -/* f126b1c: 8d089ff4 */ lw $t0,-0x600c($t0) +/* f126b1c: 8d089ff4 */ lw $t0,%lo(g_Vars+0x34)($t0) /* f126b20: 3c017f1b */ lui $at,%hi(var7f1b511c) /* f126b24: c428511c */ lwc1 $f8,%lo(var7f1b511c)($at) /* f126b28: 0113082a */ slt $at,$t0,$s3 @@ -8593,8 +8593,8 @@ glabel var7f1b513c /* f126df0: c4241630 */ lwc1 $f4,0x1630($at) /* f126df4: 3c017f1b */ lui $at,%hi(var7f1b5120) /* f126df8: c4265120 */ lwc1 $f6,%lo(var7f1b5120)($at) -/* f126dfc: 3c03800a */ lui $v1,0x800a -/* f126e00: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f126dfc: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f126e00: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f126e04: 46062202 */ mul.s $f8,$f4,$f6 /* f126e08: afbf0074 */ sw $ra,0x74($sp) /* f126e0c: afbe0070 */ sw $s8,0x70($sp) @@ -9019,8 +9019,8 @@ glabel func0f127334 /* f127434: 54200005 */ bnezl $at,.L0f12744c /* f127438: 8c581c2c */ lw $t8,0x1c2c($v0) /* f12743c: ac431c28 */ sw $v1,0x1c28($v0) -/* f127440: 3c02800a */ lui $v0,0x800a -/* f127444: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f127440: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f127444: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f127448: 8c581c2c */ lw $t8,0x1c2c($v0) .L0f12744c: /* f12744c: 240300cc */ addiu $v1,$zero,0xcc @@ -9028,8 +9028,8 @@ glabel func0f127334 /* f127454: 54200005 */ bnezl $at,.L0f12746c /* f127458: 8c591c30 */ lw $t9,0x1c30($v0) /* f12745c: ac431c2c */ sw $v1,0x1c2c($v0) -/* f127460: 3c02800a */ lui $v0,0x800a -/* f127464: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f127460: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f127464: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f127468: 8c591c30 */ lw $t9,0x1c30($v0) .L0f12746c: /* f12746c: 2b2100cd */ slti $at,$t9,0xcd diff --git a/src/game/game_129210.c b/src/game/game_129210.c index dd342a533..7e2f87963 100644 --- a/src/game/game_129210.c +++ b/src/game/game_129210.c @@ -19,8 +19,8 @@ GLOBAL_ASM( glabel func0f129210 /* f129210: 27bdffb8 */ addiu $sp,$sp,-72 -/* f129214: 3c0e800a */ lui $t6,0x800a -/* f129218: 8dcea2fc */ lw $t6,-0x5d04($t6) +/* f129214: 3c0e800a */ lui $t6,%hi(g_Vars+0x33c) +/* f129218: 8dcea2fc */ lw $t6,%lo(g_Vars+0x33c)($t6) /* f12921c: afbe0038 */ sw $s8,0x38($sp) /* f129220: afb70034 */ sw $s7,0x34($sp) /* f129224: 0080b825 */ or $s7,$a0,$zero diff --git a/src/game/game_129900.c b/src/game/game_129900.c index ccc6688fb..8b85df216 100644 --- a/src/game/game_129900.c +++ b/src/game/game_129900.c @@ -563,9 +563,9 @@ glabel func0f129f54 /* f129fd0: 00000000 */ sll $zero,$zero,0x0 /* f129fd4: 0fc2d5ee */ jal func0f0b57b8 /* f129fd8: afaa0158 */ sw $t2,0x158($sp) -/* f129fdc: 3c02800a */ lui $v0,%hi(var800a1bb0) +/* f129fdc: 3c02800a */ lui $v0,%hi(g_Vars+0x284) /* f129fe0: 8fa30164 */ lw $v1,0x164($sp) -/* f129fe4: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f129fe4: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f129fe8: 3c017f1b */ lui $at,%hi(var7f1b557c) /* f129fec: c4640000 */ lwc1 $f4,0x0($v1) /* f129ff0: c4461bb0 */ lwc1 $f6,0x1bb0($v0) @@ -580,7 +580,7 @@ glabel func0f129f54 /* f12a014: 46128381 */ sub.s $f14,$f16,$f18 /* f12a018: 460c6202 */ mul.s $f8,$f12,$f12 /* f12a01c: 8faa0158 */ lw $t2,0x158($sp) -/* f12a020: 24421bb0 */ addiu $v0,$v0,%lo(var800a1bb0) +/* f12a020: 24421bb0 */ addiu $v0,$v0,7088 /* f12a024: 460e7402 */ mul.s $f16,$f14,$f14 /* f12a028: 46083280 */ add.s $f10,$f6,$f8 /* f12a02c: 46105480 */ add.s $f18,$f10,$f16 @@ -652,8 +652,8 @@ glabel func0f129f54 /* f12a11c: 02c03025 */ or $a2,$s6,$zero /* f12a120: 18a00010 */ blez $a1,.L0f12a164 /* f12a124: 00008825 */ or $s1,$zero,$zero -/* f12a128: 3c02800a */ lui $v0,%hi(var800a0478) -/* f12a12c: 8c423430 */ lw $v0,0x3430($v0) +/* f12a128: 3c02800a */ lui $v0,%hi(var800a3430) +/* f12a12c: 8c423430 */ lw $v0,%lo(var800a3430)($v0) .L0f12a130: /* f12a130: 804e03cc */ lb $t6,0x3cc($v0) /* f12a134: 54ee0008 */ bnel $a3,$t6,.L0f12a158 @@ -668,7 +668,7 @@ glabel func0f129f54 .L0f12a158: /* f12a158: 0225082a */ slt $at,$s1,$a1 /* f12a15c: 1420fff4 */ bnez $at,.L0f12a130 -/* f12a160: 24420478 */ addiu $v0,$v0,%lo(var800a0478) +/* f12a160: 24420478 */ addiu $v0,$v0,1144 .L0f12a164: /* f12a164: 04c00011 */ bltz $a2,.L0f12a1ac /* f12a168: 3c11800a */ lui $s1,%hi(var800a3430) @@ -1411,10 +1411,10 @@ glabel func0f129f54 /* f12ac50: 3c017f1b */ lui $at,%hi(var7f1b5584) /* f12ac54: c4325584 */ lwc1 $f18,%lo(var7f1b5584)($at) /* f12ac58: a140001e */ sb $zero,0x1e($t2) -/* f12ac5c: 3c0d800a */ lui $t5,0x800a +/* f12ac5c: 3c0d800a */ lui $t5,%hi(g_Vars+0x314) /* f12ac60: 46122282 */ mul.s $f10,$f4,$f18 /* f12ac64: e54a0018 */ swc1 $f10,0x18($t2) -/* f12ac68: 8dada2d4 */ lw $t5,-0x5d2c($t5) +/* f12ac68: 8dada2d4 */ lw $t5,%lo(g_Vars+0x314)($t5) /* f12ac6c: 51a00005 */ beqzl $t5,.L0f12ac84 /* f12ac70: 8fa4009c */ lw $a0,0x9c($sp) /* f12ac74: 0fc4bd7e */ jal func0f12f5f8 @@ -1508,7 +1508,7 @@ glabel func0f12acec /* f12adb4: 26943430 */ addiu $s4,$s4,%lo(var800a3430) /* f12adb8: 00008825 */ or $s1,$zero,$zero /* f12adbc: 00008025 */ or $s0,$zero,$zero -/* f12adc0: 3c02800a */ lui $v0,%hi(var800a0478) +/* f12adc0: 3c02800a */ lui $v0,%hi(var800a3430) /* f12adc4: 3c014170 */ lui $at,0x4170 /* f12adc8: 46062280 */ add.s $f10,$f4,$f6 /* f12adcc: 2415002c */ addiu $s5,$zero,0x2c @@ -1520,7 +1520,7 @@ glabel func0f12acec /* f12ade4: 3c138008 */ lui $s3,%hi(g_ExplosionTypes) /* f12ade8: 2673e4b8 */ addiu $s3,$s3,%lo(g_ExplosionTypes) /* f12adec: c438558c */ lwc1 $f24,%lo(var7f1b558c)($at) -/* f12adf0: 8c423430 */ lw $v0,0x3430($v0) +/* f12adf0: 8c423430 */ lw $v0,%lo(var800a3430)($v0) .L0f12adf4: /* f12adf4: 8c430000 */ lw $v1,0x0($v0) /* f12adf8: 50600022 */ beqzl $v1,.L0f12ae84 @@ -1563,7 +1563,7 @@ glabel func0f12acec /* f12ae84: 0204082a */ slt $at,$s0,$a0 /* f12ae88: 26310478 */ addiu $s1,$s1,0x478 /* f12ae8c: 1420ffd9 */ bnez $at,.L0f12adf4 -/* f12ae90: 24420478 */ addiu $v0,$v0,%lo(var800a0478) +/* f12ae90: 24420478 */ addiu $v0,$v0,1144 .L0f12ae94: /* f12ae94: 3c038008 */ lui $v1,%hi(var8007e4a4) /* f12ae98: 2463e4a4 */ addiu $v1,$v1,%lo(var8007e4a4) diff --git a/src/game/game_12d3f0.c b/src/game/game_12d3f0.c index df4b1e84f..b6abc022e 100644 --- a/src/game/game_12d3f0.c +++ b/src/game/game_12d3f0.c @@ -56,19 +56,19 @@ glabel func0f12d3f0 /* f12d434: 3c048008 */ lui $a0,0x8008 /* f12d438: 95cf0006 */ lhu $t7,0x6($t6) /* f12d43c: 84e60024 */ lh $a2,0x24($a3) -/* f12d440: 3c08800a */ lui $t0,%hi(var800a1bb0) +/* f12d440: 3c08800a */ lui $t0,%hi(g_Vars+0x284) /* f12d444: 000fc242 */ srl $t8,$t7,0x9 /* f12d448: 0018c8c0 */ sll $t9,$t8,0x3 /* f12d44c: 0338c821 */ addu $t9,$t9,$t8 /* f12d450: 0019c880 */ sll $t9,$t9,0x2 /* f12d454: 00992021 */ addu $a0,$a0,$t9 /* f12d458: 8484e942 */ lh $a0,-0x16be($a0) -/* f12d45c: 8d08a244 */ lw $t0,-0x5dbc($t0) +/* f12d45c: 8d08a244 */ lw $t0,%lo(g_Vars+0x284)($t0) /* f12d460: 8fa500b4 */ lw $a1,0xb4($sp) /* f12d464: 0086082a */ slt $at,$a0,$a2 /* f12d468: 00401825 */ or $v1,$v0,$zero /* f12d46c: 1420002b */ bnez $at,.L0f12d51c -/* f12d470: 25081bb0 */ addiu $t0,$t0,%lo(var800a1bb0) +/* f12d470: 25081bb0 */ addiu $t0,$t0,7088 /* f12d474: 44843000 */ mtc1 $a0,$f6 /* f12d478: c4e40020 */ lwc1 $f4,0x20($a3) /* f12d47c: 240b0001 */ addiu $t3,$zero,0x1 @@ -378,14 +378,14 @@ glabel func0f12d3f0 /* f12d90c: 45010005 */ bc1t .L0f12d924 /* f12d910: 00000000 */ sll $zero,$zero,0x0 /* f12d914: 4600303c */ c.lt.s $f6,$f0 -/* f12d918: 3c02800a */ lui $v0,0x800a +/* f12d918: 3c02800a */ lui $v0,%hi(g_Vars+0x284) /* f12d91c: 45000003 */ bc1f .L0f12d92c /* f12d920: 00000000 */ sll $zero,$zero,0x0 .L0f12d924: /* f12d924: 10000221 */ beqz $zero,.L0f12e1ac /* f12d928: 02201025 */ or $v0,$s1,$zero .L0f12d92c: -/* f12d92c: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f12d92c: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f12d930: 24010001 */ addiu $at,$zero,0x1 /* f12d934: c7aa0068 */ lwc1 $f10,0x68($sp) /* f12d938: 944f0010 */ lhu $t7,0x10($v0) @@ -410,8 +410,8 @@ glabel func0f12d3f0 /* f12d984: 46000202 */ mul.s $f8,$f0,$f0 /* f12d988: 0c012974 */ jal sqrtf /* f12d98c: 460a4300 */ add.s $f12,$f8,$f10 -/* f12d990: 3c18800a */ lui $t8,0x800a -/* f12d994: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f12d990: 3c18800a */ lui $t8,%hi(g_Vars+0x284) +/* f12d994: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f12d998: 8fa500b4 */ lw $a1,0xb4($sp) /* f12d99c: 8fa900c4 */ lw $t1,0xc4($sp) /* f12d9a0: c70c0024 */ lwc1 $f12,0x24($t8) @@ -1450,8 +1450,8 @@ glabel func0f12e820 GLOBAL_ASM( glabel func0f12e848 /* f12e848: 27bdff30 */ addiu $sp,$sp,-208 -/* f12e84c: 3c0e800a */ lui $t6,0x800a -/* f12e850: 8dce9ff4 */ lw $t6,-0x600c($t6) +/* f12e84c: 3c0e800a */ lui $t6,%hi(g_Vars+0x34) +/* f12e850: 8dce9ff4 */ lw $t6,%lo(g_Vars+0x34)($t6) /* f12e854: afbf0074 */ sw $ra,0x74($sp) /* f12e858: afbe0070 */ sw $s8,0x70($sp) /* f12e85c: afb7006c */ sw $s7,0x6c($sp) @@ -1474,8 +1474,8 @@ glabel func0f12e848 /* f12e8a0: 10000226 */ beqz $zero,.L0f12f13c /* f12e8a4: 00001025 */ or $v0,$zero,$zero .L0f12e8a8: -/* f12e8a8: 3c02800a */ lui $v0,%hi(var800a0004) -/* f12e8ac: 8c429ff8 */ lw $v0,-0x6008($v0) +/* f12e8a8: 3c02800a */ lui $v0,%hi(g_Vars+0x38) +/* f12e8ac: 8c429ff8 */ lw $v0,%lo(g_Vars+0x38)($v0) /* f12e8b0: 264b0008 */ addiu $t3,$s2,0x8 /* f12e8b4: 24150190 */ addiu $s5,$zero,0x190 /* f12e8b8: 2841000f */ slti $at,$v0,0xf @@ -1756,18 +1756,18 @@ glabel func0f12e848 /* f12ecb8: 5020001e */ beqzl $at,.L0f12ed34 /* f12ecbc: 8e420198 */ lw $v0,0x198($s2) /* f12ecc0: 924b0006 */ lbu $t3,0x6($s2) -/* f12ecc4: 3c0a800a */ lui $t2,0x800a -/* f12ecc8: 8d4aa244 */ lw $t2,-0x5dbc($t2) +/* f12ecc4: 3c0a800a */ lui $t2,%hi(g_Vars+0x284) +/* f12ecc8: 8d4aa244 */ lw $t2,%lo(g_Vars+0x284)($t2) /* f12eccc: 316c0001 */ andi $t4,$t3,0x1 /* f12ecd0: 019e0019 */ multu $t4,$s8 -/* f12ecd4: 3c0f800a */ lui $t7,0x800a -/* f12ecd8: 3c0c800a */ lui $t4,0x800a +/* f12ecd4: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) +/* f12ecd8: 3c0c800a */ lui $t4,%hi(g_Vars+0x284) /* f12ecdc: 00006812 */ mflo $t5 /* f12ece0: 014d7021 */ addu $t6,$t2,$t5 /* f12ece4: c5c609ac */ lwc1 $f6,0x9ac($t6) /* f12ece8: e6060000 */ swc1 $f6,0x0($s0) /* f12ecec: 92580006 */ lbu $t8,0x6($s2) -/* f12ecf0: 8defa244 */ lw $t7,-0x5dbc($t7) +/* f12ecf0: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) /* f12ecf4: 33190001 */ andi $t9,$t8,0x1 /* f12ecf8: 033e0019 */ multu $t9,$s8 /* f12ecfc: 00004812 */ mflo $t1 @@ -1775,7 +1775,7 @@ glabel func0f12e848 /* f12ed04: c56a09b0 */ lwc1 $f10,0x9b0($t3) /* f12ed08: e60a0004 */ swc1 $f10,0x4($s0) /* f12ed0c: 924a0006 */ lbu $t2,0x6($s2) -/* f12ed10: 8d8ca244 */ lw $t4,-0x5dbc($t4) +/* f12ed10: 8d8ca244 */ lw $t4,%lo(g_Vars+0x284)($t4) /* f12ed14: 314d0001 */ andi $t5,$t2,0x1 /* f12ed18: 01be0019 */ multu $t5,$s8 /* f12ed1c: 00007012 */ mflo $t6 @@ -2014,7 +2014,7 @@ glabel func0f12e848 /* f12f078: 460c503c */ c.lt.s $f10,$f12 /* f12f07c: 00000000 */ sll $zero,$zero,0x0 /* f12f080: 45020003 */ bc1fl .L0f12f090 -/* f12f084: 24420004 */ addiu $v0,$v0,%lo(var800a0004) +/* f12f084: 24420004 */ addiu $v0,$v0,4 /* f12f088: e44c0000 */ swc1 $f12,0x0($v0) /* f12f08c: 24420004 */ addiu $v0,$v0,0x4 .L0f12f090: diff --git a/src/game/game_12f6c0.c b/src/game/game_12f6c0.c index 9bc0f7c39..a9c11c86d 100644 --- a/src/game/game_12f6c0.c +++ b/src/game/game_12f6c0.c @@ -644,13 +644,13 @@ glabel func0f12f9f0 /* f12ff80: 1320000b */ beqz $t9,.L0f12ffb0 /* f12ff84: 24060020 */ addiu $a2,$zero,0x20 /* f12ff88: 1321000d */ beq $t9,$at,.L0f12ffc0 -/* f12ff8c: 3c0b800a */ lui $t3,0x800a +/* f12ff8c: 3c0b800a */ lui $t3,%hi(g_Vars+0x4b4) /* f12ff90: 2401000a */ addiu $at,$zero,0xa /* f12ff94: 13210013 */ beq $t9,$at,.L0f12ffe4 -/* f12ff98: 3c0a800a */ lui $t2,0x800a +/* f12ff98: 3c0a800a */ lui $t2,%hi(g_Vars+0x4b4) /* f12ff9c: 2401000b */ addiu $at,$zero,0xb /* f12ffa0: 13210019 */ beq $t9,$at,.L0f130008 -/* f12ffa4: 3c0c800a */ lui $t4,0x800a +/* f12ffa4: 3c0c800a */ lui $t4,%hi(g_Vars+0x4b4) /* f12ffa8: 1000001f */ beqz $zero,.L0f130028 /* f12ffac: 240e0001 */ addiu $t6,$zero,0x1 .L0f12ffb0: @@ -659,7 +659,7 @@ glabel func0f12f9f0 /* f12ffb8: 1000001b */ beqz $zero,.L0f130028 /* f12ffbc: 240e0001 */ addiu $t6,$zero,0x1 .L0f12ffc0: -/* f12ffc0: 8d6ba474 */ lw $t3,-0x5b8c($t3) +/* f12ffc0: 8d6ba474 */ lw $t3,%lo(g_Vars+0x4b4)($t3) /* f12ffc4: 2401001c */ addiu $at,$zero,0x1c /* f12ffc8: 24050020 */ addiu $a1,$zero,0x20 /* f12ffcc: 11610015 */ beq $t3,$at,.L0f130024 @@ -669,7 +669,7 @@ glabel func0f12f9f0 /* f12ffdc: 10000012 */ beqz $zero,.L0f130028 /* f12ffe0: 240e0001 */ addiu $t6,$zero,0x1 .L0f12ffe4: -/* f12ffe4: 8d4aa474 */ lw $t2,-0x5b8c($t2) +/* f12ffe4: 8d4aa474 */ lw $t2,%lo(g_Vars+0x4b4)($t2) /* f12ffe8: 2401001c */ addiu $at,$zero,0x1c /* f12ffec: 24050040 */ addiu $a1,$zero,0x40 /* f12fff0: 1141000c */ beq $t2,$at,.L0f130024 @@ -679,7 +679,7 @@ glabel func0f12f9f0 /* f130000: 10000009 */ beqz $zero,.L0f130028 /* f130004: 240e0001 */ addiu $t6,$zero,0x1 .L0f130008: -/* f130008: 8d8ca474 */ lw $t4,-0x5b8c($t4) +/* f130008: 8d8ca474 */ lw $t4,%lo(g_Vars+0x4b4)($t4) /* f13000c: 2401001c */ addiu $at,$zero,0x1c /* f130010: 240500c8 */ addiu $a1,$zero,0xc8 /* f130014: 11810003 */ beq $t4,$at,.L0f130024 @@ -721,8 +721,8 @@ glabel func0f130044 /* f130088: f7b40028 */ sdc1 $f20,0x28($sp) /* f13008c: 11c003e0 */ beqz $t6,.L0f131010 /* f130090: afa40170 */ sw $a0,0x170($sp) -/* f130094: 3c10800a */ lui $s0,0x800a -/* f130098: 8e10a244 */ lw $s0,-0x5dbc($s0) +/* f130094: 3c10800a */ lui $s0,%hi(g_Vars+0x284) +/* f130098: 8e10a244 */ lw $s0,%lo(g_Vars+0x284)($s0) /* f13009c: 4480a000 */ mtc1 $zero,$f20 /* f1300a0: 27a40170 */ addiu $a0,$sp,0x170 /* f1300a4: c6021bc0 */ lwc1 $f2,0x1bc0($s0) @@ -878,9 +878,9 @@ glabel func0f130044 /* f1302d4: afb3016c */ sw $s3,0x16c($sp) /* f1302d8: 24110001 */ addiu $s1,$zero,0x1 /* f1302dc: 11800345 */ beqz $t4,.L0f130ff4 -/* f1302e0: 3c10800a */ lui $s0,0x800a +/* f1302e0: 3c10800a */ lui $s0,%hi(g_Vars+0x284) /* f1302e4: 8e620014 */ lw $v0,0x14($s3) -/* f1302e8: 8e10a244 */ lw $s0,-0x5dbc($s0) +/* f1302e8: 8e10a244 */ lw $s0,%lo(g_Vars+0x284)($s0) /* f1302ec: 4600c406 */ mov.s $f16,$f24 /* f1302f0: 10400007 */ beqz $v0,.L0f130310 /* f1302f4: 96030010 */ lhu $v1,0x10($s0) @@ -927,8 +927,8 @@ glabel func0f130044 /* f13038c: 46000482 */ mul.s $f18,$f0,$f0 /* f130390: 0c012974 */ jal sqrtf /* f130394: 460a9300 */ add.s $f12,$f18,$f10 -/* f130398: 3c10800a */ lui $s0,0x800a -/* f13039c: 8e10a244 */ lw $s0,-0x5dbc($s0) +/* f130398: 3c10800a */ lui $s0,%hi(g_Vars+0x284) +/* f13039c: 8e10a244 */ lw $s0,%lo(g_Vars+0x284)($s0) /* f1303a0: 3c014316 */ lui $at,0x4316 /* f1303a4: 44812000 */ mtc1 $at,$f4 /* f1303a8: c6020024 */ lwc1 $f2,0x24($s0) @@ -1003,8 +1003,8 @@ glabel func0f130044 /* f1304ac: 26750018 */ addiu $s5,$s3,0x18 /* f1304b0: 0fc59e73 */ jal func0f1679cc /* f1304b4: e7b00138 */ swc1 $f16,0x138($sp) -/* f1304b8: 3c10800a */ lui $s0,0x800a -/* f1304bc: 8e10a244 */ lw $s0,-0x5dbc($s0) +/* f1304b8: 3c10800a */ lui $s0,%hi(g_Vars+0x284) +/* f1304bc: 8e10a244 */ lw $s0,%lo(g_Vars+0x284)($s0) /* f1304c0: c7b00138 */ lwc1 $f16,0x138($sp) /* f1304c4: 00408825 */ or $s1,$v0,$zero /* f1304c8: 8e0400d8 */ lw $a0,0xd8($s0) diff --git a/src/game/game_131060.c b/src/game/game_131060.c index 444089692..6fee9ba02 100644 --- a/src/game/game_131060.c +++ b/src/game/game_131060.c @@ -56,10 +56,10 @@ glabel func0f131060 /* f131080: 3c028008 */ lui $v0,%hi(var8007fc00) /* f131084: 8c42fc00 */ lw $v0,%lo(var8007fc00)($v0) /* f131088: 24010013 */ addiu $at,$zero,0x13 -/* f13108c: 3c0e800a */ lui $t6,0x800a +/* f13108c: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) /* f131090: 5441000c */ bnel $v0,$at,.L0f1310c4 /* f131094: 2401000a */ addiu $at,$zero,0xa -/* f131098: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f131098: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f13109c: 3c01c4fa */ lui $at,0xc4fa /* f1310a0: 44813000 */ mtc1 $at,$f6 /* f1310a4: c5c41bb8 */ lwc1 $f4,0x1bb8($t6) @@ -72,8 +72,8 @@ glabel func0f131060 /* f1310c0: 2401000a */ addiu $at,$zero,0xa .L0f1310c4: /* f1310c4: 14410007 */ bne $v0,$at,.L0f1310e4 -/* f1310c8: 3c0f800a */ lui $t7,0x800a -/* f1310cc: 8defa26c */ lw $t7,-0x5d94($t7) +/* f1310c8: 3c0f800a */ lui $t7,%hi(g_Vars+0x2ac) +/* f1310cc: 8defa26c */ lw $t7,%lo(g_Vars+0x2ac)($t7) /* f1310d0: 24010006 */ addiu $at,$zero,0x6 /* f1310d4: 51e10004 */ beql $t7,$at,.L0f1310e8 /* f1310d8: 8fb80030 */ lw $t8,0x30($sp) diff --git a/src/game/game_135c70.c b/src/game/game_135c70.c index 104c47a04..bd1313a02 100644 --- a/src/game/game_135c70.c +++ b/src/game/game_135c70.c @@ -405,9 +405,9 @@ glabel func0f1360e8 /* f1361b4: 240d0001 */ addiu $t5,$zero,0x1 /* f1361b8: ad0d0000 */ sw $t5,0x0($t0) /* f1361bc: 240e0640 */ addiu $t6,$zero,0x640 -/* f1361c0: 3c01800a */ lui $at,0x800a +/* f1361c0: 3c01800a */ lui $at,%hi(var800a4150) /* f1361c4: 10000018 */ beqz $zero,.L0f136228 -/* f1361c8: ac2e4150 */ sw $t6,0x4150($at) +/* f1361c8: ac2e4150 */ sw $t6,%lo(var800a4150)($at) .L0f1361cc: /* f1361cc: 24010030 */ addiu $at,$zero,0x30 /* f1361d0: 10410003 */ beq $v0,$at,.L0f1361e0 @@ -415,8 +415,8 @@ glabel func0f1360e8 /* f1361d8: 24010022 */ addiu $at,$zero,0x22 /* f1361dc: 14410005 */ bne $v0,$at,.L0f1361f4 .L0f1361e0: -/* f1361e0: 3c01800a */ lui $at,0x800a -/* f1361e4: ac2f4150 */ sw $t7,0x4150($at) +/* f1361e0: 3c01800a */ lui $at,%hi(var800a4150) +/* f1361e4: ac2f4150 */ sw $t7,%lo(var800a4150)($at) /* f1361e8: 24180002 */ addiu $t8,$zero,0x2 /* f1361ec: 1000000e */ beqz $zero,.L0f136228 /* f1361f0: ac780000 */ sw $t8,0x0($v1) @@ -427,12 +427,12 @@ glabel func0f1360e8 /* f136200: 24190001 */ addiu $t9,$zero,0x1 /* f136204: ad190000 */ sw $t9,0x0($t0) /* f136208: 240904b0 */ addiu $t1,$zero,0x4b0 -/* f13620c: 3c01800a */ lui $at,0x800a +/* f13620c: 3c01800a */ lui $at,%hi(var800a4150) /* f136210: 10000005 */ beqz $zero,.L0f136228 -/* f136214: ac294150 */ sw $t1,0x4150($at) +/* f136214: ac294150 */ sw $t1,%lo(var800a4150)($at) .L0f136218: -/* f136218: 3c01800a */ lui $at,0x800a -/* f13621c: ac2a4150 */ sw $t2,0x4150($at) +/* f136218: 3c01800a */ lui $at,%hi(var800a4150) +/* f13621c: ac2a4150 */ sw $t2,%lo(var800a4150)($at) /* f136220: 240b0002 */ addiu $t3,$zero,0x2 /* f136224: ac6b0000 */ sw $t3,0x0($v1) .L0f136228: @@ -509,10 +509,10 @@ glabel func0f1360e8 /* f13633c: 8c8c0000 */ lw $t4,0x0($a0) .L0f136340: /* f136340: 00035880 */ sll $t3,$v1,0x2 -/* f136344: 3c01800a */ lui $at,0x800a +/* f136344: 3c01800a */ lui $at,%hi(var800a4154) /* f136348: 016c7021 */ addu $t6,$t3,$t4 /* f13634c: 0fc4d71c */ jal func0f135c70 -/* f136350: ac2e4154 */ sw $t6,0x4154($at) +/* f136350: ac2e4154 */ sw $t6,%lo(var800a4154)($at) /* f136354: 3c0d800a */ lui $t5,%hi(var800a4150) /* f136358: 8dad4150 */ lw $t5,%lo(var800a4150)($t5) /* f13635c: 3c013f80 */ lui $at,0x3f80 diff --git a/src/game/game_1371b0.c b/src/game/game_1371b0.c index 15d4b56c7..d631aff1d 100644 --- a/src/game/game_1371b0.c +++ b/src/game/game_1371b0.c @@ -1037,7 +1037,7 @@ glabel var7f1b57f8 /* f13800c: 460a3603 */ div.s $f24,$f6,$f10 /* f138010: 44908000 */ mtc1 $s0,$f16 .L0f138014: -/* f138014: 3c02800a */ lui $v0,%hi(var800a0004) +/* f138014: 3c02800a */ lui $v0,%hi(var800a4170) /* f138018: 3c0b800a */ lui $t3,%hi(var800a4170) /* f13801c: 468084a0 */ cvt.s.w $f18,$f16 /* f138020: 461a9102 */ mul.s $f4,$f18,$f26 @@ -1053,7 +1053,7 @@ glabel var7f1b57f8 /* f138048: 00000000 */ sll $zero,$zero,0x0 /* f13804c: 45000043 */ bc1f .L0f13815c /* f138050: 00000000 */ sll $zero,$zero,0x0 -/* f138054: 8c424170 */ lw $v0,0x4170($v0) +/* f138054: 8c424170 */ lw $v0,%lo(var800a4170)($v0) /* f138058: 00106900 */ sll $t5,$s0,0x4 /* f13805c: 4616a401 */ sub.s $f16,$f20,$f22 /* f138060: 004dc821 */ addu $t9,$v0,$t5 @@ -1181,7 +1181,7 @@ glabel var7f1b57f8 /* f138220: 26100001 */ addiu $s0,$s0,0x1 .L0f138224: /* f138224: 1613fff2 */ bne $s0,$s3,.L0f1381f0 -/* f138228: 24420004 */ addiu $v0,$v0,%lo(var800a0004) +/* f138228: 24420004 */ addiu $v0,$v0,4 .L0f13822c: /* f13822c: 06200017 */ bltz $s1,.L0f13828c /* f138230: 8fa400f8 */ lw $a0,0xf8($sp) @@ -4467,10 +4467,10 @@ glabel var7f1b5930 /* f13af30: 3c05800a */ lui $a1,%hi(var800a4164) /* f13af34: 24a54164 */ addiu $a1,$a1,%lo(var800a4164) /* f13af38: 8ca20000 */ lw $v0,0x0($a1) -/* f13af3c: 3c03800a */ lui $v1,0x800a -/* f13af40: 8c63a000 */ lw $v1,-0x6000($v1) -/* f13af44: 3c01800a */ lui $at,0x800a -/* f13af48: ac224168 */ sw $v0,0x4168($at) +/* f13af3c: 3c03800a */ lui $v1,%hi(g_Vars+0x40) +/* f13af40: 8c63a000 */ lw $v1,%lo(g_Vars+0x40)($v1) +/* f13af44: 3c01800a */ lui $at,%hi(var800a4168) +/* f13af48: ac224168 */ sw $v0,%lo(var800a4168)($at) /* f13af4c: 240112c0 */ addiu $at,$zero,0x12c0 /* f13af50: 00835821 */ addu $t3,$a0,$v1 /* f13af54: 0161001b */ divu $zero,$t3,$at @@ -4646,9 +4646,9 @@ glabel var7f1b5948 /* f13b19c: 8ce30000 */ lw $v1,0x0($a3) .L0f13b1a0: /* f13b1a0: 3c028008 */ lui $v0,%hi(var8007f6dc) -/* f13b1a4: 3c0b800a */ lui $t3,0x800a +/* f13b1a4: 3c0b800a */ lui $t3,%hi(g_Vars+0x40) /* f13b1a8: 8c42f6dc */ lw $v0,%lo(var8007f6dc)($v0) -/* f13b1ac: 8d6ba000 */ lw $t3,-0x6000($t3) +/* f13b1ac: 8d6ba000 */ lw $t3,%lo(g_Vars+0x40)($t3) /* f13b1b0: 44800000 */ mtc1 $zero,$f0 /* f13b1b4: 004b1021 */ addu $v0,$v0,$t3 /* f13b1b8: 2c413841 */ sltiu $at,$v0,0x3841 @@ -4837,13 +4837,13 @@ glabel var7f1b5948 /* f13b478: 3c048006 */ lui $a0,%hi(var800624e4) /* f13b47c: 0c003a57 */ jal func0000e95c /* f13b480: 8c8424e4 */ lw $a0,%lo(var800624e4)($a0) -/* f13b484: 3c01800a */ lui $at,0x800a -/* f13b488: ac20a254 */ sw $zero,-0x5dac($at) +/* f13b484: 3c01800a */ lui $at,%hi(g_Vars+0x294) +/* f13b488: ac20a254 */ sw $zero,%lo(g_Vars+0x294)($at) /* f13b48c: 2402ffff */ addiu $v0,$zero,-1 -/* f13b490: 3c01800a */ lui $at,0x800a -/* f13b494: ac22a258 */ sw $v0,-0x5da8($at) -/* f13b498: 3c01800a */ lui $at,0x800a -/* f13b49c: ac22a25c */ sw $v0,-0x5da4($at) +/* f13b490: 3c01800a */ lui $at,%hi(g_Vars+0x298) +/* f13b494: ac22a258 */ sw $v0,%lo(g_Vars+0x298)($at) +/* f13b498: 3c01800a */ lui $at,%hi(g_Vars+0x29c) +/* f13b49c: ac22a25c */ sw $v0,%lo(g_Vars+0x29c)($at) /* f13b4a0: 0fc5b36a */ jal setDifficulty /* f13b4a4: 00002025 */ or $a0,$zero,$zero /* f13b4a8: 0c0027b1 */ jal func00009ec4 @@ -4867,11 +4867,11 @@ glabel var7f1b5950 glabel var7f1b5954 .word 0x3b80c73b .text -/* f13b4c4: 3c01800a */ lui $at,0x800a -/* f13b4c8: ac204164 */ sw $zero,0x4164($at) -/* f13b4cc: 3c01800a */ lui $at,0x800a +/* f13b4c4: 3c01800a */ lui $at,%hi(var800a4164) +/* f13b4c8: ac204164 */ sw $zero,%lo(var800a4164)($at) +/* f13b4cc: 3c01800a */ lui $at,%hi(var800a416c) /* f13b4d0: 27bdffc8 */ addiu $sp,$sp,-56 -/* f13b4d4: ac20416c */ sw $zero,0x416c($at) +/* f13b4d4: ac20416c */ sw $zero,%lo(var800a416c)($at) /* f13b4d8: afbf0034 */ sw $ra,0x34($sp) /* f13b4dc: 3c018008 */ lui $at,0x8008 /* f13b4e0: afb00030 */ sw $s0,0x30($sp) diff --git a/src/game/game_13b670.c b/src/game/game_13b670.c index bf28e4829..77575389c 100644 --- a/src/game/game_13b670.c +++ b/src/game/game_13b670.c @@ -469,8 +469,8 @@ glabel var7f1b598c /* f13bc78: 2406ffff */ addiu $a2,$zero,-1 /* f13bc7c: 1860000c */ blez $v1,.L0f13bcb0 /* f13bc80: 00008825 */ or $s1,$zero,$zero -/* f13bc84: 3c02800a */ lui $v0,%hi(var800a000c) -/* f13bc88: 8c424194 */ lw $v0,0x4194($v0) +/* f13bc84: 3c02800a */ lui $v0,%hi(var800a4194) +/* f13bc88: 8c424194 */ lw $v0,%lo(var800a4194)($v0) .L0f13bc8c: /* f13bc8c: 944e0000 */ lhu $t6,0x0($v0) /* f13bc90: 548e0004 */ bnel $a0,$t6,.L0f13bca4 @@ -481,11 +481,11 @@ glabel var7f1b598c .L0f13bca4: /* f13bca4: 0223082a */ slt $at,$s1,$v1 /* f13bca8: 1420fff8 */ bnez $at,.L0f13bc8c -/* f13bcac: 2442000c */ addiu $v0,$v0,%lo(var800a000c) +/* f13bcac: 2442000c */ addiu $v0,$v0,12 .L0f13bcb0: /* f13bcb0: 2401ffff */ addiu $at,$zero,-1 /* f13bcb4: 10c100e7 */ beq $a2,$at,.L0f13c054 -/* f13bcb8: 3c03800a */ lui $v1,0x800a +/* f13bcb8: 3c03800a */ lui $v1,%hi(g_Vars+0xc) /* f13bcbc: 3c0f800a */ lui $t7,%hi(var800a4194) /* f13bcc0: 8def4194 */ lw $t7,%lo(var800a4194)($t7) /* f13bcc4: 0006a080 */ sll $s4,$a2,0x2 @@ -493,7 +493,7 @@ glabel var7f1b598c /* f13bccc: 0014a080 */ sll $s4,$s4,0x2 /* f13bcd0: 01f41021 */ addu $v0,$t7,$s4 /* f13bcd4: 8c580008 */ lw $t8,0x8($v0) -/* f13bcd8: 8c639fcc */ lw $v1,-0x6034($v1) +/* f13bcd8: 8c639fcc */ lw $v1,%lo(g_Vars+0xc)($v1) /* f13bcdc: 507800de */ beql $v1,$t8,.L0f13c058 /* f13bce0: 8fbf0034 */ lw $ra,0x34($sp) /* f13bce4: 94590004 */ lhu $t9,0x4($v0) @@ -732,8 +732,8 @@ glabel var7f1b598c /* f13c03c: 022d082a */ slt $at,$s1,$t5 /* f13c040: 5420ff31 */ bnezl $at,.L0f13bd08 /* f13c044: 944c0002 */ lhu $t4,0x2($v0) -/* f13c048: 3c03800a */ lui $v1,0x800a -/* f13c04c: 8c639fcc */ lw $v1,-0x6034($v1) +/* f13c048: 3c03800a */ lui $v1,%hi(g_Vars+0xc) +/* f13c04c: 8c639fcc */ lw $v1,%lo(g_Vars+0xc)($v1) .L0f13c050: /* f13c050: ac430008 */ sw $v1,0x8($v0) .L0f13c054: @@ -964,10 +964,10 @@ glabel func0f13c370 /* f13c380: 3c038008 */ lui $v1,%hi(var8007f6f0) /* f13c384: 8c63f6f0 */ lw $v1,%lo(var8007f6f0)($v1) /* f13c388: 00001025 */ or $v0,$zero,$zero -/* f13c38c: 3c05800a */ lui $a1,%hi(var800a000c) +/* f13c38c: 3c05800a */ lui $a1,%hi(var800a4194) /* f13c390: 18600009 */ blez $v1,.L0f13c3b8 /* f13c394: 00000000 */ sll $zero,$zero,0x0 -/* f13c398: 8ca54194 */ lw $a1,0x4194($a1) +/* f13c398: 8ca54194 */ lw $a1,%lo(var800a4194)($a1) .L0f13c39c: /* f13c39c: 94b80000 */ lhu $t8,0x0($a1) /* f13c3a0: 24420001 */ addiu $v0,$v0,0x1 @@ -975,7 +975,7 @@ glabel func0f13c370 /* f13c3a8: 10980010 */ beq $a0,$t8,.L0f13c3ec /* f13c3ac: 00000000 */ sll $zero,$zero,0x0 /* f13c3b0: 1420fffa */ bnez $at,.L0f13c39c -/* f13c3b4: 24a5000c */ addiu $a1,$a1,%lo(var800a000c) +/* f13c3b4: 24a5000c */ addiu $a1,$a1,12 .L0f13c3b8: /* f13c3b8: 3c19800a */ lui $t9,%hi(var800a4194) /* f13c3bc: 8f394194 */ lw $t9,%lo(var800a4194)($t9) @@ -1010,15 +1010,15 @@ glabel func0f13c3f4 /* f13c41c: ac20f6f4 */ sw $zero,-0x90c($at) /* f13c420: 3c018008 */ lui $at,0x8008 /* f13c424: ac20f6f8 */ sw $zero,-0x908($at) -/* f13c428: 3c01800a */ lui $at,0x800a +/* f13c428: 3c01800a */ lui $at,%hi(var800a4180) /* f13c42c: 240e04b0 */ addiu $t6,$zero,0x4b0 /* f13c430: 3c06800a */ lui $a2,%hi(var800a4184) -/* f13c434: ac2e4180 */ sw $t6,0x4180($at) +/* f13c434: ac2e4180 */ sw $t6,%lo(var800a4180)($at) /* f13c438: 24c64184 */ addiu $a2,$a2,%lo(var800a4184) /* f13c43c: 24030032 */ addiu $v1,$zero,0x32 /* f13c440: acc30000 */ sw $v1,0x0($a2) -/* f13c444: 3c01800a */ lui $at,0x800a -/* f13c448: ac234188 */ sw $v1,0x4188($at) +/* f13c444: 3c01800a */ lui $at,%hi(var800a4188) +/* f13c448: ac234188 */ sw $v1,%lo(var800a4188)($at) /* f13c44c: 8cc40000 */ lw $a0,0x0($a2) /* f13c450: 27bdffd8 */ addiu $sp,$sp,-40 /* f13c454: afbf0014 */ sw $ra,0x14($sp) @@ -1031,8 +1031,8 @@ glabel func0f13c3f4 /* f13c470: 24050004 */ addiu $a1,$zero,0x4 /* f13c474: 3c04800a */ lui $a0,%hi(var800a4180) /* f13c478: 8c844180 */ lw $a0,%lo(var800a4180)($a0) -/* f13c47c: 3c01800a */ lui $at,0x800a -/* f13c480: ac224190 */ sw $v0,0x4190($at) +/* f13c47c: 3c01800a */ lui $at,%hi(var800a4190) +/* f13c480: ac224190 */ sw $v0,%lo(var800a4190)($at) /* f13c484: 00044080 */ sll $t0,$a0,0x2 /* f13c488: 01044023 */ subu $t0,$t0,$a0 /* f13c48c: 00084040 */ sll $t0,$t0,0x1 @@ -1043,8 +1043,8 @@ glabel func0f13c3f4 /* f13c4a0: 24050004 */ addiu $a1,$zero,0x4 /* f13c4a4: 3c04800a */ lui $a0,%hi(var800a4188) /* f13c4a8: 8c844188 */ lw $a0,%lo(var800a4188)($a0) -/* f13c4ac: 3c01800a */ lui $at,0x800a -/* f13c4b0: ac22418c */ sw $v0,0x418c($at) +/* f13c4ac: 3c01800a */ lui $at,%hi(var800a418c) +/* f13c4b0: ac22418c */ sw $v0,%lo(var800a418c)($at) /* f13c4b4: 00045880 */ sll $t3,$a0,0x2 /* f13c4b8: 01645823 */ subu $t3,$t3,$a0 /* f13c4bc: 000b5880 */ sll $t3,$t3,0x2 @@ -1054,8 +1054,8 @@ glabel func0f13c3f4 /* f13c4cc: 0c0048f2 */ jal malloc /* f13c4d0: 24050004 */ addiu $a1,$zero,0x4 /* f13c4d4: 8fbf0014 */ lw $ra,0x14($sp) -/* f13c4d8: 3c01800a */ lui $at,0x800a -/* f13c4dc: ac224194 */ sw $v0,0x4194($at) +/* f13c4d8: 3c01800a */ lui $at,%hi(var800a4194) +/* f13c4dc: ac224194 */ sw $v0,%lo(var800a4194)($at) /* f13c4e0: 03e00008 */ jr $ra /* f13c4e4: 27bd0028 */ addiu $sp,$sp,0x28 /* f13c4e8: 03e00008 */ jr $ra diff --git a/src/game/game_13c510.c b/src/game/game_13c510.c index 41b760259..160b96637 100644 --- a/src/game/game_13c510.c +++ b/src/game/game_13c510.c @@ -263,8 +263,8 @@ glabel func0f13c780 /* f13c7c4: 0c000913 */ jal func0000244c /* f13c7c8: afa401d8 */ sw $a0,0x1d8($sp) /* f13c7cc: 8fa501d8 */ lw $a1,0x1d8($sp) -/* f13c7d0: 3c0e800a */ lui $t6,0x800a -/* f13c7d4: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f13c7d0: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f13c7d4: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f13c7d8: 0005c8c0 */ sll $t9,$a1,0x3 /* f13c7dc: 3c18800a */ lui $t8,%hi(g_RoomPtrs) /* f13c7e0: 0325c821 */ addu $t9,$t9,$a1 @@ -1442,7 +1442,7 @@ glabel func0f13d568 /* f13d8fc: 00000000 */ sll $zero,$zero,0x0 /* f13d900: 00000000 */ sll $zero,$zero,0x0 /* f13d904: 03030019 */ multu $t8,$v1 -/* f13d908: 3c03800a */ lui $v1,0x800a +/* f13d908: 3c03800a */ lui $v1,%hi(g_Vars+0x284) /* f13d90c: 0000b012 */ mflo $s6 /* f13d910: 16210004 */ bne $s1,$at,.L0f13d924 /* f13d914: 240100ff */ addiu $at,$zero,0xff @@ -1464,7 +1464,7 @@ glabel func0f13d568 .L0f13d948: /* f13d948: afac00cc */ sw $t4,0xcc($sp) .L0f13d94c: -/* f13d94c: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f13d94c: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f13d950: 8c6d00d8 */ lw $t5,0xd8($v1) /* f13d954: 55a0001f */ bnezl $t5,.L0f13d9d4 /* f13d958: 926d0002 */ lbu $t5,0x2($s3) @@ -1535,8 +1535,8 @@ glabel func0f13d568 /* f13da50: 000c6880 */ sll $t5,$t4,0x2 /* f13da54: 01ac6821 */ addu $t5,$t5,$t4 /* f13da58: 000d6880 */ sll $t5,$t5,0x2 -/* f13da5c: 3c07800a */ lui $a3,%hi(var800a0004) -/* f13da60: 8ce7a244 */ lw $a3,-0x5dbc($a3) +/* f13da5c: 3c07800a */ lui $a3,%hi(g_Vars+0x284) +/* f13da60: 8ce7a244 */ lw $a3,%lo(g_Vars+0x284)($a3) /* f13da64: 27a300fc */ addiu $v1,$sp,0xfc /* f13da68: 8fa20140 */ lw $v0,0x140($sp) /* f13da6c: 27a400f0 */ addiu $a0,$sp,0xf0 @@ -1566,7 +1566,7 @@ glabel func0f13d568 /* f13dac4: 46809120 */ cvt.s.w $f4,$f18 /* f13dac8: 24840004 */ addiu $a0,$a0,0x4 /* f13dacc: 24c60004 */ addiu $a2,$a2,0x4 -/* f13dad0: 24e70004 */ addiu $a3,$a3,%lo(var800a0004) +/* f13dad0: 24e70004 */ addiu $a3,$a3,4 /* f13dad4: 46048200 */ add.s $f8,$f16,$f4 /* f13dad8: e488fffc */ swc1 $f8,-0x4($a0) /* f13dadc: c4ea1bac */ lwc1 $f10,0x1bac($a3) @@ -1632,8 +1632,8 @@ glabel func0f13d568 .L0f13dbc0: /* f13dbc0: 3c017f1b */ lui $at,%hi(var7f1b59f4) /* f13dbc4: c42a59f4 */ lwc1 $f10,%lo(var7f1b59f4)($at) -/* f13dbc8: 3c03800a */ lui $v1,0x800a -/* f13dbcc: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f13dbc8: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f13dbcc: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f13dbd0: 460a3402 */ mul.s $f16,$f6,$f10 /* f13dbd4: 8c6d00d8 */ lw $t5,0xd8($v1) /* f13dbd8: 4610b582 */ mul.s $f22,$f22,$f16 @@ -1787,8 +1787,8 @@ glabel func0f13d568 /* f13de0c: 3c013e00 */ lui $at,0x3e00 .L0f13de10: /* f13de10: 44812000 */ mtc1 $at,$f4 -/* f13de14: 3c03800a */ lui $v1,0x800a -/* f13de18: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f13de14: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f13de18: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f13de1c: 46048282 */ mul.s $f10,$f16,$f4 /* f13de20: 8c7800d8 */ lw $t8,0xd8($v1) /* f13de24: 460a0002 */ mul.s $f0,$f0,$f10 diff --git a/src/game/game_141820.c b/src/game/game_141820.c index ac5bf7cb3..3eccad842 100644 --- a/src/game/game_141820.c +++ b/src/game/game_141820.c @@ -6268,22 +6268,22 @@ glabel func0f1472fc /* f147390: 0c004c4c */ jal strcpy /* f147394: 248441c0 */ addiu $a0,$a0,%lo(var800a41c0) /* f147398: 241900bc */ addiu $t9,$zero,0xbc -/* f14739c: 3c01800a */ lui $at,0x800a -/* f1473a0: a039caec */ sb $t9,-0x3514($at) -/* f1473a4: 3c01800a */ lui $at,0x800a +/* f14739c: 3c01800a */ lui $at,%hi(var8009caec) +/* f1473a0: a039caec */ sb $t9,%lo(var8009caec)($at) +/* f1473a4: 3c01800a */ lui $at,%hi(var8009caec+0x3) /* f1473a8: 240800be */ addiu $t0,$zero,0xbe -/* f1473ac: a028caef */ sb $t0,-0x3511($at) -/* f1473b0: 3c01800a */ lui $at,0x800a +/* f1473ac: a028caef */ sb $t0,%lo(var8009caec+0x3)($at) +/* f1473b0: 3c01800a */ lui $at,%hi(var8009caf0) /* f1473b4: 240900de */ addiu $t1,$zero,0xde -/* f1473b8: a029caf0 */ sb $t1,-0x3510($at) -/* f1473bc: 3c01800a */ lui $at,0x800a +/* f1473b8: a029caf0 */ sb $t1,%lo(var8009caf0)($at) +/* f1473bc: 3c01800a */ lui $at,%hi(var8009caec+0x1) /* f1473c0: 240a0050 */ addiu $t2,$zero,0x50 -/* f1473c4: a02acaed */ sb $t2,-0x3513($at) +/* f1473c4: a02acaed */ sb $t2,%lo(var8009caec+0x1)($at) /* f1473c8: 3c10800a */ lui $s0,%hi(g_Vars) -/* f1473cc: 3c01800a */ lui $at,0x800a +/* f1473cc: 3c01800a */ lui $at,%hi(var8009caec+0x2) /* f1473d0: 240b00c0 */ addiu $t3,$zero,0xc0 /* f1473d4: 26109fc0 */ addiu $s0,$s0,%lo(g_Vars) -/* f1473d8: a02bcaee */ sb $t3,-0x3512($at) +/* f1473d8: a02bcaee */ sb $t3,%lo(var8009caec+0x2)($at) /* f1473dc: 8e0c0284 */ lw $t4,0x284($s0) /* f1473e0: 8d8d00bc */ lw $t5,0xbc($t4) /* f1473e4: 0fc00270 */ jal func0f0009c0 @@ -6296,7 +6296,7 @@ glabel func0f1472fc /* f147400: 00403025 */ or $a2,$v0,$zero .L0f147404: /* f147404: 8e0e0288 */ lw $t6,0x288($s0) -/* f147408: 3c19800a */ lui $t9,%hi(g_MenuStack) +/* f147408: 3c19800a */ lui $t9,%hi(g_MenuStack+0x4f8) /* f14740c: 02202025 */ or $a0,$s1,$zero /* f147410: 8dcf0070 */ lw $t7,0x70($t6) /* f147414: 3c0500ff */ lui $a1,0xff @@ -6308,7 +6308,7 @@ glabel func0f1472fc /* f14742c: 030fc023 */ subu $t8,$t8,$t7 /* f147430: 0018c100 */ sll $t8,$t8,0x4 /* f147434: 0338c821 */ addu $t9,$t9,$t8 -/* f147438: 8f39e4f8 */ lw $t9,%lo(g_MenuStack)($t9) +/* f147438: 8f39e4f8 */ lw $t9,%lo(g_MenuStack+0x4f8)($t9) /* f14743c: 57200005 */ bnezl $t9,.L0f147454 /* f147440: 02201025 */ or $v0,$s1,$zero /* f147444: 0fc5090e */ jal func0f142438 @@ -6578,13 +6578,13 @@ glabel func0f147578 /* f1477f8: 1605ffec */ bne $s0,$a1,.L0f1477ac /* f1477fc: a46f1c62 */ sh $t7,0x1c62($v1) .L0f147800: -/* f147800: 3c01800a */ lui $at,0x800a -/* f147804: a028caec */ sb $t0,-0x3514($at) +/* f147800: 3c01800a */ lui $at,%hi(var8009caec) +/* f147804: a028caec */ sb $t0,%lo(var8009caec)($at) /* f147808: 240300de */ addiu $v1,$zero,0xde -/* f14780c: 3c01800a */ lui $at,0x800a -/* f147810: a023caef */ sb $v1,-0x3511($at) -/* f147814: 3c01800a */ lui $at,0x800a -/* f147818: a023caf0 */ sb $v1,-0x3510($at) +/* f14780c: 3c01800a */ lui $at,%hi(var8009caec+0x3) +/* f147810: a023caef */ sb $v1,%lo(var8009caec+0x3)($at) +/* f147814: 3c01800a */ lui $at,%hi(var8009caf0) +/* f147818: a023caf0 */ sb $v1,%lo(var8009caf0)($at) /* f14781c: 02801025 */ or $v0,$s4,$zero /* f147820: 3c18e700 */ lui $t8,0xe700 /* f147824: ac580000 */ sw $t8,0x0($v0) @@ -6744,7 +6744,7 @@ glabel func0f147578 /* f147a70: 320e0001 */ andi $t6,$s0,0x1 /* f147a74: 8ecf0288 */ lw $t7,0x288($s6) .L0f147a78: -/* f147a78: 3c0b800a */ lui $t3,%hi(g_MenuStack) +/* f147a78: 3c0b800a */ lui $t3,%hi(g_MenuStack+0x4f8) /* f147a7c: 02802025 */ or $a0,$s4,$zero /* f147a80: 8df80070 */ lw $t8,0x70($t7) /* f147a84: 3c05ff00 */ lui $a1,0xff00 @@ -6756,7 +6756,7 @@ glabel func0f147578 /* f147a9c: 01585023 */ subu $t2,$t2,$t8 /* f147aa0: 000a5100 */ sll $t2,$t2,0x4 /* f147aa4: 016a5821 */ addu $t3,$t3,$t2 -/* f147aa8: 8d6be4f8 */ lw $t3,%lo(g_MenuStack)($t3) +/* f147aa8: 8d6be4f8 */ lw $t3,%lo(g_MenuStack+0x4f8)($t3) /* f147aac: 55600005 */ bnezl $t3,.L0f147ac4 /* f147ab0: 02801025 */ or $v0,$s4,$zero /* f147ab4: 0fc5090e */ jal func0f142438 diff --git a/src/game/game_1531a0.c b/src/game/game_1531a0.c index 4754a8a2f..019fba745 100644 --- a/src/game/game_1531a0.c +++ b/src/game/game_1531a0.c @@ -205,8 +205,8 @@ glabel func0f1532ec /* f1533cc: ac20fae0 */ sw $zero,-0x520($at) /* f1533d0: 3c018008 */ lui $at,0x8008 /* f1533d4: ac20fae4 */ sw $zero,-0x51c($at) -/* f1533d8: 3c02800a */ lui $v0,0x800a -/* f1533dc: 8c42a474 */ lw $v0,-0x5b8c($v0) +/* 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) /* f1533e8: 27bdffe0 */ addiu $sp,$sp,-32 @@ -337,8 +337,8 @@ glabel func0f1532ec /* f1535d4: 2484dd80 */ addiu $a0,$a0,-8832 /* f1535d8: 0fc54c81 */ jal func0f153204 /* f1535dc: afa00010 */ sw $zero,0x10($sp) -/* f1535e0: 3c0f800a */ lui $t7,0x800a -/* f1535e4: 8defa474 */ lw $t7,-0x5b8c($t7) +/* f1535e0: 3c0f800a */ lui $t7,%hi(g_Vars+0x4b4) +/* f1535e4: 8defa474 */ lw $t7,%lo(g_Vars+0x4b4)($t7) /* f1535e8: 2401004e */ addiu $at,$zero,0x4e /* f1535ec: 3c040080 */ lui $a0,0x80 /* f1535f0: 15e10009 */ bne $t7,$at,.L0f153618 @@ -663,8 +663,8 @@ glabel func0f153ab0 /* f153ad8: 24a54634 */ addiu $a1,$a1,%lo(var800a4634) /* f153adc: aca20000 */ sw $v0,0x0($a1) /* f153ae0: 244f1090 */ addiu $t7,$v0,0x1090 -/* f153ae4: 3c01800a */ lui $at,0x800a -/* f153ae8: ac2f4638 */ sw $t7,0x4638($at) +/* f153ae4: 3c01800a */ lui $at,%hi(var800a4638) +/* f153ae8: ac2f4638 */ sw $t7,%lo(var800a4638)($at) /* f153aec: 3c180600 */ lui $t8,0x600 /* f153af0: ae180000 */ sw $t8,0x0($s0) /* f153af4: 8cb90000 */ lw $t9,0x0($a1) @@ -676,9 +676,9 @@ glabel func0f153ab0 /* f153b0c: 8c844634 */ lw $a0,%lo(var800a4634)($a0) /* f153b10: 0fc3528f */ jal func0f0d4a3c /* f153b14: 00002825 */ or $a1,$zero,$zero -/* f153b18: 3c01800a */ lui $at,0x800a +/* f153b18: 3c01800a */ lui $at,%hi(var800a4634) /* f153b1c: 8fbf001c */ lw $ra,0x1c($sp) -/* f153b20: ac224634 */ sw $v0,0x4634($at) +/* f153b20: ac224634 */ sw $v0,%lo(var800a4634)($at) /* f153b24: 02001025 */ or $v0,$s0,$zero /* f153b28: 3c018008 */ lui $at,0x8008 /* f153b2c: 2408ffff */ addiu $t0,$zero,-1 @@ -828,12 +828,12 @@ glabel func0f153ce8 /* f153d00: a04f0000 */ sb $t7,0x0($v0) /* f153d04: 03e00008 */ jr $ra /* f153d08: ac460040 */ sw $a2,0x40($v0) -/* f153d0c: 3c01800a */ lui $at,0x800a +/* f153d0c: 3c01800a */ lui $at,%hi(var800a45d0) /* f153d10: 03e00008 */ jr $ra -/* f153d14: a02045d0 */ sb $zero,0x45d0($at) -/* f153d18: 3c01800a */ lui $at,0x800a +/* f153d14: a02045d0 */ sb $zero,%lo(var800a45d0)($at) +/* f153d18: 3c01800a */ lui $at,%hi(var800a45d0) /* f153d1c: 03e00008 */ jr $ra -/* f153d20: a02045d0 */ sb $zero,0x45d0($at) +/* f153d20: a02045d0 */ sb $zero,%lo(var800a45d0)($at) ); GLOBAL_ASM( @@ -935,9 +935,9 @@ glabel func0f153e38 GLOBAL_ASM( glabel func0f153e4c -/* f153e4c: 3c01800a */ lui $at,0x800a +/* f153e4c: 3c01800a */ lui $at,%hi(var800a45d0) /* f153e50: 03e00008 */ jr $ra -/* f153e54: a02045d0 */ sb $zero,0x45d0($at) +/* f153e54: a02045d0 */ sb $zero,%lo(var800a45d0)($at) ); GLOBAL_ASM( @@ -3026,8 +3026,8 @@ glabel func0f15568c /* f155cac: afa20014 */ sw $v0,0x14($sp) /* f155cb0: 0fc35343 */ jal func0f0d4d0c /* f155cb4: afa20018 */ sw $v0,0x18($sp) -/* f155cb8: 3c01800a */ lui $at,0x800a -/* f155cbc: ac224634 */ sw $v0,0x4634($at) +/* f155cb8: 3c01800a */ lui $at,%hi(var800a4634) +/* f155cbc: ac224634 */ sw $v0,%lo(var800a4634)($at) /* f155cc0: 3c198008 */ lui $t9,%hi(var8007fac0) /* f155cc4: 8f39fac0 */ lw $t9,%lo(var8007fac0)($t9) /* f155cc8: 8e4e0000 */ lw $t6,0x0($s2) @@ -3075,9 +3075,9 @@ glabel func0f15568c /* f155d64: afa20014 */ sw $v0,0x14($sp) /* f155d68: 0fc35343 */ jal func0f0d4d0c /* f155d6c: afa20018 */ sw $v0,0x18($sp) -/* f155d70: 3c01800a */ lui $at,0x800a +/* f155d70: 3c01800a */ lui $at,%hi(var800a4634) /* f155d74: 1000009d */ beqz $zero,.L0f155fec -/* f155d78: ac224634 */ sw $v0,0x4634($at) +/* f155d78: ac224634 */ sw $v0,%lo(var800a4634)($at) /* f155d7c: 0186082a */ slt $at,$t4,$a2 .L0f155d80: /* f155d80: 5420009b */ bnezl $at,.L0f155ff0 @@ -3267,9 +3267,9 @@ glabel func0f156024 GLOBAL_ASM( glabel func0f156030 -/* f156030: 3c01800a */ lui $at,0x800a +/* f156030: 3c01800a */ lui $at,%hi(var800a463c) /* f156034: 03e00008 */ jr $ra -/* f156038: ac24463c */ sw $a0,0x463c($at) +/* f156038: ac24463c */ sw $a0,%lo(var800a463c)($at) ); GLOBAL_ASM( diff --git a/src/game/game_157db0.c b/src/game/game_157db0.c index 7e8dc0533..895f421aa 100644 --- a/src/game/game_157db0.c +++ b/src/game/game_157db0.c @@ -191,13 +191,13 @@ glabel func0f157e94 /* f157f50: 01c04825 */ or $t1,$t6,$zero /* f157f54: 84a40002 */ lh $a0,0x2($a1) /* f157f58: 8faf0024 */ lw $t7,0x24($sp) -/* f157f5c: 3c0a800a */ lui $t2,0x800a +/* f157f5c: 3c0a800a */ lui $t2,%hi(var800a4ce4+0x2) /* f157f60: 0004c880 */ sll $t9,$a0,0x2 /* f157f64: 0324c823 */ subu $t9,$t9,$a0 /* f157f68: 0019c880 */ sll $t9,$t9,0x2 /* f157f6c: 00f91021 */ addu $v0,$a3,$t9 /* f157f70: 904e0003 */ lbu $t6,0x3($v0) -/* f157f74: 254a4ce6 */ addiu $t2,$t2,0x4ce6 +/* f157f74: 254a4ce6 */ addiu $t2,$t2,%lo(var800a4ce4+0x2) /* f157f78: 8fb80024 */ lw $t8,0x24($sp) /* f157f7c: 01cf082a */ slt $at,$t6,$t7 /* f157f80: 1020000e */ beqz $at,.L0f157fbc @@ -237,8 +237,8 @@ glabel func0f157e94 /* f157ff8: a4580000 */ sh $t8,0x0($v0) /* f157ffc: a0590003 */ sb $t9,0x3($v0) /* f158000: 84ce0000 */ lh $t6,0x0($a2) -/* f158004: 3c0a800a */ lui $t2,0x800a -/* f158008: 254a4ce6 */ addiu $t2,$t2,0x4ce6 +/* f158004: 3c0a800a */ lui $t2,%hi(var800a4ce4+0x2) +/* f158008: 254a4ce6 */ addiu $t2,$t2,%lo(var800a4ce4+0x2) /* f15800c: a44e0004 */ sh $t6,0x4($v0) /* f158010: 84cf0002 */ lh $t7,0x2($a2) /* f158014: 854e0000 */ lh $t6,0x0($t2) @@ -843,11 +843,11 @@ glabel var7f1b75c0 .word 0x3fc90fdb .text /* f158884: 27bdffc8 */ addiu $sp,$sp,-56 -/* f158888: 3c02800a */ lui $v0,0x800a +/* f158888: 3c02800a */ lui $v0,%hi(g_Vars+0x284) /* f15888c: afbf0014 */ sw $ra,0x14($sp) /* f158890: afa40038 */ sw $a0,0x38($sp) /* f158894: afa60040 */ sw $a2,0x40($sp) -/* f158898: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f158898: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f15889c: ac800000 */ sw $zero,0x0($a0) /* f1588a0: 8cf80000 */ lw $t8,0x0($a3) /* f1588a4: 84af0000 */ lh $t7,0x0($a1) @@ -1964,8 +1964,8 @@ glabel var7f1b75c4 /* f1598e8: afa403d8 */ sw $a0,0x3d8($sp) /* f1598ec: 0fc59570 */ jal stageFindById /* f1598f0: afa603e0 */ sw $a2,0x3e0($sp) -/* f1598f4: 3c03800a */ lui $v1,0x800a -/* f1598f8: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f1598f4: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f1598f8: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f1598fc: 3c017f1b */ lui $at,%hi(var7f1b75c4) /* f159900: c42075c4 */ lwc1 $f0,%lo(var7f1b75c4)($at) /* f159904: c4640028 */ lwc1 $f4,0x28($v1) @@ -2377,13 +2377,13 @@ GLOBAL_ASM( glabel func0f159f1c /* f159f1c: 27bdffb0 */ addiu $sp,$sp,-80 /* f159f20: afb00020 */ sw $s0,0x20($sp) -/* f159f24: 3c03800a */ lui $v1,0x800a +/* f159f24: 3c03800a */ lui $v1,%hi(g_Vars+0x284) /* f159f28: 00c08025 */ or $s0,$a2,$zero /* f159f2c: afbf0024 */ sw $ra,0x24($sp) /* f159f30: afa50054 */ sw $a1,0x54($sp) /* f159f34: afa7005c */ sw $a3,0x5c($sp) /* f159f38: 14c00003 */ bnez $a2,.L0f159f48 -/* f159f3c: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f159f3c: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f159f40: 10000069 */ beqz $zero,.L0f15a0e8 /* f159f44: 00801025 */ or $v0,$a0,$zero .L0f159f48: @@ -2764,8 +2764,8 @@ glabel func0f15a2c4 /* f15a4b8: 8fa40238 */ lw $a0,0x238($sp) /* f15a4bc: 3c12800a */ lui $s2,%hi(var800a4ce4) /* f15a4c0: 26524ce4 */ addiu $s2,$s2,%lo(var800a4ce4) -/* f15a4c4: 3c04800a */ lui $a0,0x800a -/* f15a4c8: 84844ce6 */ lh $a0,0x4ce6($a0) +/* f15a4c4: 3c04800a */ lui $a0,%hi(var800a4ce4+0x2) +/* f15a4c8: 84844ce6 */ lh $a0,%lo(var800a4ce4+0x2)($a0) /* f15a4cc: 86530000 */ lh $s3,0x0($s2) /* f15a4d0: afa20238 */ sw $v0,0x238($sp) /* f15a4d4: 3c038008 */ lui $v1,%hi(var8007fc2c) @@ -2793,8 +2793,8 @@ glabel func0f15a2c4 /* f15a520: 0223082a */ slt $at,$s1,$v1 /* f15a524: 1420fff4 */ bnez $at,.L0f15a4f8 /* f15a528: 2610000c */ addiu $s0,$s0,0xc -/* f15a52c: 3c04800a */ lui $a0,0x800a -/* f15a530: 84844ce6 */ lh $a0,0x4ce6($a0) +/* f15a52c: 3c04800a */ lui $a0,%hi(var800a4ce4+0x2) +/* f15a530: 84844ce6 */ lh $a0,%lo(var800a4ce4+0x2)($a0) .L0f15a534: /* f15a534: 26730001 */ addiu $s3,$s3,0x1 /* f15a538: 00136400 */ sll $t4,$s3,0x10 @@ -2813,8 +2813,8 @@ glabel func0f15a2c4 /* f15a568: 0c012d20 */ jal osVirtualToPhysical /* f15a56c: 00402025 */ or $a0,$v0,$zero /* f15a570: ae020004 */ sw $v0,0x4($s0) -/* f15a574: 3c13800a */ lui $s3,0x800a -/* f15a578: 86734ce6 */ lh $s3,0x4ce6($s3) +/* f15a574: 3c13800a */ lui $s3,%hi(var800a4ce4+0x2) +/* f15a578: 86734ce6 */ lh $s3,%lo(var800a4ce4+0x2)($s3) /* f15a57c: 86440000 */ lh $a0,0x0($s2) /* f15a580: 3c038008 */ lui $v1,%hi(var8007fc2c) /* f15a584: 8c63fc2c */ lw $v1,%lo(var8007fc2c)($v1) @@ -2921,8 +2921,8 @@ glabel func0f15a2c4 GLOBAL_ASM( glabel func0f15a6f4 /* f15a6f4: 27bdfcc8 */ addiu $sp,$sp,-824 -/* f15a6f8: 3c0e800a */ lui $t6,0x800a -/* f15a6fc: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f15a6f8: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f15a6fc: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f15a700: 3c018008 */ lui $at,0x8008 /* f15a704: afbf003c */ sw $ra,0x3c($sp) /* f15a708: afb60038 */ sw $s6,0x38($sp) @@ -2934,10 +2934,10 @@ glabel func0f15a6f4 /* f15a720: afb00020 */ sw $s0,0x20($sp) /* f15a724: ac20fc14 */ sw $zero,-0x3ec($at) /* f15a728: 95cf0010 */ lhu $t7,0x10($t6) -/* f15a72c: 3c13800a */ lui $s3,0x800a +/* f15a72c: 3c13800a */ lui $s3,%hi(g_Vars+0x4b4) /* f15a730: 24010001 */ addiu $at,$zero,0x1 /* f15a734: 00808825 */ or $s1,$a0,$zero -/* f15a738: 8e73a474 */ lw $s3,-0x5b8c($s3) +/* f15a738: 8e73a474 */ lw $s3,%lo(g_Vars+0x4b4)($s3) /* f15a73c: 15e10005 */ bne $t7,$at,.L0f15a754 /* f15a740: 2416ffff */ addiu $s6,$zero,-1 /* f15a744: 0fc568b1 */ jal func0f15a2c4 @@ -3001,8 +3001,8 @@ glabel func0f15a6f4 /* f15a80c: 02202025 */ or $a0,$s1,$zero /* f15a810: 0fc572dd */ jal func0f15cb74 /* f15a814: 0000a025 */ or $s4,$zero,$zero -/* f15a818: 3c03800a */ lui $v1,0x800a -/* f15a81c: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f15a818: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f15a81c: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f15a820: 00408825 */ or $s1,$v0,$zero /* f15a824: 8c6400d8 */ lw $a0,0xd8($v1) /* f15a828: 14800013 */ bnez $a0,.L0f15a878 @@ -3140,18 +3140,18 @@ glabel func0f15a6f4 /* f15aa08: 00000000 */ sll $zero,$zero,0x0 /* f15aa0c: 24120071 */ addiu $s2,$zero,0x71 .L0f15aa10: -/* f15aa10: 3c0f800a */ lui $t7,0x800a -/* f15aa14: 8defa02c */ lw $t7,-0x5fd4($t7) -/* f15aa18: 3c18800a */ lui $t8,0x800a -/* f15aa1c: 3c0b800a */ lui $t3,0x800a +/* f15aa10: 3c0f800a */ lui $t7,%hi(g_Vars+0x6c) +/* f15aa14: 8defa02c */ lw $t7,%lo(g_Vars+0x6c)($t7) +/* f15aa18: 3c18800a */ lui $t8,%hi(g_Vars+0x68) +/* f15aa1c: 3c0b800a */ lui $t3,%hi(g_Vars+0x64) /* f15aa20: 11e00003 */ beqz $t7,.L0f15aa30 -/* f15aa24: 3c19800a */ lui $t9,0x800a +/* f15aa24: 3c19800a */ lui $t9,%hi(g_Vars+0x70) /* f15aa28: 10000002 */ beqz $zero,.L0f15aa34 /* f15aa2c: 24050001 */ addiu $a1,$zero,0x1 .L0f15aa30: /* f15aa30: 00002825 */ or $a1,$zero,$zero .L0f15aa34: -/* f15aa34: 8f18a028 */ lw $t8,-0x5fd8($t8) +/* f15aa34: 8f18a028 */ lw $t8,%lo(g_Vars+0x68)($t8) /* f15aa38: 00001825 */ or $v1,$zero,$zero /* f15aa3c: 00002025 */ or $a0,$zero,$zero /* f15aa40: 13000003 */ beqz $t8,.L0f15aa50 @@ -3159,13 +3159,13 @@ glabel func0f15a6f4 /* f15aa48: 10000001 */ beqz $zero,.L0f15aa50 /* f15aa4c: 24030001 */ addiu $v1,$zero,0x1 .L0f15aa50: -/* f15aa50: 8d6ba024 */ lw $t3,-0x5fdc($t3) +/* f15aa50: 8d6ba024 */ lw $t3,%lo(g_Vars+0x64)($t3) /* f15aa54: 11600003 */ beqz $t3,.L0f15aa64 /* f15aa58: 00000000 */ sll $zero,$zero,0x0 /* f15aa5c: 10000001 */ beqz $zero,.L0f15aa64 /* f15aa60: 24040001 */ addiu $a0,$zero,0x1 .L0f15aa64: -/* f15aa64: 8f39a030 */ lw $t9,-0x5fd0($t9) +/* f15aa64: 8f39a030 */ lw $t9,%lo(g_Vars+0x70)($t9) /* f15aa68: 13200003 */ beqz $t9,.L0f15aa78 /* f15aa6c: 00000000 */ sll $zero,$zero,0x0 /* f15aa70: 10000001 */ beqz $zero,.L0f15aa78 @@ -3244,10 +3244,10 @@ glabel func0f15a6f4 .L0f15ab78: /* f15ab78: 0fc4969b */ jal func0f125a6c /* f15ab7c: 00002825 */ or $a1,$zero,$zero -/* f15ab80: 3c05800a */ lui $a1,%hi(var800a0004) -/* f15ab84: 3c0e800a */ lui $t6,0x800a -/* f15ab88: 8dcea30c */ lw $t6,-0x5cf4($t6) -/* f15ab8c: 8ca5a308 */ lw $a1,-0x5cf8($a1) +/* f15ab80: 3c05800a */ lui $a1,%hi(g_Vars+0x348) +/* f15ab84: 3c0e800a */ lui $t6,%hi(g_Vars+0x34c) +/* f15ab88: 8dcea30c */ lw $t6,%lo(g_Vars+0x34c)($t6) +/* f15ab8c: 8ca5a308 */ lw $a1,%lo(g_Vars+0x348)($a1) /* f15ab90: 27b50198 */ addiu $s5,$sp,0x198 /* f15ab94: 3c098008 */ lui $t1,%hi(var8007fc2c) /* f15ab98: 00ae082b */ sltu $at,$a1,$t6 @@ -3260,7 +3260,7 @@ glabel func0f15a6f4 /* f15abb4: a5000000 */ sh $zero,0x0($t0) .L0f15abb8: /* f15abb8: 8ca30000 */ lw $v1,0x0($a1) -/* f15abbc: 3c0d800a */ lui $t5,0x800a +/* f15abbc: 3c0d800a */ lui $t5,%hi(g_Vars+0x34c) /* f15abc0: 10600015 */ beqz $v1,.L0f15ac18 /* f15abc4: 00000000 */ sll $zero,$zero,0x0 /* f15abc8: 846f0028 */ lh $t7,0x28($v1) @@ -3286,8 +3286,8 @@ glabel func0f15a6f4 /* f15ac10: 14c3fff4 */ bne $a2,$v1,.L0f15abe4 /* f15ac14: 00000000 */ sll $zero,$zero,0x0 .L0f15ac18: -/* f15ac18: 8dada30c */ lw $t5,-0x5cf4($t5) -/* f15ac1c: 24a50004 */ addiu $a1,$a1,%lo(var800a0004) +/* f15ac18: 8dada30c */ lw $t5,%lo(g_Vars+0x34c)($t5) +/* f15ac1c: 24a50004 */ addiu $a1,$a1,4 /* f15ac20: 25080002 */ addiu $t0,$t0,0x2 /* f15ac24: 00ad082b */ sltu $at,$a1,$t5 /* f15ac28: 5420ffe3 */ bnezl $at,.L0f15abb8 @@ -3460,8 +3460,8 @@ glabel func0f15a6f4 /* f15ae9c: 0fc59eb8 */ jal func0f167ae0 /* f15aea0: ae020004 */ sw $v0,0x4($s0) /* f15aea4: 1040001c */ beqz $v0,.L0f15af18 -/* f15aea8: 3c18800a */ lui $t8,0x800a -/* f15aeac: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f15aea8: 3c18800a */ lui $t8,%hi(g_Vars+0x284) +/* f15aeac: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f15aeb0: 24010001 */ addiu $at,$zero,0x1 /* f15aeb4: 3c198008 */ lui $t9,%hi(var8007fc2c) /* f15aeb8: 970b0010 */ lhu $t3,0x10($t8) @@ -3589,8 +3589,8 @@ glabel func0f15a6f4 /* f15b088: 02a03825 */ or $a3,$s5,$zero /* f15b08c: 00408825 */ or $s1,$v0,$zero .L0f15b090: -/* f15b090: 3c0c800a */ lui $t4,0x800a -/* f15b094: 8d8ca2d4 */ lw $t4,-0x5d2c($t4) +/* f15b090: 3c0c800a */ lui $t4,%hi(g_Vars+0x314) +/* f15b094: 8d8ca2d4 */ lw $t4,%lo(g_Vars+0x314)($t4) /* f15b098: 5580000f */ bnezl $t4,.L0f15b0d8 /* f15b09c: 2673fffe */ addiu $s3,$s3,-2 /* f15b0a0: 0fc4f1e0 */ jal func0f13c780 @@ -3631,8 +3631,8 @@ glabel func0f15a6f4 GLOBAL_ASM( glabel func0f15b114 /* f15b114: 27bdffd8 */ addiu $sp,$sp,-40 -/* f15b118: 3c0e800a */ lui $t6,0x800a -/* f15b11c: 8dcea2d4 */ lw $t6,-0x5d2c($t6) +/* f15b118: 3c0e800a */ lui $t6,%hi(g_Vars+0x314) +/* f15b11c: 8dcea2d4 */ lw $t6,%lo(g_Vars+0x314)($t6) /* f15b120: afb2001c */ sw $s2,0x1c($sp) /* f15b124: 00809025 */ or $s2,$a0,$zero /* f15b128: afbf0024 */ sw $ra,0x24($sp) @@ -3738,8 +3738,8 @@ glabel func0f15b23c GLOBAL_ASM( glabel func0f15b274 /* f15b274: 27bdff50 */ addiu $sp,$sp,-176 -/* f15b278: 3c02800a */ lui $v0,%hi(var800a0004) -/* f15b27c: 8c424cc8 */ lw $v0,0x4cc8($v0) +/* f15b278: 3c02800a */ lui $v0,%hi(g_Portals) +/* f15b27c: 8c424cc8 */ lw $v0,%lo(g_Portals)($v0) /* f15b280: 000470c0 */ sll $t6,$a0,0x3 /* f15b284: afbf005c */ sw $ra,0x5c($sp) /* f15b288: afb40058 */ sw $s4,0x58($sp) @@ -3776,7 +3776,7 @@ glabel func0f15b274 /* f15b2fc: 24630004 */ addiu $v1,$v1,0x4 /* f15b300: 24840004 */ addiu $a0,$a0,0x4 /* f15b304: 46062201 */ sub.s $f8,$f4,$f6 -/* f15b308: 24420004 */ addiu $v0,$v0,%lo(var800a0004) +/* f15b308: 24420004 */ addiu $v0,$v0,4 /* f15b30c: 24a50004 */ addiu $a1,$a1,0x4 /* f15b310: e488fffc */ swc1 $f8,-0x4($a0) /* f15b314: c444fff4 */ lwc1 $f4,-0xc($v0) @@ -3948,17 +3948,17 @@ glabel func0f15b534 /* f15b558: 15e10007 */ bne $t7,$at,.L0f15b578 /* f15b55c: afb00014 */ sw $s0,0x14($sp) /* f15b560: 24020006 */ addiu $v0,$zero,0x6 -/* f15b564: 3c01800a */ lui $at,0x800a -/* f15b568: a4224bf0 */ sh $v0,0x4bf0($at) -/* f15b56c: 3c01800a */ lui $at,0x800a +/* f15b564: 3c01800a */ lui $at,%hi(var800a4bf0) +/* f15b568: a4224bf0 */ sh $v0,%lo(var800a4bf0)($at) +/* f15b56c: 3c01800a */ lui $at,%hi(var800a4bf0+0x2) /* f15b570: 10000006 */ beqz $zero,.L0f15b58c -/* f15b574: a4224bf2 */ sh $v0,0x4bf2($at) +/* f15b574: a4224bf2 */ sh $v0,%lo(var800a4bf0+0x2)($at) .L0f15b578: /* f15b578: 24020078 */ addiu $v0,$zero,0x78 -/* f15b57c: 3c01800a */ lui $at,0x800a -/* f15b580: a4224bf0 */ sh $v0,0x4bf0($at) -/* f15b584: 3c01800a */ lui $at,0x800a -/* f15b588: a4224bf2 */ sh $v0,0x4bf2($at) +/* f15b57c: 3c01800a */ lui $at,%hi(var800a4bf0) +/* f15b580: a4224bf0 */ sh $v0,%lo(var800a4bf0)($at) +/* f15b584: 3c01800a */ lui $at,%hi(var800a4bf0+0x2) +/* f15b588: a4224bf2 */ sh $v0,%lo(var800a4bf0+0x2)($at) .L0f15b58c: /* f15b58c: 0fc56c8f */ jal func0f15b23c /* f15b590: 00000000 */ sll $zero,$zero,0x0 @@ -4016,11 +4016,11 @@ glabel func0f15b534 /* f15b65c: 39c6000f */ xori $a2,$t6,0xf /* f15b660: 0fc56c71 */ jal func0f15b1c4 /* f15b664: 00002825 */ or $a1,$zero,$zero -/* f15b668: 3c05800a */ lui $a1,%hi(var800a000c) +/* f15b668: 3c05800a */ lui $a1,%hi(var800a491c) /* f15b66c: 8fa60058 */ lw $a2,0x58($sp) /* f15b670: 2604000c */ addiu $a0,$s0,0xc /* f15b674: 0fc5766a */ jal func0f15d9a8 -/* f15b678: 8ca5491c */ lw $a1,0x491c($a1) +/* f15b678: 8ca5491c */ lw $a1,%lo(var800a491c)($a1) /* f15b67c: 3c04800a */ lui $a0,%hi(var800a491c) /* f15b680: 8c84491c */ lw $a0,%lo(var800a491c)($a0) /* f15b684: 02202825 */ or $a1,$s1,$zero @@ -4029,7 +4029,7 @@ glabel func0f15b534 /* f15b690: 8fa50048 */ lw $a1,0x48($sp) /* f15b694: 8fa4002c */ lw $a0,0x2c($sp) /* f15b698: 24060040 */ addiu $a2,$zero,0x40 -/* f15b69c: 24a5000c */ addiu $a1,$a1,%lo(var800a000c) +/* f15b69c: 24a5000c */ addiu $a1,$a1,12 /* f15b6a0: 0fc56c71 */ jal func0f15b1c4 /* f15b6a4: afa50028 */ sw $a1,0x28($sp) /* f15b6a8: 8fa2002c */ lw $v0,0x2c($sp) @@ -4084,11 +4084,11 @@ glabel func0f15b534 /* f15b764: 24060004 */ addiu $a2,$zero,0x4 /* f15b768: 8fae0028 */ lw $t6,0x28($sp) /* f15b76c: 8faf0050 */ lw $t7,0x50($sp) -/* f15b770: 3c01800a */ lui $at,0x800a +/* f15b770: 3c01800a */ lui $at,%hi(var800a4924) /* f15b774: 3c044fff */ lui $a0,0x4fff /* f15b778: 01cfc021 */ addu $t8,$t6,$t7 /* f15b77c: 27190004 */ addiu $t9,$t8,0x4 -/* f15b780: ac394924 */ sw $t9,0x4924($at) +/* f15b780: ac394924 */ sw $t9,%lo(var800a4924)($at) /* f15b784: 0fc56d47 */ jal func0f15b51c /* f15b788: 3484fbab */ ori $a0,$a0,0xfbab /* f15b78c: 3c04bbb7 */ lui $a0,0xbbb7 @@ -4153,17 +4153,17 @@ glabel func0f15b534 /* f15b870: 8c7802bc */ lw $t8,0x2bc($v1) /* f15b874: 8caa0008 */ lw $t2,0x8($a1) .L0f15b878: -/* f15b878: 3c01800a */ lui $at,0x800a +/* f15b878: 3c01800a */ lui $at,%hi(g_Portals) /* f15b87c: 01445821 */ addu $t3,$t2,$a0 /* f15b880: 01676021 */ addu $t4,$t3,$a3 -/* f15b884: ac2c4cc8 */ sw $t4,0x4cc8($at) +/* f15b884: ac2c4cc8 */ sw $t4,%lo(g_Portals)($at) /* f15b888: 8ca2000c */ lw $v0,0xc($a1) /* f15b88c: 3c01800a */ lui $at,0x800a /* f15b890: 14400004 */ bnez $v0,.L0f15b8a4 /* f15b894: 00446821 */ addu $t5,$v0,$a0 -/* f15b898: 3c01800a */ lui $at,0x800a +/* f15b898: 3c01800a */ lui $at,%hi(var800a4cd4) /* f15b89c: 10000003 */ beqz $zero,.L0f15b8ac -/* f15b8a0: ac204cd4 */ sw $zero,0x4cd4($at) +/* f15b8a0: ac204cd4 */ sw $zero,%lo(var800a4cd4)($at) .L0f15b8a4: /* f15b8a4: 01a77021 */ addu $t6,$t5,$a3 /* f15b8a8: ac2e4cd4 */ sw $t6,0x4cd4($at) @@ -4172,9 +4172,9 @@ glabel func0f15b534 /* f15b8b0: 3c01800a */ lui $at,0x800a /* f15b8b4: 14400004 */ bnez $v0,.L0f15b8c8 /* f15b8b8: 00447821 */ addu $t7,$v0,$a0 -/* f15b8bc: 3c01800a */ lui $at,0x800a +/* f15b8bc: 3c01800a */ lui $at,%hi(var800a4cd8) /* f15b8c0: 10000003 */ beqz $zero,.L0f15b8d0 -/* f15b8c4: ac204cd8 */ sw $zero,0x4cd8($at) +/* f15b8c4: ac204cd8 */ sw $zero,%lo(var800a4cd8)($at) .L0f15b8c8: /* f15b8c8: 01e7c021 */ addu $t8,$t7,$a3 /* f15b8cc: ac384cd8 */ sw $t8,0x4cd8($at) @@ -4183,9 +4183,9 @@ glabel func0f15b534 /* f15b8d4: 3c01800a */ lui $at,0x800a /* f15b8d8: 14400004 */ bnez $v0,.L0f15b8ec /* f15b8dc: 0044c821 */ addu $t9,$v0,$a0 -/* f15b8e0: 3c01800a */ lui $at,0x800a +/* f15b8e0: 3c01800a */ lui $at,%hi(var800a4cdc) /* f15b8e4: 10000003 */ beqz $zero,.L0f15b8f4 -/* f15b8e8: ac204cdc */ sw $zero,0x4cdc($at) +/* f15b8e8: ac204cdc */ sw $zero,%lo(var800a4cdc)($at) .L0f15b8ec: /* f15b8ec: 03274821 */ addu $t1,$t9,$a3 /* f15b8f0: ac294cdc */ sw $t1,0x4cdc($at) @@ -4346,8 +4346,8 @@ glabel var7f1b75d0 /* f15bb18: 0338c823 */ subu $t9,$t9,$t8 /* f15bb1c: 0019c8c0 */ sll $t9,$t9,0x3 /* f15bb20: 00390821 */ addu $at,$at,$t9 -/* f15bb24: 3c03800a */ lui $v1,%hi(var800a0008) -/* f15bb28: 2463a1c0 */ addiu $v1,$v1,-24128 +/* f15bb24: 3c03800a */ lui $v1,%hi(g_Vars+0x200) +/* f15bb28: 2463a1c0 */ addiu $v1,$v1,%lo(g_Vars+0x200) /* f15bb2c: c420fcd8 */ lwc1 $f0,-0x328($at) /* f15bb30: 24429fc0 */ addiu $v0,$v0,%lo(g_Vars) .L0f15bb34: @@ -4385,8 +4385,8 @@ glabel var7f1b75d0 /* f15bba8: ac5e0000 */ sw $s8,0x0($v0) /* f15bbac: 0c0048f2 */ jal malloc /* f15bbb0: 39c4000f */ xori $a0,$t6,0xf -/* f15bbb4: 3c01800a */ lui $at,0x800a -/* f15bbb8: ac224cec */ sw $v0,0x4cec($at) +/* f15bbb4: 3c01800a */ lui $at,%hi(var800a4cec) +/* f15bbb8: ac224cec */ sw $v0,%lo(var800a4cec)($at) /* f15bbbc: 001e20c0 */ sll $a0,$s8,0x3 /* f15bbc0: 24840008 */ addiu $a0,$a0,0x8 /* f15bbc4: 8ef00000 */ lw $s0,0x0($s7) @@ -4406,7 +4406,7 @@ glabel var7f1b75d0 /* f15bbf4: 8ef00000 */ lw $s0,0x0($s7) .L0f15bbf8: /* f15bbf8: 16defff8 */ bne $s6,$s8,.L0f15bbdc -/* f15bbfc: 24630008 */ addiu $v1,$v1,%lo(var800a0008) +/* f15bbfc: 24630008 */ addiu $v1,$v1,8 /* f15bc00: 0000b025 */ or $s6,$zero,$zero .L0f15bc04: /* f15bc04: 02048821 */ addu $s1,$s0,$a0 @@ -4589,8 +4589,8 @@ glabel var7f1b75d0 /* f15be78: 26310002 */ addiu $s1,$s1,0x2 /* f15be7c: 1420ffbe */ bnez $at,.L0f15bd78 /* f15be80: 27ff0002 */ addiu $ra,$ra,0x2 -/* f15be84: 3c11800a */ lui $s1,%hi(var800a008c) -/* f15be88: 8e31a27c */ lw $s1,-0x5d84($s1) +/* f15be84: 3c11800a */ lui $s1,%hi(g_Vars+0x2bc) +/* f15be88: 8e31a27c */ lw $s1,%lo(g_Vars+0x2bc)($s1) /* f15be8c: 0000b025 */ or $s6,$zero,$zero /* f15be90: 26940001 */ addiu $s4,$s4,0x1 .L0f15be94: @@ -4633,9 +4633,9 @@ glabel var7f1b75d0 /* f15bf10: 3b04000f */ xori $a0,$t8,0xf /* f15bf14: 0c0048f2 */ jal malloc /* f15bf18: 24050004 */ addiu $a1,$zero,0x4 -/* f15bf1c: 3c01800a */ lui $at,0x800a +/* f15bf1c: 3c01800a */ lui $at,%hi(var800a4ccc) /* f15bf20: 1bc00095 */ blez $s8,.L0f15c178 -/* f15bf24: ac224ccc */ sw $v0,0x4ccc($at) +/* f15bf24: ac224ccc */ sw $v0,%lo(var800a4ccc)($at) /* f15bf28: 44808000 */ mtc1 $zero,$f16 /* f15bf2c: 00009025 */ or $s2,$zero,$zero /* f15bf30: 00003025 */ or $a2,$zero,$zero @@ -5040,7 +5040,7 @@ glabel var7f1b75d0 /* f15c52c: 26940001 */ addiu $s4,$s4,0x1 /* f15c530: 46100182 */ mul.s $f6,$f0,$f16 /* f15c534: 0331c021 */ addu $t8,$t9,$s1 -/* f15c538: 2631008c */ addiu $s1,$s1,%lo(var800a008c) +/* f15c538: 2631008c */ addiu $s1,$s1,140 /* f15c53c: 26520014 */ addiu $s2,$s2,0x14 /* f15c540: e706003c */ swc1 $f6,0x3c($t8) /* f15c544: 8fc302bc */ lw $v1,0x2bc($s8) @@ -5127,11 +5127,11 @@ glabel var7f1b75d0 /* f15c66c: 2a210002 */ slti $at,$s1,0x2 .L0f15c670: /* f15c670: 1420000b */ bnez $at,.L0f15c6a0 -/* f15c674: 3c0c800a */ lui $t4,%hi(var800a008c) -/* f15c678: 8d8c4928 */ lw $t4,0x4928($t4) +/* f15c674: 3c0c800a */ lui $t4,%hi(g_RoomPtrs) +/* f15c678: 8d8c4928 */ lw $t4,%lo(g_RoomPtrs)($t4) /* f15c67c: 3c1e800a */ lui $s8,%hi(g_Vars) /* f15c680: 27de9fc0 */ addiu $s8,$s8,%lo(g_Vars) -/* f15c684: 258c008c */ addiu $t4,$t4,%lo(var800a008c) +/* f15c684: 258c008c */ addiu $t4,$t4,140 .L0f15c688: /* f15c688: 81990008 */ lb $t9,0x8($t4) /* f15c68c: 26940001 */ addiu $s4,$s4,0x1 @@ -5141,7 +5141,7 @@ glabel var7f1b75d0 /* f15c69c: 02d9b021 */ addu $s6,$s6,$t9 .L0f15c6a0: /* f15c6a0: 12c0001c */ beqz $s6,.L0f15c714 -/* f15c6a4: 3c03800a */ lui $v1,%hi(var800a41a0) +/* f15c6a4: 3c03800a */ lui $v1,0x800a /* f15c6a8: 00162080 */ sll $a0,$s6,0x2 /* f15c6ac: 00962023 */ subu $a0,$a0,$s6 /* f15c6b0: 2484000f */ addiu $a0,$a0,0xf @@ -5171,7 +5171,7 @@ glabel var7f1b75d0 /* f15c70c: 10000004 */ beqz $zero,.L0f15c720 /* f15c710: 0000a025 */ or $s4,$zero,$zero .L0f15c714: -/* f15c714: 246341a0 */ addiu $v1,$v1,%lo(var800a41a0) +/* f15c714: 246341a0 */ addiu $v1,$v1,16800 /* f15c718: ac600000 */ sw $zero,0x0($v1) /* f15c71c: 0000a025 */ or $s4,$zero,$zero .L0f15c720: @@ -5301,8 +5301,8 @@ glabel func0f15c888 GLOBAL_ASM( glabel func0f15c8b8 -/* f15c8b8: 3c0e800a */ lui $t6,0x800a -/* f15c8bc: 8dcea248 */ lw $t6,-0x5db8($t6) +/* f15c8b8: 3c0e800a */ lui $t6,%hi(g_Vars+0x288) +/* f15c8bc: 8dcea248 */ lw $t6,%lo(g_Vars+0x288)($t6) /* f15c8c0: 03e00008 */ jr $ra /* f15c8c4: c5c00074 */ lwc1 $f0,0x74($t6) ); @@ -5402,9 +5402,9 @@ GLOBAL_ASM( glabel func0f15ca00 /* f15ca00: 27bdffe8 */ addiu $sp,$sp,-24 /* f15ca04: afbf0014 */ sw $ra,0x14($sp) -/* f15ca08: 3c01800a */ lui $at,0x800a +/* f15ca08: 3c01800a */ lui $at,%hi(var800a4bec) /* f15ca0c: 0fc57248 */ jal func0f15c920 -/* f15ca10: ac204bec */ sw $zero,0x4bec($at) +/* f15ca10: ac204bec */ sw $zero,%lo(var800a4bec)($at) /* f15ca14: 3c05800a */ lui $a1,%hi(g_Vars) /* f15ca18: 24a59fc0 */ addiu $a1,$a1,%lo(g_Vars) /* f15ca1c: 8cae0290 */ lw $t6,0x290($a1) @@ -5506,8 +5506,8 @@ glabel func0f15cae0 GLOBAL_ASM( glabel func0f15cb74 -/* f15cb74: 3c02800a */ lui $v0,0x800a -/* f15cb78: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f15cb74: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f15cb78: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f15cb7c: 27bdffe0 */ addiu $sp,$sp,-32 /* f15cb80: afbf001c */ sw $ra,0x1c($sp) /* f15cb84: 844f0632 */ lh $t7,0x632($v0) @@ -5555,8 +5555,8 @@ glabel func0f15cbb4 GLOBAL_ASM( glabel func0f15cc18 -/* f15cc18: 3c02800a */ lui $v0,0x800a -/* f15cc1c: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f15cc18: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f15cc1c: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f15cc20: afa40000 */ sw $a0,0x0($sp) /* f15cc24: afa7000c */ sw $a3,0xc($sp) /* f15cc28: 84430634 */ lh $v1,0x634($v0) @@ -6041,7 +6041,7 @@ glabel func0f15d10c /* f15d2c4: c7a602e0 */ lwc1 $f6,0x2e0($sp) /* f15d2c8: c7a802d8 */ lwc1 $f8,0x2d8($sp) /* f15d2cc: 4604903c */ c.lt.s $f18,$f4 -/* f15d2d0: 3c02800a */ lui $v0,0x800a +/* f15d2d0: 3c02800a */ lui $v0,%hi(g_Vars+0x284) /* f15d2d4: 45010007 */ bc1t .L0f15d2f4 /* f15d2d8: 00000000 */ sll $zero,$zero,0x0 /* f15d2dc: 4608303c */ c.lt.s $f6,$f8 @@ -6051,7 +6051,7 @@ glabel func0f15d10c /* f15d2ec: 45000016 */ bc1f .L0f15d348 /* f15d2f0: 02205025 */ or $t2,$s1,$zero .L0f15d2f4: -/* f15d2f4: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f15d2f4: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f15d2f8: c44a1794 */ lwc1 $f10,0x1794($v0) /* f15d2fc: 4600540d */ trunc.w.s $f16,$f10 /* f15d300: 440d8000 */ mfc1 $t5,$f16 @@ -6352,8 +6352,8 @@ bool roomIsActive(s32 room_id) GLOBAL_ASM( glabel func0f15d744 -/* f15d744: 3c0e800a */ lui $t6,0x800a -/* f15d748: 8dcea2d4 */ lw $t6,-0x5d2c($t6) +/* f15d744: 3c0e800a */ lui $t6,%hi(g_Vars+0x314) +/* f15d748: 8dcea2d4 */ lw $t6,%lo(g_Vars+0x314)($t6) /* f15d74c: 000450c0 */ sll $t2,$a0,0x3 /* f15d750: 01445021 */ addu $t2,$t2,$a0 /* f15d754: 11c00008 */ beqz $t6,.L0f15d778 @@ -6380,8 +6380,8 @@ glabel func0f15d744 GLOBAL_ASM( glabel func0f15d7a0 -/* f15d7a0: 3c0e800a */ lui $t6,0x800a -/* f15d7a4: 8dcea2d4 */ lw $t6,-0x5d2c($t6) +/* f15d7a0: 3c0e800a */ lui $t6,%hi(g_Vars+0x314) +/* f15d7a4: 8dcea2d4 */ lw $t6,%lo(g_Vars+0x314)($t6) /* f15d7a8: 000460c0 */ sll $t4,$a0,0x3 /* f15d7ac: 01846021 */ addu $t4,$t4,$a0 /* f15d7b0: 11c0000b */ beqz $t6,.L0f15d7e0 @@ -6411,8 +6411,8 @@ glabel func0f15d7a0 GLOBAL_ASM( glabel func0f15d808 -/* f15d808: 3c0e800a */ lui $t6,0x800a -/* f15d80c: 8dcea2d4 */ lw $t6,-0x5d2c($t6) +/* f15d808: 3c0e800a */ lui $t6,%hi(g_Vars+0x314) +/* f15d80c: 8dcea2d4 */ lw $t6,%lo(g_Vars+0x314)($t6) /* f15d810: 000460c0 */ sll $t4,$a0,0x3 /* f15d814: 01846021 */ addu $t4,$t4,$a0 /* f15d818: 11c0000b */ beqz $t6,.L0f15d848 @@ -6472,21 +6472,21 @@ glabel func0f15d870 /* f15d8d0: 0fc47b70 */ jal func0f11edc0 /* f15d8d4: 00000000 */ sll $zero,$zero,0x0 /* f15d8d8: 1040002f */ beqz $v0,.L0f15d998 -/* f15d8dc: 3c06800a */ lui $a2,0x800a -/* f15d8e0: 8cc6a27c */ lw $a2,-0x5d84($a2) +/* f15d8dc: 3c06800a */ lui $a2,%hi(g_Vars+0x2bc) +/* f15d8e0: 8cc6a27c */ lw $a2,%lo(g_Vars+0x2bc)($a2) /* f15d8e4: 00002025 */ or $a0,$zero,$zero /* f15d8e8: 24030001 */ addiu $v1,$zero,0x1 /* f15d8ec: 28c10002 */ slti $at,$a2,0x2 /* f15d8f0: 14200027 */ bnez $at,.L0f15d990 /* f15d8f4: 27a20030 */ addiu $v0,$sp,0x30 -/* f15d8f8: 3c05800a */ lui $a1,%hi(var800a008c) -/* f15d8fc: 8ca54928 */ lw $a1,0x4928($a1) +/* f15d8f8: 3c05800a */ lui $a1,%hi(g_RoomPtrs) +/* f15d8fc: 8ca54928 */ lw $a1,%lo(g_RoomPtrs)($a1) /* f15d900: 240b002e */ addiu $t3,$zero,0x2e /* f15d904: 240a004c */ addiu $t2,$zero,0x4c /* f15d908: 2409000a */ addiu $t1,$zero,0xa /* f15d90c: 24080001 */ addiu $t0,$zero,0x1 /* f15d910: 24070028 */ addiu $a3,$zero,0x28 -/* f15d914: 24a5008c */ addiu $a1,$a1,%lo(var800a008c) +/* f15d914: 24a5008c */ addiu $a1,$a1,140 .L0f15d918: /* f15d918: 246effff */ addiu $t6,$v1,-1 /* f15d91c: 01c7001a */ div $zero,$t6,$a3 @@ -6749,8 +6749,8 @@ glabel func0f15dc58 /* f15dc6c: afb10024 */ sw $s1,0x24($sp) /* f15dc70: 108001f8 */ beqz $a0,.L0f15e454 /* f15dc74: afb00020 */ sw $s0,0x20($sp) -/* f15dc78: 3c0e800a */ lui $t6,0x800a -/* f15dc7c: 8dcea27c */ lw $t6,-0x5d84($t6) +/* f15dc78: 3c0e800a */ lui $t6,%hi(g_Vars+0x2bc) +/* f15dc7c: 8dcea27c */ lw $t6,%lo(g_Vars+0x2bc)($t6) /* f15dc80: 000478c0 */ sll $t7,$a0,0x3 /* f15dc84: 01e47821 */ addu $t7,$t7,$a0 /* f15dc88: 008e082a */ slt $at,$a0,$t6 @@ -7360,8 +7360,8 @@ glabel func0f15e474 GLOBAL_ASM( glabel func0f15e538 -/* f15e538: 3c02800a */ lui $v0,0x800a -/* f15e53c: 8c42a27c */ lw $v0,-0x5d84($v0) +/* f15e538: 3c02800a */ lui $v0,%hi(g_Vars+0x2bc) +/* f15e53c: 8c42a27c */ lw $v0,%lo(g_Vars+0x2bc)($v0) /* f15e540: 27bdffd8 */ addiu $sp,$sp,-40 /* f15e544: afb1001c */ sw $s1,0x1c($sp) /* f15e548: 28410002 */ slti $at,$v0,0x2 @@ -7381,8 +7381,8 @@ glabel func0f15e538 /* f15e57c: 26310001 */ addiu $s1,$s1,0x1 /* f15e580: 0fc5791d */ jal func0f15e474 /* f15e584: 02202025 */ or $a0,$s1,$zero -/* f15e588: 3c02800a */ lui $v0,0x800a -/* f15e58c: 8c42a27c */ lw $v0,-0x5d84($v0) +/* f15e588: 3c02800a */ lui $v0,%hi(g_Vars+0x2bc) +/* f15e58c: 8c42a27c */ lw $v0,%lo(g_Vars+0x2bc)($v0) /* f15e590: 26310001 */ addiu $s1,$s1,0x1 .L0f15e594: /* f15e594: 0222082a */ slt $at,$s1,$v0 @@ -7423,9 +7423,9 @@ glabel func0f15e5b8 /* f15e608: 28a10002 */ slti $at,$a1,0x2 /* f15e60c: 1420000e */ bnez $at,.L0f15e648 /* f15e610: 24100001 */ addiu $s0,$zero,0x1 -/* f15e614: 3c02800a */ lui $v0,%hi(var800a008c) -/* f15e618: 8c424928 */ lw $v0,0x4928($v0) -/* f15e61c: 2442008c */ addiu $v0,$v0,%lo(var800a008c) +/* f15e614: 3c02800a */ lui $v0,%hi(g_RoomPtrs) +/* f15e618: 8c424928 */ lw $v0,%lo(g_RoomPtrs)($v0) +/* f15e61c: 2442008c */ addiu $v0,$v0,140 .L0f15e620: /* f15e620: 84430002 */ lh $v1,0x2($v0) /* f15e624: 0083082a */ slt $at,$a0,$v1 @@ -7522,12 +7522,12 @@ glabel func0f15e728 /* f15e760: 00009025 */ or $s2,$zero,$zero /* f15e764: 14200032 */ bnez $at,.L0f15e830 /* f15e768: 24110001 */ addiu $s1,$zero,0x1 -/* f15e76c: 3c17800a */ lui $s7,0x800a +/* f15e76c: 3c17800a */ lui $s7,%hi(var800a4bf0+0x2) /* f15e770: 3c15800a */ lui $s5,%hi(var800a4bf0) /* f15e774: 3c13800a */ lui $s3,%hi(g_RoomPtrs) /* f15e778: 26734928 */ addiu $s3,$s3,%lo(g_RoomPtrs) /* f15e77c: 26b54bf0 */ addiu $s5,$s5,%lo(var800a4bf0) -/* f15e780: 26f74bf2 */ addiu $s7,$s7,0x4bf2 +/* f15e780: 26f74bf2 */ addiu $s7,$s7,%lo(var800a4bf0+0x2) /* f15e784: 2410008c */ addiu $s0,$zero,0x8c /* f15e788: 24160001 */ addiu $s6,$zero,0x1 /* f15e78c: 8e6f0000 */ lw $t7,0x0($s3) @@ -7699,8 +7699,8 @@ glabel func0f15e85c /* f15e9e8: 02001025 */ or $v0,$s0,$zero /* f15e9ec: afa40058 */ sw $a0,0x58($sp) /* f15e9f0: 8c880004 */ lw $t0,0x4($a0) -/* f15e9f4: 3c03800a */ lui $v1,0x800a -/* f15e9f8: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f15e9f4: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f15e9f8: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f15e9fc: afa80054 */ sw $t0,0x54($sp) /* f15ea00: 8e22000c */ lw $v0,0xc($s1) /* f15ea04: 0080c825 */ or $t9,$a0,$zero @@ -7837,8 +7837,8 @@ glabel func0f15ebd4 /* f15ebd8: afbf0014 */ sw $ra,0x14($sp) /* f15ebdc: 10a00008 */ beqz $a1,.L0f15ec00 /* f15ebe0: 00803025 */ or $a2,$a0,$zero -/* f15ebe4: 3c0e800a */ lui $t6,0x800a -/* f15ebe8: 8dcea27c */ lw $t6,-0x5d84($t6) +/* f15ebe4: 3c0e800a */ lui $t6,%hi(g_Vars+0x2bc) +/* f15ebe8: 8dcea27c */ lw $t6,%lo(g_Vars+0x2bc)($t6) /* f15ebec: 000518c0 */ sll $v1,$a1,0x3 /* f15ebf0: 00651821 */ addu $v1,$v1,$a1 /* f15ebf4: 00ae082a */ slt $at,$a1,$t6 @@ -10785,7 +10785,7 @@ glabel func0f161520 /* f161570: e7a600bc */ swc1 $f6,0xbc($sp) /* f161574: c4880008 */ lwc1 $f8,0x8($a0) /* f161578: c7a600b8 */ lwc1 $f6,0xb8($sp) -/* f16157c: 3c0f800a */ lui $t7,0x800a +/* f16157c: 3c0f800a */ lui $t7,%hi(g_Vars+0x2bc) /* f161580: e7a800c0 */ swc1 $f8,0xc0($sp) /* f161584: c4aa0000 */ lwc1 $f10,0x0($a1) /* f161588: e7aa00ac */ swc1 $f10,0xac($sp) @@ -10811,7 +10811,7 @@ glabel func0f161520 /* f1615d8: e7a40098 */ swc1 $f4,0x98($sp) /* f1615dc: 04c00007 */ bltz $a2,.L0f1615fc /* f1615e0: e7a6009c */ swc1 $f6,0x9c($sp) -/* f1615e4: 8defa27c */ lw $t7,-0x5d84($t7) +/* f1615e4: 8defa27c */ lw $t7,%lo(g_Vars+0x2bc)($t7) /* f1615e8: 8fb500f0 */ lw $s5,0xf0($sp) /* f1615ec: 3c16800a */ lui $s6,%hi(g_RoomPtrs) /* f1615f0: 00cf082a */ slt $at,$a2,$t7 @@ -10880,7 +10880,7 @@ glabel func0f161520 .L0f1616d8: /* f1616d8: 2a610010 */ slti $at,$s3,0x10 /* f1616dc: 10200019 */ beqz $at,.L0f161744 -/* f1616e0: 3c10800a */ lui $s0,%hi(var800a0008) +/* f1616e0: 3c10800a */ lui $s0,0x800a /* f1616e4: 8fa400e4 */ lw $a0,0xe4($sp) /* f1616e8: 1a600010 */ blez $s3,.L0f16172c /* f1616ec: 00001825 */ or $v1,$zero,$zero @@ -10900,7 +10900,7 @@ glabel func0f161520 /* f161720: 00402025 */ or $a0,$v0,$zero .L0f161724: /* f161724: 1473fff4 */ bne $v1,$s3,.L0f1616f8 -/* f161728: 26100008 */ addiu $s0,$s0,%lo(var800a0008) +/* f161728: 26100008 */ addiu $s0,$s0,8 .L0f16172c: /* f16172c: 000350c0 */ sll $t2,$v1,0x3 /* f161730: 022a8021 */ addu $s0,$s1,$t2 @@ -11642,8 +11642,8 @@ glabel func0f162194 /* f1621a0: afa50064 */ sw $a1,0x64($sp) /* f1621a4: afa60068 */ sw $a2,0x68($sp) /* f1621a8: c4840000 */ lwc1 $f4,0x0($a0) -/* f1621ac: 3c03800a */ lui $v1,0x800a -/* f1621b0: 8c63a27c */ lw $v1,-0x5d84($v1) +/* f1621ac: 3c03800a */ lui $v1,%hi(g_Vars+0x2bc) +/* f1621b0: 8c63a27c */ lw $v1,%lo(g_Vars+0x2bc)($v1) /* f1621b4: e7a40048 */ swc1 $f4,0x48($sp) /* f1621b8: c4860004 */ lwc1 $f6,0x4($a0) /* f1621bc: 4480a000 */ mtc1 $zero,$f20 @@ -11706,8 +11706,8 @@ glabel func0f162194 /* f16229c: 0009c840 */ sll $t9,$t1,0x1 /* f1622a0: 03197021 */ addu $t6,$t8,$t9 /* f1622a4: a5c20000 */ sh $v0,0x0($t6) -/* f1622a8: 3c03800a */ lui $v1,0x800a -/* f1622ac: 8c63a27c */ lw $v1,-0x5d84($v1) +/* f1622a8: 3c03800a */ lui $v1,%hi(g_Vars+0x2bc) +/* f1622ac: 8c63a27c */ lw $v1,%lo(g_Vars+0x2bc)($v1) /* f1622b0: 10000009 */ beqz $zero,.L0f1622d8 /* f1622b4: 25290001 */ addiu $t1,$t1,0x1 .L0f1622b8: @@ -11716,8 +11716,8 @@ glabel func0f162194 /* f1622c0: 000ac040 */ sll $t8,$t2,0x1 /* f1622c4: 01f8c821 */ addu $t9,$t7,$t8 /* f1622c8: a7220000 */ sh $v0,0x0($t9) -/* f1622cc: 3c03800a */ lui $v1,0x800a -/* f1622d0: 8c63a27c */ lw $v1,-0x5d84($v1) +/* f1622cc: 3c03800a */ lui $v1,%hi(g_Vars+0x2bc) +/* f1622d0: 8c63a27c */ lw $v1,%lo(g_Vars+0x2bc)($v1) /* f1622d4: 254a0001 */ addiu $t2,$t2,0x1 .L0f1622d8: /* f1622d8: 24420001 */ addiu $v0,$v0,0x1 @@ -11784,8 +11784,8 @@ glabel func0f162194 /* f1623c0: 50200011 */ beqzl $at,.L0f162408 /* f1623c4: 24420001 */ addiu $v0,$v0,0x1 /* f1623c8: a5620000 */ sh $v0,0x0($t3) -/* f1623cc: 3c03800a */ lui $v1,0x800a -/* f1623d0: 8c63a27c */ lw $v1,-0x5d84($v1) +/* f1623cc: 3c03800a */ lui $v1,%hi(g_Vars+0x2bc) +/* f1623d0: 8c63a27c */ lw $v1,%lo(g_Vars+0x2bc)($v1) /* f1623d4: 25290001 */ addiu $t1,$t1,0x1 /* f1623d8: 24c60002 */ addiu $a2,$a2,0x2 /* f1623dc: 10000009 */ beqz $zero,.L0f162404 @@ -11794,8 +11794,8 @@ glabel func0f162194 /* f1623e4: 50200008 */ beqzl $at,.L0f162408 /* f1623e8: 24420001 */ addiu $v0,$v0,0x1 /* f1623ec: a5a20000 */ sh $v0,0x0($t5) -/* f1623f0: 3c03800a */ lui $v1,0x800a -/* f1623f4: 8c63a27c */ lw $v1,-0x5d84($v1) +/* f1623f0: 3c03800a */ lui $v1,%hi(g_Vars+0x2bc) +/* f1623f4: 8c63a27c */ lw $v1,%lo(g_Vars+0x2bc)($v1) /* f1623f8: 254a0001 */ addiu $t2,$t2,0x1 /* f1623fc: 258c0002 */ addiu $t4,$t4,0x2 /* f162400: 25ad0002 */ addiu $t5,$t5,0x2 @@ -11814,16 +11814,16 @@ glabel func0f162194 /* f162428: 14c0003f */ bnez $a2,.L0f162528 /* f16242c: 00000000 */ sll $zero,$zero,0x0 /* f162430: 1580003d */ bnez $t4,.L0f162528 -/* f162434: 3c03800a */ lui $v1,0x800a -/* f162438: 8c63a27c */ lw $v1,-0x5d84($v1) +/* f162434: 3c03800a */ lui $v1,%hi(g_Vars+0x2bc) +/* f162438: 8c63a27c */ lw $v1,%lo(g_Vars+0x2bc)($v1) /* f16243c: 24020001 */ addiu $v0,$zero,0x1 -/* f162440: 3c07800a */ lui $a3,%hi(var800a008c) +/* f162440: 3c07800a */ lui $a3,%hi(g_RoomPtrs) /* f162444: 28610002 */ slti $at,$v1,0x2 /* f162448: 14200037 */ bnez $at,.L0f162528 /* f16244c: 00000000 */ sll $zero,$zero,0x0 -/* f162450: 8ce74928 */ lw $a3,0x4928($a3) +/* f162450: 8ce74928 */ lw $a3,%lo(g_RoomPtrs)($a3) /* f162454: 27ab0054 */ addiu $t3,$sp,0x54 -/* f162458: 24e7008c */ addiu $a3,$a3,%lo(var800a008c) +/* f162458: 24e7008c */ addiu $a3,$a3,140 .L0f16245c: /* f16245c: 4600a086 */ mov.s $f2,$f20 /* f162460: 27a60048 */ addiu $a2,$sp,0x48 @@ -12067,7 +12067,7 @@ glabel var7f1b76bc /* f1625ec: 27bdffa0 */ addiu $sp,$sp,-96 /* f1625f0: afb2001c */ sw $s2,0x1c($sp) /* f1625f4: afb00014 */ sw $s0,0x14($sp) -/* f1625f8: 3c01800a */ lui $at,0x800a +/* f1625f8: 3c01800a */ lui $at,%hi(var800a65d0) /* f1625fc: 00808025 */ or $s0,$a0,$zero /* f162600: 00a09025 */ or $s2,$a1,$zero /* f162604: afbf0034 */ sw $ra,0x34($sp) @@ -12078,7 +12078,7 @@ glabel var7f1b76bc /* f162618: afb30020 */ sw $s3,0x20($sp) /* f16261c: afb10018 */ sw $s1,0x18($sp) /* f162620: 14800003 */ bnez $a0,.L0f162630 -/* f162624: ac2065d0 */ sw $zero,0x65d0($at) +/* f162624: ac2065d0 */ sw $zero,%lo(var800a65d0)($at) /* f162628: 100001a6 */ beqz $zero,.L0f162cc4 /* f16262c: 00801025 */ or $v0,$a0,$zero .L0f162630: @@ -12204,8 +12204,8 @@ glabel var7f1b76bc /* f1627e0: 1000ff9c */ beqz $zero,.L0f162654 /* f1627e4: 020b8021 */ addu $s0,$s0,$t3 /* f1627e8: 12400017 */ beqz $s2,.L0f162848 -/* f1627ec: 3c02800a */ lui $v0,0x800a -/* f1627f0: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f1627ec: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f1627f0: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f1627f4: c4441794 */ lwc1 $f4,0x1794($v0) /* f1627f8: 4600218d */ trunc.w.s $f6,$f4 /* f1627fc: 440d3000 */ mfc1 $t5,$f6 @@ -12327,14 +12327,14 @@ glabel var7f1b76bc /* f1629a4: 0fc57443 */ jal func0f15d10c /* f1629a8: 27a5004c */ addiu $a1,$sp,0x4c /* f1629ac: 14400003 */ bnez $v0,.L0f1629bc -/* f1629b0: 3c05800a */ lui $a1,%hi(var800a1794) +/* f1629b0: 3c05800a */ lui $a1,%hi(g_Vars+0x284) /* f1629b4: 1000000f */ beqz $zero,.L0f1629f4 /* f1629b8: ae760000 */ sw $s6,0x0($s3) .L0f1629bc: -/* f1629bc: 8ca5a244 */ lw $a1,-0x5dbc($a1) +/* f1629bc: 8ca5a244 */ lw $a1,%lo(g_Vars+0x284)($a1) /* f1629c0: 27a4004c */ addiu $a0,$sp,0x4c /* f1629c4: 0fc5755c */ jal func0f15d570 -/* f1629c8: 24a51794 */ addiu $a1,$a1,%lo(var800a1794) +/* f1629c8: 24a51794 */ addiu $a1,$a1,6036 /* f1629cc: 14400003 */ bnez $v0,.L0f1629dc /* f1629d0: 3c04800a */ lui $a0,%hi(var800a65c8) /* f1629d4: 10000007 */ beqz $zero,.L0f1629f4 @@ -12368,13 +12368,13 @@ glabel var7f1b76bc /* f162a38: 3c02800a */ lui $v0,%hi(var800a4bec) /* f162a3c: 8c424bec */ lw $v0,%lo(var800a4bec)($v0) /* f162a40: 8e18000c */ lw $t8,0xc($s0) -/* f162a44: 3c01800a */ lui $at,0x800a +/* f162a44: 3c01800a */ lui $at,%hi(var800a4930) /* f162a48: 0002c840 */ sll $t9,$v0,0x1 /* f162a4c: 00390821 */ addu $at,$at,$t9 -/* f162a50: a4384930 */ sh $t8,0x4930($at) -/* f162a54: 3c01800a */ lui $at,0x800a +/* f162a50: a4384930 */ sh $t8,%lo(var800a4930)($at) +/* f162a54: 3c01800a */ lui $at,%hi(var800a4bec) /* f162a58: 24480001 */ addiu $t0,$v0,0x1 -/* f162a5c: ac284bec */ sw $t0,0x4bec($at) +/* f162a5c: ac284bec */ sw $t0,%lo(var800a4bec)($at) .L0f162a60: /* f162a60: 92090001 */ lbu $t1,0x1($s0) .L0f162a64: @@ -12437,8 +12437,8 @@ glabel var7f1b76bc /* f162b34: 1000fec7 */ beqz $zero,.L0f162654 /* f162b38: 02088021 */ addu $s0,$s0,$t0 /* f162b3c: 12400002 */ beqz $s2,.L0f162b48 -/* f162b40: 3c01800a */ lui $at,0x800a -/* f162b44: ac3665b8 */ sw $s6,0x65b8($at) +/* f162b40: 3c01800a */ lui $at,%hi(var800a65b8) +/* f162b44: ac3665b8 */ sw $s6,%lo(var800a65b8)($at) .L0f162b48: /* f162b48: 92090001 */ lbu $t1,0x1($s0) /* f162b4c: 000950c0 */ sll $t2,$t1,0x3 @@ -12500,8 +12500,8 @@ glabel var7f1b76bc /* f162c1c: 1000fe8d */ beqz $zero,.L0f162654 /* f162c20: 00498021 */ addu $s0,$v0,$t1 /* f162c24: 920b0001 */ lbu $t3,0x1($s0) -/* f162c28: 3c01800a */ lui $at,0x800a -/* f162c2c: ac2065d0 */ sw $zero,0x65d0($at) +/* f162c28: 3c01800a */ lui $at,%hi(var800a65d0) +/* f162c2c: ac2065d0 */ sw $zero,%lo(var800a65d0)($at) /* f162c30: 000b60c0 */ sll $t4,$t3,0x3 /* f162c34: 10000023 */ beqz $zero,.L0f162cc4 /* f162c38: 020c1021 */ addu $v0,$s0,$t4 @@ -12511,9 +12511,9 @@ glabel var7f1b76bc /* f162c48: 000d70c0 */ sll $t6,$t5,0x3 /* f162c4c: 1040fe81 */ beqz $v0,.L0f162654 /* f162c50: 020e8021 */ addu $s0,$s0,$t6 -/* f162c54: 3c01800a */ lui $at,0x800a +/* f162c54: 3c01800a */ lui $at,%hi(var800a65d0) /* f162c58: 1000fe7e */ beqz $zero,.L0f162654 -/* f162c5c: ac3665d0 */ sw $s6,0x65d0($at) +/* f162c5c: ac3665d0 */ sw $s6,%lo(var800a65d0)($at) /* f162c60: 0fc58962 */ jal func0f162588 /* f162c64: 00000000 */ sll $zero,$zero,0x0 /* f162c68: 920f0001 */ lbu $t7,0x1($s0) @@ -12557,11 +12557,11 @@ glabel var7f1b76bc GLOBAL_ASM( glabel func0f162cf0 /* f162cf0: 27bdffe0 */ addiu $sp,$sp,-32 -/* f162cf4: 3c06800a */ lui $a2,0x800a +/* f162cf4: 3c06800a */ lui $a2,%hi(g_Vars+0x284) /* f162cf8: 3c018008 */ lui $at,0x8008 /* f162cfc: afbf0014 */ sw $ra,0x14($sp) /* f162d00: 00803825 */ or $a3,$a0,$zero -/* f162d04: 8cc6a244 */ lw $a2,-0x5dbc($a2) +/* f162d04: 8cc6a244 */ lw $a2,%lo(g_Vars+0x284)($a2) /* f162d08: 14800003 */ bnez $a0,.L0f162d18 /* f162d0c: ac20fcac */ sw $zero,-0x354($at) /* f162d10: 1000001e */ beqz $zero,.L0f162d8c @@ -12703,10 +12703,10 @@ glabel func0f162d9c /* f162f0c: 3c06800a */ lui $a2,%hi(var800a4640) /* f162f10: 46805420 */ cvt.s.w $f16,$f10 /* f162f14: 24c64640 */ addiu $a2,$a2,%lo(var800a4640) -/* f162f18: 3c17800a */ lui $s7,0x800a +/* f162f18: 3c17800a */ lui $s7,%hi(var800a4ce4+0x2) /* f162f1c: 3c1e800a */ lui $s8,%hi(var800a4ce4) /* f162f20: 27de4ce4 */ addiu $s8,$s8,%lo(var800a4ce4) -/* f162f24: 26f74ce6 */ addiu $s7,$s7,0x4ce6 +/* f162f24: 26f74ce6 */ addiu $s7,$s7,%lo(var800a4ce4+0x2) /* f162f28: e6d00024 */ swc1 $f16,0x24($s6) /* f162f2c: 84580030 */ lh $t8,0x30($v0) /* f162f30: 844f002e */ lh $t7,0x2e($v0) @@ -12916,7 +12916,7 @@ glabel func0f162d9c /* f163248: a638000a */ sh $t8,0xa($s1) /* f16324c: 8ecc1ba0 */ lw $t4,0x1ba0($s6) /* f163250: 8eab0000 */ lw $t3,0x0($s5) -/* f163254: 3c04800a */ lui $a0,0x800a +/* f163254: 3c04800a */ lui $a0,%hi(g_Vars+0x2bc) /* f163258: 000c68c0 */ sll $t5,$t4,0x3 /* f16325c: 01ac6821 */ addu $t5,$t5,$t4 /* f163260: 000d6880 */ sll $t5,$t5,0x2 @@ -12928,7 +12928,7 @@ glabel func0f162d9c /* f163278: 24c64640 */ addiu $a2,$a2,%lo(var800a4640) /* f16327c: 35cf0004 */ ori $t7,$t6,0x4 /* f163280: a44f0000 */ sh $t7,0x0($v0) -/* f163284: 8c84a27c */ lw $a0,-0x5d84($a0) +/* f163284: 8c84a27c */ lw $a0,%lo(g_Vars+0x2bc)($a0) .L0f163288: /* f163288: 26520001 */ addiu $s2,$s2,0x1 .L0f16328c: @@ -12980,7 +12980,7 @@ glabel func0f1632d4 /* f16332c: 17200079 */ bnez $t9,.L0f163514 /* f163330: 29c10002 */ slti $at,$t6,0x2 /* f163334: 1420000e */ bnez $at,.L0f163370 -/* f163338: 3c19800a */ lui $t9,0x800a +/* f163338: 3c19800a */ lui $t9,%hi(g_Vars+0x2c) /* f16333c: 90440004 */ lbu $a0,0x4($v0) /* f163340: 288100ff */ slti $at,$a0,0xff /* f163344: 10200006 */ beqz $at,.L0f163360 @@ -12991,7 +12991,7 @@ glabel func0f1632d4 /* f163358: 030d1021 */ addu $v0,$t8,$t5 /* f16335c: 90430004 */ lbu $v1,0x4($v0) .L0f163360: -/* f163360: 8f399fec */ lw $t9,-0x6014($t9) +/* f163360: 8f399fec */ lw $t9,%lo(g_Vars+0x2c)($t9) /* f163364: 0323082a */ slt $at,$t9,$v1 /* f163368: 5420006b */ bnezl $at,.L0f163518 /* f16336c: 8fbf001c */ lw $ra,0x1c($sp) @@ -13146,16 +13146,16 @@ glabel func0f163528 /* f163584: 2728ffff */ addiu $t0,$t9,-1 /* f163588: a0480006 */ sb $t0,0x6($v0) /* f16358c: 84a90000 */ lh $t1,0x0($a1) -/* f163590: 3c17800a */ lui $s7,%hi(var800a1bb0) +/* f163590: 3c17800a */ lui $s7,%hi(g_Vars+0x284) /* f163594: 00808825 */ or $s1,$a0,$zero /* f163598: 252a0001 */ addiu $t2,$t1,0x1 /* f16359c: a4aa0000 */ sh $t2,0x0($a1) /* f1635a0: 908b000d */ lbu $t3,0xd($a0) -/* f1635a4: 8ef7a244 */ lw $s7,-0x5dbc($s7) +/* f1635a4: 8ef7a244 */ lw $s7,%lo(g_Vars+0x284)($s7) /* f1635a8: 0000a025 */ or $s4,$zero,$zero /* f1635ac: 2416ffff */ addiu $s6,$zero,-1 /* f1635b0: 196000b9 */ blez $t3,.L0f163898 -/* f1635b4: 26f71bb0 */ addiu $s7,$s7,%lo(var800a1bb0) +/* f1635b4: 26f71bb0 */ addiu $s7,$s7,7088 /* f1635b8: 0000a825 */ or $s5,$zero,$zero /* f1635bc: 27be0054 */ addiu $s8,$sp,0x54 /* f1635c0: 862d000e */ lh $t5,0xe($s1) @@ -13849,10 +13849,10 @@ glabel func0f163e34 /* f163f88: 3c018008 */ lui $at,0x8008 /* f163f8c: ac20fc2c */ sw $zero,-0x3d4($at) /* f163f90: aca00000 */ sw $zero,0x0($a1) -/* f163f94: 3c01800a */ lui $at,0x800a -/* f163f98: a4204ce6 */ sh $zero,0x4ce6($at) -/* f163f9c: 3c01800a */ lui $at,0x800a -/* f163fa0: a4294ce4 */ sh $t1,0x4ce4($at) +/* f163f94: 3c01800a */ lui $at,%hi(var800a4ce4+0x2) +/* f163f98: a4204ce6 */ sh $zero,%lo(var800a4ce4+0x2)($at) +/* f163f9c: 3c01800a */ lui $at,%hi(var800a4ce4) +/* f163fa0: a4294ce4 */ sh $t1,%lo(var800a4ce4)($at) /* f163fa4: 3c02800a */ lui $v0,%hi(var800a4640) /* f163fa8: 24424640 */ addiu $v0,$v0,%lo(var800a4640) /* f163fac: 87ac0038 */ lh $t4,0x38($sp) @@ -14036,15 +14036,15 @@ glabel var7f1b76c0 /* f16421c: 11e000b2 */ beqz $t7,.L0f1644e8 /* f164220: e7a400ac */ swc1 $f4,0xac($sp) /* f164224: 8c6602bc */ lw $a2,0x2bc($v1) -/* f164228: 3c03800a */ lui $v1,%hi(var800a008c) +/* f164228: 3c03800a */ lui $v1,%hi(g_RoomPtrs) /* f16422c: 24040001 */ addiu $a0,$zero,0x1 /* f164230: 28c10002 */ slti $at,$a2,0x2 /* f164234: 142000ac */ bnez $at,.L0f1644e8 /* f164238: 00000000 */ sll $zero,$zero,0x0 -/* f16423c: 8c634928 */ lw $v1,0x4928($v1) +/* f16423c: 8c634928 */ lw $v1,%lo(g_RoomPtrs)($v1) /* f164240: 3c08800a */ lui $t0,%hi(var8009dd6c) /* f164244: 2508dd6c */ addiu $t0,$t0,%lo(var8009dd6c) -/* f164248: 2463008c */ addiu $v1,$v1,%lo(var800a008c) +/* f164248: 2463008c */ addiu $v1,$v1,140 .L0f16424c: /* f16424c: 84780002 */ lh $t8,0x2($v1) /* f164250: 570000a2 */ bnezl $t8,.L0f1644dc @@ -14407,9 +14407,9 @@ glabel func0f164748 /* f164748: 27bdffc8 */ addiu $sp,$sp,-56 /* f16474c: afb00018 */ sw $s0,0x18($sp) /* f164750: afbf001c */ sw $ra,0x1c($sp) -/* f164754: 3c10800a */ lui $s0,0x800a +/* f164754: 3c10800a */ lui $s0,%hi(g_Vars+0x284) /* f164758: 0c002f02 */ jal func0000bc08 -/* f16475c: 8e10a244 */ lw $s0,-0x5dbc($s0) +/* f16475c: 8e10a244 */ lw $s0,%lo(g_Vars+0x284)($s0) /* f164760: 44822000 */ mtc1 $v0,$f4 /* f164764: 00000000 */ sll $zero,$zero,0x0 /* f164768: 468021a0 */ cvt.s.w $f6,$f4 diff --git a/src/game/game_1655c0.c b/src/game/game_1655c0.c index 3bd979211..c39d8c89c 100644 --- a/src/game/game_1655c0.c +++ b/src/game/game_1655c0.c @@ -16,10 +16,10 @@ glabel stageFindById /* f1655c8: 3c0e8008 */ lui $t6,0x8008 /* f1655cc: 24620d58 */ addiu $v0,$v1,0xd58 /* f1655d0: 25cefcc1 */ addiu $t6,$t6,-831 -/* f1655d4: 3c05800a */ lui $a1,0x800a +/* f1655d4: 3c05800a */ lui $a1,%hi(g_Vars+0x4b4) /* f1655d8: 004e082b */ sltu $at,$v0,$t6 /* f1655dc: 1420000a */ bnez $at,.L0f165608 -/* f1655e0: 8ca5a474 */ lw $a1,-0x5b8c($a1) +/* f1655e0: 8ca5a474 */ lw $a1,%lo(g_Vars+0x4b4)($a1) /* f1655e4: 846f0000 */ lh $t7,0x0($v1) .L0f1655e8: /* f1655e8: 54af0004 */ bnel $a1,$t7,.L0f1655fc diff --git a/src/game/game_165670.c b/src/game/game_165670.c index 731f51e51..598c93e0e 100644 --- a/src/game/game_165670.c +++ b/src/game/game_165670.c @@ -253,12 +253,12 @@ glabel func0f1657f8 GLOBAL_ASM( glabel func0f16598c /* f16598c: 240e0001 */ addiu $t6,$zero,0x1 -/* f165990: 3c01800a */ lui $at,0x800a -/* f165994: ac2e65e0 */ sw $t6,0x65e0($at) +/* f165990: 3c01800a */ lui $at,%hi(var800a65e0) +/* f165994: ac2e65e0 */ sw $t6,%lo(var800a65e0)($at) /* f165998: 27bdffe8 */ addiu $sp,$sp,-24 -/* f16599c: 3c01800a */ lui $at,0x800a +/* f16599c: 3c01800a */ lui $at,%hi(var800a65e4) /* f1659a0: afbf0014 */ sw $ra,0x14($sp) -/* f1659a4: ac2065e4 */ sw $zero,0x65e4($at) +/* f1659a4: ac2065e4 */ sw $zero,%lo(var800a65e4)($at) /* f1659a8: 84980004 */ lh $t8,0x4($a0) /* f1659ac: 848f0002 */ lh $t7,0x2($a0) /* f1659b0: afa40018 */ sw $a0,0x18($sp) @@ -410,17 +410,17 @@ glabel func0f16598c .L0f165bd4: /* f165bd4: e4500040 */ swc1 $f16,0x40($v0) /* f165bd8: 84830006 */ lh $v1,0x6($a0) -/* f165bdc: 3c01800a */ lui $at,0x800a +/* f165bdc: 3c01800a */ lui $at,%hi(var800a65e8) /* f165be0: 54600004 */ bnezl $v1,.L0f165bf4 /* f165be4: 44833000 */ mtc1 $v1,$f6 /* f165be8: 10000012 */ beqz $zero,.L0f165c34 -/* f165bec: ac2065e8 */ sw $zero,0x65e8($at) +/* f165bec: ac2065e8 */ sw $zero,%lo(var800a65e8)($at) /* f165bf0: 44833000 */ mtc1 $v1,$f6 .L0f165bf4: /* f165bf4: 3c02800a */ lui $v0,%hi(var800a65f0) /* f165bf8: 244265f0 */ addiu $v0,$v0,%lo(var800a65f0) /* f165bfc: 468032a0 */ cvt.s.w $f10,$f6 -/* f165c00: 3c01800a */ lui $at,0x800a +/* f165c00: 3c01800a */ lui $at,%hi(var800a65e8) /* f165c04: e44a0000 */ swc1 $f10,0x0($v0) /* f165c08: 848a0008 */ lh $t2,0x8($a0) /* f165c0c: 448a2000 */ mtc1 $t2,$f4 @@ -432,7 +432,7 @@ glabel func0f16598c /* f165c24: 00000000 */ sll $zero,$zero,0x0 /* f165c28: 46804420 */ cvt.s.w $f16,$f8 /* f165c2c: e4500008 */ swc1 $f16,0x8($v0) -/* f165c30: ac2265e8 */ sw $v0,0x65e8($at) +/* f165c30: ac2265e8 */ sw $v0,%lo(var800a65e8)($at) .L0f165c34: /* f165c34: 0fc595fe */ jal func0f1657f8 /* f165c38: 00000000 */ sll $zero,$zero,0x0 @@ -577,19 +577,19 @@ glabel func0f165c4c .L0f165e34: /* f165e34: e450003c */ swc1 $f16,0x3c($v0) /* f165e38: c48a0030 */ lwc1 $f10,0x30($a0) -/* f165e3c: 3c01800a */ lui $at,0x800a +/* f165e3c: 3c01800a */ lui $at,%hi(var800a65e8) /* f165e40: e44a0040 */ swc1 $f10,0x40($v0) /* f165e44: 84830008 */ lh $v1,0x8($a0) /* f165e48: 54600004 */ bnezl $v1,.L0f165e5c /* f165e4c: 44839000 */ mtc1 $v1,$f18 /* f165e50: 10000012 */ beqz $zero,.L0f165e9c -/* f165e54: ac2065e8 */ sw $zero,0x65e8($at) +/* f165e54: ac2065e8 */ sw $zero,%lo(var800a65e8)($at) /* f165e58: 44839000 */ mtc1 $v1,$f18 .L0f165e5c: /* f165e5c: 3c02800a */ lui $v0,%hi(var800a65f0) /* f165e60: 244265f0 */ addiu $v0,$v0,%lo(var800a65f0) /* f165e64: 46809120 */ cvt.s.w $f4,$f18 -/* f165e68: 3c01800a */ lui $at,0x800a +/* f165e68: 3c01800a */ lui $at,%hi(var800a65e8) /* f165e6c: e4440000 */ swc1 $f4,0x0($v0) /* f165e70: 848e000a */ lh $t6,0xa($a0) /* f165e74: 448e3000 */ mtc1 $t6,$f6 @@ -601,16 +601,16 @@ glabel func0f165c4c /* f165e8c: 00000000 */ sll $zero,$zero,0x0 /* f165e90: 468082a0 */ cvt.s.w $f10,$f16 /* f165e94: e44a0008 */ swc1 $f10,0x8($v0) -/* f165e98: ac2265e8 */ sw $v0,0x65e8($at) +/* f165e98: ac2265e8 */ sw $v0,%lo(var800a65e8)($at) .L0f165e9c: -/* f165e9c: 3c01800a */ lui $at,0x800a +/* f165e9c: 3c01800a */ lui $at,%hi(var800a65e0) /* f165ea0: 8fbf0014 */ lw $ra,0x14($sp) -/* f165ea4: ac2065e0 */ sw $zero,0x65e0($at) +/* f165ea4: ac2065e0 */ sw $zero,%lo(var800a65e0)($at) /* f165ea8: 8c980034 */ lw $t8,0x34($a0) -/* f165eac: 3c01800a */ lui $at,0x800a +/* f165eac: 3c01800a */ lui $at,%hi(var800a65e4) /* f165eb0: 27bd0018 */ addiu $sp,$sp,0x18 /* f165eb4: 03e00008 */ jr $ra -/* f165eb8: ac3865e4 */ sw $t8,0x65e4($at) +/* f165eb8: ac3865e4 */ sw $t8,%lo(var800a65e4)($at) /* f165ebc: 3c028008 */ lui $v0,%hi(var80081058) /* f165ec0: 24421058 */ addiu $v0,$v0,%lo(var80081058) /* f165ec4: 44800000 */ mtc1 $zero,$f0 @@ -685,11 +685,11 @@ glabel func0f165eec /* f165f98: 3c02800a */ lui $v0,%hi(var800a6620) /* f165f9c: 24426620 */ addiu $v0,$v0,%lo(var800a6620) /* f165fa0: ac430000 */ sw $v1,0x0($v0) -/* f165fa4: 3c01800a */ lui $at,0x800a -/* f165fa8: ac236624 */ sw $v1,0x6624($at) -/* f165fac: 3c01800a */ lui $at,0x800a +/* f165fa4: 3c01800a */ lui $at,%hi(var800a6624) +/* f165fa8: ac236624 */ sw $v1,%lo(var800a6624)($at) +/* f165fac: 3c01800a */ lui $at,%hi(var800a6628) /* f165fb0: 246b002c */ addiu $t3,$v1,0x2c -/* f165fb4: ac2b6628 */ sw $t3,0x6628($at) +/* f165fb4: ac2b6628 */ sw $t3,%lo(var800a6628)($at) /* f165fb8: 0fc59663 */ jal func0f16598c /* f165fbc: 8c440000 */ lw $a0,0x0($v0) /* f165fc0: 10000035 */ beqz $zero,.L0f166098 @@ -706,17 +706,17 @@ glabel func0f165eec /* f165fe4: 3c0d8008 */ lui $t5,%hi(smallskies) /* f165fe8: 25ad1164 */ addiu $t5,$t5,%lo(smallskies) /* f165fec: 11800012 */ beqz $t4,.L0f166038 -/* f165ff0: 3c01800a */ lui $at,0x800a +/* f165ff0: 3c01800a */ lui $at,%hi(var800a6624) /* f165ff4: 85a20000 */ lh $v0,0x0($t5) .L0f165ff8: /* f165ff8: 14c2000b */ bne $a2,$v0,.L0f166028 /* f165ffc: 3c02800a */ lui $v0,%hi(var800a6620) /* f166000: 24426620 */ addiu $v0,$v0,%lo(var800a6620) /* f166004: ac430000 */ sw $v1,0x0($v0) -/* f166008: ac236624 */ sw $v1,0x6624($at) -/* f16600c: 3c01800a */ lui $at,0x800a +/* f166008: ac236624 */ sw $v1,%lo(var800a6624)($at) +/* f16600c: 3c01800a */ lui $at,%hi(var800a6628) /* f166010: 246e002c */ addiu $t6,$v1,0x2c -/* f166014: ac2e6628 */ sw $t6,0x6628($at) +/* f166014: ac2e6628 */ sw $t6,%lo(var800a6628)($at) /* f166018: 0fc59663 */ jal func0f16598c /* f16601c: 8c440000 */ lw $a0,0x0($v0) /* f166020: 1000001d */ beqz $zero,.L0f166098 @@ -786,7 +786,7 @@ glabel func0f1660a4 /* f1660f0: 3c03800a */ lui $v1,%hi(var800a6628) /* f1660f4: ad010000 */ sw $at,0x0($t0) /* f1660f8: 8f380004 */ lw $t8,0x4($t9) -/* f1660fc: 3c01800a */ lui $at,0x800a +/* f1660fc: 3c01800a */ lui $at,%hi(var800a6630+0x2) /* f166100: ad180004 */ sw $t8,0x4($t0) /* f166104: 8c636628 */ lw $v1,%lo(var800a6628)($v1) /* f166108: 84490002 */ lh $t1,0x2($v0) @@ -801,7 +801,7 @@ glabel func0f1660a4 /* f16612c: 4600320d */ trunc.w.s $f8,$f6 /* f166130: 440c4000 */ mfc1 $t4,$f8 /* f166134: 00000000 */ sll $zero,$zero,0x0 -/* f166138: a42c6632 */ sh $t4,0x6632($at) +/* f166138: a42c6632 */ sh $t4,%lo(var800a6630+0x2)($at) /* f16613c: 844d0004 */ lh $t5,0x4($v0) /* f166140: 846f0004 */ lh $t7,0x4($v1) /* f166144: 448d5000 */ mtc1 $t5,$f10 @@ -817,7 +817,7 @@ glabel func0f1660a4 /* f16616c: a4386634 */ sh $t8,0x6634($at) /* f166170: 8459000c */ lh $t9,0xc($v0) /* f166174: 8468000c */ lh $t0,0xc($v1) -/* f166178: 3c01800a */ lui $at,0x800a +/* f166178: 3c01800a */ lui $at,%hi(var800a663c) /* f16617c: 44994000 */ mtc1 $t9,$f8 /* f166180: 44885000 */ mtc1 $t0,$f10 /* f166184: 468043a0 */ cvt.s.w $f14,$f8 @@ -828,7 +828,7 @@ glabel func0f1660a4 /* f166198: 4600510d */ trunc.w.s $f4,$f10 /* f16619c: 440a2000 */ mfc1 $t2,$f4 /* f1661a0: 00000000 */ sll $zero,$zero,0x0 -/* f1661a4: a42a663c */ sh $t2,0x663c($at) +/* f1661a4: a42a663c */ sh $t2,%lo(var800a663c)($at) /* f1661a8: 844b000e */ lh $t3,0xe($v0) /* f1661ac: 846c000e */ lh $t4,0xe($v1) /* f1661b0: 448b3000 */ mtc1 $t3,$f6 @@ -898,8 +898,8 @@ glabel func0f1660a4 /* f1662a0: 0500fffb */ bltz $t0,.L0f166290 /* f1662a4: 00000000 */ sll $zero,$zero,0x0 .L0f1662a8: -/* f1662a8: 3c01800a */ lui $at,0x800a -/* f1662ac: a0286640 */ sb $t0,0x6640($at) +/* f1662a8: 3c01800a */ lui $at,%hi(var800a6640) +/* f1662ac: a0286640 */ sb $t0,%lo(var800a6640)($at) /* f1662b0: 90490011 */ lbu $t1,0x11($v0) /* f1662b4: 44d9f800 */ ctc1 $t9,$31 /* f1662b8: 3c014f80 */ lui $at,0x4f80 @@ -960,8 +960,8 @@ glabel func0f1660a4 /* f166384: 0580fffb */ bltz $t4,.L0f166374 /* f166388: 00000000 */ sll $zero,$zero,0x0 .L0f16638c: -/* f16638c: 3c01800a */ lui $at,0x800a -/* f166390: a02c6641 */ sb $t4,0x6641($at) +/* f16638c: 3c01800a */ lui $at,%hi(var800a6640+0x1) +/* f166390: a02c6641 */ sb $t4,%lo(var800a6640+0x1)($at) /* f166394: 904d0012 */ lbu $t5,0x12($v0) /* f166398: 44cbf800 */ ctc1 $t3,$31 /* f16639c: 3c014f80 */ lui $at,0x4f80 @@ -1022,8 +1022,8 @@ glabel func0f1660a4 /* f166468: 0700fffb */ bltz $t8,.L0f166458 /* f16646c: 00000000 */ sll $zero,$zero,0x0 .L0f166470: -/* f166470: 3c01800a */ lui $at,0x800a -/* f166474: a0386642 */ sb $t8,0x6642($at) +/* f166470: 3c01800a */ lui $at,%hi(var800a6640+0x2) +/* f166474: a0386642 */ sb $t8,%lo(var800a6640+0x2)($at) /* f166478: 44cef800 */ ctc1 $t6,$31 /* f16647c: 330f00f8 */ andi $t7,$t8,0xf8 /* f166480: a0296640 */ sb $t1,0x6640($at) @@ -1217,8 +1217,8 @@ glabel func0f1666f8 /* f166710: 10000031 */ beqz $zero,.L0f1667d8 /* f166714: 24020001 */ addiu $v0,$zero,0x1 .L0f166718: -/* f166718: 3c02800a */ lui $v0,0x800a -/* f16671c: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f166718: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f16671c: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f166720: 24010001 */ addiu $at,$zero,0x1 /* f166724: 944f0010 */ lhu $t7,0x10($v0) /* f166728: 24431bb0 */ addiu $v1,$v0,0x1bb0 @@ -1291,7 +1291,7 @@ glabel func0f1667f4 /* f16680c: 44801000 */ mtc1 $zero,$f2 .L0f166810: /* f166810: c4840014 */ lwc1 $f4,0x14($a0) -/* f166814: 3c0f800a */ lui $t7,0x800a +/* f166814: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) /* f166818: 4602203c */ c.lt.s $f4,$f2 /* f16681c: 00000000 */ sll $zero,$zero,0x0 /* f166820: 45000003 */ bc1f .L0f166830 @@ -1299,7 +1299,7 @@ glabel func0f1667f4 /* f166828: 03e00008 */ jr $ra /* f16682c: 24020002 */ addiu $v0,$zero,0x2 .L0f166830: -/* f166830: 8defa244 */ lw $t7,-0x5dbc($t7) +/* f166830: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) /* f166834: 24010001 */ addiu $at,$zero,0x1 /* f166838: 3c028008 */ lui $v0,%hi(var80081058) /* f16683c: 95f80010 */ lhu $t8,0x10($t7) diff --git a/src/game/game_1668e0.c b/src/game/game_1668e0.c index 87c485afa..49593775a 100644 --- a/src/game/game_1668e0.c +++ b/src/game/game_1668e0.c @@ -13,8 +13,8 @@ GLOBAL_ASM( glabel func0f1668e0 -/* f1668e0: 3c0e800a */ lui $t6,0x800a -/* f1668e4: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f1668e0: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f1668e4: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f1668e8: 03e00008 */ jr $ra /* f1668ec: adc41700 */ sw $a0,0x1700($t6) ); @@ -273,11 +273,11 @@ glabel func0f166c20 /* f166c4c: 01d8c821 */ addu $t9,$t6,$t8 /* f166c50: 87300010 */ lh $s0,0x10($t9) /* f166c54: 2402ffff */ addiu $v0,$zero,-1 -/* f166c58: 3c08800a */ lui $t0,0x800a +/* f166c58: 3c08800a */ lui $t0,%hi(g_Vars+0x284) /* f166c5c: 12020015 */ beq $s0,$v0,.L0f166cb4 /* f166c60: 3c0a800a */ lui $t2,%hi(var800a6668) /* f166c64: 8d4a6668 */ lw $t2,%lo(var800a6668)($t2) -/* f166c68: 8d08a244 */ lw $t0,-0x5dbc($t0) +/* f166c68: 8d08a244 */ lw $t0,%lo(g_Vars+0x284)($t0) /* f166c6c: 00105840 */ sll $t3,$s0,0x1 /* f166c70: 014b6021 */ addu $t4,$t2,$t3 /* f166c74: 858d0000 */ lh $t5,0x0($t4) @@ -310,7 +310,7 @@ glabel func0f166c20 /* f166cd8: 8fa50068 */ lw $a1,0x68($sp) /* f166cdc: 3c19800a */ lui $t9,%hi(var800a6660) /* f166ce0: 8f396660 */ lw $t9,%lo(var800a6660)($t9) -/* f166ce4: 3c0c800a */ lui $t4,0x800a +/* f166ce4: 3c0c800a */ lui $t4,%hi(g_Vars+0x284) /* f166ce8: 3c0d800a */ lui $t5,%hi(var800a6668) /* f166cec: 03304021 */ addu $t0,$t9,$s0 /* f166cf0: 10000006 */ beqz $zero,.L0f166d0c @@ -322,7 +322,7 @@ glabel func0f166c20 /* f166d04: 10000018 */ beqz $zero,.L0f166d68 /* f166d08: a1600000 */ sb $zero,0x0($t3) .L0f166d0c: -/* f166d0c: 8d8ca244 */ lw $t4,-0x5dbc($t4) +/* f166d0c: 8d8ca244 */ lw $t4,%lo(g_Vars+0x284)($t4) /* f166d10: 8dad6668 */ lw $t5,%lo(var800a6668)($t5) /* f166d14: 00107840 */ sll $t7,$s0,0x1 /* f166d18: 8d891700 */ lw $t1,0x1700($t4) diff --git a/src/game/game_166e40.c b/src/game/game_166e40.c index 88a5c137d..234f4aa12 100644 --- a/src/game/game_166e40.c +++ b/src/game/game_166e40.c @@ -802,7 +802,7 @@ glabel func0f167350 /* f167830: 00003825 */ or $a3,$zero,$zero /* f167834: 00001825 */ or $v1,$zero,$zero /* f167838: 10a00003 */ beqz $a1,.L0f167848 -/* f16783c: 3c01800b */ lui $at,0x800b +/* f16783c: 3c01800b */ lui $at,%hi(var800aa5a0) /* f167840: 10000001 */ beqz $zero,.L0f167848 /* f167844: 24070001 */ addiu $a3,$zero,0x1 .L0f167848: @@ -867,12 +867,12 @@ glabel func0f167350 /* f167918: 27bd0038 */ addiu $sp,$sp,0x38 /* f16791c: 032ec021 */ addu $t8,$t9,$t6 /* f167920: ad980008 */ sw $t8,0x8($t4) -/* f167924: a020a5a0 */ sb $zero,-0x5a60($at) -/* f167928: 3c01800b */ lui $at,0x800b -/* f16792c: ac20a5a4 */ sw $zero,-0x5a5c($at) -/* f167930: 3c01800b */ lui $at,0x800b +/* f167924: a020a5a0 */ sb $zero,%lo(var800aa5a0)($at) +/* f167928: 3c01800b */ lui $at,%hi(var800aa5a4) +/* f16792c: ac20a5a4 */ sw $zero,%lo(var800aa5a4)($at) +/* f167930: 3c01800b */ lui $at,%hi(var800aa59c) /* f167934: 03e00008 */ jr $ra -/* f167938: ac26a59c */ sw $a2,-0x5a64($at) +/* f167938: ac26a59c */ sw $a2,%lo(var800aa59c)($at) ); GLOBAL_ASM( @@ -882,9 +882,9 @@ glabel func0f16793c /* f167944: 3c02800b */ lui $v0,%hi(var800aa580) /* f167948: 240e0001 */ addiu $t6,$zero,0x1 /* f16794c: 000fc080 */ sll $t8,$t7,0x2 -/* f167950: 3c01800b */ lui $at,0x800b +/* f167950: 3c01800b */ lui $at,%hi(var800aa5a4) /* f167954: 00581021 */ addu $v0,$v0,$t8 -/* f167958: ac2ea5a4 */ sw $t6,-0x5a5c($at) +/* f167958: ac2ea5a4 */ sw $t6,%lo(var800aa5a4)($at) /* f16795c: 03e00008 */ jr $ra /* f167960: 8c42a580 */ lw $v0,%lo(var800aa580)($v0) ); @@ -959,20 +959,20 @@ glabel func0f167a18 /* f167a18: 3c04800b */ lui $a0,%hi(var800aa5a0) /* f167a1c: 2484a5a0 */ addiu $a0,$a0,%lo(var800aa5a0) /* f167a20: 908e0000 */ lbu $t6,0x0($a0) -/* f167a24: 3c01800b */ lui $at,0x800b +/* f167a24: 3c01800b */ lui $at,%hi(var800aa5a4) /* f167a28: 3c19800b */ lui $t9,%hi(var800aa590) /* f167a2c: 39cf0001 */ xori $t7,$t6,0x1 /* f167a30: a08f0000 */ sb $t7,0x0($a0) -/* f167a34: ac20a5a4 */ sw $zero,-0x5a5c($at) +/* f167a34: ac20a5a4 */ sw $zero,%lo(var800aa5a4)($at) /* f167a38: 90820000 */ lbu $v0,0x0($a0) /* f167a3c: 3c058008 */ lui $a1,%hi(var80084008) -/* f167a40: 3c01800b */ lui $at,0x800b +/* f167a40: 3c01800b */ lui $at,%hi(var800aa59c) /* f167a44: 0002c080 */ sll $t8,$v0,0x2 /* f167a48: 0338c821 */ addu $t9,$t9,$t8 /* f167a4c: 8f39a590 */ lw $t9,%lo(var800aa590)($t9) /* f167a50: 24a54008 */ addiu $a1,$a1,%lo(var80084008) /* f167a54: 240a0002 */ addiu $t2,$zero,0x2 -/* f167a58: ac39a59c */ sw $t9,-0x5a64($at) +/* f167a58: ac39a59c */ sw $t9,%lo(var800aa59c)($at) /* f167a5c: 8ca30000 */ lw $v1,0x0($a1) /* f167a60: 3c018008 */ lui $at,0x8008 /* f167a64: 00380821 */ addu $at,$at,$t8 diff --git a/src/game/game_167ae0.c b/src/game/game_167ae0.c index 6aa66e05b..6e27c10fe 100644 --- a/src/game/game_167ae0.c +++ b/src/game/game_167ae0.c @@ -215,10 +215,10 @@ glabel func0f167b84 /* f167c1c: e7a40014 */ swc1 $f4,0x14($sp) /* f167c20: 8fa30028 */ lw $v1,0x28($sp) /* f167c24: 8fae0038 */ lw $t6,0x38($sp) -/* f167c28: 3c01800b */ lui $at,0x800b +/* f167c28: 3c01800b */ lui $at,%hi(var800aa5c0) /* f167c2c: 00230821 */ addu $at,$at,$v1 /* f167c30: 10000011 */ beqz $zero,.L0f167c78 -/* f167c34: ac2ea5c0 */ sw $t6,-0x5a40($at) +/* f167c34: ac2ea5c0 */ sw $t6,%lo(var800aa5c0)($at) .L0f167c38: /* f167c38: 0fc59ed2 */ jal func0f167b48 /* f167c3c: 00000000 */ sll $zero,$zero,0x0 @@ -232,10 +232,10 @@ glabel func0f167b84 /* f167c5c: 0c00cec9 */ jal func00033b24 /* f167c60: afa20028 */ sw $v0,0x28($sp) /* f167c64: 8fa20028 */ lw $v0,0x28($sp) -/* f167c68: 3c01800b */ lui $at,0x800b +/* f167c68: 3c01800b */ lui $at,%hi(var800aa5c0) /* f167c6c: 2418ffff */ addiu $t8,$zero,-1 /* f167c70: 00220821 */ addu $at,$at,$v0 -/* f167c74: ac38a5c0 */ sw $t8,-0x5a40($at) +/* f167c74: ac38a5c0 */ sw $t8,%lo(var800aa5c0)($at) .L0f167c78: /* f167c78: 8fbf0024 */ lw $ra,0x24($sp) .L0f167c7c: @@ -246,8 +246,8 @@ glabel func0f167b84 GLOBAL_ASM( glabel func0f167c88 -/* f167c88: 3c0e800a */ lui $t6,0x800a -/* f167c8c: 8dce9ff4 */ lw $t6,-0x600c($t6) +/* f167c88: 3c0e800a */ lui $t6,%hi(g_Vars+0x34) +/* f167c8c: 8dce9ff4 */ lw $t6,%lo(g_Vars+0x34)($t6) /* f167c90: 27bdffe0 */ addiu $sp,$sp,-32 /* f167c94: afbf001c */ sw $ra,0x1c($sp) /* f167c98: afb10018 */ sw $s1,0x18($sp) @@ -265,8 +265,8 @@ glabel func0f167c88 /* f167cc4: 10000059 */ beqz $zero,.L0f167e2c /* f167cc8: 00000000 */ sll $zero,$zero,0x0 .L0f167ccc: -/* f167ccc: 3c05800a */ lui $a1,0x800a -/* f167cd0: 8ca5a428 */ lw $a1,-0x5bd8($a1) +/* f167ccc: 3c05800a */ lui $a1,%hi(g_Vars+0x468) +/* f167cd0: 8ca5a428 */ lw $a1,%lo(g_Vars+0x468)($a1) /* f167cd4: 0005782b */ sltu $t7,$zero,$a1 /* f167cd8: 11e0000a */ beqz $t7,.L0f167d04 /* f167cdc: 01e02825 */ or $a1,$t7,$zero @@ -275,33 +275,33 @@ glabel func0f167c88 /* f167ce8: 2c450001 */ sltiu $a1,$v0,0x1 /* f167cec: 10a00005 */ beqz $a1,.L0f167d04 /* f167cf0: 00000000 */ sll $zero,$zero,0x0 -/* f167cf4: 3c05800a */ lui $a1,0x800a -/* f167cf8: 8ca5a48c */ lw $a1,-0x5b74($a1) +/* f167cf4: 3c05800a */ lui $a1,%hi(g_Vars+0x4cc) +/* f167cf8: 8ca5a48c */ lw $a1,%lo(g_Vars+0x4cc)($a1) /* f167cfc: 2cb80001 */ sltiu $t8,$a1,0x1 /* f167d00: 03002825 */ or $a1,$t8,$zero .L0f167d04: /* f167d04: 0fc59ee1 */ jal func0f167b84 /* f167d08: 00002025 */ or $a0,$zero,$zero -/* f167d0c: 3c0a800a */ lui $t2,0x800a -/* f167d10: 8d4aa02c */ lw $t2,-0x5fd4($t2) +/* f167d0c: 3c0a800a */ lui $t2,%hi(g_Vars+0x6c) +/* f167d10: 8d4aa02c */ lw $t2,%lo(g_Vars+0x6c)($t2) /* f167d14: 00008825 */ or $s1,$zero,$zero /* f167d18: 00008025 */ or $s0,$zero,$zero /* f167d1c: 11400003 */ beqz $t2,.L0f167d2c -/* f167d20: 3c0b800a */ lui $t3,0x800a +/* f167d20: 3c0b800a */ lui $t3,%hi(g_Vars+0x68) /* f167d24: 10000002 */ beqz $zero,.L0f167d30 /* f167d28: 24060001 */ addiu $a2,$zero,0x1 .L0f167d2c: /* f167d2c: 00003025 */ or $a2,$zero,$zero .L0f167d30: -/* f167d30: 8d6ba028 */ lw $t3,-0x5fd8($t3) -/* f167d34: 3c09800a */ lui $t1,0x800a -/* f167d38: 3c07800a */ lui $a3,0x800a +/* f167d30: 8d6ba028 */ lw $t3,%lo(g_Vars+0x68)($t3) +/* f167d34: 3c09800a */ lui $t1,%hi(g_Vars+0x64) +/* f167d38: 3c07800a */ lui $a3,%hi(g_Vars+0x70) /* f167d3c: 11600003 */ beqz $t3,.L0f167d4c /* f167d40: 00002025 */ or $a0,$zero,$zero /* f167d44: 10000001 */ beqz $zero,.L0f167d4c /* f167d48: 24040001 */ addiu $a0,$zero,0x1 .L0f167d4c: -/* f167d4c: 8d29a024 */ lw $t1,-0x5fdc($t1) +/* f167d4c: 8d29a024 */ lw $t1,%lo(g_Vars+0x64)($t1) /* f167d50: 00001025 */ or $v0,$zero,$zero /* f167d54: 00002825 */ or $a1,$zero,$zero /* f167d58: 11200003 */ beqz $t1,.L0f167d68 @@ -309,7 +309,7 @@ glabel func0f167c88 /* f167d60: 10000001 */ beqz $zero,.L0f167d68 /* f167d64: 24020001 */ addiu $v0,$zero,0x1 .L0f167d68: -/* f167d68: 8ce7a030 */ lw $a3,-0x5fd0($a3) +/* f167d68: 8ce7a030 */ lw $a3,%lo(g_Vars+0x70)($a3) /* f167d6c: 3c0f800a */ lui $t7,%hi(g_Vars) /* f167d70: 25ef9fc0 */ addiu $t7,$t7,%lo(g_Vars) /* f167d74: 10e00003 */ beqz $a3,.L0f167d84 @@ -367,8 +367,8 @@ glabel func0f167c88 /* f167e24: 0fc59ee1 */ jal func0f167b84 /* f167e28: 02202825 */ or $a1,$s1,$zero .L0f167e2c: -/* f167e2c: 3c0f800a */ lui $t7,0x800a -/* f167e30: 8def9ff4 */ lw $t7,-0x600c($t7) +/* f167e2c: 3c0f800a */ lui $t7,%hi(g_Vars+0x34) +/* f167e30: 8def9ff4 */ lw $t7,%lo(g_Vars+0x34)($t7) /* f167e34: 3c108008 */ lui $s0,%hi(var80084034) /* f167e38: 26104034 */ addiu $s0,$s0,%lo(var80084034) /* f167e3c: 55e0000b */ bnezl $t7,.L0f167e6c @@ -896,8 +896,8 @@ glabel var7f1b77fc /* f168948: 00000000 */ sll $zero,$zero,0x0 /* f16894c: 0fc4a25f */ jal propGetPlayerNum /* f168950: 00c02025 */ or $a0,$a2,$zero -/* f168954: 3c0a800a */ lui $t2,0x800a -/* f168958: 8d4aa24c */ lw $t2,-0x5db4($t2) +/* f168954: 3c0a800a */ lui $t2,%hi(g_Vars+0x28c) +/* f168958: 8d4aa24c */ lw $t2,%lo(g_Vars+0x28c)($t2) /* f16895c: 8fa80050 */ lw $t0,0x50($sp) /* f168960: 544a0004 */ bnel $v0,$t2,.L0f168974 /* f168964: 8d020000 */ lw $v0,0x0($t0) @@ -912,21 +912,21 @@ glabel var7f1b77fc /* f168984: 1040001a */ beqz $v0,.L0f1689f0 /* f168988: 8fa90038 */ lw $t1,0x38($sp) /* f16898c: 8fab0054 */ lw $t3,0x54($sp) -/* f168990: 3c0c800a */ lui $t4,0x800a +/* f168990: 3c0c800a */ lui $t4,%hi(g_Vars+0x284) /* f168994: 00001025 */ or $v0,$zero,$zero /* f168998: 05600013 */ bltz $t3,.L0f1689e8 /* f16899c: 00000000 */ sll $zero,$zero,0x0 -/* f1689a0: 8d8ca244 */ lw $t4,-0x5dbc($t4) +/* f1689a0: 8d8ca244 */ lw $t4,%lo(g_Vars+0x284)($t4) /* f1689a4: 000b1840 */ sll $v1,$t3,0x1 /* f1689a8: 240d0081 */ addiu $t5,$zero,0x81 /* f1689ac: 01832021 */ addu $a0,$t4,$v1 /* f1689b0: 94821b90 */ lhu $v0,0x1b90($a0) -/* f1689b4: 3c0e800a */ lui $t6,0x800a +/* f1689b4: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) /* f1689b8: 28410081 */ slti $at,$v0,0x81 /* f1689bc: 50200006 */ beqzl $at,.L0f1689d8 /* f1689c0: 284100af */ slti $at,$v0,0xaf /* f1689c4: a48d1b90 */ sh $t5,0x1b90($a0) -/* f1689c8: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f1689c8: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f1689cc: 01c37821 */ addu $t7,$t6,$v1 /* f1689d0: 95e21b90 */ lhu $v0,0x1b90($t7) /* f1689d4: 284100af */ slti $at,$v0,0xaf @@ -1175,8 +1175,8 @@ glabel var7f1b784c .L0f168ca8: /* f168ca8: 1100000b */ beqz $t0,.L0f168cd8 /* f168cac: 00001825 */ or $v1,$zero,$zero -/* f168cb0: 3c04800a */ lui $a0,%hi(var800a000c) -/* f168cb4: 8c84a244 */ lw $a0,-0x5dbc($a0) +/* f168cb0: 3c04800a */ lui $a0,%hi(g_Vars+0x284) +/* f168cb4: 8c84a244 */ lw $a0,%lo(g_Vars+0x284)($a0) /* f168cb8: 24020030 */ addiu $v0,$zero,0x30 .L0f168cbc: /* f168cbc: 8c8a1630 */ lw $t2,0x1630($a0) @@ -1186,7 +1186,7 @@ glabel var7f1b784c /* f168ccc: 00004025 */ or $t0,$zero,$zero .L0f168cd0: /* f168cd0: 1462fffa */ bne $v1,$v0,.L0f168cbc -/* f168cd4: 2484000c */ addiu $a0,$a0,%lo(var800a000c) +/* f168cd4: 2484000c */ addiu $a0,$a0,12 .L0f168cd8: /* f168cd8: 11000014 */ beqz $t0,.L0f168d2c /* f168cdc: 3c01bf80 */ lui $at,0xbf80 @@ -1617,11 +1617,11 @@ glabel func0f1691c0 .L0f1692f8: /* f1692f8: 1468fff0 */ bne $v1,$t0,.L0f1692bc /* f1692fc: 24840004 */ addiu $a0,$a0,0x4 -/* f169300: 3c10800a */ lui $s0,%hi(var8009fffc) -/* f169304: 8e10a30c */ lw $s0,-0x5cf4($s0) -/* f169308: 3c02800a */ lui $v0,0x800a -/* f16930c: 8c42a308 */ lw $v0,-0x5cf8($v0) -/* f169310: 2610fffc */ addiu $s0,$s0,%lo(var8009fffc) +/* f169300: 3c10800a */ lui $s0,%hi(g_Vars+0x34c) +/* f169304: 8e10a30c */ lw $s0,%lo(g_Vars+0x34c)($s0) +/* f169308: 3c02800a */ lui $v0,%hi(g_Vars+0x348) +/* f16930c: 8c42a308 */ lw $v0,%lo(g_Vars+0x348)($v0) +/* f169310: 2610fffc */ addiu $s0,$s0,-4 /* f169314: 0202082b */ sltu $at,$s0,$v0 /* f169318: 5420000f */ bnezl $at,.L0f169358 /* f16931c: 8fbf0034 */ lw $ra,0x34($sp) @@ -1633,8 +1633,8 @@ glabel func0f1691c0 /* f169330: 02803825 */ or $a3,$s4,$zero /* f169334: 0fc5a2d3 */ jal func0f168b4c /* f169338: afb30010 */ sw $s3,0x10($sp) -/* f16933c: 3c02800a */ lui $v0,0x800a -/* f169340: 8c42a308 */ lw $v0,-0x5cf8($v0) +/* f16933c: 3c02800a */ lui $v0,%hi(g_Vars+0x348) +/* f169340: 8c42a308 */ lw $v0,%lo(g_Vars+0x348)($v0) .L0f169344: /* f169344: 2610fffc */ addiu $s0,$s0,-4 /* f169348: 0202082b */ sltu $at,$s0,$v0 @@ -2582,7 +2582,7 @@ glabel var7f1b7868 /* f16a0cc: 17c30032 */ bne $s8,$v1,.L0f16a198 /* f16a0d0: 3c188008 */ lui $t8,%hi(var80084088) /* f16a0d4: 8e0a0490 */ lw $t2,0x490($s0) -/* f16a0d8: 3c048009 */ lui $a0,%hi(var80090008) +/* f16a0d8: 3c048009 */ lui $a0,0x8009 /* f16a0dc: 24058052 */ addiu $a1,$zero,-32686 /* f16a0e0: 11400024 */ beqz $t2,.L0f16a174 /* f16a0e4: 00003025 */ or $a2,$zero,$zero @@ -2618,7 +2618,7 @@ glabel var7f1b7868 /* f16a15c: afa00014 */ sw $zero,0x14($sp) /* f16a160: afaf0010 */ sw $t7,0x10($sp) /* f16a164: 0fc244b7 */ jal func0f0912dc -/* f16a168: 24860008 */ addiu $a2,$a0,%lo(var80090008) +/* f16a168: 24860008 */ addiu $a2,$a0,8 /* f16a16c: 10000008 */ beqz $zero,.L0f16a190 /* f16a170: 00000000 */ sll $zero,$zero,0x0 .L0f16a174: @@ -4256,7 +4256,7 @@ glabel getEffectiveSlowMotion /* f16b890: 3c058006 */ lui $a1,%hi(var80059fe0) /* f16b894: 24a29fe0 */ addiu $v0,$a1,%lo(var80059fe0) /* f16b898: 11cf000d */ beq $t6,$t7,.L0f16b8d0 -/* f16b89c: 3c09800a */ lui $t1,0x800a +/* f16b89c: 3c09800a */ lui $t1,%hi(g_Vars+0x318) /* f16b8a0: 3c188006 */ lui $t8,0x8006 /* f16b8a4: 24431000 */ addiu $v1,$v0,0x1000 /* f16b8a8: 27189fe1 */ addiu $t8,$t8,-24607 @@ -4271,11 +4271,11 @@ glabel getEffectiveSlowMotion /* f16b8c8: 1420fffb */ bnez $at,.L0f16b8b8 /* f16b8cc: ac48fffc */ sw $t0,-0x4($v0) .L0f16b8d0: -/* f16b8d0: 8d29a2d8 */ lw $t1,-0x5d28($t1) -/* f16b8d4: 3c02800b */ lui $v0,0x800b +/* f16b8d0: 8d29a2d8 */ lw $t1,%lo(g_Vars+0x318)($t1) +/* f16b8d4: 3c02800b */ lui $v0,%hi(g_MpSetup+0xc) /* f16b8d8: 1120000b */ beqz $t1,.L0f16b908 /* f16b8dc: 00000000 */ sll $zero,$zero,0x0 -/* f16b8e0: 8c42cb94 */ lw $v0,-0x346c($v0) +/* f16b8e0: 8c42cb94 */ lw $v0,%lo(g_MpSetup+0xc)($v0) /* f16b8e4: 304a0040 */ andi $t2,$v0,0x40 /* f16b8e8: 11400003 */ beqz $t2,.L0f16b8f8 /* f16b8ec: 304b0080 */ andi $t3,$v0,0x80 @@ -5637,8 +5637,8 @@ glabel func0f16cb04 /* f16cb3c: 0fc2f641 */ jal func0f0bd904 /* f16cb40: 00002025 */ or $a0,$zero,$zero .L0f16cb44: -/* f16cb44: 3c02800a */ lui $v0,0x800a -/* f16cb48: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f16cb44: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f16cb48: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f16cb4c: 8c4300bc */ lw $v1,0xbc($v0) /* f16cb50: c4460310 */ lwc1 $f6,0x310($v0) /* f16cb54: c44a0318 */ lwc1 $f10,0x318($v0) @@ -5651,8 +5651,8 @@ glabel func0f16cb04 /* f16cb70: 46021482 */ mul.s $f18,$f2,$f2 /* f16cb74: 0c012974 */ jal sqrtf /* f16cb78: 46128300 */ add.s $f12,$f16,$f18 -/* f16cb7c: 3c02800a */ lui $v0,0x800a -/* f16cb80: 8c42a248 */ lw $v0,-0x5db8($v0) +/* f16cb7c: 3c02800a */ lui $v0,%hi(g_Vars+0x288) +/* f16cb80: 8c42a248 */ lw $v0,%lo(g_Vars+0x288)($v0) /* f16cb84: c4440038 */ lwc1 $f4,0x38($v0) /* f16cb88: 46002180 */ add.s $f6,$f4,$f0 /* f16cb8c: e4460038 */ swc1 $f6,0x38($v0) diff --git a/src/game/game_16cfa0.c b/src/game/game_16cfa0.c index d15cb459c..12a82eb0c 100644 --- a/src/game/game_16cfa0.c +++ b/src/game/game_16cfa0.c @@ -17,8 +17,8 @@ GLOBAL_ASM( glabel func0f16cfa0 -/* f16cfa0: 3c0e800a */ lui $t6,0x800a -/* f16cfa4: 8dcea474 */ lw $t6,-0x5b8c($t6) +/* f16cfa0: 3c0e800a */ lui $t6,%hi(g_Vars+0x4b4) +/* f16cfa4: 8dcea474 */ lw $t6,%lo(g_Vars+0x4b4)($t6) /* f16cfa8: 2401005c */ addiu $at,$zero,0x5c /* f16cfac: 3c028008 */ lui $v0,%hi(var800840ec) /* f16cfb0: 15c10003 */ bne $t6,$at,.L0f16cfc0 @@ -483,8 +483,8 @@ glabel func0f16d548 /* f16d5ac: afa5001c */ sw $a1,0x1c($sp) /* f16d5b0: 10400022 */ beqz $v0,.L0f16d63c /* f16d5b4: 8fa5001c */ lw $a1,0x1c($sp) -/* f16d5b8: 3c0f800a */ lui $t7,0x800a -/* f16d5bc: 8defa26c */ lw $t7,-0x5d94($t7) +/* f16d5b8: 3c0f800a */ lui $t7,%hi(g_Vars+0x2ac) +/* f16d5bc: 8defa26c */ lw $t7,%lo(g_Vars+0x2ac)($t7) /* f16d5c0: 24010006 */ addiu $at,$zero,0x6 /* f16d5c4: 3c028008 */ lui $v0,%hi(var800840cc) /* f16d5c8: 51e1001c */ beql $t7,$at,.L0f16d63c @@ -781,10 +781,10 @@ GLOBAL_ASM( glabel func0f16d9a8 /* f16d9a8: 27bdffe8 */ addiu $sp,$sp,-24 /* f16d9ac: afbf0014 */ sw $ra,0x14($sp) -/* f16d9b0: 3c01800b */ lui $at,0x800b +/* f16d9b0: 3c01800b */ lui $at,%hi(var800aa5d0) /* f16d9b4: 44806000 */ mtc1 $zero,$f12 /* f16d9b8: 0fc5b52e */ jal func0f16d4b8 -/* f16d9bc: ac24a5d0 */ sw $a0,-0x5a30($at) +/* f16d9bc: ac24a5d0 */ sw $a0,%lo(var800aa5d0)($at) /* f16d9c0: 3c04800b */ lui $a0,%hi(var800aa5d0) /* f16d9c4: 0fc5db36 */ jal func0f176cd8 /* f16d9c8: 8c84a5d0 */ lw $a0,%lo(var800aa5d0)($a0) @@ -802,9 +802,9 @@ glabel func0f16d9a8 GLOBAL_ASM( glabel func0f16d9f0 -/* f16d9f0: 3c01800b */ lui $at,0x800b +/* f16d9f0: 3c01800b */ lui $at,%hi(var800aa5d0) /* f16d9f4: 03e00008 */ jr $ra -/* f16d9f8: ac24a5d0 */ sw $a0,-0x5a30($at) +/* f16d9f8: ac24a5d0 */ sw $a0,%lo(var800aa5d0)($at) ); GLOBAL_ASM( @@ -875,8 +875,8 @@ glabel func0f16daa4 /* f16dad0: 3c053f80 */ lui $a1,0x3f80 /* f16dad4: 0fc5b4ab */ jal func0f16d2ac /* f16dad8: 00003025 */ or $a2,$zero,$zero -/* f16dadc: 3c0f800a */ lui $t7,0x800a -/* f16dae0: 8defa488 */ lw $t7,-0x5b78($t7) +/* f16dadc: 3c0f800a */ lui $t7,%hi(g_Vars+0x4c8) +/* f16dae0: 8defa488 */ lw $t7,%lo(g_Vars+0x4c8)($t7) /* f16dae4: 3c013f00 */ lui $at,0x3f00 /* f16dae8: 15e00004 */ bnez $t7,.L0f16dafc /* f16daec: 00000000 */ sll $zero,$zero,0x0 @@ -1226,8 +1226,8 @@ glabel audioSetTrack /* f16df68: 3107ffff */ andi $a3,$t0,0xffff /* f16df6c: 8fbf0014 */ lw $ra,0x14($sp) /* f16df70: 240e0001 */ addiu $t6,$zero,0x1 -/* f16df74: 3c01800a */ lui $at,0x800a -/* f16df78: ac2ea488 */ sw $t6,-0x5b78($at) +/* f16df74: 3c01800a */ lui $at,%hi(g_Vars+0x4c8) +/* f16df78: ac2ea488 */ sw $t6,%lo(g_Vars+0x4c8)($at) /* f16df7c: 03e00008 */ jr $ra /* f16df80: 27bd0018 */ addiu $sp,$sp,0x18 ); @@ -1237,10 +1237,10 @@ glabel audioRestartDefaultTrack /* f16df84: 3c0e8006 */ lui $t6,%hi(var800624a4) /* f16df88: 8dce24a4 */ lw $t6,%lo(var800624a4)($t6) /* f16df8c: 27bdffe8 */ addiu $sp,$sp,-24 -/* f16df90: 3c01800a */ lui $at,0x800a +/* f16df90: 3c01800a */ lui $at,%hi(g_Vars+0x4c8) /* f16df94: afbf0014 */ sw $ra,0x14($sp) /* f16df98: 15c00009 */ bnez $t6,.L0f16dfc0 -/* f16df9c: ac20a488 */ sw $zero,-0x5b78($at) +/* f16df9c: ac20a488 */ sw $zero,%lo(g_Vars+0x4c8)($at) /* f16dfa0: 0fc5b490 */ jal func0f16d240 /* f16dfa4: 24040001 */ addiu $a0,$zero,0x1 /* f16dfa8: 0fc5b490 */ jal func0f16d240 @@ -1312,16 +1312,16 @@ glabel audioPlayXTrack /* f16e074: 00000000 */ sll $zero,$zero,0x0 /* f16e078: 00a40019 */ multu $a1,$a0 /* f16e07c: 24180001 */ addiu $t8,$zero,0x1 -/* f16e080: 3c01800b */ lui $at,0x800b +/* f16e080: 3c01800b */ lui $at,%hi(var800aaa78) /* f16e084: ac780000 */ sw $t8,0x0($v1) /* f16e088: 00220821 */ addu $at,$at,$v0 /* f16e08c: 0000c812 */ mflo $t9 -/* f16e090: ac39aa78 */ sw $t9,-0x5588($at) -/* f16e094: 3c01800b */ lui $at,0x800b +/* f16e090: ac39aa78 */ sw $t9,%lo(var800aaa78)($at) +/* f16e094: 3c01800b */ lui $at,%hi(var800aaa88) /* f16e098: 00c40019 */ multu $a2,$a0 /* f16e09c: 00220821 */ addu $at,$at,$v0 /* f16e0a0: 00004012 */ mflo $t0 -/* f16e0a4: ac28aa88 */ sw $t0,-0x5578($at) +/* f16e0a4: ac28aa88 */ sw $t0,%lo(var800aaa88)($at) /* f16e0a8: 00000000 */ sll $zero,$zero,0x0 .L0f16e0ac: /* f16e0ac: 03e00008 */ jr $ra @@ -1334,10 +1334,10 @@ glabel audioStopTrack /* f16e0b8: 04800006 */ bltz $a0,.L0f16e0d4 /* f16e0bc: afbf0014 */ sw $ra,0x14($sp) /* f16e0c0: 00047080 */ sll $t6,$a0,0x2 -/* f16e0c4: 3c01800b */ lui $at,0x800b +/* f16e0c4: 3c01800b */ lui $at,%hi(var800aaa68) /* f16e0c8: 002e0821 */ addu $at,$at,$t6 /* f16e0cc: 10000016 */ beqz $zero,.L0f16e128 -/* f16e0d0: ac20aa68 */ sw $zero,-0x5598($at) +/* f16e0d0: ac20aa68 */ sw $zero,%lo(var800aaa68)($at) .L0f16e0d4: /* f16e0d4: 3c03800b */ lui $v1,%hi(var800aaa68) /* f16e0d8: 3c04800b */ lui $a0,%hi(var800aaa78) diff --git a/src/game/game_16e810.c b/src/game/game_16e810.c index d188a1f4c..7a97da556 100644 --- a/src/game/game_16e810.c +++ b/src/game/game_16e810.c @@ -270,11 +270,11 @@ glabel func0f16e818 /* f16eb8c: 2442b538 */ addiu $v0,$v0,%lo(var800ab538) /* f16eb90: 8c450000 */ lw $a1,0x0($v0) /* f16eb94: 8dcc0000 */ lw $t4,0x0($t6) -/* f16eb98: 3c01800b */ lui $at,0x800b +/* f16eb98: 3c01800b */ lui $at,%hi(var800aabd8) /* f16eb9c: 0005c100 */ sll $t8,$a1,0x4 /* f16eba0: 00380821 */ addu $at,$at,$t8 /* f16eba4: 000c6d02 */ srl $t5,$t4,0x14 -/* f16eba8: a42dabd8 */ sh $t5,-0x5428($at) +/* f16eba8: a42dabd8 */ sh $t5,%lo(var800aabd8)($at) /* f16ebac: 24af0001 */ addiu $t7,$a1,0x1 /* f16ebb0: 29e10096 */ slti $at,$t7,0x96 /* f16ebb4: 14200002 */ bnez $at,.L0f16ebc0 @@ -2096,10 +2096,10 @@ glabel var7f1b7a74 /* f17054c: afb90088 */ sw $t9,0x88($sp) /* f170550: 3c0b800b */ lui $t3,%hi(var800ab540) /* f170554: 8d6bb540 */ lw $t3,%lo(var800ab540)($t3) -/* f170558: 3c01800b */ lui $at,0x800b +/* f170558: 3c01800b */ lui $at,%hi(var800ab540) /* f17055c: 256f0001 */ addiu $t7,$t3,0x1 /* f170560: 10000002 */ beqz $zero,.L0f17056c -/* f170564: ac2fb540 */ sw $t7,-0x4ac0($at) +/* f170564: ac2fb540 */ sw $t7,%lo(var800ab540)($at) .L0f170568: /* f170568: ac400000 */ sw $zero,0x0($v0) .L0f17056c: @@ -2123,12 +2123,12 @@ glabel var7f1b7a74 /* f1705ac: 8fb70094 */ lw $s7,0x94($sp) /* f1705b0: 8cf9000c */ lw $t9,0xc($a3) /* f1705b4: 8d050000 */ lw $a1,0x0($t0) -/* f1705b8: 3c01800b */ lui $at,0x800b +/* f1705b8: 3c01800b */ lui $at,%hi(var800aabd8) /* f1705bc: 8f2e0000 */ lw $t6,0x0($t9) /* f1705c0: 00057900 */ sll $t7,$a1,0x4 /* f1705c4: 002f0821 */ addu $at,$at,$t7 /* f1705c8: 000e5d02 */ srl $t3,$t6,0x14 -/* f1705cc: a42babd8 */ sh $t3,-0x5428($at) +/* f1705cc: a42babd8 */ sh $t3,%lo(var800aabd8)($at) /* f1705d0: 24b80001 */ addiu $t8,$a1,0x1 /* f1705d4: 2b010096 */ slti $at,$t8,0x96 /* f1705d8: 14200002 */ bnez $at,.L0f1705e4 @@ -5540,7 +5540,7 @@ glabel func0f173010 /* f173258: 8e020008 */ lw $v0,0x8($s0) /* f17325c: 8d6bb53c */ lw $t3,%lo(var800ab53c)($t3) /* f173260: 8fa31490 */ lw $v1,0x1490($sp) -/* f173264: 3c18800b */ lui $t8,0x800b +/* f173264: 3c18800b */ lui $t8,%hi(var800ab53c) /* f173268: a44b0000 */ sh $t3,0x0($v0) /* f17326c: 8e0d0008 */ lw $t5,0x8($s0) /* f173270: 8e0e000c */ lw $t6,0xc($s0) @@ -5549,7 +5549,7 @@ glabel func0f173010 /* f17327c: ae0c0008 */ sw $t4,0x8($s0) /* f173280: ae08000c */ sw $t0,0xc($s0) /* f173284: 950d0000 */ lhu $t5,0x0($t0) -/* f173288: 8f19b53c */ lw $t9,-0x4ac4($t8) +/* f173288: 8f19b53c */ lw $t9,%lo(var800ab53c)($t8) /* f17328c: 9118000c */ lbu $t8,0xc($t0) /* f173290: 31ac000f */ andi $t4,$t5,0xf /* f173294: 00195900 */ sll $t3,$t9,0x4 @@ -5739,13 +5739,13 @@ glabel func0f1734e8 GLOBAL_ASM( glabel func0f173520 -/* f173520: 3c01800b */ lui $at,0x800b -/* f173524: ac24b540 */ sw $a0,-0x4ac0($at) -/* f173528: 3c01800b */ lui $at,0x800b -/* f17352c: ac20b544 */ sw $zero,-0x4abc($at) -/* f173530: 3c01800b */ lui $at,0x800b +/* f173520: 3c01800b */ lui $at,%hi(var800ab540) +/* f173524: ac24b540 */ sw $a0,%lo(var800ab540)($at) +/* f173528: 3c01800b */ lui $at,%hi(var800ab544) +/* f17352c: ac20b544 */ sw $zero,%lo(var800ab544)($at) +/* f173530: 3c01800b */ lui $at,%hi(var800ab548) /* f173534: 03e00008 */ jr $ra -/* f173538: ac20b548 */ sw $zero,-0x4ab8($at) +/* f173538: ac20b548 */ sw $zero,%lo(var800ab548)($at) ); GLOBAL_ASM( @@ -5820,20 +5820,20 @@ glabel func0f1735c0 /* f173630: 25080000 */ addiu $t0,$t0,0x0 /* f173634: acc20000 */ sw $v0,0x0($a2) /* f173638: 00484821 */ addu $t1,$v0,$t0 -/* f17363c: 3c01800b */ lui $at,0x800b +/* f17363c: 3c01800b */ lui $at,%hi(var800ab564) /* f173640: 3c0a0200 */ lui $t2,0x200 -/* f173644: ac29b564 */ sw $t1,-0x4a9c($at) +/* f173644: ac29b564 */ sw $t1,%lo(var800ab564)($at) /* f173648: 254a0070 */ addiu $t2,$t2,0x70 /* f17364c: 004a5821 */ addu $t3,$v0,$t2 -/* f173650: 3c01800b */ lui $at,0x800b +/* f173650: 3c01800b */ lui $at,%hi(var800ab568) /* f173654: 3c0c0200 */ lui $t4,0x200 -/* f173658: ac2bb568 */ sw $t3,-0x4a98($at) +/* f173658: ac2bb568 */ sw $t3,%lo(var800ab568)($at) /* f17365c: 258c00d8 */ addiu $t4,$t4,0xd8 /* f173660: 004c6821 */ addu $t5,$v0,$t4 -/* f173664: 3c01800b */ lui $at,0x800b +/* f173664: 3c01800b */ lui $at,%hi(var800ab56c) /* f173668: 3c0e0200 */ lui $t6,0x200 /* f17366c: 3c12800b */ lui $s2,%hi(var800ab570) -/* f173670: ac2db56c */ sw $t5,-0x4a94($at) +/* f173670: ac2db56c */ sw $t5,%lo(var800ab56c)($at) /* f173674: 25ce0148 */ addiu $t6,$t6,0x148 /* f173678: 3c030200 */ lui $v1,0x200 /* f17367c: 2652b570 */ addiu $s2,$s2,%lo(var800ab570) @@ -5841,92 +5841,92 @@ glabel func0f1735c0 /* f173684: 246301c0 */ addiu $v1,$v1,0x1c0 /* f173688: ae4f0000 */ sw $t7,0x0($s2) /* f17368c: 0062c021 */ addu $t8,$v1,$v0 -/* f173690: 3c01800b */ lui $at,0x800b +/* f173690: 3c01800b */ lui $at,%hi(var800ab560) /* f173694: 3c190200 */ lui $t9,0x200 -/* f173698: ac38b560 */ sw $t8,-0x4aa0($at) +/* f173698: ac38b560 */ sw $t8,%lo(var800ab560)($at) /* f17369c: 27390298 */ addiu $t9,$t9,0x298 /* f1736a0: 00594021 */ addu $t0,$v0,$t9 -/* f1736a4: 3c01800b */ lui $at,0x800b +/* f1736a4: 3c01800b */ lui $at,%hi(var800ab574) /* f1736a8: 3c090200 */ lui $t1,0x200 -/* f1736ac: ac28b574 */ sw $t0,-0x4a8c($at) +/* f1736ac: ac28b574 */ sw $t0,%lo(var800ab574)($at) /* f1736b0: 252902d4 */ addiu $t1,$t1,0x2d4 /* f1736b4: 00495021 */ addu $t2,$v0,$t1 -/* f1736b8: 3c01800b */ lui $at,0x800b +/* f1736b8: 3c01800b */ lui $at,%hi(var800ab578) /* f1736bc: 3c0b0200 */ lui $t3,0x200 -/* f1736c0: ac2ab578 */ sw $t2,-0x4a88($at) +/* f1736c0: ac2ab578 */ sw $t2,%lo(var800ab578)($at) /* f1736c4: 256b02e0 */ addiu $t3,$t3,0x2e0 /* f1736c8: 004b6021 */ addu $t4,$v0,$t3 -/* f1736cc: 3c01800b */ lui $at,0x800b +/* f1736cc: 3c01800b */ lui $at,%hi(var800ab57c) /* f1736d0: 3c0d0200 */ lui $t5,0x200 -/* f1736d4: ac2cb57c */ sw $t4,-0x4a84($at) +/* f1736d4: ac2cb57c */ sw $t4,%lo(var800ab57c)($at) /* f1736d8: 25ad02ec */ addiu $t5,$t5,0x2ec /* f1736dc: 004d7021 */ addu $t6,$v0,$t5 -/* f1736e0: 3c01800b */ lui $at,0x800b +/* f1736e0: 3c01800b */ lui $at,%hi(var800ab580) /* f1736e4: 3c0f0200 */ lui $t7,0x200 -/* f1736e8: ac2eb580 */ sw $t6,-0x4a80($at) +/* f1736e8: ac2eb580 */ sw $t6,%lo(var800ab580)($at) /* f1736ec: 25ef02f8 */ addiu $t7,$t7,0x2f8 /* f1736f0: 004fc021 */ addu $t8,$v0,$t7 -/* f1736f4: 3c01800b */ lui $at,0x800b +/* f1736f4: 3c01800b */ lui $at,%hi(var800ab584) /* f1736f8: 3c190200 */ lui $t9,0x200 -/* f1736fc: ac38b584 */ sw $t8,-0x4a7c($at) +/* f1736fc: ac38b584 */ sw $t8,%lo(var800ab584)($at) /* f173700: 27390304 */ addiu $t9,$t9,0x304 /* f173704: 00594021 */ addu $t0,$v0,$t9 -/* f173708: 3c01800b */ lui $at,0x800b +/* f173708: 3c01800b */ lui $at,%hi(var800ab588) /* f17370c: 3c090200 */ lui $t1,0x200 -/* f173710: ac28b588 */ sw $t0,-0x4a78($at) +/* f173710: ac28b588 */ sw $t0,%lo(var800ab588)($at) /* f173714: 25290310 */ addiu $t1,$t1,0x310 /* f173718: 00495021 */ addu $t2,$v0,$t1 -/* f17371c: 3c01800b */ lui $at,0x800b +/* f17371c: 3c01800b */ lui $at,%hi(var800ab58c) /* f173720: 3c0b0200 */ lui $t3,0x200 -/* f173724: ac2ab58c */ sw $t2,-0x4a74($at) +/* f173724: ac2ab58c */ sw $t2,%lo(var800ab58c)($at) /* f173728: 256b031c */ addiu $t3,$t3,0x31c /* f17372c: 004b6021 */ addu $t4,$v0,$t3 -/* f173730: 3c01800b */ lui $at,0x800b +/* f173730: 3c01800b */ lui $at,%hi(var800ab590) /* f173734: 3c0d0200 */ lui $t5,0x200 -/* f173738: ac2cb590 */ sw $t4,-0x4a70($at) +/* f173738: ac2cb590 */ sw $t4,%lo(var800ab590)($at) /* f17373c: 25ad0334 */ addiu $t5,$t5,0x334 /* f173740: 004d7021 */ addu $t6,$v0,$t5 -/* f173744: 3c01800b */ lui $at,0x800b +/* f173744: 3c01800b */ lui $at,%hi(var800ab594) /* f173748: 3c0f0200 */ lui $t7,0x200 -/* f17374c: ac2eb594 */ sw $t6,-0x4a6c($at) +/* f17374c: ac2eb594 */ sw $t6,%lo(var800ab594)($at) /* f173750: 25ef07b4 */ addiu $t7,$t7,0x7b4 /* f173754: 004fc021 */ addu $t8,$v0,$t7 -/* f173758: 3c01800b */ lui $at,0x800b +/* f173758: 3c01800b */ lui $at,%hi(var800ab598) /* f17375c: 3c190200 */ lui $t9,0x200 -/* f173760: ac38b598 */ sw $t8,-0x4a68($at) +/* f173760: ac38b598 */ sw $t8,%lo(var800ab598)($at) /* f173764: 273907d8 */ addiu $t9,$t9,0x7d8 /* f173768: 00594021 */ addu $t0,$v0,$t9 -/* f17376c: 3c01800b */ lui $at,0x800b +/* f17376c: 3c01800b */ lui $at,%hi(var800ab59c) /* f173770: 3c090200 */ lui $t1,0x200 -/* f173774: ac28b59c */ sw $t0,-0x4a64($at) +/* f173774: ac28b59c */ sw $t0,%lo(var800ab59c)($at) /* f173778: 25290820 */ addiu $t1,$t1,0x820 /* f17377c: 00495021 */ addu $t2,$v0,$t1 -/* f173780: 3c01800b */ lui $at,0x800b +/* f173780: 3c01800b */ lui $at,%hi(var800ab5a0) /* f173784: 3c0b0200 */ lui $t3,0x200 -/* f173788: ac2ab5a0 */ sw $t2,-0x4a60($at) +/* f173788: ac2ab5a0 */ sw $t2,%lo(var800ab5a0)($at) /* f17378c: 256b0898 */ addiu $t3,$t3,0x898 /* f173790: 004b6021 */ addu $t4,$v0,$t3 -/* f173794: 3c01800b */ lui $at,0x800b +/* f173794: 3c01800b */ lui $at,%hi(var800ab5a4) /* f173798: 3c0d0200 */ lui $t5,0x200 -/* f17379c: ac2cb5a4 */ sw $t4,-0x4a5c($at) +/* f17379c: ac2cb5a4 */ sw $t4,%lo(var800ab5a4)($at) /* f1737a0: 25ad08a4 */ addiu $t5,$t5,0x8a4 /* f1737a4: 004d7021 */ addu $t6,$v0,$t5 -/* f1737a8: 3c01800b */ lui $at,0x800b +/* f1737a8: 3c01800b */ lui $at,%hi(var800ab5a8) /* f1737ac: 3c0f0200 */ lui $t7,0x200 -/* f1737b0: ac2eb5a8 */ sw $t6,-0x4a58($at) +/* f1737b0: ac2eb5a8 */ sw $t6,%lo(var800ab5a8)($at) /* f1737b4: 25ef0b44 */ addiu $t7,$t7,0xb44 /* f1737b8: 004fc021 */ addu $t8,$v0,$t7 -/* f1737bc: 3c01800b */ lui $at,0x800b -/* f1737c0: ac38b5ac */ sw $t8,-0x4a54($at) +/* f1737bc: 3c01800b */ lui $at,%hi(var800ab5ac) +/* f1737c0: ac38b5ac */ sw $t8,%lo(var800ab5ac)($at) /* f1737c4: 0223c823 */ subu $t9,$s1,$v1 /* f1737c8: 03274021 */ addu $t0,$t9,$a3 /* f1737cc: 2401000c */ addiu $at,$zero,0xc /* f1737d0: 0101001b */ divu $zero,$t0,$at /* f1737d4: 3c10800b */ lui $s0,%hi(var800ab558) /* f1737d8: 00004812 */ mflo $t1 -/* f1737dc: 3c01800b */ lui $at,0x800b +/* f1737dc: 3c01800b */ lui $at,%hi(var800ab558) /* f1737e0: 2610b558 */ addiu $s0,$s0,%lo(var800ab558) -/* f1737e4: ac29b558 */ sw $t1,-0x4aa8($at) +/* f1737e4: ac29b558 */ sw $t1,%lo(var800ab558)($at) /* f1737e8: 8e040000 */ lw $a0,0x0($s0) /* f1737ec: 24050004 */ addiu $a1,$zero,0x4 /* f1737f0: 00045080 */ sll $t2,$a0,0x2 diff --git a/src/game/game_173a00.c b/src/game/game_173a00.c index 1c45ad098..c3a7dda77 100644 --- a/src/game/game_173a00.c +++ b/src/game/game_173a00.c @@ -52,9 +52,9 @@ glabel func0f173a08 /* f173a2c: 1482fffc */ bne $a0,$v0,.L0f173a20 /* f173a30: ac80ffec */ sw $zero,-0x14($a0) /* f173a34: 240effff */ addiu $t6,$zero,-1 -/* f173a38: 3c01800b */ lui $at,0x800b +/* f173a38: 3c01800b */ lui $at,%hi(var800ab5b0) /* f173a3c: 03e00008 */ jr $ra -/* f173a40: ac2eb5b0 */ sw $t6,-0x4a50($at) +/* f173a40: ac2eb5b0 */ sw $t6,%lo(var800ab5b0)($at) ); GLOBAL_ASM( @@ -215,10 +215,10 @@ glabel func0f173c10 /* f173c5c: 14680006 */ bne $v1,$t0,.L0f173c78 /* f173c60: 00064900 */ sll $t1,$a2,0x4 /* f173c64: 01255021 */ addu $t2,$t1,$a1 -/* f173c68: 3c02800b */ lui $v0,0x800b +/* f173c68: 3c02800b */ lui $v0,%hi(var800aabd8+0x1) /* f173c6c: 004a1021 */ addu $v0,$v0,$t2 /* f173c70: 03e00008 */ jr $ra -/* f173c74: 9042abd9 */ lbu $v0,-0x5427($v0) +/* f173c74: 9042abd9 */ lbu $v0,%lo(var800aabd8+0x1)($v0) .L0f173c78: /* f173c78: 24c60001 */ addiu $a2,$a2,0x1 /* f173c7c: 00c2082a */ slt $at,$a2,$v0 diff --git a/src/game/game_176080.c b/src/game/game_176080.c index f18ecb8cf..5eba461d0 100644 --- a/src/game/game_176080.c +++ b/src/game/game_176080.c @@ -500,14 +500,14 @@ glabel func0f1766b4 /* f176708: 0fc5d99a */ jal func0f176668 /* f17670c: 8e640000 */ lw $a0,0x0($s3) /* f176710: 8e780000 */ lw $t8,0x0($s3) -/* f176714: 3c018009 */ lui $at,0x8009 +/* f176714: 3c018009 */ lui $at,%hi(var8008fa68) /* f176718: 02001825 */ or $v1,$s0,$zero /* f17671c: 240f0001 */ addiu $t7,$zero,0x1 /* f176720: 26100008 */ addiu $s0,$s0,0x8 /* f176724: 00380821 */ addu $at,$at,$t8 /* f176728: 3c16e700 */ lui $s6,0xe700 /* f17672c: afa20044 */ sw $v0,0x44($sp) -/* f176730: a02ffa68 */ sb $t7,-0x598($at) +/* f176730: a02ffa68 */ sb $t7,%lo(var8008fa68)($at) /* f176734: 02008825 */ or $s1,$s0,$zero /* f176738: ac600004 */ sw $zero,0x4($v1) /* f17673c: ac760000 */ sw $s6,0x0($v1) @@ -838,8 +838,8 @@ glabel func0f1766b4 GLOBAL_ASM( glabel func0f176c40 -/* f176c40: 3c0e800a */ lui $t6,0x800a -/* f176c44: 8dcea2d8 */ lw $t6,-0x5d28($t6) +/* f176c40: 3c0e800a */ lui $t6,%hi(g_Vars+0x318) +/* f176c44: 8dcea2d8 */ lw $t6,%lo(g_Vars+0x318)($t6) /* f176c48: 27bdffe8 */ addiu $sp,$sp,-24 /* f176c4c: afbf0014 */ sw $ra,0x14($sp) /* f176c50: 11c00005 */ beqz $t6,.L0f176c68 diff --git a/src/game/game_177e00.c b/src/game/game_177e00.c index 056ae84ff..7e0b167f4 100644 --- a/src/game/game_177e00.c +++ b/src/game/game_177e00.c @@ -65,12 +65,12 @@ glabel menuhandler00177e00 /* f177e78: 10000055 */ beqz $zero,.L0f177fd0 /* f177e7c: 00001025 */ or $v0,$zero,$zero .L0f177e80: -/* f177e80: 3c03800b */ lui $v1,0x800b +/* f177e80: 3c03800b */ lui $v1,%hi(g_MpSetup+0x16) /* f177e84: 3c0b800b */ lui $t3,%hi(g_MpSimulants) /* f177e88: 3c09800b */ lui $t1,%hi(g_MpPlayers) /* f177e8c: 2529c7b8 */ addiu $t1,$t1,%lo(g_MpPlayers) /* f177e90: 256bc538 */ addiu $t3,$t3,%lo(g_MpSimulants) -/* f177e94: 9463cb9e */ lhu $v1,-0x3462($v1) +/* f177e94: 9463cb9e */ lhu $v1,%lo(g_MpSetup+0x16)($v1) /* f177e98: 00002825 */ or $a1,$zero,$zero /* f177e9c: 240c004c */ addiu $t4,$zero,0x4c /* f177ea0: 240a00a0 */ addiu $t2,$zero,0xa0 @@ -107,12 +107,12 @@ glabel menuhandler00177e00 /* f177f0c: 03e00008 */ jr $ra /* f177f10: 24427e80 */ addiu $v0,$v0,%lo(var7f1b7e80) .L0f177f14: -/* f177f14: 3c03800b */ lui $v1,0x800b +/* f177f14: 3c03800b */ lui $v1,%hi(g_MpSetup+0x16) /* f177f18: 3c098007 */ lui $t1,%hi(g_MpPlayerNum) /* f177f1c: 3c07800a */ lui $a3,%hi(var8009deb0) /* f177f20: 24e7deb0 */ addiu $a3,$a3,%lo(var8009deb0) /* f177f24: 25291448 */ addiu $t1,$t1,%lo(g_MpPlayerNum) -/* f177f28: 9463cb9e */ lhu $v1,-0x3462($v1) +/* f177f28: 9463cb9e */ lhu $v1,%lo(g_MpSetup+0x16)($v1) /* f177f2c: 00002825 */ or $a1,$zero,$zero /* f177f30: 2408000c */ addiu $t0,$zero,0xc /* f177f34: 240e0001 */ addiu $t6,$zero,0x1 @@ -209,8 +209,8 @@ glabel func0f178050 .L0f17808c: /* f17808c: 0fc5b9f1 */ jal langGet /* f178090: 24045072 */ addiu $a0,$zero,0x5072 -/* f178094: 3c06800b */ lui $a2,0x800b -/* f178098: 90c6cb9a */ lbu $a2,-0x3466($a2) +/* f178094: 3c06800b */ lui $a2,%hi(g_MpSetup+0x12) +/* f178098: 90c6cb9a */ lbu $a2,%lo(g_MpSetup+0x12)($a2) /* f17809c: 3c048007 */ lui $a0,%hi(g_StringPointer) /* f1780a0: 8c841440 */ lw $a0,%lo(g_StringPointer)($a0) /* f1780a4: 00402825 */ or $a1,$v0,$zero @@ -221,8 +221,8 @@ glabel func0f178050 .L0f1780b8: /* f1780b8: 0fc5b9f1 */ jal langGet /* f1780bc: 24045071 */ addiu $a0,$zero,0x5071 -/* f1780c0: 3c06800b */ lui $a2,0x800b -/* f1780c4: 90c6cb9b */ lbu $a2,-0x3465($a2) +/* f1780c0: 3c06800b */ lui $a2,%hi(g_MpSetup+0x13) +/* f1780c4: 90c6cb9b */ lbu $a2,%lo(g_MpSetup+0x13)($a2) /* f1780c8: 3c048007 */ lui $a0,%hi(g_StringPointer) /* f1780cc: 8c841440 */ lw $a0,%lo(g_StringPointer)($a0) /* f1780d0: 00402825 */ or $a1,$v0,$zero @@ -314,11 +314,11 @@ glabel func0f178330 /* f178350: 000f78c0 */ sll $t7,$t7,0x3 /* f178354: 01ee7823 */ subu $t7,$t7,$t6 /* f178358: 000f7900 */ sll $t7,$t7,0x4 -/* f17835c: 3c04800a */ lui $a0,0x800a +/* f17835c: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe28) /* f178360: afbf0014 */ sw $ra,0x14($sp) /* f178364: 008f2021 */ addu $a0,$a0,$t7 /* f178368: 0fc2c3f4 */ jal weaponFindById -/* f17836c: 8c84ee28 */ lw $a0,-0x11d8($a0) +/* f17836c: 8c84ee28 */ lw $a0,%lo(g_MenuStack+0xe28)($a0) /* f178370: 10400005 */ beqz $v0,.L0f178388 /* f178374: 00000000 */ sll $zero,$zero,0x0 /* f178378: 0fc5b9f1 */ jal langGet @@ -398,10 +398,10 @@ glabel func0f178450 /* f178470: 000f78c0 */ sll $t7,$t7,0x3 /* f178474: 01ee7823 */ subu $t7,$t7,$t6 /* f178478: 000f7900 */ sll $t7,$t7,0x4 -/* f17847c: 3c04800a */ lui $a0,0x800a +/* f17847c: 3c04800a */ lui $a0,%hi(g_MenuStack+0x83b) /* f178480: afbf0014 */ sw $ra,0x14($sp) /* f178484: 008f2021 */ addu $a0,$a0,$t7 -/* f178488: 9084e83b */ lbu $a0,-0x17c5($a0) +/* f178488: 9084e83b */ lbu $a0,%lo(g_MenuStack+0x83b)($a0) /* f17848c: 0fc05840 */ jal func0f016100 /* f178490: 00002825 */ or $a1,$zero,$zero /* f178494: 8fbf0014 */ lw $ra,0x14($sp) @@ -414,8 +414,8 @@ GLOBAL_ASM( glabel func0f1784a4 /* f1784a4: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f1784a8: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f1784ac: 3c18800a */ lui $t8,0x800a -/* f1784b0: 3c08800a */ lui $t0,0x800a +/* f1784ac: 3c18800a */ lui $t8,%hi(g_MenuStack+0x83b) +/* f1784b0: 3c08800a */ lui $t0,%hi(g_Vars+0x64) /* f1784b4: 000e78c0 */ sll $t7,$t6,0x3 /* f1784b8: 01ee7823 */ subu $t7,$t7,$t6 /* f1784bc: 000f7880 */ sll $t7,$t7,0x2 @@ -424,11 +424,11 @@ glabel func0f1784a4 /* f1784c8: 01ee7823 */ subu $t7,$t7,$t6 /* f1784cc: 000f7900 */ sll $t7,$t7,0x4 /* f1784d0: 030fc021 */ addu $t8,$t8,$t7 -/* f1784d4: 9318e83b */ lbu $t8,-0x17c5($t8) +/* f1784d4: 9318e83b */ lbu $t8,%lo(g_MenuStack+0x83b)($t8) /* f1784d8: afa40000 */ sw $a0,0x0($sp) /* f1784dc: 0018c880 */ sll $t9,$t8,0x2 /* f1784e0: 01194021 */ addu $t0,$t0,$t9 -/* f1784e4: 8d08a024 */ lw $t0,-0x5fdc($t0) +/* f1784e4: 8d08a024 */ lw $t0,%lo(g_Vars+0x64)($t0) /* f1784e8: 03e00008 */ jr $ra /* f1784ec: 8d021974 */ lw $v0,0x1974($t0) ); @@ -437,8 +437,8 @@ GLOBAL_ASM( glabel func0f1784f0 /* f1784f0: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f1784f4: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f1784f8: 3c18800a */ lui $t8,0x800a -/* f1784fc: 3c08800a */ lui $t0,0x800a +/* f1784f8: 3c18800a */ lui $t8,%hi(g_MenuStack+0x83b) +/* f1784fc: 3c08800a */ lui $t0,%hi(g_Vars+0x64) /* f178500: 000e78c0 */ sll $t7,$t6,0x3 /* f178504: 01ee7823 */ subu $t7,$t7,$t6 /* f178508: 000f7880 */ sll $t7,$t7,0x2 @@ -447,11 +447,11 @@ glabel func0f1784f0 /* f178514: 01ee7823 */ subu $t7,$t7,$t6 /* f178518: 000f7900 */ sll $t7,$t7,0x4 /* f17851c: 030fc021 */ addu $t8,$t8,$t7 -/* f178520: 9318e83b */ lbu $t8,-0x17c5($t8) +/* f178520: 9318e83b */ lbu $t8,%lo(g_MenuStack+0x83b)($t8) /* f178524: afa40000 */ sw $a0,0x0($sp) /* f178528: 0018c880 */ sll $t9,$t8,0x2 /* f17852c: 01194021 */ addu $t0,$t0,$t9 -/* f178530: 8d08a024 */ lw $t0,-0x5fdc($t0) +/* f178530: 8d08a024 */ lw $t0,%lo(g_Vars+0x64)($t0) /* f178534: 03e00008 */ jr $ra /* f178538: 8d021978 */ lw $v0,0x1978($t0) ); @@ -468,7 +468,7 @@ glabel func0f17853c /* f178558: 3c088007 */ lui $t0,%hi(g_MpPlayerNum) /* f17855c: ac410000 */ sw $at,0x0($v0) /* f178560: 8dd90004 */ lw $t9,0x4($t6) -/* f178564: 3c0a800b */ lui $t2,0x800b +/* f178564: 3c0a800b */ lui $t2,%hi(g_MpPlayers+0x1e) /* f178568: ac590004 */ sw $t9,0x4($v0) /* f17856c: 8dc10008 */ lw $at,0x8($t6) /* f178570: ac410008 */ sw $at,0x8($v0) @@ -483,7 +483,7 @@ glabel func0f17853c /* f178594: 01284821 */ addu $t1,$t1,$t0 /* f178598: 00094940 */ sll $t1,$t1,0x5 /* f17859c: 01495021 */ addu $t2,$t2,$t1 -/* f1785a0: 814ac7d6 */ lb $t2,-0x382a($t2) +/* f1785a0: 814ac7d6 */ lb $t2,%lo(g_MpPlayers+0x1e)($t2) /* f1785a4: 000a5840 */ sll $t3,$t2,0x1 /* f1785a8: 004b6021 */ addu $t4,$v0,$t3 /* f1785ac: 0fc5b9f1 */ jal langGet @@ -504,13 +504,13 @@ glabel menuhandler001785c4 /* f1785d8: afa60020 */ sw $a2,0x20($sp) /* f1785dc: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f1785e0: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f1785e4: 3c18800b */ lui $t8,0x800b +/* f1785e4: 3c18800b */ lui $t8,%hi(g_MpPlayers+0x1e) /* f1785e8: 3c014220 */ lui $at,0x4220 /* f1785ec: 000e7880 */ sll $t7,$t6,0x2 /* f1785f0: 01ee7821 */ addu $t7,$t7,$t6 /* f1785f4: 000f7940 */ sll $t7,$t7,0x5 /* f1785f8: 030fc021 */ addu $t8,$t8,$t7 -/* f1785fc: 8318c7d6 */ lb $t8,-0x382a($t8) +/* f1785fc: 8318c7d6 */ lb $t8,%lo(g_MpPlayers+0x1e)($t8) /* f178600: 57000031 */ bnezl $t8,.L0f1786c8 /* f178604: 8fbf0014 */ lw $ra,0x14($sp) /* f178608: 44816000 */ mtc1 $at,$f12 @@ -916,9 +916,9 @@ glabel func0f178bb0 /* f178bc0: 000e7880 */ sll $t7,$t6,0x2 /* f178bc4: 01ee7821 */ addu $t7,$t7,$t6 /* f178bc8: 000f7940 */ sll $t7,$t7,0x5 -/* f178bcc: 3c04800b */ lui $a0,0x800b +/* f178bcc: 3c04800b */ lui $a0,%hi(g_MpPlayers+0x95) /* f178bd0: 008f2021 */ addu $a0,$a0,$t7 -/* f178bd4: 9084c84d */ lbu $a0,-0x37b3($a0) +/* f178bd4: 9084c84d */ lbu $a0,%lo(g_MpPlayers+0x95)($a0) /* f178bd8: afbf0014 */ sw $ra,0x14($sp) /* f178bdc: 0fc5b9f1 */ jal langGet /* f178be0: 248458b9 */ addiu $a0,$a0,0x58b9 @@ -1078,8 +1078,8 @@ glabel func0f178dbc /* f178df8: 5700003a */ bnezl $t8,.L0f178ee4 /* f178dfc: 8fbf0014 */ lw $ra,0x14($sp) /* f178e00: 8c790288 */ lw $t9,0x288($v1) -/* f178e04: 3c0b800a */ lui $t3,%hi(var8009e000) -/* f178e08: 256be000 */ addiu $t3,$t3,%lo(var8009e000) +/* f178e04: 3c0b800a */ lui $t3,0x800a +/* f178e08: 256be000 */ addiu $t3,$t3,-8192 /* f178e0c: 8f280070 */ lw $t0,0x70($t9) /* f178e10: 000850c0 */ sll $t2,$t0,0x3 /* f178e14: 01485023 */ subu $t2,$t2,$t0 @@ -1156,21 +1156,21 @@ glabel func0f178ef0 /* f178f04: 0018c080 */ sll $t8,$t8,0x2 /* f178f08: ac450000 */ sw $a1,0x0($v0) /* f178f0c: 0305c021 */ addu $t8,$t8,$a1 -/* f178f10: 3c19800b */ lui $t9,0x800b -/* f178f14: 8f39cb94 */ lw $t9,-0x346c($t9) +/* f178f10: 3c19800b */ lui $t9,%hi(g_MpSetup+0xc) +/* f178f14: 8f39cb94 */ lw $t9,%lo(g_MpSetup+0xc)($t9) /* f178f18: 0018c0c0 */ sll $t8,$t8,0x3 /* f178f1c: 0305c023 */ subu $t8,$t8,$a1 /* f178f20: 0018c100 */ sll $t8,$t8,0x4 -/* f178f24: 3c01800a */ lui $at,0x800a +/* f178f24: 3c01800a */ lui $at,%hi(g_MenuStack+0x83b) /* f178f28: 27bdffe0 */ addiu $sp,$sp,-32 /* f178f2c: 00380821 */ addu $at,$at,$t8 /* f178f30: 33280002 */ andi $t0,$t9,0x2 /* f178f34: afbf0014 */ sw $ra,0x14($sp) -/* f178f38: a024e83b */ sb $a0,-0x17c5($at) +/* f178f38: a024e83b */ sb $a0,%lo(g_MenuStack+0x83b)($at) /* f178f3c: 11000027 */ beqz $t0,.L0f178fdc /* f178f40: afae001c */ sw $t6,0x1c($sp) -/* f178f44: 3c09800b */ lui $t1,0x800b -/* f178f48: 9129cc10 */ lbu $t1,-0x33f0($t1) +/* f178f44: 3c09800b */ lui $t1,%hi(g_MpSetup+0x88) +/* f178f48: 9129cc10 */ lbu $t1,%lo(g_MpSetup+0x88)($t1) /* f178f4c: 24010005 */ addiu $at,$zero,0x5 /* f178f50: 3c048008 */ lui $a0,%hi(menudialog_2aa30) /* f178f54: 1521001d */ bne $t1,$at,.L0f178fcc diff --git a/src/game/game_179060.c b/src/game/game_179060.c index 577941d89..f3cdded3f 100644 --- a/src/game/game_179060.c +++ b/src/game/game_179060.c @@ -291,14 +291,14 @@ glabel var7f1b8074 /* f1792fc: 00000000 */ sll $zero,$zero,0x0 .L0f179300: /* f179300: 86180000 */ lh $t8,0x0($s0) -/* f179304: 3c01800b */ lui $at,0x800b +/* f179304: 3c01800b */ lui $at,%hi(g_MpSetup+0x11) /* f179308: 10000063 */ beqz $zero,.L0f179498 -/* f17930c: a038cb99 */ sb $t8,-0x3467($at) +/* f17930c: a038cb99 */ sb $t8,%lo(g_MpSetup+0x11)($at) /* f179310: 3c108008 */ lui $s0,%hi(mpstages) /* f179314: 26104b98 */ addiu $s0,$s0,%lo(mpstages) .L0f179318: -/* f179318: 3c0e800b */ lui $t6,0x800b -/* f17931c: 91cecb99 */ lbu $t6,-0x3467($t6) +/* f179318: 3c0e800b */ lui $t6,%hi(g_MpSetup+0x11) +/* f17931c: 91cecb99 */ lbu $t6,%lo(g_MpSetup+0x11)($t6) /* f179320: 860f0000 */ lh $t7,0x0($s0) /* f179324: 15cf0002 */ bne $t6,$t7,.L0f179330 /* f179328: 00000000 */ sll $zero,$zero,0x0 @@ -666,25 +666,25 @@ glabel func0f179b58 /* f179b9c: 8fbf0014 */ lw $ra,0x14($sp) .L0f179ba0: /* f179ba0: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f179ba4: 3c18800b */ lui $t8,0x800b +/* f179ba4: 3c18800b */ lui $t8,%hi(g_MpPlayers+0x18) /* f179ba8: 000e7880 */ sll $t7,$t6,0x2 /* f179bac: 01ee7821 */ addu $t7,$t7,$t6 /* f179bb0: 000f7940 */ sll $t7,$t7,0x5 /* f179bb4: 030fc021 */ addu $t8,$t8,$t7 -/* f179bb8: 9718c7d0 */ lhu $t8,-0x3830($t8) +/* f179bb8: 9718c7d0 */ lhu $t8,%lo(g_MpPlayers+0x18)($t8) /* f179bbc: 10000010 */ beqz $zero,.L0f179c00 /* f179bc0: acf80000 */ sw $t8,0x0($a3) .L0f179bc4: /* f179bc4: 3c088007 */ lui $t0,%hi(g_MpPlayerNum) /* f179bc8: 8d081448 */ lw $t0,%lo(g_MpPlayerNum)($t0) /* f179bcc: 90f90003 */ lbu $t9,0x3($a3) -/* f179bd0: 3c01800b */ lui $at,0x800b +/* f179bd0: 3c01800b */ lui $at,%hi(g_MpPlayers+0x18) /* f179bd4: 00084880 */ sll $t1,$t0,0x2 /* f179bd8: 01284821 */ addu $t1,$t1,$t0 /* f179bdc: 00094940 */ sll $t1,$t1,0x5 /* f179be0: 00290821 */ addu $at,$at,$t1 /* f179be4: 10000006 */ beqz $zero,.L0f179c00 -/* f179be8: a439c7d0 */ sh $t9,-0x3830($at) +/* f179be8: a439c7d0 */ sh $t9,%lo(g_MpPlayers+0x18)($at) .L0f179bec: /* f179bec: 8ce60000 */ lw $a2,0x0($a3) /* f179bf0: 8ce40004 */ lw $a0,0x4($a3) @@ -714,25 +714,25 @@ glabel func0f179b58 /* f179c48: 8fbf0014 */ lw $ra,0x14($sp) .L0f179c4c: /* f179c4c: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f179c50: 3c18800b */ lui $t8,0x800b +/* f179c50: 3c18800b */ lui $t8,%hi(g_MpPlayers+0x1a) /* f179c54: 000e7880 */ sll $t7,$t6,0x2 /* f179c58: 01ee7821 */ addu $t7,$t7,$t6 /* f179c5c: 000f7940 */ sll $t7,$t7,0x5 /* f179c60: 030fc021 */ addu $t8,$t8,$t7 -/* f179c64: 9718c7d2 */ lhu $t8,-0x382e($t8) +/* f179c64: 9718c7d2 */ lhu $t8,%lo(g_MpPlayers+0x1a)($t8) /* f179c68: 10000010 */ beqz $zero,.L0f179cac /* f179c6c: acf80000 */ sw $t8,0x0($a3) .L0f179c70: /* f179c70: 3c088007 */ lui $t0,%hi(g_MpPlayerNum) /* f179c74: 8d081448 */ lw $t0,%lo(g_MpPlayerNum)($t0) /* f179c78: 90f90003 */ lbu $t9,0x3($a3) -/* f179c7c: 3c01800b */ lui $at,0x800b +/* f179c7c: 3c01800b */ lui $at,%hi(g_MpPlayers+0x1a) /* f179c80: 00084880 */ sll $t1,$t0,0x2 /* f179c84: 01284821 */ addu $t1,$t1,$t0 /* f179c88: 00094940 */ sll $t1,$t1,0x5 /* f179c8c: 00290821 */ addu $at,$at,$t1 /* f179c90: 10000006 */ beqz $zero,.L0f179cac -/* f179c94: a439c7d2 */ sh $t9,-0x382e($at) +/* f179c94: a439c7d2 */ sh $t9,%lo(g_MpPlayers+0x1a)($at) .L0f179c98: /* f179c98: 8ce60000 */ lw $a2,0x0($a3) /* f179c9c: 8ce40004 */ lw $a0,0x4($a3) @@ -762,25 +762,25 @@ glabel func0f179b58 /* f179cf4: 8fbf0014 */ lw $ra,0x14($sp) .L0f179cf8: /* f179cf8: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f179cfc: 3c18800b */ lui $t8,0x800b +/* f179cfc: 3c18800b */ lui $t8,%hi(g_MpPlayers+0x1c) /* f179d00: 000e7880 */ sll $t7,$t6,0x2 /* f179d04: 01ee7821 */ addu $t7,$t7,$t6 /* f179d08: 000f7940 */ sll $t7,$t7,0x5 /* f179d0c: 030fc021 */ addu $t8,$t8,$t7 -/* f179d10: 9718c7d4 */ lhu $t8,-0x382c($t8) +/* f179d10: 9718c7d4 */ lhu $t8,%lo(g_MpPlayers+0x1c)($t8) /* f179d14: 10000010 */ beqz $zero,.L0f179d58 /* f179d18: acf80000 */ sw $t8,0x0($a3) .L0f179d1c: /* f179d1c: 3c088007 */ lui $t0,%hi(g_MpPlayerNum) /* f179d20: 8d081448 */ lw $t0,%lo(g_MpPlayerNum)($t0) /* f179d24: 8cf90000 */ lw $t9,0x0($a3) -/* f179d28: 3c01800b */ lui $at,0x800b +/* f179d28: 3c01800b */ lui $at,%hi(g_MpPlayers+0x1c) /* f179d2c: 00084880 */ sll $t1,$t0,0x2 /* f179d30: 01284821 */ addu $t1,$t1,$t0 /* f179d34: 00094940 */ sll $t1,$t1,0x5 /* f179d38: 00290821 */ addu $at,$at,$t1 /* f179d3c: 10000006 */ beqz $zero,.L0f179d58 -/* f179d40: a439c7d4 */ sh $t9,-0x382c($at) +/* f179d40: a439c7d4 */ sh $t9,%lo(g_MpPlayers+0x1c)($at) .L0f179d44: /* f179d44: 8ce60000 */ lw $a2,0x0($a3) /* f179d48: 8ce40004 */ lw $a0,0x4($a3) @@ -887,7 +887,7 @@ glabel var7f1b80dc /* f179de8: acc20000 */ sw $v0,0x0($a2) /* f179dec: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f179df0: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f179df4: 3c19800a */ lui $t9,%hi(var8009e000) +/* f179df4: 3c19800a */ lui $t9,0x800a /* f179df8: 3c05800a */ lui $a1,%hi(g_Vars) /* f179dfc: 000fc0c0 */ sll $t8,$t7,0x3 /* f179e00: 030fc023 */ subu $t8,$t8,$t7 @@ -896,7 +896,7 @@ glabel var7f1b80dc /* f179e0c: 0018c0c0 */ sll $t8,$t8,0x3 /* f179e10: 030fc023 */ subu $t8,$t8,$t7 /* f179e14: 0018c100 */ sll $t8,$t8,0x4 -/* f179e18: 2739e000 */ addiu $t9,$t9,%lo(var8009e000) +/* f179e18: 2739e000 */ addiu $t9,$t9,-8192 /* f179e1c: 8fa90050 */ lw $t1,0x50($sp) /* f179e20: 24a59fc0 */ addiu $a1,$a1,%lo(g_Vars) /* f179e24: 03191021 */ addu $v0,$t8,$t9 @@ -946,7 +946,7 @@ glabel var7f1b80dc /* f179ec8: 24020001 */ addiu $v0,$zero,0x1 /* f179ecc: 3c098007 */ lui $t1,%hi(g_MpPlayerNum) /* f179ed0: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) -/* f179ed4: 3c01800a */ lui $at,0x800a +/* f179ed4: 3c01800a */ lui $at,%hi(g_MenuStack+0x840) /* f179ed8: 24080003 */ addiu $t0,$zero,0x3 /* f179edc: 000950c0 */ sll $t2,$t1,0x3 /* f179ee0: 01495023 */ subu $t2,$t2,$t1 @@ -957,13 +957,13 @@ glabel var7f1b80dc /* f179ef4: 000a5100 */ sll $t2,$t2,0x4 /* f179ef8: 002a0821 */ addu $at,$at,$t2 /* f179efc: 10000045 */ beqz $zero,.L0f17a014 -/* f179f00: a028e840 */ sb $t0,-0x17c0($at) +/* f179f00: a028e840 */ sb $t0,%lo(g_MenuStack+0x840)($at) /* f179f04: 10000043 */ beqz $zero,.L0f17a014 /* f179f08: acc70000 */ sw $a3,0x0($a2) /* f179f0c: 3c0b8007 */ lui $t3,%hi(g_MpPlayerNum) /* f179f10: 8d6b1448 */ lw $t3,%lo(g_MpPlayerNum)($t3) /* f179f14: 44800000 */ mtc1 $zero,$f0 -/* f179f18: 3c0d800a */ lui $t5,%hi(var8009e000) +/* f179f18: 3c0d800a */ lui $t5,0x800a /* f179f1c: 000b60c0 */ sll $t4,$t3,0x3 /* f179f20: 018b6023 */ subu $t4,$t4,$t3 /* f179f24: 000c6080 */ sll $t4,$t4,0x2 @@ -973,7 +973,7 @@ glabel var7f1b80dc /* f179f34: 018b6023 */ subu $t4,$t4,$t3 /* f179f38: 44819000 */ mtc1 $at,$f18 /* f179f3c: 000c6100 */ sll $t4,$t4,0x4 -/* f179f40: 25ade000 */ addiu $t5,$t5,%lo(var8009e000) +/* f179f40: 25ade000 */ addiu $t5,$t5,-8192 /* f179f44: 018d1021 */ addu $v0,$t4,$t5 /* f179f48: 240e0001 */ addiu $t6,$zero,0x1 /* f179f4c: 44050000 */ mfc1 $a1,$f0 @@ -1000,11 +1000,11 @@ glabel var7f1b80dc /* f179fa0: c42280d4 */ lwc1 $f2,%lo(var7f1b80d4)($at) /* f179fa4: 0018c0c0 */ sll $t8,$t8,0x3 /* f179fa8: 3c017f1c */ lui $at,%hi(var7f1b80d8) -/* f179fac: 3c19800a */ lui $t9,%hi(var8009e000) +/* f179fac: 3c19800a */ lui $t9,0x800a /* f179fb0: 030fc023 */ subu $t8,$t8,$t7 /* f179fb4: c42c80d8 */ lwc1 $f12,%lo(var7f1b80d8)($at) /* f179fb8: 0018c100 */ sll $t8,$t8,0x4 -/* f179fbc: 2739e000 */ addiu $t9,$t9,%lo(var8009e000) +/* f179fbc: 2739e000 */ addiu $t9,$t9,-8192 /* f179fc0: 03191021 */ addu $v0,$t8,$t9 /* f179fc4: 3c017f1c */ lui $at,%hi(var7f1b80dc) /* f179fc8: e4400d50 */ swc1 $f0,0xd50($v0) @@ -1072,7 +1072,7 @@ glabel menudialog0017a174 /* f17a194: 14810018 */ bne $a0,$at,.L0f17a1f8 /* f17a198: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f17a19c: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f17a1a0: 3c02800a */ lui $v0,%hi(g_MenuStack) +/* f17a1a0: 3c02800a */ lui $v0,%hi(g_MenuStack+0x4f8) /* f17a1a4: 000e78c0 */ sll $t7,$t6,0x3 /* f17a1a8: 01ee7823 */ subu $t7,$t7,$t6 /* f17a1ac: 000f7880 */ sll $t7,$t7,0x2 @@ -1081,7 +1081,7 @@ glabel menudialog0017a174 /* f17a1b8: 01ee7823 */ subu $t7,$t7,$t6 /* f17a1bc: 000f7900 */ sll $t7,$t7,0x4 /* f17a1c0: 004f1021 */ addu $v0,$v0,$t7 -/* f17a1c4: 8c42e4f8 */ lw $v0,%lo(g_MenuStack)($v0) +/* f17a1c4: 8c42e4f8 */ lw $v0,%lo(g_MenuStack+0x4f8)($v0) /* f17a1c8: 8c580000 */ lw $t8,0x0($v0) /* f17a1cc: 54b8000b */ bnel $a1,$t8,.L0f17a1fc /* f17a1d0: 8fbf0014 */ lw $ra,0x14($sp) @@ -1403,7 +1403,7 @@ glabel func0f17a658 /* f17a668: 000e7880 */ sll $t7,$t6,0x2 /* f17a66c: 01ee7821 */ addu $t7,$t7,$t6 /* f17a670: 000f7940 */ sll $t7,$t7,0x5 -/* f17a674: 3c06800b */ lui $a2,0x800b +/* f17a674: 3c06800b */ lui $a2,%hi(g_MpPlayers+0x54) /* f17a678: 00cf3021 */ addu $a2,$a2,$t7 /* f17a67c: 3c048007 */ lui $a0,%hi(g_StringPointer) /* f17a680: afbf0014 */ sw $ra,0x14($sp) @@ -1411,7 +1411,7 @@ glabel func0f17a658 /* f17a688: 24a57ef8 */ addiu $a1,$a1,%lo(var7f1b7ef8) /* f17a68c: 8c841440 */ lw $a0,%lo(g_StringPointer)($a0) /* f17a690: 0c004dad */ jal sprintf -/* f17a694: 8cc6c80c */ lw $a2,-0x37f4($a2) +/* f17a694: 8cc6c80c */ lw $a2,%lo(g_MpPlayers+0x54)($a2) /* f17a698: 8fbf0014 */ lw $ra,0x14($sp) /* f17a69c: 3c028007 */ lui $v0,%hi(g_StringPointer) /* f17a6a0: 8c421440 */ lw $v0,%lo(g_StringPointer)($v0) @@ -1428,7 +1428,7 @@ glabel func0f17a6ac /* f17a6bc: 000e7880 */ sll $t7,$t6,0x2 /* f17a6c0: 01ee7821 */ addu $t7,$t7,$t6 /* f17a6c4: 000f7940 */ sll $t7,$t7,0x5 -/* f17a6c8: 3c06800b */ lui $a2,0x800b +/* f17a6c8: 3c06800b */ lui $a2,%hi(g_MpPlayers+0x58) /* f17a6cc: 00cf3021 */ addu $a2,$a2,$t7 /* f17a6d0: 3c048007 */ lui $a0,%hi(g_StringPointer) /* f17a6d4: afbf0014 */ sw $ra,0x14($sp) @@ -1436,7 +1436,7 @@ glabel func0f17a6ac /* f17a6dc: 24a57efc */ addiu $a1,$a1,%lo(var7f1b7efc) /* f17a6e0: 8c841440 */ lw $a0,%lo(g_StringPointer)($a0) /* f17a6e4: 0c004dad */ jal sprintf -/* f17a6e8: 8cc6c810 */ lw $a2,-0x37f0($a2) +/* f17a6e8: 8cc6c810 */ lw $a2,%lo(g_MpPlayers+0x58)($a2) /* f17a6ec: 8fbf0014 */ lw $ra,0x14($sp) /* f17a6f0: 3c028007 */ lui $v0,%hi(g_StringPointer) /* f17a6f4: 8c421440 */ lw $v0,%lo(g_StringPointer)($v0) @@ -1453,7 +1453,7 @@ glabel func0f17a700 /* f17a710: 000e7880 */ sll $t7,$t6,0x2 /* f17a714: 01ee7821 */ addu $t7,$t7,$t6 /* f17a718: 000f7940 */ sll $t7,$t7,0x5 -/* f17a71c: 3c06800b */ lui $a2,0x800b +/* f17a71c: 3c06800b */ lui $a2,%hi(g_MpPlayers+0x5c) /* f17a720: 00cf3021 */ addu $a2,$a2,$t7 /* f17a724: 3c048007 */ lui $a0,%hi(g_StringPointer) /* f17a728: afbf0014 */ sw $ra,0x14($sp) @@ -1461,7 +1461,7 @@ glabel func0f17a700 /* f17a730: 24a57f00 */ addiu $a1,$a1,%lo(var7f1b7f00) /* f17a734: 8c841440 */ lw $a0,%lo(g_StringPointer)($a0) /* f17a738: 0c004dad */ jal sprintf -/* f17a73c: 8cc6c814 */ lw $a2,-0x37ec($a2) +/* f17a73c: 8cc6c814 */ lw $a2,%lo(g_MpPlayers+0x5c)($a2) /* f17a740: 8fbf0014 */ lw $ra,0x14($sp) /* f17a744: 3c028007 */ lui $v0,%hi(g_StringPointer) /* f17a748: 8c421440 */ lw $v0,%lo(g_StringPointer)($v0) @@ -1478,7 +1478,7 @@ glabel func0f17a754 /* f17a764: 000e7880 */ sll $t7,$t6,0x2 /* f17a768: 01ee7821 */ addu $t7,$t7,$t6 /* f17a76c: 000f7940 */ sll $t7,$t7,0x5 -/* f17a770: 3c06800b */ lui $a2,0x800b +/* f17a770: 3c06800b */ lui $a2,%hi(g_MpPlayers+0x60) /* f17a774: 00cf3021 */ addu $a2,$a2,$t7 /* f17a778: 3c048007 */ lui $a0,%hi(g_StringPointer) /* f17a77c: afbf0014 */ sw $ra,0x14($sp) @@ -1486,7 +1486,7 @@ glabel func0f17a754 /* f17a784: 24a57f04 */ addiu $a1,$a1,%lo(var7f1b7f04) /* f17a788: 8c841440 */ lw $a0,%lo(g_StringPointer)($a0) /* f17a78c: 0c004dad */ jal sprintf -/* f17a790: 8cc6c818 */ lw $a2,-0x37e8($a2) +/* f17a790: 8cc6c818 */ lw $a2,%lo(g_MpPlayers+0x60)($a2) /* f17a794: 8fbf0014 */ lw $ra,0x14($sp) /* f17a798: 3c028007 */ lui $v0,%hi(g_StringPointer) /* f17a79c: 8c421440 */ lw $v0,%lo(g_StringPointer)($v0) @@ -1503,7 +1503,7 @@ glabel func0f17a7a8 /* f17a7b8: 000e7880 */ sll $t7,$t6,0x2 /* f17a7bc: 01ee7821 */ addu $t7,$t7,$t6 /* f17a7c0: 000f7940 */ sll $t7,$t7,0x5 -/* f17a7c4: 3c06800b */ lui $a2,0x800b +/* f17a7c4: 3c06800b */ lui $a2,%hi(g_MpPlayers+0x64) /* f17a7c8: 00cf3021 */ addu $a2,$a2,$t7 /* f17a7cc: 3c048007 */ lui $a0,%hi(g_StringPointer) /* f17a7d0: afbf0014 */ sw $ra,0x14($sp) @@ -1511,7 +1511,7 @@ glabel func0f17a7a8 /* f17a7d8: 24a57f08 */ addiu $a1,$a1,%lo(var7f1b7f08) /* f17a7dc: 8c841440 */ lw $a0,%lo(g_StringPointer)($a0) /* f17a7e0: 0c004dad */ jal sprintf -/* f17a7e4: 8cc6c81c */ lw $a2,-0x37e4($a2) +/* f17a7e4: 8cc6c81c */ lw $a2,%lo(g_MpPlayers+0x64)($a2) /* f17a7e8: 8fbf0014 */ lw $ra,0x14($sp) /* f17a7ec: 3c028007 */ lui $v0,%hi(g_StringPointer) /* f17a7f0: 8c421440 */ lw $v0,%lo(g_StringPointer)($v0) @@ -1528,7 +1528,7 @@ glabel func0f17a7fc /* f17a80c: 000e7880 */ sll $t7,$t6,0x2 /* f17a810: 01ee7821 */ addu $t7,$t7,$t6 /* f17a814: 000f7940 */ sll $t7,$t7,0x5 -/* f17a818: 3c06800b */ lui $a2,0x800b +/* f17a818: 3c06800b */ lui $a2,%hi(g_MpPlayers+0x7c) /* f17a81c: 00cf3021 */ addu $a2,$a2,$t7 /* f17a820: 3c048007 */ lui $a0,%hi(g_StringPointer) /* f17a824: afbf0014 */ sw $ra,0x14($sp) @@ -1536,7 +1536,7 @@ glabel func0f17a7fc /* f17a82c: 24a57f0c */ addiu $a1,$a1,%lo(var7f1b7f0c) /* f17a830: 8c841440 */ lw $a0,%lo(g_StringPointer)($a0) /* f17a834: 0c004dad */ jal sprintf -/* f17a838: 8cc6c834 */ lw $a2,-0x37cc($a2) +/* f17a838: 8cc6c834 */ lw $a2,%lo(g_MpPlayers+0x7c)($a2) /* f17a83c: 8fbf0014 */ lw $ra,0x14($sp) /* f17a840: 3c028007 */ lui $v0,%hi(g_StringPointer) /* f17a844: 8c421440 */ lw $v0,%lo(g_StringPointer)($v0) @@ -1553,7 +1553,7 @@ glabel func0f17a850 /* f17a860: 000e7880 */ sll $t7,$t6,0x2 /* f17a864: 01ee7821 */ addu $t7,$t7,$t6 /* f17a868: 000f7940 */ sll $t7,$t7,0x5 -/* f17a86c: 3c06800b */ lui $a2,0x800b +/* f17a86c: 3c06800b */ lui $a2,%hi(g_MpPlayers+0x84) /* f17a870: 00cf3021 */ addu $a2,$a2,$t7 /* f17a874: 3c048007 */ lui $a0,%hi(g_StringPointer) /* f17a878: afbf0014 */ sw $ra,0x14($sp) @@ -1561,7 +1561,7 @@ glabel func0f17a850 /* f17a880: 24a57f10 */ addiu $a1,$a1,%lo(var7f1b7f10) /* f17a884: 8c841440 */ lw $a0,%lo(g_StringPointer)($a0) /* f17a888: 0c004dad */ jal sprintf -/* f17a88c: 8cc6c83c */ lw $a2,-0x37c4($a2) +/* f17a88c: 8cc6c83c */ lw $a2,%lo(g_MpPlayers+0x84)($a2) /* f17a890: 8fbf0014 */ lw $ra,0x14($sp) /* f17a894: 3c028007 */ lui $v0,%hi(g_StringPointer) /* f17a898: 8c421440 */ lw $v0,%lo(g_StringPointer)($v0) @@ -1578,7 +1578,7 @@ glabel func0f17a8a4 /* f17a8b4: 000e7880 */ sll $t7,$t6,0x2 /* f17a8b8: 01ee7821 */ addu $t7,$t7,$t6 /* f17a8bc: 000f7940 */ sll $t7,$t7,0x5 -/* f17a8c0: 3c06800b */ lui $a2,0x800b +/* f17a8c0: 3c06800b */ lui $a2,%hi(g_MpPlayers+0x88) /* f17a8c4: 00cf3021 */ addu $a2,$a2,$t7 /* f17a8c8: 3c048007 */ lui $a0,%hi(g_StringPointer) /* f17a8cc: afbf0014 */ sw $ra,0x14($sp) @@ -1586,7 +1586,7 @@ glabel func0f17a8a4 /* f17a8d4: 24a57f14 */ addiu $a1,$a1,%lo(var7f1b7f14) /* f17a8d8: 8c841440 */ lw $a0,%lo(g_StringPointer)($a0) /* f17a8dc: 0c004dad */ jal sprintf -/* f17a8e0: 8cc6c840 */ lw $a2,-0x37c0($a2) +/* f17a8e0: 8cc6c840 */ lw $a2,%lo(g_MpPlayers+0x88)($a2) /* f17a8e4: 8fbf0014 */ lw $ra,0x14($sp) /* f17a8e8: 3c028007 */ lui $v0,%hi(g_StringPointer) /* f17a8ec: 8c421440 */ lw $v0,%lo(g_StringPointer)($v0) @@ -1603,7 +1603,7 @@ glabel func0f17a8f8 /* f17a908: 000e7880 */ sll $t7,$t6,0x2 /* f17a90c: 01ee7821 */ addu $t7,$t7,$t6 /* f17a910: 000f7940 */ sll $t7,$t7,0x5 -/* f17a914: 3c06800b */ lui $a2,0x800b +/* f17a914: 3c06800b */ lui $a2,%hi(g_MpPlayers+0x8c) /* f17a918: 00cf3021 */ addu $a2,$a2,$t7 /* f17a91c: 3c048007 */ lui $a0,%hi(g_StringPointer) /* f17a920: afbf0014 */ sw $ra,0x14($sp) @@ -1611,7 +1611,7 @@ glabel func0f17a8f8 /* f17a928: 24a57f18 */ addiu $a1,$a1,%lo(var7f1b7f18) /* f17a92c: 8c841440 */ lw $a0,%lo(g_StringPointer)($a0) /* f17a930: 0c004dad */ jal sprintf -/* f17a934: 8cc6c844 */ lw $a2,-0x37bc($a2) +/* f17a934: 8cc6c844 */ lw $a2,%lo(g_MpPlayers+0x8c)($a2) /* f17a938: 8fbf0014 */ lw $ra,0x14($sp) /* f17a93c: 3c028007 */ lui $v0,%hi(g_StringPointer) /* f17a940: 8c421440 */ lw $v0,%lo(g_StringPointer)($v0) @@ -1628,7 +1628,7 @@ glabel func0f17a94c /* f17a95c: 000e7880 */ sll $t7,$t6,0x2 /* f17a960: 01ee7821 */ addu $t7,$t7,$t6 /* f17a964: 000f7940 */ sll $t7,$t7,0x5 -/* f17a968: 3c06800b */ lui $a2,0x800b +/* f17a968: 3c06800b */ lui $a2,%hi(g_MpPlayers+0x90) /* f17a96c: 00cf3021 */ addu $a2,$a2,$t7 /* f17a970: 3c048007 */ lui $a0,%hi(g_StringPointer) /* f17a974: afbf0014 */ sw $ra,0x14($sp) @@ -1636,7 +1636,7 @@ glabel func0f17a94c /* f17a97c: 24a57f1c */ addiu $a1,$a1,%lo(var7f1b7f1c) /* f17a980: 8c841440 */ lw $a0,%lo(g_StringPointer)($a0) /* f17a984: 0c004dad */ jal sprintf -/* f17a988: 8cc6c848 */ lw $a2,-0x37b8($a2) +/* f17a988: 8cc6c848 */ lw $a2,%lo(g_MpPlayers+0x90)($a2) /* f17a98c: 8fbf0014 */ lw $ra,0x14($sp) /* f17a990: 3c028007 */ lui $v0,%hi(g_StringPointer) /* f17a994: 8c421440 */ lw $v0,%lo(g_StringPointer)($v0) @@ -1648,13 +1648,13 @@ GLOBAL_ASM( glabel func0f17a9a0 /* f17a9a0: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f17a9a4: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f17a9a8: 3c06800b */ lui $a2,0x800b +/* f17a9a8: 3c06800b */ lui $a2,%hi(g_MpPlayers+0x80) /* f17a9ac: 3c020001 */ lui $v0,0x1 /* f17a9b0: 000e7880 */ sll $t7,$t6,0x2 /* f17a9b4: 01ee7821 */ addu $t7,$t7,$t6 /* f17a9b8: 000f7940 */ sll $t7,$t7,0x5 /* f17a9bc: 00cf3021 */ addu $a2,$a2,$t7 -/* f17a9c0: 8cc6c838 */ lw $a2,-0x37c8($a2) +/* f17a9c0: 8cc6c838 */ lw $a2,%lo(g_MpPlayers+0x80)($a2) /* f17a9c4: 344286a1 */ ori $v0,$v0,0x86a1 /* f17a9c8: 27bdffe8 */ addiu $sp,$sp,-24 /* f17a9cc: 00c2082a */ slt $at,$a2,$v0 @@ -1723,13 +1723,13 @@ GLOBAL_ASM( glabel func0f17aaa0 /* f17aaa0: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f17aaa4: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f17aaa8: 3c18800b */ lui $t8,0x800b +/* f17aaa8: 3c18800b */ lui $t8,%hi(g_MpPlayers+0x6c) /* f17aaac: 27bdffe0 */ addiu $sp,$sp,-32 /* f17aab0: 000e7880 */ sll $t7,$t6,0x2 /* f17aab4: 01ee7821 */ addu $t7,$t7,$t6 /* f17aab8: 000f7940 */ sll $t7,$t7,0x5 /* f17aabc: 030fc021 */ addu $t8,$t8,$t7 -/* f17aac0: 8f18c824 */ lw $t8,-0x37dc($t8) +/* f17aac0: 8f18c824 */ lw $t8,%lo(g_MpPlayers+0x6c)($t8) /* f17aac4: afa40020 */ sw $a0,0x20($sp) /* f17aac8: 3c048007 */ lui $a0,%hi(g_StringPointer) /* f17aacc: 44982000 */ mtc1 $t8,$f4 @@ -1766,13 +1766,13 @@ GLOBAL_ASM( glabel func0f17ab38 /* f17ab38: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f17ab3c: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f17ab40: 3c02800b */ lui $v0,0x800b +/* f17ab40: 3c02800b */ lui $v0,%hi(g_MpPlayers+0x68) /* f17ab44: 2408003c */ addiu $t0,$zero,0x3c /* f17ab48: 000e7880 */ sll $t7,$t6,0x2 /* f17ab4c: 01ee7821 */ addu $t7,$t7,$t6 /* f17ab50: 000f7940 */ sll $t7,$t7,0x5 /* f17ab54: 004f1021 */ addu $v0,$v0,$t7 -/* f17ab58: 8c42c820 */ lw $v0,-0x37e0($v0) +/* f17ab58: 8c42c820 */ lw $v0,%lo(g_MpPlayers+0x68)($v0) /* f17ab5c: 27bdffe0 */ addiu $sp,$sp,-32 /* f17ab60: afbf001c */ sw $ra,0x1c($sp) /* f17ab64: 0048001b */ divu $zero,$v0,$t0 @@ -1894,13 +1894,13 @@ GLOBAL_ASM( glabel func0f17ace8 /* f17ace8: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f17acec: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f17acf0: 3c18800b */ lui $t8,0x800b +/* f17acf0: 3c18800b */ lui $t8,%hi(g_MpPlayers+0x70) /* f17acf4: 27bdffe0 */ addiu $sp,$sp,-32 /* f17acf8: 000e7880 */ sll $t7,$t6,0x2 /* f17acfc: 01ee7821 */ addu $t7,$t7,$t6 /* f17ad00: 000f7940 */ sll $t7,$t7,0x5 /* f17ad04: 030fc021 */ addu $t8,$t8,$t7 -/* f17ad08: 8f18c828 */ lw $t8,-0x37d8($t8) +/* f17ad08: 8f18c828 */ lw $t8,%lo(g_MpPlayers+0x70)($t8) /* f17ad0c: afa40020 */ sw $a0,0x20($sp) /* f17ad10: 3c048007 */ lui $a0,%hi(g_StringPointer) /* f17ad14: 44982000 */ mtc1 $t8,$f4 @@ -2060,13 +2060,13 @@ GLOBAL_ASM( glabel func0f17af1c /* f17af1c: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f17af20: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f17af24: 3c18800b */ lui $t8,0x800b +/* f17af24: 3c18800b */ lui $t8,%hi(g_MpPlayers+0x78) /* f17af28: 27bdffe8 */ addiu $sp,$sp,-24 /* f17af2c: 000e7880 */ sll $t7,$t6,0x2 /* f17af30: 01ee7821 */ addu $t7,$t7,$t6 /* f17af34: 000f7940 */ sll $t7,$t7,0x5 /* f17af38: 030fc021 */ addu $t8,$t8,$t7 -/* f17af3c: 8f18c830 */ lw $t8,-0x37d0($t8) +/* f17af3c: 8f18c830 */ lw $t8,%lo(g_MpPlayers+0x78)($t8) /* f17af40: afa40018 */ sw $a0,0x18($sp) /* f17af44: 3c048007 */ lui $a0,%hi(g_StringPointer) /* f17af48: 44982000 */ mtc1 $t8,$f4 @@ -2097,13 +2097,13 @@ GLOBAL_ASM( glabel func0f17af9c /* f17af9c: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f17afa0: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f17afa4: 3c18800b */ lui $t8,0x800b +/* f17afa4: 3c18800b */ lui $t8,%hi(g_MpPlayers+0x74) /* f17afa8: 27bdffe8 */ addiu $sp,$sp,-24 /* f17afac: 000e7880 */ sll $t7,$t6,0x2 /* f17afb0: 01ee7821 */ addu $t7,$t7,$t6 /* f17afb4: 000f7940 */ sll $t7,$t7,0x5 /* f17afb8: 030fc021 */ addu $t8,$t8,$t7 -/* f17afbc: 8f18c82c */ lw $t8,-0x37d4($t8) +/* f17afbc: 8f18c82c */ lw $t8,%lo(g_MpPlayers+0x74)($t8) /* f17afc0: afa40018 */ sw $a0,0x18($sp) /* f17afc4: 3c048007 */ lui $a0,%hi(g_StringPointer) /* f17afc8: 44982000 */ mtc1 $t8,$f4 @@ -2539,10 +2539,10 @@ glabel var7f1b814c /* f17b564: 030fc021 */ addu $t8,$t8,$t7 /* f17b568: 46062202 */ mul.s $f8,$f4,$f6 /* f17b56c: 0018c0c0 */ sll $t8,$t8,0x3 -/* f17b570: 3c19800a */ lui $t9,%hi(var8009e000) +/* f17b570: 3c19800a */ lui $t9,0x800a /* f17b574: 030fc023 */ subu $t8,$t8,$t7 /* f17b578: 0018c100 */ sll $t8,$t8,0x4 -/* f17b57c: 2739e000 */ addiu $t9,$t9,%lo(var8009e000) +/* f17b57c: 2739e000 */ addiu $t9,$t9,-8192 /* f17b580: 03191821 */ addu $v1,$t8,$t9 /* f17b584: c46a0d64 */ lwc1 $f10,0xd64($v1) /* f17b588: 46085000 */ add.s $f0,$f10,$f8 @@ -2557,8 +2557,8 @@ glabel var7f1b814c /* f17b5ac: 306400ff */ andi $a0,$v1,0xff /* f17b5b0: 3c088007 */ lui $t0,%hi(g_MpPlayerNum) /* f17b5b4: 8d081448 */ lw $t0,%lo(g_MpPlayerNum)($t0) -/* f17b5b8: 3c0a800a */ lui $t2,%hi(var8009e000) -/* f17b5bc: 254ae000 */ addiu $t2,$t2,%lo(var8009e000) +/* f17b5b8: 3c0a800a */ lui $t2,0x800a +/* f17b5bc: 254ae000 */ addiu $t2,$t2,-8192 /* f17b5c0: 000848c0 */ sll $t1,$t0,0x3 /* f17b5c4: 01284823 */ subu $t1,$t1,$t0 /* f17b5c8: 00094880 */ sll $t1,$t1,0x2 @@ -2588,8 +2588,8 @@ glabel var7f1b814c /* f17b624: 304400ff */ andi $a0,$v0,0xff /* f17b628: 3c188007 */ lui $t8,%hi(g_MpPlayerNum) /* f17b62c: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f17b630: 3c08800a */ lui $t0,%hi(var8009e000) -/* f17b634: 2508e000 */ addiu $t0,$t0,%lo(var8009e000) +/* f17b630: 3c08800a */ lui $t0,0x800a +/* f17b634: 2508e000 */ addiu $t0,$t0,-8192 /* f17b638: 0018c8c0 */ sll $t9,$t8,0x3 /* f17b63c: 0338c823 */ subu $t9,$t9,$t8 /* f17b640: 0019c880 */ sll $t9,$t9,0x2 @@ -2612,7 +2612,7 @@ glabel var7f1b814c /* f17b684: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f17b688: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) /* f17b68c: 8fb9003c */ lw $t9,0x3c($sp) -/* f17b690: 3c18800a */ lui $t8,%hi(var8009e000) +/* f17b690: 3c18800a */ lui $t8,0x800a /* f17b694: 000e78c0 */ sll $t7,$t6,0x3 /* f17b698: 01ee7823 */ subu $t7,$t7,$t6 /* f17b69c: 000f7880 */ sll $t7,$t7,0x2 @@ -2620,7 +2620,7 @@ glabel var7f1b814c /* f17b6a4: 000f78c0 */ sll $t7,$t7,0x3 /* f17b6a8: 01ee7823 */ subu $t7,$t7,$t6 /* f17b6ac: 000f7900 */ sll $t7,$t7,0x4 -/* f17b6b0: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f17b6b0: 2718e000 */ addiu $t8,$t8,-8192 /* f17b6b4: 01f81821 */ addu $v1,$t7,$t8 /* f17b6b8: 03224023 */ subu $t0,$t9,$v0 /* f17b6bc: a0680df0 */ sb $t0,0xdf0($v1) @@ -2646,7 +2646,7 @@ glabel var7f1b814c /* f17b708: acca0000 */ sw $t2,0x0($a2) /* f17b70c: 3c0c8007 */ lui $t4,%hi(g_MpPlayerNum) /* f17b710: 8d8c1448 */ lw $t4,%lo(g_MpPlayerNum)($t4) -/* f17b714: 3c01800a */ lui $at,0x800a +/* f17b714: 3c01800a */ lui $at,%hi(g_MenuStack+0x840) /* f17b718: 240b0003 */ addiu $t3,$zero,0x3 /* f17b71c: 000c68c0 */ sll $t5,$t4,0x3 /* f17b720: 01ac6823 */ subu $t5,$t5,$t4 @@ -2657,7 +2657,7 @@ glabel var7f1b814c /* f17b734: 000d6900 */ sll $t5,$t5,0x4 /* f17b738: 002d0821 */ addu $at,$at,$t5 /* f17b73c: 0fc62ec7 */ jal func0f18bb1c -/* f17b740: a02be840 */ sb $t3,-0x17c0($at) +/* f17b740: a02be840 */ sb $t3,%lo(g_MenuStack+0x840)($at) /* f17b744: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f17b748: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) /* f17b74c: 44800000 */ mtc1 $zero,$f0 @@ -2670,8 +2670,8 @@ glabel var7f1b814c /* f17b768: 01ee7823 */ subu $t7,$t7,$t6 /* f17b76c: 44819000 */ mtc1 $at,$f18 /* f17b770: 000f7900 */ sll $t7,$t7,0x4 -/* f17b774: 3c19800a */ lui $t9,%hi(var8009e000) -/* f17b778: 2739e000 */ addiu $t9,$t9,%lo(var8009e000) +/* f17b774: 3c19800a */ lui $t9,0x800a +/* f17b778: 2739e000 */ addiu $t9,$t9,-8192 /* f17b77c: 25f80840 */ addiu $t8,$t7,0x840 /* f17b780: 24080001 */ addiu $t0,$zero,0x1 /* f17b784: 44050000 */ mfc1 $a1,$f0 @@ -2687,7 +2687,7 @@ glabel var7f1b814c /* f17b7ac: 3c098007 */ lui $t1,%hi(g_MpPlayerNum) /* f17b7b0: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) /* f17b7b4: 3c017f1c */ lui $at,%hi(var7f1b8148) -/* f17b7b8: 3c0c800a */ lui $t4,%hi(var8009e000) +/* f17b7b8: 3c0c800a */ lui $t4,0x800a /* f17b7bc: 000950c0 */ sll $t2,$t1,0x3 /* f17b7c0: 01495023 */ subu $t2,$t2,$t1 /* f17b7c4: 000a5080 */ sll $t2,$t2,0x2 @@ -2697,7 +2697,7 @@ glabel var7f1b814c /* f17b7d4: c4228148 */ lwc1 $f2,%lo(var7f1b8148)($at) /* f17b7d8: 44800000 */ mtc1 $zero,$f0 /* f17b7dc: 000a5100 */ sll $t2,$t2,0x4 -/* f17b7e0: 258ce000 */ addiu $t4,$t4,%lo(var8009e000) +/* f17b7e0: 258ce000 */ addiu $t4,$t4,-8192 /* f17b7e4: 014c1821 */ addu $v1,$t2,$t4 /* f17b7e8: 3c01c040 */ lui $at,0xc040 /* f17b7ec: 44812000 */ mtc1 $at,$f4 @@ -2743,11 +2743,11 @@ glabel func0f17b8b0 /* f17b8c0: 000e7880 */ sll $t7,$t6,0x2 /* f17b8c4: 01ee7821 */ addu $t7,$t7,$t6 /* f17b8c8: 000f7940 */ sll $t7,$t7,0x5 -/* f17b8cc: 3c04800b */ lui $a0,0x800b +/* f17b8cc: 3c04800b */ lui $a0,%hi(g_MpPlayers+0x10) /* f17b8d0: afbf0014 */ sw $ra,0x14($sp) /* f17b8d4: 008f2021 */ addu $a0,$a0,$t7 /* f17b8d8: 0fc62f0c */ jal mpGetBodyName -/* f17b8dc: 9084c7c8 */ lbu $a0,-0x3838($a0) +/* f17b8dc: 9084c7c8 */ lbu $a0,%lo(g_MpPlayers+0x10)($a0) /* f17b8e0: 8fbf0014 */ lw $ra,0x14($sp) /* f17b8e4: 27bd0018 */ addiu $sp,$sp,0x18 /* f17b8e8: 03e00008 */ jr $ra @@ -3115,7 +3115,7 @@ glabel var7f1b818c /* f17bd98: 1020000e */ beqz $at,.L0f17bdd4 /* f17bd9c: 00000000 */ sll $zero,$zero,0x0 /* f17bda0: 8d4a1448 */ lw $t2,%lo(g_MpPlayerNum)($t2) -/* f17bda4: 3c01800a */ lui $at,0x800a +/* f17bda4: 3c01800a */ lui $at,%hi(g_MenuStack+0xe1c) /* f17bda8: 3409ffff */ dli $t1,0xffff /* f17bdac: 000a58c0 */ sll $t3,$t2,0x3 /* f17bdb0: 016a5823 */ subu $t3,$t3,$t2 @@ -3126,14 +3126,14 @@ glabel var7f1b818c /* f17bdc4: 000b5900 */ sll $t3,$t3,0x4 /* f17bdc8: 002b0821 */ addu $at,$at,$t3 /* f17bdcc: 10000012 */ beqz $zero,.L0f17be18 -/* f17bdd0: ac29ee1c */ sw $t1,-0x11e4($at) +/* f17bdd0: ac29ee1c */ sw $t1,%lo(g_MenuStack+0xe1c)($at) .L0f17bdd4: /* f17bdd4: 0fc63703 */ jal mpGetNumUnlockedPresets /* f17bdd8: afa70038 */ sw $a3,0x38($sp) /* f17bddc: 3c0d8007 */ lui $t5,%hi(g_MpPlayerNum) /* f17bde0: 8dad1448 */ lw $t5,%lo(g_MpPlayerNum)($t5) /* f17bde4: 8fa70038 */ lw $a3,0x38($sp) -/* f17bde8: 3c01800a */ lui $at,0x800a +/* f17bde8: 3c01800a */ lui $at,%hi(g_MenuStack+0xe1c) /* f17bdec: 000d78c0 */ sll $t7,$t5,0x3 /* f17bdf0: 01ed7823 */ subu $t7,$t7,$t5 /* f17bdf4: 000f7880 */ sll $t7,$t7,0x2 @@ -3144,7 +3144,7 @@ glabel var7f1b818c /* f17be08: 000f7900 */ sll $t7,$t7,0x4 /* f17be0c: 002f0821 */ addu $at,$at,$t7 /* f17be10: 01827023 */ subu $t6,$t4,$v0 -/* f17be14: ac2eee1c */ sw $t6,-0x11e4($at) +/* f17be14: ac2eee1c */ sw $t6,%lo(g_MenuStack+0xe1c)($at) .L0f17be18: /* f17be18: 00001025 */ or $v0,$zero,$zero .L0f17be1c: @@ -3159,7 +3159,7 @@ GLOBAL_ASM( glabel func0f17be2c /* f17be2c: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f17be30: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f17be34: 3c02800a */ lui $v0,0x800a +/* f17be34: 3c02800a */ lui $v0,%hi(g_MenuStack+0xe1c) /* f17be38: 3401ffff */ dli $at,0xffff /* f17be3c: 000e78c0 */ sll $t7,$t6,0x3 /* f17be40: 01ee7823 */ subu $t7,$t7,$t6 @@ -3169,7 +3169,7 @@ glabel func0f17be2c /* f17be50: 01ee7823 */ subu $t7,$t7,$t6 /* f17be54: 000f7900 */ sll $t7,$t7,0x4 /* f17be58: 004f1021 */ addu $v0,$v0,$t7 -/* f17be5c: 8c42ee1c */ lw $v0,-0x11e4($v0) +/* f17be5c: 8c42ee1c */ lw $v0,%lo(g_MenuStack+0xe1c)($v0) /* f17be60: 27bdffa8 */ addiu $sp,$sp,-88 /* f17be64: afbf001c */ sw $ra,0x1c($sp) /* f17be68: 0041082b */ sltu $at,$v0,$at @@ -3495,9 +3495,9 @@ glabel menuhandlerMpHandicapPlayer /* f17c438: 1081001e */ beq $a0,$at,.L0f17c4b4 /* f17c43c: 24010018 */ addiu $at,$zero,0x18 /* f17c440: 14810033 */ bne $a0,$at,.L0f17c510 -/* f17c444: 3c0e800b */ lui $t6,0x800b +/* f17c444: 3c0e800b */ lui $t6,%hi(g_MpSetup+0x16) /* f17c448: 90af0001 */ lbu $t7,0x1($a1) -/* f17c44c: 95cecb9e */ lhu $t6,-0x3462($t6) +/* f17c44c: 95cecb9e */ lhu $t6,%lo(g_MpSetup+0x16)($t6) /* f17c450: 24180001 */ addiu $t8,$zero,0x1 /* f17c454: 01f8c804 */ sllv $t9,$t8,$t7 /* f17c458: 01d94024 */ and $t0,$t6,$t9 @@ -3507,34 +3507,34 @@ glabel menuhandlerMpHandicapPlayer /* f17c468: 24020001 */ addiu $v0,$zero,0x1 .L0f17c46c: /* f17c46c: 90a90001 */ lbu $t1,0x1($a1) -/* f17c470: 3c0b800b */ lui $t3,0x800b +/* f17c470: 3c0b800b */ lui $t3,%hi(g_MpPlayers+0x9d) /* f17c474: 00095080 */ sll $t2,$t1,0x2 /* f17c478: 01495021 */ addu $t2,$t2,$t1 /* f17c47c: 000a5140 */ sll $t2,$t2,0x5 /* f17c480: 016a5821 */ addu $t3,$t3,$t2 -/* f17c484: 916bc855 */ lbu $t3,-0x37ab($t3) +/* f17c484: 916bc855 */ lbu $t3,%lo(g_MpPlayers+0x9d)($t3) /* f17c488: 10000021 */ beqz $zero,.L0f17c510 /* f17c48c: accb0000 */ sw $t3,0x0($a2) .L0f17c490: /* f17c490: 90ad0001 */ lbu $t5,0x1($a1) /* f17c494: 94cc0002 */ lhu $t4,0x2($a2) -/* f17c498: 3c01800b */ lui $at,0x800b +/* f17c498: 3c01800b */ lui $at,%hi(g_MpPlayers+0x9d) /* f17c49c: 000dc080 */ sll $t8,$t5,0x2 /* f17c4a0: 030dc021 */ addu $t8,$t8,$t5 /* f17c4a4: 0018c140 */ sll $t8,$t8,0x5 /* f17c4a8: 00380821 */ addu $at,$at,$t8 /* f17c4ac: 10000018 */ beqz $zero,.L0f17c510 -/* f17c4b0: a02cc855 */ sb $t4,-0x37ab($at) +/* f17c4b0: a02cc855 */ sb $t4,%lo(g_MpPlayers+0x9d)($at) .L0f17c4b4: /* f17c4b4: 90af0001 */ lbu $t7,0x1($a1) -/* f17c4b8: 3c04800b */ lui $a0,0x800b +/* f17c4b8: 3c04800b */ lui $a0,%hi(g_MpPlayers+0x9d) /* f17c4bc: afa60028 */ sw $a2,0x28($sp) /* f17c4c0: 000f7080 */ sll $t6,$t7,0x2 /* f17c4c4: 01cf7021 */ addu $t6,$t6,$t7 /* f17c4c8: 000e7140 */ sll $t6,$t6,0x5 /* f17c4cc: 008e2021 */ addu $a0,$a0,$t6 /* f17c4d0: 0fc61ddc */ jal func0f187770 -/* f17c4d4: 9084c855 */ lbu $a0,-0x37ab($a0) +/* f17c4d4: 9084c855 */ lbu $a0,%lo(g_MpPlayers+0x9d)($a0) /* f17c4d8: 3c0142c8 */ lui $at,0x42c8 /* f17c4dc: 44812000 */ mtc1 $at,$f4 /* f17c4e0: 8fb90028 */ lw $t9,0x28($sp) @@ -3561,8 +3561,8 @@ glabel menuhandlerMpHandicapPlayer GLOBAL_ASM( glabel func0f17c524 /* f17c524: 90830001 */ lbu $v1,0x1($a0) -/* f17c528: 3c0e800b */ lui $t6,0x800b -/* f17c52c: 95cecb9e */ lhu $t6,-0x3462($t6) +/* f17c528: 3c0e800b */ lui $t6,%hi(g_MpSetup+0x16) +/* f17c52c: 95cecb9e */ lhu $t6,%lo(g_MpSetup+0x16)($t6) /* f17c530: 240f0001 */ addiu $t7,$zero,0x1 /* f17c534: 006fc004 */ sllv $t8,$t7,$v1 /* f17c538: 01d8c824 */ and $t9,$t6,$t8 @@ -3723,7 +3723,7 @@ glabel var7f1b81e8 /* f17c7a0: 00001025 */ or $v0,$zero,$zero /* f17c7a4: 3c0a8007 */ lui $t2,%hi(g_MpPlayerNum) /* f17c7a8: 8d4a1448 */ lw $t2,%lo(g_MpPlayerNum)($t2) -/* f17c7ac: 3c0c800a */ lui $t4,0x800a +/* f17c7ac: 3c0c800a */ lui $t4,%hi(g_MenuStack+0xe1c) /* f17c7b0: afa00038 */ sw $zero,0x38($sp) /* f17c7b4: 000a58c0 */ sll $t3,$t2,0x3 /* f17c7b8: 016a5823 */ subu $t3,$t3,$t2 @@ -3733,8 +3733,8 @@ glabel var7f1b81e8 /* f17c7c8: 016a5823 */ subu $t3,$t3,$t2 /* f17c7cc: 000b5900 */ sll $t3,$t3,0x4 /* f17c7d0: 018b6021 */ addu $t4,$t4,$t3 -/* f17c7d4: 8d8cee1c */ lw $t4,-0x11e4($t4) -/* f17c7d8: 3c18800b */ lui $t8,0x800b +/* f17c7d4: 8d8cee1c */ lw $t4,%lo(g_MenuStack+0xe1c)($t4) +/* f17c7d8: 3c18800b */ lui $t8,%hi(g_MpSetup+0x16) /* f17c7dc: 05810007 */ bgez $t4,.L0f17c7fc /* f17c7e0: afac003c */ sw $t4,0x3c($sp) /* f17c7e4: 0fc632ee */ jal func0f18cbb8 @@ -3745,7 +3745,7 @@ glabel var7f1b81e8 /* f17c7f8: afad0038 */ sw $t5,0x38($sp) .L0f17c7fc: /* f17c7fc: 8faf003c */ lw $t7,0x3c($sp) -/* f17c800: 9718cb9e */ lhu $t8,-0x3462($t8) +/* f17c800: 9718cb9e */ lhu $t8,%lo(g_MpSetup+0x16)($t8) /* f17c804: 24190001 */ addiu $t9,$zero,0x1 /* f17c808: 25ee0004 */ addiu $t6,$t7,0x4 /* f17c80c: 01d94004 */ sllv $t0,$t9,$t6 @@ -3801,7 +3801,7 @@ glabel var7f1b81e8 /* f17c8bc: 3c098007 */ lui $t1,%hi(g_MpPlayerNum) /* f17c8c0: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) /* f17c8c4: 8e880000 */ lw $t0,0x0($s4) -/* f17c8c8: 3c01800a */ lui $at,0x800a +/* f17c8c8: 3c01800a */ lui $at,%hi(g_MenuStack+0xe20) /* f17c8cc: 000950c0 */ sll $t2,$t1,0x3 /* f17c8d0: 01495023 */ subu $t2,$t2,$t1 /* f17c8d4: 000a5080 */ sll $t2,$t2,0x2 @@ -3811,7 +3811,7 @@ glabel var7f1b81e8 /* f17c8e4: 000a5100 */ sll $t2,$t2,0x4 /* f17c8e8: 002a0821 */ addu $at,$at,$t2 /* f17c8ec: 1000004b */ beqz $zero,.L0f17ca1c -/* f17c8f0: ac28ee20 */ sw $t0,-0x11e0($at) +/* f17c8f0: ac28ee20 */ sw $t0,%lo(g_MenuStack+0xe20)($at) /* f17c8f4: 3c108008 */ lui $s0,%hi(g_MpGeneralSimulants) /* f17c8f8: 2610772c */ addiu $s0,$s0,%lo(g_MpGeneralSimulants) /* f17c8fc: 00008825 */ or $s1,$zero,$zero @@ -3831,7 +3831,7 @@ glabel var7f1b81e8 .L0f17c92c: /* f17c92c: 3c0c8007 */ lui $t4,%hi(g_MpPlayerNum) /* f17c930: 8d8c1448 */ lw $t4,%lo(g_MpPlayerNum)($t4) -/* f17c934: 3c01800a */ lui $at,0x800a +/* f17c934: 3c01800a */ lui $at,%hi(g_MenuStack+0xe24) /* f17c938: 000c68c0 */ sll $t5,$t4,0x3 /* f17c93c: 01ac6823 */ subu $t5,$t5,$t4 /* f17c940: 000d6880 */ sll $t5,$t5,0x2 @@ -3840,10 +3840,10 @@ glabel var7f1b81e8 /* f17c94c: 01ac6823 */ subu $t5,$t5,$t4 /* f17c950: 000d6900 */ sll $t5,$t5,0x4 /* f17c954: 002d0821 */ addu $at,$at,$t5 -/* f17c958: ac31ee24 */ sw $s1,-0x11dc($at) +/* f17c958: ac31ee24 */ sw $s1,%lo(g_MenuStack+0xe24)($at) /* f17c95c: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f17c960: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f17c964: 3c0e800a */ lui $t6,0x800a +/* f17c964: 3c0e800a */ lui $t6,%hi(g_MenuStack+0xe20) /* f17c968: 000fc8c0 */ sll $t9,$t7,0x3 /* f17c96c: 032fc823 */ subu $t9,$t9,$t7 /* f17c970: 0019c880 */ sll $t9,$t9,0x2 @@ -3852,7 +3852,7 @@ glabel var7f1b81e8 /* f17c97c: 032fc823 */ subu $t9,$t9,$t7 /* f17c980: 0019c900 */ sll $t9,$t9,0x4 /* f17c984: 01d97021 */ addu $t6,$t6,$t9 -/* f17c988: 8dceee20 */ lw $t6,-0x11e0($t6) +/* f17c988: 8dceee20 */ lw $t6,%lo(g_MenuStack+0xe20)($t6) /* f17c98c: 10000023 */ beqz $zero,.L0f17ca1c /* f17c990: ae8e0000 */ sw $t6,0x0($s4) /* f17c994: 24180002 */ addiu $t8,$zero,0x2 @@ -3918,9 +3918,9 @@ glabel func0f17ca40 /* f17ca60: 000f78c0 */ sll $t7,$t7,0x3 /* f17ca64: 01ee7823 */ subu $t7,$t7,$t6 /* f17ca68: 000f7900 */ sll $t7,$t7,0x4 -/* f17ca6c: 3c04800a */ lui $a0,0x800a +/* f17ca6c: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe24) /* f17ca70: 008f2021 */ addu $a0,$a0,$t7 -/* f17ca74: 8c84ee24 */ lw $a0,-0x11dc($a0) +/* f17ca74: 8c84ee24 */ lw $a0,%lo(g_MenuStack+0xe24)($a0) /* f17ca78: afbf0014 */ sw $ra,0x14($sp) /* f17ca7c: 0fc5b9f1 */ jal langGet /* f17ca80: 2484586a */ addiu $a0,$a0,0x586a @@ -3979,7 +3979,7 @@ glabel menudialog0017ccfc /* f17cd14: 00a03825 */ or $a3,$a1,$zero /* f17cd18: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f17cd1c: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f17cd20: 3c02800a */ lui $v0,%hi(g_MenuStack) +/* f17cd20: 3c02800a */ lui $v0,%hi(g_MenuStack+0x4f8) /* f17cd24: 000fc0c0 */ sll $t8,$t7,0x3 /* f17cd28: 030fc023 */ subu $t8,$t8,$t7 /* f17cd2c: 0018c080 */ sll $t8,$t8,0x2 @@ -3988,7 +3988,7 @@ glabel menudialog0017ccfc /* f17cd38: 030fc023 */ subu $t8,$t8,$t7 /* f17cd3c: 0018c100 */ sll $t8,$t8,0x4 /* f17cd40: 00581021 */ addu $v0,$v0,$t8 -/* f17cd44: 8c42e4f8 */ lw $v0,%lo(g_MenuStack)($v0) +/* f17cd44: 8c42e4f8 */ lw $v0,%lo(g_MenuStack+0x4f8)($v0) /* f17cd48: 8c590000 */ lw $t9,0x0($v0) /* f17cd4c: 54b9000d */ bnel $a1,$t9,.L0f17cd84 /* f17cd50: 8fa40038 */ lw $a0,0x38($sp) @@ -4042,7 +4042,7 @@ glabel menuhandlerMpSimulantDifficulty /* f17cdf8: 00001025 */ or $v0,$zero,$zero .L0f17cdfc: /* f17cdfc: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f17ce00: 3c04800a */ lui $a0,0x800a +/* f17ce00: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe1c) /* f17ce04: 8e850000 */ lw $a1,0x0($s4) /* f17ce08: 000e78c0 */ sll $t7,$t6,0x3 /* f17ce0c: 01ee7823 */ subu $t7,$t7,$t6 @@ -4053,15 +4053,15 @@ glabel menuhandlerMpSimulantDifficulty /* f17ce20: 000f7900 */ sll $t7,$t7,0x4 /* f17ce24: 008f2021 */ addu $a0,$a0,$t7 /* f17ce28: 0fc632d8 */ jal func0f18cb60 -/* f17ce2c: 8c84ee1c */ lw $a0,-0x11e4($a0) +/* f17ce2c: 8c84ee1c */ lw $a0,%lo(g_MenuStack+0xe1c)($a0) /* f17ce30: 0fc63377 */ jal func0f18cddc /* f17ce34: 00000000 */ sll $zero,$zero,0x0 /* f17ce38: 1000003f */ beqz $zero,.L0f17cf38 /* f17ce3c: 00001025 */ or $v0,$zero,$zero .L0f17ce40: /* f17ce40: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f17ce44: 3c08800a */ lui $t0,0x800a -/* f17ce48: 3c02800b */ lui $v0,0x800b +/* f17ce44: 3c08800a */ lui $t0,%hi(g_MenuStack+0xe1c) +/* f17ce48: 3c02800b */ lui $v0,%hi(g_MpSimulants+0x48) /* f17ce4c: 0018c8c0 */ sll $t9,$t8,0x3 /* f17ce50: 0338c823 */ subu $t9,$t9,$t8 /* f17ce54: 0019c880 */ sll $t9,$t9,0x2 @@ -4070,14 +4070,14 @@ glabel menuhandlerMpSimulantDifficulty /* f17ce60: 0338c823 */ subu $t9,$t9,$t8 /* f17ce64: 0019c900 */ sll $t9,$t9,0x4 /* f17ce68: 01194021 */ addu $t0,$t0,$t9 -/* f17ce6c: 8d08ee1c */ lw $t0,-0x11e4($t0) +/* f17ce6c: 8d08ee1c */ lw $t0,%lo(g_MenuStack+0xe1c)($t0) /* f17ce70: 00084880 */ sll $t1,$t0,0x2 /* f17ce74: 01284821 */ addu $t1,$t1,$t0 /* f17ce78: 00094880 */ sll $t1,$t1,0x2 /* f17ce7c: 01284823 */ subu $t1,$t1,$t0 /* f17ce80: 00094880 */ sll $t1,$t1,0x2 /* f17ce84: 00491021 */ addu $v0,$v0,$t1 -/* f17ce88: 9042c580 */ lbu $v0,-0x3a80($v0) +/* f17ce88: 9042c580 */ lbu $v0,%lo(g_MpSimulants+0x48)($v0) /* f17ce8c: 04400005 */ bltz $v0,.L0f17cea4 /* f17ce90: 28410006 */ slti $at,$v0,0x6 /* f17ce94: 10200003 */ beqz $at,.L0f17cea4 @@ -4156,7 +4156,7 @@ GLOBAL_ASM( glabel func0f17cfc0 /* f17cfc0: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f17cfc4: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f17cfc8: 3c18800a */ lui $t8,0x800a +/* f17cfc8: 3c18800a */ lui $t8,%hi(g_MenuStack+0xe1c) /* f17cfcc: 27bdffe8 */ addiu $sp,$sp,-24 /* f17cfd0: 000e78c0 */ sll $t7,$t6,0x3 /* f17cfd4: 01ee7823 */ subu $t7,$t7,$t6 @@ -4166,7 +4166,7 @@ glabel func0f17cfc0 /* f17cfe4: 01ee7823 */ subu $t7,$t7,$t6 /* f17cfe8: 000f7900 */ sll $t7,$t7,0x4 /* f17cfec: 030fc021 */ addu $t8,$t8,$t7 -/* f17cff0: 8f18ee1c */ lw $t8,-0x11e4($t8) +/* f17cff0: 8f18ee1c */ lw $t8,%lo(g_MenuStack+0xe1c)($t8) /* f17cff4: afa40018 */ sw $a0,0x18($sp) /* f17cff8: 3c08800b */ lui $t0,%hi(g_MpSimulants) /* f17cffc: 0018c880 */ sll $t9,$t8,0x2 @@ -4281,10 +4281,10 @@ glabel func0f17d378 /* f17d398: 01cf1821 */ addu $v1,$t6,$t7 /* f17d39c: 90780000 */ lbu $t8,0x0($v1) /* f17d3a0: 24480004 */ addiu $t0,$v0,0x4 -/* f17d3a4: 3c19800b */ lui $t9,0x800b +/* f17d3a4: 3c19800b */ lui $t9,%hi(g_MpSetup+0x16) /* f17d3a8: 13000007 */ beqz $t8,.L0f17d3c8 /* f17d3ac: 3c027f1c */ lui $v0,%hi(var7f1b8030) -/* f17d3b0: 9739cb9e */ lhu $t9,-0x3462($t9) +/* f17d3b0: 9739cb9e */ lhu $t9,%lo(g_MpSetup+0x16)($t9) /* f17d3b4: 24090001 */ addiu $t1,$zero,0x1 /* f17d3b8: 01095004 */ sllv $t2,$t1,$t0 /* f17d3bc: 032a5824 */ and $t3,$t9,$t2 @@ -4301,7 +4301,7 @@ glabel func0f17d378 /* f17d3e0: afbf0014 */ sw $ra,0x14($sp) /* f17d3e4: 90820001 */ lbu $v0,0x1($a0) /* f17d3e8: 3c0f800b */ lui $t7,%hi(g_MpSimulants) -/* f17d3ec: 3c18800b */ lui $t8,0x800b +/* f17d3ec: 3c18800b */ lui $t8,%hi(g_MpSetup+0x16) /* f17d3f0: 00027080 */ sll $t6,$v0,0x2 /* f17d3f4: 01c27021 */ addu $t6,$t6,$v0 /* f17d3f8: 000e7080 */ sll $t6,$t6,0x2 @@ -4312,7 +4312,7 @@ glabel func0f17d378 /* f17d40c: 24590004 */ addiu $t9,$v0,0x4 /* f17d410: 11e00007 */ beqz $t7,.L0f17d430 /* f17d414: 00000000 */ sll $zero,$zero,0x0 -/* f17d418: 9718cb9e */ lhu $t8,-0x3462($t8) +/* f17d418: 9718cb9e */ lhu $t8,%lo(g_MpSetup+0x16)($t8) /* f17d41c: 24080001 */ addiu $t0,$zero,0x1 /* f17d420: 03284804 */ sllv $t1,$t0,$t9 /* f17d424: 03095024 */ and $t2,$t8,$t1 @@ -4679,7 +4679,7 @@ glabel func0f17dac4 /* f17dad4: afa5001c */ sw $a1,0x1c($sp) /* f17dad8: 24010003 */ addiu $at,$zero,0x3 /* f17dadc: 1081000a */ beq $a0,$at,.L0f17db08 -/* f17dae0: 3c0e800b */ lui $t6,0x800b +/* f17dae0: 3c0e800b */ lui $t6,%hi(g_MpSetup+0xc) /* f17dae4: 10000017 */ beqz $zero,.L0f17db44 /* f17dae8: 00000000 */ sll $zero,$zero,0x0 .L0f17daec: @@ -4691,7 +4691,7 @@ glabel func0f17dac4 /* f17db00: 10000010 */ beqz $zero,.L0f17db44 /* f17db04: acc20000 */ sw $v0,0x0($a2) .L0f17db08: -/* f17db08: 8dcecb94 */ lw $t6,-0x346c($t6) +/* f17db08: 8dcecb94 */ lw $t6,%lo(g_MpSetup+0xc)($t6) /* f17db0c: 3c027f1c */ lui $v0,%hi(var7f1b8044) /* f17db10: 31cf0002 */ andi $t7,$t6,0x2 /* f17db14: 55e00004 */ bnezl $t7,.L0f17db28 @@ -4700,8 +4700,8 @@ glabel func0f17dac4 /* f17db20: 24428044 */ addiu $v0,$v0,%lo(var7f1b8044) /* f17db24: 8cd80000 */ lw $t8,0x0($a2) .L0f17db28: -/* f17db28: 3c08800b */ lui $t0,0x800b -/* f17db2c: 2508cbb0 */ addiu $t0,$t0,-13392 +/* f17db28: 3c08800b */ lui $t0,%hi(g_MpSetup+0x28) +/* f17db2c: 2508cbb0 */ addiu $t0,$t0,%lo(g_MpSetup+0x28) /* f17db30: 0018c880 */ sll $t9,$t8,0x2 /* f17db34: 0338c823 */ subu $t9,$t9,$t8 /* f17db38: 0019c880 */ sll $t9,$t9,0x2 @@ -5084,11 +5084,11 @@ glabel menuhandler0017e06c /* f17e094: 25291448 */ addiu $t1,$t1,%lo(g_MpPlayerNum) /* f17e098: 8d2e0000 */ lw $t6,0x0($t1) /* f17e09c: 240a0e70 */ addiu $t2,$zero,0xe70 -/* f17e0a0: 3c08800a */ lui $t0,%hi(var8009e000) +/* f17e0a0: 3c08800a */ lui $t0,0x800a /* f17e0a4: 01ca0019 */ multu $t6,$t2 -/* f17e0a8: 2508e000 */ addiu $t0,$t0,%lo(var8009e000) -/* f17e0ac: 3c07800b */ lui $a3,0x800b -/* f17e0b0: 24e7cbb0 */ addiu $a3,$a3,-13392 +/* f17e0a8: 2508e000 */ addiu $t0,$t0,-8192 +/* f17e0ac: 3c07800b */ lui $a3,%hi(g_MpSetup+0x28) +/* f17e0b0: 24e7cbb0 */ addiu $a3,$a3,%lo(g_MpSetup+0x28) /* f17e0b4: 240b000a */ addiu $t3,$zero,0xa /* f17e0b8: 00001825 */ or $v1,$zero,$zero /* f17e0bc: 00007812 */ mflo $t7 @@ -5151,7 +5151,7 @@ glabel menuhandler0017e06c /* f17e18c: 11e0001d */ beqz $t7,.L0f17e204 /* f17e190: 25291448 */ addiu $t1,$t1,%lo(g_MpPlayerNum) /* f17e194: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f17e198: 3c0d800a */ lui $t5,0x800a +/* f17e198: 3c0d800a */ lui $t5,%hi(g_MenuStack+0xe1c) /* f17e19c: 00403021 */ addu $a2,$v0,$zero /* f17e1a0: 0018c8c0 */ sll $t9,$t8,0x3 /* f17e1a4: 0338c823 */ subu $t9,$t9,$t8 @@ -5161,9 +5161,9 @@ glabel menuhandler0017e06c /* f17e1b4: 0338c823 */ subu $t9,$t9,$t8 /* f17e1b8: 0019c900 */ sll $t9,$t9,0x4 /* f17e1bc: 01b96821 */ addu $t5,$t5,$t9 -/* f17e1c0: 8dadee1c */ lw $t5,-0x11e4($t5) -/* f17e1c4: 3c18800b */ lui $t8,0x800b -/* f17e1c8: 2718cbb0 */ addiu $t8,$t8,-13392 +/* f17e1c0: 8dadee1c */ lw $t5,%lo(g_MenuStack+0xe1c)($t5) +/* f17e1c4: 3c18800b */ lui $t8,%hi(g_MpSetup+0x28) +/* f17e1c8: 2718cbb0 */ addiu $t8,$t8,%lo(g_MpSetup+0x28) /* f17e1cc: 000d7080 */ sll $t6,$t5,0x2 /* f17e1d0: 01cd7023 */ subu $t6,$t6,$t5 /* f17e1d4: 000e7080 */ sll $t6,$t6,0x2 @@ -5182,11 +5182,11 @@ glabel menuhandler0017e06c .L0f17e204: /* f17e204: 8d390000 */ lw $t9,0x0($t1) /* f17e208: 240a0e70 */ addiu $t2,$zero,0xe70 -/* f17e20c: 3c08800a */ lui $t0,%hi(var8009e000) +/* f17e20c: 3c08800a */ lui $t0,0x800a /* f17e210: 032a0019 */ multu $t9,$t2 -/* f17e214: 2508e000 */ addiu $t0,$t0,%lo(var8009e000) -/* f17e218: 3c07800b */ lui $a3,0x800b -/* f17e21c: 24e7cbb0 */ addiu $a3,$a3,-13392 +/* f17e214: 2508e000 */ addiu $t0,$t0,-8192 +/* f17e218: 3c07800b */ lui $a3,%hi(g_MpSetup+0x28) +/* f17e21c: 24e7cbb0 */ addiu $a3,$a3,%lo(g_MpSetup+0x28) /* f17e220: 3c02800a */ lui $v0,%hi(g_Vars) /* f17e224: 24429fc0 */ addiu $v0,$v0,%lo(g_Vars) /* f17e228: 00006812 */ mflo $t5 @@ -5221,8 +5221,8 @@ glabel menuhandler0017e06c GLOBAL_ASM( glabel func0f17e288 /* f17e288: 8c830008 */ lw $v1,0x8($a0) -/* f17e28c: 3c0f800b */ lui $t7,0x800b -/* f17e290: 25efcbb0 */ addiu $t7,$t7,-13392 +/* f17e28c: 3c0f800b */ lui $t7,%hi(g_MpSetup+0x28) +/* f17e290: 25efcbb0 */ addiu $t7,$t7,%lo(g_MpSetup+0x28) /* f17e294: 2463a9f8 */ addiu $v1,$v1,-22024 /* f17e298: 00037080 */ sll $t6,$v1,0x2 /* f17e29c: 01c37023 */ subu $t6,$t6,$v1 @@ -5250,7 +5250,7 @@ glabel func0f17e318 /* f17e328: 24045038 */ addiu $a0,$zero,0x5038 /* f17e32c: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f17e330: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f17e334: 3c04800a */ lui $a0,0x800a +/* f17e334: 3c04800a */ lui $a0,%hi(g_MenuStack+0xe1c) /* f17e338: afa20018 */ sw $v0,0x18($sp) /* f17e33c: 000e78c0 */ sll $t7,$t6,0x3 /* f17e340: 01ee7823 */ subu $t7,$t7,$t6 @@ -5261,7 +5261,7 @@ glabel func0f17e318 /* f17e354: 000f7900 */ sll $t7,$t7,0x4 /* f17e358: 008f2021 */ addu $a0,$a0,$t7 /* f17e35c: 0fc66dbe */ jal func0f19b6f8 -/* f17e360: 8c84ee1c */ lw $a0,-0x11e4($a0) +/* f17e360: 8c84ee1c */ lw $a0,%lo(g_MenuStack+0xe1c)($a0) /* f17e364: 3c048007 */ lui $a0,%hi(g_StringPointer) /* f17e368: 8c841440 */ lw $a0,%lo(g_StringPointer)($a0) /* f17e36c: 8fa50018 */ lw $a1,0x18($sp) @@ -5300,14 +5300,14 @@ glabel menudialog0017e3fc /* f17e418: 10810029 */ beq $a0,$at,.L0f17e4c0 /* f17e41c: 24010066 */ addiu $at,$zero,0x66 /* f17e420: 10810021 */ beq $a0,$at,.L0f17e4a8 -/* f17e424: 3c09800b */ lui $t1,0x800b +/* f17e424: 3c09800b */ lui $t1,%hi(g_MpSetup+0x88) /* f17e428: 10000026 */ beqz $zero,.L0f17e4c4 /* f17e42c: 8fbf0014 */ lw $ra,0x14($sp) .L0f17e430: /* f17e430: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f17e434: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f17e438: 3c18800a */ lui $t8,%hi(var8009e000) -/* f17e43c: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f17e438: 3c18800a */ lui $t8,0x800a +/* f17e43c: 2718e000 */ addiu $t8,$t8,-8192 /* f17e440: 000e78c0 */ sll $t7,$t6,0x3 /* f17e444: 01ee7823 */ subu $t7,$t7,$t6 /* f17e448: 000f7880 */ sll $t7,$t7,0x2 @@ -5323,7 +5323,7 @@ glabel menudialog0017e3fc /* f17e470: 8c460848 */ lw $a2,0x848($v0) /* f17e474: 3c198007 */ lui $t9,%hi(g_MpPlayerNum) /* f17e478: 8f391448 */ lw $t9,%lo(g_MpPlayerNum)($t9) -/* f17e47c: 3c01800a */ lui $at,0x800a +/* f17e47c: 3c01800a */ lui $at,%hi(g_MenuStack+0xe20) /* f17e480: 001940c0 */ sll $t0,$t9,0x3 /* f17e484: 01194023 */ subu $t0,$t0,$t9 /* f17e488: 00084080 */ sll $t0,$t0,0x2 @@ -5333,9 +5333,9 @@ glabel menudialog0017e3fc /* f17e498: 00084100 */ sll $t0,$t0,0x4 /* f17e49c: 00280821 */ addu $at,$at,$t0 /* f17e4a0: 10000007 */ beqz $zero,.L0f17e4c0 -/* f17e4a4: ac22ee20 */ sw $v0,-0x11e0($at) +/* f17e4a4: ac22ee20 */ sw $v0,%lo(g_MenuStack+0xe20)($at) .L0f17e4a8: -/* f17e4a8: 9129cc10 */ lbu $t1,-0x33f0($t1) +/* f17e4a8: 9129cc10 */ lbu $t1,%lo(g_MpSetup+0x88)($t1) /* f17e4ac: 24010005 */ addiu $at,$zero,0x5 /* f17e4b0: 55210004 */ bnel $t1,$at,.L0f17e4c4 /* f17e4b4: 8fbf0014 */ lw $ra,0x14($sp) @@ -5422,8 +5422,8 @@ glabel var7f1b8288 /* f17e518: 8c2e822c */ lw $t6,%lo(var7f1b822c)($at) /* f17e51c: 01c00008 */ jr $t6 /* f17e520: 00000000 */ sll $zero,$zero,0x0 -/* f17e524: 3c0f800b */ lui $t7,0x800b -/* f17e528: 91efcc10 */ lbu $t7,-0x33f0($t7) +/* f17e524: 3c0f800b */ lui $t7,%hi(g_MpSetup+0x88) +/* f17e528: 91efcc10 */ lbu $t7,%lo(g_MpSetup+0x88)($t7) /* f17e52c: 24010005 */ addiu $at,$zero,0x5 /* f17e530: 55e1011e */ bnel $t7,$at,.L0f17e9ac /* f17e534: 00001025 */ or $v0,$zero,$zero @@ -5442,7 +5442,7 @@ glabel var7f1b8288 .L0f17e568: /* f17e568: 8d8c1448 */ lw $t4,%lo(g_MpPlayerNum)($t4) /* f17e56c: 8ecb0000 */ lw $t3,0x0($s6) -/* f17e570: 3c01800a */ lui $at,0x800a +/* f17e570: 3c01800a */ lui $at,%hi(g_MenuStack+0xe1c) /* f17e574: 000c68c0 */ sll $t5,$t4,0x3 /* f17e578: 01ac6823 */ subu $t5,$t5,$t4 /* f17e57c: 000d6880 */ sll $t5,$t5,0x2 @@ -5451,7 +5451,7 @@ glabel var7f1b8288 /* f17e588: 01ac6823 */ subu $t5,$t5,$t4 /* f17e58c: 000d6900 */ sll $t5,$t5,0x4 /* f17e590: 002d0821 */ addu $at,$at,$t5 -/* f17e594: ac2bee1c */ sw $t3,-0x11e4($at) +/* f17e594: ac2bee1c */ sw $t3,%lo(g_MenuStack+0xe1c)($at) /* f17e598: 90ae0001 */ lbu $t6,0x1($a1) /* f17e59c: 3c048008 */ lui $a0,%hi(menudialog_2bfa8) /* f17e5a0: 15c00005 */ bnez $t6,.L0f17e5b8 @@ -5783,8 +5783,8 @@ s32 menuhandlerMpStartChallenge(u32 operation, struct menu_item *item, s32 *valu GLOBAL_ASM( glabel func0f17eac8 -/* f17eac8: 3c0e800b */ lui $t6,0x800b -/* f17eacc: 91cecc10 */ lbu $t6,-0x33f0($t6) +/* f17eac8: 3c0e800b */ lui $t6,%hi(g_MpSetup+0x88) +/* f17eacc: 91cecc10 */ lbu $t6,%lo(g_MpSetup+0x88)($t6) /* f17ead0: 27bdffe8 */ addiu $sp,$sp,-24 /* f17ead4: 24010005 */ addiu $at,$zero,0x5 /* f17ead8: afbf0014 */ sw $ra,0x14($sp) @@ -5822,14 +5822,14 @@ glabel menudialog0017eb34 /* f17eb40: afa40018 */ sw $a0,0x18($sp) /* f17eb44: 1481002c */ bne $a0,$at,.L0f17ebf8 /* f17eb48: afa60020 */ sw $a2,0x20($sp) -/* f17eb4c: 3c0f800b */ lui $t7,0x800b -/* f17eb50: 91efcc10 */ lbu $t7,-0x33f0($t7) +/* f17eb4c: 3c0f800b */ lui $t7,%hi(g_MpSetup+0x88) +/* f17eb50: 91efcc10 */ lbu $t7,%lo(g_MpSetup+0x88)($t7) /* f17eb54: 24010005 */ addiu $at,$zero,0x5 /* f17eb58: 3c188007 */ lui $t8,%hi(g_MpPlayerNum) /* f17eb5c: 55e10027 */ bnel $t7,$at,.L0f17ebfc /* f17eb60: 8fad0018 */ lw $t5,0x18($sp) /* f17eb64: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f17eb68: 3c02800a */ lui $v0,%hi(g_MenuStack) +/* f17eb68: 3c02800a */ lui $v0,%hi(g_MenuStack+0x4f8) /* f17eb6c: 0018c8c0 */ sll $t9,$t8,0x3 /* f17eb70: 0338c823 */ subu $t9,$t9,$t8 /* f17eb74: 0019c880 */ sll $t9,$t9,0x2 @@ -5838,7 +5838,7 @@ glabel menudialog0017eb34 /* f17eb80: 0338c823 */ subu $t9,$t9,$t8 /* f17eb84: 0019c900 */ sll $t9,$t9,0x4 /* f17eb88: 00591021 */ addu $v0,$v0,$t9 -/* f17eb8c: 8c42e4f8 */ lw $v0,%lo(g_MenuStack)($v0) +/* f17eb8c: 8c42e4f8 */ lw $v0,%lo(g_MenuStack+0x4f8)($v0) /* f17eb90: 5040001a */ beqzl $v0,.L0f17ebfc /* f17eb94: 8fad0018 */ lw $t5,0x18($sp) /* f17eb98: 8c480000 */ lw $t0,0x0($v0) @@ -5849,8 +5849,8 @@ glabel menudialog0017eb34 /* f17ebac: 14400012 */ bnez $v0,.L0f17ebf8 /* f17ebb0: 3c098007 */ lui $t1,%hi(g_MpPlayerNum) /* f17ebb4: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) -/* f17ebb8: 3c0b800a */ lui $t3,%hi(var8009e000) -/* f17ebbc: 256be000 */ addiu $t3,$t3,%lo(var8009e000) +/* f17ebb8: 3c0b800a */ lui $t3,0x800a +/* f17ebbc: 256be000 */ addiu $t3,$t3,-8192 /* f17ebc0: 000950c0 */ sll $t2,$t1,0x3 /* f17ebc4: 01495023 */ subu $t2,$t2,$t1 /* f17ebc8: 000a5080 */ sll $t2,$t2,0x2 @@ -5873,7 +5873,7 @@ glabel menudialog0017eb34 /* f17ec04: 55a10013 */ bnel $t5,$at,.L0f17ec54 /* f17ec08: 8fbf0014 */ lw $ra,0x14($sp) /* f17ec0c: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f17ec10: 3c18800a */ lui $t8,0x800a +/* f17ec10: 3c18800a */ lui $t8,%hi(g_MenuStack+0x850) /* f17ec14: 3c014fac */ lui $at,0x4fac /* f17ec18: 000e78c0 */ sll $t7,$t6,0x3 /* f17ec1c: 01ee7823 */ subu $t7,$t7,$t6 @@ -5883,7 +5883,7 @@ glabel menudialog0017eb34 /* f17ec2c: 01ee7823 */ subu $t7,$t7,$t6 /* f17ec30: 000f7900 */ sll $t7,$t7,0x4 /* f17ec34: 030fc021 */ addu $t8,$t8,$t7 -/* f17ec38: 8f18e850 */ lw $t8,-0x17b0($t8) +/* f17ec38: 8f18e850 */ lw $t8,%lo(g_MenuStack+0x850)($t8) /* f17ec3c: 34215ace */ ori $at,$at,0x5ace /* f17ec40: 57010004 */ bnel $t8,$at,.L0f17ec54 /* f17ec44: 8fbf0014 */ lw $ra,0x14($sp) @@ -5965,13 +5965,13 @@ GLOBAL_ASM( glabel func0f17eed4 /* f17eed4: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f17eed8: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f17eedc: 3c18800b */ lui $t8,0x800b +/* f17eedc: 3c18800b */ lui $t8,%hi(g_MpPlayers+0x4c) /* f17eee0: 27bdffe8 */ addiu $sp,$sp,-24 /* f17eee4: 000e7880 */ sll $t7,$t6,0x2 /* f17eee8: 01ee7821 */ addu $t7,$t7,$t6 /* f17eeec: 000f7940 */ sll $t7,$t7,0x5 /* f17eef0: 030fc021 */ addu $t8,$t8,$t7 -/* f17eef4: 8f18c804 */ lw $t8,-0x37fc($t8) +/* f17eef4: 8f18c804 */ lw $t8,%lo(g_MpPlayers+0x4c)($t8) /* f17eef8: afbf0014 */ sw $ra,0x14($sp) /* f17eefc: afa40018 */ sw $a0,0x18($sp) /* f17ef00: 17000005 */ bnez $t8,.L0f17ef18 @@ -6026,11 +6026,11 @@ glabel func0f17f024 /* f17f024: 27bdffe8 */ addiu $sp,$sp,-24 /* f17f028: afa40018 */ sw $a0,0x18($sp) /* f17f02c: 3c048008 */ lui $a0,0x8008 -/* f17f030: 3c03800b */ lui $v1,0x800b +/* f17f030: 3c03800b */ lui $v1,%hi(g_MpSetup+0x11) /* f17f034: 3c028008 */ lui $v0,%hi(mpstages) /* f17f038: afbf0014 */ sw $ra,0x14($sp) /* f17f03c: 24424b98 */ addiu $v0,$v0,%lo(mpstages) -/* f17f040: 9063cb99 */ lbu $v1,-0x3467($v1) +/* f17f040: 9063cb99 */ lbu $v1,%lo(g_MpSetup+0x11)($v1) /* f17f044: 24844bfe */ addiu $a0,$a0,0x4bfe /* f17f048: 844e0000 */ lh $t6,0x0($v0) .L0f17f04c: @@ -6100,8 +6100,8 @@ glabel var7f1b8298 glabel var7f1b829c .word func0f17f100+0x118 # f17f218 .text -/* f17f100: 3c0e800a */ lui $t6,0x800a -/* f17f104: 8dcea470 */ lw $t6,-0x5b90($t6) +/* f17f100: 3c0e800a */ lui $t6,%hi(g_Vars+0x4b0) +/* f17f104: 8dcea470 */ lw $t6,%lo(g_Vars+0x4b0)($t6) /* f17f108: 27bdffe0 */ addiu $sp,$sp,-32 /* f17f10c: 24010005 */ addiu $at,$zero,0x5 /* f17f110: afbf001c */ sw $ra,0x1c($sp) @@ -6115,8 +6115,8 @@ glabel var7f1b829c /* f17f12c: 2a010008 */ slti $at,$s0,0x8 /* f17f130: 1420fffb */ bnez $at,.L0f17f120 /* f17f134: 00000000 */ sll $zero,$zero,0x0 -/* f17f138: 3c0f800a */ lui $t7,0x800a -/* f17f13c: 8defa470 */ lw $t7,-0x5b90($t7) +/* f17f138: 3c0f800a */ lui $t7,%hi(g_Vars+0x4b0) +/* f17f13c: 8defa470 */ lw $t7,%lo(g_Vars+0x4b0)($t7) /* f17f140: 2de10005 */ sltiu $at,$t7,0x5 /* f17f144: 10200041 */ beqz $at,.L0f17f24c /* f17f148: 000f7880 */ sll $t7,$t7,0x2 @@ -6146,8 +6146,8 @@ glabel var7f1b829c /* f17f1a8: 3c03800a */ lui $v1,%hi(g_Vars) /* f17f1ac: 354b0002 */ ori $t3,$t2,0x2 /* f17f1b0: ac8b000c */ sw $t3,0xc($a0) -/* f17f1b4: 3c04800a */ lui $a0,0x800a -/* f17f1b8: 24849fc4 */ addiu $a0,$a0,-24636 +/* f17f1b4: 3c04800a */ lui $a0,%hi(g_Vars+0x4) +/* f17f1b8: 24849fc4 */ addiu $a0,$a0,%lo(g_Vars+0x4) /* f17f1bc: 24639fc0 */ addiu $v1,$v1,%lo(g_Vars) /* f17f1c0: 2442c7b8 */ addiu $v0,$v0,%lo(g_MpPlayers) .L0f17f1c4: @@ -6162,10 +6162,10 @@ glabel var7f1b829c /* f17f1e4: 2484cb88 */ addiu $a0,$a0,%lo(g_MpSetup) /* f17f1e8: 8c8d000c */ lw $t5,0xc($a0) /* f17f1ec: 3c02800b */ lui $v0,%hi(g_MpPlayers) -/* f17f1f0: 3c03800b */ lui $v1,0x800b +/* f17f1f0: 3c03800b */ lui $v1,%hi(g_MpPlayers+0x280) /* f17f1f4: 35ae0002 */ ori $t6,$t5,0x2 /* f17f1f8: ac8e000c */ sw $t6,0xc($a0) -/* f17f1fc: 2463ca38 */ addiu $v1,$v1,-13768 +/* f17f1fc: 2463ca38 */ addiu $v1,$v1,%lo(g_MpPlayers+0x280) /* f17f200: 2442c7b8 */ addiu $v0,$v0,%lo(g_MpPlayers) .L0f17f204: /* f17f204: 244200a0 */ addiu $v0,$v0,0xa0 @@ -6459,8 +6459,8 @@ glabel var7f1b8310 /* f17f524: 1000001c */ beqz $zero,.L0f17f598 /* f17f528: accf0000 */ sw $t7,0x0($a2) /* f17f52c: 8cd80000 */ lw $t8,0x0($a2) -/* f17f530: 3c08800b */ lui $t0,0x800b -/* f17f534: 2508cbb0 */ addiu $t0,$t0,-13392 +/* f17f530: 3c08800b */ lui $t0,%hi(g_MpSetup+0x28) +/* f17f534: 2508cbb0 */ addiu $t0,$t0,%lo(g_MpSetup+0x28) /* f17f538: 0018c880 */ sll $t9,$t8,0x2 /* f17f53c: 0338c823 */ subu $t9,$t9,$t8 /* f17f540: 0019c880 */ sll $t9,$t9,0x2 @@ -6468,18 +6468,18 @@ glabel var7f1b8310 /* f17f548: 03281021 */ addu $v0,$t9,$t0 /* f17f54c: 90aa0001 */ lbu $t2,0x1($a1) /* f17f550: 8cc90000 */ lw $t1,0x0($a2) -/* f17f554: 3c01800a */ lui $at,0x800a +/* f17f554: 3c01800a */ lui $at,%hi(g_Vars+0x4ac) /* f17f558: 002a0821 */ addu $at,$at,$t2 /* f17f55c: 1000000e */ beqz $zero,.L0f17f598 -/* f17f560: a029a46c */ sb $t1,-0x5b94($at) +/* f17f560: a029a46c */ sb $t1,%lo(g_Vars+0x4ac)($at) /* f17f564: 90ab0001 */ lbu $t3,0x1($a1) -/* f17f568: 3c0c800a */ lui $t4,0x800a +/* f17f568: 3c0c800a */ lui $t4,%hi(g_Vars+0x4ac) /* f17f56c: 018b6021 */ addu $t4,$t4,$t3 -/* f17f570: 818ca46c */ lb $t4,-0x5b94($t4) +/* f17f570: 818ca46c */ lb $t4,%lo(g_Vars+0x4ac)($t4) /* f17f574: 10000008 */ beqz $zero,.L0f17f598 /* f17f578: accc0000 */ sw $t4,0x0($a2) -/* f17f57c: 3c0d800a */ lui $t5,0x800a -/* f17f580: 8dada470 */ lw $t5,-0x5b90($t5) +/* f17f57c: 3c0d800a */ lui $t5,%hi(g_Vars+0x4b0) +/* f17f580: 8dada470 */ lw $t5,%lo(g_Vars+0x4b0)($t5) /* f17f584: 24010002 */ addiu $at,$zero,0x2 /* f17f588: 51a10004 */ beql $t5,$at,.L0f17f59c /* f17f58c: 00001025 */ or $v0,$zero,$zero @@ -6682,15 +6682,15 @@ glabel var7f1b8430 /* f17f818: 10000015 */ beqz $zero,.L0f17f870 /* f17f81c: 00001025 */ or $v0,$zero,$zero /* f17f820: 8e980000 */ lw $t8,0x0($s4) -/* f17f824: 3c01800a */ lui $at,0x800a +/* f17f824: 3c01800a */ lui $at,%hi(g_Vars+0x4a8) /* f17f828: 10000010 */ beqz $zero,.L0f17f86c -/* f17f82c: ac38a468 */ sw $t8,-0x5b98($at) -/* f17f830: 3c19800a */ lui $t9,0x800a -/* f17f834: 8f39a468 */ lw $t9,-0x5b98($t9) +/* f17f82c: ac38a468 */ sw $t8,%lo(g_Vars+0x4a8)($at) +/* f17f830: 3c19800a */ lui $t9,%hi(g_Vars+0x4a8) +/* f17f834: 8f39a468 */ lw $t9,%lo(g_Vars+0x4a8)($t9) /* f17f838: 1000000c */ beqz $zero,.L0f17f86c /* f17f83c: ae990000 */ sw $t9,0x0($s4) -/* f17f840: 3c02800a */ lui $v0,0x800a -/* f17f844: 8c42a470 */ lw $v0,-0x5b90($v0) +/* f17f840: 3c02800a */ lui $v0,%hi(g_Vars+0x4b0) +/* f17f844: 8c42a470 */ lw $v0,%lo(g_Vars+0x4b0)($v0) /* f17f848: 24010001 */ addiu $at,$zero,0x1 /* f17f84c: 10410007 */ beq $v0,$at,.L0f17f86c /* f17f850: 24010003 */ addiu $at,$zero,0x3 diff --git a/src/game/game_17f930.c b/src/game/game_17f930.c index 68f0de901..108a800ff 100644 --- a/src/game/game_17f930.c +++ b/src/game/game_17f930.c @@ -84,8 +84,8 @@ bool menudialogCombatSimulator(u32 operation, struct menu_dialog *dialog, struct g_Vars.unk000497 = 0; } - if (g_MenuStack[g_MpPlayerNum].unk00 && - g_MenuStack[g_MpPlayerNum].unk00->dialog == &g_CombatSimulatorMenuDialog && + if (g_MenuStack[g_MpPlayerNum].unk4f8 && + g_MenuStack[g_MpPlayerNum].unk4f8->dialog == &g_CombatSimulatorMenuDialog && operation == MENUOP_102) { g_Vars.unk000490 = 2; g_Vars.mpquickteam = MPQUICKTEAM_5; @@ -154,17 +154,17 @@ glabel func0f17fa28 /* f17fad0: 0018c0c0 */ sll $t8,$t8,0x3 /* f17fad4: 0302c023 */ subu $t8,$t8,$v0 /* f17fad8: 0018c100 */ sll $t8,$t8,0x4 -/* f17fadc: 3c19800a */ lui $t9,%hi(g_MenuStack) +/* f17fadc: 3c19800a */ lui $t9,%hi(g_MenuStack+0x4f8) /* f17fae0: afe20000 */ sw $v0,0x0($ra) /* f17fae4: 0338c821 */ addu $t9,$t9,$t8 -/* f17fae8: 8f39e4f8 */ lw $t9,%lo(g_MenuStack)($t9) +/* f17fae8: 8f39e4f8 */ lw $t9,%lo(g_MenuStack+0x4f8)($t9) /* f17faec: 5320005f */ beqzl $t9,.L0f17fc6c /* f17faf0: 24420001 */ addiu $v0,$v0,0x1 /* f17faf4: afa20044 */ sw $v0,0x44($sp) /* f17faf8: 8fe20000 */ lw $v0,0x0($ra) .L0f17fafc: -/* f17fafc: 3c0f800a */ lui $t7,%hi(var8009e000) -/* f17fb00: 25efe000 */ addiu $t7,$t7,%lo(var8009e000) +/* f17fafc: 3c0f800a */ lui $t7,0x800a +/* f17fb00: 25efe000 */ addiu $t7,$t7,-8192 /* f17fb04: 000270c0 */ sll $t6,$v0,0x3 /* f17fb08: 01c27023 */ subu $t6,$t6,$v0 /* f17fb0c: 000e7080 */ sll $t6,$t6,0x2 @@ -295,7 +295,7 @@ GLOBAL_ASM( glabel func0f17fcb0 /* f17fcb0: 3c028007 */ lui $v0,%hi(g_MpPlayerNum) /* f17fcb4: 8c421448 */ lw $v0,%lo(g_MpPlayerNum)($v0) -/* f17fcb8: 3c01800a */ lui $at,0x800a +/* f17fcb8: 3c01800a */ lui $at,%hi(g_MenuStack+0x83b) /* f17fcbc: 3c0f8009 */ lui $t7,%hi(g_Is4Mb) /* f17fcc0: 000270c0 */ sll $t6,$v0,0x3 /* f17fcc4: 01c27023 */ subu $t6,$t6,$v0 @@ -306,7 +306,7 @@ glabel func0f17fcb0 /* f17fcd8: 000e7100 */ sll $t6,$t6,0x4 /* f17fcdc: 91ef0af0 */ lbu $t7,%lo(g_Is4Mb)($t7) /* f17fce0: 002e0821 */ addu $at,$at,$t6 -/* f17fce4: a022e83b */ sb $v0,-0x17c5($at) +/* f17fce4: a022e83b */ sb $v0,%lo(g_MenuStack+0x83b)($at) /* f17fce8: 27bdffd8 */ addiu $sp,$sp,-40 /* f17fcec: 24010001 */ addiu $at,$zero,0x1 /* f17fcf0: afbf0024 */ sw $ra,0x24($sp) @@ -321,8 +321,8 @@ glabel func0f17fcb0 /* f17fd14: 10000012 */ beqz $zero,.L0f17fd60 /* f17fd18: 8fb90028 */ lw $t9,0x28($sp) .L0f17fd1c: -/* f17fd1c: 3c18800b */ lui $t8,0x800b -/* f17fd20: 9318cc10 */ lbu $t8,-0x33f0($t8) +/* f17fd1c: 3c18800b */ lui $t8,%hi(g_MpSetup+0x88) +/* f17fd20: 9318cc10 */ lbu $t8,%lo(g_MpSetup+0x88)($t8) /* f17fd24: 24010005 */ addiu $at,$zero,0x5 /* f17fd28: 3c048008 */ lui $a0,%hi(menudialog_mpgamesetup3) /* f17fd2c: 17010007 */ bne $t8,$at,.L0f17fd4c @@ -542,16 +542,16 @@ glabel func0f17ff8c /* f17ffa0: 2b01003c */ slti $at,$t8,0x3c /* f17ffa4: 1020000b */ beqz $at,.L0f17ffd4 /* f17ffa8: afa40000 */ sw $a0,0x0($sp) -/* f17ffac: 3c19800b */ lui $t9,0x800b -/* f17ffb0: 8739c128 */ lh $t9,-0x3ed8($t9) -/* f17ffb4: 3c0a800b */ lui $t2,0x800b -/* f17ffb8: 3c01800b */ lui $at,0x800b +/* f17ffac: 3c19800b */ lui $t9,%hi(g_ScenarioData+0x18) +/* f17ffb0: 8739c128 */ lh $t9,%lo(g_ScenarioData+0x18)($t9) +/* f17ffb4: 3c0a800b */ lui $t2,%hi(g_ScenarioData+0x18) +/* f17ffb8: 3c01800b */ lui $at,%hi(g_ScenarioData+0x18) /* f17ffbc: 00194040 */ sll $t0,$t9,0x1 /* f17ffc0: 00484821 */ addu $t1,$v0,$t0 /* f17ffc4: a52f001a */ sh $t7,0x1a($t1) -/* f17ffc8: 854ac128 */ lh $t2,-0x3ed8($t2) +/* f17ffc8: 854ac128 */ lh $t2,%lo(g_ScenarioData+0x18)($t2) /* f17ffcc: 254b0001 */ addiu $t3,$t2,0x1 -/* f17ffd0: a42bc128 */ sh $t3,-0x3ed8($at) +/* f17ffd0: a42bc128 */ sh $t3,%lo(g_ScenarioData+0x18)($at) .L0f17ffd4: /* f17ffd4: 03e00008 */ jr $ra /* f17ffd8: 00000000 */ sll $zero,$zero,0x0 @@ -564,8 +564,8 @@ s32 scenarioHtbCallback08(void) GLOBAL_ASM( glabel func0f17ffe4 -/* f17ffe4: 3c02800a */ lui $v0,0x800a -/* f17ffe8: 8c42a2fc */ lw $v0,-0x5d04($v0) +/* f17ffe4: 3c02800a */ lui $v0,%hi(g_Vars+0x33c) +/* f17ffe8: 8c42a2fc */ lw $v0,%lo(g_Vars+0x33c)($v0) /* f17ffec: afa40000 */ sw $a0,0x0($sp) /* f17fff0: 00047400 */ sll $t6,$a0,0x10 /* f17fff4: 1040001e */ beqz $v0,.L0f180070 @@ -609,11 +609,11 @@ glabel func0f17ffe4 GLOBAL_ASM( glabel func0f180078 -/* f180078: 3c01800b */ lui $at,0x800b +/* f180078: 3c01800b */ lui $at,%hi(g_ScenarioData+0x18) /* f18007c: 3c03800b */ lui $v1,%hi(g_ScenarioData) -/* f180080: 3c04800b */ lui $a0,0x800b -/* f180084: a420c128 */ sh $zero,-0x3ed8($at) -/* f180088: 2484c188 */ addiu $a0,$a0,-15992 +/* f180080: 3c04800b */ lui $a0,%hi(g_ScenarioData+0x78) +/* f180084: a420c128 */ sh $zero,%lo(g_ScenarioData+0x18)($at) +/* f180088: 2484c188 */ addiu $a0,$a0,%lo(g_ScenarioData+0x78) /* f18008c: 2463c110 */ addiu $v1,$v1,%lo(g_ScenarioData) /* f180090: 2402ffff */ addiu $v0,$zero,-1 .L0f180094: @@ -644,10 +644,10 @@ glabel func0f1800a8 /* f1800e0: adc1fffc */ sw $at,-0x4($t6) /* f1800e4: 8de10000 */ lw $at,0x0($t7) /* f1800e8: 8de80004 */ lw $t0,0x4($t7) -/* f1800ec: 3c02800a */ lui $v0,0x800a +/* f1800ec: 3c02800a */ lui $v0,%hi(g_Vars+0x33c) /* f1800f0: adc10000 */ sw $at,0x0($t6) /* f1800f4: adc80004 */ sw $t0,0x4($t6) -/* f1800f8: 8c42a2fc */ lw $v0,-0x5d04($v0) +/* f1800f8: 8c42a2fc */ lw $v0,%lo(g_Vars+0x33c)($v0) /* f1800fc: 00002025 */ or $a0,$zero,$zero /* f180100: 27a70024 */ addiu $a3,$sp,0x24 /* f180104: 10400013 */ beqz $v0,.L0f180154 @@ -900,8 +900,8 @@ glabel scenarioHtbCallback18 /* f1807dc: 01cf2821 */ addu $a1,$t6,$t7 /* f1807e0: 0c002f44 */ jal func0000bd10 /* f1807e4: afa50090 */ sw $a1,0x90($sp) -/* f1807e8: 3c19800a */ lui $t9,0x800a -/* f1807ec: 8f39a248 */ lw $t9,-0x5db8($t9) +/* f1807e8: 3c19800a */ lui $t9,%hi(g_Vars+0x288) +/* f1807ec: 8f39a248 */ lw $t9,%lo(g_Vars+0x288)($t9) /* f1807f0: 2458000a */ addiu $t8,$v0,0xa /* f1807f4: afb8008c */ sw $t8,0x8c($sp) /* f1807f8: 8f2a0060 */ lw $t2,0x60($t9) @@ -1179,8 +1179,8 @@ glabel scenarioCtcReset /* f180eb0: 5420fffa */ bnezl $at,.L0f180e9c /* f180eb4: 00001025 */ or $v0,$zero,$zero /* f180eb8: 3c10800b */ lui $s0,%hi(g_ScenarioData) -/* f180ebc: 3c03800b */ lui $v1,0x800b -/* f180ec0: 2463c118 */ addiu $v1,$v1,-16104 +/* f180ebc: 3c03800b */ lui $v1,%hi(g_ScenarioData+0x8) +/* f180ec0: 2463c118 */ addiu $v1,$v1,%lo(g_ScenarioData+0x8) /* f180ec4: 2610c110 */ addiu $s0,$s0,%lo(g_ScenarioData) /* f180ec8: 27a200b8 */ addiu $v0,$sp,0xb8 .L0f180ecc: @@ -1286,8 +1286,8 @@ glabel scenarioCtcReset /* f181034: 5420ffc5 */ bnezl $at,.L0f180f4c /* f181038: 96580016 */ lhu $t8,0x16($s2) /* f18103c: 3c10800b */ lui $s0,%hi(g_ScenarioData) -/* f181040: 3c02800b */ lui $v0,0x800b -/* f181044: 2442c118 */ addiu $v0,$v0,-16104 +/* f181040: 3c02800b */ lui $v0,%hi(g_ScenarioData+0x8) +/* f181044: 2442c118 */ addiu $v0,$v0,%lo(g_ScenarioData+0x8) /* f181048: 2610c110 */ addiu $s0,$s0,%lo(g_ScenarioData) /* f18104c: 2408ffff */ addiu $t0,$zero,-1 /* f181050: 860f0000 */ lh $t7,0x0($s0) @@ -1307,8 +1307,8 @@ glabel scenarioCtcReset /* f18107c: 5420fffe */ bnezl $at,.L0f181078 /* f181080: 26520001 */ addiu $s2,$s2,0x1 /* f181084: 3c02800b */ lui $v0,%hi(g_ScenarioData) -/* f181088: 3c03800b */ lui $v1,0x800b -/* f18108c: 2463c120 */ addiu $v1,$v1,-16096 +/* f181088: 3c03800b */ lui $v1,%hi(g_ScenarioData+0x10) +/* f18108c: 2463c120 */ addiu $v1,$v1,%lo(g_ScenarioData+0x10) /* f181090: 2442c110 */ addiu $v0,$v0,%lo(g_ScenarioData) .L0f181094: /* f181094: 24420004 */ addiu $v0,$v0,0x4 @@ -1316,8 +1316,8 @@ glabel scenarioCtcReset /* f18109c: 1420fffd */ bnez $at,.L0f181094 /* f1810a0: ac400054 */ sw $zero,0x54($v0) /* f1810a4: 3c10800b */ lui $s0,%hi(g_ScenarioData) -/* f1810a8: 3c02800b */ lui $v0,0x800b -/* f1810ac: 2442c118 */ addiu $v0,$v0,-16104 +/* f1810a8: 3c02800b */ lui $v0,%hi(g_ScenarioData+0x8) +/* f1810ac: 2442c118 */ addiu $v0,$v0,%lo(g_ScenarioData+0x8) /* f1810b0: 2610c110 */ addiu $s0,$s0,%lo(g_ScenarioData) .L0f1810b4: /* f1810b4: 26100002 */ addiu $s0,$s0,0x2 @@ -1354,15 +1354,15 @@ glabel scenarioCtcReset /* f18112c: a48f0006 */ sh $t7,0x6($a0) /* f181130: 3c0e800b */ lui $t6,%hi(var800ac2d4) /* f181134: 8dcec2d4 */ lw $t6,%lo(var800ac2d4)($t6) -/* f181138: 3c0a800b */ lui $t2,0x800b -/* f18113c: 914ac2c2 */ lbu $t2,-0x3d3e($t2) -/* f181140: 3c01800b */ lui $at,0x800b -/* f181144: ac2ec168 */ sw $t6,-0x3e98($at) -/* f181148: 3c01800b */ lui $at,0x800b +/* f181138: 3c0a800b */ lui $t2,%hi(var800ac2c0+0x2) +/* f18113c: 914ac2c2 */ lbu $t2,%lo(var800ac2c0+0x2)($t2) +/* f181140: 3c01800b */ lui $at,%hi(g_ScenarioData+0x58) +/* f181144: ac2ec168 */ sw $t6,%lo(g_ScenarioData+0x58)($at) +/* f181148: 3c01800b */ lui $at,%hi(var800ac2c0+0x2) /* f18114c: 314cfffb */ andi $t4,$t2,0xfffb -/* f181150: a02cc2c2 */ sb $t4,-0x3d3e($at) -/* f181154: 3c01800b */ lui $at,0x800b -/* f181158: a420c322 */ sh $zero,-0x3cde($at) +/* f181150: a02cc2c2 */ sb $t4,%lo(var800ac2c0+0x2)($at) +/* f181154: 3c01800b */ lui $at,%hi(var800ac320+0x2) +/* f181158: a420c322 */ sh $zero,%lo(var800ac320+0x2)($at) /* f18115c: 8e6b0058 */ lw $t3,0x58($s3) /* f181160: 2408ffff */ addiu $t0,$zero,-1 /* f181164: 856d0028 */ lh $t5,0x28($t3) @@ -1399,16 +1399,16 @@ glabel scenarioCtcReset /* f1811d8: a48d0006 */ sh $t5,0x6($a0) /* f1811dc: 3c19800b */ lui $t9,%hi(var800ac33c) /* f1811e0: 8f39c33c */ lw $t9,%lo(var800ac33c)($t9) -/* f1811e4: 3c18800b */ lui $t8,0x800b -/* f1811e8: 9318c32a */ lbu $t8,-0x3cd6($t8) -/* f1811ec: 3c01800b */ lui $at,0x800b -/* f1811f0: ac39c16c */ sw $t9,-0x3e94($at) -/* f1811f4: 3c01800b */ lui $at,0x800b +/* f1811e4: 3c18800b */ lui $t8,%hi(var800ac328+0x2) +/* f1811e8: 9318c32a */ lbu $t8,%lo(var800ac328+0x2)($t8) +/* f1811ec: 3c01800b */ lui $at,%hi(g_ScenarioData+0x5c) +/* f1811f0: ac39c16c */ sw $t9,%lo(g_ScenarioData+0x5c)($at) +/* f1811f4: 3c01800b */ lui $at,%hi(var800ac328+0x2) /* f1811f8: 03107824 */ and $t7,$t8,$s0 -/* f1811fc: a02fc32a */ sb $t7,-0x3cd6($at) -/* f181200: 3c01800b */ lui $at,0x800b +/* f1811fc: a02fc32a */ sb $t7,%lo(var800ac328+0x2)($at) +/* f181200: 3c01800b */ lui $at,%hi(var800ac388+0x2) /* f181204: 24090001 */ addiu $t1,$zero,0x1 -/* f181208: a429c38a */ sh $t1,-0x3c76($at) +/* f181208: a429c38a */ sh $t1,%lo(var800ac388+0x2)($at) /* f18120c: 8e6e005c */ lw $t6,0x5c($s3) /* f181210: 2408ffff */ addiu $t0,$zero,-1 /* f181214: 85ca0028 */ lh $t2,0x28($t6) @@ -1444,16 +1444,16 @@ glabel scenarioCtcReset /* f181284: a48a0006 */ sh $t2,0x6($a0) /* f181288: 3c0c800b */ lui $t4,%hi(var800ac3a4) /* f18128c: 8d8cc3a4 */ lw $t4,%lo(var800ac3a4)($t4) -/* f181290: 3c0d800b */ lui $t5,0x800b -/* f181294: 91adc392 */ lbu $t5,-0x3c6e($t5) -/* f181298: 3c01800b */ lui $at,0x800b -/* f18129c: ac2cc170 */ sw $t4,-0x3e90($at) -/* f1812a0: 3c01800b */ lui $at,0x800b +/* f181290: 3c0d800b */ lui $t5,%hi(var800ac390+0x2) +/* f181294: 91adc392 */ lbu $t5,%lo(var800ac390+0x2)($t5) +/* f181298: 3c01800b */ lui $at,%hi(g_ScenarioData+0x60) +/* f18129c: ac2cc170 */ sw $t4,%lo(g_ScenarioData+0x60)($at) +/* f1812a0: 3c01800b */ lui $at,%hi(var800ac390+0x2) /* f1812a4: 01b0c824 */ and $t9,$t5,$s0 -/* f1812a8: a039c392 */ sb $t9,-0x3c6e($at) -/* f1812ac: 3c01800b */ lui $at,0x800b +/* f1812a8: a039c392 */ sb $t9,%lo(var800ac390+0x2)($at) +/* f1812ac: 3c01800b */ lui $at,%hi(var800ac3f0+0x2) /* f1812b0: 240b0002 */ addiu $t3,$zero,0x2 -/* f1812b4: a42bc3f2 */ sh $t3,-0x3c0e($at) +/* f1812b4: a42bc3f2 */ sh $t3,%lo(var800ac3f0+0x2)($at) /* f1812b8: 8e780060 */ lw $t8,0x60($s3) /* f1812bc: 2408ffff */ addiu $t0,$zero,-1 /* f1812c0: 870f0028 */ lh $t7,0x28($t8) @@ -1489,24 +1489,24 @@ glabel scenarioCtcReset /* f181330: a48f0006 */ sh $t7,0x6($a0) /* f181334: 3c09800b */ lui $t1,%hi(var800ac40c) /* f181338: 8d29c40c */ lw $t1,%lo(var800ac40c)($t1) -/* f18133c: 3c0a800b */ lui $t2,0x800b -/* f181340: 914ac3fa */ lbu $t2,-0x3c06($t2) -/* f181344: 3c01800b */ lui $at,0x800b -/* f181348: ac29c174 */ sw $t1,-0x3e8c($at) -/* f18134c: 3c01800b */ lui $at,0x800b +/* f18133c: 3c0a800b */ lui $t2,%hi(var800ac3f8+0x2) +/* f181340: 914ac3fa */ lbu $t2,%lo(var800ac3f8+0x2)($t2) +/* f181344: 3c01800b */ lui $at,%hi(g_ScenarioData+0x64) +/* f181348: ac29c174 */ sw $t1,%lo(g_ScenarioData+0x64)($at) +/* f18134c: 3c01800b */ lui $at,%hi(var800ac3f8+0x2) /* f181350: 01506024 */ and $t4,$t2,$s0 -/* f181354: a02cc3fa */ sb $t4,-0x3c06($at) -/* f181358: 3c01800b */ lui $at,0x800b +/* f181354: a02cc3fa */ sb $t4,%lo(var800ac3f8+0x2)($at) +/* f181358: 3c01800b */ lui $at,%hi(var800ac458+0x2) /* f18135c: 240e0003 */ addiu $t6,$zero,0x3 -/* f181360: a42ec45a */ sh $t6,-0x3ba6($at) +/* f181360: a42ec45a */ sh $t6,%lo(var800ac458+0x2)($at) /* f181364: 8e6d0064 */ lw $t5,0x64($s3) /* f181368: 2408ffff */ addiu $t0,$zero,-1 /* f18136c: 85b90028 */ lh $t9,0x28($t5) /* f181370: a6790016 */ sh $t9,0x16($s3) .L0f181374: /* f181374: 3c10800b */ lui $s0,%hi(g_ScenarioData) -/* f181378: 3c11800b */ lui $s1,0x800b -/* f18137c: 2631c118 */ addiu $s1,$s1,-16104 +/* f181378: 3c11800b */ lui $s1,%hi(g_ScenarioData+0x8) +/* f18137c: 2631c118 */ addiu $s1,$s1,%lo(g_ScenarioData+0x8) /* f181380: 2610c110 */ addiu $s0,$s0,%lo(g_ScenarioData) /* f181384: 860b0000 */ lh $t3,0x0($s0) .L0f181388: @@ -1681,10 +1681,10 @@ glabel func0f181800 /* f181810: 3c09800b */ lui $t1,%hi(g_ScenarioData) /* f181814: 8c8f0004 */ lw $t7,0x4($a0) /* f181818: 8c8e0008 */ lw $t6,0x8($a0) -/* f18181c: 3c01800b */ lui $at,0x800b +/* f18181c: 3c01800b */ lui $at,%hi(g_ScenarioData+0x18) /* f181820: 000fc100 */ sll $t8,$t7,0x4 /* f181824: 00380821 */ addu $at,$at,$t8 -/* f181828: a42ec128 */ sh $t6,-0x3ed8($at) +/* f181828: a42ec128 */ sh $t6,%lo(g_ScenarioData+0x18)($at) /* f18182c: 8c820000 */ lw $v0,0x0($a0) .L0f181830: /* f181830: 2401000a */ addiu $at,$zero,0xa @@ -1989,11 +1989,11 @@ glabel var7f1b8950 /* f181e10: c7aa00ac */ lwc1 $f10,0xac($sp) /* f181e14: c7b200b0 */ lwc1 $f18,0xb0($sp) /* f181e18: 240dffff */ addiu $t5,$zero,-1 -/* f181e1c: 3c04800b */ lui $a0,0x800b -/* f181e20: 3c05800b */ lui $a1,0x800b +/* f181e1c: 3c04800b */ lui $a0,%hi(g_ScenarioData+0x24) +/* f181e20: 3c05800b */ lui $a1,%hi(g_ScenarioData+0xe) /* f181e24: a66d0010 */ sh $t5,0x10($s3) -/* f181e28: 24a5c11e */ addiu $a1,$a1,-16098 -/* f181e2c: 2484c134 */ addiu $a0,$a0,-16076 +/* f181e28: 24a5c11e */ addiu $a1,$a1,%lo(g_ScenarioData+0xe) +/* f181e2c: 2484c134 */ addiu $a0,$a0,%lo(g_ScenarioData+0x24) /* f181e30: 00003025 */ or $a2,$zero,$zero /* f181e34: 00003825 */ or $a3,$zero,$zero /* f181e38: a66c000e */ sh $t4,0xe($s3) @@ -2209,8 +2209,8 @@ glabel var7f1b8950 /* f182110: 24045416 */ addiu $a0,$zero,0x5416 /* f182114: 00107080 */ sll $t6,$s0,0x2 /* f182118: 01d07023 */ subu $t6,$t6,$s0 -/* f18211c: 3c0f800b */ lui $t7,0x800b -/* f182120: 25efcbb0 */ addiu $t7,$t7,-13392 +/* f18211c: 3c0f800b */ lui $t7,%hi(g_MpSetup+0x28) +/* f182120: 25efcbb0 */ addiu $t7,$t7,%lo(g_MpSetup+0x28) /* f182124: 000e7080 */ sll $t6,$t6,0x2 /* f182128: 01cf3021 */ addu $a2,$t6,$t7 /* f18212c: 27a4011c */ addiu $a0,$sp,0x11c @@ -2418,8 +2418,8 @@ glabel var7f1b8950 /* f182408: 240effff */ addiu $t6,$zero,-1 /* f18240c: a66e0004 */ sh $t6,0x4($s3) /* f182410: a6600006 */ sh $zero,0x6($s3) -/* f182414: 3c0f800b */ lui $t7,0x800b -/* f182418: 8defcb94 */ lw $t7,-0x346c($t7) +/* f182414: 3c0f800b */ lui $t7,%hi(g_MpSetup+0xc) +/* f182418: 8defcb94 */ lw $t7,%lo(g_MpSetup+0xc)($t7) /* f18241c: 24080001 */ addiu $t0,$zero,0x1 /* f182420: 31f98000 */ andi $t9,$t7,0x8000 /* f182424: 53200003 */ beqzl $t9,.L0f182434 @@ -2587,8 +2587,8 @@ glabel var7f1b8950 GLOBAL_ASM( glabel scenarioKohCallback18 -/* f182670: 3c0e800a */ lui $t6,0x800a -/* f182674: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f182670: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f182674: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f182678: 27bdff50 */ addiu $sp,$sp,-176 /* f18267c: afbf003c */ sw $ra,0x3c($sp) /* f182680: afb00038 */ sw $s0,0x38($sp) @@ -2618,12 +2618,12 @@ glabel scenarioKohCallback18 /* f1826dc: 012a2821 */ addu $a1,$t1,$t2 /* f1826e0: 0c002f44 */ jal func0000bd10 /* f1826e4: afa50098 */ sw $a1,0x98($sp) -/* f1826e8: 3c04800a */ lui $a0,0x800a -/* f1826ec: 8c84a444 */ lw $a0,-0x5bbc($a0) +/* f1826e8: 3c04800a */ lui $a0,%hi(g_Vars+0x484) +/* f1826ec: 8c84a444 */ lw $a0,%lo(g_Vars+0x484)($a0) /* f1826f0: 240800f0 */ addiu $t0,$zero,0xf0 -/* f1826f4: 3c0d800b */ lui $t5,0x800b +/* f1826f4: 3c0d800b */ lui $t5,%hi(g_ScenarioData+0x6) /* f1826f8: 00880019 */ multu $a0,$t0 -/* f1826fc: 85adc116 */ lh $t5,-0x3eea($t5) +/* f1826fc: 85adc116 */ lh $t5,%lo(g_ScenarioData+0x6)($t5) /* f182700: 24073840 */ addiu $a3,$zero,0x3840 /* f182704: 00047900 */ sll $t7,$a0,0x4 /* f182708: 01e47823 */ subu $t7,$t7,$a0 @@ -2905,13 +2905,13 @@ glabel func0f182ba4 /* f182bc4: 3c19800b */ lui $t9,%hi(g_ScenarioData) /* f182bc8: 8739c110 */ lh $t9,%lo(g_ScenarioData)($t9) /* f182bcc: 3c0a800b */ lui $t2,%hi(g_ScenarioData) -/* f182bd0: 3c01800b */ lui $at,0x800b +/* f182bd0: 3c01800b */ lui $at,%hi(g_ScenarioData) /* f182bd4: 00194040 */ sll $t0,$t9,0x1 /* f182bd8: 00484821 */ addu $t1,$v0,$t0 /* f182bdc: a52f0004 */ sh $t7,0x4($t1) /* f182be0: 854ac110 */ lh $t2,%lo(g_ScenarioData)($t2) /* f182be4: 254b0001 */ addiu $t3,$t2,0x1 -/* f182be8: a42bc110 */ sh $t3,-0x3ef0($at) +/* f182be8: a42bc110 */ sh $t3,%lo(g_ScenarioData)($at) .L0f182bec: /* f182bec: 03e00008 */ jr $ra /* f182bf0: 00000000 */ sll $zero,$zero,0x0 @@ -2923,7 +2923,7 @@ glabel func0f182bf4 /* f182bf8: 2484c110 */ addiu $a0,$a0,%lo(g_ScenarioData) /* f182bfc: 2405ffff */ addiu $a1,$zero,-1 /* f182c00: 3c03800b */ lui $v1,%hi(g_ScenarioData) -/* f182c04: 3c02800b */ lui $v0,0x800b +/* f182c04: 3c02800b */ lui $v0,%hi(g_ScenarioData+0x30) /* f182c08: a4800000 */ sh $zero,0x0($a0) /* f182c0c: a4800002 */ sh $zero,0x2($a0) /* f182c10: ac800138 */ sw $zero,0x138($a0) @@ -2931,7 +2931,7 @@ glabel func0f182bf4 /* f182c18: a48500d2 */ sh $a1,0xd2($a0) /* f182c1c: ac8500d4 */ sw $a1,0xd4($a0) /* f182c20: ac800140 */ sw $zero,0x140($a0) -/* f182c24: 2442c140 */ addiu $v0,$v0,-16064 +/* f182c24: 2442c140 */ addiu $v0,$v0,%lo(g_ScenarioData+0x30) /* f182c28: 2463c110 */ addiu $v1,$v1,%lo(g_ScenarioData) .L0f182c2c: /* f182c2c: 24630004 */ addiu $v1,$v1,0x4 @@ -2940,8 +2940,8 @@ glabel func0f182bf4 /* f182c38: 1420fffc */ bnez $at,.L0f182c2c /* f182c3c: ac600104 */ sw $zero,0x104($v1) /* f182c40: 3c03800b */ lui $v1,%hi(g_ScenarioData) -/* f182c44: 3c02800b */ lui $v0,0x800b -/* f182c48: 2442c188 */ addiu $v0,$v0,-15992 +/* f182c44: 3c02800b */ lui $v0,%hi(g_ScenarioData+0x78) +/* f182c48: 2442c188 */ addiu $v0,$v0,%lo(g_ScenarioData+0x78) /* f182c4c: 2463c110 */ addiu $v1,$v1,%lo(g_ScenarioData) .L0f182c50: /* f182c50: 24630002 */ addiu $v1,$v1,0x2 @@ -2949,8 +2949,8 @@ glabel func0f182bf4 /* f182c58: 1420fffd */ bnez $at,.L0f182c50 /* f182c5c: a4650002 */ sh $a1,0x2($v1) /* f182c60: 3c03800b */ lui $v1,%hi(g_ScenarioData) -/* f182c64: 3c04800b */ lui $a0,0x800b -/* f182c68: 2484c11c */ addiu $a0,$a0,-16100 +/* f182c64: 3c04800b */ lui $a0,%hi(g_ScenarioData+0xc) +/* f182c68: 2484c11c */ addiu $a0,$a0,%lo(g_ScenarioData+0xc) /* f182c6c: 2463c110 */ addiu $v1,$v1,%lo(g_ScenarioData) /* f182c70: 240200ff */ addiu $v0,$zero,0xff .L0f182c74: @@ -2985,10 +2985,10 @@ glabel func0f182c98 /* f182cd0: adc1fffc */ sw $at,-0x4($t6) /* f182cd4: 8de10000 */ lw $at,0x0($t7) /* f182cd8: 8de80004 */ lw $t0,0x4($t7) -/* f182cdc: 3c02800a */ lui $v0,0x800a +/* f182cdc: 3c02800a */ lui $v0,%hi(g_Vars+0x33c) /* f182ce0: adc10000 */ sw $at,0x0($t6) /* f182ce4: adc80004 */ sw $t0,0x4($t6) -/* f182ce8: 8c42a2fc */ lw $v0,-0x5d04($v0) +/* f182ce8: 8c42a2fc */ lw $v0,%lo(g_Vars+0x33c)($v0) /* f182cec: 00002025 */ or $a0,$zero,$zero /* f182cf0: 27a70020 */ addiu $a3,$sp,0x20 /* f182cf4: 10400013 */ beqz $v0,.L0f182d44 @@ -3115,8 +3115,8 @@ glabel var7f1b8954 .text /* f182e98: 27bdffb8 */ addiu $sp,$sp,-72 /* f182e9c: afb1002c */ sw $s1,0x2c($sp) -/* f182ea0: 3c11800a */ lui $s1,0x800a -/* f182ea4: 8e31a2fc */ lw $s1,-0x5d04($s1) +/* f182ea0: 3c11800a */ lui $s1,%hi(g_Vars+0x33c) +/* f182ea4: 8e31a2fc */ lw $s1,%lo(g_Vars+0x33c)($s1) /* f182ea8: afb00028 */ sw $s0,0x28($sp) /* f182eac: 3c10800b */ lui $s0,%hi(g_ScenarioData) /* f182eb0: 2610c110 */ addiu $s0,$s0,%lo(g_ScenarioData) @@ -3158,11 +3158,11 @@ glabel var7f1b8954 .L0f182f34: /* f182f34: 0fc60ae7 */ jal scenarioHtmCallback08 /* f182f38: 00000000 */ sll $zero,$zero,0x0 -/* f182f3c: 3c01800b */ lui $at,0x800b +/* f182f3c: 3c01800b */ lui $at,%hi(g_ScenarioData+0x2) /* f182f40: 0fc60ae7 */ jal scenarioHtmCallback08 -/* f182f44: a420c112 */ sh $zero,-0x3eee($at) -/* f182f48: 3c18800b */ lui $t8,0x800b -/* f182f4c: 8718c112 */ lh $t8,-0x3eee($t8) +/* f182f44: a420c112 */ sh $zero,%lo(g_ScenarioData+0x2)($at) +/* f182f48: 3c18800b */ lui $t8,%hi(g_ScenarioData+0x2) +/* f182f4c: 8718c112 */ lh $t8,%lo(g_ScenarioData+0x2)($t8) /* f182f50: 2413ffff */ addiu $s3,$zero,-1 /* f182f54: 2411000c */ addiu $s1,$zero,0xc /* f182f58: 0302082a */ slt $at,$t8,$v0 @@ -3184,17 +3184,17 @@ glabel var7f1b8954 .L0f182f94: /* f182f94: 1880fff3 */ blez $a0,.L0f182f64 /* f182f98: 00000000 */ sll $zero,$zero,0x0 -/* f182f9c: 3c09800b */ lui $t1,0x800b -/* f182fa0: 8529c112 */ lh $t1,-0x3eee($t1) -/* f182fa4: 3c0c800b */ lui $t4,0x800b -/* f182fa8: 3c01800b */ lui $at,0x800b +/* f182f9c: 3c09800b */ lui $t1,%hi(g_ScenarioData+0x2) +/* f182fa0: 8529c112 */ lh $t1,%lo(g_ScenarioData+0x2)($t1) +/* f182fa4: 3c0c800b */ lui $t4,%hi(g_ScenarioData+0x2) +/* f182fa8: 3c01800b */ lui $at,%hi(g_ScenarioData+0x2) /* f182fac: 01310019 */ multu $t1,$s1 /* f182fb0: 00005012 */ mflo $t2 /* f182fb4: 020a5821 */ addu $t3,$s0,$t2 /* f182fb8: a5640084 */ sh $a0,0x84($t3) -/* f182fbc: 858cc112 */ lh $t4,-0x3eee($t4) +/* f182fbc: 858cc112 */ lh $t4,%lo(g_ScenarioData+0x2)($t4) /* f182fc0: 258d0001 */ addiu $t5,$t4,0x1 -/* f182fc4: a42dc112 */ sh $t5,-0x3eee($at) +/* f182fc4: a42dc112 */ sh $t5,%lo(g_ScenarioData+0x2)($at) /* f182fc8: 0fc60ae7 */ jal scenarioHtmCallback08 /* f182fcc: a4b30004 */ sh $s3,0x4($a1) /* f182fd0: 86ce0002 */ lh $t6,0x2($s6) @@ -3204,12 +3204,12 @@ glabel var7f1b8954 .L0f182fe0: /* f182fe0: 0fc60ae7 */ jal scenarioHtmCallback08 /* f182fe4: 00000000 */ sll $zero,$zero,0x0 -/* f182fe8: 3c0f800b */ lui $t7,0x800b -/* f182fec: 85efc112 */ lh $t7,-0x3eee($t7) +/* f182fe8: 3c0f800b */ lui $t7,%hi(g_ScenarioData+0x2) +/* f182fec: 85efc112 */ lh $t7,%lo(g_ScenarioData+0x2)($t7) /* f182ff0: 3c10800b */ lui $s0,%hi(g_ScenarioData) /* f182ff4: 2610c110 */ addiu $s0,$s0,%lo(g_ScenarioData) /* f182ff8: 19e00006 */ blez $t7,.L0f183014 -/* f182ffc: 3c14800b */ lui $s4,0x800b +/* f182ffc: 3c14800b */ lui $s4,%hi(g_ScenarioData+0xc) /* f183000: 86c20002 */ lh $v0,0x2($s6) /* f183004: 26520001 */ addiu $s2,$s2,0x1 .L0f183008: @@ -3225,7 +3225,7 @@ glabel var7f1b8954 /* f183028: 36524000 */ ori $s2,$s2,0x4000 /* f18302c: 36732000 */ ori $s3,$s3,0x2000 /* f183030: c4348954 */ lwc1 $f20,%lo(var7f1b8954)($at) -/* f183034: 2694c11c */ addiu $s4,$s4,-16100 +/* f183034: 2694c11c */ addiu $s4,$s4,%lo(g_ScenarioData+0xc) /* f183038: 4406a000 */ mfc1 $a2,$f20 .L0f18303c: /* f18303c: 24040156 */ addiu $a0,$zero,0x156 @@ -3356,9 +3356,9 @@ glabel var7f1b8960 /* f1833e4: 38440036 */ xori $a0,$v0,0x36 /* f1833e8: 2c840001 */ sltiu $a0,$a0,0x1 .L0f1833ec: -/* f1833ec: 3c12800a */ lui $s2,0x800a +/* f1833ec: 3c12800a */ lui $s2,%hi(g_Vars+0x28c) /* f1833f0: 00809825 */ or $s3,$a0,$zero -/* f1833f4: 8e52a24c */ lw $s2,-0x5db4($s2) +/* f1833f4: 8e52a24c */ lw $s2,%lo(g_Vars+0x28c)($s2) .L0f1833f8: /* f1833f8: 3c01bf80 */ lui $at,0xbf80 /* f1833fc: 3c11800b */ lui $s1,%hi(g_ScenarioData) @@ -3392,7 +3392,7 @@ glabel var7f1b8960 /* f183460: 26100001 */ addiu $s0,$s0,0x1 /* f183464: 8c690040 */ lw $t1,0x40($v1) /* f183468: 2401bfff */ addiu $at,$zero,-16385 -/* f18346c: 3c0d800b */ lui $t5,0x800b +/* f18346c: 3c0d800b */ lui $t5,%hi(g_ScenarioData+0xd4) /* f183470: 01215024 */ and $t2,$t1,$at /* f183474: 3c010fff */ lui $at,0xfff /* f183478: 3421ffff */ ori $at,$at,0xffff @@ -3400,13 +3400,13 @@ glabel var7f1b8960 /* f183480: 01416024 */ and $t4,$t2,$at /* f183484: 1260002e */ beqz $s3,.L0f183540 /* f183488: ac6c0040 */ sw $t4,0x40($v1) -/* f18348c: 8dadc1e4 */ lw $t5,-0x3e1c($t5) +/* f18348c: 8dadc1e4 */ lw $t5,%lo(g_ScenarioData+0xd4)($t5) /* f183490: 2401ffff */ addiu $at,$zero,-1 /* f183494: 00127080 */ sll $t6,$s2,0x2 /* f183498: 15a10041 */ bne $t5,$at,.L0f1835a0 /* f18349c: 02ae7821 */ addu $t7,$s5,$t6 -/* f1834a0: 3c01800b */ lui $at,0x800b -/* f1834a4: ac30c1e4 */ sw $s0,-0x3e1c($at) +/* f1834a0: 3c01800b */ lui $at,%hi(g_ScenarioData+0xd4) +/* f1834a4: ac30c1e4 */ sw $s0,%lo(g_ScenarioData+0xd4)($at) /* f1834a8: a432c1e0 */ sh $s2,-0x3e20($at) /* f1834ac: a432c1e2 */ sh $s2,-0x3e1e($at) /* f1834b0: 1680003b */ bnez $s4,.L0f1835a0 @@ -3417,8 +3417,8 @@ glabel var7f1b8960 /* f1834c4: 24050009 */ addiu $a1,$zero,0x9 /* f1834c8: 0fc377e9 */ jal func0f0ddfa4 /* f1834cc: 24060001 */ addiu $a2,$zero,0x1 -/* f1834d0: 3c18800b */ lui $t8,0x800b -/* f1834d4: 8f18c1e4 */ lw $t8,-0x3e1c($t8) +/* f1834d0: 3c18800b */ lui $t8,%hi(g_ScenarioData+0xd4) +/* f1834d4: 8f18c1e4 */ lw $t8,%lo(g_ScenarioData+0xd4)($t8) /* f1834d8: 2409ffff */ addiu $t1,$zero,-1 /* f1834dc: 240a0002 */ addiu $t2,$zero,0x2 /* f1834e0: 0018c880 */ sll $t9,$t8,0x2 @@ -3476,12 +3476,12 @@ glabel var7f1b8960 /* f1835a4: 24010001 */ addiu $at,$zero,0x1 /* f1835a8: 1601ff9a */ bne $s0,$at,.L0f183414 /* f1835ac: 2631000c */ addiu $s1,$s1,0xc -/* f1835b0: 3c19800b */ lui $t9,0x800b -/* f1835b4: 8739c1e0 */ lh $t9,-0x3e20($t9) -/* f1835b8: 3c08800b */ lui $t0,0x800b +/* f1835b0: 3c19800b */ lui $t9,%hi(g_ScenarioData+0xd0) +/* f1835b4: 8739c1e0 */ lh $t9,%lo(g_ScenarioData+0xd0)($t9) +/* f1835b8: 3c08800b */ lui $t0,%hi(g_ScenarioData+0xd4) /* f1835bc: 565900f1 */ bnel $s2,$t9,.L0f183984 /* f1835c0: 8fbf0064 */ lw $ra,0x64($sp) -/* f1835c4: 8d08c1e4 */ lw $t0,-0x3e1c($t0) +/* f1835c4: 8d08c1e4 */ lw $t0,%lo(g_ScenarioData+0xd4)($t0) /* f1835c8: 2401ffff */ addiu $at,$zero,-1 /* f1835cc: 00125880 */ sll $t3,$s2,0x2 /* f1835d0: 110100eb */ beq $t0,$at,.L0f183980 @@ -3512,8 +3512,8 @@ glabel var7f1b8960 /* f183634: 1000000b */ beqz $zero,.L0f183664 /* f183638: 2dc30001 */ sltiu $v1,$t6,0x1 .L0f18363c: -/* f18363c: 3c02800a */ lui $v0,0x800a -/* f183640: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f18363c: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f183640: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f183644: 00002025 */ or $a0,$zero,$zero /* f183648: 8c5000bc */ lw $s0,0xbc($v0) /* f18364c: c4460144 */ lwc1 $f6,0x144($v0) @@ -3626,16 +3626,16 @@ glabel var7f1b8960 /* f1837d8: 45000009 */ bc1f .L0f183800 /* f1837dc: 00000000 */ sll $zero,$zero,0x0 /* f1837e0: 44813000 */ mtc1 $at,$f6 -/* f1837e4: 3c01800b */ lui $at,0x800b +/* f1837e4: 3c01800b */ lui $at,%hi(g_ScenarioData+0xd2) /* f1837e8: 4606803c */ c.lt.s $f16,$f6 /* f1837ec: 00000000 */ sll $zero,$zero,0x0 /* f1837f0: 45000003 */ bc1f .L0f183800 /* f1837f4: 00000000 */ sll $zero,$zero,0x0 /* f1837f8: 10000003 */ beqz $zero,.L0f183808 -/* f1837fc: a432c1e2 */ sh $s2,-0x3e1e($at) +/* f1837fc: a432c1e2 */ sh $s2,%lo(g_ScenarioData+0xd2)($at) .L0f183800: -/* f183800: 3c01800b */ lui $at,0x800b -/* f183804: a42fc1e2 */ sh $t7,-0x3e1e($at) +/* f183800: 3c01800b */ lui $at,%hi(g_ScenarioData+0xd2) +/* f183804: a42fc1e2 */ sh $t7,%lo(g_ScenarioData+0xd2)($at) .L0f183808: /* f183808: 16800021 */ bnez $s4,.L0f183890 /* f18380c: 00000000 */ sll $zero,$zero,0x0 @@ -3645,8 +3645,8 @@ glabel var7f1b8960 /* f18381c: 24050009 */ addiu $a1,$zero,0x9 /* f183820: 0fc377e9 */ jal func0f0ddfa4 /* f183824: 24060001 */ addiu $a2,$zero,0x1 -/* f183828: 3c18800b */ lui $t8,0x800b -/* f18382c: 8f18c1e4 */ lw $t8,-0x3e1c($t8) +/* f183828: 3c18800b */ lui $t8,%hi(g_ScenarioData+0xd4) +/* f18382c: 8f18c1e4 */ lw $t8,%lo(g_ScenarioData+0xd4)($t8) /* f183830: 24050001 */ addiu $a1,$zero,0x1 /* f183834: 3406ffff */ dli $a2,0xffff /* f183838: 0018c880 */ sll $t9,$t8,0x2 @@ -3672,36 +3672,36 @@ glabel var7f1b8960 /* f183888: 0c0041c6 */ jal func00010718 /* f18388c: e7a80014 */ swc1 $f8,0x14($sp) .L0f183890: -/* f183890: 3c01800b */ lui $at,0x800b +/* f183890: 3c01800b */ lui $at,%hi(g_ScenarioData+0xd4) /* f183894: 8faf006c */ lw $t7,0x6c($sp) /* f183898: 240dffff */ addiu $t5,$zero,-1 /* f18389c: 240effff */ addiu $t6,$zero,-1 -/* f1838a0: ac2dc1e4 */ sw $t5,-0x3e1c($at) +/* f1838a0: ac2dc1e4 */ sw $t5,%lo(g_ScenarioData+0xd4)($at) /* f1838a4: a42ec1e0 */ sh $t6,-0x3e20($at) /* f1838a8: 10000035 */ beqz $zero,.L0f183980 /* f1838ac: ade00000 */ sw $zero,0x0($t7) .L0f1838b0: -/* f1838b0: 3c19800a */ lui $t9,0x800a -/* f1838b4: 8f399ff4 */ lw $t9,-0x600c($t9) +/* f1838b0: 3c19800a */ lui $t9,%hi(g_Vars+0x34) +/* f1838b4: 8f399ff4 */ lw $t9,%lo(g_Vars+0x34)($t9) /* f1838b8: 8c580000 */ lw $t8,0x0($v0) /* f1838bc: 03194021 */ addu $t0,$t8,$t9 /* f1838c0: 290112c1 */ slti $at,$t0,0x12c1 /* f1838c4: 1420002e */ bnez $at,.L0f183980 /* f1838c8: ac480000 */ sw $t0,0x0($v0) /* f1838cc: 8e6a00d8 */ lw $t2,0xd8($s3) -/* f1838d0: 3c01800b */ lui $at,0x800b +/* f1838d0: 3c01800b */ lui $at,%hi(g_ScenarioData+0xd2) /* f1838d4: 254b0001 */ addiu $t3,$t2,0x1 /* f1838d8: ae6b00d8 */ sw $t3,0xd8($s3) /* f1838dc: 16800022 */ bnez $s4,.L0f183968 -/* f1838e0: a432c1e2 */ sh $s2,-0x3e1e($at) +/* f1838e0: a432c1e2 */ sh $s2,%lo(g_ScenarioData+0xd2)($at) /* f1838e4: 0fc5b9f1 */ jal langGet /* f1838e8: 24045410 */ addiu $a0,$zero,0x5410 /* f1838ec: 00402025 */ or $a0,$v0,$zero /* f1838f0: 24050009 */ addiu $a1,$zero,0x9 /* f1838f4: 0fc377e9 */ jal func0f0ddfa4 /* f1838f8: 24060001 */ addiu $a2,$zero,0x1 -/* f1838fc: 3c0c800b */ lui $t4,0x800b -/* f183900: 8d8cc1e4 */ lw $t4,-0x3e1c($t4) +/* f1838fc: 3c0c800b */ lui $t4,%hi(g_ScenarioData+0xd4) +/* f183900: 8d8cc1e4 */ lw $t4,%lo(g_ScenarioData+0xd4)($t4) /* f183904: 24050001 */ addiu $a1,$zero,0x1 /* f183908: 3406ffff */ dli $a2,0xffff /* f18390c: 000c6880 */ sll $t5,$t4,0x2 @@ -3728,10 +3728,10 @@ glabel var7f1b8960 /* f183960: e7aa0014 */ swc1 $f10,0x14($sp) /* f183964: 8fa2006c */ lw $v0,0x6c($sp) .L0f183968: -/* f183968: 3c01800b */ lui $at,0x800b +/* f183968: 3c01800b */ lui $at,%hi(g_ScenarioData+0xd4) /* f18396c: 2409ffff */ addiu $t1,$zero,-1 /* f183970: 240affff */ addiu $t2,$zero,-1 -/* f183974: ac29c1e4 */ sw $t1,-0x3e1c($at) +/* f183974: ac29c1e4 */ sw $t1,%lo(g_ScenarioData+0xd4)($at) /* f183978: a42ac1e0 */ sh $t2,-0x3e20($at) /* f18397c: ac400000 */ sw $zero,0x0($v0) .L0f183980: @@ -3750,8 +3750,8 @@ glabel var7f1b8960 GLOBAL_ASM( glabel scenarioHtmCallback18 -/* f1839a8: 3c02800a */ lui $v0,0x800a -/* f1839ac: 8c42a24c */ lw $v0,-0x5db4($v0) +/* f1839a8: 3c02800a */ lui $v0,%hi(g_Vars+0x28c) +/* f1839ac: 8c42a24c */ lw $v0,%lo(g_Vars+0x28c)($v0) /* f1839b0: 3c03800b */ lui $v1,%hi(g_ScenarioData) /* f1839b4: 2463c110 */ addiu $v1,$v1,%lo(g_ScenarioData) /* f1839b8: 00027080 */ sll $t6,$v0,0x2 @@ -3766,8 +3766,8 @@ glabel scenarioHtmCallback18 /* f1839dc: afb10018 */ sw $s1,0x18($sp) /* f1839e0: 1321006e */ beq $t9,$at,.L0f183b9c /* f1839e4: afb80060 */ sw $t8,0x60($sp) -/* f1839e8: 3c09800b */ lui $t1,0x800b -/* f1839ec: 8529c1e0 */ lh $t1,-0x3e20($t1) +/* f1839e8: 3c09800b */ lui $t1,%hi(g_ScenarioData+0xd0) +/* f1839ec: 8529c1e0 */ lh $t1,%lo(g_ScenarioData+0xd0)($t1) /* f1839f0: 5449006b */ bnel $v0,$t1,.L0f183ba0 /* f1839f4: 8fbf001c */ lw $ra,0x1c($sp) /* f1839f8: 0c002f40 */ jal func0000bd00 @@ -3947,8 +3947,8 @@ glabel scenarioHtmRadar /* f183d4c: f7b60020 */ sdc1 $f22,0x20($sp) /* f183d50: 05e10123 */ bgez $t7,.L0f1841e0 /* f183d54: f7b40018 */ sdc1 $f20,0x18($sp) -/* f183d58: 3c18800b */ lui $t8,0x800b -/* f183d5c: 8f18c24c */ lw $t8,-0x3db4($t8) +/* f183d58: 3c18800b */ lui $t8,%hi(g_ScenarioData+0x13c) +/* f183d5c: 8f18c24c */ lw $t8,%lo(g_ScenarioData+0x13c)($t8) /* f183d60: 53000021 */ beqzl $t8,.L0f183de8 /* f183d64: 3c01437f */ lui $at,0x437f /* f183d68: 93020000 */ lbu $v0,0x0($t8) @@ -3988,11 +3988,11 @@ glabel scenarioHtmRadar /* f183de8: 3c16800a */ lui $s6,%hi(g_Vars) /* f183dec: 3c10800b */ lui $s0,%hi(g_ScenarioData) /* f183df0: 3c158008 */ lui $s5,%hi(g_TeamColours) -/* f183df4: 3c14800b */ lui $s4,0x800b +/* f183df4: 3c14800b */ lui $s4,%hi(g_ScenarioData+0xc) /* f183df8: 4481b000 */ mtc1 $at,$f22 /* f183dfc: 4480a000 */ mtc1 $zero,$f20 /* f183e00: 26d69fc0 */ addiu $s6,$s6,%lo(g_Vars) -/* f183e04: 2694c11c */ addiu $s4,$s4,-16100 +/* f183e04: 2694c11c */ addiu $s4,$s4,%lo(g_ScenarioData+0xc) /* f183e08: 26b57cc4 */ addiu $s5,$s5,%lo(g_TeamColours) /* f183e0c: 2610c110 */ addiu $s0,$s0,%lo(g_ScenarioData) /* f183e10: 27b30088 */ addiu $s3,$sp,0x88 @@ -4344,7 +4344,7 @@ glabel scenarioPacChooseVictims /* f1843e0: 2694c110 */ addiu $s4,$s4,%lo(g_ScenarioData) /* f1843e4: 240effff */ addiu $t6,$zero,-1 /* f1843e8: 3c02800b */ lui $v0,%hi(g_ScenarioData) -/* f1843ec: 3c03800b */ lui $v1,0x800b +/* f1843ec: 3c03800b */ lui $v1,%hi(g_ScenarioData+0x18) /* f1843f0: afbf002c */ sw $ra,0x2c($sp) /* f1843f4: afb30024 */ sw $s3,0x24($sp) /* f1843f8: afb20020 */ sw $s2,0x20($sp) @@ -4352,7 +4352,7 @@ glabel scenarioPacChooseVictims /* f184400: afb00018 */ sw $s0,0x18($sp) /* f184404: ae8e0004 */ sw $t6,0x4($s4) /* f184408: a6800002 */ sh $zero,0x2($s4) -/* f18440c: 2463c128 */ addiu $v1,$v1,-16088 +/* f18440c: 2463c128 */ addiu $v1,$v1,%lo(g_ScenarioData+0x18) /* f184410: 2442c110 */ addiu $v0,$v0,%lo(g_ScenarioData) .L0f184414: /* f184414: 24420002 */ addiu $v0,$v0,0x2 @@ -4469,26 +4469,26 @@ void scenarioPacReset(void) GLOBAL_ASM( glabel scenarioPacHighlight -/* f18452c: 3c0e800b */ lui $t6,0x800b -/* f184530: 8dcecb94 */ lw $t6,-0x346c($t6) +/* f18452c: 3c0e800b */ lui $t6,%hi(g_MpSetup+0xc) +/* f184530: 8dcecb94 */ lw $t6,%lo(g_MpSetup+0xc)($t6) /* f184534: 000e7b00 */ sll $t7,$t6,0xc /* f184538: 05e3001e */ bgezl $t7,.L0f1845b4 /* f18453c: 00001025 */ or $v0,$zero,$zero /* f184540: 90820000 */ lbu $v0,0x0($a0) /* f184544: 24010006 */ addiu $at,$zero,0x6 -/* f184548: 3c18800b */ lui $t8,0x800b +/* f184548: 3c18800b */ lui $t8,%hi(g_ScenarioData+0x4) /* f18454c: 10410003 */ beq $v0,$at,.L0f18455c /* f184550: 24010003 */ addiu $at,$zero,0x3 /* f184554: 54410017 */ bnel $v0,$at,.L0f1845b4 /* f184558: 00001025 */ or $v0,$zero,$zero .L0f18455c: -/* f18455c: 8f18c114 */ lw $t8,-0x3eec($t8) +/* f18455c: 8f18c114 */ lw $t8,%lo(g_ScenarioData+0x4)($t8) /* f184560: 2401ffff */ addiu $at,$zero,-1 -/* f184564: 3c09800b */ lui $t1,0x800b +/* f184564: 3c09800b */ lui $t1,%hi(g_ScenarioData+0x8) /* f184568: 13010011 */ beq $t8,$at,.L0f1845b0 /* f18456c: 00184040 */ sll $t0,$t8,0x1 /* f184570: 01284821 */ addu $t1,$t1,$t0 -/* f184574: 8529c118 */ lh $t1,-0x3ee8($t1) +/* f184574: 8529c118 */ lh $t1,%lo(g_ScenarioData+0x8)($t1) /* f184578: 3c0b800b */ lui $t3,%hi(g_MpPlayerChrs) /* f18457c: 8c990004 */ lw $t9,0x4($a0) /* f184580: 00095080 */ sll $t2,$t1,0x2 @@ -4544,13 +4544,13 @@ glabel func0f1845bc /* f1845ec: afb1001c */ sw $s1,0x1c($sp) /* f1845f0: 170f0003 */ bne $t8,$t7,.L0f184600 /* f1845f4: afb00018 */ sw $s0,0x18($sp) -/* f1845f8: 3c01800b */ lui $at,0x800b -/* f1845fc: ac20c114 */ sw $zero,-0x3eec($at) +/* f1845f8: 3c01800b */ lui $at,%hi(g_ScenarioData+0x4) +/* f1845fc: ac20c114 */ sw $zero,%lo(g_ScenarioData+0x4)($at) .L0f184600: -/* f184600: 3c01800b */ lui $at,0x800b -/* f184604: a420c112 */ sh $zero,-0x3eee($at) -/* f184608: 3c08800b */ lui $t0,0x800b -/* f18460c: 8d08c114 */ lw $t0,-0x3eec($t0) +/* f184600: 3c01800b */ lui $at,%hi(g_ScenarioData+0x2) +/* f184604: a420c112 */ sh $zero,%lo(g_ScenarioData+0x2)($at) +/* f184608: 3c08800b */ lui $t0,%hi(g_ScenarioData+0x4) +/* f18460c: 8d08c114 */ lw $t0,%lo(g_ScenarioData+0x4)($t0) /* f184610: 3c13800a */ lui $s3,%hi(g_Vars) /* f184614: 26739fc0 */ addiu $s3,$s3,%lo(g_Vars) /* f184618: 8e6b006c */ lw $t3,0x6c($s3) @@ -4683,15 +4683,15 @@ glabel func0f1847b8 /* f1847cc: 00808025 */ or $s0,$a0,$zero /* f1847d0: 05c00036 */ bltz $t6,.L0f1848ac /* f1847d4: afbf001c */ sw $ra,0x1c($sp) -/* f1847d8: 3c0f800b */ lui $t7,0x800b -/* f1847dc: 8defc114 */ lw $t7,-0x3eec($t7) +/* f1847d8: 3c0f800b */ lui $t7,%hi(g_ScenarioData+0x4) +/* f1847dc: 8defc114 */ lw $t7,%lo(g_ScenarioData+0x4)($t7) /* f1847e0: 000fc040 */ sll $t8,$t7,0x1 /* f1847e4: 0078c821 */ addu $t9,$v1,$t8 /* f1847e8: 87280008 */ lh $t0,0x8($t9) /* f1847ec: 54a80030 */ bnel $a1,$t0,.L0f1848b0 /* f1847f0: 8fbf001c */ lw $ra,0x1c($sp) /* f1847f4: 1085002c */ beq $a0,$a1,.L0f1848a8 -/* f1847f8: 3c01800b */ lui $at,0x800b +/* f1847f8: 3c01800b */ lui $at,%hi(g_ScenarioData+0x2) /* f1847fc: 04800026 */ bltz $a0,.L0f184898 /* f184800: 00000000 */ sll $zero,$zero,0x0 /* f184804: 0fc619e0 */ jal func0f186780 @@ -4738,7 +4738,7 @@ glabel func0f1847b8 /* f1848a0: 10000003 */ beqz $zero,.L0f1848b0 /* f1848a4: 8fbf001c */ lw $ra,0x1c($sp) .L0f1848a8: -/* f1848a8: a420c112 */ sh $zero,-0x3eee($at) +/* f1848a8: a420c112 */ sh $zero,%lo(g_ScenarioData+0x2)($at) .L0f1848ac: /* f1848ac: 8fbf001c */ lw $ra,0x1c($sp) .L0f1848b0: @@ -4762,12 +4762,12 @@ glabel scenarioPacCallback10 /* f1848e4: 3c09800b */ lui $t1,%hi(g_ScenarioData) /* f1848e8: 2529c110 */ addiu $t1,$t1,%lo(g_ScenarioData) .L0f1848ec: -/* f1848ec: 3c0f800b */ lui $t7,0x800b -/* f1848f0: 8defc114 */ lw $t7,-0x3eec($t7) +/* f1848ec: 3c0f800b */ lui $t7,%hi(g_ScenarioData+0x4) +/* f1848f0: 8defc114 */ lw $t7,%lo(g_ScenarioData+0x4)($t7) /* f1848f4: 3c07800a */ lui $a3,%hi(g_Vars) /* f1848f8: 24e79fc0 */ addiu $a3,$a3,%lo(g_Vars) /* f1848fc: 05e00042 */ bltz $t7,.L0f184a08 -/* f184900: 3c0c800b */ lui $t4,0x800b +/* f184900: 3c0c800b */ lui $t4,%hi(g_ScenarioData+0x4) /* f184904: 8cf8006c */ lw $t8,0x6c($a3) /* f184908: 00004025 */ or $t0,$zero,$zero /* f18490c: 00002825 */ or $a1,$zero,$zero @@ -4795,14 +4795,14 @@ glabel scenarioPacCallback10 /* f184958: 10000001 */ beqz $zero,.L0f184960 /* f18495c: 24020001 */ addiu $v0,$zero,0x1 .L0f184960: -/* f184960: 8d8cc114 */ lw $t4,-0x3eec($t4) +/* f184960: 8d8cc114 */ lw $t4,%lo(g_ScenarioData+0x4)($t4) /* f184964: 00467021 */ addu $t6,$v0,$a2 /* f184968: 01c57821 */ addu $t7,$t6,$a1 /* f18496c: 000c6840 */ sll $t5,$t4,0x1 /* f184970: 012d1821 */ addu $v1,$t1,$t5 /* f184974: 84640008 */ lh $a0,0x8($v1) /* f184978: 01e8c021 */ addu $t8,$t7,$t0 -/* f18497c: 3c02800b */ lui $v0,0x800b +/* f18497c: 3c02800b */ lui $v0,%hi(g_ScenarioData+0x2) /* f184980: 0098082a */ slt $at,$a0,$t8 /* f184984: 10200006 */ beqz $at,.L0f1849a0 /* f184988: 0004c880 */ sll $t9,$a0,0x2 @@ -4812,16 +4812,16 @@ glabel scenarioPacCallback10 /* f184998: 5580001c */ bnezl $t4,.L0f184a0c /* f18499c: 8fbf0014 */ lw $ra,0x14($sp) .L0f1849a0: -/* f1849a0: 9442c112 */ lhu $v0,-0x3eee($v0) +/* f1849a0: 9442c112 */ lhu $v0,%lo(g_ScenarioData+0x2)($v0) /* f1849a4: 8ced0034 */ lw $t5,0x34($a3) -/* f1849a8: 3c01800b */ lui $at,0x800b +/* f1849a8: 3c01800b */ lui $at,%hi(g_ScenarioData+0x2) /* f1849ac: 004d1021 */ addu $v0,$v0,$t5 /* f1849b0: 304effff */ andi $t6,$v0,0xffff -/* f1849b4: a42ec112 */ sh $t6,-0x3eee($at) +/* f1849b4: a42ec112 */ sh $t6,%lo(g_ScenarioData+0x2)($at) /* f1849b8: 2dc13841 */ sltiu $at,$t6,0x3841 /* f1849bc: 14200012 */ bnez $at,.L0f184a08 -/* f1849c0: 3c01800b */ lui $at,0x800b -/* f1849c4: a420c112 */ sh $zero,-0x3eee($at) +/* f1849c0: 3c01800b */ lui $at,%hi(g_ScenarioData+0x2) +/* f1849c4: a420c112 */ sh $zero,%lo(g_ScenarioData+0x2)($at) /* f1849c8: 846f0008 */ lh $t7,0x8($v1) /* f1849cc: 24045407 */ addiu $a0,$zero,0x5407 /* f1849d0: 000fc040 */ sll $t8,$t7,0x1 @@ -4830,14 +4830,14 @@ glabel scenarioPacCallback10 /* f1849dc: 272a0001 */ addiu $t2,$t9,0x1 /* f1849e0: 0fc5b9f1 */ jal langGet /* f1849e4: a44a0038 */ sh $t2,0x38($v0) -/* f1849e8: 3c0b800b */ lui $t3,0x800b -/* f1849ec: 8d6bc114 */ lw $t3,-0x3eec($t3) -/* f1849f0: 3c04800b */ lui $a0,0x800b +/* f1849e8: 3c0b800b */ lui $t3,%hi(g_ScenarioData+0x4) +/* f1849ec: 8d6bc114 */ lw $t3,%lo(g_ScenarioData+0x4)($t3) +/* f1849f0: 3c04800b */ lui $a0,%hi(g_ScenarioData+0x8) /* f1849f4: 00402825 */ or $a1,$v0,$zero /* f1849f8: 000b6040 */ sll $t4,$t3,0x1 /* f1849fc: 008c2021 */ addu $a0,$a0,$t4 /* f184a00: 0fc619ae */ jal func0f1866b8 -/* f184a04: 8484c118 */ lh $a0,-0x3ee8($a0) +/* f184a04: 8484c118 */ lh $a0,%lo(g_ScenarioData+0x8)($a0) .L0f184a08: /* f184a08: 8fbf0014 */ lw $ra,0x14($sp) .L0f184a0c: @@ -4883,11 +4883,11 @@ glabel scenarioPacCallback18 /* f184a48: 15c9006e */ bne $t6,$t1,.L0f184c04 /* f184a4c: afbf003c */ sw $ra,0x3c($sp) /* f184a50: 8c6a0284 */ lw $t2,0x284($v1) -/* f184a54: 3c0c800b */ lui $t4,0x800b +/* f184a54: 3c0c800b */ lui $t4,%hi(g_ScenarioData+0x2) /* f184a58: 8d4b00d8 */ lw $t3,0xd8($t2) /* f184a5c: 5560006a */ bnezl $t3,.L0f184c08 /* f184a60: 8fbf003c */ lw $ra,0x3c($sp) -/* f184a64: 958cc112 */ lhu $t4,-0x3eee($t4) +/* f184a64: 958cc112 */ lhu $t4,%lo(g_ScenarioData+0x2)($t4) /* f184a68: 240d3840 */ addiu $t5,$zero,0x3840 /* f184a6c: 01ac1823 */ subu $v1,$t5,$t4 /* f184a70: 0c002f40 */ jal func0000bd00 @@ -5051,29 +5051,29 @@ Gfx *scenarioPacRadar(Gfx *gdl) GLOBAL_ASM( glabel scenarioPacRadar2 -/* f184d8c: 3c03800b */ lui $v1,0x800b -/* f184d90: 8c63cb94 */ lw $v1,-0x346c($v1) +/* f184d8c: 3c03800b */ lui $v1,%hi(g_MpSetup+0xc) +/* f184d90: 8c63cb94 */ lw $v1,%lo(g_MpSetup+0xc)($v1) /* f184d94: 27bdffb8 */ addiu $sp,$sp,-72 /* f184d98: afbf001c */ sw $ra,0x1c($sp) /* f184d9c: 000372c0 */ sll $t6,$v1,0xb /* f184da0: 05c10042 */ bgez $t6,.L0f184eac /* f184da4: afa40048 */ sw $a0,0x48($sp) -/* f184da8: 3c0f800b */ lui $t7,0x800b -/* f184dac: 8defc114 */ lw $t7,-0x3eec($t7) -/* f184db0: 3c19800b */ lui $t9,0x800b +/* f184da8: 3c0f800b */ lui $t7,%hi(g_ScenarioData+0x4) +/* f184dac: 8defc114 */ lw $t7,%lo(g_ScenarioData+0x4)($t7) +/* f184db0: 3c19800b */ lui $t9,%hi(g_ScenarioData+0x8) /* f184db4: 05e0003d */ bltz $t7,.L0f184eac /* f184db8: 000fc040 */ sll $t8,$t7,0x1 /* f184dbc: 0338c821 */ addu $t9,$t9,$t8 -/* f184dc0: 8739c118 */ lh $t9,-0x3ee8($t9) +/* f184dc0: 8739c118 */ lh $t9,%lo(g_ScenarioData+0x8)($t9) /* f184dc4: 3c09800b */ lui $t1,%hi(g_MpPlayerChrs) -/* f184dc8: 3c02800a */ lui $v0,0x800a +/* f184dc8: 3c02800a */ lui $v0,%hi(g_Vars+0x284) /* f184dcc: 00194080 */ sll $t0,$t9,0x2 /* f184dd0: 01284821 */ addu $t1,$t1,$t0 /* f184dd4: 8d29c4d0 */ lw $t1,%lo(g_MpPlayerChrs)($t1) /* f184dd8: 8d2a001c */ lw $t2,0x1c($t1) /* f184ddc: 15450033 */ bne $t2,$a1,.L0f184eac /* f184de0: afaa0034 */ sw $t2,0x34($sp) -/* f184de4: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f184de4: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f184de8: c4a40008 */ lwc1 $f4,0x8($a1) /* f184dec: 306e0002 */ andi $t6,$v1,0x2 /* f184df0: 8c4b00bc */ lw $t3,0xbc($v0) @@ -5171,8 +5171,8 @@ glabel menudialog00184ec0 /* f184ed4: afa60020 */ sw $a2,0x20($sp) /* f184ed8: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f184edc: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f184ee0: 3c19800b */ lui $t9,0x800b -/* f184ee4: 9339cb98 */ lbu $t9,-0x3468($t9) +/* f184ee0: 3c19800b */ lui $t9,%hi(g_MpSetup+0x10) +/* f184ee4: 9339cb98 */ lbu $t9,%lo(g_MpSetup+0x10)($t9) /* f184ee8: 000e78c0 */ sll $t7,$t6,0x3 /* f184eec: 01ee7823 */ subu $t7,$t7,$t6 /* f184ef0: 000f7880 */ sll $t7,$t7,0x2 @@ -5180,10 +5180,10 @@ glabel menudialog00184ec0 /* f184ef8: 000f78c0 */ sll $t7,$t7,0x3 /* f184efc: 01ee7823 */ subu $t7,$t7,$t6 /* f184f00: 000f7900 */ sll $t7,$t7,0x4 -/* f184f04: 3c18800a */ lui $t8,%hi(g_MenuStack) +/* f184f04: 3c18800a */ lui $t8,%hi(g_MenuStack+0x4f8) /* f184f08: 030fc021 */ addu $t8,$t8,$t7 /* f184f0c: 001940c0 */ sll $t0,$t9,0x3 -/* f184f10: 8f18e4f8 */ lw $t8,%lo(g_MenuStack)($t8) +/* f184f10: 8f18e4f8 */ lw $t8,%lo(g_MenuStack+0x4f8)($t8) /* f184f14: 3c098008 */ lui $t1,%hi(g_MpScenarios) /* f184f18: 01194021 */ addu $t0,$t0,$t9 /* f184f1c: 000840c0 */ sll $t0,$t0,0x3 @@ -5211,8 +5211,8 @@ glabel menudialog00184ec0 /* f184f6c: 8fbf0014 */ lw $ra,0x14($sp) /* f184f70: 0fc3cdb7 */ jal menuPopDialog /* f184f74: 00000000 */ sll $zero,$zero,0x0 -/* f184f78: 3c0e800b */ lui $t6,0x800b -/* f184f7c: 91cecb98 */ lbu $t6,-0x3468($t6) +/* f184f78: 3c0e800b */ lui $t6,%hi(g_MpSetup+0x10) +/* f184f7c: 91cecb98 */ lbu $t6,%lo(g_MpSetup+0x10)($t6) /* f184f80: 3c048008 */ lui $a0,%hi(g_MpScenarios) /* f184f84: 000e78c0 */ sll $t7,$t6,0x3 /* f184f88: 01ee7821 */ addu $t7,$t7,$t6 @@ -5231,8 +5231,8 @@ glabel menudialog00184ec0 GLOBAL_ASM( glabel func0f184fb0 -/* f184fb0: 3c0e800b */ lui $t6,0x800b -/* f184fb4: 91cecb98 */ lbu $t6,-0x3468($t6) +/* f184fb0: 3c0e800b */ lui $t6,%hi(g_MpSetup+0x10) +/* f184fb4: 91cecb98 */ lbu $t6,%lo(g_MpSetup+0x10)($t6) /* f184fb8: 27bdffe8 */ addiu $sp,$sp,-24 /* f184fbc: afa40018 */ sw $a0,0x18($sp) /* f184fc0: 000e7880 */ sll $t7,$t6,0x2 @@ -5258,8 +5258,8 @@ glabel func0f184fb0 GLOBAL_ASM( glabel func0f18500c -/* f18500c: 3c0e800b */ lui $t6,0x800b -/* f185010: 91cecb98 */ lbu $t6,-0x3468($t6) +/* f18500c: 3c0e800b */ lui $t6,%hi(g_MpSetup+0x10) +/* f185010: 91cecb98 */ lbu $t6,%lo(g_MpSetup+0x10)($t6) /* f185014: 27bdffe8 */ addiu $sp,$sp,-24 /* f185018: afa40018 */ sw $a0,0x18($sp) /* f18501c: 000e7880 */ sll $t7,$t6,0x2 @@ -5320,7 +5320,7 @@ glabel var7f1b897c /* f1850a8: 24140001 */ addiu $s4,$zero,0x1 /* f1850ac: ae790004 */ sw $t9,0x4($s3) /* f1850b0: 8dc10008 */ lw $at,0x8($t6) -/* f1850b4: 3c02800a */ lui $v0,0x800a +/* f1850b4: 3c02800a */ lui $v0,%hi(g_Vars+0x4b0) /* f1850b8: 2489ffff */ addiu $t1,$a0,-1 /* f1850bc: ae610008 */ sw $at,0x8($s3) /* f1850c0: 8dd9000c */ lw $t9,0xc($t6) @@ -5328,7 +5328,7 @@ glabel var7f1b897c /* f1850c8: 90a80001 */ lbu $t0,0x1($a1) /* f1850cc: 51000009 */ beqzl $t0,.L0f1850f4 /* f1850d0: 2d210007 */ sltiu $at,$t1,0x7 -/* f1850d4: 8c42a470 */ lw $v0,-0x5b90($v0) +/* f1850d4: 8c42a470 */ lw $v0,%lo(g_Vars+0x4b0)($v0) /* f1850d8: 24010001 */ addiu $at,$zero,0x1 /* f1850dc: 50400004 */ beqzl $v0,.L0f1850f0 /* f1850e0: 0000a025 */ or $s4,$zero,$zero @@ -5414,9 +5414,9 @@ glabel var7f1b897c /* f1851f8: 8eb80000 */ lw $t8,0x0($s5) .L0f1851fc: /* f1851fc: 16580003 */ bne $s2,$t8,.L0f18520c -/* f185200: 3c01800b */ lui $at,0x800b +/* f185200: 3c01800b */ lui $at,%hi(g_MpSetup+0x10) /* f185204: 10000005 */ beqz $zero,.L0f18521c -/* f185208: a031cb98 */ sb $s1,-0x3468($at) +/* f185208: a031cb98 */ sb $s1,%lo(g_MpSetup+0x10)($at) .L0f18520c: /* f18520c: 26520001 */ addiu $s2,$s2,0x1 /* f185210: 26310001 */ addiu $s1,$s1,0x1 @@ -5438,12 +5438,12 @@ glabel var7f1b897c /* f185244: 5040000d */ beqzl $v0,.L0f18527c /* f185248: 26310001 */ addiu $s1,$s1,0x1 /* f18524c: 16800004 */ bnez $s4,.L0f185260 -/* f185250: 3c0e800b */ lui $t6,0x800b +/* f185250: 3c0e800b */ lui $t6,%hi(g_MpSetup+0x10) /* f185254: 920f0005 */ lbu $t7,0x5($s0) /* f185258: 55e00008 */ bnezl $t7,.L0f18527c /* f18525c: 26310001 */ addiu $s1,$s1,0x1 .L0f185260: -/* f185260: 91cecb98 */ lbu $t6,-0x3468($t6) +/* f185260: 91cecb98 */ lbu $t6,%lo(g_MpSetup+0x10)($t6) /* f185264: 562e0004 */ bnel $s1,$t6,.L0f185278 /* f185268: 26520001 */ addiu $s2,$s2,0x1 /* f18526c: 1000003a */ beqz $zero,.L0f185358 @@ -5582,11 +5582,11 @@ GLOBAL_ASM( glabel func0f185568 /* f185568: 27bdff40 */ addiu $sp,$sp,-192 /* f18556c: afb40024 */ sw $s4,0x24($sp) -/* f185570: 3c14800b */ lui $s4,0x800b -/* f185574: 2694cbb0 */ addiu $s4,$s4,-13392 +/* f185570: 3c14800b */ lui $s4,%hi(g_MpSetup+0x28) +/* f185574: 2694cbb0 */ addiu $s4,$s4,%lo(g_MpSetup+0x28) /* f185578: 928f0060 */ lbu $t7,0x60($s4) -/* f18557c: 3c0e800a */ lui $t6,0x800a -/* f185580: 8dcea24c */ lw $t6,-0x5db4($t6) +/* f18557c: 3c0e800a */ lui $t6,%hi(g_Vars+0x28c) +/* f185580: 8dcea24c */ lw $t6,%lo(g_Vars+0x28c)($t6) /* f185584: afb30020 */ sw $s3,0x20($sp) /* f185588: 24130005 */ addiu $s3,$zero,0x5 /* f18558c: afbf002c */ sw $ra,0x2c($sp) @@ -5606,8 +5606,8 @@ glabel func0f185568 /* f1855c4: 0c004dad */ jal sprintf /* f1855c8: 00403025 */ or $a2,$v0,$zero .L0f1855cc: -/* f1855cc: 3c18800b */ lui $t8,0x800b -/* f1855d0: 9318cb98 */ lbu $t8,-0x3468($t8) +/* f1855cc: 3c18800b */ lui $t8,%hi(g_MpSetup+0x10) +/* f1855d0: 9318cb98 */ lbu $t8,%lo(g_MpSetup+0x10)($t8) /* f1855d4: 3c048008 */ lui $a0,%hi(mpscenarios) /* f1855d8: 27b5007c */ addiu $s5,$sp,0x7c /* f1855dc: 0018c880 */ sll $t9,$t8,0x2 @@ -6183,7 +6183,7 @@ glabel var7f1b89b8 .L0f185e9c: /* f185e9c: 90e90010 */ lbu $t1,0x10($a3) /* f185ea0: 8fb90030 */ lw $t9,0x30($sp) -/* f185ea4: 3c0c800a */ lui $t4,0x800a +/* f185ea4: 3c0c800a */ lui $t4,%hi(g_Vars+0x288) /* f185ea8: 15200005 */ bnez $t1,.L0f185ec0 /* f185eac: 8f220004 */ lw $v0,0x4($t9) /* f185eb0: 8cea000c */ lw $t2,0xc($a3) @@ -6191,14 +6191,14 @@ glabel var7f1b89b8 /* f185eb8: 556000ac */ bnezl $t3,.L0f18616c /* f185ebc: 00001025 */ or $v0,$zero,$zero .L0f185ec0: -/* f185ec0: 8d8ca248 */ lw $t4,-0x5db8($t4) -/* f185ec4: 3c0f800b */ lui $t7,0x800b +/* f185ec0: 8d8ca248 */ lw $t4,%lo(g_Vars+0x288)($t4) +/* f185ec4: 3c0f800b */ lui $t7,%hi(g_MpPlayers+0x14) /* f185ec8: 8d8d0070 */ lw $t5,0x70($t4) /* f185ecc: 000d7080 */ sll $t6,$t5,0x2 /* f185ed0: 01cd7021 */ addu $t6,$t6,$t5 /* f185ed4: 000e7140 */ sll $t6,$t6,0x5 /* f185ed8: 01ee7821 */ addu $t7,$t7,$t6 -/* f185edc: 8defc7cc */ lw $t7,-0x3834($t7) +/* f185edc: 8defc7cc */ lw $t7,%lo(g_MpPlayers+0x14)($t7) /* f185ee0: 31f80002 */ andi $t8,$t7,0x2 /* f185ee4: 530000a1 */ beqzl $t8,.L0f18616c /* f185ee8: 00001025 */ or $v0,$zero,$zero @@ -6279,30 +6279,30 @@ glabel var7f1b89b8 .L0f186008: /* f186008: 304b0002 */ andi $t3,$v0,0x2 /* f18600c: 1160000e */ beqz $t3,.L0f186048 -/* f186010: 3c0c800a */ lui $t4,0x800a -/* f186014: 8d8ca248 */ lw $t4,-0x5db8($t4) -/* f186018: 3c0f800b */ lui $t7,0x800b +/* f186010: 3c0c800a */ lui $t4,%hi(g_Vars+0x288) +/* f186014: 8d8ca248 */ lw $t4,%lo(g_Vars+0x288)($t4) +/* f186018: 3c0f800b */ lui $t7,%hi(g_MpPlayers+0x14) /* f18601c: 8d8d0070 */ lw $t5,0x70($t4) /* f186020: 000d7080 */ sll $t6,$t5,0x2 /* f186024: 01cd7021 */ addu $t6,$t6,$t5 /* f186028: 000e7140 */ sll $t6,$t6,0x5 /* f18602c: 01ee7821 */ addu $t7,$t7,$t6 -/* f186030: 8defc7cc */ lw $t7,-0x3834($t7) +/* f186030: 8defc7cc */ lw $t7,%lo(g_MpPlayers+0x14)($t7) /* f186034: 31f80008 */ andi $t8,$t7,0x8 /* f186038: 13000003 */ beqz $t8,.L0f186048 /* f18603c: 00000000 */ sll $zero,$zero,0x0 /* f186040: 1000000e */ beqz $zero,.L0f18607c /* f186044: 24040001 */ addiu $a0,$zero,0x1 .L0f186048: -/* f186048: 3c19800a */ lui $t9,0x800a -/* f18604c: 8f39a248 */ lw $t9,-0x5db8($t9) -/* f186050: 3c0b800b */ lui $t3,0x800b +/* f186048: 3c19800a */ lui $t9,%hi(g_Vars+0x288) +/* f18604c: 8f39a248 */ lw $t9,%lo(g_Vars+0x288)($t9) +/* f186050: 3c0b800b */ lui $t3,%hi(g_MpPlayers+0x14) /* f186054: 8f290070 */ lw $t1,0x70($t9) /* f186058: 00095080 */ sll $t2,$t1,0x2 /* f18605c: 01495021 */ addu $t2,$t2,$t1 /* f186060: 000a5140 */ sll $t2,$t2,0x5 /* f186064: 016a5821 */ addu $t3,$t3,$t2 -/* f186068: 8d6bc7cc */ lw $t3,-0x3834($t3) +/* f186068: 8d6bc7cc */ lw $t3,%lo(g_MpPlayers+0x14)($t3) /* f18606c: 316c0001 */ andi $t4,$t3,0x1 /* f186070: 11800002 */ beqz $t4,.L0f18607c /* f186074: 00000000 */ sll $zero,$zero,0x0 @@ -6434,25 +6434,25 @@ glabel var7f1b89fc /* f186218: 2631cb88 */ addiu $s1,$s1,%lo(g_MpSetup) /* f18621c: 922e0010 */ lbu $t6,0x10($s1) /* f186220: afb00014 */ sw $s0,0x14($sp) -/* f186224: 3c10800a */ lui $s0,%hi(var800a000c) +/* f186224: 3c10800a */ lui $s0,%hi(g_StageSetup+0xc) /* f186228: 25cfffff */ addiu $t7,$t6,-1 /* f18622c: 2de10005 */ sltiu $at,$t7,0x5 /* f186230: afbf001c */ sw $ra,0x1c($sp) /* f186234: 1020002d */ beqz $at,.L0f1862ec -/* f186238: 8e10d03c */ lw $s0,-0x2fc4($s0) +/* f186238: 8e10d03c */ lw $s0,%lo(g_StageSetup+0xc)($s0) /* f18623c: 000f7880 */ sll $t7,$t7,0x2 /* f186240: 3c017f1c */ lui $at,%hi(var7f1b89bc) /* f186244: 002f0821 */ addu $at,$at,$t7 /* f186248: 8c2f89bc */ lw $t7,%lo(var7f1b89bc)($at) /* f18624c: 01e00008 */ jr $t7 /* f186250: 00000000 */ sll $zero,$zero,0x0 -/* f186254: 3c01800b */ lui $at,0x800b +/* f186254: 3c01800b */ lui $at,%hi(g_ScenarioData+0xc) /* f186258: 10000024 */ beqz $zero,.L0f1862ec -/* f18625c: a420c11c */ sh $zero,-0x3ee4($at) +/* f18625c: a420c11c */ sh $zero,%lo(g_ScenarioData+0xc)($at) /* f186260: 3c18800b */ lui $t8,%hi(g_ScenarioData) /* f186264: 2707c110 */ addiu $a3,$t8,%lo(g_ScenarioData) -/* f186268: 3c08800b */ lui $t0,0x800b -/* f18626c: 2508c150 */ addiu $t0,$t0,-16048 +/* f186268: 3c08800b */ lui $t0,%hi(g_ScenarioData+0x40) +/* f18626c: 2508c150 */ addiu $t0,$t0,%lo(g_ScenarioData+0x40) /* f186270: 00e03025 */ or $a2,$a3,$zero /* f186274: 2405ffff */ addiu $a1,$zero,-1 /* f186278: 24040006 */ addiu $a0,$zero,0x6 @@ -6471,8 +6471,8 @@ glabel var7f1b89fc /* f1862a4: 1420fff5 */ bnez $at,.L0f18627c /* f1862a8: 24c60010 */ addiu $a2,$a2,0x10 /* f1862ac: 3c02800b */ lui $v0,%hi(g_ScenarioData) -/* f1862b0: 3c03800b */ lui $v1,0x800b -/* f1862b4: 2463c118 */ addiu $v1,$v1,-16104 +/* f1862b0: 3c03800b */ lui $v1,%hi(g_ScenarioData+0x8) +/* f1862b4: 2463c118 */ addiu $v1,$v1,%lo(g_ScenarioData+0x8) /* f1862b8: 2442c110 */ addiu $v0,$v0,%lo(g_ScenarioData) .L0f1862bc: /* f1862bc: 24420002 */ addiu $v0,$v0,0x2 @@ -6503,7 +6503,7 @@ glabel var7f1b89fc /* f186318: 03200008 */ jr $t9 /* f18631c: 00000000 */ sll $zero,$zero,0x0 /* f186320: 10000030 */ beqz $zero,.L0f1863e4 -/* f186324: 2610000c */ addiu $s0,$s0,%lo(var800a000c) +/* f186324: 2610000c */ addiu $s0,$s0,12 /* f186328: 92220010 */ lbu $v0,0x10($s1) /* f18632c: 24010005 */ addiu $at,$zero,0x5 /* f186330: 54410006 */ bnel $v0,$at,.L0f18634c @@ -6774,8 +6774,8 @@ glabel func0f1866b8 GLOBAL_ASM( glabel func0f186780 -/* f186780: 3c0e800b */ lui $t6,0x800b -/* f186784: 8dcecb94 */ lw $t6,-0x346c($t6) +/* f186780: 3c0e800b */ lui $t6,%hi(g_MpSetup+0xc) +/* f186784: 8dcecb94 */ lw $t6,%lo(g_MpSetup+0xc)($t6) /* f186788: 27bdffd8 */ addiu $sp,$sp,-40 /* f18678c: afbf0014 */ sw $ra,0x14($sp) /* f186790: 31cf0002 */ andi $t7,$t6,0x2 @@ -6861,17 +6861,17 @@ glabel func0f186898 /* f1868a4: afb00024 */ sw $s0,0x24($sp) /* f1868a8: afa40128 */ sw $a0,0x128($sp) /* f1868ac: afa5012c */ sw $a1,0x12c($sp) -/* f1868b0: 3c03800b */ lui $v1,0x800b +/* f1868b0: 3c03800b */ lui $v1,%hi(g_MpSetup+0x10) /* f1868b4: 8ca20004 */ lw $v0,0x4($a1) -/* f1868b8: 9063cb98 */ lbu $v1,-0x3468($v1) +/* f1868b8: 9063cb98 */ lbu $v1,%lo(g_MpSetup+0x10)($v1) /* f1868bc: 24010001 */ addiu $at,$zero,0x1 /* f1868c0: afa20124 */ sw $v0,0x124($sp) /* f1868c4: 146100a5 */ bne $v1,$at,.L0f186b5c /* f1868c8: afa20120 */ sw $v0,0x120($sp) /* f1868cc: 8c98001c */ lw $t8,0x1c($a0) -/* f1868d0: 3c01800b */ lui $at,0x800b +/* f1868d0: 3c01800b */ lui $at,%hi(g_ScenarioData+0x4) /* f1868d4: 3c11800a */ lui $s1,%hi(g_Vars) -/* f1868d8: ac38c114 */ sw $t8,-0x3eec($at) +/* f1868d8: ac38c114 */ sw $t8,%lo(g_ScenarioData+0x4)($at) /* f1868dc: 8c9902d4 */ lw $t9,0x2d4($a0) /* f1868e0: 26319fc0 */ addiu $s1,$s1,%lo(g_Vars) /* f1868e4: 53200017 */ beqzl $t9,.L0f186944 @@ -6992,14 +6992,14 @@ glabel func0f186898 /* f186a84: 24050009 */ addiu $a1,$zero,0x9 /* f186a88: 0fc377e9 */ jal func0f0ddfa4 /* f186a8c: 24060001 */ addiu $a2,$zero,0x1 -/* f186a90: 3c09800a */ lui $t1,0x800a -/* f186a94: 3c08800a */ lui $t0,0x800a -/* f186a98: 3c07800a */ lui $a3,0x800a -/* f186a9c: 3c06800a */ lui $a2,0x800a -/* f186aa0: 8cc6a030 */ lw $a2,-0x5fd0($a2) -/* f186aa4: 8ce7a024 */ lw $a3,-0x5fdc($a3) -/* f186aa8: 8d08a028 */ lw $t0,-0x5fd8($t0) -/* f186aac: 8d29a02c */ lw $t1,-0x5fd4($t1) +/* f186a90: 3c09800a */ lui $t1,%hi(g_Vars+0x6c) +/* f186a94: 3c08800a */ lui $t0,%hi(g_Vars+0x68) +/* f186a98: 3c07800a */ lui $a3,%hi(g_Vars+0x64) +/* f186a9c: 3c06800a */ lui $a2,%hi(g_Vars+0x70) +/* f186aa0: 8cc6a030 */ lw $a2,%lo(g_Vars+0x70)($a2) +/* f186aa4: 8ce7a024 */ lw $a3,%lo(g_Vars+0x64)($a3) +/* f186aa8: 8d08a028 */ lw $t0,%lo(g_Vars+0x68)($t0) +/* f186aac: 8d29a02c */ lw $t1,%lo(g_Vars+0x6c)($t1) .L0f186ab0: /* f186ab0: 11200003 */ beqz $t1,.L0f186ac0 /* f186ab4: 26100001 */ addiu $s0,$s0,0x1 @@ -7178,8 +7178,8 @@ glabel func0f186898 /* f186d24: afa20048 */ sw $v0,0x48($sp) /* f186d28: 00106880 */ sll $t5,$s0,0x2 /* f186d2c: 01b06823 */ subu $t5,$t5,$s0 -/* f186d30: 3c0c800b */ lui $t4,0x800b -/* f186d34: 258ccbb0 */ addiu $t4,$t4,-13392 +/* f186d30: 3c0c800b */ lui $t4,%hi(g_MpSetup+0x28) +/* f186d34: 258ccbb0 */ addiu $t4,$t4,%lo(g_MpSetup+0x28) /* f186d38: 000d6880 */ sll $t5,$t5,0x2 /* f186d3c: 01ac3021 */ addu $a2,$t5,$t4 /* f186d40: afa6003c */ sw $a2,0x3c($sp) @@ -7355,20 +7355,20 @@ glabel func0f186898 /* f186f9c: 8faa0120 */ lw $t2,0x120($sp) .L0f186fa0: /* f186fa0: 8fae0128 */ lw $t6,0x128($sp) -/* f186fa4: 3c01800b */ lui $at,0x800b +/* f186fa4: 3c01800b */ lui $at,%hi(g_ScenarioData+0x58) /* f186fa8: 854f0062 */ lh $t7,0x62($t2) /* f186fac: 8dd9001c */ lw $t9,0x1c($t6) /* f186fb0: 24045401 */ addiu $a0,$zero,0x5401 /* f186fb4: 000f5880 */ sll $t3,$t7,0x2 /* f186fb8: 002b0821 */ addu $at,$at,$t3 /* f186fbc: 0fc5b9f1 */ jal langGet -/* f186fc0: ac39c168 */ sw $t9,-0x3e98($at) +/* f186fc0: ac39c168 */ sw $t9,%lo(g_ScenarioData+0x58)($at) /* f186fc4: 24040057 */ addiu $a0,$zero,0x57 /* f186fc8: 0fc28874 */ jal func0f0a21d0 /* f186fcc: afa20048 */ sw $v0,0x48($sp) /* f186fd0: 8fb80120 */ lw $t8,0x120($sp) -/* f186fd4: 3c10800b */ lui $s0,0x800b -/* f186fd8: 2610cbb0 */ addiu $s0,$s0,-13392 +/* f186fd4: 3c10800b */ lui $s0,%hi(g_MpSetup+0x28) +/* f186fd8: 2610cbb0 */ addiu $s0,$s0,%lo(g_MpSetup+0x28) /* f186fdc: 870d0062 */ lh $t5,0x62($t8) /* f186fe0: afa20010 */ sw $v0,0x10($sp) /* f186fe4: 8fa50048 */ lw $a1,0x48($sp) @@ -7565,8 +7565,8 @@ glabel func0f186898 GLOBAL_ASM( glabel func0f187288 /* f187288: 27bdfef0 */ addiu $sp,$sp,-272 -/* f18728c: 3c0e800b */ lui $t6,0x800b -/* f187290: 91cecb98 */ lbu $t6,-0x3468($t6) +/* f18728c: 3c0e800b */ lui $t6,%hi(g_MpSetup+0x10) +/* f187290: 91cecb98 */ lbu $t6,%lo(g_MpSetup+0x10)($t6) /* f187294: afbf005c */ sw $ra,0x5c($sp) /* f187298: afbe0058 */ sw $s8,0x58($sp) /* f18729c: afb70054 */ sw $s7,0x54($sp) @@ -7602,11 +7602,11 @@ glabel func0f187288 /* f187310: ae370058 */ sw $s7,0x58($s1) /* f187314: a6d00062 */ sh $s0,0x62($s6) /* f187318: 86690008 */ lh $t1,0x8($s3) -/* f18731c: 3c04800b */ lui $a0,0x800b +/* f18731c: 3c04800b */ lui $a0,%hi(g_ScenarioData+0x18) /* f187320: 8ef20004 */ lw $s2,0x4($s7) /* f187324: 00095100 */ sll $t2,$t1,0x4 /* f187328: 008a2021 */ addu $a0,$a0,$t2 -/* f18732c: 8484c128 */ lh $a0,-0x3ed8($a0) +/* f18732c: 8484c128 */ lh $a0,%lo(g_ScenarioData+0x18)($a0) /* f187330: 2405004e */ addiu $a1,$zero,0x4e /* f187334: 0fc456ac */ jal padUnpack /* f187338: 02803025 */ or $a2,$s4,$zero @@ -7670,8 +7670,8 @@ glabel func0f187288 GLOBAL_ASM( glabel func0f187410 -/* f187410: 3c0e800b */ lui $t6,0x800b -/* f187414: 91cecb98 */ lbu $t6,-0x3468($t6) +/* f187410: 3c0e800b */ lui $t6,%hi(g_MpSetup+0x10) +/* f187414: 91cecb98 */ lbu $t6,%lo(g_MpSetup+0x10)($t6) /* f187418: 27bdff70 */ addiu $sp,$sp,-144 /* f18741c: afb10018 */ sw $s1,0x18($sp) /* f187420: 24010002 */ addiu $at,$zero,0x2 @@ -7681,12 +7681,12 @@ glabel func0f187410 /* f187430: 15c100a1 */ bne $t6,$at,.L0f1876b8 /* f187434: afa50094 */ sw $a1,0x94($sp) /* f187438: 8cb80004 */ lw $t8,0x4($a1) -/* f18743c: 3c01800b */ lui $at,0x800b +/* f18743c: 3c01800b */ lui $at,%hi(g_ScenarioData+0x13c) /* f187440: 3c0a800a */ lui $t2,%hi(g_Vars) /* f187444: afb80040 */ sw $t8,0x40($sp) /* f187448: 8c99001c */ lw $t9,0x1c($a0) /* f18744c: 254a9fc0 */ addiu $t2,$t2,%lo(g_Vars) -/* f187450: ac39c24c */ sw $t9,-0x3db4($at) +/* f187450: ac39c24c */ sw $t9,%lo(g_ScenarioData+0x13c)($at) /* f187454: 8c8b02d4 */ lw $t3,0x2d4($a0) /* f187458: 51600009 */ beqzl $t3,.L0f187480 /* f18745c: 8d4d028c */ lw $t5,0x28c($t2) @@ -7783,14 +7783,14 @@ glabel func0f187410 /* f1875a0: 24050009 */ addiu $a1,$zero,0x9 /* f1875a4: 0fc377e9 */ jal func0f0ddfa4 /* f1875a8: 24060001 */ addiu $a2,$zero,0x1 -/* f1875ac: 3c09800a */ lui $t1,0x800a -/* f1875b0: 3c08800a */ lui $t0,0x800a -/* f1875b4: 3c07800a */ lui $a3,0x800a -/* f1875b8: 3c06800a */ lui $a2,0x800a -/* f1875bc: 8cc6a030 */ lw $a2,-0x5fd0($a2) -/* f1875c0: 8ce7a024 */ lw $a3,-0x5fdc($a3) -/* f1875c4: 8d08a028 */ lw $t0,-0x5fd8($t0) -/* f1875c8: 8d29a02c */ lw $t1,-0x5fd4($t1) +/* f1875ac: 3c09800a */ lui $t1,%hi(g_Vars+0x6c) +/* f1875b0: 3c08800a */ lui $t0,%hi(g_Vars+0x68) +/* f1875b4: 3c07800a */ lui $a3,%hi(g_Vars+0x64) +/* f1875b8: 3c06800a */ lui $a2,%hi(g_Vars+0x70) +/* f1875bc: 8cc6a030 */ lw $a2,%lo(g_Vars+0x70)($a2) +/* f1875c0: 8ce7a024 */ lw $a3,%lo(g_Vars+0x64)($a3) +/* f1875c4: 8d08a028 */ lw $t0,%lo(g_Vars+0x68)($t0) +/* f1875c8: 8d29a02c */ lw $t1,%lo(g_Vars+0x6c)($t1) .L0f1875cc: /* f1875cc: 11200003 */ beqz $t1,.L0f1875dc /* f1875d0: 26100001 */ addiu $s0,$s0,0x1 @@ -7875,8 +7875,8 @@ glabel func0f187410 GLOBAL_ASM( glabel func0f1876e4 -/* f1876e4: 3c0e800b */ lui $t6,0x800b -/* f1876e8: 91cecb98 */ lbu $t6,-0x3468($t6) +/* f1876e4: 3c0e800b */ lui $t6,%hi(g_MpSetup+0x10) +/* f1876e8: 91cecb98 */ lbu $t6,%lo(g_MpSetup+0x10)($t6) /* f1876ec: 27bdffe0 */ addiu $sp,$sp,-32 /* f1876f0: 24010002 */ addiu $at,$zero,0x2 /* f1876f4: 15c10017 */ bne $t6,$at,.L0f187754 diff --git a/src/game/game_18e5a0.c b/src/game/game_18e5a0.c index 24932ba46..7a1a6824c 100644 --- a/src/game/game_18e5a0.c +++ b/src/game/game_18e5a0.c @@ -1298,10 +1298,10 @@ glabel func0f18f874 /* f18f910: 11c0001a */ beqz $t6,.L0f18f97c /* f18f914: afa6007c */ sw $a2,0x7c($sp) /* f18f918: 8e4f0318 */ lw $t7,0x318($s2) -/* f18f91c: 3c18800b */ lui $t8,0x800b +/* f18f91c: 3c18800b */ lui $t8,%hi(g_MpSetup+0xc) /* f18f920: 51e00008 */ beqzl $t7,.L0f18f944 /* f18f924: 8e4a0288 */ lw $t2,0x288($s2) -/* f18f928: 8f18cb94 */ lw $t8,-0x346c($t8) +/* f18f928: 8f18cb94 */ lw $t8,%lo(g_MpSetup+0xc)($t8) /* f18f92c: 33190004 */ andi $t9,$t8,0x4 /* f18f930: 53200004 */ beqzl $t9,.L0f18f944 /* f18f934: 8e4a0288 */ lw $t2,0x288($s2) @@ -1309,13 +1309,13 @@ glabel func0f18f874 /* f18f93c: 8fa20088 */ lw $v0,0x88($sp) /* f18f940: 8e4a0288 */ lw $t2,0x288($s2) .L0f18f944: -/* f18f944: 3c0d800b */ lui $t5,0x800b +/* f18f944: 3c0d800b */ lui $t5,%hi(g_MpPlayers+0x14) /* f18f948: 8d4b0070 */ lw $t3,0x70($t2) /* f18f94c: 000b6080 */ sll $t4,$t3,0x2 /* f18f950: 018b6021 */ addu $t4,$t4,$t3 /* f18f954: 000c6140 */ sll $t4,$t4,0x5 /* f18f958: 01ac6821 */ addu $t5,$t5,$t4 -/* f18f95c: 8dadc7cc */ lw $t5,-0x3834($t5) +/* f18f95c: 8dadc7cc */ lw $t5,%lo(g_MpPlayers+0x14)($t5) /* f18f960: 31ae0004 */ andi $t6,$t5,0x4 /* f18f964: 15c00003 */ bnez $t6,.L0f18f974 /* f18f968: 00000000 */ sll $zero,$zero,0x0 @@ -1326,7 +1326,7 @@ glabel func0f18f874 /* f18f978: 8e480284 */ lw $t0,0x284($s2) .L0f18f97c: /* f18f97c: 8e480284 */ lw $t0,0x284($s2) -/* f18f980: 3c0c800a */ lui $t4,%hi(var8009fffc) +/* f18f980: 3c0c800a */ lui $t4,%hi(g_MissionConfig+0x3) /* f18f984: 8d181c54 */ lw $t8,0x1c54($t0) /* f18f988: 8d0f00c4 */ lw $t7,0xc4($t0) /* f18f98c: 0300c827 */ nor $t9,$t8,$zero @@ -1334,7 +1334,7 @@ glabel func0f18f874 /* f18f994: 314b0010 */ andi $t3,$t2,0x10 /* f18f998: 5560000a */ bnezl $t3,.L0f18f9c4 /* f18f99c: 8d18192c */ lw $t8,0x192c($t0) -/* f18f9a0: 818ddfeb */ lb $t5,-0x2015($t4) +/* f18f9a0: 818ddfeb */ lb $t5,%lo(g_MissionConfig+0x3)($t4) /* f18f9a4: 05a10004 */ bgez $t5,.L0f18f9b8 /* f18f9a8: 00000000 */ sll $zero,$zero,0x0 /* f18f9ac: 8e4e0448 */ lw $t6,0x448($s2) @@ -1419,7 +1419,7 @@ glabel func0f18f874 /* f18fabc: 14410017 */ bne $v0,$at,.L0f18fb1c /* f18fac0: 00000000 */ sll $zero,$zero,0x0 /* f18fac4: 8e2c0000 */ lw $t4,0x0($s1) -/* f18fac8: 258dfffc */ addiu $t5,$t4,%lo(var8009fffc) +/* f18fac8: 258dfffc */ addiu $t5,$t4,-4 /* f18facc: 10000013 */ beqz $zero,.L0f18fb1c /* f18fad0: ae2d0000 */ sw $t5,0x0($s1) .L0f18fad4: @@ -1542,7 +1542,7 @@ glabel func0f18f874 /* f18fc7c: 8e4d0318 */ lw $t5,0x318($s2) /* f18fc80: 8c5800bc */ lw $t8,0xbc($v0) /* f18fc84: 8d0f00bc */ lw $t7,0xbc($t0) -/* f18fc88: 3c0e800b */ lui $t6,0x800b +/* f18fc88: 3c0e800b */ lui $t6,%hi(g_MpSetup+0xc) /* f18fc8c: c7040008 */ lwc1 $f4,0x8($t8) /* f18fc90: c5e60008 */ lwc1 $f6,0x8($t7) /* f18fc94: 3c0700ff */ lui $a3,0xff @@ -1563,20 +1563,20 @@ glabel func0f18f874 /* f18fcd0: 46062201 */ sub.s $f8,$f4,$f6 /* f18fcd4: 11a00013 */ beqz $t5,.L0f18fd24 /* f18fcd8: e7a80070 */ swc1 $f8,0x70($sp) -/* f18fcdc: 8dcecb94 */ lw $t6,-0x346c($t6) +/* f18fcdc: 8dcecb94 */ lw $t6,%lo(g_MpSetup+0xc)($t6) /* f18fce0: 001179c0 */ sll $t7,$s1,0x7 /* f18fce4: 024fc821 */ addu $t9,$s2,$t7 /* f18fce8: 31d80002 */ andi $t8,$t6,0x2 /* f18fcec: 1300000d */ beqz $t8,.L0f18fd24 /* f18fcf0: 00000000 */ sll $zero,$zero,0x0 /* f18fcf4: 8f2a00e4 */ lw $t2,0xe4($t9) -/* f18fcf8: 3c03800b */ lui $v1,0x800b +/* f18fcf8: 3c03800b */ lui $v1,%hi(g_MpPlayers+0x11) /* f18fcfc: 3c078008 */ lui $a3,%hi(g_TeamColours) /* f18fd00: 000a5880 */ sll $t3,$t2,0x2 /* f18fd04: 016a5821 */ addu $t3,$t3,$t2 /* f18fd08: 000b5940 */ sll $t3,$t3,0x5 /* f18fd0c: 006b1821 */ addu $v1,$v1,$t3 -/* f18fd10: 9063c7c9 */ lbu $v1,-0x3837($v1) +/* f18fd10: 9063c7c9 */ lbu $v1,%lo(g_MpPlayers+0x11)($v1) /* f18fd14: 00036080 */ sll $t4,$v1,0x2 /* f18fd18: 00ec3821 */ addu $a3,$a3,$t4 /* f18fd1c: 10000001 */ beqz $zero,.L0f18fd24 @@ -1595,10 +1595,10 @@ glabel func0f18f874 /* f18fd44: 8fb90078 */ lw $t9,0x78($sp) /* f18fd48: 8e4e0318 */ lw $t6,0x318($s2) .L0f18fd4c: -/* f18fd4c: 3c18800a */ lui $t8,0x800a +/* f18fd4c: 3c18800a */ lui $t8,%hi(g_MissionConfig+0x3) /* f18fd50: 55c0003b */ bnezl $t6,.L0f18fe40 /* f18fd54: 8e4e0318 */ lw $t6,0x318($s2) -/* f18fd58: 830fdfeb */ lb $t7,-0x2015($t8) +/* f18fd58: 830fdfeb */ lb $t7,%lo(g_MissionConfig+0x3)($t8) /* f18fd5c: 05e30038 */ bgezl $t7,.L0f18fe40 /* f18fd60: 8e4e0318 */ lw $t6,0x318($s2) /* f18fd64: 8e440474 */ lw $a0,0x474($s2) @@ -1688,7 +1688,7 @@ glabel func0f18f874 /* f18fea0: 8e4f0318 */ lw $t7,0x318($s2) /* f18fea4: 8c6a001c */ lw $t2,0x1c($v1) /* f18fea8: 8d0b00bc */ lw $t3,0xbc($t0) -/* f18feac: 3c19800b */ lui $t9,0x800b +/* f18feac: 3c19800b */ lui $t9,%hi(g_MpSetup+0xc) /* f18feb0: c5440008 */ lwc1 $f4,0x8($t2) /* f18feb4: c5660008 */ lwc1 $f6,0x8($t3) /* f18feb8: 3c0700ff */ lui $a3,0xff @@ -1707,7 +1707,7 @@ glabel func0f18f874 /* f18feec: 46062201 */ sub.s $f8,$f4,$f6 /* f18fef0: 11e0000d */ beqz $t7,.L0f18ff28 /* f18fef4: e7a80070 */ swc1 $f8,0x70($sp) -/* f18fef8: 8f39cb94 */ lw $t9,-0x346c($t9) +/* f18fef8: 8f39cb94 */ lw $t9,%lo(g_MpSetup+0xc)($t9) /* f18fefc: 332a0002 */ andi $t2,$t9,0x2 /* f18ff00: 11400009 */ beqz $t2,.L0f18ff28 /* f18ff04: 00000000 */ sll $zero,$zero,0x0 @@ -1759,25 +1759,25 @@ glabel func0f18f874 /* f18ffac: 240c0001 */ addiu $t4,$zero,0x1 /* f18ffb0: 44800000 */ mtc1 $zero,$f0 /* f18ffb4: 8e4a0318 */ lw $t2,0x318($s2) -/* f18ffb8: 3c0b800b */ lui $t3,0x800b +/* f18ffb8: 3c0b800b */ lui $t3,%hi(g_MpSetup+0xc) /* f18ffbc: e7a00068 */ swc1 $f0,0x68($sp) /* f18ffc0: e7a0006c */ swc1 $f0,0x6c($sp) /* f18ffc4: 11400013 */ beqz $t2,.L0f190014 /* f18ffc8: e7a00070 */ swc1 $f0,0x70($sp) -/* f18ffcc: 8d6bcb94 */ lw $t3,-0x346c($t3) +/* f18ffcc: 8d6bcb94 */ lw $t3,%lo(g_MpSetup+0xc)($t3) /* f18ffd0: 8fae0078 */ lw $t6,0x78($sp) /* f18ffd4: 316c0002 */ andi $t4,$t3,0x2 /* f18ffd8: 1180000e */ beqz $t4,.L0f190014 /* f18ffdc: 000e69c0 */ sll $t5,$t6,0x7 /* f18ffe0: 024dc021 */ addu $t8,$s2,$t5 /* f18ffe4: 8f0f00e4 */ lw $t7,0xe4($t8) -/* f18ffe8: 3c02800b */ lui $v0,0x800b +/* f18ffe8: 3c02800b */ lui $v0,%hi(g_MpPlayers+0x11) /* f18ffec: 3c078008 */ lui $a3,%hi(g_TeamColours) /* f18fff0: 000fc880 */ sll $t9,$t7,0x2 /* f18fff4: 032fc821 */ addu $t9,$t9,$t7 /* f18fff8: 0019c940 */ sll $t9,$t9,0x5 /* f18fffc: 00591021 */ addu $v0,$v0,$t9 -/* f190000: 9042c7c9 */ lbu $v0,-0x3837($v0) +/* f190000: 9042c7c9 */ lbu $v0,%lo(g_MpPlayers+0x11)($v0) /* f190004: 00025080 */ sll $t2,$v0,0x2 /* f190008: 00ea3821 */ addu $a3,$a3,$t2 /* f19000c: 10000002 */ beqz $zero,.L0f190018 diff --git a/src/game/game_190260.c b/src/game/game_190260.c index c8903ca8c..f3ab6f3f2 100644 --- a/src/game/game_190260.c +++ b/src/game/game_190260.c @@ -876,10 +876,10 @@ glabel var7f1b8ea8 /* f190bf8: 10a0000d */ beqz $a1,.L0f190c30 /* f190bfc: afaf0084 */ sw $t7,0x84($sp) /* f190c00: 8cb802d4 */ lw $t8,0x2d4($a1) -/* f190c04: 3c19800a */ lui $t9,0x800a +/* f190c04: 3c19800a */ lui $t9,%hi(g_Vars+0x31c) /* f190c08: 13000009 */ beqz $t8,.L0f190c30 /* f190c0c: 00000000 */ sll $zero,$zero,0x0 -/* f190c10: 8f39a2dc */ lw $t9,-0x5d24($t9) +/* f190c10: 8f39a2dc */ lw $t9,%lo(g_Vars+0x31c)($t9) /* f190c14: 00a02025 */ or $a0,$a1,$zero /* f190c18: 13200005 */ beqz $t9,.L0f190c30 /* f190c1c: 00000000 */ sll $zero,$zero,0x0 @@ -1136,7 +1136,7 @@ glabel var7f1b8ea8 /* f190fb8: 3c013e00 */ lui $at,0x3e00 /* f190fbc: 44812000 */ mtc1 $at,$f4 /* f190fc0: 8fad0058 */ lw $t5,0x58($sp) -/* f190fc4: 3c0e800b */ lui $t6,0x800b +/* f190fc4: 3c0e800b */ lui $t6,%hi(g_MpSetup+0x10) /* f190fc8: 46040182 */ mul.s $f6,$f0,$f4 /* f190fcc: c5a80060 */ lwc1 $f8,0x60($t5) /* f190fd0: 4606403e */ c.le.s $f8,$f6 @@ -1146,7 +1146,7 @@ glabel var7f1b8ea8 /* f190fe0: 1000000c */ beqz $zero,.L0f191014 /* f190fe4: 24100001 */ addiu $s0,$zero,0x1 .L0f190fe8: -/* f190fe8: 91cecb98 */ lbu $t6,-0x3468($t6) +/* f190fe8: 91cecb98 */ lbu $t6,%lo(g_MpSetup+0x10)($t6) /* f190fec: 24010001 */ addiu $at,$zero,0x1 /* f190ff0: 8faf008c */ lw $t7,0x8c($sp) /* f190ff4: 15c10007 */ bne $t6,$at,.L0f191014 @@ -1605,7 +1605,7 @@ glabel var7f1b8ec8 /* f191678: 00024080 */ sll $t0,$v0,0x2 /* f19167c: 8ce302d4 */ lw $v1,0x2d4($a3) /* f191680: 8fa6002c */ lw $a2,0x2c($sp) -/* f191684: 3c0b800a */ lui $t3,0x800a +/* f191684: 3c0b800a */ lui $t3,%hi(g_Vars+0x8) /* f191688: 00627821 */ addu $t7,$v1,$v0 /* f19168c: 91f8016c */ lbu $t8,0x16c($t7) /* f191690: 00684821 */ addu $t1,$v1,$t0 @@ -1617,7 +1617,7 @@ glabel var7f1b8ec8 /* f1916a4: 93240048 */ lbu $a0,0x48($t9) /* f1916a8: 58800042 */ blezl $a0,.L0f1917b4 /* f1916ac: 8faf0034 */ lw $t7,0x34($sp) -/* f1916b0: 8d6b9fc8 */ lw $t3,-0x6038($t3) +/* f1916b0: 8d6b9fc8 */ lw $t3,%lo(g_Vars+0x8)($t3) /* f1916b4: 8d2a0178 */ lw $t2,0x178($t1) /* f1916b8: 8fa50028 */ lw $a1,0x28($sp) /* f1916bc: 256cff10 */ addiu $t4,$t3,-240 @@ -1805,16 +1805,16 @@ glabel var7f1b8ef0 /* f1918f8: 000f382b */ sltu $a3,$zero,$t7 /* f1918fc: 10e00005 */ beqz $a3,.L0f191914 /* f191900: 00000000 */ sll $zero,$zero,0x0 -/* f191904: 3c07800a */ lui $a3,0x800a -/* f191908: 8ce79ff4 */ lw $a3,-0x600c($a3) +/* f191904: 3c07800a */ lui $a3,%hi(g_Vars+0x34) +/* f191908: 8ce79ff4 */ lw $a3,%lo(g_Vars+0x34)($a3) /* f19190c: 0007c82b */ sltu $t9,$zero,$a3 /* f191910: 03203825 */ or $a3,$t9,$zero .L0f191914: /* f191914: 1200019d */ beqz $s0,.L0f191f8c /* f191918: afa70058 */ sw $a3,0x58($sp) /* f19191c: 10e00183 */ beqz $a3,.L0f191f2c -/* f191920: 3c08800a */ lui $t0,0x800a -/* f191924: 8d089fc8 */ lw $t0,-0x6038($t0) +/* f191920: 3c08800a */ lui $t0,%hi(g_Vars+0x8) +/* f191924: 8d089fc8 */ lw $t0,%lo(g_Vars+0x8)($t0) /* f191928: 29010091 */ slti $at,$t0,0x91 /* f19192c: 1420017f */ bnez $at,.L0f191f2c /* f191930: 00000000 */ sll $zero,$zero,0x0 @@ -1855,13 +1855,13 @@ glabel var7f1b8ef0 /* f1919ac: 18400012 */ blez $v0,.L0f1919f8 /* f1919b0: 28411389 */ slti $at,$v0,0x1389 /* f1919b4: 14200004 */ bnez $at,.L0f1919c8 -/* f1919b8: 3c19800a */ lui $t9,0x800a +/* f1919b8: 3c19800a */ lui $t9,%hi(g_Vars+0x38) /* f1919bc: 24181388 */ addiu $t8,$zero,0x1388 /* f1919c0: a63802d8 */ sh $t8,0x2d8($s1) /* f1919c4: 862202d8 */ lh $v0,0x2d8($s1) .L0f1919c8: /* f1919c8: 922802ff */ lbu $t0,0x2ff($s1) -/* f1919cc: 8f399ff8 */ lw $t9,-0x6008($t9) +/* f1919cc: 8f399ff8 */ lw $t9,%lo(g_Vars+0x38)($t9) /* f1919d0: 25090001 */ addiu $t1,$t0,0x1 /* f1919d4: 03290019 */ multu $t9,$t1 /* f1919d8: 00005012 */ mflo $t2 @@ -1939,12 +1939,12 @@ glabel var7f1b8ef0 /* f191ae4: 0203c021 */ addu $t8,$s0,$v1 /* f191ae8: c704013c */ lwc1 $f4,0x13c($t8) /* f191aec: 44813000 */ mtc1 $at,$f6 -/* f191af0: 3c19800a */ lui $t9,0x800a +/* f191af0: 3c19800a */ lui $t9,%hi(g_Vars+0x8) /* f191af4: 4606203c */ c.lt.s $f4,$f6 /* f191af8: 00000000 */ sll $zero,$zero,0x0 /* f191afc: 45020012 */ bc1fl .L0f191b48 /* f191b00: 24010033 */ addiu $at,$zero,0x33 -/* f191b04: 8f399fc8 */ lw $t9,-0x6038($t9) +/* f191b04: 8f399fc8 */ lw $t9,%lo(g_Vars+0x8)($t9) /* f191b08: 8e0801e4 */ lw $t0,0x1e4($s0) /* f191b0c: 2729ffc4 */ addiu $t1,$t9,-60 /* f191b10: 0109082a */ slt $at,$t0,$t1 @@ -1964,8 +1964,8 @@ glabel var7f1b8ef0 /* f191b44: 24010033 */ addiu $at,$zero,0x33 .L0f191b48: /* f191b48: 1481000d */ bne $a0,$at,.L0f191b80 -/* f191b4c: 3c0c800a */ lui $t4,0x800a -/* f191b50: 8d8c9fc8 */ lw $t4,-0x6038($t4) +/* f191b4c: 3c0c800a */ lui $t4,%hi(g_Vars+0x8) +/* f191b50: 8d8c9fc8 */ lw $t4,%lo(g_Vars+0x8)($t4) /* f191b54: 8e0d01e4 */ lw $t5,0x1e4($s0) /* f191b58: 258effc4 */ addiu $t6,$t4,-60 /* f191b5c: 01ae082a */ slt $at,$t5,$t6 @@ -2018,10 +2018,10 @@ glabel var7f1b8ef0 /* f191c00: 14400024 */ bnez $v0,.L0f191c94 /* f191c04: c7a20048 */ lwc1 $f2,0x48($sp) /* f191c08: 8e080044 */ lw $t0,0x44($s0) -/* f191c0c: 3c09800a */ lui $t1,0x800a +/* f191c0c: 3c09800a */ lui $t1,%hi(g_Vars+0x8) /* f191c10: 55000021 */ bnezl $t0,.L0f191c98 /* f191c14: c7a40044 */ lwc1 $f4,0x44($sp) -/* f191c18: 8d299fc8 */ lw $t1,-0x6038($t1) +/* f191c18: 8d299fc8 */ lw $t1,%lo(g_Vars+0x8)($t1) /* f191c1c: 24010078 */ addiu $at,$zero,0x78 /* f191c20: e7a20048 */ swc1 $f2,0x48($sp) /* f191c24: 0121001a */ div $zero,$t1,$at @@ -2217,18 +2217,18 @@ glabel var7f1b8ef0 /* f191ec4: e6120070 */ swc1 $f18,0x70($s0) /* f191ec8: 8e080044 */ lw $t0,0x44($s0) .L0f191ecc: -/* f191ecc: 3c09800a */ lui $t1,0x800a +/* f191ecc: 3c09800a */ lui $t1,%hi(g_Vars+0x8) /* f191ed0: 2401000f */ addiu $at,$zero,0xf /* f191ed4: 11000006 */ beqz $t0,.L0f191ef0 /* f191ed8: 00000000 */ sll $zero,$zero,0x0 /* f191edc: e612006c */ swc1 $f18,0x6c($s0) /* f191ee0: e6120070 */ swc1 $f18,0x70($s0) -/* f191ee4: 8d299fc8 */ lw $t1,-0x6038($t1) +/* f191ee4: 8d299fc8 */ lw $t1,%lo(g_Vars+0x8)($t1) /* f191ee8: 10000010 */ beqz $zero,.L0f191f2c /* f191eec: ae0901e4 */ sw $t1,0x1e4($s0) .L0f191ef0: /* f191ef0: 1441000a */ bne $v0,$at,.L0f191f1c -/* f191ef4: 3c0c800a */ lui $t4,0x800a +/* f191ef4: 3c0c800a */ lui $t4,%hi(g_Vars+0x8) /* f191ef8: 922a0065 */ lbu $t2,0x65($s1) /* f191efc: 3c013f80 */ lui $at,0x3f80 /* f191f00: 314b0020 */ andi $t3,$t2,0x20 @@ -2242,15 +2242,15 @@ glabel var7f1b8ef0 /* f191f1c: e612006c */ swc1 $f18,0x6c($s0) .L0f191f20: /* f191f20: e6120070 */ swc1 $f18,0x70($s0) -/* f191f24: 8d8c9fc8 */ lw $t4,-0x6038($t4) +/* f191f24: 8d8c9fc8 */ lw $t4,%lo(g_Vars+0x8)($t4) /* f191f28: ae0c01e4 */ sw $t4,0x1e4($s0) .L0f191f2c: /* f191f2c: 0fc64512 */ jal func0f191448 /* f191f30: 02202025 */ or $a0,$s1,$zero /* f191f34: 0fc08c26 */ jal func0f023098 /* f191f38: 8fa40068 */ lw $a0,0x68($sp) -/* f191f3c: 3c0d800a */ lui $t5,0x800a -/* f191f40: 8dad9fc8 */ lw $t5,-0x6038($t5) +/* f191f3c: 3c0d800a */ lui $t5,%hi(g_Vars+0x8) +/* f191f40: 8dad9fc8 */ lw $t5,%lo(g_Vars+0x8)($t5) /* f191f44: afa2005c */ sw $v0,0x5c($sp) /* f191f48: 8fae0058 */ lw $t6,0x58($sp) /* f191f4c: 29a10091 */ slti $at,$t5,0x91 @@ -2493,10 +2493,10 @@ glabel var7f1b8f34 /* f192210: 10800070 */ beqz $a0,.L0f1923d4 /* f192214: afa70064 */ sw $a3,0x64($sp) /* f192218: 8c8202d4 */ lw $v0,0x2d4($a0) -/* f19221c: 3c0e800a */ lui $t6,0x800a +/* f19221c: 3c0e800a */ lui $t6,%hi(g_Vars+0x8) /* f192220: 5040006d */ beqzl $v0,.L0f1923d8 /* f192224: 8fbf002c */ lw $ra,0x2c($sp) -/* f192228: 8dce9fc8 */ lw $t6,-0x6038($t6) +/* f192228: 8dce9fc8 */ lw $t6,%lo(g_Vars+0x8)($t6) /* f19222c: 02002025 */ or $a0,$s0,$zero /* f192230: 29c10091 */ slti $at,$t6,0x91 /* f192234: 50200007 */ beqzl $at,.L0f192254 @@ -2908,11 +2908,11 @@ glabel func0f19294c /* f192950: afbf0014 */ sw $ra,0x14($sp) /* f192954: 8ca3001c */ lw $v1,0x1c($a1) /* f192958: 24010006 */ addiu $at,$zero,0x6 -/* f19295c: 3c0f800a */ lui $t7,0x800a +/* f19295c: 3c0f800a */ lui $t7,%hi(g_Vars+0x324) /* f192960: 906e0000 */ lbu $t6,0x0($v1) /* f192964: 55c10007 */ bnel $t6,$at,.L0f192984 /* f192968: 8cb80018 */ lw $t8,0x18($a1) -/* f19296c: 8defa2e4 */ lw $t7,-0x5d1c($t7) +/* f19296c: 8defa2e4 */ lw $t7,%lo(g_Vars+0x324)($t7) /* f192970: 55e00004 */ bnezl $t7,.L0f192984 /* f192974: 8cb80018 */ lw $t8,0x18($a1) /* f192978: 1000002f */ beqz $zero,.L0f192a38 @@ -3339,8 +3339,8 @@ glabel func0f192e90 /* f192f18: 24013840 */ addiu $at,$zero,0x3840 /* f192f1c: 0041001b */ divu $zero,$v0,$at /* f192f20: 3c0d800b */ lui $t5,%hi(g_MpNumPlayers) -/* f192f24: 3c0e800a */ lui $t6,0x800a -/* f192f28: 8dce9ff8 */ lw $t6,-0x6008($t6) +/* f192f24: 3c0e800a */ lui $t6,%hi(g_Vars+0x38) +/* f192f28: 8dce9ff8 */ lw $t6,%lo(g_Vars+0x38)($t6) /* f192f2c: 8dadc530 */ lw $t5,%lo(g_MpNumPlayers)($t5) /* f192f30: 00006010 */ mfhi $t4 /* f192f34: 00000000 */ sll $zero,$zero,0x0 @@ -3488,8 +3488,8 @@ glabel func0f192e90 /* f193130: 54400012 */ bnezl $v0,.L0f19317c /* f193134: 86b8017e */ lh $t8,0x17e($s5) /* f193138: 86780008 */ lh $t8,0x8($s3) -/* f19313c: 3c0e800a */ lui $t6,0x800a -/* f193140: 8dcea2f8 */ lw $t6,-0x5d08($t6) +/* f19313c: 3c0e800a */ lui $t6,%hi(g_Vars+0x338) +/* f193140: 8dcea2f8 */ lw $t6,%lo(g_Vars+0x338)($t6) /* f193144: 00186880 */ sll $t5,$t8,0x2 /* f193148: 020d5821 */ addu $t3,$s0,$t5 /* f19314c: 8d790000 */ lw $t9,0x0($t3) @@ -3554,7 +3554,7 @@ glabel func0f192e90 /* f193220: 86a2017e */ lh $v0,0x17e($s5) .L0f193224: /* f193224: 3c0f800b */ lui $t7,%hi(g_MpNumPlayers) -/* f193228: 3c0b800a */ lui $t3,0x800a +/* f193228: 3c0b800a */ lui $t3,%hi(g_Vars+0x338) /* f19322c: 16220062 */ bne $s1,$v0,.L0f1933b8 /* f193230: 000268c0 */ sll $t5,$v0,0x3 /* f193234: 8defc530 */ lw $t7,%lo(g_MpNumPlayers)($t7) @@ -3585,8 +3585,8 @@ glabel func0f192e90 /* f193294: 930d016c */ lbu $t5,0x16c($t8) /* f193298: 02a02025 */ or $a0,$s5,$zero /* f19329c: 11a0000c */ beqz $t5,.L0f1932d0 -/* f1932a0: 3c19800a */ lui $t9,0x800a -/* f1932a4: 8f39a2f8 */ lw $t9,-0x5d08($t9) +/* f1932a0: 3c19800a */ lui $t9,%hi(g_Vars+0x338) +/* f1932a4: 8f39a2f8 */ lw $t9,%lo(g_Vars+0x338)($t9) /* f1932a8: 8e2b001c */ lw $t3,0x1c($s1) /* f1932ac: 24010048 */ addiu $at,$zero,0x48 /* f1932b0: 02a02025 */ or $a0,$s5,$zero @@ -3609,8 +3609,8 @@ glabel func0f192e90 /* f1932f0: 00000000 */ sll $zero,$zero,0x0 /* f1932f4: 1441000c */ bne $v0,$at,.L0f193328 .L0f1932f8: -/* f1932f8: 3c18800a */ lui $t8,0x800a -/* f1932fc: 8f18a2f8 */ lw $t8,-0x5d08($t8) +/* f1932f8: 3c18800a */ lui $t8,%hi(g_Vars+0x338) +/* f1932fc: 8f18a2f8 */ lw $t8,%lo(g_Vars+0x338)($t8) /* f193300: 8e2f001c */ lw $t7,0x1c($s1) /* f193304: 24010048 */ addiu $at,$zero,0x48 /* f193308: 02a02025 */ or $a0,$s5,$zero @@ -3644,8 +3644,8 @@ glabel func0f192e90 /* f19336c: 00000000 */ sll $zero,$zero,0x0 /* f193370: 0fc63410 */ jal mpGetChrFromPlayerIndex /* f193374: 01802025 */ or $a0,$t4,$zero -/* f193378: 3c0f800a */ lui $t7,0x800a -/* f19337c: 8defa2f8 */ lw $t7,-0x5d08($t7) +/* f193378: 3c0f800a */ lui $t7,%hi(g_Vars+0x338) +/* f19337c: 8defa2f8 */ lw $t7,%lo(g_Vars+0x338)($t7) /* f193380: 8c4e001c */ lw $t6,0x1c($v0) /* f193384: 24010048 */ addiu $at,$zero,0x48 /* f193388: 02a02025 */ or $a0,$s5,$zero @@ -3662,7 +3662,7 @@ glabel func0f192e90 /* f1933b0: 10000042 */ beqz $zero,.L0f1934bc /* f1933b4: 8fbf002c */ lw $ra,0x2c($sp) .L0f1933b8: -/* f1933b8: 8d6ba2f8 */ lw $t3,-0x5d08($t3) +/* f1933b8: 8d6ba2f8 */ lw $t3,%lo(g_Vars+0x338)($t3) /* f1933bc: 01a26821 */ addu $t5,$t5,$v0 /* f1933c0: 000d68c0 */ sll $t5,$t5,0x3 /* f1933c4: 01abc821 */ addu $t9,$t5,$t3 @@ -3706,8 +3706,8 @@ glabel func0f192e90 /* f193454: 0fc64b59 */ jal func0f192d64 /* f193458: 02202825 */ or $a1,$s1,$zero /* f19345c: 1040000c */ beqz $v0,.L0f193490 -/* f193460: 3c19800a */ lui $t9,0x800a -/* f193464: 8f39a2f8 */ lw $t9,-0x5d08($t9) +/* f193460: 3c19800a */ lui $t9,%hi(g_Vars+0x338) +/* f193464: 8f39a2f8 */ lw $t9,%lo(g_Vars+0x338)($t9) /* f193468: 8e2b001c */ lw $t3,0x1c($s1) /* f19346c: 24010048 */ addiu $at,$zero,0x48 /* f193470: 02a02025 */ or $a0,$s5,$zero @@ -3900,14 +3900,14 @@ glabel var7f1b8f50 /* f1937e8: 81d9004f */ lb $t9,0x4f($t6) /* f1937ec: 0080f025 */ or $s8,$a0,$zero /* f1937f0: 07210017 */ bgez $t9,.L0f193850 -/* f1937f4: 3c08800b */ lui $t0,0x800b -/* f1937f8: 9108cb98 */ lbu $t0,-0x3468($t0) +/* f1937f4: 3c08800b */ lui $t0,%hi(g_MpSetup+0x10) +/* f1937f8: 9108cb98 */ lbu $t0,%lo(g_MpSetup+0x10)($t0) /* f1937fc: 24010004 */ addiu $at,$zero,0x4 /* f193800: 55010014 */ bnel $t0,$at,.L0f193854 /* f193804: 03c02025 */ or $a0,$s8,$zero /* f193808: 8c89001c */ lw $t1,0x1c($a0) -/* f19380c: 3c0b800b */ lui $t3,0x800b -/* f193810: 856bc11e */ lh $t3,-0x3ee2($t3) +/* f19380c: 3c0b800b */ lui $t3,%hi(g_ScenarioData+0xe) +/* f193810: 856bc11e */ lh $t3,%lo(g_ScenarioData+0xe)($t3) /* f193814: 852a0028 */ lh $t2,0x28($t1) /* f193818: 554b000e */ bnel $t2,$t3,.L0f193854 /* f19381c: 03c02025 */ or $a0,$s8,$zero @@ -3960,8 +3960,8 @@ glabel var7f1b8f50 /* f1938c4: 26730004 */ addiu $s3,$s3,0x4 /* f1938c8: 1611fff9 */ bne $s0,$s1,.L0f1938b0 /* f1938cc: ae02fffc */ sw $v0,-0x4($s0) -/* f1938d0: 3c15800a */ lui $s5,0x800a -/* f1938d4: 8eb5a2fc */ lw $s5,-0x5d04($s5) +/* f1938d0: 3c15800a */ lui $s5,%hi(g_Vars+0x33c) +/* f1938d4: 8eb5a2fc */ lw $s5,%lo(g_Vars+0x33c)($s5) /* f1938d8: 27b701fc */ addiu $s7,$sp,0x1fc /* f1938dc: 27b20274 */ addiu $s2,$sp,0x274 /* f1938e0: 52a000db */ beqzl $s5,.L0f193c50 @@ -4263,10 +4263,10 @@ glabel var7f1b8f50 /* f193d10: 8e690000 */ lw $t1,0x0($s3) .L0f193d14: /* f193d14: 2401005b */ addiu $at,$zero,0x5b -/* f193d18: 3c03800b */ lui $v1,0x800b +/* f193d18: 3c03800b */ lui $v1,%hi(g_MpSetup+0x10) /* f193d1c: 552100d0 */ bnel $t1,$at,.L0f194060 /* f193d20: 26730004 */ addiu $s3,$s3,0x4 -/* f193d24: 9063cb98 */ lbu $v1,-0x3468($v1) +/* f193d24: 9063cb98 */ lbu $v1,%lo(g_MpSetup+0x10)($v1) /* f193d28: 24010001 */ addiu $at,$zero,0x1 /* f193d2c: 8fad0274 */ lw $t5,0x274($sp) /* f193d30: 54610007 */ bnel $v1,$at,.L0f193d50 @@ -4528,11 +4528,11 @@ glabel var7f1b8f50 /* f1940dc: 8fb400d8 */ lw $s4,0xd8($sp) .L0f1940e0: /* f1940e0: 8d4a022c */ lw $t2,0x22c($t2) -/* f1940e4: 3c0c800b */ lui $t4,0x800b +/* f1940e4: 3c0c800b */ lui $t4,%hi(g_MpSetup+0x10) /* f1940e8: 014b082a */ slt $at,$t2,$t3 /* f1940ec: 542000d8 */ bnezl $at,.L0f194450 /* f1940f0: 8fb400d8 */ lw $s4,0xd8($sp) -/* f1940f4: 918ccb98 */ lbu $t4,-0x3468($t4) +/* f1940f4: 918ccb98 */ lbu $t4,%lo(g_MpSetup+0x10)($t4) /* f1940f8: 24010005 */ addiu $at,$zero,0x5 /* f1940fc: 24140001 */ addiu $s4,$zero,0x1 /* f194100: 55810008 */ bnel $t4,$at,.L0f194124 @@ -4796,10 +4796,10 @@ glabel var7f1b8f50 /* f19449c: 8e6b0000 */ lw $t3,0x0($s3) .L0f1944a0: /* f1944a0: 2401005b */ addiu $at,$zero,0x5b -/* f1944a4: 3c0c800b */ lui $t4,0x800b +/* f1944a4: 3c0c800b */ lui $t4,%hi(g_MpSetup+0x10) /* f1944a8: 51610029 */ beql $t3,$at,.L0f194550 /* f1944ac: 26730004 */ addiu $s3,$s3,0x4 -/* f1944b0: 918ccb98 */ lbu $t4,-0x3468($t4) +/* f1944b0: 918ccb98 */ lbu $t4,%lo(g_MpSetup+0x10)($t4) /* f1944b4: 24010005 */ addiu $at,$zero,0x5 /* f1944b8: 55810008 */ bnel $t4,$at,.L0f1944dc /* f1944bc: 93cf02a0 */ lbu $t7,0x2a0($s8) @@ -5555,8 +5555,8 @@ glabel var7f1b8fc8 /* f195060: 928d02a0 */ lbu $t5,0x2a0($s4) /* f195064: 0fc651b5 */ jal mpGetNumPlayerTeammates /* f195068: 02802025 */ or $a0,$s4,$zero -/* f19506c: 3c03800b */ lui $v1,0x800b -/* f195070: 9063cb98 */ lbu $v1,-0x3468($v1) +/* f19506c: 3c03800b */ lui $v1,%hi(g_MpSetup+0x10) +/* f195070: 9063cb98 */ lbu $v1,%lo(g_MpSetup+0x10)($v1) /* f195074: 00409825 */ or $s3,$v0,$zero /* f195078: 02802025 */ or $a0,$s4,$zero /* f19507c: 16e3001e */ bne $s7,$v1,.L0f1950f8 @@ -5678,8 +5678,8 @@ glabel var7f1b8fc8 /* f195210: 0fc65241 */ jal mpGetNumTeammatesDefendingHill /* f195214: 02802025 */ or $a0,$s4,$zero /* f195218: 8e98001c */ lw $t8,0x1c($s4) -/* f19521c: 3c09800b */ lui $t1,0x800b -/* f195220: 8529c11e */ lh $t1,-0x3ee2($t1) +/* f19521c: 3c09800b */ lui $t1,%hi(g_ScenarioData+0xe) +/* f195220: 8529c11e */ lh $t1,%lo(g_ScenarioData+0xe)($t1) /* f195224: 87190028 */ lh $t9,0x28($t8) /* f195228: 00408025 */ or $s0,$v0,$zero /* f19522c: 02802025 */ or $a0,$s4,$zero @@ -6019,8 +6019,8 @@ glabel var7f1b8fc8 /* f1956e0: 24010006 */ addiu $at,$zero,0x6 .L0f1956e4: /* f1956e4: 14410089 */ bne $v0,$at,.L0f19590c -/* f1956e8: 3c0d800b */ lui $t5,0x800b -/* f1956ec: 91adcb98 */ lbu $t5,-0x3468($t5) +/* f1956e8: 3c0d800b */ lui $t5,%hi(g_MpSetup+0x10) +/* f1956ec: 91adcb98 */ lbu $t5,%lo(g_MpSetup+0x10)($t5) /* f1956f0: 24010005 */ addiu $at,$zero,0x5 /* f1956f4: 15a10083 */ bne $t5,$at,.L0f195904 /* f1956f8: 00000000 */ sll $zero,$zero,0x0 @@ -6177,17 +6177,17 @@ glabel var7f1b8fc8 .L0f19590c: /* f19590c: 24010008 */ addiu $at,$zero,0x8 /* f195910: 14410043 */ bne $v0,$at,.L0f195a20 -/* f195914: 3c19800b */ lui $t9,0x800b -/* f195918: 9339cb98 */ lbu $t9,-0x3468($t9) +/* f195914: 3c19800b */ lui $t9,%hi(g_MpSetup+0x10) +/* f195918: 9339cb98 */ lbu $t9,%lo(g_MpSetup+0x10)($t9) /* f19591c: 24010005 */ addiu $at,$zero,0x5 /* f195920: 1721016b */ bne $t9,$at,.L0f195ed0 /* f195924: 00000000 */ sll $zero,$zero,0x0 /* f195928: 0fc63a5a */ jal teamGetIndex /* f19592c: 92840125 */ lbu $a0,0x125($s4) /* f195930: 00024880 */ sll $t1,$v0,0x2 -/* f195934: 3c03800b */ lui $v1,0x800b +/* f195934: 3c03800b */ lui $v1,%hi(g_ScenarioData+0x58) /* f195938: 00691821 */ addu $v1,$v1,$t1 -/* f19593c: 8c63c168 */ lw $v1,-0x3e98($v1) +/* f19593c: 8c63c168 */ lw $v1,%lo(g_ScenarioData+0x58)($v1) /* f195940: 24010003 */ addiu $at,$zero,0x3 /* f195944: 90640000 */ lbu $a0,0x0($v1) /* f195948: 10810003 */ beq $a0,$at,.L0f195958 @@ -6250,14 +6250,14 @@ glabel var7f1b8fc8 .L0f195a20: /* f195a20: 24010009 */ addiu $at,$zero,0x9 /* f195a24: 14410048 */ bne $v0,$at,.L0f195b48 -/* f195a28: 3c18800b */ lui $t8,0x800b -/* f195a2c: 9318cb98 */ lbu $t8,-0x3468($t8) +/* f195a28: 3c18800b */ lui $t8,%hi(g_MpSetup+0x10) +/* f195a2c: 9318cb98 */ lbu $t8,%lo(g_MpSetup+0x10)($t8) /* f195a30: 24010004 */ addiu $at,$zero,0x4 /* f195a34: 17010126 */ bne $t8,$at,.L0f195ed0 /* f195a38: 00000000 */ sll $zero,$zero,0x0 /* f195a3c: 8e99001c */ lw $t9,0x1c($s4) -/* f195a40: 3c0a800b */ lui $t2,0x800b -/* f195a44: 854ac11e */ lh $t2,-0x3ee2($t2) +/* f195a40: 3c0a800b */ lui $t2,%hi(g_ScenarioData+0xe) +/* f195a44: 854ac11e */ lh $t2,%lo(g_ScenarioData+0xe)($t2) /* f195a48: 87290028 */ lh $t1,0x28($t9) /* f195a4c: 152a0016 */ bne $t1,$t2,.L0f195aa8 /* f195a50: 00000000 */ sll $zero,$zero,0x0 @@ -6283,10 +6283,10 @@ glabel var7f1b8fc8 /* f195aa0: 1000010b */ beqz $zero,.L0f195ed0 /* f195aa4: ae4c01d8 */ sw $t4,0x1d8($s2) .L0f195aa8: -/* f195aa8: 3c04800b */ lui $a0,0x800b +/* f195aa8: 3c04800b */ lui $a0,%hi(g_ScenarioData+0xe) /* f195aac: 27ae0260 */ addiu $t6,$sp,0x260 /* f195ab0: afae0010 */ sw $t6,0x10($sp) -/* f195ab4: 8484c11e */ lh $a0,-0x3ee2($a0) +/* f195ab4: 8484c11e */ lh $a0,%lo(g_ScenarioData+0xe)($a0) /* f195ab8: 27a5026c */ addiu $a1,$sp,0x26c /* f195abc: 27a60268 */ addiu $a2,$sp,0x268 /* f195ac0: 0fc66adc */ jal func0f19ab70 @@ -6295,20 +6295,20 @@ glabel var7f1b8fc8 /* f195acc: c7b2026c */ lwc1 $f18,0x26c($sp) /* f195ad0: e65200ec */ swc1 $f18,0xec($s2) /* f195ad4: c7a40270 */ lwc1 $f4,0x270($sp) -/* f195ad8: 3c04800b */ lui $a0,0x800b +/* f195ad8: 3c04800b */ lui $a0,%hi(g_ScenarioData+0xe) /* f195adc: 2415002b */ addiu $s5,$zero,0x2b /* f195ae0: e64400f0 */ swc1 $f4,0xf0($s2) /* f195ae4: c7a80274 */ lwc1 $f8,0x274($sp) -/* f195ae8: 2484c11e */ addiu $a0,$a0,-16098 +/* f195ae8: 2484c11e */ addiu $a0,$a0,%lo(g_ScenarioData+0xe) /* f195aec: 264500f8 */ addiu $a1,$s2,0xf8 /* f195af0: 0fc195e9 */ jal roomsCopy /* f195af4: e64800f4 */ swc1 $f8,0xf4($s2) /* f195af8: 8e8f001c */ lw $t7,0x1c($s4) -/* f195afc: 3c19800b */ lui $t9,0x800b -/* f195b00: 8739c11e */ lh $t9,-0x3ee2($t9) +/* f195afc: 3c19800b */ lui $t9,%hi(g_ScenarioData+0xe) +/* f195b00: 8739c11e */ lh $t9,%lo(g_ScenarioData+0xe)($t9) /* f195b04: 85f80028 */ lh $t8,0x28($t7) /* f195b08: 924e004c */ lbu $t6,0x4c($s2) -/* f195b0c: 3c0a800b */ lui $t2,0x800b +/* f195b0c: 3c0a800b */ lui $t2,%hi(g_ScenarioData+0xe) /* f195b10: 03194826 */ xor $t1,$t8,$t9 /* f195b14: 2d290001 */ sltiu $t1,$t1,0x1 /* f195b18: 0009582b */ sltu $t3,$zero,$t1 @@ -6320,21 +6320,21 @@ glabel var7f1b8fc8 /* f195b30: a6590048 */ sh $t9,0x48($s2) /* f195b34: 8fa90260 */ lw $t1,0x260($sp) /* f195b38: a649004a */ sh $t1,0x4a($s2) -/* f195b3c: 854ac11e */ lh $t2,-0x3ee2($t2) +/* f195b3c: 854ac11e */ lh $t2,%lo(g_ScenarioData+0xe)($t2) /* f195b40: 100000e3 */ beqz $zero,.L0f195ed0 /* f195b44: ae4a00bc */ sw $t2,0xbc($s2) .L0f195b48: /* f195b48: 2401000a */ addiu $at,$zero,0xa /* f195b4c: 1441002c */ bne $v0,$at,.L0f195c00 -/* f195b50: 3c0b800b */ lui $t3,0x800b -/* f195b54: 916bcb98 */ lbu $t3,-0x3468($t3) +/* f195b50: 3c0b800b */ lui $t3,%hi(g_MpSetup+0x10) +/* f195b54: 916bcb98 */ lbu $t3,%lo(g_MpSetup+0x10)($t3) /* f195b58: 24010004 */ addiu $at,$zero,0x4 -/* f195b5c: 3c04800b */ lui $a0,0x800b +/* f195b5c: 3c04800b */ lui $a0,%hi(g_ScenarioData+0xe) /* f195b60: 156100db */ bne $t3,$at,.L0f195ed0 /* f195b64: 27a50254 */ addiu $a1,$sp,0x254 /* f195b68: 27ad0248 */ addiu $t5,$sp,0x248 /* f195b6c: afad0010 */ sw $t5,0x10($sp) -/* f195b70: 8484c11e */ lh $a0,-0x3ee2($a0) +/* f195b70: 8484c11e */ lh $a0,%lo(g_ScenarioData+0xe)($a0) /* f195b74: 27a60250 */ addiu $a2,$sp,0x250 /* f195b78: 0fc66adc */ jal func0f19ab70 /* f195b7c: 27a7024c */ addiu $a3,$sp,0x24c @@ -6342,20 +6342,20 @@ glabel var7f1b8fc8 /* f195b84: c7a60254 */ lwc1 $f6,0x254($sp) /* f195b88: e64600ec */ swc1 $f6,0xec($s2) /* f195b8c: c7aa0258 */ lwc1 $f10,0x258($sp) -/* f195b90: 3c04800b */ lui $a0,0x800b +/* f195b90: 3c04800b */ lui $a0,%hi(g_ScenarioData+0xe) /* f195b94: 2415002b */ addiu $s5,$zero,0x2b /* f195b98: e64a00f0 */ swc1 $f10,0xf0($s2) /* f195b9c: c7b2025c */ lwc1 $f18,0x25c($sp) -/* f195ba0: 2484c11e */ addiu $a0,$a0,-16098 +/* f195ba0: 2484c11e */ addiu $a0,$a0,%lo(g_ScenarioData+0xe) /* f195ba4: 264500f8 */ addiu $a1,$s2,0xf8 /* f195ba8: 0fc195e9 */ jal roomsCopy /* f195bac: e65200f4 */ swc1 $f18,0xf4($s2) /* f195bb0: 8e8e001c */ lw $t6,0x1c($s4) -/* f195bb4: 3c0f800b */ lui $t7,0x800b -/* f195bb8: 85efc11e */ lh $t7,-0x3ee2($t7) +/* f195bb4: 3c0f800b */ lui $t7,%hi(g_ScenarioData+0xe) +/* f195bb8: 85efc11e */ lh $t7,%lo(g_ScenarioData+0xe)($t7) /* f195bbc: 85cc0028 */ lh $t4,0x28($t6) /* f195bc0: 924d004c */ lbu $t5,0x4c($s2) -/* f195bc4: 3c19800b */ lui $t9,0x800b +/* f195bc4: 3c19800b */ lui $t9,%hi(g_ScenarioData+0xe) /* f195bc8: 018fc026 */ xor $t8,$t4,$t7 /* f195bcc: 2f180001 */ sltiu $t8,$t8,0x1 /* f195bd0: 0018482b */ sltu $t1,$zero,$t8 @@ -6367,19 +6367,19 @@ glabel var7f1b8fc8 /* f195be8: a64f0048 */ sh $t7,0x48($s2) /* f195bec: 8fb80248 */ lw $t8,0x248($sp) /* f195bf0: a658004a */ sh $t8,0x4a($s2) -/* f195bf4: 8739c11e */ lh $t9,-0x3ee2($t9) +/* f195bf4: 8739c11e */ lh $t9,%lo(g_ScenarioData+0xe)($t9) /* f195bf8: 100000b5 */ beqz $zero,.L0f195ed0 /* f195bfc: ae5900bc */ sw $t9,0xbc($s2) .L0f195c00: /* f195c00: 24010005 */ addiu $at,$zero,0x5 /* f195c04: 1441003b */ bne $v0,$at,.L0f195cf4 -/* f195c08: 3c09800b */ lui $t1,0x800b -/* f195c0c: 9129cb98 */ lbu $t1,-0x3468($t1) +/* f195c08: 3c09800b */ lui $t1,%hi(g_MpSetup+0x10) +/* f195c0c: 9129cb98 */ lbu $t1,%lo(g_MpSetup+0x10)($t1) /* f195c10: 24010002 */ addiu $at,$zero,0x2 -/* f195c14: 3c02800b */ lui $v0,0x800b +/* f195c14: 3c02800b */ lui $v0,%hi(g_ScenarioData+0x13c) /* f195c18: 152100ad */ bne $t1,$at,.L0f195ed0 /* f195c1c: 00000000 */ sll $zero,$zero,0x0 -/* f195c20: 8c42c24c */ lw $v0,-0x3db4($v0) +/* f195c20: 8c42c24c */ lw $v0,%lo(g_ScenarioData+0x13c)($v0) /* f195c24: 104000aa */ beqz $v0,.L0f195ed0 /* f195c28: 00000000 */ sll $zero,$zero,0x0 /* f195c2c: 8e8a001c */ lw $t2,0x1c($s4) @@ -6387,13 +6387,13 @@ glabel var7f1b8fc8 /* f195c34: 00000000 */ sll $zero,$zero,0x0 /* f195c38: 90430000 */ lbu $v1,0x0($v0) /* f195c3c: 24010003 */ addiu $at,$zero,0x3 -/* f195c40: 3c0d800b */ lui $t5,0x800b +/* f195c40: 3c0d800b */ lui $t5,%hi(g_MpSetup+0xc) /* f195c44: 10610003 */ beq $v1,$at,.L0f195c54 /* f195c48: 24010006 */ addiu $at,$zero,0x6 /* f195c4c: 54610027 */ bnel $v1,$at,.L0f195cec /* f195c50: 2415002c */ addiu $s5,$zero,0x2c .L0f195c54: -/* f195c54: 8dadcb94 */ lw $t5,-0x346c($t5) +/* f195c54: 8dadcb94 */ lw $t5,%lo(g_MpSetup+0xc)($t5) /* f195c58: 8c500004 */ lw $s0,0x4($v0) /* f195c5c: 02802025 */ or $a0,$s4,$zero /* f195c60: 31ab0002 */ andi $t3,$t5,0x2 @@ -6438,12 +6438,12 @@ glabel var7f1b8fc8 .L0f195cf4: /* f195cf4: 2401000b */ addiu $at,$zero,0xb /* f195cf8: 1441003a */ bne $v0,$at,.L0f195de4 -/* f195cfc: 3c19800b */ lui $t9,0x800b -/* f195d00: 9339cb98 */ lbu $t9,-0x3468($t9) -/* f195d04: 3c02800b */ lui $v0,0x800b +/* f195cfc: 3c19800b */ lui $t9,%hi(g_MpSetup+0x10) +/* f195d00: 9339cb98 */ lbu $t9,%lo(g_MpSetup+0x10)($t9) +/* f195d04: 3c02800b */ lui $v0,%hi(g_ScenarioData+0x4) /* f195d08: 16f90071 */ bne $s7,$t9,.L0f195ed0 /* f195d0c: 00000000 */ sll $zero,$zero,0x0 -/* f195d10: 8c42c114 */ lw $v0,-0x3eec($v0) +/* f195d10: 8c42c114 */ lw $v0,%lo(g_ScenarioData+0x4)($v0) /* f195d14: 1040006e */ beqz $v0,.L0f195ed0 /* f195d18: 00000000 */ sll $zero,$zero,0x0 /* f195d1c: 8e89001c */ lw $t1,0x1c($s4) @@ -6451,13 +6451,13 @@ glabel var7f1b8fc8 /* f195d24: 00000000 */ sll $zero,$zero,0x0 /* f195d28: 90430000 */ lbu $v1,0x0($v0) /* f195d2c: 24010003 */ addiu $at,$zero,0x3 -/* f195d30: 3c0a800b */ lui $t2,0x800b +/* f195d30: 3c0a800b */ lui $t2,%hi(g_MpSetup+0xc) /* f195d34: 10610003 */ beq $v1,$at,.L0f195d44 /* f195d38: 24010006 */ addiu $at,$zero,0x6 /* f195d3c: 54610027 */ bnel $v1,$at,.L0f195ddc /* f195d40: 2415002c */ addiu $s5,$zero,0x2c .L0f195d44: -/* f195d44: 8d4acb94 */ lw $t2,-0x346c($t2) +/* f195d44: 8d4acb94 */ lw $t2,%lo(g_MpSetup+0xc)($t2) /* f195d48: 8c500004 */ lw $s0,0x4($v0) /* f195d4c: 02802025 */ or $a0,$s4,$zero /* f195d50: 314d0002 */ andi $t5,$t2,0x2 @@ -6502,28 +6502,28 @@ glabel var7f1b8fc8 .L0f195de4: /* f195de4: 2401000c */ addiu $at,$zero,0xc /* f195de8: 14410039 */ bne $v0,$at,.L0f195ed0 -/* f195dec: 3c18800b */ lui $t8,0x800b -/* f195df0: 9318cb98 */ lbu $t8,-0x3468($t8) +/* f195dec: 3c18800b */ lui $t8,%hi(g_MpSetup+0x10) +/* f195df0: 9318cb98 */ lbu $t8,%lo(g_MpSetup+0x10)($t8) /* f195df4: 24010003 */ addiu $at,$zero,0x3 -/* f195df8: 3c02800b */ lui $v0,0x800b +/* f195df8: 3c02800b */ lui $v0,%hi(g_ScenarioData+0x4) /* f195dfc: 17010034 */ bne $t8,$at,.L0f195ed0 /* f195e00: 00000000 */ sll $zero,$zero,0x0 -/* f195e04: 8c42c114 */ lw $v0,-0x3eec($v0) -/* f195e08: 3c09800b */ lui $t1,0x800b +/* f195e04: 8c42c114 */ lw $v0,%lo(g_ScenarioData+0x4)($v0) +/* f195e08: 3c09800b */ lui $t1,%hi(g_ScenarioData+0x8) /* f195e0c: 04400030 */ bltz $v0,.L0f195ed0 /* f195e10: 0002c840 */ sll $t9,$v0,0x1 /* f195e14: 01394821 */ addu $t1,$t1,$t9 -/* f195e18: 8529c118 */ lh $t1,-0x3ee8($t1) +/* f195e18: 8529c118 */ lh $t1,%lo(g_ScenarioData+0x8)($t1) /* f195e1c: 3c0d800b */ lui $t5,%hi(g_MpPlayerChrs) /* f195e20: 8e8b001c */ lw $t3,0x1c($s4) /* f195e24: 00095080 */ sll $t2,$t1,0x2 /* f195e28: 01aa6821 */ addu $t5,$t5,$t2 /* f195e2c: 8dadc4d0 */ lw $t5,%lo(g_MpPlayerChrs)($t5) -/* f195e30: 3c0e800b */ lui $t6,0x800b +/* f195e30: 3c0e800b */ lui $t6,%hi(g_MpSetup+0xc) /* f195e34: 8da3001c */ lw $v1,0x1c($t5) /* f195e38: 106b0025 */ beq $v1,$t3,.L0f195ed0 /* f195e3c: 00000000 */ sll $zero,$zero,0x0 -/* f195e40: 8dcecb94 */ lw $t6,-0x346c($t6) +/* f195e40: 8dcecb94 */ lw $t6,%lo(g_MpSetup+0xc)($t6) /* f195e44: 8c700004 */ lw $s0,0x4($v1) /* f195e48: 02802025 */ or $a0,$s4,$zero /* f195e4c: 31cc0002 */ andi $t4,$t6,0x2 @@ -6562,8 +6562,8 @@ glabel var7f1b8fc8 /* f195ecc: ae5e01d8 */ sw $s8,0x1d8($s2) .L0f195ed0: /* f195ed0: 06a10078 */ bgez $s5,.L0f1960b4 -/* f195ed4: 3c03800b */ lui $v1,0x800b -/* f195ed8: 9063cb98 */ lbu $v1,-0x3468($v1) +/* f195ed4: 3c03800b */ lui $v1,%hi(g_MpSetup+0x10) +/* f195ed8: 9063cb98 */ lbu $v1,%lo(g_MpSetup+0x10)($v1) /* f195edc: 24010003 */ addiu $at,$zero,0x3 /* f195ee0: 16e3001a */ bne $s7,$v1,.L0f195f4c /* f195ee4: 00000000 */ sll $zero,$zero,0x0 @@ -6595,13 +6595,13 @@ glabel var7f1b8fc8 /* f195f48: a650000a */ sh $s0,0xa($s2) .L0f195f4c: /* f195f4c: 14610024 */ bne $v1,$at,.L0f195fe0 -/* f195f50: 3c02800b */ lui $v0,0x800b -/* f195f54: 8c42c114 */ lw $v0,-0x3eec($v0) -/* f195f58: 3c18800b */ lui $t8,0x800b +/* f195f50: 3c02800b */ lui $v0,%hi(g_ScenarioData+0x4) +/* f195f54: 8c42c114 */ lw $v0,%lo(g_ScenarioData+0x4)($v0) +/* f195f58: 3c18800b */ lui $t8,%hi(g_ScenarioData+0x8) /* f195f5c: 04400055 */ bltz $v0,.L0f1960b4 /* f195f60: 00027840 */ sll $t7,$v0,0x1 /* f195f64: 030fc021 */ addu $t8,$t8,$t7 -/* f195f68: 8718c118 */ lh $t8,-0x3ee8($t8) +/* f195f68: 8718c118 */ lh $t8,%lo(g_ScenarioData+0x8)($t8) /* f195f6c: 3c09800b */ lui $t1,%hi(g_MpPlayerChrs) /* f195f70: 8e8a001c */ lw $t2,0x1c($s4) /* f195f74: 0018c880 */ sll $t9,$t8,0x2 @@ -6670,8 +6670,8 @@ glabel var7f1b8fc8 /* f196068: 24010002 */ addiu $at,$zero,0x2 .L0f19606c: /* f19606c: 14610011 */ bne $v1,$at,.L0f1960b4 -/* f196070: 3c0b800b */ lui $t3,0x800b -/* f196074: 8d6bc24c */ lw $t3,-0x3db4($t3) +/* f196070: 3c0b800b */ lui $t3,%hi(g_ScenarioData+0x13c) +/* f196074: 8d6bc24c */ lw $t3,%lo(g_ScenarioData+0x13c)($t3) /* f196078: 8e8e001c */ lw $t6,0x1c($s4) /* f19607c: 156e000d */ bne $t3,$t6,.L0f1960b4 /* f196080: 00000000 */ sll $zero,$zero,0x0 @@ -7331,17 +7331,17 @@ glabel var7f1b8fc8 /* f1969d8: 2401002b */ addiu $at,$zero,0x2b .L0f1969dc: /* f1969dc: 1441002f */ bne $v0,$at,.L0f196a9c -/* f1969e0: 3c0b800b */ lui $t3,0x800b -/* f1969e4: 916bcb98 */ lbu $t3,-0x3468($t3) +/* f1969e0: 3c0b800b */ lui $t3,%hi(g_MpSetup+0x10) +/* f1969e4: 916bcb98 */ lbu $t3,%lo(g_MpSetup+0x10)($t3) /* f1969e8: 24010004 */ addiu $at,$zero,0x4 /* f1969ec: 5561001f */ bnel $t3,$at,.L0f196a6c /* f1969f0: 828a0007 */ lb $t2,0x7($s4) /* f1969f4: 8e4e004c */ lw $t6,0x4c($s2) -/* f1969f8: 3c02800b */ lui $v0,0x800b +/* f1969f8: 3c02800b */ lui $v0,%hi(g_ScenarioData+0xe) /* f1969fc: 000e67c2 */ srl $t4,$t6,0x1f /* f196a00: 5180001a */ beqzl $t4,.L0f196a6c /* f196a04: 828a0007 */ lb $t2,0x7($s4) -/* f196a08: 8442c11e */ lh $v0,-0x3ee2($v0) +/* f196a08: 8442c11e */ lh $v0,%lo(g_ScenarioData+0xe)($v0) /* f196a0c: 8e5800bc */ lw $t8,0xbc($s2) /* f196a10: 53020006 */ beql $t8,$v0,.L0f196a2c /* f196a14: 8e89001c */ lw $t1,0x1c($s4) @@ -7403,27 +7403,27 @@ glabel var7f1b8fc8 /* f196ad8: 10a00005 */ beqz $a1,.L0f196af0 /* f196adc: 00000000 */ sll $zero,$zero,0x0 /* f196ae0: 8caf0018 */ lw $t7,0x18($a1) -/* f196ae4: 3c03800b */ lui $v1,0x800b +/* f196ae4: 3c03800b */ lui $v1,%hi(g_MpSetup+0x10) /* f196ae8: 11e00003 */ beqz $t7,.L0f196af8 /* f196aec: 00000000 */ sll $zero,$zero,0x0 .L0f196af0: /* f196af0: 10000025 */ beqz $zero,.L0f196b88 /* f196af4: a29902a0 */ sb $t9,0x2a0($s4) .L0f196af8: -/* f196af8: 9063cb98 */ lbu $v1,-0x3468($v1) +/* f196af8: 9063cb98 */ lbu $v1,%lo(g_MpSetup+0x10)($v1) /* f196afc: 24010002 */ addiu $at,$zero,0x2 /* f196b00: 12e30021 */ beq $s7,$v1,.L0f196b88 /* f196b04: 00000000 */ sll $zero,$zero,0x0 /* f196b08: 1461001f */ bne $v1,$at,.L0f196b88 -/* f196b0c: 3c09800b */ lui $t1,0x800b -/* f196b10: 8d29c24c */ lw $t1,-0x3db4($t1) +/* f196b0c: 3c09800b */ lui $t1,%hi(g_ScenarioData+0x13c) +/* f196b10: 8d29c24c */ lw $t1,%lo(g_ScenarioData+0x13c)($t1) /* f196b14: 8e8d001c */ lw $t5,0x1c($s4) /* f196b18: 152d001b */ bne $t1,$t5,.L0f196b88 /* f196b1c: 00000000 */ sll $zero,$zero,0x0 /* f196b20: 0fc633fe */ jal mpPlayerGetIndex /* f196b24: 02802025 */ or $a0,$s4,$zero -/* f196b28: 3c0a800b */ lui $t2,0x800b -/* f196b2c: 854ac1e2 */ lh $t2,-0x3e1e($t2) +/* f196b28: 3c0a800b */ lui $t2,%hi(g_ScenarioData+0xd2) +/* f196b2c: 854ac1e2 */ lh $t2,%lo(g_ScenarioData+0xd2)($t2) /* f196b30: 240b0029 */ addiu $t3,$zero,0x29 /* f196b34: 144a0014 */ bne $v0,$t2,.L0f196b88 /* f196b38: 00000000 */ sll $zero,$zero,0x0 @@ -7442,8 +7442,8 @@ glabel var7f1b8fc8 .L0f196b68: /* f196b68: 0fc633fe */ jal mpPlayerGetIndex /* f196b6c: 02802025 */ or $a0,$s4,$zero -/* f196b70: 3c0c800b */ lui $t4,0x800b -/* f196b74: 858cc1e2 */ lh $t4,-0x3e1e($t4) +/* f196b70: 3c0c800b */ lui $t4,%hi(g_ScenarioData+0xd2) +/* f196b74: 858cc1e2 */ lh $t4,%lo(g_ScenarioData+0xd2)($t4) /* f196b78: 24180029 */ addiu $t8,$zero,0x29 /* f196b7c: 104c0002 */ beq $v0,$t4,.L0f196b88 /* f196b80: 00000000 */ sll $zero,$zero,0x0 diff --git a/src/game/game_197600.c b/src/game/game_197600.c index 9971a8d29..6f8284e3c 100644 --- a/src/game/game_197600.c +++ b/src/game/game_197600.c @@ -292,10 +292,10 @@ glabel func0f197600 /* f1979c8: a10c009d */ sb $t4,0x9d($t0) /* f1979cc: 8d0b0050 */ lw $t3,0x50($t0) .L0f1979d0: -/* f1979d0: 3c04800a */ lui $a0,0x800a +/* f1979d0: 3c04800a */ lui $a0,%hi(g_Vars+0x38) /* f1979d4: 5160000c */ beqzl $t3,.L0f197a08 /* f1979d8: 8d0200d0 */ lw $v0,0xd0($t0) -/* f1979dc: 8c849ff8 */ lw $a0,-0x6008($a0) +/* f1979dc: 8c849ff8 */ lw $a0,%lo(g_Vars+0x38)($a0) /* f1979e0: 9105009d */ lbu $a1,0x9d($t0) /* f1979e4: 0085082a */ slt $at,$a0,$a1 /* f1979e8: 10200004 */ beqz $at,.L0f1979fc @@ -310,10 +310,10 @@ glabel func0f197600 /* f197a04: 8d0200d0 */ lw $v0,0xd0($t0) .L0f197a08: /* f197a08: a1030074 */ sb $v1,0x74($t0) -/* f197a0c: 3c0f800a */ lui $t7,0x800a +/* f197a0c: 3c0f800a */ lui $t7,%hi(g_Vars+0x38) /* f197a10: 04420005 */ bltzl $v0,.L0f197a28 /* f197a14: 8fad0050 */ lw $t5,0x50($sp) -/* f197a18: 8def9ff8 */ lw $t7,-0x6008($t7) +/* f197a18: 8def9ff8 */ lw $t7,%lo(g_Vars+0x38)($t7) /* f197a1c: 004fc023 */ subu $t8,$v0,$t7 /* f197a20: ad1800d0 */ sw $t8,0xd0($t0) /* f197a24: 8fad0050 */ lw $t5,0x50($sp) @@ -919,10 +919,10 @@ glabel func0f198068 GLOBAL_ASM( glabel func0f198278 /* f198278: 3c03800b */ lui $v1,%hi(g_MpSetup) -/* f19827c: 3c07800b */ lui $a3,0x800b +/* f19827c: 3c07800b */ lui $a3,%hi(g_MpSetup+0x6) /* f198280: 3c048008 */ lui $a0,%hi(mpweaponstable) /* f198284: 24847268 */ addiu $a0,$a0,%lo(mpweaponstable) -/* f198288: 24e7cb8e */ addiu $a3,$a3,-13426 +/* f198288: 24e7cb8e */ addiu $a3,$a3,%lo(g_MpSetup+0x6) /* f19828c: 2463cb88 */ addiu $v1,$v1,%lo(g_MpSetup) /* f198290: 2406005b */ addiu $a2,$zero,0x5b /* f198294: 2405000a */ addiu $a1,$zero,0xa @@ -1242,8 +1242,8 @@ glabel var7f1b908c /* f1985f0: 50ac017a */ beql $a1,$t4,.L0f198bdc /* f1985f4: 8fac0070 */ lw $t4,0x70($sp) /* f1985f8: 11a0000c */ beqz $t5,.L0f19862c -/* f1985fc: 3c0f800b */ lui $t7,0x800b -/* f198600: 8defcb94 */ lw $t7,-0x346c($t7) +/* f1985fc: 3c0f800b */ lui $t7,%hi(g_MpSetup+0xc) +/* f198600: 8defcb94 */ lw $t7,%lo(g_MpSetup+0xc)($t7) /* f198604: 31ee0001 */ andi $t6,$t7,0x1 /* f198608: 51c00174 */ beqzl $t6,.L0f198bdc /* f19860c: 8fac0070 */ lw $t4,0x70($sp) @@ -2535,12 +2535,12 @@ glabel func0f19978c /* f19982c: 0fc2c5f0 */ jal weaponHasFlag /* f199830: 86240004 */ lh $a0,0x4($s1) /* f199834: 1040000d */ beqz $v0,.L0f19986c -/* f199838: 3c18800a */ lui $t8,0x800a -/* f19983c: 8f18a2d8 */ lw $t8,-0x5d28($t8) -/* f199840: 3c19800b */ lui $t9,0x800b +/* f199838: 3c18800a */ lui $t8,%hi(g_Vars+0x318) +/* f19983c: 8f18a2d8 */ lw $t8,%lo(g_Vars+0x318)($t8) +/* f199840: 3c19800b */ lui $t9,%hi(g_MpSetup+0x10) /* f199844: 53000023 */ beqzl $t8,.L0f1998d4 /* f199848: 8e6402d4 */ lw $a0,0x2d4($s3) -/* f19984c: 9339cb98 */ lbu $t9,-0x3468($t9) +/* f19984c: 9339cb98 */ lbu $t9,%lo(g_MpSetup+0x10)($t9) /* f199850: 24010002 */ addiu $at,$zero,0x2 /* f199854: 5721001f */ bnel $t9,$at,.L0f1998d4 /* f199858: 8e6402d4 */ lw $a0,0x2d4($s3) diff --git a/src/game/game_1999b0.c b/src/game/game_1999b0.c index 1a131fc01..17bf88edf 100644 --- a/src/game/game_1999b0.c +++ b/src/game/game_1999b0.c @@ -534,9 +534,9 @@ glabel var7f1b90a0 /* f19a090: 0fc4a25f */ jal propGetPlayerNum /* f19a094: 02402025 */ or $a0,$s2,$zero /* f19a098: 00026880 */ sll $t5,$v0,0x2 -/* f19a09c: 3c03800a */ lui $v1,0x800a +/* f19a09c: 3c03800a */ lui $v1,%hi(g_Vars+0x64) /* f19a0a0: 006d1821 */ addu $v1,$v1,$t5 -/* f19a0a4: 8c63a024 */ lw $v1,-0x5fdc($v1) +/* f19a0a4: 8c63a024 */ lw $v1,%lo(g_Vars+0x64)($v1) /* f19a0a8: 240e001e */ addiu $t6,$zero,0x1e /* f19a0ac: c4600170 */ lwc1 $f0,0x170($v1) /* f19a0b0: c4620168 */ lwc1 $f2,0x168($v1) @@ -993,9 +993,9 @@ glabel func0f19a6d0 /* f19a708: 51c0002d */ beqzl $t6,.L0f19a7c0 /* f19a70c: 00001025 */ or $v0,$zero,$zero /* f19a710: 1040002a */ beqz $v0,.L0f19a7bc -/* f19a714: 3c0f800a */ lui $t7,0x800a +/* f19a714: 3c0f800a */ lui $t7,%hi(g_Vars+0x8) /* f19a718: 8fa80050 */ lw $t0,0x50($sp) -/* f19a71c: 8def9fc8 */ lw $t7,-0x6038($t7) +/* f19a71c: 8def9fc8 */ lw $t7,%lo(g_Vars+0x8)($t7) /* f19a720: 85090000 */ lh $t1,0x0($t0) /* f19a724: 000fc243 */ sra $t8,$t7,0x9 /* f19a728: 0018c9c0 */ sll $t9,$t8,0x7 diff --git a/src/game/game_19aa80.c b/src/game/game_19aa80.c index c61ee518d..509b67486 100644 --- a/src/game/game_19aa80.c +++ b/src/game/game_19aa80.c @@ -181,8 +181,8 @@ glabel func0f19ab70 .L0f19ace0: /* f19ace0: 3c0b800a */ lui $t3,%hi(g_RoomPtrs) /* f19ace4: 8d6b4928 */ lw $t3,%lo(g_RoomPtrs)($t3) -/* f19ace8: 3c0a800a */ lui $t2,0x800a -/* f19acec: 8d4aa020 */ lw $t2,-0x5fe0($t2) +/* f19ace8: 3c0a800a */ lui $t2,%hi(g_Vars+0x60) +/* f19acec: 8d4aa020 */ lw $t2,%lo(g_Vars+0x60)($t2) /* f19acf0: 01776021 */ addu $t4,$t3,$s7 /* f19acf4: 958d000c */ lhu $t5,0xc($t4) /* f19acf8: 3c08800a */ lui $t0,%hi(g_StageSetup) @@ -748,17 +748,17 @@ glabel func0f19afdc GLOBAL_ASM( glabel func0f19b540 -/* f19b540: 3c0e800b */ lui $t6,0x800b -/* f19b544: 91cecc10 */ lbu $t6,-0x33f0($t6) +/* f19b540: 3c0e800b */ lui $t6,%hi(g_MpSetup+0x88) +/* f19b544: 91cecc10 */ lbu $t6,%lo(g_MpSetup+0x88)($t6) /* f19b548: 27bdffe8 */ addiu $sp,$sp,-24 /* f19b54c: 24010005 */ addiu $at,$zero,0x5 /* f19b550: 15c10038 */ bne $t6,$at,.L0f19b634 /* f19b554: afbf0014 */ sw $ra,0x14($sp) -/* f19b558: 3c07800b */ lui $a3,0x800b +/* f19b558: 3c07800b */ lui $a3,%hi(g_MpSetup+0x16) /* f19b55c: 3c03800b */ lui $v1,%hi(g_MpPlayers) /* f19b560: 00002825 */ or $a1,$zero,$zero /* f19b564: 2463c7b8 */ addiu $v1,$v1,%lo(g_MpPlayers) -/* f19b568: 94e7cb9e */ lhu $a3,-0x3462($a3) +/* f19b568: 94e7cb9e */ lhu $a3,%lo(g_MpSetup+0x16)($a3) /* f19b56c: 00001025 */ or $v0,$zero,$zero /* f19b570: 24060080 */ addiu $a2,$zero,0x80 /* f19b574: 240400a0 */ addiu $a0,$zero,0xa0 @@ -810,9 +810,9 @@ glabel func0f19b540 /* f19b61c: 24010004 */ addiu $at,$zero,0x4 /* f19b620: 240a000a */ addiu $t2,$zero,0xa /* f19b624: 1521000b */ bne $t1,$at,.L0f19b654 -/* f19b628: 3c01800a */ lui $at,0x800a +/* f19b628: 3c01800a */ lui $at,%hi(g_Vars+0x484) /* f19b62c: 10000009 */ beqz $zero,.L0f19b654 -/* f19b630: ac2aa444 */ sw $t2,-0x5bbc($at) +/* f19b630: ac2aa444 */ sw $t2,%lo(g_Vars+0x484)($at) .L0f19b634: /* f19b634: 0fc67244 */ jal mpIsChallengeComplete /* f19b638: 24040040 */ addiu $a0,$zero,0x40 @@ -1629,8 +1629,8 @@ glabel func0f19c1cc /* f19c1ec: 0fc62fdc */ jal mpSetLock /* f19c1f0: 24050005 */ addiu $a1,$zero,0x5 /* f19c1f4: 3c03800b */ lui $v1,%hi(g_MpPlayers) -/* f19c1f8: 3c02800b */ lui $v0,0x800b -/* f19c1fc: 2442ca38 */ addiu $v0,$v0,-13768 +/* f19c1f8: 3c02800b */ lui $v0,%hi(g_MpPlayers+0x280) +/* f19c1fc: 2442ca38 */ addiu $v0,$v0,%lo(g_MpPlayers+0x280) /* f19c200: 2463c7b8 */ addiu $v1,$v1,%lo(g_MpPlayers) .L0f19c204: /* f19c204: 246300a0 */ addiu $v1,$v1,0xa0 diff --git a/src/game/game_19c990.c b/src/game/game_19c990.c index 9a44b6f03..af9e93d2c 100644 --- a/src/game/game_19c990.c +++ b/src/game/game_19c990.c @@ -182,9 +182,9 @@ glabel func0f19cad4 /* f19caec: 10200010 */ beqz $at,.L0f19cb30 /* f19caf0: 00001025 */ or $v0,$zero,$zero /* f19caf4: 000470c3 */ sra $t6,$a0,0x3 -/* f19caf8: 3c0f800a */ lui $t7,0x800a +/* f19caf8: 3c0f800a */ lui $t7,%hi(var800a22b4+0x1) /* f19cafc: 01ee7821 */ addu $t7,$t7,$t6 -/* f19cb00: 91ef22b5 */ lbu $t7,0x22b5($t7) +/* f19cb00: 91ef22b5 */ lbu $t7,%lo(var800a22b4+0x1)($t7) /* f19cb04: 04810004 */ bgez $a0,.L0f19cb18 /* f19cb08: 30980007 */ andi $t8,$a0,0x7 /* f19cb0c: 13000002 */ beqz $t8,.L0f19cb18 @@ -640,16 +640,16 @@ glabel var7f1b93b8 GLOBAL_ASM( glabel func0f19d250 -/* f19d250: 3c02800b */ lui $v0,0x800b +/* f19d250: 3c02800b */ lui $v0,%hi(var800ad174+0x2) /* f19d254: 03e00008 */ jr $ra -/* f19d258: 9442d176 */ lhu $v0,-0x2e8a($v0) +/* f19d258: 9442d176 */ lhu $v0,%lo(var800ad174+0x2)($v0) ); GLOBAL_ASM( glabel func0f19d25c -/* f19d25c: 3c01800b */ lui $at,0x800b +/* f19d25c: 3c01800b */ lui $at,%hi(var800ad174+0x2) /* f19d260: 03e00008 */ jr $ra -/* f19d264: a424d176 */ sh $a0,-0x2e8a($at) +/* f19d264: a424d176 */ sh $a0,%lo(var800ad174+0x2)($at) ); GLOBAL_ASM( @@ -748,12 +748,12 @@ glabel func0f19d338 /* f19d398: 24060019 */ addiu $a2,$zero,0x19 /* f19d39c: 0fc00b0a */ jal func0f002c28 /* f19d3a0: 24070064 */ addiu $a3,$zero,0x64 -/* f19d3a4: 3c09800b */ lui $t1,0x800b -/* f19d3a8: 912ad185 */ lbu $t2,-0x2e7b($t1) -/* f19d3ac: 3c01800b */ lui $at,0x800b +/* f19d3a4: 3c09800b */ lui $t1,%hi(var800ad184+0x1) +/* f19d3a8: 912ad185 */ lbu $t2,%lo(var800ad184+0x1)($t1) +/* f19d3ac: 3c01800b */ lui $at,%hi(var800ad184+0x1) /* f19d3b0: 3c048009 */ lui $a0,%hi(var80095200) /* f19d3b4: 354b0010 */ ori $t3,$t2,0x10 -/* f19d3b8: a02bd185 */ sb $t3,-0x2e7b($at) +/* f19d3b8: a02bd185 */ sb $t3,%lo(var800ad184+0x1)($at) /* f19d3bc: 3c01bf80 */ lui $at,0xbf80 /* f19d3c0: 44812000 */ mtc1 $at,$f4 /* f19d3c4: 240cffff */ addiu $t4,$zero,-1 @@ -811,12 +811,12 @@ glabel func0f19d414 /* f19d47c: 24060064 */ addiu $a2,$zero,0x64 /* f19d480: 0fc00b0a */ jal func0f002c28 /* f19d484: 24070019 */ addiu $a3,$zero,0x19 -/* f19d488: 3c09800b */ lui $t1,0x800b -/* f19d48c: 9129d185 */ lbu $t1,-0x2e7b($t1) -/* f19d490: 3c01800b */ lui $at,0x800b +/* f19d488: 3c09800b */ lui $t1,%hi(var800ad184+0x1) +/* f19d48c: 9129d185 */ lbu $t1,%lo(var800ad184+0x1)($t1) +/* f19d490: 3c01800b */ lui $at,%hi(var800ad184+0x1) /* f19d494: 3c048009 */ lui $a0,%hi(var80095200) /* f19d498: 312affef */ andi $t2,$t1,0xffef -/* f19d49c: a02ad185 */ sb $t2,-0x2e7b($at) +/* f19d49c: a02ad185 */ sb $t2,%lo(var800ad184+0x1)($at) /* f19d4a0: 3c01bf80 */ lui $at,0xbf80 /* f19d4a4: 44812000 */ mtc1 $at,$f4 /* f19d4a8: 240bffff */ addiu $t3,$zero,-1 @@ -914,9 +914,9 @@ glabel func0f19d5c0 /* f19d5d4: 00000000 */ sll $zero,$zero,0x0 /* f19d5d8: 24040002 */ addiu $a0,$zero,0x2 .L0f19d5dc: -/* f19d5dc: 3c01800b */ lui $at,0x800b +/* f19d5dc: 3c01800b */ lui $at,%hi(var800ad168) /* f19d5e0: 03e00008 */ jr $ra -/* f19d5e4: a024d168 */ sb $a0,-0x2e98($at) +/* f19d5e4: a024d168 */ sb $a0,%lo(var800ad168)($at) ); GLOBAL_ASM( @@ -1378,9 +1378,9 @@ glabel var7f1b93ec /* f19dbf8: 0043082a */ slt $at,$v0,$v1 /* f19dbfc: 10200004 */ beqz $at,.L0f19dc10 /* f19dc00: 0062c023 */ subu $t8,$v1,$v0 -/* f19dc04: 3c01800b */ lui $at,0x800b +/* f19dc04: 3c01800b */ lui $at,%hi(var800ad194+0x2) /* f19dc08: 10000002 */ beqz $zero,.L0f19dc14 -/* f19dc0c: a438d196 */ sh $t8,-0x2e6a($at) +/* f19dc0c: a438d196 */ sh $t8,%lo(var800ad194+0x2)($at) .L0f19dc10: /* f19dc10: a6000476 */ sh $zero,0x476($s0) .L0f19dc14: @@ -1400,9 +1400,9 @@ glabel var7f1b93ec /* f19dc48: 0043082a */ slt $at,$v0,$v1 /* f19dc4c: 10200004 */ beqz $at,.L0f19dc60 /* f19dc50: 00625023 */ subu $t2,$v1,$v0 -/* f19dc54: 3c01800b */ lui $at,0x800b +/* f19dc54: 3c01800b */ lui $at,%hi(var800ad198) /* f19dc58: 10000002 */ beqz $zero,.L0f19dc64 -/* f19dc5c: a42ad198 */ sh $t2,-0x2e68($at) +/* f19dc5c: a42ad198 */ sh $t2,%lo(var800ad198)($at) .L0f19dc60: /* f19dc60: a6000478 */ sh $zero,0x478($s0) .L0f19dc64: @@ -1595,9 +1595,9 @@ glabel func0f19def4 /* f19def4: 00047100 */ sll $t6,$a0,0x4 /* f19def8: 01c47023 */ subu $t6,$t6,$a0 /* f19defc: 000e7080 */ sll $t6,$t6,0x2 -/* f19df00: 3c02800b */ lui $v0,0x800b +/* f19df00: 3c02800b */ lui $v0,%hi(var800acd50+0x1) /* f19df04: 004e1021 */ addu $v0,$v0,$t6 -/* f19df08: 9042cd51 */ lbu $v0,-0x32af($v0) +/* f19df08: 9042cd51 */ lbu $v0,%lo(var800acd50+0x1)($v0) /* f19df0c: 2c4f0001 */ sltiu $t7,$v0,0x1 /* f19df10: 03e00008 */ jr $ra /* f19df14: 01e01025 */ or $v0,$t7,$zero @@ -2355,8 +2355,8 @@ glabel func0f19e900 /* f19e930: afa20024 */ sw $v0,0x24($sp) /* f19e934: 0fc67643 */ jal func0f19d90c /* f19e938: 00402025 */ or $a0,$v0,$zero -/* f19e93c: 3c05800b */ lui $a1,0x800b -/* f19e940: 90a5cd26 */ lbu $a1,-0x32da($a1) +/* f19e93c: 3c05800b */ lui $a1,%hi(var800acd24+0x2) +/* f19e940: 90a5cd26 */ lbu $a1,%lo(var800acd24+0x2)($a1) /* f19e944: 240100ff */ addiu $at,$zero,0xff /* f19e948: 8fa40020 */ lw $a0,0x20($sp) /* f19e94c: 14a10005 */ bne $a1,$at,.L0f19e964 @@ -2371,10 +2371,10 @@ glabel func0f19e900 /* f19e96c: 8fae0028 */ lw $t6,0x28($sp) .L0f19e970: /* f19e970: 24010012 */ addiu $at,$zero,0x12 -/* f19e974: 3c05800b */ lui $a1,0x800b +/* f19e974: 3c05800b */ lui $a1,%hi(var800acd24+0x3) /* f19e978: 55c1000d */ bnel $t6,$at,.L0f19e9b0 /* f19e97c: 8fbf0014 */ lw $ra,0x14($sp) -/* f19e980: 90a5cd27 */ lbu $a1,-0x32d9($a1) +/* f19e980: 90a5cd27 */ lbu $a1,%lo(var800acd24+0x3)($a1) /* f19e984: 240100ff */ addiu $at,$zero,0xff /* f19e988: 2404000b */ addiu $a0,$zero,0xb /* f19e98c: 14a10005 */ bne $a1,$at,.L0f19e9a4 @@ -2523,9 +2523,9 @@ glabel var7f1b94a8 .text /* f19ea80: 27bdffe8 */ addiu $sp,$sp,-24 /* f19ea84: afbf0014 */ sw $ra,0x14($sp) -/* f19ea88: 3c04800b */ lui $a0,0x800b +/* f19ea88: 3c04800b */ lui $a0,%hi(var800ad174+0x2) /* f19ea8c: 0fc6749a */ jal func0f19d268 -/* f19ea90: 9484d176 */ lhu $a0,-0x2e8a($a0) +/* f19ea90: 9484d176 */ lhu $a0,%lo(var800ad174+0x2)($a0) /* f19ea94: 244efffe */ addiu $t6,$v0,-2 /* f19ea98: 2dc10021 */ sltiu $at,$t6,0x21 /* f19ea9c: 1020008b */ beqz $at,.L0f19eccc @@ -3021,7 +3021,7 @@ glabel func0f19f18c /* f19f1a0: 0fc67c1f */ jal func0f19f07c /* f19f1a4: 00000000 */ sll $zero,$zero,0x0 /* f19f1a8: 1040000a */ beqz $v0,.L0f19f1d4 -/* f19f1ac: 3c10800b */ lui $s0,%hi(var800acd20) +/* f19f1ac: 3c10800b */ lui $s0,0x800b /* f19f1b0: 3c10800b */ lui $s0,%hi(var800acd20) /* f19f1b4: 2610cd20 */ addiu $s0,$s0,%lo(var800acd20) /* f19f1b8: 920f0465 */ lbu $t7,0x465($s0) @@ -3032,7 +3032,7 @@ glabel func0f19f18c /* f19f1cc: 1000000e */ beqz $zero,.L0f19f208 /* f19f1d0: a2190465 */ sb $t9,0x465($s0) .L0f19f1d4: -/* f19f1d4: 2610cd20 */ addiu $s0,$s0,%lo(var800acd20) +/* f19f1d4: 2610cd20 */ addiu $s0,$s0,-13024 /* f19f1d8: 0fc6749a */ jal func0f19d268 /* f19f1dc: 96040456 */ lhu $a0,0x456($s0) /* f19f1e0: 0fc67330 */ jal func0f19ccc0 @@ -3300,9 +3300,9 @@ GLOBAL_ASM( glabel func0f19f524 /* f19f524: 27bdfd40 */ addiu $sp,$sp,-704 /* f19f528: afbf0014 */ sw $ra,0x14($sp) -/* f19f52c: 3c04800b */ lui $a0,0x800b +/* f19f52c: 3c04800b */ lui $a0,%hi(var800ad174+0x2) /* f19f530: 0fc6749a */ jal func0f19d268 -/* f19f534: 9484d176 */ lhu $a0,-0x2e8a($a0) +/* f19f534: 9484d176 */ lhu $a0,%lo(var800ad174+0x2)($a0) /* f19f538: afa202bc */ sw $v0,0x2bc($sp) /* f19f53c: 00402025 */ or $a0,$v0,$zero /* f19f540: 0fc2a685 */ jal weaponGetAmmoType @@ -3311,8 +3311,8 @@ glabel func0f19f524 /* f19f54c: 8fa402bc */ lw $a0,0x2bc($sp) /* f19f550: 0fc2a685 */ jal weaponGetAmmoType /* f19f554: 24050001 */ addiu $a1,$zero,0x1 -/* f19f558: 3c03800a */ lui $v1,0x800a -/* f19f55c: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f19f558: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f19f55c: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f19f560: 8fae02bc */ lw $t6,0x2bc($sp) /* f19f564: 2401001d */ addiu $at,$zero,0x1d /* f19f568: 00403825 */ or $a3,$v0,$zero @@ -3348,7 +3348,7 @@ glabel func0f19f524 /* f19f5dc: 24c6cd20 */ addiu $a2,$a2,%lo(var800acd20) /* f19f5e0: 8cd90464 */ lw $t9,0x464($a2) /* f19f5e4: 00001025 */ or $v0,$zero,$zero -/* f19f5e8: 3c03800a */ lui $v1,%hi(var800a0478) +/* f19f5e8: 3c03800a */ lui $v1,%hi(var800a3430) /* f19f5ec: 00197b40 */ sll $t7,$t9,0xd /* f19f5f0: 05e10006 */ bgez $t7,.L0f19f60c /* f19f5f4: 24041ad0 */ addiu $a0,$zero,0x1ad0 @@ -3358,7 +3358,7 @@ glabel func0f19f524 /* f19f604: 100000df */ beqz $zero,.L0f19f984 /* f19f608: a0d90465 */ sb $t9,0x465($a2) .L0f19f60c: -/* f19f60c: 8c633430 */ lw $v1,0x3430($v1) +/* f19f60c: 8c633430 */ lw $v1,%lo(var800a3430)($v1) .L0f19f610: /* f19f610: 8c6e0000 */ lw $t6,0x0($v1) /* f19f614: 24420478 */ addiu $v0,$v0,0x478 @@ -3368,10 +3368,10 @@ glabel func0f19f524 /* f19f624: 00001025 */ or $v0,$zero,$zero .L0f19f628: /* f19f628: 1444fff9 */ bne $v0,$a0,.L0f19f610 -/* f19f62c: 24630478 */ addiu $v1,$v1,%lo(var800a0478) +/* f19f62c: 24630478 */ addiu $v1,$v1,1144 /* f19f630: 8fa202bc */ lw $v0,0x2bc($sp) /* f19f634: 24010018 */ addiu $at,$zero,0x18 -/* f19f638: 3c0f800a */ lui $t7,0x800a +/* f19f638: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) /* f19f63c: 10410015 */ beq $v0,$at,.L0f19f694 /* f19f640: 24010019 */ addiu $at,$zero,0x19 /* f19f644: 10410013 */ beq $v0,$at,.L0f19f694 @@ -3395,13 +3395,13 @@ glabel func0f19f524 /* f19f68c: 144100ba */ bne $v0,$at,.L0f19f978 /* f19f690: 00000000 */ sll $zero,$zero,0x0 .L0f19f694: -/* f19f694: 8defa244 */ lw $t7,-0x5dbc($t7) +/* f19f694: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) /* f19f698: 27a50064 */ addiu $a1,$sp,0x64 /* f19f69c: 8de400bc */ lw $a0,0xbc($t7) /* f19f6a0: 0fc195e9 */ jal roomsCopy /* f19f6a4: 24840028 */ addiu $a0,$a0,0x0028 -/* f19f6a8: 3c18800a */ lui $t8,0x800a -/* f19f6ac: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f19f6a8: 3c18800a */ lui $t8,%hi(g_Vars+0x284) +/* f19f6ac: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f19f6b0: 2401ffff */ addiu $at,$zero,-1 /* f19f6b4: 00001825 */ or $v1,$zero,$zero /* f19f6b8: 8f0200bc */ lw $v0,0xbc($t8) @@ -3418,8 +3418,8 @@ glabel func0f19f524 /* f19f6e0: 27a50064 */ addiu $a1,$sp,0x64 /* f19f6e4: 0fc195f6 */ jal func0f0657d8 /* f19f6e8: 24060014 */ addiu $a2,$zero,0x14 -/* f19f6ec: 3c0e800a */ lui $t6,0x800a -/* f19f6f0: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f19f6ec: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f19f6f0: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f19f6f4: 8fa30020 */ lw $v1,0x20($sp) /* f19f6f8: 2401ffff */ addiu $at,$zero,-1 /* f19f6fc: 8dcf00bc */ lw $t7,0xbc($t6) @@ -3437,8 +3437,8 @@ glabel func0f19f524 /* f19f728: 27b90090 */ addiu $t9,$sp,0x90 /* f19f72c: 03203025 */ or $a2,$t9,$zero /* f19f730: 05c00091 */ bltz $t6,.L0f19f978 -/* f19f734: 3c0f800a */ lui $t7,0x800a -/* f19f738: 8defa2f8 */ lw $t7,-0x5d08($t7) +/* f19f734: 3c0f800a */ lui $t7,%hi(g_Vars+0x338) +/* f19f738: 8defa2f8 */ lw $t7,%lo(g_Vars+0x338)($t7) /* f19f73c: 87230000 */ lh $v1,0x0($t9) /* f19f740: 241f0056 */ addiu $ra,$zero,0x56 /* f19f744: 240d0054 */ addiu $t5,$zero,0x54 @@ -3549,24 +3549,24 @@ glabel func0f19f524 /* f19f8b8: 00001025 */ or $v0,$zero,$zero .L0f19f8bc: /* f19f8bc: 14400014 */ bnez $v0,.L0f19f910 -/* f19f8c0: 3c0f800a */ lui $t7,0x800a +/* f19f8c0: 3c0f800a */ lui $t7,%hi(g_MenuStack+0x2220) /* f19f8c4: 8fa402bc */ lw $a0,0x2bc($sp) /* f19f8c8: 0fc2a685 */ jal weaponGetAmmoType /* f19f8cc: 00002825 */ or $a1,$zero,$zero -/* f19f8d0: 3c0e800a */ lui $t6,0x800a -/* f19f8d4: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f19f8d0: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f19f8d4: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f19f8d8: 00402025 */ or $a0,$v0,$zero /* f19f8dc: 25d90638 */ addiu $t9,$t6,0x638 /* f19f8e0: 0fc2a5dc */ jal ammoGetQuantity /* f19f8e4: afb90034 */ sw $t9,0x34($sp) /* f19f8e8: 8faf0034 */ lw $t7,0x34($sp) /* f19f8ec: 2419012c */ addiu $t9,$zero,0x12c -/* f19f8f0: 3c01800b */ lui $at,0x800b -/* f19f8f4: 8df80220 */ lw $t8,0x220($t7) +/* f19f8f0: 3c01800b */ lui $at,%hi(var800ad194) +/* f19f8f4: 8df80220 */ lw $t8,%lo(g_MenuStack+0x2220)($t7) /* f19f8f8: 03027021 */ addu $t6,$t8,$v0 /* f19f8fc: 15c00002 */ bnez $t6,.L0f19f908 /* f19f900: 00000000 */ sll $zero,$zero,0x0 -/* f19f904: a439d194 */ sh $t9,-0x2e6c($at) +/* f19f904: a439d194 */ sh $t9,%lo(var800ad194)($at) .L0f19f908: /* f19f908: 1000001e */ beqz $zero,.L0f19f984 /* f19f90c: 00001025 */ or $v0,$zero,$zero @@ -3719,13 +3719,13 @@ glabel var7f1b94e4 .L0f19fac0: /* f19fac0: 5611fff9 */ bnel $s0,$s1,.L0f19faa8 /* f19fac4: 8e040014 */ lw $a0,0x14($s0) -/* f19fac8: 3c02800b */ lui $v0,0x800b -/* f19facc: 9042d185 */ lbu $v0,-0x2e7b($v0) +/* f19fac8: 3c02800b */ lui $v0,%hi(var800ad184+0x1) +/* f19facc: 9042d185 */ lbu $v0,%lo(var800ad184+0x1)($v0) /* f19fad0: 00027942 */ srl $t7,$v0,0x5 /* f19fad4: 11e0000b */ beqz $t7,.L0f19fb04 /* f19fad8: 00000000 */ sll $zero,$zero,0x0 /* f19fadc: 11f30010 */ beq $t7,$s3,.L0f19fb20 -/* f19fae0: 3c048009 */ lui $a0,%hi(var80095200) +/* f19fae0: 3c048009 */ lui $a0,0x8009 /* f19fae4: 24010002 */ addiu $at,$zero,0x2 /* f19fae8: 11e10012 */ beq $t7,$at,.L0f19fb34 /* f19faec: 3c048009 */ lui $a0,%hi(var80095200) @@ -3778,7 +3778,7 @@ glabel var7f1b94e4 /* f19fb98: afac001c */ sw $t4,0x1c($sp) /* f19fb9c: afab0018 */ sw $t3,0x18($sp) /* f19fba0: afaa0010 */ sw $t2,0x10($sp) -/* f19fba4: 8c845200 */ lw $a0,%lo(var80095200)($a0) +/* f19fba4: 8c845200 */ lw $a0,20992($a0) /* f19fba8: 240505dc */ addiu $a1,$zero,0x5dc /* f19fbac: 00003025 */ or $a2,$zero,$zero /* f19fbb0: 2407ffff */ addiu $a3,$zero,-1 @@ -3797,7 +3797,7 @@ glabel var7f1b94e4 /* f19fbe4: 8fbf007c */ lw $ra,0x7c($sp) /* f19fbe8: 8ec20284 */ lw $v0,0x284($s6) .L0f19fbec: -/* f19fbec: 3c038009 */ lui $v1,%hi(var8009003c) +/* f19fbec: 3c038009 */ lui $v1,0x8009 /* f19fbf0: 2401000a */ addiu $at,$zero,0xa /* f19fbf4: 8c4d00bc */ lw $t5,0xbc($v0) /* f19fbf8: 90638804 */ lbu $v1,-0x77fc($v1) @@ -3832,8 +3832,8 @@ glabel var7f1b94e4 .L0f19fc64: /* f19fc64: 5611ffee */ bnel $s0,$s1,.L0f19fc20 /* f19fc68: 8e020010 */ lw $v0,0x10($s0) -/* f19fc6c: 3c02800a */ lui $v0,0x800a -/* f19fc70: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f19fc6c: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f19fc70: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f19fc74: 24040001 */ addiu $a0,$zero,0x1 /* f19fc78: 0fc67b37 */ jal func0f19ecdc /* f19fc7c: ac401c08 */ sw $zero,0x1c08($v0) @@ -4180,7 +4180,7 @@ glabel var7f1b94e4 .L0f1a0150: /* f1a0150: 0fc1a2bd */ jal func0f068af4 /* f1a0154: 00001025 */ or $v0,$zero,$zero -/* f1a0158: 3c038009 */ lui $v1,%hi(var8009003c) +/* f1a0158: 3c038009 */ lui $v1,0x8009 /* f1a015c: 9063880c */ lbu $v1,-0x77f4($v1) /* f1a0160: 00404025 */ or $t0,$v0,$zero /* f1a0164: 5060000d */ beqzl $v1,.L0f1a019c @@ -4258,7 +4258,7 @@ glabel var7f1b94e4 /* f1a0274: 1160000e */ beqz $t3,.L0f1a02b0 /* f1a0278: 00026840 */ sll $t5,$v0,0x1 /* f1a027c: 05a2000d */ bltzl $t5,.L0f1a02b4 -/* f1a0280: 2463003c */ addiu $v1,$v1,%lo(var8009003c) +/* f1a0280: 2463003c */ addiu $v1,$v1,60 /* f1a0284: 8c6e0014 */ lw $t6,0x14($v1) /* f1a0288: 90780010 */ lbu $t8,0x10($v1) /* f1a028c: 3c01fff7 */ lui $at,0xfff7 @@ -4271,7 +4271,7 @@ glabel var7f1b94e4 /* f1a02a8: 10000004 */ beqz $zero,.L0f1a02bc /* f1a02ac: ac4a000c */ sw $t2,0xc($v0) .L0f1a02b0: -/* f1a02b0: 2463003c */ addiu $v1,$v1,%lo(var8009003c) +/* f1a02b0: 2463003c */ addiu $v1,$v1,60 .L0f1a02b4: /* f1a02b4: 5474ffec */ bnel $v1,$s4,.L0f1a0268 /* f1a02b8: 8c620010 */ lw $v0,0x10($v1) @@ -4750,8 +4750,8 @@ glabel func0f1a0924 /* f1a0974: 27af0044 */ addiu $t7,$sp,0x44 /* f1a0978: 0fc1a006 */ jal func0f068018 /* f1a097c: afaf0010 */ sw $t7,0x10($sp) -/* f1a0980: 3c03800a */ lui $v1,%hi(var800a000c) -/* f1a0984: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f1a0980: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f1a0984: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f1a0988: 00001025 */ or $v0,$zero,$zero /* f1a098c: 00002825 */ or $a1,$zero,$zero /* f1a0990: 24060004 */ addiu $a2,$zero,0x4 @@ -4806,7 +4806,7 @@ glabel func0f1a0924 /* f1a0a4c: 24420001 */ addiu $v0,$v0,0x1 /* f1a0a50: 24a5000c */ addiu $a1,$a1,0xc /* f1a0a54: 1446ffcf */ bne $v0,$a2,.L0f1a0994 -/* f1a0a58: 2463000c */ addiu $v1,$v1,%lo(var800a000c) +/* f1a0a58: 2463000c */ addiu $v1,$v1,12 .L0f1a0a5c: /* f1a0a5c: 8fbf0024 */ lw $ra,0x24($sp) .L0f1a0a60: @@ -4944,7 +4944,7 @@ glabel func0f1a0c30 /* f1a0c3c: 27bdffe8 */ addiu $sp,$sp,-24 /* f1a0c40: afbf0014 */ sw $ra,0x14($sp) /* f1a0c44: 19c0000a */ blez $t6,.L0f1a0c70 -/* f1a0c48: 3c18800a */ lui $t8,0x800a +/* f1a0c48: 3c18800a */ lui $t8,%hi(g_Vars+0x284) /* f1a0c4c: 90620465 */ lbu $v0,0x465($v1) /* f1a0c50: 24010002 */ addiu $at,$zero,0x2 /* f1a0c54: 00027942 */ srl $t7,$v0,0x5 @@ -4956,7 +4956,7 @@ glabel func0f1a0c30 /* f1a0c68: 10000011 */ beqz $zero,.L0f1a0cb0 /* f1a0c6c: 24020001 */ addiu $v0,$zero,0x1 .L0f1a0c70: -/* f1a0c70: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f1a0c70: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f1a0c74: 8f1900bc */ lw $t9,0xbc($t8) /* f1a0c78: 87220028 */ lh $v0,0x28($t9) /* f1a0c7c: 3848000a */ xori $t0,$v0,0xa @@ -5861,9 +5861,9 @@ glabel func0f1a1824 /* f1a1844: 0fc1acd3 */ jal setupParseObjectWithArg2False /* f1a1848: 24050001 */ addiu $a1,$zero,0x1 .L0f1a184c: -/* f1a184c: 3c01800b */ lui $at,0x800b +/* f1a184c: 3c01800b */ lui $at,%hi(var800ad1a8) /* f1a1850: 3c048009 */ lui $a0,%hi(var80088ad8) -/* f1a1854: ac20d1a8 */ sw $zero,-0x2e58($at) +/* f1a1854: ac20d1a8 */ sw $zero,%lo(var800ad1a8)($at) /* f1a1858: 0fc6875a */ jal func0f1a1d68 /* f1a185c: 90848ad8 */ lbu $a0,%lo(var80088ad8)($a0) /* f1a1860: 0fc68778 */ jal func0f1a1de0 @@ -6107,8 +6107,8 @@ glabel func0f1a1b54 /* f1a1bac: 00002025 */ or $a0,$zero,$zero /* f1a1bb0: 0fc127cb */ jal chrSetStageFlag /* f1a1bb4: 00402825 */ or $a1,$v0,$zero -/* f1a1bb8: 3c08800a */ lui $t0,0x800a -/* f1a1bbc: 8d08a244 */ lw $t0,-0x5dbc($t0) +/* f1a1bb8: 3c08800a */ lui $t0,%hi(g_Vars+0x284) +/* f1a1bbc: 8d08a244 */ lw $t0,%lo(g_Vars+0x284)($t0) /* f1a1bc0: 24190001 */ addiu $t9,$zero,0x1 /* f1a1bc4: 00002025 */ or $a0,$zero,$zero /* f1a1bc8: 0fc2a4ab */ jal func0f0a92ac @@ -6149,8 +6149,8 @@ glabel func0f1a1bec /* f1a1c44: 00002025 */ or $a0,$zero,$zero /* f1a1c48: 0fc127d2 */ jal chrUnsetStageFlag /* f1a1c4c: 00402825 */ or $a1,$v0,$zero -/* f1a1c50: 3c18800a */ lui $t8,0x800a -/* f1a1c54: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f1a1c50: 3c18800a */ lui $t8,%hi(g_Vars+0x284) +/* f1a1c54: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f1a1c58: 00002025 */ or $a0,$zero,$zero /* f1a1c5c: 24050001 */ addiu $a1,$zero,0x1 /* f1a1c60: 0fc127d2 */ jal chrUnsetStageFlag @@ -6158,8 +6158,8 @@ glabel func0f1a1bec /* f1a1c68: 0fc2eda7 */ jal func0f0bb69c /* f1a1c6c: 00000000 */ sll $zero,$zero,0x0 /* f1a1c70: 3c013f80 */ lui $at,0x3f80 -/* f1a1c74: 3c19800a */ lui $t9,0x800a -/* f1a1c78: 8f39a244 */ lw $t9,-0x5dbc($t9) +/* f1a1c74: 3c19800a */ lui $t9,%hi(g_Vars+0x284) +/* f1a1c78: 8f39a244 */ lw $t9,%lo(g_Vars+0x284)($t9) /* f1a1c7c: 44812000 */ mtc1 $at,$f4 /* f1a1c80: 00000000 */ sll $zero,$zero,0x0 /* f1a1c84: e72400dc */ swc1 $f4,0xdc($t9) @@ -6628,8 +6628,8 @@ glabel func0f1a2220 /* f1a2294: 24440200 */ addiu $a0,$v0,0x200 /* f1a2298: 0fc45692 */ jal func0f115a48 /* f1a229c: 24450310 */ addiu $a1,$v0,0x310 -/* f1a22a0: 3c09800a */ lui $t1,0x800a -/* f1a22a4: 8d29a244 */ lw $t1,-0x5dbc($t1) +/* f1a22a0: 3c09800a */ lui $t1,%hi(g_Vars+0x284) +/* f1a22a4: 8d29a244 */ lw $t1,%lo(g_Vars+0x284)($t1) /* f1a22a8: 24080001 */ addiu $t0,$zero,0x1 /* f1a22ac: 00002025 */ or $a0,$zero,$zero /* f1a22b0: 0fc2a4ab */ jal func0f0a92ac @@ -7014,8 +7014,8 @@ glabel func0f1a27cc /* f1a27cc: 27bdffe8 */ addiu $sp,$sp,-24 /* f1a27d0: afbf0014 */ sw $ra,0x14($sp) /* f1a27d4: 3c057f1c */ lui $a1,%hi(var7f1b9188) -/* f1a27d8: 3c06800b */ lui $a2,0x800b -/* f1a27dc: 90c6d175 */ lbu $a2,-0x2e8b($a2) +/* f1a27d8: 3c06800b */ lui $a2,%hi(var800ad174+0x1) +/* f1a27dc: 90c6d175 */ lbu $a2,%lo(var800ad174+0x1)($a2) /* f1a27e0: 0c004dad */ jal sprintf /* f1a27e4: 24a59188 */ addiu $a1,$a1,%lo(var7f1b9188) /* f1a27e8: 8fbf0014 */ lw $ra,0x14($sp) @@ -7041,8 +7041,8 @@ glabel func0f1a27f8 GLOBAL_ASM( glabel func0f1a2824 -/* f1a2824: 3c0e800b */ lui $t6,0x800b -/* f1a2828: 95cecd22 */ lhu $t6,-0x32de($t6) +/* f1a2824: 3c0e800b */ lui $t6,%hi(var800acd20+0x2) +/* f1a2828: 95cecd22 */ lhu $t6,%lo(var800acd20+0x2)($t6) /* f1a282c: 27bdffe8 */ addiu $sp,$sp,-24 /* f1a2830: afbf0014 */ sw $ra,0x14($sp) /* f1a2834: 11c0000c */ beqz $t6,.L0f1a2868 @@ -7050,8 +7050,8 @@ glabel func0f1a2824 /* f1a283c: 0fc5b9f1 */ jal langGet /* f1a2840: 240459a2 */ addiu $a0,$zero,0x59a2 /* f1a2844: 3c057f1c */ lui $a1,%hi(var7f1b9198) -/* f1a2848: 3c07800b */ lui $a3,0x800b -/* f1a284c: 94e7cd22 */ lhu $a3,-0x32de($a3) +/* f1a2848: 3c07800b */ lui $a3,%hi(var800acd20+0x2) +/* f1a284c: 94e7cd22 */ lhu $a3,%lo(var800acd20+0x2)($a3) /* f1a2850: 24a59198 */ addiu $a1,$a1,%lo(var7f1b9198) /* f1a2854: 8fa40018 */ lw $a0,0x18($sp) /* f1a2858: 0c004dad */ jal sprintf @@ -7357,11 +7357,11 @@ glabel var7f1b97c8 /* f1a2c04: adc8000c */ sw $t0,0xc($t6) /* f1a2c08: adc10010 */ sw $at,0x10($t6) /* f1a2c0c: 90620471 */ lbu $v0,0x471($v1) -/* f1a2c10: 3c0a800a */ lui $t2,0x800a +/* f1a2c10: 3c0a800a */ lui $t2,%hi(g_Vars+0x38) /* f1a2c14: 50400058 */ beqzl $v0,.L0f1a2d78 /* f1a2c18: 00001025 */ or $v0,$zero,$zero /* f1a2c1c: 80690472 */ lb $t1,0x472($v1) -/* f1a2c20: 8d4a9ff8 */ lw $t2,-0x6008($t2) +/* f1a2c20: 8d4a9ff8 */ lw $t2,%lo(g_Vars+0x38)($t2) /* f1a2c24: 2401000b */ addiu $at,$zero,0xb /* f1a2c28: 012a5823 */ subu $t3,$t1,$t2 /* f1a2c2c: a06b0472 */ sb $t3,0x472($v1) diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c index 2ae226a7f..8b09c4299 100644 --- a/src/game/game_1a3340.c +++ b/src/game/game_1a3340.c @@ -584,7 +584,7 @@ glabel var7f1b9944 /* f1a39e4: 00402025 */ or $a0,$v0,$zero /* f1a39e8: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f1a39ec: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f1a39f0: 3c01800a */ lui $at,0x800a +/* f1a39f0: 3c01800a */ lui $at,%hi(g_MenuStack+0xe28) /* f1a39f4: afa20018 */ sw $v0,0x18($sp) /* f1a39f8: 000e78c0 */ sll $t7,$t6,0x3 /* f1a39fc: 01ee7823 */ subu $t7,$t7,$t6 @@ -594,7 +594,7 @@ glabel var7f1b9944 /* f1a3a0c: 01ee7823 */ subu $t7,$t7,$t6 /* f1a3a10: 000f7900 */ sll $t7,$t7,0x4 /* f1a3a14: 002f0821 */ addu $at,$at,$t7 -/* f1a3a18: ac22ee28 */ sw $v0,-0x11d8($at) +/* f1a3a18: ac22ee28 */ sw $v0,%lo(g_MenuStack+0xe28)($at) /* f1a3a1c: 0fc41652 */ jal func0f105948 /* f1a3a20: 00402025 */ or $a0,$v0,$zero /* f1a3a24: 0fc6830c */ jal func0f1a0c30 @@ -607,8 +607,8 @@ glabel var7f1b9944 /* f1a3a40: 8fbf0014 */ lw $ra,0x14($sp) .L0f1a3a44: /* f1a3a44: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) -/* f1a3a48: 3c08800a */ lui $t0,%hi(var8009e000) -/* f1a3a4c: 2508e000 */ addiu $t0,$t0,%lo(var8009e000) +/* f1a3a48: 3c08800a */ lui $t0,0x800a +/* f1a3a4c: 2508e000 */ addiu $t0,$t0,-8192 /* f1a3a50: 0018c8c0 */ sll $t9,$t8,0x3 /* f1a3a54: 0338c823 */ subu $t9,$t9,$t8 /* f1a3a58: 0019c880 */ sll $t9,$t9,0x2 @@ -3202,11 +3202,11 @@ glabel var7f1b9978 /* f1a5fd8: 01ee7821 */ addu $t7,$t7,$t6 /* f1a5fdc: 000f78c0 */ sll $t7,$t7,0x3 /* f1a5fe0: 3c01bf80 */ lui $at,0xbf80 -/* f1a5fe4: 3c18800a */ lui $t8,%hi(var8009e000) +/* f1a5fe4: 3c18800a */ lui $t8,0x800a /* f1a5fe8: 01ee7823 */ subu $t7,$t7,$t6 /* f1a5fec: 44812000 */ mtc1 $at,$f4 /* f1a5ff0: 000f7900 */ sll $t7,$t7,0x4 -/* f1a5ff4: 2718e000 */ addiu $t8,$t8,%lo(var8009e000) +/* f1a5ff4: 2718e000 */ addiu $t8,$t8,-8192 /* f1a5ff8: 01f81821 */ addu $v1,$t7,$t8 /* f1a5ffc: 10000011 */ beqz $zero,.L0f1a6044 /* f1a6000: e4640d94 */ swc1 $f4,0xd94($v1) @@ -3219,10 +3219,10 @@ glabel var7f1b9978 /* f1a6018: 00084080 */ sll $t0,$t0,0x2 /* f1a601c: 01194021 */ addu $t0,$t0,$t9 /* f1a6020: 000840c0 */ sll $t0,$t0,0x3 -/* f1a6024: 3c09800a */ lui $t1,%hi(var8009e000) +/* f1a6024: 3c09800a */ lui $t1,0x800a /* f1a6028: 01194023 */ subu $t0,$t0,$t9 /* f1a602c: 00084100 */ sll $t0,$t0,0x4 -/* f1a6030: 2529e000 */ addiu $t1,$t1,%lo(var8009e000) +/* f1a6030: 2529e000 */ addiu $t1,$t1,-8192 /* f1a6034: 3c013f80 */ lui $at,0x3f80 /* f1a6038: 01091821 */ addu $v1,$t0,$t1 /* f1a603c: 44816000 */ mtc1 $at,$f12 @@ -3263,7 +3263,7 @@ glabel var7f1b9978 .L0f1a60bc: /* f1a60bc: 8d6b1448 */ lw $t3,%lo(g_MpPlayerNum)($t3) /* f1a60c0: 44800000 */ mtc1 $zero,$f0 -/* f1a60c4: 3c0e800a */ lui $t6,%hi(var8009e000) +/* f1a60c4: 3c0e800a */ lui $t6,0x800a /* f1a60c8: 000b60c0 */ sll $t4,$t3,0x3 /* f1a60cc: 018b6023 */ subu $t4,$t4,$t3 /* f1a60d0: 000c6080 */ sll $t4,$t4,0x2 @@ -3272,7 +3272,7 @@ glabel var7f1b9978 /* f1a60dc: 018b6023 */ subu $t4,$t4,$t3 /* f1a60e0: 000c6100 */ sll $t4,$t4,0x4 /* f1a60e4: 258d0840 */ addiu $t5,$t4,0x840 -/* f1a60e8: 25cee000 */ addiu $t6,$t6,%lo(var8009e000) +/* f1a60e8: 25cee000 */ addiu $t6,$t6,-8192 /* f1a60ec: 44057000 */ mfc1 $a1,$f14 /* f1a60f0: 44061000 */ mfc1 $a2,$f2 /* f1a60f4: 240f0007 */ addiu $t7,$zero,0x7 @@ -3293,10 +3293,10 @@ glabel var7f1b9978 /* f1a6130: 0019c880 */ sll $t9,$t9,0x2 /* f1a6134: 0338c821 */ addu $t9,$t9,$t8 /* f1a6138: 0019c8c0 */ sll $t9,$t9,0x3 -/* f1a613c: 3c08800a */ lui $t0,%hi(var8009e000) +/* f1a613c: 3c08800a */ lui $t0,0x800a /* f1a6140: 0338c823 */ subu $t9,$t9,$t8 /* f1a6144: 0019c900 */ sll $t9,$t9,0x4 -/* f1a6148: 2508e000 */ addiu $t0,$t0,%lo(var8009e000) +/* f1a6148: 2508e000 */ addiu $t0,$t0,-8192 /* f1a614c: 03281821 */ addu $v1,$t9,$t0 /* f1a6150: 3c017f1c */ lui $at,%hi(var7f1b9970) /* f1a6154: e46a0d50 */ swc1 $f10,0xd50($v1) @@ -3316,8 +3316,8 @@ glabel var7f1b9978 /* f1a6188: 14a10012 */ bne $a1,$at,.L0f1a61d4 /* f1a618c: 3c0a8007 */ lui $t2,%hi(g_MpPlayerNum) /* f1a6190: 8d4a1448 */ lw $t2,%lo(g_MpPlayerNum)($t2) -/* f1a6194: 3c0c800a */ lui $t4,%hi(var8009e000) -/* f1a6198: 258ce000 */ addiu $t4,$t4,%lo(var8009e000) +/* f1a6194: 3c0c800a */ lui $t4,0x800a +/* f1a6198: 258ce000 */ addiu $t4,$t4,-8192 /* f1a619c: 000a58c0 */ sll $t3,$t2,0x3 /* f1a61a0: 016a5823 */ subu $t3,$t3,$t2 /* f1a61a4: 000b5880 */ sll $t3,$t3,0x2 @@ -3335,8 +3335,8 @@ glabel var7f1b9978 .L0f1a61d4: /* f1a61d4: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f1a61d8: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f1a61dc: 3c19800a */ lui $t9,%hi(var8009e000) -/* f1a61e0: 2739e000 */ addiu $t9,$t9,%lo(var8009e000) +/* f1a61dc: 3c19800a */ lui $t9,0x800a +/* f1a61e0: 2739e000 */ addiu $t9,$t9,-8192 /* f1a61e4: 000fc0c0 */ sll $t8,$t7,0x3 /* f1a61e8: 030fc023 */ subu $t8,$t8,$t7 /* f1a61ec: 0018c080 */ sll $t8,$t8,0x2 @@ -3633,7 +3633,7 @@ glabel var7f1b9998 /* f1a65b8: 3c088007 */ lui $t0,%hi(g_MpPlayerNum) /* f1a65bc: 8d081448 */ lw $t0,%lo(g_MpPlayerNum)($t0) /* f1a65c0: 8fa40034 */ lw $a0,0x34($sp) -/* f1a65c4: 3c01800a */ lui $at,0x800a +/* f1a65c4: 3c01800a */ lui $at,%hi(g_MenuStack+0xe28) /* f1a65c8: 000848c0 */ sll $t1,$t0,0x3 /* f1a65cc: 01284823 */ subu $t1,$t1,$t0 /* f1a65d0: 00094880 */ sll $t1,$t1,0x2 @@ -3643,7 +3643,7 @@ glabel var7f1b9998 /* f1a65e0: 00094900 */ sll $t1,$t1,0x4 /* f1a65e4: 00290821 */ addu $at,$at,$t1 /* f1a65e8: 0fc41652 */ jal func0f105948 -/* f1a65ec: ac24ee28 */ sw $a0,-0x11d8($at) +/* f1a65ec: ac24ee28 */ sw $a0,%lo(g_MenuStack+0xe28)($at) /* f1a65f0: 0fc54bc7 */ jal optionsGetScreenRatio /* f1a65f4: 00000000 */ sll $zero,$zero,0x0 /* f1a65f8: 24010001 */ addiu $at,$zero,0x1 @@ -3658,10 +3658,10 @@ glabel var7f1b9998 /* f1a661c: 000b5880 */ sll $t3,$t3,0x2 /* f1a6620: 016a5821 */ addu $t3,$t3,$t2 /* f1a6624: 000b58c0 */ sll $t3,$t3,0x3 -/* f1a6628: 3c0c800a */ lui $t4,%hi(var8009e000) +/* f1a6628: 3c0c800a */ lui $t4,0x800a /* f1a662c: 016a5823 */ subu $t3,$t3,$t2 /* f1a6630: 000b5900 */ sll $t3,$t3,0x4 -/* f1a6634: 258ce000 */ addiu $t4,$t4,%lo(var8009e000) +/* f1a6634: 258ce000 */ addiu $t4,$t4,-8192 /* f1a6638: 016c1021 */ addu $v0,$t3,$t4 /* f1a663c: e4400d78 */ swc1 $f0,0xd78($v0) /* f1a6640: 10000010 */ beqz $zero,.L0f1a6684 @@ -3675,10 +3675,10 @@ glabel var7f1b9998 /* f1a665c: 0018c080 */ sll $t8,$t8,0x2 /* f1a6660: 030dc021 */ addu $t8,$t8,$t5 /* f1a6664: 0018c0c0 */ sll $t8,$t8,0x3 -/* f1a6668: 3c0e800a */ lui $t6,%hi(var8009e000) +/* f1a6668: 3c0e800a */ lui $t6,0x800a /* f1a666c: 030dc023 */ subu $t8,$t8,$t5 /* f1a6670: 0018c100 */ sll $t8,$t8,0x4 -/* f1a6674: 25cee000 */ addiu $t6,$t6,%lo(var8009e000) +/* f1a6674: 25cee000 */ addiu $t6,$t6,-8192 /* f1a6678: 030e1021 */ addu $v0,$t8,$t6 /* f1a667c: e4400d78 */ swc1 $f0,0xd78($v0) /* f1a6680: e4400d50 */ swc1 $f0,0xd50($v0) @@ -3692,7 +3692,7 @@ glabel var7f1b9998 .L0f1a669c: /* f1a669c: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f1a66a0: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) -/* f1a66a4: 3c02800a */ lui $v0,%hi(g_MenuStack) +/* f1a66a4: 3c02800a */ lui $v0,%hi(g_MenuStack+0x4f8) /* f1a66a8: 000fc8c0 */ sll $t9,$t7,0x3 /* f1a66ac: 032fc823 */ subu $t9,$t9,$t7 /* f1a66b0: 0019c880 */ sll $t9,$t9,0x2 @@ -3701,7 +3701,7 @@ glabel var7f1b9998 /* f1a66bc: 032fc823 */ subu $t9,$t9,$t7 /* f1a66c0: 0019c900 */ sll $t9,$t9,0x4 /* f1a66c4: 00591021 */ addu $v0,$v0,$t9 -/* f1a66c8: 8c42e4f8 */ lw $v0,%lo(g_MenuStack)($v0) +/* f1a66c8: 8c42e4f8 */ lw $v0,%lo(g_MenuStack+0x4f8)($v0) /* f1a66cc: 50400034 */ beqzl $v0,.L0f1a67a0 /* f1a66d0: 8fbf0014 */ lw $ra,0x14($sp) /* f1a66d4: 8c480000 */ lw $t0,0x0($v0) @@ -3717,8 +3717,8 @@ glabel var7f1b9998 /* f1a66fc: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f1a6700: 3c098007 */ lui $t1,%hi(g_MpPlayerNum) /* f1a6704: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1) -/* f1a6708: 3c0b800a */ lui $t3,%hi(var8009e000) -/* f1a670c: 256be000 */ addiu $t3,$t3,%lo(var8009e000) +/* f1a6708: 3c0b800a */ lui $t3,0x800a +/* f1a670c: 256be000 */ addiu $t3,$t3,-8192 /* f1a6710: 000950c0 */ sll $t2,$t1,0x3 /* f1a6714: 01495023 */ subu $t2,$t2,$t1 /* f1a6718: 000a5080 */ sll $t2,$t2,0x2 @@ -3745,10 +3745,10 @@ glabel var7f1b9998 /* f1a6768: 46105002 */ mul.s $f0,$f10,$f16 /* f1a676c: 01ee7821 */ addu $t7,$t7,$t6 /* f1a6770: 000f78c0 */ sll $t7,$t7,0x3 -/* f1a6774: 3c19800a */ lui $t9,%hi(var8009e000) +/* f1a6774: 3c19800a */ lui $t9,0x800a /* f1a6778: 01ee7823 */ subu $t7,$t7,$t6 /* f1a677c: 000f7900 */ sll $t7,$t7,0x4 -/* f1a6780: 2739e000 */ addiu $t9,$t9,%lo(var8009e000) +/* f1a6780: 2739e000 */ addiu $t9,$t9,-8192 /* f1a6784: 44801000 */ mtc1 $zero,$f2 /* f1a6788: 01f91021 */ addu $v0,$t7,$t9 /* f1a678c: e4400d8c */ swc1 $f0,0xd8c($v0) @@ -4660,7 +4660,7 @@ glabel var7f1b99d8 .L0f1a7410: /* f1a7410: 8d081448 */ lw $t0,%lo(g_MpPlayerNum)($t0) /* f1a7414: 44800000 */ mtc1 $zero,$f0 -/* f1a7418: 3c0a800a */ lui $t2,%hi(var8009e000) +/* f1a7418: 3c0a800a */ lui $t2,0x800a /* f1a741c: 000848c0 */ sll $t1,$t0,0x3 /* f1a7420: 01284823 */ subu $t1,$t1,$t0 /* f1a7424: 00094880 */ sll $t1,$t1,0x2 @@ -4668,7 +4668,7 @@ glabel var7f1b99d8 /* f1a742c: 000948c0 */ sll $t1,$t1,0x3 /* f1a7430: 01284823 */ subu $t1,$t1,$t0 /* f1a7434: 00094900 */ sll $t1,$t1,0x4 -/* f1a7438: 254ae000 */ addiu $t2,$t2,%lo(var8009e000) +/* f1a7438: 254ae000 */ addiu $t2,$t2,-8192 /* f1a743c: 012a1821 */ addu $v1,$t1,$t2 /* f1a7440: e4600d88 */ swc1 $f0,0xd88($v1) /* f1a7444: e4600d60 */ swc1 $f0,0xd60($v1) @@ -4683,8 +4683,8 @@ glabel var7f1b99d8 .L0f1a7468: /* f1a7468: 3c0b8007 */ lui $t3,%hi(g_MpPlayerNum) /* f1a746c: 8d6b1448 */ lw $t3,%lo(g_MpPlayerNum)($t3) -/* f1a7470: 3c0d800a */ lui $t5,%hi(var8009e000) -/* f1a7474: 25ade000 */ addiu $t5,$t5,%lo(var8009e000) +/* f1a7470: 3c0d800a */ lui $t5,0x800a +/* f1a7474: 25ade000 */ addiu $t5,$t5,-8192 /* f1a7478: 000b60c0 */ sll $t4,$t3,0x3 /* f1a747c: 018b6023 */ subu $t4,$t4,$t3 /* f1a7480: 000c6080 */ sll $t4,$t4,0x2 diff --git a/src/game/lang.c b/src/game/lang.c index a0537203a..89fdc8006 100644 --- a/src/game/lang.c +++ b/src/game/lang.c @@ -228,7 +228,7 @@ glabel func0f16e3fc /* f16e5ec: 010e1021 */ addu $v0,$t0,$t6 .L0f16e5f0: /* f16e5f0: 11000032 */ beqz $t0,.L0f16e6bc -/* f16e5f4: 3c02800b */ lui $v0,%hi(var800aabb4) +/* f16e5f4: 3c02800b */ lui $v0,0x800b /* f16e5f8: 05600030 */ bltz $t3,.L0f16e6bc /* f16e5fc: 000b1840 */ sll $v1,$t3,0x1 /* f16e600: 01831021 */ addu $v0,$t4,$v1 @@ -279,7 +279,7 @@ glabel func0f16e3fc /* f16e6b4: 10000002 */ beqz $zero,.L0f16e6c0 /* f16e6b8: 01191021 */ addu $v0,$t0,$t9 .L0f16e6bc: -/* f16e6bc: 8c42abb4 */ lw $v0,%lo(var800aabb4)($v0) +/* f16e6bc: 8c42abb4 */ lw $v0,-21580($v0) .L0f16e6c0: /* f16e6c0: 8fbf001c */ lw $ra,0x1c($sp) .L0f16e6c4: diff --git a/src/game/mplayer.c b/src/game/mplayer.c index 41c9ed8ae..8b02b6f6d 100644 --- a/src/game/mplayer.c +++ b/src/game/mplayer.c @@ -219,9 +219,9 @@ glabel func0f187864 /* f187924: 24040005 */ addiu $a0,$zero,0x5 /* f187928: 8fbf001c */ lw $ra,0x1c($sp) /* f18792c: 240b0001 */ addiu $t3,$zero,0x1 -/* f187930: 3c01800a */ lui $at,0x800a +/* f187930: 3c01800a */ lui $at,%hi(g_Vars+0x470) /* f187934: 8fb00018 */ lw $s0,0x18($sp) -/* f187938: ac2ba430 */ sw $t3,-0x5bd0($at) +/* f187938: ac2ba430 */ sw $t3,%lo(g_Vars+0x470)($at) /* f18793c: 03e00008 */ jr $ra /* f187940: 27bd0030 */ addiu $sp,$sp,0x30 ); @@ -275,19 +275,19 @@ glabel var7f1b8d94 /* f1879bc: aeb8031c */ sw $t8,0x31c($s5) .L0f1879c0: /* f1879c0: 8eb90298 */ lw $t9,0x298($s5) -/* f1879c4: 3c04800b */ lui $a0,0x800b -/* f1879c8: 2484ca38 */ addiu $a0,$a0,-13768 +/* f1879c4: 3c04800b */ lui $a0,%hi(g_MpPlayers+0x280) +/* f1879c8: 2484ca38 */ addiu $a0,$a0,%lo(g_MpPlayers+0x280) /* f1879cc: 07210003 */ bgez $t9,.L0f1879dc /* f1879d0: 27a20048 */ addiu $v0,$sp,0x48 /* f1879d4: 8ea8029c */ lw $t0,0x29c($s5) /* f1879d8: 0500008d */ bltz $t0,.L0f187c10 .L0f1879dc: -/* f1879dc: 3c05800b */ lui $a1,0x800b -/* f1879e0: 3c06800b */ lui $a2,0x800b +/* f1879dc: 3c05800b */ lui $a1,%hi(g_MpPlayers+0x320) +/* f1879e0: 3c06800b */ lui $a2,%hi(g_MpPlayers+0xa0) /* f1879e4: 3c14800b */ lui $s4,%hi(g_MpPlayers) /* f1879e8: 2694c7b8 */ addiu $s4,$s4,%lo(g_MpPlayers) -/* f1879ec: 24c6c858 */ addiu $a2,$a2,-14248 -/* f1879f0: 24a5cad8 */ addiu $a1,$a1,-13608 +/* f1879ec: 24c6c858 */ addiu $a2,$a2,%lo(g_MpPlayers+0xa0) +/* f1879f0: 24a5cad8 */ addiu $a1,$a1,%lo(g_MpPlayers+0x320) /* f1879f4: 24070002 */ addiu $a3,$zero,0x2 /* f1879f8: 00805825 */ or $t3,$a0,$zero /* f1879fc: 00406025 */ or $t4,$v0,$zero @@ -443,8 +443,8 @@ glabel var7f1b8d94 /* f187c18: 00008025 */ or $s0,$zero,$zero /* f187c1c: 241300a0 */ addiu $s3,$zero,0xa0 .L0f187c20: -/* f187c20: 3c0c800b */ lui $t4,0x800b -/* f187c24: 958ccb9e */ lhu $t4,-0x3462($t4) +/* f187c20: 3c0c800b */ lui $t4,%hi(g_MpSetup+0x16) +/* f187c24: 958ccb9e */ lhu $t4,%lo(g_MpSetup+0x16)($t4) /* f187c28: 240d0001 */ addiu $t5,$zero,0x1 /* f187c2c: 020d7004 */ sllv $t6,$t5,$s0 /* f187c30: 018e7824 */ and $t7,$t4,$t6 @@ -503,8 +503,8 @@ glabel var7f1b8d94 /* f187cf0: 26310004 */ addiu $s1,$s1,0x4 /* f187cf4: 1612ffeb */ bne $s0,$s2,.L0f187ca4 /* f187cf8: ae20fffc */ sw $zero,-0x4($s1) -/* f187cfc: 3c01800b */ lui $at,0x800b -/* f187d00: a020cba6 */ sb $zero,-0x345a($at) +/* f187cfc: 3c01800b */ lui $at,%hi(g_MpSetup+0x1e) +/* f187d00: a020cba6 */ sb $zero,%lo(g_MpSetup+0x1e)($at) /* f187d04: 8eb80318 */ lw $t8,0x318($s5) /* f187d08: 3c138008 */ lui $s3,%hi(var80087264) /* f187d0c: 26737264 */ addiu $s3,$s3,%lo(var80087264) @@ -537,12 +537,12 @@ glabel var7f1b8d94 /* f187d6c: ae790000 */ sw $t9,0x0($s3) .L0f187d70: /* f187d70: 2408ffff */ addiu $t0,$zero,-1 -/* f187d74: 3c01800b */ lui $at,0x800b -/* f187d78: ac28cc24 */ sw $t0,-0x33dc($at) +/* f187d74: 3c01800b */ lui $at,%hi(var800acc24) +/* f187d78: ac28cc24 */ sw $t0,%lo(var800acc24)($at) .L0f187d7c: /* f187d7c: 3c02800b */ lui $v0,%hi(g_ActiveMenuMpBotCommands) -/* f187d80: 3c03800b */ lui $v1,0x800b -/* f187d84: 2463cb81 */ addiu $v1,$v1,-13439 +/* f187d80: 3c03800b */ lui $v1,%hi(g_ActiveMenuMpBotCommands+0x9) +/* f187d84: 2463cb81 */ addiu $v1,$v1,%lo(g_ActiveMenuMpBotCommands+0x9) /* f187d88: 2442cb78 */ addiu $v0,$v0,%lo(g_ActiveMenuMpBotCommands) /* f187d8c: 24040004 */ addiu $a0,$zero,0x4 .L0f187d90: @@ -561,8 +561,8 @@ glabel var7f1b8d94 /* f187dc0: a04a0002 */ sb $t2,0x2($v0) /* f187dc4: a04b0003 */ sb $t3,0x3($v0) /* f187dc8: a04d0005 */ sb $t5,0x5($v0) -/* f187dcc: 3c0c800b */ lui $t4,0x800b -/* f187dd0: 918ccb98 */ lbu $t4,-0x3468($t4) +/* f187dcc: 3c0c800b */ lui $t4,%hi(g_MpSetup+0x10) +/* f187dd0: 918ccb98 */ lbu $t4,%lo(g_MpSetup+0x10)($t4) /* f187dd4: 258effff */ addiu $t6,$t4,-1 /* f187dd8: 2dc10005 */ sltiu $at,$t6,0x5 /* f187ddc: 1020001b */ beqz $at,.L0f187e4c @@ -892,10 +892,10 @@ glabel func0f188210 /* f188230: a04e0011 */ sb $t6,0x11($v0) /* f188234: ac4f000c */ sw $t7,0xc($v0) /* f188238: 2418000a */ addiu $t8,$zero,0xa -/* f18823c: 3c01800a */ lui $at,0x800a +/* f18823c: 3c01800a */ lui $at,%hi(g_Vars+0x484) /* f188240: afb00018 */ sw $s0,0x18($sp) /* f188244: 0fc61ffb */ jal func0f187fec -/* f188248: ac38a444 */ sw $t8,-0x5bbc($at) +/* f188248: ac38a444 */ sw $t8,%lo(g_Vars+0x484)($at) /* f18824c: 3c04800b */ lui $a0,%hi(g_MpSetup) /* f188250: 2484cb88 */ addiu $a0,$a0,%lo(g_MpSetup) /* f188254: 3c057f1c */ lui $a1,%hi(var7f1b8a34) @@ -969,9 +969,9 @@ glabel func0f188210 /* f18834c: 54a6fff9 */ bnel $a1,$a2,.L0f188334 /* f188350: 00001025 */ or $v0,$zero,$zero /* f188354: 8fbf001c */ lw $ra,0x1c($sp) -/* f188358: 3c01800b */ lui $at,0x800b +/* f188358: 3c01800b */ lui $at,%hi(g_MpSetup+0x16) /* f18835c: 8fb00018 */ lw $s0,0x18($sp) -/* f188360: a420cb9e */ sh $zero,-0x3462($at) +/* f188360: a420cb9e */ sh $zero,%lo(g_MpSetup+0x16)($at) /* f188364: 03e00008 */ jr $ra /* f188368: 27bd0020 */ addiu $sp,$sp,0x20 ); @@ -994,8 +994,8 @@ glabel func0f18836c /* f1883a0: 0c004c4c */ jal strcpy /* f1883a4: 00402825 */ or $a1,$v0,$zero .L0f1883a8: -/* f1883a8: 3c11800b */ lui $s1,0x800b -/* f1883ac: 2631cbb0 */ addiu $s1,$s1,-13392 +/* f1883a8: 3c11800b */ lui $s1,%hi(g_MpSetup+0x28) +/* f1883ac: 2631cbb0 */ addiu $s1,$s1,%lo(g_MpSetup+0x28) /* f1883b0: 00008025 */ or $s0,$zero,$zero .L0f1883b4: /* f1883b4: 922f0000 */ lbu $t7,0x0($s1) @@ -1044,8 +1044,8 @@ glabel func0f18836c GLOBAL_ASM( glabel func0f18844c /* f18844c: 3c04800b */ lui $a0,%hi(g_MpSetup) -/* f188450: 3c0e800b */ lui $t6,0x800b -/* f188454: 91cecc10 */ lbu $t6,-0x33f0($t6) +/* f188450: 3c0e800b */ lui $t6,%hi(g_MpSetup+0x88) +/* f188454: 91cecc10 */ lbu $t6,%lo(g_MpSetup+0x88)($t6) /* f188458: 2484cb88 */ addiu $a0,$a0,%lo(g_MpSetup) /* f18845c: 94820014 */ lhu $v0,0x14($a0) /* f188460: 24060005 */ addiu $a2,$zero,0x5 @@ -1058,12 +1058,12 @@ glabel func0f18844c /* f18847c: 24070004 */ addiu $a3,$zero,0x4 /* f188480: 00002025 */ or $a0,$zero,$zero /* f188484: 10400002 */ beqz $v0,.L0f188490 -/* f188488: 3c05800b */ lui $a1,0x800b +/* f188488: 3c05800b */ lui $a1,%hi(g_MpSetup+0x16) /* f18848c: 14e20026 */ bne $a3,$v0,.L0f188528 .L0f188490: /* f188490: 24070004 */ addiu $a3,$zero,0x4 /* f188494: 00001025 */ or $v0,$zero,$zero -/* f188498: 94a5cb9e */ lhu $a1,-0x3462($a1) +/* f188498: 94a5cb9e */ lhu $a1,%lo(g_MpSetup+0x16)($a1) /* f18849c: 240f0001 */ addiu $t7,$zero,0x1 .L0f1884a0: /* f1884a0: 008fc004 */ sllv $t8,$t7,$a0 @@ -1112,8 +1112,8 @@ glabel func0f18844c GLOBAL_ASM( glabel func0f188530 -/* f188530: 3c02800b */ lui $v0,0x800b -/* f188534: 9042cb9a */ lbu $v0,-0x3466($v0) +/* f188530: 3c02800b */ lui $v0,%hi(g_MpSetup+0x12) +/* f188534: 9042cb9a */ lbu $v0,%lo(g_MpSetup+0x12)($v0) /* f188538: 27bdffe8 */ addiu $sp,$sp,-24 /* f18853c: afbf0014 */ sw $ra,0x14($sp) /* f188540: 2841003c */ slti $at,$v0,0x3c @@ -1131,8 +1131,8 @@ glabel func0f188530 /* f18856c: 0fc5b372 */ jal setVar80084028 /* f188570: 24840e10 */ addiu $a0,$a0,0xe10 .L0f188574: -/* f188574: 3c02800b */ lui $v0,0x800b -/* f188578: 9042cb9b */ lbu $v0,-0x3465($v0) +/* f188574: 3c02800b */ lui $v0,%hi(g_MpSetup+0x13) +/* f188578: 9042cb9b */ lbu $v0,%lo(g_MpSetup+0x13)($v0) /* f18857c: 28410064 */ slti $at,$v0,0x64 /* f188580: 14200005 */ bnez $at,.L0f188598 /* f188584: 00000000 */ sll $zero,$zero,0x0 @@ -1144,8 +1144,8 @@ glabel func0f188530 /* f188598: 0fc5b375 */ jal setVar8008402c /* f18859c: 24440001 */ addiu $a0,$v0,0x1 .L0f1885a0: -/* f1885a0: 3c0e800b */ lui $t6,0x800b -/* f1885a4: 95cecb9c */ lhu $t6,-0x3464($t6) +/* f1885a0: 3c0e800b */ lui $t6,%hi(g_MpSetup+0x14) +/* f1885a4: 95cecb9c */ lhu $t6,%lo(g_MpSetup+0x14)($t6) /* f1885a8: 29c10190 */ slti $at,$t6,0x190 /* f1885ac: 14200005 */ bnez $at,.L0f1885c4 /* f1885b0: 00000000 */ sll $zero,$zero,0x0 @@ -1380,8 +1380,8 @@ glabel func0f1885e4 /* f1888e0: 2631cc20 */ addiu $s1,$s1,%lo(g_MpLockPlayerNum) /* f1888e4: a22d0001 */ sb $t5,0x1($s1) /* f1888e8: a23f0002 */ sb $ra,0x2($s1) -/* f1888ec: 3c19800b */ lui $t9,0x800b -/* f1888f0: 9339cc10 */ lbu $t9,-0x33f0($t9) +/* f1888ec: 3c19800b */ lui $t9,%hi(g_MpSetup+0x88) +/* f1888f0: 9339cc10 */ lbu $t9,%lo(g_MpSetup+0x88)($t9) /* f1888f4: 24010003 */ addiu $at,$zero,0x3 /* f1888f8: 57210005 */ bnel $t9,$at,.L0f188910 /* f1888fc: 8fbf002c */ lw $ra,0x2c($sp) @@ -1716,10 +1716,10 @@ glabel mpSetWeaponSlot /* f188d68: 2610000a */ addiu $s0,$s0,0xa .L0f188d6c: /* f188d6c: 8faf0028 */ lw $t7,0x28($sp) -/* f188d70: 3c01800b */ lui $at,0x800b +/* f188d70: 3c01800b */ lui $at,%hi(g_MpSetup+0x18) /* f188d74: 8fbf0024 */ lw $ra,0x24($sp) /* f188d78: 002f0821 */ addu $at,$at,$t7 -/* f188d7c: a031cba0 */ sb $s1,-0x3460($at) +/* f188d7c: a031cba0 */ sb $s1,%lo(g_MpSetup+0x18)($at) /* f188d80: 8fb1001c */ lw $s1,0x1c($sp) /* f188d84: 8fb00018 */ lw $s0,0x18($sp) /* f188d88: 8fb20020 */ lw $s2,0x20($sp) @@ -2026,7 +2026,7 @@ glabel func0f18913c /* f189154: afb40028 */ sw $s4,0x28($sp) /* f189158: 25ef73f0 */ addiu $t7,$t7,%lo(mpweaponsetstable) /* f18915c: 3c158008 */ lui $s5,%hi(mpweaponstable) -/* f189160: 3c17800b */ lui $s7,0x800b +/* f189160: 3c17800b */ lui $s7,%hi(g_MpSetup+0x6) /* f189164: 00007100 */ sll $t6,$zero,0x4 /* f189168: afbf003c */ sw $ra,0x3c($sp) /* f18916c: afb30024 */ sw $s3,0x24($sp) @@ -2035,7 +2035,7 @@ glabel func0f18913c /* f189178: afb00018 */ sw $s0,0x18($sp) /* f18917c: afa00040 */ sw $zero,0x40($sp) /* f189180: 01cff021 */ addu $s8,$t6,$t7 -/* f189184: 26f7cb8e */ addiu $s7,$s7,-13426 +/* f189184: 26f7cb8e */ addiu $s7,$s7,%lo(g_MpSetup+0x6) /* f189188: 26b57268 */ addiu $s5,$s5,%lo(mpweaponstable) /* f18918c: 2414005b */ addiu $s4,$zero,0x5b /* f189190: 2416000a */ addiu $s6,$zero,0xa @@ -2258,8 +2258,8 @@ glabel func0f1892dc .L0f1894ac: /* f1894ac: 10a0fff2 */ beqz $a1,.L0f189478 /* f1894b0: 24630001 */ addiu $v1,$v1,0x1 -/* f1894b4: 3c0e800b */ lui $t6,0x800b -/* f1894b8: 25cecb8e */ addiu $t6,$t6,-13426 +/* f1894b4: 3c0e800b */ lui $t6,%hi(g_MpSetup+0x6) +/* f1894b8: 25cecb8e */ addiu $t6,$t6,%lo(g_MpSetup+0x6) /* f1894bc: 254a0001 */ addiu $t2,$t2,0x1 /* f1894c0: 256b0001 */ addiu $t3,$t3,0x1 /* f1894c4: 154effd4 */ bne $t2,$t6,.L0f189418 @@ -2382,7 +2382,7 @@ glabel func0f18961c bool mpIsPaused(void) { - if (PLAYERCOUNT() == 1 && g_Vars.mplayerisrunning && g_MenuStack[g_Vars.currentplayerstats->mpindex].unk00) { + if (PLAYERCOUNT() == 1 && g_Vars.mplayerisrunning && g_MenuStack[g_Vars.currentplayerstats->mpindex].unk4f8) { return true; } @@ -2400,8 +2400,8 @@ void mpSetPaused(u8 pause) GLOBAL_ASM( glabel func0f18973c -/* f18973c: 3c02800b */ lui $v0,0x800b -/* f189740: 9042cba6 */ lbu $v0,-0x345a($v0) +/* f18973c: 3c02800b */ lui $v0,%hi(g_MpSetup+0x1e) +/* f189740: 9042cba6 */ lbu $v0,%lo(g_MpSetup+0x1e)($v0) /* f189744: 27bdff60 */ addiu $sp,$sp,-160 /* f189748: 24010001 */ addiu $at,$zero,0x1 /* f18974c: afbf0034 */ sw $ra,0x34($sp) @@ -2439,8 +2439,8 @@ glabel func0f18973c /* f1897cc: 0c002f22 */ jal func0000bc88 /* f1897d0: a7a20042 */ sh $v0,0x42($sp) /* f1897d4: 87a80042 */ lh $t0,0x42($sp) -/* f1897d8: 3c0a800a */ lui $t2,0x800a -/* f1897dc: 8d4aa248 */ lw $t2,-0x5db8($t2) +/* f1897d8: 3c0a800a */ lui $t2,%hi(g_Vars+0x288) +/* f1897dc: 8d4aa248 */ lw $t2,%lo(g_Vars+0x288)($t2) /* f1897e0: 04410003 */ bgez $v0,.L0f1897f0 /* f1897e4: 0002c843 */ sra $t9,$v0,0x1 /* f1897e8: 24410001 */ addiu $at,$v0,0x1 @@ -2449,7 +2449,7 @@ glabel func0f18973c /* f1897f0: 03284821 */ addu $t1,$t9,$t0 /* f1897f4: afa90094 */ sw $t1,0x94($sp) /* f1897f8: 8d4b0070 */ lw $t3,0x70($t2) -/* f1897fc: 3c0d800a */ lui $t5,%hi(g_MenuStack) +/* f1897fc: 3c0d800a */ lui $t5,%hi(g_MenuStack+0x4f8) /* f189800: 000b60c0 */ sll $t4,$t3,0x3 /* f189804: 018b6023 */ subu $t4,$t4,$t3 /* f189808: 000c6080 */ sll $t4,$t4,0x2 @@ -2458,7 +2458,7 @@ glabel func0f18973c /* f189814: 018b6023 */ subu $t4,$t4,$t3 /* f189818: 000c6100 */ sll $t4,$t4,0x4 /* f18981c: 01ac6821 */ addu $t5,$t5,$t4 -/* f189820: 8dade4f8 */ lw $t5,%lo(g_MenuStack)($t5) +/* f189820: 8dade4f8 */ lw $t5,%lo(g_MenuStack+0x4f8)($t5) /* f189824: 11a00006 */ beqz $t5,.L0f189840 /* f189828: 00000000 */ sll $zero,$zero,0x0 /* f18982c: 0c002f44 */ jal func0000bd10 @@ -2657,8 +2657,8 @@ glabel func0f18973c /* f189b04: afb80010 */ sw $t8,0x10($sp) /* f189b08: 0fc55b92 */ jal func0f156e48 /* f189b0c: afa90020 */ sw $t1,0x20($sp) -/* f189b10: 3c0b800a */ lui $t3,0x800a -/* f189b14: 8d6ba244 */ lw $t3,-0x5dbc($t3) +/* f189b10: 3c0b800a */ lui $t3,%hi(g_Vars+0x284) +/* f189b14: 8d6ba244 */ lw $t3,%lo(g_Vars+0x284)($t3) /* f189b18: afa200a0 */ sw $v0,0xa0($sp) /* f189b1c: 8d6d1c0c */ lw $t5,0x1c0c($t3) /* f189b20: 19a00051 */ blez $t5,.L0f189c68 @@ -2682,8 +2682,8 @@ glabel func0f18973c /* f189b64: 0c002f22 */ jal func0000bc88 /* f189b68: a7a20042 */ sh $v0,0x42($sp) /* f189b6c: 87a90042 */ lh $t1,0x42($sp) -/* f189b70: 3c0d800a */ lui $t5,0x800a -/* f189b74: 8dada244 */ lw $t5,-0x5dbc($t5) +/* f189b70: 3c0d800a */ lui $t5,%hi(g_Vars+0x284) +/* f189b74: 8dada244 */ lw $t5,%lo(g_Vars+0x284)($t5) /* f189b78: 04410003 */ bgez $v0,.L0f189b88 /* f189b7c: 00025043 */ sra $t2,$v0,0x1 /* f189b80: 24410001 */ addiu $at,$v0,0x1 @@ -2749,10 +2749,10 @@ glabel func0f18973c .L0f189c68: /* f189c68: 0fc54de0 */ jal func0f153780 /* f189c6c: 8fa400a0 */ lw $a0,0xa0($sp) -/* f189c70: 3c0f800a */ lui $t7,0x800a -/* f189c74: 8defa248 */ lw $t7,-0x5db8($t7) +/* f189c70: 3c0f800a */ lui $t7,%hi(g_Vars+0x288) +/* f189c74: 8defa248 */ lw $t7,%lo(g_Vars+0x288)($t7) /* f189c78: afa200a0 */ sw $v0,0xa0($sp) -/* f189c7c: 3c01800a */ lui $at,0x800a +/* f189c7c: 3c01800a */ lui $at,%hi(g_MenuStack+0x83c) /* f189c80: 8df90070 */ lw $t9,0x70($t7) /* f189c84: 2418000a */ addiu $t8,$zero,0xa /* f189c88: 001940c0 */ sll $t0,$t9,0x3 @@ -2763,7 +2763,7 @@ glabel func0f18973c /* f189c9c: 01194023 */ subu $t0,$t0,$t9 /* f189ca0: 00084100 */ sll $t0,$t0,0x4 /* f189ca4: 00280821 */ addu $at,$at,$t0 -/* f189ca8: a038e83c */ sb $t8,-0x17c4($at) +/* f189ca8: a038e83c */ sb $t8,%lo(g_MenuStack+0x83c)($at) .L0f189cac: /* f189cac: 8fbf0034 */ lw $ra,0x34($sp) .L0f189cb0: @@ -3514,8 +3514,8 @@ glabel var7f1b8db0 /* f18a658: afa201e0 */ sw $v0,0x1e0($sp) /* f18a65c: afa001e0 */ sw $zero,0x1e0($sp) .L0f18a660: -/* f18a660: 3c0d800a */ lui $t5,0x800a -/* f18a664: 8dada24c */ lw $t5,-0x5db4($t5) +/* f18a660: 3c0d800a */ lui $t5,%hi(g_Vars+0x28c) +/* f18a664: 8dada24c */ lw $t5,%lo(g_Vars+0x28c)($t5) /* f18a668: 0000b025 */ or $s6,$zero,$zero /* f18a66c: 1a000224 */ blez $s0,.L0f18af00 /* f18a670: afad02f0 */ sw $t5,0x2f0($sp) @@ -4274,10 +4274,10 @@ glabel var7f1b8db0 /* f18b160: 8fa7028c */ lw $a3,0x28c($sp) /* f18b164: 0fc6280c */ jal func0f18a030 /* f18b168: e7aa0010 */ swc1 $f10,0x10($sp) -/* f18b16c: 3c0f800a */ lui $t7,0x800a -/* f18b170: 8defa02c */ lw $t7,-0x5fd4($t7) -/* f18b174: 3c0d800a */ lui $t5,0x800a -/* f18b178: 3c19800a */ lui $t9,0x800a +/* f18b16c: 3c0f800a */ lui $t7,%hi(g_Vars+0x6c) +/* f18b170: 8defa02c */ lw $t7,%lo(g_Vars+0x6c)($t7) +/* f18b174: 3c0d800a */ lui $t5,%hi(g_Vars+0x68) +/* f18b178: 3c19800a */ lui $t9,%hi(g_Vars+0x64) /* f18b17c: 11e00003 */ beqz $t7,.L0f18b18c /* f18b180: 240e0001 */ addiu $t6,$zero,0x1 /* f18b184: 10000002 */ beqz $zero,.L0f18b190 @@ -4285,8 +4285,8 @@ glabel var7f1b8db0 .L0f18b18c: /* f18b18c: afa00064 */ sw $zero,0x64($sp) .L0f18b190: -/* f18b190: 8dada028 */ lw $t5,-0x5fd8($t5) -/* f18b194: 3c0e800a */ lui $t6,0x800a +/* f18b190: 8dada028 */ lw $t5,%lo(g_Vars+0x68)($t5) +/* f18b194: 3c0e800a */ lui $t6,%hi(g_Vars+0x70) /* f18b198: 11a00003 */ beqz $t5,.L0f18b1a8 /* f18b19c: 24180001 */ addiu $t8,$zero,0x1 /* f18b1a0: 10000002 */ beqz $zero,.L0f18b1ac @@ -4294,7 +4294,7 @@ glabel var7f1b8db0 .L0f18b1a8: /* f18b1a8: afa00068 */ sw $zero,0x68($sp) .L0f18b1ac: -/* f18b1ac: 8f39a024 */ lw $t9,-0x5fdc($t9) +/* f18b1ac: 8f39a024 */ lw $t9,%lo(g_Vars+0x64)($t9) /* f18b1b0: 13200003 */ beqz $t9,.L0f18b1c0 /* f18b1b4: 240f0001 */ addiu $t7,$zero,0x1 /* f18b1b8: 10000002 */ beqz $zero,.L0f18b1c4 @@ -4302,7 +4302,7 @@ glabel var7f1b8db0 .L0f18b1c0: /* f18b1c0: afa0006c */ sw $zero,0x6c($sp) .L0f18b1c4: -/* f18b1c4: 8dcea030 */ lw $t6,-0x5fd0($t6) +/* f18b1c4: 8dcea030 */ lw $t6,%lo(g_Vars+0x70)($t6) /* f18b1c8: 8fad006c */ lw $t5,0x6c($sp) /* f18b1cc: 8fb90068 */ lw $t9,0x68($sp) /* f18b1d0: 51c00004 */ beqzl $t6,.L0f18b1e4 @@ -4333,10 +4333,10 @@ glabel var7f1b8db0 /* f18b22c: 8fa70294 */ lw $a3,0x294($sp) /* f18b230: 0fc62772 */ jal func0f189dc8 /* f18b234: afad0010 */ sw $t5,0x10($sp) -/* f18b238: 3c18800a */ lui $t8,0x800a -/* f18b23c: 8f18a02c */ lw $t8,-0x5fd4($t8) -/* f18b240: 3c0f800a */ lui $t7,0x800a -/* f18b244: 3c0d800a */ lui $t5,0x800a +/* f18b238: 3c18800a */ lui $t8,%hi(g_Vars+0x6c) +/* f18b23c: 8f18a02c */ lw $t8,%lo(g_Vars+0x6c)($t8) +/* f18b240: 3c0f800a */ lui $t7,%hi(g_Vars+0x68) +/* f18b244: 3c0d800a */ lui $t5,%hi(g_Vars+0x64) /* f18b248: 13000003 */ beqz $t8,.L0f18b258 /* f18b24c: 24190001 */ addiu $t9,$zero,0x1 /* f18b250: 10000002 */ beqz $zero,.L0f18b25c @@ -4344,8 +4344,8 @@ glabel var7f1b8db0 .L0f18b258: /* f18b258: afa00064 */ sw $zero,0x64($sp) .L0f18b25c: -/* f18b25c: 8defa028 */ lw $t7,-0x5fd8($t7) -/* f18b260: 3c19800a */ lui $t9,0x800a +/* f18b25c: 8defa028 */ lw $t7,%lo(g_Vars+0x68)($t7) +/* f18b260: 3c19800a */ lui $t9,%hi(g_Vars+0x70) /* f18b264: 11e00003 */ beqz $t7,.L0f18b274 /* f18b268: 240e0001 */ addiu $t6,$zero,0x1 /* f18b26c: 10000002 */ beqz $zero,.L0f18b278 @@ -4353,7 +4353,7 @@ glabel var7f1b8db0 .L0f18b274: /* f18b274: afa00068 */ sw $zero,0x68($sp) .L0f18b278: -/* f18b278: 8dada024 */ lw $t5,-0x5fdc($t5) +/* f18b278: 8dada024 */ lw $t5,%lo(g_Vars+0x64)($t5) /* f18b27c: 11a00003 */ beqz $t5,.L0f18b28c /* f18b280: 24180001 */ addiu $t8,$zero,0x1 /* f18b284: 10000002 */ beqz $zero,.L0f18b290 @@ -4361,7 +4361,7 @@ glabel var7f1b8db0 .L0f18b28c: /* f18b28c: afa0006c */ sw $zero,0x6c($sp) .L0f18b290: -/* f18b290: 8f39a030 */ lw $t9,-0x5fd0($t9) +/* f18b290: 8f39a030 */ lw $t9,%lo(g_Vars+0x70)($t9) /* f18b294: 8faf006c */ lw $t7,0x6c($sp) /* f18b298: 8fad0068 */ lw $t5,0x68($sp) /* f18b29c: 53200004 */ beqzl $t9,.L0f18b2b0 @@ -4664,14 +4664,14 @@ glabel var7f1b8db0 /* f18b6d0: 29a10002 */ slti $at,$t5,0x2 /* f18b6d4: 14200072 */ bnez $at,.L0f18b8a0 /* f18b6d8: 3c0800ff */ lui $t0,0xff -/* f18b6dc: 3c07800b */ lui $a3,0x800b +/* f18b6dc: 3c07800b */ lui $a3,%hi(g_MpSetup+0x16) /* f18b6e0: 3c0b800b */ lui $t3,%hi(g_MpSimulants) /* f18b6e4: 00003025 */ or $a2,$zero,$zero /* f18b6e8: 2409ffff */ addiu $t1,$zero,-1 /* f18b6ec: 3508ffff */ ori $t0,$t0,0xffff /* f18b6f0: 240affff */ addiu $t2,$zero,-1 /* f18b6f4: 256bc538 */ addiu $t3,$t3,%lo(g_MpSimulants) -/* f18b6f8: 94e7cb9e */ lhu $a3,-0x3462($a3) +/* f18b6f8: 94e7cb9e */ lhu $a3,%lo(g_MpSetup+0x16)($a3) /* f18b6fc: 00002825 */ or $a1,$zero,$zero /* f18b700: 240c004c */ addiu $t4,$zero,0x4c /* f18b704: 24180001 */ addiu $t8,$zero,0x1 @@ -4958,8 +4958,8 @@ glabel func0f18b9e4 /* f18bacc: 8fa4002c */ lw $a0,0x2c($sp) /* f18bad0: 0fc6295b */ jal func0f18a56c /* f18bad4: 00000000 */ sll $zero,$zero,0x0 -/* f18bad8: 3c0e800b */ lui $t6,0x800b -/* f18badc: 91cecc10 */ lbu $t6,-0x33f0($t6) +/* f18bad8: 3c0e800b */ lui $t6,%hi(g_MpSetup+0x88) +/* f18badc: 91cecc10 */ lbu $t6,%lo(g_MpSetup+0x88)($t6) /* f18bae0: 24010005 */ addiu $at,$zero,0x5 /* f18bae4: 55c10004 */ bnel $t6,$at,.L0f18baf8 /* f18bae8: 00002025 */ or $a0,$zero,$zero @@ -5165,8 +5165,8 @@ glabel func0f18bc9c /* f18be00: 01c08825 */ or $s1,$t6,$zero /* f18be04: 0c004b70 */ jal random /* f18be08: 00000000 */ sll $zero,$zero,0x0 -/* f18be0c: 3c07800b */ lui $a3,0x800b -/* f18be10: 94e7cb9e */ lhu $a3,-0x3462($a3) +/* f18be0c: 3c07800b */ lui $a3,%hi(g_MpSetup+0x16) +/* f18be10: 94e7cb9e */ lhu $a3,%lo(g_MpSetup+0x16)($a3) /* f18be14: 00002025 */ or $a0,$zero,$zero /* f18be18: 240f0001 */ addiu $t7,$zero,0x1 .L0f18be1c: @@ -5242,8 +5242,8 @@ glabel func0f18bee8 /* f18bf0c: 00000000 */ sll $zero,$zero,0x0 /* f18bf10: 25cefffc */ addiu $t6,$t6,-4 .L0f18bf14: -/* f18bf14: 3c05800b */ lui $a1,0x800b -/* f18bf18: 94a5cb9e */ lhu $a1,-0x3462($a1) +/* f18bf14: 3c05800b */ lui $a1,%hi(g_MpSetup+0x16) +/* f18bf18: 94a5cb9e */ lhu $a1,%lo(g_MpSetup+0x16)($a1) /* f18bf1c: 01c01825 */ or $v1,$t6,$zero /* f18bf20: 240f0001 */ addiu $t7,$zero,0x1 /* f18bf24: 006fc004 */ sllv $t8,$t7,$v1 @@ -5272,8 +5272,8 @@ glabel func0f18bee8 GLOBAL_ASM( glabel mpSetLock -/* f18bf70: 3c02800b */ lui $v0,0x800b -/* f18bf74: 2442cbb0 */ addiu $v0,$v0,-13392 +/* f18bf70: 3c02800b */ lui $v0,%hi(g_MpSetup+0x28) +/* f18bf74: 2442cbb0 */ addiu $v0,$v0,%lo(g_MpSetup+0x28) /* f18bf78: 27bdffe8 */ addiu $sp,$sp,-24 /* f18bf7c: 308e00ff */ andi $t6,$a0,0xff /* f18bf80: 24010003 */ addiu $at,$zero,0x3 @@ -5282,12 +5282,12 @@ glabel mpSetLock /* f18bf8c: a0440060 */ sb $a0,0x60($v0) /* f18bf90: 0fc62fba */ jal func0f18bee8 /* f18bf94: 00000000 */ sll $zero,$zero,0x0 -/* f18bf98: 3c01800b */ lui $at,0x800b +/* f18bf98: 3c01800b */ lui $at,%hi(g_MpLockPlayerNum) /* f18bf9c: 10000003 */ beqz $zero,.L0f18bfac -/* f18bfa0: a022cc20 */ sb $v0,-0x33e0($at) +/* f18bfa0: a022cc20 */ sb $v0,%lo(g_MpLockPlayerNum)($at) .L0f18bfa4: -/* f18bfa4: 3c01800b */ lui $at,0x800b -/* f18bfa8: a025cc20 */ sb $a1,-0x33e0($at) +/* f18bfa4: 3c01800b */ lui $at,%hi(g_MpLockPlayerNum) +/* f18bfa8: a025cc20 */ sb $a1,%lo(g_MpLockPlayerNum)($at) .L0f18bfac: /* f18bfac: 8fbf0014 */ lw $ra,0x14($sp) /* f18bfb0: 27bd0018 */ addiu $sp,$sp,0x18 @@ -5321,8 +5321,8 @@ bool mpIsPlayerLockedOut(u32 playernum) GLOBAL_ASM( glabel func0f18c014 -/* f18c014: 3c04800b */ lui $a0,0x800b -/* f18c018: 9084cc10 */ lbu $a0,-0x33f0($a0) +/* f18c014: 3c04800b */ lui $a0,%hi(g_MpSetup+0x88) +/* f18c018: 9084cc10 */ lbu $a0,%lo(g_MpSetup+0x88)($a0) /* f18c01c: 27bdffe8 */ addiu $sp,$sp,-24 /* f18c020: 24010001 */ addiu $at,$zero,0x1 /* f18c024: 14810007 */ bne $a0,$at,.L0f18c044 @@ -5349,8 +5349,8 @@ glabel func0f18c014 /* f18c06c: 04420011 */ bltzl $v0,.L0f18c0b4 /* f18c070: 8fbf0014 */ lw $ra,0x14($sp) /* f18c074: 1081000e */ beq $a0,$at,.L0f18c0b0 -/* f18c078: 3c0e800b */ lui $t6,0x800b -/* f18c07c: 95cecb9e */ lhu $t6,-0x3462($t6) +/* f18c078: 3c0e800b */ lui $t6,%hi(g_MpSetup+0x16) +/* f18c07c: 95cecb9e */ lhu $t6,%lo(g_MpSetup+0x16)($t6) /* f18c080: 240f0001 */ addiu $t7,$zero,0x1 /* f18c084: 004fc004 */ sllv $t8,$t7,$v0 /* f18c088: 01d8c824 */ and $t9,$t6,$t8 @@ -5498,9 +5498,9 @@ glabel func0f18c2b0 /* f18c2bc: 00000000 */ sll $zero,$zero,0x0 /* f18c2c0: 000270c3 */ sra $t6,$v0,0x3 /* f18c2c4: 31cf00ff */ andi $t7,$t6,0xff -/* f18c2c8: 3c18800b */ lui $t8,0x800b +/* f18c2c8: 3c18800b */ lui $t8,%hi(var800acc14+0x1) /* f18c2cc: 030fc021 */ addu $t8,$t8,$t7 -/* f18c2d0: 9318cc15 */ lbu $t8,-0x33eb($t8) +/* f18c2d0: 9318cc15 */ lbu $t8,%lo(var800acc14+0x1)($t8) /* f18c2d4: 30590007 */ andi $t9,$v0,0x7 /* f18c2d8: 24080001 */ addiu $t0,$zero,0x1 /* f18c2dc: 03284804 */ sllv $t1,$t0,$t9 @@ -5524,13 +5524,13 @@ glabel func0f18c304 /* f18c30c: 0fc63065 */ jal mpGetTrackNumAtSlotIndex /* f18c310: afa5001c */ sw $a1,0x1c($sp) /* f18c314: 8fae001c */ lw $t6,0x1c($sp) -/* f18c318: 3c18800b */ lui $t8,0x800b -/* f18c31c: 2718cbb0 */ addiu $t8,$t8,-13392 +/* f18c318: 3c18800b */ lui $t8,%hi(g_MpSetup+0x28) +/* f18c31c: 2718cbb0 */ addiu $t8,$t8,%lo(g_MpSetup+0x28) /* f18c320: 11c0000d */ beqz $t6,.L0f18c358 /* f18c324: 304a0007 */ andi $t2,$v0,0x7 /* f18c328: 000278c3 */ sra $t7,$v0,0x3 -/* f18c32c: 3c19800b */ lui $t9,0x800b -/* f18c330: 2739cbb0 */ addiu $t9,$t9,-13392 +/* f18c32c: 3c19800b */ lui $t9,%hi(g_MpSetup+0x28) +/* f18c330: 2739cbb0 */ addiu $t9,$t9,%lo(g_MpSetup+0x28) /* f18c334: 31f800ff */ andi $t8,$t7,0xff /* f18c338: 03191821 */ addu $v1,$t8,$t9 /* f18c33c: 90680065 */ lbu $t0,0x65($v1) @@ -5576,8 +5576,8 @@ glabel func0f18c38c .L0f18c3c4: /* f18c3c4: 0fc63065 */ jal mpGetTrackNumAtSlotIndex /* f18c3c8: 8fa40018 */ lw $a0,0x18($sp) -/* f18c3cc: 3c01800b */ lui $at,0x800b -/* f18c3d0: a022cc14 */ sb $v0,-0x33ec($at) +/* f18c3cc: 3c01800b */ lui $at,%hi(var800acc14) +/* f18c3d0: a022cc14 */ sb $v0,%lo(var800acc14)($at) /* f18c3d4: 8fbf0014 */ lw $ra,0x14($sp) .L0f18c3d8: /* f18c3d8: 27bd0018 */ addiu $sp,$sp,0x18 @@ -5587,10 +5587,10 @@ glabel func0f18c38c GLOBAL_ASM( glabel func0f18c3e4 -/* f18c3e4: 3c03800b */ lui $v1,0x800b -/* f18c3e8: 3c04800b */ lui $a0,0x800b -/* f18c3ec: 2484cbb6 */ addiu $a0,$a0,-13386 -/* f18c3f0: 2463cbb0 */ addiu $v1,$v1,-13392 +/* f18c3e4: 3c03800b */ lui $v1,%hi(g_MpSetup+0x28) +/* f18c3e8: 3c04800b */ lui $a0,%hi(g_MpSetup+0x2e) +/* f18c3ec: 2484cbb6 */ addiu $a0,$a0,%lo(g_MpSetup+0x2e) +/* f18c3f0: 2463cbb0 */ addiu $v1,$v1,%lo(g_MpSetup+0x28) /* f18c3f4: 240200ff */ addiu $v0,$zero,0xff .L0f18c3f8: /* f18c3f8: 24630001 */ addiu $v1,$v1,0x1 @@ -5602,10 +5602,10 @@ glabel func0f18c3e4 GLOBAL_ASM( glabel func0f18c40c -/* f18c40c: 3c03800b */ lui $v1,0x800b -/* f18c410: 3c02800b */ lui $v0,0x800b -/* f18c414: 2442cbb6 */ addiu $v0,$v0,-13386 -/* f18c418: 2463cbb0 */ addiu $v1,$v1,-13392 +/* f18c40c: 3c03800b */ lui $v1,%hi(g_MpSetup+0x28) +/* f18c410: 3c02800b */ lui $v0,%hi(g_MpSetup+0x2e) +/* f18c414: 2442cbb6 */ addiu $v0,$v0,%lo(g_MpSetup+0x2e) +/* f18c418: 2463cbb0 */ addiu $v1,$v1,%lo(g_MpSetup+0x28) .L0f18c41c: /* f18c41c: 24630001 */ addiu $v1,$v1,0x1 /* f18c420: 1462fffe */ bne $v1,$v0,.L0f18c41c @@ -5619,11 +5619,11 @@ glabel func0f18c430 /* f18c430: 27bdffe0 */ addiu $sp,$sp,-32 /* f18c434: afb10018 */ sw $s1,0x18($sp) /* f18c438: afb00014 */ sw $s0,0x14($sp) -/* f18c43c: 3c10800b */ lui $s0,0x800b -/* f18c440: 3c11800b */ lui $s1,0x800b +/* f18c43c: 3c10800b */ lui $s0,%hi(g_MpSetup+0x28) +/* f18c440: 3c11800b */ lui $s1,%hi(g_MpSetup+0x2e) /* f18c444: afbf001c */ sw $ra,0x1c($sp) -/* f18c448: 2631cbb6 */ addiu $s1,$s1,-13386 -/* f18c44c: 2610cbb0 */ addiu $s0,$s0,-13392 +/* f18c448: 2631cbb6 */ addiu $s1,$s1,%lo(g_MpSetup+0x2e) +/* f18c44c: 2610cbb0 */ addiu $s0,$s0,%lo(g_MpSetup+0x28) .L0f18c450: /* f18c450: 0c004b70 */ jal random /* f18c454: 00000000 */ sll $zero,$zero,0x0 @@ -5640,9 +5640,9 @@ glabel func0f18c430 GLOBAL_ASM( glabel func0f18c478 /* f18c478: 240effff */ addiu $t6,$zero,-1 -/* f18c47c: 3c01800b */ lui $at,0x800b +/* f18c47c: 3c01800b */ lui $at,%hi(var800acc14) /* f18c480: 03e00008 */ jr $ra -/* f18c484: a02ecc14 */ sb $t6,-0x33ec($at) +/* f18c484: a02ecc14 */ sb $t6,%lo(var800acc14)($at) ); GLOBAL_ASM( @@ -5871,10 +5871,10 @@ glabel func0f18c4c0 GLOBAL_ASM( glabel func0f18c794 -/* f18c794: 3c06800b */ lui $a2,0x800b +/* f18c794: 3c06800b */ lui $a2,%hi(g_MpSetup+0x16) /* f18c798: 00001025 */ or $v0,$zero,$zero /* f18c79c: 00001825 */ or $v1,$zero,$zero -/* f18c7a0: 94c6cb9e */ lhu $a2,-0x3462($a2) +/* f18c7a0: 94c6cb9e */ lhu $a2,%lo(g_MpSetup+0x16)($a2) /* f18c7a4: 00002825 */ or $a1,$zero,$zero /* f18c7a8: 2407000c */ addiu $a3,$zero,0xc /* f18c7ac: 240e0001 */ addiu $t6,$zero,0x1 @@ -5916,10 +5916,10 @@ glabel func0f18c794 GLOBAL_ASM( glabel func0f18c828 -/* f18c828: 3c06800b */ lui $a2,0x800b +/* f18c828: 3c06800b */ lui $a2,%hi(g_MpSetup+0x16) /* f18c82c: 00001025 */ or $v0,$zero,$zero /* f18c830: 00001825 */ or $v1,$zero,$zero -/* f18c834: 94c6cb9e */ lhu $a2,-0x3462($a2) +/* f18c834: 94c6cb9e */ lhu $a2,%lo(g_MpSetup+0x16)($a2) /* f18c838: 00002825 */ or $a1,$zero,$zero /* f18c83c: 2407000c */ addiu $a3,$zero,0xc /* f18c840: 240e0001 */ addiu $t6,$zero,0x1 @@ -5944,9 +5944,9 @@ glabel func0f18c828 GLOBAL_ASM( glabel func0f18c87c -/* f18c87c: 3c04800b */ lui $a0,0x800b +/* f18c87c: 3c04800b */ lui $a0,%hi(g_MpSetup+0x16) /* f18c880: 00001825 */ or $v1,$zero,$zero -/* f18c884: 9484cb9e */ lhu $a0,-0x3462($a0) +/* f18c884: 9484cb9e */ lhu $a0,%lo(g_MpSetup+0x16)($a0) /* f18c888: 00001025 */ or $v0,$zero,$zero /* f18c88c: 2405000c */ addiu $a1,$zero,0xc /* f18c890: 240e0001 */ addiu $t6,$zero,0x1 @@ -5965,13 +5965,13 @@ glabel func0f18c87c GLOBAL_ASM( glabel func0f18c8b8 -/* f18c8b8: 3c05800b */ lui $a1,0x800b +/* f18c8b8: 3c05800b */ lui $a1,%hi(g_MpSetup+0x16) /* f18c8bc: 3c0b800b */ lui $t3,%hi(g_MpSimulants) /* f18c8c0: 3c08800b */ lui $t0,%hi(g_MpPlayers) /* f18c8c4: 00001825 */ or $v1,$zero,$zero /* f18c8c8: 2508c7b8 */ addiu $t0,$t0,%lo(g_MpPlayers) /* f18c8cc: 256bc538 */ addiu $t3,$t3,%lo(g_MpSimulants) -/* f18c8d0: 94a5cb9e */ lhu $a1,-0x3462($a1) +/* f18c8d0: 94a5cb9e */ lhu $a1,%lo(g_MpSetup+0x16)($a1) /* f18c8d4: 240c004c */ addiu $t4,$zero,0x4c /* f18c8d8: 240a000c */ addiu $t2,$zero,0xc /* f18c8dc: 240900a0 */ addiu $t1,$zero,0xa0 @@ -6102,13 +6102,13 @@ glabel func0f18c984 /* f18ca94: 0000c010 */ mfhi $t8 /* f18ca98: 0018c880 */ sll $t9,$t8,0x2 /* f18ca9c: 02d94021 */ addu $t0,$s6,$t9 -/* f18caa0: 3c04800b */ lui $a0,0x800b +/* f18caa0: 3c04800b */ lui $a0,%hi(g_MpSetup+0x16) /* f18caa4: 8d060000 */ lw $a2,0x0($t0) /* f18caa8: 16e00002 */ bnez $s7,.L0f18cab4 /* f18caac: 00000000 */ sll $zero,$zero,0x0 /* f18cab0: 0007000d */ break 0x7 .L0f18cab4: -/* f18cab4: 9484cb9e */ lhu $a0,-0x3462($a0) +/* f18cab4: 9484cb9e */ lhu $a0,%lo(g_MpSetup+0x16)($a0) /* f18cab8: 00001825 */ or $v1,$zero,$zero /* f18cabc: 24090001 */ addiu $t1,$zero,0x1 .L0f18cac0: @@ -6187,8 +6187,8 @@ glabel func0f18cb60 GLOBAL_ASM( glabel func0f18cbb8 -/* f18cbb8: 3c02800b */ lui $v0,0x800b -/* f18cbbc: 9442cb9e */ lhu $v0,-0x3462($v0) +/* f18cbb8: 3c02800b */ lui $v0,%hi(g_MpSetup+0x16) +/* f18cbbc: 9442cb9e */ lhu $v0,%lo(g_MpSetup+0x16)($v0) /* f18cbc0: 00001825 */ or $v1,$zero,$zero /* f18cbc4: 304e0010 */ andi $t6,$v0,0x10 /* f18cbc8: 11c0000a */ beqz $t6,.L0f18cbf4 @@ -6223,13 +6223,13 @@ glabel mpRemoveSimulant /* f18cc24: 01445023 */ subu $t2,$t2,$a0 /* f18cc28: 27bdffe8 */ addiu $sp,$sp,-24 /* f18cc2c: 000a5080 */ sll $t2,$t2,0x2 -/* f18cc30: 3c01800b */ lui $at,0x800b +/* f18cc30: 3c01800b */ lui $at,%hi(g_MpSimulants) /* f18cc34: 01c84824 */ and $t1,$t6,$t0 /* f18cc38: afbf0014 */ sw $ra,0x14($sp) /* f18cc3c: a4490016 */ sh $t1,0x16($v0) /* f18cc40: 002a0821 */ addu $at,$at,$t2 /* f18cc44: 0fc62075 */ jal func0f1881d4 -/* f18cc48: a020c538 */ sb $zero,-0x3ac8($at) +/* f18cc48: a020c538 */ sb $zero,%lo(g_MpSimulants)($at) /* f18cc4c: 0fc63377 */ jal func0f18cddc /* f18cc50: 00000000 */ sll $zero,$zero,0x0 /* f18cc54: 8fbf0014 */ lw $ra,0x14($sp) @@ -6240,8 +6240,8 @@ glabel mpRemoveSimulant GLOBAL_ASM( glabel func0f18cc64 -/* f18cc64: 3c0e800b */ lui $t6,0x800b -/* f18cc68: 95cecb9e */ lhu $t6,-0x3462($t6) +/* f18cc64: 3c0e800b */ lui $t6,%hi(g_MpSetup+0x16) +/* f18cc68: 95cecb9e */ lhu $t6,%lo(g_MpSetup+0x16)($t6) /* f18cc6c: 00001025 */ or $v0,$zero,$zero /* f18cc70: 31cffff0 */ andi $t7,$t6,0xfff0 /* f18cc74: 11e00003 */ beqz $t7,.L0f18cc84 @@ -6260,14 +6260,14 @@ glabel func0f18cc8c /* f18cc94: 0fc67244 */ jal mpIsChallengeComplete /* f18cc98: 24040040 */ addiu $a0,$zero,0x40 /* f18cc9c: 10400003 */ beqz $v0,.L0f18ccac -/* f18cca0: 3c04800b */ lui $a0,0x800b +/* f18cca0: 3c04800b */ lui $a0,%hi(g_MpSetup+0x16) /* f18cca4: 10000002 */ beqz $zero,.L0f18ccb0 /* f18cca8: 24030008 */ addiu $v1,$zero,0x8 .L0f18ccac: /* f18ccac: 24030004 */ addiu $v1,$zero,0x4 .L0f18ccb0: /* f18ccb0: 24020004 */ addiu $v0,$zero,0x4 -/* f18ccb4: 9484cb9e */ lhu $a0,-0x3462($a0) +/* f18ccb4: 9484cb9e */ lhu $a0,%lo(g_MpSetup+0x16)($a0) /* f18ccb8: 2405000c */ addiu $a1,$zero,0xc /* f18ccbc: 240e0001 */ addiu $t6,$zero,0x1 .L0f18ccc0: @@ -6292,8 +6292,8 @@ glabel func0f18cc8c GLOBAL_ASM( glabel mpIsSimSlotEnabled -/* f18ccf8: 3c03800b */ lui $v1,0x800b -/* f18ccfc: 9463cb9e */ lhu $v1,-0x3462($v1) +/* f18ccf8: 3c03800b */ lui $v1,%hi(g_MpSetup+0x16) +/* f18ccfc: 9463cb9e */ lhu $v1,%lo(g_MpSetup+0x16)($v1) /* f18cd00: 248e0004 */ addiu $t6,$a0,0x4 /* f18cd04: 240f0001 */ addiu $t7,$zero,0x1 /* f18cd08: 01cfc004 */ sllv $t8,$t7,$t6 @@ -7239,8 +7239,8 @@ glabel func0f18d9fc /* f18da94: 10000006 */ beqz $zero,.L0f18dab0 /* f18da98: a46b0050 */ sh $t3,0x50($v1) .L0f18da9c: -/* f18da9c: 3c01800a */ lui $at,0x800a -/* f18daa0: ac2321f8 */ sw $v1,0x21f8($at) +/* f18da9c: 3c01800a */ lui $at,%hi(var800a21f8) +/* f18daa0: ac2321f8 */ sw $v1,%lo(var800a21f8)($at) /* f18daa4: 10000002 */ beqz $zero,.L0f18dab0 /* f18daa8: 2402ffff */ addiu $v0,$zero,-1 .L0f18daac: @@ -7293,8 +7293,8 @@ glabel func0f18dac0 /* f18db50: 10000006 */ beqz $zero,.L0f18db6c /* f18db54: a069009d */ sb $t1,0x9d($v1) .L0f18db58: -/* f18db58: 3c01800a */ lui $at,0x800a -/* f18db5c: ac2321f8 */ sw $v1,0x21f8($at) +/* f18db58: 3c01800a */ lui $at,%hi(var800a21f8) +/* f18db5c: ac2321f8 */ sw $v1,%lo(var800a21f8)($at) /* f18db60: 10000002 */ beqz $zero,.L0f18db6c /* f18db64: 2402ffff */ addiu $v0,$zero,-1 .L0f18db68: @@ -7478,10 +7478,10 @@ glabel func0f18dcec /* f18de48: 0fc67244 */ jal mpIsChallengeComplete /* f18de4c: 24040016 */ addiu $a0,$zero,0x16 /* f18de50: 1440000c */ bnez $v0,.L0f18de84 -/* f18de54: 3c04800b */ lui $a0,0x800b +/* f18de54: 3c04800b */ lui $a0,%hi(g_MpSetup+0x6) /* f18de58: 3c02800b */ lui $v0,%hi(g_MpSetup) /* f18de5c: 2442cb88 */ addiu $v0,$v0,%lo(g_MpSetup) -/* f18de60: 2484cb8e */ addiu $a0,$a0,-13426 +/* f18de60: 2484cb8e */ addiu $a0,$a0,%lo(g_MpSetup+0x6) /* f18de64: 24030025 */ addiu $v1,$zero,0x25 /* f18de68: 90480018 */ lbu $t0,0x18($v0) .L0f18de6c: @@ -7648,8 +7648,8 @@ glabel func0f18df5c /* f18e0a8: 0fc63377 */ jal func0f18cddc /* f18e0ac: 00000000 */ sll $zero,$zero,0x0 /* f18e0b0: 3c10800b */ lui $s0,%hi(g_MpSetup) -/* f18e0b4: 3c11800b */ lui $s1,0x800b -/* f18e0b8: 2631cb8e */ addiu $s1,$s1,-13426 +/* f18e0b4: 3c11800b */ lui $s1,%hi(g_MpSetup+0x6) +/* f18e0b8: 2631cb8e */ addiu $s1,$s1,%lo(g_MpSetup+0x6) /* f18e0bc: 2610cb88 */ addiu $s0,$s0,%lo(g_MpSetup) .L0f18e0c0: /* f18e0c0: 02602025 */ or $a0,$s3,$zero @@ -7673,9 +7673,9 @@ glabel func0f18df5c /* f18e108: 0fc354fe */ jal scenarioDefaultCallback40 /* f18e10c: 24050009 */ addiu $a1,$zero,0x9 /* f18e110: 3c10800b */ lui $s0,%hi(g_MpPlayers) -/* f18e114: 3c11800b */ lui $s1,0x800b +/* f18e114: 3c11800b */ lui $s1,%hi(g_MpPlayers+0x280) /* f18e118: a6a20014 */ sh $v0,0x14($s5) -/* f18e11c: 2631ca38 */ addiu $s1,$s1,-13768 +/* f18e11c: 2631ca38 */ addiu $s1,$s1,%lo(g_MpPlayers+0x280) /* f18e120: 2610c7b8 */ addiu $s0,$s0,%lo(g_MpPlayers) .L0f18e124: /* f18e124: 02602025 */ or $a0,$s3,$zero @@ -7807,8 +7807,8 @@ glabel func0f18e16c /* f18e2ec: 1420ffcc */ bnez $at,.L0f18e220 /* f18e2f0: 2610004c */ addiu $s0,$s0,0x4c /* f18e2f4: 3c10800b */ lui $s0,%hi(g_MpSetup) -/* f18e2f8: 3c11800b */ lui $s1,0x800b -/* f18e2fc: 2631cb8e */ addiu $s1,$s1,-13426 +/* f18e2f8: 3c11800b */ lui $s1,%hi(g_MpSetup+0x6) +/* f18e2fc: 2631cb8e */ addiu $s1,$s1,%lo(g_MpSetup+0x6) /* f18e300: 2610cb88 */ addiu $s0,$s0,%lo(g_MpSetup) /* f18e304: 02402025 */ or $a0,$s2,$zero .L0f18e308: @@ -7832,8 +7832,8 @@ glabel func0f18e16c /* f18e34c: 0fc354be */ jal scenarioDefaultCallback44 /* f18e350: 24060009 */ addiu $a2,$zero,0x9 /* f18e354: 3c10800b */ lui $s0,%hi(g_MpPlayers) -/* f18e358: 3c11800b */ lui $s1,0x800b -/* f18e35c: 2631ca38 */ addiu $s1,$s1,-13768 +/* f18e358: 3c11800b */ lui $s1,%hi(g_MpPlayers+0x280) +/* f18e35c: 2631ca38 */ addiu $s1,$s1,%lo(g_MpPlayers+0x280) /* f18e360: 2610c7b8 */ addiu $s0,$s0,%lo(g_MpPlayers) /* f18e364: 02402025 */ or $a0,$s2,$zero .L0f18e368: @@ -7925,8 +7925,8 @@ glabel func0f18e420 /* f18e49c: 10000006 */ beqz $zero,.L0f18e4b8 /* f18e4a0: a4680024 */ sh $t0,0x24($v1) .L0f18e4a4: -/* f18e4a4: 3c01800a */ lui $at,0x800a -/* f18e4a8: ac2321f8 */ sw $v1,0x21f8($at) +/* f18e4a4: 3c01800a */ lui $at,%hi(var800a21f8) +/* f18e4a8: ac2321f8 */ sw $v1,%lo(var800a21f8)($at) /* f18e4ac: 10000002 */ beqz $zero,.L0f18e4b8 /* f18e4b0: 2402ffff */ addiu $v0,$zero,-1 .L0f18e4b4: @@ -7968,8 +7968,8 @@ glabel func0f18e4c8 /* f18e52c: 10000006 */ beqz $zero,.L0f18e548 /* f18e530: 00001025 */ or $v0,$zero,$zero .L0f18e534: -/* f18e534: 3c01800a */ lui $at,0x800a -/* f18e538: ac2321f8 */ sw $v1,0x21f8($at) +/* f18e534: 3c01800a */ lui $at,%hi(var800a21f8) +/* f18e538: ac2321f8 */ sw $v1,%lo(var800a21f8)($at) /* f18e53c: 10000002 */ beqz $zero,.L0f18e548 /* f18e540: 2402ffff */ addiu $v0,$zero,-1 .L0f18e544: diff --git a/src/game/pad.c b/src/game/pad.c index 417c25f55..50a378405 100644 --- a/src/game/pad.c +++ b/src/game/pad.c @@ -16,10 +16,10 @@ glabel padUnpack /* f115ab0: 3c0e800a */ lui $t6,%hi(g_PadOffsets) /* f115ab4: 8dce2354 */ lw $t6,%lo(g_PadOffsets)($t6) /* f115ab8: 00047840 */ sll $t7,$a0,0x1 -/* f115abc: 3c19800a */ lui $t9,0x800a +/* f115abc: 3c19800a */ lui $t9,%hi(g_StageSetup+0x1c) /* f115ac0: 01cfc021 */ addu $t8,$t6,$t7 /* f115ac4: 97020000 */ lhu $v0,0x0($t8) -/* f115ac8: 8f39d04c */ lw $t9,-0x2fb4($t9) +/* f115ac8: 8f39d04c */ lw $t9,%lo(g_StageSetup+0x1c)($t9) /* f115acc: 00a03825 */ or $a3,$a1,$zero /* f115ad0: 30e80040 */ andi $t0,$a3,0x40 /* f115ad4: 03221821 */ addu $v1,$t9,$v0 @@ -555,10 +555,10 @@ glabel func0f116068 /* f116070: 27bdffd0 */ addiu $sp,$sp,-48 /* f116074: 00047840 */ sll $t7,$a0,0x1 /* f116078: afbf0014 */ sw $ra,0x14($sp) -/* f11607c: 3c19800a */ lui $t9,0x800a +/* f11607c: 3c19800a */ lui $t9,%hi(g_StageSetup+0x1c) /* f116080: 01cfc021 */ addu $t8,$t6,$t7 /* f116084: 97060000 */ lhu $a2,0x0($t8) -/* f116088: 8f39d04c */ lw $t9,-0x2fb4($t9) +/* f116088: 8f39d04c */ lw $t9,%lo(g_StageSetup+0x1c)($t9) /* f11608c: 03261021 */ addu $v0,$t9,$a2 /* f116090: 00403825 */ or $a3,$v0,$zero /* f116094: 8ce50000 */ lw $a1,0x0($a3) @@ -699,8 +699,8 @@ glabel coverLoad /* f1162f4: 10200008 */ beqz $at,.L0f116318 /* f1162f8: 00000000 */ sll $zero,$zero,0x0 /* f1162fc: 04800006 */ bltz $a0,.L0f116318 -/* f116300: 3c03800a */ lui $v1,0x800a -/* f116304: 8c63d038 */ lw $v1,-0x2fc8($v1) +/* f116300: 3c03800a */ lui $v1,%hi(g_StageSetup+0x8) +/* f116304: 8c63d038 */ lw $v1,%lo(g_StageSetup+0x8)($v1) /* f116308: 3c09800a */ lui $t1,%hi(g_CoverFlags) /* f11630c: 25292360 */ addiu $t1,$t1,%lo(g_CoverFlags) /* f116310: 14600003 */ bnez $v1,.L0f116320 diff --git a/src/game/padhalllv.c b/src/game/padhalllv.c index 8da9d018a..8838c241b 100644 --- a/src/game/padhalllv.c +++ b/src/game/padhalllv.c @@ -95,8 +95,8 @@ glabel waypointFindClosestToPos /* f114340: 10ec0068 */ beq $a3,$t4,.L0f1144e4 /* f114344: 0000a025 */ or $s4,$zero,$zero /* f114348: 27b50360 */ addiu $s5,$sp,0x360 -/* f11434c: 3c03800a */ lui $v1,%hi(var8009fffc) -/* f114350: 8c634928 */ lw $v1,0x4928($v1) +/* f11434c: 3c03800a */ lui $v1,%hi(g_RoomPtrs) +/* f114350: 8c634928 */ lw $v1,%lo(g_RoomPtrs)($v1) /* f114354: 86a40000 */ lh $a0,0x0($s5) /* f114358: 2417008c */ addiu $s7,$zero,0x8c .L0f11435c: @@ -111,8 +111,8 @@ glabel waypointFindClosestToPos /* f11437c: 0000a025 */ or $s4,$zero,$zero /* f114380: 9458000c */ lhu $t8,0xc($v0) .L0f114384: -/* f114384: 3c0e800a */ lui $t6,0x800a -/* f114388: 8dcea020 */ lw $t6,-0x5fe0($t6) +/* f114384: 3c0e800a */ lui $t6,%hi(g_Vars+0x60) +/* f114388: 8dcea020 */ lw $t6,%lo(g_Vars+0x60)($t6) /* f11438c: 0018c840 */ sll $t9,$t8,0x1 /* f114390: 8fcc0000 */ lw $t4,0x0($s8) /* f114394: 01d95021 */ addu $t2,$t6,$t9 @@ -177,7 +177,7 @@ glabel waypointFindClosestToPos /* f11446c: c4520000 */ lwc1 $f18,0x0($v0) /* f114470: 2442fffc */ addiu $v0,$v0,-4 /* f114474: 0045082b */ sltu $at,$v0,$a1 -/* f114478: 2463fffc */ addiu $v1,$v1,%lo(var8009fffc) +/* f114478: 2463fffc */ addiu $v1,$v1,-4 /* f11447c: ac790008 */ sw $t9,0x8($v1) /* f114480: 1020fff9 */ beqz $at,.L0f114468 /* f114484: e4520008 */ swc1 $f18,0x8($v0) @@ -443,11 +443,11 @@ glabel func0f114810 /* f114834: afb1001c */ sw $s1,0x1c($sp) /* f114838: afb00018 */ sw $s0,0x18($sp) /* f11483c: 8c820000 */ lw $v0,0x0($a0) -/* f114840: 3c15800a */ lui $s5,0x800a +/* f114840: 3c15800a */ lui $s5,%hi(g_StageSetup+0x4) /* f114844: 00808825 */ or $s1,$a0,$zero /* f114848: 00c0b825 */ or $s7,$a2,$zero /* f11484c: 00a0f025 */ or $s8,$a1,$zero -/* f114850: 8eb5d034 */ lw $s5,-0x2fcc($s5) +/* f114850: 8eb5d034 */ lw $s5,%lo(g_StageSetup+0x4)($s5) /* f114854: 04400033 */ bltz $v0,.L0f114924 /* f114858: 0000b025 */ or $s6,$zero,$zero /* f11485c: 3c13800a */ lui $s3,%hi(g_Vars) @@ -524,10 +524,10 @@ glabel func0f114810 GLOBAL_ASM( glabel func0f114958 /* f114958: 8c830000 */ lw $v1,0x0($a0) -/* f11495c: 3c02800a */ lui $v0,0x800a +/* f11495c: 3c02800a */ lui $v0,%hi(g_StageSetup+0x4) /* f114960: 00a03825 */ or $a3,$a1,$zero /* f114964: 04600010 */ bltz $v1,.L0f1149a8 -/* f114968: 8c42d034 */ lw $v0,-0x2fcc($v0) +/* f114968: 8c42d034 */ lw $v0,%lo(g_StageSetup+0x4)($v0) /* f11496c: 2408000c */ addiu $t0,$zero,0xc /* f114970: 00667024 */ and $t6,$v1,$a2 .L0f114974: @@ -1094,7 +1094,7 @@ glabel func0f11505c /* f1150ec: 00084900 */ sll $t1,$t0,0x4 /* f1150f0: 01331821 */ addu $v1,$t1,$s3 /* f1150f4: 8c6a0008 */ lw $t2,0x8($v1) -/* f1150f8: 3c0d800a */ lui $t5,0x800a +/* f1150f8: 3c0d800a */ lui $t5,%hi(g_Vars+0x330) /* f1150fc: 015e0019 */ multu $t2,$s8 /* f115100: 00005812 */ mflo $t3 /* f115104: 01746021 */ addu $t4,$t3,$s4 @@ -1102,7 +1102,7 @@ glabel func0f11505c /* f11510c: 8e020004 */ lw $v0,0x4($s0) /* f115110: aed20000 */ sw $s2,0x0($s6) /* f115114: aea30000 */ sw $v1,0x0($s5) -/* f115118: 8dada2f0 */ lw $t5,-0x5d10($t5) +/* f115118: 8dada2f0 */ lw $t5,%lo(g_Vars+0x330)($t5) /* f11511c: 24040000 */ addiu $a0,$zero,0x0 /* f115120: 24060000 */ addiu $a2,$zero,0x0 /* f115124: 11a0001f */ beqz $t5,.L0f1151a4 @@ -1167,8 +1167,8 @@ GLOBAL_ASM( glabel waypointFindRoute /* f1151ec: 27bdff90 */ addiu $sp,$sp,-112 /* f1151f0: afb00018 */ sw $s0,0x18($sp) -/* f1151f4: 3c10800a */ lui $s0,0x800a -/* f1151f8: 8e10d034 */ lw $s0,-0x2fcc($s0) +/* f1151f4: 3c10800a */ lui $s0,%hi(g_StageSetup+0x4) +/* f1151f8: 8e10d034 */ lw $s0,%lo(g_StageSetup+0x4)($s0) /* f1151fc: afb60030 */ sw $s6,0x30($sp) /* f115200: afb40028 */ sw $s4,0x28($sp) /* f115204: afb30024 */ sw $s3,0x24($sp) @@ -1278,8 +1278,8 @@ glabel waypointFindRoute GLOBAL_ASM( glabel func0f115390 -/* f115390: 3c02800a */ lui $v0,%hi(var800a0010) -/* f115394: 8c42d030 */ lw $v0,-0x2fd0($v0) +/* f115390: 3c02800a */ lui $v0,%hi(g_StageSetup) +/* f115394: 8c42d030 */ lw $v0,%lo(g_StageSetup)($v0) /* f115398: 2403ffff */ addiu $v1,$zero,-1 /* f11539c: 8c4e0000 */ lw $t6,0x0($v0) /* f1153a0: 05c00006 */ bltz $t6,.L0f1153bc @@ -1287,7 +1287,7 @@ glabel func0f115390 /* f1153a8: 8c4f0010 */ lw $t7,0x10($v0) .L0f1153ac: /* f1153ac: ac43000c */ sw $v1,0xc($v0) -/* f1153b0: 24420010 */ addiu $v0,$v0,%lo(var800a0010) +/* f1153b0: 24420010 */ addiu $v0,$v0,16 /* f1153b4: 05e3fffd */ bgezl $t7,.L0f1153ac /* f1153b8: 8c4f0010 */ lw $t7,0x10($v0) .L0f1153bc: @@ -1409,8 +1409,8 @@ glabel func0f1154cc /* f115534: 10200013 */ beqz $at,.L0f115584 /* f115538: 01201825 */ or $v1,$t1,$zero /* f11553c: 0003c080 */ sll $t8,$v1,0x2 -/* f115540: 3c05800a */ lui $a1,0x800a -/* f115544: 8ca5d034 */ lw $a1,-0x2fcc($a1) +/* f115540: 3c05800a */ lui $a1,%hi(g_StageSetup+0x4) +/* f115544: 8ca5d034 */ lw $a1,%lo(g_StageSetup+0x4)($a1) /* f115548: 01581021 */ addu $v0,$t2,$t8 /* f11554c: 2407000c */ addiu $a3,$zero,0xc .L0f115550: @@ -1432,8 +1432,8 @@ glabel func0f1154cc /* f115584: 2407000c */ addiu $a3,$zero,0xc /* f115588: 19200011 */ blez $t1,.L0f1155d0 /* f11558c: 00001825 */ or $v1,$zero,$zero -/* f115590: 3c05800a */ lui $a1,0x800a -/* f115594: 8ca5d034 */ lw $a1,-0x2fcc($a1) +/* f115590: 3c05800a */ lui $a1,%hi(g_StageSetup+0x4) +/* f115594: 8ca5d034 */ lw $a1,%lo(g_StageSetup+0x4)($a1) /* f115598: 01401025 */ or $v0,$t2,$zero .L0f11559c: /* f11559c: 8c4e0000 */ lw $t6,0x0($v0) @@ -1460,8 +1460,8 @@ glabel func0f1154cc GLOBAL_ASM( glabel func0f1155e0 -/* f1155e0: 3c06800a */ lui $a2,0x800a -/* f1155e4: 8cc6d034 */ lw $a2,-0x2fcc($a2) +/* f1155e0: 3c06800a */ lui $a2,%hi(g_StageSetup+0x4) +/* f1155e4: 8cc6d034 */ lw $a2,%lo(g_StageSetup+0x4)($a2) /* f1155e8: 27bdffa0 */ addiu $sp,$sp,-96 /* f1155ec: afb10020 */ sw $s1,0x20($sp) /* f1155f0: 00808825 */ or $s1,$a0,$zero diff --git a/src/game/pak/pak.c b/src/game/pak/pak.c index f67fd7640..d72c11323 100644 --- a/src/game/pak/pak.c +++ b/src/game/pak/pak.c @@ -347,9 +347,9 @@ glabel func0f11668c /* f1166c8: 0018c080 */ sll $t8,$t8,0x2 /* f1166cc: 0304c023 */ subu $t8,$t8,$a0 /* f1166d0: 0018c080 */ sll $t8,$t8,0x2 -/* f1166d4: 3c19800a */ lui $t9,0x800a +/* f1166d4: 3c19800a */ lui $t9,%hi(var800a2380+0x2c8) /* f1166d8: 0338c821 */ addu $t9,$t9,$t8 -/* f1166dc: 8f392648 */ lw $t9,0x2648($t9) +/* f1166dc: 8f392648 */ lw $t9,%lo(var800a2380+0x2c8)($t9) /* f1166e0: 0c004b70 */ jal random /* f1166e4: afb9001c */ sw $t9,0x1c($sp) /* f1166e8: 240101f0 */ addiu $at,$zero,0x1f0 @@ -802,11 +802,11 @@ glabel func0f116c54 /* f116c74: 0018c080 */ sll $t8,$t8,0x2 /* f116c78: 030fc023 */ subu $t8,$t8,$t7 /* f116c7c: 0018c080 */ sll $t8,$t8,0x2 -/* f116c80: 3c02800a */ lui $v0,0x800a +/* f116c80: 3c02800a */ lui $v0,%hi(var800a2380+0x262) /* f116c84: 00581021 */ addu $v0,$v0,$t8 /* f116c88: afa40000 */ sw $a0,0x0($sp) /* f116c8c: 03e00008 */ jr $ra -/* f116c90: 944225e2 */ lhu $v0,0x25e2($v0) +/* f116c90: 944225e2 */ lhu $v0,%lo(var800a2380+0x262)($v0) ); GLOBAL_ASM( @@ -833,7 +833,7 @@ glabel func0f116c94 /* f116ce0: 0fc47588 */ jal func0f11d620 /* f116ce4: 83a4001b */ lb $a0,0x1b($sp) /* f116ce8: 83ae001b */ lb $t6,0x1b($sp) -/* f116cec: 3c02800a */ lui $v0,0x800a +/* f116cec: 3c02800a */ lui $v0,%hi(var800a2380+0x2b8) /* f116cf0: 8fbf0014 */ lw $ra,0x14($sp) /* f116cf4: 000e7880 */ sll $t7,$t6,0x2 /* f116cf8: 01ee7823 */ subu $t7,$t7,$t6 @@ -845,7 +845,7 @@ glabel func0f116c94 /* f116d10: 01ee7823 */ subu $t7,$t7,$t6 /* f116d14: 000f7880 */ sll $t7,$t7,0x2 /* f116d18: 004f1021 */ addu $v0,$v0,$t7 -/* f116d1c: 8c422638 */ lw $v0,0x2638($v0) +/* f116d1c: 8c422638 */ lw $v0,%lo(var800a2380+0x2b8)($v0) /* f116d20: 27bd0018 */ addiu $sp,$sp,0x18 /* f116d24: 00021900 */ sll $v1,$v0,0x4 /* f116d28: 0003c7c2 */ srl $t8,$v1,0x1f @@ -869,9 +869,9 @@ glabel func0f116c94 /* f116d6c: 0018c080 */ sll $t8,$t8,0x2 /* f116d70: 030fc023 */ subu $t8,$t8,$t7 /* f116d74: 0018c080 */ sll $t8,$t8,0x2 -/* f116d78: 3c02800a */ lui $v0,0x800a +/* f116d78: 3c02800a */ lui $v0,%hi(var800a2380+0x2b8) /* f116d7c: 00581021 */ addu $v0,$v0,$t8 -/* f116d80: 8c422638 */ lw $v0,0x2638($v0) +/* f116d80: 8c422638 */ lw $v0,%lo(var800a2380+0x2b8)($v0) /* f116d84: afa40000 */ sw $a0,0x0($sp) /* f116d88: 00021900 */ sll $v1,$v0,0x4 /* f116d8c: 0003cfc2 */ srl $t9,$v1,0x1f @@ -899,11 +899,11 @@ glabel func0f116db0 /* f116dd0: 0018c080 */ sll $t8,$t8,0x2 /* f116dd4: 030fc023 */ subu $t8,$t8,$t7 /* f116dd8: 0018c080 */ sll $t8,$t8,0x2 -/* f116ddc: 3c01800a */ lui $at,0x800a +/* f116ddc: 3c01800a */ lui $at,%hi(var800a2380+0x10) /* f116de0: 00380821 */ addu $at,$at,$t8 /* f116de4: afa40000 */ sw $a0,0x0($sp) /* f116de8: 03e00008 */ jr $ra -/* f116dec: ac252390 */ sw $a1,0x2390($at) +/* f116dec: ac252390 */ sw $a1,%lo(var800a2380+0x10)($at) ); GLOBAL_ASM( @@ -1083,11 +1083,11 @@ glabel func0f11702c /* f11704c: 0018c080 */ sll $t8,$t8,0x2 /* f117050: 030fc023 */ subu $t8,$t8,$t7 /* f117054: 0018c080 */ sll $t8,$t8,0x2 -/* f117058: 3c02800a */ lui $v0,0x800a +/* f117058: 3c02800a */ lui $v0,%hi(var800a2380+0x264) /* f11705c: 00581021 */ addu $v0,$v0,$t8 /* f117060: afa40000 */ sw $a0,0x0($sp) /* f117064: 03e00008 */ jr $ra -/* f117068: 8c4225e4 */ lw $v0,0x25e4($v0) +/* f117068: 8c4225e4 */ lw $v0,%lo(var800a2380+0x264)($v0) ); GLOBAL_ASM( @@ -1206,11 +1206,11 @@ glabel func0f117210 /* f117230: 0018c080 */ sll $t8,$t8,0x2 /* f117234: 030fc023 */ subu $t8,$t8,$t7 /* f117238: 0018c080 */ sll $t8,$t8,0x2 -/* f11723c: 3c02800a */ lui $v0,0x800a +/* f11723c: 3c02800a */ lui $v0,%hi(var800a2380+0x8) /* f117240: 00581021 */ addu $v0,$v0,$t8 /* f117244: afa40000 */ sw $a0,0x0($sp) /* f117248: 03e00008 */ jr $ra -/* f11724c: 8c422388 */ lw $v0,0x2388($v0) +/* f11724c: 8c422388 */ lw $v0,%lo(var800a2380+0x8)($v0) /* f117250: 00047600 */ sll $t6,$a0,0x18 /* f117254: 000e7e03 */ sra $t7,$t6,0x18 /* f117258: 000fc080 */ sll $t8,$t7,0x2 @@ -1222,11 +1222,11 @@ glabel func0f117210 /* f117270: 0018c080 */ sll $t8,$t8,0x2 /* f117274: 030fc023 */ subu $t8,$t8,$t7 /* f117278: 0018c080 */ sll $t8,$t8,0x2 -/* f11727c: 3c01800a */ lui $at,0x800a +/* f11727c: 3c01800a */ lui $at,%hi(var800a2380+0x8) /* f117280: 00380821 */ addu $at,$at,$t8 /* f117284: afa40000 */ sw $a0,0x0($sp) /* f117288: 03e00008 */ jr $ra -/* f11728c: ac252388 */ sw $a1,0x2388($at) +/* f11728c: ac252388 */ sw $a1,%lo(var800a2380+0x8)($at) /* f117290: 00047600 */ sll $t6,$a0,0x18 /* f117294: 000e7e03 */ sra $t7,$t6,0x18 /* f117298: 000fc080 */ sll $t8,$t7,0x2 @@ -1238,11 +1238,11 @@ glabel func0f117210 /* f1172b0: 0018c080 */ sll $t8,$t8,0x2 /* f1172b4: 030fc023 */ subu $t8,$t8,$t7 /* f1172b8: 0018c080 */ sll $t8,$t8,0x2 -/* f1172bc: 3c02800a */ lui $v0,0x800a +/* f1172bc: 3c02800a */ lui $v0,%hi(var800a2380+0x270) /* f1172c0: 00581021 */ addu $v0,$v0,$t8 /* f1172c4: afa40000 */ sw $a0,0x0($sp) /* f1172c8: 03e00008 */ jr $ra -/* f1172cc: 8c4225f0 */ lw $v0,0x25f0($v0) +/* f1172cc: 8c4225f0 */ lw $v0,%lo(var800a2380+0x270)($v0) /* f1172d0: 00047600 */ sll $t6,$a0,0x18 /* f1172d4: 000e7e03 */ sra $t7,$t6,0x18 /* f1172d8: 000fc080 */ sll $t8,$t7,0x2 @@ -1254,11 +1254,11 @@ glabel func0f117210 /* f1172f0: 0018c080 */ sll $t8,$t8,0x2 /* f1172f4: 030fc023 */ subu $t8,$t8,$t7 /* f1172f8: 0018c080 */ sll $t8,$t8,0x2 -/* f1172fc: 3c02800a */ lui $v0,0x800a +/* f1172fc: 3c02800a */ lui $v0,%hi(var800a2380+0x4) /* f117300: 00581021 */ addu $v0,$v0,$t8 /* f117304: afa40000 */ sw $a0,0x0($sp) /* f117308: 03e00008 */ jr $ra -/* f11730c: 8c422384 */ lw $v0,0x2384($v0) +/* f11730c: 8c422384 */ lw $v0,%lo(var800a2380+0x4)($v0) /* f117310: 00047600 */ sll $t6,$a0,0x18 /* f117314: 000e7e03 */ sra $t7,$t6,0x18 /* f117318: 000fc080 */ sll $t8,$t7,0x2 @@ -1270,11 +1270,11 @@ glabel func0f117210 /* f117330: 0018c080 */ sll $t8,$t8,0x2 /* f117334: 030fc023 */ subu $t8,$t8,$t7 /* f117338: 0018c080 */ sll $t8,$t8,0x2 -/* f11733c: 3c01800a */ lui $at,0x800a +/* f11733c: 3c01800a */ lui $at,%hi(var800a2380+0x4) /* f117340: 00380821 */ addu $at,$at,$t8 /* f117344: afa40000 */ sw $a0,0x0($sp) /* f117348: 03e00008 */ jr $ra -/* f11734c: ac252384 */ sw $a1,0x2384($at) +/* f11734c: ac252384 */ sw $a1,%lo(var800a2380+0x4)($at) /* f117350: 00047600 */ sll $t6,$a0,0x18 /* f117354: 000e7e03 */ sra $t7,$t6,0x18 /* f117358: 000fc080 */ sll $t8,$t7,0x2 @@ -1286,9 +1286,9 @@ glabel func0f117210 /* f117370: 0018c080 */ sll $t8,$t8,0x2 /* f117374: 030fc023 */ subu $t8,$t8,$t7 /* f117378: 0018c080 */ sll $t8,$t8,0x2 -/* f11737c: 3c02800a */ lui $v0,0x800a +/* f11737c: 3c02800a */ lui $v0,%hi(var800a2380+0x2b8) /* f117380: 00581021 */ addu $v0,$v0,$t8 -/* f117384: 8c422638 */ lw $v0,0x2638($v0) +/* f117384: 8c422638 */ lw $v0,%lo(var800a2380+0x2b8)($v0) /* f117388: afa40000 */ sw $a0,0x0($sp) /* f11738c: 0002cfc2 */ srl $t9,$v0,0x1f /* f117390: 03e00008 */ jr $ra @@ -2174,11 +2174,11 @@ glabel func0f117ec0 /* f117f60: 0018c080 */ sll $t8,$t8,0x2 /* f117f64: 030fc023 */ subu $t8,$t8,$t7 /* f117f68: 0018c080 */ sll $t8,$t8,0x2 -/* f117f6c: 3c02800a */ lui $v0,0x800a +/* f117f6c: 3c02800a */ lui $v0,%hi(var800a2380+0x2a4) /* f117f70: 00581021 */ addu $v0,$v0,$t8 /* f117f74: afa40000 */ sw $a0,0x0($sp) /* f117f78: 03e00008 */ jr $ra -/* f117f7c: 8c422624 */ lw $v0,0x2624($v0) +/* f117f7c: 8c422624 */ lw $v0,%lo(var800a2380+0x2a4)($v0) ); GLOBAL_ASM( @@ -2194,11 +2194,11 @@ glabel func0f117f80 /* f117fa0: 0018c080 */ sll $t8,$t8,0x2 /* f117fa4: 030fc023 */ subu $t8,$t8,$t7 /* f117fa8: 0018c080 */ sll $t8,$t8,0x2 -/* f117fac: 3c02800a */ lui $v0,0x800a +/* f117fac: 3c02800a */ lui $v0,%hi(var800a2380+0x2a8) /* f117fb0: 00581021 */ addu $v0,$v0,$t8 /* f117fb4: afa40000 */ sw $a0,0x0($sp) /* f117fb8: 03e00008 */ jr $ra -/* f117fbc: 8c422628 */ lw $v0,0x2628($v0) +/* f117fbc: 8c422628 */ lw $v0,%lo(var800a2380+0x2a8)($v0) ); GLOBAL_ASM( @@ -2214,11 +2214,11 @@ glabel func0f117fc0 /* f117fe0: 0018c080 */ sll $t8,$t8,0x2 /* f117fe4: 030fc023 */ subu $t8,$t8,$t7 /* f117fe8: 0018c080 */ sll $t8,$t8,0x2 -/* f117fec: 3c02800a */ lui $v0,0x800a +/* f117fec: 3c02800a */ lui $v0,%hi(var800a2380+0x2a0) /* f117ff0: 00581021 */ addu $v0,$v0,$t8 /* f117ff4: afa40000 */ sw $a0,0x0($sp) /* f117ff8: 03e00008 */ jr $ra -/* f117ffc: 8c422620 */ lw $v0,0x2620($v0) +/* f117ffc: 8c422620 */ lw $v0,%lo(var800a2380+0x2a0)($v0) ); GLOBAL_ASM( @@ -2338,7 +2338,7 @@ glabel func0f118148 /* f118184: afa2001c */ sw $v0,0x1c($sp) /* f118188: 8fa3001c */ lw $v1,0x1c($sp) /* f11818c: 83b9002b */ lb $t9,0x2b($sp) -/* f118190: 3c09800a */ lui $t1,0x800a +/* f118190: 3c09800a */ lui $t1,%hi(var800a2380+0x258) /* f118194: 00032a02 */ srl $a1,$v1,0x8 /* f118198: 307800ff */ andi $t8,$v1,0xff /* f11819c: 13000002 */ beqz $t8,.L0f1181a8 @@ -2355,7 +2355,7 @@ glabel func0f118148 /* f1181c4: 01194023 */ subu $t0,$t0,$t9 /* f1181c8: 00084080 */ sll $t0,$t0,0x2 /* f1181cc: 01284821 */ addu $t1,$t1,$t0 -/* f1181d0: 952925d8 */ lhu $t1,0x25d8($t1) +/* f1181d0: 952925d8 */ lhu $t1,%lo(var800a2380+0x258)($t1) /* f1181d4: 240a0080 */ addiu $t2,$zero,0x80 /* f1181d8: 8fa30024 */ lw $v1,0x24($sp) /* f1181dc: 01495823 */ subu $t3,$t2,$t1 @@ -2975,8 +2975,8 @@ glabel func0f1189d8 /* f118a70: 0c004e90 */ jal func00013a40 /* f118a74: 24040010 */ addiu $a0,$zero,0x10 /* f118a78: 240b0010 */ addiu $t3,$zero,0x10 -/* f118a7c: 3c01800a */ lui $at,0x800a -/* f118a80: a02ba490 */ sb $t3,-0x5b70($at) +/* f118a7c: 3c01800a */ lui $at,%hi(g_Vars+0x4d0) +/* f118a80: a02ba490 */ sb $t3,%lo(g_Vars+0x4d0)($at) /* f118a84: 24040004 */ addiu $a0,$zero,0x4 /* f118a88: 0fc45a72 */ jal func0f1169c8 /* f118a8c: 24050001 */ addiu $a1,$zero,0x1 @@ -2988,19 +2988,19 @@ glabel func0f1189d8 /* f118aa4: 02002025 */ or $a0,$s0,$zero /* f118aa8: 0fc43c81 */ jal func0f10f204 /* f118aac: 02002025 */ or $a0,$s0,$zero -/* f118ab0: 3c01800a */ lui $at,0x800a -/* f118ab4: a42022c4 */ sh $zero,0x22c4($at) +/* f118ab0: 3c01800a */ lui $at,%hi(var800a22c4) +/* f118ab4: a42022c4 */ sh $zero,%lo(var800a22c4)($at) /* f118ab8: 8fbf001c */ lw $ra,0x1c($sp) -/* f118abc: 3c01800a */ lui $at,0x800a +/* f118abc: 3c01800a */ lui $at,%hi(g_Vars+0x4e4) /* f118ac0: 240c00f5 */ addiu $t4,$zero,0xf5 /* f118ac4: 93ad0027 */ lbu $t5,0x27($sp) -/* f118ac8: a42ca4a4 */ sh $t4,-0x5b5c($at) -/* f118acc: 3c01800a */ lui $at,0x800a +/* f118ac8: a42ca4a4 */ sh $t4,%lo(g_Vars+0x4e4)($at) +/* f118acc: 3c01800a */ lui $at,%hi(g_Vars+0x4d0) /* f118ad0: 8fb00014 */ lw $s0,0x14($sp) /* f118ad4: 8fb10018 */ lw $s1,0x18($sp) /* f118ad8: 27bd0028 */ addiu $sp,$sp,0x28 /* f118adc: 03e00008 */ jr $ra -/* f118ae0: a02da490 */ sb $t5,-0x5b70($at) +/* f118ae0: a02da490 */ sb $t5,%lo(g_Vars+0x4d0)($at) ); GLOBAL_ASM( @@ -3342,9 +3342,9 @@ glabel func0f118d18 /* f118f84: 000a5080 */ sll $t2,$t2,0x2 /* f118f88: 01535023 */ subu $t2,$t2,$s3 /* f118f8c: 000a5080 */ sll $t2,$t2,0x2 -/* f118f90: 3c0b800a */ lui $t3,0x800a +/* f118f90: 3c0b800a */ lui $t3,%hi(var800a2380+0x2a4) /* f118f94: 016a5821 */ addu $t3,$t3,$t2 -/* f118f98: 8d6b2624 */ lw $t3,0x2624($t3) +/* f118f98: 8d6b2624 */ lw $t3,%lo(var800a2380+0x2a4)($t3) /* f118f9c: 3c0142c8 */ lui $at,0x42c8 /* f118fa0: 44812000 */ mtc1 $at,$f4 /* f118fa4: 448b3000 */ mtc1 $t3,$f6 @@ -3515,9 +3515,9 @@ glabel func0f1190bc /* f1191f4: 0019c880 */ sll $t9,$t9,0x2 /* f1191f8: 0333c823 */ subu $t9,$t9,$s3 /* f1191fc: 0019c880 */ sll $t9,$t9,0x2 -/* f119200: 3c08800a */ lui $t0,0x800a +/* f119200: 3c08800a */ lui $t0,%hi(var800a2380+0x2a0) /* f119204: 01194021 */ addu $t0,$t0,$t9 -/* f119208: 8d082620 */ lw $t0,0x2620($t0) +/* f119208: 8d082620 */ lw $t0,%lo(var800a2380+0x2a0)($t0) /* f11920c: 8fa90044 */ lw $t1,0x44($sp) /* f119210: 00132600 */ sll $a0,$s3,0x18 /* f119214: 12200009 */ beqz $s1,.L0f11923c @@ -4727,11 +4727,11 @@ glabel func0f11a2e4 /* f11a30c: 0018c080 */ sll $t8,$t8,0x2 /* f11a310: 030fc023 */ subu $t8,$t8,$t7 /* f11a314: 0018c080 */ sll $t8,$t8,0x2 -/* f11a318: 3c02800a */ lui $v0,0x800a +/* f11a318: 3c02800a */ lui $v0,%hi(var800a2380+0x14) /* f11a31c: 00581021 */ addu $v0,$v0,$t8 /* f11a320: afa40000 */ sw $a0,0x0($sp) /* f11a324: 03e00008 */ jr $ra -/* f11a328: 90422394 */ lbu $v0,0x2394($v0) +/* f11a328: 90422394 */ lbu $v0,%lo(var800a2380+0x14)($v0) ); GLOBAL_ASM( @@ -5448,10 +5448,10 @@ glabel func0f11ac7c /* f11ad30: 00094880 */ sll $t1,$t1,0x2 /* f11ad34: 01304823 */ subu $t1,$t1,$s0 /* f11ad38: 00094880 */ sll $t1,$t1,0x2 -/* f11ad3c: 3c01800a */ lui $at,0x800a +/* f11ad3c: 3c01800a */ lui $at,%hi(var800a2380+0x10) /* f11ad40: 00290821 */ addu $at,$at,$t1 /* f11ad44: 24080003 */ addiu $t0,$zero,0x3 -/* f11ad48: ac282390 */ sw $t0,0x2390($at) +/* f11ad48: ac282390 */ sw $t0,%lo(var800a2380+0x10)($at) /* f11ad4c: 24010004 */ addiu $at,$zero,0x4 /* f11ad50: 56010008 */ bnel $s0,$at,.L0f11ad74 /* f11ad54: 240a0001 */ addiu $t2,$zero,0x1 @@ -8143,7 +8143,7 @@ glabel func0f11d174 /* f11d184: 0fc52a9c */ jal func0f14aa70 /* f11d188: afa40028 */ sw $a0,0x28($sp) /* f11d18c: 83ae002b */ lb $t6,0x2b($sp) -/* f11d190: 3c05800a */ lui $a1,0x800a +/* f11d190: 3c05800a */ lui $a1,%hi(var800a2380+0x2b9) /* f11d194: 02002025 */ or $a0,$s0,$zero /* f11d198: 000e7880 */ sll $t7,$t6,0x2 /* f11d19c: 01ee7823 */ subu $t7,$t7,$t6 @@ -8155,7 +8155,7 @@ glabel func0f11d174 /* f11d1b4: 01ee7823 */ subu $t7,$t7,$t6 /* f11d1b8: 000f7880 */ sll $t7,$t7,0x2 /* f11d1bc: 00af2821 */ addu $a1,$a1,$t7 -/* f11d1c0: 90a52639 */ lbu $a1,0x2639($a1) +/* f11d1c0: 90a52639 */ lbu $a1,%lo(var800a2380+0x2b9)($a1) /* f11d1c4: 0fc47446 */ jal func0f11d118 /* f11d1c8: 00403025 */ or $a2,$v0,$zero /* f11d1cc: 0fc52b4e */ jal func0f14ad38 @@ -9250,8 +9250,8 @@ glabel var7f1b4fd8 /* f11e074: 100000b6 */ beqz $zero,.L0f11e350 /* f11e078: 8e0a02b8 */ lw $t2,0x2b8($s0) /* f11e07c: 83af0023 */ lb $t7,0x23($sp) -/* f11e080: 3c0e800a */ lui $t6,0x800a -/* f11e084: 91cea490 */ lbu $t6,-0x5b70($t6) +/* f11e080: 3c0e800a */ lui $t6,%hi(g_Vars+0x4d0) +/* f11e084: 91cea490 */ lbu $t6,%lo(g_Vars+0x4d0)($t6) /* f11e088: 24180001 */ addiu $t8,$zero,0x1 /* f11e08c: 01f8c804 */ sllv $t9,$t8,$t7 /* f11e090: 01d94024 */ and $t0,$t6,$t9 @@ -9269,8 +9269,8 @@ glabel var7f1b4fd8 /* f11e0b8: 100000a4 */ beqz $zero,.L0f11e34c /* f11e0bc: ae0a0010 */ sw $t2,0x10($s0) /* f11e0c0: 83ac0023 */ lb $t4,0x23($sp) -/* f11e0c4: 3c0b800a */ lui $t3,0x800a -/* f11e0c8: 916ba490 */ lbu $t3,-0x5b70($t3) +/* f11e0c4: 3c0b800a */ lui $t3,%hi(g_Vars+0x4d0) +/* f11e0c8: 916ba490 */ lbu $t3,%lo(g_Vars+0x4d0)($t3) /* f11e0cc: 240d0001 */ addiu $t5,$zero,0x1 /* f11e0d0: 018dc004 */ sllv $t8,$t5,$t4 /* f11e0d4: 01787024 */ and $t6,$t3,$t8 @@ -9341,8 +9341,8 @@ glabel var7f1b4fd8 /* f11e1d0: 24050001 */ addiu $a1,$zero,0x1 /* f11e1d4: 83aa0023 */ lb $t2,0x23($sp) .L0f11e1d8: -/* f11e1d8: 3c09800a */ lui $t1,0x800a -/* f11e1dc: 9129a490 */ lbu $t1,-0x5b70($t1) +/* f11e1d8: 3c09800a */ lui $t1,%hi(g_Vars+0x4d0) +/* f11e1dc: 9129a490 */ lbu $t1,%lo(g_Vars+0x4d0)($t1) /* f11e1e0: 240d0001 */ addiu $t5,$zero,0x1 /* f11e1e4: 014d6004 */ sllv $t4,$t5,$t2 /* f11e1e8: 012c5824 */ and $t3,$t1,$t4 @@ -9379,8 +9379,8 @@ glabel var7f1b4fd8 /* f11e264: 24050001 */ addiu $a1,$zero,0x1 /* f11e268: 83ad0023 */ lb $t5,0x23($sp) .L0f11e26c: -/* f11e26c: 3c0f800a */ lui $t7,0x800a -/* f11e270: 91efa490 */ lbu $t7,-0x5b70($t7) +/* f11e26c: 3c0f800a */ lui $t7,%hi(g_Vars+0x4d0) +/* f11e270: 91efa490 */ lbu $t7,%lo(g_Vars+0x4d0)($t7) /* f11e274: 24090001 */ addiu $t1,$zero,0x1 /* f11e278: 01a96004 */ sllv $t4,$t1,$t5 /* f11e27c: 01ec5824 */ and $t3,$t7,$t4 @@ -9404,8 +9404,8 @@ glabel var7f1b4fd8 /* f11e2c4: 24050001 */ addiu $a1,$zero,0x1 /* f11e2c8: 83b90023 */ lb $t9,0x23($sp) .L0f11e2cc: -/* f11e2cc: 3c0e800a */ lui $t6,0x800a -/* f11e2d0: 91cea490 */ lbu $t6,-0x5b70($t6) +/* f11e2cc: 3c0e800a */ lui $t6,%hi(g_Vars+0x4d0) +/* f11e2d0: 91cea490 */ lbu $t6,%lo(g_Vars+0x4d0)($t6) /* f11e2d4: 24080001 */ addiu $t0,$zero,0x1 /* f11e2d8: 03284804 */ sllv $t1,$t0,$t9 /* f11e2dc: 01c97824 */ and $t7,$t6,$t1 @@ -9484,11 +9484,11 @@ glabel func0f11e3bc /* f11e3dc: 0018c080 */ sll $t8,$t8,0x2 /* f11e3e0: 030fc023 */ subu $t8,$t8,$t7 /* f11e3e4: 0018c080 */ sll $t8,$t8,0x2 -/* f11e3e8: 3c01800a */ lui $at,0x800a +/* f11e3e8: 3c01800a */ lui $at,%hi(var800a2380+0x8) /* f11e3ec: 00380821 */ addu $at,$at,$t8 /* f11e3f0: afa40000 */ sw $a0,0x0($sp) /* f11e3f4: 03e00008 */ jr $ra -/* f11e3f8: ac202388 */ sw $zero,0x2388($at) +/* f11e3f8: ac202388 */ sw $zero,%lo(var800a2380+0x8)($at) ); GLOBAL_ASM( diff --git a/src/game/pdoptions.c b/src/game/pdoptions.c index f5f115a23..afedc47ec 100644 --- a/src/game/pdoptions.c +++ b/src/game/pdoptions.c @@ -228,15 +228,15 @@ s32 optionsGetEffectiveScreenSize(void) if (var800a19c4 == 13) { g_MpPlayerNum = 0; - if (g_MenuStack[g_MpPlayerNum].unk00 && var8009dfc0) { + if (g_MenuStack[g_MpPlayerNum].unk4f8 && var8009dfc0) { return SCREENSIZE_FULL; } } - if (g_MenuStack[g_MpPlayerNum].unk00 && ( - g_MenuStack[g_MpPlayerNum].unk00->dialog == &menudialog_control4 || - g_MenuStack[g_MpPlayerNum].unk00->dialog == &menudialog_control3 || - g_MenuStack[g_MpPlayerNum].unk00->dialog == &g_ControlStyleSingleMenuDialog)) { + if (g_MenuStack[g_MpPlayerNum].unk4f8 && ( + g_MenuStack[g_MpPlayerNum].unk4f8->dialog == &menudialog_control4 || + g_MenuStack[g_MpPlayerNum].unk4f8->dialog == &menudialog_control3 || + g_MenuStack[g_MpPlayerNum].unk4f8->dialog == &g_ControlStyleSingleMenuDialog)) { return SCREENSIZE_FULL; } diff --git a/src/game/propobj.c b/src/game/propobj.c index 5c6e162e0..cd9d8f120 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -2346,8 +2346,8 @@ glabel func0f06803c /* f068060: afa70064 */ sw $a3,0x64($sp) /* f068064: 0c002f9d */ jal func0000be74 /* f068068: 46000586 */ mov.s $f22,$f0 -/* f06806c: 3c02800a */ lui $v0,0x800a -/* f068070: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f06806c: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f068070: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f068074: 46000506 */ mov.s $f20,$f0 /* f068078: 8faa005c */ lw $t2,0x5c($sp) /* f06807c: 8c4f1c54 */ lw $t7,0x1c54($v0) @@ -2436,8 +2436,8 @@ glabel func0f06803c GLOBAL_ASM( glabel func0f0681c0 -/* f0681c0: 3c02800a */ lui $v0,0x800a -/* f0681c4: 8c42a2fc */ lw $v0,-0x5d04($v0) +/* f0681c0: 3c02800a */ lui $v0,%hi(g_Vars+0x33c) +/* f0681c4: 8c42a2fc */ lw $v0,%lo(g_Vars+0x33c)($v0) /* f0681c8: 24050001 */ addiu $a1,$zero,0x1 /* f0681cc: 50400010 */ beqzl $v0,.L0f068210 /* f0681d0: 00001025 */ or $v0,$zero,$zero @@ -2467,8 +2467,8 @@ GLOBAL_ASM( glabel func0f068218 /* f068218: 27bdffc0 */ addiu $sp,$sp,-64 /* f06821c: afb00014 */ sw $s0,0x14($sp) -/* f068220: 3c10800a */ lui $s0,0x800a -/* f068224: 8e10a2fc */ lw $s0,-0x5d04($s0) +/* f068220: 3c10800a */ lui $s0,%hi(g_Vars+0x33c) +/* f068224: 8e10a2fc */ lw $s0,%lo(g_Vars+0x33c)($s0) /* f068228: afb50028 */ sw $s5,0x28($sp) /* f06822c: afb10018 */ sw $s1,0x18($sp) /* f068230: 00808825 */ or $s1,$a0,$zero @@ -2845,8 +2845,8 @@ glabel func0f0686f0 /* f0686f8: 00001025 */ or $v0,$zero,$zero /* f0686fc: 00002025 */ or $a0,$zero,$zero /* f068700: 18600014 */ blez $v1,.L0f068754 -/* f068704: 3c05800a */ lui $a1,%hi(var800a0048) -/* f068708: 8ca5ce6c */ lw $a1,-0x3194($a1) +/* f068704: 3c05800a */ lui $a1,%hi(var8009ce6c) +/* f068708: 8ca5ce6c */ lw $a1,%lo(var8009ce6c)($a1) .L0f06870c: /* f06870c: 8cae0000 */ lw $t6,0x0($a1) /* f068710: 31cf0001 */ andi $t7,$t6,0x1 @@ -2866,7 +2866,7 @@ glabel func0f0686f0 /* f068744: 0043082a */ slt $at,$v0,$v1 /* f068748: 24840048 */ addiu $a0,$a0,0x48 /* f06874c: 1420ffef */ bnez $at,.L0f06870c -/* f068750: 24a50048 */ addiu $a1,$a1,%lo(var800a0048) +/* f068750: 24a50048 */ addiu $a1,$a1,72 .L0f068754: /* f068754: 00001025 */ or $v0,$zero,$zero /* f068758: 03e00008 */ jr $ra @@ -3304,8 +3304,8 @@ glabel func0f068c04 /* f068ca8: 847900c4 */ lh $t9,0xc4($v1) /* f068cac: 5728007c */ bnel $t9,$t0,.L0f068ea0 /* f068cb0: 8fa70128 */ lw $a3,0x128($sp) -/* f068cb4: 3c02800a */ lui $v0,0x800a -/* f068cb8: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f068cb4: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f068cb8: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f068cbc: afa70128 */ sw $a3,0x128($sp) /* f068cc0: 8c4900bc */ lw $t1,0xbc($v0) /* f068cc4: 51200076 */ beqzl $t1,.L0f068ea0 @@ -5004,8 +5004,8 @@ glabel func0f06a1ec /* f06a434: ae000014 */ sw $zero,0x14($s0) /* f06a438: ae000018 */ sw $zero,0x18($s0) .L0f06a43c: -/* f06a43c: 3c0d800a */ lui $t5,0x800a -/* f06a440: 8dada2d8 */ lw $t5,-0x5d28($t5) +/* f06a43c: 3c0d800a */ lui $t5,%hi(g_Vars+0x318) +/* f06a440: 8dada2d8 */ lw $t5,%lo(g_Vars+0x318)($t5) /* f06a444: 51a00035 */ beqzl $t5,.L0f06a51c /* f06a448: 8fbf001c */ lw $ra,0x1c($sp) /* f06a44c: 50c00033 */ beqzl $a2,.L0f06a51c @@ -5018,14 +5018,14 @@ glabel func0f06a1ec /* f06a468: 8fbf001c */ lw $ra,0x1c($sp) /* f06a46c: 9202005c */ lbu $v0,0x5c($s0) /* f06a470: 24010057 */ addiu $at,$zero,0x57 -/* f06a474: 3c0f800b */ lui $t7,0x800b +/* f06a474: 3c0f800b */ lui $t7,%hi(g_MpSetup+0x10) /* f06a478: 54410014 */ bnel $v0,$at,.L0f06a4cc /* f06a47c: 24010036 */ addiu $at,$zero,0x36 -/* f06a480: 91efcb98 */ lbu $t7,-0x3468($t7) +/* f06a480: 91efcb98 */ lbu $t7,%lo(g_MpSetup+0x10)($t7) /* f06a484: 24010001 */ addiu $at,$zero,0x1 /* f06a488: 15e10002 */ bne $t7,$at,.L0f06a494 -/* f06a48c: 3c01800b */ lui $at,0x800b -/* f06a490: ac26c114 */ sw $a2,-0x3eec($at) +/* f06a48c: 3c01800b */ lui $at,%hi(g_ScenarioData+0x4) +/* f06a490: ac26c114 */ sw $a2,%lo(g_ScenarioData+0x4)($at) .L0f06a494: /* f06a494: 90d9003f */ lbu $t9,0x3f($a2) /* f06a498: 3c010042 */ lui $at,0x42 @@ -5043,12 +5043,12 @@ glabel func0f06a1ec /* f06a4c8: 24010036 */ addiu $at,$zero,0x36 .L0f06a4cc: /* f06a4cc: 14410012 */ bne $v0,$at,.L0f06a518 -/* f06a4d0: 3c0d800b */ lui $t5,0x800b -/* f06a4d4: 91adcb98 */ lbu $t5,-0x3468($t5) +/* f06a4d0: 3c0d800b */ lui $t5,%hi(g_MpSetup+0x10) +/* f06a4d4: 91adcb98 */ lbu $t5,%lo(g_MpSetup+0x10)($t5) /* f06a4d8: 24010002 */ addiu $at,$zero,0x2 /* f06a4dc: 15a10002 */ bne $t5,$at,.L0f06a4e8 -/* f06a4e0: 3c01800b */ lui $at,0x800b -/* f06a4e4: ac26c24c */ sw $a2,-0x3db4($at) +/* f06a4e0: 3c01800b */ lui $at,%hi(g_ScenarioData+0x13c) +/* f06a4e4: ac26c24c */ sw $a2,%lo(g_ScenarioData+0x13c)($at) .L0f06a4e8: /* f06a4e8: 90cf003f */ lbu $t7,0x3f($a2) /* f06a4ec: 3c010042 */ lui $at,0x42 @@ -6267,11 +6267,11 @@ glabel func0f06b488 /* f06b5d8: ac2e9930 */ sw $t6,-0x66d0($at) /* f06b5dc: 3c018007 */ lui $at,0x8007 /* f06b5e0: ac209934 */ sw $zero,-0x66cc($at) -/* f06b5e4: 3c01800a */ lui $at,0x800a -/* f06b5e8: ac20ce70 */ sw $zero,-0x3190($at) -/* f06b5ec: 3c01800a */ lui $at,0x800a +/* f06b5e4: 3c01800a */ lui $at,%hi(var8009ce70) +/* f06b5e8: ac20ce70 */ sw $zero,%lo(var8009ce70)($at) +/* f06b5ec: 3c01800a */ lui $at,%hi(var8009ce74) /* f06b5f0: 10000002 */ beqz $zero,.L0f06b5fc -/* f06b5f4: ac20ce74 */ sw $zero,-0x318c($at) +/* f06b5f4: ac20ce74 */ sw $zero,%lo(var8009ce74)($at) .L0f06b5f8: /* f06b5f8: 00001025 */ or $v0,$zero,$zero .L0f06b5fc: @@ -6463,8 +6463,8 @@ glabel func0f06b610 /* f06b8bc: 3c018007 */ lui $at,0x8007 /* f06b8c0: c7a600b4 */ lwc1 $f6,0xb4($sp) /* f06b8c4: ac399930 */ sw $t9,-0x66d0($at) -/* f06b8c8: 3c01800a */ lui $at,0x800a -/* f06b8cc: ac34ce70 */ sw $s4,-0x3190($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) @@ -6472,8 +6472,8 @@ glabel func0f06b610 /* f06b8e0: 87a900dc */ lh $t1,0xdc($sp) /* f06b8e4: ac359934 */ sw $s5,-0x66cc($at) /* f06b8e8: 4600310d */ trunc.w.s $f4,$f6 -/* f06b8ec: 3c01800a */ lui $at,0x800a -/* f06b8f0: ac28ce74 */ sw $t0,-0x318c($at) +/* f06b8ec: 3c01800a */ lui $at,%hi(var8009ce74) +/* f06b8f0: ac28ce74 */ sw $t0,%lo(var8009ce74)($at) /* f06b8f4: 4600548d */ trunc.w.s $f18,$f10 /* f06b8f8: 05210003 */ bgez $t1,.L0f06b908 /* f06b8fc: 00095043 */ sra $t2,$t1,0x1 @@ -6719,11 +6719,11 @@ glabel func0f06b610 /* f06bc80: ac2a9930 */ sw $t2,-0x66d0($at) /* f06bc84: 3c018007 */ lui $at,0x8007 /* f06bc88: ac359934 */ sw $s5,-0x66cc($at) -/* f06bc8c: 3c01800a */ lui $at,0x800a -/* f06bc90: ac34ce70 */ sw $s4,-0x3190($at) +/* f06bc8c: 3c01800a */ lui $at,%hi(var8009ce70) +/* f06bc90: ac34ce70 */ sw $s4,%lo(var8009ce70)($at) /* f06bc94: 87a200de */ lh $v0,0xde($sp) -/* f06bc98: 3c01800a */ lui $at,0x800a -/* f06bc9c: ac2cce74 */ sw $t4,-0x318c($at) +/* f06bc98: 3c01800a */ lui $at,%hi(var8009ce74) +/* f06bc9c: ac2cce74 */ sw $t4,%lo(var8009ce74)($at) /* f06bca0: 3c018007 */ lui $at,0x8007 /* f06bca4: ac229944 */ sw $v0,-0x66bc($at) /* f06bca8: 24012710 */ addiu $at,$zero,0x2710 @@ -6776,13 +6776,13 @@ glabel func0f06b610 /* f06bd58: 0fc1ad22 */ jal func0f06b488 /* f06bd5c: afaa0010 */ sw $t2,0x10($sp) /* f06bd60: 10400007 */ beqz $v0,.L0f06bd80 -/* f06bd64: 3c01800a */ lui $at,0x800a -/* f06bd68: ac34ce70 */ sw $s4,-0x3190($at) +/* f06bd64: 3c01800a */ lui $at,%hi(var8009ce70) +/* f06bd68: ac34ce70 */ sw $s4,%lo(var8009ce70)($at) /* f06bd6c: 8e8c0008 */ lw $t4,0x8($s4) -/* f06bd70: 3c01800a */ lui $at,0x800a +/* f06bd70: 3c01800a */ lui $at,%hi(var8009ce74) /* f06bd74: 241e0001 */ addiu $s8,$zero,0x1 /* f06bd78: 8d8b0000 */ lw $t3,0x0($t4) -/* f06bd7c: ac2bce74 */ sw $t3,-0x318c($at) +/* f06bd7c: ac2bce74 */ sw $t3,%lo(var8009ce74)($at) .L0f06bd80: /* f06bd80: 8fa20114 */ lw $v0,0x114($sp) .L0f06bd84: @@ -7400,8 +7400,8 @@ glabel func0f06c28c /* f06c5b4: ac399930 */ sw $t9,-0x66d0($at) /* f06c5b8: 4600518d */ trunc.w.s $f6,$f10 /* f06c5bc: 8fa800d0 */ lw $t0,0xd0($sp) -/* f06c5c0: 3c01800a */ lui $at,0x800a -/* f06c5c4: ac32ce70 */ sw $s2,-0x3190($at) +/* f06c5c0: 3c01800a */ lui $at,%hi(var8009ce70) +/* f06c5c4: ac32ce70 */ sw $s2,%lo(var8009ce70)($at) /* f06c5c8: 8fa900cc */ lw $t1,0xcc($sp) /* f06c5cc: c7a40080 */ lwc1 $f4,0x80($sp) /* f06c5d0: c7aa0084 */ lwc1 $f10,0x84($sp) @@ -7409,9 +7409,9 @@ glabel func0f06c28c /* f06c5d8: 87ab00a4 */ lh $t3,0xa4($sp) /* f06c5dc: ac289934 */ sw $t0,-0x66cc($at) /* f06c5e0: 440e3000 */ mfc1 $t6,$f6 -/* f06c5e4: 3c01800a */ lui $at,0x800a +/* f06c5e4: 3c01800a */ lui $at,%hi(var8009ce74) /* f06c5e8: 4600220d */ trunc.w.s $f8,$f4 -/* f06c5ec: ac29ce74 */ sw $t1,-0x318c($at) +/* f06c5ec: ac29ce74 */ sw $t1,%lo(var8009ce74)($at) /* f06c5f0: 05610003 */ bgez $t3,.L0f06c600 /* f06c5f4: 000b5043 */ sra $t2,$t3,0x1 /* f06c5f8: 25610001 */ addiu $at,$t3,0x1 @@ -7514,15 +7514,15 @@ glabel func0f06c28c /* f06c75c: 3c018007 */ lui $at,0x8007 /* f06c760: 8faf00d0 */ lw $t7,0xd0($sp) /* f06c764: ac2d9930 */ sw $t5,-0x66d0($at) -/* f06c768: 3c01800a */ lui $at,0x800a -/* f06c76c: ac32ce70 */ sw $s2,-0x3190($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) -/* f06c77c: 3c01800a */ lui $at,0x800a +/* f06c77c: 3c01800a */ lui $at,%hi(var8009ce74) /* f06c780: 24190001 */ addiu $t9,$zero,0x1 /* f06c784: afb900c8 */ sw $t9,0xc8($sp) -/* f06c788: ac38ce74 */ sw $t8,-0x318c($at) +/* f06c788: ac38ce74 */ sw $t8,%lo(var8009ce74)($at) .L0f06c78c: /* f06c78c: 10000010 */ beqz $zero,.L0f06c7d0 /* f06c790: 8faa00e8 */ lw $t2,0xe8($sp) @@ -9904,8 +9904,8 @@ glabel func0f06e87c /* f06e8fc: 00006810 */ mfhi $t5 /* f06e900: afad005c */ sw $t5,0x5c($sp) /* f06e904: 8e0e0048 */ lw $t6,0x48($s0) -/* f06e908: 3c18800a */ lui $t8,0x800a -/* f06e90c: 8f189fc8 */ lw $t8,-0x6038($t8) +/* f06e908: 3c18800a */ lui $t8,%hi(g_Vars+0x8) +/* f06e90c: 8f189fc8 */ lw $t8,%lo(g_Vars+0x8)($t8) /* f06e910: 8dcf009c */ lw $t7,0x9c($t6) /* f06e914: 24050001 */ addiu $a1,$zero,0x1 /* f06e918: 2719fffa */ addiu $t9,$t8,-6 @@ -9940,8 +9940,8 @@ glabel func0f06e87c /* f06e98c: e7a00030 */ swc1 $f0,0x30($sp) /* f06e990: 0fc24e7e */ jal func0f0939f8 /* f06e994: e7a00024 */ swc1 $f0,0x24($sp) -/* f06e998: 3c0c800a */ lui $t4,0x800a -/* f06e99c: 8d8c9fc8 */ lw $t4,-0x6038($t4) +/* f06e998: 3c0c800a */ lui $t4,%hi(g_Vars+0x8) +/* f06e99c: 8d8c9fc8 */ lw $t4,%lo(g_Vars+0x8)($t4) /* f06e9a0: 8e0d0048 */ lw $t5,0x48($s0) /* f06e9a4: 10000004 */ beqz $zero,.L0f06e9b8 /* f06e9a8: adac009c */ sw $t4,0x9c($t5) @@ -10588,13 +10588,13 @@ glabel func0f06f0a0 /* f06f298: 8fa40028 */ lw $a0,0x28($sp) /* f06f29c: 3c06800a */ lui $a2,%hi(var8009ce70) /* f06f2a0: 90a80001 */ lbu $t0,0x1($a1) -/* f06f2a4: 3c07800a */ lui $a3,%hi(var800a0028) +/* f06f2a4: 3c07800a */ lui $a3,%hi(var8009ce74) /* f06f2a8: 31090002 */ andi $t1,$t0,0x2 /* f06f2ac: 5120000a */ beqzl $t1,.L0f06f2d8 /* f06f2b0: 8e0c0040 */ lw $t4,0x40($s0) /* f06f2b4: 8cc6ce70 */ lw $a2,%lo(var8009ce70)($a2) /* f06f2b8: 0fc1bbd1 */ jal func0f06ef44 -/* f06f2bc: 8ce7ce74 */ lw $a3,-0x318c($a3) +/* f06f2bc: 8ce7ce74 */ lw $a3,%lo(var8009ce74)($a3) /* f06f2c0: 1040000f */ beqz $v0,.L0f06f300 /* f06f2c4: 8fab0034 */ lw $t3,0x34($sp) /* f06f2c8: 240a0001 */ addiu $t2,$zero,0x1 @@ -10612,7 +10612,7 @@ glabel func0f06f0a0 /* f06f2f0: 8fa5002c */ lw $a1,0x2c($sp) /* f06f2f4: 2406ffff */ addiu $a2,$zero,-1 /* f06f2f8: 0fc2a132 */ jal func0f0a84c8 -/* f06f2fc: 24e70028 */ addiu $a3,$a3,%lo(var800a0028) +/* f06f2fc: 24e70028 */ addiu $a3,$a3,40 .L0f06f300: /* f06f300: 8fbf001c */ lw $ra,0x1c($sp) /* f06f304: 8fb00018 */ lw $s0,0x18($sp) @@ -12211,8 +12211,8 @@ glabel func0f07079c GLOBAL_ASM( glabel func0f07092c /* f07092c: 27bdffe8 */ addiu $sp,$sp,-24 -/* f070930: 3c02800a */ lui $v0,%hi(var800a1bb0) -/* f070934: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f070930: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f070934: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f070938: afbf0014 */ sw $ra,0x14($sp) /* f07093c: afa5001c */ sw $a1,0x1c($sp) /* f070940: afa60020 */ sw $a2,0x20($sp) @@ -12226,7 +12226,7 @@ glabel func0f07092c /* f070960: c4521bb8 */ lwc1 $f18,0x1bb8($v0) /* f070964: 460a4081 */ sub.s $f2,$f8,$f10 /* f070968: 46000102 */ mul.s $f4,$f0,$f0 -/* f07096c: 24421bb0 */ addiu $v0,$v0,%lo(var800a1bb0) +/* f07096c: 24421bb0 */ addiu $v0,$v0,7088 /* f070970: 46128381 */ sub.s $f14,$f16,$f18 /* f070974: 46021182 */ mul.s $f6,$f2,$f2 /* f070978: 46062200 */ add.s $f8,$f4,$f6 @@ -12839,8 +12839,8 @@ glabel var7f1aa2c8 /* f0713e8: afbf001c */ sw $ra,0x1c($sp) /* f0713ec: afa40040 */ sw $a0,0x40($sp) /* f0713f0: afa50044 */ sw $a1,0x44($sp) -/* f0713f4: 3c18800a */ lui $t8,0x800a -/* f0713f8: 8f189fc8 */ lw $t8,-0x6038($t8) +/* f0713f4: 3c18800a */ lui $t8,%hi(g_Vars+0x8) +/* f0713f8: 8f189fc8 */ lw $t8,%lo(g_Vars+0x8)($t8) /* f0713fc: 8caf0038 */ lw $t7,0x38($a1) /* f071400: 01f8082a */ slt $at,$t7,$t8 /* f071404: 50200029 */ beqzl $at,.L0f0714ac @@ -12881,9 +12881,9 @@ glabel var7f1aa2c8 /* f071490: c4420034 */ lwc1 $f2,0x34($v0) /* f071494: 8fa20044 */ lw $v0,0x44($sp) .L0f071498: -/* f071498: 3c19800a */ lui $t9,0x800a +/* f071498: 3c19800a */ lui $t9,%hi(g_Vars+0x8) /* f07149c: e4420034 */ swc1 $f2,0x34($v0) -/* f0714a0: 8f399fc8 */ lw $t9,-0x6038($t9) +/* f0714a0: 8f399fc8 */ lw $t9,%lo(g_Vars+0x8)($t9) /* f0714a4: ac59003c */ sw $t9,0x3c($v0) /* f0714a8: 8fbf001c */ lw $ra,0x1c($sp) .L0f0714ac: @@ -12938,8 +12938,8 @@ glabel var7f1aa314 /* f0714bc: afbf004c */ sw $ra,0x4c($sp) /* f0714c0: afb10048 */ sw $s1,0x48($sp) /* f0714c4: afb00044 */ sw $s0,0x44($sp) -/* f0714c8: 3c0f800a */ lui $t7,0x800a -/* f0714cc: 8def9fc8 */ lw $t7,-0x6038($t7) +/* f0714c8: 3c0f800a */ lui $t7,%hi(g_Vars+0x8) +/* f0714cc: 8def9fc8 */ lw $t7,%lo(g_Vars+0x8)($t7) /* f0714d0: 8cae0038 */ lw $t6,0x38($a1) /* f0714d4: 00a08025 */ or $s0,$a1,$zero /* f0714d8: 00808825 */ or $s1,$a0,$zero @@ -12960,8 +12960,8 @@ glabel var7f1aa314 /* f071514: 012a5821 */ addu $t3,$t1,$t2 /* f071518: afab00c0 */ sw $t3,0xc0($sp) /* f07151c: afa0008c */ sw $zero,0x8c($sp) -/* f071520: 3c03800a */ lui $v1,0x800a -/* f071524: 8c639fc8 */ lw $v1,-0x6038($v1) +/* f071520: 3c03800a */ lui $v1,%hi(g_Vars+0x8) +/* f071524: 8c639fc8 */ lw $v1,%lo(g_Vars+0x8)($v1) /* f071528: 8e0c003c */ lw $t4,0x3c($s0) /* f07152c: 00404025 */ or $t0,$v0,$zero /* f071530: 0183082a */ slt $at,$t4,$v1 @@ -12976,8 +12976,8 @@ glabel var7f1aa314 /* f071554: 24460008 */ addiu $a2,$v0,0x8 /* f071558: 0fc1c4f9 */ jal func0f0713e4 /* f07155c: 24470028 */ addiu $a3,$v0,0x28 -/* f071560: 3c03800a */ lui $v1,0x800a -/* f071564: 8c639fc8 */ lw $v1,-0x6038($v1) +/* f071560: 3c03800a */ lui $v1,%hi(g_Vars+0x8) +/* f071564: 8c639fc8 */ lw $v1,%lo(g_Vars+0x8)($v1) /* f071568: 8fa801c0 */ lw $t0,0x1c0($sp) /* f07156c: ae030038 */ sw $v1,0x38($s0) .L0f071570: @@ -13186,8 +13186,8 @@ glabel var7f1aa314 /* f071870: 8e2d0040 */ lw $t5,0x40($s1) /* f071874: 000d7100 */ sll $t6,$t5,0x4 /* f071878: 05c1000c */ bgez $t6,.L0f0718ac -/* f07187c: 3c0f800a */ lui $t7,0x800a -/* f071880: 8defa244 */ lw $t7,-0x5dbc($t7) +/* f07187c: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) +/* f071880: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) /* f071884: 3c01428c */ lui $at,0x428c /* f071888: 44813000 */ mtc1 $at,$f6 /* f07188c: c5e00078 */ lwc1 $f0,0x78($t7) @@ -15138,8 +15138,8 @@ glabel func0f0732d4 /* f073340: 27b40058 */ addiu $s4,$sp,0x58 /* f073344: 85e20000 */ lh $v0,0x0($t7) .L0f073348: -/* f073348: 3c19800a */ lui $t9,0x800a -/* f07334c: 8f39a2f8 */ lw $t9,-0x5d08($t9) +/* f073348: 3c19800a */ lui $t9,%hi(g_Vars+0x338) +/* f07334c: 8f39a2f8 */ lw $t9,%lo(g_Vars+0x338)($t9) /* f073350: 0002c0c0 */ sll $t8,$v0,0x3 /* f073354: 0302c021 */ addu $t8,$t8,$v0 /* f073358: 0018c0c0 */ sll $t8,$t8,0x3 @@ -15942,12 +15942,12 @@ glabel var7f1aa438 /* f073dec: c61000e4 */ lwc1 $f16,0xe4($s0) .L0f073df0: /* f073df0: 44812000 */ mtc1 $at,$f4 -/* f073df4: 3c03800a */ lui $v1,0x800a +/* f073df4: 3c03800a */ lui $v1,%hi(g_Vars+0x38) /* f073df8: 4604803c */ c.lt.s $f16,$f4 /* f073dfc: 00000000 */ sll $zero,$zero,0x0 /* f073e00: 45020045 */ bc1fl .L0f073f18 /* f073e04: c60e0004 */ lwc1 $f14,0x4($s0) -/* f073e08: 8c639ff8 */ lw $v1,-0x6008($v1) +/* f073e08: 8c639ff8 */ lw $v1,%lo(g_Vars+0x38)($v1) /* f073e0c: 00001025 */ or $v0,$zero,$zero /* f073e10: 58600041 */ blezl $v1,.L0f073f18 /* f073e14: c60e0004 */ lwc1 $f14,0x4($s0) @@ -15960,11 +15960,11 @@ glabel var7f1aa438 /* f073e2c: 45020008 */ bc1fl .L0f073e50 /* f073e30: 0043082a */ slt $at,$v0,$v1 /* f073e34: 46020181 */ sub.s $f6,$f0,$f2 -/* f073e38: 3c03800a */ lui $v1,0x800a +/* f073e38: 3c03800a */ lui $v1,%hi(g_Vars+0x38) /* f073e3c: 46103202 */ mul.s $f8,$f6,$f16 /* f073e40: 46081280 */ add.s $f10,$f2,$f8 /* f073e44: e60a00dc */ swc1 $f10,0xdc($s0) -/* f073e48: 8c639ff8 */ lw $v1,-0x6008($v1) +/* f073e48: 8c639ff8 */ lw $v1,%lo(g_Vars+0x38)($v1) /* f073e4c: 0043082a */ slt $at,$v0,$v1 .L0f073e50: /* f073e50: 5420fff3 */ bnezl $at,.L0f073e20 @@ -17395,8 +17395,8 @@ glabel var7f1aa438 /* f075368: 0c005755 */ jal func00015d54 /* f07536c: e7aa05e4 */ swc1 $f10,0x5e4($sp) /* f075370: 26050020 */ addiu $a1,$s0,0x20 -/* f075374: 3c06800a */ lui $a2,0x800a -/* f075378: 8cc69ff4 */ lw $a2,-0x600c($a2) +/* f075374: 3c06800a */ lui $a2,%hi(g_Vars+0x34) +/* f075378: 8cc69ff4 */ lw $a2,%lo(g_Vars+0x34)($a2) /* f07537c: afa50064 */ sw $a1,0x64($sp) /* f075380: 0fc259a6 */ jal func0f096698 /* f075384: 27a4030c */ addiu $a0,$sp,0x30c @@ -17624,11 +17624,11 @@ glabel var7f1aa438 /* f0756a8: 3c0542c8 */ lui $a1,0x42c8 /* f0756ac: 8c8d000c */ lw $t5,0xc($a0) /* f0756b0: 8fa60070 */ lw $a2,0x70($sp) -/* f0756b4: 3c0b800a */ lui $t3,0x800a +/* f0756b4: 3c0b800a */ lui $t3,%hi(g_Vars+0x28c) /* f0756b8: 31aa4000 */ andi $t2,$t5,0x4000 /* f0756bc: 5540001a */ bnezl $t2,.L0f075728 /* f0756c0: 8fae034c */ lw $t6,0x34c($sp) -/* f0756c4: 8d6ba24c */ lw $t3,-0x5db4($t3) +/* f0756c4: 8d6ba24c */ lw $t3,%lo(g_Vars+0x28c)($t3) /* f0756c8: 9107005c */ lbu $a3,0x5c($t0) /* f0756cc: afa001f8 */ sw $zero,0x1f8($sp) /* f0756d0: 0fc2149c */ jal func0f085270 @@ -17873,8 +17873,8 @@ glabel var7f1aa438 /* f075a58: 8f0d0004 */ lw $t5,0x4($t8) /* f075a5c: 11a00027 */ beqz $t5,.L0f075afc .L0f075a60: -/* f075a60: 3c0b800a */ lui $t3,0x800a -/* f075a64: 8d6ba2d8 */ lw $t3,-0x5d28($t3) +/* f075a60: 3c0b800a */ lui $t3,%hi(g_Vars+0x318) +/* f075a64: 8d6ba2d8 */ lw $t3,%lo(g_Vars+0x318)($t3) /* f075a68: 00001825 */ or $v1,$zero,$zero /* f075a6c: 2627005c */ addiu $a3,$s1,0x5c /* f075a70: 11600008 */ beqz $t3,.L0f075a94 @@ -18069,10 +18069,10 @@ glabel var7f1aa438 /* f075d18: 8fae01f4 */ lw $t6,0x1f4($sp) /* f075d1c: 90890000 */ lbu $t1,0x0($a0) /* f075d20: 24010006 */ addiu $at,$zero,0x6 -/* f075d24: 3c18800a */ lui $t8,0x800a +/* f075d24: 3c18800a */ lui $t8,%hi(g_Vars+0x28c) /* f075d28: 15210065 */ bne $t1,$at,.L0f075ec0 /* f075d2c: 2627005c */ addiu $a3,$s1,0x5c -/* f075d30: 8f18a24c */ lw $t8,-0x5db4($t8) +/* f075d30: 8f18a24c */ lw $t8,%lo(g_Vars+0x28c)($t8) /* f075d34: afa70070 */ sw $a3,0x70($sp) /* f075d38: 0fc4a25f */ jal propGetPlayerNum /* f075d3c: afb80164 */ sw $t8,0x164($sp) @@ -18125,9 +18125,9 @@ glabel var7f1aa438 /* f075dec: 0fc4a25f */ jal propGetPlayerNum /* f075df0: afa70070 */ sw $a3,0x70($sp) /* f075df4: 00025880 */ sll $t3,$v0,0x2 -/* f075df8: 3c0f800a */ lui $t7,0x800a +/* f075df8: 3c0f800a */ lui $t7,%hi(g_Vars+0x64) /* f075dfc: 01eb7821 */ addu $t7,$t7,$t3 -/* f075e00: 8defa024 */ lw $t7,-0x5fdc($t7) +/* f075e00: 8defa024 */ lw $t7,%lo(g_Vars+0x64)($t7) /* f075e04: 8fa6015c */ lw $a2,0x15c($sp) /* f075e08: 8fa70070 */ lw $a3,0x70($sp) /* f075e0c: 8dea00d8 */ lw $t2,0xd8($t7) @@ -18565,10 +18565,10 @@ glabel var7f1aa438 /* f07643c: 5540000d */ bnezl $t2,.L0f076474 /* f076440: 8e190090 */ lw $t9,0x90($s0) /* f076444: 8e020094 */ lw $v0,0x94($s0) -/* f076448: 3c0c800a */ lui $t4,0x800a +/* f076448: 3c0c800a */ lui $t4,%hi(g_Vars+0x8) /* f07644c: 04400006 */ bltz $v0,.L0f076468 /* f076450: 00000000 */ sll $zero,$zero,0x0 -/* f076454: 8d8c9fc8 */ lw $t4,-0x6038($t4) +/* f076454: 8d8c9fc8 */ lw $t4,%lo(g_Vars+0x8)($t4) /* f076458: 258effc4 */ addiu $t6,$t4,-60 /* f07645c: 004e082a */ slt $at,$v0,$t6 /* f076460: 50200004 */ beqzl $at,.L0f076474 @@ -18578,10 +18578,10 @@ glabel var7f1aa438 /* f07646c: 8fa40064 */ lw $a0,0x64($sp) /* f076470: 8e190090 */ lw $t9,0x90($s0) .L0f076474: -/* f076474: 3c18800a */ lui $t8,0x800a +/* f076474: 3c18800a */ lui $t8,%hi(g_Vars+0x8) /* f076478: 27290001 */ addiu $t1,$t9,0x1 /* f07647c: ae090090 */ sw $t1,0x90($s0) -/* f076480: 8f189fc8 */ lw $t8,-0x6038($t8) +/* f076480: 8f189fc8 */ lw $t8,%lo(g_Vars+0x8)($t8) /* f076484: ae180094 */ sw $t8,0x94($s0) /* f076488: 8e220040 */ lw $v0,0x40($s1) /* f07648c: 00026bc0 */ sll $t5,$v0,0xf @@ -18853,10 +18853,10 @@ glabel var7f1aa438 .L0f07686c: /* f07686c: 8fac0600 */ lw $t4,0x600($sp) .L0f076870: -/* f076870: 3c03800a */ lui $v1,0x800a +/* f076870: 3c03800a */ lui $v1,%hi(g_Vars+0xc) /* f076874: 55800076 */ bnezl $t4,.L0f076a50 /* f076878: 02202025 */ or $a0,$s1,$zero -/* f07687c: 8c639fcc */ lw $v1,-0x6034($v1) +/* f07687c: 8c639fcc */ lw $v1,%lo(g_Vars+0xc)($v1) /* f076880: 8e0e00a4 */ lw $t6,0xa4($s0) /* f076884: 2479fffe */ addiu $t9,$v1,-2 /* f076888: 01d9082a */ slt $at,$t6,$t9 @@ -18888,9 +18888,9 @@ glabel var7f1aa438 /* f0768ec: e7a00034 */ swc1 $f0,0x34($sp) /* f0768f0: 0fc24e7e */ jal func0f0939f8 /* f0768f4: e7a00038 */ swc1 $f0,0x38($sp) -/* f0768f8: 3c03800a */ lui $v1,0x800a +/* f0768f8: 3c03800a */ lui $v1,%hi(g_Vars+0xc) /* f0768fc: 10000052 */ beqz $zero,.L0f076a48 -/* f076900: 8c639fcc */ lw $v1,-0x6034($v1) +/* f076900: 8c639fcc */ lw $v1,%lo(g_Vars+0xc)($v1) .L0f076904: /* f076904: 2401001e */ addiu $at,$zero,0x1e /* f076908: 14e1003a */ bne $a3,$at,.L0f0769f4 @@ -18949,9 +18949,9 @@ glabel var7f1aa438 /* f0769dc: e7a00034 */ swc1 $f0,0x34($sp) /* f0769e0: 0fc24e7e */ jal func0f0939f8 /* f0769e4: e7a00038 */ swc1 $f0,0x38($sp) -/* f0769e8: 3c03800a */ lui $v1,0x800a +/* f0769e8: 3c03800a */ lui $v1,%hi(g_Vars+0xc) /* f0769ec: 10000016 */ beqz $zero,.L0f076a48 -/* f0769f0: 8c639fcc */ lw $v1,-0x6034($v1) +/* f0769f0: 8c639fcc */ lw $v1,%lo(g_Vars+0xc)($v1) .L0f0769f4: /* f0769f4: 3c01bf80 */ lui $at,0xbf80 /* f0769f8: 44810000 */ mtc1 $at,$f0 @@ -18972,8 +18972,8 @@ glabel var7f1aa438 /* f076a34: e7a00034 */ swc1 $f0,0x34($sp) /* f076a38: 0fc24e7e */ jal func0f0939f8 /* f076a3c: e7a00038 */ swc1 $f0,0x38($sp) -/* f076a40: 3c03800a */ lui $v1,0x800a -/* f076a44: 8c639fcc */ lw $v1,-0x6034($v1) +/* f076a40: 3c03800a */ lui $v1,%hi(g_Vars+0xc) +/* f076a44: 8c639fcc */ lw $v1,%lo(g_Vars+0xc)($v1) .L0f076a48: /* f076a48: ae0300a4 */ sw $v1,0xa4($s0) .L0f076a4c: @@ -19065,8 +19065,8 @@ glabel var7f1aa438 /* f076b88: 00402025 */ or $a0,$v0,$zero /* f076b8c: 0fc19a57 */ jal func0f06695c /* f076b90: 8fa50074 */ lw $a1,0x74($sp) -/* f076b94: 3c03800a */ lui $v1,0x800a -/* f076b98: 8c639ff8 */ lw $v1,-0x6008($v1) +/* f076b94: 3c03800a */ lui $v1,%hi(g_Vars+0x38) +/* f076b98: 8c639ff8 */ lw $v1,%lo(g_Vars+0x38)($v1) /* f076b9c: e7a00098 */ swc1 $f0,0x98($sp) /* f076ba0: 00001025 */ or $v0,$zero,$zero /* f076ba4: 1860004d */ blez $v1,.L0f076cdc @@ -19106,7 +19106,7 @@ glabel var7f1aa438 /* f076c28: c430a430 */ lwc1 $f16,%lo(var7f1aa430)($at) /* f076c2c: 8fa2009c */ lw $v0,0x9c($sp) /* f076c30: 45000019 */ bc1f .L0f076c98 -/* f076c34: 3c03800a */ lui $v1,0x800a +/* f076c34: 3c03800a */ lui $v1,%hi(g_Vars+0x38) /* f076c38: 3c01800a */ lui $at,0x800a /* f076c3c: c42aa00c */ lwc1 $f10,-0x5ff4($at) /* f076c40: c6080098 */ lwc1 $f8,0x98($s0) @@ -19137,17 +19137,17 @@ glabel var7f1aa438 /* f076c9c: e614000c */ swc1 $f20,0xc($s0) .L0f076ca0: /* f076ca0: 1000000a */ beqz $zero,.L0f076ccc -/* f076ca4: 8c639ff8 */ lw $v1,-0x6008($v1) +/* f076ca4: 8c639ff8 */ lw $v1,%lo(g_Vars+0x38)($v1) /* f076ca8: c6080004 */ lwc1 $f8,0x4($s0) .L0f076cac: /* f076cac: c606000c */ lwc1 $f6,0xc($s0) -/* f076cb0: 3c03800a */ lui $v1,0x800a +/* f076cb0: 3c03800a */ lui $v1,%hi(g_Vars+0x38) /* f076cb4: 46104282 */ mul.s $f10,$f8,$f16 /* f076cb8: 00000000 */ sll $zero,$zero,0x0 /* f076cbc: 46103102 */ mul.s $f4,$f6,$f16 /* f076cc0: e60a0004 */ swc1 $f10,0x4($s0) /* f076cc4: e604000c */ swc1 $f4,0xc($s0) -/* f076cc8: 8c639ff8 */ lw $v1,-0x6008($v1) +/* f076cc8: 8c639ff8 */ lw $v1,%lo(g_Vars+0x38)($v1) .L0f076ccc: /* f076ccc: 24420001 */ addiu $v0,$v0,0x1 .L0f076cd0: @@ -19344,8 +19344,8 @@ glabel var7f1aa43c /* f076f80: 8fb80078 */ lw $t8,0x78($sp) /* f076f84: 1458000e */ bne $v0,$t8,.L0f076fc0 .L0f076f88: -/* f076f88: 3c02800a */ lui $v0,0x800a -/* f076f8c: 8c42a024 */ lw $v0,-0x5fdc($v0) +/* f076f88: 3c02800a */ lui $v0,%hi(g_Vars+0x64) +/* f076f8c: 8c42a024 */ lw $v0,%lo(g_Vars+0x64)($v0) /* f076f90: 8fb90078 */ lw $t9,0x78($sp) /* f076f94: c4481bb0 */ lwc1 $f8,0x1bb0($v0) /* f076f98: c7260008 */ lwc1 $f6,0x8($t9) @@ -19367,11 +19367,11 @@ glabel var7f1aa43c /* f076fd0: 55000053 */ bnezl $t0,.L0f077120 /* f076fd4: 820a0084 */ lb $t2,0x84($s0) /* f076fd8: 8e090008 */ lw $t1,0x8($s0) -/* f076fdc: 3c0b800a */ lui $t3,0x800a +/* f076fdc: 3c0b800a */ lui $t3,%hi(g_Vars+0x8) /* f076fe0: 00095040 */ sll $t2,$t1,0x1 /* f076fe4: 0542004e */ bltzl $t2,.L0f077120 /* f076fe8: 820a0084 */ lb $t2,0x84($s0) -/* f076fec: 8d6b9fc8 */ lw $t3,-0x6038($t3) +/* f076fec: 8d6b9fc8 */ lw $t3,%lo(g_Vars+0x8)($t3) /* f076ff0: 8e0c0078 */ lw $t4,0x78($s0) /* f076ff4: 016c6823 */ subu $t5,$t3,$t4 /* f076ff8: 004d082a */ slt $at,$v0,$t5 @@ -19508,14 +19508,14 @@ glabel var7f1aa43c /* f0771c8: 0fc23fba */ jal doorActivateWrapper /* f0771cc: 00002825 */ or $a1,$zero,$zero .L0f0771d0: -/* f0771d0: 3c0e800a */ lui $t6,0x800a -/* f0771d4: 8dce9fc8 */ lw $t6,-0x6038($t6) +/* f0771d0: 3c0e800a */ lui $t6,%hi(g_Vars+0x8) +/* f0771d4: 8dce9fc8 */ lw $t6,%lo(g_Vars+0x8)($t6) /* f0771d8: 8e0d00c8 */ lw $t5,0xc8($s0) -/* f0771dc: 3c0f800a */ lui $t7,0x800a +/* f0771dc: 3c0f800a */ lui $t7,%hi(g_Vars+0x34) /* f0771e0: 01ae082a */ slt $at,$t5,$t6 /* f0771e4: 14200004 */ bnez $at,.L0f0771f8 /* f0771e8: 00000000 */ sll $zero,$zero,0x0 -/* f0771ec: 8def9ff4 */ lw $t7,-0x600c($t7) +/* f0771ec: 8def9ff4 */ lw $t7,%lo(g_Vars+0x34)($t7) /* f0771f0: 55e00004 */ bnezl $t7,.L0f077204 /* f0771f4: 8fb90070 */ lw $t9,0x70($sp) .L0f0771f8: @@ -19872,8 +19872,8 @@ glabel var7f1aa454 /* f0776c4: c438a450 */ lwc1 $f24,%lo(var7f1aa450)($at) /* f0776c8: afa500b8 */ sw $a1,0xb8($sp) .L0f0776cc: -/* f0776cc: 3c18800a */ lui $t8,0x800a -/* f0776d0: 8f18a2f8 */ lw $t8,-0x5d08($t8) +/* f0776cc: 3c18800a */ lui $t8,%hi(g_Vars+0x338) +/* f0776d0: 8f18a2f8 */ lw $t8,%lo(g_Vars+0x338)($t8) /* f0776d4: 000378c0 */ sll $t7,$v1,0x3 /* f0776d8: 01e37821 */ addu $t7,$t7,$v1 /* f0776dc: 000f78c0 */ sll $t7,$t7,0x3 @@ -20064,7 +20064,7 @@ glabel var7f1aa454 /* f0779a4: c6a80000 */ lwc1 $f8,0x0($s5) /* f0779a8: c6ca0000 */ lwc1 $f10,0x0($s6) /* f0779ac: 8e500064 */ lw $s0,0x64($s2) -/* f0779b0: 3c17800a */ lui $s7,0x800a +/* f0779b0: 3c17800a */ lui $s7,%hi(g_Vars+0x28c) /* f0779b4: 460a4101 */ sub.s $f4,$f8,$f10 /* f0779b8: c6121c44 */ lwc1 $f18,0x1c44($s0) /* f0779bc: 00402025 */ or $a0,$v0,$zero @@ -20080,7 +20080,7 @@ glabel var7f1aa454 /* f0779e4: c6d00000 */ lwc1 $f16,0x0($s6) /* f0779e8: c6a60000 */ lwc1 $f6,0x0($s5) /* f0779ec: e7b60090 */ swc1 $f22,0x90($sp) -/* f0779f0: 8ef7a24c */ lw $s7,-0x5db4($s7) +/* f0779f0: 8ef7a24c */ lw $s7,%lo(g_Vars+0x28c)($s7) /* f0779f4: 46103201 */ sub.s $f8,$f6,$f16 /* f0779f8: e7a8008c */ swc1 $f8,0x8c($sp) /* f0779fc: c6ca0008 */ lwc1 $f10,0x8($s6) @@ -20121,12 +20121,12 @@ glabel var7f1aa454 /* f077a84: 4503004e */ bc1tl .L0f077bc0 /* f077a88: 8fac00b8 */ lw $t4,0xb8($sp) /* f077a8c: c6081c48 */ lwc1 $f8,0x1c48($s0) -/* f077a90: 3c17800a */ lui $s7,0x800a +/* f077a90: 3c17800a */ lui $s7,%hi(g_Vars+0x28c) /* f077a94: 02602025 */ or $a0,$s3,$zero /* f077a98: 46144480 */ add.s $f18,$f8,$f20 /* f077a9c: e6121c48 */ swc1 $f18,0x1c48($s0) /* f077aa0: 0fc4a24b */ jal setCurrentPlayerNum -/* f077aa4: 8ef7a24c */ lw $s7,-0x5db4($s7) +/* f077aa4: 8ef7a24c */ lw $s7,%lo(g_Vars+0x28c)($s7) /* f077aa8: 8e500064 */ lw $s0,0x64($s2) /* f077aac: 4614b03c */ c.lt.s $f22,$f20 /* f077ab0: c60a0078 */ lwc1 $f10,0x78($s0) @@ -20541,8 +20541,8 @@ glabel func0f078094 /* f078098: afbf001c */ sw $ra,0x1c($sp) /* f07809c: afb00018 */ sw $s0,0x18($sp) /* f0780a0: 8c870004 */ lw $a3,0x4($a0) -/* f0780a4: 3c0f800a */ lui $t7,0x800a -/* f0780a8: 8def9ff8 */ lw $t7,-0x6008($t7) +/* f0780a4: 3c0f800a */ lui $t7,%hi(g_Vars+0x38) +/* f0780a8: 8def9ff8 */ lw $t7,%lo(g_Vars+0x38)($t7) /* f0780ac: afa70258 */ sw $a3,0x258($sp) /* f0780b0: 8cee005c */ lw $t6,0x5c($a3) /* f0780b4: 3c088007 */ lui $t0,%hi(var80069bd8) @@ -21862,10 +21862,10 @@ glabel var7f1aa580 /* f079118: 5320ffe6 */ beqzl $t9,.L0f0790b4 /* f07911c: 246a0001 */ addiu $t2,$v1,0x1 /* f079120: 8c8a0020 */ lw $t2,0x20($a0) -/* f079124: 3c0b800b */ lui $t3,0x800b +/* f079124: 3c0b800b */ lui $t3,%hi(g_MpSetup+0xc) /* f079128: 5140ffe2 */ beqzl $t2,.L0f0790b4 /* f07912c: 246a0001 */ addiu $t2,$v1,0x1 -/* f079130: 8d6bcb94 */ lw $t3,-0x346c($t3) +/* f079130: 8d6bcb94 */ lw $t3,%lo(g_MpSetup+0xc)($t3) /* f079134: 316c0002 */ andi $t4,$t3,0x2 /* f079138: 51800021 */ beqzl $t4,.L0f0791c0 /* f07913c: 8c990018 */ lw $t9,0x18($a0) @@ -22912,7 +22912,7 @@ glabel var7f1aa5a8 /* f079fe8: 3c188007 */ lui $t8,%hi(var80069cb8) /* f079fec: 916c005f */ lbu $t4,0x5f($t3) /* f079ff0: 8f189cb8 */ lw $t8,%lo(var80069cb8)($t8) -/* f079ff4: 3c09800a */ lui $t1,0x800a +/* f079ff4: 3c09800a */ lui $t1,%hi(g_Vars+0x318) /* f079ff8: 318d0003 */ andi $t5,$t4,0x3 /* f079ffc: 2dae0001 */ sltiu $t6,$t5,0x1 /* f07a000: afae0128 */ sw $t6,0x128($sp) @@ -22923,7 +22923,7 @@ glabel var7f1aa5a8 /* f07a014: afb80118 */ sw $t8,0x118($sp) /* f07a018: afaf0124 */ sw $t7,0x124($sp) /* f07a01c: 8c640040 */ lw $a0,0x40($v1) -/* f07a020: 8d29a2d8 */ lw $t1,-0x5d28($t1) +/* f07a020: 8d29a2d8 */ lw $t1,%lo(g_Vars+0x318)($t1) /* f07a024: 3c01f000 */ lui $at,0xf000 /* f07a028: 0081c824 */ and $t9,$a0,$at /* f07a02c: 11200007 */ beqz $t1,.L0f07a04c @@ -23133,13 +23133,13 @@ glabel var7f1aa5a8 /* f07a328: afa20178 */ sw $v0,0x178($sp) /* f07a32c: 90430000 */ lbu $v1,0x0($v0) /* f07a330: 24010003 */ addiu $at,$zero,0x3 -/* f07a334: 3c0b800a */ lui $t3,0x800a +/* f07a334: 3c0b800a */ lui $t3,%hi(g_Vars+0x318) /* f07a338: 10610003 */ beq $v1,$at,.L0f07a348 /* f07a33c: 24010006 */ addiu $at,$zero,0x6 /* f07a340: 54610064 */ bnel $v1,$at,.L0f07a4d4 /* f07a344: 24080001 */ addiu $t0,$zero,0x1 .L0f07a348: -/* f07a348: 8d6ba2d8 */ lw $t3,-0x5d28($t3) +/* f07a348: 8d6ba2d8 */ lw $t3,%lo(g_Vars+0x318)($t3) /* f07a34c: 8faf0124 */ lw $t7,0x124($sp) /* f07a350: 2418ffff */ addiu $t8,$zero,-1 /* f07a354: 15600003 */ bnez $t3,.L0f07a364 @@ -23154,8 +23154,8 @@ glabel var7f1aa5a8 /* f07a374: 0fc2c74a */ jal func0f0b1d28 /* f07a378: 27a40118 */ addiu $a0,$sp,0x118 /* f07a37c: 8fa80178 */ lw $t0,0x178($sp) -/* f07a380: 3c09800a */ lui $t1,0x800a -/* f07a384: 8d29a2d8 */ lw $t1,-0x5d28($t1) +/* f07a380: 3c09800a */ lui $t1,%hi(g_Vars+0x318) +/* f07a384: 8d29a2d8 */ lw $t1,%lo(g_Vars+0x318)($t1) /* f07a388: e7a000b0 */ swc1 $f0,0xb0($sp) /* f07a38c: 8d040004 */ lw $a0,0x4($t0) /* f07a390: 3c013f00 */ lui $at,0x3f00 @@ -23340,8 +23340,8 @@ glabel var7f1aa5a8 /* f07a628: afa80148 */ sw $t0,0x148($sp) .L0f07a62c: /* f07a62c: 8faa0194 */ lw $t2,0x194($sp) -/* f07a630: 3c09800a */ lui $t1,0x800a -/* f07a634: 8d299fc8 */ lw $t1,-0x6038($t1) +/* f07a630: 3c09800a */ lui $t1,%hi(g_Vars+0x8) +/* f07a634: 8d299fc8 */ lw $t1,%lo(g_Vars+0x8)($t1) /* f07a638: 8d4c0094 */ lw $t4,0x94($t2) /* f07a63c: 8fa20124 */ lw $v0,0x124($sp) /* f07a640: 552c0083 */ bnel $t1,$t4,.L0f07a850 @@ -23712,8 +23712,8 @@ glabel var7f1aa5a8 .L0f07ab98: /* f07ab98: 8fa80194 */ lw $t0,0x194($sp) .L0f07ab9c: -/* f07ab9c: 3c09800a */ lui $t1,0x800a -/* f07aba0: 8d299fc8 */ lw $t1,-0x6038($t1) +/* f07ab9c: 3c09800a */ lui $t1,%hi(g_Vars+0x8) +/* f07aba0: 8d299fc8 */ lw $t1,%lo(g_Vars+0x8)($t1) /* f07aba4: 8d0a0098 */ lw $t2,0x98($t0) /* f07aba8: 240c0002 */ addiu $t4,$zero,0x2 /* f07abac: 24050001 */ addiu $a1,$zero,0x1 @@ -23761,8 +23761,8 @@ glabel var7f1aa5a8 /* f07ac4c: 0fc24e7e */ jal func0f0939f8 /* f07ac50: e7a00038 */ swc1 $f0,0x38($sp) .L0f07ac54: -/* f07ac54: 3c0a800a */ lui $t2,0x800a -/* f07ac58: 8d4a9fc8 */ lw $t2,-0x6038($t2) +/* f07ac54: 3c0a800a */ lui $t2,%hi(g_Vars+0x8) +/* f07ac58: 8d4a9fc8 */ lw $t2,%lo(g_Vars+0x8)($t2) /* f07ac5c: 8fa80064 */ lw $t0,0x64($sp) /* f07ac60: 8fac0194 */ lw $t4,0x194($sp) /* f07ac64: 010a4821 */ addu $t1,$t0,$t2 @@ -24874,12 +24874,12 @@ glabel var7f1aa668 /* f07bbac: 46004282 */ mul.s $f10,$f8,$f0 /* f07bbb0: c4e60004 */ lwc1 $f6,0x4($a3) /* f07bbb4: c42ca62c */ lwc1 $f12,%lo(var7f1aa62c)($at) -/* f07bbb8: 3c03800a */ lui $v1,0x800a +/* f07bbb8: 3c03800a */ lui $v1,%hi(g_Vars+0x38) /* f07bbbc: 24020001 */ addiu $v0,$zero,0x1 /* f07bbc0: 46006086 */ mov.s $f2,$f12 /* f07bbc4: 460a3100 */ add.s $f4,$f6,$f10 /* f07bbc8: e4e40004 */ swc1 $f4,0x4($a3) -/* f07bbcc: 8c639ff8 */ lw $v1,-0x6008($v1) +/* f07bbcc: 8c639ff8 */ lw $v1,%lo(g_Vars+0x38)($v1) /* f07bbd0: 28610002 */ slti $at,$v1,0x2 /* f07bbd4: 14200005 */ bnez $at,.L0f07bbec /* f07bbd8: 24420001 */ addiu $v0,$v0,0x1 @@ -25113,8 +25113,8 @@ glabel var7f1aa668 /* f07bf38: 0fc21a6a */ jal objIsHealthy /* f07bf3c: 02002025 */ or $a0,$s0,$zero /* f07bf40: 1040000f */ beqz $v0,.L0f07bf80 -/* f07bf44: 3c0e800a */ lui $t6,0x800a -/* f07bf48: 8dcea474 */ lw $t6,-0x5b8c($t6) +/* f07bf44: 3c0e800a */ lui $t6,%hi(g_Vars+0x4b4) +/* f07bf48: 8dcea474 */ lw $t6,%lo(g_Vars+0x4b4)($t6) /* f07bf4c: 24010022 */ addiu $at,$zero,0x22 /* f07bf50: 8fa40178 */ lw $a0,0x178($sp) /* f07bf54: 15c10003 */ bne $t6,$at,.L0f07bf64 @@ -25219,8 +25219,8 @@ glabel var7f1aa668 /* f07c0c0: 0fc21a6a */ jal objIsHealthy /* f07c0c4: 02002025 */ or $a0,$s0,$zero /* f07c0c8: 1040000f */ beqz $v0,.L0f07c108 -/* f07c0cc: 3c09800a */ lui $t1,0x800a -/* f07c0d0: 8d29a474 */ lw $t1,-0x5b8c($t1) +/* f07c0cc: 3c09800a */ lui $t1,%hi(g_Vars+0x4b4) +/* f07c0d0: 8d29a474 */ lw $t1,%lo(g_Vars+0x4b4)($t1) /* f07c0d4: 24010022 */ addiu $at,$zero,0x22 /* f07c0d8: 8fa40178 */ lw $a0,0x178($sp) /* f07c0dc: 15210003 */ bne $t1,$at,.L0f07c0ec @@ -25286,11 +25286,11 @@ glabel var7f1aa698 /* f07c140: 24010002 */ addiu $at,$zero,0x2 /* f07c144: 00808825 */ or $s1,$a0,$zero /* f07c148: 8e0300c0 */ lw $v1,0xc0($s0) -/* f07c14c: 3c0e800a */ lui $t6,0x800a +/* f07c14c: 3c0e800a */ lui $t6,%hi(g_Vars+0x38) /* f07c150: 02002825 */ or $a1,$s0,$zero /* f07c154: 14610078 */ bne $v1,$at,.L0f07c338 /* f07c158: 00000000 */ sll $zero,$zero,0x0 -/* f07c15c: 8dce9ff8 */ lw $t6,-0x6008($t6) +/* f07c15c: 8dce9ff8 */ lw $t6,%lo(g_Vars+0x38)($t6) /* f07c160: 8e080088 */ lw $t0,0x88($s0) /* f07c164: 44801000 */ mtc1 $zero,$f2 /* f07c168: 44807000 */ mtc1 $zero,$f14 @@ -25425,8 +25425,8 @@ glabel var7f1aa698 .L0f07c338: /* f07c338: 04600007 */ bltz $v1,.L0f07c358 /* f07c33c: 26020068 */ addiu $v0,$s0,0x68 -/* f07c340: 3c0c800a */ lui $t4,0x800a -/* f07c344: 8d8c9ff8 */ lw $t4,-0x6008($t4) +/* f07c340: 3c0c800a */ lui $t4,%hi(g_Vars+0x38) +/* f07c344: 8d8c9ff8 */ lw $t4,%lo(g_Vars+0x38)($t4) /* f07c348: 26020068 */ addiu $v0,$s0,0x68 /* f07c34c: 006c6823 */ subu $t5,$v1,$t4 /* f07c350: 1000000f */ beqz $zero,.L0f07c390 @@ -25451,10 +25451,10 @@ glabel var7f1aa698 .L0f07c394: /* f07c394: c4680000 */ lwc1 $f8,0x0($v1) /* f07c398: 2605006c */ addiu $a1,$s0,0x6c -/* f07c39c: 3c04800a */ lui $a0,0x800a +/* f07c39c: 3c04800a */ lui $a0,%hi(g_Vars+0x4b4) /* f07c3a0: e7a8015c */ swc1 $f8,0x15c($sp) /* f07c3a4: c44a0000 */ lwc1 $f10,0x0($v0) -/* f07c3a8: 8c84a474 */ lw $a0,-0x5b8c($a0) +/* f07c3a8: 8c84a474 */ lw $a0,%lo(g_Vars+0x4b4)($a0) /* f07c3ac: e7aa0160 */ swc1 $f10,0x160($sp) /* f07c3b0: c4b00000 */ lwc1 $f16,0x0($a1) /* f07c3b4: e7b00164 */ swc1 $f16,0x164($sp) @@ -25467,7 +25467,7 @@ glabel var7f1aa698 /* f07c3d0: e7aa0174 */ swc1 $f10,0x174($sp) /* f07c3d4: 2401000e */ addiu $at,$zero,0xe /* f07c3d8: 14410022 */ bne $v0,$at,.L0f07c464 -/* f07c3dc: 3c03800a */ lui $v1,0x800a +/* f07c3dc: 3c03800a */ lui $v1,%hi(g_Vars+0x38) /* f07c3e0: 3c017f1b */ lui $at,%hi(var7f1aa674) /* f07c3e4: c432a674 */ lwc1 $f18,%lo(var7f1aa674)($at) /* f07c3e8: c630000c */ lwc1 $f16,0xc($s1) @@ -25505,7 +25505,7 @@ glabel var7f1aa698 /* f07c45c: 100000d0 */ beqz $zero,.L0f07c7a0 /* f07c460: 8fbf0034 */ lw $ra,0x34($sp) .L0f07c464: -/* f07c464: 8c639ff8 */ lw $v1,-0x6008($v1) +/* f07c464: 8c639ff8 */ lw $v1,%lo(g_Vars+0x38)($v1) /* f07c468: 3c017f1b */ lui $at,%hi(var7f1aa680) /* f07c46c: c420a680 */ lwc1 $f0,%lo(var7f1aa680)($at) /* f07c470: 28610002 */ slti $at,$v1,0x2 @@ -25741,8 +25741,8 @@ glabel func0f07c7b0 /* f07c7d4: c6060080 */ lwc1 $f6,0x80($s0) /* f07c7d8: 0fc135ad */ jal chraiExecute /* f07c7dc: e7a60038 */ swc1 $f6,0x38($sp) -/* f07c7e0: 3c18800a */ lui $t8,0x800a -/* f07c7e4: 8f189ff8 */ lw $t8,-0x6008($t8) +/* f07c7e0: 3c18800a */ lui $t8,%hi(g_Vars+0x38) +/* f07c7e4: 8f189ff8 */ lw $t8,%lo(g_Vars+0x38)($t8) /* f07c7e8: 8e0f00c0 */ lw $t7,0xc0($s0) /* f07c7ec: 44800000 */ mtc1 $zero,$f0 /* f07c7f0: 27a7002c */ addiu $a3,$sp,0x2c @@ -25980,8 +25980,8 @@ glabel var7f1aa6a8 /* f07cb24: 02602025 */ or $a0,$s3,$zero /* f07cb28: 0fc135ad */ jal chraiExecute /* f07cb2c: 24050001 */ addiu $a1,$zero,0x1 -/* f07cb30: 3c18800a */ lui $t8,0x800a -/* f07cb34: 8f189ff8 */ lw $t8,-0x6008($t8) +/* f07cb30: 3c18800a */ lui $t8,%hi(g_Vars+0x38) +/* f07cb34: 8f189ff8 */ lw $t8,%lo(g_Vars+0x38)($t8) /* f07cb38: 8e6f00c0 */ lw $t7,0xc0($s3) /* f07cb3c: 8e6800bc */ lw $t0,0xbc($s3) /* f07cb40: 3c017f1b */ lui $at,%hi(var7f1aa69c) @@ -26540,8 +26540,8 @@ glabel var7f1aa6e8 /* f07d2c4: 0fc249af */ jal func0f0926bc /* f07d2c8: e7a801ec */ swc1 $f8,0x1ec($sp) /* f07d2cc: 8fa20278 */ lw $v0,0x278($sp) -/* f07d2d0: 3c08800a */ lui $t0,0x800a -/* f07d2d4: 8d08a24c */ lw $t0,-0x5db4($t0) +/* f07d2d0: 3c08800a */ lui $t0,%hi(g_Vars+0x28c) +/* f07d2d4: 8d08a24c */ lw $t0,%lo(g_Vars+0x28c)($t0) /* f07d2d8: 87ab01d6 */ lh $t3,0x1d6($sp) /* f07d2dc: 24090001 */ addiu $t1,$zero,0x1 /* f07d2e0: 27aa01e4 */ addiu $t2,$sp,0x1e4 @@ -27796,14 +27796,14 @@ glabel func0f07e474 /* f07e488: afa00060 */ sw $zero,0x60($sp) /* f07e48c: 84820002 */ lh $v0,0x2($a0) /* f07e490: 00808825 */ or $s1,$a0,$zero -/* f07e494: 3c0e800a */ lui $t6,0x800a +/* f07e494: 3c0e800a */ lui $t6,%hi(g_Vars+0x38) /* f07e498: 18400088 */ blez $v0,.L0f07e6bc /* f07e49c: 2841003c */ slti $at,$v0,0x3c /* f07e4a0: 14200002 */ bnez $at,.L0f07e4ac /* f07e4a4: 24030001 */ addiu $v1,$zero,0x1 /* f07e4a8: 00001825 */ or $v1,$zero,$zero .L0f07e4ac: -/* f07e4ac: 8dce9ff8 */ lw $t6,-0x6008($t6) +/* f07e4ac: 8dce9ff8 */ lw $t6,%lo(g_Vars+0x38)($t6) /* f07e4b0: 004e7823 */ subu $t7,$v0,$t6 /* f07e4b4: a62f0002 */ sh $t7,0x2($s1) /* f07e4b8: 86380002 */ lh $t8,0x2($s1) @@ -28108,10 +28108,10 @@ glabel var7f1aa6ec /* f07e8d8: 14410013 */ bne $v0,$at,.L0f07e928 /* f07e8dc: 00000000 */ sll $zero,$zero,0x0 /* f07e8e0: 860400c4 */ lh $a0,0xc4($s0) -/* f07e8e4: 3c0c800a */ lui $t4,%hi(var800a000c) +/* f07e8e4: 3c0c800a */ lui $t4,%hi(g_Portals) /* f07e8e8: 0480000f */ bltz $a0,.L0f07e928 /* f07e8ec: 00000000 */ sll $zero,$zero,0x0 -/* f07e8f0: 8d8c4cc8 */ lw $t4,0x4cc8($t4) +/* f07e8f0: 8d8c4cc8 */ lw $t4,%lo(g_Portals)($t4) /* f07e8f4: 000468c0 */ sll $t5,$a0,0x3 /* f07e8f8: 018d2821 */ addu $a1,$t4,$t5 /* f07e8fc: 90a30006 */ lbu $v1,0x6($a1) @@ -28221,7 +28221,7 @@ glabel var7f1aa6ec .L0f07ea7c: /* f07ea7c: 8da10000 */ lw $at,0x0($t5) /* f07ea80: 25ad000c */ addiu $t5,$t5,0xc -/* f07ea84: 258c000c */ addiu $t4,$t4,%lo(var800a000c) +/* f07ea84: 258c000c */ addiu $t4,$t4,12 /* f07ea88: ad81fff4 */ sw $at,-0xc($t4) /* f07ea8c: 8da1fff8 */ lw $at,-0x8($t5) /* f07ea90: ad81fff8 */ sw $at,-0x8($t4) @@ -31259,8 +31259,8 @@ glabel var7f1aa82c /* f08141c: 100001f9 */ beqz $zero,.L0f081c04 /* f081420: 8fa200fc */ lw $v0,0xfc($sp) .L0f081424: -/* f081424: 3c02800a */ lui $v0,0x800a -/* f081428: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f081424: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f081428: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f08142c: 8fa600f8 */ lw $a2,0xf8($sp) /* f081430: 24010002 */ addiu $at,$zero,0x2 /* f081434: 94430010 */ lhu $v1,0x10($v0) @@ -31297,8 +31297,8 @@ glabel var7f1aa82c /* f0814ac: 46000182 */ mul.s $f6,$f0,$f0 /* f0814b0: 0c012974 */ jal sqrtf /* f0814b4: 46123300 */ add.s $f12,$f6,$f18 -/* f0814b8: 3c0c800a */ lui $t4,0x800a -/* f0814bc: 8d8ca244 */ lw $t4,-0x5dbc($t4) +/* f0814b8: 3c0c800a */ lui $t4,%hi(g_Vars+0x284) +/* f0814bc: 8d8ca244 */ lw $t4,%lo(g_Vars+0x284)($t4) /* f0814c0: 3c014316 */ lui $at,0x4316 /* f0814c4: c5820024 */ lwc1 $f2,0x24($t4) /* f0814c8: 4600103c */ c.lt.s $f2,$f0 @@ -31341,8 +31341,8 @@ glabel var7f1aa82c /* f081554: 00000000 */ sll $zero,$zero,0x0 /* f081558: e7a60078 */ swc1 $f6,0x78($sp) .L0f08155c: -/* f08155c: 3c19800a */ lui $t9,0x800a -/* f081560: 8f39a2dc */ lw $t9,-0x5d24($t9) +/* f08155c: 3c19800a */ lui $t9,%hi(g_Vars+0x31c) +/* f081560: 8f39a2dc */ lw $t9,%lo(g_Vars+0x31c)($t9) /* f081564: 8fa600f8 */ lw $a2,0xf8($sp) /* f081568: 8fad0100 */ lw $t5,0x100($sp) /* f08156c: 5320001e */ beqzl $t9,.L0f0815e8 @@ -31675,8 +31675,8 @@ glabel var7f1aa82c .L0f081a20: /* f081a20: 0fc1a5d4 */ jal func0f069750 /* f081a24: 8fa500e4 */ lw $a1,0xe4($sp) -/* f081a28: 3c02800a */ lui $v0,0x800a -/* f081a2c: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f081a28: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f081a2c: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f081a30: 27a500a0 */ addiu $a1,$sp,0xa0 /* f081a34: 8c4400d8 */ lw $a0,0xd8($v0) /* f081a38: 14800021 */ bnez $a0,.L0f081ac0 @@ -31701,13 +31701,13 @@ glabel var7f1aa82c /* f081a80: 1140000f */ beqz $t2,.L0f081ac0 /* f081a84: 00000000 */ sll $zero,$zero,0x0 /* f081a88: 8e0e0008 */ lw $t6,0x8($s0) -/* f081a8c: 3c02800a */ lui $v0,0x800a +/* f081a8c: 3c02800a */ lui $v0,%hi(var8009caec+0x1) /* f081a90: 31cc0800 */ andi $t4,$t6,0x800 /* f081a94: 15800008 */ bnez $t4,.L0f081ab8 /* f081a98: 00000000 */ sll $zero,$zero,0x0 -/* f081a9c: 9042caed */ lbu $v0,-0x3513($v0) -/* f081aa0: 3c03800a */ lui $v1,0x800a -/* f081aa4: 9063caee */ lbu $v1,-0x3512($v1) +/* f081a9c: 9042caed */ lbu $v0,%lo(var8009caec+0x1)($v0) +/* f081aa0: 3c03800a */ lui $v1,%hi(var8009caec+0x2) +/* f081aa4: 9063caee */ lbu $v1,%lo(var8009caec+0x2)($v1) /* f081aa8: afa20088 */ sw $v0,0x88($sp) /* f081aac: afa2008c */ sw $v0,0x8c($sp) /* f081ab0: afa20090 */ sw $v0,0x90($sp) @@ -32755,7 +32755,7 @@ glabel var7f1aa85c /* f082910: c6040004 */ lwc1 $f4,0x4($s0) /* f082914: c610000c */ lwc1 $f16,0xc($s0) /* f082918: 4612b182 */ mul.s $f6,$f22,$f18 -/* f08291c: 3c19800a */ lui $t9,0x800a +/* f08291c: 3c19800a */ lui $t9,%hi(g_Vars+0x284) /* f082920: 240e0001 */ addiu $t6,$zero,0x1 /* f082924: 46062200 */ add.s $f8,$f4,$f6 /* f082928: e6080004 */ swc1 $f8,0x4($s0) @@ -32763,7 +32763,7 @@ glabel var7f1aa85c /* f082930: 460ab482 */ mul.s $f18,$f22,$f10 /* f082934: 46128100 */ add.s $f4,$f16,$f18 /* f082938: e604000c */ swc1 $f4,0xc($s0) -/* f08293c: 8f39a244 */ lw $t9,-0x5dbc($t9) +/* f08293c: 8f39a244 */ lw $t9,%lo(g_Vars+0x284)($t9) /* f082940: 8f3800bc */ lw $t8,0xbc($t9) /* f082944: ae0e0090 */ sw $t6,0x90($s0) /* f082948: ae180088 */ sw $t8,0x88($s0) @@ -32789,7 +32789,7 @@ glabel func0f082964 /* f082984: afa20018 */ sw $v0,0x18($sp) /* f082988: 8fa20018 */ lw $v0,0x18($sp) /* f08298c: 8fa50024 */ lw $a1,0x24($sp) -/* f082990: 3c08800a */ lui $t0,0x800a +/* f082990: 3c08800a */ lui $t0,%hi(g_Vars+0x31c) /* f082994: 8c430040 */ lw $v1,0x40($v0) /* f082998: 306e0040 */ andi $t6,$v1,0x40 /* f08299c: 11c00007 */ beqz $t6,.L0f0829bc @@ -32806,7 +32806,7 @@ glabel func0f082964 /* f0829c4: 8c590048 */ lw $t9,0x48($v0) /* f0829c8: a72500b0 */ sh $a1,0xb0($t9) .L0f0829cc: -/* f0829cc: 8d08a2dc */ lw $t0,-0x5d24($t0) +/* f0829cc: 8d08a2dc */ lw $t0,%lo(g_Vars+0x31c)($t0) /* f0829d0: 5100000f */ beqzl $t0,.L0f082a10 /* f0829d4: 8fbf0014 */ lw $ra,0x14($sp) /* f0829d8: 90490003 */ lbu $t1,0x3($v0) @@ -33904,10 +33904,10 @@ glabel var7f1aa978 /* f08377c: 8d4b0004 */ lw $t3,0x4($t2) /* f083780: ad210000 */ sw $at,0x0($t1) /* f083784: 8d410008 */ lw $at,0x8($t2) -/* f083788: 3c0d800a */ lui $t5,0x800a +/* f083788: 3c0d800a */ lui $t5,%hi(g_Vars+0x284) /* f08378c: ad2b0004 */ sw $t3,0x4($t1) /* f083790: ad210008 */ sw $at,0x8($t1) -/* f083794: 8dada244 */ lw $t5,-0x5dbc($t5) +/* f083794: 8dada244 */ lw $t5,%lo(g_Vars+0x284)($t5) /* f083798: c4660008 */ lwc1 $f6,0x8($v1) /* f08379c: c4720010 */ lwc1 $f18,0x10($v1) /* f0837a0: 8da200bc */ lw $v0,0xbc($t5) @@ -34357,8 +34357,8 @@ glabel var7f1aa9a8 /* f083dc4: 2401000d */ addiu $at,$zero,0xd /* f083dc8: 00808025 */ or $s0,$a0,$zero /* f083dcc: 15c10004 */ bne $t6,$at,.L0f083de0 -/* f083dd0: 3c0f800a */ lui $t7,0x800a -/* f083dd4: 8defa2d8 */ lw $t7,-0x5d28($t7) +/* f083dd0: 3c0f800a */ lui $t7,%hi(g_Vars+0x318) +/* f083dd4: 8defa2d8 */ lw $t7,%lo(g_Vars+0x318)($t7) /* f083dd8: 55e0000c */ bnezl $t7,.L0f083e0c /* f083ddc: 8e0c000c */ lw $t4,0xc($s0) .L0f083de0: @@ -34657,8 +34657,8 @@ glabel func0f0841dc /* f084214: 8fbf0024 */ lw $ra,0x24($sp) /* f084218: 86180004 */ lh $t8,0x4($s0) .L0f08421c: -/* f08421c: 3c19800a */ lui $t9,0x800a -/* f084220: 8f39a26c */ lw $t9,-0x5d94($t9) +/* 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 /* f08422c: 24010006 */ addiu $at,$zero,0x6 @@ -35724,8 +35724,8 @@ glabel func0f085050 /* f085084: 00c09825 */ or $s3,$a2,$zero /* f085088: 00e0a025 */ or $s4,$a3,$zero /* f08508c: 15e10006 */ bne $t7,$at,.L0f0850a8 -/* f085090: 3c18800a */ lui $t8,0x800a -/* f085094: 8f18a2d8 */ lw $t8,-0x5d28($t8) +/* f085090: 3c18800a */ lui $t8,%hi(g_Vars+0x318) +/* f085094: 8f18a2d8 */ lw $t8,%lo(g_Vars+0x318)($t8) /* f085098: 53000004 */ beqzl $t8,.L0f0850ac /* f08509c: 8c590040 */ lw $t9,0x40($v0) /* f0850a0: 1000000c */ beqz $zero,.L0f0850d4 @@ -35904,8 +35904,8 @@ glabel var7f1aab30 /* f0852c8: 2401000d */ addiu $at,$zero,0xd /* f0852cc: 14410005 */ bne $v0,$at,.L0f0852e4 /* f0852d0: 00808025 */ or $s0,$a0,$zero -/* f0852d4: 3c0e800a */ lui $t6,%hi(var800a000c) -/* f0852d8: 8dcea2d8 */ lw $t6,-0x5d28($t6) +/* f0852d4: 3c0e800a */ lui $t6,%hi(g_Vars+0x318) +/* f0852d8: 8dcea2d8 */ lw $t6,%lo(g_Vars+0x318)($t6) /* f0852dc: 55c0000e */ bnezl $t6,.L0f085318 /* f0852e0: 24010024 */ addiu $at,$zero,0x24 .L0f0852e4: @@ -36180,7 +36180,7 @@ glabel var7f1aab30 .L0f0856b0: /* f0856b0: 8d610000 */ lw $at,0x0($t3) /* f0856b4: 256b000c */ addiu $t3,$t3,0xc -/* f0856b8: 25ce000c */ addiu $t6,$t6,%lo(var800a000c) +/* f0856b8: 25ce000c */ addiu $t6,$t6,12 /* f0856bc: adc1fff4 */ sw $at,-0xc($t6) /* f0856c0: 8d61fff8 */ lw $at,-0x8($t3) /* f0856c4: adc1fff8 */ sw $at,-0x8($t6) @@ -36805,10 +36805,10 @@ glabel func0f085eac /* f085f9c: 0c0056d9 */ jal func00015b64 /* f085fa0: 27a50110 */ addiu $a1,$sp,0x110 /* f085fa4: 8fb900fc */ lw $t9,0xfc($sp) -/* f085fa8: 3c0b800a */ lui $t3,0x800a +/* f085fa8: 3c0b800a */ lui $t3,%hi(g_Vars+0x284) /* f085fac: 57200009 */ bnezl $t9,.L0f085fd4 /* f085fb0: 8fa30124 */ lw $v1,0x124($sp) -/* f085fb4: 8d6ba244 */ lw $t3,-0x5dbc($t3) +/* f085fb4: 8d6ba244 */ lw $t3,%lo(g_Vars+0x284)($t3) /* f085fb8: 8d6c00bc */ lw $t4,0xbc($t3) /* f085fbc: 0fc4f92a */ jal func0f13e4a8 /* f085fc0: 8d840004 */ lw $a0,0x4($t4) @@ -36898,10 +36898,10 @@ glabel func0f085eac .L0f0860f0: /* f0860f0: 93ab010b */ lbu $t3,0x10b($sp) .L0f0860f4: -/* f0860f4: 3c0c800a */ lui $t4,0x800a +/* f0860f4: 3c0c800a */ lui $t4,%hi(g_Vars+0x284) /* f0860f8: 55600019 */ bnezl $t3,.L0f086160 /* f0860fc: 8479003a */ lh $t9,0x3a($v1) -/* f086100: 8d8ca244 */ lw $t4,-0x5dbc($t4) +/* f086100: 8d8ca244 */ lw $t4,%lo(g_Vars+0x284)($t4) /* f086104: 8d8d00bc */ lw $t5,0xbc($t4) /* f086108: 0fc4f92a */ jal func0f13e4a8 /* f08610c: 8da40004 */ lw $a0,0x4($t5) @@ -37086,8 +37086,8 @@ glabel func0f085eac /* f08639c: afa80014 */ sw $t0,0x14($sp) /* f0863a0: afaa001c */ sw $t2,0x1c($sp) /* f0863a4: 8f2b0040 */ lw $t3,0x40($t9) -/* f0863a8: 3c18800a */ lui $t8,0x800a -/* f0863ac: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f0863a8: 3c18800a */ lui $t8,%hi(g_Vars+0x284) +/* f0863ac: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f0863b0: afa30024 */ sw $v1,0x24($sp) /* f0863b4: afab0020 */ sw $t3,0x20($sp) /* f0863b8: 8f0c00bc */ lw $t4,0xbc($t8) @@ -37217,10 +37217,10 @@ glabel func0f085eac /* f086578: afa20014 */ sw $v0,0x14($sp) /* f08657c: 8d8d0004 */ lw $t5,0x4($t4) /* f086580: 83af00cb */ lb $t7,0xcb($sp) -/* f086584: 3c0b800a */ lui $t3,0x800a +/* f086584: 3c0b800a */ lui $t3,%hi(g_Vars+0x284) /* f086588: afad001c */ sw $t5,0x1c($sp) /* f08658c: 8d8e0040 */ lw $t6,0x40($t4) -/* f086590: 8d6ba244 */ lw $t3,-0x5dbc($t3) +/* f086590: 8d6ba244 */ lw $t3,%lo(g_Vars+0x284)($t3) /* f086594: afaf0024 */ sw $t7,0x24($sp) /* f086598: afae0020 */ sw $t6,0x20($sp) /* f08659c: 8d7800bc */ lw $t8,0xbc($t3) @@ -37321,8 +37321,8 @@ glabel func0f085eac .L0f0866fc: /* f0866fc: 8fae0120 */ lw $t6,0x120($sp) .L0f086700: -/* f086700: 3c0f800a */ lui $t7,0x800a -/* f086704: 8defa24c */ lw $t7,-0x5db4($t7) +/* f086700: 3c0f800a */ lui $t7,%hi(g_Vars+0x28c) +/* f086704: 8defa24c */ lw $t7,%lo(g_Vars+0x28c)($t7) /* f086708: 44051000 */ mfc1 $a1,$f2 /* f08670c: 91c70018 */ lbu $a3,0x18($t6) /* f086710: 8fa4011c */ lw $a0,0x11c($sp) @@ -37475,8 +37475,8 @@ glabel func0f086918 /* f086924: afb1001c */ sw $s1,0x1c($sp) /* f086928: 10800018 */ beqz $a0,.L0f08698c /* f08692c: afb00018 */ sw $s0,0x18($sp) -/* f086930: 3c0e800a */ lui $t6,0x800a -/* f086934: 8dcea474 */ lw $t6,-0x5b8c($t6) +/* f086930: 3c0e800a */ lui $t6,%hi(g_Vars+0x4b4) +/* f086934: 8dcea474 */ lw $t6,%lo(g_Vars+0x4b4)($t6) /* f086938: 24010026 */ addiu $at,$zero,0x26 /* f08693c: 27af0038 */ addiu $t7,$sp,0x38 /* f086940: 15c10012 */ bne $t6,$at,.L0f08698c @@ -37572,8 +37572,8 @@ glabel var7f1aab3c .L0f086a50: /* f086a50: 1441001c */ bne $v0,$at,.L0f086ac4 /* f086a54: 306b0002 */ andi $t3,$v1,0x2 -/* f086a58: 3c09800a */ lui $t1,0x800a -/* f086a5c: 8d29a244 */ lw $t1,-0x5dbc($t1) +/* f086a58: 3c09800a */ lui $t1,%hi(g_Vars+0x284) +/* f086a5c: 8d29a244 */ lw $t1,%lo(g_Vars+0x284)($t1) /* f086a60: 24010004 */ addiu $at,$zero,0x4 /* f086a64: 8d2201b0 */ lw $v0,0x1b0($t1) /* f086a68: 14410003 */ bne $v0,$at,.L0f086a78 @@ -37590,8 +37590,8 @@ glabel var7f1aab3c /* f086a90: 8fa50024 */ lw $a1,0x24($sp) /* f086a94: 14410021 */ bne $v0,$at,.L0f086b1c /* f086a98: 8fa60028 */ lw $a2,0x28($sp) -/* f086a9c: 3c0a800a */ lui $t2,0x800a -/* f086aa0: 8d4aa244 */ lw $t2,-0x5dbc($t2) +/* f086a9c: 3c0a800a */ lui $t2,%hi(g_Vars+0x284) +/* f086aa0: 8d4aa244 */ lw $t2,%lo(g_Vars+0x284)($t2) /* f086aa4: 44802000 */ mtc1 $zero,$f4 /* f086aa8: c54600b4 */ lwc1 $f6,0xb4($t2) /* f086aac: 46062032 */ c.eq.s $f4,$f6 @@ -37602,8 +37602,8 @@ glabel var7f1aab3c /* f086ac0: 24050001 */ addiu $a1,$zero,0x1 .L0f086ac4: /* f086ac4: 11600015 */ beqz $t3,.L0f086b1c -/* f086ac8: 3c0c800a */ lui $t4,0x800a -/* f086acc: 8d8ca244 */ lw $t4,-0x5dbc($t4) +/* f086ac8: 3c0c800a */ lui $t4,%hi(g_Vars+0x284) +/* f086acc: 8d8ca244 */ lw $t4,%lo(g_Vars+0x284)($t4) /* f086ad0: 8d8d01b0 */ lw $t5,0x1b0($t4) /* f086ad4: 15a00011 */ bnez $t5,.L0f086b1c /* f086ad8: 00000000 */ sll $zero,$zero,0x0 @@ -37614,8 +37614,8 @@ glabel var7f1aab3c /* f086aec: 8fa50024 */ lw $a1,0x24($sp) /* f086af0: 1441000a */ bne $v0,$at,.L0f086b1c /* f086af4: 8fa60028 */ lw $a2,0x28($sp) -/* f086af8: 3c0e800a */ lui $t6,0x800a -/* f086afc: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f086af8: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f086afc: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f086b00: 44804000 */ mtc1 $zero,$f8 /* f086b04: c5ca00b4 */ lwc1 $f10,0xb4($t6) /* f086b08: 460a4032 */ c.eq.s $f8,$f10 @@ -37653,11 +37653,11 @@ glabel var7f1aab3c /* f086b80: 8fa60028 */ lw $a2,0x28($sp) /* f086b84: 8ccb0008 */ lw $t3,0x8($a2) /* f086b88: 8fa40030 */ lw $a0,0x30($sp) -/* f086b8c: 3c0d800a */ lui $t5,0x800a +/* f086b8c: 3c0d800a */ lui $t5,%hi(g_Vars+0x284) /* f086b90: 000b6180 */ sll $t4,$t3,0x6 /* f086b94: 0580006d */ bltz $t4,.L0f086d4c /* f086b98: 240100c8 */ addiu $at,$zero,0xc8 -/* f086b9c: 8dada244 */ lw $t5,-0x5dbc($t5) +/* f086b9c: 8dada244 */ lw $t5,%lo(g_Vars+0x284)($t5) /* f086ba0: c4900008 */ lwc1 $f16,0x8($a0) /* f086ba4: c4880010 */ lwc1 $f8,0x10($a0) /* f086ba8: 8da300bc */ lw $v1,0xbc($t5) @@ -37722,8 +37722,8 @@ glabel var7f1aab3c /* f086c80: afa30020 */ sw $v1,0x20($sp) /* f086c84: 0fc259d4 */ jal func0f096750 /* f086c88: afa60028 */ sw $a2,0x28($sp) -/* f086c8c: 3c18800a */ lui $t8,0x800a -/* f086c90: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f086c8c: 3c18800a */ lui $t8,%hi(g_Vars+0x284) +/* f086c90: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f086c94: 3c0143b4 */ lui $at,0x43b4 /* f086c98: 44816000 */ mtc1 $at,$f12 /* f086c9c: c70a0144 */ lwc1 $f10,0x144($t8) @@ -37771,8 +37771,8 @@ glabel var7f1aab3c /* f086d3c: 8fbf001c */ lw $ra,0x1c($sp) .L0f086d40: /* f086d40: 8fab0030 */ lw $t3,0x30($sp) -/* f086d44: 3c01800a */ lui $at,0x800a -/* f086d48: ac2bcda8 */ sw $t3,-0x3258($at) +/* f086d44: 3c01800a */ lui $at,%hi(var8009cda8) +/* f086d48: ac2bcda8 */ sw $t3,%lo(var8009cda8)($at) .L0f086d4c: /* f086d4c: 8fbf001c */ lw $ra,0x1c($sp) .L0f086d50: @@ -37803,12 +37803,12 @@ glabel var7f1aab50 /* f086d70: 24010033 */ addiu $at,$zero,0x33 /* f086d74: 00001825 */ or $v1,$zero,$zero /* f086d78: 90af0003 */ lbu $t7,0x3($a1) -/* f086d7c: 3c19800a */ lui $t9,0x800a +/* f086d7c: 3c19800a */ lui $t9,%hi(g_Vars+0x284) /* f086d80: 15e10019 */ bne $t7,$at,.L0f086de8 /* f086d84: 00000000 */ sll $zero,$zero,0x0 -/* f086d88: 8f39a244 */ lw $t9,-0x5dbc($t9) -/* f086d8c: 3c18800a */ lui $t8,0x800a -/* f086d90: 8f189fc8 */ lw $t8,-0x6038($t8) +/* f086d88: 8f39a244 */ lw $t9,%lo(g_Vars+0x284)($t9) +/* f086d8c: 3c18800a */ lui $t8,%hi(g_Vars+0x8) +/* f086d90: 8f189fc8 */ lw $t8,%lo(g_Vars+0x8)($t8) /* f086d94: 8f28019c */ lw $t0,0x19c($t9) /* f086d98: 03084823 */ subu $t1,$t8,$t0 /* f086d9c: 2921001e */ slti $at,$t1,0x1e @@ -37832,8 +37832,8 @@ glabel var7f1aab50 /* f086de4: 24030001 */ addiu $v1,$zero,0x1 .L0f086de8: /* f086de8: 10600018 */ beqz $v1,.L0f086e4c -/* f086dec: 3c0d800a */ lui $t5,0x800a -/* f086df0: 8dada244 */ lw $t5,-0x5dbc($t5) +/* f086dec: 3c0d800a */ lui $t5,%hi(g_Vars+0x284) +/* f086df0: 8dada244 */ lw $t5,%lo(g_Vars+0x284)($t5) /* f086df4: 24010004 */ addiu $at,$zero,0x4 /* f086df8: 8da201b0 */ lw $v0,0x1b0($t5) /* f086dfc: 10410013 */ beq $v0,$at,.L0f086e4c @@ -37847,8 +37847,8 @@ glabel var7f1aab50 /* f086e1c: 8fa30028 */ lw $v1,0x28($sp) /* f086e20: 14410009 */ bne $v0,$at,.L0f086e48 /* f086e24: 8fa5002c */ lw $a1,0x2c($sp) -/* f086e28: 3c0e800a */ lui $t6,0x800a -/* f086e2c: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f086e28: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f086e2c: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f086e30: 44802000 */ mtc1 $zero,$f4 /* f086e34: c5c600b4 */ lwc1 $f6,0xb4($t6) /* f086e38: 46062032 */ c.eq.s $f4,$f6 @@ -37859,8 +37859,8 @@ glabel var7f1aab50 /* f086e48: 00001825 */ or $v1,$zero,$zero .L0f086e4c: /* f086e4c: 10600037 */ beqz $v1,.L0f086f2c -/* f086e50: 3c0f800a */ lui $t7,0x800a -/* f086e54: 8defa244 */ lw $t7,-0x5dbc($t7) +/* f086e50: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) +/* f086e54: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) /* f086e58: 8fb90030 */ lw $t9,0x30($sp) /* f086e5c: 8de200bc */ lw $v0,0xbc($t7) /* f086e60: c7280008 */ lwc1 $f8,0x8($t9) @@ -37909,8 +37909,8 @@ glabel var7f1aab50 /* f086f04: 00000000 */ sll $zero,$zero,0x0 /* f086f08: 45000008 */ bc1f .L0f086f2c .L0f086f0c: -/* f086f0c: 3c08800a */ lui $t0,0x800a -/* f086f10: 8d08a244 */ lw $t0,-0x5dbc($t0) +/* f086f0c: 3c08800a */ lui $t0,%hi(g_Vars+0x284) +/* f086f10: 8d08a244 */ lw $t0,%lo(g_Vars+0x284)($t0) /* f086f14: 8fb80030 */ lw $t8,0x30($sp) /* f086f18: 24040003 */ addiu $a0,$zero,0x3 /* f086f1c: 0fc31f4c */ jal currentPlayerSetMoveMode @@ -38068,7 +38068,7 @@ glabel func0f086f40 .L0f087138: /* f087138: 93a8002b */ lbu $t0,0x2b($sp) .L0f08713c: -/* f08713c: 3c048009 */ lui $a0,%hi(var80090008) +/* f08713c: 3c048009 */ lui $a0,%hi(var80095200) /* f087140: 24058118 */ addiu $a1,$zero,-32488 /* f087144: 1100000d */ beqz $t0,.L0f08717c /* f087148: 00003025 */ or $a2,$zero,$zero @@ -38080,14 +38080,14 @@ glabel func0f086f40 /* f087160: afab001c */ sw $t3,0x1c($sp) /* f087164: afaa0018 */ sw $t2,0x18($sp) /* f087168: afa90010 */ sw $t1,0x10($sp) -/* f08716c: 8c845200 */ lw $a0,0x5200($a0) +/* f08716c: 8c845200 */ lw $a0,%lo(var80095200)($a0) /* f087170: 2407ffff */ addiu $a3,$zero,-1 /* f087174: 0c004241 */ jal func00010904 /* f087178: e7a40014 */ swc1 $f4,0x14($sp) .L0f08717c: /* f08717c: 8fa40038 */ lw $a0,0x38($sp) /* f087180: 0fc3f525 */ jal func0f0fd494 -/* f087184: 24840008 */ addiu $a0,$a0,%lo(var80090008) +/* f087184: 24840008 */ addiu $a0,$a0,8 /* f087188: 10000080 */ beqz $zero,.L0f08738c /* f08718c: 00000000 */ sll $zero,$zero,0x0 .L0f087190: @@ -38132,20 +38132,20 @@ glabel func0f086f40 /* f087220: 00000000 */ sll $zero,$zero,0x0 /* f087224: 14410037 */ bne $v0,$at,.L0f087304 /* f087228: 8fa40038 */ lw $a0,0x38($sp) -/* f08722c: 3c09800a */ lui $t1,0x800a -/* f087230: 8d29a2d8 */ lw $t1,-0x5d28($t1) -/* f087234: 3c0a800a */ lui $t2,0x800a -/* f087238: 3c03800a */ lui $v1,0x800a +/* f08722c: 3c09800a */ lui $t1,%hi(g_Vars+0x318) +/* f087230: 8d29a2d8 */ lw $t1,%lo(g_Vars+0x318)($t1) +/* f087234: 3c0a800a */ lui $t2,%hi(g_Vars+0x284) +/* f087238: 3c03800a */ lui $v1,%hi(g_Vars+0x28c) /* f08723c: 11200007 */ beqz $t1,.L0f08725c /* f087240: 00000000 */ sll $zero,$zero,0x0 -/* f087244: 8d4aa244 */ lw $t2,-0x5dbc($t2) +/* f087244: 8d4aa244 */ lw $t2,%lo(g_Vars+0x284)($t2) /* f087248: 8d4b00bc */ lw $t3,0xbc($t2) /* f08724c: 0fc633fe */ jal mpPlayerGetIndex /* f087250: 8d640004 */ lw $a0,0x4($t3) /* f087254: 10000002 */ beqz $zero,.L0f087260 /* f087258: 00401825 */ or $v1,$v0,$zero .L0f08725c: -/* f08725c: 8c63a24c */ lw $v1,-0x5db4($v1) +/* f08725c: 8c63a24c */ lw $v1,%lo(g_Vars+0x28c)($v1) .L0f087260: /* f087260: 0460004a */ bltz $v1,.L0f08738c /* f087264: 8fac0034 */ lw $t4,0x34($sp) @@ -38199,11 +38199,11 @@ glabel func0f086f40 /* f08731c: 1440001b */ bnez $v0,.L0f08738c /* f087320: 8fab0034 */ lw $t3,0x34($sp) /* f087324: 8d6d0010 */ lw $t5,0x10($t3) -/* f087328: 3c0f800a */ lui $t7,0x800a +/* f087328: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) /* f08732c: 31ae0002 */ andi $t6,$t5,0x2 /* f087330: 11c00016 */ beqz $t6,.L0f08738c /* f087334: 00000000 */ sll $zero,$zero,0x0 -/* f087338: 8defa244 */ lw $t7,-0x5dbc($t7) +/* f087338: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) /* f08733c: 8df801b0 */ lw $t8,0x1b0($t7) /* f087340: 17000012 */ bnez $t8,.L0f08738c /* f087344: 00000000 */ sll $zero,$zero,0x0 @@ -38211,8 +38211,8 @@ glabel func0f086f40 /* f08734c: 00000000 */ sll $zero,$zero,0x0 /* f087350: 24010002 */ addiu $at,$zero,0x2 /* f087354: 1441000d */ bne $v0,$at,.L0f08738c -/* f087358: 3c02800a */ lui $v0,0x800a -/* f08735c: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f087358: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f08735c: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f087360: 44804000 */ mtc1 $zero,$f8 /* f087364: c44a00b4 */ lwc1 $f10,0xb4($v0) /* f087368: 460a4032 */ c.eq.s $f8,$f10 @@ -39853,8 +39853,8 @@ glabel var7f1aae70 /* f088934: 00c02025 */ or $a0,$a2,$zero /* f088938: 0fc22067 */ jal ammocrateGetPickupAmmoQty /* f08893c: afa6008c */ sw $a2,0x8c($sp) -/* f088940: 3c06800a */ lui $a2,0x800a -/* f088944: 8cc6a48c */ lw $a2,-0x5b74($a2) +/* f088940: 3c06800a */ lui $a2,%hi(g_Vars+0x4cc) +/* f088944: 8cc6a48c */ lw $a2,%lo(g_Vars+0x4cc)($a2) /* f088948: 8fb9008c */ lw $t9,0x8c($sp) /* f08894c: 00402825 */ or $a1,$v0,$zero /* f088950: 2cd80001 */ sltiu $t8,$a2,0x1 @@ -39894,8 +39894,8 @@ glabel var7f1aae70 /* f0889d0: 24010013 */ addiu $at,$zero,0x13 /* f0889d4: 1441ffe9 */ bne $v0,$at,.L0f08897c /* f0889d8: 24630004 */ addiu $v1,$v1,0x4 -/* f0889dc: 3c0c800a */ lui $t4,0x800a -/* f0889e0: 8d8ca48c */ lw $t4,-0x5b74($t4) +/* f0889dc: 3c0c800a */ lui $t4,%hi(g_Vars+0x4cc) +/* f0889e0: 8d8ca48c */ lw $t4,%lo(g_Vars+0x4cc)($t4) /* f0889e4: 3c048009 */ lui $a0,%hi(var80095200) /* f0889e8: 240500ea */ addiu $a1,$zero,0xea /* f0889ec: 1580000d */ bnez $t4,.L0f088a24 @@ -40158,11 +40158,11 @@ glabel var7f1aae70 /* f088d98: 8fb80074 */ lw $t8,0x74($sp) .L0f088d9c: /* f088d9c: 2401002e */ addiu $at,$zero,0x2e -/* f088da0: 3c09800a */ lui $t1,0x800a +/* f088da0: 3c09800a */ lui $t1,%hi(g_Vars+0x284) /* f088da4: 9319005c */ lbu $t9,0x5c($t8) /* f088da8: 17210007 */ bne $t9,$at,.L0f088dc8 /* f088dac: 00000000 */ sll $zero,$zero,0x0 -/* f088db0: 8d29a244 */ lw $t1,-0x5dbc($t1) +/* f088db0: 8d29a244 */ lw $t1,%lo(g_Vars+0x284)($t1) /* f088db4: 8d2a0480 */ lw $t2,0x480($t1) /* f088db8: 15400003 */ bnez $t2,.L0f088dc8 /* f088dbc: 00000000 */ sll $zero,$zero,0x0 @@ -40173,8 +40173,8 @@ glabel var7f1aae70 /* f088dcc: 8fa20098 */ lw $v0,0x98($sp) /* f088dd0: 0fc30884 */ jal func0f0c2210 /* f088dd4: c4cc0060 */ lwc1 $f12,0x60($a2) -/* f088dd8: 3c0b800a */ lui $t3,0x800a -/* f088ddc: 8d6ba48c */ lw $t3,-0x5b74($t3) +/* f088dd8: 3c0b800a */ lui $t3,%hi(g_Vars+0x4cc) +/* f088ddc: 8d6ba48c */ lw $t3,%lo(g_Vars+0x4cc)($t3) /* f088de0: 3c048009 */ lui $a0,%hi(var80095200) /* f088de4: 240501cd */ addiu $a1,$zero,0x1cd /* f088de8: 1560000d */ bnez $t3,.L0f088e20 @@ -40199,18 +40199,18 @@ glabel var7f1aae70 /* f088e30: 8fa4009c */ lw $a0,0x9c($sp) /* f088e34: 14400033 */ bnez $v0,.L0f088f04 /* f088e38: 00402025 */ or $a0,$v0,$zero -/* f088e3c: 3c18800a */ lui $t8,0x800a -/* f088e40: 8f18a02c */ lw $t8,-0x5fd4($t8) -/* f088e44: 3c19800a */ lui $t9,0x800a -/* f088e48: 3c09800a */ lui $t1,0x800a +/* f088e3c: 3c18800a */ lui $t8,%hi(g_Vars+0x6c) +/* f088e40: 8f18a02c */ lw $t8,%lo(g_Vars+0x6c)($t8) +/* f088e44: 3c19800a */ lui $t9,%hi(g_Vars+0x68) +/* f088e48: 3c09800a */ lui $t1,%hi(g_Vars+0x64) /* f088e4c: 13000003 */ beqz $t8,.L0f088e5c -/* f088e50: 3c0a800a */ lui $t2,0x800a +/* f088e50: 3c0a800a */ lui $t2,%hi(g_Vars+0x70) /* f088e54: 10000002 */ beqz $zero,.L0f088e60 /* f088e58: 24050001 */ addiu $a1,$zero,0x1 .L0f088e5c: /* f088e5c: 00002825 */ or $a1,$zero,$zero .L0f088e60: -/* f088e60: 8f39a028 */ lw $t9,-0x5fd8($t9) +/* f088e60: 8f39a028 */ lw $t9,%lo(g_Vars+0x68)($t9) /* f088e64: 00001825 */ or $v1,$zero,$zero /* f088e68: 00002025 */ or $a0,$zero,$zero /* f088e6c: 13200003 */ beqz $t9,.L0f088e7c @@ -40218,13 +40218,13 @@ glabel var7f1aae70 /* f088e74: 10000001 */ beqz $zero,.L0f088e7c /* f088e78: 24030001 */ addiu $v1,$zero,0x1 .L0f088e7c: -/* f088e7c: 8d29a024 */ lw $t1,-0x5fdc($t1) +/* f088e7c: 8d29a024 */ lw $t1,%lo(g_Vars+0x64)($t1) /* f088e80: 11200003 */ beqz $t1,.L0f088e90 /* f088e84: 00000000 */ sll $zero,$zero,0x0 /* f088e88: 10000001 */ beqz $zero,.L0f088e90 /* f088e8c: 24040001 */ addiu $a0,$zero,0x1 .L0f088e90: -/* f088e90: 8d4aa030 */ lw $t2,-0x5fd0($t2) +/* f088e90: 8d4aa030 */ lw $t2,%lo(g_Vars+0x70)($t2) /* f088e94: 11400003 */ beqz $t2,.L0f088ea4 /* f088e98: 00000000 */ sll $zero,$zero,0x0 /* f088e9c: 10000001 */ beqz $zero,.L0f088ea4 @@ -40403,7 +40403,7 @@ glabel var7f1aae84 /* f0890c4: 19c00010 */ blez $t6,.L0f089108 /* f0890c8: 00000000 */ sll $zero,$zero,0x0 /* f0890cc: 8c430108 */ lw $v1,0x108($v0) -/* f0890d0: 3c18800a */ lui $t8,0x800a +/* f0890d0: 3c18800a */ lui $t8,%hi(g_Vars+0x284) /* f0890d4: 14600006 */ bnez $v1,.L0f0890f0 /* f0890d8: 00000000 */ sll $zero,$zero,0x0 /* f0890dc: 8c4f0090 */ lw $t7,0x90($v0) @@ -40412,7 +40412,7 @@ glabel var7f1aae84 /* f0890e8: 10000237 */ beqz $zero,.L0f0899c8 /* f0890ec: 00001025 */ or $v0,$zero,$zero .L0f0890f0: -/* f0890f0: 8f18a244 */ lw $t8,-0x5dbc($t8) +/* f0890f0: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) /* f0890f4: 8f1900bc */ lw $t9,0xbc($t8) /* f0890f8: 13230003 */ beq $t9,$v1,.L0f089108 /* f0890fc: 00000000 */ sll $zero,$zero,0x0 @@ -40568,7 +40568,7 @@ glabel var7f1aae84 /* f089318: 14400005 */ bnez $v0,.L0f089330 /* f08931c: 00000000 */ sll $zero,$zero,0x0 /* f089320: 80ea0061 */ lb $t2,0x61($a3) -/* f089324: 3c0d800a */ lui $t5,0x800a +/* f089324: 3c0d800a */ lui $t5,%hi(g_Vars+0x318) /* f089328: 05400015 */ bltz $t2,.L0f089380 /* f08932c: 00000000 */ sll $zero,$zero,0x0 .L0f089330: @@ -40596,7 +40596,7 @@ glabel var7f1aae84 /* f089378: 10000193 */ beqz $zero,.L0f0899c8 /* f08937c: 00001025 */ or $v0,$zero,$zero .L0f089380: -/* f089380: 8dada2d8 */ lw $t5,-0x5d28($t5) +/* f089380: 8dada2d8 */ lw $t5,%lo(g_Vars+0x318)($t5) /* f089384: 24051000 */ addiu $a1,$zero,0x1000 /* f089388: 11a0001a */ beqz $t5,.L0f0893f4 /* f08938c: 00000000 */ sll $zero,$zero,0x0 @@ -40835,7 +40835,7 @@ glabel var7f1aae84 /* f0896c4: 0fc30869 */ jal func0f0c21a4 /* f0896c8: afae0058 */ sw $t6,0x58($sp) /* f0896cc: 8faf0058 */ lw $t7,0x58($sp) -/* f0896d0: 3c18800a */ lui $t8,0x800a +/* f0896d0: 3c18800a */ lui $t8,%hi(g_Vars+0x318) /* f0896d4: c5e40060 */ lwc1 $f4,0x60($t7) /* f0896d8: 4600203e */ c.le.s $f4,$f0 /* f0896dc: 00000000 */ sll $zero,$zero,0x0 @@ -40844,11 +40844,11 @@ glabel var7f1aae84 /* f0896e8: 1000000e */ beqz $zero,.L0f089724 /* f0896ec: 24100001 */ addiu $s0,$zero,0x1 .L0f0896f0: -/* f0896f0: 8f18a2d8 */ lw $t8,-0x5d28($t8) -/* f0896f4: 3c19800b */ lui $t9,0x800b +/* f0896f0: 8f18a2d8 */ lw $t8,%lo(g_Vars+0x318)($t8) +/* f0896f4: 3c19800b */ lui $t9,%hi(g_MpSetup+0x10) /* f0896f8: 1300000a */ beqz $t8,.L0f089724 /* f0896fc: 00000000 */ sll $zero,$zero,0x0 -/* f089700: 9339cb98 */ lbu $t9,-0x3468($t9) +/* f089700: 9339cb98 */ lbu $t9,%lo(g_MpSetup+0x10)($t9) /* f089704: 24010001 */ addiu $at,$zero,0x1 /* f089708: 17210006 */ bne $t9,$at,.L0f089724 /* f08970c: 00000000 */ sll $zero,$zero,0x0 @@ -40863,8 +40863,8 @@ glabel var7f1aae84 /* f08972c: 100000a6 */ beqz $zero,.L0f0899c8 /* f089730: 00001025 */ or $v0,$zero,$zero .L0f089734: -/* f089734: 3c02800a */ lui $v0,0x800a -/* f089738: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f089734: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f089738: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f08973c: 3c017f1b */ lui $at,%hi(var7f1aae74) /* f089740: c428ae74 */ lwc1 $f8,%lo(var7f1aae74)($at) /* f089744: c4460154 */ lwc1 $f6,0x154($v0) @@ -40925,8 +40925,8 @@ glabel var7f1aae84 /* f08981c: c7ae0048 */ lwc1 $f14,0x48($sp) /* f089820: 0002182b */ sltu $v1,$zero,$v0 .L0f089824: -/* f089824: 3c0d800a */ lui $t5,0x800a -/* f089828: 8dada244 */ lw $t5,-0x5dbc($t5) +/* f089824: 3c0d800a */ lui $t5,%hi(g_Vars+0x284) +/* f089828: 8dada244 */ lw $t5,%lo(g_Vars+0x284)($t5) /* f08982c: 8fa50084 */ lw $a1,0x84($sp) /* f089830: 00602025 */ or $a0,$v1,$zero /* f089834: 8dae18f0 */ lw $t6,0x18f0($t5) @@ -42308,8 +42308,8 @@ GLOBAL_ASM( glabel weaponIsThrown /* f08aaf4: 27bdffe0 */ addiu $sp,$sp,-32 /* f08aaf8: afb00014 */ sw $s0,0x14($sp) -/* f08aafc: 3c10800a */ lui $s0,0x800a -/* f08ab00: 8e10a2fc */ lw $s0,-0x5d04($s0) +/* f08aafc: 3c10800a */ lui $s0,%hi(g_Vars+0x33c) +/* f08ab00: 8e10a2fc */ lw $s0,%lo(g_Vars+0x33c)($s0) /* f08ab04: afb10018 */ sw $s1,0x18($sp) /* f08ab08: 00808825 */ or $s1,$a0,$zero /* f08ab0c: 1200000f */ beqz $s0,.L0f08ab4c @@ -42591,10 +42591,10 @@ glabel func0f08ae54 /* f08ae84: 11e00099 */ beqz $t7,.L0f08b0ec /* f08ae88: 00000000 */ sll $zero,$zero,0x0 /* f08ae8c: 8cd80018 */ lw $t8,0x18($a2) -/* f08ae90: 3c19800a */ lui $t9,0x800a +/* f08ae90: 3c19800a */ lui $t9,%hi(g_Vars+0x314) /* f08ae94: 13000095 */ beqz $t8,.L0f08b0ec /* f08ae98: 00000000 */ sll $zero,$zero,0x0 -/* f08ae9c: 8f39a2d4 */ lw $t9,-0x5d2c($t9) +/* f08ae9c: 8f39a2d4 */ lw $t9,%lo(g_Vars+0x314)($t9) /* f08aea0: 02002025 */ or $a0,$s0,$zero /* f08aea4: 53200012 */ beqzl $t9,.L0f08aef0 /* f08aea8: 00037880 */ sll $t7,$v1,0x2 @@ -42887,8 +42887,8 @@ glabel var7f1aae98 .word 0x3d8ebee0 .text /* f08b27c: 27bdff58 */ addiu $sp,$sp,-168 -/* f08b280: 3c0e800a */ lui $t6,0x800a -/* f08b284: 8dcea2d8 */ lw $t6,-0x5d28($t6) +/* f08b280: 3c0e800a */ lui $t6,%hi(g_Vars+0x318) +/* f08b284: 8dcea2d8 */ lw $t6,%lo(g_Vars+0x318)($t6) /* f08b288: afb00020 */ sw $s0,0x20($sp) /* f08b28c: afbf0024 */ sw $ra,0x24($sp) /* f08b290: afa400a8 */ sw $a0,0xa8($sp) @@ -43047,12 +43047,12 @@ glabel var7f1aae98 /* f08b4d8: 8ca4001c */ lw $a0,0x1c($a1) .L0f08b4dc: /* f08b4dc: 24010006 */ addiu $at,$zero,0x6 -/* f08b4e0: 3c08800a */ lui $t0,0x800a +/* f08b4e0: 3c08800a */ lui $t0,%hi(g_Vars+0x28c) /* f08b4e4: 908f0000 */ lbu $t7,0x0($a0) /* f08b4e8: 240a00ff */ addiu $t2,$zero,0xff /* f08b4ec: 55e10023 */ bnel $t7,$at,.L0f08b57c /* f08b4f0: a20a00a9 */ sb $t2,0xa9($s0) -/* f08b4f4: 8d08a24c */ lw $t0,-0x5db4($t0) +/* f08b4f4: 8d08a24c */ lw $t0,%lo(g_Vars+0x28c)($t0) /* f08b4f8: 0fc4a25f */ jal propGetPlayerNum /* f08b4fc: afa80030 */ sw $t0,0x30($sp) /* f08b500: 0fc4a24b */ jal setCurrentPlayerNum @@ -43330,8 +43330,8 @@ glabel var7f1aaf24 /* f08b7d8: a60b0004 */ sh $t3,0x4($s0) /* f08b7dc: 0fc22b72 */ jal func0f08adc8 /* f08b7e0: 8fa5009c */ lw $a1,0x9c($sp) -/* f08b7e4: 3c0c800a */ lui $t4,0x800a -/* f08b7e8: 8d8ca2d4 */ lw $t4,-0x5d2c($t4) +/* f08b7e4: 3c0c800a */ lui $t4,%hi(g_Vars+0x314) +/* f08b7e8: 8d8ca2d4 */ lw $t4,%lo(g_Vars+0x314)($t4) /* f08b7ec: 00408825 */ or $s1,$v0,$zero /* f08b7f0: 5180000e */ beqzl $t4,.L0f08b82c /* f08b7f4: 922a003f */ lbu $t2,0x3f($s1) @@ -45706,8 +45706,8 @@ glabel var7f1aaff8 /* f08d7a4: afa00050 */ sw $zero,0x50($sp) /* f08d7a8: 0fc249af */ jal func0f0926bc /* f08d7ac: 3406ffff */ dli $a2,0xffff -/* f08d7b0: 3c0e800a */ lui $t6,0x800a -/* f08d7b4: 8dcea48c */ lw $t6,-0x5b74($t6) +/* f08d7b0: 3c0e800a */ lui $t6,%hi(g_Vars+0x4cc) +/* f08d7b4: 8dcea48c */ lw $t6,%lo(g_Vars+0x4cc)($t6) /* f08d7b8: 8fa20054 */ lw $v0,0x54($sp) /* f08d7bc: 8fa30050 */ lw $v1,0x50($sp) /* f08d7c0: 11c0000c */ beqz $t6,.L0f08d7f4 @@ -45981,8 +45981,8 @@ glabel var7f1ab070 /* f08dac8: afa00050 */ sw $zero,0x50($sp) /* f08dacc: 0fc249af */ jal func0f0926bc /* f08dad0: 3406ffff */ dli $a2,0xffff -/* f08dad4: 3c0e800a */ lui $t6,0x800a -/* f08dad8: 8dcea48c */ lw $t6,-0x5b74($t6) +/* f08dad4: 3c0e800a */ lui $t6,%hi(g_Vars+0x4cc) +/* f08dad8: 8dcea48c */ lw $t6,%lo(g_Vars+0x4cc)($t6) /* f08dadc: 8fa20054 */ lw $v0,0x54($sp) /* f08dae0: 8fa30050 */ lw $v1,0x50($sp) /* f08dae4: 11c0000c */ beqz $t6,.L0f08db18 @@ -46224,8 +46224,8 @@ glabel var7f1ab0f0 /* f08dd5c: afa0004c */ sw $zero,0x4c($sp) /* f08dd60: 0fc249af */ jal func0f0926bc /* f08dd64: 3406ffff */ dli $a2,0xffff -/* f08dd68: 3c0e800a */ lui $t6,0x800a -/* f08dd6c: 8dcea48c */ lw $t6,-0x5b74($t6) +/* f08dd68: 3c0e800a */ lui $t6,%hi(g_Vars+0x4cc) +/* f08dd6c: 8dcea48c */ lw $t6,%lo(g_Vars+0x4cc)($t6) /* f08dd70: 8fa2004c */ lw $v0,0x4c($sp) /* f08dd74: 8fa50054 */ lw $a1,0x54($sp) /* f08dd78: 11c0000b */ beqz $t6,.L0f08dda8 @@ -46410,8 +46410,8 @@ glabel var7f1ab168 /* f08df28: afa0004c */ sw $zero,0x4c($sp) /* f08df2c: 0fc249af */ jal func0f0926bc /* f08df30: 3406ffff */ dli $a2,0xffff -/* f08df34: 3c0e800a */ lui $t6,0x800a -/* f08df38: 8dcea48c */ lw $t6,-0x5b74($t6) +/* f08df34: 3c0e800a */ lui $t6,%hi(g_Vars+0x4cc) +/* f08df38: 8dcea48c */ lw $t6,%lo(g_Vars+0x4cc)($t6) /* f08df3c: 8fa2004c */ lw $v0,0x4c($sp) /* f08df40: 8fa50054 */ lw $a1,0x54($sp) /* f08df44: 11c0000b */ beqz $t6,.L0f08df74 @@ -46831,10 +46831,10 @@ glabel func0f08e794 /* f08e7a8: 0fc599fa */ jal func0f1667e8 /* f08e7ac: afae0034 */ sw $t6,0x34($sp) /* f08e7b0: 10400039 */ beqz $v0,.L0f08e898 -/* f08e7b4: 3c04800a */ lui $a0,%hi(var800a1bb0) -/* f08e7b8: 8c84a244 */ lw $a0,-0x5dbc($a0) +/* f08e7b4: 3c04800a */ lui $a0,%hi(g_Vars+0x284) +/* f08e7b8: 8c84a244 */ lw $a0,%lo(g_Vars+0x284)($a0) /* f08e7bc: afa20030 */ sw $v0,0x30($sp) -/* f08e7c0: 24841bb0 */ addiu $a0,$a0,%lo(var800a1bb0) +/* f08e7c0: 24841bb0 */ addiu $a0,$a0,7088 /* f08e7c4: 0fc2d5be */ jal func0f0b56f8 /* f08e7c8: afa4001c */ sw $a0,0x1c($sp) /* f08e7cc: 8fa4001c */ lw $a0,0x1c($sp) @@ -46949,8 +46949,8 @@ glabel var7f1ab16c /* f08e950: 8fa60050 */ lw $a2,0x50($sp) /* f08e954: 1040001e */ beqz $v0,.L0f08e9d0 /* f08e958: 00404025 */ or $t0,$v0,$zero -/* f08e95c: 3c02800a */ lui $v0,%hi(var800a1bb0) -/* f08e960: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f08e95c: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f08e960: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f08e964: c6040000 */ lwc1 $f4,0x0($s0) /* f08e968: c6080004 */ lwc1 $f8,0x4($s0) /* f08e96c: c4461bb0 */ lwc1 $f6,0x1bb0($v0) @@ -46964,7 +46964,7 @@ glabel var7f1ab16c /* f08e98c: c424b16c */ lwc1 $f4,%lo(var7f1ab16c)($at) /* f08e990: 46128301 */ sub.s $f12,$f16,$f18 /* f08e994: 46021202 */ mul.s $f8,$f2,$f2 -/* f08e998: 24421bb0 */ addiu $v0,$v0,%lo(var800a1bb0) +/* f08e998: 24421bb0 */ addiu $v0,$v0,7088 /* f08e99c: 460c6402 */ mul.s $f16,$f12,$f12 /* f08e9a0: 46083280 */ add.s $f10,$f6,$f8 /* f08e9a4: 46105480 */ add.s $f18,$f10,$f16 @@ -46994,8 +46994,8 @@ glabel func0f08e9e4 glabel var7f1ab170 .word 0x4e742400 .text -/* f08e9e4: 3c02800a */ lui $v0,%hi(var800a1bb0) -/* f08e9e8: 8c42a244 */ lw $v0,-0x5dbc($v0) +/* f08e9e4: 3c02800a */ lui $v0,%hi(g_Vars+0x284) +/* f08e9e8: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) /* f08e9ec: c4840000 */ lwc1 $f4,0x0($a0) /* f08e9f0: c4880004 */ lwc1 $f8,0x4($a0) /* f08e9f4: c4461bb0 */ lwc1 $f6,0x1bb0($v0) @@ -47010,7 +47010,7 @@ glabel var7f1ab170 /* f08ea18: 46128301 */ sub.s $f12,$f16,$f18 /* f08ea1c: 46021202 */ mul.s $f8,$f2,$f2 /* f08ea20: 24030001 */ addiu $v1,$zero,0x1 -/* f08ea24: 24421bb0 */ addiu $v0,$v0,%lo(var800a1bb0) +/* f08ea24: 24421bb0 */ addiu $v0,$v0,7088 /* f08ea28: 460c6402 */ mul.s $f16,$f12,$f12 /* f08ea2c: 46083280 */ add.s $f10,$f6,$f8 /* f08ea30: 46105480 */ add.s $f18,$f10,$f16 @@ -47653,11 +47653,11 @@ glabel func0f08f11c /* f08f218: 15210046 */ bne $t1,$at,.L0f08f334 /* f08f21c: 00000000 */ sll $zero,$zero,0x0 /* f08f220: 8c510004 */ lw $s1,0x4($v0) -/* f08f224: 3c0c800a */ lui $t4,0x800a +/* f08f224: 3c0c800a */ lui $t4,%hi(g_Vars+0x318) /* f08f228: 8e2a0014 */ lw $t2,0x14($s1) /* f08f22c: 354b0010 */ ori $t3,$t2,0x10 /* f08f230: ae2b0014 */ sw $t3,0x14($s1) -/* f08f234: 8d8ca2d8 */ lw $t4,-0x5d28($t4) +/* f08f234: 8d8ca2d8 */ lw $t4,%lo(g_Vars+0x318)($t4) /* f08f238: 000b7240 */ sll $t6,$t3,0x9 /* f08f23c: 1580003d */ bnez $t4,.L0f08f334 /* f08f240: 00000000 */ sll $zero,$zero,0x0 @@ -47716,11 +47716,11 @@ glabel func0f08f11c /* f08f2fc: 160a000d */ bne $s0,$t2,.L0f08f334 /* f08f300: 00000000 */ sll $zero,$zero,0x0 /* f08f304: 862b019e */ lh $t3,0x19e($s1) -/* f08f308: 3c0d800a */ lui $t5,0x800a +/* f08f308: 3c0d800a */ lui $t5,%hi(g_Vars+0x8) /* f08f30c: 240f0258 */ addiu $t7,$zero,0x258 /* f08f310: 05630008 */ bgezl $t3,.L0f08f334 /* f08f314: a62f019e */ sh $t7,0x19e($s1) -/* f08f318: 8dad9fc8 */ lw $t5,-0x6038($t5) +/* f08f318: 8dad9fc8 */ lw $t5,%lo(g_Vars+0x8)($t5) /* f08f31c: 8e2c00d8 */ lw $t4,0xd8($s1) /* f08f320: 25aeffc4 */ addiu $t6,$t5,-60 /* f08f324: 018e082a */ slt $at,$t4,$t6 @@ -47757,14 +47757,14 @@ glabel func0f08f11c /* f08f38c: 24010002 */ addiu $at,$zero,0x2 /* f08f390: c606007c */ lwc1 $f6,0x7c($s0) /* f08f394: c608005c */ lwc1 $f8,0x5c($s0) -/* f08f398: 3c19800a */ lui $t9,0x800a +/* f08f398: 3c19800a */ lui $t9,%hi(g_Vars+0x8) /* f08f39c: 4606403e */ c.le.s $f8,$f6 /* f08f3a0: 00000000 */ sll $zero,$zero,0x0 /* f08f3a4: 45020017 */ bc1fl .L0f08f404 /* f08f3a8: 02002025 */ or $a0,$s0,$zero /* f08f3ac: a2000084 */ sb $zero,0x84($s0) /* f08f3b0: e6140080 */ swc1 $f20,0x80($s0) -/* f08f3b4: 8f399fc8 */ lw $t9,-0x6038($t9) +/* f08f3b4: 8f399fc8 */ lw $t9,%lo(g_Vars+0x8)($t9) /* f08f3b8: 02002025 */ or $a0,$s0,$zero /* f08f3bc: 0fc23889 */ jal func0f08e224 /* f08f3c0: ae1900c0 */ sw $t9,0xc0($s0) @@ -47808,8 +47808,8 @@ glabel func0f08f11c /* f08f448: 0fc23518 */ jal func0f08d460 /* f08f44c: 02002025 */ or $a0,$s0,$zero .L0f08f450: -/* f08f450: 3c08800a */ lui $t0,0x800a -/* f08f454: 8d089fc8 */ lw $t0,-0x6038($t0) +/* f08f450: 3c08800a */ lui $t0,%hi(g_Vars+0x8) +/* f08f454: 8d089fc8 */ lw $t0,%lo(g_Vars+0x8)($t0) /* f08f458: ae0800c8 */ sw $t0,0xc8($s0) /* f08f45c: 8e1000bc */ lw $s0,0xbc($s0) /* f08f460: 52120004 */ beql $s0,$s2,.L0f08f474 @@ -47891,8 +47891,8 @@ glabel var7f1ab17c /* f08f53c: afbf0014 */ sw $ra,0x14($sp) /* f08f540: 0fc259d4 */ jal func0f096750 /* f08f544: 00000000 */ sll $zero,$zero,0x0 -/* f08f548: 3c03800a */ lui $v1,0x800a -/* f08f54c: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f08f548: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f08f54c: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f08f550: 46000086 */ mov.s $f2,$f0 /* f08f554: 3c0143b4 */ lui $at,0x43b4 /* f08f558: 8c620480 */ lw $v0,0x480($v1) @@ -47954,8 +47954,8 @@ glabel var7f1ab184 .word 0x40c907a9 .text /* f08f604: 27bdff18 */ addiu $sp,$sp,-232 -/* f08f608: 3c08800a */ lui $t0,0x800a -/* f08f60c: 8d08a244 */ lw $t0,-0x5dbc($t0) +/* f08f608: 3c08800a */ lui $t0,%hi(g_Vars+0x284) +/* f08f60c: 8d08a244 */ lw $t0,%lo(g_Vars+0x284)($t0) /* f08f610: afbf0014 */ sw $ra,0x14($sp) /* f08f614: afa400e8 */ sw $a0,0xe8($sp) /* f08f618: afa500ec */ sw $a1,0xec($sp) @@ -48209,8 +48209,8 @@ glabel var7f1ab194 /* f08f988: afa50064 */ sw $a1,0x64($sp) /* f08f98c: 15e000c4 */ bnez $t7,.L0f08fca0 /* f08f990: afae005c */ sw $t6,0x5c($sp) -/* f08f994: 3c03800a */ lui $v1,0x800a -/* f08f998: 8c63a244 */ lw $v1,-0x5dbc($v1) +/* f08f994: 3c03800a */ lui $v1,%hi(g_Vars+0x284) +/* f08f998: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f08f99c: 00008025 */ or $s0,$zero,$zero /* f08f9a0: 3c0541f0 */ lui $a1,0x41f0 /* f08f9a4: 8c620480 */ lw $v0,0x480($v1) @@ -48302,10 +48302,10 @@ glabel var7f1ab194 /* f08fae4: 00000000 */ sll $zero,$zero,0x0 /* f08fae8: 8e2c0014 */ lw $t4,0x14($s1) .L0f08faec: -/* f08faec: 3c01800a */ lui $at,0x800a +/* f08faec: 3c01800a */ lui $at,%hi(var8009cda8) /* f08faf0: afa0005c */ sw $zero,0x5c($sp) /* f08faf4: 1000006a */ beqz $zero,.L0f08fca0 -/* f08faf8: ac2ccda8 */ sw $t4,-0x3258($at) +/* f08faf8: ac2ccda8 */ sw $t4,%lo(var8009cda8)($at) .L0f08fafc: /* f08fafc: 3c017f1b */ lui $at,%hi(var7f1ab190) /* f08fb00: c42eb190 */ lwc1 $f14,%lo(var7f1ab190)($at) @@ -48325,13 +48325,13 @@ glabel var7f1ab194 /* f08fb38: 4502000a */ bc1fl .L0f08fb64 /* f08fb3c: 8e3000bc */ lw $s0,0xbc($s1) /* f08fb40: 460e503e */ c.le.s $f10,$f14 -/* f08fb44: 3c01800a */ lui $at,0x800a +/* f08fb44: 3c01800a */ lui $at,%hi(var8009cda8) /* f08fb48: 45020006 */ bc1fl .L0f08fb64 /* f08fb4c: 8e3000bc */ lw $s0,0xbc($s1) /* f08fb50: 8e2d0014 */ lw $t5,0x14($s1) /* f08fb54: afa0005c */ sw $zero,0x5c($sp) /* f08fb58: 10000051 */ beqz $zero,.L0f08fca0 -/* f08fb5c: ac2dcda8 */ sw $t5,-0x3258($at) +/* f08fb5c: ac2dcda8 */ sw $t5,%lo(var8009cda8)($at) /* f08fb60: 8e3000bc */ lw $s0,0xbc($s1) .L0f08fb64: /* f08fb64: 5200003a */ beqzl $s0,.L0f08fc50 @@ -48415,9 +48415,9 @@ glabel var7f1ab194 /* f08fc88: 45020006 */ bc1fl .L0f08fca4 /* f08fc8c: 8fbf0024 */ lw $ra,0x24($sp) /* f08fc90: 8e2f0014 */ lw $t7,0x14($s1) -/* f08fc94: 3c01800a */ lui $at,0x800a +/* f08fc94: 3c01800a */ lui $at,%hi(var8009cda8) /* f08fc98: afa0005c */ sw $zero,0x5c($sp) -/* f08fc9c: ac2fcda8 */ sw $t7,-0x3258($at) +/* f08fc9c: ac2fcda8 */ sw $t7,%lo(var8009cda8)($at) .L0f08fca0: /* f08fca0: 8fbf0024 */ lw $ra,0x24($sp) .L0f08fca4: @@ -48452,11 +48452,11 @@ glabel var7f1ab198 /* f08fcf4: 45020078 */ bc1fl .L0f08fed8 /* f08fcf8: 8fbf0024 */ lw $ra,0x24($sp) /* f08fcfc: 90890001 */ lbu $t1,0x1($a0) -/* f08fd00: 3c04800a */ lui $a0,%hi(var800a0028) +/* f08fd00: 3c04800a */ lui $a0,%hi(g_Vars+0x284) /* f08fd04: 312a0002 */ andi $t2,$t1,0x2 /* f08fd08: 51400073 */ beqzl $t2,.L0f08fed8 /* f08fd0c: 8fbf0024 */ lw $ra,0x24($sp) -/* f08fd10: 8c84a244 */ lw $a0,-0x5dbc($a0) +/* f08fd10: 8c84a244 */ lw $a0,%lo(g_Vars+0x284)($a0) /* f08fd14: afa000ac */ sw $zero,0xac($sp) /* f08fd18: 8c830480 */ lw $v1,0x480($a0) /* f08fd1c: 0003102b */ sltu $v0,$zero,$v1 @@ -48488,7 +48488,7 @@ glabel var7f1ab198 /* f08fd7c: 8fa400b8 */ lw $a0,0xb8($sp) /* f08fd80: 3c014348 */ lui $at,0x4348 /* f08fd84: 25050028 */ addiu $a1,$t0,0x28 -/* f08fd88: 24840028 */ addiu $a0,$a0,%lo(var800a0028) +/* f08fd88: 24840028 */ addiu $a0,$a0,40 /* f08fd8c: 460a4400 */ add.s $f16,$f8,$f10 /* f08fd90: 4612803c */ c.lt.s $f16,$f18 /* f08fd94: 00000000 */ sll $zero,$zero,0x0 @@ -48835,17 +48835,17 @@ glabel func0f09044c /* f09049c: 44818000 */ mtc1 $at,$f16 /* f0904a0: 3c01800a */ lui $at,0x800a /* f0904a4: e430ce38 */ swc1 $f16,-0x31c8($at) -/* f0904a8: 3c01800a */ lui $at,0x800a +/* f0904a8: 3c01800a */ lui $at,%hi(var8009ce3c) /* f0904ac: 10000008 */ beqz $zero,.L0f0904d0 -/* f0904b0: ac20ce3c */ sw $zero,-0x31c4($at) +/* f0904b0: ac20ce3c */ sw $zero,%lo(var8009ce3c)($at) .L0f0904b4: /* f0904b4: 3c014561 */ lui $at,0x4561 /* f0904b8: 44819000 */ mtc1 $at,$f18 /* f0904bc: 3c01800a */ lui $at,0x800a /* f0904c0: 240f0001 */ addiu $t7,$zero,0x1 /* f0904c4: e432ce38 */ swc1 $f18,-0x31c8($at) -/* f0904c8: 3c01800a */ lui $at,0x800a -/* f0904cc: ac2fce3c */ sw $t7,-0x31c4($at) +/* f0904c8: 3c01800a */ lui $at,%hi(var8009ce3c) +/* f0904cc: ac2fce3c */ sw $t7,%lo(var8009ce3c)($at) .L0f0904d0: /* f0904d0: 8fbf0014 */ lw $ra,0x14($sp) /* f0904d4: 27bd0018 */ addiu $sp,$sp,0x18 @@ -48942,8 +48942,8 @@ glabel var7f1ab19c /* f0905f0: 246398e4 */ addiu $v1,$v1,%lo(var800698e4) /* f0905f4: 13000080 */ beqz $t8,.L0f0907f8 /* f0905f8: 3c048007 */ lui $a0,%hi(var800698f8) -/* f0905fc: 3c02800a */ lui $v0,0x800a -/* f090600: 8c429fc8 */ lw $v0,-0x6038($v0) +/* f0905fc: 3c02800a */ lui $v0,%hi(g_Vars+0x8) +/* f090600: 8c429fc8 */ lw $v0,%lo(g_Vars+0x8)($v0) /* f090604: 248498f8 */ addiu $a0,$a0,%lo(var800698f8) /* f090608: 8c990000 */ lw $t9,0x0($a0) /* f09060c: 2448ff1f */ addiu $t0,$v0,-225 @@ -48983,7 +48983,7 @@ glabel var7f1ab19c /* f090690: 00000000 */ sll $zero,$zero,0x0 /* f090694: 8d810000 */ lw $at,0x0($t4) /* f090698: 27a60040 */ addiu $a2,$sp,0x40 -/* f09069c: 3c0f800a */ lui $t7,0x800a +/* f09069c: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) /* f0906a0: acc10000 */ sw $at,0x0($a2) /* f0906a4: 8d8e0004 */ lw $t6,0x4($t4) /* f0906a8: 3c053e00 */ lui $a1,0x3e00 @@ -48991,7 +48991,7 @@ glabel var7f1ab19c /* f0906b0: acce0004 */ sw $t6,0x4($a2) /* f0906b4: 8d810008 */ lw $at,0x8($t4) /* f0906b8: acc10008 */ sw $at,0x8($a2) -/* f0906bc: 8defa244 */ lw $t7,-0x5dbc($t7) +/* f0906bc: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) /* f0906c0: 8df800bc */ lw $t8,0xbc($t7) /* f0906c4: 8f040004 */ lw $a0,0x4($t8) /* f0906c8: 0fc0d049 */ jal func0f034124 @@ -49047,8 +49047,8 @@ glabel var7f1ab19c /* f090788: 3c0643c8 */ lui $a2,0x43c8 /* f09078c: 3c017f1b */ lui $at,%hi(var7f1ab19c) /* f090790: c426b19c */ lwc1 $f6,%lo(var7f1ab19c)($at) -/* f090794: 3c0c800a */ lui $t4,0x800a -/* f090798: 8d8ca244 */ lw $t4,-0x5dbc($t4) +/* f090794: 3c0c800a */ lui $t4,%hi(g_Vars+0x284) +/* f090798: 8d8ca244 */ lw $t4,%lo(g_Vars+0x284)($t4) /* f09079c: e7a60010 */ swc1 $f6,0x10($sp) /* f0907a0: 87b8003e */ lh $t8,0x3e($sp) /* f0907a4: 8d8e00bc */ lw $t6,0xbc($t4) @@ -49438,39 +49438,39 @@ glabel var7f1ab1a8 GLOBAL_ASM( glabel func0f090d34 -/* f090d34: 3c03800a */ lui $v1,%hi(var800a0068) -/* f090d38: 8c63ce50 */ lw $v1,-0x31b0($v1) +/* f090d34: 3c03800a */ lui $v1,%hi(var8009ce50) +/* f090d38: 8c63ce50 */ lw $v1,%lo(var8009ce50)($v1) /* f090d3c: 00001025 */ or $v0,$zero,$zero -/* f090d40: 3c04800a */ lui $a0,%hi(var800a010c) +/* f090d40: 3c04800a */ lui $a0,%hi(var8009ce68) /* f090d44: 1860000a */ blez $v1,.L0f090d70 /* f090d48: 00032900 */ sll $a1,$v1,0x4 /* f090d4c: 00a32821 */ addu $a1,$a1,$v1 /* f090d50: 00052880 */ sll $a1,$a1,0x2 /* f090d54: 00a32823 */ subu $a1,$a1,$v1 /* f090d58: 00052880 */ sll $a1,$a1,0x2 -/* f090d5c: 8c84ce68 */ lw $a0,-0x3198($a0) +/* f090d5c: 8c84ce68 */ lw $a0,%lo(var8009ce68)($a0) .L0f090d60: /* f090d60: 2442010c */ addiu $v0,$v0,0x10c /* f090d64: 0045082a */ slt $at,$v0,$a1 /* f090d68: 1420fffd */ bnez $at,.L0f090d60 -/* f090d6c: 2484010c */ addiu $a0,$a0,%lo(var800a010c) +/* f090d6c: 2484010c */ addiu $a0,$a0,268 .L0f090d70: /* f090d70: 3c02800a */ lui $v0,%hi(var8009ce40) /* f090d74: 8c42ce40 */ lw $v0,%lo(var8009ce40)($v0) /* f090d78: 00001825 */ or $v1,$zero,$zero -/* f090d7c: 3c04800a */ lui $a0,%hi(var800a0068) +/* f090d7c: 3c04800a */ lui $a0,%hi(var8009ce58) /* f090d80: 1840000a */ blez $v0,.L0f090dac /* f090d84: 00022880 */ sll $a1,$v0,0x2 /* f090d88: 00a22823 */ subu $a1,$a1,$v0 /* f090d8c: 00052880 */ sll $a1,$a1,0x2 /* f090d90: 00a22821 */ addu $a1,$a1,$v0 /* f090d94: 000528c0 */ sll $a1,$a1,0x3 -/* f090d98: 8c84ce58 */ lw $a0,-0x31a8($a0) +/* f090d98: 8c84ce58 */ lw $a0,%lo(var8009ce58)($a0) .L0f090d9c: -/* f090d9c: 24630068 */ addiu $v1,$v1,%lo(var800a0068) +/* f090d9c: 24630068 */ addiu $v1,$v1,104 /* f090da0: 0065082a */ slt $at,$v1,$a1 /* f090da4: 1420fffd */ bnez $at,.L0f090d9c -/* f090da8: 24840068 */ addiu $a0,$a0,%lo(var800a0068) +/* f090da8: 24840068 */ addiu $a0,$a0,104 .L0f090dac: /* f090dac: 03e00008 */ jr $ra /* f090db0: 00000000 */ sll $zero,$zero,0x0 @@ -49533,8 +49533,8 @@ glabel var7f1ab208 /* f090dbc: 0fc2410e */ jal alarmIsActive /* f090dc0: 00000000 */ sll $zero,$zero,0x0 /* f090dc4: 10400079 */ beqz $v0,.L0f090fac -/* f090dc8: 3c0e800a */ lui $t6,0x800a -/* f090dcc: 8dcea474 */ lw $t6,-0x5b8c($t6) +/* f090dc8: 3c0e800a */ lui $t6,%hi(g_Vars+0x4b4) +/* f090dcc: 8dcea474 */ lw $t6,%lo(g_Vars+0x4b4)($t6) /* f090dd0: 25cfffe3 */ addiu $t7,$t6,-29 /* f090dd4: 2de10018 */ sltiu $at,$t7,0x18 /* f090dd8: 10200012 */ beqz $at,.L0f090e24 @@ -49569,8 +49569,8 @@ glabel var7f1ab208 /* f090e44: 24c698d8 */ addiu $a2,$a2,%lo(var800698d8) /* f090e48: 13000045 */ beqz $t8,.L0f090f60 /* f090e4c: 3c048009 */ lui $a0,%hi(var80095200) -/* f090e50: 3c19800a */ lui $t9,0x800a -/* f090e54: 8f399ff4 */ lw $t9,-0x600c($t9) +/* f090e50: 3c19800a */ lui $t9,%hi(g_Vars+0x34) +/* f090e54: 8f399ff4 */ lw $t9,%lo(g_Vars+0x34)($t9) /* f090e58: 3c014120 */ lui $at,0x4120 /* f090e5c: 44810000 */ mtc1 $at,$f0 /* f090e60: 44992000 */ mtc1 $t9,$f4 @@ -49657,8 +49657,8 @@ glabel var7f1ab208 .L0f090f90: /* f090f90: 3c038007 */ lui $v1,%hi(g_AlarmActive) /* f090f94: 246398d4 */ addiu $v1,$v1,%lo(g_AlarmActive) -/* f090f98: 3c18800a */ lui $t8,0x800a -/* f090f9c: 8f189ff8 */ lw $t8,-0x6008($t8) +/* f090f98: 3c18800a */ lui $t8,%hi(g_Vars+0x38) +/* f090f9c: 8f189ff8 */ lw $t8,%lo(g_Vars+0x38)($t8) /* f090fa0: 8c6f0000 */ lw $t7,0x0($v1) /* f090fa4: 01f8c821 */ addu $t9,$t7,$t8 /* f090fa8: ac790000 */ sw $t9,0x0($v1) @@ -49703,8 +49703,8 @@ glabel var7f1ab208 GLOBAL_ASM( glabel func0f091030 -/* f091030: 3c02800a */ lui $v0,0x800a -/* f091034: 8c42a2fc */ lw $v0,-0x5d04($v0) +/* f091030: 3c02800a */ lui $v0,%hi(g_Vars+0x33c) +/* f091034: 8c42a2fc */ lw $v0,%lo(g_Vars+0x33c)($v0) /* f091038: 27bdffe8 */ addiu $sp,$sp,-24 /* f09103c: afbf0014 */ sw $ra,0x14($sp) /* f091040: 10400016 */ beqz $v0,.L0f09109c @@ -49861,8 +49861,8 @@ glabel func0f0910ac GLOBAL_ASM( glabel func0f091250 -/* f091250: 3c0e800a */ lui $t6,0x800a -/* f091254: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f091250: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f091254: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f091258: 27bdffd0 */ addiu $sp,$sp,-48 /* f09125c: afbf001c */ sw $ra,0x1c($sp) /* f091260: afa40030 */ sw $a0,0x30($sp) @@ -49929,7 +49929,7 @@ glabel var7f1ab214 /* f09131c: e7a4018c */ swc1 $f4,0x18c($sp) /* f091320: c4660004 */ lwc1 $f6,0x4($v1) /* f091324: 240f0001 */ addiu $t7,$zero,0x1 -/* f091328: 3c0a800a */ lui $t2,0x800a +/* f091328: 3c0a800a */ lui $t2,%hi(g_Vars+0x8) /* f09132c: e7a60190 */ swc1 $f6,0x190($sp) /* f091330: c4680008 */ lwc1 $f8,0x8($v1) /* f091334: afae0054 */ sw $t6,0x54($sp) @@ -49950,7 +49950,7 @@ glabel var7f1ab214 /* f09136c: 5100008d */ beqzl $t0,.L0f0915a4 /* f091370: 8fa20214 */ lw $v0,0x214($sp) /* f091374: 8d090008 */ lw $t1,0x8($t0) -/* f091378: 8d4a9fc8 */ lw $t2,-0x6038($t2) +/* f091378: 8d4a9fc8 */ lw $t2,%lo(g_Vars+0x8)($t2) /* f09137c: 8fab0054 */ lw $t3,0x54($sp) /* f091380: 012a082a */ slt $at,$t1,$t2 /* f091384: 10200086 */ beqz $at,.L0f0915a0 @@ -49990,8 +49990,8 @@ glabel var7f1ab214 /* f091408: e7a00034 */ swc1 $f0,0x34($sp) /* f09140c: 0fc24e7e */ jal func0f0939f8 /* f091410: e7a00038 */ swc1 $f0,0x38($sp) -/* f091414: 3c0f800a */ lui $t7,0x800a -/* f091418: 8def9fc8 */ lw $t7,-0x6038($t7) +/* f091414: 3c0f800a */ lui $t7,%hi(g_Vars+0x8) +/* f091418: 8def9fc8 */ lw $t7,%lo(g_Vars+0x8)($t7) /* f09141c: 8fb90204 */ lw $t9,0x204($sp) /* f091420: 25f80004 */ addiu $t8,$t7,0x4 /* f091424: af380008 */ sw $t8,0x8($t9) @@ -50024,8 +50024,8 @@ glabel var7f1ab214 /* f09148c: e7a80034 */ swc1 $f8,0x34($sp) /* f091490: 0fc24e7e */ jal func0f0939f8 /* f091494: e7aa0038 */ swc1 $f10,0x38($sp) -/* f091498: 3c0a800a */ lui $t2,0x800a -/* f09149c: 8d4a9fc8 */ lw $t2,-0x6038($t2) +/* f091498: 3c0a800a */ lui $t2,%hi(g_Vars+0x8) +/* f09149c: 8d4a9fc8 */ lw $t2,%lo(g_Vars+0x8)($t2) /* f0914a0: 8fac0204 */ lw $t4,0x204($sp) /* f0914a4: 254b0002 */ addiu $t3,$t2,0x2 /* f0914a8: ad8b0008 */ sw $t3,0x8($t4) @@ -50055,8 +50055,8 @@ glabel var7f1ab214 /* f091504: e7a00034 */ swc1 $f0,0x34($sp) /* f091508: 0fc24e7e */ jal func0f0939f8 /* f09150c: e7a00038 */ swc1 $f0,0x38($sp) -/* f091510: 3c0f800a */ lui $t7,0x800a -/* f091514: 8def9fc8 */ lw $t7,-0x6038($t7) +/* f091510: 3c0f800a */ lui $t7,%hi(g_Vars+0x8) +/* f091514: 8def9fc8 */ lw $t7,%lo(g_Vars+0x8)($t7) /* f091518: 8fb90204 */ lw $t9,0x204($sp) /* f09151c: 25f80008 */ addiu $t8,$t7,0x8 /* f091520: af380008 */ sw $t8,0x8($t9) @@ -50086,8 +50086,8 @@ glabel var7f1ab214 /* f09157c: e7a00034 */ swc1 $f0,0x34($sp) /* f091580: 0fc24e7e */ jal func0f0939f8 /* f091584: e7a00038 */ swc1 $f0,0x38($sp) -/* f091588: 3c0a800a */ lui $t2,0x800a -/* f09158c: 8d4a9fc8 */ lw $t2,-0x6038($t2) +/* f091588: 3c0a800a */ lui $t2,%hi(g_Vars+0x8) +/* f09158c: 8d4a9fc8 */ lw $t2,%lo(g_Vars+0x8)($t2) /* f091590: 8fac0204 */ lw $t4,0x204($sp) /* f091594: 254b0002 */ addiu $t3,$t2,0x2 /* f091598: ad8b0008 */ sw $t3,0x8($t4) diff --git a/src/game/splat.c b/src/game/splat.c index 04a74ac6f..ca80d6b0b 100644 --- a/src/game/splat.c +++ b/src/game/splat.c @@ -217,8 +217,8 @@ glabel func0f148b80 /* f148e28: a06c0335 */ sb $t4,0x335($v1) /* f148e2c: a060033a */ sb $zero,0x33a($v1) .L0f148e30: -/* f148e30: 3c0e800a */ lui $t6,0x800a -/* f148e34: 8dce9ff8 */ lw $t6,-0x6008($t6) +/* f148e30: 3c0e800a */ lui $t6,%hi(g_Vars+0x38) +/* f148e34: 8dce9ff8 */ lw $t6,%lo(g_Vars+0x38)($t6) /* f148e38: 946d0336 */ lhu $t5,0x336($v1) /* f148e3c: 01ae7821 */ addu $t7,$t5,$t6 /* f148e40: a46f0336 */ sh $t7,0x336($v1) @@ -826,9 +826,9 @@ glabel func0f149274 /* f1496b8: 27a500a0 */ addiu $a1,$sp,0xa0 /* f1496bc: 0fc21780 */ jal func0f085e00 /* f1496c0: afa305e4 */ sw $v1,0x5e4($sp) -/* f1496c4: 3c05800a */ lui $a1,%hi(var800a0004) +/* f1496c4: 3c05800a */ lui $a1,%hi(g_Vars+0x348) /* f1496c8: 8fa305e4 */ lw $v1,0x5e4($sp) -/* f1496cc: 8ca5a308 */ lw $a1,-0x5cf8($a1) +/* f1496cc: 8ca5a308 */ lw $a1,%lo(g_Vars+0x348)($a1) /* f1496d0: 2463fffc */ addiu $v1,$v1,-4 .L0f1496d4: /* f1496d4: 0065082b */ sltu $at,$v1,$a1 @@ -905,7 +905,7 @@ glabel func0f149274 /* f1497d0: e4640008 */ swc1 $f4,0x8($v1) /* f1497d4: c4c80000 */ lwc1 $f8,0x0($a2) /* f1497d8: 24840004 */ addiu $a0,$a0,0x4 -/* f1497dc: 24a50004 */ addiu $a1,$a1,%lo(var800a0004) +/* f1497dc: 24a50004 */ addiu $a1,$a1,4 /* f1497e0: 24c60004 */ addiu $a2,$a2,0x4 /* f1497e4: 1467fff3 */ bne $v1,$a3,.L0f1497b4 /* f1497e8: e4680014 */ swc1 $f8,0x14($v1) diff --git a/src/game/utils.c b/src/game/utils.c index 7e57b8960..8a8f7316a 100644 --- a/src/game/utils.c +++ b/src/game/utils.c @@ -75,8 +75,8 @@ glabel func0f176ddc /* f176de4: 24042710 */ addiu $a0,$zero,0x2710 /* f176de8: 0c0048f2 */ jal malloc /* f176dec: 24050008 */ addiu $a1,$zero,0x8 -/* f176df0: 3c01800b */ lui $at,0x800b -/* f176df4: ac22c0d0 */ sw $v0,-0x3f30($at) +/* f176df0: 3c01800b */ lui $at,%hi(var800ac0d0) +/* f176df4: ac22c0d0 */ sw $v0,%lo(var800ac0d0)($at) /* f176df8: 0fc5db69 */ jal func0f176da4 /* f176dfc: 24043900 */ addiu $a0,$zero,0x3900 /* f176e00: afa20018 */ sw $v0,0x18($sp) @@ -1003,11 +1003,11 @@ glabel func0f177a54 /* f177b4c: 2401ffff */ addiu $at,$zero,-1 /* f177b50: 14610003 */ bne $v1,$at,.L0f177b60 /* f177b54: 3c04800b */ lui $a0,%hi(var800ac108) -/* f177b58: 3c01800b */ lui $at,0x800b -/* f177b5c: ac20c108 */ sw $zero,-0x3ef8($at) +/* f177b58: 3c01800b */ lui $at,%hi(var800ac108) +/* f177b5c: ac20c108 */ sw $zero,%lo(var800ac108)($at) .L0f177b60: /* f177b60: 8c84c108 */ lw $a0,%lo(var800ac108)($a0) -/* f177b64: 3c01800b */ lui $at,0x800b +/* f177b64: 3c01800b */ lui $at,%hi(var800ac108) /* f177b68: 00c43821 */ addu $a3,$a2,$a0 /* f177b6c: 90ee0000 */ lbu $t6,0x0($a3) /* f177b70: 55c0000b */ bnezl $t6,.L0f177ba0 @@ -1028,7 +1028,7 @@ glabel func0f177a54 /* f177ba4: 90e20000 */ lbu $v0,0x0($a3) /* f177ba8: 24840001 */ addiu $a0,$a0,0x1 /* f177bac: 03e00008 */ jr $ra -/* f177bb0: ac24c108 */ sw $a0,-0x3ef8($at) +/* f177bb0: ac24c108 */ sw $a0,%lo(var800ac108)($at) ); GLOBAL_ASM( diff --git a/src/game/wallhit.c b/src/game/wallhit.c index 13be9af88..91a5ab4f3 100644 --- a/src/game/wallhit.c +++ b/src/game/wallhit.c @@ -584,10 +584,10 @@ glabel func0f13e744 /* f13e7a8: 00005825 */ or $t3,$zero,$zero /* f13e7ac: 19800043 */ blez $t4,.L0f13e8bc /* f13e7b0: 00003825 */ or $a3,$zero,$zero -/* f13e7b4: 3c04800a */ lui $a0,%hi(var800a007c) +/* f13e7b4: 3c04800a */ lui $a0,%hi(var800a41b0) /* f13e7b8: 3c1f8008 */ lui $ra,%hi(var8007f75c) /* f13e7bc: 27fff75c */ addiu $ra,$ra,%lo(var8007f75c) -/* f13e7c0: 8c8441b0 */ lw $a0,0x41b0($a0) +/* f13e7c0: 8c8441b0 */ lw $a0,%lo(var800a41b0)($a0) /* f13e7c4: 240d0003 */ addiu $t5,$zero,0x3 .L0f13e7c8: /* f13e7c8: 808f006f */ lb $t7,0x6f($a0) @@ -657,7 +657,7 @@ glabel func0f13e744 .L0f13e8b0: /* f13e8b0: 00ac082a */ slt $at,$a1,$t4 /* f13e8b4: 1420ffc4 */ bnez $at,.L0f13e7c8 -/* f13e8b8: 2484007c */ addiu $a0,$a0,%lo(var800a007c) +/* f13e8b8: 2484007c */ addiu $a0,$a0,124 .L0f13e8bc: /* f13e8bc: 01671021 */ addu $v0,$t3,$a3 /* f13e8c0: 18400006 */ blez $v0,.L0f13e8dc @@ -735,8 +735,8 @@ glabel func0f13e994 /* f13e9b8: 240d0001 */ addiu $t5,$zero,0x1 /* f13e9bc: 240b008c */ addiu $t3,$zero,0x8c .L0f13e9c0: -/* f13e9c0: 3c09800a */ lui $t1,0x800a -/* f13e9c4: 8d29a27c */ lw $t1,-0x5d84($t1) +/* f13e9c0: 3c09800a */ lui $t1,%hi(g_Vars+0x2bc) +/* f13e9c4: 8d29a27c */ lw $t1,%lo(g_Vars+0x2bc)($t1) /* f13e9c8: 2410ffff */ addiu $s0,$zero,-1 /* f13e9cc: 2407ffff */ addiu $a3,$zero,-1 /* f13e9d0: 19200031 */ blez $t1,.L0f13ea98 @@ -968,10 +968,10 @@ glabel var7f1b5d18 /* f13eccc: 0fc4fa65 */ jal func0f13e994 /* f13ecd0: ac20f834 */ sw $zero,-0x7cc($at) .L0f13ecd4: -/* f13ecd4: 3c02800a */ lui $v0,%hi(var800a000c) -/* f13ecd8: 8c42cc44 */ lw $v0,-0x33bc($v0) -/* f13ecdc: 3c11800a */ lui $s1,%hi(var800a007c) -/* f13ece0: 8e3141b0 */ lw $s1,0x41b0($s1) +/* f13ecd4: 3c02800a */ lui $v0,%hi(var8009cc44) +/* f13ecd8: 8c42cc44 */ lw $v0,%lo(var8009cc44)($v0) +/* f13ecdc: 3c11800a */ lui $s1,%hi(var800a41b0) +/* f13ece0: 8e3141b0 */ lw $s1,%lo(var800a41b0)($s1) /* f13ece4: 184001b1 */ blez $v0,.L0f13f3ac /* f13ece8: 0000b825 */ or $s7,$zero,$zero /* f13ecec: 3c013f00 */ lui $at,0x3f00 @@ -1296,7 +1296,7 @@ glabel var7f1b5d18 /* f13f190: a16a0007 */ sb $t2,0x7($t3) /* f13f194: c48afff4 */ lwc1 $f10,-0xc($a0) /* f13f198: c494fff8 */ lwc1 $f20,-0x8($a0) -/* f13f19c: 2442000c */ addiu $v0,$v0,%lo(var800a000c) +/* f13f19c: 2442000c */ addiu $v0,$v0,12 /* f13f1a0: 460c5281 */ sub.s $f10,$f10,$f12 /* f13f1a4: 460ea701 */ sub.s $f28,$f20,$f14 /* f13f1a8: 460a1782 */ mul.s $f30,$f2,$f10 @@ -1443,7 +1443,7 @@ glabel var7f1b5d18 .L0f13f3a0: /* f13f3a0: 02e2082a */ slt $at,$s7,$v0 /* f13f3a4: 1420fe5a */ bnez $at,.L0f13ed10 -/* f13f3a8: 2631007c */ addiu $s1,$s1,%lo(var800a007c) +/* f13f3a8: 2631007c */ addiu $s1,$s1,124 .L0f13f3ac: /* f13f3ac: 8fbf006c */ lw $ra,0x6c($sp) /* f13f3b0: d7b40018 */ ldc1 $f20,0x18($sp) @@ -1681,11 +1681,11 @@ glabel var7f1b5d6c /* f13f660: 00002025 */ or $a0,$zero,$zero .L0f13f664: /* f13f664: 12400005 */ beqz $s2,.L0f13f67c -/* f13f668: 3c02800a */ lui $v0,0x800a +/* f13f668: 3c02800a */ lui $v0,%hi(g_MenuStack+0x1fff) /* f13f66c: 3c02800a */ lui $v0,%hi(var8009cc60) /* f13f670: 8c42cc60 */ lw $v0,%lo(var8009cc60)($v0) /* f13f674: 10000003 */ beqz $zero,.L0f13f684 -/* f13f678: 2442ffff */ addiu $v0,$v0,-1 +/* f13f678: 2442ffff */ addiu $v0,$v0,%lo(g_MenuStack+0x1fff) .L0f13f67c: /* f13f67c: 8c42cc68 */ lw $v0,-0x3398($v0) /* f13f680: 2442ffff */ addiu $v0,$v0,-1 @@ -2346,7 +2346,7 @@ glabel var7f1b5d6c /* f140028: e7a801a0 */ swc1 $f8,0x1a0($sp) /* f14002c: c5840000 */ lwc1 $f4,0x0($t4) /* f140030: 926e006f */ lbu $t6,0x6f($s3) -/* f140034: 3c0c800a */ lui $t4,0x800a +/* f140034: 3c0c800a */ lui $t4,%hi(g_Vars+0xc) /* f140038: e6640050 */ swc1 $f4,0x50($s3) /* f14003c: 8fad0200 */ lw $t5,0x200($sp) /* f140040: 31c9ffbf */ andi $t1,$t6,0xffbf @@ -2394,7 +2394,7 @@ glabel var7f1b5d6c /* f1400e4: a2690073 */ sb $t1,0x73($s3) .L0f1400e8: /* f1400e8: 8e620070 */ lw $v0,0x70($s3) -/* f1400ec: 8d8c9fcc */ lw $t4,-0x6034($t4) +/* f1400ec: 8d8c9fcc */ lw $t4,%lo(g_Vars+0xc)($t4) /* f1400f0: 926a006f */ lbu $t2,0x6f($s3) /* f1400f4: 00025902 */ srl $t3,$v0,0x4 /* f1400f8: 01816824 */ and $t5,$t4,$at @@ -2845,8 +2845,8 @@ glabel var7f1b5d6c GLOBAL_ASM( glabel func0f140750 -/* f140750: 3c0e800a */ lui $t6,0x800a -/* f140754: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f140750: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f140754: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f140758: c4860000 */ lwc1 $f6,0x0($a0) /* f14075c: 44807000 */ mtc1 $zero,$f14 /* f140760: 8dc2174c */ lw $v0,0x174c($t6) @@ -3321,8 +3321,8 @@ glabel func0f140b7c GLOBAL_ASM( glabel func0f140e20 /* f140e20: 27bdff48 */ addiu $sp,$sp,-184 -/* f140e24: 3c0e800a */ lui $t6,0x800a -/* f140e28: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* f140e24: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f140e28: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f140e2c: afbf004c */ sw $ra,0x4c($sp) /* f140e30: afbe0048 */ sw $s8,0x48($sp) /* f140e34: afb70044 */ sw $s7,0x44($sp) @@ -3607,11 +3607,11 @@ glabel func0f1411b0 GLOBAL_ASM( glabel func0f141234 -/* f141234: 3c04800a */ lui $a0,%hi(var800a0004) -/* f141238: 8c84cc44 */ lw $a0,-0x33bc($a0) -/* f14123c: 3c03800a */ lui $v1,%hi(var800a007c) +/* f141234: 3c04800a */ lui $a0,%hi(var8009cc44) +/* f141238: 8c84cc44 */ lw $a0,%lo(var8009cc44)($a0) +/* f14123c: 3c03800a */ lui $v1,%hi(var800a41b0) /* f141240: 27bdffe0 */ addiu $sp,$sp,-32 -/* f141244: 8c6341b0 */ lw $v1,0x41b0($v1) +/* f141244: 8c6341b0 */ lw $v1,%lo(var800a41b0)($v1) /* f141248: 188000d2 */ blez $a0,.L0f141594 /* f14124c: 00001025 */ or $v0,$zero,$zero /* f141250: 3c0d800a */ lui $t5,%hi(g_RoomPtrs) @@ -3832,7 +3832,7 @@ glabel func0f141234 /* f141560: 00000000 */ sll $zero,$zero,0x0 .L0f141564: /* f141564: 44d8f800 */ ctc1 $t8,$31 -/* f141568: 24840004 */ addiu $a0,$a0,%lo(var800a0004) +/* f141568: 24840004 */ addiu $a0,$a0,4 /* f14156c: 152cff7d */ bne $t1,$t4,.L0f141364 /* f141570: a099003e */ sb $t9,0x3e($a0) /* f141574: 3c04800a */ lui $a0,%hi(var8009cc44) @@ -3841,7 +3841,7 @@ glabel func0f141234 /* f14157c: 0044082a */ slt $at,$v0,$a0 .L0f141580: /* f141580: 1420ff3b */ bnez $at,.L0f141270 -/* f141584: 2463007c */ addiu $v1,$v1,%lo(var800a007c) +/* f141584: 2463007c */ addiu $v1,$v1,124 /* f141588: e7ac0004 */ swc1 $f12,0x4($sp) /* f14158c: e7a20008 */ swc1 $f2,0x8($sp) /* f141590: e7a0000c */ swc1 $f0,0xc($sp) @@ -3909,9 +3909,9 @@ glabel func0f14159c /* f14166c: 00000000 */ sll $zero,$zero,0x0 /* f141670: 0007000d */ break 0x7 .L0f141674: -/* f141674: 3c0a800a */ lui $t2,0x800a +/* f141674: 3c0a800a */ lui $t2,%hi(g_Vars+0xc) /* f141678: 10200007 */ beqz $at,.L0f141698 -/* f14167c: 3c03800a */ lui $v1,%hi(var8009cc44) +/* f14167c: 3c03800a */ lui $v1,0x800a /* f141680: 02002025 */ or $a0,$s0,$zero .L0f141684: /* f141684: 0fc4f990 */ jal func0f13e640 @@ -3921,7 +3921,7 @@ glabel func0f14159c /* f141694: 8c63cc44 */ lw $v1,%lo(var8009cc44)($v1) .L0f141698: /* f141698: 8e020070 */ lw $v0,0x70($s0) -/* f14169c: 8d4a9fcc */ lw $t2,-0x6034($t2) +/* f14169c: 8d4a9fcc */ lw $t2,%lo(g_Vars+0xc)($t2) /* f1416a0: 3c010fff */ lui $at,0xfff /* f1416a4: 3421ffff */ ori $at,$at,0xffff /* f1416a8: 00026102 */ srl $t4,$v0,0x4 @@ -3930,7 +3930,7 @@ glabel func0f14159c /* f1416b4: 000d7100 */ sll $t6,$t5,0x4 /* f1416b8: 01c27826 */ xor $t7,$t6,$v0 /* f1416bc: ae0f0070 */ sw $t7,0x70($s0) -/* f1416c0: 8c63cc44 */ lw $v1,%lo(var8009cc44)($v1) +/* f1416c0: 8c63cc44 */ lw $v1,-13244($v1) .L0f1416c4: /* f1416c4: 26310001 */ addiu $s1,$s1,0x1 .L0f1416c8: @@ -3965,10 +3965,10 @@ glabel func0f141704 /* f141724: 2409ffff */ addiu $t1,$zero,-1 /* f141728: 1900002b */ blez $t0,.L0f1417d8 /* f14172c: 00002825 */ or $a1,$zero,$zero -/* f141730: 3c06800a */ lui $a2,%hi(var800a007c) +/* f141730: 3c06800a */ lui $a2,%hi(var800a41b0) /* f141734: 3c0b8008 */ lui $t3,%hi(var8007f75c) /* f141738: 256bf75c */ addiu $t3,$t3,%lo(var8007f75c) -/* f14173c: 8cc641b0 */ lw $a2,0x41b0($a2) +/* f14173c: 8cc641b0 */ lw $a2,%lo(var800a41b0)($a2) /* f141740: 240c000c */ addiu $t4,$zero,0xc /* f141744: 240a0003 */ addiu $t2,$zero,0x3 .L0f141748: @@ -4009,7 +4009,7 @@ glabel func0f141704 .L0f1417cc: /* f1417cc: 00a8082a */ slt $at,$a1,$t0 /* f1417d0: 1420ffdd */ bnez $at,.L0f141748 -/* f1417d4: 24c6007c */ addiu $a2,$a2,%lo(var800a007c) +/* f1417d4: 24c6007c */ addiu $a2,$a2,124 .L0f1417d8: /* f1417d8: 2401ffff */ addiu $at,$zero,-1 /* f1417dc: 11210008 */ beq $t1,$at,.L0f141800 diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c index 0f26aaba4..779554de4 100644 --- a/src/gvars/gvars.c +++ b/src/gvars/gvars.c @@ -16125,2779 +16125,7 @@ u32 var8009dfdc = 0; u32 var8009dfe0 = 0; u32 var8009dfe4 = 0; struct missionconfig g_MissionConfig = {0}; -u32 var8009e000 = 0; -u32 var8009e004 = 0; -u32 var8009e008 = 0; -u32 var8009e00c = 0; -u32 var8009e010 = 0; -u32 var8009e014 = 0; -u32 var8009e018 = 0; -u32 var8009e01c = 0; -u32 var8009e020 = 0; -u32 var8009e024 = 0; -u32 var8009e028 = 0; -u32 var8009e02c = 0; -u32 var8009e030 = 0; -u32 var8009e034 = 0; -u32 var8009e038 = 0; -u32 var8009e03c = 0; -u32 var8009e040 = 0; -u32 var8009e044 = 0; -u32 var8009e048 = 0; -u32 var8009e04c = 0; -u32 var8009e050 = 0; -u32 var8009e054 = 0; -u32 var8009e058 = 0; -u32 var8009e05c = 0; -u32 var8009e060 = 0; -u32 var8009e064 = 0; -u32 var8009e068 = 0; -u32 var8009e06c = 0; -u32 var8009e070 = 0; -u32 var8009e074 = 0; -u32 var8009e078 = 0; -u32 var8009e07c = 0; -u32 var8009e080 = 0; -u32 var8009e084 = 0; -u32 var8009e088 = 0; -u32 var8009e08c = 0; -u32 var8009e090 = 0; -u32 var8009e094 = 0; -u32 var8009e098 = 0; -u32 var8009e09c = 0; -u32 var8009e0a0 = 0; -u32 var8009e0a4 = 0; -u32 var8009e0a8 = 0; -u32 var8009e0ac = 0; -u32 var8009e0b0 = 0; -u32 var8009e0b4 = 0; -u32 var8009e0b8 = 0; -u32 var8009e0bc = 0; -u32 var8009e0c0 = 0; -u32 var8009e0c4 = 0; -u32 var8009e0c8 = 0; -u32 var8009e0cc = 0; -u32 var8009e0d0 = 0; -u32 var8009e0d4 = 0; -u32 var8009e0d8 = 0; -u32 var8009e0dc = 0; -u32 var8009e0e0 = 0; -u32 var8009e0e4 = 0; -u32 var8009e0e8 = 0; -u32 var8009e0ec = 0; -u32 var8009e0f0 = 0; -u32 var8009e0f4 = 0; -u32 var8009e0f8 = 0; -u32 var8009e0fc = 0; -u32 var8009e100 = 0; -u32 var8009e104 = 0; -u32 var8009e108 = 0; -u32 var8009e10c = 0; -u32 var8009e110 = 0; -u32 var8009e114 = 0; -u32 var8009e118 = 0; -u32 var8009e11c = 0; -u32 var8009e120 = 0; -u32 var8009e124 = 0; -u32 var8009e128 = 0; -u32 var8009e12c = 0; -u32 var8009e130 = 0; -u32 var8009e134 = 0; -u32 var8009e138 = 0; -u32 var8009e13c = 0; -u32 var8009e140 = 0; -u32 var8009e144 = 0; -u32 var8009e148 = 0; -u32 var8009e14c = 0; -u32 var8009e150 = 0; -u32 var8009e154 = 0; -u32 var8009e158 = 0; -u32 var8009e15c = 0; -u32 var8009e160 = 0; -u32 var8009e164 = 0; -u32 var8009e168 = 0; -u32 var8009e16c = 0; -u32 var8009e170 = 0; -u32 var8009e174 = 0; -u32 var8009e178 = 0; -u32 var8009e17c = 0; -u32 var8009e180 = 0; -u32 var8009e184 = 0; -u32 var8009e188 = 0; -u32 var8009e18c = 0; -u32 var8009e190 = 0; -u32 var8009e194 = 0; -u32 var8009e198 = 0; -u32 var8009e19c = 0; -u32 var8009e1a0 = 0; -u32 var8009e1a4 = 0; -u32 var8009e1a8 = 0; -u32 var8009e1ac = 0; -u32 var8009e1b0 = 0; -u32 var8009e1b4 = 0; -u32 var8009e1b8 = 0; -u32 var8009e1bc = 0; -u32 var8009e1c0 = 0; -u32 var8009e1c4 = 0; -u32 var8009e1c8 = 0; -u32 var8009e1cc = 0; -u32 var8009e1d0 = 0; -u32 var8009e1d4 = 0; -u32 var8009e1d8 = 0; -u32 var8009e1dc = 0; -u32 var8009e1e0 = 0; -u32 var8009e1e4 = 0; -u32 var8009e1e8 = 0; -u32 var8009e1ec = 0; -u32 var8009e1f0 = 0; -u32 var8009e1f4 = 0; -u32 var8009e1f8 = 0; -u32 var8009e1fc = 0; -u32 var8009e200 = 0; -u32 var8009e204 = 0; -u32 var8009e208 = 0; -u32 var8009e20c = 0; -u32 var8009e210 = 0; -u32 var8009e214 = 0; -u32 var8009e218 = 0; -u32 var8009e21c = 0; -u32 var8009e220 = 0; -u32 var8009e224 = 0; -u32 var8009e228 = 0; -u32 var8009e22c = 0; -u32 var8009e230 = 0; -u32 var8009e234 = 0; -u32 var8009e238 = 0; -u32 var8009e23c = 0; -u32 var8009e240 = 0; -u32 var8009e244 = 0; -u32 var8009e248 = 0; -u32 var8009e24c = 0; -u32 var8009e250 = 0; -u32 var8009e254 = 0; -u32 var8009e258 = 0; -u32 var8009e25c = 0; -u32 var8009e260 = 0; -u32 var8009e264 = 0; -u32 var8009e268 = 0; -u32 var8009e26c = 0; -u32 var8009e270 = 0; -u32 var8009e274 = 0; -u32 var8009e278 = 0; -u32 var8009e27c = 0; -u32 var8009e280 = 0; -u32 var8009e284 = 0; -u32 var8009e288 = 0; -u32 var8009e28c = 0; -u32 var8009e290 = 0; -u32 var8009e294 = 0; -u32 var8009e298 = 0; -u32 var8009e29c = 0; -u32 var8009e2a0 = 0; -u32 var8009e2a4 = 0; -u32 var8009e2a8 = 0; -u32 var8009e2ac = 0; -u32 var8009e2b0 = 0; -u32 var8009e2b4 = 0; -u32 var8009e2b8 = 0; -u32 var8009e2bc = 0; -u32 var8009e2c0 = 0; -u32 var8009e2c4 = 0; -u32 var8009e2c8 = 0; -u32 var8009e2cc = 0; -u32 var8009e2d0 = 0; -u32 var8009e2d4 = 0; -u32 var8009e2d8 = 0; -u32 var8009e2dc = 0; -u32 var8009e2e0 = 0; -u32 var8009e2e4 = 0; -u32 var8009e2e8 = 0; -u32 var8009e2ec = 0; -u32 var8009e2f0 = 0; -u32 var8009e2f4 = 0; -u32 var8009e2f8 = 0; -u32 var8009e2fc = 0; -u32 var8009e300 = 0; -u32 var8009e304 = 0; -u32 var8009e308 = 0; -u32 var8009e30c = 0; -u32 var8009e310 = 0; -u32 var8009e314 = 0; -u32 var8009e318 = 0; -u32 var8009e31c = 0; -u32 var8009e320 = 0; -u32 var8009e324 = 0; -u32 var8009e328 = 0; -u32 var8009e32c = 0; -u32 var8009e330 = 0; -u32 var8009e334 = 0; -u32 var8009e338 = 0; -u32 var8009e33c = 0; -u32 var8009e340 = 0; -u32 var8009e344 = 0; -u32 var8009e348 = 0; -u32 var8009e34c = 0; -u32 var8009e350 = 0; -u32 var8009e354 = 0; -u32 var8009e358 = 0; -u32 var8009e35c = 0; -u32 var8009e360 = 0; -u32 var8009e364 = 0; -u32 var8009e368 = 0; -u32 var8009e36c = 0; -u32 var8009e370 = 0; -u32 var8009e374 = 0; -u32 var8009e378 = 0; -u32 var8009e37c = 0; -u32 var8009e380 = 0; -u32 var8009e384 = 0; -u32 var8009e388 = 0; -u32 var8009e38c = 0; -u32 var8009e390 = 0; -u32 var8009e394 = 0; -u32 var8009e398 = 0; -u32 var8009e39c = 0; -u32 var8009e3a0 = 0; -u32 var8009e3a4 = 0; -u32 var8009e3a8 = 0; -u32 var8009e3ac = 0; -u32 var8009e3b0 = 0; -u32 var8009e3b4 = 0; -u32 var8009e3b8 = 0; -u32 var8009e3bc = 0; -u32 var8009e3c0 = 0; -u32 var8009e3c4 = 0; -u32 var8009e3c8 = 0; -u32 var8009e3cc = 0; -u32 var8009e3d0 = 0; -u32 var8009e3d4 = 0; -u32 var8009e3d8 = 0; -u32 var8009e3dc = 0; -u32 var8009e3e0 = 0; -u32 var8009e3e4 = 0; -u32 var8009e3e8 = 0; -u32 var8009e3ec = 0; -u32 var8009e3f0 = 0; -u32 var8009e3f4 = 0; -u32 var8009e3f8 = 0; -u32 var8009e3fc = 0; -u32 var8009e400 = 0; -u32 var8009e404 = 0; -u32 var8009e408 = 0; -u32 var8009e40c = 0; -u32 var8009e410 = 0; -u32 var8009e414 = 0; -u32 var8009e418 = 0; -u32 var8009e41c = 0; -u32 var8009e420 = 0; -u32 var8009e424 = 0; -u32 var8009e428 = 0; -u32 var8009e42c = 0; -u32 var8009e430 = 0; -u32 var8009e434 = 0; -u32 var8009e438 = 0; -u32 var8009e43c = 0; -u32 var8009e440 = 0; -u32 var8009e444 = 0; -u32 var8009e448 = 0; -u32 var8009e44c = 0; -u32 var8009e450 = 0; -u32 var8009e454 = 0; -u32 var8009e458 = 0; -u32 var8009e45c = 0; -u32 var8009e460 = 0; -u32 var8009e464 = 0; -u32 var8009e468 = 0; -u32 var8009e46c = 0; -u32 var8009e470 = 0; -u32 var8009e474 = 0; -u32 var8009e478 = 0; -u32 var8009e47c = 0; -u32 var8009e480 = 0; -u32 var8009e484 = 0; -u32 var8009e488 = 0; -u32 var8009e48c = 0; -u32 var8009e490 = 0; -u32 var8009e494 = 0; -u32 var8009e498 = 0; -u32 var8009e49c = 0; -u32 var8009e4a0 = 0; -u32 var8009e4a4 = 0; -u32 var8009e4a8 = 0; -u32 var8009e4ac = 0; -u32 var8009e4b0 = 0; -u32 var8009e4b4 = 0; -u32 var8009e4b8 = 0; -u32 var8009e4bc = 0; -u32 var8009e4c0 = 0; -u32 var8009e4c4 = 0; -u32 var8009e4c8 = 0; -u32 var8009e4cc = 0; -u32 var8009e4d0 = 0; -u32 var8009e4d4 = 0; -u32 var8009e4d8 = 0; -u32 var8009e4dc = 0; -u32 var8009e4e0 = 0; -u32 var8009e4e4 = 0; -u32 var8009e4e8 = 0; -u32 var8009e4ec = 0; -u32 var8009e4f0 = 0; -u32 var8009e4f4 = 0; -struct menustackitem g_MenuStack[] = {0}; -u32 var8009f368 = 0; -u32 var8009f36c = 0; -u32 var8009f370 = 0; -u32 var8009f374 = 0; -u32 var8009f378 = 0; -u32 var8009f37c = 0; -u32 var8009f380 = 0; -u32 var8009f384 = 0; -u32 var8009f388 = 0; -u32 var8009f38c = 0; -u32 var8009f390 = 0; -u32 var8009f394 = 0; -u32 var8009f398 = 0; -u32 var8009f39c = 0; -u32 var8009f3a0 = 0; -u32 var8009f3a4 = 0; -u32 var8009f3a8 = 0; -u32 var8009f3ac = 0; -u32 var8009f3b0 = 0; -u32 var8009f3b4 = 0; -u32 var8009f3b8 = 0; -u32 var8009f3bc = 0; -u32 var8009f3c0 = 0; -u32 var8009f3c4 = 0; -u32 var8009f3c8 = 0; -u32 var8009f3cc = 0; -u32 var8009f3d0 = 0; -u32 var8009f3d4 = 0; -u32 var8009f3d8 = 0; -u32 var8009f3dc = 0; -u32 var8009f3e0 = 0; -u32 var8009f3e4 = 0; -u32 var8009f3e8 = 0; -u32 var8009f3ec = 0; -u32 var8009f3f0 = 0; -u32 var8009f3f4 = 0; -u32 var8009f3f8 = 0; -u32 var8009f3fc = 0; -u32 var8009f400 = 0; -u32 var8009f404 = 0; -u32 var8009f408 = 0; -u32 var8009f40c = 0; -u32 var8009f410 = 0; -u32 var8009f414 = 0; -u32 var8009f418 = 0; -u32 var8009f41c = 0; -u32 var8009f420 = 0; -u32 var8009f424 = 0; -u32 var8009f428 = 0; -u32 var8009f42c = 0; -u32 var8009f430 = 0; -u32 var8009f434 = 0; -u32 var8009f438 = 0; -u32 var8009f43c = 0; -u32 var8009f440 = 0; -u32 var8009f444 = 0; -u32 var8009f448 = 0; -u32 var8009f44c = 0; -u32 var8009f450 = 0; -u32 var8009f454 = 0; -u32 var8009f458 = 0; -u32 var8009f45c = 0; -u32 var8009f460 = 0; -u32 var8009f464 = 0; -u32 var8009f468 = 0; -u32 var8009f46c = 0; -u32 var8009f470 = 0; -u32 var8009f474 = 0; -u32 var8009f478 = 0; -u32 var8009f47c = 0; -u32 var8009f480 = 0; -u32 var8009f484 = 0; -u32 var8009f488 = 0; -u32 var8009f48c = 0; -u32 var8009f490 = 0; -u32 var8009f494 = 0; -u32 var8009f498 = 0; -u32 var8009f49c = 0; -u32 var8009f4a0 = 0; -u32 var8009f4a4 = 0; -u32 var8009f4a8 = 0; -u32 var8009f4ac = 0; -u32 var8009f4b0 = 0; -u32 var8009f4b4 = 0; -u32 var8009f4b8 = 0; -u32 var8009f4bc = 0; -u32 var8009f4c0 = 0; -u32 var8009f4c4 = 0; -u32 var8009f4c8 = 0; -u32 var8009f4cc = 0; -u32 var8009f4d0 = 0; -u32 var8009f4d4 = 0; -u32 var8009f4d8 = 0; -u32 var8009f4dc = 0; -u32 var8009f4e0 = 0; -u32 var8009f4e4 = 0; -u32 var8009f4e8 = 0; -u32 var8009f4ec = 0; -u32 var8009f4f0 = 0; -u32 var8009f4f4 = 0; -u32 var8009f4f8 = 0; -u32 var8009f4fc = 0; -u32 var8009f500 = 0; -u32 var8009f504 = 0; -u32 var8009f508 = 0; -u32 var8009f50c = 0; -u32 var8009f510 = 0; -u32 var8009f514 = 0; -u32 var8009f518 = 0; -u32 var8009f51c = 0; -u32 var8009f520 = 0; -u32 var8009f524 = 0; -u32 var8009f528 = 0; -u32 var8009f52c = 0; -u32 var8009f530 = 0; -u32 var8009f534 = 0; -u32 var8009f538 = 0; -u32 var8009f53c = 0; -u32 var8009f540 = 0; -u32 var8009f544 = 0; -u32 var8009f548 = 0; -u32 var8009f54c = 0; -u32 var8009f550 = 0; -u32 var8009f554 = 0; -u32 var8009f558 = 0; -u32 var8009f55c = 0; -u32 var8009f560 = 0; -u32 var8009f564 = 0; -u32 var8009f568 = 0; -u32 var8009f56c = 0; -u32 var8009f570 = 0; -u32 var8009f574 = 0; -u32 var8009f578 = 0; -u32 var8009f57c = 0; -u32 var8009f580 = 0; -u32 var8009f584 = 0; -u32 var8009f588 = 0; -u32 var8009f58c = 0; -u32 var8009f590 = 0; -u32 var8009f594 = 0; -u32 var8009f598 = 0; -u32 var8009f59c = 0; -u32 var8009f5a0 = 0; -u32 var8009f5a4 = 0; -u32 var8009f5a8 = 0; -u32 var8009f5ac = 0; -u32 var8009f5b0 = 0; -u32 var8009f5b4 = 0; -u32 var8009f5b8 = 0; -u32 var8009f5bc = 0; -u32 var8009f5c0 = 0; -u32 var8009f5c4 = 0; -u32 var8009f5c8 = 0; -u32 var8009f5cc = 0; -u32 var8009f5d0 = 0; -u32 var8009f5d4 = 0; -u32 var8009f5d8 = 0; -u32 var8009f5dc = 0; -u32 var8009f5e0 = 0; -u32 var8009f5e4 = 0; -u32 var8009f5e8 = 0; -u32 var8009f5ec = 0; -u32 var8009f5f0 = 0; -u32 var8009f5f4 = 0; -u32 var8009f5f8 = 0; -u32 var8009f5fc = 0; -u32 var8009f600 = 0; -u32 var8009f604 = 0; -u32 var8009f608 = 0; -u32 var8009f60c = 0; -u32 var8009f610 = 0; -u32 var8009f614 = 0; -u32 var8009f618 = 0; -u32 var8009f61c = 0; -u32 var8009f620 = 0; -u32 var8009f624 = 0; -u32 var8009f628 = 0; -u32 var8009f62c = 0; -u32 var8009f630 = 0; -u32 var8009f634 = 0; -u32 var8009f638 = 0; -u32 var8009f63c = 0; -u32 var8009f640 = 0; -u32 var8009f644 = 0; -u32 var8009f648 = 0; -u32 var8009f64c = 0; -u32 var8009f650 = 0; -u32 var8009f654 = 0; -u32 var8009f658 = 0; -u32 var8009f65c = 0; -u32 var8009f660 = 0; -u32 var8009f664 = 0; -u32 var8009f668 = 0; -u32 var8009f66c = 0; -u32 var8009f670 = 0; -u32 var8009f674 = 0; -u32 var8009f678 = 0; -u32 var8009f67c = 0; -u32 var8009f680 = 0; -u32 var8009f684 = 0; -u32 var8009f688 = 0; -u32 var8009f68c = 0; -u32 var8009f690 = 0; -u32 var8009f694 = 0; -u32 var8009f698 = 0; -u32 var8009f69c = 0; -u32 var8009f6a0 = 0; -u32 var8009f6a4 = 0; -u32 var8009f6a8 = 0; -u32 var8009f6ac = 0; -u32 var8009f6b0 = 0; -u32 var8009f6b4 = 0; -u32 var8009f6b8 = 0; -u32 var8009f6bc = 0; -u32 var8009f6c0 = 0; -u32 var8009f6c4 = 0; -u32 var8009f6c8 = 0; -u32 var8009f6cc = 0; -u32 var8009f6d0 = 0; -u32 var8009f6d4 = 0; -u32 var8009f6d8 = 0; -u32 var8009f6dc = 0; -u32 var8009f6e0 = 0; -u32 var8009f6e4 = 0; -u32 var8009f6e8 = 0; -u32 var8009f6ec = 0; -u32 var8009f6f0 = 0; -u32 var8009f6f4 = 0; -u32 var8009f6f8 = 0; -u32 var8009f6fc = 0; -u32 var8009f700 = 0; -u32 var8009f704 = 0; -u32 var8009f708 = 0; -u32 var8009f70c = 0; -u32 var8009f710 = 0; -u32 var8009f714 = 0; -u32 var8009f718 = 0; -u32 var8009f71c = 0; -u32 var8009f720 = 0; -u32 var8009f724 = 0; -u32 var8009f728 = 0; -u32 var8009f72c = 0; -u32 var8009f730 = 0; -u32 var8009f734 = 0; -u32 var8009f738 = 0; -u32 var8009f73c = 0; -u32 var8009f740 = 0; -u32 var8009f744 = 0; -u32 var8009f748 = 0; -u32 var8009f74c = 0; -u32 var8009f750 = 0; -u32 var8009f754 = 0; -u32 var8009f758 = 0; -u32 var8009f75c = 0; -u32 var8009f760 = 0; -u32 var8009f764 = 0; -u32 var8009f768 = 0; -u32 var8009f76c = 0; -u32 var8009f770 = 0; -u32 var8009f774 = 0; -u32 var8009f778 = 0; -u32 var8009f77c = 0; -u32 var8009f780 = 0; -u32 var8009f784 = 0; -u32 var8009f788 = 0; -u32 var8009f78c = 0; -u32 var8009f790 = 0; -u32 var8009f794 = 0; -u32 var8009f798 = 0; -u32 var8009f79c = 0; -u32 var8009f7a0 = 0; -u32 var8009f7a4 = 0; -u32 var8009f7a8 = 0; -u32 var8009f7ac = 0; -u32 var8009f7b0 = 0; -u32 var8009f7b4 = 0; -u32 var8009f7b8 = 0; -u32 var8009f7bc = 0; -u32 var8009f7c0 = 0; -u32 var8009f7c4 = 0; -u32 var8009f7c8 = 0; -u32 var8009f7cc = 0; -u32 var8009f7d0 = 0; -u32 var8009f7d4 = 0; -u32 var8009f7d8 = 0; -u32 var8009f7dc = 0; -u32 var8009f7e0 = 0; -u32 var8009f7e4 = 0; -u32 var8009f7e8 = 0; -u32 var8009f7ec = 0; -u32 var8009f7f0 = 0; -u32 var8009f7f4 = 0; -u32 var8009f7f8 = 0; -u32 var8009f7fc = 0; -u32 var8009f800 = 0; -u32 var8009f804 = 0; -u32 var8009f808 = 0; -u32 var8009f80c = 0; -u32 var8009f810 = 0; -u32 var8009f814 = 0; -u32 var8009f818 = 0; -u32 var8009f81c = 0; -u32 var8009f820 = 0; -u32 var8009f824 = 0; -u32 var8009f828 = 0; -u32 var8009f82c = 0; -u32 var8009f830 = 0; -u32 var8009f834 = 0; -u32 var8009f838 = 0; -u32 var8009f83c = 0; -u32 var8009f840 = 0; -u32 var8009f844 = 0; -u32 var8009f848 = 0; -u32 var8009f84c = 0; -u32 var8009f850 = 0; -u32 var8009f854 = 0; -u32 var8009f858 = 0; -u32 var8009f85c = 0; -u32 var8009f860 = 0; -u32 var8009f864 = 0; -u32 var8009f868 = 0; -u32 var8009f86c = 0; -u32 var8009f870 = 0; -u32 var8009f874 = 0; -u32 var8009f878 = 0; -u32 var8009f87c = 0; -u32 var8009f880 = 0; -u32 var8009f884 = 0; -u32 var8009f888 = 0; -u32 var8009f88c = 0; -u32 var8009f890 = 0; -u32 var8009f894 = 0; -u32 var8009f898 = 0; -u32 var8009f89c = 0; -u32 var8009f8a0 = 0; -u32 var8009f8a4 = 0; -u32 var8009f8a8 = 0; -u32 var8009f8ac = 0; -u32 var8009f8b0 = 0; -u32 var8009f8b4 = 0; -u32 var8009f8b8 = 0; -u32 var8009f8bc = 0; -u32 var8009f8c0 = 0; -u32 var8009f8c4 = 0; -u32 var8009f8c8 = 0; -u32 var8009f8cc = 0; -u32 var8009f8d0 = 0; -u32 var8009f8d4 = 0; -u32 var8009f8d8 = 0; -u32 var8009f8dc = 0; -u32 var8009f8e0 = 0; -u32 var8009f8e4 = 0; -u32 var8009f8e8 = 0; -u32 var8009f8ec = 0; -u32 var8009f8f0 = 0; -u32 var8009f8f4 = 0; -u32 var8009f8f8 = 0; -u32 var8009f8fc = 0; -u32 var8009f900 = 0; -u32 var8009f904 = 0; -u32 var8009f908 = 0; -u32 var8009f90c = 0; -u32 var8009f910 = 0; -u32 var8009f914 = 0; -u32 var8009f918 = 0; -u32 var8009f91c = 0; -u32 var8009f920 = 0; -u32 var8009f924 = 0; -u32 var8009f928 = 0; -u32 var8009f92c = 0; -u32 var8009f930 = 0; -u32 var8009f934 = 0; -u32 var8009f938 = 0; -u32 var8009f93c = 0; -u32 var8009f940 = 0; -u32 var8009f944 = 0; -u32 var8009f948 = 0; -u32 var8009f94c = 0; -u32 var8009f950 = 0; -u32 var8009f954 = 0; -u32 var8009f958 = 0; -u32 var8009f95c = 0; -u32 var8009f960 = 0; -u32 var8009f964 = 0; -u32 var8009f968 = 0; -u32 var8009f96c = 0; -u32 var8009f970 = 0; -u32 var8009f974 = 0; -u32 var8009f978 = 0; -u32 var8009f97c = 0; -u32 var8009f980 = 0; -u32 var8009f984 = 0; -u32 var8009f988 = 0; -u32 var8009f98c = 0; -u32 var8009f990 = 0; -u32 var8009f994 = 0; -u32 var8009f998 = 0; -u32 var8009f99c = 0; -u32 var8009f9a0 = 0; -u32 var8009f9a4 = 0; -u32 var8009f9a8 = 0; -u32 var8009f9ac = 0; -u32 var8009f9b0 = 0; -u32 var8009f9b4 = 0; -u32 var8009f9b8 = 0; -u32 var8009f9bc = 0; -u32 var8009f9c0 = 0; -u32 var8009f9c4 = 0; -u32 var8009f9c8 = 0; -u32 var8009f9cc = 0; -u32 var8009f9d0 = 0; -u32 var8009f9d4 = 0; -u32 var8009f9d8 = 0; -u32 var8009f9dc = 0; -u32 var8009f9e0 = 0; -u32 var8009f9e4 = 0; -u32 var8009f9e8 = 0; -u32 var8009f9ec = 0; -u32 var8009f9f0 = 0; -u32 var8009f9f4 = 0; -u32 var8009f9f8 = 0; -u32 var8009f9fc = 0; -u32 var8009fa00 = 0; -u32 var8009fa04 = 0; -u32 var8009fa08 = 0; -u32 var8009fa0c = 0; -u32 var8009fa10 = 0; -u32 var8009fa14 = 0; -u32 var8009fa18 = 0; -u32 var8009fa1c = 0; -u32 var8009fa20 = 0; -u32 var8009fa24 = 0; -u32 var8009fa28 = 0; -u32 var8009fa2c = 0; -u32 var8009fa30 = 0; -u32 var8009fa34 = 0; -u32 var8009fa38 = 0; -u32 var8009fa3c = 0; -u32 var8009fa40 = 0; -u32 var8009fa44 = 0; -u32 var8009fa48 = 0; -u32 var8009fa4c = 0; -u32 var8009fa50 = 0; -u32 var8009fa54 = 0; -u32 var8009fa58 = 0; -u32 var8009fa5c = 0; -u32 var8009fa60 = 0; -u32 var8009fa64 = 0; -u32 var8009fa68 = 0; -u32 var8009fa6c = 0; -u32 var8009fa70 = 0; -u32 var8009fa74 = 0; -u32 var8009fa78 = 0; -u32 var8009fa7c = 0; -u32 var8009fa80 = 0; -u32 var8009fa84 = 0; -u32 var8009fa88 = 0; -u32 var8009fa8c = 0; -u32 var8009fa90 = 0; -u32 var8009fa94 = 0; -u32 var8009fa98 = 0; -u32 var8009fa9c = 0; -u32 var8009faa0 = 0; -u32 var8009faa4 = 0; -u32 var8009faa8 = 0; -u32 var8009faac = 0; -u32 var8009fab0 = 0; -u32 var8009fab4 = 0; -u32 var8009fab8 = 0; -u32 var8009fabc = 0; -u32 var8009fac0 = 0; -u32 var8009fac4 = 0; -u32 var8009fac8 = 0; -u32 var8009facc = 0; -u32 var8009fad0 = 0; -u32 var8009fad4 = 0; -u32 var8009fad8 = 0; -u32 var8009fadc = 0; -u32 var8009fae0 = 0; -u32 var8009fae4 = 0; -u32 var8009fae8 = 0; -u32 var8009faec = 0; -u32 var8009faf0 = 0; -u32 var8009faf4 = 0; -u32 var8009faf8 = 0; -u32 var8009fafc = 0; -u32 var8009fb00 = 0; -u32 var8009fb04 = 0; -u32 var8009fb08 = 0; -u32 var8009fb0c = 0; -u32 var8009fb10 = 0; -u32 var8009fb14 = 0; -u32 var8009fb18 = 0; -u32 var8009fb1c = 0; -u32 var8009fb20 = 0; -u32 var8009fb24 = 0; -u32 var8009fb28 = 0; -u32 var8009fb2c = 0; -u32 var8009fb30 = 0; -u32 var8009fb34 = 0; -u32 var8009fb38 = 0; -u32 var8009fb3c = 0; -u32 var8009fb40 = 0; -u32 var8009fb44 = 0; -u32 var8009fb48 = 0; -u32 var8009fb4c = 0; -u32 var8009fb50 = 0; -u32 var8009fb54 = 0; -u32 var8009fb58 = 0; -u32 var8009fb5c = 0; -u32 var8009fb60 = 0; -u32 var8009fb64 = 0; -u32 var8009fb68 = 0; -u32 var8009fb6c = 0; -u32 var8009fb70 = 0; -u32 var8009fb74 = 0; -u32 var8009fb78 = 0; -u32 var8009fb7c = 0; -u32 var8009fb80 = 0; -u32 var8009fb84 = 0; -u32 var8009fb88 = 0; -u32 var8009fb8c = 0; -u32 var8009fb90 = 0; -u32 var8009fb94 = 0; -u32 var8009fb98 = 0; -u32 var8009fb9c = 0; -u32 var8009fba0 = 0; -u32 var8009fba4 = 0; -u32 var8009fba8 = 0; -u32 var8009fbac = 0; -u32 var8009fbb0 = 0; -u32 var8009fbb4 = 0; -u32 var8009fbb8 = 0; -u32 var8009fbbc = 0; -u32 var8009fbc0 = 0; -u32 var8009fbc4 = 0; -u32 var8009fbc8 = 0; -u32 var8009fbcc = 0; -u32 var8009fbd0 = 0; -u32 var8009fbd4 = 0; -u32 var8009fbd8 = 0; -u32 var8009fbdc = 0; -u32 var8009fbe0 = 0; -u32 var8009fbe4 = 0; -u32 var8009fbe8 = 0; -u32 var8009fbec = 0; -u32 var8009fbf0 = 0; -u32 var8009fbf4 = 0; -u32 var8009fbf8 = 0; -u32 var8009fbfc = 0; -u32 var8009fc00 = 0; -u32 var8009fc04 = 0; -u32 var8009fc08 = 0; -u32 var8009fc0c = 0; -u32 var8009fc10 = 0; -u32 var8009fc14 = 0; -u32 var8009fc18 = 0; -u32 var8009fc1c = 0; -u32 var8009fc20 = 0; -u32 var8009fc24 = 0; -u32 var8009fc28 = 0; -u32 var8009fc2c = 0; -u32 var8009fc30 = 0; -u32 var8009fc34 = 0; -u32 var8009fc38 = 0; -u32 var8009fc3c = 0; -u32 var8009fc40 = 0; -u32 var8009fc44 = 0; -u32 var8009fc48 = 0; -u32 var8009fc4c = 0; -u32 var8009fc50 = 0; -u32 var8009fc54 = 0; -u32 var8009fc58 = 0; -u32 var8009fc5c = 0; -u32 var8009fc60 = 0; -u32 var8009fc64 = 0; -u32 var8009fc68 = 0; -u32 var8009fc6c = 0; -u32 var8009fc70 = 0; -u32 var8009fc74 = 0; -u32 var8009fc78 = 0; -u32 var8009fc7c = 0; -u32 var8009fc80 = 0; -u32 var8009fc84 = 0; -u32 var8009fc88 = 0; -u32 var8009fc8c = 0; -u32 var8009fc90 = 0; -u32 var8009fc94 = 0; -u32 var8009fc98 = 0; -u32 var8009fc9c = 0; -u32 var8009fca0 = 0; -u32 var8009fca4 = 0; -u32 var8009fca8 = 0; -u32 var8009fcac = 0; -u32 var8009fcb0 = 0; -u32 var8009fcb4 = 0; -u32 var8009fcb8 = 0; -u32 var8009fcbc = 0; -u32 var8009fcc0 = 0; -u32 var8009fcc4 = 0; -u32 var8009fcc8 = 0; -u32 var8009fccc = 0; -u32 var8009fcd0 = 0; -u32 var8009fcd4 = 0; -u32 var8009fcd8 = 0; -u32 var8009fcdc = 0; -u32 var8009fce0 = 0; -u32 var8009fce4 = 0; -u32 var8009fce8 = 0; -u32 var8009fcec = 0; -u32 var8009fcf0 = 0; -u32 var8009fcf4 = 0; -u32 var8009fcf8 = 0; -u32 var8009fcfc = 0; -u32 var8009fd00 = 0; -u32 var8009fd04 = 0; -u32 var8009fd08 = 0; -u32 var8009fd0c = 0; -u32 var8009fd10 = 0; -u32 var8009fd14 = 0; -u32 var8009fd18 = 0; -u32 var8009fd1c = 0; -u32 var8009fd20 = 0; -u32 var8009fd24 = 0; -u32 var8009fd28 = 0; -u32 var8009fd2c = 0; -u32 var8009fd30 = 0; -u32 var8009fd34 = 0; -u32 var8009fd38 = 0; -u32 var8009fd3c = 0; -u32 var8009fd40 = 0; -u32 var8009fd44 = 0; -u32 var8009fd48 = 0; -u32 var8009fd4c = 0; -u32 var8009fd50 = 0; -u32 var8009fd54 = 0; -u32 var8009fd58 = 0; -u32 var8009fd5c = 0; -u32 var8009fd60 = 0; -u32 var8009fd64 = 0; -u32 var8009fd68 = 0; -u32 var8009fd6c = 0; -u32 var8009fd70 = 0; -u32 var8009fd74 = 0; -u32 var8009fd78 = 0; -u32 var8009fd7c = 0; -u32 var8009fd80 = 0; -u32 var8009fd84 = 0; -u32 var8009fd88 = 0; -u32 var8009fd8c = 0; -u32 var8009fd90 = 0; -u32 var8009fd94 = 0; -u32 var8009fd98 = 0; -u32 var8009fd9c = 0; -u32 var8009fda0 = 0; -u32 var8009fda4 = 0; -u32 var8009fda8 = 0; -u32 var8009fdac = 0; -u32 var8009fdb0 = 0; -u32 var8009fdb4 = 0; -u32 var8009fdb8 = 0; -u32 var8009fdbc = 0; -u32 var8009fdc0 = 0; -u32 var8009fdc4 = 0; -u32 var8009fdc8 = 0; -u32 var8009fdcc = 0; -u32 var8009fdd0 = 0; -u32 var8009fdd4 = 0; -u32 var8009fdd8 = 0; -u32 var8009fddc = 0; -u32 var8009fde0 = 0; -u32 var8009fde4 = 0; -u32 var8009fde8 = 0; -u32 var8009fdec = 0; -u32 var8009fdf0 = 0; -u32 var8009fdf4 = 0; -u32 var8009fdf8 = 0; -u32 var8009fdfc = 0; -u32 var8009fe00 = 0; -u32 var8009fe04 = 0; -u32 var8009fe08 = 0; -u32 var8009fe0c = 0; -u32 var8009fe10 = 0; -u32 var8009fe14 = 0; -u32 var8009fe18 = 0; -u32 var8009fe1c = 0; -u32 var8009fe20 = 0; -u32 var8009fe24 = 0; -u32 var8009fe28 = 0; -u32 var8009fe2c = 0; -u32 var8009fe30 = 0; -u32 var8009fe34 = 0; -u32 var8009fe38 = 0; -u32 var8009fe3c = 0; -u32 var8009fe40 = 0; -u32 var8009fe44 = 0; -u32 var8009fe48 = 0; -u32 var8009fe4c = 0; -u32 var8009fe50 = 0; -u32 var8009fe54 = 0; -u32 var8009fe58 = 0; -u32 var8009fe5c = 0; -u32 var8009fe60 = 0; -u32 var8009fe64 = 0; -u32 var8009fe68 = 0; -u32 var8009fe6c = 0; -u32 var8009fe70 = 0; -u32 var8009fe74 = 0; -u32 var8009fe78 = 0; -u32 var8009fe7c = 0; -u32 var8009fe80 = 0; -u32 var8009fe84 = 0; -u32 var8009fe88 = 0; -u32 var8009fe8c = 0; -u32 var8009fe90 = 0; -u32 var8009fe94 = 0; -u32 var8009fe98 = 0; -u32 var8009fe9c = 0; -u32 var8009fea0 = 0; -u32 var8009fea4 = 0; -u32 var8009fea8 = 0; -u32 var8009feac = 0; -u32 var8009feb0 = 0; -u32 var8009feb4 = 0; -u32 var8009feb8 = 0; -u32 var8009febc = 0; -u32 var8009fec0 = 0; -u32 var8009fec4 = 0; -u32 var8009fec8 = 0; -u32 var8009fecc = 0; -u32 var8009fed0 = 0; -u32 var8009fed4 = 0; -u32 var8009fed8 = 0; -u32 var8009fedc = 0; -u32 var8009fee0 = 0; -u32 var8009fee4 = 0; -u32 var8009fee8 = 0; -u32 var8009feec = 0; -u32 var8009fef0 = 0; -u32 var8009fef4 = 0; -u32 var8009fef8 = 0; -u32 var8009fefc = 0; -u32 var8009ff00 = 0; -u32 var8009ff04 = 0; -u32 var8009ff08 = 0; -u32 var8009ff0c = 0; -u32 var8009ff10 = 0; -u32 var8009ff14 = 0; -u32 var8009ff18 = 0; -u32 var8009ff1c = 0; -u32 var8009ff20 = 0; -u32 var8009ff24 = 0; -u32 var8009ff28 = 0; -u32 var8009ff2c = 0; -u32 var8009ff30 = 0; -u32 var8009ff34 = 0; -u32 var8009ff38 = 0; -u32 var8009ff3c = 0; -u32 var8009ff40 = 0; -u32 var8009ff44 = 0; -u32 var8009ff48 = 0; -u32 var8009ff4c = 0; -u32 var8009ff50 = 0; -u32 var8009ff54 = 0; -u32 var8009ff58 = 0; -u32 var8009ff5c = 0; -u32 var8009ff60 = 0; -u32 var8009ff64 = 0; -u32 var8009ff68 = 0; -u32 var8009ff6c = 0; -u32 var8009ff70 = 0; -u32 var8009ff74 = 0; -u32 var8009ff78 = 0; -u32 var8009ff7c = 0; -u32 var8009ff80 = 0; -u32 var8009ff84 = 0; -u32 var8009ff88 = 0; -u32 var8009ff8c = 0; -u32 var8009ff90 = 0; -u32 var8009ff94 = 0; -u32 var8009ff98 = 0; -u32 var8009ff9c = 0; -u32 var8009ffa0 = 0; -u32 var8009ffa4 = 0; -u32 var8009ffa8 = 0; -u32 var8009ffac = 0; -u32 var8009ffb0 = 0; -u32 var8009ffb4 = 0; -u32 var8009ffb8 = 0; -u32 var8009ffbc = 0; -u32 var8009ffc0 = 0; -u32 var8009ffc4 = 0; -u32 var8009ffc8 = 0; -u32 var8009ffcc = 0; -u32 var8009ffd0 = 0; -u32 var8009ffd4 = 0; -u32 var8009ffd8 = 0; -u32 var8009ffdc = 0; -u32 var8009ffe0 = 0; -u32 var8009ffe4 = 0; -u32 var8009ffe8 = 0; -u32 var8009ffec = 0; -u32 var8009fff0 = 0; -u32 var8009fff4 = 0; -u32 var8009fff8 = 0; -u32 var8009fffc = 0; -u32 var800a0000 = 0; -u32 var800a0004 = 0; -u32 var800a0008 = 0; -u32 var800a000c = 0; -u32 var800a0010 = 0; -u32 var800a0014 = 0; -u32 var800a0018 = 0; -u32 var800a001c = 0; -u32 var800a0020 = 0; -u32 var800a0024 = 0; -u32 var800a0028 = 0; -u32 var800a002c = 0; -u32 var800a0030 = 0; -u32 var800a0034 = 0; -u32 var800a0038 = 0; -u32 var800a003c = 0; -u32 var800a0040 = 0; -u32 var800a0044 = 0; -u32 var800a0048 = 0; -u32 var800a004c = 0; -u32 var800a0050 = 0; -u32 var800a0054 = 0; -u32 var800a0058 = 0; -u32 var800a005c = 0; -u32 var800a0060 = 0; -u32 var800a0064 = 0; -u32 var800a0068 = 0; -u32 var800a006c = 0; -u32 var800a0070 = 0; -u32 var800a0074 = 0; -u32 var800a0078 = 0; -u32 var800a007c = 0; -u32 var800a0080 = 0; -u32 var800a0084 = 0; -u32 var800a0088 = 0; -u32 var800a008c = 0; -u32 var800a0090 = 0; -u32 var800a0094 = 0; -u32 var800a0098 = 0; -u32 var800a009c = 0; -u32 var800a00a0 = 0; -u32 var800a00a4 = 0; -u32 var800a00a8 = 0; -u32 var800a00ac = 0; -u32 var800a00b0 = 0; -u32 var800a00b4 = 0; -u32 var800a00b8 = 0; -u32 var800a00bc = 0; -u32 var800a00c0 = 0; -u32 var800a00c4 = 0; -u32 var800a00c8 = 0; -u32 var800a00cc = 0; -u32 var800a00d0 = 0; -u32 var800a00d4 = 0; -u32 var800a00d8 = 0; -u32 var800a00dc = 0; -u32 var800a00e0 = 0; -u32 var800a00e4 = 0; -u32 var800a00e8 = 0; -u32 var800a00ec = 0; -u32 var800a00f0 = 0; -u32 var800a00f4 = 0; -u32 var800a00f8 = 0; -u32 var800a00fc = 0; -u32 var800a0100 = 0; -u32 var800a0104 = 0; -u32 var800a0108 = 0; -u32 var800a010c = 0; -u32 var800a0110 = 0; -u32 var800a0114 = 0; -u32 var800a0118 = 0; -u32 var800a011c = 0; -u32 var800a0120 = 0; -u32 var800a0124 = 0; -u32 var800a0128 = 0; -u32 var800a012c = 0; -u32 var800a0130 = 0; -u32 var800a0134 = 0; -u32 var800a0138 = 0; -u32 var800a013c = 0; -u32 var800a0140 = 0; -u32 var800a0144 = 0; -u32 var800a0148 = 0; -u32 var800a014c = 0; -u32 var800a0150 = 0; -u32 var800a0154 = 0; -u32 var800a0158 = 0; -u32 var800a015c = 0; -u32 var800a0160 = 0; -u32 var800a0164 = 0; -u32 var800a0168 = 0; -u32 var800a016c = 0; -u32 var800a0170 = 0; -u32 var800a0174 = 0; -u32 var800a0178 = 0; -u32 var800a017c = 0; -u32 var800a0180 = 0; -u32 var800a0184 = 0; -u32 var800a0188 = 0; -u32 var800a018c = 0; -u32 var800a0190 = 0; -u32 var800a0194 = 0; -u32 var800a0198 = 0; -u32 var800a019c = 0; -u32 var800a01a0 = 0; -u32 var800a01a4 = 0; -u32 var800a01a8 = 0; -u32 var800a01ac = 0; -u32 var800a01b0 = 0; -u32 var800a01b4 = 0; -u32 var800a01b8 = 0; -u32 var800a01bc = 0; -u32 var800a01c0 = 0; -u32 var800a01c4 = 0; -u32 var800a01c8 = 0; -u32 var800a01cc = 0; -u32 var800a01d0 = 0; -u32 var800a01d4 = 0; -u32 var800a01d8 = 0; -u32 var800a01dc = 0; -u32 var800a01e0 = 0; -u32 var800a01e4 = 0; -u32 var800a01e8 = 0; -u32 var800a01ec = 0; -u32 var800a01f0 = 0; -u32 var800a01f4 = 0; -u32 var800a01f8 = 0; -u32 var800a01fc = 0; -u32 var800a0200 = 0; -u32 var800a0204 = 0; -u32 var800a0208 = 0; -u32 var800a020c = 0; -u32 var800a0210 = 0; -u32 var800a0214 = 0; -u32 var800a0218 = 0; -u32 var800a021c = 0; -u32 var800a0220 = 0; -u32 var800a0224 = 0; -u32 var800a0228 = 0; -u32 var800a022c = 0; -u32 var800a0230 = 0; -u32 var800a0234 = 0; -u32 var800a0238 = 0; -u32 var800a023c = 0; -u32 var800a0240 = 0; -u32 var800a0244 = 0; -u32 var800a0248 = 0; -u32 var800a024c = 0; -u32 var800a0250 = 0; -u32 var800a0254 = 0; -u32 var800a0258 = 0; -u32 var800a025c = 0; -u32 var800a0260 = 0; -u32 var800a0264 = 0; -u32 var800a0268 = 0; -u32 var800a026c = 0; -u32 var800a0270 = 0; -u32 var800a0274 = 0; -u32 var800a0278 = 0; -u32 var800a027c = 0; -u32 var800a0280 = 0; -u32 var800a0284 = 0; -u32 var800a0288 = 0; -u32 var800a028c = 0; -u32 var800a0290 = 0; -u32 var800a0294 = 0; -u32 var800a0298 = 0; -u32 var800a029c = 0; -u32 var800a02a0 = 0; -u32 var800a02a4 = 0; -u32 var800a02a8 = 0; -u32 var800a02ac = 0; -u32 var800a02b0 = 0; -u32 var800a02b4 = 0; -u32 var800a02b8 = 0; -u32 var800a02bc = 0; -u32 var800a02c0 = 0; -u32 var800a02c4 = 0; -u32 var800a02c8 = 0; -u32 var800a02cc = 0; -u32 var800a02d0 = 0; -u32 var800a02d4 = 0; -u32 var800a02d8 = 0; -u32 var800a02dc = 0; -u32 var800a02e0 = 0; -u32 var800a02e4 = 0; -u32 var800a02e8 = 0; -u32 var800a02ec = 0; -u32 var800a02f0 = 0; -u32 var800a02f4 = 0; -u32 var800a02f8 = 0; -u32 var800a02fc = 0; -u32 var800a0300 = 0; -u32 var800a0304 = 0; -u32 var800a0308 = 0; -u32 var800a030c = 0; -u32 var800a0310 = 0; -u32 var800a0314 = 0; -u32 var800a0318 = 0; -u32 var800a031c = 0; -u32 var800a0320 = 0; -u32 var800a0324 = 0; -u32 var800a0328 = 0; -u32 var800a032c = 0; -u32 var800a0330 = 0; -u32 var800a0334 = 0; -u32 var800a0338 = 0; -u32 var800a033c = 0; -u32 var800a0340 = 0; -u32 var800a0344 = 0; -u32 var800a0348 = 0; -u32 var800a034c = 0; -u32 var800a0350 = 0; -u32 var800a0354 = 0; -u32 var800a0358 = 0; -u32 var800a035c = 0; -u32 var800a0360 = 0; -u32 var800a0364 = 0; -u32 var800a0368 = 0; -u32 var800a036c = 0; -u32 var800a0370 = 0; -u32 var800a0374 = 0; -u32 var800a0378 = 0; -u32 var800a037c = 0; -u32 var800a0380 = 0; -u32 var800a0384 = 0; -u32 var800a0388 = 0; -u32 var800a038c = 0; -u32 var800a0390 = 0; -u32 var800a0394 = 0; -u32 var800a0398 = 0; -u32 var800a039c = 0; -u32 var800a03a0 = 0; -u32 var800a03a4 = 0; -u32 var800a03a8 = 0; -u32 var800a03ac = 0; -u32 var800a03b0 = 0; -u32 var800a03b4 = 0; -u32 var800a03b8 = 0; -u32 var800a03bc = 0; -u32 var800a03c0 = 0; -u32 var800a03c4 = 0; -u32 var800a03c8 = 0; -u32 var800a03cc = 0; -u32 var800a03d0 = 0; -u32 var800a03d4 = 0; -u32 var800a03d8 = 0; -u32 var800a03dc = 0; -u32 var800a03e0 = 0; -u32 var800a03e4 = 0; -u32 var800a03e8 = 0; -u32 var800a03ec = 0; -u32 var800a03f0 = 0; -u32 var800a03f4 = 0; -u32 var800a03f8 = 0; -u32 var800a03fc = 0; -u32 var800a0400 = 0; -u32 var800a0404 = 0; -u32 var800a0408 = 0; -u32 var800a040c = 0; -u32 var800a0410 = 0; -u32 var800a0414 = 0; -u32 var800a0418 = 0; -u32 var800a041c = 0; -u32 var800a0420 = 0; -u32 var800a0424 = 0; -u32 var800a0428 = 0; -u32 var800a042c = 0; -u32 var800a0430 = 0; -u32 var800a0434 = 0; -u32 var800a0438 = 0; -u32 var800a043c = 0; -u32 var800a0440 = 0; -u32 var800a0444 = 0; -u32 var800a0448 = 0; -u32 var800a044c = 0; -u32 var800a0450 = 0; -u32 var800a0454 = 0; -u32 var800a0458 = 0; -u32 var800a045c = 0; -u32 var800a0460 = 0; -u32 var800a0464 = 0; -u32 var800a0468 = 0; -u32 var800a046c = 0; -u32 var800a0470 = 0; -u32 var800a0474 = 0; -u32 var800a0478 = 0; -u32 var800a047c = 0; -u32 var800a0480 = 0; -u32 var800a0484 = 0; -u32 var800a0488 = 0; -u32 var800a048c = 0; -u32 var800a0490 = 0; -u32 var800a0494 = 0; -u32 var800a0498 = 0; -u32 var800a049c = 0; -u32 var800a04a0 = 0; -u32 var800a04a4 = 0; -u32 var800a04a8 = 0; -u32 var800a04ac = 0; -u32 var800a04b0 = 0; -u32 var800a04b4 = 0; -u32 var800a04b8 = 0; -u32 var800a04bc = 0; -u32 var800a04c0 = 0; -u32 var800a04c4 = 0; -u32 var800a04c8 = 0; -u32 var800a04cc = 0; -u32 var800a04d0 = 0; -u32 var800a04d4 = 0; -u32 var800a04d8 = 0; -u32 var800a04dc = 0; -u32 var800a04e0 = 0; -u32 var800a04e4 = 0; -u32 var800a04e8 = 0; -u32 var800a04ec = 0; -u32 var800a04f0 = 0; -u32 var800a04f4 = 0; -u32 var800a04f8 = 0; -u32 var800a04fc = 0; -u32 var800a0500 = 0; -u32 var800a0504 = 0; -u32 var800a0508 = 0; -u32 var800a050c = 0; -u32 var800a0510 = 0; -u32 var800a0514 = 0; -u32 var800a0518 = 0; -u32 var800a051c = 0; -u32 var800a0520 = 0; -u32 var800a0524 = 0; -u32 var800a0528 = 0; -u32 var800a052c = 0; -u32 var800a0530 = 0; -u32 var800a0534 = 0; -u32 var800a0538 = 0; -u32 var800a053c = 0; -u32 var800a0540 = 0; -u32 var800a0544 = 0; -u32 var800a0548 = 0; -u32 var800a054c = 0; -u32 var800a0550 = 0; -u32 var800a0554 = 0; -u32 var800a0558 = 0; -u32 var800a055c = 0; -u32 var800a0560 = 0; -u32 var800a0564 = 0; -u32 var800a0568 = 0; -u32 var800a056c = 0; -u32 var800a0570 = 0; -u32 var800a0574 = 0; -u32 var800a0578 = 0; -u32 var800a057c = 0; -u32 var800a0580 = 0; -u32 var800a0584 = 0; -u32 var800a0588 = 0; -u32 var800a058c = 0; -u32 var800a0590 = 0; -u32 var800a0594 = 0; -u32 var800a0598 = 0; -u32 var800a059c = 0; -u32 var800a05a0 = 0; -u32 var800a05a4 = 0; -u32 var800a05a8 = 0; -u32 var800a05ac = 0; -u32 var800a05b0 = 0; -u32 var800a05b4 = 0; -u32 var800a05b8 = 0; -u32 var800a05bc = 0; -u32 var800a05c0 = 0; -u32 var800a05c4 = 0; -u32 var800a05c8 = 0; -u32 var800a05cc = 0; -u32 var800a05d0 = 0; -u32 var800a05d4 = 0; -u32 var800a05d8 = 0; -u32 var800a05dc = 0; -u32 var800a05e0 = 0; -u32 var800a05e4 = 0; -u32 var800a05e8 = 0; -u32 var800a05ec = 0; -u32 var800a05f0 = 0; -u32 var800a05f4 = 0; -u32 var800a05f8 = 0; -u32 var800a05fc = 0; -u32 var800a0600 = 0; -u32 var800a0604 = 0; -u32 var800a0608 = 0; -u32 var800a060c = 0; -u32 var800a0610 = 0; -u32 var800a0614 = 0; -u32 var800a0618 = 0; -u32 var800a061c = 0; -u32 var800a0620 = 0; -u32 var800a0624 = 0; -u32 var800a0628 = 0; -u32 var800a062c = 0; -u32 var800a0630 = 0; -u32 var800a0634 = 0; -u32 var800a0638 = 0; -u32 var800a063c = 0; -u32 var800a0640 = 0; -u32 var800a0644 = 0; -u32 var800a0648 = 0; -u32 var800a064c = 0; -u32 var800a0650 = 0; -u32 var800a0654 = 0; -u32 var800a0658 = 0; -u32 var800a065c = 0; -u32 var800a0660 = 0; -u32 var800a0664 = 0; -u32 var800a0668 = 0; -u32 var800a066c = 0; -u32 var800a0670 = 0; -u32 var800a0674 = 0; -u32 var800a0678 = 0; -u32 var800a067c = 0; -u32 var800a0680 = 0; -u32 var800a0684 = 0; -u32 var800a0688 = 0; -u32 var800a068c = 0; -u32 var800a0690 = 0; -u32 var800a0694 = 0; -u32 var800a0698 = 0; -u32 var800a069c = 0; -u32 var800a06a0 = 0; -u32 var800a06a4 = 0; -u32 var800a06a8 = 0; -u32 var800a06ac = 0; -u32 var800a06b0 = 0; -u32 var800a06b4 = 0; -u32 var800a06b8 = 0; -u32 var800a06bc = 0; -u32 var800a06c0 = 0; -u32 var800a06c4 = 0; -u32 var800a06c8 = 0; -u32 var800a06cc = 0; -u32 var800a06d0 = 0; -u32 var800a06d4 = 0; -u32 var800a06d8 = 0; -u32 var800a06dc = 0; -u32 var800a06e0 = 0; -u32 var800a06e4 = 0; -u32 var800a06e8 = 0; -u32 var800a06ec = 0; -u32 var800a06f0 = 0; -u32 var800a06f4 = 0; -u32 var800a06f8 = 0; -u32 var800a06fc = 0; -u32 var800a0700 = 0; -u32 var800a0704 = 0; -u32 var800a0708 = 0; -u32 var800a070c = 0; -u32 var800a0710 = 0; -u32 var800a0714 = 0; -u32 var800a0718 = 0; -u32 var800a071c = 0; -u32 var800a0720 = 0; -u32 var800a0724 = 0; -u32 var800a0728 = 0; -u32 var800a072c = 0; -u32 var800a0730 = 0; -u32 var800a0734 = 0; -u32 var800a0738 = 0; -u32 var800a073c = 0; -u32 var800a0740 = 0; -u32 var800a0744 = 0; -u32 var800a0748 = 0; -u32 var800a074c = 0; -u32 var800a0750 = 0; -u32 var800a0754 = 0; -u32 var800a0758 = 0; -u32 var800a075c = 0; -u32 var800a0760 = 0; -u32 var800a0764 = 0; -u32 var800a0768 = 0; -u32 var800a076c = 0; -u32 var800a0770 = 0; -u32 var800a0774 = 0; -u32 var800a0778 = 0; -u32 var800a077c = 0; -u32 var800a0780 = 0; -u32 var800a0784 = 0; -u32 var800a0788 = 0; -u32 var800a078c = 0; -u32 var800a0790 = 0; -u32 var800a0794 = 0; -u32 var800a0798 = 0; -u32 var800a079c = 0; -u32 var800a07a0 = 0; -u32 var800a07a4 = 0; -u32 var800a07a8 = 0; -u32 var800a07ac = 0; -u32 var800a07b0 = 0; -u32 var800a07b4 = 0; -u32 var800a07b8 = 0; -u32 var800a07bc = 0; -u32 var800a07c0 = 0; -u32 var800a07c4 = 0; -u32 var800a07c8 = 0; -u32 var800a07cc = 0; -u32 var800a07d0 = 0; -u32 var800a07d4 = 0; -u32 var800a07d8 = 0; -u32 var800a07dc = 0; -u32 var800a07e0 = 0; -u32 var800a07e4 = 0; -u32 var800a07e8 = 0; -u32 var800a07ec = 0; -u32 var800a07f0 = 0; -u32 var800a07f4 = 0; -u32 var800a07f8 = 0; -u32 var800a07fc = 0; -u32 var800a0800 = 0; -u32 var800a0804 = 0; -u32 var800a0808 = 0; -u32 var800a080c = 0; -u32 var800a0810 = 0; -u32 var800a0814 = 0; -u32 var800a0818 = 0; -u32 var800a081c = 0; -u32 var800a0820 = 0; -u32 var800a0824 = 0; -u32 var800a0828 = 0; -u32 var800a082c = 0; -u32 var800a0830 = 0; -u32 var800a0834 = 0; -u32 var800a0838 = 0; -u32 var800a083c = 0; -u32 var800a0840 = 0; -u32 var800a0844 = 0; -u32 var800a0848 = 0; -u32 var800a084c = 0; -u32 var800a0850 = 0; -u32 var800a0854 = 0; -u32 var800a0858 = 0; -u32 var800a085c = 0; -u32 var800a0860 = 0; -u32 var800a0864 = 0; -u32 var800a0868 = 0; -u32 var800a086c = 0; -u32 var800a0870 = 0; -u32 var800a0874 = 0; -u32 var800a0878 = 0; -u32 var800a087c = 0; -u32 var800a0880 = 0; -u32 var800a0884 = 0; -u32 var800a0888 = 0; -u32 var800a088c = 0; -u32 var800a0890 = 0; -u32 var800a0894 = 0; -u32 var800a0898 = 0; -u32 var800a089c = 0; -u32 var800a08a0 = 0; -u32 var800a08a4 = 0; -u32 var800a08a8 = 0; -u32 var800a08ac = 0; -u32 var800a08b0 = 0; -u32 var800a08b4 = 0; -u32 var800a08b8 = 0; -u32 var800a08bc = 0; -u32 var800a08c0 = 0; -u32 var800a08c4 = 0; -u32 var800a08c8 = 0; -u32 var800a08cc = 0; -u32 var800a08d0 = 0; -u32 var800a08d4 = 0; -u32 var800a08d8 = 0; -u32 var800a08dc = 0; -u32 var800a08e0 = 0; -u32 var800a08e4 = 0; -u32 var800a08e8 = 0; -u32 var800a08ec = 0; -u32 var800a08f0 = 0; -u32 var800a08f4 = 0; -u32 var800a08f8 = 0; -u32 var800a08fc = 0; -u32 var800a0900 = 0; -u32 var800a0904 = 0; -u32 var800a0908 = 0; -u32 var800a090c = 0; -u32 var800a0910 = 0; -u32 var800a0914 = 0; -u32 var800a0918 = 0; -u32 var800a091c = 0; -u32 var800a0920 = 0; -u32 var800a0924 = 0; -u32 var800a0928 = 0; -u32 var800a092c = 0; -u32 var800a0930 = 0; -u32 var800a0934 = 0; -u32 var800a0938 = 0; -u32 var800a093c = 0; -u32 var800a0940 = 0; -u32 var800a0944 = 0; -u32 var800a0948 = 0; -u32 var800a094c = 0; -u32 var800a0950 = 0; -u32 var800a0954 = 0; -u32 var800a0958 = 0; -u32 var800a095c = 0; -u32 var800a0960 = 0; -u32 var800a0964 = 0; -u32 var800a0968 = 0; -u32 var800a096c = 0; -u32 var800a0970 = 0; -u32 var800a0974 = 0; -u32 var800a0978 = 0; -u32 var800a097c = 0; -u32 var800a0980 = 0; -u32 var800a0984 = 0; -u32 var800a0988 = 0; -u32 var800a098c = 0; -u32 var800a0990 = 0; -u32 var800a0994 = 0; -u32 var800a0998 = 0; -u32 var800a099c = 0; -u32 var800a09a0 = 0; -u32 var800a09a4 = 0; -u32 var800a09a8 = 0; -u32 var800a09ac = 0; -u32 var800a09b0 = 0; -u32 var800a09b4 = 0; -u32 var800a09b8 = 0; -u32 var800a09bc = 0; -u32 var800a09c0 = 0; -u32 var800a09c4 = 0; -u32 var800a09c8 = 0; -u32 var800a09cc = 0; -u32 var800a09d0 = 0; -u32 var800a09d4 = 0; -u32 var800a09d8 = 0; -u32 var800a09dc = 0; -u32 var800a09e0 = 0; -u32 var800a09e4 = 0; -u32 var800a09e8 = 0; -u32 var800a09ec = 0; -u32 var800a09f0 = 0; -u32 var800a09f4 = 0; -u32 var800a09f8 = 0; -u32 var800a09fc = 0; -u32 var800a0a00 = 0; -u32 var800a0a04 = 0; -u32 var800a0a08 = 0; -u32 var800a0a0c = 0; -u32 var800a0a10 = 0; -u32 var800a0a14 = 0; -u32 var800a0a18 = 0; -u32 var800a0a1c = 0; -u32 var800a0a20 = 0; -u32 var800a0a24 = 0; -u32 var800a0a28 = 0; -u32 var800a0a2c = 0; -u32 var800a0a30 = 0; -u32 var800a0a34 = 0; -u32 var800a0a38 = 0; -u32 var800a0a3c = 0; -u32 var800a0a40 = 0; -u32 var800a0a44 = 0; -u32 var800a0a48 = 0; -u32 var800a0a4c = 0; -u32 var800a0a50 = 0; -u32 var800a0a54 = 0; -u32 var800a0a58 = 0; -u32 var800a0a5c = 0; -u32 var800a0a60 = 0; -u32 var800a0a64 = 0; -u32 var800a0a68 = 0; -u32 var800a0a6c = 0; -u32 var800a0a70 = 0; -u32 var800a0a74 = 0; -u32 var800a0a78 = 0; -u32 var800a0a7c = 0; -u32 var800a0a80 = 0; -u32 var800a0a84 = 0; -u32 var800a0a88 = 0; -u32 var800a0a8c = 0; -u32 var800a0a90 = 0; -u32 var800a0a94 = 0; -u32 var800a0a98 = 0; -u32 var800a0a9c = 0; -u32 var800a0aa0 = 0; -u32 var800a0aa4 = 0; -u32 var800a0aa8 = 0; -u32 var800a0aac = 0; -u32 var800a0ab0 = 0; -u32 var800a0ab4 = 0; -u32 var800a0ab8 = 0; -u32 var800a0abc = 0; -u32 var800a0ac0 = 0; -u32 var800a0ac4 = 0; -u32 var800a0ac8 = 0; -u32 var800a0acc = 0; -u32 var800a0ad0 = 0; -u32 var800a0ad4 = 0; -u32 var800a0ad8 = 0; -u32 var800a0adc = 0; -u32 var800a0ae0 = 0; -u32 var800a0ae4 = 0; -u32 var800a0ae8 = 0; -u32 var800a0aec = 0; -u32 var800a0af0 = 0; -u32 var800a0af4 = 0; -u32 var800a0af8 = 0; -u32 var800a0afc = 0; -u32 var800a0b00 = 0; -u32 var800a0b04 = 0; -u32 var800a0b08 = 0; -u32 var800a0b0c = 0; -u32 var800a0b10 = 0; -u32 var800a0b14 = 0; -u32 var800a0b18 = 0; -u32 var800a0b1c = 0; -u32 var800a0b20 = 0; -u32 var800a0b24 = 0; -u32 var800a0b28 = 0; -u32 var800a0b2c = 0; -u32 var800a0b30 = 0; -u32 var800a0b34 = 0; -u32 var800a0b38 = 0; -u32 var800a0b3c = 0; -u32 var800a0b40 = 0; -u32 var800a0b44 = 0; -u32 var800a0b48 = 0; -u32 var800a0b4c = 0; -u32 var800a0b50 = 0; -u32 var800a0b54 = 0; -u32 var800a0b58 = 0; -u32 var800a0b5c = 0; -u32 var800a0b60 = 0; -u32 var800a0b64 = 0; -u32 var800a0b68 = 0; -u32 var800a0b6c = 0; -u32 var800a0b70 = 0; -u32 var800a0b74 = 0; -u32 var800a0b78 = 0; -u32 var800a0b7c = 0; -u32 var800a0b80 = 0; -u32 var800a0b84 = 0; -u32 var800a0b88 = 0; -u32 var800a0b8c = 0; -u32 var800a0b90 = 0; -u32 var800a0b94 = 0; -u32 var800a0b98 = 0; -u32 var800a0b9c = 0; -u32 var800a0ba0 = 0; -u32 var800a0ba4 = 0; -u32 var800a0ba8 = 0; -u32 var800a0bac = 0; -u32 var800a0bb0 = 0; -u32 var800a0bb4 = 0; -u32 var800a0bb8 = 0; -u32 var800a0bbc = 0; -u32 var800a0bc0 = 0; -u32 var800a0bc4 = 0; -u32 var800a0bc8 = 0; -u32 var800a0bcc = 0; -u32 var800a0bd0 = 0; -u32 var800a0bd4 = 0; -u32 var800a0bd8 = 0; -u32 var800a0bdc = 0; -u32 var800a0be0 = 0; -u32 var800a0be4 = 0; -u32 var800a0be8 = 0; -u32 var800a0bec = 0; -u32 var800a0bf0 = 0; -u32 var800a0bf4 = 0; -u32 var800a0bf8 = 0; -u32 var800a0bfc = 0; -u32 var800a0c00 = 0; -u32 var800a0c04 = 0; -u32 var800a0c08 = 0; -u32 var800a0c0c = 0; -u32 var800a0c10 = 0; -u32 var800a0c14 = 0; -u32 var800a0c18 = 0; -u32 var800a0c1c = 0; -u32 var800a0c20 = 0; -u32 var800a0c24 = 0; -u32 var800a0c28 = 0; -u32 var800a0c2c = 0; -u32 var800a0c30 = 0; -u32 var800a0c34 = 0; -u32 var800a0c38 = 0; -u32 var800a0c3c = 0; -u32 var800a0c40 = 0; -u32 var800a0c44 = 0; -u32 var800a0c48 = 0; -u32 var800a0c4c = 0; -u32 var800a0c50 = 0; -u32 var800a0c54 = 0; -u32 var800a0c58 = 0; -u32 var800a0c5c = 0; -u32 var800a0c60 = 0; -u32 var800a0c64 = 0; -u32 var800a0c68 = 0; -u32 var800a0c6c = 0; -u32 var800a0c70 = 0; -u32 var800a0c74 = 0; -u32 var800a0c78 = 0; -u32 var800a0c7c = 0; -u32 var800a0c80 = 0; -u32 var800a0c84 = 0; -u32 var800a0c88 = 0; -u32 var800a0c8c = 0; -u32 var800a0c90 = 0; -u32 var800a0c94 = 0; -u32 var800a0c98 = 0; -u32 var800a0c9c = 0; -u32 var800a0ca0 = 0; -u32 var800a0ca4 = 0; -u32 var800a0ca8 = 0; -u32 var800a0cac = 0; -u32 var800a0cb0 = 0; -u32 var800a0cb4 = 0; -u32 var800a0cb8 = 0; -u32 var800a0cbc = 0; -u32 var800a0cc0 = 0; -u32 var800a0cc4 = 0; -u32 var800a0cc8 = 0; -u32 var800a0ccc = 0; -u32 var800a0cd0 = 0; -u32 var800a0cd4 = 0; -u32 var800a0cd8 = 0; -u32 var800a0cdc = 0; -u32 var800a0ce0 = 0; -u32 var800a0ce4 = 0; -u32 var800a0ce8 = 0; -u32 var800a0cec = 0; -u32 var800a0cf0 = 0; -u32 var800a0cf4 = 0; -u32 var800a0cf8 = 0; -u32 var800a0cfc = 0; -u32 var800a0d00 = 0; -u32 var800a0d04 = 0; -u32 var800a0d08 = 0; -u32 var800a0d0c = 0; -u32 var800a0d10 = 0; -u32 var800a0d14 = 0; -u32 var800a0d18 = 0; -u32 var800a0d1c = 0; -u32 var800a0d20 = 0; -u32 var800a0d24 = 0; -u32 var800a0d28 = 0; -u32 var800a0d2c = 0; -u32 var800a0d30 = 0; -u32 var800a0d34 = 0; -u32 var800a0d38 = 0; -u32 var800a0d3c = 0; -u32 var800a0d40 = 0; -u32 var800a0d44 = 0; -u32 var800a0d48 = 0; -u32 var800a0d4c = 0; -u32 var800a0d50 = 0; -u32 var800a0d54 = 0; -u32 var800a0d58 = 0; -u32 var800a0d5c = 0; -u32 var800a0d60 = 0; -u32 var800a0d64 = 0; -u32 var800a0d68 = 0; -u32 var800a0d6c = 0; -u32 var800a0d70 = 0; -u32 var800a0d74 = 0; -u32 var800a0d78 = 0; -u32 var800a0d7c = 0; -u32 var800a0d80 = 0; -u32 var800a0d84 = 0; -u32 var800a0d88 = 0; -u32 var800a0d8c = 0; -u32 var800a0d90 = 0; -u32 var800a0d94 = 0; -u32 var800a0d98 = 0; -u32 var800a0d9c = 0; -u32 var800a0da0 = 0; -u32 var800a0da4 = 0; -u32 var800a0da8 = 0; -u32 var800a0dac = 0; -u32 var800a0db0 = 0; -u32 var800a0db4 = 0; -u32 var800a0db8 = 0; -u32 var800a0dbc = 0; -u32 var800a0dc0 = 0; -u32 var800a0dc4 = 0; -u32 var800a0dc8 = 0; -u32 var800a0dcc = 0; -u32 var800a0dd0 = 0; -u32 var800a0dd4 = 0; -u32 var800a0dd8 = 0; -u32 var800a0ddc = 0; -u32 var800a0de0 = 0; -u32 var800a0de4 = 0; -u32 var800a0de8 = 0; -u32 var800a0dec = 0; -u32 var800a0df0 = 0; -u32 var800a0df4 = 0; -u32 var800a0df8 = 0; -u32 var800a0dfc = 0; -u32 var800a0e00 = 0; -u32 var800a0e04 = 0; -u32 var800a0e08 = 0; -u32 var800a0e0c = 0; -u32 var800a0e10 = 0; -u32 var800a0e14 = 0; -u32 var800a0e18 = 0; -u32 var800a0e1c = 0; -u32 var800a0e20 = 0; -u32 var800a0e24 = 0; -u32 var800a0e28 = 0; -u32 var800a0e2c = 0; -u32 var800a0e30 = 0; -u32 var800a0e34 = 0; -u32 var800a0e38 = 0; -u32 var800a0e3c = 0; -u32 var800a0e40 = 0; -u32 var800a0e44 = 0; -u32 var800a0e48 = 0; -u32 var800a0e4c = 0; -u32 var800a0e50 = 0; -u32 var800a0e54 = 0; -u32 var800a0e58 = 0; -u32 var800a0e5c = 0; -u32 var800a0e60 = 0; -u32 var800a0e64 = 0; -u32 var800a0e68 = 0; -u32 var800a0e6c = 0; -u32 var800a0e70 = 0; -u32 var800a0e74 = 0; -u32 var800a0e78 = 0; -u32 var800a0e7c = 0; -u32 var800a0e80 = 0; -u32 var800a0e84 = 0; -u32 var800a0e88 = 0; -u32 var800a0e8c = 0; -u32 var800a0e90 = 0; -u32 var800a0e94 = 0; -u32 var800a0e98 = 0; -u32 var800a0e9c = 0; -u32 var800a0ea0 = 0; -u32 var800a0ea4 = 0; -u32 var800a0ea8 = 0; -u32 var800a0eac = 0; -u32 var800a0eb0 = 0; -u32 var800a0eb4 = 0; -u32 var800a0eb8 = 0; -u32 var800a0ebc = 0; -u32 var800a0ec0 = 0; -u32 var800a0ec4 = 0; -u32 var800a0ec8 = 0; -u32 var800a0ecc = 0; -u32 var800a0ed0 = 0; -u32 var800a0ed4 = 0; -u32 var800a0ed8 = 0; -u32 var800a0edc = 0; -u32 var800a0ee0 = 0; -u32 var800a0ee4 = 0; -u32 var800a0ee8 = 0; -u32 var800a0eec = 0; -u32 var800a0ef0 = 0; -u32 var800a0ef4 = 0; -u32 var800a0ef8 = 0; -u32 var800a0efc = 0; -u32 var800a0f00 = 0; -u32 var800a0f04 = 0; -u32 var800a0f08 = 0; -u32 var800a0f0c = 0; -u32 var800a0f10 = 0; -u32 var800a0f14 = 0; -u32 var800a0f18 = 0; -u32 var800a0f1c = 0; -u32 var800a0f20 = 0; -u32 var800a0f24 = 0; -u32 var800a0f28 = 0; -u32 var800a0f2c = 0; -u32 var800a0f30 = 0; -u32 var800a0f34 = 0; -u32 var800a0f38 = 0; -u32 var800a0f3c = 0; -u32 var800a0f40 = 0; -u32 var800a0f44 = 0; -u32 var800a0f48 = 0; -u32 var800a0f4c = 0; -u32 var800a0f50 = 0; -u32 var800a0f54 = 0; -u32 var800a0f58 = 0; -u32 var800a0f5c = 0; -u32 var800a0f60 = 0; -u32 var800a0f64 = 0; -u32 var800a0f68 = 0; -u32 var800a0f6c = 0; -u32 var800a0f70 = 0; -u32 var800a0f74 = 0; -u32 var800a0f78 = 0; -u32 var800a0f7c = 0; -u32 var800a0f80 = 0; -u32 var800a0f84 = 0; -u32 var800a0f88 = 0; -u32 var800a0f8c = 0; -u32 var800a0f90 = 0; -u32 var800a0f94 = 0; -u32 var800a0f98 = 0; -u32 var800a0f9c = 0; -u32 var800a0fa0 = 0; -u32 var800a0fa4 = 0; -u32 var800a0fa8 = 0; -u32 var800a0fac = 0; -u32 var800a0fb0 = 0; -u32 var800a0fb4 = 0; -u32 var800a0fb8 = 0; -u32 var800a0fbc = 0; -u32 var800a0fc0 = 0; -u32 var800a0fc4 = 0; -u32 var800a0fc8 = 0; -u32 var800a0fcc = 0; -u32 var800a0fd0 = 0; -u32 var800a0fd4 = 0; -u32 var800a0fd8 = 0; -u32 var800a0fdc = 0; -u32 var800a0fe0 = 0; -u32 var800a0fe4 = 0; -u32 var800a0fe8 = 0; -u32 var800a0fec = 0; -u32 var800a0ff0 = 0; -u32 var800a0ff4 = 0; -u32 var800a0ff8 = 0; -u32 var800a0ffc = 0; -u32 var800a1000 = 0; -u32 var800a1004 = 0; -u32 var800a1008 = 0; -u32 var800a100c = 0; -u32 var800a1010 = 0; -u32 var800a1014 = 0; -u32 var800a1018 = 0; -u32 var800a101c = 0; -u32 var800a1020 = 0; -u32 var800a1024 = 0; -u32 var800a1028 = 0; -u32 var800a102c = 0; -u32 var800a1030 = 0; -u32 var800a1034 = 0; -u32 var800a1038 = 0; -u32 var800a103c = 0; -u32 var800a1040 = 0; -u32 var800a1044 = 0; -u32 var800a1048 = 0; -u32 var800a104c = 0; -u32 var800a1050 = 0; -u32 var800a1054 = 0; -u32 var800a1058 = 0; -u32 var800a105c = 0; -u32 var800a1060 = 0; -u32 var800a1064 = 0; -u32 var800a1068 = 0; -u32 var800a106c = 0; -u32 var800a1070 = 0; -u32 var800a1074 = 0; -u32 var800a1078 = 0; -u32 var800a107c = 0; -u32 var800a1080 = 0; -u32 var800a1084 = 0; -u32 var800a1088 = 0; -u32 var800a108c = 0; -u32 var800a1090 = 0; -u32 var800a1094 = 0; -u32 var800a1098 = 0; -u32 var800a109c = 0; -u32 var800a10a0 = 0; -u32 var800a10a4 = 0; -u32 var800a10a8 = 0; -u32 var800a10ac = 0; -u32 var800a10b0 = 0; -u32 var800a10b4 = 0; -u32 var800a10b8 = 0; -u32 var800a10bc = 0; -u32 var800a10c0 = 0; -u32 var800a10c4 = 0; -u32 var800a10c8 = 0; -u32 var800a10cc = 0; -u32 var800a10d0 = 0; -u32 var800a10d4 = 0; -u32 var800a10d8 = 0; -u32 var800a10dc = 0; -u32 var800a10e0 = 0; -u32 var800a10e4 = 0; -u32 var800a10e8 = 0; -u32 var800a10ec = 0; -u32 var800a10f0 = 0; -u32 var800a10f4 = 0; -u32 var800a10f8 = 0; -u32 var800a10fc = 0; -u32 var800a1100 = 0; -u32 var800a1104 = 0; -u32 var800a1108 = 0; -u32 var800a110c = 0; -u32 var800a1110 = 0; -u32 var800a1114 = 0; -u32 var800a1118 = 0; -u32 var800a111c = 0; -u32 var800a1120 = 0; -u32 var800a1124 = 0; -u32 var800a1128 = 0; -u32 var800a112c = 0; -u32 var800a1130 = 0; -u32 var800a1134 = 0; -u32 var800a1138 = 0; -u32 var800a113c = 0; -u32 var800a1140 = 0; -u32 var800a1144 = 0; -u32 var800a1148 = 0; -u32 var800a114c = 0; -u32 var800a1150 = 0; -u32 var800a1154 = 0; -u32 var800a1158 = 0; -u32 var800a115c = 0; -u32 var800a1160 = 0; -u32 var800a1164 = 0; -u32 var800a1168 = 0; -u32 var800a116c = 0; -u32 var800a1170 = 0; -u32 var800a1174 = 0; -u32 var800a1178 = 0; -u32 var800a117c = 0; -u32 var800a1180 = 0; -u32 var800a1184 = 0; -u32 var800a1188 = 0; -u32 var800a118c = 0; -u32 var800a1190 = 0; -u32 var800a1194 = 0; -u32 var800a1198 = 0; -u32 var800a119c = 0; -u32 var800a11a0 = 0; -u32 var800a11a4 = 0; -u32 var800a11a8 = 0; -u32 var800a11ac = 0; -u32 var800a11b0 = 0; -u32 var800a11b4 = 0; -u32 var800a11b8 = 0; -u32 var800a11bc = 0; -u32 var800a11c0 = 0; -u32 var800a11c4 = 0; -u32 var800a11c8 = 0; -u32 var800a11cc = 0; -u32 var800a11d0 = 0; -u32 var800a11d4 = 0; -u32 var800a11d8 = 0; -u32 var800a11dc = 0; -u32 var800a11e0 = 0; -u32 var800a11e4 = 0; -u32 var800a11e8 = 0; -u32 var800a11ec = 0; -u32 var800a11f0 = 0; -u32 var800a11f4 = 0; -u32 var800a11f8 = 0; -u32 var800a11fc = 0; -u32 var800a1200 = 0; -u32 var800a1204 = 0; -u32 var800a1208 = 0; -u32 var800a120c = 0; -u32 var800a1210 = 0; -u32 var800a1214 = 0; -u32 var800a1218 = 0; -u32 var800a121c = 0; -u32 var800a1220 = 0; -u32 var800a1224 = 0; -u32 var800a1228 = 0; -u32 var800a122c = 0; -u32 var800a1230 = 0; -u32 var800a1234 = 0; -u32 var800a1238 = 0; -u32 var800a123c = 0; -u32 var800a1240 = 0; -u32 var800a1244 = 0; -u32 var800a1248 = 0; -u32 var800a124c = 0; -u32 var800a1250 = 0; -u32 var800a1254 = 0; -u32 var800a1258 = 0; -u32 var800a125c = 0; -u32 var800a1260 = 0; -u32 var800a1264 = 0; -u32 var800a1268 = 0; -u32 var800a126c = 0; -u32 var800a1270 = 0; -u32 var800a1274 = 0; -u32 var800a1278 = 0; -u32 var800a127c = 0; -u32 var800a1280 = 0; -u32 var800a1284 = 0; -u32 var800a1288 = 0; -u32 var800a128c = 0; -u32 var800a1290 = 0; -u32 var800a1294 = 0; -u32 var800a1298 = 0; -u32 var800a129c = 0; -u32 var800a12a0 = 0; -u32 var800a12a4 = 0; -u32 var800a12a8 = 0; -u32 var800a12ac = 0; -u32 var800a12b0 = 0; -u32 var800a12b4 = 0; -u32 var800a12b8 = 0; -u32 var800a12bc = 0; -u32 var800a12c0 = 0; -u32 var800a12c4 = 0; -u32 var800a12c8 = 0; -u32 var800a12cc = 0; -u32 var800a12d0 = 0; -u32 var800a12d4 = 0; -u32 var800a12d8 = 0; -u32 var800a12dc = 0; -u32 var800a12e0 = 0; -u32 var800a12e4 = 0; -u32 var800a12e8 = 0; -u32 var800a12ec = 0; -u32 var800a12f0 = 0; -u32 var800a12f4 = 0; -u32 var800a12f8 = 0; -u32 var800a12fc = 0; -u32 var800a1300 = 0; -u32 var800a1304 = 0; -u32 var800a1308 = 0; -u32 var800a130c = 0; -u32 var800a1310 = 0; -u32 var800a1314 = 0; -u32 var800a1318 = 0; -u32 var800a131c = 0; -u32 var800a1320 = 0; -u32 var800a1324 = 0; -u32 var800a1328 = 0; -u32 var800a132c = 0; -u32 var800a1330 = 0; -u32 var800a1334 = 0; -u32 var800a1338 = 0; -u32 var800a133c = 0; -u32 var800a1340 = 0; -u32 var800a1344 = 0; -u32 var800a1348 = 0; -u32 var800a134c = 0; -u32 var800a1350 = 0; -u32 var800a1354 = 0; -u32 var800a1358 = 0; -u32 var800a135c = 0; -u32 var800a1360 = 0; -u32 var800a1364 = 0; -u32 var800a1368 = 0; -u32 var800a136c = 0; -u32 var800a1370 = 0; -u32 var800a1374 = 0; -u32 var800a1378 = 0; -u32 var800a137c = 0; -u32 var800a1380 = 0; -u32 var800a1384 = 0; -u32 var800a1388 = 0; -u32 var800a138c = 0; -u32 var800a1390 = 0; -u32 var800a1394 = 0; -u32 var800a1398 = 0; -u32 var800a139c = 0; -u32 var800a13a0 = 0; -u32 var800a13a4 = 0; -u32 var800a13a8 = 0; -u32 var800a13ac = 0; -u32 var800a13b0 = 0; -u32 var800a13b4 = 0; -u32 var800a13b8 = 0; -u32 var800a13bc = 0; -u32 var800a13c0 = 0; -u32 var800a13c4 = 0; -u32 var800a13c8 = 0; -u32 var800a13cc = 0; -u32 var800a13d0 = 0; -u32 var800a13d4 = 0; -u32 var800a13d8 = 0; -u32 var800a13dc = 0; -u32 var800a13e0 = 0; -u32 var800a13e4 = 0; -u32 var800a13e8 = 0; -u32 var800a13ec = 0; -u32 var800a13f0 = 0; -u32 var800a13f4 = 0; -u32 var800a13f8 = 0; -u32 var800a13fc = 0; -u32 var800a1400 = 0; -u32 var800a1404 = 0; -u32 var800a1408 = 0; -u32 var800a140c = 0; -u32 var800a1410 = 0; -u32 var800a1414 = 0; -u32 var800a1418 = 0; -u32 var800a141c = 0; -u32 var800a1420 = 0; -u32 var800a1424 = 0; -u32 var800a1428 = 0; -u32 var800a142c = 0; -u32 var800a1430 = 0; -u32 var800a1434 = 0; -u32 var800a1438 = 0; -u32 var800a143c = 0; -u32 var800a1440 = 0; -u32 var800a1444 = 0; -u32 var800a1448 = 0; -u32 var800a144c = 0; -u32 var800a1450 = 0; -u32 var800a1454 = 0; -u32 var800a1458 = 0; -u32 var800a145c = 0; -u32 var800a1460 = 0; -u32 var800a1464 = 0; -u32 var800a1468 = 0; -u32 var800a146c = 0; -u32 var800a1470 = 0; -u32 var800a1474 = 0; -u32 var800a1478 = 0; -u32 var800a147c = 0; -u32 var800a1480 = 0; -u32 var800a1484 = 0; -u32 var800a1488 = 0; -u32 var800a148c = 0; -u32 var800a1490 = 0; -u32 var800a1494 = 0; -u32 var800a1498 = 0; -u32 var800a149c = 0; -u32 var800a14a0 = 0; -u32 var800a14a4 = 0; -u32 var800a14a8 = 0; -u32 var800a14ac = 0; -u32 var800a14b0 = 0; -u32 var800a14b4 = 0; -u32 var800a14b8 = 0; -u32 var800a14bc = 0; -u32 var800a14c0 = 0; -u32 var800a14c4 = 0; -u32 var800a14c8 = 0; -u32 var800a14cc = 0; -u32 var800a14d0 = 0; -u32 var800a14d4 = 0; -u32 var800a14d8 = 0; -u32 var800a14dc = 0; -u32 var800a14e0 = 0; -u32 var800a14e4 = 0; -u32 var800a14e8 = 0; -u32 var800a14ec = 0; -u32 var800a14f0 = 0; -u32 var800a14f4 = 0; -u32 var800a14f8 = 0; -u32 var800a14fc = 0; -u32 var800a1500 = 0; -u32 var800a1504 = 0; -u32 var800a1508 = 0; -u32 var800a150c = 0; -u32 var800a1510 = 0; -u32 var800a1514 = 0; -u32 var800a1518 = 0; -u32 var800a151c = 0; -u32 var800a1520 = 0; -u32 var800a1524 = 0; -u32 var800a1528 = 0; -u32 var800a152c = 0; -u32 var800a1530 = 0; -u32 var800a1534 = 0; -u32 var800a1538 = 0; -u32 var800a153c = 0; -u32 var800a1540 = 0; -u32 var800a1544 = 0; -u32 var800a1548 = 0; -u32 var800a154c = 0; -u32 var800a1550 = 0; -u32 var800a1554 = 0; -u32 var800a1558 = 0; -u32 var800a155c = 0; -u32 var800a1560 = 0; -u32 var800a1564 = 0; -u32 var800a1568 = 0; -u32 var800a156c = 0; -u32 var800a1570 = 0; -u32 var800a1574 = 0; -u32 var800a1578 = 0; -u32 var800a157c = 0; -u32 var800a1580 = 0; -u32 var800a1584 = 0; -u32 var800a1588 = 0; -u32 var800a158c = 0; -u32 var800a1590 = 0; -u32 var800a1594 = 0; -u32 var800a1598 = 0; -u32 var800a159c = 0; -u32 var800a15a0 = 0; -u32 var800a15a4 = 0; -u32 var800a15a8 = 0; -u32 var800a15ac = 0; -u32 var800a15b0 = 0; -u32 var800a15b4 = 0; -u32 var800a15b8 = 0; -u32 var800a15bc = 0; -u32 var800a15c0 = 0; -u32 var800a15c4 = 0; -u32 var800a15c8 = 0; -u32 var800a15cc = 0; -u32 var800a15d0 = 0; -u32 var800a15d4 = 0; -u32 var800a15d8 = 0; -u32 var800a15dc = 0; -u32 var800a15e0 = 0; -u32 var800a15e4 = 0; -u32 var800a15e8 = 0; -u32 var800a15ec = 0; -u32 var800a15f0 = 0; -u32 var800a15f4 = 0; -u32 var800a15f8 = 0; -u32 var800a15fc = 0; -u32 var800a1600 = 0; -u32 var800a1604 = 0; -u32 var800a1608 = 0; -u32 var800a160c = 0; -u32 var800a1610 = 0; -u32 var800a1614 = 0; -u32 var800a1618 = 0; -u32 var800a161c = 0; -u32 var800a1620 = 0; -u32 var800a1624 = 0; -u32 var800a1628 = 0; -u32 var800a162c = 0; -u32 var800a1630 = 0; -u32 var800a1634 = 0; -u32 var800a1638 = 0; -u32 var800a163c = 0; -u32 var800a1640 = 0; -u32 var800a1644 = 0; -u32 var800a1648 = 0; -u32 var800a164c = 0; -u32 var800a1650 = 0; -u32 var800a1654 = 0; -u32 var800a1658 = 0; -u32 var800a165c = 0; -u32 var800a1660 = 0; -u32 var800a1664 = 0; -u32 var800a1668 = 0; -u32 var800a166c = 0; -u32 var800a1670 = 0; -u32 var800a1674 = 0; -u32 var800a1678 = 0; -u32 var800a167c = 0; -u32 var800a1680 = 0; -u32 var800a1684 = 0; -u32 var800a1688 = 0; -u32 var800a168c = 0; -u32 var800a1690 = 0; -u32 var800a1694 = 0; -u32 var800a1698 = 0; -u32 var800a169c = 0; -u32 var800a16a0 = 0; -u32 var800a16a4 = 0; -u32 var800a16a8 = 0; -u32 var800a16ac = 0; -u32 var800a16b0 = 0; -u32 var800a16b4 = 0; -u32 var800a16b8 = 0; -u32 var800a16bc = 0; -u32 var800a16c0 = 0; -u32 var800a16c4 = 0; -u32 var800a16c8 = 0; -u32 var800a16cc = 0; -u32 var800a16d0 = 0; -u32 var800a16d4 = 0; -u32 var800a16d8 = 0; -u32 var800a16dc = 0; -u32 var800a16e0 = 0; -u32 var800a16e4 = 0; -u32 var800a16e8 = 0; -u32 var800a16ec = 0; -u32 var800a16f0 = 0; -u32 var800a16f4 = 0; -u32 var800a16f8 = 0; -u32 var800a16fc = 0; -u32 var800a1700 = 0; -u32 var800a1704 = 0; -u32 var800a1708 = 0; -u32 var800a170c = 0; -u32 var800a1710 = 0; -u32 var800a1714 = 0; -u32 var800a1718 = 0; -u32 var800a171c = 0; -u32 var800a1720 = 0; -u32 var800a1724 = 0; -u32 var800a1728 = 0; -u32 var800a172c = 0; -u32 var800a1730 = 0; -u32 var800a1734 = 0; -u32 var800a1738 = 0; -u32 var800a173c = 0; -u32 var800a1740 = 0; -u32 var800a1744 = 0; -u32 var800a1748 = 0; -u32 var800a174c = 0; -u32 var800a1750 = 0; -u32 var800a1754 = 0; -u32 var800a1758 = 0; -u32 var800a175c = 0; -u32 var800a1760 = 0; -u32 var800a1764 = 0; -u32 var800a1768 = 0; -u32 var800a176c = 0; -u32 var800a1770 = 0; -u32 var800a1774 = 0; -u32 var800a1778 = 0; -u32 var800a177c = 0; -u32 var800a1780 = 0; -u32 var800a1784 = 0; -u32 var800a1788 = 0; -u32 var800a178c = 0; -u32 var800a1790 = 0; -u32 var800a1794 = 0; -u32 var800a1798 = 0; -u32 var800a179c = 0; -u32 var800a17a0 = 0; -u32 var800a17a4 = 0; -u32 var800a17a8 = 0; -u32 var800a17ac = 0; -u32 var800a17b0 = 0; -u32 var800a17b4 = 0; -u32 var800a17b8 = 0; -u32 var800a17bc = 0; -u32 var800a17c0 = 0; -u32 var800a17c4 = 0; -u32 var800a17c8 = 0; -u32 var800a17cc = 0; -u32 var800a17d0 = 0; -u32 var800a17d4 = 0; -u32 var800a17d8 = 0; -u32 var800a17dc = 0; -u32 var800a17e0 = 0; -u32 var800a17e4 = 0; -u32 var800a17e8 = 0; -u32 var800a17ec = 0; -u32 var800a17f0 = 0; -u32 var800a17f4 = 0; -u32 var800a17f8 = 0; -u32 var800a17fc = 0; -u32 var800a1800 = 0; -u32 var800a1804 = 0; -u32 var800a1808 = 0; -u32 var800a180c = 0; -u32 var800a1810 = 0; -u32 var800a1814 = 0; -u32 var800a1818 = 0; -u32 var800a181c = 0; -u32 var800a1820 = 0; -u32 var800a1824 = 0; -u32 var800a1828 = 0; -u32 var800a182c = 0; -u32 var800a1830 = 0; -u32 var800a1834 = 0; -u32 var800a1838 = 0; -u32 var800a183c = 0; -u32 var800a1840 = 0; -u32 var800a1844 = 0; -u32 var800a1848 = 0; -u32 var800a184c = 0; -u32 var800a1850 = 0; -u32 var800a1854 = 0; -u32 var800a1858 = 0; -u32 var800a185c = 0; -u32 var800a1860 = 0; -u32 var800a1864 = 0; -u32 var800a1868 = 0; -u32 var800a186c = 0; -u32 var800a1870 = 0; -u32 var800a1874 = 0; -u32 var800a1878 = 0; -u32 var800a187c = 0; -u32 var800a1880 = 0; -u32 var800a1884 = 0; -u32 var800a1888 = 0; -u32 var800a188c = 0; -u32 var800a1890 = 0; -u32 var800a1894 = 0; -u32 var800a1898 = 0; -u32 var800a189c = 0; -u32 var800a18a0 = 0; -u32 var800a18a4 = 0; -u32 var800a18a8 = 0; -u32 var800a18ac = 0; -u32 var800a18b0 = 0; -u32 var800a18b4 = 0; -u32 var800a18b8 = 0; -u32 var800a18bc = 0; -u32 var800a18c0 = 0; -u32 var800a18c4 = 0; -u32 var800a18c8 = 0; -u32 var800a18cc = 0; -u32 var800a18d0 = 0; -u32 var800a18d4 = 0; -u32 var800a18d8 = 0; -u32 var800a18dc = 0; -u32 var800a18e0 = 0; -u32 var800a18e4 = 0; -u32 var800a18e8 = 0; -u32 var800a18ec = 0; -u32 var800a18f0 = 0; -u32 var800a18f4 = 0; -u32 var800a18f8 = 0; -u32 var800a18fc = 0; -u32 var800a1900 = 0; -u32 var800a1904 = 0; -u32 var800a1908 = 0; -u32 var800a190c = 0; -u32 var800a1910 = 0; -u32 var800a1914 = 0; -u32 var800a1918 = 0; -u32 var800a191c = 0; -u32 var800a1920 = 0; -u32 var800a1924 = 0; -u32 var800a1928 = 0; -u32 var800a192c = 0; -u32 var800a1930 = 0; -u32 var800a1934 = 0; -u32 var800a1938 = 0; -u32 var800a193c = 0; -u32 var800a1940 = 0; -u32 var800a1944 = 0; -u32 var800a1948 = 0; -u32 var800a194c = 0; -u32 var800a1950 = 0; -u32 var800a1954 = 0; -u32 var800a1958 = 0; -u32 var800a195c = 0; -u32 var800a1960 = 0; -u32 var800a1964 = 0; -u32 var800a1968 = 0; -u32 var800a196c = 0; -u32 var800a1970 = 0; -u32 var800a1974 = 0; -u32 var800a1978 = 0; -u32 var800a197c = 0; -u32 var800a1980 = 0; -u32 var800a1984 = 0; -u32 var800a1988 = 0; -u32 var800a198c = 0; -u32 var800a1990 = 0; -u32 var800a1994 = 0; -u32 var800a1998 = 0; -u32 var800a199c = 0; -u32 var800a19a0 = 0; -u32 var800a19a4 = 0; -u32 var800a19a8 = 0; -u32 var800a19ac = 0; -u32 var800a19b0 = 0; -u32 var800a19b4 = 0; -u32 var800a19b8 = 0; -u32 var800a19bc = 0; +struct menustackitem g_MenuStack[4] = {0, 0, 0, 0}; u32 var800a19c0 = 0; u32 var800a19c4 = 0; u32 var800a19c8 = 0; diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index ae6a94b65..bf6e34ffb 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -341,7 +341,6 @@ extern struct g_vars g_Vars; extern s32 g_NumTags; extern struct tag **g_TagPtrs; -extern u32 var8008de24; extern u32 var8008de38; extern struct bootbufferthing var8008de48[3]; extern s32 var8008fa6c; @@ -381,13 +380,6 @@ extern u32 var8008faa8; extern OSThread var8008fac0; extern u32 var8008fdf0; extern OSThread var8008fe00; -extern u32 var80090004; -extern u32 var80090008; -extern u32 var8009000c; -extern u32 var80090010; -extern u32 var80090018; -extern u32 var8009003c; -extern u32 var80090068; extern u32 var80090230; extern u32 var80090248; extern u32 var80090260; @@ -405,7 +397,6 @@ extern u32 var80090ad0; extern u32 var80090ae8; extern u32 var80090b10; extern u32 var80090b14; -extern u32 var80090ff8; extern u32 var800914d8; extern u32 var80091558; extern u32 var80091568; @@ -429,7 +420,6 @@ extern u32 var80091900; extern u32 var80091910; extern u32 var80091924; extern u32 var80091f50; -extern u32 var800923a4; extern u32 var800926d0; extern u32 var800926e8; extern u32 var80092828; @@ -645,44 +635,10 @@ extern u32 var8009dfc0; extern u32 var8009dfc8; extern u32 var8009dfd4; extern struct missionconfig g_MissionConfig; -extern u32 var8009e000; -extern struct menustackitem g_MenuStack[]; -extern u32 var8009f6b0; -extern u32 var8009f800; -extern u32 var8009ffe0; -extern u32 var8009fffc; -extern u32 var800a0004; -extern u32 var800a0008; -extern u32 var800a000c; -extern u32 var800a0010; -extern u32 var800a0014; -extern u32 var800a0024; -extern u32 var800a0028; -extern u32 var800a0040; -extern u32 var800a0048; -extern u32 var800a0068; -extern u32 var800a007c; -extern u32 var800a008c; -extern u32 var800a010c; -extern u32 var800a044c; -extern u32 var800a045c; -extern u32 var800a0478; -extern u32 var800a0520; -extern u32 var800a0610; -extern u32 var800a0638; -extern u32 var800a07a4; -extern u32 var800a0814; -extern u32 var800a0884; -extern u32 var800a0b50; -extern u32 var800a0ddc; -extern u32 var800a0fb8; -extern u32 var800a1390; -extern u32 var800a1660; -extern u32 var800a1794; +extern struct menustackitem g_MenuStack[4]; extern u32 var800a19c0; extern u32 var800a19c4; extern u32 var800a19dc; -extern u32 var800a1bb0; extern u32 var800a2038; extern u32 var800a203c; extern u32 var800a2040; diff --git a/src/include/types.h b/src/include/types.h index 0b3fa391e..3b65ee763 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -3359,14 +3359,14 @@ struct fireslot { /*0x2c*/ u32 unk2c; }; -struct menustackitem00 { +struct menustackitem4f8 { struct menu_dialog *dialog; u32 unk04; struct menu_item *item; }; struct menustackitem { - /*0x000*/ struct menustackitem00 *unk00; + /*0x000*/ u32 unk000; /*0x004*/ u32 unk004; /*0x008*/ u32 unk008; /*0x00c*/ u32 unk00c; @@ -3684,7 +3684,7 @@ struct menustackitem { /*0x4ec*/ u32 unk4ec; /*0x4f0*/ u32 unk4f0; /*0x4f4*/ u32 unk4f4; - /*0x4f8*/ u32 unk4f8; + /*0x4f8*/ struct menustackitem4f8 *unk4f8; /*0x4fc*/ u32 unk4fc; /*0x500*/ u32 unk500; /*0x504*/ u32 unk504; @@ -3951,34 +3951,27 @@ struct menustackitem { /*0x918*/ u32 unk918; /*0x91c*/ u32 unk91c; /*0x920*/ u32 unk920; - /*0x924*/ s32 slotindex; - /*0x928*/ u32 slotcount; + /*0x924*/ u32 unk924; + /*0x928*/ u32 unk928; /*0x92c*/ u32 unk92c; /*0x930*/ u32 unk930; /*0x934*/ u32 unk934; /*0x938*/ u32 unk938; /*0x93c*/ u32 unk93c; /*0x940*/ u32 unk940; - /*0x944*/ u8 unk944_00 : 1; - /*0x944*/ u8 unk944_01 : 7; - /*0x945*/ u8 unk945; - /*0x946*/ u8 unk946; - /*0x947*/ u8 unk947; - /*0x948*/ u8 unk948; - /*0x949*/ u8 unk949; - /*0x94a*/ u8 unk94a; + /*0x944*/ u32 unk944; + /*0x948*/ u32 unk948; /*0x94c*/ u32 unk94c; /*0x950*/ u32 unk950; /*0x954*/ u32 unk954; - /*0x958*/ u16 unk958; - /*0x95a*/ u8 unk95a; + /*0x958*/ u32 unk958; /*0x95c*/ u32 unk95c; /*0x960*/ u32 unk960; /*0x964*/ u32 unk964; /*0x968*/ u32 unk968; /*0x96c*/ u32 unk96c; /*0x970*/ u32 unk970; - /*0x974*/ s8 unk974; + /*0x974*/ u32 unk974; /*0x978*/ u32 unk978; /*0x97c*/ u32 unk97c; /*0x980*/ u32 unk980; @@ -4276,30 +4269,34 @@ struct menustackitem { /*0xe10*/ u32 unke10; /*0xe14*/ u32 unke14; /*0xe18*/ u32 unke18; - /*0xe1c*/ u32 unke1c; - /*0xe20*/ u32 unke20; + /*0xe1c*/ s32 slotindex; + /*0xe20*/ u32 slotcount; /*0xe24*/ u32 unke24; /*0xe28*/ u32 unke28; /*0xe2c*/ u32 unke2c; /*0xe30*/ u32 unke30; /*0xe34*/ u32 unke34; /*0xe38*/ u32 unke38; - /*0xe3c*/ u32 unke3c; - /*0xe40*/ u32 unke40; + /*0xe3c*/ u8 unke3c_00 : 1; + /*0xe3c*/ u8 unke3c_01 : 7; + /*0xe3d*/ u8 unke3d; + /*0xe3e*/ u8 unke3e; + /*0xe3f*/ u8 unke3f; + /*0xe40*/ u8 unke40; + /*0xe41*/ u8 unke41; + /*0xe42*/ u8 unke42; /*0xe44*/ u32 unke44; /*0xe48*/ u32 unke48; /*0xe4c*/ u32 unke4c; - /*0xe50*/ u8 unke50; - /*0xe51*/ u8 unke51; + /*0xe50*/ u16 unke50; /*0xe52*/ u8 unke52; - /*0xe53*/ char unke53[1]; /*0xe54*/ u32 unke54; /*0xe58*/ u32 unke58; /*0xe5c*/ u32 unke5c; /*0xe60*/ u32 unke60; /*0xe64*/ u32 unke64; /*0xe68*/ u32 unke68; - /*0xe6c*/ u32 unke6c; + /*0xe6c*/ s8 unke6c; }; struct savefile_solo { diff --git a/src/lib/lib_03050.c b/src/lib/lib_03050.c index 42a86ed82..931f0071c 100644 --- a/src/lib/lib_03050.c +++ b/src/lib/lib_03050.c @@ -147,13 +147,13 @@ glabel func000031d0 /* 31fc: 0c0125e0 */ jal func00049780 /* 3200: afa00044 */ sw $zero,0x44($sp) /* 3204: 94430002 */ lhu $v1,0x2($v0) -/* 3208: 3c018009 */ lui $at,0x8009 +/* 3208: 3c018009 */ lui $at,%hi(var80090290) /* 320c: 2416000e */ addiu $s6,$zero,0xe /* 3210: 14600004 */ bnez $v1,.L00003224 -/* 3214: a4230290 */ sh $v1,0x290($at) +/* 3214: a4230290 */ sh $v1,%lo(var80090290)($at) /* 3218: 24030001 */ addiu $v1,$zero,0x1 -/* 321c: 3c018009 */ lui $at,0x8009 -/* 3220: a4230290 */ sh $v1,0x290($at) +/* 321c: 3c018009 */ lui $at,%hi(var80090290) +/* 3220: a4230290 */ sh $v1,%lo(var80090290)($at) .L00003224: /* 3224: 3c13800a */ lui $s3,%hi(var8009c78c) /* 3228: 3c12800a */ lui $s2,%hi(var8009c788) @@ -182,11 +182,11 @@ glabel func000031d0 /* 3278: 00000000 */ sll $zero,$zero,0x0 /* 327c: 3c038009 */ lui $v1,%hi(var80090290) /* 3280: 94630290 */ lhu $v1,%lo(var80090290)($v1) -/* 3284: 3c018009 */ lui $at,0x8009 +/* 3284: 3c018009 */ lui $at,%hi(var80090290) /* 3288: 2463ffff */ addiu $v1,$v1,-1 /* 328c: 306fffff */ andi $t7,$v1,0xffff /* 3290: 15e0000e */ bnez $t7,.L000032cc -/* 3294: a42f0290 */ sh $t7,0x290($at) +/* 3294: a42f0290 */ sh $t7,%lo(var80090290)($at) /* 3298: 0c0125e0 */ jal func00049780 /* 329c: 00000000 */ sll $zero,$zero,0x0 /* 32a0: 8c580010 */ lw $t8,0x10($v0) @@ -199,8 +199,8 @@ glabel func000031d0 /* 32bc: 8c450014 */ lw $a1,0x14($v0) /* 32c0: 96030002 */ lhu $v1,0x2($s0) .L000032c4: -/* 32c4: 3c018009 */ lui $at,0x8009 -/* 32c8: a4230290 */ sh $v1,0x290($at) +/* 32c4: 3c018009 */ lui $at,%hi(var80090290) +/* 32c8: a4230290 */ sh $v1,%lo(var80090290)($at) .L000032cc: /* 32cc: 8e790000 */ lw $t9,0x0($s3) /* 32d0: 8e500000 */ lw $s0,0x0($s2) diff --git a/src/lib/lib_04a80.c b/src/lib/lib_04a80.c index 9338a387e..128791af9 100644 --- a/src/lib/lib_04a80.c +++ b/src/lib/lib_04a80.c @@ -1009,10 +1009,10 @@ glabel func00005770 /* 57a4: 0000a825 */ or $s5,$zero,$zero /* 57a8: 0c012a18 */ jal __osSiGetAccess /* 57ac: 24110001 */ addiu $s1,$zero,0x1 -/* 57b0: 3c1e800a */ lui $s8,0x800a +/* 57b0: 3c1e800a */ lui $s8,%hi(var8009c820+0x1) /* 57b4: 3c138009 */ lui $s3,%hi(var80090a20) /* 57b8: 26730a20 */ addiu $s3,$s3,%lo(var80090a20) -/* 57bc: 27dec821 */ addiu $s8,$s8,-14303 +/* 57bc: 27dec821 */ addiu $s8,$s8,%lo(var8009c820+0x1) /* 57c0: 00008025 */ or $s0,$zero,$zero /* 57c4: 27b70054 */ addiu $s7,$sp,0x54 /* 57c8: 27b60067 */ addiu $s6,$sp,0x67 @@ -1107,14 +1107,14 @@ GLOBAL_ASM( glabel func000058fc /* 58fc: 27bdfff0 */ addiu $sp,$sp,-16 /* 5900: 3c058009 */ lui $a1,%hi(var80090a20) -/* 5904: 3c01800a */ lui $at,0x800a +/* 5904: 3c01800a */ lui $at,%hi(var8009c820) /* 5908: 24a20a20 */ addiu $v0,$a1,%lo(var80090a20) /* 590c: afa40010 */ sw $a0,0x10($sp) -/* 5910: a024c820 */ sb $a0,-0x37e0($at) +/* 5910: a024c820 */ sb $a0,%lo(var8009c820)($at) /* 5914: 240f0001 */ addiu $t7,$zero,0x1 /* 5918: ac4f003c */ sw $t7,0x3c($v0) -/* 591c: 3c06800a */ lui $a2,0x800a -/* 5920: 24c6c821 */ addiu $a2,$a2,-14303 +/* 591c: 3c06800a */ lui $a2,%hi(var8009c820+0x1) +/* 5920: 24c6c821 */ addiu $a2,$a2,%lo(var8009c820+0x1) /* 5924: 90cd0000 */ lbu $t5,0x0($a2) /* 5928: 241800ff */ addiu $t8,$zero,0xff /* 592c: 24190001 */ addiu $t9,$zero,0x1 @@ -1156,8 +1156,8 @@ glabel func000058fc GLOBAL_ASM( glabel func000059b0 -/* 59b0: 3c07800a */ lui $a3,0x800a -/* 59b4: 24e7c821 */ addiu $a3,$a3,-14303 +/* 59b0: 3c07800a */ lui $a3,%hi(var8009c820+0x1) +/* 59b4: 24e7c821 */ addiu $a3,$a3,%lo(var8009c820+0x1) /* 59b8: 90ee0000 */ lbu $t6,0x0($a3) /* 59bc: 3c038009 */ lui $v1,%hi(var80090a20) /* 59c0: 27bdffe8 */ addiu $sp,$sp,-24 @@ -1294,11 +1294,11 @@ glabel func00005b60 /* 5b60: 27bdffc8 */ addiu $sp,$sp,-56 /* 5b64: afbf001c */ sw $ra,0x1c($sp) /* 5b68: 240e0001 */ addiu $t6,$zero,0x1 -/* 5b6c: 3c018009 */ lui $at,0x8009 +/* 5b6c: 3c018009 */ lui $at,%hi(var80090a60) /* 5b70: afb10018 */ sw $s1,0x18($sp) /* 5b74: afb00014 */ sw $s0,0x14($sp) /* 5b78: 0c012b34 */ jal func0004acd0 -/* 5b7c: ac2e0a60 */ sw $t6,0xa60($at) +/* 5b7c: ac2e0a60 */ sw $t6,%lo(var80090a60)($at) /* 5b80: 3c012000 */ lui $at,0x2000 /* 5b84: 0c012b30 */ jal func0004acc0 /* 5b88: 00412025 */ or $a0,$v0,$at diff --git a/src/lib/lib_05e40.c b/src/lib/lib_05e40.c index 299e6c327..3c2b81969 100644 --- a/src/lib/lib_05e40.c +++ b/src/lib/lib_05e40.c @@ -30,8 +30,8 @@ glabel func00005e40 /* 5e64: 00000000 */ sll $zero,$zero,0x0 /* 5e68: 0c012d20 */ jal osVirtualToPhysical /* 5e6c: 00000000 */ sll $zero,$zero,0x0 -/* 5e70: 3c018009 */ lui $at,0x8009 -/* 5e74: ac220a80 */ sw $v0,0xa80($at) +/* 5e70: 3c018009 */ lui $at,%hi(var80090a80) +/* 5e74: ac220a80 */ sw $v0,%lo(var80090a80)($at) .L00005e78: /* 5e78: 3c048009 */ lui $a0,%hi(var80090a88) /* 5e7c: 8c840a88 */ lw $a0,%lo(var80090a88)($a0) @@ -39,8 +39,8 @@ glabel func00005e40 /* 5e84: 00000000 */ sll $zero,$zero,0x0 /* 5e88: 0c012d20 */ jal osVirtualToPhysical /* 5e8c: 00000000 */ sll $zero,$zero,0x0 -/* 5e90: 3c018009 */ lui $at,0x8009 -/* 5e94: ac220a88 */ sw $v0,0xa88($at) +/* 5e90: 3c018009 */ lui $at,%hi(var80090a88) +/* 5e94: ac220a88 */ sw $v0,%lo(var80090a88)($at) .L00005e98: /* 5e98: 3c048009 */ lui $a0,%hi(var80090a90) /* 5e9c: 8c840a90 */ lw $a0,%lo(var80090a90)($a0) @@ -48,8 +48,8 @@ glabel func00005e40 /* 5ea4: 00000000 */ sll $zero,$zero,0x0 /* 5ea8: 0c012d20 */ jal osVirtualToPhysical /* 5eac: 00000000 */ sll $zero,$zero,0x0 -/* 5eb0: 3c018009 */ lui $at,0x8009 -/* 5eb4: ac220a90 */ sw $v0,0xa90($at) +/* 5eb0: 3c018009 */ lui $at,%hi(var80090a90) +/* 5eb4: ac220a90 */ sw $v0,%lo(var80090a90)($at) .L00005eb8: /* 5eb8: 3c048009 */ lui $a0,%hi(var80090a98) /* 5ebc: 8c840a98 */ lw $a0,%lo(var80090a98)($a0) @@ -57,8 +57,8 @@ glabel func00005e40 /* 5ec4: 00000000 */ sll $zero,$zero,0x0 /* 5ec8: 0c012d20 */ jal osVirtualToPhysical /* 5ecc: 00000000 */ sll $zero,$zero,0x0 -/* 5ed0: 3c018009 */ lui $at,0x8009 -/* 5ed4: ac220a98 */ sw $v0,0xa98($at) +/* 5ed0: 3c018009 */ lui $at,%hi(var80090a98) +/* 5ed4: ac220a98 */ sw $v0,%lo(var80090a98)($at) .L00005ed8: /* 5ed8: 3c048009 */ lui $a0,%hi(var80090a9c) /* 5edc: 8c840a9c */ lw $a0,%lo(var80090a9c)($a0) @@ -66,8 +66,8 @@ glabel func00005e40 /* 5ee4: 00000000 */ sll $zero,$zero,0x0 /* 5ee8: 0c012d20 */ jal osVirtualToPhysical /* 5eec: 00000000 */ sll $zero,$zero,0x0 -/* 5ef0: 3c018009 */ lui $at,0x8009 -/* 5ef4: ac220a9c */ sw $v0,0xa9c($at) +/* 5ef0: 3c018009 */ lui $at,%hi(var80090a9c) +/* 5ef4: ac220a9c */ sw $v0,%lo(var80090a9c)($at) .L00005ef8: /* 5ef8: 3c048009 */ lui $a0,%hi(var80090aa0) /* 5efc: 8c840aa0 */ lw $a0,%lo(var80090aa0)($a0) @@ -75,8 +75,8 @@ glabel func00005e40 /* 5f04: 00000000 */ sll $zero,$zero,0x0 /* 5f08: 0c012d20 */ jal osVirtualToPhysical /* 5f0c: 00000000 */ sll $zero,$zero,0x0 -/* 5f10: 3c018009 */ lui $at,0x8009 -/* 5f14: ac220aa0 */ sw $v0,0xaa0($at) +/* 5f10: 3c018009 */ lui $at,%hi(var80090aa0) +/* 5f14: ac220aa0 */ sw $v0,%lo(var80090aa0)($at) .L00005f18: /* 5f18: 3c048009 */ lui $a0,%hi(var80090aa8) /* 5f1c: 8c840aa8 */ lw $a0,%lo(var80090aa8)($a0) @@ -84,8 +84,8 @@ glabel func00005e40 /* 5f24: 8fbf0014 */ lw $ra,0x14($sp) /* 5f28: 0c012d20 */ jal osVirtualToPhysical /* 5f2c: 00000000 */ sll $zero,$zero,0x0 -/* 5f30: 3c018009 */ lui $at,0x8009 -/* 5f34: ac220aa8 */ sw $v0,0xaa8($at) +/* 5f30: 3c018009 */ lui $at,%hi(var80090aa8) +/* 5f34: ac220aa8 */ sw $v0,%lo(var80090aa8)($at) /* 5f38: 8fbf0014 */ lw $ra,0x14($sp) .L00005f3c: /* 5f3c: 3c028009 */ lui $v0,%hi(var80090a70) diff --git a/src/lib/lib_070d0.c b/src/lib/lib_070d0.c index 894539eca..3cbe59ab0 100644 --- a/src/lib/lib_070d0.c +++ b/src/lib/lib_070d0.c @@ -21,7 +21,7 @@ glabel func000070d0 /* 70d4: afb0001c */ sw $s0,0x1c($sp) /* 70d8: 24100001 */ addiu $s0,$zero,0x1 /* 70dc: afbf003c */ sw $ra,0x3c($sp) -/* 70e0: 3c018009 */ lui $at,0x8009 +/* 70e0: 3c018009 */ lui $at,%hi(var8008ae28) /* 70e4: afb70038 */ sw $s7,0x38($sp) /* 70e8: afb60034 */ sw $s6,0x34($sp) /* 70ec: afb50030 */ sw $s5,0x30($sp) @@ -30,7 +30,7 @@ glabel func000070d0 /* 70f8: afb20024 */ sw $s2,0x24($sp) /* 70fc: afb10020 */ sw $s1,0x20($sp) /* 7100: 0c00222c */ jal func000088b0 -/* 7104: a030ae28 */ sb $s0,-0x51d8($at) +/* 7104: a030ae28 */ sb $s0,%lo(var8008ae28)($at) /* 7108: 0c0005b0 */ jal osGetMemSize /* 710c: 00000000 */ sll $zero,$zero,0x0 /* 7110: 3c010040 */ lui $at,0x40 @@ -42,9 +42,9 @@ glabel func000070d0 /* 7128: 3c097f00 */ lui $t1,%hi(func0f000000) /* 712c: 25290000 */ addiu $t1,$t1,%lo(func0f000000) /* 7130: 250899e0 */ addiu $t0,$t0,-26144 -/* 7134: 3c018009 */ lui $at,0x8009 +/* 7134: 3c018009 */ lui $at,%hi(g_Is4Mb) /* 7138: 01097023 */ subu $t6,$t0,$t1 -/* 713c: a0300af0 */ sb $s0,0xaf0($at) +/* 713c: a0300af0 */ sb $s0,%lo(g_Is4Mb)($at) /* 7140: 25cf0fff */ addiu $t7,$t6,0xfff /* 7144: 3c178006 */ lui $s7,%hi(var8005cf84) /* 7148: 26f7cf84 */ addiu $s7,$s7,%lo(var8005cf84) @@ -67,15 +67,15 @@ glabel func000070d0 /* 7188: 0018cb00 */ sll $t9,$t8,0xc /* 718c: 03216021 */ addu $t4,$t9,$at /* 7190: aef80000 */ sw $t8,0x0($s7) -/* 7194: 3c018009 */ lui $at,0x8009 -/* 7198: ac2c0b04 */ sw $t4,0xb04($at) -/* 719c: 3c018009 */ lui $at,0x8009 +/* 7194: 3c018009 */ lui $at,%hi(var80090b04) +/* 7198: ac2c0b04 */ sw $t4,%lo(var80090b04)($at) +/* 719c: 3c018009 */ lui $at,%hi(var80090b08) /* 71a0: 001868c0 */ sll $t5,$t8,0x3 -/* 71a4: ac270b08 */ sw $a3,0xb08($at) +/* 71a4: ac270b08 */ sw $a3,%lo(var80090b08)($at) /* 71a8: 00ed9823 */ subu $s3,$a3,$t5 -/* 71ac: 3c018009 */ lui $at,0x8009 +/* 71ac: 3c018009 */ lui $at,%hi(var8008ae24) /* 71b0: 25cf0005 */ addiu $t7,$t6,0x5 -/* 71b4: ac33ae24 */ sw $s3,-0x51dc($at) +/* 71b4: ac33ae24 */ sw $s3,%lo(var8008ae24)($at) /* 71b8: 000fc080 */ sll $t8,$t7,0x2 /* 71bc: 00066880 */ sll $t5,$a2,0x2 /* 71c0: 0278c823 */ subu $t9,$s3,$t8 @@ -138,11 +138,11 @@ glabel func000070d0 /* 7290: 326e1fff */ andi $t6,$s3,0x1fff /* 7294: ac4d0000 */ sw $t5,0x0($v0) /* 7298: 026e9823 */ subu $s3,$s3,$t6 -/* 729c: 3c018009 */ lui $at,0x8009 -/* 72a0: ac33ae20 */ sw $s3,-0x51e0($at) -/* 72a4: 3c018009 */ lui $at,0x8009 +/* 729c: 3c018009 */ lui $at,%hi(var8008ae20) +/* 72a0: ac33ae20 */ sw $s3,%lo(var8008ae20)($at) +/* 72a4: 3c018009 */ lui $at,%hi(var80090b00) /* 72a8: 0c000429 */ jal func000010a4 -/* 72ac: ac330b00 */ sw $s3,0xb00($at) +/* 72ac: ac330b00 */ sw $s3,%lo(var80090b00)($at) /* 72b0: 8ee30000 */ lw $v1,0x0($s7) /* 72b4: 3c048009 */ lui $a0,%hi(var8008ae24) /* 72b8: 8c84ae24 */ lw $a0,%lo(var8008ae24)($a0) @@ -172,10 +172,10 @@ glabel func000070d0 /* 730c: 358d003f */ ori $t5,$t4,0x3f /* 7310: 24420fff */ addiu $v0,$v0,0xfff /* 7314: 355750b8 */ ori $s7,$t2,0x50b8 -/* 7318: 3c018009 */ lui $at,0x8009 +/* 7318: 3c018009 */ lui $at,%hi(g_Is4Mb) /* 731c: 39ae003f */ xori $t6,$t5,0x3f /* 7320: 0002c302 */ srl $t8,$v0,0xc -/* 7324: a0200af0 */ sb $zero,0xaf0($at) +/* 7324: a0200af0 */ sb $zero,%lo(g_Is4Mb)($at) /* 7328: 02ee3823 */ subu $a3,$s7,$t6 /* 732c: 3c01fffe */ lui $at,0xfffe /* 7330: 27190005 */ addiu $t9,$t8,0x5 @@ -187,12 +187,12 @@ glabel func000070d0 /* 7348: 026c6823 */ subu $t5,$s3,$t4 /* 734c: 25c6000f */ addiu $a2,$t6,0xf /* 7350: 3c120005 */ lui $s2,0x5 -/* 7354: 3c018009 */ lui $at,0x8009 +/* 7354: 3c018009 */ lui $at,%hi(var80090b00) /* 7358: 27160001 */ addiu $s6,$t8,0x1 /* 735c: 2652fc40 */ addiu $s2,$s2,-960 /* 7360: 34cf000f */ ori $t7,$a2,0xf /* 7364: 01aba824 */ and $s5,$t5,$t3 -/* 7368: ac330b00 */ sw $s3,0xb00($at) +/* 7368: ac330b00 */ sw $s3,%lo(var80090b00)($at) /* 736c: 02a02025 */ or $a0,$s5,$zero /* 7370: 39e6000f */ xori $a2,$t7,0xf /* 7374: 02402825 */ or $a1,$s2,$zero @@ -273,12 +273,12 @@ glabel func000070d0 /* 748c: 1020ffef */ beqz $at,.L0000744c /* 7490: 26100001 */ addiu $s0,$s0,0x1 .L00007494: -/* 7494: 3c018009 */ lui $at,0x8009 -/* 7498: ac200af4 */ sw $zero,0xaf4($at) -/* 749c: 3c018009 */ lui $at,0x8009 -/* 74a0: ac200af8 */ sw $zero,0xaf8($at) -/* 74a4: 3c018009 */ lui $at,0x8009 -/* 74a8: ac200afc */ sw $zero,0xafc($at) +/* 7494: 3c018009 */ lui $at,%hi(var80090af4) +/* 7498: ac200af4 */ sw $zero,%lo(var80090af4)($at) +/* 749c: 3c018009 */ lui $at,%hi(var80090af8) +/* 74a0: ac200af8 */ sw $zero,%lo(var80090af8)($at) +/* 74a4: 3c018009 */ lui $at,%hi(var80090afc) +/* 74a8: ac200afc */ sw $zero,%lo(var80090afc)($at) /* 74ac: 00002025 */ or $a0,$zero,$zero /* 74b0: 0c012054 */ jal func00048150 /* 74b4: 24054000 */ addiu $a1,$zero,0x4000 diff --git a/src/lib/lib_08a20.c b/src/lib/lib_08a20.c index bc63345b2..46184c9e0 100644 --- a/src/lib/lib_08a20.c +++ b/src/lib/lib_08a20.c @@ -33,8 +33,8 @@ glabel func00008a20 /* 8a2c: 0c00062b */ jal func000018ac /* 8a30: 24051000 */ addiu $a1,$zero,0x1000 /* 8a34: 8fbf0014 */ lw $ra,0x14($sp) -/* 8a38: 3c018009 */ lui $at,0x8009 -/* 8a3c: ac2218f0 */ sw $v0,0x18f0($at) +/* 8a38: 3c018009 */ lui $at,%hi(var800918f0) +/* 8a3c: ac2218f0 */ sw $v0,%lo(var800918f0)($at) /* 8a40: 03e00008 */ jr $ra /* 8a44: 27bd0018 */ addiu $sp,$sp,0x18 ); @@ -100,7 +100,7 @@ glabel func00008a48 .L00008b20: /* 8b20: 0044001b */ divu $zero,$v0,$a0 /* 8b24: 00004812 */ mflo $t1 -/* 8b28: 3c018009 */ lui $at,0x8009 +/* 8b28: 3c018009 */ lui $at,%hi(var800918dc) /* 8b2c: 14800002 */ bnez $a0,.L00008b38 /* 8b30: 00000000 */ sll $zero,$zero,0x0 /* 8b34: 0007000d */ break 0x7 @@ -110,10 +110,10 @@ glabel func00008a48 /* 8b40: 254b00b8 */ addiu $t3,$t2,0xb8 /* 8b44: ac6b0000 */ sw $t3,0x0($v1) /* 8b48: 256cff48 */ addiu $t4,$t3,-184 -/* 8b4c: ac2c18dc */ sw $t4,0x18dc($at) -/* 8b50: 3c018009 */ lui $at,0x8009 +/* 8b4c: ac2c18dc */ sw $t4,%lo(var800918dc)($at) +/* 8b50: 3c018009 */ lui $at,%hi(var800918e4) /* 8b54: 256d0050 */ addiu $t5,$t3,0x50 -/* 8b58: ac2d18e4 */ sw $t5,0x18e4($at) +/* 8b58: ac2d18e4 */ sw $t5,%lo(var800918e4)($at) /* 8b5c: 3c018006 */ lui $at,0x8006 /* 8b60: 0c002598 */ jal func00009660 /* 8b64: a020cf94 */ sb $zero,-0x306c($at) @@ -623,9 +623,9 @@ glabel func00009154 /* 929c: 006d082b */ sltu $at,$v1,$t5 /* 92a0: 01014023 */ subu $t0,$t0,$at /* 92a4: aea30004 */ sw $v1,0x4($s5) -/* 92a8: 3c018009 */ lui $at,0x8009 +/* 92a8: 3c018009 */ lui $at,%hi(var80091574) /* 92ac: 006d4823 */ subu $t1,$v1,$t5 -/* 92b0: ac291574 */ sw $t1,0x1574($at) +/* 92b0: ac291574 */ sw $t1,%lo(var80091574)($at) /* 92b4: ac281570 */ sw $t0,0x1570($at) /* 92b8: 240100f0 */ addiu $at,$zero,0xf0 /* 92bc: 0241001a */ div $zero,$s2,$at @@ -642,8 +642,8 @@ glabel func00009154 /* 92e8: 24060000 */ addiu $a2,$zero,0x0 /* 92ec: 0c012b9a */ jal func0004ae68 /* 92f0: 240700f0 */ addiu $a3,$zero,0xf0 -/* 92f4: 3c018009 */ lui $at,0x8009 -/* 92f8: ac221578 */ sw $v0,0x1578($at) +/* 92f4: 3c018009 */ lui $at,%hi(var80091578) +/* 92f8: ac221578 */ sw $v0,%lo(var80091578)($at) /* 92fc: ac23157c */ sw $v1,0x157c($at) /* 9300: 8e890004 */ lw $t1,0x4($s4) /* 9304: 8e880000 */ lw $t0,0x0($s4) @@ -747,8 +747,8 @@ glabel func00009448 /* 9460: 10c00007 */ beqz $a2,.L00009480 /* 9464: afa50034 */ sw $a1,0x34($sp) /* 9468: 3c048009 */ lui $a0,%hi(var8008dbd0) -/* 946c: 3c018009 */ lui $at,0x8009 -/* 9470: ac2618f4 */ sw $a2,0x18f4($at) +/* 946c: 3c018009 */ lui $at,%hi(var800918f4) +/* 9470: ac2618f4 */ sw $a2,%lo(var800918f4)($at) /* 9474: 2484dbd0 */ addiu $a0,$a0,%lo(var8008dbd0) /* 9478: 0c0007ea */ jal func00001fa8 /* 947c: 00c02825 */ or $a1,$a2,$zero @@ -838,7 +838,7 @@ glabel func00009448 /* 95bc: accc0024 */ sw $t4,0x24($a2) /* 95c0: accd002c */ sw $t5,0x2c($a2) /* 95c4: 8fae0024 */ lw $t6,0x24($sp) -/* 95c8: 3c018009 */ lui $at,0x8009 +/* 95c8: 3c018009 */ lui $at,%hi(var800918f4) /* 95cc: acce0040 */ sw $t6,0x40($a2) /* 95d0: 8faf0024 */ lw $t7,0x24($sp) /* 95d4: acc00048 */ sw $zero,0x48($a2) @@ -854,7 +854,7 @@ glabel func00009448 /* 95fc: 8fb00018 */ lw $s0,0x18($sp) /* 9600: 392a0001 */ xori $t2,$t1,0x1 /* 9604: ac4a0000 */ sw $t2,0x0($v0) -/* 9608: ac2618f4 */ sw $a2,0x18f4($at) +/* 9608: ac2618f4 */ sw $a2,%lo(var800918f4)($at) /* 960c: 03e00008 */ jr $ra /* 9610: 27bd0030 */ addiu $sp,$sp,0x30 ); diff --git a/src/lib/lib_09660.c b/src/lib/lib_09660.c index 01e65509e..2cfbcf7ea 100644 --- a/src/lib/lib_09660.c +++ b/src/lib/lib_09660.c @@ -376,12 +376,12 @@ glabel func00009ab0 /* 9ab0: 2405002c */ addiu $a1,$zero,0x2c /* 9ab4: 300f00ff */ andi $t7,$zero,0xff /* 9ab8: 01e50019 */ multu $t7,$a1 -/* 9abc: 3c028009 */ lui $v0,0x8009 -/* 9ac0: 3c038009 */ lui $v1,0x8009 +/* 9abc: 3c028009 */ lui $v0,%hi(var80092874+0x2) +/* 9ac0: 3c038009 */ lui $v1,%hi(var80092874+0x3) /* 9ac4: 3c048006 */ lui $a0,%hi(var8005d530) /* 9ac8: 2484d530 */ addiu $a0,$a0,%lo(var8005d530) -/* 9acc: 24632877 */ addiu $v1,$v1,0x2877 -/* 9ad0: 24422876 */ addiu $v0,$v0,0x2876 +/* 9acc: 24632877 */ addiu $v1,$v1,%lo(var80092874+0x3) +/* 9ad0: 24422876 */ addiu $v0,$v0,%lo(var80092874+0x2) /* 9ad4: 240e0001 */ addiu $t6,$zero,0x1 /* 9ad8: a0400000 */ sb $zero,0x0($v0) /* 9adc: a06e0000 */ sb $t6,0x0($v1) @@ -437,8 +437,8 @@ glabel func00009b50 /* 9b8c: a4a6ffee */ sh $a2,-0x12($a1) /* 9b90: 14a7fff7 */ bne $a1,$a3,.L00009b70 /* 9b94: a4a6fff2 */ sh $a2,-0xe($a1) -/* 9b98: 3c0e8009 */ lui $t6,0x8009 -/* 9b9c: 91ce2876 */ lbu $t6,0x2876($t6) +/* 9b98: 3c0e8009 */ lui $t6,%hi(var80092874+0x2) +/* 9b9c: 91ce2876 */ lbu $t6,%lo(var80092874+0x2)($t6) /* 9ba0: 3c02800a */ lui $v0,%hi(var8009cac0) /* 9ba4: 2442cac0 */ addiu $v0,$v0,%lo(var8009cac0) /* 9ba8: 000e7880 */ sll $t7,$t6,0x2 @@ -446,10 +446,10 @@ glabel func00009b50 /* 9bb0: 3c088006 */ lui $t0,%hi(var8005d590) /* 9bb4: 8d08d590 */ lw $t0,%lo(var8005d590)($t0) /* 9bb8: 8f190000 */ lw $t9,0x0($t8) -/* 9bbc: 3c098009 */ lui $t1,0x8009 +/* 9bbc: 3c098009 */ lui $t1,%hi(var80092874+0x3) /* 9bc0: 3c0d8006 */ lui $t5,%hi(var8005d594) /* 9bc4: ad190028 */ sw $t9,0x28($t0) -/* 9bc8: 91292877 */ lbu $t1,0x2877($t1) +/* 9bc8: 91292877 */ lbu $t1,%lo(var80092874+0x3)($t1) /* 9bcc: 8dadd594 */ lw $t5,%lo(var8005d594)($t5) /* 9bd0: 240e0001 */ addiu $t6,$zero,0x1 /* 9bd4: 00095080 */ sll $t2,$t1,0x2 @@ -458,9 +458,9 @@ glabel func00009b50 /* 9be0: 3c018006 */ lui $at,0x8006 /* 9be4: adac0028 */ sw $t4,0x28($t5) /* 9be8: ac2ed59c */ sw $t6,-0x2a64($at) -/* 9bec: 3c01800a */ lui $at,0x800a +/* 9bec: 3c01800a */ lui $at,%hi(g_Vars+0x4e0) /* 9bf0: 03e00008 */ jr $ra -/* 9bf4: a020a4a0 */ sb $zero,-0x5b60($at) +/* 9bf4: a020a4a0 */ sb $zero,%lo(g_Vars+0x4e0)($at) ); GLOBAL_ASM( @@ -480,9 +480,9 @@ glabel func00009bf8 /* 9c24: a464ffee */ sh $a0,-0x12($v1) /* 9c28: 1465fff9 */ bne $v1,$a1,.L00009c10 /* 9c2c: a464fff2 */ sh $a0,-0xe($v1) -/* 9c30: 3c01800a */ lui $at,0x800a +/* 9c30: 3c01800a */ lui $at,%hi(g_Vars+0x4e0) /* 9c34: 03e00008 */ jr $ra -/* 9c38: a020a4a0 */ sb $zero,-0x5b60($at) +/* 9c38: a020a4a0 */ sb $zero,%lo(g_Vars+0x4e0)($at) ); GLOBAL_ASM( @@ -634,17 +634,17 @@ glabel func00009c3c /* 9e30: 00ce7821 */ addu $t7,$a2,$t6 /* 9e34: ac8e0000 */ sw $t6,0x0($a0) /* 9e38: ac8f0004 */ sw $t7,0x4($a0) -/* 9e3c: 3c188009 */ lui $t8,0x8009 -/* 9e40: 93182876 */ lbu $t8,0x2876($t8) +/* 9e3c: 3c188009 */ lui $t8,%hi(var80092874+0x2) +/* 9e40: 93182876 */ lbu $t8,%lo(var80092874+0x2)($t8) /* 9e44: 3c0b8006 */ lui $t3,%hi(var8005d590) /* 9e48: 8d6bd590 */ lw $t3,%lo(var8005d590)($t3) /* 9e4c: 0018c880 */ sll $t9,$t8,0x2 /* 9e50: 00994821 */ addu $t1,$a0,$t9 /* 9e54: 8d2a0000 */ lw $t2,0x0($t1) -/* 9e58: 3c0c8009 */ lui $t4,0x8009 +/* 9e58: 3c0c8009 */ lui $t4,%hi(var80092874+0x3) /* 9e5c: 3c188006 */ lui $t8,%hi(var8005d594) /* 9e60: ad6a0028 */ sw $t2,0x28($t3) -/* 9e64: 918c2877 */ lbu $t4,0x2877($t4) +/* 9e64: 918c2877 */ lbu $t4,%lo(var80092874+0x3)($t4) /* 9e68: 8f18d594 */ lw $t8,%lo(var8005d594)($t8) /* 9e6c: 00001825 */ or $v1,$zero,$zero /* 9e70: 000c6880 */ sll $t5,$t4,0x2 @@ -708,8 +708,8 @@ glabel func00009ed4 /* 9f2c: 0c012194 */ jal func00048650 /* 9f30: 00000000 */ sll $zero,$zero,0x0 /* 9f34: 3c078006 */ lui $a3,%hi(var8005ce74) -/* 9f38: 3c038009 */ lui $v1,0x8009 -/* 9f3c: 8c6dde0c */ lw $t5,-0x21f4($v1) +/* 9f38: 3c038009 */ lui $v1,%hi(var8008de0c) +/* 9f3c: 8c6dde0c */ lw $t5,%lo(var8008de0c)($v1) /* 9f40: 24e7ce74 */ addiu $a3,$a3,%lo(var8005ce74) /* 9f44: 8fa50018 */ lw $a1,0x18($sp) /* 9f48: 8cf90000 */ lw $t9,0x0($a3) @@ -725,9 +725,9 @@ glabel func00009ed4 /* 9f70: 01a57021 */ addu $t6,$t5,$a1 /* 9f74: 31cfffff */ andi $t7,$t6,0xffff /* 9f78: 018fc025 */ or $t8,$t4,$t7 -/* 9f7c: 3c038009 */ lui $v1,0x8009 +/* 9f7c: 3c038009 */ lui $v1,%hi(var8008de10) /* 9f80: ad780030 */ sw $t8,0x30($t3) -/* 9f84: 8c68de10 */ lw $t0,-0x21f0($v1) +/* 9f84: 8c68de10 */ lw $t0,%lo(var8008de10)($v1) /* 9f88: 8ceb0000 */ lw $t3,0x0($a3) /* 9f8c: 00402025 */ or $a0,$v0,$zero /* 9f90: 00087403 */ sra $t6,$t0,0x10 @@ -971,10 +971,10 @@ glabel func0000a044 /* a308: 000f7040 */ sll $t6,$t7,0x1 /* a30c: ac8e0028 */ sw $t6,0x28($a0) /* a310: 85390018 */ lh $t9,0x18($t1) -/* a314: 3c0f8009 */ lui $t7,%hi(var8009000c) +/* a314: 3c0f8009 */ lui $t7,%hi(g_Is4Mb) /* a318: 0019c040 */ sll $t8,$t9,0x1 /* a31c: ac98003c */ sw $t8,0x3c($a0) -/* a320: 91ef0af0 */ lbu $t7,0xaf0($t7) +/* a320: 91ef0af0 */ lbu $t7,%lo(g_Is4Mb)($t7) /* a324: 17ef0004 */ bne $ra,$t7,.L0000a338 /* a328: 24020400 */ addiu $v0,$zero,0x400 /* a32c: ac82002c */ sw $v0,0x2c($a0) @@ -1052,8 +1052,8 @@ glabel func0000a044 /* a428: 0000c810 */ mfhi $t9 /* a42c: 03191025 */ or $v0,$t8,$t9 /* a430: ac82001c */ sw $v0,0x1c($a0) -/* a434: 3c018009 */ lui $at,0x8009 -/* a438: ac22de08 */ sw $v0,-0x21f8($at) +/* a434: 3c018009 */ lui $at,%hi(var8008de08) +/* a438: ac22de08 */ sw $v0,%lo(var8008de08)($at) /* a43c: 8523001a */ lh $v1,0x1a($t1) /* a440: 8c8e002c */ lw $t6,0x2c($a0) /* a444: 27ffde10 */ addiu $ra,$ra,%lo(var8008de10) @@ -1142,7 +1142,7 @@ glabel func0000a044 /* a574: 0080c025 */ or $t8,$a0,$zero .L0000a578: /* a578: 8de10000 */ lw $at,0x0($t7) -/* a57c: 25ef000c */ addiu $t7,$t7,%lo(var8009000c) +/* a57c: 25ef000c */ addiu $t7,$t7,12 /* a580: 2718000c */ addiu $t8,$t8,0xc /* a584: af01fff4 */ sw $at,-0xc($t8) /* a588: 8de1fff8 */ lw $at,-0x8($t7) @@ -1237,8 +1237,8 @@ glabel func0000a044 /* a6d0: 0000c810 */ mfhi $t9 /* a6d4: 03191025 */ or $v0,$t8,$t9 /* a6d8: ac82001c */ sw $v0,0x1c($a0) -/* a6dc: 3c018009 */ lui $at,0x8009 -/* a6e0: ac22de08 */ sw $v0,-0x21f8($at) +/* a6dc: 3c018009 */ lui $at,%hi(var8008de08) +/* a6e0: ac22de08 */ sw $v0,%lo(var8008de08)($at) /* a6e4: 8c830030 */ lw $v1,0x30($a0) /* a6e8: 8ca5d58c */ lw $a1,%lo(var8005d58c)($a1) /* a6ec: 27ffde10 */ addiu $ra,$ra,%lo(var8008de10) @@ -1416,15 +1416,15 @@ glabel func0000a044 /* a94c: 8f18cac0 */ lw $t8,%lo(var8009cac0)($t8) /* a950: add80058 */ sw $t8,0x58($t6) .L0000a954: -/* a954: 3c028009 */ lui $v0,0x8009 -/* a958: 24422876 */ addiu $v0,$v0,0x2876 +/* a954: 3c028009 */ lui $v0,%hi(var80092874+0x2) +/* a958: 24422876 */ addiu $v0,$v0,%lo(var80092874+0x2) /* a95c: 90590000 */ lbu $t9,0x0($v0) /* a960: 3c048006 */ lui $a0,%hi(var8005d594) /* a964: 8c84d594 */ lw $a0,%lo(var8005d594)($a0) /* a968: 272f0001 */ addiu $t7,$t9,0x1 -/* a96c: 3c038009 */ lui $v1,0x8009 +/* a96c: 3c038009 */ lui $v1,%hi(var80092874+0x3) /* a970: 2408002c */ addiu $t0,$zero,0x2c -/* a974: 24632877 */ addiu $v1,$v1,0x2877 +/* a974: 24632877 */ addiu $v1,$v1,%lo(var80092874+0x3) /* a978: 906e0000 */ lbu $t6,0x0($v1) /* a97c: 3c078006 */ lui $a3,%hi(var8005d530) /* a980: 24e7d530 */ addiu $a3,$a3,%lo(var8005d530) @@ -1459,8 +1459,8 @@ glabel func0000a044 /* a9ec: ac2ed594 */ sw $t6,-0x2a6c($at) /* a9f0: 0c012c5c */ jal func0004b170 /* a9f4: 8ca5d594 */ lw $a1,%lo(var8005d594)($a1) -/* a9f8: 3c038009 */ lui $v1,0x8009 -/* a9fc: 24632877 */ addiu $v1,$v1,0x2877 +/* a9f8: 3c038009 */ lui $v1,%hi(var80092874+0x3) +/* a9fc: 24632877 */ addiu $v1,$v1,%lo(var80092874+0x3) /* aa00: 90790000 */ lbu $t9,0x0($v1) /* aa04: 3c18800a */ lui $t8,%hi(var8009cac0) /* aa08: 3c0e8006 */ lui $t6,%hi(var8005d594) @@ -1567,10 +1567,10 @@ glabel func0000ab2c GLOBAL_ASM( glabel func0000ab4c -/* ab4c: 3c0f8009 */ lui $t7,0x8009 -/* ab50: 91ef2877 */ lbu $t7,0x2877($t7) -/* ab54: 3c0e800a */ lui $t6,0x800a -/* ab58: 8dcea244 */ lw $t6,-0x5dbc($t6) +/* ab4c: 3c0f8009 */ lui $t7,%hi(var80092874+0x3) +/* ab50: 91ef2877 */ lbu $t7,%lo(var80092874+0x3)($t7) +/* ab54: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* ab58: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* ab5c: 000fc100 */ sll $t8,$t7,0x4 /* ab60: 01d81021 */ addu $v0,$t6,$t8 /* ab64: 03e00008 */ jr $ra @@ -1719,8 +1719,8 @@ glabel func0000ad5c /* ad60: 2508d594 */ addiu $t0,$t0,%lo(var8005d594) /* ad64: 8d0e0000 */ lw $t6,0x0($t0) /* ad68: 27bdffd0 */ addiu $sp,$sp,-48 -/* ad6c: 3c028009 */ lui $v0,0x8009 -/* ad70: 24422877 */ addiu $v0,$v0,0x2877 +/* ad6c: 3c028009 */ lui $v0,%hi(var80092874+0x3) +/* ad70: 24422877 */ addiu $v0,$v0,%lo(var80092874+0x3) /* ad74: 90590000 */ lbu $t9,0x0($v0) /* ad78: afbf002c */ sw $ra,0x2c($sp) /* ad7c: afb00028 */ sw $s0,0x28($sp) @@ -1768,8 +1768,8 @@ glabel func0000ad5c /* ae24: 0fc59e66 */ jal func0f167998 /* ae28: ac8a0004 */ sw $t2,0x4($a0) /* ae2c: 3c088006 */ lui $t0,%hi(var8005d594) -/* ae30: 3c018009 */ lui $at,0x8009 -/* ae34: ac222870 */ sw $v0,0x2870($at) +/* ae30: 3c018009 */ lui $at,%hi(var80092870) +/* ae34: ac222870 */ sw $v0,%lo(var80092870)($at) /* ae38: 2508d594 */ addiu $t0,$t0,%lo(var8005d594) /* ae3c: 8d030000 */ lw $v1,0x0($t0) /* ae40: 3c013f80 */ lui $at,0x3f80 @@ -1828,8 +1828,8 @@ glabel func0000af00 /* af04: 2508d594 */ addiu $t0,$t0,%lo(var8005d594) /* af08: 8d0e0000 */ lw $t6,0x0($t0) /* af0c: 27bdffd0 */ addiu $sp,$sp,-48 -/* af10: 3c028009 */ lui $v0,0x8009 -/* af14: 24422877 */ addiu $v0,$v0,0x2877 +/* af10: 3c028009 */ lui $v0,%hi(var80092874+0x3) +/* af14: 24422877 */ addiu $v0,$v0,%lo(var80092874+0x3) /* af18: 90590000 */ lbu $t9,0x0($v0) /* af1c: afbf002c */ sw $ra,0x2c($sp) /* af20: afb00028 */ sw $s0,0x28($sp) @@ -1894,8 +1894,8 @@ glabel func0000af00 /* b00c: 0fc59e66 */ jal func0f167998 /* b010: ac8b0004 */ sw $t3,0x4($a0) /* b014: 3c088006 */ lui $t0,%hi(var8005d594) -/* b018: 3c018009 */ lui $at,0x8009 -/* b01c: ac222870 */ sw $v0,0x2870($at) +/* b018: 3c018009 */ lui $at,%hi(var80092870) +/* b01c: ac222870 */ sw $v0,%lo(var80092870)($at) /* b020: 2508d594 */ addiu $t0,$t0,%lo(var8005d594) /* b024: 8d030000 */ lw $v1,0x0($t0) /* b028: 3c013f80 */ lui $at,0x3f80 @@ -2002,12 +2002,12 @@ glabel func0000b0e8 GLOBAL_ASM( glabel func0000b1a8 -/* b1a8: 3c05800a */ lui $a1,%hi(var800a0610) -/* b1ac: 8ca5a244 */ lw $a1,-0x5dbc($a1) +/* b1a8: 3c05800a */ lui $a1,%hi(g_Vars+0x284) +/* b1ac: 8ca5a244 */ lw $a1,%lo(g_Vars+0x284)($a1) /* b1b0: 27bdffe8 */ addiu $sp,$sp,-24 /* b1b4: afbf0014 */ sw $ra,0x14($sp) /* b1b8: 0c002b57 */ jal func0000ad5c -/* b1bc: 24a50610 */ addiu $a1,$a1,%lo(var800a0610) +/* b1bc: 24a50610 */ addiu $a1,$a1,1552 /* b1c0: 8fbf0014 */ lw $ra,0x14($sp) /* b1c4: 27bd0018 */ addiu $sp,$sp,0x18 /* b1c8: 03e00008 */ jr $ra @@ -2366,8 +2366,8 @@ glabel func0000b330 /* b6b4: 240c0002 */ addiu $t4,$zero,0x2 /* b6b8: afae0080 */ sw $t6,0x80($sp) .L0000b6bc: -/* b6bc: 3c0f800a */ lui $t7,0x800a -/* b6c0: 8defa024 */ lw $t7,-0x5fdc($t7) +/* b6bc: 3c0f800a */ lui $t7,%hi(g_Vars+0x64) +/* b6c0: 8defa024 */ lw $t7,%lo(g_Vars+0x64)($t7) /* b6c4: 85ed0636 */ lh $t5,0x636($t7) /* b6c8: 19a0001c */ blez $t5,.L0000b73c /* b6cc: 00c02025 */ or $a0,$a2,$zero @@ -2376,8 +2376,8 @@ glabel func0000b330 /* b6d8: afa4007c */ sw $a0,0x7c($sp) /* b6dc: 0c002f02 */ jal func0000bc08 /* b6e0: afac0084 */ sw $t4,0x84($sp) -/* b6e4: 3c18800a */ lui $t8,0x800a -/* b6e8: 8f18a024 */ lw $t8,-0x5fdc($t8) +/* b6e4: 3c18800a */ lui $t8,%hi(g_Vars+0x64) +/* b6e8: 8f18a024 */ lw $t8,%lo(g_Vars+0x64)($t8) /* b6ec: 8fa4007c */ lw $a0,0x7c($sp) /* b6f0: 8fa600a8 */ lw $a2,0xa8($sp) /* b6f4: 87190636 */ lh $t9,0x636($t8) diff --git a/src/lib/lib_0c000.c b/src/lib/lib_0c000.c index ae7bdba15..3c60ec274 100644 --- a/src/lib/lib_0c000.c +++ b/src/lib/lib_0c000.c @@ -107,8 +107,8 @@ glabel func0000c06c /* c094: 02202825 */ or $a1,$s1,$zero /* c098: 0c012148 */ jal osSetEventMesg /* c09c: 24060010 */ addiu $a2,$zero,0x10 -/* c0a0: 3c018009 */ lui $at,0x8009 -/* c0a4: ac204ad0 */ sw $zero,0x4ad0($at) +/* c0a0: 3c018009 */ lui $at,%hi(var80094ad0) +/* c0a4: ac204ad0 */ sw $zero,%lo(var80094ad0)($at) /* c0a8: 27b2005c */ addiu $s2,$sp,0x5c .L0000c0ac: /* c0ac: 02202025 */ or $a0,$s1,$zero @@ -120,9 +120,9 @@ glabel func0000c06c /* c0c0: 24040001 */ addiu $a0,$zero,0x1 /* c0c4: 0c013990 */ jal func0004e640 /* c0c8: 00408025 */ or $s0,$v0,$zero -/* c0cc: 3c018009 */ lui $at,0x8009 +/* c0cc: 3c018009 */ lui $at,%hi(var80094acc) /* c0d0: 1040fff6 */ beqz $v0,.L0000c0ac -/* c0d4: ac224acc */ sw $v0,0x4acc($at) +/* c0d4: ac224acc */ sw $v0,%lo(var80094acc)($at) /* c0d8: 0c012194 */ jal func00048650 /* c0dc: 02002025 */ or $a0,$s0,$zero /* c0e0: 1000fff3 */ beqz $zero,.L0000c0b0 diff --git a/src/lib/lib_0d0a0.c b/src/lib/lib_0d0a0.c index 2eaf5125a..43d8c2dd0 100644 --- a/src/lib/lib_0d0a0.c +++ b/src/lib/lib_0d0a0.c @@ -114,9 +114,9 @@ glabel func0000d0f8 /* d1f4: 26d64e88 */ addiu $s6,$s6,%lo(var80094e88) /* d1f8: 10600014 */ beqz $v1,.L0000d24c /* d1fc: 24150001 */ addiu $s5,$zero,0x1 -/* d200: 3c018009 */ lui $at,0x8009 +/* d200: 3c018009 */ lui $at,%hi(var80094de8) /* d204: 00320821 */ addu $at,$at,$s2 -/* d208: a0354de8 */ sb $s5,0x4de8($at) +/* d208: a0354de8 */ sb $s5,%lo(var80094de8)($at) /* d20c: 8ee20000 */ lw $v0,0x0($s7) /* d210: 00124880 */ sll $t1,$s2,0x2 /* d214: 01324823 */ subu $t1,$t1,$s2 diff --git a/src/lib/lib_0d520.c b/src/lib/lib_0d520.c index 2fc9c5e8e..6d40d33d0 100644 --- a/src/lib/lib_0d520.c +++ b/src/lib/lib_0d520.c @@ -972,7 +972,7 @@ glabel func0000db3c /* e070: ae56031c */ sw $s6,0x31c($s2) .L0000e074: /* e074: 8e4f0298 */ lw $t7,0x298($s2) -/* e078: 3c01800b */ lui $at,0x800b +/* e078: 3c01800b */ lui $at,%hi(g_MpSetup+0x16) /* e07c: 05e10004 */ bgez $t7,.L0000e090 /* e080: 00000000 */ sll $zero,$zero,0x0 /* e084: 8e48029c */ lw $t0,0x29c($s2) @@ -980,7 +980,7 @@ glabel func0000db3c /* e08c: 8e4a0470 */ lw $t2,0x470($s2) .L0000e090: /* e090: 0fc61e51 */ jal func0f187944 -/* e094: a429cb9e */ sh $t1,-0x3462($at) +/* e094: a429cb9e */ sh $t1,%lo(g_MpSetup+0x16)($at) /* e098: 10000033 */ beqz $zero,.L0000e168 /* e09c: 00000000 */ sll $zero,$zero,0x0 /* e0a0: 8e4a0470 */ lw $t2,0x470($s2) @@ -1008,8 +1008,8 @@ glabel func0000db3c /* e0f0: 1040001d */ beqz $v0,.L0000e168 /* e0f4: 240d0001 */ addiu $t5,$zero,0x1 .L0000e0f8: -/* e0f8: 3c01800b */ lui $at,0x800b -/* e0fc: a42dcb9e */ sh $t5,-0x3462($at) +/* e0f8: 3c01800b */ lui $at,%hi(g_MpSetup+0x16) +/* e0fc: a42dcb9e */ sh $t5,%lo(g_MpSetup+0x16)($at) /* e100: 2a210002 */ slti $at,$s1,0x2 /* e104: 14200006 */ bnez $at,.L0000e120 /* e108: 3c0a8006 */ lui $t2,%hi(g_StageNum) @@ -1029,16 +1029,16 @@ glabel func0000db3c .L0000e13c: /* e13c: 2a210004 */ slti $at,$s1,0x4 /* e140: 14200005 */ bnez $at,.L0000e158 -/* e144: 3c08800b */ lui $t0,0x800b -/* e148: 9508cb9e */ lhu $t0,-0x3462($t0) -/* e14c: 3c01800b */ lui $at,0x800b +/* e144: 3c08800b */ lui $t0,%hi(g_MpSetup+0x16) +/* e148: 9508cb9e */ lhu $t0,%lo(g_MpSetup+0x16)($t0) +/* e14c: 3c01800b */ lui $at,%hi(g_MpSetup+0x16) /* e150: 35090008 */ ori $t1,$t0,0x8 -/* e154: a429cb9e */ sh $t1,-0x3462($at) +/* e154: a429cb9e */ sh $t1,%lo(g_MpSetup+0x16)($at) .L0000e158: /* e158: 8d4ad9b4 */ lw $t2,%lo(g_StageNum)($t2) -/* e15c: 3c01800b */ lui $at,0x800b +/* e15c: 3c01800b */ lui $at,%hi(g_MpSetup+0x11) /* e160: 0fc61e51 */ jal func0f187944 -/* e164: a02acb99 */ sb $t2,-0x3467($at) +/* e164: a02acb99 */ sb $t2,%lo(g_MpSetup+0x11)($at) .L0000e168: /* e168: 0fc59cd4 */ jal func0f167350 /* e16c: 00000000 */ sll $zero,$zero,0x0 diff --git a/src/lib/lib_0e9d0.c b/src/lib/lib_0e9d0.c index b1cdbd279..aea075682 100644 --- a/src/lib/lib_0e9d0.c +++ b/src/lib/lib_0e9d0.c @@ -195,10 +195,10 @@ glabel func0000eb2c /* eba4: 02802825 */ or $a1,$s4,$zero /* eba8: 864a000e */ lh $t2,0xe($s2) /* ebac: 3c098009 */ lui $t1,%hi(var80094ea0) -/* ebb0: 3c018009 */ lui $at,0x8009 +/* ebb0: 3c018009 */ lui $at,%hi(var80094ea0) /* ebb4: 254b0001 */ addiu $t3,$t2,0x1 /* ebb8: 25294ea0 */ addiu $t1,$t1,%lo(var80094ea0) -/* ebbc: ac2b4ea0 */ sw $t3,0x4ea0($at) +/* ebbc: ac2b4ea0 */ sw $t3,%lo(var80094ea0)($at) /* ebc0: 8d330000 */ lw $s3,0x0($t1) /* ebc4: 3c068009 */ lui $a2,%hi(var800951f0) /* ebc8: 24c651f0 */ addiu $a2,$a2,%lo(var800951f0) @@ -271,8 +271,8 @@ glabel func0000eb2c .L0000ecc8: /* ecc8: 3c188009 */ lui $t8,%hi(var80095210) /* eccc: 27025210 */ addiu $v0,$t8,%lo(var80095210) -/* ecd0: 3c058009 */ lui $a1,0x8009 -/* ecd4: 24a5523d */ addiu $a1,$a1,0x523d +/* ecd0: 3c058009 */ lui $a1,%hi(var8009523c+0x1) +/* ecd4: 24a5523d */ addiu $a1,$a1,%lo(var8009523c+0x1) /* ecd8: 00401825 */ or $v1,$v0,$zero /* ecdc: 24040001 */ addiu $a0,$zero,0x1 .L0000ece0: @@ -1088,14 +1088,14 @@ glabel func0000f804 /* f810: afb0001c */ sw $s0,0x1c($sp) /* f814: 24020001 */ addiu $v0,$zero,0x1 /* f818: 3c100006 */ lui $s0,0x6 -/* f81c: 3c01800a */ lui $at,0x800a +/* f81c: 3c01800a */ lui $at,%hi(g_Vars+0x4e3) /* f820: afbf0024 */ sw $ra,0x24($sp) /* f824: afb10020 */ sw $s1,0x20($sp) /* f828: 3610e400 */ ori $s0,$s0,0xe400 /* f82c: 144e000d */ bne $v0,$t6,.L0000f864 -/* f830: a020a4a3 */ sb $zero,-0x5b5d($at) -/* f834: 3c018009 */ lui $at,0x8009 -/* f838: ac224ea8 */ sw $v0,0x4ea8($at) +/* f830: a020a4a3 */ sb $zero,%lo(g_Vars+0x4e3)($at) +/* f834: 3c018009 */ lui $at,%hi(var80094ea8) +/* f838: ac224ea8 */ sw $v0,%lo(var80094ea8)($at) /* f83c: 3c100006 */ lui $s0,0x6 /* f840: 3c01fffd */ lui $at,0xfffd /* f844: 36104c00 */ ori $s0,$s0,0x4c00 @@ -1109,10 +1109,10 @@ glabel func0000f804 .L0000f864: /* f864: 3c018006 */ lui $at,0x8006 /* f868: ac22ddd0 */ sw $v0,-0x2230($at) -/* f86c: 3c018009 */ lui $at,0x8009 +/* f86c: 3c018009 */ lui $at,%hi(var80094ea8) /* f870: 240f0002 */ addiu $t7,$zero,0x2 /* f874: 3c057005 */ lui $a1,%hi(var70053b58) -/* f878: ac2f4ea8 */ sw $t7,0x4ea8($at) +/* f878: ac2f4ea8 */ sw $t7,%lo(var80094ea8)($at) /* f87c: 24a53b58 */ addiu $a1,$a1,%lo(var70053b58) /* f880: 0c004c04 */ jal func00013010 /* f884: 00402025 */ or $a0,$v0,$zero @@ -1165,10 +1165,10 @@ glabel func0000f804 /* f934: 254abf30 */ addiu $t2,$t2,-16592 /* f938: 25295f90 */ addiu $t1,$t1,0x5f90 /* f93c: 2408ffff */ addiu $t0,$zero,-1 -/* f940: 3c018009 */ lui $at,0x8009 +/* f940: 3c018009 */ lui $at,%hi(var80095200) /* f944: 012a8023 */ subu $s0,$t1,$t2 /* f948: 3c068009 */ lui $a2,%hi(var800951f0) -/* f94c: ac285200 */ sw $t0,0x5200($at) +/* f94c: ac285200 */ sw $t0,%lo(var80095200)($at) /* f950: 24c651f0 */ addiu $a2,$a2,%lo(var800951f0) /* f954: afb00010 */ sw $s0,0x10($sp) /* f958: 00002025 */ or $a0,$zero,$zero @@ -1186,7 +1186,7 @@ glabel func0000f804 /* f988: 0c00ddc1 */ jal func00037704 /* f98c: 02202025 */ or $a0,$s1,$zero /* f990: 8e2b0004 */ lw $t3,0x4($s1) -/* f994: 3c018009 */ lui $at,0x8009 +/* f994: 3c018009 */ lui $at,%hi(var80095204) /* f998: 3c068009 */ lui $a2,%hi(var800951f0) /* f99c: 240c0010 */ addiu $t4,$zero,0x10 /* f9a0: afac0010 */ sw $t4,0x10($sp) @@ -1195,7 +1195,7 @@ glabel func0000f804 /* f9ac: 00002825 */ or $a1,$zero,$zero /* f9b0: 24070001 */ addiu $a3,$zero,0x1 /* f9b4: 0c00bec5 */ jal func0002fb14 -/* f9b8: ac2b5204 */ sw $t3,0x5204($at) +/* f9b8: ac2b5204 */ sw $t3,%lo(var80095204)($at) /* f9bc: 3c108009 */ lui $s0,%hi(var80095208) /* f9c0: 3c1100e8 */ lui $s1,0xe8 /* f9c4: 26105208 */ addiu $s0,$s0,%lo(var80095208) @@ -1657,10 +1657,10 @@ glabel func0000fe88 /* ffe8: 570000d4 */ bnezl $t8,.L0001033c /* ffec: 8fbf002c */ lw $ra,0x2c($sp) /* fff0: 8f39ddd0 */ lw $t9,%lo(var8005ddd0)($t9) -/* fff4: 3c02800a */ lui $v0,0x800a +/* fff4: 3c02800a */ lui $v0,%hi(g_Vars+0x4b4) /* fff8: 532000d0 */ beqzl $t9,.L0001033c /* fffc: 8fbf002c */ lw $ra,0x2c($sp) -/* 10000: 8c42a474 */ lw $v0,-0x5b8c($v0) +/* 10000: 8c42a474 */ lw $v0,%lo(g_Vars+0x4b4)($v0) /* 10004: 24010031 */ addiu $at,$zero,0x31 /* 10008: 54410006 */ bnel $v0,$at,.L00010024 /* 1000c: 24010019 */ addiu $at,$zero,0x19 @@ -1675,8 +1675,8 @@ glabel func0000fe88 /* 1002c: 0c004447 */ jal func0001111c /* 10030: 00000000 */ sll $zero,$zero,0x0 .L00010034: -/* 10034: 3c0a800a */ lui $t2,0x800a -/* 10038: 8d4aa26c */ lw $t2,-0x5d94($t2) +/* 10034: 3c0a800a */ lui $t2,%hi(g_Vars+0x2ac) +/* 10038: 8d4aa26c */ lw $t2,%lo(g_Vars+0x2ac)($t2) /* 1003c: 24010006 */ addiu $at,$zero,0x6 /* 10040: 15410014 */ bne $t2,$at,.L00010094 /* 10044: 00000000 */ sll $zero,$zero,0x0 @@ -1757,10 +1757,10 @@ glabel func0000fe88 /* 10150: 3c108009 */ lui $s0,%hi(var80094eb0) /* 10154: 26104eb0 */ addiu $s0,$s0,%lo(var80094eb0) /* 10158: 8e02000c */ lw $v0,0xc($s0) -/* 1015c: 3c0e800a */ lui $t6,0x800a +/* 1015c: 3c0e800a */ lui $t6,%hi(g_Vars+0x34) /* 10160: 58400076 */ blezl $v0,.L0001033c /* 10164: 8fbf002c */ lw $ra,0x2c($sp) -/* 10168: 8dce9ff4 */ lw $t6,-0x600c($t6) +/* 10168: 8dce9ff4 */ lw $t6,%lo(g_Vars+0x34)($t6) /* 1016c: 004e7823 */ subu $t7,$v0,$t6 /* 10170: 1de00071 */ bgtz $t7,.L00010338 /* 10174: ae0f000c */ sw $t7,0xc($s0) @@ -1775,9 +1775,9 @@ glabel func0000fe88 /* 10194: 30430003 */ andi $v1,$v0,0x3 /* 10198: 1323fffb */ beq $t9,$v1,.L00010188 /* 1019c: 00000000 */ sll $zero,$zero,0x0 -/* 101a0: 3c018009 */ lui $at,0x8009 +/* 101a0: 3c018009 */ lui $at,%hi(var80094ec0) /* 101a4: 1060000c */ beqz $v1,.L000101d8 -/* 101a8: ac234ec0 */ sw $v1,0x4ec0($at) +/* 101a8: ac234ec0 */ sw $v1,%lo(var80094ec0)($at) /* 101ac: 24010001 */ addiu $at,$zero,0x1 /* 101b0: 1061000c */ beq $v1,$at,.L000101e4 /* 101b4: 240b7cee */ addiu $t3,$zero,0x7cee @@ -1813,9 +1813,9 @@ glabel func0000fe88 /* 10214: 30430003 */ andi $v1,$v0,0x3 /* 10218: 11c3fffb */ beq $t6,$v1,.L00010208 /* 1021c: 00000000 */ sll $zero,$zero,0x0 -/* 10220: 3c018009 */ lui $at,0x8009 +/* 10220: 3c018009 */ lui $at,%hi(var80094ec4) /* 10224: 1060000c */ beqz $v1,.L00010258 -/* 10228: ac234ec4 */ sw $v1,0x4ec4($at) +/* 10228: ac234ec4 */ sw $v1,%lo(var80094ec4)($at) /* 1022c: 24010001 */ addiu $at,$zero,0x1 /* 10230: 1061000c */ beq $v1,$at,.L00010264 /* 10234: 24187cf9 */ addiu $t8,$zero,0x7cf9 @@ -1851,9 +1851,9 @@ glabel func0000fe88 /* 10294: 30430003 */ andi $v1,$v0,0x3 /* 10298: 1163fffb */ beq $t3,$v1,.L00010288 /* 1029c: 00000000 */ sll $zero,$zero,0x0 -/* 102a0: 3c018009 */ lui $at,0x8009 +/* 102a0: 3c018009 */ lui $at,%hi(var80094ec8) /* 102a4: 1060000c */ beqz $v1,.L000102d8 -/* 102a8: ac234ec8 */ sw $v1,0x4ec8($at) +/* 102a8: ac234ec8 */ sw $v1,%lo(var80094ec8)($at) /* 102ac: 24010001 */ addiu $at,$zero,0x1 /* 102b0: 1061000c */ beq $v1,$at,.L000102e4 /* 102b4: 240d77b7 */ addiu $t5,$zero,0x77b7 @@ -1963,8 +1963,8 @@ glabel func0001036c GLOBAL_ASM( glabel audioIsFiltered -/* 1040c: 3c0e800a */ lui $t6,0x800a -/* 10410: 91cea4a3 */ lbu $t6,-0x5b5d($t6) +/* 1040c: 3c0e800a */ lui $t6,%hi(g_Vars+0x4e3) +/* 10410: 91cea4a3 */ lbu $t6,%lo(g_Vars+0x4e3)($t6) /* 10414: 27bdfff8 */ addiu $sp,$sp,-8 /* 10418: 51c0001f */ beqzl $t6,.L00010498 /* 1041c: 00001025 */ or $v0,$zero,$zero @@ -2103,12 +2103,12 @@ glabel func000104a0 /* 105c0: 0006000d */ break 0x6 .L000105c4: /* 105c4: 8c820014 */ lw $v0,0x14($a0) -/* 105c8: 3c18800a */ lui $t8,0x800a +/* 105c8: 3c18800a */ lui $t8,%hi(g_Vars+0x4e3) /* 105cc: 11020002 */ beq $t0,$v0,.L000105d8 /* 105d0: 00000000 */ sll $zero,$zero,0x0 /* 105d4: 00403825 */ or $a3,$v0,$zero .L000105d8: -/* 105d8: 9318a4a3 */ lbu $t8,-0x5b5d($t8) +/* 105d8: 9318a4a3 */ lbu $t8,%lo(g_Vars+0x4e3)($t8) /* 105dc: 53000007 */ beqzl $t8,.L000105fc /* 105e0: 8fac002c */ lw $t4,0x2c($sp) /* 105e4: 8c8a001c */ lw $t2,0x1c($a0) @@ -2294,12 +2294,12 @@ glabel func00010718 /* 1086c: 0006000d */ break 0x6 .L00010870: /* 10870: 8c820014 */ lw $v0,0x14($a0) -/* 10874: 3c19800a */ lui $t9,0x800a +/* 10874: 3c19800a */ lui $t9,%hi(g_Vars+0x4e3) /* 10878: 10e20002 */ beq $a3,$v0,.L00010884 /* 1087c: 00000000 */ sll $zero,$zero,0x0 /* 10880: afa2004c */ sw $v0,0x4c($sp) .L00010884: -/* 10884: 9339a4a3 */ lbu $t9,-0x5b5d($t9) +/* 10884: 9339a4a3 */ lbu $t9,%lo(g_Vars+0x4e3)($t9) /* 10888: 53200007 */ beqzl $t9,.L000108a8 /* 1088c: 8fad004c */ lw $t5,0x4c($sp) /* 10890: 8c8a001c */ lw $t2,0x1c($a0) @@ -2560,7 +2560,7 @@ glabel func00010ae4 /* 10c0c: 004a5821 */ addu $t3,$v0,$t2 /* 10c10: 8d6d0014 */ lw $t5,0x14($t3) /* 10c14: 97ac0024 */ lhu $t4,0x24($sp) -/* 10c18: 3c0b800a */ lui $t3,0x800a +/* 10c18: 3c0b800a */ lui $t3,%hi(g_Vars+0x4e3) /* 10c1c: 106d0003 */ beq $v1,$t5,.L00010c2c /* 10c20: 31987fff */ andi $t8,$t4,0x7fff /* 10c24: 004a7821 */ addu $t7,$v0,$t2 @@ -2575,7 +2575,7 @@ glabel func00010ae4 /* 10c44: 31aa7fff */ andi $t2,$t5,0x7fff /* 10c48: 8d260014 */ lw $a2,0x14($t1) .L00010c4c: -/* 10c4c: 916ba4a3 */ lbu $t3,-0x5b5d($t3) +/* 10c4c: 916ba4a3 */ lbu $t3,%lo(g_Vars+0x4e3)($t3) /* 10c50: 000a7940 */ sll $t7,$t2,0x5 /* 10c54: 004f6021 */ addu $t4,$v0,$t7 /* 10c58: 51600007 */ beqzl $t3,.L00010c78 diff --git a/src/lib/lib_11420.c b/src/lib/lib_11420.c index fce51e649..abf7bd2ba 100644 --- a/src/lib/lib_11420.c +++ b/src/lib/lib_11420.c @@ -613,8 +613,8 @@ glabel func0001190c /* 11bbc: 2652a5d8 */ addiu $s2,$s2,%lo(var800aa5d8) /* 11bc0: 10600006 */ beqz $v1,.L00011bdc /* 11bc4: 3c188008 */ lui $t8,%hi(var800840e4) -/* 11bc8: 3c19800a */ lui $t9,0x800a -/* 11bcc: 8f39a000 */ lw $t9,-0x6000($t9) +/* 11bc8: 3c19800a */ lui $t9,%hi(g_Vars+0x40) +/* 11bcc: 8f39a000 */ lw $t9,%lo(g_Vars+0x40)($t9) /* 11bd0: 8f1840e4 */ lw $t8,%lo(var800840e4)($t8) /* 11bd4: 0319082a */ slt $at,$t8,$t9 /* 11bd8: 10200058 */ beqz $at,.L00011d3c @@ -626,11 +626,11 @@ glabel func0001190c .L00011bec: /* 11bec: 3c0e800b */ lui $t6,%hi(var800aa5f0) /* 11bf0: 95cea5f0 */ lhu $t6,%lo(var800aa5f0)($t6) -/* 11bf4: 3c01800b */ lui $at,0x800b -/* 11bf8: 3c0f800b */ lui $t7,0x800b +/* 11bf4: 3c01800b */ lui $at,%hi(var800aa5f0) +/* 11bf8: 3c0f800b */ lui $t7,%hi(var800aa5e8+0x2) /* 11bfc: 25cd0001 */ addiu $t5,$t6,0x1 -/* 11c00: a42da5f0 */ sh $t5,-0x5a10($at) -/* 11c04: 95efa5ea */ lhu $t7,-0x5a16($t7) +/* 11c00: a42da5f0 */ sh $t5,%lo(var800aa5f0)($at) +/* 11c04: 95efa5ea */ lhu $t7,%lo(var800aa5e8+0x2)($t7) /* 11c08: 00002025 */ or $a0,$zero,$zero /* 11c0c: 25f8ffff */ addiu $t8,$t7,-1 /* 11c10: 2f010005 */ sltiu $at,$t8,0x5 @@ -717,8 +717,8 @@ glabel func0001190c /* 11d3c: 10600009 */ beqz $v1,.L00011d64 /* 11d40: 3c018008 */ lui $at,0x8008 /* 11d44: 3c198008 */ lui $t9,%hi(var800840e4) -/* 11d48: 3c0c800a */ lui $t4,0x800a -/* 11d4c: 8d8ca000 */ lw $t4,-0x6000($t4) +/* 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 /* 11d58: 032c6823 */ subu $t5,$t9,$t4 @@ -785,10 +785,10 @@ glabel func00011d84 /* 11e2c: 00000000 */ sll $zero,$zero,0x0 /* 11e30: 3c0d8008 */ lui $t5,%hi(var80087264) /* 11e34: 8dad7264 */ lw $t5,%lo(var80087264)($t5) -/* 11e38: 3c0e800a */ lui $t6,0x800a +/* 11e38: 3c0e800a */ lui $t6,%hi(g_Vars+0x318) /* 11e3c: 11a0001c */ beqz $t5,.L00011eb0 /* 11e40: 00000000 */ sll $zero,$zero,0x0 -/* 11e44: 8dcea2d8 */ lw $t6,-0x5d28($t6) +/* 11e44: 8dcea2d8 */ lw $t6,%lo(g_Vars+0x318)($t6) /* 11e48: 3c058008 */ lui $a1,%hi(var800840f4) /* 11e4c: 24a540f4 */ addiu $a1,$a1,%lo(var800840f4) /* 11e50: 11c00017 */ beqz $t6,.L00011eb0 @@ -954,9 +954,9 @@ glabel func00011d84 /* 1209c: 00000000 */ sll $zero,$zero,0x0 /* 120a0: 0fc5b6a9 */ jal func0f16daa4 /* 120a4: 00000000 */ sll $zero,$zero,0x0 -/* 120a8: 3c08800a */ lui $t0,0x800a +/* 120a8: 3c08800a */ lui $t0,%hi(g_Vars+0x34) /* 120ac: 1000000a */ beqz $zero,.L000120d8 -/* 120b0: 8d089ff4 */ lw $t0,-0x600c($t0) +/* 120b0: 8d089ff4 */ lw $t0,%lo(g_Vars+0x34)($t0) .L000120b4: /* 120b4: 11c00008 */ beqz $t6,.L000120d8 /* 120b8: 00000000 */ sll $zero,$zero,0x0 @@ -965,8 +965,8 @@ glabel func00011d84 /* 120c4: 00000000 */ sll $zero,$zero,0x0 /* 120c8: 0fc5b68b */ jal func0f16da2c /* 120cc: 00000000 */ sll $zero,$zero,0x0 -/* 120d0: 3c08800a */ lui $t0,0x800a -/* 120d4: 8d089ff4 */ lw $t0,-0x600c($t0) +/* 120d0: 3c08800a */ lui $t0,%hi(g_Vars+0x34) +/* 120d4: 8d089ff4 */ lw $t0,%lo(g_Vars+0x34)($t0) .L000120d8: /* 120d8: 3c038006 */ lui $v1,%hi(var8005edf0) /* 120dc: 2463edf0 */ addiu $v1,$v1,%lo(var8005edf0) diff --git a/src/lib/lib_121e0.c b/src/lib/lib_121e0.c index 45f555d14..07dd3bea5 100644 --- a/src/lib/lib_121e0.c +++ b/src/lib/lib_121e0.c @@ -115,9 +115,9 @@ glabel func00012324 /* 12330: 3c03800a */ lui $v1,0x800a /* 12334: 15c10004 */ bne $t6,$at,.L00012348 /* 12338: 00000000 */ sll $zero,$zero,0x0 -/* 1233c: 3c03800a */ lui $v1,0x800a +/* 1233c: 3c03800a */ lui $v1,%hi(g_PrimaryMemoryPools+0x54) /* 12340: 03e00008 */ jr $ra -/* 12344: 8c629354 */ lw $v0,-0x6cac($v1) +/* 12344: 8c629354 */ lw $v0,%lo(g_PrimaryMemoryPools+0x54)($v1) .L00012348: /* 12348: 8c63940c */ lw $v1,-0x6bf4($v1) /* 1234c: 03e00008 */ jr $ra diff --git a/src/lib/lib_12dc0.c b/src/lib/lib_12dc0.c index c7cc5981a..5ae2ecac4 100644 --- a/src/lib/lib_12dc0.c +++ b/src/lib/lib_12dc0.c @@ -162,9 +162,9 @@ glabel func00012f30 /* 12f50: 3631ff00 */ ori $s1,$s1,0xff00 /* 12f54: 10400004 */ beqz $v0,.L00012f68 /* 12f58: 3c10800a */ lui $s0,%hi(var80099880) -/* 12f5c: 3c01800a */ lui $at,0x800a +/* 12f5c: 3c01800a */ lui $at,%hi(var80099880) /* 12f60: 1000000a */ beqz $zero,.L00012f8c -/* 12f64: ac209880 */ sw $zero,-0x6780($at) +/* 12f64: ac209880 */ sw $zero,%lo(var80099880)($at) .L00012f68: /* 12f68: 3c12800a */ lui $s2,%hi(var800998f8) /* 12f6c: 265298f8 */ addiu $s2,$s2,%lo(var800998f8) diff --git a/src/lib/lib_13900.c b/src/lib/lib_13900.c index ce570979b..1c05360d2 100644 --- a/src/lib/lib_13900.c +++ b/src/lib/lib_13900.c @@ -172,14 +172,14 @@ glabel func00013a40 /* 13a78: 93a4001b */ lbu $a0,0x1b($sp) .L00013a7c: /* 13a7c: 10400004 */ beqz $v0,.L00013a90 -/* 13a80: 3c18800a */ lui $t8,0x800a +/* 13a80: 3c18800a */ lui $t8,%hi(var80099f44+0x3) /* 13a84: 0302c021 */ addu $t8,$t8,$v0 -/* 13a88: 93189f47 */ lbu $t8,-0x60b9($t8) +/* 13a88: 93189f47 */ lbu $t8,%lo(var80099f44+0x3)($t8) /* 13a8c: 10980006 */ beq $a0,$t8,.L00013aa8 .L00013a90: -/* 13a90: 3c01800a */ lui $at,0x800a +/* 13a90: 3c01800a */ lui $at,%hi(var80099f48) /* 13a94: 00220821 */ addu $at,$at,$v0 -/* 13a98: a0249f48 */ sb $a0,-0x60b8($at) +/* 13a98: a0249f48 */ sb $a0,%lo(var80099f48)($at) /* 13a9c: 3c018006 */ lui $at,0x8006 /* 13aa0: 24590001 */ addiu $t9,$v0,0x1 /* 13aa4: ac39eecc */ sw $t9,-0x1134($at) @@ -803,8 +803,8 @@ glabel func000142f0 /* 14300: 24a5ef08 */ addiu $a1,$a1,%lo(var8005ef08) /* 14304: 0c0036cc */ jal func0000db30 /* 14308: 248440a8 */ addiu $a0,$a0,%lo(var700540a8) -/* 1430c: 3c0e800a */ lui $t6,0x800a -/* 14310: 91cea490 */ lbu $t6,-0x5b70($t6) +/* 1430c: 3c0e800a */ lui $t6,%hi(g_Vars+0x4d0) +/* 14310: 91cea490 */ lbu $t6,%lo(g_Vars+0x4d0)($t6) /* 14314: 11c00003 */ beqz $t6,.L00014324 /* 14318: 00000000 */ sll $zero,$zero,0x0 /* 1431c: 0c004eae */ jal func00013ab8 @@ -818,9 +818,9 @@ glabel func000142f0 /* 14338: 3c05800a */ lui $a1,%hi(var80099e44) /* 1433c: 0040f809 */ jalr $v0 /* 14340: 8ca59e44 */ lw $a1,%lo(var80099e44)($a1) -/* 14344: 3c01800a */ lui $at,0x800a +/* 14344: 3c01800a */ lui $at,%hi(var80099e4c) /* 14348: 3c04800a */ lui $a0,%hi(var80099c64) -/* 1434c: ac229e4c */ sw $v0,-0x61b4($at) +/* 1434c: ac229e4c */ sw $v0,%lo(var80099e4c)($at) /* 14350: 0c005016 */ jal func00014058 /* 14354: 24849c64 */ addiu $a0,$a0,%lo(var80099c64) .L00014358: @@ -923,7 +923,7 @@ glabel func00014484 /* 14498: 0c0121bc */ jal osRecvMesg /* 1449c: 00003025 */ or $a2,$zero,$zero /* 144a0: 14400049 */ bnez $v0,.L000145c8 -/* 144a4: 3c04800a */ lui $a0,%hi(var80099f00) +/* 144a4: 3c04800a */ lui $a0,0x800a /* 144a8: 3c0e8006 */ lui $t6,%hi(var8005ee64) /* 144ac: 8dceee64 */ lw $t6,%lo(var8005ee64)($t6) /* 144b0: 3c04800a */ lui $a0,%hi(var80099e78) @@ -1003,7 +1003,7 @@ glabel func00014484 /* 145c0: 10000090 */ beqz $zero,.L00014804 /* 145c4: 8fbf0014 */ lw $ra,0x14($sp) .L000145c8: -/* 145c8: 24849f00 */ addiu $a0,$a0,%lo(var80099f00) +/* 145c8: 24849f00 */ addiu $a0,$a0,-24832 /* 145cc: 27a50034 */ addiu $a1,$sp,0x34 /* 145d0: 0c0121bc */ jal osRecvMesg /* 145d4: 00003025 */ or $a2,$zero,$zero @@ -1986,12 +1986,12 @@ glabel func000152d0 /* 15310: aca40000 */ sw $a0,0x0($a1) /* 15314: 00eb6021 */ addu $t4,$a3,$t3 /* 15318: 8d8d00e4 */ lw $t5,0xe4($t4) -/* 1531c: 3c0f800b */ lui $t7,0x800b +/* 1531c: 3c0f800b */ lui $t7,%hi(g_MpPlayers+0x44) /* 15320: 000d7080 */ sll $t6,$t5,0x2 /* 15324: 01cd7021 */ addu $t6,$t6,$t5 /* 15328: 000e7140 */ sll $t6,$t6,0x5 /* 1532c: 01ee7821 */ addu $t7,$t7,$t6 -/* 15330: 91efc7fc */ lbu $t7,-0x3804($t7) +/* 15330: 91efc7fc */ lbu $t7,%lo(g_MpPlayers+0x44)($t7) /* 15334: 240effff */ addiu $t6,$zero,-1 /* 15338: 29e10004 */ slti $at,$t7,0x4 /* 1533c: 5420001f */ bnezl $at,.L000153bc @@ -2190,11 +2190,11 @@ glabel func000155b4 /* 155d4: 0018c080 */ sll $t8,$t8,0x2 /* 155d8: 030fc023 */ subu $t8,$t8,$t7 /* 155dc: 0018c080 */ sll $t8,$t8,0x2 -/* 155e0: 3c02800a */ lui $v0,0x800a +/* 155e0: 3c02800a */ lui $v0,%hi(var800a2380+0x10) /* 155e4: 00581021 */ addu $v0,$v0,$t8 /* 155e8: afa40000 */ sw $a0,0x0($sp) /* 155ec: 03e00008 */ jr $ra -/* 155f0: 8c422390 */ lw $v0,0x2390($v0) +/* 155f0: 8c422390 */ lw $v0,%lo(var800a2380+0x10)($v0) ); GLOBAL_ASM( diff --git a/src/lib/lib_16110.c b/src/lib/lib_16110.c index daf545d30..3f5df923b 100644 --- a/src/lib/lib_16110.c +++ b/src/lib/lib_16110.c @@ -1985,8 +1985,8 @@ glabel func00017cbc GLOBAL_ASM( glabel func00017ce0 -/* 17ce0: 3c03800a */ lui $v1,%hi(var800a000c) -/* 17ce4: 8c634cc8 */ lw $v1,0x4cc8($v1) +/* 17ce0: 3c03800a */ lui $v1,%hi(g_Portals) +/* 17ce4: 8c634cc8 */ lw $v1,%lo(g_Portals)($v1) /* 17ce8: 000470c0 */ sll $t6,$a0,0x3 /* 17cec: 3c013f80 */ lui $at,0x3f80 /* 17cf0: 006e7821 */ addu $t7,$v1,$t6 @@ -2020,7 +2020,7 @@ glabel func00017ce0 /* 17d58: 24e70001 */ addiu $a3,$a3,0x1 /* 17d5c: 46083400 */ add.s $f16,$f6,$f8 /* 17d60: c4a60008 */ lwc1 $f6,0x8($a1) -/* 17d64: 2463000c */ addiu $v1,$v1,%lo(var800a000c) +/* 17d64: 2463000c */ addiu $v1,$v1,12 /* 17d68: e4b00000 */ swc1 $f16,0x0($a1) /* 17d6c: c46afffc */ lwc1 $f10,-0x4($v1) /* 17d70: 460a2480 */ add.s $f18,$f4,$f10 @@ -2345,8 +2345,8 @@ glabel func00018148 /* 181f4: 3c14800a */ lui $s4,%hi(g_Portals) /* 181f8: 3c038008 */ lui $v1,%hi(var8007fc40) /* 181fc: 8c63fc40 */ lw $v1,%lo(var8007fc40)($v1) -/* 18200: 3c0b800a */ lui $t3,0x800a -/* 18204: 2562a4e0 */ addiu $v0,$t3,-23328 +/* 18200: 3c0b800a */ lui $t3,%hi(g_Vars+0x520) +/* 18204: 2562a4e0 */ addiu $v0,$t3,%lo(g_Vars+0x520) /* 18208: 18600008 */ blez $v1,.L0001822c /* 1820c: 00036040 */ sll $t4,$v1,0x1 /* 18210: 01822821 */ addu $a1,$t4,$v0 @@ -2388,8 +2388,8 @@ glabel func00018148 /* 1828c: 014c9821 */ addu $s3,$t2,$t4 .L00018290: /* 18290: 86720000 */ lh $s2,0x0($s3) -/* 18294: 3c0d800a */ lui $t5,0x800a -/* 18298: 25ada4e0 */ addiu $t5,$t5,-23328 +/* 18294: 3c0d800a */ lui $t5,%hi(g_Vars+0x520) +/* 18298: 25ada4e0 */ addiu $t5,$t5,%lo(g_Vars+0x520) /* 1829c: 00125840 */ sll $t3,$s2,0x1 /* 182a0: 016d8821 */ addu $s1,$t3,$t5 /* 182a4: 3c028006 */ lui $v0,%hi(var8005ef20) diff --git a/src/lib/lib_1a500.c b/src/lib/lib_1a500.c index 4f50b895d..ec806daf0 100644 --- a/src/lib/lib_1a500.c +++ b/src/lib/lib_1a500.c @@ -1259,7 +1259,7 @@ glabel func0001b0e8 /* 1b114: 55c000a6 */ bnezl $t6,.L0001b3b0 /* 1b118: 8fbf0014 */ lw $ra,0x14($sp) /* 1b11c: c4440034 */ lwc1 $f4,0x34($v0) -/* 1b120: 3c0f800a */ lui $t7,0x800a +/* 1b120: 3c0f800a */ lui $t7,%hi(g_Vars+0x4cc) /* 1b124: e7a40034 */ swc1 $f4,0x34($sp) /* 1b128: c4460038 */ lwc1 $f6,0x38($v0) /* 1b12c: e7a60038 */ swc1 $f6,0x38($sp) @@ -1267,7 +1267,7 @@ glabel func0001b0e8 /* 1b134: e7a8003c */ swc1 $f8,0x3c($sp) /* 1b138: c44a0030 */ lwc1 $f10,0x30($v0) /* 1b13c: e44a0014 */ swc1 $f10,0x14($v0) -/* 1b140: 8defa48c */ lw $t7,-0x5b74($t7) +/* 1b140: 8defa48c */ lw $t7,%lo(g_Vars+0x4cc)($t7) /* 1b144: 51e00014 */ beqzl $t7,.L0001b198 /* 1b148: c5020010 */ lwc1 $f2,0x10($t0) /* 1b14c: c500001c */ lwc1 $f0,0x1c($t0) @@ -1521,8 +1521,8 @@ glabel func0001b400 /* 1b4d8: 8fa6023c */ lw $a2,0x23c($sp) /* 1b4dc: 0c009014 */ jal func00024050 /* 1b4e0: afae0010 */ sw $t6,0x10($sp) -/* 1b4e4: 3c09800a */ lui $t1,0x800a -/* 1b4e8: 8d29a48c */ lw $t1,-0x5b74($t1) +/* 1b4e4: 3c09800a */ lui $t1,%hi(g_Vars+0x4cc) +/* 1b4e8: 8d29a48c */ lw $t1,%lo(g_Vars+0x4cc)($t1) /* 1b4ec: 51200010 */ beqzl $t1,.L0001b530 /* 1b4f0: c6020010 */ lwc1 $f2,0x10($s0) /* 1b4f4: c600001c */ lwc1 $f0,0x1c($s0) @@ -2327,8 +2327,8 @@ glabel func0001bfa8 /* 1c05c: 8fa60150 */ lw $a2,0x150($sp) /* 1c060: 0c009014 */ jal func00024050 /* 1c064: afb90010 */ sw $t9,0x10($sp) -/* 1c068: 3c0a800a */ lui $t2,0x800a -/* 1c06c: 8d4aa48c */ lw $t2,-0x5b74($t2) +/* 1c068: 3c0a800a */ lui $t2,%hi(g_Vars+0x4cc) +/* 1c06c: 8d4aa48c */ lw $t2,%lo(g_Vars+0x4cc)($t2) /* 1c070: 51400010 */ beqzl $t2,.L0001c0b4 /* 1c074: 44807000 */ mtc1 $zero,$f14 /* 1c078: 44807000 */ mtc1 $zero,$f14 diff --git a/src/lib/lib_233c0.c b/src/lib/lib_233c0.c index 7994e81f6..4cab9a1e7 100644 --- a/src/lib/lib_233c0.c +++ b/src/lib/lib_233c0.c @@ -140,28 +140,28 @@ glabel func000233c0 /* 23550: 348d003f */ ori $t5,$a0,0x3f /* 23554: 0c0048f2 */ jal malloc /* 23558: 39a4003f */ xori $a0,$t5,0x3f -/* 2355c: 3c01800a */ lui $at,0x800a -/* 23560: ac22a870 */ sw $v0,-0x5790($at) +/* 2355c: 3c01800a */ lui $at,%hi(var8009a870) +/* 23560: ac22a870 */ sw $v0,%lo(var8009a870)($at) /* 23564: 24040080 */ addiu $a0,$zero,0x80 /* 23568: 0c0048f2 */ jal malloc /* 2356c: 24050006 */ addiu $a1,$zero,0x6 -/* 23570: 3c01800a */ lui $at,0x800a -/* 23574: ac22a874 */ sw $v0,-0x578c($at) +/* 23570: 3c01800a */ lui $at,%hi(var8009a874) +/* 23574: ac22a874 */ sw $v0,%lo(var8009a874)($at) /* 23578: 24040040 */ addiu $a0,$zero,0x40 /* 2357c: 0c0048f2 */ jal malloc /* 23580: 24050006 */ addiu $a1,$zero,0x6 -/* 23584: 3c01800a */ lui $at,0x800a -/* 23588: ac22a878 */ sw $v0,-0x5788($at) +/* 23584: 3c01800a */ lui $at,%hi(var8009a878) +/* 23588: ac22a878 */ sw $v0,%lo(var8009a878)($at) /* 2358c: 24040040 */ addiu $a0,$zero,0x40 /* 23590: 0c0048f2 */ jal malloc /* 23594: 24050006 */ addiu $a1,$zero,0x6 -/* 23598: 3c01800a */ lui $at,0x800a -/* 2359c: ac22a87c */ sw $v0,-0x5784($at) +/* 23598: 3c01800a */ lui $at,%hi(var8009a87c) +/* 2359c: ac22a87c */ sw $v0,%lo(var8009a87c)($at) /* 235a0: 24040040 */ addiu $a0,$zero,0x40 /* 235a4: 0c0048f2 */ jal malloc /* 235a8: 24050006 */ addiu $a1,$zero,0x6 -/* 235ac: 3c01800a */ lui $at,0x800a -/* 235b0: ac22a880 */ sw $v0,-0x5780($at) +/* 235ac: 3c01800a */ lui $at,%hi(var8009a880) +/* 235b0: ac22a880 */ sw $v0,%lo(var8009a880)($at) /* 235b4: 8e040000 */ lw $a0,0x0($s0) /* 235b8: 24050006 */ addiu $a1,$zero,0x6 /* 235bc: 00047880 */ sll $t7,$a0,0x2 @@ -171,24 +171,24 @@ glabel func000233c0 /* 235cc: 3498003f */ ori $t8,$a0,0x3f /* 235d0: 0c0048f2 */ jal malloc /* 235d4: 3b04003f */ xori $a0,$t8,0x3f -/* 235d8: 3c01800a */ lui $at,0x800a -/* 235dc: ac22a884 */ sw $v0,-0x577c($at) +/* 235d8: 3c01800a */ lui $at,%hi(var8009a884) +/* 235dc: ac22a884 */ sw $v0,%lo(var8009a884)($at) /* 235e0: 240400c0 */ addiu $a0,$zero,0xc0 /* 235e4: 0c0048f2 */ jal malloc /* 235e8: 24050006 */ addiu $a1,$zero,0x6 -/* 235ec: 3c01800a */ lui $at,0x800a -/* 235f0: ac22a888 */ sw $v0,-0x5778($at) +/* 235ec: 3c01800a */ lui $at,%hi(var8009a888) +/* 235f0: ac22a888 */ sw $v0,%lo(var8009a888)($at) /* 235f4: 24040080 */ addiu $a0,$zero,0x80 /* 235f8: 0c0048f2 */ jal malloc /* 235fc: 24050006 */ addiu $a1,$zero,0x6 -/* 23600: 3c01800a */ lui $at,0x800a -/* 23604: ac22a88c */ sw $v0,-0x5774($at) +/* 23600: 3c01800a */ lui $at,%hi(var8009a88c) +/* 23604: ac22a88c */ sw $v0,%lo(var8009a88c)($at) /* 23608: 240400c0 */ addiu $a0,$zero,0xc0 /* 2360c: 0c0048f2 */ jal malloc /* 23610: 24050006 */ addiu $a1,$zero,0x6 -/* 23614: 3c01800a */ lui $at,0x800a +/* 23614: 3c01800a */ lui $at,%hi(var8009a890) /* 23618: 0c008d90 */ jal func00023640 -/* 2361c: ac22a890 */ sw $v0,-0x5770($at) +/* 2361c: ac22a890 */ sw $v0,%lo(var8009a890)($at) /* 23620: 8fbf001c */ lw $ra,0x1c($sp) /* 23624: 3c018006 */ lui $at,0x8006 /* 23628: ac20f024 */ sw $zero,-0xfdc($at) @@ -672,8 +672,8 @@ glabel func00023ab0 /* 23c98: 016d7021 */ addu $t6,$t3,$t5 /* 23c9c: af2e0000 */ sw $t6,0x0($t9) .L00023ca0: -/* 23ca0: 3c0c800a */ lui $t4,%hi(var8009ffe0) -/* 23ca4: 8d8ca878 */ lw $t4,-0x5788($t4) +/* 23ca0: 3c0c800a */ lui $t4,%hi(var8009a878) +/* 23ca4: 8d8ca878 */ lw $t4,%lo(var8009a878)($t4) /* 23ca8: 00071040 */ sll $v0,$a3,0x1 /* 23cac: 3c18800a */ lui $t8,%hi(var8009a880) /* 23cb0: 01825021 */ addu $t2,$t4,$v0 @@ -691,7 +691,7 @@ glabel func00023ab0 /* 23ce0: 332c001f */ andi $t4,$t9,0x1f /* 23ce4: 11800002 */ beqz $t4,.L00023cf0 /* 23ce8: 00000000 */ sll $zero,$zero,0x0 -/* 23cec: 258cffe0 */ addiu $t4,$t4,%lo(var8009ffe0) +/* 23cec: 258cffe0 */ addiu $t4,$t4,-32 .L00023cf0: /* 23cf0: ac2cf000 */ sw $t4,-0x1000($at) .L00023cf4: @@ -2009,18 +2009,18 @@ glabel func00024f10 GLOBAL_ASM( glabel func00024f6c -/* 24f6c: 3c01800a */ lui $at,0x800a -/* 24f70: ac20a8b4 */ sw $zero,-0x574c($at) -/* 24f74: 3c01800a */ lui $at,0x800a -/* 24f78: ac20a8ac */ sw $zero,-0x5754($at) -/* 24f7c: 3c01800a */ lui $at,0x800a -/* 24f80: ac20a8d4 */ sw $zero,-0x572c($at) -/* 24f84: 3c01800a */ lui $at,0x800a -/* 24f88: ac20a8d8 */ sw $zero,-0x5728($at) -/* 24f8c: 3c01800a */ lui $at,0x800a -/* 24f90: ac20a8ec */ sw $zero,-0x5714($at) -/* 24f94: 3c01800a */ lui $at,0x800a -/* 24f98: ac20a8f4 */ sw $zero,-0x570c($at) +/* 24f6c: 3c01800a */ lui $at,%hi(var8009a8b4) +/* 24f70: ac20a8b4 */ sw $zero,%lo(var8009a8b4)($at) +/* 24f74: 3c01800a */ lui $at,%hi(var8009a8ac) +/* 24f78: ac20a8ac */ sw $zero,%lo(var8009a8ac)($at) +/* 24f7c: 3c01800a */ lui $at,%hi(var8009a8d4) +/* 24f80: ac20a8d4 */ sw $zero,%lo(var8009a8d4)($at) +/* 24f84: 3c01800a */ lui $at,%hi(var8009a8d8) +/* 24f88: ac20a8d8 */ sw $zero,%lo(var8009a8d8)($at) +/* 24f8c: 3c01800a */ lui $at,%hi(var8009a8ec) +/* 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 @@ -2040,7 +2040,7 @@ glabel func00024fb0 /* 24fcc: e4460004 */ swc1 $f6,0x4($v0) /* 24fd0: c4880008 */ lwc1 $f8,0x8($a0) /* 24fd4: 240e0001 */ addiu $t6,$zero,0x1 -/* 24fd8: 3c01800a */ lui $at,0x800a +/* 24fd8: 3c01800a */ lui $at,%hi(var8009a8b4) /* 24fdc: e4480008 */ swc1 $f8,0x8($v0) /* 24fe0: c4aa0000 */ lwc1 $f10,0x0($a1) /* 24fe4: e46a0000 */ swc1 $f10,0x0($v1) @@ -2048,17 +2048,17 @@ glabel func00024fb0 /* 24fec: e4700004 */ swc1 $f16,0x4($v1) /* 24ff0: c4b20008 */ lwc1 $f18,0x8($a1) /* 24ff4: e4720008 */ swc1 $f18,0x8($v1) -/* 24ff8: ac2ea8b4 */ sw $t6,-0x574c($at) -/* 24ffc: 3c01800a */ lui $at,0x800a -/* 25000: ac20a8ac */ sw $zero,-0x5754($at) -/* 25004: 3c01800a */ lui $at,0x800a -/* 25008: ac26a8d4 */ sw $a2,-0x572c($at) -/* 2500c: 3c01800a */ lui $at,0x800a -/* 25010: ac20a8d8 */ sw $zero,-0x5728($at) -/* 25014: 3c01800a */ lui $at,0x800a -/* 25018: ac20a8ec */ sw $zero,-0x5714($at) -/* 2501c: 3c01800a */ lui $at,0x800a -/* 25020: ac20a8f4 */ sw $zero,-0x570c($at) +/* 24ff8: ac2ea8b4 */ sw $t6,%lo(var8009a8b4)($at) +/* 24ffc: 3c01800a */ lui $at,%hi(var8009a8ac) +/* 25000: ac20a8ac */ sw $zero,%lo(var8009a8ac)($at) +/* 25004: 3c01800a */ lui $at,%hi(var8009a8d4) +/* 25008: ac26a8d4 */ sw $a2,%lo(var8009a8d4)($at) +/* 2500c: 3c01800a */ lui $at,%hi(var8009a8d8) +/* 25010: ac20a8d8 */ sw $zero,%lo(var8009a8d8)($at) +/* 25014: 3c01800a */ lui $at,%hi(var8009a8ec) +/* 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 @@ -2081,7 +2081,7 @@ glabel func00025038 /* 25060: 24070001 */ addiu $a3,$zero,0x1 /* 25064: e4460004 */ swc1 $f6,0x4($v0) /* 25068: c4880008 */ lwc1 $f8,0x8($a0) -/* 2506c: 3c01800a */ lui $at,0x800a +/* 2506c: 3c01800a */ lui $at,%hi(var8009a8b4) /* 25070: e4480008 */ swc1 $f8,0x8($v0) /* 25074: c4aa0000 */ lwc1 $f10,0x0($a1) /* 25078: e46a0000 */ swc1 $f10,0x0($v1) @@ -2089,17 +2089,17 @@ glabel func00025038 /* 25080: e4700004 */ swc1 $f16,0x4($v1) /* 25084: c4b20008 */ lwc1 $f18,0x8($a1) /* 25088: e4720008 */ swc1 $f18,0x8($v1) -/* 2508c: ac27a8b4 */ sw $a3,-0x574c($at) -/* 25090: 3c01800a */ lui $at,0x800a -/* 25094: ac27a8ac */ sw $a3,-0x5754($at) -/* 25098: 3c01800a */ lui $at,0x800a -/* 2509c: ac26a8d4 */ sw $a2,-0x572c($at) -/* 250a0: 3c01800a */ lui $at,0x800a -/* 250a4: ac20a8d8 */ sw $zero,-0x5728($at) -/* 250a8: 3c01800a */ lui $at,0x800a -/* 250ac: ac20a8ec */ sw $zero,-0x5714($at) -/* 250b0: 3c01800a */ lui $at,0x800a -/* 250b4: ac20a8f4 */ sw $zero,-0x570c($at) +/* 2508c: ac27a8b4 */ sw $a3,%lo(var8009a8b4)($at) +/* 25090: 3c01800a */ lui $at,%hi(var8009a8ac) +/* 25094: ac27a8ac */ sw $a3,%lo(var8009a8ac)($at) +/* 25098: 3c01800a */ lui $at,%hi(var8009a8d4) +/* 2509c: ac26a8d4 */ sw $a2,%lo(var8009a8d4)($at) +/* 250a0: 3c01800a */ lui $at,%hi(var8009a8d8) +/* 250a4: ac20a8d8 */ sw $zero,%lo(var8009a8d8)($at) +/* 250a8: 3c01800a */ lui $at,%hi(var8009a8ec) +/* 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 @@ -2143,27 +2143,27 @@ glabel func000250cc /* 25148: 8fbf0014 */ lw $ra,0x14($sp) /* 2514c: 3c01800a */ lui $at,0x800a /* 25150: e420a8b0 */ swc1 $f0,-0x5750($at) -/* 25154: 3c01800a */ lui $at,0x800a +/* 25154: 3c01800a */ lui $at,%hi(var8009a8ac) /* 25158: 24180001 */ addiu $t8,$zero,0x1 -/* 2515c: ac38a8ac */ sw $t8,-0x5754($at) +/* 2515c: ac38a8ac */ sw $t8,%lo(var8009a8ac)($at) /* 25160: 03e00008 */ jr $ra /* 25164: 27bd0040 */ addiu $sp,$sp,0x40 ); GLOBAL_ASM( glabel func00025168 -/* 25168: 3c01800a */ lui $at,0x800a -/* 2516c: ac20a8b4 */ sw $zero,-0x574c($at) -/* 25170: 3c01800a */ lui $at,0x800a -/* 25174: ac20a8ac */ sw $zero,-0x5754($at) -/* 25178: 3c01800a */ lui $at,0x800a -/* 2517c: ac24a8d4 */ sw $a0,-0x572c($at) -/* 25180: 3c01800a */ lui $at,0x800a -/* 25184: ac20a8d8 */ sw $zero,-0x5728($at) -/* 25188: 3c01800a */ lui $at,0x800a -/* 2518c: ac20a8ec */ sw $zero,-0x5714($at) -/* 25190: 3c01800a */ lui $at,0x800a -/* 25194: ac20a8f4 */ sw $zero,-0x570c($at) +/* 25168: 3c01800a */ lui $at,%hi(var8009a8b4) +/* 2516c: ac20a8b4 */ sw $zero,%lo(var8009a8b4)($at) +/* 25170: 3c01800a */ lui $at,%hi(var8009a8ac) +/* 25174: ac20a8ac */ sw $zero,%lo(var8009a8ac)($at) +/* 25178: 3c01800a */ lui $at,%hi(var8009a8d4) +/* 2517c: ac24a8d4 */ sw $a0,%lo(var8009a8d4)($at) +/* 25180: 3c01800a */ lui $at,%hi(var8009a8d8) +/* 25184: ac20a8d8 */ sw $zero,%lo(var8009a8d8)($at) +/* 25188: 3c01800a */ lui $at,%hi(var8009a8ec) +/* 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 @@ -2187,7 +2187,7 @@ glabel func000251ac /* 251d8: e4480008 */ swc1 $f8,0x8($v0) /* 251dc: c4aa0000 */ lwc1 $f10,0x0($a1) /* 251e0: 24090001 */ addiu $t1,$zero,0x1 -/* 251e4: 3c01800a */ lui $at,0x800a +/* 251e4: 3c01800a */ lui $at,%hi(var8009a8b4) /* 251e8: e46a0000 */ swc1 $f10,0x0($v1) /* 251ec: c4b00004 */ lwc1 $f16,0x4($a1) /* 251f0: e4700004 */ swc1 $f16,0x4($v1) @@ -2199,17 +2199,17 @@ glabel func000251ac /* 25208: e5060004 */ swc1 $f6,0x4($t0) /* 2520c: c4c80008 */ lwc1 $f8,0x8($a2) /* 25210: e5080008 */ swc1 $f8,0x8($t0) -/* 25214: ac29a8b4 */ sw $t1,-0x574c($at) -/* 25218: 3c01800a */ lui $at,0x800a -/* 2521c: ac20a8ac */ sw $zero,-0x5754($at) -/* 25220: 3c01800a */ lui $at,0x800a -/* 25224: ac27a8d4 */ sw $a3,-0x572c($at) -/* 25228: 3c01800a */ lui $at,0x800a -/* 2522c: ac29a8d8 */ sw $t1,-0x5728($at) -/* 25230: 3c01800a */ lui $at,0x800a -/* 25234: ac20a8ec */ sw $zero,-0x5714($at) -/* 25238: 3c01800a */ lui $at,0x800a -/* 2523c: ac20a8f4 */ sw $zero,-0x570c($at) +/* 25214: ac29a8b4 */ sw $t1,%lo(var8009a8b4)($at) +/* 25218: 3c01800a */ lui $at,%hi(var8009a8ac) +/* 2521c: ac20a8ac */ sw $zero,%lo(var8009a8ac)($at) +/* 25220: 3c01800a */ lui $at,%hi(var8009a8d4) +/* 25224: ac27a8d4 */ sw $a3,%lo(var8009a8d4)($at) +/* 25228: 3c01800a */ lui $at,%hi(var8009a8d8) +/* 2522c: ac29a8d8 */ sw $t1,%lo(var8009a8d8)($at) +/* 25230: 3c01800a */ lui $at,%hi(var8009a8ec) +/* 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 @@ -2233,7 +2233,7 @@ glabel func00025254 /* 25280: e4480008 */ swc1 $f8,0x8($v0) /* 25284: c4aa0000 */ lwc1 $f10,0x0($a1) /* 25288: 24090001 */ addiu $t1,$zero,0x1 -/* 2528c: 3c01800a */ lui $at,0x800a +/* 2528c: 3c01800a */ lui $at,%hi(var8009a8b4) /* 25290: e46a0000 */ swc1 $f10,0x0($v1) /* 25294: c4b00004 */ lwc1 $f16,0x4($a1) /* 25298: c7aa0010 */ lwc1 $f10,0x10($sp) @@ -2247,23 +2247,23 @@ glabel func00025254 /* 252b8: e5060004 */ swc1 $f6,0x4($t0) /* 252bc: c4c80008 */ lwc1 $f8,0x8($a2) /* 252c0: e5080008 */ swc1 $f8,0x8($t0) -/* 252c4: ac29a8b4 */ sw $t1,-0x574c($at) -/* 252c8: 3c01800a */ lui $at,0x800a -/* 252cc: ac20a8ac */ sw $zero,-0x5754($at) -/* 252d0: 3c01800a */ lui $at,0x800a -/* 252d4: ac27a8d4 */ sw $a3,-0x572c($at) -/* 252d8: 3c01800a */ lui $at,0x800a -/* 252dc: ac29a8d8 */ sw $t1,-0x5728($at) +/* 252c4: ac29a8b4 */ sw $t1,%lo(var8009a8b4)($at) +/* 252c8: 3c01800a */ lui $at,%hi(var8009a8ac) +/* 252cc: ac20a8ac */ sw $zero,%lo(var8009a8ac)($at) +/* 252d0: 3c01800a */ lui $at,%hi(var8009a8d4) +/* 252d4: ac27a8d4 */ sw $a3,%lo(var8009a8d4)($at) +/* 252d8: 3c01800a */ lui $at,%hi(var8009a8d8) +/* 252dc: ac29a8d8 */ sw $t1,%lo(var8009a8d8)($at) /* 252e0: 3c01800a */ lui $at,0x800a /* 252e4: e42aa8f0 */ swc1 $f10,-0x5710($at) -/* 252e8: 3c01800a */ lui $at,0x800a -/* 252ec: ac29a8ec */ sw $t1,-0x5714($at) -/* 252f0: 3c01800a */ lui $at,0x800a -/* 252f4: ac20a8f4 */ sw $zero,-0x570c($at) +/* 252e8: 3c01800a */ lui $at,%hi(var8009a8ec) +/* 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) -/* 25300: 3c01800a */ lui $at,0x800a -/* 25304: ac2ea964 */ sw $t6,-0x569c($at) +/* 25300: 3c01800a */ lui $at,%hi(var8009a964) +/* 25304: ac2ea964 */ sw $t6,%lo(var8009a964)($at) /* 25308: 3c018006 */ lui $at,0x8006 /* 2530c: 03e00008 */ jr $ra /* 25310: ac29f038 */ sw $t1,-0xfc8($at) @@ -2281,7 +2281,7 @@ glabel func00025314 /* 25330: e4460004 */ swc1 $f6,0x4($v0) /* 25334: c4880008 */ lwc1 $f8,0x8($a0) /* 25338: 240e0001 */ addiu $t6,$zero,0x1 -/* 2533c: 3c01800a */ lui $at,0x800a +/* 2533c: 3c01800a */ lui $at,%hi(var8009a8f4) /* 25340: e4480008 */ swc1 $f8,0x8($v0) /* 25344: c4aa0000 */ lwc1 $f10,0x0($a1) /* 25348: e46a0000 */ swc1 $f10,0x0($v1) @@ -2290,7 +2290,7 @@ glabel func00025314 /* 25354: c4b20008 */ lwc1 $f18,0x8($a1) /* 25358: e4720008 */ swc1 $f18,0x8($v1) /* 2535c: 03e00008 */ jr $ra -/* 25360: ac2ea8f4 */ sw $t6,-0x570c($at) +/* 25360: ac2ea8f4 */ sw $t6,%lo(var8009a8f4)($at) ); GLOBAL_ASM( @@ -3754,8 +3754,8 @@ glabel func0002671c /* 267a0: 24150006 */ addiu $s5,$zero,0x6 /* 267a4: 2412000c */ addiu $s2,$zero,0xc .L000267a8: -/* 267a8: 3c19800a */ lui $t9,0x800a -/* 267ac: 8f39a2f8 */ lw $t9,-0x5d08($t9) +/* 267a8: 3c19800a */ lui $t9,%hi(g_Vars+0x338) +/* 267ac: 8f39a2f8 */ lw $t9,%lo(g_Vars+0x338)($t9) /* 267b0: 0002c0c0 */ sll $t8,$v0,0x3 /* 267b4: 8fa80278 */ lw $t0,0x278($sp) /* 267b8: 0302c021 */ addu $t8,$t8,$v0 @@ -5584,8 +5584,8 @@ glabel func00027f78 GLOBAL_ASM( glabel func00028200 -/* 28200: 3c0e800a */ lui $t6,0x800a -/* 28204: 8dcea2ec */ lw $t6,-0x5d14($t6) +/* 28200: 3c0e800a */ lui $t6,%hi(g_Vars+0x32c) +/* 28204: 8dcea2ec */ lw $t6,%lo(g_Vars+0x32c)($t6) /* 28208: 27bdffb8 */ addiu $sp,$sp,-72 /* 2820c: f7b40008 */ sdc1 $f20,0x8($sp) /* 28210: 4487a000 */ mtc1 $a3,$f20 diff --git a/src/lib/lib_2fc60.c b/src/lib/lib_2fc60.c index fe90d0dd9..fd28e5bfa 100644 --- a/src/lib/lib_2fc60.c +++ b/src/lib/lib_2fc60.c @@ -130,9 +130,9 @@ glabel func0002fcdc /* 2fd78: afaa003c */ sw $t2,0x3c($sp) /* 2fd7c: 3c0b800a */ lui $t3,%hi(var8009b870) /* 2fd80: 8d6bb870 */ lw $t3,%lo(var8009b870)($t3) -/* 2fd84: 3c01800a */ lui $at,0x800a +/* 2fd84: 3c01800a */ lui $at,%hi(var8009b870) /* 2fd88: 8d6c0000 */ lw $t4,0x0($t3) -/* 2fd8c: ac2cb870 */ sw $t4,-0x4790($at) +/* 2fd8c: ac2cb870 */ sw $t4,%lo(var8009b870)($at) /* 2fd90: 93ad004b */ lbu $t5,0x4b($sp) /* 2fd94: 8fae003c */ lw $t6,0x3c($sp) /* 2fd98: a1cd0004 */ sb $t5,0x4($t6) @@ -415,8 +415,8 @@ glabel func00030134 /* 30178: 8fa80020 */ lw $t0,0x20($sp) /* 3017c: ad190000 */ sw $t9,0x0($t0) /* 30180: 8fa90020 */ lw $t1,0x20($sp) -/* 30184: 3c01800a */ lui $at,0x800a -/* 30188: ac29b870 */ sw $t1,-0x4790($at) +/* 30184: 3c01800a */ lui $at,%hi(var8009b870) +/* 30188: ac29b870 */ sw $t1,%lo(var8009b870)($at) /* 3018c: 10000001 */ beqz $zero,.L00030194 /* 30190: 00000000 */ sll $zero,$zero,0x0 .L00030194: @@ -748,9 +748,9 @@ glabel func000301e4 /* 30634: adac0000 */ sw $t4,0x0($t5) /* 30638: 3c0e800a */ lui $t6,%hi(var8009b870) /* 3063c: 8dceb870 */ lw $t6,%lo(var8009b870)($t6) -/* 30640: 3c01800a */ lui $at,0x800a +/* 30640: 3c01800a */ lui $at,%hi(var8009b870) /* 30644: 8dcf0000 */ lw $t7,0x0($t6) -/* 30648: ac2fb870 */ sw $t7,-0x4790($at) +/* 30648: ac2fb870 */ sw $t7,%lo(var8009b870)($at) /* 3064c: 93b80037 */ lbu $t8,0x37($sp) /* 30650: 13000007 */ beqz $t8,.L00030670 /* 30654: 00000000 */ sll $zero,$zero,0x0 @@ -1139,8 +1139,8 @@ glabel func00030bd8 /* 30bd8: 3c0e800a */ lui $t6,%hi(var8009b870) /* 30bdc: 8dceb870 */ lw $t6,%lo(var8009b870)($t6) /* 30be0: ac8e0000 */ sw $t6,0x0($a0) -/* 30be4: 3c01800a */ lui $at,0x800a -/* 30be8: ac24b870 */ sw $a0,-0x4790($at) +/* 30be4: 3c01800a */ lui $at,%hi(var8009b870) +/* 30be8: ac24b870 */ sw $a0,%lo(var8009b870)($at) /* 30bec: 03e00008 */ jr $ra /* 30bf0: 00000000 */ sll $zero,$zero,0x0 /* 30bf4: 03e00008 */ jr $ra @@ -1153,8 +1153,8 @@ glabel func00030bfc /* 30c00: afa40008 */ sw $a0,0x8($sp) /* 30c04: 3c0e800a */ lui $t6,%hi(var8009b878) /* 30c08: 25ceb878 */ addiu $t6,$t6,%lo(var8009b878) -/* 30c0c: 3c01800a */ lui $at,0x800a -/* 30c10: ac2eb870 */ sw $t6,-0x4790($at) +/* 30c0c: 3c01800a */ lui $at,%hi(var8009b870) +/* 30c10: ac2eb870 */ sw $t6,%lo(var8009b870)($at) /* 30c14: 3c0f800a */ lui $t7,%hi(var8009b878) /* 30c18: 25efb878 */ addiu $t7,$t7,%lo(var8009b878) /* 30c1c: afaf0004 */ sw $t7,0x4($sp) diff --git a/src/lib/lib_317f0.c b/src/lib/lib_317f0.c index 99ea4e2f8..676a9a751 100644 --- a/src/lib/lib_317f0.c +++ b/src/lib/lib_317f0.c @@ -339,8 +339,8 @@ glabel func000317f0 /* 31970: 24070002 */ addiu $a3,$zero,0x2 /* 31974: 0c00bec5 */ jal func0002fb14 /* 31978: afaf0010 */ sw $t7,0x10($sp) -/* 3197c: 3c01800a */ lui $at,0x800a -/* 31980: ac22c334 */ sw $v0,-0x3ccc($at) +/* 3197c: 3c01800a */ lui $at,%hi(var8009c334) +/* 31980: ac22c334 */ sw $v0,%lo(var8009c334)($at) /* 31984: 8fb80040 */ lw $t8,0x40($sp) /* 31988: afa0003c */ sw $zero,0x3c($sp) /* 3198c: 97190010 */ lhu $t9,0x10($t8) @@ -3105,12 +3105,12 @@ glabel func00034030 /* 34034: afbf001c */ sw $ra,0x1c($sp) /* 34038: afa40028 */ sw $a0,0x28($sp) /* 3403c: afb00018 */ sw $s0,0x18($sp) -/* 34040: 3c01800a */ lui $at,0x800a -/* 34044: a020c340 */ sb $zero,-0x3cc0($at) -/* 34048: 3c01800a */ lui $at,0x800a -/* 3404c: a020c341 */ sb $zero,-0x3cbf($at) -/* 34050: 3c01800a */ lui $at,0x800a -/* 34054: a020c342 */ sb $zero,-0x3cbe($at) +/* 34040: 3c01800a */ lui $at,%hi(var8009c340) +/* 34044: a020c340 */ sb $zero,%lo(var8009c340)($at) +/* 34048: 3c01800a */ lui $at,%hi(var8009c340+0x1) +/* 3404c: a020c341 */ sb $zero,%lo(var8009c340+0x1)($at) +/* 34050: 3c01800a */ lui $at,%hi(var8009c340+0x2) +/* 34054: a020c342 */ sb $zero,%lo(var8009c340+0x2)($at) /* 34058: 93b0002b */ lbu $s0,0x2b($sp) /* 3405c: 24010001 */ addiu $at,$zero,0x1 /* 34060: 12010009 */ beq $s0,$at,.L00034088 @@ -3125,20 +3125,20 @@ glabel func00034030 /* 34084: 00000000 */ sll $zero,$zero,0x0 .L00034088: /* 34088: 240e0001 */ addiu $t6,$zero,0x1 -/* 3408c: 3c01800a */ lui $at,0x800a -/* 34090: a02ec341 */ sb $t6,-0x3cbf($at) +/* 3408c: 3c01800a */ lui $at,%hi(var8009c340+0x1) +/* 34090: a02ec341 */ sb $t6,%lo(var8009c340+0x1)($at) /* 34094: 1000000b */ beqz $zero,.L000340c4 /* 34098: 00000000 */ sll $zero,$zero,0x0 .L0003409c: /* 3409c: 240f0001 */ addiu $t7,$zero,0x1 -/* 340a0: 3c01800a */ lui $at,0x800a -/* 340a4: a02fc342 */ sb $t7,-0x3cbe($at) +/* 340a0: 3c01800a */ lui $at,%hi(var8009c340+0x2) +/* 340a4: a02fc342 */ sb $t7,%lo(var8009c340+0x2)($at) /* 340a8: 10000006 */ beqz $zero,.L000340c4 /* 340ac: 00000000 */ sll $zero,$zero,0x0 .L000340b0: /* 340b0: 24180001 */ addiu $t8,$zero,0x1 -/* 340b4: 3c01800a */ lui $at,0x800a -/* 340b8: a038c340 */ sb $t8,-0x3cc0($at) +/* 340b4: 3c01800a */ lui $at,%hi(var8009c340) +/* 340b8: a038c340 */ sb $t8,%lo(var8009c340)($at) /* 340bc: 10000001 */ beqz $zero,.L000340c4 /* 340c0: 00000000 */ sll $zero,$zero,0x0 .L000340c4: @@ -3171,12 +3171,12 @@ glabel func00034104 /* 34114: 00a42821 */ addu $a1,$a1,$a0 /* 34118: 90a5c348 */ lbu $a1,%lo(var8009c348)($a1) .L0003411c: -/* 3411c: 3c01800a */ lui $at,0x800a +/* 3411c: 3c01800a */ lui $at,%hi(var8009c344) /* 34120: 00240821 */ addu $at,$at,$a0 -/* 34124: a020c344 */ sb $zero,-0x3cbc($at) -/* 34128: 3c01800a */ lui $at,0x800a +/* 34124: a020c344 */ sb $zero,%lo(var8009c344)($at) +/* 34128: 3c01800a */ lui $at,%hi(var8009c344+0x2) /* 3412c: 00240821 */ addu $at,$at,$a0 -/* 34130: a020c346 */ sb $zero,-0x3cba($at) +/* 34130: a020c346 */ sb $zero,%lo(var8009c344+0x2)($at) /* 34134: 00a03025 */ or $a2,$a1,$zero /* 34138: 24010002 */ addiu $at,$zero,0x2 /* 3413c: 10c1000c */ beq $a2,$at,.L00034170 @@ -3197,10 +3197,10 @@ glabel func00034104 /* 34174: 91cec340 */ lbu $t6,%lo(var8009c340)($t6) /* 34178: 11c00005 */ beqz $t6,.L00034190 /* 3417c: 00000000 */ sll $zero,$zero,0x0 -/* 34180: 3c01800a */ lui $at,0x800a +/* 34180: 3c01800a */ lui $at,%hi(var8009c344+0x2) /* 34184: 00240821 */ addu $at,$at,$a0 /* 34188: 240f0001 */ addiu $t7,$zero,0x1 -/* 3418c: a02fc346 */ sb $t7,-0x3cba($at) +/* 3418c: a02fc346 */ sb $t7,%lo(var8009c344+0x2)($at) .L00034190: /* 34190: 10000023 */ beqz $zero,.L00034220 /* 34194: 00000000 */ sll $zero,$zero,0x0 @@ -3209,45 +3209,45 @@ glabel func00034104 /* 3419c: 9318c340 */ lbu $t8,%lo(var8009c340)($t8) /* 341a0: 13000005 */ beqz $t8,.L000341b8 /* 341a4: 00000000 */ sll $zero,$zero,0x0 -/* 341a8: 3c01800a */ lui $at,0x800a +/* 341a8: 3c01800a */ lui $at,%hi(var8009c344) /* 341ac: 00240821 */ addu $at,$at,$a0 /* 341b0: 24190001 */ addiu $t9,$zero,0x1 -/* 341b4: a039c344 */ sb $t9,-0x3cbc($at) +/* 341b4: a039c344 */ sb $t9,%lo(var8009c344)($at) .L000341b8: /* 341b8: 10000019 */ beqz $zero,.L00034220 /* 341bc: 00000000 */ sll $zero,$zero,0x0 .L000341c0: -/* 341c0: 3c08800a */ lui $t0,0x800a -/* 341c4: 9108c341 */ lbu $t0,-0x3cbf($t0) +/* 341c0: 3c08800a */ lui $t0,%hi(var8009c340+0x1) +/* 341c4: 9108c341 */ lbu $t0,%lo(var8009c340+0x1)($t0) /* 341c8: 15000005 */ bnez $t0,.L000341e0 /* 341cc: 00000000 */ sll $zero,$zero,0x0 -/* 341d0: 3c01800a */ lui $at,0x800a +/* 341d0: 3c01800a */ lui $at,%hi(var8009c344) /* 341d4: 00240821 */ addu $at,$at,$a0 /* 341d8: 24090001 */ addiu $t1,$zero,0x1 -/* 341dc: a029c344 */ sb $t1,-0x3cbc($at) +/* 341dc: a029c344 */ sb $t1,%lo(var8009c344)($at) .L000341e0: /* 341e0: 1000000f */ beqz $zero,.L00034220 /* 341e4: 00000000 */ sll $zero,$zero,0x0 .L000341e8: -/* 341e8: 3c0a800a */ lui $t2,0x800a -/* 341ec: 914ac341 */ lbu $t2,-0x3cbf($t2) +/* 341e8: 3c0a800a */ lui $t2,%hi(var8009c340+0x1) +/* 341ec: 914ac341 */ lbu $t2,%lo(var8009c340+0x1)($t2) /* 341f0: 15400009 */ bnez $t2,.L00034218 /* 341f4: 00000000 */ sll $zero,$zero,0x0 -/* 341f8: 3c01800a */ lui $at,0x800a +/* 341f8: 3c01800a */ lui $at,%hi(var8009c344) /* 341fc: 00240821 */ addu $at,$at,$a0 /* 34200: 240b0001 */ addiu $t3,$zero,0x1 -/* 34204: a02bc344 */ sb $t3,-0x3cbc($at) -/* 34208: 3c01800a */ lui $at,0x800a +/* 34204: a02bc344 */ sb $t3,%lo(var8009c344)($at) +/* 34208: 3c01800a */ lui $at,%hi(var8009c344+0x2) /* 3420c: 00240821 */ addu $at,$at,$a0 /* 34210: 240c0001 */ addiu $t4,$zero,0x1 -/* 34214: a02cc346 */ sb $t4,-0x3cba($at) +/* 34214: a02cc346 */ sb $t4,%lo(var8009c344+0x2)($at) .L00034218: /* 34218: 10000001 */ beqz $zero,.L00034220 /* 3421c: 00000000 */ sll $zero,$zero,0x0 .L00034220: -/* 34220: 3c01800a */ lui $at,0x800a +/* 34220: 3c01800a */ lui $at,%hi(var8009c348) /* 34224: 00240821 */ addu $at,$at,$a0 -/* 34228: a025c348 */ sb $a1,-0x3cb8($at) +/* 34228: a025c348 */ sb $a1,%lo(var8009c348)($at) /* 3422c: 10000001 */ beqz $zero,.L00034234 /* 34230: 00000000 */ sll $zero,$zero,0x0 .L00034234: @@ -4347,10 +4347,10 @@ glabel func00035110 /* 35230: 00000000 */ sll $zero,$zero,0x0 /* 35234: 93a800c3 */ lbu $t0,0xc3($sp) /* 35238: 8fb900a0 */ lw $t9,0xa0($sp) -/* 3523c: 3c01800a */ lui $at,0x800a +/* 3523c: 3c01800a */ lui $at,%hi(var8009c350) /* 35240: 00085080 */ sll $t2,$t0,0x2 /* 35244: 002a0821 */ addu $at,$at,$t2 -/* 35248: ac39c350 */ sw $t9,-0x3cb0($at) +/* 35248: ac39c350 */ sw $t9,%lo(var8009c350)($at) /* 3524c: 8fa400d0 */ lw $a0,0xd0($sp) /* 35250: 27a500a4 */ addiu $a1,$sp,0xa4 /* 35254: 8fa600a0 */ lw $a2,0xa0($sp) @@ -4853,10 +4853,10 @@ glabel func00035110 /* 359a8: 00000000 */ sll $zero,$zero,0x0 /* 359ac: 93ab00c3 */ lbu $t3,0xc3($sp) /* 359b0: 8fad00a0 */ lw $t5,0xa0($sp) -/* 359b4: 3c01800a */ lui $at,0x800a +/* 359b4: 3c01800a */ lui $at,%hi(var8009c350) /* 359b8: 000b6080 */ sll $t4,$t3,0x2 /* 359bc: 002c0821 */ addu $at,$at,$t4 -/* 359c0: ac2dc350 */ sw $t5,-0x3cb0($at) +/* 359c0: ac2dc350 */ sw $t5,%lo(var8009c350)($at) /* 359c4: 8fa400d0 */ lw $a0,0xd0($sp) /* 359c8: 27a500a4 */ addiu $a1,$sp,0xa4 /* 359cc: 8fa600a0 */ lw $a2,0xa0($sp) diff --git a/src/lib/lib_37b00.c b/src/lib/lib_37b00.c index fd5fce3ed..2e9845a2c 100644 --- a/src/lib/lib_37b00.c +++ b/src/lib/lib_37b00.c @@ -32,8 +32,8 @@ glabel func00037b00 /* 37b2c: 8fa60020 */ lw $a2,0x20($sp) /* 37b30: 0c00bec5 */ jal func0002fb14 /* 37b34: 34078480 */ dli $a3,0x8480 -/* 37b38: 3c01800a */ lui $at,0x800a -/* 37b3c: ac22c3f4 */ sw $v0,-0x3c0c($at) +/* 37b38: 3c01800a */ lui $at,%hi(var8009c3f4) +/* 37b3c: ac22c3f4 */ sw $v0,%lo(var8009c3f4)($at) /* 37b40: 240f2200 */ addiu $t7,$zero,0x2200 /* 37b44: afaf0010 */ sw $t7,0x10($sp) /* 37b48: 00002025 */ or $a0,$zero,$zero @@ -59,8 +59,8 @@ glabel func00037b00 /* 37b98: 8fa60020 */ lw $a2,0x20($sp) /* 37b9c: 0c00bec5 */ jal func0002fb14 /* 37ba0: 24070400 */ addiu $a3,$zero,0x400 -/* 37ba4: 3c01800a */ lui $at,0x800a -/* 37ba8: ac22c6d8 */ sw $v0,-0x3928($at) +/* 37ba4: 3c01800a */ lui $at,%hi(var8009c6d8) +/* 37ba8: ac22c6d8 */ sw $v0,%lo(var8009c6d8)($at) /* 37bac: 24080001 */ addiu $t0,$zero,0x1 /* 37bb0: afa80010 */ sw $t0,0x10($sp) /* 37bb4: 00002025 */ or $a0,$zero,$zero @@ -68,8 +68,8 @@ glabel func00037b00 /* 37bbc: 8fa60020 */ lw $a2,0x20($sp) /* 37bc0: 0c00bec5 */ jal func0002fb14 /* 37bc4: 24070400 */ addiu $a3,$zero,0x400 -/* 37bc8: 3c01800a */ lui $at,0x800a -/* 37bcc: ac22c6dc */ sw $v0,-0x3924($at) +/* 37bc8: 3c01800a */ lui $at,%hi(var8009c6dc) +/* 37bcc: ac22c6dc */ sw $v0,%lo(var8009c6dc)($at) /* 37bd0: 24090001 */ addiu $t1,$zero,0x1 /* 37bd4: afa90010 */ sw $t1,0x10($sp) /* 37bd8: 00002025 */ or $a0,$zero,$zero @@ -77,8 +77,8 @@ glabel func00037b00 /* 37be0: 8fa60020 */ lw $a2,0x20($sp) /* 37be4: 0c00bec5 */ jal func0002fb14 /* 37be8: 3407a410 */ dli $a3,0xa410 -/* 37bec: 3c01800a */ lui $at,0x800a -/* 37bf0: ac22c640 */ sw $v0,-0x39c0($at) +/* 37bec: 3c01800a */ lui $at,%hi(var8009c640) +/* 37bf0: ac22c640 */ sw $v0,%lo(var8009c640)($at) /* 37bf4: 240a0001 */ addiu $t2,$zero,0x1 /* 37bf8: afaa0010 */ sw $t2,0x10($sp) /* 37bfc: 00002025 */ or $a0,$zero,$zero @@ -86,8 +86,8 @@ glabel func00037b00 /* 37c04: 8fa60020 */ lw $a2,0x20($sp) /* 37c08: 0c00bec5 */ jal func0002fb14 /* 37c0c: 34078000 */ dli $a3,0x8000 -/* 37c10: 3c01800a */ lui $at,0x800a -/* 37c14: ac22c644 */ sw $v0,-0x39bc($at) +/* 37c10: 3c01800a */ lui $at,%hi(var8009c644) +/* 37c14: ac22c644 */ sw $v0,%lo(var8009c644)($at) /* 37c18: 0c011101 */ jal func00044404 /* 37c1c: 00000000 */ sll $zero,$zero,0x0 /* 37c20: 240b0050 */ addiu $t3,$zero,0x50 @@ -97,8 +97,8 @@ glabel func00037b00 /* 37c30: 8fa60020 */ lw $a2,0x20($sp) /* 37c34: 0c00bec5 */ jal func0002fb14 /* 37c38: 24070001 */ addiu $a3,$zero,0x1 -/* 37c3c: 3c01800a */ lui $at,0x800a -/* 37c40: ac22c398 */ sw $v0,-0x3c68($at) +/* 37c3c: 3c01800a */ lui $at,%hi(var8009c398) +/* 37c40: ac22c398 */ sw $v0,%lo(var8009c398)($at) /* 37c44: 240c0440 */ addiu $t4,$zero,0x440 /* 37c48: afac0010 */ sw $t4,0x10($sp) /* 37c4c: 00002025 */ or $a0,$zero,$zero @@ -109,69 +109,69 @@ glabel func00037b00 /* 37c60: 3c0d800a */ lui $t5,%hi(var8009c390) /* 37c64: 25adc390 */ addiu $t5,$t5,%lo(var8009c390) /* 37c68: ada20044 */ sw $v0,0x44($t5) -/* 37c6c: 3c01800a */ lui $at,0x800a -/* 37c70: ac20c3e0 */ sw $zero,-0x3c20($at) +/* 37c6c: 3c01800a */ lui $at,%hi(var8009c3e0) +/* 37c70: ac20c3e0 */ sw $zero,%lo(var8009c3e0)($at) /* 37c74: 240e7fff */ addiu $t6,$zero,0x7fff -/* 37c78: 3c01800a */ lui $at,0x800a -/* 37c7c: ac2ec3e4 */ sw $t6,-0x3c1c($at) -/* 37c80: 3c01800a */ lui $at,0x800a +/* 37c78: 3c01800a */ lui $at,%hi(var8009c3e4) +/* 37c7c: ac2ec3e4 */ sw $t6,%lo(var8009c3e4)($at) +/* 37c80: 3c01800a */ lui $at,%hi(var8009c3ec) /* 37c84: 240f0040 */ addiu $t7,$zero,0x40 /* 37c88: 24180040 */ addiu $t8,$zero,0x40 -/* 37c8c: a438c3ec */ sh $t8,-0x3c14($at) +/* 37c8c: a438c3ec */ sh $t8,%lo(var8009c3ec)($at) /* 37c90: a42fc3ee */ sh $t7,-0x3c12($at) /* 37c94: 24197fff */ addiu $t9,$zero,0x7fff -/* 37c98: 3c01800a */ lui $at,0x800a -/* 37c9c: a439c39e */ sh $t9,-0x3c62($at) +/* 37c98: 3c01800a */ lui $at,%hi(var8009c39c+0x2) +/* 37c9c: a439c39e */ sh $t9,%lo(var8009c39c+0x2)($at) /* 37ca0: 24080040 */ addiu $t0,$zero,0x40 -/* 37ca4: 3c01800a */ lui $at,0x800a -/* 37ca8: a428c39c */ sh $t0,-0x3c64($at) +/* 37ca4: 3c01800a */ lui $at,%hi(var8009c39c) +/* 37ca8: a428c39c */ sh $t0,%lo(var8009c39c)($at) /* 37cac: 3c09800a */ lui $t1,%hi(var8009c39c) /* 37cb0: 8529c39c */ lh $t1,%lo(var8009c39c)($t1) /* 37cb4: 3c0c8006 */ lui $t4,%hi(var8005f570) -/* 37cb8: 3c0d800a */ lui $t5,0x800a +/* 37cb8: 3c0d800a */ lui $t5,%hi(var8009c39c+0x2) /* 37cbc: 312a007f */ andi $t2,$t1,0x7f /* 37cc0: 000a5840 */ sll $t3,$t2,0x1 /* 37cc4: 018b6021 */ addu $t4,$t4,$t3 /* 37cc8: 858cf570 */ lh $t4,%lo(var8005f570)($t4) -/* 37ccc: 85adc39e */ lh $t5,-0x3c62($t5) -/* 37cd0: 3c01800a */ lui $at,0x800a +/* 37ccc: 85adc39e */ lh $t5,%lo(var8009c39c+0x2)($t5) +/* 37cd0: 3c01800a */ lui $at,%hi(var8009c3a0) /* 37cd4: 018d0019 */ multu $t4,$t5 /* 37cd8: 00007012 */ mflo $t6 /* 37cdc: 000e7bc3 */ sra $t7,$t6,0xf -/* 37ce0: a42fc3a0 */ sh $t7,-0x3c60($at) +/* 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 -/* 37cf0: 3c0b800a */ lui $t3,0x800a +/* 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) -/* 37d08: 856bc39e */ lh $t3,-0x3c62($t3) -/* 37d0c: 3c01800a */ lui $at,0x800a +/* 37d08: 856bc39e */ lh $t3,%lo(var8009c39c+0x2)($t3) +/* 37d0c: 3c01800a */ lui $at,%hi(var8009c3a0+0x2) /* 37d10: 014b0019 */ multu $t2,$t3 /* 37d14: 00006012 */ mflo $t4 /* 37d18: 000c6bc3 */ sra $t5,$t4,0xf -/* 37d1c: a42dc3a2 */ sh $t5,-0x3c5e($at) +/* 37d1c: a42dc3a2 */ sh $t5,%lo(var8009c3a0+0x2)($at) /* 37d20: 240e0001 */ addiu $t6,$zero,0x1 -/* 37d24: 3c01800a */ lui $at,0x800a -/* 37d28: a42ec3b4 */ sh $t6,-0x3c4c($at) +/* 37d24: 3c01800a */ lui $at,%hi(var8009c3b4) +/* 37d28: a42ec3b4 */ sh $t6,%lo(var8009c3b4)($at) /* 37d2c: 240f7ffc */ addiu $t7,$zero,0x7ffc -/* 37d30: 3c01800a */ lui $at,0x800a -/* 37d34: a42fc3a4 */ sh $t7,-0x3c5c($at) +/* 37d30: 3c01800a */ lui $at,%hi(var8009c3a4) +/* 37d34: a42fc3a4 */ sh $t7,%lo(var8009c3a4)($at) /* 37d38: 3c18800a */ lui $t8,%hi(var8009c39c) /* 37d3c: 8718c39c */ lh $t8,%lo(var8009c39c)($t8) /* 37d40: 33190080 */ andi $t9,$t8,0x80 /* 37d44: 13200005 */ beqz $t9,.L00037d5c /* 37d48: 00000000 */ sll $zero,$zero,0x0 /* 37d4c: 24080001 */ addiu $t0,$zero,0x1 -/* 37d50: 3c01800a */ lui $at,0x800a +/* 37d50: 3c01800a */ lui $at,%hi(var8009c3a4+0x2) /* 37d54: 10000003 */ beqz $zero,.L00037d64 -/* 37d58: a428c3a6 */ sh $t0,-0x3c5a($at) +/* 37d58: a428c3a6 */ sh $t0,%lo(var8009c3a4+0x2)($at) .L00037d5c: -/* 37d5c: 3c01800a */ lui $at,0x800a -/* 37d60: a420c3a6 */ sh $zero,-0x3c5a($at) +/* 37d5c: 3c01800a */ lui $at,%hi(var8009c3a4+0x2) +/* 37d60: a420c3a6 */ sh $zero,%lo(var8009c3a4+0x2)($at) .L00037d64: /* 37d64: 3c047004 */ lui $a0,%hi(func00038ba8) /* 37d68: 0c00e2e4 */ jal func00038b90 @@ -199,26 +199,26 @@ glabel func00037d88 /* 37dac: 00000000 */ sll $zero,$zero,0x0 .L00037db0: /* 37db0: 8faf0018 */ lw $t7,0x18($sp) -/* 37db4: 3c01800a */ lui $at,0x800a -/* 37db8: ac2fc390 */ sw $t7,-0x3c70($at) +/* 37db4: 3c01800a */ lui $at,%hi(var8009c390) +/* 37db8: ac2fc390 */ sw $t7,%lo(var8009c390)($at) /* 37dbc: 8fb8001c */ lw $t8,0x1c($sp) -/* 37dc0: 3c01800a */ lui $at,0x800a -/* 37dc4: ac38c3c0 */ sw $t8,-0x3c40($at) -/* 37dc8: 3c01800a */ lui $at,0x800a -/* 37dcc: ac20c3c4 */ sw $zero,-0x3c3c($at) -/* 37dd0: 3c01800a */ lui $at,0x800a -/* 37dd4: ac20c3e8 */ sw $zero,-0x3c18($at) +/* 37dc0: 3c01800a */ lui $at,%hi(var8009c3c0) +/* 37dc4: ac38c3c0 */ sw $t8,%lo(var8009c3c0)($at) +/* 37dc8: 3c01800a */ lui $at,%hi(var8009c3c4) +/* 37dcc: ac20c3c4 */ sw $zero,%lo(var8009c3c4)($at) +/* 37dd0: 3c01800a */ lui $at,%hi(var8009c3e8) +/* 37dd4: ac20c3e8 */ sw $zero,%lo(var8009c3e8)($at) /* 37dd8: 24197fff */ addiu $t9,$zero,0x7fff -/* 37ddc: 3c01800a */ lui $at,0x800a -/* 37de0: ac39c3e4 */ sw $t9,-0x3c1c($at) +/* 37ddc: 3c01800a */ lui $at,%hi(var8009c3e4) +/* 37de0: ac39c3e4 */ sw $t9,%lo(var8009c3e4)($at) /* 37de4: 24080005 */ addiu $t0,$zero,0x5 -/* 37de8: 3c01800a */ lui $at,0x800a -/* 37dec: a028c3f0 */ sb $t0,-0x3c10($at) +/* 37de8: 3c01800a */ lui $at,%hi(var8009c3f0) +/* 37dec: a028c3f0 */ sb $t0,%lo(var8009c3f0)($at) /* 37df0: 0c00e32b */ jal func00038cac /* 37df4: 00000000 */ sll $zero,$zero,0x0 /* 37df8: 24090004 */ addiu $t1,$zero,0x4 -/* 37dfc: 3c01800a */ lui $at,0x800a -/* 37e00: ac29c3e0 */ sw $t1,-0x3c20($at) +/* 37dfc: 3c01800a */ lui $at,%hi(var8009c3e0) +/* 37e00: ac29c3e0 */ sw $t1,%lo(var8009c3e0)($at) /* 37e04: 10000001 */ beqz $zero,.L00037e0c /* 37e08: 00000000 */ sll $zero,$zero,0x0 .L00037e0c: @@ -231,8 +231,8 @@ glabel func00037d88 GLOBAL_ASM( glabel func00037e1c /* 37e1c: 240e0003 */ addiu $t6,$zero,0x3 -/* 37e20: 3c01800a */ lui $at,0x800a -/* 37e24: ac2ec3e0 */ sw $t6,-0x3c20($at) +/* 37e20: 3c01800a */ lui $at,%hi(var8009c3e0) +/* 37e24: ac2ec3e0 */ sw $t6,%lo(var8009c3e0)($at) /* 37e28: 03e00008 */ jr $ra /* 37e2c: 00000000 */ sll $zero,$zero,0x0 /* 37e30: 03e00008 */ jr $ra @@ -247,8 +247,8 @@ glabel func00037e38 /* 37e44: 15c10004 */ bne $t6,$at,.L00037e58 /* 37e48: 00000000 */ sll $zero,$zero,0x0 /* 37e4c: 240f0002 */ addiu $t7,$zero,0x2 -/* 37e50: 3c01800a */ lui $at,0x800a -/* 37e54: ac2fc3e0 */ sw $t7,-0x3c20($at) +/* 37e50: 3c01800a */ lui $at,%hi(var8009c3e0) +/* 37e54: ac2fc3e0 */ sw $t7,%lo(var8009c3e0)($at) .L00037e58: /* 37e58: 03e00008 */ jr $ra /* 37e5c: 00000000 */ sll $zero,$zero,0x0 @@ -264,11 +264,11 @@ glabel func00037e68 /* 37e74: 15c10007 */ bne $t6,$at,.L00037e94 /* 37e78: 00000000 */ sll $zero,$zero,0x0 /* 37e7c: 240f0005 */ addiu $t7,$zero,0x5 -/* 37e80: 3c01800a */ lui $at,0x800a -/* 37e84: a02fc3f0 */ sb $t7,-0x3c10($at) +/* 37e80: 3c01800a */ lui $at,%hi(var8009c3f0) +/* 37e84: a02fc3f0 */ sb $t7,%lo(var8009c3f0)($at) /* 37e88: 24180005 */ addiu $t8,$zero,0x5 -/* 37e8c: 3c01800a */ lui $at,0x800a -/* 37e90: ac38c3e0 */ sw $t8,-0x3c20($at) +/* 37e8c: 3c01800a */ lui $at,%hi(var8009c3e0) +/* 37e90: ac38c3e0 */ sw $t8,%lo(var8009c3e0)($at) .L00037e94: /* 37e94: 03e00008 */ jr $ra /* 37e98: 00000000 */ sll $zero,$zero,0x0 @@ -312,24 +312,24 @@ GLOBAL_ASM( glabel func00037f08 /* 37f08: 04810004 */ bgez $a0,.L00037f1c /* 37f0c: 00000000 */ sll $zero,$zero,0x0 -/* 37f10: 3c01800a */ lui $at,0x800a +/* 37f10: 3c01800a */ lui $at,%hi(var8009c3e4) /* 37f14: 1000000b */ beqz $zero,.L00037f44 -/* 37f18: ac20c3e4 */ sw $zero,-0x3c1c($at) +/* 37f18: ac20c3e4 */ sw $zero,%lo(var8009c3e4)($at) .L00037f1c: /* 37f1c: 34018000 */ dli $at,0x8000 /* 37f20: 0081082a */ slt $at,$a0,$at /* 37f24: 14200005 */ bnez $at,.L00037f3c /* 37f28: 00000000 */ sll $zero,$zero,0x0 /* 37f2c: 240e7fff */ addiu $t6,$zero,0x7fff -/* 37f30: 3c01800a */ lui $at,0x800a +/* 37f30: 3c01800a */ lui $at,%hi(var8009c3e4) /* 37f34: 10000003 */ beqz $zero,.L00037f44 -/* 37f38: ac2ec3e4 */ sw $t6,-0x3c1c($at) +/* 37f38: ac2ec3e4 */ sw $t6,%lo(var8009c3e4)($at) .L00037f3c: -/* 37f3c: 3c01800a */ lui $at,0x800a -/* 37f40: ac24c3e4 */ sw $a0,-0x3c1c($at) +/* 37f3c: 3c01800a */ lui $at,%hi(var8009c3e4) +/* 37f40: ac24c3e4 */ sw $a0,%lo(var8009c3e4)($at) .L00037f44: -/* 37f44: 3c01800a */ lui $at,0x800a -/* 37f48: ac25c3e8 */ sw $a1,-0x3c18($at) +/* 37f44: 3c01800a */ lui $at,%hi(var8009c3e8) +/* 37f48: ac25c3e8 */ sw $a1,%lo(var8009c3e8)($at) /* 37f4c: 03e00008 */ jr $ra /* 37f50: 00000000 */ sll $zero,$zero,0x0 /* 37f54: 03e00008 */ jr $ra @@ -347,14 +347,14 @@ glabel func00037f5c /* 37f70: 00000000 */ sll $zero,$zero,0x0 /* 37f74: 00002025 */ or $a0,$zero,$zero .L00037f78: -/* 37f78: 3c01800a */ lui $at,0x800a -/* 37f7c: a424c3ee */ sh $a0,-0x3c12($at) +/* 37f78: 3c01800a */ lui $at,%hi(var8009c3ec+0x2) +/* 37f7c: a424c3ee */ sh $a0,%lo(var8009c3ec+0x2)($at) /* 37f80: 10a00005 */ beqz $a1,.L00037f98 /* 37f84: 00000000 */ sll $zero,$zero,0x0 -/* 37f88: 3c0e800a */ lui $t6,0x800a -/* 37f8c: 85cec3ee */ lh $t6,-0x3c12($t6) -/* 37f90: 3c01800a */ lui $at,0x800a -/* 37f94: a42ec3ec */ sh $t6,-0x3c14($at) +/* 37f88: 3c0e800a */ lui $t6,%hi(var8009c3ec+0x2) +/* 37f8c: 85cec3ee */ lh $t6,%lo(var8009c3ec+0x2)($t6) +/* 37f90: 3c01800a */ lui $at,%hi(var8009c3ec) +/* 37f94: a42ec3ec */ sh $t6,%lo(var8009c3ec)($at) .L00037f98: /* 37f98: 03e00008 */ jr $ra /* 37f9c: 00000000 */ sll $zero,$zero,0x0 @@ -382,15 +382,15 @@ glabel func00037fc0 /* 37fe0: 240f0650 */ addiu $t7,$zero,0x650 /* 37fe4: afaf0048 */ sw $t7,0x48($sp) /* 37fe8: 3c18800a */ lui $t8,%hi(var8009c3ec) -/* 37fec: 3c19800a */ lui $t9,0x800a -/* 37ff0: 8739c3ee */ lh $t9,-0x3c12($t9) +/* 37fec: 3c19800a */ lui $t9,%hi(var8009c3ec+0x2) +/* 37ff0: 8739c3ee */ lh $t9,%lo(var8009c3ec+0x2)($t9) /* 37ff4: 8718c3ec */ lh $t8,%lo(var8009c3ec)($t8) /* 37ff8: 13190024 */ beq $t8,$t9,.L0003808c /* 37ffc: 00000000 */ sll $zero,$zero,0x0 -/* 38000: 3c08800a */ lui $t0,0x800a +/* 38000: 3c08800a */ lui $t0,%hi(var8009c3ec+0x2) /* 38004: 3c09800a */ lui $t1,%hi(var8009c3ec) /* 38008: 8529c3ec */ lh $t1,%lo(var8009c3ec)($t1) -/* 3800c: 8508c3ee */ lh $t0,-0x3c12($t0) +/* 3800c: 8508c3ee */ lh $t0,%lo(var8009c3ec+0x2)($t0) /* 38010: 01095023 */ subu $t2,$t0,$t1 /* 38014: afaa0060 */ sw $t2,0x60($sp) /* 38018: 8fab0060 */ lw $t3,0x60($sp) @@ -403,10 +403,10 @@ glabel func00037fc0 /* 38034: 3c0c800a */ lui $t4,%hi(var8009c3ec) /* 38038: 858cc3ec */ lh $t4,%lo(var8009c3ec)($t4) /* 3803c: 8fad0060 */ lw $t5,0x60($sp) -/* 38040: 3c01800a */ lui $at,0x800a +/* 38040: 3c01800a */ lui $at,%hi(var8009c3ec) /* 38044: 018d7021 */ addu $t6,$t4,$t5 /* 38048: 10000010 */ beqz $zero,.L0003808c -/* 3804c: a42ec3ec */ sh $t6,-0x3c14($at) +/* 3804c: a42ec3ec */ sh $t6,%lo(var8009c3ec)($at) .L00038050: /* 38050: 8faf0060 */ lw $t7,0x60($sp) /* 38054: 29e10003 */ slti $at,$t7,0x3 @@ -414,16 +414,16 @@ glabel func00037fc0 /* 3805c: 00000000 */ sll $zero,$zero,0x0 /* 38060: 3c18800a */ lui $t8,%hi(var8009c3ec) /* 38064: 8718c3ec */ lh $t8,%lo(var8009c3ec)($t8) -/* 38068: 3c01800a */ lui $at,0x800a +/* 38068: 3c01800a */ lui $at,%hi(var8009c3ec) /* 3806c: 27190002 */ addiu $t9,$t8,0x2 /* 38070: 10000006 */ beqz $zero,.L0003808c -/* 38074: a439c3ec */ sh $t9,-0x3c14($at) +/* 38074: a439c3ec */ sh $t9,%lo(var8009c3ec)($at) .L00038078: /* 38078: 3c08800a */ lui $t0,%hi(var8009c3ec) /* 3807c: 8508c3ec */ lh $t0,%lo(var8009c3ec)($t0) -/* 38080: 3c01800a */ lui $at,0x800a +/* 38080: 3c01800a */ lui $at,%hi(var8009c3ec) /* 38084: 2509fffe */ addiu $t1,$t0,-2 -/* 38088: a429c3ec */ sh $t1,-0x3c14($at) +/* 38088: a429c3ec */ sh $t1,%lo(var8009c3ec)($at) .L0003808c: /* 3808c: 3c0a800a */ lui $t2,%hi(var8009c3e0) /* 38090: 8d4ac3e0 */ lw $t2,%lo(var8009c3e0)($t2) @@ -442,33 +442,33 @@ glabel func00037fc0 /* 380c4: 8ca5c3dc */ lw $a1,%lo(var8009c3dc)($a1) /* 380c8: 0c011118 */ jal func00044460 /* 380cc: 00002025 */ or $a0,$zero,$zero -/* 380d0: 3c01800a */ lui $at,0x800a -/* 380d4: ac22c394 */ sw $v0,-0x3c6c($at) +/* 380d0: 3c01800a */ lui $at,%hi(var8009c394) +/* 380d4: ac22c394 */ sw $v0,%lo(var8009c394)($at) /* 380d8: 3c0c800a */ lui $t4,%hi(var8009c394) /* 380dc: 8d8cc394 */ lw $t4,%lo(var8009c394)($t4) /* 380e0: 15800007 */ bnez $t4,.L00038100 /* 380e4: 00000000 */ sll $zero,$zero,0x0 -/* 380e8: 3c01800a */ lui $at,0x800a -/* 380ec: ac20c3e0 */ sw $zero,-0x3c20($at) +/* 380e8: 3c01800a */ lui $at,%hi(var8009c3e0) +/* 380ec: ac20c3e0 */ sw $zero,%lo(var8009c3e0)($at) /* 380f0: 10000208 */ beqz $zero,.L00038914 /* 380f4: 00001025 */ or $v0,$zero,$zero /* 380f8: 10000014 */ beqz $zero,.L0003814c /* 380fc: 00000000 */ sll $zero,$zero,0x0 .L00038100: /* 38100: 240d0001 */ addiu $t5,$zero,0x1 -/* 38104: 3c01800a */ lui $at,0x800a -/* 38108: ac2dc3e0 */ sw $t5,-0x3c20($at) +/* 38104: 3c01800a */ lui $at,%hi(var8009c3e0) +/* 38108: ac2dc3e0 */ sw $t5,%lo(var8009c3e0)($at) /* 3810c: 240e0001 */ addiu $t6,$zero,0x1 -/* 38110: 3c01800a */ lui $at,0x800a -/* 38114: a42ec3b4 */ sh $t6,-0x3c4c($at) -/* 38118: 3c01800a */ lui $at,0x800a -/* 3811c: ac20c3c8 */ sw $zero,-0x3c38($at) -/* 38120: 3c01800a */ lui $at,0x800a -/* 38124: ac20c3cc */ sw $zero,-0x3c34($at) -/* 38128: 3c01800a */ lui $at,0x800a -/* 3812c: ac20c3d0 */ sw $zero,-0x3c30($at) -/* 38130: 3c01800a */ lui $at,0x800a -/* 38134: ac20c3d8 */ sw $zero,-0x3c28($at) +/* 38110: 3c01800a */ lui $at,%hi(var8009c3b4) +/* 38114: a42ec3b4 */ sh $t6,%lo(var8009c3b4)($at) +/* 38118: 3c01800a */ lui $at,%hi(var8009c3c8) +/* 3811c: ac20c3c8 */ sw $zero,%lo(var8009c3c8)($at) +/* 38120: 3c01800a */ lui $at,%hi(var8009c3cc) +/* 38124: ac20c3cc */ sw $zero,%lo(var8009c3cc)($at) +/* 38128: 3c01800a */ lui $at,%hi(var8009c3d0) +/* 3812c: ac20c3d0 */ sw $zero,%lo(var8009c3d0)($at) +/* 38130: 3c01800a */ lui $at,%hi(var8009c3d8) +/* 38134: ac20c3d8 */ sw $zero,%lo(var8009c3d8)($at) /* 38138: 3c0f800a */ lui $t7,%hi(var8009c390) /* 3813c: 25efc390 */ addiu $t7,$t7,%lo(var8009c390) /* 38140: 8de40044 */ lw $a0,0x44($t7) @@ -480,9 +480,9 @@ glabel func00037fc0 .L00038154: /* 38154: 3c18800a */ lui $t8,%hi(var8009c3f0) /* 38158: 9318c3f0 */ lbu $t8,%lo(var8009c3f0)($t8) -/* 3815c: 3c01800a */ lui $at,0x800a +/* 3815c: 3c01800a */ lui $at,%hi(var8009c3f0) /* 38160: 2719ffff */ addiu $t9,$t8,-1 -/* 38164: a039c3f0 */ sb $t9,-0x3c10($at) +/* 38164: a039c3f0 */ sb $t9,%lo(var8009c3f0)($at) .L00038168: /* 38168: 3c08800a */ lui $t0,%hi(var8009c3e0) /* 3816c: 8d08c3e0 */ lw $t0,%lo(var8009c3e0)($t0) @@ -496,15 +496,15 @@ glabel func00037fc0 /* 3818c: 15200005 */ bnez $t1,.L000381a4 /* 38190: 00000000 */ sll $zero,$zero,0x0 /* 38194: 240a0001 */ addiu $t2,$zero,0x1 -/* 38198: 3c01800a */ lui $at,0x800a +/* 38198: 3c01800a */ lui $at,%hi(var8009c3e0) /* 3819c: 10000006 */ beqz $zero,.L000381b8 -/* 381a0: ac2ac3e0 */ sw $t2,-0x3c20($at) +/* 381a0: ac2ac3e0 */ sw $t2,%lo(var8009c3e0)($at) .L000381a4: /* 381a4: 3c0b800a */ lui $t3,%hi(var8009c3f0) /* 381a8: 916bc3f0 */ lbu $t3,%lo(var8009c3f0)($t3) -/* 381ac: 3c01800a */ lui $at,0x800a +/* 381ac: 3c01800a */ lui $at,%hi(var8009c3f0) /* 381b0: 256cffff */ addiu $t4,$t3,-1 -/* 381b4: a02cc3f0 */ sb $t4,-0x3c10($at) +/* 381b4: a02cc3f0 */ sb $t4,%lo(var8009c3f0)($at) .L000381b8: /* 381b8: 3c0d800a */ lui $t5,%hi(var8009c3e0) /* 381bc: 8dadc3e0 */ lw $t5,%lo(var8009c3e0)($t5) @@ -524,9 +524,9 @@ glabel func00037fc0 /* 381f4: 3c09800a */ lui $t1,%hi(var8009c3d0) /* 381f8: 8d29c3d0 */ lw $t1,%lo(var8009c3d0)($t1) /* 381fc: 8d08c3cc */ lw $t0,%lo(var8009c3cc)($t0) -/* 38200: 3c01800a */ lui $at,0x800a +/* 38200: 3c01800a */ lui $at,%hi(var8009c3cc) /* 38204: 01095023 */ subu $t2,$t0,$t1 -/* 38208: ac2ac3cc */ sw $t2,-0x3c34($at) +/* 38208: ac2ac3cc */ sw $t2,%lo(var8009c3cc)($at) /* 3820c: 3c0b800a */ lui $t3,%hi(var8009c3cc) /* 38210: 8d6bc3cc */ lw $t3,%lo(var8009c3cc)($t3) /* 38214: 1160000f */ beqz $t3,.L00038254 @@ -546,10 +546,10 @@ glabel func00037fc0 /* 3824c: 8f39c3cc */ lw $t9,%lo(var8009c3cc)($t9) /* 38250: afb90050 */ sw $t9,0x50($sp) .L00038254: -/* 38254: 3c01800a */ lui $at,0x800a -/* 38258: ac20c3d0 */ sw $zero,-0x3c30($at) -/* 3825c: 3c01800a */ lui $at,0x800a -/* 38260: ac20c3cc */ sw $zero,-0x3c34($at) +/* 38254: 3c01800a */ lui $at,%hi(var8009c3d0) +/* 38258: ac20c3d0 */ sw $zero,%lo(var8009c3d0)($at) +/* 3825c: 3c01800a */ lui $at,%hi(var8009c3cc) +/* 38260: ac20c3cc */ sw $zero,%lo(var8009c3cc)($at) /* 38264: 3c04800a */ lui $a0,%hi(var8009c394) /* 38268: 8c84c394 */ lw $a0,%lo(var8009c394)($a0) /* 3826c: 27a50058 */ addiu $a1,$sp,0x58 @@ -558,8 +558,8 @@ glabel func00037fc0 /* 38278: 10400042 */ beqz $v0,.L00038384 /* 3827c: 00000000 */ sll $zero,$zero,0x0 /* 38280: 8fa80058 */ lw $t0,0x58($sp) -/* 38284: 3c01800a */ lui $at,0x800a -/* 38288: ac28c3c8 */ sw $t0,-0x3c38($at) +/* 38284: 3c01800a */ lui $at,%hi(var8009c3c8) +/* 38288: ac28c3c8 */ sw $t0,%lo(var8009c3c8)($at) /* 3828c: 8fa9005c */ lw $t1,0x5c($sp) /* 38290: afa00064 */ sw $zero,0x64($sp) /* 38294: 1920002c */ blez $t1,.L00038348 @@ -611,24 +611,24 @@ glabel func00037fc0 .L00038348: /* 38348: 3c0a800a */ lui $t2,%hi(var8009c3d8) /* 3834c: 8d4ac3d8 */ lw $t2,%lo(var8009c3d8)($t2) -/* 38350: 3c01800a */ lui $at,0x800a +/* 38350: 3c01800a */ lui $at,%hi(var8009c3d8) /* 38354: 254effdc */ addiu $t6,$t2,-36 /* 38358: 31cf001e */ andi $t7,$t6,0x1e -/* 3835c: ac2fc3d8 */ sw $t7,-0x3c28($at) +/* 3835c: ac2fc3d8 */ sw $t7,%lo(var8009c3d8)($at) /* 38360: 24180240 */ addiu $t8,$zero,0x240 -/* 38364: 3c01800a */ lui $at,0x800a -/* 38368: ac38c3cc */ sw $t8,-0x3c34($at) +/* 38364: 3c01800a */ lui $at,%hi(var8009c3cc) +/* 38368: ac38c3cc */ sw $t8,%lo(var8009c3cc)($at) /* 3836c: 8fb9005c */ lw $t9,0x5c($sp) -/* 38370: 3c01800a */ lui $at,0x800a +/* 38370: 3c01800a */ lui $at,%hi(var8009c3f0+0x1) /* 38374: 3b280002 */ xori $t0,$t9,0x2 /* 38378: 2d080001 */ sltiu $t0,$t0,0x1 /* 3837c: 10000001 */ beqz $zero,.L00038384 -/* 38380: a028c3f1 */ sb $t0,-0x3c0f($at) +/* 38380: a028c3f1 */ sb $t0,%lo(var8009c3f0+0x1)($at) .L00038384: /* 38384: 0c00e32b */ jal func00038cac /* 38388: 00000000 */ sll $zero,$zero,0x0 -/* 3838c: 3c0b800a */ lui $t3,0x800a -/* 38390: 916bc3f1 */ lbu $t3,-0x3c0f($t3) +/* 3838c: 3c0b800a */ lui $t3,%hi(var8009c3f0+0x1) +/* 38390: 916bc3f1 */ lbu $t3,%lo(var8009c3f0+0x1)($t3) /* 38394: 15600002 */ bnez $t3,.L000383a0 /* 38398: 00000000 */ sll $zero,$zero,0x0 /* 3839c: afa0004c */ sw $zero,0x4c($sp) @@ -657,8 +657,8 @@ glabel func00037fc0 /* 383f4: 8fa40054 */ lw $a0,0x54($sp) /* 383f8: 8fad003c */ lw $t5,0x3c($sp) /* 383fc: ada20004 */ sw $v0,0x4($t5) -/* 38400: 3c0f800a */ lui $t7,0x800a -/* 38404: 91efc3f1 */ lbu $t7,-0x3c0f($t7) +/* 38400: 3c0f800a */ lui $t7,%hi(var8009c3f0+0x1) +/* 38404: 91efc3f1 */ lbu $t7,%lo(var8009c3f0+0x1)($t7) /* 38408: 11e00019 */ beqz $t7,.L00038470 /* 3840c: 00000000 */ sll $zero,$zero,0x0 /* 38410: 8fb80054 */ lw $t8,0x54($sp) @@ -736,8 +736,8 @@ glabel func00037fc0 /* 38528: 8fa40054 */ lw $a0,0x54($sp) /* 3852c: 8fab0034 */ lw $t3,0x34($sp) /* 38530: ad620004 */ sw $v0,0x4($t3) -/* 38534: 3c0d800a */ lui $t5,0x800a -/* 38538: 91adc3f1 */ lbu $t5,-0x3c0f($t5) +/* 38534: 3c0d800a */ lui $t5,%hi(var8009c3f0+0x1) +/* 38538: 91adc3f1 */ lbu $t5,%lo(var8009c3f0+0x1)($t5) /* 3853c: 11a00019 */ beqz $t5,.L000385a4 /* 38540: 00000000 */ sll $zero,$zero,0x0 /* 38544: 8fae0054 */ lw $t6,0x54($sp) @@ -768,15 +768,15 @@ glabel func00037fc0 /* 385a4: 3c08800a */ lui $t0,%hi(var8009c3d0) /* 385a8: 8d08c3d0 */ lw $t0,%lo(var8009c3d0)($t0) /* 385ac: 8faa0068 */ lw $t2,0x68($sp) -/* 385b0: 3c01800a */ lui $at,0x800a +/* 385b0: 3c01800a */ lui $at,%hi(var8009c3d0) /* 385b4: 010a5821 */ addu $t3,$t0,$t2 -/* 385b8: ac2bc3d0 */ sw $t3,-0x3c30($at) +/* 385b8: ac2bc3d0 */ sw $t3,%lo(var8009c3d0)($at) .L000385bc: /* 385bc: 3c04800a */ lui $a0,%hi(var8009c390) /* 385c0: 0c00e249 */ jal func00038924 /* 385c4: 2484c390 */ addiu $a0,$a0,%lo(var8009c390) -/* 385c8: 3c0d800a */ lui $t5,0x800a -/* 385cc: 91adc3f1 */ lbu $t5,-0x3c0f($t5) +/* 385c8: 3c0d800a */ lui $t5,%hi(var8009c3f0+0x1) +/* 385cc: 91adc3f1 */ lbu $t5,%lo(var8009c3f0+0x1)($t5) /* 385d0: 15a000c8 */ bnez $t5,.L000388f4 /* 385d4: 00000000 */ sll $zero,$zero,0x0 /* 385d8: 8faf006c */ lw $t7,0x6c($sp) @@ -796,22 +796,22 @@ glabel func00037fc0 /* 38610: 856bc3b4 */ lh $t3,%lo(var8009c3b4)($t3) /* 38614: 11600099 */ beqz $t3,.L0003887c /* 38618: 00000000 */ sll $zero,$zero,0x0 -/* 3861c: 3c01800a */ lui $at,0x800a -/* 38620: a420c3b4 */ sh $zero,-0x3c4c($at) +/* 3861c: 3c01800a */ lui $at,%hi(var8009c3b4) +/* 38620: a420c3b4 */ sh $zero,%lo(var8009c3b4)($at) /* 38624: 3c0d800a */ lui $t5,%hi(var8009c39c) /* 38628: 85adc39c */ lh $t5,%lo(var8009c39c)($t5) /* 3862c: 3c0c8006 */ lui $t4,%hi(var8005f570) -/* 38630: 3c0f800a */ lui $t7,0x800a +/* 38630: 3c0f800a */ lui $t7,%hi(var8009c39c+0x2) /* 38634: 31ae007f */ andi $t6,$t5,0x7f /* 38638: 000ec040 */ sll $t8,$t6,0x1 /* 3863c: 01986021 */ addu $t4,$t4,$t8 /* 38640: 858cf570 */ lh $t4,%lo(var8005f570)($t4) -/* 38644: 85efc39e */ lh $t7,-0x3c62($t7) -/* 38648: 3c01800a */ lui $at,0x800a +/* 38644: 85efc39e */ lh $t7,%lo(var8009c39c+0x2)($t7) +/* 38648: 3c01800a */ lui $at,%hi(var8009c3ac) /* 3864c: 018f0019 */ multu $t4,$t7 /* 38650: 00004812 */ mflo $t1 /* 38654: 0009cbc3 */ sra $t9,$t1,0xf -/* 38658: a439c3ac */ sh $t9,-0x3c54($at) +/* 38658: a439c3ac */ sh $t9,%lo(var8009c3ac)($at) /* 3865c: 3c08800a */ lui $t0,%hi(var8009c3a0) /* 38660: 3c0a800a */ lui $t2,%hi(var8009c3ac) /* 38664: 854ac3ac */ lh $t2,%lo(var8009c3ac)($t2) @@ -826,27 +826,27 @@ glabel func00037fc0 /* 38688: 468033a0 */ cvt.s.w $f14,$f6 /* 3868c: 0c00fd83 */ jal func0003f60c /* 38690: 46802320 */ cvt.s.w $f12,$f4 -/* 38694: 3c01800a */ lui $at,0x800a -/* 38698: a422c3aa */ sh $v0,-0x3c56($at) +/* 38694: 3c01800a */ lui $at,%hi(var8009c3a8+0x2) +/* 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 -/* 386a8: 3c0f800a */ lui $t7,0x800a +/* 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) -/* 386c0: 85efc39e */ lh $t7,-0x3c62($t7) -/* 386c4: 3c01800a */ lui $at,0x800a +/* 386c0: 85efc39e */ lh $t7,%lo(var8009c39c+0x2)($t7) +/* 386c4: 3c01800a */ lui $at,%hi(var8009c3b0+0x2) /* 386c8: 018f0019 */ multu $t4,$t7 /* 386cc: 00004812 */ mflo $t1 /* 386d0: 0009cbc3 */ sra $t9,$t1,0xf -/* 386d4: a439c3b2 */ sh $t9,-0x3c4e($at) -/* 386d8: 3c08800a */ lui $t0,0x800a -/* 386dc: 3c0a800a */ lui $t2,0x800a -/* 386e0: 854ac3b2 */ lh $t2,-0x3c4e($t2) -/* 386e4: 8508c3a2 */ lh $t0,-0x3c5e($t0) +/* 386d4: a439c3b2 */ sh $t9,%lo(var8009c3b0+0x2)($at) +/* 386d8: 3c08800a */ lui $t0,%hi(var8009c3a0+0x2) +/* 386dc: 3c0a800a */ lui $t2,%hi(var8009c3b0+0x2) +/* 386e0: 854ac3b2 */ lh $t2,%lo(var8009c3b0+0x2)($t2) +/* 386e4: 8508c3a2 */ lh $t0,%lo(var8009c3a0+0x2)($t0) /* 386e8: 3c07800a */ lui $a3,%hi(var8009c390) /* 386ec: 448a5000 */ mtc1 $t2,$f10 /* 386f0: 44884000 */ mtc1 $t0,$f8 @@ -857,8 +857,8 @@ glabel func00037fc0 /* 38704: 468053a0 */ cvt.s.w $f14,$f10 /* 38708: 0c00fd83 */ jal func0003f60c /* 3870c: 46804320 */ cvt.s.w $f12,$f8 -/* 38710: 3c01800a */ lui $at,0x800a -/* 38714: a422c3b0 */ sh $v0,-0x3c50($at) +/* 38710: 3c01800a */ lui $at,%hi(var8009c3b0) +/* 38714: a422c3b0 */ sh $v0,%lo(var8009c3b0)($at) /* 38718: 8fab006c */ lw $t3,0x6c($sp) /* 3871c: 8d6d0000 */ lw $t5,0x0($t3) /* 38720: afad0028 */ sw $t5,0x28($sp) @@ -874,8 +874,8 @@ glabel func00037fc0 /* 38748: af290000 */ sw $t1,0x0($t9) /* 3874c: 3c08800a */ lui $t0,%hi(var8009c3a4) /* 38750: 8508c3a4 */ lh $t0,%lo(var8009c3a4)($t0) -/* 38754: 3c0e800a */ lui $t6,0x800a -/* 38758: 85cec3a6 */ lh $t6,-0x3c5a($t6) +/* 38754: 3c0e800a */ lui $t6,%hi(var8009c3a4+0x2) +/* 38758: 85cec3a6 */ lh $t6,%lo(var8009c3a4+0x2)($t6) /* 3875c: 8fac0028 */ lw $t4,0x28($sp) /* 38760: 310affff */ andi $t2,$t0,0xffff /* 38764: 000a6c00 */ sll $t5,$t2,0x10 @@ -888,8 +888,8 @@ glabel func00037fc0 /* 38780: 8df90000 */ lw $t9,0x0($t7) /* 38784: 27280008 */ addiu $t0,$t9,0x8 /* 38788: ade80000 */ sw $t0,0x0($t7) -/* 3878c: 3c0a800a */ lui $t2,0x800a -/* 38790: 854ac3b2 */ lh $t2,-0x3c4e($t2) +/* 3878c: 3c0a800a */ lui $t2,%hi(var8009c3b0+0x2) +/* 38790: 854ac3b2 */ lh $t2,%lo(var8009c3b0+0x2)($t2) /* 38794: 8fb80024 */ lw $t8,0x24($sp) /* 38798: 3c010904 */ lui $at,0x904 /* 3879c: 314effff */ andi $t6,$t2,0xffff @@ -897,8 +897,8 @@ glabel func00037fc0 /* 387a4: af0d0000 */ sw $t5,0x0($t8) /* 387a8: 3c0b800a */ lui $t3,%hi(var8009c3b0) /* 387ac: 856bc3b0 */ lh $t3,%lo(var8009c3b0)($t3) -/* 387b0: 3c19800a */ lui $t9,0x800a -/* 387b4: 9739c3ae */ lhu $t9,-0x3c52($t9) +/* 387b0: 3c19800a */ lui $t9,%hi(var8009c3ac+0x2) +/* 387b4: 9739c3ae */ lhu $t9,%lo(var8009c3ac+0x2)($t9) /* 387b8: 8faa0024 */ lw $t2,0x24($sp) /* 387bc: 316cffff */ andi $t4,$t3,0xffff /* 387c0: 000c4c00 */ sll $t1,$t4,0x10 @@ -918,8 +918,8 @@ glabel func00037fc0 /* 387f8: 3199ffff */ andi $t9,$t4,0xffff /* 387fc: 03214825 */ or $t1,$t9,$at /* 38800: ad090000 */ sw $t1,0x0($t0) -/* 38804: 3c0f800a */ lui $t7,0x800a -/* 38808: 85efc3aa */ lh $t7,-0x3c56($t7) +/* 38804: 3c0f800a */ lui $t7,%hi(var8009c3a8+0x2) +/* 38808: 85efc3aa */ lh $t7,%lo(var8009c3a8+0x2)($t7) /* 3880c: 3c18800a */ lui $t8,%hi(var8009c3a8) /* 38810: 9718c3a8 */ lhu $t8,%lo(var8009c3a8)($t8) /* 38814: 8fac0020 */ lw $t4,0x20($sp) @@ -934,8 +934,8 @@ glabel func00037fc0 /* 38838: 8f280000 */ lw $t0,0x0($t9) /* 3883c: 250f0008 */ addiu $t7,$t0,0x8 /* 38840: af2f0000 */ sw $t7,0x0($t9) -/* 38844: 3c0a800a */ lui $t2,0x800a -/* 38848: 854ac3a2 */ lh $t2,-0x3c5e($t2) +/* 38844: 3c0a800a */ lui $t2,%hi(var8009c3a0+0x2) +/* 38848: 854ac3a2 */ lh $t2,%lo(var8009c3a0+0x2)($t2) /* 3884c: 8fab001c */ lw $t3,0x1c($sp) /* 38850: 3c010301 */ lui $at,0x301 /* 38854: 3158ffff */ andi $t8,$t2,0xffff @@ -966,9 +966,9 @@ glabel func00037fc0 .L000388b4: /* 388b4: 3c0d800a */ lui $t5,%hi(var8009c3b8) /* 388b8: 8dadc3b8 */ lw $t5,%lo(var8009c3b8)($t5) -/* 388bc: 3c01800a */ lui $at,0x800a +/* 388bc: 3c01800a */ lui $at,%hi(var8009c3b8) /* 388c0: 25ab00b8 */ addiu $t3,$t5,0xb8 -/* 388c4: ac2bc3b8 */ sw $t3,-0x3c48($at) +/* 388c4: ac2bc3b8 */ sw $t3,%lo(var8009c3b8)($at) /* 388c8: 3c0e800a */ lui $t6,%hi(var8009c3b8) /* 388cc: 3c09800a */ lui $t1,%hi(var8009c3bc) /* 388d0: 8d29c3bc */ lw $t1,%lo(var8009c3bc)($t1) @@ -978,8 +978,8 @@ glabel func00037fc0 /* 388e0: 00000000 */ sll $zero,$zero,0x0 /* 388e4: 3c08800a */ lui $t0,%hi(var8009c3bc) /* 388e8: 8d08c3bc */ lw $t0,%lo(var8009c3bc)($t0) -/* 388ec: 3c01800a */ lui $at,0x800a -/* 388f0: ac28c3b8 */ sw $t0,-0x3c48($at) +/* 388ec: 3c01800a */ lui $at,%hi(var8009c3b8) +/* 388f0: ac28c3b8 */ sw $t0,%lo(var8009c3b8)($at) .L000388f4: /* 388f4: 10000003 */ beqz $zero,.L00038904 /* 388f8: 00000000 */ sll $zero,$zero,0x0 @@ -1096,8 +1096,8 @@ glabel func00038924 /* 38a84: 856f005c */ lh $t7,0x5c($t3) /* 38a88: 118f002a */ beq $t4,$t7,.L00038b34 /* 38a8c: 00000000 */ sll $zero,$zero,0x0 -/* 38a90: 3c0d800a */ lui $t5,0x800a -/* 38a94: 91adc342 */ lbu $t5,-0x3cbe($t5) +/* 38a90: 3c0d800a */ lui $t5,%hi(var8009c340+0x2) +/* 38a94: 91adc342 */ lbu $t5,%lo(var8009c340+0x2)($t5) /* 38a98: 11a0000a */ beqz $t5,.L00038ac4 /* 38a9c: 00000000 */ sll $zero,$zero,0x0 /* 38aa0: 8fae0018 */ lw $t6,0x18($sp) @@ -1110,8 +1110,8 @@ glabel func00038924 /* 38abc: 1000000c */ beqz $zero,.L00038af0 /* 38ac0: a5cb000c */ sh $t3,0xc($t6) .L00038ac4: -/* 38ac4: 3c0c800a */ lui $t4,0x800a -/* 38ac8: 918cc341 */ lbu $t4,-0x3cbf($t4) +/* 38ac4: 3c0c800a */ lui $t4,%hi(var8009c340+0x1) +/* 38ac8: 918cc341 */ lbu $t4,%lo(var8009c340+0x1)($t4) /* 38acc: 11800005 */ beqz $t4,.L00038ae4 /* 38ad0: 00000000 */ sll $zero,$zero,0x0 /* 38ad4: 8fad0018 */ lw $t5,0x18($sp) @@ -1171,8 +1171,8 @@ glabel func00038924 GLOBAL_ASM( glabel func00038b90 -/* 38b90: 3c01800a */ lui $at,0x800a -/* 38b94: ac24c3dc */ sw $a0,-0x3c24($at) +/* 38b90: 3c01800a */ lui $at,%hi(var8009c3dc) +/* 38b94: ac24c3dc */ sw $a0,%lo(var8009c3dc)($at) /* 38b98: 03e00008 */ jr $ra /* 38b9c: 00000000 */ sll $zero,$zero,0x0 /* 38ba0: 03e00008 */ jr $ra @@ -1192,8 +1192,8 @@ glabel func00038ba8 /* 38bc8: 11c10004 */ beq $t6,$at,.L00038bdc /* 38bcc: 00000000 */ sll $zero,$zero,0x0 /* 38bd0: 8faf002c */ lw $t7,0x2c($sp) -/* 38bd4: 3c01800a */ lui $at,0x800a -/* 38bd8: ac2fc3c4 */ sw $t7,-0x3c3c($at) +/* 38bd4: 3c01800a */ lui $at,%hi(var8009c3c4) +/* 38bd8: ac2fc3c4 */ sw $t7,%lo(var8009c3c4)($at) .L00038bdc: /* 38bdc: 3c18800a */ lui $t8,%hi(var8009c3c4) /* 38be0: 8f18c3c4 */ lw $t8,%lo(var8009c3c4)($t8) @@ -1237,9 +1237,9 @@ glabel func00038ba8 /* 38c74: 3c08800a */ lui $t0,%hi(var8009c3c4) /* 38c78: 8d08c3c4 */ lw $t0,%lo(var8009c3c4)($t0) /* 38c7c: 8fa90028 */ lw $t1,0x28($sp) -/* 38c80: 3c01800a */ lui $at,0x800a +/* 38c80: 3c01800a */ lui $at,%hi(var8009c3c4) /* 38c84: 01095021 */ addu $t2,$t0,$t1 -/* 38c88: ac2ac3c4 */ sw $t2,-0x3c3c($at) +/* 38c88: ac2ac3c4 */ sw $t2,%lo(var8009c3c4)($at) /* 38c8c: 10000003 */ beqz $zero,.L00038c9c /* 38c90: 8fa20028 */ lw $v0,0x28($sp) /* 38c94: 10000001 */ beqz $zero,.L00038c9c diff --git a/src/lib/lib_3a100.c b/src/lib/lib_3a100.c index 53bfcd6d0..564d3d9c7 100644 --- a/src/lib/lib_3a100.c +++ b/src/lib/lib_3a100.c @@ -188,9 +188,9 @@ glabel func0003a100 /* 3a340: 016e7821 */ addu $t7,$t3,$t6 /* 3a344: afaf0064 */ sw $t7,0x64($sp) /* 3a348: 8fb90088 */ lw $t9,0x88($sp) -/* 3a34c: 3c18800a */ lui $t8,0x800a +/* 3a34c: 3c18800a */ lui $t8,%hi(var8009c344+0x2) /* 3a350: 0319c021 */ addu $t8,$t8,$t9 -/* 3a354: 9318c346 */ lbu $t8,-0x3cba($t8) +/* 3a354: 9318c346 */ lbu $t8,%lo(var8009c344+0x2)($t8) /* 3a358: 1300000e */ beqz $t8,.L0003a394 /* 3a35c: 00000000 */ sll $zero,$zero,0x0 /* 3a360: 3c08800a */ lui $t0,%hi(var8009c344) @@ -484,9 +484,9 @@ glabel func0003a100 /* 3a7a8: afaa0014 */ sw $t2,0x14($sp) /* 3a7ac: afa2007c */ sw $v0,0x7c($sp) /* 3a7b0: 8fae0088 */ lw $t6,0x88($sp) -/* 3a7b4: 3c18800a */ lui $t8,0x800a +/* 3a7b4: 3c18800a */ lui $t8,%hi(var8009c344+0x2) /* 3a7b8: 030ec021 */ addu $t8,$t8,$t6 -/* 3a7bc: 9318c346 */ lbu $t8,-0x3cba($t8) +/* 3a7bc: 9318c346 */ lbu $t8,%lo(var8009c344+0x2)($t8) /* 3a7c0: 13000011 */ beqz $t8,.L0003a808 /* 3a7c4: 00000000 */ sll $zero,$zero,0x0 /* 3a7c8: 8faf007c */ lw $t7,0x7c($sp) diff --git a/src/lib/lib_3e730.c b/src/lib/lib_3e730.c index b34505ccb..56eb8b015 100644 --- a/src/lib/lib_3e730.c +++ b/src/lib/lib_3e730.c @@ -5726,8 +5726,8 @@ glabel func0003e8c0 /* 3eaf4: 858cf66e */ lh $t4,-0x992($t4) /* 3eaf8: 318dfffe */ andi $t5,$t4,0xfffe /* 3eafc: a70d0062 */ sh $t5,0x62($t8) -/* 3eb00: 3c19800a */ lui $t9,0x800a -/* 3eb04: 9339c342 */ lbu $t9,-0x3cbe($t9) +/* 3eb00: 3c19800a */ lui $t9,%hi(var8009c340+0x2) +/* 3eb04: 9339c342 */ lbu $t9,%lo(var8009c340+0x2)($t9) /* 3eb08: 13200007 */ beqz $t9,.L0003eb28 /* 3eb0c: 00000000 */ sll $zero,$zero,0x0 /* 3eb10: 8fae0050 */ lw $t6,0x50($sp) @@ -5737,8 +5737,8 @@ glabel func0003e8c0 /* 3eb20: 10000008 */ beqz $zero,.L0003eb44 /* 3eb24: a5c90058 */ sh $t1,0x58($t6) .L0003eb28: -/* 3eb28: 3c0a800a */ lui $t2,0x800a -/* 3eb2c: 914ac341 */ lbu $t2,-0x3cbf($t2) +/* 3eb28: 3c0a800a */ lui $t2,%hi(var8009c340+0x1) +/* 3eb2c: 914ac341 */ lbu $t2,%lo(var8009c340+0x1)($t2) /* 3eb30: 11400004 */ beqz $t2,.L0003eb44 /* 3eb34: 00000000 */ sll $zero,$zero,0x0 /* 3eb38: 8fac0050 */ lw $t4,0x50($sp) @@ -5892,8 +5892,8 @@ glabel func0003e8c0 /* 3ed6c: 85780008 */ lh $t8,0x8($t3) /* 3ed70: 17010018 */ bne $t8,$at,.L0003edd4 /* 3ed74: 00000000 */ sll $zero,$zero,0x0 -/* 3ed78: 3c0a800a */ lui $t2,0x800a -/* 3ed7c: 914ac342 */ lbu $t2,-0x3cbe($t2) +/* 3ed78: 3c0a800a */ lui $t2,%hi(var8009c340+0x2) +/* 3ed7c: 914ac342 */ lbu $t2,%lo(var8009c340+0x2)($t2) /* 3ed80: 11400008 */ beqz $t2,.L0003eda4 /* 3ed84: 00000000 */ sll $zero,$zero,0x0 /* 3ed88: 8fad0050 */ lw $t5,0x50($sp) @@ -5904,8 +5904,8 @@ glabel func0003e8c0 /* 3ed9c: 1000000d */ beqz $zero,.L0003edd4 /* 3eda0: a5ae0058 */ sh $t6,0x58($t5) .L0003eda4: -/* 3eda4: 3c0f800a */ lui $t7,0x800a -/* 3eda8: 91efc341 */ lbu $t7,-0x3cbf($t7) +/* 3eda4: 3c0f800a */ lui $t7,%hi(var8009c340+0x1) +/* 3eda8: 91efc341 */ lbu $t7,%lo(var8009c340+0x1)($t7) /* 3edac: 11e00005 */ beqz $t7,.L0003edc4 /* 3edb0: 00000000 */ sll $zero,$zero,0x0 /* 3edb4: 8fab0050 */ lw $t3,0x50($sp) @@ -6881,10 +6881,10 @@ glabel func0003f8a0 /* 3fbcc: 15400008 */ bnez $t2,.L0003fbf0 /* 3fbd0: 00000000 */ sll $zero,$zero,0x0 /* 3fbd4: 8fab0264 */ lw $t3,0x264($sp) -/* 3fbd8: 3c01800a */ lui $at,0x800a +/* 3fbd8: 3c01800a */ lui $at,%hi(var8009c650) /* 3fbdc: 000b6080 */ sll $t4,$t3,0x2 /* 3fbe0: 002c0821 */ addu $at,$at,$t4 -/* 3fbe4: ac20c650 */ sw $zero,-0x39b0($at) +/* 3fbe4: ac20c650 */ sw $zero,%lo(var8009c650)($at) /* 3fbe8: 1000010e */ beqz $zero,.L00040024 /* 3fbec: 00000000 */ sll $zero,$zero,0x0 .L0003fbf0: @@ -6892,12 +6892,12 @@ glabel func0003f8a0 /* 3fbf4: 8fb90264 */ lw $t9,0x264($sp) /* 3fbf8: 3c0f800a */ lui $t7,%hi(var8009c640) /* 3fbfc: 8defc640 */ lw $t7,%lo(var8009c640)($t7) -/* 3fc00: 3c01800a */ lui $at,0x800a +/* 3fc00: 3c01800a */ lui $at,%hi(var8009c650) /* 3fc04: 000d7080 */ sll $t6,$t5,0x2 /* 3fc08: 00194080 */ sll $t0,$t9,0x2 /* 3fc0c: 00280821 */ addu $at,$at,$t0 /* 3fc10: 01cfc021 */ addu $t8,$t6,$t7 -/* 3fc14: ac38c650 */ sw $t8,-0x39b0($at) +/* 3fc14: ac38c650 */ sw $t8,%lo(var8009c650)($at) /* 3fc18: 8fa90264 */ lw $t1,0x264($sp) /* 3fc1c: 3c0b800a */ lui $t3,%hi(var8009c650) /* 3fc20: 00095080 */ sll $t2,$t1,0x2 @@ -7186,8 +7186,8 @@ glabel func0003f8a0 /* 40034: afb90264 */ sw $t9,0x264($sp) /* 40038: 3c0e800a */ lui $t6,%hi(var8009c644) /* 4003c: 8dcec644 */ lw $t6,%lo(var8009c644)($t6) -/* 40040: 3c01800a */ lui $at,0x800a -/* 40044: ac2ec648 */ sw $t6,-0x39b8($at) +/* 40040: 3c01800a */ lui $at,%hi(var8009c648) +/* 40044: ac2ec648 */ sw $t6,%lo(var8009c648)($at) /* 40048: 3c0d800a */ lui $t5,%hi(var8009c648) /* 4004c: 8dadc648 */ lw $t5,%lo(var8009c648)($t5) /* 40050: 15a00003 */ bnez $t5,.L00040060 diff --git a/src/lib/lib_43dd0.c b/src/lib/lib_43dd0.c index b65e98425..131aeb3e6 100644 --- a/src/lib/lib_43dd0.c +++ b/src/lib/lib_43dd0.c @@ -562,8 +562,8 @@ glabel func0004453c /* 44598: 14400006 */ bnez $v0,.L000445b4 /* 4459c: 00000000 */ sll $zero,$zero,0x0 /* 445a0: 240c0003 */ addiu $t4,$zero,0x3 -/* 445a4: 3c01800a */ lui $at,0x800a -/* 445a8: ac2cc3e0 */ sw $t4,-0x3c20($at) +/* 445a4: 3c01800a */ lui $at,%hi(var8009c3e0) +/* 445a8: ac2cc3e0 */ sw $t4,%lo(var8009c3e0)($at) /* 445ac: 10000024 */ beqz $zero,.L00044640 /* 445b0: 00001025 */ or $v0,$zero,$zero .L000445b4: diff --git a/src/lib/lib_44bc0.c b/src/lib/lib_44bc0.c index 766b0758d..5a3dbcdb5 100644 --- a/src/lib/lib_44bc0.c +++ b/src/lib/lib_44bc0.c @@ -61,9 +61,9 @@ glabel func00044bc0 /* 44c68: 13000023 */ beqz $t8,.L00044cf8 /* 44c6c: 00000000 */ sll $zero,$zero,0x0 /* 44c70: 8fa80040 */ lw $t0,0x40($sp) -/* 44c74: 3c09800a */ lui $t1,0x800a +/* 44c74: 3c09800a */ lui $t1,%hi(var8009c344+0x2) /* 44c78: 01284821 */ addu $t1,$t1,$t0 -/* 44c7c: 9129c346 */ lbu $t1,-0x3cba($t1) +/* 44c7c: 9129c346 */ lbu $t1,%lo(var8009c344+0x2)($t1) /* 44c80: 1120000f */ beqz $t1,.L00044cc0 /* 44c84: 00000000 */ sll $zero,$zero,0x0 /* 44c88: 8faa0044 */ lw $t2,0x44($sp) @@ -98,9 +98,9 @@ glabel func00044bc0 /* 44cf4: 00000000 */ sll $zero,$zero,0x0 .L00044cf8: /* 44cf8: 8fac0040 */ lw $t4,0x40($sp) -/* 44cfc: 3c0d800a */ lui $t5,0x800a +/* 44cfc: 3c0d800a */ lui $t5,%hi(var8009c344+0x2) /* 44d00: 01ac6821 */ addu $t5,$t5,$t4 -/* 44d04: 91adc346 */ lbu $t5,-0x3cba($t5) +/* 44d04: 91adc346 */ lbu $t5,%lo(var8009c344+0x2)($t5) /* 44d08: 11a0000f */ beqz $t5,.L00044d48 /* 44d0c: 00000000 */ sll $zero,$zero,0x0 /* 44d10: 8fae0044 */ lw $t6,0x44($sp) diff --git a/src/lib/lib_491b0.c b/src/lib/lib_491b0.c index a194a5265..93bf86f57 100644 --- a/src/lib/lib_491b0.c +++ b/src/lib/lib_491b0.c @@ -15,17 +15,17 @@ GLOBAL_ASM( glabel __osTimerServicesInit -/* 491b0: 3c01800a */ lui $at,0x800a +/* 491b0: 3c01800a */ lui $at,%hi(var8009c784) /* 491b4: 240e0000 */ addiu $t6,$zero,0x0 /* 491b8: 240f0000 */ addiu $t7,$zero,0x0 -/* 491bc: ac2fc784 */ sw $t7,-0x387c($at) +/* 491bc: ac2fc784 */ sw $t7,%lo(var8009c784)($at) /* 491c0: ac2ec780 */ sw $t6,-0x3880($at) -/* 491c4: 3c01800a */ lui $at,0x800a +/* 491c4: 3c01800a */ lui $at,%hi(var8009c788) /* 491c8: 3c188006 */ lui $t8,%hi(var800608a0) /* 491cc: 8f1808a0 */ lw $t8,%lo(var800608a0)($t8) -/* 491d0: ac20c788 */ sw $zero,-0x3878($at) -/* 491d4: 3c01800a */ lui $at,0x800a -/* 491d8: ac20c78c */ sw $zero,-0x3874($at) +/* 491d0: ac20c788 */ sw $zero,%lo(var8009c788)($at) +/* 491d4: 3c01800a */ lui $at,%hi(var8009c78c) +/* 491d8: ac20c78c */ sw $zero,%lo(var8009c78c)($at) /* 491dc: 3c198006 */ lui $t9,%hi(var800608a0) /* 491e0: af180004 */ sw $t8,0x4($t8) /* 491e4: 8f3908a0 */ lw $t9,%lo(var800608a0)($t9) @@ -69,9 +69,9 @@ glabel __osTimerInterrupt /* 49268: afb90024 */ sw $t9,0x24($sp) /* 4926c: 0c014620 */ jal __osSetCompare /* 49270: 00002025 */ or $a0,$zero,$zero -/* 49274: 3c01800a */ lui $at,0x800a +/* 49274: 3c01800a */ lui $at,%hi(var8009c790) /* 49278: 1000004a */ beqz $zero,.L000493a4 -/* 4927c: ac20c790 */ sw $zero,-0x3870($at) +/* 4927c: ac20c790 */ sw $zero,%lo(var8009c790)($at) .L00049280: /* 49280: 0c012144 */ jal osGetCount /* 49284: 00000000 */ sll $zero,$zero,0x0 @@ -80,10 +80,10 @@ glabel __osTimerInterrupt /* 49290: 8d29c790 */ lw $t1,%lo(var8009c790)($t1) /* 49294: 8fa80020 */ lw $t0,0x20($sp) /* 49298: 8faf0024 */ lw $t7,0x24($sp) -/* 4929c: 3c01800a */ lui $at,0x800a +/* 4929c: 3c01800a */ lui $at,%hi(var8009c790) /* 492a0: 01095023 */ subu $t2,$t0,$t1 /* 492a4: afaa001c */ sw $t2,0x1c($sp) -/* 492a8: ac28c790 */ sw $t0,-0x3870($at) +/* 492a8: ac28c790 */ sw $t0,%lo(var8009c790)($at) /* 492ac: 8dee0010 */ lw $t6,0x10($t7) /* 492b0: 8fab001c */ lw $t3,0x1c($sp) /* 492b4: 240c0000 */ addiu $t4,$zero,0x0 @@ -166,8 +166,8 @@ glabel __osSetTimerIntr /* 493c4: afa5002c */ sw $a1,0x2c($sp) /* 493c8: 0c012144 */ jal osGetCount /* 493cc: afa2001c */ sw $v0,0x1c($sp) -/* 493d0: 3c01800a */ lui $at,0x800a -/* 493d4: ac22c790 */ sw $v0,-0x3870($at) +/* 493d0: 3c01800a */ lui $at,%hi(var8009c790) +/* 493d4: ac22c790 */ sw $v0,%lo(var8009c790)($at) /* 493d8: 3c0e800a */ lui $t6,%hi(var8009c790) /* 493dc: 8dcec790 */ lw $t6,%lo(var8009c790)($t6) /* 493e0: 8fa9002c */ lw $t1,0x2c($sp) diff --git a/src/lib/lib_4a980.c b/src/lib/lib_4a980.c index 2705d017d..9d391d009 100644 --- a/src/lib/lib_4a980.c +++ b/src/lib/lib_4a980.c @@ -72,8 +72,8 @@ glabel func0004a980 /* 4aa4c: 24060001 */ addiu $a2,$zero,0x1 .L0004aa50: /* 4aa50: 24180004 */ addiu $t8,$zero,0x4 -/* 4aa54: 3c01800a */ lui $at,0x800a -/* 4aa58: a038c821 */ sb $t8,-0x37df($at) +/* 4aa54: 3c01800a */ lui $at,%hi(var8009c820+0x1) +/* 4aa58: a038c821 */ sb $t8,%lo(var8009c820+0x1)($at) /* 4aa5c: 0c012af0 */ jal func0004abc0 /* 4aa60: 00002025 */ or $a0,$zero,$zero /* 4aa64: 3c05800a */ lui $a1,%hi(var8009c7e0) @@ -97,9 +97,9 @@ glabel func0004a980 /* 4aaac: 8fa40074 */ lw $a0,0x74($sp) /* 4aab0: 0c012abc */ jal func0004aaf0 /* 4aab4: 8fa50078 */ lw $a1,0x78($sp) -/* 4aab8: 3c01800a */ lui $at,0x800a +/* 4aab8: 3c01800a */ lui $at,%hi(var8009c820) /* 4aabc: 0c012a04 */ jal __osSiCreateAccessQueue -/* 4aac0: a020c820 */ sb $zero,-0x37e0($at) +/* 4aac0: a020c820 */ sb $zero,%lo(var8009c820)($at) /* 4aac4: 3c04800a */ lui $a0,%hi(var8009c848) /* 4aac8: 3c05800a */ lui $a1,%hi(var8009c860) /* 4aacc: 24a5c860 */ addiu $a1,$a1,%lo(var8009c860) @@ -116,8 +116,8 @@ glabel func0004a980 GLOBAL_ASM( glabel func0004aaf0 -/* 4aaf0: 3c0f800a */ lui $t7,0x800a -/* 4aaf4: 91efc821 */ lbu $t7,-0x37df($t7) +/* 4aaf0: 3c0f800a */ lui $t7,%hi(var8009c820+0x1) +/* 4aaf4: 91efc821 */ lbu $t7,%lo(var8009c820+0x1)($t7) /* 4aaf8: 27bdffe8 */ addiu $sp,$sp,-24 /* 4aafc: 3c0e800a */ lui $t6,%hi(var8009c7e0) /* 4ab00: 25cec7e0 */ addiu $t6,$t6,%lo(var8009c7e0) @@ -156,8 +156,8 @@ glabel func0004aaf0 /* 4ab80: a3ad0007 */ sb $t5,0x7($sp) .L0004ab84: /* 4ab84: 8fae0008 */ lw $t6,0x8($sp) -/* 4ab88: 3c19800a */ lui $t9,0x800a -/* 4ab8c: 9339c821 */ lbu $t9,-0x37df($t9) +/* 4ab88: 3c19800a */ lui $t9,%hi(var8009c820+0x1) +/* 4ab8c: 9339c821 */ lbu $t9,%lo(var8009c820+0x1)($t9) /* 4ab90: 8fa80014 */ lw $t0,0x14($sp) /* 4ab94: 25cf0001 */ addiu $t7,$t6,0x1 /* 4ab98: 01f9082a */ slt $at,$t7,$t9 @@ -181,19 +181,19 @@ glabel func0004abc0 .L0004abcc: /* 4abcc: 8fae0000 */ lw $t6,0x0($sp) /* 4abd0: 8fb80000 */ lw $t8,0x0($sp) -/* 4abd4: 3c01800a */ lui $at,0x800a +/* 4abd4: 3c01800a */ lui $at,%hi(var8009c7e0) /* 4abd8: 000e7880 */ sll $t7,$t6,0x2 /* 4abdc: 002f0821 */ addu $at,$at,$t7 -/* 4abe0: ac20c7e0 */ sw $zero,-0x3820($at) +/* 4abe0: ac20c7e0 */ sw $zero,%lo(var8009c7e0)($at) /* 4abe4: 27190001 */ addiu $t9,$t8,0x1 /* 4abe8: 2b21000f */ slti $at,$t9,0xf /* 4abec: 1420fff7 */ bnez $at,.L0004abcc /* 4abf0: afb90000 */ sw $t9,0x0($sp) -/* 4abf4: 3c19800a */ lui $t9,0x800a -/* 4abf8: 9339c821 */ lbu $t9,-0x37df($t9) +/* 4abf4: 3c19800a */ lui $t9,%hi(var8009c820+0x1) +/* 4abf8: 9339c821 */ lbu $t9,%lo(var8009c820+0x1)($t9) /* 4abfc: 3c09800a */ lui $t1,%hi(var8009c7e0) /* 4ac00: 24080001 */ addiu $t0,$zero,0x1 -/* 4ac04: 3c01800a */ lui $at,0x800a +/* 4ac04: 3c01800a */ lui $at,%hi(var8009c81c) /* 4ac08: 2529c7e0 */ addiu $t1,$t1,%lo(var8009c7e0) /* 4ac0c: 240a00ff */ addiu $t2,$zero,0xff /* 4ac10: 240b0001 */ addiu $t3,$zero,0x1 @@ -202,7 +202,7 @@ glabel func0004abc0 /* 4ac1c: 240e00ff */ addiu $t6,$zero,0xff /* 4ac20: 240f00ff */ addiu $t7,$zero,0xff /* 4ac24: 241800ff */ addiu $t8,$zero,0xff -/* 4ac28: ac28c81c */ sw $t0,-0x37e4($at) +/* 4ac28: ac28c81c */ sw $t0,%lo(var8009c81c)($at) /* 4ac2c: afa9000c */ sw $t1,0xc($sp) /* 4ac30: a3aa0004 */ sb $t2,0x4($sp) /* 4ac34: a3ab0005 */ sb $t3,0x5($sp) @@ -218,14 +218,14 @@ glabel func0004abc0 /* 4ac58: 27a90004 */ addiu $t1,$sp,0x4 /* 4ac5c: 8d210000 */ lw $at,0x0($t1) /* 4ac60: 8fa8000c */ lw $t0,0xc($sp) -/* 4ac64: 3c18800a */ lui $t8,0x800a +/* 4ac64: 3c18800a */ lui $t8,%hi(var8009c820+0x1) /* 4ac68: a9010000 */ swl $at,0x0($t0) /* 4ac6c: b9010003 */ swr $at,0x3($t0) /* 4ac70: 8d2b0004 */ lw $t3,0x4($t1) /* 4ac74: a90b0004 */ swl $t3,0x4($t0) /* 4ac78: b90b0007 */ swr $t3,0x7($t0) /* 4ac7c: 8fae0000 */ lw $t6,0x0($sp) -/* 4ac80: 9318c821 */ lbu $t8,-0x37df($t8) +/* 4ac80: 9318c821 */ lbu $t8,%lo(var8009c820+0x1)($t8) /* 4ac84: 8fac000c */ lw $t4,0xc($sp) /* 4ac88: 25cf0001 */ addiu $t7,$t6,0x1 /* 4ac8c: 01f8082a */ slt $at,$t7,$t8 diff --git a/src/lib/lib_4ba90.c b/src/lib/lib_4ba90.c index 6eec3f36c..a5ca31518 100644 --- a/src/lib/lib_4ba90.c +++ b/src/lib/lib_4ba90.c @@ -77,10 +77,10 @@ glabel __osPfsRequestOneChannel /* 4bb60: 27bdffe8 */ addiu $sp,$sp,-24 /* 4bb64: 3c068009 */ lui $a2,%hi(var80090a20) /* 4bb68: 240700fe */ addiu $a3,$zero,0xfe -/* 4bb6c: 3c01800a */ lui $at,0x800a +/* 4bb6c: 3c01800a */ lui $at,%hi(var8009c820) /* 4bb70: 24c20a20 */ addiu $v0,$a2,%lo(var80090a20) /* 4bb74: afa5001c */ sw $a1,0x1c($sp) -/* 4bb78: a027c820 */ sb $a3,-0x37e0($at) +/* 4bb78: a027c820 */ sb $a3,%lo(var8009c820)($at) /* 4bb7c: 240f0001 */ addiu $t7,$zero,0x1 /* 4bb80: ac4f003c */ sw $t7,0x3c($v0) /* 4bb84: 24180001 */ addiu $t8,$zero,0x1 @@ -248,8 +248,8 @@ glabel osEepromWrite /* 4bdb8: 0c012a34 */ jal __osSiRawStartDma /* 4bdbc: 00002025 */ or $a0,$zero,$zero /* 4bdc0: 240c0005 */ addiu $t4,$zero,0x5 -/* 4bdc4: 3c01800a */ lui $at,0x800a -/* 4bdc8: a02cc820 */ sb $t4,-0x37e0($at) +/* 4bdc4: 3c01800a */ lui $at,%hi(var8009c820) +/* 4bdc8: a02cc820 */ sb $t4,%lo(var8009c820)($at) /* 4bdcc: 02202025 */ or $a0,$s1,$zero /* 4bdd0: 00002825 */ or $a1,$zero,$zero /* 4bdd4: 0c0121bc */ jal osRecvMesg @@ -304,10 +304,10 @@ glabel __osPackEepWriteData /* 4be80: 24a50001 */ addiu $a1,$a1,0x1 /* 4be84: 1420fffb */ bnez $at,.L0004be74 /* 4be88: a0c90003 */ sb $t1,0x3($a2) -/* 4be8c: 3c01800a */ lui $at,0x800a -/* 4be90: 3c02800a */ lui $v0,0x800a -/* 4be94: 2442ca81 */ addiu $v0,$v0,-13695 -/* 4be98: a020ca80 */ sb $zero,-0x3580($at) +/* 4be8c: 3c01800a */ lui $at,%hi(var8009ca80) +/* 4be90: 3c02800a */ lui $v0,%hi(var8009ca80+0x1) +/* 4be94: 2442ca81 */ addiu $v0,$v0,%lo(var8009ca80+0x1) +/* 4be98: a020ca80 */ sb $zero,%lo(var8009ca80)($at) /* 4be9c: a0400002 */ sb $zero,0x2($v0) /* 4bea0: a0400001 */ sb $zero,0x1($v0) /* 4bea4: a0400000 */ sb $zero,0x0($v0) @@ -387,9 +387,9 @@ glabel __osEepStatus /* 4bfb4: 0c0121bc */ jal osRecvMesg /* 4bfb8: 24060001 */ addiu $a2,$zero,0x1 /* 4bfbc: 241900fe */ addiu $t9,$zero,0xfe -/* 4bfc0: 3c01800a */ lui $at,0x800a +/* 4bfc0: 3c01800a */ lui $at,%hi(var8009c820) /* 4bfc4: 3c05800a */ lui $a1,%hi(var8009ca80) -/* 4bfc8: a039c820 */ sb $t9,-0x37e0($at) +/* 4bfc8: a039c820 */ sb $t9,%lo(var8009c820)($at) /* 4bfcc: 24a5ca80 */ addiu $a1,$a1,%lo(var8009ca80) /* 4bfd0: 0c012a34 */ jal __osSiRawStartDma /* 4bfd4: 00002025 */ or $a0,$zero,$zero @@ -399,14 +399,14 @@ glabel __osEepStatus /* 4bfe4: 0c0121bc */ jal osRecvMesg /* 4bfe8: afa2002c */ sw $v0,0x2c($sp) /* 4bfec: 8fa3002c */ lw $v1,0x2c($sp) -/* 4bff0: 3c02800a */ lui $v0,0x800a -/* 4bff4: 2442ca81 */ addiu $v0,$v0,-13695 +/* 4bff0: 3c02800a */ lui $v0,%hi(var8009ca80+0x1) +/* 4bff4: 2442ca81 */ addiu $v0,$v0,%lo(var8009ca80+0x1) /* 4bff8: 10600003 */ beqz $v1,.L0004c008 -/* 4bffc: 3c01800a */ lui $at,0x800a +/* 4bffc: 3c01800a */ lui $at,%hi(var8009ca80) /* 4c000: 1000001e */ beqz $zero,.L0004c07c /* 4c004: 00601025 */ or $v0,$v1,$zero .L0004c008: -/* 4c008: a020ca80 */ sb $zero,-0x3580($at) +/* 4c008: a020ca80 */ sb $zero,%lo(var8009ca80)($at) /* 4c00c: 88410003 */ lwl $at,0x3($v0) /* 4c010: 98410006 */ lwr $at,0x6($v0) /* 4c014: a0400002 */ sb $zero,0x2($v0) diff --git a/src/lib/lib_4f350.c b/src/lib/lib_4f350.c index 6ac71af8b..94328bd22 100644 --- a/src/lib/lib_4f350.c +++ b/src/lib/lib_4f350.c @@ -39,10 +39,10 @@ glabel func0004f350 /* 4f3a4: 24a5c7e0 */ addiu $a1,$a1,%lo(var8009c7e0) /* 4f3a8: 0c012a34 */ jal __osSiRawStartDma /* 4f3ac: 00002025 */ or $a0,$zero,$zero -/* 4f3b0: 3c01800a */ lui $at,0x800a +/* 4f3b0: 3c01800a */ lui $at,%hi(var8009c820) /* 4f3b4: afa2001c */ sw $v0,0x1c($sp) /* 4f3b8: 0c012a29 */ jal __osSiRelAccess -/* 4f3bc: a020c820 */ sb $zero,-0x37e0($at) +/* 4f3bc: a020c820 */ sb $zero,%lo(var8009c820)($at) /* 4f3c0: 8fbf0014 */ lw $ra,0x14($sp) /* 4f3c4: 8fa2001c */ lw $v0,0x1c($sp) /* 4f3c8: 27bd0020 */ addiu $sp,$sp,0x20 diff --git a/src/lib/lib_4f400.c b/src/lib/lib_4f400.c index b223fa4a9..c500e2355 100644 --- a/src/lib/lib_4f400.c +++ b/src/lib/lib_4f400.c @@ -38,10 +38,10 @@ glabel osContStartReadData /* 4f454: 0c012a34 */ jal __osSiRawStartDma /* 4f458: 00002025 */ or $a0,$zero,$zero /* 4f45c: 240f0001 */ addiu $t7,$zero,0x1 -/* 4f460: 3c01800a */ lui $at,0x800a +/* 4f460: 3c01800a */ lui $at,%hi(var8009c820) /* 4f464: afa2001c */ sw $v0,0x1c($sp) /* 4f468: 0c012a29 */ jal __osSiRelAccess -/* 4f46c: a02fc820 */ sb $t7,-0x37e0($at) +/* 4f46c: a02fc820 */ sb $t7,%lo(var8009c820)($at) /* 4f470: 8fbf0014 */ lw $ra,0x14($sp) /* 4f474: 8fa2001c */ lw $v0,0x1c($sp) /* 4f478: 27bd0020 */ addiu $sp,$sp,0x20 @@ -51,8 +51,8 @@ glabel osContStartReadData GLOBAL_ASM( glabel osContGetReadData -/* 4f484: 3c05800a */ lui $a1,0x800a -/* 4f488: 24a5c821 */ addiu $a1,$a1,-14303 +/* 4f484: 3c05800a */ lui $a1,%hi(var8009c820+0x1) +/* 4f488: 24a5c821 */ addiu $a1,$a1,%lo(var8009c820+0x1) /* 4f48c: 90ae0000 */ lbu $t6,0x0($a1) /* 4f490: 3c02800a */ lui $v0,%hi(var8009c7e0) /* 4f494: 27bdfff0 */ addiu $sp,$sp,-16 @@ -106,8 +106,8 @@ glabel __osPackReadData /* 4f534: 0083082b */ sltu $at,$a0,$v1 /* 4f538: 1420fffd */ bnez $at,.L0004f530 /* 4f53c: ac80fffc */ sw $zero,-0x4($a0) -/* 4f540: 3c04800a */ lui $a0,0x800a -/* 4f544: 2484c821 */ addiu $a0,$a0,-14303 +/* 4f540: 3c04800a */ lui $a0,%hi(var8009c820+0x1) +/* 4f544: 2484c821 */ addiu $a0,$a0,%lo(var8009c820+0x1) /* 4f548: 908c0000 */ lbu $t4,0x0($a0) /* 4f54c: 240e0001 */ addiu $t6,$zero,0x1 /* 4f550: 240f00ff */ addiu $t7,$zero,0xff diff --git a/src/lib/lib_4f5e0.c b/src/lib/lib_4f5e0.c index eacb549fb..a2ae25a27 100644 --- a/src/lib/lib_4f5e0.c +++ b/src/lib/lib_4f5e0.c @@ -62,8 +62,8 @@ glabel func0004f5e0 /* 4f674: 1464fffa */ bne $v1,$a0,.L0004f660 /* 4f678: a0470002 */ sb $a3,0x2($v0) /* 4f67c: 240f00fe */ addiu $t7,$zero,0xfe -/* 4f680: 3c01800a */ lui $at,0x800a -/* 4f684: a02fc820 */ sb $t7,-0x37e0($at) +/* 4f680: 3c01800a */ lui $at,%hi(var8009c820) +/* 4f684: a02fc820 */ sb $t7,%lo(var8009c820)($at) /* 4f688: 8e180008 */ lw $t8,0x8($s0) /* 4f68c: afa80024 */ sw $t0,0x24($sp) /* 4f690: afa70034 */ sw $a3,0x34($sp) diff --git a/src/lib/lib_50130.c b/src/lib/lib_50130.c index 7152c108b..5edfb4be4 100644 --- a/src/lib/lib_50130.c +++ b/src/lib/lib_50130.c @@ -122,8 +122,8 @@ glabel func000501a0 /* 5029c: 0c012a34 */ jal __osSiRawStartDma /* 502a0: 00002025 */ or $a0,$zero,$zero /* 502a4: 240c0004 */ addiu $t4,$zero,0x4 -/* 502a8: 3c01800a */ lui $at,0x800a -/* 502ac: a02cc820 */ sb $t4,-0x37e0($at) +/* 502a8: 3c01800a */ lui $at,%hi(var8009c820) +/* 502ac: a02cc820 */ sb $t4,%lo(var8009c820)($at) /* 502b0: 02402025 */ or $a0,$s2,$zero /* 502b4: 00002825 */ or $a1,$zero,$zero /* 502b8: 0c0121bc */ jal osRecvMesg @@ -185,15 +185,15 @@ glabel func00050364 /* 50378: 24180002 */ addiu $t8,$zero,0x2 /* 5037c: 24190008 */ addiu $t9,$zero,0x8 /* 50380: 24080004 */ addiu $t0,$zero,0x4 -/* 50384: 3c01800a */ lui $at,0x800a -/* 50388: 3c02800a */ lui $v0,0x800a +/* 50384: 3c01800a */ lui $at,%hi(var8009ca80) +/* 50388: 3c02800a */ lui $v0,%hi(var8009ca80+0x1) /* 5038c: afa40018 */ sw $a0,0x18($sp) /* 50390: a3b80008 */ sb $t8,0x8($sp) /* 50394: a3b90009 */ sb $t9,0x9($sp) /* 50398: a3a8000a */ sb $t0,0xa($sp) /* 5039c: a3a4000b */ sb $a0,0xb($sp) -/* 503a0: 2442ca81 */ addiu $v0,$v0,-13695 -/* 503a4: a020ca80 */ sb $zero,-0x3580($at) +/* 503a0: 2442ca81 */ addiu $v0,$v0,%lo(var8009ca80+0x1) +/* 503a4: a020ca80 */ sb $zero,%lo(var8009ca80)($at) /* 503a8: a0400002 */ sb $zero,0x2($v0) /* 503ac: a0400001 */ sb $zero,0x1($v0) /* 503b0: a0400000 */ sb $zero,0x0($v0)