diff options
107 files changed, 5959 insertions, 2348 deletions
@@ -31,9 +31,7 @@ SECTION "Sound Effect Headers 3", ROMX, BANK[AUDIO_3] INCLUDE "audio/headers/sfxheaders3.asm" SECTION "Sound Effect Headers 4", ROMX, BANK[AUDIO_4] -SFX_Headers_4:: ; 80000 (20:4000) - dr $80000,$801cb -; INCLUDE "audio/headers/sfxheaders4.asm" +INCLUDE "audio/headers/sfxheaders4.asm" SECTION "Music Headers 1", ROMX, BANK[AUDIO_1] INCLUDE "audio/headers/musicheaders1.asm" @@ -45,8 +43,7 @@ SECTION "Music Headers 3", ROMX, BANK[AUDIO_3] INCLUDE "audio/headers/musicheaders3.asm" SECTION "Music Headers 4", ROMX, BANK[AUDIO_4] - dr $801cb,$801ec -;INCLUDE "audio/headers/musicheaders4.asm" +INCLUDE "audio/headers/musicheaders4.asm" SECTION "Sound Effects 1", ROMX, BANK[AUDIO_1] @@ -373,7 +370,78 @@ INCLUDE "audio/sfx/cry21_3.asm" INCLUDE "audio/sfx/cry22_3.asm" SECTION "Sound Effects 4", ROMX, BANK[AUDIO_4] - dr $801ec, $80f14 +INCLUDE "audio/sfx/snare1_4.asm" +INCLUDE "audio/sfx/snare2_4.asm" +INCLUDE "audio/sfx/snare3_4.asm" +INCLUDE "audio/sfx/snare4_4.asm" +INCLUDE "audio/sfx/snare5_4.asm" +INCLUDE "audio/sfx/triangle1_4.asm" +INCLUDE "audio/sfx/triangle2_4.asm" +INCLUDE "audio/sfx/snare6_4.asm" +INCLUDE "audio/sfx/snare7_4.asm" +INCLUDE "audio/sfx/snare8_4.asm" +INCLUDE "audio/sfx/snare9_4.asm" +INCLUDE "audio/sfx/cymbal1_4.asm" +INCLUDE "audio/sfx/cymbal2_4.asm" +INCLUDE "audio/sfx/cymbal3_4.asm" +INCLUDE "audio/sfx/muted_snare1_4.asm" +INCLUDE "audio/sfx/triangle3_4.asm" +INCLUDE "audio/sfx/muted_snare2_4.asm" +INCLUDE "audio/sfx/muted_snare3_4.asm" +INCLUDE "audio/sfx/muted_snare4_4.asm" +INCLUDE "audio/sfx/unknown_80250.asm" +INCLUDE "audio/sfx/unknown_80263.asm" +INCLUDE "audio/sfx/unknown_8026a.asm" +INCLUDE "audio/sfx/heal_ailment_4.asm" +INCLUDE "audio/sfx/tink_4.asm" +INCLUDE "audio/sfx/unknown_8029f.asm" +INCLUDE "audio/sfx/unknown_802b5.asm" +INCLUDE "audio/sfx/unknown_802cc.asm" +INCLUDE "audio/sfx/unknown_802d7.asm" +INCLUDE "audio/sfx/unknown_802e1.asm" +INCLUDE "audio/sfx/get_item2_4_2.asm" +INCLUDE "audio/sfx/unknown_80337.asm" +INCLUDE "audio/sfx/unknown_803da.asm" +INCLUDE "audio/sfx/unknown_80411.asm" +INCLUDE "audio/sfx/unknown_80467.asm" +INCLUDE "audio/sfx/unknown_804bf.asm" +INCLUDE "audio/sfx/unknown_804fa.asm" +INCLUDE "audio/sfx/unknown_80545.asm" +INCLUDE "audio/sfx/unknown_8058b.asm" +INCLUDE "audio/sfx/unknown_805db.asm" +INCLUDE "audio/sfx/unknown_80603.asm" +INCLUDE "audio/sfx/unknown_80633.asm" +INCLUDE "audio/sfx/unknown_80661.asm" +INCLUDE "audio/sfx/unknown_80689.asm" +INCLUDE "audio/sfx/unknown_806af.asm" +INCLUDE "audio/sfx/unknown_80712.asm" +INCLUDE "audio/sfx/unknown_80760.asm" +INCLUDE "audio/sfx/unknown_8077e.asm" +INCLUDE "audio/sfx/unknown_807eb.asm" +INCLUDE "audio/sfx/unknown_8081e.asm" +INCLUDE "audio/sfx/unknown_80879.asm" +INCLUDE "audio/sfx/unknown_808a9.asm" +INCLUDE "audio/sfx/unknown_808fa.asm" +INCLUDE "audio/sfx/unknown_8091c.asm" +INCLUDE "audio/sfx/unknown_80944.asm" +INCLUDE "audio/sfx/unknown_8097f.asm" +INCLUDE "audio/sfx/unknown_809b2.asm" +INCLUDE "audio/sfx/unknown_809fb.asm" +INCLUDE "audio/sfx/unknown_80a23.asm" +INCLUDE "audio/sfx/unknown_80a89.asm" +INCLUDE "audio/sfx/unknown_80ad2.asm" +INCLUDE "audio/sfx/unknown_80b05.asm" +INCLUDE "audio/sfx/unknown_80b53.asm" +INCLUDE "audio/sfx/unknown_80b9c.asm" +INCLUDE "audio/sfx/unknown_80be2.asm" +INCLUDE "audio/sfx/unknown_80c3b.asm" +INCLUDE "audio/sfx/unknown_80c6e.asm" +INCLUDE "audio/sfx/unknown_80ca1.asm" +INCLUDE "audio/sfx/unknown_80ce7.asm" +INCLUDE "audio/music/printer.asm" +INCLUDE "audio/sfx/unknown_80e5a.asm" +INCLUDE "audio/sfx/unknown_80e91.asm" +INCLUDE "audio/sfx/get_item2_4.asm" SECTION "Audio Engine 1", ROMX, BANK[AUDIO_1] @@ -448,6 +516,8 @@ Music_RivalAlternateStartAndTempo:: ; 99e7 (2:59e7) asm_99ed: ; 99ed (2:59ed) ld hl, wChannelCommandPointers jp Audio1_OverwriteChannelPointer + +; XXX ret ; an alternate tempo for Cities1 which is used for the Hall of Fame room @@ -669,8 +739,9 @@ INCLUDE "audio/music/yellowintro.asm" SECTION "Music 4", ROMX, BANK[AUDIO_4] INCLUDE "audio/music/surfingpikachu.asm" INCLUDE "audio/music/yellowunusedsong.asm" +INCLUDE "audio/music/jessieandjames.asm" - dr $8316d,$84000 +INCBIN "audio/unknown_832b9.bin" SECTION "Pikachu Cries 1",ROMX,BANK[PCM_1] PikachuCry1:: ; 84000 (21:4000) diff --git a/audio/engine_4.asm b/audio/engine_4.asm index c4c1c9dd..fdeead3e 100644 --- a/audio/engine_4.asm +++ b/audio/engine_4.asm @@ -10,6 +10,7 @@ Audio4_PlaySound:: ; 82bd4 (20:6bd4) cp $a3 jr z, .asm_7d127 jp nc, Audio4_7d12d + .asm_7d127 call InitMusicVariables jp Audio4_7d192 @@ -61,6 +62,7 @@ Audio4_7d12d: ; 7d12d (1f:512d) cp $14 jr nc, .asm_7d172 ret + .asm_7d172 ld a, [hl] cp $14 @@ -72,6 +74,7 @@ Audio4_7d12d: ; 7d12d (1f:512d) jr z, .asm_7d182 jr c, .asm_7d182 ret + .asm_7d182 call InitSFXVariables ld a, c @@ -158,6 +161,7 @@ Audio4_7d192: ; 7d192 (1f:5192) cp $14 jr nc, .asm_7d1f5 jr .asm_7d21f + .asm_7d1f5 ld a, [wSoundID] cp $86 diff --git a/audio/headers/musicheaders1.asm b/audio/headers/musicheaders1.asm index a6449436..b3e640af 100644 --- a/audio/headers/musicheaders1.asm +++ b/audio/headers/musicheaders1.asm @@ -1,184 +1,115 @@ Music_PalletTown:: ; 822e (2:422e) - db ( $80 | CH0 ) - dw Music_PalletTown_Ch1 - db CH1 - dw Music_PalletTown_Ch2 - db CH2 - dw Music_PalletTown_Ch3 + dbw ( $80 | CH0 ), Music_PalletTown_Ch1 + dbw CH1, Music_PalletTown_Ch2 + dbw CH2, Music_PalletTown_Ch3 Music_Pokecenter:: ; 8237 (2:4237) - db ( $80 | CH0 ) - dw Music_Pokecenter_Ch1 - db CH1 - dw Music_Pokecenter_Ch2 - db CH2 - dw Music_Pokecenter_Ch3 + dbw ( $80 | CH0 ), Music_Pokecenter_Ch1 + dbw CH1, Music_Pokecenter_Ch2 + dbw CH2, Music_Pokecenter_Ch3 Music_Gym:: ; 8240 (2:4240) - db ( $80 | CH0 ) - dw Music_Gym_Ch1 - db CH1 - dw Music_Gym_Ch2 - db CH2 - dw Music_Gym_Ch3 + dbw ( $80 | CH0 ), Music_Gym_Ch1 + dbw CH1, Music_Gym_Ch2 + dbw CH2, Music_Gym_Ch3 ; Viridian City, Pewter City, Saffron City Music_Cities1:: ; 8249 (2:4249) - db ( $C0 | CH0 ) - dw Music_Cities1_Ch1 - db CH1 - dw Music_Cities1_Ch2 - db CH2 - dw Music_Cities1_Ch3 - db CH3 - dw Music_Cities1_Ch4 + dbw ( $C0 | CH0 ), Music_Cities1_Ch1 + dbw CH1, Music_Cities1_Ch2 + dbw CH2, Music_Cities1_Ch3 + dbw CH3, Music_Cities1_Ch4 ; Cerulean City, Fuchsia City Music_Cities2:: ; 8255 (2:4255) - db ( $80 | CH0 ) - dw Music_Cities2_Ch1 - db CH1 - dw Music_Cities2_Ch2 - db CH2 - dw Music_Cities2_Ch3 + dbw ( $80 | CH0 ), Music_Cities2_Ch1 + dbw CH1, Music_Cities2_Ch2 + dbw CH2, Music_Cities2_Ch3 Music_Celadon:: ; 825e (2:425e) - db ( $80 | CH0 ) - dw Music_Celadon_Ch1 - db CH1 - dw Music_Celadon_Ch2 - db CH2 - dw Music_Celadon_Ch3 + dbw ( $80 | CH0 ), Music_Celadon_Ch1 + dbw CH1, Music_Celadon_Ch2 + dbw CH2, Music_Celadon_Ch3 Music_Cinnabar:: ; 8267 (2:4267) - db ( $80 | CH0 ) - dw Music_Cinnabar_Ch1 - db CH1 - dw Music_Cinnabar_Ch2 - db CH2 - dw Music_Cinnabar_Ch3 + dbw ( $80 | CH0 ), Music_Cinnabar_Ch1 + dbw CH1, Music_Cinnabar_Ch2 + dbw CH2, Music_Cinnabar_Ch3 Music_Vermilion:: ; 8270 (2:4270) - db ( $C0 | CH0 ) - dw Music_Vermilion_Ch1 - db CH1 - dw Music_Vermilion_Ch2 - db CH2 - dw Music_Vermilion_Ch3 - db CH3 - dw Music_Vermilion_Ch4 + dbw ( $C0 | CH0 ), Music_Vermilion_Ch1 + dbw CH1, Music_Vermilion_Ch2 + dbw CH2, Music_Vermilion_Ch3 + dbw CH3, Music_Vermilion_Ch4 Music_Lavender:: ; 827c (2:427c) - db ( $C0 | CH0 ) - dw Music_Lavender_Ch1 - db CH1 - dw Music_Lavender_Ch2 - db CH2 - dw Music_Lavender_Ch3 - db CH3 - dw Music_Lavender_Ch4 + dbw ( $C0 | CH0 ), Music_Lavender_Ch1 + dbw CH1, Music_Lavender_Ch2 + dbw CH2, Music_Lavender_Ch3 + dbw CH3, Music_Lavender_Ch4 Music_SSAnne:: ; 8288 (2:4288) - db ( $80 | CH0 ) - dw Music_SSAnne_Ch1 - db CH1 - dw Music_SSAnne_Ch2 - db CH2 - dw Music_SSAnne_Ch3 + dbw ( $80 | CH0 ), Music_SSAnne_Ch1 + dbw CH1, Music_SSAnne_Ch2 + dbw CH2, Music_SSAnne_Ch3 Music_MeetProfOak:: ; 8291 (2:4291) - db ( $80 | CH0 ) - dw Music_MeetProfOak_Ch1 - db CH1 - dw Music_MeetProfOak_Ch2 - db CH2 - dw Music_MeetProfOak_Ch3 + dbw ( $80 | CH0 ), Music_MeetProfOak_Ch1 + dbw CH1, Music_MeetProfOak_Ch2 + dbw CH2, Music_MeetProfOak_Ch3 Music_MeetRival:: ; 829a (2:429a) - db ( $80 | CH0 ) - dw Music_MeetRival_Ch1 - db CH1 - dw Music_MeetRival_Ch2 - db CH2 - dw Music_MeetRival_Ch3 + dbw ( $80 | CH0 ), Music_MeetRival_Ch1 + dbw CH1, Music_MeetRival_Ch2 + dbw CH2, Music_MeetRival_Ch3 Music_MuseumGuy:: ; 82a3 (2:42a3) - db ( $C0 | CH0 ) - dw Music_MuseumGuy_Ch1 - db CH1 - dw Music_MuseumGuy_Ch2 - db CH2 - dw Music_MuseumGuy_Ch3 - db CH3 - dw Music_MuseumGuy_Ch4 + dbw ( $C0 | CH0 ), Music_MuseumGuy_Ch1 + dbw CH1, Music_MuseumGuy_Ch2 + dbw CH2, Music_MuseumGuy_Ch3 + dbw CH3, Music_MuseumGuy_Ch4 Music_SafariZone:: ; 82af (2:42af) - db ( $80 | CH0 ) - dw Music_SafariZone_Ch1 - db CH1 - dw Music_SafariZone_Ch2 - db CH2 - dw Music_SafariZone_Ch3 + dbw ( $80 | CH0 ), Music_SafariZone_Ch1 + dbw CH1, Music_SafariZone_Ch2 + dbw CH2, Music_SafariZone_Ch3 Music_PkmnHealed:: ; 82b8 (2:42b8) - db ( $80 | CH0 ) - dw Music_PkmnHealed_Ch1 - db CH1 - dw Music_PkmnHealed_Ch2 - db CH2 - dw Music_PkmnHealed_Ch3 + dbw ( $80 | CH0 ), Music_PkmnHealed_Ch1 + dbw CH1, Music_PkmnHealed_Ch2 + dbw CH2, Music_PkmnHealed_Ch3 ; Routes 1 and 2 Music_Routes1:: ; 82c1 (2:42c1) - db ( $C0 | CH0 ) - dw Music_Routes1_Ch1 - db CH1 - dw Music_Routes1_Ch2 - db CH2 - dw Music_Routes1_Ch3 - db CH3 - dw Music_Routes1_Ch4 + dbw ( $C0 | CH0 ), Music_Routes1_Ch1 + dbw CH1, Music_Routes1_Ch2 + dbw CH2, Music_Routes1_Ch3 + dbw CH3, Music_Routes1_Ch4 ; Routes 24 and 25 Music_Routes2:: ; 82cd (2:42cd) - db ( $C0 | CH0 ) - dw Music_Routes2_Ch1 - db CH1 - dw Music_Routes2_Ch2 - db CH2 - dw Music_Routes2_Ch3 - db CH3 - dw Music_Routes2_Ch4 + dbw ( $C0 | CH0 ), Music_Routes2_Ch1 + dbw CH1, Music_Routes2_Ch2 + dbw CH2, Music_Routes2_Ch3 + dbw CH3, Music_Routes2_Ch4 ; Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22 Music_Routes3:: ; 82d9 (2:42d9) - db ( $C0 | CH0 ) - dw Music_Routes3_Ch1 - db CH1 - dw Music_Routes3_Ch2 - db CH2 - dw Music_Routes3_Ch3 - db CH3 - dw Music_Routes3_Ch4 + dbw ( $C0 | CH0 ), Music_Routes3_Ch1 + dbw CH1, Music_Routes3_Ch2 + dbw CH2, Music_Routes3_Ch3 + dbw CH3, Music_Routes3_Ch4 ; Routes 11, 12, 13, 14, 15 Music_Routes4:: ; 82d5 (2:42d5) - db ( $C0 | CH0 ) - dw Music_Routes4_Ch1 - db CH1 - dw Music_Routes4_Ch2 - db CH2 - dw Music_Routes4_Ch3 - db CH3 - dw Music_Routes4_Ch4 + dbw ( $C0 | CH0 ), Music_Routes4_Ch1 + dbw CH1, Music_Routes4_Ch2 + dbw CH2, Music_Routes4_Ch3 + dbw CH3, Music_Routes4_Ch4 ; Route 23, Indigo Plateau Music_IndigoPlateau:: ; 82f1 (2:42f1) - db ( $C0 | CH0 ) - dw Music_IndigoPlateau_Ch1 - db CH1 - dw Music_IndigoPlateau_Ch2 - db CH2 - dw Music_IndigoPlateau_Ch3 - db CH3 - dw Music_IndigoPlateau_Ch4 + dbw ( $C0 | CH0 ), Music_IndigoPlateau_Ch1 + dbw CH1, Music_IndigoPlateau_Ch2 + dbw CH2, Music_IndigoPlateau_Ch3 + dbw CH3, Music_IndigoPlateau_Ch4 diff --git a/audio/headers/musicheaders2.asm b/audio/headers/musicheaders2.asm index 85cf2825..1862a040 100644 --- a/audio/headers/musicheaders2.asm +++ b/audio/headers/musicheaders2.asm @@ -1,57 +1,36 @@ Music_GymLeaderBattle:: ; 202be (8:42be) - db ( $80 | CH0 ) - dw Music_GymLeaderBattle_Ch1 - db CH1 - dw Music_GymLeaderBattle_Ch2 - db CH2 - dw Music_GymLeaderBattle_Ch3 + dbw ( $80 | CH0 ), Music_GymLeaderBattle_Ch1 + dbw CH1, Music_GymLeaderBattle_Ch2 + dbw CH2, Music_GymLeaderBattle_Ch3 Music_TrainerBattle:: ; 202c7 (8:42c7) - db ( $80 | CH0 ) - dw Music_TrainerBattle_Ch1 - db CH1 - dw Music_TrainerBattle_Ch2 - db CH2 - dw Music_TrainerBattle_Ch3 + dbw ( $80 | CH0 ), Music_TrainerBattle_Ch1 + dbw CH1, Music_TrainerBattle_Ch2 + dbw CH2, Music_TrainerBattle_Ch3 Music_WildBattle:: ; 202d0 (8:42d0) - db ( $80 | CH0 ) - dw Music_WildBattle_Ch1 - db CH1 - dw Music_WildBattle_Ch2 - db CH2 - dw Music_WildBattle_Ch3 + dbw ( $80 | CH0 ), Music_WildBattle_Ch1 + dbw CH1, Music_WildBattle_Ch2 + dbw CH2, Music_WildBattle_Ch3 Music_FinalBattle:: ; 202d9 (8:42d9) - db ( $80 | CH0 ) - dw Music_FinalBattle_Ch1 - db CH1 - dw Music_FinalBattle_Ch2 - db CH2 - dw Music_FinalBattle_Ch3 + dbw ( $80 | CH0 ), Music_FinalBattle_Ch1 + dbw CH1, Music_FinalBattle_Ch2 + dbw CH2, Music_FinalBattle_Ch3 Music_DefeatedTrainer:: ; 202e2 (8:42e2) - db ( $80 | CH0 ) - dw Music_DefeatedTrainer_Ch1 - db CH1 - dw Music_DefeatedTrainer_Ch2 - db CH2 - dw Music_DefeatedTrainer_Ch3 + dbw ( $80 | CH0 ), Music_DefeatedTrainer_Ch1 + dbw CH1, Music_DefeatedTrainer_Ch2 + dbw CH2, Music_DefeatedTrainer_Ch3 Music_DefeatedWildMon:: ; 202eb (8:42eb) - db ( $80 | CH0 ) - dw Music_DefeatedWildMon_Ch1 - db CH1 - dw Music_DefeatedWildMon_Ch2 - db CH2 - dw Music_DefeatedWildMon_Ch3 + dbw ( $80 | CH0 ), Music_DefeatedWildMon_Ch1 + dbw CH1, Music_DefeatedWildMon_Ch2 + dbw CH2, Music_DefeatedWildMon_Ch3 Music_DefeatedGymLeader:: ; 202f4 (8:42f4) - db ( $80 | CH0 ) - dw Music_DefeatedGymLeader_Ch1 - db CH1 - dw Music_DefeatedGymLeader_Ch2 - db CH2 - dw Music_DefeatedGymLeader_Ch3 + dbw ( $80 | CH0 ), Music_DefeatedGymLeader_Ch1 + dbw CH1, Music_DefeatedGymLeader_Ch2 + dbw CH2, Music_DefeatedGymLeader_Ch3 ; 202fd diff --git a/audio/headers/musicheaders3.asm b/audio/headers/musicheaders3.asm index be83f2ee..a1bfaad2 100644 --- a/audio/headers/musicheaders3.asm +++ b/audio/headers/musicheaders3.asm @@ -1,156 +1,97 @@ Music_TitleScreen:: ; 7c249 (1f:4249) - db ( $C0 | CH0 ) - dw Music_TitleScreen_Ch1 - db CH1 - dw Music_TitleScreen_Ch2 - db CH2 - dw Music_TitleScreen_Ch3 - db CH3 - dw Music_TitleScreen_Ch4 + dbw ( $C0 | CH0 ), Music_TitleScreen_Ch1 + dbw CH1, Music_TitleScreen_Ch2 + dbw CH2, Music_TitleScreen_Ch3 + dbw CH3, Music_TitleScreen_Ch4 Music_Credits:: ; 7c255 (1f:4255) - db ( $80 | CH0 ) - dw Music_Credits_Ch1 - db CH1 - dw Music_Credits_Ch2 - db CH2 - dw Music_Credits_Ch3 + dbw ( $80 | CH0 ), Music_Credits_Ch1 + dbw CH1, Music_Credits_Ch2 + dbw CH2, Music_Credits_Ch3 Music_HallOfFame:: ; 7c25e (1f:425e) - db ( $80 | CH0 ) - dw Music_HallOfFame_Ch1 - db CH1 - dw Music_HallOfFame_Ch2 - db CH2 - dw Music_HallOfFame_Ch3 + dbw ( $80 | CH0 ), Music_HallOfFame_Ch1 + dbw CH1, Music_HallOfFame_Ch2 + dbw CH2, Music_HallOfFame_Ch3 Music_OaksLab:: ; 7c267 (1f:4267) - db ( $80 | CH0 ) - dw Music_OaksLab_Ch1 - db CH1 - dw Music_OaksLab_Ch2 - db CH2 - dw Music_OaksLab_Ch3 + dbw ( $80 | CH0 ), Music_OaksLab_Ch1 + dbw CH1, Music_OaksLab_Ch2 + dbw CH2, Music_OaksLab_Ch3 Music_JigglypuffSong:: ; 7c270 (1f:4270) - db $40 - dw Music_JigglypuffSong_Ch1 - db CH1 - dw Music_JigglypuffSong_Ch2 + dbw $40, Music_JigglypuffSong_Ch1 + dbw CH1, Music_JigglypuffSong_Ch2 Music_BikeRiding:: ; 7c276 (1f:4276) - db ( $C0 | CH0 ) - dw Music_BikeRiding_Ch1 - db CH1 - dw Music_BikeRiding_Ch2 - db CH2 - dw Music_BikeRiding_Ch3 - db CH3 - dw Music_BikeRiding_Ch4 + dbw ( $C0 | CH0 ), Music_BikeRiding_Ch1 + dbw CH1, Music_BikeRiding_Ch2 + dbw CH2, Music_BikeRiding_Ch3 + dbw CH3, Music_BikeRiding_Ch4 Music_Surfing:: ; 7c282 (1f:4282) - db ( $80 | CH0 ) - dw Music_Surfing_Ch1 - db CH1 - dw Music_Surfing_Ch2 - db CH2 - dw Music_Surfing_Ch3 + dbw ( $80 | CH0 ), Music_Surfing_Ch1 + dbw CH1, Music_Surfing_Ch2 + dbw CH2, Music_Surfing_Ch3 Music_GameCorner:: ; 7c28b (1f:428b) - db ( $80 | CH0 ) - dw Music_GameCorner_Ch1 - db CH1 - dw Music_GameCorner_Ch2 - db CH2 - dw Music_GameCorner_Ch3 + dbw ( $80 | CH0 ), Music_GameCorner_Ch1 + dbw CH1, Music_GameCorner_Ch2 + dbw CH2, Music_GameCorner_Ch3 Music_IntroBattle:: ; 7c294 (1f:4294) - db ( $80 | CH0 ) - dw Music_YellowIntro_Ch1 - db CH1 - dw Music_YellowIntro_Ch2 - db CH2 - dw Music_YellowIntro_Ch3 + dbw ( $80 | CH0 ), Music_YellowIntro_Ch1 + dbw CH1, Music_YellowIntro_Ch2 + dbw CH2, Music_YellowIntro_Ch3 ; Power Plant, Unknown Dungeon, Rocket HQ Music_Dungeon1:: ; 7c2a0 (1f:42a0) - db ( $C0 | CH0 ) - dw Music_Dungeon1_Ch1 - db CH1 - dw Music_Dungeon1_Ch2 - db CH2 - dw Music_Dungeon1_Ch3 - db CH3 - dw Music_Dungeon1_Ch4 + dbw ( $C0 | CH0 ), Music_Dungeon1_Ch1 + dbw CH1, Music_Dungeon1_Ch2 + dbw CH2, Music_Dungeon1_Ch3 + dbw CH3, Music_Dungeon1_Ch4 ; Viridian Forest, Seafoam Islands Music_Dungeon2:: ; 7c2ac (1f:42ac) - db ( $C0 | CH0 ) - dw Music_Dungeon2_Ch1 - db CH1 - dw Music_Dungeon2_Ch2 - db CH2 - dw Music_Dungeon2_Ch3 - db CH3 - dw Music_Dungeon2_Ch4 + dbw ( $C0 | CH0 ), Music_Dungeon2_Ch1 + dbw CH1, Music_Dungeon2_Ch2 + dbw CH2, Music_Dungeon2_Ch3 + dbw CH3, Music_Dungeon2_Ch4 ; Mt. Moon, Rock Tunnel, Victory Road Music_Dungeon3:: ; 7c2b8 (1f:42b8) - db ( $C0 | CH0 ) - dw Music_Dungeon3_Ch1 - db CH1 - dw Music_Dungeon3_Ch2 - db CH2 - dw Music_Dungeon3_Ch3 - db CH3 - dw Music_Dungeon3_Ch4 + dbw ( $C0 | CH0 ), Music_Dungeon3_Ch1 + dbw CH1, Music_Dungeon3_Ch2 + dbw CH2, Music_Dungeon3_Ch3 + dbw CH3, Music_Dungeon3_Ch4 Music_CinnabarMansion:: ; 7c2c4 (1f:42c4) - db ( $C0 | CH0 ) - dw Music_CinnabarMansion_Ch1 - db CH1 - dw Music_CinnabarMansion_Ch2 - db CH2 - dw Music_CinnabarMansion_Ch3 - db CH3 - dw Music_CinnabarMansion_Ch4 + dbw ( $C0 | CH0 ), Music_CinnabarMansion_Ch1 + dbw CH1, Music_CinnabarMansion_Ch2 + dbw CH2, Music_CinnabarMansion_Ch3 + dbw CH3, Music_CinnabarMansion_Ch4 Music_PokemonTower:: ; 7c2d0 (1f:42d0) - db ( $80 | CH0 ) - dw Music_PokemonTower_Ch1 - db CH1 - dw Music_PokemonTower_Ch2 - db CH2 - dw Music_PokemonTower_Ch3 + dbw ( $80 | CH0 ), Music_PokemonTower_Ch1 + dbw CH1, Music_PokemonTower_Ch2 + dbw CH2, Music_PokemonTower_Ch3 Music_SilphCo:: ; 7c2d9 (1f:42d9) - db ( $80 | CH0 ) - dw Music_SilphCo_Ch1 - db CH1 - dw Music_SilphCo_Ch2 - db CH2 - dw Music_SilphCo_Ch3 + dbw ( $80 | CH0 ), Music_SilphCo_Ch1 + dbw CH1, Music_SilphCo_Ch2 + dbw CH2, Music_SilphCo_Ch3 Music_MeetEvilTrainer:: ; 7c2e2 (1f:42e2) - db ( $80 | CH0 ) - dw Music_MeetEvilTrainer_Ch1 - db CH1 - dw Music_MeetEvilTrainer_Ch2 - db CH2 - dw Music_MeetEvilTrainer_Ch3 + dbw ( $80 | CH0 ), Music_MeetEvilTrainer_Ch1 + dbw CH1, Music_MeetEvilTrainer_Ch2 + dbw CH2, Music_MeetEvilTrainer_Ch3 Music_MeetFemaleTrainer:: ; 7c2eb (1f:42eb) - db ( $80 | CH0 ) - dw Music_MeetFemaleTrainer_Ch1 - db CH1 - dw Music_MeetFemaleTrainer_Ch2 - db CH2 - dw Music_MeetFemaleTrainer_Ch3 + dbw ( $80 | CH0 ), Music_MeetFemaleTrainer_Ch1 + dbw CH1, Music_MeetFemaleTrainer_Ch2 + dbw CH2, Music_MeetFemaleTrainer_Ch3 Music_MeetMaleTrainer:: ; 7c2f4 (1f:42f4) - db ( $80 | CH0 ) - dw Music_MeetMaleTrainer_Ch1 - db CH1 - dw Music_MeetMaleTrainer_Ch2 - db CH2 - dw Music_MeetMaleTrainer_Ch3 + dbw ( $80 | CH0 ), Music_MeetMaleTrainer_Ch1 + dbw CH1, Music_MeetMaleTrainer_Ch2 + dbw CH2, Music_MeetMaleTrainer_Ch3 diff --git a/audio/headers/musicheaders4.asm b/audio/headers/musicheaders4.asm index 76678dcb..7f26601e 100644 --- a/audio/headers/musicheaders4.asm +++ b/audio/headers/musicheaders4.asm @@ -1,22 +1,18 @@ - db $80 - dw $6ce8 - db $1 - dw $6d9d - db $2 - dw $6e45 - db $80 - dw $716d - db $1 - dw $71c8 - db $2 - dw $722a - db $c0 - dw $6fbe - db $1 - dw $7010 - db $2 - dw $7068 - db $3 - dw $7092 - db $2 - dw $4d1a
\ No newline at end of file +Music_SurfingPikachu:: + dbw ((3 - 1) << 6) | CH0, Music_SurfingPikachu_Ch1 + dbw CH1, Music_SurfingPikachu_Ch2 + dbw CH2, Music_SurfingPikachu_Ch3 + +Music_JessieAndJames:: + dbw ((3 - 1) << 6) | CH0, Music_JessieAndJames_Ch1 + dbw CH1, Music_JessieAndJames_Ch2 + dbw CH2, Music_JessieAndJames_Ch3 + +Music_YellowUnusedSong:: + dbw ((4 - 1) << 6) | CH0, Music_YellowUnusedSong_Ch1 + dbw CH1, Music_YellowUnusedSong_Ch2 + dbw CH2, Music_YellowUnusedSong_Ch3 + dbw CH3, Music_YellowUnusedSong_Ch4 + +Music_GBPrinter:: + dbw ((1 - 1) << 6) | CH2, Music_GBPrinter_Ch3 diff --git a/audio/headers/sfxheaders1.asm b/audio/headers/sfxheaders1.asm index 49370aa4..8a24fcb5 100644 --- a/audio/headers/sfxheaders1.asm +++ b/audio/headers/sfxheaders1.asm @@ -1,562 +1,377 @@ SFX_Headers_1:: - db $ff, $ff, $ff ; padding + dbw -1, -1 ; padding SFX_Snare1_1:: ; 8003 (2:4003) - db CH7 - dw SFX_Snare1_1_Ch1 + dbw CH7, SFX_Snare1_1_Ch1 SFX_Snare2_1:: ; 8006 (2:4006) - db CH7 - dw SFX_Snare2_1_Ch1 + dbw CH7, SFX_Snare2_1_Ch1 SFX_Snare3_1:: ; 8009 (2:4009) - db CH7 - dw SFX_Snare3_1_Ch1 + dbw CH7, SFX_Snare3_1_Ch1 SFX_Snare4_1:: ; 800c (2:400c) - db CH7 - dw SFX_Snare4_1_Ch1 + dbw CH7, SFX_Snare4_1_Ch1 SFX_Snare5_1:: ; 800f (2:400f) - db CH7 - dw SFX_Snare5_1_Ch1 + dbw CH7, SFX_Snare5_1_Ch1 SFX_Triangle1_1:: ; 8012 (2:4012) - db CH7 - dw SFX_Triangle1_1_Ch1 + dbw CH7, SFX_Triangle1_1_Ch1 SFX_Triangle2_1:: ; 8015 (2:4015) - db CH7 - dw SFX_Triangle2_1_Ch1 + dbw CH7, SFX_Triangle2_1_Ch1 SFX_Snare6_1:: ; 8018 (2:4018) - db CH7 - dw SFX_Snare6_1_Ch1 + dbw CH7, SFX_Snare6_1_Ch1 SFX_Snare7_1:: ; 801b (2:401b) - db CH7 - dw SFX_Snare7_1_Ch1 + dbw CH7, SFX_Snare7_1_Ch1 SFX_Snare8_1:: ; 801e (2:401e) - db CH7 - dw SFX_Snare8_1_Ch1 + dbw CH7, SFX_Snare8_1_Ch1 SFX_Snare9_1:: ; 8021 (2:4021) - db CH7 - dw SFX_Snare9_1_Ch1 + dbw CH7, SFX_Snare9_1_Ch1 SFX_Cymbal1_1:: ; 8024 (2:4024) - db CH7 - dw SFX_Cymbal1_1_Ch1 + dbw CH7, SFX_Cymbal1_1_Ch1 SFX_Cymbal2_1:: ; 8027 (2:4027) - db CH7 - dw SFX_Cymbal2_1_Ch1 + dbw CH7, SFX_Cymbal2_1_Ch1 SFX_Cymbal3_1:: ; 802a (2:402a) - db CH7 - dw SFX_Cymbal3_1_Ch1 + dbw CH7, SFX_Cymbal3_1_Ch1 SFX_Muted_Snare1_1:: ; 802d (2:402d) - db CH7 - dw SFX_Muted_Snare1_1_Ch1 + dbw CH7, SFX_Muted_Snare1_1_Ch1 SFX_Triangle3_1:: ; 8030 (2:4030) - db CH7 - dw SFX_Triangle3_1_Ch1 + dbw CH7, SFX_Triangle3_1_Ch1 SFX_Muted_Snare2_1:: ; 8033 (2:4033) - db CH7 - dw SFX_Muted_Snare2_1_Ch1 + dbw CH7, SFX_Muted_Snare2_1_Ch1 SFX_Muted_Snare3_1:: ; 8036 (2:4036) - db CH7 - dw SFX_Muted_Snare3_1_Ch1 + dbw CH7, SFX_Muted_Snare3_1_Ch1 SFX_Muted_Snare4_1:: ; 8039 (2:4039) - db CH7 - dw SFX_Muted_Snare4_1_Ch1 + dbw CH7, SFX_Muted_Snare4_1_Ch1 SFX_Cry00_1:: ; 803c (2:403c) - db ( $80 | CH4 ) - dw SFX_Cry00_1_Ch1 - db CH5 - dw SFX_Cry00_1_Ch2 - db CH7 - dw SFX_Cry00_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry00_1_Ch1 + dbw CH5, SFX_Cry00_1_Ch2 + dbw CH7, SFX_Cry00_1_Ch3 SFX_Cry01_1:: ; 8045 (2:4045) - db ( $80 | CH4 ) - dw SFX_Cry01_1_Ch1 - db CH5 - dw SFX_Cry01_1_Ch2 - db CH7 - dw SFX_Cry01_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry01_1_Ch1 + dbw CH5, SFX_Cry01_1_Ch2 + dbw CH7, SFX_Cry01_1_Ch3 SFX_Cry02_1:: ; 804e (2:404e) - db ( $80 | CH4 ) - dw SFX_Cry02_1_Ch1 - db CH5 - dw SFX_Cry02_1_Ch2 - db CH7 - dw SFX_Cry02_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry02_1_Ch1 + dbw CH5, SFX_Cry02_1_Ch2 + dbw CH7, SFX_Cry02_1_Ch3 SFX_Cry03_1:: ; 8057 (2:4057) - db ( $80 | CH4 ) - dw SFX_Cry03_1_Ch1 - db CH5 - dw SFX_Cry03_1_Ch2 - db CH7 - dw SFX_Cry03_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry03_1_Ch1 + dbw CH5, SFX_Cry03_1_Ch2 + dbw CH7, SFX_Cry03_1_Ch3 SFX_Cry04_1:: ; 8060 (2:4060) - db ( $80 | CH4 ) - dw SFX_Cry04_1_Ch1 - db CH5 - dw SFX_Cry04_1_Ch2 - db CH7 - dw SFX_Cry04_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry04_1_Ch1 + dbw CH5, SFX_Cry04_1_Ch2 + dbw CH7, SFX_Cry04_1_Ch3 SFX_Cry05_1:: ; 8069 (2:4069) - db ( $80 | CH4 ) - dw SFX_Cry05_1_Ch1 - db CH5 - dw SFX_Cry05_1_Ch2 - db CH7 - dw SFX_Cry05_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry05_1_Ch1 + dbw CH5, SFX_Cry05_1_Ch2 + dbw CH7, SFX_Cry05_1_Ch3 SFX_Cry06_1:: ; 8072 (2:4072) - db ( $80 | CH4 ) - dw SFX_Cry06_1_Ch1 - db CH5 - dw SFX_Cry06_1_Ch2 - db CH7 - dw SFX_Cry06_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry06_1_Ch1 + dbw CH5, SFX_Cry06_1_Ch2 + dbw CH7, SFX_Cry06_1_Ch3 SFX_Cry07_1:: ; 807b (2:407b) - db ( $80 | CH4 ) - dw SFX_Cry07_1_Ch1 - db CH5 - dw SFX_Cry07_1_Ch2 - db CH7 - dw SFX_Cry07_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry07_1_Ch1 + dbw CH5, SFX_Cry07_1_Ch2 + dbw CH7, SFX_Cry07_1_Ch3 SFX_Cry08_1:: ; 8084 (2:4084) - db ( $80 | CH4 ) - dw SFX_Cry08_1_Ch1 - db CH5 - dw SFX_Cry08_1_Ch2 - db CH7 - dw SFX_Cry08_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry08_1_Ch1 + dbw CH5, SFX_Cry08_1_Ch2 + dbw CH7, SFX_Cry08_1_Ch3 SFX_Cry09_1:: ; 808d (2:408d) - db ( $80 | CH4 ) - dw SFX_Cry09_1_Ch1 - db CH5 - dw SFX_Cry09_1_Ch2 - db CH7 - dw SFX_Cry09_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry09_1_Ch1 + dbw CH5, SFX_Cry09_1_Ch2 + dbw CH7, SFX_Cry09_1_Ch3 SFX_Cry0A_1:: ; 8096 (2:4096) - db ( $80 | CH4 ) - dw SFX_Cry0A_1_Ch1 - db CH5 - dw SFX_Cry0A_1_Ch2 - db CH7 - dw SFX_Cry0A_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0A_1_Ch1 + dbw CH5, SFX_Cry0A_1_Ch2 + dbw CH7, SFX_Cry0A_1_Ch3 SFX_Cry0B_1:: ; 809f (2:409f) - db ( $80 | CH4 ) - dw SFX_Cry0B_1_Ch1 - db CH5 - dw SFX_Cry0B_1_Ch2 - db CH7 - dw SFX_Cry0B_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0B_1_Ch1 + dbw CH5, SFX_Cry0B_1_Ch2 + dbw CH7, SFX_Cry0B_1_Ch3 SFX_Cry0C_1:: ; 80a8 (2:40a8) - db ( $80 | CH4 ) - dw SFX_Cry0C_1_Ch1 - db CH5 - dw SFX_Cry0C_1_Ch2 - db CH7 - dw SFX_Cry0C_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0C_1_Ch1 + dbw CH5, SFX_Cry0C_1_Ch2 + dbw CH7, SFX_Cry0C_1_Ch3 SFX_Cry0D_1:: ; 80b1 (2:40b1) - db ( $80 | CH4 ) - dw SFX_Cry0D_1_Ch1 - db CH5 - dw SFX_Cry0D_1_Ch2 - db CH7 - dw SFX_Cry0D_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0D_1_Ch1 + dbw CH5, SFX_Cry0D_1_Ch2 + dbw CH7, SFX_Cry0D_1_Ch3 SFX_Cry0E_1:: ; 80ba (2:40ba) - db ( $80 | CH4 ) - dw SFX_Cry0E_1_Ch1 - db CH5 - dw SFX_Cry0E_1_Ch2 - db CH7 - dw SFX_Cry0E_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0E_1_Ch1 + dbw CH5, SFX_Cry0E_1_Ch2 + dbw CH7, SFX_Cry0E_1_Ch3 SFX_Cry0F_1:: ; 80c3 (2:40c3) - db ( $80 | CH4 ) - dw SFX_Cry0F_1_Ch1 - db CH5 - dw SFX_Cry0F_1_Ch2 - db CH7 - dw SFX_Cry0F_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0F_1_Ch1 + dbw CH5, SFX_Cry0F_1_Ch2 + dbw CH7, SFX_Cry0F_1_Ch3 SFX_Cry10_1:: ; 80cc (2:40cc) - db ( $80 | CH4 ) - dw SFX_Cry10_1_Ch1 - db CH5 - dw SFX_Cry10_1_Ch2 - db CH7 - dw SFX_Cry10_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry10_1_Ch1 + dbw CH5, SFX_Cry10_1_Ch2 + dbw CH7, SFX_Cry10_1_Ch3 SFX_Cry11_1:: ; 80d5 (2:40d5) - db ( $80 | CH4 ) - dw SFX_Cry11_1_Ch1 - db CH5 - dw SFX_Cry11_1_Ch2 - db CH7 - dw SFX_Cry11_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry11_1_Ch1 + dbw CH5, SFX_Cry11_1_Ch2 + dbw CH7, SFX_Cry11_1_Ch3 SFX_Cry12_1:: ; 80de (2:40de) - db ( $80 | CH4 ) - dw SFX_Cry12_1_Ch1 - db CH5 - dw SFX_Cry12_1_Ch2 - db CH7 - dw SFX_Cry12_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry12_1_Ch1 + dbw CH5, SFX_Cry12_1_Ch2 + dbw CH7, SFX_Cry12_1_Ch3 SFX_Cry13_1:: ; 80e7 (2:40e7) - db ( $80 | CH4 ) - dw SFX_Cry13_1_Ch1 - db CH5 - dw SFX_Cry13_1_Ch2 - db CH7 - dw SFX_Cry13_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry13_1_Ch1 + dbw CH5, SFX_Cry13_1_Ch2 + dbw CH7, SFX_Cry13_1_Ch3 SFX_Cry14_1:: ; 80f0 (2:40f0) - db ( $80 | CH4 ) - dw SFX_Cry14_1_Ch1 - db CH5 - dw SFX_Cry14_1_Ch2 - db CH7 - dw SFX_Cry14_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry14_1_Ch1 + dbw CH5, SFX_Cry14_1_Ch2 + dbw CH7, SFX_Cry14_1_Ch3 SFX_Cry15_1:: ; 80f9 (2:40f9) - db ( $80 | CH4 ) - dw SFX_Cry15_1_Ch1 - db CH5 - dw SFX_Cry15_1_Ch2 - db CH7 - dw SFX_Cry15_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry15_1_Ch1 + dbw CH5, SFX_Cry15_1_Ch2 + dbw CH7, SFX_Cry15_1_Ch3 SFX_Cry16_1:: ; 8102 (2:4102) - db ( $80 | CH4 ) - dw SFX_Cry16_1_Ch1 - db CH5 - dw SFX_Cry16_1_Ch2 - db CH7 - dw SFX_Cry16_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry16_1_Ch1 + dbw CH5, SFX_Cry16_1_Ch2 + dbw CH7, SFX_Cry16_1_Ch3 SFX_Cry17_1:: ; 810b (2:410b) - db ( $80 | CH4 ) - dw SFX_Cry17_1_Ch1 - db CH5 - dw SFX_Cry17_1_Ch2 - db CH7 - dw SFX_Cry17_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry17_1_Ch1 + dbw CH5, SFX_Cry17_1_Ch2 + dbw CH7, SFX_Cry17_1_Ch3 SFX_Cry18_1:: ; 8114 (2:4114) - db ( $80 | CH4 ) - dw SFX_Cry18_1_Ch1 - db CH5 - dw SFX_Cry18_1_Ch2 - db CH7 - dw SFX_Cry18_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry18_1_Ch1 + dbw CH5, SFX_Cry18_1_Ch2 + dbw CH7, SFX_Cry18_1_Ch3 SFX_Cry19_1:: ; 811d (2:411d) - db ( $80 | CH4 ) - dw SFX_Cry19_1_Ch1 - db CH5 - dw SFX_Cry19_1_Ch2 - db CH7 - dw SFX_Cry19_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry19_1_Ch1 + dbw CH5, SFX_Cry19_1_Ch2 + dbw CH7, SFX_Cry19_1_Ch3 SFX_Cry1A_1:: ; 8126 (2:4126) - db ( $80 | CH4 ) - dw SFX_Cry1A_1_Ch1 - db CH5 - dw SFX_Cry1A_1_Ch2 - db CH7 - dw SFX_Cry1A_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1A_1_Ch1 + dbw CH5, SFX_Cry1A_1_Ch2 + dbw CH7, SFX_Cry1A_1_Ch3 SFX_Cry1B_1:: ; 812f (2:412f) - db ( $80 | CH4 ) - dw SFX_Cry1B_1_Ch1 - db CH5 - dw SFX_Cry1B_1_Ch2 - db CH7 - dw SFX_Cry1B_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1B_1_Ch1 + dbw CH5, SFX_Cry1B_1_Ch2 + dbw CH7, SFX_Cry1B_1_Ch3 SFX_Cry1C_1:: ; 8138 (2:4138) - db ( $80 | CH4 ) - dw SFX_Cry1C_1_Ch1 - db CH5 - dw SFX_Cry1C_1_Ch2 - db CH7 - dw SFX_Cry1C_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1C_1_Ch1 + dbw CH5, SFX_Cry1C_1_Ch2 + dbw CH7, SFX_Cry1C_1_Ch3 SFX_Cry1D_1:: ; 8141 (2:4141) - db ( $80 | CH4 ) - dw SFX_Cry1D_1_Ch1 - db CH5 - dw SFX_Cry1D_1_Ch2 - db CH7 - dw SFX_Cry1D_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1D_1_Ch1 + dbw CH5, SFX_Cry1D_1_Ch2 + dbw CH7, SFX_Cry1D_1_Ch3 SFX_Cry1E_1:: ; 814a (2:414a) - db ( $80 | CH4 ) - dw SFX_Cry1E_1_Ch1 - db CH5 - dw SFX_Cry1E_1_Ch2 - db CH7 - dw SFX_Cry1E_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1E_1_Ch1 + dbw CH5, SFX_Cry1E_1_Ch2 + dbw CH7, SFX_Cry1E_1_Ch3 SFX_Cry1F_1:: ; 8153 (2:4153) - db ( $80 | CH4 ) - dw SFX_Cry1F_1_Ch1 - db CH5 - dw SFX_Cry1F_1_Ch2 - db CH7 - dw SFX_Cry1F_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1F_1_Ch1 + dbw CH5, SFX_Cry1F_1_Ch2 + dbw CH7, SFX_Cry1F_1_Ch3 SFX_Cry20_1:: ; 815c (2:415c) - db ( $80 | CH4 ) - dw SFX_Cry20_1_Ch1 - db CH5 - dw SFX_Cry20_1_Ch2 - db CH7 - dw SFX_Cry20_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry20_1_Ch1 + dbw CH5, SFX_Cry20_1_Ch2 + dbw CH7, SFX_Cry20_1_Ch3 SFX_Cry21_1:: ; 8165 (2:4165) - db ( $80 | CH4 ) - dw SFX_Cry21_1_Ch1 - db CH5 - dw SFX_Cry21_1_Ch2 - db CH7 - dw SFX_Cry21_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry21_1_Ch1 + dbw CH5, SFX_Cry21_1_Ch2 + dbw CH7, SFX_Cry21_1_Ch3 SFX_Cry22_1:: ; 816e (2:416e) - db ( $80 | CH4 ) - dw SFX_Cry22_1_Ch1 - db CH5 - dw SFX_Cry22_1_Ch2 - db CH7 - dw SFX_Cry22_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry22_1_Ch1 + dbw CH5, SFX_Cry22_1_Ch2 + dbw CH7, SFX_Cry22_1_Ch3 SFX_Cry23_1:: ; 8177 (2:4177) - db ( $80 | CH4 ) - dw SFX_Cry23_1_Ch1 - db CH5 - dw SFX_Cry23_1_Ch2 - db CH7 - dw SFX_Cry23_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry23_1_Ch1 + dbw CH5, SFX_Cry23_1_Ch2 + dbw CH7, SFX_Cry23_1_Ch3 SFX_Cry24_1:: ; 8180 (2:4180) - db ( $80 | CH4 ) - dw SFX_Cry24_1_Ch1 - db CH5 - dw SFX_Cry24_1_Ch2 - db CH7 - dw SFX_Cry24_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry24_1_Ch1 + dbw CH5, SFX_Cry24_1_Ch2 + dbw CH7, SFX_Cry24_1_Ch3 SFX_Cry25_1:: ; 8189 (2:4189) - db ( $80 | CH4 ) - dw SFX_Cry25_1_Ch1 - db CH5 - dw SFX_Cry25_1_Ch2 - db CH7 - dw SFX_Cry25_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry25_1_Ch1 + dbw CH5, SFX_Cry25_1_Ch2 + dbw CH7, SFX_Cry25_1_Ch3 SFX_Get_Item1_1:: ; 8192 (2:4192) - db ( $80 | CH4 ) - dw SFX_Get_Item1_1_Ch1 - db CH5 - dw SFX_Get_Item1_1_Ch2 - db CH6 - dw SFX_Get_Item1_1_Ch3 + dbw ( $80 | CH4 ), SFX_Get_Item1_1_Ch1 + dbw CH5, SFX_Get_Item1_1_Ch2 + dbw CH6, SFX_Get_Item1_1_Ch3 SFX_Get_Item2_1:: ; 819b (2:419b) - db ( $80 | CH4 ) - dw SFX_Get_Item2_1_Ch1 - db CH5 - dw SFX_Get_Item2_1_Ch2 - db CH6 - dw SFX_Get_Item2_1_Ch3 + dbw ( $80 | CH4 ), SFX_Get_Item2_1_Ch1 + dbw CH5, SFX_Get_Item2_1_Ch2 + dbw CH6, SFX_Get_Item2_1_Ch3 SFX_Tink_1:: ; 81a4 (2:41a4) - db CH4 - dw SFX_Tink_1_Ch1 + dbw CH4, SFX_Tink_1_Ch1 SFX_Heal_HP_1:: ; 81a7 (2:41a7) - db CH4 - dw SFX_Heal_HP_1_Ch1 + dbw CH4, SFX_Heal_HP_1_Ch1 SFX_Heal_Ailment_1:: ; 81aa (2:41aa) - db CH4 - dw SFX_Heal_Ailment_1_Ch1 + dbw CH4, SFX_Heal_Ailment_1_Ch1 SFX_Start_Menu_1:: ; 81ad (2:41ad) - db CH7 - dw SFX_Start_Menu_1_Ch1 + dbw CH7, SFX_Start_Menu_1_Ch1 SFX_Press_AB_1:: ; 81b0 (2:41b0) - db CH4 - dw SFX_Press_AB_1_Ch1 + dbw CH4, SFX_Press_AB_1_Ch1 SFX_Pokedex_Rating_1:: ; 81b3 (2:41b3) - db ( $80 | CH4 ) - dw SFX_Pokedex_Rating_1_Ch1 - db CH5 - dw SFX_Pokedex_Rating_1_Ch2 - db CH6 - dw SFX_Pokedex_Rating_1_Ch3 + dbw ( $80 | CH4 ), SFX_Pokedex_Rating_1_Ch1 + dbw CH5, SFX_Pokedex_Rating_1_Ch2 + dbw CH6, SFX_Pokedex_Rating_1_Ch3 SFX_Get_Key_Item_1:: ; 81bc (2:41bc) - db ( $80 | CH4 ) - dw SFX_Get_Key_Item_1_Ch1 - db CH5 - dw SFX_Get_Key_Item_1_Ch2 - db CH6 - dw SFX_Get_Key_Item_1_Ch3 + dbw ( $80 | CH4 ), SFX_Get_Key_Item_1_Ch1 + dbw CH5, SFX_Get_Key_Item_1_Ch2 + dbw CH6, SFX_Get_Key_Item_1_Ch3 SFX_Poisoned_1:: ; 81c5 (2:41c5) - db CH4 - dw SFX_Poisoned_1_Ch1 + dbw CH4, SFX_Poisoned_1_Ch1 SFX_Trade_Machine_1:: ; 81c8 (2:41c8) - db CH4 - dw SFX_Trade_Machine_1_Ch1 + dbw CH4, SFX_Trade_Machine_1_Ch1 SFX_Turn_On_PC_1:: ; 81cb (2:41cb) - db CH4 - dw SFX_Turn_On_PC_1_Ch1 + dbw CH4, SFX_Turn_On_PC_1_Ch1 SFX_Turn_Off_PC_1:: ; 81ce (2:41ce) - db CH4 - dw SFX_Turn_Off_PC_1_Ch1 + dbw CH4, SFX_Turn_Off_PC_1_Ch1 SFX_Enter_PC_1:: ; 81d1 (2:41d1) - db CH4 - dw SFX_Enter_PC_1_Ch1 + dbw CH4, SFX_Enter_PC_1_Ch1 SFX_Shrink_1:: ; 81d4 (2:41d4) - db CH4 - dw SFX_Shrink_1_Ch1 + dbw CH4, SFX_Shrink_1_Ch1 SFX_Switch_1:: ; 81d7 (2:41d7) - db CH4 - dw SFX_Switch_1_Ch1 + dbw CH4, SFX_Switch_1_Ch1 SFX_Healing_Machine_1:: ; 81da (2:41da) - db CH4 - dw SFX_Healing_Machine_1_Ch1 + dbw CH4, SFX_Healing_Machine_1_Ch1 SFX_Teleport_Exit1_1:: ; 81dd (2:41dd) - db CH4 - dw SFX_Teleport_Exit1_1_Ch1 + dbw CH4, SFX_Teleport_Exit1_1_Ch1 SFX_Teleport_Enter1_1:: ; 81e0 (2:41e0) - db CH4 - dw SFX_Teleport_Enter1_1_Ch1 + dbw CH4, SFX_Teleport_Enter1_1_Ch1 SFX_Teleport_Exit2_1:: ; 81e3 (2:41e3) - db CH4 - dw SFX_Teleport_Exit2_1_Ch1 + dbw CH4, SFX_Teleport_Exit2_1_Ch1 SFX_Ledge_1:: ; 81e6 (2:41e6) - db CH4 - dw SFX_Ledge_1_Ch1 + dbw CH4, SFX_Ledge_1_Ch1 SFX_Teleport_Enter2_1:: ; 81e9 (2:41e9) - db CH7 - dw SFX_Teleport_Enter2_1_Ch1 + dbw CH7, SFX_Teleport_Enter2_1_Ch1 SFX_Fly_1:: ; 81ec (2:41ec) - db CH7 - dw SFX_Fly_1_Ch1 + dbw CH7, SFX_Fly_1_Ch1 SFX_Denied_1:: ; 81ef (2:41ef) - db ( $40 | CH4 ) - dw SFX_Denied_1_Ch1 - db CH5 - dw SFX_Denied_1_Ch2 + dbw ( $40 | CH4 ), SFX_Denied_1_Ch1 + dbw CH5, SFX_Denied_1_Ch2 SFX_Arrow_Tiles_1:: ; 81f5 (2:41f5) - db CH4 - dw SFX_Arrow_Tiles_1_Ch1 + dbw CH4, SFX_Arrow_Tiles_1_Ch1 SFX_Push_Boulder_1:: ; 81f8 (2:41f8) - db CH7 - dw SFX_Push_Boulder_1_Ch1 + dbw CH7, SFX_Push_Boulder_1_Ch1 SFX_SS_Anne_Horn_1:: ; 81fb (2:41fb) - db ( $40 | CH4 ) - dw SFX_SS_Anne_Horn_1_Ch1 - db CH5 - dw SFX_SS_Anne_Horn_1_Ch2 + dbw ( $40 | CH4 ), SFX_SS_Anne_Horn_1_Ch1 + dbw CH5, SFX_SS_Anne_Horn_1_Ch2 SFX_Withdraw_Deposit_1:: ; 8201 (2:4201) - db CH4 - dw SFX_Withdraw_Deposit_1_Ch1 + dbw CH4, SFX_Withdraw_Deposit_1_Ch1 SFX_Cut_1:: ; 8204 (2:4204) - db CH7 - dw SFX_Cut_1_Ch1 + dbw CH7, SFX_Cut_1_Ch1 SFX_Go_Inside_1:: ; 8207 (2:4207) - db CH7 - dw SFX_Go_Inside_1_Ch1 + dbw CH7, SFX_Go_Inside_1_Ch1 SFX_Swap_1:: ; 820a (2:420a) - db ( $40 | CH4 ) - dw SFX_Swap_1_Ch1 - db CH5 - dw SFX_Swap_1_Ch2 + dbw ( $40 | CH4 ), SFX_Swap_1_Ch1 + dbw CH5, SFX_Swap_1_Ch2 SFX_59_1:: ; 8210 (2:4210) - db ( $40 | CH4 ) - dw SFX_59_1_Ch1 - db CH5 - dw SFX_59_1_Ch2 + dbw ( $40 | CH4 ), SFX_59_1_Ch1 + dbw CH5, SFX_59_1_Ch2 SFX_Purchase_1:: ; 8216 (2:4216) - db ( $40 | CH4 ) - dw SFX_Purchase_1_Ch1 - db CH5 - dw SFX_Purchase_1_Ch2 + dbw ( $40 | CH4 ), SFX_Purchase_1_Ch1 + dbw CH5, SFX_Purchase_1_Ch2 SFX_Collision_1:: ; 821c (2:421c) - db CH4 - dw SFX_Collision_1_Ch1 + dbw CH4, SFX_Collision_1_Ch1 SFX_Go_Outside_1:: ; 821f (2:421f) - db CH7 - dw SFX_Go_Outside_1_Ch1 + dbw CH7, SFX_Go_Outside_1_Ch1 SFX_Save_1:: ; 8222 (2:4222) - db ( $40 | CH4 ) - dw SFX_Save_1_Ch1 - db CH5 - dw SFX_Save_1_Ch2 + dbw ( $40 | CH4 ), SFX_Save_1_Ch1 + dbw CH5, SFX_Save_1_Ch2 SFX_Pokeflute:: ; 8228 (2:4228) - db CH2 - dw SFX_Pokeflute_Ch1 + dbw CH2, SFX_Pokeflute_Ch1 SFX_Safari_Zone_PA:: ; 822b (2:422b) - db CH4 - dw SFX_Safari_Zone_PA_Ch1 + dbw CH4, SFX_Safari_Zone_PA_Ch1 diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm index 1b30f5cc..f3d0720e 100644 --- a/audio/headers/sfxheaders2.asm +++ b/audio/headers/sfxheaders2.asm @@ -1,706 +1,473 @@ SFX_Headers_2:: - db $ff, $ff, $ff ; padding + dbw -1, -1 ; padding SFX_Snare1_2:: ; 20003 (8:4003) - db CH7 - dw SFX_Snare1_2_Ch1 + dbw CH7, SFX_Snare1_2_Ch1 SFX_Snare2_2:: ; 20006 (8:4006) - db CH7 - dw SFX_Snare2_2_Ch1 + dbw CH7, SFX_Snare2_2_Ch1 SFX_Snare3_2:: ; 20009 (8:4009) - db CH7 - dw SFX_Snare3_2_Ch1 + dbw CH7, SFX_Snare3_2_Ch1 SFX_Snare4_2:: ; 2000c (8:400c) - db CH7 - dw SFX_Snare4_2_Ch1 + dbw CH7, SFX_Snare4_2_Ch1 SFX_Snare5_2:: ; 2000f (8:400f) - db CH7 - dw SFX_Snare5_2_Ch1 + dbw CH7, SFX_Snare5_2_Ch1 SFX_Triangle1_2:: ; 20012 (8:4012) - db CH7 - dw SFX_Triangle1_2_Ch1 + dbw CH7, SFX_Triangle1_2_Ch1 SFX_Triangle2_2:: ; 20015 (8:4015) - db CH7 - dw SFX_Triangle2_2_Ch1 + dbw CH7, SFX_Triangle2_2_Ch1 SFX_Snare6_2:: ; 20018 (8:4018) - db CH7 - dw SFX_Snare6_2_Ch1 + dbw CH7, SFX_Snare6_2_Ch1 SFX_Snare7_2:: ; 2001b (8:401b) - db CH7 - dw SFX_Snare7_2_Ch1 + dbw CH7, SFX_Snare7_2_Ch1 SFX_Snare8_2:: ; 2001e (8:401e) - db CH7 - dw SFX_Snare8_2_Ch1 + dbw CH7, SFX_Snare8_2_Ch1 SFX_Snare9_2:: ; 20021 (8:4021) - db CH7 - dw SFX_Snare9_2_Ch1 + dbw CH7, SFX_Snare9_2_Ch1 SFX_Cymbal1_2:: ; 20024 (8:4024) - db CH7 - dw SFX_Cymbal1_2_Ch1 + dbw CH7, SFX_Cymbal1_2_Ch1 SFX_Cymbal2_2:: ; 20027 (8:4027) - db CH7 - dw SFX_Cymbal2_2_Ch1 + dbw CH7, SFX_Cymbal2_2_Ch1 SFX_Cymbal3_2:: ; 2002a (8:402a) - db CH7 - dw SFX_Cymbal3_2_Ch1 + dbw CH7, SFX_Cymbal3_2_Ch1 SFX_Muted_Snare1_2:: ; 2002d (8:402d) - db CH7 - dw SFX_Muted_Snare1_2_Ch1 + dbw CH7, SFX_Muted_Snare1_2_Ch1 SFX_Triangle3_2:: ; 20030 (8:4030) - db CH7 - dw SFX_Triangle3_2_Ch1 + dbw CH7, SFX_Triangle3_2_Ch1 SFX_Muted_Snare2_2:: ; 20033 (8:4033) - db CH7 - dw SFX_Muted_Snare2_2_Ch1 + dbw CH7, SFX_Muted_Snare2_2_Ch1 SFX_Muted_Snare3_2:: ; 20036 (8:4036) - db CH7 - dw SFX_Muted_Snare3_2_Ch1 + dbw CH7, SFX_Muted_Snare3_2_Ch1 SFX_Muted_Snare4_2:: ; 20039 (8:4039) - db CH7 - dw SFX_Muted_Snare4_2_Ch1 + dbw CH7, SFX_Muted_Snare4_2_Ch1 SFX_Cry00_2:: ; 2003c (8:403c) - db ( $80 | CH4 ) - dw SFX_Cry00_2_Ch1 - db CH5 - dw SFX_Cry00_2_Ch2 - db CH7 - dw SFX_Cry00_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry00_2_Ch1 + dbw CH5, SFX_Cry00_2_Ch2 + dbw CH7, SFX_Cry00_2_Ch3 SFX_Cry01_2:: ; 20045 (8:4045) - db ( $80 | CH4 ) - dw SFX_Cry01_2_Ch1 - db CH5 - dw SFX_Cry01_2_Ch2 - db CH7 - dw SFX_Cry01_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry01_2_Ch1 + dbw CH5, SFX_Cry01_2_Ch2 + dbw CH7, SFX_Cry01_2_Ch3 SFX_Cry02_2:: ; 2004e (8:404e) - db ( $80 | CH4 ) - dw SFX_Cry02_2_Ch1 - db CH5 - dw SFX_Cry02_2_Ch2 - db CH7 - dw SFX_Cry02_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry02_2_Ch1 + dbw CH5, SFX_Cry02_2_Ch2 + dbw CH7, SFX_Cry02_2_Ch3 SFX_Cry03_2:: ; 20057 (8:4057) - db ( $80 | CH4 ) - dw SFX_Cry03_2_Ch1 - db CH5 - dw SFX_Cry03_2_Ch2 - db CH7 - dw SFX_Cry03_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry03_2_Ch1 + dbw CH5, SFX_Cry03_2_Ch2 + dbw CH7, SFX_Cry03_2_Ch3 SFX_Cry04_2:: ; 20060 (8:4060) - db ( $80 | CH4 ) - dw SFX_Cry04_2_Ch1 - db CH5 - dw SFX_Cry04_2_Ch2 - db CH7 - dw SFX_Cry04_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry04_2_Ch1 + dbw CH5, SFX_Cry04_2_Ch2 + dbw CH7, SFX_Cry04_2_Ch3 SFX_Cry05_2:: ; 20069 (8:4069) - db ( $80 | CH4 ) - dw SFX_Cry05_2_Ch1 - db CH5 - dw SFX_Cry05_2_Ch2 - db CH7 - dw SFX_Cry05_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry05_2_Ch1 + dbw CH5, SFX_Cry05_2_Ch2 + dbw CH7, SFX_Cry05_2_Ch3 SFX_Cry06_2:: ; 20072 (8:4072) - db ( $80 | CH4 ) - dw SFX_Cry06_2_Ch1 - db CH5 - dw SFX_Cry06_2_Ch2 - db CH7 - dw SFX_Cry06_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry06_2_Ch1 + dbw CH5, SFX_Cry06_2_Ch2 + dbw CH7, SFX_Cry06_2_Ch3 SFX_Cry07_2:: ; 2007b (8:407b) - db ( $80 | CH4 ) - dw SFX_Cry07_2_Ch1 - db CH5 - dw SFX_Cry07_2_Ch2 - db CH7 - dw SFX_Cry07_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry07_2_Ch1 + dbw CH5, SFX_Cry07_2_Ch2 + dbw CH7, SFX_Cry07_2_Ch3 SFX_Cry08_2:: ; 20084 (8:4084) - db ( $80 | CH4 ) - dw SFX_Cry08_2_Ch1 - db CH5 - dw SFX_Cry08_2_Ch2 - db CH7 - dw SFX_Cry08_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry08_2_Ch1 + dbw CH5, SFX_Cry08_2_Ch2 + dbw CH7, SFX_Cry08_2_Ch3 SFX_Cry09_2:: ; 2008d (8:408d) - db ( $80 | CH4 ) - dw SFX_Cry09_2_Ch1 - db CH5 - dw SFX_Cry09_2_Ch2 - db CH7 - dw SFX_Cry09_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry09_2_Ch1 + dbw CH5, SFX_Cry09_2_Ch2 + dbw CH7, SFX_Cry09_2_Ch3 SFX_Cry0A_2:: ; 20096 (8:4096) - db ( $80 | CH4 ) - dw SFX_Cry0A_2_Ch1 - db CH5 - dw SFX_Cry0A_2_Ch2 - db CH7 - dw SFX_Cry0A_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0A_2_Ch1 + dbw CH5, SFX_Cry0A_2_Ch2 + dbw CH7, SFX_Cry0A_2_Ch3 SFX_Cry0B_2:: ; 2009f (8:409f) - db ( $80 | CH4 ) - dw SFX_Cry0B_2_Ch1 - db CH5 - dw SFX_Cry0B_2_Ch2 - db CH7 - dw SFX_Cry0B_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0B_2_Ch1 + dbw CH5, SFX_Cry0B_2_Ch2 + dbw CH7, SFX_Cry0B_2_Ch3 SFX_Cry0C_2:: ; 200a8 (8:40a8) - db ( $80 | CH4 ) - dw SFX_Cry0C_2_Ch1 - db CH5 - dw SFX_Cry0C_2_Ch2 - db CH7 - dw SFX_Cry0C_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0C_2_Ch1 + dbw CH5, SFX_Cry0C_2_Ch2 + dbw CH7, SFX_Cry0C_2_Ch3 SFX_Cry0D_2:: ; 200b1 (8:40b1) - db ( $80 | CH4 ) - dw SFX_Cry0D_2_Ch1 - db CH5 - dw SFX_Cry0D_2_Ch2 - db CH7 - dw SFX_Cry0D_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0D_2_Ch1 + dbw CH5, SFX_Cry0D_2_Ch2 + dbw CH7, SFX_Cry0D_2_Ch3 SFX_Cry0E_2:: ; 200ba (8:40ba) - db ( $80 | CH4 ) - dw SFX_Cry0E_2_Ch1 - db CH5 - dw SFX_Cry0E_2_Ch2 - db CH7 - dw SFX_Cry0E_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0E_2_Ch1 + dbw CH5, SFX_Cry0E_2_Ch2 + dbw CH7, SFX_Cry0E_2_Ch3 SFX_Cry0F_2:: ; 200c3 (8:40c3) - db ( $80 | CH4 ) - dw SFX_Cry0F_2_Ch1 - db CH5 - dw SFX_Cry0F_2_Ch2 - db CH7 - dw SFX_Cry0F_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0F_2_Ch1 + dbw CH5, SFX_Cry0F_2_Ch2 + dbw CH7, SFX_Cry0F_2_Ch3 SFX_Cry10_2:: ; 200cc (8:40cc) - db ( $80 | CH4 ) - dw SFX_Cry10_2_Ch1 - db CH5 - dw SFX_Cry10_2_Ch2 - db CH7 - dw SFX_Cry10_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry10_2_Ch1 + dbw CH5, SFX_Cry10_2_Ch2 + dbw CH7, SFX_Cry10_2_Ch3 SFX_Cry11_2:: ; 200d5 (8:40d5) - db ( $80 | CH4 ) - dw SFX_Cry11_2_Ch1 - db CH5 - dw SFX_Cry11_2_Ch2 - db CH7 - dw SFX_Cry11_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry11_2_Ch1 + dbw CH5, SFX_Cry11_2_Ch2 + dbw CH7, SFX_Cry11_2_Ch3 SFX_Cry12_2:: ; 200de (8:40de) - db ( $80 | CH4 ) - dw SFX_Cry12_2_Ch1 - db CH5 - dw SFX_Cry12_2_Ch2 - db CH7 - dw SFX_Cry12_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry12_2_Ch1 + dbw CH5, SFX_Cry12_2_Ch2 + dbw CH7, SFX_Cry12_2_Ch3 SFX_Cry13_2:: ; 200e7 (8:40e7) - db ( $80 | CH4 ) - dw SFX_Cry13_2_Ch1 - db CH5 - dw SFX_Cry13_2_Ch2 - db CH7 - dw SFX_Cry13_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry13_2_Ch1 + dbw CH5, SFX_Cry13_2_Ch2 + dbw CH7, SFX_Cry13_2_Ch3 SFX_Cry14_2:: ; 200f0 (8:40f0) - db ( $80 | CH4 ) - dw SFX_Cry14_2_Ch1 - db CH5 - dw SFX_Cry14_2_Ch2 - db CH7 - dw SFX_Cry14_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry14_2_Ch1 + dbw CH5, SFX_Cry14_2_Ch2 + dbw CH7, SFX_Cry14_2_Ch3 SFX_Cry15_2:: ; 200f9 (8:40f9) - db ( $80 | CH4 ) - dw SFX_Cry15_2_Ch1 - db CH5 - dw SFX_Cry15_2_Ch2 - db CH7 - dw SFX_Cry15_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry15_2_Ch1 + dbw CH5, SFX_Cry15_2_Ch2 + dbw CH7, SFX_Cry15_2_Ch3 SFX_Cry16_2:: ; 20102 (8:4102) - db ( $80 | CH4 ) - dw SFX_Cry16_2_Ch1 - db CH5 - dw SFX_Cry16_2_Ch2 - db CH7 - dw SFX_Cry16_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry16_2_Ch1 + dbw CH5, SFX_Cry16_2_Ch2 + dbw CH7, SFX_Cry16_2_Ch3 SFX_Cry17_2:: ; 2010b (8:410b) - db ( $80 | CH4 ) - dw SFX_Cry17_2_Ch1 - db CH5 - dw SFX_Cry17_2_Ch2 - db CH7 - dw SFX_Cry17_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry17_2_Ch1 + dbw CH5, SFX_Cry17_2_Ch2 + dbw CH7, SFX_Cry17_2_Ch3 SFX_Cry18_2:: ; 20114 (8:4114) - db ( $80 | CH4 ) - dw SFX_Cry18_2_Ch1 - db CH5 - dw SFX_Cry18_2_Ch2 - db CH7 - dw SFX_Cry18_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry18_2_Ch1 + dbw CH5, SFX_Cry18_2_Ch2 + dbw CH7, SFX_Cry18_2_Ch3 SFX_Cry19_2:: ; 2011d (8:411d) - db ( $80 | CH4 ) - dw SFX_Cry19_2_Ch1 - db CH5 - dw SFX_Cry19_2_Ch2 - db CH7 - dw SFX_Cry19_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry19_2_Ch1 + dbw CH5, SFX_Cry19_2_Ch2 + dbw CH7, SFX_Cry19_2_Ch3 SFX_Cry1A_2:: ; 20126 (8:4126) - db ( $80 | CH4 ) - dw SFX_Cry1A_2_Ch1 - db CH5 - dw SFX_Cry1A_2_Ch2 - db CH7 - dw SFX_Cry1A_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1A_2_Ch1 + dbw CH5, SFX_Cry1A_2_Ch2 + dbw CH7, SFX_Cry1A_2_Ch3 SFX_Cry1B_2:: ; 2012f (8:412f) - db ( $80 | CH4 ) - dw SFX_Cry1B_2_Ch1 - db CH5 - dw SFX_Cry1B_2_Ch2 - db CH7 - dw SFX_Cry1B_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1B_2_Ch1 + dbw CH5, SFX_Cry1B_2_Ch2 + dbw CH7, SFX_Cry1B_2_Ch3 SFX_Cry1C_2:: ; 20138 (8:4138) - db ( $80 | CH4 ) - dw SFX_Cry1C_2_Ch1 - db CH5 - dw SFX_Cry1C_2_Ch2 - db CH7 - dw SFX_Cry1C_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1C_2_Ch1 + dbw CH5, SFX_Cry1C_2_Ch2 + dbw CH7, SFX_Cry1C_2_Ch3 SFX_Cry1D_2:: ; 20141 (8:4141) - db ( $80 | CH4 ) - dw SFX_Cry1D_2_Ch1 - db CH5 - dw SFX_Cry1D_2_Ch2 - db CH7 - dw SFX_Cry1D_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1D_2_Ch1 + dbw CH5, SFX_Cry1D_2_Ch2 + dbw CH7, SFX_Cry1D_2_Ch3 SFX_Cry1E_2:: ; 2014a (8:414a) - db ( $80 | CH4 ) - dw SFX_Cry1E_2_Ch1 - db CH5 - dw SFX_Cry1E_2_Ch2 - db CH7 - dw SFX_Cry1E_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1E_2_Ch1 + dbw CH5, SFX_Cry1E_2_Ch2 + dbw CH7, SFX_Cry1E_2_Ch3 SFX_Cry1F_2:: ; 20153 (8:4153) - db ( $80 | CH4 ) - dw SFX_Cry1F_2_Ch1 - db CH5 - dw SFX_Cry1F_2_Ch2 - db CH7 - dw SFX_Cry1F_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1F_2_Ch1 + dbw CH5, SFX_Cry1F_2_Ch2 + dbw CH7, SFX_Cry1F_2_Ch3 SFX_Cry20_2:: ; 2015c (8:415c) - db ( $80 | CH4 ) - dw SFX_Cry20_2_Ch1 - db CH5 - dw SFX_Cry20_2_Ch2 - db CH7 - dw SFX_Cry20_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry20_2_Ch1 + dbw CH5, SFX_Cry20_2_Ch2 + dbw CH7, SFX_Cry20_2_Ch3 SFX_Cry21_2:: ; 20165 (8:4165) - db ( $80 | CH4 ) - dw SFX_Cry21_2_Ch1 - db CH5 - dw SFX_Cry21_2_Ch2 - db CH7 - dw SFX_Cry21_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry21_2_Ch1 + dbw CH5, SFX_Cry21_2_Ch2 + dbw CH7, SFX_Cry21_2_Ch3 SFX_Cry22_2:: ; 2016e (8:416e) - db ( $80 | CH4 ) - dw SFX_Cry22_2_Ch1 - db CH5 - dw SFX_Cry22_2_Ch2 - db CH7 - dw SFX_Cry22_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry22_2_Ch1 + dbw CH5, SFX_Cry22_2_Ch2 + dbw CH7, SFX_Cry22_2_Ch3 SFX_Cry23_2:: ; 20177 (8:4177) - db ( $80 | CH4 ) - dw SFX_Cry23_2_Ch1 - db CH5 - dw SFX_Cry23_2_Ch2 - db CH7 - dw SFX_Cry23_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry23_2_Ch1 + dbw CH5, SFX_Cry23_2_Ch2 + dbw CH7, SFX_Cry23_2_Ch3 SFX_Cry24_2:: ; 20180 (8:4180) - db ( $80 | CH4 ) - dw SFX_Cry24_2_Ch1 - db CH5 - dw SFX_Cry24_2_Ch2 - db CH7 - dw SFX_Cry24_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry24_2_Ch1 + dbw CH5, SFX_Cry24_2_Ch2 + dbw CH7, SFX_Cry24_2_Ch3 SFX_Cry25_2:: ; 20189 (8:4189) - db ( $80 | CH4 ) - dw SFX_Cry25_2_Ch1 - db CH5 - dw SFX_Cry25_2_Ch2 - db CH7 - dw SFX_Cry25_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry25_2_Ch1 + dbw CH5, SFX_Cry25_2_Ch2 + dbw CH7, SFX_Cry25_2_Ch3 SFX_Level_Up:: ; 20192 (8:4192) - db ( $80 | CH4 ) - dw SFX_Level_Up_Ch1 - db CH5 - dw SFX_Level_Up_Ch2 - db CH6 - dw SFX_Level_Up_Ch3 + dbw ( $80 | CH4 ), SFX_Level_Up_Ch1 + dbw CH5, SFX_Level_Up_Ch2 + dbw CH6, SFX_Level_Up_Ch3 SFX_Get_Item2_2:: ; 2019b (8:419b) - db ( $80 | CH4 ) - dw SFX_Get_Item2_2_Ch1 - db CH5 - dw SFX_Get_Item2_2_Ch2 - db CH6 - dw SFX_Get_Item2_2_Ch3 + dbw ( $80 | CH4 ), SFX_Get_Item2_2_Ch1 + dbw CH5, SFX_Get_Item2_2_Ch2 + dbw CH6, SFX_Get_Item2_2_Ch3 SFX_Tink_2:: ; 201a4 (8:41a4) - db CH4 - dw SFX_Tink_2_Ch1 + dbw CH4, SFX_Tink_2_Ch1 SFX_Heal_HP_2:: ; 201a7 (8:41a7) - db CH4 - dw SFX_Heal_HP_2_Ch1 + dbw CH4, SFX_Heal_HP_2_Ch1 SFX_Heal_Ailment_2:: ; 201aa (8:41aa) - db CH4 - dw SFX_Heal_Ailment_2_Ch1 + dbw CH4, SFX_Heal_Ailment_2_Ch1 SFX_Start_Menu_2:: ; 201ad (8:41ad) - db CH7 - dw SFX_Start_Menu_2_Ch1 + dbw CH7, SFX_Start_Menu_2_Ch1 SFX_Press_AB_2:: ; 201b0 (8:41b0) - db CH4 - dw SFX_Press_AB_2_Ch1 + dbw CH4, SFX_Press_AB_2_Ch1 SFX_Ball_Toss:: ; 201b3 (8:41b3) - db ( $40 | CH4 ) - dw SFX_Ball_Toss_Ch1 - db CH5 - dw SFX_Ball_Toss_Ch2 + dbw ( $40 | CH4 ), SFX_Ball_Toss_Ch1 + dbw CH5, SFX_Ball_Toss_Ch2 SFX_Ball_Poof:: ; 201b9 (8:41b9) - db ( $40 | CH4 ) - dw SFX_Ball_Poof_Ch1 - db CH7 - dw SFX_Ball_Poof_Ch2 + dbw ( $40 | CH4 ), SFX_Ball_Poof_Ch1 + dbw CH7, SFX_Ball_Poof_Ch2 SFX_Faint_Thud:: ; 201bf (8:41bf) - db ( $40 | CH4 ) - dw SFX_Faint_Thud_Ch1 - db CH7 - dw SFX_Faint_Thud_Ch2 + dbw ( $40 | CH4 ), SFX_Faint_Thud_Ch1 + dbw CH7, SFX_Faint_Thud_Ch2 SFX_Run:: ; 201c5 (8:41c5) - db CH7 - dw SFX_Run_Ch1 + dbw CH7, SFX_Run_Ch1 SFX_Dex_Page_Added:: ; 201c8 (8:41c8) - db ( $40 | CH4 ) - dw SFX_Dex_Page_Added_Ch1 - db CH5 - dw SFX_Dex_Page_Added_Ch2 + dbw ( $40 | CH4 ), SFX_Dex_Page_Added_Ch1 + dbw CH5, SFX_Dex_Page_Added_Ch2 SFX_Caught_Mon:: ; 201ce (8:41ce) - db ( $80 | CH4 ) - dw SFX_Caught_Mon_Ch1 - db CH5 - dw SFX_Caught_Mon_Ch2 - db CH6 - dw SFX_Caught_Mon_Ch3 + dbw ( $80 | CH4 ), SFX_Caught_Mon_Ch1 + dbw CH5, SFX_Caught_Mon_Ch2 + dbw CH6, SFX_Caught_Mon_Ch3 SFX_Peck:: ; 201d7 (8:41d7) - db CH7 - dw SFX_Peck_Ch1 + dbw CH7, SFX_Peck_Ch1 SFX_Faint_Fall:: ; 201da (8:41da) - db CH4 - dw SFX_Faint_Fall_Ch1 + dbw CH4, SFX_Faint_Fall_Ch1 SFX_Battle_09:: ; 201dd (8:41dd) - db CH4 - dw SFX_Battle_09_Ch1 + dbw CH4, SFX_Battle_09_Ch1 SFX_Pound:: ; 201e0 (8:41e0) - db CH7 - dw SFX_Pound_Ch1 + dbw CH7, SFX_Pound_Ch1 SFX_Battle_0B:: ; 201e3 (8:41e3) - db CH7 - dw SFX_Battle_0B_Ch1 + dbw CH7, SFX_Battle_0B_Ch1 SFX_Battle_0C:: ; 201e6 (8:41e6) - db CH7 - dw SFX_Battle_0C_Ch1 + dbw CH7, SFX_Battle_0C_Ch1 SFX_Battle_0D:: ; 201e9 (8:41e9) - db CH7 - dw SFX_Battle_0D_Ch1 + dbw CH7, SFX_Battle_0D_Ch1 SFX_Battle_0E:: ; 201ec (8:41ec) - db CH7 - dw SFX_Battle_0E_Ch1 + dbw CH7, SFX_Battle_0E_Ch1 SFX_Battle_0F:: ; 201ef (8:41ef) - db CH7 - dw SFX_Battle_0F_Ch1 + dbw CH7, SFX_Battle_0F_Ch1 SFX_Damage:: ; 201f2 (8:41f2) - db CH7 - dw SFX_Damage_Ch1 + dbw CH7, SFX_Damage_Ch1 SFX_Not_Very_Effective:: ; 201f5 (8:41f5) - db CH7 - dw SFX_Not_Very_Effective_Ch1 + dbw CH7, SFX_Not_Very_Effective_Ch1 SFX_Battle_12:: ; 201f8 (8:41f8) - db CH7 - dw SFX_Battle_12_Ch1 + dbw CH7, SFX_Battle_12_Ch1 SFX_Battle_13:: ; 201fb (8:41fb) - db CH7 - dw SFX_Battle_13_Ch1 + dbw CH7, SFX_Battle_13_Ch1 SFX_Battle_14:: ; 201fe (8:41fe) - db CH7 - dw SFX_Battle_14_Ch1 + dbw CH7, SFX_Battle_14_Ch1 SFX_Vine_Whip:: ; 20201 (8:4201) - db CH7 - dw SFX_Vine_Whip_Ch1 + dbw CH7, SFX_Vine_Whip_Ch1 SFX_Battle_16:: ; 20204 (8:4204) - db CH7 - dw SFX_Battle_16_Ch1 + dbw CH7, SFX_Battle_16_Ch1 SFX_Battle_17:: ; 20207 (8:4207) - db CH7 - dw SFX_Battle_17_Ch1 + dbw CH7, SFX_Battle_17_Ch1 SFX_Battle_18:: ; 2020a (8:420a) - db CH7 - dw SFX_Battle_18_Ch1 + dbw CH7, SFX_Battle_18_Ch1 SFX_Battle_19:: ; 2020d (8:420d) - db CH7 - dw SFX_Battle_19_Ch1 + dbw CH7, SFX_Battle_19_Ch1 SFX_Super_Effective:: ; 20210 (8:4210) - db CH7 - dw SFX_Super_Effective_Ch1 + dbw CH7, SFX_Super_Effective_Ch1 SFX_Battle_1B:: ; 20213 (8:4213) - db CH7 - dw SFX_Battle_1B_Ch1 + dbw CH7, SFX_Battle_1B_Ch1 SFX_Battle_1C:: ; 20216 (8:4216) - db CH7 - dw SFX_Battle_1C_Ch1 + dbw CH7, SFX_Battle_1C_Ch1 SFX_Doubleslap:: ; 20219 (8:4219) - db CH7 - dw SFX_Doubleslap_Ch1 + dbw CH7, SFX_Doubleslap_Ch1 SFX_Battle_1E:: ; 2021c (8:421c) - db ( $40 | CH4 ) - dw SFX_Battle_1E_Ch1 - db CH7 - dw SFX_Battle_1E_Ch2 + dbw ( $40 | CH4 ), SFX_Battle_1E_Ch1 + dbw CH7, SFX_Battle_1E_Ch2 SFX_Horn_Drill:: ; 20222 (8:4222) - db CH7 - dw SFX_Horn_Drill_Ch1 + dbw CH7, SFX_Horn_Drill_Ch1 SFX_Battle_20:: ; 20225 (8:4225) - db CH7 - dw SFX_Battle_20_Ch1 + dbw CH7, SFX_Battle_20_Ch1 SFX_Battle_21:: ; 20228 (8:4228) - db CH7 - dw SFX_Battle_21_Ch1 + dbw CH7, SFX_Battle_21_Ch1 SFX_Battle_22:: ; 2022b (8:422b) - db CH7 - dw SFX_Battle_22_Ch1 + dbw CH7, SFX_Battle_22_Ch1 SFX_Battle_23:: ; 2022e (8:422e) - db CH7 - dw SFX_Battle_23_Ch1 + dbw CH7, SFX_Battle_23_Ch1 SFX_Battle_24:: ; 20231 (8:4231) - db ( $40 | CH4 ) - dw SFX_Battle_24_Ch1 - db CH7 - dw SFX_Battle_24_Ch2 + dbw ( $40 | CH4 ), SFX_Battle_24_Ch1 + dbw CH7, SFX_Battle_24_Ch2 SFX_Battle_25:: ; 20237 (8:4237) - db CH7 - dw SFX_Battle_25_Ch1 + dbw CH7, SFX_Battle_25_Ch1 SFX_Battle_26:: ; 2023a (8:423a) - db CH7 - dw SFX_Battle_26_Ch1 + dbw CH7, SFX_Battle_26_Ch1 SFX_Battle_27:: ; 2023d (8:423d) - db ( $80 | CH4 ) - dw SFX_Battle_27_Ch1 - db CH5 - dw SFX_Battle_27_Ch2 - db CH7 - dw SFX_Battle_27_Ch3 + dbw ( $80 | CH4 ), SFX_Battle_27_Ch1 + dbw CH5, SFX_Battle_27_Ch2 + dbw CH7, SFX_Battle_27_Ch3 SFX_Battle_28:: ; 20246 (8:4246) - db ( $80 | CH4 ) - dw SFX_Battle_28_Ch1 - db CH5 - dw SFX_Battle_28_Ch2 - db CH7 - dw SFX_Battle_28_Ch3 + dbw ( $80 | CH4 ), SFX_Battle_28_Ch1 + dbw CH5, SFX_Battle_28_Ch2 + dbw CH7, SFX_Battle_28_Ch3 SFX_Battle_29:: ; 2024f (8:424f) - db ( $40 | CH4 ) - dw SFX_Battle_29_Ch1 - db CH7 - dw SFX_Battle_29_Ch2 + dbw ( $40 | CH4 ), SFX_Battle_29_Ch1 + dbw CH7, SFX_Battle_29_Ch2 SFX_Battle_2A:: ; 20255 (8:4255) - db ( $80 | CH4 ) - dw SFX_Battle_2A_Ch1 - db CH5 - dw SFX_Battle_2A_Ch2 - db CH7 - dw SFX_Battle_2A_Ch3 + dbw ( $80 | CH4 ), SFX_Battle_2A_Ch1 + dbw CH5, SFX_Battle_2A_Ch2 + dbw CH7, SFX_Battle_2A_Ch3 SFX_Battle_2B:: ; 2025e (8:425e) - db ( $40 | CH4 ) - dw SFX_Battle_2B_Ch1 - db CH7 - dw SFX_Battle_2B_Ch2 + dbw ( $40 | CH4 ), SFX_Battle_2B_Ch1 + dbw CH7, SFX_Battle_2B_Ch2 SFX_Battle_2C:: ; 20264 (8:4264) - db ( $80 | CH4 ) - dw SFX_Battle_2C_Ch1 - db CH5 - dw SFX_Battle_2C_Ch2 - db CH7 - dw SFX_Battle_2C_Ch3 + dbw ( $80 | CH4 ), SFX_Battle_2C_Ch1 + dbw CH5, SFX_Battle_2C_Ch2 + dbw CH7, SFX_Battle_2C_Ch3 SFX_Psybeam:: ; 2026d (8:426d) - db ( $80 | CH4 ) - dw SFX_Psybeam_Ch1 - db CH5 - dw SFX_Psybeam_Ch2 - db CH7 - dw SFX_Psybeam_Ch3 + dbw ( $80 | CH4 ), SFX_Psybeam_Ch1 + dbw CH5, SFX_Psybeam_Ch2 + dbw CH7, SFX_Psybeam_Ch3 SFX_Battle_2E:: ; 20276 (8:4276) - db ( $80 | CH4 ) - dw SFX_Battle_2E_Ch1 - db CH5 - dw SFX_Battle_2E_Ch2 - db CH7 - dw SFX_Battle_2E_Ch3 + dbw ( $80 | CH4 ), SFX_Battle_2E_Ch1 + dbw CH5, SFX_Battle_2E_Ch2 + dbw CH7, SFX_Battle_2E_Ch3 SFX_Battle_2F:: ; 2027f (8:427f) - db ( $80 | CH4 ) - dw SFX_Battle_2F_Ch1 - db CH5 - dw SFX_Battle_2F_Ch2 - db CH7 - dw SFX_Battle_2F_Ch3 + dbw ( $80 | CH4 ), SFX_Battle_2F_Ch1 + dbw CH5, SFX_Battle_2F_Ch2 + dbw CH7, SFX_Battle_2F_Ch3 SFX_Psychic_M:: ; 20288 (8:4288) - db ( $80 | CH4 ) - dw SFX_Psychic_M_Ch1 - db CH5 - dw SFX_Psychic_M_Ch2 - db CH7 - dw SFX_Psychic_M_Ch3 + dbw ( $80 | CH4 ), SFX_Psychic_M_Ch1 + dbw CH5, SFX_Psychic_M_Ch2 + dbw CH7, SFX_Psychic_M_Ch3 SFX_Battle_31:: ; 20291 (8:4291) - db ( $40 | CH4 ) - dw SFX_Battle_31_Ch1 - db CH5 - dw SFX_Battle_31_Ch2 + dbw ( $40 | CH4 ), SFX_Battle_31_Ch1 + dbw CH5, SFX_Battle_31_Ch2 SFX_Battle_32:: ; 20297 (8:4297) - db ( $40 | CH4 ) - dw SFX_Battle_32_Ch1 - db CH5 - dw SFX_Battle_32_Ch2 + dbw ( $40 | CH4 ), SFX_Battle_32_Ch1 + dbw CH5, SFX_Battle_32_Ch2 SFX_Battle_33:: ; 2029d (8:429d) - db ( $40 | CH4 ) - dw SFX_Battle_33_Ch1 - db CH5 - dw SFX_Battle_33_Ch2 + dbw ( $40 | CH4 ), SFX_Battle_33_Ch1 + dbw CH5, SFX_Battle_33_Ch2 SFX_Battle_34:: ; 202a3 (8:42a3) - db ( $80 | CH4 ) - dw SFX_Battle_34_Ch1 - db CH5 - dw SFX_Battle_34_Ch2 - db CH7 - dw SFX_Battle_34_Ch3 + dbw ( $80 | CH4 ), SFX_Battle_34_Ch1 + dbw CH5, SFX_Battle_34_Ch2 + dbw CH7, SFX_Battle_34_Ch3 SFX_Battle_35:: ; 202ac (8:42ac) - db ( $40 | CH4 ) - dw SFX_Battle_35_Ch1 - db CH5 - dw SFX_Battle_35_Ch2 + dbw ( $40 | CH4 ), SFX_Battle_35_Ch1 + dbw CH5, SFX_Battle_35_Ch2 SFX_Battle_36:: ; 202b2 (8:42b2) - db ( $80 | CH4 ) - dw SFX_Battle_36_Ch1 - db CH5 - dw SFX_Battle_36_Ch2 - db CH7 - dw SFX_Battle_36_Ch3 + dbw ( $80 | CH4 ), SFX_Battle_36_Ch1 + dbw CH5, SFX_Battle_36_Ch2 + dbw CH7, SFX_Battle_36_Ch3 SFX_Silph_Scope:: ; 202bb (8:42bb) - db CH4 - dw SFX_Silph_Scope_Ch1 + dbw CH4, SFX_Silph_Scope_Ch1 diff --git a/audio/headers/sfxheaders3.asm b/audio/headers/sfxheaders3.asm index 321a33f5..8328d6c7 100644 --- a/audio/headers/sfxheaders3.asm +++ b/audio/headers/sfxheaders3.asm @@ -1,596 +1,402 @@ SFX_Headers_3:: - db $ff, $ff, $ff ; padding + dbw -1, -1 ; padding SFX_Snare1_3:: ; 7c003 (1f:4003) - db CH7 - dw SFX_Snare1_3_Ch1 + dbw CH7, SFX_Snare1_3_Ch1 SFX_Snare2_3:: ; 7c006 (1f:4006) - db CH7 - dw SFX_Snare2_3_Ch1 + dbw CH7, SFX_Snare2_3_Ch1 SFX_Snare3_3:: ; 7c009 (1f:4009) - db CH7 - dw SFX_Snare3_3_Ch1 + dbw CH7, SFX_Snare3_3_Ch1 SFX_Snare4_3:: ; 7c00c (1f:400c) - db CH7 - dw SFX_Snare4_3_Ch1 + dbw CH7, SFX_Snare4_3_Ch1 SFX_Snare5_3:: ; 7c00f (1f:400f) - db CH7 - dw SFX_Snare5_3_Ch1 + dbw CH7, SFX_Snare5_3_Ch1 SFX_Triangle1_3:: ; 7c012 (1f:4012) - db CH7 - dw SFX_Triangle1_3_Ch1 + dbw CH7, SFX_Triangle1_3_Ch1 SFX_Triangle2_3:: ; 7c015 (1f:4015) - db CH7 - dw SFX_Triangle2_3_Ch1 + dbw CH7, SFX_Triangle2_3_Ch1 SFX_Snare6_3:: ; 7c018 (1f:4018) - db CH7 - dw SFX_Snare6_3_Ch1 + dbw CH7, SFX_Snare6_3_Ch1 SFX_Snare7_3:: ; 7c01b (1f:401b) - db CH7 - dw SFX_Snare7_3_Ch1 + dbw CH7, SFX_Snare7_3_Ch1 SFX_Snare8_3:: ; 7c01e (1f:401e) - db CH7 - dw SFX_Snare8_3_Ch1 + dbw CH7, SFX_Snare8_3_Ch1 SFX_Snare9_3:: ; 7c021 (1f:4021) - db CH7 - dw SFX_Snare9_3_Ch1 + dbw CH7, SFX_Snare9_3_Ch1 SFX_Cymbal1_3:: ; 7c024 (1f:4024) - db CH7 - dw SFX_Cymbal1_3_Ch1 + dbw CH7, SFX_Cymbal1_3_Ch1 SFX_Cymbal2_3:: ; 7c027 (1f:4027) - db CH7 - dw SFX_Cymbal2_3_Ch1 + dbw CH7, SFX_Cymbal2_3_Ch1 SFX_Cymbal3_3:: ; 7c02a (1f:402a) - db CH7 - dw SFX_Cymbal3_3_Ch1 + dbw CH7, SFX_Cymbal3_3_Ch1 SFX_Muted_Snare1_3:: ; 7c02d (1f:402d) - db CH7 - dw SFX_Muted_Snare1_3_Ch1 + dbw CH7, SFX_Muted_Snare1_3_Ch1 SFX_Triangle3_3:: ; 7c030 (1f:4030) - db CH7 - dw SFX_Triangle3_3_Ch1 + dbw CH7, SFX_Triangle3_3_Ch1 SFX_Muted_Snare2_3:: ; 7c033 (1f:4033) - db CH7 - dw SFX_Muted_Snare2_3_Ch1 + dbw CH7, SFX_Muted_Snare2_3_Ch1 SFX_Muted_Snare3_3:: ; 7c036 (1f:4036) - db CH7 - dw SFX_Muted_Snare3_3_Ch1 + dbw CH7, SFX_Muted_Snare3_3_Ch1 SFX_Muted_Snare4_3:: ; 7c039 (1f:4039) - db CH7 - dw SFX_Muted_Snare4_3_Ch1 + dbw CH7, SFX_Muted_Snare4_3_Ch1 SFX_Cry00_3:: ; 7c03c (1f:403c) - db ( $80 | CH4 ) - dw SFX_Cry00_3_Ch1 - db CH5 - dw SFX_Cry00_3_Ch2 - db CH7 - dw SFX_Cry00_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry00_3_Ch1 + dbw CH5, SFX_Cry00_3_Ch2 + dbw CH7, SFX_Cry00_3_Ch3 SFX_Cry01_3:: ; 7c045 (1f:4045) - db ( $80 | CH4 ) - dw SFX_Cry01_3_Ch1 - db CH5 - dw SFX_Cry01_3_Ch2 - db CH7 - dw SFX_Cry01_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry01_3_Ch1 + dbw CH5, SFX_Cry01_3_Ch2 + dbw CH7, SFX_Cry01_3_Ch3 SFX_Cry02_3:: ; 7c04e (1f:404e) - db ( $80 | CH4 ) - dw SFX_Cry02_3_Ch1 - db CH5 - dw SFX_Cry02_3_Ch2 - db CH7 - dw SFX_Cry02_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry02_3_Ch1 + dbw CH5, SFX_Cry02_3_Ch2 + dbw CH7, SFX_Cry02_3_Ch3 SFX_Cry03_3:: ; 7c057 (1f:4057) - db ( $80 | CH4 ) - dw SFX_Cry03_3_Ch1 - db CH5 - dw SFX_Cry03_3_Ch2 - db CH7 - dw SFX_Cry03_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry03_3_Ch1 + dbw CH5, SFX_Cry03_3_Ch2 + dbw CH7, SFX_Cry03_3_Ch3 SFX_Cry04_3:: ; 7c060 (1f:4060) - db ( $80 | CH4 ) - dw SFX_Cry04_3_Ch1 - db CH5 - dw SFX_Cry04_3_Ch2 - db CH7 - dw SFX_Cry04_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry04_3_Ch1 + dbw CH5, SFX_Cry04_3_Ch2 + dbw CH7, SFX_Cry04_3_Ch3 SFX_Cry05_3:: ; 7c069 (1f:4069) - db ( $80 | CH4 ) - dw SFX_Cry05_3_Ch1 - db CH5 - dw SFX_Cry05_3_Ch2 - db CH7 - dw SFX_Cry05_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry05_3_Ch1 + dbw CH5, SFX_Cry05_3_Ch2 + dbw CH7, SFX_Cry05_3_Ch3 SFX_Cry06_3:: ; 7c072 (1f:4072) - db ( $80 | CH4 ) - dw SFX_Cry06_3_Ch1 - db CH5 - dw SFX_Cry06_3_Ch2 - db CH7 - dw SFX_Cry06_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry06_3_Ch1 + dbw CH5, SFX_Cry06_3_Ch2 + dbw CH7, SFX_Cry06_3_Ch3 SFX_Cry07_3:: ; 7c07b (1f:407b) - db ( $80 | CH4 ) - dw SFX_Cry07_3_Ch1 - db CH5 - dw SFX_Cry07_3_Ch2 - db CH7 - dw SFX_Cry07_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry07_3_Ch1 + dbw CH5, SFX_Cry07_3_Ch2 + dbw CH7, SFX_Cry07_3_Ch3 SFX_Cry08_3:: ; 7c084 (1f:4084) - db ( $80 | CH4 ) - dw SFX_Cry08_3_Ch1 - db CH5 - dw SFX_Cry08_3_Ch2 - db CH7 - dw SFX_Cry08_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry08_3_Ch1 + dbw CH5, SFX_Cry08_3_Ch2 + dbw CH7, SFX_Cry08_3_Ch3 SFX_Cry09_3:: ; 7c08d (1f:408d) - db ( $80 | CH4 ) - dw SFX_Cry09_3_Ch1 - db CH5 - dw SFX_Cry09_3_Ch2 - db CH7 - dw SFX_Cry09_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry09_3_Ch1 + dbw CH5, SFX_Cry09_3_Ch2 + dbw CH7, SFX_Cry09_3_Ch3 SFX_Cry0A_3:: ; 7c096 (1f:4096) - db ( $80 | CH4 ) - dw SFX_Cry0A_3_Ch1 - db CH5 - dw SFX_Cry0A_3_Ch2 - db CH7 - dw SFX_Cry0A_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0A_3_Ch1 + dbw CH5, SFX_Cry0A_3_Ch2 + dbw CH7, SFX_Cry0A_3_Ch3 SFX_Cry0B_3:: ; 7c09f (1f:409f) - db ( $80 | CH4 ) - dw SFX_Cry0B_3_Ch1 - db CH5 - dw SFX_Cry0B_3_Ch2 - db CH7 - dw SFX_Cry0B_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0B_3_Ch1 + dbw CH5, SFX_Cry0B_3_Ch2 + dbw CH7, SFX_Cry0B_3_Ch3 SFX_Cry0C_3:: ; 7c0a8 (1f:40a8) - db ( $80 | CH4 ) - dw SFX_Cry0C_3_Ch1 - db CH5 - dw SFX_Cry0C_3_Ch2 - db CH7 - dw SFX_Cry0C_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0C_3_Ch1 + dbw CH5, SFX_Cry0C_3_Ch2 + dbw CH7, SFX_Cry0C_3_Ch3 SFX_Cry0D_3:: ; 7c0b1 (1f:40b1) - db ( $80 | CH4 ) - dw SFX_Cry0D_3_Ch1 - db CH5 - dw SFX_Cry0D_3_Ch2 - db CH7 - dw SFX_Cry0D_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0D_3_Ch1 + dbw CH5, SFX_Cry0D_3_Ch2 + dbw CH7, SFX_Cry0D_3_Ch3 SFX_Cry0E_3:: ; 7c0ba (1f:40ba) - db ( $80 | CH4 ) - dw SFX_Cry0E_3_Ch1 - db CH5 - dw SFX_Cry0E_3_Ch2 - db CH7 - dw SFX_Cry0E_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0E_3_Ch1 + dbw CH5, SFX_Cry0E_3_Ch2 + dbw CH7, SFX_Cry0E_3_Ch3 SFX_Cry0F_3:: ; 7c0c3 (1f:40c3) - db ( $80 | CH4 ) - dw SFX_Cry0F_3_Ch1 - db CH5 - dw SFX_Cry0F_3_Ch2 - db CH7 - dw SFX_Cry0F_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0F_3_Ch1 + dbw CH5, SFX_Cry0F_3_Ch2 + dbw CH7, SFX_Cry0F_3_Ch3 SFX_Cry10_3:: ; 7c0cc (1f:40cc) - db ( $80 | CH4 ) - dw SFX_Cry10_3_Ch1 - db CH5 - dw SFX_Cry10_3_Ch2 - db CH7 - dw SFX_Cry10_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry10_3_Ch1 + dbw CH5, SFX_Cry10_3_Ch2 + dbw CH7, SFX_Cry10_3_Ch3 SFX_Cry11_3:: ; 7c0d5 (1f:40d5) - db ( $80 | CH4 ) - dw SFX_Cry11_3_Ch1 - db CH5 - dw SFX_Cry11_3_Ch2 - db CH7 - dw SFX_Cry11_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry11_3_Ch1 + dbw CH5, SFX_Cry11_3_Ch2 + dbw CH7, SFX_Cry11_3_Ch3 SFX_Cry12_3:: ; 7c0de (1f:40de) - db ( $80 | CH4 ) - dw SFX_Cry12_3_Ch1 - db CH5 - dw SFX_Cry12_3_Ch2 - db CH7 - dw SFX_Cry12_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry12_3_Ch1 + dbw CH5, SFX_Cry12_3_Ch2 + dbw CH7, SFX_Cry12_3_Ch3 SFX_Cry13_3:: ; 7c0e7 (1f:40e7) - db ( $80 | CH4 ) - dw SFX_Cry13_3_Ch1 - db CH5 - dw SFX_Cry13_3_Ch2 - db CH7 - dw SFX_Cry13_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry13_3_Ch1 + dbw CH5, SFX_Cry13_3_Ch2 + dbw CH7, SFX_Cry13_3_Ch3 SFX_Cry14_3:: ; 7c0f0 (1f:40f0) - db ( $80 | CH4 ) - dw SFX_Cry14_3_Ch1 - db CH5 - dw SFX_Cry14_3_Ch2 - db CH7 - dw SFX_Cry14_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry14_3_Ch1 + dbw CH5, SFX_Cry14_3_Ch2 + dbw CH7, SFX_Cry14_3_Ch3 SFX_Cry15_3:: ; 7c0f9 (1f:40f9) - db ( $80 | CH4 ) - dw SFX_Cry15_3_Ch1 - db CH5 - dw SFX_Cry15_3_Ch2 - db CH7 - dw SFX_Cry15_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry15_3_Ch1 + dbw CH5, SFX_Cry15_3_Ch2 + dbw CH7, SFX_Cry15_3_Ch3 SFX_Cry16_3:: ; 7c102 (1f:4102) - db ( $80 | CH4 ) - dw SFX_Cry16_3_Ch1 - db CH5 - dw SFX_Cry16_3_Ch2 - db CH7 - dw SFX_Cry16_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry16_3_Ch1 + dbw CH5, SFX_Cry16_3_Ch2 + dbw CH7, SFX_Cry16_3_Ch3 SFX_Cry17_3:: ; 7c10b (1f:410b) - db ( $80 | CH4 ) - dw SFX_Cry17_3_Ch1 - db CH5 - dw SFX_Cry17_3_Ch2 - db CH7 - dw SFX_Cry17_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry17_3_Ch1 + dbw CH5, SFX_Cry17_3_Ch2 + dbw CH7, SFX_Cry17_3_Ch3 SFX_Cry18_3:: ; 7c114 (1f:4114) - db ( $80 | CH4 ) - dw SFX_Cry18_3_Ch1 - db CH5 - dw SFX_Cry18_3_Ch2 - db CH7 - dw SFX_Cry18_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry18_3_Ch1 + dbw CH5, SFX_Cry18_3_Ch2 + dbw CH7, SFX_Cry18_3_Ch3 SFX_Cry19_3:: ; 7c11d (1f:411d) - db ( $80 | CH4 ) - dw SFX_Cry19_3_Ch1 - db CH5 - dw SFX_Cry19_3_Ch2 - db CH7 - dw SFX_Cry19_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry19_3_Ch1 + dbw CH5, SFX_Cry19_3_Ch2 + dbw CH7, SFX_Cry19_3_Ch3 SFX_Cry1A_3:: ; 7c126 (1f:4126) - db ( $80 | CH4 ) - dw SFX_Cry1A_3_Ch1 - db CH5 - dw SFX_Cry1A_3_Ch2 - db CH7 - dw SFX_Cry1A_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1A_3_Ch1 + dbw CH5, SFX_Cry1A_3_Ch2 + dbw CH7, SFX_Cry1A_3_Ch3 SFX_Cry1B_3:: ; 7c12f (1f:412f) - db ( $80 | CH4 ) - dw SFX_Cry1B_3_Ch1 - db CH5 - dw SFX_Cry1B_3_Ch2 - db CH7 - dw SFX_Cry1B_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1B_3_Ch1 + dbw CH5, SFX_Cry1B_3_Ch2 + dbw CH7, SFX_Cry1B_3_Ch3 SFX_Cry1C_3:: ; 7c138 (1f:4138) - db ( $80 | CH4 ) - dw SFX_Cry1C_3_Ch1 - db CH5 - dw SFX_Cry1C_3_Ch2 - db CH7 - dw SFX_Cry1C_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1C_3_Ch1 + dbw CH5, SFX_Cry1C_3_Ch2 + dbw CH7, SFX_Cry1C_3_Ch3 SFX_Cry1D_3:: ; 7c141 (1f:4141) - db ( $80 | CH4 ) - dw SFX_Cry1D_3_Ch1 - db CH5 - dw SFX_Cry1D_3_Ch2 - db CH7 - dw SFX_Cry1D_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1D_3_Ch1 + dbw CH5, SFX_Cry1D_3_Ch2 + dbw CH7, SFX_Cry1D_3_Ch3 SFX_Cry1E_3:: ; 7c14a (1f:414a) - db ( $80 | CH4 ) - dw SFX_Cry1E_3_Ch1 - db CH5 - dw SFX_Cry1E_3_Ch2 - db CH7 - dw SFX_Cry1E_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1E_3_Ch1 + dbw CH5, SFX_Cry1E_3_Ch2 + dbw CH7, SFX_Cry1E_3_Ch3 SFX_Cry1F_3:: ; 7c153 (1f:4153) - db ( $80 | CH4 ) - dw SFX_Cry1F_3_Ch1 - db CH5 - dw SFX_Cry1F_3_Ch2 - db CH7 - dw SFX_Cry1F_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1F_3_Ch1 + dbw CH5, SFX_Cry1F_3_Ch2 + dbw CH7, SFX_Cry1F_3_Ch3 SFX_Cry20_3:: ; 7c15c (1f:415c) - db ( $80 | CH4 ) - dw SFX_Cry20_3_Ch1 - db CH5 - dw SFX_Cry20_3_Ch2 - db CH7 - dw SFX_Cry20_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry20_3_Ch1 + dbw CH5, SFX_Cry20_3_Ch2 + dbw CH7, SFX_Cry20_3_Ch3 SFX_Cry21_3:: ; 7c165 (1f:4165) - db ( $80 | CH4 ) - dw SFX_Cry21_3_Ch1 - db CH5 - dw SFX_Cry21_3_Ch2 - db CH7 - dw SFX_Cry21_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry21_3_Ch1 + dbw CH5, SFX_Cry21_3_Ch2 + dbw CH7, SFX_Cry21_3_Ch3 SFX_Cry22_3:: ; 7c16e (1f:416e) - db ( $80 | CH4 ) - dw SFX_Cry22_3_Ch1 - db CH5 - dw SFX_Cry22_3_Ch2 - db CH7 - dw SFX_Cry22_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry22_3_Ch1 + dbw CH5, SFX_Cry22_3_Ch2 + dbw CH7, SFX_Cry22_3_Ch3 SFX_Cry23_3:: ; 7c177 (1f:4177) - db ( $80 | CH4 ) - dw SFX_Cry23_3_Ch1 - db CH5 - dw SFX_Cry23_3_Ch2 - db CH7 - dw SFX_Cry23_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry23_3_Ch1 + dbw CH5, SFX_Cry23_3_Ch2 + dbw CH7, SFX_Cry23_3_Ch3 SFX_Cry24_3:: ; 7c180 (1f:4180) - db ( $80 | CH4 ) - dw SFX_Cry24_3_Ch1 - db CH5 - dw SFX_Cry24_3_Ch2 - db CH7 - dw SFX_Cry24_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry24_3_Ch1 + dbw CH5, SFX_Cry24_3_Ch2 + dbw CH7, SFX_Cry24_3_Ch3 SFX_Cry25_3:: ; 7c189 (1f:4189) - db ( $80 | CH4 ) - dw SFX_Cry25_3_Ch1 - db CH5 - dw SFX_Cry25_3_Ch2 - db CH7 - dw SFX_Cry25_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry25_3_Ch1 + dbw CH5, SFX_Cry25_3_Ch2 + dbw CH7, SFX_Cry25_3_Ch3 SFX_Get_Item1_3:: ; 7c192 (1f:4192) - db ( $80 | CH4 ) - dw SFX_Get_Item1_3_Ch1 - db CH5 - dw SFX_Get_Item1_3_Ch2 - db CH6 - dw SFX_Get_Item1_3_Ch3 + dbw ( $80 | CH4 ), SFX_Get_Item1_3_Ch1 + dbw CH5, SFX_Get_Item1_3_Ch2 + dbw CH6, SFX_Get_Item1_3_Ch3 SFX_Get_Item2_3:: ; 7c19b (1f:419b) - db ( $80 | CH4 ) - dw SFX_Get_Item2_3_Ch1 - db CH5 - dw SFX_Get_Item2_3_Ch2 - db CH6 - dw SFX_Get_Item2_3_Ch3 + dbw ( $80 | CH4 ), SFX_Get_Item2_3_Ch1 + dbw CH5, SFX_Get_Item2_3_Ch2 + dbw CH6, SFX_Get_Item2_3_Ch3 SFX_Tink_3:: ; 7c1a4 (1f:41a4) - db CH4 - dw SFX_Tink_3_Ch1 + dbw CH4, SFX_Tink_3_Ch1 SFX_Heal_HP_3:: ; 7c1a7 (1f:41a7) - db CH4 - dw SFX_Heal_HP_3_Ch1 + dbw CH4, SFX_Heal_HP_3_Ch1 SFX_Heal_Ailment_3:: ; 7c1aa (1f:41aa) - db CH4 - dw SFX_Heal_Ailment_3_Ch1 + dbw CH4, SFX_Heal_Ailment_3_Ch1 SFX_Start_Menu_3:: ; 7c1ad (1f:41ad) - db CH7 - dw SFX_Start_Menu_3_Ch1 + dbw CH7, SFX_Start_Menu_3_Ch1 SFX_Press_AB_3:: ; 7c1b0 (1f:41b0) - db CH4 - dw SFX_Press_AB_3_Ch1 + dbw CH4, SFX_Press_AB_3_Ch1 SFX_Pokedex_Rating_3:: ; 7c1b3 (1f:41b3) - db ( $80 | CH4 ) - dw SFX_Pokedex_Rating_3_Ch1 - db CH5 - dw SFX_Pokedex_Rating_3_Ch2 - db CH6 - dw SFX_Pokedex_Rating_3_Ch3 + dbw ( $80 | CH4 ), SFX_Pokedex_Rating_3_Ch1 + dbw CH5, SFX_Pokedex_Rating_3_Ch2 + dbw CH6, SFX_Pokedex_Rating_3_Ch3 SFX_Get_Key_Item_3:: ; 7c1bc (1f:41bc) - db ( $80 | CH4 ) - dw SFX_Get_Key_Item_3_Ch1 - db CH5 - dw SFX_Get_Key_Item_3_Ch2 - db CH6 - dw SFX_Get_Key_Item_3_Ch3 + dbw ( $80 | CH4 ), SFX_Get_Key_Item_3_Ch1 + dbw CH5, SFX_Get_Key_Item_3_Ch2 + dbw CH6, SFX_Get_Key_Item_3_Ch3 SFX_Poisoned_3:: ; 7c1c5 (1f:41c5) - db CH4 - dw SFX_Poisoned_3_Ch1 + dbw CH4, SFX_Poisoned_3_Ch1 SFX_Trade_Machine_3:: ; 7c1c8 (1f:41c8) - db CH4 - dw SFX_Trade_Machine_3_Ch1 + dbw CH4, SFX_Trade_Machine_3_Ch1 SFX_Turn_On_PC_3:: ; 7c1cb (1f:41cb) - db CH4 - dw SFX_Turn_On_PC_3_Ch1 + dbw CH4, SFX_Turn_On_PC_3_Ch1 SFX_Turn_Off_PC_3:: ; 7c1ce (1f:41ce) - db CH4 - dw SFX_Turn_Off_PC_3_Ch1 + dbw CH4, SFX_Turn_Off_PC_3_Ch1 SFX_Enter_PC_3:: ; 7c1d1 (1f:41d1) - db CH4 - dw SFX_Enter_PC_3_Ch1 + dbw CH4, SFX_Enter_PC_3_Ch1 SFX_Shrink_3:: ; 7c1d4 (1f:41d4) - db CH4 - dw SFX_Shrink_3_Ch1 + dbw CH4, SFX_Shrink_3_Ch1 SFX_Switch_3:: ; 7c1d7 (1f:41d7) - db CH4 - dw SFX_Switch_3_Ch1 + dbw CH4, SFX_Switch_3_Ch1 SFX_Healing_Machine_3:: ; 7c1da (1f:41da) - db CH4 - dw SFX_Healing_Machine_3_Ch1 + dbw CH4, SFX_Healing_Machine_3_Ch1 SFX_Teleport_Exit1_3:: ; 7c1dd (1f:41dd) - db CH4 - dw SFX_Teleport_Exit1_3_Ch1 + dbw CH4, SFX_Teleport_Exit1_3_Ch1 SFX_Teleport_Enter1_3:: ; 7c1e0 (1f:41e0) - db CH4 - dw SFX_Teleport_Enter1_3_Ch1 + dbw CH4, SFX_Teleport_Enter1_3_Ch1 SFX_Teleport_Exit2_3:: ; 7c1e3 (1f:41e3) - db CH4 - dw SFX_Teleport_Exit2_3_Ch1 + dbw CH4, SFX_Teleport_Exit2_3_Ch1 SFX_Ledge_3:: ; 7c1e6 (1f:41e6) - db CH4 - dw SFX_Ledge_3_Ch1 + dbw CH4, SFX_Ledge_3_Ch1 SFX_Teleport_Enter2_3:: ; 7c1e9 (1f:41e9) - db CH7 - dw SFX_Teleport_Enter2_3_Ch1 + dbw CH7, SFX_Teleport_Enter2_3_Ch1 SFX_Fly_3:: ; 7c1ec (1f:41ec) - db CH7 - dw SFX_Fly_3_Ch1 + dbw CH7, SFX_Fly_3_Ch1 SFX_Denied_3:: ; 7c1ef (1f:41ef) - db ( $40 | CH4 ) - dw SFX_Denied_3_Ch1 - db CH5 - dw SFX_Denied_3_Ch2 + dbw ( $40 | CH4 ), SFX_Denied_3_Ch1 + dbw CH5, SFX_Denied_3_Ch2 SFX_Arrow_Tiles_3:: ; 7c1f5 (1f:41f5) - db CH4 - dw SFX_Arrow_Tiles_3_Ch1 + dbw CH4, SFX_Arrow_Tiles_3_Ch1 SFX_Push_Boulder_3:: ; 7c1f8 (1f:41f8) - db CH7 - dw SFX_Push_Boulder_3_Ch1 + dbw CH7, SFX_Push_Boulder_3_Ch1 SFX_SS_Anne_Horn_3:: ; 7c1fb (1f:41fb) - db ( $40 | CH4 ) - dw SFX_SS_Anne_Horn_3_Ch1 - db CH5 - dw SFX_SS_Anne_Horn_3_Ch2 + dbw ( $40 | CH4 ), SFX_SS_Anne_Horn_3_Ch1 + dbw CH5, SFX_SS_Anne_Horn_3_Ch2 SFX_Withdraw_Deposit_3:: ; 7c201 (1f:4201) - db CH4 - dw SFX_Withdraw_Deposit_3_Ch1 + dbw CH4, SFX_Withdraw_Deposit_3_Ch1 SFX_Cut_3:: ; 7c204 (1f:4204) - db CH7 - dw SFX_Cut_3_Ch1 + dbw CH7, SFX_Cut_3_Ch1 SFX_Go_Inside_3:: ; 7c207 (1f:4207) - db CH7 - dw SFX_Go_Inside_3_Ch1 + dbw CH7, SFX_Go_Inside_3_Ch1 SFX_Swap_3:: ; 7c20a (1f:420a) - db ( $40 | CH4 ) - dw SFX_Swap_3_Ch1 - db CH5 - dw SFX_Swap_3_Ch2 + dbw ( $40 | CH4 ), SFX_Swap_3_Ch1 + dbw CH5, SFX_Swap_3_Ch2 SFX_59_3:: ; 7c210 (1f:4210) - db ( $40 | CH4 ) - dw SFX_59_3_Ch1 - db CH5 - dw SFX_59_3_Ch2 + dbw ( $40 | CH4 ), SFX_59_3_Ch1 + dbw CH5, SFX_59_3_Ch2 SFX_Purchase_3:: ; 7c216 (1f:4216) - db ( $40 | CH4 ) - dw SFX_Purchase_3_Ch1 - db CH5 - dw SFX_Purchase_3_Ch2 + dbw ( $40 | CH4 ), SFX_Purchase_3_Ch1 + dbw CH5, SFX_Purchase_3_Ch2 SFX_Collision_3:: ; 7c21c (1f:421c) - db CH4 - dw SFX_Collision_3_Ch1 + dbw CH4, SFX_Collision_3_Ch1 SFX_Go_Outside_3:: ; 7c21f (1f:421f) - db CH7 - dw SFX_Go_Outside_3_Ch1 + dbw CH7, SFX_Go_Outside_3_Ch1 SFX_Save_3:: ; 7c222 (1f:4222) - db ( $40 | CH4 ) - dw SFX_Save_3_Ch1 - db CH5 - dw SFX_Save_3_Ch2 + dbw ( $40 | CH4 ), SFX_Save_3_Ch1 + dbw CH5, SFX_Save_3_Ch2 SFX_Intro_Lunge:: ; 7c228 (1f:4228) - db CH7 - dw SFX_Intro_Lunge_Ch1 + dbw CH7, SFX_Intro_Lunge_Ch1 SFX_Intro_Hip:: ; 7c22b (1f:422b) - db CH4 - dw SFX_Intro_Hip_Ch1 + dbw CH4, SFX_Intro_Hip_Ch1 SFX_Intro_Hop:: ; 7c22e (1f:422e) - db CH4 - dw SFX_Intro_Hop_Ch1 + dbw CH4, SFX_Intro_Hop_Ch1 SFX_Intro_Raise:: ; 7c231 (1f:4231) - db CH7 - dw SFX_Intro_Raise_Ch1 + dbw CH7, SFX_Intro_Raise_Ch1 SFX_Intro_Crash:: ; 7c234 (1f:4234) - db CH7 - dw SFX_Intro_Crash_Ch1 + dbw CH7, SFX_Intro_Crash_Ch1 SFX_Intro_Whoosh:: ; 7c237 (1f:4237) - db CH7 - dw SFX_Intro_Whoosh_Ch1 + dbw CH7, SFX_Intro_Whoosh_Ch1 SFX_Slots_Stop_Wheel:: ; 7c23a (1f:423a) - db CH4 - dw SFX_Slots_Stop_Wheel_Ch1 + dbw CH4, SFX_Slots_Stop_Wheel_Ch1 SFX_Slots_Reward:: ; 7c23d (1f:423d) - db CH4 - dw SFX_Slots_Reward_Ch1 + dbw CH4, SFX_Slots_Reward_Ch1 SFX_Slots_New_Spin:: ; 7c240 (1f:4240) - db ( $40 | CH4 ) - dw SFX_Slots_New_Spin_Ch1 - db CH5 - dw SFX_Slots_New_Spin_Ch2 + dbw ( $40 | CH4 ), SFX_Slots_New_Spin_Ch1 + dbw CH5, SFX_Slots_New_Spin_Ch2 SFX_Shooting_Star:: ; 7c246 (1f:4246) - db CH4 - dw SFX_Shooting_Star_Ch1 + dbw CH4, SFX_Shooting_Star_Ch1 diff --git a/audio/headers/sfxheaders4.asm b/audio/headers/sfxheaders4.asm index 6968bcf0..bb60c5bd 100644 --- a/audio/headers/sfxheaders4.asm +++ b/audio/headers/sfxheaders4.asm @@ -1,610 +1,294 @@ SFX_Headers_4:: ; 80000 (20:4000) - db $ff, $ff, $ff + dbw -1, -1 ; padding -SFX_80003_4:: ; 80003 (20:4003) - db CH7 - dw SFX_841ec_4_Ch7 +SFX_Snare1_4:: ; 80003 (20:4003) + dbw CH7, SFX_Snare1_4_Ch7 -SFX_80006_4:: ; 80006 (20:4006) - db CH7 - dw SFX_841f0_4_Ch7 +SFX_Snare2_4:: ; 80006 (20:4006) + dbw CH7, SFX_Snare2_4_Ch7 -SFX_80009_4:: ; 80009 (20:4009) - db CH7 - dw SFX_841f4_4_Ch7 +SFX_Snare3_4:: ; 80009 (20:4009) + dbw CH7, SFX_Snare3_4_Ch7 -SFX_8000c_4:: ; 8000c (20:400c) - db CH7 - dw SFX_841f8_4_Ch7 +SFX_Snare4_4:: ; 8000c (20:400c) + dbw CH7, SFX_Snare4_4_Ch7 -SFX_8000f_4:: ; 8000f (20:400f) - db CH7 - dw SFX_841fc_4_Ch7 +SFX_Snare5_4:: ; 8000f (20:400f) + dbw CH7, SFX_Snare5_4_Ch7 -SFX_80012_4:: ; 80012 (20:4012) - db CH7 - dw SFX_8420f_4_Ch7 +SFX_Triangle1_4:: ; 80012 (20:4012) + dbw CH7, SFX_Triangle1_4_Ch7 -SFX_80015_4:: ; 80015 (20:4015) - db CH7 - dw SFX_84213_4_Ch7 +SFX_Triangle2_4:: ; 80015 (20:4015) + dbw CH7, SFX_Triangle2_4_Ch7 -SFX_80018_4:: ; 80018 (20:4018) - db CH7 - dw SFX_8421a_4_Ch7 +SFX_Snare6_4:: ; 80018 (20:4018) + dbw CH7, SFX_Snare6_4_Ch7 -SFX_8001b_4:: ; 8001b (20:401b) - db CH7 - dw SFX_8421e_4_Ch7 +SFX_Snare7_4:: ; 8001b (20:401b) + dbw CH7, SFX_Snare7_4_Ch7 -SFX_8001e_4:: ; 8001e (20:401e) - db CH7 - dw SFX_84222_4_Ch7 +SFX_Snare8_4:: ; 8001e (20:401e) + dbw CH7, SFX_Snare8_4_Ch7 -SFX_80021_4:: ; 80021 (20:4021) - db CH7 - dw SFX_84226_4_Ch7 +SFX_Snare9_4:: ; 80021 (20:4021) + dbw CH7, SFX_Snare9_4_Ch7 -SFX_80024_4:: ; 80024 (20:4024) - db CH7 - dw SFX_8422a_4_Ch7 +SFX_Cymbal1_4:: ; 80024 (20:4024) + dbw CH7, SFX_Cymbal1_4_Ch7 -SFX_80027_4:: ; 80027 (20:4027) - db CH7 - dw SFX_8422e_4_Ch7 +SFX_Cymbal2_4:: ; 80027 (20:4027) + dbw CH7, SFX_Cymbal2_4_Ch7 -SFX_8002a_4:: ; 8002a (20:402a) - db CH7 - dw SFX_84232_4_Ch7 +SFX_Cymbal3_4:: ; 8002a (20:402a) + dbw CH7, SFX_Cymbal3_4_Ch7 -SFX_8002d_4:: ; 8002d (20:402d) - db CH7 - dw SFX_84236_4_Ch7 +SFX_Muted_Snare1_4:: ; 8002d (20:402d) + dbw CH7, SFX_Muted_Snare1_4_Ch7 -SFX_80030_4:: ; 80030 (20:4030) - db CH7 - dw SFX_8423d_4_Ch7 +SFX_Triangle3_4:: ; 80030 (20:4030) + dbw CH7, SFX_Triangle3_4_Ch7 -SFX_80033_4:: ; 80033 (20:4033) - db CH7 - dw SFX_84244_4_Ch7 +SFX_Muted_Snare2_4:: ; 80033 (20:4033) + dbw CH7, SFX_Muted_Snare2_4_Ch7 -SFX_80036_4:: ; 80036 (20:4036) - db CH7 - dw SFX_84248_4_Ch7 +SFX_Muted_Snare3_4:: ; 80036 (20:4036) + dbw CH7, SFX_Muted_Snare3_4_Ch7 -SFX_80039_4:: ; 80039 (20:4039) - db CH7 - dw SFX_8424c_4_Ch7 +SFX_Muted_Snare4_4:: ; 80039 (20:4039) + dbw CH7, SFX_Muted_Snare4_4_Ch7 SFX_8003c_4:: ; 8003c (20:403c) - db ( $80 | CH4 ) - dw SFX_845db_4_Ch4 - -SFX_8003f_4:: ; 8003f (20:403f) - db CH5 - dw SFX_845ea_4_Ch5 - -SFX_80042_4:: ; 80042 (20:4042) - db CH7 - dw SFX_845f9_4_Ch7 + dbw ( $80 | CH4 ), SFX_805db_4_Ch4 + dbw CH5, SFX_805ea_4_Ch5 + dbw CH7, SFX_805f9_4_Ch7 SFX_80045_4:: ; 80045 (20:4045) - db ( $80 | CH4 ) - dw SFX_847eb_4_Ch4 - -SFX_80048_4:: ; 80048 (20:4048) - db CH5 - dw SFX_847fe_4_Ch5 - -SFX_8004b_4:: ; 8004b (20:404b) - db CH7 - dw SFX_84811_4_Ch7 + dbw ( $80 | CH4 ), SFX_807eb_4_Ch4 + dbw CH5, SFX_807fe_4_Ch5 + dbw CH7, SFX_80811_4_Ch7 SFX_8004e_4:: ; 8004e (20:404e) - db ( $80 | CH4 ) - dw SFX_84760_4_Ch4 - -SFX_80051_4:: ; 80051 (20:4051) - db CH5 - dw SFX_8476f_4_Ch5 - -SFX_80054_4:: ; 80054 (20:4054) - db CH7 - dw SFX_8477d_4_Ch7 + dbw ( $80 | CH4 ), SFX_80760_4_Ch4 + dbw CH5, SFX_8076f_4_Ch5 + dbw CH7, SFX_8077d_4_Ch7 SFX_80057_4:: ; 80057 (20:4057) - db ( $80 | CH4 ) - dw SFX_844fa_4_Ch4 - -SFX_8005a_4:: ; 8005a (20:405a) - db CH5 - dw SFX_84519_4_Ch5 - -SFX_8005d_4:: ; 8005d (20:405d) - db CH7 - dw SFX_84538_4_Ch7 + dbw ( $80 | CH4 ), SFX_804fa_4_Ch4 + dbw CH5, SFX_80519_4_Ch5 + dbw CH7, SFX_80538_4_Ch7 SFX_80060_4:: ; 80060 (20:4060) - db ( $80 | CH4 ) - dw SFX_848a9_4_Ch4 - -SFX_80063_4:: ; 80063 (20:4063) - db CH5 - dw SFX_848c8_4_Ch5 - -SFX_80066_4:: ; 80066 (20:4066) - db CH7 - dw SFX_848e7_4_Ch7 + dbw ( $80 | CH4 ), SFX_808a9_4_Ch4 + dbw CH5, SFX_808c8_4_Ch5 + dbw CH7, SFX_808e7_4_Ch7 SFX_80069_4:: ; 80069 (20:4069) - db ( $80 | CH4 ) - dw SFX_84689_4_Ch4 - -SFX_8006c_4:: ; 8006c (20:406c) - db CH5 - dw SFX_8469c_4_Ch5 - -SFX_8006f_4:: ; 8006f (20:406f) - db CH7 - dw SFX_846ae_4_Ch7 + dbw ( $80 | CH4 ), SFX_80689_4_Ch4 + dbw CH5, SFX_8069c_4_Ch5 + dbw CH7, SFX_806ae_4_Ch7 SFX_80072_4:: ; 80072 (20:4072) - db ( $80 | CH4 ) - dw SFX_84633_4_Ch4 - -SFX_80075_4:: ; 80075 (20:4075) - db CH5 - dw SFX_8464d_4_Ch5 - -SFX_80078_4:: ; 80078 (20:4078) - db CH7 - dw SFX_8464e_4_Ch7 + dbw ( $80 | CH4 ), SFX_80633_4_Ch4 + dbw CH5, SFX_8064d_4_Ch5 + dbw CH7, SFX_8064e_4_Ch7 SFX_8007b_4:: ; 8007b (20:407b) - db ( $80 | CH4 ) - dw SFX_84661_4_Ch4 - -SFX_8007e_4:: ; 8007e (20:407e) - db CH5 - dw SFX_84670_4_Ch5 - -SFX_80081_4:: ; 80081 (20:4081) - db CH7 - dw SFX_8467f_4_Ch7 + dbw ( $80 | CH4 ), SFX_80661_4_Ch4 + dbw CH5, SFX_80670_4_Ch5 + dbw CH7, SFX_8067f_4_Ch7 SFX_80084_4:: ; 80084 (20:4084) - db ( $80 | CH4 ) - dw SFX_84879_4_Ch4 - -SFX_80087_4:: ; 80087 (20:4087) - db CH5 - dw SFX_8488c_4_Ch5 - -SFX_8008a_4:: ; 8008a (20:408a) - db CH7 - dw SFX_8489f_4_Ch7 + dbw ( $80 | CH4 ), SFX_80879_4_Ch4 + dbw CH5, SFX_8088c_4_Ch5 + dbw CH7, SFX_8089f_4_Ch7 SFX_8008d_4:: ; 8008d (20:408d) - db ( $80 | CH4 ) - dw SFX_84383_4_Ch4 - -SFX_80090_4:: ; 80090 (20:4090) - db CH5 - dw SFX_843a0_4_Ch5 - -SFX_80093_4:: ; 80093 (20:4093) - db CH7 - dw SFX_843c1_4_Ch7 + dbw ( $80 | CH4 ), SFX_80383_4_Ch4 + dbw CH5, SFX_803a0_4_Ch5 + dbw CH7, SFX_803c1_4_Ch7 SFX_80096_4:: ; 80096 (20:4096) - db ( $80 | CH4 ) - dw SFX_8481e_4_Ch4 - -SFX_80099_4:: ; 80099 (20:4099) - db CH5 - dw SFX_8483d_4_Ch5 - -SFX_8009c_4:: ; 8009c (20:409c) - db CH7 - dw SFX_84860_4_Ch7 + dbw ( $80 | CH4 ), SFX_8081e_4_Ch4 + dbw CH5, SFX_8083d_4_Ch5 + dbw CH7, SFX_80860_4_Ch7 SFX_8009f_4:: ; 8009f (20:409f) - db ( $80 | CH4 ) - dw SFX_846af_4_Ch4 - -SFX_800a2_4:: ; 800a2 (20:40a2) - db CH5 - dw SFX_846da_4_Ch5 - -SFX_800a5_4:: ; 800a5 (20:40a5) - db CH7 - dw SFX_846f9_4_Ch7 + dbw ( $80 | CH4 ), SFX_806af_4_Ch4 + dbw CH5, SFX_806da_4_Ch5 + dbw CH7, SFX_806f9_4_Ch7 SFX_800a8_4:: ; 800a8 (20:40a8) - db ( $80 | CH4 ) - dw SFX_84712_4_Ch4 - -SFX_800ab_4:: ; 800ab (20:40ab) - db CH5 - dw SFX_84739_4_Ch5 - -SFX_800ae_4:: ; 800ae (20:40ae) - db CH7 - dw SFX_8475f_4_Ch7 + dbw ( $80 | CH4 ), SFX_80712_4_Ch4 + dbw CH5, SFX_80739_4_Ch5 + dbw CH7, SFX_8075f_4_Ch7 SFX_800b1_4:: ; 800b1 (20:40b1) - db ( $80 | CH4 ) - dw SFX_8477e_4_Ch4 - -SFX_800b4_4:: ; 800b4 (20:40b4) - db CH5 - dw SFX_8479d_4_Ch5 - -SFX_800b7_4:: ; 800b7 (20:40b7) - db CH7 - dw SFX_847cc_4_Ch7 + dbw ( $80 | CH4 ), SFX_8077e_4_Ch4 + dbw CH5, SFX_8079d_4_Ch5 + dbw CH7, SFX_807cc_4_Ch7 SFX_800ba_4:: ; 800ba (20:40ba) - db ( $80 | CH4 ) - dw SFX_84603_4_Ch4 - -SFX_800bd_4:: ; 800bd (20:40bd) - db CH5 - dw SFX_84616_4_Ch5 - -SFX_800c0_4:: ; 800c0 (20:40c0) - db CH7 - dw SFX_84629_4_Ch7 + dbw ( $80 | CH4 ), SFX_80603_4_Ch4 + dbw CH5, SFX_80616_4_Ch5 + dbw CH7, SFX_80629_4_Ch7 SFX_800c3_4:: ; 800c3 (20:40c3) - db ( $80 | CH4 ) - dw SFX_84545_4_Ch4 - -SFX_800c6_4:: ; 800c6 (20:40c6) - db CH5 - dw SFX_84560_4_Ch5 - -SFX_800c9_4:: ; 800c9 (20:40c9) - db CH7 - dw SFX_8457b_4_Ch7 + dbw ( $80 | CH4 ), SFX_80545_4_Ch4 + dbw CH5, SFX_80560_4_Ch5 + dbw CH7, SFX_8057b_4_Ch7 SFX_800cc_4:: ; 800cc (20:40cc) - db ( $80 | CH4 ) - dw SFX_8458b_4_Ch4 - -SFX_800cf_4:: ; 800cf (20:40cf) - db CH5 - dw SFX_845ae_4_Ch5 - -SFX_800d2_4:: ; 800d2 (20:40d2) - db CH7 - dw SFX_845d1_4_Ch7 + dbw ( $80 | CH4 ), SFX_8058b_4_Ch4 + dbw CH5, SFX_805ae_4_Ch5 + dbw CH7, SFX_805d1_4_Ch7 SFX_800d5_4:: ; 800d5 (20:40d5) - db ( $80 | CH4 ) - dw SFX_84467_4_Ch4 - -SFX_800d8_4:: ; 800d8 (20:40d8) - db CH5 - dw SFX_84486_4_Ch5 - -SFX_800db_4:: ; 800db (20:40db) - db CH7 - dw SFX_844a9_4_Ch7 + dbw ( $80 | CH4 ), SFX_80467_4_Ch4 + dbw CH5, SFX_80486_4_Ch5 + dbw CH7, SFX_804a9_4_Ch7 SFX_800de_4:: ; 800de (20:40de) - db ( $80 | CH4 ) - dw SFX_8497f_4_Ch4 - -SFX_800e1_4:: ; 800e1 (20:40e1) - db CH5 - dw SFX_84992_4_Ch5 - -SFX_800e4_4:: ; 800e4 (20:40e4) - db CH7 - dw SFX_849a5_4_Ch7 + dbw ( $80 | CH4 ), SFX_8097f_4_Ch4 + dbw CH5, SFX_80992_4_Ch5 + dbw CH7, SFX_809a5_4_Ch7 SFX_800e7_4:: ; 800e7 (20:40e7) - db ( $80 | CH4 ) - dw SFX_849b2_4_Ch4 - -SFX_800ea_4:: ; 800ea (20:40ea) - db CH5 - dw SFX_849cd_4_Ch5 - -SFX_800ed_4:: ; 800ed (20:40ed) - db CH7 - dw SFX_849e8_4_Ch7 + dbw ( $80 | CH4 ), SFX_809b2_4_Ch4 + dbw CH5, SFX_809cd_4_Ch5 + dbw CH7, SFX_809e8_4_Ch7 SFX_800f0_4:: ; 800f0 (20:40f0) - db ( $80 | CH4 ) - dw SFX_849fb_4_Ch4 - -SFX_800f3_4:: ; 800f3 (20:40f3) - db CH5 - dw SFX_84a0a_4_Ch5 - -SFX_800f6_4:: ; 800f6 (20:40f6) - db CH7 - dw SFX_84a19_4_Ch7 + dbw ( $80 | CH4 ), SFX_809fb_4_Ch4 + dbw CH5, SFX_80a0a_4_Ch5 + dbw CH7, SFX_80a19_4_Ch7 SFX_800f9_4:: ; 800f9 (20:40f9) - db ( $80 | CH4 ) - dw SFX_84a89_4_Ch4 - -SFX_800fc_4:: ; 800fc (20:40fc) - db CH5 - dw SFX_84aa4_4_Ch5 - -SFX_800ff_4:: ; 800ff (20:40ff) - db CH7 - dw SFX_84abf_4_Ch7 + dbw ( $80 | CH4 ), SFX_80a89_4_Ch4 + dbw CH5, SFX_80aa4_4_Ch5 + dbw CH7, SFX_80abf_4_Ch7 SFX_80102_4:: ; 80102 (20:4102) - db ( $80 | CH4 ) - dw SFX_8491c_4_Ch4 - -SFX_80105_4:: ; 80105 (20:4105) - db CH5 - dw SFX_8492b_4_Ch5 - -SFX_80108_4:: ; 80108 (20:4108) - db CH7 - dw SFX_8493a_4_Ch7 + dbw ( $80 | CH4 ), SFX_8091c_4_Ch4 + dbw CH5, SFX_8092b_4_Ch5 + dbw CH7, SFX_8093a_4_Ch7 SFX_8010b_4:: ; 8010b (20:410b) - db ( $80 | CH4 ) - dw SFX_84ad2_4_Ch4 - -SFX_8010e_4:: ; 8010e (20:410e) - db CH5 - dw SFX_84ae5_4_Ch5 - -SFX_80111_4:: ; 80111 (20:4111) - db CH7 - dw SFX_84af8_4_Ch7 + dbw ( $80 | CH4 ), SFX_80ad2_4_Ch4 + dbw CH5, SFX_80ae5_4_Ch5 + dbw CH7, SFX_80af8_4_Ch7 SFX_80114_4:: ; 80114 (20:4114) - db ( $80 | CH4 ) - dw SFX_84be2_4_Ch4 - -SFX_80117_4:: ; 80117 (20:4117) - db CH5 - dw SFX_84c05_4_Ch5 - -SFX_8011a_4:: ; 8011a (20:411a) - db CH7 - dw SFX_84c28_4_Ch7 + dbw ( $80 | CH4 ), SFX_80be2_4_Ch4 + dbw CH5, SFX_80c05_4_Ch5 + dbw CH7, SFX_80c28_4_Ch7 SFX_8011d_4:: ; 8011d (20:411d) - db ( $80 | CH4 ) - dw SFX_848fa_4_Ch4 - -SFX_80120_4:: ; 80120 (20:4120) - db CH5 - dw SFX_84909_4_Ch5 - -SFX_80123_4:: ; 80123 (20:4123) - db CH7 - dw SFX_8491b_4_Ch7 + dbw ( $80 | CH4 ), SFX_808fa_4_Ch4 + dbw CH5, SFX_80909_4_Ch5 + dbw CH7, SFX_8091b_4_Ch7 SFX_80126_4:: ; 80126 (20:4126) - db ( $80 | CH4 ) - dw SFX_84b53_4_Ch4 - -SFX_80129_4:: ; 80129 (20:4129) - db CH5 - dw SFX_84b6e_4_Ch5 - -SFX_8012c_4:: ; 8012c (20:412c) - db CH7 - dw SFX_84b89_4_Ch7 + dbw ( $80 | CH4 ), SFX_80b53_4_Ch4 + dbw CH5, SFX_80b6e_4_Ch5 + dbw CH7, SFX_80b89_4_Ch7 SFX_8012f_4:: ; 8012f (20:412f) - db ( $80 | CH4 ) - dw SFX_84944_4_Ch4 - -SFX_80132_4:: ; 80132 (20:4132) - db CH5 - dw SFX_8495b_4_Ch5 - -SFX_80135_4:: ; 80135 (20:4135) - db CH7 - dw SFX_84972_4_Ch7 + dbw ( $80 | CH4 ), SFX_80944_4_Ch4 + dbw CH5, SFX_8095b_4_Ch5 + dbw CH7, SFX_80972_4_Ch7 SFX_80138_4:: ; 80138 (20:4138) - db ( $80 | CH4 ) - dw SFX_84b05_4_Ch4 - -SFX_8013b_4:: ; 8013b (20:413b) - db CH5 - dw SFX_84b28_4_Ch5 - -SFX_8013e_4:: ; 8013e (20:413e) - db CH7 - dw SFX_84b43_4_Ch7 + dbw ( $80 | CH4 ), SFX_80b05_4_Ch4 + dbw CH5, SFX_80b28_4_Ch5 + dbw CH7, SFX_80b43_4_Ch7 SFX_80141_4:: ; 80141 (20:4141) - db ( $80 | CH4 ) - dw SFX_84b9c_4_Ch4 - -SFX_80144_4:: ; 80144 (20:4144) - db CH5 - dw SFX_84bb7_4_Ch5 - -SFX_80147_4:: ; 80147 (20:4147) - db CH7 - dw SFX_84bd2_4_Ch7 + dbw ( $80 | CH4 ), SFX_80b9c_4_Ch4 + dbw CH5, SFX_80bb7_4_Ch5 + dbw CH7, SFX_80bd2_4_Ch7 SFX_8014a_4:: ; 8014a (20:414a) - db ( $80 | CH4 ) - dw SFX_84a23_4_Ch4 - -SFX_8014d_4:: ; 8014d (20:414d) - db CH5 - dw SFX_84a46_4_Ch5 - -SFX_80150_4:: ; 80150 (20:4150) - db CH7 - dw SFX_84a6d_4_Ch7 + dbw ( $80 | CH4 ), SFX_80a23_4_Ch4 + dbw CH5, SFX_80a46_4_Ch5 + dbw CH7, SFX_80a6d_4_Ch7 SFX_80153_4:: ; 80153 (20:4153) - db ( $80 | CH4 ) - dw SFX_84c3b_4_Ch4 - -SFX_80156_4:: ; 80156 (20:4156) - db CH5 - dw SFX_84c4e_4_Ch5 - -SFX_80159_4:: ; 80159 (20:4159) - db CH7 - dw SFX_84c61_4_Ch7 + dbw ( $80 | CH4 ), SFX_80c3b_4_Ch4 + dbw CH5, SFX_80c4e_4_Ch5 + dbw CH7, SFX_80c61_4_Ch7 SFX_8015c_4:: ; 8015c (20:415c) - db ( $80 | CH4 ) - dw SFX_84c6e_4_Ch4 - -SFX_8015f_4:: ; 8015f (20:415f) - db CH5 - dw SFX_84c81_4_Ch5 - -SFX_80162_4:: ; 80162 (20:4162) - db CH7 - dw SFX_84c94_4_Ch7 + dbw ( $80 | CH4 ), SFX_80c6e_4_Ch4 + dbw CH5, SFX_80c81_4_Ch5 + dbw CH7, SFX_80c94_4_Ch7 SFX_80165_4:: ; 80165 (20:4165) - db ( $80 | CH4 ) - dw SFX_84ca1_4_Ch4 - -SFX_80168_4:: ; 80168 (20:4168) - db CH5 - dw SFX_84cc4_4_Ch5 - -SFX_8016b_4:: ; 8016b (20:416b) - db CH7 - dw SFX_84ce6_4_Ch7 + dbw ( $80 | CH4 ), SFX_80ca1_4_Ch4 + dbw CH5, SFX_80cc4_4_Ch5 + dbw CH7, SFX_80ce6_4_Ch7 SFX_8016e_4:: ; 8016e (20:416e) - db ( $80 | CH4 ) - dw SFX_84ce7_4_Ch4 - -SFX_80171_4:: ; 80171 (20:4171) - db CH5 - dw SFX_84cfa_4_Ch5 - -SFX_80174_4:: ; 80174 (20:4174) - db CH7 - dw SFX_84d0d_4_Ch7 + dbw ( $80 | CH4 ), SFX_80ce7_4_Ch4 + dbw CH5, SFX_80cfa_4_Ch5 + dbw CH7, SFX_80d0d_4_Ch7 SFX_80177_4:: ; 80177 (20:4177) - db ( $80 | CH4 ) - dw SFX_843da_4_Ch4 - -SFX_8017a_4:: ; 8017a (20:417a) - db CH5 - dw SFX_843f1_4_Ch5 - -SFX_8017d_4:: ; 8017d (20:417d) - db CH7 - dw SFX_84404_4_Ch7 + dbw ( $80 | CH4 ), SFX_803da_4_Ch4 + dbw CH5, SFX_803f1_4_Ch5 + dbw CH7, SFX_80404_4_Ch7 SFX_80180_4:: ; 80180 (20:4180) - db ( $80 | CH4 ) - dw SFX_84411_4_Ch4 - -SFX_80183_4:: ; 80183 (20:4183) - db CH5 - dw SFX_84434_4_Ch5 - -SFX_80186_4:: ; 80186 (20:4186) - db CH7 - dw SFX_84457_4_Ch7 + dbw ( $80 | CH4 ), SFX_80411_4_Ch4 + dbw CH5, SFX_80434_4_Ch5 + dbw CH7, SFX_80457_4_Ch7 SFX_80189_4:: ; 80189 (20:4189) - db ( $80 | CH4 ) - dw SFX_844bf_4_Ch4 - -SFX_8018c_4:: ; 8018c (20:418c) - db CH5 - dw SFX_844d6_4_Ch5 - -SFX_8018f_4:: ; 8018f (20:418f) - db CH7 - dw SFX_844ed_4_Ch7 - -SFX_80192_4:: ; 80192 (20:4192) - db ( $80 | CH4 ) - dw SFX_84e5a_4_Ch4 + dbw ( $80 | CH4 ), SFX_804bf_4_Ch4 + dbw CH5, SFX_804d6_4_Ch5 + dbw CH7, SFX_804ed_4_Ch7 -SFX_80195_4:: ; 80195 (20:4195) - db CH5 - dw SFX_84e71_4_Ch5 +SFX_Get_Item1_4:: ; 80192 (20:4192) + dbw ( $80 | CH4 ), SFX_80e5a_4_Ch4 + dbw CH5, SFX_80e71_4_Ch5 + dbw CH6, SFX_80e81_4_Ch6 -SFX_80198_4:: ; 80198 (20:4198) - db CH6 - dw SFX_84e81_4_Ch6 +SFX_Get_Item2_4:: ; 8019b (20:419b) + dbw ( $80 | CH4 ), SFX_80ec8_4_Ch4 + dbw CH5, SFX_80ee7_4_Ch5 + dbw CH6, SFX_80eff_4_Ch6 -SFX_8019b_4:: ; 8019b (20:419b) - db ( $80 | CH4 ) - dw SFX_84ec8_4_Ch4 +SFX_Tink_4:: ; 801a4 (20:41a4) + dbw CH4, SFX_8028e_4_Ch4 -SFX_8019e_4:: ; 8019e (20:419e) - db CH5 - dw SFX_84ee7_4_Ch5 +SFX_Heal_Ailment_4:: ; 801a7 (20:41a7) + dbw CH4, SFX_8027f_4_Ch4 -SFX_801a1_4:: ; 801a1 (20:41a1) - db CH6 - dw SFX_84eff_4_Ch6 +SFX_Start_Menu_4:: ; 801aa (20:41aa) + dbw CH4, SFX_8026a_4_Ch4 -SFX_801a4_4:: ; 801a4 (20:41a4) - db CH4 - dw SFX_8428e_4_Ch4 - -SFX_801a7_4:: ; 801a7 (20:41a7) - db CH4 - dw SFX_8427f_4_Ch4 - -SFX_801aa_4:: ; 801aa (20:41aa) - db CH4 - dw SFX_8426a_4_Ch4 - -SFX_801ad_4:: ; 801ad (20:41ad) - db CH7 - dw SFX_84263_4_Ch7 +SFX_PressAB_4:: ; 801ad (20:41ad) + dbw CH7, SFX_80263_4_Ch7 SFX_801b0_4:: ; 801b0 (20:41b0) - db CH4 - dw SFX_84250_4_Ch4 + dbw CH4, SFX_80250_4_Ch4 SFX_801b3_4:: ; 801b3 (20:41b3) - db CH7 - dw SFX_8429f_4_Ch7 + dbw CH7, SFX_8029f_4_Ch7 SFX_801b6_4:: ; 801b6 (20:41b6) - db CH4 - dw SFX_842b5_4_Ch4 + dbw CH4, SFX_802b5_4_Ch4 SFX_801b9_4:: ; 801b9 (20:41b9) - db CH7 - dw SFX_842e1_4_Ch7 + dbw CH7, SFX_802e1_4_Ch7 SFX_801bc_4:: ; 801bc (20:41bc) - db CH4 - dw SFX_842cc_4_Ch4 + dbw CH4, SFX_802cc_4_Ch4 SFX_801bf_4:: ; 801bf (20:41bf) - db CH7 - dw SFX_842d7_4_Ch7 - -SFX_801c2_4:: ; 801c2 (20:41c2) - db ( $80 | CH4 ) - dw SFX_842eb_4_Ch4 - -SFX_801c5_4:: ; 801c5 (20:41c5) - db CH5 - dw SFX_8430a_4_Ch5 + dbw CH7, SFX_802d7_4_Ch7 -SFX_801c8_4:: ; 801c8 (20:41c8) - db CH6 - dw SFX_84322_4_Ch6 +SFX_Get_Item2_4_2:: ; 801c2 (20:41c2) + dbw ( $80 | CH4 ), SFX_Get_Item2_4_2_Ch1 + dbw CH5, SFX_Get_Item2_4_2_Ch2 + dbw CH6, SFX_Get_Item2_4_2_Ch3 diff --git a/audio/music/jessieandjames.asm b/audio/music/jessieandjames.asm new file mode 100755 index 00000000..0d349ddb --- /dev/null +++ b/audio/music/jessieandjames.asm @@ -0,0 +1,303 @@ +Music_JessieAndJames_Ch1: + tempo 144 + volume 7, 7 + duty 3 + vibrato 8, 1, 4 + notetype 12, 11, 2 + octave 3 + G# 1 + G_ 1 + F# 2 + F_ 2 + E_ 2 + D# 2 + D_ 2 + C# 2 + C_ 2 + notetype 12, 11, 6 + D# 12 + C_ 4 +.loop + notetype 12, 11, 2 + octave 4 + D_ 16 + rest 12 + notetype 12, 11, 4 + octave 3 + A# 4 + rest 16 + rest 8 + notetype 12, 11, 2 + octave 2 + A_ 2 + octave 3 + A# 2 + A_ 4 + D_ 1 + D# 1 + D# 2 + D# 2 + D_ 2 + D# 2 + D_ 2 + D# 2 + F_ 2 + D_ 1 + D# 1 + D# 2 + D# 2 + D_ 2 + octave 2 + A# 4 + notetype 12, 11, 4 + octave 3 + B_ 4 + notetype 12, 11, 2 + D_ 1 + D# 1 + D# 2 + D# 2 + D_ 2 + D# 2 + D_ 2 + D# 2 + F_ 2 + D_ 1 + D# 1 + D# 2 + D# 2 + D_ 2 + octave 2 + A# 2 + octave 3 + B_ 2 + notetype 12, 11, 4 + A# 4 + loopchannel 0, .loop + +Music_JessieAndJames_Ch2: + duty 3 + vibrato 6, 1, 5 + notetype 12, 12, 2 + octave 4 + D_ 1 + C# 1 + C_ 2 + octave 3 + B_ 2 + A# 2 + A_ 2 + G# 2 + G_ 2 + F# 2 + notetype 12, 12, 7 + A_ 12 + octave 4 + C# 4 +.loop + notetype 12, 12, 2 + octave 3 + C# 1 + D_ 1 + D_ 2 + D_ 2 + C# 2 + D_ 2 + C# 2 + D_ 2 + E_ 2 + C# 1 + D_ 1 + D_ 2 + D_ 2 + C# 2 + octave 2 + A_ 4 + notetype 12, 12, 5 + octave 4 + C# 4 + notetype 12, 12, 2 + D_ 1 + octave 3 + D_ 1 + D_ 2 + D_ 2 + C# 2 + D_ 2 + C# 2 + D_ 2 + E_ 2 + C# 1 + D_ 1 + D_ 2 + D_ 2 + C# 2 + notetype 12, 12, 6 + octave 4 + D_ 8 + notetype 12, 12, 2 + D# 6 + F_ 4 + D# 4 + octave 3 + A# 2 + octave 4 + D# 6 + F_ 4 + D# 2 + notetype 12, 12, 5 + D_ 4 + notetype 12, 12, 2 + D# 6 + F_ 4 + D# 4 + octave 3 + A# 2 + octave 4 + D# 4 + F_ 4 + notetype 12, 12, 5 + D# 8 + loopchannel 0, .loop + +Music_JessieAndJames_Ch3: + notetype 12, 1, 0 + rest 16 + rest 8 + octave 4 + D_ 2 + octave 3 + A_ 2 + octave 4 + C_ 2 + D# 2 +.loop + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A# 2 + A_ 2 + D# 2 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + octave 3 + A_ 2 + octave 4 + C_ 2 + D_ 2 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + octave 3 + A# 1 + rest 1 + octave 4 + C# 1 + rest 1 + E_ 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + octave 3 + A# 1 + rest 1 + octave 4 + C# 1 + rest 1 + E_ 1 + rest 1 + loopchannel 0, .loop diff --git a/audio/music/printer.asm b/audio/music/printer.asm new file mode 100755 index 00000000..853aa290 --- /dev/null +++ b/audio/music/printer.asm @@ -0,0 +1,316 @@ +Music_GBPrinter_Ch3: + tempo 256 + notetype 12, 1, 0 + octave 4 + B_ 6 + octave 5 + C# 1 + rest 1 + octave 4 + B_ 6 + octave 5 + C# 1 + rest 1 + octave 4 + B_ 1 + rest 1 + octave 5 + E_ 1 + rest 1 + D# 1 + rest 1 + C# 1 + rest 1 + octave 4 + B_ 1 + rest 1 + A_ 1 + rest 1 + G# 1 + rest 1 + F# 1 + rest 1 +.loop: + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + F# 1 + rest 1 + A_ 1 + rest 1 + F# 1 + rest 1 + A_ 1 + rest 1 + F# 1 + rest 1 + octave 5 + C# 1 + C_ 1 + C# 1 + rest 1 + octave 4 + F# 1 + rest 1 + E_ 1 + rest 1 + G# 1 + rest 1 + E_ 1 + rest 1 + G# 1 + rest 1 + E_ 1 + rest 1 + octave 5 + E_ 1 + D# 1 + E_ 1 + rest 1 + octave 4 + D# 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + F# 1 + rest 1 + A_ 1 + rest 1 + F# 1 + rest 1 + A_ 1 + rest 1 + B_ 1 + rest 1 + A_ 1 + rest 1 + G# 1 + rest 1 + F# 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + C# 1 + rest 1 + D_ 1 + rest 1 + D# 1 + rest 1 + F# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + F# 1 + rest 1 + D# 1 + rest 1 + F# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + F# 1 + rest 1 + E_ 1 + rest 1 + G# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + G# 1 + rest 1 + E_ 1 + rest 1 + G# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + G# 1 + rest 1 + F# 1 + rest 1 + A_ 1 + rest 1 + C# 1 + rest 1 + A_ 1 + rest 1 + F# 1 + rest 1 + A_ 1 + rest 1 + C# 1 + rest 1 + A_ 1 + rest 1 + B_ 1 + A# 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + F# 1 + rest 1 + G# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + C# 1 + rest 1 + D_ 1 + rest 1 + D# 1 + rest 1 + F# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + F# 1 + rest 1 + D# 1 + rest 1 + F# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + F# 1 + rest 1 + E_ 1 + rest 1 + G# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + G# 1 + rest 1 + E_ 1 + rest 1 + G# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + G# 1 + rest 1 + F# 1 + rest 1 + A_ 1 + rest 1 + C# 1 + rest 1 + A_ 1 + rest 1 + F# 1 + rest 1 + A_ 1 + rest 1 + F# 1 + rest 1 + D# 1 + rest 1 + B_ 1 + rest 1 + B_ 1 + rest 1 + A_ 1 + rest 1 + A_ 1 + rest 1 + G# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + C# 1 + rest 1 + D# 1 + rest 1 + loopchannel 0, .loop diff --git a/audio/sfx/cymbal1_4.asm b/audio/sfx/cymbal1_4.asm new file mode 100644 index 00000000..bd941ef5 --- /dev/null +++ b/audio/sfx/cymbal1_4.asm @@ -0,0 +1,4 @@ +SFX_Cymbal1_4_Ch7: + unknownnoise0x20 0, 161, 16 + endchannel + diff --git a/audio/sfx/cymbal2_4.asm b/audio/sfx/cymbal2_4.asm new file mode 100644 index 00000000..b33e10fc --- /dev/null +++ b/audio/sfx/cymbal2_4.asm @@ -0,0 +1,4 @@ +SFX_Cymbal2_4_Ch7: + unknownnoise0x20 0, 162, 17 + endchannel + diff --git a/audio/sfx/cymbal3_4.asm b/audio/sfx/cymbal3_4.asm new file mode 100644 index 00000000..b5e99c56 --- /dev/null +++ b/audio/sfx/cymbal3_4.asm @@ -0,0 +1,4 @@ +SFX_Cymbal3_4_Ch7: + unknownnoise0x20 0, 162, 80 + endchannel + diff --git a/audio/sfx/get_item2_4.asm b/audio/sfx/get_item2_4.asm new file mode 100644 index 00000000..b2909739 --- /dev/null +++ b/audio/sfx/get_item2_4.asm @@ -0,0 +1,67 @@ +SFX_80ec8_4_Ch4: + executemusic + tempo 256 + volume 7, 7 + duty 2 + toggleperfectpitch + notetype 5, 11, 4 + octave 4 + D_ 4 + C_ 4 + octave 3 + A_ 8 + notetype 5, 11, 2 + octave 4 + D# 2 + D# 2 + D_ 2 + C_ 2 + C_ 2 + octave 3 + A# 2 + notetype 5, 11, 4 + octave 4 + C_ 8 + endchannel + +SFX_80ee7_4_Ch5: + executemusic + vibrato 8, 2, 7 + duty 2 + notetype 5, 12, 5 + octave 4 + A_ 4 + F_ 4 + C_ 8 + notetype 5, 12, 2 + A# 2 + A# 2 + A# 2 + G_ 2 + G_ 2 + A# 2 + notetype 5, 12, 4 + A_ 8 + endchannel + +SFX_80eff_4_Ch6: + executemusic + notetype 5, 1, 0 + octave 5 + F_ 4 + D# 4 + C_ 8 + D# 1 + rest 1 + D# 1 + rest 1 + E_ 1 + rest 1 + F_ 1 + rest 1 + F_ 1 + rest 1 + G_ 1 + rest 1 + A_ 8 + endchannel diff --git a/audio/sfx/get_item2_4_2.asm b/audio/sfx/get_item2_4_2.asm new file mode 100644 index 00000000..6f97390e --- /dev/null +++ b/audio/sfx/get_item2_4_2.asm @@ -0,0 +1,69 @@ +SFX_Get_Item2_4_2_Ch1: ; 802eb (20:42eb) + executemusic + tempo 256 + volume 7, 7 + duty 2 + toggleperfectpitch + notetype 5, 11, 4 + octave 4 + D_ 4 + C_ 4 + octave 3 + A_ 8 + notetype 5, 11, 2 + octave 4 + D# 2 + D# 2 + D_ 2 + C_ 2 + C_ 2 + octave 3 + A# 2 + notetype 5, 11, 4 + octave 4 + C_ 8 + endchannel + + +SFX_Get_Item2_4_2_Ch2: ; 8030a (20:430a) + executemusic + vibrato 8, 2, 7 + duty 2 + notetype 5, 12, 5 + octave 4 + A_ 4 + F_ 4 + C_ 8 + notetype 5, 12, 2 + A# 2 + A# 2 + A# 2 + G_ 2 + G_ 2 + A# 2 + notetype 5, 12, 4 + A_ 8 + endchannel + + +SFX_Get_Item2_4_2_Ch3: ; 80322 (20:4322) + executemusic + notetype 5, 1, 0 + octave 5 + F_ 4 + D# 4 + C_ 8 + D# 1 + rest 1 + D# 1 + rest 1 + E_ 1 + rest 1 + F_ 1 + rest 1 + F_ 1 + rest 1 + G_ 1 + rest 1 + A_ 8 + endchannel diff --git a/audio/sfx/heal_ailment_4.asm b/audio/sfx/heal_ailment_4.asm new file mode 100755 index 00000000..fd80517d --- /dev/null +++ b/audio/sfx/heal_ailment_4.asm @@ -0,0 +1,7 @@ +SFX_8027f_4_Ch4: + duty 2 + unknownsfx0x10 23 + unknownsfx0x20 15, 240, 240, 4 + unknownsfx0x20 15, 242, 80, 6 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/muted_snare1_4.asm b/audio/sfx/muted_snare1_4.asm new file mode 100644 index 00000000..bcf8c54b --- /dev/null +++ b/audio/sfx/muted_snare1_4.asm @@ -0,0 +1,5 @@ +SFX_Muted_Snare1_4_Ch7: + unknownnoise0x20 0, 161, 24 + unknownnoise0x20 0, 49, 51 + endchannel + diff --git a/audio/sfx/muted_snare2_4.asm b/audio/sfx/muted_snare2_4.asm new file mode 100644 index 00000000..8934afe2 --- /dev/null +++ b/audio/sfx/muted_snare2_4.asm @@ -0,0 +1,4 @@ +SFX_Muted_Snare2_4_Ch7: + unknownnoise0x20 0, 145, 34 + endchannel + diff --git a/audio/sfx/muted_snare3_4.asm b/audio/sfx/muted_snare3_4.asm new file mode 100644 index 00000000..beeec087 --- /dev/null +++ b/audio/sfx/muted_snare3_4.asm @@ -0,0 +1,4 @@ +SFX_Muted_Snare3_4_Ch7: + unknownnoise0x20 0, 113, 34 + endchannel + diff --git a/audio/sfx/muted_snare4_4.asm b/audio/sfx/muted_snare4_4.asm new file mode 100644 index 00000000..7fc65086 --- /dev/null +++ b/audio/sfx/muted_snare4_4.asm @@ -0,0 +1,4 @@ +SFX_Muted_Snare4_4_Ch7: + unknownnoise0x20 0, 97, 34 + endchannel + diff --git a/audio/sfx/snare1_4.asm b/audio/sfx/snare1_4.asm new file mode 100755 index 00000000..4ba3b8c5 --- /dev/null +++ b/audio/sfx/snare1_4.asm @@ -0,0 +1,4 @@ +SFX_Snare1_4_Ch7: ; 841ec + unknownnoise0x20 0, 193, 51 + endchannel + diff --git a/audio/sfx/snare2_4.asm b/audio/sfx/snare2_4.asm new file mode 100755 index 00000000..dc1a26a9 --- /dev/null +++ b/audio/sfx/snare2_4.asm @@ -0,0 +1,4 @@ +SFX_Snare2_4_Ch7: ; 841f0 + unknownnoise0x20 0, 177, 51 + endchannel + diff --git a/audio/sfx/snare3_4.asm b/audio/sfx/snare3_4.asm new file mode 100755 index 00000000..a0fcb0d7 --- /dev/null +++ b/audio/sfx/snare3_4.asm @@ -0,0 +1,4 @@ +SFX_Snare3_4_Ch7: + unknownnoise0x20 0, 161, 51 + endchannel + diff --git a/audio/sfx/snare4_4.asm b/audio/sfx/snare4_4.asm new file mode 100644 index 00000000..c1d5cc21 --- /dev/null +++ b/audio/sfx/snare4_4.asm @@ -0,0 +1,4 @@ +SFX_Snare4_4_Ch7: + unknownnoise0x20 0, 129, 51 + endchannel + diff --git a/audio/sfx/snare5_4.asm b/audio/sfx/snare5_4.asm new file mode 100644 index 00000000..37fe8b27 --- /dev/null +++ b/audio/sfx/snare5_4.asm @@ -0,0 +1,9 @@ +SFX_Snare5_4_Ch7: + unknownnoise0x20 7, 132, 55 + unknownnoise0x20 6, 132, 54 + unknownnoise0x20 5, 131, 53 + unknownnoise0x20 4, 131, 52 + unknownnoise0x20 3, 130, 51 + unknownnoise0x20 2, 129, 50 + endchannel + diff --git a/audio/sfx/snare6_4.asm b/audio/sfx/snare6_4.asm new file mode 100644 index 00000000..1b835f00 --- /dev/null +++ b/audio/sfx/snare6_4.asm @@ -0,0 +1,4 @@ +SFX_Snare6_4_Ch7: + unknownnoise0x20 0, 129, 16 + endchannel + diff --git a/audio/sfx/snare7_4.asm b/audio/sfx/snare7_4.asm new file mode 100644 index 00000000..ed03d368 --- /dev/null +++ b/audio/sfx/snare7_4.asm @@ -0,0 +1,4 @@ +SFX_Snare7_4_Ch7: + unknownnoise0x20 0, 130, 35 + endchannel + diff --git a/audio/sfx/snare8_4.asm b/audio/sfx/snare8_4.asm new file mode 100644 index 00000000..ec0e6665 --- /dev/null +++ b/audio/sfx/snare8_4.asm @@ -0,0 +1,4 @@ +SFX_Snare8_4_Ch7: + unknownnoise0x20 0, 130, 37 + endchannel + diff --git a/audio/sfx/snare9_4.asm b/audio/sfx/snare9_4.asm new file mode 100644 index 00000000..254e9ce6 --- /dev/null +++ b/audio/sfx/snare9_4.asm @@ -0,0 +1,4 @@ +SFX_Snare9_4_Ch7: + unknownnoise0x20 0, 130, 38 + endchannel + diff --git a/audio/sfx/tink_4.asm b/audio/sfx/tink_4.asm new file mode 100755 index 00000000..4efa3209 --- /dev/null +++ b/audio/sfx/tink_4.asm @@ -0,0 +1,8 @@ +SFX_8028e_4_Ch4: + duty 2 + unknownsfx0x10 58 + unknownsfx0x20 4, 242, 0, 2 + unknownsfx0x10 34 + unknownsfx0x20 8, 226, 0, 2 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/triangle1_4.asm b/audio/sfx/triangle1_4.asm new file mode 100644 index 00000000..a90e4c48 --- /dev/null +++ b/audio/sfx/triangle1_4.asm @@ -0,0 +1,4 @@ +SFX_Triangle1_4_Ch7: + unknownnoise0x20 0, 81, 42 + endchannel + diff --git a/audio/sfx/triangle2_4.asm b/audio/sfx/triangle2_4.asm new file mode 100644 index 00000000..58b6d511 --- /dev/null +++ b/audio/sfx/triangle2_4.asm @@ -0,0 +1,5 @@ +SFX_Triangle2_4_Ch7: + unknownnoise0x20 1, 65, 43 + unknownnoise0x20 0, 97, 42 + endchannel + diff --git a/audio/sfx/triangle3_4.asm b/audio/sfx/triangle3_4.asm new file mode 100644 index 00000000..a2fab704 --- /dev/null +++ b/audio/sfx/triangle3_4.asm @@ -0,0 +1,5 @@ +SFX_Triangle3_4_Ch7: + unknownnoise0x20 2, 145, 40 + unknownnoise0x20 0, 113, 24 + endchannel + diff --git a/audio/sfx/unknown_80250.asm b/audio/sfx/unknown_80250.asm new file mode 100644 index 00000000..4f65a6a0 --- /dev/null +++ b/audio/sfx/unknown_80250.asm @@ -0,0 +1,7 @@ +SFX_80250_4_Ch4: + duty 2 + unknownsfx0x20 0, 145, 192, 7 + unknownsfx0x20 0, 129, 208, 7 + unknownsfx0x20 0, 145, 192, 7 + unknownsfx0x20 12, 161, 208, 7 + endchannel diff --git a/audio/sfx/unknown_80263.asm b/audio/sfx/unknown_80263.asm new file mode 100755 index 00000000..884c1352 --- /dev/null +++ b/audio/sfx/unknown_80263.asm @@ -0,0 +1,4 @@ +SFX_80263_4_Ch7: + unknownnoise0x20 1, 226, 51 + unknownnoise0x20 8, 225, 34 + endchannel diff --git a/audio/sfx/unknown_8026a.asm b/audio/sfx/unknown_8026a.asm new file mode 100644 index 00000000..9dd6a02b --- /dev/null +++ b/audio/sfx/unknown_8026a.asm @@ -0,0 +1,10 @@ +SFX_8026a_4_Ch4: + duty 2 + unknownsfx0x10 20 + unknownsfx0x20 4, 242, 0, 6 + unknownsfx0x20 4, 242, 0, 6 + unknownsfx0x10 23 + unknownsfx0x20 15, 242, 0, 6 + unknownsfx0x10 8 + endchannel + diff --git a/audio/sfx/unknown_8029f.asm b/audio/sfx/unknown_8029f.asm new file mode 100755 index 00000000..475c2813 --- /dev/null +++ b/audio/sfx/unknown_8029f.asm @@ -0,0 +1,10 @@ +SFX_8029f_4_Ch7: + unknownnoise0x20 6, 241, 17 + unknownnoise0x20 7, 242, 34 + unknownnoise0x20 8, 243, 51 + unknownnoise0x20 9, 244, 66 + unknownnoise0x20 10, 245, 51 + unknownnoise0x20 11, 246, 34 + unknownnoise0x20 12, 247, 17 + endchannel + diff --git a/audio/sfx/unknown_802b5.asm b/audio/sfx/unknown_802b5.asm new file mode 100644 index 00000000..364443cf --- /dev/null +++ b/audio/sfx/unknown_802b5.asm @@ -0,0 +1,8 @@ +SFX_802b5_4_Ch4: + duty 2 + unknownsfx0x20 3, 196, 96, 7 + unknownsfx0x20 0, 164, 64, 7 + unknownsfx0x20 2, 196, 64, 7 + unknownsfx0x20 0, 164, 96, 7 + unknownsfx0x20 15, 193, 96, 7 + endchannel diff --git a/audio/sfx/unknown_802cc.asm b/audio/sfx/unknown_802cc.asm new file mode 100755 index 00000000..9e209638 --- /dev/null +++ b/audio/sfx/unknown_802cc.asm @@ -0,0 +1,5 @@ +SFX_802cc_4_Ch4: + duty 2 + unknownsfx0x20 3, 180, 192, 7 + unknownsfx0x20 0, 161, 128, 7 + endchannel diff --git a/audio/sfx/unknown_802d7.asm b/audio/sfx/unknown_802d7.asm new file mode 100755 index 00000000..4a1f1ab4 --- /dev/null +++ b/audio/sfx/unknown_802d7.asm @@ -0,0 +1,6 @@ +SFX_802d7_4_Ch7: + unknownnoise0x20 2, 241, 50 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 4, 230, 33 + endchannel + diff --git a/audio/sfx/unknown_802e1.asm b/audio/sfx/unknown_802e1.asm new file mode 100644 index 00000000..e1963b23 --- /dev/null +++ b/audio/sfx/unknown_802e1.asm @@ -0,0 +1,6 @@ +SFX_802e1_4_Ch7: + unknownnoise0x20 3, 243, 102 + unknownnoise0x20 3, 51, 83 + unknownnoise0x20 7, 245, 81 + endchannel + diff --git a/audio/sfx/unknown_80337.asm b/audio/sfx/unknown_80337.asm new file mode 100644 index 00000000..c21f8794 --- /dev/null +++ b/audio/sfx/unknown_80337.asm @@ -0,0 +1,64 @@ +SFX_80337_4_Branch: + dutycycle 240 + unknownsfx0x20 15, 224, 128, 7 + unknownsfx0x20 15, 240, 132, 7 + unknownsfx0x20 15, 195, 224, 5 + unknownsfx0x20 15, 196, 0, 6 + unknownsfx0x20 10, 108, 128, 7 + unknownsfx0x20 8, 113, 132, 7 + endchannel + +SFX_80352_4_Branch: + dutycycle 5 + unknownsfx0x20 15, 160, 65, 7 + unknownsfx0x20 15, 176, 67, 7 + unknownsfx0x20 15, 147, 177, 5 + unknownsfx0x20 15, 148, 193, 5 + unknownsfx0x20 10, 76, 65, 7 + unknownsfx0x20 8, 49, 70, 7 + endchannel + +SFX_8036c_4_Branch: + unknownnoise0x20 2, 242, 76 + unknownnoise0x20 6, 224, 58 + unknownnoise0x20 15, 208, 58 + unknownnoise0x20 8, 208, 44 + unknownnoise0x20 6, 230, 76 + unknownnoise0x20 12, 125, 76 + unknownnoise0x20 15, 211, 76 + endchannel + +SFX_80383_4_Ch4: + dutycycle 240 + unknownsfx0x20 15, 247, 160, 7 + unknownsfx0x20 6, 230, 163, 7 + unknownsfx0x20 10, 244, 160, 7 + dutycycle 165 + unknownsfx0x20 10, 246, 216, 7 + unknownsfx0x20 4, 227, 215, 7 + unknownsfx0x20 15, 242, 216, 7 + endchannel + +SFX_803a0_4_Ch5: + dutycycle 5 + unknownsfx0x20 2, 8, 0, 0 + unknownsfx0x20 15, 167, 161, 6 + unknownsfx0x20 6, 134, 162, 6 + unknownsfx0x20 10, 116, 161, 6 + dutycycle 95 + unknownsfx0x20 10, 118, 214, 6 + unknownsfx0x20 4, 131, 217, 6 + unknownsfx0x20 15, 162, 215, 6 + endchannel + +SFX_803c1_4_Ch7: + unknownnoise0x20 2, 242, 60 + unknownnoise0x20 8, 228, 62 + unknownnoise0x20 15, 215, 60 + unknownnoise0x20 6, 197, 59 + unknownnoise0x20 6, 228, 61 + unknownnoise0x20 8, 182, 60 + unknownnoise0x20 6, 212, 61 + unknownnoise0x20 8, 193, 59 + endchannel + diff --git a/audio/sfx/unknown_803da.asm b/audio/sfx/unknown_803da.asm new file mode 100644 index 00000000..442bd112 --- /dev/null +++ b/audio/sfx/unknown_803da.asm @@ -0,0 +1,24 @@ +SFX_803da_4_Ch4: + dutycycle 240 + unknownsfx0x20 15, 247, 192, 7 + unknownsfx0x20 6, 228, 193, 7 + unknownsfx0x20 10, 246, 192, 7 + unknownsfx0x20 4, 211, 194, 7 + unknownsfx0x20 8, 193, 192, 7 + endchannel + +SFX_803f1_4_Ch5: + dutycycle 95 + unknownsfx0x20 15, 151, 129, 7 + unknownsfx0x20 6, 132, 128, 7 + unknownsfx0x20 10, 150, 129, 7 + unknownsfx0x20 15, 131, 129, 7 + endchannel + +SFX_80404_4_Ch7: + unknownnoise0x20 3, 242, 60 + unknownnoise0x20 13, 230, 44 + unknownnoise0x20 15, 215, 60 + unknownnoise0x20 8, 193, 44 + endchannel + diff --git a/audio/sfx/unknown_80411.asm b/audio/sfx/unknown_80411.asm new file mode 100644 index 00000000..4ef49cdf --- /dev/null +++ b/audio/sfx/unknown_80411.asm @@ -0,0 +1,32 @@ +SFX_80411_4_Ch4: + dutycycle 240 + unknownsfx0x20 15, 247, 128, 6 + unknownsfx0x20 10, 230, 132, 6 + unknownsfx0x20 15, 215, 144, 6 + unknownsfx0x20 8, 213, 144, 6 + unknownsfx0x20 6, 196, 136, 6 + unknownsfx0x20 5, 211, 112, 6 + unknownsfx0x20 4, 211, 96, 6 + unknownsfx0x20 8, 193, 64, 6 + endchannel + +SFX_80434_4_Ch5: + dutycycle 5 + unknownsfx0x20 15, 183, 65, 6 + unknownsfx0x20 10, 150, 66, 6 + unknownsfx0x20 15, 167, 81, 6 + unknownsfx0x20 8, 165, 81, 6 + unknownsfx0x20 6, 148, 71, 6 + unknownsfx0x20 5, 163, 49, 6 + unknownsfx0x20 4, 147, 34, 6 + unknownsfx0x20 8, 113, 1, 6 + endchannel + +SFX_80457_4_Ch7: + unknownnoise0x20 15, 228, 60 + unknownnoise0x20 10, 199, 76 + unknownnoise0x20 10, 199, 60 + unknownnoise0x20 12, 183, 76 + unknownnoise0x20 15, 162, 92 + endchannel + diff --git a/audio/sfx/unknown_80467.asm b/audio/sfx/unknown_80467.asm new file mode 100644 index 00000000..7e5335ff --- /dev/null +++ b/audio/sfx/unknown_80467.asm @@ -0,0 +1,33 @@ +SFX_80467_4_Ch4: + dutycycle 240 + unknownsfx0x20 6, 247, 160, 7 + unknownsfx0x20 8, 230, 164, 7 + unknownsfx0x20 4, 214, 160, 7 + unknownsfx0x20 15, 211, 32, 7 + unknownsfx0x20 8, 195, 35, 7 + unknownsfx0x20 2, 194, 40, 7 + unknownsfx0x20 8, 177, 48, 7 + endchannel + +SFX_80486_4_Ch5: + dutycycle 10 + unknownsfx0x20 4, 8, 0, 0 + unknownsfx0x20 6, 167, 65, 7 + unknownsfx0x20 8, 134, 67, 7 + unknownsfx0x20 4, 118, 65, 7 + unknownsfx0x20 13, 131, 194, 6 + unknownsfx0x20 7, 115, 193, 6 + unknownsfx0x20 3, 130, 204, 6 + unknownsfx0x20 8, 113, 216, 6 + endchannel + +SFX_804a9_4_Ch7: + unknownnoise0x20 2, 242, 76 + unknownnoise0x20 6, 230, 58 + unknownnoise0x20 4, 215, 58 + unknownnoise0x20 6, 214, 44 + unknownnoise0x20 8, 229, 60 + unknownnoise0x20 12, 210, 61 + unknownnoise0x20 8, 209, 44 + endchannel + diff --git a/audio/sfx/unknown_804bf.asm b/audio/sfx/unknown_804bf.asm new file mode 100644 index 00000000..6776692c --- /dev/null +++ b/audio/sfx/unknown_804bf.asm @@ -0,0 +1,25 @@ +SFX_804bf_4_Ch4: + dutycycle 165 + unknownsfx0x20 6, 244, 64, 7 + unknownsfx0x20 15, 227, 48, 7 + unknownsfx0x20 4, 244, 64, 7 + unknownsfx0x20 5, 179, 72, 7 + unknownsfx0x20 8, 209, 80, 7 + endchannel + +SFX_804d6_4_Ch5: + dutycycle 119 + unknownsfx0x20 6, 195, 18, 7 + unknownsfx0x20 15, 179, 4, 7 + unknownsfx0x20 3, 195, 18, 7 + unknownsfx0x20 4, 195, 33, 7 + unknownsfx0x20 8, 177, 50, 7 + endchannel + +SFX_804ed_4_Ch7: + unknownnoise0x20 8, 214, 44 + unknownnoise0x20 12, 198, 60 + unknownnoise0x20 10, 182, 44 + unknownnoise0x20 8, 145, 28 + endchannel + diff --git a/audio/sfx/unknown_804fa.asm b/audio/sfx/unknown_804fa.asm new file mode 100644 index 00000000..74b7e681 --- /dev/null +++ b/audio/sfx/unknown_804fa.asm @@ -0,0 +1,29 @@ +SFX_804fa_4_Ch4: + dutycycle 240 + unknownsfx0x20 4, 247, 8, 6 + unknownsfx0x20 6, 230, 0, 6 + unknownsfx0x20 6, 215, 240, 5 + unknownsfx0x20 6, 196, 224, 5 + unknownsfx0x20 5, 211, 192, 5 + unknownsfx0x20 4, 211, 160, 5 + unknownsfx0x20 8, 225, 128, 5 + endchannel + +SFX_80519_4_Ch5: + dutycycle 10 + unknownsfx0x20 4, 199, 4, 5 + unknownsfx0x20 6, 166, 2, 5 + unknownsfx0x20 6, 151, 241, 4 + unknownsfx0x20 4, 180, 225, 4 + unknownsfx0x20 5, 163, 194, 4 + unknownsfx0x20 4, 179, 163, 4 + unknownsfx0x20 8, 193, 130, 4 + endchannel + +SFX_80538_4_Ch7: + unknownnoise0x20 12, 228, 76 + unknownnoise0x20 10, 199, 92 + unknownnoise0x20 12, 182, 76 + unknownnoise0x20 15, 162, 92 + endchannel + diff --git a/audio/sfx/unknown_80545.asm b/audio/sfx/unknown_80545.asm new file mode 100644 index 00000000..9ba19478 --- /dev/null +++ b/audio/sfx/unknown_80545.asm @@ -0,0 +1,28 @@ +SFX_80545_4_Ch4: + dutycycle 241 + unknownsfx0x20 4, 247, 192, 7 + unknownsfx0x20 12, 230, 194, 7 + unknownsfx0x20 6, 181, 128, 6 + unknownsfx0x20 4, 196, 112, 6 + unknownsfx0x20 4, 181, 96, 6 + unknownsfx0x20 8, 193, 64, 6 + endchannel + +SFX_80560_4_Ch5: + dutycycle 204 + unknownsfx0x20 3, 199, 129, 7 + unknownsfx0x20 12, 182, 128, 7 + unknownsfx0x20 6, 165, 65, 6 + unknownsfx0x20 4, 196, 50, 6 + unknownsfx0x20 6, 181, 33, 6 + unknownsfx0x20 8, 161, 2, 6 + endchannel + +SFX_8057b_4_Ch7: + unknownnoise0x20 3, 228, 60 + unknownnoise0x20 12, 214, 44 + unknownnoise0x20 4, 228, 60 + unknownnoise0x20 8, 183, 92 + unknownnoise0x20 15, 194, 93 + endchannel + diff --git a/audio/sfx/unknown_8058b.asm b/audio/sfx/unknown_8058b.asm new file mode 100644 index 00000000..9e424200 --- /dev/null +++ b/audio/sfx/unknown_8058b.asm @@ -0,0 +1,30 @@ +SFX_8058b_4_Ch4: + dutycycle 201 + unknownsfx0x20 8, 247, 128, 6 + unknownsfx0x20 2, 247, 96, 6 + unknownsfx0x20 1, 231, 64, 6 + unknownsfx0x20 1, 231, 32, 6 + unknownsfx0x20 15, 209, 0, 6 + unknownsfx0x20 4, 199, 64, 7 + unknownsfx0x20 4, 167, 48, 7 + unknownsfx0x20 15, 145, 32, 7 + endchannel + +SFX_805ae_4_Ch5: + dutycycle 121 + unknownsfx0x20 10, 231, 130, 6 + unknownsfx0x20 2, 231, 98, 6 + unknownsfx0x20 1, 215, 66, 6 + unknownsfx0x20 1, 215, 34, 6 + unknownsfx0x20 15, 193, 2, 6 + unknownsfx0x20 4, 183, 66, 7 + unknownsfx0x20 2, 151, 50, 7 + unknownsfx0x20 15, 129, 34, 7 + endchannel + +SFX_805d1_4_Ch7: + unknownnoise0x20 4, 116, 33 + unknownnoise0x20 4, 116, 16 + unknownnoise0x20 4, 113, 32 + endchannel + diff --git a/audio/sfx/unknown_805db.asm b/audio/sfx/unknown_805db.asm new file mode 100644 index 00000000..5e978a1e --- /dev/null +++ b/audio/sfx/unknown_805db.asm @@ -0,0 +1,20 @@ +SFX_805db_4_Ch4: + dutycycle 245 + unknownsfx0x20 4, 243, 24, 7 + unknownsfx0x20 15, 229, 152, 7 + unknownsfx0x20 8, 145, 88, 7 + endchannel + +SFX_805ea_4_Ch5: + dutycycle 160 + unknownsfx0x20 5, 179, 8, 7 + unknownsfx0x20 15, 197, 136, 7 + unknownsfx0x20 8, 113, 72, 7 + endchannel + +SFX_805f9_4_Ch7: + unknownnoise0x20 3, 161, 28 + unknownnoise0x20 14, 148, 44 + unknownnoise0x20 8, 129, 28 + endchannel + diff --git a/audio/sfx/unknown_80603.asm b/audio/sfx/unknown_80603.asm new file mode 100644 index 00000000..3cbc9ca2 --- /dev/null +++ b/audio/sfx/unknown_80603.asm @@ -0,0 +1,22 @@ +SFX_80603_4_Ch4: + dutycycle 165 + unknownsfx0x20 4, 225, 0, 7 + unknownsfx0x20 4, 242, 128, 7 + unknownsfx0x20 2, 146, 64, 7 + unknownsfx0x20 8, 225, 0, 6 + endchannel + +SFX_80616_4_Ch5: + dutycycle 10 + unknownsfx0x20 4, 177, 225, 6 + unknownsfx0x20 3, 194, 225, 6 + unknownsfx0x20 3, 98, 129, 6 + unknownsfx0x20 8, 177, 225, 5 + endchannel + +SFX_80629_4_Ch7: + unknownnoise0x20 2, 97, 50 + unknownnoise0x20 2, 97, 33 + unknownnoise0x20 8, 97, 17 + endchannel + diff --git a/audio/sfx/unknown_80633.asm b/audio/sfx/unknown_80633.asm new file mode 100644 index 00000000..9be59347 --- /dev/null +++ b/audio/sfx/unknown_80633.asm @@ -0,0 +1,20 @@ +SFX_80633_4_Ch4: + dutycycle 250 + unknownsfx0x20 6, 131, 71, 2 + unknownsfx0x20 15, 98, 38, 2 + unknownsfx0x20 4, 82, 69, 2 + unknownsfx0x20 9, 99, 6, 2 + unknownsfx0x20 15, 130, 37, 2 + unknownsfx0x20 15, 66, 7, 2 +SFX_8064d_4_Ch5: + endchannel + +SFX_8064e_4_Ch7: + unknownnoise0x20 8, 212, 140 + unknownnoise0x20 4, 226, 156 + unknownnoise0x20 15, 198, 140 + unknownnoise0x20 8, 228, 172 + unknownnoise0x20 15, 215, 156 + unknownnoise0x20 15, 242, 172 + endchannel + diff --git a/audio/sfx/unknown_80661.asm b/audio/sfx/unknown_80661.asm new file mode 100644 index 00000000..f6848664 --- /dev/null +++ b/audio/sfx/unknown_80661.asm @@ -0,0 +1,20 @@ +SFX_80661_4_Ch4: + dutycycle 240 + unknownsfx0x20 4, 243, 224, 6 + unknownsfx0x20 15, 228, 64, 6 + unknownsfx0x20 8, 193, 32, 6 + endchannel + +SFX_80670_4_Ch5: + dutycycle 10 + unknownsfx0x20 3, 195, 131, 6 + unknownsfx0x20 14, 180, 2, 6 + unknownsfx0x20 8, 161, 1, 6 + endchannel + +SFX_8067f_4_Ch7: + unknownnoise0x20 4, 211, 92 + unknownnoise0x20 15, 230, 76 + unknownnoise0x20 8, 177, 92 + endchannel + diff --git a/audio/sfx/unknown_80689.asm b/audio/sfx/unknown_80689.asm new file mode 100644 index 00000000..0e2c573a --- /dev/null +++ b/audio/sfx/unknown_80689.asm @@ -0,0 +1,17 @@ +SFX_80689_4_Ch4: + dutycycle 10 + unknownsfx0x20 6, 226, 0, 5 + unknownsfx0x20 6, 227, 128, 5 + unknownsfx0x20 6, 211, 112, 5 + unknownsfx0x20 8, 161, 96, 5 + endchannel + +SFX_8069c_4_Ch5: + dutycycle 245 + unknownsfx0x20 6, 226, 130, 4 + unknownsfx0x20 6, 211, 1, 5 + unknownsfx0x20 6, 178, 226, 4 + unknownsfx0x20 8, 129, 193, 4 +SFX_806ae_4_Ch7: + endchannel + diff --git a/audio/sfx/unknown_806af.asm b/audio/sfx/unknown_806af.asm new file mode 100644 index 00000000..3cb97c62 --- /dev/null +++ b/audio/sfx/unknown_806af.asm @@ -0,0 +1,36 @@ +SFX_806af_4_Ch4: + dutycycle 204 + unknownsfx0x20 4, 241, 0, 7 + unknownsfx0x20 4, 225, 128, 7 + unknownsfx0x20 4, 209, 64, 7 + unknownsfx0x20 4, 225, 64, 7 + unknownsfx0x20 4, 241, 128, 7 + unknownsfx0x20 4, 209, 0, 7 + unknownsfx0x20 4, 241, 1, 7 + unknownsfx0x20 4, 209, 130, 7 + unknownsfx0x20 4, 193, 66, 7 + unknownsfx0x20 8, 177, 65, 7 + endchannel + +SFX_806da_4_Ch5: + dutycycle 68 + unknownsfx0x20 12, 8, 0, 0 + unknownsfx0x20 4, 241, 1, 7 + unknownsfx0x20 4, 225, 130, 7 + unknownsfx0x20 4, 209, 65, 7 + unknownsfx0x20 4, 225, 65, 7 + unknownsfx0x20 4, 241, 130, 7 + unknownsfx0x20 8, 209, 1, 7 + endchannel + +SFX_806f9_4_Ch7: + unknownnoise0x20 15, 8, 0 + unknownnoise0x20 4, 8, 0 + unknownnoise0x20 4, 209, 76 + unknownnoise0x20 4, 177, 44 + unknownnoise0x20 4, 209, 60 + unknownnoise0x20 4, 177, 60 + unknownnoise0x20 4, 193, 44 + unknownnoise0x20 8, 161, 76 + endchannel + diff --git a/audio/sfx/unknown_80712.asm b/audio/sfx/unknown_80712.asm new file mode 100644 index 00000000..689f12ad --- /dev/null +++ b/audio/sfx/unknown_80712.asm @@ -0,0 +1,27 @@ +SFX_80712_4_Ch4: + dutycycle 204 + unknownsfx0x20 8, 245, 0, 6 + unknownsfx0x20 2, 210, 56, 6 + unknownsfx0x20 2, 194, 48, 6 + unknownsfx0x20 2, 194, 40, 6 + unknownsfx0x20 2, 178, 32, 6 + unknownsfx0x20 2, 178, 16, 6 + unknownsfx0x20 2, 162, 24, 6 + unknownsfx0x20 2, 178, 16, 6 + unknownsfx0x20 8, 193, 32, 6 + endchannel + +SFX_80739_4_Ch5: + dutycycle 68 + unknownsfx0x20 12, 195, 192, 5 + unknownsfx0x20 3, 177, 249, 5 + unknownsfx0x20 2, 161, 241, 5 + unknownsfx0x20 2, 161, 233, 5 + unknownsfx0x20 2, 145, 225, 5 + unknownsfx0x20 2, 145, 217, 5 + unknownsfx0x20 2, 129, 209, 5 + unknownsfx0x20 2, 145, 217, 5 + unknownsfx0x20 8, 145, 225, 5 +SFX_8075f_4_Ch7: + endchannel + diff --git a/audio/sfx/unknown_80760.asm b/audio/sfx/unknown_80760.asm new file mode 100644 index 00000000..47d28da0 --- /dev/null +++ b/audio/sfx/unknown_80760.asm @@ -0,0 +1,15 @@ +SFX_80760_4_Ch4: + duty 0 + unknownsfx0x20 8, 245, 128, 4 + unknownsfx0x20 2, 225, 224, 5 + unknownsfx0x20 8, 209, 220, 5 + endchannel + +SFX_8076f_4_Ch5: + dutycycle 165 + unknownsfx0x20 7, 149, 65, 4 + unknownsfx0x20 2, 129, 33, 5 + unknownsfx0x20 8, 97, 26, 5 +SFX_8077d_4_Ch7: + endchannel + diff --git a/audio/sfx/unknown_8077e.asm b/audio/sfx/unknown_8077e.asm new file mode 100644 index 00000000..2047af78 --- /dev/null +++ b/audio/sfx/unknown_8077e.asm @@ -0,0 +1,39 @@ +SFX_8077e_4_Ch4: + dutycycle 136 + unknownsfx0x20 5, 242, 80, 6 + unknownsfx0x20 9, 209, 96, 6 + unknownsfx0x20 5, 226, 18, 6 + unknownsfx0x20 9, 193, 34, 6 + unknownsfx0x20 5, 242, 16, 6 + unknownsfx0x20 6, 209, 32, 6 + loopchannel 2, SFX_8077e_4_Ch4 + endchannel + +SFX_8079d_4_Ch5: + dutycycle 64 + unknownsfx0x20 4, 8, 0, 0 + unknownsfx0x20 5, 242, 81, 6 + unknownsfx0x20 9, 209, 97, 6 + unknownsfx0x20 5, 226, 20, 6 + unknownsfx0x20 8, 193, 36, 6 + unknownsfx0x20 5, 242, 17, 6 + unknownsfx0x20 12, 209, 33, 6 + unknownsfx0x20 5, 226, 20, 6 + unknownsfx0x20 8, 193, 36, 6 + unknownsfx0x20 5, 242, 17, 6 + unknownsfx0x20 4, 209, 33, 6 + endchannel + +SFX_807cc_4_Ch7: + unknownnoise0x20 6, 210, 28 + unknownnoise0x20 9, 177, 44 + unknownnoise0x20 8, 194, 44 + unknownnoise0x20 9, 177, 60 + unknownnoise0x20 6, 194, 44 + unknownnoise0x20 9, 162, 60 + unknownnoise0x20 7, 194, 44 + unknownnoise0x20 5, 161, 60 + unknownnoise0x20 9, 194, 44 + unknownnoise0x20 4, 161, 60 + endchannel + diff --git a/audio/sfx/unknown_807eb.asm b/audio/sfx/unknown_807eb.asm new file mode 100644 index 00000000..8554695e --- /dev/null +++ b/audio/sfx/unknown_807eb.asm @@ -0,0 +1,23 @@ +SFX_807eb_4_Ch4: + dutycycle 160 + unknownsfx0x20 4, 243, 0, 6 + unknownsfx0x20 8, 213, 96, 7 + unknownsfx0x20 3, 226, 32, 7 + unknownsfx0x20 8, 209, 16, 7 + endchannel + +SFX_807fe_4_Ch5: + dutycycle 90 + unknownsfx0x20 5, 179, 241, 6 + unknownsfx0x20 7, 197, 82, 7 + unknownsfx0x20 3, 162, 17, 7 + unknownsfx0x20 8, 177, 1, 6 + endchannel + +SFX_80811_4_Ch7: + unknownnoise0x20 3, 162, 60 + unknownnoise0x20 12, 148, 44 + unknownnoise0x20 3, 130, 28 + unknownnoise0x20 8, 113, 44 + endchannel + diff --git a/audio/sfx/unknown_8081e.asm b/audio/sfx/unknown_8081e.asm new file mode 100644 index 00000000..1581d121 --- /dev/null +++ b/audio/sfx/unknown_8081e.asm @@ -0,0 +1,34 @@ +SFX_8081e_4_Ch4: + dutycycle 240 + unknownsfx0x20 8, 247, 224, 6 + unknownsfx0x20 6, 230, 229, 6 + unknownsfx0x20 3, 244, 224, 6 + unknownsfx0x20 3, 246, 208, 6 + unknownsfx0x20 3, 227, 192, 6 + unknownsfx0x20 4, 242, 176, 6 + unknownsfx0x20 15, 162, 200, 6 + endchannel + +SFX_8083d_4_Ch5: + dutycycle 5 + unknownsfx0x20 3, 8, 0, 0 + unknownsfx0x20 8, 167, 161, 6 + unknownsfx0x20 6, 134, 163, 6 + unknownsfx0x20 3, 116, 161, 6 + unknownsfx0x20 3, 118, 145, 6 + unknownsfx0x20 3, 131, 130, 6 + unknownsfx0x20 4, 162, 113, 6 + unknownsfx0x20 15, 114, 137, 6 + endchannel + +SFX_80860_4_Ch7: + unknownnoise0x20 2, 242, 60 + unknownnoise0x20 8, 228, 62 + unknownnoise0x20 8, 215, 60 + unknownnoise0x20 5, 197, 59 + unknownnoise0x20 3, 212, 44 + unknownnoise0x20 2, 182, 60 + unknownnoise0x20 3, 164, 44 + unknownnoise0x20 8, 145, 60 + endchannel + diff --git a/audio/sfx/unknown_80879.asm b/audio/sfx/unknown_80879.asm new file mode 100644 index 00000000..23839d60 --- /dev/null +++ b/audio/sfx/unknown_80879.asm @@ -0,0 +1,22 @@ +SFX_80879_4_Ch4: + dutycycle 240 + unknownsfx0x20 15, 246, 101, 5 + unknownsfx0x20 10, 228, 124, 5 + unknownsfx0x20 3, 194, 92, 5 + unknownsfx0x20 15, 178, 60, 5 + endchannel + +SFX_8088c_4_Ch5: + dutycycle 90 + unknownsfx0x20 14, 214, 3, 5 + unknownsfx0x20 9, 180, 27, 5 + unknownsfx0x20 4, 146, 250, 4 + unknownsfx0x20 15, 162, 219, 4 + endchannel + +SFX_8089f_4_Ch7: + unknownnoise0x20 12, 230, 76 + unknownnoise0x20 11, 215, 92 + unknownnoise0x20 15, 194, 76 + endchannel + diff --git a/audio/sfx/unknown_808a9.asm b/audio/sfx/unknown_808a9.asm new file mode 100644 index 00000000..efa4a0d6 --- /dev/null +++ b/audio/sfx/unknown_808a9.asm @@ -0,0 +1,31 @@ +SFX_808a9_4_Ch4: + dutycycle 240 + unknownsfx0x20 4, 247, 160, 6 + unknownsfx0x20 8, 230, 164, 6 + unknownsfx0x20 4, 214, 160, 6 + unknownsfx0x20 12, 211, 32, 6 + unknownsfx0x20 8, 195, 36, 6 + unknownsfx0x20 4, 194, 32, 6 + unknownsfx0x20 8, 177, 16, 6 + endchannel + +SFX_808c8_4_Ch5: + dutycycle 90 + unknownsfx0x20 4, 231, 1, 6 + unknownsfx0x20 8, 214, 3, 6 + unknownsfx0x20 4, 198, 1, 6 + unknownsfx0x20 12, 195, 129, 5 + unknownsfx0x20 8, 179, 131, 5 + unknownsfx0x20 4, 178, 130, 5 + unknownsfx0x20 8, 161, 113, 5 + endchannel + +SFX_808e7_4_Ch7: + unknownnoise0x20 7, 214, 92 + unknownnoise0x20 8, 230, 76 + unknownnoise0x20 4, 212, 92 + unknownnoise0x20 4, 212, 76 + unknownnoise0x20 7, 195, 76 + unknownnoise0x20 8, 161, 92 + endchannel + diff --git a/audio/sfx/unknown_808fa.asm b/audio/sfx/unknown_808fa.asm new file mode 100644 index 00000000..4bd5839f --- /dev/null +++ b/audio/sfx/unknown_808fa.asm @@ -0,0 +1,16 @@ +SFX_808fa_4_Ch4: + dutycycle 27 + unknownsfx0x20 7, 210, 64, 7 + unknownsfx0x20 15, 229, 96, 7 + unknownsfx0x20 15, 193, 48, 7 + endchannel + +SFX_80909_4_Ch5: + dutycycle 129 + unknownsfx0x20 2, 194, 1, 7 + unknownsfx0x20 4, 194, 8, 7 + unknownsfx0x20 15, 215, 65, 7 + unknownsfx0x20 15, 162, 1, 7 +SFX_8091b_4_Ch7: + endchannel + diff --git a/audio/sfx/unknown_8091c.asm b/audio/sfx/unknown_8091c.asm new file mode 100644 index 00000000..c4fa4c20 --- /dev/null +++ b/audio/sfx/unknown_8091c.asm @@ -0,0 +1,20 @@ +SFX_8091c_4_Ch4: + dutycycle 240 + unknownsfx0x20 15, 215, 128, 7 + unknownsfx0x20 4, 230, 160, 7 + unknownsfx0x20 15, 210, 64, 7 + endchannel + +SFX_8092b_4_Ch5: + dutycycle 90 + unknownsfx0x20 15, 199, 83, 7 + unknownsfx0x20 5, 182, 114, 7 + unknownsfx0x20 15, 194, 17, 7 + endchannel + +SFX_8093a_4_Ch7: + unknownnoise0x20 13, 246, 76 + unknownnoise0x20 4, 230, 60 + unknownnoise0x20 15, 242, 76 + endchannel + diff --git a/audio/sfx/unknown_80944.asm b/audio/sfx/unknown_80944.asm new file mode 100644 index 00000000..e16cec26 --- /dev/null +++ b/audio/sfx/unknown_80944.asm @@ -0,0 +1,25 @@ +SFX_80944_4_Ch4: + dutycycle 240 + unknownsfx0x20 6, 247, 192, 6 + unknownsfx0x20 15, 231, 0, 7 + unknownsfx0x20 4, 244, 240, 6 + unknownsfx0x20 4, 228, 224, 6 + unknownsfx0x20 8, 209, 208, 6 + endchannel + +SFX_8095b_4_Ch5: + dutycycle 10 + unknownsfx0x20 7, 230, 129, 6 + unknownsfx0x20 14, 213, 193, 6 + unknownsfx0x20 4, 196, 177, 6 + unknownsfx0x20 4, 212, 161, 6 + unknownsfx0x20 8, 193, 145, 6 + endchannel + +SFX_80972_4_Ch7: + unknownnoise0x20 10, 166, 60 + unknownnoise0x20 14, 148, 44 + unknownnoise0x20 5, 163, 60 + unknownnoise0x20 8, 145, 44 + endchannel + diff --git a/audio/sfx/unknown_8097f.asm b/audio/sfx/unknown_8097f.asm new file mode 100644 index 00000000..b178821c --- /dev/null +++ b/audio/sfx/unknown_8097f.asm @@ -0,0 +1,23 @@ +SFX_8097f_4_Ch4: + dutycycle 165 + unknownsfx0x20 12, 242, 64, 4 + unknownsfx0x20 15, 227, 160, 4 + unknownsfx0x20 4, 210, 144, 4 + unknownsfx0x20 8, 209, 128, 4 + endchannel + +SFX_80992_4_Ch5: + dutycycle 238 + unknownsfx0x20 11, 210, 56, 4 + unknownsfx0x20 14, 198, 152, 4 + unknownsfx0x20 3, 178, 136, 4 + unknownsfx0x20 8, 177, 120, 4 + endchannel + +SFX_809a5_4_Ch7: + unknownnoise0x20 10, 230, 108 + unknownnoise0x20 15, 210, 92 + unknownnoise0x20 3, 194, 108 + unknownnoise0x20 8, 209, 92 + endchannel + diff --git a/audio/sfx/unknown_809b2.asm b/audio/sfx/unknown_809b2.asm new file mode 100644 index 00000000..095f7134 --- /dev/null +++ b/audio/sfx/unknown_809b2.asm @@ -0,0 +1,29 @@ +SFX_809b2_4_Ch4: + dutycycle 51 + unknownsfx0x20 15, 246, 192, 5 + unknownsfx0x20 8, 227, 188, 5 + unknownsfx0x20 6, 210, 208, 5 + unknownsfx0x20 6, 178, 224, 5 + unknownsfx0x20 6, 194, 240, 5 + unknownsfx0x20 8, 177, 0, 6 + endchannel + +SFX_809cd_4_Ch5: + dutycycle 153 + unknownsfx0x20 14, 198, 177, 4 + unknownsfx0x20 7, 195, 173, 4 + unknownsfx0x20 5, 178, 193, 4 + unknownsfx0x20 8, 146, 209, 4 + unknownsfx0x20 6, 162, 225, 4 + unknownsfx0x20 8, 145, 241, 4 + endchannel + +SFX_809e8_4_Ch7: + unknownnoise0x20 10, 230, 92 + unknownnoise0x20 10, 214, 108 + unknownnoise0x20 4, 194, 76 + unknownnoise0x20 6, 211, 92 + unknownnoise0x20 8, 179, 76 + unknownnoise0x20 8, 161, 92 + endchannel + diff --git a/audio/sfx/unknown_809fb.asm b/audio/sfx/unknown_809fb.asm new file mode 100644 index 00000000..7424d61b --- /dev/null +++ b/audio/sfx/unknown_809fb.asm @@ -0,0 +1,20 @@ +SFX_809fb_4_Ch4: + dutycycle 240 + unknownsfx0x20 8, 228, 144, 7 + unknownsfx0x20 15, 245, 192, 7 + unknownsfx0x20 8, 209, 216, 7 + endchannel + +SFX_80a0a_4_Ch5: + dutycycle 165 + unknownsfx0x20 10, 196, 113, 7 + unknownsfx0x20 15, 182, 162, 7 + unknownsfx0x20 8, 161, 183, 7 + endchannel + +SFX_80a19_4_Ch7: + unknownnoise0x20 8, 228, 76 + unknownnoise0x20 14, 196, 60 + unknownnoise0x20 8, 209, 44 + endchannel + diff --git a/audio/sfx/unknown_80a23.asm b/audio/sfx/unknown_80a23.asm new file mode 100644 index 00000000..c20a37d4 --- /dev/null +++ b/audio/sfx/unknown_80a23.asm @@ -0,0 +1,37 @@ +SFX_80a23_4_Ch4: + dutycycle 240 + unknownsfx0x20 6, 242, 0, 6 + unknownsfx0x20 6, 226, 64, 6 + unknownsfx0x20 6, 210, 128, 6 + unknownsfx0x20 6, 226, 192, 6 + unknownsfx0x20 6, 210, 0, 7 + unknownsfx0x20 6, 194, 64, 7 + unknownsfx0x20 6, 178, 128, 7 + unknownsfx0x20 8, 161, 192, 7 + endchannel + +SFX_80a46_4_Ch5: + dutycycle 17 + unknownsfx0x20 3, 8, 1, 0 + unknownsfx0x20 6, 194, 193, 5 + unknownsfx0x20 6, 178, 2, 6 + unknownsfx0x20 6, 162, 65, 6 + unknownsfx0x20 6, 178, 130, 6 + unknownsfx0x20 6, 162, 194, 6 + unknownsfx0x20 6, 146, 1, 7 + unknownsfx0x20 6, 162, 66, 7 + unknownsfx0x20 8, 129, 129, 7 + endchannel + +SFX_80a6d_4_Ch7: + unknownnoise0x20 6, 8, 1 + unknownnoise0x20 5, 226, 92 + unknownnoise0x20 5, 194, 76 + unknownnoise0x20 5, 210, 60 + unknownnoise0x20 5, 178, 44 + unknownnoise0x20 5, 194, 28 + unknownnoise0x20 5, 162, 27 + unknownnoise0x20 5, 146, 26 + unknownnoise0x20 8, 129, 24 + endchannel + diff --git a/audio/sfx/unknown_80a89.asm b/audio/sfx/unknown_80a89.asm new file mode 100644 index 00000000..b79cf7c3 --- /dev/null +++ b/audio/sfx/unknown_80a89.asm @@ -0,0 +1,29 @@ +SFX_80a89_4_Ch4: + dutycycle 240 + unknownsfx0x20 4, 243, 128, 7 + unknownsfx0x20 15, 231, 0, 7 + unknownsfx0x20 8, 211, 16, 7 + unknownsfx0x20 4, 194, 0, 7 + unknownsfx0x20 4, 210, 240, 6 + unknownsfx0x20 8, 193, 224, 6 + endchannel + +SFX_80aa4_4_Ch5: + dutycycle 90 + unknownsfx0x20 6, 195, 1, 7 + unknownsfx0x20 14, 183, 129, 6 + unknownsfx0x20 7, 179, 146, 6 + unknownsfx0x20 3, 162, 129, 6 + unknownsfx0x20 4, 178, 114, 6 + unknownsfx0x20 8, 161, 97, 6 + endchannel + +SFX_80abf_4_Ch7: + unknownnoise0x20 6, 227, 92 + unknownnoise0x20 14, 214, 76 + unknownnoise0x20 6, 198, 60 + unknownnoise0x20 3, 179, 76 + unknownnoise0x20 3, 162, 92 + unknownnoise0x20 8, 177, 108 + endchannel + diff --git a/audio/sfx/unknown_80ad2.asm b/audio/sfx/unknown_80ad2.asm new file mode 100644 index 00000000..db7b45b2 --- /dev/null +++ b/audio/sfx/unknown_80ad2.asm @@ -0,0 +1,23 @@ +SFX_80ad2_4_Ch4: + dutycycle 15 + unknownsfx0x20 15, 247, 0, 5 + unknownsfx0x20 15, 231, 8, 5 + unknownsfx0x20 8, 180, 128, 4 + unknownsfx0x20 15, 162, 96, 4 + endchannel + +SFX_80ae5_4_Ch5: + dutycycle 68 + unknownsfx0x20 14, 215, 129, 4 + unknownsfx0x20 14, 199, 137, 4 + unknownsfx0x20 10, 180, 1, 4 + unknownsfx0x20 15, 194, 225, 3 + endchannel + +SFX_80af8_4_Ch7: + unknownnoise0x20 14, 247, 124 + unknownnoise0x20 12, 246, 108 + unknownnoise0x20 9, 228, 124 + unknownnoise0x20 15, 226, 108 + endchannel + diff --git a/audio/sfx/unknown_80b05.asm b/audio/sfx/unknown_80b05.asm new file mode 100644 index 00000000..68ca90f5 --- /dev/null +++ b/audio/sfx/unknown_80b05.asm @@ -0,0 +1,30 @@ +SFX_80b05_4_Ch4: + dutycycle 245 + unknownsfx0x20 7, 214, 225, 7 + unknownsfx0x20 6, 198, 226, 7 + unknownsfx0x20 9, 214, 225, 7 + unknownsfx0x20 7, 198, 224, 7 + unknownsfx0x20 5, 182, 226, 7 + unknownsfx0x20 7, 198, 225, 7 + unknownsfx0x20 6, 182, 224, 7 + unknownsfx0x20 8, 161, 223, 7 + endchannel + +SFX_80b28_4_Ch5: + dutycycle 68 + unknownsfx0x20 6, 195, 201, 7 + unknownsfx0x20 6, 179, 199, 7 + unknownsfx0x20 10, 196, 195, 7 + unknownsfx0x20 8, 180, 199, 7 + unknownsfx0x20 6, 195, 201, 7 + unknownsfx0x20 15, 162, 197, 7 + endchannel + +SFX_80b43_4_Ch7: + unknownnoise0x20 13, 25, 124 + unknownnoise0x20 13, 247, 140 + unknownnoise0x20 12, 214, 124 + unknownnoise0x20 8, 196, 108 + unknownnoise0x20 15, 179, 92 + endchannel + diff --git a/audio/sfx/unknown_80b53.asm b/audio/sfx/unknown_80b53.asm new file mode 100644 index 00000000..3033d299 --- /dev/null +++ b/audio/sfx/unknown_80b53.asm @@ -0,0 +1,29 @@ +SFX_80b53_4_Ch4: + dutycycle 240 + unknownsfx0x20 6, 247, 64, 7 + unknownsfx0x20 12, 230, 68, 7 + unknownsfx0x20 6, 213, 80, 7 + unknownsfx0x20 4, 195, 96, 7 + unknownsfx0x20 3, 195, 128, 7 + unknownsfx0x20 8, 209, 160, 7 + endchannel + +SFX_80b6e_4_Ch5: + dutycycle 10 + unknownsfx0x20 6, 199, 1, 7 + unknownsfx0x20 11, 182, 2, 7 + unknownsfx0x20 6, 165, 17, 7 + unknownsfx0x20 4, 147, 33, 7 + unknownsfx0x20 3, 163, 65, 7 + unknownsfx0x20 8, 145, 98, 7 + endchannel + +SFX_80b89_4_Ch7: + unknownnoise0x20 3, 226, 60 + unknownnoise0x20 8, 214, 76 + unknownnoise0x20 5, 212, 60 + unknownnoise0x20 12, 199, 76 + unknownnoise0x20 2, 226, 60 + unknownnoise0x20 8, 209, 44 + endchannel + diff --git a/audio/sfx/unknown_80b9c.asm b/audio/sfx/unknown_80b9c.asm new file mode 100644 index 00000000..5e54107e --- /dev/null +++ b/audio/sfx/unknown_80b9c.asm @@ -0,0 +1,28 @@ +SFX_80b9c_4_Ch4: + dutycycle 244 + unknownsfx0x20 15, 240, 5, 7 + unknownsfx0x20 10, 224, 0, 7 + unknownsfx0x20 6, 180, 16, 7 + unknownsfx0x20 4, 211, 0, 7 + unknownsfx0x20 6, 178, 32, 6 + unknownsfx0x20 8, 161, 36, 6 + endchannel + +SFX_80bb7_4_Ch5: + dutycycle 34 + unknownsfx0x20 15, 176, 195, 6 + unknownsfx0x20 10, 160, 193, 6 + unknownsfx0x20 6, 132, 210, 6 + unknownsfx0x20 4, 147, 193, 6 + unknownsfx0x20 6, 130, 225, 5 + unknownsfx0x20 8, 97, 232, 5 + endchannel + +SFX_80bd2_4_Ch7: + unknownnoise0x20 6, 230, 76 + unknownnoise0x20 15, 214, 60 + unknownnoise0x20 10, 197, 74 + unknownnoise0x20 1, 178, 91 + unknownnoise0x20 15, 194, 76 + endchannel + diff --git a/audio/sfx/unknown_80be2.asm b/audio/sfx/unknown_80be2.asm new file mode 100644 index 00000000..4660d8f2 --- /dev/null +++ b/audio/sfx/unknown_80be2.asm @@ -0,0 +1,33 @@ +SFX_80be2_4_Ch4: + dutycycle 80 + unknownsfx0x20 10, 245, 128, 6 + unknownsfx0x20 3, 226, 160, 6 + unknownsfx0x20 3, 242, 192, 6 + unknownsfx0x20 3, 226, 224, 6 + unknownsfx0x20 3, 210, 0, 7 + unknownsfx0x20 3, 194, 224, 6 + unknownsfx0x20 3, 210, 192, 6 + unknownsfx0x20 8, 193, 160, 6 + endchannel + +SFX_80c05_4_Ch5: + dutycycle 15 + unknownsfx0x20 9, 213, 49, 6 + unknownsfx0x20 3, 210, 82, 6 + unknownsfx0x20 3, 226, 113, 6 + unknownsfx0x20 3, 178, 145, 6 + unknownsfx0x20 3, 194, 178, 6 + unknownsfx0x20 3, 178, 145, 6 + unknownsfx0x20 3, 194, 113, 6 + unknownsfx0x20 8, 177, 81, 6 + endchannel + +SFX_80c28_4_Ch7: + unknownnoise0x20 6, 227, 76 + unknownnoise0x20 4, 195, 60 + unknownnoise0x20 5, 212, 60 + unknownnoise0x20 4, 196, 44 + unknownnoise0x20 6, 180, 60 + unknownnoise0x20 8, 193, 44 + endchannel + diff --git a/audio/sfx/unknown_80c3b.asm b/audio/sfx/unknown_80c3b.asm new file mode 100644 index 00000000..f6106ebf --- /dev/null +++ b/audio/sfx/unknown_80c3b.asm @@ -0,0 +1,23 @@ +SFX_80c3b_4_Ch4: + dutycycle 165 + unknownsfx0x20 3, 244, 65, 6 + unknownsfx0x20 13, 214, 33, 7 + unknownsfx0x20 8, 244, 25, 7 + unknownsfx0x20 8, 193, 26, 7 + endchannel + +SFX_80c4e_4_Ch5: + dutycycle 204 + unknownsfx0x20 4, 244, 128, 5 + unknownsfx0x20 14, 230, 224, 6 + unknownsfx0x20 8, 213, 216, 6 + unknownsfx0x20 8, 209, 220, 6 + endchannel + +SFX_80c61_4_Ch7: + unknownnoise0x20 5, 196, 70 + unknownnoise0x20 13, 165, 68 + unknownnoise0x20 8, 196, 69 + unknownnoise0x20 8, 177, 68 + endchannel + diff --git a/audio/sfx/unknown_80c6e.asm b/audio/sfx/unknown_80c6e.asm new file mode 100644 index 00000000..54c4b3f9 --- /dev/null +++ b/audio/sfx/unknown_80c6e.asm @@ -0,0 +1,23 @@ +SFX_80c6e_4_Ch4: + dutycycle 240 + unknownsfx0x20 13, 241, 17, 5 + unknownsfx0x20 13, 225, 21, 5 + unknownsfx0x20 13, 225, 17, 5 + unknownsfx0x20 8, 209, 17, 5 + endchannel + +SFX_80c81_4_Ch5: + dutycycle 21 + unknownsfx0x20 12, 225, 12, 5 + unknownsfx0x20 12, 209, 16, 5 + unknownsfx0x20 14, 193, 12, 5 + unknownsfx0x20 8, 193, 10, 5 + endchannel + +SFX_80c94_4_Ch7: + unknownnoise0x20 14, 242, 101 + unknownnoise0x20 13, 226, 85 + unknownnoise0x20 14, 210, 86 + unknownnoise0x20 8, 209, 102 + endchannel + diff --git a/audio/sfx/unknown_80ca1.asm b/audio/sfx/unknown_80ca1.asm new file mode 100644 index 00000000..df3b29be --- /dev/null +++ b/audio/sfx/unknown_80ca1.asm @@ -0,0 +1,25 @@ +SFX_80ca1_4_Ch4: + dutycycle 27 + unknownsfx0x20 3, 243, 100, 5 + unknownsfx0x20 2, 226, 68, 5 + unknownsfx0x20 5, 209, 34, 5 + unknownsfx0x20 2, 178, 132, 4 + unknownsfx0x20 8, 209, 162, 4 + unknownsfx0x20 3, 243, 36, 5 + unknownsfx0x20 4, 228, 228, 4 + unknownsfx0x20 8, 209, 2, 5 + endchannel + +SFX_80cc4_4_Ch5: + dutycycle 204 + unknownsfx0x20 3, 211, 96, 5 + unknownsfx0x20 2, 194, 64, 5 + unknownsfx0x20 5, 193, 32, 5 + unknownsfx0x20 2, 146, 128, 4 + unknownsfx0x20 8, 193, 160, 4 + unknownsfx0x20 3, 211, 32, 5 + unknownsfx0x20 3, 196, 224, 4 + unknownsfx0x20 8, 193, 0, 5 +SFX_80ce6_4_Ch7: + endchannel + diff --git a/audio/sfx/unknown_80ce7.asm b/audio/sfx/unknown_80ce7.asm new file mode 100644 index 00000000..6b5a2163 --- /dev/null +++ b/audio/sfx/unknown_80ce7.asm @@ -0,0 +1,24 @@ +SFX_80ce7_4_Ch4: + dutycycle 17 + unknownsfx0x20 2, 61, 129, 3 + unknownsfx0x20 7, 245, 1, 6 + unknownsfx0x20 1, 194, 129, 4 + unknownsfx0x20 8, 145, 129, 3 + endchannel + +SFX_80cfa_4_Ch5: + dutycycle 238 + unknownsfx0x20 2, 62, 176, 5 + unknownsfx0x20 7, 213, 93, 7 + unknownsfx0x20 1, 178, 176, 6 + unknownsfx0x20 8, 97, 176, 5 + endchannel + +SFX_80d0d_4_Ch7: + unknownnoise0x20 2, 146, 73 + unknownnoise0x20 7, 181, 41 + unknownnoise0x20 1, 162, 57 + unknownnoise0x20 8, 145, 73 + endchannel + + diff --git a/audio/sfx/unknown_80e5a.asm b/audio/sfx/unknown_80e5a.asm new file mode 100644 index 00000000..76cf48d4 --- /dev/null +++ b/audio/sfx/unknown_80e5a.asm @@ -0,0 +1,46 @@ +SFX_80e5a_4_Ch4: + executemusic + tempo 256 + volume 7, 7 + vibrato 6, 2, 6 + duty 2 + toggleperfectpitch + notetype 4, 11, 1 + octave 3 + G# 2 + G# 2 + G# 2 + notetype 12, 11, 3 + octave 4 + E_ 4 + endchannel + +SFX_80e71_4_Ch5: + executemusic + vibrato 8, 2, 7 + duty 2 + notetype 4, 12, 1 + octave 4 + E_ 2 + E_ 2 + E_ 2 + notetype 12, 12, 3 + B_ 4 + endchannel + +SFX_80e81_4_Ch6: + executemusic + notetype 4, 1, 0 + octave 4 + B_ 1 + rest 1 + B_ 1 + rest 1 + B_ 1 + rest 1 + notetype 12, 1, 0 + octave 4 + B_ 2 + rest 2 + endchannel + diff --git a/audio/sfx/unknown_80e71.asm b/audio/sfx/unknown_80e71.asm new file mode 100644 index 00000000..1b8241fb --- /dev/null +++ b/audio/sfx/unknown_80e71.asm @@ -0,0 +1,45 @@ +SFX_80e91_4_Ch4: + executemusic + tempo 256 + volume 7, 7 + vibrato 6, 2, 6 + duty 2 + toggleperfectpitch + notetype 4, 11, 1 + octave 3 + G# 2 + G# 2 + G# 2 + notetype 12, 11, 3 + octave 4 + E_ 4 + endchannel + +SFX_80ea8_4_Ch5: + executemusic + vibrato 8, 2, 7 + duty 2 + notetype 4, 12, 1 + octave 4 + E_ 2 + E_ 2 + E_ 2 + notetype 12, 12, 3 + B_ 4 + endchannel + +SFX_80eb8_4_Ch6: + executemusic + notetype 4, 1, 0 + octave 4 + B_ 1 + rest 1 + B_ 1 + rest 1 + B_ 1 + rest 1 + notetype 12, 1, 0 + octave 4 + B_ 2 + rest 2 + endchannel diff --git a/audio/sfx/unknown_80e91.asm b/audio/sfx/unknown_80e91.asm new file mode 100644 index 00000000..2b180d9d --- /dev/null +++ b/audio/sfx/unknown_80e91.asm @@ -0,0 +1,46 @@ +SFX_80e91_4_Ch4: + executemusic + tempo 256 + volume 7, 7 + vibrato 6, 2, 6 + duty 2 + toggleperfectpitch + notetype 4, 11, 1 + octave 3 + G# 2 + G# 2 + G# 2 + notetype 12, 11, 3 + octave 4 + E_ 4 + endchannel + +SFX_80ea8_4_Ch5: + executemusic + vibrato 8, 2, 7 + duty 2 + notetype 4, 12, 1 + octave 4 + E_ 2 + E_ 2 + E_ 2 + notetype 12, 12, 3 + B_ 4 + endchannel + +SFX_80eb8_4_Ch6: + executemusic + notetype 4, 1, 0 + octave 4 + B_ 1 + rest 1 + B_ 1 + rest 1 + B_ 1 + rest 1 + notetype 12, 1, 0 + octave 4 + B_ 2 + rest 2 + endchannel + diff --git a/audio/unknown_832b9.bin b/audio/unknown_832b9.bin Binary files differnew file mode 100755 index 00000000..96a64283 --- /dev/null +++ b/audio/unknown_832b9.bin diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 5eb05b61..6e34bc0d 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -94,7 +94,13 @@ ENDM music_const MUSIC_MEET_FEMALE_TRAINER, Music_MeetFemaleTrainer music_const MUSIC_MEET_MALE_TRAINER, Music_MeetMaleTrainer - ; AUDIO_1 AUDIO_2 AUDIO_3 + ; AUDIO_4 + music_const MUSIC_SURFING_PIKACHU, Music_SurfingPikachu + music_const MUSIC_JESSIE_AND_JAMES, Music_JessieAndJames + music_const MUSIC_YELLOW_UNUSED_SONG, Music_YellowUnusedSong + music_const MUSIC_GB_PRINTER, Music_GBPrinter + + ; AUDIO_1 AUDIO_2 AUDIO_3 AUDIO_4 music_const SFX_SNARE_1, SFX_Snare1_1 music_const SFX_SNARE_2, SFX_Snare2_1 music_const SFX_SNARE_3, SFX_Snare3_1 @@ -152,8 +158,9 @@ ENDM music_const SFX_CRY_23, SFX_Cry23_1 music_const SFX_CRY_24, SFX_Cry24_1 music_const SFX_CRY_25, SFX_Cry25_1 - music_const SFX_GET_ITEM_2, SFX_Get_Item2_1 + + ; AUDIO_1 AUDIO_2 AUDIO_3 music_const SFX_TINK, SFX_Tink_1 music_const SFX_HEAL_HP, SFX_Heal_HP_1 music_const SFX_HEAL_AILMENT, SFX_Heal_Ailment_1 @@ -194,7 +201,7 @@ ENDM music_const SFX_SAVE, SFX_Save_1 ; AUDIO_1 - music_const SFX_POKEFLUTE, SFX_Pokeflute + music_const SFX_POKEFLUTE, SFX_Pokeflute music_const SFX_SAFARI_ZONE_PA, SFX_Safari_Zone_PA ; AUDIO_2 @@ -267,3 +274,11 @@ ENDM music_const SFX_SLOTS_REWARD, SFX_Slots_Reward music_const SFX_SLOTS_NEW_SPIN, SFX_Slots_New_Spin music_const SFX_SHOOTING_STAR, SFX_Shooting_Star + + ; AUDIO_4 + music_const SFX_UNKNOWN_801B3_4, SFX_801b3_4 + music_const SFX_UNKNOWN_801B6_4, SFX_801b6_4 + music_const SFX_UNKNOWN_801B9_4, SFX_801b9_4 + music_const SFX_UNKNOWN_801BC_4, SFX_801bc_4 + music_const SFX_UNKNOWN_801BF_4, SFX_801bf_4 + music_const SFX_UNKNOWN_GET_ITEM2_4_2, SFX_Get_Item2_4_2 diff --git a/engine/clear_save.asm b/engine/clear_save.asm index adbef1a4..37d098e6 100755 --- a/engine/clear_save.asm +++ b/engine/clear_save.asm @@ -1,10 +1,12 @@ -DoClearSaveDialogue: ; 1c98a (7:498a) +DoClearSaveDialogue: ; DoClearSaveDialogue: ; 1c21e (7:421e) call ClearScreen call RunDefaultPaletteCommand call LoadFontTilePatterns call LoadTextBoxTilePatterns ld hl, ClearSaveDataText call PrintText + ld a, B_BUTTON + ld [wJoyIgnore], a coord hl, 14, 7 lb bc, 8, 15 ld a, NO_YES_MENU @@ -12,12 +14,14 @@ DoClearSaveDialogue: ; 1c98a (7:498a) ld a, TWO_OPTION_MENU ld [wTextBoxID], a call DisplayTextBoxID + ld a, 0 + ld [wJoyIgnore], a ld a, [wCurrentMenuItem] and a jp z, Init callba ClearSAV jp Init -ClearSaveDataText: ; 1c9c1 (7:49c1) +ClearSaveDataText: ; 1c25f (7:425f) TX_FAR _ClearSaveDataText db "@" diff --git a/engine/diploma_3a.asm b/engine/diploma_3a.asm new file mode 100755 index 00000000..c8a7e740 --- /dev/null +++ b/engine/diploma_3a.asm @@ -0,0 +1,167 @@ +_DisplayDiploma: ; e9a08 (3a:5a08) + call GBPalWhiteOutWithDelay3 + call ClearScreen + ld de, SurfingPikachu3Graphics + ld hl, vChars2 + lb bc, BANK(SurfingPikachu3Graphics), (SurfingPikachu3GraphicsEnd - SurfingPikachu3Graphics) / $10 + call CopyVideoData + + coord hl, 0, 0 + call Func_e9bdf + + coord hl, 0, 0 + call Func_e9beb + + coord hl, 19, 0 + call Func_e9beb + + ld a, $00 + coord hl, 0, 0 + ld [hl], a + coord hl, 19, 0 + ld [hl], a + + ld de, String_e9a73 + coord hl, 5, 2 + call PlaceString + + ld de, String_e9a7d + coord hl, 3, 4 + call PlaceString + + ld de, wPlayerName + coord hl, 10, 4 + call PlaceString + + ld de, String_e9a84 + coord hl, 2, 6 + call PlaceString + + ld de, String_e9ac8 + coord hl, 9, 16 + call PlaceString + + ld b, SET_PAL_GENERIC + call RunPaletteCommand + ld a, $01 + ld [$ffba], a + call Delay3 + call GBPalNormal + ret + +; e9a73 +String_e9a73: + db $10, "Diploma", $10, "@" + +String_e9a7d: + db "Player@" + +String_e9a84: + db "Congrats! This" + next "diploma certifies" + next "that you have" + next "completed your" + next "#DEX.@" + +String_e9ac8: + db "GAME FREAK@" + +Func_e9ad3: + call ClearScreen + coord hl, 0, 17 + call Func_e9bdf + coord hl, 0, 0 + call Func_e9beb + coord hl, 19, 0 + call Func_e9beb + ld a, $00 + coord hl, 0, 17 + ld [hl], a + coord hl, 19, 17 + ld [hl], a + ld de, Tilemap_e9b3e + coord hl, 6, 2 + lb bc, 10, 12 + call Func_e925d + ld de, Tilemap_e9bb6 + coord hl, 5, 13 + lb bc, 1, 11 + call Func_e925d + ld de, String_e9bd5 + coord hl, 2, 15 + call PlaceString + coord hl, 12, 15 + ld de, wPlayTimeHours + 1 + lb bc, $40 | 1, 3 + call PrintNumber + ld [hl], $16 + inc hl + ld de, wPlayTimeMinutes + 1 + lb bc, $80 | 1, 2 + call PrintNumber + ld a, [wNumSetBits] + cp 151 + ret nz + ld de, TileMap_e9bc1 + coord hl, 2, 0 + lb bc, 4, 5 + call Func_e925d + ret + +Tilemap_e9b3e: + db $7f, $7f, $7f, $1a, $1b, $7f, $7f, $7f, $7f, $7f + db $7f, $7f, $7f, $7f, $7f, $1c, $1d, $1e, $1f, $20 + db $7f, $21, $22, $23, $7f, $24, $25, $26, $27, $28 + db $29, $2a, $2b, $2c, $2d, $2e, $2f, $30, $31, $32 + db $33, $34, $35, $36, $37, $38, $39, $3a, $3b, $3c + db $7f, $3d, $3e, $3f, $40, $41, $42, $43, $29, $44 + db $45, $46, $47, $48, $49, $4a, $4b, $29, $29, $4c + db $4d, $4e, $4f, $50, $51, $52, $53, $54, $55, $56 + db $57, $58, $59, $7f, $7f, $7f, $5a, $5b, $5c, $5d + db $5e, $5f, $60, $61, $62, $7f, $7f, $7f, $7f, $63 + db $64, $65, $66, $67, $68, $7f, $7f, $7f, $7f, $7f + db $7f, $69, $6a, $6b, $6c, $6d, $6e, $7f, $7f, $7f + +Tilemap_e9bb6: + db $05 + db $06 + db $07 + db $08 + db $09 + db $0a + db $0b + db $0c + db $0d + db $0e + db $0f + +TileMap_e9bc1: + db $70, $71, $7f, $72, $7f + db $73, $74, $75, $76, $77 + db $7f, $78, $11, $12, $13 + db $7f, $7f, $14, $15, $7f + +String_e9bd5: db "PLAY TIME@" + +Func_e9bdf: + ld c, 10 +.asm_e9be1 + ld [hl], $02 + inc hl + ld [hl], $01 + inc hl + dec c + jr nz, .asm_e9be1 + ret + +Func_e9beb: + ld c, 9 + ld de, SCREEN_WIDTH +.asm_e9bed + ld [hl], $04 + add hl, de + ld [hl], $03 + add hl, de + dec c + jr nz, .asm_e9bed + ret diff --git a/engine/overworld/card_key.asm b/engine/overworld/card_key.asm index f601a951..48b2380d 100755 --- a/engine/overworld/card_key.asm +++ b/engine/overworld/card_key.asm @@ -74,7 +74,7 @@ SilphCoMapList: ; 52645 (14:6645) CardKeySuccessText: ; 52650 (14:6650) TX_FAR _CardKeySuccessText1 - db $0b + TX_SFX_ITEM TX_FAR _CardKeySuccessText2 db "@" diff --git a/engine/overworld/doors.asm b/engine/overworld/doors.asm index 6b0c0464..8ec9772a 100755 --- a/engine/overworld/doors.asm +++ b/engine/overworld/doors.asm @@ -25,33 +25,21 @@ IsPlayerStandingOnDoorTile: ; 1a609 (6:6609) and a ret -DoorTileIDPointers: ; 1a62c (6:662c) - db OVERWORLD - dw OverworldDoorTileIDs - db FOREST - dw ForestDoorTileIDs - db MART - dw MartDoorTileIDs - db HOUSE - dw HouseDoorTileIDs - db FOREST_GATE - dw TilesetMuseumDoorTileIDs - db MUSEUM - dw TilesetMuseumDoorTileIDs - db GATE - dw TilesetMuseumDoorTileIDs - db SHIP - dw ShipDoorTileIDs - db LOBBY - dw LobbyDoorTileIDs - db MANSION - dw MansionDoorTileIDs - db LAB - dw LabDoorTileIDs - db FACILITY - dw FacilityDoorTileIDs - db PLATEAU - dw PlateauDoorTileIDs +DoorTileIDPointers: ; 1a7a8 (6:67a8) + dbw OVERWORLD, OverworldDoorTileIDs + dbw FOREST, ForestDoorTileIDs + dbw MART, MartDoorTileIDs + dbw HOUSE, HouseDoorTileIDs + dbw FOREST_GATE, TilesetMuseumDoorTileIDs + dbw MUSEUM, TilesetMuseumDoorTileIDs + dbw GATE, TilesetMuseumDoorTileIDs + dbw SHIP, ShipDoorTileIDs + dbw LOBBY, LobbyDoorTileIDs + dbw MANSION, MansionDoorTileIDs + dbw LAB, LabDoorTileIDs + dbw FACILITY, FacilityDoorTileIDs + dbw PLATEAU, PlateauDoorTileIDs + dbw INTERIOR, InteriorDoorTileIDs db $ff OverworldDoorTileIDs: ; 1a654 (6:6654) @@ -72,17 +60,20 @@ TilesetMuseumDoorTileIDs: ; 1a65d (6:665d) ShipDoorTileIDs: ; 1a65f (6:665f) db $1e,$00 -LobbyDoorTileIDs: ; 1a661 (6:6661) +LobbyDoorTileIDs: ; 1a7e0 (6:67e0) db $1c,$38,$1a,$00 -MansionDoorTileIDs: ; 1a665 (6:6665) +MansionDoorTileIDs: ; 1a7e4 (6:67e4) db $1a,$1c,$53,$00 -LabDoorTileIDs: ; 1a669 (6:6669) +LabDoorTileIDs: ; 1a7e8 (6:67e8) db $34,$00 -FacilityDoorTileIDs: ; 1a66b (6:666b) +FacilityDoorTileIDs: ; 1a7ea (6:67ea) db $43,$58,$1b,$00 -PlateauDoorTileIDs: ; 1a66f (6:666f) +PlateauDoorTileIDs: ; 1a7ee (6:67ee) db $3b,$1b,$00 + +InteriorDoorTileIDs: ; 1a7f1 (6:67f1) + db $04,$15,$00 diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm index b04f6332..a6ebd9be 100755 --- a/engine/overworld/ledges.asm +++ b/engine/overworld/ledges.asm @@ -1,4 +1,4 @@ -HandleLedges: ; 1a672 (6:6672) +HandleLedges: ; 1a7f4 (6:67f4) ld a, [wd736] bit 6, a ; already jumping down ledge ret nz @@ -55,7 +55,7 @@ HandleLedges: ; 1a672 (6:6672) ret ; (player direction) (tile player standing on) (ledge tile) (input required) -LedgeTiles: ; 1a6cf (6:66cf) +LedgeTiles: ; 1a851 (6:6851) db SPRITE_FACING_DOWN, $2C,$37,D_DOWN db SPRITE_FACING_DOWN, $39,$36,D_DOWN db SPRITE_FACING_DOWN, $39,$37,D_DOWN @@ -66,21 +66,25 @@ LedgeTiles: ; 1a6cf (6:66cf) db SPRITE_FACING_RIGHT,$39,$0D,D_RIGHT db $FF -LoadHoppingShadowOAM: ; 1a6f0 (6:66f0) +LoadHoppingShadowOAM: ; 1a872 (6:6872) ld hl, vChars1 + $7f0 ld de, LedgeHoppingShadow lb bc, BANK(LedgeHoppingShadow), (LedgeHoppingShadowEnd - LedgeHoppingShadow) / $8 call CopyVideoDataDouble - ld a, $9 - lb bc, $54, $48 ; b, c = y, x coordinates of shadow - ld de, LedgeHoppingShadowOAM - call WriteOAMBlock + ld hl, LedgeHoppingShadowOAM + ld de, wOAMBuffer + 36 * 4 + ld bc, LedgeHoppingShadowOAMEnd - LedgeHoppingShadowOAM + call CopyData + ld a, $a0 + ld [wOAMBuffer + 38 * 4], a + ld [wOAMBuffer + 39 * 4], a ret -LedgeHoppingShadow: ; 1a708 (6:6708) +LedgeHoppingShadow: ; 1a893 (6:6893) INCBIN "gfx/ledge_hopping_shadow.1bpp" LedgeHoppingShadowEnd: -LedgeHoppingShadowOAM: ; 1a710 (6:6710) - db $FF,$10,$FF,$20 - db $FF,$40,$FF,$60 +LedgeHoppingShadowOAM: ; 1a89b (6:689b) + db $58,$48,$FF,$00 + db $58,$50,$FF,$20 +LedgeHoppingShadowOAMEnd: ; 1a8a3 (6:68a3) diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index 719c8835..58eb6a47 100755 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -27,7 +27,7 @@ PlayerStepOutFromDoor: ; 1a3e0 (6:63e0) res 7, [hl] ret -_EndNPCMovementScript: ; 1a41d (6:641d) +_EndNPCMovementScript: ; 1a527 (6:6527) ld hl, wd730 res 7, [hl] ld hl, wd72e @@ -37,21 +37,21 @@ _EndNPCMovementScript: ; 1a41d (6:641d) res 1, [hl] xor a ld [wNPCMovementScriptSpriteOffset], a - ld [wNPCMovementScriptPointerTableNum], a ld [wNPCMovementScriptFunctionNum], a + ld [wNPCMovementScriptPointerTableNum], a ld [wWastedByteCD3A], a ld [wSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesEnd], a ret -PalletMovementScriptPointerTable: ; 1a442 (6:6442) +PalletMovementScriptPointerTable: ; 1a54c (6:654c) dw PalletMovementScript_OakMoveLeft dw PalletMovementScript_PlayerMoveLeft dw PalletMovementScript_WaitAndWalkToLab dw PalletMovementScript_WalkToLab dw PalletMovementScript_Done -PalletMovementScript_OakMoveLeft: ; 1a44c (6:644c) +PalletMovementScript_OakMoveLeft: ; 1a556 (6:6556) ld a, [wXCoord] sub $a ld [wNumStepsToTake], a @@ -79,13 +79,17 @@ PalletMovementScript_OakMoveLeft: ; 1a44c (6:644c) ld a, $3 ld [wNPCMovementScriptFunctionNum], a .done + ld a, BANK(Music_MuseumGuy) + ld c, a + ld a, MUSIC_MUSEUM_GUY + call PlayMusic ld hl, wFlags_D733 set 1, [hl] ld a, $fc ld [wJoyIgnore], a ret -PalletMovementScript_PlayerMoveLeft: ; 1a485 (6:6485) +PalletMovementScript_PlayerMoveLeft: ; 1a597 (6:6597) ld a, [wd730] bit 0, a ; is an NPC being moved by a script? ret nz ; return if Oak is still moving @@ -98,12 +102,12 @@ PalletMovementScript_PlayerMoveLeft: ; 1a485 (6:6485) ld [wNPCMovementScriptFunctionNum], a ret -PalletMovementScript_WaitAndWalkToLab: ; 1a4a1 (6:64a1) +PalletMovementScript_WaitAndWalkToLab: ; 1a5b3 (6:65b3) ld a, [wSimulatedJoypadStatesIndex] and a ; is the player done moving left yet? ret nz -PalletMovementScript_WalkToLab: ; 1a4a6 (6:64a6) +PalletMovementScript_WalkToLab: ; 1a5b8 (6:65b8) xor a ld [wOverrideSimulatedJoypadStatesMask], a ld a, [wSpriteIndex] @@ -127,8 +131,9 @@ PalletMovementScript_WalkToLab: ; 1a4a6 (6:64a6) ld [wNPCMovementScriptFunctionNum], a ret -RLEList_ProfOakWalkToLab: ; 1a4dc (6:64dc) - db NPC_MOVEMENT_DOWN, $05 + +RLEList_ProfOakWalkToLab: ; 1a5ee (6:65ee) + db NPC_MOVEMENT_DOWN, $06 ; differs from red db NPC_MOVEMENT_LEFT, $01 db NPC_MOVEMENT_DOWN, $05 db NPC_MOVEMENT_RIGHT, $03 @@ -136,15 +141,15 @@ RLEList_ProfOakWalkToLab: ; 1a4dc (6:64dc) db $E0, $01 ; stand still db $FF -RLEList_PlayerWalkToLab: ; 1a4e9 (6:64e9) +RLEList_PlayerWalkToLab: ; 1a5fb (6:65fb) db D_UP, $02 db D_RIGHT, $03 db D_DOWN, $05 db D_LEFT, $01 - db D_DOWN, $06 + db D_DOWN, $07 ; differs from red db $FF -PalletMovementScript_Done: ; 1a4f4 (6:64f4) +PalletMovementScript_Done: ; 1a606 (6:6606) ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -157,17 +162,15 @@ PalletMovementScript_Done: ; 1a4f4 (6:64f4) res 7, [hl] jp EndNPCMovementScript -PewterMuseumGuyMovementScriptPointerTable: ; 1a510 (6:6510) +PewterMuseumGuyMovementScriptPointerTable: ; 1a622 (6:6622) dw PewterMovementScript_WalkToMuseum dw PewterMovementScript_Done -PewterMovementScript_WalkToMuseum: ; 1a514 (6:6514) +PewterMovementScript_WalkToMuseum: ; 1a626 (6:6626) ld a, BANK(Music_MuseumGuy) - ld [wAudioROMBank], a - ld [wAudioSavedROMBank], a + ld c, a ld a, MUSIC_MUSEUM_GUY - ld [wNewSoundID], a - call PlaySound + call PlayMusic ld a, [wSpriteIndex] swap a ld [wNPCMovementScriptSpriteOffset], a @@ -179,7 +182,7 @@ PewterMovementScript_WalkToMuseum: ; 1a514 (6:6514) ld [wSimulatedJoypadStatesIndex], a xor a ld [wWhichPewterGuy], a - predef PewterGuys + call PewterGuys ld hl, wNPCMovementDirections2 ld de, RLEList_PewterMuseumGuy call DecodeRLEList @@ -189,21 +192,21 @@ PewterMovementScript_WalkToMuseum: ; 1a514 (6:6514) ld [wNPCMovementScriptFunctionNum], a ret -RLEList_PewterMuseumPlayer: ; 1a559 (6:6559) +RLEList_PewterMuseumPlayer: ; 1a661 (6:6661) db 0, $01 db D_UP, $03 db D_LEFT, $0D db D_UP, $06 db $FF -RLEList_PewterMuseumGuy: ; 1a562 (6:6562) +RLEList_PewterMuseumGuy: ; 1a66a (6:666a) db NPC_MOVEMENT_UP, $06 db NPC_MOVEMENT_LEFT, $0D db NPC_MOVEMENT_UP, $03 db NPC_MOVEMENT_LEFT, $01 db $FF -PewterMovementScript_Done: ; 1a56b (6:656b) +PewterMovementScript_Done: ; 1a673 (6:6673) ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -213,17 +216,15 @@ PewterMovementScript_Done: ; 1a56b (6:656b) res 7, [hl] jp EndNPCMovementScript -PewterGymGuyMovementScriptPointerTable: ; 1a57d (6:657d) +PewterGymGuyMovementScriptPointerTable: ; 1a685 (6:6685) dw PewterMovementScript_WalkToGym dw PewterMovementScript_Done -PewterMovementScript_WalkToGym: ; 1a581 (6:6581) +PewterMovementScript_WalkToGym: ; 1a689 (6:6689) ld a, BANK(Music_MuseumGuy) - ld [wAudioROMBank], a - ld [wAudioSavedROMBank], a + ld c, a ld a, MUSIC_MUSEUM_GUY - ld [wNewSoundID], a - call PlaySound + call PlayMusic ld a, [wSpriteIndex] swap a ld [wNPCMovementScriptSpriteOffset], a @@ -236,7 +237,7 @@ PewterMovementScript_WalkToGym: ; 1a581 (6:6581) ld [wSimulatedJoypadStatesIndex], a ld a, 1 ld [wWhichPewterGuy], a - predef PewterGuys + call PewterGuys ld hl, wNPCMovementDirections2 ld de, RLEList_PewterGymGuy call DecodeRLEList @@ -248,7 +249,7 @@ PewterMovementScript_WalkToGym: ; 1a581 (6:6581) ld [wNPCMovementScriptFunctionNum], a ret -RLEList_PewterGymPlayer: ; 1a5cd (6:65cd) +RLEList_PewterGymPlayer: ; 1a6cb (6:66cb) db 0, $01 db D_RIGHT, $02 db D_DOWN, $05 @@ -257,7 +258,7 @@ RLEList_PewterGymPlayer: ; 1a5cd (6:65cd) db D_LEFT, $0F db $FF -RLEList_PewterGymGuy: ; 1a5da (6:65da) +RLEList_PewterGymGuy: ; 1a6cd8(6:66d8) db NPC_MOVEMENT_DOWN, $02 db NPC_MOVEMENT_LEFT, $0F db NPC_MOVEMENT_UP, $05 @@ -266,27 +267,4 @@ RLEList_PewterGymGuy: ; 1a5da (6:65da) db NPC_MOVEMENT_RIGHT, $03 db $FF -FreezeEnemyTrainerSprite: ; 1a5e7 (6:65e7) - ld a, [wCurMap] - cp POKEMONTOWER_7 - ret z ; the Rockets on Pokemon Tower 7F leave after battling, so don't freeze them - ld hl, RivalIDs - ld a, [wEngagedTrainerClass] - ld b, a -.loop - ld a, [hli] - cp $ff - jr z, .notRival - cp b - ret z ; the rival leaves after battling, so don't freeze him - jr .loop -.notRival - ld a, [wSpriteIndex] - ld [H_SPRITEINDEX], a - jp SetSpriteMovementBytesToFF - -RivalIDs: ; 1a605 (6:6605) - db OPP_SONY1 - db OPP_SONY2 - db OPP_SONY3 - db $ff +INCLUDE "engine/overworld/pewter_guys.asm" diff --git a/engine/overworld/pewter_guys.asm b/engine/overworld/pewter_guys.asm index 543dac91..ff3c6152 100755 --- a/engine/overworld/pewter_guys.asm +++ b/engine/overworld/pewter_guys.asm @@ -1,4 +1,4 @@ -PewterGuys: ; 37ca1 (d:7ca1) +PewterGuys: ; 1a6e5 (6:66e5) ld hl, wSimulatedJoypadStatesEnd ld a, [wSimulatedJoypadStatesIndex] dec a ; this decrement causes it to overwrite the last byte before $FF in the list @@ -48,14 +48,14 @@ PewterGuys: ; 37ca1 (d:7ca1) inc hl jr .findMatchingCoordsLoop -PointerTable_37ce6: ; 37ce6 (d:7ce6) +PointerTable_37ce6: ; 1a72a (6:672a) dw PewterMuseumGuyCoords dw PewterGymGuyCoords ; these are the four coordinates of the spaces below, above, to the left and ; to the right of the museum guy, and pointers to different movements for ; the player to make to get positioned before the main movement. -PewterMuseumGuyCoords: ; 37cea (d:7cea) +PewterMuseumGuyCoords: ; 1a72e (6:672e) db 18, 27 dw .down db 16, 27 @@ -78,7 +78,7 @@ PewterMuseumGuyCoords: ; 37cea (d:7cea) ; different movements for the player to make to get positioned before the ; main movement ; $00 is a pause -PewterGymGuyCoords: ; 37d06 (d:7d06) +PewterGymGuyCoords: ; 1a74a (6:674a) db 16, 34 dw .one db 17, 35 diff --git a/engine/predefs.asm b/engine/predefs.asm index fa6e29df..3ec98577 100755 --- a/engine/predefs.asm +++ b/engine/predefs.asm @@ -52,103 +52,102 @@ GetPredefPointer: ; f67ed (3d:67ed) PredefPointers:: ; f681d (3d:681d) ; these are pointers to ASM routines. ; they appear to be used in overworld map scripts. - dr $f681d,$f7000 - ;add_predef DrawPlayerHUDAndHPBar - ;add_predef CopyUncompressedPicToTilemap - ;add_predef Func_3f073 - ;add_predef ScaleSpriteByTwo - ;add_predef LoadMonBackPic - ;add_predef CopyDownscaledMonTiles - ;add_predef LoadMissableObjects - ;add_predef HealParty - ;add_predef MoveAnimation; 08 play move animation - ;add_predef DivideBCDPredef - ;add_predef DivideBCDPredef2 - ;add_predef AddBCDPredef - ;add_predef SubBCDPredef - ;add_predef DivideBCDPredef3 - ;add_predef DivideBCDPredef4 - ;add_predef InitPlayerData - ;add_predef FlagActionPredef - ;add_predef HideObject - ;add_predef IsObjectHidden - ;add_predef ApplyOutOfBattlePoisonDamage - ;add_predef AnyPartyAlive - ;add_predef ShowObject - ;add_predef ShowObject2 - ;add_predef ReplaceTileBlock - ;add_predef InitPlayerData2 - ;add_predef LoadTilesetHeader - ;add_predef LearnMoveFromLevelUp - ;add_predef LearnMove - ;add_predef IsItemInBag_ - ;dbw $03,CheckForHiddenObjectOrBookshelfOrCardKeyDoor ; for these two, the bank number is actually 0 - ;dbw $03,GiveItem - ;add_predef InvertBGPal_4Frames - ;add_predef FindPathToPlayer - ;add_predef Func_480ff - ;add_predef CalcPositionOfPlayerRelativeToNPC - ;add_predef ConvertNPCMovementDirectionsToJoypadMasks - ;add_predef Func_48125 - ;add_predef UpdateHPBar - ;add_predef HPBarLength - ;add_predef Diploma_TextBoxBorder - ;add_predef DoubleOrHalveSelectedStats - ;add_predef ShowPokedexMenu - ;add_predef EvolutionAfterBattle - ;add_predef SaveSAVtoSRAM0 - ;add_predef InitOpponent - ;add_predef CableClub_Run - ;add_predef DrawBadges - ;add_predef ExternalClockTradeAnim - ;add_predef BattleTransition - ;add_predef CopyTileIDsFromList - ;add_predef PlayIntro - ;add_predef Func_79869 - ;add_predef FlashScreen - ;add_predef GetTileAndCoordsInFrontOfPlayer - ;add_predef StatusScreen - ;add_predef StatusScreen2 - ;add_predef InternalClockTradeAnim - ;add_predef TrainerEngage - ;add_predef IndexToPokedex - ;add_predef DisplayPicCenteredOrUpperRight; 3B display pic? - ;add_predef UsedCut - ;add_predef ShowPokedexData - ;add_predef WriteMonMoves - ;add_predef SaveSAV - ;add_predef LoadSGB - ;add_predef MarkTownVisitedAndLoadMissableObjects - ;add_predef SetPartyMonTypes - ;add_predef CanLearnTM - ;add_predef TMToMove - ;add_predef Func_71ddf - ;add_predef StarterDex ; 46 - ;add_predef _AddPartyMon - ;add_predef UpdateHPBar2 - ;add_predef DrawEnemyHUDAndHPBar - ;add_predef LoadTownMap_Nest - ;add_predef PrintMonType - ;add_predef EmotionBubble; 4C player exclamation - ;add_predef EmptyFunc3; return immediately - ;add_predef AskName - ;add_predef PewterGuys - ;add_predef SaveSAVtoSRAM2 - ;add_predef LoadSAVCheckSum2 - ;add_predef LoadSAV - ;add_predef SaveSAVtoSRAM1 - ;add_predef DoInGameTradeDialogue ; 54 initiate trade - ;add_predef HallOfFamePC - ;add_predef DisplayDexRating - ;dbw $1E, _LeaveMapAnim ; wrong bank - ;dbw $1E, EnterMapAnim ; wrong bank - ;add_predef GetTileTwoStepsInFrontOfPlayer - ;add_predef CheckForCollisionWhenPushingBoulder - ;add_predef PrintStrengthTxt - ;add_predef PickupItem - ;add_predef PrintMoveType - ;add_predef LoadMovePPs - ;add_predef DrawHP ; 5F - ;add_predef DrawHP2 - ;add_predef Func_1c9c6 - ;add_predef OaksAideScript
\ No newline at end of file + dbw BANK(DrawPlayerHUDAndHPBar), DrawPlayerHUDAndHPBar ; add_predef DrawPlayerHUDAndHPBar + dbw $3d, $61f9 ; add_predef CopyUncompressedPicToTilemap + dbw $3d, $61a6 ; add_predef Func_3f073 + dbw $0b, $7d79 ; add_predef ScaleSpriteByTwo + dbw $3d, $6178 ; add_predef LoadMonBackPic + dbw $1e, $5c16 ; add_predef CopyDownscaledMonTiles + dbw $03, $70a7 ; add_predef LoadMissableObjects + dbw $03, $752b ; add_predef HealParty + dbw $1e, $4d97 ; add_predef MoveAnimation; 08 play move animation + dbw $03, $75a4 ; add_predef DivideBCDPredef + dbw $03, $75a4 ; add_predef DivideBCDPredef2 + dbw $03, $76a3 ; add_predef AddBCDPredef + dbw $03, $76bc ; add_predef SubBCDPredef + dbw $03, $75a4 ; add_predef DivideBCDPredef3 + dbw $03, $75a4 ; add_predef DivideBCDPredef4 + dbw $03, $76d6 ; add_predef InitPlayerData + dbw $03, $74ec ; add_predef FlagActionPredef + dbw $03, $7053 ; add_predef HideObject + dbw $03, $7022 ; add_predef IsObjectHidden + dbw $03, $43de ; add_predef ApplyOutOfBattlePoisonDamage + dbw $0f, $4ae8 ; add_predef AnyPartyAlive + dbw $03, $7044 ; add_predef ShowObject + dbw $03, $7044 ; add_predef ShowObject2 + dbw $03, $6d1b ; add_predef ReplaceTileBlock + dbw $03, $76d6 ; add_predef InitPlayerData2 + dbw $03, $44f4 ; add_predef LoadTilesetHeader + dbw $0e, $700c ; add_predef LearnMoveFromLevelUp + dbw $01, $6bc8 ; add_predef LearnMove + dbw $03, $7735 ; add_predef IsItemInBag_ + dbw $03, $3ef9 ; dbw $03,CheckForHiddenObjectOrBookshelfOrCardKeyDoor ; for these two, the ba + dbw $03, $3e3f ; dbw $03,GiveItem + dbw $0a, $7d4c ; add_predef InvertBGPal_4Frames + dbw $03, $774a ; add_predef FindPathToPlayer + dbw $0a, $7d67 ; add_predef Func_480ff + dbw $03, $77b9 ; add_predef CalcPositionOfPlayerRelativeToNPC + dbw $03, $7830 ; add_predef ConvertNPCMovementDirectionsToJoypadMasks + dbw $0a, $7d8d ; add_predef Func_48125 + dbw $03, $78ad ; add_predef UpdateHPBar + dbw $03, $786c ; add_predef HPBarLength + dbw $01, $5b64 ; add_predef Diploma_TextBoxBorder + dbw $0f, $6e8e ; add_predef DoubleOrHalveSelectedStats + dbw $10, $4000 ; add_predef ShowPokedexMenu + dbw $0e, $6dc6 ; add_predef EvolutionAfterBattle + dbw $1c, $7ae5 ; add_predef SaveSAVtoSRAM0 + dbw $3d, $5ff8 ; add_predef InitOpponent + dbw $01, $5b13 ; add_predef CableClub_Run + dbw $03, $6880 ; add_predef DrawBadges + dbw $10, $53f6 ; add_predef ExternalClockTradeAnim + dbw $1c, $49d7 ; add_predef BattleTransition + dbw $1e, $5f7b ; add_predef CopyTileIDsFromList + dbw $10, $5997 ; add_predef PlayIntro + dbw $1e, $59c5 ; add_predef Func_79869 + dbw $1c, $4bd0 ; add_predef FlashScreen + dbw $03, $42d1 ; add_predef GetTileAndCoordsInFrontOfPlayer + dbw $04, $54cc ; add_predef StatusScreen + dbw $04, $56fb ; add_predef StatusScreen2 + dbw $10, $53e5 ; add_predef InternalClockTradeAnim + dbw $15, $685b ; add_predef TrainerEngage + dbw $10, $509d ; add_predef IndexToPokedex + dbw $01, $600d ; add_predef DisplayPicCenteredOrUpperRight; 3B display pic? + dbw $03, $6dd1 ; add_predef UsedCut + dbw $10, $4312 ; add_predef ShowPokedexData + dbw $0e, $713f ; add_predef WriteMonMoves + dbw $1c, $7a67 ; add_predef SaveSAV + dbw $1c, $61f8 ; add_predef LoadSGB + dbw $03, $6f93 ; add_predef MarkTownVisitedAndLoadMissableObjects + dbw $17, $5b93 ; add_predef SetPartyMonTypes + dbw $04, $62f0 ; add_predef CanLearnTM + dbw $04, $631d ; add_predef TMToMove + dbw $1c, $5eb3 ; add_predef Func_71ddf + dbw $17, $40d4 ; add_predef StarterDex ; 46 + dbw $03, $7161 ; add_predef _AddPartyMon + dbw $03, $78ad ; add_predef UpdateHPBar2 + dbw $0f, $4eb1 ; add_predef DrawEnemyHUDAndHPBar + dbw $1c, $4fe4 ; add_predef LoadTownMap_Nest + dbw $09, $7d20 ; add_predef PrintMonType + dbw $10, $516f ; add_predef EmotionBubble; 4C player exclamation + dbw $01, $5b63 ; add_predef EmptyFunc3; return immediately + dbw $01, $625d ; add_predef AskName + dbw $06, $66e5 ; add_predef PewterGuys + dbw $1c, $7b56 ; add_predef SaveSAVtoSRAM2 + dbw $1c, $7a24 ; add_predef LoadSAVCheckSum2 + dbw $1c, $7959 ; add_predef LoadSAV + dbw $1c, $7b32 ; add_predef SaveSAVtoSRAM1 + dbw $1c, $5b86 ; add_predef DoInGameTradeDialogue ; 54 initiate trade + dbw $3c, $4f26 ; add_predef HallOfFamePC + dbw $11, $4169 ; add_predef DisplayDexRating + dbw $1e, $4615 ; dbw $1E, _LeaveMapAnim ; wrong bank + dbw $1e, $4567 ; dbw $1E, EnterMapAnim ; wrong bank + dbw $03, $4309 ; add_predef GetTileTwoStepsInFrontOfPlayer + dbw $03, $4356 ; add_predef CheckForCollisionWhenPushingBoulder + dbw $3d, $5b06 ; add_predef PrintStrengthTxt + dbw $01, $4d55 ; add_predef PickupItem + dbw $09, $7d4d ; add_predef PrintMoveType + dbw $03, $72f9 ; add_predef LoadMovePPs + dbw $04, $5468 ; add_predef DrawHP ; 5F + dbw $04, $546f ; add_predef DrawHP2 + dbw $07, $4264 ; add_predef Func_1c9c6 + dbw $16, $4ecc ; add_predef OaksAideScript diff --git a/engine/predefs7.asm b/engine/predefs7.asm index a2c08171..9138897f 100755 --- a/engine/predefs7.asm +++ b/engine/predefs7.asm @@ -1,6 +1,12 @@ -DisplayElevatorFloorMenu: ; 1c9c6 (7:49c6) +DisplayElevatorFloorMenu: ; 1c264 (7:4264) + ld hl, wd730 + ld a, [hl] + push af + set 6, [hl] ld hl, WhichFloorText call PrintText + pop af + ld [wd730], a ld hl, wItemList ld a, l ld [wListPointer], a @@ -43,6 +49,6 @@ DisplayElevatorFloorMenu: ; 1c9c6 (7:49c6) ld [hli], a ; destination map ID ret -WhichFloorText: ; 1ca14 (7:4a14) +WhichFloorText: ; 1c2bd (7:42bd) TX_FAR _WhichFloorText db "@" diff --git a/engine/printer.asm b/engine/printer.asm new file mode 100755 index 00000000..7e6ae637 --- /dev/null +++ b/engine/printer.asm @@ -0,0 +1,1342 @@ +Func_e8783: ; e8783 (3a:4783) + ld a, 9 +Func_e8785: + push af + ld hl, wOverworldMap + lb bc, 4, 13 + xor a + call Func_e8a2e + xor a + ld [rSB], a + ld [rSC], a + ld [wUnknownSerialFlag_d49b], a + ld hl, wUnknownSerialFlag_d49a + set 0, [hl] + ld a, [wd498] + ld [$cae3], a + pop af + ld [$caf4], a + ret + +; e87a8 +Func_e87a8: ; e87a8 (3a:47a8) + ld a, [wOverworldMap] + ld e, a + ld d, 0 + ld hl, Jumptable_e87b7 + add hl, de + add hl, de + ld a, [hli] + ld h, [hl] + ld l, a + jp [hl] + +Jumptable_e87b7: + dw Func_e87fd + dw Func_e88c9 + dw Func_e88a6 + dw Func_e881f + dw Func_e8906 + dw Func_e88b4 + dw Func_e884b + dw Func_e8906 + dw Func_e88a6 + dw Func_e8864 + dw Func_e8906 + dw Func_e88a6 + dw Func_e8927 + dw Func_e87e9 + dw Func_e87f3 + dw Func_e88a6 + dw Func_e8889 + dw Func_e87f7 + dw Func_e8936 + dw Func_e8939 + +Func_e87df: + ld hl, wOverworldMap + inc [hl] + ret + +Func_e87e4: + ld hl, wOverworldMap + dec [hl] + ret + +Func_e87e9: + xor a + ld [$c971], a + ld hl, wOverworldMap + set 7, [hl] + ret + +Func_e87f3: + call Func_e87df + ret + +Func_e87f7: + ld a, $01 + ld [wOverworldMap], a + ret + +Func_e87fd: + call Func_e8981 + ld hl, Data_e8a3a + call Func_e8968 + xor a + ld [$c976], a + ld [$c977], a + ld a, [$caf4] + ld [$c6e9], a + call Func_e87df + call Func_e8949 + ld a, $01 + ld [$cae0], a + ret + +Func_e881f: + call Func_e8981 + ld hl, $c6e9 + ld a, [hl] + and a + jr z, Func_e884b + ld hl, Data_e8a46 + call Func_e8968 + call Func_e89e6 + ld a, $80 + ld [$c976], a + ld a, $02 + ld [$c977], a + call Func_e899f + call Func_e87df + call Func_e8949 + ld a, $02 + ld [$cae0], a + ret + +Func_e884b: + ld a, $06 + ld [wOverworldMap], a + ld hl, Data_e8a4c + call Func_e8968 + xor a + ld [$c976], a + ld [$c977], a + call Func_e87df + call Func_e8949 + ret + +Func_e8864: + call Func_e8981 + ld hl, Data_e8a40 + call Func_e8968 + call Func_e89cf + ld a, $04 + ld [$c976], a + ld a, $00 + ld [$c977], a + call Func_e899f + call Func_e87df + call Func_e8949 + ld a, $03 + ld [$cae0], a + ret + +Func_e8889: + call Func_e8981 + ld hl, Data_e8a3a + call Func_e8968 + xor a + ld [$c976], a + ld [$c977], a + ld a, [$caf4] + ld [$c6e9], a + call Func_e87df + call Func_e8949 + ret + +Func_e88a6: + ld hl, $c973 + inc [hl] + ld a, [hl] + cp a, $06 + ret c + xor a + ld [hl], a + call Func_e87df + ret + +Func_e88b4: + ld hl, $c973 + inc [hl] + ld a, [hl] + cp a, $06 + ret c + xor a + ld [hl], a + ld hl, $c6e9 + dec [hl] + call Func_e87e4 + call Func_e87e4 + ret + +Func_e88c9: + ld a, [wUnknownSerialFlag_d49b] + and a + ret nz + ld a, [$c970] + cp a, $ff + jr nz, .asm_e88dc + ld a, [$c971] + cp a, $ff + jr z, .asm_e88f8 +.asm_e88dc + ld a, [$c970] + cp a, $81 + jr nz, .asm_e88f8 + ld a, [$c971] + cp a, $00 + jr nz, .asm_e88f8 + ld hl, wUnknownSerialFlag_d49a + set 1, [hl] + ld a, $05 + ld [$c972], a + call Func_e87df + ret + +.asm_e88f8 + ld a, $ff + ld [$c970], a + ld [$c971], a + ld a, $0e + ld [wOverworldMap], a + ret + +Func_e8906: + ld a, [wUnknownSerialFlag_d49b] + and a + ret nz + ld a, [$c971] + and a, $f0 + jr nz, .asm_e8921 + ld a, [$c971] + and a, $01 + jr nz, .asm_e891d + call Func_e87df + ret + +.asm_e891d + call Func_e87e4 + ret + +.asm_e8921 + ld a, $12 + ld [wOverworldMap], a + ret + +Func_e8927: + ld a, [wUnknownSerialFlag_d49b] + and a + ret nz + ld a, [$c971] + and a, $f3 + ret nz + call Func_e87df + ret + +Func_e8936: + call Func_e87df +Func_e8939: + ld a, [wUnknownSerialFlag_d49b] + and a + ret nz + ld a, [$c971] + and a, $f0 + ret nz + xor a + ld [wOverworldMap], a + ret + +Func_e8949: +.asm_e8949 + ld a, [wUnknownSerialFlag_d49b] + and a + jr nz, .asm_e8949 + xor a + ld [$c974], a + ld [$c975], a + ld a, $01 + ld [wUnknownSerialFlag_d49b], a + ld a, $88 + ld [rSB], a + ld a, $01 + ld [rSC], a + ld a, $81 + ld [rSC], a + ret + +Func_e8968: + ld a, [hli] + ld [$c6ea], a + ld a, [hli] + ld [$c6eb], a + ld a, [hli] + ld [$c6ec], a + ld a, [hli] + ld [$c6ed], a + ld a, [hli] + ld [$c6ee], a + ld a, [hl] + ld [$c6ef], a + ret + +Func_e8981: + xor a + ld hl, $c6ea + ld [hli], a + ld [hli], a + ld [hli], a + ld [hl], a + ld hl, $c6ee + ld [hli], a + ld [hl], a + xor a + ld [$c976], a + ld [$c977], a + ld hl, $c6f0 + ld bc, $0280 + call Func_e8a2e + ret + +Func_e899f: + ld hl, $0000 + ld bc, $0004 + ld de, $c6ea + call Func_e89c2 + ld a, [$c976] + ld c, a + ld a, [$c977] + ld b, a + ld de, $c6f0 + call Func_e89c2 + ld a, l + ld [$c6ee], a + ld a, h + ld [$c6ef], a + ret + +Func_e89c2: +.asm_e89c2 + ld a, [de] + inc de + add l + jr nc, .asm_e89c8 + inc h +.asm_e89c8 + ld l, a + dec bc + ld a, c + or b + jr nz, .asm_e89c2 + ret + +Func_e89cf: + ld a, $01 + ld [$c6f0], a + ld a, [$cae2] + ld [$c6f1], a + ld a, $e4 + ld [$c6f2], a + ld a, [$cae3] + ld [$c6f3], a + ret + +Func_e89e6: + ld a, [$c6e9] + ld b, a + ld a, [$caf4] + sub b + ld hl, $c978 + ld de, $0028 +.asm_e89f4 + and a + jr z, .asm_e89fb + add hl, de + dec a + jr .asm_e89f4 + +.asm_e89fb + ld e, l + ld d, h + ld hl, $c6f0 + ld c, $28 +.asm_e8a02 + ld a, [de] + inc de + push bc + push de + push hl + swap a + ld d, a + and a, $f0 + ld e, a + ld a, d + and a, $0f + ld d, a + and a, $08 + ld a, d + jr nz, .asm_e8a1a + or a, $90 + jr .asm_e8a1c + +.asm_e8a1a + or a, $80 +.asm_e8a1c + ld d, a + ld bc, $3a01 + call CopyVideoData + pop hl + ld de, $0010 + add hl, de + pop de + pop bc + dec c + jr nz, .asm_e8a02 + ret + +Func_e8a2e: ; e8a2e (3a:4a2e) + push de + ld e, a +.asm_e8a30 + ld [hl], e + inc hl + dec bc + ld a, c + or b + jr nz, .asm_e8a30 + ld a, e + pop de + ret + +Data_e8a3a: + db $01, $00, $00, $00, $01, $00 +Data_e8a40: + db $02, $00, $04, $00, $00, $00 +Data_e8a46: + db $04, $00, $80, $02, $00, $00 +Data_e8a4c: + db $04, $00, $00, $00, $04, $00 +Data_e8a52: + db $08, $00, $00, $00, $08, $00 +Data_e8a58: + db $0f, $00, $00, $00, $0f, $00 + +Func_e8a5e: ; e8a5e (3a:4a5e) + ld a, [$d49a] + ld e, a + ld d, 0 + ld hl, Jumptable_e8a6d + add hl, de + add hl, de + ld a, [hli] + ld h, [hl] + ld l, a + jp [hl] + +Jumptable_e8a6d: + dw Func_e8ab2 + dw Func_e8ab3 + dw Func_e8abc + dw Func_e8ac6 + dw Func_e8ad0 + dw Func_e8ada + dw Func_e8ae4 + dw Func_e8b0f + dw Func_e8b19 + dw Func_e8b23 + dw Func_e8b2c + dw Func_e8b3a + dw Func_e8ab3 + dw Func_e8b44 + dw Func_e8b4d + dw Func_e8b4d + dw Func_e8b4d + dw Func_e8b44 + dw Func_e8b4d + dw Func_e8b23 + dw Func_e8b2c + dw Func_e8b6a + dw Func_e8ab3 + dw Func_e8b56 + dw Func_e8b4d + dw Func_e8b4d + dw Func_e8b4d + dw Func_e8b56 + dw Func_e8b4d + dw Func_e8b23 + dw Func_e8b2c + dw Func_e8b3a + +Func_e8aad: + ld hl, wUnknownSerialFlag_d49b + inc [hl] + ret + +Func_e8ab2: + ret + +Func_e8ab3: + ld a, $33 + call Func_e8b5f + call Func_e8aad + ret + +Func_e8abc: + ld a, [$c6ea] + call Func_e8b5f + call Func_e8aad + ret + +Func_e8ac6: + ld a, [$c6eb] + call Func_e8b5f + call Func_e8aad + ret + +Func_e8ad0: + ld a, [$c6ec] + call Func_e8b5f + call Func_e8aad + ret + +Func_e8ada: + ld a, [$c6ed] + call Func_e8b5f + call Func_e8aad + ret + +Func_e8ae4: + ld hl, $c976 + ld e, [hl] + inc hl + ld d, [hl] + ld a, e + or d + jr z, .asm_e8b0c + dec de + ld [hl], d + dec hl + ld [hl], e + ld a, [$c974] + ld e, a + ld a, [$c975] + ld d, a + ld hl, $c6f0 + add hl, de + inc de + ld a, e + ld [$c974], a + ld a, d + ld [$c975], a + ld a, [hl] + call Func_e8b5f + ret + +.asm_e8b0c + call Func_e8aad +Func_e8b0f: + ld a, [$c6ee] + call Func_e8b5f + call Func_e8aad + ret + +Func_e8b19: + ld a, [$c6ef] + call Func_e8b5f + call Func_e8aad + ret + +Func_e8b23: + ld a, $00 + call Func_e8b5f + call Func_e8aad + ret + +Func_e8b2c: + ld a, [rSB] + ld [$c970], a + ld a, $00 + call Func_e8b5f + call Func_e8aad + ret + +Func_e8b3a: + ld a, [rSB] + ld [$c971], a + xor a + ld [wUnknownSerialFlag_d49b], a + ret + +Func_e8b44: + ld a, $0f + call Func_e8b5f + call Func_e8aad + ret + +Func_e8b4d: + ld a, $00 + call Func_e8b5f + call Func_e8aad + ret + +Func_e8b56: + ld a, $08 + call Func_e8b5f + call Func_e8aad + ret + +Func_e8b5f: + ld [rSB], a + ld a, $01 + ld [rSC], a + ld a, $81 + ld [rSC], a + ret + +Func_e8b6a: + ld a, [rSB] + ld [$c971], a + xor a + ld [wUnknownSerialFlag_d49b], a + ret + +Func_e8b74: ; e8b74 (3a:4b74) + ld a, [$cfca] + push af + xor a + ld [$cfca], a + ld [$ffdb], a + call Func_e8f24 + ld a, [rIE] + push af + xor a + ld [rIF], a + ld a, $09 + ld [rIE], a + xor a + ld [$ffba], a + call Func_e8c30 + call Func_e8785 + ld a, [$caf9] + and a + jr z, .asm_e8b9e + ld a, $10 + jr .asm_e8ba0 + +.asm_e8b9e + ld a, $13 +.asm_e8ba0 + ld [$cae2], a + call Func_e8efc + call ClearScreen + callab Func_401c2 + callab Func_4027c + ld a, $01 + ld [$ffba], a + call Func_e8c0c + jr c, .asm_e8bf4 + ld a, [$caf9] + and a + jr z, .asm_e8bf4 + xor a + ld [wUnknownSerialFlag_d49a], a + ld [wUnknownSerialFlag_d49b], a + ld c, $0c + call DelayFrames + call SaveScreenTilesToBuffer1 + xor a + ld [$ffba], a + call Func_e8c50 + ld a, $07 + call Func_e8785 + ld a, $03 + ld [$cae2], a + call Func_e8efc + call LoadScreenTilesFromBuffer1 + ld a, $01 + ld [$ffba], a + call Func_e8c0c +.asm_e8bf4 + xor a + ld [wUnknownSerialFlag_d49a], a + ld [wUnknownSerialFlag_d49b], a + xor a + ld [rIF], a + pop af + ld [rIE], a + call Func_0f3d + call Func_e8f3b + pop af + ld [$cfca], a + ret + +Func_e8c0c: + call Func_e8f16 +.asm_e8c0f + call JoypadLowSensitivity + call Func_e8eca + jr c, .asm_e8c2e + ld a, [$c6e8] + bit 7, a + jr nz, .asm_e8c2c + call Func_e87a8 + call Func_e8f51 + call Func_e8f82 + call DelayFrame + jr .asm_e8c0f + +.asm_e8c2c + and a + ret + +.asm_e8c2e + scf + ret + +Func_e8c30: + callab Func_4039c + ld a, l + ld [$caf5], a + ld a, h + ld [$caf6], a + ld a, $00 + rla + ld [$caf9], a + and a + jr z, .asm_e8c4d + ld a, $05 + jr .asm_e8c4f + +.asm_e8c4d + ld a, $09 +.asm_e8c4f + ret + +Func_e8c50: + call ClearScreen + callab Func_404bc + ret + +Func_e8c5c: + xor a + ld [$ffdb], a + call Func_e8f24 + call Func_e910a + ld a, [rIE] + push af + xor a + ld [rIF], a + ld a, $09 + ld [rIE], a + call Func_e8783 + ld a, $13 + ld [$cae2], a + call Func_e8efc + call Func_e8f16 +.asm_e8c7d + call JoypadLowSensitivity + call Func_e8eca + jr c, .asm_e8c9a + ld a, [$c6e8] + bit 7, a + jr nz, .asm_e8c9a + call Func_e87a8 + call Func_e8f51 + call Func_e8f82 + call DelayFrame + jr .asm_e8c7d + +.asm_e8c9a + xor a + ld [wUnknownSerialFlag_d49a], a + ld [wUnknownSerialFlag_d49b], a + call Func_e8f09 + xor a + ld [rIF], a + pop af + ld [rIE], a + call Func_0f3d + call Func_e8f3b + ret + +Func_e8cb1: + xor a + ld [$ffdb], a + call Func_e8f24 + call _DisplayDiploma + ld a, [rIE] + push af + xor a + ld [rIF], a + ld a, $09 + ld [rIE], a + call Func_e8783 + ld a, $10 + ld [$cae2], a + call Func_e8efc + call Func_e8d11 + jr c, .asm_e8cfa + xor a + ld [wUnknownSerialFlag_d49a], a + ld [wUnknownSerialFlag_d49b], a + ld c, $0c + call DelayFrames + call SaveScreenTilesToBuffer1 + xor a + ld [$ffba], a + call Func_e9ad3 + call Func_e8783 + ld a, $03 + ld [$cae2], a + call Func_e8efc + call LoadScreenTilesFromBuffer1 + call Func_e8d11 +.asm_e8cfa + xor a + ld [wUnknownSerialFlag_d49a], a + ld [wUnknownSerialFlag_d49b], a + call Func_e8f09 + xor a + ld [rIF], a + pop af + ld [rIE], a + call Func_0f3d + call Func_e8f3b + ret + +Func_e8d11: + call Func_e8f16 +.asm_e8d14 + call JoypadLowSensitivity + call Func_e8eca + jr c, .asm_e8d33 + ld a, [$c6e8] + bit 7, a + jr nz, .asm_e8d31 + call Func_e87a8 + call Func_e8f51 + call Func_e8f82 + call DelayFrame + jr .asm_e8d14 + +.asm_e8d31 + and a + ret + +.asm_e8d33 + scf + ret + + + +Func_e8d35:: ; e8d35 (3a:4e79) + ld a, [wBoxDataStart] + and a + jp z, Func_e8df4 + ld a, [wUpdateSpritesEnabled] + push af + xor a + ld [wUpdateSpritesEnabled], a + ld [hItemCounter], a + call Func_e8f24 + ld a, [rIE] + push af + xor a + ld [rIF], a + ld a, $09 + ld [rIE], a + call SaveScreenTilesToBuffer1 + xor a + ld [H_AUTOBGTRANSFERENABLED], a + call Func_e988a + call Func_e8783 + ld a, $10 + ld [$cae2], a + call Func_e8efc + call LoadScreenTilesFromBuffer1 + call Func_e8dfb + jr c, .asm_e8ddc + xor a + ld [wUnknownSerialFlag_d49a], a + ld [wUnknownSerialFlag_d49b], a + ld c, 12 + call DelayFrames + xor a + ld [H_AUTOBGTRANSFERENABLED], a + call Func_e98ec + call Func_e8783 + ld a, $00 + ld [$cae2], a + call Func_e8efc + call LoadScreenTilesFromBuffer1 + call Func_e8dfb + jr c, .asm_e8ddc + xor a + ld [wUnknownSerialFlag_d49a], a + ld [wUnknownSerialFlag_d49b], a + ld c, 12 + call DelayFrames + xor a + ld [H_AUTOBGTRANSFERENABLED], a + call Func_e9907 + call Func_e8783 + ld a, $00 + ld [$cae2], a + call Func_e8efc + call LoadScreenTilesFromBuffer1 + call Func_e8dfb + jr c, .asm_e8ddc + xor a + ld [wUnknownSerialFlag_d49a], a + ld [wUnknownSerialFlag_d49b], a + ld c, 12 + call DelayFrames + xor a + ld [H_AUTOBGTRANSFERENABLED], a + call Func_e9922 + call Func_e8783 + ld a, $03 + ld [$cae2], a + call Func_e8efc + call LoadScreenTilesFromBuffer1 + call Func_e8dfb +.asm_e8ddc + xor a + ld [wUnknownSerialFlag_d49a], a + ld [wUnknownSerialFlag_d49b], a + xor a + ld [rIF], a + pop af + ld [rIE], a + call Func_0f3d + call Func_e8f3b + pop af + ld [wUpdateSpritesEnabled], a + ret + +Func_e8df4: ; e8df4 + ld hl, String_e8e1f + call PrintText + ret + +Func_e8dfb: ; e8dfb + call Func_e8f16 +.asm_e8dfe + call JoypadLowSensitivity + call Func_e8eca + jr c, .asm_e8e1d + ld a, [wOverworldMap] + bit 7, a + jr nz, .asm_e8e1b + call Func_e87a8 + call Func_e8f51 + call Func_e8f82 + call DelayFrame + jr .asm_e8dfe + +.asm_e8e1b + and a + ret + +.asm_e8e1d + scf + ret + +String_e8e1f: ; e8e1f + TX_FAR _NoPokemonText + db "@" + +Func_e8e24: ; e8e24 + xor a + ld [hItemCounter], a + call Func_e8f24 + call Func_ea3ea + ld a, [rIE] + push af + xor a + ld [rIF], a + ld a, $09 + ld [rIE], a + call Func_e8783 + ld a, $13 + ld [$cae2], a + call Func_e8efc + call Func_e8f16 +.asm_e8e45 + call JoypadLowSensitivity + call Func_e8eca + jr c, .asm_e8e62 + ld a, [wOverworldMap] + bit 7, a + jr nz, .asm_e8e62 + call Func_e87a8 + call Func_e8f51 + call Func_e8f82 + call DelayFrame + jr .asm_e8e45 + +.asm_e8e62 + xor a + ld [wUnknownSerialFlag_d49a], a + ld [wUnknownSerialFlag_d49b], a + call Func_e8f09 + xor a + ld [rIF], a + pop af + ld [rIE], a + call Func_0f3d + call Func_e8f3b + ret + +Func_e8e79: ; e8e79 (3a:4e79) + push af + push bc + push de + push hl + call StopAllMusic + ld a, [rIE] + push af + xor a + ld [rIF], a + ld a, $09 + ld [rIE], a + call Func_e8783 + ld a, $13 + ld [$cae2], a + ld a, $1 + ld [H_AUTOBGTRANSFERENABLED], a + call Func_e8efc + call Func_ea573 +.asm_e8e9c + ld a, [wOverworldMap] + bit 7, a + jr nz, .asm_e8eae + call Func_ea5d1 + call Func_ea5b7 + call DelayFrame + jr .asm_e8e9c + +.asm_e8eae + xor a + ld [wUnknownSerialFlag_d49a], a + ld [wUnknownSerialFlag_d49b], a + ld hl, wOAMBuffer + 32 * 4 + ld bc, $0020 + xor a + call FillMemory + xor a + ld [rIF], a + pop af + ld [rIE], a + pop hl + pop de + pop bc + pop af + ret + +Func_e8eca: ; e8eca (3a:4eca) + ld a, [hJoyHeld] + and B_BUTTON + jr nz, .asm_e8ed2 + and a + ret + +.asm_e8ed2 + ld a, [wOverworldMap] + cp $0c + jr nz, .asm_e8ef6 +.asm_e8ed9 + ld a, [wUnknownSerialFlag_d49b] + and a + jr nz, .asm_e8ed9 + ld a, $16 + ld [wUnknownSerialFlag_d49b], a + ld a, $88 + ld [rSB], a + ld a, $01 + ld [rSC], a + ld a, $81 + ld [rSC], a +.asm_e8ef0 + ld a, [wUnknownSerialFlag_d49b] + and a + jr nz, .asm_e8ef0 +.asm_e8ef6 + ld a, $01 + ld [hItemCounter], a + scf + ret + +Func_e8efc: ; e8efc (3a:4efc) + dr $e8efc,$e8f09 +Func_e8f09: ; e8f09 (3a:4f09) + dr $e8f09,$e8f16 +Func_e8f16: ; e8f16 (3a:4f16) + dr $e8f16,$e8f24 +Func_e8f24: ; e8f24 (3a:4f24) + dr $e8f24,$e8f3b +Func_e8f3b: ; e8f3b (3a:4f3b) + dr $e8f3b,$e8f51 +Func_e8f51: ; e8f51 (3a:4f51) + dr $e8f51,$e8f82 +Func_e8f82: ; e8f82 (3a:4f82) + dr $e8f82,$e910a +Func_e910a: + dr $e910a,$e925d + +Func_e925d: +.asm_e925d + push bc + push hl +.asm_e925f + ld a, [de] + inc de + ld [hli], a + dec c + jr nz, .asm_e925f + pop hl + ld bc, SCREEN_WIDTH + add hl, bc + pop bc + dec b + jr nz, .asm_e925d + ret + +Func_e926f: + ld de, wd496 + coord hl, 7, 6 + ld a, [de] + call Func_e927a + ld a, [de] +Func_e927a: + ld c, a + swap a + and $f + add -10 + ld [hli], a + ld a, c + and $f + add -10 + ld [hli], a + dec de + ret + +SurfingPikachu2Graphics: INCBIN "gfx/surfing_pikachu_2.2bpp" + +Func_e988a: + xor a + ld [wBoxNumString], a + call ClearScreen + call Func_e99de + coord hl, 0, 0 + ld bc, 11 * SCREEN_WIDTH + ld a, " " + call FillMemory + call Func_e99b9 + call Func_e99a7 + coord hl, 4, 4 + ld de, String_e98db + call PlaceString + coord hl, 7, 6 + ld de, String_e98e8 + call PlaceString + coord hl, 11, 6 + ld a, [wCurrentBoxNum] + and $7f + cp 9 + jr c, .asm_e98cc + sub 9 + ld [hl], "1" + inc hl + add "0" + jr .asm_e98ce + +.asm_e98cc + add "1" +.asm_e98ce + ld [hl], a + coord hl, 4, 9 + ld de, wBoxSpecies + ld c, $03 + call Func_e994e + ret + + +String_e98db: db "POKéMON LIST@" +String_e98e8: db "BOX@" + +Func_e98ec: + call ClearScreen + call Func_e99de + call Func_e99b9 + ld a, [wBoxDataStart] + cp 4 + ret c + coord hl, 4, 0 + ld de, wBoxSpecies + 3 + ld c, 6 + call Func_e994e + ret + +Func_e9907: + call ClearScreen + call Func_e99de + call Func_e99b9 + ld a, [wBoxDataStart] + cp 10 + ret c + coord hl, 4, 0 + ld de, wBoxSpecies + 9 + ld c, 6 + call Func_e994e + ret + +Func_e9922: + call ClearScreen + call Func_e99de + call Func_e99b9 + coord hl, 0, 15 + call Func_e99cf + coord hl, 0, 16 + ld bc, 2 * SCREEN_WIDTH + ld a, " " + call FillMemory + ld a, [wBoxDataStart] + cp 16 + ret c + coord hl, 4, 0 + ld de, wBoxSpecies + 15 + ld c, 5 + call Func_e994e + ret + +Func_e994e: +.asm_e994e + ld a, c + and a + jr z, .asm_e99a6 + dec c + ld a, [de] + cp $ff + jr z, .asm_e99a6 + ld [$d11d], a + push bc + push hl + push de + push hl + ld bc, 12 + ld a, " " + call FillMemory + pop hl + push hl + ld de, SCREEN_WIDTH + add hl, de + ld bc, 12 + ld a, " " + call FillMemory + pop hl + push hl + call GetMonName + pop hl + call PlaceString + push hl + ld hl, wBoxMonNicks + ld bc, NAME_LENGTH + ld a, [wBoxNumString] + call AddNTimes + ld e, l + ld d, h + pop hl + ld bc, SCREEN_WIDTH + 1 + add hl, bc + ld [hl], " " + inc hl + call PlaceString + ld hl, wBoxNumString + inc [hl] + pop de + pop hl + ld bc, 3 * SCREEN_WIDTH + add hl, bc + pop bc + inc de + jr .asm_e994e + +.asm_e99a6 + ret + +Func_e99a7: + coord hl, 0, 0 + ld a, $79 + ld [hli], a + ld a, $7a + ld c, SCREEN_WIDTH - 2 +.asm_e99b1 + ld [hli], a + dec c + jr nz, .asm_e99b1 + ld a, $7b + ld [hl], a + ret + +Func_e99b9: + coord hl, 0, 0 + ld de, SCREEN_WIDTH - 1 + ld c, SCREEN_HEIGHT +.asm_e99c1 + ld a, $7c + ld [hl], a + add hl, de + ld a, $7c + ld [hli], a + dec c + jr nz, .asm_e99c1 + ret + +Func_e99cc: + coord hl, 0, 17 +Func_e99cf: + ld a, $7d + ld [hli], a + ld a, $7a + ld c, SCREEN_WIDTH - 2 +.asm_e99b1 + ld [hli], a + dec c + jr nz, .asm_e99b1 + ld a, $7e + ld [hl], a + ret + +Func_e99de: + coord hl, 4, 0 + ld c, 6 + call Func_e99eb + coord hl, 6, 1 + ld c, 6 +Func_e99eb: +.asm_e99eb + push bc + push hl + ld de, String_e99fd + call PlaceString + pop hl + ld bc, 3 * SCREEN_WIDTH + add hl, bc + pop bc + dec c + jr nz, .asm_e99eb + ret + +String_e99fd: + db "----------@" diff --git a/engine/unknown_ea3ea.asm b/engine/unknown_ea3ea.asm new file mode 100755 index 00000000..c00785b4 --- /dev/null +++ b/engine/unknown_ea3ea.asm @@ -0,0 +1,972 @@ +Func_ea3ea: ; ea3ea (3a:63ea) + call GBPalWhiteOutWithDelay3 + call ClearScreen + call LoadHpBarAndStatusTilePatterns + ld de, GFX_ea563 + ld hl, vChars2 + $710 + lb bc, BANK(GFX_ea563), (GFX_ea563End - GFX_ea563) / 8 + call CopyVideoDataDouble + + ld de, GFX_ea56b + ld hl, vChars2 + $6e0 + lb bc, BANK(GFX_ea56b), (GFX_ea56bEnd - GFX_ea56b) / 8 + call CopyVideoDataDouble + + xor a + ld [H_AUTOBGTRANSFERENABLED], a + xor a + ld [wWhichTradeMonSelectionMenu], a + call LoadMonData + + ld hl, wTileMap + lb bc, $10, $12 + call TextBoxBorder + + coord hl, 0, 12 + lb bc, $04, $12 + call TextBoxBorder + + coord hl, 3, 10 + call PrintLevelFull + + coord hl, 2, 10 + ld a, $6e + ld [hli], a + ld [hl], " " + + coord hl, 2, 11 + ld [hl], "′" + + coord hl, 4, 11 + ld de, wLoadedMonMaxHP + lb bc, 2, 3 + call PrintNumber + + ld a, [wMonHeader] + ld [wPokeBallAnimData], a + ld [wd0b5], a + ld hl, wPartyMonNicks + call Func_ea511 + coord hl, 8, 2 + call PlaceString + + call GetMonName + coord hl, 9, 3 + call PlaceString + + predef IndexToPokedex + coord hl, 2, 8 + ld [hl], "№" + inc hl + ld [hl], $f2 + inc hl + ld de, wPokeBallAnimData + lb bc, $80 | 1, 3 + call PrintNumber + + coord hl, 8, 4 + ld de, String_ea52f + call PlaceString + + ld hl, wPartyMonOT + call Func_ea511 + coord hl, 9, 5 + call PlaceString + + coord hl, 9, 6 + ld de, String_ea533 + call PlaceString + + coord hl, 13, 6 + ld de, wLoadedMonOTID + lb bc, $80 | 2, 5 + call PrintNumber + + coord hl, 9, 8 + ld de, String_ea537 + ld a, [hFlags_0xFFFA] + set 2, a + ld [hFlags_0xFFFA], a + call PlaceString + ld a, [hFlags_0xFFFA] + res 2, a + ld [hFlags_0xFFFA], a + + coord hl, 16, 8 + ld de, wLoadedMonAttack + ld a, 4 +.loop + push af + push de + + push hl + lb bc, 2, 3 + call PrintNumber + pop hl + ld bc, SCREEN_WIDTH + add hl, bc + + pop de + inc de + inc de + pop af + dec a + jr nz, .loop + + coord hl, 1, 13 + ld a, [wLoadedMonMoves] + call Func_ea51d + + coord hl, 1, 14 + ld a, [wLoadedMonMoves + 1] + call Func_ea51d + + coord hl, 1, 15 + ld a, [wLoadedMonMoves + 2] + call Func_ea51d + + coord hl, 1, 16 + ld a, [wLoadedMonMoves + 3] + call Func_ea51d + + ld b, $04 ; SET_PAL_STATUS_SCREEN + call RunPaletteCommand + + ld a, $01 + ld [H_AUTOBGTRANSFERENABLED], a + call Delay3 + call GBPalNormal + coord hl, 1, 1 + call LoadFlippedFrontSpriteByMonIndex + ret + +Func_ea511: ; ea511 (3a:6511) + ld bc, NAME_LENGTH + ld a, [wWhichPokemon] + call AddNTimes + ld e, l + ld d, h + ret + +Func_ea51d: ; ea51d (3a:651d) + and a + jr z, .asm_e6528 + ld [wPokeBallAnimData], a + call GetMoveName + jr .asm_ea52b + +.asm_e6528 + ld de, String_ea554 +.asm_ea52b + call PlaceString + ret +; ea52f + +String_ea52f: + db "OT/@" +; ea533 + +String_ea533: + db $73, "№/@" +; ea537 + +String_ea537: + db "ATTACK" + next "DEFENSE" + next "SPEED" + next "SPECIAL@" +; ea554 + +String_ea554: ; ea554 (3a:6554) + db "--------------@" + +GFX_ea563: ; ea563 (3a:6563) +INCBIN "gfx/stats_screen_hp.1bpp" +GFX_ea563End: ; ea56b (3a:656b) + +GFX_ea56b: +INCBIN "gfx/stats_screen_lv.1bpp" +GFX_ea56bEnd: ; ea573 (3a:6573) + +Func_ea573: ; ea573 (3a:6573) + ld hl, vChars1 + $7e0 + ld de, GFX_ea597 + lb bc, BANK(GFX_ea597), (GFX_ea597End - GFX_ea597) / 16 + call CopyVideoData + + ld hl, wOAMBuffer + 32 * 4 + ld a, $08 + ld c, $08 +.loop + ld [hl], $10 + inc hl + ld [hl], a + inc hl + ld [hl], $fe + inc hl + ld [hl], $00 + inc hl + add $08 + dec c + jr nz, .loop + ret + +GFX_ea597: ; ea597 (3a:6597) +INCBIN "gfx/zero_one_ea597.2bpp" +GFX_ea597End: + +Func_ea5b7: ; ea5b7 (3a:65b7) + ld hl, wOAMBuffer + 32 * 4 + 2 + ld de, 4 + ld a, [$c971] + ld c, 8 +.asm_ea5c2 + sla a + jr c, .asm_ea5ca + ld [hl], $fe + jr .asm_ea5cc + +.asm_ea5ca + ld [hl], $ff +.asm_ea5cc + add hl, de + dec c + jr nz, .asm_ea5c2 + ret + +Func_ea5d1: ; ea5d1 (3a:65d1) + ld a, [wOverworldMap] + ld e, a + ld d, 0 + ld hl, Jumptable_ea5e0 + add hl, de + add hl, de + ld a, [hli] + ld h, [hl] + ld l, a + jp [hl] + +Jumptable_ea5e0: + dw Func_ea623 + dw Func_ea6d2 + dw Func_ea6af + dw Func_ea645 + dw Func_ea701 + dw Func_ea6bd + dw Func_ea671 + dw Func_ea701 + dw Func_ea6af + dw Func_ea68a + dw Func_ea701 + dw Func_ea6af + dw Func_ea721 + dw Func_ea610 + dw Func_ea61a + dw Func_ea6af + dw Func_ea61e + dw Func_ea72f + dw Func_ea732 + + +Func_ea606: ; ea606 (3a:6606) + ld hl, wOverworldMap + inc [hl] + ret + +Func_ea60b: ; ea60b (3a:660b) + ld hl, wOverworldMap + dec [hl] + ret + +Func_ea610: ; ea610 (3a:6610) + xor a + ld [$c971], a + ld hl, wOverworldMap + set 7, [hl] + ret + +Func_ea61a: ; ea61a (3a:661a) + call Func_ea606 + ret + +Func_ea61e: ; ea61e (3a:661e) + xor a + ld [wOverworldMap], a + ret + +Func_ea623: ; ea623 (3a:6623) + call Func_ea784 + ld hl, Data_ea9de + call Func_ea76b + xor a + ld [$c976], a + ld [$c977], a + ld a, [$caf4] + ld [$c6e9], a + call Func_ea606 + call Func_ea74c + ld a, $01 + ld [$cae0], a + ret + +Func_ea645: ; ea645 (3a:6645) + call Func_ea784 + ld hl, $c6e9 + ld a, [hl] + and a + jr z, Func_ea671 + ld hl, Data_ea9ea + call Func_ea76b + call Func_ea7e9 + ld a, $80 + ld [$c976], a + ld a, $02 + ld [$c977], a + call Func_ea7a2 + call Func_ea606 + call Func_ea74c + ld a, $02 + ld [$cae0], a + ret + +Func_ea671: ; ea671 (3a:6671) + ld a, $06 + ld [wOverworldMap], a + ld hl, Data_ea9f0 + call Func_ea76b + xor a + ld [$c976], a + ld [$c977], a + call Func_ea606 + call Func_ea74c + ret + +Func_ea68a: ; ea68a (3a:668a) + call Func_ea784 + ld hl, Data_ea9e4 + call Func_ea76b + call Func_ea7d2 + ld a, $04 + ld [$c976], a + ld a, $00 + ld [$c977], a + call Func_ea7a2 + call Func_ea606 + call Func_ea74c + ld a, $03 + ld [$cae0], a + ret + +Func_ea6af: ; ea6af (3a:66af) + ld hl, $c973 + inc [hl] + ld a, [hl] + cp a, $06 + ret c + xor a + ld [hl], a + call Func_ea606 + ret + +Func_ea6bd: ; ea6bd (3a:66bd) + ld hl, $c973 + inc [hl] + ld a, [hl] + cp 6 + ret c + xor a + ld [hl], a + ld hl, $c6e9 + dec [hl] + call Func_ea60b + call Func_ea60b + ret + +Func_ea6d2: ; ea6d2 (3a:66d2) + call Func_ea742 + ret c + ld a, [$c970] + cp a, $ff + jr nz, .asm_ea6e4 + ld a, [$c971] + cp a, $ff + jr z, .asm_ea6fb +.asm_ea6e4 + ld a, [$c970] + cp a, $81 + jr nz, .asm_ea6fb + ld a, [$c971] + cp a, $00 + jr nz, .asm_ea6fb + ld hl, wUnknownSerialFlag_d49a + set 1, [hl] + call Func_ea606 + ret + +.asm_ea6fb + ld a, $0e + ld [wOverworldMap], a + ret + +Func_ea701: ; ea701 (3a:6701) + call Func_ea742 + ret c + ld a, [$c971] + and $f0 + jr nz, .asm_ea71b + ld a, [$c971] + and $01 + jr nz, .asm_ea717 + call Func_ea606 + ret + +.asm_ea717 + call Func_ea60b + ret + +.asm_ea71b + ld a, $11 + ld [wOverworldMap], a + ret + +Func_ea721: ; ea721 (3a:6721) + call Func_ea742 + ret c + ld a, [$c971] + and $f3 + ret nz + call Func_ea606 + ret + +Func_ea72f: ; ea72f (3a:672f) + call Func_ea606 +Func_ea732: ; ea732 (3a:6732) + ld a, [wUnknownSerialFlag_d49b] + and a + ret nz + ld a, [$c971] + and $f0 + ret nz + xor a + ld [wOverworldMap], a + ret + +Func_ea742: ; ea742 (3a:6742) + ld a, [wUnknownSerialFlag_d49b] + and a + jr nz, .asm_ea74a + and a + ret + +.asm_ea74a + scf + ret + +Func_ea74c: ; ea74c (3a:674c) +.asm_ea74c + ld a, [wUnknownSerialFlag_d49b] + and a + jr nz, .asm_ea74c + ld a, $01 + ld [wUnknownSerialFlag_d49b], a + xor a + ld [$c974], a + ld [$c975], a + ld a, $88 + ld [rSB], a + ld a, $01 + ld [rSC], a + ld a, $81 + ld [rSC], a + ret + +Func_ea76b: ; ea76b (3a:676b) + ld a, [hli] + ld [$c6ea], a + ld a, [hli] + ld [$c6eb], a + ld a, [hli] + ld [$c6ec], a + ld a, [hli] + ld [$c6ed], a + ld a, [hli] + ld [$c6ee], a + ld a, [hl] + ld [$c6ef], a + ret + +Func_ea784: ; ea784 (3a:6784) + xor a + ld hl, $c6ea + ld [hli], a + ld [hli], a + ld [hli], a + ld [hl], a + ld hl, $c6ee + ld [hli], a + ld [hl], a + xor a + ld [$c976], a + ld [$c977], a + ld hl, $c6f0 + ld bc, $280 + call FillMemory + ret + +Func_ea7a2: ; ea7a2 (3a:67a2) + ld hl, $0000 + ld bc, $0004 + ld de, $c6ea + call Func_ea7c5 + ld a, [$c976] + ld c, a + ld a, [$c977] + ld b, a + ld de, $c6f0 + call Func_ea7c5 + ld a, l + ld [$c6ee], a + ld a, h + ld [$c6ef], a + ret + +Func_ea7c5: ; ea7c5 (3a:67c5) +.asm_ea7c5 + ld a, [de] + inc de + add l + jr nc, .asm_ea7cb + inc h +.asm_ea7cb + ld l, a + dec bc + ld a, c + or b + jr nz, .asm_ea7c5 + ret + +Func_ea7d2: ; ea7d2 (3a:67d2) + ld a, $01 + ld [$c6f0], a + ld a, [$cae2] + ld [$c6f1], a + ld a, $e4 + ld [$c6f2], a + ld a, [$cae3] + ld [$c6f3], a + ret + +Func_ea7e9: ; ea7e9 (3a:67e9) + ld a, [$c6e9] + ld b, a + ld a, [$caf4] + sub b + ld hl, $c978 + ld de, $0028 +.asm_ea7f7 + and a + jr z, .asm_ea7fe + add hl, de + dec a + jr .asm_ea7f7 + +.asm_ea7fe + ld e, l + ld d, h + ld hl, $c6f0 + ld c, $28 +.asm_ea805 + ld a, [de] + inc de + push bc + push de + push hl + swap a + ld d, a + and $f0 + ld e, a + ld a, d + and $0f + ld d, a + and $08 + ld a, d + jr nz, .asm_ea81d + or $90 + jr .asm_ea81f + +.asm_ea81d + or $80 +.asm_ea81f + ld d, a + lb bc, $3a, $01 + call CopyVideoData + pop hl + ld de, $0010 + add hl, de + pop de + pop bc + dec c + jr nz, .asm_ea805 + call Func_ea834 + ret + +Func_ea834: ; ea834 (3a:6834) + ld hl, $cbdc + ld bc, $0020 + xor a + call FillMemory + ld hl, $c300 + ld c, $28 +.asm_ea843 + push bc + push hl + call Func_ea860 + jr nc, .asm_ea856 + call Func_ea886 + call Func_ea8a1 + call Func_ea902 + call Func_ea999 +.asm_ea856 + pop hl + inc hl + inc hl + inc hl + inc hl + pop bc + dec c + jr nz, .asm_ea843 + ret + +Func_ea860: ; ea860 (3a:6860) + ld a, [$c6e9] + ld b, a + ld a, [$caf4] + sub b + ld c, a + ld b, $10 +.asm_ea86b + ld a, c + and a + jr z, .asm_ea876 + ld a, b + add $10 + ld b, a + dec c + jr .asm_ea86b + +.asm_ea876 + ld a, b + ld e, a + add $10 + ld d, a + ld a, [hl] + cp e + jr c, .asm_ea884 + cp d + jr nc, .asm_ea884 + scf + ret + +.asm_ea884 + and a + ret + +Func_ea886: ; ea886 (3a:6886) + push hl + inc hl + inc hl + ld a, [hl] + swap a + ld d, a + and $f0 + ld e, a + ld a, d + and $0f + or $80 + ld d, a + ld hl, $cbdc + lb bc, $3a, $01 + call CopyVideoData + pop hl + ret + +Func_ea8a1: ; ea8a1 (3a:68a1) + push hl + inc hl + inc hl + inc hl + ld a, [hl] + call Func_ea8ab + pop hl + ret + +Func_ea8ab: ; ea8ab (3a:68ab) + and $60 + swap a + ld e, a + ld d, 0 + ld hl, Jumptable_ea8ba + add hl, de + ld a, [hli] + ld h, [hl] + ld l, a + jp [hl] + +Jumptable_ea8ba: ; ea8ba (3a:68ba) + dw Func_ea8c2 + dw Func_ea8c3 + dw Func_ea8c7 + dw Func_ea8cb + +Func_ea8c2: ; ea8c2 (3a:68c2) + ret + +Func_ea8c3: ; ea8c3 (3a:68c3) + call Func_ea8d2 + ret + +Func_ea8c7: ; ea8c7 (3a:68c7) + call Func_ea8e8 + ret + +Func_ea8cb: ; ea8cb (3a:68cb) + call Func_ea8d2 + call Func_ea8e8 + ret + +Func_ea8d2: ; ea8d2 (3a:68d2) + ld hl, $cbdc + ld c, 16 +.asm_ea8d7 + ld d, [hl] + ld a, 0 + ld b, 8 +.asm_ea8dc + sla d + rr a + dec b + jr nz, .asm_ea8dc + ld [hli], a + dec c + jr nz, .asm_ea8d7 + ret + +Func_ea8e8: ; ea8e8 (3a:68e8) + ld hl, $cbdc + ld de, $cbea + ld c, $04 +.asm_ea8f0 + ld b, [hl] + ld a, [de] + ld [hli], a + ld a, b + ld [de], a + inc de + ld b, [hl] + ld a, [de] + ld [hli], a + ld a, b + ld [de], a + dec de + dec de + dec de + dec c + jr nz, .asm_ea8f0 + ret + +Func_ea902: ; ea902 (3a:6902) + push hl + ld hl, $cbdc + ld de, $cbec + ld a, $08 +.asm_ea90b + push af + ld bc, $0000 + ld a, $08 +.asm_ea911 + push af + xor a + rlc [hl] + rl a + inc hl + rlc [hl] + rl a + dec hl + push hl + push de + call Func_ea936 + pop de + pop hl + pop af + dec a + jr nz, .asm_ea911 + inc hl + inc hl + ld a, b + ld [de], a + inc de + ld a, c + ld [de], a + inc de + pop af + dec a + jr nz, .asm_ea90b + pop hl + ret + +Func_ea936 ; ea936 (3a:6936) + call Func_ea93d + call Func_ea96d + ret + +Func_ea93d: ; ea93d (3a:693d) + ld e, a + ld d, 0 + ld hl, Jumptable_ea949 + add hl, de + add hl, de + ld a, [hli] + ld h, [hl] + ld l, a + jp [hl] + +Jumptable_ea949: ; ea949 (3a:6949) + dw Func_ea951 + dw Func_ea95f + dw Func_ea956 + dw Func_ea966 + +Func_ea951: ; ea951 (3a:6951) + ld a, [rOBP0] + and $03 + ret + +Func_ea956: ; ea956 (3a:6956) + ld a, [rOBP0] + and $0c + srl a + srl a + ret + +Func_ea95f: ; ea95f (3a:695f) + ld a, [rOBP0] + and $30 + swap a + ret + +Func_ea966: ; ea966 (3a:6966) + ld a, [rOBP0] + and $c0 + rlca + rlca + ret + +Func_ea96d: ; ea96d (3a:696d) + ld e, a + ld d, 0 + ld hl, Jumptable_ea979 + add hl, de + add hl, de + ld a, [hli] + ld h, [hl] + ld l, a + jp [hl] + +Jumptable_ea979: ; ea979 (3a:6979) + dw Func_ea981 + dw Func_ea986 + dw Func_ea98c + dw Func_ea992 + +Func_ea981: ; ea981 (3a:6981) + sla b + sla c + ret + +Func_ea986: ; ea986 (3a:6986) + scf + rl b + sla c + ret + +Func_ea98c: ; ea98c (3a:698c) + sla b + scf + rl c + ret + +Func_ea992: ; ea992 (3a:6992) + scf + rl b + scf + rl c + ret + +Func_ea999: ; ea999 (3a:6999) + push hl + ld a, [hli] + ld c, [hl] + and $08 + jr nz, .asm_ea9a5 + ld hl, $c6f0 + jr .asm_ea9a8 + +.asm_ea9a5 + ld hl, $c830 +.asm_ea9a8 + ld b, $00 + ld a, c + and $f8 + sub $08 + ld c, a + sla c + rl b + add hl, bc + ld e, l + ld d, h + ld hl, $cbec + ld c, $08 +.asm_ea9bc + call Func_ea9d0 + ld a, [de] + and b + or [hl] + ld [de], a + inc hl + inc de + ld a, [de] + and b + or [hl] + ld [de], a + inc hl + inc de + dec c + jr nz, .asm_ea9bc + pop hl + ret + +Func_ea9d0: ; ea9d0 (3a:69d0) + push hl + push de + ld de, $fff0 + add hl, de + ld a, [hli] + or [hl] + xor $ff + ld b, a + pop de + pop hl + ret + +Data_ea9de: ; ea9de + db $01, $00, $00, $00, $01, $00 +Data_ea9e4: ; ea9e4 + db $02, $00, $04, $00, $00, $00 +Data_ea9ea: ; ea9ea + db $04, $00, $80, $02, $00, $00 +Data_ea9f0: ; ea9f0 + db $04, $00, $00, $00, $04, $00 +Data_ea9f6: ; ea9f6 + db $08, $00, $00, $00, $08, $00 +Data_ea9fc: ; ea9fc + db $0f, $00, $00, $00, $0f, $00 diff --git a/gfx/stats_screen_hp.png b/gfx/stats_screen_hp.png Binary files differnew file mode 100644 index 00000000..adf086ca --- /dev/null +++ b/gfx/stats_screen_hp.png diff --git a/gfx/stats_screen_lv.png b/gfx/stats_screen_lv.png Binary files differnew file mode 100644 index 00000000..0d5c6620 --- /dev/null +++ b/gfx/stats_screen_lv.png diff --git a/gfx/unknown_ea563.png b/gfx/unknown_ea563.png Binary files differnew file mode 100644 index 00000000..adf086ca --- /dev/null +++ b/gfx/unknown_ea563.png diff --git a/gfx/zero_one_ea597.png b/gfx/zero_one_ea597.png Binary files differnew file mode 100644 index 00000000..0c11b9da --- /dev/null +++ b/gfx/zero_one_ea597.png @@ -2447,7 +2447,7 @@ RunNPCMovementScript:: ; 30ae (0:30ae) ret .NPCMovementScriptPointerTables - dw ProfOakMovementScriptPointerTable + dw PalletMovementScriptPointerTable dw PewterMuseumGuyMovementScriptPointerTable dw PewterGymGuyMovementScriptPointerTable .playerStepOutFromDoor @@ -5044,3 +5044,5 @@ TextPredefs:: ; 3f67 (0:3f67) ; add_tx_pre BookOrSculptureText ; 40 ; add_tx_pre ElevatorText ; 41 ; add_tx_pre PokemonStuffText ; 42 +; add_tx_pre $7a9b ; 43 +; add_tx_pre $7ad3 ; 44 diff --git a/home/audio.asm b/home/audio.asm index f65a8485..c0dd7b8f 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -69,7 +69,7 @@ PlayDefaultMusicCommon:: ; 2118 (0:2118) CheckForNoBikingMusicMap:: ; 21c8 (0:21c8) ; probably used to not change music upon getting on bike - ld a,[wCurMap] + ld a, [wCurMap] cp ROUTE_23 jr z, .found cp VICTORY_ROAD_1 @@ -87,7 +87,7 @@ CheckForNoBikingMusicMap:: ; 21c8 (0:21c8) ret UpdateMusic6Times:: ; 21e3 (0:21e3) - ld c,$6 + ld c, $6 .loop push bc push hl @@ -138,16 +138,16 @@ PlayMusic:: ; 2211 (0:2211) Func_2223:: ; 2223 (0:2223) xor a - ld [wChannelSoundIDs + CH4],a - ld [wChannelSoundIDs + CH5],a - ld [wChannelSoundIDs + CH6],a - ld [wChannelSoundIDs + CH7],a - ld [rNR10],a + ld [wChannelSoundIDs + CH4], a + ld [wChannelSoundIDs + CH5], a + ld [wChannelSoundIDs + CH6], a + ld [wChannelSoundIDs + CH7], a + ld [rNR10], a ret StopAllMusic:: ; 2233 (0:2233) - ld a,$FF - ld [wNewSoundID],a + ld a, $FF + ld [wNewSoundID], a ; plays music specified by a. If value is $ff, music is stopped PlaySound:: ; 2238 (0:2238) push hl @@ -181,14 +181,15 @@ PlaySound:: ; 2238 (0:2238) ld [wNewSoundID], a call DetermineAudioFunction jr .done + .fadeOut - ld a,b - ld [wLastMusicSoundID],a - ld a,[wAudioFadeOutControl] - ld [wAudioFadeOutCounterReloadValue],a - ld [wAudioFadeOutCounter],a - ld a,b - ld [wAudioFadeOutControl],a + ld a, b + ld [wLastMusicSoundID], a + ld a, [wAudioFadeOutControl] + ld [wAudioFadeOutCounterReloadValue], a + ld [wAudioFadeOutCounter], a + ld a, b + ld [wAudioFadeOutControl], a .done pop bc pop de @@ -196,29 +197,29 @@ PlaySound:: ; 2238 (0:2238) ret GetNextMusicByte:: ; 2288 (0:2288) - ld a,[H_LOADEDROMBANK] + ld a, [H_LOADEDROMBANK] push af ld a, [wAudioROMBank] call BankswitchCommon - ld d,$0 - ld a,c + ld d, $0 + ld a, c add a - ld e,a - ld hl,wChannelCommandPointers - add hl,de - ld a,[hli] - ld e,a - ld a,[hld] - ld d,a - ld a,[de] + ld e, a + ld hl, wChannelCommandPointers + add hl, de + ld a, [hli] + ld e, a + ld a, [hld] + ld d, a + ld a, [de] inc de - ld [hl],e + ld [hl], e inc hl - ld [hl],d - ld e,a + ld [hl], d + ld e, a pop af call BankswitchCommon - ld a,e + ld a, e ret InitMusicVariables:: ; 22aa (0:22aa) @@ -252,9 +253,9 @@ StopAllAudio:: ; 22d6 (0:22d6) ret DetermineAudioFunction:: ; 22ec (0:22ec) - ld a,[H_LOADEDROMBANK] + ld a, [H_LOADEDROMBANK] push af - ld a,[wAudioROMBank] + ld a, [wAudioROMBank] call BankswitchCommon ; determine the audio function, based on the bank cp BANK(Audio1_PlaySound) @@ -283,7 +284,7 @@ DetermineAudioFunction:: ; 22ec (0:22ec) .bank20 ; invalid banks will default to XX:6bd4 ; this is seen when encountering Missingno, as its sprite dimensions overflow to wAudioROMBank - ld a,b + ld a, b call Audio4_PlaySound .done pop af @@ -286,6 +286,8 @@ TX_ASM: MACRO db $08 ENDM +TX_SFX_ITEM EQUS "db $0b" + ; Predef macro. add_predef: MACRO \1Predef:: @@ -40,7 +40,7 @@ INCLUDE "engine/cable_club.asm" INCLUDE "engine/menu/main_menu.asm" INCLUDE "engine/oak_speech.asm" INCLUDE "engine/overworld/special_warps.asm" - + INCLUDE "data/special_warps.asm" INCLUDE "engine/debug1.asm" @@ -66,7 +66,7 @@ INCLUDE "engine/battle/moveEffects/drain_hp_effect.asm" INCLUDE "engine/menu/players_pc.asm" INCLUDE "engine/remove_pokemon.asm" INCLUDE "engine/display_pokedex.asm" - + SECTION "bank03",ROMX,BANK[$03] INCLUDE "engine/joypad.asm" @@ -231,27 +231,58 @@ INCLUDE "engine/battle/moveEffects/substitute_effect.asm" INCLUDE "engine/menu/pc.asm" SECTION "bank06",ROMX,BANK[$06] - dr $18000,$1a4ea -PlayerStepOutFromDoor: ; 1a4ea (6:64ea) - dr $1a4ea,$1a527 -_EndNPCMovementScript: ; 1a527 (6:6527) - dr $1a527,$1a54c -ProfOakMovementScriptPointerTable: ; 1a54c (6:654c) - dr $1a54c,$1a622 -PewterMuseumGuyMovementScriptPointerTable: ; 1a622 (6:6622) - dr $1a622,$1a685 -PewterGymGuyMovementScriptPointerTable: ; 1a685 (6:6685) - dr $1a685,$1a785 -IsPlayerStandingOnDoorTile: ; 1a785 (6:6785) - dr $1a785,$1a7f4 -HandleLedges: ; 1a7f4 (6:67f4) - dr $1a7f4,$1c000 + + dr $18000,$18dee ; headers, objects, blocks +; INCLUDE "data/mapHeaders/celadoncity.asm" +; INCLUDE "data/mapObjects/celadoncity.asm" +; CeladonCityBlocks: INCBIN "maps/celadoncity.blk" + +; INCLUDE "data/mapHeaders/pallettown.asm" +; INCLUDE "data/mapObjects/pallettown.asm" +; PalletTownBlocks: INCBIN "maps/pallettown.blk" + +; INCLUDE "data/mapHeaders/viridiancity.asm" +; INCLUDE "data/mapObjects/viridiancity.asm" +; ViridianCityBlocks: INCBIN "maps/viridiancity.blk" + +; INCLUDE "data/mapHeaders/pewtercity.asm" +; INCLUDE "data/mapObjects/pewtercity.asm" +; PewterCityBlocks: INCBIN "maps/pewtercity.blk" + +; INCLUDE "data/mapHeaders/ceruleancity.asm" +; INCLUDE "data/mapObjects/ceruleancity.asm" +; CeruleanCityBlocks: INCBIN "maps/ceruleancity.blk" + +; INCLUDE "data/mapHeaders/vermilioncity.asm" +; INCLUDE "data/mapObjects/vermilioncity.asm" +; VermilionCityBlocks: INCBIN "maps/vermilioncity.blk" + +; INCLUDE "data/mapHeaders/fuchsiacity.asm" +; INCLUDE "data/mapObjects/fuchsiacity.asm" +; FuchsiaCityBlocks: INCBIN "maps/fuchsiacity.blk" + + dr $18dee,$1a4ea ; map scripts + +; INCLUDE "scripts/pallettown.asm" +; INCLUDE "scripts/viridiancity.asm" +; INCLUDE "scripts/pewtercity.asm" +; INCLUDE "scripts/ceruleancity.asm" +; INCLUDE "scripts/vermilioncity.asm" +; INCLUDE "scripts/celadoncity.asm" +; INCLUDE "scripts/fuchsiacity.asm" + +INCLUDE "engine/overworld/npc_movement.asm" +INCLUDE "engine/overworld/doors.asm" +INCLUDE "engine/overworld/ledges.asm" SECTION "bank07",ROMX,BANK[$07] - dr $1c000,$1c21e -DoClearSaveDialogue: ; 1c21e (7:421e) - dr $1c21e,$1e2ae + dr $1c000,$1c21e ; headers, objects, blocks + +INCLUDE "engine/clear_save.asm" +INCLUDE "engine/predefs7.asm" + + dr $1c2c2,$1e2ae ; map scripts OpenOaksPC: ; 1e2ae (7:62ae) dr $1e2ae,$1e321 SafariZoneCheck: ; 1e321 (7:6e21) @@ -481,7 +512,7 @@ Func_2fd6a: ; 2fd6a (b:7d6a) ld a, $3 ld [wd431], a ret - + INCLUDE "engine/battle/scale_sprites.asm" INCLUDE "engine/game_corner_slots2.asm" @@ -620,7 +651,7 @@ TradingAnimationGraphics: INCBIN "gfx/game_boy.norepeat.2bpp" INCBIN "gfx/link_cable.2bpp" TradingAnimationGraphicsEnd: - + TradingAnimationGraphics2: ; Pokeball traveling through the link cable. INCBIN "gfx/trade2.2bpp" @@ -652,12 +683,12 @@ INCLUDE "engine/pokedex_rating.asm" dr $44251,$45077 LoadSpinnerArrowTiles: ; 45077 (11:5077) dr $45077,$46bf3 - + INCLUDE "engine/overworld/dungeon_warps.asm" SECTION "bank12",ROMX,BANK[$12] - dr $48000,$4c000 + dr $48000,$4a540 SECTION "bank13",ROMX,BANK[$13] @@ -711,20 +742,18 @@ AgathaPic: INCBIN "pic/trainer/agatha.pic" LancePic: INCBIN "pic/trainer/lance.pic" JessieJamesPic: INCBIN "pic/ytrainer/jessiejames.pic" - dr $4fe79,$50000 + dr $4fe79,$4ff1a SECTION "bank14",ROMX,BANK[$14] dr $50000,$525d8 - INCLUDE "engine/overworld/card_key.asm" INCLUDE "engine/menu/prize_menu.asm" INCLUDE "engine/hidden_object_functions14.asm" - SECTION "bank15",ROMX,BANK[$15] dr $54000,$5525f @@ -746,19 +775,19 @@ CalcLevelFromExperience: ; 58d99 (16:4d99) CalcExperience: ; 58dc0 (16:4dc0) dr $58dc0,$58e8b PrintStatusAilment: ; 58e8b (16:4e8b) - dr $58e8b,$5c000 + dr $58e8b,$5a555 SECTION "bank17",ROMX,BANK[$17] dr $5c000,$5da70 EvolveMon: ; 5da70 (17:5a70) - dr $5da70,$60000 + dr $5da70,$5df60 SECTION "bank18",ROMX,BANK[$18] - dr $60000,$64000 + dr $60000,$62702 SECTION "bank19",ROMX,BANK[$19] @@ -768,7 +797,7 @@ Overworld_GFX: SECTION "bank1A",ROMX,BANK[$1A] - dr $68000,$6c000 + dr $68000,$6bff1 SECTION "bank1B",ROMX,BANK[$1B] @@ -811,7 +840,7 @@ HiddenItemNear: ; 7405c (1d:405c) VendingMachineMenu: ; 74726 (1d:4726) dr $74726,$75dfe PKMNLeaguePC: ; 75dfe (1d:5dfe) - dr $75dfe,$78000 + dr $75dfe,$76177 SECTION "bank1E",ROMX,BANK[$1E] @@ -820,7 +849,7 @@ INCLUDE "engine/battle/animations.asm" INCLUDE "engine/overworld/cut2.asm" INCLUDE "engine/overworld/ssanne.asm" - + RedFishingTilesFront: INCBIN "gfx/red_fishing_tile_front.2bpp" RedFishingTilesBack: INCBIN "gfx/red_fishing_tile_back.2bpp" RedFishingTilesSide: INCBIN "gfx/red_fishing_tile_side.2bpp" @@ -846,32 +875,59 @@ SECTION "bank30",ROMX,BANK[$30] SECTION "bank39",ROMX,BANK[$39] - dr $e4000,$e8000 + dr $e4000,$e7ea3 SECTION "bank3A",ROMX,BANK[$3A] -MonsterNames: ; e8000 (3a:4000) - dr $e8000,$e876c +INCLUDE "text/monster_names.asm" IsPlayerJustOutsideMap: ; e876c (3a:476c) - dr $e876c,$e8a5e -Func_e8a5e: ; e8a5e (3a:4a5e) - dr $e8a5e,$e8b74 -Func_e8b74: ; e8b74 (3a:4b74) - dr $e8b74,$e8d35 -Func_e8d35:: ; e8d35 (3a:4d35) - dr $e8d35,$e8e79 -Func_e8e79: ; e8e79 (3a:4e79) - dr $e8e79,$e928a -SurfingPikachu2Graphics: INCBIN "gfx/surfing_pikachu_2.2bpp" - dr $e988a,$e9a08 -_DisplayDiploma: ; e9a08 (3a:5a08) - dr $e9a08,$e9bfa + ld a, [wYCoord] + ld b, a + ld a, [wCurMapHeight] + call Func_e877e + ret z + ld a, [wXCoord] + ld b, a + ld a, [wCurMapWidth] +Func_e877e: + add a + cp b + ret z + inc b + ret + +INCLUDE "engine/printer.asm" +INCLUDE "engine/diploma_3a.asm" SurfingPikachu3Graphics: INCBIN "gfx/surfing_pikachu_3.t1.2bpp" +SurfingPikachu3GraphicsEnd: + +INCLUDE "engine/unknown_ea3ea.asm" - dr $ea3ea,$eaa02 FreezeEnemyTrainerSprite: ; eaa02 (3a:6a02) - dr $eaa02,$ec000 + ld a, [wCurMap] + cp POKEMONTOWER_7 + ret z ; the Rockets on Pokemon Tower 7F leave after battling, so don't freeze them + ld hl, RivalIDs + ld a, [wEngagedTrainerClass] + ld b, a +.loop + ld a, [hli] + cp $ff + jr z, .notRival + cp b + ret z ; the rival leaves after battling, so don't freeze him + jr .loop +.notRival + ld a, [wSpriteIndex] + ld [H_SPRITEINDEX], a + jp SetSpriteMovementBytesToFF + +RivalIDs: ; eaa20 (3a:6a20) + db OPP_SONY1 + db OPP_SONY2 + db OPP_SONY3 + db $ff SECTION "bank3C",ROMX,BANK[$3C] diff --git a/text/monster_names.asm b/text/monster_names.asm index c7e0226f..3262ec02 100755 --- a/text/monster_names.asm +++ b/text/monster_names.asm @@ -1,4 +1,4 @@ -MonsterNames: ; 1c21e (7:421e) +MonsterNames: ; e8000 (3a:4000) db "RHYDON@@@@" db "KANGASKHAN" db "NIDORAN♂@@" @@ -2536,7 +2536,7 @@ wd47a:: ds 1 ds 24 -wPreventBlackout:: ds 1 +wPreventBlackout:: ds 1 ; d492 ds 1 @@ -3026,7 +3026,10 @@ wFlags_D733:: ; d733 wBeatLorelei:: ; d734 ; bit 1: set when you beat Lorelei and reset in Indigo Plateau lobby ; the game uses this to tell when Elite 4 events need to be reset - ds 2 + ds 1 + +wd735:: ; d735 + ds 1 wd736:: ; d736 ; bit 0: check if the player is standing on a door and make him walk down a step if so |
