diff --git a/asm/non_matchings/audio/func_80001D04.s b/asm/non_matchings/audio/play_sound_global.s similarity index 99% rename from asm/non_matchings/audio/func_80001D04.s rename to asm/non_matchings/audio/play_sound_global.s index 6a099b68..21b0b852 100644 --- a/asm/non_matchings/audio/func_80001D04.s +++ b/asm/non_matchings/audio/play_sound_global.s @@ -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 diff --git a/asm/non_matchings/game_text/func_800C2D6C.s b/asm/non_matchings/game_text/func_800C2D6C.s index e0f8e9f6..a760ccc4 100644 --- a/asm/non_matchings/game_text/func_800C2D6C.s +++ b/asm/non_matchings/game_text/func_800C2D6C.s @@ -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) diff --git a/asm/non_matchings/game_text/func_800C38B4.s b/asm/non_matchings/game_text/func_800C38B4.s index 7881865e..74092b8f 100644 --- a/asm/non_matchings/game_text/func_800C38B4.s +++ b/asm/non_matchings/game_text/func_800C38B4.s @@ -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) diff --git a/asm/non_matchings/game_ui/func_800A01A0.s b/asm/non_matchings/game_ui/func_800A01A0.s index fd85dacc..a93f20fe 100644 --- a/asm/non_matchings/game_ui/func_800A01A0.s +++ b/asm/non_matchings/game_ui/func_800A01A0.s @@ -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) diff --git a/asm/non_matchings/game_ui/func_800A0BD4.s b/asm/non_matchings/game_ui/func_800A0BD4.s index 13f976af..6c95e39f 100644 --- a/asm/non_matchings/game_ui/func_800A0BD4.s +++ b/asm/non_matchings/game_ui/func_800A0BD4.s @@ -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) diff --git a/asm/non_matchings/game_ui/func_800A277C.s b/asm/non_matchings/game_ui/func_800A277C.s index 1a2193ae..5d6dc77d 100644 --- a/asm/non_matchings/game_ui/func_800A277C.s +++ b/asm/non_matchings/game_ui/func_800A277C.s @@ -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 diff --git a/asm/non_matchings/game_ui/func_800A3CE4.s b/asm/non_matchings/game_ui/func_800A3CE4.s index 2ba55d0e..d268c2b4 100644 --- a/asm/non_matchings/game_ui/func_800A3CE4.s +++ b/asm/non_matchings/game_ui/func_800A3CE4.s @@ -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 diff --git a/asm/non_matchings/game_ui/func_800A47A0.s b/asm/non_matchings/game_ui/func_800A47A0.s index e02c49cd..875c9a6d 100644 --- a/asm/non_matchings/game_ui/func_800A47A0.s +++ b/asm/non_matchings/game_ui/func_800A47A0.s @@ -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) diff --git a/asm/non_matchings/game_ui/func_800A497C.s b/asm/non_matchings/game_ui/func_800A497C.s index 5a488f2a..4351494a 100644 --- a/asm/non_matchings/game_ui/func_800A497C.s +++ b/asm/non_matchings/game_ui/func_800A497C.s @@ -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 diff --git a/asm/non_matchings/game_ui/func_800A4F50.s b/asm/non_matchings/game_ui/func_800A4F50.s index 2a429992..a3fc586a 100644 --- a/asm/non_matchings/game_ui/func_800A4F50.s +++ b/asm/non_matchings/game_ui/func_800A4F50.s @@ -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 diff --git a/asm/non_matchings/game_ui/func_800A5A64.s b/asm/non_matchings/game_ui/func_800A5A64.s index 5ec9c1a4..3f64a513 100644 --- a/asm/non_matchings/game_ui/func_800A5A64.s +++ b/asm/non_matchings/game_ui/func_800A5A64.s @@ -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 diff --git a/asm/non_matchings/game_ui/func_800A6254.s b/asm/non_matchings/game_ui/func_800A6254.s index b0d63651..f2612e2d 100644 --- a/asm/non_matchings/game_ui/func_800A6254.s +++ b/asm/non_matchings/game_ui/func_800A6254.s @@ -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 diff --git a/asm/non_matchings/game_ui/func_800A6E30.s b/asm/non_matchings/game_ui/func_800A6E30.s index fd0301f3..f486db4e 100644 --- a/asm/non_matchings/game_ui/func_800A6E30.s +++ b/asm/non_matchings/game_ui/func_800A6E30.s @@ -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) diff --git a/asm/non_matchings/game_ui/func_800A718C.s b/asm/non_matchings/game_ui/func_800A718C.s index cf1f7e4e..5f80743b 100644 --- a/asm/non_matchings/game_ui/func_800A718C.s +++ b/asm/non_matchings/game_ui/func_800A718C.s @@ -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) diff --git a/asm/non_matchings/game_ui/func_800A7B68.s b/asm/non_matchings/game_ui/func_800A7B68.s index 0c75c988..b51da2aa 100644 --- a/asm/non_matchings/game_ui/func_800A7B68.s +++ b/asm/non_matchings/game_ui/func_800A7B68.s @@ -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) diff --git a/asm/non_matchings/game_ui/func_800ADCBC.s b/asm/non_matchings/game_ui/func_800ADCBC.s index faad555e..3e4a2a16 100644 --- a/asm/non_matchings/game_ui/func_800ADCBC.s +++ b/asm/non_matchings/game_ui/func_800ADCBC.s @@ -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) diff --git a/asm/non_matchings/menu/func_80081F4C.s b/asm/non_matchings/menu/func_80081F4C.s index 91906f92..f07d3a4d 100644 --- a/asm/non_matchings/menu/func_80081F4C.s +++ b/asm/non_matchings/menu/func_80081F4C.s @@ -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) diff --git a/asm/non_matchings/menu/func_80087734.s b/asm/non_matchings/menu/func_80087734.s index 74a6fcdf..4e5aa330 100644 --- a/asm/non_matchings/menu/func_80087734.s +++ b/asm/non_matchings/menu/func_80087734.s @@ -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 diff --git a/asm/non_matchings/menu/func_800890AC.s b/asm/non_matchings/menu/func_800890AC.s index 4780bba6..526d9b2f 100644 --- a/asm/non_matchings/menu/func_800890AC.s +++ b/asm/non_matchings/menu/func_800890AC.s @@ -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) diff --git a/asm/non_matchings/menu/func_8008B358.s b/asm/non_matchings/menu/func_8008B358.s index 11abf84d..d8c809e9 100644 --- a/asm/non_matchings/menu/func_8008B358.s +++ b/asm/non_matchings/menu/func_8008B358.s @@ -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 diff --git a/asm/non_matchings/menu/func_8008B4C8.s b/asm/non_matchings/menu/func_8008B4C8.s index cf14a99a..6a0d7ab5 100644 --- a/asm/non_matchings/menu/func_8008B4C8.s +++ b/asm/non_matchings/menu/func_8008B4C8.s @@ -82,7 +82,7 @@ glabel func_8008B4C8 /* 08C1F4 8008B5F4 02002825 */ move $a1, $s0 /* 08C1F8 8008B5F8 2484019E */ addiu $a0, $a0, 0x19e /* 08C1FC 8008B5FC 3089FFFF */ andi $t1, $a0, 0xffff -/* 08C200 8008B600 0C000741 */ jal func_80001D04 +/* 08C200 8008B600 0C000741 */ jal play_sound_global /* 08C204 8008B604 01202025 */ move $a0, $t1 /* 08C208 8008B608 3C02800E */ lui $v0, %hi(gNumberOfActivePlayers) # $v0, 0x800e /* 08C20C 8008B60C 8C42F4BC */ lw $v0, %lo(gNumberOfActivePlayers)($v0) @@ -156,7 +156,7 @@ glabel func_8008B4C8 /* 08C308 8008B708 00000000 */ nop /* 08C30C 8008B70C 24840093 */ addiu $a0, $a0, 0x93 /* 08C310 8008B710 3098FFFF */ andi $t8, $a0, 0xffff -/* 08C314 8008B714 0C000741 */ jal func_80001D04 +/* 08C314 8008B714 0C000741 */ jal play_sound_global /* 08C318 8008B718 03002025 */ move $a0, $t8 .L8008B71C: /* 08C31C 8008B71C 26100001 */ addiu $s0, $s0, 1 diff --git a/asm/non_matchings/menu/func_8008B758.s b/asm/non_matchings/menu/func_8008B758.s index 15834f04..db744034 100644 --- a/asm/non_matchings/menu/func_8008B758.s +++ b/asm/non_matchings/menu/func_8008B758.s @@ -61,7 +61,7 @@ glabel func_8008B758 /* 08C43C 8008B83C 00000000 */ nop /* 08C440 8008B840 24840093 */ addiu $a0, $a0, 0x93 /* 08C444 8008B844 3099FFFF */ andi $t9, $a0, 0xffff -/* 08C448 8008B848 0C000741 */ jal func_80001D04 +/* 08C448 8008B848 0C000741 */ jal play_sound_global /* 08C44C 8008B84C 03202025 */ move $a0, $t9 /* 08C450 8008B850 100000AA */ b .L8008BAFC /* 08C454 8008B854 8FA2004C */ lw $v0, 0x4c($sp) @@ -159,7 +159,7 @@ glabel func_8008B758 /* 08C5A8 8008B9A8 00000000 */ nop /* 08C5AC 8008B9AC 24840087 */ addiu $a0, $a0, 0x87 /* 08C5B0 8008B9B0 308FFFFF */ andi $t7, $a0, 0xffff -/* 08C5B4 8008B9B4 0C000741 */ jal func_80001D04 +/* 08C5B4 8008B9B4 0C000741 */ jal play_sound_global /* 08C5B8 8008B9B8 01E02025 */ move $a0, $t7 /* 08C5BC 8008B9BC 1000004F */ b .L8008BAFC /* 08C5C0 8008B9C0 8FA2004C */ lw $v0, 0x4c($sp) diff --git a/asm/non_matchings/menu/func_8008D5F8.s b/asm/non_matchings/menu/func_8008D5F8.s index d3955340..c31bc2c3 100644 --- a/asm/non_matchings/menu/func_8008D5F8.s +++ b/asm/non_matchings/menu/func_8008D5F8.s @@ -63,7 +63,7 @@ glabel func_8008D5F8 /* 08E2E4 8008D6E4 13190008 */ beq $t8, $t9, .L8008D708 /* 08E2E8 8008D6E8 00002825 */ move $a1, $zero /* 08E2EC 8008D6EC AFA60020 */ sw $a2, 0x20($sp) -/* 08E2F0 8008D6F0 0C000741 */ jal func_80001D04 +/* 08E2F0 8008D6F0 0C000741 */ jal play_sound_global /* 08E2F4 8008D6F4 AFA7001C */ sw $a3, 0x1c($sp) /* 08E2F8 8008D6F8 8FA60020 */ lw $a2, 0x20($sp) /* 08E2FC 8008D6FC 8FA7001C */ lw $a3, 0x1c($sp) @@ -72,12 +72,12 @@ glabel func_8008D5F8 .L8008D708: /* 08E308 8008D708 240400EF */ li $a0, 239 .L8008D70C: -/* 08E30C 8008D70C 0C000741 */ jal func_80001D04 +/* 08E30C 8008D70C 0C000741 */ jal play_sound_global /* 08E310 8008D710 00002825 */ move $a1, $zero /* 08E314 8008D714 10000065 */ b .L8008D8AC /* 08E318 8008D718 24020001 */ li $v0, 1 .L8008D71C: -/* 08E31C 8008D71C 0C000741 */ jal func_80001D04 +/* 08E31C 8008D71C 0C000741 */ jal play_sound_global /* 08E320 8008D720 00002825 */ move $a1, $zero /* 08E324 8008D724 3C0B800E */ lui $t3, %hi(gSaveFileIndex) # $t3, 0x800e /* 08E328 8008D728 256BF4CC */ addiu $t3, %lo(gSaveFileIndex) # addiu $t3, $t3, -0xb34 @@ -93,7 +93,7 @@ glabel func_8008D5F8 /* 08E350 8008D750 00001025 */ move $v0, $zero /* 08E354 8008D754 240400EF */ li $a0, 239 .L8008D758: -/* 08E358 8008D758 0C000741 */ jal func_80001D04 +/* 08E358 8008D758 0C000741 */ jal play_sound_global /* 08E35C 8008D75C 00002825 */ move $a1, $zero /* 08E360 8008D760 3C0B800E */ lui $t3, %hi(gSaveFileIndex) # $t3, 0x800e /* 08E364 8008D764 256BF4CC */ addiu $t3, %lo(gSaveFileIndex) # addiu $t3, $t3, -0xb34 @@ -187,7 +187,7 @@ glabel func_8008D5F8 /* 08E494 8008D894 01836825 */ or $t5, $t4, $v1 /* 08E498 8008D898 108D0003 */ beq $a0, $t5, .L8008D8A8 /* 08E49C 8008D89C 00002825 */ move $a1, $zero -/* 08E4A0 8008D8A0 0C000741 */ jal func_80001D04 +/* 08E4A0 8008D8A0 0C000741 */ jal play_sound_global /* 08E4A4 8008D8A4 240400EB */ li $a0, 235 .L8008D8A8: /* 08E4A8 8008D8A8 00001025 */ move $v0, $zero diff --git a/asm/non_matchings/menu/func_8008D8BC.s b/asm/non_matchings/menu/func_8008D8BC.s index 4e3c9524..0aa5f2f6 100644 --- a/asm/non_matchings/menu/func_8008D8BC.s +++ b/asm/non_matchings/menu/func_8008D8BC.s @@ -32,7 +32,7 @@ glabel func_8008D8BC /* 08E530 8008D930 13000007 */ beqz $t8, .L8008D950 /* 08E534 8008D934 30799000 */ andi $t9, $v1, 0x9000 /* 08E538 8008D938 24040241 */ li $a0, 577 -/* 08E53C 8008D93C 0C000741 */ jal func_80001D04 +/* 08E53C 8008D93C 0C000741 */ jal play_sound_global /* 08E540 8008D940 00002825 */ move $a1, $zero /* 08E544 8008D944 3C018012 */ lui $at, %hi(D_80126484) # $at, 0x8012 /* 08E548 8008D948 100000C8 */ b .L8008DC6C @@ -54,7 +54,7 @@ glabel func_8008D8BC /* 08E584 8008D984 00000000 */ nop /* 08E588 8008D988 11800012 */ beqz $t4, .L8008D9D4 /* 08E58C 8008D98C 00000000 */ nop -/* 08E590 8008D990 0C000741 */ jal func_80001D04 +/* 08E590 8008D990 0C000741 */ jal play_sound_global /* 08E594 8008D994 00002825 */ move $a1, $zero /* 08E598 8008D998 3C028012 */ lui $v0, %hi(D_8012648C) # $v0, 0x8012 /* 08E59C 8008D99C 2442648C */ addiu $v0, %lo(D_8012648C) # addiu $v0, $v0, 0x648c @@ -73,7 +73,7 @@ glabel func_8008D8BC /* 08E5D0 8008D9D0 AC2E6494 */ sw $t6, %lo(D_80126494)($at) .L8008D9D4: /* 08E5D4 8008D9D4 24040241 */ li $a0, 577 -/* 08E5D8 8008D9D8 0C000741 */ jal func_80001D04 +/* 08E5D8 8008D9D8 0C000741 */ jal play_sound_global /* 08E5DC 8008D9DC 00002825 */ move $a1, $zero /* 08E5E0 8008D9E0 100000A3 */ b .L8008DC70 /* 08E5E4 8008D9E4 8FBF0014 */ lw $ra, 0x14($sp) @@ -96,7 +96,7 @@ glabel func_8008D8BC .L8008DA20: /* 08E620 8008DA20 10660092 */ beq $v1, $a2, .L8008DC6C /* 08E624 8008DA24 240400EB */ li $a0, 235 -/* 08E628 8008DA28 0C000741 */ jal func_80001D04 +/* 08E628 8008DA28 0C000741 */ jal play_sound_global /* 08E62C 8008DA2C 00002825 */ move $a1, $zero /* 08E630 8008DA30 1000008F */ b .L8008DC70 /* 08E634 8008DA34 8FBF0014 */ lw $ra, 0x14($sp) @@ -106,7 +106,7 @@ glabel func_8008D8BC /* 08E640 8008DA40 30794000 */ andi $t9, $v1, 0x4000 /* 08E644 8008DA44 1320000C */ beqz $t9, .L8008DA78 /* 08E648 8008DA48 24040241 */ li $a0, 577 -/* 08E64C 8008DA4C 0C000741 */ jal func_80001D04 +/* 08E64C 8008DA4C 0C000741 */ jal play_sound_global /* 08E650 8008DA50 00002825 */ move $a1, $zero /* 08E654 8008DA54 3C068012 */ lui $a2, %hi(D_80126490) # $a2, 0x8012 /* 08E658 8008DA58 24C66490 */ addiu $a2, %lo(D_80126490) # addiu $a2, $a2, 0x6490 @@ -135,14 +135,14 @@ glabel func_8008D8BC /* 08E6B0 8008DAB0 00000000 */ nop /* 08E6B4 8008DAB4 15C00007 */ bnez $t6, .L8008DAD4 /* 08E6B8 8008DAB8 00000000 */ nop -/* 08E6BC 8008DABC 0C000741 */ jal func_80001D04 +/* 08E6BC 8008DABC 0C000741 */ jal play_sound_global /* 08E6C0 8008DAC0 240400EF */ li $a0, 239 /* 08E6C4 8008DAC4 240F0002 */ li $t7, 2 /* 08E6C8 8008DAC8 3C018012 */ lui $at, %hi(D_80126494) # $at, 0x8012 /* 08E6CC 8008DACC 10000067 */ b .L8008DC6C /* 08E6D0 8008DAD0 AC2F6494 */ sw $t7, %lo(D_80126494)($at) .L8008DAD4: -/* 08E6D4 8008DAD4 0C000741 */ jal func_80001D04 +/* 08E6D4 8008DAD4 0C000741 */ jal play_sound_global /* 08E6D8 8008DAD8 00002825 */ move $a1, $zero /* 08E6DC 8008DADC 10000064 */ b .L8008DC70 /* 08E6E0 8008DAE0 8FBF0014 */ lw $ra, 0x14($sp) @@ -166,14 +166,14 @@ glabel func_8008D8BC .L8008DB20: /* 08E720 8008DB20 10670052 */ beq $v1, $a3, .L8008DC6C /* 08E724 8008DB24 240400EB */ li $a0, 235 -/* 08E728 8008DB28 0C000741 */ jal func_80001D04 +/* 08E728 8008DB28 0C000741 */ jal play_sound_global /* 08E72C 8008DB2C 00002825 */ move $a1, $zero /* 08E730 8008DB30 1000004F */ b .L8008DC70 /* 08E734 8008DB34 8FBF0014 */ lw $ra, 0x14($sp) .L8008DB38: /* 08E738 8008DB38 11200044 */ beqz $t1, .L8008DC4C /* 08E73C 8008DB3C 240400EF */ li $a0, 239 -/* 08E740 8008DB40 0C000741 */ jal func_80001D04 +/* 08E740 8008DB40 0C000741 */ jal play_sound_global /* 08E744 8008DB44 00002825 */ move $a1, $zero /* 08E748 8008DB48 3C068012 */ lui $a2, %hi(D_80126490) # $a2, 0x8012 /* 08E74C 8008DB4C 24C66490 */ addiu $a2, %lo(D_80126490) # addiu $a2, $a2, 0x6490 @@ -247,7 +247,7 @@ glabel func_8008D8BC /* 08E84C 8008DC4C 306E4000 */ andi $t6, $v1, 0x4000 /* 08E850 8008DC50 11C00006 */ beqz $t6, .L8008DC6C /* 08E854 8008DC54 24040241 */ li $a0, 577 -/* 08E858 8008DC58 0C000741 */ jal func_80001D04 +/* 08E858 8008DC58 0C000741 */ jal play_sound_global /* 08E85C 8008DC5C 00002825 */ move $a1, $zero /* 08E860 8008DC60 240F0001 */ li $t7, 1 /* 08E864 8008DC64 3C018012 */ lui $at, %hi(D_80126494) # $at, 0x8012 diff --git a/asm/non_matchings/menu/func_80090918.s b/asm/non_matchings/menu/func_80090918.s index fa7b14a8..7de665d8 100644 --- a/asm/non_matchings/menu/func_80090918.s +++ b/asm/non_matchings/menu/func_80090918.s @@ -47,7 +47,7 @@ glabel func_80090918 /* 0915C4 800909C4 240400EF */ li $a0, 239 /* 0915C8 800909C8 11E00008 */ beqz $t7, .L800909EC /* 0915CC 800909CC 2469FFFF */ addiu $t1, $v1, -1 -/* 0915D0 800909D0 0C000741 */ jal func_80001D04 +/* 0915D0 800909D0 0C000741 */ jal play_sound_global /* 0915D4 800909D4 00002825 */ move $a1, $zero /* 0915D8 800909D8 3C03800E */ lui $v1, %hi(gMenuDelay) # $v1, 0x800e /* 0915DC 800909DC 3C01800E */ lui $at, %hi(D_800E1E1C) # $at, 0x800e @@ -278,7 +278,7 @@ glabel func_80090918 /* 091920 80090D20 10000069 */ b .L80090EC8 /* 091924 80090D24 AC391E1C */ sw $t9, %lo(D_800E1E1C)($at) .L80090D28: -/* 091928 80090D28 0C000741 */ jal func_80001D04 +/* 091928 80090D28 0C000741 */ jal play_sound_global /* 09192C 80090D2C 00002825 */ move $a1, $zero /* 091930 80090D30 10000066 */ b .L80090ECC /* 091934 80090D34 8FBF001C */ lw $ra, 0x1c($sp) @@ -356,7 +356,7 @@ glabel func_80090918 /* 091A34 80090E34 11380025 */ beq $t1, $t8, .L80090ECC /* 091A38 80090E38 8FBF001C */ lw $ra, 0x1c($sp) .L80090E3C: -/* 091A3C 80090E3C 0C000741 */ jal func_80001D04 +/* 091A3C 80090E3C 0C000741 */ jal play_sound_global /* 091A40 80090E40 00002825 */ move $a1, $zero /* 091A44 80090E44 3C038012 */ lui $v1, %hi(D_801269CC) # $v1, 0x8012 /* 091A48 80090E48 8C6369CC */ lw $v1, %lo(D_801269CC)($v1) diff --git a/asm/non_matchings/menu/func_80092188.s b/asm/non_matchings/menu/func_80092188.s index 52782c75..0456e9e7 100644 --- a/asm/non_matchings/menu/func_80092188.s +++ b/asm/non_matchings/menu/func_80092188.s @@ -69,7 +69,7 @@ glabel func_80092188 /* 092E74 80092274 29C10007 */ slti $at, $t6, 7 /* 092E78 80092278 14200006 */ bnez $at, .L80092294 /* 092E7C 8009227C 00000000 */ nop -/* 092E80 80092280 0C000741 */ jal func_80001D04 +/* 092E80 80092280 0C000741 */ jal play_sound_global /* 092E84 80092284 00002825 */ move $a1, $zero /* 092E88 80092288 3C06800E */ lui $a2, %hi(D_800E0980) # $a2, 0x800e /* 092E8C 8009228C 24C60980 */ addiu $a2, %lo(D_800E0980) # addiu $a2, $a2, 0x980 @@ -401,7 +401,7 @@ glabel L8009251C /* 093328 80092728 AD9F0000 */ sw $ra, ($t4) .L8009272C: /* 09332C 8009272C 24040131 */ li $a0, 305 -/* 093330 80092730 0C000741 */ jal func_80001D04 +/* 093330 80092730 0C000741 */ jal play_sound_global /* 093334 80092734 00002825 */ move $a1, $zero /* 093338 80092738 100000F8 */ b .L80092B1C /* 09333C 8009273C 8FAF003C */ lw $t7, 0x3c($sp) @@ -477,13 +477,13 @@ glabel L80092740 /* 09343C 8009283C 24040147 */ li $a0, 327 /* 093440 80092840 3C058012 */ lui $a1, %hi(D_80126848) # $a1, 0x8012 /* 093444 80092844 24A56848 */ addiu $a1, %lo(D_80126848) # addiu $a1, $a1, 0x6848 -/* 093448 80092848 0C000741 */ jal func_80001D04 +/* 093448 80092848 0C000741 */ jal play_sound_global /* 09344C 8009284C 24040141 */ li $a0, 321 /* 093450 80092850 10000004 */ b .L80092864 /* 093454 80092854 00000000 */ nop .L80092858: /* 093458 80092858 3C058012 */ lui $a1, %hi(D_80126848) # $a1, 0x8012 -/* 09345C 8009285C 0C000741 */ jal func_80001D04 +/* 09345C 8009285C 0C000741 */ jal play_sound_global /* 093460 80092860 24A56848 */ addiu $a1, %lo(D_80126848) # addiu $a1, $a1, 0x6848 .L80092864: /* 093464 80092864 3C0E800E */ lui $t6, %hi(D_800E0414) # $t6, 0x800e @@ -681,14 +681,14 @@ glabel L8009287C /* 09371C 80092B1C 8FB90038 */ lw $t9, 0x38($sp) /* 093720 80092B20 11E00005 */ beqz $t7, .L80092B38 /* 093724 80092B24 24040241 */ li $a0, 577 -/* 093728 80092B28 0C000741 */ jal func_80001D04 +/* 093728 80092B28 0C000741 */ jal play_sound_global /* 09372C 80092B2C 00002825 */ move $a1, $zero /* 093730 80092B30 1000000D */ b .L80092B68 /* 093734 80092B34 00000000 */ nop .L80092B38: /* 093738 80092B38 13200005 */ beqz $t9, .L80092B50 /* 09373C 80092B3C 240400EF */ li $a0, 239 -/* 093740 80092B40 0C000741 */ jal func_80001D04 +/* 093740 80092B40 0C000741 */ jal play_sound_global /* 093744 80092B44 00002825 */ move $a1, $zero /* 093748 80092B48 10000007 */ b .L80092B68 /* 09374C 80092B4C 00000000 */ nop @@ -697,7 +697,7 @@ glabel L8009287C /* 093754 80092B54 240400EB */ li $a0, 235 /* 093758 80092B58 13000003 */ beqz $t8, .L80092B68 /* 09375C 80092B5C 00000000 */ nop -/* 093760 80092B60 0C000741 */ jal func_80001D04 +/* 093760 80092B60 0C000741 */ jal play_sound_global /* 093764 80092B64 00002825 */ move $a1, $zero .L80092B68: /* 093768 80092B68 3C048012 */ lui $a0, %hi(gPlayerSelectVehicle) # $a0, 0x8012 diff --git a/asm/non_matchings/menu/func_80094170.s b/asm/non_matchings/menu/func_80094170.s index c6a450ba..f76c9403 100644 --- a/asm/non_matchings/menu/func_80094170.s +++ b/asm/non_matchings/menu/func_80094170.s @@ -46,7 +46,7 @@ glabel func_80094170 /* 094E18 80094218 1160000F */ beqz $t3, .L80094258 /* 094E1C 8009421C 306D4000 */ andi $t5, $v1, 0x4000 /* 094E20 80094220 240400EF */ li $a0, 239 -/* 094E24 80094224 0C000741 */ jal func_80001D04 +/* 094E24 80094224 0C000741 */ jal play_sound_global /* 094E28 80094228 00002825 */ move $a1, $zero /* 094E2C 8009422C 3C08800E */ lui $t0, %hi(D_800E0988) # $t0, 0x800e /* 094E30 80094230 25080988 */ addiu $t0, %lo(D_800E0988) # addiu $t0, $t0, 0x988 @@ -64,7 +64,7 @@ glabel func_80094170 /* 094E58 80094258 11A00008 */ beqz $t5, .L8009427C /* 094E5C 8009425C 00022E00 */ sll $a1, $v0, 0x18 /* 094E60 80094260 240400EF */ li $a0, 239 -/* 094E64 80094264 0C000741 */ jal func_80001D04 +/* 094E64 80094264 0C000741 */ jal play_sound_global /* 094E68 80094268 00002825 */ move $a1, $zero /* 094E6C 8009426C 3C08800E */ lui $t0, %hi(D_800E0988) # $t0, 0x800e /* 094E70 80094270 25080988 */ addiu $t0, %lo(D_800E0988) # addiu $t0, $t0, 0x988 @@ -86,7 +86,7 @@ glabel func_80094170 .L800942AC: /* 094EAC 800942AC 10A200B6 */ beq $a1, $v0, .L80094588 /* 094EB0 800942B0 240400EB */ li $a0, 235 -/* 094EB4 800942B4 0C000741 */ jal func_80001D04 +/* 094EB4 800942B4 0C000741 */ jal play_sound_global /* 094EB8 800942B8 00002825 */ move $a1, $zero /* 094EBC 800942BC 100000B3 */ b .L8009458C /* 094EC0 800942C0 8FA4001C */ lw $a0, 0x1c($sp) @@ -94,7 +94,7 @@ glabel func_80094170 /* 094EC4 800942C4 11200022 */ beqz $t1, .L80094350 /* 094EC8 800942C8 3C078012 */ lui $a3, %hi(D_80126A68) # $a3, 0x8012 /* 094ECC 800942CC 240400EF */ li $a0, 239 -/* 094ED0 800942D0 0C000741 */ jal func_80001D04 +/* 094ED0 800942D0 0C000741 */ jal play_sound_global /* 094ED4 800942D4 00002825 */ move $a1, $zero /* 094ED8 800942D8 3C078012 */ lui $a3, %hi(D_80126A68) # $a3, 0x8012 /* 094EDC 800942DC 24E76A68 */ addiu $a3, %lo(D_80126A68) # addiu $a3, $a3, 0x6a68 @@ -167,7 +167,7 @@ glabel func_80094170 .L800943D0: /* 094FD0 800943D0 10A2006D */ beq $a1, $v0, .L80094588 /* 094FD4 800943D4 00000000 */ nop -/* 094FD8 800943D8 0C000741 */ jal func_80001D04 +/* 094FD8 800943D8 0C000741 */ jal play_sound_global /* 094FDC 800943DC 00002825 */ move $a1, $zero /* 094FE0 800943E0 1000006A */ b .L8009458C /* 094FE4 800943E4 8FA4001C */ lw $a0, 0x1c($sp) diff --git a/asm/non_matchings/menu/func_80094688.s b/asm/non_matchings/menu/func_80094688.s index af73b424..b6bdf812 100644 --- a/asm/non_matchings/menu/func_80094688.s +++ b/asm/non_matchings/menu/func_80094688.s @@ -126,7 +126,7 @@ glabel func_80094688 /* 095458 80094858 31F80040 */ andi $t8, $t7, 0x40 /* 09545C 8009485C 13000005 */ beqz $t8, .L80094874 /* 095460 80094860 00000000 */ nop -/* 095464 80094864 0C00322D */ jal func_8000C8B4 +/* 095464 80094864 0C00322D */ jal normalise_time /* 095468 80094868 240400F0 */ li $a0, 240 /* 09546C 8009486C 3C018012 */ lui $at, %hi(gIgnorePlayerInput) # $at, 0x8012 /* 095470 80094870 AC2263C4 */ sw $v0, %lo(gIgnorePlayerInput)($at) diff --git a/asm/non_matchings/menu/func_80095728.s b/asm/non_matchings/menu/func_80095728.s index 8dd22ebf..bd007c79 100644 --- a/asm/non_matchings/menu/func_80095728.s +++ b/asm/non_matchings/menu/func_80095728.s @@ -926,7 +926,7 @@ glabel L80095EC8 /* 097058 80096458 00000000 */ nop /* 09705C 8009645C 13200005 */ beqz $t9, .L80096474 /* 097060 80096460 24040241 */ li $a0, 577 -/* 097064 80096464 0C000741 */ jal func_80001D04 +/* 097064 80096464 0C000741 */ jal play_sound_global /* 097068 80096468 00002825 */ move $a1, $zero /* 09706C 8009646C 100000A9 */ b .L80096714 /* 097070 80096470 00000000 */ nop @@ -935,14 +935,14 @@ glabel L80095EC8 /* 097078 80096478 8FAE004C */ lw $t6, 0x4c($sp) /* 09707C 8009647C 11800005 */ beqz $t4, .L80096494 /* 097080 80096480 240400EF */ li $a0, 239 -/* 097084 80096484 0C000741 */ jal func_80001D04 +/* 097084 80096484 0C000741 */ jal play_sound_global /* 097088 80096488 00002825 */ move $a1, $zero /* 09708C 8009648C 100000A1 */ b .L80096714 /* 097090 80096490 00000000 */ nop .L80096494: /* 097094 80096494 11C0009F */ beqz $t6, .L80096714 /* 097098 80096498 240400EB */ li $a0, 235 -/* 09709C 8009649C 0C000741 */ jal func_80001D04 +/* 09709C 8009649C 0C000741 */ jal play_sound_global /* 0970A0 800964A0 00002825 */ move $a1, $zero /* 0970A4 800964A4 1000009B */ b .L80096714 /* 0970A8 800964A8 00000000 */ nop diff --git a/asm/non_matchings/menu/func_80097D10.s b/asm/non_matchings/menu/func_80097D10.s index 38acf168..c8f25d4d 100644 --- a/asm/non_matchings/menu/func_80097D10.s +++ b/asm/non_matchings/menu/func_80097D10.s @@ -199,7 +199,7 @@ glabel func_80097D10 /* 098BC8 80097FC8 01AC7821 */ addu $t7, $t5, $t4 /* 098BCC 80097FCC A1E00000 */ sb $zero, ($t7) /* 098BD0 80097FD0 240400EF */ li $a0, 239 -/* 098BD4 80097FD4 0C000741 */ jal func_80001D04 +/* 098BD4 80097FD4 0C000741 */ jal play_sound_global /* 098BD8 80097FD8 00002825 */ move $a1, $zero /* 098BDC 80097FDC 3C03800E */ lui $v1, %hi(D_800E0FA0) # $v1, 0x800e /* 098BE0 80097FE0 3C078012 */ lui $a3, %hi(D_80126C78) # $a3, 0x8012 @@ -228,7 +228,7 @@ glabel func_80097D10 /* 098C38 80098038 01AC7821 */ addu $t7, $t5, $t4 /* 098C3C 8009803C A1E00000 */ sb $zero, ($t7) .L80098040: -/* 098C40 80098040 0C000741 */ jal func_80001D04 +/* 098C40 80098040 0C000741 */ jal play_sound_global /* 098C44 80098044 00002825 */ move $a1, $zero /* 098C48 80098048 1000005E */ b .L800981C4 /* 098C4C 8009804C 8FA40030 */ lw $a0, 0x30($sp) @@ -263,7 +263,7 @@ glabel func_80097D10 /* 098CB0 800980B0 8D0C0000 */ lw $t4, ($t0) /* 098CB4 800980B4 00002825 */ move $a1, $zero /* 098CB8 800980B8 01866821 */ addu $t5, $t4, $a2 -/* 098CBC 800980BC 0C000741 */ jal func_80001D04 +/* 098CBC 800980BC 0C000741 */ jal play_sound_global /* 098CC0 800980C0 A1A00000 */ sb $zero, ($t5) /* 098CC4 800980C4 240E0001 */ li $t6, 1 /* 098CC8 800980C8 3C018012 */ lui $at, %hi(gCheatInputString) # $at, 0x8012 @@ -283,7 +283,7 @@ glabel func_80097D10 /* 098CF8 800980F8 24040241 */ li $a0, 577 /* 098CFC 800980FC 03025021 */ addu $t2, $t8, $v0 /* 098D00 80098100 A1400000 */ sb $zero, ($t2) -/* 098D04 80098104 0C000741 */ jal func_80001D04 +/* 098D04 80098104 0C000741 */ jal play_sound_global /* 098D08 80098108 00002825 */ move $a1, $zero /* 098D0C 8009810C 1000002D */ b .L800981C4 /* 098D10 80098110 8FA40030 */ lw $a0, 0x30($sp) @@ -308,7 +308,7 @@ glabel func_80097D10 .L8009814C: /* 098D4C 8009814C 1049001C */ beq $v0, $t1, .L800981C0 /* 098D50 80098150 00000000 */ nop -/* 098D54 80098154 0C000741 */ jal func_80001D04 +/* 098D54 80098154 0C000741 */ jal play_sound_global /* 098D58 80098158 AFA2002C */ sw $v0, 0x2c($sp) /* 098D5C 8009815C 3C0B8012 */ lui $t3, %hi(D_80126C6C) # $t3, 0x8012 /* 098D60 80098160 8FA2002C */ lw $v0, 0x2c($sp) @@ -319,7 +319,7 @@ glabel func_80097D10 /* 098D70 80098170 11800008 */ beqz $t4, .L80098194 /* 098D74 80098174 310E4000 */ andi $t6, $t0, 0x4000 /* 098D78 80098178 240400EF */ li $a0, 239 -/* 098D7C 8009817C 0C000741 */ jal func_80001D04 +/* 098D7C 8009817C 0C000741 */ jal play_sound_global /* 098D80 80098180 00002825 */ move $a1, $zero /* 098D84 80098184 240D0001 */ li $t5, 1 /* 098D88 80098188 3C018012 */ lui $at, %hi(gCheatInputString) # $at, 0x8012 @@ -335,7 +335,7 @@ glabel func_80097D10 /* 098DAC 800981AC 032F5021 */ addu $t2, $t9, $t7 /* 098DB0 800981B0 A1400000 */ sb $zero, ($t2) /* 098DB4 800981B4 24040241 */ li $a0, 577 -/* 098DB8 800981B8 0C000741 */ jal func_80001D04 +/* 098DB8 800981B8 0C000741 */ jal play_sound_global /* 098DBC 800981BC 00002825 */ move $a1, $zero .L800981C0: /* 098DC0 800981C0 8FA40030 */ lw $a0, 0x30($sp) diff --git a/asm/non_matchings/menu/func_800998E0.s b/asm/non_matchings/menu/func_800998E0.s index 90f8023b..7eb32077 100644 --- a/asm/non_matchings/menu/func_800998E0.s +++ b/asm/non_matchings/menu/func_800998E0.s @@ -12,7 +12,7 @@ glabel func_800998E0 /* 09A508 80099908 008E082A */ slt $at, $a0, $t6 /* 09A50C 8009990C 1020004E */ beqz $at, .L80099A48 /* 09A510 80099910 240400EF */ li $a0, 239 -/* 09A514 80099914 0C000741 */ jal func_80001D04 +/* 09A514 80099914 0C000741 */ jal play_sound_global /* 09A518 80099918 AFA60020 */ sw $a2, 0x20($sp) /* 09A51C 8009991C 8FA60020 */ lw $a2, 0x20($sp) /* 09A520 80099920 3C108012 */ lui $s0, %hi(D_80126540) # $s0, 0x8012 diff --git a/asm/non_matchings/menu/menu_audio_options_loop.s b/asm/non_matchings/menu/menu_audio_options_loop.s index 4c9db625..4ad5f2b3 100644 --- a/asm/non_matchings/menu/menu_audio_options_loop.s +++ b/asm/non_matchings/menu/menu_audio_options_loop.s @@ -330,7 +330,7 @@ glabel menu_audio_options_loop /* 085D20 80085120 00000000 */ nop /* 085D24 80085124 15C0000D */ bnez $t6, .L8008515C /* 085D28 80085128 8FAF0030 */ lw $t7, 0x30($sp) -/* 085D2C 8008512C 0C000741 */ jal func_80001D04 +/* 085D2C 8008512C 0C000741 */ jal play_sound_global /* 085D30 80085130 2404019B */ li $a0, 411 /* 085D34 80085134 10000009 */ b .L8008515C /* 085D38 80085138 8FAF0030 */ lw $t7, 0x30($sp) @@ -347,7 +347,7 @@ glabel menu_audio_options_loop /* 085D5C 8008515C 24010003 */ li $at, 3 /* 085D60 80085160 15E10005 */ bne $t7, $at, .L80085178 /* 085D64 80085164 24040241 */ li $a0, 577 -/* 085D68 80085168 0C000741 */ jal func_80001D04 +/* 085D68 80085168 0C000741 */ jal play_sound_global /* 085D6C 8008516C 00002825 */ move $a1, $zero /* 085D70 80085170 1000000F */ b .L800851B0 /* 085D74 80085174 00000000 */ nop @@ -356,7 +356,7 @@ glabel menu_audio_options_loop /* 085D7C 8008517C 24010002 */ li $at, 2 /* 085D80 80085180 17010005 */ bne $t8, $at, .L80085198 /* 085D84 80085184 240400EF */ li $a0, 239 -/* 085D88 80085188 0C000741 */ jal func_80001D04 +/* 085D88 80085188 0C000741 */ jal play_sound_global /* 085D8C 8008518C 00002825 */ move $a1, $zero /* 085D90 80085190 10000007 */ b .L800851B0 /* 085D94 80085194 00000000 */ nop @@ -365,7 +365,7 @@ glabel menu_audio_options_loop /* 085D9C 8008519C 24010001 */ li $at, 1 /* 085DA0 800851A0 17210003 */ bne $t9, $at, .L800851B0 /* 085DA4 800851A4 240400EB */ li $a0, 235 -/* 085DA8 800851A8 0C000741 */ jal func_80001D04 +/* 085DA8 800851A8 0C000741 */ jal play_sound_global /* 085DAC 800851AC 00002825 */ move $a1, $zero .L800851B0: /* 085DB0 800851B0 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e diff --git a/asm/non_matchings/menu/menu_file_select_loop.s b/asm/non_matchings/menu/menu_file_select_loop.s index a057cba3..0baabf34 100644 --- a/asm/non_matchings/menu/menu_file_select_loop.s +++ b/asm/non_matchings/menu/menu_file_select_loop.s @@ -225,7 +225,7 @@ glabel menu_file_select_loop /* 08EDB8 8008E1B8 1300000C */ beqz $t8, .L8008E1EC /* 08EDBC 8008E1BC 256B0FB0 */ addiu $t3, %lo(D_800E0FB0) # addiu $t3, $t3, 0xfb0 /* 08EDC0 8008E1C0 240400EF */ li $a0, 239 -/* 08EDC4 8008E1C4 0C000741 */ jal func_80001D04 +/* 08EDC4 8008E1C4 0C000741 */ jal play_sound_global /* 08EDC8 8008E1C8 00002825 */ move $a1, $zero /* 08EDCC 8008E1CC 3C04800E */ lui $a0, %hi(gSaveFileIndex) # $a0, 0x800e /* 08EDD0 8008E1D0 8C84F4CC */ lw $a0, %lo(gSaveFileIndex)($a0) diff --git a/asm/non_matchings/menu/menu_magic_codes_list_loop.s b/asm/non_matchings/menu/menu_magic_codes_list_loop.s index a1824d6f..66bb166e 100644 --- a/asm/non_matchings/menu/menu_magic_codes_list_loop.s +++ b/asm/non_matchings/menu/menu_magic_codes_list_loop.s @@ -102,7 +102,7 @@ glabel menu_magic_codes_list_loop /* 08B698 8008AA98 240400EF */ li $a0, 239 /* 08B69C 8008AA9C 10E90044 */ beq $a3, $t1, .L8008ABB0 /* 08B6A0 8008AAA0 00002825 */ move $a1, $zero -/* 08B6A4 8008AAA4 0C000741 */ jal func_80001D04 +/* 08B6A4 8008AAA4 0C000741 */ jal play_sound_global /* 08B6A8 8008AAA8 AFA7003C */ sw $a3, 0x3c($sp) /* 08B6AC 8008AAAC 860A0000 */ lh $t2, ($s0) /* 08B6B0 8008AAB0 3C088012 */ lui $t0, %hi(D_80126C80) # $t0, 0x8012 @@ -219,7 +219,7 @@ glabel menu_magic_codes_list_loop /* 08B858 8008AC58 10C20006 */ beq $a2, $v0, .L8008AC74 /* 08B85C 8008AC5C 240400EB */ li $a0, 235 /* 08B860 8008AC60 00002825 */ move $a1, $zero -/* 08B864 8008AC64 0C000741 */ jal func_80001D04 +/* 08B864 8008AC64 0C000741 */ jal play_sound_global /* 08B868 8008AC68 AFA7003C */ sw $a3, 0x3c($sp) /* 08B86C 8008AC6C 8FA7003C */ lw $a3, 0x3c($sp) /* 08B870 8008AC70 00000000 */ nop @@ -245,7 +245,7 @@ glabel menu_magic_codes_list_loop /* 08B8B4 8008ACB4 0C030076 */ jal func_800C01D8 /* 08B8B8 8008ACB8 2484F774 */ addiu $a0, %lo(sMenuTransitionFadeIn) # addiu $a0, $a0, -0x88c /* 08B8BC 8008ACBC 24040241 */ li $a0, 577 -/* 08B8C0 8008ACC0 0C000741 */ jal func_80001D04 +/* 08B8C0 8008ACC0 0C000741 */ jal play_sound_global /* 08B8C4 8008ACC4 00002825 */ move $a1, $zero .L8008ACC8: /* 08B8C8 8008ACC8 3C0A800E */ lui $t2, %hi(gMenuDelay) # $t2, 0x800e diff --git a/asm/non_matchings/menu/menu_magic_codes_loop.s b/asm/non_matchings/menu/menu_magic_codes_loop.s index a902ad69..4ba64859 100644 --- a/asm/non_matchings/menu/menu_magic_codes_loop.s +++ b/asm/non_matchings/menu/menu_magic_codes_loop.s @@ -241,7 +241,7 @@ glabel menu_magic_codes_loop /* 08AC40 8008A040 240400AE */ li $a0, 174 /* 08AC44 8008A044 11C00011 */ beqz $t6, .L8008A08C /* 08AC48 8008A048 8FB90048 */ lw $t9, 0x48($sp) -/* 08AC4C 8008A04C 0C000741 */ jal func_80001D04 +/* 08AC4C 8008A04C 0C000741 */ jal play_sound_global /* 08AC50 8008A050 AFA70044 */ sw $a3, 0x44($sp) /* 08AC54 8008A054 3C068012 */ lui $a2, %hi(gCheatInputStringLength) # $a2, 0x8012 /* 08AC58 8008A058 24C66C44 */ addiu $a2, %lo(gCheatInputStringLength) # addiu $a2, $a2, 0x6c44 @@ -498,7 +498,7 @@ glabel menu_magic_codes_loop /* 08AFC8 8008A3C8 00000000 */ nop /* 08AFCC 8008A3CC 11E00005 */ beqz $t7, .L8008A3E4 /* 08AFD0 8008A3D0 24040241 */ li $a0, 577 -/* 08AFD4 8008A3D4 0C000741 */ jal func_80001D04 +/* 08AFD4 8008A3D4 0C000741 */ jal play_sound_global /* 08AFD8 8008A3D8 00002825 */ move $a1, $zero /* 08AFDC 8008A3DC 1000000D */ b .L8008A414 /* 08AFE0 8008A3E0 00000000 */ nop @@ -507,14 +507,14 @@ glabel menu_magic_codes_loop /* 08AFE8 8008A3E8 8FB80034 */ lw $t8, 0x34($sp) /* 08AFEC 8008A3EC 11C00005 */ beqz $t6, .L8008A404 /* 08AFF0 8008A3F0 240400EF */ li $a0, 239 -/* 08AFF4 8008A3F4 0C000741 */ jal func_80001D04 +/* 08AFF4 8008A3F4 0C000741 */ jal play_sound_global /* 08AFF8 8008A3F8 00002825 */ move $a1, $zero /* 08AFFC 8008A3FC 10000005 */ b .L8008A414 /* 08B000 8008A400 00000000 */ nop .L8008A404: /* 08B004 8008A404 13000003 */ beqz $t8, .L8008A414 /* 08B008 8008A408 240400EB */ li $a0, 235 -/* 08B00C 8008A40C 0C000741 */ jal func_80001D04 +/* 08B00C 8008A40C 0C000741 */ jal play_sound_global /* 08B010 8008A410 00002825 */ move $a1, $zero .L8008A414: /* 08B014 8008A414 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e diff --git a/asm/non_matchings/menu/menu_options_loop.s b/asm/non_matchings/menu/menu_options_loop.s index daa7b7a9..81e57241 100644 --- a/asm/non_matchings/menu/menu_options_loop.s +++ b/asm/non_matchings/menu/menu_options_loop.s @@ -91,7 +91,7 @@ glabel menu_options_loop /* 0850A8 800844A8 0C030076 */ jal func_800C01D8 /* 0850AC 800844AC 2484F774 */ addiu $a0, %lo(sMenuTransitionFadeIn) # addiu $a0, $a0, -0x88c /* 0850B0 800844B0 24040241 */ li $a0, 577 -/* 0850B4 800844B4 0C000741 */ jal func_80001D04 +/* 0850B4 800844B4 0C000741 */ jal play_sound_global /* 0850B8 800844B8 00002825 */ move $a1, $zero /* 0850BC 800844BC 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e /* 0850C0 800844C0 3C06800E */ lui $a2, %hi(D_800DF460) # $a2, 0x800e @@ -108,7 +108,7 @@ glabel menu_options_loop /* 0850E8 800844E8 240A001F */ li $t2, 31 /* 0850EC 800844EC AD2A0000 */ sw $t2, ($t1) /* 0850F0 800844F0 240400EF */ li $a0, 239 -/* 0850F4 800844F4 0C000741 */ jal func_80001D04 +/* 0850F4 800844F4 0C000741 */ jal play_sound_global /* 0850F8 800844F8 00002825 */ move $a1, $zero /* 0850FC 800844FC 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e /* 085100 80084500 3C06800E */ lui $a2, %hi(D_800DF460) # $a2, 0x800e @@ -136,7 +136,7 @@ glabel menu_options_loop /* 085150 80084550 00002025 */ move $a0, $zero /* 085154 80084554 240400EB */ li $a0, 235 .L80084558: -/* 085158 80084558 0C000741 */ jal func_80001D04 +/* 085158 80084558 0C000741 */ jal play_sound_global /* 08515C 8008455C 00002825 */ move $a1, $zero /* 085160 80084560 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e /* 085164 80084564 3C06800E */ lui $a2, %hi(D_800DF460) # $a2, 0x800e @@ -154,7 +154,7 @@ glabel menu_options_loop /* 085190 80084590 1320000F */ beqz $t9, .L800845D0 /* 085194 80084594 240400EB */ li $a0, 235 /* 085198 80084598 240400EB */ li $a0, 235 -/* 08519C 8008459C 0C000741 */ jal func_80001D04 +/* 08519C 8008459C 0C000741 */ jal play_sound_global /* 0851A0 800845A0 00002825 */ move $a1, $zero /* 0851A4 800845A4 24040000 */ li $a0, 0 /* 0851A8 800845A8 0C027AAF */ jal unset_eeprom_settings_value @@ -168,7 +168,7 @@ glabel menu_options_loop /* 0851C8 800845C8 1000000E */ b .L80084604 /* 0851CC 800845CC AC2AFA14 */ sw $t2, %lo(gOptionMenuStrings+4)($at) .L800845D0: -/* 0851D0 800845D0 0C000741 */ jal func_80001D04 +/* 0851D0 800845D0 0C000741 */ jal play_sound_global /* 0851D4 800845D4 00002825 */ move $a1, $zero /* 0851D8 800845D8 24040000 */ li $a0, 0 /* 0851DC 800845DC 0C027A9E */ jal set_eeprom_settings_value @@ -208,7 +208,7 @@ glabel menu_options_loop .L80084658: /* 085258 80084658 10620007 */ beq $v1, $v0, .L80084678 /* 08525C 8008465C 240400EB */ li $a0, 235 -/* 085260 80084660 0C000741 */ jal func_80001D04 +/* 085260 80084660 0C000741 */ jal play_sound_global /* 085264 80084664 00002825 */ move $a1, $zero /* 085268 80084668 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e /* 08526C 8008466C 3C06800E */ lui $a2, %hi(D_800DF460) # $a2, 0x800e diff --git a/asm/non_matchings/menu/menu_results_loop.s b/asm/non_matchings/menu/menu_results_loop.s index 57aa80ba..d4639f5d 100644 --- a/asm/non_matchings/menu/menu_results_loop.s +++ b/asm/non_matchings/menu/menu_results_loop.s @@ -33,7 +33,7 @@ glabel menu_results_loop /* 097F20 80097320 14200006 */ bnez $at, .L8009733C /* 097F24 80097324 24040016 */ li $a0, 22 /* 097F28 80097328 ACC00000 */ sw $zero, ($a2) -/* 097F2C 8009732C 0C000741 */ jal func_80001D04 +/* 097F2C 8009732C 0C000741 */ jal play_sound_global /* 097F30 80097330 00002825 */ move $a1, $zero /* 097F34 80097334 3C068012 */ lui $a2, %hi(D_801263E0) # $a2, 0x8012 /* 097F38 80097338 24C663E0 */ addiu $a2, %lo(D_801263E0) # addiu $a2, $a2, 0x63e0 @@ -217,14 +217,14 @@ glabel menu_results_loop /* 0981C0 800975C0 8FAE0020 */ lw $t6, 0x20($sp) /* 0981C4 800975C4 11800005 */ beqz $t4, .L800975DC /* 0981C8 800975C8 24040241 */ li $a0, 577 -/* 0981CC 800975CC 0C000741 */ jal func_80001D04 +/* 0981CC 800975CC 0C000741 */ jal play_sound_global /* 0981D0 800975D0 00002825 */ move $a1, $zero /* 0981D4 800975D4 10000036 */ b .L800976B0 /* 0981D8 800975D8 00000000 */ nop .L800975DC: /* 0981DC 800975DC 11C00005 */ beqz $t6, .L800975F4 /* 0981E0 800975E0 240400EF */ li $a0, 239 -/* 0981E4 800975E4 0C000741 */ jal func_80001D04 +/* 0981E4 800975E4 0C000741 */ jal play_sound_global /* 0981E8 800975E8 00002825 */ move $a1, $zero /* 0981EC 800975EC 10000030 */ b .L800976B0 /* 0981F0 800975F0 00000000 */ nop @@ -233,7 +233,7 @@ glabel menu_results_loop /* 0981F8 800975F8 240400EB */ li $a0, 235 /* 0981FC 800975FC 11E0002C */ beqz $t7, .L800976B0 /* 098200 80097600 00000000 */ nop -/* 098204 80097604 0C000741 */ jal func_80001D04 +/* 098204 80097604 0C000741 */ jal play_sound_global /* 098208 80097608 00002825 */ move $a1, $zero /* 09820C 8009760C 10000028 */ b .L800976B0 /* 098210 80097610 00000000 */ nop diff --git a/asm/non_matchings/menu/menu_title_screen_loop.s b/asm/non_matchings/menu/menu_title_screen_loop.s index 0b8b7c55..05fe4c96 100644 --- a/asm/non_matchings/menu/menu_title_screen_loop.s +++ b/asm/non_matchings/menu/menu_title_screen_loop.s @@ -195,7 +195,7 @@ glabel menu_title_screen_loop /* 084898 80083C98 24010001 */ li $at, 1 /* 08489C 80083C9C 14410007 */ bne $v0, $at, .L80083CBC /* 0848A0 80083CA0 24040016 */ li $a0, 22 -/* 0848A4 80083CA4 0C000741 */ jal func_80001D04 +/* 0848A4 80083CA4 0C000741 */ jal play_sound_global /* 0848A8 80083CA8 00002825 */ move $a1, $zero /* 0848AC 80083CAC 3C028012 */ lui $v0, %hi(D_8012686C) # $v0, 0x8012 /* 0848B0 80083CB0 3C038012 */ lui $v1, %hi(D_8012686C) # $v1, 0x8012 @@ -214,7 +214,7 @@ glabel menu_title_screen_loop /* 0848E0 80083CE0 AC6D0000 */ sw $t5, ($v1) /* 0848E4 80083CE4 24040011 */ li $a0, 17 /* 0848E8 80083CE8 00002825 */ move $a1, $zero -/* 0848EC 80083CEC 0C000741 */ jal func_80001D04 +/* 0848EC 80083CEC 0C000741 */ jal play_sound_global /* 0848F0 80083CF0 E5CA0030 */ swc1 $f10, 0x30($t6) /* 0848F4 80083CF4 3C038012 */ lui $v1, %hi(D_8012686C) # $v1, 0x8012 /* 0848F8 80083CF8 10000032 */ b .L80083DC4 @@ -244,7 +244,7 @@ glabel menu_title_screen_loop /* 084954 80083D54 24040105 */ li $a0, 261 /* 084958 80083D58 15E00009 */ bnez $t7, .L80083D80 /* 08495C 80083D5C 00000000 */ nop -/* 084960 80083D60 0C000741 */ jal func_80001D04 +/* 084960 80083D60 0C000741 */ jal play_sound_global /* 084964 80083D64 00002825 */ move $a1, $zero /* 084968 80083D68 24180001 */ li $t8, 1 /* 08496C 80083D6C 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012 @@ -263,7 +263,7 @@ glabel menu_title_screen_loop /* 08499C 80083D9C 24010001 */ li $at, 1 /* 0849A0 80083DA0 17210008 */ bne $t9, $at, .L80083DC4 /* 0849A4 80083DA4 24040106 */ li $a0, 262 -/* 0849A8 80083DA8 0C000741 */ jal func_80001D04 +/* 0849A8 80083DA8 0C000741 */ jal play_sound_global /* 0849AC 80083DAC 00002825 */ move $a1, $zero /* 0849B0 80083DB0 24090002 */ li $t1, 2 /* 0849B4 80083DB4 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012 @@ -404,7 +404,7 @@ glabel menu_title_screen_loop .L80083FB4: /* 084BB4 80083FB4 10820003 */ beq $a0, $v0, .L80083FC4 /* 084BB8 80083FB8 00000000 */ nop -/* 084BBC 80083FBC 0C000741 */ jal func_80001D04 +/* 084BBC 80083FBC 0C000741 */ jal play_sound_global /* 084BC0 80083FC0 240400EB */ li $a0, 235 .L80083FC4: /* 084BC4 80083FC4 3C028012 */ lui $v0, %hi(D_801267D8) # $v0, 0x8012 @@ -441,7 +441,7 @@ glabel menu_title_screen_loop /* 084C38 80084038 0C03005C */ jal func_800C0170 /* 084C3C 8008403C 00000000 */ nop /* 084C40 80084040 240400EF */ li $a0, 239 -/* 084C44 80084044 0C000741 */ jal func_80001D04 +/* 084C44 80084044 0C000741 */ jal play_sound_global /* 084C48 80084048 00002825 */ move $a1, $zero .L8008404C: /* 084C4C 8008404C 3C18800E */ lui $t8, %hi(gMenuDelay) # $t8, 0x800e diff --git a/asm/non_matchings/menu/menu_trophy_race_rankings_loop.s b/asm/non_matchings/menu/menu_trophy_race_rankings_loop.s index 44791016..82a30e2e 100644 --- a/asm/non_matchings/menu/menu_trophy_race_rankings_loop.s +++ b/asm/non_matchings/menu/menu_trophy_race_rankings_loop.s @@ -116,7 +116,7 @@ glabel menu_trophy_race_rankings_loop /* 099D80 80099180 11000006 */ beqz $t0, .L8009919C /* 099D84 80099184 2404005E */ li $a0, 94 /* 099D88 80099188 00002825 */ move $a1, $zero -/* 099D8C 8009918C 0C000741 */ jal func_80001D04 +/* 099D8C 8009918C 0C000741 */ jal play_sound_global /* 099D90 80099190 AFAB002C */ sw $t3, 0x2c($sp) /* 099D94 80099194 8FAB002C */ lw $t3, 0x2c($sp) /* 099D98 80099198 00000000 */ nop @@ -186,7 +186,7 @@ glabel menu_trophy_race_rankings_loop /* 099E7C 8009927C 11E20008 */ beq $t7, $v0, .L800992A0 /* 099E80 80099280 31189000 */ andi $t8, $t0, 0x9000 /* 099E84 80099284 AFA80044 */ sw $t0, 0x44($sp) -/* 099E88 80099288 0C000741 */ jal func_80001D04 +/* 099E88 80099288 0C000741 */ jal play_sound_global /* 099E8C 8009928C AFAB002C */ sw $t3, 0x2c($sp) /* 099E90 80099290 8FA80044 */ lw $t0, 0x44($sp) /* 099E94 80099294 8FAB002C */ lw $t3, 0x2c($sp) diff --git a/asm/non_matchings/menu/tt_menu_loop.s b/asm/non_matchings/menu/tt_menu_loop.s index 4a51bbdb..05da17ed 100644 --- a/asm/non_matchings/menu/tt_menu_loop.s +++ b/asm/non_matchings/menu/tt_menu_loop.s @@ -196,7 +196,7 @@ glabel L8009DC60 /* 09E9F4 8009DDF4 10000023 */ b .L8009DE84 /* 09E9F8 8009DDF8 246D0001 */ addiu $t5, $v1, 1 .L8009DDFC: -/* 09E9FC 8009DDFC 0C000741 */ jal func_80001D04 +/* 09E9FC 8009DDFC 0C000741 */ jal play_sound_global /* 09EA00 8009DE00 00002825 */ move $a1, $zero /* 09EA04 8009DE04 3C048012 */ lui $a0, %hi(D_80126398) # $a0, 0x8012 /* 09EA08 8009DE08 24846398 */ addiu $a0, %lo(D_80126398) # addiu $a0, $a0, 0x6398 @@ -211,7 +211,7 @@ glabel L8009DC60 /* 09EA2C 8009DE2C A02A64E2 */ sb $t2, %lo(sCurrentMenuID)($at) /* 09EA30 8009DE30 240400EF */ li $a0, 239 .L8009DE34: -/* 09EA34 8009DE34 0C000741 */ jal func_80001D04 +/* 09EA34 8009DE34 0C000741 */ jal play_sound_global /* 09EA38 8009DE38 00002825 */ move $a1, $zero /* 09EA3C 8009DE3C 2404022E */ li $a0, 558 /* 09EA40 8009DE40 0C00DAF3 */ jal func_80036BCC @@ -239,7 +239,7 @@ glabel L8009DC60 /* 09EA8C 8009DE8C 31CF4000 */ andi $t7, $t6, 0x4000 /* 09EA90 8009DE90 11E00005 */ beqz $t7, .L8009DEA8 /* 09EA94 8009DE94 24040241 */ li $a0, 577 -/* 09EA98 8009DE98 0C000741 */ jal func_80001D04 +/* 09EA98 8009DE98 0C000741 */ jal play_sound_global /* 09EA9C 8009DE9C 00002825 */ move $a1, $zero /* 09EAA0 8009DEA0 24180003 */ li $t8, 3 /* 09EAA4 8009DEA4 AFB80044 */ sw $t8, 0x44($sp) @@ -420,7 +420,7 @@ glabel L8009E098 /* 09ED24 8009E124 31AF9000 */ andi $t7, $t5, 0x9000 /* 09ED28 8009E128 11E0000E */ beqz $t7, .L8009E164 /* 09ED2C 8009E12C 8FA90040 */ lw $t1, 0x40($sp) -/* 09ED30 8009E130 0C000741 */ jal func_80001D04 +/* 09ED30 8009E130 0C000741 */ jal play_sound_global /* 09ED34 8009E134 00002825 */ move $a1, $zero /* 09ED38 8009E138 3C048012 */ lui $a0, %hi(D_80126398) # $a0, 0x8012 /* 09ED3C 8009E13C 24846398 */ addiu $a0, %lo(D_80126398) # addiu $a0, $a0, 0x6398 @@ -438,7 +438,7 @@ glabel L8009E098 /* 09ED68 8009E168 312A4000 */ andi $t2, $t1, 0x4000 /* 09ED6C 8009E16C 11400005 */ beqz $t2, .L8009E184 /* 09ED70 8009E170 24040241 */ li $a0, 577 -/* 09ED74 8009E174 0C000741 */ jal func_80001D04 +/* 09ED74 8009E174 0C000741 */ jal play_sound_global /* 09ED78 8009E178 00002825 */ move $a1, $zero /* 09ED7C 8009E17C 3C018012 */ lui $at, %hi(sCurrentMenuID) # $at, 0x8012 /* 09ED80 8009E180 A02064E2 */ sb $zero, %lo(sCurrentMenuID)($at) diff --git a/asm/non_matchings/objects/func_80010994.s b/asm/non_matchings/objects/func_80010994.s index 15a5c11d..2ab12416 100644 --- a/asm/non_matchings/objects/func_80010994.s +++ b/asm/non_matchings/objects/func_80010994.s @@ -13,9 +13,9 @@ glabel func_80010994 /* 0115C0 800109C0 2404FFFF */ li $a0, -1 /* 0115C4 800109C4 3C028012 */ lui $v0, %hi(D_8011ADB0) # $v0, 0x8012 /* 0115C8 800109C8 8C42ADB0 */ lw $v0, %lo(D_8011ADB0)($v0) -/* 0115CC 800109CC 3C018012 */ lui $at, %hi(D_8011ADB8) # $at, 0x8012 +/* 0115CC 800109CC 3C018012 */ lui $at, %hi(gRaceStartCountdown) # $at, 0x8012 /* 0115D0 800109D0 1840000D */ blez $v0, .L80010A08 -/* 0115D4 800109D4 AC22ADB8 */ sw $v0, %lo(D_8011ADB8)($at) +/* 0115D4 800109D4 AC22ADB8 */ sw $v0, %lo(gRaceStartCountdown)($at) /* 0115D8 800109D8 0C028064 */ jal func_800A0190 /* 0115DC 800109DC 00000000 */ nop /* 0115E0 800109E0 10400009 */ beqz $v0, .L80010A08 diff --git a/asm/non_matchings/objects/func_80016500.s b/asm/non_matchings/objects/func_80016500.s index 3bf2e8f3..ca0cc542 100644 --- a/asm/non_matchings/objects/func_80016500.s +++ b/asm/non_matchings/objects/func_80016500.s @@ -78,7 +78,7 @@ glabel func_80016500 /* 017224 80016624 26050220 */ addiu $a1, $s0, 0x220 /* 017228 80016628 1460000B */ bnez $v1, .L80016658 /* 01722C 8001662C 00000000 */ nop -/* 017230 80016630 0C000741 */ jal func_80001D04 +/* 017230 80016630 0C000741 */ jal play_sound_global /* 017234 80016634 AFA20038 */ sw $v0, 0x38($sp) /* 017238 80016638 8FA20038 */ lw $v0, 0x38($sp) /* 01723C 8001663C 8E050220 */ lw $a1, 0x220($s0) diff --git a/asm/non_matchings/objects/func_80019808.s b/asm/non_matchings/objects/func_80019808.s index 348f5f9b..365a4339 100644 --- a/asm/non_matchings/objects/func_80019808.s +++ b/asm/non_matchings/objects/func_80019808.s @@ -627,7 +627,7 @@ glabel func_80019808 /* 01ACFC 8001A0FC 00002825 */ move $a1, $zero /* 01AD00 8001A100 AFBF0064 */ sw $ra, 0x64($sp) /* 01AD04 8001A104 AFA80080 */ sw $t0, 0x80($sp) -/* 01AD08 8001A108 0C000741 */ jal func_80001D04 +/* 01AD08 8001A108 0C000741 */ jal play_sound_global /* 01AD0C 8001A10C AFAA0044 */ sw $t2, 0x44($sp) /* 01AD10 8001A110 3C0B8012 */ lui $t3, %hi(gObjectStructArrayPtr) # $t3, 0x8012 /* 01AD14 8001A114 8FA80080 */ lw $t0, 0x80($sp) diff --git a/asm/non_matchings/objects/func_8001B3C4.s b/asm/non_matchings/objects/func_8001B3C4.s index f736645f..2e05e62f 100644 --- a/asm/non_matchings/objects/func_8001B3C4.s +++ b/asm/non_matchings/objects/func_8001B3C4.s @@ -51,7 +51,7 @@ glabel func_8001B3C4 /* 01C080 8001B480 0C0270B8 */ jal set_magic_code_flags /* 01C084 8001B484 24040001 */ li $a0, 1 /* 01C088 8001B488 2404024E */ li $a0, 590 -/* 01C08C 8001B48C 0C000741 */ jal func_80001D04 +/* 01C08C 8001B48C 0C000741 */ jal play_sound_global /* 01C090 8001B490 00002825 */ move $a1, $zero /* 01C094 8001B494 2404024F */ li $a0, 591 /* 01C098 8001B498 00002825 */ move $a1, $zero @@ -63,7 +63,7 @@ glabel func_8001B3C4 /* 01C0B0 8001B4B0 00000000 */ nop /* 01C0B4 8001B4B4 2404024C */ li $a0, 588 .L8001B4B8: -/* 01C0B8 8001B4B8 0C000741 */ jal func_80001D04 +/* 01C0B8 8001B4B8 0C000741 */ jal play_sound_global /* 01C0BC 8001B4BC 00002825 */ move $a1, $zero /* 01C0C0 8001B4C0 2404024D */ li $a0, 589 /* 01C0C4 8001B4C4 00002825 */ move $a1, $zero diff --git a/asm/non_matchings/objects/func_8001EFA4.s b/asm/non_matchings/objects/func_8001EFA4.s index c8c7a36d..2b95a4b6 100644 --- a/asm/non_matchings/objects/func_8001EFA4.s +++ b/asm/non_matchings/objects/func_8001EFA4.s @@ -86,7 +86,7 @@ glabel func_8001EFA4 /* 01FCD4 8001F0D4 46209120 */ cvt.s.d $f4, $f18 /* 01FCD8 8001F0D8 E6040008 */ swc1 $f4, 8($s0) /* 01FCDC 8001F0DC 8624000E */ lh $a0, 0xe($s1) -/* 01FCE0 8001F0E0 0C00322D */ jal func_8000C8B4 +/* 01FCE0 8001F0E0 0C00322D */ jal normalise_time /* 01FCE4 8001F0E4 AFA5002C */ sw $a1, 0x2c($sp) /* 01FCE8 8001F0E8 8FA5002C */ lw $a1, 0x2c($sp) /* 01FCEC 8001F0EC A602002A */ sh $v0, 0x2a($s0) @@ -130,7 +130,7 @@ glabel func_8001EFA4 /* 01FD84 8001F184 A20F0034 */ sb $t7, 0x34($s0) /* 01FD88 8001F188 AE40006C */ sw $zero, 0x6c($s2) /* 01FD8C 8001F18C 86240024 */ lh $a0, 0x24($s1) -/* 01FD90 8001F190 0C00322D */ jal func_8000C8B4 +/* 01FD90 8001F190 0C00322D */ jal normalise_time /* 01FD94 8001F194 00000000 */ nop /* 01FD98 8001F198 A6020036 */ sh $v0, 0x36($s0) /* 01FD9C 8001F19C 82380026 */ lb $t8, 0x26($s1) diff --git a/asm/non_matchings/objects/func_8001F460.s b/asm/non_matchings/objects/func_8001F460.s index 286a1d28..ce30bf26 100644 --- a/asm/non_matchings/objects/func_8001F460.s +++ b/asm/non_matchings/objects/func_8001F460.s @@ -196,7 +196,7 @@ glabel func_8001F460 /* 020304 8001F704 03001025 */ move $v0, $t8 .L8001F708: /* 020308 8001F708 3044FFFF */ andi $a0, $v0, 0xffff -/* 02030C 8001F70C 0C000741 */ jal func_80001D04 +/* 02030C 8001F70C 0C000741 */ jal play_sound_global /* 020310 8001F710 26650018 */ addiu $a1, $s3, 0x18 .L8001F714: /* 020314 8001F714 A2600038 */ sb $zero, 0x38($s3) @@ -269,7 +269,7 @@ glabel func_8001F460 /* 020400 8001F800 321900FF */ andi $t9, $s0, 0xff /* 020404 8001F804 27300384 */ addiu $s0, $t9, 0x384 /* 020408 8001F808 AFA80174 */ sw $t0, 0x174($sp) -/* 02040C 8001F80C 0C00322D */ jal func_8000C8B4 +/* 02040C 8001F80C 0C00322D */ jal normalise_time /* 020410 8001F810 24040006 */ li $a0, 6 /* 020414 8001F814 8FA80174 */ lw $t0, 0x174($sp) /* 020418 8001F818 82250002 */ lb $a1, 2($s1) @@ -350,7 +350,7 @@ glabel func_8001F460 .L8001F934: /* 020534 8001F934 A7AF00AA */ sh $t7, 0xaa($sp) .L8001F938: -/* 020538 8001F938 0C00322D */ jal func_8000C8B4 +/* 020538 8001F938 0C00322D */ jal normalise_time /* 02053C 8001F93C 24040006 */ li $a0, 6 /* 020540 8001F940 9278003C */ lbu $t8, 0x3c($s3) /* 020544 8001F944 00000000 */ nop diff --git a/asm/non_matchings/objects/func_8002125C.s b/asm/non_matchings/objects/func_8002125C.s index f10a0435..d747bcd4 100644 --- a/asm/non_matchings/objects/func_8002125C.s +++ b/asm/non_matchings/objects/func_8002125C.s @@ -35,7 +35,7 @@ glabel func_8002125C .L800212D8: /* 021ED8 800212D8 84A40024 */ lh $a0, 0x24($a1) /* 021EDC 800212DC AFA60020 */ sw $a2, 0x20($sp) -/* 021EE0 800212E0 0C00322D */ jal func_8000C8B4 +/* 021EE0 800212E0 0C00322D */ jal normalise_time /* 021EE4 800212E4 AFA5001C */ sw $a1, 0x1c($sp) /* 021EE8 800212E8 8FA5001C */ lw $a1, 0x1c($sp) /* 021EEC 800212EC 8FA60020 */ lw $a2, 0x20($sp) diff --git a/asm/non_matchings/objects/func_80022E18.s b/asm/non_matchings/objects/func_80022E18.s index e23ebe8d..b1eae65f 100644 --- a/asm/non_matchings/objects/func_80022E18.s +++ b/asm/non_matchings/objects/func_80022E18.s @@ -166,8 +166,8 @@ glabel func_80022E18 /* 023C80 80023080 3C018012 */ lui $at, %hi(D_8011ADB0) # $at, 0x8012 /* 023C84 80023084 AC20ADB0 */ sw $zero, %lo(D_8011ADB0)($at) /* 023C88 80023088 8FAF001C */ lw $t7, 0x1c($sp) -/* 023C8C 8002308C 3C018012 */ lui $at, %hi(D_8011ADB8) # $at, 0x8012 -/* 023C90 80023090 AC20ADB8 */ sw $zero, %lo(D_8011ADB8)($at) +/* 023C8C 8002308C 3C018012 */ lui $at, %hi(gRaceStartCountdown) # $at, 0x8012 +/* 023C90 80023090 AC20ADB8 */ sw $zero, %lo(gRaceStartCountdown)($at) /* 023C94 80023094 240D0014 */ li $t5, 20 /* 023C98 80023098 ADED0078 */ sw $t5, 0x78($t7) .L8002309C: diff --git a/asm/non_matchings/racer/func_80042D20.s b/asm/non_matchings/racer/func_80042D20.s index 09a8e29e..070d0950 100644 --- a/asm/non_matchings/racer/func_80042D20.s +++ b/asm/non_matchings/racer/func_80042D20.s @@ -134,8 +134,8 @@ glabel func_80042D20 /* 043A90 80042E90 A7AC0034 */ sh $t4, 0x34($sp) /* 043A94 80042E94 0C008D5A */ jal func_80023568 /* 043A98 80042E98 A7AD0078 */ sh $t5, 0x78($sp) -/* 043A9C 80042E9C 3C188012 */ lui $t8, %hi(D_8011D540) # $t8, 0x8012 -/* 043AA0 80042EA0 8F18D540 */ lw $t8, %lo(D_8011D540)($t8) +/* 043A9C 80042E9C 3C188012 */ lui $t8, %hi(gRaceStartTimer) # $t8, 0x8012 +/* 043AA0 80042EA0 8F18D540 */ lw $t8, %lo(gRaceStartTimer)($t8) /* 043AA4 80042EA4 87A80076 */ lh $t0, 0x76($sp) /* 043AA8 80042EA8 8FAA0060 */ lw $t2, 0x60($sp) /* 043AAC 80042EAC 87AC0034 */ lh $t4, 0x34($sp) @@ -361,8 +361,8 @@ glabel func_80042D20 /* 043DF4 800431F4 87AC0034 */ lh $t4, 0x34($sp) /* 043DF8 800431F8 87AD0078 */ lh $t5, 0x78($sp) /* 043DFC 800431FC 1440000F */ bnez $v0, .L8004323C -/* 043E00 80043200 3C0F8012 */ lui $t7, %hi(D_8011D540) # $t7, 0x8012 -/* 043E04 80043204 8DEFD540 */ lw $t7, %lo(D_8011D540)($t7) +/* 043E00 80043200 3C0F8012 */ lui $t7, %hi(gRaceStartTimer) # $t7, 0x8012 +/* 043E04 80043204 8DEFD540 */ lw $t7, %lo(gRaceStartTimer)($t7) /* 043E08 80043208 24010064 */ li $at, 100 /* 043E0C 8004320C 15E10022 */ bne $t7, $at, .L80043298 /* 043E10 80043210 00002025 */ move $a0, $zero @@ -900,8 +900,8 @@ glabel func_80042D20 /* 0445D8 800439D8 3338FFFB */ andi $t8, $t9, 0xfffb /* 0445DC 800439DC A2180209 */ sb $t8, 0x209($s0) .L800439E0: -/* 0445E0 800439E0 3C0F8012 */ lui $t7, %hi(D_8011D540) # $t7, 0x8012 -/* 0445E4 800439E4 8DEFD540 */ lw $t7, %lo(D_8011D540)($t7) +/* 0445E0 800439E0 3C0F8012 */ lui $t7, %hi(gRaceStartTimer) # $t7, 0x8012 +/* 0445E4 800439E4 8DEFD540 */ lw $t7, %lo(gRaceStartTimer)($t7) /* 0445E8 800439E8 8FB90054 */ lw $t9, 0x54($sp) /* 0445EC 800439EC 15E00050 */ bnez $t7, .L80043B30 /* 0445F0 800439F0 3C01800E */ lui $at, %hi(D_800E62B0 + 4) # $at, 0x800e @@ -1094,10 +1094,10 @@ glabel func_80042D20 /* 0448B4 80043CB4 E6120124 */ swc1 $f18, 0x124($s0) /* 0448B8 80043CB8 87AE0070 */ lh $t6, 0x70($sp) .L80043CBC: -/* 0448BC 80043CBC 3C0F8012 */ lui $t7, %hi(D_8011D540) # $t7, 0x8012 +/* 0448BC 80043CBC 3C0F8012 */ lui $t7, %hi(gRaceStartTimer) # $t7, 0x8012 /* 0448C0 80043CC0 11C00061 */ beqz $t6, .L80043E48 /* 0448C4 80043CC4 00000000 */ nop -/* 0448C8 80043CC8 8DEFD540 */ lw $t7, %lo(D_8011D540)($t7) +/* 0448C8 80043CC8 8DEFD540 */ lw $t7, %lo(gRaceStartTimer)($t7) /* 0448CC 80043CCC 3C038012 */ lui $v1, %hi(D_8011D5B8) # $v1, 0x8012 /* 0448D0 80043CD0 11E00006 */ beqz $t7, .L80043CEC /* 0448D4 80043CD4 2463D5B8 */ addiu $v1, %lo(D_8011D5B8) # addiu $v1, $v1, -0x2a48 diff --git a/asm/non_matchings/racer/func_8004447C.s b/asm/non_matchings/racer/func_8004447C.s index 31c06816..ac4faa9c 100644 --- a/asm/non_matchings/racer/func_8004447C.s +++ b/asm/non_matchings/racer/func_8004447C.s @@ -113,8 +113,8 @@ glabel func_8004447C /* 045204 80044604 3C018012 */ lui $at, %hi(gCurrentStickX) # $at, 0x8012 /* 045208 80044608 AC2ED534 */ sw $t6, %lo(gCurrentStickX)($at) .L8004460C: -/* 04520C 8004460C 3C0F8012 */ lui $t7, %hi(D_8011D540) # $t7, 0x8012 -/* 045210 80044610 8DEFD540 */ lw $t7, %lo(D_8011D540)($t7) +/* 04520C 8004460C 3C0F8012 */ lui $t7, %hi(gRaceStartTimer) # $t7, 0x8012 +/* 045210 80044610 8DEFD540 */ lw $t7, %lo(gRaceStartTimer)($t7) /* 045214 80044614 00000000 */ nop /* 045218 80044618 11E00002 */ beqz $t7, .L80044624 /* 04521C 8004461C 00000000 */ nop diff --git a/asm/non_matchings/racer/func_80046524.s b/asm/non_matchings/racer/func_80046524.s index d1c68e78..29a1566c 100644 --- a/asm/non_matchings/racer/func_80046524.s +++ b/asm/non_matchings/racer/func_80046524.s @@ -464,7 +464,7 @@ glabel func_80046524 /* 047714 80046B14 8E25000C */ lw $a1, 0xc($s1) /* 047718 80046B18 8E260010 */ lw $a2, 0x10($s1) /* 04771C 80046B1C 8E270014 */ lw $a3, 0x14($s1) -/* 047720 80046B20 0C0007AA */ jal func_80001EA8 +/* 047720 80046B20 0C0007AA */ jal play_sound_spatial /* 047724 80046B24 AFA00010 */ sw $zero, 0x10($sp) /* 047728 80046B28 02202025 */ move $a0, $s1 /* 04772C 80046B2C 24050162 */ li $a1, 354 @@ -472,7 +472,7 @@ glabel func_80046524 /* 047734 80046B34 0C015C2E */ jal func_800570B8 /* 047738 80046B38 24070082 */ li $a3, 130 .L80046B3C: -/* 04773C 80046B3C 0C00322D */ jal func_8000C8B4 +/* 04773C 80046B3C 0C00322D */ jal normalise_time /* 047740 80046B40 2404002D */ li $a0, 45 /* 047744 80046B44 920B020C */ lbu $t3, 0x20c($s0) /* 047748 80046B48 240A0002 */ li $t2, 2 @@ -1102,8 +1102,8 @@ glabel func_80046524 /* 048068 80047468 1040004B */ beqz $v0, .L80047598 /* 04806C 8004746C 02202025 */ move $a0, $s1 /* 048070 80047470 10A0001E */ beqz $a1, .L800474EC -/* 048074 80047474 3C188012 */ lui $t8, %hi(D_8011D540) # $t8, 0x8012 -/* 048078 80047478 8F18D540 */ lw $t8, %lo(D_8011D540)($t8) +/* 048074 80047474 3C188012 */ lui $t8, %hi(gRaceStartTimer) # $t8, 0x8012 +/* 048078 80047478 8F18D540 */ lw $t8, %lo(gRaceStartTimer)($t8) /* 04807C 8004747C 24010064 */ li $at, 100 /* 048080 80047480 1301002A */ beq $t8, $at, .L8004752C /* 048084 80047484 00000000 */ nop @@ -1116,7 +1116,7 @@ glabel func_80046524 /* 0480A0 800474A0 2605021C */ addiu $a1, $s0, 0x21c /* 0480A4 800474A4 A3A700AD */ sb $a3, 0xad($sp) /* 0480A8 800474A8 A3A900AF */ sb $t1, 0xaf($sp) -/* 0480AC 800474AC 0C000741 */ jal func_80001D04 +/* 0480AC 800474AC 0C000741 */ jal play_sound_global /* 0480B0 800474B0 E7B20104 */ swc1 $f18, 0x104($sp) /* 0480B4 800474B4 820601E0 */ lb $a2, 0x1e0($s0) /* 0480B8 800474B8 8E05021C */ lw $a1, 0x21c($s0) @@ -1139,7 +1139,7 @@ glabel func_80046524 /* 0480F8 800474F8 240500AF */ li $a1, 175 /* 0480FC 800474FC A3A700AD */ sb $a3, 0xad($sp) /* 048100 80047500 A3A900AF */ sb $t1, 0xaf($sp) -/* 048104 80047504 0C015C12 */ jal func_80057048 +/* 048104 80047504 0C015C12 */ jal racer_play_sound /* 048108 80047508 E7B20104 */ swc1 $f18, 0x104($sp) /* 04810C 8004750C 8E2B0074 */ lw $t3, 0x74($s1) /* 048110 80047510 83A700AD */ lb $a3, 0xad($sp) @@ -1183,7 +1183,7 @@ glabel func_80046524 /* 048198 80047598 02002825 */ move $a1, $s0 /* 04819C 8004759C A3A700AD */ sb $a3, 0xad($sp) /* 0481A0 800475A0 A3A900AF */ sb $t1, 0xaf($sp) -/* 0481A4 800475A4 0C015C88 */ jal func_80057220 +/* 0481A4 800475A4 0C015C88 */ jal handle_racer_top_speed /* 0481A8 800475A8 E7B20104 */ swc1 $f18, 0x104($sp) /* 0481AC 800475AC 3C01800E */ lui $at, %hi(D_800E6410 + 4) # $at, 0x800e /* 0481B0 800475B0 C4296410 */ lwc1 $f9, %lo(D_800E6410)($at) @@ -1198,8 +1198,8 @@ glabel func_80046524 /* 0481D4 800475D4 83A900AF */ lb $t1, 0xaf($sp) /* 0481D8 800475D8 18600019 */ blez $v1, .L80047640 /* 0481DC 800475DC 462034A0 */ cvt.s.d $f18, $f6 -/* 0481E0 800475E0 3C028012 */ lui $v0, %hi(D_8011D540) # $v0, 0x8012 -/* 0481E4 800475E4 8C42D540 */ lw $v0, %lo(D_8011D540)($v0) +/* 0481E0 800475E0 3C028012 */ lui $v0, %hi(gRaceStartTimer) # $v0, 0x8012 +/* 0481E4 800475E4 8C42D540 */ lw $v0, %lo(gRaceStartTimer)($v0) /* 0481E8 800475E8 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 0481EC 800475EC 14400018 */ bnez $v0, .L80047650 /* 0481F0 800475F0 00000000 */ nop @@ -1217,16 +1217,16 @@ glabel func_80046524 /* 048220 80047620 00000000 */ nop .L80047624: /* 048224 80047624 8FB80128 */ lw $t8, 0x128($sp) -/* 048228 80047628 3C028012 */ lui $v0, %hi(D_8011D540) # $v0, 0x8012 +/* 048228 80047628 3C028012 */ lui $v0, %hi(gRaceStartTimer) # $v0, 0x8012 /* 04822C 8004762C 00786823 */ subu $t5, $v1, $t8 /* 048230 80047630 A20D01D3 */ sb $t5, 0x1d3($s0) -/* 048234 80047634 8C42D540 */ lw $v0, %lo(D_8011D540)($v0) +/* 048234 80047634 8C42D540 */ lw $v0, %lo(gRaceStartTimer)($v0) /* 048238 80047638 10000005 */ b .L80047650 /* 04823C 8004763C 00000000 */ nop .L80047640: /* 048240 80047640 A20001D3 */ sb $zero, 0x1d3($s0) -/* 048244 80047644 3C028012 */ lui $v0, %hi(D_8011D540) # $v0, 0x8012 -/* 048248 80047648 8C42D540 */ lw $v0, %lo(D_8011D540)($v0) +/* 048244 80047644 3C028012 */ lui $v0, %hi(gRaceStartTimer) # $v0, 0x8012 +/* 048248 80047648 8C42D540 */ lw $v0, %lo(gRaceStartTimer)($v0) /* 04824C 8004764C 00000000 */ nop .L80047650: /* 048250 80047650 10400003 */ beqz $v0, .L80047660 @@ -1260,7 +1260,7 @@ glabel func_80046524 /* 0482B8 800476B8 24010003 */ li $at, 3 /* 0482BC 800476BC 1521001B */ bne $t1, $at, .L8004772C /* 0482C0 800476C0 2404002D */ li $a0, 45 -/* 0482C4 800476C4 0C00322D */ jal func_8000C8B4 +/* 0482C4 800476C4 0C00322D */ jal normalise_time /* 0482C8 800476C8 E7B20104 */ swc1 $f18, 0x104($sp) /* 0482CC 800476CC 920E020C */ lbu $t6, 0x20c($s0) /* 0482D0 800476D0 C7B20104 */ lwc1 $f18, 0x104($sp) @@ -1275,7 +1275,7 @@ glabel func_80046524 .L800476F4: /* 0482F4 800476F4 02202025 */ move $a0, $s1 /* 0482F8 800476F8 24050107 */ li $a1, 263 -/* 0482FC 800476FC 0C015C12 */ jal func_80057048 +/* 0482FC 800476FC 0C015C12 */ jal racer_play_sound /* 048300 80047700 E7B20104 */ swc1 $f18, 0x104($sp) /* 048304 80047704 02202025 */ move $a0, $s1 /* 048308 80047708 24050162 */ li $a1, 354 @@ -1676,10 +1676,10 @@ glabel func_80046524 /* 0488E8 80047CE8 13200031 */ beqz $t9, .L80047DB0 /* 0488EC 80047CEC 00000000 */ nop /* 0488F0 80047CF0 814AD584 */ lb $t2, %lo(D_8011D584)($t2) -/* 0488F4 80047CF4 3C0C8012 */ lui $t4, %hi(D_8011D540) # $t4, 0x8012 +/* 0488F4 80047CF4 3C0C8012 */ lui $t4, %hi(gRaceStartTimer) # $t4, 0x8012 /* 0488F8 80047CF8 1540002D */ bnez $t2, .L80047DB0 /* 0488FC 80047CFC 00000000 */ nop -/* 048900 80047D00 8D8CD540 */ lw $t4, %lo(D_8011D540)($t4) +/* 048900 80047D00 8D8CD540 */ lw $t4, %lo(gRaceStartTimer)($t4) /* 048904 80047D04 C7A8012C */ lwc1 $f8, 0x12c($sp) /* 048908 80047D08 15800029 */ bnez $t4, .L80047DB0 /* 04890C 80047D0C 3C018012 */ lui $at, %hi(D_8011D56C) # $at, 0x8012 @@ -2577,8 +2577,8 @@ glabel func_80046524 /* 049618 80048A18 00AC5821 */ addu $t3, $a1, $t4 /* 04961C 80048A1C A60B01A4 */ sh $t3, 0x1a4($s0) .L80048A20: -/* 049620 80048A20 3C0E8012 */ lui $t6, %hi(D_8011D540) # $t6, 0x8012 -/* 049624 80048A24 8DCED540 */ lw $t6, %lo(D_8011D540)($t6) +/* 049620 80048A20 3C0E8012 */ lui $t6, %hi(gRaceStartTimer) # $t6, 0x8012 +/* 049624 80048A24 8DCED540 */ lw $t6, %lo(gRaceStartTimer)($t6) /* 049628 80048A28 3C0D8012 */ lui $t5, %hi(gActivePlayerButtonPress) # $t5, 0x8012 /* 04962C 80048A2C 11C00007 */ beqz $t6, .L80048A4C /* 049630 80048A30 02202025 */ move $a0, $s1 diff --git a/asm/non_matchings/racer/func_80048C7C.s b/asm/non_matchings/racer/func_80048C7C.s index aab88adb..f48c9f44 100644 --- a/asm/non_matchings/racer/func_80048C7C.s +++ b/asm/non_matchings/racer/func_80048C7C.s @@ -135,7 +135,7 @@ glabel L80048E18 /* 049A3C 80048E3C 462A4400 */ add.d $f16, $f8, $f10 /* 049A40 80048E40 24050139 */ li $a1, 313 /* 049A44 80048E44 462084A0 */ cvt.s.d $f18, $f16 -/* 049A48 80048E48 0C015C12 */ jal func_80057048 +/* 049A48 80048E48 0C015C12 */ jal racer_play_sound /* 049A4C 80048E4C E4920020 */ swc1 $f18, 0x20($a0) .L80048E50: glabel L80048E50 diff --git a/asm/non_matchings/racer/func_80049794.s b/asm/non_matchings/racer/func_80049794.s index 0cf9733e..4bf42ac9 100644 --- a/asm/non_matchings/racer/func_80049794.s +++ b/asm/non_matchings/racer/func_80049794.s @@ -90,7 +90,7 @@ glabel func_80049794 /* 04A41C 8004981C 24040240 */ li $a0, 576 /* 04A420 80049820 17000006 */ bnez $t8, .L8004983C /* 04A424 80049824 00000000 */ nop -/* 04A428 80049828 0C000741 */ jal func_80001D04 +/* 04A428 80049828 0C000741 */ jal play_sound_global /* 04A42C 8004982C 00002825 */ move $a1, $zero /* 04A430 80049830 24190014 */ li $t9, 20 /* 04A434 80049834 44807000 */ mtc1 $zero, $f14 @@ -867,7 +867,7 @@ glabel func_80049794 /* 04AF74 8004A374 2404002D */ li $a0, 45 /* 04AF78 8004A378 E7A10048 */ swc1 $f1, 0x48($sp) /* 04AF7C 8004A37C E7A0004C */ swc1 $f0, 0x4c($sp) -/* 04AF80 8004A380 0C00322D */ jal func_8000C8B4 +/* 04AF80 8004A380 0C00322D */ jal normalise_time /* 04AF84 8004A384 E7AE00DC */ swc1 $f14, 0xdc($sp) /* 04AF88 8004A388 9218020C */ lbu $t8, 0x20c($s0) /* 04AF8C 8004A38C C7A10048 */ lwc1 $f1, 0x48($sp) @@ -886,7 +886,7 @@ glabel func_80049794 /* 04AFBC 8004A3BC 24050107 */ li $a1, 263 /* 04AFC0 8004A3C0 E7A10048 */ swc1 $f1, 0x48($sp) /* 04AFC4 8004A3C4 E7A0004C */ swc1 $f0, 0x4c($sp) -/* 04AFC8 8004A3C8 0C015C12 */ jal func_80057048 +/* 04AFC8 8004A3C8 0C015C12 */ jal racer_play_sound /* 04AFCC 8004A3CC E7AE00DC */ swc1 $f14, 0xdc($sp) /* 04AFD0 8004A3D0 02202025 */ move $a0, $s1 /* 04AFD4 8004A3D4 24050162 */ li $a1, 354 @@ -1009,7 +1009,7 @@ glabel func_80049794 /* 04B188 8004A588 920201FE */ lbu $v0, 0x1fe($s0) /* 04B18C 8004A58C C7AE00DC */ lwc1 $f14, 0xdc($sp) /* 04B190 8004A590 14400008 */ bnez $v0, .L8004A5B4 -/* 04B194 8004A594 3C0C8012 */ lui $t4, %hi(D_8011D540) # $t4, 0x8012 +/* 04B194 8004A594 3C0C8012 */ lui $t4, %hi(gRaceStartTimer) # $t4, 0x8012 /* 04B198 8004A598 8E380074 */ lw $t8, 0x74($s1) /* 04B19C 8004A59C 3C0140B0 */ li $at, 0x40B00000 # 5.500000 /* 04B1A0 8004A5A0 37190100 */ ori $t9, $t8, 0x100 @@ -1066,7 +1066,7 @@ glabel func_80049794 /* 04B260 8004A660 4481A000 */ mtc1 $at, $f20 /* 04B264 8004A664 00000000 */ nop .L8004A668: -/* 04B268 8004A668 8D8CD540 */ lw $t4, %lo(D_8011D540)($t4) +/* 04B268 8004A668 8D8CD540 */ lw $t4, %lo(gRaceStartTimer)($t4) /* 04B26C 8004A66C 00000000 */ nop /* 04B270 8004A670 11800003 */ beqz $t4, .L8004A680 /* 04B274 8004A674 3C013F80 */ li $at, 0x3F800000 # 1.000000 @@ -1147,7 +1147,7 @@ glabel func_80049794 /* 04B384 8004A784 8E260010 */ lw $a2, 0x10($s1) /* 04B388 8004A788 8E270014 */ lw $a3, 0x14($s1) /* 04B38C 8004A78C E7AE00DC */ swc1 $f14, 0xdc($sp) -/* 04B390 8004A790 0C0007AA */ jal func_80001EA8 +/* 04B390 8004A790 0C0007AA */ jal play_sound_spatial /* 04B394 8004A794 AFA00010 */ sw $zero, 0x10($sp) /* 04B398 8004A798 02202025 */ move $a0, $s1 /* 04B39C 8004A79C 24050162 */ li $a1, 354 @@ -1158,7 +1158,7 @@ glabel func_80049794 /* 04B3B0 8004A7B0 00000000 */ nop .L8004A7B4: /* 04B3B4 8004A7B4 2404002D */ li $a0, 45 -/* 04B3B8 8004A7B8 0C00322D */ jal func_8000C8B4 +/* 04B3B8 8004A7B8 0C00322D */ jal normalise_time /* 04B3BC 8004A7BC E7AE00DC */ swc1 $f14, 0xdc($sp) /* 04B3C0 8004A7C0 920D020C */ lbu $t5, 0x20c($s0) /* 04B3C4 8004A7C4 C7AE00DC */ lwc1 $f14, 0xdc($sp) @@ -1292,7 +1292,7 @@ glabel func_80049794 .L8004A990: /* 04B590 8004A990 02202025 */ move $a0, $s1 /* 04B594 8004A994 2405000C */ li $a1, 12 -/* 04B598 8004A998 0C015C12 */ jal func_80057048 +/* 04B598 8004A998 0C015C12 */ jal racer_play_sound /* 04B59C 8004A99C E7AE00DC */ swc1 $f14, 0xdc($sp) /* 04B5A0 8004A9A0 860F0000 */ lh $t7, ($s0) /* 04B5A4 8004A9A4 C7AE00DC */ lwc1 $f14, 0xdc($sp) @@ -1485,7 +1485,7 @@ glabel func_80049794 /* 04B850 8004AC50 A20001E0 */ sb $zero, 0x1e0($s0) /* 04B854 8004AC54 A6200002 */ sh $zero, 2($s1) /* 04B858 8004AC58 E7AE00DC */ swc1 $f14, 0xdc($sp) -/* 04B85C 8004AC5C 0C00322D */ jal func_8000C8B4 +/* 04B85C 8004AC5C 0C00322D */ jal normalise_time /* 04B860 8004AC60 AFA800B8 */ sw $t0, 0xb8($sp) /* 04B864 8004AC64 920B020C */ lbu $t3, 0x20c($s0) /* 04B868 8004AC68 8FA800B8 */ lw $t0, 0xb8($sp) @@ -1532,7 +1532,7 @@ glabel func_80049794 /* 04B8FC 8004ACFC A20001E0 */ sb $zero, 0x1e0($s0) /* 04B900 8004AD00 A6200002 */ sh $zero, 2($s1) /* 04B904 8004AD04 E7AE00DC */ swc1 $f14, 0xdc($sp) -/* 04B908 8004AD08 0C00322D */ jal func_8000C8B4 +/* 04B908 8004AD08 0C00322D */ jal normalise_time /* 04B90C 8004AD0C AFA800B8 */ sw $t0, 0xb8($sp) /* 04B910 8004AD10 920E020C */ lbu $t6, 0x20c($s0) /* 04B914 8004AD14 8FA800B8 */ lw $t0, 0xb8($sp) @@ -1974,7 +1974,7 @@ glabel func_80049794 .L8004B378: /* 04BF78 8004B378 02002825 */ move $a1, $s0 .L8004B37C: -/* 04BF7C 8004B37C 0C015C88 */ jal func_80057220 +/* 04BF7C 8004B37C 0C015C88 */ jal handle_racer_top_speed /* 04BF80 8004B380 E7AE00DC */ swc1 $f14, 0xdc($sp) /* 04BF84 8004B384 C7AE00DC */ lwc1 $f14, 0xdc($sp) /* 04BF88 8004B388 3C01800E */ lui $at, %hi(D_800E6518 + 4) # $at, 0x800e @@ -1986,8 +1986,8 @@ glabel func_80049794 /* 04BFA0 8004B3A0 46283282 */ mul.d $f10, $f6, $f8 /* 04BFA4 8004B3A4 18400012 */ blez $v0, .L8004B3F0 /* 04BFA8 8004B3A8 462053A0 */ cvt.s.d $f14, $f10 -/* 04BFAC 8004B3AC 3C0D8012 */ lui $t5, %hi(D_8011D540) # $t5, 0x8012 -/* 04BFB0 8004B3B0 8DADD540 */ lw $t5, %lo(D_8011D540)($t5) +/* 04BFAC 8004B3AC 3C0D8012 */ lui $t5, %hi(gRaceStartTimer) # $t5, 0x8012 +/* 04BFB0 8004B3B0 8DADD540 */ lw $t5, %lo(gRaceStartTimer)($t5) /* 04BFB4 8004B3B4 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 04BFB8 8004B3B8 15A0000E */ bnez $t5, .L8004B3F4 /* 04BFBC 8004B3BC 00000000 */ nop @@ -2009,8 +2009,8 @@ glabel func_80049794 /* 04BFF4 8004B3F4 921901F5 */ lbu $t9, 0x1f5($s0) /* 04BFF8 8004B3F8 00000000 */ nop /* 04BFFC 8004B3FC 17200128 */ bnez $t9, .L8004B8A0 -/* 04C000 8004B400 3C0F8012 */ lui $t7, %hi(D_8011D540) # $t7, 0x8012 -/* 04C004 8004B404 8DEFD540 */ lw $t7, %lo(D_8011D540)($t7) +/* 04C000 8004B400 3C0F8012 */ lui $t7, %hi(gRaceStartTimer) # $t7, 0x8012 +/* 04C004 8004B404 8DEFD540 */ lw $t7, %lo(gRaceStartTimer)($t7) /* 04C008 8004B408 00000000 */ nop /* 04C00C 8004B40C 15E00124 */ bnez $t7, .L8004B8A0 /* 04C010 8004B410 00000000 */ nop @@ -2482,8 +2482,8 @@ glabel func_80049794 /* 04C6EC 8004BAEC 820F01D7 */ lb $t7, 0x1d7($s0) /* 04C6F0 8004BAF0 2401000D */ li $at, 13 /* 04C6F4 8004BAF4 15E10005 */ bne $t7, $at, .L8004BB0C -/* 04C6F8 8004BAF8 3C0D8012 */ lui $t5, %hi(D_8011D540) # $t5, 0x8012 -/* 04C6FC 8004BAFC 8DADD540 */ lw $t5, %lo(D_8011D540)($t5) +/* 04C6F8 8004BAF8 3C0D8012 */ lui $t5, %hi(gRaceStartTimer) # $t5, 0x8012 +/* 04C6FC 8004BAFC 8DADD540 */ lw $t5, %lo(gRaceStartTimer)($t5) /* 04C700 8004BB00 00000000 */ nop /* 04C704 8004BB04 11A0000B */ beqz $t5, .L8004BB34 /* 04C708 8004BB08 00000000 */ nop @@ -2523,7 +2523,7 @@ glabel func_80049794 /* 04C780 8004BB80 02202025 */ move $a0, $s1 /* 04C784 8004BB84 11C0000D */ beqz $t6, .L8004BBBC /* 04C788 8004BB88 2405000C */ li $a1, 12 -/* 04C78C 8004BB8C 0C015C12 */ jal func_80057048 +/* 04C78C 8004BB8C 0C015C12 */ jal racer_play_sound /* 04C790 8004BB90 E7AC00EC */ swc1 $f12, 0xec($sp) /* 04C794 8004BB94 86180000 */ lh $t8, ($s0) /* 04C798 8004BB98 C7AC00EC */ lwc1 $f12, 0xec($sp) @@ -2537,7 +2537,7 @@ glabel func_80049794 /* 04C7B8 8004BBB8 E5840030 */ swc1 $f4, 0x30($t4) .L8004BBBC: /* 04C7BC 8004BBBC 820201D2 */ lb $v0, 0x1d2($s0) -/* 04C7C0 8004BBC0 3C0B8012 */ lui $t3, %hi(D_8011D540) # $t3, 0x8012 +/* 04C7C0 8004BBC0 3C0B8012 */ lui $t3, %hi(gRaceStartTimer) # $t3, 0x8012 /* 04C7C4 8004BBC4 1040000B */ beqz $v0, .L8004BBF4 /* 04C7C8 8004BBC8 3C058012 */ lui $a1, %hi(D_8011D510) # $a1, 0x8012 /* 04C7CC 8004BBCC 8FB900F8 */ lw $t9, 0xf8($sp) @@ -2576,7 +2576,7 @@ glabel func_80049794 /* 04C84C 8004BC4C 46004302 */ mul.s $f12, $f8, $f0 /* 04C850 8004BC50 00000000 */ nop .L8004BC54: -/* 04C854 8004BC54 8D6BD540 */ lw $t3, %lo(D_8011D540)($t3) +/* 04C854 8004BC54 8D6BD540 */ lw $t3, %lo(gRaceStartTimer)($t3) /* 04C858 8004BC58 24010064 */ li $at, 100 /* 04C85C 8004BC5C 15610005 */ bne $t3, $at, .L8004BC74 /* 04C860 8004BC60 24A5D510 */ addiu $a1, %lo(D_8011D510) # addiu $a1, $a1, -0x2af0 diff --git a/asm/non_matchings/racer/func_8004CC20.s b/asm/non_matchings/racer/func_8004CC20.s index 39526a75..f05c9057 100644 --- a/asm/non_matchings/racer/func_8004CC20.s +++ b/asm/non_matchings/racer/func_8004CC20.s @@ -33,7 +33,7 @@ glabel func_8004CC20 /* 04D86C 8004CC6C 240E0008 */ li $t6, 8 /* 04D870 8004CC70 A20E01D3 */ sb $t6, 0x1d3($s0) /* 04D874 8004CC74 02202025 */ move $a0, $s1 -/* 04D878 8004CC78 0C015C12 */ jal func_80057048 +/* 04D878 8004CC78 0C015C12 */ jal racer_play_sound /* 04D87C 8004CC7C 24050107 */ li $a1, 263 /* 04D880 8004CC80 820201D3 */ lb $v0, 0x1d3($s0) /* 04D884 8004CC84 00000000 */ nop diff --git a/asm/non_matchings/racer/func_8004DE38.s b/asm/non_matchings/racer/func_8004DE38.s index dfd8839d..7caa8a0e 100644 --- a/asm/non_matchings/racer/func_8004DE38.s +++ b/asm/non_matchings/racer/func_8004DE38.s @@ -41,9 +41,9 @@ glabel func_8004DE38 /* 04EA68 8004DE68 A020D581 */ sb $zero, %lo(D_8011D581)($at) /* 04EA6C 8004DE6C 3C014049 */ li $at, 0x40490000 # 3.140625 /* 04EA70 8004DE70 44811800 */ mtc1 $at, $f3 -/* 04EA74 8004DE74 3C018012 */ lui $at, %hi(D_8011D540) # $at, 0x8012 +/* 04EA74 8004DE74 3C018012 */ lui $at, %hi(gRaceStartTimer) # $at, 0x8012 /* 04EA78 8004DE78 8FA300B4 */ lw $v1, 0xb4($sp) -/* 04EA7C 8004DE7C AC22D540 */ sw $v0, %lo(D_8011D540)($at) +/* 04EA7C 8004DE7C AC22D540 */ sw $v0, %lo(gRaceStartTimer)($at) /* 04EA80 8004DE80 C626001C */ lwc1 $f6, 0x1c($s1) /* 04EA84 8004DE84 44801000 */ mtc1 $zero, $f2 /* 04EA88 8004DE88 44832000 */ mtc1 $v1, $f4 @@ -221,8 +221,8 @@ glabel func_8004DE38 /* 04ECF4 8004E0F4 1000059D */ b .L8004F76C /* 04ECF8 8004E0F8 8FBF002C */ lw $ra, 0x2c($sp) .L8004E0FC: -/* 04ECFC 8004E0FC 3C0B8012 */ lui $t3, %hi(D_8011D540) # $t3, 0x8012 -/* 04ED00 8004E100 8D6BD540 */ lw $t3, %lo(D_8011D540)($t3) +/* 04ECFC 8004E0FC 3C0B8012 */ lui $t3, %hi(gRaceStartTimer) # $t3, 0x8012 +/* 04ED00 8004E100 8D6BD540 */ lw $t3, %lo(gRaceStartTimer)($t3) /* 04ED04 8004E104 00000000 */ nop /* 04ED08 8004E108 15600017 */ bnez $t3, .L8004E168 /* 04ED0C 8004E10C 00002025 */ move $a0, $zero @@ -262,8 +262,8 @@ glabel func_8004DE38 .L8004E18C: /* 04ED8C 8004E18C 0C01B683 */ jal get_render_context /* 04ED90 8004E190 00000000 */ nop -/* 04ED94 8004E194 3C0D8012 */ lui $t5, %hi(D_8011D540) # $t5, 0x8012 -/* 04ED98 8004E198 8DADD540 */ lw $t5, %lo(D_8011D540)($t5) +/* 04ED94 8004E194 3C0D8012 */ lui $t5, %hi(gRaceStartTimer) # $t5, 0x8012 +/* 04ED98 8004E198 8DADD540 */ lw $t5, %lo(gRaceStartTimer)($t5) /* 04ED9C 8004E19C AFA200A4 */ sw $v0, 0xa4($sp) /* 04EDA0 8004E1A0 15A00010 */ bnez $t5, .L8004E1E4 /* 04EDA4 8004E1A4 3C028012 */ lui $v0, %hi(D_8011D544) # $v0, 0x8012 @@ -642,8 +642,8 @@ glabel func_8004DE38 /* 04F31C 8004E71C 0C019944 */ jal func_80066510 /* 04F320 8004E720 00000000 */ nop /* 04F324 8004E724 14400014 */ bnez $v0, .L8004E778 -/* 04F328 8004E728 3C0D8012 */ lui $t5, %hi(D_8011D540) # $t5, 0x8012 -/* 04F32C 8004E72C 8DADD540 */ lw $t5, %lo(D_8011D540)($t5) +/* 04F328 8004E728 3C0D8012 */ lui $t5, %hi(gRaceStartTimer) # $t5, 0x8012 +/* 04F32C 8004E72C 8DADD540 */ lw $t5, %lo(gRaceStartTimer)($t5) /* 04F330 8004E730 24010064 */ li $at, 100 /* 04F334 8004E734 11A10010 */ beq $t5, $at, .L8004E778 /* 04F338 8004E738 00000000 */ nop @@ -751,8 +751,8 @@ glabel func_8004DE38 /* 04F4B0 8004E8B0 0C015B8B */ jal func_80056E2C /* 04F4B4 8004E8B4 02002825 */ move $a1, $s0 .L8004E8B8: -/* 04F4B8 8004E8B8 3C038012 */ lui $v1, %hi(D_8011D540) # $v1, 0x8012 -/* 04F4BC 8004E8BC 8C63D540 */ lw $v1, %lo(D_8011D540)($v1) +/* 04F4B8 8004E8B8 3C038012 */ lui $v1, %hi(gRaceStartTimer) # $v1, 0x8012 +/* 04F4BC 8004E8BC 8C63D540 */ lw $v1, %lo(gRaceStartTimer)($v1) /* 04F4C0 8004E8C0 00000000 */ nop /* 04F4C4 8004E8C4 10600010 */ beqz $v1, .L8004E908 /* 04F4C8 8004E8C8 00000000 */ nop @@ -782,7 +782,7 @@ glabel func_8004DE38 /* 04F520 8004E920 012B082A */ slt $at, $t1, $t3 /* 04F524 8004E924 10200015 */ beqz $at, .L8004E97C /* 04F528 8004E928 00000000 */ nop -/* 04F52C 8004E92C 0C00322D */ jal func_8000C8B4 +/* 04F52C 8004E92C 0C00322D */ jal normalise_time /* 04F530 8004E930 34048CA0 */ li $a0, 36000 /* 04F534 8004E934 820D0194 */ lb $t5, 0x194($s0) /* 04F538 8004E938 8FA500B4 */ lw $a1, 0xb4($sp) @@ -796,7 +796,7 @@ glabel func_8004DE38 /* 04F558 8004E958 10000008 */ b .L8004E97C /* 04F55C 8004E95C AC6F0128 */ sw $t7, 0x128($v1) .L8004E960: -/* 04F560 8004E960 0C00322D */ jal func_8000C8B4 +/* 04F560 8004E960 0C00322D */ jal normalise_time /* 04F564 8004E964 34048CA0 */ li $a0, 36000 /* 04F568 8004E968 82080194 */ lb $t0, 0x194($s0) /* 04F56C 8004E96C 00000000 */ nop @@ -987,8 +987,8 @@ glabel L8004EBF4 glabel L8004EC10 /* 04F810 8004EC10 3C0B8012 */ lui $t3, %hi(gCurrentCarInput) # $t3, 0x8012 /* 04F814 8004EC14 3C0D8012 */ lui $t5, %hi(gActivePlayerButtonPress) # $t5, 0x8012 -/* 04F818 8004EC18 3C0C8012 */ lui $t4, %hi(D_8011D540) # $t4, 0x8012 -/* 04F81C 8004EC1C 258CD540 */ addiu $t4, %lo(D_8011D540) # addiu $t4, $t4, -0x2ac0 +/* 04F818 8004EC18 3C0C8012 */ lui $t4, %hi(gRaceStartTimer) # $t4, 0x8012 +/* 04F81C 8004EC1C 258CD540 */ addiu $t4, %lo(gRaceStartTimer) # addiu $t4, $t4, -0x2ac0 /* 04F820 8004EC20 25ADD52C */ addiu $t5, %lo(gActivePlayerButtonPress) # addiu $t5, $t5, -0x2ad4 /* 04F824 8004EC24 256BD528 */ addiu $t3, %lo(gCurrentCarInput) # addiu $t3, $t3, -0x2ad8 /* 04F828 8004EC28 8FA400B4 */ lw $a0, 0xb4($sp) @@ -1004,8 +1004,8 @@ glabel L8004EC10 glabel L8004EC50 /* 04F850 8004EC50 3C0E8012 */ lui $t6, %hi(gCurrentCarInput) # $t6, 0x8012 /* 04F854 8004EC54 3C0F8012 */ lui $t7, %hi(gActivePlayerButtonPress) # $t7, 0x8012 -/* 04F858 8004EC58 3C088012 */ lui $t0, %hi(D_8011D540) # $t0, 0x8012 -/* 04F85C 8004EC5C 2508D540 */ addiu $t0, %lo(D_8011D540) # addiu $t0, $t0, -0x2ac0 +/* 04F858 8004EC58 3C088012 */ lui $t0, %hi(gRaceStartTimer) # $t0, 0x8012 +/* 04F85C 8004EC5C 2508D540 */ addiu $t0, %lo(gRaceStartTimer) # addiu $t0, $t0, -0x2ac0 /* 04F860 8004EC60 25EFD52C */ addiu $t7, %lo(gActivePlayerButtonPress) # addiu $t7, $t7, -0x2ad4 /* 04F864 8004EC64 25CED528 */ addiu $t6, %lo(gCurrentCarInput) # addiu $t6, $t6, -0x2ad8 /* 04F868 8004EC68 8FA400B4 */ lw $a0, 0xb4($sp) @@ -1021,8 +1021,8 @@ glabel L8004EC50 glabel L8004EC90 /* 04F890 8004EC90 3C188012 */ lui $t8, %hi(gCurrentCarInput) # $t8, 0x8012 /* 04F894 8004EC94 3C198012 */ lui $t9, %hi(gCurrentStickX) # $t9, 0x8012 -/* 04F898 8004EC98 3C0A8012 */ lui $t2, %hi(D_8011D540) # $t2, 0x8012 -/* 04F89C 8004EC9C 254AD540 */ addiu $t2, %lo(D_8011D540) # addiu $t2, $t2, -0x2ac0 +/* 04F898 8004EC98 3C0A8012 */ lui $t2, %hi(gRaceStartTimer) # $t2, 0x8012 +/* 04F89C 8004EC9C 254AD540 */ addiu $t2, %lo(gRaceStartTimer) # addiu $t2, $t2, -0x2ac0 /* 04F8A0 8004ECA0 2739D534 */ addiu $t9, %lo(gCurrentStickX) # addiu $t9, $t9, -0x2acc /* 04F8A4 8004ECA4 2718D528 */ addiu $t8, %lo(gCurrentCarInput) # addiu $t8, $t8, -0x2ad8 /* 04F8A8 8004ECA8 8FA400B4 */ lw $a0, 0xb4($sp) @@ -1038,8 +1038,8 @@ glabel L8004EC90 glabel L8004ECD0 /* 04F8D0 8004ECD0 3C098012 */ lui $t1, %hi(gCurrentCarInput) # $t1, 0x8012 /* 04F8D4 8004ECD4 3C0B8012 */ lui $t3, %hi(gActivePlayerButtonPress) # $t3, 0x8012 -/* 04F8D8 8004ECD8 3C0D8012 */ lui $t5, %hi(D_8011D540) # $t5, 0x8012 -/* 04F8DC 8004ECDC 25ADD540 */ addiu $t5, %lo(D_8011D540) # addiu $t5, $t5, -0x2ac0 +/* 04F8D8 8004ECD8 3C0D8012 */ lui $t5, %hi(gRaceStartTimer) # $t5, 0x8012 +/* 04F8DC 8004ECDC 25ADD540 */ addiu $t5, %lo(gRaceStartTimer) # addiu $t5, $t5, -0x2ac0 /* 04F8E0 8004ECE0 256BD52C */ addiu $t3, %lo(gActivePlayerButtonPress) # addiu $t3, $t3, -0x2ad4 /* 04F8E4 8004ECE4 2529D528 */ addiu $t1, %lo(gCurrentCarInput) # addiu $t1, $t1, -0x2ad8 /* 04F8E8 8004ECE8 8FA400B4 */ lw $a0, 0xb4($sp) @@ -1055,8 +1055,8 @@ glabel L8004ECD0 glabel L8004ED10 /* 04F910 8004ED10 3C0C8012 */ lui $t4, %hi(gCurrentCarInput) # $t4, 0x8012 /* 04F914 8004ED14 3C0E8012 */ lui $t6, %hi(gActivePlayerButtonPress) # $t6, 0x8012 -/* 04F918 8004ED18 3C0F8012 */ lui $t7, %hi(D_8011D540) # $t7, 0x8012 -/* 04F91C 8004ED1C 25EFD540 */ addiu $t7, %lo(D_8011D540) # addiu $t7, $t7, -0x2ac0 +/* 04F918 8004ED18 3C0F8012 */ lui $t7, %hi(gRaceStartTimer) # $t7, 0x8012 +/* 04F91C 8004ED1C 25EFD540 */ addiu $t7, %lo(gRaceStartTimer) # addiu $t7, $t7, -0x2ac0 /* 04F920 8004ED20 25CED52C */ addiu $t6, %lo(gActivePlayerButtonPress) # addiu $t6, $t6, -0x2ad4 /* 04F924 8004ED24 258CD528 */ addiu $t4, %lo(gCurrentCarInput) # addiu $t4, $t4, -0x2ad8 /* 04F928 8004ED28 8FA400B4 */ lw $a0, 0xb4($sp) @@ -1072,8 +1072,8 @@ glabel L8004ED10 glabel L8004ED50 /* 04F950 8004ED50 3C088012 */ lui $t0, %hi(gCurrentCarInput) # $t0, 0x8012 /* 04F954 8004ED54 3C188012 */ lui $t8, %hi(gActivePlayerButtonPress) # $t8, 0x8012 -/* 04F958 8004ED58 3C198012 */ lui $t9, %hi(D_8011D540) # $t9, 0x8012 -/* 04F95C 8004ED5C 2739D540 */ addiu $t9, %lo(D_8011D540) # addiu $t9, $t9, -0x2ac0 +/* 04F958 8004ED58 3C198012 */ lui $t9, %hi(gRaceStartTimer) # $t9, 0x8012 +/* 04F95C 8004ED5C 2739D540 */ addiu $t9, %lo(gRaceStartTimer) # addiu $t9, $t9, -0x2ac0 /* 04F960 8004ED60 2718D52C */ addiu $t8, %lo(gActivePlayerButtonPress) # addiu $t8, $t8, -0x2ad4 /* 04F964 8004ED64 2508D528 */ addiu $t0, %lo(gCurrentCarInput) # addiu $t0, $t0, -0x2ad8 /* 04F968 8004ED68 8FA400B4 */ lw $a0, 0xb4($sp) @@ -1621,10 +1621,10 @@ glabel L8004ED88 /* 050124 8004F524 1040000B */ beqz $v0, .L8004F554 /* 050128 8004F528 00000000 */ nop /* 05012C 8004F52C 860A0000 */ lh $t2, ($s0) -/* 050130 8004F530 3C098012 */ lui $t1, %hi(D_8011D540) # $t1, 0x8012 +/* 050130 8004F530 3C098012 */ lui $t1, %hi(gRaceStartTimer) # $t1, 0x8012 /* 050134 8004F534 15400007 */ bnez $t2, .L8004F554 /* 050138 8004F538 00000000 */ nop -/* 05013C 8004F53C 8D29D540 */ lw $t1, %lo(D_8011D540)($t1) +/* 05013C 8004F53C 8D29D540 */ lw $t1, %lo(gRaceStartTimer)($t1) /* 050140 8004F540 8FA500B4 */ lw $a1, 0xb4($sp) /* 050144 8004F544 15200003 */ bnez $t1, .L8004F554 /* 050148 8004F548 00000000 */ nop @@ -1644,10 +1644,10 @@ glabel L8004ED88 /* 050178 8004F578 3C018012 */ lui $at, %hi(D_8011D584) # $at, 0x8012 /* 05017C 8004F57C A020D584 */ sb $zero, %lo(D_8011D584)($at) /* 050180 8004F580 8E020150 */ lw $v0, 0x150($s0) -/* 050184 8004F584 3C0D8012 */ lui $t5, %hi(D_8011D540) # $t5, 0x8012 +/* 050184 8004F584 3C0D8012 */ lui $t5, %hi(gRaceStartTimer) # $t5, 0x8012 /* 050188 8004F588 1040003D */ beqz $v0, .L8004F680 /* 05018C 8004F58C 00000000 */ nop -/* 050190 8004F590 8DADD540 */ lw $t5, %lo(D_8011D540)($t5) +/* 050190 8004F590 8DADD540 */ lw $t5, %lo(gRaceStartTimer)($t5) /* 050194 8004F594 00002025 */ move $a0, $zero /* 050198 8004F598 15A0003A */ bnez $t5, .L8004F684 /* 05019C 8004F59C 240D00FF */ li $t5, 255 @@ -1747,7 +1747,7 @@ glabel L8004ED88 /* 0502F8 8004F6F8 8E25000C */ lw $a1, 0xc($s1) /* 0502FC 8004F6FC 8E260010 */ lw $a2, 0x10($s1) /* 050300 8004F700 8E270014 */ lw $a3, 0x14($s1) -/* 050304 8004F704 0C0007AA */ jal func_80001EA8 +/* 050304 8004F704 0C0007AA */ jal play_sound_spatial /* 050308 8004F708 AFA00010 */ sw $zero, 0x10($sp) /* 05030C 8004F70C A600020E */ sh $zero, 0x20e($s0) .L8004F710: diff --git a/asm/non_matchings/racer/func_8004F7F4.s b/asm/non_matchings/racer/func_8004F7F4.s index d26a00f2..7a41bc89 100644 --- a/asm/non_matchings/racer/func_8004F7F4.s +++ b/asm/non_matchings/racer/func_8004F7F4.s @@ -197,7 +197,7 @@ glabel func_8004F7F4 /* 05068C 8004FA8C 00000000 */ nop /* 050690 8004FA90 45000009 */ bc1f .L8004FAB8 /* 050694 8004FA94 00000000 */ nop -/* 050698 8004FA98 0C015C12 */ jal func_80057048 +/* 050698 8004FA98 0C015C12 */ jal racer_play_sound /* 05069C 8004FA9C 2405001C */ li $a1, 28 /* 0506A0 8004FAA0 821901E6 */ lb $t9, 0x1e6($s0) /* 0506A4 8004FAA4 3C068012 */ lui $a2, %hi(gCurrentStickX) # $a2, 0x8012 @@ -249,7 +249,7 @@ glabel func_8004F7F4 .L8004FB3C: /* 05073C 8004FB3C 8FA600C4 */ lw $a2, 0xc4($sp) /* 050740 8004FB40 02002025 */ move $a0, $s0 -/* 050744 8004FB44 0C015E6C */ jal func_800579B0 +/* 050744 8004FB44 0C015E6C */ jal handle_base_steering /* 050748 8004FB48 00002825 */ move $a1, $zero /* 05074C 8004FB4C 02202025 */ move $a0, $s1 /* 050750 8004FB50 0C015D7B */ jal func_800575EC @@ -522,7 +522,7 @@ glabel func_8004F7F4 /* 050B2C 8004FF2C 8E25000C */ lw $a1, 0xc($s1) /* 050B30 8004FF30 8E260010 */ lw $a2, 0x10($s1) /* 050B34 8004FF34 8E270014 */ lw $a3, 0x14($s1) -/* 050B38 8004FF38 0C0007AA */ jal func_80001EA8 +/* 050B38 8004FF38 0C0007AA */ jal play_sound_spatial /* 050B3C 8004FF3C AFAF0010 */ sw $t7, 0x10($sp) /* 050B40 8004FF40 3C048012 */ lui $a0, %hi(D_8011D550) # $a0, 0x8012 /* 050B44 8004FF44 3C068012 */ lui $a2, %hi(D_8011D553) # $a2, 0x8012 diff --git a/asm/non_matchings/racer/func_80050A28.s b/asm/non_matchings/racer/func_80050A28.s index a48459c8..cf06caa1 100644 --- a/asm/non_matchings/racer/func_80050A28.s +++ b/asm/non_matchings/racer/func_80050A28.s @@ -454,7 +454,7 @@ glabel func_80050A28 /* 051C0C 8005100C 00000000 */ nop /* 051C10 80051010 A20001E6 */ sb $zero, 0x1e6($s0) .L80051014: -/* 051C14 80051014 0C015C88 */ jal func_80057220 +/* 051C14 80051014 0C015C88 */ jal handle_racer_top_speed /* 051C18 80051018 AFA70078 */ sw $a3, 0x78($sp) /* 051C1C 8005101C 3C0F8012 */ lui $t7, %hi(gCurrentCarInput) # $t7, 0x8012 /* 051C20 80051020 8DEFD528 */ lw $t7, %lo(gCurrentCarInput)($t7) @@ -573,7 +573,7 @@ glabel func_80050A28 /* 051DBC 800511BC 8D05000C */ lw $a1, 0xc($t0) /* 051DC0 800511C0 8D060010 */ lw $a2, 0x10($t0) /* 051DC4 800511C4 8D070014 */ lw $a3, 0x14($t0) -/* 051DC8 800511C8 0C0007AA */ jal func_80001EA8 +/* 051DC8 800511C8 0C0007AA */ jal play_sound_spatial /* 051DCC 800511CC AFAF0010 */ sw $t7, 0x10($sp) /* 051DD0 800511D0 10000007 */ b .L800511F0 /* 051DD4 800511D4 8E020014 */ lw $v0, 0x14($s0) @@ -1049,7 +1049,7 @@ glabel func_80050A28 /* 0524AC 800518AC A20D01EF */ sb $t5, 0x1ef($s0) /* 0524B0 800518B0 8FA40078 */ lw $a0, 0x78($sp) /* 0524B4 800518B4 E7AE0044 */ swc1 $f14, 0x44($sp) -/* 0524B8 800518B8 0C015C12 */ jal func_80057048 +/* 0524B8 800518B8 0C015C12 */ jal racer_play_sound /* 0524BC 800518BC AFA90064 */ sw $t1, 0x64($sp) /* 0524C0 800518C0 8FA90064 */ lw $t1, 0x64($sp) /* 0524C4 800518C4 C7AE0044 */ lwc1 $f14, 0x44($sp) @@ -1062,13 +1062,13 @@ glabel func_80050A28 /* 0524DC 800518DC 1521001B */ bne $t1, $at, .L8005194C /* 0524E0 800518E0 2404002D */ li $a0, 45 /* 0524E4 800518E4 AFA90064 */ sw $t1, 0x64($sp) -/* 0524E8 800518E8 0C00322D */ jal func_8000C8B4 +/* 0524E8 800518E8 0C00322D */ jal normalise_time /* 0524EC 800518EC E7AE0044 */ swc1 $f14, 0x44($sp) /* 0524F0 800518F0 240F0002 */ li $t7, 2 /* 0524F4 800518F4 A20201D3 */ sb $v0, 0x1d3($s0) /* 0524F8 800518F8 A20F0203 */ sb $t7, 0x203($s0) /* 0524FC 800518FC 8FA40078 */ lw $a0, 0x78($sp) -/* 052500 80051900 0C015C12 */ jal func_80057048 +/* 052500 80051900 0C015C12 */ jal racer_play_sound /* 052504 80051904 24050107 */ li $a1, 263 /* 052508 80051908 8FA40078 */ lw $a0, 0x78($sp) /* 05250C 8005190C 24050162 */ li $a1, 354 @@ -1235,7 +1235,7 @@ glabel func_80050A28 /* 052760 80051B60 3124FFFF */ andi $a0, $t1, 0xffff /* 052764 80051B64 45000007 */ bc1f .L80051B84 /* 052768 80051B68 26050018 */ addiu $a1, $s0, 0x18 -/* 05276C 80051B6C 0C000741 */ jal func_80001D04 +/* 05276C 80051B6C 0C000741 */ jal play_sound_global /* 052770 80051B70 AFA90064 */ sw $t1, 0x64($sp) /* 052774 80051B74 8FA90064 */ lw $t1, 0x64($sp) /* 052778 80051B78 8E020018 */ lw $v0, 0x18($s0) @@ -1353,8 +1353,8 @@ glabel func_80050A28 /* 052920 80051D20 44802000 */ mtc1 $zero, $f4 /* 052924 80051D24 46067382 */ mul.s $f14, $f14, $f6 /* 052928 80051D28 19600016 */ blez $t3, .L80051D84 -/* 05292C 80051D2C 3C188012 */ lui $t8, %hi(D_8011D540) # $t8, 0x8012 -/* 052930 80051D30 8F18D540 */ lw $t8, %lo(D_8011D540)($t8) +/* 05292C 80051D2C 3C188012 */ lui $t8, %hi(gRaceStartTimer) # $t8, 0x8012 +/* 052930 80051D30 8F18D540 */ lw $t8, %lo(gRaceStartTimer)($t8) /* 052934 80051D34 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 052938 80051D38 17000010 */ bnez $t8, .L80051D7C /* 05293C 80051D3C 00000000 */ nop @@ -1538,11 +1538,11 @@ glabel func_80050A28 /* 052BD4 80051FD4 4500003F */ bc1f .L800520D4 /* 052BD8 80051FD8 00000000 */ nop /* 052BDC 80051FDC 820C01D7 */ lb $t4, 0x1d7($s0) -/* 052BE0 80051FE0 3C0F8012 */ lui $t7, %hi(D_8011D540) # $t7, 0x8012 +/* 052BE0 80051FE0 3C0F8012 */ lui $t7, %hi(gRaceStartTimer) # $t7, 0x8012 /* 052BE4 80051FE4 29810005 */ slti $at, $t4, 5 /* 052BE8 80051FE8 1020003A */ beqz $at, .L800520D4 /* 052BEC 80051FEC 00000000 */ nop -/* 052BF0 80051FF0 8DEFD540 */ lw $t7, %lo(D_8011D540)($t7) +/* 052BF0 80051FF0 8DEFD540 */ lw $t7, %lo(gRaceStartTimer)($t7) /* 052BF4 80051FF4 00000000 */ nop /* 052BF8 80051FF8 15E00036 */ bnez $t7, .L800520D4 /* 052BFC 80051FFC 00000000 */ nop diff --git a/asm/non_matchings/racer/func_8005250C.s b/asm/non_matchings/racer/func_8005250C.s index 79510798..fd958165 100644 --- a/asm/non_matchings/racer/func_8005250C.s +++ b/asm/non_matchings/racer/func_8005250C.s @@ -77,8 +77,8 @@ glabel func_8005250C .L80052614: /* 053214 80052614 A0B801F2 */ sb $t8, 0x1f2($a1) .L80052618: -/* 053218 80052618 3C088012 */ lui $t0, %hi(D_8011D540) # $t0, 0x8012 -/* 05321C 8005261C 8D08D540 */ lw $t0, %lo(D_8011D540)($t0) +/* 053218 80052618 3C088012 */ lui $t0, %hi(gRaceStartTimer) # $t0, 0x8012 +/* 05321C 8005261C 8D08D540 */ lw $t0, %lo(gRaceStartTimer)($t0) /* 053220 80052620 00000000 */ nop /* 053224 80052624 11000003 */ beqz $t0, .L80052634 /* 053228 80052628 00000000 */ nop diff --git a/asm/non_matchings/racer/func_80053E9C.s b/asm/non_matchings/racer/func_80053E9C.s index fb5d6c41..c01ee348 100644 --- a/asm/non_matchings/racer/func_80053E9C.s +++ b/asm/non_matchings/racer/func_80053E9C.s @@ -39,7 +39,7 @@ glabel func_80053E9C /* 054B00 80053F00 24050140 */ li $a1, 320 /* 054B04 80053F04 05000007 */ bltz $t0, .L80053F24 /* 054B08 80053F08 00000000 */ nop -/* 054B0C 80053F0C 0C015C12 */ jal func_80057048 +/* 054B0C 80053F0C 0C015C12 */ jal racer_play_sound /* 054B10 80053F10 AFA40028 */ sw $a0, 0x28($sp) /* 054B14 80053F14 8FA40028 */ lw $a0, 0x28($sp) /* 054B18 80053F18 10000003 */ b .L80053F28 @@ -142,7 +142,7 @@ glabel L8005406C /* 054C70 80054070 24091002 */ li $t1, 4098 /* 054C74 80054074 A20801DB */ sb $t0, 0x1db($s0) /* 054C78 80054078 A60901A2 */ sh $t1, 0x1a2($s0) -/* 054C7C 8005407C 0C015C12 */ jal func_80057048 +/* 054C7C 8005407C 0C015C12 */ jal racer_play_sound /* 054C80 80054080 2405013B */ li $a1, 315 /* 054C84 80054084 1000001E */ b .L80054100 /* 054C88 80054088 A2000187 */ sb $zero, 0x187($s0) @@ -175,7 +175,7 @@ glabel L800540C4 /* 054CE8 800540E8 46249180 */ add.d $f6, $f18, $f4 /* 054CEC 800540EC 24050139 */ li $a1, 313 /* 054CF0 800540F0 46203220 */ cvt.s.d $f8, $f6 -/* 054CF4 800540F4 0C015C12 */ jal func_80057048 +/* 054CF4 800540F4 0C015C12 */ jal racer_play_sound /* 054CF8 800540F8 E4880020 */ swc1 $f8, 0x20($a0) .L800540FC: glabel L800540FC diff --git a/asm/non_matchings/racer/func_8005492C.s b/asm/non_matchings/racer/func_8005492C.s index 1794ce70..aceb27d6 100644 --- a/asm/non_matchings/racer/func_8005492C.s +++ b/asm/non_matchings/racer/func_8005492C.s @@ -42,7 +42,7 @@ glabel func_8005492C /* 055568 80054968 00E02025 */ move $a0, $a3 /* 05556C 8005496C AFA5004C */ sw $a1, 0x4c($sp) /* 055570 80054970 AFA70048 */ sw $a3, 0x48($sp) -/* 055574 80054974 0C015C88 */ jal func_80057220 +/* 055574 80054974 0C015C88 */ jal handle_racer_top_speed /* 055578 80054978 E7A20030 */ swc1 $f2, 0x30($sp) /* 05557C 8005497C 8FA5004C */ lw $a1, 0x4c($sp) /* 055580 80054980 E7A00018 */ swc1 $f0, 0x18($sp) @@ -183,7 +183,7 @@ glabel func_8005492C /* 055778 80054B78 AFA5004C */ sw $a1, 0x4c($sp) /* 05577C 80054B7C AFA70048 */ sw $a3, 0x48($sp) /* 055780 80054B80 E7A00028 */ swc1 $f0, 0x28($sp) -/* 055784 80054B84 0C00322D */ jal func_8000C8B4 +/* 055784 80054B84 0C00322D */ jal normalise_time /* 055788 80054B88 E7A20030 */ swc1 $f2, 0x30($sp) /* 05578C 80054B8C 8FA5004C */ lw $a1, 0x4c($sp) /* 055790 80054B90 8FA70048 */ lw $a3, 0x48($sp) @@ -264,7 +264,7 @@ glabel func_8005492C /* 0558A4 80054CA4 4602003C */ c.lt.s $f0, $f2 /* 0558A8 80054CA8 3C0B8012 */ lui $t3, %hi(D_8011D564) # $t3, 0x8012 /* 0558AC 80054CAC 45000002 */ bc1f .L80054CB8 -/* 0558B0 80054CB0 3C0E8012 */ lui $t6, %hi(D_8011D540) # $t6, 0x8012 +/* 0558B0 80054CB0 3C0E8012 */ lui $t6, %hi(gRaceStartTimer) # $t6, 0x8012 /* 0558B4 80054CB4 46000086 */ mov.s $f2, $f0 .L80054CB8: /* 0558B8 80054CB8 444CF800 */ cfc1 $t4, $31 @@ -304,7 +304,7 @@ glabel func_8005492C /* 055940 80054D40 460A1082 */ mul.s $f2, $f2, $f10 /* 055944 80054D44 19A00016 */ blez $t5, .L80054DA0 /* 055948 80054D48 00000000 */ nop -/* 05594C 80054D4C 8DCED540 */ lw $t6, %lo(D_8011D540)($t6) +/* 05594C 80054D4C 8DCED540 */ lw $t6, %lo(gRaceStartTimer)($t6) /* 055950 80054D50 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 055954 80054D54 15C00010 */ bnez $t6, .L80054D98 /* 055958 80054D58 00000000 */ nop @@ -337,7 +337,7 @@ glabel func_8005492C /* 0559B4 80054DB4 44805000 */ mtc1 $zero, $f10 /* 0559B8 80054DB8 3C014008 */ li $at, 0x40080000 # 2.125000 /* 0559BC 80054DBC 4620503C */ c.lt.d $f10, $f0 -/* 0559C0 80054DC0 3C0B8012 */ lui $t3, %hi(D_8011D540) # $t3, 0x8012 +/* 0559C0 80054DC0 3C0B8012 */ lui $t3, %hi(gRaceStartTimer) # $t3, 0x8012 /* 0559C4 80054DC4 4500001E */ bc1f .L80054E40 /* 0559C8 80054DC8 00000000 */ nop /* 0559CC 80054DCC 44818800 */ mtc1 $at, $f17 @@ -451,7 +451,7 @@ glabel func_8005492C /* 055B68 80054F68 00000000 */ nop /* 055B6C 80054F6C 4500000F */ bc1f .L80054FAC /* 055B70 80054F70 00000000 */ nop -/* 055B74 80054F74 8D6BD540 */ lw $t3, %lo(D_8011D540)($t3) +/* 055B74 80054F74 8D6BD540 */ lw $t3, %lo(gRaceStartTimer)($t3) /* 055B78 80054F78 3C014080 */ li $at, 0x40800000 # 4.000000 /* 055B7C 80054F7C 1560000B */ bnez $t3, .L80054FAC /* 055B80 80054F80 00000000 */ nop diff --git a/asm/non_matchings/racer/func_80054FD0.s b/asm/non_matchings/racer/func_80054FD0.s index 6ed49ce0..b06860f8 100644 --- a/asm/non_matchings/racer/func_80054FD0.s +++ b/asm/non_matchings/racer/func_80054FD0.s @@ -346,7 +346,7 @@ glabel func_80054FD0 /* 0560E8 800554E8 0C015C2E */ jal func_800570B8 /* 0560EC 800554EC AFA9018C */ sw $t1, 0x18c($sp) /* 0560F0 800554F0 02202025 */ move $a0, $s1 -/* 0560F4 800554F4 0C015C12 */ jal func_80057048 +/* 0560F4 800554F4 0C015C12 */ jal racer_play_sound /* 0560F8 800554F8 2405000C */ li $a1, 12 /* 0560FC 800554FC 8FA9018C */ lw $t1, 0x18c($sp) /* 056100 80055500 44808000 */ mtc1 $zero, $f16 @@ -406,7 +406,7 @@ glabel func_80054FD0 /* 0561CC 800555CC 2404013F */ li $a0, 319 /* 0561D0 800555D0 1DC00006 */ bgtz $t6, .L800555EC /* 0561D4 800555D4 26050020 */ addiu $a1, $s0, 0x20 -/* 0561D8 800555D8 0C000741 */ jal func_80001D04 +/* 0561D8 800555D8 0C000741 */ jal play_sound_global /* 0561DC 800555DC AFA9018C */ sw $t1, 0x18c($sp) /* 0561E0 800555E0 8FA9018C */ lw $t1, 0x18c($sp) /* 0561E4 800555E4 44808000 */ mtc1 $zero, $f16 diff --git a/asm/non_matchings/racer/func_80055EC0.s b/asm/non_matchings/racer/func_80055EC0.s index 727bcdeb..1b877618 100644 --- a/asm/non_matchings/racer/func_80055EC0.s +++ b/asm/non_matchings/racer/func_80055EC0.s @@ -373,21 +373,21 @@ glabel L800563EC /* 056FF4 800563F4 2401000F */ li $at, 15 /* 056FF8 800563F8 1501000D */ bne $t0, $at, .L80056430 /* 056FFC 800563FC 00000000 */ nop -/* 057000 80056400 0C00322D */ jal func_8000C8B4 +/* 057000 80056400 0C00322D */ jal normalise_time /* 057004 80056404 2404004B */ li $a0, 75 /* 057008 80056408 240D0002 */ li $t5, 2 /* 05700C 8005640C A20D0203 */ sb $t5, 0x203($s0) /* 057010 80056410 1000000B */ b .L80056440 /* 057014 80056414 A20201D3 */ sb $v0, 0x1d3($s0) .L80056418: -/* 057018 80056418 0C00322D */ jal func_8000C8B4 +/* 057018 80056418 0C00322D */ jal normalise_time /* 05701C 8005641C 24040037 */ li $a0, 55 /* 057020 80056420 240E0001 */ li $t6, 1 /* 057024 80056424 A20E0203 */ sb $t6, 0x203($s0) /* 057028 80056428 10000005 */ b .L80056440 /* 05702C 8005642C A20201D3 */ sb $v0, 0x1d3($s0) .L80056430: -/* 057030 80056430 0C00322D */ jal func_8000C8B4 +/* 057030 80056430 0C00322D */ jal normalise_time /* 057034 80056434 24040023 */ li $a0, 35 /* 057038 80056438 A20201D3 */ sb $v0, 0x1d3($s0) /* 05703C 8005643C A2000203 */ sb $zero, 0x203($s0) @@ -406,7 +406,7 @@ glabel L800563EC /* 057068 80056468 1721000B */ bne $t9, $at, .L80056498 /* 05706C 8005646C 8FA40088 */ lw $a0, 0x88($sp) /* 057070 80056470 8FA40088 */ lw $a0, 0x88($sp) -/* 057074 80056474 0C015C12 */ jal func_80057048 +/* 057074 80056474 0C015C12 */ jal racer_play_sound /* 057078 80056478 24050232 */ li $a1, 562 /* 05707C 8005647C 8FA40088 */ lw $a0, 0x88($sp) /* 057080 80056480 24050233 */ li $a1, 563 @@ -416,7 +416,7 @@ glabel L800563EC /* 057090 80056490 820B0173 */ lb $t3, 0x173($s0) /* 057094 80056494 8FA40088 */ lw $a0, 0x88($sp) .L80056498: -/* 057098 80056498 0C015C12 */ jal func_80057048 +/* 057098 80056498 0C015C12 */ jal racer_play_sound /* 05709C 8005649C 24050021 */ li $a1, 33 /* 0570A0 800564A0 820B0173 */ lb $t3, 0x173($s0) .L800564A4: @@ -721,7 +721,7 @@ glabel L80056884 /* 0574F0 800568F0 8D260010 */ lw $a2, 0x10($t1) /* 0574F4 800568F4 8D270014 */ lw $a3, 0x14($t1) /* 0574F8 800568F8 26190218 */ addiu $t9, $s0, 0x218 -/* 0574FC 800568FC 0C0007AA */ jal func_80001EA8 +/* 0574FC 800568FC 0C0007AA */ jal play_sound_spatial /* 057500 80056900 AFB90010 */ sw $t9, 0x10($sp) .L80056904: /* 057504 80056904 82020173 */ lb $v0, 0x173($s0) diff --git a/asm/non_matchings/racer/func_80056E2C.s b/asm/non_matchings/racer/func_80056E2C.s index d9b11f7b..59d36e2f 100644 --- a/asm/non_matchings/racer/func_80056E2C.s +++ b/asm/non_matchings/racer/func_80056E2C.s @@ -73,7 +73,7 @@ glabel func_80056E2C /* 057B38 80056F38 AFA7002C */ sw $a3, 0x2c($sp) /* 057B3C 80056F3C E7A2001C */ swc1 $f2, 0x1c($sp) /* 057B40 80056F40 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 057B44 80056F44 0C000741 */ jal func_80001D04 +/* 057B44 80056F44 0C000741 */ jal play_sound_global /* 057B48 80056F48 E7B00020 */ swc1 $f16, 0x20($sp) /* 057B4C 80056F4C 8FA7002C */ lw $a3, 0x2c($sp) /* 057B50 80056F50 C7A2001C */ lwc1 $f2, 0x1c($sp) diff --git a/asm/non_matchings/racer/func_8005A6F0.s b/asm/non_matchings/racer/func_8005A6F0.s index a7d6309c..f19a5335 100644 --- a/asm/non_matchings/racer/func_8005A6F0.s +++ b/asm/non_matchings/racer/func_8005A6F0.s @@ -43,7 +43,7 @@ glabel func_8005A6F0 /* 05B320 8005A720 AFA20094 */ sw $v0, 0x94($sp) /* 05B324 8005A724 AFA20070 */ sw $v0, 0x70($sp) /* 05B328 8005A728 820301F6 */ lb $v1, 0x1f6($s0) -/* 05B32C 8005A72C 3C198012 */ lui $t9, %hi(D_8011D540) # $t9, 0x8012 +/* 05B32C 8005A72C 3C198012 */ lui $t9, %hi(gRaceStartTimer) # $t9, 0x8012 /* 05B330 8005A730 18600006 */ blez $v1, .L8005A74C /* 05B334 8005A734 00000000 */ nop /* 05B338 8005A738 8FAF00A8 */ lw $t7, 0xa8($sp) @@ -54,7 +54,7 @@ glabel func_8005A6F0 .L8005A74C: /* 05B34C 8005A74C A20001F6 */ sb $zero, 0x1f6($s0) .L8005A750: -/* 05B350 8005A750 8F39D540 */ lw $t9, %lo(D_8011D540)($t9) +/* 05B350 8005A750 8F39D540 */ lw $t9, %lo(gRaceStartTimer)($t9) /* 05B354 8005A754 00000000 */ nop /* 05B358 8005A758 13200005 */ beqz $t9, .L8005A770 /* 05B35C 8005A75C 2404FFC4 */ li $a0, -60 @@ -165,12 +165,12 @@ glabel func_8005A6F0 /* 05B4EC 8005A8EC 44813000 */ mtc1 $at, $f6 /* 05B4F0 8005A8F0 3C018012 */ lui $at, %hi(D_8011D544) # $at, 0x8012 /* 05B4F4 8005A8F4 C428D544 */ lwc1 $f8, %lo(D_8011D544)($at) -/* 05B4F8 8005A8F8 3C188012 */ lui $t8, %hi(D_8011D540) # $t8, 0x8012 +/* 05B4F8 8005A8F8 3C188012 */ lui $t8, %hi(gRaceStartTimer) # $t8, 0x8012 /* 05B4FC 8005A8FC 4608303C */ c.lt.s $f6, $f8 /* 05B500 8005A900 00000000 */ nop /* 05B504 8005A904 4501000A */ bc1t .L8005A930 /* 05B508 8005A908 240E001E */ li $t6, 30 -/* 05B50C 8005A90C 8F18D540 */ lw $t8, %lo(D_8011D540)($t8) +/* 05B50C 8005A90C 8F18D540 */ lw $t8, %lo(gRaceStartTimer)($t8) /* 05B510 8005A910 8FAF0070 */ lw $t7, 0x70($sp) /* 05B514 8005A914 17000006 */ bnez $t8, .L8005A930 /* 05B518 8005A918 240E001E */ li $t6, 30 @@ -581,8 +581,8 @@ glabel func_8005A6F0 /* 05BAE0 8005AEE0 8E0E0148 */ lw $t6, 0x148($s0) /* 05BAE4 8005AEE4 240B0001 */ li $t3, 1 /* 05BAE8 8005AEE8 15C00009 */ bnez $t6, .L8005AF10 -/* 05BAEC 8005AEEC 3C088012 */ lui $t0, %hi(D_8011D540) # $t0, 0x8012 -/* 05BAF0 8005AEF0 2508D540 */ addiu $t0, %lo(D_8011D540) # addiu $t0, $t0, -0x2ac0 +/* 05BAEC 8005AEEC 3C088012 */ lui $t0, %hi(gRaceStartTimer) # $t0, 0x8012 +/* 05BAF0 8005AEF0 2508D540 */ addiu $t0, %lo(gRaceStartTimer) # addiu $t0, $t0, -0x2ac0 /* 05BAF4 8005AEF4 8D180000 */ lw $t8, ($t0) /* 05BAF8 8005AEF8 00000000 */ nop /* 05BAFC 8005AEFC 17000004 */ bnez $t8, .L8005AF10 @@ -601,9 +601,9 @@ glabel func_8005A6F0 /* 05BB2C 8005AF2C AC600000 */ sw $zero, ($v1) /* 05BB30 8005AF30 3C018012 */ lui $at, %hi(D_8011D530) # $at, 0x8012 /* 05BB34 8005AF34 2442D52C */ addiu $v0, %lo(gActivePlayerButtonPress) # addiu $v0, $v0, -0x2ad4 -/* 05BB38 8005AF38 3C088012 */ lui $t0, %hi(D_8011D540) # $t0, 0x8012 +/* 05BB38 8005AF38 3C088012 */ lui $t0, %hi(gRaceStartTimer) # $t0, 0x8012 /* 05BB3C 8005AF3C AC20D530 */ sw $zero, %lo(D_8011D530)($at) -/* 05BB40 8005AF40 2508D540 */ addiu $t0, %lo(D_8011D540) # addiu $t0, $t0, -0x2ac0 +/* 05BB40 8005AF40 2508D540 */ addiu $t0, %lo(gRaceStartTimer) # addiu $t0, $t0, -0x2ac0 /* 05BB44 8005AF44 AC400000 */ sw $zero, ($v0) .L8005AF48: /* 05BB48 8005AF48 921901D6 */ lbu $t9, 0x1d6($s0) @@ -1149,10 +1149,10 @@ glabel L8005B1B0 /* 05C304 8005B704 3C018012 */ lui $at, %hi(D_8011D584) # $at, 0x8012 /* 05C308 8005B708 A020D584 */ sb $zero, %lo(D_8011D584)($at) /* 05C30C 8005B70C 8E020150 */ lw $v0, 0x150($s0) -/* 05C310 8005B710 3C198012 */ lui $t9, %hi(D_8011D540) # $t9, 0x8012 +/* 05C310 8005B710 3C198012 */ lui $t9, %hi(gRaceStartTimer) # $t9, 0x8012 /* 05C314 8005B714 10400038 */ beqz $v0, .L8005B7F8 /* 05C318 8005B718 00000000 */ nop -/* 05C31C 8005B71C 8F39D540 */ lw $t9, %lo(D_8011D540)($t9) +/* 05C31C 8005B71C 8F39D540 */ lw $t9, %lo(gRaceStartTimer)($t9) /* 05C320 8005B720 8FAD00A0 */ lw $t5, 0xa0($sp) /* 05C324 8005B724 17200034 */ bnez $t9, .L8005B7F8 /* 05C328 8005B728 00002025 */ move $a0, $zero diff --git a/asm/non_matchings/racer/update_camera_car.s b/asm/non_matchings/racer/update_camera_car.s index 80806caf..caa9f30d 100644 --- a/asm/non_matchings/racer/update_camera_car.s +++ b/asm/non_matchings/racer/update_camera_car.s @@ -211,7 +211,7 @@ glabel update_camera_car /* 0590BC 800584BC 44804000 */ mtc1 $zero, $f8 /* 0590C0 800584C0 460001A1 */ cvt.d.s $f6, $f0 /* 0590C4 800584C4 4628303C */ c.lt.d $f6, $f8 -/* 0590C8 800584C8 3C0A8012 */ lui $t2, %hi(D_8011D540) # $t2, 0x8012 +/* 0590C8 800584C8 3C0A8012 */ lui $t2, %hi(gRaceStartTimer) # $t2, 0x8012 /* 0590CC 800584CC 45000016 */ bc1f .L80058528 /* 0590D0 800584D0 00000000 */ nop /* 0590D4 800584D4 460E0282 */ mul.s $f10, $f0, $f14 @@ -254,13 +254,13 @@ glabel update_camera_car /* 059158 80058558 46061202 */ mul.s $f8, $f2, $f6 /* 05915C 8005855C 46088400 */ add.s $f16, $f16, $f8 .L80058560: -/* 059160 80058560 8D4AD540 */ lw $t2, %lo(D_8011D540)($t2) +/* 059160 80058560 8D4AD540 */ lw $t2, %lo(gRaceStartTimer)($t2) /* 059164 80058564 E7B20050 */ swc1 $f18, 0x50($sp) /* 059168 80058568 15400014 */ bnez $t2, .L800585BC /* 05916C 8005856C 24040024 */ li $a0, 36 /* 059170 80058570 AFA70070 */ sw $a3, 0x70($sp) /* 059174 80058574 E7B00054 */ swc1 $f16, 0x54($sp) -/* 059178 80058578 0C00322D */ jal func_8000C8B4 +/* 059178 80058578 0C00322D */ jal normalise_time /* 05917C 8005857C E7B20050 */ swc1 $f18, 0x50($sp) /* 059180 80058580 8FA70070 */ lw $a3, 0x70($sp) /* 059184 80058584 3C088012 */ lui $t0, %hi(gCameraObject) # $t0, 0x8012 @@ -279,8 +279,8 @@ glabel update_camera_car /* 0591B4 800585B4 44818000 */ mtc1 $at, $f16 /* 0591B8 800585B8 00000000 */ nop .L800585BC: -/* 0591BC 800585BC 3C0B8012 */ lui $t3, %hi(D_8011D540) # $t3, 0x8012 -/* 0591C0 800585C0 8D6BD540 */ lw $t3, %lo(D_8011D540)($t3) +/* 0591BC 800585BC 3C0B8012 */ lui $t3, %hi(gRaceStartTimer) # $t3, 0x8012 +/* 0591C0 800585C0 8D6BD540 */ lw $t3, %lo(gRaceStartTimer)($t3) /* 0591C4 800585C4 C7B20050 */ lwc1 $f18, 0x50($sp) /* 0591C8 800585C8 8D050000 */ lw $a1, ($t0) /* 0591CC 800585CC 29610051 */ slti $at, $t3, 0x51 @@ -513,7 +513,7 @@ glabel update_camera_car /* 059540 80058940 44802000 */ mtc1 $zero, $f4 /* 059544 80058944 3C014000 */ li $at, 0x40000000 # 2.000000 /* 059548 80058948 46204420 */ cvt.s.d $f16, $f8 -/* 05954C 8005894C 3C098012 */ lui $t1, %hi(D_8011D540) # $t1, 0x8012 +/* 05954C 8005894C 3C098012 */ lui $t1, %hi(gRaceStartTimer) # $t1, 0x8012 /* 059550 80058950 460080A1 */ cvt.d.s $f2, $f16 /* 059554 80058954 4624103C */ c.lt.d $f2, $f4 /* 059558 80058958 00000000 */ nop @@ -543,7 +543,7 @@ glabel update_camera_car /* 0595B4 800589B4 E4A80010 */ swc1 $f8, 0x10($a1) /* 0595B8 800589B8 45010005 */ bc1t .L800589D0 /* 0595BC 800589BC 00000000 */ nop -/* 0595C0 800589C0 8D29D540 */ lw $t1, %lo(D_8011D540)($t1) +/* 0595C0 800589C0 8D29D540 */ lw $t1, %lo(gRaceStartTimer)($t1) /* 0595C4 800589C4 00000000 */ nop /* 0595C8 800589C8 11200004 */ beqz $t1, .L800589DC /* 0595CC 800589CC 00000000 */ nop diff --git a/asm/non_matchings/racer/update_camera_plane.s b/asm/non_matchings/racer/update_camera_plane.s index 88ba7de3..8e80fd67 100644 --- a/asm/non_matchings/racer/update_camera_plane.s +++ b/asm/non_matchings/racer/update_camera_plane.s @@ -247,7 +247,7 @@ glabel update_camera_plane /* 04D1F4 8004C5F4 008B1823 */ subu $v1, $a0, $t3 /* 04D1F8 8004C5F8 0061082A */ slt $at, $v1, $at /* 04D1FC 8004C5FC 14200004 */ bnez $at, .L8004C610 -/* 04D200 8004C600 3C198012 */ lui $t9, %hi(D_8011D540) # $t9, 0x8012 +/* 04D200 8004C600 3C198012 */ lui $t9, %hi(gRaceStartTimer) # $t9, 0x8012 /* 04D204 8004C604 3C01FFFF */ lui $at, (0xFFFF0001 >> 16) # lui $at, 0xffff /* 04D208 8004C608 34210001 */ ori $at, (0xFFFF0001 & 0xFFFF) # ori $at, $at, 1 /* 04D20C 8004C60C 00611821 */ addu $v1, $v1, $at @@ -348,13 +348,13 @@ glabel update_camera_plane .L8004C764: /* 04D364 8004C764 46107381 */ sub.s $f14, $f14, $f16 .L8004C768: -/* 04D368 8004C768 8F39D540 */ lw $t9, %lo(D_8011D540)($t9) +/* 04D368 8004C768 8F39D540 */ lw $t9, %lo(gRaceStartTimer)($t9) /* 04D36C 8004C76C 00000000 */ nop /* 04D370 8004C770 17200015 */ bnez $t9, .L8004C7C8 /* 04D374 8004C774 24040024 */ li $a0, 36 /* 04D378 8004C778 AFA70058 */ sw $a3, 0x58($sp) /* 04D37C 8004C77C E7AE0034 */ swc1 $f14, 0x34($sp) -/* 04D380 8004C780 0C00322D */ jal func_8000C8B4 +/* 04D380 8004C780 0C00322D */ jal normalise_time /* 04D384 8004C784 E7B20030 */ swc1 $f18, 0x30($sp) /* 04D388 8004C788 8FA70058 */ lw $a3, 0x58($sp) /* 04D38C 8004C78C 3C088012 */ lui $t0, %hi(gCameraObject) # $t0, 0x8012 @@ -374,8 +374,8 @@ glabel update_camera_plane /* 04D3C0 8004C7C0 44817000 */ mtc1 $at, $f14 /* 04D3C4 8004C7C4 00000000 */ nop .L8004C7C8: -/* 04D3C8 8004C7C8 3C0A8012 */ lui $t2, %hi(D_8011D540) # $t2, 0x8012 -/* 04D3CC 8004C7CC 8D4AD540 */ lw $t2, %lo(D_8011D540)($t2) +/* 04D3C8 8004C7C8 3C0A8012 */ lui $t2, %hi(gRaceStartTimer) # $t2, 0x8012 +/* 04D3CC 8004C7CC 8D4AD540 */ lw $t2, %lo(gRaceStartTimer)($t2) /* 04D3D0 8004C7D0 8D050000 */ lw $a1, ($t0) /* 04D3D4 8004C7D4 29410051 */ slti $at, $t2, 0x51 /* 04D3D8 8004C7D8 14200007 */ bnez $at, .L8004C7F8 diff --git a/asm/non_matchings/unknown_005740/func_800063EC.s b/asm/non_matchings/unknown_005740/func_800063EC.s index e4fb87fb..4489b4b6 100644 --- a/asm/non_matchings/unknown_005740/func_800063EC.s +++ b/asm/non_matchings/unknown_005740/func_800063EC.s @@ -462,7 +462,7 @@ glabel func_800063EC /* 007660 80006A60 00000000 */ nop /* 007664 80006A64 A06B00D8 */ sb $t3, 0xd8($v1) /* 007668 80006A68 8D250000 */ lw $a1, ($t1) -/* 00766C 80006A6C 0C000741 */ jal func_80001D04 +/* 00766C 80006A6C 0C000741 */ jal play_sound_global /* 007670 80006A70 24A500DC */ addiu $a1, $a1, 0xdc /* 007674 80006A74 10000011 */ b .L80006ABC /* 007678 80006A78 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003E694.s b/asm/non_matchings/unknown_032760/func_8003E694.s index 87627b38..66a88382 100644 --- a/asm/non_matchings/unknown_032760/func_8003E694.s +++ b/asm/non_matchings/unknown_032760/func_8003E694.s @@ -224,7 +224,7 @@ glabel func_8003E694 /* 03F5D4 8003E9D4 00402825 */ move $a1, $v0 /* 03F5D8 8003E9D8 144E000C */ bne $v0, $t6, .L8003EA0C /* 03F5DC 8003E9DC 240401C2 */ li $a0, 450 -/* 03F5E0 8003E9E0 0C00322D */ jal func_8000C8B4 +/* 03F5E0 8003E9E0 0C00322D */ jal normalise_time /* 03F5E4 8003E9E4 AFA200E4 */ sw $v0, 0xe4($sp) /* 03F5E8 8003E9E8 8E030078 */ lw $v1, 0x78($s0) /* 03F5EC 8003E9EC 8FA500E4 */ lw $a1, 0xe4($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003F2E8.s b/asm/non_matchings/unknown_032760/func_8003F2E8.s index 0dac6658..c1f592c6 100644 --- a/asm/non_matchings/unknown_032760/func_8003F2E8.s +++ b/asm/non_matchings/unknown_032760/func_8003F2E8.s @@ -437,7 +437,7 @@ glabel func_8003F2E8 /* 040524 8003F924 1498000D */ bne $a0, $t8, .L8003F95C /* 040528 8003F928 240401C2 */ li $a0, 450 /* 04052C 8003F92C AFA50048 */ sw $a1, 0x48($sp) -/* 040530 8003F930 0C00322D */ jal func_8000C8B4 +/* 040530 8003F930 0C00322D */ jal normalise_time /* 040534 8003F934 AFA80038 */ sw $t0, 0x38($sp) /* 040538 8003F938 8FA80038 */ lw $t0, 0x38($sp) /* 04053C 8003F93C 8FA50048 */ lw $a1, 0x48($sp) @@ -597,7 +597,7 @@ glabel func_8003F2E8 /* 04077C 8003FB7C 1020002D */ beqz $at, .L8003FC34 /* 040780 8003FB80 AD0F0000 */ sw $t7, ($t0) /* 040784 8003FB84 2404FAD8 */ li $a0, -1320 -/* 040788 8003FB88 0C00322D */ jal func_8000C8B4 +/* 040788 8003FB88 0C00322D */ jal normalise_time /* 04078C 8003FB8C AFA80038 */ sw $t0, 0x38($sp) /* 040790 8003FB90 8FA80038 */ lw $t0, 0x38($sp) /* 040794 8003FB94 8FAC0040 */ lw $t4, 0x40($sp) diff --git a/asm/non_matchings/unknown_032760/obj_loop_banana.s b/asm/non_matchings/unknown_032760/obj_loop_banana.s index 116cdf1d..929afab6 100644 --- a/asm/non_matchings/unknown_032760/obj_loop_banana.s +++ b/asm/non_matchings/unknown_032760/obj_loop_banana.s @@ -372,7 +372,7 @@ glabel obj_loop_banana /* 03E704 8003DB04 01602025 */ move $a0, $t3 /* 03E708 8003DB08 AFA90030 */ sw $t1, 0x30($sp) /* 03E70C 8003DB0C AFA80068 */ sw $t0, 0x68($sp) -/* 03E710 8003DB10 0C0007AA */ jal func_80001EA8 +/* 03E710 8003DB10 0C0007AA */ jal play_sound_spatial /* 03E714 8003DB14 AFA00010 */ sw $zero, 0x10($sp) /* 03E718 8003DB18 8FA80068 */ lw $t0, 0x68($sp) /* 03E71C 8003DB1C 8FA90030 */ lw $t1, 0x30($sp) diff --git a/asm/non_matchings/unknown_032760/obj_loop_door.s b/asm/non_matchings/unknown_032760/obj_loop_door.s index 4a99eee0..bf218492 100644 --- a/asm/non_matchings/unknown_032760/obj_loop_door.s +++ b/asm/non_matchings/unknown_032760/obj_loop_door.s @@ -109,7 +109,7 @@ glabel obj_loop_door /* 03C710 8003BB10 AD0F0008 */ sw $t7, 8($t0) /* 03C714 8003BB14 0C002050 */ jal func_80008140 /* 03C718 8003BB18 00000000 */ nop -/* 03C71C 8003BB1C 0C0006F0 */ jal play_sound +/* 03C71C 8003BB1C 0C0006F0 */ jal play_sequence /* 03C720 8003BB20 24040011 */ li $a0, 17 /* 03C724 8003BB24 8FA80044 */ lw $t0, 0x44($sp) /* 03C728 8003BB28 00000000 */ nop diff --git a/asm/non_matchings/unknown_032760/obj_loop_fireball_octoweapon.s b/asm/non_matchings/unknown_032760/obj_loop_fireball_octoweapon.s index c69c7917..526e2082 100644 --- a/asm/non_matchings/unknown_032760/obj_loop_fireball_octoweapon.s +++ b/asm/non_matchings/unknown_032760/obj_loop_fireball_octoweapon.s @@ -295,7 +295,7 @@ glabel obj_loop_fireball_octoweapon /* 034FA0 800343A0 AE030078 */ sw $v1, 0x78($s0) /* 034FA4 800343A4 8FA50074 */ lw $a1, 0x74($sp) /* 034FA8 800343A8 2404024A */ li $a0, 586 -/* 034FAC 800343AC 0C000741 */ jal func_80001D04 +/* 034FAC 800343AC 0C000741 */ jal play_sound_global /* 034FB0 800343B0 24A5001C */ addiu $a1, $a1, 0x1c .L800343B4: /* 034FB4 800343B4 86090048 */ lh $t1, 0x48($s0) diff --git a/asm/non_matchings/unknown_032760/obj_loop_flycoin.s b/asm/non_matchings/unknown_032760/obj_loop_flycoin.s index db5fce08..593e8024 100644 --- a/asm/non_matchings/unknown_032760/obj_loop_flycoin.s +++ b/asm/non_matchings/unknown_032760/obj_loop_flycoin.s @@ -72,7 +72,7 @@ glabel obj_loop_flycoin /* 03DFB4 8003D3B4 24040022 */ li $a0, 34 /* 03DFB8 8003D3B8 11C10004 */ beq $t6, $at, .L8003D3CC /* 03DFBC 8003D3BC 8FB8002C */ lw $t8, 0x2c($sp) -/* 03DFC0 8003D3C0 0C000741 */ jal func_80001D04 +/* 03DFC0 8003D3C0 0C000741 */ jal play_sound_global /* 03DFC4 8003D3C4 00002825 */ move $a1, $zero .L8003D3C8: /* 03DFC8 8003D3C8 8FB8002C */ lw $t8, 0x2c($sp) diff --git a/asm/non_matchings/unknown_032760/obj_loop_goldenballoon.s b/asm/non_matchings/unknown_032760/obj_loop_goldenballoon.s index 0089d37a..0f6e85f2 100644 --- a/asm/non_matchings/unknown_032760/obj_loop_goldenballoon.s +++ b/asm/non_matchings/unknown_032760/obj_loop_goldenballoon.s @@ -142,7 +142,7 @@ glabel obj_loop_goldenballoon /* 03C2BC 8003B6BC 8E270014 */ lw $a3, 0x14($s1) /* 03C2C0 8003B6C0 8E260010 */ lw $a2, 0x10($s1) /* 03C2C4 8003B6C4 8E25000C */ lw $a1, 0xc($s1) -/* 03C2C8 8003B6C8 0C0007AA */ jal func_80001EA8 +/* 03C2C8 8003B6C8 0C0007AA */ jal play_sound_spatial /* 03C2CC 8003B6CC AFA00010 */ sw $zero, 0x10($sp) /* 03C2D0 8003B6D0 862B0006 */ lh $t3, 6($s1) /* 03C2D4 8003B6D4 24090010 */ li $t1, 16 diff --git a/asm/non_matchings/unknown_032760/obj_loop_parkwarden.s b/asm/non_matchings/unknown_032760/obj_loop_parkwarden.s index f10f077e..de50fde3 100644 --- a/asm/non_matchings/unknown_032760/obj_loop_parkwarden.s +++ b/asm/non_matchings/unknown_032760/obj_loop_parkwarden.s @@ -819,7 +819,7 @@ glabel L80039DC4 /* 03AAB0 80039EB0 240F0006 */ li $t7, 6 /* 03AAB4 80039EB4 AE0F0078 */ sw $t7, 0x78($s0) /* 03AAB8 80039EB8 24040113 */ li $a0, 275 -/* 03AABC 80039EBC 0C000741 */ jal func_80001D04 +/* 03AABC 80039EBC 0C000741 */ jal play_sound_global /* 03AAC0 80039EC0 00002825 */ move $a1, $zero /* 03AAC4 80039EC4 3C04800E */ lui $a0, %hi(D_800DC970) # $a0, 0x800e /* 03AAC8 80039EC8 0C030076 */ jal func_800C01D8 @@ -886,7 +886,7 @@ glabel L80039ED8 /* 03ABA8 80039FA8 2418000F */ li $t8, 15 /* 03ABAC 80039FAC AE180078 */ sw $t8, 0x78($s0) /* 03ABB0 80039FB0 24040110 */ li $a0, 272 -/* 03ABB4 80039FB4 0C000741 */ jal func_80001D04 +/* 03ABB4 80039FB4 0C000741 */ jal play_sound_global /* 03ABB8 80039FB8 00002825 */ move $a1, $zero /* 03ABBC 80039FBC 44805000 */ mtc1 $zero, $f10 /* 03ABC0 80039FC0 100002CF */ b .L8003AB00 @@ -950,7 +950,7 @@ glabel L80039FDC .L8003A098: /* 03AC98 8003A098 AE0A0078 */ sw $t2, 0x78($s0) /* 03AC9C 8003A09C 24040110 */ li $a0, 272 -/* 03ACA0 8003A0A0 0C000741 */ jal func_80001D04 +/* 03ACA0 8003A0A0 0C000741 */ jal play_sound_global /* 03ACA4 8003A0A4 00002825 */ move $a1, $zero /* 03ACA8 8003A0A8 8FA20070 */ lw $v0, 0x70($sp) /* 03ACAC 8003A0AC 00000000 */ nop @@ -1003,7 +1003,7 @@ glabel L8003A0CC /* 03AD5C 8003A15C 10000268 */ b .L8003AB00 /* 03AD60 8003A160 A20E0039 */ sb $t6, 0x39($s0) .L8003A164: -/* 03AD64 8003A164 0C000741 */ jal func_80001D04 +/* 03AD64 8003A164 0C000741 */ jal play_sound_global /* 03AD68 8003A168 A3AF006B */ sb $t7, 0x6b($sp) /* 03AD6C 8003A16C 8FA20070 */ lw $v0, 0x70($sp) /* 03AD70 8003A170 8FA30090 */ lw $v1, 0x90($sp) diff --git a/asm/non_matchings/unknown_032760/obj_loop_silvercoin.s b/asm/non_matchings/unknown_032760/obj_loop_silvercoin.s index 7024ae22..ae0c3d0e 100644 --- a/asm/non_matchings/unknown_032760/obj_loop_silvercoin.s +++ b/asm/non_matchings/unknown_032760/obj_loop_silvercoin.s @@ -64,7 +64,7 @@ glabel obj_loop_silvercoin /* 03EA04 8003DE04 2484002B */ addiu $a0, $a0, 0x2b /* 03EA08 8003DE08 309900FF */ andi $t9, $a0, 0xff /* 03EA0C 8003DE0C 03202025 */ move $a0, $t9 -/* 03EA10 8003DE10 0C0006F0 */ jal play_sound +/* 03EA10 8003DE10 0C0006F0 */ jal play_sequence /* 03EA14 8003DE14 AFA20018 */ sw $v0, 0x18($sp) /* 03EA18 8003DE18 8FA20018 */ lw $v0, 0x18($sp) /* 03EA1C 8003DE1C 8FA60020 */ lw $a2, 0x20($sp) diff --git a/asm/non_matchings/unknown_032760/obj_loop_trophycab.s b/asm/non_matchings/unknown_032760/obj_loop_trophycab.s index f0fe83d5..4fb5dd74 100644 --- a/asm/non_matchings/unknown_032760/obj_loop_trophycab.s +++ b/asm/non_matchings/unknown_032760/obj_loop_trophycab.s @@ -127,7 +127,7 @@ glabel obj_loop_trophycab /* 035C6C 8003506C 240C0001 */ li $t4, 1 /* 035C70 80035070 AE0C0078 */ sw $t4, 0x78($s0) /* 035C74 80035074 2404012F */ li $a0, 303 -/* 035C78 80035078 0C000741 */ jal func_80001D04 +/* 035C78 80035078 0C000741 */ jal play_sound_global /* 035C7C 8003507C 00002825 */ move $a1, $zero /* 035C80 80035080 0C028E1C */ jal func_800A3870 /* 035C84 80035084 00000000 */ nop @@ -145,7 +145,7 @@ glabel obj_loop_trophycab /* 035CB0 800350B0 ADAE0000 */ sw $t6, ($t5) /* 035CB4 800350B4 0C000326 */ jal set_music_fade_timer /* 035CB8 800350B8 2404FFF8 */ li $a0, -8 -/* 035CBC 800350BC 0C0006F0 */ jal play_sound +/* 035CBC 800350BC 0C0006F0 */ jal play_sequence /* 035CC0 800350C0 24040011 */ li $a0, 17 .L800350C4: /* 035CC4 800350C4 8FA30050 */ lw $v1, 0x50($sp) diff --git a/asm/non_matchings/unknown_032760/obj_loop_ttdoor.s b/asm/non_matchings/unknown_032760/obj_loop_ttdoor.s index a093e418..c9cd12e1 100644 --- a/asm/non_matchings/unknown_032760/obj_loop_ttdoor.s +++ b/asm/non_matchings/unknown_032760/obj_loop_ttdoor.s @@ -86,7 +86,7 @@ glabel obj_loop_ttdoor /* 03D028 8003C428 AE0B0008 */ sw $t3, 8($s0) /* 03D02C 8003C42C 0C00030E */ jal set_sndfx_player_voice_limit /* 03D030 8003C430 24040010 */ li $a0, 16 -/* 03D034 8003C434 0C0006F0 */ jal play_sound +/* 03D034 8003C434 0C0006F0 */ jal play_sequence /* 03D038 8003C438 24040011 */ li $a0, 17 /* 03D03C 8003C43C 82040013 */ lb $a0, 0x13($s0) /* 03D040 8003C440 00000000 */ nop diff --git a/asm/non_matchings/unknown_032760/obj_loop_weaponballoon.s b/asm/non_matchings/unknown_032760/obj_loop_weaponballoon.s index 902f5dc6..f1e42500 100644 --- a/asm/non_matchings/unknown_032760/obj_loop_weaponballoon.s +++ b/asm/non_matchings/unknown_032760/obj_loop_weaponballoon.s @@ -268,7 +268,7 @@ glabel obj_loop_weaponballoon /* 03F0FC 8003E4FC 24C400A0 */ addiu $a0, $a2, 0xa0 .L8003E500: /* 03F100 8003E500 3089FFFF */ andi $t1, $a0, 0xffff -/* 03F104 8003E504 0C000741 */ jal func_80001D04 +/* 03F104 8003E504 0C000741 */ jal play_sound_global /* 03F108 8003E508 01202025 */ move $a0, $t1 /* 03F10C 8003E50C 1000001D */ b .L8003E584 /* 03F110 8003E510 240D0001 */ li $t5, 1 @@ -300,7 +300,7 @@ glabel obj_loop_weaponballoon /* 03F16C 8003E56C 244400A0 */ addiu $a0, $v0, 0xa0 /* 03F170 8003E570 308CFFFF */ andi $t4, $a0, 0xffff /* 03F174 8003E574 01802025 */ move $a0, $t4 -/* 03F178 8003E578 0C000741 */ jal func_80001D04 +/* 03F178 8003E578 0C000741 */ jal play_sound_global /* 03F17C 8003E57C 00002825 */ move $a1, $zero /* 03F180 8003E580 240D0001 */ li $t5, 1 .L8003E584: diff --git a/asm/non_matchings/unknown_05CEF0/func_8005C364.s b/asm/non_matchings/unknown_05CEF0/func_8005C364.s index 8b04c94d..03a931f8 100644 --- a/asm/non_matchings/unknown_05CEF0/func_8005C364.s +++ b/asm/non_matchings/unknown_05CEF0/func_8005C364.s @@ -130,7 +130,7 @@ glabel func_8005C364 /* 05D128 8005C528 0C0172C1 */ jal func_8005CB04 /* 05D12C 8005C52C E6320020 */ swc1 $f18, 0x20($s1) /* 05D130 8005C530 24040011 */ li $a0, 17 -/* 05D134 8005C534 0C000741 */ jal func_80001D04 +/* 05D134 8005C534 0C000741 */ jal play_sound_global /* 05D138 8005C538 00002825 */ move $a1, $zero /* 05D13C 8005C53C 3C014140 */ li $at, 0x41400000 # 12.000000 /* 05D140 8005C540 44816000 */ mtc1 $at, $f12 diff --git a/asm/non_matchings/unknown_05DCD0/func_8005D0D0.s b/asm/non_matchings/unknown_05DCD0/func_8005D0D0.s index 5996b5a7..cf901d65 100644 --- a/asm/non_matchings/unknown_05DCD0/func_8005D0D0.s +++ b/asm/non_matchings/unknown_05DCD0/func_8005D0D0.s @@ -136,7 +136,7 @@ glabel func_8005D0D0 /* 05DEA8 8005D2A8 0C0172C1 */ jal func_8005CB04 /* 05DEAC 8005D2AC 24040001 */ li $a0, 1 /* 05DEB0 8005D2B0 24040011 */ li $a0, 17 -/* 05DEB4 8005D2B4 0C000741 */ jal func_80001D04 +/* 05DEB4 8005D2B4 0C000741 */ jal play_sound_global /* 05DEB8 8005D2B8 00002825 */ move $a1, $zero /* 05DEBC 8005D2BC 3C014140 */ li $at, 0x41400000 # 12.000000 /* 05DEC0 8005D2C0 44816000 */ mtc1 $at, $f12 diff --git a/asm/non_matchings/unknown_05DCD0/func_8005D820.s b/asm/non_matchings/unknown_05DCD0/func_8005D820.s index 3036cd7e..5e5a5e08 100644 --- a/asm/non_matchings/unknown_05DCD0/func_8005D820.s +++ b/asm/non_matchings/unknown_05DCD0/func_8005D820.s @@ -151,7 +151,7 @@ glabel func_8005D820 /* 05E608 8005DA08 0C0172C1 */ jal func_8005CB04 /* 05E60C 8005DA0C 24040001 */ li $a0, 1 /* 05E610 8005DA10 24040011 */ li $a0, 17 -/* 05E614 8005DA14 0C000741 */ jal func_80001D04 +/* 05E614 8005DA14 0C000741 */ jal play_sound_global /* 05E618 8005DA18 00002825 */ move $a1, $zero /* 05E61C 8005DA1C 3C014140 */ li $at, 0x41400000 # 12.000000 /* 05E620 8005DA20 44816000 */ mtc1 $at, $f12 diff --git a/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s b/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s index 6a9a4993..fe6fb819 100644 --- a/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s +++ b/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s @@ -134,7 +134,7 @@ glabel func_8005E4C0 /* 05F2A0 8005E6A0 0C0172C1 */ jal func_8005CB04 /* 05F2A4 8005E6A4 E6320020 */ swc1 $f18, 0x20($s1) /* 05F2A8 8005E6A8 24040011 */ li $a0, 17 -/* 05F2AC 8005E6AC 0C000741 */ jal func_80001D04 +/* 05F2AC 8005E6AC 0C000741 */ jal play_sound_global /* 05F2B0 8005E6B0 00002825 */ move $a1, $zero /* 05F2B4 8005E6B4 3C014140 */ li $at, 0x41400000 # 12.000000 /* 05F2B8 8005E6B8 44816000 */ mtc1 $at, $f12 diff --git a/asm/non_matchings/unknown_05F690/func_8005EA90.s b/asm/non_matchings/unknown_05F690/func_8005EA90.s index fc14cf91..6a09ced2 100644 --- a/asm/non_matchings/unknown_05F690/func_8005EA90.s +++ b/asm/non_matchings/unknown_05F690/func_8005EA90.s @@ -147,7 +147,7 @@ glabel func_8005EA90 /* 05F878 8005EC78 0C0172C1 */ jal func_8005CB04 /* 05F87C 8005EC7C 24040001 */ li $a0, 1 /* 05F880 8005EC80 24040011 */ li $a0, 17 -/* 05F884 8005EC84 0C000741 */ jal func_80001D04 +/* 05F884 8005EC84 0C000741 */ jal play_sound_global /* 05F888 8005EC88 00002825 */ move $a1, $zero /* 05F88C 8005EC8C 3C014140 */ li $at, 0x41400000 # 12.000000 /* 05F890 8005EC90 44816000 */ mtc1 $at, $f12 diff --git a/asm/non_matchings/unknown_05FF10/func_8005F310.s b/asm/non_matchings/unknown_05FF10/func_8005F310.s index cda2fc49..de86a943 100644 --- a/asm/non_matchings/unknown_05FF10/func_8005F310.s +++ b/asm/non_matchings/unknown_05FF10/func_8005F310.s @@ -147,7 +147,7 @@ glabel func_8005F310 /* 060114 8005F514 0C0172C1 */ jal func_8005CB04 /* 060118 8005F518 AFA7004C */ sw $a3, 0x4c($sp) /* 06011C 8005F51C 24040011 */ li $a0, 17 -/* 060120 8005F520 0C000741 */ jal func_80001D04 +/* 060120 8005F520 0C000741 */ jal play_sound_global /* 060124 8005F524 00002825 */ move $a1, $zero /* 060128 8005F528 3C014140 */ li $at, 0x41400000 # 12.000000 /* 06012C 8005F52C 44816000 */ mtc1 $at, $f12 diff --git a/include/enums.h b/include/enums.h index de27cf2c..e40cf813 100644 --- a/include/enums.h +++ b/include/enums.h @@ -1,6 +1,9 @@ #ifndef ENUMS_H #define ENUMS_H +#include "sound_ids.h" +#include "sequence_ids.h" + /* All the enums defined here can be used in asset files */ typedef enum Vehicle { diff --git a/include/sequence_ids.h b/include/sequence_ids.h new file mode 100644 index 00000000..a9cdfe76 --- /dev/null +++ b/include/sequence_ids.h @@ -0,0 +1,75 @@ +#ifndef SEQUENCE_IDS_H +#define SEQUENCE_IDS_H + +enum SequenceID { + SEQUENCE_NONE, + SEQUENCE_NONE2, + SEQUENCE_AMULET_THEME, + SEQUENCE_VICTORY_THEME, + SEQUENCE_TROPHY_THEME, + SEQUENCE_AMBIENT_GRASS, + SEQUENCE_INTRO_CUTSCENE, + SEQUENCE_TITLE_THEME, + SEQUENCE_DARKMOON_CAVERNS, + SEQUENCE_JUNGLE_FALLS, + SEQUENCE_ANCIENT_LAKE, + SEQUENCE_FROSTY_VILLAGE, + SEQUENCE_SECRET_TUNE, + SEQUENCE_FOSSIL_CANYON, + SEQUENCE_HOT_TOP_VOLCANO, + SEQUENCE_WHALE_BAY, + SEQUENCE_WALRUS_COVE, + SEQUENCE_NO_TROPHY_FOR_YOU, + SEQUENCE_GOLD_BALLOONS, + SEQUENCE_COLLECTION_TUNE, + SEQUENCE_MAIN_LOBBY_AREA, + SEQUENCE_PARTY_POOPER, + SEQUENCE_EVERFROST_PEAK, + SEQUENCE_WIZPIG_ATTACKS, + SEQUENCE_MAIN_MENU, + SEQUENCE_FIRST_PLACE, + SEQUENCE_CHOOSE_YOUR_RACER, + SEQUENCE_UNK27, + SEQUENCE_BOSS_CHALLENGE_VICTORY, + SEQUENCE_TAJS_RACES, + SEQUENCE_RACE_START_FANFARE, + SEQUENCE_GREENWOOD_VILLAGE, + SEQUENCE_ENTRANCED, + SEQUENCE_AMBIENT_NIGHT, + SEQUENCE_BATTLE_THEME, + SEQUENCE_AMBIENT_BEACH, + SEQUENCE_TTS_THEME, + SEQUENCE_CRESCENT_ISLAND, + SEQUENCE_BOSS_CHALLENGE_FAILURE, + SEQUENCE_STAR_CITY, + SEQUENCE_BOULDER_CANYON, + SEQUENCE_AMBIENT_UNK, + SEQUENCE_SPACEPORT_ALPHA, + SEQUENCE_SILVER_COIN_1, + SEQUENCE_SILVER_COIN_2, + SEQUENCE_SILVER_COIN_3, + SEQUENCE_SILVER_COIN_4, + SEQUENCE_SILVER_COIN_5, + SEQUENCE_SILVER_COIN_6, + SEQUENCE_SILVER_COIN_7, + SEQUENCE_SILVER_COIN_8, + SEQUENCE_WIZPIGS_TERROR, + SEQUENCE_BOSS_DOOR_UNLOCKED, + SEQUENCE_WIZPIGS_FIMAL_CHALLENGE, + SEQUENCE_KEY_COLLECT, + SEQUENCE_WIZPIGS_RACES, + SEQUENCE_WIZPIGS_DEFEAT, + SEQUENCE_BOSS_CHALLENGES, + SEQUENCE_WIZPIG_IS_BLASTED_OFF, + SEQUENCE_ENDING_PARTY_1, + SEQUENCE_ENDING_PARTY_2, + SEQUENCE_BATTLE_VICTORY, + SEQUENCE_BATTLE_LOSE, + SEQUENCE_HAUNTED_WOODS, + SEQUENCE_AMBIENT_HAUNTED_WOODS, + SEQUENCE_PIRATE_LAGOON, + + NUM_SEQUENCE_IDS +}; + +#endif diff --git a/include/sound_ids.h b/include/sound_ids.h new file mode 100644 index 00000000..6f23a0c5 --- /dev/null +++ b/include/sound_ids.h @@ -0,0 +1,659 @@ +#ifndef SOUND_IDS_H +#define SOUND_IDS_H + +// Since the game uses a lot of random selection for playing character voice clips, here are two offsets to refer to for that purpose. +// Interestingly, there's two unused ID's for each set, implying two characters that were cut. +#define SOUND_VOICE_CHARACTER_POSITIVE SOUND_VOICE_KRUNCH_POSITIVE1 +#define SOUND_VOICE_CHARACTER_NEGATIVE SOUND_VOICE_KRUNCH_NEGATIVE1 +#define SOUND_HORN_CHARACTER SOUND_HORN_KRUNCH + +/// Cannot stress enough that these names are very temporary, preliminary, expendable and other words that imply that they are not final. +// Also might be worth thinking of a better way of laying this out, because scrolling through hundreds of sound ID's isn't particularly pleasant. + +// Anything I've labelled as UNK, without a comment, is something I didn't get an audible sound from. +enum SoundID { + SOUND_UNK0, + SOUND_CAR_SLIDE, + SOUND_CAR_SLIDE2, // Not sure what this is for. I thought it was for the brakes originally, but there's clearly a brake + SOUND_INTRO_PLANE, + SOUND_INTRO_KIDS, + SOUND_UNK5, // Sounds like something sifting, idk. + SOUND_UNK6, // Same thing, but faster + SOUND_UNK7, + SOUND_UNK8, + SOUND_STOMP, + SOUND_UNK10, + SOUND_UNK11, + SOUND_CRASH, + SOUND_CRASH2, // Not the same as the last, sounds like a cymbal or something. + SOUND_BALLOON_POP, + SOUND_PLOP, // Dropping a landmine + SOUND_UNK16, + SOUND_EXPLOSION, + SOUND_NYOOM, // Firing a rocket. + SOUND_UNK19, + SOUND_UNK20, + SOUND_UNK21, + SOUND_WHOOSH1, // The hud flying in on a race start. + SOUND_EXPLOSION2, // Not sure what this one's for. + SOUND_VOICE_TT_GET_READY, + SOUND_VOICE_TT_GO, + SOUND_UNK26, + SOUND_UNK27, + SOUND_CAR_BRAKE, + SOUND_UNK_29, + SOUND_UNK_30, + SOUND_UNK_31, + SOUND_UNK_32, + SOUND_NITRO_BOOST, + SOUND_SELECT, + SOUND_VOICE_TAJ_CUTSCENE_0, // "Woah there!" + SOUND_VOICE_TAJ_CUTSCENE_1, // "Hello, friend." + SOUND_VOICE_TAJ_WAHEY, + SOUND_VOICE_TAJ_HOHO, + SOUND_LIGHTNING, + SOUND_VOICE_TAJ_WOAH, + SOUND_VOICE_TAJ_HINT, // "I've got something special for you." + SOUND_UNK42, // Sounds like a wave or something, not sure. + SOUND_RIBBIT, // :frog: + SOUND_SPLOOSH, + SOUND_VOICE_TAJ_WINNER, // "You won first prize!" + SOUND_VOICE_CONKER_YEHAHA, + SOUND_VOICE_TIMBER_WOW, + SOUND_WHOOSH2, // This is a transition before a Taj Tech Tip. + SOUND_WHOOSH3, // Don't remember what this is but I know it's used somewhere. + SOUND_VOICE_TAJ_BALLOON, // "This is for you." + SOUND_UNK51, // Some softer gong thing maybe? + SOUND_TWINKLE, // Sounds like a lower, slower version of SOUND_SELECT + SOUND_VOICE_WIZPIG_LAUGH, + SOUND_NYOOM_HIGH, // High pitched nyoom. + SOUND_UNK55, // I cannot describe tbis. uhh, a car coming past? really I can't say + SOUND_VOICE_TT_RADIO, // "Okay control" remind me to find the subtitles for this lol. It's the rocket. + SOUND_DOOR_CLOSE, + SOUND_VOICE_TT_THREE, + SOUND_VOICE_TT_TWO, + SOUND_VOICE_BUMPER_OHNO, + SOUND_VOICE_TIPTUP_WAH, + SOUND_VOICE_TT_ONE, + SOUND_VOICE_TT_BLASTOFF, + SOUND_ROCKET_LAUNCH, + SOUND_UNK65, // Sounds like an explosion sort. Likely related to the rocket. + SOUND_VOICE_DIDDY_LAUGH, + SOUND_VOICE_BANJO_GUHHUH, + SOUND_VOICE_DIDDY_LAUGH2, + SOUND_VOICE_PIPSY_LAUGH, + SOUND_VOICE_TIMBER_YEAH, + SOUND_VOICE_KRUNCH_HOHOO, + SOUND_VOICE_WIZPIG_LAUGH_SHORT, + SOUND_VOICE_TAJ_CUTSCENE2, // "I am the genie of the island." + SOUND_VOICE_PIPSY_YEHAW, + SOUND_VOICE_TAJ_CUTSCENE3, // "I'm here to help you." + SOUND_VOICE_TAJ_CUTSCENE4, // "Good luck!" + SOUND_VOICE_DIDDY_LAUGH_LOW, // Same as his regular laugh but lower pitch + SOUND_VOICE_UNK78, + SOUND_VOICE_UNK79, + SOUND_VOICE_UNK80, // "Yippee, lets party!" + SOUND_VOICE_WIZPIG_LAUGH2, + SOUND_VOICE_WIZPIG_LAUGH3, + SOUND_VOICE_WIZPIG_ENDING, // "Sorry to break the party worms, but I had to say goodbyte!" + SOUND_VOICE_WIZPIG_UNK0, // "Well lookie here, it's the little worm!" + SOUND_UNK85, // Sounds like some future something + SOUND_VOICE_WIZPIG_SEEYA, // "See ya later, worms!" + SOUND_VOICE_WIZPIG_LAUGH4, + SOUND_VOICE_BLUEY_REMATCH1, // "Fantastic!" + SOUND_VOICE_BLUEY_REMATCH2, // "If you can beat me again..." + SOUND_VOICE_BLUEY_REMATCH3, // "I'll give you a special prize" + SOUND_UNK91, // Might be the hovercraft engine. + SOUND_UNK92, // Might be the car engine. + SOUND_TING_LOW, + SOUND_TING_HIGH, + SOUND_BOOST_LEVEL3, + SOUND_UNK96, // Also not sure + SOUND_UNK97, // Sounds like an earthquake, goes on for absolutely ever, but not a continuous sound. + SOUND_ELECTRIC_BUZZ, // Bzzzz! + SOUND_UNK99, // sounds kind of like lightning but not 100% sure + SOUND_UNK100, + SOUND_UNK101, + SOUND_VOICE_TT_WRONG_WAY, + SOUND_VOICE_TT_NONONO, + SOUND_MENU_BACK, + SOUND_MENU_BACK2, // Appears to be exactly the same as the previous to my tonedeaf ears. + SOUND_UNK106, // Same thing as the previous but with an inverse wave. + SOUND_VOICE_WIZPIG_ENCOUNTER, // "You can't beat me!" + SOUND_VOICE_WIZPIG_DEFEAT, // "Gragh, no! No!" + SOUND_VOICE_WIZPIG_GROAN, + SOUND_VOICE_WIZPIG_SCREAM, + SOUND_ZAP, + SOUND_ZAP2, + SOUND_ZAP3, + SOUND_VOICE_WIZPIG_SCREAM2, + SOUND_VOICE_KRUNCH_LAUGH, + SOUND_UNK116, // More lightning? + SOUND_VOICE_WIZPIG_SCREAM3, + SOUND_VOICE_DRUMSTUCK_BWAK, // Chicken noises intensify. + SOUND_VOICE_BLUEY_GOODBYE, // "Goodbye, Kid!" + SOUND_VOICE_BANJO_YAHOO, + SOUND_VOICE_BLUEY_SILVERCOINS2, // "Collect all the silver coins from the snow world" + SOUND_CAR_REV, // Selecting the car in the menu, and the initial revs at the start. + SOUND_UNK123, + SOUND_UNK124, + SOUND_UNK125, + SOUND_UNK126, + SOUND_UNK127, + SOUND_UNK128, + SOUND_UNK129, + SOUND_UNK130, + SOUND_UNK131, + SOUND_UNK132, + SOUND_VOICE_BLUEY_TROPHY_CHALLENGE, // "Now try the trophy challenge" + SOUND_VOICE_BLUEY_AMULET, // "You've won a piece of the amulet" + SOUND_VOICE_KRUNCH_SELECT, // "My name's Krunch" + SOUND_VOICE_BUMPER_SELECT, // "My name's Bumper" + SOUND_VOICE_TIPTUP_SELECT, // "Hey, it's Tiptup" + SOUND_VOICE_CONKER_SELECT, // "I'm Conker" + SOUND_VOICE_TIMBER_SELECT, // "Timber" + SOUND_VOICE_BANJO_SELECT, // "I'm Banjo" + SOUND_VOICE_DRUMSTICK_SELECT, // "My name's Drumstick" + SOUND_VOICE_PIPSY_SELECT, // "I'm Pipsy" + SOUND_VOICE_TT_SELECT, // I'm T.T + SOUND_VOICE_DIDDY_SELECT, // "I'm Diddy" + SOUND_VOICE_BLUEY_RETRY, // "You can come back, whenever you're ready" + SOUND_VOICE_BLUEY_NEVERMIND, // "Ah, nevermind kid." + SOUND_VOICE_KRUNCH_EHH, + SOUND_VOICE_BUMPER_UHH, + SOUND_VOICE_TIPTUP_AHH, + SOUND_VOICE_CONKER_AHH, + SOUND_VOICE_TIMBER_RAGH, + SOUND_VOICE_BANJO_WOAH, + SOUND_VOICE_DRUMSTICK_WAH, + SOUND_VOICE_PIPSY_UHOH, + SOUND_VOICE_TT_WOAH, + SOUND_VOICE_DIDDY_WOAH, + SOUND_VOICE_BLUEY_SILVERCOINS3, // "Collect 8 from each level and win" + SOUND_VOICE_BLUEY_SILVERCOINS4, // "Then come back and see me" + SOUND_SHIELD, + SOUND_COLLECT_ITEM, + SOUND_COLLECT_ITEM_TIER2, + SOUND_COLLECT_ITEM_TIER3, + SOUND_VOICE_TRICKY_WOAH, + SOUND_VOICE_TRICKY_WOAH2, // Same as the last + SOUND_VOICE_TRICKY_HM, + SOUND_VOICE_TRICKY_HMMM, + SOUND_VOICE_BLUEY_EH, + SOUND_VOICE_BLUEY_OHNO, + SOUND_FLUTTERING, // idk + SOUND_PLANE_ENGINE, + SOUND_BOING, + SOUND_STOMP2, + SOUND_STOMP3, + SOUND_BOUNCE, + SOUND_UNK175, // sounds just like UNK5 + SOUND_FOOTSTEP, + SOUND_UNK177, // Very low pitch something + SOUND_MENU_PICK, + SOUND_VOICE_WIZPIG_LAUGH_SHORT2, + SOUND_VOICE_WIZPIG_LAUGH_SHORT3, + SOUND_VOICE_WIZPIG_HA, + SOUND_VOICE_WIZPIG_H2, + SOUND_VOICE_BLUEY_HAHA, + SOUND_VOICE_BLUEY_HAHA2, + SOUND_VOICE_BLUEY_SILVERCOINS1, // "Now try my new challenge" + SOUND_VOICE_TRICKY_ENCOUNTER1, // "Now I challenge you to a race" + SOUND_VOICE_TRICKY_SILVERCOINS1, // "Now try my new challenge" + SOUND_VOICE_TRICKY_SILVERCOINS2, // "Collect all the silver coins from the dino domain." + SOUND_VOICE_TRICKY_GOODTRY, // "Good one, kid" + SOUND_VOICE_TRICKY_NEVERMIND, // "Maybe next time." + SOUND_VOICE_TRICKY_RETRY, // "Come back whenever you're ready." + SOUND_VOICE_TRICKY_SILVERCOINS6, // "Then come back and see me" + SOUND_VOICE_TRICKY_TROPHY1, // "Well done kid" + SOUND_VOICE_TRICKY_TROPHY2, // "You've earned a piece of the amulet" + SOUND_VOICE_TRICKY_TROPHY3, // "Now try the trophy challenge" + SOUND_VOICE_TRICKY_TROPHY4, // "See ya later" + SOUND_VOICE_TRICKY_SILVERCOINS4, // "You must find 8 from each level" + SOUND_VOICE_TRICKY_SILVERCOINS5, // "and win" + SOUND_VOICE_TRICKY_REMATCH1, // "Fantastic" + SOUND_VOICE_TRICKY_REMATCH2, // "If you can beat me again" + SOUND_VOICE_TRICKY_REMATCH3, // "I'll give you a special prize" + SOUND_VOICE_SMOKEY_ENCOUNTER1, // "Hahahaha!" + SOUND_VOICE_SMOKEY_ENCOUNTER2, // "Now I challenge you to a race!" + SOUND_VOICE_SMOKEY_SILVERCOINS1, // "Now try my new challenge" + SOUND_VOICE_SMOKEY_SILVERCOINS2, // "Collect all the silver coins from my world" + SOUND_VOICE_SMOKEY_GOODTRY, // "Excellent" + SOUND_VOICE_SMOKEY_SILVERCOINS3, // "You must find 8 from each level and win" + SOUND_VOICE_SMOKEY_SILVERCOINS4, // "Then come back and see me" + SOUND_UNK209, + SOUND_VOICE_SMOKEY_BADLUCK, // "Bad luck" + SOUND_VOICE_SMOKEY_RETRY, // "Try again whenever you're ready" + SOUND_VOICE_SMOKEY_TROPHY1, // "You have earned a piece of the amulet" + SOUND_VOICE_SMOKEY_TROPHY2, // "Now try the trophy challenge" + SOUND_VOICE_SMOKEY_TROPHY3, // "Goodbye" + SOUND_VOICE_SMOKEY_REMATCH2, // "If you can beat me again" + SOUND_VOICE_SMOKEY_REMATCH3, // "I'll give you a special prize" + SOUND_VOICE_BUBBLER_ENCOUNTER1, // "Well done!" + SOUND_VOICE_BUBBLER_ENCOUNTER2, // "Now I challenge you to a race!" + SOUND_VOICE_BUBBLER_SILVERCOINS1, // "Try my new challenge" + SOUND_VOICE_BUBBLER_SILVERCOINS2, // "Collect all the silver coins from my world." + SOUND_VOICE_BUBBLER_SILVERCOINS3, // "Find 8 from each level and win" + SOUND_VOICE_BUBBLER_BADLUCK, // "Tough luck, kid" + SOUND_VOICE_BUBBLER_BADLUCK2, // "Maybe next time" + SOUND_VOICE_BUBBLER_RETRY, // "Come back whenever you're ready" + SOUND_VOICE_BUBBLER_TROPHY1, // "Well done, shrimp" + SOUND_VOICE_BUBBLER_TROPHY2, // "You have earned a piece of the amulet" + SOUND_VOICE_BUBBLER_TROPHY3, // "Now try the trophy challenge" + SOUND_VOICE_BUBBLER_TROPHY4, // "Goodbye" + SOUND_VOICE_BUBBLER_REMATCH2, // "If you can beat me again" + SOUND_VOICE_BUBBLER_REMATCH3, // "I'll give you a special prize" + SOUND_VOICE_BUBBLER_SILVERCOINS4, // "Then return to me" + SOUND_VOICE_BUBBLER_HAHA, + SOUND_VOICE_BLUEY_ENCOUNTER1, // "Well done" + SOUND_VOICE_BLUEY_ENCOUNTER2, // "Now I challenge you to a race" + SOUND_MENU_PICK2, + SOUND_MENU_PICK3, + SOUND_UNK237, + SOUND_UNK238, + SOUND_SELECT2, + SOUND_VOICE_TRICKY_WOAH3, + SOUND_VOICE_TRICKY_WOAH4, + SOUND_VOICE_SMOKEY_EH, + SOUND_VOICE_SMOKEY_HEH, + SOUND_VOICE_BLUEY_EH2, + SOUND_VOICE_BLUEY_OHNO2, + SOUND_VOICE_TRICKY_LAUGH, + SOUND_VOICE_TRICKY_LAUGH2, + SOUND_VOICE_SMOKEY_HAH, + SOUND_VOICE_SMOKEY_LAUGH, + SOUND_VOICE_BLUEY_HAHA3, + SOUND_VOICE_BLUEY_HAHA4, + SOUND_UNK252, + SOUND_CROWD, + SOUND_MENU_PICK4, + SOUND_UNK255, + SOUND_VOICE_TT_LAP2, + SOUND_VOICE_TT_FINAL_LAP, + SOUND_VOICE_TT_FINISH, + SOUND_UNK259, // Sounds like car engines driving past + SOUND_UNK260, // Continuous sound, not sure what it is + SOUND_VOICE_TT_DIDDY_KONG_RACING, // title drop + SOUND_VOICE_TT_PRESS_START, + SOUND_ZIP_PAD_BOOST, + SOUND_UNK264, + SOUND_UNK265, + SOUND_UNK266, + SOUND_STOMP4, + SOUND_STOMP5, + SOUND_INTRO_KIDS2, + SOUND_INTRO_PLANE2, + SOUND_VOICE_TAJ_HELLO, // "Hello, friend" + SOUND_WHOOSH4, + SOUND_VOICE_TAJ_BYE, // "Byebye for now" + SOUND_VOICE_TAJ_ALAKAZOOM, + SOUND_CYMBAL, + SOUND_SELECT3, + SOUND_VOICE_TT_ANCIENT_LAKE, + SOUND_VOICE_TT_BOULDER_CANYON, + SOUND_VOICE_TT_CRESCENT_ISLAND, + SOUND_VOICE_TT_DARKMOON_CAVERNS, + SOUND_VOICE_TT_EVERFROST_PEAK, + SOUND_VOICE_TT_FOSSIL_CANYON, + SOUND_VOICE_TT_FROSTY_VILLAGE, + SOUND_VOICE_TT_GREENWOOD_VILLAGE, + SOUND_VOICE_TT_HOT_TOP_VOLCANO, + SOUND_VOICE_TT_HAUNTED_WOODS, + SOUND_VOICE_TT_JUNGLE_FALLS, + SOUND_VOICE_TT_PIRATE_LAGOON, + SOUND_VOICE_TT_SNOWBALL_VALLEY, + SOUND_VOICE_TT_SPACEDUST_VALLEY, + SOUND_VOICE_TT_SPACEPORT_ALPHA, + SOUND_VOICE_TT_TREASURE_CAVES, + SOUND_VOICE_TT_STAR_CITY, + SOUND_VOICE_TT_WALRUS_COVE, + SOUND_VOICE_TT_WINDMILL_PLAINS, + SOUND_VOICE_TT_DINO_DOMAIN, + SOUND_VOICE_TT_DRAGON_FOREST, + SOUND_VOICE_TT_FUTURE_FUN_LAND, + SOUND_VOICE_TT_ICICLE_PYRAMID, + SOUND_VOICE_TT_SHIVER_ISLAND, + SOUND_VOICE_TT_SNOWFLAKE_MOUNTAIN, + SOUND_VOICE_TT_SMOKEY_CASTLE, + SOUND_VOICE_TT_TROPHY_RACE, + SOUND_VOICE_TT_WHALE_BAY, + SOUND_CAR_REV2, + SOUND_VOICE_TT_SNORE, + SOUND_LASER_GUN, + SOUND_NYOOM2, + SOUND_NYOOM3, + SOUND_HOMING_ROCKET, + SOUND_INCOMING_ROCKET, + SOUND_BOUNCE2, + SOUND_WHEE, + SOUND_MAGNET_HUM, + SOUND_TYRE_SCREECH, + SOUND_TWANG, + SOUND_UNK317, // Unsure + SOUND_VOICE_TT_POWERUP, + SOUND_SPLOINK, + SOUND_PLOP2, + SOUND_VOICE_TT_INTRO, // "Hi there, I'm T.T!" + SOUND_VOICE_TT_SEE_YOU, // "See you there" + SOUND_VOICE_TT_OK, + SOUND_VOICE_TT_LAP_RECORD, + SOUND_VOICE_TT_RACE_RECORD, + SOUND_UNK326, + SOUND_VOICE_TT_GO_FOR_IT, + SOUND_VOICE_TT_KEEP_GOING, + SOUND_VOICE_TT_YOU_CAN_DO_THIS, + SOUND_UNK330, + SOUND_VOICE_TT_OH_NO, + SOUND_VOICE_TT_TOO_BAD, + SOUND_VOICE_TT_UNLUCKY, + SOUND_VOICE_TT_NOT_AGAIN, + SOUND_TING_HIGHER, // Even higher than high. + SOUND_TING_HIGHEST, // Truly the tingiest ting of them all. + SOUND_SPLOINK2, + SOUND_BUBBLE, // The sound of pure rage, embodied. + SOUND_VOICE_TT_DARKWATER_BEACH, + SOUND_VOICE_TT_FIRE_MOUNTAIN, + SOUND_POP, + SOUND_HORN_KRUNCH, + SOUND_HORN_BUMPER, + SOUND_HORN_TIPTUP, + SOUND_HORN_CONKER, + SOUND_HORN_TIMBER, + SOUND_HORN_BANJO, + SOUND_HORN_DRUMSTICK, + SOUND_HORN_PIPSY, + SOUND_HORN_TT, + SOUND_HORN_DIDDY, + SOUND_HORN_UNUSED1, + SOUND_HORN_UNUSED2, + SOUND_VOICE_KRUNCH_POSITIVE1, + SOUND_VOICE_BUMPER_POSITIVE1, + SOUND_VOICE_TIPTUP_POSITIVE1, + SOUND_VOICE_CONKER_POSITIVE1, + SOUND_VOICE_TIMBER_POSITIVE1, + SOUND_VOICE_BANJO_POSITIVE1, + SOUND_VOICE_DRUMSTICK_POSITIVE1, + SOUND_VOICE_PIPSY_POSITIVE1, + SOUND_VOICE_TT_POSITIVE1, + SOUND_VOICE_DIDDY_POSITIVE1, + SOUND_VOICE_UNUSED1_POSITIVE1, + SOUND_VOICE_UNUSED2_POSITIVE1, + SOUND_VOICE_KRUNCH_POSITIVE2, + SOUND_VOICE_BUMPER_POSITIVE2, + SOUND_VOICE_TIPTUP_POSITIVE2, + SOUND_VOICE_CONKER_POSITIVE2, + SOUND_VOICE_TIMBER_POSITIVE2, + SOUND_VOICE_BANJO_POSITIVE2, + SOUND_VOICE_DRUMSTICK_POSITIVE2, + SOUND_VOICE_PIPSY_POSITIVE2, + SOUND_VOICE_TT_POSITIVE2, + SOUND_VOICE_DIDDY_POSITIVE2, + SOUND_VOICE_UNUSED1_POSITIVE2, + SOUND_VOICE_UNUSED2_POSITIVE2, + SOUND_VOICE_KRUNCH_POSITIVE3, + SOUND_VOICE_BUMPER_POSITIVE3, + SOUND_VOICE_TIPTUP_POSITIVE3, + SOUND_VOICE_CONKER_POSITIVE3, + SOUND_VOICE_TIMBER_POSITIVE3, + SOUND_VOICE_BANJO_POSITIVE3, + SOUND_VOICE_DRUMSTICK_POSITIVE3, + SOUND_VOICE_PIPSY_POSITIVE3, + SOUND_VOICE_TT_POSITIVE3, + SOUND_VOICE_DIDDY_POSITIVE3, + SOUND_VOICE_UNUSED1_POSITIVE3, + SOUND_VOICE_UNUSED2_POSITIVE3, + SOUND_VOICE_KRUNCH_POSITIVE4, + SOUND_VOICE_BUMPER_POSITIVE4, + SOUND_VOICE_TIPTUP_POSITIVE4, + SOUND_VOICE_CONKER_POSITIVE4, + SOUND_VOICE_TIMBER_POSITIVE4, + SOUND_VOICE_BANJO_POSITIVE4, + SOUND_VOICE_DRUMSTICK_POSITIVE4, + SOUND_VOICE_PIPSY_POSITIVE4, + SOUND_VOICE_TT_POSITIVE4, + SOUND_VOICE_DIDDY_POSITIVE4, + SOUND_VOICE_UNUSED1_POSITIVE4, + SOUND_VOICE_UNUSED2_POSITIVE4, + SOUND_VOICE_KRUNCH_POSITIVE5, + SOUND_VOICE_BUMPER_POSITIVE5, + SOUND_VOICE_TIPTUP_POSITIVE5, + SOUND_VOICE_CONKER_POSITIVE5, + SOUND_VOICE_TIMBER_POSITIVE5, + SOUND_VOICE_BANJO_POSITIVE5, + SOUND_VOICE_DRUMSTICK_POSITIVE5, + SOUND_VOICE_PIPSY_POSITIVE5, + SOUND_VOICE_TT_POSITIVE5, + SOUND_VOICE_DIDDY_POSITIVE5, + SOUND_VOICE_UNUSED1_POSITIVE5, + SOUND_VOICE_UNUSED2_POSITIVE5, + SOUND_VOICE_KRUNCH_POSITIVE6, + SOUND_VOICE_BUMPER_POSITIVE6, + SOUND_VOICE_TIPTUP_POSITIVE6, + SOUND_VOICE_CONKER_POSITIVE6, + SOUND_VOICE_TIMBER_POSITIVE6, + SOUND_VOICE_BANJO_POSITIVE6, + SOUND_VOICE_DRUMSTICK_POSITIVE6, + SOUND_VOICE_PIPSY_POSITIVE6, + SOUND_VOICE_TT_POSITIVE6, + SOUND_VOICE_DIDDY_POSITIVE6, + SOUND_VOICE_UNUSED1_POSITIVE6, + SOUND_VOICE_UNUSED2_POSITIVE6, + SOUND_VOICE_KRUNCH_POSITIVE7, + SOUND_VOICE_BUMPER_POSITIVE7, + SOUND_VOICE_TIPTUP_POSITIVE7, + SOUND_VOICE_CONKER_POSITIVE7, + SOUND_VOICE_TIMBER_POSITIVE7, + SOUND_VOICE_BANJO_POSITIVE7, + SOUND_VOICE_DRUMSTICK_POSITIVE7, + SOUND_VOICE_PIPSY_POSITIVE7, + SOUND_VOICE_TT_POSITIVE7, + SOUND_VOICE_DIDDY_POSITIVE7, + SOUND_VOICE_UNUSED1_POSITIVE7, + SOUND_VOICE_UNUSED2_POSITIVE7, + SOUND_VOICE_KRUNCH_POSITIVE8, + SOUND_VOICE_BUMPER_POSITIVE8, + SOUND_VOICE_TIPTUP_POSITIVE8, + SOUND_VOICE_CONKER_POSITIVE8, + SOUND_VOICE_TIMBER_POSITIVE8, + SOUND_VOICE_BANJO_POSITIVE8, + SOUND_VOICE_DRUMSTICK_POSITIVE8, + SOUND_VOICE_PIPSY_POSITIVE8, + SOUND_VOICE_TT_POSITIVE8, + SOUND_VOICE_DIDDY_POSITIVE8, + SOUND_VOICE_UNUSED1_POSITIVE8, + SOUND_VOICE_UNUSED2_POSITIVE8, + SOUND_VOICE_KRUNCH_NEGATIVE1, + SOUND_VOICE_BUMPER_NEGATIVE1, + SOUND_VOICE_TIPTUP_NEGATIVE1, + SOUND_VOICE_CONKER_NEGATIVE1, + SOUND_VOICE_TIMBER_NEGATIVE1, + SOUND_VOICE_BANJO_NEGATIVE1, + SOUND_VOICE_DRUMSTICK_NEGATIVE1, + SOUND_VOICE_PIPSY_NEGATIVE1, + SOUND_VOICE_TT_NEGATIVE1, + SOUND_VOICE_DIDDY_NEGATIVE1, + SOUND_VOICE_UNUSED1_NEGATIVE1, + SOUND_VOICE_UNUSED2_NEGATIVE1, + SOUND_VOICE_KRUNCH_NEGATIVE2, + SOUND_VOICE_BUMPER_NEGATIVE2, + SOUND_VOICE_TIPTUP_NEGATIVE2, + SOUND_VOICE_CONKER_NEGATIVE2, + SOUND_VOICE_TIMBER_NEGATIVE2, + SOUND_VOICE_BANJO_NEGATIVE2, + SOUND_VOICE_DRUMSTICK_NEGATIVE2, + SOUND_VOICE_PIPSY_NEGATIVE2, + SOUND_VOICE_TT_NEGATIVE2, + SOUND_VOICE_DIDDY_NEGATIVE2, + SOUND_VOICE_UNUSED1_NEGATIVE2, + SOUND_VOICE_UNUSED2_NEGATIVE2, + SOUND_VOICE_KRUNCH_NEGATIVE3, + SOUND_VOICE_BUMPER_NEGATIVE3, + SOUND_VOICE_TIPTUP_NEGATIVE3, + SOUND_VOICE_CONKER_NEGATIVE3, + SOUND_VOICE_TIMBER_NEGATIVE3, + SOUND_VOICE_BANJO_NEGATIVE3, + SOUND_VOICE_DRUMSTICK_NEGATIVE3, + SOUND_VOICE_PIPSY_NEGATIVE3, + SOUND_VOICE_TT_NEGATIVE3, + SOUND_VOICE_DIDDY_NEGATIVE3, + SOUND_VOICE_UNUSED1_NEGATIVE3, + SOUND_VOICE_UNUSED2_NEGATIVE3, + SOUND_VOICE_KRUNCH_NEGATIVE4, + SOUND_VOICE_BUMPER_NEGATIVE4, + SOUND_VOICE_TIPTUP_NEGATIVE4, + SOUND_VOICE_CONKER_NEGATIVE4, + SOUND_VOICE_TIMBER_NEGATIVE4, + SOUND_VOICE_BANJO_NEGATIVE4, + SOUND_VOICE_DRUMSTICK_NEGATIVE4, + SOUND_VOICE_PIPSY_NEGATIVE4, + SOUND_VOICE_TT_NEGATIVE4, + SOUND_VOICE_DIDDY_NEGATIVE4, + SOUND_VOICE_UNUSED1_NEGATIVE4, + SOUND_VOICE_UNUSED2_NEGATIVE4, + SOUND_VOICE_KRUNCH_NEGATIVE5, + SOUND_VOICE_BUMPER_NEGATIVE5, + SOUND_VOICE_TIPTUP_NEGATIVE5, + SOUND_VOICE_CONKER_NEGATIVE5, + SOUND_VOICE_TIMBER_NEGATIVE5, + SOUND_VOICE_BANJO_NEGATIVE5, + SOUND_VOICE_DRUMSTICK_NEGATIVE5, + SOUND_VOICE_PIPSY_NEGATIVE5, + SOUND_VOICE_TT_NEGATIVE5, + SOUND_VOICE_DIDDY_NEGATIVE5, + SOUND_VOICE_UNUSED1_NEGATIVE5, + SOUND_VOICE_UNUSED2_NEGATIVE5, + SOUND_VOICE_KRUNCH_NEGATIVE6, + SOUND_VOICE_BUMPER_NEGATIVE6, + SOUND_VOICE_TIPTUP_NEGATIVE6, + SOUND_VOICE_CONKER_NEGATIVE6, + SOUND_VOICE_TIMBER_NEGATIVE6, + SOUND_VOICE_BANJO_NEGATIVE6, + SOUND_VOICE_DRUMSTICK_NEGATIVE6, + SOUND_VOICE_PIPSY_NEGATIVE6, + SOUND_VOICE_TT_NEGATIVE6, + SOUND_VOICE_DIDDY_NEGATIVE6, + SOUND_VOICE_UNUSED1_NEGATIVE6, + SOUND_VOICE_UNUSED2_NEGATIVE6, + SOUND_VOICE_KRUNCH_NEGATIVE7, + SOUND_VOICE_BUMPER_NEGATIVE7, + SOUND_VOICE_TIPTUP_NEGATIVE7, + SOUND_VOICE_CONKER_NEGATIVE7, + SOUND_VOICE_TIMBER_NEGATIVE7, + SOUND_VOICE_BANJO_NEGATIVE7, + SOUND_VOICE_DRUMSTICK_NEGATIVE7, + SOUND_VOICE_PIPSY_NEGATIVE7, + SOUND_VOICE_TT_NEGATIVE7, + SOUND_VOICE_DIDDY_NEGATIVE7, + SOUND_VOICE_UNUSED1_NEGATIVE7, + SOUND_VOICE_UNUSED2_NEGATIVE7, + SOUND_VOICE_KRUNCH_NEGATIVE8, + SOUND_VOICE_BUMPER_NEGATIVE8, + SOUND_VOICE_TIPTUP_NEGATIVE8, + SOUND_VOICE_CONKER_NEGATIVE8, + SOUND_VOICE_TIMBER_NEGATIVE8, + SOUND_VOICE_BANJO_NEGATIVE8, + SOUND_VOICE_DRUMSTICK_NEGATIVE8, + SOUND_VOICE_PIPSY_NEGATIVE8, + SOUND_VOICE_TT_NEGATIVE8, + SOUND_VOICE_DIDDY_NEGATIVE8, + //Betting these are unused, because they sit in the spot where character ID's should be. + SOUND_VOICE_BLUEY_REMATCH4, // "If you can beat me again..." + SOUND_VOICE_BLUEY_TROPHY2, // "Goodbye kid" + SOUND_UNK546, // I'm guessing rolling snowballs + SOUND_UNK547, // The sound of hitting something + SOUND_UNK548, // Same + SOUND_VOICE_TRICKY_OW, + SOUND_VOICE_TRICKY_OW2, + SOUND_VOICE_SMOKEY_HM, + SOUND_VOICE_SMOKEY_HM2, + SOUND_VOICE_BLUEY_AIEE, + SOUND_VOICE_BLUEY_OHNO3, + SOUND_VOICE_BOSS_LAUGH, // Don't recognise it + SOUND_VOICE_BOSS_LAUGH2, // Yeah + SOUND_VOICE_BLUEY_EH3, + SOUND_VOICE_TT_GAME_STATUS, + SOUND_VOICE_TT_OKAY, + SOUND_VOICE_TT_TIME_TRIAL_OFF, + SOUND_VOICE_TT_TIME_TRIAL_ON, + SOUND_NITRO_LEVEL3_CHARGE, + SOUND_NITRO_LEVEL3_BOOST, + SOUND_VOICE_TAJ_SELECT_VEHICLE, + SOUND_VOICE_TAJ_ABRAKADABRA, + SOUND_VOICE_TAJ_ALAKAZAM, + SOUND_VOICE_TAJ_ALAKAZOOM2, + SOUND_VOICE_TAJ_MENUBACK, // "Can I help you further?" + SOUND_VOICE_TAJ_CHALLENGE_MENU, // "Select the challenge of your choice" + SOUND_VOICE_TAJ_MENUBACK2, // "Will that be all?" + SOUND_VOICE_BRONTO_ROAR, + SOUND_WHOOSH5, + SOUND_COLLECT_BALLOON, + SOUND_RAIN, + SOUND_UNK575, // Might be thunder + SOUND_ZAP4, + SOUND_MENU_BACK3, + SOUND_VOICE_BUBBLER_OW, + SOUND_VOICE_BUBBLER_AUGH, + SOUND_VOICE_BUBBLER_HOHO, + SOUND_VOICE_BUBBLER_HOHO2, + SOUND_VOICE_BUBBLER_AW, + SOUND_VOICE_BUBBLER_OW2, + SOUND_VOICE_BUBBLER_AUGH2, + SOUND_DRAWBRIDGE_BELL, + SOUND_BUBBLE_RISE, + SOUND_VOICE_TT_BEAT_MY_TIME, // "Now try beat my time" + SOUND_VOICE_TT_WELL_THEN, + SOUND_VOICE_TT_TRY_ANOTHER_TRACK, // "Now try another track" + SOUND_VOICE_TT_BEAT_ALL_TIMES, // "You've beaten all my times" + SOUND_VOICE_TT_UNLOCKED, // "Now you can pick me" + SOUND_VOICE_TAJ_CHALLENGE_RACE, // "I challenge you to a race" + SOUND_UNK593, + SOUND_UNK594, + SOUND_UNK595, + SOUND_UNK596, + SOUND_UNK597, + SOUND_UNK598, + SOUND_UNK599, + SOUND_UNK600, + SOUND_UNK601, + SOUND_UNK602, + SOUND_UNK603, + SOUND_UNK604, + SOUND_UNK605, + SOUND_UNK606, + SOUND_UNK607, + SOUND_UNK608, + SOUND_UNK609, + SOUND_UNK610, + SOUND_UNK611, + SOUND_UNK612, + SOUND_UNK613, + SOUND_UNK614, + SOUND_UNK615, + SOUND_UNK616, + SOUND_UNK617, + SOUND_UNK618, + SOUND_UNK619, + SOUND_UNK620, + SOUND_UNK621, + SOUND_UNK622, + SOUND_UNK623, + SOUND_UNK624, + SOUND_UNK625, + SOUND_UNK626, + SOUND_UNK627, + SOUND_UNK628, + SOUND_UNK629, + SOUND_UNK630, + SOUND_UNK631, + SOUND_UNK632, + SOUND_UNK633, + SOUND_UNK634, + SOUND_UNK635, + SOUND_UNK636, + SOUND_UNK637, + SOUND_UNK638, + // Trying to play 639 onwards will incur a crash. + NUM_SOUND_IDS +}; + +#endif diff --git a/include/structs.h b/include/structs.h index eb92488d..f44f4f57 100644 --- a/include/structs.h +++ b/include/structs.h @@ -922,9 +922,9 @@ typedef struct Object_Racer { /* 0x19C */ s16 unk19C; /* 0x19E */ s16 unk19E; /* 0x1A0 */ s16 unk1A0; - /* 0x1A2 */ s16 unk1A2; - /* 0x1A4 */ s16 unk1A4; - /* 0x1A6 */ s16 unk1A6; + /* 0x1A2 */ s16 y_rotation_vel; + /* 0x1A4 */ s16 x_rotation_vel; + /* 0x1A6 */ s16 z_rotation_vel; /* 0x1A8 */ s16 unk1A8; /* 0x1AA */ u16 unk1AA; /* 0x1AC */ u8 unk1AC; @@ -942,14 +942,14 @@ typedef struct Object_Racer { /* 0x1C9 */ u8 unk1C9; /* 0x1CA */ s8 unk1CA; /* 0x1CB */ u8 unk1CB; - /* 0x1CC */ s8 unk1CC; + /* 0x1CC */ s8 aiSkill; /* 0x1CD */ u8 unk1CD; /* 0x1CE */ u8 unk1CE; /* 0x1CF */ s8 unk1CF; /* 0x1D0 */ s8 spectateCamID; /* 0x1D1 */ u8 unk1D1; /* 0x1D2 */ s8 unk1D2; - /* 0x1D3 */ s8 unk1D3; + /* 0x1D3 */ s8 boostTimer; /* 0x1D4 */ u8 unk1D4; /* 0x1D5 */ u8 unk1D5; /* 0x1D6 */ s8 unk1D6; @@ -960,7 +960,7 @@ typedef struct Object_Racer { /* 0x1DB */ s8 spinout_timer; /* 0x1DC */ u8 wheel_surfaces[4]; /* 0x1E0 */ s8 unk1E0; - /* 0x1E1 */ s8 unk1E1; + /* 0x1E1 */ s8 steerAngle; /* 0x1E2 */ s8 unk1E2; /* 0x1E3 */ s8 unk1E3; /* 0x1E4 */ s8 unk1E4; @@ -979,7 +979,7 @@ typedef struct Object_Racer { /* 0x1F1 */ u8 unk1F1; /* 0x1F2 */ u8 unk1F2; /* 0x1F3 */ u8 unk1F3; - /* 0x1F4 */ u8 unk1F4; + /* 0x1F4 */ u8 startInput; /* 0x1F5 */ u8 unk1F5; /* 0x1F6 */ u8 unk1F6; /* 0x1F7 */ u8 transparency; @@ -994,13 +994,13 @@ typedef struct Object_Racer { /* 0x200 */ s8 unk200; /* 0x201 */ s8 unk201; /* 0x202 */ s8 unk202; - /* 0x203 */ s8 unk203; + /* 0x203 */ s8 boostType; /* 0x204 */ s16 unk204; /* 0x206 */ s16 unk206; /* 0x208 */ s16 unk208; /* 0x20A */ s8 unk20A; /* 0x20B */ s8 unk20B; - /* 0x20C */ u8 unk20C; + /* 0x20C */ u8 throttleReleased; /* 0x20D */ u8 unk20D; /* 0x20E */ s16 unk20E; /* 0x210 */ s8 unk210; diff --git a/src/audio.c b/src/audio.c index fca72d12..4c73fbb0 100644 --- a/src/audio.c +++ b/src/audio.c @@ -233,10 +233,10 @@ void func_80000B28(void) { D_800DC648 = 0; } -void play_music(u8 arg0) { +void play_music(u8 seqID) { if (D_800DC648 == 0 && musicVolumeSliderPercentage != 0) { - D_80115D04 = arg0; - musicRelativeVolume = 0x7F; + D_80115D04 = seqID; + musicRelativeVolume = 127; if (D_800DC640 != 0) { func_800022BC(D_80115D04, gMusicPlayer); } @@ -318,7 +318,7 @@ void handle_music_fade(u8 updateRate) { D_80115D48[reg_s2].unk2 -= updateRate; if (D_80115D48[reg_s2].unk2 <= 0) { j = reg_s2; - func_80001D04(D_80115D48[reg_s2].unk0, D_80115D48[reg_s2].unk4); + play_sound_global(D_80115D48[reg_s2].unk0, D_80115D48[reg_s2].unk4); D_800DC658 -= 1; while (j < D_800DC658) { @@ -643,9 +643,13 @@ void sfxSetPan(ALPan pan) { return; } -void play_sound(u8 arg0) { +/** + * Plays a sequence just once, allowing it to coexist with the music if necessary. + * Examples include getting silver coins, challenge keys, or getting the locked message. + */ +void play_sequence(u8 seqID) { D_800DC644 = 1; - func_800022BC(D_80115D05 = arg0, gSndFxPlayer); + func_800022BC(D_80115D05 = seqID, gSndFxPlayer); } u32 func_80001C08(void) { @@ -671,30 +675,30 @@ u16 func_80001CB8(u16 arg0) { } //Play Sound effect? -GLOBAL_ASM("asm/non_matchings/audio/func_80001D04.s") +GLOBAL_ASM("asm/non_matchings/audio/play_sound_global.s") -void func_80001EA8(u16 arg0, f32 x, f32 y, f32 z, s32 **arg4) { +void play_sound_spatial(u16 soundID, f32 x, f32 y, f32 z, s32 **arg4) { if (arg4 == NULL) { arg4 = &D_80115F84; } - func_80001D04(arg0, arg4); + play_sound_global(soundID, arg4); if (*arg4 != NULL) { func_80009B7C(*arg4, x, y, z); } } -void func_80001F14(u16 sndIndx, u32 *arg1) { - if (sndIndx <= 0 || ALBankFile_80115D14_GetSoundCount() < sndIndx) { +void func_80001F14(u16 soundID, u32 *arg1) { + if (soundID <= 0 || ALBankFile_80115D14_GetSoundCount() < soundID) { if (arg1) { *arg1 = 0; } } else { if (arg1) { - func_80004638(ALBankFile_80115D14->bankArray[0], (s16)sndIndx, arg1); + func_80004638(ALBankFile_80115D14->bankArray[0], (s16)soundID, arg1); } else { - func_80004638(ALBankFile_80115D14->bankArray[0], (s16)sndIndx, &D_80115F88); + func_80004638(ALBankFile_80115D14->bankArray[0], (s16)soundID, &D_80115F88); } } } @@ -740,11 +744,11 @@ void func_8000216C(unk80115D1C **arg0, s32 *arg1, s32 *arg2) { } } -u8 ALBankFile_80115D14_GetSoundDecayTime(u16 sndIndx) { - if (sndIndx <= 0 || ALBankFile_80115D14->bankArray[0]->instArray[0]->soundCount < sndIndx) { +u8 ALBankFile_80115D14_GetSoundDecayTime(u16 soundID) { + if (soundID <= 0 || ALBankFile_80115D14->bankArray[0]->instArray[0]->soundCount < soundID) { return 0; } - return ((u32)(1 + ALBankFile_80115D14->bankArray[0]->instArray[0]->soundArray[sndIndx - 1]->envelope->decayTime) == 0); + return ((u32)(1 + ALBankFile_80115D14->bankArray[0]->instArray[0]->soundArray[soundID - 1]->envelope->decayTime) == 0); } ALSeqPlayer *func_80002224(s32 _max_voices, s32 _max_events) { diff --git a/src/audio.h b/src/audio.h index ebbad97f..80926b4b 100644 --- a/src/audio.h +++ b/src/audio.h @@ -68,7 +68,7 @@ void func_80000890(u8 arg0); void func_80000968(s32 arg0); void func_80000B18(void); void func_80000B28(void); -void play_music(u8 arg0); +void play_music(u8 seqID); void set_music_player_voice_limit(u8 voiceLimit); void func_80000C1C(void); void func_80000C2C(void); @@ -112,24 +112,24 @@ u8 musicGetRelativeVolume(void); s32 musicGetVolSliderPercentage(void); void sfxSetRelativeVolume(u8 arg0); void sfxSetPan(ALPan pan); -void play_sound(u8 arg0); +void play_sequence(u8 seqID); u32 func_80001C08(void); void func_80001C5C(u16 arg0); u16 func_80001CB8(u16 arg0); -void func_80001EA8(u16 arg0, f32 x, f32 y, f32 z, s32 **arg4); -void func_80001F14(u16 sndIndx, u32 *arg1); +void play_sound_spatial(u16 soundID, f32 x, f32 y, f32 z, s32 **arg4); +void func_80001F14(u16 soundID, u32 *arg1); u16 ALBankFile_80115D14_GetSoundCount(void); u8 ALSeqFile_80115CF8_GetSeqCount(void); void func_80002128(unk80115D18 **arg0, s32 *arg1, s32 *arg2); void func_8000216C(unk80115D1C **arg0, s32 *arg1, s32 *arg2); -u8 ALBankFile_80115D14_GetSoundDecayTime(u16 sndIndx); +u8 ALBankFile_80115D14_GetSoundDecayTime(u16 soundID); ALSeqPlayer *func_80002224(s32 _max_voices, s32 _max_events); void func_800022BC(u8 arg0, ALSeqPlayer *arg1); void func_80002570(ALSeqPlayer *seqp); void func_80002608(u8 arg0); u8 func_80002630(void); -void func_80001D04(u16, s32*); //Non matching. +void play_sound_global(u16 soundID, s32*); //Non matching. void func_8000232C(ALSeqPlayer *seqp, void *ptr, u8 *arg2, ALCSeq *seq); //Non Matching f32 func_800015F8(void); //Non Matching void func_80001FB8(u16 arg0); //Non Matching diff --git a/src/game.c b/src/game.c index cdf94c5f..f3f49016 100644 --- a/src/game.c +++ b/src/game.c @@ -136,7 +136,7 @@ unk8012117C *D_8012117C; s32 D_80121180[16]; -u32 *D_801211C0[2]; +TempStruct5 *D_801211C0; s16 D_801211C8[20]; Gfx *gDisplayLists[2]; Gfx *gCurrDisplayList; @@ -191,7 +191,7 @@ void func_8006A6B0(void) { s32 checksumCount; u8 *sp44; s32 temp2; - + sp44 = allocate_from_main_pool_safe(sizeof(LevelHeader), 0xFFFF00FF); gTempAssetTable = load_asset_section_from_rom(ASSET_LEVEL_HEADERS_TABLE); i = 0; @@ -234,15 +234,15 @@ void func_8006A6B0(void) { } free_from_memory_pool(gTempAssetTable); free_from_memory_pool(sp44); - + gTempAssetTable = load_asset_section_from_rom(ASSET_LEVEL_NAMES_TABLE); - + for (i = 0; gTempAssetTable[i] != (-1); i++){} i--; - + temp = gTempAssetTable[i]; temp -= gTempAssetTable[0]; - + gLevelNames = allocate_from_main_pool_safe(i * sizeof(s32), 0xFFFF00FF); D_800DD310 = allocate_from_main_pool_safe(temp, 0xFFFF00FF); load_asset_to_address(ASSET_LEVEL_NAMES, D_800DD310, 0, temp); @@ -250,7 +250,7 @@ void func_8006A6B0(void) { gLevelNames[count] = &D_800DD310[gTempAssetTable[count]]; } free_from_memory_pool(gTempAssetTable); - + checksumCount = 0; for (i = 0; i < gFunc80068158Length; i++) { checksumCount += ((u8 *) (&func_80068158))[i]; @@ -736,17 +736,17 @@ void func_8006BFC8(s8 *arg0) { } temp2 = gTempAssetTable[phi_s0]; temp = gTempAssetTable[phi_s0 + 1] - temp2; - D_801211C0[0] = allocate_from_main_pool_safe(temp, COLOUR_TAG_YELLOW); - load_asset_to_address(ASSET_UNKNOWN_0, D_801211C0[0], temp2, temp); + D_801211C0 = allocate_from_main_pool_safe(temp, COLOUR_TAG_YELLOW); + load_asset_to_address(ASSET_UNKNOWN_0, D_801211C0, temp2, temp); free_from_memory_pool(gTempAssetTable); } void func_8006C164(void) { - free_from_memory_pool(D_801211C0[0]); + free_from_memory_pool(D_801211C0); } -u32 *func_8006C18C(void) { - return D_801211C0[0]; +TempStruct5 *func_8006C18C(void) { + return D_801211C0; } s8 func_8006C19C(void) { diff --git a/src/game.h b/src/game.h index 5b284aa6..6bcf2128 100644 --- a/src/game.h +++ b/src/game.h @@ -5,6 +5,7 @@ #include "structs.h" #include "fade_transition.h" #include "libc/math.h" +#include "racer.h" enum RenderContext { DRAW_INTRO = -1, @@ -104,7 +105,7 @@ u8 *get_level_name(s32 levelId); void func_8006BEFC(void); void func_8006BFC8(s8 *arg0); void func_8006C164(void); -u32 *func_8006C18C(void); +TempStruct5 *func_8006C18C(void); s8 func_8006C19C(void); void func_8006C1AC(s32 arg0, s32 arg1, s32 arg2, s32 arg3); void func_8006C22C(s32 *arg0, s32 *arg1, s32 *arg2, s32 *arg3); diff --git a/src/game_text.c b/src/game_text.c index fe0304a9..f22cac23 100644 --- a/src/game_text.c +++ b/src/game_text.c @@ -190,7 +190,7 @@ void func_800C3440(s32 arg0) { if (D_8012A786 != 0) { D_8012A785 -= arg0; while (D_8012A785 < 0) { - D_8012A785 += func_8000C8B4(0x3C); + D_8012A785 += normalise_time(60); D_8012A786--; } if (D_8012A786 <= 0) { diff --git a/src/game_ui.c b/src/game_ui.c index b73e1c0c..72329cd0 100644 --- a/src/game_ui.c +++ b/src/game_ui.c @@ -396,9 +396,9 @@ void func_800A6DB4(s16 *arg0) { if (arg0 != NULL) { if (settings->racers[*arg0].best_times & 0x80) { - func_80001D04(0x145, &D_80126D40); + play_sound_global(SOUND_VOICE_TT_RACE_RECORD, &D_80126D40); } else { - func_80001D04(0x102, &D_80126D40); + play_sound_global(SOUND_VOICE_TT_FINISH, &D_80126D40); } } } diff --git a/src/menu.c b/src/menu.c index f0d51ea1..69315fce 100644 --- a/src/menu.c +++ b/src/menu.c @@ -80,9 +80,9 @@ s32 D_80126438[4]; //bit 24 = Unknown, but it's set as a default high bit. //bit 25 = Seems to be a flag for whether subtitles are enabled or not. //bits 26-55 = Unknown, but it could be a set of flags for unlocked tracks -//bits 56-63 = Checksum bits. These are calculated from the previous bits, +//bits 56-63 = Checksum bits. These are calculated from the previous bits, // and validated using calculate_eeprom_settings_checksum. -// If the checksum fails, the settings are reset to just +// If the checksum fails, the settings are reset to just // bits 24/25 being high. u64 sEepromSettings; @@ -366,7 +366,7 @@ unk800DF510 sMenuImageProperties[18] = { { 0, 0, 0, 0x5D, 1.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, { 0 } }, }; -s16 *gAssetsMenuElementIds[1] = { NULL }; // This is probably not correct. +s16 *gAssetsMenuElementIds[1] = { NULL }; // This is probably not correct. s16 D_800DF754 = 0; s16 D_800DF758 = 0; unk800DF510 *gMenuImageStack = NULL; @@ -1921,7 +1921,7 @@ void show_timestamp(s32 frameCount, s32 xPos, s32 yPos, u8 red, u8 green, u8 blu get_timestamp_from_frames(frameCount, &minutes, &seconds, &hundredths); func_80068508(1); func_8007BF1C(0); - + gMenuImageStack[imageIndex].unk18 = minutes / 10; gMenuImageStack[imageIndex].unkC = xPos; func_8009CA60(imageIndex); @@ -1944,21 +1944,21 @@ void show_timestamp(s32 frameCount, s32 xPos, s32 yPos, u8 red, u8 green, u8 blu gMenuImageStack[imageIndex].unk18 = seconds % 10; gMenuImageStack[imageIndex].unkC = xPos; func_8009CA60(imageIndex); - + xPos += xOffset2; gMenuImageStack[imageIndex2].unkC = xPos; func_8009CA60(imageIndex2); - xPos += xOffset3; + xPos += xOffset3; gMenuImageStack[imageIndex].unk18 = hundredths / 10; gMenuImageStack[imageIndex].unkC = xPos; func_8009CA60(imageIndex); - xPos += xOffset1; + xPos += xOffset1; gMenuImageStack[imageIndex].unk18 = hundredths % 10; gMenuImageStack[imageIndex].unkC = xPos; func_8009CA60(imageIndex); - + func_80068508(0); func_8007BF1C(1); sMenuGuiColourR = (u8)255; @@ -1978,7 +1978,7 @@ void func_80081E54(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, s32 arg5) { D_800DF79C = arg4; D_800DF7A0 = arg5; if (D_80126858 > 0) { - func_80001D04(0x16, NULL); + play_sound_global(SOUND_WHOOSH1, NULL); } } @@ -2305,7 +2305,7 @@ void menu_title_screen_init(void) { gTitleScreenCurrentOption = 0; gNumberOfActivePlayers = 4; initialise_player_ids(); - play_music(1); + play_music(SEQUENCE_NONE2); sMenuMusicVolume = musicGetRelativeVolume(); if (D_800DF458) { D_8012686C = 0; @@ -2360,7 +2360,7 @@ void menu_options_init(void) { load_font(2); set_text_font(ASSET_FONTS_BIGFONT); set_music_player_voice_limit(0x18); - play_music(0x18); + play_music(SEQUENCE_MAIN_MENU); func_80000B18(); } @@ -2437,11 +2437,11 @@ s32 menu_options_loop(s32 arg0) { set_music_fade_timer(-128); gMenuDelay = -1; func_800C01D8(&sMenuTransitionFadeIn); - func_80001D04(0x241, 0); + play_sound_global(SOUND_MENU_BACK3, 0); } else if ((buttonsPressed & (A_BUTTON | START_BUTTON)) && D_800DF460 >= 2) { // Go to a sub-menu gMenuDelay = 31; - func_80001D04(0xEF, 0); + play_sound_global(SOUND_SELECT2, 0); } else if (D_800DF460 == 0 && analogX != 0) { // Change language s32 currentLang = get_language(); @@ -2450,16 +2450,16 @@ s32 menu_options_loop(s32 arg0) { } else { set_language(LANGUAGE_ENGLISH); } - func_80001D04(0xEB, 0); + play_sound_global(SOUND_MENU_PICK2, 0); } else if (D_800DF460 == 1 && analogX != 0) { // Enable/Disable subtitles. if (sEepromSettings & 0x2000000) { - func_80001D04(0xEB, NULL); + play_sound_global(SOUND_MENU_PICK2, NULL); unset_eeprom_settings_value(0); func_800C2AF4(0); gOptionMenuStrings[1] = gMenuText[183]; } else { - func_80001D04(0xEB, 0); + play_sound_global(SOUND_MENU_PICK2, 0); set_eeprom_settings_value(0); func_800C2AF4(1); gOptionMenuStrings[1] = gMenuText[182]; @@ -2472,7 +2472,7 @@ s32 menu_options_loop(s32 arg0) { if (D_800DF460 >= 6) { D_800DF460 = 5; } - func_80001D04(0xEB, 0); + play_sound_global(SOUND_MENU_PICK2, 0); } if (analogY > 0) { // Scroll up the list. @@ -2480,7 +2480,7 @@ s32 menu_options_loop(s32 arg0) { if (D_800DF460 < 0) { D_800DF460 = 0; } - func_80001D04(0xEB, 0); + play_sound_global(SOUND_MENU_PICK2, 0); } } @@ -2648,7 +2648,7 @@ s32 menu_audio_options_loop(s32 arg0) { } else { func_80000B28(); set_music_player_voice_limit(0x18); - play_music(0x18); + play_music(SEQUENCE_MAIN_MENU); func_80000B18(); } } @@ -2670,17 +2670,17 @@ s32 menu_audio_options_loop(s32 arg0) { } if (gOptionsMenuItemIndex == 1 && D_801269FC == NULL) { - func_80001D04(0x19B, &D_801269FC); + play_sound_global(SOUND_VOICE_DIDDY_POSITIVE5, &D_801269FC); } else if (D_801269FC != NULL) { func_8000488C(&D_801269FC); } if (sp30 == 3) { - func_80001D04(0x241, NULL); + play_sound_global(SOUND_MENU_BACK3, NULL); } else if (sp30 == 2) { - func_80001D04(0xEF, NULL); + play_sound_global(SOUND_SELECT2, NULL); } else if (sp30 == 1) { - func_80001D04(0xEB, NULL); + play_sound_global(SOUND_MENU_PICK2, NULL); } } if (gMenuDelay < -0x1E) { @@ -2701,7 +2701,7 @@ void func_800851FC(void) { } if (D_801263D8 >= 0) { set_music_player_voice_limit(0x18); - play_music(0x18); + play_music(SEQUENCE_MAIN_MENU); set_music_fade_timer(0x100); func_80000B18(); } @@ -2748,7 +2748,7 @@ GLOBAL_ASM("asm/non_matchings/menu/func_80085B9C.s") s32 func_800860A8(s32 controllerIndex, s32 *arg1, unk800860A8 *arg2, s32 *arg3, s32 fileSize, UNUSED s32 arg5) { s32 ret = 0; - + if (*arg1 != 0) { ret = get_free_space(controllerIndex, &arg2[*arg3].cPakBytesFree, &sControllerPakNotesFree[controllerIndex]); if (ret == CONTROLLER_PAK_GOOD) { @@ -2762,9 +2762,9 @@ s32 func_800860A8(s32 controllerIndex, s32 *arg1, unk800860A8 *arg2, s32 *arg3, if ((*arg1 < 0) && status == RUMBLE_PAK) { *arg1 = 0; ret = 0; - } else if - (status != CONTROLLER_PAK_WITH_BAD_ID && - status != CONTROLLER_PAK_INCONSISTENT && + } else if + (status != CONTROLLER_PAK_WITH_BAD_ID && + status != CONTROLLER_PAK_INCONSISTENT && status != CONTROLLER_PAK_BAD_DATA) { ret = 0; @@ -2822,17 +2822,17 @@ s32 func_800874D0(s32 buttonsPressed, s32 arg1) { if (D_80126A10 != D_80126A14) { func_800871D8(8); } else { - func_80001D04(0x241, NULL); + play_sound_global(SOUND_MENU_BACK3, NULL); ret = -1; } } else if (buttonsPressed & (A_BUTTON | START_BUTTON)) { - func_80001D04(0xEF, NULL); + play_sound_global(SOUND_SELECT2, NULL); D_801263E0 = 4; } else if ((arg1 < 0) && (D_80126BD4 > 0)) { - func_80001D04(0xEB, NULL); + play_sound_global(SOUND_MENU_PICK2, NULL); D_80126BD4--; } else if ((arg1 > 0) && (D_80126BD4 < (D_80126A08 - 1))) { - func_80001D04(0xEB, NULL); + play_sound_global(SOUND_MENU_PICK2, NULL); D_80126BD4++; } return ret; @@ -2840,16 +2840,16 @@ s32 func_800874D0(s32 buttonsPressed, s32 arg1) { s32 func_800875E4(s32 buttonsPressed, s32 arg1) { if (buttonsPressed & B_BUTTON) { - func_80001D04(0x241, NULL); + play_sound_global(SOUND_MENU_BACK3, NULL); D_801263E0 = 3; } else if (buttonsPressed & (A_BUTTON | START_BUTTON)) { - func_80001D04(0xEF, NULL); + play_sound_global(SOUND_SELECT2, NULL); D_801263E0 = 6; } else if ((arg1 < 0) && (D_80126BE4 > 0)) { - func_80001D04(0xEB, NULL); + play_sound_global(SOUND_MENU_PICK2, NULL); D_80126BE4--; } else if ((arg1 > 0) && (D_80126BE4 < D_80126A00 - 1)) { - func_80001D04(0xEB, NULL); + play_sound_global(SOUND_MENU_PICK2, NULL); D_80126BE4++; } @@ -2858,10 +2858,10 @@ s32 func_800875E4(s32 buttonsPressed, s32 arg1) { s32 func_800876CC(s32 buttonsPressed, UNUSED s32 arg1) { if (buttonsPressed & B_BUTTON) { - func_80001D04(0x241, NULL); + play_sound_global(SOUND_MENU_BACK3, NULL); D_801263E0 = 5; } else if (buttonsPressed & (A_BUTTON | START_BUTTON)) { - func_80001D04(0xEF, NULL); + play_sound_global(SOUND_SELECT2, NULL); D_801263E0 = 7; D_801263D8 = 0; } @@ -2937,13 +2937,13 @@ SIDeviceStatus func_80087F14(s32 *controllerIndex, s32 arg1) { } } } - if ( (pakStatusSuccess == 0) - || (pakStatusError3 != 0) - || (pakStatusErrorNoFreeSpace != 0) + if ( (pakStatusSuccess == 0) + || (pakStatusError3 != 0) + || (pakStatusErrorNoFreeSpace != 0) || (pakStatusError9 != 0)) { return NO_CONTROLLER_PAK; // Return unsuccessfully? } - + controllerIndexVal = *controllerIndex; if (controllerIndexVal < 0) { i = controllerIndexVal; @@ -2976,7 +2976,7 @@ SIDeviceStatus func_80087F14(s32 *controllerIndex, s32 arg1) { } } while (sControllerPakIssueNotFound[i] == 0); } - + *controllerIndex = controllerIndexVal; ret = get_controller_pak_file_list(controllerIndexVal, 16, &sCurrentControllerPakAllFileNames, &sCurrentControllerPakAllFileExtensions, &sCurrentControllerPakAllFileSizes, &sCurrentControllerPakAllFileTypes); @@ -2990,7 +2990,7 @@ SIDeviceStatus func_80087F14(s32 *controllerIndex, s32 arg1) { for (; sCurrentControllerPakAllFileNames[i][k] != 0; j++, k++) { D_80126AA0[i][j] = sCurrentControllerPakAllFileNames[i][k]; } - + if ((sCurrentControllerPakAllFileExtensions[i] != 0) && (*sCurrentControllerPakAllFileExtensions[i] != 0)) { D_80126AA0[i][j] = '.'; j++; @@ -3050,7 +3050,7 @@ s32 menu_boot_loop(s32 arg0) { if (osTvType == TV_TYPE_PAL) { y = 132; } - + temp = y; switch (D_80126C20) { @@ -3165,10 +3165,10 @@ void func_80088938(s32 arg0) { set_text_colour(255, 255, 255, 0, 255); draw_text(&sMenuCurrDisplayList, 160, 30, gMenuText[35], ALIGN_MIDDLE_CENTER); assign_dialogue_box_id(6); - + //HERE! set_current_dialogue_box_coords(6, 58, yPos, 262, yPos + 30); - + if (D_800DF460 == -1) { set_current_dialogue_background_colour(6, 255, 255, 255, (alpha >> 1) + 128); @@ -3240,7 +3240,7 @@ void func_80088938(s32 arg0) { set_dialogue_font(6, 0); set_current_dialogue_box_coords(6, 76, yPos - 28, 244, yPos + 28); set_current_dialogue_background_colour(6, 0, 0, 0, 160); - + for (yPos = 4, i = 0; i < 3; i++) { if (i == 0) { set_current_text_colour(6, 255, 0, 255, 64, 255); @@ -3558,7 +3558,7 @@ s32 menu_magic_codes_list_loop(s32 arg0) { } if (((xAxis < 0) || (xAxis > 0)) && (numUnlockedCodes != gOptionsMenuItemIndex)) { - func_80001D04(0xEF, NULL); + play_sound_global(SOUND_SELECT2, NULL); phi_s1 = 1 << D_80126C80[gOptionsMenuItemIndex]; gActiveMagicCodes ^= phi_s1; // Toggle active cheats? func_8008A8F8(phi_s1, 0x10, 0x20); // func_8008A8F8() = Clear flags? @@ -3596,7 +3596,7 @@ s32 menu_magic_codes_list_loop(s32 arg0) { } if (gOptionsMenuItemIndex != phi_a2) { - func_80001D04(0xEB, NULL); + play_sound_global(SOUND_MENU_PICK2, NULL); } if ((buttonsPressed & 0x9000) && (numUnlockedCodes == gOptionsMenuItemIndex)) { @@ -3608,7 +3608,7 @@ s32 menu_magic_codes_list_loop(s32 arg0) { if (sp48 != 0) { gMenuDelay = sp48; func_800C01D8(&sMenuTransitionFadeIn); - func_80001D04(0x241, NULL); + play_sound_global(SOUND_MENU_BACK3, NULL); } if (gMenuDelay < -0x1E) { func_8008AD1C(); @@ -3741,7 +3741,7 @@ void menu_character_select_init(void) { D_801263B8.unk0 = -1; D_801263B8.unk2 = 0; D_801263B8.unk1 = 0; - play_music(0x1A); + play_music(SEQUENCE_CHOOSE_YOUR_RACER); for (i = 0; i < 10; i++) { temp = D_800DFDB4[i]; if (i != D_801263C0.unk0) { @@ -3937,10 +3937,10 @@ void func_8008BFE8(s32 arg0, s8 *arg1, s32 arg2, u16 arg3, u16 arg4) { } if (!someBool) { gPlayersCharacterArray[arg0] = arg1[j]; - func_80001D04(arg3, NULL); + play_sound_global(arg3, NULL); return; } - func_80001D04(arg4, NULL); + play_sound_global(arg4, NULL); } void func_8008C128(void) { @@ -3973,7 +3973,7 @@ s32 menu_caution_loop(s32 updateRate) { if (gMenuDelay) { gMenuDelay += updateRate; } else if (gIgnorePlayerInput <= 0 && (get_buttons_pressed_from_player(0) & (A_BUTTON | B_BUTTON | START_BUTTON))) { - func_80001D04(0xEF, NULL); + play_sound_global(SOUND_SELECT2, NULL); gMenuDelay = 1; func_800C01D8(&sMenuTransitionFadeIn); } @@ -4013,7 +4013,7 @@ void menu_game_select_init(void) { func_8009C6D4(0x43); func_8007FFEC(3); load_font(2); - play_music(0x1A); + play_music(SEQUENCE_CHOOSE_YOUR_RACER); for (i = 0; i < 10; i++) { if (i != D_801263B4.unk0) { @@ -4151,7 +4151,7 @@ s32 menu_game_select_loop(s32 arg0) { } func_800C01D8(&sMenuTransitionFadeIn); gMenuDelay = 1; - func_80001D04(0xEF, 0); + play_sound_global(SOUND_SELECT2, 0); } else if (playerInputs & B_BUTTON) { func_800C01D8(&sMenuTransitionFadeIn); gMenuDelay = -1; @@ -4159,13 +4159,13 @@ s32 menu_game_select_loop(s32 arg0) { if (playerYDir < 0) { if (D_800DF460 < D_801263E0) { D_800DF460++; - func_80001D04(0xEB, 0); + play_sound_global(SOUND_MENU_PICK2, 0); } } if (playerYDir > 0) { if (D_800DF460 > 0) { D_800DF460--; - func_80001D04(0xEB, 0); + play_sound_global(SOUND_MENU_PICK2, 0); } } } @@ -4201,7 +4201,7 @@ void menu_file_select_init(void) { D_80126CC0 = 0; func_800C01D8(&sMenuTransitionFadeOut); load_font(2); - play_music(0x1A); + play_music(SEQUENCE_CHOOSE_YOUR_RACER); for (i = 0; i < 10; i++) { if (i != D_801263B4.unk0) { func_80001114(D_800DFDB4[i][0]); @@ -4397,16 +4397,16 @@ void func_8008DC7C(UNUSED s32 arg0) { if (D_80126494 == 0) { if (buttonsPressed & B_BUTTON) { - func_80001D04(577, NULL); + play_sound_global(SOUND_MENU_BACK3, NULL); D_80126488 = 0; return; } else if (buttonsPressed & (A_BUTTON | START_BUTTON)) { if (gSavefileInfo[D_8012648C].isStarted != 0) { - func_80001D04(239, NULL); + play_sound_global(SOUND_SELECT2, NULL); D_80126494 = 1; return; } - func_80001D04(577, NULL); + play_sound_global(SOUND_MENU_BACK3, NULL); return; } @@ -4427,11 +4427,11 @@ void func_8008DC7C(UNUSED s32 arg0) { } if (D_8012648C != temp) { - func_80001D04(235, NULL); + play_sound_global(SOUND_MENU_PICK2, NULL); } } else { if (buttonsPressed & (A_BUTTON | START_BUTTON)) { - func_80001D04(239, NULL); + play_sound_global(SOUND_SELECT2, NULL); func_8006ECAC(D_8012648C); gSavefileInfo[D_8012648C].isAdventure2 = 0; gSavefileInfo[D_8012648C].isStarted = 0; @@ -4444,7 +4444,7 @@ void func_8008DC7C(UNUSED s32 arg0) { D_801263E0 = 0; D_80126488 = 0; } else if (buttonsPressed & B_BUTTON) { - func_80001D04(577, NULL); + play_sound_global(SOUND_MENU_BACK3, NULL); D_80126494 = 0; } } @@ -4598,7 +4598,7 @@ GLOBAL_ASM("asm/non_matchings/menu/func_80090918.s") void func_80090ED8(UNUSED s32 updateRate) { if (D_801263E0 == 1 && D_800E0414 == 0 && D_80126840 == 0) { - func_80001D04(0x132, &D_80126840); + play_sound_global(SOUND_VOICE_TT_SNORE, &D_80126840); } } @@ -4958,7 +4958,7 @@ void menu_5_init(void) { func_80000FDC(temp, 0, 0.5f); } set_music_player_voice_limit(0x18); - play_music(0x18); + play_music(SEQUENCE_MAIN_MENU); func_80000B18(); D_801263E0 = 0; func_8009C674(D_800E0FB4); @@ -5038,9 +5038,9 @@ s32 menu_5_loop(s32 updateRate) { } gMenuDelay = 1; func_800C01D8(&sMenuTransitionFadeIn); - func_80001D04(0xEF, NULL); + play_sound_global(SOUND_SELECT2, NULL); } else if (D_801267D8[0] & 0x4000) { - func_80001D04(0x241, NULL); + play_sound_global(SOUND_MENU_BACK3, NULL); if (sp20 || sp28) { if (sp28) { func_800C31EC(0x2710); @@ -5053,12 +5053,12 @@ s32 menu_5_loop(s32 updateRate) { } } else { if (D_801267D8[0] & 0x4000) { - func_80001D04(0x241, NULL); + play_sound_global(SOUND_MENU_BACK3, NULL); func_800C01D8(&sMenuTransitionFadeIn); gMenuDelay = -1; } else if (D_801267D8[0] & 0x9000) { D_801263E0 = 1; - func_80001D04(0x131, NULL); + play_sound_global(SOUND_CAR_REV2, NULL); } else if (sp1C >= 2) { if (D_80126830 > 0) { do { @@ -5074,7 +5074,7 @@ s32 menu_5_loop(s32 updateRate) { vehicle = vehicle2; } if (vehicle != vehicle2) { - func_80001D04(0xEB, NULL); + play_sound_global(SOUND_MENU_PICK2, NULL); gPlayerSelectVehicle[0] = vehicle; } } @@ -5227,20 +5227,20 @@ void func_80094C14(s32 arg0) { D_801263D8 += arg0; switch (D_800DF460) { case 0: - if (func_8000C8B4(0xF0) < D_801263D8) { - set_music_fade_timer(-0x100); + if (normalise_time(240) < D_801263D8) { + set_music_fade_timer(-256); D_800DF460 = 1; } break; case 1: - if (func_8000C8B4(0x12C) < D_801263D8) { - set_music_player_voice_limit(0x18); - play_music(0x18); - set_music_fade_timer(0x100); + if (normalise_time(300) < D_801263D8) { + set_music_player_voice_limit(24); + play_music(SEQUENCE_MAIN_MENU); + set_music_fade_timer(256); } break; } - if (func_8000C8B4(0x12C) < D_801263D8) { + if (normalise_time(300) < D_801263D8) { D_801263D8 = -1; } } @@ -5337,7 +5337,7 @@ void menu_11_init(void) { load_font(2); func_800C01D8(&sMenuTransitionFadeOut); set_music_player_voice_limit(0x18); - play_music(0x18); + play_music(SEQUENCE_MAIN_MENU); set_music_fade_timer(0x80); } @@ -5505,7 +5505,7 @@ void menu_trophy_race_round_init(void) { D_800E0980 = 10; load_font(2); set_music_player_voice_limit(0x18); - play_music(0x18); + play_music(SEQUENCE_MAIN_MENU); set_music_fade_timer(0x100); } #else @@ -5557,7 +5557,7 @@ s32 menu_trophy_race_round_loop(s32 updateRate) { temp = trackMenuIds[(((gTrophyRaceWorldId - 1) * 6) + gTrophyRaceRound)]; temp_a2 = D_800E0758[temp]; if (temp_a2 != -1) { - func_80001D04(temp_a2, NULL); + play_sound_global(temp_a2, NULL); } D_800E0980 = 0; } @@ -5744,11 +5744,11 @@ s32 menu_ghost_data_loop(s32 updateRate) { case 0: if ((pressedButtons & (START_BUTTON | A_BUTTON)) && (D_801264D4 > 0)) { D_801263E0 = 2; - func_80001D04(0xEF, 0); + play_sound_global(SOUND_SELECT2, 0); } else if ((pressedButtons & B_BUTTON) || ((pressedButtons & (START_BUTTON | A_BUTTON)) && (D_801264D4 == 0))) { gMenuDelay = 1; func_800C01D8(&sMenuTransitionFadeIn); - func_80001D04(0x241, 0); + play_sound_global(SOUND_MENU_BACK3, 0); } else { temp = D_80126498; if (yStick < 0 && D_80126498 < (D_801264D4 - 1)) { @@ -5764,14 +5764,14 @@ s32 menu_ghost_data_loop(s32 updateRate) { } } if (temp != D_80126498) { - func_80001D04(0xEB, 0); + play_sound_global(SOUND_MENU_PICK2, 0); } } break; case 1: if (pressedButtons & B_BUTTON) { D_801263E0 = 0; - func_80001D04(0x241, 0); + play_sound_global(SOUND_MENU_BACK3, 0); } else { if (pressedButtons & (START_BUTTON | A_BUTTON)) { if (func_800998E0(D_80126498) == 0) { @@ -5784,26 +5784,26 @@ s32 menu_ghost_data_loop(s32 updateRate) { if (D_80126498 < D_801263D8) { D_801263D8 = D_80126498; } - func_80001D04(0xEF, 0); + play_sound_global(SOUND_SELECT2, 0); } else { gMenuDelay = 1; func_800C01D8(&sMenuTransitionFadeIn); - func_80001D04(0x241, 0); + play_sound_global(SOUND_MENU_BACK3, 0); } D_801263E0 = 0; } else if (yStick < 0) { D_801263E0 = 2; - func_80001D04(0xEB, 0); + play_sound_global(SOUND_MENU_PICK2, 0); } } break; case 2: if (pressedButtons & (START_BUTTON | A_BUTTON | B_BUTTON)) { D_801263E0 = 0; - func_80001D04(0x241, 0); + play_sound_global(SOUND_MENU_BACK3, 0); } else if (yStick > 0) { D_801263E0 = 1; - func_80001D04(0xEB, 0); + play_sound_global(SOUND_MENU_PICK2, 0); } break; } @@ -5897,19 +5897,19 @@ void menu_credits_init(void) { set_music_player_voice_limit(0x18); D_800E18F8 = (u16)0x1000; if (gViewingCreditsFromCheat) { - play_music(8); + play_music(SEQUENCE_DARKMOON_CAVERNS); gCreditsArray[84] = gCreditsLastMessageArray[2]; // "THE END" gCreditsArray[85] = gCreditsLastMessageArray[3]; // "NO CHEAT" gCreditsArray[86] = gCreditsLastMessageArray[4]; // "THIS TIME." gViewingCreditsFromCheat = 0; } else { if (settings->bosses & 0x20) { - play_music(0x25); + play_music(SEQUENCE_CRESCENT_ISLAND); gCreditsArray[84] = gCreditsLastMessageArray[1]; // "TO BE CONTINUED ..." D_800E18F8 = (u16)0x61F4; D_80126BCC = 9; } else { - play_music(8); + play_music(SEQUENCE_DARKMOON_CAVERNS); gCreditsArray[84] = gCreditsLastMessageArray[0]; // "THE END?" } @@ -6431,10 +6431,10 @@ void render_dialogue_option(char *text, s32 yOffset, s32 optionID) { void handle_menu_joystick_input(void) { if (gControllersYAxisDirection[0] < 0) { sDialogueOption = sDialogueOption + 1; - func_80001D04(0xB2, NULL); + play_sound_global(SOUND_MENU_PICK, NULL); } else if (gControllersYAxisDirection[0] > 0) { sDialogueOption = sDialogueOption - 1; - func_80001D04(0xB2, NULL); + play_sound_global(SOUND_MENU_PICK, NULL); } if (sDialogueOption < 0) { @@ -6502,17 +6502,17 @@ s32 taj_menu_loop(void) { gDialogueOptionYOffset = 30; if (settings->tajFlags & TAJ_FLAGS_CAR_CHAL_UNLOCKED) { gDialogueOptionTangible = settings->tajFlags & TAJ_FLAGS_CAR_CHAL_COMPLETED; - render_dialogue_option(gMenuText[46], 0x14, 0); // CAR CHALLENGE + render_dialogue_option(gMenuText[46], 20, 0); // CAR CHALLENGE } if (settings->tajFlags & TAJ_FLAGS_HOVER_CHAL_UNLOCKED) { gDialogueOptionTangible = settings->tajFlags & TAJ_FLAGS_HOVER_CHAL_COMPLETED; - render_dialogue_option(gMenuText[47], 0x14, 1); // HOVER CHALLENGE + render_dialogue_option(gMenuText[47], 20, 1); // HOVER CHALLENGE } if (settings->tajFlags & TAJ_FLAGS_PLANE_CHAL_UNLOCKED) { gDialogueOptionTangible = settings->tajFlags & TAJ_FLAGS_PLANE_CHAL_COMPLETED; - render_dialogue_option(gMenuText[48], 0x14, 2); // PLANE CHALLENGE + render_dialogue_option(gMenuText[48], 20, 2); // PLANE CHALLENGE } - render_dialogue_option(gMenuText[44], 0x14, 3); // MAIN MENU + render_dialogue_option(gMenuText[44], 20, 3); // MAIN MENU break; } @@ -6526,17 +6526,17 @@ s32 taj_menu_loop(void) { D_800DF4DC = 0; render_dialogue_text(1, POS_CENTRED, 6, gMenuText[36], 1, 4); // OPTIONS gDialogueOptionYOffset = 30; - render_dialogue_option(gMenuText[37], 0x14, 0); // CHANGE VEHICLE + render_dialogue_option(gMenuText[37], 20, 0); // CHANGE VEHICLE if (settings->tajFlags & TAJ_FLAGS_UNLOCKED_A_CHALLENGE) { - render_dialogue_option(gMenuText[39], 0x14, 1); // CHALLENGES + render_dialogue_option(gMenuText[39], 20, 1); // CHALLENGES } - render_dialogue_option(gMenuText[5], 0x14, 2); // RETURN + render_dialogue_option(gMenuText[5], 20, 2); // RETURN handle_menu_joystick_input(); if (buttonsPressed & B_BUTTON) { sp2C = 3; - func_80001D04(0x241, 0); + play_sound_global(SOUND_MENU_BACK3, 0); } else if (buttonsPressed & A_BUTTON) { - func_80001D04(0xEF, 0); + play_sound_global(SOUND_SELECT2, 0); switch (D_80126516) { case 1: sCurrentMenuID = 3; @@ -6557,7 +6557,7 @@ s32 taj_menu_loop(void) { case 2: handle_menu_joystick_input(); if (buttonsPressed & B_BUTTON) { - func_80001D04(0x241, 0); + play_sound_global(SOUND_MENU_BACK3, 0); func_8003AC3C(0x238, 1); sCurrentMenuID = 1; sDialogueOption = 0; @@ -6575,13 +6575,13 @@ s32 taj_menu_loop(void) { case 3: handle_menu_joystick_input(); if ((buttonsPressed & B_BUTTON) || ((buttonsPressed & A_BUTTON) && (D_80126516 == 3))) { - func_80001D04(0x241, 0); + play_sound_global(SOUND_MENU_BACK3, 0); func_8003AC3C(0x23A, 1); sCurrentMenuID = 1; sDialogueOption = 3; } else if (buttonsPressed & A_BUTTON) { sp2C = D_80126516 | 0x40; - func_80001D04(0xEF, 0); + play_sound_global(SOUND_SELECT2, 0); sCurrentMenuID = 0x63; } break; @@ -6654,7 +6654,7 @@ s32 dialogue_race_defeat(void) { render_dialogue_option(gMenuText[51], 20, 1); // EXIT handle_menu_joystick_input(); if (playerInput & A_BUTTON) { - func_80001D04(0xEF, NULL); + play_sound_global(SOUND_SELECT2, NULL); switch (D_80126516) { case 0: state = 1; @@ -6734,13 +6734,13 @@ s32 tt_menu_loop(void) { if ((buttonsPressed & A_BUTTON) && (sCurrentMenuID != TT_MENU_EXIT)) { switch (D_80126516) { case 1: - func_80001D04(0xEF, 0); + play_sound_global(SOUND_SELECT2, 0); D_80126398 = 0; D_8012639C = TT_MENU_ROOT; sCurrentMenuID = TT_MENU_SAVE_GHOST; break; case 3: - func_80001D04(0xEF, 0); + play_sound_global(SOUND_SELECT2, 0); func_80036BCC(0x22E, 1); func_8009C674(D_800E1E2C); allocate_menu_images(D_800E1E40); @@ -6750,7 +6750,7 @@ s32 tt_menu_loop(void) { } currentOption = D_80126516 + 1; } else if (buttonsPressed & B_BUTTON) { - func_80001D04(0x241, 0); + play_sound_global(SOUND_MENU_BACK3, 0); currentOption = 3; } if (sCurrentMenuID == TT_MENU_GAME_STATUS) { @@ -6812,12 +6812,12 @@ s32 tt_menu_loop(void) { render_dialogue_text(1, POS_CENTRED, 50, gMenuText[160], 1, 4); // the Controller Pak render_dialogue_text(1, POS_CENTRED, 66, gMenuText[162], 1, 4); // insert it now! if (buttonsPressed & (A_BUTTON | START_BUTTON)) { - func_80001D04(0xEF, 0); + play_sound_global(SOUND_SELECT2, 0); D_80126398 = 0; D_8012639C = TT_MENU_INSERT_RUMBLE_PAK; sCurrentMenuID = TT_MENU_SAVE_GHOST; } else if (buttonsPressed & B_BUTTON) { - func_80001D04(0x241, 0); + play_sound_global(SOUND_MENU_BACK3, 0); sCurrentMenuID = TT_MENU_ROOT; } break; diff --git a/src/object_functions.c b/src/object_functions.c index b804adb9..a24e98e6 100644 --- a/src/object_functions.c +++ b/src/object_functions.c @@ -110,7 +110,7 @@ VertexPosition D_800DCB28[6] = { { 0, 0, -32 }, { 64, 0, 32 }, { 64, 0, -32 }, -}; +}; /*******************************/ @@ -155,14 +155,14 @@ void obj_init_scenery(Object *obj, LevelObjectEntry_Scenery *entry) { void obj_loop_scenery(Object *obj, s32 speed) { Object78_80033DD0 *obj78; s32 temp_v0; - + if (obj->unk4C != NULL) { obj78 = &obj->unk78; if (obj->unk7C.half.upper > 0) { obj78->unk4 -= speed; } if ((obj->unk4C->unk14 & 0x40) && ((s32) obj78->unk4 <= 0)) { - func_80009558(316, obj->segment.trans.x_position, obj->segment.trans.y_position, obj->segment.trans.z_position, 4, NULL); + func_80009558(SOUND_TWANG, obj->segment.trans.x_position, obj->segment.trans.y_position, obj->segment.trans.z_position, 4, NULL); obj78->unk0 = (s32*) obj->unk4C->unk0; obj78->unk6 = 1820; obj78->unk4 = 10; @@ -213,10 +213,10 @@ void func_80011570(Object*, f32, f32, f32); void func_8003FC44(f32, f32, f32, s32, s32, f32, s32); s16 arctan2_f(f32, f32); s32 func_8002AD08(f32, f32**, s32); -void func_80001D04(u16, s32 *); -void func_8000488C(s32); -void func_800AFC3C(Object *, s32); -void gParticlePtrList_addObject(Object *); +void play_sound_global(u16, s32 *); +void func_8000488C(s32); +void func_800AFC3C(Object *, s32); +void gParticlePtrList_addObject(Object *); void obj_loop_fireball_octoweapon(Object *obj, s32 speed) { Object *obj78; @@ -230,12 +230,12 @@ void obj_loop_fireball_octoweapon(Object *obj, s32 speed) { f32 sp4C[7]; obj78 = (Object*)obj->unk78; - + sp7C = speed; if (osTvType == TV_TYPE_PAL) { sp7C *= 1.2; } - + if ((obj->behaviorId == 116) && (obj->unk7C.word < 0)) { obj->segment.trans.x_position = 0.0f; obj->segment.trans.y_position = 0.0f; @@ -292,7 +292,7 @@ void obj_loop_fireball_octoweapon(Object *obj, s32 speed) { obj4C_obj64->unk204 = 60; obj->unk7C.word = -60; obj->unk78 = obj4C_obj; - func_80001D04(586, &obj64->unk1C); + play_sound_global(SOUND_BUBBLE_RISE, &obj64->unk1C); } } } @@ -327,7 +327,7 @@ void obj_loop_fireball_octoweapon(Object *obj, s32 speed) { if (temp != 0) { func_8000488C(temp); } - func_80009558(341, obj->segment.trans.x_position, obj->segment.trans.y_position, obj->segment.trans.z_position, 4, 0); + func_80009558(SOUND_POP, obj->segment.trans.x_position, obj->segment.trans.y_position, obj->segment.trans.z_position, 4, 0); gParticlePtrList_addObject(obj); } } @@ -382,7 +382,7 @@ void obj_loop_laserbolt(Object *obj, s32 speed) { f32 sp3C; s32 sp38; // Boolean - + sp4F = FALSE; sp5C = speed; if (osTvType == TV_TYPE_PAL) { @@ -406,13 +406,13 @@ void obj_loop_laserbolt(Object *obj, s32 speed) { func_8003FC44(obj->segment.trans.x_position, obj->segment.trans.y_position - 36.0f, obj->segment.trans.z_position, 44, 0, 0.2, 0); sp4F = TRUE; } - + if (obj->unk78 > 0) { obj->unk78 -= speed; } else { sp4F = TRUE; } - + if (obj->unk4C->unk13 < 80) { obj4C_obj = (Object*)obj->unk4C->unk0; if (obj4C_obj && (obj4C_obj->behaviorId == 1)) { @@ -527,10 +527,10 @@ void obj_init_trophycab(Object *obj, LevelObjectEntry_TrophyCab *entry) { #ifdef NON_EQUIVALENT -void func_80001D04(u16, s32 *); -void func_80001D04(u16, s32 *); +void play_sound_global(u16, s32 *); +void play_sound_global(u16, s32 *); u32 func_80001C08(void); -void func_80001D04(u16, s32 *); +void play_sound_global(u16, s32 *); Object *spawn_object(void *, s32); void func_8005A3B0(void); void func_8006F254(void); @@ -543,7 +543,6 @@ void func_800C31EC(s32); s32 func_800C3400(void); LevelHeader *get_current_level_header(void); Settings *get_settings(void); -void play_sound(u8 arg0); void set_music_fade_timer(s32 time); void set_sndfx_player_voice_limit(u8 voiceLimit); @@ -568,11 +567,11 @@ void obj_loop_trophycab(Object *obj, s32 speed) { f32 xDiff; f32 zDiff; s32 new_var2; - + settings = get_settings(); curLevelHeader = get_current_level_header(); obj64 = &obj->unk64->trophy_cabinet; - + // Show trophy inside the cabinet if (obj->unk7C.word == 0) { raceType = curLevelHeader->race_type; @@ -592,37 +591,37 @@ void obj_loop_trophycab(Object *obj, s32 speed) { } } } - + ((Object_54_80034E9C *) obj->unk54)->unk2C = 0.612f; ((Object_54_80034E9C *) obj->unk54)->unk28 = 0.0f; - + playerObj = get_object_struct(0); if (playerObj) { xDiff = obj->segment.trans.x_position - playerObj->segment.trans.x_position; zDiff = playerObj->segment.trans.z_position - obj->segment.trans.z_position; sqrtf((xDiff * xDiff) + (zDiff * zDiff)); // Distance on X & Z axes. Not used? - + new_var2 = settings->bosses; /** - * Future Fun Land doesn't have a boss rematch, so this OR is needed so that - * trophy race becomes avaliable after all the balloons have been collected. + * Future Fun Land doesn't have a boss rematch, so this OR is needed so that + * trophy race becomes avaliable after all the balloons have been collected. */ - new_var2 |= 0x800; - + new_var2 |= 0x800; + // Check if all the balloons have been collected. isTrophyRaceAvaliable = (settings->balloonsPtr[settings->worldId] < 8) ^ 1; if (isTrophyRaceAvaliable) { // Check if the boss rematch has been beaten. isTrophyRaceAvaliable = ((1 << (settings->worldId + 6)) & new_var2) != 0; } - + // Hit detection between cabinet & player? if ((((obj->unk78 == 0) && (!func_800C3400())) && obj->unk5C->unk100) && (obj64->unk4 == 0)) { // A hit has been detected at this point. if (isTrophyRaceAvaliable) { obj->unk78 = 1; - func_80001D04(303, 0); + play_sound_global(SOUND_VOICE_TT_TROPHY_RACE, 0); func_800A3870(); } else @@ -632,7 +631,7 @@ void obj_loop_trophycab(Object *obj, s32 speed) { obj64->unk0 = 140; set_sndfx_player_voice_limit(16); set_music_fade_timer(-8); - play_sound(17); + play_sequence(SEQUENCE_NO_TROPHY_FOR_YOU); } } if ((obj64->unk0 != 0) && (func_80001C08() == 0)) { @@ -744,7 +743,7 @@ void obj_loop_rocketsignpost(Object *obj, UNUSED s32 speed) { if (obj4C->unk13 < 0xC8) { if (playerObj == obj4C->unk0) { // Detect if the player honks or slams into the signpost. - if ((get_buttons_pressed_from_player(0) & Z_TRIG) || playerObj == obj->unk5C->unk100) { + if ((get_buttons_pressed_from_player(0) & Z_TRIG) || playerObj == obj->unk5C->unk100) { func_8006F29C(); } } @@ -798,7 +797,7 @@ void obj_loop_airzippers_waterzippers(Object *obj, UNUSED s32 speed) { for (i = 0; i < numObjects; i++) { curRacerObj = racerObjs[i]; racerObj64 = &curRacerObj->unk64->racer; - if ((racerObj64->unk1F5 == 0) && (racerObj64->unk1D3 < 15)) { + if ((racerObj64->unk1F5 == 0) && (racerObj64->boostTimer < 15)) { xDiff = curRacerObj->segment.trans.x_position - obj->segment.trans.x_position; yDiff = curRacerObj->segment.trans.y_position - obj->segment.trans.y_position; zDiff = curRacerObj->segment.trans.z_position - obj->segment.trans.z_position; @@ -847,7 +846,7 @@ void obj_init_groundzipper(Object *arg0, LevelObjectEntry_GroundZipper *entry) { void obj_loop_groundzipper(Object *obj, UNUSED s32 speed) { Object *curRacerObj; - Object_Racer *racerObj64; + Object_Racer *racer; f32 xDiff; f32 yDiff; s32 numObjects; @@ -862,22 +861,22 @@ void obj_loop_groundzipper(Object *obj, UNUSED s32 speed) { racerObjs = get_object_struct_array(&numObjects); for (i = 0; i < numObjects; i++) { curRacerObj = racerObjs[i]; - racerObj64 = &curRacerObj->unk64->racer; - if ((racerObj64->unk1D3 < 15) && (racerObj64->unk1E2 != 0)) { + racer = &curRacerObj->unk64->racer; + if ((racer->boostTimer < 15) && (racer->unk1E2 != 0)) { xDiff = curRacerObj->segment.trans.x_position - obj->segment.trans.x_position; yDiff = curRacerObj->segment.trans.y_position - obj->segment.trans.y_position; zDiff = curRacerObj->segment.trans.z_position - obj->segment.trans.z_position; if ((s32) sqrtf((xDiff * xDiff) + (yDiff * yDiff) + (zDiff * zDiff)) < obj->unk78) { - if (racerObj64->playerIndex != -1) { - func_80001EA8(263, curRacerObj->segment.trans.x_position, curRacerObj->segment.trans.y_position, curRacerObj->segment.trans.z_position, NULL); + if (racer->playerIndex != PLAYER_COMPUTER) { + play_sound_spatial(SOUND_ZIP_PAD_BOOST, curRacerObj->segment.trans.x_position, curRacerObj->segment.trans.y_position, curRacerObj->segment.trans.z_position, NULL); } - racerObj64->unk1D3 = func_8000C8B4(45); - racerObj64->unk203 = 2; - if (racerObj64->unk20C) { - racerObj64->unk203 |= 4; + racer->boostTimer = normalise_time(45); + racer->boostType = BOOST_LARGE; + if (racer->throttleReleased) { + racer->boostType |= BOOST_SMALL_FAST; } - if (racerObj64->raceStatus == STATUS_RACING) { - func_80072348(racerObj64->playerIndex, 8); + if (racer->raceStatus == STATUS_RACING) { + func_80072348(racer->playerIndex, 8); } } } @@ -984,7 +983,7 @@ void func_80036BCC(u16 arg0, s32 arg1) { D_8011D4D8 = 0; } if (D_8011D4D8 == 0) { - func_80001D04(arg0, &D_8011D4D8); + play_sound_global(arg0, &D_8011D4D8); } } @@ -1085,7 +1084,7 @@ void obj_loop_animator(Object* obj, s32 speed) { s32 maxSpeed; obj64 = &obj->unk64->animator; - + temp = obj64->xSpeedFactor * speed; obj64->xSpeed += temp << 4; sp20 = obj64->xSpeed >> 4; @@ -1201,7 +1200,7 @@ void obj_init_animation(Object *obj, LevelObjectEntry_Animation *entry, s32 arg2 func_8001F23C(obj, entry); } obj64 = &obj->unk64->animation; - if (obj->unk64 != 0) { + if (obj->unk64 != 0) { func_8001EFA4(obj, obj64); if (entry->order != 0 || obj64->unk4A != entry->objectIdToSpawn) { gParticlePtrList_addObject(obj64); @@ -1469,7 +1468,7 @@ void obj_loop_teleport(Object *obj, UNUSED s32 speed) { if (obj->unk4C->unk13 < 0x78) { func_8006F338(temp->unk8); obj->unk78 = 0; - func_80001D04(0x30, 0); + play_sound_global(SOUND_WHOOSH2, 0); func_80000FDC(0x12A, 0, 1.0f); } } @@ -1587,7 +1586,7 @@ void obj_loop_dino_whale(Object *obj, s32 speed) { if (obj->unk4C->unk13 < 0xFF) { if (obj->unk78 == 0) { obj->unk78 = 0x3C; - func_80009558(0x23B, obj->segment.trans.x_position, obj->segment.trans.y_position, obj->segment.trans.z_position, 4, NULL); + func_80009558(571, obj->segment.trans.x_position, obj->segment.trans.y_position, obj->segment.trans.z_position, 4, NULL); } } } @@ -1621,7 +1620,7 @@ void func_8003AC3C(u16 arg0, s32 arg1) { D_8011D4D4 = 0; } if (D_8011D4D4 == 0) { - func_80001D04(arg0, &D_8011D4D4); + play_sound_global(arg0, &D_8011D4D4); } } @@ -1696,7 +1695,7 @@ void obj_init_bonus(Object *obj, LevelObjectEntry_Bonus *entry) { void obj_loop_bonus(Object *obj, UNUSED s32 speed) { Object *racerObj; - Object_Racer *racerObj64; + Object_Racer *racer; s32 numberOfRacers; f32 xDiff; f32 yDiff; @@ -1714,7 +1713,7 @@ void obj_loop_bonus(Object *obj, UNUSED s32 speed) { racerObjects = get_object_struct_array(&numberOfRacers); for (i = 0; i < numberOfRacers; i++) { racerObj = racerObjects[i]; - racerObj64 = &racerObj->unk64->racer; + racer = &racerObj->unk64->racer; yDiff = racerObj->segment.trans.y_position - obj->segment.trans.y_position; if ((yDiff < halfDist) && (-halfDist < yDiff)) { xDiff = racerObj->segment.trans.x_position - obj->segment.trans.x_position; @@ -1722,10 +1721,10 @@ void obj_loop_bonus(Object *obj, UNUSED s32 speed) { if ((sqrtf((xDiff * xDiff) + (yDiff * yDiff) + (zDiff * zDiff)) < dist)) { f32 temp = (obj64->unk0 * racerObj->segment.trans.x_position) + (obj64->unk8 * racerObj->segment.trans.z_position) + obj64->unkC; if (temp < 0.0f) { - if ((s32) racerObj64->bananas < 10) { - racerObj64->bananas = 10; - func_80009558(34, racerObj->segment.trans.x_position, racerObj->segment.trans.y_position, racerObj->segment.trans.z_position, 4, NULL); - func_80001EA8(racerObj64->characterId + 123, racerObj->segment.trans.x_position, racerObj->segment.trans.y_position, racerObj->segment.trans.z_position, NULL); + if ((s32) racer->bananas < 10) { + racer->bananas = 10; + func_80009558(SOUND_SELECT, racerObj->segment.trans.x_position, racerObj->segment.trans.y_position, racerObj->segment.trans.z_position, 4, NULL); + play_sound_spatial(racer->characterId + SOUND_UNK123, racerObj->segment.trans.x_position, racerObj->segment.trans.y_position, racerObj->segment.trans.z_position, NULL); } } } @@ -1825,7 +1824,7 @@ void obj_loop_goldenballoon(Object *obj, s32 speed) { settings->balloonsPtr[0]++; } settings->courseFlagsPtr[settings->courseId] |= flag; - func_80001EA8(573, obj->segment.trans.x_position, obj->segment.trans.y_position, obj->segment.trans.z_position, NULL); + play_sound_spatial(573, obj->segment.trans.x_position, obj->segment.trans.y_position, obj->segment.trans.z_position, NULL); obj->unk7C.word = 16; obj->unk74 = 2; obj->segment.trans.unk6 |= 0x4000; @@ -2170,7 +2169,7 @@ void obj_loop_worldkey(Object *worldKeyObj, s32 speed) { Object_WorldKey *obj64 = &playerObj->unk64->world_key; if (obj64->unk0 != -1) { // Player has grabbed the key! - play_sound(SOUND_WORLD_KEY_GRAB); + play_sequence(SEQUENCE_KEY_COLLECT); settings = get_settings(); settings->keys |= 1 << worldKeyObj->unk78; // Set key flag gParticlePtrList_addObject(worldKeyObj); // Makes the key unload. @@ -2249,7 +2248,7 @@ void obj_init_weapon(Object *obj, UNUSED LevelObjectEntry_Weapon *entry) { obj->unk4C->unk11 = 0; obj->unk4C->unk10 = 0x18; obj->unk4C->unk12 = 0; - obj->unk78 = func_8000C8B4(0x1E0); + obj->unk78 = normalise_time(0x1E0); obj->unk7C.word = 0; } @@ -2327,11 +2326,11 @@ void obj_init_audio(Object *obj, LevelObjectEntry_Audio *entry) { obj64->unk8 = 0; if (ALBankFile_80115D14_GetSoundDecayTime(obj64->unk0)) { func_8000974C(obj64->unk0, entry->common.x, entry->common.y, entry->common.z, - 9, obj64->unk5, obj64->unk4, obj64->unk2, obj64->unkC, + 9, obj64->unk5, obj64->unk4, obj64->unk2, obj64->unkC, obj64->unk6, obj64->unkD, &obj64->unk8); } else { - func_8000974C(obj64->unk0, entry->common.x, entry->common.y, entry->common.z, - 10, obj64->unk5, obj64->unk4, obj64->unk2, obj64->unkC, + func_8000974C(obj64->unk0, entry->common.x, entry->common.y, entry->common.z, + 10, obj64->unk5, obj64->unk4, obj64->unk2, obj64->unkC, obj64->unk6, obj64->unkD, &obj64->unk8); } gParticlePtrList_addObject(obj); @@ -2556,7 +2555,7 @@ void obj_init_butterfly(Object *obj, LevelObjectEntry_Butterfly *entry, s32 arg2 } else { obj64->texture = (TextureHeader*)obj->unk68[0]; } - + if (obj64->texture) { uMask = (obj64->texture->width - 1) << 5; vMask = (obj64->texture->height - 1) << 5; @@ -2691,7 +2690,7 @@ void obj_init_frog(Object *obj, LevelObjectEntry_Frog *entry) { if (obj64->unk15) { obj->segment.unk3A = 1; /** - * Don't spawn the chicken frog if drumstick is already unlocked, or + * Don't spawn the chicken frog if drumstick is already unlocked, or * if the player hasn't completed the trophy races yet. */ if (is_drumstick_unlocked() || (get_settings()->trophies & 0xFF) != 0xFF) { diff --git a/src/object_functions.h b/src/object_functions.h index 95b27beb..943b75f9 100644 --- a/src/object_functions.h +++ b/src/object_functions.h @@ -7,7 +7,6 @@ #include "libc/math.h" #define WORLD_KEY_GRAB_CHECK_RADIUS 50 -#define SOUND_WORLD_KEY_GRAB 54 #define TIME_JIFFIES_PER_SECOND 60 #define TIME_SECONDS(sec) sec * TIME_JIFFIES_PER_SECOND diff --git a/src/objects.c b/src/objects.c index ba08b5f2..235ca9bd 100644 --- a/src/objects.c +++ b/src/objects.c @@ -167,7 +167,7 @@ f32 D_8011ADA8; s32 D_8011ADAC; s32 D_8011ADB0; s32 D_8011ADB4; -s32 D_8011ADB8; +s32 gRaceStartCountdown; s32 D_8011ADBC; s32 D_8011ADC0; u8 D_8011ADC4; @@ -482,11 +482,16 @@ void func_8000C844(s32 arg0) { } } -s32 func_8000C8B4(s32 arg0) { - if (osTvType != 0 || arg0 < 0) { - return arg0; +/** + * Converts the passed value into an accurate countdown value based on the systems region. + * Since PAL runs at 50Hz, it therefore will reduce the timer to 5/6 to match, keeping + * it consistent with non PAL timers, running 60Hz. + */ +s32 normalise_time(s32 timer) { + if (osTvType != TV_TYPE_PAL || timer < 0) { + return timer; } else { - return (arg0 * 5) / 6; + return (timer * 5) / 6; } } @@ -860,8 +865,13 @@ s32 func_8001139C() { return D_8011ADB0; } -s32 func_800113AC() { - return D_8011ADB8; +/** + * Return the timer countdown before the race starts. + * There exists another variable in racer.c with exactly the same purpose. + * This does not get used anywhere else. + */ +s32 get_race_start_timer() { + return gRaceStartCountdown; } s32 func_800113BC() { diff --git a/src/objects.h b/src/objects.h index 8366cab3..d180afff 100644 --- a/src/objects.h +++ b/src/objects.h @@ -43,7 +43,7 @@ typedef struct unk800179D0 { /* Unknown Size */ typedef struct unk800179D0_2 { - s32 unk04; + s32 unk04; } unk800179D0_2; typedef struct unk8001D6E4_arg1_40 { @@ -130,7 +130,7 @@ Object *func_8000BF44(s32 arg0); void func_8000BF8C(void); void func_8000C460(void); void func_8000C604(void); -s32 func_8000C8B4(s32 arg0); +s32 normalise_time(s32 timer); void func_8000CBC0(void); s32 func_8000CC20(u32 *arg0); u32 func_8000E0B0(void); @@ -157,7 +157,7 @@ s32 func_80010018(void); s32 func_80010028(s32 arg0); void func_80011390(void); s32 func_8001139C(); -s32 func_800113AC(); +s32 get_race_start_timer(); s32 func_800113BC(); s32 func_80011560(void); void func_80012C30(void); diff --git a/src/racer.c b/src/racer.c index 7d8844c7..dd83d1f7 100644 --- a/src/racer.c +++ b/src/racer.c @@ -154,7 +154,7 @@ s32 D_8011D530; s32 gCurrentStickX; s32 gCurrentStickY; s32 D_8011D53C; -s32 D_8011D540; +s32 gRaceStartTimer; f32 D_8011D544; f32 D_8011D548; f32 D_8011D54C; @@ -178,7 +178,7 @@ s8 D_8011D581; s8 D_8011D582; s8 D_8011D583; s8 D_8011D584; -s8 D_8011D585; +s8 gStartBoostTime; s16 D_8011D586; s8 D_8011D588[4]; s8 D_8011D58C[4]; @@ -199,7 +199,7 @@ s16 D_8011D5B8; GLOBAL_ASM("asm/non_matchings/racer/func_80042D20.s") -void func_80043ECC(s32 arg0, Object_64_Unknown5 *arg1, s32 updateRate) { +void func_80043ECC(s32 arg0, Object_Racer *racer, s32 updateRate) { TempStruct5 *temp_v0; s8 *test; s8 phi_a0; @@ -214,8 +214,8 @@ void func_80043ECC(s32 arg0, Object_64_Unknown5 *arg1, s32 updateRate) { D_8011D5BC = 0; return; } - temp_v0 = (TempStruct5 *)func_8006C18C(); - if (arg1->unk1D3) { + temp_v0 = func_8006C18C(); + if (racer->boostTimer) { if (!D_8011D5BB) { temp_v0->unk8[3][0] += temp_v0->unk8[3][2]; temp_v0->unk8[3][1] += temp_v0->unk8[3][3]; @@ -232,21 +232,21 @@ void func_80043ECC(s32 arg0, Object_64_Unknown5 *arg1, s32 updateRate) { } D_8011D5BA = 0; } - if (arg1->unk173) { - if (D_8011D5BC < arg1->unk174) { + if (racer->balloon_quantity) { + if (D_8011D5BC < racer->balloon_level) { temp_v0->unk8[1][0] += temp_v0->unk8[1][2]; temp_v0->unk8[1][1] += temp_v0->unk8[1][3]; } - D_8011D5BC = arg1->unk174; + D_8011D5BC = racer->balloon_level; } else { D_8011D5BC = 0; } test = get_misc_asset(12); - if ((D_8011D530 & 0x2000) && arg1->unk173) { - if (arg1->unk174 < 3) { - phi_a0 = test[arg1->unk172 * 3 + arg1->unk174]; + if ((D_8011D530 & 0x2000) && racer->balloon_quantity) { + if (racer->balloon_level < 3) { + phi_a0 = test[racer->balloon_type * 3 + racer->balloon_level]; } else { - phi_a0 = arg1->unk172; + phi_a0 = racer->balloon_type; } if (D_800DCD90[phi_a0] == 1) { temp_v0->unk8[2][0] += temp_v0->unk8[2][2]; @@ -295,7 +295,7 @@ void func_80044170(Object *obj, Object_Racer *racer, s32 updateRate) { } } - if (racer->velocity > -1.0 && racer->unk214 == 0 && !D_8011D540 && D_8011D544 == 0.0f && racer->unk1E2 && racer->unk215 == 0) { + if (racer->velocity > -1.0 && racer->unk214 == 0 && !gRaceStartTimer && D_8011D544 == 0.0f && racer->unk1E2 && racer->unk215 == 0) { racer->unk213 += updateRate; if (racer->unk213 > 60) { @@ -451,14 +451,14 @@ void update_camera_hovercraft(f32 updateRate, Object *obj, Object_Racer *racer) phi_f14 -= yVel; } phi_f14 += baseSpeed * 30.0f; - if (D_8011D540 == 0) { - if (func_8000C8B4(36) < racer->unk1D3) { + if (gRaceStartTimer == 0) { + if (normalise_time(36) < racer->boostTimer) { phi_f14 = -30.0f; - } else if (racer->unk1D3 > 0) { + } else if (racer->boostTimer > 0) { phi_f14 = 180.0f; } } - if (D_8011D540 > 80) { + if (gRaceStartTimer > 80) { gCameraObject->unk1C = phi_f14; gCameraObject->unk20 = phi_f18; } @@ -485,13 +485,13 @@ void update_camera_hovercraft(f32 updateRate, Object *obj, Object_Racer *racer) } else { yVel *= 0.25; } - if (racer->unk1D3 != 0) { + if (racer->boostTimer != 0) { yVel *= 2.0; } } gCameraObject->trans.y_position -= yVel; gCameraObject->trans.z_rotation = 0; - if (D_8011D540) { + if (gRaceStartTimer) { gCameraObject->trans.y_position = obj->segment.trans.y_position + phi_f18; } @@ -500,8 +500,8 @@ void update_camera_hovercraft(f32 updateRate, Object *obj, Object_Racer *racer) gCameraObject->trans.z_position = obj->segment.trans.z_position + zVel; gCameraObject->trans.y_rotation = racer->unk196; segmentIndex = get_level_segment_index_from_position(gCameraObject->trans.x_position, gCameraObject->trans.y_position, gCameraObject->trans.z_position); - if (segmentIndex != -1) { - gCameraObject->unk34 = segmentIndex; + if (segmentIndex != SEGMENT_NONE) { + gCameraObject->segmentIndex = segmentIndex; } } @@ -509,16 +509,16 @@ GLOBAL_ASM("asm/non_matchings/racer/func_800494E0.s") GLOBAL_ASM("asm/non_matchings/racer/func_80049794.s") // Something Plane related. -void func_8004C0A0(s32 arg0, Object *planeObj, Object_Racer *planeObj64) { +void func_8004C0A0(s32 arg0, Object *planeObj, Object_Racer *racer) { s32 temp_v1; s32 phi_v0; - if (planeObj64->unk1D7 != 10) { + if (racer->unk1D7 != 10) { //!@bug Typo. Should've been `== 0`, not `= 0`. - if ((planeObj64->unk1F2 = 0)) { + if ((racer->unk1F2 = 0)) { return; // This never gets called because of the typo. } - phi_v0 = planeObj64->unk1E1; + phi_v0 = racer->steerAngle; phi_v0 = 40 - (phi_v0 >> 1); if (phi_v0 < 0) { phi_v0 = 0; @@ -565,7 +565,7 @@ void func_8004C140(Object *obj, Object_Racer *racer) { racer->unk1C9 = 0; } if (racer->unk1D6 < 5) { - func_800570B8(obj, 450, 8, 129); + func_800570B8(obj, SOUND_VOICE_CHARACTER_NEGATIVE, 8, 129); switch (racer->unk187) { case 1: case 2: @@ -718,14 +718,14 @@ void update_camera_plane(f32 updateRate, Object* obj, Object_Racer* racer) { if (yOffset); phi_f14 -= tempVel; } - if (!D_8011D540) { - if (func_8000C8B4(36) < racer->unk1D3) { + if (!gRaceStartTimer) { + if (normalise_time(36) < racer->boostTimer) { phi_f14 = -30.0f; - } else if (racer->unk1D3 > 0) { + } else if (racer->boostTimer > 0) { phi_f14 = 180.0f; } } - if (D_8011D540 > 80) { + if (gRaceStartTimer > 80) { gCameraObject->unk1C = phi_f14; gCameraObject->unk20 = baseFloat1; } @@ -777,7 +777,7 @@ void update_camera_plane(f32 updateRate, Object* obj, Object_Racer* racer) { gCameraObject->trans.z_rotation += angle >> 2; } else { angle = (u16) gCameraObject->trans.z_rotation; - angle = angle + (-(racer->unk1A4 >> 4)); + angle = angle + (-(racer->x_rotation_vel >> 4)); if (angle > 0x8000) { angle -= 0xFFFF; } @@ -789,7 +789,7 @@ void update_camera_plane(f32 updateRate, Object* obj, Object_Racer* racer) { tempVel = gCameraObject->trans.x_position; segmentIndex = get_level_segment_index_from_position(tempVel, gCameraObject->trans.y_position, gCameraObject->trans.z_position); if (segmentIndex != -1) { - gCameraObject->unk34 = segmentIndex; + gCameraObject->segmentIndex = segmentIndex; } racer->unk196 = gCameraObject->trans.y_rotation; } @@ -819,8 +819,8 @@ void update_camera_loop(f32 updateRate, Object* obj, Object_Racer* racer) { delta = (s32) updateRate; zoom = 120.0f; - if (D_8011D540 >= 0x3D) { - zoom += ((f32) (D_8011D540 - 0x3C) * 4.0f); + if (gRaceStartTimer > 60) { + zoom += ((f32) (gRaceStartTimer - 60) * 4.0f); } racer->unk196 = 0x8000 - racer->unk1A0; if (get_viewport_count() == 1) { @@ -860,8 +860,8 @@ void update_camera_loop(f32 updateRate, Object* obj, Object_Racer* racer) { gCameraObject->trans.x_rotation += ((angle * delta) >> 4); gCameraObject->trans.y_rotation = racer->unk196; segmentIndex = get_level_segment_index_from_position(gCameraObject->trans.x_position, gCameraObject->trans.y_position, gCameraObject->trans.z_position); - if (segmentIndex != -1) { - gCameraObject->unk34 = segmentIndex; + if (segmentIndex != SEGMENT_NONE) { + gCameraObject->segmentIndex = segmentIndex; } racer->unk196 = gCameraObject->trans.y_rotation; gCameraObject->trans.x_position += gCameraObject->x_velocity; @@ -928,7 +928,7 @@ void obj_init_racer(Object *obj, LevelObjectEntry_CharacterFlag *racer) { tempObj->playerIndex = PLAYER_COMPUTER; } tempObj->unk1A0 = obj->segment.trans.y_rotation; - tempObj->unk1A4 = obj->segment.trans.z_rotation; + tempObj->x_rotation_vel = obj->segment.trans.z_rotation; tempObj->unkC4 = 0.5f; if (1); tempObj->unk196 = tempObj->unk1A0; @@ -1000,7 +1000,7 @@ void obj_init_racer(Object *obj, LevelObjectEntry_CharacterFlag *racer) { if (1); if (1); // Also critical to match. func_80043ECC(0, NULL, 0); D_8011D583 = i; - D_8011D585 = 0; + gStartBoostTime = 0; tempObj->unk20A = 0; } @@ -1046,7 +1046,7 @@ void func_80050754(Object *obj, Object_Racer *racer, f32 divisor) { obj->segment.trans.y_rotation = racer->unk148->segment.trans.y_rotation; obj->segment.trans.x_rotation = racer->unk148->segment.trans.x_rotation; obj->segment.trans.z_rotation = racer->unk148->segment.trans.z_rotation; - racer->unk1A4 = obj->segment.trans.z_rotation; + racer->x_rotation_vel = obj->segment.trans.z_rotation; racer->unk1A0 = obj->segment.trans.y_rotation; obj->segment.x_velocity = diffX / divisor; obj->segment.y_velocity = diffY / divisor; @@ -1145,13 +1145,13 @@ void func_800521C4(Object *obj, Object_Racer *racer, UNUSED s32 arg2) { } if (!foundObj) { tempObj = func_8001B7A8(racer, 1, &distance); - if (tempObj && !D_8011D540) { + if (tempObj && !gRaceStartTimer) { foundObj = func_80052388(obj, racer, tempObj, 160000.0f); } } if (!foundObj) { tempObj = func_8001B7A8(racer, -1, &distance); - if (tempObj && !D_8011D540) { + if (tempObj && !gRaceStartTimer) { foundObj = func_80052388(obj, racer, tempObj, 30000.0f); } } @@ -1302,7 +1302,7 @@ void handle_car_steering(Object_Racer *racer) { velScale = vel * 58.0f; } // Set the steering velocity based on the car's steering value, scaled with the temp forward velocity value. - gCurrentCarSteerVel -= (racer->unk1E1 * velScale); + gCurrentCarSteerVel -= (racer->steerAngle * velScale); // If the car is reversing, then flip the steering. if (racer->velocity > 0.0f) { gCurrentCarSteerVel = -gCurrentCarSteerVel; @@ -1351,7 +1351,7 @@ void handle_car_velocity_control(Object_Racer *racer) { GLOBAL_ASM("asm/non_matchings/racer/func_80053750.s") GLOBAL_ASM("asm/non_matchings/racer/func_80053E9C.s") -void func_80054110(Object *obj, Object_Racer *racer, s32 updateRate, f32 arg3) { +void func_80054110(Object *obj, Object_Racer *racer, s32 updateRate, f32 updateRateF) { f32 tempVel; f32 xVel; f32 zVel; @@ -1370,17 +1370,17 @@ void func_80054110(Object *obj, Object_Racer *racer, s32 updateRate, f32 arg3) { tempZ = obj->segment.trans.z_position; gCurrentCarSteerVel = 0; D_8011D558 = 0; - func_800579B0(racer, 0, arg3); + handle_base_steering(racer, 0, updateRateF); handle_car_velocity_control(racer); func_800575EC(obj, racer); func_80055EC0(obj, racer, updateRate); func_80053E9C(obj, racer, updateRate); if (racer->spinout_timer) { - func_80052B64(obj, racer, updateRate, arg3); // Sbinalla + func_80052B64(obj, racer, updateRate, updateRateF); // Sbinalla } else if (racer->unk1E2 > 0) { - func_8005492C(obj, racer, updateRate, arg3); + func_8005492C(obj, racer, updateRate, updateRateF); } else { - func_80052D7C(obj, racer, updateRate, arg3); + func_80052D7C(obj, racer, updateRate, updateRateF); } apply_vehicle_rotation_offset(racer, updateRate, 0, 0, 0); header = get_current_level_header(); @@ -1409,7 +1409,7 @@ void func_80054110(Object *obj, Object_Racer *racer, s32 updateRate, f32 arg3) { racer->unk1F0 = 0; } obj->segment.unk3B = 0; - tempAngle = ((-racer->unk1A2 >> 8) / D_8011D570); + tempAngle = ((-racer->y_rotation_vel >> 8) / D_8011D570); tempAngle = 40 - tempAngle; if (tempAngle < 0) { tempAngle = 0; @@ -1419,14 +1419,14 @@ void func_80054110(Object *obj, Object_Racer *racer, s32 updateRate, f32 arg3) { } obj->segment.unk18 = tempAngle; func_8005234C(racer); - angle = gCurrentCarSteerVel - (u16) racer->unk1A2; + angle = gCurrentCarSteerVel - (u16) racer->y_rotation_vel; WRAP(angle, -0x8000, 0x8000); angle >>= 2; CLAMP(angle, -0x2EE, 0x2EE); - racer->unk1A2 += (angle * updateRate); - obj->segment.trans.y_rotation = racer->unk1A0 + racer->unk1A2; - racer->unk1A6 += ((D_8011D558 - racer->unk1A6) * updateRate) >> 4; - obj->segment.trans.z_rotation = racer->unk1A4 + racer->unk1A6; + racer->y_rotation_vel += (angle * updateRate); + obj->segment.trans.y_rotation = racer->unk1A0 + racer->y_rotation_vel; + racer->z_rotation_vel += ((D_8011D558 - racer->z_rotation_vel) * updateRate) >> 4; + obj->segment.trans.z_rotation = racer->x_rotation_vel + racer->z_rotation_vel; if (!racer->unk1F0) { D_8011D510.y_rotation = racer->unk1A0 + racer->unk10C; D_8011D510.x_rotation = 0; @@ -1451,9 +1451,9 @@ void func_80054110(Object *obj, Object_Racer *racer, s32 updateRate, f32 arg3) { } xVel += racer->unk84; zVel += racer->unk88; - func_80011570(obj, xVel * arg3, obj->segment.y_velocity * arg3, zVel * arg3); + func_80011570(obj, xVel * updateRateF, obj->segment.y_velocity * updateRateF, zVel * updateRateF); } else { - func_80050754(obj, racer, arg3); + func_80050754(obj, racer, updateRateF); } if (D_8011D55C == -1 && !func_80023568()) { func_80055A84(obj, racer, updateRate); @@ -1465,8 +1465,8 @@ void func_80054110(Object *obj, Object_Racer *racer, s32 updateRate, f32 arg3) { } else if (racer->unk1D6 < 5) { func_800AF714(obj, updateRate); } - func_80053750(obj, racer, arg3); - tempVel = 1.0f / arg3; + func_80053750(obj, racer, updateRateF); + tempVel = 1.0f / updateRateF; xVel = (((obj->segment.trans.x_position - tempX) - D_8011D548) * tempVel) - racer->unk84; obj->segment.y_velocity = (obj->segment.trans.y_position - tempY) * tempVel; zVel = (((obj->segment.trans.z_position - tempZ) - D_8011D54C) * tempVel) - racer->unk88; @@ -1585,7 +1585,7 @@ void func_80055A84(Object *obj, Object_Racer *racer, s32 updateRate) { tempZ = (tempX * angleX) - (tempZ * angleZ); temp_v1_2 = -(s16)(u16)arctan2_f(distance, tempY); if (temp_v1_2 < 0x2000 && temp_v1_2 > -0x2000) { - racer->unk1A4 = temp_v1_2; + racer->x_rotation_vel = temp_v1_2; } xRot = -(s16)(u16)arctan2_f(tempZ, tempY); if ((xRot < 0x2000) && (xRot > -0x2000)) { @@ -1599,7 +1599,7 @@ void func_80055A84(Object *obj, Object_Racer *racer, s32 updateRate) { } } if (racer->unk1D6 != 4 && racer->unk1D6 != 2 && racer->unk1D6 != 10 && racer->unk1D6 != 7) { - CLAMP(racer->unk1A4, -0x3400, 0x3400); + CLAMP(racer->x_rotation_vel, -0x3400, 0x3400); CLAMP(obj->segment.trans.x_rotation, -0x3400, 0x3400); } } @@ -1609,20 +1609,23 @@ GLOBAL_ASM("asm/non_matchings/racer/func_80055EC0.s") void play_char_horn_sound(Object *obj, Object_Racer *racer) { if (get_filtered_cheats() & CHEAT_HORN_CHEAT) { // Play character voice instead of horn. - func_800570B8(obj, 0x162, 8, 0x82); + func_800570B8(obj, SOUND_VOICE_CHARACTER_POSITIVE, 8, 130); } else { // Play character's horn sound - func_80057048(obj, racer->characterId + 0x156); + racer_play_sound(obj, racer->characterId + SOUND_HORN_CHARACTER); } } GLOBAL_ASM("asm/non_matchings/racer/func_8005698C.s") GLOBAL_ASM("asm/non_matchings/racer/func_80056E2C.s") -void func_80057048(Object *obj, s32 arg1) { +/** + * Play a spatial sound, emitting from the position of the racer object. + */ +void racer_play_sound(Object *obj, s32 soundID) { Object_Racer *racer = &obj->unk64->racer; if (D_8011D55C != -1 && racer->unk108 == 0) { - func_80001EA8(arg1, obj->segment.trans.x_position, obj->segment.trans.y_position, obj->segment.trans.z_position, NULL); + play_sound_spatial(soundID, obj->segment.trans.x_position, obj->segment.trans.y_position, obj->segment.trans.z_position, NULL); } } @@ -1632,110 +1635,126 @@ void func_800570A4(Object *obj, s32 arg1, s32 arg2) { temp->unk210 = arg2; } -void func_800570B8(Object *obj, s32 arg1, s32 arg2, s32 arg3) { - s32 temp_v1; - Object_64 *temp_s2; +/** + * Play a random character voice clip from the given offset. + * It uses SOUND_VOICE_CHARACTER_POSITIVE and SOUND_VOICE_CHARACTER_NEGATIVE for + * acceptable offsets. Range will always be 8, because that's how many ID's for each + * there are. + */ +void func_800570B8(Object *obj, s32 soundID, s32 range, s32 arg3) { + s32 soundIndex; + Object_64 *tempRacer; - temp_s2 = obj->unk64; - if ((temp_s2->racer.unk108 == 0) && ((!(arg3 & 0x80)) || (D_8011D55C != -1))) { + tempRacer = obj->unk64; + if (tempRacer->racer.unk108 == 0 && ((!(arg3 & 0x80)) || D_8011D55C != -1)) { if (arg3 == 2) { - if ((temp_s2->racer.unk24 != 0) && (arg1 != temp_s2->racer.unk2A)) { - func_800096F8(temp_s2->racer.unk24); - temp_s2->racer.unk24 = 0; + if ((tempRacer->racer.unk24 != 0) && (soundID != tempRacer->racer.unk2A)) { + func_800096F8(tempRacer->racer.unk24); + tempRacer->racer.unk24 = 0; } } - if ((temp_s2->racer.unk24 == 0) && ((arg3 != 3) || (get_random_number_from_range(0, 1) != 0))) { - temp_s2->racer.unk2A = arg1; - arg1 += temp_s2->racer.characterId; - temp_v1 = (get_random_number_from_range(0, arg2 - 1) * 12) + arg1; - if (arg2 - 1 > 0) { - while (temp_v1 == temp_s2->racer.unk28) { - temp_v1 = (get_random_number_from_range(0, arg2 - 1) * 12) + arg1; + if (tempRacer->racer.unk24 == 0 && (arg3 != 3 || get_random_number_from_range(0, 1))) { + tempRacer->racer.unk2A = soundID; + soundID += tempRacer->racer.characterId; + soundIndex = (get_random_number_from_range(0, range - 1) * 12) + soundID; + if (range - 1 > 0) { + while (soundIndex == tempRacer->racer.unk28) { + soundIndex = (get_random_number_from_range(0, range - 1) * 12) + soundID; } } - func_80009558(temp_v1, obj->segment.trans.x_position, obj->segment.trans.y_position, obj->segment.trans.z_position, 4, &temp_s2->racer.unk24); - temp_s2->racer.unk28 = temp_v1; + func_80009558(soundIndex, obj->segment.trans.x_position, obj->segment.trans.y_position, obj->segment.trans.z_position, 4, &tempRacer->racer.unk24); + tempRacer->racer.unk28 = soundIndex; } } } -f32 func_80057220(Object *obj, Object_Racer *racer) { +/** + * This function dictates the base top speed of a racer. + * During the race start sequence it hardsets it to 0 so you don't go anywhere. + * It then adds to the multiplier an amount based on your bananas. + */ +f32 handle_racer_top_speed(Object *obj, Object_Racer *racer) { f32 speedMultiplier; - s32 temp_v1; + s32 timer; f32 bananas; f32 cap; - s32 phi_a1; - s32 sp28; + s32 timer2; + s32 timer3; + // If you want to change the baseline speed of vehicles, this is what you change. speedMultiplier = 1.0f; - if (D_8011D540) { + // Set the player's top speed to 0 before the race starts, so you can't jump the start. + if (gRaceStartTimer) { speedMultiplier = 0.0f; } - sp28 = func_800113AC(); - if (D_8011D540); - if (D_8011D540 > 0 && D_8011D540 < 30 && !racer->unk1F4) { - temp_v1 = D_8011D540 - 14; + timer3 = get_race_start_timer(); + if (gRaceStartTimer); + // If the A button is held for the first time, 30 frames prior to starting, + // decide how much boost to add based on when it was pressed. + if (gRaceStartTimer > 0 && gRaceStartTimer < 30 && !racer->startInput) { + timer = gRaceStartTimer - 14; if (gActivePlayerButtonPress & A_BUTTON) { - if (temp_v1 < 0 && sp28 >= 0) { - temp_v1 = 0; + if (timer < 0 && timer3 >= 0) { + timer = 0; } - if (temp_v1 < 0) { - temp_v1 = -temp_v1; + // Keep the timer positive. + if (timer < 0) { + timer = -timer; } - if ((gCurrentCarInput & Z_TRIG)) { - if (temp_v1 < 2) { - temp_v1 = 0; + if (timer < 2) { + timer = 0; } } - - phi_a1 = 24 - temp_v1; - racer->unk1D3 = func_8000C8B4(phi_a1 >> 1); - if (phi_a1 == 24) { - func_80057048(obj, 34); - racer->unk1D3 = func_8000C8B4(20); + timer2 = 24 - timer; + racer->boostTimer = normalise_time(timer2 >> 1); + if (timer2 == 24) { + racer_play_sound(obj, SOUND_SELECT); + racer->boostTimer = normalise_time(20); } - if (racer->unk1D3 < func_8000C8B4(20)) { - racer->unk203 = 0; - } else if (racer->unk1D3 < func_8000C8B4(35)) { - racer->unk203 = 1; + if (racer->boostTimer < normalise_time(20)) { + racer->boostType = BOOST_SMALL; + } else if (racer->boostTimer < normalise_time(35)) { + racer->boostType = BOOST_MEDIUM; } else { - racer->unk203 = 2; + racer->boostType = BOOST_LARGE; } - racer->boost_sound |= 1; + racer->boost_sound |= BOOST_RACE_START; D_8011D560 = 7; - D_8011D585 = racer->unk1D3; + gStartBoostTime = racer->boostTimer; } - if ((racer->playerIndex == PLAYER_COMPUTER) && (!racer->unk1CC || (racer->unk1CC == 1 && D_8011D585))) { - if (D_8011D585) { - racer->unk1D3 = D_8011D585; + // For the AI, expert AI will match the players start, and master AI will get a good start always. + if ((racer->playerIndex == PLAYER_COMPUTER) && (racer->aiSkill == AI_MASTER || (racer->aiSkill == AI_EXPERT && gStartBoostTime))) { + if (gStartBoostTime) { + racer->boostTimer = gStartBoostTime; } else { - racer->unk1D3 = func_8000C8B4(5); + racer->boostTimer = normalise_time(5); } - if (racer->unk1D3 < func_8000C8B4(20)) { - racer->unk203 = 0; - } else if (racer->unk1D3 < func_8000C8B4(35)) { - racer->unk203 = 1; + if (racer->boostTimer < normalise_time(20)) { + racer->boostType = BOOST_SMALL; + } else if (racer->boostTimer < normalise_time(35)) { + racer->boostType = BOOST_MEDIUM; } else { - racer->unk203 = 2; + racer->boostType = BOOST_LARGE; } } } - if (racer->unk1D3 && !D_8011D540 && sp28 && racer->raceStatus == STATUS_RACING) { + if (racer->boostTimer && !gRaceStartTimer && timer3 && racer->raceStatus == STATUS_RACING) { func_80072348(racer->playerIndex, 6); } - if ((D_8011D540 < 80) && gActivePlayerButtonPress & A_BUTTON) { - racer->unk1F4 = 1; + if ((gRaceStartTimer < 80) && gActivePlayerButtonPress & A_BUTTON) { + racer->startInput = 1; } - if (!D_8011D540) { - if (racer->boost_sound & 1) { - racer->boost_sound = racer->boost_sound & 0xFFFE; - func_800570B8(obj, 354, 8, 130); - func_80057048(obj, 33); + if (!gRaceStartTimer) { + if (racer->boost_sound & BOOST_RACE_START) { + racer->boost_sound &= ~BOOST_RACE_START; + func_800570B8(obj, SOUND_VOICE_CHARACTER_POSITIVE, 8, 130); + racer_play_sound(obj, SOUND_NITRO_BOOST); } } - if (racer->boost_sound & 2) { - racer->boost_sound = racer->boost_sound & 0xFFFD; + + if (racer->boost_sound & BOOST_UNK2) { + racer->boost_sound &= ~BOOST_UNK2; } bananas = racer->bananas; // Cheats only apply to human players. @@ -1783,22 +1802,27 @@ void func_800575EC(Object *obj, Object_Racer *racer) { GLOBAL_ASM("asm/non_matchings/racer/func_800576E0.s") -void func_800579B0(Object_Racer *racer, UNUSED s32 arg1, f32 updateRate) { - s32 temp, temp2; +/** + * Generate the steer velocity by taking the current steer velocity and getting the difference between the stick tilt. + * Get the velocity from a fraction of the difference. + */ +void handle_base_steering(Object_Racer *racer, UNUSED s32 arg1, f32 updateRate) { + s32 steering, turnVel; - temp = gCurrentStickX - racer->unk1E1; - temp2 = (temp * updateRate) * 0.125; + steering = gCurrentStickX - racer->steerAngle; + turnVel = (steering * updateRate) * 0.125; - if (temp != 0 && temp2 == 0) { - if (temp > 0) { - temp2 = 1; + if (steering != 0 && turnVel == 0) { + if (steering > 0) { + turnVel = 1; } - if (temp < 0) { - temp2 = -1; + if (steering < 0) { + turnVel = -1; } } - racer->unk1E1 += temp2; + racer->steerAngle += turnVel; + } void func_80057A40(Object *obj, Object_Racer *racer, f32 updateRate) { @@ -1816,13 +1840,13 @@ void func_80057A40(Object *obj, Object_Racer *racer, f32 updateRate) { } switch (gCameraObject->zoom) { case ZOOM_MEDIUM: - func_80001D04(104, 0); + play_sound_global(SOUND_MENU_BACK, 0); break; case ZOOM_FAR: - func_80001D04(105, 0); + play_sound_global(SOUND_MENU_BACK2, 0); break; default: - func_80001D04(106, 0); + play_sound_global(SOUND_UNK106, 0); break; } } @@ -1873,7 +1897,7 @@ void func_80057A40(Object *obj, Object_Racer *racer, f32 updateRate) { gCameraObject->trans.x_position += gCameraObject->x_velocity; gCameraObject->trans.y_position += gCameraObject->y_velocity + gCameraObject->unk30; gCameraObject->trans.z_position += gCameraObject->z_velocity; - if (!D_8011D540 && !D_8011D586) { + if (!gRaceStartTimer && !D_8011D586) { gCameraObject->x_velocity = gCameraObject->x_velocity * 0.95; gCameraObject->y_velocity = gCameraObject->y_velocity * 0.95; gCameraObject->z_velocity = gCameraObject->z_velocity * 0.95; @@ -1902,7 +1926,7 @@ void func_80057A40(Object *obj, Object_Racer *racer, f32 updateRate) { gCameraObject->unk3A -= delta; while (gCameraObject->unk3A < 0) { gCameraObject->unk3A += 5; - gCameraObject->unk30 = -gCameraObject->unk30 * 0.75; + gCameraObject->unk30 = -gCameraObject->unk30 * 0.75; } } @@ -1916,7 +1940,7 @@ void func_800580B4(Object *obj, Object_Racer *racer, s32 mode, f32 arg3) { zPos = gCameraObject->trans.z_position; gCameraObject->mode = mode; func_80057A40(obj, racer, arg3); - if (D_8011D540 == 0 && D_8011D582 == 0) { + if (gRaceStartTimer == 0 && D_8011D582 == 0) { gCameraObject->x_velocity = xPos - gCameraObject->trans.x_position; gCameraObject->y_velocity = yPos - (gCameraObject->trans.y_position + gCameraObject->unk30); gCameraObject->z_velocity = zPos - gCameraObject->trans.z_position; @@ -1925,7 +1949,7 @@ void func_800580B4(Object *obj, Object_Racer *racer, s32 mode, f32 arg3) { } } -#ifdef NON_EQUIVALENT +#ifdef NON_MATCHING void update_camera_car(f32 updateRate, Object *obj, Object_Racer *racer) { s64 pad; s32 segmentIndex; @@ -2042,14 +2066,14 @@ void update_camera_car(f32 updateRate, Object *obj, Object_Racer *racer) { } else { baseDistance += baseSpeed * 30.0f; } - if (D_8011D540 == 0) { - if (func_8000C8B4(0x24) < racer->unk1D3) { + if (gRaceStartTimer == 0) { + if (normalise_time(36) < racer->boostTimer) { baseDistance = -30.0f; - } else if (racer->unk1D3 > 0) { + } else if (racer->boostTimer > 0) { baseDistance = 180.0f; } } - if (D_8011D540 > 80) { + if (gRaceStartTimer > 80) { gCameraObject->unk1C = baseDistance; gCameraObject->unk20 = yVel; } @@ -2098,7 +2122,7 @@ void update_camera_car(f32 updateRate, Object *obj, Object_Racer *racer) { gCameraObject->trans.y_position -= temp_f16 + 2.0; } gCameraObject->trans.y_position -= temp_f16 * 0.25; - if (temp_f16 > 0.0f || D_8011D540) { + if (temp_f16 > 0.0f || gRaceStartTimer) { gCameraObject->trans.y_position = yOffset; } gCameraObject->trans.z_position = zOffset + (-sine_s(racer->unk196 + 0x4000) * racer->unkC8) + cosOffset; @@ -2120,7 +2144,7 @@ void update_camera_car(f32 updateRate, Object *obj, Object_Racer *racer) { lateralOffset = (yOffset = gCameraObject->trans.x_position); segmentIndex = get_level_segment_index_from_position(lateralOffset, gCameraObject->trans.y_position, gCameraObject->trans.z_position); if (segmentIndex != -1) { - gCameraObject->unk34 = segmentIndex; + gCameraObject->segmentIndex = segmentIndex; } racer->unk196 = gCameraObject->trans.y_rotation; } @@ -2134,7 +2158,7 @@ GLOBAL_ASM("asm/non_matchings/racer/update_camera_car.s") * Otherwise, it will follow a set path while rotating. */ void update_camera_finish_challenge(UNUSED f32 updateRate, Object *obj, Object_Racer *racer) { - s32 levelSeg; + s32 segmentIndex; f32 temp_f12; f32 zOffset; f32 xOffset; @@ -2155,9 +2179,9 @@ void update_camera_finish_challenge(UNUSED f32 updateRate, Object *obj, Object_R gCameraObject->trans.y_position = obj->segment.trans.y_position + 45.0f; } gCameraObject->trans.z_position = obj->segment.trans.z_position + zOffset; - levelSeg = get_level_segment_index_from_position(gCameraObject->trans.x_position, gCameraObject->trans.y_position, gCameraObject->trans.z_position); - if (levelSeg != -1) { - gCameraObject->unk34 = levelSeg; + segmentIndex = get_level_segment_index_from_position(gCameraObject->trans.x_position, gCameraObject->trans.y_position, gCameraObject->trans.z_position); + if (segmentIndex != SEGMENT_NONE) { + gCameraObject->segmentIndex = segmentIndex; } racer->unk196 = gCameraObject->trans.y_rotation; } @@ -2191,7 +2215,7 @@ void update_camera_finish_race(UNUSED f32 updateRate, Object *obj, Object_Racer gCameraObject->trans.y_rotation = (s16) (0x8000 - func_8007066C((s32) xDiff, (s32) zDiff)); gCameraObject->trans.x_rotation = func_8007066C((s32) yDiff, (s32) distance); gCameraObject->trans.z_rotation = 0; - gCameraObject->unk34 = get_level_segment_index_from_position(gCameraObject->trans.x_position, racer->oy1, gCameraObject->trans.z_position); + gCameraObject->segmentIndex = get_level_segment_index_from_position(gCameraObject->trans.x_position, racer->oy1, gCameraObject->trans.z_position); } /** @@ -2208,7 +2232,7 @@ void update_camera_fixed(f32 updateRate, struct Object *obj, struct Object_Racer gCameraObject->trans.y_rotation += ((((-func_8007066C((s32) xDiff, (s32) zDiff)) - gCameraObject->trans.y_rotation) + 0x8000) * delta) >> 4; gCameraObject->trans.z_rotation -= (((s32) (gCameraObject->trans.z_rotation * delta)) >> 4); - gCameraObject->unk34 = get_level_segment_index_from_position(gCameraObject->trans.x_position, + gCameraObject->segmentIndex = get_level_segment_index_from_position(gCameraObject->trans.x_position, racer->oy1, gCameraObject->trans.z_position); } diff --git a/src/racer.h b/src/racer.h index 0421c684..b30137d5 100644 --- a/src/racer.h +++ b/src/racer.h @@ -5,6 +5,8 @@ #include "structs.h" #include "level_object_entries.h" +#define SEGMENT_NONE -1 // If the level in question does not use segmentation. + typedef enum ActivePlayers { PLAYER_COMPUTER = -1, PLAYER_ONE, @@ -25,6 +27,31 @@ typedef enum CameraZoom { ZOOM_VERY_CLOSE } CameraZoom; +typedef enum BoostSound { + BOOST_NONE, + BOOST_RACE_START, + BOOST_UNK2 +} BoostSound; + +// boost types suffixed with _FAST are the ones you get from releasing the throttle. +typedef enum BoostType { + BOOST_SMALL, + BOOST_MEDIUM, + BOOST_LARGE, + BOOST_UNK3, + BOOST_SMALL_FAST, + BOOST_MEDIUM_FAST, + BOOST_LARGE_FAST, +} BoostType; + +typedef enum AISkill { + AI_MASTER, + AI_EXPERT, + AI_HARD, + AI_MEDIUM, + AI_EASY +} AISkill; + typedef struct ObjectCamera { /* 0x0014 */ ObjectTransform trans; /* 0x0018 */ f32 unk18; @@ -34,7 +61,7 @@ typedef struct ObjectCamera { /* 0x0028 */ f32 y_velocity; /* 0x002C */ f32 z_velocity; /* 0x0030 */ f32 unk30; - /* 0x0034 */ s16 unk34; + /* 0x0034 */ s16 segmentIndex; /* 0x0036 */ s16 mode; /* 0x0038 */ s16 unk38; /* 0x003A */ s8 unk3A; @@ -56,32 +83,11 @@ typedef struct unk8005234C { s16 unk16C; } unk8005234C; -// Also fairly certain this is NOT Object_Racer. -typedef struct Object_64_Unknown5 { - u8 pad0[0x88]; - u8 unk89; - u8 pad90[0xE9]; - s8 unk172; - s8 unk173; - s8 unk174; - u8 pad175[0x5E]; - s8 unk1D3; -} Object_64_Unknown5; - typedef struct TempStruct5 { s8 pad0[8]; s8 unk8[4][4]; } TempStruct5; -typedef struct Object_64_80053478 { - u8 unk0[0x2C]; - f32 unk2C; // Forward Velocity? - u8 unk30[0x1B1]; - s8 unk1E1; // Steering Value? - u8 unk1E2[4]; - s8 unk1E6; -} Object_64_80053478; - /* Unknown Size */ typedef struct unk800535C4 { s16 unk0; @@ -176,10 +182,10 @@ void handle_car_steering(Object_Racer *racer); void func_800535C4(unk800535C4 *arg0, unk800535C4_2 *arg1); void handle_car_velocity_control(Object_Racer *racer); void play_char_horn_sound(Object *obj, Object_Racer *racer); -void func_80057048(Object *obj, s32 arg1); +void racer_play_sound(Object *obj, s32 soundID); void func_800570A4(Object *obj, s32 arg1, s32 arg2); void func_800575EC(Object *obj, Object_Racer *racer); -void func_800579B0(Object_Racer *racer, s32 arg1, f32 updateRate); +void handle_base_steering(Object_Racer *racer, s32 arg1, f32 updateRate); void func_800580B4(Object *obj, Object_Racer *racer, s32 mode, f32 arg3); void get_timestamp_from_frames(s32 frameCount, s32 *minutes, s32 *seconds, s32 *hundredths); void func_800598D0(void); @@ -198,11 +204,11 @@ void antipiracy_modify_surface_traction_table(void); s32 func_80052388(Object *obj1, Object_Racer *racer, Object *obj2, f32 distance); void func_80055A84(Object *obj, Object_Racer *racer, s32 arg2); void func_8005C270(Object_Racer *racer); -f32 func_80057220(Object *obj, Object_Racer *racer); -void func_800570B8(Object *obj, s32 arg1, s32 arg2, s32 arg3); +f32 handle_racer_top_speed(Object *obj, Object_Racer *racer); +void func_800570B8(Object *obj, s32 soundID, s32 range, s32 arg3); void apply_vehicle_rotation_offset(Object_Racer *obj, s32 max, s16 yRotation, s16 xRotation, s16 zRotation); void func_80059080(Object *obj, Object_Racer *racer, f32 *velX, f32 *velY, f32 *velZ); -void func_80054110(Object *obj, Object_Racer *racer, s32 updateRate, f32 arg3); +void func_80054110(Object *obj, Object_Racer *racer, s32 updateRate, f32 updateRateF); void update_camera_hovercraft(f32 updateRate, Object *obj, Object_Racer *racer); void update_camera_plane(f32 updateRate, Object *obj, Object_Racer *racer); void update_camera_loop(f32 updateRate, Object *obj, Object_Racer *racer); @@ -214,7 +220,7 @@ void func_800521C4(Object *obj, Object_Racer *racer, s32 arg2); void func_80050754(Object *obj, Object_Racer *racer, f32 divisor); void obj_init_racer(Object *obj, LevelObjectEntry_CharacterFlag *racer); void func_80044170(Object *obj, Object_Racer *racer, s32 updateRate); -void func_80043ECC(s32 arg0, Object_64_Unknown5 *arg1, s32 updateRate); +void func_80043ECC(s32 arg0, Object_Racer *racer, s32 updateRate); void func_80055A84(Object *obj, Object_Racer *racer, s32 updateRate); void func_80057A40(Object *obj, Object_Racer *racer, f32 updateRate); diff --git a/src/unknown_05CEF0.c b/src/unknown_05CEF0.c index 60e13a14..07ebd9c7 100644 --- a/src/unknown_05CEF0.c +++ b/src/unknown_05CEF0.c @@ -65,7 +65,7 @@ void func_8005CB04(s32 arg0) { phi_v1 = 0; } arg0 += phi_v1; - func_80001D04(D_8011D5C8[arg0], 0); + play_sound_global(D_8011D5C8[arg0], 0); } GLOBAL_ASM("asm/non_matchings/unknown_05CEF0/func_8005CB68.s") diff --git a/src/weather.c b/src/weather.c index b3b49634..e1e99754 100644 --- a/src/weather.c +++ b/src/weather.c @@ -472,7 +472,7 @@ void func_800ADAB8(s32 arg0) { if (D_800E2C6C >= 32769 && func_800C018C() == 0) { func_800C01D8(&D_800E2C98); } - func_80001D04(39, 0); + play_sound_global(SOUND_LIGHTNING, 0); D_800E2C80 = 0; } } else if (D_800E2C60 >= 48000) { @@ -480,7 +480,7 @@ void func_800ADAB8(s32 arg0) { D_800E2C7C -= arg0; return; } - func_80001D04(575, 0); + play_sound_global(SOUND_UNK575, 0); D_800E2C80 = 600 - ((s32) (D_800E2C60 + -48000) >> 5); D_800E2C7C = get_random_number_from_range(900, 1140) - ((s32) (D_800E2C60 + -48000) >> 5); }