mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-05-25 07:22:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Trim gvars

Browse Source
This commit is contained in:
Ryan Dwyer
2019-11-26 18:55:28 +10:00
parent 20c819ccf7
commit ca368e5f46
16 changed files with 73 additions and 11136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/game_005fd0.c
+8 -8
View File
@@ -1564,7 +1564,7 @@ glabel func0f006c80
/* f007484: 0c012d20 */ jal func0004b480
/* f007488: ae0f0000 */ sw $t7,0x0($s0)
/* f00748c: ae020004 */ sw $v0,0x4($s0)
/* f007490: 3c05800b */ lui $a1,%hi(var800b0078)
/* f007490: 3c05800b */ lui $a1,0x800b
/* f007494: 8ca5b5a8 */ lw $a1,-0x4a58($a1)
/* f007498: 240e0002 */ addiu $t6,$zero,0x2
/* f00749c: 24180001 */ addiu $t8,$zero,0x1
@@ -1575,7 +1575,7 @@ glabel func0f006c80
/* f0074b0: 24060002 */ addiu $a2,$zero,0x2
/* f0074b4: 24070001 */ addiu $a3,$zero,0x1
/* f0074b8: 0fc2ce70 */ jal func0f0b39c0
/* f0074bc: 24a50078 */ addiu $a1,$a1,%lo(var800b0078)
/* f0074bc: 24a50078 */ addiu $a1,$a1,0x0078
/* f0074c0: 8fb90150 */ lw $t9,0x150($sp)
/* f0074c4: 3c07e700 */ lui $a3,0xe700
/* f0074c8: 3c08ba00 */ lui $t0,0xba00
@@ -3774,7 +3774,7 @@ glabel func0f009504
/* f00960c: 8c440000 */ lw $a0,0x0($v0)
/* f009610: 0fc59e7d */ jal func0f1679f4
/* f009614: afa2002c */ sw $v0,0x2c($sp)
/* f009618: 3c05800b */ lui $a1,%hi(var800b0078)
/* f009618: 3c05800b */ lui $a1,0x800b
/* f00961c: 8ca5b5a8 */ lw $a1,-0x4a58($a1)
/* f009620: 24090002 */ addiu $t1,$zero,0x2
/* f009624: 240a0001 */ addiu $t2,$zero,0x1
@@ -3787,7 +3787,7 @@ glabel func0f009504
/* f009640: 24070001 */ addiu $a3,$zero,0x1
/* f009644: afa00018 */ sw $zero,0x18($sp)
/* f009648: 0fc2ce70 */ jal func0f0b39c0
/* f00964c: 24a50078 */ addiu $a1,$a1,%lo(var800b0078)
/* f00964c: 24a50078 */ addiu $a1,$a1,0x0078
/* f009650: 8fab0074 */ lw $t3,0x74($sp)
/* f009654: 3c0de700 */ lui $t5,0xe700
/* f009658: 3c0eba00 */ lui $t6,0xba00
@@ -4937,7 +4937,7 @@ glabel func0f00a490
/* f00a6b8: 016fc821 */ addu $t9,$t3,$t7
/* f00a6bc: 0fc351e7 */ jal func0f0d479c
/* f00a6c0: a7b9005e */ sh $t9,0x5e($sp)
/* f00a6c4: 3c05800b */ lui $a1,%hi(var800b0078)
/* f00a6c4: 3c05800b */ lui $a1,0x800b
/* f00a6c8: 87a8005e */ lh $t0,0x5e($sp)
/* f00a6cc: 87a9003c */ lh $t1,0x3c($sp)
/* f00a6d0: 8ca5b5a8 */ lw $a1,-0x4a58($a1)
@@ -4953,7 +4953,7 @@ glabel func0f00a490
/* f00a6f8: a7a8005e */ sh $t0,0x5e($sp)
/* f00a6fc: a7a9003c */ sh $t1,0x3c($sp)
/* f00a700: 0fc2ce70 */ jal func0f0b39c0
/* f00a704: 24a50078 */ addiu $a1,$a1,%lo(var800b0078)
/* f00a704: 24a50078 */ addiu $a1,$a1,0x0078
/* f00a708: 8fae0080 */ lw $t6,0x80($sp)
/* f00a70c: 87a8005e */ lh $t0,0x5e($sp)
/* f00a710: 87a9003c */ lh $t1,0x3c($sp)
@@ -5413,7 +5413,7 @@ glabel func0f00a940
/* f00ade0: 004f5821 */ addu $t3,$v0,$t7
/* f00ade4: 0fc351e7 */ jal func0f0d479c
/* f00ade8: a7ab0072 */ sh $t3,0x72($sp)
/* f00adec: 3c05800b */ lui $a1,%hi(var800b0048)
/* f00adec: 3c05800b */ lui $a1,0x800b
/* f00adf0: 87a80072 */ lh $t0,0x72($sp)
/* f00adf4: 87a900fa */ lh $t1,0xfa($sp)
/* f00adf8: 8ca5b5a8 */ lw $a1,-0x4a58($a1)
@@ -5429,7 +5429,7 @@ glabel func0f00a940
/* f00ae20: a7a80072 */ sh $t0,0x72($sp)
/* f00ae24: a7a900fa */ sh $t1,0xfa($sp)
/* f00ae28: 0fc2ce70 */ jal func0f0b39c0
/* f00ae2c: 24a50048 */ addiu $a1,$a1,%lo(var800b0048)
/* f00ae2c: 24a50048 */ addiu $a1,$a1,0x0048
/* f00ae30: 8fb80110 */ lw $t8,0x110($sp)
/* f00ae34: 87a80072 */ lh $t0,0x72($sp)
/* f00ae38: 87a900fa */ lh $t1,0xfa($sp)
src/game/game_015470.c
+12 -12
View File
@@ -1638,7 +1638,7 @@ glabel func0f0166ec
/* f016954: 25ee0008 */ addiu $t6,$t7,0x8
/* f016958: afae0128 */ sw $t6,0x128($sp)
/* f01695c: 240d0c00 */ addiu $t5,$zero,0xc00
/* f016960: 3c05800b */ lui $a1,%hi(var800b0234)
/* f016960: 3c05800b */ lui $a1,0x800b
/* f016964: aded0004 */ sw $t5,0x4($t7)
/* f016968: adec0000 */ sw $t4,0x0($t7)
/* f01696c: 8ca5b5a8 */ lw $a1,-0x4a58($a1)
@@ -1651,7 +1651,7 @@ glabel func0f0166ec
/* f016988: 24060001 */ addiu $a2,$zero,0x1
/* f01698c: 00003825 */ or $a3,$zero,$zero
/* f016990: 0fc2ce70 */ jal func0f0b39c0
/* f016994: 24a50234 */ addiu $a1,$a1,%lo(var800b0234)
/* f016994: 24a50234 */ addiu $a1,$a1,0x0234
/* f016998: 8fab0128 */ lw $t3,0x128($sp)
/* f01699c: 3c0eba00 */ lui $t6,0xba00
/* f0169a0: 35ce1402 */ ori $t6,$t6,0x1402
@@ -1757,7 +1757,7 @@ glabel func0f0166ec
/* f016b2c: 25ee0008 */ addiu $t6,$t7,0x8
/* f016b30: afae0128 */ sw $t6,0x128($sp)
/* f016b34: 24190c00 */ addiu $t9,$zero,0xc00
/* f016b38: 3c05800b */ lui $a1,%hi(var800b024c)
/* f016b38: 3c05800b */ lui $a1,0x800b
/* f016b3c: adf90004 */ sw $t9,0x4($t7)
/* f016b40: aded0000 */ sw $t5,0x0($t7)
/* f016b44: 8ca5b5a8 */ lw $a1,-0x4a58($a1)
@@ -1770,7 +1770,7 @@ glabel func0f0166ec
/* f016b60: 24060001 */ addiu $a2,$zero,0x1
/* f016b64: 00003825 */ or $a3,$zero,$zero
/* f016b68: 0fc2ce70 */ jal func0f0b39c0
/* f016b6c: 24a5024c */ addiu $a1,$a1,%lo(var800b024c)
/* f016b6c: 24a5024c */ addiu $a1,$a1,0x024c
/* f016b70: 8fb80128 */ lw $t8,0x128($sp)
/* f016b74: 3c0eba00 */ lui $t6,0xba00
/* f016b78: 35ce1402 */ ori $t6,$t6,0x1402
@@ -7944,7 +7944,7 @@ glabel func0f01bf28
/* f01c354: ae8e0000 */ sw $t6,0x0($s4)
/* f01c358: 0fc5ff2c */ jal func0f17fcb0
/* f01c35c: afa80058 */ sw $t0,0x58($sp)
/* f01c360: 3c03800b */ lui $v1,%hi(var800b0e70)
/* f01c360: 3c03800b */ lui $v1,0x800b
/* f01c364: 9463cb9e */ lhu $v1,-0x3462($v1)
/* f01c368: 10000018 */ beqz $zero,.L0f01c3cc
/* f01c36c: 8fa80058 */ lw $t0,0x58($sp)
@@ -7970,7 +7970,7 @@ glabel func0f01bf28
/* f01c3b4: afa80058 */ sw $t0,0x58($sp)
/* f01c3b8: 8fa80058 */ lw $t0,0x58($sp)
.L0f01c3bc:
/* f01c3bc: 3c03800b */ lui $v1,%hi(var800b0e70)
/* f01c3bc: 3c03800b */ lui $v1,0x800b
/* f01c3c0: 10000002 */ beqz $zero,.L0f01c3cc
/* f01c3c4: 9463cb9e */ lhu $v1,-0x3462($v1)
.L0f01c3c8:
@@ -8099,7 +8099,7 @@ glabel func0f01bf28
/* f01c584: 26310001 */ addiu $s1,$s1,0x1
.L0f01c588:
/* f01c588: 1621fff0 */ bne $s1,$at,.L0f01c54c
/* f01c58c: 24630e70 */ addiu $v1,$v1,%lo(var800b0e70)
/* f01c58c: 24630e70 */ addiu $v1,$v1,0x0e70
/* f01c590: 0fc63005 */ jal func0f18c014
/* f01c594: 00000000 */ sll $zero,$zero,0x0
/* f01c598: 0fc66d50 */ jal func0f19b540
@@ -8210,7 +8210,7 @@ glabel func0f01bf28
/* f01c70c: 2401000b */ addiu $at,$zero,0xb
/* f01c710: 3050ffff */ andi $s0,$v0,0xffff
/* f01c714: 17010014 */ bne $t8,$at,.L0f01c768
/* f01c718: 3c0e800b */ lui $t6,%hi(var800b000c)
/* f01c718: 3c0e800b */ lui $t6,0x800b
/* f01c71c: 8e790490 */ lw $t9,0x490($s3)
/* f01c720: 24010002 */ addiu $at,$zero,0x2
/* f01c724: 02c02025 */ or $a0,$s6,$zero
@@ -8557,7 +8557,7 @@ glabel func0f01bf28
/* f01cbd8: 2463e000 */ addiu $v1,$v1,%lo(var8009e000)
/* f01cbdc: 8c6d04f8 */ lw $t5,0x4f8($v1)
.L0f01cbe0:
/* f01cbe0: 24630e70 */ addiu $v1,$v1,%lo(var800b0e70)
/* f01cbe0: 24630e70 */ addiu $v1,$v1,0x0e70
/* f01cbe4: 0062082b */ sltu $at,$v1,$v0
/* f01cbe8: 11a00002 */ beqz $t5,.L0f01cbf4
/* f01cbec: 00000000 */ sll $zero,$zero,0x0
@@ -8661,7 +8661,7 @@ glabel func0f01bf28
/* f01cd48: 00008825 */ or $s1,$zero,$zero
/* f01cd4c: 24140038 */ addiu $s4,$zero,0x38
.L0f01cd50:
/* f01cd50: 3c19800b */ lui $t9,%hi(var800b000c)
/* f01cd50: 3c19800b */ lui $t9,0x800b
/* f01cd54: 9739cb9e */ lhu $t9,-0x3462($t9)
/* f01cd58: 240d0001 */ addiu $t5,$zero,0x1
/* f01cd5c: 022d7804 */ sllv $t7,$t5,$s1
@@ -8932,7 +8932,7 @@ glabel func0f01bf28
/* f01d120: adc10000 */ sw $at,0x0($t6)
.L0f01d124:
/* f01d124: 8f210000 */ lw $at,0x0($t9)
/* f01d128: 2739000c */ addiu $t9,$t9,%lo(var800b000c)
/* f01d128: 2739000c */ addiu $t9,$t9,0x000c
/* f01d12c: 25ef000c */ addiu $t7,$t7,%lo(var8009000c)
/* f01d130: ade1fff4 */ sw $at,-0xc($t7)
/* f01d134: 8f21fff8 */ lw $at,-0x8($t9)
@@ -8993,7 +8993,7 @@ glabel func0f01bf28
.L0f01d204:
/* f01d204: 8de10000 */ lw $at,0x0($t7)
/* f01d208: 25ef000c */ addiu $t7,$t7,0xc
/* f01d20c: 25ce000c */ addiu $t6,$t6,%lo(var800b000c)
/* f01d20c: 25ce000c */ addiu $t6,$t6,0x000c
/* f01d210: adc1fff4 */ sw $at,-0xc($t6)
/* f01d214: 8de1fff8 */ lw $at,-0x8($t7)
/* f01d218: adc1fff8 */ sw $at,-0x8($t6)
src/game/game_0abe70.c
+4 -4
View File
@@ -3903,7 +3903,7 @@ glabel func0f0af158
/* f0af5c0: 3c0a8007 */ lui $t2,0x8007
/* f0af5c4: 8d4a0574 */ lw $t2,0x574($t2)
/* f0af5c8: 27a40200 */ addiu $a0,$sp,0x200
/* f0af5cc: 3c05800b */ lui $a1,%hi(var800b0030)
/* f0af5cc: 3c05800b */ lui $a1,0x800b
/* f0af5d0: 448a3000 */ mtc1 $t2,$f6
/* f0af5d4: 24060004 */ addiu $a2,$zero,0x4
/* f0af5d8: 05410005 */ bgez $t2,.L0f0af5f0
@@ -3991,7 +3991,7 @@ glabel func0f0af158
/* f0af6fc: afb80014 */ sw $t8,0x14($sp)
/* f0af700: afa00018 */ sw $zero,0x18($sp)
/* f0af704: 0fc2ce70 */ jal func0f0b39c0
/* f0af708: 24a50030 */ addiu $a1,$a1,%lo(var800b0030)
/* f0af708: 24a50030 */ addiu $a1,$a1,0x0030
/* f0af70c: 44800000 */ mtc1 $zero,$f0
/* f0af710: c7aa00dc */ lwc1 $f10,0xdc($sp)
/* f0af714: c7b800e4 */ lwc1 $f24,0xe4($sp)
@@ -4309,7 +4309,7 @@ glabel func0f0afa4c
/* f0afbd8: 3c0cb600 */ lui $t4,0xb600
/* f0afbdc: 254b0008 */ addiu $t3,$t2,0x8
/* f0afbe0: afab01e8 */ sw $t3,0x1e8($sp)
/* f0afbe4: 3c05800b */ lui $a1,%hi(var800b0024)
/* f0afbe4: 3c05800b */ lui $a1,0x800b
/* f0afbe8: ad4d0004 */ sw $t5,0x4($t2)
/* f0afbec: ad4c0000 */ sw $t4,0x0($t2)
/* f0afbf0: 8ca5b5a8 */ lw $a1,-0x4a58($a1)
@@ -4322,7 +4322,7 @@ glabel func0f0afa4c
/* f0afc0c: 24060004 */ addiu $a2,$zero,0x4
/* f0afc10: 00003825 */ or $a3,$zero,$zero
/* f0afc14: 0fc2ce70 */ jal func0f0b39c0
/* f0afc18: 24a50024 */ addiu $a1,$a1,%lo(var800b0024)
/* f0afc18: 24a50024 */ addiu $a1,$a1,0x0024
/* f0afc1c: 0c00566c */ jal func000159b0
/* f0afc20: 27a4014c */ addiu $a0,$sp,0x14c
/* f0afc24: 0fc2d5be */ jal func0f0b56f8
src/game/game_0d4690.c
+4 -4
View File
@@ -440,7 +440,7 @@ glabel func0f0d4a3c
/* f0d4a68: add80000 */ sw $t8,0x0($t6)
/* f0d4a6c: 1480000f */ bnez $a0,.L0f0d4aac
/* f0d4a70: adc00004 */ sw $zero,0x4($t6)
/* f0d4a74: 3c05800b */ lui $a1,%hi(var800b0048)
/* f0d4a74: 3c05800b */ lui $a1,0x800b
/* f0d4a78: 8ca5b5a8 */ lw $a1,-0x4a58($a1)
/* f0d4a7c: 24190002 */ addiu $t9,$zero,0x2
/* f0d4a80: 24080001 */ addiu $t0,$zero,0x1
@@ -451,13 +451,13 @@ glabel func0f0d4a3c
/* f0d4a94: 00003825 */ or $a3,$zero,$zero
/* f0d4a98: afa00018 */ sw $zero,0x18($sp)
/* f0d4a9c: 0fc2ce70 */ jal func0f0b39c0
/* f0d4aa0: 24a50048 */ addiu $a1,$a1,%lo(var800b0048)
/* f0d4aa0: 24a50048 */ addiu $a1,$a1,0x0048
/* f0d4aa4: 10000010 */ beqz $zero,.L0f0d4ae8
/* f0d4aa8: 8fab00a0 */ lw $t3,0xa0($sp)
.L0f0d4aac:
/* f0d4aac: 24010001 */ addiu $at,$zero,0x1
/* f0d4ab0: 1481000c */ bne $a0,$at,.L0f0d4ae4
/* f0d4ab4: 3c05800b */ lui $a1,%hi(var800b0084)
/* f0d4ab4: 3c05800b */ lui $a1,0x800b
/* f0d4ab8: 8ca5b5a8 */ lw $a1,-0x4a58($a1)
/* f0d4abc: 24090002 */ addiu $t1,$zero,0x2
/* f0d4ac0: 240a0001 */ addiu $t2,$zero,0x1
@@ -468,7 +468,7 @@ glabel func0f0d4a3c
/* f0d4ad4: 00003825 */ or $a3,$zero,$zero
/* f0d4ad8: afa00018 */ sw $zero,0x18($sp)
/* f0d4adc: 0fc2ce70 */ jal func0f0b39c0
/* f0d4ae0: 24a50084 */ addiu $a1,$a1,%lo(var800b0084)
/* f0d4ae0: 24a50084 */ addiu $a1,$a1,0x0084
.L0f0d4ae4:
/* f0d4ae4: 8fab00a0 */ lw $t3,0xa0($sp)
.L0f0d4ae8:
src/game/game_0dcdb0.c
+6 -6
View File
@@ -9008,7 +9008,7 @@ glabel func0f0e0dac
/* f0e10c0: 25ae0008 */ addiu $t6,$t5,0x8
/* f0e10c4: afae0118 */ sw $t6,0x118($sp)
/* f0e10c8: 24182000 */ addiu $t8,$zero,0x2000
/* f0e10cc: 3c05800b */ lui $a1,%hi(var800b0048)
/* f0e10cc: 3c05800b */ lui $a1,0x800b
/* f0e10d0: adb80004 */ sw $t8,0x4($t5)
/* f0e10d4: adaf0000 */ sw $t7,0x0($t5)
/* f0e10d8: 8ca5b5a8 */ lw $a1,-0x4a58($a1)
@@ -9022,7 +9022,7 @@ glabel func0f0e0dac
/* f0e10f8: 24060002 */ addiu $a2,$zero,0x2
/* f0e10fc: 00003825 */ or $a3,$zero,$zero
/* f0e1100: 0fc2ce70 */ jal func0f0b39c0
/* f0e1104: 24a50048 */ addiu $a1,$a1,%lo(var800b0048)
/* f0e1104: 24a50048 */ addiu $a1,$a1,0x0048
/* f0e1108: 2406000a */ addiu $a2,$zero,0xa
/* f0e110c: 02060019 */ multu $s0,$a2
/* f0e1110: 8faa0118 */ lw $t2,0x118($sp)
@@ -13607,7 +13607,7 @@ glabel func0f0e5000
/* f0e5544: 00402025 */ or $a0,$v0,$zero
/* f0e5548: 0fc35272 */ jal func0f0d49c8
/* f0e554c: afa20150 */ sw $v0,0x150($sp)
/* f0e5550: 3c05800b */ lui $a1,%hi(var800b000c)
/* f0e5550: 3c05800b */ lui $a1,0x800b
/* f0e5554: 8ca5b5a8 */ lw $a1,-0x4a58($a1)
/* f0e5558: 240e0002 */ addiu $t6,$zero,0x2
/* f0e555c: 240f0001 */ addiu $t7,$zero,0x1
@@ -13619,7 +13619,7 @@ glabel func0f0e5000
/* f0e5574: afa00018 */ sw $zero,0x18($sp)
/* f0e5578: afa20150 */ sw $v0,0x150($sp)
/* f0e557c: 0fc2ce70 */ jal func0f0b39c0
/* f0e5580: 24a5000c */ addiu $a1,$a1,%lo(var800b000c)
/* f0e5580: 24a5000c */ addiu $a1,$a1,0x000c
/* f0e5584: 8fb80150 */ lw $t8,0x150($sp)
/* f0e5588: 3c09ba00 */ lui $t1,0xba00
/* f0e558c: 35291402 */ ori $t1,$t1,0x1402
@@ -24839,7 +24839,7 @@ glabel func0f0ef758
/* f0ef7d8: 3c19ba00 */ lui $t9,0xba00
/* f0ef7dc: 37391301 */ ori $t9,$t9,0x1301
/* f0ef7e0: 00a0b025 */ or $s6,$a1,$zero
/* f0ef7e4: 3c05800b */ lui $a1,%hi(var800b0294)
/* f0ef7e4: 3c05800b */ lui $a1,0x800b
/* f0ef7e8: 00c09025 */ or $s2,$a2,$zero
/* f0ef7ec: 00e09825 */ or $s3,$a3,$zero
/* f0ef7f0: 06a10004 */ bgez $s5,.L0f0ef804
@@ -24886,7 +24886,7 @@ glabel func0f0ef758
/* f0ef890: afa00018 */ sw $zero,0x18($sp)
/* f0ef894: 27a400a0 */ addiu $a0,$sp,0xa0
/* f0ef898: 0fc2ce70 */ jal func0f0b39c0
/* f0ef89c: 24a50294 */ addiu $a1,$a1,%lo(var800b0294)
/* f0ef89c: 24a50294 */ addiu $a1,$a1,0x0294
/* f0ef8a0: 8faf00a0 */ lw $t7,0xa0($sp)
/* f0ef8a4: 3c19ba00 */ lui $t9,0xba00
/* f0ef8a8: 37391402 */ ori $t9,$t9,0x1402
src/game/game_0f09f0.c
+2 -2
View File
@@ -15010,7 +15010,7 @@ glabel menuhandler000fd6f0
/* f0fd740: 0338c821 */ addu $t9,$t9,$t8
/* f0fd744: 93392103 */ lbu $t9,0x2103($t9)
/* f0fd748: 256b9fc0 */ addiu $t3,$t3,%lo(g_Vars)
/* f0fd74c: 3c06800b */ lui $a2,%hi(var800b0004)
/* f0fd74c: 3c06800b */ lui $a2,0x800b
/* f0fd750: 1320004b */ beqz $t9,.L0f0fd880
/* f0fd754: 3c0e800b */ lui $t6,0x800b
/* f0fd758: 8d6e0284 */ lw $t6,0x284($t3)
@@ -15134,7 +15134,7 @@ glabel menuhandler000fd6f0
/* f0fd8fc: 8f240004 */ lw $a0,0x4($t9)
.L0f0fd900:
/* f0fd900: 1100000a */ beqz $t0,.L0f0fd92c
/* f0fd904: 24c60004 */ addiu $a2,$a2,%lo(var800b0004)
/* f0fd904: 24c60004 */ addiu $a2,$a2,0x0004
/* f0fd908: 8cc30000 */ lw $v1,0x0($a2)
/* f0fd90c: 10830005 */ beq $a0,$v1,.L0f0fd924
/* f0fd910: 00000000 */ sll $zero,$zero,0x0
src/game/game_11ecf0.c
+2 -2
View File
@@ -7916,7 +7916,7 @@ glabel func0f125a6c
/* f125ffc: 3c0e800a */ lui $t6,0x800a
/* f126000: 8dce9ff4 */ lw $t6,-0x600c($t6)
/* f126004: 8c4d0000 */ lw $t5,0x0($v0)
/* f126008: 3c05800b */ lui $a1,%hi(var800b003c)
/* f126008: 3c05800b */ lui $a1,0x800b
/* f12600c: 24180002 */ addiu $t8,$zero,0x2
/* f126010: 01ae7821 */ addu $t7,$t5,$t6
/* f126014: ac4f0000 */ sw $t7,0x0($v0)
@@ -7929,7 +7929,7 @@ glabel func0f125a6c
/* f126030: 00003825 */ or $a3,$zero,$zero
/* f126034: afa00018 */ sw $zero,0x18($sp)
/* f126038: 0fc2ce70 */ jal func0f0b39c0
/* f12603c: 24a5003c */ addiu $a1,$a1,%lo(var800b003c)
/* f12603c: 24a5003c */ addiu $a1,$a1,0x003c
/* f126040: 8fa80170 */ lw $t0,0x170($sp)
/* f126044: 3c0aba00 */ lui $t2,0xba00
/* f126048: 354a1402 */ ori $t2,$t2,0x1402
src/game/game_129900.c
+6 -6
View File
@@ -9154,7 +9154,7 @@ glabel func0f131060
/* f131128: 24010001 */ addiu $at,$zero,0x1
/* f13112c: 27a40030 */ addiu $a0,$sp,0x30
/* f131130: 8d860020 */ lw $a2,0x20($t4)
/* f131134: 3c05800b */ lui $a1,%hi(var800b000c)
/* f131134: 3c05800b */ lui $a1,0x800b
/* f131138: 24070001 */ addiu $a3,$zero,0x1
/* f13113c: 14c10051 */ bne $a2,$at,.L0f131284
/* f131140: 240d0002 */ addiu $t5,$zero,0x2
@@ -9165,7 +9165,7 @@ glabel func0f131060
/* f131154: afad0010 */ sw $t5,0x10($sp)
/* f131158: afa00018 */ sw $zero,0x18($sp)
/* f13115c: 0fc2ce70 */ jal func0f0b39c0
/* f131160: 24a5000c */ addiu $a1,$a1,%lo(var800b000c)
/* f131160: 24a5000c */ addiu $a1,$a1,0x000c
/* f131164: 8faf0030 */ lw $t7,0x30($sp)
/* f131168: 3c19ba00 */ lui $t9,0xba00
/* f13116c: 37391402 */ ori $t9,$t9,0x1402
@@ -11256,7 +11256,7 @@ glabel func0f132e28
/* f132f44: 24630004 */ addiu $v1,$v1,0x4
/* f132f48: 1462fffe */ bne $v1,$v0,.L0f132f44
/* f132f4c: ac60fffc */ sw $zero,-0x4($v1)
/* f132f50: 3c05800b */ lui $a1,%hi(var800b000c)
/* f132f50: 3c05800b */ lui $a1,0x800b
/* f132f54: 8ca5b5a8 */ lw $a1,-0x4a58($a1)
/* f132f58: 24180002 */ addiu $t8,$zero,0x2
/* f132f5c: 24190001 */ addiu $t9,$zero,0x1
@@ -11267,7 +11267,7 @@ glabel func0f132e28
/* f132f70: 24070001 */ addiu $a3,$zero,0x1
/* f132f74: afa00018 */ sw $zero,0x18($sp)
/* f132f78: 0fc2ce70 */ jal func0f0b39c0
/* f132f7c: 24a5000c */ addiu $a1,$a1,%lo(var800b000c)
/* f132f7c: 24a5000c */ addiu $a1,$a1,0x000c
/* f132f80: 8fab0de8 */ lw $t3,0xde8($sp)
/* f132f84: 3c0dba00 */ lui $t5,0xba00
/* f132f88: 35ad1402 */ ori $t5,$t5,0x1402
@@ -12856,7 +12856,7 @@ glabel func0f1346b0
/* f1346c4: afbf007c */ sw $ra,0x7c($sp)
/* f1346c8: afb70074 */ sw $s7,0x74($sp)
/* f1346cc: afa41398 */ sw $a0,0x1398($sp)
/* f1346d0: 3c05800b */ lui $a1,%hi(var800b0004)
/* f1346d0: 3c05800b */ lui $a1,0x800b
/* f1346d4: 240e0002 */ addiu $t6,$zero,0x2
/* f1346d8: 240f0001 */ addiu $t7,$zero,0x1
/* f1346dc: afbe0078 */ sw $s8,0x78($sp)
@@ -13434,7 +13434,7 @@ glabel func0f1346b0
/* f134f30: 24630001 */ addiu $v1,$v1,0x1
/* f134f34: 46149483 */ div.s $f18,$f18,$f20
/* f134f38: 03110019 */ multu $t8,$s1
/* f134f3c: 24a50004 */ addiu $a1,$a1,%lo(var800b0004)
/* f134f3c: 24a50004 */ addiu $a1,$a1,0x0004
/* f134f40: 24420030 */ addiu $v0,$v0,0x30
/* f134f44: 00007812 */ mflo $t7
/* f134f48: 46009481 */ sub.s $f18,$f18,$f0
src/game/game_150820.c
+2 -2
View File
@@ -1577,7 +1577,7 @@ glabel func0f151ed0
/* f151f34: 24010001 */ addiu $at,$zero,0x1
/* f151f38: 95f80010 */ lhu $t8,0x10($t7)
/* f151f3c: 27a40140 */ addiu $a0,$sp,0x140
/* f151f40: 3c05800b */ lui $a1,%hi(var800b000c)
/* f151f40: 3c05800b */ lui $a1,0x800b
/* f151f44: 1701000d */ bne $t8,$at,.L0f151f7c
/* f151f48: 24060002 */ addiu $a2,$zero,0x2
/* f151f4c: 24190002 */ addiu $t9,$zero,0x2
@@ -1601,7 +1601,7 @@ glabel func0f151ed0
/* f151f90: 24070001 */ addiu $a3,$zero,0x1
/* f151f94: afa00018 */ sw $zero,0x18($sp)
/* f151f98: 0fc2ce70 */ jal func0f0b39c0
/* f151f9c: 24a5000c */ addiu $a1,$a1,%lo(var800b000c)
/* f151f9c: 24a5000c */ addiu $a1,$a1,0x000c
/* f151fa0: 8fab0140 */ lw $t3,0x140($sp)
.L0f151fa4:
/* f151fa4: 3c0dbb00 */ lui $t5,0xbb00
src/game/game_176d70.c
+16 -16
View File
@@ -2444,7 +2444,7 @@ glabel menuhandler001786d8
/* f178860: af090004 */ sw $t1,0x4($t8)
/* f178864: af080000 */ sw $t0,0x0($t8)
/* f178868: 8fab00a4 */ lw $t3,0xa4($sp)
/* f17886c: 3c05800b */ lui $a1,%hi(var800b01a4)
/* f17886c: 3c05800b */ lui $a1,0x800b
/* f178870: 240d0001 */ addiu $t5,$zero,0x1
/* f178874: 256a0008 */ addiu $t2,$t3,0x8
/* f178878: afaa00a4 */ sw $t2,0xa4($sp)
@@ -2460,7 +2460,7 @@ glabel menuhandler001786d8
/* f1788a0: 24060002 */ addiu $a2,$zero,0x2
/* f1788a4: 00003825 */ or $a3,$zero,$zero
/* f1788a8: 0fc2ce70 */ jal func0f0b39c0
/* f1788ac: 24a501a4 */ addiu $a1,$a1,%lo(var800b01a4)
/* f1788ac: 24a501a4 */ addiu $a1,$a1,0x01a4
/* f1788b0: 8fae00a4 */ lw $t6,0xa4($sp)
/* f1788b4: 3c18ba00 */ lui $t8,0xba00
/* f1788b8: 37181402 */ ori $t8,$t8,0x1402
@@ -4460,7 +4460,7 @@ glabel menuhandler0017a20c
/* f17a3b4: 25f80008 */ addiu $t8,$t7,0x8
/* f17a3b8: afb800c4 */ sw $t8,0xc4($sp)
/* f17a3bc: 240b0c00 */ addiu $t3,$zero,0xc00
/* f17a3c0: 3c05800b */ lui $a1,%hi(var800b01a4)
/* f17a3c0: 3c05800b */ lui $a1,0x800b
/* f17a3c4: adeb0004 */ sw $t3,0x4($t7)
/* f17a3c8: adf90000 */ sw $t9,0x0($t7)
/* f17a3cc: 8ca5b5a8 */ lw $a1,-0x4a58($a1)
@@ -4473,7 +4473,7 @@ glabel menuhandler0017a20c
/* f17a3e8: 24060002 */ addiu $a2,$zero,0x2
/* f17a3ec: 00003825 */ or $a3,$zero,$zero
/* f17a3f0: 0fc2ce70 */ jal func0f0b39c0
/* f17a3f4: 24a501a4 */ addiu $a1,$a1,%lo(var800b01a4)
/* f17a3f4: 24a501a4 */ addiu $a1,$a1,0x01a4
/* f17a3f8: 8fae00c4 */ lw $t6,0xc4($sp)
/* f17a3fc: 3c18ba00 */ lui $t8,0xba00
/* f17a400: 37181402 */ ori $t8,$t8,0x1402
@@ -5414,7 +5414,7 @@ glabel menuhandlerMpMedal
/* f17b0d4: afb8006c */ sw $t8,0x6c($sp)
/* f17b0d8: ade00004 */ sw $zero,0x4($t7)
/* f17b0dc: adf90000 */ sw $t9,0x0($t7)
/* f17b0e0: 3c05800b */ lui $a1,%hi(var800b01a4)
/* f17b0e0: 3c05800b */ lui $a1,0x800b
/* f17b0e4: 8ca5b5a8 */ lw $a1,-0x4a58($a1)
/* f17b0e8: 240b0001 */ addiu $t3,$zero,0x1
/* f17b0ec: 240a0002 */ addiu $t2,$zero,0x2
@@ -5426,7 +5426,7 @@ glabel menuhandlerMpMedal
/* f17b104: 00003825 */ or $a3,$zero,$zero
/* f17b108: afa80068 */ sw $t0,0x68($sp)
/* f17b10c: 0fc2ce70 */ jal func0f0b39c0
/* f17b110: 24a501a4 */ addiu $a1,$a1,%lo(var800b01a4)
/* f17b110: 24a501a4 */ addiu $a1,$a1,0x01a4
/* f17b114: 8fac006c */ lw $t4,0x6c($sp)
/* f17b118: 8fa80068 */ lw $t0,0x68($sp)
/* f17b11c: 3c0eba00 */ lui $t6,0xba00
@@ -9373,7 +9373,7 @@ glabel menuhandler0017e4d4
/* f17e748: 272c0008 */ addiu $t4,$t9,0x8
/* f17e74c: afac00b4 */ sw $t4,0xb4($sp)
/* f17e750: 240d0c00 */ addiu $t5,$zero,0xc00
/* f17e754: 3c05800b */ lui $a1,%hi(var800b01a4)
/* f17e754: 3c05800b */ lui $a1,0x800b
/* f17e758: af2d0004 */ sw $t5,0x4($t9)
/* f17e75c: af2b0000 */ sw $t3,0x0($t9)
/* f17e760: 8ca5b5a8 */ lw $a1,-0x4a58($a1)
@@ -9386,7 +9386,7 @@ glabel menuhandler0017e4d4
/* f17e77c: 24060002 */ addiu $a2,$zero,0x2
/* f17e780: 00003825 */ or $a3,$zero,$zero
/* f17e784: 0fc2ce70 */ jal func0f0b39c0
/* f17e788: 24a501a4 */ addiu $a1,$a1,%lo(var800b01a4)
/* f17e788: 24a501a4 */ addiu $a1,$a1,0x01a4
/* f17e78c: 8fb800b4 */ lw $t8,0xb4($sp)
/* f17e790: 3c0cba00 */ lui $t4,0xba00
/* f17e794: 358c1402 */ ori $t4,$t4,0x1402
@@ -12489,7 +12489,7 @@ glabel func0f180e34
/* f181124: 870f0018 */ lh $t7,0x18($t8)
/* f181128: 0fc0359c */ jal func0f00d670
/* f18112c: a48f0006 */ sh $t7,0x6($a0)
/* f181130: 3c0e800b */ lui $t6,%hi(var800b000c)
/* f181130: 3c0e800b */ lui $t6,0x800b
/* f181134: 8dcec2d4 */ lw $t6,-0x3d2c($t6)
/* f181138: 3c0a800b */ lui $t2,0x800b
/* f18113c: 914ac2c2 */ lbu $t2,-0x3d3e($t2)
@@ -12516,7 +12516,7 @@ glabel func0f180e34
.L0f18118c:
/* f18118c: 8d210000 */ lw $at,0x0($t1)
/* f181190: 2529000c */ addiu $t1,$t1,0xc
/* f181194: 25ce000c */ addiu $t6,$t6,%lo(var800b000c)
/* f181194: 25ce000c */ addiu $t6,$t6,0x000c
/* f181198: adc1fff4 */ sw $at,-0xc($t6)
/* f18119c: 8d21fff8 */ lw $at,-0x8($t1)
/* f1811a0: adc1fff8 */ sw $at,-0x8($t6)
@@ -12536,7 +12536,7 @@ glabel func0f180e34
/* f1811d8: a48d0006 */ sh $t5,0x6($a0)
/* f1811dc: 3c19800b */ lui $t9,0x800b
/* f1811e0: 8f39c33c */ lw $t9,-0x3cc4($t9)
/* f1811e4: 3c18800b */ lui $t8,%hi(var800b000c)
/* f1811e4: 3c18800b */ lui $t8,0x800b
/* f1811e8: 9318c32a */ lbu $t8,-0x3cd6($t8)
/* f1811ec: 3c01800b */ lui $at,0x800b
/* f1811f0: ac39c16c */ sw $t9,-0x3e94($at)
@@ -12561,7 +12561,7 @@ glabel func0f180e34
.L0f181238:
/* f181238: 8d610000 */ lw $at,0x0($t3)
/* f18123c: 256b000c */ addiu $t3,$t3,0xc
/* f181240: 2718000c */ addiu $t8,$t8,%lo(var800b000c)
/* f181240: 2718000c */ addiu $t8,$t8,0x000c
/* f181244: af01fff4 */ sw $at,-0xc($t8)
/* f181248: 8d61fff8 */ lw $at,-0x8($t3)
/* f18124c: af01fff8 */ sw $at,-0x8($t8)
@@ -12581,7 +12581,7 @@ glabel func0f180e34
/* f181284: a48a0006 */ sh $t2,0x6($a0)
/* f181288: 3c0c800b */ lui $t4,0x800b
/* f18128c: 8d8cc3a4 */ lw $t4,-0x3c5c($t4)
/* f181290: 3c0d800b */ lui $t5,%hi(var800b000c)
/* f181290: 3c0d800b */ lui $t5,0x800b
/* f181294: 91adc392 */ lbu $t5,-0x3c6e($t5)
/* f181298: 3c01800b */ lui $at,0x800b
/* f18129c: ac2cc170 */ sw $t4,-0x3e90($at)
@@ -12606,7 +12606,7 @@ glabel func0f180e34
.L0f1812e4:
/* f1812e4: 8dc10000 */ lw $at,0x0($t6)
/* f1812e8: 25ce000c */ addiu $t6,$t6,0xc
/* f1812ec: 25ad000c */ addiu $t5,$t5,%lo(var800b000c)
/* f1812ec: 25ad000c */ addiu $t5,$t5,0x000c
/* f1812f0: ada1fff4 */ sw $at,-0xc($t5)
/* f1812f4: 8dc1fff8 */ lw $at,-0x8($t6)
/* f1812f8: ada1fff8 */ sw $at,-0x8($t5)
@@ -13424,7 +13424,7 @@ glabel func0f181cf0
/* f181e14: c7b200b0 */ lwc1 $f18,0xb0($sp)
/* f181e18: 240dffff */ addiu $t5,$zero,-1
/* f181e1c: 3c04800b */ lui $a0,%hi(var800ac134)
/* f181e20: 3c05800b */ lui $a1,%hi(var800b0004)
/* f181e20: 3c05800b */ lui $a1,0x800b
/* f181e24: a66d0010 */ sh $t5,0x10($s3)
/* f181e28: 24a5c11e */ addiu $a1,$a1,-16098
/* f181e2c: 2484c134 */ addiu $a0,$a0,%lo(var800ac134)
@@ -13810,7 +13810,7 @@ glabel func0f181cf0
/* f182370: 3c03800b */ lui $v1,0x800b
/* f182374: 8c63c530 */ lw $v1,-0x3ad0($v1)
/* f182378: 26520001 */ addiu $s2,$s2,0x1
/* f18237c: 24a50004 */ addiu $a1,$a1,%lo(var800b0004)
/* f18237c: 24a50004 */ addiu $a1,$a1,0x0004
/* f182380: 0243082a */ slt $at,$s2,$v1
/* f182384: 1420ffe7 */ bnez $at,.L0f182324
/* f182388: 26100004 */ addiu $s0,$s0,0x4
src/game/game_197600.c
+2 -2
View File
@@ -115,7 +115,7 @@ glabel func0f197600
/* f197698: 04400037 */ bltz $v0,.L0f197778
/* f19769c: 0102c021 */ addu $t8,$t0,$v0
/* f1976a0: 00027080 */ sll $t6,$v0,0x2
/* f1976a4: 3c0f800b */ lui $t7,%hi(var800b7e50)
/* f1976a4: 3c0f800b */ lui $t7,0x800b
/* f1976a8: 85b9017e */ lh $t9,0x17e($t5)
/* f1976ac: 01ee7821 */ addu $t7,$t7,$t6
/* f1976b0: 8defc4d0 */ lw $t7,-0x3b30($t7)
@@ -170,7 +170,7 @@ glabel func0f197600
/* f197770: 1000001c */ beqz $zero,.L0f1977e4
/* f197774: 8d090128 */ lw $t1,0x128($t0)
.L0f197778:
/* f197778: 25ef7e50 */ addiu $t7,$t7,%lo(var800b7e50)
/* f197778: 25ef7e50 */ addiu $t7,$t7,0x7e50
/* f19777c: 2401002f */ addiu $at,$zero,0x2f
/* f197780: 1481000b */ bne $a0,$at,.L0f1977b0
/* f197784: 01cf3021 */ addu $a2,$t6,$t7
src/game/game_19c990.c
+2 -2
View File
@@ -3547,7 +3547,7 @@ GLOBAL_ASM(
glabel func0f19f524
/* f19f524: 27bdfd40 */ addiu $sp,$sp,-704
/* f19f528: afbf0014 */ sw $ra,0x14($sp)
/* f19f52c: 3c04800b */ lui $a0,%hi(var800b0028)
/* f19f52c: 3c04800b */ lui $a0,0x800b
/* f19f530: 0fc6749a */ jal func0f19d268
/* f19f534: 9484d176 */ lhu $a0,-0x2e8a($a0)
/* f19f538: afa202bc */ sw $v0,0x2bc($sp)
@@ -3646,7 +3646,7 @@ glabel func0f19f524
/* f19f698: 27a50064 */ addiu $a1,$sp,0x64
/* f19f69c: 8de400bc */ lw $a0,0xbc($t7)
/* f19f6a0: 0fc195e9 */ jal func0f0657a4
/* f19f6a4: 24840028 */ addiu $a0,$a0,%lo(var800b0028)
/* f19f6a4: 24840028 */ addiu $a0,$a0,0x0028
/* f19f6a8: 3c18800a */ lui $t8,0x800a
/* f19f6ac: 8f18a244 */ lw $t8,-0x5dbc($t8)
/* f19f6b0: 2401ffff */ addiu $at,$zero,-1
src/game/game_1a3340.c
+2 -2
View File
@@ -398,7 +398,7 @@ glabel menuhandler001a348c
/* f1a36f8: afb9009c */ sw $t9,0x9c($sp)
/* f1a36fc: af000004 */ sw $zero,0x4($t8)
/* f1a3700: af0e0000 */ sw $t6,0x0($t8)
/* f1a3704: 3c05800b */ lui $a1,%hi(var800b01a4)
/* f1a3704: 3c05800b */ lui $a1,0x800b
/* f1a3708: 8ca5b5a8 */ lw $a1,-0x4a58($a1)
/* f1a370c: 24180001 */ addiu $t8,$zero,0x1
/* f1a3710: 240f0002 */ addiu $t7,$zero,0x2
@@ -410,7 +410,7 @@ glabel menuhandler001a348c
/* f1a3728: 00003825 */ or $a3,$zero,$zero
/* f1a372c: afa80098 */ sw $t0,0x98($sp)
/* f1a3730: 0fc2ce70 */ jal func0f0b39c0
/* f1a3734: 24a501a4 */ addiu $a1,$a1,%lo(var800b01a4)
/* f1a3734: 24a501a4 */ addiu $a1,$a1,0x01a4
/* f1a3738: 8fb9009c */ lw $t9,0x9c($sp)
/* f1a373c: 8fa80098 */ lw $t0,0x98($sp)
/* f1a3740: 3c0fba00 */ lui $t7,0xba00
src/gvars/gvars.c
-11048
View File
File diff suppressed because it is too large Load Diff
src/include/gvars/gvars.h
-15
View File
@@ -882,20 +882,5 @@ extern u32 var800ad158;
extern u32 var800ad1a0;
extern u32 var800ad1b0;
extern u32 var800ad1c0;
extern u32 var800b0004;
extern u32 var800b000c;
extern u32 var800b0024;
extern u32 var800b0028;
extern u32 var800b0030;
extern u32 var800b003c;
extern u32 var800b0048;
extern u32 var800b0078;
extern u32 var800b0084;
extern u32 var800b01a4;
extern u32 var800b0234;
extern u32 var800b024c;
extern u32 var800b0294;
extern u32 var800b0e70;
extern u32 var800b7e50;
#endif
src/library/library_11420.c
+5 -5
View File
@@ -797,7 +797,7 @@ glabel func00011d84
/* 11e7c: 24040004 */ addiu $a0,$zero,0x4
/* 11e80: 0fc5b490 */ jal func0f16d240
/* 11e84: 24040001 */ addiu $a0,$zero,0x1
/* 11e88: 3c04800b */ lui $a0,%hi(var800b0004)
/* 11e88: 3c04800b */ lui $a0,0x800b
/* 11e8c: 0fc5db10 */ jal func0f176c40
/* 11e90: 8c84a5d0 */ lw $a0,-0x5a30($a0)
/* 11e94: 0fc5b3e8 */ jal func0f16cfa0
@@ -866,7 +866,7 @@ glabel func00011d84
/* 11f84: 24040004 */ addiu $a0,$zero,0x4
/* 11f88: 0fc5b490 */ jal func0f16d240
/* 11f8c: 24040001 */ addiu $a0,$zero,0x1
/* 11f90: 3c04800b */ lui $a0,%hi(var800b0004)
/* 11f90: 3c04800b */ lui $a0,0x800b
/* 11f94: 0fc5db10 */ jal func0f176c40
/* 11f98: 8c84a5d0 */ lw $a0,-0x5a30($a0)
/* 11f9c: 0fc5b3e8 */ jal func0f16cfa0
@@ -893,7 +893,7 @@ glabel func00011d84
/* 11fe8: 8c820000 */ lw $v0,0x0($a0)
/* 11fec: 8c8c0000 */ lw $t4,0x0($a0)
/* 11ff0: 5980001f */ blezl $t4,.L00012070
/* 11ff4: 24840004 */ addiu $a0,$a0,%lo(var800b0004)
/* 11ff4: 24840004 */ addiu $a0,$a0,0x0004
/* 11ff8: 8c820000 */ lw $v0,0x0($a0)
.L00011ffc:
/* 11ffc: 3c0d800b */ lui $t5,%hi(var800aaa88)
@@ -924,7 +924,7 @@ glabel func00011d84
/* 12050: 240b0001 */ addiu $t3,$zero,0x1
/* 12054: 8c990000 */ lw $t9,0x0($a0)
/* 12058: 53200005 */ beqzl $t9,.L00012070
/* 1205c: 24840004 */ addiu $a0,$a0,%lo(var800b0004)
/* 1205c: 24840004 */ addiu $a0,$a0,0x0004
.L00012060:
/* 12060: 10000002 */ beqz $zero,.L0001206c
/* 12064: afab0020 */ sw $t3,0x20($sp)
@@ -1032,4 +1032,4 @@ glabel func00011d84
/* 121d4: 27bd0038 */ addiu $sp,$sp,0x38
/* 121d8: 00000000 */ sll $zero,$zero,0x0
/* 121dc: 00000000 */ sll $zero,$zero,0x0
);
);