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

Merge pull request #231 from FazanaJ/hoohooheehee

Browse Source 
Create Sound ID and Sequence ID enums + some racer labelling
This commit is contained in:
Fazana
2022-05-22 16:23:01 +01:00
committed by GitHub
parent 4a8712ae75 8413639214
commit c67da4c011
104 changed files with 1518 additions and 738 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matchings/audio/func_80001D04.s → asm/non_matchings/audio/play_sound_global.s
+1 -1
View File
@@ -1,4 +1,4 @@
glabel func_80001D04
glabel play_sound_global
/* 002904 80001D04 3C0F8011 */ lui $t7, %hi(D_80115D20) # $t7, 0x8011
/* 002908 80001D08 8DEF5D20 */ lw $t7, %lo(D_80115D20)($t7)
/* 00290C 80001D0C 27BDFFD8 */ addiu $sp, $sp, -0x28
asm/non_matchings/game_text/func_800C2D6C.s
+1 -1
View File
@@ -39,7 +39,7 @@ glabel func_800C2D6C
/* 0C39FC 800C2DFC 00000000 */ nop
/* 0C3A00 800C2E00 03370019 */ multu $t9, $s7
/* 0C3A04 800C2E04 00002012 */ mflo $a0
/* 0C3A08 800C2E08 0C00322D */ jal func_8000C8B4
/* 0C3A08 800C2E08 0C00322D */ jal normalise_time
/* 0C3A0C 800C2E0C 00000000 */ nop
/* 0C3A10 800C2E10 8E280000 */ lw $t0, ($s1)
/* 0C3A14 800C2E14 A6820000 */ sh $v0, ($s4)
asm/non_matchings/game_text/func_800C38B4.s
+1 -1
View File
@@ -189,7 +189,7 @@ glabel L800C3B50
/* 0C4758 800C3B58 15800007 */ bnez $t4, .L800C3B78
/* 0C475C 800C3B5C 00000000 */ nop
/* 0C4760 800C3B60 920E0001 */ lbu $t6, 1($s0)
/* 0C4764 800C3B64 0C00322D */ jal func_8000C8B4
/* 0C4764 800C3B64 0C00322D */ jal normalise_time
/* 0C4768 800C3B68 A28E0000 */ sb $t6, ($s4)
/* 0C476C 800C3B6C 8E6F0000 */ lw $t7, ($s3)
/* 0C4770 800C3B70 A2E20000 */ sb $v0, ($s7)
asm/non_matchings/game_ui/func_800A01A0.s
+6 -6
View File
@@ -164,7 +164,7 @@ glabel func_800A01A0
/* 0A1008 800A0408 3098FFFF */ andi $t8, $a0, 0xffff
/* 0A100C 800A040C A04E0000 */ sb $t6, ($v0)
/* 0A1010 800A0410 03002025 */ move $a0, $t8
/* 0A1014 800A0414 0C000741 */ jal func_80001D04
/* 0A1014 800A0414 0C000741 */ jal play_sound_global
/* 0A1018 800A0418 00002825 */ move $a1, $zero
/* 0A101C 800A041C 3C02800E */ lui $v0, %hi(D_800E2790) # $v0, 0x800e
/* 0A1020 800A0420 24422790 */ addiu $v0, %lo(D_800E2790) # addiu $v0, $v0, 0x2790
@@ -228,7 +228,7 @@ glabel func_800A01A0
/* 0A10F8 800A04F8 2DD80001 */ sltiu $t8, $t6, 1
/* 0A10FC 800A04FC 01F82023 */ subu $a0, $t7, $t8
/* 0A1100 800A0500 3099FFFF */ andi $t9, $a0, 0xffff
/* 0A1104 800A0504 0C000741 */ jal func_80001D04
/* 0A1104 800A0504 0C000741 */ jal play_sound_global
/* 0A1108 800A0508 03202025 */ move $a0, $t9
.L800A050C:
/* 0A110C 800A050C 3C048012 */ lui $a0, %hi(D_80126D10) # $a0, 0x8012
@@ -264,12 +264,12 @@ glabel func_800A01A0
/* 0A1184 800A0584 00002825 */ move $a1, $zero
/* 0A1188 800A0588 15200005 */ bnez $t1, .L800A05A0
/* 0A118C 800A058C 2404005E */ li $a0, 94
/* 0A1190 800A0590 0C000741 */ jal func_80001D04
/* 0A1190 800A0590 0C000741 */ jal play_sound_global
/* 0A1194 800A0594 2404005D */ li $a0, 93
/* 0A1198 800A0598 10000003 */ b .L800A05A8
/* 0A119C 800A059C 00000000 */ nop
.L800A05A0:
/* 0A11A0 800A05A0 0C000741 */ jal func_80001D04
/* 0A11A0 800A05A0 0C000741 */ jal play_sound_global
/* 0A11A4 800A05A4 00002825 */ move $a1, $zero
.L800A05A8:
/* 0A11A8 800A05A8 3C088012 */ lui $t0, %hi(D_80126CD4) # $t0, 0x8012
@@ -411,7 +411,7 @@ glabel func_800A01A0
/* 0A13B4 800A07B4 24010001 */ li $at, 1
/* 0A13B8 800A07B8 15210008 */ bne $t1, $at, .L800A07DC
/* 0A13BC 800A07BC 24040016 */ li $a0, 22
/* 0A13C0 800A07C0 0C000741 */ jal func_80001D04
/* 0A13C0 800A07C0 0C000741 */ jal play_sound_global
/* 0A13C4 800A07C4 00002825 */ move $a1, $zero
/* 0A13C8 800A07C8 3C088012 */ lui $t0, %hi(D_80126CD4) # $t0, 0x8012
/* 0A13CC 800A07CC 81086CD4 */ lb $t0, %lo(D_80126CD4)($t0)
@@ -438,7 +438,7 @@ glabel func_800A01A0
/* 0A1418 800A0818 3C018012 */ lui $at, %hi(D_80126D35) # $at, 0x8012
/* 0A141C 800A081C A0386D35 */ sb $t8, %lo(D_80126D35)($at)
/* 0A1420 800A0820 24040017 */ li $a0, 23
/* 0A1424 800A0824 0C000741 */ jal func_80001D04
/* 0A1424 800A0824 0C000741 */ jal play_sound_global
/* 0A1428 800A0828 00002825 */ move $a1, $zero
/* 0A142C 800A082C 3C018012 */ lui $at, %hi(D_80126D28) # $at, 0x8012
/* 0A1430 800A0830 AC206D28 */ sw $zero, %lo(D_80126D28)($at)
asm/non_matchings/game_ui/func_800A0BD4.s
+2 -2
View File
@@ -21,7 +21,7 @@ glabel func_800A0BD4
/* 0A1820 800A0C20 17000004 */ bnez $t8, .L800A0C34
/* 0A1824 800A0C24 3C048012 */ lui $a0, %hi(D_80126D7C) # $a0, 0x8012
/* 0A1828 800A0C28 94846D7C */ lhu $a0, %lo(D_80126D7C)($a0)
/* 0A182C 800A0C2C 0C000741 */ jal func_80001D04
/* 0A182C 800A0C2C 0C000741 */ jal play_sound_global
/* 0A1830 800A0C30 00000000 */ nop
.L800A0C34:
/* 0A1834 800A0C34 3C10800E */ lui $s0, %hi(D_800E2770) # $s0, 0x800e
@@ -40,7 +40,7 @@ glabel func_800A0BD4
/* 0A1864 800A0C64 14A00007 */ bnez $a1, .L800A0C84
/* 0A1868 800A0C68 00000000 */ nop
/* 0A186C 800A0C6C 96040000 */ lhu $a0, ($s0)
/* 0A1870 800A0C70 0C000741 */ jal func_80001D04
/* 0A1870 800A0C70 0C000741 */ jal play_sound_global
/* 0A1874 800A0C74 26050004 */ addiu $a1, $s0, 4
/* 0A1878 800A0C78 92060002 */ lbu $a2, 2($s0)
/* 0A187C 800A0C7C 8E050004 */ lw $a1, 4($s0)
asm/non_matchings/game_ui/func_800A277C.s
+5 -5
View File
@@ -344,14 +344,14 @@ glabel func_800A277C
/* 0A3824 800A2C24 44093000 */ mfc1 $t1, $f6
/* 0A3828 800A2C28 00000000 */ nop
.L800A2C2C:
/* 0A382C 800A2C2C 0C00322D */ jal func_8000C8B4
/* 0A382C 800A2C2C 0C00322D */ jal normalise_time
/* 0A3830 800A2C30 AFA900A8 */ sw $t1, 0xa8($sp)
/* 0A3834 800A2C34 8FA900A8 */ lw $t1, 0xa8($sp)
/* 0A3838 800A2C38 00000000 */ nop
/* 0A383C 800A2C3C 0049082A */ slt $at, $v0, $t1
/* 0A3840 800A2C40 10200005 */ beqz $at, .L800A2C58
/* 0A3844 800A2C44 24100444 */ li $s0, 1092
/* 0A3848 800A2C48 0C00322D */ jal func_8000C8B4
/* 0A3848 800A2C48 0C00322D */ jal normalise_time
/* 0A384C 800A2C4C 34048CA0 */ li $a0, 36000
/* 0A3850 800A2C50 00404825 */ move $t1, $v0
/* 0A3854 800A2C54 24100444 */ li $s0, 1092
@@ -652,7 +652,7 @@ glabel func_800A277C
.L800A30BC:
/* 0A3CBC 800A30BC 3C058012 */ lui $a1, %hi(D_80126D40) # $a1, 0x8012
/* 0A3CC0 800A30C0 A6240000 */ sh $a0, ($s1)
/* 0A3CC4 800A30C4 0C000741 */ jal func_80001D04
/* 0A3CC4 800A30C4 0C000741 */ jal play_sound_global
/* 0A3CC8 800A30C8 24A56D40 */ addiu $a1, %lo(D_80126D40) # addiu $a1, $a1, 0x6d40
/* 0A3CCC 800A30CC 240E0001 */ li $t6, 1
/* 0A3CD0 800A30D0 8FA900A0 */ lw $t1, 0xa0($sp)
@@ -727,7 +727,7 @@ glabel func_800A277C
/* 0A3DD4 800A31D4 11200004 */ beqz $t1, .L800A31E8
/* 0A3DD8 800A31D8 24040144 */ li $a0, 324
/* 0A3DDC 800A31DC 3C058012 */ lui $a1, %hi(D_80126D40) # $a1, 0x8012
/* 0A3DE0 800A31E0 0C000741 */ jal func_80001D04
/* 0A3DE0 800A31E0 0C000741 */ jal play_sound_global
/* 0A3DE4 800A31E4 24A56D40 */ addiu $a1, %lo(D_80126D40) # addiu $a1, $a1, 0x6d40
.L800A31E8:
/* 0A3DE8 800A31E8 0C006CA2 */ jal func_8001B288
@@ -798,7 +798,7 @@ glabel func_800A277C
.L800A32E8:
/* 0A3EE8 800A32E8 3C058012 */ lui $a1, %hi(D_80126D40) # $a1, 0x8012
/* 0A3EEC 800A32EC A6240000 */ sh $a0, ($s1)
/* 0A3EF0 800A32F0 0C000741 */ jal func_80001D04
/* 0A3EF0 800A32F0 0C000741 */ jal play_sound_global
/* 0A3EF4 800A32F4 24A56D40 */ addiu $a1, %lo(D_80126D40) # addiu $a1, $a1, 0x6d40
/* 0A3EF8 800A32F8 24040078 */ li $a0, 120
/* 0A3EFC 800A32FC 0C01BE53 */ jal get_random_number_from_range
asm/non_matchings/game_ui/func_800A3CE4.s
+3 -3
View File
@@ -71,7 +71,7 @@ glabel func_800A3CE4
/* 0A49F0 800A3DF0 1541000A */ bne $t2, $at, .L800A3E1C
/* 0A49F4 800A3DF4 24040018 */ li $a0, 24
/* 0A49F8 800A3DF8 3C058012 */ lui $a1, %hi(D_80126D40) # $a1, 0x8012
/* 0A49FC 800A3DFC 0C000741 */ jal func_80001D04
/* 0A49FC 800A3DFC 0C000741 */ jal play_sound_global
/* 0A4A00 800A3E00 24A56D40 */ addiu $a1, %lo(D_80126D40) # addiu $a1, $a1, 0x6d40
/* 0A4A04 800A3E04 3C028012 */ lui $v0, %hi(D_80126CD4) # $v0, 0x8012
/* 0A4A08 800A3E08 24426CD4 */ addiu $v0, %lo(D_80126CD4) # addiu $v0, $v0, 0x6cd4
@@ -233,7 +233,7 @@ glabel func_800A3CE4
/* 0A4C6C 800A406C 00000000 */ nop
/* 0A4C70 800A4070 24040016 */ li $a0, 22
.L800A4074:
/* 0A4C74 800A4074 0C000741 */ jal func_80001D04
/* 0A4C74 800A4074 0C000741 */ jal play_sound_global
/* 0A4C78 800A4078 00002825 */ move $a1, $zero
/* 0A4C7C 800A407C 3C028012 */ lui $v0, %hi(D_80126CD4) # $v0, 0x8012
/* 0A4C80 800A4080 24426CD4 */ addiu $v0, %lo(D_80126CD4) # addiu $v0, $v0, 0x6cd4
@@ -259,7 +259,7 @@ glabel func_800A3CE4
/* 0A4CC8 800A40C8 1561001C */ bne $t3, $at, .L800A413C
/* 0A4CCC 800A40CC 24040019 */ li $a0, 25
/* 0A4CD0 800A40D0 3C058012 */ lui $a1, %hi(D_80126D40) # $a1, 0x8012
/* 0A4CD4 800A40D4 0C000741 */ jal func_80001D04
/* 0A4CD4 800A40D4 0C000741 */ jal play_sound_global
/* 0A4CD8 800A40D8 24A56D40 */ addiu $a1, %lo(D_80126D40) # addiu $a1, $a1, 0x6d40
/* 0A4CDC 800A40DC 0C006D90 */ jal func_8001B640
/* 0A4CE0 800A40E0 00000000 */ nop
asm/non_matchings/game_ui/func_800A47A0.s
+1 -1
View File
@@ -99,7 +99,7 @@ glabel func_800A47A0
/* 0A5518 800A4918 00000000 */ nop
/* 0A551C 800A491C 17200004 */ bnez $t9, .L800A4930
/* 0A5520 800A4920 8FA80040 */ lw $t0, 0x40($sp)
/* 0A5524 800A4924 0C000741 */ jal func_80001D04
/* 0A5524 800A4924 0C000741 */ jal play_sound_global
/* 0A5528 800A4928 24040147 */ li $a0, 327
.L800A492C:
/* 0A552C 800A492C 8FA80040 */ lw $t0, 0x40($sp)
asm/non_matchings/game_ui/func_800A497C.s
+3 -3
View File
@@ -27,11 +27,11 @@ glabel func_800A497C
/* 0A55DC 800A49DC 0C0002CD */ jal play_music
/* 0A55E0 800A49E0 24040019 */ li $a0, 25
/* 0A55E4 800A49E4 24040016 */ li $a0, 22
/* 0A55E8 800A49E8 0C000741 */ jal func_80001D04
/* 0A55E8 800A49E8 0C000741 */ jal play_sound_global
/* 0A55EC 800A49EC 00002825 */ move $a1, $zero
/* 0A55F0 800A49F0 3C058012 */ lui $a1, %hi(D_80126D40) # $a1, 0x8012
/* 0A55F4 800A49F4 24A56D40 */ addiu $a1, %lo(D_80126D40) # addiu $a1, $a1, 0x6d40
/* 0A55F8 800A49F8 0C000741 */ jal func_80001D04
/* 0A55F8 800A49F8 0C000741 */ jal play_sound_global
/* 0A55FC 800A49FC 24040102 */ li $a0, 258
/* 0A5600 800A4A00 3C02800E */ lui $v0, %hi(D_800E2770) # $v0, 0x800e
/* 0A5604 800A4A04 24422770 */ addiu $v0, %lo(D_800E2770) # addiu $v0, $v0, 0x2770
@@ -103,7 +103,7 @@ glabel func_800A497C
/* 0A56FC 800A4AFC 14580028 */ bne $v0, $t8, .L800A4BA0
/* 0A5700 800A4B00 83AD0027 */ lb $t5, 0x27($sp)
/* 0A5704 800A4B04 A0E2001A */ sb $v0, 0x1a($a3)
/* 0A5708 800A4B08 0C000741 */ jal func_80001D04
/* 0A5708 800A4B08 0C000741 */ jal play_sound_global
/* 0A570C 800A4B0C AFA7002C */ sw $a3, 0x2c($sp)
/* 0A5710 800A4B10 8FB90030 */ lw $t9, 0x30($sp)
/* 0A5714 800A4B14 3C02800E */ lui $v0, %hi(D_800E2770) # $v0, 0x800e
asm/non_matchings/game_ui/func_800A4F50.s
+6 -6
View File
@@ -197,7 +197,7 @@ glabel func_800A4F50
/* 0A5E3C 800A523C 00002825 */ move $a1, $zero
/* 0A5E40 800A5240 A16603DB */ sb $a2, 0x3db($t3)
/* 0A5E44 800A5244 8D0F0000 */ lw $t7, ($t0)
/* 0A5E48 800A5248 0C000741 */ jal func_80001D04
/* 0A5E48 800A5248 0C000741 */ jal play_sound_global
/* 0A5E4C 800A524C A1E003DD */ sb $zero, 0x3dd($t7)
/* 0A5E50 800A5250 3C028012 */ lui $v0, %hi(D_80126D0C) # $v0, 0x8012
/* 0A5E54 800A5254 8C426D0C */ lw $v0, %lo(D_80126D0C)($v0)
@@ -293,7 +293,7 @@ glabel func_800A4F50
/* 0A5FA8 800A53A8 8D190000 */ lw $t9, ($t0)
/* 0A5FAC 800A53AC 24040016 */ li $a0, 22
/* 0A5FB0 800A53B0 00002825 */ move $a1, $zero
/* 0A5FB4 800A53B4 0C000741 */ jal func_80001D04
/* 0A5FB4 800A53B4 0C000741 */ jal play_sound_global
/* 0A5FB8 800A53B8 A32003DD */ sb $zero, 0x3dd($t9)
/* 0A5FBC 800A53BC 3C028012 */ lui $v0, %hi(D_80126D0C) # $v0, 0x8012
/* 0A5FC0 800A53C0 8C426D0C */ lw $v0, %lo(D_80126D0C)($v0)
@@ -446,7 +446,7 @@ glabel func_800A4F50
/* 0A61E8 800A55E8 14200007 */ bnez $at, .L800A5608
/* 0A61EC 800A55EC 00000000 */ nop
/* 0A61F0 800A55F0 8D0E0000 */ lw $t6, ($t0)
/* 0A61F4 800A55F4 0C000741 */ jal func_80001D04
/* 0A61F4 800A55F4 0C000741 */ jal play_sound_global
/* 0A61F8 800A55F8 A1CF03DB */ sb $t7, 0x3db($t6)
/* 0A61FC 800A55FC 3C088012 */ lui $t0, %hi(D_80126CDC) # $t0, 0x8012
/* 0A6200 800A5600 25086CDC */ addiu $t0, %lo(D_80126CDC) # addiu $t0, $t0, 0x6cdc
@@ -480,7 +480,7 @@ glabel func_800A4F50
/* 0A626C 800A566C 00000000 */ nop
/* 0A6270 800A5670 15800007 */ bnez $t4, .L800A5690
/* 0A6274 800A5674 00000000 */ nop
/* 0A6278 800A5678 0C000741 */ jal func_80001D04
/* 0A6278 800A5678 0C000741 */ jal play_sound_global
/* 0A627C 800A567C 24040100 */ li $a0, 256
/* 0A6280 800A5680 3C088012 */ lui $t0, %hi(D_80126CDC) # $t0, 0x8012
/* 0A6284 800A5684 25086CDC */ addiu $t0, %lo(D_80126CDC) # addiu $t0, $t0, 0x6cdc
@@ -627,7 +627,7 @@ glabel func_800A4F50
/* 0A6498 800A5898 14200007 */ bnez $at, .L800A58B8
/* 0A649C 800A589C 00000000 */ nop
/* 0A64A0 800A58A0 8D0F0000 */ lw $t7, ($t0)
/* 0A64A4 800A58A4 0C000741 */ jal func_80001D04
/* 0A64A4 800A58A4 0C000741 */ jal play_sound_global
/* 0A64A8 800A58A8 A1E603DB */ sb $a2, 0x3db($t7)
/* 0A64AC 800A58AC 3C088012 */ lui $t0, %hi(D_80126CDC) # $t0, 0x8012
/* 0A64B0 800A58B0 25086CDC */ addiu $t0, %lo(D_80126CDC) # addiu $t0, $t0, 0x6cdc
@@ -661,7 +661,7 @@ glabel func_800A4F50
/* 0A651C 800A591C 00000000 */ nop
/* 0A6520 800A5920 15A00007 */ bnez $t5, .L800A5940
/* 0A6524 800A5924 00000000 */ nop
/* 0A6528 800A5928 0C000741 */ jal func_80001D04
/* 0A6528 800A5928 0C000741 */ jal play_sound_global
/* 0A652C 800A592C 24040101 */ li $a0, 257
/* 0A6530 800A5930 3C088012 */ lui $t0, %hi(D_80126CDC) # $t0, 0x8012
/* 0A6534 800A5934 25086CDC */ addiu $t0, %lo(D_80126CDC) # addiu $t0, $t0, 0x6cdc
asm/non_matchings/game_ui/func_800A5A64.s
+4 -4
View File
@@ -65,7 +65,7 @@ glabel func_800A5A64
.L800A5B54:
/* 0A6754 800A5B54 A0600000 */ sb $zero, ($v1)
/* 0A6758 800A5B58 24040066 */ li $a0, 102
/* 0A675C 800A5B5C 0C000741 */ jal func_80001D04
/* 0A675C 800A5B5C 0C000741 */ jal play_sound_global
/* 0A6760 800A5B60 00C02825 */ move $a1, $a2
/* 0A6764 800A5B64 24040001 */ li $a0, 1
/* 0A6768 800A5B68 0C01BE53 */ jal get_random_number_from_range
@@ -80,7 +80,7 @@ glabel func_800A5A64
/* 0A6788 800A5B88 240D0001 */ li $t5, 1
/* 0A678C 800A5B8C A06D0000 */ sb $t5, ($v1)
/* 0A6790 800A5B90 24040067 */ li $a0, 103
/* 0A6794 800A5B94 0C000741 */ jal func_80001D04
/* 0A6794 800A5B94 0C000741 */ jal play_sound_global
/* 0A6798 800A5B98 00C02825 */ move $a1, $a2
/* 0A679C 800A5B9C 3C078012 */ lui $a3, %hi(D_80126D6C) # $a3, 0x8012
/* 0A67A0 800A5BA0 24E76D6C */ addiu $a3, %lo(D_80126D6C) # addiu $a3, $a3, 0x6d6c
@@ -159,7 +159,7 @@ glabel func_800A5A64
/* 0A68B4 800A5CB4 10200023 */ beqz $at, .L800A5D44
/* 0A68B8 800A5CB8 00000000 */ nop
/* 0A68BC 800A5CBC 8D180000 */ lw $t8, ($t0)
/* 0A68C0 800A5CC0 0C000741 */ jal func_80001D04
/* 0A68C0 800A5CC0 0C000741 */ jal play_sound_global
/* 0A68C4 800A5CC4 A30F047B */ sb $t7, 0x47b($t8)
/* 0A68C8 800A5CC8 1000001E */ b .L800A5D44
/* 0A68CC 800A5CCC 00000000 */ nop
@@ -308,7 +308,7 @@ glabel func_800A5A64
/* 0A6AEC 800A5EEC 448D5000 */ mtc1 $t5, $f10
/* 0A6AF0 800A5EF0 00000000 */ nop
/* 0A6AF4 800A5EF4 46805420 */ cvt.s.w $f16, $f10
/* 0A6AF8 800A5EF8 0C000741 */ jal func_80001D04
/* 0A6AF8 800A5EF8 0C000741 */ jal play_sound_global
/* 0A6AFC 800A5EFC E450046C */ swc1 $f16, 0x46c($v0)
.L800A5F00:
/* 0A6B00 800A5F00 0C01EFC7 */ jal func_8007BF1C
asm/non_matchings/game_ui/func_800A6254.s
+5 -5
View File
@@ -118,7 +118,7 @@ glabel L800A63D8
/* 0A6FF4 800A63F4 84ED0000 */ lh $t5, ($a3)
/* 0A6FF8 800A63F8 AFA70070 */ sw $a3, 0x70($sp)
/* 0A6FFC 800A63FC 00002825 */ move $a1, $zero
/* 0A7000 800A6400 0C000741 */ jal func_80001D04
/* 0A7000 800A6400 0C000741 */ jal play_sound_global
/* 0A7004 800A6404 A06D000C */ sb $t5, 0xc($v1)
/* 0A7008 800A6408 3C098012 */ lui $t1, %hi(D_80126CDC) # $t1, 0x8012
/* 0A700C 800A640C 25296CDC */ addiu $t1, %lo(D_80126CDC) # addiu $t1, $t1, 0x6cdc
@@ -623,19 +623,19 @@ glabel L800A691C
/* 0A7754 800A6B54 1000000B */ b .L800A6B84
/* 0A7758 800A6B58 2404014D */ li $a0, 333
.L800A6B5C:
/* 0A775C 800A6B5C 0C000741 */ jal func_80001D04
/* 0A775C 800A6B5C 0C000741 */ jal play_sound_global
/* 0A7760 800A6B60 AFA70070 */ sw $a3, 0x70($sp)
/* 0A7764 800A6B64 8FA70070 */ lw $a3, 0x70($sp)
/* 0A7768 800A6B68 10000014 */ b .L800A6BBC
/* 0A776C 800A6B6C 00000000 */ nop
.L800A6B70:
/* 0A7770 800A6B70 0C000741 */ jal func_80001D04
/* 0A7770 800A6B70 0C000741 */ jal play_sound_global
/* 0A7774 800A6B74 AFA70070 */ sw $a3, 0x70($sp)
/* 0A7778 800A6B78 8FA70070 */ lw $a3, 0x70($sp)
/* 0A777C 800A6B7C 1000000F */ b .L800A6BBC
/* 0A7780 800A6B80 00000000 */ nop
.L800A6B84:
/* 0A7784 800A6B84 0C000741 */ jal func_80001D04
/* 0A7784 800A6B84 0C000741 */ jal play_sound_global
/* 0A7788 800A6B88 AFA70070 */ sw $a3, 0x70($sp)
/* 0A778C 800A6B8C 8FA70070 */ lw $a3, 0x70($sp)
/* 0A7790 800A6B90 1000000A */ b .L800A6BBC
@@ -700,7 +700,7 @@ glabel L800A6BCC
/* 0A7868 800A6C68 A04C05FA */ sb $t4, 0x5fa($v0)
/* 0A786C 800A6C6C AFA70070 */ sw $a3, 0x70($sp)
/* 0A7870 800A6C70 24040016 */ li $a0, 22
/* 0A7874 800A6C74 0C000741 */ jal func_80001D04
/* 0A7874 800A6C74 0C000741 */ jal play_sound_global
/* 0A7878 800A6C78 00002825 */ move $a1, $zero
/* 0A787C 800A6C7C 8FA70070 */ lw $a3, 0x70($sp)
/* 0A7880 800A6C80 10000004 */ b .L800A6C94
asm/non_matchings/game_ui/func_800A6E30.s
+2 -2
View File
@@ -30,7 +30,7 @@ glabel L800A6E70
/* 0A7A88 800A6E88 AFA60018 */ sw $a2, 0x18($sp)
/* 0A7A8C 800A6E8C 24040016 */ li $a0, 22
/* 0A7A90 800A6E90 00002825 */ move $a1, $zero
/* 0A7A94 800A6E94 0C000741 */ jal func_80001D04
/* 0A7A94 800A6E94 0C000741 */ jal play_sound_global
/* 0A7A98 800A6E98 A078000C */ sb $t8, 0xc($v1)
/* 0A7A9C 800A6E9C 3C038012 */ lui $v1, %hi(D_80126D0C) # $v1, 0x8012
/* 0A7AA0 800A6EA0 8C636D0C */ lw $v1, %lo(D_80126D0C)($v1)
@@ -173,7 +173,7 @@ glabel L800A7014
/* 0A7C90 800A7090 240FFFD8 */ li $t7, -40
/* 0A7C94 800A7094 A30F01DD */ sb $t7, 0x1dd($t8)
.L800A7098:
/* 0A7C98 800A7098 0C000741 */ jal func_80001D04
/* 0A7C98 800A7098 0C000741 */ jal play_sound_global
/* 0A7C9C 800A709C 00002825 */ move $a1, $zero
/* 0A7CA0 800A70A0 3C028012 */ lui $v0, %hi(D_80126CDC) # $v0, 0x8012
/* 0A7CA4 800A70A4 8C426CDC */ lw $v0, %lo(D_80126CDC)($v0)
asm/non_matchings/game_ui/func_800A718C.s
+2 -2
View File
@@ -66,7 +66,7 @@ glabel func_800A718C
/* 0A7E7C 800A727C 15400006 */ bnez $t2, .L800A7298
/* 0A7E80 800A7280 00000000 */ nop
/* 0A7E84 800A7284 240400FE */ li $a0, 254
/* 0A7E88 800A7288 0C000741 */ jal func_80001D04
/* 0A7E88 800A7288 0C000741 */ jal play_sound_global
/* 0A7E8C 800A728C AFA3002C */ sw $v1, 0x2c($sp)
/* 0A7E90 800A7290 8FA3002C */ lw $v1, 0x2c($sp)
/* 0A7E94 800A7294 00000000 */ nop
@@ -199,7 +199,7 @@ glabel func_800A718C
/* 0A8060 800A7460 14400004 */ bnez $v0, .L800A7474
/* 0A8064 800A7464 3C058012 */ lui $a1, %hi(D_80126D40) # $a1, 0x8012
/* 0A8068 800A7468 97A4001A */ lhu $a0, 0x1a($sp)
/* 0A806C 800A746C 0C000741 */ jal func_80001D04
/* 0A806C 800A746C 0C000741 */ jal play_sound_global
/* 0A8070 800A7470 24A56D40 */ addiu $a1, %lo(D_80126D40) # addiu $a1, $a1, 0x6d40
.L800A7474:
/* 0A8074 800A7474 8FBF0014 */ lw $ra, 0x14($sp)
asm/non_matchings/game_ui/func_800A7B68.s
+4 -4
View File
@@ -115,13 +115,13 @@ glabel func_800A7B68
/* 0A8914 800A7D14 00000000 */ nop
.L800A7D18:
/* 0A8918 800A7D18 34048CA0 */ li $a0, 36000
/* 0A891C 800A7D1C 0C00322D */ jal func_8000C8B4
/* 0A891C 800A7D1C 0C00322D */ jal normalise_time
/* 0A8920 800A7D20 AFA90044 */ sw $t1, 0x44($sp)
/* 0A8924 800A7D24 8FA90044 */ lw $t1, 0x44($sp)
/* 0A8928 800A7D28 0050082A */ slt $at, $v0, $s0
/* 0A892C 800A7D2C 10200005 */ beqz $at, .L800A7D44
/* 0A8930 800A7D30 34048CA0 */ li $a0, 36000
/* 0A8934 800A7D34 0C00322D */ jal func_8000C8B4
/* 0A8934 800A7D34 0C00322D */ jal normalise_time
/* 0A8938 800A7D38 AFA90044 */ sw $t1, 0x44($sp)
/* 0A893C 800A7D3C 8FA90044 */ lw $t1, 0x44($sp)
/* 0A8940 800A7D40 00408025 */ move $s0, $v0
@@ -136,7 +136,7 @@ glabel func_800A7B68
/* 0A8960 800A7D60 8FA90044 */ lw $t1, 0x44($sp)
/* 0A8964 800A7D64 17000006 */ bnez $t8, .L800A7D80
/* 0A8968 800A7D68 34048CA0 */ li $a0, 36000
/* 0A896C 800A7D6C 0C00322D */ jal func_8000C8B4
/* 0A896C 800A7D6C 0C00322D */ jal normalise_time
/* 0A8970 800A7D70 AFA90044 */ sw $t1, 0x44($sp)
/* 0A8974 800A7D74 8FA90044 */ lw $t1, 0x44($sp)
/* 0A8978 800A7D78 14500028 */ bne $v0, $s0, .L800A7E1C
@@ -176,7 +176,7 @@ glabel func_800A7B68
/* 0A89F0 800A7DF0 240400FE */ li $a0, 254
/* 0A89F4 800A7DF4 17000003 */ bnez $t8, .L800A7E04
/* 0A89F8 800A7DF8 00000000 */ nop
/* 0A89FC 800A7DFC 0C000741 */ jal func_80001D04
/* 0A89FC 800A7DFC 0C000741 */ jal play_sound_global
/* 0A8A00 800A7E00 00002825 */ move $a1, $zero
.L800A7E04:
/* 0A8A04 800A7E04 A2000000 */ sb $zero, ($s0)
asm/non_matchings/game_ui/func_800ADCBC.s
+2 -2
View File
@@ -35,7 +35,7 @@ glabel func_800ADCBC
/* 0AE940 800ADD40 01E09025 */ move $s2, $t7
/* 0AE944 800ADD44 AFA3004C */ sw $v1, 0x4c($sp)
/* 0AE948 800ADD48 00002012 */ mflo $a0
/* 0AE94C 800ADD4C 0C00322D */ jal func_8000C8B4
/* 0AE94C 800ADD4C 0C00322D */ jal normalise_time
/* 0AE950 800ADD50 00000000 */ nop
/* 0AE954 800ADD54 860F0000 */ lh $t7, ($s0)
/* 0AE958 800ADD58 8FA3004C */ lw $v1, 0x4c($sp)
@@ -47,7 +47,7 @@ glabel func_800ADCBC
/* 0AE970 800ADD70 00000000 */ nop
/* 0AE974 800ADD74 01AE0019 */ multu $t5, $t6
/* 0AE978 800ADD78 00002012 */ mflo $a0
/* 0AE97C 800ADD7C 0C00322D */ jal func_8000C8B4
/* 0AE97C 800ADD7C 0C00322D */ jal normalise_time
/* 0AE980 800ADD80 00000000 */ nop
/* 0AE984 800ADD84 860E0004 */ lh $t6, 4($s0)
/* 0AE988 800ADD88 860F0002 */ lh $t7, 2($s0)
asm/non_matchings/menu/func_80081F4C.s
+2 -2
View File
@@ -103,7 +103,7 @@ glabel func_80081F4C
/* 082CC0 800820C0 10200004 */ beqz $at, .L800820D4
/* 082CC4 800820C4 00008825 */ move $s1, $zero
/* 082CC8 800820C8 24040016 */ li $a0, 22
/* 082CCC 800820CC 0C000741 */ jal func_80001D04
/* 082CCC 800820CC 0C000741 */ jal play_sound_global
/* 082CD0 800820D0 00002825 */ move $a1, $zero
.L800820D4:
/* 082CD4 800820D4 8E470000 */ lw $a3, ($s2)
@@ -121,7 +121,7 @@ glabel func_80081F4C
/* 082D00 80082100 10200004 */ beqz $at, .L80082114
/* 082D04 80082104 AE540000 */ sw $s4, ($s2)
/* 082D08 80082108 24040016 */ li $a0, 22
/* 082D0C 8008210C 0C000741 */ jal func_80001D04
/* 082D0C 8008210C 0C000741 */ jal play_sound_global
/* 082D10 80082110 00002825 */ move $a1, $zero
.L80082114:
/* 082D14 80082114 8E470000 */ lw $a3, ($s2)
asm/non_matchings/menu/func_80087734.s
+4 -4
View File
@@ -70,7 +70,7 @@ glabel func_80087734
.L8008780C:
/* 08840C 8008780C 24040241 */ li $a0, 577
/* 088410 80087810 00002825 */ move $a1, $zero
/* 088414 80087814 0C000741 */ jal func_80001D04
/* 088414 80087814 0C000741 */ jal play_sound_global
/* 088418 80087818 AFA8001C */ sw $t0, 0x1c($sp)
/* 08841C 8008781C 3C098012 */ lui $t1, %hi(D_801263E0) # $t1, 0x8012
/* 088420 80087820 252963E0 */ addiu $t1, %lo(D_801263E0) # addiu $t1, $t1, 0x63e0
@@ -198,7 +198,7 @@ glabel L800879BC
/* 0885C4 800879C4 10400042 */ beqz $v0, .L80087AD0
/* 0885C8 800879C8 00002825 */ move $a1, $zero
/* 0885CC 800879CC 240400EF */ li $a0, 239
/* 0885D0 800879D0 0C000741 */ jal func_80001D04
/* 0885D0 800879D0 0C000741 */ jal play_sound_global
/* 0885D4 800879D4 AFA8001C */ sw $t0, 0x1c($sp)
/* 0885D8 800879D8 3C098012 */ lui $t1, %hi(D_801263E0) # $t1, 0x8012
/* 0885DC 800879DC 252963E0 */ addiu $t1, %lo(D_801263E0) # addiu $t1, $t1, 0x63e0
@@ -278,7 +278,7 @@ glabel L800879BC
/* 0886E8 80087AE8 018E082A */ slt $at, $t4, $t6
/* 0886EC 80087AEC 1020000A */ beqz $at, .L80087B18
/* 0886F0 80087AF0 240400EB */ li $a0, 235
/* 0886F4 80087AF4 0C000741 */ jal func_80001D04
/* 0886F4 80087AF4 0C000741 */ jal play_sound_global
/* 0886F8 80087AF8 00002825 */ move $a1, $zero
/* 0886FC 80087AFC 3C078012 */ lui $a3, %hi(D_80126A78) # $a3, 0x8012
/* 088700 80087B00 24E76A78 */ addiu $a3, %lo(D_80126A78) # addiu $a3, $a3, 0x6a78
@@ -294,7 +294,7 @@ glabel L800879BC
/* 088724 80087B24 240400EB */ li $a0, 235
/* 088728 80087B28 1940000A */ blez $t2, .L80087B54
/* 08872C 80087B2C 8FBF0014 */ lw $ra, 0x14($sp)
/* 088730 80087B30 0C000741 */ jal func_80001D04
/* 088730 80087B30 0C000741 */ jal play_sound_global
/* 088734 80087B34 00002825 */ move $a1, $zero
/* 088738 80087B38 3C078012 */ lui $a3, %hi(D_80126A78) # $a3, 0x8012
/* 08873C 80087B3C 24E76A78 */ addiu $a3, %lo(D_80126A78) # addiu $a3, $a3, 0x6a78
asm/non_matchings/menu/func_800890AC.s
+4 -4
View File
@@ -67,7 +67,7 @@ glabel func_800890AC
/* 089DA8 800891A8 30CD9000 */ andi $t5, $a2, 0x9000
/* 089DAC 800891AC 11A000D8 */ beqz $t5, .L80089510
/* 089DB0 800891B0 240400EF */ li $a0, 239
/* 089DB4 800891B4 0C000741 */ jal func_80001D04
/* 089DB4 800891B4 0C000741 */ jal play_sound_global
/* 089DB8 800891B8 00002825 */ move $a1, $zero
/* 089DBC 800891BC 3C048012 */ lui $a0, %hi(D_80126A68) # $a0, 0x8012
/* 089DC0 800891C0 24846A68 */ addiu $a0, %lo(D_80126A68) # addiu $a0, $a0, 0x6a68
@@ -312,14 +312,14 @@ glabel func_800890AC
/* 08A114 80089514 8FB8002C */ lw $t8, 0x2c($sp)
/* 08A118 80089518 11E00005 */ beqz $t7, .L80089530
/* 08A11C 8008951C 24040241 */ li $a0, 577
/* 08A120 80089520 0C000741 */ jal func_80001D04
/* 08A120 80089520 0C000741 */ jal play_sound_global
/* 08A124 80089524 00002825 */ move $a1, $zero
/* 08A128 80089528 1000001B */ b .L80089598
/* 08A12C 8008952C 8FBF0014 */ lw $ra, 0x14($sp)
.L80089530:
/* 08A130 80089530 13000005 */ beqz $t8, .L80089548
/* 08A134 80089534 240400EF */ li $a0, 239
/* 08A138 80089538 0C000741 */ jal func_80001D04
/* 08A138 80089538 0C000741 */ jal play_sound_global
/* 08A13C 8008953C 00002825 */ move $a1, $zero
/* 08A140 80089540 10000015 */ b .L80089598
/* 08A144 80089544 8FBF0014 */ lw $ra, 0x14($sp)
@@ -328,7 +328,7 @@ glabel func_800890AC
/* 08A14C 8008954C 240400EB */ li $a0, 235
/* 08A150 80089550 13200011 */ beqz $t9, .L80089598
/* 08A154 80089554 8FBF0014 */ lw $ra, 0x14($sp)
/* 08A158 80089558 0C000741 */ jal func_80001D04
/* 08A158 80089558 0C000741 */ jal play_sound_global
/* 08A15C 8008955C 00002825 */ move $a1, $zero
/* 08A160 80089560 1000000D */ b .L80089598
/* 08A164 80089564 8FBF0014 */ lw $ra, 0x14($sp)
asm/non_matchings/menu/func_8008B358.s
+1 -1
View File
@@ -78,7 +78,7 @@ glabel func_8008B358
/* 08C074 8008B474 8509000C */ lh $t1, 0xc($t0)
/* 08C078 8008B478 A6600002 */ sh $zero, 2($s3)
/* 08C07C 8008B47C A26A0001 */ sb $t2, 1($s3)
/* 08C080 8008B480 0C000741 */ jal func_80001D04
/* 08C080 8008B480 0C000741 */ jal play_sound_global
/* 08C084 8008B484 A2690000 */ sb $t1, ($s3)
.L8008B488:
/* 08C088 8008B488 26310001 */ addiu $s1, $s1, 1

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