From e7e2da86a8cd96145b34a7717db1f36e4528ebb2 Mon Sep 17 00:00:00 2001 From: engineer124 <47598039+engineer124@users.noreply.github.com> Date: Mon, 20 Jun 2022 21:32:17 -0400 Subject: [PATCH] Remove OoB SfxIds (#1291) --- include/sfx.h | 144 -------------------- src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c | 4 +- 2 files changed, 2 insertions(+), 146 deletions(-) diff --git a/include/sfx.h b/include/sfx.h index 5ddda84dc7..9742b2903d 100644 --- a/include/sfx.h +++ b/include/sfx.h @@ -229,24 +229,6 @@ #define NA_SE_PL_DUMMY_221 0x8DD #define NA_SE_PL_SLIP_HEAVYBOOTS_LEVEL 0x8DE #define NA_SE_PL_SLIP_ICE_LEVEL 0x8DF -// TODO: The sfx below in this bank are not in gSoundParams and read OoB. May be fake Ids from OoT3D -#define NA_SE_PL_JUMP_METAL 0x8E0 -#define NA_SE_PL_LAND_METAL 0x8E1 -#define NA_SE_PL_WALK_RUNNINGMAN 0x8E2 -#define NA_SE_PL_WALK_ZELDA_DEMO 0x8E3 -#define NA_SE_PL_YOBI_DATA02 0x8E4 -#define NA_SE_PL_YOBI_DATA03 0x8E5 -#define NA_SE_PL_YOBI_DATA04 0x8E6 -#define NA_SE_PL_YOBI_DATA05 0x8E7 -#define NA_SE_PL_YOBI_DATA06 0x8E8 -#define NA_SE_PL_YOBI_DATA07 0x8E9 -#define NA_SE_PL_YOBI_DATA08 0x8EA -#define NA_SE_PL_YOBI_DATA09 0x8EB -#define NA_SE_PL_YOBI_DATA10 0x8EC -#define NA_SE_PL_YOBI_DATA11 0x8ED -#define NA_SE_PL_YOBI_DATA12 0x8EE -#define NA_SE_PL_YOBI_DATA13 0x8EF -#define NA_SE_PL_YOBI_DATA14 0x8F0 // ------------ ITEM ------------ @@ -330,28 +312,6 @@ #define NA_SE_IT_HAND_CLAP 0x184D #define NA_SE_IT_MASTER_SWORD_SWING 0x184E #define NA_SE_IT_DUMMY5 0x184F -// TODO: The sfx below in this bank are not in gSoundParams and read OoB. May be fake Ids from OoT3D -#define NA_SE_IT_YOBI19 0x1850 -#define NA_SE_FISHING_REEL_SLOW2 0x1851 // not IT? -#define NA_SE_IT_SPIDERNET_HIT1 0x1852 -#define NA_SE_IT_LURE_LAND1 0x1853 -#define NA_SE_IT_HOOKSHOT_STICK_OBJ_WATER 0x1854 -#define NA_SE_IT_SWORD_PICKOUT_GANON 0x1855 -#define NA_SE_IT_BOMB_IGNIT_DODO_M 0x1856 -#define NA_SE_IT_YOBI05 0x1857 -#define NA_SE_IT_YOBI06 0x1858 -#define NA_SE_IT_YOBI07 0x1859 -#define NA_SE_IT_YOBI08 0x185A -#define NA_SE_IT_YOBI09 0x185B -#define NA_SE_IT_YOBI10 0x185C -#define NA_SE_IT_YOBI11 0x185D -#define NA_SE_IT_YOBI12 0x185E -#define NA_SE_IT_YOBI13 0x185F -#define NA_SE_IT_YOBI14 0x1860 -#define NA_SE_IT_YOBI15 0x1861 -#define NA_SE_IT_YOBI16 0x1862 -#define NA_SE_IT_YOBI17 0x1863 -#define NA_SE_IT_YOBI18 0x1864 // ------------ ENVIRONMENT ------------ @@ -603,40 +563,6 @@ #define NA_SE_EV_OCARINA_BMELO_0 0x28F5 #define NA_SE_EV_OCARINA_BMELO_1 0x28F6 #define NA_SE_EV_EXPLOSION_FOR_RENZOKU 0x28F7 -// TODO: The sfx below in this bank are not in gSoundParams and read OoB. May be fake Ids from OoT3D -#define NA_SE_EV_ELEVATOR_MOVE_KABE1 0x28F8 -#define NA_SE_EV_RIVER_STREAM_F_IDO 0x28F9 -#define NA_SE_EV_GUILLOTINE_BOUND_copyOrigin 0x28FA -#define NA_SE_EV_HEALING_TOU 0x28FB -#define NA_SE_EV_RUMUBLE_KEMURI 0x28FC -#define NA_SE_EV_GANON_HADOU 0x28FD -#define NA_SE_EV_KANOKE_OPEN 0x28FE -#define NA_SE_EV_KANOKE_CLOSE 0x28FF -#define NA_SE_EV_SEEK_CLOTH1 0x2900 -#define NA_SE_EV_SEEK_CLOTH2 0x2901 -#define NA_SE_EV_BOTTLE_CAP_CLOSE 0x2902 -#define NA_SE_EV_ELEVATOR_MOVE_KABE2 0x2903 -#define NA_SE_EV_WATER_LEVEL_DOWN_STOP 0x2904 -#define NA_SE_EV_DAIKU_CLOTH1 0x2905 -#define NA_SE_EV_DEMO_EPONA_LAND 0x2906 -#define NA_SE_EV_DIVE_INTO_WATER_BLOCK 0x2907 -#define NA_SE_EV_TORCH2 0x2908 -#define NA_SE_EV_TORCH3 0x2909 -#define NA_SE_EV_TORCH4 0x290A -#define NA_SE_EV_TORCH5 0x290B -#define NA_SE_EV_EARTHQUAKE_LAST 0x290C -#define NA_SE_EV_YAMI_TRAP_CHAIN 0x290D -#define NA_SE_EV_FLAME_IGNITION_GANON 0x290E -#define NA_SE_EV_MGANON_DOWN2 0x290F -#define NA_SE_EV_EXPLOSION_HOUKAI 0x2910 -#define NA_SE_EV_BLOCKSINK_GANON 0x2911 -#define NA_SE_EV_DOG_WALK 0x2912 -#define NA_SE_EV_GANON_HOUKAI_KEMURI1 0x2913 -#define NA_SE_EV_YOBI21 0x2914 -#define NA_SE_EV_YOBI22 0x2915 -#define NA_SE_EV_YOBI23 0x2916 -#define NA_SE_EV_YOBI24 0x2917 -#define NA_SE_EV_YOBI25 0x2918 // ------------ ENEMY ------------ @@ -1139,41 +1065,6 @@ #define NA_SE_EN_MUSI_WALK 0x39F0 #define NA_SE_EN_MIMICK_BREATH 0x39F1 #define NA_SE_EN_STALWALL_LAUGH 0x39F2 -// TODO: The sfx below in this bank are not in gSoundParams and read OoB. May be fake Ids from OoT3D -#define NA_SE_EN_TWINROBA_TRANSFORM2 0x39F3 -#define NA_SE_EN_KAICHO_PIYORI 0x39F4 -#define NA_SE_EN_DODO_K_WALK_APPEAR 0x39F5 -#define NA_SE_EN_DODO_K_STOP 0x39F6 -#define NA_SE_EN_TEKU_GND993 0x39F7 -#define NA_SE_EN_TEKU_JUMP993 0x39F8 -#define NA_SE_EN_MORIBLIN_DEMO 0x39F9 -#define NA_SE_EN_LEADED_WHITE 0x39FA -#define NA_SE_EN_RIVA_HIDE_NEW 0x39FB -#define NA_SE_EN_STALBABY_HIDE_NEW 0x39FC -#define NA_SE_EN_STAL_REBORN 0x39FD -#define NA_SE_EN_DAIKU_FOOT 0x39FE -#define NA_SE_EN_STALKID_DAMAGE_NEW 0x39FF -#define NA_SE_EN_STALKID_DOWN_NEW 0x3A00 -#define NA_SE_EN_BALINADE_ARM_LAND 0x3A01 -#define NA_SE_EN_BALINADE_ARM_DEAD 0x3A02 -#define NA_SE_EN_READED_WALK 0x3A03 -#define NA_SE_EN_YOBI14 0x3A04 -#define NA_SE_EN_YOBI15 0x3A05 -#define NA_SE_EN_YOBI16 0x3A06 -#define NA_SE_EN_YOBI17 0x3A07 -#define NA_SE_EN_YOBI18 0x3A08 -#define NA_SE_EN_YOBI19 0x3A09 -#define NA_SE_EN_YOBI20 0x3A0A -#define NA_SE_EN_YOBI21 0x3A0B -#define NA_SE_EN_YOBI22 0x3A0C -#define NA_SE_EN_YOBI23 0x3A0D -#define NA_SE_EN_YOBI24 0x3A0E -#define NA_SE_EN_YOBI25 0x3A0F -#define NA_SE_EN_YOBI26 0x3A10 -#define NA_SE_EN_YOBI27 0x3A11 -#define NA_SE_EN_YOBI28 0x3A12 -#define NA_SE_EN_YOBI29 0x3A13 -#define NA_SE_EN_YOBI30 0x3A14 // ------------ SYSTEM ------------ @@ -1249,26 +1140,6 @@ #define NA_SE_SY_CARROT_RECOVER 0x4845 #define NA_SE_EV_FAIVE_LUPY_COUNT 0x4846 // EV sound inside SY? #define NA_SE_SY_DUMMY_71 0x4847 -// TODO: The sfx below in this bank are not in gSoundParams and read OoB. May be fake Ids from OoT3D -#define NA_SE_SY_KANADE_ISHI 0x4848 -#define NA_SE_SY_NA_HELLO_2 0x4849 -#define NA_SE_SY_MAGIC_SOUL_NORMAL 0x484A -#define NA_SE_SY_MAGIC_SOUL_FLASH 0x484B -#define NA_SE_SY_CANCEL_CHALLENGE 0x484C -#define NA_SE_SY_DECIDE_CHALLENGE 0x484D -#define NA_SE_SY_YOBI05 0x484E -#define NA_SE_SY_YOBI06 0x484F -#define NA_SE_SY_YOBI07 0x4850 -#define NA_SE_SY_YOBI08 0x4851 -#define NA_SE_SY_YOBI09 0x4852 -#define NA_SE_SY_YOBI10 0x4853 -#define NA_SE_SY_YOBI11 0x4854 -#define NA_SE_SY_YOBI12 0x4855 -#define NA_SE_SY_YOBI13 0x4856 -#define NA_SE_SY_YOBI14 0x4857 -#define NA_SE_SY_YOBI15 0x4858 -#define NA_SE_SY_YOBI16 0x4859 -#define NA_SE_SY_YOBI17 0x485A // ------------ OCARINA ------------ @@ -1280,10 +1151,6 @@ #define NA_SE_OC_SECRET_HOLE_OUT 0x5805 #define NA_SE_OC_REVENGE 0x5806 #define NA_SE_OC_HINT_MOVIE 0x5807 -// TODO: The sfx below in this bank are not in gSoundParams and read OoB. May be fake Ids from OoT3D -#define NA_SE_OC_HINT_MOVIE2_WHITE 0x5808 -#define NA_SE_OC_HINT_MOVIE_ZOOMIN 0x5809 -#define NA_SE_OC_HIBIKI_ISHI 0x580A // ------------ VOICE ------------ @@ -1415,16 +1282,5 @@ #define NA_SE_VO_DUMMY_0x7d 0x687D #define NA_SE_VO_DUMMY_0x7e 0x687E #define NA_SE_VO_DUMMY_0x7f 0x687F -// TODO: The sfx below in this bank are not in gSoundParams and read OoB. May be fake Ids from OoT3D -#define NA_SE_VO_DUMMY_0x80 0x6880 -#define NA_SE_VO_LI_AUTO_JUMP_DARKLINK 0x6881 -#define NA_SE_VO_DUMMY_0x82_YOBI 0x6882 -#define NA_SE_VO_DUMMY_0x83_YOBI 0x6883 -#define NA_SE_VO_DUMMY_0x84_YOBI 0x6884 -#define NA_SE_VO_DUMMY_0x85_YOBI 0x6885 -#define NA_SE_VO_DUMMY_0x86_YOBI 0x6886 -#define NA_SE_VO_DUMMY_0x87_YOBI 0x6887 -#define NA_SE_VO_DUMMY_0x88_YOBI 0x6888 -#define NA_SE_VO_DUMMY_0x89_YOBI 0x6889 #endif diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c index c5fd72bfa0..ec476e2d03 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c @@ -3211,8 +3211,8 @@ void BossMo_Unknown(void) { NA_SE_IT_MAGIC_ARROW_SHOT, NA_SE_IT_EXPLOSION_FRAME, NA_SE_IT_EXPLOSION_ICE, - NA_SE_IT_YOBI19 - SFX_FLAG, - NA_SE_FISHING_REEL_SLOW2 - SFX_FLAG, + 0x1850 - SFX_FLAG, // Invalid sfxId, OoB read + 0x1851 - SFX_FLAG, // Invalid sfxId, OoB read NA_SE_OC_DOOR_OPEN, NA_SE_EV_DOOR_CLOSE, NA_SE_EV_EXPLOSION,