izzy/Diddy-Kong-Racing
0
0
Fork 0
mirror of https://github.com/izzy2lost/Diddy-Kong-Racing.git synced 2026-06-19 01:16:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

More various labels (#416)

Browse Source 
* be

* macros

* name these

* improve some names

* 31%

* I did evil things to objects

* made changes
This commit is contained in:
Fazana
2023-10-08 15:41:12 +01:00
committed by GitHub
parent 4d3a6bf21b
commit e40ccf32c8
40 changed files with 1890 additions and 1728 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matchings/game_ui/func_800A277C.s
+4 -4
View File
@@ -361,7 +361,7 @@ glabel func_800A277C
/* 0A3860 800A2C60 0000C812 */ mflo $t9
/* 0A3864 800A2C64 272C7FF8 */ addiu $t4, $t9, 0x7ff8
/* 0A3868 800A2C68 A54C0444 */ sh $t4, 0x444($t2)
/* 0A386C 800A2C6C 0C00382C */ jal func_8000E0B0
/* 0A386C 800A2C6C 0C00382C */ jal get_contpak_error
/* 0A3870 800A2C70 AFA900A8 */ sw $t1, 0xa8($sp)
/* 0A3874 800A2C74 8FA900A8 */ lw $t1, 0xa8($sp)
/* 0A3878 800A2C78 1C40000D */ bgtz $v0, .L800A2CB0
@@ -420,7 +420,7 @@ glabel func_800A277C
/* 0A3938 800A2D38 C4480350 */ lwc1 $f8, 0x350($v0)
/* 0A393C 800A2D3C 00000000 */ nop
/* 0A3940 800A2D40 460A4100 */ add.s $f4, $f8, $f10
/* 0A3944 800A2D44 0C00382C */ jal func_8000E0B0
/* 0A3944 800A2D44 0C00382C */ jal get_contpak_error
/* 0A3948 800A2D48 E4440450 */ swc1 $f4, 0x450($v0)
/* 0A394C 800A2D4C 1C40000A */ bgtz $v0, .L800A2D78
/* 0A3950 800A2D50 8FAF0098 */ lw $t7, 0x98($sp)
@@ -884,11 +884,11 @@ glabel func_800A277C
/* 0A4020 800A3420 8FA500C8 */ lw $a1, 0xc8($sp)
/* 0A4024 800A3424 0C028E21 */ jal render_speedometer
/* 0A4028 800A3428 00000000 */ nop
/* 0A402C 800A342C 0C00382C */ jal func_8000E0B0
/* 0A402C 800A342C 0C00382C */ jal get_contpak_error
/* 0A4030 800A3430 00000000 */ nop
/* 0A4034 800A3434 1840009D */ blez $v0, .L800A36AC
/* 0A4038 800A3438 00000000 */ nop
/* 0A403C 800A343C 0C00382C */ jal func_8000E0B0
/* 0A403C 800A343C 0C00382C */ jal get_contpak_error
/* 0A4040 800A3440 00000000 */ nop
/* 0A4044 800A3444 24010001 */ li $at, 1
/* 0A4048 800A3448 10410008 */ beq $v0, $at, .L800A346C
asm/non_matchings/menu/func_80094D28.s
+636 -636
View File
File diff suppressed because it is too large Load Diff
asm/non_matchings/objects/func_8000CC7C.s
+10 -10
View File
@@ -79,7 +79,7 @@ glabel func_8000CC7C
/* 00D974 8000CD74 AFB90130 */ sw $t9, 0x130($sp)
/* 00D978 8000CD78 A04D003B */ sb $t5, 0x3b($v0)
.L8000CD7C:
/* 00D97C 8000CD7C 0C01B683 */ jal get_render_context
/* 00D97C 8000CD7C 0C01B683 */ jal get_game_mode
/* 00D980 8000CD80 00000000 */ nop
/* 00D984 8000CD84 0C01BAA4 */ jal get_settings
/* 00D988 8000CD88 AFA20138 */ sw $v0, 0x138($sp)
@@ -122,8 +122,8 @@ glabel func_8000CC7C
/* 00DA14 8000CE14 AC80FFFC */ sw $zero, -4($a0)
/* 00DA18 8000CE18 1420FFF9 */ bnez $at, .L8000CE00
/* 00DA1C 8000CE1C AC40FFFC */ sw $zero, -4($v0)
/* 00DA20 8000CE20 3C028012 */ lui $v0, %hi(objCount) # $v0, 0x8012
/* 00DA24 8000CE24 8C42AE5C */ lw $v0, %lo(objCount)($v0)
/* 00DA20 8000CE20 3C028012 */ lui $v0, %hi(gObjectCount) # $v0, 0x8012
/* 00DA24 8000CE24 8C42AE5C */ lw $v0, %lo(gObjectCount)($v0)
/* 00DA28 8000CE28 00009025 */ move $s2, $zero
/* 00DA2C 8000CE2C 18400050 */ blez $v0, .L8000CF70
/* 00DA30 8000CE30 0000A825 */ move $s5, $zero
@@ -967,11 +967,11 @@ glabel L8000D98C
/* 00E5D4 8000D9D4 3C018012 */ lui $at, %hi(D_8011AD20) # $at, 0x8012
/* 00E5D8 8000D9D8 A020AD20 */ sb $zero, %lo(D_8011AD20)($at)
.L8000D9DC:
/* 00E5DC 8000D9DC 0C01B683 */ jal get_render_context
/* 00E5DC 8000D9DC 0C01B683 */ jal get_game_mode
/* 00E5E0 8000D9E0 00000000 */ nop
/* 00E5E4 8000D9E4 1440002D */ bnez $v0, .L8000DA9C
/* 00E5E8 8000D9E8 3C028012 */ lui $v0, %hi(objCount) # $v0, 0x8012
/* 00E5EC 8000D9EC 8C42AE5C */ lw $v0, %lo(objCount)($v0)
/* 00E5E8 8000D9E8 3C028012 */ lui $v0, %hi(gObjectCount) # $v0, 0x8012
/* 00E5EC 8000D9EC 8C42AE5C */ lw $v0, %lo(gObjectCount)($v0)
/* 00E5F0 8000D9F0 0000A825 */ move $s5, $zero
/* 00E5F4 8000D9F4 18400029 */ blez $v0, .L8000DA9C
/* 00E5F8 8000D9F8 3C138012 */ lui $s3, %hi(gObjPtrList) # $s3, 0x8012
@@ -995,8 +995,8 @@ glabel L8000D98C
/* 00E63C 8000DA3C 00000000 */ nop
/* 00E640 8000DA40 0C003FEE */ jal free_object
/* 00E644 8000DA44 02202025 */ move $a0, $s1
/* 00E648 8000DA48 3C028012 */ lui $v0, %hi(objCount) # $v0, 0x8012
/* 00E64C 8000DA4C 8C42AE5C */ lw $v0, %lo(objCount)($v0)
/* 00E648 8000DA48 3C028012 */ lui $v0, %hi(gObjectCount) # $v0, 0x8012
/* 00E64C 8000DA4C 8C42AE5C */ lw $v0, %lo(gObjectCount)($v0)
/* 00E650 8000DA50 1000000E */ b .L8000DA8C
/* 00E654 8000DA54 26520001 */ addiu $s2, $s2, 1
.L8000DA58:
@@ -1009,8 +1009,8 @@ glabel L8000D98C
/* 00E670 8000DA70 00000000 */ nop
/* 00E674 8000DA74 0C003FEE */ jal free_object
/* 00E678 8000DA78 02202025 */ move $a0, $s1
/* 00E67C 8000DA7C 3C028012 */ lui $v0, %hi(objCount) # $v0, 0x8012
/* 00E680 8000DA80 8C42AE5C */ lw $v0, %lo(objCount)($v0)
/* 00E67C 8000DA7C 3C028012 */ lui $v0, %hi(gObjectCount) # $v0, 0x8012
/* 00E680 8000DA80 8C42AE5C */ lw $v0, %lo(gObjectCount)($v0)
/* 00E684 8000DA84 00000000 */ nop
.L8000DA88:
/* 00E688 8000DA88 26520001 */ addiu $s2, $s2, 1
asm/non_matchings/objects/func_8000E5EC.s
+6 -6
View File
@@ -73,10 +73,10 @@ glabel func_8000E5EC
.L8000E6F0:
/* 00F2F0 8000E6F0 01681821 */ addu $v1, $t3, $t0
/* 00F2F4 8000E6F4 8C790000 */ lw $t9, ($v1)
/* 00F2F8 8000E6F8 3C068012 */ lui $a2, %hi(objCount) # $a2, 0x8012
/* 00F2F8 8000E6F8 3C068012 */ lui $a2, %hi(gObjectCount) # $a2, 0x8012
/* 00F2FC 8000E6FC 03226023 */ subu $t4, $t9, $v0
/* 00F300 8000E700 AC6C0000 */ sw $t4, ($v1)
/* 00F304 8000E704 8CC6AE5C */ lw $a2, %lo(objCount)($a2)
/* 00F304 8000E704 8CC6AE5C */ lw $a2, %lo(gObjectCount)($a2)
/* 00F308 8000E708 00004025 */ move $t0, $zero
/* 00F30C 8000E70C 18C00021 */ blez $a2, .L8000E794
/* 00F310 8000E710 00002825 */ move $a1, $zero
@@ -100,16 +100,16 @@ glabel func_8000E5EC
/* 00F354 8000E754 10200006 */ beqz $at, .L8000E770
/* 00F358 8000E758 01227823 */ subu $t7, $t1, $v0
/* 00F35C 8000E75C AC6F003C */ sw $t7, 0x3c($v1)
/* 00F360 8000E760 3C068012 */ lui $a2, %hi(objCount) # $a2, 0x8012
/* 00F364 8000E764 8CC6AE5C */ lw $a2, %lo(objCount)($a2)
/* 00F360 8000E760 3C068012 */ lui $a2, %hi(gObjectCount) # $a2, 0x8012
/* 00F364 8000E764 8CC6AE5C */ lw $a2, %lo(gObjectCount)($a2)
/* 00F368 8000E768 10000008 */ b .L8000E78C
/* 00F36C 8000E76C 00A6082A */ slt $at, $a1, $a2
.L8000E770:
/* 00F370 8000E770 148A0006 */ bne $a0, $t2, .L8000E78C
/* 00F374 8000E774 00A6082A */ slt $at, $a1, $a2
/* 00F378 8000E778 AC60003C */ sw $zero, 0x3c($v1)
/* 00F37C 8000E77C 3C068012 */ lui $a2, %hi(objCount) # $a2, 0x8012
/* 00F380 8000E780 8CC6AE5C */ lw $a2, %lo(objCount)($a2)
/* 00F37C 8000E77C 3C068012 */ lui $a2, %hi(gObjectCount) # $a2, 0x8012
/* 00F380 8000E780 8CC6AE5C */ lw $a2, %lo(gObjectCount)($a2)
/* 00F384 8000E784 00000000 */ nop
.L8000E788:
/* 00F388 8000E788 00A6082A */ slt $at, $a1, $a2
asm/non_matchings/objects/func_8000FD54.s
+3 -3
View File
@@ -12,7 +12,7 @@ glabel func_8000FD54
/* 01097C 8000FD7C AFB00018 */ sw $s0, 0x18($sp)
/* 010980 8000FD80 00002025 */ move $a0, $zero
.L8000FD84:
/* 010984 8000FD84 0C0031C6 */ jal func_8000C718
/* 010984 8000FD84 0C0031C6 */ jal load_object_header
/* 010988 8000FD88 AFA40038 */ sw $a0, 0x38($sp)
/* 01098C 8000FD8C 14400003 */ bnez $v0, .L8000FD9C
/* 010990 8000FD90 00409825 */ move $s3, $v0
@@ -28,7 +28,7 @@ glabel func_8000FD54
/* 0109B4 8000FDB4 14400006 */ bnez $v0, .L8000FDD0
/* 0109B8 8000FDB8 00409025 */ move $s2, $v0
/* 0109BC 8000FDBC 8FA40038 */ lw $a0, 0x38($sp)
/* 0109C0 8000FDC0 0C003211 */ jal func_8000C844
/* 0109C0 8000FDC0 0C003211 */ jal try_free_object_header
/* 0109C4 8000FDC4 00000000 */ nop
/* 0109C8 8000FDC8 10000073 */ b .L8000FF98
/* 0109CC 8000FDCC 00001025 */ move $v0, $zero
@@ -153,7 +153,7 @@ glabel func_8000FD54
/* 010B74 8000FF74 0C003D92 */ jal objFreeAssets
/* 010B78 8000FF78 02802825 */ move $a1, $s4
/* 010B7C 8000FF7C 8FA40038 */ lw $a0, 0x38($sp)
/* 010B80 8000FF80 0C003211 */ jal func_8000C844
/* 010B80 8000FF80 0C003211 */ jal try_free_object_header
/* 010B84 8000FF84 00000000 */ nop
/* 010B88 8000FF88 0C01C450 */ jal free_from_memory_pool
/* 010B8C 8000FF8C 02402025 */ move $a0, $s2
asm/non_matchings/objects/func_800101AC.s
+10 -10
View File
@@ -23,8 +23,8 @@ glabel func_800101AC
/* 010DE4 800101E4 00000000 */ nop
/* 010DE8 800101E8 0C02C810 */ jal func_800B2040
/* 010DEC 800101EC 00000000 */ nop
/* 010DF0 800101F0 3C028012 */ lui $v0, %hi(D_8011AE64) # $v0, 0x8012
/* 010DF4 800101F4 2442AE64 */ addiu $v0, %lo(D_8011AE64) # addiu $v0, $v0, -0x519c
/* 010DF0 800101F0 3C028012 */ lui $v0, %hi(gParticleCount) # $v0, 0x8012
/* 010DF4 800101F4 2442AE64 */ addiu $v0, %lo(gParticleCount) # addiu $v0, $v0, -0x519c
/* 010DF8 800101F8 8C580000 */ lw $t8, ($v0)
/* 010DFC 800101FC 00000000 */ nop
/* 010E00 80010200 2719FFFF */ addiu $t9, $t8, -1
@@ -80,7 +80,7 @@ glabel func_800101AC
.L800102B4:
/* 010EB4 800102B4 8624002C */ lh $a0, 0x2c($s1)
.L800102B8:
/* 010EB8 800102B8 0C003211 */ jal func_8000C844
/* 010EB8 800102B8 0C003211 */ jal try_free_object_header
/* 010EBC 800102BC 00000000 */ nop
/* 010EC0 800102C0 0C01C450 */ jal free_from_memory_pool
/* 010EC4 800102C4 02202025 */ move $a0, $s1
@@ -131,8 +131,8 @@ glabel func_800101AC
/* 010F6C 8001036C 01800008 */ jr $t4
/* 010F70 80010370 00000000 */ nop
glabel L80010374
/* 010F74 80010374 3C038012 */ lui $v1, %hi(objCount) # $v1, 0x8012
/* 010F78 80010378 8C63AE5C */ lw $v1, %lo(objCount)($v1)
/* 010F74 80010374 3C038012 */ lui $v1, %hi(gObjectCount) # $v1, 0x8012
/* 010F78 80010378 8C63AE5C */ lw $v1, %lo(gObjectCount)($v1)
/* 010F7C 8001037C 0000A825 */ move $s5, $zero
/* 010F80 80010380 1860001D */ blez $v1, .L800103F8
/* 010F84 80010384 0000A025 */ move $s4, $zero
@@ -157,8 +157,8 @@ glabel L80010374
/* 010FCC 800103CC 02A3082A */ slt $at, $s5, $v1
/* 010FD0 800103D0 AC400100 */ sw $zero, 0x100($v0)
/* 010FD4 800103D4 A04500FD */ sb $a1, 0xfd($v0)
/* 010FD8 800103D8 3C038012 */ lui $v1, %hi(objCount) # $v1, 0x8012
/* 010FDC 800103DC 8C63AE5C */ lw $v1, %lo(objCount)($v1)
/* 010FD8 800103D8 3C038012 */ lui $v1, %hi(gObjectCount) # $v1, 0x8012
/* 010FDC 800103DC 8C63AE5C */ lw $v1, %lo(gObjectCount)($v1)
/* 010FE0 800103E0 00000000 */ nop
/* 010FE4 800103E4 02A3082A */ slt $at, $s5, $v1
.L800103E8:
@@ -412,8 +412,8 @@ glabel L80010664
.L80010738:
/* 011338 80010738 0C001AB2 */ jal func_80006AC8
/* 01133C 8001073C 02C02025 */ move $a0, $s6
/* 011340 80010740 3C158012 */ lui $s5, %hi(objCount) # $s5, 0x8012
/* 011344 80010744 26B5AE5C */ addiu $s5, %lo(objCount) # addiu $s5, $s5, -0x51a4
/* 011340 80010740 3C158012 */ lui $s5, %hi(gObjectCount) # $s5, 0x8012
/* 011344 80010744 26B5AE5C */ addiu $s5, %lo(gObjectCount) # addiu $s5, $s5, -0x51a4
/* 011348 80010748 8EA80000 */ lw $t0, ($s5)
/* 01134C 8001074C 00008025 */ move $s0, $zero
/* 011350 80010750 19000027 */ blez $t0, .L800107F0
@@ -564,7 +564,7 @@ glabel L80010664
/* 011554 80010954 00000000 */ nop
.L80010958:
/* 011558 80010958 86C4002C */ lh $a0, 0x2c($s6)
/* 01155C 8001095C 0C003211 */ jal func_8000C844
/* 01155C 8001095C 0C003211 */ jal try_free_object_header
/* 011560 80010960 00000000 */ nop
/* 011564 80010964 0C01C450 */ jal free_from_memory_pool
/* 011568 80010968 02C02025 */ move $a0, $s6
asm/non_matchings/objects/func_80010994.s
+8 -8
View File
@@ -144,9 +144,9 @@ glabel func_80010994
/* 0117AC 80010BAC 1420FFF6 */ bnez $at, .L80010B88
/* 0117B0 80010BB0 26520004 */ addiu $s2, $s2, 4
.L80010BB4:
/* 0117B4 80010BB4 3C138012 */ lui $s3, %hi(objCount) # $s3, 0x8012
/* 0117B4 80010BB4 3C138012 */ lui $s3, %hi(gObjectCount) # $s3, 0x8012
/* 0117B8 80010BB8 3C118012 */ lui $s1, %hi(D_8011AE60) # $s1, 0x8012
/* 0117BC 80010BBC 8E73AE5C */ lw $s3, %lo(objCount)($s3)
/* 0117BC 80010BBC 8E73AE5C */ lw $s3, %lo(gObjectCount)($s3)
/* 0117C0 80010BC0 8E31AE60 */ lw $s1, %lo(D_8011AE60)($s1)
/* 0117C4 80010BC4 00000000 */ nop
/* 0117C8 80010BC8 0233082A */ slt $at, $s1, $s3
@@ -333,8 +333,8 @@ glabel func_80010994
/* 011A50 80010E50 1420FFE6 */ bnez $at, .L80010DEC
/* 011A54 80010E54 00000000 */ nop
.L80010E58:
/* 011A58 80010E58 3C188012 */ lui $t8, %hi(D_8011AE64) # $t8, 0x8012
/* 011A5C 80010E5C 8F18AE64 */ lw $t8, %lo(D_8011AE64)($t8)
/* 011A58 80010E58 3C188012 */ lui $t8, %hi(gParticleCount) # $t8, 0x8012
/* 011A5C 80010E5C 8F18AE64 */ lw $t8, %lo(gParticleCount)($t8)
/* 011A60 80010E60 00000000 */ nop
/* 011A64 80010E64 1B000018 */ blez $t8, .L80010EC8
/* 011A68 80010E68 3C118012 */ lui $s1, %hi(D_8011AE60) # $s1, 0x8012
@@ -370,8 +370,8 @@ glabel func_80010994
/* 011AD4 80010ED4 00000000 */ nop
/* 011AD8 80010ED8 1840001F */ blez $v0, .L80010F58
/* 011ADC 80010EDC 3C118012 */ lui $s1, %hi(D_8011AE60) # $s1, 0x8012
/* 011AE0 80010EE0 3C028012 */ lui $v0, %hi(objCount) # $v0, 0x8012
/* 011AE4 80010EE4 8C42AE5C */ lw $v0, %lo(objCount)($v0)
/* 011AE0 80010EE0 3C028012 */ lui $v0, %hi(gObjectCount) # $v0, 0x8012
/* 011AE4 80010EE4 8C42AE5C */ lw $v0, %lo(gObjectCount)($v0)
/* 011AE8 80010EE8 8E31AE60 */ lw $s1, %lo(D_8011AE60)($s1)
/* 011AEC 80010EEC 00000000 */ nop
/* 011AF0 80010EF0 0222082A */ slt $at, $s1, $v0
@@ -394,8 +394,8 @@ glabel func_80010994
/* 011B30 80010F30 00000000 */ nop
/* 011B34 80010F34 0C00CB1F */ jal func_80032C7C
/* 011B38 80010F38 02002025 */ move $a0, $s0
/* 011B3C 80010F3C 3C028012 */ lui $v0, %hi(objCount) # $v0, 0x8012
/* 011B40 80010F40 8C42AE5C */ lw $v0, %lo(objCount)($v0)
/* 011B3C 80010F3C 3C028012 */ lui $v0, %hi(gObjectCount) # $v0, 0x8012
/* 011B40 80010F40 8C42AE5C */ lw $v0, %lo(gObjectCount)($v0)
/* 011B44 80010F44 00000000 */ nop
.L80010F48:
/* 011B48 80010F48 26310001 */ addiu $s1, $s1, 1
asm/non_matchings/objects/func_80014814.s
+2 -2
View File
@@ -1,6 +1,6 @@
glabel func_80014814
/* 015414 80014814 3C068012 */ lui $a2, %hi(objCount) # $a2, 0x8012
/* 015418 80014818 24C6AE5C */ addiu $a2, %lo(objCount) # addiu $a2, $a2, -0x51a4
/* 015414 80014814 3C068012 */ lui $a2, %hi(gObjectCount) # $a2, 0x8012
/* 015418 80014818 24C6AE5C */ addiu $a2, %lo(gObjectCount) # addiu $a2, $a2, -0x51a4
/* 01541C 8001481C 8CCE0000 */ lw $t6, ($a2)
/* 015420 80014820 3C0A8012 */ lui $t2, %hi(D_8011AE7C) # $t2, 0x8012
/* 015424 80014824 254AAE7C */ addiu $t2, %lo(D_8011AE7C) # addiu $t2, $t2, -0x5184
asm/non_matchings/objects/func_80017E98.s
+4 -4
View File
@@ -1,7 +1,7 @@
glabel func_80017E98
/* 018A98 80017E98 27BDFEE8 */ addiu $sp, $sp, -0x118
/* 018A9C 80017E9C 3C038012 */ lui $v1, %hi(objCount) # $v1, 0x8012
/* 018AA0 80017EA0 8C63AE5C */ lw $v1, %lo(objCount)($v1)
/* 018A9C 80017E9C 3C038012 */ lui $v1, %hi(gObjectCount) # $v1, 0x8012
/* 018AA0 80017EA0 8C63AE5C */ lw $v1, %lo(gObjectCount)($v1)
/* 018AA4 80017EA4 AFB30044 */ sw $s3, 0x44($sp)
/* 018AA8 80017EA8 3C018012 */ lui $at, %hi(gNumberOfCheckpoints) # $at, 0x8012
/* 018AAC 80017EAC AFBF005C */ sw $ra, 0x5c($sp)
@@ -74,7 +74,7 @@ glabel func_80017E98
/* 018BB0 80017FB0 8E8B0000 */ lw $t3, ($s4)
/* 018BB4 80017FB4 01850019 */ multu $t4, $a1
/* 018BB8 80017FB8 240FFFFF */ li $t7, -1
/* 018BBC 80017FBC 3C038012 */ lui $v1, %hi(objCount) # $v1, 0x8012
/* 018BBC 80017FBC 3C038012 */ lui $v1, %hi(gObjectCount) # $v1, 0x8012
/* 018BC0 80017FC0 00006812 */ mflo $t5
/* 018BC4 80017FC4 016D7021 */ addu $t6, $t3, $t5
/* 018BC8 80017FC8 A5C4002C */ sh $a0, 0x2c($t6)
@@ -88,7 +88,7 @@ glabel func_80017E98
/* 018BE8 80017FE8 00000000 */ nop
/* 018BEC 80017FEC 25AE0001 */ addiu $t6, $t5, 1
/* 018BF0 80017FF0 ACEE0000 */ sw $t6, ($a3)
/* 018BF4 80017FF4 8C63AE5C */ lw $v1, %lo(objCount)($v1)
/* 018BF4 80017FF4 8C63AE5C */ lw $v1, %lo(gObjectCount)($v1)
/* 018BF8 80017FF8 00000000 */ nop
/* 018BFC 80017FFC 0263082A */ slt $at, $s3, $v1
.L80018000:
asm/non_matchings/objects/func_80018CE0.s
+4 -4
View File
@@ -36,8 +36,8 @@ glabel func_80018CE0
/* 019968 80018D68 144001E4 */ bnez $v0, .L800194FC
/* 01996C 80018D6C 3C0C8012 */ lui $t4, %hi(D_8011AE60) # $t4, 0x8012
/* 019970 80018D70 8D8CAE60 */ lw $t4, %lo(D_8011AE60)($t4)
/* 019974 80018D74 3C0D8012 */ lui $t5, %hi(objCount) # $t5, 0x8012
/* 019978 80018D78 8DADAE5C */ lw $t5, %lo(objCount)($t5)
/* 019974 80018D74 3C0D8012 */ lui $t5, %hi(gObjectCount) # $t5, 0x8012
/* 019978 80018D78 8DADAE5C */ lw $t5, %lo(gObjectCount)($t5)
/* 01997C 80018D7C AFAC00F4 */ sw $t4, 0xf4($sp)
/* 019980 80018D80 018D082A */ slt $at, $t4, $t5
/* 019984 80018D84 10200135 */ beqz $at, .L8001925C
@@ -357,8 +357,8 @@ glabel func_80018CE0
.L80019234:
/* 019E34 80019234 8FAA00F4 */ lw $t2, 0xf4($sp)
.L80019238:
/* 019E38 80019238 3C188012 */ lui $t8, %hi(objCount) # $t8, 0x8012
/* 019E3C 8001923C 8F18AE5C */ lw $t8, %lo(objCount)($t8)
/* 019E38 80019238 3C188012 */ lui $t8, %hi(gObjectCount) # $t8, 0x8012
/* 019E3C 8001923C 8F18AE5C */ lw $t8, %lo(gObjectCount)($t8)
/* 019E40 80019240 8FAD0098 */ lw $t5, 0x98($sp)
/* 019E44 80019244 254B0001 */ addiu $t3, $t2, 1
/* 019E48 80019248 0178082A */ slt $at, $t3, $t8
asm/non_matchings/objects/func_80019808.s
+1 -1
View File
@@ -604,7 +604,7 @@ glabel func_80019808
/* 01ACA0 8001A0A0 00000000 */ nop
/* 01ACA4 8001A0A4 AFBF0064 */ sw $ra, 0x64($sp)
/* 01ACA8 8001A0A8 AFA80080 */ sw $t0, 0x80($sp)
/* 01ACAC 8001A0AC 0C01B683 */ jal get_render_context
/* 01ACAC 8001A0AC 0C01B683 */ jal get_game_mode
/* 01ACB0 8001A0B0 AFAA0044 */ sw $t2, 0x44($sp)
/* 01ACB4 8001A0B4 8FA80080 */ lw $t0, 0x80($sp)
/* 01ACB8 8001A0B8 8FAA0044 */ lw $t2, 0x44($sp)
asm/non_matchings/objects/func_8001A8F4.s
+1 -1
View File
@@ -4,7 +4,7 @@ glabel func_8001A8F4
/* 01B4FC 8001A8FC AFA40040 */ sw $a0, 0x40($sp)
/* 01B500 8001A900 AFB10018 */ sw $s1, 0x18($sp)
/* 01B504 8001A904 AFB00014 */ sw $s0, 0x14($sp)
/* 01B508 8001A908 0C01BCE2 */ jal func_8006F388
/* 01B508 8001A908 0C01BCE2 */ jal set_pause_lockout_timer
/* 01B50C 8001A90C 24040001 */ li $a0, 1
/* 01B510 8001A910 3C108012 */ lui $s0, %hi(D_8011AD4E) # $s0, 0x8012
/* 01B514 8001A914 2610AD4E */ addiu $s0, %lo(D_8011AD4E) # addiu $s0, $s0, -0x52b2
asm/non_matchings/objects/func_8001BF20.s
+4 -4
View File
@@ -33,8 +33,8 @@ glabel func_8001BF20
/* 01CB7C 8001BF7C 2BC10200 */ slti $at, $fp, 0x200
/* 01CB80 8001BF80 1420FFFA */ bnez $at, .L8001BF6C
/* 01CB84 8001BF84 AF000000 */ sw $zero, ($t8)
/* 01CB88 8001BF88 3C048012 */ lui $a0, %hi(objCount) # $a0, 0x8012
/* 01CB8C 8001BF8C 8C84AE5C */ lw $a0, %lo(objCount)($a0)
/* 01CB88 8001BF88 3C048012 */ lui $a0, %hi(gObjectCount) # $a0, 0x8012
/* 01CB8C 8001BF8C 8C84AE5C */ lw $a0, %lo(gObjectCount)($a0)
/* 01CB90 8001BF90 A7A00186 */ sh $zero, 0x186($sp)
/* 01CB94 8001BF94 1880002D */ blez $a0, .L8001C04C
/* 01CB98 8001BF98 00003825 */ move $a3, $zero
@@ -66,7 +66,7 @@ glabel func_8001BF20
/* 01CBFC 8001BFFC 15E00010 */ bnez $t7, .L8001C040
/* 01CC00 8001C000 0003C880 */ sll $t9, $v1, 2
/* 01CC04 8001C004 8D580000 */ lw $t8, ($t2)
/* 01CC08 8001C008 3C048012 */ lui $a0, %hi(objCount) # $a0, 0x8012
/* 01CC08 8001C008 3C048012 */ lui $a0, %hi(gObjectCount) # $a0, 0x8012
/* 01CC0C 8001C00C 03195821 */ addu $t3, $t8, $t9
/* 01CC10 8001C010 AD730000 */ sw $s3, ($t3)
/* 01CC14 8001C014 87AD0186 */ lh $t5, 0x186($sp)
@@ -78,7 +78,7 @@ glabel func_8001BF20
/* 01CC2C 8001C02C 31F80003 */ andi $t8, $t7, 3
/* 01CC30 8001C030 A3380000 */ sb $t8, ($t9)
/* 01CC34 8001C034 25AB0001 */ addiu $t3, $t5, 1
/* 01CC38 8001C038 8C84AE5C */ lw $a0, %lo(objCount)($a0)
/* 01CC38 8001C038 8C84AE5C */ lw $a0, %lo(gObjectCount)($a0)
/* 01CC3C 8001C03C A7AB0186 */ sh $t3, 0x186($sp)
.L8001C040:
/* 01CC40 8001C040 00E4082A */ slt $at, $a3, $a0
asm/non_matchings/objects/func_8001E4C4.s
+2 -2
View File
@@ -1,6 +1,6 @@
glabel func_8001E4C4
/* 01F0C4 8001E4C4 3C088012 */ lui $t0, %hi(objCount) # $t0, 0x8012
/* 01F0C8 8001E4C8 2508AE5C */ addiu $t0, %lo(objCount) # addiu $t0, $t0, -0x51a4
/* 01F0C4 8001E4C4 3C088012 */ lui $t0, %hi(gObjectCount) # $t0, 0x8012
/* 01F0C8 8001E4C8 2508AE5C */ addiu $t0, %lo(gObjectCount) # addiu $t0, $t0, -0x51a4
/* 01F0CC 8001E4CC 8D030000 */ lw $v1, ($t0)
/* 01F0D0 8001E4D0 00001025 */ move $v0, $zero
/* 01F0D4 8001E4D4 18600013 */ blez $v1, .L8001E524
asm/non_matchings/objects/func_8001E93C.s
+4 -4
View File
@@ -56,8 +56,8 @@ glabel func_8001E93C
.L8001EA08:
/* 01F608 8001EA08 0C007931 */ jal func_8001E4C4
/* 01F60C 8001EA0C 00000000 */ nop
/* 01F610 8001EA10 3C068012 */ lui $a2, %hi(objCount) # $a2, 0x8012
/* 01F614 8001EA14 8CC6AE5C */ lw $a2, %lo(objCount)($a2)
/* 01F610 8001EA10 3C068012 */ lui $a2, %hi(gObjectCount) # $a2, 0x8012
/* 01F614 8001EA14 8CC6AE5C */ lw $a2, %lo(gObjectCount)($a2)
/* 01F618 8001EA18 3C0D8012 */ lui $t5, %hi(D_8011AE74) # $t5, 0x8012
/* 01F61C 8001EA1C 18C00023 */ blez $a2, .L8001EAAC
/* 01F620 8001EA20 25ADAE74 */ addiu $t5, %lo(D_8011AE74) # addiu $t5, $t5, -0x518c
@@ -133,10 +133,10 @@ glabel func_8001E93C
/* 01F724 8001EB24 14990008 */ bne $a0, $t9, .L8001EB48
/* 01F728 8001EB28 0186082A */ slt $at, $t4, $a2
/* 01F72C 8001EB2C 8DAE0000 */ lw $t6, ($t5)
/* 01F730 8001EB30 3C068012 */ lui $a2, %hi(objCount) # $a2, 0x8012
/* 01F730 8001EB30 3C068012 */ lui $a2, %hi(gObjectCount) # $a2, 0x8012
/* 01F734 8001EB34 01CFC021 */ addu $t8, $t6, $t7
/* 01F738 8001EB38 AF020000 */ sw $v0, ($t8)
/* 01F73C 8001EB3C 8CC6AE5C */ lw $a2, %lo(objCount)($a2)
/* 01F73C 8001EB3C 8CC6AE5C */ lw $a2, %lo(gObjectCount)($a2)
/* 01F740 8001EB40 26730001 */ addiu $s3, $s3, 1
/* 01F744 8001EB44 0186082A */ slt $at, $t4, $a2
.L8001EB48:
asm/non_matchings/objects/func_8001F460.s
+1 -1
View File
@@ -288,7 +288,7 @@ glabel func_8001F460
/* 02044C 8001F84C 00002025 */ move $a0, $zero
/* 020450 8001F850 00007012 */ mflo $t6
/* 020454 8001F854 AFAE0018 */ sw $t6, 0x18($sp)
/* 020458 8001F858 0C00C378 */ jal func_80030DE0
/* 020458 8001F858 0C00C378 */ jal slowly_change_fog
/* 02045C 8001F85C 00000000 */ nop
/* 020460 8001F860 10000048 */ b .L8001F984
/* 020464 8001F864 241800FF */ li $t8, 255
asm/non_matchings/objects/func_80022948.s
+5 -5
View File
@@ -200,8 +200,8 @@ glabel func_80022948
/* 023854 80022C54 240D0002 */ li $t5, 2
/* 023858 80022C58 A18D0012 */ sb $t5, 0x12($t4)
/* 02385C 80022C5C 3C048012 */ lui $a0, %hi(D_8011AE60) # $a0, 0x8012
/* 023860 80022C60 3C058012 */ lui $a1, %hi(objCount) # $a1, 0x8012
/* 023864 80022C64 8CA5AE5C */ lw $a1, %lo(objCount)($a1)
/* 023860 80022C60 3C058012 */ lui $a1, %hi(gObjectCount) # $a1, 0x8012
/* 023864 80022C64 8CA5AE5C */ lw $a1, %lo(gObjectCount)($a1)
/* 023868 80022C68 8C84AE60 */ lw $a0, %lo(D_8011AE60)($a0)
/* 02386C 80022C6C 2407003E */ li $a3, 62
/* 023870 80022C70 0085082A */ slt $at, $a0, $a1
@@ -225,15 +225,15 @@ glabel func_80022948
/* 0238B4 80022CB4 14E90006 */ bne $a3, $t1, .L80022CD0
/* 0238B8 80022CB8 0085082A */ slt $at, $a0, $a1
/* 0238BC 80022CBC AE020154 */ sw $v0, 0x154($s0)
/* 0238C0 80022CC0 3C058012 */ lui $a1, %hi(objCount) # $a1, 0x8012
/* 0238C4 80022CC4 8CA5AE5C */ lw $a1, %lo(objCount)($a1)
/* 0238C0 80022CC0 3C058012 */ lui $a1, %hi(gObjectCount) # $a1, 0x8012
/* 0238C4 80022CC4 8CA5AE5C */ lw $a1, %lo(gObjectCount)($a1)
/* 0238C8 80022CC8 00000000 */ nop
/* 0238CC 80022CCC 0085082A */ slt $at, $a0, $a1
.L80022CD0:
/* 0238D0 80022CD0 1420FFEC */ bnez $at, .L80022C84
/* 0238D4 80022CD4 24630004 */ addiu $v1, $v1, 4
.L80022CD8:
/* 0238D8 80022CD8 0C01BCE2 */ jal func_8006F388
/* 0238D8 80022CD8 0C01BCE2 */ jal set_pause_lockout_timer
/* 0238DC 80022CDC 24040014 */ li $a0, 20
/* 0238E0 80022CE0 3C04800E */ lui $a0, %hi(D_800DC6F0) # $a0, 0x800e
/* 0238E4 80022CE4 0C030076 */ jal transition_begin
asm/non_matchings/objects/func_80022E18.s
+2 -2
View File
@@ -53,8 +53,8 @@ glabel func_80022E18
/* 023AE0 80022EE0 ADCD0000 */ sw $t5, ($t6)
/* 023AE4 80022EE4 ACCF0000 */ sw $t7, ($a2)
/* 023AE8 80022EE8 3C058012 */ lui $a1, %hi(D_8011AE60) # $a1, 0x8012
/* 023AEC 80022EEC 3C038012 */ lui $v1, %hi(objCount) # $v1, 0x8012
/* 023AF0 80022EF0 8C63AE5C */ lw $v1, %lo(objCount)($v1)
/* 023AEC 80022EEC 3C038012 */ lui $v1, %hi(gObjectCount) # $v1, 0x8012
/* 023AF0 80022EF0 8C63AE5C */ lw $v1, %lo(gObjectCount)($v1)
/* 023AF4 80022EF4 8CA5AE60 */ lw $a1, %lo(D_8011AE60)($a1)
/* 023AF8 80022EF8 3C188012 */ lui $t8, %hi(gObjPtrList) # $t8, 0x8012
/* 023AFC 80022EFC 00A3082A */ slt $at, $a1, $v1
asm/non_matchings/objects/func_800230D0.s
+2 -2
View File
@@ -8,8 +8,8 @@ glabel func_800230D0
/* 023CE8 800230E8 00A08825 */ move $s1, $a1
/* 023CEC 800230EC 14400032 */ bnez $v0, .L800231B8
/* 023CF0 800230F0 AFBF001C */ sw $ra, 0x1c($sp)
/* 023CF4 800230F4 3C078012 */ lui $a3, %hi(objCount) # $a3, 0x8012
/* 023CF8 800230F8 24E7AE5C */ addiu $a3, %lo(objCount) # addiu $a3, $a3, -0x51a4
/* 023CF4 800230F4 3C078012 */ lui $a3, %hi(gObjectCount) # $a3, 0x8012
/* 023CF8 800230F8 24E7AE5C */ addiu $a3, %lo(gObjectCount) # addiu $a3, $a3, -0x51a4
/* 023CFC 800230FC 8CE40000 */ lw $a0, ($a3)
/* 023D00 80023100 00004025 */ move $t0, $zero
/* 023D04 80023104 1880002A */ blez $a0, .L800231B0
asm/non_matchings/objects/spawn_object.s
+11 -11
View File
@@ -61,7 +61,7 @@ glabel spawn_object
/* 00F71C 8000EB1C 24190002 */ li $t9, 2
/* 00F720 8000EB20 A6590006 */ sh $t9, 6($s2)
/* 00F724 8000EB24 A7A4004E */ sh $a0, 0x4e($sp)
/* 00F728 8000EB28 0C0031C6 */ jal func_8000C718
/* 00F728 8000EB28 0C0031C6 */ jal load_object_header
/* 00F72C 8000EB2C AFA3002C */ sw $v1, 0x2c($sp)
/* 00F730 8000EB30 14400003 */ bnez $v0, .L8000EB40
/* 00F734 8000EB34 AE420040 */ sw $v0, 0x40($s2)
@@ -459,7 +459,7 @@ glabel L8000EDE0
/* 00FCD0 8000F0D0 0C003D92 */ jal objFreeAssets
/* 00FCD4 8000F0D4 02602825 */ move $a1, $s3
/* 00FCD8 8000F0D8 87A4004E */ lh $a0, 0x4e($sp)
/* 00FCDC 8000F0DC 0C003211 */ jal func_8000C844
/* 00FCDC 8000F0DC 0C003211 */ jal try_free_object_header
/* 00FCE0 8000F0E0 00000000 */ nop
/* 00FCE4 8000F0E4 10000151 */ b .L8000F62C
/* 00FCE8 8000F0E8 00001025 */ move $v0, $zero
@@ -504,7 +504,7 @@ glabel L8000EDE0
/* 00FD7C 8000F17C 0C003D92 */ jal objFreeAssets
/* 00FD80 8000F180 02602825 */ move $a1, $s3
/* 00FD84 8000F184 87A4004E */ lh $a0, 0x4e($sp)
/* 00FD88 8000F188 0C003211 */ jal func_8000C844
/* 00FD88 8000F188 0C003211 */ jal try_free_object_header
/* 00FD8C 8000F18C 00000000 */ nop
/* 00FD90 8000F190 10000126 */ b .L8000F62C
/* 00FD94 8000F194 00001025 */ move $v0, $zero
@@ -514,7 +514,7 @@ glabel L8000EDE0
/* 00FDA0 8000F1A0 330E0004 */ andi $t6, $t8, 4
/* 00FDA4 8000F1A4 11C00016 */ beqz $t6, .L8000F200
/* 00FDA8 8000F1A8 00C02825 */ move $a1, $a2
/* 00FDAC 8000F1AC 0C003F1B */ jal func_8000FC6C
/* 00FDAC 8000F1AC 0C003F1B */ jal init_object_water_effect
/* 00FDB0 8000F1B0 AFA60048 */ sw $a2, 0x48($sp)
/* 00FDB4 8000F1B4 8FA60048 */ lw $a2, 0x48($sp)
/* 00FDB8 8000F1B8 14400011 */ bnez $v0, .L8000F200
@@ -532,7 +532,7 @@ glabel L8000EDE0
/* 00FDE4 8000F1E4 0C003D92 */ jal objFreeAssets
/* 00FDE8 8000F1E8 02602825 */ move $a1, $s3
/* 00FDEC 8000F1EC 87A4004E */ lh $a0, 0x4e($sp)
/* 00FDF0 8000F1F0 0C003211 */ jal func_8000C844
/* 00FDF0 8000F1F0 0C003211 */ jal try_free_object_header
/* 00FDF4 8000F1F4 00000000 */ nop
/* 00FDF8 8000F1F8 1000010C */ b .L8000F62C
/* 00FDFC 8000F1FC 00001025 */ move $v0, $zero
@@ -619,7 +619,7 @@ glabel L8000EDE0
/* 00FF20 8000F320 0C003D92 */ jal objFreeAssets
/* 00FF24 8000F324 02602825 */ move $a1, $s3
/* 00FF28 8000F328 87A4004E */ lh $a0, 0x4e($sp)
/* 00FF2C 8000F32C 0C003211 */ jal func_8000C844
/* 00FF2C 8000F32C 0C003211 */ jal try_free_object_header
/* 00FF30 8000F330 00000000 */ nop
/* 00FF34 8000F334 100000BD */ b .L8000F62C
/* 00FF38 8000F338 00001025 */ move $v0, $zero
@@ -703,9 +703,9 @@ glabel L8000EDE0
/* 01004C 8000F44C AC4A005C */ sw $t2, 0x5c($v0)
.L8000F450:
/* 010050 8000F450 8C430060 */ lw $v1, 0x60($v0)
/* 010054 8000F454 3C108012 */ lui $s0, %hi(objCount) # $s0, 0x8012
/* 010054 8000F454 3C108012 */ lui $s0, %hi(gObjectCount) # $s0, 0x8012
/* 010058 8000F458 10600005 */ beqz $v1, .L8000F470
/* 01005C 8000F45C 2610AE5C */ addiu $s0, %lo(objCount) # addiu $s0, $s0, -0x51a4
/* 01005C 8000F45C 2610AE5C */ addiu $s0, %lo(gObjectCount) # addiu $s0, $s0, -0x51a4
/* 010060 8000F460 8CAB0000 */ lw $t3, ($a1)
/* 010064 8000F464 0043C821 */ addu $t9, $v0, $v1
/* 010068 8000F468 032B6023 */ subu $t4, $t9, $t3
@@ -750,10 +750,10 @@ glabel L8000EDE0
/* 0100F8 8000F4F8 25590001 */ addiu $t9, $t2, 1
/* 0100FC 8000F4FC AE190000 */ sw $t9, ($s0)
.L8000F500:
/* 010100 8000F500 3C108012 */ lui $s0, %hi(objCount) # $s0, 0x8012
/* 010100 8000F500 3C108012 */ lui $s0, %hi(gObjectCount) # $s0, 0x8012
/* 010104 8000F504 8FA50068 */ lw $a1, 0x68($sp)
/* 010108 8000F508 0C008E2F */ jal run_object_init_func
/* 01010C 8000F50C 2610AE5C */ addiu $s0, %lo(objCount) # addiu $s0, $s0, -0x51a4
/* 01010C 8000F50C 2610AE5C */ addiu $s0, %lo(gObjectCount) # addiu $s0, $s0, -0x51a4
/* 010110 8000F510 8E42004C */ lw $v0, 0x4c($s2)
/* 010114 8000F514 00000000 */ nop
/* 010118 8000F518 1040000C */ beqz $v0, .L8000F54C
@@ -802,7 +802,7 @@ glabel L8000EDE0
/* 0101B8 8000F5B8 0C003D92 */ jal objFreeAssets
/* 0101BC 8000F5BC 02602825 */ move $a1, $s3
/* 0101C0 8000F5C0 87A4004E */ lh $a0, 0x4e($sp)
/* 0101C4 8000F5C4 0C003211 */ jal func_8000C844
/* 0101C4 8000F5C4 0C003211 */ jal try_free_object_header
/* 0101C8 8000F5C8 00000000 */ nop
/* 0101CC 8000F5CC 0C01C450 */ jal free_from_memory_pool
/* 0101D0 8000F5D0 02402025 */ move $a0, $s2

Some files were not shown because too many files have changed in this diff Show More