From 312f369acb4f5f8ed974ab3acdec358cb65dc12a Mon Sep 17 00:00:00 2001 From: Fazana <52551480+FazanaJ@users.noreply.github.com> Date: Sun, 22 May 2022 12:46:49 +0100 Subject: [PATCH] rename play_sound_global man this PR is gonna suck lmao but it'll be worth it I promise --- .../{func_80001D04.s => play_sound_global.s} | 2 +- asm/non_matchings/game_ui/func_800A01A0.s | 12 +- asm/non_matchings/game_ui/func_800A0BD4.s | 4 +- asm/non_matchings/game_ui/func_800A277C.s | 6 +- asm/non_matchings/game_ui/func_800A3CE4.s | 6 +- asm/non_matchings/game_ui/func_800A47A0.s | 2 +- asm/non_matchings/game_ui/func_800A497C.s | 6 +- asm/non_matchings/game_ui/func_800A4F50.s | 12 +- asm/non_matchings/game_ui/func_800A5A64.s | 8 +- asm/non_matchings/game_ui/func_800A6254.s | 10 +- asm/non_matchings/game_ui/func_800A6E30.s | 4 +- asm/non_matchings/game_ui/func_800A718C.s | 4 +- asm/non_matchings/game_ui/func_800A7B68.s | 2 +- asm/non_matchings/menu/func_80081F4C.s | 4 +- asm/non_matchings/menu/func_80087734.s | 8 +- asm/non_matchings/menu/func_800890AC.s | 8 +- asm/non_matchings/menu/func_8008B358.s | 2 +- asm/non_matchings/menu/func_8008B4C8.s | 4 +- asm/non_matchings/menu/func_8008B758.s | 4 +- asm/non_matchings/menu/func_8008D5F8.s | 10 +- asm/non_matchings/menu/func_8008D8BC.s | 20 +-- asm/non_matchings/menu/func_80090918.s | 6 +- asm/non_matchings/menu/func_80092188.s | 14 +- asm/non_matchings/menu/func_80094170.s | 10 +- asm/non_matchings/menu/func_80095728.s | 6 +- asm/non_matchings/menu/func_80097D10.s | 14 +- asm/non_matchings/menu/func_800998E0.s | 2 +- .../menu/menu_audio_options_loop.s | 8 +- .../menu/menu_file_select_loop.s | 2 +- .../menu/menu_magic_codes_list_loop.s | 6 +- .../menu/menu_magic_codes_loop.s | 8 +- asm/non_matchings/menu/menu_options_loop.s | 12 +- asm/non_matchings/menu/menu_results_loop.s | 8 +- .../menu/menu_title_screen_loop.s | 12 +- .../menu/menu_trophy_race_rankings_loop.s | 4 +- asm/non_matchings/menu/tt_menu_loop.s | 10 +- asm/non_matchings/objects/func_80016500.s | 2 +- asm/non_matchings/objects/func_80019808.s | 2 +- asm/non_matchings/objects/func_8001B3C4.s | 4 +- asm/non_matchings/objects/func_8001F460.s | 2 +- asm/non_matchings/racer/func_80046524.s | 2 +- asm/non_matchings/racer/func_80049794.s | 2 +- asm/non_matchings/racer/func_80050A28.s | 2 +- asm/non_matchings/racer/func_80054FD0.s | 2 +- asm/non_matchings/racer/func_80056E2C.s | 2 +- .../unknown_005740/func_800063EC.s | 2 +- .../obj_loop_fireball_octoweapon.s | 2 +- .../unknown_032760/obj_loop_flycoin.s | 2 +- .../unknown_032760/obj_loop_parkwarden.s | 8 +- .../unknown_032760/obj_loop_trophycab.s | 2 +- .../unknown_032760/obj_loop_weaponballoon.s | 4 +- .../unknown_05CEF0/func_8005C364.s | 2 +- .../unknown_05DCD0/func_8005D0D0.s | 2 +- .../unknown_05DCD0/func_8005D820.s | 2 +- .../unknown_05F0C0/func_8005E4C0.s | 2 +- .../unknown_05F690/func_8005EA90.s | 2 +- .../unknown_05FF10/func_8005F310.s | 2 +- src/audio.c | 6 +- src/audio.h | 2 +- src/game_ui.c | 4 +- src/menu.c | 158 +++++++++--------- src/object_functions.c | 18 +- src/racer.c | 6 +- src/unknown_05CEF0.c | 2 +- src/weather.c | 4 +- 65 files changed, 256 insertions(+), 256 deletions(-) rename asm/non_matchings/audio/{func_80001D04.s => play_sound_global.s} (99%) 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_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 a9bc0ffc..5d6dc77d 100644 --- a/asm/non_matchings/game_ui/func_800A277C.s +++ b/asm/non_matchings/game_ui/func_800A277C.s @@ -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 4a33ccf7..b51da2aa 100644 --- a/asm/non_matchings/game_ui/func_800A7B68.s +++ b/asm/non_matchings/game_ui/func_800A7B68.s @@ -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/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_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_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_8001F460.s b/asm/non_matchings/objects/func_8001F460.s index d237668e..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) diff --git a/asm/non_matchings/racer/func_80046524.s b/asm/non_matchings/racer/func_80046524.s index e710dccb..29a1566c 100644 --- a/asm/non_matchings/racer/func_80046524.s +++ b/asm/non_matchings/racer/func_80046524.s @@ -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) diff --git a/asm/non_matchings/racer/func_80049794.s b/asm/non_matchings/racer/func_80049794.s index 6a6988d9..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 diff --git a/asm/non_matchings/racer/func_80050A28.s b/asm/non_matchings/racer/func_80050A28.s index 592f8044..cf06caa1 100644 --- a/asm/non_matchings/racer/func_80050A28.s +++ b/asm/non_matchings/racer/func_80050A28.s @@ -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) diff --git a/asm/non_matchings/racer/func_80054FD0.s b/asm/non_matchings/racer/func_80054FD0.s index ed3afd92..b06860f8 100644 --- a/asm/non_matchings/racer/func_80054FD0.s +++ b/asm/non_matchings/racer/func_80054FD0.s @@ -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_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/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/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_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_trophycab.s b/asm/non_matchings/unknown_032760/obj_loop_trophycab.s index 935f4b36..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 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/src/audio.c b/src/audio.c index ddf5a84d..4c73fbb0 100644 --- a/src/audio.c +++ b/src/audio.c @@ -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) { @@ -675,14 +675,14 @@ 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 play_sound_spatial(u16 soundID, f32 x, f32 y, f32 z, s32 **arg4) { if (arg4 == NULL) { arg4 = &D_80115F84; } - func_80001D04(soundID, arg4); + play_sound_global(soundID, arg4); if (*arg4 != NULL) { func_80009B7C(*arg4, x, y, z); diff --git a/src/audio.h b/src/audio.h index 97c149fb..80926b4b 100644 --- a/src/audio.h +++ b/src/audio.h @@ -129,7 +129,7 @@ void func_80002570(ALSeqPlayer *seqp); void func_80002608(u8 arg0); u8 func_80002630(void); -void func_80001D04(u16 soundID, 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_ui.c b/src/game_ui.c index b73e1c0c..7d4466f7 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(0x145, &D_80126D40); } else { - func_80001D04(0x102, &D_80126D40); + play_sound_global(0x102, &D_80126D40); } } } diff --git a/src/menu.c b/src/menu.c index 7b217047..69315fce 100644 --- a/src/menu.c +++ b/src/menu.c @@ -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); } } @@ -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); } } @@ -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) { @@ -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; } @@ -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(); @@ -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); } @@ -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); } } } @@ -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); } } @@ -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 (normalise_time(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 (normalise_time(0x12C) < D_801263D8) { - set_music_player_voice_limit(0x18); + if (normalise_time(300) < D_801263D8) { + set_music_player_voice_limit(24); play_music(SEQUENCE_MAIN_MENU); - set_music_fade_timer(0x100); + set_music_fade_timer(256); } break; } - if (normalise_time(0x12C) < D_801263D8) { + if (normalise_time(300) < D_801263D8) { D_801263D8 = -1; } } @@ -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; } @@ -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 16471ed2..4d676e94 100644 --- a/src/object_functions.c +++ b/src/object_functions.c @@ -213,7 +213,7 @@ 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 play_sound_global(u16, s32 *); void func_8000488C(s32); void func_800AFC3C(Object *, s32); void gParticlePtrList_addObject(Object *); @@ -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(586, &obj64->unk1C); } } } @@ -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); @@ -621,7 +621,7 @@ void obj_loop_trophycab(Object *obj, s32 speed) { // A hit has been detected at this point. if (isTrophyRaceAvaliable) { obj->unk78 = 1; - func_80001D04(303, 0); + play_sound_global(303, 0); func_800A3870(); } else @@ -983,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); } } @@ -1468,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(0x30, 0); func_80000FDC(0x12A, 0, 1.0f); } } @@ -1620,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); } } diff --git a/src/racer.c b/src/racer.c index db409338..dd83d1f7 100644 --- a/src/racer.c +++ b/src/racer.c @@ -1840,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; } } 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..8a47c3e2 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(39, 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(575, 0); D_800E2C80 = 600 - ((s32) (D_800E2C60 + -48000) >> 5); D_800E2C7C = get_random_number_from_range(900, 1140) - ((s32) (D_800E2C60 + -48000) >> 5); }