diff options
| author | IIMarckus <iimarckus@gmail.com> | 2019-08-15 22:48:45 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2019-08-15 22:48:45 -0600 |
| commit | f150c1ab60c11570aabc5fd9633a00e7155ec4fe (patch) | |
| tree | 48d1a20f22b5963e8343ca821c426e06b07b4625 | |
| parent | f783e73aeb96e1b69383a59ccaf5aa744ea0ab8c (diff) | |
Sync sfx with pokecrystal, and add to the build.
| -rw-r--r-- | audio/sfx.asm | 4757 | ||||
| -rw-r--r-- | main.asm | 3 |
2 files changed, 2055 insertions, 2705 deletions
diff --git a/audio/sfx.asm b/audio/sfx.asm index b292a899..e1cfff37 100644 --- a/audio/sfx.asm +++ b/audio/sfx.asm @@ -1,500 +1,394 @@ -Sfx_PokeballsPlacedOnTable: ; f0941 - dbw $04, Sfx_PokeballsPlacedOnTable_Ch5 -; f0944 - -Sfx_BallWiggle: ; f0944 - dbw $04, Sfx_BallWiggle_Ch5 -; f0947 - -Sfx_Potion: ; f0947 - dbw $04, Sfx_Potion_Ch5 -; f094a - -Sfx_FullHeal: ; f094a - dbw $04, Sfx_FullHeal_Ch5 -; f094d - -Sfx_Menu: ; f094d - dbw $07, Sfx_Menu_Ch8 -; f0950 - -Sfx_ReadText2: ; f0950 -Sfx_ReadText: ; f0950 - dbw $04, Sfx_ReadText2_Ch5 -; f0953 - -Sfx_Poison: ; f0953 - dbw $04, Sfx_Poison_Ch5 -; f0956 - -Sfx_GotSafariBalls: ; f0956 - dbw $04, Sfx_GotSafariBalls_Ch5 -; f0959 - -Sfx_BootPc: ; f0959 - dbw $04, Sfx_BootPc_Ch5 -; f095c - -Sfx_ShutDownPc: ; f095c - dbw $04, Sfx_ShutDownPc_Ch5 -; f095f - -Sfx_ChoosePcOption: ; f095f - dbw $04, Sfx_ChoosePcOption_Ch5 -; f0962 - -Sfx_EscapeRope: ; f0962 - dbw $04, Sfx_EscapeRope_Ch5 -; f0965 - -Sfx_PushButton: ; f0965 - dbw $04, Sfx_PushButton_Ch5 -; f0968 - -Sfx_SecondPartOfItemfinder: ; f0968 - dbw $04, Sfx_SecondPartOfItemfinder_Ch5 -; f096b - -Sfx_WarpTo: ; f096b - dbw $04, Sfx_WarpTo_Ch5 -; f096e - -Sfx_WarpFrom: ; f096e - dbw $04, Sfx_WarpFrom_Ch5 -; f0971 - -Sfx_ChangeDexMode: ; f0971 - dbw $04, Sfx_ChangeDexMode_Ch5 -; f0974 - -Sfx_JumpOverLedge: ; f0974 - dbw $04, Sfx_JumpOverLedge_Ch5 -; f0977 - -Sfx_GrassRustle: ; f0977 - dbw $07, Sfx_GrassRustle_Ch8 -; f097a - -Sfx_Fly: ; f097a - dbw $07, Sfx_Fly_Ch8 -; f097d - -Sfx_Wrong: ; f097d - dbw $44, Sfx_Wrong_Ch5 - dbw $05, Sfx_Wrong_Ch6 -; f0983 - -Sfx_Squeak: ; f0983 - dbw $04, Sfx_Squeak_Ch5 -; f0986 - -Sfx_Strength: ; f0986 - dbw $07, Sfx_Strength_Ch8 -; f0989 - -Sfx_Boat: ; f0989 - dbw $44, Sfx_Boat_Ch5 - dbw $05, Sfx_Boat_Ch6 -; f098f - -Sfx_WallOpen: ; f098f - dbw $04, Sfx_WallOpen_Ch5 -; f0992 - -Sfx_PlacePuzzlePieceDown: ; f0992 - dbw $07, Sfx_PlacePuzzlePieceDown_Ch8 -; f0995 - -Sfx_EnterDoor: ; f0995 - dbw $07, Sfx_EnterDoor_Ch8 -; f0998 - -Sfx_SwitchPokemon: ; f0998 - dbw $44, Sfx_SwitchPokemon_Ch5 - dbw $05, Sfx_SwitchPokemon_Ch6 -; f099e - -Sfx_Tally: ; f099e - dbw $44, Sfx_Tally_Ch5 - dbw $05, Sfx_Tally_Ch6 -; f09a4 - -Sfx_Transaction: ; f09a4 - dbw $44, Sfx_Transaction_Ch5 - dbw $05, Sfx_Transaction_Ch6 -; f09aa - -Sfx_Bump: ; f09aa - dbw $04, Sfx_Bump_Ch5 -; f09ad - -Sfx_ExitBuilding: ; f09ad - dbw $07, Sfx_ExitBuilding_Ch8 -; f09b0 - -Sfx_Save: ; f09b0 - dbw $44, Sfx_Save_Ch5 - dbw $05, Sfx_Save_Ch6 -; f09b6 - -Sfx_Save_Ch5: ; f09b6 +Sfx_PokeballsPlacedOnTable: + musicheader 1, 5, Sfx_PokeballsPlacedOnTable_Ch5 + +Sfx_BallWobble: + musicheader 1, 5, Sfx_BallWobble_Ch5 + +Sfx_Potion: + musicheader 1, 5, Sfx_Potion_Ch5 + +Sfx_FullHeal: + musicheader 1, 5, Sfx_FullHeal_Ch5 + +Sfx_Menu: + musicheader 1, 8, Sfx_Menu_Ch8 + +Sfx_ReadText2: +Sfx_ReadText: + musicheader 1, 5, Sfx_ReadText2_Ch5 + +Sfx_Poison: + musicheader 1, 5, Sfx_Poison_Ch5 + +Sfx_GotSafariBalls: + musicheader 1, 5, Sfx_GotSafariBalls_Ch5 + +Sfx_BootPc: + musicheader 1, 5, Sfx_BootPc_Ch5 + +Sfx_ShutDownPc: + musicheader 1, 5, Sfx_ShutDownPc_Ch5 + +Sfx_ChoosePcOption: + musicheader 1, 5, Sfx_ChoosePcOption_Ch5 + +Sfx_EscapeRope: + musicheader 1, 5, Sfx_EscapeRope_Ch5 + +Sfx_PushButton: + musicheader 1, 5, Sfx_PushButton_Ch5 + +Sfx_SecondPartOfItemfinder: + musicheader 1, 5, Sfx_SecondPartOfItemfinder_Ch5 + +Sfx_WarpTo: + musicheader 1, 5, Sfx_WarpTo_Ch5 + +Sfx_WarpFrom: + musicheader 1, 5, Sfx_WarpFrom_Ch5 + +Sfx_ChangeDexMode: + musicheader 1, 5, Sfx_ChangeDexMode_Ch5 + +Sfx_JumpOverLedge: + musicheader 1, 5, Sfx_JumpOverLedge_Ch5 + +Sfx_GrassRustle: + musicheader 1, 8, Sfx_GrassRustle_Ch8 + +Sfx_Fly: + musicheader 1, 8, Sfx_Fly_Ch8 + +Sfx_Wrong: + musicheader 2, 5, Sfx_Wrong_Ch5 + musicheader 1, 6, Sfx_Wrong_Ch6 + +Sfx_Squeak: + musicheader 1, 5, Sfx_Squeak_Ch5 + +Sfx_Strength: + musicheader 1, 8, Sfx_Strength_Ch8 + +Sfx_Boat: + musicheader 2, 5, Sfx_Boat_Ch5 + musicheader 1, 6, Sfx_Boat_Ch6 + +Sfx_WallOpen: + musicheader 1, 5, Sfx_WallOpen_Ch5 + +Sfx_PlacePuzzlePieceDown: + musicheader 1, 8, Sfx_PlacePuzzlePieceDown_Ch8 + +Sfx_EnterDoor: + musicheader 1, 8, Sfx_EnterDoor_Ch8 + +Sfx_SwitchPokemon: + musicheader 2, 5, Sfx_SwitchPokemon_Ch5 + musicheader 1, 6, Sfx_SwitchPokemon_Ch6 + +Sfx_Tally: + musicheader 2, 5, Sfx_Tally_Ch5 + musicheader 1, 6, Sfx_Tally_Ch6 + +Sfx_Transaction: + musicheader 2, 5, Sfx_Transaction_Ch5 + musicheader 1, 6, Sfx_Transaction_Ch6 + +Sfx_Bump: + musicheader 1, 5, Sfx_Bump_Ch5 + +Sfx_ExitBuilding: + musicheader 1, 8, Sfx_ExitBuilding_Ch8 + +Sfx_Save: + musicheader 2, 5, Sfx_Save_Ch5 + musicheader 1, 6, Sfx_Save_Ch6 + +Sfx_Save_Ch5: dutycycle $2 - sound $2, $f1, $0700 - sound $1, $e1, $0600 - sound $1, $e1, $0680 - sound $1, $e1, $06c0 - sound $2, $e1, $0700 - sound $2, $e1, $07c0 - sound $f, $f2, $07e0 + sound __, 3, $f1, $0700 + sound __, 2, $e1, $0600 + sound __, 2, $e1, $0680 + sound __, 2, $e1, $06c0 + sound __, 3, $e1, $0700 + sound __, 3, $e1, $07c0 + sound __, 16, $f2, $07e0 endchannel -; f09d5 -Sfx_Save_Ch6: ; f09d5 +Sfx_Save_Ch6: dutycycle $2 - sound $2, $8, $0000 - sound $2, $a1, $0701 - sound $1, $91, $0601 - sound $1, $91, $0681 - sound $1, $91, $06c1 - sound $2, $91, $0701 - sound $2, $91, $07c1 - sound $f, $d2, $07e1 - endchannel -; f09f8 - -Sfx_Pokeflute: ; f09f8 - dbw $06, Sfx_Pokeflute_Ch7 -; f09fb - -Sfx_ElevatorEnd: ; f09fb - dbw $04, Sfx_ElevatorEnd_Ch5 -; f09fe - -Sfx_ThrowBall: ; f09fe - dbw $44, Sfx_ThrowBall_Ch5 - dbw $05, Sfx_ThrowBall_Ch6 -; f0a04 - -Sfx_BallPoof: ; f0a04 - dbw $44, Sfx_BallPoof_Ch5 - dbw $07, Sfx_BallPoof_Ch8 -; f0a0a - -Sfx_Unknown3A: ; f0a0a - dbw $44, Sfx_Unknown3A_Ch5 - dbw $07, Sfx_Unknown3A_Ch8 -; f0a10 - -Sfx_Run: ; f0a10 - dbw $07, Sfx_Run_Ch8 -; f0a13 - -Sfx_SlotMachineStart: ; f0a13 - dbw $44, Sfx_SlotMachineStart_Ch5 - dbw $05, Sfx_SlotMachineStart_Ch6 -; f0a19 - -Sfx_Call: ; f0a19 - dbw $04, Sfx_Call_Ch5 -; f0a1c - -Sfx_Unknown60: ; f0a1c - dbw $07, Sfx_Unknown60_Ch8 -; f0a1f - -Sfx_Unknown61: ; f0a1f - dbw $07, Sfx_Unknown61_Ch8 -; f0a22 - -Sfx_Unknown62: ; f0a22 - dbw $07, Sfx_Unknown62_Ch8 -; f0a25 - -Sfx_Unknown63: ; f0a25 - dbw $07, Sfx_Unknown63_Ch8 -; f0a28 - -Sfx_Burn: ; f0a28 - dbw $07, Sfx_Burn_Ch8 -; f0a2b - -Sfx_TitleScreenEntrance: ; f0a2b - dbw $07, Sfx_TitleScreenEntrance_Ch8 -; f0a2e - -Sfx_Unknown66: ; f0a2e - dbw $04, Sfx_Unknown66_Ch5 -; f0a31 - -Sfx_GetCoinFromSlots: ; f0a31 - dbw $04, Sfx_GetCoinFromSlots_Ch5 -; f0a34 - -Sfx_PayDay: ; f0a34 - dbw $44, Sfx_PayDay_Ch5 - dbw $05, Sfx_PayDay_Ch6 -; f0a3a - -Sfx_Metronome: ; f0a3a - dbw $04, Sfx_Metronome_Ch5 -; f0a3d - -Sfx_Peck: ; f0a3d - dbw $07, Sfx_Peck_Ch8 -; f0a40 - -Sfx_Kinesis: ; f0a40 - dbw $04, Sfx_Kinesis_Ch5 -; f0a43 - -Sfx_Lick: ; f0a43 - dbw $04, Sfx_Lick_Ch5 -; f0a46 - -Sfx_Pound: ; f0a46 - dbw $07, Sfx_Pound_Ch8 -; f0a49 - -Sfx_MovePuzzlePiece: ; f0a49 - dbw $07, Sfx_MovePuzzlePiece_Ch8 -; f0a4c - -Sfx_CometPunch: ; f0a4c - dbw $07, Sfx_CometPunch_Ch8 -; f0a4f - -Sfx_MegaPunch: ; f0a4f - dbw $07, Sfx_MegaPunch_Ch8 -; f0a52 - -Sfx_Scratch: ; f0a52 - dbw $07, Sfx_Scratch_Ch8 -; f0a55 - -Sfx_Vicegrip: ; f0a55 - dbw $07, Sfx_Vicegrip_Ch8 -; f0a58 - -Sfx_RazorWind: ; f0a58 - dbw $07, Sfx_RazorWind_Ch8 -; f0a5b - -Sfx_Cut: ; f0a5b - dbw $07, Sfx_Cut_Ch8 -; f0a5e - -Sfx_WingAttack: ; f0a5e - dbw $07, Sfx_WingAttack_Ch8 -; f0a61 - -Sfx_Whirlwind: ; f0a61 - dbw $07, Sfx_Whirlwind_Ch8 -; f0a64 - -Sfx_Bind: ; f0a64 - dbw $07, Sfx_Bind_Ch8 -; f0a67 - -Sfx_VineWhip: ; f0a67 - dbw $07, Sfx_VineWhip_Ch8 -; f0a6a - -Sfx_DoubleKick: ; f0a6a - dbw $07, Sfx_DoubleKick_Ch8 -; f0a6d - -Sfx_MegaKick: ; f0a6d - dbw $07, Sfx_MegaKick_Ch8 -; f0a70 - -Sfx_Headbutt: ; f0a70 - dbw $07, Sfx_Headbutt_Ch8 -; f0a73 - -Sfx_HornAttack: ; f0a73 - dbw $07, Sfx_HornAttack_Ch8 -; f0a76 - -Sfx_Tackle: ; f0a76 - dbw $07, Sfx_Tackle_Ch8 -; f0a79 - -Sfx_PoisonSting: ; f0a79 - dbw $07, Sfx_PoisonSting_Ch8 -; f0a7c - -Sfx_Powder: ; f0a7c - dbw $07, Sfx_Powder_Ch8 -; f0a7f - -Sfx_Doubleslap: ; f0a7f - dbw $07, Sfx_Doubleslap_Ch8 -; f0a82 - -Sfx_Bite: ; f0a82 - dbw $44, Sfx_Bite_Ch5 - dbw $07, Sfx_Bite_Ch8 -; f0a88 - -Sfx_JumpKick: ; f0a88 - dbw $07, Sfx_JumpKick_Ch8 -; f0a8b - -Sfx_Stomp: ; f0a8b - dbw $07, Sfx_Stomp_Ch8 -; f0a8e - -Sfx_TailWhip: ; f0a8e - dbw $07, Sfx_TailWhip_Ch8 -; f0a91 - -Sfx_KarateChop: ; f0a91 - dbw $07, Sfx_KarateChop_Ch8 -; f0a94 - -Sfx_Submission: ; f0a94 - dbw $07, Sfx_Submission_Ch8 -; f0a97 - -Sfx_WaterGun: ; f0a97 - dbw $44, Sfx_WaterGun_Ch5 - dbw $07, Sfx_WaterGun_Ch8 -; f0a9d - -Sfx_SwordsDance: ; f0a9d - dbw $07, Sfx_SwordsDance_Ch8 -; f0aa0 - -Sfx_Thunder: ; f0aa0 - dbw $07, Sfx_Thunder_Ch8 -; f0aa3 - -Sfx_Supersonic: ; f0aa3 - dbw $84, Sfx_Supersonic_Ch5 - dbw $05, Sfx_Supersonic_Ch6 - dbw $07, Sfx_Supersonic_Ch8 -; f0aac - -Sfx_Leer: ; f0aac - dbw $84, Sfx_Leer_Ch5 - dbw $05, Sfx_Leer_Ch6 - dbw $07, Sfx_Leer_Ch8 -; f0ab5 - -Sfx_Ember: ; f0ab5 - dbw $44, Sfx_Ember_Ch5 - dbw $07, Sfx_Ember_Ch8 -; f0abb - -Sfx_Bubblebeam: ; f0abb - dbw $84, Sfx_Bubblebeam_Ch5 - dbw $05, Sfx_Bubblebeam_Ch6 - dbw $07, Sfx_Bubblebeam_Ch8 -; f0ac4 - -Sfx_HydroPump: ; f0ac4 - dbw $44, Sfx_HydroPump_Ch5 - dbw $07, Sfx_HydroPump_Ch8 -; f0aca - -Sfx_Surf: ; f0aca - dbw $84, Sfx_Surf_Ch5 - dbw $05, Sfx_Surf_Ch6 - dbw $07, Sfx_Surf_Ch8 -; f0ad3 - -Sfx_Psybeam: ; f0ad3 - dbw $84, Sfx_Psybeam_Ch5 - dbw $05, Sfx_Psybeam_Ch6 - dbw $07, Sfx_Psybeam_Ch8 -; f0adc - -Sfx_Charge: ; f0adc - dbw $84, Sfx_Charge_Ch5 - dbw $05, Sfx_Charge_Ch6 - dbw $07, Sfx_Charge_Ch8 -; f0ae5 - -Sfx_Thundershock: ; f0ae5 - dbw $84, Sfx_Thundershock_Ch5 - dbw $05, Sfx_Thundershock_Ch6 - dbw $07, Sfx_Thundershock_Ch8 -; f0aee - -Sfx_Psychic: ; f0aee - dbw $84, Sfx_Psychic_Ch5 - dbw $05, Sfx_Psychic_Ch6 - dbw $07, Sfx_Psychic_Ch8 -; f0af7 - -Sfx_Screech: ; f0af7 - dbw $44, Sfx_Screech_Ch5 - dbw $05, Sfx_Screech_Ch6 -; f0afd - -Sfx_BoneClub: ; f0afd - dbw $44, Sfx_BoneClub_Ch5 - dbw $05, Sfx_BoneClub_Ch6 -; f0b03 - -Sfx_Sharpen: ; f0b03 - dbw $44, Sfx_Sharpen_Ch5 - dbw $05, Sfx_Sharpen_Ch6 -; f0b09 - -Sfx_EggBomb: ; f0b09 - dbw $84, Sfx_EggBomb_Ch5 - dbw $05, Sfx_EggBomb_Ch6 - dbw $07, Sfx_EggBomb_Ch8 -; f0b12 - -Sfx_Sing: ; f0b12 - dbw $44, Sfx_Sing_Ch5 - dbw $05, Sfx_Sing_Ch6 -; f0b18 - -Sfx_HyperBeam: ; f0b18 - dbw $84, Sfx_HyperBeam_Ch5 - dbw $05, Sfx_HyperBeam_Ch6 - dbw $07, Sfx_HyperBeam_Ch8 -; f0b21 - -Sfx_Shine: ; f0b21 - dbw $04, Sfx_Shine_Ch5 -; f0b24 - -Sfx_Unknown5F: ; f0b24 - dbw $84, Sfx_Unknown5F_Ch5 - dbw $05, Sfx_Unknown5F_Ch6 -Sfx_Sandstorm: ; f0b2a - dbw $07, Sfx_Sandstorm_Ch8 -; f0b2d - -Sfx_HangUp: ; f0b2d - dbw $04, Sfx_HangUp_Ch5 -; f0b30 - -Sfx_NoSignal: ; f0b30 - dbw $04, Sfx_NoSignal_Ch5 -; f0b33 - -Sfx_Elevator: ; f0b33 - dbw $c4, Sfx_Elevator_Ch5 - dbw $05, Sfx_Elevator_Ch6 - dbw $06, Sfx_Elevator_Ch7 - dbw $07, Sfx_Elevator_Ch8 -; f0b3f - -Sfx_DexFanfare5079: ; f0b3f -Sfx_LevelUp: ; f0b3f - dbw $c4, Sfx_DexFanfare5079_Ch5 - dbw $05, Sfx_DexFanfare5079_Ch6 - dbw $06, Sfx_DexFanfare5079_Ch7 - dbw $07, Sfx_DexFanfare5079_Ch8 -; f0b4b - -Sfx_DexFanfare5079_Ch5: ; f0b4b -Sfx_LevelUp_Ch5: ; f0b4b + sound __, 3, $8, 0 + sound __, 3, $a1, $0701 + sound __, 2, $91, $0601 + sound __, 2, $91, $0681 + sound __, 2, $91, $06c1 + sound __, 3, $91, $0701 + sound __, 3, $91, $07c1 + sound __, 16, $d2, $07e1 + endchannel + +Sfx_Pokeflute: + musicheader 1, 7, Sfx_Pokeflute_Ch7 + +Sfx_ElevatorEnd: + musicheader 1, 5, Sfx_ElevatorEnd_Ch5 + +Sfx_ThrowBall: + musicheader 2, 5, Sfx_ThrowBall_Ch5 + musicheader 1, 6, Sfx_ThrowBall_Ch6 + +Sfx_BallPoof: + musicheader 2, 5, Sfx_BallPoof_Ch5 + musicheader 1, 8, Sfx_BallPoof_Ch8 + +Sfx_Unknown3A: + musicheader 2, 5, Sfx_Unknown3A_Ch5 + musicheader 1, 8, Sfx_Unknown3A_Ch8 + +Sfx_Run: + musicheader 1, 8, Sfx_Run_Ch8 + +Sfx_SlotMachineStart: + musicheader 2, 5, Sfx_SlotMachineStart_Ch5 + musicheader 1, 6, Sfx_SlotMachineStart_Ch6 + +Sfx_Call: + musicheader 1, 5, Sfx_Call_Ch5 + +Sfx_Unknown60: + musicheader 1, 8, Sfx_Unknown60_Ch8 + +Sfx_Unknown61: + musicheader 1, 8, Sfx_Unknown61_Ch8 + +Sfx_SwitchPockets: + musicheader 1, 8, Sfx_SwitchPockets_Ch8 + +Sfx_Unknown63: + musicheader 1, 8, Sfx_Unknown63_Ch8 + +Sfx_Burn: + musicheader 1, 8, Sfx_Burn_Ch8 + +Sfx_TitleScreenEntrance: + musicheader 1, 8, Sfx_TitleScreenEntrance_Ch8 + +Sfx_Unknown66: + musicheader 1, 5, Sfx_Unknown66_Ch5 + +Sfx_GetCoinFromSlots: + musicheader 1, 5, Sfx_GetCoinFromSlots_Ch5 + +Sfx_PayDay: + musicheader 2, 5, Sfx_PayDay_Ch5 + musicheader 1, 6, Sfx_PayDay_Ch6 + +Sfx_Metronome: + musicheader 1, 5, Sfx_Metronome_Ch5 + +Sfx_Peck: + musicheader 1, 8, Sfx_Peck_Ch8 + +Sfx_Kinesis: + musicheader 1, 5, Sfx_Kinesis_Ch5 + +Sfx_Lick: + musicheader 1, 5, Sfx_Lick_Ch5 + +Sfx_Pound: + musicheader 1, 8, Sfx_Pound_Ch8 + +Sfx_MovePuzzlePiece: + musicheader 1, 8, Sfx_MovePuzzlePiece_Ch8 + +Sfx_CometPunch: + musicheader 1, 8, Sfx_CometPunch_Ch8 + +Sfx_MegaPunch: + musicheader 1, 8, Sfx_MegaPunch_Ch8 + +Sfx_Scratch: + musicheader 1, 8, Sfx_Scratch_Ch8 + +Sfx_Vicegrip: + musicheader 1, 8, Sfx_Vicegrip_Ch8 + +Sfx_RazorWind: + musicheader 1, 8, Sfx_RazorWind_Ch8 + +Sfx_Cut: + musicheader 1, 8, Sfx_Cut_Ch8 + +Sfx_WingAttack: + musicheader 1, 8, Sfx_WingAttack_Ch8 + +Sfx_Whirlwind: + musicheader 1, 8, Sfx_Whirlwind_Ch8 + +Sfx_Bind: + musicheader 1, 8, Sfx_Bind_Ch8 + +Sfx_VineWhip: + musicheader 1, 8, Sfx_VineWhip_Ch8 + +Sfx_DoubleKick: + musicheader 1, 8, Sfx_DoubleKick_Ch8 + +Sfx_MegaKick: + musicheader 1, 8, Sfx_MegaKick_Ch8 + +Sfx_Headbutt: + musicheader 1, 8, Sfx_Headbutt_Ch8 + +Sfx_HornAttack: + musicheader 1, 8, Sfx_HornAttack_Ch8 + +Sfx_Tackle: + musicheader 1, 8, Sfx_Tackle_Ch8 + +Sfx_PoisonSting: + musicheader 1, 8, Sfx_PoisonSting_Ch8 + +Sfx_Powder: + musicheader 1, 8, Sfx_Powder_Ch8 + +Sfx_Doubleslap: + musicheader 1, 8, Sfx_Doubleslap_Ch8 + +Sfx_Bite: + musicheader 2, 5, Sfx_Bite_Ch5 + musicheader 1, 8, Sfx_Bite_Ch8 + +Sfx_JumpKick: + musicheader 1, 8, Sfx_JumpKick_Ch8 + +Sfx_Stomp: + musicheader 1, 8, Sfx_Stomp_Ch8 + +Sfx_TailWhip: + musicheader 1, 8, Sfx_TailWhip_Ch8 + +Sfx_KarateChop: + musicheader 1, 8, Sfx_KarateChop_Ch8 + +Sfx_Submission: + musicheader 1, 8, Sfx_Submission_Ch8 + +Sfx_WaterGun: + musicheader 2, 5, Sfx_WaterGun_Ch5 + musicheader 1, 8, Sfx_WaterGun_Ch8 + +Sfx_SwordsDance: + musicheader 1, 8, Sfx_SwordsDance_Ch8 + +Sfx_Thunder: + musicheader 1, 8, Sfx_Thunder_Ch8 + +Sfx_Supersonic: + musicheader 3, 5, Sfx_Supersonic_Ch5 + musicheader 1, 6, Sfx_Supersonic_Ch6 + musicheader 1, 8, Sfx_Supersonic_Ch8 + +Sfx_Leer: + musicheader 3, 5, Sfx_Leer_Ch5 + musicheader 1, 6, Sfx_Leer_Ch6 + musicheader 1, 8, Sfx_Leer_Ch8 + +Sfx_Ember: + musicheader 2, 5, Sfx_Ember_Ch5 + musicheader 1, 8, Sfx_Ember_Ch8 + +Sfx_Bubblebeam: + musicheader 3, 5, Sfx_Bubblebeam_Ch5 + musicheader 1, 6, Sfx_Bubblebeam_Ch6 + musicheader 1, 8, Sfx_Bubblebeam_Ch8 + +Sfx_HydroPump: + musicheader 2, 5, Sfx_HydroPump_Ch5 + musicheader 1, 8, Sfx_HydroPump_Ch8 + +Sfx_Surf: + musicheader 3, 5, Sfx_Surf_Ch5 + musicheader 1, 6, Sfx_Surf_Ch6 + musicheader 1, 8, Sfx_Surf_Ch8 + +Sfx_Psybeam: + musicheader 3, 5, Sfx_Psybeam_Ch5 + musicheader 1, 6, Sfx_Psybeam_Ch6 + musicheader 1, 8, Sfx_Psybeam_Ch8 + +Sfx_Charge: + musicheader 3, 5, Sfx_Charge_Ch5 + musicheader 1, 6, Sfx_Charge_Ch6 + musicheader 1, 8, Sfx_Charge_Ch8 + +Sfx_Thundershock: + musicheader 3, 5, Sfx_Thundershock_Ch5 + musicheader 1, 6, Sfx_Thundershock_Ch6 + musicheader 1, 8, Sfx_Thundershock_Ch8 + +Sfx_Psychic: + musicheader 3, 5, Sfx_Psychic_Ch5 + musicheader 1, 6, Sfx_Psychic_Ch6 + musicheader 1, 8, Sfx_Psychic_Ch8 + +Sfx_Screech: + musicheader 2, 5, Sfx_Screech_Ch5 + musicheader 1, 6, Sfx_Screech_Ch6 + +Sfx_BoneClub: + musicheader 2, 5, Sfx_BoneClub_Ch5 + musicheader 1, 6, Sfx_BoneClub_Ch6 + +Sfx_Sharpen: + musicheader 2, 5, Sfx_Sharpen_Ch5 + musicheader 1, 6, Sfx_Sharpen_Ch6 + +Sfx_EggBomb: + musicheader 3, 5, Sfx_EggBomb_Ch5 + musicheader 1, 6, Sfx_EggBomb_Ch6 + musicheader 1, 8, Sfx_EggBomb_Ch8 + +Sfx_Sing: + musicheader 2, 5, Sfx_Sing_Ch5 + musicheader 1, 6, Sfx_Sing_Ch6 + +Sfx_HyperBeam: + musicheader 3, 5, Sfx_HyperBeam_Ch5 + musicheader 1, 6, Sfx_HyperBeam_Ch6 + musicheader 1, 8, Sfx_HyperBeam_Ch8 + +Sfx_Shine: + musicheader 1, 5, Sfx_Shine_Ch5 + +Sfx_Unknown5F: + musicheader 3, 5, Sfx_Unknown5F_Ch5 + musicheader 1, 6, Sfx_Unknown5F_Ch6 + +Sfx_Sandstorm: + musicheader 1, 8, Sfx_Sandstorm_Ch8 + +Sfx_HangUp: + musicheader 1, 5, Sfx_HangUp_Ch5 + +Sfx_NoSignal: + musicheader 1, 5, Sfx_NoSignal_Ch5 + +Sfx_Elevator: + musicheader 4, 5, Sfx_Elevator_Ch5 + musicheader 1, 6, Sfx_Elevator_Ch6 + musicheader 1, 7, Sfx_Elevator_Ch7 + musicheader 1, 8, Sfx_Elevator_Ch8 + +Sfx_DexFanfare5079: +Sfx_LevelUp: + musicheader 4, 5, Sfx_DexFanfare5079_Ch5 + musicheader 1, 6, Sfx_DexFanfare5079_Ch6 + musicheader 1, 7, Sfx_DexFanfare5079_Ch7 + musicheader 1, 8, Sfx_DexFanfare5079_Ch8 + +Sfx_DexFanfare5079_Ch5: +Sfx_LevelUp_Ch5: togglesfx tempo 120 volume $77 @@ -508,10 +402,9 @@ Sfx_LevelUp_Ch5: ; f0b4b octave 4 note G#, 12 endchannel -; f0b5f -Sfx_DexFanfare5079_Ch6: ; f0b5f -Sfx_LevelUp_Ch6: ; f0b5f +Sfx_DexFanfare5079_Ch6: +Sfx_LevelUp_Ch6: togglesfx dutycycle $2 notetype $8, $c1 @@ -522,10 +415,9 @@ Sfx_LevelUp_Ch6: ; f0b5f intensity $c3 note B_, 12 endchannel -; f0b6d -Sfx_DexFanfare5079_Ch7: ; f0b6d -Sfx_LevelUp_Ch7: ; f0b6d +Sfx_DexFanfare5079_Ch7: +Sfx_LevelUp_Ch7: togglesfx notetype $8, $25 octave 4 @@ -541,25 +433,22 @@ Sfx_LevelUp_Ch7: ; f0b6d note E_, 3 note __, 4 endchannel -; f0b7f -Sfx_DexFanfare5079_Ch8: ; f0b7f -Sfx_LevelUp_Ch8: ; f0b7f +Sfx_DexFanfare5079_Ch8: +Sfx_LevelUp_Ch8: togglesfx sfxtogglenoise $4 notetype $c note C_, 12 endchannel -; f0b86 -Sfx_KeyItem: ; f0b86 - dbw $c4, Sfx_KeyItem_Ch5 - dbw $05, Sfx_KeyItem_Ch6 - dbw $06, Sfx_KeyItem_Ch7 - dbw $07, Sfx_KeyItem_Ch8 -; f0b92 +Sfx_KeyItem: + musicheader 4, 5, Sfx_KeyItem_Ch5 + musicheader 1, 6, Sfx_KeyItem_Ch6 + musicheader 1, 7, Sfx_KeyItem_Ch7 + musicheader 1, 8, Sfx_KeyItem_Ch8 -Sfx_KeyItem_Ch5: ; f0b92 +Sfx_KeyItem_Ch5: togglesfx tempo 120 volume $77 @@ -575,9 +464,8 @@ Sfx_KeyItem_Ch5: ; f0b92 intensity $b3 note G#, 16 endchannel -; f0ba8 -Sfx_KeyItem_Ch6: ; f0ba8 +Sfx_KeyItem_Ch6: togglesfx dutycycle $2 notetype $6, $c1 @@ -590,9 +478,8 @@ Sfx_KeyItem_Ch6: ; f0ba8 intensity $c3 note B_, 16 endchannel -; f0bb8 -Sfx_KeyItem_Ch7: ; f0bb8 +Sfx_KeyItem_Ch7: togglesfx notetype $6, $25 octave 4 @@ -612,24 +499,21 @@ Sfx_KeyItem_Ch7: ; f0bb8 note E_, 4 note __, 4 endchannel -; f0bce -Sfx_KeyItem_Ch8: ; f0bce +Sfx_KeyItem_Ch8: togglesfx sfxtogglenoise $4 notetype $c note C_, 16 endchannel -; f0bd5 -Sfx_DexFanfare2049: ; f0bd5 - dbw $c4, Sfx_DexFanfare2049_Ch5 - dbw $05, Sfx_DexFanfare2049_Ch6 - dbw $06, Sfx_DexFanfare2049_Ch7 - dbw $07, Sfx_DexFanfare2049_Ch8 -; f0be1 +Sfx_DexFanfare2049: + musicheader 4, 5, Sfx_DexFanfare2049_Ch5 + musicheader 1, 6, Sfx_DexFanfare2049_Ch6 + musicheader 1, 7, Sfx_DexFanfare2049_Ch7 + musicheader 1, 8, Sfx_DexFanfare2049_Ch8 -Sfx_DexFanfare2049_Ch5: ; f0be1 +Sfx_DexFanfare2049_Ch5: togglesfx tempo 104 volume $77 @@ -653,9 +537,8 @@ Sfx_DexFanfare2049_Ch5: ; f0be1 note A_, 2 note __, 6 endchannel -; f0bfe -Sfx_DexFanfare2049_Ch6: ; f0bfe +Sfx_DexFanfare2049_Ch6: togglesfx dutycycle $2 notetype $c, $c1 @@ -674,9 +557,8 @@ Sfx_DexFanfare2049_Ch6: ; f0bfe note G_, 4 note F_, 8 endchannel -; f0c13 -Sfx_DexFanfare2049_Ch7: ; f0c13 +Sfx_DexFanfare2049_Ch7: togglesfx notetype $c, $25 octave 4 @@ -695,25 +577,22 @@ Sfx_DexFanfare2049_Ch7: ; f0c13 note F_, 2 note __, 6 endchannel -; f0c27 -Sfx_DexFanfare2049_Ch8: ; f0c27 +Sfx_DexFanfare2049_Ch8: togglesfx sfxtogglenoise $4 notetype $c note C_, 16 note __, 16 endchannel -; f0c2f -Sfx_Item: ; f0c2f - dbw $c4, Sfx_Item_Ch5 - dbw $05, Sfx_Item_Ch6 - dbw $06, Sfx_Item_Ch7 - dbw $07, Sfx_Item_Ch8 -; f0c3b +Sfx_Item: + musicheader 4, 5, Sfx_Item_Ch5 + musicheader 1, 6, Sfx_Item_Ch6 + musicheader 1, 7, Sfx_Item_Ch7 + musicheader 1, 8, Sfx_Item_Ch8 -Sfx_Item_Ch5: ; f0c3b +Sfx_Item_Ch5: togglesfx tempo 108 volume $77 @@ -731,9 +610,8 @@ Sfx_Item_Ch5: ; f0c3b note F_, 12 note __, 12 endchannel -; f0c54 -Sfx_Item_Ch6: ; f0c54 +Sfx_Item_Ch6: togglesfx vibrato $8, $27 dutycycle $2 @@ -749,9 +627,8 @@ Sfx_Item_Ch6: ; f0c54 note A_, 12 note __, 12 endchannel -; f0c68 -Sfx_Item_Ch7: ; f0c68 +Sfx_Item_Ch7: togglesfx notetype $8, $25 octave 4 @@ -774,25 +651,22 @@ Sfx_Item_Ch7: ; f0c68 note F_, 4 note __, 14 endchannel -; f0c81 -Sfx_Item_Ch8: ; f0c81 +Sfx_Item_Ch8: togglesfx sfxtogglenoise $4 notetype $c note C_, 16 note __, 16 endchannel -; f0c89 -Sfx_CaughtMon: ; f0c89 - dbw $c4, Sfx_CaughtMon_Ch5 - dbw $05, Sfx_CaughtMon_Ch6 - dbw $06, Sfx_CaughtMon_Ch7 - dbw $07, Sfx_CaughtMon_Ch8 -; f0c95 +Sfx_CaughtMon: + musicheader 4, 5, Sfx_CaughtMon_Ch5 + musicheader 1, 6, Sfx_CaughtMon_Ch6 + musicheader 1, 7, Sfx_CaughtMon_Ch7 + musicheader 1, 8, Sfx_CaughtMon_Ch8 -Sfx_CaughtMon_Ch5: ; f0c95 +Sfx_CaughtMon_Ch5: togglesfx tempo 112 volume $77 @@ -815,9 +689,8 @@ Sfx_CaughtMon_Ch5: ; f0c95 intensity $b3 note F_, 12 endchannel -; f0cb5 -Sfx_CaughtMon_Ch6: ; f0cb5 +Sfx_CaughtMon_Ch6: togglesfx dutycycle $2 vibrato $8, $27 @@ -836,9 +709,8 @@ Sfx_CaughtMon_Ch6: ; f0cb5 intensity $c3 note A_, 12 endchannel -; f0cce -Sfx_CaughtMon_Ch7: ; f0cce +Sfx_CaughtMon_Ch7: togglesfx notetype $8, $25 octave 3 @@ -856,25 +728,22 @@ Sfx_CaughtMon_Ch7: ; f0cce note A_, 3 note __, 3 endchannel -; f0ce2 -Sfx_CaughtMon_Ch8: ; f0ce2 +Sfx_CaughtMon_Ch8: togglesfx sfxtogglenoise $4 notetype $c note C_, 16 note __, 16 endchannel -; f0cea -Sfx_DexFanfare80109: ; f0cea - dbw $c4, Sfx_DexFanfare80109_Ch5 - dbw $05, Sfx_DexFanfare80109_Ch6 - dbw $06, Sfx_DexFanfare80109_Ch7 - dbw $07, Sfx_DexFanfare80109_Ch8 -; f0cf6 +Sfx_DexFanfare80109: + musicheader 4, 5, Sfx_DexFanfare80109_Ch5 + musicheader 1, 6, Sfx_DexFanfare80109_Ch6 + musicheader 1, 7, Sfx_DexFanfare80109_Ch7 + musicheader 1, 8, Sfx_DexFanfare80109_Ch8 -Sfx_DexFanfare80109_Ch5: ; f0cf6 +Sfx_DexFanfare80109_Ch5: togglesfx tempo 112 volume $77 @@ -899,9 +768,8 @@ Sfx_DexFanfare80109_Ch5: ; f0cf6 intensity $a5 note A#, 16 endchannel -; f0d17 -Sfx_DexFanfare80109_Ch6: ; f0d17 +Sfx_DexFanfare80109_Ch6: togglesfx vibrato $8, $27 dutycycle $2 @@ -923,9 +791,8 @@ Sfx_DexFanfare80109_Ch6: ; f0d17 octave 5 note D#, 16 endchannel -; f0d32 -Sfx_DexFanfare80109_Ch7: ; f0d32 +Sfx_DexFanfare80109_Ch7: togglesfx notetype $c, $25 octave 4 @@ -951,31 +818,27 @@ Sfx_DexFanfare80109_Ch7: ; f0d32 note D#, 3 note __, 9 endchannel -; f0d4e -Sfx_DexFanfare80109_Ch8: ; f0d4e +Sfx_DexFanfare80109_Ch8: togglesfx sfxtogglenoise $4 notetype $c note C_, 16 note __, 16 endchannel -; f0d56 -Sfx_Fanfare2: ; f0d56 - dbw $84, Sfx_Fanfare2_Ch5 - dbw $05, Sfx_Fanfare2_Ch6 - dbw $07, Sfx_Fanfare2_Ch8 -; f0d5f +Sfx_Fanfare2: + musicheader 3, 5, Sfx_Fanfare2_Ch5 + musicheader 1, 6, Sfx_Fanfare2_Ch6 + musicheader 1, 8, Sfx_Fanfare2_Ch8 -UnknownSfx: ; f0d5f - dbw $c4, UnknownSfx_Ch5 - dbw $05, UnknownSfx_Ch6 - dbw $06, UnknownSfx_Ch7 - dbw $07, UnknownSfx_Ch8 -; f0d6b +UnusedSfx: + musicheader 4, 5, UnusedSfx_Ch5 + musicheader 1, 6, UnusedSfx_Ch6 + musicheader 1, 7, UnusedSfx_Ch7 + musicheader 1, 8, UnusedSfx_Ch8 -UnknownSfx_Ch5: ; f0d6b +UnusedSfx_Ch5: togglesfx tempo 124 volume $77 @@ -998,9 +861,8 @@ UnknownSfx_Ch5: ; f0d6b intensity $a5 note F_, 16 endchannel -; f0d8a -UnknownSfx_Ch6: ; f0d8a +UnusedSfx_Ch6: togglesfx vibrato $8, $27 dutycycle $2 @@ -1023,9 +885,8 @@ UnknownSfx_Ch6: ; f0d8a intensity $b5 note A_, 16 endchannel -; f0da6 -UnknownSfx_Ch7: ; f0da6 +UnusedSfx_Ch7: togglesfx notetype $c, $25 octave 4 @@ -1039,31 +900,27 @@ UnknownSfx_Ch7: ; f0da6 note A_, 3 note __, 9 endchannel -; f0db6 -UnknownSfx_Ch8: ; f0db6 +UnusedSfx_Ch8: togglesfx sfxtogglenoise $4 notetype $c note C_, 16 note __, 16 endchannel -; f0dbe -Sfx_Fanfare: ; f0dbe - dbw $84, Sfx_Fanfare_Ch5 - dbw $05, Sfx_Fanfare_Ch6 - dbw $07, Sfx_Fanfare_Ch8 -; f0dc7 +Sfx_Fanfare: + musicheader 3, 5, Sfx_Fanfare_Ch5 + musicheader 1, 6, Sfx_Fanfare_Ch6 + musicheader 1, 8, Sfx_Fanfare_Ch8 -Sfx_RegisterPhoneNumber: ; f0dc7 - dbw $c4, Sfx_RegisterPhoneNumber_Ch5 - dbw $05, Sfx_RegisterPhoneNumber_Ch6 - dbw $06, Sfx_RegisterPhoneNumber_Ch7 - dbw $07, Sfx_RegisterPhoneNumber_Ch8 -; f0dd3 +Sfx_RegisterPhoneNumber: + musicheader 4, 5, Sfx_RegisterPhoneNumber_Ch5 + musicheader 1, 6, Sfx_RegisterPhoneNumber_Ch6 + musicheader 1, 7, Sfx_RegisterPhoneNumber_Ch7 + musicheader 1, 8, Sfx_RegisterPhoneNumber_Ch8 -Sfx_RegisterPhoneNumber_Ch5: ; f0dd3 +Sfx_RegisterPhoneNumber_Ch5: togglesfx tempo 124 volume $77 @@ -1086,13 +943,10 @@ Sfx_RegisterPhoneNumber_Ch5: ; f0dd3 note C_, 2 note __, 8 endchannel -; f0def - - -INCBIN "baserom.gbc", $f0def, $f0df0 - $f0def + togglesfx -Sfx_RegisterPhoneNumber_Ch6: ; f0df0 +Sfx_RegisterPhoneNumber_Ch6: togglesfx dutycycle $3 notetype $c, $c2 @@ -1113,13 +967,10 @@ Sfx_RegisterPhoneNumber_Ch6: ; f0df0 note G#, 2 note __, 8 endchannel -; f0e07 - - -INCBIN "baserom.gbc", $f0e07, $f0e08 - $f0e07 + togglesfx -Sfx_RegisterPhoneNumber_Ch7: ; f0e08 +Sfx_RegisterPhoneNumber_Ch7: togglesfx notetype $c, $25 note __, 2 @@ -1137,13 +988,10 @@ Sfx_RegisterPhoneNumber_Ch7: ; f0e08 note G#, 2 note __, 8 endchannel -; f0e1b - - -INCBIN "baserom.gbc", $f0e1b, $f0e1c - $f0e1b + togglesfx -Sfx_RegisterPhoneNumber_Ch8: ; f0e1c +Sfx_RegisterPhoneNumber_Ch8: togglesfx sfxtogglenoise $4 notetype $c @@ -1151,19 +999,15 @@ Sfx_RegisterPhoneNumber_Ch8: ; f0e1c note __, 16 note __, 16 endchannel -; f0e25 - - -INCBIN "baserom.gbc", $f0e25, $f0e26 - $f0e25 + togglesfx -Sfx_3RdPlace: ; f0e26 - dbw $84, Sfx_3RdPlace_Ch5 - dbw $05, Sfx_3RdPlace_Ch6 - dbw $06, Sfx_3RdPlace_Ch7 -; f0e2f +Sfx_3RdPlace: + musicheader 3, 5, Sfx_3RdPlace_Ch5 + musicheader 1, 6, Sfx_3RdPlace_Ch6 + musicheader 1, 7, Sfx_3RdPlace_Ch7 -Sfx_3RdPlace_Ch5: ; f0e2f +Sfx_3RdPlace_Ch5: togglesfx tempo 120 volume $77 @@ -1179,13 +1023,10 @@ Sfx_3RdPlace_Ch5: ; f0e2f note C_, 1 note D_, 6 endchannel -; f0e44 - - -INCBIN "baserom.gbc", $f0e44, $f0e45 - $f0e44 + togglesfx -Sfx_3RdPlace_Ch6: ; f0e45 +Sfx_3RdPlace_Ch6: togglesfx dutycycle $2 notetype $c, $b4 @@ -1199,13 +1040,10 @@ Sfx_3RdPlace_Ch6: ; f0e45 note F_, 1 note G_, 6 endchannel -; f0e55 - - -INCBIN "baserom.gbc", $f0e55, $f0e56 - $f0e55 + togglesfx -Sfx_3RdPlace_Ch7: ; f0e56 +Sfx_3RdPlace_Ch7: togglesfx notetype $c, $25 octave 3 @@ -1219,22 +1057,18 @@ Sfx_3RdPlace_Ch7: ; f0e56 note A_, 1 note B_, 6 endchannel -; f0e65 - - -INCBIN "baserom.gbc", $f0e65, $f0e66 - $f0e65 + togglesfx -Sfx_GetEggFromDaycareLady: ; f0e66 -Sfx_GetEggFromDaycareMan: ; f0e66 - dbw $c4, Sfx_GetEggFromDaycareLady_Ch5 - dbw $05, Sfx_GetEggFromDaycareLady_Ch6 - dbw $06, Sfx_GetEggFromDaycareLady_Ch7 - dbw $07, Sfx_GetEggFromDaycareLady_Ch8 -; f0e72 +Sfx_GetEggFromDayCareLady: +Sfx_GetEggFromDayCareMan: + musicheader 4, 5, Sfx_GetEggFromDayCareLady_Ch5 + musicheader 1, 6, Sfx_GetEggFromDayCareLady_Ch6 + musicheader 1, 7, Sfx_GetEggFromDayCareLady_Ch7 + musicheader 1, 8, Sfx_GetEggFromDayCareLady_Ch8 -Sfx_GetEggFromDaycareLady_Ch5: ; f0e72 -Sfx_GetEggFromDaycareMan_Ch5: ; f0e72 +Sfx_GetEggFromDayCareLady_Ch5: +Sfx_GetEggFromDayCareMan_Ch5: togglesfx tempo 120 volume $77 @@ -1263,14 +1097,11 @@ Sfx_GetEggFromDaycareMan_Ch5: ; f0e72 note F_, 9 note __, 9 endchannel -; f0e9a - - -INCBIN "baserom.gbc", $f0e9a, $f0e9b - $f0e9a + togglesfx -Sfx_GetEggFromDaycareLady_Ch6: ; f0e9b -Sfx_GetEggFromDaycareMan_Ch6: ; f0e9b +Sfx_GetEggFromDayCareLady_Ch6: +Sfx_GetEggFromDayCareMan_Ch6: togglesfx vibrato $12, $34 dutycycle $3 @@ -1296,14 +1127,11 @@ Sfx_GetEggFromDaycareMan_Ch6: ; f0e9b note A_, 9 note __, 9 endchannel -; f0ebd - - -INCBIN "baserom.gbc", $f0ebd, $f0ebe - $f0ebd + togglesfx -Sfx_GetEggFromDaycareLady_Ch7: ; f0ebe -Sfx_GetEggFromDaycareMan_Ch7: ; f0ebe +Sfx_GetEggFromDayCareLady_Ch7: +Sfx_GetEggFromDayCareMan_Ch7: togglesfx notetype $8, $25 note __, 2 @@ -1319,14 +1147,11 @@ Sfx_GetEggFromDaycareMan_Ch7: ; f0ebe note A_, 9 note __, 9 endchannel -; f0ecf - - -INCBIN "baserom.gbc", $f0ecf, $f0ed0 - $f0ecf + togglesfx -Sfx_GetEggFromDaycareLady_Ch8: ; f0ed0 -Sfx_GetEggFromDaycareMan_Ch8: ; f0ed0 +Sfx_GetEggFromDayCareLady_Ch8: +Sfx_GetEggFromDayCareMan_Ch8: togglesfx sfxtogglenoise $4 notetype $8 @@ -1335,20 +1160,16 @@ Sfx_GetEggFromDaycareMan_Ch8: ; f0ed0 note __, 16 note __, 12 endchannel -; f0edb - - -INCBIN "baserom.gbc", $f0edb, $f0edc - $f0edb + togglesfx -Sfx_MoveDeleted: ; f0edc - dbw $c4, Sfx_MoveDeleted_Ch5 - dbw $05, Sfx_MoveDeleted_Ch6 - dbw $06, Sfx_MoveDeleted_Ch7 - dbw $07, Sfx_MoveDeleted_Ch8 -; f0ee8 +Sfx_MoveDeleted: + musicheader 4, 5, Sfx_MoveDeleted_Ch5 + musicheader 1, 6, Sfx_MoveDeleted_Ch6 + musicheader 1, 7, Sfx_MoveDeleted_Ch7 + musicheader 1, 8, Sfx_MoveDeleted_Ch8 -Sfx_MoveDeleted_Ch5: ; f0ee8 +Sfx_MoveDeleted_Ch5: togglesfx tempo 116 volume $77 @@ -1375,13 +1196,10 @@ Sfx_MoveDeleted_Ch5: ; f0ee8 note D_, 10 note __, 6 endchannel -; f0f0c - - -INCBIN "baserom.gbc", $f0f0c, $f0f0d - $f0f0c + togglesfx -Sfx_MoveDeleted_Ch6: ; f0f0d +Sfx_MoveDeleted_Ch6: togglesfx dutycycle $3 vibrato $c, $44 @@ -1414,13 +1232,10 @@ Sfx_MoveDeleted_Ch6: ; f0f0d note F_, 16 note __, 6 endchannel -; f0f36 - - -INCBIN "baserom.gbc", $f0f36, $f0f37 - $f0f36 + togglesfx -Sfx_MoveDeleted_Ch7: ; f0f37 +Sfx_MoveDeleted_Ch7: togglesfx notetype $6, $25 octave 2 @@ -1444,13 +1259,10 @@ Sfx_MoveDeleted_Ch7: ; f0f37 note B_, 16 note __, 6 endchannel -; f0f52 - - -INCBIN "baserom.gbc", $f0f52, $f0f53 - $f0f52 + togglesfx -Sfx_MoveDeleted_Ch8: ; f0f53 +Sfx_MoveDeleted_Ch8: togglesfx sfxtogglenoise $3 notetype $c @@ -1459,20 +1271,16 @@ Sfx_MoveDeleted_Ch8: ; f0f53 note __, 16 note __, 6 endchannel -; f0f5d - - -INCBIN "baserom.gbc", $f0f5d, $f0f5e - $f0f5d + togglesfx -Sfx_2ndPlace: ; f0f5e - dbw $c4, Sfx_2ndPlace_Ch5 - dbw $05, Sfx_2ndPlace_Ch6 - dbw $06, Sfx_2ndPlace_Ch7 - dbw $07, Sfx_2ndPlace_Ch8 -; f0f6a +Sfx_2ndPlace: + musicheader 4, 5, Sfx_2ndPlace_Ch5 + musicheader 1, 6, Sfx_2ndPlace_Ch6 + musicheader 1, 7, Sfx_2ndPlace_Ch7 + musicheader 1, 8, Sfx_2ndPlace_Ch8 -Sfx_2ndPlace_Ch5: ; f0f6a +Sfx_2ndPlace_Ch5: togglesfx tempo 116 volume $77 @@ -1503,13 +1311,10 @@ Sfx_2ndPlace_Ch5: ; f0f6a note B_, 12 note __, 6 endchannel -; f0f91 - - -INCBIN "baserom.gbc", $f0f91, $f0f92 - $f0f91 + togglesfx -Sfx_2ndPlace_Ch6: ; f0f92 +Sfx_2ndPlace_Ch6: togglesfx dutycycle $2 notetype $8, $b1 @@ -1530,13 +1335,10 @@ Sfx_2ndPlace_Ch6: ; f0f92 note D_, 12 note __, 6 endchannel -; f0fac - - -INCBIN "baserom.gbc", $f0fac, $f0fad - $f0fac + togglesfx -Sfx_2ndPlace_Ch7: ; f0fad +Sfx_2ndPlace_Ch7: togglesfx notetype $8, $25 octave 3 @@ -1571,38 +1373,31 @@ Sfx_2ndPlace_Ch7: ; f0fad note G_, 12 note __, 6 endchannel -; f0fd1 - - -INCBIN "baserom.gbc", $f0fd1, $f0fd2 - $f0fd1 + togglesfx -Sfx_2ndPlace_Ch8: ; f0fd2 +Sfx_2ndPlace_Ch8: togglesfx sfxtogglenoise $3 notetype $8 -Sfx_2ndPlace_branch_f0fd7: ; f0fd7 +.loop note C#, 1 - loopchannel 6, Sfx_2ndPlace_branch_f0fd7 + loopchannel 6, .loop note B_, 12 note B_, 12 note B_, 12 note __, 6 endchannel -; f0fe1 - - -INCBIN "baserom.gbc", $f0fe1, $f0fe2 - $f0fe1 + togglesfx -Sfx_1stPlace: ; f0fe2 - dbw $c4, Sfx_1stPlace_Ch5 - dbw $05, Sfx_1stPlace_Ch6 - dbw $06, Sfx_1stPlace_Ch7 - dbw $07, Sfx_1stPlace_Ch8 -; f0fee +Sfx_1stPlace: + musicheader 4, 5, Sfx_1stPlace_Ch5 + musicheader 1, 6, Sfx_1stPlace_Ch6 + musicheader 1, 7, Sfx_1stPlace_Ch7 + musicheader 1, 8, Sfx_1stPlace_Ch8 -Sfx_1stPlace_Ch5: ; f0fee +Sfx_1stPlace_Ch5: togglesfx tempo 124 volume $77 @@ -1640,13 +1435,10 @@ Sfx_1stPlace_Ch5: ; f0fee note A_, 10 note __, 6 endchannel -; f101f - - -INCBIN "baserom.gbc", $f101f, $f1020 - $f101f + togglesfx -Sfx_1stPlace_Ch6: ; f1020 +Sfx_1stPlace_Ch6: togglesfx dutycycle $3 vibrato $c, $34 @@ -1667,13 +1459,10 @@ Sfx_1stPlace_Ch6: ; f1020 note D_, 10 note __, 6 endchannel -; f103c - - -INCBIN "baserom.gbc", $f103c, $f103d - $f103c + togglesfx -Sfx_1stPlace_Ch7: ; f103d +Sfx_1stPlace_Ch7: togglesfx notetype $c, $25 octave 2 @@ -1694,13 +1483,10 @@ Sfx_1stPlace_Ch7: ; f103d note D_, 10 note __, 6 endchannel -; f1053 - - -INCBIN "baserom.gbc", $f1053, $f1054 - $f1053 + togglesfx -Sfx_1stPlace_Ch8: ; f1054 +Sfx_1stPlace_Ch8: togglesfx sfxtogglenoise $4 notetype $6 @@ -1718,20 +1504,16 @@ Sfx_1stPlace_Ch8: ; f1054 note B_, 10 note __, 6 endchannel -; f1068 - - -INCBIN "baserom.gbc", $f1068, $f1069 - $f1068 + togglesfx -Sfx_ChooseACard: ; f1069 - dbw $c4, Sfx_ChooseACard_Ch5 - dbw $05, Sfx_ChooseACard_Ch6 - dbw $06, Sfx_ChooseACard_Ch7 - dbw $07, Sfx_ChooseACard_Ch8 -; f1075 +Sfx_ChooseACard: + musicheader 4, 5, Sfx_ChooseACard_Ch5 + musicheader 1, 6, Sfx_ChooseACard_Ch6 + musicheader 1, 7, Sfx_ChooseACard_Ch7 + musicheader 1, 8, Sfx_ChooseACard_Ch8 -Sfx_ChooseACard_Ch5: ; f1075 +Sfx_ChooseACard_Ch5: togglesfx tempo 152 volume $77 @@ -1774,13 +1556,10 @@ Sfx_ChooseACard_Ch5: ; f1075 note E_, 4 note __, 12 endchannel -; f10a8 - - -INCBIN "baserom.gbc", $f10a8, $f10a9 - $f10a8 + togglesfx -Sfx_ChooseACard_Ch6: ; f10a9 +Sfx_ChooseACard_Ch6: togglesfx dutycycle $3 notetype $6, $b4 @@ -1809,13 +1588,10 @@ Sfx_ChooseACard_Ch6: ; f10a9 note A_, 4 note __, 12 endchannel -; f10c8 - - -INCBIN "baserom.gbc", $f10c8, $f10c9 - $f10c8 + togglesfx -Sfx_ChooseACard_Ch7: ; f10c9 +Sfx_ChooseACard_Ch7: togglesfx notetype $6, $25 octave 3 @@ -1848,13 +1624,10 @@ Sfx_ChooseACard_Ch7: ; f10c9 note A_, 4 note __, 12 endchannel -; f10eb - - -INCBIN "baserom.gbc", $f10eb, $f10ec - $f10eb + togglesfx -Sfx_ChooseACard_Ch8: ; f10ec +Sfx_ChooseACard_Ch8: togglesfx sfxtogglenoise $4 notetype $6 @@ -1876,20 +1649,16 @@ Sfx_ChooseACard_Ch8: ; f10ec note D_, 2 note B_, 16 endchannel -; f1103 - - -INCBIN "baserom.gbc", $f1103, $f1104 - $f1103 + togglesfx -Sfx_GetTm: ; f1104 - dbw $c4, Sfx_GetTm_Ch5 - dbw $05, Sfx_GetTm_Ch6 - dbw $06, Sfx_GetTm_Ch7 - dbw $07, Sfx_GetTm_Ch8 -; f1110 +Sfx_GetTm: + musicheader 4, 5, Sfx_GetTm_Ch5 + musicheader 1, 6, Sfx_GetTm_Ch6 + musicheader 1, 7, Sfx_GetTm_Ch7 + musicheader 1, 8, Sfx_GetTm_Ch8 -Sfx_GetTm_Ch5: ; f1110 +Sfx_GetTm_Ch5: togglesfx tempo 144 volume $77 @@ -1912,13 +1681,10 @@ Sfx_GetTm_Ch5: ; f1110 note F#, 8 note __, 6 endchannel -; f1130 - - -INCBIN "baserom.gbc", $f1130, $f1131 - $f1130 + togglesfx -Sfx_GetTm_Ch6: ; f1131 +Sfx_GetTm_Ch6: togglesfx dutycycle $3 vibrato $8, $24 @@ -1938,13 +1704,10 @@ Sfx_GetTm_Ch6: ; f1131 note D_, 8 note __, 6 endchannel -; f114b - - -INCBIN "baserom.gbc", $f114b, $f114c - $f114b + togglesfx -Sfx_GetTm_Ch7: ; f114c +Sfx_GetTm_Ch7: togglesfx notetype $6, $25 octave 2 @@ -1972,13 +1735,10 @@ Sfx_GetTm_Ch7: ; f114c note A_, 16 note __, 6 endchannel -; f1169 - - -INCBIN "baserom.gbc", $f1169, $f116a - $f1169 + togglesfx -Sfx_GetTm_Ch8: ; f116a +Sfx_GetTm_Ch8: togglesfx sfxtogglenoise $4 notetype $6 @@ -1995,20 +1755,16 @@ Sfx_GetTm_Ch8: ; f116a note B_, 16 note __, 6 endchannel -; f117c - - -INCBIN "baserom.gbc", $f117c, $f117d - $f117c + togglesfx -Sfx_GetBadge: ; f117d - dbw $c4, Sfx_GetBadge_Ch5 - dbw $05, Sfx_GetBadge_Ch6 - dbw $06, Sfx_GetBadge_Ch7 - dbw $07, Sfx_GetBadge_Ch8 -; f1189 +Sfx_GetBadge: + musicheader 4, 5, Sfx_GetBadge_Ch5 + musicheader 1, 6, Sfx_GetBadge_Ch6 + musicheader 1, 7, Sfx_GetBadge_Ch7 + musicheader 1, 8, Sfx_GetBadge_Ch8 -Sfx_GetBadge_Ch5: ; f1189 +Sfx_GetBadge_Ch5: togglesfx tempo 120 volume $77 @@ -2019,20 +1775,17 @@ Sfx_GetBadge_Ch5: ; f1189 note F_, 3 callchannel Sfx_GetBadge_branch_f11aa note A#, 3 - forceoctave $2 + pitchoffset 0, D_ callchannel Sfx_GetBadge_branch_f11aa - forceoctave $0 + pitchoffset 0, C_ intensity $a7 note A_, 16 note __, 6 endchannel -; f11a9 - - -INCBIN "baserom.gbc", $f11a9, $f11aa - $f11a9 + togglesfx -Sfx_GetBadge_branch_f11aa: ; f11aa +Sfx_GetBadge_branch_f11aa: note __, 5 octave 3 note F_, 2 @@ -2053,9 +1806,8 @@ Sfx_GetBadge_branch_f11aa: ; f11aa note C#, 2 note F_, 2 endchannel -; f11be -Sfx_GetBadge_Ch6: ; f11be +Sfx_GetBadge_Ch6: togglesfx dutycycle $3 vibrato $8, $24 @@ -2101,13 +1853,10 @@ Sfx_GetBadge_Ch6: ; f11be note F_, 16 note __, 6 endchannel -; f11f4 - - -INCBIN "baserom.gbc", $f11f4, $f11f5 - $f11f4 + togglesfx -Sfx_GetBadge_Ch7: ; f11f5 +Sfx_GetBadge_Ch7: togglesfx notetype $6, $25 octave 2 @@ -2143,17 +1892,14 @@ Sfx_GetBadge_Ch7: ; f11f5 note F_, 16 note __, 6 endchannel -; f121a - - -INCBIN "baserom.gbc", $f121a, $f121b - $f121a + togglesfx -Sfx_GetBadge_Ch8: ; f121b +Sfx_GetBadge_Ch8: togglesfx sfxtogglenoise $4 notetype $6 -Sfx_GetBadge_branch_f1220: ; f1220 +.loop note B_, 12 note D_, 1 note D_, 1 @@ -2168,24 +1914,20 @@ Sfx_GetBadge_branch_f1220: ; f1220 note C#, 1 note C#, 1 note C#, 1 - loopchannel 2, Sfx_GetBadge_branch_f1220 + loopchannel 2, .loop note B_, 16 note __, 6 endchannel -; f1235 - - -INCBIN "baserom.gbc", $f1235, $f1236 - $f1235 + togglesfx -Sfx_QuitSlots: ; f1236 - dbw $c4, Sfx_QuitSlots_Ch5 - dbw $05, Sfx_QuitSlots_Ch6 - dbw $06, Sfx_QuitSlots_Ch7 - dbw $07, Sfx_QuitSlots_Ch8 -; f1242 +Sfx_QuitSlots: + musicheader 4, 5, Sfx_QuitSlots_Ch5 + musicheader 1, 6, Sfx_QuitSlots_Ch6 + musicheader 1, 7, Sfx_QuitSlots_Ch7 + musicheader 1, 8, Sfx_QuitSlots_Ch8 -Sfx_QuitSlots_Ch5: ; f1242 +Sfx_QuitSlots_Ch5: togglesfx tempo 144 volume $77 @@ -2214,13 +1956,10 @@ Sfx_QuitSlots_Ch5: ; f1242 note G#, 14 note __, 6 endchannel -; f1265 - - -INCBIN "baserom.gbc", $f1265, $f1266 - $f1265 + togglesfx -Sfx_QuitSlots_Ch6: ; f1266 +Sfx_QuitSlots_Ch6: togglesfx dutycycle $2 notetype $8, $b3 @@ -2244,13 +1983,10 @@ Sfx_QuitSlots_Ch6: ; f1266 note F_, 14 note __, 6 endchannel -; f1282 - - -INCBIN "baserom.gbc", $f1282, $f1283 - $f1282 + togglesfx -Sfx_QuitSlots_Ch7: ; f1283 +Sfx_QuitSlots_Ch7: togglesfx notetype $8, $25 octave 3 @@ -2278,13 +2014,10 @@ Sfx_QuitSlots_Ch7: ; f1283 note C#, 14 note __, 6 endchannel -; f12a0 - - -INCBIN "baserom.gbc", $f12a0, $f12a1 - $f12a0 + togglesfx -Sfx_QuitSlots_Ch8: ; f12a1 +Sfx_QuitSlots_Ch8: togglesfx sfxtogglenoise $3 notetype $8 @@ -2301,22 +2034,18 @@ Sfx_QuitSlots_Ch8: ; f12a1 note B_, 14 note __, 6 endchannel -; f12b3 - - -INCBIN "baserom.gbc", $f12b3, $f12b4 - $f12b3 + togglesfx -Sfx_Protect: ; f12b4 - dbw $44, Sfx_Protect_Ch5 - dbw $07, Sfx_Protect_Ch8 -; f12ba +Sfx_Protect: + musicheader 2, 5, Sfx_Protect_Ch5 + musicheader 1, 8, Sfx_Protect_Ch8 -Sfx_Protect_Ch5: ; f12ba +Sfx_Protect_Ch5: togglesfx notetype $1, $f1 dutycycle $0 -Sfx_Protect_branch_f12c0: ; f12c0 +.loop octave 5 note F_, 5 note A_, 5 @@ -2329,7 +2058,7 @@ Sfx_Protect_branch_f12c0: ; f12c0 octave 6 note C#, 5 note E_, 5 - loopchannel 3, Sfx_Protect_branch_f12c0 + loopchannel 3, .loop intensity $c1 octave 5 note F_, 5 @@ -2347,144 +2076,120 @@ Sfx_Protect_branch_f12c0: ; f12c0 note C#, 5 note E_, 5 endchannel -; f12e5 -Sfx_Protect_Ch8: ; f12e5 -Sfx_Protect_branch_f12e5: ; f12e5 - noise $9, $9e, $0 - noise $9, $be, $11 - loopchannel 6, Sfx_Protect_branch_f12e5 - noise $9, $a7, $0 - noise $10, $75, $11 +Sfx_Protect_Ch8: + noise __, 10, $9e, $0 + noise __, 10, $be, $11 + loopchannel 6, Sfx_Protect_Ch8 + noise __, 10, $a7, $0 + noise C_, 1, $75, $11 endchannel -; f12f6 -Sfx_Sketch: ; f12f6 - dbw $04, Sfx_Sketch_Ch5 -; f12f9 +Sfx_Sketch: + musicheader 1, 5, Sfx_Sketch_Ch5 -Sfx_Sketch_Ch5: ; f12f9 +Sfx_Sketch_Ch5: dutycycle $1 soundinput $a5 -Sfx_Sketch_branch_f12fd: ; f12fd - sound $2, $f1, $06e0 - sound $d, $af, $05b0 - sound $4, $0, $0000 - sound $9, $f4, $0718 - loopchannel 3, Sfx_Sketch_branch_f12fd +.loop + sound __, 3, $f1, $06e0 + sound __, 14, $af, $05b0 + sound __, 5, $0, 0 + sound __, 10, $f4, $0718 + loopchannel 3, .loop soundinput $8 endchannel -; f1314 - -Sfx_RainDance: ; f1314 - dbw $07, Sfx_RainDance_Ch8 -; f1317 - -Sfx_RainDance_Ch8: ; f1317 -Sfx_RainDance_branch_f1317: ; f1317 - noise $b, $7d, $50 - noise $6, $7d, $4f - noise $b, $7f, $47 - noise $f, $6e, $22 - loopchannel 3, Sfx_RainDance_branch_f1317 - noise $6, $6d, $50 - noise $5, $5d, $4f - noise $5, $4f, $47 - noise $a, $32, $46 - endchannel -; f1334 - -Sfx_Aeroblast: ; f1334 - dbw $44, Sfx_Aeroblast_Ch5 - dbw $07, Sfx_Aeroblast_Ch8 -; f133a - -Sfx_Aeroblast_Ch5: ; f133a - unknownmusic0xde $f2 + +Sfx_RainDance: + musicheader 1, 8, Sfx_RainDance_Ch8 + +Sfx_RainDance_Ch8: + noise __, 12, $7d, $50 + noise __, 7, $7d, $4f + noise __, 12, $7f, $47 + noise __, 16, $6e, $22 + loopchannel 3, Sfx_RainDance_Ch8 + noise __, 7, $6d, $50 + noise __, 6, $5d, $4f + noise __, 6, $4f, $47 + noise __, 11, $32, $46 + endchannel + +Sfx_Aeroblast: + musicheader 2, 5, Sfx_Aeroblast_Ch5 + musicheader 1, 8, Sfx_Aeroblast_Ch8 + +Sfx_Aeroblast_Ch5: + sound_duty 2, 0, 3, 3 soundinput $f5 - sound $1c, $f8, $0580 + sound C_, 13, $f8, $0580 soundinput $8 endchannel -; f1345 -Sfx_Aeroblast_Ch8: ; f1345 - noise $4, $f8, $6c - noise $4, $c8, $5c - noise $4, $78, $5b - noise $10, $31, $5a +Sfx_Aeroblast_Ch8: + noise __, 5, $f8, $6c + noise __, 5, $c8, $5c + noise __, 5, $78, $5b + noise C_, 1, $31, $5a endchannel -; f1352 -Sfx_Spark: ; f1352 - dbw $07, Sfx_Spark_Ch8 -; f1355 +Sfx_Spark: + musicheader 1, 8, Sfx_Spark_Ch8 -Sfx_Spark_Ch8: ; f1355 -Sfx_Spark_branch_f1355: ; f1355 - noise $4, $f8, $5d - noise $4, $d8, $6f - loopchannel 2, Sfx_Spark_branch_f1355 +Sfx_Spark_Ch8: + noise __, 5, $f8, $5d + noise __, 5, $d8, $6f + loopchannel 2, Sfx_Spark_Ch8 endchannel -; f1360 -Sfx_Curse: ; f1360 - dbw $44, Sfx_Curse_Ch5 - dbw $07, Sfx_Curse_Ch8 -; f1366 +Sfx_Curse: + musicheader 2, 5, Sfx_Curse_Ch5 + musicheader 1, 8, Sfx_Curse_Ch8 -Sfx_Curse_Ch5: ; f1366 +Sfx_Curse_Ch5: dutycycle $3 - sound $4, $f2, $0483 - sound $4, $f2, $0511 - sound $4, $f2, $0589 - sound $4, $f2, $05ed + sound __, 5, $f2, $0483 + sound __, 5, $f2, $0511 + sound __, 5, $f2, $0589 + sound __, 5, $f2, $05ed endchannel -; f1379 -Sfx_Curse_Ch8: ; f1379 - noise $14, $9a, $9 +Sfx_Curse_Ch8: + noise C_, 5, $9a, $9 endchannel -; f137d -Sfx_Rage: ; f137d - dbw $44, Sfx_Rage_Ch5 - dbw $07, Sfx_Rage_Ch8 -; f1383 +Sfx_Rage: + musicheader 2, 5, Sfx_Rage_Ch5 + musicheader 1, 8, Sfx_Rage_Ch8 -Sfx_Rage_Ch5: ; f1383 +Sfx_Rage_Ch5: dutycycle $0 - sound $3, $d1, $07b0 - sound $3, $d1, $07c2 - sound $18, $d2, $07d5 + sound __, 4, $d1, $07b0 + sound __, 4, $d1, $07c2 + sound C_, 9, $d2, $07d5 endchannel -; f1392 -Sfx_Rage_Ch8: ; f1392 - noise $3, $f4, $1a - noise $3, $f4, $19 - noise $18, $f2, $18 +Sfx_Rage_Ch8: + noise __, 4, $f4, $1a + noise __, 4, $f4, $19 + noise C_, 9, $f2, $18 endchannel -; f139c -Sfx_Thief: ; f139c - dbw $07, Sfx_Thief_Ch8 -; f139f +Sfx_Thief: + musicheader 1, 8, Sfx_Thief_Ch8 -Sfx_Thief_Ch8: ; f139f -Sfx_Thief_branch_f139f: ; f139f - noise $0, $0, $0 - noise $4, $e1, $12 - noise $0, $0, $0 - noise $2, $b1, $22 - loopchannel 2, Sfx_Thief_branch_f139f +Sfx_Thief_Ch8: + noise __, 1, $0, $0 + noise __, 5, $e1, $12 + noise __, 1, $0, $0 + noise __, 3, $b1, $22 + loopchannel 2, Sfx_Thief_Ch8 endchannel -; f13b0 -Sfx_Thief2: ; f13b0 - dbw $04, Sfx_Thief2_Ch5 -; f13b3 +Sfx_Thief2: + musicheader 1, 5, Sfx_Thief2_Ch5 -Sfx_Thief2_Ch5: ; f13b3 +Sfx_Thief2_Ch5: togglesfx notetype $2, $f4 dutycycle $0 @@ -2502,38 +2207,33 @@ Sfx_Thief2_Ch5: ; f13b3 note A_, 3 togglesfx endchannel -; f13ca -Sfx_SpiderWeb: ; f13ca - dbw $44, Sfx_SpiderWeb_Ch5 - dbw $07, Sfx_SpiderWeb_Ch8 -; f13d0 +Sfx_SpiderWeb: + musicheader 2, 5, Sfx_SpiderWeb_Ch5 + musicheader 1, 8, Sfx_SpiderWeb_Ch8 -Sfx_SpiderWeb_Ch5: ; f13d0 +Sfx_SpiderWeb_Ch5: dutycycle $0 - sound $20, $7f, $0720 + sound C#, 1, $7f, $0720 soundinput $95 - sound $4, $f8, $0620 - sound $4, $e8, $0630 - sound $4, $d8, $0640 - sound $4, $95, $0620 - sound $4, $73, $0630 - sound $4, $51, $0640 + sound __, 5, $f8, $0620 + sound __, 5, $e8, $0630 + sound __, 5, $d8, $0640 + sound __, 5, $95, $0620 + sound __, 5, $73, $0630 + sound __, 5, $51, $0640 soundinput $8 endchannel -; f13f3 -Sfx_SpiderWeb_Ch8: ; f13f3 - noise $20, $ef, $0 +Sfx_SpiderWeb_Ch8: + noise C#, 1, $ef, $0 endchannel -; f13f7 -Sfx_MindReader: ; f13f7 - dbw $44, Sfx_MindReader_Ch5 - dbw $07, Sfx_MindReader_Ch8 -; f13fd +Sfx_MindReader: + musicheader 2, 5, Sfx_MindReader_Ch5 + musicheader 1, 8, Sfx_MindReader_Ch8 -Sfx_MindReader_Ch5: ; f13fd +Sfx_MindReader_Ch5: togglesfx dutycycle $2 notetype $2, $f1 @@ -2551,158 +2251,137 @@ Sfx_MindReader_Ch5: ; f13fd note D_, 3 togglesfx endchannel -; f1416 -Sfx_MindReader_Ch8: ; f1416 - noise $11, $af, $19 - noise $12, $af, $18 +Sfx_MindReader_Ch8: + noise C_, 2, $af, $19 + noise C_, 3, $af, $18 endchannel -; f141d -Sfx_Nightmare: ; f141d - dbw $04, Sfx_Nightmare_Ch5 -; f1420 +Sfx_Nightmare: + musicheader 1, 5, Sfx_Nightmare_Ch5 -Sfx_Nightmare_Ch5: ; f1420 +Sfx_Nightmare_Ch5: dutycycle $0 soundinput $34 -Sfx_Nightmare_branch_f1424: ; f1424 - sound $3, $ba, $0631 - sound $2, $0, $0000 - sound $3, $f8, $0621 - sound $2, $0, $0000 - sound $3, $f8, $0611 - sound $2, $0, $0000 - sound $3, $e8, $0601 - sound $2, $0, $0000 - sound $3, $e8, $05f1 - sound $2, $0, $0000 - loopchannel 2, Sfx_Nightmare_branch_f1424 +.loop + sound __, 4, $ba, $0631 + sound __, 3, $0, 0 + sound __, 4, $f8, $0621 + sound __, 3, $0, 0 + sound __, 4, $f8, $0611 + sound __, 3, $0, 0 + sound __, 4, $e8, $0601 + sound __, 3, $0, 0 + sound __, 4, $e8, $05f1 + sound __, 3, $0, 0 + loopchannel 2, .loop soundinput $8 endchannel -; f1453 -Sfx_Snore: ; f1453 - dbw $07, Sfx_Snore_Ch8 -; f1456 +Sfx_Snore: + musicheader 1, 8, Sfx_Snore_Ch8 -Sfx_Snore_Ch8: ; f1456 - noise $2, $ea, $4b - noise $2, $ea, $5b - noise $2, $0, $0 - noise $4, $ee, $47 - noise $4, $ee, $46 - noise $4, $ee, $45 +Sfx_Snore_Ch8: + noise __, 3, $ea, $4b + noise __, 3, $ea, $5b + noise __, 3, $0, $0 + noise __, 5, $ee, $47 + noise __, 5, $ee, $46 + noise __, 5, $ee, $45 endchannel -; f1469 -Sfx_SweetKiss: ; f1469 - dbw $04, Sfx_SweetKiss_Ch5 -; f146c +Sfx_SweetKiss: + musicheader 1, 5, Sfx_SweetKiss_Ch5 -Sfx_SweetKiss_Ch5: ; f146c +Sfx_SweetKiss_Ch5: dutycycle $2 -Sfx_SweetKiss_branch_f146e: ; f146e - sound $2, $c1, $07c8 - sound $2, $d1, $07da - loopchannel 2, Sfx_SweetKiss_branch_f146e - sound $1a, $f1, $07e2 +.loop + sound __, 3, $c1, $07c8 + sound __, 3, $d1, $07da + loopchannel 2, .loop + sound C_, 11, $f1, $07e2 endchannel -; f147f -Sfx_SweetKiss2: ; f147f - dbw $04, Sfx_SweetKiss2_Ch5 -; f1482 +Sfx_SweetKiss2: + musicheader 1, 5, Sfx_SweetKiss2_Ch5 -Sfx_SweetKiss2_Ch5: ; f1482 +Sfx_SweetKiss2_Ch5: dutycycle $0 soundinput $97 - sound $2, $f4, $0772 - sound $4, $0, $0000 - sound $2, $c4, $0772 - sound $4, $0, $0000 - sound $2, $b4, $0772 - sound $4, $0, $0000 - sound $2, $a1, $0772 + sound __, 3, $f4, $0772 + sound __, 5, $0, 0 + sound __, 3, $c4, $0772 + sound __, 5, $0, 0 + sound __, 3, $b4, $0772 + sound __, 5, $0, 0 + sound __, 3, $a1, $0772 soundinput $8 endchannel -; f14a5 -Sfx_BellyDrum: ; f14a5 - dbw $44, Sfx_BellyDrum_Ch5 - dbw $07, Sfx_BellyDrum_Ch8 -; f14ab +Sfx_BellyDrum: + musicheader 2, 5, Sfx_BellyDrum_Ch5 + musicheader 1, 8, Sfx_BellyDrum_Ch8 -Sfx_BellyDrum_Ch5: ; f14ab +Sfx_BellyDrum_Ch5: dutycycle $2 soundinput $ac - sound $c, $f1, $05a3 + sound __, 13, $f1, $05a3 soundinput $8 endchannel -; f14b6 -Sfx_BellyDrum_Ch8: ; f14b6 - noise $c, $b1, $6c +Sfx_BellyDrum_Ch8: + noise __, 13, $b1, $6c endchannel -; f14ba -Sfx_Unknown7F: ; f14ba - dbw $04, Sfx_Unknown7F_Ch5 -; f14bd +Sfx_Unknown7F: + musicheader 1, 5, Sfx_Unknown7F_Ch5 -Sfx_Unknown7F_Ch5: ; f14bd +Sfx_Unknown7F_Ch5: dutycycle $2 soundinput $95 - sound $2, $c9, $03b3 - sound $5, $f8, $0463 - sound $4, $d1, $0543 + sound __, 3, $c9, $03b3 + sound __, 6, $f8, $0463 + sound __, 5, $d1, $0543 soundinput $8 endchannel -; f14d0 -Sfx_SludgeBomb: ; f14d0 - dbw $44, Sfx_SludgeBomb_Ch5 - dbw $07, Sfx_SludgeBomb_Ch8 -; f14d6 +Sfx_SludgeBomb: + musicheader 2, 5, Sfx_SludgeBomb_Ch5 + musicheader 1, 8, Sfx_SludgeBomb_Ch8 -Sfx_SludgeBomb_Ch5: ; f14d6 +Sfx_SludgeBomb_Ch5: dutycycle $2 soundinput $c5 - sound $3, $f8, $0581 - sound $1, $0, $0000 + sound __, 4, $f8, $0581 + sound __, 2, $0, 0 soundinput $cb - sound $10, $f2, $05d1 + sound C_, 1, $f2, $05d1 soundinput $8 endchannel -; f14eb -Sfx_SludgeBomb_Ch8: ; f14eb - noise $3, $e2, $6e - noise $1, $0, $0 - noise $10, $e2, $6d +Sfx_SludgeBomb_Ch8: + noise __, 4, $e2, $6e + noise __, 2, $0, $0 + noise C_, 1, $e2, $6d endchannel -; f14f5 -Sfx_Foresight: ; f14f5 - dbw $04, Sfx_Foresight_Ch5 -; f14f8 +Sfx_Foresight: + musicheader 1, 5, Sfx_Foresight_Ch5 -Sfx_Foresight_Ch5: ; f14f8 - sound $3, $f4, $07b5 - sound $3, $f5, $07c8 - sound $8, $f4, $07da - sound $2, $0, $0000 - sound $8, $c1, $07da - sound $2, $0, $0000 - sound $8, $91, $07da +Sfx_Foresight_Ch5: + sound __, 4, $f4, $07b5 + sound __, 4, $f5, $07c8 + sound __, 9, $f4, $07da + sound __, 3, $0, 0 + sound __, 9, $c1, $07da + sound __, 3, $0, 0 + sound __, 9, $91, $07da endchannel -; f1515 -Sfx_Spite: ; f1515 - dbw $04, Sfx_Spite_Ch5 -; f1518 +Sfx_Spite: + musicheader 1, 5, Sfx_Spite_Ch5 -Sfx_Spite_Ch5: ; f1518 +Sfx_Spite_Ch5: togglesfx vibrato $0, $12 dutycycle $3 @@ -2727,27 +2406,23 @@ Sfx_Spite_Ch5: ; f1518 soundinput $8 togglesfx endchannel -; f153a -Sfx_Outrage: ; f153a - dbw $07, Sfx_Outrage_Ch8 -; f153d +Sfx_Outrage: + musicheader 1, 8, Sfx_Outrage_Ch8 -Sfx_Outrage_Ch8: ; f153d - noise $b, $ea, $6c - noise $b, $ea, $6b - noise $b, $ea, $6a - noise $b, $ea, $69 - noise $b, $e1, $59 +Sfx_Outrage_Ch8: + noise __, 12, $ea, $6c + noise __, 12, $ea, $6b + noise __, 12, $ea, $6a + noise __, 12, $ea, $69 + noise __, 12, $e1, $59 endchannel -; f154d -Sfx_PerishSong: ; f154d - dbw $44, Sfx_PerishSong_Ch5 - dbw $05, Sfx_PerishSong_Ch6 -; f1553 +Sfx_PerishSong: + musicheader 2, 5, Sfx_PerishSong_Ch5 + musicheader 1, 6, Sfx_PerishSong_Ch6 -Sfx_PerishSong_Ch5: ; f1553 +Sfx_PerishSong_Ch5: togglesfx dutycycle $0 vibrato $12, $53 @@ -2757,9 +2432,8 @@ Sfx_PerishSong_Ch5: ; f1553 note G#, 9 togglesfx endchannel -; f1561 -Sfx_PerishSong_Ch6: ; f1561 +Sfx_PerishSong_Ch6: togglesfx dutycycle $0 vibrato $12, $53 @@ -2770,298 +2444,260 @@ Sfx_PerishSong_Ch6: ; f1561 note B_, 9 togglesfx endchannel -; f1570 -Sfx_GigaDrain: ; f1570 - dbw $44, Sfx_GigaDrain_Ch5 - dbw $07, Sfx_GigaDrain_Ch8 -; f1576 +Sfx_GigaDrain: + musicheader 2, 5, Sfx_GigaDrain_Ch5 + musicheader 1, 8, Sfx_GigaDrain_Ch8 -Sfx_GigaDrain_Ch5: ; f1576 +Sfx_GigaDrain_Ch5: dutycycle $2 soundinput $97 - sound $4, $f8, $0680 - sound $14, $f8, $0680 - sound $14, $c8, $0660 - sound $14, $a8, $0670 - sound $14, $88, $0680 - sound $14, $f8, $0561 - sound $14, $c8, $0541 - sound $14, $a8, $0521 - sound $14, $88, $0511 + sound __, 5, $f8, $0680 + sound C_, 5, $f8, $0680 + sound C_, 5, $c8, $0660 + sound C_, 5, $a8, $0670 + sound C_, 5, $88, $0680 + sound C_, 5, $f8, $0561 + sound C_, 5, $c8, $0541 + sound C_, 5, $a8, $0521 + sound C_, 5, $88, $0511 soundinput $8 endchannel -; f15a1 -Sfx_GigaDrain_Ch8: ; f15a1 - noise $4, $c8, $44 - noise $14, $c8, $50 - noise $14, $c8, $52 - noise $14, $c8, $54 - noise $14, $c8, $56 - noise $40, $c7, $57 +Sfx_GigaDrain_Ch8: + noise __, 5, $c8, $44 + noise C_, 5, $c8, $50 + noise C_, 5, $c8, $52 + noise C_, 5, $c8, $54 + noise C_, 5, $c8, $56 + noise D#, 1, $c7, $57 endchannel -; f15b4 -Sfx_Attract: ; f15b4 - dbw $04, Sfx_Attract_Ch5 -; f15b7 +Sfx_Attract: + musicheader 1, 5, Sfx_Attract_Ch5 -Sfx_Attract_Ch5: ; f15b7 +Sfx_Attract_Ch5: dutycycle $0 soundinput $77 - sound $4, $a9, $06f0 - sound $c, $f8, $0720 + sound __, 5, $a9, $06f0 + sound __, 13, $f8, $0720 soundinput $7f - sound $8, $f1, $0740 + sound __, 9, $f1, $0740 soundinput $8 endchannel -; f15cc -Sfx_Kinesis2: ; f15cc - dbw $04, Sfx_Kinesis2_Ch5 -; f15cf +Sfx_Kinesis2: + musicheader 1, 5, Sfx_Kinesis2_Ch5 -Sfx_Kinesis2_Ch5: ; f15cf +Sfx_Kinesis2_Ch5: dutycycle $0 - sound $2, $f3, $0796 - sound $2, $23, $0796 - sound $14, $f1, $07c4 + sound __, 3, $f3, $0796 + sound __, 3, $23, $0796 + sound C_, 5, $f1, $07c4 endchannel -; f15de -Sfx_ZapCannon: ; f15de - dbw $07, Sfx_ZapCannon_Ch8 -; f15e1 +Sfx_ZapCannon: + musicheader 1, 8, Sfx_ZapCannon_Ch8 -Sfx_ZapCannon_Ch8: ; f15e1 -Sfx_ZapCannon_branch_f15e1: ; f15e1 - noise $2, $e1, $49 - noise $0, $0, $0 - loopchannel 8, Sfx_ZapCannon_branch_f15e1 - noise $8, $e1, $49 +Sfx_ZapCannon_Ch8: + noise __, 3, $e1, $49 + noise __, 1, $0, $0 + loopchannel 8, Sfx_ZapCannon_Ch8 + noise __, 9, $e1, $49 endchannel -; f15ef -Sfx_MeanLook: ; f15ef - dbw $04, Sfx_MeanLook_Ch5 -; f15f2 +Sfx_MeanLook: + musicheader 1, 5, Sfx_MeanLook_Ch5 -Sfx_MeanLook_Ch5: ; f15f2 +Sfx_MeanLook_Ch5: soundinput $77 dutycycle $3 - sound $2, $f8, $0720 -Sfx_MeanLook_branch_f15fa: ; f15fa - sound $1, $88, $0660 - sound $2, $f8, $0790 - loopchannel 5, Sfx_MeanLook_branch_f15fa - sound $c, $f8, $0700 - sound $c, $c8, $0720 - sound $c, $a8, $0700 - sound $c, $78, $0720 - sound $c, $48, $0700 - sound $c, $28, $0720 + sound __, 3, $f8, $0720 +.loop + sound __, 2, $88, $0660 + sound __, 3, $f8, $0790 + loopchannel 5, .loop + sound __, 13, $f8, $0700 + sound __, 13, $c8, $0720 + sound __, 13, $a8, $0700 + sound __, 13, $78, $0720 + sound __, 13, $48, $0700 + sound __, 13, $28, $0720 soundinput $8 endchannel -; f1621 -Sfx_HealBell: ; f1621 - dbw $04, Sfx_HealBell_Ch5 -; f1624 +Sfx_HealBell: + musicheader 1, 5, Sfx_HealBell_Ch5 -Sfx_HealBell_Ch5: ; f1624 +Sfx_HealBell_Ch5: dutycycle $1 - sound $1, $f1, $07da - sound $1, $d1, $07d9 - sound $1, $f1, $07da - sound $8, $d1, $07db + sound __, 2, $f1, $07da + sound __, 2, $d1, $07d9 + sound __, 2, $f1, $07da + sound __, 9, $d1, $07db endchannel -; f1637 -Sfx_Return: ; f1637 - dbw $04, Sfx_Return_Ch5 -; f163a +Sfx_Return: + musicheader 1, 5, Sfx_Return_Ch5 -Sfx_Return_Ch5: ; f163a +Sfx_Return_Ch5: dutycycle $0 -Sfx_Return_branch_f163c: ; f163c +.loop soundinput $bf - sound $8, $f1, $0759 + sound __, 9, $f1, $0759 soundinput $57 - sound $8, $f1, $0759 - sound $10, $0, $0000 - loopchannel 2, Sfx_Return_branch_f163c + sound __, 9, $f1, $0759 + sound C_, 1, $0, 0 + loopchannel 2, .loop soundinput $8 endchannel -; f1653 -Sfx_ExpBar: ; f1653 - dbw $04, Sfx_ExpBar_Ch5 -; f1656 +Sfx_ExpBar: + musicheader 1, 5, Sfx_ExpBar_Ch5 -Sfx_ExpBar_Ch5: ; f1656 +Sfx_ExpBar_Ch5: dutycycle $2 soundinput $d7 - sound $8, $e1, $0750 + sound __, 9, $e1, $0750 soundinput $e7 - sound $8, $48, $06e0 - sound $8, $58, $06f8 - sound $8, $68, $0710 - sound $8, $78, $0728 - sound $8, $88, $0740 - sound $8, $98, $0758 - sound $10, $a8, $0770 + sound __, 9, $48, $06e0 + sound __, 9, $58, $06f8 + sound __, 9, $68, $0710 + sound __, 9, $78, $0728 + sound __, 9, $88, $0740 + sound __, 9, $98, $0758 + sound C_, 1, $a8, $0770 soundinput $8 endchannel -; f167f -Sfx_MilkDrink: ; f167f - dbw $04, Sfx_MilkDrink_Ch5 -; f1682 +Sfx_MilkDrink: + musicheader 1, 5, Sfx_MilkDrink_Ch5 -Sfx_MilkDrink_Ch5: ; f1682 +Sfx_MilkDrink_Ch5: dutycycle $2 -Sfx_MilkDrink_branch_f1684: ; f1684 +.loop soundinput $a4 - sound $2, $ea, $04e0 - sound $d, $f7, $0290 + sound __, 3, $ea, $04e0 + sound __, 14, $f7, $0290 soundinput $9e - sound $4, $c9, $05e1 - sound $2, $0, $0000 - loopchannel 6, Sfx_MilkDrink_branch_f1684 + sound __, 5, $c9, $05e1 + sound __, 3, $0, 0 + loopchannel 6, .loop soundinput $8 endchannel -; f169f -Sfx_Present: ; f169f - dbw $04, Sfx_Present_Ch5 -; f16a2 +Sfx_Present: + musicheader 1, 5, Sfx_Present_Ch5 -Sfx_Present_Ch5: ; f16a2 +Sfx_Present_Ch5: dutycycle $2 soundinput $d6 -Sfx_Present_branch_f16a6: ; f16a6 - sound $2, $f1, $0740 - sound $1, $0, $0000 - loopchannel 3, Sfx_Present_branch_f16a6 - sound $10, $f1, $0780 +.loop + sound __, 3, $f1, $0740 + sound __, 2, $0, 0 + loopchannel 3, .loop + sound C_, 1, $f1, $0780 soundinput $8 endchannel -; f16b9 -Sfx_MorningSun: ; f16b9 - dbw $04, Sfx_MorningSun_Ch5 -; f16bc +Sfx_MorningSun: + musicheader 1, 5, Sfx_MorningSun_Ch5 -Sfx_MorningSun_Ch5: ; f16bc +Sfx_MorningSun_Ch5: dutycycle $3 -Sfx_MorningSun_branch_f16be: ; f16be - sound $2, $f1, $07e4 - sound $2, $f1, $07e0 - sound $5, $f2, $07e7 - loopchannel 3, Sfx_MorningSun_branch_f16be - sound $1, $0, $0000 - sound $8, $c2, $07e7 - sound $1, $0, $0000 - sound $8, $82, $07e7 - endchannel -; f16df - -Sfx_Moonlight: ; f16df - dbw $04, Sfx_Moonlight_Ch5 -; f16e2 - -Sfx_Moonlight_Ch5: ; f16e2 +.loop + sound __, 3, $f1, $07e4 + sound __, 3, $f1, $07e0 + sound __, 6, $f2, $07e7 + loopchannel 3, .loop + sound __, 2, $0, 0 + sound __, 9, $c2, $07e7 + sound __, 2, $0, 0 + sound __, 9, $82, $07e7 + endchannel + +Sfx_Moonlight: + musicheader 1, 5, Sfx_Moonlight_Ch5 + +Sfx_Moonlight_Ch5: dutycycle $2 -Sfx_Moonlight_branch_f16e4: ; f16e4 - sound $1, $f8, $07d0 - sound $4, $f1, $07e0 - loopchannel 2, Sfx_Moonlight_branch_f16e4 - sound $10, $f1, $07e0 - sound $10, $d1, $07e0 - sound $10, $81, $07e0 - endchannel -; f16fd - -Sfx_Encore: ; f16fd - dbw $44, Sfx_Encore_Ch5 - dbw $07, Sfx_Encore_Ch8 -; f1703 - -Sfx_Encore_Ch5: ; f1703 +.loop + sound __, 2, $f8, $07d0 + sound __, 5, $f1, $07e0 + loopchannel 2, .loop + sound C_, 1, $f1, $07e0 + sound C_, 1, $d1, $07e0 + sound C_, 1, $81, $07e0 + endchannel + +Sfx_Encore: + musicheader 2, 5, Sfx_Encore_Ch5 + musicheader 1, 8, Sfx_Encore_Ch8 + +Sfx_Encore_Ch5: dutycycle $2 soundinput $ce - sound $10, $0, $0000 -Sfx_Encore_branch_f170b: ; f170b - sound $2, $f8, $0774 - sound $24, $0, $0000 - loopchannel 2, Sfx_Encore_branch_f170b + sound C_, 1, $0, 0 +.loop + sound __, 3, $f8, $0774 + sound C#, 5, $0, 0 + loopchannel 2, .loop soundinput $8 endchannel -; f171a -Sfx_Encore_Ch8: ; f171a - noise $30, $1f, $36 - noise $30, $76, $36 +Sfx_Encore_Ch8: + noise D_, 1, $1f, $36 + noise D_, 1, $76, $36 endchannel -; f1721 -Sfx_BeatUp: ; f1721 - dbw $07, Sfx_BeatUp_Ch8 -; f1724 +Sfx_BeatUp: + musicheader 1, 8, Sfx_BeatUp_Ch8 -Sfx_BeatUp_Ch8: ; f1724 - noise $2, $e8, $69 - noise $6, $d8, $24 - noise $2, $e8, $6c - noise $4, $c8, $46 - noise $6, $d1, $24 +Sfx_BeatUp_Ch8: + noise __, 3, $e8, $69 + noise __, 7, $d8, $24 + noise __, 3, $e8, $6c + noise __, 5, $c8, $46 + noise __, 7, $d1, $24 endchannel -; f1734 -Sfx_SweetScent: ; f1734 - dbw $04, Sfx_SweetScent_Ch5 -; f1737 +Sfx_SweetScent: + musicheader 1, 5, Sfx_SweetScent_Ch5 -Sfx_SweetScent_Ch5: ; f1737 +Sfx_SweetScent_Ch5: dutycycle $2 soundinput $96 - sound $6, $f8, $0760 - sound $6, $e8, $0720 + sound __, 7, $f8, $0760 + sound __, 7, $e8, $0720 soundinput $df - sound $16, $f1, $0730 + sound C_, 7, $f1, $0730 soundinput $8 endchannel -; f174c -Sfx_BatonPass: ; f174c - dbw $44, Sfx_BatonPass_Ch5 - dbw $07, Sfx_BatonPass_Ch8 -; f1752 +Sfx_BatonPass: + musicheader 2, 5, Sfx_BatonPass_Ch5 + musicheader 1, 8, Sfx_BatonPass_Ch8 -Sfx_BatonPass_Ch5: ; f1752 +Sfx_BatonPass_Ch5: dutycycle $2 soundinput $f7 - sound $20, $f2, $0680 - sound $1, $f1, $0760 - sound $20, $0, $0000 - sound $1, $f1, $0760 - sound $1a, $0, $0000 - sound $1, $f1, $0760 + sound C#, 1, $f2, $0680 + sound __, 2, $f1, $0760 + sound C#, 1, $0, 0 + sound __, 2, $f1, $0760 + sound C_, 11, $0, 0 + sound __, 2, $f1, $0760 soundinput $8 endchannel -; f1771 -Sfx_BatonPass_Ch8: ; f1771 - noise $20, $f2, $20 +Sfx_BatonPass_Ch8: + noise C#, 1, $f2, $20 endchannel -; f1775 -Sfx_EggCrack: ; f1775 - dbw $04, Sfx_EggCrack_Ch5 -; f1778 +Sfx_EggCrack: + musicheader 1, 5, Sfx_EggCrack_Ch5 -Sfx_EggCrack_Ch5: ; f1778 +Sfx_EggCrack_Ch5: togglesfx notetype $1, $f1 dutycycle $0 @@ -3071,13 +2707,11 @@ Sfx_EggCrack_Ch5: ; f1778 note __, 1 note F#, 1 endchannel -; f1784 -Sfx_Evolved: ; f1784 - dbw $04, Sfx_Evolved_Ch5 -; f1787 +Sfx_Evolved: + musicheader 1, 5, Sfx_Evolved_Ch5 -Sfx_Evolved_Ch5: ; f1787 +Sfx_Evolved_Ch5: togglesfx notetype $1, $c1 octave 4 @@ -3096,13 +2730,11 @@ Sfx_Evolved_Ch5: ; f1787 octave 7 note C_, 16 endchannel -; f179b -Sfx_MasterBall: ; f179b - dbw $04, Sfx_MasterBall_Ch5 -; f179e +Sfx_MasterBall: + musicheader 1, 5, Sfx_MasterBall_Ch5 -Sfx_MasterBall_Ch5: ; f179e +Sfx_MasterBall_Ch5: togglesfx dutycycle $1 notetype $2, $e1 @@ -3131,13 +2763,11 @@ Sfx_MasterBall_Ch5: ; f179e note C#, 2 note C_, 2 endchannel -; f17c0 -Sfx_EggHatch: ; f17c0 - dbw $04, Sfx_EggHatch_Ch5 -; f17c3 +Sfx_EggHatch: + musicheader 1, 5, Sfx_EggHatch_Ch5 -Sfx_EggHatch_Ch5: ; f17c3 +Sfx_EggHatch_Ch5: togglesfx notetype $2, $f1 dutycycle $2 @@ -3154,92 +2784,82 @@ Sfx_EggHatch_Ch5: ; f17c3 intensity $42 note B_, 7 endchannel -; f17d9 - -Sfx_GsIntroCharizardFireball: ; f17d9 - dbw $07, Sfx_GsIntroCharizardFireball_Ch8 -; f17dc - -Sfx_GsIntroCharizardFireball_Ch8: ; f17dc - noise $8, $cf, $4d - noise $8, $f1, $37 -Sfx_GsIntroCharizardFireball_branch_f17e2: ; f17e2 - noise $1, $f8, $4f - noise $0, $c8, $26 - noise $1, $d8, $5f - noise $0, $a8, $37 - loopchannel 12, Sfx_GsIntroCharizardFireball_branch_f17e2 - noise $3, $f8, $6f - noise $4, $d8, $5f - noise $c, $d8, $5c - noise $28, $d3, $4f - endchannel -; f17ff - -Sfx_GsIntroPokemonAppears: ; f17ff - dbw $07, Sfx_GsIntroPokemonAppears_Ch8 -; f1802 - -Sfx_GsIntroPokemonAppears_Ch8: ; f1802 - noise $1, $88, $4f - noise $2, $8f, $2 - noise $2, $5f, $12 - noise $2, $3f, $22 - noise $0, $f8, $27 - noise $1, $f8, $4f - noise $8, $f1, $0 - endchannel -; f1818 - -Sfx_Flash: ; f1818 - dbw $04, Sfx_Flash_Ch5 -; f181b - -Sfx_Flash_Ch5: ; f181b + +Sfx_GsIntroCharizardFireball: + musicheader 1, 8, Sfx_GsIntroCharizardFireball_Ch8 + +Sfx_GsIntroCharizardFireball_Ch8: + noise __, 9, $cf, $4d + noise __, 9, $f1, $37 +.loop + noise __, 2, $f8, $4f + noise __, 1, $c8, $26 + noise __, 2, $d8, $5f + noise __, 1, $a8, $37 + loopchannel 12, .loop + noise __, 4, $f8, $6f + noise __, 5, $d8, $5f + noise __, 13, $d8, $5c + noise C#, 9, $d3, $4f + endchannel + +Sfx_GsIntroPokemonAppears: + musicheader 1, 8, Sfx_GsIntroPokemonAppears_Ch8 + +Sfx_GsIntroPokemonAppears_Ch8: + noise __, 2, $88, $4f + noise __, 3, $8f, $2 + noise __, 3, $5f, $12 + noise __, 3, $3f, $22 + noise __, 1, $f8, $27 + noise __, 2, $f8, $4f + noise __, 9, $f1, $0 + endchannel + +Sfx_Flash: + musicheader 1, 5, Sfx_Flash_Ch5 + +Sfx_Flash_Ch5: dutycycle $1 soundinput $ef - sound $1, $40, $07e8 - sound $1, $60, $07e8 - sound $2, $80, $07e8 - sound $5, $a0, $07e8 - sound $6, $a0, $07e8 - sound $7, $80, $07e8 - sound $8, $60, $07e8 - sound $9, $30, $07e8 - sound $f, $12, $07e8 + sound __, 2, $40, $07e8 + sound __, 2, $60, $07e8 + sound __, 3, $80, $07e8 + sound __, 6, $a0, $07e8 + sound __, 7, $a0, $07e8 + sound __, 8, $80, $07e8 + sound __, 9, $60, $07e8 + sound __, 10, $30, $07e8 + sound __, 16, $12, $07e8 soundinput $8 endchannel -; f1846 -Sfx_GameFreakLogoGs: ; f1846 - dbw $04, Sfx_GameFreakLogoGs_Ch5 -; f1849 +Sfx_GameFreakLogoGs: + musicheader 1, 5, Sfx_GameFreakLogoGs_Ch5 -Sfx_GameFreakLogoGs_Ch5: ; f1849 +Sfx_GameFreakLogoGs_Ch5: dutycycle $3 soundinput $7f - sound $4, $55, $07e2 - sound $5, $75, $07e2 - sound $6, $94, $07e2 - sound $7, $b4, $07e2 - sound $8, $b3, $07e2 - sound $9, $93, $07e2 - sound $a, $72, $07e2 - sound $a, $53, $07e2 - sound $a, $34, $07e2 - sound $a, $15, $07e2 + sound __, 5, $55, $07e2 + sound __, 6, $75, $07e2 + sound __, 7, $94, $07e2 + sound __, 8, $b4, $07e2 + sound __, 9, $b3, $07e2 + sound __, 10, $93, $07e2 + sound __, 11, $72, $07e2 + sound __, 11, $53, $07e2 + sound __, 11, $34, $07e2 + sound __, 11, $15, $07e2 soundinput $8 endchannel -; f1878 -Sfx_DexFanfareLessThan20: ; f1878 - dbw $c4, Sfx_DexFanfareLessThan20_Ch5 - dbw $05, Sfx_DexFanfareLessThan20_Ch6 - dbw $06, Sfx_DexFanfareLessThan20_Ch7 - dbw $07, Sfx_DexFanfareLessThan20_Ch8 -; f1884 +Sfx_DexFanfareLessThan20: + musicheader 4, 5, Sfx_DexFanfareLessThan20_Ch5 + musicheader 1, 6, Sfx_DexFanfareLessThan20_Ch6 + musicheader 1, 7, Sfx_DexFanfareLessThan20_Ch7 + musicheader 1, 8, Sfx_DexFanfareLessThan20_Ch8 -Sfx_DexFanfareLessThan20_Ch5: ; f1884 +Sfx_DexFanfareLessThan20_Ch5: togglesfx tempo 124 volume $77 @@ -3257,13 +2877,10 @@ Sfx_DexFanfareLessThan20_Ch5: ; f1884 note E_, 2 note D_, 6 endchannel -; f189a - - -INCBIN "baserom.gbc", $f189a, $f189b - $f189a + togglesfx -Sfx_DexFanfareLessThan20_Ch6: ; f189b +Sfx_DexFanfareLessThan20_Ch6: togglesfx notetype $8, $c1 octave 3 @@ -3279,13 +2896,10 @@ Sfx_DexFanfareLessThan20_Ch6: ; f189b note G_, 2 note F#, 6 endchannel -; f18ac - - -INCBIN "baserom.gbc", $f18ac, $f18ad - $f18ac + togglesfx -Sfx_DexFanfareLessThan20_Ch7: ; f18ad +Sfx_DexFanfareLessThan20_Ch7: togglesfx notetype $8, $25 octave 4 @@ -3310,13 +2924,10 @@ Sfx_DexFanfareLessThan20_Ch7: ; f18ad note A_, 2 note __, 6 endchannel -; f18c7 - - -INCBIN "baserom.gbc", $f18c7, $f18c8 - $f18c7 + togglesfx -Sfx_DexFanfareLessThan20_Ch8: ; f18c8 +Sfx_DexFanfareLessThan20_Ch8: togglesfx sfxtogglenoise $4 notetype $c @@ -3324,20 +2935,16 @@ Sfx_DexFanfareLessThan20_Ch8: ; f18c8 note __, 16 note __, 12 endchannel -; f18d1 - - -INCBIN "baserom.gbc", $f18d1, $f18d2 - $f18d1 + togglesfx -Sfx_DexFanfare140169: ; f18d2 - dbw $c4, Sfx_DexFanfare140169_Ch5 - dbw $05, Sfx_DexFanfare140169_Ch6 - dbw $06, Sfx_DexFanfare140169_Ch7 - dbw $07, Sfx_DexFanfare140169_Ch8 -; f18de +Sfx_DexFanfare140169: + musicheader 4, 5, Sfx_DexFanfare140169_Ch5 + musicheader 1, 6, Sfx_DexFanfare140169_Ch6 + musicheader 1, 7, Sfx_DexFanfare140169_Ch7 + musicheader 1, 8, Sfx_DexFanfare140169_Ch8 -Sfx_DexFanfare140169_Ch5: ; f18de +Sfx_DexFanfare140169_Ch5: togglesfx tempo 120 volume $77 @@ -3363,13 +2970,10 @@ Sfx_DexFanfare140169_Ch5: ; f18de note B_, 8 note __, 8 endchannel -; f1900 - - -INCBIN "baserom.gbc", $f1900, $f1901 - $f1900 + togglesfx -Sfx_DexFanfare140169_Ch6: ; f1901 +Sfx_DexFanfare140169_Ch6: togglesfx dutycycle $2 vibrato $12, $34 @@ -3392,13 +2996,10 @@ Sfx_DexFanfare140169_Ch6: ; f1901 note G_, 8 note __, 8 endchannel -; f191d - - -INCBIN "baserom.gbc", $f191d, $f191e - $f191d + togglesfx -Sfx_DexFanfare140169_Ch7: ; f191e +Sfx_DexFanfare140169_Ch7: togglesfx notetype $c, $25 note __, 4 @@ -3429,40 +3030,33 @@ Sfx_DexFanfare140169_Ch7: ; f191e note G_, 4 note __, 4 endchannel -; f193e - - -INCBIN "baserom.gbc", $f193e, $f193f - $f193e + togglesfx -Sfx_DexFanfare140169_Ch8: ; f193f +Sfx_DexFanfare140169_Ch8: togglesfx sfxtogglenoise $4 notetype $c note C_, 4 -Sfx_DexFanfare140169_branch_f1945: ; f1945 +.loop note D_, 4 note C#, 1 note C#, 1 note C#, 1 note C#, 1 - loopchannel 3, Sfx_DexFanfare140169_branch_f1945 + loopchannel 3, .loop note D_, 8 endchannel -; f1950 - - -INCBIN "baserom.gbc", $f1950, $f1951 - $f1950 + togglesfx -Sfx_DexFanfare170199: ; f1951 - dbw $c4, Sfx_DexFanfare170199_Ch5 - dbw $05, Sfx_DexFanfare170199_Ch6 - dbw $06, Sfx_DexFanfare170199_Ch7 - dbw $07, Sfx_DexFanfare170199_Ch8 -; f195d +Sfx_DexFanfare170199: + musicheader 4, 5, Sfx_DexFanfare170199_Ch5 + musicheader 1, 6, Sfx_DexFanfare170199_Ch6 + musicheader 1, 7, Sfx_DexFanfare170199_Ch7 + musicheader 1, 8, Sfx_DexFanfare170199_Ch8 -Sfx_DexFanfare170199_Ch5: ; f195d +Sfx_DexFanfare170199_Ch5: togglesfx tempo 112 volume $77 @@ -3488,13 +3082,10 @@ Sfx_DexFanfare170199_Ch5: ; f195d note A#, 12 note __, 4 endchannel -; f1981 - - -INCBIN "baserom.gbc", $f1981, $f1982 - $f1981 + togglesfx -Sfx_DexFanfare170199_Ch6: ; f1982 +Sfx_DexFanfare170199_Ch6: togglesfx vibrato $12, $34 dutycycle $3 @@ -3519,13 +3110,10 @@ Sfx_DexFanfare170199_Ch6: ; f1982 note D_, 12 note __, 4 endchannel -; f19a2 - - -INCBIN "baserom.gbc", $f19a2, $f19a3 - $f19a2 + togglesfx -Sfx_DexFanfare170199_Ch7: ; f19a3 +Sfx_DexFanfare170199_Ch7: togglesfx notetype $8, $25 octave 3 @@ -3550,13 +3138,10 @@ Sfx_DexFanfare170199_Ch7: ; f19a3 note A#, 12 note __, 4 endchannel -; f19bf - - -INCBIN "baserom.gbc", $f19bf, $f19c0 - $f19bf + togglesfx -Sfx_DexFanfare170199_Ch8: ; f19c0 +Sfx_DexFanfare170199_Ch8: togglesfx sfxtogglenoise $4 notetype $8 @@ -3575,20 +3160,16 @@ Sfx_DexFanfare170199_Ch8: ; f19c0 notetype $c note B_, 16 endchannel -; f19d5 - - -INCBIN "baserom.gbc", $f19d5, $f19d6 - $f19d5 + db $fd -Sfx_DexFanfare200229: ; f19d6 - dbw $c4, Sfx_DexFanfare200229_Ch5 - dbw $05, Sfx_DexFanfare200229_Ch6 - dbw $06, Sfx_DexFanfare200229_Ch7 - dbw $07, Sfx_DexFanfare200229_Ch8 -; f19e2 +Sfx_DexFanfare200229: + musicheader 4, 5, Sfx_DexFanfare200229_Ch5 + musicheader 1, 6, Sfx_DexFanfare200229_Ch6 + musicheader 1, 7, Sfx_DexFanfare200229_Ch7 + musicheader 1, 8, Sfx_DexFanfare200229_Ch8 -Sfx_DexFanfare200229_Ch5: ; f19e2 +Sfx_DexFanfare200229_Ch5: togglesfx tempo 124 volume $77 @@ -3612,13 +3193,10 @@ Sfx_DexFanfare200229_Ch5: ; f19e2 note F#, 12 note __, 4 endchannel -; f1a03 - - -INCBIN "baserom.gbc", $f1a03, $f1a04 - $f1a03 + togglesfx -Sfx_DexFanfare200229_Ch6: ; f1a04 +Sfx_DexFanfare200229_Ch6: togglesfx vibrato $12, $34 dutycycle $3 @@ -3638,13 +3216,10 @@ Sfx_DexFanfare200229_Ch6: ; f1a04 note A_, 12 note __, 4 endchannel -; f1a1e - - -INCBIN "baserom.gbc", $f1a1e, $f1a1f - $f1a1e + togglesfx -Sfx_DexFanfare200229_Ch7: ; f1a1f +Sfx_DexFanfare200229_Ch7: togglesfx notetype $8, $25 octave 3 @@ -3685,13 +3260,10 @@ Sfx_DexFanfare200229_Ch7: ; f1a1f note D_, 6 note __, 6 endchannel -; f1a49 - - -INCBIN "baserom.gbc", $f1a49, $f1a4a - $f1a49 + togglesfx -Sfx_DexFanfare200229_Ch8: ; f1a4a +Sfx_DexFanfare200229_Ch8: togglesfx sfxtogglenoise $4 notetype $8 @@ -3717,20 +3289,16 @@ Sfx_DexFanfare200229_Ch8: ; f1a4a note D_, 2 note B_, 12 endchannel -; f1a65 - - -INCBIN "baserom.gbc", $f1a65, $f1a66 - $f1a65 + togglesfx -Sfx_DexFanfare230Plus: ; f1a66 - dbw $c4, Sfx_DexFanfare230Plus_Ch5 - dbw $05, Sfx_DexFanfare230Plus_Ch6 - dbw $06, Sfx_DexFanfare230Plus_Ch7 - dbw $07, Sfx_DexFanfare230Plus_Ch8 -; f1a72 +Sfx_DexFanfare230Plus: + musicheader 4, 5, Sfx_DexFanfare230Plus_Ch5 + musicheader 1, 6, Sfx_DexFanfare230Plus_Ch6 + musicheader 1, 7, Sfx_DexFanfare230Plus_Ch7 + musicheader 1, 8, Sfx_DexFanfare230Plus_Ch8 -Sfx_DexFanfare230Plus_Ch5: ; f1a72 +Sfx_DexFanfare230Plus_Ch5: togglesfx tempo 112 volume $77 @@ -3775,13 +3343,10 @@ Sfx_DexFanfare230Plus_Ch5: ; f1a72 note A_, 14 note __, 2 endchannel -; f1ab1 - - -INCBIN "baserom.gbc", $f1ab1, $f1ab2 - $f1ab1 + togglesfx -Sfx_DexFanfare230Plus_Ch6: ; f1ab2 +Sfx_DexFanfare230Plus_Ch6: togglesfx vibrato $12, $34 dutycycle $3 @@ -3813,13 +3378,10 @@ Sfx_DexFanfare230Plus_Ch6: ; f1ab2 note F#, 14 note __, 2 endchannel -; f1ad9 - - -INCBIN "baserom.gbc", $f1ad9, $f1ada - $f1ad9 + togglesfx -Sfx_DexFanfare230Plus_Ch7: ; f1ada +Sfx_DexFanfare230Plus_Ch7: togglesfx notetype $8, $25 octave 3 @@ -3865,20 +3427,17 @@ Sfx_DexFanfare230Plus_Ch7: ; f1ada note D_, 14 note __, 2 endchannel -; f1b0b - - -INCBIN "baserom.gbc", $f1b0b, $f1b0c - $f1b0b + togglesfx -Sfx_DexFanfare230Plus_Ch8: ; f1b0c +Sfx_DexFanfare230Plus_Ch8: togglesfx sfxtogglenoise $4 notetype $8 note D_, 2 note D_, 2 note D_, 2 -Sfx_DexFanfare230Plus_branch_f1b14: ; f1b14 +.loop1 note D_, 6 note D_, 2 note D_, 2 @@ -3890,7 +3449,7 @@ Sfx_DexFanfare230Plus_branch_f1b14: ; f1b14 note C#, 1 note C#, 1 note C#, 1 - loopchannel 2, Sfx_DexFanfare230Plus_branch_f1b14 + loopchannel 2, .loop1 note D_, 6 note D_, 2 note D_, 2 @@ -3899,233 +3458,205 @@ Sfx_DexFanfare230Plus_branch_f1b14: ; f1b14 note D_, 4 note D_, 4 note D_, 4 -Sfx_DexFanfare230Plus_branch_f1b2b: ; f1b2b +.loop2 note C#, 1 - loopchannel 18, Sfx_DexFanfare230Plus_branch_f1b2b + loopchannel 18, .loop2 note D_, 6 endchannel -; f1b32 - - -INCBIN "baserom.gbc", $f1b32, $f1b33 - $f1b32 + togglesfx -Sfx_NotVeryEffective: ; f1b33 - dbw $07, Sfx_NotVeryEffective_Ch8 -; f1b36 +Sfx_NotVeryEffective: + musicheader 1, 8, Sfx_NotVeryEffective_Ch8 -Sfx_NotVeryEffective_Ch8: ; f1b36 - noise $4, $f1, $5f - noise $1, $a0, $42 - noise $10, $f1, $53 +Sfx_NotVeryEffective_Ch8: + noise __, 5, $f1, $5f + noise __, 2, $a0, $42 + noise C_, 1, $f1, $53 endchannel -; f1b40 -Sfx_Damage: ; f1b40 - dbw $07, Sfx_Damage_Ch8 -; f1b43 +Sfx_Damage: + musicheader 1, 8, Sfx_Damage_Ch8 -Sfx_Damage_Ch8: ; f1b43 - noise $4, $f1, $5e - noise $1, $a0, $12 - noise $4, $f0, $32 - noise $10, $f1, $44 +Sfx_Damage_Ch8: + noise __, 5, $f1, $5e + noise __, 2, $a0, $12 + noise __, 5, $f0, $32 + noise C_, 1, $f1, $44 endchannel -; f1b50 -Sfx_SuperEffective: ; f1b50 - dbw $07, Sfx_SuperEffective_Ch8 -; f1b53 +Sfx_SuperEffective: + musicheader 1, 8, Sfx_SuperEffective_Ch8 -Sfx_SuperEffective_Ch8: ; f1b53 - noise $3, $f1, $4f - noise $1, $c8, $22 - noise $2, $f8, $3f - noise $3, $d0, $15 - noise $20, $f2, $35 +Sfx_SuperEffective_Ch8: + noise __, 4, $f1, $4f + noise __, 2, $c8, $22 + noise __, 3, $f8, $3f + noise __, 4, $d0, $15 + noise C#, 1, $f2, $35 endchannel -; f1b63 -Sfx_BallBounce: ; f1b63 - dbw $44, Sfx_BallBounce_Ch5 - dbw $05, Sfx_BallBounce_Ch6 -; f1b69 +Sfx_BallBounce: + musicheader 2, 5, Sfx_BallBounce_Ch5 + musicheader 1, 6, Sfx_BallBounce_Ch6 -Sfx_BallBounce_Ch5: ; f1b69 +Sfx_BallBounce_Ch5: dutycycle $2 - sound $8, $e1, $0740 - sound $17, $0, $0000 - sound $8, $b1, $0740 - sound $17, $0, $0000 - sound $8, $81, $0740 - sound $17, $0, $0000 - sound $8, $51, $0740 - sound $17, $0, $0000 - endchannel -; f1b8c - -Sfx_BallBounce_Ch6: ; f1b8c + sound __, 9, $e1, $0740 + sound C_, 8, $0, 0 + sound __, 9, $b1, $0740 + sound C_, 8, $0, 0 + sound __, 9, $81, $0740 + sound C_, 8, $0, 0 + sound __, 9, $51, $0740 + sound C_, 8, $0, 0 + endchannel + +Sfx_BallBounce_Ch6: dutycycle $2 - sound $2, $8, $0000 - sound $8, $b1, $0741 - sound $17, $0, $0000 - sound $8, $81, $0741 - sound $17, $0, $0000 - sound $8, $51, $0741 - sound $17, $0, $0000 - sound $8, $21, $0741 - sound $17, $0, $0000 - endchannel -; f1bb3 - -Sfx_SweetScent2: ; f1bb3 - dbw $44, Sfx_SweetScent2_Ch5 - dbw $07, Sfx_SweetScent2_Ch8 -; f1bb9 - -Sfx_SweetScent2_Ch5: ; f1bb9 + sound __, 3, $8, 0 + sound __, 9, $b1, $0741 + sound C_, 8, $0, 0 + sound __, 9, $81, $0741 + sound C_, 8, $0, 0 + sound __, 9, $51, $0741 + sound C_, 8, $0, 0 + sound __, 9, $21, $0741 + sound C_, 8, $0, 0 + endchannel + +Sfx_SweetScent2: + musicheader 2, 5, Sfx_SweetScent2_Ch5 + musicheader 1, 8, Sfx_SweetScent2_Ch8 + +Sfx_SweetScent2_Ch5: soundinput $af dutycycle $1 - sound $6, $f8, $05f0 - sound $2, $f1, $0620 - sound $10, $f1, $0650 + sound __, 7, $f8, $05f0 + sound __, 3, $f1, $0620 + sound C_, 1, $f1, $0650 soundinput $8 endchannel -; f1bcc - -Sfx_SweetScent2_Ch8: ; f1bcc - noise $2, $e8, $22 - noise $11, $aa, $0 -Sfx_SweetScent2_branch_f1bd2: ; f1bd2 - noise $4, $d9, $10 - noise $8, $91, $0 - noise $2, $61, $7 - loopchannel 5, Sfx_SweetScent2_branch_f1bd2 - noise $4, $99, $0 - noise $a, $61, $0 - noise $6, $59, $0 - noise $2, $21, $7 - endchannel -; f1bec - -Sfx_HitEndOfExpBar: ; f1bec - dbw $44, Sfx_HitEndOfExpBar_Ch5 - dbw $05, Sfx_HitEndOfExpBar_Ch6 -; f1bf2 - -Sfx_HitEndOfExpBar_Ch5: ; f1bf2 + +Sfx_SweetScent2_Ch8: + noise __, 3, $e8, $22 + noise C_, 2, $aa, $0 +.loop + noise __, 5, $d9, $10 + noise __, 9, $91, $0 + noise __, 3, $61, $7 + loopchannel 5, .loop + noise __, 5, $99, $0 + noise __, 11, $61, $0 + noise __, 7, $59, $0 + noise __, 3, $21, $7 + endchannel + +Sfx_HitEndOfExpBar: + musicheader 2, 5, Sfx_HitEndOfExpBar_Ch5 + musicheader 1, 6, Sfx_HitEndOfExpBar_Ch6 + +Sfx_HitEndOfExpBar_Ch5: dutycycle $2 - sound $1, $e1, $0789 - sound $1, $e1, $07a2 - sound $10, $e1, $07b1 + sound __, 2, $e1, $0789 + sound __, 2, $e1, $07a2 + sound C_, 1, $e1, $07b1 endchannel -; f1c01 -Sfx_HitEndOfExpBar_Ch6: ; f1c01 +Sfx_HitEndOfExpBar_Ch6: dutycycle $2 - sound $1, $e1, $07a2 - sound $1, $e1, $07b1 - sound $10, $e1, $07c4 + sound __, 2, $e1, $07a2 + sound __, 2, $e1, $07b1 + sound C_, 1, $e1, $07c4 endchannel -; f1c10 -Sfx_GiveTrademon: ; f1c10 - dbw $04, Sfx_GiveTrademon_Ch5 -; f1c13 +Sfx_GiveTrademon: + musicheader 1, 5, Sfx_GiveTrademon_Ch5 -Sfx_GiveTrademon_Ch5: ; f1c13 - sound $20, $0, $0000 +Sfx_GiveTrademon_Ch5: + sound C#, 1, $0, 0 dutycycle $1 soundinput $a7 - sound $1b, $f4, $0750 - sound $1b, $d4, $0750 - sound $1b, $b4, $0750 - sound $1b, $94, $0750 - sound $1b, $74, $0750 - sound $1b, $54, $0750 - sound $1b, $34, $0750 - sound $1b, $14, $0750 + sound C_, 12, $f4, $0750 + sound C_, 12, $d4, $0750 + sound C_, 12, $b4, $0750 + sound C_, 12, $94, $0750 + sound C_, 12, $74, $0750 + sound C_, 12, $54, $0750 + sound C_, 12, $34, $0750 + sound C_, 12, $14, $0750 soundinput $8 endchannel -; f1c3e -Sfx_GetTrademon: ; f1c3e - dbw $04, Sfx_GetTrademon_Ch5 -; f1c41 +Sfx_GetTrademon: + musicheader 1, 5, Sfx_GetTrademon_Ch5 -Sfx_GetTrademon_Ch5: ; f1c41 - sound $20, $0, $0000 +Sfx_GetTrademon_Ch5: + sound C#, 1, $0, 0 dutycycle $2 soundinput $bf - sound $1b, $14, $07bc - sound $1b, $34, $07bc - sound $1b, $54, $07bc - sound $1b, $74, $07bc - sound $1b, $94, $07bc - sound $1b, $b4, $07bc - sound $1b, $d4, $07bc - sound $1b, $f4, $07bc + sound C_, 12, $14, $07bc + sound C_, 12, $34, $07bc + sound C_, 12, $54, $07bc + sound C_, 12, $74, $07bc + sound C_, 12, $94, $07bc + sound C_, 12, $b4, $07bc + sound C_, 12, $d4, $07bc + sound C_, 12, $f4, $07bc soundinput $8 endchannel -; f1c6c -Sfx_TrainArrived: ; f1c6c - dbw $84, Sfx_TrainArrived_Ch5 - dbw $05, Sfx_TrainArrived_Ch6 - dbw $07, Sfx_TrainArrived_Ch8 -; f1c75 +Sfx_TrainArrived: + musicheader 3, 5, Sfx_TrainArrived_Ch5 + musicheader 1, 6, Sfx_TrainArrived_Ch6 + musicheader 1, 8, Sfx_TrainArrived_Ch8 -Sfx_TrainArrived_Ch6: ; f1c75 +Sfx_TrainArrived_Ch6: tone $0008 - sound $8, $0, $0000 -Sfx_TrainArrived_Ch5: ; f1c7c + sound __, 9, $0, 0 +Sfx_TrainArrived_Ch5: dutycycle $2 - sound $4, $5f, $0691 - sound $4, $6f, $0694 - sound $4, $78, $0697 - sound $4, $7f, $069a - sound $4, $68, $06ae - sound $10, $6f, $06ab - sound $68, $65, $06a8 - endchannel -; f1c9b - -Sfx_TrainArrived_Ch8: ; f1c9b - noise $5, $af, $10 - noise $4, $9f, $20 - noise $4, $8f, $21 - noise $4, $7f, $22 - noise $4, $8f, $21 - noise $4, $9f, $20 - noise $4, $9f, $10 - noise $68, $a3, $0 - endchannel -; f1cb4 - -Sfx_2Boops: ; f1cb4 - dbw $04, Sfx_2Boops_Ch5 -; f1cb7 - -Sfx_2Boops_Ch5: ; f1cb7 + sound __, 5, $5f, $0691 + sound __, 5, $6f, $0694 + sound __, 5, $78, $0697 + sound __, 5, $7f, $069a + sound __, 5, $68, $06ae + sound C_, 1, $6f, $06ab + sound F_, 9, $65, $06a8 + endchannel + +Sfx_TrainArrived_Ch8: + noise __, 6, $af, $10 + noise __, 5, $9f, $20 + noise __, 5, $8f, $21 + noise __, 5, $7f, $22 + noise __, 5, $8f, $21 + noise __, 5, $9f, $20 + noise __, 5, $9f, $10 + noise F_, 9, $a3, $0 + endchannel + +Sfx_2Boops: + musicheader 1, 5, Sfx_2Boops_Ch5 + +Sfx_2Boops_Ch5: dutycycle $2 -Sfx_2Boops_branch_f1cb9: ; f1cb9 +.loop soundinput $79 - sound $1, $99, $0563 - sound $4, $f2, $04b5 + sound __, 2, $99, $0563 + sound __, 5, $f2, $04b5 soundinput $43 - sound $10, $f8, $05cd - loopchannel 2, Sfx_2Boops_branch_f1cb9 + sound C_, 1, $f8, $05cd + loopchannel 2, .loop soundinput $8 endchannel -; f1cd0 -Sfx_Menu_Ch8: ; f1cd0 - noise $1, $e2, $33 - noise $8, $e1, $22 +Sfx_Menu_Ch8: + noise __, 2, $e2, $33 + noise __, 9, $e1, $22 endchannel -; f1cd7 -Sfx_Pokeflute_Ch7: ; f1cd7 +Sfx_Pokeflute_Ch7: tempo 256 volume $77 togglesfx @@ -4149,1087 +3680,942 @@ Sfx_Pokeflute_Ch7: ; f1cd7 note G_, 8 note __, 12 endchannel -; f1cf5 -Sfx_PlacePuzzlePieceDown_Ch8: ; f1cf5 - noise $2, $f7, $24 - noise $2, $f7, $34 - noise $4, $f7, $44 - noise $8, $f4, $55 - noise $8, $f1, $44 +Sfx_PlacePuzzlePieceDown_Ch8: + noise __, 3, $f7, $24 + noise __, 3, $f7, $34 + noise __, 5, $f7, $44 + noise __, 9, $f4, $55 + noise __, 9, $f1, $44 endchannel -; f1d05 -Sfx_EnterDoor_Ch8: ; f1d05 - noise $9, $f1, $44 - noise $8, $d1, $43 +Sfx_EnterDoor_Ch8: + noise __, 10, $f1, $44 + noise __, 9, $d1, $43 endchannel -; f1d0c -Sfx_SwitchPokemon_Ch5: ; f1d0c +Sfx_SwitchPokemon_Ch5: dutycycle $2 - sound $8, $e1, $0740 + sound __, 9, $e1, $0740 endchannel -; f1d13 -Sfx_SwitchPokemon_Ch6: ; f1d13 +Sfx_SwitchPokemon_Ch6: dutycycle $2 - sound $2, $8, $0000 - sound $8, $b1, $0741 + sound __, 3, $8, 0 + sound __, 9, $b1, $0741 endchannel -; f1d1e -Sfx_PokeballsPlacedOnTable_Ch5: ; f1d1e +Sfx_PokeballsPlacedOnTable_Ch5: dutycycle $2 soundinput $3a - sound $4, $f2, $0200 + sound __, 5, $f2, $0200 soundinput $22 - sound $8, $e2, $0200 + sound __, 9, $e2, $0200 soundinput $8 endchannel -; f1d2f -Sfx_BallWiggle_Ch5: ; f1d2f +Sfx_BallWobble_Ch5: dutycycle $2 soundinput $3a - sound $4, $f2, $0400 + sound __, 5, $f2, $0400 soundinput $22 - sound $8, $e2, $0400 + sound __, 9, $e2, $0400 soundinput $8 endchannel -; f1d40 -Sfx_Tally_Ch5: ; f1d40 +Sfx_Tally_Ch5: dutycycle $2 - sound $4, $f1, $0780 + sound __, 5, $f1, $0780 endchannel -; f1d47 -Sfx_Tally_Ch6: ; f1d47 +Sfx_Tally_Ch6: dutycycle $2 - sound $1, $8, $0000 - sound $4, $a1, $0761 + sound __, 2, $8, 0 + sound __, 5, $a1, $0761 endchannel -; f1d52 -Sfx_Transaction_Ch5: ; f1d52 +Sfx_Transaction_Ch5: dutycycle $2 - sound $4, $e1, $0700 - sound $18, $f2, $07e0 + sound __, 5, $e1, $0700 + sound C_, 9, $f2, $07e0 endchannel -; f1d5d -Sfx_Transaction_Ch6: ; f1d5d +Sfx_Transaction_Ch6: dutycycle $2 - sound $1, $8, $0000 - sound $4, $91, $06c1 - sound $18, $a2, $07a1 + sound __, 2, $8, 0 + sound __, 5, $91, $06c1 + sound C_, 9, $a2, $07a1 endchannel -; f1d6c -Sfx_Bump_Ch5: ; f1d6c +Sfx_Bump_Ch5: dutycycle $2 soundinput $5a - sound $f, $f1, $0300 + sound __, 16, $f1, $0300 soundinput $8 endchannel -; f1d77 -Sfx_ExitBuilding_Ch8: ; f1d77 - noise $2, $f1, $54 - noise $c, $71, $23 - noise $2, $b1, $54 - noise $c, $61, $23 - noise $6, $41, $54 +Sfx_ExitBuilding_Ch8: + noise __, 3, $f1, $54 + noise __, 13, $71, $23 + noise __, 3, $b1, $54 + noise __, 13, $61, $23 + noise __, 7, $41, $54 endchannel -; f1d87 -Sfx_ReadText2_Ch5: ; f1d87 -Sfx_ReadText_Ch5: ; f1d87 +Sfx_ReadText2_Ch5: +Sfx_ReadText_Ch5: dutycycle $2 - sound $0, $91, $07c0 - sound $0, $81, $07d0 - sound $0, $91, $07c0 - sound $c, $a1, $07d0 + sound __, 1, $91, $07c0 + sound __, 1, $81, $07d0 + sound __, 1, $91, $07c0 + sound __, 13, $a1, $07d0 endchannel -; f1d9a -Sfx_Potion_Ch5: ; f1d9a +Sfx_Potion_Ch5: dutycycle $2 soundinput $17 - sound $f, $f0, $04f0 - sound $f, $f2, $0650 + sound __, 16, $f0, $04f0 + sound __, 16, $f2, $0650 soundinput $8 endchannel -; f1da9 -Sfx_Poison_Ch5: ; f1da9 -Sfx_Poison_branch_f1da9: ; f1da9 +Sfx_Poison_Ch5: dutycycle $0 soundinput $14 - sound $4, $f2, $0600 - loopchannel 4, Sfx_Poison_branch_f1da9 - sound $f, $f3, $0600 + sound __, 5, $f2, $0600 + loopchannel 4, Sfx_Poison_Ch5 + sound __, 16, $f3, $0600 soundinput $8 endchannel -; f1dbc -Sfx_FullHeal_Ch5: ; f1dbc +Sfx_FullHeal_Ch5: dutycycle $2 soundinput $14 - sound $4, $f2, $0600 - sound $4, $f2, $0600 + sound __, 5, $f2, $0600 + sound __, 5, $f2, $0600 soundinput $17 - sound $f, $f2, $0600 + sound __, 16, $f2, $0600 soundinput $8 endchannel -; f1dd1 -Sfx_GotSafariBalls_Ch5: ; f1dd1 +Sfx_GotSafariBalls_Ch5: dutycycle $2 soundinput $15 - sound $f, $f0, $04f0 - sound $f, $f2, $0650 + sound __, 16, $f0, $04f0 + sound __, 16, $f2, $0650 soundinput $8 endchannel -; f1de0 -Sfx_BootPc_Ch5: ; f1de0 +Sfx_BootPc_Ch5: dutycycle $2 - sound $f, $f2, $07c0 - sound $f, $0, $0000 - sound $3, $a1, $0780 - sound $3, $a1, $0700 - sound $3, $a1, $0740 - sound $3, $a1, $0700 - sound $3, $a1, $0780 - sound $3, $a1, $0700 - sound $3, $a1, $07c0 - sound $8, $a1, $0700 - endchannel -; f1e0b - -Sfx_ShutDownPc_Ch5: ; f1e0b + sound __, 16, $f2, $07c0 + sound __, 16, $0, 0 + sound __, 4, $a1, $0780 + sound __, 4, $a1, $0700 + sound __, 4, $a1, $0740 + sound __, 4, $a1, $0700 + sound __, 4, $a1, $0780 + sound __, 4, $a1, $0700 + sound __, 4, $a1, $07c0 + sound __, 9, $a1, $0700 + endchannel + +Sfx_ShutDownPc_Ch5: dutycycle $2 - sound $4, $f0, $0600 - sound $4, $f0, $0400 - sound $4, $f0, $0200 - sound $1, $0, $0000 + sound __, 5, $f0, $0600 + sound __, 5, $f0, $0400 + sound __, 5, $f0, $0200 + sound __, 2, $0, 0 endchannel -; f1e1e -Sfx_ChoosePcOption_Ch5: ; f1e1e +Sfx_ChoosePcOption_Ch5: dutycycle $2 - sound $6, $f0, $0700 - sound $4, $0, $0000 - sound $6, $f0, $0700 - sound $1, $0, $0000 + sound __, 7, $f0, $0700 + sound __, 5, $0, 0 + sound __, 7, $f0, $0700 + sound __, 2, $0, 0 endchannel -; f1e31 -Sfx_EscapeRope_Ch5: ; f1e31 +Sfx_EscapeRope_Ch5: dutycycle $1 soundinput $17 - sound $f, $d7, $0600 - sound $f, $b7, $0580 - sound $f, $87, $0500 - sound $f, $47, $0480 - sound $f, $17, $0400 + sound __, 16, $d7, $0600 + sound __, 16, $b7, $0580 + sound __, 16, $87, $0500 + sound __, 16, $47, $0480 + sound __, 16, $17, $0400 soundinput $8 endchannel -; f1e4c -Sfx_PushButton_Ch5: ; f1e4c +Sfx_PushButton_Ch5: dutycycle $2 - sound $4, $0, $0000 - sound $2, $f1, $0680 - sound $1, $0, $0000 - sound $4, $f1, $0780 - sound $4, $0, $0000 + sound __, 5, $0, 0 + sound __, 3, $f1, $0680 + sound __, 2, $0, 0 + sound __, 5, $f1, $0780 + sound __, 5, $0, 0 endchannel -; f1e63 -Sfx_SecondPartOfItemfinder_Ch5: ; f1e63 +Sfx_SecondPartOfItemfinder_Ch5: dutycycle $2 soundinput $2c - sound $4, $f2, $0500 + sound __, 5, $f2, $0500 soundinput $22 - sound $2, $f1, $0500 + sound __, 3, $f1, $0500 soundinput $8 - sound $1, $0, $0000 + sound __, 2, $0, 0 endchannel -; f1e78 -Sfx_WarpTo_Ch5: ; f1e78 +Sfx_WarpTo_Ch5: dutycycle $1 soundinput $17 - sound $f, $d7, $0500 - sound $f, $b7, $0580 - sound $f, $87, $0600 - sound $f, $47, $0680 - sound $f, $17, $0700 + sound __, 16, $d7, $0500 + sound __, 16, $b7, $0580 + sound __, 16, $87, $0600 + sound __, 16, $47, $0680 + sound __, 16, $17, $0700 soundinput $8 endchannel -; f1e93 -Sfx_WarpFrom_Ch5: ; f1e93 +Sfx_WarpFrom_Ch5: dutycycle $1 soundinput $17 - sound $f, $d7, $0700 - sound $f, $b7, $0680 - sound $f, $87, $0600 - sound $f, $47, $0580 - sound $f, $17, $0500 + sound __, 16, $d7, $0700 + sound __, 16, $b7, $0680 + sound __, 16, $87, $0600 + sound __, 16, $47, $0580 + sound __, 16, $17, $0500 soundinput $8 endchannel -; f1eae -Sfx_ChangeDexMode_Ch5: ; f1eae +Sfx_ChangeDexMode_Ch5: dutycycle $1 soundinput $16 - sound $f, $d2, $0500 + sound __, 16, $d2, $0500 soundinput $8 endchannel -; f1eb9 -Sfx_JumpOverLedge_Ch5: ; f1eb9 +Sfx_JumpOverLedge_Ch5: dutycycle $2 soundinput $95 - sound $f, $f2, $0400 + sound __, 16, $f2, $0400 soundinput $8 endchannel -; f1ec4 - -Sfx_GrassRustle_Ch8: ; f1ec4 - noise $2, $f1, $32 - noise $2, $0, $0 - noise $2, $f1, $22 - noise $1, $0, $0 - endchannel -; f1ed1 - -Sfx_Fly_Ch8: ; f1ed1 - noise $2, $f1, $12 - noise $2, $0, $0 - noise $2, $a1, $12 - noise $2, $0, $0 - noise $2, $d1, $12 - noise $2, $0, $0 - noise $2, $81, $12 - noise $2, $0, $0 - noise $2, $b1, $12 - noise $2, $0, $0 - noise $2, $61, $12 - noise $2, $0, $0 - noise $2, $91, $12 - noise $2, $0, $0 - noise $2, $41, $12 - noise $2, $0, $0 - endchannel -; f1f02 - -Sfx_Wrong_Ch5: ; f1f02 + +Sfx_GrassRustle_Ch8: + noise __, 3, $f1, $32 + noise __, 3, $0, $0 + noise __, 3, $f1, $22 + noise __, 2, $0, $0 + endchannel + +Sfx_Fly_Ch8: + noise __, 3, $f1, $12 + noise __, 3, $0, $0 + noise __, 3, $a1, $12 + noise __, 3, $0, $0 + noise __, 3, $d1, $12 + noise __, 3, $0, $0 + noise __, 3, $81, $12 + noise __, 3, $0, $0 + noise __, 3, $b1, $12 + noise __, 3, $0, $0 + noise __, 3, $61, $12 + noise __, 3, $0, $0 + noise __, 3, $91, $12 + noise __, 3, $0, $0 + noise __, 3, $41, $12 + noise __, 3, $0, $0 + endchannel + +Sfx_Wrong_Ch5: dutycycle $3 soundinput $5a - sound $4, $f0, $0500 + sound __, 5, $f0, $0500 soundinput $8 - sound $4, $0, $0000 - sound $f, $f0, $0500 - sound $1, $0, $0000 + sound __, 5, $0, 0 + sound __, 16, $f0, $0500 + sound __, 2, $0, 0 endchannel -; f1f19 -Sfx_Wrong_Ch6: ; f1f19 +Sfx_Wrong_Ch6: dutycycle $3 - sound $4, $f0, $0401 - sound $4, $0, $0000 - sound $f, $f0, $0401 - sound $1, $0, $0000 + sound __, 5, $f0, $0401 + sound __, 5, $0, 0 + sound __, 16, $f0, $0401 + sound __, 2, $0, 0 endchannel -; f1f2c -Sfx_Squeak_Ch5: ; f1f2c +Sfx_Squeak_Ch5: dutycycle $0 soundinput $17 - sound $f, $d2, $0700 + sound __, 16, $d2, $0700 soundinput $8 endchannel -; f1f37 -Sfx_Strength_Ch8: ; f1f37 - noise $4, $a2, $23 - noise $8, $f1, $34 - noise $f, $0, $0 - noise $2, $f7, $24 - noise $2, $f7, $34 - noise $4, $f7, $44 - noise $8, $f4, $55 - noise $8, $f1, $44 +Sfx_Strength_Ch8: + noise __, 5, $a2, $23 + noise __, 9, $f1, $34 + noise __, 16, $0, $0 + noise __, 3, $f7, $24 + noise __, 3, $f7, $34 + noise __, 5, $f7, $44 + noise __, 9, $f4, $55 + noise __, 9, $f1, $44 endchannel -; f1f50 -Sfx_Boat_Ch5: ; f1f50 +Sfx_Boat_Ch5: dutycycle $2 - sound $f, $f0, $0500 - sound $4, $0, $0000 - sound $f, $f0, $0500 - sound $f, $f0, $0500 - sound $f, $f0, $0500 - sound $f, $f0, $0500 - sound $f, $f2, $0500 + sound __, 16, $f0, $0500 + sound __, 5, $0, 0 + sound __, 16, $f0, $0500 + sound __, 16, $f0, $0500 + sound __, 16, $f0, $0500 + sound __, 16, $f0, $0500 + sound __, 16, $f2, $0500 endchannel -; f1f6f -Sfx_Boat_Ch6: ; f1f6f +Sfx_Boat_Ch6: dutycycle $3 - sound $f, $f0, $0482 - sound $4, $0, $0000 - sound $f, $f0, $0482 - sound $f, $f0, $0482 - sound $f, $f0, $0482 - sound $f, $f0, $0482 - sound $f, $f2, $0482 + sound __, 16, $f0, $0482 + sound __, 5, $0, 0 + sound __, 16, $f0, $0482 + sound __, 16, $f0, $0482 + sound __, 16, $f0, $0482 + sound __, 16, $f0, $0482 + sound __, 16, $f2, $0482 endchannel -; f1f8e -Sfx_WallOpen_Ch5: ; f1f8e +Sfx_WallOpen_Ch5: dutycycle $1 soundinput $3a - sound $4, $f2, $0500 + sound __, 5, $f2, $0500 soundinput $22 - sound $4, $e2, $0500 + sound __, 5, $e2, $0500 soundinput $3a - sound $4, $f2, $0700 + sound __, 5, $f2, $0700 soundinput $22 - sound $f, $e2, $0700 + sound __, 16, $e2, $0700 soundinput $8 endchannel -; f1fab -Sfx_ElevatorEnd_Ch5: ; f1fab +Sfx_ElevatorEnd_Ch5: dutycycle $2 - sound $f, $f3, $0730 - sound $8, $65, $0730 - sound $f, $f4, $0700 - sound $f, $74, $0700 - sound $f, $44, $0700 - sound $f, $24, $0700 + sound __, 16, $f3, $0730 + sound __, 9, $65, $0730 + sound __, 16, $f4, $0700 + sound __, 16, $74, $0700 + sound __, 16, $44, $0700 + sound __, 16, $24, $0700 endchannel -; f1fc6 -Sfx_ThrowBall_Ch5: ; f1fc6 +Sfx_ThrowBall_Ch5: dutycycle $2 soundinput $2f - sound $f, $f2, $0780 + sound __, 16, $f2, $0780 endchannel -; f1fcf -Sfx_ThrowBall_Ch6: ; f1fcf +Sfx_ThrowBall_Ch6: dutycycle $2 - sound $f, $c2, $0782 + sound __, 16, $c2, $0782 endchannel -; f1fd6 -Sfx_Shine_Ch5: ; f1fd6 +Sfx_Shine_Ch5: dutycycle $0 - sound $0, $d2, $0700 - sound $0, $d2, $0740 - sound $0, $d2, $0780 - sound $0, $d2, $07c0 - sound $a, $e1, $07e0 - sound $1, $0, $0000 + sound __, 1, $d2, $0700 + sound __, 1, $d2, $0740 + sound __, 1, $d2, $0780 + sound __, 1, $d2, $07c0 + sound __, 11, $e1, $07e0 + sound __, 2, $0, 0 endchannel -; f1ff1 -Sfx_BallPoof_Ch5: ; f1ff1 +Sfx_BallPoof_Ch5: dutycycle $2 soundinput $16 - sound $f, $f2, $0400 + sound __, 16, $f2, $0400 soundinput $8 endchannel -; f1ffc -Sfx_BallPoof_Ch8: ; f1ffc - noise $f, $a2, $22 +Sfx_BallPoof_Ch8: + noise __, 16, $a2, $22 endchannel -; f2000 -Sfx_Unknown3A_Ch5: ; f2000 - sound $f, $d1, $0200 +Sfx_Unknown3A_Ch5: + sound __, 16, $d1, $0200 soundinput $8 endchannel -; f2007 -Sfx_Unknown3A_Ch8: ; f2007 - noise $4, $f5, $33 - noise $8, $f4, $22 - noise $f, $f2, $21 +Sfx_Unknown3A_Ch8: + noise __, 5, $f5, $33 + noise __, 9, $f4, $22 + noise __, 16, $f2, $21 endchannel -; f2011 -Sfx_Run_Ch8: ; f2011 - noise $2, $61, $23 - noise $2, $a1, $33 - noise $2, $c1, $33 - noise $2, $51, $11 - noise $2, $f1, $33 - noise $2, $41, $11 - noise $2, $c1, $33 - noise $2, $31, $11 - noise $2, $81, $33 - noise $2, $31, $11 - noise $8, $41, $33 +Sfx_Run_Ch8: + noise __, 3, $61, $23 + noise __, 3, $a1, $33 + noise __, 3, $c1, $33 + noise __, 3, $51, $11 + noise __, 3, $f1, $33 + noise __, 3, $41, $11 + noise __, 3, $c1, $33 + noise __, 3, $31, $11 + noise __, 3, $81, $33 + noise __, 3, $31, $11 + noise __, 9, $41, $33 endchannel -; f2033 -Sfx_SlotMachineStart_Ch5: ; f2033 +Sfx_SlotMachineStart_Ch5: dutycycle $2 soundinput $44 - sound $f, $f0, $04f0 + sound __, 16, $f0, $04f0 soundinput $17 - sound $f, $f2, $0650 + sound __, 16, $f2, $0650 soundinput $8 endchannel -; f2044 -Sfx_SlotMachineStart_Ch6: ; f2044 +Sfx_SlotMachineStart_Ch6: dutycycle $2 - sound $f, $92, $0600 - sound $f, $92, $0782 + sound __, 16, $92, $0600 + sound __, 16, $92, $0782 endchannel -; f204f -Sfx_Call_Ch5: ; f204f +Sfx_Call_Ch5: soundinput $67 - sound $4, $f7, $07a0 - sound $4, $f7, $07a0 - sound $4, $f7, $07a0 - sound $4, $f7, $07a0 - sound $4, $f7, $07a0 + sound __, 5, $f7, $07a0 + sound __, 5, $f7, $07a0 + sound __, 5, $f7, $07a0 + sound __, 5, $f7, $07a0 + sound __, 5, $f7, $07a0 soundinput $8 - sound $4, $0, $0000 + sound __, 5, $0, 0 endchannel -; f206c -Sfx_Peck_Ch8: ; f206c - noise $2, $a1, $12 +Sfx_Peck_Ch8: + noise __, 3, $a1, $12 endchannel -; f2070 -Sfx_Kinesis_Ch5: ; f2070 +Sfx_Kinesis_Ch5: dutycycle $1 soundinput $af - sound $f, $f2, $0780 + sound __, 16, $f2, $0780 soundinput $8 endchannel -; f207b -Sfx_Lick_Ch5: ; f207b +Sfx_Lick_Ch5: dutycycle $1 soundinput $97 - sound $f, $f2, $0500 + sound __, 16, $f2, $0500 soundinput $8 endchannel -; f2086 -Sfx_Pound_Ch8: ; f2086 - noise $2, $a1, $22 +Sfx_Pound_Ch8: + noise __, 3, $a1, $22 endchannel -; f208a -Sfx_MovePuzzlePiece_Ch8: ; f208a - noise $8, $f1, $54 +Sfx_MovePuzzlePiece_Ch8: + noise __, 9, $f1, $54 endchannel -; f208e -Sfx_CometPunch_Ch8: ; f208e - noise $f, $8f, $11 - noise $4, $ff, $12 - noise $a, $f1, $55 +Sfx_CometPunch_Ch8: + noise __, 16, $8f, $11 + noise __, 5, $ff, $12 + noise __, 11, $f1, $55 endchannel -; f2098 -Sfx_MegaPunch_Ch8: ; f2098 - noise $f, $8f, $34 - noise $8, $f2, $35 - noise $a, $f1, $55 +Sfx_MegaPunch_Ch8: + noise __, 16, $8f, $34 + noise __, 9, $f2, $35 + noise __, 11, $f1, $55 endchannel -; f20a2 -Sfx_Scratch_Ch8: ; f20a2 - noise $f, $9f, $23 - noise $8, $f1, $21 +Sfx_Scratch_Ch8: + noise __, 16, $9f, $23 + noise __, 9, $f1, $21 endchannel -; f20a9 -Sfx_Vicegrip_Ch8: ; f20a9 - noise $2, $e1, $4b - noise $a, $f1, $44 - noise $2, $e1, $3a - noise $6, $f1, $34 +Sfx_Vicegrip_Ch8: + noise __, 3, $e1, $4b + noise __, 11, $f1, $44 + noise __, 3, $e1, $3a + noise __, 7, $f1, $34 endchannel -; f20b6 -Sfx_RazorWind_Ch8: ; f20b6 - noise $2, $f4, $44 - noise $2, $f4, $14 - noise $f, $f1, $32 +Sfx_RazorWind_Ch8: + noise __, 3, $f4, $44 + noise __, 3, $f4, $14 + noise __, 16, $f1, $32 endchannel -; f20c0 -Sfx_Cut_Ch8: ; f20c0 - noise $4, $8f, $55 - noise $2, $f4, $44 - noise $8, $f4, $22 - noise $f, $f2, $21 +Sfx_Cut_Ch8: + noise __, 5, $8f, $55 + noise __, 3, $f4, $44 + noise __, 9, $f4, $22 + noise __, 16, $f2, $21 endchannel -; f20cd -Sfx_WingAttack_Ch8: ; f20cd -Sfx_WingAttack_branch_f20cd: ; f20cd - noise $8, $4f, $23 - noise $4, $c4, $22 - noise $6, $f2, $23 - loopchannel 4, Sfx_WingAttack_branch_f20cd +Sfx_WingAttack_Ch8: + noise __, 9, $4f, $23 + noise __, 5, $c4, $22 + noise __, 7, $f2, $23 + loopchannel 4, Sfx_WingAttack_Ch8 endchannel -; f20db -Sfx_Whirlwind_Ch8: ; f20db - noise $8, $4f, $33 - noise $4, $c4, $22 - noise $6, $f2, $23 - noise $f, $f2, $22 +Sfx_Whirlwind_Ch8: + noise __, 9, $4f, $33 + noise __, 5, $c4, $22 + noise __, 7, $f2, $23 + noise __, 16, $f2, $22 endchannel -; f20e8 -Sfx_Bind_Ch8: ; f20e8 - noise $8, $ff, $32 - noise $8, $f4, $43 - noise $8, $f2, $54 - noise $8, $f1, $65 +Sfx_Bind_Ch8: + noise __, 9, $ff, $32 + noise __, 9, $f4, $43 + noise __, 9, $f2, $54 + noise __, 9, $f1, $65 endchannel -; f20f5 -Sfx_VineWhip_Ch8: ; f20f5 - noise $1, $c2, $33 - noise $2, $f2, $21 - noise $1, $e2, $33 - noise $1, $c2, $32 - noise $1, $92, $12 - noise $1, $b2, $31 - noise $c, $91, $10 - noise $8, $f2, $41 +Sfx_VineWhip_Ch8: + noise __, 2, $c2, $33 + noise __, 3, $f2, $21 + noise __, 2, $e2, $33 + noise __, 2, $c2, $32 + noise __, 2, $92, $12 + noise __, 2, $b2, $31 + noise __, 13, $91, $10 + noise __, 9, $f2, $41 endchannel -; f210e -Sfx_DoubleKick_Ch8: ; f210e - noise $1, $94, $23 - noise $1, $b4, $22 - noise $8, $f1, $44 +Sfx_DoubleKick_Ch8: + noise __, 2, $94, $23 + noise __, 2, $b4, $22 + noise __, 9, $f1, $44 endchannel -; f2118 -Sfx_MegaKick_Ch8: ; f2118 - noise $2, $94, $33 - noise $4, $b4, $22 - noise $4, $f1, $44 - noise $8, $f1, $55 +Sfx_MegaKick_Ch8: + noise __, 3, $94, $33 + noise __, 5, $b4, $22 + noise __, 5, $f1, $44 + noise __, 9, $f1, $55 endchannel -; f2125 -Sfx_Headbutt_Ch8: ; f2125 - noise $4, $ff, $55 - noise $8, $f1, $65 +Sfx_Headbutt_Ch8: + noise __, 5, $ff, $55 + noise __, 9, $f1, $65 endchannel -; f212c -Sfx_HornAttack_Ch8: ; f212c - noise $2, $84, $43 - noise $2, $c4, $22 - noise $8, $f2, $34 +Sfx_HornAttack_Ch8: + noise __, 3, $84, $43 + noise __, 3, $c4, $22 + noise __, 9, $f2, $34 endchannel -; f2136 -Sfx_Tackle_Ch8: ; f2136 - noise $4, $f1, $34 - noise $f, $f2, $64 +Sfx_Tackle_Ch8: + noise __, 5, $f1, $34 + noise __, 16, $f2, $64 endchannel -; f213d -Sfx_PoisonSting_Ch8: ; f213d - noise $2, $f1, $22 - noise $f, $f2, $12 +Sfx_PoisonSting_Ch8: + noise __, 3, $f1, $22 + noise __, 16, $f2, $12 endchannel -; f2144 -Sfx_Powder_Ch8: ; f2144 - noise $2, $c2, $1 - noise $f, $f4, $1 - noise $f, $f2, $1 +Sfx_Powder_Ch8: + noise __, 3, $c2, $1 + noise __, 16, $f4, $1 + noise __, 16, $f2, $1 endchannel -; f214e -Sfx_Doubleslap_Ch8: ; f214e - noise $8, $f1, $32 - noise $8, $f1, $33 +Sfx_Doubleslap_Ch8: + noise __, 9, $f1, $32 + noise __, 9, $f1, $33 endchannel -; f2155 -Sfx_Bite_Ch5: ; f2155 +Sfx_Bite_Ch5: dutycycle $0 soundinput $3a - sound $4, $f2, $0200 + sound __, 5, $f2, $0200 soundinput $22 - sound $8, $e2, $0200 + sound __, 9, $e2, $0200 soundinput $8 endchannel -; f2166 -Sfx_Bite_Ch8: ; f2166 - noise $0, $d1, $42 - noise $4, $a1, $32 - noise $0, $d1, $22 - noise $6, $a1, $32 +Sfx_Bite_Ch8: + noise __, 1, $d1, $42 + noise __, 5, $a1, $32 + noise __, 1, $d1, $22 + noise __, 7, $a1, $32 endchannel -; f2173 -Sfx_JumpKick_Ch8: ; f2173 - noise $3, $92, $31 - noise $3, $b2, $32 - noise $3, $c2, $33 - noise $8, $f1, $54 +Sfx_JumpKick_Ch8: + noise __, 4, $92, $31 + noise __, 4, $b2, $32 + noise __, 4, $c2, $33 + noise __, 9, $f1, $54 endchannel -; f2180 -Sfx_Stomp_Ch8: ; f2180 - noise $c, $f1, $54 - noise $8, $f1, $64 +Sfx_Stomp_Ch8: + noise __, 13, $f1, $54 + noise __, 9, $f1, $64 endchannel -; f2187 -Sfx_TailWhip_Ch8: ; f2187 - noise $2, $f1, $33 - noise $2, $c1, $32 - noise $2, $a1, $31 - noise $f, $82, $32 - noise $8, $f1, $34 +Sfx_TailWhip_Ch8: + noise __, 3, $f1, $33 + noise __, 3, $c1, $32 + noise __, 3, $a1, $31 + noise __, 16, $82, $32 + noise __, 9, $f1, $34 endchannel -; f2197 -Sfx_KarateChop_Ch8: ; f2197 - noise $2, $d2, $32 - noise $f, $f2, $43 +Sfx_KarateChop_Ch8: + noise __, 3, $d2, $32 + noise __, 16, $f2, $43 endchannel -; f219e -Sfx_Submission_Ch8: ; f219e - noise $2, $f2, $43 - noise $4, $b5, $32 - noise $9, $86, $31 - noise $7, $64, $0 - noise $f, $f2, $55 +Sfx_Submission_Ch8: + noise __, 3, $f2, $43 + noise __, 5, $b5, $32 + noise __, 10, $86, $31 + noise __, 8, $64, $0 + noise __, 16, $f2, $55 endchannel -; f21ae -Sfx_WaterGun_Ch5: ; f21ae +Sfx_WaterGun_Ch5: dutycycle $1 soundinput $97 - sound $f, $f2, $0700 + sound __, 16, $f2, $0700 soundinput $8 endchannel -; f21b9 -Sfx_WaterGun_Ch8: ; f21b9 - noise $f, $3f, $22 - noise $f, $f2, $21 +Sfx_WaterGun_Ch8: + noise __, 16, $3f, $22 + noise __, 16, $f2, $21 endchannel -; f21c0 -Sfx_SwordsDance_Ch8: ; f21c0 - noise $f, $4f, $41 - noise $8, $8f, $41 - noise $8, $cf, $41 - noise $8, $f2, $42 - noise $f, $f2, $41 +Sfx_SwordsDance_Ch8: + noise __, 16, $4f, $41 + noise __, 9, $8f, $41 + noise __, 9, $cf, $41 + noise __, 9, $f2, $42 + noise __, 16, $f2, $41 endchannel -; f21d0 -Sfx_Thunder_Ch8: ; f21d0 - noise $a, $ff, $50 - noise $f, $ff, $51 - noise $8, $f2, $51 - noise $6, $ff, $52 - noise $6, $ff, $53 - noise $8, $ff, $54 - noise $f, $f2, $54 +Sfx_Thunder_Ch8: + noise __, 11, $ff, $50 + noise __, 16, $ff, $51 + noise __, 9, $f2, $51 + noise __, 7, $ff, $52 + noise __, 7, $ff, $53 + noise __, 9, $ff, $54 + noise __, 16, $f2, $54 endchannel -; f21e6 -Sfx_Supersonic_Ch5: ; f21e6 +Sfx_Supersonic_Ch5: dutycycle $2 - sound $f, $3f, $07c0 -Sfx_Supersonic_branch_f21ec: ; f21ec - sound $f, $df, $07c0 - loopchannel 4, Sfx_Supersonic_branch_f21ec - sound $f, $d1, $07c0 - endchannel -; f21f9 - -Sfx_Supersonic_Ch6: ; f21f9 - unknownmusic0xde $b3 - sound $f, $2f, $07c8 -Sfx_Supersonic_branch_f21ff: ; f21ff - sound $f, $cf, $07c7 - loopchannel 4, Sfx_Supersonic_branch_f21ff - sound $f, $c1, $07c8 - endchannel -; f220c - -Sfx_Supersonic_Ch8: ; f220c -Sfx_Supersonic_branch_f220c: ; f220c - noise $3, $97, $12 - noise $3, $a1, $11 - loopchannel 10, Sfx_Supersonic_branch_f220c - endchannel -; f2217 - -Sfx_Leer_Ch5: ; f2217 -Sfx_Leer_branch_f2217: ; f2217 + sound __, 16, $3f, $07c0 +.loop + sound __, 16, $df, $07c0 + loopchannel 4, .loop + sound __, 16, $d1, $07c0 + endchannel + +Sfx_Supersonic_Ch6: + sound_duty 3, 0, 3, 2 + sound __, 16, $2f, $07c8 +.loop + sound __, 16, $cf, $07c7 + loopchannel 4, .loop + sound __, 16, $c1, $07c8 + endchannel + +Sfx_Supersonic_Ch8: + noise __, 4, $97, $12 + noise __, 4, $a1, $11 + loopchannel 10, Sfx_Supersonic_Ch8 + endchannel + +Sfx_Leer_Ch5: dutycycle $0 - sound $0, $f1, $07c0 - sound $0, $f1, $0700 - loopchannel 12, Sfx_Leer_branch_f2217 - endchannel -; f2226 - -Sfx_Leer_Ch6: ; f2226 -Sfx_Leer_branch_f2226: ; f2226 - unknownmusic0xde $b3 - sound $0, $e1, $07c1 - sound $0, $e1, $0701 - loopchannel 12, Sfx_Leer_branch_f2226 - endchannel -; f2235 - -Sfx_Leer_Ch8: ; f2235 -Sfx_Leer_branch_f2235: ; f2235 - noise $1, $d1, $49 - noise $1, $d1, $29 - loopchannel 6, Sfx_Leer_branch_f2235 - endchannel -; f2240 - -Sfx_Ember_Ch5: ; f2240 -Sfx_Ember_branch_f2240: ; f2240 - unknownmusic0xde $c9 - sound $b, $f3, $0120 - sound $9, $d3, $0150 - loopchannel 5, Sfx_Ember_branch_f2240 - sound $8, $e3, $0130 - sound $f, $c2, $0110 - endchannel -; f2257 - -Sfx_Ember_Ch8: ; f2257 -Sfx_Ember_branch_f2257: ; f2257 - noise $a, $f3, $35 - noise $e, $f6, $45 - loopchannel 4, Sfx_Ember_branch_f2257 - noise $c, $f4, $bc - noise $c, $f5, $9c - noise $f, $f4, $ac - endchannel -; f226b - -Sfx_Bubblebeam_Ch5: ; f226b -Sfx_Bubblebeam_branch_f226b: ; f226b - unknownmusic0xde $39 - sound $4, $f4, $0600 - sound $3, $c4, $0500 - sound $5, $b5, $0600 - sound $d, $e2, $06c0 - loopchannel 3, Sfx_Bubblebeam_branch_f226b - sound $8, $d1, $0600 - endchannel -; f2286 - -Sfx_Bubblebeam_Ch6: ; f2286 -Sfx_Bubblebeam_branch_f2286: ; f2286 - unknownmusic0xde $8d - sound $5, $e4, $05e0 - sound $4, $b4, $04e0 - sound $6, $a5, $05e8 - sound $e, $d1, $06a0 - loopchannel 3, Sfx_Bubblebeam_branch_f2286 - endchannel -; f229d - -Sfx_Bubblebeam_Ch8: ; f229d -Sfx_Bubblebeam_branch_f229d: ; f229d - noise $5, $c3, $33 - noise $3, $92, $43 - noise $a, $b5, $33 - noise $f, $c3, $32 - loopchannel 2, Sfx_Bubblebeam_branch_f229d - endchannel -; f22ae - -Sfx_HydroPump_Ch5: ; f22ae -Sfx_HydroPump_branch_f22ae: ; f22ae - unknownmusic0xde $d2 - sound $3, $81, $0300 - sound $3, $c1, $0400 - sound $3, $f1, $0500 - sound $3, $b1, $0400 - sound $3, $71, $0300 - loopchannel 5, Sfx_HydroPump_branch_f22ae - sound $8, $81, $0400 - endchannel -; f22cd - -Sfx_HydroPump_Ch8: ; f22cd -Sfx_HydroPump_branch_f22cd: ; f22cd - noise $3, $62, $22 - noise $3, $a2, $32 - noise $3, $d2, $33 - noise $3, $92, $23 - noise $3, $52, $12 - loopchannel 5, Sfx_HydroPump_branch_f22cd - noise $8, $81, $12 - endchannel -; f22e4 - -Sfx_Surf_Ch5: ; f22e4 -Sfx_Surf_branch_f22e4: ; f22e4 - unknownmusic0xde $39 - sound $f, $f4, $0500 - sound $f, $c4, $0400 - sound $f, $e2, $05c0 - loopchannel 3, Sfx_Surf_branch_f22e4 - endchannel -; f22f7 - -Sfx_Surf_Ch6: ; f22f7 -Sfx_Surf_branch_f22f7: ; f22f7 - unknownmusic0xde $8d - sound $7, $e4, $0430 - sound $f, $b4, $0330 - sound $f, $a2, $0438 - loopchannel 4, Sfx_Surf_branch_f22f7 - endchannel -; f230a - -Sfx_Surf_Ch8: ; f230a -Sfx_Surf_branch_f230a: ; f230a - noise $9, $f4, $44 - noise $9, $f2, $43 - noise $f, $f4, $42 - noise $f, $f4, $41 - loopchannel 3, Sfx_Surf_branch_f230a - endchannel -; f231b - -Sfx_Psybeam_Ch5: ; f231b -Sfx_Psybeam_branch_f231b: ; f231b - unknownmusic0xde $a1 - sound $a, $f1, $0640 - sound $a, $f3, $0680 - sound $a, $f2, $0620 - loopchannel 4, Sfx_Psybeam_branch_f231b - sound $a, $f1, $0640 - endchannel -; f2332 - -Sfx_Psybeam_Ch6: ; f2332 -Sfx_Psybeam_branch_f2332: ; f2332 - unknownmusic0xde $b3 - sound $a, $f3, $0571 - sound $7, $e3, $0531 - sound $a, $f1, $0551 - loopchannel 4, Sfx_Psybeam_branch_f2332 - sound $a, $f1, $0571 - endchannel -; f2349 - -Sfx_Psybeam_Ch8: ; f2349 -Sfx_Psybeam_branch_f2349: ; f2349 - noise $2, $d1, $4a - noise $2, $d2, $2a - loopchannel 21, Sfx_Psybeam_branch_f2349 - endchannel -; f2354 - -Sfx_Charge_Ch5: ; f2354 -Sfx_Charge_branch_f2354: ; f2354 + sound __, 1, $f1, $07c0 + sound __, 1, $f1, $0700 + loopchannel 12, Sfx_Leer_Ch5 + endchannel + +Sfx_Leer_Ch6: + sound_duty 3, 0, 3, 2 + sound __, 1, $e1, $07c1 + sound __, 1, $e1, $0701 + loopchannel 12, Sfx_Leer_Ch6 + endchannel + +Sfx_Leer_Ch8: + noise __, 2, $d1, $49 + noise __, 2, $d1, $29 + loopchannel 6, Sfx_Leer_Ch8 + endchannel + +Sfx_Ember_Ch5: + sound_duty 1, 2, 0, 3 + sound __, 12, $f3, $0120 + sound __, 10, $d3, $0150 + loopchannel 5, Sfx_Ember_Ch5 + sound __, 9, $e3, $0130 + sound __, 16, $c2, $0110 + endchannel + +Sfx_Ember_Ch8: + noise __, 11, $f3, $35 + noise __, 15, $f6, $45 + loopchannel 4, Sfx_Ember_Ch8 + noise __, 13, $f4, $bc + noise __, 13, $f5, $9c + noise __, 16, $f4, $ac + endchannel + +Sfx_Bubblebeam_Ch5: + sound_duty 1, 2, 3, 0 + sound __, 5, $f4, $0600 + sound __, 4, $c4, $0500 + sound __, 6, $b5, $0600 + sound __, 14, $e2, $06c0 + loopchannel 3, Sfx_Bubblebeam_Ch5 + sound __, 9, $d1, $0600 + endchannel + +Sfx_Bubblebeam_Ch6: + sound_duty 1, 3, 0, 2 + sound __, 6, $e4, $05e0 + sound __, 5, $b4, $04e0 + sound __, 7, $a5, $05e8 + sound __, 15, $d1, $06a0 + loopchannel 3, Sfx_Bubblebeam_Ch6 + endchannel + +Sfx_Bubblebeam_Ch8: + noise __, 6, $c3, $33 + noise __, 4, $92, $43 + noise __, 11, $b5, $33 + noise __, 16, $c3, $32 + loopchannel 2, Sfx_Bubblebeam_Ch8 + endchannel + +Sfx_HydroPump_Ch5: + sound_duty 2, 0, 1, 3 + sound __, 4, $81, $0300 + sound __, 4, $c1, $0400 + sound __, 4, $f1, $0500 + sound __, 4, $b1, $0400 + sound __, 4, $71, $0300 + loopchannel 5, Sfx_HydroPump_Ch5 + sound __, 9, $81, $0400 + endchannel + +Sfx_HydroPump_Ch8: + noise __, 4, $62, $22 + noise __, 4, $a2, $32 + noise __, 4, $d2, $33 + noise __, 4, $92, $23 + noise __, 4, $52, $12 + loopchannel 5, Sfx_HydroPump_Ch8 + noise __, 9, $81, $12 + endchannel + +Sfx_Surf_Ch5: + sound_duty 1, 2, 3, 0 + sound __, 16, $f4, $0500 + sound __, 16, $c4, $0400 + sound __, 16, $e2, $05c0 + loopchannel 3, Sfx_Surf_Ch5 + endchannel + +Sfx_Surf_Ch6: + sound_duty 1, 3, 0, 2 + sound __, 8, $e4, $0430 + sound __, 16, $b4, $0330 + sound __, 16, $a2, $0438 + loopchannel 4, Sfx_Surf_Ch6 + endchannel + +Sfx_Surf_Ch8: + noise __, 10, $f4, $44 + noise __, 10, $f2, $43 + noise __, 16, $f4, $42 + noise __, 16, $f4, $41 + loopchannel 3, Sfx_Surf_Ch8 + endchannel + +Sfx_Psybeam_Ch5: + sound_duty 1, 0, 2, 2 + sound __, 11, $f1, $0640 + sound __, 11, $f3, $0680 + sound __, 11, $f2, $0620 + loopchannel 4, Sfx_Psybeam_Ch5 + sound __, 11, $f1, $0640 + endchannel + +Sfx_Psybeam_Ch6: + sound_duty 3, 0, 3, 2 + sound __, 11, $f3, $0571 + sound __, 8, $e3, $0531 + sound __, 11, $f1, $0551 + loopchannel 4, Sfx_Psybeam_Ch6 + sound __, 11, $f1, $0571 + endchannel + +Sfx_Psybeam_Ch8: + noise __, 3, $d1, $4a + noise __, 3, $d2, $2a + loopchannel 21, Sfx_Psybeam_Ch8 + endchannel + +Sfx_Charge_Ch5: dutycycle $0 - sound $2, $f1, $0200 - sound $3, $f1, $0700 - sound $4, $f1, $0500 - sound $5, $f1, $07f0 - loopchannel 8, Sfx_Charge_branch_f2354 - endchannel -; f236b - -Sfx_Charge_Ch6: ; f236b -Sfx_Charge_branch_f236b: ; f236b - unknownmusic0xde $b3 - sound $2, $e1, $0302 - sound $3, $e1, $07f2 - sound $4, $e1, $0602 - sound $5, $e1, $0702 - loopchannel 8, Sfx_Charge_branch_f236b - endchannel -; f2382 - -Sfx_Charge_Ch8: ; f2382 -Sfx_Charge_branch_f2382: ; f2382 - noise $2, $d3, $10 - noise $3, $d3, $11 - noise $2, $d2, $10 - noise $5, $d2, $12 - loopchannel 9, Sfx_Charge_branch_f2382 - endchannel -; f2393 - -Sfx_Thundershock_Ch5: ; f2393 -Sfx_Thundershock_branch_f2393: ; f2393 - unknownmusic0xde $2b - sound $3, $f1, $07f0 - sound $4, $f2, $0200 - loopchannel 8, Sfx_Thundershock_branch_f2393 - endchannel -; f23a2 - -Sfx_Thundershock_Ch6: ; f23a2 -Sfx_Thundershock_branch_f23a2: ; f23a2 - unknownmusic0xde $b3 - sound $4, $e2, $0202 - sound $4, $e1, $07e2 - loopchannel 9, Sfx_Thundershock_branch_f23a2 - endchannel -; f23b1 - -Sfx_Thundershock_Ch8: ; f23b1 -Sfx_Thundershock_branch_f23b1: ; f23b1 - noise $4, $ff, $43 - noise $4, $f2, $44 - loopchannel 9, Sfx_Thundershock_branch_f23b1 - endchannel -; f23bc - -Sfx_Psychic_Ch5: ; f23bc + sound __, 3, $f1, $0200 + sound __, 4, $f1, $0700 + sound __, 5, $f1, $0500 + sound __, 6, $f1, $07f0 + loopchannel 8, Sfx_Charge_Ch5 + endchannel + +Sfx_Charge_Ch6: + sound_duty 3, 0, 3, 2 + sound __, 3, $e1, $0302 + sound __, 4, $e1, $07f2 + sound __, 5, $e1, $0602 + sound __, 6, $e1, $0702 + loopchannel 8, Sfx_Charge_Ch6 + endchannel + +Sfx_Charge_Ch8: + noise __, 3, $d3, $10 + noise __, 4, $d3, $11 + noise __, 3, $d2, $10 + noise __, 6, $d2, $12 + loopchannel 9, Sfx_Charge_Ch8 + endchannel + +Sfx_Thundershock_Ch5: + sound_duty 3, 2, 2, 0 + sound __, 4, $f1, $07f0 + sound __, 5, $f2, $0200 + loopchannel 8, Sfx_Thundershock_Ch5 + endchannel + +Sfx_Thundershock_Ch6: + sound_duty 3, 0, 3, 2 + sound __, 5, $e2, $0202 + sound __, 5, $e1, $07e2 + loopchannel 9, Sfx_Thundershock_Ch6 + endchannel + +Sfx_Thundershock_Ch8: + noise __, 5, $ff, $43 + noise __, 5, $f2, $44 + loopchannel 9, Sfx_Thundershock_Ch8 + endchannel + +Sfx_Psychic_Ch5: dutycycle $2 soundinput $f7 - sound $8, $c4, $07bd - sound $8, $c4, $07be - sound $8, $c4, $07bf - sound $8, $c4, $07c0 - sound $f, $c4, $07c1 - sound $f, $f2, $07c0 + sound __, 9, $c4, $07bd + sound __, 9, $c4, $07be + sound __, 9, $c4, $07bf + sound __, 9, $c4, $07c0 + sound __, 16, $c4, $07c1 + sound __, 16, $f2, $07c0 soundinput $8 endchannel -; f23db -Sfx_Psychic_Ch6: ; f23db +Sfx_Psychic_Ch6: dutycycle $2 - sound $8, $c4, $0770 - sound $8, $c4, $0761 - sound $8, $c4, $0762 - sound $8, $c4, $0763 - sound $f, $c4, $0764 - sound $f, $f2, $0764 - endchannel -; f23f6 - -Sfx_Psychic_Ch8: ; f23f6 - noise $f, $3f, $14 - noise $f, $cf, $13 - noise $f, $cf, $12 - noise $f, $cf, $11 - noise $f, $cf, $10 - noise $f, $c2, $10 - endchannel -; f2409 - -Sfx_Screech_Ch5: ; f2409 + sound __, 9, $c4, $0770 + sound __, 9, $c4, $0761 + sound __, 9, $c4, $0762 + sound __, 9, $c4, $0763 + sound __, 16, $c4, $0764 + sound __, 16, $f2, $0764 + endchannel + +Sfx_Psychic_Ch8: + noise __, 16, $3f, $14 + noise __, 16, $cf, $13 + noise __, 16, $cf, $12 + noise __, 16, $cf, $11 + noise __, 16, $cf, $10 + noise __, 16, $c2, $10 + endchannel + +Sfx_Screech_Ch5: dutycycle $2 - sound $f, $ff, $07e0 - sound $f, $ff, $07e0 - sound $f, $ff, $07e0 - sound $f, $ff, $07e0 - sound $f, $f2, $07e0 + sound __, 16, $ff, $07e0 + sound __, 16, $ff, $07e0 + sound __, 16, $ff, $07e0 + sound __, 16, $ff, $07e0 + sound __, 16, $f2, $07e0 endchannel -; f2420 -Sfx_Screech_Ch6: ; f2420 +Sfx_Screech_Ch6: dutycycle $3 - sound $f, $ff, $07e2 - sound $f, $ff, $07e1 - sound $f, $ff, $07e2 - sound $f, $ff, $07e1 - sound $f, $f2, $07e2 + sound __, 16, $ff, $07e2 + sound __, 16, $ff, $07e1 + sound __, 16, $ff, $07e2 + sound __, 16, $ff, $07e1 + sound __, 16, $f2, $07e2 endchannel -; f2437 -Sfx_BoneClub_Ch5: ; f2437 +Sfx_BoneClub_Ch5: dutycycle $2 soundinput $af - sound $8, $f1, $0700 + sound __, 9, $f1, $0700 soundinput $8 endchannel -; f2442 -Sfx_BoneClub_Ch6: ; f2442 +Sfx_BoneClub_Ch6: dutycycle $3 - sound $8, $f1, $0701 + sound __, 9, $f1, $0701 endchannel -; f2449 -Sfx_Sharpen_Ch5: ; f2449 +Sfx_Sharpen_Ch5: dutycycle $2 - sound $6, $f1, $0500 - sound $6, $f1, $0580 - sound $6, $f1, $0600 - sound $6, $f1, $0680 - sound $8, $f1, $0700 + sound __, 7, $f1, $0500 + sound __, 7, $f1, $0580 + sound __, 7, $f1, $0600 + sound __, 7, $f1, $0680 + sound __, 9, $f1, $0700 endchannel -; f2460 -Sfx_Sharpen_Ch6: ; f2460 +Sfx_Sharpen_Ch6: dutycycle $3 - sound $6, $e1, $0510 - sound $6, $e1, $0590 - sound $6, $e1, $0610 - sound $6, $e1, $0690 - sound $8, $e1, $0710 + sound __, 7, $e1, $0510 + sound __, 7, $e1, $0590 + sound __, 7, $e1, $0610 + sound __, 7, $e1, $0690 + sound __, 9, $e1, $0710 endchannel -; f2477 -Sfx_EggBomb_Ch5: ; f2477 - unknownmusic0xde $ed - sound $8, $ff, $03f8 - sound $f, $ff, $0400 - sound $f, $f3, $0400 +Sfx_EggBomb_Ch5: + sound_duty 1, 3, 2, 3 + sound __, 9, $ff, $03f8 + sound __, 16, $ff, $0400 + sound __, 16, $f3, $0400 endchannel -; f2486 -Sfx_EggBomb_Ch6: ; f2486 - unknownmusic0xde $b4 - sound $8, $ef, $03c0 - sound $f, $ef, $03c0 - sound $f, $e3, $03c0 +Sfx_EggBomb_Ch6: + sound_duty 0, 1, 3, 2 + sound __, 9, $ef, $03c0 + sound __, 16, $ef, $03c0 + sound __, 16, $e3, $03c0 endchannel -; f2495 -Sfx_EggBomb_Ch8: ; f2495 - noise $4, $ff, $51 - noise $8, $ff, $54 - noise $f, $ff, $55 - noise $f, $f3, $56 +Sfx_EggBomb_Ch8: + noise __, 5, $ff, $51 + noise __, 9, $ff, $54 + noise __, 16, $ff, $55 + noise __, 16, $f3, $56 endchannel -; f24a2 -Sfx_Sing_Ch5: ; f24a2 +Sfx_Sing_Ch5: togglesfx vibrato $a, $24 dutycycle $2 @@ -5242,9 +4628,8 @@ Sfx_Sing_Ch5: ; f24a2 octave 5 note G_, 8 endchannel -; f24b3 -Sfx_Sing_Ch6: ; f24b3 +Sfx_Sing_Ch6: togglesfx vibrato $a, $23 dutycycle $2 @@ -5258,166 +4643,147 @@ Sfx_Sing_Ch6: ; f24b3 octave 5 note G_, 8 endchannel -; f24c7 -Sfx_HyperBeam_Ch5: ; f24c7 +Sfx_HyperBeam_Ch5: dutycycle $0 - sound $2, $f1, $0780 - sound $2, $f1, $0700 - sound $2, $f1, $0790 - sound $2, $f1, $0700 - sound $2, $f1, $07a0 - sound $2, $f1, $0700 - sound $2, $f1, $07b0 - sound $2, $f1, $0700 - sound $2, $f1, $07c0 - sound $2, $f1, $0700 - sound $2, $f1, $07d0 -Sfx_HyperBeam_branch_f24f5: ; f24f5 - sound $2, $f1, $0700 - sound $2, $f1, $07e0 - loopchannel 12, Sfx_HyperBeam_branch_f24f5 - sound $f, $f1, $0700 - endchannel -; f2506 - -Sfx_HyperBeam_Ch6: ; f2506 - unknownmusic0xde $b3 - sound $2, $f1, $0781 - sound $2, $f1, $0701 - sound $2, $f1, $0791 - sound $2, $f1, $0701 - sound $2, $f1, $07a1 - sound $2, $f1, $0701 - sound $2, $f1, $07b1 - sound $2, $f1, $0701 - sound $2, $f1, $07c1 - sound $2, $f1, $0701 - sound $2, $f1, $07d1 -Sfx_HyperBeam_branch_f2534: ; f2534 - sound $2, $f1, $0701 - sound $2, $f1, $07e1 - loopchannel 12, Sfx_HyperBeam_branch_f2534 - sound $f, $f1, $0701 - endchannel -; f2545 - -Sfx_HyperBeam_Ch8: ; f2545 -Sfx_HyperBeam_branch_f2545: ; f2545 - noise $1, $d1, $49 - noise $1, $d1, $29 - loopchannel 26, Sfx_HyperBeam_branch_f2545 - endchannel -; f2550 - -Sfx_Unknown60_Ch8: ; f2550 - noise $6, $20, $10 - noise $6, $2f, $40 - noise $6, $4f, $41 - noise $6, $8f, $41 - noise $6, $cf, $42 - noise $8, $d7, $42 - noise $f, $e7, $43 - noise $f, $f2, $43 - endchannel -; f2569 - -Sfx_Unknown61_Ch8: ; f2569 - noise $4, $d1, $41 - endchannel -; f256d - -Sfx_Unknown62_Ch8: ; f256d - noise $4, $c1, $42 - endchannel -; f2571 - -Sfx_Unknown63_Ch8: ; f2571 - noise $2, $6f, $21 - noise $2, $af, $31 - noise $f, $f2, $41 - endchannel -; f257b - -Sfx_Burn_Ch8: ; f257b - noise $2, $d2, $32 - noise $f, $f2, $43 - endchannel -; f2582 - -Sfx_TitleScreenEntrance_Ch8: ; f2582 - noise $8, $3c, $20 - noise $6, $a0, $20 - noise $8, $b0, $21 - noise $a, $c0, $22 - noise $f, $d2, $23 - endchannel -; f2592 - -Sfx_Unknown66_Ch5: ; f2592 + sound __, 3, $f1, $0780 + sound __, 3, $f1, $0700 + sound __, 3, $f1, $0790 + sound __, 3, $f1, $0700 + sound __, 3, $f1, $07a0 + sound __, 3, $f1, $0700 + sound __, 3, $f1, $07b0 + sound __, 3, $f1, $0700 + sound __, 3, $f1, $07c0 + sound __, 3, $f1, $0700 + sound __, 3, $f1, $07d0 +.loop + sound __, 3, $f1, $0700 + sound __, 3, $f1, $07e0 + loopchannel 12, .loop + sound __, 16, $f1, $0700 + endchannel + +Sfx_HyperBeam_Ch6: + sound_duty 3, 0, 3, 2 + sound __, 3, $f1, $0781 + sound __, 3, $f1, $0701 + sound __, 3, $f1, $0791 + sound __, 3, $f1, $0701 + sound __, 3, $f1, $07a1 + sound __, 3, $f1, $0701 + sound __, 3, $f1, $07b1 + sound __, 3, $f1, $0701 + sound __, 3, $f1, $07c1 + sound __, 3, $f1, $0701 + sound __, 3, $f1, $07d1 +.loop + sound __, 3, $f1, $0701 + sound __, 3, $f1, $07e1 + loopchannel 12, .loop + sound __, 16, $f1, $0701 + endchannel + +Sfx_HyperBeam_Ch8: + noise __, 2, $d1, $49 + noise __, 2, $d1, $29 + loopchannel 26, Sfx_HyperBeam_Ch8 + endchannel + +Sfx_Unknown60_Ch8: + noise __, 7, $20, $10 + noise __, 7, $2f, $40 + noise __, 7, $4f, $41 + noise __, 7, $8f, $41 + noise __, 7, $cf, $42 + noise __, 9, $d7, $42 + noise __, 16, $e7, $43 + noise __, 16, $f2, $43 + endchannel + +Sfx_Unknown61_Ch8: + noise __, 5, $d1, $41 + endchannel + +Sfx_SwitchPockets_Ch8: + noise __, 5, $c1, $42 + endchannel + +Sfx_Unknown63_Ch8: + noise __, 3, $6f, $21 + noise __, 3, $af, $31 + noise __, 16, $f2, $41 + endchannel + +Sfx_Burn_Ch8: + noise __, 3, $d2, $32 + noise __, 16, $f2, $43 + endchannel + +Sfx_TitleScreenEntrance_Ch8: + noise __, 9, $3c, $20 + noise __, 7, $a0, $20 + noise __, 9, $b0, $21 + noise __, 11, $c0, $22 + noise __, 16, $d2, $23 + endchannel + +Sfx_Unknown66_Ch5: dutycycle $2 - sound $1, $f2, $06a0 - sound $1, $f2, $06e0 - sound $8, $f1, $0700 + sound __, 2, $f2, $06a0 + sound __, 2, $f2, $06e0 + sound __, 9, $f1, $0700 endchannel -; f25a1 -Sfx_GetCoinFromSlots_Ch5: ; f25a1 +Sfx_GetCoinFromSlots_Ch5: dutycycle $2 - sound $2, $f1, $0700 - sound $8, $81, $07e0 + sound __, 3, $f1, $0700 + sound __, 9, $81, $07e0 endchannel -; f25ac -Sfx_PayDay_Ch5: ; f25ac +Sfx_PayDay_Ch5: dutycycle $3 - sound $5, $e1, $0700 - sound $2, $e1, $0780 - sound $f, $f1, $07c0 + sound __, 6, $e1, $0700 + sound __, 3, $e1, $0780 + sound __, 16, $f1, $07c0 endchannel -; f25bb -Sfx_PayDay_Ch6: ; f25bb +Sfx_PayDay_Ch6: dutycycle $2 - sound $4, $c1, $06c1 - sound $2, $c1, $0741 - sound $f, $d1, $0781 + sound __, 5, $c1, $06c1 + sound __, 3, $c1, $0741 + sound __, 16, $d1, $0781 endchannel -; f25ca -Sfx_Metronome_Ch5: ; f25ca +Sfx_Metronome_Ch5: dutycycle $2 soundinput $5f - sound $4, $40, $07e0 - sound $4, $60, $07e0 - sound $4, $80, $07e0 - sound $8, $a0, $07e0 - sound $8, $a0, $07e0 - sound $8, $80, $07e0 - sound $8, $60, $07e0 - sound $8, $30, $07e0 - sound $f, $12, $07e0 + sound __, 5, $40, $07e0 + sound __, 5, $60, $07e0 + sound __, 5, $80, $07e0 + sound __, 9, $a0, $07e0 + sound __, 9, $a0, $07e0 + sound __, 9, $80, $07e0 + sound __, 9, $60, $07e0 + sound __, 9, $30, $07e0 + sound __, 16, $12, $07e0 soundinput $8 endchannel -; f25f5 -Sfx_Unknown5F_Ch5: ; f25f5 -Sfx_Unknown5F_branch_f25f5: ; f25f5 - sound $2, $f7, $0601 - sound $2, $f7, $0701 - loopchannel 8, Sfx_Unknown5F_branch_f25f5 +Sfx_Unknown5F_Ch5: + sound __, 3, $f7, $0601 + sound __, 3, $f7, $0701 + loopchannel 8, Sfx_Unknown5F_Ch5 endchannel -; f2602 -Sfx_Unknown5F_Ch6: ; f2602 - sound $1, $f7, $ffff - sound $2, $f7, $0602 - sound $2, $f7, $0702 - loopchannel 8, Sfx_Unknown5F_branch_f25f5 +Sfx_Unknown5F_Ch6: + sound __, 2, $f7, $ffff + sound __, 3, $f7, $0602 + sound __, 3, $f7, $0702 + loopchannel 8, Sfx_Unknown5F_Ch5 endchannel -; f2613 -Sfx_Fanfare2_Ch5: ; f2613 +Sfx_Fanfare2_Ch5: togglesfx sfxpriorityon tempo 256 @@ -5441,9 +4807,8 @@ Sfx_Fanfare2_Ch5: ; f2613 note C#, 12 sfxpriorityoff endchannel -; f2636 -Sfx_Fanfare2_Ch6: ; f2636 +Sfx_Fanfare2_Ch6: togglesfx dutycycle $2 notetype $6, $c5 @@ -5462,9 +4827,8 @@ Sfx_Fanfare2_Ch6: ; f2636 notetype $4, $c6 note F_, 12 endchannel -; f2651 -Sfx_Fanfare2_Ch8: ; f2651 +Sfx_Fanfare2_Ch8: togglesfx notetype $6 note C_, 1 @@ -5483,9 +4847,8 @@ Sfx_Fanfare2_Ch8: ; f2651 note F_, 2 note G#, 6 endchannel -; f2665 -Sfx_Fanfare_Ch5: ; f2665 +Sfx_Fanfare_Ch5: togglesfx sfxpriorityon tempo 256 @@ -5514,9 +4877,8 @@ Sfx_Fanfare_Ch5: ; f2665 note C#, 12 sfxpriorityoff endchannel -; f268d -Sfx_Fanfare_Ch6: ; f268d +Sfx_Fanfare_Ch6: togglesfx dutycycle $2 notetype $6, $c4 @@ -5551,9 +4913,8 @@ Sfx_Fanfare_Ch6: ; f268d notetype $4, $c6 note F#, 12 endchannel -; f26b6 -Sfx_Fanfare_Ch8: ; f26b6 +Sfx_Fanfare_Ch8: togglesfx notetype $6 note C_, 1 @@ -5577,73 +4938,61 @@ Sfx_Fanfare_Ch8: ; f26b6 note F_, 4 note F#, 6 endchannel -; f26cf -Sfx_HangUp_Ch5: ; f26cf +Sfx_HangUp_Ch5: dutycycle $2 - sound $4, $b8, $077b - sound $2, $21, $077b - sound $10, $0, $0000 -Sfx_HangUp_branch_f26dd: ; f26dd -Sfx_NoSignal_Ch5: ; f26dd -Sfx_NoSignal_branch_f26dd: ; f26dd + sound __, 5, $b8, $077b + sound __, 3, $21, $077b + sound C_, 1, $0, 0 +Sfx_NoSignal_Ch5: dutycycle $2 - sound $14, $e8, $070b - sound $1c, $0, $0000 - loopchannel 3, Sfx_HangUp_branch_f26dd - endchannel -; f26ec - -Sfx_Sandstorm_Ch8: ; f26ec -Sfx_Sandstorm_branch_f26ec: ; f26ec -Sfx_Unknown5F_Ch8: ; f26ec -Sfx_Unknown5F_branch_f26ec: ; f26ec - noise $1, $f8, $41 - noise $2, $9c, $24 - noise $0, $0, $0 - noise $3, $59, $16 - noise $2, $0, $0 - loopchannel 3, Sfx_Sandstorm_branch_f26ec - endchannel -; f2700 - -Sfx_Elevator_Ch5: ; f2700 + sound C_, 5, $e8, $070b + sound C_, 13, $0, 0 + loopchannel 3, Sfx_NoSignal_Ch5 + endchannel + +Sfx_Sandstorm_Ch8: +Sfx_Unknown5F_Ch8: + noise __, 2, $f8, $41 + noise __, 3, $9c, $24 + noise __, 1, $0, $0 + noise __, 4, $59, $16 + noise __, 3, $0, $0 + loopchannel 3, Sfx_Sandstorm_Ch8 + endchannel + +Sfx_Elevator_Ch5: dutycycle $2 soundinput $5a -Sfx_Elevator_branch_f2704: ; f2704 - sound $2, $f1, $0300 - loopchannel 48, Sfx_Elevator_branch_f2704 +.loop + sound __, 3, $f1, $0300 + loopchannel 48, .loop soundinput $8 dutycycle $2 - sound $f, $f3, $0730 - sound $8, $65, $0730 - sound $f, $f4, $0700 - sound $f, $74, $0700 - sound $f, $44, $0700 - sound $f, $24, $0700 + sound __, 16, $f3, $0730 + sound __, 9, $65, $0730 + sound __, 16, $f4, $0700 + sound __, 16, $74, $0700 + sound __, 16, $44, $0700 + sound __, 16, $24, $0700 endchannel -; f2729 -Sfx_Elevator_Ch6: ; f2729 -Sfx_Elevator_Ch7: ; f2729 - sound $60, $0, $0000 - sound $53, $0, $0000 +Sfx_Elevator_Ch6: +Sfx_Elevator_Ch7: + sound F_, 1, $0, 0 + sound E_, 4, $0, 0 endchannel -; f2732 -Sfx_Elevator_Ch8: ; f2732 - noise $60, $0, $0 - noise $53, $0, $0 +Sfx_Elevator_Ch8: + noise F_, 1, $0, $0 + noise E_, 4, $0, $0 endchannel -; f2739 -Sfx_StopSlot: ; f2739 - dbw $04, Sfx_StopSlot_Ch5 -; f273c +Sfx_StopSlot: + musicheader 1, 5, Sfx_StopSlot_Ch5 -Sfx_StopSlot_Ch5: ; f273c +Sfx_StopSlot_Ch5: dutycycle $2 - sound $1, $f8, $0760 - sound $4, $82, $0760 + sound __, 2, $f8, $0760 + sound __, 5, $82, $0760 endchannel -; f2747 @@ -1464,7 +1464,8 @@ SECTION "bank3b", ROMX, BANK[$3b] dr $ec000, $f0000 SECTION "bank3c", ROMX, BANK[$3c] - dr $f0000, $f2747 + dr $f0000, $f0941 +INCLUDE "audio/sfx.asm" CryHeaders:: INCLUDE "data/pokemon/cries.asm" INCLUDE "audio/cries.asm" |