diff --git a/src/audio/music/boosterpack.asm b/src/audio/music/boosterpack.asm index 29c3db2..e227e2f 100644 --- a/src/audio/music/boosterpack.asm +++ b/src/audio/music/boosterpack.asm @@ -1,4 +1,4 @@ -Music_BoosterPack_Ch1: ; f7d60 (3d:7d60) +Music_BoosterPack_Ch1: stereo_panning 1, 1 vibrato_type 1 vibrato_delay 20 @@ -43,7 +43,7 @@ Music_BoosterPack_Ch1: ; f7d60 (3d:7d60) music_end -Music_BoosterPack_Ch2: ; f7d9e (3d:7d9e) +Music_BoosterPack_Ch2: stereo_panning 1, 1 vibrato_type 1 vibrato_delay 20 @@ -87,7 +87,7 @@ Music_BoosterPack_Ch2: ; f7d9e (3d:7d9e) music_end -Music_BoosterPack_Ch3: ; f7ddb (3d:7ddb) +Music_BoosterPack_Ch3: stereo_panning 1, 1 wave 1 volume 32 diff --git a/src/audio/music/cardpop.asm b/src/audio/music/cardpop.asm index 04aceb5..041aab1 100644 --- a/src/audio/music/cardpop.asm +++ b/src/audio/music/cardpop.asm @@ -1,4 +1,4 @@ -Music_CardPop_Ch1: ; f703a (3d:703a) +Music_CardPop_Ch1: speed 4 stereo_panning 1, 1 cutoff 8 @@ -119,7 +119,7 @@ Music_CardPop_Ch1: ; f703a (3d:703a) EndMainLoop -Music_CardPop_Ch2: ; f70df (3d:70df) +Music_CardPop_Ch2: speed 4 stereo_panning 1, 1 cutoff 8 @@ -205,7 +205,7 @@ Music_CardPop_Ch2: ; f70df (3d:70df) EndMainLoop -Music_CardPop_Ch3: ; f713a (3d:713a) +Music_CardPop_Ch3: speed 4 wave 1 stereo_panning 1, 1 @@ -265,7 +265,7 @@ Branch_f716c: music_ret -Music_CardPop_Ch4: ; f717d (3d:717d) +Music_CardPop_Ch4: speed 4 octave 1 Loop 11 diff --git a/src/audio/music/challengehall.asm b/src/audio/music/challengehall.asm index 65f0102..91ebca3 100644 --- a/src/audio/music/challengehall.asm +++ b/src/audio/music/challengehall.asm @@ -1,4 +1,4 @@ -Music_ChallengeHall_Ch1: ; f9646 (3e:5646) +Music_ChallengeHall_Ch1: stereo_panning 1, 1 vibrato_type 8 vibrato_delay 15 @@ -400,7 +400,7 @@ Branch_f9848: music_ret -Music_ChallengeHall_Ch2: ; f9883 (3e:5883) +Music_ChallengeHall_Ch2: stereo_panning 1, 1 vibrato_type 8 vibrato_delay 15 @@ -771,7 +771,7 @@ Branch_f9a28: music_ret -Music_ChallengeHall_Ch3: ; f9a92 (3e:5a92) +Music_ChallengeHall_Ch3: stereo_panning 1, 1 volume 32 wave 1 @@ -1030,7 +1030,7 @@ Branch_f9b92: music_ret -Music_ChallengeHall_Ch4: ; f9ba9 (3e:5ba9) +Music_ChallengeHall_Ch4: speed 1 speed 10 Loop 2 diff --git a/src/audio/music/club1.asm b/src/audio/music/club1.asm index 679dea8..8ca0030 100644 --- a/src/audio/music/club1.asm +++ b/src/audio/music/club1.asm @@ -1,4 +1,4 @@ -Music_Club1_Ch1: ; f9be5 (3e:5be5) +Music_Club1_Ch1: speed 5 stereo_panning 1, 1 vibrato_type 8 @@ -289,7 +289,7 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) EndMainLoop -Music_Club1_Ch2: ; f9d5f (3e:5d5f) +Music_Club1_Ch2: speed 5 stereo_panning 1, 1 vibrato_type 8 @@ -571,7 +571,7 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) EndMainLoop -Music_Club1_Ch3: ; f9ec4 (3e:5ec4) +Music_Club1_Ch3: speed 5 stereo_panning 1, 1 volume 32 @@ -870,7 +870,7 @@ Branch_fa01a: music_ret -Music_Club1_Ch4: ; fa044 (3e:6044) +Music_Club1_Ch4: speed 5 octave 1 bass 2 diff --git a/src/audio/music/club2.asm b/src/audio/music/club2.asm index 6b1f7f7..2d3cd81 100644 --- a/src/audio/music/club2.asm +++ b/src/audio/music/club2.asm @@ -1,4 +1,4 @@ -Music_Club2_Ch1: ; fa077 (3e:6077) +Music_Club2_Ch1: speed 6 duty 2 stereo_panning 1, 1 @@ -92,7 +92,7 @@ Music_Club2_Ch1: ; fa077 (3e:6077) EndMainLoop -Music_Club2_Ch2: ; fa0e3 (3e:60e3) +Music_Club2_Ch2: speed 6 duty 2 stereo_panning 1, 1 @@ -206,7 +206,7 @@ Music_Club2_Ch2: ; fa0e3 (3e:60e3) EndMainLoop -Music_Club2_Ch3: ; fa164 (3e:6164) +Music_Club2_Ch3: speed 6 volume 32 stereo_panning 1, 1 diff --git a/src/audio/music/club3.asm b/src/audio/music/club3.asm index a048323..1adbea6 100644 --- a/src/audio/music/club3.asm +++ b/src/audio/music/club3.asm @@ -1,4 +1,4 @@ -Music_Club3_Ch1: ; fa210 (3e:6210) +Music_Club3_Ch1: speed 9 stereo_panning 1, 1 vibrato_type 5 @@ -432,7 +432,7 @@ Branch_fa403: music_ret -Music_Club3_Ch2: ; fa423 (3e:6423) +Music_Club3_Ch2: speed 9 stereo_panning 1, 1 vibrato_type 5 @@ -798,7 +798,7 @@ Branch_fa5a6: music_ret -Music_Club3_Ch3: ; fa63e (3e:663e) +Music_Club3_Ch3: speed 9 stereo_panning 1, 1 volume 32 @@ -1062,7 +1062,7 @@ Music_Club3_Ch3: ; fa63e (3e:663e) EndMainLoop -Music_Club3_Ch4: ; fa772 (3e:6772) +Music_Club3_Ch4: speed 9 octave 1 MainLoop diff --git a/src/audio/music/credits.asm b/src/audio/music/credits.asm index 567a44a..5e8b278 100644 --- a/src/audio/music/credits.asm +++ b/src/audio/music/credits.asm @@ -1,4 +1,4 @@ -Music_Credits_Ch1: ; fb1fe (3e:71fe) +Music_Credits_Ch1: speed 13 stereo_panning 1, 1 vibrato_type 1 @@ -849,7 +849,7 @@ Branch_fb651: music_ret -Music_Credits_Ch2: ; fb68a (3e:768a) +Music_Credits_Ch2: stereo_panning 1, 1 vibrato_type 1 vibrato_delay 20 @@ -1790,7 +1790,7 @@ Branch_fbb10: music_ret -Music_Credits_Ch3: ; fbb9d (3e:7b9d) +Music_Credits_Ch3: speed 1 stereo_panning 1, 1 volume 32 @@ -2301,7 +2301,7 @@ Branch_fbe3d: music_ret -Music_Credits_Ch4: ; fbe51 (3e:7e51) +Music_Credits_Ch4: speed 1 octave 1 Loop 8 diff --git a/src/audio/music/deckmachine.asm b/src/audio/music/deckmachine.asm index d28439a..f7cb1ce 100644 --- a/src/audio/music/deckmachine.asm +++ b/src/audio/music/deckmachine.asm @@ -1,4 +1,4 @@ -Music_DeckMachine_Ch1: ; f6ef1 (3d:6ef1) +Music_DeckMachine_Ch1: stereo_panning 1, 1 cutoff 8 duty 3 @@ -53,7 +53,7 @@ Music_DeckMachine_Ch1: ; f6ef1 (3d:6ef1) EndMainLoop -Music_DeckMachine_Ch2: ; f6f41 (3d:6f41) +Music_DeckMachine_Ch2: stereo_panning 1, 1 cutoff 8 duty 1 @@ -97,7 +97,7 @@ Music_DeckMachine_Ch2: ; f6f41 (3d:6f41) EndMainLoop -Music_DeckMachine_Ch3: ; f6f7b (3d:6f7b) +Music_DeckMachine_Ch3: stereo_panning 1, 1 volume 32 wave 1 @@ -224,7 +224,7 @@ Music_DeckMachine_Ch3: ; f6f7b (3d:6f7b) EndMainLoop -Music_DeckMachine_Ch4: ; f7018 (3d:7018) +Music_DeckMachine_Ch4: speed 1 octave 1 MainLoop diff --git a/src/audio/music/dueltheme1.asm b/src/audio/music/dueltheme1.asm index 8d432f4..75705b6 100644 --- a/src/audio/music/dueltheme1.asm +++ b/src/audio/music/dueltheme1.asm @@ -1,4 +1,4 @@ -Music_DuelTheme1_Ch1: ; f532a (3d:532a) +Music_DuelTheme1_Ch1: speed 7 stereo_panning 1, 1 vibrato_type 8 @@ -509,7 +509,7 @@ Branch_f5580: music_ret -Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) +Music_DuelTheme1_Ch2: speed 7 stereo_panning 1, 1 vibrato_type 8 @@ -1319,7 +1319,7 @@ Branch_f5a17: music_ret -Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) +Music_DuelTheme1_Ch3: speed 7 stereo_panning 1, 1 volume 32 @@ -1832,7 +1832,7 @@ Branch_f5c7e: music_ret -Music_DuelTheme1_Ch4: ; f5c9a (3d:5c9a) +Music_DuelTheme1_Ch4: speed 7 octave 1 MainLoop diff --git a/src/audio/music/dueltheme2.asm b/src/audio/music/dueltheme2.asm index c8b1eab..5642eac 100644 --- a/src/audio/music/dueltheme2.asm +++ b/src/audio/music/dueltheme2.asm @@ -1,4 +1,4 @@ -Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) +Music_DuelTheme2_Ch1: speed 9 stereo_panning 1, 1 vibrato_type 8 @@ -429,7 +429,7 @@ Branch_f5f90: music_ret -Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) +Music_DuelTheme2_Ch2: speed 9 stereo_panning 1, 1 vibrato_type 8 @@ -841,7 +841,7 @@ Branch_f618f: music_ret -Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) +Music_DuelTheme2_Ch3: speed 9 stereo_panning 1, 1 volume 32 @@ -1099,7 +1099,7 @@ Branch_f62e5: music_ret -Music_DuelTheme2_Ch4: ; f62f3 (3d:62f3) +Music_DuelTheme2_Ch4: speed 9 Loop 2 rest 12 diff --git a/src/audio/music/dueltheme3.asm b/src/audio/music/dueltheme3.asm index ce1cc2e..1580a7c 100644 --- a/src/audio/music/dueltheme3.asm +++ b/src/audio/music/dueltheme3.asm @@ -1,4 +1,4 @@ -Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) +Music_DuelTheme3_Ch1: speed 11 stereo_panning 1, 1 vibrato_type 8 @@ -473,7 +473,7 @@ Branch_f661d: music_ret -Music_DuelTheme3_Ch2: ; f6649 (3d:6649) +Music_DuelTheme3_Ch2: speed 11 stereo_panning 1, 1 vibrato_type 8 @@ -907,7 +907,7 @@ Branch_f6866: music_ret -Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) +Music_DuelTheme3_Ch3: speed 11 stereo_panning 1, 1 volume 32 @@ -1218,7 +1218,7 @@ Branch_f69f0: music_ret -Music_DuelTheme3_Ch4: ; f6a3f (3d:6a3f) +Music_DuelTheme3_Ch4: speed 11 MainLoop Loop 2 diff --git a/src/audio/music/hallofhonor.asm b/src/audio/music/hallofhonor.asm index 595143b..91d01f4 100644 --- a/src/audio/music/hallofhonor.asm +++ b/src/audio/music/hallofhonor.asm @@ -1,4 +1,4 @@ -Music_HallOfHonor_Ch1: ; fafea (3e:6fea) +Music_HallOfHonor_Ch1: speed 7 stereo_panning 1, 1 cutoff 8 @@ -92,7 +92,7 @@ Branch_fb044: music_ret -Music_HallOfHonor_Ch2: ; fb06e (3e:706e) +Music_HallOfHonor_Ch2: speed 7 stereo_panning 1, 1 cutoff 8 @@ -170,7 +170,7 @@ Branch_fb0bb: music_ret -Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) +Music_HallOfHonor_Ch3: speed 7 volume 64 stereo_panning 1, 1 diff --git a/src/audio/music/imakuni.asm b/src/audio/music/imakuni.asm index f467939..9613c2b 100644 --- a/src/audio/music/imakuni.asm +++ b/src/audio/music/imakuni.asm @@ -1,4 +1,4 @@ -Music_Imakuni_Ch1: ; fad55 (3e:6d55) +Music_Imakuni_Ch1: speed 3 stereo_panning 1, 1 vibrato_type 5 @@ -185,7 +185,7 @@ Branch_fae1d: music_ret -Music_Imakuni_Ch2: ; fae32 (3e:6e32) +Music_Imakuni_Ch2: stereo_panning 1, 1 vibrato_type 0 vibrato_delay 0 @@ -291,7 +291,7 @@ Branch_faea5: music_ret -Music_Imakuni_Ch3: ; faebc (3e:6ebc) +Music_Imakuni_Ch3: stereo_panning 1, 1 volume 32 wave 1 @@ -472,7 +472,7 @@ Branch_faf7d: music_ret -Music_Imakuni_Ch4: ; fafa4 (3e:6fa4) +Music_Imakuni_Ch4: speed 1 octave 1 Loop 10 diff --git a/src/audio/music/matchdraw.asm b/src/audio/music/matchdraw.asm index 0502e9c..d8a1062 100644 --- a/src/audio/music/matchdraw.asm +++ b/src/audio/music/matchdraw.asm @@ -1,4 +1,4 @@ -Music_MatchDraw_Ch1: ; f7cdf (3d:7cdf) +Music_MatchDraw_Ch1: speed 3 stereo_panning 1, 1 cutoff 8 @@ -45,7 +45,7 @@ Music_MatchDraw_Ch1: ; f7cdf (3d:7cdf) music_end -Music_MatchDraw_Ch2: ; f7d17 (3d:7d17) +Music_MatchDraw_Ch2: speed 3 stereo_panning 1, 1 cutoff 8 @@ -84,7 +84,7 @@ Music_MatchDraw_Ch2: ; f7d17 (3d:7d17) music_end -Music_MatchDraw_Ch3: ; f7d47 (3d:7d47) +Music_MatchDraw_Ch3: speed 6 stereo_panning 1, 1 wave 1 diff --git a/src/audio/music/matchloss.asm b/src/audio/music/matchloss.asm index df04f07..ae51623 100644 --- a/src/audio/music/matchloss.asm +++ b/src/audio/music/matchloss.asm @@ -1,4 +1,4 @@ -Music_MatchLoss_Ch1: ; f7c2e (3d:7c2e) +Music_MatchLoss_Ch1: stereo_panning 1, 1 vibrato_type 1 vibrato_delay 20 @@ -64,7 +64,7 @@ Music_MatchLoss_Ch1: ; f7c2e (3d:7c2e) music_end -Music_MatchLoss_Ch2: ; f7c87 (3d:7c87) +Music_MatchLoss_Ch2: stereo_panning 1, 1 vibrato_type 5 vibrato_delay 20 @@ -88,7 +88,7 @@ Music_MatchLoss_Ch2: ; f7c87 (3d:7c87) music_end -Music_MatchLoss_Ch3: ; f7ca7 (3d:7ca7) +Music_MatchLoss_Ch3: stereo_panning 1, 1 wave 1 volume 32 diff --git a/src/audio/music/matchstart1.asm b/src/audio/music/matchstart1.asm index 7c17634..44ca561 100644 --- a/src/audio/music/matchstart1.asm +++ b/src/audio/music/matchstart1.asm @@ -1,4 +1,4 @@ -Music_MatchStart1_Ch1: ; f7919 (3d:7919) +Music_MatchStart1_Ch1: speed 1 stereo_panning 1, 1 cutoff 8 diff --git a/src/audio/music/matchstart2.asm b/src/audio/music/matchstart2.asm index 201a4af..d84a0d3 100644 --- a/src/audio/music/matchstart2.asm +++ b/src/audio/music/matchstart2.asm @@ -1,4 +1,4 @@ -Music_MatchStart2_Ch1: ; f7956 (3d:7956) +Music_MatchStart2_Ch1: speed 1 stereo_panning 1, 1 cutoff 8 @@ -88,7 +88,7 @@ Music_MatchStart2_Ch1: ; f7956 (3d:7956) music_end -Music_MatchStart2_Ch2: ; f79b4 (3d:79b4) +Music_MatchStart2_Ch2: speed 1 stereo_panning 1, 1 cutoff 8 diff --git a/src/audio/music/matchstart3.asm b/src/audio/music/matchstart3.asm index 44b20b9..21d1ef4 100644 --- a/src/audio/music/matchstart3.asm +++ b/src/audio/music/matchstart3.asm @@ -1,4 +1,4 @@ -Music_MatchStart3_Ch1: ; f7a0f (3d:7a0f) +Music_MatchStart3_Ch1: speed 1 stereo_panning 1, 1 cutoff 8 @@ -163,7 +163,7 @@ Music_MatchStart3_Ch1: ; f7a0f (3d:7a0f) music_end -Music_MatchStart3_Ch2: ; f7aba (3d:7aba) +Music_MatchStart3_Ch2: speed 1 stereo_panning 1, 1 cutoff 8 diff --git a/src/audio/music/matchvictory.asm b/src/audio/music/matchvictory.asm index 8692d42..5eeb808 100644 --- a/src/audio/music/matchvictory.asm +++ b/src/audio/music/matchvictory.asm @@ -1,4 +1,4 @@ -Music_MatchVictory_Ch1: ; f7b61 (3d:7b61) +Music_MatchVictory_Ch1: stereo_panning 1, 1 vibrato_type 1 vibrato_delay 20 @@ -53,7 +53,7 @@ Music_MatchVictory_Ch1: ; f7b61 (3d:7b61) music_end -Music_MatchVictory_Ch2: ; f7bb0 (3d:7bb0) +Music_MatchVictory_Ch2: stereo_panning 1, 1 vibrato_type 1 vibrato_delay 20 @@ -116,7 +116,7 @@ Music_MatchVictory_Ch2: ; f7bb0 (3d:7bb0) music_end -Music_MatchVictory_Ch3: ; f7c09 (3d:7c09) +Music_MatchVictory_Ch3: stereo_panning 1, 1 wave 1 volume 32 diff --git a/src/audio/music/medal.asm b/src/audio/music/medal.asm index c706d98..9716d3d 100644 --- a/src/audio/music/medal.asm +++ b/src/audio/music/medal.asm @@ -1,4 +1,4 @@ -Music_Medal_Ch1: ; f7df8 (3d:7df8) +Music_Medal_Ch1: stereo_panning 1, 1 vibrato_type 1 vibrato_delay 20 @@ -62,7 +62,7 @@ Music_Medal_Ch1: ; f7df8 (3d:7df8) music_end -Music_Medal_Ch2: ; f7e4b (3d:7e4b) +Music_Medal_Ch2: stereo_panning 1, 1 vibrato_type 1 vibrato_delay 20 @@ -125,7 +125,7 @@ Music_Medal_Ch2: ; f7e4b (3d:7e4b) music_end -Music_Medal_Ch3: ; f7e9d (3d:7e9d) +Music_Medal_Ch3: stereo_panning 1, 1 wave 1 volume 32 diff --git a/src/audio/music/overworld.asm b/src/audio/music/overworld.asm index 8f0b032..da0c244 100644 --- a/src/audio/music/overworld.asm +++ b/src/audio/music/overworld.asm @@ -1,4 +1,4 @@ -Music_Overworld_Ch1: ; f71a0 (3d:71a0) +Music_Overworld_Ch1: speed 7 duty 0 stereo_panning 1, 1 @@ -285,7 +285,7 @@ Branch_f72fb: music_ret -Music_Overworld_Ch2: ; f7334 (3d:7334) +Music_Overworld_Ch2: speed 7 duty 0 stereo_panning 1, 1 @@ -750,7 +750,7 @@ Branch_f7535: music_ret -Music_Overworld_Ch3: ; f75a1 (3d:75a1) +Music_Overworld_Ch3: speed 7 stereo_panning 1, 1 volume 32 @@ -1386,7 +1386,7 @@ Branch_f7826: music_ret -Music_Overworld_Ch4: ; f78af (3d:78af) +Music_Overworld_Ch4: speed 7 octave 1 music_call Branch_f78ee diff --git a/src/audio/music/pausemenu.asm b/src/audio/music/pausemenu.asm index 2563cd0..aae55ee 100644 --- a/src/audio/music/pausemenu.asm +++ b/src/audio/music/pausemenu.asm @@ -1,4 +1,4 @@ -Music_PauseMenu_Ch2: ; f6bb7 (3d:6bb7) +Music_PauseMenu_Ch2: speed 7 stereo_panning 1, 1 cutoff 8 @@ -278,7 +278,7 @@ Branch_f6ce9: music_ret -Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e) +Music_PauseMenu_Ch1: speed 7 stereo_panning 1, 1 cutoff 8 @@ -432,7 +432,7 @@ Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e) EndMainLoop -Music_PauseMenu_Ch3: ; f6e2d (3d:6e2d) +Music_PauseMenu_Ch3: speed 1 wave 3 stereo_panning 1, 1 @@ -544,7 +544,7 @@ Music_PauseMenu_Ch3: ; f6e2d (3d:6e2d) EndMainLoop -Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8) +Music_PauseMenu_Ch4: speed 7 octave 1 MainLoop diff --git a/src/audio/music/pcmainmenu.asm b/src/audio/music/pcmainmenu.asm index 38c567e..a5c457f 100644 --- a/src/audio/music/pcmainmenu.asm +++ b/src/audio/music/pcmainmenu.asm @@ -1,4 +1,4 @@ -Music_PCMainMenu_Ch1: ; f9052 (3e:5052) +Music_PCMainMenu_Ch1: speed 7 stereo_panning 1, 1 cutoff 8 @@ -104,7 +104,7 @@ Branch_f90c2: music_ret -Music_PCMainMenu_Ch2: ; f90ed (3e:50ed) +Music_PCMainMenu_Ch2: speed 7 stereo_panning 1, 1 cutoff 8 @@ -211,7 +211,7 @@ Branch_f915e: music_ret -Music_PCMainMenu_Ch3: ; f9189 (3e:5189) +Music_PCMainMenu_Ch3: speed 7 volume 32 stereo_panning 1, 1 @@ -341,7 +341,7 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189) EndMainLoop -Music_PCMainMenu_Ch4: ; f922b (3e:522b) +Music_PCMainMenu_Ch4: speed 7 octave 1 MainLoop diff --git a/src/audio/music/pokemondome.asm b/src/audio/music/pokemondome.asm index e1343dc..a0f29df 100644 --- a/src/audio/music/pokemondome.asm +++ b/src/audio/music/pokemondome.asm @@ -1,4 +1,4 @@ -Music_PokemonDome_Ch1: ; f9251 (3e:5251) +Music_PokemonDome_Ch1: speed 7 stereo_panning 1, 1 vibrato_type 9 @@ -309,7 +309,7 @@ Music_PokemonDome_Ch1: ; f9251 (3e:5251) EndMainLoop -Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) +Music_PokemonDome_Ch2: speed 7 stereo_panning 1, 1 vibrato_type 9 @@ -618,7 +618,7 @@ Branch_f9554: music_ret -Music_PokemonDome_Ch3: ; f9579 (3e:5579) +Music_PokemonDome_Ch3: speed 7 stereo_panning 1, 1 volume 32 @@ -772,7 +772,7 @@ Branch_f9613: music_ret -Music_PokemonDome_Ch4: ; f9629 (3e:5629) +Music_PokemonDome_Ch4: speed 7 octave 1 snare5 8 diff --git a/src/audio/music/ronald.asm b/src/audio/music/ronald.asm index 638fbff..9c93254 100644 --- a/src/audio/music/ronald.asm +++ b/src/audio/music/ronald.asm @@ -1,4 +1,4 @@ -Music_Ronald_Ch1: ; fa7a0 (3e:67a0) +Music_Ronald_Ch1: stereo_panning 1, 1 vibrato_type 8 vibrato_delay 12 @@ -507,7 +507,7 @@ Branch_fa9ec: music_ret -Music_Ronald_Ch2: ; faa0e (3e:6a0e) +Music_Ronald_Ch2: stereo_panning 1, 1 vibrato_type 8 vibrato_delay 12 @@ -849,7 +849,7 @@ Branch_fabb1: music_ret -Music_Ronald_Ch3: ; fabc0 (3e:6bc0) +Music_Ronald_Ch3: speed 1 stereo_panning 1, 1 volume 32 @@ -1124,7 +1124,7 @@ Branch_facc5: music_ret -Music_Ronald_Ch4: ; face0 (3e:6ce0) +Music_Ronald_Ch4: speed 1 octave 1 MainLoop diff --git a/src/audio/music/titlescreen.asm b/src/audio/music/titlescreen.asm index cd67602..62f732b 100644 --- a/src/audio/music/titlescreen.asm +++ b/src/audio/music/titlescreen.asm @@ -1,4 +1,4 @@ -Music_TitleScreen_Ch1: ; f5052 (3d:5052) +Music_TitleScreen_Ch1: speed 7 duty 0 stereo_panning 1, 1 @@ -220,7 +220,7 @@ Music_TitleScreen_Ch1: ; f5052 (3d:5052) music_end -Music_TitleScreen_Ch2: ; f5193 (3d:5193) +Music_TitleScreen_Ch2: speed 7 duty 0 stereo_panning 1, 1 @@ -408,7 +408,7 @@ Music_TitleScreen_Ch2: ; f5193 (3d:5193) music_end -Music_TitleScreen_Ch3: ; f5286 (3d:5286) +Music_TitleScreen_Ch3: speed 7 wave 4 volume 32 @@ -506,7 +506,7 @@ Branch_f52f0: music_ret -Music_TitleScreen_Ch4: ; f52fa (3d:52fa) +Music_TitleScreen_Ch4: speed 7 octave 1 rest 4 diff --git a/src/audio/music1.asm b/src/audio/music1.asm index 53c3918..b76d584 100644 --- a/src/audio/music1.asm +++ b/src/audio/music1.asm @@ -1,37 +1,37 @@ -_SetupSound:: ; f4000 (3d:4000) +_SetupSound:: jp Music1_Init -SoundTimerHandler:: ; f4003 (3d:4003) +SoundTimerHandler:: jp Music1_Update -_PlaySong:: ; f4006 (3d:4006) +_PlaySong:: jp Music1_PlaySong -_PlaySFX:: ; f4009 (3d:4009) +_PlaySFX:: jp Music1_PlaySFX -Func_f400c:: ; f400c (3d:400c) - jp Func_f404e +Music1_f400c:: + jp Music1_f404e -_AssertSongFinished:: ; f400f (3d:400f) +_AssertSongFinished:: jp Music1_AssertSongFinished -_AssertSFXFinished:: ; f4012 (3d:4012) +_AssertSFXFinished:: jp Music1_AssertSFXFinished -Func_f4015:: ; f4015 (3d:4015) - jp Func_f4066 +Music1_f4015:: + jp Music1_f4066 -Func_f4018:: ; f4018 (3d:4018) - jp Func_f406f +Music1_f4018:: + jp Music1_f406f -_PauseSong:: ; f401b (3d:401b) +_PauseSong:: jp Music1_PauseSong -_ResumeSong:: ; f401e (3d:401e) +_ResumeSong:: jp Music1_ResumeSong -Music1_PlaySong: ; f4021 (3d:4021) +Music1_PlaySong: push hl ld hl, NumberOfSongs1 cp [hl] @@ -41,7 +41,7 @@ Music1_PlaySong: ; f4021 (3d:4021) pop hl ret -Music1_PlaySFX: ; f402d (3d:402d) +Music1_PlaySFX: push bc push hl ld b, $0 @@ -66,11 +66,11 @@ Music1_PlaySFX: ; f402d (3d:402d) pop bc ret -Func_f404e: ; f404e (3d:404e) +Music1_f404e: ld [wddf0], a ret -Music1_AssertSongFinished: ; f4052 (3d:4052) +Music1_AssertSongFinished: ld a, [wCurSongID] cp $80 ld a, $1 @@ -78,7 +78,7 @@ Music1_AssertSongFinished: ; f4052 (3d:4052) xor a ret -Music1_AssertSFXFinished: ; f405c (3d:405c) +Music1_AssertSFXFinished: ld a, [wCurSfxID] cp $80 ld a, $1 @@ -86,13 +86,13 @@ Music1_AssertSFXFinished: ; f405c (3d:405c) xor a ret -Func_f4066: ; f4066 (3d:4066) +Music1_f4066: ld a, [wddf2] xor $1 ld [wddf2], a ret -Func_f406f: ; f406f (3d:406f) +Music1_f406f: push bc push af and $7 @@ -104,7 +104,7 @@ Func_f406f: ; f406f (3d:406f) pop bc ret -Music1_Init: ; f407d (3d:407d) +Music1_Init: xor a ldh [rNR52], a ld a, $80 @@ -162,7 +162,7 @@ Music1_Init: ; f407d (3d:407d) jr nz, .zero_loop2 ret -Music1_Update: ; f40e9 (3d:40e9) +Music1_Update: call Music1_EmptyFunc call Music1_CheckForNewSound ld hl, SFX_UpdateSFX @@ -173,7 +173,7 @@ Music1_Update: ; f40e9 (3d:40e9) ld a, [wddf2] cp $0 jr z, .update_channels - call Func_f4980 + call Music1_f4980 jr .skip_channel_Updates .update_channels call Music1_UpdateChannel1 @@ -181,11 +181,11 @@ Music1_Update: ; f40e9 (3d:40e9) call Music1_UpdateChannel3 call Music1_UpdateChannel4 .skip_channel_Updates - call Func_f4866 + call Music1_f4866 call Music1_CheckForEndOfSong ret -Music1_CheckForNewSound: ; f411c (3d:411c) +Music1_CheckForNewSound: ld a, [wCurSongID] rla jr c, .check_for_new_sfx @@ -208,7 +208,7 @@ Music1_CheckForNewSound: ; f411c (3d:411c) .no_new_sound ret -Music1_StopAllChannels: ; f414b (3d:414b) +Music1_StopAllChannels: ld a, [wdd8c] ld d, a xor a @@ -248,7 +248,7 @@ Music1_StopAllChannels: ; f414b (3d:414b) ret ; plays the song given by the id in a -Music1_BeginSong: ; f418c (3d:418c) +Music1_BeginSong: push af ld c, a ld b, $0 @@ -379,10 +379,10 @@ Music1_BeginSong: ; f418c (3d:418c) ld [wddf2], a ret -Music1_EmptyFunc: ; f42a4 (3d:42a4) +Music1_EmptyFunc: ret -Music1_UpdateChannel1: ; f42a5 (3d:42a5) +Music1_UpdateChannel1: ld a, [wMusicIsPlaying] or a jr z, .asm_f42fa @@ -419,10 +419,10 @@ Music1_UpdateChannel1: ; f42a5 (3d:42a5) ld a, [wMusicIsPlaying] or a jr z, .asm_f42fa - call Func_f4714 + call Music1_f4714 .asm_f42f4 ld a, $0 - call Func_f485a + call Music1_f485a ret .asm_f42fa ld a, [wdd8c] @@ -435,7 +435,7 @@ Music1_UpdateChannel1: ; f42a5 (3d:42a5) .asm_f4309 ret -Music1_UpdateChannel2: ; f430a (3d:430a) +Music1_UpdateChannel2: ld a, [wMusicIsPlaying + 1] or a jr z, .asm_f435f @@ -472,10 +472,10 @@ Music1_UpdateChannel2: ; f430a (3d:430a) ld a, [wMusicIsPlaying + 1] or a jr z, .asm_f435f - call Func_f475a + call Music1_f475a .asm_f4359 ld a, $1 - call Func_f485a + call Music1_f485a ret .asm_f435f ld a, [wdd8c] @@ -488,7 +488,7 @@ Music1_UpdateChannel2: ; f430a (3d:430a) .asm_f436e ret -Music1_UpdateChannel3: ; f436f (3d:436f) +Music1_UpdateChannel3: ld a, [wMusicIsPlaying + 2] or a jr z, .asm_f43be @@ -521,10 +521,10 @@ Music1_UpdateChannel3: ; f436f (3d:436f) ld a, [wMusicIsPlaying + 2] or a jr z, .asm_f43be - call Func_f479c + call Music1_f479c .asm_f43b8 ld a, $2 - call Func_f485a + call Music1_f485a ret .asm_f43be ld a, [wdd8c] @@ -537,7 +537,7 @@ Music1_UpdateChannel3: ; f436f (3d:436f) .asm_f43cd ret -Music1_UpdateChannel4: ; f43ce (3d:43ce) +Music1_UpdateChannel4: ld a, [wMusicIsPlaying + 3] or a jr z, .asm_f4400 @@ -554,13 +554,13 @@ Music1_UpdateChannel4: ; f43ce (3d:43ce) ld a, [wMusicIsPlaying + 3] or a jr z, .asm_f4400 - call Func_f480a + call Music1_f480a jr .asm_f4413 .asm_f43f6 ld a, [wddef] or a jr z, .asm_f4413 - call Func_f4839 + call Music1_f4839 ret .asm_f4400 ld a, [wdd8c] @@ -575,7 +575,7 @@ Music1_UpdateChannel4: ; f43ce (3d:43ce) .asm_f4413 ret -Music1_PlayNextNote: ; f4414 (3d:4414) +Music1_PlayNextNote: ld a, [hli] push hl push af @@ -595,7 +595,7 @@ Music1_PlayNextNote: ; f4414 (3d:4414) pop af jp hl -Music1_CommandTable: ; f442c (3d:442c) +Music1_CommandTable: dw Music1_speed dw Music1_octave dw Music1_octave @@ -645,7 +645,7 @@ Music1_CommandTable: ; f442c (3d:442c) dw Music1_end dw Music1_end -Music1_note: ; f448c (3d:448c) +Music1_note: push af ld a, [hl] ld e, a @@ -824,7 +824,7 @@ Music1_note: ; f448c (3d:448c) ld a, [hli] ld e, a ld d, [hl] - call Func_f4967 + call Music1_f4967 pop hl ld a, e ld [hli], a @@ -839,7 +839,7 @@ Music1_note: ; f448c (3d:448c) ld [hl], d ret -Music1_speed: ; f4598 (3d:4598) +Music1_speed: pop hl ld a, [hli] push hl @@ -848,7 +848,7 @@ Music1_speed: ; f4598 (3d:4598) ld [hl], a jp Music1_PlayNextNote_pop -Music1_octave: ; f45a3 (3d:45a3) +Music1_octave: and $7 dec a ld hl, wMusicOctave @@ -866,25 +866,25 @@ Music1_octave: ; f45a3 (3d:45a3) ld [hl], a jp Music1_PlayNextNote_pop -Music1_inc_octave: ; f45bb (3d:45bb) +Music1_inc_octave: ld hl, wMusicOctave add hl, bc inc [hl] jp Music1_PlayNextNote_pop -Music1_dec_octave: ; f45c3 (3d:45c3) +Music1_dec_octave: ld hl, wMusicOctave add hl, bc dec [hl] jp Music1_PlayNextNote_pop -Music1_tie: ; f45cb (3d:45cb) +Music1_tie: ld hl, wMusicTie add hl, bc ld [hl], $80 jp Music1_PlayNextNote_pop -Music1_stereo_panning: ; f45d4 (3d:45d4) +Music1_stereo_panning: pop hl ld a, [hli] push hl @@ -907,7 +907,7 @@ Music1_stereo_panning: ; f45d4 (3d:45d4) pop bc jp Music1_PlayNextNote_pop -Music1_MainLoop: ; f45ef (3d:45ef) +Music1_MainLoop: pop de push de dec de @@ -919,7 +919,7 @@ Music1_MainLoop: ; f45ef (3d:45ef) ld [hl], d jp Music1_PlayNextNote_pop -Music1_EndMainLoop: ; f45fd (3d:45fd) +Music1_EndMainLoop: pop hl ld hl, wMusicMainLoopStart add hl, bc @@ -929,7 +929,7 @@ Music1_EndMainLoop: ; f45fd (3d:45fd) ld l, a jp Music1_PlayNextNote -Music1_Loop: ; f4609 (3d:4609) +Music1_Loop: pop de ld a, [de] ; get loop count inc de @@ -946,7 +946,7 @@ Music1_Loop: ; f4609 (3d:4609) call Music1_SetChannelStackPointer jp Music1_PlayNextNote_pop -Music1_EndLoop: ; f461e (3d:461e) +Music1_EndLoop: call Music1_GetChannelStackPointer dec hl ld a, [hl] ; get remaining loop count @@ -966,14 +966,14 @@ Music1_EndLoop: ; f461e (3d:461e) call Music1_SetChannelStackPointer jp Music1_PlayNextNote_pop -Music1_jp: ; f4638 (3d:4638) +Music1_jp: pop hl ld a, [hli] ld h, [hl] ld l, a jp Music1_PlayNextNote -Music1_call: ; f463f (3d:463f) +Music1_call: call Music1_GetChannelStackPointer pop de ld a, e @@ -991,7 +991,7 @@ Music1_call: ; f463f (3d:463f) call Music1_SetChannelStackPointer jp Music1_PlayNextNote_pop -Music1_ret: ; f4656 (3d:4656) +Music1_ret: pop de call Music1_GetChannelStackPointer dec hl @@ -1004,7 +1004,7 @@ Music1_ret: ; f4656 (3d:4656) call Music1_SetChannelStackPointer jp Music1_PlayNextNote_pop -Music1_frequency_offset: ; f4667 (3d:4667) +Music1_frequency_offset: pop de ld a, [de] inc de @@ -1015,7 +1015,7 @@ Music1_frequency_offset: ; f4667 (3d:4667) ld l, e jp Music1_PlayNextNote -Music1_duty: ; f4674 (3d:4674) +Music1_duty: pop de ld a, [de] and $c0 @@ -1027,7 +1027,7 @@ Music1_duty: ; f4674 (3d:4674) ld l, e jp Music1_PlayNextNote -Music1_volume: ; f4683 (3d:4683) +Music1_volume: pop de ld a, [de] inc de @@ -1038,7 +1038,7 @@ Music1_volume: ; f4683 (3d:4683) ld l, e jp Music1_PlayNextNote -Music1_wave: ; f4690 (3d:4690) +Music1_wave: pop de ld a, [de] inc de @@ -1049,7 +1049,7 @@ Music1_wave: ; f4690 (3d:4690) ld l, e jp Music1_PlayNextNote -Music1_cutoff: ; f46a0 (3d:46a0) +Music1_cutoff: pop de ld a, [de] inc de @@ -1060,7 +1060,7 @@ Music1_cutoff: ; f46a0 (3d:46a0) ld l, e jp Music1_PlayNextNote -Music1_echo: ; f46ad (3d:46ad) +Music1_echo: pop de ld a, [de] inc de @@ -1071,7 +1071,7 @@ Music1_echo: ; f46ad (3d:46ad) ld l, e jp Music1_PlayNextNote -Music1_vibrato_type: ; f46ba (3d:46ba) +Music1_vibrato_type: pop de ld a, [de] inc de @@ -1085,7 +1085,7 @@ Music1_vibrato_type: ; f46ba (3d:46ba) ld l, e jp Music1_PlayNextNote -Music1_vibrato_delay: ; f46cc (3d:46cc) +Music1_vibrato_delay: pop de ld a, [de] inc de @@ -1096,7 +1096,7 @@ Music1_vibrato_delay: ; f46cc (3d:46cc) ld l, e jp Music1_PlayNextNote -Music1_pitch_offset: ; f46d9 (3d:46d9) +Music1_pitch_offset: pop de ld a, [de] inc de @@ -1107,7 +1107,7 @@ Music1_pitch_offset: ; f46d9 (3d:46d9) ld l, e jp Music1_PlayNextNote -Music1_adjust_pitch_offset: ; f46e6 (3d:46e6) +Music1_adjust_pitch_offset: pop de ld a, [de] inc de @@ -1119,7 +1119,7 @@ Music1_adjust_pitch_offset: ; f46e6 (3d:46e6) ld l, e jp Music1_PlayNextNote -Music1_end: ; f46f4 (3d:46f4) +Music1_end: ld hl, wMusicIsPlaying add hl, bc ld [hl], $0 @@ -1129,7 +1129,7 @@ Music1_end: ; f46f4 (3d:46f4) ; returns the address of the top of the stack ; for the current channel ; used for loops and calls -Music1_GetChannelStackPointer: ; f46fc (3d:46fc) +Music1_GetChannelStackPointer: ld hl, wMusicChannelStackPointers add hl, bc add hl, bc @@ -1139,7 +1139,7 @@ Music1_GetChannelStackPointer: ; f46fc (3d:46fc) ret ; sets the current channel's stack pointer to hl -Music1_SetChannelStackPointer: ; f4705 (3d:4705) +Music1_SetChannelStackPointer: ld d, h ld e, l ld hl, wMusicChannelStackPointers @@ -1150,11 +1150,11 @@ Music1_SetChannelStackPointer: ; f4705 (3d:4705) ld [hl], d ret -Music1_PlayNextNote_pop: ; f4710 (3d:4710) +Music1_PlayNextNote_pop: pop hl jp Music1_PlayNextNote -Func_f4714: ; f4714 (3d:4714) +Music1_f4714: ld a, [wdd8c] bit 0, a jr nz, .asm_f4749 @@ -1193,7 +1193,7 @@ Func_f4714: ; f4714 (3d:4714) ld [hl], a ret -Func_f475a: ; f475a (3d:475a) +Music1_f475a: ld a, [wdd8c] bit 1, a jr nz, .asm_f478b @@ -1230,7 +1230,7 @@ Func_f475a: ; f475a (3d:475a) ld [hl], a ret -Func_f479c: ; f479c (3d:479c) +Music1_f479c: ld a, [wdd8c] bit 2, a jr nz, .asm_f47e0 @@ -1275,7 +1275,7 @@ Func_f479c: ; f479c (3d:479c) ldh [rNR30], a ret -Music1_LoadWaveInstrument: ; f479c (3d:47ea) +Music1_LoadWaveInstrument: ld a, [wMusicWave] add a ld d, $0 @@ -1299,13 +1299,13 @@ Music1_LoadWaveInstrument: ; f479c (3d:47ea) ld [wMusicWaveChange], a ret -Func_f480a: ; f480a (3d:480a) +Music1_f480a: ld a, [wdd8c] bit 3, a jr nz, .asm_f4829 ld a, [wddba] cp $0 - jr z, asm_f482a + jr z, .asm_f482a ld de, rNR41 ld hl, wddab ld a, [hli] @@ -1321,7 +1321,7 @@ Func_f480a: ; f480a (3d:480a) ld [de], a .asm_f4829 ret -asm_f482a: +.asm_f482a xor a ld [wddef], a ld hl, rNR42 @@ -1332,7 +1332,7 @@ asm_f482a: ld [hl], a ret -Func_f4839: ; f4839 (3d:4839) +Music1_f4839: ld a, [wdd8c] bit 3, a jr z, .asm_f4846 @@ -1347,7 +1347,7 @@ Func_f4839: ; f4839 (3d:4839) ld a, [de] cp $ff jr nz, .asm_f4853 - jr asm_f482a + jr Music1_f480a.asm_f482a .asm_f4853 ldh [rNR43], a inc de @@ -1357,16 +1357,16 @@ Func_f4839: ; f4839 (3d:4839) .asm_f4859 ret -Func_f485a: ; f485a (3d:485a) +Music1_f485a: push af ld b, $0 ld c, a call Music1_UpdateVibrato pop af - call Func_f490b + call Music1_f490b ret -Func_f4866: ; f4866 (3d:4866) +Music1_f4866: ld a, [wMusicPanning] ldh [rNR50], a ld a, [wdd8c] @@ -1400,7 +1400,7 @@ Func_f4866: ; f4866 (3d:4866) ldh [rNR51], a ret -Music1_UpdateVibrato: ; f4898 (3d:4898) +Music1_UpdateVibrato: ld hl, wMusicVibratoDelay add hl, bc ld a, [hl] @@ -1485,7 +1485,7 @@ Music1_UpdateVibrato: ; f4898 (3d:4898) ld d, [hl] ret -Func_f490b: ; f490b (3d:490b) +Music1_f490b: cp $0 jr nz, .not_channel_1 ld a, [wMusicVibratoDelay] @@ -1538,7 +1538,7 @@ Func_f490b: ; f490b (3d:490b) .done ret -Func_f4967: ; f4967 (3d:4967) +Music1_f4967: ld hl, wMusicFrequencyOffset add hl, bc ld a, [hl] @@ -1561,7 +1561,7 @@ Func_f4967: ; f4967 (3d:4967) ld d, a ret -Func_f4980: ; f4980 (3d:4980) +Music1_f4980: ld a, [wdd8c] ld d, a bit 0, d @@ -1592,7 +1592,7 @@ Func_f4980: ; f4980 (3d:4980) .asm_f49b0 ret -Music1_CheckForEndOfSong: ; f49b1 (3d:49b1) +Music1_CheckForEndOfSong: ld hl, wMusicIsPlaying xor a add [hl] @@ -1608,23 +1608,23 @@ Music1_CheckForEndOfSong: ; f49b1 (3d:49b1) ld [wCurSongID], a ret -Music1_PauseSong: ; f49c4 (3d:49c4) +Music1_PauseSong: di - call Func_f4980 + call Music1_f4980 call Music1_BackupSong call Music1_StopAllChannels ei ret -Music1_ResumeSong: ; f49d0 (3d:49d0) +Music1_ResumeSong: di - call Func_f4980 + call Music1_f4980 call Music1_StopAllChannels call Music1_LoadBackup ei ret -Music1_BackupSong: ; f49dc (3d:49dc) +Music1_BackupSong: ld a, [wCurSongID] ld [wCurSongIDBackup], a ld a, [wCurSongBank] @@ -1732,7 +1732,7 @@ Music1_BackupSong: ; f49dc (3d:49dc) call Music1_CopyData ret -Music1_LoadBackup: ; f4b01 (3d:4b01) +Music1_LoadBackup: ld a, [wCurSongIDBackup] ld [wCurSongID], a ld a, [wCurSongBankBackup] @@ -1836,7 +1836,7 @@ Music1_LoadBackup: ; f4b01 (3d:4b01) ret ; copies a bytes from hl to de -Music1_CopyData: ; f4c18 (3d:4c18) +Music1_CopyData: ld c, a .loop ld a, [hli] @@ -1846,7 +1846,7 @@ Music1_CopyData: ; f4c18 (3d:4c18) jr nz, .loop ret -Music1_ChannelLoopStacks: ; f4c20 (3d:4c20) +Music1_ChannelLoopStacks: dw wMusicCh1Stack dw wMusicCh2Stack dw wMusicCh3Stack @@ -1854,7 +1854,7 @@ Music1_ChannelLoopStacks: ; f4c20 (3d:4c20) ; these are address offsets into the pitches table below ; offset = (12 notes per octave * 2 bytes per pitch) * octave -Music1_OctaveOffsets: ; f4c28 (3d:4c28) +Music1_OctaveOffsets: db (12 * 2) * 0 db (12 * 2) * 1 db (12 * 2) * 2 @@ -1864,7 +1864,7 @@ Music1_OctaveOffsets: ; f4c28 (3d:4c28) db (12 * 2) * 6 db (12 * 2) * 7 -Music1_Pitches: ; f4c30 (3d:4c30) +Music1_Pitches: dw $002c ; C_ 0 dw $009c ; C# 0 dw $0106 ; D_ 0 @@ -1951,17 +1951,17 @@ Music1_Pitches: ; f4c30 (3d:4c30) dw $07ef ; B_ 6 dw $07f0 ; C_ 7 -Music1_WaveInstruments: ; f4cda (3d:4cda) +Music1_WaveInstruments: INCLUDE "audio/wave_instruments.asm" -Music1_NoiseInstruments: ; f4d34 (3d:4d34) +Music1_NoiseInstruments: INCLUDE "audio/noise_instruments.asm" -Music1_VibratoTypes: ; f4dde (3d:4dde) +Music1_VibratoTypes: INCLUDE "audio/vibrato_types.asm" ; all real SFX have the same priority (SFX_STOP does not use this table) -Music1_SFXPriorities: ; f4e85 (3d:4e85) +Music1_SFXPriorities: db $00, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a db $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a db $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a diff --git a/src/audio/music1_headers.asm b/src/audio/music1_headers.asm index 26cdff4..1148d8c 100644 --- a/src/audio/music1_headers.asm +++ b/src/audio/music1_headers.asm @@ -1,7 +1,7 @@ -NumberOfSongs1: ; f4ee5 (3d:4ee5) +NumberOfSongs1: db $1f -SongBanks1: ; f4ee6 (3d:4ee6) +SongBanks1: db BANK(Music_Stop) db BANK(Music_TitleScreen) db BANK(Music_DuelTheme1) @@ -34,7 +34,7 @@ SongBanks1: ; f4ee6 (3d:4ee6) db BANK(Music_Medal) db BANK(Music_Unused1e) -SongHeaderPointers1: ; f4f05 (3d:4f05) +SongHeaderPointers1: dw Music_Stop dw Music_TitleScreen dw Music_DuelTheme1 @@ -67,38 +67,38 @@ SongHeaderPointers1: ; f4f05 (3d:4f05) dw Music_Medal dw Music_Unused1e -Music_Stop: ; f4f43 (3d:4f43) +Music_Stop: db %0000 -Music_TitleScreen: ; f4f44 (3d:4f44) +Music_TitleScreen: db %1111 dw Music_TitleScreen_Ch1 dw Music_TitleScreen_Ch2 dw Music_TitleScreen_Ch3 dw Music_TitleScreen_Ch4 -Music_DuelTheme1: ; f4f4d (3d:4f4d) +Music_DuelTheme1: db %1111 dw Music_DuelTheme1_Ch1 dw Music_DuelTheme1_Ch2 dw Music_DuelTheme1_Ch3 dw Music_DuelTheme1_Ch4 -Music_DuelTheme2: ; f4f56 (3d:4f56) +Music_DuelTheme2: db %1111 dw Music_DuelTheme2_Ch1 dw Music_DuelTheme2_Ch2 dw Music_DuelTheme2_Ch3 dw Music_DuelTheme2_Ch4 -Music_DuelTheme3: ; f4f5f (3d:4f5f) +Music_DuelTheme3: db %1111 dw Music_DuelTheme3_Ch1 dw Music_DuelTheme3_Ch2 dw Music_DuelTheme3_Ch3 dw Music_DuelTheme3_Ch4 -Music_PauseMenu: ; f4f68 (3d:4f68) +Music_PauseMenu: db %1111 dw Music_PauseMenu_Ch1 dw Music_PauseMenu_Ch2 @@ -112,21 +112,21 @@ Music_PauseMenu: ; f4f68 (3d:4f68) dw NULL dw NULL -Music_DeckMachine: ; f4f7a (3d:4f7a) +Music_DeckMachine: db %1111 dw Music_DeckMachine_Ch1 dw Music_DeckMachine_Ch2 dw Music_DeckMachine_Ch3 dw Music_DeckMachine_Ch4 -Music_CardPop: ; f4f83 (3d:4f83) +Music_CardPop: db %1111 dw Music_CardPop_Ch1 dw Music_CardPop_Ch2 dw Music_CardPop_Ch3 dw Music_CardPop_Ch4 -Music_Overworld: ; f4f8c (3d:4f8c) +Music_Overworld: db %1111 dw Music_Overworld_Ch1 dw Music_Overworld_Ch2 @@ -196,84 +196,84 @@ Music_Overworld: ; f4f8c (3d:4f8c) dw NULL dw NULL -Music_Unused13: ; f4fe6 (3d:4fe6) +Music_Unused13: db %0000 dw NULL dw NULL dw NULL dw NULL -Music_Unused14: ; f4fef (3d:4fef) +Music_Unused14: db %0000 dw NULL dw NULL dw NULL dw NULL -Music_MatchStart1: ; f4ff8 (3d:4ff8) +Music_MatchStart1: db %0001 dw Music_MatchStart1_Ch1 dw NULL dw NULL dw NULL -Music_MatchStart2: ; f5001 (3d:5001) +Music_MatchStart2: db %0011 dw Music_MatchStart2_Ch1 dw Music_MatchStart2_Ch2 dw NULL dw NULL -Music_MatchStart3: ; f500a (3d:500a) +Music_MatchStart3: db %0011 dw Music_MatchStart3_Ch1 dw Music_MatchStart3_Ch2 dw NULL dw NULL -Music_MatchVictory: ; f5013 (3d:5013) +Music_MatchVictory: db %0111 dw Music_MatchVictory_Ch1 dw Music_MatchVictory_Ch2 dw Music_MatchVictory_Ch3 dw NULL -Music_MatchLoss: ; f501c (3d:501c) +Music_MatchLoss: db %0111 dw Music_MatchLoss_Ch1 dw Music_MatchLoss_Ch2 dw Music_MatchLoss_Ch3 dw NULL -Music_MatchDraw: ; f5025 (3d:5025) +Music_MatchDraw: db %0111 dw Music_MatchDraw_Ch1 dw Music_MatchDraw_Ch2 dw Music_MatchDraw_Ch3 dw NULL -Music_Unused1b: ; f502e (3d:502e) +Music_Unused1b: db %0000 dw NULL dw NULL dw NULL dw NULL -Music_BoosterPack: ; f5037 (3d:5037) +Music_BoosterPack: db %0111 dw Music_BoosterPack_Ch1 dw Music_BoosterPack_Ch2 dw Music_BoosterPack_Ch3 dw NULL -Music_Medal: ; f5040 (3d:5040) +Music_Medal: db %0111 dw Music_Medal_Ch1 dw Music_Medal_Ch2 dw Music_Medal_Ch3 dw NULL -Music_Unused1e: ; f5049 (3d:5049) +Music_Unused1e: db %0000 dw NULL dw NULL diff --git a/src/audio/music2.asm b/src/audio/music2.asm index 1b0a2b7..e3c7e5a 100644 --- a/src/audio/music2.asm +++ b/src/audio/music2.asm @@ -1,37 +1,37 @@ -Func_f8000: ; f8000 (3e:4000) +_SetupSound_2:: jp Music2_Init -Func_f8003: ; f8003 (3e:4003) +SoundTimerHandler_2:: jp Music2_Update -Func_f8006: ; f8006 (3e:4006) +_PlaySong_2:: jp Music2_PlaySong -Func_f8009: ; f8009 (3e:4009) +_PlaySFX_2:: jp Music2_PlaySFX -Func_f800c: ; f800c (3e:400c) - jp Func_f804e +Music2_f400c_2:: + jp Music2_f404e -Func_f800f: ; f800f (3e:400f) +_AssertSongFinished_2:: jp Music2_AssertSongFinished -Func_f8012: ; f8012 (3e:4012) +_AssertSFXFinished_2:: jp Music2_AssertSFXFinished -Func_f8015: ; f8015 (3e:4015) - jp Func_f8066 +Music2_f4015_2:: + jp Music2_f4066 -Func_f8018: ; f8018 (3e:4018) - jp Func_f806f +Music2_f4018_2:: + jp Music2_f406f -Func_f801b: ; f801b (3e:401b) +_PauseSong_2:: jp Music2_PauseSong -Func_f801e: ; f801e (3e:401e) +_ResumeSong_2:: jp Music2_ResumeSong -Music2_PlaySong: ; f8021 (3e:4021) +Music2_PlaySong: push hl ld hl, NumberOfSongs2 cp [hl] @@ -41,7 +41,7 @@ Music2_PlaySong: ; f8021 (3e:4021) pop hl ret -Music2_PlaySFX: ; f802d (3e:402d) +Music2_PlaySFX: push bc push hl ld b, $0 @@ -66,11 +66,11 @@ Music2_PlaySFX: ; f802d (3e:402d) pop bc ret -Func_f804e: ; f804e (3e:404e) +Music2_f404e: ld [wddf0], a ret -Music2_AssertSongFinished: ; f8052 (3e:4052) +Music2_AssertSongFinished: ld a, [wCurSongID] cp $80 ld a, $1 @@ -78,7 +78,7 @@ Music2_AssertSongFinished: ; f8052 (3e:4052) xor a ret -Music2_AssertSFXFinished: ; f805c (3e:405c) +Music2_AssertSFXFinished: ld a, [wCurSfxID] cp $80 ld a, $1 @@ -86,13 +86,13 @@ Music2_AssertSFXFinished: ; f805c (3e:405c) xor a ret -Func_f8066: ; f8066 (3e:4066) +Music2_f4066: ld a, [wddf2] xor $1 ld [wddf2], a ret -Func_f806f: ; f806f (3e:406f) +Music2_f406f: push bc push af and $7 @@ -104,7 +104,7 @@ Func_f806f: ; f806f (3e:406f) pop bc ret -Music2_Init: ; f807d (3e:407d) +Music2_Init: xor a ldh [rNR52], a ld a, $80 @@ -162,7 +162,7 @@ Music2_Init: ; f807d (3e:407d) jr nz, .zero_loop2 ret -Music2_Update: ; f80e9 (3e:40e9) +Music2_Update: call Music2_EmptyFunc call Music2_CheckForNewSound ld hl, SFX_UpdateSFX @@ -173,7 +173,7 @@ Music2_Update: ; f80e9 (3e:40e9) ld a, [wddf2] cp $0 jr z, .update_channels - call Func_f8980 + call Music2_f4980 jr .skip_channel_Updates .update_channels call Music2_UpdateChannel1 @@ -181,11 +181,11 @@ Music2_Update: ; f80e9 (3e:40e9) call Music2_UpdateChannel3 call Music2_UpdateChannel4 .skip_channel_Updates - call Func_f8866 + call Music2_f4866 call Music2_CheckForEndOfSong ret -Music2_CheckForNewSound: ; f811c (3e:411c) +Music2_CheckForNewSound: ld a, [wCurSongID] rla jr c, .check_for_new_sfx @@ -208,7 +208,7 @@ Music2_CheckForNewSound: ; f811c (3e:411c) .no_new_sound ret -Music2_StopAllChannels: ; f814b (3e:414b) +Music2_StopAllChannels: ld a, [wdd8c] ld d, a xor a @@ -248,7 +248,7 @@ Music2_StopAllChannels: ; f814b (3e:414b) ret ; plays the song given by the id in a -Music2_BeginSong: ; f818c (3e:418c) +Music2_BeginSong: push af ld c, a ld b, $0 @@ -379,37 +379,37 @@ Music2_BeginSong: ; f818c (3e:418c) ld [wddf2], a ret -Music2_EmptyFunc: ; f82a4 (3e:42a4) +Music2_EmptyFunc: ret -Music2_UpdateChannel1: ; f82a5 (3e:42a5) +Music2_UpdateChannel1: ld a, [wMusicIsPlaying] or a - jr z, .asm_f82fa + jr z, .asm_f42fa ld a, [wddb7] cp $0 - jr z, .asm_f82d4 + jr z, .asm_f42d4 ld a, [wddc3] dec a ld [wddc3], a - jr nz, .asm_f82d4 + jr nz, .asm_f42d4 ld a, [wddbb] cp $1 - jr z, .asm_f82d4 + jr z, .asm_f42d4 ld a, [wdd8c] bit 0, a - jr nz, .asm_f82d4 + jr nz, .asm_f42d4 ld hl, rNR12 ld a, [wMusicEcho] ld [hli], a inc hl ld a, $80 ld [hl], a -.asm_f82d4 +.asm_f42d4 ld a, [wddbb] dec a ld [wddbb], a - jr nz, .asm_f82f4 + jr nz, .asm_f42f4 ld a, [wMusicChannelPointers + 1] ld h, a ld a, [wMusicChannelPointers] @@ -418,51 +418,51 @@ Music2_UpdateChannel1: ; f82a5 (3e:42a5) call Music2_PlayNextNote ld a, [wMusicIsPlaying] or a - jr z, .asm_f82fa - call Func_f8714 -.asm_f82f4 + jr z, .asm_f42fa + call Music2_f4714 +.asm_f42f4 ld a, $0 - call Func_f885a + call Music2_f485a ret -.asm_f82fa +.asm_f42fa ld a, [wdd8c] bit 0, a - jr nz, .asm_f8309 + jr nz, .asm_f4309 ld a, $8 ldh [rNR12], a swap a ldh [rNR14], a -.asm_f8309 +.asm_f4309 ret -Music2_UpdateChannel2: ; f830a (3e:430a) +Music2_UpdateChannel2: ld a, [wMusicIsPlaying + 1] or a - jr z, .asm_f835f + jr z, .asm_f435f ld a, [wddb8] cp $0 - jr z, .asm_f8339 + jr z, .asm_f4339 ld a, [wddc3 + 1] dec a ld [wddc3 + 1], a - jr nz, .asm_f8339 + jr nz, .asm_f4339 ld a, [wddbb + 1] cp $1 - jr z, .asm_f8339 + jr z, .asm_f4339 ld a, [wdd8c] bit 1, a - jr nz, .asm_f8339 + jr nz, .asm_f4339 ld hl, rNR22 ld a, [wMusicEcho + 1] ld [hli], a inc hl ld a, $80 ld [hl], a -.asm_f8339 +.asm_f4339 ld a, [wddbb + 1] dec a ld [wddbb + 1], a - jr nz, .asm_f8359 + jr nz, .asm_f4359 ld a, [wMusicChannelPointers + 3] ld h, a ld a, [wMusicChannelPointers + 2] @@ -471,47 +471,47 @@ Music2_UpdateChannel2: ; f830a (3e:430a) call Music2_PlayNextNote ld a, [wMusicIsPlaying + 1] or a - jr z, .asm_f835f - call Func_f875a -.asm_f8359 + jr z, .asm_f435f + call Music2_f475a +.asm_f4359 ld a, $1 - call Func_f885a + call Music2_f485a ret -.asm_f835f +.asm_f435f ld a, [wdd8c] bit 1, a - jr nz, .asm_f836e + jr nz, .asm_f436e ld a, $8 ldh [rNR22], a swap a ldh [rNR24], a -.asm_f836e +.asm_f436e ret -Music2_UpdateChannel3: ; f836f (3e:436f) +Music2_UpdateChannel3: ld a, [wMusicIsPlaying + 2] or a - jr z, .asm_f83be + jr z, .asm_f43be ld a, [wddb9] cp $0 - jr z, .asm_f8398 + jr z, .asm_f4398 ld a, [wddc3 + 2] dec a ld [wddc3 + 2], a - jr nz, .asm_f8398 + jr nz, .asm_f4398 ld a, [wdd8c] bit 2, a - jr nz, .asm_f8398 + jr nz, .asm_f4398 ld a, [wddbb + 2] cp $1 - jr z, .asm_f8398 + jr z, .asm_f4398 ld a, [wMusicEcho + 2] ldh [rNR32], a -.asm_f8398 +.asm_f4398 ld a, [wddbb + 2] dec a ld [wddbb + 2], a - jr nz, .asm_f83b8 + jr nz, .asm_f43b8 ld a, [wMusicChannelPointers + 5] ld h, a ld a, [wMusicChannelPointers + 4] @@ -520,31 +520,31 @@ Music2_UpdateChannel3: ; f836f (3e:436f) call Music2_PlayNextNote ld a, [wMusicIsPlaying + 2] or a - jr z, .asm_f83be - call Func_f879c -.asm_f83b8 + jr z, .asm_f43be + call Music2_f479c +.asm_f43b8 ld a, $2 - call Func_f885a + call Music2_f485a ret -.asm_f83be +.asm_f43be ld a, [wdd8c] bit 2, a - jr nz, .asm_f83cd + jr nz, .asm_f43cd ld a, $0 ldh [rNR32], a ld a, $80 ldh [rNR34], a -.asm_f83cd +.asm_f43cd ret -Music2_UpdateChannel4: ; f83ce (3e:43ce) +Music2_UpdateChannel4: ld a, [wMusicIsPlaying + 3] or a - jr z, .asm_f8400 + jr z, .asm_f4400 ld a, [wddbb + 3] dec a ld [wddbb + 3], a - jr nz, .asm_f83f6 + jr nz, .asm_f43f6 ld a, [wMusicChannelPointers + 7] ld h, a ld a, [wMusicChannelPointers + 6] @@ -553,29 +553,29 @@ Music2_UpdateChannel4: ; f83ce (3e:43ce) call Music2_PlayNextNote ld a, [wMusicIsPlaying + 3] or a - jr z, .asm_f8400 - call Func_f880a - jr .asm_f8413 -.asm_f83f6 + jr z, .asm_f4400 + call Music2_f480a + jr .asm_f4413 +.asm_f43f6 ld a, [wddef] or a - jr z, .asm_f8413 - call Func_f8839 + jr z, .asm_f4413 + call Music2_f4839 ret -.asm_f8400 +.asm_f4400 ld a, [wdd8c] bit 3, a - jr nz, .asm_f8413 + jr nz, .asm_f4413 xor a ld [wddef], a ld a, $8 ldh [rNR42], a swap a ldh [rNR44], a -.asm_f8413 +.asm_f4413 ret -Music2_PlayNextNote: ; f8414 (3e:4414) +Music2_PlayNextNote: ld a, [hli] push hl push af @@ -595,7 +595,7 @@ Music2_PlayNextNote: ; f8414 (3e:4414) pop af jp hl -Music2_CommandTable: ; f842c (3e:442c) +Music2_CommandTable: dw Music2_speed dw Music2_octave dw Music2_octave @@ -645,7 +645,7 @@ Music2_CommandTable: ; f842c (3e:442c) dw Music2_end dw Music2_end -Music2_note: ; f448c (3d:448c) +Music2_note: push af ld a, [hl] ld e, a @@ -653,7 +653,7 @@ Music2_note: ; f448c (3d:448c) add hl, bc ld a, [hl] cp $80 - jr z, .asm_f84b0 + jr z, .asm_f44b0 ld [hl], $1 xor a ld hl, wdddb @@ -669,7 +669,7 @@ Music2_note: ; f448c (3d:448c) ld hl, wMusicVibratoType add hl, bc ld [hl], a -.asm_f84b0 +.asm_f44b0 pop af push de ld hl, wMusicSpeed @@ -678,18 +678,18 @@ Music2_note: ; f448c (3d:448c) and $f inc a cp d - jr nc, .asm_f84c0 + jr nc, .asm_f44c0 ld e, a ld a, d ld d, e -.asm_f84c0 +.asm_f44c0 ld e, a -.asm_f84c1 +.asm_f44c1 dec d - jr z, .asm_f84c7 + jr z, .asm_f44c7 add e - jr .asm_f84c1 -.asm_f84c7 + jr .asm_f44c1 +.asm_f44c7 ld hl, wddbb add hl, bc ld [hl], a @@ -698,7 +698,7 @@ Music2_note: ; f448c (3d:448c) ld a, e cp $d9 ld a, d - jr z, .asm_f84fb + jr z, .asm_f44fb ld e, a ld hl, wMusicCutoff add hl, bc @@ -706,16 +706,16 @@ Music2_note: ; f448c (3d:448c) cp $8 ld d, a ld a, e - jr z, .asm_f84fb + jr z, .asm_f44fb push hl push bc ld b, $0 ld c, a ld hl, $0000 -.asm_f84e8 +.asm_f44e8 add hl, bc dec d - jr nz, .asm_f84e8 + jr nz, .asm_f44e8 srl h rr l srl h @@ -725,7 +725,7 @@ Music2_note: ; f448c (3d:448c) ld a, l pop bc pop hl -.asm_f84fb +.asm_f44fb ld hl, wddc3 add hl, bc ld [hl], a @@ -735,18 +735,18 @@ Music2_note: ; f448c (3d:448c) add hl, bc ld [hl], a or a - jr nz, .asm_f850e - jp .asm_f858e -.asm_f850e + jr nz, .asm_f450e + jp .asm_f458e +.asm_f450e swap a dec a ld h, a ld a, $3 cp c ld a, h - jr z, .asm_f851a - jr .asm_f8564 -.asm_f851a + jr z, .asm_f451a + jr .asm_f4564 +.asm_f451a push af ld hl, wMusicOctave add hl, bc @@ -798,8 +798,8 @@ Music2_note: ; f448c (3d:448c) ld [hl], d ld a, $1 ld [wddef], a - jr .asm_f858e -.asm_f8564 + jr .asm_f458e +.asm_f4564 ld hl, wMusicCh1CurPitch add hl, bc add hl, bc @@ -824,12 +824,12 @@ Music2_note: ; f448c (3d:448c) ld a, [hli] ld e, a ld d, [hl] - call Func_f8967 + call Music2_f4967 pop hl ld a, e ld [hli], a ld [hl], d -.asm_f858e +.asm_f458e pop de ld hl, wMusicChannelPointers add hl, bc @@ -839,7 +839,7 @@ Music2_note: ; f448c (3d:448c) ld [hl], d ret -Music2_speed: ; f8598 (3e:4598) +Music2_speed: pop hl ld a, [hli] push hl @@ -848,7 +848,7 @@ Music2_speed: ; f8598 (3e:4598) ld [hl], a jp Music2_PlayNextNote_pop -Music2_octave: ; f85a3 (3e:45a3) +Music2_octave: and $7 dec a ld hl, wMusicOctave @@ -856,35 +856,35 @@ Music2_octave: ; f85a3 (3e:45a3) push af ld a, c cp $2 - jr nz, .asm_f85b6 + jr nz, .asm_f45b6 pop af inc a ld [hl], a jp Music2_PlayNextNote_pop -.asm_f85b6 +.asm_f45b6 pop af ld [hl], a jp Music2_PlayNextNote_pop -Music2_inc_octave: ; f85bb (3e:45bb) +Music2_inc_octave: ld hl, wMusicOctave add hl, bc inc [hl] jp Music2_PlayNextNote_pop -Music2_dec_octave: ; f85c3 (3e:45c3) +Music2_dec_octave: ld hl, wMusicOctave add hl, bc dec [hl] jp Music2_PlayNextNote_pop -Music2_tie: ; f85cb (3e:45cb) +Music2_tie: ld hl, wMusicTie add hl, bc ld [hl], $80 jp Music2_PlayNextNote_pop -Music2_stereo_panning: ; f85d4 (3e:45d4) +Music2_stereo_panning: pop hl ld a, [hli] push hl @@ -907,7 +907,7 @@ Music2_stereo_panning: ; f85d4 (3e:45d4) pop bc jp Music2_PlayNextNote_pop -Music2_MainLoop: ; f85ef (3e:45ef) +Music2_MainLoop: pop de push de dec de @@ -919,7 +919,7 @@ Music2_MainLoop: ; f85ef (3e:45ef) ld [hl], d jp Music2_PlayNextNote_pop -Music2_EndMainLoop: ; f85fd (3e:45fd) +Music2_EndMainLoop: pop hl ld hl, wMusicMainLoopStart add hl, bc @@ -929,7 +929,7 @@ Music2_EndMainLoop: ; f85fd (3e:45fd) ld l, a jp Music2_PlayNextNote -Music2_Loop: ; f8609 (3e:4609) +Music2_Loop: pop de ld a, [de] ; get loop count inc de @@ -946,7 +946,7 @@ Music2_Loop: ; f8609 (3e:4609) call Music2_SetChannelStackPointer jp Music2_PlayNextNote_pop -Music2_EndLoop: ; f861e (3e:461e) +Music2_EndLoop: call Music2_GetChannelStackPointer dec hl ld a, [hl] ; get remaining loop count @@ -966,14 +966,14 @@ Music2_EndLoop: ; f861e (3e:461e) call Music2_SetChannelStackPointer jp Music2_PlayNextNote_pop -Music2_jp: ; f8638 (3e:4638) +Music2_jp: pop hl ld a, [hli] ld h, [hl] ld l, a jp Music2_PlayNextNote -Music2_call: ; f863f (3e:463f) +Music2_call: call Music2_GetChannelStackPointer pop de ld a, e @@ -991,7 +991,7 @@ Music2_call: ; f863f (3e:463f) call Music2_SetChannelStackPointer jp Music2_PlayNextNote_pop -Music2_ret: ; f8656 (3e:4656) +Music2_ret: pop de call Music2_GetChannelStackPointer dec hl @@ -1004,7 +1004,7 @@ Music2_ret: ; f8656 (3e:4656) call Music2_SetChannelStackPointer jp Music2_PlayNextNote_pop -Music2_frequency_offset: ; f8667 (3e:4667) +Music2_frequency_offset: pop de ld a, [de] inc de @@ -1015,7 +1015,7 @@ Music2_frequency_offset: ; f8667 (3e:4667) ld l, e jp Music2_PlayNextNote -Music2_duty: ; f8674 (3e:4674) +Music2_duty: pop de ld a, [de] and $c0 @@ -1027,7 +1027,7 @@ Music2_duty: ; f8674 (3e:4674) ld l, e jp Music2_PlayNextNote -Music2_volume: ; f8683 (3e:4683) +Music2_volume: pop de ld a, [de] inc de @@ -1038,7 +1038,7 @@ Music2_volume: ; f8683 (3e:4683) ld l, e jp Music2_PlayNextNote -Music2_wave: ; f8690 (3e:4690) +Music2_wave: pop de ld a, [de] inc de @@ -1049,7 +1049,7 @@ Music2_wave: ; f8690 (3e:4690) ld l, e jp Music2_PlayNextNote -Music2_cutoff: ; f86a0 (3e:46a0) +Music2_cutoff: pop de ld a, [de] inc de @@ -1060,7 +1060,7 @@ Music2_cutoff: ; f86a0 (3e:46a0) ld l, e jp Music2_PlayNextNote -Music2_echo: ; f86ad (3e:46ad) +Music2_echo: pop de ld a, [de] inc de @@ -1071,7 +1071,7 @@ Music2_echo: ; f86ad (3e:46ad) ld l, e jp Music2_PlayNextNote -Music2_vibrato_type: ; f86ba (3e:46ba) +Music2_vibrato_type: pop de ld a, [de] inc de @@ -1085,7 +1085,7 @@ Music2_vibrato_type: ; f86ba (3e:46ba) ld l, e jp Music2_PlayNextNote -Music2_vibrato_delay: ; f86cc (3e:46cc) +Music2_vibrato_delay: pop de ld a, [de] inc de @@ -1096,7 +1096,7 @@ Music2_vibrato_delay: ; f86cc (3e:46cc) ld l, e jp Music2_PlayNextNote -Music2_pitch_offset: ; f86d9 (3e:46d9) +Music2_pitch_offset: pop de ld a, [de] inc de @@ -1107,7 +1107,7 @@ Music2_pitch_offset: ; f86d9 (3e:46d9) ld l, e jp Music2_PlayNextNote -Music2_adjust_pitch_offset: ; f86e6 (3e:46e6) +Music2_adjust_pitch_offset: pop de ld a, [de] inc de @@ -1119,7 +1119,7 @@ Music2_adjust_pitch_offset: ; f86e6 (3e:46e6) ld l, e jp Music2_PlayNextNote -Music2_end: ; f86f4 (3e:46f4) +Music2_end: ld hl, wMusicIsPlaying add hl, bc ld [hl], $0 @@ -1129,7 +1129,7 @@ Music2_end: ; f86f4 (3e:46f4) ; returns the address of the top of the stack ; for the current channel ; used for loops and calls -Music2_GetChannelStackPointer: ; f86fc (3e:46fc) +Music2_GetChannelStackPointer: ld hl, wMusicChannelStackPointers add hl, bc add hl, bc @@ -1139,7 +1139,7 @@ Music2_GetChannelStackPointer: ; f86fc (3e:46fc) ret ; sets the current channel's stack pointer to hl -Music2_SetChannelStackPointer: ; f8705 (3e:4705) +Music2_SetChannelStackPointer: ld d, h ld e, l ld hl, wMusicChannelStackPointers @@ -1150,26 +1150,26 @@ Music2_SetChannelStackPointer: ; f8705 (3e:4705) ld [hl], d ret -Music2_PlayNextNote_pop: ; f8710 (3e:4710) +Music2_PlayNextNote_pop: pop hl jp Music2_PlayNextNote -Func_f8714: ; f8714 (3e:4714) +Music2_f4714: ld a, [wdd8c] bit 0, a - jr nz, .asm_f8749 + jr nz, .asm_f4749 ld a, [wddb7] cp $0 - jr z, .asm_f874a + jr z, .asm_f474a ld d, $0 ld hl, wMusicTie ld a, [hl] cp $80 - jr z, .asm_f8733 + jr z, .asm_f4733 ld a, [wMusicVolume] ldh [rNR12], a ld d, $80 -.asm_f8733 +.asm_f4733 ld [hl], $2 ld a, $8 ldh [rNR10], a @@ -1180,9 +1180,9 @@ Func_f8714: ; f8714 (3e:4714) ld a, [wMusicCh1CurOctave] or d ldh [rNR14], a -.asm_f8749 +.asm_f4749 ret -.asm_f874a +.asm_f474a ld hl, wMusicTie ld [hl], $0 ld hl, rNR12 @@ -1193,22 +1193,22 @@ Func_f8714: ; f8714 (3e:4714) ld [hl], a ret -Func_f875a: ; f875a (3e:475a) +Music2_f475a: ld a, [wdd8c] bit 1, a - jr nz, .asm_f878b + jr nz, .asm_f478b ld a, [wddb8] cp $0 - jr z, .asm_f878c + jr z, .asm_f478c ld d, $0 ld hl, wMusicTie + 1 ld a, [hl] cp $80 - jr z, .asm_f8779 + jr z, .asm_f4779 ld a, [wMusicVolume + 1] ldh [rNR22], a ld d, $80 -.asm_f8779 +.asm_f4779 ld [hl], $2 ld a, [wMusicDuty2] ldh [rNR21], a @@ -1217,9 +1217,9 @@ Func_f875a: ; f875a (3e:475a) ld a, [wMusicCh2CurOctave] or d ldh [rNR24], a -.asm_f878b +.asm_f478b ret -.asm_f878c +.asm_f478c ld hl, wMusicTie + 1 ld [hl], $0 ld hl, rNR22 @@ -1230,10 +1230,10 @@ Func_f875a: ; f875a (3e:475a) ld [hl], a ret -Func_f879c: ; f879c (3e:479c) +Music2_f479c: ld a, [wdd8c] bit 2, a - jr nz, .asm_f87e0 + jr nz, .asm_f47e0 ld d, $0 ld a, [wMusicWaveChange] or a @@ -1245,17 +1245,17 @@ Func_f879c: ; f879c (3e:479c) .no_wave_change ld a, [wddb9] cp $0 - jr z, .asm_f87e1 + jr z, .asm_f47e1 ld hl, wMusicTie + 2 ld a, [hl] cp $80 - jr z, .asm_f87cc + jr z, .asm_f47cc ld a, [wMusicVolume + 2] ldh [rNR32], a xor a ldh [rNR30], a ld d, $80 -.asm_f87cc +.asm_f47cc ld [hl], $2 xor a ldh [rNR31], a @@ -1266,16 +1266,16 @@ Func_f879c: ; f879c (3e:479c) ld a, [wMusicCh3CurOctave] or d ldh [rNR34], a -.asm_f87e0 +.asm_f47e0 ret -.asm_f87e1 +.asm_f47e1 ld hl, wMusicTie ld [hl], $0 xor a ldh [rNR30], a ret -Music2_LoadWaveInstrument: ; f879c (3e:47ea) +Music2_LoadWaveInstrument: ld a, [wMusicWave] add a ld d, $0 @@ -1299,13 +1299,13 @@ Music2_LoadWaveInstrument: ; f879c (3e:47ea) ld [wMusicWaveChange], a ret -Func_f880a: ; f880a (3e:480a) +Music2_f480a: ld a, [wdd8c] bit 3, a - jr nz, .asm_f8829 + jr nz, .asm_f4829 ld a, [wddba] cp $0 - jr z, asm_f882a + jr z, .asm_f482a ld de, rNR41 ld hl, wddab ld a, [hli] @@ -1319,9 +1319,9 @@ Func_f880a: ; f880a (3e:480a) inc e ld a, [hli] ld [de], a -.asm_f8829 +.asm_f4829 ret -asm_f882a: +.asm_f482a xor a ld [wddef], a ld hl, rNR42 @@ -1332,48 +1332,48 @@ asm_f882a: ld [hl], a ret -Func_f8839: ; f8839 (3e:4839) +Music2_f4839: ld a, [wdd8c] bit 3, a - jr z, .asm_f8846 + jr z, .asm_f4846 xor a ld [wddef], a - jr .asm_f8859 -.asm_f8846 + jr .asm_f4859 +.asm_f4846 ld hl, wdded ld a, [hli] ld d, [hl] ld e, a ld a, [de] cp $ff - jr nz, .asm_f8853 - jr asm_f882a -.asm_f8853 + jr nz, .asm_f4853 + jr Music2_f480a.asm_f482a +.asm_f4853 ldh [rNR43], a inc de ld a, d ld [hld], a ld [hl], e -.asm_f8859 +.asm_f4859 ret -Func_f885a: ; f885a (3e:485a) +Music2_f485a: push af ld b, $0 ld c, a - call Func_f8898 + call Music2_UpdateVibrato pop af - call Func_f890b + call Music2_f490b ret -Func_f8866: ; f8866 (3e:4866) +Music2_f4866: ld a, [wMusicPanning] ldh [rNR50], a ld a, [wdd8c] or a ld hl, wMusicStereoPanning ld a, [hli] - jr z, .asm_f8888 + jr z, .asm_f4888 ld a, [wdd8c] and $f ld d, a @@ -1388,7 +1388,7 @@ Func_f8866: ; f8866 (3e:4866) ld a, [hl] and e or d -.asm_f8888 +.asm_f4888 ld d, a ld a, [wddf0] xor $ff @@ -1400,19 +1400,19 @@ Func_f8866: ; f8866 (3e:4866) ldh [rNR51], a ret -Func_f8898: ; f8898 (3e:4898) +Music2_UpdateVibrato: ld hl, wMusicVibratoDelay add hl, bc ld a, [hl] cp $0 - jr z, .asm_f8902 + jr z, .asm_f4902 ld hl, wdde3 add hl, bc cp [hl] - jr z, .asm_f88ab + jr z, .asm_f48ab inc [hl] - jr .asm_f8902 -.asm_f88ab + jr .asm_f4902 +.asm_f48ab ld hl, wMusicVibratoType add hl, bc ld e, [hl] @@ -1433,7 +1433,7 @@ Func_f8898: ; f8898 (3e:4898) add hl, de ld a, [hli] cp $80 - jr z, .asm_f88ee + jr z, .asm_f48ee ld hl, wMusicCh1CurPitch add hl, bc add hl, bc @@ -1441,7 +1441,7 @@ Func_f8898: ; f8898 (3e:4898) inc hl ld d, [hl] bit 7, a - jr nz, .asm_f88df + jr nz, .asm_f48df add e ld e, a ld a, $0 @@ -1449,7 +1449,7 @@ Func_f8898: ; f8898 (3e:4898) and $7 ld d, a ret -.asm_f88df +.asm_f48df xor $ff inc a push bc @@ -1463,7 +1463,7 @@ Func_f8898: ; f8898 (3e:4898) ld d, a pop bc ret -.asm_f88ee +.asm_f48ee push hl ld hl, wdddb add hl, bc @@ -1471,12 +1471,12 @@ Func_f8898: ; f8898 (3e:4898) pop hl ld a, [hl] cp $80 - jr z, .asm_f88ab + jr z, .asm_f48ab ld hl, wMusicVibratoType add hl, bc ld [hl], a - jr .asm_f88ab -.asm_f8902 + jr .asm_f48ab +.asm_f4902 ld hl, wMusicCh1CurPitch add hl, bc add hl, bc @@ -1485,7 +1485,7 @@ Func_f8898: ; f8898 (3e:4898) ld d, [hl] ret -Func_f890b: ; f890b (3e:490b) +Music2_f490b: cp $0 jr nz, .not_channel_1 ld a, [wMusicVibratoDelay] @@ -1538,19 +1538,19 @@ Func_f890b: ; f890b (3e:490b) .done ret -Func_f8967: ; f8967 (3e:4967) +Music2_f4967: ld hl, wMusicFrequencyOffset add hl, bc ld a, [hl] bit 7, a - jr nz, .asm_f8976 + jr nz, .asm_f4976 add e ld e, a ld a, d adc b ld d, a ret -.asm_f8976 +.asm_f4976 xor $ff ld h, a ld a, e @@ -1561,38 +1561,38 @@ Func_f8967: ; f8967 (3e:4967) ld d, a ret -Func_f8980: ; f8980 (3e:4980) +Music2_f4980: ld a, [wdd8c] ld d, a bit 0, d - jr nz, .asm_f8990 + jr nz, .asm_f4990 ld a, $8 ldh [rNR12], a swap a ldh [rNR14], a -.asm_f8990 +.asm_f4990 bit 1, d - jr nz, .asm_f899c + jr nz, .asm_f499c swap a ldh [rNR22], a swap a ldh [rNR24], a -.asm_f899c +.asm_f499c bit 3, d - jr nz, .asm_f89a8 + jr nz, .asm_f49a8 swap a ldh [rNR42], a swap a ldh [rNR44], a -.asm_f89a8 +.asm_f49a8 bit 2, d - jr nz, .asm_f89b0 + jr nz, .asm_f49b0 ld a, $0 ldh [rNR32], a -.asm_f89b0 +.asm_f49b0 ret -Music2_CheckForEndOfSong: ; f89b1 (3e:49b1) +Music2_CheckForEndOfSong: ld hl, wMusicIsPlaying xor a add [hl] @@ -1608,23 +1608,23 @@ Music2_CheckForEndOfSong: ; f89b1 (3e:49b1) ld [wCurSongID], a ret -Music2_PauseSong: ; f89c4 (3e:49c4) +Music2_PauseSong: di - call Func_f8980 + call Music2_f4980 call Music2_BackupSong call Music2_StopAllChannels ei ret -Music2_ResumeSong: ; f89d0 (3e:49d0) +Music2_ResumeSong: di - call Func_f8980 + call Music2_f4980 call Music2_StopAllChannels call Music2_LoadBackup ei ret -Music2_BackupSong: ; f89dc (3e:49dc) +Music2_BackupSong: ld a, [wCurSongID] ld [wCurSongIDBackup], a ld a, [wCurSongBank] @@ -1732,7 +1732,7 @@ Music2_BackupSong: ; f89dc (3e:49dc) call Music2_CopyData ret -Music2_LoadBackup: ; f8b01 (3e:4b01) +Music2_LoadBackup: ld a, [wCurSongIDBackup] ld [wCurSongID], a ld a, [wCurSongBankBackup] @@ -1836,7 +1836,7 @@ Music2_LoadBackup: ; f8b01 (3e:4b01) ret ; copies a bytes from hl to de -Music2_CopyData: ; f8c18 (3e:4c18) +Music2_CopyData: ld c, a .loop ld a, [hli] @@ -1846,7 +1846,7 @@ Music2_CopyData: ; f8c18 (3e:4c18) jr nz, .loop ret -Music2_ChannelLoopStacks: ; f8c20 (3e:4c20) +Music2_ChannelLoopStacks: dw wMusicCh1Stack dw wMusicCh2Stack dw wMusicCh3Stack @@ -1854,7 +1854,7 @@ Music2_ChannelLoopStacks: ; f8c20 (3e:4c20) ; these are address offsets into the pitches table below ; offset = (12 notes per octave * 2 bytes per pitch) * octave -Music2_OctaveOffsets: ; f8c28 (3e:4c28) +Music2_OctaveOffsets: db (12 * 2) * 0 db (12 * 2) * 1 db (12 * 2) * 2 @@ -1864,7 +1864,7 @@ Music2_OctaveOffsets: ; f8c28 (3e:4c28) db (12 * 2) * 6 db (12 * 2) * 7 -Music2_Pitches: ; f8c30 (3e:4c30) +Music2_Pitches: dw $002c ; C_ 0 dw $009c ; C# 0 dw $0106 ; D_ 0 @@ -1951,17 +1951,17 @@ Music2_Pitches: ; f8c30 (3e:4c30) dw $07ef ; B_ 6 dw $07f0 ; C_ 7 -Music2_WaveInstruments: ; f8cda (3e:4cda) +Music2_WaveInstruments: INCLUDE "audio/wave_instruments.asm" -Music2_NoiseInstruments: ; f8d34 (3e:4d34) +Music2_NoiseInstruments: INCLUDE "audio/noise_instruments.asm" -Music2_VibratoTypes: ; f8dde (3e:4dde) +Music2_VibratoTypes: INCLUDE "audio/vibrato_types.asm" ; all real SFX have the same priority (SFX_STOP does not use this table) -Music2_SFXPriorities: ; f8e85 (3e:4e85) +Music2_SFXPriorities: db $00, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a db $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a db $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a, $0a diff --git a/src/audio/music2_headers.asm b/src/audio/music2_headers.asm index 3a088f7..abf676f 100644 --- a/src/audio/music2_headers.asm +++ b/src/audio/music2_headers.asm @@ -1,7 +1,7 @@ -NumberOfSongs2: ; f8ee5 (3e:4ee5) +NumberOfSongs2: db $1f -SongBanks2: ; f8ee6 (3e:4ee6) +SongBanks2: db BANK(Music_Stop) db BANK(Music_TitleScreen) db BANK(Music_DuelTheme1) @@ -34,7 +34,7 @@ SongBanks2: ; f8ee6 (3e:4ee6) db BANK(Music_Medal) db BANK(Music_Unused1e) -SongHeaderPointers2: ; f8f05 (3e:4f05) +SongHeaderPointers2: dw Music_Stop dw NULL dw NULL @@ -105,7 +105,7 @@ SongHeaderPointers2: ; f8f05 (3e:4f05) dw NULL dw NULL -Music_PCMainMenu: ; f8f71 (3e:4f71) +Music_PCMainMenu: db %1111 dw Music_PCMainMenu_Ch1 dw Music_PCMainMenu_Ch2 @@ -133,63 +133,63 @@ Music_PCMainMenu: ; f8f71 (3e:4f71) dw NULL dw NULL -Music_PokemonDome: ; f8f95 (3e:4f95) +Music_PokemonDome: db %1111 dw Music_PokemonDome_Ch1 dw Music_PokemonDome_Ch2 dw Music_PokemonDome_Ch3 dw Music_PokemonDome_Ch4 -Music_ChallengeHall: ; f8f9e (3e:4f9e) +Music_ChallengeHall: db %1111 dw Music_ChallengeHall_Ch1 dw Music_ChallengeHall_Ch2 dw Music_ChallengeHall_Ch3 dw Music_ChallengeHall_Ch4 -Music_Club1: ; f8fa7 (3e:4fa7) +Music_Club1: db %1111 dw Music_Club1_Ch1 dw Music_Club1_Ch2 dw Music_Club1_Ch3 dw Music_Club1_Ch4 -Music_Club2: ; f8fb0 (3e:4fb0) +Music_Club2: db %0111 dw Music_Club2_Ch1 dw Music_Club2_Ch2 dw Music_Club2_Ch3 dw NULL -Music_Club3: ; f8fb9 (3e:4fb9) +Music_Club3: db %1111 dw Music_Club3_Ch1 dw Music_Club3_Ch2 dw Music_Club3_Ch3 dw Music_Club3_Ch4 -Music_Ronald: ; f8fc2 (3e:4fc2) +Music_Ronald: db %1111 dw Music_Ronald_Ch1 dw Music_Ronald_Ch2 dw Music_Ronald_Ch3 dw Music_Ronald_Ch4 -Music_Imakuni: ; f8fcb (3e:4fcb) +Music_Imakuni: db %1111 dw Music_Imakuni_Ch1 dw Music_Imakuni_Ch2 dw Music_Imakuni_Ch3 dw Music_Imakuni_Ch4 -Music_HallOfHonor: ; f8fd4 (3e:4fd4) +Music_HallOfHonor: db %0111 dw Music_HallOfHonor_Ch1 dw Music_HallOfHonor_Ch2 dw Music_HallOfHonor_Ch3 dw NULL -Music_Credits: ; f8fdd (3e:4fdd) +Music_Credits: db %1111 dw Music_Credits_Ch1 dw Music_Credits_Ch2 diff --git a/src/audio/sfx.asm b/src/audio/sfx.asm index 9d3818c..7e0a71b 100644 --- a/src/audio/sfx.asm +++ b/src/audio/sfx.asm @@ -1,10 +1,10 @@ -SFX_PlaySFX: ; fc000 (3f:4000) +SFX_PlaySFX: jp SFX_Play -SFX_UpdateSFX: ; fc003 (3f:4003) +SFX_UpdateSFX: jp SFX_Update -SFX_Play: ; fc006 (3f:4006) +SFX_Play: ld hl, NumberOfSFX cp [hl] jr nc, .invalidID @@ -59,7 +59,7 @@ SFX_Play: ; fc006 (3f:4006) .invalidID ret -SFX_Update: ; fc059 (3f:4059) +SFX_Update: ld a, [wdd8c] or a jr nz, .asm_fc063 @@ -100,7 +100,7 @@ SFX_Update: ; fc059 (3f:4059) jr nz, .asm_fc06c ret -Func_fc094: ; fc094 (3f:4094) +Func_fc094: ld a, [hl] and $f0 swap a @@ -119,7 +119,7 @@ Func_fc094: ; fc094 (3f:4094) ld l, e jp hl -SFX_CommandTable: ; fc0ab (3f:40ab) +SFX_CommandTable: dw SFX_0 dw SFX_1 dw SFX_2 @@ -137,10 +137,10 @@ SFX_CommandTable: ; fc0ab (3f:40ab) dw SFX_unused dw SFX_end -SFX_unused: ; fc0cb (3f:40cb) +SFX_unused: jp Func_fc094 -SFX_0: ; fc0ce (3f:40ce) +SFX_0: ld d, a pop hl ld a, [hli] @@ -185,7 +185,7 @@ SFX_0: ; fc0ce (3f:40ce) ld [hli], a ld [hl], d pop de -Func_fc105: ; fc105 (3f:4105) +Func_fc105: ld hl, wde4b add hl, bc add hl, bc @@ -194,7 +194,7 @@ Func_fc105: ; fc105 (3f:4105) ld [hl], d ret -SFX_1: ; fc10e (3f:410e) +SFX_1: ld hl, wde2b add hl, bc ld a, $80 @@ -214,7 +214,7 @@ SFX_1: ; fc10e (3f:410e) pop hl jp Func_fc094 -SFX_2: ; fc127 (3f:4127) +SFX_2: swap a ld e, a ld hl, rNR11 @@ -228,7 +228,7 @@ SFX_2: ; fc127 (3f:4127) pop hl jp Func_fc094 -SFX_loop: ; fc138 (3f:4138) +SFX_loop: ld hl, wde43 add hl, bc add hl, bc @@ -245,7 +245,7 @@ SFX_loop: ; fc138 (3f:4138) ld h, d jp Func_fc094 -SFX_endloop: ; fc14d (3f:414d) +SFX_endloop: ld hl, wde3f add hl, bc ld a, [hl] @@ -264,7 +264,7 @@ SFX_endloop: ; fc14d (3f:414d) pop hl jp Func_fc094 -SFX_5: ; fc166 (3f:4166) +SFX_5: ld hl, wde2f add hl, bc ld e, l @@ -274,7 +274,7 @@ SFX_5: ; fc166 (3f:4166) ld [de], a jp Func_fc094 -SFX_6: ; fc172 (3f:4172) +SFX_6: ld a, c cp $3 jr nz, .asm_fc17c @@ -294,7 +294,7 @@ SFX_6: ; fc172 (3f:4172) ld d, h jp Func_fc105 -Func_fc18d: ; fc18d (3f:418d) +Func_fc18d: ld hl, wde2f add hl, bc ld a, [hl] @@ -348,7 +348,7 @@ Func_fc18d: ; fc18d (3f:418d) .asm_fc1cc ret -Func_fc1cd: ; fc1cd (3f:41cd) +Func_fc1cd: ld hl, wde32 ld a, [hl] or a @@ -390,7 +390,7 @@ Func_fc1cd: ; fc1cd (3f:41cd) .asm_fc201 ret -SFX_7: ; fc202 (3f:4202) +SFX_7: add a ld d, $0 ld e, a @@ -419,7 +419,7 @@ SFX_7: ; fc202 (3f:4202) pop hl jp Func_fc094 -SFX_8: ; fc22d (3f:422d) +SFX_8: pop hl ld a, [hli] push hl @@ -443,7 +443,7 @@ SFX_8: ; fc22d (3f:422d) pop hl jp Func_fc094 -SFX_end: ; fc249 (3f:4249) +SFX_end: ld e, c inc e ld a, $7f @@ -471,7 +471,7 @@ SFX_end: ; fc249 (3f:4249) pop hl ret -Func_fc26c: ; fc26c (3f:426c) +Func_fc26c: xor a ld [wde53], a ld [wSfxPriority], a @@ -479,7 +479,7 @@ Func_fc26c: ; fc26c (3f:426c) ld [wCurSfxID], a ret -Func_fc279: ; fc279 (3f:4279) +Func_fc279: ld a, $8 ldh a, [rNR12] ldh a, [rNR22] @@ -495,7 +495,7 @@ Func_fc279: ; fc279 (3f:4279) INCLUDE "audio/sfx_headers.asm" -SFX_WaveInstruments: ; fc485 (3f:4485) +SFX_WaveInstruments: INCLUDE "audio/wave_instruments.asm" INCLUDE "audio/sfx/sfx_01.asm" diff --git a/src/audio/sfx/sfx_01.asm b/src/audio/sfx/sfx_01.asm index 9e5c060..2c97f62 100644 --- a/src/audio/sfx/sfx_01.asm +++ b/src/audio/sfx/sfx_01.asm @@ -1,4 +1,4 @@ -Sfx01_Ch1: ; fc4df (3f:44df) +Sfx01_Ch1: sfx_1 196 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_02.asm b/src/audio/sfx/sfx_02.asm index 02f6c5d..3f08f82 100644 --- a/src/audio/sfx/sfx_02.asm +++ b/src/audio/sfx/sfx_02.asm @@ -1,4 +1,4 @@ -Sfx02_Ch1: ; fc4f7 (3f:44f7) +Sfx02_Ch1: sfx_1 194 sfx_8 17 sfx_2 8 diff --git a/src/audio/sfx/sfx_03.asm b/src/audio/sfx/sfx_03.asm index 6ad742f..7ddb211 100644 --- a/src/audio/sfx/sfx_03.asm +++ b/src/audio/sfx/sfx_03.asm @@ -1,4 +1,4 @@ -Sfx03_Ch1: ; fc539 (3f:4539) +Sfx03_Ch1: sfx_1 212 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_04.asm b/src/audio/sfx/sfx_04.asm index c7bb86e..34976e8 100644 --- a/src/audio/sfx/sfx_04.asm +++ b/src/audio/sfx/sfx_04.asm @@ -1,4 +1,4 @@ -Sfx04_Ch1: ; fc573 (3f:4573) +Sfx04_Ch1: sfx_1 240 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_05.asm b/src/audio/sfx/sfx_05.asm index 1a26798..4808a9c 100644 --- a/src/audio/sfx/sfx_05.asm +++ b/src/audio/sfx/sfx_05.asm @@ -1,4 +1,4 @@ -Sfx05_Ch1: ; fc59d (3f:459d) +Sfx05_Ch1: sfx_1 241 sfx_8 17 sfx_2 8 diff --git a/src/audio/sfx/sfx_06.asm b/src/audio/sfx/sfx_06.asm index f5d12ab..316d51a 100644 --- a/src/audio/sfx/sfx_06.asm +++ b/src/audio/sfx/sfx_06.asm @@ -1,4 +1,4 @@ -Sfx06_Ch1: ; fc625 (3f:4625) +Sfx06_Ch1: sfx_1 241 sfx_8 17 sfx_2 8 diff --git a/src/audio/sfx/sfx_07.asm b/src/audio/sfx/sfx_07.asm index e3de8e6..19a9dd1 100644 --- a/src/audio/sfx/sfx_07.asm +++ b/src/audio/sfx/sfx_07.asm @@ -1,4 +1,4 @@ -Sfx07_Ch1: ; fc6c2 (3f:46c2) +Sfx07_Ch1: sfx_8 17 sfx_loop 2 sfx_1 240 diff --git a/src/audio/sfx/sfx_08.asm b/src/audio/sfx/sfx_08.asm index c5cab85..7ea87bf 100644 --- a/src/audio/sfx/sfx_08.asm +++ b/src/audio/sfx/sfx_08.asm @@ -1,4 +1,4 @@ -Sfx08_Ch1: ; fc6f6 (3f:46f6) +Sfx08_Ch1: sfx_8 17 sfx_1 224 sfx_0 0, 64 diff --git a/src/audio/sfx/sfx_09.asm b/src/audio/sfx/sfx_09.asm index a280894..3300fe2 100644 --- a/src/audio/sfx/sfx_09.asm +++ b/src/audio/sfx/sfx_09.asm @@ -1,4 +1,4 @@ -Sfx09_Ch1: ; fc725 (3f:4725) +Sfx09_Ch1: sfx_8 17 sfx_1 224 sfx_0 0, 65 diff --git a/src/audio/sfx/sfx_0a.asm b/src/audio/sfx/sfx_0a.asm index 97e6d47..c71c5d3 100644 --- a/src/audio/sfx/sfx_0a.asm +++ b/src/audio/sfx/sfx_0a.asm @@ -1,4 +1,4 @@ -Sfx0a_Ch1: ; fc78a (3f:478a) +Sfx0a_Ch1: sfx_8 17 sfx_1 228 sfx_2 0 diff --git a/src/audio/sfx/sfx_0b.asm b/src/audio/sfx/sfx_0b.asm index f350c2d..f6834be 100644 --- a/src/audio/sfx/sfx_0b.asm +++ b/src/audio/sfx/sfx_0b.asm @@ -1,4 +1,4 @@ -Sfx0b_Ch1: ; fc813 (3f:4813) +Sfx0b_Ch1: sfx_8 17 sfx_1 239 sfx_2 0 diff --git a/src/audio/sfx/sfx_0c.asm b/src/audio/sfx/sfx_0c.asm index 779ee3d..6071925 100644 --- a/src/audio/sfx/sfx_0c.asm +++ b/src/audio/sfx/sfx_0c.asm @@ -1,4 +1,4 @@ -Sfx0c_Ch1: ; fc8bd (3f:48bd) +Sfx0c_Ch1: sfx_8 17 sfx_loop 2 sfx_1 225 diff --git a/src/audio/sfx/sfx_0d.asm b/src/audio/sfx/sfx_0d.asm index 5a2d2a8..f78fdbe 100644 --- a/src/audio/sfx/sfx_0d.asm +++ b/src/audio/sfx/sfx_0d.asm @@ -1,4 +1,4 @@ -Sfx0d_Ch1: ; fc8f3 (3f:48f3) +Sfx0d_Ch1: sfx_loop 5 sfx_8 17 sfx_1 159 diff --git a/src/audio/sfx/sfx_0e.asm b/src/audio/sfx/sfx_0e.asm index 1641beb..4edbbcd 100644 --- a/src/audio/sfx/sfx_0e.asm +++ b/src/audio/sfx/sfx_0e.asm @@ -1,4 +1,4 @@ -Sfx0e_Ch1: ; fc953 (3f:4953) +Sfx0e_Ch1: sfx_8 17 sfx_1 207 sfx_2 0 diff --git a/src/audio/sfx/sfx_0f.asm b/src/audio/sfx/sfx_0f.asm index 712a508..7ebe4a4 100644 --- a/src/audio/sfx/sfx_0f.asm +++ b/src/audio/sfx/sfx_0f.asm @@ -1,4 +1,4 @@ -Sfx0f_Ch1: ; fc9b4 (3f:49b4) +Sfx0f_Ch1: sfx_8 17 sfx_1 225 sfx_0 0, 82 diff --git a/src/audio/sfx/sfx_10.asm b/src/audio/sfx/sfx_10.asm index 47c4b87..f25fa08 100644 --- a/src/audio/sfx/sfx_10.asm +++ b/src/audio/sfx/sfx_10.asm @@ -1,4 +1,4 @@ -Sfx10_Ch1: ; fc9fb (3f:49fb) +Sfx10_Ch1: sfx_loop 5 sfx_8 17 sfx_1 55 diff --git a/src/audio/sfx/sfx_11.asm b/src/audio/sfx/sfx_11.asm index 6388467..8de8635 100644 --- a/src/audio/sfx/sfx_11.asm +++ b/src/audio/sfx/sfx_11.asm @@ -1,4 +1,4 @@ -Sfx11_Ch1: ; fca82 (3f:4a82) +Sfx11_Ch1: sfx_8 17 sfx_1 241 sfx_2 0 diff --git a/src/audio/sfx/sfx_12.asm b/src/audio/sfx/sfx_12.asm index 3b6b905..c84b793 100644 --- a/src/audio/sfx/sfx_12.asm +++ b/src/audio/sfx/sfx_12.asm @@ -1,4 +1,4 @@ -Sfx12_Ch1: ; fcb2d (3f:4b2d) +Sfx12_Ch1: sfx_1 228 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_13.asm b/src/audio/sfx/sfx_13.asm index a5e3dd1..228ad73 100644 --- a/src/audio/sfx/sfx_13.asm +++ b/src/audio/sfx/sfx_13.asm @@ -1,4 +1,4 @@ -Sfx13_Ch1: ; fcb72 (3f:4b72) +Sfx13_Ch1: sfx_1 228 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_14.asm b/src/audio/sfx/sfx_14.asm index e1e364f..e9518f8 100644 --- a/src/audio/sfx/sfx_14.asm +++ b/src/audio/sfx/sfx_14.asm @@ -1,4 +1,4 @@ -Sfx14_Ch1: ; fcc80 (3f:4c80) +Sfx14_Ch1: sfx_1 228 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_15.asm b/src/audio/sfx/sfx_15.asm index e19ed92..89b1e27 100644 --- a/src/audio/sfx/sfx_15.asm +++ b/src/audio/sfx/sfx_15.asm @@ -1,4 +1,4 @@ -Sfx15_Ch1: ; fcd2f (3f:4d2f) +Sfx15_Ch1: sfx_1 239 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_16.asm b/src/audio/sfx/sfx_16.asm index ea3fd47..78f0202 100644 --- a/src/audio/sfx/sfx_16.asm +++ b/src/audio/sfx/sfx_16.asm @@ -1,4 +1,4 @@ -Sfx16_Ch1: ; fcd71 (3f:4d71) +Sfx16_Ch1: sfx_8 17 sfx_1 241 sfx_0 0, 45 diff --git a/src/audio/sfx/sfx_17.asm b/src/audio/sfx/sfx_17.asm index d541d9a..6b0054b 100644 --- a/src/audio/sfx/sfx_17.asm +++ b/src/audio/sfx/sfx_17.asm @@ -1,4 +1,4 @@ -Sfx17_Ch1: ; fcdb0 (3f:4db0) +Sfx17_Ch1: sfx_8 17 sfx_1 241 sfx_0 0, 45 diff --git a/src/audio/sfx/sfx_18.asm b/src/audio/sfx/sfx_18.asm index 4be29f7..717bd6e 100644 --- a/src/audio/sfx/sfx_18.asm +++ b/src/audio/sfx/sfx_18.asm @@ -1,4 +1,4 @@ -Sfx18_Ch1: ; fce31 (3f:4e31) +Sfx18_Ch1: sfx_8 17 sfx_1 192 sfx_0 0, 81 diff --git a/src/audio/sfx/sfx_19.asm b/src/audio/sfx/sfx_19.asm index dde7b50..a10fe3d 100644 --- a/src/audio/sfx/sfx_19.asm +++ b/src/audio/sfx/sfx_19.asm @@ -1,4 +1,4 @@ -Sfx19_Ch1: ; fce98 (3f:4e98) +Sfx19_Ch1: sfx_8 17 sfx_1 240 sfx_0 0, 98 diff --git a/src/audio/sfx/sfx_1a.asm b/src/audio/sfx/sfx_1a.asm index 5fa7d5c..1de5319 100644 --- a/src/audio/sfx/sfx_1a.asm +++ b/src/audio/sfx/sfx_1a.asm @@ -1,4 +1,4 @@ -Sfx1a_Ch1: ; fcf1d (3f:4f1d) +Sfx1a_Ch1: sfx_8 17 sfx_1 97 sfx_loop 2 diff --git a/src/audio/sfx/sfx_1b.asm b/src/audio/sfx/sfx_1b.asm index 5b598cc..a17a96e 100644 --- a/src/audio/sfx/sfx_1b.asm +++ b/src/audio/sfx/sfx_1b.asm @@ -1,4 +1,4 @@ -Sfx1b_Ch1: ; fcf5d (3f:4f5d) +Sfx1b_Ch1: sfx_8 17 sfx_1 240 sfx_0 0, 80 diff --git a/src/audio/sfx/sfx_1c.asm b/src/audio/sfx/sfx_1c.asm index 51bc45a..020a4eb 100644 --- a/src/audio/sfx/sfx_1c.asm +++ b/src/audio/sfx/sfx_1c.asm @@ -1,4 +1,4 @@ -Sfx1c_Ch1: ; fd001 (3f:5001) +Sfx1c_Ch1: sfx_8 17 sfx_1 111 sfx_0 0, 84 diff --git a/src/audio/sfx/sfx_1d.asm b/src/audio/sfx/sfx_1d.asm index 13b4baf..4fad86b 100644 --- a/src/audio/sfx/sfx_1d.asm +++ b/src/audio/sfx/sfx_1d.asm @@ -1,4 +1,4 @@ -Sfx1d_Ch1: ; fd0c0 (3f:50c0) +Sfx1d_Ch1: sfx_8 17 sfx_1 111 sfx_0 0, 84 diff --git a/src/audio/sfx/sfx_1e.asm b/src/audio/sfx/sfx_1e.asm index ed95135..e55b01a 100644 --- a/src/audio/sfx/sfx_1e.asm +++ b/src/audio/sfx/sfx_1e.asm @@ -1,4 +1,4 @@ -Sfx1e_Ch1: ; fd185 (3f:5185) +Sfx1e_Ch1: sfx_8 17 sfx_1 111 sfx_0 0, 84 diff --git a/src/audio/sfx/sfx_1f.asm b/src/audio/sfx/sfx_1f.asm index 7e96314..051e7b7 100644 --- a/src/audio/sfx/sfx_1f.asm +++ b/src/audio/sfx/sfx_1f.asm @@ -1,4 +1,4 @@ -Sfx1f_Ch1: ; fd28a (3f:528a) +Sfx1f_Ch1: sfx_8 17 sfx_1 111 sfx_0 0, 84 diff --git a/src/audio/sfx/sfx_20.asm b/src/audio/sfx/sfx_20.asm index 22b1caa..8c553e4 100644 --- a/src/audio/sfx/sfx_20.asm +++ b/src/audio/sfx/sfx_20.asm @@ -1,4 +1,4 @@ -Sfx20_Ch1: ; fd33b (3f:533b) +Sfx20_Ch1: sfx_8 17 sfx_loop 2 sfx_1 111 diff --git a/src/audio/sfx/sfx_21.asm b/src/audio/sfx/sfx_21.asm index b99d444..f668c68 100644 --- a/src/audio/sfx/sfx_21.asm +++ b/src/audio/sfx/sfx_21.asm @@ -1,4 +1,4 @@ -Sfx21_Ch1: ; fd3bd (3f:53bd) +Sfx21_Ch1: sfx_8 17 sfx_1 111 sfx_0 0, 81 diff --git a/src/audio/sfx/sfx_22.asm b/src/audio/sfx/sfx_22.asm index 4c0c599..6f5da30 100644 --- a/src/audio/sfx/sfx_22.asm +++ b/src/audio/sfx/sfx_22.asm @@ -1,4 +1,4 @@ -Sfx22_Ch1: ; fd44e (3f:544e) +Sfx22_Ch1: sfx_8 17 sfx_loop 2 sfx_1 111 diff --git a/src/audio/sfx/sfx_23.asm b/src/audio/sfx/sfx_23.asm index 14fe256..9b17e55 100644 --- a/src/audio/sfx/sfx_23.asm +++ b/src/audio/sfx/sfx_23.asm @@ -1,4 +1,4 @@ -Sfx23_Ch1: ; fd4ca (3f:54ca) +Sfx23_Ch1: sfx_8 17 sfx_1 246 sfx_0 0, 132 diff --git a/src/audio/sfx/sfx_24.asm b/src/audio/sfx/sfx_24.asm index 9b6f4a5..2eb699f 100644 --- a/src/audio/sfx/sfx_24.asm +++ b/src/audio/sfx/sfx_24.asm @@ -1,4 +1,4 @@ -Sfx24_Ch1: ; fd5bd (3f:55bd) +Sfx24_Ch1: sfx_8 17 sfx_1 111 sfx_loop 80 diff --git a/src/audio/sfx/sfx_25.asm b/src/audio/sfx/sfx_25.asm index 0a66ea0..e51bf0f 100644 --- a/src/audio/sfx/sfx_25.asm +++ b/src/audio/sfx/sfx_25.asm @@ -1,4 +1,4 @@ -Sfx25_Ch1: ; fd617 (3f:5617) +Sfx25_Ch1: sfx_1 207 sfx_8 17 sfx_2 8 diff --git a/src/audio/sfx/sfx_26.asm b/src/audio/sfx/sfx_26.asm index 730ebf4..580c80c 100644 --- a/src/audio/sfx/sfx_26.asm +++ b/src/audio/sfx/sfx_26.asm @@ -1,4 +1,4 @@ -Sfx26_Ch1: ; fd6f2 (3f:56f2) +Sfx26_Ch1: sfx_1 255 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_27.asm b/src/audio/sfx/sfx_27.asm index 39a9d1e..61bc446 100644 --- a/src/audio/sfx/sfx_27.asm +++ b/src/audio/sfx/sfx_27.asm @@ -1,4 +1,4 @@ -Sfx27_Ch1: ; fd769 (3f:5769) +Sfx27_Ch1: sfx_1 84 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_28.asm b/src/audio/sfx/sfx_28.asm index 6939d2d..f02b99f 100644 --- a/src/audio/sfx/sfx_28.asm +++ b/src/audio/sfx/sfx_28.asm @@ -1,4 +1,4 @@ -Sfx28_Ch1: ; fd799 (3f:5799) +Sfx28_Ch1: sfx_1 100 sfx_8 17 sfx_2 4 @@ -22,7 +22,7 @@ Sfx28_Ch1: ; fd799 (3f:5799) sfx_0 7, 131 sfx_end -Sfx28_Ch2: ; fd7bf (3f:57bf) +Sfx28_Ch2: sfx_8 17 sfx_1 255 sfx_1 0 diff --git a/src/audio/sfx/sfx_29.asm b/src/audio/sfx/sfx_29.asm index 133ca0e..ac0f707 100644 --- a/src/audio/sfx/sfx_29.asm +++ b/src/audio/sfx/sfx_29.asm @@ -1,4 +1,4 @@ -Sfx29_Ch1: ; fd834 (3f:5834) +Sfx29_Ch1: sfx_8 17 sfx_1 223 sfx_loop 40 diff --git a/src/audio/sfx/sfx_2a.asm b/src/audio/sfx/sfx_2a.asm index aad607c..86ad3af 100644 --- a/src/audio/sfx/sfx_2a.asm +++ b/src/audio/sfx/sfx_2a.asm @@ -1,4 +1,4 @@ -Sfx2a_Ch1: ; fd866 (3f:5866) +Sfx2a_Ch1: sfx_8 17 sfx_1 223 sfx_loop 4 diff --git a/src/audio/sfx/sfx_2b.asm b/src/audio/sfx/sfx_2b.asm index de76337..1fdbd8b 100644 --- a/src/audio/sfx/sfx_2b.asm +++ b/src/audio/sfx/sfx_2b.asm @@ -1,4 +1,4 @@ -Sfx2b_Ch1: ; fd8c4 (3f:58c4) +Sfx2b_Ch1: sfx_1 255 sfx_8 17 sfx_2 8 diff --git a/src/audio/sfx/sfx_2c.asm b/src/audio/sfx/sfx_2c.asm index 6764eb1..7df4d3d 100644 --- a/src/audio/sfx/sfx_2c.asm +++ b/src/audio/sfx/sfx_2c.asm @@ -1,4 +1,4 @@ -Sfx2c_Ch1: ; fd96f (3f:596f) +Sfx2c_Ch1: sfx_1 255 sfx_8 17 sfx_2 8 diff --git a/src/audio/sfx/sfx_2d.asm b/src/audio/sfx/sfx_2d.asm index 8098548..7a4ad8f 100644 --- a/src/audio/sfx/sfx_2d.asm +++ b/src/audio/sfx/sfx_2d.asm @@ -1,4 +1,4 @@ -Sfx2d_Ch1: ; fd9ab (3f:59ab) +Sfx2d_Ch1: sfx_8 17 sfx_1 223 sfx_0 0, 36 diff --git a/src/audio/sfx/sfx_2e.asm b/src/audio/sfx/sfx_2e.asm index b4a1926..1a94763 100644 --- a/src/audio/sfx/sfx_2e.asm +++ b/src/audio/sfx/sfx_2e.asm @@ -1,4 +1,4 @@ -Sfx2e_Ch1: ; fd9f4 (3f:59f4) +Sfx2e_Ch1: sfx_8 17 sfx_1 223 sfx_0 0, 36 diff --git a/src/audio/sfx/sfx_2f.asm b/src/audio/sfx/sfx_2f.asm index 1a499c6..b93070b 100644 --- a/src/audio/sfx/sfx_2f.asm +++ b/src/audio/sfx/sfx_2f.asm @@ -1,4 +1,4 @@ -Sfx2f_Ch1: ; fda5c (3f:5a5c) +Sfx2f_Ch1: sfx_8 17 sfx_1 214 sfx_0 0, 36 diff --git a/src/audio/sfx/sfx_30.asm b/src/audio/sfx/sfx_30.asm index b560790..101a383 100644 --- a/src/audio/sfx/sfx_30.asm +++ b/src/audio/sfx/sfx_30.asm @@ -1,4 +1,4 @@ -Sfx30_Ch1: ; fdb03 (3f:5b03) +Sfx30_Ch1: sfx_8 17 sfx_loop 8 sfx_1 129 diff --git a/src/audio/sfx/sfx_31.asm b/src/audio/sfx/sfx_31.asm index a7c8414..f912f97 100644 --- a/src/audio/sfx/sfx_31.asm +++ b/src/audio/sfx/sfx_31.asm @@ -1,4 +1,4 @@ -Sfx31_Ch1: ; fdb1e (3f:5b1e) +Sfx31_Ch1: sfx_8 17 sfx_1 111 sfx_2 0 diff --git a/src/audio/sfx/sfx_32.asm b/src/audio/sfx/sfx_32.asm index da39247..6e1ae02 100644 --- a/src/audio/sfx/sfx_32.asm +++ b/src/audio/sfx/sfx_32.asm @@ -1,4 +1,4 @@ -Sfx32_Ch1: ; fdbdb (3f:5bdb) +Sfx32_Ch1: sfx_1 143 sfx_8 17 sfx_2 8 @@ -193,7 +193,7 @@ Sfx32_Ch1: ; fdbdb (3f:5bdb) sfx_0 7, 157 sfx_end -Sfx32_Ch2: ; fdd3e (3f:5d3e) +Sfx32_Ch2: sfx_8 17 sfx_1 223 sfx_1 0 diff --git a/src/audio/sfx/sfx_33.asm b/src/audio/sfx/sfx_33.asm index f1c9319..0ceca9f 100644 --- a/src/audio/sfx/sfx_33.asm +++ b/src/audio/sfx/sfx_33.asm @@ -1,4 +1,4 @@ -Sfx33_Ch1: ; fdddd (3f:5ddd) +Sfx33_Ch1: sfx_1 255 sfx_8 17 sfx_2 0 @@ -76,7 +76,7 @@ Sfx33_Ch1: ; fdddd (3f:5ddd) sfx_1 255 sfx_end -Sfx33_Ch2: ; fde73 (3f:5e73) +Sfx33_Ch2: sfx_8 17 sfx_1 223 sfx_1 0 diff --git a/src/audio/sfx/sfx_34.asm b/src/audio/sfx/sfx_34.asm index 41c6b64..94e1a75 100644 --- a/src/audio/sfx/sfx_34.asm +++ b/src/audio/sfx/sfx_34.asm @@ -1,4 +1,4 @@ -Sfx34_Ch1: ; fdec8 (3f:5ec8) +Sfx34_Ch1: sfx_8 17 sfx_2 8 sfx_loop 3 diff --git a/src/audio/sfx/sfx_35.asm b/src/audio/sfx/sfx_35.asm index 9cc6cc5..2f63273 100644 --- a/src/audio/sfx/sfx_35.asm +++ b/src/audio/sfx/sfx_35.asm @@ -1,4 +1,4 @@ -Sfx35_Ch1: ; fdefd (3f:5efd) +Sfx35_Ch1: sfx_8 17 sfx_1 47 sfx_0 0, 8 diff --git a/src/audio/sfx/sfx_36.asm b/src/audio/sfx/sfx_36.asm index 4a281b4..069aa79 100644 --- a/src/audio/sfx/sfx_36.asm +++ b/src/audio/sfx/sfx_36.asm @@ -1,4 +1,4 @@ -Sfx36_Ch1: ; fdf5d (3f:5f5d) +Sfx36_Ch1: sfx_8 17 sfx_1 255 sfx_2 0 diff --git a/src/audio/sfx/sfx_37.asm b/src/audio/sfx/sfx_37.asm index 5854700..5cc2df4 100644 --- a/src/audio/sfx/sfx_37.asm +++ b/src/audio/sfx/sfx_37.asm @@ -1,4 +1,4 @@ -Sfx37_Ch1: ; fe04e (3f:604e) +Sfx37_Ch1: sfx_1 255 sfx_8 17 sfx_2 0 @@ -76,7 +76,7 @@ Sfx37_Ch1: ; fe04e (3f:604e) sfx_1 255 sfx_end -Sfx37_Ch2: ; fe0e4 (3f:60e4) +Sfx37_Ch2: sfx_8 17 sfx_1 223 sfx_1 0 diff --git a/src/audio/sfx/sfx_38.asm b/src/audio/sfx/sfx_38.asm index 66f6572..f295d0a 100644 --- a/src/audio/sfx/sfx_38.asm +++ b/src/audio/sfx/sfx_38.asm @@ -1,4 +1,4 @@ -Sfx38_Ch1: ; fe13b (3f:613b) +Sfx38_Ch1: sfx_1 228 sfx_8 17 sfx_2 4 diff --git a/src/audio/sfx/sfx_39.asm b/src/audio/sfx/sfx_39.asm index 8d2d6ae..11f8c8e 100644 --- a/src/audio/sfx/sfx_39.asm +++ b/src/audio/sfx/sfx_39.asm @@ -1,4 +1,4 @@ -Sfx39_Ch1: ; fe42a (3f:642a) +Sfx39_Ch1: sfx_8 17 sfx_1 159 sfx_2 0 @@ -98,7 +98,7 @@ Sfx39_Ch1: ; fe42a (3f:642a) sfx_0 7, 157 sfx_end -Sfx39_Ch2: ; fe4eb (3f:64eb) +Sfx39_Ch2: sfx_8 17 sfx_loop 2 sfx_1 207 diff --git a/src/audio/sfx/sfx_3a.asm b/src/audio/sfx/sfx_3a.asm index a017511..248bc66 100644 --- a/src/audio/sfx/sfx_3a.asm +++ b/src/audio/sfx/sfx_3a.asm @@ -1,4 +1,4 @@ -Sfx3a_Ch1: ; fe533 (3f:6533) +Sfx3a_Ch1: sfx_8 17 sfx_1 87 sfx_2 0 diff --git a/src/audio/sfx/sfx_3b.asm b/src/audio/sfx/sfx_3b.asm index 1433eb2..d13e2ed 100644 --- a/src/audio/sfx/sfx_3b.asm +++ b/src/audio/sfx/sfx_3b.asm @@ -1,4 +1,4 @@ -Sfx3b_Ch1: ; fe638 (3f:6638) +Sfx3b_Ch1: sfx_8 17 sfx_1 255 sfx_2 0 diff --git a/src/audio/sfx/sfx_3c.asm b/src/audio/sfx/sfx_3c.asm index d4786fc..03f8142 100644 --- a/src/audio/sfx/sfx_3c.asm +++ b/src/audio/sfx/sfx_3c.asm @@ -1,4 +1,4 @@ -Sfx3c_Ch1: ; fe685 (3f:6685) +Sfx3c_Ch1: sfx_loop 4 sfx_1 244 sfx_8 17 diff --git a/src/audio/sfx/sfx_3d.asm b/src/audio/sfx/sfx_3d.asm index 55c8a6e..5ae38dd 100644 --- a/src/audio/sfx/sfx_3d.asm +++ b/src/audio/sfx/sfx_3d.asm @@ -1,4 +1,4 @@ -Sfx3d_Ch1: ; fe6fc (3f:66fc) +Sfx3d_Ch1: sfx_8 17 sfx_1 255 sfx_2 0 diff --git a/src/audio/sfx/sfx_3e.asm b/src/audio/sfx/sfx_3e.asm index 7a690db..f188f27 100644 --- a/src/audio/sfx/sfx_3e.asm +++ b/src/audio/sfx/sfx_3e.asm @@ -1,4 +1,4 @@ -Sfx3e_Ch1: ; fe7c0 (3f:67c0) +Sfx3e_Ch1: sfx_1 207 sfx_8 17 sfx_2 8 diff --git a/src/audio/sfx/sfx_3f.asm b/src/audio/sfx/sfx_3f.asm index 20d9001..4236071 100644 --- a/src/audio/sfx/sfx_3f.asm +++ b/src/audio/sfx/sfx_3f.asm @@ -1,4 +1,4 @@ -Sfx3f_Ch1: ; fe7f3 (3f:67f3) +Sfx3f_Ch1: sfx_8 17 sfx_loop 20 sfx_1 193 diff --git a/src/audio/sfx/sfx_40.asm b/src/audio/sfx/sfx_40.asm index c6ba2f1..0444401 100644 --- a/src/audio/sfx/sfx_40.asm +++ b/src/audio/sfx/sfx_40.asm @@ -1,4 +1,4 @@ -Sfx40_Ch1: ; fe807 (3f:6807) +Sfx40_Ch1: sfx_8 17 sfx_1 255 sfx_2 0 diff --git a/src/audio/sfx/sfx_41.asm b/src/audio/sfx/sfx_41.asm index 982c30e..3c98a7d 100644 --- a/src/audio/sfx/sfx_41.asm +++ b/src/audio/sfx/sfx_41.asm @@ -1,4 +1,4 @@ -Sfx41_Ch1: ; fe8f8 (3f:68f8) +Sfx41_Ch1: sfx_1 239 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_42.asm b/src/audio/sfx/sfx_42.asm index 5ac2ccb..b12f4c9 100644 --- a/src/audio/sfx/sfx_42.asm +++ b/src/audio/sfx/sfx_42.asm @@ -1,4 +1,4 @@ -Sfx42_Ch1: ; fe9cf (3f:69cf) +Sfx42_Ch1: sfx_1 239 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_43.asm b/src/audio/sfx/sfx_43.asm index a5e64d0..071c98b 100644 --- a/src/audio/sfx/sfx_43.asm +++ b/src/audio/sfx/sfx_43.asm @@ -1,4 +1,4 @@ -Sfx43_Ch1: ; fea4d (3f:6a4d) +Sfx43_Ch1: sfx_8 17 sfx_loop 2 sfx_1 31 diff --git a/src/audio/sfx/sfx_44.asm b/src/audio/sfx/sfx_44.asm index bfacfe9..6e63f61 100644 --- a/src/audio/sfx/sfx_44.asm +++ b/src/audio/sfx/sfx_44.asm @@ -1,4 +1,4 @@ -Sfx44_Ch1: ; feaa5 (3f:6aa5) +Sfx44_Ch1: sfx_8 17 sfx_loop 2 sfx_1 31 diff --git a/src/audio/sfx/sfx_45.asm b/src/audio/sfx/sfx_45.asm index 84b337c..d42b119 100644 --- a/src/audio/sfx/sfx_45.asm +++ b/src/audio/sfx/sfx_45.asm @@ -1,4 +1,4 @@ -Sfx45_Ch1: ; feb5e (3f:6b5e) +Sfx45_Ch1: sfx_loop 17 sfx_1 135 sfx_8 17 diff --git a/src/audio/sfx/sfx_46.asm b/src/audio/sfx/sfx_46.asm index d99aeef..e1b35ff 100644 --- a/src/audio/sfx/sfx_46.asm +++ b/src/audio/sfx/sfx_46.asm @@ -1,4 +1,4 @@ -Sfx46_Ch1: ; febd1 (3f:6bd1) +Sfx46_Ch1: sfx_1 239 sfx_8 17 sfx_2 8 diff --git a/src/audio/sfx/sfx_47.asm b/src/audio/sfx/sfx_47.asm index ba06a36..bb9f397 100644 --- a/src/audio/sfx/sfx_47.asm +++ b/src/audio/sfx/sfx_47.asm @@ -1,4 +1,4 @@ -Sfx47_Ch1: ; fed02 (3f:6d02) +Sfx47_Ch1: sfx_8 17 sfx_1 207 sfx_0 0, 113 diff --git a/src/audio/sfx/sfx_48.asm b/src/audio/sfx/sfx_48.asm index 495164c..4bc0111 100644 --- a/src/audio/sfx/sfx_48.asm +++ b/src/audio/sfx/sfx_48.asm @@ -1,4 +1,4 @@ -Sfx48_Ch1: ; fed55 (3f:6d55) +Sfx48_Ch1: sfx_8 17 sfx_1 207 sfx_0 0, 116 diff --git a/src/audio/sfx/sfx_49.asm b/src/audio/sfx/sfx_49.asm index 0b7355c..159b95c 100644 --- a/src/audio/sfx/sfx_49.asm +++ b/src/audio/sfx/sfx_49.asm @@ -1,4 +1,4 @@ -Sfx49_Ch1: ; fedcc (3f:6dcc) +Sfx49_Ch1: sfx_1 228 sfx_8 17 sfx_2 4 diff --git a/src/audio/sfx/sfx_4a.asm b/src/audio/sfx/sfx_4a.asm index c5cec57..5625b84 100644 --- a/src/audio/sfx/sfx_4a.asm +++ b/src/audio/sfx/sfx_4a.asm @@ -1,4 +1,4 @@ -Sfx4a_Ch1: ; fee7c (3f:6e7c) +Sfx4a_Ch1: sfx_1 228 sfx_8 17 sfx_2 4 diff --git a/src/audio/sfx/sfx_4b.asm b/src/audio/sfx/sfx_4b.asm index 53f2a8b..59180b7 100644 --- a/src/audio/sfx/sfx_4b.asm +++ b/src/audio/sfx/sfx_4b.asm @@ -1,4 +1,4 @@ -Sfx4b_Ch1: ; fef2d (3f:6f2d) +Sfx4b_Ch1: sfx_8 17 sfx_1 47 sfx_0 0, 8 diff --git a/src/audio/sfx/sfx_4c.asm b/src/audio/sfx/sfx_4c.asm index 6a117ad..f19896a 100644 --- a/src/audio/sfx/sfx_4c.asm +++ b/src/audio/sfx/sfx_4c.asm @@ -1,4 +1,4 @@ -Sfx4c_Ch1: ; fef8d (3f:6f8d) +Sfx4c_Ch1: sfx_1 228 sfx_8 17 sfx_2 4 diff --git a/src/audio/sfx/sfx_4d.asm b/src/audio/sfx/sfx_4d.asm index efb8328..785abd6 100644 --- a/src/audio/sfx/sfx_4d.asm +++ b/src/audio/sfx/sfx_4d.asm @@ -1,4 +1,4 @@ -Sfx4d_Ch1: ; ff0b7 (3f:70b7) +Sfx4d_Ch1: sfx_1 239 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_4e.asm b/src/audio/sfx/sfx_4e.asm index 88f8aaa..36dca0e 100644 --- a/src/audio/sfx/sfx_4e.asm +++ b/src/audio/sfx/sfx_4e.asm @@ -1,4 +1,4 @@ -Sfx4e_Ch1: ; ff313 (3f:7313) +Sfx4e_Ch1: sfx_1 239 sfx_8 17 sfx_2 8 diff --git a/src/audio/sfx/sfx_4f.asm b/src/audio/sfx/sfx_4f.asm index 61031b2..75f061b 100644 --- a/src/audio/sfx/sfx_4f.asm +++ b/src/audio/sfx/sfx_4f.asm @@ -1,4 +1,4 @@ -Sfx4f_Ch1: ; ff49b (3f:749b) +Sfx4f_Ch1: sfx_1 239 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_50.asm b/src/audio/sfx/sfx_50.asm index 34784ed..2dbe248 100644 --- a/src/audio/sfx/sfx_50.asm +++ b/src/audio/sfx/sfx_50.asm @@ -1,4 +1,4 @@ -Sfx50_Ch1: ; ff4fa (3f:74fa) +Sfx50_Ch1: sfx_1 159 sfx_8 17 sfx_2 0 @@ -87,7 +87,7 @@ Sfx50_Ch1: ; ff4fa (3f:74fa) sfx_1 31 sfx_end -Sfx50_Ch2: ; ff5a0 (3f:75a0) +Sfx50_Ch2: sfx_1 207 sfx_8 17 sfx_loop 3 diff --git a/src/audio/sfx/sfx_51.asm b/src/audio/sfx/sfx_51.asm index 87b89aa..df13c06 100644 --- a/src/audio/sfx/sfx_51.asm +++ b/src/audio/sfx/sfx_51.asm @@ -1,4 +1,4 @@ -Sfx51_Ch1: ; ff5f8 (3f:75f8) +Sfx51_Ch1: sfx_1 0 sfx_5 0 sfx_6 20 @@ -122,7 +122,7 @@ Sfx51_Ch1: ; ff5f8 (3f:75f8) sfx_endloop sfx_end -Sfx51_Ch2: ; ff6e6 (3f:76e6) +Sfx51_Ch2: sfx_loop 65 sfx_1 127 sfx_8 17 diff --git a/src/audio/sfx/sfx_52.asm b/src/audio/sfx/sfx_52.asm index 2da2234..8b31cca 100644 --- a/src/audio/sfx/sfx_52.asm +++ b/src/audio/sfx/sfx_52.asm @@ -1,4 +1,4 @@ -Sfx52_Ch1: ; ff714 (3f:7714) +Sfx52_Ch1: sfx_1 255 sfx_8 17 sfx_2 8 @@ -91,7 +91,7 @@ Sfx52_Ch1: ; ff714 (3f:7714) sfx_1 31 sfx_end -Sfx52_Ch2: ; ff7bf (3f:77bf) +Sfx52_Ch2: sfx_8 17 sfx_loop 2 sfx_1 0 diff --git a/src/audio/sfx/sfx_53.asm b/src/audio/sfx/sfx_53.asm index f01dc82..d1f3744 100644 --- a/src/audio/sfx/sfx_53.asm +++ b/src/audio/sfx/sfx_53.asm @@ -1,4 +1,4 @@ -Sfx53_Ch1: ; ff81d (3f:781d) +Sfx53_Ch1: sfx_1 255 sfx_8 17 sfx_2 8 @@ -91,7 +91,7 @@ Sfx53_Ch1: ; ff81d (3f:781d) sfx_1 31 sfx_end -Sfx53_Ch2: ; ff8c8 (3f:78c8) +Sfx53_Ch2: sfx_8 17 sfx_loop 2 sfx_1 0 diff --git a/src/audio/sfx/sfx_54.asm b/src/audio/sfx/sfx_54.asm index c988627..464afb7 100644 --- a/src/audio/sfx/sfx_54.asm +++ b/src/audio/sfx/sfx_54.asm @@ -1,4 +1,4 @@ -Sfx54_Ch1: ; ff92c (3f:792c) +Sfx54_Ch1: sfx_1 231 sfx_8 17 sfx_2 8 diff --git a/src/audio/sfx/sfx_55.asm b/src/audio/sfx/sfx_55.asm index 928427b..c11bf25 100644 --- a/src/audio/sfx/sfx_55.asm +++ b/src/audio/sfx/sfx_55.asm @@ -1,4 +1,4 @@ -Sfx55_Ch1: ; ff960 (3f:7960) +Sfx55_Ch1: sfx_1 231 sfx_8 17 sfx_2 8 diff --git a/src/audio/sfx/sfx_56.asm b/src/audio/sfx/sfx_56.asm index 0acbe76..d32dde2 100644 --- a/src/audio/sfx/sfx_56.asm +++ b/src/audio/sfx/sfx_56.asm @@ -1,4 +1,4 @@ -Sfx56_Ch1: ; ff98b (3f:798b) +Sfx56_Ch1: sfx_1 247 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_57.asm b/src/audio/sfx/sfx_57.asm index ed7f832..29b8f20 100644 --- a/src/audio/sfx/sfx_57.asm +++ b/src/audio/sfx/sfx_57.asm @@ -1,4 +1,4 @@ -Sfx57_Ch1: ; ffa05 (3f:7a05) +Sfx57_Ch1: sfx_loop 50 sfx_1 164 sfx_8 17 diff --git a/src/audio/sfx/sfx_58.asm b/src/audio/sfx/sfx_58.asm index 3311c80..87a7fab 100644 --- a/src/audio/sfx/sfx_58.asm +++ b/src/audio/sfx/sfx_58.asm @@ -1,4 +1,4 @@ -Sfx58_Ch1: ; ffa30 (3f:7a30) +Sfx58_Ch1: sfx_1 207 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_59.asm b/src/audio/sfx/sfx_59.asm index f272af9..22c7f48 100644 --- a/src/audio/sfx/sfx_59.asm +++ b/src/audio/sfx/sfx_59.asm @@ -1,4 +1,4 @@ -Sfx59_Ch1: ; ffb0c (3f:7b0c) +Sfx59_Ch1: sfx_1 207 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_5a.asm b/src/audio/sfx/sfx_5a.asm index 87f6684..fde070f 100644 --- a/src/audio/sfx/sfx_5a.asm +++ b/src/audio/sfx/sfx_5a.asm @@ -1,4 +1,4 @@ -Sfx5a_Ch1: ; ffc03 (3f:7c03) +Sfx5a_Ch1: sfx_1 207 sfx_8 17 sfx_2 8 diff --git a/src/audio/sfx/sfx_5b.asm b/src/audio/sfx/sfx_5b.asm index b647b05..a5e78eb 100644 --- a/src/audio/sfx/sfx_5b.asm +++ b/src/audio/sfx/sfx_5b.asm @@ -1,4 +1,4 @@ -Sfx5b_Ch1: ; ffcbf (3f:7cbf) +Sfx5b_Ch1: sfx_1 196 sfx_8 17 sfx_2 0 diff --git a/src/audio/sfx/sfx_5c.asm b/src/audio/sfx/sfx_5c.asm index 60d66e2..9c7fa0b 100644 --- a/src/audio/sfx/sfx_5c.asm +++ b/src/audio/sfx/sfx_5c.asm @@ -1,4 +1,4 @@ -Sfx5c_Ch1: ; ffd5b (3f:7d5b) +Sfx5c_Ch1: sfx_loop 30 sfx_1 191 sfx_8 17 diff --git a/src/audio/sfx/sfx_5d.asm b/src/audio/sfx/sfx_5d.asm index 0067e8b..cc26264 100644 --- a/src/audio/sfx/sfx_5d.asm +++ b/src/audio/sfx/sfx_5d.asm @@ -1,4 +1,4 @@ -Sfx5d_Ch1: ; ffd89 (3f:7d89) +Sfx5d_Ch1: sfx_1 0 sfx_5 0 sfx_6 6 @@ -70,7 +70,7 @@ Sfx5d_Ch1: ; ffd89 (3f:7d89) sfx_6 1 sfx_end -Sfx5d_Ch2: ; ffe0d (3f:7e0d) +Sfx5d_Ch2: sfx_1 196 sfx_8 17 sfx_2 8 @@ -101,7 +101,7 @@ Sfx5d_Ch2: ; ffe0d (3f:7e0d) sfx_0 6, 246 sfx_end -Sfx5d_Ch3: ; ffe3f (3f:7e3f) +Sfx5d_Ch3: sfx_1 119 sfx_8 17 sfx_0 0, 17 diff --git a/src/audio/sfx/sfx_5e.asm b/src/audio/sfx/sfx_5e.asm index 8a260f7..11837ab 100644 --- a/src/audio/sfx/sfx_5e.asm +++ b/src/audio/sfx/sfx_5e.asm @@ -1,4 +1,4 @@ -Sfx5e_Ch1: ; ffe92 (3f:7e92) +Sfx5e_Ch1: sfx_1 196 sfx_8 17 sfx_2 8 diff --git a/src/audio/sfx/sfx_5f.asm b/src/audio/sfx/sfx_5f.asm index 7756369..62d08bd 100644 --- a/src/audio/sfx/sfx_5f.asm +++ b/src/audio/sfx/sfx_5f.asm @@ -1,4 +1,4 @@ -Sfx5f_Ch1: ; fff04 (3f:7f04) +Sfx5f_Ch1: sfx_1 247 sfx_8 17 sfx_0 0, 68 diff --git a/src/audio/sfx_headers.asm b/src/audio/sfx_headers.asm index 1554ddd..3f07bb2 100644 --- a/src/audio/sfx_headers.asm +++ b/src/audio/sfx_headers.asm @@ -1,7 +1,7 @@ -NumberOfSFX: ; fc290 (3f:4290) +NumberOfSFX: db $60 -SFXHeaderPointers: ; fc291 (3f:4291) +SFXHeaderPointers: dw SfxStop dw Sfx01 dw Sfx02 @@ -99,396 +99,396 @@ SFXHeaderPointers: ; fc291 (3f:4291) dw Sfx5e dw Sfx5f -SfxStop: ; fc351 (3f:4351) +SfxStop: db %0000 -Sfx01: ; fc352 (3f:4352) +Sfx01: db %0010 dw Sfx01_Ch1 -Sfx02: ; fc355 (3f:4355) +Sfx02: db %0010 dw Sfx02_Ch1 -Sfx03: ; fc358 (3f:4358) +Sfx03: db %0010 dw Sfx03_Ch1 -Sfx04: ; fc35b (3f:435b) +Sfx04: db %0010 dw Sfx04_Ch1 -Sfx05: ; fc35e (3f:435e) +Sfx05: db %0010 dw Sfx05_Ch1 -Sfx06: ; fc361 (3f:4361) +Sfx06: db %0010 dw Sfx06_Ch1 -Sfx07: ; fc364 (3f:4364) +Sfx07: db %1000 dw Sfx07_Ch1 -Sfx08: ; fc367 (3f:4367) +Sfx08: db %1000 dw Sfx08_Ch1 -Sfx09: ; fc36a (3f:436a) +Sfx09: db %1000 dw Sfx09_Ch1 -Sfx0a: ; fc36d (3f:436d) +Sfx0a: db %0010 dw Sfx0a_Ch1 -Sfx0b: ; fc370 (3f:4370) +Sfx0b: db %0010 dw Sfx0b_Ch1 -Sfx0c: ; fc373 (3f:4373) +Sfx0c: db %1000 dw Sfx0c_Ch1 -Sfx0d: ; fc376 (3f:4376) +Sfx0d: db %0010 dw Sfx0d_Ch1 -Sfx0e: ; fc379 (3f:4379) +Sfx0e: db %0010 dw Sfx0e_Ch1 -Sfx0f: ; fc37c (3f:437c) +Sfx0f: db %1000 dw Sfx0f_Ch1 -Sfx10: ; fc37f (3f:437f) +Sfx10: db %0010 dw Sfx10_Ch1 -Sfx11: ; fc382 (3f:4382) +Sfx11: db %0010 dw Sfx11_Ch1 -Sfx12: ; fc385 (3f:4385) +Sfx12: db %0010 dw Sfx12_Ch1 -Sfx13: ; fc388 (3f:4388) +Sfx13: db %0010 dw Sfx13_Ch1 -Sfx14: ; fc38b (3f:438b) +Sfx14: db %0010 dw Sfx14_Ch1 -Sfx15: ; fc38e (3f:438e) +Sfx15: db %0010 dw Sfx15_Ch1 -Sfx16: ; fc391 (3f:4391) +Sfx16: db %1000 dw Sfx16_Ch1 -Sfx17: ; fc394 (3f:4394) +Sfx17: db %1000 dw Sfx17_Ch1 -Sfx18: ; fc397 (3f:4397) +Sfx18: db %1000 dw Sfx18_Ch1 -Sfx19: ; fc39a (3f:439a) +Sfx19: db %1000 dw Sfx19_Ch1 -Sfx1a: ; fc39d (3f:439d) +Sfx1a: db %1000 dw Sfx1a_Ch1 -Sfx1b: ; fc3a0 (3f:43a0) +Sfx1b: db %1000 dw Sfx1b_Ch1 -Sfx1c: ; fc3a3 (3f:43a3) +Sfx1c: db %1000 dw Sfx1c_Ch1 -Sfx1d: ; fc3a6 (3f:43a6) +Sfx1d: db %1000 dw Sfx1d_Ch1 -Sfx1e: ; fc3a9 (3f:43a9) +Sfx1e: db %1000 dw Sfx1e_Ch1 -Sfx1f: ; fc3ac (3f:43ac) +Sfx1f: db %1000 dw Sfx1f_Ch1 -Sfx20: ; fc3af (3f:43af) +Sfx20: db %1000 dw Sfx20_Ch1 -Sfx21: ; fc3b2 (3f:43b2) +Sfx21: db %1000 dw Sfx21_Ch1 -Sfx22: ; fc3b5 (3f:43b5) +Sfx22: db %1000 dw Sfx22_Ch1 -Sfx23: ; fc3b8 (3f:43b8) +Sfx23: db %1000 dw Sfx23_Ch1 -Sfx24: ; fc3bb (3f:43bb) +Sfx24: db %1000 dw Sfx24_Ch1 -Sfx25: ; fc3be (3f:43be) +Sfx25: db %0010 dw Sfx25_Ch1 -Sfx26: ; fc3c1 (3f:43c1) +Sfx26: db %0010 dw Sfx26_Ch1 -Sfx27: ; fc3c4 (3f:43c4) +Sfx27: db %0010 dw Sfx27_Ch1 -Sfx28: ; fc3c7 (3f:43c7) +Sfx28: db %1010 dw Sfx28_Ch1 dw Sfx28_Ch2 -Sfx29: ; fc3cc (3f:43cc) +Sfx29: db %1000 dw Sfx29_Ch1 -Sfx2a: ; fc3cf (3f:43cf) +Sfx2a: db %1000 dw Sfx2a_Ch1 -Sfx2b: ; fc3d2 (3f:43d2) +Sfx2b: db %0010 dw Sfx2b_Ch1 -Sfx2c: ; fc3d5 (3f:43d5) +Sfx2c: db %0010 dw Sfx2c_Ch1 -Sfx2d: ; fc3d8 (3f:43d8) +Sfx2d: db %1000 dw Sfx2d_Ch1 -Sfx2e: ; fc3db (3f:43db) +Sfx2e: db %1000 dw Sfx2e_Ch1 -Sfx2f: ; fc3de (3f:43de) +Sfx2f: db %1000 dw Sfx2f_Ch1 -Sfx30: ; fc3e1 (3f:43e1) +Sfx30: db %1000 dw Sfx30_Ch1 -Sfx31: ; fc3e4 (3f:43e4) +Sfx31: db %0010 dw Sfx31_Ch1 -Sfx32: ; fc3e7 (3f:43e7) +Sfx32: db %1010 dw Sfx32_Ch1 dw Sfx32_Ch2 -Sfx33: ; fc3ec (3f:43ec) +Sfx33: db %1010 dw Sfx33_Ch1 dw Sfx33_Ch2 -Sfx34: ; fc3f1 (3f:43f1) +Sfx34: db %0010 dw Sfx34_Ch1 -Sfx35: ; fc3f4 (3f:43f4) +Sfx35: db %1000 dw Sfx35_Ch1 -Sfx36: ; fc3f7 (3f:43f7) +Sfx36: db %0010 dw Sfx36_Ch1 -Sfx37: ; fc3fa (3f:43fa) +Sfx37: db %1010 dw Sfx37_Ch1 dw Sfx37_Ch2 -Sfx38: ; fc3ff (3f:43ff) +Sfx38: db %0010 dw Sfx38_Ch1 -Sfx39: ; fc402 (3f:4402) +Sfx39: db %1010 dw Sfx39_Ch1 dw Sfx39_Ch2 -Sfx3a: ; fc407 (3f:4407) +Sfx3a: db %0010 dw Sfx3a_Ch1 -Sfx3b: ; fc40a (3f:440a) +Sfx3b: db %0010 dw Sfx3b_Ch1 -Sfx3c: ; fc40d (3f:440d) +Sfx3c: db %0010 dw Sfx3c_Ch1 -Sfx3d: ; fc410 (3f:4410) +Sfx3d: db %0010 dw Sfx3d_Ch1 -Sfx3e: ; fc413 (3f:4413) +Sfx3e: db %0010 dw Sfx3e_Ch1 -Sfx3f: ; fc416 (3f:4416) +Sfx3f: db %1000 dw Sfx3f_Ch1 -Sfx40: ; fc419 (3f:4419) +Sfx40: db %0010 dw Sfx40_Ch1 -Sfx41: ; fc41c (3f:441c) +Sfx41: db %0010 dw Sfx41_Ch1 -Sfx42: ; fc41f (3f:441f) +Sfx42: db %0010 dw Sfx42_Ch1 -Sfx43: ; fc422 (3f:4422) +Sfx43: db %1000 dw Sfx43_Ch1 -Sfx44: ; fc425 (3f:4425) +Sfx44: db %1000 dw Sfx44_Ch1 -Sfx45: ; fc428 (3f:4428) +Sfx45: db %0010 dw Sfx45_Ch1 -Sfx46: ; fc42b (3f:442b) +Sfx46: db %0010 dw Sfx46_Ch1 -Sfx47: ; fc42e (3f:442e) +Sfx47: db %1000 dw Sfx47_Ch1 -Sfx48: ; fc431 (3f:4431) +Sfx48: db %1000 dw Sfx48_Ch1 -Sfx49: ; fc434 (3f:4434) +Sfx49: db %0010 dw Sfx49_Ch1 -Sfx4a: ; fc437 (3f:4437) +Sfx4a: db %0010 dw Sfx4a_Ch1 -Sfx4b: ; fc43a (3f:443a) +Sfx4b: db %1000 dw Sfx4b_Ch1 -Sfx4c: ; fc43d (3f:443d) +Sfx4c: db %0010 dw Sfx4c_Ch1 -Sfx4d: ; fc440 (3f:4440) +Sfx4d: db %0010 dw Sfx4d_Ch1 -Sfx4e: ; fc443 (3f:4443) +Sfx4e: db %0010 dw Sfx4e_Ch1 -Sfx4f: ; fc446 (3f:4446) +Sfx4f: db %0010 dw Sfx4f_Ch1 -Sfx50: ; fc449 (3f:4449) +Sfx50: db %1010 dw Sfx50_Ch1 dw Sfx50_Ch2 -Sfx51: ; fc44e (3f:444e) +Sfx51: db %1010 dw Sfx51_Ch1 dw Sfx51_Ch2 -Sfx52: ; fc453 (3f:4453) +Sfx52: db %1010 dw Sfx52_Ch1 dw Sfx52_Ch2 -Sfx53: ; fc458 (3f:4458) +Sfx53: db %1010 dw Sfx53_Ch1 dw Sfx53_Ch2 -Sfx54: ; fc45d (3f:445d) +Sfx54: db %0010 dw Sfx54_Ch1 -Sfx55: ; fc460 (3f:4460) +Sfx55: db %0010 dw Sfx55_Ch1 -Sfx56: ; fc463 (3f:4463) +Sfx56: db %0010 dw Sfx56_Ch1 -Sfx57: ; fc466 (3f:4466) +Sfx57: db %0010 dw Sfx57_Ch1 -Sfx58: ; fc469 (3f:4469) +Sfx58: db %0010 dw Sfx58_Ch1 -Sfx59: ; fc46c (3f:446c) +Sfx59: db %0010 dw Sfx59_Ch1 -Sfx5a: ; fc46f (3f:446f) +Sfx5a: db %0010 dw Sfx5a_Ch1 -Sfx5b: ; fc472 (3f:4472) +Sfx5b: db %0010 dw Sfx5b_Ch1 -Sfx5c: ; fc475 (3f:4475) +Sfx5c: db %1000 dw Sfx5c_Ch1 -Sfx5d: ; fc478 (3f:4478) +Sfx5d: db %1011 dw Sfx5d_Ch1 dw Sfx5d_Ch2 dw Sfx5d_Ch3 -Sfx5e: ; fc47f (3f:447f) +Sfx5e: db %0010 dw Sfx5e_Ch1 -Sfx5f: ; fc482 (3f:4482) +Sfx5f: db %1000 dw Sfx5f_Ch1